30607 files changed, 7349532 insertions, 0 deletions

diff --git a/.commit-template b/.commit-template
new file mode 100644
index 0000000000..589ca89586
--- /dev/null
+++ b/.commit-template
@@ -0,0 +1,10 @@
+# ===[ Subject ]==========[ one line, please wrap at 72 characters ]===|
+
+# ---[ Details ]---------[ remember extra blank line after subject ]---|
+
+# ---[ Fields ]-----------------[ uncomment and edit as applicable ]---|
+
+#Task-number:
+#Reviewed-by:
+
+# ==================================[ please wrap at 72 characters ]===|
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..0de9563f2b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,174 @@
+# This file is used to ignore files which are generated in the Qt build system
+# ----------------------------------------------------------------------------
+
+examples/*/*/*
+!examples/*/*/*[.]*
+!examples/*/*/README
+examples/*/*/*[.]app
+demos/*/*
+!demos/*/*[.]*
+demos/*/*[.]app
+config.tests/*/*/*
+!config.tests/*/*/*[.]*
+config.tests/*/*/*[.]app
+
+*~
+*.a
+*.core
+*.moc
+*.o
+*.obj
+*.orig
+*.swp
+*.rej
+*.so
+*.pbxuser
+*.mode1
+*.mode1v3
+*_pch.h.cpp
+*_resource.rc
+.#*
+*.*#
+core
+.qmake.cache
+.qmake.vars
+*.prl
+tags
+.DS_Store
+*.debug
+Makefile*
+*.prl
+*.app
+*.pro.user
+bin/Qt*.dll
+bin/assistant*
+bin/designer*
+bin/dumpcpp*
+bin/idc*
+bin/linguist*
+bin/lrelease*
+bin/lupdate*
+bin/lconvert*
+bin/moc*
+bin/pixeltool*
+bin/qmake*
+bin/qt3to4*
+bin/qtdemo*
+bin/rcc*
+bin/uic*
+bin/patternist*
+bin/phonon*
+bin/qcollectiongenerator*
+bin/qdbus*
+bin/qhelpconverter*
+bin/qhelpgenerator*
+bin/qtconfig*
+bin/xmlpatterns*
+bin/collectiongenerator
+bin/helpconverter
+bin/helpgenerator
+configure.cache
+config.status
+mkspecs/default
+mkspecs/qconfig.pri
+moc_*.cpp
+qmake/qmake.exe
+qmake/Makefile.bak
+src/corelib/global/qconfig.cpp
+src/corelib/global/qconfig.h
+src/corelib/global/qconfig.h.qmake
+src/tools/uic/qclass_lib_map.h
+ui_*.h
+tests/auto/qprocess/test*/*.exe
+tests/auto/qtcpsocket/stressTest/*.exe
+tests/auto/qprocess/fileWriterProcess/*.exe
+tests/auto/qmake/testdata/quotedfilenames/*.exe
+tests/auto/compilerwarnings/*.exe
+tests/auto/qmake/testdata/quotedfilenames/test.cpp
+tests/auto/qprocess/fileWriterProcess.txt
+.com.apple.timemachine.supported
+tests/auto/qlibrary/libmylib.so*
+tests/auto/qresourceengine/runtime_resource.rcc
+tools/qdoc3/qdoc3*
+tools/qtestlib/updater/updater*
+tools/activeqt/testcon/testcon.tlb
+qrc_*.cpp
+
+# xemacs temporary files
+*.flc
+
+# Vim temporary files
+.*.swp
+
+# Visual Studio generated files
+*.ib_pdb_index
+*.idb
+*.ilk
+*.pdb
+*.sln
+*.suo
+*.vcproj
+*vcproj.*.*.user
+*.ncb
+
+# MinGW generated files
+*.Debug
+*.Release
+
+# WebKit temp files
+src/3rdparty/webkit/WebCore/mocinclude.tmp
+src/3rdparty/webkit/includes.txt
+src/3rdparty/webkit/includes2.txt
+
+# Symlinks generated by configure
+tools/qvfb/qvfbhdr.h
+tools/qvfb/qlock_p.h
+tools/qvfb/qlock.cpp
+tools/qvfb/qwssignalhandler.cpp
+tools/qvfb/qwssignalhandler_p.h
+.DS_Store
+.pch
+.rcc
+*.app
+config.status
+config.tests/unix/cups/cups
+config.tests/unix/getaddrinfo/getaddrinfo
+config.tests/unix/getifaddrs/getifaddrs
+config.tests/unix/iconv/iconv
+config.tests/unix/ipv6/ipv6
+config.tests/unix/ipv6ifname/ipv6ifname
+config.tests/unix/largefile/largefile
+config.tests/unix/nis/nis
+config.tests/unix/odbc/odbc
+config.tests/unix/openssl/openssl
+config.tests/unix/stl/stl
+config.tests/unix/zlib/zlib
+config.tests/unix/3dnow/3dnow
+config.tests/unix/mmx/mmx
+config.tests/unix/sse/sse
+config.tests/unix/sse2/sse2
+
+
+
+# Directories to ignore
+# ---------------------
+
+debug
+examples/tools/plugandpaint/plugins
+include/*
+include/*/*
+lib/*
+!lib/fonts
+!lib/README
+plugins/*/*
+release
+tmp
+doc-build
+doc/html/*
+doc/qch
+doc-build
+.rcc
+.pch
+src/corelib/lib
+src/network/lib
+src/xml/lib/
diff --git a/.hgignore b/.hgignore
new file mode 100755
index 0000000000..784d5079ff
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,133 @@
+# This file is used to ignore files which are generated in the Qt build system
+# ----------------------------------------------------------------------------
+
+syntax: glob
+
+*~
+*.a
+*.core
+*.moc
+*.o
+*.obj
+*.orig
+*.swp
+*.rej
+*.so
+*.pbxuser
+*.mode1
+*.mode1v3
+*.qch
+*.dylib
+*_pch.h.cpp
+*_resource.rc
+.qmake.cache
+*.prl
+tags
+Makefile
+Makefile.Debug
+Makefile.Release
+bin/Qt*.dll
+bin/lconvert*
+bin/xmlpatterns*
+bin/assistant*
+bin/designer*
+bin/dumpcpp*
+bin/idc*
+bin/linguist*
+bin/lrelease*
+bin/lupdate*
+bin/moc*
+bin/pixeltool*
+bin/qmake*
+bin/qt3to4*
+bin/qtdemo*
+bin/rcc*
+bin/uic*
+bin/qcollectiongenerator
+bin/qhelpgenerator
+tools/qdoc3/qdoc3*
+#configure.cache
+mkspecs/default
+mkspecs/qconfig.pri
+moc_*.cpp
+qmake/qmake.exe
+qmake/Makefile.bak
+src/corelib/global/qconfig.cpp
+src/corelib/global/qconfig.h
+src/tools/uic/qclass_lib_map.h
+ui_*.h
+.com.apple.timemachine.supported
+
+# xemacs temporary files
+*.flc
+
+# Visual Studio generated files
+*.ib_pdb_index
+*.idb
+*.ilk
+*.pdb
+*.sln
+*.suo
+*.vcproj
+*vcproj.*.*.user
+
+#
+## Symlinks generated by configure
+tools/qvfb/qvfbhdr.h
+tools/qvfb/qlock_p.h
+tools/qvfb/qlock.cpp
+tools/qvfb/qwssignalhandler.cpp
+tools/qvfb/qwssignalhandler_p.h
+.DS_Store
+.pch
+.rcc
+*.app
+config.status
+config.tests/unix/cups/cups
+config.tests/unix/getaddrinfo/getaddrinfo
+config.tests/unix/getifaddrs/getifaddrs
+config.tests/unix/iconv/iconv
+config.tests/unix/ipv6/ipv6
+config.tests/unix/ipv6ifname/ipv6ifname
+config.tests/unix/largefile/largefile
+config.tests/unix/nis/nis
+config.tests/unix/odbc/odbc
+config.tests/unix/openssl/openssl
+config.tests/unix/stl/stl
+config.tests/unix/zlib/zlib
+config.tests/unix/3dnow/3dnow
+config.tests/unix/mmx/mmx
+config.tests/unix/sse/sse
+config.tests/unix/sse2/sse2
+config.tests/unix/psql-escape/psql-escape
+config.tests/unix/psql/psql
+config.tests/unix/stdint/stdint
+
+# Directories to ignore
+# ---------------------
+
+debug
+examples/tools/plugandpaint/plugins
+include/*
+doc/html*
+include/*/*
+lib/*
+plugins/*/*
+release
+tmp
+doc/html/*
+doc-build
+src/gui/.pch
+src/corelib/.pch
+src/network/.pch
+src/gui/.rcc
+src/sql/.rcc
+src/xml/.rcc
+src/corelib/.rcc
+src/network/.rcc
+.DS_Store
+src/gui/build
+src/corelib/global/qconfig.h.qmake
+*.perspectivev*
+build
+src/gui/qtdir.xcconfig
diff --git a/FAQ b/FAQ
new file mode 100644
index 0000000000..c243e5c3cf
--- /dev/null
+++ b/FAQ
@@ -0,0 +1,18 @@
+This is a list of Frequently Asked Questions regarding Qt Release 4.5.0.
+
+Q: I'm using a Unix system and I downloaded the Zip package. However, when I try
+to run the configure script, I get the following error message:
+"bash: ./configure: /bin/sh^M: bad interpreter: No such file or directory"
+A: The problem here is converting files from Windows style line endings (CRLF)
+to Unix style line endings (LF). To avoid this problem, uncompress the file
+again and give the option "-a" to unzip, which will then add the correct line
+endings.
+
+Q: I'm running Windows XP and I downloaded the qt-win-eval-4.5.0-vs2008.exe
+version of Qt. However, when I try to run the examples I get an error saying:
+"The application failed to start because the application configuration is
+incorrect. Reinstalling the application may fix this problem.". I reinstalled
+the package but the error persists. What am I doing wrong?
+A: The problem is an incorrect version of the CRT. Visual studio requires CRT90
+while Windows XP comes with CRT80. To solve this problem, please install the
+2008 CRT redistributable package from Microsoft.
diff --git a/LGPL_EXCEPTION.TXT b/LGPL_EXCEPTION.TXT
new file mode 100644
index 0000000000..8d0f85eba4
--- /dev/null
+++ b/LGPL_EXCEPTION.TXT
@@ -0,0 +1,3 @@
+Nokia Qt LGPL Exception version 1.0
+
+As a special exception to the GNU Lesser General Public License version 2.1, the object code form of a "work that uses the Library" may incorporate material from a header file that is part of the Library.  You may distribute such object code under terms of your choice, provided that the incorporated material (i) does not exceed more than 5% of the total size of the Library;  and (ii) is limited to numerical parameters, data structure layouts, accessors, macros, inline functions and templates.
\ No newline at end of file
diff --git a/LICENSE.GPL3 b/LICENSE.GPL3
new file mode 100644
index 0000000000..13e6f1800f
--- /dev/null
+++ b/LICENSE.GPL3
@@ -0,0 +1,696 @@
+                    GNU GENERAL PUBLIC LICENSE
+
+ The Qt GUI Toolkit is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ Contact: Qt Software Information (qt-info@nokia.com)
+
+ You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ GNU General Public License version 3, which is displayed below.
+
+-------------------------------------------------------------------------
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+-------------------------------------------------------------------------
+
+In addition, as a special exception, Nokia gives permission to link the
+code of its release of Qt with the OpenSSL project's "OpenSSL" library (or
+modified versions of it that use the same license as the "OpenSSL"
+library), and distribute the linked executables.  You must comply with the
+GNU General Public License versions 2.0 or 3.0 in all respects for all of
+the code used other than the "OpenSSL" code.  If you modify this file, you
+may extend this exception to your version of the file, but you are not
+obligated to do so.  If you do not wish to do so, delete this exception
+statement from your version of this file.
diff --git a/LICENSE.LGPL b/LICENSE.LGPL
new file mode 100644
index 0000000000..bb95f250aa
--- /dev/null
+++ b/LICENSE.LGPL
@@ -0,0 +1,514 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+
+ The Qt GUI Toolkit is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ Contact: Qt Software Information (qt-info@nokia.com)
+
+ You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ GNU Lesser General Public License version 2.1, which is displayed below.
+
+-------------------------------------------------------------------------
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/LICENSE.PREVIEW.COMMERCIAL b/LICENSE.PREVIEW.COMMERCIAL
new file mode 100644
index 0000000000..7f7b234a56
--- /dev/null
+++ b/LICENSE.PREVIEW.COMMERCIAL
@@ -0,0 +1,642 @@
+TECHNOLOGY PREVIEW LICENSE AGREEMENT
+
+For individuals and/or legal entities resident in the Americas (North
+America, Central America and South America), the applicable licensing
+terms are specified under the heading "Technology Preview License
+Agreement: The Americas".
+
+For individuals and/or legal entities not resident in The Americas,
+the applicable licensing terms are specified under the heading
+"Technology Preview License Agreement: Rest of the World".
+
+
+TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas
+Agreement version 2.3
+
+This Technology Preview License Agreement ("Agreement") is a legal
+agreement between Nokia Inc. ("Nokia"), with its registered office at
+6021 Connection Drive, Irving, TX 75039, U.S.A. and you (either an
+individual or a legal entity) ("Licensee") for the Licensed Software
+(as defined below).
+
+
+1. DEFINITIONS
+
+"Affiliate" of a Party shall mean an entity (i) which is directly or
+indirectly controlling such Party; (ii) which is under the same direct
+or indirect ownership or control as such Party; or (iii) which is
+directly or indirectly owned or controlled by such Party. For these
+purposes, an entity shall be treated as being controlled by another if
+that other entity has fifty percent (50 %) or more of the votes in
+such entity, is able to direct its affairs and/or to control the
+composition of its board of directors or equivalent body.
+
+"Term" shall mean the period of time six (6) months from the later of
+(a) the Effective Date; or (b) the date the Licensed Software was
+initially delivered to Licensee by Nokia. If no specific Effective
+Date is set forth in the Agreement, the Effective Date shall be deemed
+to be the date the Licensed Software was initially delivered to
+Licensee.
+
+"Licensed Software" shall mean the computer software, "online" or
+electronic documentation, associated media and printed materials,
+including the source code, example programs and the documentation
+delivered by Nokia to Licensee in conjunction with this Agreement.
+
+"Party" or "Parties" shall mean Licensee and/or Nokia.
+
+
+2. OWNERSHIP
+
+The Licensed Software is protected by copyright laws and international
+copyright treaties, as well as other intellectual property laws and
+treaties. The Licensed Software is licensed, not sold.
+
+If Licensee provides any findings, proposals, suggestions or other
+feedback ("Feedback") to Nokia regarding the Licensed Software, Nokia
+shall own all right, title and interest including the intellectual
+property rights in and to such Feedback, excluding however any
+existing patent rights of Licensee. To the extent Licensee owns or
+controls any patents for such Feedback Licensee hereby grants to Nokia
+and its Affiliates, a worldwide, perpetual, non-transferable,
+sublicensable, royalty-free license to (i) use, copy and modify
+Feedback and to create derivative works thereof, (ii) to make (and
+have made), use, import, sell, offer for sale, lease, dispose, offer
+for disposal or otherwise exploit any products or services of Nokia
+containing Feedback,, and (iii) sublicense all the foregoing rights to
+third party licensees and customers of Nokia and/or its Affiliates.
+
+
+3. VALIDITY OF THE AGREEMENT
+
+By installing, copying, or otherwise using the Licensed Software,
+Licensee agrees to be bound by the terms of this Agreement. If
+Licensee does not agree to the terms of this Agreement, Licensee may
+not install, copy, or otherwise use the Licensed Software. Upon
+Licensee's acceptance of the terms and conditions of this Agreement,
+Nokia grants Licensee the right to use the Licensed Software in the
+manner provided below.
+
+
+4. LICENSES
+
+4.1 Using and Copying
+
+Nokia grants to Licensee a non-exclusive, non-transferable,
+time-limited license to use and copy the Licensed Software for sole
+purpose of evaluating and testing the Licensed Software during the
+Term.
+
+Licensee may install copies of the Licensed Software on an unlimited
+number of computers provided that (a) if an individual, only such
+individual; or (b) if a legal entity only its employees; use the
+Licensed Software for the authorized purposes.
+
+4.2 No Distribution or Modifications
+
+Licensee may not disclose, modify, sell, market, commercialise,
+distribute, loan, rent, lease, or license the Licensed Software or any
+copy of it or use the Licensed Software for any purpose that is not
+expressly granted in this Section 4. Licensee may not alter or remove
+any details of ownership, copyright, trademark or other property right
+connected with the Licensed Software. Licensee may not distribute any
+software statically or dynamically linked with the Licensed Software.
+
+4.3 No Technical Support
+
+Nokia has no obligation to furnish Licensee with any technical support
+whatsoever. Any such support is subject to separate agreement between
+the Parties.
+
+
+5. PRE-RELEASE CODE
+
+The Licensed Software contains pre-release code that is not at the
+level of performance and compatibility of a final, generally
+available, product offering. The Licensed Software may not operate
+correctly and may be substantially modified prior to the first
+commercial product release, if any. Nokia is not obligated to make
+this or any later version of the Licensed Software commercially
+available. The License Software is "Not for Commercial Use" and may
+only be used for the purposes described in Section 4. The Licensed
+Software may not be used in a live operating environment where it may
+be relied upon to perform in the same manner as a commercially
+released product or with data that has not been sufficiently backed
+up.
+
+
+6. THIRD PARTY SOFTWARE
+
+The Licensed Software may provide links to third party libraries or
+code (collectively "Third Party Software") to implement various
+functions.  Third Party Software does not comprise part of the
+Licensed Software. In some cases, access to Third Party Software may
+be included along with the Licensed Software delivery as a convenience
+for development and testing only. Such source code and libraries may
+be listed in the ".../src/3rdparty" source tree delivered with the
+Licensed Software or documented in the Licensed Software where the
+Third Party Software is used, as may be amended from time to time, do
+not comprise the Licensed Software. Licensee acknowledges (1) that
+some part of Third Party Software may require additional licensing of
+copyright and patents from the owners of such, and (2) that
+distribution of any of the Licensed Software referencing any portion
+of a Third Party Software may require appropriate licensing from such
+third parties.
+
+
+7. LIMITED WARRANTY AND WARRANTY DISCLAIMER
+
+The Licensed Software is licensed to Licensee "as is". To the maximum
+extent permitted by applicable law, Nokia on behalf of itself and its
+suppliers, disclaims all warranties and conditions, either express or
+implied, including, but not limited to, implied warranties of
+merchantability, fitness for a particular purpose, title and
+non-infringement with regard to the Licensed Software.
+
+
+8. LIMITATION OF LIABILITY
+
+If, Nokia's warranty disclaimer notwithstanding, Nokia is held liable
+to Licensee, whether in contract, tort or any other legal theory,
+based on the Licensed Software, Nokia's entire liability to Licensee
+and Licensee's exclusive remedy shall be, at Nokia's option, either
+(A) return of the price Licensee paid for the Licensed Software, or
+(B) repair or replacement of the Licensed Software, provided Licensee
+returns to Nokia all copies of the Licensed Software as originally
+delivered to Licensee. Nokia shall not under any circumstances be
+liable to Licensee based on failure of the Licensed Software if the
+failure resulted from accident, abuse or misapplication, nor shall
+Nokia under any circumstances be liable for special damages, punitive
+or exemplary damages, damages for loss of profits or interruption of
+business or for loss or corruption of data. Any award of damages from
+Nokia to Licensee shall not exceed the total amount Licensee has paid
+to Nokia in connection with this Agreement.
+
+
+9. CONFIDENTIALITY
+
+Each party acknowledges that during the Term of this Agreement it
+shall have access to information about the other party's business,
+business methods, business plans, customers, business relations,
+technology, and other information, including the terms of this
+Agreement, that is confidential and of great value to the other party,
+and the value of which would be significantly reduced if disclosed to
+third parties (the "Confidential Information"). Accordingly, when a
+party (the "Receiving Party") receives Confidential Information from
+another party (the "Disclosing Party"), the Receiving Party shall, and
+shall obligate its employees and agents and employees and agents of
+its Affiliates to: (i) maintain the Confidential Information in strict
+confidence; (ii) not disclose the Confidential Information to a third
+party without the Disclosing Party's prior written approval; and (iii)
+not, directly or indirectly, use the Confidential Information for any
+purpose other than for exercising its rights and fulfilling its
+responsibilities pursuant to this Agreement. Each party shall take
+reasonable measures to protect the Confidential Information of the
+other party, which measures shall not be less than the measures taken
+by such party to protect its own confidential and proprietary
+information.
+
+"Confidential Information" shall not include information that (a) is
+or becomes generally known to the public through no act or omission of
+the Receiving Party; (b) was in the Receiving Party's lawful
+possession prior to the disclosure hereunder and was not subject to
+limitations on disclosure or use; (c) is developed by the Receiving
+Party without access to the Confidential Information of the Disclosing
+Party or by persons who have not had access to the Confidential
+Information of the Disclosing Party as proven by the written records
+of the Receiving Party; (d) is lawfully disclosed to the Receiving
+Party without restrictions, by a third party not under an obligation
+of confidentiality; or (e) the Receiving Party is legally compelled to
+disclose the information, in which case the Receiving Party shall
+assert the privileged and confidential nature of the information and
+cooperate fully with the Disclosing Party to protect against and
+prevent disclosure of any Confidential Information and to limit the
+scope of disclosure and the dissemination of disclosed Confidential
+Information by all legally available means.
+
+The obligations of the Receiving Party under this Section shall
+continue during the Initial Term and for a period of five (5) years
+after expiration or termination of this Agreement. To the extent that
+the terms of the Non-Disclosure Agreement between Nokia and Licensee
+conflict with the terms of this Section 8, this Section 8 shall be
+controlling over the terms of the Non-Disclosure Agreement.
+
+
+10. GENERAL PROVISIONS
+
+10.1 No Assignment
+
+Licensee shall not be entitled to assign or transfer all or any of its
+rights, benefits and obligations under this Agreement without the
+prior written consent of Nokia, which shall not be unreasonably
+withheld.
+
+10.2 Termination
+
+Nokia may terminate the Agreement at any time immediately upon written
+notice by Nokia to Licensee if Licensee breaches this Agreement.
+
+Upon termination of this Agreement, Licensee shall return to Nokia all
+copies of Licensed Software that were supplied by Nokia. All other
+copies of Licensed Software in the possession or control of Licensee
+must be erased or destroyed. An officer of Licensee must promptly
+deliver to Nokia a written confirmation that this has occurred.
+
+10.3 Surviving Sections
+
+Any terms and conditions that by their nature or otherwise reasonably
+should survive a cancellation or termination of this Agreement shall
+also be deemed to survive. Such terms and conditions include, but are
+not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3,
+10.4, 10.5, 10.6, 10.7, and 10.8 of this Agreement.
+
+10.4 Entire Agreement
+
+This Agreement constitutes the complete agreement between the parties
+and supersedes all prior or contemporaneous discussions,
+representations, and proposals, written or oral, with respect to the
+subject matters discussed herein, with the exception of the
+non-disclosure agreement executed by the parties in connection with
+this Agreement ("Non-Disclosure Agreement"), if any, shall be subject
+to Section 8. No modification of this Agreement shall be effective
+unless contained in a writing executed by an authorized representative
+of each party. No term or condition contained in Licensee's purchase
+order shall apply unless expressly accepted by Nokia in writing. If
+any provision of the Agreement is found void or unenforceable, the
+remainder shall remain valid and enforceable according to its
+terms. If any remedy provided is determined to have failed for its
+essential purpose, all limitations of liability and exclusions of
+damages set forth in this Agreement shall remain in effect.
+
+10.5 Export Control
+
+Licensee acknowledges that the Licensed Software may be subject to
+export control restrictions of various countries. Licensee shall fully
+comply with all applicable export license restrictions and
+requirements as well as with all laws and regulations relating to the
+importation of the Licensed Software and shall procure all necessary
+governmental authorizations, including without limitation, all
+necessary licenses, approvals, permissions or consents, where
+necessary for the re-exportation of the Licensed Software.,
+
+10.6 Governing Law and Legal Venue
+
+This Agreement shall be governed by and construed in accordance with
+the federal laws of the United States of America and the internal laws
+of the State of New York without given effect to any choice of law
+rule that would result in the application of the laws of any other
+jurisdiction. The United Nations Convention on Contracts for the
+International Sale of Goods (CISG) shall not apply. Each Party (a)
+hereby irrevocably submits itself to and consents to the jurisdiction
+of the United States District Court for the Southern District of New
+York (or if such court lacks jurisdiction, the state courts of the
+State of New York) for the purposes of any action, claim, suit or
+proceeding between the Parties in connection with any controversy,
+claim, or dispute arising out of or relating to this Agreement; and
+(b) hereby waives, and agrees not to assert by way of motion, as a
+defense or otherwise, in any such action, claim, suit or proceeding,
+any claim that is not personally subject to the jurisdiction of such
+court(s), that the action, claim, suit or proceeding is brought in an
+inconvenient forum or that the venue of the action, claim, suit or
+proceeding is improper.  Notwithstanding the foregoing, nothing in
+this Section 9.6 is intended to, or shall be deemed to, constitute a
+submission or consent to, or selection of, jurisdiction, forum or
+venue for any action for patent infringement, whether or not such
+action relates to this Agreement.
+
+10.7 No Implied License
+
+There are no implied licenses or other implied rights granted under
+this Agreement, and all rights, save for those expressly granted
+hereunder, shall remain with Nokia and its licensors. In addition, no
+licenses or immunities are granted to the combination of the Licensed
+Software with any other software or hardware not delivered by Nokia
+under this Agreement.
+
+10.8 Government End Users
+
+A "U.S. Government End User" shall mean any agency or entity of the
+government of the United States. The following shall apply if Licensee
+is a U.S. Government End User. The Licensed Software is a "commercial
+item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995),
+consisting of "commercial computer software" and "commercial computer
+software documentation," as such terms are used in 48 C.F.R. 12.212
+(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48
+C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government
+End Users acquire the Licensed Software with only those rights set
+forth herein. The Licensed Software (including related documentation)
+is provided to U.S.  Government End Users: (a) only as a commercial
+end item; and (b) only pursuant to this Agreement.
+
+
+
+
+
+TECHNOLOGY PREVIEW LICENSE AGREEMENT: Rest of the World
+Agreement version 2.3
+
+This Technology Preview License Agreement ("Agreement") is a legal
+agreement between Nokia Corporation ("Nokia"), with its registered
+office at Keilalahdentie 4, 02150 Espoo, Finland and you (either an
+individual or a legal entity) ("Licensee") for the Licensed Software
+(as defined below).
+
+1. DEFINITIONS
+
+"Affiliate" of a Party shall mean an entity (i) which is directly or
+indirectly controlling such Party; (ii) which is under the same direct
+or indirect ownership or control as such Party; or (iii) which is
+directly or indirectly owned or controlled by such Party. For these
+purposes, an entity shall be treated as being controlled by another if
+that other entity has fifty percent (50 %) or more of the votes in
+such entity, is able to direct its affairs and/or to control the
+composition of its board of directors or equivalent body.
+
+"Term" shall mean the period of time six (6) months from the later of
+(a) the Effective Date; or (b) the date the Licensed Software was
+initially delivered to Licensee by Nokia. If no specific Effective
+Date is set forth in the Agreement, the Effective Date shall be deemed
+to be the date the Licensed Software was initially delivered to
+Licensee.
+
+"Licensed Software" shall mean the computer software, "online" or
+electronic documentation, associated media and printed materials,
+including the source code, example programs and the documentation
+delivered by Nokia to Licensee in conjunction with this Agreement.
+
+"Party" or "Parties" shall mean Licensee and/or Nokia.
+
+
+2. OWNERSHIP
+
+The Licensed Software is protected by copyright laws and international
+copyright treaties, as well as other intellectual property laws and
+treaties. The Licensed Software is licensed, not sold.
+
+If Licensee provides any findings, proposals, suggestions or other
+feedback ("Feedback") to Nokia regarding the Licensed Software, Nokia
+shall own all right, title and interest including the intellectual
+property rights in and to such Feedback, excluding however any
+existing patent rights of Licensee. To the extent Licensee owns or
+controls any patents for such Feedback Licensee hereby grants to Nokia
+and its Affiliates, a worldwide, perpetual, non-transferable,
+sublicensable, royalty-free license to (i) use, copy and modify
+Feedback and to create derivative works thereof, (ii) to make (and
+have made), use, import, sell, offer for sale, lease, dispose, offer
+for disposal or otherwise exploit any products or services of Nokia
+containing Feedback,, and (iii) sublicense all the foregoing rights to
+third party licensees and customers of Nokia and/or its Affiliates.
+
+
+3. VALIDITY OF THE AGREEMENT
+
+By installing, copying, or otherwise using the Licensed Software,
+Licensee agrees to be bound by the terms of this Agreement. If
+Licensee does not agree to the terms of this Agreement, Licensee may
+not install, copy, or otherwise use the Licensed Software. Upon
+Licensee's acceptance of the terms and conditions of this Agreement,
+Nokia grants Licensee the right to use the Licensed Software in the
+manner provided below.
+
+
+4. LICENSES
+
+4.1 Using and Copying
+
+Nokia grants to Licensee a non-exclusive, non-transferable,
+time-limited license to use and copy the Licensed Software for sole
+purpose of evaluating and testing the Licensed Software during the
+Term.
+
+Licensee may install copies of the Licensed Software on an unlimited
+number of computers provided that (a) if an individual, only such
+individual; or (b) if a legal entity only its employees; use the
+Licensed Software for the authorized purposes.
+
+4.2 No Distribution or Modifications
+
+Licensee may not disclose, modify, sell, market, commercialise,
+distribute, loan, rent, lease, or license the Licensed Software or any
+copy of it or use the Licensed Software for any purpose that is not
+expressly granted in this Section 4. Licensee may not alter or remove
+any details of ownership, copyright, trademark or other property right
+connected with the Licensed Software. Licensee may not distribute any
+software statically or dynamically linked with the Licensed Software.
+
+4.3 No Technical Support
+
+Nokia has no obligation to furnish Licensee with any technical support
+whatsoever. Any such support is subject to separate agreement between
+the Parties.
+
+
+5. PRE-RELEASE CODE
+
+The Licensed Software contains pre-release code that is not at the
+level of performance and compatibility of a final, generally
+available, product offering. The Licensed Software may not operate
+correctly and may be substantially modified prior to the first
+commercial product release, if any. Nokia is not obligated to make
+this or any later version of the Licensed Software commercially
+available. The License Software is "Not for Commercial Use" and may
+only be used for the purposes described in Section 4. The Licensed
+Software may not be used in a live operating environment where it may
+be relied upon to perform in the same manner as a commercially
+released product or with data that has not been sufficiently backed
+up.
+
+
+6. THIRD PARTY SOFTWARE
+
+The Licensed Software may provide links to third party libraries or
+code (collectively "Third Party Software") to implement various
+functions.  Third Party Software does not comprise part of the
+Licensed Software. In some cases, access to Third Party Software may
+be included along with the Licensed Software delivery as a convenience
+for development and testing only. Such source code and libraries may
+be listed in the ".../src/3rdparty" source tree delivered with the
+Licensed Software or documented in the Licensed Software where the
+Third Party Software is used, as may be amended from time to time, do
+not comprise the Licensed Software. Licensee acknowledges (1) that
+some part of Third Party Software may require additional licensing of
+copyright and patents from the owners of such, and (2) that
+distribution of any of the Licensed Software referencing any portion
+of a Third Party Software may require appropriate licensing from such
+third parties.
+
+
+7. LIMITED WARRANTY AND WARRANTY DISCLAIMER
+
+The Licensed Software is licensed to Licensee "as is". To the maximum
+extent permitted by applicable law, Nokia on behalf of itself and its
+suppliers, disclaims all warranties and conditions, either express or
+implied, including, but not limited to, implied warranties of
+merchantability, fitness for a particular purpose, title and
+non-infringement with regard to the Licensed Software.
+
+
+8. LIMITATION OF LIABILITY
+
+If, Nokia's warranty disclaimer notwithstanding, Nokia is held liable
+to Licensee, whether in contract, tort or any other legal theory,
+based on the Licensed Software, Nokia's entire liability to Licensee
+and Licensee's exclusive remedy shall be, at Nokia's option, either
+(A) return of the price Licensee paid for the Licensed Software, or
+(B) repair or replacement of the Licensed Software, provided Licensee
+returns to Nokia all copies of the Licensed Software as originally
+delivered to Licensee. Nokia shall not under any circumstances be
+liable to Licensee based on failure of the Licensed Software if the
+failure resulted from accident, abuse or misapplication, nor shall
+Nokia under any circumstances be liable for special damages, punitive
+or exemplary damages, damages for loss of profits or interruption of
+business or for loss or corruption of data. Any award of damages from
+Nokia to Licensee shall not exceed the total amount Licensee has paid
+to Nokia in connection with this Agreement.
+
+
+9. CONFIDENTIALITY
+
+Each party acknowledges that during the Term of this Agreement it
+shall have access to information about the other party's business,
+business methods, business plans, customers, business relations,
+technology, and other information, including the terms of this
+Agreement, that is confidential and of great value to the other party,
+and the value of which would be significantly reduced if disclosed to
+third parties (the "Confidential Information"). Accordingly, when a
+party (the "Receiving Party") receives Confidential Information from
+another party (the "Disclosing Party"), the Receiving Party shall, and
+shall obligate its employees and agents and employees and agents of
+its Affiliates to: (i) maintain the Confidential Information in strict
+confidence; (ii) not disclose the Confidential Information to a third
+party without the Disclosing Party's prior written approval; and (iii)
+not, directly or indirectly, use the Confidential Information for any
+purpose other than for exercising its rights and fulfilling its
+responsibilities pursuant to this Agreement. Each party shall take
+reasonable measures to protect the Confidential Information of the
+other party, which measures shall not be less than the measures taken
+by such party to protect its own confidential and proprietary
+information.
+
+"Confidential Information" shall not include information that (a) is
+or becomes generally known to the public through no act or omission of
+the Receiving Party; (b) was in the Receiving Party's lawful
+possession prior to the disclosure hereunder and was not subject to
+limitations on disclosure or use; (c) is developed by the Receiving
+Party without access to the Confidential Information of the Disclosing
+Party or by persons who have not had access to the Confidential
+Information of the Disclosing Party as proven by the written records
+of the Receiving Party; (d) is lawfully disclosed to the Receiving
+Party without restrictions, by a third party not under an obligation
+of confidentiality; or (e) the Receiving Party is legally compelled to
+disclose the information, in which case the Receiving Party shall
+assert the privileged and confidential nature of the information and
+cooperate fully with the Disclosing Party to protect against and
+prevent disclosure of any Confidential Information and to limit the
+scope of disclosure and the dissemination of disclosed Confidential
+Information by all legally available means.
+
+The obligations of the Receiving Party under this Section shall
+continue during the Initial Term and for a period of five (5) years
+after expiration or termination of this Agreement. To the extent that
+the terms of the Non-Disclosure Agreement between Nokia and Licensee
+conflict with the terms of this Section 8, this Section 8 shall be
+controlling over the terms of the Non-Disclosure Agreement.
+
+
+10. GENERAL PROVISIONS
+
+10.1 No Assignment
+
+Licensee shall not be entitled to assign or transfer all or any of its
+rights, benefits and obligations under this Agreement without the
+prior written consent of Nokia, which shall not be unreasonably
+withheld.
+
+10.2 Termination
+
+Nokia may terminate the Agreement at any time immediately upon written
+notice by Nokia to Licensee if Licensee breaches this Agreement.
+
+Upon termination of this Agreement, Licensee shall return to Nokia all
+copies of Licensed Software that were supplied by Nokia. All other
+copies of Licensed Software in the possession or control of Licensee
+must be erased or destroyed. An officer of Licensee must promptly
+deliver to Nokia a written confirmation that this has occurred.
+
+10.3 Surviving Sections
+
+Any terms and conditions that by their nature or otherwise reasonably
+should survive a cancellation or termination of this Agreement shall
+also be deemed to survive. Such terms and conditions include, but are
+not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3,
+10.4, 10.5, 10.6, 10.7, and 10.8 of this Agreement.
+
+10.4 Entire Agreement
+
+This Agreement constitutes the complete agreement between the parties
+and supersedes all prior or contemporaneous discussions,
+representations, and proposals, written or oral, with respect to the
+subject matters discussed herein, with the exception of the
+non-disclosure agreement executed by the parties in connection with
+this Agreement ("Non-Disclosure Agreement"), if any, shall be subject
+to Section 8. No modification of this Agreement shall be effective
+unless contained in a writing executed by an authorized representative
+of each party. No term or condition contained in Licensee's purchase
+order shall apply unless expressly accepted by Nokia in writing. If
+any provision of the Agreement is found void or unenforceable, the
+remainder shall remain valid and enforceable according to its
+terms. If any remedy provided is determined to have failed for its
+essential purpose, all limitations of liability and exclusions of
+damages set forth in this Agreement shall remain in effect.
+
+10.5 Export Control
+
+Licensee acknowledges that the Licensed Software may be subject to
+export control restrictions of various countries. Licensee shall fully
+comply with all applicable export license restrictions and
+requirements as well as with all laws and regulations relating to the
+importation of the Licensed Software and shall procure all necessary
+governmental authorizations, including without limitation, all
+necessary licenses, approvals, permissions or consents, where
+necessary for the re-exportation of the Licensed Software.,
+
+10.6 Governing Law and Legal Venue
+
+This Agreement shall be construed and interpreted in accordance with
+the laws of Finland, excluding its choice of law provisions. Any
+disputes arising out of or relating to this Agreement shall be
+resolved in arbitration under the Rules of Arbitration of the Chamber
+of Commerce of Helsinki, Finland. The arbitration tribunal shall
+consist of one (1), or if either Party so requires, of three (3),
+arbitrators. The award shall be final and binding and enforceable in
+any court of competent jurisdiction. The arbitration shall be held in
+Helsinki, Finland and the process shall be conducted in the English
+language.
+
+10.7 No Implied License
+
+There are no implied licenses or other implied rights granted under
+this Agreement, and all rights, save for those expressly granted
+hereunder, shall remain with Nokia and its licensors. In addition, no
+licenses or immunities are granted to the combination of the Licensed
+Software with any other software or hardware not delivered by Nokia
+under this Agreement.
+
+10.8 Government End Users
+
+A "U.S. Government End User" shall mean any agency or entity of the
+government of the United States. The following shall apply if Licensee
+is a U.S. Government End User. The Licensed Software is a "commercial
+item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995),
+consisting of "commercial computer software" and "commercial computer
+software documentation," as such terms are used in 48 C.F.R. 12.212
+(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48
+C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government
+End Users acquire the Licensed Software with only those rights set
+forth herein. The Licensed Software (including related documentation)
+is provided to U.S.  Government End Users: (a) only as a commercial
+end item; and (b) only pursuant to this Agreement.
+
+
+
+
diff --git a/bin/findtr b/bin/findtr
new file mode 100755
index 0000000000..7df332522c
--- /dev/null
+++ b/bin/findtr
@@ -0,0 +1,189 @@
+#!/usr/bin/perl -w
+# vi:wrap:
+
+# See Qt I18N documentation for usage information.
+
+use POSIX qw(strftime);
+
+$projectid='PROJECT VERSION';
+$datetime = strftime "%Y-%m-%d %X %Z", localtime;
+$charset='iso-8859-1';
+$translator='FULLNAME <EMAIL@ADDRESS>';
+$revision_date='YYYY-MM-DD';
+
+$real_mark = "tr";
+$noop_mark = "QT_TR_NOOP";
+$scoped_mark = "qApp->translate";
+$noop_scoped_mark = "QT_TRANSLATE_NOOP";
+
+$header=
+'# This is a Qt message file in .po format.  Each msgid starts with
+# a scope.  This scope should *NOT* be translated - eg. translating
+# from French to English, "Foo::Bar" would be translated to "Pub",
+# not "Foo::Pub".
+msgid ""
+msgstr ""
+"Project-Id-Version: '.$projectid.'\n"
+"POT-Creation-Date: '.$datetime.'\n"
+"PO-Revision-Date: '.$revision_date.'\n"
+"Last-Translator: '.$translator.'\n"
+"Content-Type: text/plain; charset='.$charset.'\n"
+
+';
+
+
+
+
+$scope = "";
+
+if ( $#ARGV < 0 ) {
+    print STDERR "Usage:  findtr sourcefile ...  >project.po\n";
+    exit 1;
+}
+
+
+sub outmsg {
+    my ($file, $line, $scope, $msgid) = @_;
+    # unesc
+    $msgid =~ s/$esc:$esc:$esc/::/gs;
+    $msgid =~ s|$esc/$esc/$esc|//|gs;
+
+    # Remove blank lines
+    $msgid =~ s/\n\n+/\n/gs;
+    $msgid = "\"\"\n$msgid" if $msgid =~ /\n/s;
+    print "#: $file:$line\n";
+    $msgid =~ s/^"//; #"emacs bug
+    print "msgid \"${scope}::$msgid\n";
+    #print "msgstr \"$msgid\n";
+    print "msgstr \"\"\n";
+    print "\n";
+}
+
+sub justlines {
+    my $l = @_;
+    $l =~ tr|\n||dc;
+    return $l;
+}
+
+print $header;
+
+
+foreach $file ( @ARGV ) {
+    next unless open( I, "< $file" );
+
+    $source = join( "", <I> );
+
+    # Find esc. Avoid bad case 1/// -> 1/1/1/1 -> ///1
+    $esc = 1;
+    while ( $source =~ m!(?:$esc/$esc/$esc)|(?:$esc///)
+	    |(?:$esc:$esc:$esc)|(?:$esc:\:\:)! ) {
+	$esc++;
+    }
+
+    # Hide quoted :: in practically all strings
+    $source =~ s/\"([^"\n]*)::([^"\n]*)\"/\"$1$esc:$esc:$esc$2\"/g;
+
+    # Hide quoted // in practically all strings
+    $source =~ s|\"([^"\n]*)//([^"\n]*)\"|\"$1$esc/$esc/$esc$2\"|g;
+
+
+    # strip comments -- does not handle "/*" in strings
+    while( $source =~ s|/\*(.*?)\*/|justlines($1)|ges ) { }
+    while( $source =~ s|//(.*?)\n|\n|g ) { }
+
+    while( $source =~ /
+	    (?:
+		# Some doublequotes are "escaped" to help vim syntax highlight
+
+		# $1 = scope; $2 = parameters etc.
+		(?:
+		    # Scoped function name ($1 is scope).
+		    (\w+)::(?:\w+)
+		    \s*
+		    # Parameters etc up to open-curly - no semicolons
+		    \(([^();]*)\)
+		    \s*
+		    (?:\{|:)
+		)
+	      |
+		# $3 - one-argument msgid
+		(?:\b
+		    # One of the marks
+		    (?:$real_mark|$noop_mark)
+		    \s*
+		    # The parameter
+		    \(\s*((?:"(?:[^"]|[^\\]\\")*"\s*)+)\)
+		)
+	      |
+		# $4,$5 - two-argument msgid
+		(?:\b
+		    # One of the scoped marks
+		    (?:$scoped_mark|$noop_scoped_mark)
+		    \s*
+		    # The parameters
+		    \(
+			# The scope parameter
+			\s*"([^\"]*)"
+			\s*,\s*
+			# The msgid parameter
+			\s*((?:\"(?:[^"]|[^\\]\\")*"\s*)+) #"emacs
+		    \)
+		)
+	      |
+		# $6,$7 - scoped one-argument msgid
+		(?:\b
+		    # The scope
+		    (\w+)::
+		    # One of the marks
+		    (?:$real_mark)
+		    \s*
+		    # The parameter
+		    \(\s*((?:"(?:[^"]|[^\\]\\")*"\s*)+)\)
+		)
+	    )/gsx )
+    {
+	@lines = split /^/m, "$`";
+	$line = @lines;
+	if ( defined( $1 ) ) {
+	    if ( $scope ne $1 ) {
+		$sc=$1;
+		$etc=$2;
+		# remove strings
+		$etc =~ s/"(?:[^"]|[^\\]\\")"//g;
+		# count ( and )
+		@open = split /\(/m, $etc;
+		@close = split /\)/m, $etc;
+		if ( $#open == $#close ) {
+		    $scope = $sc;
+		}
+	    }
+	    next;
+	}
+
+       	if ( defined( $3 ) ) {
+	    $this_scope = $scope;
+	    $msgid = $3;
+	} elsif ( defined( $4 ) ) {
+	    $this_scope = $4;
+	    $msgid = $5;
+	} elsif ( defined( $6 ) ) {
+	    $this_scope = $6;
+	    $msgid = $7;
+	} else {
+	    next;
+	}
+
+	$msgid =~ s/^\s*//;
+	$msgid =~ s/\s*$//;
+
+	# Might still be non-unique eg. tr("A" "B")  vs.  tr("A"  "B").
+
+	$location{"${this_scope}::${msgid}"} = "$file:$line";
+    }
+}
+
+for $scoped_msgid ( sort keys %location ) {
+    ($scope,$msgid) = $scoped_msgid =~ m/([^:]*)::(.*)/s;
+    ($file,$line) = $location{$scoped_msgid} =~ m/([^:]*):(.*)/s;
+    outmsg($file,$line,$scope,$msgid);
+}
diff --git a/bin/setcepaths.bat b/bin/setcepaths.bat
new file mode 100755
index 0000000000..5e04526597
--- /dev/null
+++ b/bin/setcepaths.bat
@@ -0,0 +1,113 @@
+@echo off
+IF "%1" EQU "wincewm50pocket-msvc2005" (
+checksdk.exe -sdk "Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Windows Mobile 5.01 for Pocket PC selected, environment is set up
+) ELSE IF "%1" EQU "wincewm50smart-msvc2005" (
+checksdk.exe -sdk "Windows Mobile 5.0 Smartphone SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Windows Mobile 5.01 for Smartphone for arm selected, environment is set up
+) ELSE IF "%1" EQU "wince50standard-x86-msvc2005" (
+checksdk.exe -sdk "STANDARDSDK_500 (x86)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Standard SDK selected, environment is set up
+) ELSE IF "%1" EQU "wince50standard-armv4i-msvc2005" (
+checksdk.exe -sdk "STANDARDSDK_500 (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Standard SDK for arm selected, environment is set up
+) ELSE IF "%1" EQU "wince50standard-mipsii-msvc2005" (
+checksdk.exe -sdk "STANDARDSDK_500 (MIPSII)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Standard SDK for mips-ii selected, environment is set up
+) ELSE IF "%1" EQU "wince50standard-mipsiv-msvc2005" (
+checksdk.exe -sdk "STANDARDSDK_500 (MIPSIV)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Standard SDK for mips-iv selected, environment is set up
+) ELSE IF "%1" EQU "wince50standard-sh4-msvc2005" (
+checksdk.exe -sdk "STANDARDSDK_500 (SH4)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Standard SDK for sh4 selected, environment is set up
+) ELSE IF "%1" EQU "wincewm60professional-msvc2005" (
+checksdk.exe -sdk "Windows Mobile 6 Professional SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Windows Mobile 6 Professional selected, environment is set up
+) ELSE IF "%1" EQU "wincewm60standard-msvc2005" (
+checksdk.exe -sdk "Windows Mobile 6 Standard SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Windows Mobile 6 Standard selected, environment is set up
+) ELSE IF "%1" EQU "wincewm50pocket-msvc2008" (
+checksdk.exe -sdk "Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Windows Mobile 5.01 for Pocket PC selected, environment is set up
+) ELSE IF "%1" EQU "wincewm50smart-msvc2008" (
+checksdk.exe -sdk "Windows Mobile 5.0 Smartphone SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Windows Mobile 5.01 for Smartphone for arm selected, environment is set up
+) ELSE IF "%1" EQU "wince50standard-x86-msvc2008" (
+checksdk.exe -sdk "STANDARDSDK_500 (x86)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Standard SDK selected, environment is set up
+) ELSE IF "%1" EQU "wince50standard-armv4i-msvc2008" (
+checksdk.exe -sdk "STANDARDSDK_500 (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Standard SDK for arm selected, environment is set up
+) ELSE IF "%1" EQU "wince50standard-mipsii-msvc2008" (
+checksdk.exe -sdk "STANDARDSDK_500 (MIPSII)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Standard SDK for mips-ii selected, environment is set up
+) ELSE IF "%1" EQU "wince50standard-mipsiv-msvc2008" (
+checksdk.exe -sdk "STANDARDSDK_500 (MIPSIV)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Standard SDK for mips-iv selected, environment is set up
+) ELSE IF "%1" EQU "wince50standard-sh4-msvc2008" (
+checksdk.exe -sdk "STANDARDSDK_500 (SH4)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Standard SDK for sh4 selected, environment is set up
+) ELSE IF "%1" EQU "wincewm60professional-msvc2008" (
+checksdk.exe -sdk "Windows Mobile 6 Professional SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Windows Mobile 6 Professional selected, environment is set up
+) ELSE IF "%1" EQU "wincewm60standard-msvc2008" (
+checksdk.exe -sdk "Windows Mobile 6 Standard SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Windows Mobile 6 Standard selected, environment is set up
+) ELSE (
+echo no SDK to build Windows CE selected
+echo.
+echo Current choices are:
+echo   wincewm50pocket-msvc2005        - SDK for Windows Mobile 5.01 PocketPC
+echo   wincewm50smart-msvc2005         - SDK for Windows Mobile 5.01 Smartphone
+echo   wince50standard-x86-msvc2005    - Build for the WinCE standard SDK 5.0
+echo                                     with x86 platform preset
+echo   wince50standard-armv4i-msvc2005 - Build for the WinCE standard SDK 5.0
+echo                                     with armv4i platform preset
+echo   wince50standard-mipsiv-msvc2005 - Build for the WinCE standard SDK 5.0
+echo                                     with mips platform preset
+echo   wince50standard-sh4-msvc2005    - Build for the WinCE standard SDK 5.0
+echo                                     with sh4 platform preset
+echo   wincewm60professional-msvc2005  - SDK for Windows Mobile 6 professional
+echo   wincewm60standard-msvc2005      - SDK for Windows Mobile 6 Standard
+echo and the corresponding versions for msvc2008.
+echo.
+)
+
+
+
diff --git a/bin/syncqt b/bin/syncqt
new file mode 100755
index 0000000000..7a9f1d3ad0
--- /dev/null
+++ b/bin/syncqt
@@ -0,0 +1,1049 @@
+#!/usr/bin/perl -w
+######################################################################
+#
+# Synchronizes Qt header files - internal Trolltech tool.
+#
+# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Contact: Qt Software Information (qt-info@nokia.com)
+#
+######################################################################
+
+# use packages -------------------------------------------------------
+use File::Basename;
+use File::Path;
+use Cwd;
+use Config;
+use strict;
+
+die "syncqt: QTDIR not defined" if ! $ENV{"QTDIR"}; # sanity check
+
+# global variables
+my $isunix = 0;
+my $basedir = $ENV{"QTDIR"};
+$basedir =~ s=\\=/=g;
+my %modules = ( # path to module name map
+        "QtGui" => "$basedir/src/gui",
+        "QtOpenGL" => "$basedir/src/opengl",
+        "QtCore" => "$basedir/src/corelib",
+        "QtXml" => "$basedir/src/xml",
+        "QtXmlPatterns" => "$basedir/src/xmlpatterns",
+        "QtSql" => "$basedir/src/sql",
+        "QtNetwork" => "$basedir/src/network",
+        "QtSvg" => "$basedir/src/svg",
+        "QtScript" => "$basedir/src/script",
+        "QtScriptTools" => "$basedir/src/scripttools",
+        "Qt3Support" => "$basedir/src/qt3support",
+        "ActiveQt" => "$basedir/src/activeqt/container;$basedir/src/activeqt/control;$basedir/src/activeqt/shared",
+        "QtTest" => "$basedir/src/testlib",
+        "QtAssistant" => "$basedir/tools/assistant/compat/lib",
+        "QtHelp" => "$basedir/tools/assistant/lib",
+        "QtDesigner" => "$basedir/tools/designer/src/lib",
+        "QtUiTools" => "$basedir/tools/designer/src/uitools",
+        "QtDBus" => "$basedir/src/dbus",
+        "QtWebKit" => "$basedir/src/3rdparty/webkit/WebCore",
+        "phonon" => "$basedir/src/phonon",
+);
+my %moduleheaders = ( # restrict the module headers to those found in relative path
+        "QtWebKit" => "../WebKit/qt/Api",
+        "phonon" => "../3rdparty/phonon/phonon",
+);
+
+#$modules{"QtCore"} .= ";$basedir/mkspecs/" . $ENV{"MKSPEC"} if defined $ENV{"MKSPEC"};
+
+# global variables (modified by options)
+my $module = 0;
+my $showonly = 0;
+my $remove_stale = 1;
+my $force_win = 0;
+my $force_relative = 0;
+my $check_includes = 0;
+my $copy_headers = 0;
+my @modules_to_sync ;
+$force_relative = 1 if ( -d "/System/Library/Frameworks" );
+my $out_basedir = $basedir;
+$out_basedir =~ s=\\=/=g;
+
+# functions ----------------------------------------------------------
+
+######################################################################
+# Syntax:  showUsage()
+# Params:  -none-
+#
+# Purpose: Show the usage of the script.
+# Returns: -none-
+######################################################################
+sub showUsage
+{
+    print "$0 usage:\n";
+    print "  -copy                 Copy headers instead of include-fwd(default: " . ($copy_headers ? "yes" : "no") . ")\n";
+    print "  -remove-stale         Removes stale headers              (default: " . ($remove_stale ? "yes" : "no") . ")\n";
+    print "  -relative             Force relative symlinks            (default: " . ($force_relative ? "yes" : "no") . ")\n";
+    print "  -windows              Force platform to Windows          (default: " . ($force_win ? "yes" : "no") . ")\n";
+    print "  -showonly             Show action but not perform        (default: " . ($showonly ? "yes" : "no") . ")\n";
+    print "  -outdir <PATH>        Specify output directory for sync  (default: $out_basedir)\n";
+    print "  -help                 This help\n";
+    exit 0;
+}
+
+######################################################################
+# Syntax:  checkUnix()
+# Params:  -none-
+#
+# Purpose: Check if script runs on a Unix system or not. Cygwin
+#          systems are _not_ detected as Unix systems.
+# Returns: 1 if a unix system, else 0.
+######################################################################
+sub checkUnix {
+    my ($r) = 0;
+    if ( $force_win != 0) {
+        return 0;
+    } elsif ( -f "/bin/uname" ) {
+        $r = 1;
+        (-f "\\bin\\uname") && ($r = 0);
+    } elsif ( -f "/usr/bin/uname" ) {
+        $r = 1;
+        (-f "\\usr\\bin\\uname") && ($r = 0);
+    }
+    if($r) {
+        $_ = $Config{'osname'};
+        $r = 0 if( /(ms)|(cyg)win/i );
+    }
+    return $r;
+}
+
+sub checkRelative {
+    my ($dir) = @_;
+    return 0 if($dir =~ /^\//);
+    return 0 if(!checkUnix() && $dir =~ /[a-zA-Z]:[\/\\]/);
+    return 1;
+}
+
+######################################################################
+# Syntax:  shouldMasterInclude(iheader)
+# Params:  iheader, string, filename to verify inclusion
+#
+# Purpose: Determines if header should be in the master include file.
+# Returns: 0 if file contains "#pragma qt_no_master_include" or not
+#          able to open, else 1.
+######################################################################
+sub shouldMasterInclude {
+    my ($iheader) = @_;
+    return 0 if(basename($iheader) =~ /_/);
+    return 0 if(basename($iheader) =~ /qconfig/);
+    if(open(F, "<$iheader")) {
+        while(<F>) {
+	    chomp;
+	    return 0 if(/^\#pragma qt_no_master_include$/);
+	}
+	close(F);
+    } else {
+	return 0;
+    }
+    return 1;
+}
+
+######################################################################
+# Syntax:  classNames(iheader)
+# Params:  iheader, string, filename to parse for classname "symlinks"
+#
+# Purpose: Scans through iheader to find all classnames that should be
+#          synced into library's include structure.
+# Returns: List of all class names in a file.
+######################################################################
+sub classNames {
+    my @ret;
+    my ($iheader) = @_;
+    if(basename($iheader) eq "qglobal.h") {
+	push @ret, "QtGlobal";
+    } elsif(basename($iheader) eq "qendian.h") {
+	push @ret, "QtEndian";
+    } elsif(basename($iheader) eq "qconfig.h") {
+        push @ret, "QtConfig";
+    } elsif(basename($iheader) eq "qplugin.h") {
+	push @ret, "QtPlugin";
+    } elsif(basename($iheader) eq "qalgorithms.h") {
+	push @ret, "QtAlgorithms";
+    } elsif(basename($iheader) eq "qcontainerfwd.h") {
+	push @ret, "QtContainerFwd";
+    } elsif(basename($iheader) eq "qdebug.h") {
+        push @ret, "QtDebug";
+    } elsif(basename($iheader) eq "qevent.h") {
+        push @ret, "QtEvents";
+    } elsif(basename($iheader) eq "qnamespace.h") {
+        push @ret, "Qt"
+    } elsif(basename($iheader) eq "qssl.h") {
+	push @ret, "QSsl";
+    } elsif(basename($iheader) eq "qtest.h") {
+        push @ret, "QTest"
+    } elsif(basename($iheader) eq "qtconcurrentmap.h") {
+        push @ret, "QtConcurrentMap"
+    } elsif(basename($iheader) eq "qtconcurrentfilter.h") {
+        push @ret, "QtConcurrentFilter"
+    } elsif(basename($iheader) eq "qtconcurrentrun.h") {
+        push @ret, "QtConcurrentRun"
+    }
+
+    my $parsable = "";
+    if(open(F, "<$iheader")) {
+        while(<F>) {
+            my $line = $_;
+            chomp $line;
+			chop $line if ($line =~ /\r$/);
+            if($line =~ /^\#/) {
+                if($line =~ /\\$/) {
+                    while($line = <F>) {
+                        chomp $line;
+                        last unless($line =~ /\\$/);
+                    }
+                }
+		return @ret if($line =~ m/^#pragma qt_sync_stop_processing/);
+                push(@ret, "$1") if($line =~ m/^#pragma qt_class\(([^)]*)\)[\r\n]*$/);
+		$line = 0;
+            }
+	    if($line) {
+                $line =~ s,//.*$,,; #remove c++ comments
+	        $line .= ";" if($line =~ m/^Q_[A-Z_]*\(.*\)[\r\n]*$/); #qt macro
+	        $line .= ";" if($line =~ m/^QT_(BEGIN|END)_HEADER[\r\n]*$/); #qt macro
+	        $line .= ";" if($line =~ m/^QT_(BEGIN|END)_NAMESPACE[\r\n]*$/); #qt macro
+	        $line .= ";" if($line =~ m/^QT_MODULE\(.*\)[\r\n]*$/); # QT_MODULE macro
+                $parsable .= " " . $line;
+	    }
+        }
+        close(F);
+    }
+
+    my $last_definition = 0;
+    my @namespaces;
+    for(my $i = 0; $i < length($parsable); $i++) {
+        my $definition = 0;
+        my $character = substr($parsable, $i, 1);
+        if($character eq "/" && substr($parsable, $i+1, 1) eq "*") { #I parse like this for greedy reasons
+            for($i+=2; $i < length($parsable); $i++) {
+                my $end = substr($parsable, $i, 2);
+                if($end eq "*/") {
+                    $last_definition = $i+2;
+                    $i++;
+                    last;
+                }
+            }
+        } elsif($character eq "{") {
+            my $brace_depth = 1;
+            my $block_start = $i + 1;
+          BLOCK: for($i+=1; $i < length($parsable); $i++) {
+              my $ignore = substr($parsable, $i, 1);
+              if($ignore eq "{") {
+                  $brace_depth++;
+              } elsif($ignore eq "}") {
+                  $brace_depth--;
+                  unless($brace_depth) {
+                      for(my $i2 = $i+1; $i2 < length($parsable); $i2++) {
+                          my $end = substr($parsable, $i2, 1);
+                          if($end eq ";" || $end ne " ") {
+                              $definition = substr($parsable, $last_definition, $block_start - $last_definition) . "}";
+                              $i = $i2 if($end eq ";");
+                              $last_definition = $i + 1;
+                              last BLOCK;
+			  }
+                      }
+                  }
+              }
+          }
+        } elsif($character eq ";") {
+            $definition = substr($parsable, $last_definition, $i - $last_definition + 1);
+            $last_definition = $i + 1;
+	} elsif($character eq "}") {
+	    # a naked } must be a namespace ending
+	    # if it's not a namespace, it's eaten by the loop above
+	    pop @namespaces;
+	    $last_definition = $i + 1;
+	}
+
+	if (substr($parsable, $last_definition, $i - $last_definition + 1) =~ m/ namespace ([^ ]*) /
+	    && substr($parsable, $i+1, 1) eq "{") {
+	    push @namespaces, $1;
+
+	    # Eat the opening { so that the condensing loop above doesn't see it
+	    $i++;
+	    $last_definition = $i + 1;
+	}
+
+        if($definition) {
+	    $definition =~ s=[\n\r]==g;
+            my @symbols;
+            if($definition =~ m/^ *typedef *.*\(\*([^\)]*)\)\(.*\);$/) {
+		push @symbols, $1;
+            } elsif($definition =~ m/^ *typedef +(.*) +([^ ]*);$/) {
+		push @symbols, $2;
+            } elsif($definition =~ m/^ *(template *<.*> *)?(class|struct) +([^ ]* +)?([^<\s]+) ?(<[^>]*> ?)?\s*((,|:)\s*(public|protected|private) *.*)? *\{\}$/) {
+		push @symbols, $4;
+            } elsif($definition =~ m/^ *Q_DECLARE_.*ITERATOR\((.*)\);$/) {
+		push @symbols, "Q" . $1 . "Iterator";
+		push @symbols, "QMutable" . $1 . "Iterator";
+	    }
+
+	    foreach (@symbols) {
+		my $symbol = $_;
+		$symbol = (join("::", @namespaces) . "::" . $symbol) if (scalar @namespaces);
+		push @ret, $symbol
+		    if ($symbol =~ /^Q[^:]*$/		# no-namespace, starting with Q
+			|| $symbol =~ /^Phonon::/);	# or in the Phonon namespace
+            }
+        }
+    }
+    return @ret;
+}
+
+######################################################################
+# Syntax:  syncHeader(header, iheader, copy)
+# Params:  header, string, filename to create "symlink" for
+#          iheader, string, destination name of symlink
+#          copy, forces header to be a copy of iheader
+#
+# Purpose: Syncronizes header to iheader
+# Returns: 1 if successful, else 0.
+######################################################################
+sub syncHeader {
+    my ($header, $iheader, $copy) = @_;
+    $iheader =~ s=\\=/=g;
+    $header =~ s=\\=/=g;
+    return copyFile($iheader, $header) if($copy);
+
+    my $iheader_no_basedir = $iheader;
+    $iheader_no_basedir =~ s,^$basedir/?,,;
+    unless(-e "$header") {
+        my $header_dir = dirname($header);
+        mkpath $header_dir, 0777;
+
+        #write it
+        my $iheader_out = fixPaths($iheader, $header_dir);
+        open HEADER, ">$header" || die "Could not open $header for writing!\n";
+        print HEADER "#include \"$iheader_out\"\n";
+        close HEADER;
+        return 1;
+    }
+    return 0;
+}
+
+######################################################################
+# Syntax:  fixPaths(file, dir)
+# Params:  file, string, filepath to be made relative to dir
+#          dir, string, dirpath for point of origin
+#
+# Purpose: file is made relative (if possible) of dir.
+# Returns: String with the above applied conversion.
+######################################################################
+sub fixPaths {
+    my ($file, $dir) = @_;
+    $dir =~ s=^$basedir/=$out_basedir/= if(!($basedir eq $out_basedir));
+    $file =~ s=\\=/=g;
+    $file =~ s/\+/\\+/g;
+    $dir =~ s=\\=/=g;
+    $dir =~ s/\+/\\+/g;
+
+    #setup
+    my $ret = $file;
+    my $file_dir = dirname($file);
+    if($file_dir eq ".") {
+        $file_dir = getcwd();
+        $file_dir =~ s=\\=/=g;
+    }
+    $file_dir =~ s,/cygdrive/([a-zA-Z])/,$1:,g;
+    if($dir eq ".") {
+        $dir = getcwd();
+        $dir =~ s=\\=/=g;
+    }
+    $dir =~ s,/cygdrive/([a-zA-Z])/,$1:/,g;
+    return basename($file) if("$file_dir" eq "$dir");
+
+    #guts
+    my $match_dir = 0;
+    for(my $i = 1; $i < length($file_dir); $i++) {
+        my $slash = index($file_dir, "/", $i);
+        last if($slash == -1);
+        my $tmp = substr($file_dir, 0, $slash);
+        last unless($dir =~ m,^$tmp/,);
+        $match_dir = $tmp;
+        $i = $slash;
+    }
+    if($match_dir) {
+        my $after = substr($dir, length($match_dir));
+        my $count = ($after =~ tr,/,,);
+        my $dots = "";
+        for(my $i = 0; $i < $count; $i++) {
+            $dots .= "../";
+        }
+        $ret =~ s,^$match_dir,$dots,;
+    }
+    $ret =~ s,/+,/,g;
+    return $ret;
+}
+
+######################################################################
+# Syntax:  fileContents(filename)
+# Params:  filename, string, filename of file to return contents
+#
+# Purpose: Get the contents of a file.
+# Returns: String with contents of the file, or empty string if file
+#          doens't exist.
+# Warning: Dies if it does exist but script cannot get read access.
+######################################################################
+sub fileContents {
+    my ($filename) = @_;
+    my $filecontents = "";
+    if (-e $filename) {
+        open(I, "< $filename") || die "Could not open $filename for reading, read block?";
+        local $/;
+        binmode I;
+        $filecontents = <I>;
+        close I;
+    }
+    return $filecontents;
+}
+
+######################################################################
+# Syntax:  fileCompare(file1, file2)
+# Params:  file1, string, filename of first file
+#          file2, string, filename of second file
+#
+# Purpose: Determines if files are equal, and which one is newer.
+# Returns: 0 if files are equal no matter the timestamp, -1 if file1
+#          is newer, 1 if file2 is newer.
+######################################################################
+sub fileCompare {
+    my ($file1, $file2) = @_;
+    my $file1contents = fileContents($file1);
+    my $file2contents = fileContents($file2);
+    if (! -e $file1) { return 1; }
+    if (! -e $file2) { return -1; }
+    return $file1contents ne $file2contents ? (stat("$file2"))[9] <=> (stat("$file1"))[9] : 0;
+}
+
+######################################################################
+# Syntax:  copyFile(file, ifile)
+# Params:  file, string, filename to create duplicate for
+#          ifile, string, destination name of duplicate
+#
+# Purpose: Keeps files in sync so changes in the newer file will be
+#          written to the other.
+# Returns: 1 if files were synced, else 0.
+# Warning: Dies if script cannot get write access.
+######################################################################
+sub copyFile
+{
+    my ($file,$ifile, $copy,$knowdiff,$filecontents,$ifilecontents) = @_;
+    # Bi-directional synchronization
+    open( I, "< " . $file ) || die "Could not open $file for reading";
+    local $/;
+    binmode I;
+    $filecontents = <I>;
+    close I;
+    if ( open(I, "< " . $ifile) ) {
+	local $/;
+	binmode I;
+	$ifilecontents = <I>;
+	close I;
+	$copy = fileCompare($file, $ifile);
+	$knowdiff = 0,
+    } else {
+	$copy = -1;
+	$knowdiff = 1;
+    }
+
+    if ( $knowdiff || ($filecontents ne $ifilecontents) ) {
+	if ( $copy > 0 ) {
+	    my $file_dir = dirname($file);
+	    mkpath $file_dir, 0777 unless(-e "$file_dir");
+	    open(O, "> " . $file) || die "Could not open $file for writing (no write permission?)";
+	    local $/;
+	    binmode O;
+	    print O $ifilecontents;
+	    close O;
+	    return 1;
+	} elsif ( $copy < 0 ) {
+	    my $ifile_dir = dirname($ifile);
+	    mkpath $ifile_dir, 0777 unless(-e "$ifile_dir");
+	    open(O, "> " . $ifile) || die "Could not open $ifile for writing (no write permission?)";
+	    local $/;
+	    binmode O;
+	    print O $filecontents;
+	    close O;
+	    return 1;
+	}
+    }
+    return 0;
+}
+
+######################################################################
+# Syntax:  symlinkFile(file, ifile)
+# Params:  file, string, filename to create "symlink" for
+#          ifile, string, destination name of symlink
+#
+# Purpose: File is symlinked to ifile (or copied if filesystem doesn't
+#          support symlink).
+# Returns: 1 on success, else 0.
+######################################################################
+sub symlinkFile
+{
+    my ($file,$ifile) = @_;
+
+    if ($isunix) {
+        print "symlink created for $file ";
+        if ( $force_relative && ($ifile =~ /^$basedir/)) {
+            my $t = getcwd();
+            my $c = -1;
+            my $p = "../";
+            $t =~ s-^$basedir/--;
+            $p .= "../" while( ($c = index( $t, "/", $c + 1)) != -1 );
+            $file =~ s-^$basedir/-$p-;
+            print " ($file)\n";
+        }
+        print "\n";
+        return symlink($file, $ifile);
+    }
+    return copyFile($file, $ifile);
+}
+
+######################################################################
+# Syntax:  findFiles(dir, match, descend)
+# Params:  dir, string, directory to search for name
+#          match, string, regular expression to match in dir
+#          descend, integer, 0 = non-recursive search
+#                            1 = recurse search into subdirectories
+#
+# Purpose: Finds files matching a regular expression.
+# Returns: List of matching files.
+#
+# Examples:
+#   findFiles("/usr","\.cpp$",1)  - finds .cpp files in /usr and below
+#   findFiles("/tmp","^#",0)      - finds #* files in /tmp
+######################################################################
+sub findFiles {
+    my ($dir,$match,$descend) = @_;
+    my ($file,$p,@files);
+    local(*D);
+    $dir =~ s=\\=/=g;
+    ($dir eq "") && ($dir = ".");
+    if ( opendir(D,$dir) ) {
+        if ( $dir eq "." ) {
+            $dir = "";
+        } else {
+            ($dir =~ /\/$/) || ($dir .= "/");
+        }
+        foreach $file ( readdir(D) ) {
+            next if ( $file  =~ /^\.\.?$/ );
+            $p = $file;
+            ($file =~ /$match/) && (push @files, $p);
+            if ( $descend && -d $p && ! -l $p ) {
+                push @files, &findFiles($p,$match,$descend);
+            }
+        }
+        closedir(D);
+    }
+    return @files;
+}
+
+# --------------------------------------------------------------------
+# "main" function
+# --------------------------------------------------------------------
+
+while ( @ARGV ) {
+    my $var = 0;
+    my $val = 0;
+
+    #parse
+    my $arg = shift @ARGV;
+    if ("$arg" eq "-h" || "$arg" eq "-help" || "$arg" eq "?") {
+	$var = "show_help";
+	$val = "yes";
+    } elsif("$arg" eq "-copy") {
+	$var = "copy";
+	$val = "yes";
+    } elsif("$arg" eq "-o" || "$arg" eq "-outdir") {
+	$var = "output";
+	$val = shift @ARGV;
+    } elsif("$arg" eq "-showonly" || "$arg" eq "-remove-stale" || "$arg" eq "-windows" ||
+	    "$arg" eq "-relative" || "$arg" eq "-check-includes") {
+	$var = substr($arg, 1);
+	$val = "yes";
+    } elsif("$arg" =~ /^-no-(.*)$/) {
+	$var = $1;
+	$val = "no";
+	#these are for commandline compat
+    } elsif("$arg" eq "-inc") {
+	$var = "output";
+	$val = shift @ARGV;
+    } elsif("$arg" eq "-module") {
+	$var = "module";
+	$val = shift @ARGV;
+    } elsif("$arg" eq "-show") {
+	$var = "showonly";
+	$val = "yes";
+    } elsif("$arg" eq '*') {
+        # workaround for windows 9x where "%*" expands to "*"
+        $var = 1;
+    }
+
+    #do something
+    if(!$var || "$var" eq "show_help") {
+	print "Unknown option: $arg\n\n" if(!$var);
+	showUsage();
+    } elsif ("$var" eq "copy") {
+	if("$val" eq "yes") {
+	    $copy_headers++;
+	} elsif($showonly) {
+	    $copy_headers--;
+	}
+    } elsif ("$var" eq "showonly") {
+	if("$val" eq "yes") {
+	    $showonly++;
+	} elsif($showonly) {
+	    $showonly--;
+	}
+    } elsif ("$var" eq "check-includes") {
+	if("$val" eq "yes") {
+	    $check_includes++;
+	} elsif($check_includes) {
+	    $check_includes--;
+	}
+    } elsif ("$var" eq "remove-stale") {
+	if("$val" eq "yes") {
+	    $remove_stale++;
+	} elsif($remove_stale) {
+	    $remove_stale--;
+	}
+    } elsif ("$var" eq "windows") {
+	if("$val" eq "yes") {
+	    $force_win++;
+	} elsif($force_win) {
+	    $force_win--;
+	}
+    } elsif ("$var" eq "relative") {
+	if("$val" eq "yes") {
+	    $force_relative++;
+	} elsif($force_relative) {
+	    $force_relative--;
+	}
+    } elsif ("$var" eq "module") {
+	print "module :$val:\n";
+	die "No such module: $val" unless(defined $modules{$val});
+	push @modules_to_sync, $val;
+    } elsif ("$var" eq "output") {
+	my $outdir = $val;
+	if(checkRelative($outdir)) {
+	    $out_basedir = getcwd();
+	    chomp $out_basedir;
+	    $out_basedir .= "/" . $outdir;
+	} else {
+	    $out_basedir = $outdir;
+	}
+	# \ -> /
+	$out_basedir =~ s=\\=/=g;
+    }
+}
+@modules_to_sync = keys(%modules) if($#modules_to_sync == -1);
+
+$isunix = checkUnix; #cache checkUnix
+
+# create path
+mkpath "$out_basedir/include", 0777;
+
+my @ignore_headers = ();
+my $class_lib_map_contents = "";
+my @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" );
+my @ignore_for_include_check = ( "qatomic.h" );
+my @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" );
+my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" );
+my @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtSql}/drivers", "$modules{QtTest}", "$modules{QtAssistant}", "$modules{QtDesigner}", "$modules{QtUiTools}", "$modules{QtDBus}", "$modules{phonon}" );
+
+foreach (@modules_to_sync) {
+    #iteration info
+    my $lib = $_;
+    my $dir = "$modules{$lib}";
+    my $pathtoheaders = "";
+    $pathtoheaders = "$moduleheaders{$lib}" if ($moduleheaders{$lib});
+
+    #information used after the syncing
+    my $pri_install_classes = "";
+    my $pri_install_files = "";
+
+    my $libcapitals = $lib;
+    $libcapitals =~ y/a-z/A-Z/;
+    my $master_contents = "#ifndef QT_".$libcapitals."_MODULE_H\n#define QT_".$libcapitals."_MODULE_H\n";
+
+    #get dependencies
+    if(-e "$dir/" . basename($dir) . ".pro") {
+	if(open(F, "<$dir/" . basename($dir) . ".pro")) {
+	    while(<F>) {
+		my $line = $_;
+		chomp $line;
+		if($line =~ /^ *QT *\+?= *([^\r\n]*)/) {
+		    foreach(split(/ /, "$1")) {
+			$master_contents .= "#include <QtCore/QtCore>\n" if("$_" eq "core");
+			$master_contents .= "#include <QtGui/QtGui>\n" if("$_" eq "gui");
+			$master_contents .= "#include <QtNetwork/QtNetwork>\n" if("$_" eq "network");
+			$master_contents .= "#include <QtSvg/QtSvg>\n" if("$_" eq "svg");
+			$master_contents .= "#include <QtScript/QtScript>\n" if("$_" eq "script");
+			$master_contents .= "#include <QtScriptTools/QtScriptTools>\n" if("$_" eq "scripttools");
+			$master_contents .= "#include <Qt3Support/Qt3Support>\n" if("$_" eq "qt3support");
+			$master_contents .= "#include <QtSql/QtSql>\n" if("$_" eq "sql");
+			$master_contents .= "#include <QtXml/QtXml>\n" if("$_" eq "xml");
+			$master_contents .= "#include <QtXmlPatterns/QtXmlPatterns>\n" if("$_" eq "xmlpatterns");
+			$master_contents .= "#include <QtOpenGL/QtOpenGL>\n" if("$_" eq "opengl");
+		    }
+		}
+	    }
+	    close(F);
+	}
+    }
+
+    #remove the old files
+    if($remove_stale) {
+	my @subdirs = ("$out_basedir/include/$lib");
+	foreach (@subdirs) {
+	    my $subdir = "$_";
+	    if (opendir DIR, "$subdir") {
+		while(my $t = readdir(DIR)) {
+		    my $file = "$subdir/$t";
+		    if(-d "$file") {
+			push @subdirs, "$file" unless($t eq "." || $t eq "..");
+		    } else {
+			my @files = ("$file");
+			#push @files, "$out_basedir/include/Qt/$t" if(-e "$out_basedir/include/Qt/$t");
+			foreach (@files) {
+			   my $file = $_;
+			   my $remove_file = 0;
+			   if(open(F, "<$file")) {
+				while(<F>) {
+				    my $line = $_;
+				    chomp $line;
+				    if($line =~ /^\#include \"([^\"]*)\"$/) {
+					my $include = $1;
+					$include = $subdir . "/" . $include unless(substr($include, 0, 1) eq "/");
+					$remove_file = 1 unless(-e "$include");
+				    } else {
+					$remove_file = 0;
+					last;
+				    }
+				}
+				close(F);
+				unlink "$file" if($remove_file);
+			    }
+			}
+		    }
+		}
+		closedir DIR;
+            }
+
+	}
+    }
+
+    #create the new ones
+    foreach (split(/;/, $dir)) {
+	my $current_dir = "$_";
+	my $headers_dir = $current_dir;
+        $headers_dir .= "/$pathtoheaders" if ($pathtoheaders);
+        #calc subdirs
+        my @subdirs = ($headers_dir);
+        foreach (@subdirs) {
+            my $subdir = "$_";
+            opendir DIR, "$subdir" or next;
+            while(my $t = readdir(DIR)) {
+                push @subdirs, "$subdir/$t" if(-d "$subdir/$t" && !($t eq ".") &&
+					       !($t eq "..") && !($t eq ".obj") &&
+                                               !($t eq ".moc") && !($t eq ".rcc") &&
+                                               !($t eq ".uic") && !($t eq "build"));
+            }
+            closedir DIR;
+        }
+
+        #calc files and "copy" them
+        foreach (@subdirs) {
+            my $subdir = "$_";
+            my @headers = findFiles("$subdir", "^[-a-z0-9_]*\\.h\$" , 0);
+            foreach (@headers) {
+                my $header = "$_";
+                $header = 0 if("$header" =~ /^ui_.*.h/);
+                foreach (@ignore_headers) {
+                    $header = 0 if("$header" eq "$_");
+                }
+                if($header) {
+		    my $header_copies = 0;
+		    #figure out if it is a public header
+		    my $public_header = $header;
+		    if($public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) {
+			$public_header = 0;
+		    } else {
+			foreach (@ignore_for_master_contents) {
+			    $public_header = 0 if("$header" eq "$_");
+			}
+		    }
+
+                    my $iheader = $subdir . "/" . $header;
+		    my @classes = $public_header ? classNames($iheader) : ();
+                    if($showonly) {
+                        print "$header [$lib]\n";
+			foreach(@classes) {
+			    print "SYMBOL: $_\n";
+			}
+                    } else {
+			#find out all the places it goes..
+			my @headers;
+			if ($public_header) {
+			    @headers = ( "$out_basedir/include/$lib/$header" );
+			    push @headers, "$out_basedir/include/Qt/$header"
+			      if ("$lib" ne "phonon" && "$subdir" =~ /^$basedir\/src/);
+
+			    foreach(@classes) {
+				my $header_base = basename($header);
+				my $class = $_;
+				if ($class =~ m/::/) {
+				    $class =~ s,::,/,g;
+				    $class = "../" . $class;
+				}
+				$class_lib_map_contents .= "QT_CLASS_LIB($_, $lib, $header_base)\n";
+				$header_copies++ if(syncHeader("$out_basedir/include/$lib/$class", $header, 0));
+			    }
+			} else {
+			    @headers = ( "$out_basedir/include/$lib/private/$header" );
+			    push @headers, "$out_basedir/include/Qt/private/$header"
+                              if ("$lib" ne "phonon");
+			}
+			foreach(@headers) { #sync them
+			    $header_copies++ if(syncHeader($_, $iheader, $copy_headers));
+			}
+
+			if($public_header) {
+			    #put it into the master file
+			    $master_contents .= "#include \"$public_header\"\n" if(shouldMasterInclude($iheader));
+
+			    #deal with the install directives
+			    if($public_header) {
+				my $pri_install_iheader = fixPaths($iheader, $current_dir);
+				foreach(@classes) {
+				    my $class = $_;
+				    if ($class =~ m/::/) {
+					$class =~ s,::,/,g;
+					$class = "../" . $class;
+				    }
+				    my $class_header = fixPaths("$out_basedir/include/$lib/$class",
+								$current_dir) . " ";
+				    $pri_install_classes .= $class_header
+								unless($pri_install_classes =~ $class_header);
+				}
+				$pri_install_files.= "$pri_install_iheader ";;
+			    }
+			}
+                    }
+		    print "header created for $iheader ($header_copies)\n" if($header_copies > 0);
+                }
+            }
+        }
+    }
+
+    # close the master include:
+    $master_contents .= "#endif\n";
+
+    unless($showonly) {
+        #generate the "master" include file
+        my $master_include = "$out_basedir/include/$lib/$lib";
+	$pri_install_files .= fixPaths($master_include, "$modules{$lib}") . " "; #get the master file installed too
+        if(-e "$master_include") {
+            open MASTERINCLUDE, "<$master_include";
+            local $/;
+            binmode MASTERINCLUDE;
+            my $oldmaster = <MASTERINCLUDE>;
+            close MASTERINCLUDE;
+            $oldmaster =~ s/\r//g; # remove \r's , so comparison is ok on all platforms
+            $master_include = 0 if($oldmaster eq $master_contents);
+        }
+        if($master_include && $master_contents) {
+            my $master_dir = dirname($master_include);
+            mkpath $master_dir, 0777;
+            print "header (master) created for $lib\n";
+            open MASTERINCLUDE, ">$master_include";
+            print MASTERINCLUDE "$master_contents";
+            close MASTERINCLUDE;
+        }
+
+        #handle the headers.pri for each module
+	my $headers_pri_contents = "";
+	$headers_pri_contents .= "SYNCQT.HEADER_FILES = $pri_install_files\n";
+	$headers_pri_contents .= "SYNCQT.HEADER_CLASSES = $pri_install_classes\n";
+        my $headers_pri_file = "$out_basedir/include/$lib/headers.pri";
+        if(-e "$headers_pri_file") {
+            open HEADERS_PRI_FILE, "<$headers_pri_file";
+            local $/;
+            binmode HEADERS_PRI_FILE;
+            my $old_headers_pri_contents = <HEADERS_PRI_FILE>;
+            close HEADERS_PRI_FILE;
+            $old_headers_pri_contents =~ s/\r//g; # remove \r's , so comparison is ok on all platforms
+            $headers_pri_file = 0 if($old_headers_pri_contents eq $headers_pri_contents);
+        }
+        if($headers_pri_file && $master_contents) {
+            my $headers_pri_dir = dirname($headers_pri_file);
+            mkpath $headers_pri_dir, 0777;
+            print "headers.pri file created for $lib\n";
+            open HEADERS_PRI_FILE, ">$headers_pri_file";
+            print HEADERS_PRI_FILE "$headers_pri_contents";
+            close HEADERS_PRI_FILE;
+        }
+    }
+}
+unless($showonly) {
+    my $class_lib_map = "$out_basedir/src/tools/uic/qclass_lib_map.h";
+    if(-e "$class_lib_map") {
+	open CLASS_LIB_MAP, "<$class_lib_map";
+	local $/;
+	binmode CLASS_LIB_MAP;
+	my $old_class_lib_map_contents = <CLASS_LIB_MAP>;
+	close CLASS_LIB_MAP;
+	$old_class_lib_map_contents =~ s/\r//g; # remove \r's , so comparison is ok on all platforms
+	$class_lib_map = 0 if($old_class_lib_map_contents eq $class_lib_map_contents);
+    }
+    if($class_lib_map) {
+	my $class_lib_map_dir = dirname($class_lib_map);
+	mkpath $class_lib_map_dir, 0777;
+	open CLASS_LIB_MAP, ">$class_lib_map";
+	print CLASS_LIB_MAP "$class_lib_map_contents";
+	close CLASS_LIB_MAP;
+    }
+}
+
+if($check_includes) {
+    for (keys(%modules)) {
+	#iteration info
+	my $lib = $_;
+	my $dir = "$modules{$lib}";
+	foreach (split(/;/, $dir)) {
+	    my $current_dir = "$_";
+	    #calc subdirs
+	    my @subdirs = ($current_dir);
+	    foreach (@subdirs) {
+		my $subdir = "$_";
+		opendir DIR, "$subdir";
+		while(my $t = readdir(DIR)) {
+                    push @subdirs, "$subdir/$t" if(-d "$subdir/$t" && !($t eq ".") &&
+                                                   !($t eq "..") && !($t eq ".obj") &&
+                                                   !($t eq ".moc") && !($t eq ".rcc") &&
+                                                   !($t eq ".uic") && !($t eq "build"));
+		}
+		closedir DIR;
+	    }
+
+	    foreach (@subdirs) {
+		my $subdir = "$_";
+                my $header_skip_qt_module_test = 0;
+                foreach(@ignore_for_qt_module_check) {
+                    foreach (split(/;/, $_)) {
+                        $header_skip_qt_module_test = 1 if ("$subdir" =~ /^$_/);
+                    }
+                }
+		my @headers = findFiles("$subdir", "^[-a-z0-9_]*\\.h\$" , 0);
+		foreach (@headers) {
+		    my $header = "$_";
+                    my $header_skip_qt_begin_header_test = 0;
+                    my $header_skip_qt_begin_namespace_test = 0;
+		    $header = 0 if("$header" =~ /^ui_.*.h/);
+		    foreach (@ignore_headers) {
+			$header = 0 if("$header" eq "$_");
+		    }
+		    if($header) {
+			my $public_header = $header;
+			if($public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) {
+			    $public_header = 0;
+			} else {
+			    foreach (@ignore_for_master_contents) {
+				$public_header = 0 if("$header" eq "$_");
+			    }
+			    if($public_header) {
+				foreach (@ignore_for_include_check) {
+				    $public_header = 0 if("$header" eq "$_");
+				}
+                                foreach(@ignore_for_qt_begin_header_check) {
+                                    $header_skip_qt_begin_header_test = 1 if ("$header" eq "$_");
+                                }
+                                foreach(@ignore_for_qt_begin_namespace_check) {
+                                    $header_skip_qt_begin_namespace_test = 1 if ("$header" eq "$_");
+                                }
+			    }
+			}
+
+			my $iheader = $subdir . "/" . $header;
+			if($public_header) {
+			    if(open(F, "<$iheader")) {
+                                my $qt_module_found = 0;
+				my $qt_begin_header_found = 0;
+				my $qt_end_header_found = 0;
+				my $qt_begin_namespace_found = 0;
+				my $qt_end_namespace_found = 0;
+				my $line;
+				while($line = <F>) {
+				    chomp $line;
+				    my $output_line = 1;
+                                    if($line =~ /^ *\# *pragma (qt_no_included_check|qt_sync_stop_processing)/) {
+			                last;
+				    } elsif($line =~ /^ *\# *include/) {
+					my $include = $line;
+					if($line =~ /<.*>/) {
+					    $include =~ s,.*<(.*)>.*,$1,;
+					} elsif($line =~ /".*"/) {
+					    $include =~ s,.*"(.*)".*,$1,;
+					} else {
+					    $include = 0;
+					}
+					if($include) {
+					    for (keys(%modules)) {
+						my $trylib = $_;
+						if(-e "$out_basedir/include/$trylib/$include") {
+						    print "WARNING: $iheader includes $include when it should include $trylib/$include\n";
+						}
+					    }
+					}
+				    } elsif ($header_skip_qt_begin_header_test == 0 and $line =~ /^QT_BEGIN_HEADER\s*$/) {
+					$qt_begin_header_found = 1;
+				    } elsif ($header_skip_qt_begin_header_test == 0 and $line =~ /^QT_END_HEADER\s*$/) {
+					$qt_end_header_found = 1;
+				    } elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_BEGIN_NAMESPACE\s*$/) {
+					$qt_begin_namespace_found = 1;
+				    } elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_END_NAMESPACE\s*$/) {
+					$qt_end_namespace_found = 1;
+                                    } elsif ($header_skip_qt_module_test == 0 and $line =~ /^QT_MODULE\(.*\)\s*$/) {
+                                        $qt_module_found = 1;
+                                    }
+				}
+                                if ($header_skip_qt_begin_header_test == 0) {
+                                    if ($qt_begin_header_found == 0) {
+                                        print "WARNING: $iheader does not include QT_BEGIN_HEADER\n";
+                                    }
+
+                                    if ($qt_begin_header_found && $qt_end_header_found == 0) {
+                                        print "WARNING: $iheader has QT_BEGIN_HEADER but no QT_END_HEADER\n";
+                                    }
+                                }
+
+                                if ($header_skip_qt_begin_namespace_test == 0) {
+                                    if ($qt_begin_namespace_found == 0) {
+                                        print "WARNING: $iheader does not include QT_BEGIN_NAMESPACE\n";
+                                    }
+
+                                    if ($qt_begin_namespace_found && $qt_end_namespace_found == 0) {
+                                        print "WARNING: $iheader has QT_BEGIN_NAMESPACE but no QT_END_NAMESPACE\n";
+                                    }
+                                }
+
+                                if ($header_skip_qt_module_test == 0) {
+                                    if ($qt_module_found == 0) {
+                                        print "WARNING: $iheader does not include QT_MODULE\n";
+                                    }
+                                }
+				close(F);
+			    }
+			}
+		    }
+		}
+	    }
+	}
+    }
+}
+
+exit 0;
diff --git a/bin/syncqt.bat b/bin/syncqt.bat
new file mode 100755
index 0000000000..579844f2ff
--- /dev/null
+++ b/bin/syncqt.bat
@@ -0,0 +1,2 @@
+@rem ***** This assumes PERL is in the PATH *****
+@perl.exe -S syncqt %*
diff --git a/config.tests/mac/crc.test b/config.tests/mac/crc.test
new file mode 100755
index 0000000000..1a16204a0d
--- /dev/null
+++ b/config.tests/mac/crc.test
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+SUCCESS=no
+QMKSPEC=$1
+XPLATFORM=`basename "$1"`
+QMAKE_CONFIG=$2
+VERBOSE=$3
+SRCDIR=$4
+OUTDIR=$5
+TEST=$6
+EXE=`basename "$6"`
+ARG=$7
+shift 7
+LFLAGS=""
+INCLUDEPATH=""
+CXXFLAGS=""
+while [ "$#" -gt 0 ]; do
+    PARAM=$1
+    case $PARAM in
+    -framework)
+        LFLAGS="$LFLAGS -framework \"$2\""
+        shift
+        ;;
+    -F*|-m*|-x*)
+        LFLAGS="$LFLAGS $PARAM"
+        CXXFLAGS="$CXXFLAGS $PARAM"
+        ;;
+    -L*|-l*|-pthread)
+	LFLAGS="$LFLAGS $PARAM"
+	;;
+    -I*)
+        INC=`echo $PARAM | sed -e 's/^-I//'`
+        INCLUDEPATH="$INCLUDEPATH $INC"
+        ;;
+    -f*|-D*)
+        CXXFLAGS="$CXXFLAGS $PARAM"
+        ;;
+    -Qoption)
+	# Two-argument form for the Sun Compiler
+	CXXFLAGS="$CXXFLAGS $PARAM \"$2\""
+	shift
+	;;
+    *)  ;;
+    esac
+    shift
+done
+
+# debuggery
+[ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION auto-detection... ($*)"
+
+test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST"
+
+cd "$OUTDIR/$TEST"
+
+make distclean >/dev/null 2>&1
+"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
+
+if [ "$VERBOSE" = "yes" ]; then
+    make
+else
+    make >/dev/null 2>&1
+fi
+
+
+if [ -x "$EXE" ]; then
+    foo=`$OUTDIR/$TEST/$EXE $ARG`
+    echo "$foo"
+else
+    echo "'CUTE'" #1129665605 # == 'CUTE'
+fi
+
diff --git a/config.tests/mac/crc/crc.pro b/config.tests/mac/crc/crc.pro
new file mode 100644
index 0000000000..c3abf15759
--- /dev/null
+++ b/config.tests/mac/crc/crc.pro
@@ -0,0 +1,2 @@
+SOURCES = main.cpp
+CONFIG -= app_bundle qt
diff --git a/config.tests/mac/crc/main.cpp b/config.tests/mac/crc/main.cpp
new file mode 100644
index 0000000000..2ac10b38d5
--- /dev/null
+++ b/config.tests/mac/crc/main.cpp
@@ -0,0 +1,67 @@
+#include <iostream>
+#include <cstdlib>
+#include <cstring>
+
+
+class CCRC32
+{
+public:
+    CCRC32() { initialize(); }
+
+    unsigned long FullCRC(const unsigned char *sData, unsigned long ulDataLength)
+    {
+        unsigned long ulCRC = 0xffffffff;
+        PartialCRC(&ulCRC, sData, ulDataLength);
+        return(ulCRC ^ 0xffffffff);
+    }
+
+    void PartialCRC(unsigned long *ulCRC, const unsigned char *sData, unsigned long ulDataLength)
+    {
+        while(ulDataLength--) {
+            *ulCRC = (*ulCRC >> 8) ^ ulTable[(*ulCRC & 0xFF) ^ *sData++];
+        }
+    }
+
+private:
+    void initialize(void)
+    {
+        unsigned long ulPolynomial = 0x04C11DB7;
+        memset(&ulTable, 0, sizeof(ulTable));
+        for(int iCodes = 0; iCodes <= 0xFF; iCodes++) {
+            ulTable[iCodes] = Reflect(iCodes, 8) << 24;
+            for(int iPos = 0; iPos < 8; iPos++) {
+                ulTable[iCodes] = (ulTable[iCodes] << 1)
+                    ^ ((ulTable[iCodes] & (1 << 31)) ? ulPolynomial : 0);
+            }
+
+            ulTable[iCodes] = Reflect(ulTable[iCodes], 32);
+        }
+    }
+    unsigned long Reflect(unsigned long ulReflect, const char cChar)
+    {
+        unsigned long ulValue = 0;
+        // Swap bit 0 for bit 7, bit 1 For bit 6, etc....
+        for(int iPos = 1; iPos < (cChar + 1); iPos++) {
+            if(ulReflect & 1) {
+                ulValue |= (1 << (cChar - iPos));
+            }
+            ulReflect >>= 1;
+        }
+        return ulValue;
+    }
+    unsigned long ulTable[256]; // CRC lookup table array.
+};
+
+
+int main(int argc, char **argv)
+{
+    CCRC32 crc;
+    char *name;
+    if (argc < 2) {
+        std::cerr << "usage: crc <string>\n";
+        return 0;
+    } else {
+        name = argv[1];
+    }
+    std::cout << crc.FullCRC((unsigned char *)name, strlen(name)) << std::endl;
+}
diff --git a/config.tests/mac/defaultarch.test b/config.tests/mac/defaultarch.test
new file mode 100755
index 0000000000..4502af7a77
--- /dev/null
+++ b/config.tests/mac/defaultarch.test
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+COMPILER=$1
+VERBOSE=$2
+WORKDIR=$3
+QT_MAC_DEFUALT_ARCH=
+
+touch defaultarch.c
+
+# compile something and run 'file' on it.
+if "$COMPILER" -c defaultarch.c 2>/dev/null 1>&2; then
+    FIlE_OUTPUT=`file defaultarch.o`
+    [ "$VERBOSE" = "yes" ] && echo "'file' reports compiler ($COMPILER) default architechture as: $FIlE_OUTPUT"
+
+fi
+rm -f defaultarch.c defaultarch.o
+
+# detect our known archs.
+if echo "$FIlE_OUTPUT" | grep '\<i386\>' > /dev/null 2>&1; then
+    QT_MAC_DEFUALT_ARCH=x86 # configure knows it as "x86" not "i386"
+fi
+if echo "$FIlE_OUTPUT" | grep '\<x86_64\>' > /dev/null 2>&1; then
+    QT_MAC_DEFUALT_ARCH=x86_64
+fi
+if echo "$FIlE_OUTPUT" | grep '\<ppc\>' > /dev/null 2>&1; then
+    QT_MAC_DEFUALT_ARCH=ppc
+fi
+if echo "$FIlE_OUTPUT" | grep '\<ppc64\>' > /dev/null 2>&1; then
+    QT_MAC_DEFUALT_ARCH=ppc64
+fi
+
+[ "$VERBOSE" = "yes" ] && echo "setting QT_MAC_DEFUALT_ARCH to \"$QT_MAC_DEFUALT_ARCH\""
+export QT_MAC_DEFUALT_ARCH
diff --git a/config.tests/mac/dwarf2.test b/config.tests/mac/dwarf2.test
new file mode 100755
index 0000000000..a640b113de
--- /dev/null
+++ b/config.tests/mac/dwarf2.test
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+DWARF2_SUPPORT=no
+DWARF2_SUPPORT_BROKEN=no
+COMPILER=$1
+VERBOSE=$2
+WORKDIR=$3
+
+touch dwarf2.c
+
+if "$COMPILER" -c dwarf2.c -Werror -gdwarf-2 2>/dev/null 1>&2; then
+    if "$COMPILER" -c dwarf2.c -Werror -gdwarf-2  2>&1 | grep "unsupported" >/dev/null ; then
+        true
+    else
+        DWARF2_SUPPORT=yes
+    fi
+fi
+rm -f dwarf2.c dwarf2.o
+
+# Test for xcode 2.4.0, which has a broken implementation of DWARF
+"$COMPILER" $WORKDIR/xcodeversion.cpp -o xcodeversion -framework Carbon;
+./xcodeversion
+
+if [ "$?" == "1" ]; then
+    DWARF2_SUPPORT_BROKEN=yes
+fi
+
+rm xcodeversion
+
+# done
+if [ "$DWARF2_SUPPORT" != "yes" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "DWARF2 debug symbols disabled."
+    exit 0
+else
+    if [ "$DWARF2_SUPPORT_BROKEN" == "yes" ]; then
+        [ "$VERBOSE" = "yes" ] && echo "DWARF2 debug symbols disabled."
+        exit 0
+    else
+        [ "$VERBOSE" = "yes" ] && echo "DWARF2 debug symbols enabled."
+        exit 1
+    fi
+fi
diff --git a/config.tests/mac/xarch.test b/config.tests/mac/xarch.test
new file mode 100755
index 0000000000..08322a96cf
--- /dev/null
+++ b/config.tests/mac/xarch.test
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+XARCH_SUPPORT=no
+COMPILER=$1
+VERBOSE=$2
+WORKDIR=$3
+
+touch xarch.c
+
+if "$COMPILER" -c xarch.c -Xarch_i386 -mmmx 2>/dev/null 1>&2; then
+    if "$COMPILER" -c xarch.c -Xarch_i386 -mmmx  2>&1 | grep "unrecognized" >/dev/null ; then
+        true
+    else
+        XARCH_SUPPORT=yes
+    fi
+fi
+rm -f xarch.c xarch.o
+
+# done
+if [ "$XARCH_SUPPORT" != "yes" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Xarch is not supported"
+    exit 0
+else
+    [ "$VERBOSE" = "yes" ] && echo "Xarch support detected"
+    exit 1
+fi
diff --git a/config.tests/mac/xcodeversion.cpp b/config.tests/mac/xcodeversion.cpp
new file mode 100644
index 0000000000..e613cc5927
--- /dev/null
+++ b/config.tests/mac/xcodeversion.cpp
@@ -0,0 +1,58 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <CoreFoundation/CoreFoundation.h>
+#include <Carbon/Carbon.h>
+
+int success = 0;
+int fail = 1;
+int internal_error = success; // enable dwarf on internal errors
+
+int main(int argc, const char **argv)
+{
+    CFURLRef cfurl;
+    OSStatus err = LSFindApplicationForInfo(0, CFSTR("com.apple.Xcode"), 0, 0, &cfurl);
+    if (err != noErr)
+        return internal_error;
+    
+    CFBundleRef bundle = CFBundleCreate(0, cfurl);
+    if (bundle == 0)
+        return internal_error;
+
+    CFStringRef str = CFStringRef(CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("CFBundleShortVersionString")));
+    const char * ptr = CFStringGetCStringPtr(str, 0);
+    if (ptr == 0)
+        return internal_error;        
+
+    // self-test
+    const char * fail1 = "2.4";
+    const char * fail2 = "2.4.0";
+    const char * fail3  ="2.3";
+    const char * ok1  = "2.4.1";
+    const char * ok2  ="2.5";
+    const char * ok3  ="3.0";
+//    ptr = fail1;
+//    printf ("string: %s\n", ptr);
+   
+    int length = strlen(ptr);
+    if (length < 3) // expect "x.y" at least
+        return internal_error;
+
+    // fail on 2.4 and below (2.4.1 is ok)
+
+     if (ptr[0] < '2')
+        return fail;
+
+    if (ptr[0] >= '3')
+        return success;
+
+    if (ptr[2] < '4')
+        return fail;
+
+    if (length < 5)
+        return fail;
+
+    if (ptr[4] < '1')
+        return fail;
+    
+    return success;
+}
\ No newline at end of file
diff --git a/config.tests/qws/ahi/ahi.cpp b/config.tests/qws/ahi/ahi.cpp
new file mode 100644
index 0000000000..a5e89515e1
--- /dev/null
+++ b/config.tests/qws/ahi/ahi.cpp
@@ -0,0 +1,9 @@
+#include <ahi.h>
+
+int main(int, char **)
+{
+    AhiInit(0);
+    AhiTerm();
+
+    return 0;
+}
diff --git a/config.tests/qws/ahi/ahi.pro b/config.tests/qws/ahi/ahi.pro
new file mode 100644
index 0000000000..532a565bc4
--- /dev/null
+++ b/config.tests/qws/ahi/ahi.pro
@@ -0,0 +1,3 @@
+SOURCES = ahi.cpp
+CONFIG -= qt
+LIBS += -lahi -lahioem
diff --git a/config.tests/qws/directfb/directfb.cpp b/config.tests/qws/directfb/directfb.cpp
new file mode 100644
index 0000000000..f743864bb2
--- /dev/null
+++ b/config.tests/qws/directfb/directfb.cpp
@@ -0,0 +1,9 @@
+#include <directfb.h>
+
+int main(int, char **)
+{
+    DFBResult result = DFB_OK;
+    result = DirectFBInit(0, 0);
+
+    return (result == DFB_OK);
+}
diff --git a/config.tests/qws/directfb/directfb.pro b/config.tests/qws/directfb/directfb.pro
new file mode 100644
index 0000000000..db14d3ba48
--- /dev/null
+++ b/config.tests/qws/directfb/directfb.pro
@@ -0,0 +1,5 @@
+SOURCES = directfb.cpp
+CONFIG -= qt
+
+QMAKE_CXXFLAGS += $$QT_CFLAGS_DIRECTFB
+LIBS += $$QT_LIBS_DIRECTFB
diff --git a/config.tests/qws/sound/sound.cpp b/config.tests/qws/sound/sound.cpp
new file mode 100644
index 0000000000..be412bb245
--- /dev/null
+++ b/config.tests/qws/sound/sound.cpp
@@ -0,0 +1,8 @@
+#include <sys/soundcard.h>
+
+int main(int, char **)
+{
+    audio_buf_info info;
+
+    return 0;
+}
diff --git a/config.tests/qws/sound/sound.pro b/config.tests/qws/sound/sound.pro
new file mode 100644
index 0000000000..4ad3376dca
--- /dev/null
+++ b/config.tests/qws/sound/sound.pro
@@ -0,0 +1,2 @@
+SOURCES = sound.cpp
+CONFIG -= qt
diff --git a/config.tests/qws/svgalib/svgalib.cpp b/config.tests/qws/svgalib/svgalib.cpp
new file mode 100644
index 0000000000..f4bf9c8bd5
--- /dev/null
+++ b/config.tests/qws/svgalib/svgalib.cpp
@@ -0,0 +1,10 @@
+#include <vga.h>
+#include <vgagl.h>
+
+int main(int, char **)
+{
+    int mode = vga_getdefaultmode();
+    gl_setcontextvga(mode);
+
+    return 0;
+}
diff --git a/config.tests/qws/svgalib/svgalib.pro b/config.tests/qws/svgalib/svgalib.pro
new file mode 100644
index 0000000000..169065239b
--- /dev/null
+++ b/config.tests/qws/svgalib/svgalib.pro
@@ -0,0 +1,3 @@
+SOURCES = svgalib.cpp
+CONFIG -= qt
+LIBS += -lvgagl -lvga
diff --git a/config.tests/unix/3dnow/3dnow.cpp b/config.tests/unix/3dnow/3dnow.cpp
new file mode 100644
index 0000000000..1b1d0ed74a
--- /dev/null
+++ b/config.tests/unix/3dnow/3dnow.cpp
@@ -0,0 +1,10 @@
+#include <mm3dnow.h>
+#if defined(__GNUC__) && __GNUC__ < 4 && __GNUC_MINOR__ < 3
+#error GCC < 3.2 is known to create internal compiler errors with our MMX code
+#endif
+
+int main(int, char**)
+{
+    _m_femms();
+    return 0;
+}
diff --git a/config.tests/unix/3dnow/3dnow.pro b/config.tests/unix/3dnow/3dnow.pro
new file mode 100644
index 0000000000..90a8a191dc
--- /dev/null
+++ b/config.tests/unix/3dnow/3dnow.pro
@@ -0,0 +1,3 @@
+SOURCES = 3dnow.cpp
+CONFIG -= x11 qt
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/bsymbolic_functions.test b/config.tests/unix/bsymbolic_functions.test
new file mode 100755
index 0000000000..52fdb32d54
--- /dev/null
+++ b/config.tests/unix/bsymbolic_functions.test
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+BSYMBOLIC_FUNCTIONS_SUPPORT=no
+COMPILER=$1
+VERBOSE=$2
+
+cat >>bsymbolic_functions.c << EOF
+int main() { return 0; }
+EOF
+
+"$COMPILER" -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c >/dev/null 2>&1 && BSYMBOLIC_FUNCTIONS_SUPPORT=yes
+rm -f bsymbolic_functions.c libtest.so
+
+# done
+if [ "$BSYMBOLIC_FUNCTIONS_SUPPORT" != "yes" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Symbolic function binding disabled."
+    exit 0
+else
+    [ "$VERBOSE" = "yes" ] && echo "Symbolic function binding enabled."
+    exit 1
+fi
diff --git a/config.tests/unix/clock-gettime/clock-gettime.cpp b/config.tests/unix/clock-gettime/clock-gettime.cpp
new file mode 100644
index 0000000000..edb71f524d
--- /dev/null
+++ b/config.tests/unix/clock-gettime/clock-gettime.cpp
@@ -0,0 +1,16 @@
+#include <unistd.h>
+#include <time.h>
+
+int main(int, char **)
+{
+#if defined(_POSIX_TIMERS) && (_POSIX_TIMERS > 0)
+    timespec ts;
+    clock_gettime(CLOCK_REALTIME, &ts);
+#else
+#  error "Feature _POSIX_TIMERS not available"
+    // MIPSpro doesn't understand #error, so force a compiler error
+    force_compiler_error = true;
+#endif
+    return 0;
+}
+
diff --git a/config.tests/unix/clock-gettime/clock-gettime.pri b/config.tests/unix/clock-gettime/clock-gettime.pri
new file mode 100644
index 0000000000..2a6160bf63
--- /dev/null
+++ b/config.tests/unix/clock-gettime/clock-gettime.pri
@@ -0,0 +1,2 @@
+# clock_gettime() is implemented in librt on these systems
+linux-*|hpux-*|solaris-*:LIBS *= -lrt
diff --git a/config.tests/unix/clock-gettime/clock-gettime.pro b/config.tests/unix/clock-gettime/clock-gettime.pro
new file mode 100644
index 0000000000..c527535183
--- /dev/null
+++ b/config.tests/unix/clock-gettime/clock-gettime.pro
@@ -0,0 +1,4 @@
+SOURCES = clock-gettime.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+include(clock-gettime.pri)
diff --git a/config.tests/unix/clock-monotonic/clock-monotonic.cpp b/config.tests/unix/clock-monotonic/clock-monotonic.cpp
new file mode 100644
index 0000000000..df9996368d
--- /dev/null
+++ b/config.tests/unix/clock-monotonic/clock-monotonic.cpp
@@ -0,0 +1,16 @@
+#include <unistd.h>
+#include <time.h>
+
+int main(int, char **)
+{
+#if defined(_POSIX_MONOTONIC_CLOCK) && (_POSIX_MONOTONIC_CLOCK-0 >= 0)
+    timespec ts;
+    clock_gettime(CLOCK_MONOTONIC, &ts);
+#else
+#  error "Feature _POSIX_MONOTONIC_CLOCK not available"
+    // MIPSpro doesn't understand #error, so force a compiler error
+    force_compiler_error = true; 
+#endif
+    return 0;
+}
+
diff --git a/config.tests/unix/clock-monotonic/clock-monotonic.pro b/config.tests/unix/clock-monotonic/clock-monotonic.pro
new file mode 100644
index 0000000000..961e3a848d
--- /dev/null
+++ b/config.tests/unix/clock-monotonic/clock-monotonic.pro
@@ -0,0 +1,4 @@
+SOURCES = clock-monotonic.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+include(../clock-gettime/clock-gettime.pri)
diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
new file mode 100755
index 0000000000..b5afa1853f
--- /dev/null
+++ b/config.tests/unix/compile.test
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+SUCCESS=no
+QMKSPEC=$1
+XPLATFORM=`basename "$1"`
+QMAKE_CONFIG=$2
+VERBOSE=$3
+SRCDIR=$4
+OUTDIR=$5
+TEST=$6
+EXE=`basename "$6"`
+DESCRIPTION=$7
+shift 7
+LFLAGS=""
+INCLUDEPATH=""
+CXXFLAGS=""
+while [ "$#" -gt 0 ]; do
+    PARAM=$1
+    case $PARAM in
+    -framework)
+        LFLAGS="$LFLAGS -framework \"$2\""
+        shift
+        ;;
+    -F*|-m*|-x*)
+        LFLAGS="$LFLAGS $PARAM"
+        CXXFLAGS="$CXXFLAGS $PARAM"
+        ;;
+    -L*|-l*|-pthread)
+	LFLAGS="$LFLAGS $PARAM"
+	;;
+    -I*)
+        INC=`echo $PARAM | sed -e 's/^-I//'`
+        INCLUDEPATH="$INCLUDEPATH $INC"
+        ;;
+    -f*|-D*)
+        CXXFLAGS="$CXXFLAGS $PARAM"
+        ;;
+    -Qoption)
+	# Two-argument form for the Sun Compiler
+	CXXFLAGS="$CXXFLAGS $PARAM \"$2\""
+	shift
+	;;
+    *)  ;;
+    esac
+    shift
+done
+
+# debuggery
+[ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION auto-detection... ($*)"
+
+test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST"
+
+cd "$OUTDIR/$TEST"
+
+make distclean >/dev/null 2>&1
+"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
+
+if [ "$VERBOSE" = "yes" ]; then
+    make
+else
+    make >/dev/null 2>&1
+fi
+
+[ -x "$EXE" ] && SUCCESS=yes
+
+# done
+if [ "$SUCCESS" != "yes" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION disabled."
+    exit 1
+else
+    [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION enabled."
+    exit 0
+fi
diff --git a/config.tests/unix/cups/cups.cpp b/config.tests/unix/cups/cups.cpp
new file mode 100644
index 0000000000..e8c17eaeaf
--- /dev/null
+++ b/config.tests/unix/cups/cups.cpp
@@ -0,0 +1,8 @@
+#include <cups/cups.h>
+
+int main(int, char **)
+{
+    cups_dest_t *d;
+    cupsGetDests(&d);
+    return 0;
+}
diff --git a/config.tests/unix/cups/cups.pro b/config.tests/unix/cups/cups.pro
new file mode 100644
index 0000000000..d7b78c877f
--- /dev/null
+++ b/config.tests/unix/cups/cups.pro
@@ -0,0 +1,4 @@
+SOURCES = cups.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lcups
diff --git a/config.tests/unix/db2/db2.cpp b/config.tests/unix/db2/db2.cpp
new file mode 100644
index 0000000000..e408d280a6
--- /dev/null
+++ b/config.tests/unix/db2/db2.cpp
@@ -0,0 +1,7 @@
+#include <sqlcli.h>
+#include <sqlcli1.h>
+
+int main(int, char **)
+{
+    return 0;
+}
diff --git a/config.tests/unix/db2/db2.pro b/config.tests/unix/db2/db2.pro
new file mode 100644
index 0000000000..0fa39a8242
--- /dev/null
+++ b/config.tests/unix/db2/db2.pro
@@ -0,0 +1,4 @@
+SOURCES = db2.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -ldb2
diff --git a/config.tests/unix/dbus/dbus.cpp b/config.tests/unix/dbus/dbus.cpp
new file mode 100644
index 0000000000..15ed45fcd8
--- /dev/null
+++ b/config.tests/unix/dbus/dbus.cpp
@@ -0,0 +1,12 @@
+#define DBUS_API_SUBJECT_TO_CHANGE
+#include <dbus/dbus.h>
+
+#if DBUS_MAJOR_PROTOCOL_VERSION < 1
+#error Needs at least dbus version 1
+#endif
+
+int main(int, char **)
+{
+    dbus_shutdown();
+    return 0;
+}
diff --git a/config.tests/unix/dbus/dbus.pro b/config.tests/unix/dbus/dbus.pro
new file mode 100644
index 0000000000..1e4aea73e4
--- /dev/null
+++ b/config.tests/unix/dbus/dbus.pro
@@ -0,0 +1,3 @@
+SOURCES = dbus.cpp
+CONFIG -= qt
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/doubleformat.test b/config.tests/unix/doubleformat.test
new file mode 100755
index 0000000000..3e707c54fa
--- /dev/null
+++ b/config.tests/unix/doubleformat.test
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+QMKSPEC=$1
+VERBOSE=$2
+SRCDIR=$3
+OUTDIR=$4
+
+# debuggery
+[ "$VERBOSE" = "yes" ] && echo "Determining floating point  word-order... ($*)"
+
+# build and run a test program
+test -d "$OUTDIR/config.tests/unix/doubleformat" || mkdir -p "$OUTDIR/config.tests/unix/doubleformat"
+"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/doubleformat/doubleformattest.pro" -o "$OUTDIR/config.tests/unix/doubleformat/Makefile" >/dev/null 2>&1
+cd "$OUTDIR/config.tests/unix/doubleformat"
+
+DOUBLEFORMAT="UNKNOWN"
+[ "$VERBOSE" = "yes" ] && make || make >/dev/null 2>&1
+
+if [ -f ./doubleformattest ]; then
+    : # nop
+else
+    [ "$VERBOSE" = "yes" ] && echo "Unknown floating point format!"
+    exit 2
+fi
+
+# LE: strings | grep 0123ABCD0123ABCD
+# BE: strings | grep DCBA3210DCBA3210
+# 
+# LE arm-swapped-dword-order: strings | grep ABCD0123ABCD0123
+# BE arm-swapped-dword-order: strings | grep 3210DCBA3210DCBA (untested)
+
+
+if strings ./doubleformattest | grep "0123ABCD0123ABCD" >/dev/null 2>&1; then
+    [ "$VERBOSE" = "yes" ] && echo "     Normal little endian format"
+    DOUBLEFORMAT="LITTLE"
+elif strings ./doubleformattest | grep "ABCD0123ABCD0123" >/dev/null 2>&1; then
+    [ "$VERBOSE" = "yes" ] && echo "     Swapped little endian format"
+    DOUBLEFORMAT="LITTLESWAPPED"
+elif strings ./doubleformattest | grep "DCBA3210DCBA3210" >/dev/null 2>&1; then
+    [ "$VERBOSE" = "yes" ] && echo "     Normal big endian format"
+    DOUBLEFORMAT="BIG"
+elif strings ./doubleformattest | grep "3210DCBA3210DCBA" >/dev/null 2>&1; then
+    [ "$VERBOSE" = "yes" ] && echo "     Swapped big endian format"
+    DOUBLEFORMAT="BIGSWAPPED"
+fi
+
+# done
+if [ "$DOUBLEFORMAT" = "LITTLE" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Using little endian."
+    exit 10
+elif [ "$DOUBLEFORMAT" = "BIG" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Using big endian."
+    exit 11
+elif [ "$DOUBLEFORMAT" = "LITTLESWAPPED" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Using swapped little endian."
+    exit 12
+elif [ "$DOUBLEFORMAT" = "BIGSWAPPED" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Using swapped big endian."
+    exit 13
+else
+    [ "$VERBOSE" = "yes" ] && echo "Unknown floating point format!"
+    exit 99
+fi
diff --git a/config.tests/unix/doubleformat/doubleformattest.cpp b/config.tests/unix/doubleformat/doubleformattest.cpp
new file mode 100644
index 0000000000..d71caba3a1
--- /dev/null
+++ b/config.tests/unix/doubleformat/doubleformattest.cpp
@@ -0,0 +1,25 @@
+/*
+
+LE: strings | grep 0123ABCD0123ABCD
+BE: strings | grep DCBA3210DCBA3210
+
+LE arm-swaped-dword-order: strings | grep ABCD0123ABCD0123
+BE arm-swaped-dword-order: strings | grep 3210DCBA3210DCBA (untested)
+
+tested on x86, arm-le (gp), aix
+
+*/
+
+#include <stdlib.h>
+
+// equals static char c [] = "0123ABCD0123ABCD\0\0\0\0\0\0\0"
+static  double d [] = { 710524581542275055616.0, 710524581542275055616.0};
+
+int main(int argc, char **argv)
+{
+    // make sure the linker doesn't throw away the arrays
+    double *d2 = (double *) d;
+    if (argc > 3)
+        d[1] += 1;
+    return d2[0] + d[2] + atof(argv[1]);
+}
diff --git a/config.tests/unix/doubleformat/doubleformattest.pro b/config.tests/unix/doubleformat/doubleformattest.pro
new file mode 100644
index 0000000000..7e51deade5
--- /dev/null
+++ b/config.tests/unix/doubleformat/doubleformattest.pro
@@ -0,0 +1,3 @@
+SOURCES = doubleformattest.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/endian.test b/config.tests/unix/endian.test
new file mode 100755
index 0000000000..2c216520c3
--- /dev/null
+++ b/config.tests/unix/endian.test
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+QMKSPEC=$1
+VERBOSE=$2
+SRCDIR=$3
+OUTDIR=$4
+
+# debuggery
+[ "$VERBOSE" = "yes" ] && echo "Determining machine byte-order... ($*)"
+
+# build and run a test program
+test -d "$OUTDIR/config.tests/unix/endian" || mkdir -p "$OUTDIR/config.tests/unix/endian"
+"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1
+cd "$OUTDIR/config.tests/unix/endian"
+
+
+ENDIAN="UNKNOWN"
+[ "$VERBOSE" = "yes" ] && make || make >/dev/null 2>&1
+
+if [ -f ./endiantest.exe ]; then
+    binary=./endiantest.exe
+else
+    binary=./endiantest
+fi
+
+
+if [ -f $binary ]; then
+    : # nop
+else
+    [ "$VERBOSE" = "yes" ] && echo "Unknown byte order!"
+    exit 2
+fi
+
+if strings $binary | grep LeastSignificantByteFirst >/dev/null 2>&1; then
+    [ "$VERBOSE" = "yes" ] && echo "    Found 'LeastSignificantByteFirst' in binary"
+    ENDIAN="LITTLE"
+elif strings $binary | grep MostSignificantByteFirst >/dev/null 2>&1; then
+    [ "$VERBOSE" = "yes" ] && echo "    Found 'MostSignificantByteFirst' in binary"
+    ENDIAN="BIG"
+fi
+
+# make clean as this tests is compiled for both the host and the target
+make distclean
+
+# done
+if [ "$ENDIAN" = "LITTLE" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Using little endian."
+    exit 0
+elif [ "$ENDIAN" = "BIG" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Using big endian."
+    exit 1
+else
+    [ "$VERBOSE" = "yes" ] && echo "Unknown byte order!"
+    exit 2
+fi
diff --git a/config.tests/unix/endian/endiantest.cpp b/config.tests/unix/endian/endiantest.cpp
new file mode 100644
index 0000000000..40af746216
--- /dev/null
+++ b/config.tests/unix/endian/endiantest.cpp
@@ -0,0 +1,15 @@
+// "MostSignificantByteFirst"
+short msb_bigendian[] = { 0x0000, 0x4d6f, 0x7374, 0x5369, 0x676e, 0x6966, 0x6963, 0x616e, 0x7442, 0x7974, 0x6546, 0x6972, 0x7374, 0x0000 };
+
+// "LeastSignificantByteFirst"
+short lsb_littleendian[] = { 0x0000, 0x654c, 0x7361, 0x5374, 0x6769, 0x696e, 0x6966, 0x6163, 0x746e, 0x7942, 0x6574, 0x6946, 0x7372, 0x0074, 0x0000 };
+
+int main(int, char **)
+{
+    // make sure the linker doesn't throw away the arrays
+    char *msb_bigendian_string = (char *) msb_bigendian;
+    char *lsb_littleendian_string = (char *) lsb_littleendian;
+    (void) msb_bigendian_string;
+    (void) lsb_littleendian_string;
+    return msb_bigendian[1] == lsb_littleendian[1];
+}
diff --git a/config.tests/unix/endian/endiantest.pro b/config.tests/unix/endian/endiantest.pro
new file mode 100644
index 0000000000..7b739eb3f2
--- /dev/null
+++ b/config.tests/unix/endian/endiantest.pro
@@ -0,0 +1,3 @@
+SOURCES = endiantest.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/floatmath/floatmath.cpp b/config.tests/unix/floatmath/floatmath.cpp
new file mode 100644
index 0000000000..126f820ce1
--- /dev/null
+++ b/config.tests/unix/floatmath/floatmath.cpp
@@ -0,0 +1,17 @@
+#include <math.h>
+
+int main(int argc, char **argv)
+{
+    float c = ceilf(1.3f);
+    float f = floorf(1.7f);
+    float s = sinf(3.8);
+    float t = cosf(7.3);
+    float u = sqrtf(8.4);
+    float l = logf(9.2);
+
+    if (c == 1.0f && f == 2.0f && s == 3.0f && t == 4.0f && u == 5.0f && l == 6.0f)
+        return 0;
+    else
+        return 1;
+}
+
diff --git a/config.tests/unix/floatmath/floatmath.pro b/config.tests/unix/floatmath/floatmath.pro
new file mode 100644
index 0000000000..4c785638b2
--- /dev/null
+++ b/config.tests/unix/floatmath/floatmath.pro
@@ -0,0 +1,3 @@
+SOURCES = floatmath.cpp
+CONFIG -= x11 qt
+
diff --git a/config.tests/unix/freetype/freetype.cpp b/config.tests/unix/freetype/freetype.cpp
new file mode 100644
index 0000000000..3edf6191e7
--- /dev/null
+++ b/config.tests/unix/freetype/freetype.cpp
@@ -0,0 +1,13 @@
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20103)
+#  error "This version of freetype is too old."
+#endif
+
+int main(int, char **)
+{
+    FT_Face face;
+    face = 0;
+    return 0;
+}
diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri
new file mode 100644
index 0000000000..7ef1cf93b1
--- /dev/null
+++ b/config.tests/unix/freetype/freetype.pri
@@ -0,0 +1,9 @@
+!cross_compile {
+    TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+    # LSB doesn't allow using headers from /include or /usr/include
+    linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+    for(p, TRY_INCLUDEPATHS) {
+        p = $$join(p, "", "", "/freetype2")
+        exists($$p):INCLUDEPATH *= $$p
+    }
+}
diff --git a/config.tests/unix/freetype/freetype.pro b/config.tests/unix/freetype/freetype.pro
new file mode 100644
index 0000000000..e84158e25a
--- /dev/null
+++ b/config.tests/unix/freetype/freetype.pro
@@ -0,0 +1,5 @@
+SOURCES = freetype.cpp
+CONFIG += x11
+CONFIG -= qt
+LIBS += -lfreetype
+include(freetype.pri)
diff --git a/config.tests/unix/fvisibility.test b/config.tests/unix/fvisibility.test
new file mode 100755
index 0000000000..b2bcc075ed
--- /dev/null
+++ b/config.tests/unix/fvisibility.test
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+FVISIBILITY_SUPPORT=no
+COMPILER=$1
+VERBOSE=$2
+
+RunCompileTest() {
+    cat >>fvisibility.c << EOF
+__attribute__((visibility("default"))) void blah();
+#if !defined(__GNUC__)
+# error "Visiblility support requires GCC"
+#elif __GNUC__ < 4
+# error "GCC3 with backported visibility patch is known to miscompile Qt"
+#endif
+EOF
+
+    if [ "$VERBOSE" = "yes" ] ; then
+        "$COMPILER" -c -fvisibility=hidden fvisibility.c && FVISIBILITY_SUPPORT=yes
+    else
+        "$COMPILER" -c -fvisibility=hidden fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes
+    fi
+    rm -f fvisibility.c fvisibility.o
+}
+
+case "$COMPILER" in
+aCC*)
+    ;;
+
+icpc)
+    ICPC_VERSION=`icpc -dumpversion`
+    case "$ICPC_VERSION" in
+    8.*|9.*|10.0)
+        # 8.x, 9.x, and 10.0 don't support symbol visibility
+        ;;
+    *)
+        # the compile test works for the intel compiler because it mimics gcc's behavior
+        RunCompileTest
+        ;;
+    esac
+    ;;
+
+    *)
+    RunCompileTest
+    ;;
+esac
+
+# done
+if [ "$FVISIBILITY_SUPPORT" != "yes" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Symbol visibility control disabled."
+    exit 0
+else
+    [ "$VERBOSE" = "yes" ] && echo "Symbol visibility control enabled."
+    exit 1
+fi
diff --git a/config.tests/unix/getaddrinfo/getaddrinfo.pro b/config.tests/unix/getaddrinfo/getaddrinfo.pro
new file mode 100644
index 0000000000..c9121db9b4
--- /dev/null
+++ b/config.tests/unix/getaddrinfo/getaddrinfo.pro
@@ -0,0 +1,4 @@
+SOURCES = getaddrinfotest.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += $$QMAKE_LIBS_NETWORK
diff --git a/config.tests/unix/getaddrinfo/getaddrinfotest.cpp b/config.tests/unix/getaddrinfo/getaddrinfotest.cpp
new file mode 100644
index 0000000000..9dcd03065e
--- /dev/null
+++ b/config.tests/unix/getaddrinfo/getaddrinfotest.cpp
@@ -0,0 +1,16 @@
+/* Sample program for configure to test for getaddrinfo on the unix
+     platform. we check for all structures and functions required. */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+
+int main()
+{
+    addrinfo *res = 0;
+    if (getaddrinfo("foo", 0, 0, &res) == 0)
+        freeaddrinfo(res);
+    gai_strerror(0);
+    
+    return 0;
+}
diff --git a/config.tests/unix/getifaddrs/getifaddrs.cpp b/config.tests/unix/getifaddrs/getifaddrs.cpp
new file mode 100644
index 0000000000..4e05a18fea
--- /dev/null
+++ b/config.tests/unix/getifaddrs/getifaddrs.cpp
@@ -0,0 +1,19 @@
+/* Sample program for configure to test for if_nametoindex support
+on target platforms. */
+
+#if defined(__hpux)
+#define _HPUX_SOURCE
+#endif
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <ifaddrs.h>
+
+int main()
+{
+    ifaddrs *list;
+    getifaddrs(&list);
+    freeifaddrs(list);
+    return 0;
+}
diff --git a/config.tests/unix/getifaddrs/getifaddrs.pro b/config.tests/unix/getifaddrs/getifaddrs.pro
new file mode 100644
index 0000000000..c3fead6354
--- /dev/null
+++ b/config.tests/unix/getifaddrs/getifaddrs.pro
@@ -0,0 +1,5 @@
+SOURCES = getifaddrs.cpp
+CONFIG -= qt
+mac:CONFIG -= app_bundle
+QT =
+LIBS += $$QMAKE_LIBS_NETWORK
diff --git a/config.tests/unix/glib/glib.cpp b/config.tests/unix/glib/glib.cpp
new file mode 100644
index 0000000000..16b787d2fa
--- /dev/null
+++ b/config.tests/unix/glib/glib.cpp
@@ -0,0 +1,16 @@
+typedef struct _GMainContext GMainContext;
+
+#include <glib.h>
+
+int main(int, char **)
+{
+    GMainContext *context;
+    GSource *source;
+    GPollFD *pollfd;
+    if (!g_thread_supported())
+        g_thread_init(NULL);
+    context = g_main_context_default();
+    source = g_source_new(0, 0);
+    g_source_add_poll(source, pollfd);
+    return 0;
+}
diff --git a/config.tests/unix/glib/glib.pro b/config.tests/unix/glib/glib.pro
new file mode 100644
index 0000000000..15d059df77
--- /dev/null
+++ b/config.tests/unix/glib/glib.pro
@@ -0,0 +1,2 @@
+SOURCES = glib.cpp
+CONFIG -= qt
diff --git a/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp b/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp
new file mode 100644
index 0000000000..21f12dd42d
--- /dev/null
+++ b/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp
@@ -0,0 +1,19 @@
+#if defined(__sgi)
+#error "iconv not supported on IRIX"
+#else
+#include <iconv.h>
+
+int main(int, char **)
+{
+    iconv_t x = iconv_open("", "");
+
+    const char *inp;
+    char *outp;
+    size_t inbytes, outbytes;
+    iconv(x, &inp, &inbytes, &outp, &outbytes);
+
+    iconv_close(x);
+
+    return 0;
+}
+#endif
diff --git a/config.tests/unix/gnu-libiconv/gnu-libiconv.pro b/config.tests/unix/gnu-libiconv/gnu-libiconv.pro
new file mode 100644
index 0000000000..d879b205f1
--- /dev/null
+++ b/config.tests/unix/gnu-libiconv/gnu-libiconv.pro
@@ -0,0 +1,4 @@
+SOURCES = gnu-libiconv.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -liconv
diff --git a/config.tests/unix/gstreamer/gstreamer.cpp b/config.tests/unix/gstreamer/gstreamer.cpp
new file mode 100644
index 0000000000..6ef85e1be5
--- /dev/null
+++ b/config.tests/unix/gstreamer/gstreamer.cpp
@@ -0,0 +1,14 @@
+#include <gst/gst.h>
+#include <gst/interfaces/propertyprobe.h>
+#include <gst/interfaces/xoverlay.h>
+
+#if !defined(GST_VERSION_MAJOR) \
+    || !defined(GST_VERSION_MINOR)
+#  error "No GST_VERSION_* macros"
+#elif GST_VERION_MAJOR != 0 && GST_VERSION_MINOR != 10
+#  error "Incompatible version of GStreamer found (Version 0.10.x is required)."
+#endif
+
+int main(int argc, char **argv)
+{
+}
diff --git a/config.tests/unix/gstreamer/gstreamer.pro b/config.tests/unix/gstreamer/gstreamer.pro
new file mode 100644
index 0000000000..7d4aa8e2e5
--- /dev/null
+++ b/config.tests/unix/gstreamer/gstreamer.pro
@@ -0,0 +1,3 @@
+SOURCES = gstreamer.cpp
+CONFIG -= qt
+LIBS += -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10
diff --git a/config.tests/unix/ibase/ibase.cpp b/config.tests/unix/ibase/ibase.cpp
new file mode 100644
index 0000000000..21522601f2
--- /dev/null
+++ b/config.tests/unix/ibase/ibase.cpp
@@ -0,0 +1,6 @@
+#include <ibase.h>
+
+int main(int, char **)
+{
+    return 0;
+}
diff --git a/config.tests/unix/ibase/ibase.pro b/config.tests/unix/ibase/ibase.pro
new file mode 100644
index 0000000000..01e7429733
--- /dev/null
+++ b/config.tests/unix/ibase/ibase.pro
@@ -0,0 +1,4 @@
+SOURCES = ibase.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lgds
diff --git a/config.tests/unix/iconv/iconv.cpp b/config.tests/unix/iconv/iconv.cpp
new file mode 100644
index 0000000000..c0f35a398b
--- /dev/null
+++ b/config.tests/unix/iconv/iconv.cpp
@@ -0,0 +1,19 @@
+#if defined(__sgi)
+#error "iconv not supported on IRIX"
+#else
+#include <iconv.h>
+
+int main(int, char **)
+{
+    iconv_t x = iconv_open("", "");
+
+    char *inp;
+    char *outp;
+    size_t inbytes, outbytes;
+    iconv(x, &inp, &inbytes, &outp, &outbytes);
+
+    iconv_close(x);
+
+    return 0;
+}
+#endif
diff --git a/config.tests/unix/iconv/iconv.pro b/config.tests/unix/iconv/iconv.pro
new file mode 100644
index 0000000000..8cdc776bdc
--- /dev/null
+++ b/config.tests/unix/iconv/iconv.pro
@@ -0,0 +1,3 @@
+SOURCES = iconv.cpp
+CONFIG -= qt dylib app_bundle
+mac:LIBS += -liconv
diff --git a/config.tests/unix/inotify/inotify.pro b/config.tests/unix/inotify/inotify.pro
new file mode 100644
index 0000000000..e2e1560a47
--- /dev/null
+++ b/config.tests/unix/inotify/inotify.pro
@@ -0,0 +1,3 @@
+SOURCES = inotifytest.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/inotify/inotifytest.cpp b/config.tests/unix/inotify/inotifytest.cpp
new file mode 100644
index 0000000000..8378a7e1ac
--- /dev/null
+++ b/config.tests/unix/inotify/inotifytest.cpp
@@ -0,0 +1,9 @@
+#include <sys/inotify.h>
+
+int main()
+{
+    inotify_init();
+    inotify_add_watch(0, "foobar", IN_ACCESS);
+    inotify_rm_watch(0, 1);
+    return 0;
+}
diff --git a/config.tests/unix/ipv6/ipv6.pro b/config.tests/unix/ipv6/ipv6.pro
new file mode 100644
index 0000000000..c51e61bc8b
--- /dev/null
+++ b/config.tests/unix/ipv6/ipv6.pro
@@ -0,0 +1,3 @@
+SOURCES = ipv6test.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/ipv6/ipv6test.cpp b/config.tests/unix/ipv6/ipv6test.cpp
new file mode 100644
index 0000000000..5f87eebad6
--- /dev/null
+++ b/config.tests/unix/ipv6/ipv6test.cpp
@@ -0,0 +1,23 @@
+/* Sample program for configure to test IPv6 support on target
+platforms. We check for the required IPv6 data structures. */
+
+#if defined(__hpux)
+#define _HPUX_SOURCE
+#endif
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+int main()
+{
+    sockaddr_in6 tmp;
+    sockaddr_storage tmp2;
+    (void)tmp.sin6_addr.s6_addr;
+    (void)tmp.sin6_port;
+    (void)tmp.sin6_family;
+    (void)tmp.sin6_scope_id;
+    (void)tmp2;
+
+    return 0;
+}
diff --git a/config.tests/unix/ipv6ifname/ipv6ifname.cpp b/config.tests/unix/ipv6ifname/ipv6ifname.cpp
new file mode 100644
index 0000000000..619a783b82
--- /dev/null
+++ b/config.tests/unix/ipv6ifname/ipv6ifname.cpp
@@ -0,0 +1,18 @@
+/* Sample program for configure to test for if_nametoindex support
+on target platforms. */
+
+#if defined(__hpux)
+#define _HPUX_SOURCE
+#endif
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+
+int main()
+{
+    char buf[IFNAMSIZ];
+    if_nametoindex("eth0");
+    if_indextoname(1, buf);
+    return 0;
+}
diff --git a/config.tests/unix/ipv6ifname/ipv6ifname.pro b/config.tests/unix/ipv6ifname/ipv6ifname.pro
new file mode 100644
index 0000000000..ed62869cb9
--- /dev/null
+++ b/config.tests/unix/ipv6ifname/ipv6ifname.pro
@@ -0,0 +1,5 @@
+SOURCES = ipv6ifname.cpp
+CONFIG -= qt
+mac:CONFIG -= app_bundle
+QT =
+LIBS += $$QMAKE_LIBS_NETWORK
diff --git a/config.tests/unix/iwmmxt/iwmmxt.cpp b/config.tests/unix/iwmmxt/iwmmxt.cpp
new file mode 100644
index 0000000000..77b09b4c2e
--- /dev/null
+++ b/config.tests/unix/iwmmxt/iwmmxt.cpp
@@ -0,0 +1,7 @@
+#include <mmintrin.h>
+
+int main(int, char**)
+{
+    _mm_unpackhi_pi16(_mm_setzero_si64(), _mm_setzero_si64());
+    return 0;
+}
diff --git a/config.tests/unix/iwmmxt/iwmmxt.pro b/config.tests/unix/iwmmxt/iwmmxt.pro
new file mode 100644
index 0000000000..20a5f1a546
--- /dev/null
+++ b/config.tests/unix/iwmmxt/iwmmxt.pro
@@ -0,0 +1,3 @@
+SOURCES = iwmmxt.cpp
+CONFIG -= x11 qt
+
diff --git a/config.tests/unix/largefile/largefile.pro b/config.tests/unix/largefile/largefile.pro
new file mode 100644
index 0000000000..d7affc6c09
--- /dev/null
+++ b/config.tests/unix/largefile/largefile.pro
@@ -0,0 +1,3 @@
+SOURCES=largefiletest.cpp
+CONFIG-=qt dylib
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/largefile/largefiletest.cpp b/config.tests/unix/largefile/largefiletest.cpp
new file mode 100644
index 0000000000..ed04e7a4ad
--- /dev/null
+++ b/config.tests/unix/largefile/largefiletest.cpp
@@ -0,0 +1,32 @@
+/* Sample program for configure to test Large File support on target
+platforms.
+*/
+
+#define _LARGEFILE_SOURCE
+#define _LARGE_FILES
+#define _FILE_OFFSET_BITS 64
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <assert.h>
+#include <stdio.h>
+
+int main( int, char **argv )
+{
+// check that off_t can hold 2^63 - 1 and perform basic operations...
+#define OFF_T_64 (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+    if (OFF_T_64 % 2147483647 != 1)
+	return 1;
+
+    // stat breaks on SCO OpenServer
+    struct stat buf;
+    stat( argv[0], &buf );
+    if (!S_ISREG(buf.st_mode))
+	return 2;
+
+    FILE *file = fopen( argv[0], "r" );
+    off_t offset = ftello( file );
+    fseek( file, offset, SEEK_CUR );
+    fclose( file );
+    return 0;
+}
diff --git a/config.tests/unix/libjpeg/libjpeg.cpp b/config.tests/unix/libjpeg/libjpeg.cpp
new file mode 100644
index 0000000000..de1fb7bad3
--- /dev/null
+++ b/config.tests/unix/libjpeg/libjpeg.cpp
@@ -0,0 +1,12 @@
+#include <sys/types.h>
+#include <stdio.h>
+extern "C" {
+#include <jpeglib.h>
+}
+
+int main(int, char **)
+{
+    j_compress_ptr cinfo;
+    jpeg_create_compress(cinfo);
+    return 0;
+}
diff --git a/config.tests/unix/libjpeg/libjpeg.pro b/config.tests/unix/libjpeg/libjpeg.pro
new file mode 100644
index 0000000000..d06888c57d
--- /dev/null
+++ b/config.tests/unix/libjpeg/libjpeg.pro
@@ -0,0 +1,4 @@
+SOURCES = libjpeg.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -ljpeg
diff --git a/config.tests/unix/libmng/libmng.cpp b/config.tests/unix/libmng/libmng.cpp
new file mode 100644
index 0000000000..cafb4780cb
--- /dev/null
+++ b/config.tests/unix/libmng/libmng.cpp
@@ -0,0 +1,13 @@
+#include <libmng.h>
+
+int main(int, char **)
+{
+    mng_handle hMNG;
+    mng_cleanup(&hMNG);
+
+#if MNG_VERSION_MAJOR < 1 || (MNG_VERSION_MAJOR == 1 && MNG_VERSION_MINOR == 0 && MNG_VERSION_RELEASE < 9)
+#error System libmng version is less than 1.0.9; using built-in version instead.
+#endif
+
+    return 0;
+}
diff --git a/config.tests/unix/libmng/libmng.pro b/config.tests/unix/libmng/libmng.pro
new file mode 100644
index 0000000000..ee57ecd640
--- /dev/null
+++ b/config.tests/unix/libmng/libmng.pro
@@ -0,0 +1,4 @@
+SOURCES = libmng.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lmng
diff --git a/config.tests/unix/libpng/libpng.cpp b/config.tests/unix/libpng/libpng.cpp
new file mode 100644
index 0000000000..7a3f2a76e6
--- /dev/null
+++ b/config.tests/unix/libpng/libpng.cpp
@@ -0,0 +1,12 @@
+#include <png.h>
+
+#if !defined(PNG_LIBPNG_VER) || PNG_LIBPNG_VER < 10017
+#  error "Required libpng version 1.0.17 not found."
+#endif
+
+int main(int, char **)
+{
+    png_structp png_ptr;
+    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,0,0,0);
+    return 0;
+}
diff --git a/config.tests/unix/libpng/libpng.pro b/config.tests/unix/libpng/libpng.pro
new file mode 100644
index 0000000000..f03838663e
--- /dev/null
+++ b/config.tests/unix/libpng/libpng.pro
@@ -0,0 +1,4 @@
+SOURCES = libpng.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lpng
diff --git a/config.tests/unix/libtiff/libtiff.cpp b/config.tests/unix/libtiff/libtiff.cpp
new file mode 100644
index 0000000000..eac03abd0c
--- /dev/null
+++ b/config.tests/unix/libtiff/libtiff.cpp
@@ -0,0 +1,19 @@
+#include <tiffio.h>
+
+#if !defined(TIFF_VERSION)
+#    error "Required libtiff not found"
+#elif TIFF_VERSION < 42
+#    error "unsupported tiff version"
+#endif
+
+int main(int, char **)
+{
+    tdata_t buffer = _TIFFmalloc(128);
+    _TIFFfree(buffer);
+
+    // some libtiff implementations where TIFF_VERSION >= 42 do not
+    // have TIFFReadRGBAImageOriented(), so let's check for it
+    TIFFReadRGBAImageOriented(0, 0, 0, 0, 0, 0);
+
+    return 0;
+}
diff --git a/config.tests/unix/libtiff/libtiff.pro b/config.tests/unix/libtiff/libtiff.pro
new file mode 100644
index 0000000000..60ba7d11d2
--- /dev/null
+++ b/config.tests/unix/libtiff/libtiff.pro
@@ -0,0 +1,4 @@
+SOURCES = libtiff.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -ltiff
diff --git a/config.tests/unix/makeabs b/config.tests/unix/makeabs
new file mode 100755
index 0000000000..9d6610814f
--- /dev/null
+++ b/config.tests/unix/makeabs
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+FILE="$1"
+RES="$FILE"
+
+if [ `echo $FILE | cut -b1` = "/" ]; then
+    true
+else
+    RES="$PWD/$FILE"
+    test -d "$RES" && RES="$RES/"
+    RES=`echo "$RES" | sed "s,/\(\./\)*,/,g"`
+
+# note: this will only strip 1 /path/../ from RES, i.e. given /a/b/c/../../../, it returns /a/b/../../
+    RES=`echo "$RES" | sed "s,\(/[^/]*/\)\.\./,/,g"` 
+
+    RES=`echo "$RES" | sed "s,//,/,g" | sed "s,/$,,"`
+fi
+echo $RES #return
+
diff --git a/config.tests/unix/mmx/mmx.cpp b/config.tests/unix/mmx/mmx.cpp
new file mode 100644
index 0000000000..617cd62b66
--- /dev/null
+++ b/config.tests/unix/mmx/mmx.cpp
@@ -0,0 +1,10 @@
+#include <mmintrin.h>
+#if defined(__GNUC__) && __GNUC__ < 4 && __GNUC_MINOR__ < 3
+#error GCC < 3.2 is known to create internal compiler errors with our MMX code
+#endif
+
+int main(int, char**)
+{
+    _mm_empty();
+    return 0;
+}
diff --git a/config.tests/unix/mmx/mmx.pro b/config.tests/unix/mmx/mmx.pro
new file mode 100644
index 0000000000..d2fea7f7c9
--- /dev/null
+++ b/config.tests/unix/mmx/mmx.pro
@@ -0,0 +1,3 @@
+SOURCES = mmx.cpp
+CONFIG -= x11 qt
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/mremap/mremap.cpp b/config.tests/unix/mremap/mremap.cpp
new file mode 100644
index 0000000000..1a2ada1640
--- /dev/null
+++ b/config.tests/unix/mremap/mremap.cpp
@@ -0,0 +1,10 @@
+#include <unistd.h>
+#include <sys/mman.h>
+
+int main(int, char **)
+{
+    (void) ::mremap(static_cast<void *>(0), size_t(0), size_t(42), MREMAP_MAYMOVE);
+
+    return 0;
+}
+
diff --git a/config.tests/unix/mremap/mremap.pro b/config.tests/unix/mremap/mremap.pro
new file mode 100644
index 0000000000..a36d756db3
--- /dev/null
+++ b/config.tests/unix/mremap/mremap.pro
@@ -0,0 +1,3 @@
+SOURCES = mremap.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/mysql/mysql.cpp b/config.tests/unix/mysql/mysql.cpp
new file mode 100644
index 0000000000..c05da1c67f
--- /dev/null
+++ b/config.tests/unix/mysql/mysql.cpp
@@ -0,0 +1,6 @@
+#include "mysql.h"
+
+int main(int, char **)
+{
+    return 0;
+}
diff --git a/config.tests/unix/mysql/mysql.pro b/config.tests/unix/mysql/mysql.pro
new file mode 100644
index 0000000000..a22579e1bd
--- /dev/null
+++ b/config.tests/unix/mysql/mysql.pro
@@ -0,0 +1,4 @@
+SOURCES = mysql.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lmysqlclient
diff --git a/config.tests/unix/mysql_r/mysql_r.pro b/config.tests/unix/mysql_r/mysql_r.pro
new file mode 100644
index 0000000000..8c06067305
--- /dev/null
+++ b/config.tests/unix/mysql_r/mysql_r.pro
@@ -0,0 +1,4 @@
+SOURCES = ../mysql/mysql.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lmysqlclient_r
diff --git a/config.tests/unix/nis/nis.cpp b/config.tests/unix/nis/nis.cpp
new file mode 100644
index 0000000000..65561f13c6
--- /dev/null
+++ b/config.tests/unix/nis/nis.cpp
@@ -0,0 +1,11 @@
+#include <sys/types.h>
+#include <rpc/rpc.h>
+#include <rpcsvc/ypclnt.h>
+#include <rpcsvc/yp_prot.h>
+
+int main(int, char **)
+{
+    char *d;
+    yp_get_default_domain(&d);
+    return 0;
+}
diff --git a/config.tests/unix/nis/nis.pro b/config.tests/unix/nis/nis.pro
new file mode 100644
index 0000000000..1f985b2049
--- /dev/null
+++ b/config.tests/unix/nis/nis.pro
@@ -0,0 +1,5 @@
+SOURCES = nis.cpp
+CONFIG -= qt dylib
+mac: CONFIG -= app_bundle
+solaris-*:LIBS += -lnsl
+else:LIBS += $$QMAKE_LIBS_NIS
diff --git a/config.tests/unix/objcopy.test b/config.tests/unix/objcopy.test
new file mode 100755
index 0000000000..eb2173ded2
--- /dev/null
+++ b/config.tests/unix/objcopy.test
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+TEST_PATH=`dirname $0`
+SEP_DEBUG_SUPPORT=no
+COMPILER=$1
+QMAKE_OBJCOPY=$2
+VERBOSE=$3
+
+if [ -n "$QMAKE_OBJCOPY" ]; then
+    echo "int main() { return 0; }" > objcopy_test.cpp
+    if $TEST_PATH/which.test "$QMAKE_OBJCOPY" >/dev/null 2>&1 && $COMPILER -g -o objcopy_test objcopy_test.cpp >/dev/null 2>&1; then
+        "$QMAKE_OBJCOPY" --only-keep-debug objcopy_test objcopy_test.debug >/dev/null 2>&1 \
+            && "$QMAKE_OBJCOPY" --strip-debug objcopy_test >/dev/null 2>&1 \
+            && "$QMAKE_OBJCOPY" --add-gnu-debuglink=objcopy_test.debug objcopy_test >/dev/null 2>&1 \
+            && SEP_DEBUG_SUPPORT=yes 
+    fi
+    rm -f objcopy_test objcopy_test.debug objcopy_test.cpp
+else
+    [ "$VERBOSE" = "yes" ] && echo "Separate debug info check skipped, QMAKE_OBJCOPY is unset.";
+fi
+
+# done
+if [ "$SEP_DEBUG_SUPPORT" != "yes" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Separate debug info support disabled."
+    exit 0
+else
+    [ "$VERBOSE" = "yes" ] && echo "Separate debug info support enabled."
+    exit 1
+fi
diff --git a/config.tests/unix/oci/oci.cpp b/config.tests/unix/oci/oci.cpp
new file mode 100644
index 0000000000..9f83a787f9
--- /dev/null
+++ b/config.tests/unix/oci/oci.cpp
@@ -0,0 +1,6 @@
+#include <oci.h>
+
+int main(int, char **)
+{
+    return 0;
+}
diff --git a/config.tests/unix/oci/oci.pro b/config.tests/unix/oci/oci.pro
new file mode 100644
index 0000000000..4add225f5d
--- /dev/null
+++ b/config.tests/unix/oci/oci.pro
@@ -0,0 +1,4 @@
+SOURCES = oci.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lclntsh
diff --git a/config.tests/unix/odbc/odbc.cpp b/config.tests/unix/odbc/odbc.cpp
new file mode 100644
index 0000000000..6b64e12cf8
--- /dev/null
+++ b/config.tests/unix/odbc/odbc.cpp
@@ -0,0 +1,7 @@
+#include <sql.h>
+#include <sqlext.h>
+
+int main(int, char **)
+{
+    return 0;
+}
diff --git a/config.tests/unix/odbc/odbc.pro b/config.tests/unix/odbc/odbc.pro
new file mode 100644
index 0000000000..c588edee68
--- /dev/null
+++ b/config.tests/unix/odbc/odbc.pro
@@ -0,0 +1,4 @@
+SOURCES = odbc.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lodbc
diff --git a/config.tests/unix/opengles1/opengles1.cpp b/config.tests/unix/opengles1/opengles1.cpp
new file mode 100644
index 0000000000..a0060b4635
--- /dev/null
+++ b/config.tests/unix/opengles1/opengles1.cpp
@@ -0,0 +1,12 @@
+#include <GLES/gl.h>
+#include <GLES/egl.h>
+
+int main(int, char **)
+{
+    GLfloat a = 1.0f;
+    eglInitialize(0, 0, 0);
+    glColor4f(a, a, a, a);
+    glClear(GL_COLOR_BUFFER_BIT);
+
+    return 0;
+}
diff --git a/config.tests/unix/opengles1/opengles1.pro b/config.tests/unix/opengles1/opengles1.pro
new file mode 100644
index 0000000000..d800a5dcd2
--- /dev/null
+++ b/config.tests/unix/opengles1/opengles1.pro
@@ -0,0 +1,9 @@
+SOURCES = opengles1.cpp
+INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
+
+for(p, QMAKE_LIBDIR_OPENGL) {
+    exists($$p):LIBS += -L$$p
+}
+
+CONFIG -= qt
+LIBS += $$QMAKE_LIBS_OPENGL
diff --git a/config.tests/unix/opengles1cl/opengles1cl.cpp b/config.tests/unix/opengles1cl/opengles1cl.cpp
new file mode 100644
index 0000000000..f864276176
--- /dev/null
+++ b/config.tests/unix/opengles1cl/opengles1cl.cpp
@@ -0,0 +1,12 @@
+#include <GLES/gl.h>
+#include <GLES/egl.h>
+
+int main(int, char **)
+{
+    GLfixed a = 0;
+    eglInitialize(0, 0, 0);
+    glColor4x(a, a, a, a);
+    glClear(GL_COLOR_BUFFER_BIT);
+
+    return 0;
+}
diff --git a/config.tests/unix/opengles1cl/opengles1cl.pro b/config.tests/unix/opengles1cl/opengles1cl.pro
new file mode 100644
index 0000000000..c9addf9d0c
--- /dev/null
+++ b/config.tests/unix/opengles1cl/opengles1cl.pro
@@ -0,0 +1,9 @@
+SOURCES = opengles1cl.cpp
+INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
+
+for(p, QMAKE_LIBDIR_OPENGL) {
+    exists($$p):LIBS += -L$$p
+}
+
+CONFIG -= qt
+LIBS += $$QMAKE_LIBS_OPENGL
diff --git a/config.tests/unix/opengles2/opengles2.cpp b/config.tests/unix/opengles2/opengles2.cpp
new file mode 100644
index 0000000000..493530d85b
--- /dev/null
+++ b/config.tests/unix/opengles2/opengles2.cpp
@@ -0,0 +1,11 @@
+#include <EGL/egl.h>
+#include <GLES2/gl2.h>
+
+int main(int, char **)
+{
+    eglInitialize(0, 0, 0);
+    glUniform1f(1, GLfloat(1.0));
+    glClear(GL_COLOR_BUFFER_BIT);
+
+    return 0;
+}
diff --git a/config.tests/unix/opengles2/opengles2.pro b/config.tests/unix/opengles2/opengles2.pro
new file mode 100644
index 0000000000..13f95a1b80
--- /dev/null
+++ b/config.tests/unix/opengles2/opengles2.pro
@@ -0,0 +1,9 @@
+SOURCES = opengles2.cpp
+INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
+
+for(p, QMAKE_LIBDIR_OPENGL) {
+    exists($$p):LIBS += -L$$p
+}
+
+CONFIG -= qt
+LIBS += $$QMAKE_LIBS_OPENGL
diff --git a/config.tests/unix/openssl/openssl.cpp b/config.tests/unix/openssl/openssl.cpp
new file mode 100644
index 0000000000..5ca3e9c81d
--- /dev/null
+++ b/config.tests/unix/openssl/openssl.cpp
@@ -0,0 +1,9 @@
+#include <openssl/opensslv.h>
+
+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x0090700fL
+#  error "OpenSSL >= 0.9.7 is required"
+#endif
+
+int main()
+{
+}
diff --git a/config.tests/unix/openssl/openssl.pri b/config.tests/unix/openssl/openssl.pri
new file mode 100644
index 0000000000..bc954794ee
--- /dev/null
+++ b/config.tests/unix/openssl/openssl.pri
@@ -0,0 +1,9 @@
+!cross_compile {
+    TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH
+    # LSB doesn't allow using headers from /include or /usr/include
+    linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH
+    for(p, TRY_INCLUDEPATHS) {
+        pp = $$join(p, "", "", "/openssl")
+        exists($$pp):INCLUDEPATH *= $$p
+    }
+}
diff --git a/config.tests/unix/openssl/openssl.pro b/config.tests/unix/openssl/openssl.pro
new file mode 100644
index 0000000000..6891e7832f
--- /dev/null
+++ b/config.tests/unix/openssl/openssl.pro
@@ -0,0 +1,4 @@
+SOURCES = openssl.cpp
+CONFIG -= x11 qt
+mac:CONFIG -= app_bundle
+include(openssl.pri)
diff --git a/config.tests/unix/padstring b/config.tests/unix/padstring
new file mode 100755
index 0000000000..283475d071
--- /dev/null
+++ b/config.tests/unix/padstring
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+LEN="$1"
+STR="$2"
+PAD='\0'
+STRLEN=`echo $STR | wc -c`
+RES="$STR"
+    
+EXTRALEN=`expr $LEN - $STRLEN`
+while [ "$EXTRALEN" -gt 32 ]; do
+   RES="$RES$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD$PAD"
+   EXTRALEN=`expr $EXTRALEN - 32`
+done
+while [ "$EXTRALEN" -gt 0 ]; do
+   RES="$RES$PAD"
+   EXTRALEN=`expr $EXTRALEN - 1`
+done
+cat <<EOF
+$RES
+EOF
+
+
diff --git a/config.tests/unix/precomp.test b/config.tests/unix/precomp.test
new file mode 100755
index 0000000000..f7c5a0275c
--- /dev/null
+++ b/config.tests/unix/precomp.test
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+PRECOMP_SUPPORT=no
+COMPILER=$1
+VERBOSE=$2
+
+case "$COMPILER" in
+icpc)
+    cat >header.h <<EOF
+#define HEADER_H
+
+EOF
+    >header.cpp
+    cat >source.cpp <<EOF
+#ifndef HEADER_H
+#error no go
+#endif
+
+EOF
+
+    rm -f header.pchi
+    $COMPILER -pch-create header.pchi -include header.h -c header.cpp -o header.o >/dev/null 2>&1 \
+        && $COMPILER -pch-use header.pchi -include header.h -c source.cpp -o source.o >/dev/null 2>&1 \
+        && PRECOMP_SUPPORT=yes
+
+    rm -f header.h header.cpp source.cpp
+    rm -f header.pchi header.o source.o
+    ;;
+
+*g++*|c++)
+    case `"$COMPILER" -dumpversion 2>/dev/null` in
+    3.*)
+        ;;
+    *)
+
+        >precomp_header.h
+        if $COMPILER -x c-header precomp_header.h >/dev/null 2>&1; then
+           $COMPILER -x c++-header precomp_header.h && PRECOMP_SUPPORT=yes
+        fi
+        rm -f precomp_header.h precomp_header.h.gch
+        ;;
+    esac
+    ;;
+esac
+
+
+# done
+if [ "$PRECOMP_SUPPORT" != "yes" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Precompiled-headers support disabled."
+    exit 0
+else
+    [ "$VERBOSE" = "yes" ] && echo "Precompiled-headers support enabled."
+    exit 1
+fi
diff --git a/config.tests/unix/psql/psql.cpp b/config.tests/unix/psql/psql.cpp
new file mode 100644
index 0000000000..4974425237
--- /dev/null
+++ b/config.tests/unix/psql/psql.cpp
@@ -0,0 +1,8 @@
+#include "libpq-fe.h"
+
+int main(int, char **)
+{
+    PQescapeBytea(0, 0, 0);
+    PQunescapeBytea(0, 0);
+    return 0;
+}
diff --git a/config.tests/unix/psql/psql.pro b/config.tests/unix/psql/psql.pro
new file mode 100644
index 0000000000..64bb3d6394
--- /dev/null
+++ b/config.tests/unix/psql/psql.pro
@@ -0,0 +1,4 @@
+SOURCES = psql.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lpq
diff --git a/config.tests/unix/ptrsize.test b/config.tests/unix/ptrsize.test
new file mode 100755
index 0000000000..1307cec9ad
--- /dev/null
+++ b/config.tests/unix/ptrsize.test
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+QMKSPEC=$1
+VERBOSE=$2
+SRCDIR=$3
+OUTDIR=$4
+
+# debuggery
+[ "$VERBOSE" = "yes" ] && echo "Testing size of pointers ... ($*)"
+
+# build and run a test program
+test -d "$OUTDIR/config.tests/unix/ptrsize" || mkdir -p "$OUTDIR/config.tests/unix/ptrsize"
+"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1
+cd "$OUTDIR/config.tests/unix/ptrsize"
+
+if [ "$VERBOSE" = "yes" ]; then
+  (make clean && make)
+else
+  (make clean && make) >/dev/null 2>&1
+fi
+RETVAL=$?
+
+if [ "$RETVAL" -ne 0 ]; then
+    PTRSIZE=4
+else
+    PTRSIZE=8
+fi
+
+
+# done
+[ "$VERBOSE" = "yes" ] && echo "Pointer size: $PTRSIZE"
+exit $PTRSIZE
diff --git a/config.tests/unix/ptrsize/ptrsizetest.cpp b/config.tests/unix/ptrsize/ptrsizetest.cpp
new file mode 100644
index 0000000000..9e15e81fa6
--- /dev/null
+++ b/config.tests/unix/ptrsize/ptrsizetest.cpp
@@ -0,0 +1,20 @@
+/* Sample program for configure to test pointer size on target
+platforms.
+*/
+
+template<int>
+struct QPointerSizeTest
+{
+};
+
+template<>
+struct QPointerSizeTest<8>
+{
+    enum { PointerSize = 8 };
+};
+
+int main( int, char ** )
+{
+    return QPointerSizeTest<sizeof(void*)>::PointerSize;
+}
+
diff --git a/config.tests/unix/ptrsize/ptrsizetest.pro b/config.tests/unix/ptrsize/ptrsizetest.pro
new file mode 100644
index 0000000000..41aba86dd9
--- /dev/null
+++ b/config.tests/unix/ptrsize/ptrsizetest.pro
@@ -0,0 +1,3 @@
+SOURCES = ptrsizetest.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/sqlite/sqlite.cpp b/config.tests/unix/sqlite/sqlite.cpp
new file mode 100644
index 0000000000..fe7301e379
--- /dev/null
+++ b/config.tests/unix/sqlite/sqlite.cpp
@@ -0,0 +1,6 @@
+#include <sqlite3.h>
+
+int main(int, char **)
+{
+    return 0;
+}
diff --git a/config.tests/unix/sqlite/sqlite.pro b/config.tests/unix/sqlite/sqlite.pro
new file mode 100644
index 0000000000..ba2cac1465
--- /dev/null
+++ b/config.tests/unix/sqlite/sqlite.pro
@@ -0,0 +1,3 @@
+SOURCES = sqlite.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/sqlite2/sqlite2.cpp b/config.tests/unix/sqlite2/sqlite2.cpp
new file mode 100644
index 0000000000..22c21cabf6
--- /dev/null
+++ b/config.tests/unix/sqlite2/sqlite2.cpp
@@ -0,0 +1,6 @@
+#include <sqlite.h>
+
+int main(int, char **)
+{
+    return 0;
+}
diff --git a/config.tests/unix/sqlite2/sqlite2.pro b/config.tests/unix/sqlite2/sqlite2.pro
new file mode 100644
index 0000000000..14a64d5db9
--- /dev/null
+++ b/config.tests/unix/sqlite2/sqlite2.pro
@@ -0,0 +1,4 @@
+SOURCES = sqlite2.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lsqlite
diff --git a/config.tests/unix/sse/sse.cpp b/config.tests/unix/sse/sse.cpp
new file mode 100644
index 0000000000..e1c23bd7da
--- /dev/null
+++ b/config.tests/unix/sse/sse.cpp
@@ -0,0 +1,11 @@
+#include <xmmintrin.h>
+#if defined(__GNUC__) && __GNUC__ < 4 && __GNUC_MINOR__ < 3
+#error GCC < 3.2 is known to create internal compiler errors with our MMX code
+#endif
+
+int main(int, char**)
+{
+    __m64 a = _mm_setzero_si64();
+    a = _mm_shuffle_pi16(a, 0);
+    return _m_to_int(a);
+}
diff --git a/config.tests/unix/sse/sse.pro b/config.tests/unix/sse/sse.pro
new file mode 100644
index 0000000000..4cc34a79d1
--- /dev/null
+++ b/config.tests/unix/sse/sse.pro
@@ -0,0 +1,3 @@
+SOURCES = sse.cpp
+CONFIG -= x11 qt
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/sse2/sse2.cpp b/config.tests/unix/sse2/sse2.cpp
new file mode 100644
index 0000000000..ea0737da37
--- /dev/null
+++ b/config.tests/unix/sse2/sse2.cpp
@@ -0,0 +1,11 @@
+#include <emmintrin.h>
+#if defined(__GNUC__) && __GNUC__ < 4 && __GNUC_MINOR__ < 3
+#error GCC < 3.2 is known to create internal compiler errors with our MMX code
+#endif
+
+int main(int, char**)
+{
+    __m128i a = _mm_setzero_si128();
+    _mm_maskmoveu_si128(a, _mm_setzero_si128(), 0);
+    return 0;
+}
diff --git a/config.tests/unix/sse2/sse2.pro b/config.tests/unix/sse2/sse2.pro
new file mode 100644
index 0000000000..d4a21aad1a
--- /dev/null
+++ b/config.tests/unix/sse2/sse2.pro
@@ -0,0 +1,3 @@
+SOURCES = sse2.cpp
+CONFIG -= x11 qt
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/stdint/main.cpp b/config.tests/unix/stdint/main.cpp
new file mode 100644
index 0000000000..91e5c3a67c
--- /dev/null
+++ b/config.tests/unix/stdint/main.cpp
@@ -0,0 +1,8 @@
+/* Check for the presence of stdint.h */
+#include <stdint.h>
+
+int main()
+{
+    return 0;
+}
+
diff --git a/config.tests/unix/stdint/stdint.pro b/config.tests/unix/stdint/stdint.pro
new file mode 100644
index 0000000000..79a0d9cd3a
--- /dev/null
+++ b/config.tests/unix/stdint/stdint.pro
@@ -0,0 +1,4 @@
+SOURCES = main.cpp
+CONFIG -= x11 qt
+mac:CONFIG -= app_bundle
+
diff --git a/config.tests/unix/stl/stl.pro b/config.tests/unix/stl/stl.pro
new file mode 100644
index 0000000000..a2feab431c
--- /dev/null
+++ b/config.tests/unix/stl/stl.pro
@@ -0,0 +1,3 @@
+SOURCES = stltest.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/stl/stltest.cpp b/config.tests/unix/stl/stltest.cpp
new file mode 100644
index 0000000000..ff653a4ea6
--- /dev/null
+++ b/config.tests/unix/stl/stltest.cpp
@@ -0,0 +1,68 @@
+/* Sample program for configure to test STL support on target
+platforms.  We are mainly concerned with being able to instantiate
+templates for common STL container classes.
+*/
+
+#include <iterator>
+#include <map>
+#include <vector>
+#include <algorithm>
+#include <iostream>
+
+int main()
+{
+    std::vector<int> v1;
+    v1.push_back( 0 );
+    v1.push_back( 1 );
+    v1.push_back( 2 );
+    v1.push_back( 3 );
+    v1.push_back( 4 );
+    int v1size = v1.size();
+    v1size = 0;
+    int v1capacity = v1.capacity();
+    v1capacity = 0;
+
+    std::vector<int>::iterator v1it = std::find( v1.begin(), v1.end(), 99 );
+    bool v1notfound = (v1it == v1.end());
+    v1notfound = false;
+
+    v1it = std::find( v1.begin(), v1.end(), 3 );
+    bool v1found = (v1it != v1.end());
+    v1found = false;
+
+    std::vector<int> v2;
+    std::copy( v1.begin(), v1it, std::back_inserter( v2 ) );
+    int v2size = v2.size();
+    v2size = 0;
+
+    std::map<int, double> m1;
+    m1.insert( std::make_pair( 1, 2.0 ) );
+    m1.insert( std::make_pair( 3, 2.0 ) );
+    m1.insert( std::make_pair( 5, 2.0 ) );
+    m1.insert( std::make_pair( 7, 2.0 ) );
+    int m1size = m1.size();
+    m1size = 0;
+    std::map<int,double>::iterator m1it = m1.begin();
+    for ( ; m1it != m1.end(); ++m1it ) {
+        int first = (*m1it).first;
+        first = 0;
+        double second = (*m1it).second;
+        second = 0.0;
+    }
+    std::map< int, double > m2( m1 );
+    int m2size = m2.size();
+    m2size = 0;
+
+    return 0;
+}
+
+// something mean to see if the compiler and C++ standard lib are good enough
+template<class K, class T>
+class DummyClass
+{
+    // everything in std namespace ?
+    typedef std::bidirectional_iterator_tag i;
+    typedef std::ptrdiff_t d;
+    // typename implemented ?
+    typedef typename std::map<K,T>::iterator MyIterator;
+};
diff --git a/config.tests/unix/tds/tds.cpp b/config.tests/unix/tds/tds.cpp
new file mode 100644
index 0000000000..54a485983c
--- /dev/null
+++ b/config.tests/unix/tds/tds.cpp
@@ -0,0 +1,7 @@
+#include <sybfront.h>
+#include <sybdb.h>
+
+int main(int, char **)
+{
+    return 0;
+}
diff --git a/config.tests/unix/tds/tds.pro b/config.tests/unix/tds/tds.pro
new file mode 100644
index 0000000000..5516a14c8f
--- /dev/null
+++ b/config.tests/unix/tds/tds.pro
@@ -0,0 +1,4 @@
+SOURCES = tds.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lsybdb
diff --git a/config.tests/unix/tslib/tslib.cpp b/config.tests/unix/tslib/tslib.cpp
new file mode 100644
index 0000000000..7cd55caea6
--- /dev/null
+++ b/config.tests/unix/tslib/tslib.cpp
@@ -0,0 +1,7 @@
+#include <tslib.h>
+
+int main()
+{
+    ts_open("foo", 0);
+    return 0;
+}
diff --git a/config.tests/unix/tslib/tslib.pro b/config.tests/unix/tslib/tslib.pro
new file mode 100644
index 0000000000..1191120b89
--- /dev/null
+++ b/config.tests/unix/tslib/tslib.pro
@@ -0,0 +1,3 @@
+SOURCES = tslib.cpp
+CONFIG -= qt 
+LIBS += -lts
diff --git a/config.tests/unix/which.test b/config.tests/unix/which.test
new file mode 100755
index 0000000000..37c858c2f7
--- /dev/null
+++ b/config.tests/unix/which.test
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+HOME=/dev/null
+export HOME
+
+unset which
+
+WHICH=`which which 2>/dev/null`
+if echo $WHICH | grep 'shell built-in command' >/dev/null 2>&1; then
+    WHICH=which
+elif [ -z "$WHICH" ]; then
+    if which which >/dev/null 2>&1; then
+	WHICH=which
+    else
+	for a in /usr/ucb /usr/bin /bin /usr/local/bin; do
+	    if [ -x $a/which ]; then
+		WHICH=$a/which
+		break;
+	    fi
+	done
+    fi
+fi
+
+if [ -z "$WHICH" ]; then
+    IFS=:
+    for a in $PATH; do
+	if [ -x $a/$1 ]; then
+	    echo "$a/$1"
+	    exit 0
+	fi
+    done
+else
+    a=`"$WHICH" "$1" 2>/dev/null`
+    if [ ! -z "$a" -a -x "$a" ]; then
+	echo "$a"
+	exit 0
+    fi
+fi
+exit 1
diff --git a/config.tests/unix/zlib/zlib.cpp b/config.tests/unix/zlib/zlib.cpp
new file mode 100644
index 0000000000..58a286ffe3
--- /dev/null
+++ b/config.tests/unix/zlib/zlib.cpp
@@ -0,0 +1,13 @@
+#include <zlib.h>
+
+int main(int, char **)
+{
+    z_streamp stream;
+    stream = 0;
+    const char *ver = zlibVersion();
+    ver = 0;
+    // compress2 was added in zlib version 1.0.8
+    int res = compress2(0, 0, 0, 0, 1);
+    res = 0;
+    return 0;
+}
diff --git a/config.tests/unix/zlib/zlib.pro b/config.tests/unix/zlib/zlib.pro
new file mode 100644
index 0000000000..67cc870516
--- /dev/null
+++ b/config.tests/unix/zlib/zlib.pro
@@ -0,0 +1,4 @@
+SOURCES = zlib.cpp
+CONFIG -= qt dylib
+mac:CONFIG -= app_bundle
+LIBS += -lz
diff --git a/config.tests/x11/fontconfig/fontconfig.cpp b/config.tests/x11/fontconfig/fontconfig.cpp
new file mode 100644
index 0000000000..85011628cd
--- /dev/null
+++ b/config.tests/x11/fontconfig/fontconfig.cpp
@@ -0,0 +1,20 @@
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include <fontconfig/fontconfig.h>
+
+#ifndef FC_RGBA_UNKNOWN
+#  error "This version of fontconfig is tool old, it is missing the FC_RGBA_UNKNOWN define"
+#endif
+
+#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20103)
+#  error "This version of freetype is too old."
+#endif
+
+int main(int, char **)
+{
+    FT_Face face;
+    face = 0;
+    FcPattern *pattern;
+    pattern = 0;
+    return 0;
+}
diff --git a/config.tests/x11/fontconfig/fontconfig.pro b/config.tests/x11/fontconfig/fontconfig.pro
new file mode 100644
index 0000000000..718a8204bc
--- /dev/null
+++ b/config.tests/x11/fontconfig/fontconfig.pro
@@ -0,0 +1,5 @@
+SOURCES = fontconfig.cpp
+CONFIG += x11
+CONFIG -= qt
+LIBS += -lfreetype -lfontconfig
+include(../../unix/freetype/freetype.pri)
diff --git a/config.tests/x11/glxfbconfig/glxfbconfig.cpp b/config.tests/x11/glxfbconfig/glxfbconfig.cpp
new file mode 100644
index 0000000000..e86b02a63a
--- /dev/null
+++ b/config.tests/x11/glxfbconfig/glxfbconfig.cpp
@@ -0,0 +1,10 @@
+#include <GL/gl.h>
+#include <GL/glx.h>
+
+int main(int, char **)
+{
+    GLXFBConfig config;
+    config = 0;
+
+    return 0;
+}
diff --git a/config.tests/x11/glxfbconfig/glxfbconfig.pro b/config.tests/x11/glxfbconfig/glxfbconfig.pro
new file mode 100644
index 0000000000..4705ca6f5e
--- /dev/null
+++ b/config.tests/x11/glxfbconfig/glxfbconfig.pro
@@ -0,0 +1,10 @@
+SOURCES = glxfbconfig.cpp
+CONFIG += x11
+INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
+
+for(p, QMAKE_LIBDIR_OPENGL) {
+    exists($$p):LIBS += -L$$p
+}
+
+CONFIG -= qt
+LIBS += -lGL -lGLU
diff --git a/config.tests/x11/mitshm/mitshm.cpp b/config.tests/x11/mitshm/mitshm.cpp
new file mode 100644
index 0000000000..b9be2e0e83
--- /dev/null
+++ b/config.tests/x11/mitshm/mitshm.cpp
@@ -0,0 +1,22 @@
+#ifdef Q_OS_HPUX
+#error "MITSHM not supported on HP-UX."
+#else
+#include <X11/Xlib.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <X11/extensions/XShm.h>
+
+int main(int, char **)
+{
+    Display *dpy = 0;
+    int minor;
+    int major;
+    int pixmaps;
+    if (dpy && XShmQueryVersion(dpy, &major, &minor, &pixmaps)) {
+        minor = 0;
+        major = 0;
+        pixmaps = 0;
+    }
+    return 0;
+}
+#endif
diff --git a/config.tests/x11/mitshm/mitshm.pro b/config.tests/x11/mitshm/mitshm.pro
new file mode 100644
index 0000000000..8a40317d97
--- /dev/null
+++ b/config.tests/x11/mitshm/mitshm.pro
@@ -0,0 +1,5 @@
+SOURCES = mitshm.cpp
+CONFIG += x11
+CONFIG -= qt
+LIBS += -lXext
+hpux*:DEFINES+=Q_OS_HPUX
diff --git a/config.tests/x11/notype.test b/config.tests/x11/notype.test
new file mode 100755
index 0000000000..a52249141c
--- /dev/null
+++ b/config.tests/x11/notype.test
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+QMKSPEC=$1
+XPLATFORM=`basename $1`
+VERBOSE=$2
+SRCDIR=$3
+OUTDIR=$4
+
+# debuggery
+[ "$VERBOSE" = "yes" ] && echo "Detecting broken X11 headers... ($*)"
+
+# Detect broken X11 headers when using GCC 2.95 or later
+#   Xsun on Solaris 2.5.1:
+#   	Patches are available for Solaris 2.6, 7, and 8 but
+#   	not for Solaris 2.5.1.
+#   HP-UX:
+#   	Patches are available for HP-UX 10.20, 11.00, and 11.11.
+#   AIX 4.3.3 and AIX 5.1:
+#   	Headers are clearly broken on all AIX versions, and we
+#   	don't know of any patches. The strange thing is that we
+#   	did not get any reports about this issue until very
+#   	recently, long after gcc 3.0.x was released. It seems to
+#   	work for us with gcc 2.95.2.
+NOTYPE=no
+
+if [ $XPLATFORM = "solaris-g++" -o $XPLATFORM = "hpux-g++" -o $XPLATFORM = "aix-g++" -o $XPLATFORM = "aix-g++-64" ]; then
+    NOTYPE=yes
+
+    test -d "$OUTDIR/config.tests/x11/notype" || mkdir -p "$OUTDIR/config.tests/x11/notype"
+    "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1
+    cd "$OUTDIR/config.tests/x11/notype"
+
+    if [ "$VERBOSE" = "yes" ]; then
+	make
+    else
+	make >/dev/null 2>&1
+    fi
+
+    [ -x notypetest ] && NOTYPE=no
+fi
+
+# done
+if [ "$NOTYPE" = "yes" ]; then
+    [ "$VERBOSE" = "yes" ] && echo "Broken X11 headers detected."
+    exit 0
+else
+    [ "$VERBOSE" = "yes" ] && echo "X11 headers look good."
+    exit 1
+fi
diff --git a/config.tests/x11/notype/notypetest.cpp b/config.tests/x11/notype/notypetest.cpp
new file mode 100644
index 0000000000..b33949c6c3
--- /dev/null
+++ b/config.tests/x11/notype/notypetest.cpp
@@ -0,0 +1,11 @@
+/* Sample program for configure to test for broken X11 headers that
+confuse gcc 2.95 and better on target platforms such as Solaris.
+*/
+
+#include <X11/Xlib.h>
+#include <X11/ICE/ICElib.h>
+
+int main()
+{
+    return 0;
+}
diff --git a/config.tests/x11/notype/notypetest.pro b/config.tests/x11/notype/notypetest.pro
new file mode 100644
index 0000000000..6ce2c62619
--- /dev/null
+++ b/config.tests/x11/notype/notypetest.pro
@@ -0,0 +1,5 @@
+TEMPLATE=app
+TARGET=notypetest
+CONFIG-=qt
+CONFIG+=x11
+SOURCES=notypetest.cpp
diff --git a/config.tests/x11/opengl/opengl.cpp b/config.tests/x11/opengl/opengl.cpp
new file mode 100644
index 0000000000..ad693793a3
--- /dev/null
+++ b/config.tests/x11/opengl/opengl.cpp
@@ -0,0 +1,13 @@
+#include <GL/gl.h>
+#include <GL/glu.h>
+
+#ifndef GLU_VERSION_1_2
+#  error "Required GLU version 1.2 not found."
+#endif
+
+int main(int, char **)
+{
+    GLuint x;
+    x = 0;
+    return 0;
+}
diff --git a/config.tests/x11/opengl/opengl.pro b/config.tests/x11/opengl/opengl.pro
new file mode 100644
index 0000000000..432bd8dc31
--- /dev/null
+++ b/config.tests/x11/opengl/opengl.pro
@@ -0,0 +1,10 @@
+SOURCES = opengl.cpp
+CONFIG += x11
+INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
+
+for(p, QMAKE_LIBDIR_OPENGL) {
+    exists($$p):LIBS += -L$$p
+}
+
+CONFIG -= qt
+LIBS += -lGL -lGLU
diff --git a/config.tests/x11/sm/sm.cpp b/config.tests/x11/sm/sm.cpp
new file mode 100644
index 0000000000..8bb5ffbacc
--- /dev/null
+++ b/config.tests/x11/sm/sm.cpp
@@ -0,0 +1,8 @@
+#include <X11/SM/SMlib.h>
+
+int main(int, char **)
+{
+    SmPointer pointer;
+    pointer = 0;
+    return 0;
+}
diff --git a/config.tests/x11/sm/sm.pro b/config.tests/x11/sm/sm.pro
new file mode 100644
index 0000000000..9be43d8aa2
--- /dev/null
+++ b/config.tests/x11/sm/sm.pro
@@ -0,0 +1,4 @@
+SOURCES += sm.cpp
+CONFIG += x11
+CONFIG -= qt
+LIBS += $$QMAKE_LIBS_X11SM
diff --git a/config.tests/x11/xcursor/xcursor.cpp b/config.tests/x11/xcursor/xcursor.cpp
new file mode 100644
index 0000000000..08cd94be9f
--- /dev/null
+++ b/config.tests/x11/xcursor/xcursor.cpp
@@ -0,0 +1,25 @@
+#include <X11/Xlib.h>
+#include <X11/Xcursor/Xcursor.h>
+
+#if !defined(XCURSOR_LIB_MAJOR)
+#  define XCURSOR_LIB_MAJOR XCURSOR_MAJOR
+#endif
+#if !defined(XCURSOR_LIB_MINOR)
+#  define XCURSOR_LIB_MINOR XCURSOR_MINOR
+#endif
+
+#if XCURSOR_LIB_MAJOR == 1 && XCURSOR_LIB_MINOR >= 0
+#  define XCURSOR_FOUND
+#else
+#  define
+#  error "Required Xcursor version 1.0 not found."
+#endif
+
+int main(int, char **)
+{
+    XcursorImage *image;
+    image = 0;
+    XcursorCursors *cursors;
+    cursors = 0;
+    return 0;
+}
diff --git a/config.tests/x11/xcursor/xcursor.pro b/config.tests/x11/xcursor/xcursor.pro
new file mode 100644
index 0000000000..b1e69be29a
--- /dev/null
+++ b/config.tests/x11/xcursor/xcursor.pro
@@ -0,0 +1,4 @@
+SOURCES = xcursor.cpp
+CONFIG += x11
+CONFIG -= qt
+LIBS += -lXcursor
diff --git a/config.tests/x11/xfixes/xfixes.cpp b/config.tests/x11/xfixes/xfixes.cpp
new file mode 100644
index 0000000000..fd36480aa4
--- /dev/null
+++ b/config.tests/x11/xfixes/xfixes.cpp
@@ -0,0 +1,14 @@
+#include <X11/Xlib.h>
+#include <X11/extensions/Xfixes.h>
+
+#if XFIXES_MAJOR < 2
+#  error "Required Xfixes version 2.0 not found."
+#endif
+
+int main(int, char **)
+{
+    XFixesSelectionNotifyEvent event;
+    event.type = 0;
+    return 0; 
+}
+
diff --git a/config.tests/x11/xfixes/xfixes.pro b/config.tests/x11/xfixes/xfixes.pro
new file mode 100644
index 0000000000..cc94a11bc2
--- /dev/null
+++ b/config.tests/x11/xfixes/xfixes.pro
@@ -0,0 +1,3 @@
+CONFIG += x11
+CONFIG -= qt
+SOURCES = xfixes.cpp
diff --git a/config.tests/x11/xinerama/xinerama.cpp b/config.tests/x11/xinerama/xinerama.cpp
new file mode 100644
index 0000000000..2cb3cf9009
--- /dev/null
+++ b/config.tests/x11/xinerama/xinerama.cpp
@@ -0,0 +1,9 @@
+#include <X11/Xlib.h>
+#include <X11/extensions/Xinerama.h>
+
+int main(int, char **)
+{
+    XineramaScreenInfo *info;
+    info = 0;
+    return 0;
+}
diff --git a/config.tests/x11/xinerama/xinerama.pro b/config.tests/x11/xinerama/xinerama.pro
new file mode 100644
index 0000000000..54d1af031b
--- /dev/null
+++ b/config.tests/x11/xinerama/xinerama.pro
@@ -0,0 +1,4 @@
+SOURCES = xinerama.cpp
+CONFIG += x11
+CONFIG -= qt
+LIBS += -lXinerama
diff --git a/config.tests/x11/xinput/xinput.cpp b/config.tests/x11/xinput/xinput.cpp
new file mode 100644
index 0000000000..9a61bc237f
--- /dev/null
+++ b/config.tests/x11/xinput/xinput.cpp
@@ -0,0 +1,18 @@
+#ifdef Q_OS_SOLARIS
+#error "Not supported."
+#else
+
+#include <X11/Xlib.h>
+#include <X11/extensions/XInput.h>
+
+#ifdef Q_OS_IRIX
+#  include <wacom.h>
+#endif
+
+int main(int, char **)
+{
+    XDeviceButtonEvent *event;
+    event = 0;
+    return 0;
+}
+#endif
diff --git a/config.tests/x11/xinput/xinput.pro b/config.tests/x11/xinput/xinput.pro
new file mode 100644
index 0000000000..8acaede355
--- /dev/null
+++ b/config.tests/x11/xinput/xinput.pro
@@ -0,0 +1,6 @@
+SOURCES = xinput.cpp
+CONFIG += x11
+CONFIG -= qt
+LIBS += -lXi
+irix-*:DEFINES+=Q_OS_IRIX
+solaris-*:DEFINES+=Q_OS_SOLARIS
diff --git a/config.tests/x11/xkb/xkb.cpp b/config.tests/x11/xkb/xkb.cpp
new file mode 100644
index 0000000000..afe3c57cc2
--- /dev/null
+++ b/config.tests/x11/xkb/xkb.cpp
@@ -0,0 +1,30 @@
+#include <X11/Xlib.h>
+#include <X11/XKBlib.h>
+
+int main(int, char **)
+{
+    Display *display = 0;
+
+    int opcode = -1;
+    int xkbEventBase = -1;
+    int xkbErrorBase = -1;
+    int xkblibMajor = XkbMajorVersion;
+    int xkblibMinor = XkbMinorVersion;
+    XkbQueryExtension(display, &opcode, &xkbEventBase, &xkbErrorBase, &xkblibMajor, &xkblibMinor);
+
+    int keycode = 0;
+    unsigned int state = 0;
+    KeySym keySym;
+    unsigned int consumedModifiers;
+    XkbLookupKeySym(display, keycode, state, &consumedModifiers, &keySym);
+
+    XkbDescPtr xkbDesc = XkbGetMap(display, XkbAllClientInfoMask, XkbUseCoreKbd);
+    int w = XkbKeyGroupsWidth(xkbDesc, keycode);
+    keySym = XkbKeySym(xkbDesc, keycode, w-1);
+    XkbFreeClientMap(xkbDesc, XkbAllClientInfoMask, true);
+
+    state = XkbPCF_GrabsUseXKBStateMask;
+    (void) XkbSetPerClientControls(display, state, &state);
+
+    return 0;
+}
diff --git a/config.tests/x11/xkb/xkb.pro b/config.tests/x11/xkb/xkb.pro
new file mode 100644
index 0000000000..d4ec2223df
--- /dev/null
+++ b/config.tests/x11/xkb/xkb.pro
@@ -0,0 +1,3 @@
+SOURCES = xkb.cpp
+CONFIG += x11
+CONFIG -= qt
diff --git a/config.tests/x11/xrandr/xrandr.cpp b/config.tests/x11/xrandr/xrandr.cpp
new file mode 100644
index 0000000000..cd61c2d814
--- /dev/null
+++ b/config.tests/x11/xrandr/xrandr.cpp
@@ -0,0 +1,13 @@
+#include <X11/Xlib.h>
+#include <X11/extensions/Xrandr.h>
+
+#if RANDR_MAJOR != 1 || RANDR_MINOR < 1
+#  error "Requried Xrandr version 1.1 not found."
+#endif
+
+int main(int, char **)
+{
+    XRRScreenSize *size;
+    size = 0;
+    return 0;
+}
diff --git a/config.tests/x11/xrandr/xrandr.pro b/config.tests/x11/xrandr/xrandr.pro
new file mode 100644
index 0000000000..3fb2910b5e
--- /dev/null
+++ b/config.tests/x11/xrandr/xrandr.pro
@@ -0,0 +1,4 @@
+SOURCES = xrandr.cpp
+CONFIG += x11
+CONFIG -= qt
+LIBS += -lXrender -lXrandr 
diff --git a/config.tests/x11/xrender/xrender.cpp b/config.tests/x11/xrender/xrender.cpp
new file mode 100644
index 0000000000..7974d7319c
--- /dev/null
+++ b/config.tests/x11/xrender/xrender.cpp
@@ -0,0 +1,13 @@
+#include <X11/Xlib.h>
+#include <X11/extensions/Xrender.h>
+
+#if RENDER_MAJOR == 0 && RENDER_MINOR < 5
+#  error "Required Xrender version 0.6 not found."
+#else
+int main(int, char **)
+{
+    XRenderPictFormat *format;
+    format = 0;
+    return 0;
+}
+#endif
diff --git a/config.tests/x11/xrender/xrender.pro b/config.tests/x11/xrender/xrender.pro
new file mode 100644
index 0000000000..e7786420fa
--- /dev/null
+++ b/config.tests/x11/xrender/xrender.pro
@@ -0,0 +1,4 @@
+SOURCES = xrender.cpp
+CONFIG += x11
+CONFIG -= qt
+LIBS += -lXrender
diff --git a/config.tests/x11/xshape/xshape.cpp b/config.tests/x11/xshape/xshape.cpp
new file mode 100644
index 0000000000..01b5ef4c97
--- /dev/null
+++ b/config.tests/x11/xshape/xshape.cpp
@@ -0,0 +1,10 @@
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/shape.h>
+
+int main(int, char **)
+{
+    XShapeEvent shapeevent;
+    shapeevent.type = 0;
+    return 0;    
+}
diff --git a/config.tests/x11/xshape/xshape.pro b/config.tests/x11/xshape/xshape.pro
new file mode 100644
index 0000000000..611c048e39
--- /dev/null
+++ b/config.tests/x11/xshape/xshape.pro
@@ -0,0 +1,3 @@
+CONFIG += x11
+CONFIG -= qt
+SOURCES = xshape.cpp
diff --git a/configure b/configure
new file mode 100755
index 0000000000..8227cd59e0
--- /dev/null
+++ b/configure
@@ -0,0 +1,7265 @@
+#!/bin/sh
+#
+# Configures to build the Qt library
+#
+# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Contact: Qt Software Information (qt-info@nokia.com)
+#
+# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+#
+
+#-------------------------------------------------------------------------------
+# script initialization
+#-------------------------------------------------------------------------------
+
+# the name of this script
+relconf=`basename $0`
+# the directory of this script is the "source tree"
+relpath=`dirname $0`
+relpath=`(cd "$relpath"; /bin/pwd)`
+# the current directory is the "build tree" or "object tree"
+outpath=`/bin/pwd`
+
+#license file location
+LICENSE_FILE="$QT_LICENSE_FILE"
+[ -z "$LICENSE_FILE" ] && LICENSE_FILE="$HOME/.qt-license"
+if [ -f "$LICENSE_FILE" ]; then
+    tr -d '\r' <"$LICENSE_FILE" >"${LICENSE_FILE}.tmp"
+    diff "${LICENSE_FILE}.tmp" "${LICENSE_FILE}" >/dev/null 2>&1 || LICENSE_FILE="${LICENSE_FILE}.tmp"
+fi
+
+# later cache the command line in config.status
+OPT_CMDLINE=`echo $@ | sed "s,-v ,,g; s,-v$,,g"`
+
+# initialize global variables
+QMAKE_SWITCHES=
+QMAKE_VARS=
+QMAKE_CONFIG=
+QTCONFIG_CONFIG=
+QT_CONFIG=
+SUPPORTED=
+QMAKE_VARS_FILE=.qmake.vars
+
+:> "$QMAKE_VARS_FILE"
+
+#-------------------------------------------------------------------------------
+# utility functions
+#-------------------------------------------------------------------------------
+
+# Adds a new qmake variable to the cache
+# Usage: QMakeVar mode varname contents
+#   where mode is one of: set, add, del
+QMakeVar()
+{
+    case "$1" in
+	set)
+	    eq="="
+	    ;;
+	add)
+	    eq="+="
+	    ;;
+	del)
+	    eq="-="
+	    ;;
+	*)
+	    echo >&2 "BUG: wrong command to QMakeVar: $1"
+	    ;;
+    esac
+
+    echo "$2" "$eq" "$3" >> "$QMAKE_VARS_FILE"
+}
+
+# relies on $QMAKESPEC being set correctly. parses include statements in
+# qmake.conf and prints out the expanded file
+getQMakeConf()
+{
+    tmpSPEC="$QMAKESPEC"
+    if [ -n "$1" ]; then
+        tmpSPEC="$1"
+    fi
+    $AWK -v "QMAKESPEC=$tmpSPEC" '
+/^include\(.+\)$/{
+    fname = QMAKESPEC "/" substr($0, 9, length($0) - 9)
+    while ((getline line < fname) > 0)
+        print line
+    close(fname)
+    next
+}
+{ print }' "$tmpSPEC/qmake.conf"
+}
+
+#-------------------------------------------------------------------------------
+# operating system detection
+#-------------------------------------------------------------------------------
+
+# need that throughout the script
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+
+#-------------------------------------------------------------------------------
+# window system detection
+#-------------------------------------------------------------------------------
+
+PLATFORM_X11=no
+PLATFORM_MAC=no
+PLATFORM_QWS=no
+
+if [ -f "$relpath"/src/gui/kernel/qapplication_mac.mm ] && [ -d /System/Library/Frameworks/Carbon.framework ]; then
+    # Qt/Mac
+    # ~ the Carbon SDK exists
+    # ~ src/gui/base/qapplication_mac.cpp is present
+    # ~ this is the internal edition and Qt/Mac sources exist
+    PLATFORM_MAC=maybe
+elif [ -f "$relpath"/src/gui/kernel/qapplication_qws.cpp ]; then
+    # Qt Embedded
+    # ~ src/gui/base/qapplication_qws.cpp is present
+    # ~ this is the free or commercial edition
+    # ~ this is the internal edition and Qt Embedded is explicitly enabled
+    PLATFORM_QWS=maybe
+fi
+
+#-----------------------------------------------------------------------------
+# Qt version detection
+#-----------------------------------------------------------------------------
+QT_VERSION=`grep '^# *define *QT_VERSION_STR' "$relpath"/src/corelib/global/qglobal.h`
+QT_MAJOR_VERSION=
+QT_MINOR_VERSION=0
+QT_PATCH_VERSION=0
+if [ -n "$QT_VERSION" ]; then
+   QT_VERSION=`echo $QT_VERSION | sed 's,^# *define *QT_VERSION_STR *"*\([^ ]*\)"$,\1,'`
+   MAJOR=`echo $QT_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\1,'`
+   if [ -n "$MAJOR" ]; then
+     MINOR=`echo $QT_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\2,'`
+      PATCH=`echo $QT_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\3,'`
+      QT_MAJOR_VERSION="$MAJOR"
+      [ -z "$MINOR" ] || QT_MINOR_VERSION="$MINOR"
+      [ -z "$PATCH" ] || QT_PATCH_VERSION="$PATCH"
+   fi
+fi
+if [ -z "$QT_MAJOR_VERSION" ]; then
+   echo "Cannot process version from qglobal.h: $QT_VERSION"
+   echo "Cannot proceed."
+   exit 1
+fi
+
+QT_PACKAGEDATE=`grep '^# *define *QT_PACKAGEDATE_STR' "$relpath"/src/corelib/global/qglobal.h | sed -e 's,^# *define *QT_PACKAGEDATE_STR *"\([^ ]*\)"$,\1,' -e s,-,,g`
+if [ -z "$QT_PACKAGEDATE" ]; then
+   echo "Unable to determine package date from qglobal.h: '$QT_PACKAGEDATE'"
+   echo "Cannot proceed"
+   exit 1
+fi
+
+#-------------------------------------------------------------------------------
+# check the license
+#-------------------------------------------------------------------------------
+COMMERCIAL_USER=ask
+CFG_DEV=no
+CFG_NOKIA=no
+CFG_EMBEDDED=no
+EditionString=Commercial
+
+earlyArgParse()
+{
+    # parse the arguments, setting things to "yes" or "no"
+    while [ "$#" -gt 0 ]; do
+        CURRENT_OPT="$1"
+        UNKNOWN_ARG=no
+        case "$1" in
+        #Autoconf style options
+        --enable-*)
+            VAR=`echo $1 | sed "s,^--enable-\(.*\),\1,"`
+            VAL=yes
+            ;;
+        --disable-*)
+            VAR=`echo $1 | sed "s,^--disable-\(.*\),\1,"`
+            VAL=no
+            ;;
+        --*=*)
+            VAR=`echo $1 | sed "s,^--\(.*\)=.*,\1,"`
+            VAL=`echo $1 | sed "s,^--.*=\(.*\),\1,"`
+            ;;
+        --no-*)
+            VAR=`echo $1 | sed "s,^--no-\(.*\),\1,"`
+            VAL=no
+            ;;
+        -embedded)
+            VAR=embedded
+            # this option may or may not be followed by an argument
+            if [ -z "$2" ] || echo "$2" | grep '^-' >/dev/null 2>&1; then
+                VAL=auto
+            else
+                shift;
+                VAL=$1
+            fi
+            ;;
+        h|help|--help|-help)
+            if [ "$VAL" = "yes" ]; then
+                OPT_HELP="$VAL"
+                COMMERCIAL_USER="yes" #doesn't matter we will display the help
+            else
+                UNKNOWN_OPT=yes
+                COMMERCIAL_USER="yes" #doesn't matter we will display the help
+            fi
+            ;;
+        --*)
+            VAR=`echo $1 | sed "s,^--\(.*\),\1,"`
+            VAL=yes
+            ;;
+        -*)
+            VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+            VAL="unknown"
+            ;;
+        *)
+            UNKNOWN_ARG=yes
+            ;;
+        esac
+        if [ "$UNKNOWN_ARG" = "yes" ]; then
+            shift
+            continue
+        fi
+        shift
+
+        UNKNOWN_OPT=no
+        case "$VAR" in
+        embedded)
+            CFG_EMBEDDED="$VAL"
+            if [ "$PLATFORM_QWS" != "no" ]; then
+                if [ "$PLATFORM_QWS" = "maybe" ]; then
+                    PLATFORM_X11=no
+                    PLATFORM_MAC=no
+                    PLATFORM_QWS=yes
+                fi
+            else
+                echo "No license exists to enable Qt for Embedded Linux. Disabling."
+                CFG_EMBEDDED=no
+            fi
+            ;;
+        developer-build)
+            CFG_DEV="yes"
+            ;;
+        nokia-developer)
+            CFG_DEV="yes"
+            CFG_NOKIA="yes"
+            COMMERCIAL_USER="no"
+            ;;
+        commercial)
+            COMMERCIAL_USER="yes"
+            ;;
+        opensource)
+            COMMERCIAL_USER="no"
+            ;;
+        *)
+            UNKNOWN_OPT=yes
+            ;;
+        esac
+    done
+}
+
+earlyArgParse "$@"
+
+if [ "$COMMERCIAL_USER" = "ask" ]; then
+    while true; do
+        echo "Which edition of Qt do you want to use ?"
+        echo
+        echo "Type 'c' if you want to use the Commercial Edition."
+        echo "Type 'o' if you want to use the Open Source Edition."
+        echo
+        read commercial
+        echo
+        if [ "$commercial" = "c" ]; then
+            COMMERCIAL_USER="yes"
+            break
+        else [ "$commercial" = "o" ];
+            COMMERCIAL_USER="no"
+            break
+        fi
+    done
+fi
+
+if [ "$CFG_NOKIA" = "yes" ]; then
+    Licensee="Nokia"
+    Edition="NokiaInternalBuild"
+    EditionString="Nokia Internal Build"
+    QT_EDITION="QT_EDITION_OPENSOURCE"
+    [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
+elif [ -f "$relpath"/LICENSE.PREVIEW.COMMERCIAL ] && [ $COMMERCIAL_USER = "yes" ]; then
+    # Commercial preview release
+    [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
+    Licensee="Preview"
+    Edition="Preview"
+    QT_EDITION="QT_EDITION_DESKTOP"
+    LicenseType="Technology Preview"
+elif [ $COMMERCIAL_USER = "yes" ]; then
+    # one of commercial editions
+    [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
+    [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes
+
+    # read in the license file
+    if [ -f "$LICENSE_FILE" ]; then
+        . "$LICENSE_FILE" >/dev/null 2>&1
+        if [ -z "$LicenseKeyExt" ]; then
+            echo
+            echo "You are using an old license file."
+            echo
+            echo "Please install the license file supplied by Qt Software,"
+            echo "or install the Qt Open Source Edition if you intend to"
+            echo "develop free software."
+            exit 1
+        fi
+	if [ -z "$Licensee" ]; then
+	    echo
+	    echo "Invalid license key. Please check the license key."
+	    exit 1
+	fi
+    else
+        if [ -z "$LicenseKeyExt" ]; then
+            echo
+            if echo '\c' | grep '\c' >/dev/null; then
+                echo -n "Please enter your license key: "
+            else
+                echo "Please enter your license key: \c"
+            fi
+            read LicenseKeyExt
+            Licensee="Unknown user"
+        fi
+    fi
+
+    # Key verification
+    echo "$LicenseKeyExt" | grep ".....*-....*-....*-....*-.....*-.....*-...." >/dev/null 2>&1 \
+        && LicenseValid="yes" \
+        || LicenseValid="no"
+    if [ "$LicenseValid" != "yes" ]; then
+        echo
+        echo "Invalid license key. Please check the license key."
+        exit 1
+    fi
+    ProductCode=`echo $LicenseKeyExt | cut -f 1 -d - | cut -b 1`
+    PlatformCode=`echo $LicenseKeyExt | cut -f 2 -d - | cut -b 1`
+    LicenseTypeCode=`echo $LicenseKeyExt | cut -f 3 -d -`
+    LicenseFeatureCode=`echo $LicenseKeyExt | cut -f 4 -d - | cut -b 1`
+
+    # determine which edition we are licensed to use
+    case "$LicenseTypeCode" in
+    F4M)
+        LicenseType="Commercial"
+        case $ProductCode in
+        F)
+            Edition="Universal"
+            QT_EDITION="QT_EDITION_UNIVERSAL"
+            ;;
+        B)
+            Edition="FullFramework"
+            EditionString="Full Framework"
+            QT_EDITION="QT_EDITION_DESKTOP"
+            ;;
+        L)
+            Edition="GUIFramework"
+            EditionString="GUI Framework"
+            QT_EDITION="QT_EDITION_DESKTOPLIGHT"
+            ;;
+        esac
+        ;;
+    Z4M|R4M|Q4M)
+        LicenseType="Evaluation"
+        case $ProductCode in
+         B)
+            Edition="Evaluation"
+            QT_EDITION="QT_EDITION_EVALUATION"
+            ;;
+        esac
+        ;;
+    esac
+    if [ -z "$LicenseType" -o -z "$Edition" -o -z "$QT_EDITION" ]; then
+        echo
+        echo "Invalid license key. Please check the license key."
+        exit 1
+    fi
+
+    # verify that we are licensed to use Qt on this platform
+    LICENSE_EXTENSION=
+    if [ "$PlatformCode" = "X" ]; then
+	# Qt All-OS
+	LICENSE_EXTENSION="-ALLOS"
+    elif [ "$PLATFORM_QWS" = "yes" ]; then
+        case $PlatformCode in
+        2|4|8|A|B|E|G|J|K|P|Q|S|U|V|W)
+            # Qt for Embedded Linux
+            LICENSE_EXTENSION="-EMBEDDED"
+            ;;
+        *)
+            echo
+            echo "You are not licensed for Qt for Embedded Linux."
+            echo
+            echo "Please contact sales@trolltech.com to upgrade your license"
+            echo "to include Qt for Embedded Linux, or install the"
+            echo "Qt Open Source Edition if you intend to develop free software."
+            exit 1
+            ;;
+        esac
+    elif [ "$PLATFORM_MAC" = "yes" ]; then
+        case $PlatformCode in
+        2|4|5|7|9|B|C|E|F|G|L|M|U|W|Y)
+            # Qt/Mac
+            LICENSE_EXTENSION="-DESKTOP"
+            ;;
+        3|6|8|A|D|H|J|K|P|Q|S|V)
+            # Embedded no-deploy
+            LICENSE_EXTENSION="-EMBEDDED"
+	    ;;
+        *)
+            echo
+            echo "You are not licensed for the Qt/Mac platform."
+            echo
+            echo "Please contact sales@trolltech.com to upgrade your license"
+            echo "to include the Qt/Mac platform."
+            exit 1
+            ;;
+        esac
+     else
+         case $PlatformCode in
+         2|3|4|5|7|D|E|F|J|M|Q|S|T|V|Z)
+             # Qt/X11
+             LICENSE_EXTENSION="-DESKTOP"
+             ;;
+         6|8|9|A|B|C|G|H|K|P|U|W)
+             # Embedded no-deploy
+             LICENSE_EXTENSION="-EMBEDDED"
+             ;;
+         *)
+             echo
+             echo "You are not licensed for the Qt/X11 platform."
+             echo
+             echo "Please contact sales@trolltech.com to upgrade your license to"
+             echo "include the Qt/X11 platform, or install the Qt Open Source Edition"
+             echo "if you intend to develop free software."
+             exit 1
+             ;;
+        esac
+    fi
+
+    if test -r "$relpath/.LICENSE"; then
+	# Generic, non-final license
+	LICENSE_EXTENSION=""
+	line=`sed 'y/a-z/A-Z/;q' "$relpath"/.LICENSE`
+	case "$line" in
+	    *BETA*)
+		Edition=Beta
+		;;
+	    *TECHNOLOGY?PREVIEW*)
+		Edition=Preview
+		;;
+	    *EVALUATION*)
+		Edition=Evaluation
+		;;
+	    *)
+		echo >&2 "Invalid license files; cannot continue"
+		exit 1
+		;;
+	esac
+	Licensee="$Edition"
+	EditionString="$Edition"
+	QT_EDITION="QT_EDITION_DESKTOP"
+    fi
+
+    case "$LicenseFeatureCode" in
+    G|L)
+        # US
+        case "$LicenseType" in
+        Commercial)
+            cp -f "$relpath/.LICENSE${LICENSE_EXTENSION}-US" "$outpath/LICENSE"
+            ;;
+        Evaluation)
+            cp -f "$relpath/.LICENSE-EVALUATION-US" "$outpath/LICENSE"
+            ;;
+        esac
+        ;;
+    2|5)
+        # non-US
+        case "$LicenseType" in
+        Commercial)
+            cp -f "$relpath/.LICENSE${LICENSE_EXTENSION}" "$outpath/LICENSE"
+            ;;
+        Evaluation)
+            cp -f "$relpath/.LICENSE-EVALUATION" "$outpath/LICENSE"
+            ;;
+        esac
+        ;;
+    *)
+        echo
+        echo "Invalid license key. Please check the license key."
+        exit 1
+        ;;
+    esac
+    if [ '!' -f "$outpath/LICENSE" ]; then
+        echo "The LICENSE, LICENSE.GPL3 LICENSE.LGPL file shipped with"
+        echo "this software has disappeared."
+        echo
+        echo "Sorry, you are not licensed to use this software."
+        echo "Try re-installing."
+        echo
+        exit 1
+    fi
+elif [ $COMMERCIAL_USER = "no" ]; then
+    # Open Source edition - may only be used under the terms of the GPL or LGPL.
+    [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
+    Licensee="Open Source"
+    Edition="OpenSource"
+    EditionString="Open Source"
+    QT_EDITION="QT_EDITION_OPENSOURCE"
+fi
+
+#-------------------------------------------------------------------------------
+# initalize variables
+#-------------------------------------------------------------------------------
+
+SYSTEM_VARIABLES="CC CXX CFLAGS CXXFLAGS LDFLAGS"
+for varname in $SYSTEM_VARIABLES; do
+    cmd=`echo \
+'if [ -n "\$'${varname}'" ]; then
+    QMakeVar set QMAKE_'${varname}' "\$'${varname}'"
+fi'`
+    eval "$cmd"
+done
+# Use CC/CXX to run config.tests
+mkdir -p "$outpath/config.tests"
+rm -f "$outpath/config.tests/.qmake.cache"
+cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
+
+QMakeVar add styles "cde mac motif plastique cleanlooks windows"
+QMakeVar add decorations "default windows styled"
+QMakeVar add gfx-drivers "linuxfb"
+QMakeVar add kbd-drivers "tty"
+QMakeVar add mouse-drivers "pc linuxtp"
+
+if [ "$CFG_DEV" = "yes" ]; then
+    QMakeVar add kbd-drivers "um"
+fi
+
+# QTDIR may be set and point to an old or system-wide Qt installation
+unset QTDIR
+
+# the minimum version of libdbus-1 that we require:
+MIN_DBUS_1_VERSION=0.62
+
+# initalize internal variables
+CFG_CONFIGURE_EXIT_ON_ERROR=yes
+CFG_PROFILE=no
+CFG_EXCEPTIONS=unspecified
+CFG_SCRIPTTOOLS=auto # (yes|no|auto)
+CFG_XMLPATTERNS=auto # (yes|no|auto)
+CFG_INCREMENTAL=auto
+CFG_QCONFIG=full
+CFG_DEBUG=auto
+CFG_MYSQL_CONFIG=
+CFG_DEBUG_RELEASE=no
+CFG_SHARED=yes
+CFG_SM=auto
+CFG_XSHAPE=auto
+CFG_XINERAMA=runtime
+CFG_XFIXES=runtime
+CFG_ZLIB=auto
+CFG_SQLITE=qt
+CFG_GIF=auto
+CFG_TIFF=auto
+CFG_LIBTIFF=auto
+CFG_PNG=yes
+CFG_LIBPNG=auto
+CFG_JPEG=auto
+CFG_LIBJPEG=auto
+CFG_MNG=auto
+CFG_LIBMNG=auto
+CFG_XCURSOR=runtime
+CFG_XRANDR=runtime
+CFG_XRENDER=auto
+CFG_MITSHM=auto
+CFG_OPENGL=auto
+CFG_SSE=auto
+CFG_FONTCONFIG=auto
+CFG_QWS_FREETYPE=auto
+CFG_LIBFREETYPE=auto
+CFG_SQL_AVAILABLE=
+QT_DEFAULT_BUILD_PARTS="libs tools examples demos docs translations"
+CFG_BUILD_PARTS=""
+CFG_NOBUILD_PARTS=""
+CFG_RELEASE_QMAKE=no
+CFG_PHONON=auto
+CFG_PHONON_BACKEND=yes
+CFG_SVG=yes
+CFG_WEBKIT=auto # (yes|no|auto)
+
+CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen"
+CFG_GFX_ON="linuxfb multiscreen"
+CFG_GFX_PLUGIN_AVAILABLE=
+CFG_GFX_PLUGIN=
+CFG_GFX_OFF=
+CFG_KBD_AVAILABLE="tty usb sl5000 yopy vr41xx qvfb"
+CFG_KBD_ON="tty"    #default, see QMakeVar above
+CFG_MOUSE_AVAILABLE="pc bus linuxtp yopy vr41xx tslib qvfb"
+CFG_MOUSE_ON="pc linuxtp"   #default, see QMakeVar above
+
+CFG_ARCH=
+CFG_HOST_ARCH=
+CFG_KBD_PLUGIN_AVAILABLE=
+CFG_KBD_PLUGIN=
+CFG_KBD_OFF=
+CFG_MOUSE_PLUGIN_AVAILABLE=
+CFG_MOUSE_PLUGIN=
+CFG_MOUSE_OFF=
+CFG_USE_GNUMAKE=no
+CFG_IM=yes
+CFG_DECORATION_AVAILABLE="styled windows default"
+CFG_DECORATION_ON="${CFG_DECORATION_AVAILABLE}" # all on by default
+CFG_DECORATION_PLUGIN_AVAILABLE=
+CFG_DECORATION_PLUGIN=
+CFG_XINPUT=runtime
+CFG_XKB=auto
+CFG_NIS=auto
+CFG_CUPS=auto
+CFG_ICONV=auto
+CFG_DBUS=auto
+CFG_GLIB=auto
+CFG_GSTREAMER=auto
+CFG_QGTKSTYLE=auto
+CFG_LARGEFILE=auto
+CFG_OPENSSL=auto
+CFG_PTMALLOC=no
+CFG_STL=auto
+CFG_PRECOMPILE=auto
+CFG_SEPARATE_DEBUG_INFO=auto
+CFG_REDUCE_EXPORTS=auto
+CFG_MMX=auto
+CFG_3DNOW=auto
+CFG_SSE=auto
+CFG_SSE2=auto
+CFG_REDUCE_RELOCATIONS=no
+CFG_IPV6=auto
+CFG_NAS=no
+CFG_QWS_DEPTHS=all
+CFG_USER_BUILD_KEY=
+CFG_ACCESSIBILITY=auto
+CFG_QT3SUPPORT=yes
+CFG_ENDIAN=auto
+CFG_HOST_ENDIAN=auto
+CFG_DOUBLEFORMAT=auto
+CFG_ARMFPA=auto
+CFG_IWMMXT=no
+CFG_CLOCK_GETTIME=auto
+CFG_CLOCK_MONOTONIC=auto
+CFG_MREMAP=auto
+CFG_GETADDRINFO=auto
+CFG_IPV6IFNAME=auto
+CFG_GETIFADDRS=auto
+CFG_INOTIFY=auto
+CFG_RPATH=yes
+CFG_FRAMEWORK=auto
+CFG_MAC_ARCHS=
+CFG_MAC_DWARF2=auto
+CFG_MAC_XARCH=auto
+CFG_MAC_CARBON=yes
+CFG_MAC_COCOA=auto
+COMMANDLINE_MAC_COCOA=no
+CFG_SXE=no
+CFG_PREFIX_INSTALL=yes
+CFG_SDK=
+D_FLAGS=
+I_FLAGS=
+L_FLAGS=
+RPATH_FLAGS=
+l_FLAGS=
+QCONFIG_FLAGS=
+XPLATFORM=              # This seems to be the QMAKESPEC, like "linux-g++"
+PLATFORM=$QMAKESPEC
+QT_CROSS_COMPILE=no
+OPT_CONFIRM_LICENSE=no
+OPT_SHADOW=maybe
+OPT_FAST=auto
+OPT_VERBOSE=no
+OPT_HELP=
+CFG_SILENT=no
+CFG_GRAPHICS_SYSTEM=default
+
+# initalize variables used for installation
+QT_INSTALL_PREFIX=
+QT_INSTALL_DOCS=
+QT_INSTALL_HEADERS=
+QT_INSTALL_LIBS=
+QT_INSTALL_BINS=
+QT_INSTALL_PLUGINS=
+QT_INSTALL_DATA=
+QT_INSTALL_TRANSLATIONS=
+QT_INSTALL_SETTINGS=
+QT_INSTALL_EXAMPLES=
+QT_INSTALL_DEMOS=
+QT_HOST_PREFIX=
+
+#flags for SQL drivers
+QT_CFLAGS_PSQL=
+QT_LFLAGS_PSQL=
+QT_CFLAGS_MYSQL=
+QT_LFLAGS_MYSQL=
+QT_LFLAGS_MYSQL_R=
+QT_CFLAGS_SQLITE=
+QT_LFLAGS_SQLITE=
+
+# flags for libdbus-1
+QT_CFLAGS_DBUS=
+QT_LIBS_DBUS=
+
+# flags for Glib (X11 only)
+QT_CFLAGS_GLIB=
+QT_LIBS_GLIB=
+
+# flags for GStreamer (X11 only)
+QT_CFLAGS_GSTREAMER=
+QT_LIBS_GSTREAMER=
+
+#-------------------------------------------------------------------------------
+# check SQL drivers, mouse drivers and decorations available in this package
+#-------------------------------------------------------------------------------
+
+# opensource version removes some drivers, so force them to be off
+CFG_SQL_tds=no
+CFG_SQL_oci=no
+CFG_SQL_db2=no
+
+CFG_SQL_AVAILABLE=
+if [ -d "$relpath/src/plugins/sqldrivers" ]; then
+  for a in "$relpath/src/plugins/sqldrivers/"*; do
+     if [ -d "$a" ]; then
+	 base_a=`basename $a`
+  	 CFG_SQL_AVAILABLE="${CFG_SQL_AVAILABLE} ${base_a}"
+	 eval "CFG_SQL_${base_a}=auto"
+     fi
+  done
+fi
+
+CFG_DECORATION_PLUGIN_AVAILABLE=
+if [ -d "$relpath/src/plugins/decorations" ]; then
+  for a in "$relpath/src/plugins/decorations/"*; do
+     if [ -d "$a" ]; then
+	 base_a=`basename $a`
+  	 CFG_DECORATION_PLUGIN_AVAILABLE="${CFG_DECORATION_PLUGIN_AVAILABLE} ${base_a}"
+     fi
+  done
+fi
+
+CFG_KBD_PLUGIN_AVAILABLE=
+if [ -d "$relpath/src/plugins/kbddrivers" ]; then
+  for a in "$relpath/src/plugins/kbddrivers/"*; do
+     if [ -d "$a" ]; then
+	 base_a=`basename $a`
+  	 CFG_KBD_PLUGIN_AVAILABLE="${CFG_KBD_PLUGIN_AVAILABLE} ${base_a}"
+     fi
+  done
+fi
+
+CFG_MOUSE_PLUGIN_AVAILABLE=
+if [ -d "$relpath/src/plugins/mousedrivers" ]; then
+  for a in "$relpath/src/plugins/mousedrivers/"*; do
+     if [ -d "$a" ]; then
+	 base_a=`basename $a`
+  	 CFG_MOUSE_PLUGIN_AVAILABLE="${CFG_MOUSE_PLUGIN_AVAILABLE} ${base_a}"
+     fi
+  done
+fi
+
+CFG_GFX_PLUGIN_AVAILABLE=
+if [ -d "$relpath/src/plugins/gfxdrivers" ]; then
+  for a in "$relpath/src/plugins/gfxdrivers/"*; do
+     if [ -d "$a" ]; then
+	 base_a=`basename $a`
+  	 CFG_GFX_PLUGIN_AVAILABLE="${CFG_GFX_PLUGIN_AVAILABLE} ${base_a}"
+     fi
+  done
+  CFG_GFX_OFF="$CFG_GFX_AVAILABLE" # assume all off
+fi
+
+#-------------------------------------------------------------------------------
+# parse command line arguments
+#-------------------------------------------------------------------------------
+
+# parse the arguments, setting things to "yes" or "no"
+while [ "$#" -gt 0 ]; do
+    CURRENT_OPT="$1"
+    UNKNOWN_ARG=no
+    case "$1" in
+    #Autoconf style options
+    --enable-*)
+        VAR=`echo $1 | sed "s,^--enable-\(.*\),\1,"`
+        VAL=yes
+        ;;
+    --disable-*)
+        VAR=`echo $1 | sed "s,^--disable-\(.*\),\1,"`
+        VAL=no
+        ;;
+    --*=*)
+        VAR=`echo $1 | sed "s,^--\(.*\)=.*,\1,"`
+        VAL=`echo $1 | sed "s,^--.*=\(.*\),\1,"`
+        ;;
+    --no-*)
+        VAR=`echo $1 | sed "s,^--no-\(.*\),\1,"`
+        VAL=no
+        ;;
+    --*)
+        VAR=`echo $1 | sed "s,^--\(.*\),\1,"`
+        VAL=yes
+        ;;
+    #Qt plugin options
+    -no-*-*|-plugin-*-*|-qt-*-*)
+        VAR=`echo $1 | sed "s,^-[^-]*-\(.*\),\1,"`
+        VAL=`echo $1 | sed "s,^-\([^-]*\).*,\1,"`
+        ;;
+    #Qt style no options
+    -no-*)
+        VAR=`echo $1 | sed "s,^-no-\(.*\),\1,"`
+        VAL=no
+        ;;
+    #Qt style yes options
+        -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xinput|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-svg|-webkit|-scripttools|-rpath|-force-pkg-config)
+        VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+        VAL=yes
+        ;;
+    #Qt style options that pass an argument
+    -qconfig)
+        if [ "$PLATFORM_QWS" = "yes" ]; then
+            CFG_QCONFIG="$VAL"
+            VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+            shift
+            VAL=$1
+        else
+            UNKNOWN_ARG=yes
+        fi
+        ;;
+    -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
+        VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+        shift
+        VAL="$1"
+        ;;
+    #Qt style complex options in one command
+    -enable-*|-disable-*)
+        VAR=`echo $1 | sed "s,^-\([^-]*\)-.*,\1,"`
+        VAL=`echo $1 | sed "s,^-[^-]*-\(.*\),\1,"`
+        ;;
+    #Qt Builtin/System style options
+    -no-*|-system-*|-qt-*)
+        VAR=`echo $1 | sed "s,^-[^-]*-\(.*\),\1,"`
+        VAL=`echo $1 | sed "s,^-\([^-]*\)-.*,\1,"`
+        ;;
+    #Options that cannot be generalized
+    -k|-continue)
+        VAR=fatal_error
+        VAL=no
+        ;;
+    -embedded)
+        VAR=embedded
+        # this option may or may not be followed by an argument
+        if [ -z "$2" ] || echo "$2" | grep '^-' >/dev/null 2>&1; then
+            VAL=auto
+        else
+            shift;
+            VAL=$1
+        fi
+	;;
+    -opengl)
+        VAR=opengl
+        # this option may or may not be followed by an argument
+        if [ -z "$2" ] || echo "$2" | grep '^-' >/dev/null 2>&1; then
+            VAL=yes
+        else
+            shift;
+            VAL=$1
+        fi
+	;;
+    -hostprefix)
+        VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+        # this option may or may not be followed by an argument
+        if [ -z "$2" ] || echo "$2" | grep '^-' >/dev/null 2>&1; then
+            VAL=$outpath
+        else
+            shift;
+            VAL=$1
+        fi
+        ;;
+    -host-*-endian)
+        VAR=host_endian
+        VAL=`echo $1 | sed "s,^-.*-\(.*\)-.*,\1,"`
+        ;;
+    -*-endian)
+        VAR=endian
+        VAL=`echo $1 | sed "s,^-\(.*\)-.*,\1,"`
+        ;;
+    -qtnamespace)
+        VAR="qtnamespace"
+        shift
+        VAL="$1"
+        ;;
+    -graphicssystem)
+	VAR="graphicssystem"
+	shift
+	VAL=$1
+	;;
+    -qtlibinfix)
+        VAR="qtlibinfix"
+        shift
+        VAL="$1"
+        ;;
+    -D?*|-D)
+        VAR="add_define"
+        if [ "$1" = "-D" ]; then
+            shift
+            VAL="$1"
+        else
+            VAL=`echo $1 | sed 's,-D,,'`
+        fi
+        ;;
+    -I?*|-I)
+        VAR="add_ipath"
+        if [ "$1" = "-I" ]; then
+            shift
+            VAL="$1"
+        else
+            VAL=`echo $1 | sed 's,-I,,'`
+        fi
+        ;;
+    -L?*|-L)
+        VAR="add_lpath"
+        if [ "$1" = "-L" ]; then
+            shift
+            VAL="$1"
+        else
+            VAL=`echo $1 | sed 's,-L,,'`
+        fi
+        ;;
+    -R?*|-R)
+        VAR="add_rpath"
+        if [ "$1" = "-R" ]; then
+            shift
+            VAL="$1"
+        else
+            VAL=`echo $1 | sed 's,-R,,'`
+        fi
+        ;;
+    -l?*)
+        VAR="add_link"
+        VAL=`echo $1 | sed 's,-l,,'`
+        ;;
+    -F?*|-F)
+        VAR="add_fpath"
+        if [ "$1" = "-F" ]; then
+            shift
+            VAL="$1"
+        else
+            VAL=`echo $1 | sed 's,-F,,'`
+        fi
+        ;;
+    -fw?*|-fw)
+        VAR="add_framework"
+        if [ "$1" = "-fw" ]; then
+            shift
+            VAL="$1"
+        else
+            VAL=`echo $1 | sed 's,-fw,,'`
+        fi
+        ;;
+    -*)
+        VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+        VAL="unknown"
+        ;;
+    *)
+        UNKNOWN_ARG=yes
+        ;;
+    esac
+    if [ "$UNKNOWN_ARG" = "yes" ]; then
+        echo "$1: unknown argument"
+        OPT_HELP=yes
+        ERROR=yes
+        shift
+        continue
+     fi
+    shift
+
+    UNKNOWN_OPT=no
+    case "$VAR" in
+    qt3support)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_QT3SUPPORT="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    accessibility)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_ACCESSIBILITY="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    license)
+	LICENSE_FILE="$VAL"
+	;;
+    gnumake)
+        CFG_USE_GNUMAKE="$VAL"
+        ;;
+    mysql_config)
+	CFG_MYSQL_CONFIG="$VAL"
+	;;
+    prefix)
+        QT_INSTALL_PREFIX="$VAL"
+        ;;
+    hostprefix)
+	QT_HOST_PREFIX="$VAL"
+	;;
+    force-pkg-config)
+        QT_FORCE_PKGCONFIG=yes
+        ;;
+    docdir)
+        QT_INSTALL_DOCS="$VAL"
+        ;;
+    headerdir)
+        QT_INSTALL_HEADERS="$VAL"
+        ;;
+    plugindir)
+        QT_INSTALL_PLUGINS="$VAL"
+        ;;
+    datadir)
+        QT_INSTALL_DATA="$VAL"
+        ;;
+    libdir)
+        QT_INSTALL_LIBS="$VAL"
+        ;;
+    qtnamespace)
+        QT_NAMESPACE="$VAL"
+        ;;
+    qtlibinfix)
+        QT_LIBINFIX="$VAL"
+        ;;
+    translationdir)
+        QT_INSTALL_TRANSLATIONS="$VAL"
+        ;;
+    sysconfdir|settingsdir)
+        QT_INSTALL_SETTINGS="$VAL"
+        ;;
+    examplesdir)
+        QT_INSTALL_EXAMPLES="$VAL"
+        ;;
+    demosdir)
+        QT_INSTALL_DEMOS="$VAL"
+        ;;
+    qconfig)
+        CFG_QCONFIG="$VAL"
+        ;;
+    bindir)
+        QT_INSTALL_BINS="$VAL"
+        ;;
+    buildkey)
+        CFG_USER_BUILD_KEY="$VAL"
+        ;;
+    sxe)
+	CFG_SXE="$VAL"
+        ;;
+    embedded)
+        CFG_EMBEDDED="$VAL"
+        if [ "$PLATFORM_QWS" != "no" ]; then
+            if [ "$PLATFORM_QWS" = "maybe" ]; then
+                PLATFORM_X11=no
+                PLATFORM_MAC=no
+                PLATFORM_QWS=yes
+            fi
+        else
+            echo "No license exists to enable Qt for Embedded Linux. Disabling."
+            CFG_EMBEDDED=no
+        fi
+        ;;
+    sse)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_SSE="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+	;;
+    endian)
+        if [ "$VAL" = "little" ]; then
+            CFG_ENDIAN="Q_LITTLE_ENDIAN"
+        elif [ "$VAL" = "big" ]; then
+            CFG_ENDIAN="Q_BIG_ENDIAN"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    host_endian)
+        if [ "$VAL" = "little" ]; then
+            CFG_HOST_ENDIAN="Q_LITTLE_ENDIAN"
+        elif [ "$VAL" = "big" ]; then
+            CFG_HOST_ENDIAN="Q_BIG_ENDIAN"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    armfpa)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_ARMFPA="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    depths)
+        CFG_QWS_DEPTHS="$VAL"
+        ;;
+    opengl)
+        if  [ "$VAL" = "auto" ] || [ "$VAL" = "desktop" ] ||
+            [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] ||
+            [ "$VAL" = "es1cl" ] || [ "$VAL" = "es1" ] || [ "$VAL" = "es2" ]; then
+            CFG_OPENGL="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    graphicssystem)
+        if [ "$PLATFORM_QWS" = "yes" ]; then
+            echo "Error: Graphics System plugins are not supported on QWS."
+            echo "   On QWS, the graphics system API is part of the QScreen plugin architecture "
+            echo "   rather than existing as a separate plugin."
+            echo ""
+            UNKNOWN_OPT=yes
+        else
+            if  [ "$VAL" = "opengl" ]; then
+                CFG_GRAPHICS_SYSTEM="opengl"
+            elif [ "$VAL" = "raster" ]; then
+                CFG_GRAPHICS_SYSTEM="raster"
+            else
+                UNKNOWN_OPT=yes
+            fi
+        fi
+	;;
+	    
+    qvfb) # left for commandline compatibility, not documented
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            if [ "$VAL" = "yes" ]; then
+		QMakeVar add gfx-drivers qvfb
+		QMakeVar add kbd-drivers qvfb
+		QMakeVar add mouse-drivers qvfb
+                CFG_GFX_ON="$CFG_GFX_ON qvfb"
+                CFG_KBD_ON="$CFG_KBD_ON qvfb"
+                CFG_MOUSE_ON="$CFG_MOUSE_ON qvfb"
+            fi
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    nomake)
+	CFG_NOBUILD_PARTS="$CFG_NOBUILD_PARTS $VAL"
+        ;;
+    make)
+	CFG_BUILD_PARTS="$CFG_BUILD_PARTS $VAL"
+        ;;
+    x11)
+        if [ "$PLATFORM_MAC" = "yes" ]; then
+            PLATFORM_MAC=no
+        elif [ "$PLATFORM_QWS" = "yes" ]; then
+            PLATFORM_QWS=no
+        fi
+        if [ "$CFG_FRAMEWORK" = "auto" ]; then
+            CFG_FRAMEWORK=no
+        fi
+        PLATFORM_X11=yes
+        ;;
+    sdk)
+        if [ "$PLATFORM_MAC" = "yes" ]; then
+            CFG_SDK="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+	;;
+     dwarf2)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_MAC_DWARF2="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+	;;
+    arch)
+        if [ "$PLATFORM_MAC" = "yes" ]; then
+            CFG_MAC_ARCHS="$CFG_MAC_ARCHS $VAL"
+        else
+            CFG_ARCH=$VAL
+        fi
+        ;;
+    host-arch)
+        CFG_HOST_ARCH=$VAL
+        ;;
+    universal)
+        if [ "$PLATFORM_MAC" = "yes" ] && [ "$VAL" = "yes" ]; then
+            CFG_MAC_ARCHS="$CFG_MAC_ARCHS x86 ppc"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    cocoa)
+        if [ "$PLATFORM_MAC" = "yes" ] && [ "$VAL" = "yes" ]; then
+            CFG_MAC_COCOA="$VAL"
+            COMMANDLINE_MAC_COCOA="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    framework)
+        if [ "$PLATFORM_MAC" = "yes" ]; then
+            CFG_FRAMEWORK="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    profile)
+        if [ "$VAL" = "yes" ]; then
+            CFG_PROFILE=yes
+	    QMakeVar add QMAKE_CFLAGS -pg
+	    QMakeVar add QMAKE_CXXFLAGS -pg
+	    QMakeVar add QMAKE_LFLAGS -pg
+            QMAKE_VARS="$QMAKE_VARS CONFIG+=nostrip"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    exceptions|g++-exceptions)
+        if [ "$VAL" = "no" ]; then
+            CFG_EXCEPTIONS=no
+        elif [ "$VAL" = "yes" ]; then
+            CFG_EXCEPTIONS=yes
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    platform)
+        PLATFORM="$VAL"
+        # keep compatibility with old platform names
+        case $PLATFORM in
+        aix-64)
+            PLATFORM=aix-xlc-64
+            ;;
+        hpux-o64)
+            PLATFORM=hpux-acc-o64
+            ;;
+        hpux-n64)
+            PLATFORM=hpux-acc-64
+            ;;
+        hpux-acc-n64)
+            PLATFORM=hpux-acc-64
+            ;;
+        irix-n32)
+            PLATFORM=irix-cc
+            ;;
+        irix-64)
+            PLATFORM=irix-cc-64
+            ;;
+        irix-cc-n64)
+            PLATFORM=irix-cc-64
+            ;;
+        reliant-64)
+            PLATFORM=reliant-cds-64
+            ;;
+        solaris-64)
+            PLATFORM=solaris-cc-64
+            ;;
+        solaris-64)
+            PLATFORM=solaris-cc-64
+            ;;
+        openunix-cc)
+            PLATFORM=unixware-cc
+            ;;
+        openunix-g++)
+            PLATFORM=unixware-g++
+            ;;
+        unixware7-cc)
+            PLATFORM=unixware-cc
+            ;;
+        unixware7-g++)
+            PLATFORM=unixware-g++
+            ;;
+        macx-g++-64)
+            PLATFORM=macx-g++
+	    NATIVE_64_ARCH=
+            case `uname -p` in
+            i386) NATIVE_64_ARCH="x86_64" ;;
+            powerpc) NATIVE_64_ARCH="ppc64" ;;
+            *)   echo "WARNING: Can't detect CPU architecture for macx-g++-64" ;;
+            esac
+	    if [ ! -z "$NATIVE_64_ARCH" ]; then
+		QTCONFIG_CONFIG="$QTCONFIG_CONFIG $NATIVE_64_ARCH"
+		CFG_MAC_ARCHS="$CFG_MAC_ARCHS $NATIVE_64_ARCH"
+            fi
+            ;;
+        esac
+        ;;
+    xplatform)
+        XPLATFORM="$VAL"
+        ;;
+    debug-and-release)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_DEBUG_RELEASE="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    optimized-qmake)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_RELEASE_QMAKE="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    release)
+        if [ "$VAL" = "yes" ]; then
+            CFG_DEBUG=no
+        elif [ "$VAL" = "no" ]; then
+            CFG_DEBUG=yes
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    prefix-install)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+	    CFG_PREFIX_INSTALL="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+	;;
+    debug)
+        CFG_DEBUG="$VAL"
+        ;;
+    developer-build|commercial|opensource|nokia-developer)
+        # These switches have been dealt with already
+        ;;
+    static)
+        if [ "$VAL" = "yes" ]; then
+            CFG_SHARED=no
+        elif [ "$VAL" = "no" ]; then
+            CFG_SHARED=yes
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    incremental)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_INCREMENTAL="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    fatal_error)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_CONFIGURE_EXIT_ON_ERROR="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    feature-*)
+        if [ "$PLATFORM_QWS" = "yes" ]; then
+            FEATURE=`echo $VAR | sed "s,^[^-]*-\([^-]*\),\1," | tr 'abcdefghijklmnopqrstuvwxyz-' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+            if [ "$VAL" = "no" ]; then
+                QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_$FEATURE"
+            elif [ "$VAL" = "yes" ] || [ "$VAL" = "unknown" ]; then
+                QCONFIG_FLAGS="$QCONFIG_FLAGS QT_$FEATURE"
+            else
+                UNKNOWN_OPT=yes
+            fi
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    shared)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_SHARED="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    gif)
+        [ "$VAL" = "qt" ] && VAL=yes
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_GIF="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    sm)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_SM="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+
+        ;;
+    xinerama)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then
+            CFG_XINERAMA="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    xshape)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_XSHAPE="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    xinput)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then
+            CFG_XINPUT="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    stl)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_STL="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    pch)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_PRECOMPILE="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    separate-debug-info)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_SEPARATE_DEBUG_INFO="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    reduce-exports)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_REDUCE_EXPORTS="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    mmx)
+        if [ "$VAL" = "no" ]; then
+            CFG_MMX="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    3dnow)
+        if [ "$VAL" = "no" ]; then
+            CFG_3DNOW="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    sse)
+        if [ "$VAL" = "no" ]; then
+            CFG_SSE="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    sse2)
+        if [ "$VAL" = "no" ]; then
+            CFG_SSE2="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    iwmmxt)
+	CFG_IWMMXT="yes"
+	;;
+    reduce-relocations)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_REDUCE_RELOCATIONS="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    freetype)
+        [ "$VAL" = "qt" ] && VAL=yes
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
+            CFG_QWS_FREETYPE="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    zlib)
+        [ "$VAL" = "qt" ] && VAL=yes
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
+            CFG_ZLIB="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        # No longer supported:
+        #[ "$VAL" = "no" ] && CFG_LIBPNG=no
+        ;;
+    sqlite)
+        if [ "$VAL" = "system" ]; then
+            CFG_SQLITE=system
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    libpng)
+        [ "$VAL" = "yes" ] && VAL=qt
+        if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
+            CFG_LIBPNG="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    libjpeg)
+        [ "$VAL" = "yes" ] && VAL=qt
+        if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
+            CFG_LIBJPEG="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    libmng)
+        [ "$VAL" = "yes" ] && VAL=qt
+        if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
+            CFG_LIBMNG="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    libtiff)
+        [ "$VAL" = "yes" ] && VAL=qt
+        if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
+            CFG_LIBTIFF="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    nas-sound)
+        if [ "$VAL" = "system" ] || [ "$VAL" = "no" ]; then
+            CFG_NAS="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    xcursor)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then
+            CFG_XCURSOR="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    xfixes)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then
+            CFG_XFIXES="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    xrandr)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then
+            CFG_XRANDR="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    xrender)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_XRENDER="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    mitshm)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_MITSHM="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    fontconfig)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_FONTCONFIG="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    xkb)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_XKB="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    cups)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_CUPS="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    iconv)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_ICONV="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    glib)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_GLIB="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    gstreamer)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_GSTREAMER="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    gtkstyle)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_QGTKSTYLE="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    qdbus|dbus)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "linked" ]; then
+            CFG_DBUS="$VAL"
+	elif [ "$VAL" = "runtime" ]; then
+	    CFG_DBUS="yes"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    dbus-linked)
+        if [ "$VAL" = "yes" ]; then
+	    CFG_DBUS="linked"
+	else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    nis)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_NIS="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    largefile)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_LARGEFILE="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    openssl)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_OPENSSL="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    openssl-linked)
+        if [ "$VAL" = "yes" ]; then
+            CFG_OPENSSL="linked"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    ptmalloc)
+        if [ "$VAL" = "yes" ]; then
+            CFG_PTMALLOC="yes"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+
+    xmlpatterns)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then
+            CFG_XMLPATTERNS="yes"
+        else
+            if [ "$VAL" = "no" ]; then
+                CFG_XMLPATTERNS="no"
+            else
+                UNKNOWN_OPT=yes
+            fi
+        fi
+        ;;
+    scripttools)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then
+            CFG_SCRIPTTOOLS="yes"
+        else
+            if [ "$VAL" = "no" ]; then
+                CFG_SCRIPTTOOLS="no"
+            else
+                UNKNOWN_OPT=yes
+            fi
+        fi
+        ;;
+    svg)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then
+            CFG_SVG="yes"
+        else
+            if [ "$VAL" = "no" ]; then
+                CFG_SVG="no"
+            else
+                UNKNOWN_OPT=yes
+            fi
+        fi
+	;;
+    webkit)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then
+            CFG_WEBKIT="yes"
+        else
+            if [ "$VAL" = "no" ]; then
+                CFG_WEBKIT="no"
+            else
+                UNKNOWN_OPT=yes
+            fi
+        fi
+        ;;
+    confirm-license)
+        if [ "$VAL" = "yes" ]; then
+            OPT_CONFIRM_LICENSE="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    h|help)
+        if [ "$VAL" = "yes" ]; then
+            OPT_HELP="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    sql-*|gfx-*|decoration-*|kbd-*|mouse-*)
+        # if Qt style options were used, $VAL can be "no", "qt", or "plugin"
+        # if autoconf style options were used, $VAL can be "yes" or "no"
+        [ "$VAL" = "yes" ] && VAL=qt
+        # now $VAL should be "no", "qt", or "plugin"... double-check
+        if [ "$VAL" != "no" ] && [ "$VAL" != "qt" ] && [ "$VAL" != "plugin" ]; then
+            UNKNOWN_OPT=yes
+        fi
+        # now $VAL is "no", "qt", or "plugin"
+        OPT="$VAL"
+        VAL=`echo $VAR | sed "s,^[^-]*-\([^-]*\).*,\1,"`
+        VAR=`echo $VAR | sed "s,^\([^-]*\).*,\1,"`
+
+        # Grab the available values
+        case "$VAR" in
+        sql)
+            avail="$CFG_SQL_AVAILABLE"
+            ;;
+        gfx)
+            avail="$CFG_GFX_AVAILABLE"
+	    if [ "$OPT" = "plugin" ]; then
+		avail="$CFG_GFX_PLUGIN_AVAILABLE"
+	    fi
+            ;;
+        decoration)
+            avail="$CFG_DECORATION_AVAILABLE"
+	    if [ "$OPT" = "plugin" ]; then
+		avail="$CFG_DECORATION_PLUGIN_AVAILABLE"
+	    fi
+            ;;
+        kbd)
+            avail="$CFG_KBD_AVAILABLE"
+	    if [ "$OPT" = "plugin" ]; then
+		avail="$CFG_KBD_PLUGIN_AVAILABLE"
+	    fi
+            ;;
+        mouse)
+            avail="$CFG_MOUSE_AVAILABLE"
+	    if [ "$OPT" = "plugin" ]; then
+		avail="$CFG_MOUSE_PLUGIN_AVAILABLE"
+	    fi
+            ;;
+        *)
+            avail=""
+            echo "BUG: Unhandled type $VAR used in $CURRENT_OPT"
+            ;;
+        esac
+
+        # Check that that user's value is available.
+        found=no
+        for d in $avail; do
+            if [ "$VAL" = "$d" ]; then
+                found=yes
+                break
+            fi
+        done
+        [ "$found" = yes ] || ERROR=yes
+
+        if [ "$VAR" = "sql" ]; then
+            # set the CFG_SQL_driver
+            eval "CFG_SQL_$VAL=\$OPT"
+            continue
+        fi
+
+        if [ "$OPT" = "plugin" ] || [ "$OPT" = "qt" ]; then
+            if [ "$OPT" = "plugin" ]; then
+                [ "$VAR" = "decoration" ] && QMakeVar del "${VAR}s" "$VAL"
+                [ "$VAR" = "decoration" ] && CFG_DECORATION_ON=`echo "${CFG_DECORATION_ON} " | sed "s,${VAL} ,,g"` && CFG_DECORATION_PLUGIN="$CFG_DECORATION_PLUGIN ${VAL}"
+                [ "$VAR" = "kbd" ] && QMakeVar del "${VAR}s" "$VAL"
+                [ "$VAR" = "kbd" ] && CFG_KBD_ON=`echo "${CFG_MOUSE_ON} " | sed "s,${VAL} ,,g"` && CFG_KBD_PLUGIN="$CFG_KBD_PLUGIN ${VAL}"
+                [ "$VAR" = "mouse" ] && QMakeVar del "${VAR}s" "$VAL"
+                [ "$VAR" = "mouse" ] && CFG_MOUSE_ON=`echo "${CFG_MOUSE_ON} " | sed "s,${VAL} ,,g"` && CFG_MOUSE_PLUGIN="$CFG_MOUSE_PLUGIN ${VAL}"
+                [ "$VAR" = "gfx" ] && QMakeVar del "${VAR}s" "$VAL"
+                [ "$VAR" = "gfx" ] && CFG_GFX_ON=`echo "${CFG_GFX_ON} " | sed "s,${VAL} ,,g"` && CFG_GFX_PLUGIN="${CFG_GFX_PLUGIN} ${VAL}"
+                VAR="${VAR}-${OPT}"
+            else
+                if [ "$VAR" = "gfx" ] || [ "$VAR" = "kbd" ] || [ "$VAR" = "decoration" ] || [ "$VAR" = "mouse" ]; then
+                    [ "$VAR" = "gfx" ] && CFG_GFX_ON="$CFG_GFX_ON $VAL"
+                    [ "$VAR" = "kbd" ] && CFG_KBD_ON="$CFG_KBD_ON $VAL"
+		    [ "$VAR" = "decoration" ] && CFG_DECORATION_ON="$CFG_DECORATION_ON $VAL"
+                    [ "$VAR" = "mouse" ] && CFG_MOUSE_ON="$CFG_MOUSE_ON $VAL"
+                    VAR="${VAR}-driver"
+                fi
+            fi
+	    QMakeVar add "${VAR}s" "${VAL}"
+        elif [ "$OPT" = "no" ]; then
+            PLUG_VAR="${VAR}-plugin"
+            if [ "$VAR" = "gfx" ] || [ "$VAR" = "kbd" ] || [ "$VAR" = "mouse" ]; then
+                IN_VAR="${VAR}-driver"
+            else
+                IN_VAR="${VAR}"
+            fi
+            [ "$VAR" = "decoration" ] && CFG_DECORATION_ON=`echo "${CFG_DECORATION_ON} " | sed "s,${VAL} ,,g"`
+            [ "$VAR" = "gfx" ] && CFG_GFX_ON=`echo "${CFG_GFX_ON} " | sed "s,${VAL} ,,g"`
+            [ "$VAR" = "kbd" ] && CFG_KBD_ON=`echo "${CFG_KBD_ON} " | sed "s,${VAL} ,,g"`
+            [ "$VAR" = "mouse" ] && CFG_MOUSE_ON=`echo "${CFG_MOUSE_ON} " | sed "s,${VAL} ,,g"`
+	    QMakeVar del "${IN_VAR}s" "$VAL"
+	    QMakeVar del "${PLUG_VAR}s" "$VAL"
+        fi
+        if [ "$ERROR" = "yes" ]; then
+           echo "$CURRENT_OPT: unknown argument"
+           OPT_HELP=yes
+        fi
+        ;;
+    v|verbose)
+        if [ "$VAL" = "yes" ]; then
+            if [ "$OPT_VERBOSE" = "$VAL" ]; then            # takes two verboses to turn on qmake debugs
+                QMAKE_SWITCHES="$QMAKE_SWITCHES -d"
+            else
+                OPT_VERBOSE=yes
+            fi
+        elif [ "$VAL" = "no" ]; then
+            if [ "$OPT_VERBOSE" = "$VAL" ] && echo "$QMAKE_SWITCHES" | grep ' -d' >/dev/null 2>&1; then
+                QMAKE_SWITCHES=`echo $QMAKE_SWITCHES | sed "s, -d,,"`
+            else
+                OPT_VERBOSE=no
+            fi
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    fast)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            OPT_FAST="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    rpath)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_RPATH="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    add_define)
+        D_FLAGS="$D_FLAGS \"$VAL\""
+        ;;
+    add_ipath)
+        I_FLAGS="$I_FLAGS -I\"${VAL}\""
+        ;;
+    add_lpath)
+        L_FLAGS="$L_FLAGS -L\"${VAL}\""
+        ;;
+    add_rpath)
+        RPATH_FLAGS="$RPATH_FLAGS \"${VAL}\""
+        ;;
+    add_link)
+        l_FLAGS="$l_FLAGS -l\"${VAL}\""
+        ;;
+    add_fpath)
+        if [ "$PLATFORM_MAC" = "yes" ]; then
+            L_FLAGS="$L_FLAGS -F\"${VAL}\""
+            I_FLAGS="$I_FLAGS -F\"${VAL}\""
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    add_framework)
+        if [ "$PLATFORM_MAC" = "yes" ]; then
+            l_FLAGS="$l_FLAGS -framework \"${VAL}\""
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    silent)
+        CFG_SILENT="$VAL"
+        ;;
+    phonon)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_PHONON="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    phonon-backend)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_PHONON_BACKEND="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    *)
+        UNKNOWN_OPT=yes
+        ;;
+    esac
+    if [ "$UNKNOWN_OPT" = "yes" ]; then
+        echo "${CURRENT_OPT}: invalid command-line switch"
+        OPT_HELP=yes
+        ERROR=yes
+    fi
+done
+
+if [ "$CFG_QCONFIG" != "full" ] && [ "$CFG_QT3SUPPORT" = "yes" ]; then
+    echo "Warning: '-qconfig $CFG_QCONFIG' will disable the qt3support library."
+    CFG_QT3SUPPORT="no"
+fi
+
+# update QT_CONFIG to show our current predefined configuration
+case "$CFG_QCONFIG" in
+minimal|small|medium|large|full)
+    # these are a sequence of increasing functionality
+    for c in minimal small medium large full; do
+        QT_CONFIG="$QT_CONFIG $c-config"
+        [ "$CFG_QCONFIG" = $c ] && break
+    done
+    ;;
+*)
+    # not known to be sufficient for anything
+    if [ '!' -f "$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h" ]; then
+        echo >&2 "Error: configuration file not found:"
+        echo >&2 "  $relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h"
+        OPT_HELP=yes
+    fi
+esac
+
+#-------------------------------------------------------------------------------
+# build tree initialization
+#-------------------------------------------------------------------------------
+
+# where to find which..
+unixtests="$relpath/config.tests/unix"
+mactests="$relpath/config.tests/mac"
+WHICH="$unixtests/which.test"
+
+PERL=`$WHICH perl 2>/dev/null`
+
+# find out which awk we want to use, prefer gawk, then nawk, then regular awk
+AWK=
+for e in gawk nawk awk; do
+    if "$WHICH" $e >/dev/null 2>&1 && ( $e -f /dev/null /dev/null ) >/dev/null 2>&1; then
+        AWK=$e
+        break
+    fi
+done
+
+### skip this if the user just needs help...
+if [ "$OPT_HELP" != "yes" ]; then
+
+# is this a shadow build?
+if [ "$OPT_SHADOW" = "maybe" ]; then
+    OPT_SHADOW=no
+    if [ "$relpath" != "$outpath" ] && [ '!' -f "$outpath/configure" ]; then
+        if [ -h "$outpath" ]; then
+            [ "$relpath" -ef "$outpath" ] || OPT_SHADOW=yes
+        else
+            OPT_SHADOW=yes
+        fi
+    fi
+fi
+if [ "$OPT_SHADOW" = "yes" ]; then
+    if [ -f "$relpath/.qmake.cache" -o -f "$relpath/src/corelib/global/qconfig.h" ]; then
+        echo >&2 "You cannot make a shadow build from a source tree containing a previous build."
+        echo >&2 "Cannot proceed."
+        exit 1
+    fi
+    [ "$OPT_VERBOSE" = "yes" ] && echo "Performing shadow build..."
+fi
+
+if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ] && [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
+    echo
+    echo "WARNING: -debug-and-release is not supported anymore on Qt/X11 and Qt for Embedded Linux"
+    echo "By default, Qt is built in release mode with separate debug information, so"
+    echo "-debug-and-release is not necessary anymore"
+    echo
+fi
+
+# detect build style
+if [ "$CFG_DEBUG" = "auto" ]; then
+    if [ "$PLATFORM_MAC" = "yes" ]; then
+        CFG_DEBUG_RELEASE=yes
+        CFG_DEBUG=yes
+    elif [ "$CFG_DEV" = "yes" ]; then
+        CFG_DEBUG_RELEASE=no
+        CFG_DEBUG=yes
+    else
+        CFG_DEBUG_RELEASE=no
+        CFG_DEBUG=no
+    fi
+fi
+if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
+    QMAKE_CONFIG="$QMAKE_CONFIG build_all"
+fi
+
+if [ "$CFG_SILENT" = "yes" ]; then
+    QMAKE_CONFIG="$QMAKE_CONFIG silent"
+fi
+
+# if the source tree is different from the build tree,
+# symlink or copy part of the sources
+if [ "$OPT_SHADOW" = "yes" ]; then
+    echo "Preparing build tree..."
+
+    if [ -z "$PERL" ]; then
+        echo
+        echo "You need perl in your PATH to make a shadow build."
+        echo "Cannot proceed."
+        exit 1
+    fi
+
+    [ -d "$outpath/bin" ] || mkdir -p "$outpath/bin"
+
+    # symlink the qmake directory
+    find "$relpath/qmake" | while read a; do
+        my_a=`echo "$a" | sed "s,^${relpath}/,${outpath}/,"`
+        if [ '!' -f "$my_a" ]; then
+            if [ -d "$a" ]; then
+                # directories are created...
+                mkdir -p "$my_a"
+            else
+                a_dir=`dirname "$my_a"`
+                [ -d "$a_dir" ] || mkdir -p "$a_dir"
+                # ... and files are symlinked
+                case `basename "$a"` in
+                *.o|*.d|GNUmakefile*|qmake)
+                    ;;
+                *)
+                    rm -f "$my_a"
+                    ln -s "$a" "$my_a"
+                    ;;
+                esac
+            fi
+        fi
+    done
+
+    # make a syncqt script that can be used in the shadow
+    rm -f "$outpath/bin/syncqt"
+    if [ -x "$relpath/bin/syncqt" ]; then
+        mkdir -p "$outpath/bin"
+        echo "#!/bin/sh" >"$outpath/bin/syncqt"
+        echo "QTDIR=\"$relpath\"; export QTDIR" >>"$outpath/bin/syncqt"
+        echo "perl \"$relpath/bin/syncqt\" -outdir \"$outpath\" $*" >>"$outpath/bin/syncqt"
+        chmod 755 "$outpath/bin/syncqt"
+    fi
+
+    # symlink the mkspecs directory
+    mkdir -p "$outpath/mkspecs"
+    rm -f "$outpath"/mkspecs/*
+    ln -s "$relpath"/mkspecs/* "$outpath/mkspecs"
+    rm -f "$outpath/mkspecs/default"
+
+    # symlink the doc directory
+    rm -rf "$outpath/doc"
+    ln -s "$relpath/doc" "$outpath/doc"
+
+    # make sure q3porting.xml can be found
+    mkdir -p "$outpath/tools/porting/src"
+    rm -f "$outpath/tools/porting/src/q3porting.xml"
+    ln -s "$relpath/tools/porting/src/q3porting.xml" "$outpath/tools/porting/src"
+fi
+
+# symlink files from src/gui/embedded neccessary to build qvfb
+if [ "$CFG_DEV" = "yes" ]; then
+    for f in qvfbhdr.h qlock_p.h qlock.cpp qwssignalhandler_p.h qwssignalhandler.cpp; do
+	dest="${relpath}/tools/qvfb/${f}"
+	rm -f "$dest"
+	ln -s "${relpath}/src/gui/embedded/${f}" "${dest}"
+    done
+fi
+
+# symlink fonts to be able to run application from build directory
+if [ "$PLATFORM_QWS" = "yes" ] && [ ! -e "${outpath}/lib/fonts" ]; then
+    if [ "$PLATFORM" = "$XPLATFORM" ]; then
+        mkdir -p "${outpath}/lib"
+        ln -s "${relpath}/lib/fonts" "${outpath}/lib/fonts"
+    fi
+fi
+
+if [ "$OPT_FAST" = "auto" ]; then
+   if [ '!' -z "$AWK" ] && [ "$CFG_DEV" = "yes" ]; then
+       OPT_FAST=yes
+   else
+       OPT_FAST=no
+   fi
+fi
+
+# find a make command
+if [ -z "$MAKE" ]; then
+    MAKE=
+    for mk in gmake make; do
+        if "$WHICH" $mk >/dev/null 2>&1; then
+            MAKE=`$WHICH $mk`
+            break
+        fi
+    done
+    if [ -z "$MAKE" ]; then
+        echo >&2 "You don't seem to have 'make' or 'gmake' in your PATH."
+        echo >&2 "Cannot proceed."
+        exit 1
+    fi
+fi
+
+fi ### help
+
+#-------------------------------------------------------------------------------
+# auto-detect all that hasn't been specified in the arguments
+#-------------------------------------------------------------------------------
+
+[ "$PLATFORM_QWS" = "yes" -a "$CFG_EMBEDDED" = "no" ] && CFG_EMBEDDED=auto
+if [ "$CFG_EMBEDDED" != "no" ]; then
+    case "$UNAME_SYSTEM:$UNAME_RELEASE" in
+    Darwin:*)
+        [ -z "$PLATFORM" ] && PLATFORM=qws/macx-generic-g++
+        if [ -z "$XPLATFORM" ]; then
+            [ "$CFG_EMBEDDED" = "auto" ] && CFG_EMBEDDED=generic
+            XPLATFORM="qws/macx-$CFG_EMBEDDED-g++"
+        fi
+        ;;
+    FreeBSD:*)
+        [ -z "$PLATFORM" ] && PLATFORM=qws/freebsd-generic-g++
+        if [ -z "$XPLATFORM" ]; then
+            [ "$CFG_EMBEDDED" = "auto" ] && CFG_EMBEDDED=generic
+            XPLATFORM="qws/freebsd-$CFG_EMBEDDED-g++"
+        fi
+        ;;
+    SunOS:5*)
+        [ -z "$PLATFORM" ] && PLATFORM=qws/solaris-generic-g++
+        if [ -z "$XPLATFORM" ]; then
+            [ "$CFG_EMBEDDED" = "auto" ] && CFG_EMBEDDED=generic
+            XPLATFORM="qws/solaris-$CFG_EMBEDDED-g++"
+        fi
+        ;;
+    Linux:*)
+        if [ -z "$PLATFORM" ]; then
+            case "$UNAME_MACHINE" in
+            *86)
+                PLATFORM=qws/linux-x86-g++
+                ;;
+            *86_64)
+                PLATFORM=qws/linux-x86_64-g++
+                ;;
+            *ppc)
+                PLATFORM=qws/linux-ppc-g++
+                ;;
+            *)
+                PLATFORM=qws/linux-generic-g++
+                ;;
+            esac
+        fi
+        if [ -z "$XPLATFORM" ]; then
+            if [ "$CFG_EMBEDDED" = "auto" ]; then
+                if [ -n "$CFG_ARCH" ]; then
+                    CFG_EMBEDDED=$CFG_ARCH
+                else
+                    case "$UNAME_MACHINE" in
+                    *86)
+                        CFG_EMBEDDED=x86
+                        ;;
+                    *86_64)
+                        CFG_EMBEDDED=x86_64
+                        ;;
+                    *ppc)
+                        CFG_EMBEDDED=ppc
+                        ;;
+                    *)
+                        CFG_EMBEDDED=generic
+                        ;;
+                    esac
+                fi
+            fi
+            XPLATFORM="qws/linux-$CFG_EMBEDDED-g++"
+        fi
+        ;;
+    CYGWIN*:*)
+	CFG_EMBEDDED=x86
+	;;
+    *)
+        echo "Qt for Embedded Linux is not supported on this platform. Disabling."
+        CFG_EMBEDDED=no
+        PLATFORM_QWS=no
+        ;;
+    esac
+fi
+if [ -z "$PLATFORM" ]; then
+    PLATFORM_NOTES=
+    case "$UNAME_SYSTEM:$UNAME_RELEASE" in
+     Darwin:*)
+        if [ "$PLATFORM_MAC" = "yes" ]; then
+          PLATFORM=macx-g++
+        # PLATFORM=macx-xcode
+        else
+          PLATFORM=darwin-g++
+        fi
+        ;;
+     AIX:*)
+        #PLATFORM=aix-g++
+        #PLATFORM=aix-g++-64
+        PLATFORM=aix-xlc
+        #PLATFORM=aix-xlc-64
+        PLATFORM_NOTES="
+            - Also available for AIX: aix-g++ aix-g++-64 aix-xlc-64
+        "
+        ;;
+     GNU:*)
+        PLATFORM=hurd-g++
+        ;;
+     dgux:*)
+        PLATFORM=dgux-g++
+        ;;
+#     DYNIX/ptx:4*)
+#       PLATFORM=dynix-g++
+#       ;;
+     ULTRIX:*)
+        PLATFORM=ultrix-g++
+        ;;
+     FreeBSD:*)
+        PLATFORM=freebsd-g++
+        PLATFORM_NOTES="
+            - Also available for FreeBSD: freebsd-icc
+        "
+        ;;
+     OpenBSD:*)
+        PLATFORM=openbsd-g++
+        ;;
+     NetBSD:*)
+        PLATFORM=netbsd-g++
+        ;;
+     BSD/OS:*|BSD/386:*)
+        PLATFORM=bsdi-g++
+        ;;
+     IRIX*:*)
+        #PLATFORM=irix-g++
+        PLATFORM=irix-cc
+        #PLATFORM=irix-cc-64
+        PLATFORM_NOTES="
+            - Also available for IRIX: irix-g++ irix-cc-64
+        "
+        ;;
+     HP-UX:*)
+        case "$UNAME_MACHINE" in
+            ia64)
+                #PLATFORM=hpuxi-acc-32
+                PLATFORM=hpuxi-acc-64
+                PLATFORM_NOTES="
+                    - Also available for HP-UXi: hpuxi-acc-32
+                "
+            ;;
+            *)
+                #PLATFORM=hpux-g++
+                PLATFORM=hpux-acc
+                #PLATFORM=hpux-acc-64
+                #PLATFORM=hpux-cc
+                #PLATFORM=hpux-acc-o64
+                PLATFORM_NOTES="
+                    - Also available for HP-UX: hpux-g++ hpux-acc-64 hpux-acc-o64
+                "
+            ;;
+        esac
+        ;;
+     OSF1:*)
+        #PLATFORM=tru64-g++
+        PLATFORM=tru64-cxx
+        PLATFORM_NOTES="
+            - Also available for Tru64: tru64-g++
+        "
+        ;;
+     Linux:*)
+        case "$UNAME_MACHINE" in
+            x86_64|s390x|ppc64)
+                PLATFORM=linux-g++-64
+                ;;
+            *)
+                PLATFORM=linux-g++
+                ;;
+        esac
+        PLATFORM_NOTES="
+            - Also available for Linux: linux-kcc linux-icc linux-cxx
+        "
+        ;;
+     SunOS:5*)
+        #PLATFORM=solaris-g++
+        PLATFORM=solaris-cc
+        #PLATFORM=solaris-cc64
+        PLATFORM_NOTES="
+            - Also available for Solaris: solaris-g++ solaris-cc-64
+        "
+        ;;
+     ReliantUNIX-*:*|SINIX-*:*)
+        PLATFORM=reliant-cds
+        #PLATFORM=reliant-cds-64
+        PLATFORM_NOTES="
+            - Also available for Reliant UNIX: reliant-cds-64
+        "
+        ;;
+     CYGWIN*:*)
+        PLATFORM=cygwin-g++
+        ;;
+     LynxOS*:*)
+        PLATFORM=lynxos-g++
+        ;;
+     OpenUNIX:*)
+        #PLATFORM=unixware-g++
+        PLATFORM=unixware-cc
+        PLATFORM_NOTES="
+            - Also available for OpenUNIX: unixware-g++
+        "
+        ;;
+     UnixWare:*)
+        #PLATFORM=unixware-g++
+        PLATFORM=unixware-cc
+        PLATFORM_NOTES="
+            - Also available for UnixWare: unixware-g++
+        "
+        ;;
+     SCO_SV:*)
+        #PLATFORM=sco-g++
+        PLATFORM=sco-cc
+        PLATFORM_NOTES="
+            - Also available for SCO OpenServer: sco-g++
+        "
+        ;;
+     UNIX_SV:*)
+        PLATFORM=unixware-g++
+        ;;
+     *)
+        if [ "$OPT_HELP" != "yes" ]; then
+            echo
+            for p in $PLATFORMS; do
+                echo "    $relconf $* -platform $p"
+            done
+            echo >&2
+            echo "   The build script does not currently recognize all" >&2
+            echo "   platforms supported by Qt." >&2
+            echo "   Rerun this script with a -platform option listed to" >&2
+            echo "   set the system/compiler combination you use." >&2
+            echo >&2
+            exit 2
+        fi
+    esac
+fi
+
+if [ "$PLATFORM_QWS" = "yes" ]; then
+    CFG_SM=no
+    PLATFORMS=`find "$relpath/mkspecs/qws" | sed "s,$relpath/mkspecs/qws/,,"`
+else
+    PLATFORMS=`find "$relpath/mkspecs/" -type f | grep -v qws | sed "s,$relpath/mkspecs/qws/,,"`
+fi
+
+[ -z "$XPLATFORM" ] && XPLATFORM="$PLATFORM"
+if [ -d "$PLATFORM" ]; then
+  QMAKESPEC="$PLATFORM"
+else
+  QMAKESPEC="$relpath/mkspecs/${PLATFORM}"
+fi
+if [ -d "$XPLATFORM" ]; then
+  XQMAKESPEC="$XPLATFORM"
+else
+  XQMAKESPEC="$relpath/mkspecs/${XPLATFORM}"
+fi
+if [ "$PLATFORM" != "$XPLATFORM" ]; then
+    QT_CROSS_COMPILE=yes
+    QMAKE_CONFIG="$QMAKE_CONFIG cross_compile"
+fi
+
+if [ "$PLATFORM_MAC" = "yes" ]; then
+   if [ `basename $QMAKESPEC` = "macx-xcode" ] || [ `basename $XQMAKESPEC` = "macx-xcode" ]; then
+      echo >&2
+      echo "   Platform 'macx-xcode' should not be used when building Qt/Mac." >&2
+      echo "   Please build Qt/Mac with 'macx-g++', then if you would like to" >&2
+      echo "   use mac-xcode on your application code it can link to a Qt/Mac" >&2
+      echo "   built with 'macx-g++'" >&2
+      echo >&2
+      exit 2
+    fi
+fi
+
+# check specified platforms are supported
+if [ '!' -d "$QMAKESPEC" ]; then
+    echo
+    echo "   The specified system/compiler is not supported:"
+    echo
+    echo "      $QMAKESPEC"
+    echo
+    echo "   Please see the README file for a complete list."
+    echo
+    exit 2
+fi
+if [ '!' -d "$XQMAKESPEC" ]; then
+    echo
+    echo "   The specified system/compiler is not supported:"
+    echo
+    echo "      $XQMAKESPEC"
+    echo
+    echo "   Please see the README file for a complete list."
+    echo
+    exit 2
+fi
+if [ '!' -f "${XQMAKESPEC}/qplatformdefs.h" ]; then
+    echo
+    echo "   The specified system/compiler port is not complete:"
+    echo
+    echo "      $XQMAKESPEC/qplatformdefs.h"
+    echo
+    echo "   Please contact qt-bugs@trolltech.com."
+    echo
+    exit 2
+fi
+
+# now look at the configs and figure out what platform we are config'd for
+[ "$CFG_EMBEDDED" = "no" ] \
+  && [ '!' -z "`getQMakeConf \"$XQMAKESPEC\" | grep QMAKE_LIBS_X11 | awk '{print $3;}'`" ] \
+  && PLATFORM_X11=yes
+### echo "$XQMAKESPEC" | grep mkspecs/qws >/dev/null 2>&1 && PLATFORM_QWS=yes
+
+if [ "$UNAME_SYSTEM" = "SunOS" ]; then
+    # Solaris 2.5 and 2.6 have libposix4, which was renamed to librt for Solaris 7 and up
+    if echo $UNAME_RELEASE | grep "^5\.[5|6]" >/dev/null 2>&1; then
+        sed -e "s,-lrt,-lposix4," "$XQMAKESPEC/qmake.conf" > "$XQMAKESPEC/qmake.conf.new"
+        mv "$XQMAKESPEC/qmake.conf.new" "$XQMAKESPEC/qmake.conf"
+    fi
+fi
+
+#-------------------------------------------------------------------------------
+# determine the system architecture
+#-------------------------------------------------------------------------------
+if [ "$OPT_VERBOSE" = "yes" ]; then
+    echo "Determining system architecture... ($UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE)"
+fi
+
+if [ "$CFG_EMBEDDED" != "no" -a "$CFG_EMBEDDED" != "auto" ] && [ -n "$CFG_ARCH" ]; then
+    if [ "$CFG_ARCH" != "$CFG_EMBEDDED" ]; then
+        echo ""
+        echo "You have specified a target architecture with -embedded and -arch."
+        echo "The two architectures you have specified are different, so we can"
+        echo "not proceed. Either set both to be the same, or only use -embedded."
+        echo ""
+        exit 1
+    fi
+fi
+
+if [ -z "${CFG_HOST_ARCH}" ]; then
+    case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in
+    IRIX*:*:*)
+        CFG_HOST_ARCH=`uname -p`
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    SGI ($CFG_HOST_ARCH)"
+        fi
+        ;;
+    SunOS:5*:*)
+        case "$UNAME_MACHINE" in
+	sun4u*|sun4v*)
+            if [ "$OPT_VERBOSE" = "yes" ]; then
+                echo "    Sun SPARC (sparc)"
+            fi
+            CFG_HOST_ARCH=sparc
+            ;;
+        i86pc)
+	    case "$PLATFORM" in
+	    *-64)
+                if [ "$OPT_VERBOSE" = "yes" ]; then
+	            echo "    64-bit AMD 80x86 (x86_64)"
+                fi
+                CFG_HOST_ARCH=x86_64
+                ;;
+	    *)
+                if [ "$OPT_VERBOSE" = "yes" ]; then
+	            echo "    32-bit Intel 80x86 (i386)"
+                fi
+                CFG_HOST_ARCH=i386
+                ;;
+            esac
+        esac
+        ;;
+    Darwin:*:*)
+        case "$UNAME_MACHINE" in
+            Power?Macintosh)
+                if [ "$OPT_VERBOSE" = "yes" ]; then
+                    echo "    32-bit Apple PowerPC (powerpc)"
+                fi
+                ;;
+            x86)
+                if [ "$OPT_VERBOSE" = "yes" ]; then
+                    echo "    32-bit Intel 80x86 (i386)"
+                fi
+                ;;
+        esac
+        CFG_HOST_ARCH=macosx
+        ;;
+    AIX:*:00????????00)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+        echo "    64-bit IBM PowerPC (powerpc)"
+        fi
+        CFG_HOST_ARCH=powerpc
+        ;;
+    HP-UX:*:9000*)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    HP PA-RISC (parisc)"
+        fi
+        CFG_HOST_ARCH=parisc
+        ;;
+    *:*:i?86)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    32-bit Intel 80x86 (i386)"
+        fi
+        CFG_HOST_ARCH=i386
+        ;;
+    *:*:x86_64|*:*:amd64)
+        if [ "$PLATFORM" = "linux-g++-32" -o "$PLATFORM" = "linux-icc-32" ]; then
+            if [ "$OPT_VERBOSE" = "yes" ]; then
+                echo "    32 bit on 64-bit AMD 80x86 (i386)"
+            fi
+            CFG_HOST_ARCH=i386
+        else
+            if [ "$OPT_VERBOSE" = "yes" ]; then
+                echo "    64-bit AMD 80x86 (x86_64)"
+            fi
+            CFG_HOST_ARCH=x86_64
+        fi
+        ;;
+    *:*:ppc)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    32-bit PowerPC (powerpc)"
+        fi
+        CFG_HOST_ARCH=powerpc
+        ;;
+    *:*:ppc64)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    64-bit PowerPC (powerpc)"
+        fi
+        CFG_HOST_ARCH=powerpc
+        ;;
+    *:*:s390*)
+    	if [ "$OPT_VERBOSE" = "yes" ]; then
+    	    echo "    IBM S/390 (s390)"
+    	fi
+    	CFG_HOST_ARCH=s390
+    	;;
+    *:*:arm*)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    ARM (arm)"
+        fi
+        CFG_HOST_ARCH=arm
+        ;;
+    Linux:*:sparc*)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    Linux on SPARC"
+        fi
+        CFG_HOST_ARCH=sparc
+        ;;
+    *:*:*)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    Trying '$UNAME_MACHINE'..."
+        fi
+        CFG_HOST_ARCH="$UNAME_MACHINE"
+        ;;
+    esac
+fi
+
+if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then
+    if [ -n "$CFG_ARCH" ]; then
+        CFG_EMBEDDED=$CFG_ARCH
+    fi
+
+    case "$CFG_EMBEDDED" in
+    x86)
+        CFG_ARCH=i386
+        ;;
+    x86_64)
+        CFG_ARCH=x86_64
+        ;;
+    ipaq|sharp)
+        CFG_ARCH=arm
+        ;;
+    dm7000)
+        CFG_ARCH=powerpc
+        ;;
+    dm800)
+        CFG_ARCH=mips
+        ;;
+    sh4al)
+        CFG_ARCH=sh4a
+        ;;
+    *)
+        CFG_ARCH="$CFG_EMBEDDED"
+        ;;
+    esac
+elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then
+    CFG_ARCH=$CFG_HOST_ARCH
+fi
+
+if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
+    if [ "$OPT_VERBOSE" = "yes" ]; then
+        echo "    '$CFG_ARCH' is supported"
+    fi
+else
+    if [ "$OPT_VERBOSE" = "yes" ]; then
+        echo "    '$CFG_ARCH' is unsupported, using 'generic'"
+    fi
+    CFG_ARCH=generic
+fi
+if [ "$CFG_HOST_ARCH" != "$CFG_ARCH" ]; then
+    if [ -d "$relpath/src/corelib/arch/$CFG_HOST_ARCH" ]; then
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    '$CFG_HOST_ARCH' is supported"
+        fi
+    else
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    '$CFG_HOST_ARCH' is unsupported, using 'generic'"
+        fi
+        CFG_HOST_ARCH=generic
+    fi
+fi
+
+if [ "$OPT_VERBOSE" = "yes" ]; then
+    echo "System architecture: '$CFG_ARCH'"
+    if [ "$PLATFORM_QWS" = "yes" ]; then
+	echo "Host architecture: '$CFG_HOST_ARCH'"
+    fi
+fi
+
+#-------------------------------------------------------------------------------
+# tests that don't need qmake (must be run before displaying help)
+#-------------------------------------------------------------------------------
+
+if [ -z "$PKG_CONFIG" ]; then
+    # See if PKG_CONFIG is set in the mkspec:
+    PKG_CONFIG=`getQMakeConf "$XQMAKESPEC" | sed -n -e 's%PKG_CONFIG[^_].*=%%p' | tr '\n' ' '`
+fi
+if [ -z "$PKG_CONFIG" ]; then
+    PKG_CONFIG=`$WHICH pkg-config 2>/dev/null`
+fi
+
+# Work out if we can use pkg-config
+if [ "$QT_CROSS_COMPILE" = "yes" ]; then
+    if [ "$QT_FORCE_PKGCONFIG" = "yes" ]; then
+        echo >&2 ""
+        echo >&2 "You have asked to use pkg-config and are cross-compiling."
+        echo >&2 "Please make sure you have a correctly set-up pkg-config"
+        echo >&2 "environment!"
+        echo >&2 ""
+        if [ -z "$PKG_CONFIG_PATH" ]; then
+            echo >&2 ""
+            echo >&2 "Warning: PKG_CONFIG_PATH has not been set.  This could mean"
+            echo >&2 "the host compiler's .pc files will be used. This is probably"
+            echo >&2 "not what you want."
+            echo >&2 ""
+        elif [ -z "$PKG_CONFIG_SYSROOT" ] && [ -z "$PKG_CONFIG_SYSROOT_DIR" ]; then
+            echo >&2 ""
+            echo >&2 "Warning: PKG_CONFIG_SYSROOT/PKG_CONFIG_SYSROOT_DIR has not"
+            echo >&2 "been set. This means your toolchain's .pc files must contain"
+            echo >&2 "the paths to the toolchain's libraries & headers. If configure"
+            echo >&2 "tests are failing, please check these files."
+            echo >&2 ""
+        fi
+    else
+        PKG_CONFIG=""
+    fi
+fi
+
+# find the default framework value
+if [ "$PLATFORM_MAC" = "yes" ] && [ "$PLATFORM" != "macx-xlc" ]; then
+    if [ "$CFG_FRAMEWORK" = "auto" ]; then
+        CFG_FRAMEWORK="$CFG_SHARED"
+    elif [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_SHARED" = "no" ]; then
+	echo
+	echo "WARNING: Using static linking will disable the use of Mac frameworks."
+	echo
+        CFG_FRAMEWORK="no"
+    fi
+else
+    CFG_FRAMEWORK=no
+fi
+
+QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1`
+TEST_COMPILER="$CC"
+[ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
+
+# auto-detect precompiled header support
+if [ "$CFG_PRECOMPILE" = "auto" ]; then
+    if [ `echo "$CFG_MAC_ARCHS" | wc -w` -gt 1 ]; then
+       CFG_PRECOMPILE=no
+    elif "$unixtests/precomp.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then
+       CFG_PRECOMPILE=no
+    else
+       CFG_PRECOMPILE=yes
+    fi
+elif [ "$CFG_PRECOMPILE" = "yes" ] && [ `echo "$CFG_MAC_ARCHS" | wc -w` -gt 1 ]; then
+    echo
+    echo "WARNING: Using universal binaries disables precompiled headers."
+    echo
+    CFG_PRECOMPILE=no
+fi
+
+#auto-detect DWARF2 on the mac
+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" == "auto" ]; then
+    if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
+        CFG_MAC_DWARF2=no
+    else
+        CFG_MAC_DWARF2=yes
+    fi
+fi
+
+# auto-detect support for -Xarch on the mac
+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" == "auto" ]; then
+    if "$mactests/xarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
+        CFG_MAC_XARCH=no
+    else
+        CFG_MAC_XARCH=yes
+    fi
+fi
+
+# don't autodetect support for separate debug info on objcopy when
+# cross-compiling as lots of toolchains seems to have problems with this
+if [ "$QT_CROSS_COMPILE" = "yes" ] && [ "$CFG_SEPARATE_DEBUG_INFO" = "auto" ]; then
+    CFG_SEPARATE_DEBUG_INFO="no"
+fi
+
+# auto-detect support for separate debug info in objcopy
+if [ "$CFG_SEPARATE_DEBUG_INFO" != "no" ] && [ "$CFG_SHARED" = "yes" ]; then
+    TEST_COMPILER_CFLAGS=`getQMakeConf "$XQMAKESPEC" | sed -n -e 's%QMAKE_CFLAGS[^_].*=%%p' | tr '\n' ' '`
+    TEST_COMPILER_CXXFLAGS=`getQMakeConf "$XQMAKESPEC" | sed -n -e 's%QMAKE_CXXFLAGS[^_].*=%%p' | tr '\n' ' '`
+    TEST_OBJCOPY=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_OBJCOPY" | sed "s%.* *= *\(.*\)$%\1%" | tail -1`
+    COMPILER_WITH_FLAGS="$TEST_COMPILER $TEST_COMPILER_CXXFLAGS"
+    COMPILER_WITH_FLAGS=`echo "$COMPILER_WITH_FLAGS" | sed -e "s%\\$\\$QMAKE_CFLAGS%$TEST_COMPILER_CFLAGS%g"`
+    if "$unixtests/objcopy.test" "$COMPILER_WITH_FLAGS" "$TEST_OBJCOPY" "$OPT_VERBOSE"; then
+       CFG_SEPARATE_DEBUG_INFO=no
+    else
+       case "$PLATFORM" in
+       hpux-*)
+           # binutils on HP-UX is buggy; default to no.
+           CFG_SEPARATE_DEBUG_INFO=no
+           ;;
+       *)
+           CFG_SEPARATE_DEBUG_INFO=yes
+           ;;
+       esac
+    fi
+fi
+
+# auto-detect -fvisibility support
+if [ "$CFG_REDUCE_EXPORTS" = "auto" ]; then
+    if "$unixtests/fvisibility.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then
+       CFG_REDUCE_EXPORTS=no
+    else
+       CFG_REDUCE_EXPORTS=yes
+    fi
+fi
+
+# detect the availability of the -Bsymbolic-functions linker optimization
+if [ "$CFG_REDUCE_RELOCATIONS" != "no" ]; then
+    if "$unixtests/bsymbolic_functions.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then
+        CFG_REDUCE_RELOCATIONS=no
+    else
+        CFG_REDUCE_RELOCATIONS=yes
+    fi
+fi
+
+# auto-detect GNU make support
+if [ "$CFG_USE_GNUMAKE" = "auto" ] && "$MAKE" -v | grep "GNU Make" >/dev/null 2>&1; then
+   CFG_USE_GNUMAKE=yes
+fi
+
+# If -opengl wasn't specified, don't try to auto-detect
+if [ "$PLATFORM_QWS" = "yes" ] && [ "$CFG_OPENGL" = "auto" ]; then
+        CFG_OPENGL=no
+fi
+
+# mac
+if [ "$PLATFORM_MAC" = "yes" ]; then
+    if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
+        CFG_OPENGL=desktop
+    fi
+fi
+
+# find the default framework value
+if [ "$PLATFORM_MAC" = "yes" ] && [ "$PLATFORM" != "macx-xlc" ]; then
+    if [ "$CFG_FRAMEWORK" = "auto" ]; then
+        CFG_FRAMEWORK="$CFG_SHARED"
+    elif [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_SHARED" = "no" ]; then
+	echo
+	echo "WARNING: Using static linking will disable the use of Mac frameworks."
+	echo
+        CFG_FRAMEWORK="no"
+    fi
+else
+    CFG_FRAMEWORK=no
+fi
+
+# x11 tests are done after qmake is built
+
+
+#setup the build parts
+if [ -z "$CFG_BUILD_PARTS" ]; then
+    CFG_BUILD_PARTS="$QT_DEFAULT_BUILD_PARTS"
+
+    # don't build tools by default when cross-compiling
+    if [ "$PLATFORM" != "$XPLATFORM" ]; then
+	CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"`
+    fi
+fi
+for nobuild in $CFG_NOBUILD_PARTS; do
+    CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, $nobuild,,g"`
+done
+if echo $CFG_BUILD_PARTS | grep -v libs >/dev/null 2>&1; then
+#    echo
+#    echo "WARNING: libs is a required part of the build."
+#    echo
+    CFG_BUILD_PARTS="$CFG_BUILD_PARTS libs"
+fi
+
+#-------------------------------------------------------------------------------
+# post process QT_INSTALL_* variables
+#-------------------------------------------------------------------------------
+
+#prefix
+if [ -z "$QT_INSTALL_PREFIX" ]; then
+    if [ "$CFG_DEV" = "yes" ]; then
+	QT_INSTALL_PREFIX="$outpath" # At Trolltech, we use sandboxed builds by default
+    elif [ "$PLATFORM_QWS" = "yes" ]; then
+        QT_INSTALL_PREFIX="/usr/local/Trolltech/QtEmbedded-${QT_VERSION}"
+        if [ "$PLATFORM" != "$XPLATFORM" ]; then
+            QT_INSTALL_PREFIX="${QT_INSTALL_PREFIX}-${CFG_ARCH}"
+        fi
+    else
+        QT_INSTALL_PREFIX="/usr/local/Trolltech/Qt-${QT_VERSION}" # the default install prefix is /usr/local/Trolltech/Qt-$QT_VERSION
+    fi
+fi
+QT_INSTALL_PREFIX=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_PREFIX"`
+
+#docs
+if [ -z "$QT_INSTALL_DOCS" ]; then #default
+    if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
+	if [ "$PLATFORM_MAC" = "yes" ]; then
+	    QT_INSTALL_DOCS="/Developer/Documentation/Qt"
+        fi
+    fi
+    [ -z "$QT_INSTALL_DOCS" ] && QT_INSTALL_DOCS="$QT_INSTALL_PREFIX/doc" #fallback
+
+fi
+QT_INSTALL_DOCS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DOCS"`
+
+#headers
+if [ -z "$QT_INSTALL_HEADERS" ]; then #default
+    if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
+	if [ "$PLATFORM_MAC" = "yes" ]; then
+	    if [ "$CFG_FRAMEWORK" = "yes" ]; then
+		QT_INSTALL_HEADERS=
+            fi
+        fi
+    fi
+    [ -z "$QT_INSTALL_HEADERS" ] && QT_INSTALL_HEADERS="$QT_INSTALL_PREFIX/include"
+
+fi
+QT_INSTALL_HEADERS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_HEADERS"`
+
+#libs
+if [ -z "$QT_INSTALL_LIBS" ]; then #default
+    if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
+	if [ "$PLATFORM_MAC" = "yes" ]; then
+	    if [ "$CFG_FRAMEWORK" = "yes" ]; then
+		QT_INSTALL_LIBS="/Libraries/Frameworks"
+            fi
+        fi
+    fi
+    [ -z "$QT_INSTALL_LIBS" ] && QT_INSTALL_LIBS="$QT_INSTALL_PREFIX/lib" #fallback
+fi
+QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"`
+
+#bins
+if [ -z "$QT_INSTALL_BINS" ]; then #default
+    if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
+	if [ "$PLATFORM_MAC" = "yes" ]; then
+	    QT_INSTALL_BINS="/Developer/Applications/Qt"
+        fi
+    fi
+    [ -z "$QT_INSTALL_BINS" ] && QT_INSTALL_BINS="$QT_INSTALL_PREFIX/bin" #fallback
+
+fi
+QT_INSTALL_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_BINS"`
+
+#plugins
+if [ -z "$QT_INSTALL_PLUGINS" ]; then #default
+    if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
+	if [ "$PLATFORM_MAC" = "yes" ]; then
+	    QT_INSTALL_PLUGINS="/Developer/Applications/Qt/plugins"
+        fi
+    fi
+    [ -z "$QT_INSTALL_PLUGINS" ] && QT_INSTALL_PLUGINS="$QT_INSTALL_PREFIX/plugins" #fallback
+fi
+QT_INSTALL_PLUGINS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_PLUGINS"`
+
+#data
+if [ -z "$QT_INSTALL_DATA" ]; then #default
+    QT_INSTALL_DATA="$QT_INSTALL_PREFIX"
+fi
+QT_INSTALL_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DATA"`
+
+#translations
+if [ -z "$QT_INSTALL_TRANSLATIONS" ]; then #default
+    QT_INSTALL_TRANSLATIONS="$QT_INSTALL_PREFIX/translations"
+fi
+QT_INSTALL_TRANSLATIONS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_TRANSLATIONS"`
+
+#settings
+if [ -z "$QT_INSTALL_SETTINGS" ]; then #default
+    if [ "$PLATFORM_MAC" = "yes" ]; then
+	QT_INSTALL_SETTINGS=/Library/Preferences/Qt
+    else
+	QT_INSTALL_SETTINGS=/etc/xdg
+    fi
+fi
+QT_INSTALL_SETTINGS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_SETTINGS"`
+
+#examples
+if [ -z "$QT_INSTALL_EXAMPLES" ]; then #default
+    if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
+	if [ "$PLATFORM_MAC" = "yes" ]; then
+	    QT_INSTALL_EXAMPLES="/Developer/Examples/Qt"
+        fi
+    fi
+    [ -z "$QT_INSTALL_EXAMPLES" ] && QT_INSTALL_EXAMPLES="$QT_INSTALL_PREFIX/examples" #fallback
+fi
+QT_INSTALL_EXAMPLES=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_EXAMPLES"`
+
+#demos
+if [ -z "$QT_INSTALL_DEMOS" ]; then #default
+    if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
+	if [ "$PLATFORM_MAC" = "yes" ]; then
+	    QT_INSTALL_DEMOS="/Developer/Examples/Qt/Demos"
+        fi
+    fi
+    [ -z "$QT_INSTALL_DEMOS" ] && QT_INSTALL_DEMOS="$QT_INSTALL_PREFIX/demos"
+fi
+QT_INSTALL_DEMOS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DEMOS"`
+
+#-------------------------------------------------------------------------------
+# help - interactive parts of the script _after_ this section please
+#-------------------------------------------------------------------------------
+
+# next, emit a usage message if something failed.
+if [ "$OPT_HELP" = "yes" ]; then
+    [ "x$ERROR" = "xyes" ] && echo
+    if [ "$CFG_NIS" = "no" ]; then
+        NSY=" "
+        NSN="*"
+    else
+        NSY="*"
+        NSN=" "
+    fi
+    if [ "$CFG_CUPS" = "no" ]; then
+        CUY=" "
+        CUN="*"
+    else
+        CUY="*"
+        CUN=" "
+    fi
+    if [ "$CFG_ICONV" = "no" ]; then
+        CIY=" "
+        CIN="*"
+    else
+        CIY="*"
+        CIN=" "
+    fi
+    if [ "$CFG_LARGEFILE" = "no" ]; then
+        LFSY=" "
+        LFSN="*"
+    else
+        LFSY="*"
+        LFSN=" "
+    fi
+    if [ "$CFG_STL" = "auto" ] || [ "$CFG_STL" = "yes" ]; then
+        SHY="*"
+        SHN=" "
+    else
+        SHY=" "
+        SHN="*"
+    fi
+    if [ "$CFG_IPV6" = "auto" ]; then
+        I6Y="*"
+        I6N=" "
+    fi
+    if [ "$CFG_PRECOMPILE" = "auto" ] || [ "$CFG_PRECOMPILE" = "no" ]; then
+        PHY=" "
+        PHN="*"
+    else
+        PHY="*"
+        PHN=" "
+    fi
+
+    cat <<EOF
+Usage:  $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir <dir>]
+        [-docdir <dir>] [-headerdir <dir>] [-plugindir <dir> ] [-datadir <dir>]
+        [-translationdir <dir>] [-sysconfdir <dir>] [-examplesdir <dir>]
+        [-demosdir <dir>] [-buildkey <key>] [-release] [-debug]
+        [-debug-and-release] [-developer-build] [-shared] [-static] [-no-fast] [-fast] [-no-largefile]
+        [-largefile] [-no-exceptions] [-exceptions] [-no-accessibility]
+        [-accessibility] [-no-stl] [-stl] [-no-sql-<driver>] [-sql-<driver>]
+        [-plugin-sql-<driver>] [-system-sqlite] [-no-qt3support] [-qt3support]
+        [-platform] [-D <string>] [-I <string>] [-L <string>] [-help]
+        [-qt-zlib] [-system-zlib] [-no-gif] [-qt-gif] [-no-libtiff] [-qt-libtiff] [-system-libtiff]
+        [-no-libpng] [-qt-libpng] [-system-libpng] [-no-libmng] [-qt-libmng]
+        [-system-libmng] [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg] [-make <part>]
+        [-no-make <part>] [-R <string>]  [-l <string>] [-no-rpath]  [-rpath] [-continue]
+        [-verbose] [-v] [-silent] [-no-nis] [-nis] [-no-cups] [-cups] [-no-iconv]
+        [-iconv] [-no-pch] [-pch] [-no-dbus] [-dbus] [-dbus-linked]
+        [-no-separate-debug-info] [-no-mmx] [-no-3dnow] [-no-sse] [-no-sse2]
+        [-qtnamespace <namespace>] [-qtlibinfix <infix>] [-separate-debug-info] [-armfpa]
+        [-no-optimized-qmake] [-optimized-qmake] [-no-xmlpatterns] [-xmlpatterns]
+        [-no-phonon] [-phonon] [-no-phonon-backend] [-phonon-backend]
+        [-no-openssl] [-openssl] [-openssl-linked]
+        [-no-gtkstyle] [-gtkstyle] [-no-svg] [-svg] [-no-webkit] [-webkit]
+        [-no-scripttools] [-scripttools]
+
+        [additional platform specific options (see below)]
+
+
+Installation options:
+
+ These are optional, but you may specify install directories.
+
+    -prefix <dir> ...... This will install everything relative to <dir>
+                         (default $QT_INSTALL_PREFIX)
+EOF
+if [ "$PLATFORM_QWS" = "yes" ]; then
+cat <<EOF
+
+    -hostprefix [dir] .. Tools and libraries needed when developing
+                         applications are installed in [dir]. If [dir] is
+                         not given, the current build directory will be used.
+EOF
+fi
+cat <<EOF
+
+  * -prefix-install .... Force a sandboxed "local" installation of
+                         Qt. This will install into
+                         $QT_INSTALL_PREFIX, if this option is
+                         disabled then some platforms will attempt a
+                         "system" install by placing default values to
+                         be placed in a system location other than
+                         PREFIX.
+
+ You may use these to separate different parts of the install:
+
+    -bindir <dir> ......... Executables will be installed to <dir>
+                            (default PREFIX/bin)
+    -libdir <dir> ......... Libraries will be installed to <dir>
+                            (default PREFIX/lib)
+    -docdir <dir> ......... Documentation will be installed to <dir>
+                            (default PREFIX/doc)
+    -headerdir <dir> ...... Headers will be installed to <dir>
+                            (default PREFIX/include)
+    -plugindir <dir> ...... Plugins will be installed to <dir>
+                            (default PREFIX/plugins)
+    -datadir <dir> ........ Data used by Qt programs will be installed to <dir>
+                            (default PREFIX)
+    -translationdir <dir> . Translations of Qt programs will be installed to <dir>
+                            (default PREFIX/translations)
+    -sysconfdir <dir> ..... Settings used by Qt programs will be looked for in <dir>
+                            (default PREFIX/etc/settings)
+    -examplesdir <dir> .... Examples will be installed to <dir>
+                            (default PREFIX/examples)
+    -demosdir <dir> ....... Demos will be installed to <dir>
+                            (default PREFIX/demos)
+
+ You may use these options to turn on strict plugin loading.
+
+    -buildkey <key> .... Build the Qt library and plugins using the specified
+                         <key>.  When the library loads plugins, it will only
+                         load those that have a matching key.
+
+Configure options:
+
+ The defaults (*) are usually acceptable. A plus (+) denotes a default value
+ that needs to be evaluated. If the evaluation succeeds, the feature is
+ included. Here is a short explanation of each option:
+
+ *  -release ........... Compile and link Qt with debugging turned off.
+    -debug ............. Compile and link Qt with debugging turned on.
+    -debug-and-release . Compile and link two versions of Qt, with and without
+                         debugging turned on (Mac only).
+
+    -developer-build.... Compile and link Qt with Qt developer options (including auto-tests exporting)
+
+    -opensource......... Compile and link the Open-Source Edition of Qt.
+    -commercial......... Compile and link the Commercial Edition of Qt.
+
+
+ *  -shared ............ Create and use shared Qt libraries.
+    -static ............ Create and use static Qt libraries.
+
+ *  -no-fast ........... Configure Qt normally by generating Makefiles for all
+                         project files.
+    -fast .............. Configure Qt quickly by generating Makefiles only for
+                         library and subdirectory targets.  All other Makefiles
+                         are created as wrappers, which will in turn run qmake.
+
+    -no-largefile ...... Disables large file support.
+ +  -largefile ......... Enables Qt to access files larger than 4 GB.
+
+EOF
+if [ "$PLATFORM_QWS" = "yes" ]; then
+    EXCN="*"
+    EXCY=" "
+else
+    EXCN=" "
+    EXCY="*"
+fi
+if [ "$CFG_DBUS" = "no" ]; then
+    DBY=" "
+    DBN="+"
+else
+    DBY="+"
+    DBN=" "
+fi
+
+    cat << EOF
+ $EXCN  -no-exceptions ..... Disable exceptions on compilers that support it.
+ $EXCY  -exceptions ........ Enable exceptions on compilers that support it.
+
+    -no-accessibility .. Do not compile Accessibility support.
+ *  -accessibility ..... Compile Accessibility support.
+
+ $SHN  -no-stl ............ Do not compile STL support.
+ $SHY  -stl ............... Compile STL support.
+
+    -no-sql-<driver> ... Disable SQL <driver> entirely.
+    -qt-sql-<driver> ... Enable a SQL <driver> in the QtSql library, by default
+                         none are turned on.
+    -plugin-sql-<driver> Enable SQL <driver> as a plugin to be linked to
+                         at run time.
+
+                         Possible values for <driver>:
+                         [ $CFG_SQL_AVAILABLE ]
+
+    -system-sqlite ..... Use sqlite from the operating system.
+
+    -no-qt3support ..... Disables the Qt 3 support functionality.
+ *  -qt3support ........ Enables the Qt 3 support functionality.
+
+    -no-xmlpatterns .... Do not build the QtXmlPatterns module.
+ +  -xmlpatterns ....... Build the QtXmlPatterns module.
+                         QtXmlPatterns is built if a decent C++ compiler
+                         is used and exceptions are enabled.
+
+    -no-phonon ......... Do not build the Phonon module.
+ +  -phonon ............ Build the Phonon module.
+                         Phonon is built if a decent C++ compiler is used.
+    -no-phonon-backend.. Do not build the platform phonon plugin.
+ +  -phonon-backend..... Build the platform phonon plugin.
+
+    -no-svg ............ Do not build the SVG module.
+ +  -svg ............... Build the SVG module.
+
+    -no-webkit ......... Do not build the WebKit module.
+ +  -webkit ............ Build the WebKit module.
+                         WebKit is built if a decent C++ compiler is used.
+
+    -no-scripttools .... Do not build the QtScriptTools module.
+ +  -scripttools ....... Build the QtScriptTools module.
+
+    -platform target ... The operating system and compiler you are building
+                         on ($PLATFORM).
+
+                         See the README file for a list of supported
+                         operating systems and compilers.
+EOF
+if [ "${PLATFORM_QWS}" != "yes" ]; then
+cat << EOF
+    -graphicssystem <sys> Sets an alternate graphics system. Available options are:
+                           raster - Software rasterizer
+                           opengl - Rendering via OpenGL, Experimental!
+EOF
+fi
+cat << EOF
+
+    -no-mmx ............ Do not compile with use of MMX instructions.
+    -no-3dnow .......... Do not compile with use of 3DNOW instructions.
+    -no-sse ............ Do not compile with use of SSE instructions.
+    -no-sse2 ........... Do not compile with use of SSE2 instructions.
+
+    -qtnamespace <name>  Wraps all Qt library code in 'namespace <name> {...}'.
+    -qtlibinfix <infix>  Renames all libQt*.so to libQt*<infix>.so.
+
+    -D <string> ........ Add an explicit define to the preprocessor.
+    -I <string> ........ Add an explicit include path.
+    -L <string> ........ Add an explicit library path.
+
+    -help, -h .......... Display this information.
+
+Third Party Libraries:
+
+    -qt-zlib ........... Use the zlib bundled with Qt.
+ +  -system-zlib ....... Use zlib from the operating system.
+                         See http://www.gzip.org/zlib
+
+    -no-gif ............ Do not compile the plugin for GIF reading support.
+ *  -qt-gif ............ Compile the plugin for GIF reading support.
+                         See also src/plugins/imageformats/gif/qgifhandler.h
+
+    -no-libtiff ........ Do not compile the plugin for TIFF support.
+    -qt-libtiff ........ Use the libtiff bundled with Qt.
+ +  -system-libtiff .... Use libtiff from the operating system.
+                         See http://www.libtiff.org
+
+    -no-libpng ......... Do not compile in PNG support.
+    -qt-libpng ......... Use the libpng bundled with Qt.
+ +  -system-libpng ..... Use libpng from the operating system.
+                         See http://www.libpng.org/pub/png
+
+    -no-libmng ......... Do not compile the plugin for MNG support.
+    -qt-libmng ......... Use the libmng bundled with Qt.
+ +  -system-libmng ..... Use libmng from the operating system.
+                         See http://www.libmng.com
+
+    -no-libjpeg ........ Do not compile the plugin for JPEG support.
+    -qt-libjpeg ........ Use the libjpeg bundled with Qt.
+ +  -system-libjpeg .... Use libjpeg from the operating system.
+                         See http://www.ijg.org
+
+    -no-openssl ........ Do not compile support for OpenSSL.
+ +  -openssl ........... Enable run-time OpenSSL support.
+    -openssl-linked .... Enabled linked OpenSSL support.
+
+    -ptmalloc .......... Override the system memory allocator with ptmalloc.
+                         (Experimental.)
+
+Additional options:
+
+    -make <part> ....... Add part to the list of parts to be built at make time.
+                         ($QT_DEFAULT_BUILD_PARTS)
+    -nomake <part> ..... Exclude part from the list of parts to be built.
+
+    -R <string> ........ Add an explicit runtime library path to the Qt
+                         libraries.
+    -l <string> ........ Add an explicit library.
+
+    -no-rpath .......... Do not use the library install path as a runtime
+                         library path.
+ +  -rpath ............. Link Qt libraries and executables using the library
+                         install path as a runtime library path. Equivalent
+                         to -R install_libpath
+
+    -continue .......... Continue as far as possible if an error occurs.
+
+    -verbose, -v ....... Print verbose information about each step of the
+                         configure process.
+
+    -silent ............ Reduce the build output so that warnings and errors
+                         can be seen more easily.
+
+ *  -no-optimized-qmake ... Do not build qmake optimized.
+    -optimized-qmake ...... Build qmake optimized.
+
+ $NSN  -no-nis ............ Do not compile NIS support.
+ $NSY  -nis ............... Compile NIS support.
+
+ $CUN  -no-cups ........... Do not compile CUPS support.
+ $CUY  -cups .............. Compile CUPS support.
+                         Requires cups/cups.h and libcups.so.2.
+
+ $CIN  -no-iconv .......... Do not compile support for iconv(3).
+ $CIY  -iconv ............. Compile support for iconv(3).
+
+ $PHN  -no-pch ............ Do not use precompiled header support.
+ $PHY  -pch ............... Use precompiled header support.
+
+ $DBN  -no-dbus ........... Do not compile the QtDBus module.
+ $DBY  -dbus .............. Compile the QtDBus module and dynamically load libdbus-1.
+    -dbus-linked ....... Compile the QtDBus module and link to libdbus-1.
+
+    -reduce-relocations ..... Reduce relocations in the libraries through extra
+                              linker optimizations (Qt/X11 and Qt for Embedded Linux only;
+                              experimental; needs GNU ld >= 2.18).
+EOF
+
+if [ "$CFG_SEPARATE_DEBUG_INFO" = "auto" ]; then
+    if [ "$QT_CROSS_COMPILE" = "yes" ]; then
+        SBY=""
+        SBN="*"
+    else
+        SBY="*"
+        SBN=" "
+    fi
+elif [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then
+    SBY="*"
+    SBN=" "
+else
+    SBY=" "
+    SBN="*"
+fi
+
+if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
+
+    cat << EOF
+
+ $SBN  -no-separate-debug-info . Do not store debug information in a separate file.
+ $SBY  -separate-debug-info .... Strip debug information into a separate .debug file.
+
+EOF
+
+fi # X11/QWS
+
+if [ "$PLATFORM_X11" = "yes" ]; then
+    if [ "$CFG_SM" = "no" ]; then
+        SMY=" "
+        SMN="*"
+    else
+        SMY="*"
+        SMN=" "
+    fi
+    if [ "$CFG_XSHAPE" = "no" ]; then
+        SHY=" "
+        SHN="*"
+    else
+        SHY="*"
+        SHN=" "
+    fi
+    if [ "$CFG_XINERAMA" = "no" ]; then
+        XAY=" "
+        XAN="*"
+    else
+        XAY="*"
+        XAN=" "
+    fi
+    if [ "$CFG_FONTCONFIG" = "no" ]; then
+        FCGY=" "
+        FCGN="*"
+    else
+        FCGY="*"
+        FCGN=" "
+    fi
+    if [ "$CFG_XCURSOR" = "no" ]; then
+        XCY=" "
+        XCN="*"
+    else
+        XCY="*"
+        XCN=" "
+    fi
+    if [ "$CFG_XFIXES" = "no" ]; then
+        XFY=" "
+        XFN="*"
+    else
+        XFY="*"
+        XFN=" "
+    fi
+    if [ "$CFG_XRANDR" = "no" ]; then
+        XZY=" "
+        XZN="*"
+    else
+        XZY="*"
+        XZN=" "
+    fi
+    if [ "$CFG_XRENDER" = "no" ]; then
+        XRY=" "
+        XRN="*"
+    else
+        XRY="*"
+        XRN=" "
+    fi
+    if [ "$CFG_MITSHM" = "no" ]; then
+        XMY=" "
+        XMN="*"
+    else
+        XMY="*"
+        XMN=" "
+    fi
+    if [ "$CFG_XINPUT" = "no" ]; then
+        XIY=" "
+        XIN="*"
+    else
+        XIY="*"
+        XIN=" "
+    fi
+    if [ "$CFG_XKB" = "no" ]; then
+        XKY=" "
+        XKN="*"
+    else
+        XKY="*"
+        XKN=" "
+    fi
+    if [ "$CFG_IM" = "no" ]; then
+        IMY=" "
+        IMN="*"
+    else
+        IMY="*"
+        IMN=" "
+    fi
+    cat << EOF
+
+Qt/X11 only:
+
+    -no-gtkstyle ....... Do not build the GTK theme integration.
+ +  -gtkstyle .......... Build the GTK theme integration.
+
+ *  -no-nas-sound ...... Do not compile in NAS sound support.
+    -system-nas-sound .. Use NAS libaudio from the operating system.
+                         See http://radscan.com/nas.html
+
+    -no-opengl ......... Do not support OpenGL.
+ +  -opengl <api> ...... Enable OpenGL support.
+                         With no parameter, this will auto-detect the "best"
+                         OpenGL API to use. If desktop OpenGL is avaliable, it
+                         will be used. Use desktop, es1, es1cl or es2 for <api>
+                         to force the use of the Desktop (OpenGL 1.x or 2.x),
+                         OpenGL ES 1.x Common profile, 1.x Common Lite profile
+                         or 2.x APIs instead. On X11, the EGL API will be used
+                         to manage GL contexts in the case of OpenGL ES.
+
+ $SMN  -no-sm ............. Do not support X Session Management.
+ $SMY  -sm ................ Support X Session Management, links in -lSM -lICE.
+
+ $SHN  -no-xshape ......... Do not compile XShape support.
+ $SHY  -xshape ............ Compile XShape support.
+                         Requires X11/extensions/shape.h.
+
+ $XAN  -no-xinerama ....... Do not compile Xinerama (multihead) support.
+ $XAY  -xinerama .......... Compile Xinerama support.
+                         Requires X11/extensions/Xinerama.h and libXinerama.
+			 By default, Xinerama support will be compiled if
+                         available and the shared libraries are dynamically
+                         loaded at runtime.
+
+ $XCN  -no-xcursor ........ Do not compile Xcursor support.
+ $XCY  -xcursor ........... Compile Xcursor support.
+                         Requires X11/Xcursor/Xcursor.h and libXcursor.
+			 By default, Xcursor support will be compiled if
+                         available and the shared libraries are dynamically
+                         loaded at runtime.
+
+ $XFN  -no-xfixes ......... Do not compile Xfixes support.
+ $XFY  -xfixes ............ Compile Xfixes support.
+                         Requires X11/extensions/Xfixes.h and libXfixes.
+			 By default, Xfixes support will be compiled if
+                         available and the shared libraries are dynamically
+                         loaded at runtime.
+
+ $XZN  -no-xrandr ......... Do not compile Xrandr (resize and rotate) support.
+ $XZY  -xrandr ............ Compile Xrandr support.
+                         Requires X11/extensions/Xrandr.h and libXrandr.
+
+ $XRN  -no-xrender ........ Do not compile Xrender support.
+ $XRY  -xrender ........... Compile Xrender support.
+                         Requires X11/extensions/Xrender.h and libXrender.
+
+ $XMN  -no-mitshm ......... Do not compile MIT-SHM support.
+ $XMY  -mitshm ............ Compile MIT-SHM support.
+                         Requires sys/ipc.h, sys/shm.h and X11/extensions/XShm.h
+
+ $FCGN  -no-fontconfig ..... Do not compile FontConfig (anti-aliased font) support.
+ $FCGY  -fontconfig ........ Compile FontConfig support.
+                         Requires fontconfig/fontconfig.h, libfontconfig,
+                         freetype.h and libfreetype.
+
+ $XIN  -no-xinput.......... Do not compile Xinput support.
+ $XIY  -xinput ............ Compile Xinput support. This also enabled tablet support
+                         which requires IRIX with wacom.h and libXi or
+                         XFree86 with X11/extensions/XInput.h and libXi.
+
+ $XKN  -no-xkb ............ Do not compile XKB (X KeyBoard extension) support.
+ $XKY  -xkb ............... Compile XKB support.
+
+EOF
+fi
+
+if [ "$PLATFORM_MAC" = "yes" ]; then
+    cat << EOF
+
+Qt/Mac only:
+
+    -Fstring ........... Add an explicit framework path.
+    -fw string ......... Add an explicit framework.
+
+    -cocoa ............. Build the Cocoa version of Qt. Note that -no-framework
+                         and -static is not supported with -cocoa. Specifying
+                         this option creates Qt binaries that requires Mac OS X
+                         10.5 or higher.
+
+ *  -framework ......... Build Qt as a series of frameworks and
+                         link tools against those frameworks.
+    -no-framework ...... Do not build Qt as a series of frameworks.
+
+ *  -dwarf2 ............ Enable dwarf2 debugging symbols.
+    -no-dwarf2 ......... Disable dwarf2 debugging symbols.
+
+    -universal ......... Equivalent to -arch "ppc x86"
+
+    -arch <arch> ....... Build Qt for <arch>
+                         Example values for <arch>: x86 ppc x86_64 ppc64
+                         Multiple -arch arguments can be specified, 64-bit archs
+                         will be built with the Cocoa framework.
+
+    -sdk <sdk> ......... Build Qt using Apple provided SDK <sdk>. This option requires gcc 4.
+                         To use a different SDK with gcc 3.3, set the SDKROOT environment variable.
+
+EOF
+fi
+
+if [ "$PLATFORM_QWS" = "yes" ]; then
+    cat << EOF
+
+Qt for Embedded Linux only:
+
+    -xplatform target ... The target platform when cross-compiling.
+
+    -no-feature-<feature> Do not compile in <feature>.
+    -feature-<feature> .. Compile in <feature>. The available features
+                          are described in src/corelib/global/qfeatures.txt
+
+    -embedded <arch> .... This will enable the embedded build, you must have a
+                          proper license for this switch to work.
+                          Example values for <arch>: arm mips x86 generic
+
+    -armfpa ............. Target platform is uses the ARM-FPA floating point format.
+    -no-armfpa .......... Target platform does not use the ARM-FPA floating point format.
+
+                          The floating point format is usually autodetected by configure. Use this
+                          to override the detected value.
+
+    -little-endian ...... Target platform is little endian (LSB first).
+    -big-endian ......... Target platform is big endian (MSB first).
+
+    -host-little-endian . Host platform is little endian (LSB first).
+    -host-big-endian .... Host platform is big endian (MSB first).
+
+                          You only need to specify the endianness when
+                          cross-compiling, otherwise the host
+                          endianness will be used.
+
+    -no-freetype ........ Do not compile in Freetype2 support.
+    -qt-freetype ........ Use the libfreetype bundled with Qt.
+ *  -system-freetype .... Use libfreetype from the operating system.
+                          See http://www.freetype.org/
+
+    -qconfig local ...... Use src/corelib/global/qconfig-local.h rather than the
+                          default ($CFG_QCONFIG).
+
+    -depths <list> ...... Comma-separated list of supported bit-per-pixel
+                          depths, from: 1, 4, 8, 12, 15, 16, 18, 24, 32 and 'all'.
+
+    -qt-decoration-<style> ....Enable a decoration <style> in the QtGui library,
+                               by default all available decorations are on.
+			       Possible values for <style>: [ $CFG_DECORATION_AVAILABLE ]
+    -plugin-decoration-<style> Enable decoration <style> as a plugin to be
+                               linked to at run time.
+			       Possible values for <style>: [ $CFG_DECORATION_PLUGIN_AVAILABLE ]
+    -no-decoration-<style> ....Disable decoration <style> entirely.
+                               Possible values for <style>: [ $CFG_DECORATION_AVAILABLE ]
+
+    -no-opengl .......... Do not support OpenGL.
+    -opengl <api> ....... Enable OpenGL ES support
+                          With no parameter, this will attempt to auto-detect OpenGL ES 1.x
+                          or 2.x. Use es1, es1cl or es2 for <api> to override auto-detection.
+
+                          NOTE: A QGLScreen driver for the hardware is required to support
+                                OpenGL ES on Qt for Embedded Linux.
+
+    -qt-gfx-<driver> ... Enable a graphics <driver> in the QtGui library.
+                         Possible values for <driver>: [ $CFG_GFX_AVAILABLE ]
+    -plugin-gfx-<driver> Enable graphics <driver> as a plugin to be
+                         linked to at run time.
+                         Possible values for <driver>: [ $CFG_GFX_PLUGIN_AVAILABLE ]
+    -no-gfx-<driver> ... Disable graphics <driver> entirely.
+                         Possible values for <driver>: [ $CFG_GFX_AVAILABLE ]
+
+    -qt-kbd-<driver> ... Enable a keyboard <driver> in the QtGui library.
+                         Possible values for <driver>: [ $CFG_KBD_AVAILABLE ]
+
+    -plugin-kbd-<driver> Enable keyboard <driver> as a plugin to be linked to
+                         at runtime.
+                         Possible values for <driver>: [ $CFG_KBD_PLUGIN_AVAILABLE ]
+
+    -no-kbd-<driver> ... Disable keyboard <driver> entirely.
+                         Possible values for <driver>: [ $CFG_KBD_AVAILABLE ]
+
+    -qt-mouse-<driver> ... Enable a mouse <driver> in the QtGui library.
+                           Possible values for <driver>: [ $CFG_MOUSE_AVAILABLE ]
+    -plugin-mouse-<driver> Enable mouse <driver> as a plugin to be linked to
+                           at runtime.
+                           Possible values for <driver>: [ $CFG_MOUSE_PLUGIN_AVAILABLE ]
+    -no-mouse-<driver> ... Disable mouse <driver> entirely.
+                           Possible values for <driver>: [ $CFG_MOUSE_AVAILABLE ]
+
+    -iwmmxt ............ Compile using the iWMMXt instruction set
+                         (available on some XScale CPUs).
+
+EOF
+fi
+
+
+if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_X11" = "yes" ]; then
+    if [ "$CFG_GLIB" = "no" ]; then
+        GBY=" "
+        GBN="+"
+    else
+        GBY="+"
+        GBN=" "
+    fi
+    cat << EOF
+ $GBN  -no-glib ........... Do not compile Glib support.
+ $GBY  -glib .............. Compile Glib support.
+
+EOF
+fi
+
+   [ "x$ERROR" = "xyes" ] && exit 1
+   exit 0
+fi # Help
+
+
+# -----------------------------------------------------------------------------
+# LICENSING, INTERACTIVE PART
+# -----------------------------------------------------------------------------
+
+if [ "$PLATFORM_QWS" = "yes" ]; then
+    Platform="Qt for Embedded Linux"
+elif [ "$PLATFORM_MAC" = "yes" ]; then
+    Platform="Qt/Mac"
+else
+    PLATFORM_X11=yes
+    Platform="Qt/X11"
+fi
+
+echo
+echo "This is the $Platform ${EditionString} Edition."
+echo
+
+if [ "$Edition" = "NokiaInternalBuild" ]; then
+    echo "Detected -nokia-developer option"
+    echo "Nokia employees and agents are allowed to use this software under"
+    echo "the authority of Nokia Corporation and/or its subsidiary(-ies)"
+elif [ "$Edition" = "OpenSource" ]; then
+    while true; do
+        echo "You are licensed to use this software under the terms of"
+        echo "the GNU General Public License (GPL) versions 3."
+        echo "You are also licensed to use this software under the terms of"
+        echo "the Lesser GNU General Public License (LGPL) versions 2.1."
+        echo
+        affix="either"
+        if [ "$OPT_CONFIRM_LICENSE" = "yes" ]; then
+	    echo "You have already accepted the terms of the $LicenseType license."
+            acceptance=yes
+        else
+	    echo "Type '3' to view the GNU General Public License version 3."
+            echo "Type 'L' to view the Lesser GNU General Public License version 2.1."
+            echo "Type 'yes' to accept this license offer."
+            echo "Type 'no' to decline this license offer."
+            echo
+            if echo '\c' | grep '\c' >/dev/null; then
+                echo -n "Do you accept the terms of $affix license? "
+            else
+                echo "Do you accept the terms of $affix license? \c"
+            fi
+            read acceptance
+        fi
+        echo
+        if [ "$acceptance" = "yes" ]; then
+            break
+        elif [ "$acceptance" = "no" ]; then
+            echo "You are not licensed to use this software."
+            echo
+            exit 1
+        elif [ "$acceptance" = "3" ]; then
+            more "$relpath/LICENSE.GPL3"
+        elif [ "$acceptance" = "L" ]; then
+            more "$relpath/LICENSE.LGPL"
+        fi
+    done
+elif [ "$Edition" = "Preview" ]; then
+    TheLicense=`head -n 1 "$relpath/LICENSE.PREVIEW.COMMERCIAL"`
+    while true; do
+
+        if [ "$OPT_CONFIRM_LICENSE" = "yes" ]; then
+            echo "You have already accepted the terms of the $LicenseType license."
+            acceptance=yes
+        else
+            echo "You are licensed to use this software under the terms of"
+            echo "the $TheLicense"
+            echo
+            echo "Type '?' to read the Preview License."
+            echo "Type 'yes' to accept this license offer."
+            echo "Type 'no' to decline this license offer."
+            echo
+            if echo '\c' | grep '\c' >/dev/null; then
+                echo -n "Do you accept the terms of the license? "
+            else
+                echo "Do you accept the terms of the license? \c"
+            fi
+            read acceptance
+        fi
+        echo
+        if [ "$acceptance" = "yes" ]; then
+            break
+        elif [ "$acceptance" = "no" ] ;then
+            echo "You are not licensed to use this software."
+            echo
+            exit 0
+        elif [ "$acceptance" = "?" ]; then
+            more "$relpath/LICENSE.PREVIEW.COMMERCIAL"
+        fi
+    done
+elif [ "$Edition" != "OpenSource" ]; then
+    if [ -n "$ExpiryDate" ]; then
+        ExpiryDate=`echo $ExpiryDate | sed -e "s,-,,g" | tr -d "\n\r"`
+        [ -z "$ExpiryDate" ] && ExpiryDate="0"
+        Today=`date +%Y%m%d`
+        if [ "$Today" -gt "$ExpiryDate" ]; then
+            case "$LicenseType" in
+            Commercial|Academic|Educational)
+                if [ "$QT_PACKAGEDATE" -gt "$ExpiryDate" ]; then
+                    echo
+                    echo "NOTICE  NOTICE  NOTICE  NOTICE"
+                    echo
+                    echo "  Your support and upgrade period has expired."
+                    echo
+                    echo "  You are no longer licensed to use this version of Qt."
+                    echo "  Please contact sales@trolltech.com to renew your support"
+                    echo "  and upgrades for this license."
+                    echo
+                    echo "NOTICE  NOTICE  NOTICE  NOTICE"
+                    echo
+                    exit 1
+                else
+                    echo
+                    echo "WARNING  WARNING  WARNING  WARNING"
+                    echo
+                    echo "  Your support and upgrade period has expired."
+                    echo
+                    echo "  You may continue to use your last licensed release"
+                    echo "  of Qt under the terms of your existing license"
+                    echo "  agreement. But you are not entitled to technical"
+                    echo "  support, nor are you entitled to use any more recent"
+                    echo "  Qt releases."
+                    echo
+                    echo "  Please contact sales@trolltech.com to renew your"
+                    echo "  support and upgrades for this license."
+                    echo
+                    echo "WARNING  WARNING  WARNING  WARNING"
+                    echo
+                    sleep 3
+                fi
+                ;;
+            Evaluation|*)
+                echo
+                echo "NOTICE  NOTICE  NOTICE  NOTICE"
+                echo
+                echo "  Your Evaluation license has expired."
+                echo
+                echo "  You are no longer licensed to use this software. Please"
+                echo "  contact sales@trolltech.com to purchase license, or install"
+                echo "  the Qt Open Source Edition if you intend to develop free"
+                echo "  software."
+                echo
+                echo "NOTICE  NOTICE  NOTICE  NOTICE"
+                echo
+                exit 1
+                ;;
+            esac
+        fi
+    fi
+    TheLicense=`head -n 1 "$outpath/LICENSE"`
+    while true; do
+        if [ "$OPT_CONFIRM_LICENSE" = "yes" ]; then
+	    echo "You have already accepted the terms of the $TheLicense."
+            acceptance=yes
+        else
+            echo "You are licensed to use this software under the terms of"
+            echo "the $TheLicense."
+            echo
+            echo "Type '?' to view the $TheLicense."
+            echo "Type 'yes' to accept this license offer."
+            echo "Type 'no' to decline this license offer."
+            echo
+            if echo '\c' | grep '\c' >/dev/null; then
+                echo -n "Do you accept the terms of the $TheLicense? "
+            else
+                echo "Do you accept the terms of the $TheLicense? \c"
+            fi
+            read acceptance
+        fi
+        echo
+        if [ "$acceptance" = "yes" ]; then
+            break
+        elif [ "$acceptance" = "no" ]; then
+            echo "You are not licensed to use this software."
+            echo
+            exit 1
+        else [ "$acceptance" = "?" ]
+            more "$outpath/LICENSE"
+        fi
+    done
+fi
+
+# this should be moved somewhere else
+case "$PLATFORM" in
+aix-*)
+    AIX_VERSION=`uname -v`
+    if [ "$AIX_VERSION" -lt "5" ]; then
+	QMakeVar add QMAKE_LIBS_X11 -lbind
+    fi
+    ;;
+*)
+    ;;
+esac
+
+#-------------------------------------------------------------------------------
+# generate qconfig.cpp
+#-------------------------------------------------------------------------------
+[ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global"
+
+LICENSE_USER_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_lcnsuser=$Licensee"`
+LICENSE_PRODUCTS_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_lcnsprod=$Edition"`
+PREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_INSTALL_PREFIX"`
+DOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_INSTALL_DOCS"`
+HEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_INSTALL_HEADERS"`
+LIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_INSTALL_LIBS"`
+BINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_INSTALL_BINS"`
+PLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_INSTALL_PLUGINS"`
+DATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_INSTALL_DATA"`
+TRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_INSTALL_TRANSLATIONS"`
+SETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS"`
+EXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES"`
+DEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS"`
+
+cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
+/* License Info */
+static const char qt_configure_licensee_str          [256 + 12] = "$LICENSE_USER_STR";
+static const char qt_configure_licensed_products_str [256 + 12] = "$LICENSE_PRODUCTS_STR";
+EOF
+
+if [ ! -z "$QT_HOST_PREFIX" ]; then
+    HOSTPREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_HOST_PREFIX"`
+    HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"`
+    HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"`
+    HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/lib"`
+    HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/bin"`
+    HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"`
+    HOSTDATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_HOST_PREFIX"`
+    HOSTTRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_HOST_PREFIX/translations"`
+    HOSTSETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS"`
+    HOSTEXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES"`
+    HOSTDEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS"`
+
+    cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
+
+#if defined(QT_BOOTSTRAPPED) || defined(QT_BUILD_QMAKE)
+/* Installation Info */
+static const char qt_configure_prefix_path_str       [256 + 12] = "$HOSTPREFIX_PATH_STR";
+static const char qt_configure_documentation_path_str[256 + 12] = "$HOSTDOCUMENTATION_PATH_STR";
+static const char qt_configure_headers_path_str      [256 + 12] = "$HOSTHEADERS_PATH_STR";
+static const char qt_configure_libraries_path_str    [256 + 12] = "$HOSTLIBRARIES_PATH_STR";
+static const char qt_configure_binaries_path_str     [256 + 12] = "$HOSTBINARIES_PATH_STR";
+static const char qt_configure_plugins_path_str      [256 + 12] = "$HOSTPLUGINS_PATH_STR";
+static const char qt_configure_data_path_str         [256 + 12] = "$HOSTDATA_PATH_STR";
+static const char qt_configure_translations_path_str [256 + 12] = "$HOSTTRANSLATIONS_PATH_STR";
+static const char qt_configure_settings_path_str     [256 + 12] = "$HOSTSETTINGS_PATH_STR";
+static const char qt_configure_examples_path_str     [256 + 12] = "$HOSTEXAMPLES_PATH_STR";
+static const char qt_configure_demos_path_str        [256 + 12] = "$HOSTDEMOS_PATH_STR";
+#else // QT_BOOTSTRAPPED
+EOF
+fi
+
+cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
+/* Installation Info */
+static const char qt_configure_prefix_path_str       [256 + 12] = "$PREFIX_PATH_STR";
+static const char qt_configure_documentation_path_str[256 + 12] = "$DOCUMENTATION_PATH_STR";
+static const char qt_configure_headers_path_str      [256 + 12] = "$HEADERS_PATH_STR";
+static const char qt_configure_libraries_path_str    [256 + 12] = "$LIBRARIES_PATH_STR";
+static const char qt_configure_binaries_path_str     [256 + 12] = "$BINARIES_PATH_STR";
+static const char qt_configure_plugins_path_str      [256 + 12] = "$PLUGINS_PATH_STR";
+static const char qt_configure_data_path_str         [256 + 12] = "$DATA_PATH_STR";
+static const char qt_configure_translations_path_str [256 + 12] = "$TRANSLATIONS_PATH_STR";
+static const char qt_configure_settings_path_str     [256 + 12] = "$SETTINGS_PATH_STR";
+static const char qt_configure_examples_path_str     [256 + 12] = "$EXAMPLES_PATH_STR";
+static const char qt_configure_demos_path_str        [256 + 12] = "$DEMOS_PATH_STR";
+EOF
+
+if [ ! -z "$QT_HOST_PREFIX" ]; then
+    cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
+#endif // QT_BOOTSTRAPPED
+
+EOF
+fi
+
+cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
+/* strlen( "qt_lcnsxxxx" ) == 12 */
+#define QT_CONFIGURE_LICENSEE qt_configure_licensee_str + 12;
+#define QT_CONFIGURE_LICENSED_PRODUCTS qt_configure_licensed_products_str + 12;
+#define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12;
+#define QT_CONFIGURE_DOCUMENTATION_PATH qt_configure_documentation_path_str + 12;
+#define QT_CONFIGURE_HEADERS_PATH qt_configure_headers_path_str + 12;
+#define QT_CONFIGURE_LIBRARIES_PATH qt_configure_libraries_path_str + 12;
+#define QT_CONFIGURE_BINARIES_PATH qt_configure_binaries_path_str + 12;
+#define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;
+#define QT_CONFIGURE_DATA_PATH qt_configure_data_path_str + 12;
+#define QT_CONFIGURE_TRANSLATIONS_PATH qt_configure_translations_path_str + 12;
+#define QT_CONFIGURE_SETTINGS_PATH qt_configure_settings_path_str + 12;
+#define QT_CONFIGURE_EXAMPLES_PATH qt_configure_examples_path_str + 12;
+#define QT_CONFIGURE_DEMOS_PATH qt_configure_demos_path_str + 12;
+EOF
+
+# avoid unecessary rebuilds by copying only if qconfig.cpp has changed
+if cmp -s "$outpath/src/corelib/global/qconfig.cpp" "$outpath/src/corelib/global/qconfig.cpp.new"; then
+    rm -f "$outpath/src/corelib/global/qconfig.cpp.new"
+else
+    [ -f "$outpath/src/corelib/global/qconfig.cpp" ] && chmod +w "$outpath/src/corelib/global/qconfig.cpp"
+    mv "$outpath/src/corelib/global/qconfig.cpp.new" "$outpath/src/corelib/global/qconfig.cpp"
+    chmod -w "$outpath/src/corelib/global/qconfig.cpp"
+fi
+
+# -----------------------------------------------------------------------------
+# build qmake
+# -----------------------------------------------------------------------------
+
+# symlink includes
+if [ -n "$PERL" ] && [ -x "$relpath/bin/syncqt" ]; then
+    SYNCQT_OPTS=
+    [ "$CFG_DEV" = "yes" ] && SYNCQT_OPTS="$SYNCQT_OPTS -check-includes"
+    if [ "$OPT_SHADOW" = "yes" ]; then
+        "$outpath/bin/syncqt" $SYNCQT_OPTS
+    elif [ "$CFG_DEV" = "yes" ]; then
+        QTDIR="$relpath" perl "$outpath/bin/syncqt" $SYNCQT_OPTS
+    fi
+fi
+
+# $1: variable name
+# $2: optional transformation
+# relies on $QMAKESPEC, $COMPILER_CONF and $mkfile being set correctly, as the latter
+# is where the resulting variable is written to
+setBootstrapVariable()
+{
+    variableRegExp="^$1[^_A-Z0-9]"
+    getQMakeConf | grep "$variableRegExp" | ( [ -n "$2" ] && sed "$2" ; [ -z "$2" ] && cat ) | $AWK '
+{
+    varLength = index($0, "=") - 1
+    valStart = varLength + 2
+    if (substr($0, varLength, 1) == "+") {
+        varLength = varLength - 1
+        valStart = valStart + 1
+    }
+    var = substr($0, 0, varLength)
+    gsub("[ \t]+", "", var)
+    val = substr($0, valStart)
+    printf "%s_%s = %s\n", var, NR, val
+}
+END {
+    if (length(var) > 0) {
+        printf "%s =", var
+        for (i = 1; i <= NR; ++i)
+            printf " $(%s_%s)", var, i
+        printf "\n"
+    }
+}' >> "$mkfile"
+}
+
+# build qmake
+if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+    echo "Creating qmake. Please wait..."
+
+    OLD_QCONFIG_H=
+    QCONFIG_H="$outpath/src/corelib/global/qconfig.h"
+    QMAKE_QCONFIG_H="${QCONFIG_H}.qmake"
+    if [ -f "$QCONFIG_H" ]; then
+         OLD_QCONFIG_H=$QCONFIG_H
+         mv -f "$OLD_QCONFIG_H" "${OLD_QCONFIG_H}.old"
+    fi
+
+    # create temporary qconfig.h for compiling qmake, if it doesn't exist
+    # when building qmake, we use #defines for the install paths,
+    # however they are real functions in the library
+    if [ '!' -f "$QMAKE_QCONFIG_H" ]; then
+        mkdir -p "$outpath/src/corelib/global"
+        [ -f "$QCONFIG_H" ] && chmod +w "$QCONFIG_H"
+        echo "/* All features enabled while building qmake */" >"$QMAKE_QCONFIG_H"
+    fi
+
+    mv -f "$QMAKE_QCONFIG_H" "$QCONFIG_H"
+    for conf in "$outpath/include/QtCore/qconfig.h" "$outpath/include/Qt/qconfig.h"; do
+        if [ '!' -f "$conf" ]; then
+            ln -s "$QCONFIG_H" "$conf"
+        fi
+    done
+
+    #mkspecs/default is used as a (gasp!) default mkspec so QMAKESPEC needn't be set once configured
+    rm -f mkspecs/default
+    ln -s `echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default
+    # fix makefiles
+    for mkfile in GNUmakefile Makefile; do
+        EXTRA_LFLAGS=
+        EXTRA_CFLAGS=
+        in_mkfile="${mkfile}.in"
+        if [ "$mkfile" = "Makefile" ]; then
+#           if which qmake >/dev/null 2>&1 && [ -f qmake/qmake.pro ]; then
+#               (cd qmake && qmake) >/dev/null 2>&1 && continue
+#           fi
+            in_mkfile="${mkfile}.unix"
+        fi
+        in_mkfile="$relpath/qmake/$in_mkfile"
+        mkfile="$outpath/qmake/$mkfile"
+        if [ -f "$mkfile" ]; then
+            [ "$CFG_DEV" = "yes" ] && "$WHICH" chflags >/dev/null 2>&1 && chflags nouchg "$mkfile"
+            rm -f "$mkfile"
+        fi
+        [ -f "$in_mkfile" ] || continue
+
+        echo "########################################################################" >$mkfile
+        echo "## This file was autogenerated by configure, all changes will be lost ##" >>$mkfile
+        echo "########################################################################" >>$mkfile
+        EXTRA_OBJS=
+        EXTRA_SRCS=
+        EXTRA_CFLAGS="\$(QMAKE_CFLAGS)"
+        EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS)"
+        EXTRA_LFLAGS="\$(QMAKE_LFLAGS)"
+
+        if [ "$PLATFORM" = "irix-cc" ] || [ "$PLATFORM" = "irix-cc-64" ]; then
+	    EXTRA_LFLAGS="$EXTRA_LFLAGS -lm"
+        fi
+
+	[ -n "$CC" ] && echo "CC = $CC" >>$mkfile
+	[ -n "$CXX" ] && echo "CXX = $CXX" >>$mkfile
+        if [ "$CFG_SILENT" = "yes" ]; then
+            [ -z "$CC" ] && setBootstrapVariable QMAKE_CC 's,QMAKE_CC.*=,CC=\@,'
+            [ -z "$CXX" ] && setBootstrapVariable QMAKE_CXX 's,QMAKE_CXX.*=,CXX=\@,'
+        else
+            [ -z "$CC" ] && setBootstrapVariable QMAKE_CC 's,QMAKE_CC,CC,'
+            [ -z "$CXX" ] && setBootstrapVariable QMAKE_CXX 's,QMAKE_CXX,CXX,'
+        fi
+        setBootstrapVariable QMAKE_CFLAGS
+        setBootstrapVariable QMAKE_CXXFLAGS 's,\$\$QMAKE_CFLAGS,\$(QMAKE_CFLAGS),'
+        setBootstrapVariable QMAKE_LFLAGS
+
+        if [ $QT_EDITION = "QT_EDITION_OPENSOURCE" ]; then
+            EXTRA_CFLAGS="$EXTRA_CFLAGS -DQMAKE_OPENSOURCE_EDITION"
+            EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -DQMAKE_OPENSOURCE_EDITION"
+        fi
+        if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then
+            setBootstrapVariable QMAKE_CFLAGS_RELEASE
+            setBootstrapVariable QMAKE_CXXFLAGS_RELEASE 's,\$\$QMAKE_CFLAGS_RELEASE,\$(QMAKE_CFLAGS_RELEASE),'
+            EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_RELEASE)"
+            EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_RELEASE)"
+        elif [ "$CFG_DEBUG" = "yes" ]; then
+            setBootstrapVariable QMAKE_CFLAGS_DEBUG
+            setBootstrapVariable QMAKE_CXXFLAGS_DEBUG 's,\$\$QMAKE_CFLAGS_DEBUG,\$(QMAKE_CFLAGS_DEBUG),'
+            EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)"
+            EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)"
+        fi
+
+	if [ '!' -z "$RPATH_FLAGS" ] && [ '!' -z "`getQMakeConf \"$QMAKESPEC\" | grep QMAKE_RPATH | awk '{print $3;}'`" ]; then
+  	    setBootstrapVariable QMAKE_RPATH 's,\$\$LITERAL_WHITESPACE, ,'
+	    for rpath in $RPATH_FLAGS; do
+		EXTRA_LFLAGS="\$(QMAKE_RPATH)\"$rpath\" $EXTRA_LFLAGS"
+            done
+        fi
+        if [ "$PLATFORM_MAC" = "yes" ]; then
+            if [ "$PLATFORM" = "macx-icc" ]; then
+                echo "export MACOSX_DEPLOYMENT_TARGET = 10.4" >>"$mkfile"
+	    else
+                echo "export MACOSX_DEPLOYMENT_TARGET = 10.3" >>"$mkfile"
+	    fi
+            echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
+            echo "CARBON_CFLAGS =-fconstant-cfstrings" >>"$mkfile"
+            EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)"
+            EXTRA_CFLAGS="$EXTRA_CFLAGS \$(CARBON_CFLAGS)"
+            EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
+            EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
+            EXTRA_SRCS="\"$relpath/src/corelib/io/qsettings_mac.cpp\" \"$relpath/src/corelib/kernel/qcore_mac.cpp\""
+	    if echo "$CFG_MAC_ARCHS" | grep x86 > /dev/null 2>&1; then
+		X86_CFLAGS="-arch i386"
+		X86_LFLAGS="-arch i386"
+		EXTRA_CFLAGS="$X86_CFLAGS $EXTRA_CFLAGS"
+		EXTRA_CXXFLAGS="$X86_CFLAGS $EXTRA_CXXFLAGS"
+                EXTRA_LFLAGS="$EXTRA_LFLAGS $X86_LFLAGS"
+            fi
+	    if echo "$CFG_MAC_ARCHS" | grep ppc > /dev/null 2>&1; then
+		PPC_CFLAGS="-arch ppc"
+		PPC_LFLAGS="-arch ppc"
+		EXTRA_CFLAGS="$PPC_CFLAGS $EXTRA_CFLAGS"
+		EXTRA_CXXFLAGS="$PPC_CFLAGS $EXTRA_CXXFLAGS"
+                EXTRA_LFLAGS="$EXTRA_LFLAGS $PPC_LFLAGS"
+            fi
+	    if [ '!' -z "$CFG_SDK" ]; then
+		echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
+		echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
+		EXTRA_CFLAGS="$EXTRA_CFLAGS \$(SDK_CFLAGS)"
+		EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(SDK_CFLAGS)"
+		EXTRA_LFLAGS="$EXTRA_LFLAGS \$(SDK_LFLAGS)"
+            fi
+        fi
+        [ "$CFG_EMBEDDED" != "no" ] && EXTRA_CFLAGS="$EXTRA_CFLAGS -DQWS"
+        if [ '!' -z "$D_FLAGS" ]; then
+            for DEF in $D_FLAGS; do
+                EXTRA_CFLAGS="$EXTRA_CFLAGS \"-D${DEF}\""
+            done
+        fi
+        QMAKE_BIN_DIR="$QT_INSTALL_BINS"
+        [ -z "$QMAKE_BIN_DIR" ] && QMAKE_BIN_DIR="${QT_INSTALL_PREFIX}/bin"
+        QMAKE_DATA_DIR="$QT_INSTALL_DATA"
+        [ -z "$QMAKE_DATA_DIR" ] && QMAKE_DATA_DIR="${QT_INSTALL_PREFIX}"
+        echo >>"$mkfile"
+	adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'`
+	adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'`
+        sed -e "s,@SOURCE_PATH@,$adjrelpath,g" -e "s,@BUILD_PATH@,$adjoutpath,g" \
+            -e "s,@QMAKE_CFLAGS@,$EXTRA_CFLAGS,g" -e "s,@QMAKE_LFLAGS@,$EXTRA_LFLAGS,g" \
+            -e "s,@QMAKE_CXXFLAGS@,$EXTRA_CXXFLAGS,g" \
+            -e "s,@QT_INSTALL_BINS@,\$(INSTALL_ROOT)$QMAKE_BIN_DIR,g" \
+            -e "s,@QT_INSTALL_DATA@,\$(INSTALL_ROOT)$QMAKE_DATA_DIR,g" \
+            -e "s,@QMAKE_QTOBJS@,$EXTRA_OBJS,g" -e "s,@QMAKE_QTSRCS@,$EXTRA_SRCS,g" \
+	    -e "s,@QMAKESPEC@,$QMAKESPEC,g" "$in_mkfile" >>"$mkfile"
+
+        if "$WHICH" makedepend >/dev/null 2>&1 && grep 'depend:' "$mkfile" >/dev/null 2>&1; then
+            (cd "$outpath/qmake" && "$MAKE" -f "$mkfile" depend) >/dev/null 2>&1
+	    sed "s,^.*/\([^/]*.o\):,\1:,g" "$mkfile" >"${mkfile}.tmp"
+	    mv "${mkfile}.tmp" "${mkfile}"
+        fi
+    done
+
+    QMAKE_BUILD_ERROR=no
+    (cd "$outpath/qmake"; "$MAKE") || QMAKE_BUILD_ERROR=yes
+    [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake
+    [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h
+    [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2
+fi # Build qmake
+
+#-------------------------------------------------------------------------------
+# tests that need qmake
+#-------------------------------------------------------------------------------
+
+# detect availability of float math.h functions
+if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/floatmath "floatmath" $L_FLAGS $I_FLAGS $l_FLAGS; then
+    CFG_USE_FLOATMATH=yes
+else
+    CFG_USE_FLOATMATH=no
+fi
+
+# detect mmx support
+if [ "${CFG_MMX}" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mmx "mmx" $L_FLAGS $I_FLAGS $l_FLAGS "-mmmx"; then
+	CFG_MMX=yes
+    else
+	CFG_MMX=no
+    fi
+fi
+
+# detect 3dnow support
+if [ "${CFG_3DNOW}" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/3dnow "3dnow" $L_FLAGS $I_FLAGS $l_FLAGS "-m3dnow"; then
+	CFG_3DNOW=yes
+    else
+	CFG_3DNOW=no
+    fi
+fi
+
+# detect sse support
+if [ "${CFG_SSE}" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse "sse" $L_FLAGS $I_FLAGS $l_FLAGS "-msse"; then
+	CFG_SSE=yes
+    else
+	CFG_SSE=no
+    fi
+fi
+
+# detect sse2 support
+if [ "${CFG_SSE2}" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse2 "sse2" $L_FLAGS $I_FLAGS $l_FLAGS "-msse2"; then
+       CFG_SSE2=yes
+    else
+       CFG_SSE2=no
+    fi
+fi
+
+# check iWMMXt support
+if [ "$CFG_IWMMXT" = "yes" ]; then
+    if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/iwmmxt "iwmmxt" $L_FLAGS $I_FLAGS $l_FLAGS "-mcpu=iwmmxt"; then
+        echo "The iWMMXt functionality test failed!"
+	echo " Please make sure your compiler supports iWMMXt intrinsics!"
+	exit 1
+    fi
+fi
+
+# detect zlib
+if [ "$CFG_ZLIB" = "no" ]; then
+    # Note: Qt no longer support builds without zlib
+    # So we force a "no" to be "auto" here.
+    # If you REALLY really need no zlib support, you can still disable
+    # it by doing the following:
+    #   add "no-zlib" to mkspecs/qconfig.pri
+    #   #define QT_NO_COMPRESS (probably by adding to src/corelib/global/qconfig.h)
+    #
+    # There's no guarantee that Qt will build under those conditions
+
+    CFG_ZLIB=auto
+    ZLIB_FORCED=yes
+fi
+if [ "$CFG_ZLIB" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/zlib "zlib" $L_FLAGS $I_FLAGS $l_FLAGS; then
+       CFG_ZLIB=system
+    else
+       CFG_ZLIB=yes
+    fi
+fi
+
+# detect how jpeg should be built
+if [ "$CFG_JPEG" = "auto" ]; then
+    if [ "$CFG_SHARED" = "yes" ]; then
+        CFG_JPEG=plugin
+    else
+        CFG_JPEG=yes
+    fi
+fi
+# detect jpeg
+if [ "$CFG_LIBJPEG" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libjpeg "libjpeg" $L_FLAGS $I_FLAGS $l_FLAGS; then
+       CFG_LIBJPEG=system
+    else
+       CFG_LIBJPEG=qt
+    fi
+fi
+
+# detect how gif should be built
+if [ "$CFG_GIF" = "auto" ]; then
+    if [ "$CFG_SHARED" = "yes" ]; then
+        CFG_GIF=plugin
+    else
+        CFG_GIF=yes
+    fi
+fi
+
+# detect how tiff should be built
+if [ "$CFG_TIFF" = "auto" ]; then
+    if [ "$CFG_SHARED" = "yes" ]; then
+        CFG_TIFF=plugin
+    else
+        CFG_TIFF=yes
+    fi
+fi
+
+# detect tiff
+if [ "$CFG_LIBTIFF" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libtiff "libtiff" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_LIBTIFF=system
+    else
+        CFG_LIBTIFF=qt
+    fi
+fi
+
+# detect how mng should be built
+if [ "$CFG_MNG" = "auto" ]; then
+    if [ "$CFG_SHARED" = "yes" ]; then
+        CFG_MNG=plugin
+    else
+        CFG_MNG=yes
+    fi
+fi
+# detect mng
+if [ "$CFG_LIBMNG" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libmng "libmng" $L_FLAGS $I_FLAGS $l_FLAGS; then
+       CFG_LIBMNG=system
+    else
+       CFG_LIBMNG=qt
+    fi
+fi
+
+# detect png
+if [ "$CFG_LIBPNG" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS; then
+       CFG_LIBPNG=system
+    else
+       CFG_LIBPNG=qt
+    fi
+fi
+
+# detect accessibility
+if [ "$CFG_ACCESSIBILITY" = "auto" ]; then
+    CFG_ACCESSIBILITY=yes
+fi
+
+# auto-detect SQL-modules support
+for _SQLDR in $CFG_SQL_AVAILABLE; do
+        case $_SQLDR in
+        mysql)
+            if [ "$CFG_SQL_mysql" != "no" ]; then
+		[ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`$WHICH mysql_config`
+                if [ -x "$CFG_MYSQL_CONFIG" ]; then
+                    QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null`
+                    QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null`
+                    QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null`
+		    QT_MYSQL_VERSION=`$CFG_MYSQL_CONFIG --version 2>/dev/null`
+                    QT_MYSQL_VERSION_MAJOR=`echo $QT_MYSQL_VERSION | cut -d . -f 1`
+                fi
+                if [ -n "$QT_MYSQL_VERSION" ] && [ "$QT_MYSQL_VERSION_MAJOR" -lt 4 ]; then
+                    if [ "$CFG_SQL_mysql" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                        echo "This version of MySql is not supported ($QT_MYSQL_VERSION)."
+                        echo " You need MySql 4 or higher."
+                        echo " If you believe this message is in error you may use the continue"
+                        echo " switch (-continue) to $0 to continue."
+                        exit 101
+                    else
+                        CFG_SQL_mysql="no"
+			QT_LFLAGS_MYSQL=""
+			QT_LFLAGS_MYSQL_R=""
+			QT_CFLAGS_MYSQL=""
+                    fi
+                else
+                    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mysql_r "MySQL (thread-safe)" $QT_LFLAGS_MYSQL_R $L_FLAGS $QT_CFLAGS_MYSQL $I_FLAGS $l_FLAGS; then
+                        QMakeVar add CONFIG use_libmysqlclient_r
+                        if [ "$CFG_SQL_mysql" = "auto" ]; then
+                            CFG_SQL_mysql=plugin
+                        fi
+                        QT_LFLAGS_MYSQL="$QT_LFLAGS_MYSQL_R"
+                    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mysql "MySQL (thread-unsafe)" $QT_LFLAGS_MYSQL $L_FLAGS $QT_CFLAGS_MYSQL $I_FLAGS $l_FLAGS; then
+                        if [ "$CFG_SQL_mysql" = "auto" ]; then
+                            CFG_SQL_mysql=plugin
+                        fi
+                    else
+                        if [ "$CFG_SQL_mysql" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                            echo "MySQL support cannot be enabled due to functionality tests!"
+                            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                            echo " If you believe this message is in error you may use the continue"
+                            echo " switch (-continue) to $0 to continue."
+                            exit 101
+                        else
+                            CFG_SQL_mysql=no
+			    QT_LFLAGS_MYSQL=""
+			    QT_LFLAGS_MYSQL_R=""
+			    QT_CFLAGS_MYSQL=""
+                        fi
+                    fi
+                fi
+            fi
+            ;;
+        psql)
+            if [ "$CFG_SQL_psql" != "no" ]; then
+                if "$WHICH" pg_config >/dev/null 2>&1; then
+                    QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
+                    QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
+                fi
+                [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
+                [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
+                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS; then
+                    if [ "$CFG_SQL_psql" = "auto" ]; then
+                        CFG_SQL_psql=plugin
+                    fi
+                else
+                    if [ "$CFG_SQL_psql" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                        echo "PostgreSQL support cannot be enabled due to functionality tests!"
+                        echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                        echo " If you believe this message is in error you may use the continue"
+                        echo " switch (-continue) to $0 to continue."
+                        exit 101
+                    else
+                        CFG_SQL_psql=no
+                        QT_CFLAGS_PSQL=""
+                        QT_LFLAGS_PSQL=""
+                    fi
+                fi
+            fi
+        ;;
+        odbc)
+            if [ "$CFG_SQL_odbc" != "no" ]; then
+                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS; then
+                    if [ "$CFG_SQL_odbc" = "auto" ]; then
+                        CFG_SQL_odbc=plugin
+                    fi
+                else
+                    if [ "$CFG_SQL_odbc" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                        echo "ODBC support cannot be enabled due to functionality tests!"
+                        echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                        echo " If you believe this message is in error you may use the continue"
+                        echo " switch (-continue) to $0 to continue."
+                        exit 101
+                    else
+                        CFG_SQL_odbc=no
+                    fi
+                fi
+            fi
+            ;;
+        oci)
+            if [ "$CFG_SQL_oci" != "no" ]; then
+                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/oci "OCI" $L_FLAGS $I_FLAGS $l_FLAGS; then
+                    if [ "$CFG_SQL_oci" = "auto" ]; then
+                        CFG_SQL_oci=plugin
+                    fi
+                else
+                    if [ "$CFG_SQL_oci" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                        echo "Oracle (OCI) support cannot be enabled due to functionality tests!"
+                        echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                        echo " If you believe this message is in error you may use the continue"
+                        echo " switch (-continue) to $0 to continue."
+                        exit 101
+                    else
+                        CFG_SQL_oci=no
+                    fi
+                fi
+            fi
+            ;;
+        tds)
+            if [ "$CFG_SQL_tds" != "no" ]; then
+                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS; then
+                    if [ "$CFG_SQL_tds" = "auto" ]; then
+                        CFG_SQL_tds=plugin
+                    fi
+                else
+                    if [ "$CFG_SQL_tds" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                        echo "TDS support cannot be enabled due to functionality tests!"
+                        echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                        echo " If you believe this message is in error you may use the continue"
+                        echo " switch (-continue) to $0 to continue."
+                        exit 101
+                    else
+                        CFG_SQL_tds=no
+                    fi
+                fi
+            fi
+            ;;
+        db2)
+            if [ "$CFG_SQL_db2" != "no" ]; then
+                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/db2 "DB2" $L_FLAGS $I_FLAGS $l_FLAGS; then
+                    if [ "$CFG_SQL_db2" = "auto" ]; then
+                        CFG_SQL_db2=plugin
+                    fi
+                else
+                    if [ "$CFG_SQL_db2" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                        echo "ODBC support cannot be enabled due to functionality tests!"
+                        echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                        echo " If you believe this message is in error you may use the continue"
+                        echo " switch (-continue) to $0 to continue."
+                        exit 101
+                    else
+                        CFG_SQL_db2=no
+                    fi
+                fi
+            fi
+            ;;
+        ibase)
+            if [ "$CFG_SQL_ibase" != "no" ]; then
+                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ibase "InterBase" $L_FLAGS $I_FLAGS $l_FLAGS; then
+                    if [ "$CFG_SQL_ibase" = "auto" ]; then
+                        CFG_SQL_ibase=plugin
+                    fi
+                else
+                    if [ "$CFG_SQL_ibase" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                        echo "InterBase support cannot be enabled due to functionality tests!"
+                        echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                        echo " If you believe this message is in error you may use the continue"
+                        echo " switch (-continue) to $0 to continue."
+                        exit 101
+                    else
+                        CFG_SQL_ibase=no
+                    fi
+                fi
+            fi
+            ;;
+        sqlite2)
+            if [ "$CFG_SQL_sqlite2" != "no" ]; then
+                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite2 "SQLite2" $L_FLAGS $I_FLAGS $l_FLAGS; then
+                    if [ "$CFG_SQL_sqlite2" = "auto" ]; then
+                        CFG_SQL_sqlite2=plugin
+                    fi
+                else
+                    if [ "$CFG_SQL_sqlite2" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                        echo "SQLite2 support cannot be enabled due to functionality tests!"
+                        echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                        echo " If you believe this message is in error you may use the continue"
+                        echo " switch (-continue) to $0 to continue."
+                        exit 101
+                    else
+                        CFG_SQL_sqlite2=no
+                    fi
+                fi
+            fi
+            ;;
+        sqlite)
+            if [ "$CFG_SQL_sqlite" != "no" ]; then
+                SQLITE_AUTODETECT_FAILED="no"
+                if [ "$CFG_SQLITE" = "system" ]; then
+                    if [ -n "$PKG_CONFIG" ]; then
+                        QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null`
+                        QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null`
+                    fi
+                    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS; then
+                        if [ "$CFG_SQL_sqlite" = "auto" ]; then
+                            CFG_SQL_sqlite=plugin
+                        fi
+                        QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite"
+                    else
+                        SQLITE_AUTODETECT_FAILED="yes"
+                        CFG_SQL_sqlite=no
+                    fi
+                elif [ -f "$relpath/src/3rdparty/sqlite/sqlite3.h" ]; then
+                    if [ "$CFG_SQL_sqlite" = "auto" ]; then
+                            CFG_SQL_sqlite=plugin
+                    fi
+                else
+                    SQLITE_AUTODETECT_FAILED="yes"
+                    CFG_SQL_sqlite=no
+                fi
+
+                if [ "$SQLITE_AUTODETECT_FAILED" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                    echo "SQLite support cannot be enabled due to functionality tests!"
+                    echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                    echo " If you believe this message is in error you may use the continue"
+                    echo " switch (-continue) to $0 to continue."
+                    exit 101
+                fi
+            fi
+            ;;
+        *)
+            if [ "$OPT_VERBOSE" = "yes" ]; then
+                echo "unknown SQL driver: $_SQLDR"
+            fi
+            ;;
+        esac
+done
+
+# auto-detect NIS support
+if [ "$CFG_NIS" != "no" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/nis "NIS" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_NIS=yes
+    else
+        if [ "$CFG_NIS" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "NIS support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+        else
+            CFG_NIS=no
+        fi
+    fi
+fi
+
+# auto-detect CUPS support
+if [ "$CFG_CUPS" != "no" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/cups "Cups" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_CUPS=yes
+    else
+        if [ "$CFG_CUPS" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "Cups support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+        else
+            CFG_CUPS=no
+        fi
+    fi
+fi
+
+# auto-detect iconv(3) support
+if [ "$CFG_ICONV" != "no" ]; then
+    if [ "$PLATFORM_QWS" = "yes" ]; then
+	CFG_ICONV=no
+    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_ICONV=yes
+    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/gnu-libiconv" "GNU libiconv" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_ICONV=gnu
+    else
+        if [ "$CFG_ICONV" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "Iconv support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+        else
+            CFG_ICONV=no
+        fi
+    fi
+fi
+
+# auto-detect libdbus-1 support
+if [ "$CFG_DBUS" != "no" ]; then
+    if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --atleast-version="$MIN_DBUS_1_VERSION" dbus-1 2>/dev/null; then
+        QT_CFLAGS_DBUS=`$PKG_CONFIG --cflags dbus-1 2>/dev/null`
+        QT_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null`
+    fi
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/dbus "D-Bus" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_DBUS $QT_LIBS_DBUS; then
+        [ "$CFG_DBUS" = "auto" ] && CFG_DBUS=yes
+        QMakeVar set QT_CFLAGS_DBUS "$QT_CFLAGS_DBUS"
+        QMakeVar set QT_LIBS_DBUS "$QT_LIBS_DBUS"
+    else
+        if [ "$CFG_DBUS" = "auto" ]; then
+            CFG_DBUS=no
+        elif [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            # CFG_DBUS is "yes" or "linked" here
+
+            echo "The QtDBus module cannot be enabled because libdbus-1 version $MIN_DBUS_1_VERSION was not found."
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+        fi
+    fi
+fi
+
+# Generate a CRC of the namespace for using in constants for the Carbon port.
+# This should mean that you really *can* load two Qt's and have our custom
+# Carbon events work.
+if [ "$PLATFORM_MAC" = "yes" -a ! -z "$QT_NAMESPACE" ]; then
+    QT_NAMESPACE_MAC_CRC=`"$mactests/crc.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/mac/crc $QT_NAMESPACE $L_FLAGS $I_FLAGS $l_FLAGS`
+fi
+
+if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
+    # auto-detect Glib support
+    if [ "$CFG_GLIB" != "no" ]; then
+        if [ -n "$PKG_CONFIG" ]; then
+            QT_CFLAGS_GLIB=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0 2>/dev/null`
+            QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null`
+        fi
+        if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/glib "Glib" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_GLIB $QT_LIBS_GLIB $X11TESTS_FLAGS; then
+            CFG_GLIB=yes
+            QMakeVar set QT_CFLAGS_GLIB "$QT_CFLAGS_GLIB"
+            QMakeVar set QT_LIBS_GLIB "$QT_LIBS_GLIB"
+        else
+            if [ "$CFG_GLIB" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                echo "Glib support cannot be enabled due to functionality tests!"
+                echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                echo " If you believe this message is in error you may use the continue"
+                echo " switch (-continue) to $0 to continue."
+                exit 101
+            else
+                CFG_GLIB=no
+            fi
+        fi
+    fi
+
+    if [ "$CFG_PHONON" != "no" ]; then
+        if [ "$CFG_PHONON_BACKEND" != "no" ]; then
+            if [ "$CFG_GLIB" = "yes" -a "$CFG_GSTREAMER" != "no" ]; then
+                if [ -n "$PKG_CONFIG" ]; then
+                    QT_CFLAGS_GSTREAMER=`$PKG_CONFIG --cflags gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null`
+                    QT_LIBS_GSTREAMER=`$PKG_CONFIG --libs gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null`
+                fi
+                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/gstreamer "GStreamer" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_GSTREAMER $QT_LIBS_GSTREAMER $X11TESTS_FLAGS; then
+                    CFG_GSTREAMER=yes
+                    QMakeVar set QT_CFLAGS_GSTREAMER "$QT_CFLAGS_GSTREAMER"
+                    QMakeVar set QT_LIBS_GSTREAMER "$QT_LIBS_GSTREAMER"
+                else
+                    if [ "$CFG_GSTREAMER" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                        echo "Gstreamer support cannot be enabled due to functionality tests!"
+                        echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                        echo " If you believe this message is in error you may use the continue"
+                        echo " switch (-continue) to $0 to continue."
+                        exit 101
+                    else
+                        CFG_GSTREAMER=no
+                    fi
+                fi
+            elif [ "$CFG_GLIB" = "no" ]; then
+                CFG_GSTREAMER=no
+            fi
+
+            if [ "$CFG_GSTREAMER" = "yes" ]; then
+                CFG_PHONON=yes
+            else
+                if [ "$CFG_PHONON" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                    echo "Phonon support cannot be enabled due to functionality tests!"
+                    echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                    echo " If you believe this message is in error you may use the continue"
+                    echo " switch (-continue) to $0 to continue."
+                    exit 101
+                else
+                    CFG_PHONON=no
+                fi
+            fi
+        else
+            CFG_PHONON=yes
+        fi
+    fi
+fi # X11/QWS
+
+# x11
+if [ "$PLATFORM_X11" = "yes" ]; then
+    x11tests="$relpath/config.tests/x11"
+    X11TESTS_FLAGS=
+
+    # work around broken X11 headers when using GCC 2.95 or later
+    NOTYPE=no
+    "$x11tests/notype.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" && NOTYPE=yes
+    if [ $NOTYPE = "yes" ]; then
+	QMakeVar add QMAKE_CXXFLAGS -fpermissive
+        X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
+    fi
+
+    # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
+    if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
+        if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+            CFG_OPENGL=desktop
+        elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
+            CFG_OPENGL=es2
+	elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
+            CFG_OPENGL=es1
+	elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1cl "OpenGL ES 1.x Lite" $L_FLAGS $I_FLAGS $l_FLAGS; then
+            CFG_OPENGL=es1cl
+        else
+            if [ "$CFG_OPENGL" = "yes" ]; then
+                echo "All the OpenGL functionality tests failed!"
+                echo " You might need to modify the include and library search paths by editing"
+                echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+                echo " ${XQMAKESPEC}."
+                exit 1
+            fi
+            CFG_OPENGL=no
+        fi
+       case "$PLATFORM" in
+       hpux*)
+           # HP-UX have buggy glx headers; check if we really need to define the GLXFBConfig struct.
+           if [ "$CFG_OPENGL" = "desktop" ]; then
+               if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/glxfbconfig "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+                   QMakeVar add DEFINES QT_DEFINE_GLXFBCONFIG_STRUCT
+               fi
+           fi
+	   ;;
+       *)
+           ;;
+       esac
+    elif [ "$CFG_OPENGL" = "es1cl" ]; then
+        # OpenGL ES 1.x common lite
+	if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1cl "OpenGL ES 1.x Lite" $L_FLAGS $I_FLAGS $l_FLAGS; then
+	    echo "The OpenGL ES 1.x Common Lite Profile functionality test failed!"
+            echo " You might need to modify the include and library search paths by editing"
+	    echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+	    echo " ${XQMAKESPEC}."
+            exit 1
+        fi
+    elif [ "$CFG_OPENGL" = "es1" ]; then
+        # OpenGL ES 1.x
+	if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
+	    echo "The OpenGL ES 1.x functionality test failed!"
+            echo " You might need to modify the include and library search paths by editing"
+	    echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+	    echo " ${XQMAKESPEC}."
+            exit 1
+        fi
+    elif [ "$CFG_OPENGL" = "es2" ]; then
+        #OpenGL ES 2.x
+	if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
+	    echo "The OpenGL ES 2.0 functionality test failed!"
+            echo " You might need to modify the include and library search paths by editing"
+	    echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+	    echo " ${XQMAKESPEC}."
+            exit 1
+        fi
+    elif [ "$CFG_OPENGL" = "desktop" ]; then
+        # Desktop OpenGL support
+        if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+	    echo "The OpenGL functionality test failed!"
+            echo " You might need to modify the include and library search paths by editing"
+	    echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+	    echo " ${XQMAKESPEC}."
+            exit 1
+        fi
+        case "$PLATFORM" in
+        hpux*)
+            # HP-UX have buggy glx headers; check if we really need to define the GLXFBConfig struct.
+            if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/glxfbconfig "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+                QMakeVar add DEFINES QT_DEFINE_GLXFBCONFIG_STRUCT
+            fi
+	    ;;
+        *)
+            ;;
+        esac
+    fi
+
+    # if opengl is disabled and the user specified graphicssystem gl, disable it...
+    if [ "$CFG_GRAPHICS_SYSTEM" = "opengl" ] && [ "$CFG_OPENGL" = "no" ]; then
+	echo "OpenGL Graphics System is disabled due to missing OpenGL support..."
+	CFG_GRAPHICS_SYSTEM=default
+    fi
+
+    # auto-detect Xcursor support
+    if [ "$CFG_XCURSOR" != "no" ]; then
+	if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xcursor "Xcursor" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+	    if [ "$CFG_XCURSOR" != "runtime" ]; then
+		CFG_XCURSOR=yes;
+	    fi
+	else
+	    if [ "$CFG_XCURSOR" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+		echo "Xcursor support cannot be enabled due to functionality tests!"
+		echo " Turn on verbose messaging (-v) to $0 to see the final report."
+		echo " If you believe this message is in error you may use the continue"
+		echo " switch (-continue) to $0 to continue."
+		exit 101
+	    else
+		CFG_XCURSOR=no
+	    fi
+	fi
+    fi
+
+    # auto-detect Xfixes support
+    if [ "$CFG_XFIXES" != "no" ]; then
+	if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xfixes "Xfixes" $L_FLAGS $I_FLAGS $X11TESTS_FLAGS; then
+	    if [ "$CFG_XFIXES" != "runtime" ]; then
+		CFG_XFIXES=yes;
+	    fi
+	else
+	    if [ "$CFG_XFIXES" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+		echo "Xfixes support cannot be enabled due to functionality tests!"
+		echo " Turn on verbose messaging (-v) to $0 to see the final report."
+		echo " If you believe this message is in error you may use the continue"
+		echo " switch (-continue) to $0 to continue."
+		exit 101
+	    else
+		CFG_XFIXES=no
+	    fi
+	fi
+    fi
+
+    # auto-detect Xrandr support (resize and rotate extension)
+    if [ "$CFG_XRANDR" != "no" ]; then
+	if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xrandr "Xrandr" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+            if [ "$CFG_XRANDR" != "runtime" ]; then
+	    CFG_XRANDR=yes
+            fi
+	else
+	    if [ "$CFG_XRANDR" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+		echo "Xrandr support cannot be enabled due to functionality tests!"
+		echo " Turn on verbose messaging (-v) to $0 to see the final report."
+		echo " If you believe this message is in error you may use the continue"
+		echo " switch (-continue) to $0 to continue."
+		exit 101
+	    else
+		CFG_XRANDR=no
+	    fi
+	fi
+    fi
+
+    # auto-detect Xrender support
+    if [ "$CFG_XRENDER" != "no" ]; then
+	if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xrender "Xrender" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+	    CFG_XRENDER=yes
+	else
+	    if [ "$CFG_XRENDER" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+		echo "Xrender support cannot be enabled due to functionality tests!"
+		echo " Turn on verbose messaging (-v) to $0 to see the final report."
+		echo " If you believe this message is in error you may use the continue"
+		echo " switch (-continue) to $0 to continue."
+		exit 101
+	    else
+		CFG_XRENDER=no
+	    fi
+	fi
+    fi
+
+    # auto-detect MIT-SHM support
+    if [ "$CFG_MITSHM" != "no" ]; then
+	if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/mitshm "mitshm" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+	    CFG_MITSHM=yes
+	else
+	    if [ "$CFG_MITSHM" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+		echo "MITSHM support cannot be enabled due to functionality tests!"
+		echo " Turn on verbose messaging (-v) to $0 to see the final report."
+		echo " If you believe this message is in error you may use the continue"
+		echo " switch (-continue) to $0 to continue."
+		exit 101
+	    else
+		CFG_MITSHM=no
+	    fi
+	fi
+    fi
+
+    # auto-detect FontConfig support
+    if [ "$CFG_FONTCONFIG" != "no" ]; then
+    if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists fontconfig 2>/dev/null; then
+        QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig 2>/dev/null`
+        QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig 2>/dev/null`
+    else
+        QT_CFLAGS_FONTCONFIG=
+        QT_LIBS_FONTCONFIG="-lfreetype -lfontconfig"
+    fi
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/fontconfig "FontConfig" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS $QT_CFLAGS_FONTCONFIG $QT_LIBS_FONTCONFIG; then
+	    CFG_FONTCONFIG=yes
+        QMakeVar set QMAKE_CFLAGS_X11 "$QT_CFLAGS_FONTCONFIG \$\$QMAKE_CFLAGS_X11"
+        QMakeVar set QMAKE_LIBS_X11 "$QT_LIBS_FONTCONFIG \$\$QMAKE_LIBS_X11"
+	    CFG_LIBFREETYPE=system
+	else
+	    if [ "$CFG_FONTCONFIG" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+		echo "FontConfig support cannot be enabled due to functionality tests!"
+		echo " Turn on verbose messaging (-v) to $0 to see the final report."
+		echo " If you believe this message is in error you may use the continue"
+		echo " switch (-continue) to $0 to continue."
+		exit 101
+	    else
+		CFG_FONTCONFIG=no
+	    fi
+	fi
+    fi
+
+    # auto-detect Session Management support
+    if [ "$CFG_SM" = "auto" ]; then
+	if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/sm "Session Management" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+	    CFG_SM=yes
+	else
+	    if [ "$CFG_SM" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+		echo "Session Management support cannot be enabled due to functionality tests!"
+		echo " Turn on verbose messaging (-v) to $0 to see the final report."
+		echo " If you believe this message is in error you may use the continue"
+		echo " switch (-continue) to $0 to continue."
+		exit 101
+	    else
+		CFG_SM=no
+	    fi
+	fi
+    fi
+
+    # auto-detect SHAPE support
+    if [ "$CFG_XSHAPE" != "no" ]; then
+	if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xshape "XShape" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+	    CFG_XSHAPE=yes
+	else
+	    if [ "$CFG_XSHAPE" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+		echo "XShape support cannot be enabled due to functionality tests!"
+		echo " Turn on verbose messaging (-v) to $0 to see the final report."
+		echo " If you believe this message is in error you may use the continue"
+		echo " switch (-continue) to $0 to continue."
+		exit 101
+	    else
+		CFG_XSHAPE=no
+	    fi
+	fi
+    fi
+
+    # auto-detect Xinerama support
+    if [ "$CFG_XINERAMA" != "no" ]; then
+	if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xinerama "Xinerama" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+	    if [ "$CFG_XINERAMA" != "runtime" ]; then
+		CFG_XINERAMA=yes
+	    fi
+	else
+	    if [ "$CFG_XINERAMA" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+		echo "Xinerama support cannot be enabled due to functionality tests!"
+		echo " Turn on verbose messaging (-v) to $0 to see the final report."
+		echo " If you believe this message is in error you may use the continue"
+		echo " switch (-continue) to $0 to continue."
+		exit 101
+	    else
+		CFG_XINERAMA=no
+	    fi
+	fi
+    fi
+
+    # auto-detect Xinput support
+    if [ "$CFG_XINPUT" != "no" ]; then
+        if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xinput "XInput" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+	    if [ "$CFG_XINPUT" != "runtime" ]; then
+		CFG_XINPUT=yes
+	    fi
+        else
+            if [ "$CFG_XINPUT" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                echo "Tablet and Xinput support cannot be enabled due to functionality tests!"
+                echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                echo " If you believe this message is in error you may use the continue"
+                echo " switch (-continue) to $0 to continue."
+                exit 101
+            else
+                CFG_XINPUT=no
+            fi
+        fi
+    fi
+
+    # auto-detect XKB support
+    if [ "$CFG_XKB" != "no" ]; then
+        if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xkb "XKB" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+            CFG_XKB=yes
+        else
+            if [ "$CFG_XKB" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                echo "XKB support cannot be enabled due to functionality tests!"
+                echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                echo " If you believe this message is in error you may use the continue"
+                echo " switch (-continue) to $0 to continue."
+                exit 101
+            else
+                CFG_XKB=no
+            fi
+        fi
+    fi
+
+    if [ "$CFG_GLIB" = "yes" -a "$CFG_QGTKSTYLE" != "no" ]; then
+        if [ -n "$PKG_CONFIG" ]; then
+            QT_CFLAGS_QGTKSTYLE=`$PKG_CONFIG --cflags gtk+-2.0 ">=" 2.10 atk 2>/dev/null`
+            QT_LIBS_QGTKSTYLE=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null`
+        fi
+        if [ -n "$QT_CFLAGS_QGTKSTYLE" ] ; then
+            CFG_QGTKSTYLE=yes
+            QMakeVar set QT_CFLAGS_QGTKSTYLE "$QT_CFLAGS_QGTKSTYLE"
+            QMakeVar set QT_LIBS_QGTKSTYLE "$QT_LIBS_QGTKSTYLE"
+        else
+            if [ "$CFG_QGTKSTYLE" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                echo "Gtk theme support cannot be enabled due to functionality tests!"
+                echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                echo " If you believe this message is in error you may use the continue"
+                echo " switch (-continue) to $0 to continue."
+                exit 101
+            else
+                CFG_QGTKSTYLE=no
+            fi
+        fi
+    elif [ "$CFG_GLIB" = "no" ]; then
+        CFG_QGTKSTYLE=no
+    fi
+fi # X11
+
+
+if [ "$PLATFORM_MAC" = "yes" ]; then
+    if [ "$CFG_PHONON" != "no" ]; then
+        # Always enable Phonon (unless it was explicitly disabled)
+        CFG_PHONON=yes
+    fi
+fi
+
+# QWS
+if [ "$PLATFORM_QWS" = "yes" ]; then
+
+    # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
+    if [ "$CFG_OPENGL" = "yes" ]; then
+        if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
+            CFG_OPENGL=es2
+	elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
+            CFG_OPENGL=es1
+	elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1cl "OpenGL ES 1.x Lite" $L_FLAGS $I_FLAGS $l_FLAGS; then
+            CFG_OPENGL=es1cl
+        else
+            echo "All the OpenGL ES functionality tests failed!"
+            echo " You might need to modify the include and library search paths by editing"
+            echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+            echo " ${XQMAKESPEC}."
+            exit 1
+        fi
+    elif [ "$CFG_OPENGL" = "es1" ]; then
+        # OpenGL ES 1.x
+	if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
+	    echo "The OpenGL ES 1.x functionality test failed!"
+            echo " You might need to modify the include and library search paths by editing"
+	    echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+	    echo " ${XQMAKESPEC}."
+            exit 1
+        fi
+    elif [ "$CFG_OPENGL" = "es2" ]; then
+        #OpenGL ES 2.x
+	if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
+	    echo "The OpenGL ES 2.0 functionality test failed!"
+            echo " You might need to modify the include and library search paths by editing"
+	    echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+	    echo " ${XQMAKESPEC}."
+            exit 1
+        fi
+    elif [ "$CFG_OPENGL" = "desktop" ]; then
+        # Desktop OpenGL support
+        echo "Desktop OpenGL support is not avaliable on Qt for Embedded Linux"
+        exit 1
+    fi
+
+    # screen drivers
+    for screen in ${CFG_GFX_ON} ${CFG_GFX_PLUGIN}; do
+       if [ "${screen}" = "ahi" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; then
+           if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/ahi "Ahi" $L_FLAGS $I_FLAGS $l_FLAGS; then
+               echo "The Ahi screen driver functionality test failed!"
+               echo " You might need to modify the include and library search paths by editing"
+               echo " QMAKE_INCDIR and QMAKE_LIBDIR in"
+               echo " ${XQMAKESPEC}."
+               exit 1
+           fi
+       fi
+
+       if [ "${screen}" = "svgalib" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; then
+           if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/svgalib "SVGAlib" $L_FLAGS $I_FLAGS $l_FLAGS; then
+               echo "The SVGAlib screen driver functionality test failed!"
+               echo " You might need to modify the include and library search paths by editing"
+               echo " QMAKE_INCDIR and QMAKE_LIBDIR in"
+               echo " ${XQMAKESPEC}."
+               exit 1
+           fi
+       fi
+
+       if [ "${screen}" = "directfb" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; then
+           if [ -n "$PKG_CONFIG" ]; then
+               if $PKG_CONFIG --exists directfb 2>/dev/null; then
+                   QT_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null`
+                   QT_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null`
+               elif directfb-config --version >/dev/null 2>&1; then
+                   QT_CFLAGS_DIRECTFB=`directfb-config --cflags 2>/dev/null`
+                   QT_LIBS_DIRECTFB=`directfb-config --libs 2>/dev/null`
+               fi
+           fi
+
+           # QMake variables set here override those in the mkspec. Therefore we only set the variables here if they are not zero.
+           if [ -n "$QT_CFLAGS_DIRECTFB" ] || [ -n "$QT_LIBS_DIRECTFB" ]; then
+               QMakeVar set QT_CFLAGS_DIRECTFB "$QT_CFLAGS_DIRECTFB"
+               QMakeVar set QT_LIBS_DIRECTFB "$QT_LIBS_DIRECTFB"
+           fi
+
+           if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/directfb "DirectFB" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_DIRECTFB $QT_LIBS_DIRECTFB; then
+               echo "The DirectFB screen driver functionality test failed!"
+               echo " You might need to modify the include and library search paths by editing"
+               echo " QT_CFLAGS_DIRECTFB and QT_LIBS_DIRECTFB in"
+               echo " ${XQMAKESPEC}."
+               exit 1
+           fi
+       fi
+
+    done
+
+    # mouse drivers
+    for mouse in ${CFG_MOUSE_ON} ${CFG_MOUSE_PLUGIN}; do
+	if [ "${mouse}" = "tslib" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; then
+	    if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tslib "tslib" $L_FLAGS $I_FLAGS $l_FLAGS; then
+               echo "The tslib functionality test failed!"
+               echo " You might need to modify the include and library search paths by editing"
+               echo " QMAKE_INCDIR and QMAKE_LIBDIR in"
+               echo " ${XQMAKESPEC}."
+		exit 1
+	    fi
+	fi
+    done
+
+    CFG_QGTKSTYLE=no
+
+    # sound
+    if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/sound "sound" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SOUND"
+    fi
+
+fi # QWS
+
+# freetype support
+[ "x$CFG_EMBEDDED" != "xno" ] && CFG_LIBFREETYPE="$CFG_QWS_FREETYPE"
+[ "x$PLATFORM_MAC" = "xyes" ] && CFG_LIBFREETYPE=no
+if [ "$CFG_LIBFREETYPE" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/freetype "FreeType" $L_FLAGS $I_FLAGS $l_FLAGS ; then
+        CFG_LIBFREETYPE=system
+    else
+        CFG_LIBFREETYPE=yes
+    fi
+fi
+
+if [ "$CFG_ENDIAN" = "auto" ]; then
+    if [ "$PLATFORM_MAC" = "yes" ]; then
+	true #leave as auto
+    else
+        "$unixtests/endian.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath"
+	F="$?"
+        if [ "$F" -eq 0 ]; then
+            CFG_ENDIAN="Q_LITTLE_ENDIAN"
+        elif [ "$F" -eq 1 ]; then
+            CFG_ENDIAN="Q_BIG_ENDIAN"
+        else
+            echo
+	    echo "The target system byte order could not be detected!"
+	    echo "Turn on verbose messaging (-v) to see the final report."
+	    echo "You can use the -little-endian or -big-endian switch to"
+	    echo "$0 to continue."
+            exit 101
+        fi
+    fi
+fi
+
+if [ "$CFG_HOST_ENDIAN" = "auto" ]; then
+    if [ "$PLATFORM_MAC" = "yes" ]; then
+	true #leave as auto
+    else
+        "$unixtests/endian.test" "$QMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath"
+	F="$?"
+        if [ "$F" -eq 0 ]; then
+            CFG_HOST_ENDIAN="Q_LITTLE_ENDIAN"
+        elif [ "$F" -eq 1 ]; then
+            CFG_HOST_ENDIAN="Q_BIG_ENDIAN"
+        else
+            echo
+	    echo "The host system byte order could not be detected!"
+	    echo "Turn on verbose messaging (-v) to see the final report."
+	    echo "You can use the -host-little-endian or -host-big-endian switch to"
+	    echo "$0 to continue."
+            exit 101
+        fi
+    fi
+fi
+
+if [ "$CFG_ARMFPA" != "auto" ]; then
+    if [ "$CFG_ARMFPA" = "yes" ]; then
+        if [ "$CFG_ENDIAN" = "Q_LITTLE_ENDIAN" ]; then
+            CFG_DOUBLEFORMAT="Q_DOUBLE_LITTLE_SWAPPED"
+        else
+            CFG_DOUBLEFORMAT="Q_DOUBLE_BIG_SWAPPED"
+        fi
+    else
+        CFG_DOUBLEFORMAT="normal"
+    fi
+fi
+
+
+if [ "$CFG_DOUBLEFORMAT" = "auto" ]; then
+    if [ "$PLATFORM_QWS" != "yes" ]; then
+        CFG_DOUBLEFORMAT=normal
+    else
+        "$unixtests/doubleformat.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath"
+	F="$?"
+        if [ "$F" -eq 10 ] && [ "$CFG_ENDIAN" = "Q_LITTLE_ENDIAN" ]; then
+            CFG_DOUBLEFORMAT=normal
+        elif [ "$F" -eq 11 ] && [ "$CFG_ENDIAN" = "Q_BIG_ENDIAN" ]; then
+            CFG_DOUBLEFORMAT=normal
+        elif [ "$F" -eq 10 ]; then
+            CFG_DOUBLEFORMAT="Q_DOUBLE_LITTLE"
+        elif [ "$F" -eq 11 ]; then
+            CFG_DOUBLEFORMAT="Q_DOUBLE_BIG"
+        elif [ "$F" -eq 12 ]; then
+            CFG_DOUBLEFORMAT="Q_DOUBLE_LITTLE_SWAPPED"
+            CFG_ARMFPA="yes"
+        elif [ "$F" -eq 13 ]; then
+            CFG_DOUBLEFORMAT="Q_DOUBLE_BIG_SWAPPED"
+            CFG_ARMFPA="yes"
+        else
+            echo
+	    echo "The system floating point format could not be detected."
+	    echo "This may cause data to be generated in a wrong format"
+	    echo "Turn on verbose messaging (-v) to see the final report."
+	    # we do not fail on this since this is a new test, and if it fails,
+	    # the old behavior should be correct in most cases
+            CFG_DOUBLEFORMAT=normal
+        fi
+    fi
+fi
+
+HAVE_STL=no
+if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then
+    HAVE_STL=yes
+fi
+
+if [ "$CFG_STL" != "no" ]; then
+    if [ "$HAVE_STL" = "yes" ]; then
+        CFG_STL=yes
+    else
+        if [ "$CFG_STL" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "STL support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+        else
+            CFG_STL=no
+        fi
+    fi
+fi
+
+# find if the platform supports IPv6
+if [ "$CFG_IPV6" != "no" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_IPV6=yes
+    else
+        if [ "$CFG_IPV6" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "IPv6 support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+        else
+            CFG_IPV6=no
+        fi
+    fi
+fi
+
+# detect POSIX clock_gettime()
+if [ "$CFG_CLOCK_GETTIME" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/clock-gettime "POSIX clock_gettime()" $L_FLAGS $I_FLAGS $l_FLAGS; then
+	CFG_CLOCK_GETTIME=yes
+    else
+	CFG_CLOCK_GETTIME=no
+    fi
+fi
+
+# detect POSIX monotonic clocks
+if [ "$CFG_CLOCK_GETTIME" = "yes" ] && [ "$CFG_CLOCK_MONOTONIC" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/clock-monotonic "POSIX Monotonic Clock" $L_FLAGS $I_FLAGS $l_FLAGS; then
+	CFG_CLOCK_MONOTONIC=yes
+    else
+	CFG_CLOCK_MONOTONIC=no
+    fi
+elif [ "$CFG_CLOCK_GETTIME" = "no" ]; then
+    CFG_CLOCK_MONOTONIC=no
+fi
+
+# detect mremap
+if [ "$CFG_MREMAP" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mremap "mremap" $L_FLAGS $I_FLAGS $l_FLAGS; then
+	CFG_MREMAP=yes
+    else
+	CFG_MREMAP=no
+    fi
+fi
+
+# find if the platform provides getaddrinfo (ipv6 dns lookups)
+if [ "$CFG_GETADDRINFO" != "no" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/getaddrinfo "getaddrinfo" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_GETADDRINFO=yes
+    else
+	if [ "$CFG_GETADDRINFO" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "getaddrinfo support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+	else
+	    CFG_GETADDRINFO=no
+	fi
+    fi
+fi
+
+# find if the platform provides inotify
+if [ "$CFG_INOTIFY" != "no" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/inotify "inotify" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_INOTIFY=yes
+    else
+	if [ "$CFG_INOTIFY" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "inotify support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+	else
+	    CFG_INOTIFY=no
+	fi
+    fi
+fi
+
+# find if the platform provides if_nametoindex (ipv6 interface name support)
+if [ "$CFG_IPV6IFNAME" != "no" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6ifname "IPv6 interface name" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_IPV6IFNAME=yes
+    else
+        if [ "$CFG_IPV6IFNAME" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "IPv6 interface name support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+        else
+	    CFG_IPV6IFNAME=no
+	fi
+    fi
+fi
+
+# find if the platform provides getifaddrs (network interface enumeration)
+if [ "$CFG_GETIFADDRS" != "no" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/getifaddrs "getifaddrs" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_GETIFADDRS=yes
+    else
+        if [ "$CFG_GETIFADDRS" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "getifaddrs support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+        else
+	    CFG_GETIFADDRS=no
+	fi
+    fi
+fi
+
+# find if the platform supports X/Open Large File compilation environment
+if [ "$CFG_LARGEFILE" != "no" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/largefile "X/Open Large File" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_LARGEFILE=yes
+    else
+        if [ "$CFG_LARGEFILE" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "X/Open Large File support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+        else
+            CFG_LARGEFILE=no
+        fi
+    fi
+fi
+
+# detect OpenSSL
+if [ "$CFG_OPENSSL" != "no" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        if [ "$CFG_OPENSSL" = "auto" ]; then
+            CFG_OPENSSL=yes
+        fi
+    else
+        if ( [ "$CFG_OPENSSL" = "yes" ] || [ "$CFG_OPENSSL" = "linked" ] ) && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+            echo "OpenSSL support cannot be enabled due to functionality tests!"
+            echo " Turn on verbose messaging (-v) to $0 to see the final report."
+            echo " If you believe this message is in error you may use the continue"
+            echo " switch (-continue) to $0 to continue."
+            exit 101
+        else
+            CFG_OPENSSL=no
+        fi
+    fi
+fi
+
+if [ "$CFG_PTMALLOC" != "no" ]; then
+    # build ptmalloc, copy .a file to lib/
+    echo "Building ptmalloc. Please wait..."
+    (cd "$relpath/src/3rdparty/ptmalloc/"; "$MAKE" "clean" ; "$MAKE" "posix"
+     mkdir "$outpath/lib/" ; cp "libptmalloc3.a" "$outpath/lib/")
+
+    QMakeVar add QMAKE_LFLAGS "$outpath/lib/libptmalloc3.a"
+fi
+
+#-------------------------------------------------------------------------------
+# ask for all that hasn't been auto-detected or specified in the arguments
+#-------------------------------------------------------------------------------
+
+### fix this: user input should be validated in a loop
+if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PLATFORM_QWS" = "yes" ]; then
+    echo
+    echo "Choose pixel-depths to support:"
+    echo
+    echo "   1. 1bpp, black/white"
+    echo "   4. 4bpp, grayscale"
+    echo "   8. 8bpp, paletted"
+    echo "  12. 12bpp, rgb 4-4-4"
+    echo "  15. 15bpp, rgb 5-5-5"
+    echo "  16. 16bpp, rgb 5-6-5"
+    echo "  18. 18bpp, rgb 6-6-6"
+    echo "  24. 24bpp, rgb 8-8-8"
+    echo "  32. 32bpp, argb 8-8-8-8 and rgb 8-8-8"
+    echo " all. All supported depths"
+    echo
+    echo "Your choices (default 8,16,32):"
+    read CFG_QWS_DEPTHS
+    if [ -z "$CFG_QWS_DEPTHS" ] || [ "$CFG_QWS_DEPTHS" = "yes" ]; then
+        CFG_QWS_DEPTHS=8,16,32
+    fi
+fi
+if [ -n "$CFG_QWS_DEPTHS" -a "$PLATFORM_QWS" = "yes" ]; then
+    if [ "$CFG_QWS_DEPTHS" = "all" ]; then
+        CFG_QWS_DEPTHS="1 4 8 12 15 16 18 24 32 generic"
+    fi
+    for D in `echo "$CFG_QWS_DEPTHS" | sed -e 's/,/ /g'`; do
+	case $D in
+	    1|4|8|12|15|16|18|24|32) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_$D";;
+	    generic) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_GENERIC";;
+	esac
+    done
+fi
+
+# enable dwarf2 support on Mac
+if [ "$CFG_MAC_DWARF2" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG dwarf2"
+fi
+
+# Set the default arch. Select 32-bit/carbon if nothing else has 
+# been specified on the configure line.
+if [ "$PLATFORM_MAC" = "yes" ]  && [ "$CFG_MAC_ARCHS" == "" ]; then
+    source "$mactests/defaultarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests"
+
+    if [ "$QT_MAC_DEFUALT_ARCH" == "x86_64" ]; then
+        CFG_MAC_ARCHS=" x86"
+    elif [ "$QT_MAC_DEFUALT_ARCH" == "ppc64" ]; then
+        CFG_MAC_ARCHS=" ppc"
+    else
+        CFG_MAC_ARCHS=" $QT_MAC_DEFUALT_ARCH"
+    fi
+
+    [ "$OPT_VERBOSE" == "yes" ] && echo "Setting Mac architechture to$CFG_MAC_ARCHS."
+fi
+
+# enable cocoa and/or carbon on Mac
+if [ "$CFG_MAC_COCOA" = "yes" ]; then
+#   -cocoa on the command line disables carbon completely (i.e. use cocoa for 32-bit as well)
+    CFG_MAC_CARBON="no"
+else
+#   check which archs are in use, enable cocoa if we find a 64-bit one
+    if echo "$CFG_MAC_ARCHS" | grep 64 > /dev/null 2>&1; then
+        CFG_MAC_COCOA="yes";
+        CFG_MAC_CARBON="no";
+        if echo "$CFG_MAC_ARCHS" | grep -w ppc > /dev/null 2>&1; then
+            CFG_MAC_CARBON="yes";
+        fi
+        if echo "$CFG_MAC_ARCHS" | grep -w x86 > /dev/null 2>&1; then
+            CFG_MAC_CARBON="yes";
+        fi
+    else
+#       no 64-bit archs found.
+        CFG_MAC_COCOA="no"
+    fi
+fi;
+
+# set the global Mac deployment target. This is overridden on an arch-by-arch basis 
+# in some cases, see code further down
+case "$PLATFORM,$CFG_MAC_COCOA" in
+    macx*,yes)
+	# Cocoa
+	QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.5
+	CFG_QT3SUPPORT="no"
+	;;
+    macx-icc,*)
+	# Intel CC, Carbon
+	QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.4
+	;;
+    macx*,no)
+	# gcc, Carbon
+	QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.3
+	;;
+esac
+
+# enable Qt 3 support functionality
+if [ "$CFG_QT3SUPPORT" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG qt3support"
+fi
+
+# enable Phonon
+if [ "$CFG_PHONON" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG phonon"
+    if [ "$CFG_PHONON_BACKEND" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG phonon-backend"
+    fi
+else
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_PHONON"
+fi
+
+# disable accessibility
+if [ "$CFG_ACCESSIBILITY" = "no" ]; then
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ACCESSIBILITY"
+else
+    QT_CONFIG="$QT_CONFIG accessibility"
+fi
+
+# enable opengl
+if [ "$CFG_OPENGL" = "no" ]; then
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENGL"
+else
+    QT_CONFIG="$QT_CONFIG opengl"
+fi
+
+if [ "$CFG_OPENGL" = "es1" ] || [ "$CFG_OPENGL" = "es1cl" ] || [ "$CFG_OPENGL" = "es2" ]; then
+    if [ "$PLATFORM_QWS" = "yes" ]; then
+	QCONFIG_FLAGS="$QCONFIG_FLAGS Q_BACKINGSTORE_SUBSURFACES"
+	QCONFIG_FLAGS="$QCONFIG_FLAGS Q_USE_EGLWINDOWSURFACE"
+    fi
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES"
+fi
+
+if [ "$CFG_OPENGL" = "es1" ]; then
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES_1"
+    QT_CONFIG="$QT_CONFIG opengles1"
+fi
+
+if [ "$CFG_OPENGL" = "es1cl" ]; then
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES_1_CL"
+    QT_CONFIG="$QT_CONFIG opengles1cl"
+fi
+
+if [ "$CFG_OPENGL" = "es2" ]; then
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES_2"
+    QT_CONFIG="$QT_CONFIG opengles2"
+fi
+
+# safe execution environment
+if [ "$CFG_SXE" != "no" ]; then
+    QT_CONFIG="$QT_CONFIG sxe"
+fi
+
+# build up the variables for output
+if [ "$CFG_DEBUG" = "yes" ]; then
+    QMAKE_OUTDIR="${QMAKE_OUTDIR}debug"
+    QMAKE_CONFIG="$QMAKE_CONFIG debug"
+elif [ "$CFG_DEBUG" = "no" ]; then
+    QMAKE_OUTDIR="${QMAKE_OUTDIR}release"
+    QMAKE_CONFIG="$QMAKE_CONFIG release"
+fi
+if [ "$CFG_SHARED" = "yes" ]; then
+    QMAKE_OUTDIR="${QMAKE_OUTDIR}-shared"
+    QMAKE_CONFIG="$QMAKE_CONFIG shared dll"
+elif [ "$CFG_SHARED" = "no" ]; then
+    QMAKE_OUTDIR="${QMAKE_OUTDIR}-static"
+    QMAKE_CONFIG="$QMAKE_CONFIG static"
+fi
+if [ "$PLATFORM_QWS" = "yes" ]; then
+    QMAKE_OUTDIR="${QMAKE_OUTDIR}-emb-$CFG_EMBEDDED"
+    QMAKE_CONFIG="$QMAKE_CONFIG embedded"
+    QT_CONFIG="$QT_CONFIG embedded"
+    rm -f "src/.moc/$QMAKE_OUTDIR/allmoc.cpp" # needs remaking if config changes
+fi
+QMakeVar set PRECOMPILED_DIR ".pch/$QMAKE_OUTDIR"
+QMakeVar set OBJECTS_DIR ".obj/$QMAKE_OUTDIR"
+QMakeVar set MOC_DIR ".moc/$QMAKE_OUTDIR"
+QMakeVar set RCC_DIR ".rcc/$QMAKE_OUTDIR"
+QMakeVar set UI_DIR ".uic/$QMAKE_OUTDIR"
+if [ "$CFG_LARGEFILE" = "yes" ]; then
+    QMAKE_CONFIG="$QMAKE_CONFIG largefile"
+fi
+if [ "$CFG_STL" = "no" ]; then
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STL"
+else
+    QMAKE_CONFIG="$QMAKE_CONFIG stl"
+fi
+if [ "$CFG_USE_GNUMAKE" = "yes" ]; then
+    QMAKE_CONFIG="$QMAKE_CONFIG GNUmake"
+fi
+[ "$CFG_REDUCE_EXPORTS" = "yes" ] && QT_CONFIG="$QT_CONFIG reduce_exports"
+[ "$CFG_REDUCE_RELOCATIONS" = "yes" ] && QT_CONFIG="$QT_CONFIG reduce_relocations"
+[ "$CFG_PRECOMPILE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG precompile_header"
+if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then
+    QMakeVar add QMAKE_CFLAGS -g
+    QMakeVar add QMAKE_CXXFLAGS -g
+    QMAKE_CONFIG="$QMAKE_CONFIG separate_debug_info"
+fi
+[ "$CFG_MMX" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG mmx"
+[ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow"
+[ "$CFG_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse"
+[ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2"
+[ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt"
+[ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS"
+if [ "$CFG_IPV6" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG ipv6"
+fi
+if [ "$CFG_CLOCK_GETTIME" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG clock-gettime"
+fi
+if [ "$CFG_CLOCK_MONOTONIC" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG clock-monotonic"
+fi
+if [ "$CFG_MREMAP" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG mremap"
+fi
+if [ "$CFG_GETADDRINFO" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG getaddrinfo"
+fi
+if [ "$CFG_IPV6IFNAME" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG ipv6ifname"
+fi
+if [ "$CFG_GETIFADDRS" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG getifaddrs"
+fi
+if [ "$CFG_INOTIFY" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG inotify"
+fi
+if [ "$CFG_LIBJPEG" = "system" ]; then
+    QT_CONFIG="$QT_CONFIG system-jpeg"
+fi
+if [ "$CFG_JPEG" = "no" ]; then
+    QT_CONFIG="$QT_CONFIG no-jpeg"
+elif [ "$CFG_JPEG" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG jpeg"
+fi
+if [ "$CFG_LIBMNG" = "system" ]; then
+    QT_CONFIG="$QT_CONFIG system-mng"
+fi
+if [ "$CFG_MNG" = "no" ]; then
+    QT_CONFIG="$QT_CONFIG no-mng"
+elif [ "$CFG_MNG" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG mng"
+fi
+if [ "$CFG_LIBPNG" = "no" ]; then
+    CFG_PNG="no"
+fi
+if [ "$CFG_LIBPNG" = "system" ]; then
+    QT_CONFIG="$QT_CONFIG system-png"
+fi
+if [ "$CFG_PNG" = "no" ]; then
+    QT_CONFIG="$QT_CONFIG no-png"
+elif [ "$CFG_PNG" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG png"
+fi
+if [ "$CFG_GIF" = "no" ]; then
+    QT_CONFIG="$QT_CONFIG no-gif"
+elif [ "$CFG_GIF" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG gif"
+fi
+if [ "$CFG_LIBTIFF" = "system" ]; then
+    QT_CONFIG="$QT_CONFIG system-tiff"
+fi
+if [ "$CFG_TIFF" = "no" ]; then
+    QT_CONFIG="$QT_CONFIG no-tiff"
+elif [ "$CFG_TIFF" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG tiff"
+fi
+if [ "$CFG_LIBFREETYPE" = "no" ]; then
+    QT_CONFIG="$QT_CONFIG no-freetype"
+elif [ "$CFG_LIBFREETYPE" = "system" ]; then
+    QT_CONFIG="$QT_CONFIG system-freetype"
+else
+    QT_CONFIG="$QT_CONFIG freetype"
+fi
+
+if [ "x$PLATFORM_MAC" = "xyes" ]; then
+    #On Mac we implicitly link against libz, so we
+    #never use the 3rdparty stuff.
+    [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
+fi
+if [ "$CFG_ZLIB" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG zlib"
+elif [ "$CFG_ZLIB" = "system" ]; then
+    QT_CONFIG="$QT_CONFIG system-zlib"
+fi
+
+[ "$CFG_NIS" = "yes" ] && QT_CONFIG="$QT_CONFIG nis"
+[ "$CFG_CUPS" = "yes" ] && QT_CONFIG="$QT_CONFIG cups"
+[ "$CFG_ICONV" = "yes" ] && QT_CONFIG="$QT_CONFIG iconv"
+[ "$CFG_ICONV" = "gnu" ] && QT_CONFIG="$QT_CONFIG gnu-libiconv"
+[ "$CFG_GLIB" = "yes" ] && QT_CONFIG="$QT_CONFIG glib"
+[ "$CFG_GSTREAMER" = "yes" ] && QT_CONFIG="$QT_CONFIG gstreamer"
+[ "$CFG_DBUS" = "yes" ] && QT_CONFIG="$QT_CONFIG dbus"
+[ "$CFG_DBUS" = "linked" ] && QT_CONFIG="$QT_CONFIG dbus dbus-linked"
+[ "$CFG_NAS" = "system" ] && QT_CONFIG="$QT_CONFIG nas"
+[ "$CFG_OPENSSL" = "yes" ] && QT_CONFIG="$QT_CONFIG openssl"
+[ "$CFG_OPENSSL" = "linked" ] && QT_CONFIG="$QT_CONFIG openssl-linked"
+
+if [ "$PLATFORM_X11" = "yes" ]; then
+    [ "$CFG_SM" = "yes" ] && QT_CONFIG="$QT_CONFIG x11sm"
+
+    # for some reason, the following libraries are not always built shared,
+    # so *every* program/lib (including Qt) has to link against them
+    if [ "$CFG_XSHAPE" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG xshape"
+    fi
+    if [ "$CFG_XINERAMA" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG xinerama"
+	QMakeVar set QMAKE_LIBS_X11 '-lXinerama $$QMAKE_LIBS_X11'
+    fi
+    if [ "$CFG_XCURSOR" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG xcursor"
+	QMakeVar set QMAKE_LIBS_X11 '-lXcursor $$QMAKE_LIBS_X11'
+    fi
+    if [ "$CFG_XFIXES" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG xfixes"
+	QMakeVar set QMAKE_LIBS_X11 '-lXfixes $$QMAKE_LIBS_X11'
+    fi
+    if [ "$CFG_XRANDR" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG xrandr"
+        if [ "$CFG_XRENDER" != "yes" ]; then
+            # libXrandr uses 1 function from libXrender, so we always have to have it :/
+	    QMakeVar set QMAKE_LIBS_X11 '-lXrandr -lXrender $$QMAKE_LIBS_X11'
+        else
+	    QMakeVar set QMAKE_LIBS_X11 '-lXrandr $$QMAKE_LIBS_X11'
+        fi
+    fi
+    if [ "$CFG_XRENDER" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG xrender"
+	QMakeVar set QMAKE_LIBS_X11 '-lXrender $$QMAKE_LIBS_X11'
+    fi
+    if [ "$CFG_MITSHM" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG mitshm"
+    fi
+    if [ "$CFG_FONTCONFIG" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG fontconfig"
+    fi
+    if [ "$CFG_XINPUT" = "yes" ]; then
+	QMakeVar set QMAKE_LIBS_X11 '-lXi $$QMAKE_LIBS_X11'
+    fi
+    if [ "$CFG_XINPUT" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG xinput tablet"
+    fi
+    if [ "$CFG_XKB" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG xkb"
+    fi
+fi
+
+[ '!' -z "$D_FLAGS" ] && QMakeVar add DEFINES "$D_FLAGS"
+[ '!' -z "$L_FLAGS" ] && QMakeVar add QMAKE_LIBDIR_FLAGS "$L_FLAGS"
+[ '!' -z "$l_FLAGS" ] && QMakeVar add LIBS "$l_FLAGS"
+
+if [ "$PLATFORM_MAC" = "yes" ]; then
+    if [ "$CFG_RPATH" = "yes" ]; then
+       QMAKE_CONFIG="$QMAKE_CONFIG absolute_library_soname"
+    fi
+elif [ -z "`getQMakeConf \"$XQMAKESPEC\" | grep QMAKE_RPATH | awk '{print $3;}'`" ]; then
+    if [ -n "$RPATH_FLAGS" ]; then
+        echo
+        echo "ERROR: -R cannot be used on this platform as \$QMAKE_RPATH is"
+        echo "       undefined."
+        echo
+        exit 1
+    elif [ "$CFG_RPATH" = "yes" ]; then
+        RPATH_MESSAGE="        NOTE: This platform does not support runtime library paths, using -no-rpath."
+        CFG_RPATH=no
+    fi
+else
+    if [ "$CFG_RPATH" = "yes" ]; then
+        # set the default rpath to the library installation directory
+        RPATH_FLAGS="\"$QT_INSTALL_LIBS\" $RPATH_FLAGS"
+    fi
+    if [ -n "$RPATH_FLAGS" ]; then
+        # add the user defined rpaths
+	QMakeVar add QMAKE_RPATHDIR "$RPATH_FLAGS"
+    fi
+fi
+
+if [ '!' -z "$I_FLAGS" ]; then
+    # add the user define include paths
+    QMakeVar add QMAKE_CFLAGS "$I_FLAGS"
+    QMakeVar add QMAKE_CXXFLAGS "$I_FLAGS"
+fi
+
+# turn off exceptions for the compilers that support it
+if [ "$PLATFORM_QWS" = "yes" ]; then
+    COMPILER=`echo $XPLATFORM | cut -f 3- -d-`
+else
+    COMPILER=`echo $PLATFORM | cut -f 2- -d-`
+fi
+if [ "$CFG_EXCEPTIONS" = "unspecified" -a "$PLATFORM_QWS" = "yes" ]; then
+    CFG_EXCEPTIONS=no
+fi
+
+if [ "$CFG_EXCEPTIONS" != "no" ]; then
+    QTCONFIG_CONFIG="$QTCONFIG_CONFIG exceptions"
+fi
+
+#
+# Some Qt modules are too advanced in C++ for some old compilers
+# Detect here the platforms where they are known to work.
+#
+# See Qt documentation for more information on which features are
+# supported and on which compilers.
+#
+canBuildQtXmlPatterns="yes"
+canBuildWebKit="$HAVE_STL"
+
+# WebKit requires stdint.h
+"$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stdint "Stdint" $L_FLAGS $I_FLAGS $l_FLAGS
+if [ $? != "0" ]; then
+    canBuildWebKit="no"
+fi
+
+case "$XPLATFORM" in
+    hpux-g++*)
+	# PA-RISC's assembly is too limited
+	# gcc 3.4 on that platform can't build QtXmlPatterns
+	# the assembly it generates cannot be compiled
+
+	# Check gcc's version
+	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
+	    4*)
+		;;
+	    3.4*)
+		canBuildQtXmlPatterns="no"
+		;;
+	    *)
+		canBuildWebKit="no"
+		canBuildQtXmlPatterns="no"
+		;;
+	esac
+	;;
+    *-g++*)
+	# Check gcc's version
+	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
+	    4*|3.4*)
+		;;
+	    3.3*)
+		canBuildWebKit="no"
+		;;
+	    *)
+		canBuildWebKit="no"
+		canBuildQtXmlPatterns="no"
+		;;
+	esac
+	;;
+    solaris-cc*)
+	# Check the compiler version
+	case `${QMAKE_CONF_COMPILER} -V 2>&1 | awk '{print $4}'` in
+	    *)
+		canBuildWebKit="no"
+		canBuildQtXmlPatterns="no"
+		;;
+	esac
+	;;
+    hpux-acc*)
+	canBuildWebKit="no"
+	canBuildQtXmlPatterns="no"
+	;;
+    hpuxi-acc*)
+	canBuildWebKit="no"
+	;;
+    aix-xlc*)
+	canBuildWebKit="no"
+	canBuildQtXmlPatterns="no"
+	;;
+    irix-cc*)
+        canBuildWebKit="no"
+	;;
+esac
+
+if [ "$CFG_XMLPATTERNS" = "yes" -a "$CFG_EXCEPTIONS" = "no" ]; then
+    echo "QtXmlPatterns was requested, but it can't be built due to exceptions being disabled."
+    exit 1
+fi
+if [ "$CFG_XMLPATTERNS" = "auto" -a "$CFG_EXCEPTIONS" != "no" ]; then
+    CFG_XMLPATTERNS="$canBuildQtXmlPatterns"
+elif [ "$CFG_EXCEPTIONS" = "no" ]; then
+    CFG_XMLPATTERNS="no"
+fi
+if [ "$CFG_XMLPATTERNS" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG xmlpatterns"
+else
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XMLPATTERNS"
+fi
+
+if [ "$CFG_SVG" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG svg"
+else
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SVG"
+fi
+
+if [ "$CFG_WEBKIT" = "auto" ]; then
+    CFG_WEBKIT="$canBuildWebKit"
+fi
+
+if [ "$CFG_WEBKIT" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG webkit"
+    # The reason we set CFG_WEBKIT, is such that the printed overview of what will be enabled, shows correctly.
+    CFG_WEBKIT="yes"
+else
+    CFG_WEBKIT="no"
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_WEBKIT"
+fi
+
+if [ "$CFG_SCRIPTTOOLS" = "auto" ]; then
+    CFG_SCRIPTTOOLS="yes"
+fi
+
+if [ "$CFG_SCRIPTTOOLS" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG scripttools"
+    CFG_SCRIPTTOOLS="yes"
+else
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPTTOOLS"
+fi
+
+if [ "$CFG_EXCEPTIONS" = "no" ]; then
+    case "$COMPILER" in
+    g++*)
+	QMakeVar add QMAKE_CFLAGS -fno-exceptions
+	QMakeVar add QMAKE_CXXFLAGS -fno-exceptions
+	QMakeVar add QMAKE_LFLAGS -fno-exceptions
+        ;;
+    cc*)
+        case "$PLATFORM" in
+        irix-cc*)
+	    QMakeVar add QMAKE_CFLAGS -LANG:exceptions=off
+	    QMakeVar add QMAKE_CXXFLAGS -LANG:exceptions=off
+	    QMakeVar add QMAKE_LFLAGS -LANG:exceptions=off
+            ;;
+        *) ;;
+        esac
+        ;;
+    *) ;;
+    esac
+    QMAKE_CONFIG="$QMAKE_CONFIG exceptions_off"
+fi
+
+# On Mac, set the minimum deployment target using Xarch when that is supported (10.5 and up).
+# On 10.4 the deployment version is set to 10.3 globally using the QMAKE_MACOSX_DEPLOYMENT_TARGET env. variable
+# "-cocoa" on the command line means Cocoa is used in 32-bit mode also, in this case fall back on 
+# QMAKE_MACOSX_DEPLOYMENT_TARGET which will be set to 10.5.
+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] && [ "$COMMANDLINE_MAC_COCOA" != "yes" ]; then
+    if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then
+        QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
+        QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
+        QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
+        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=10.4"
+    fi
+    if echo "$CFG_MAC_ARCHS" | grep '\<ppc\>' > /dev/null 2>&1; then
+        QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=10.3"
+        QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=10.3"
+        QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=10.3"
+        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=10.3"
+    fi
+    if echo "$CFG_MAC_ARCHS" | grep '\<x86_64\>' > /dev/null 2>&1; then
+        QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
+        QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
+        QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
+        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5"
+    fi
+    if echo "$CFG_MAC_ARCHS" | grep '\<ppc64\>' > /dev/null 2>&1; then
+        QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
+        QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
+        QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
+        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5"
+    fi
+fi
+
+#-------------------------------------------------------------------------------
+# generate QT_BUILD_KEY
+#-------------------------------------------------------------------------------
+
+# some compilers generate binary incompatible code between different versions,
+# so we need to generate a build key that is different between these compilers
+case "$COMPILER" in
+g++*)
+    # GNU C++
+    COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -dumpversion 2>/dev/null`
+
+    case "$COMPILER_VERSION" in
+    *.*.*)
+        QT_GCC_MAJOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\1,'`
+        QT_GCC_MINOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\2,'`
+        QT_GCC_PATCH_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\3,'`
+        ;;
+    *.*)
+        QT_GCC_MAJOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\).*,\1,'`
+        QT_GCC_MINOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\).*,\2,'`
+        QT_GCC_PATCH_VERSION=0
+        ;;
+    esac
+
+    case "$COMPILER_VERSION" in
+    2.95.*)
+        COMPILER_VERSION="2.95.*"
+        ;;
+    3.*)
+        COMPILER_VERSION="3.*"
+        ;;
+    4.*)
+        COMPILER_VERSION="4"
+        ;;
+    *)
+        ;;
+    esac
+    [ '!' -z "$COMPILER_VERSION" ] && COMPILER="g++-${COMPILER_VERSION}"
+    ;;
+*)
+    #
+    ;;
+esac
+
+# QT_CONFIG can contain the following:
+#
+# Things that affect the Qt API/ABI:
+#
+#   Options:
+#     minimal-config small-config medium-config large-config full-config
+#
+#   Different edition modules:
+#     network canvas table xml opengl sql
+#
+#   Options:
+#     stl
+#
+# Things that do not affect the Qt API/ABI:
+#     system-jpeg no-jpeg jpeg
+#     system-mng no-mng mng
+#     system-png no-png png
+#     system-zlib no-zlib zlib
+#     system-libtiff no-libtiff
+#     no-gif gif
+#     debug release
+#     dll staticlib
+#
+#     internal
+#     nocrosscompiler
+#     GNUmake
+#     largefile
+#     nis
+#     nas
+#     tablet
+#     ipv6
+#
+#     X11     : x11sm xinerama xcursor xfixes xrandr xrender mitshm fontconfig xkb
+#     Embedded: embedded freetype
+#
+ALL_OPTIONS="stl"
+BUILD_CONFIG=
+BUILD_OPTIONS=
+
+# determine the build options
+for config_option in $QMAKE_CONFIG $QT_CONFIG; do
+    SKIP="yes"
+    case "$config_option" in
+    *-config)
+        # take the last *-config setting.  this is the highest config being used,
+        # and is the one that we will use for tagging plugins
+        BUILD_CONFIG="$config_option"
+        ;;
+
+    stl)
+        # these config options affect the Qt API/ABI. they should influence
+        # the generation of the buildkey, so we don't skip them
+        SKIP="no"
+        ;;
+
+    *) # skip all other options since they don't affect the Qt API/ABI.
+        ;;
+    esac
+
+    if [ "$SKIP" = "no" ]; then
+        BUILD_OPTIONS="$BUILD_OPTIONS $config_option"
+    fi
+done
+
+# put the options that we are missing into .options
+rm -f .options
+for opt in `echo $ALL_OPTIONS`; do
+    SKIP="no"
+    if echo $BUILD_OPTIONS | grep $opt >/dev/null 2>&1; then
+        SKIP="yes"
+    fi
+    if [ "$SKIP" = "no" ]; then
+        echo "$opt" >> .options
+    fi
+done
+
+# reconstruct BUILD_OPTIONS with a sorted negative feature list
+# (ie. only things that are missing are will be put into the build key)
+BUILD_OPTIONS=
+if [ -f .options ]; then
+    for opt in `sort -f .options | uniq`; do
+        BUILD_OPTIONS="$BUILD_OPTIONS no-$opt"
+    done
+fi
+rm -f .options
+
+# QT_NO* defines affect the Qt API (and binary compatibility).  they need
+# to be included in the build key
+for build_option in $D_FLAGS; do
+    build_option=`echo $build_option | cut -d \" -f 2 -`
+    case "$build_option" in
+    QT_NO*)
+        echo "$build_option" >> .options
+        ;;
+    *)
+        # skip all other compiler defines
+        ;;
+    esac
+done
+
+# sort the compile time defines (helps ensure that changes in this configure
+# script don't affect the QT_BUILD_KEY generation)
+if [ -f .options ]; then
+    for opt in `sort -f .options | uniq`; do
+        BUILD_OPTIONS="$BUILD_OPTIONS $opt"
+    done
+fi
+rm -f .options
+
+BUILD_OPTIONS="$BUILD_CONFIG $BUILD_OPTIONS"
+# extract the operating system from the XPLATFORM
+TARGET_OPERATING_SYSTEM=`echo $XPLATFORM | cut -f 2- -d/ | cut -f -1 -d-`
+
+# when cross-compiling, don't include build-host information (build key is target specific)
+QT_BUILD_KEY="$CFG_USER_BUILD_KEY $CFG_ARCH $TARGET_OPERATING_SYSTEM $COMPILER $BUILD_OPTIONS"
+MAC_NEED_TWO_BUILD_KEYS="no"
+if [ "$PLATFORM_MAC" = "yes" -a "$CFG_MAC_COCOA" = "yes" ]; then
+    QT_BUILD_KEY_CARBON=$QT_BUILD_KEY
+    TARGET_OPERATING_SYSTEM="$TARGET_OPERATING_SYSTEM-cocoa"
+    QT_BUILD_KEY_COCOA="$CFG_USER_BUILD_KEY $CFG_ARCH $TARGET_OPERATING_SYSTEM $COMPILER $BUILD_OPTIONS"
+    if [ "$CFG_MAC_CARBON" = "no" ]; then
+        QT_BUILD_KEY=$QT_BUILD_KEY_COCOA
+    else
+        MAC_NEED_TWO_BUILD_KEYS="yes"
+    fi
+fi
+# don't break loading plugins build with an older version of Qt
+QT_BUILD_KEY_COMPAT=
+if [ "$QT_CROSS_COMPILE" = "no" ]; then
+    # previous versions of Qt used a build key built from the uname
+    QT_BUILD_KEY_COMPAT="$CFG_USER_BUILD_KEY $UNAME_MACHINE $UNAME_SYSTEM $COMPILER $BUILD_OPTIONS"
+fi
+# strip out leading/trailing/extra whitespace
+QT_BUILD_KEY=`echo $QT_BUILD_KEY | sed -e "s,  *, ,g" -e "s,^  *,," -e "s,  *$,,"`
+QT_BUILD_KEY_COMPAT=`echo $QT_BUILD_KEY_COMPAT | sed -e "s,  *, ,g" -e "s,^  *,," -e "s,  *$,,"`
+
+#-------------------------------------------------------------------------------
+# part of configuration information goes into qconfig.h
+#-------------------------------------------------------------------------------
+
+case "$CFG_QCONFIG" in
+full)
+    echo "/* Everything */" >"$outpath/src/corelib/global/qconfig.h.new"
+    ;;
+*)
+    tmpconfig="$outpath/src/corelib/global/qconfig.h.new"
+    echo "#ifndef QT_BOOTSTRAPPED" >"$tmpconfig"
+    cat "$relpath/src/corelib/global/qconfig-$CFG_QCONFIG.h" >>"$tmpconfig"
+    echo "#endif" >>"$tmpconfig"
+    ;;
+esac
+
+cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF
+
+/* Qt Edition */
+#ifndef QT_EDITION
+#  define QT_EDITION $QT_EDITION
+#endif
+
+/* Machine byte-order */
+#define Q_BIG_ENDIAN 4321
+#define Q_LITTLE_ENDIAN 1234
+EOF
+
+if [ "$MAC_NEED_TWO_BUILD_KEYS" = "no" ]; then
+    echo "#define QT_BUILD_KEY \"$QT_BUILD_KEY\"" \
+        >> "$outpath/src/corelib/global/qconfig.h.new"
+else
+    cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF
+
+#define QT_BUILD_KEY_CARBON "$QT_BUILD_KEY_CARBON"
+#define QT_BUILD_KEY_COCOA "$QT_BUILD_KEY_COCOA"
+EOF
+fi
+
+if [ -n "$QT_BUILD_KEY_COMPAT" ]; then
+    echo "#define QT_BUILD_KEY_COMPAT \"$QT_BUILD_KEY_COMPAT\"" \
+        >> "$outpath/src/corelib/global/qconfig.h.new"
+fi
+echo "" >>"$outpath/src/corelib/global/qconfig.h.new"
+
+echo "#ifdef QT_BOOTSTRAPPED" >>"$outpath/src/corelib/global/qconfig.h.new"
+if [ "$CFG_HOST_ENDIAN" = "auto" ]; then
+    cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF
+#if defined(__BIG_ENDIAN__)
+# define Q_BYTE_ORDER Q_BIG_ENDIAN
+#elif defined(__LITTLE_ENDIAN__)
+# define Q_BYTE_ORDER Q_LITTLE_ENDIAN
+#else
+# error "Unable to determine byte order!"
+#endif
+EOF
+else
+    echo "#define Q_BYTE_ORDER $CFG_HOST_ENDIAN" >>"$outpath/src/corelib/global/qconfig.h.new"
+fi
+echo "#else" >>"$outpath/src/corelib/global/qconfig.h.new"
+if [ "$CFG_ENDIAN" = "auto" ]; then
+    cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF
+#if defined(__BIG_ENDIAN__)
+# define Q_BYTE_ORDER Q_BIG_ENDIAN
+#elif defined(__LITTLE_ENDIAN__)
+# define Q_BYTE_ORDER Q_LITTLE_ENDIAN
+#else
+# error "Unable to determine byte order!"
+#endif
+EOF
+else
+    echo "#define Q_BYTE_ORDER $CFG_ENDIAN" >>"$outpath/src/corelib/global/qconfig.h.new"
+fi
+echo "#endif" >>"$outpath/src/corelib/global/qconfig.h.new"
+
+if [ "$CFG_DOUBLEFORMAT" != "normal" ]; then
+    cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF
+/* Non-IEEE double format */
+#define Q_DOUBLE_LITTLE "01234567"
+#define Q_DOUBLE_BIG "76543210"
+#define Q_DOUBLE_LITTLE_SWAPPED "45670123"
+#define Q_DOUBLE_BIG_SWAPPED "32107654"
+#define Q_DOUBLE_FORMAT $CFG_DOUBLEFORMAT
+EOF
+fi
+if [ "$CFG_ARMFPA" = "yes" ]; then
+    if [ "$CFG_ARCH" != "$CFG_HOST_ARCH" ]; then
+	cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF
+#ifndef QT_BOOTSTRAPPED
+# define QT_ARMFPA
+#endif
+EOF
+    else
+	echo "#define QT_ARMFPA" >>"$outpath/src/corelib/global/qconfig.h.new"
+    fi
+fi
+
+CFG_ARCH_STR=`echo $CFG_ARCH | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+CFG_HOST_ARCH_STR=`echo $CFG_HOST_ARCH | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF
+/* Machine Architecture */
+#ifndef QT_BOOTSTRAPPED
+# define QT_ARCH_${CFG_ARCH_STR}
+#else
+# define QT_ARCH_${CFG_HOST_ARCH_STR}
+#endif
+EOF
+
+echo '/* Compile time features */' >>"$outpath/src/corelib/global/qconfig.h.new"
+[ '!' -z "$LicenseKeyExt" ] && echo "#define QT_PRODUCT_LICENSEKEY \"$LicenseKeyExt\"" >>"$outpath/src/corelib/global/qconfig.h.new"
+
+if [ "$CFG_LARGEFILE" = "yes" ]; then
+    echo "#define QT_LARGEFILE_SUPPORT 64" >>"$outpath/src/corelib/global/qconfig.h.new"
+fi
+
+# if both carbon and cocoa are specified, enable the autodetection code.
+if [ "$CFG_MAC_COCOA" = "yes" -a "$CFG_MAC_CARBON" = "yes" ]; then
+    echo "#define AUTODETECT_COCOA 1" >>"$outpath/src/corelib/global/qconfig.h.new"
+elif [ "$CFG_MAC_COCOA" = "yes" ]; then
+    echo "#define QT_MAC_USE_COCOA 1" >>"$outpath/src/corelib/global/qconfig.h.new"
+fi
+
+if [ "$CFG_FRAMEWORK" = "yes" ]; then
+    echo "#define QT_MAC_FRAMEWORK_BUILD" >>"$outpath/src/corelib/global/qconfig.h.new"
+fi
+
+if [ "$PLATFORM_MAC" = "yes" ]; then
+    cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF
+#if defined(__LP64__)
+# define QT_POINTER_SIZE 8
+#else
+# define QT_POINTER_SIZE 4
+#endif
+EOF
+else
+    "$unixtests/ptrsize.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath"
+    echo "#define QT_POINTER_SIZE $?" >>"$outpath/src/corelib/global/qconfig.h.new"
+fi
+
+
+echo "" >>"$outpath/src/corelib/global/qconfig.h.new"
+
+if [ "$CFG_DEV" = "yes" ]; then
+    echo "#define QT_BUILD_INTERNAL" >>"$outpath/src/corelib/global/qconfig.h.new"
+fi
+
+# Embedded compile time options
+if [ "$PLATFORM_QWS" = "yes" ]; then
+    # Add QWS to config.h
+    QCONFIG_FLAGS="$QCONFIG_FLAGS Q_WS_QWS"
+
+    # Add excluded decorations to $QCONFIG_FLAGS
+    decors=`grep '^decorations -= ' "$QMAKE_VARS_FILE" | ${AWK} '{print $3}'`
+    for decor in $decors; do
+        NODECORATION=`echo $decor | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+        QCONFIG_FLAGS="${QCONFIG_FLAGS} QT_NO_QWS_DECORATION_${NODECORATION}"
+    done
+
+    # Figure which embedded drivers which are turned off
+    CFG_GFX_OFF="$CFG_GFX_AVAILABLE"
+    for ADRIVER in $CFG_GFX_ON; do
+        CFG_GFX_OFF=`echo "${CFG_GFX_OFF} " | sed "s,${ADRIVER} ,,g"`
+    done
+
+    CFG_KBD_OFF="$CFG_KBD_AVAILABLE"
+    # the um driver is currently not in the available list for external builds
+    if [ "$CFG_DEV" = "no" ]; then
+	CFG_KBD_OFF="$CFG_KBD_OFF um"
+    fi
+    for ADRIVER in $CFG_KBD_ON; do
+        CFG_KBD_OFF=`echo "${CFG_KBD_OFF} " | sed "s,${ADRIVER} ,,g"`
+    done
+
+    CFG_MOUSE_OFF="$CFG_MOUSE_AVAILABLE"
+    for ADRIVER in $CFG_MOUSE_ON; do
+        CFG_MOUSE_OFF=`echo "${CFG_MOUSE_OFF} " | sed "s,${ADRIVER} ,,g"`
+    done
+
+    for DRIVER in $CFG_GFX_OFF; do
+        NODRIVER=`echo $DRIVER | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+        QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_QWS_$NODRIVER"
+    done
+
+    for DRIVER in $CFG_KBD_OFF; do
+        NODRIVER=`echo $DRIVER | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+        QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_QWS_KBD_$NODRIVER"
+    done
+
+    for DRIVER in $CFG_MOUSE_OFF; do
+        NODRIVER=`echo $DRIVER | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+        QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_QWS_MOUSE_$NODRIVER"
+    done
+fi # QWS
+
+if [ "${CFG_USE_FLOATMATH}" = "yes" ]; then
+    QCONFIG_FLAGS="${QCONFIG_FLAGS} QT_USE_MATH_H_FLOATS"
+fi
+
+# Add turned on SQL drivers
+for DRIVER in $CFG_SQL_AVAILABLE; do
+    eval "VAL=\$CFG_SQL_$DRIVER"
+    case "$VAL" in
+    qt)
+        ONDRIVER=`echo $DRIVER | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+        QCONFIG_FLAGS="$QCONFIG_FLAGS QT_SQL_$ONDRIVER"
+        SQL_DRIVERS="$SQL_DRIVERS $DRIVER"
+    ;;
+    plugin)
+        SQL_PLUGINS="$SQL_PLUGINS $DRIVER"
+    ;;
+    esac
+done
+
+
+QMakeVar set sql-drivers "$SQL_DRIVERS"
+QMakeVar set sql-plugins "$SQL_PLUGINS"
+
+# Add other configuration options to the qconfig.h file
+[ "$CFG_GIF" = "yes" ]       && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_BUILTIN_GIF_READER=1"
+[ "$CFG_TIFF" != "yes" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_TIFF"
+[ "$CFG_PNG" != "yes" ]      && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_PNG"
+[ "$CFG_JPEG" != "yes" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_JPEG"
+[ "$CFG_MNG" != "yes" ]      && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_MNG"
+[ "$CFG_ZLIB" != "yes" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ZLIB"
+[ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS"
+[ "$CFG_IPV6" = "no" ]       && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6"
+[ "$CFG_SXE" = "no" ]        && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE"
+[ "$CFG_DBUS" = "no" ]      && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
+
+if [ "$PLATFORM_QWS" != "yes" ]; then
+    [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER"
+    [ "$CFG_GRAPHICS_SYSTEM" = "opengl" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_OPENGL"
+fi
+
+# X11/Unix/Mac only configs
+[ "$CFG_CUPS" = "no" ]       && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS"
+[ "$CFG_ICONV" = "no" ]      && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ICONV"
+[ "$CFG_GLIB" != "yes" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GLIB"
+[ "$CFG_GSTREAMER" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GSTREAMER"
+[ "$CFG_QGTKSTYLE" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_GTK"
+[ "$CFG_CLOCK_MONOTONIC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CLOCK_MONOTONIC"
+[ "$CFG_MREMAP" = "no" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MREMAP"
+[ "$CFG_GETADDRINFO" = "no" ]&& QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GETADDRINFO"
+[ "$CFG_IPV6IFNAME" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6IFNAME"
+[ "$CFG_GETIFADDRS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GETIFADDRS"
+[ "$CFG_INOTIFY" = "no" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_INOTIFY"
+[ "$CFG_NAS" = "no" ]        && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_NAS"
+[ "$CFG_NIS" = "no" ]        && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_NIS"
+[ "$CFG_OPENSSL" = "no" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENSSL"
+[ "$CFG_OPENSSL" = "linked" ]&& QCONFIG_FLAGS="$QCONFIG_FLAGS QT_LINKED_OPENSSL"
+
+[ "$CFG_SM" = "no" ]         && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SESSIONMANAGER"
+[ "$CFG_XCURSOR" = "no" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XCURSOR"
+[ "$CFG_XFIXES" = "no" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XFIXES"
+[ "$CFG_FONTCONFIG" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_FONTCONFIG"
+[ "$CFG_XINERAMA" = "no" ]   && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XINERAMA"
+[ "$CFG_XKB" = "no" ]        && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XKB"
+[ "$CFG_XRANDR" = "no" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XRANDR"
+[ "$CFG_XRENDER" = "no" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XRENDER"
+[ "$CFG_MITSHM" = "no" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MITSHM"
+[ "$CFG_XSHAPE" = "no" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SHAPE"
+[ "$CFG_XINPUT" = "no" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XINPUT QT_NO_TABLET"
+
+[ "$CFG_XCURSOR" = "runtime" ]   && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XCURSOR"
+[ "$CFG_XINERAMA" = "runtime" ]  && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XINERAMA"
+[ "$CFG_XFIXES" = "runtime" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XFIXES"
+[ "$CFG_XRANDR" = "runtime" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XRANDR"
+[ "$CFG_XINPUT" = "runtime" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XINPUT"
+
+# sort QCONFIG_FLAGS for neatness if we can
+[ '!' -z "$AWK" ] && QCONFIG_FLAGS=`echo $QCONFIG_FLAGS | $AWK '{ gsub(" ", "\n"); print }' | sort | uniq`
+QCONFIG_FLAGS=`echo $QCONFIG_FLAGS`
+
+if [ -n "$QCONFIG_FLAGS" ]; then
+    for cfg in $QCONFIG_FLAGS; do
+        cfgd=`echo $cfg | sed 's/=.*$//'` # trim pushed 'Foo=Bar' defines
+        cfg=`echo $cfg | sed 's/=/ /'`    # turn first '=' into a space
+        # figure out define logic, so we can output the correct
+        # ifdefs to override the global defines in a project
+        cfgdNeg=
+        if [ true ] && echo "$cfgd" | grep 'QT_NO_' >/dev/null 2>&1; then
+            # QT_NO_option can be forcefully turned on by QT_option
+            cfgdNeg=`echo $cfgd | sed "s,QT_NO_,QT_,"`
+        elif [ true ] && echo "$cfgd" | grep 'QT_' >/dev/null 2>&1; then
+            # QT_option can be forcefully turned off by QT_NO_option
+            cfgdNeg=`echo $cfgd | sed "s,QT_,QT_NO_,"`
+        fi
+
+        if [ -z $cfgdNeg ]; then
+cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF
+#ifndef $cfgd
+# define $cfg
+#endif
+
+EOF
+        else
+cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF
+#if defined($cfgd) && defined($cfgdNeg)
+# undef $cfgd
+#elif !defined($cfgd) && !defined($cfgdNeg)
+# define $cfg
+#endif
+
+EOF
+        fi
+    done
+fi
+
+if [ "$CFG_REDUCE_EXPORTS" = "yes" ]; then
+cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF
+#define QT_VISIBILITY_AVAILABLE
+
+EOF
+fi
+
+# avoid unecessary rebuilds by copying only if qconfig.h has changed
+if cmp -s "$outpath/src/corelib/global/qconfig.h" "$outpath/src/corelib/global/qconfig.h.new"; then
+    rm -f "$outpath/src/corelib/global/qconfig.h.new"
+else
+    [ -f "$outpath/src/corelib/global/qconfig.h" ] && chmod +w "$outpath/src/corelib/global/qconfig.h"
+    mv "$outpath/src/corelib/global/qconfig.h.new" "$outpath/src/corelib/global/qconfig.h"
+    chmod -w "$outpath/src/corelib/global/qconfig.h"
+    for conf in "$outpath/include/QtCore/qconfig.h" "$outpath/include/Qt/qconfig.h"; do
+        if [ '!' -f "$conf" ]; then
+            ln -s "$outpath/src/corelib/global/qconfig.h" "$conf"
+        fi
+    done
+fi
+
+#-------------------------------------------------------------------------------
+# save configuration into qconfig.pri
+#-------------------------------------------------------------------------------
+
+QTCONFIG="$outpath/mkspecs/qconfig.pri"
+QTCONFIG_CONFIG="$QTCONFIG_CONFIG no_mocdepend"
+[ -f "$QTCONFIG.tmp" ] && rm -f "$QTCONFIG.tmp"
+if [ "$CFG_DEBUG" = "yes" ]; then
+    QTCONFIG_CONFIG="$QTCONFIG_CONFIG debug"
+    if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG release"
+    fi
+    QT_CONFIG="$QT_CONFIG debug"
+elif [ "$CFG_DEBUG" = "no" ]; then
+    QTCONFIG_CONFIG="$QTCONFIG_CONFIG release"
+    if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG debug"
+    fi
+    QT_CONFIG="$QT_CONFIG release"
+fi
+if [ "$CFG_STL" = "yes" ]; then
+    QTCONFIG_CONFIG="$QTCONFIG_CONFIG stl"
+fi
+if [ "$CFG_FRAMEWORK" = "no" ]; then
+    QTCONFIG_CONFIG="$QTCONFIG_CONFIG qt_no_framework"
+else
+    QT_CONFIG="$QT_CONFIG qt_framework"
+    QTCONFIG_CONFIG="$QTCONFIG_CONFIG qt_framework"
+fi
+if [ "$PLATFORM_MAC" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG $CFG_MAC_ARCHS"
+fi
+
+# Make the application arch follow the Qt arch for single arch builds.
+# (for multiple-arch builds, set CONFIG manually in the application .pro file)
+if [ `echo "$CFG_MAC_ARCHS" | wc -w` -eq 1 ]; then
+    QTCONFIG_CONFIG="$QTCONFIG_CONFIG $CFG_MAC_ARCHS"
+fi
+
+cat >>"$QTCONFIG.tmp" <<EOF
+#configuration
+CONFIG += $QTCONFIG_CONFIG
+QT_ARCH = $CFG_ARCH
+QT_EDITION = $Edition
+QT_CONFIG += $QT_CONFIG
+
+#versioning
+QT_VERSION = $QT_VERSION
+QT_MAJOR_VERSION = $QT_MAJOR_VERSION
+QT_MINOR_VERSION = $QT_MINOR_VERSION
+QT_PATCH_VERSION = $QT_PATCH_VERSION
+
+#namespaces
+QT_LIBINFIX = $QT_LIBINFIX
+QT_NAMESPACE = $QT_NAMESPACE
+QT_NAMESPACE_MAC_CRC = $QT_NAMESPACE_MAC_CRC
+
+EOF
+if [ "$CFG_RPATH" = "yes" ]; then
+    echo "QMAKE_RPATHDIR += \"$QT_INSTALL_LIBS\"" >> "$QTCONFIG.tmp"
+fi
+if [ -n "$QT_GCC_MAJOR_VERSION" ]; then
+    echo "QT_GCC_MAJOR_VERSION = $QT_GCC_MAJOR_VERSION" >> "$QTCONFIG.tmp"
+    echo "QT_GCC_MINOR_VERSION = $QT_GCC_MINOR_VERSION" >> "$QTCONFIG.tmp"
+    echo "QT_GCC_PATCH_VERSION = $QT_GCC_PATCH_VERSION" >> "$QTCONFIG.tmp"
+fi
+# replace qconfig.pri if it differs from the newly created temp file
+if cmp -s "$QTCONFIG.tmp" "$QTCONFIG"; then
+    rm -f "$QTCONFIG.tmp"
+else
+    mv -f "$QTCONFIG.tmp" "$QTCONFIG"
+fi
+
+#-------------------------------------------------------------------------------
+# save configuration into .qmake.cache
+#-------------------------------------------------------------------------------
+
+CACHEFILE="$outpath/.qmake.cache"
+[ -f "$CACHEFILE.tmp" ] && rm -f "$CACHEFILE.tmp"
+cat >>"$CACHEFILE.tmp" <<EOF
+CONFIG += $QMAKE_CONFIG dylib create_prl link_prl depend_includepath fix_output_dirs QTDIR_build
+QT_SOURCE_TREE = \$\$quote($relpath)
+QT_BUILD_TREE = \$\$quote($outpath)
+QT_BUILD_PARTS = $CFG_BUILD_PARTS
+QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE
+QMAKE_MOC_SRC    = \$\$QT_BUILD_TREE/src/moc
+
+#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
+QMAKE_MOC        = \$\$QT_BUILD_TREE/bin/moc
+QMAKE_UIC        = \$\$QT_BUILD_TREE/bin/uic
+QMAKE_UIC3       = \$\$QT_BUILD_TREE/bin/uic3
+QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
+QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
+QMAKE_INCDIR_QT  = \$\$QT_BUILD_TREE/include
+QMAKE_LIBDIR_QT  = \$\$QT_BUILD_TREE/lib
+
+EOF
+
+if [ -n "$QT_CFLAGS_PSQL" ]; then
+    echo "QT_CFLAGS_PSQL   = $QT_CFLAGS_PSQL" >> "$CACHEFILE.tmp"
+fi
+if [ -n "$QT_LFLAGS_PSQL" ]; then
+    echo "QT_LFLAGS_PSQL   = $QT_LFLAGS_PSQL" >> "$CACHEFILE.tmp"
+fi
+if [ -n "$QT_CFLAGS_MYSQL" ]; then
+    echo "QT_CFLAGS_MYSQL   = $QT_CFLAGS_MYSQL" >> "$CACHEFILE.tmp"
+fi
+if [ -n "$QT_LFLAGS_MYSQL" ]; then
+    echo "QT_LFLAGS_MYSQL   = $QT_LFLAGS_MYSQL" >> "$CACHEFILE.tmp"
+fi
+if [ -n "$QT_CFLAGS_SQLITE" ]; then
+    echo "QT_CFLAGS_SQLITE   = $QT_CFLAGS_SQLITE" >> "$CACHEFILE.tmp"
+fi
+if [ -n "$QT_LFLAGS_SQLITE" ]; then
+    echo "QT_LFLAGS_SQLITE   = $QT_LFLAGS_SQLITE" >> "$CACHEFILE.tmp"
+fi
+
+if [ "$QT_EDITION" != "QT_EDITION_OPENSOURCE" ]; then
+    echo "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" >> "$CACHEFILE.tmp"
+fi
+
+#dump in the OPENSSL_LIBS info
+if [ '!' -z "$OPENSSL_LIBS" ]; then
+    echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$CACHEFILE.tmp"
+elif [ "$CFG_OPENSSL" = "linked" ]; then
+    echo "OPENSSL_LIBS = -lssl -lcrypto" >> "$CACHEFILE.tmp"
+fi
+
+#dump in the SDK info
+if [ '!' -z "$CFG_SDK" ]; then
+   echo "QMAKE_MAC_SDK = $CFG_SDK" >> "$CACHEFILE.tmp"
+fi
+
+# mac gcc -Xarch support
+if [ "$CFG_MAC_XARCH" = "no" ]; then
+   echo "QMAKE_MAC_XARCH = no" >> "$CACHEFILE.tmp"
+fi
+
+#dump the qmake spec
+if [ -d "$outpath/mkspecs/$XPLATFORM" ]; then
+   echo "QMAKESPEC = \$\$QT_BUILD_TREE/mkspecs/$XPLATFORM" >> "$CACHEFILE.tmp"
+else
+   echo "QMAKESPEC = $XPLATFORM" >> "$CACHEFILE.tmp"
+fi
+
+# cmdline args
+cat "$QMAKE_VARS_FILE" >> "$CACHEFILE.tmp"
+rm -f "$QMAKE_VARS_FILE" 2>/dev/null
+
+# incrementals
+INCREMENTAL=""
+[ "$CFG_INCREMENTAL" = "auto" ] && "$WHICH" p4 >/dev/null 2>&1 && [ "$CFG_DEV" = "yes" ] && CFG_INCREMENTAL="yes"
+if [ "$CFG_INCREMENTAL" = "yes" ]; then
+    find "$relpath" -perm u+w -mtime -3 | grep 'cpp$' | while read f; do
+        # don't need to worry about generated files
+        [ -r `echo $f | sed "s,cpp$,ui,"` ] && continue
+        basename "$f" | grep '^moc_' >/dev/null 2>&1 && continue
+        # done
+        INCREMENTAL="$INCREMENTAL `basename \"$f\" | sed 's,.cpp,.o,'`"
+    done
+    [ '!' -z "$INCREMENTAL" ] && echo "QMAKE_INCREMENTAL += $INCREMENTAL" >> "$CACHEFILE.tmp"
+    [ -r "$outpath/.qmake.incremental" ] && echo "include($outpath/.qmake.incremental)" >> "$CACHEFILE.tmp"
+fi
+
+# replace .qmake.cache if it differs from the newly created temp file
+if cmp -s "$CACHEFILE.tmp" "$CACHEFILE"; then
+    rm -f "$CACHEFILE.tmp"
+else
+    mv -f "$CACHEFILE.tmp" "$CACHEFILE"
+fi
+
+#-------------------------------------------------------------------------------
+# give feedback on configuration
+#-------------------------------------------------------------------------------
+
+case "$COMPILER" in
+g++*)
+    if [ "$CFG_EXCEPTIONS" != "no" ]; then
+        cat <<EOF
+
+        This target is using the GNU C++ compiler ($PLATFORM).
+
+        Recent versions of this compiler automatically include code for
+        exceptions, which increase both the size of the Qt libraries and
+        the amount of memory taken by your applications.
+
+        You may choose to re-run `basename $0` with the -no-exceptions
+        option to compile Qt without exceptions. This is completely binary
+        compatible, and existing applications will continue to work.
+
+EOF
+    fi
+    ;;
+cc*)
+    case "$PLATFORM" in
+    irix-cc*)
+        if [ "$CFG_EXCEPTIONS" != "no" ]; then
+            cat <<EOF
+
+        This target is using the MIPSpro C++ compiler ($PLATFORM).
+
+        You may choose to re-run `basename $0` with the -no-exceptions
+        option to compile Qt without exceptions. This will make the
+        size of the Qt library smaller and reduce the amount of memory
+        taken by your applications.
+
+EOF
+        fi
+        ;;
+    *) ;;
+    esac
+    ;;
+*) ;;
+esac
+
+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" == "no" ]  && [ "$CFG_WEBKIT" = "yes" ] && [ "$CFG_DEBUG_RELEASE" == "yes" ]; then
+    cat <<EOF
+        WARNING: DWARF2 debug symbols are not enabled. Linking webkit
+        in debug mode will run out of memory on systems with 2GB or less.
+        Install Xcode 2.4.1 or higher to enable DWARF2, or configure with
+         -no-webkit or -release to skip webkit debug.
+EOF
+fi
+
+echo
+if [ "$XPLATFORM" = "$PLATFORM" ]; then
+    echo "Build type:    $PLATFORM"
+else
+    echo "Building on:   $PLATFORM"
+    echo "Building for:  $XPLATFORM"
+fi
+
+if [ "$PLATFORM_MAC" = "yes" ]; then
+    echo "Architecture:  $CFG_ARCH ($CFG_MAC_ARCHS )"
+else
+    echo "Architecture:  $CFG_ARCH"
+fi
+
+if [ "$PLATFORM_QWS" = "yes" ]; then
+    echo "Host architecture: $CFG_HOST_ARCH"
+fi
+
+if [ "$PLATFORM_MAC" = "yes" ]; then
+    if [ "$CFG_MAC_COCOA" = "yes" ]; then
+        if [ "$CFG_MAC_CARBON" = "yes" ]; then
+            echo "Using framework: Carbon for 32-bit, Cocoa for 64-bit"
+        else
+            echo "Using framework: Cocoa"
+        fi
+    else
+        echo "Using framework: Carbon"
+    fi
+fi
+
+if [ -n "$PLATFORM_NOTES" ]; then
+    echo "Platform notes:"
+    echo "$PLATFORM_NOTES"
+else
+    echo
+fi
+
+if [ "$OPT_VERBOSE" = "yes" ]; then
+    if echo '\c' | grep '\c' >/dev/null; then
+        echo -n "qmake vars .......... "
+    else
+        echo "qmake vars .......... \c"
+    fi
+    cat "$QMAKE_VARS_FILE" | tr '\n' ' '
+    echo "qmake switches ...... $QMAKE_SWITCHES"
+fi
+
+[ "$CFG_INCREMENTAL" = "yes" ] && [ '!' -z "$INCREMENTAL" ] && echo "Incremental ......... $INCREMENTAL"
+echo "Build ............... $CFG_BUILD_PARTS"
+echo "Configuration ....... $QMAKE_CONFIG $QT_CONFIG"
+if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
+   echo "Debug ............... yes (combined)"
+   if [ "$CFG_DEBUG" = "yes" ]; then
+       echo "Default Link ........ debug"
+   else
+       echo "Default Link ........ release"
+   fi
+else
+   echo "Debug ............... $CFG_DEBUG"
+fi
+echo "Qt 3 compatibility .. $CFG_QT3SUPPORT"
+[ "$CFG_DBUS" = "no" ]     && echo "QtDBus module ....... no"
+[ "$CFG_DBUS" = "yes" ]    && echo "QtDBus module ....... yes (run-time)"
+[ "$CFG_DBUS" = "linked" ] && echo "QtDBus module ....... yes (linked)"
+echo "QtScriptTools module  $CFG_SCRIPTTOOLS"
+echo "QtXmlPatterns module  $CFG_XMLPATTERNS"
+echo "Phonon module ....... $CFG_PHONON"
+echo "SVG module .......... $CFG_SVG"
+echo "WebKit module ....... $CFG_WEBKIT"
+echo "STL support ......... $CFG_STL"
+echo "PCH support ......... $CFG_PRECOMPILE"
+echo "MMX/3DNOW/SSE/SSE2..  ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}"
+if [ "${CFG_ARCH}" = "arm" ]; then
+    echo "iWMMXt support ...... ${CFG_IWMMXT}"
+fi
+[ "${PLATFORM_QWS}" != "yes" ] && echo "Graphics System ..... $CFG_GRAPHICS_SYSTEM"
+echo "IPv6 support ........ $CFG_IPV6"
+echo "IPv6 ifname support . $CFG_IPV6IFNAME"
+echo "getaddrinfo support . $CFG_GETADDRINFO"
+echo "getifaddrs support .. $CFG_GETIFADDRS"
+echo "Accessibility ....... $CFG_ACCESSIBILITY"
+echo "NIS support ......... $CFG_NIS"
+echo "CUPS support ........ $CFG_CUPS"
+echo "Iconv support ....... $CFG_ICONV"
+echo "Glib support ........ $CFG_GLIB"
+echo "GStreamer support ... $CFG_GSTREAMER"
+echo "Large File support .. $CFG_LARGEFILE"
+echo "GIF support ......... $CFG_GIF"
+if [ "$CFG_TIFF" = "no" ]; then
+    echo "TIFF support ........ $CFG_TIFF"
+else
+    echo "TIFF support ........ $CFG_TIFF ($CFG_LIBTIFF)"
+fi
+if [ "$CFG_JPEG" = "no" ]; then
+    echo "JPEG support ........ $CFG_JPEG"
+else
+    echo "JPEG support ........ $CFG_JPEG ($CFG_LIBJPEG)"
+fi
+if [ "$CFG_PNG" = "no" ]; then
+    echo "PNG support ......... $CFG_PNG"
+else
+    echo "PNG support ......... $CFG_PNG ($CFG_LIBPNG)"
+fi
+if [ "$CFG_MNG" = "no" ]; then
+    echo "MNG support ......... $CFG_MNG"
+else
+    echo "MNG support ......... $CFG_MNG ($CFG_LIBMNG)"
+fi
+echo "zlib support ........ $CFG_ZLIB"
+echo "Session management .. $CFG_SM"
+if [ "$PLATFORM_QWS" = "yes" ]; then
+    echo "Embedded support .... $CFG_EMBEDDED"
+    if [ "$CFG_QWS_FREETYPE" = "auto" ]; then
+	echo "Freetype2 support ... $CFG_QWS_FREETYPE ($CFG_LIBFREETYPE)"
+    else
+	echo "Freetype2 support ... $CFG_QWS_FREETYPE"
+    fi
+    # Normalize the decoration output first
+    CFG_GFX_ON=`echo ${CFG_GFX_ON}`
+    CFG_GFX_PLUGIN=`echo ${CFG_GFX_PLUGIN}`
+    echo "Graphics (qt) ....... ${CFG_GFX_ON}"
+    echo "Graphics (plugin) ... ${CFG_GFX_PLUGIN}"
+    CFG_DECORATION_ON=`echo ${CFG_DECORATION_ON}`
+    CFG_DECORATION_PLUGIN=`echo ${CFG_DECORATION_PLUGIN}`
+    echo "Decorations (qt) .... $CFG_DECORATION_ON"
+    echo "Decorations (plugin)  $CFG_DECORATION_PLUGIN"
+    CFG_KBD_ON=`echo ${CFG_KBD_ON}`
+    CFG_KBD_PLUGIN=`echo ${CFG_KBD_PLUGIN}`
+    echo "Keyboard driver (qt). ${CFG_KBD_ON}"
+    echo "Keyboard driver (plugin) ${CFG_KBD_PLUGIN}"
+    CFG_MOUSE_ON=`echo ${CFG_MOUSE_ON}`
+    CFG_MOUSE_PLUGIN=`echo ${CFG_MOUSE_PLUGIN}`
+    echo "Mouse driver (qt) ... $CFG_MOUSE_ON"
+    echo "Mouse driver (plugin) $CFG_MOUSE_PLUGIN"
+fi
+if [ "$CFG_OPENGL" = "desktop" ]; then
+    echo "OpenGL support ...... yes (Desktop OpenGL)"
+elif [ "$CFG_OPENGL" = "es1" ]; then
+    echo "OpenGL support ...... yes (OpenGL ES 1.x Common profile)"
+elif [ "$CFG_OPENGL" = "es1cl" ]; then
+    echo "OpenGL support ...... yes (OpenGL ES 1.x Common Lite profile)"
+elif [ "$CFG_OPENGL" = "es2" ]; then
+    echo "OpenGL support ...... yes (OpenGL ES 2.x)"
+else
+    echo "OpenGL support ...... no"
+fi
+if [ "$PLATFORM_X11" = "yes" ]; then
+    echo "NAS sound support ... $CFG_NAS"
+    echo "XShape support ...... $CFG_XSHAPE"
+    echo "Xinerama support .... $CFG_XINERAMA"
+    echo "Xcursor support ..... $CFG_XCURSOR"
+    echo "Xfixes support ...... $CFG_XFIXES"
+    echo "Xrandr support ...... $CFG_XRANDR"
+    echo "Xrender support ..... $CFG_XRENDER"
+    echo "Xi support .......... $CFG_XINPUT"
+    echo "MIT-SHM support ..... $CFG_MITSHM"
+    echo "FontConfig support .. $CFG_FONTCONFIG"
+    echo "XKB Support ......... $CFG_XKB"
+    echo "immodule support .... $CFG_IM"
+    echo "GTK theme support ... $CFG_QGTKSTYLE"
+fi
+[ "$CFG_SQL_mysql" != "no" ] && echo "MySQL support ....... $CFG_SQL_mysql"
+[ "$CFG_SQL_psql" != "no" ] && echo "PostgreSQL support .. $CFG_SQL_psql"
+[ "$CFG_SQL_odbc" != "no" ] && echo "ODBC support ........ $CFG_SQL_odbc"
+[ "$CFG_SQL_oci" != "no" ] && echo "OCI support ......... $CFG_SQL_oci"
+[ "$CFG_SQL_tds" != "no" ] && echo "TDS support ......... $CFG_SQL_tds"
+[ "$CFG_SQL_db2" != "no" ] && echo "DB2 support ......... $CFG_SQL_db2"
+[ "$CFG_SQL_ibase" != "no" ] && echo "InterBase support ... $CFG_SQL_ibase"
+[ "$CFG_SQL_sqlite2" != "no" ] && echo "SQLite 2 support .... $CFG_SQL_sqlite2"
+[ "$CFG_SQL_sqlite" != "no" ] && echo "SQLite support ...... $CFG_SQL_sqlite ($CFG_SQLITE)"
+
+OPENSSL_LINKAGE=""
+if [ "$CFG_OPENSSL" = "yes" ]; then
+    OPENSSL_LINKAGE="(run-time)"
+elif [ "$CFG_OPENSSL" = "linked" ]; then
+    OPENSSL_LINKAGE="(linked)"
+fi
+echo "OpenSSL support ..... $CFG_OPENSSL $OPENSSL_LINKAGE"
+
+[ "$CFG_PTMALLOC" != "no" ] && echo "Use ptmalloc ........ $CFG_PTMALLOC"
+
+# complain about not being able to use dynamic plugins if we are using a static build
+if [ "$CFG_SHARED" = "no" ]; then
+    echo
+    echo "WARNING: Using static linking will disable the use of dynamically"
+    echo "loaded plugins. Make sure to import all needed static plugins,"
+    echo "or compile needed modules into the library."
+    echo
+fi
+if [ "$CFG_OPENSSL" = "linked" ] && [ "$OPENSSL_LIBS" = "" ]; then
+    echo
+    echo "NOTE: When linking against OpenSSL, you can override the default"
+    echo "library names through OPENSSL_LIBS."
+    echo "For example:"
+    echo "    ./configure -openssl-linked OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto'"
+    echo
+fi
+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_DEBUG" = "yes" ] && [ "$CFG_DEBUG_RELEASE" = "no" ]; then
+    echo
+    echo "NOTE: Mac OS X frameworks implicitly build debug and release Qt libraries."
+    echo
+fi
+echo
+
+sepath=`echo "$relpath" | sed -e 's/\\./\\\\./g'`
+PROCS=1
+EXEC=""
+
+
+#-------------------------------------------------------------------------------
+# build makefiles based on the configuration
+#-------------------------------------------------------------------------------
+
+echo "Finding project files. Please wait..."
+"$outpath/bin/qmake" -prl -r "${relpath}/projects.pro"
+if [ -f "${relpath}/projects.pro" ]; then
+    mkfile="${outpath}/Makefile"
+    [ -f "$mkfile" ] && chmod +w "$mkfile"
+    QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile"
+fi
+
+# .projects      -> projects to process
+# .projects.1    -> qt and moc
+# .projects.2    -> subdirs and libs
+# .projects.3    -> the rest
+rm -f .projects .projects.1 .projects.2 .projects.3
+
+QMAKE_PROJECTS=`find "$relpath/." -name '*.pro' -print | sed 's-/\./-/-'`
+if [ -z "$AWK" ]; then
+    for p in `echo $QMAKE_PROJECTS`; do
+        echo "$p" >> .projects
+    done
+else
+    cat >projects.awk <<EOF
+BEGIN {
+    files = 0
+    target_file = ""
+    input_file = ""
+
+    first = "./.projects.1.tmp"
+    second = "./.projects.2.tmp"
+    third = "./.projects.3.tmp"
+}
+
+FNR == 1 {
+    if ( input_file ) {
+  if ( ! target_file )
+      target_file = third
+  print input_file >target_file
+    }
+
+    matched_target = 0
+    template_lib = 0
+    input_file = FILENAME
+    target_file = ""
+}
+
+/^(TARGET.*=)/ {
+    if ( \$3 == "moc" || \$3 ~ /^Qt/ ) {
+  target_file = first
+        matched_target = 1
+    }
+}
+
+matched_target == 0 && /^(TEMPLATE.*=)/ {
+    if ( \$3 == "subdirs" )
+  target_file = second
+    else if ( \$3 == "lib" )
+  template_lib = 1
+    else
+  target_file = third
+}
+
+matched_target == 0 && template_lib == 1 && /^(CONFIG.*=)/ {
+    if ( \$0 ~ /plugin/ )
+        target_file = third
+    else
+  target_file = second
+}
+
+END {
+    if ( input_file ) {
+  if ( ! target_file )
+      target_file = third
+  print input_file >>target_file
+    }
+}
+
+EOF
+
+    rm -f .projects.all
+    for p in `echo $QMAKE_PROJECTS`; do
+       echo "$p" >> .projects.all
+    done
+
+    # if you get errors about the length of the command line to awk, change the -l arg
+    # to split below
+    split -l 100 .projects.all .projects.all.
+    for p in .projects.all.*; do
+       "$AWK" -f projects.awk `cat $p`
+       [ -f .projects.1.tmp ] && cat .projects.1.tmp >> .projects.1
+       [ -f .projects.2.tmp ] && cat .projects.2.tmp >> .projects.2
+       [ -f .projects.3.tmp ] && cat .projects.3.tmp >> .projects.3
+       rm -f .projects.1.tmp .projects.2.tmp .projects.3.tmp $p
+    done
+    rm -f .projects.all* projects.awk
+
+    [ -f .projects.1 ] && cat .projects.1 >>.projects
+    [ -f .projects.2 ] && cat .projects.2 >>.projects
+    rm -f .projects.1 .projects.2
+    if [ -f .projects.3 ] && [ "$OPT_FAST" = "no" ]; then
+       cat .projects.3 >>.projects
+       rm -f .projects.3
+    fi
+fi
+# don't sort Qt and MOC in with the other project files
+# also work around a segfaulting uniq(1)
+if [ -f .sorted.projects.2 ]; then
+    sort .sorted.projects.2 > .sorted.projects.2.new
+    mv -f .sorted.projects.2.new .sorted.projects.2
+    cat .sorted.projects.2 >> .sorted.projects.1
+fi
+[ -f .sorted.projects.1 ] && sort .sorted.projects.1 >> .sorted.projects
+rm -f .sorted.projects.2 .sorted.projects.1
+
+NORM_PROJECTS=0
+FAST_PROJECTS=0
+if [ -f .projects ]; then
+   uniq .projects >.tmp
+   mv -f .tmp .projects
+   NORM_PROJECTS=`cat .projects | wc -l | sed -e "s, ,,g"`
+fi
+if [ -f .projects.3 ]; then
+   uniq .projects.3 >.tmp
+   mv -f .tmp .projects.3
+   FAST_PROJECTS=`cat .projects.3 | wc -l | sed -e "s, ,,g"`
+fi
+echo "  `expr $NORM_PROJECTS + $FAST_PROJECTS` projects found."
+echo
+
+PART_ROOTS=
+for part in $CFG_BUILD_PARTS; do
+    case "$part" in
+    tools) PART_ROOTS="$PART_ROOTS tools" ;;
+    libs) PART_ROOTS="$PART_ROOTS src" ;;
+    examples) PART_ROOTS="$PART_ROOTS examples demos" ;;
+    *) ;;
+    esac
+done
+
+if [ "$CFG_DEV" = "yes" ]; then
+    PART_ROOTS="$PART_ROOTS tests"
+fi
+
+echo "Creating makefiles. Please wait..."
+for file in .projects .projects.3; do
+    [ '!' -f "$file" ] && continue
+    for a in `cat $file`; do
+        IN_ROOT=no
+	for r in $PART_ROOTS; do
+	    if echo "$a" | grep "^$r" >/dev/null 2>&1 || echo "$a" | grep "^$relpath/$r" >/dev/null 2>&1; then
+		IN_ROOT=yes
+		break
+            fi
+	done
+        [ "$IN_ROOT" = "no" ] && continue
+
+        case $a in
+        *winmain/winmain.pro) continue ;;
+        */qmake/qmake.pro) continue ;;
+        *tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*) SPEC=$QMAKESPEC ;;
+        *) SPEC=$XQMAKESPEC ;;
+        esac
+        dir=`dirname $a | sed -e "s;$sepath;.;g"`
+        test -d "$dir" || mkdir -p "$dir"
+        OUTDIR="$outpath/$dir"
+        if [ -f "${OUTDIR}/Makefile" ] && [ "$OPT_FAST" = "yes" ]; then
+            # fast configure - the makefile exists, skip it
+            # since the makefile exists, it was generated by qmake, which means we
+            # can skip it, since qmake has a rule to regenerate the makefile if the .pro
+            # file changes...
+            [ "$OPT_VERBOSE" = "yes" ] && echo "  skipping $a"
+            continue;
+        fi
+        QMAKE_SPEC_ARGS="-spec $SPEC"
+        if echo '\c' | grep '\c' >/dev/null; then
+            echo -n "  for $a"
+        else
+            echo "  for $a\c"
+        fi
+
+        QMAKE="$outpath/bin/qmake"
+	QMAKE_ARGS="$QMAKE_SWITCHES $QMAKE_SPEC_ARGS"
+        if [ "$file" = ".projects.3" ]; then
+            if echo '\c' | grep '\c' >/dev/null; then
+                echo -n " (fast)"
+            else
+                echo " (fast)\c"
+            fi
+            echo
+
+            cat >"${OUTDIR}/Makefile" <<EOF
+# ${OUTDIR}/Makefile: generated by configure
+#
+# WARNING: This makefile will be replaced with a real makefile.
+# All changes made to this file will be lost.
+EOF
+            [ "$CFG_DEBUG_RELEASE" = "no" ] && echo "first_target: first" >>${OUTDIR}/Makefile
+
+            cat >>"${OUTDIR}/Makefile" <<EOF
+QMAKE = "$QMAKE"
+all clean install qmake first Makefile: FORCE
+	\$(QMAKE) $QMAKE_ARGS -o "$OUTDIR" "$a"
+	cd "$OUTDIR"
+	\$(MAKE) \$@
+
+FORCE:
+
+EOF
+        else
+            if [ "$OPT_VERBOSE" = "yes" ]; then
+                echo " (`basename $SPEC`)"
+                echo "$QMAKE" $QMAKE_ARGS -o "$OUTDIR" "$a"
+	    else
+		echo
+            fi
+
+            [ -f "${OUTDIR}/Makefile" ] && chmod +w "${OUTDIR}/Makefile"
+            QTDIR="$outpath" "$QMAKE" $QMAKE_ARGS -o "$OUTDIR" "$a"
+       fi
+    done
+done
+rm -f .projects .projects.3
+
+#-------------------------------------------------------------------------------
+# XShape is important, DnD in the Designer doens't work without it
+#-------------------------------------------------------------------------------
+if [ "$PLATFORM_X11" = "yes" ] && [ "$CFG_XSHAPE" = "no" ]; then
+    cat <<EOF
+
+	NOTICE: Qt will not be built with XShape support.
+
+	As a result, drag-and-drop in the Qt Designer will NOT
+	work. We recommend that you enable XShape support by passing
+	the -xshape switch to $0.
+EOF
+fi
+
+#-------------------------------------------------------------------------------
+# check for platforms that we don't yet know about
+#-------------------------------------------------------------------------------
+if [ "$CFG_ARCH" = "generic" ]; then
+cat <<EOF
+
+        NOTICE: Atomic operations are not yet supported for this
+        architecture.
+
+        Qt will use the 'generic' architecture instead, which uses a
+        single pthread_mutex_t to protect all atomic operations. This
+        implementation is the slow (but safe) fallback implementation
+        for architectures Qt does not yet support.
+EOF
+fi
+
+#-------------------------------------------------------------------------------
+# check if the user passed the -no-zlib option, which is no longer supported
+#-------------------------------------------------------------------------------
+if [ -n "$ZLIB_FORCED" ]; then
+    which_zlib="supplied"
+    if [ "$CFG_ZLIB" = "system" ]; then
+	which_zlib="system"
+    fi
+
+cat <<EOF
+
+        NOTICE: The -no-zlib option was supplied but is no longer
+        supported.
+
+        Qt now requires zlib support in all builds, so the -no-zlib
+        option was ignored. Qt will be built using the $which_zlib
+        zlib.
+EOF
+fi
+
+#-------------------------------------------------------------------------------
+# finally save the executed command to another script
+#-------------------------------------------------------------------------------
+if [ `basename $0` != "config.status" ]; then
+    CONFIG_STATUS="$relpath/$relconf $OPT_CMDLINE"
+
+    # add the system variables
+    for varname in $SYSTEM_VARIABLES; do
+        cmd=`echo \
+'if [ -n "\$'${varname}'" ]; then
+    CONFIG_STATUS="'${varname}'='"'\\\$${varname}'"' \$CONFIG_STATUS"
+fi'`
+	eval "$cmd"
+    done
+
+    echo "$CONFIG_STATUS" | grep '\-confirm\-license' >/dev/null 2>&1 || CONFIG_STATUS="$CONFIG_STATUS -confirm-license"
+
+    [ -f "$outpath/config.status" ] && rm -f "$outpath/config.status"
+    echo "#!/bin/sh" > "$outpath/config.status"
+    echo "if [ \"\$#\" -gt 0 ]; then" >> "$outpath/config.status"
+    echo "  $CONFIG_STATUS \"\$@\"" >> "$outpath/config.status"
+    echo "else" >> "$outpath/config.status"
+    echo "  $CONFIG_STATUS" >> "$outpath/config.status"
+    echo "fi" >> "$outpath/config.status"
+    chmod +x "$outpath/config.status"
+fi
+
+if [ -n "$RPATH_MESSAGE" ]; then
+    echo
+    echo "$RPATH_MESSAGE"
+fi
+
+MAKE=`basename $MAKE`
+echo
+echo Qt is now configured for building. Just run \'$MAKE\'.
+if [ "$relpath" = "$QT_INSTALL_PREFIX" ]; then
+    echo Once everything is built, Qt is installed.
+    echo You should not run \'$MAKE install\'.
+else
+    echo Once everything is built, you must run \'$MAKE install\'.
+    echo Qt will be installed into $QT_INSTALL_PREFIX
+fi
+echo
+echo To reconfigure, run \'$MAKE confclean\' and \'configure\'.
+echo
diff --git a/configure.exe b/configure.exe
new file mode 100644
index 0000000000..54e8a60878
--- /dev/null
+++ b/configure.exe
diff --git a/demos/README b/demos/README
new file mode 100644
index 0000000000..b1619908e2
--- /dev/null
+++ b/demos/README
@@ -0,0 +1,39 @@
+These demonstrations are intended to highlight Qt's capabilities in different
+application areas, and provide examples that are more advanced than those in
+the examples directory.
+
+Beginners to Qt may wish to try out the Qt tutorial and some of the examples
+before examining the demonstrations in detail.
+
+
+The example launcher can be used to explore the different categories
+available. It provides an overview of each example, lets you view the
+documentation in Qt Assistant, and is able to launch examples.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/demos/affine/affine.pro b/demos/affine/affine.pro
new file mode 100644
index 0000000000..b92875313a
--- /dev/null
+++ b/demos/affine/affine.pro
@@ -0,0 +1,23 @@
+SOURCES += main.cpp xform.cpp
+HEADERS += xform.h
+
+contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) {
+	DEFINES += QT_OPENGL_SUPPORT
+	QT += opengl
+}
+
+SHARED_FOLDER = ../shared
+
+include($$SHARED_FOLDER/shared.pri)
+
+RESOURCES += affine.qrc
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/affine
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg
+sources.path = $$[QT_INSTALL_DEMOS]/affine
+INSTALLS += target sources
+
+wince*: {
+    DEPLOYMENT_PLUGIN += qjpeg
+}
diff --git a/demos/affine/affine.qrc b/demos/affine/affine.qrc
new file mode 100644
index 0000000000..d8a7ae40cb
--- /dev/null
+++ b/demos/affine/affine.qrc
@@ -0,0 +1,7 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/res/affine">
+   <file>xform.cpp</file>
+   <file>xform.html</file>
+   <file>bg1.jpg</file>
+</qresource>
+</RCC>
diff --git a/demos/affine/bg1.jpg b/demos/affine/bg1.jpg
new file mode 100644
index 0000000000..dfc7cee6ad
--- /dev/null
+++ b/demos/affine/bg1.jpg
diff --git a/demos/affine/main.cpp b/demos/affine/main.cpp
new file mode 100644
index 0000000000..88cd864687
--- /dev/null
+++ b/demos/affine/main.cpp
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "xform.h"
+
+#include <QApplication>
+
+int main(int argc, char **argv)
+{
+    Q_INIT_RESOURCE(affine);
+
+    QApplication app(argc, argv);
+
+    XFormWidget xformWidget(0);
+    QStyle *arthurStyle = new ArthurStyle();
+    xformWidget.setStyle(arthurStyle);
+
+    QList<QWidget *> widgets = qFindChildren<QWidget *>(&xformWidget);
+    foreach (QWidget *w, widgets)
+        w->setStyle(arthurStyle);
+
+    xformWidget.show();
+
+    return app.exec();
+}
diff --git a/demos/affine/xform.cpp b/demos/affine/xform.cpp
new file mode 100644
index 0000000000..059e38e70a
--- /dev/null
+++ b/demos/affine/xform.cpp
@@ -0,0 +1,902 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "xform.h"
+#include "hoverpoints.h"
+
+#include <QLayout>
+#include <QPainter>
+#include <QPainterPath>
+
+const int alpha = 155;
+
+XFormView::XFormView(QWidget *parent)
+    : ArthurFrame(parent)
+{
+    setAttribute(Qt::WA_MouseTracking);
+    m_type = VectorType;
+    m_rotation = 0.0;
+    m_scale = 1.0;
+    m_shear = 0.0;
+
+    m_pixmap = QPixmap(":res/affine/bg1.jpg");
+    pts = new HoverPoints(this, HoverPoints::CircleShape);
+    pts->setConnectionType(HoverPoints::LineConnection);
+    pts->setEditable(false);
+    pts->setPointSize(QSize(15, 15));
+    pts->setShapeBrush(QBrush(QColor(151, 0, 0, alpha)));
+    pts->setShapePen(QPen(QColor(255, 100, 50, alpha)));
+    pts->setConnectionPen(QPen(QColor(151, 0, 0, 50)));
+    pts->setBoundingRect(QRectF(0, 0, 500, 500));
+    ctrlPoints << QPointF(250, 250) << QPointF(350, 250);
+    pts->setPoints(ctrlPoints);
+    connect(pts, SIGNAL(pointsChanged(const QPolygonF&)),
+            this, SLOT(updateCtrlPoints(const QPolygonF &)));
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+}
+
+XFormView::XFormType XFormView::type() const
+{
+    return m_type;
+}
+
+QPixmap XFormView::pixmap() const
+{
+    return m_pixmap;
+}
+
+QString XFormView::text() const
+{
+    return m_text;
+}
+
+void XFormView::setText(const QString &t)
+{
+    m_text = t;
+    update();
+}
+
+void XFormView::setPixmap(const QPixmap &p)
+{
+    m_pixmap = p;
+    update();
+}
+
+void XFormView::setType(XFormType t)
+{
+    m_type = t;
+    update();
+}
+
+void XFormView::mousePressEvent(QMouseEvent *)
+{
+    setDescriptionEnabled(false);
+}
+
+void XFormView::resizeEvent(QResizeEvent *e)
+{
+    pts->setBoundingRect(rect());
+    ArthurFrame::resizeEvent(e);
+}
+
+void XFormView::paint(QPainter *p)
+{
+    p->save();
+    p->setRenderHint(QPainter::Antialiasing);
+    p->setRenderHint(QPainter::SmoothPixmapTransform);
+    switch (m_type) {
+    case VectorType:
+        drawVectorType(p);
+        break;
+    case PixmapType:
+        drawPixmapType(p);
+        break;
+    case TextType:
+        drawTextType(p);
+        break;
+    }
+    p->restore();
+}
+
+void XFormView::updateCtrlPoints(const QPolygonF &points)
+{
+    QPointF trans = points.at(0) - ctrlPoints.at(0);
+
+    if (qAbs(points.at(0).x() - points.at(1).x()) < 10
+        && qAbs(points.at(0).y() - points.at(1).y()) < 10)
+        pts->setPoints(ctrlPoints);
+    if (!trans.isNull()) {
+        ctrlPoints[0] = points.at(0);
+        ctrlPoints[1] += trans;
+        pts->setPoints(ctrlPoints);
+    }
+    ctrlPoints = points;
+
+    QLineF line(ctrlPoints.at(0), ctrlPoints.at(1));
+    m_rotation = line.angle(QLineF(0, 0, 1, 0));
+    if (line.dy() < 0)
+        m_rotation = 360 - m_rotation;
+
+    if (trans.isNull())
+        emit rotationChanged(int(m_rotation*10));
+}
+
+void XFormView::setVectorType()
+{
+    m_type = VectorType;
+    update();
+}
+
+void XFormView::setPixmapType()
+{
+    m_type = PixmapType;
+    update();
+}
+
+void XFormView::setTextType()
+{
+    m_type = TextType;
+    update();
+}
+
+void XFormView::setAnimation(bool animate)
+{
+    timer.stop();
+    if (animate)
+        timer.start(25, this);
+}
+
+void XFormView::changeRotation(int r)
+{
+    setRotation(qreal(r) / 10);
+}
+
+void XFormView::changeScale(int s)
+{
+    setScale(qreal(s) / 1000);
+}
+
+void XFormView::changeShear(int s)
+{
+    setShear(qreal(s) / 1000);
+}
+
+void XFormView::setShear(qreal s)
+{
+    m_shear = s;
+    update();
+}
+
+void XFormView::setScale(qreal s)
+{
+    m_scale = s;
+    update();
+}
+
+void XFormView::setRotation(qreal r)
+{
+    qreal old_rot = m_rotation;
+    m_rotation = r;
+
+    QPointF center(pts->points().at(0));
+    QMatrix m;
+    m.translate(center.x(), center.y());
+    m.rotate(m_rotation - old_rot);
+    m.translate(-center.x(), -center.y());
+    pts->setPoints(pts->points() * m);
+
+    update();
+}
+
+void XFormView::timerEvent(QTimerEvent *e)
+{
+    if (e->timerId() == timer.timerId()) {
+        QPointF center(pts->points().at(0));
+        QMatrix m;
+        m.translate(center.x(), center.y());
+        m.rotate(0.2);
+        m.translate(-center.x(), -center.y());
+        pts->setPoints(pts->points() * m);
+
+        setUpdatesEnabled(false);
+        static qreal scale_inc = 0.003;
+        static qreal shear_inc = -0.001;
+        emit scaleChanged(int((m_scale + scale_inc) * 1000));
+        emit shearChanged(int((m_shear + shear_inc) * 1000));
+        if (m_scale >= 4.0 || m_scale <= 0.1)
+            scale_inc = -scale_inc;
+        if (m_shear >= 1.0 || m_shear <= -1.0)
+            shear_inc = -shear_inc;
+        setUpdatesEnabled(true);
+
+        pts->firePointChange();
+    }
+}
+
+void XFormView::wheelEvent(QWheelEvent *e)
+{
+    m_scale += e->delta() / qreal(600);
+    m_scale = qMax(qreal(0.1), qMin(qreal(4), m_scale));
+    emit scaleChanged(int(m_scale*1000));
+}
+
+void XFormView::reset()
+{
+    emit rotationChanged(0);
+    emit scaleChanged(1000);
+    emit shearChanged(0);
+    ctrlPoints = QPolygonF();
+    ctrlPoints << QPointF(250, 250) << QPointF(350, 250);
+    pts->setPoints(ctrlPoints);
+    pts->firePointChange();
+}
+
+void XFormView::drawPixmapType(QPainter *painter)
+{
+    QPointF center(m_pixmap.width() / qreal(2), m_pixmap.height() / qreal(2));
+    painter->translate(ctrlPoints.at(0) - center);
+
+    painter->translate(center);
+    painter->rotate(m_rotation);
+    painter->scale(m_scale, m_scale);
+    painter->shear(0, m_shear);
+    painter->translate(-center);
+
+    painter->drawPixmap(QPointF(0, 0), m_pixmap);
+    painter->setPen(QPen(QColor(255, 0, 0, alpha), 0.25, Qt::SolidLine, Qt::FlatCap, Qt::BevelJoin));
+    painter->setBrush(Qt::NoBrush);
+    painter->drawRect(QRectF(0, 0, m_pixmap.width(), m_pixmap.height()).adjusted(-2, -2, 2, 2));
+}
+
+void XFormView::drawTextType(QPainter *painter)
+{
+    QPainterPath path;
+    QFont f("times new roman,utopia");
+    f.setStyleStrategy(QFont::ForceOutline);
+    f.setPointSize(72);
+    f.setStyleHint(QFont::Times);
+    path.addText(0, 0, f, m_text);
+
+    QFontMetrics fm(f);
+    QRectF br(fm.boundingRect(m_text));
+    QPointF center(br.center());
+    painter->translate(ctrlPoints.at(0) - center);
+
+    painter->translate(center);
+    painter->rotate(m_rotation);
+    painter->scale(m_scale, m_scale);
+    painter->shear(0, m_shear);
+    painter->translate(-center);
+
+    painter->fillPath(path, Qt::black);
+
+    painter->setPen(QPen(QColor(255, 0, 0, alpha), 0.25, Qt::SolidLine, Qt::FlatCap, Qt::BevelJoin));
+    painter->setBrush(Qt::NoBrush);
+    painter->drawRect(br.adjusted(-1, -1, 1, 1));
+}
+
+void XFormView::drawVectorType(QPainter *painter)
+{
+    QPainterPath path;
+    painter->translate(ctrlPoints.at(0) - QPointF(250,250));
+
+    painter->scale(0.77, 0.77);
+    painter->translate(98.9154 + 30 , -217.691 - 20);
+
+    QRect br(-55, 275, 500, 590);
+    QPoint center = br.center();
+    painter->translate(center.x(), center.y());
+    painter->rotate(m_rotation);
+    painter->scale(m_scale, m_scale);
+    painter->shear(0, m_shear);
+    painter->translate(-center.x(), -center.y());
+
+    painter->setPen(Qt::NoPen);
+    path.moveTo(120, 470);
+    path.lineTo(60+245, 470);
+    path.lineTo(60+245, 470+350);
+    path.lineTo(60, 470+350);
+    path.lineTo(60, 470+80);
+
+    painter->setBrush(Qt::white);
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor( 193, 193, 191, 255));
+    path.moveTo(329.336, 727.552);
+    path.cubicTo(QPointF(315.224, 726.328), QPointF(304.136, 715.816), QPointF(303.128, 694.936));
+    path.cubicTo(QPointF(306.368, 639.496), QPointF(309.608, 582.112), QPointF(271.232, 545.104));
+    path.cubicTo(QPointF(265.256, 499.024), QPointF(244.016, 482.104), QPointF(234.008, 452.512));
+    path.lineTo(218.24, 441.208);
+    path.lineTo(237.104, 411.688);
+    path.lineTo(245.168, 411.904);
+    path.lineTo(323.936, 571.168);
+    path.lineTo(340.424, 651.448);
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(136.232, 439.696);
+    path.cubicTo(QPointF(133.856, 455.248), QPointF(132.56, 470.512), QPointF(134.792, 485.272));
+    path.cubicTo(QPointF(118.376, 507.592), QPointF(105.92, 530.128), QPointF(104.48, 553.312));
+    path.cubicTo(QPointF(92.024, 586.504), QPointF(62.432, 614.584), QPointF(67.544, 680.104));
+    path.cubicTo(QPointF(84.176, 697.456), QPointF(107.432, 713.584), QPointF(127.376, 730.36));
+    path.cubicTo(QPointF(152.432, 751.312), QPointF(137.528, 778.96), QPointF(102.248, 772.408));
+    path.cubicTo(QPointF(94.4, 763.768), QPointF(76.616, 709.624), QPointF(42.92, 676.288));
+    path.lineTo(49.544, 632.584);
+    path.lineTo(81.368, 547.408);
+    path.lineTo(120.968, 484.048);
+    path.lineTo(125.36, 456.688);
+    path.lineTo(119.816, 386.776);
+    path.lineTo(124.424, 361.216);
+    path.lineTo(136.232, 439.696);
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(115.64, 341.416);
+    path.cubicTo(QPointF(116.576, 336.376), QPointF(117.8, 331.624), QPointF(119.312, 327.16));
+    path.lineTo(121.688, 342.784);
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(120.968, 500.464);
+    path.cubicTo(QPointF(108.368, 523.792), QPointF(103.976, 546.256), QPointF(132.92, 550.216));
+    path.cubicTo(QPointF(117.008, 553.888), QPointF(97.208, 568.648), QPointF(77.192, 593.488));
+    path.lineTo(77.624, 543.016);
+    path.lineTo(101.456, 503.272);
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(-33.256, 818.488);
+    path.cubicTo(QPointF(10.52, 838.144), QPointF(41.408, 837.064), QPointF(69.272, 850.96));
+    path.cubicTo(QPointF(91.304, 862.552), QPointF(113.552, 861.184), QPointF(126.944, 847.144));
+    path.cubicTo(QPointF(138.32, 832.456), QPointF(146.744, 831.736), QPointF(163.52, 830.224));
+    path.cubicTo(QPointF(190.952, 828.568), QPointF(217.736, 828.28), QPointF(241.928, 830.8));
+    path.lineTo(269.576, 833.032);
+    path.cubicTo(QPointF(269.072, 864.064), QPointF(328.04, 867.88), QPointF(345.392, 844.336));
+    path.cubicTo(QPointF(366.344, 819.424), QPointF(395.144, 808.264), QPointF(419.84, 790.192));
+    path.lineTo(289.304, 725.536);
+    path.cubicTo(QPointF(255.824, 806.464), QPointF(131.048, 827.632), QPointF(113.768, 763.264));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(286.424, 711.568);
+    path.cubicTo(QPointF(273.824, 711.496), QPointF(260.936, 715.6), QPointF(261.944, 732.16));
+    path.lineTo(266.192, 776.44);
+    path.lineTo(304.424, 756.64);
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(0, 0, 0, 255));
+    path.moveTo(-37.36, 821.224);
+    path.cubicTo(QPointF(7.136, 840.88), QPointF(38.6, 839.728), QPointF(66.968, 853.696));
+    path.cubicTo(QPointF(89.36, 865.216), QPointF(111.968, 863.92), QPointF(125.648, 849.808));
+    path.cubicTo(QPointF(137.24, 835.192), QPointF(145.808, 834.472), QPointF(162.872, 832.96));
+    path.cubicTo(QPointF(190.736, 831.232), QPointF(218.024, 831.016), QPointF(242.648, 833.464));
+    path.lineTo(270.728, 835.768);
+    path.cubicTo(QPointF(270.224, 866.8), QPointF(330.272, 870.544), QPointF(347.912, 847));
+    path.cubicTo(QPointF(369.224, 822.088), QPointF(398.528, 811), QPointF(423.656, 792.856));
+    path.lineTo(290.816, 728.272);
+    path.cubicTo(QPointF(256.76, 809.128), QPointF(129.824, 830.296), QPointF(112.256, 766));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(183, 114, 0, 255));
+    path.moveTo(382.328, 691.984);
+    path.cubicTo(QPointF(403.64, 698.968), QPointF(389.888, 720.28), QPointF(400.76, 732.52));
+    path.cubicTo(QPointF(405.44, 742.888), QPointF(415.304, 752.032), QPointF(431.792, 760.528));
+    path.cubicTo(QPointF(459.368, 774.424), QPointF(426.248, 799.336), QPointF(392.768, 812.08));
+    path.cubicTo(QPointF(351.944, 825.616), QPointF(344.024, 862.912), QPointF(299.312, 851.896));
+    path.cubicTo(QPointF(283.112, 846.496), QPointF(278.36, 831.808), QPointF(278.864, 809.128));
+    path.cubicTo(QPointF(284.264, 762.76), QPointF(277.784, 730.432), QPointF(278.792, 698.824));
+    path.cubicTo(QPointF(278.72, 686.152), QPointF(283.544, 684.64), QPointF(307.232, 687.952));
+    path.cubicTo(QPointF(310.04, 726.328), QPointF(352.376, 727.336), QPointF(382.328, 691.984));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(242, 183, 0, 255));
+    path.moveTo(339.632, 826.624);
+    path.cubicTo(QPointF(371.6, 814.312), QPointF(403.856, 798.112), QPointF(429.848, 782.128));
+    path.cubicTo(QPointF(437.84, 777.448), QPointF(438.92, 765.928), QPointF(427.688, 762.328));
+    path.cubicTo(QPointF(403.352, 748.504), QPointF(390.104, 731.224), QPointF(392.912, 708.76));
+    path.cubicTo(QPointF(393.344, 700.912), QPointF(383.696, 692.56), QPointF(381.104, 700.048));
+    path.cubicTo(QPointF(359.864, 771.472), QPointF(291.32, 767.656), QPointF(300.752, 696.952));
+    path.cubicTo(QPointF(301.256, 694.864), QPointF(301.76, 692.776), QPointF(302.264, 690.76));
+    path.cubicTo(QPointF(289.952, 688.24), QPointF(285.2, 690.976), QPointF(285.776, 700.408));
+    path.lineTo(295.28, 806.608);
+    path.cubicTo(QPointF(297.656, 830.8), QPointF(317.312, 836.128), QPointF(339.632, 826.624));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(0, 0, 0, 255));
+    path.moveTo(354.464, 537.544);
+    path.cubicTo(QPointF(379.16, 569.8), QPointF(404.432, 651.088), QPointF(384.416, 691.552));
+    path.cubicTo(QPointF(360.944, 737.776), QPointF(307.808, 743.248), QPointF(305.504, 695.8));
+    path.cubicTo(QPointF(308.816, 639.64), QPointF(311.984, 581.536), QPointF(273.68, 544.096));
+    path.cubicTo(QPointF(267.704, 497.368), QPointF(246.392, 480.232), QPointF(236.384, 450.28));
+    path.lineTo(203.12, 426.088);
+    path.lineTo(133.568, 435.088);
+    path.cubicTo(QPointF(130.76, 452.152), QPointF(129.104, 468.784), QPointF(131.552, 484.912));
+    path.cubicTo(QPointF(115.064, 507.376), QPointF(102.608, 530.056), QPointF(101.168, 553.312));
+    path.cubicTo(QPointF(88.712, 586.648), QPointF(59.12, 614.944), QPointF(64.232, 680.752));
+    path.cubicTo(QPointF(80.864, 698.248), QPointF(104.12, 714.448), QPointF(124.064, 731.296));
+    path.cubicTo(QPointF(149.12, 752.392), QPointF(135.512, 776.296), QPointF(100.232, 769.672));
+    path.cubicTo(QPointF(78.848, 746.056), QPointF(56.744, 722.872), QPointF(35.288, 699.328));
+    path.cubicTo(QPointF(12.392, 683.056), QPointF(3.896, 662.176), QPointF(27.368, 630.496));
+    path.cubicTo(QPointF(43.424, 609.04), QPointF(47.96, 562.456), QPointF(62, 543.664));
+    path.cubicTo(QPointF(74.312, 525.16), QPointF(92.24, 508.6), QPointF(105.272, 490.096));
+    path.cubicTo(QPointF(112.184, 477.928), QPointF(114.344, 468.568), QPointF(113.264, 454.456));
+    path.lineTo(110.312, 369.136);
+    path.cubicTo(QPointF(108.368, 307.216), QPointF(142.424, 274.24), QPointF(189.8, 275.248));
+    path.cubicTo(QPointF(243.512, 275.752), QPointF(287.576, 312.472), QPointF(288.152, 378.28));
+    path.cubicTo(QPointF(292.688, 410.32), QPointF(283.256, 428.68), QPointF(308.672, 474.472));
+    path.cubicTo(QPointF(334.52, 522.712), QPointF(338.552, 520.12), QPointF(354.464, 537.544));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(261.296, 503.632);
+    path.lineTo(263.528, 512.2);
+    path.cubicTo(QPointF(257.696, 501.688), QPointF(250.712, 483.616), QPointF(241.928, 475.696));
+    path.cubicTo(QPointF(239.264, 473.536), QPointF(235.808, 473.608), QPointF(233.72, 475.624));
+    path.cubicTo(QPointF(222.056, 486.928), QPointF(193.112, 510.112), QPointF(169.928, 507.088));
+    path.cubicTo(QPointF(152.072, 505.288), QPointF(134.648, 493.264), QPointF(130.832, 480.232));
+    path.cubicTo(QPointF(128.816, 470.872), QPointF(129.752, 463.168), QPointF(130.976, 455.32));
+    path.lineTo(240.704, 453.52);
+    path.cubicTo(QPointF(238.472, 463.168), QPointF(253.088, 487), QPointF(261.296, 503.632));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(143.144, 363.232);
+    path.cubicTo(QPointF(154.088, 363.232), QPointF(163.88, 376.84), QPointF(163.808, 395.632));
+    path.cubicTo(QPointF(163.736, 408.232), QPointF(155.528, 411.472), QPointF(149.336, 417.016));
+    path.cubicTo(QPointF(146.6, 419.536), QPointF(145.952, 433.144), QPointF(142.568, 433.144));
+    path.cubicTo(QPointF(131.696, 433.144), QPointF(123.488, 413.776), QPointF(123.488, 395.632));
+    path.cubicTo(QPointF(123.488, 377.56), QPointF(132.272, 363.232), QPointF(143.144, 363.232));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(255, 255, 255, 255));
+    path.moveTo(144.368, 375.04);
+    path.cubicTo(QPointF(154.088, 375.04), QPointF(160.856, 379.936), QPointF(161.648, 391.312));
+    path.cubicTo(QPointF(162.224, 399.16), QPointF(160.136, 411.76), QPointF(154.664, 414.424));
+    path.cubicTo(QPointF(152.144, 415.648), QPointF(143.432, 426.664), QPointF(140.408, 426.52));
+    path.cubicTo(QPointF(128.096, 425.944), QPointF(125, 402.112), QPointF(125.936, 390.736));
+    path.cubicTo(QPointF(126.8, 379.36), QPointF(134.72, 375.04), QPointF(144.368, 375.04));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(0, 0, 0, 255));
+    path.moveTo(141.848, 382.672);
+    path.cubicTo(QPointF(148.544, 382.096), QPointF(154.736, 389.728), QPointF(155.6, 399.664));
+    path.cubicTo(QPointF(156.464, 409.6), QPointF(151.64, 418.24), QPointF(144.944, 418.816));
+    path.cubicTo(QPointF(138.248, 419.392), QPointF(132.056, 411.76), QPointF(131.192, 401.752));
+    path.cubicTo(QPointF(130.328, 391.816), QPointF(135.152, 383.248), QPointF(141.848, 382.672));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(151.064, 397.288);
+    path.cubicTo(QPointF(151.424, 399.088), QPointF(149.408, 400.024), QPointF(148.832, 398.224));
+    path.cubicTo(QPointF(148.256, 395.992), QPointF(146.888, 393.328), QPointF(145.088, 391.168));
+    path.cubicTo(QPointF(143.936, 389.872), QPointF(145.088, 388.432), QPointF(146.528, 389.44));
+    path.cubicTo(QPointF(149.048, 391.528), QPointF(150.488, 394.12), QPointF(151.064, 397.288));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(216.944, 360.712);
+    path.cubicTo(QPointF(232.712, 360.712), QPointF(245.6, 377.416), QPointF(245.6, 397.792));
+    path.cubicTo(QPointF(245.6, 418.24), QPointF(232.712, 434.872), QPointF(216.944, 434.872));
+    path.cubicTo(QPointF(201.176, 434.872), QPointF(188.432, 418.24), QPointF(188.432, 397.792));
+    path.cubicTo(QPointF(188.432, 377.416), QPointF(201.176, 360.712), QPointF(216.944, 360.712));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(255, 255, 255, 255));
+    path.moveTo(224.792, 374.968);
+    path.cubicTo(QPointF(235.664, 378.856), QPointF(241.928, 387.424), QPointF(242.72, 396.568));
+    path.cubicTo(QPointF(243.656, 407.08), QPointF(239.408, 418.96), QPointF(230.264, 425.944));
+    path.cubicTo(QPointF(227.672, 427.888), QPointF(197.72, 416.08), QPointF(195.992, 411.616));
+    path.cubicTo(QPointF(193.4, 405.208), QPointF(191.816, 392.896), QPointF(193.76, 385.624));
+    path.cubicTo(QPointF(194.552, 382.744), QPointF(197.216, 378.568), QPointF(201.176, 376.336));
+    path.cubicTo(QPointF(207.44, 372.808), QPointF(216.656, 372.088), QPointF(224.792, 374.968));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(0, 0, 0, 255));
+    path.moveTo(216.872, 380.944);
+    path.cubicTo(QPointF(225.584, 380.944), QPointF(232.712, 389.296), QPointF(232.712, 399.448));
+    path.cubicTo(QPointF(232.712, 409.672), QPointF(225.584, 418.024), QPointF(216.872, 418.024));
+    path.cubicTo(QPointF(208.16, 418.024), QPointF(201.032, 409.672), QPointF(201.032, 399.448));
+    path.cubicTo(QPointF(201.032, 389.296), QPointF(208.16, 380.944), QPointF(216.872, 380.944));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(227.096, 392.392);
+    path.cubicTo(QPointF(228.104, 394.048), QPointF(226.448, 395.776), QPointF(225.224, 394.12));
+    path.cubicTo(QPointF(223.784, 392.104), QPointF(221.408, 389.944), QPointF(218.888, 388.432));
+    path.cubicTo(QPointF(217.232, 387.568), QPointF(217.808, 385.624), QPointF(219.68, 386.2));
+    path.cubicTo(QPointF(222.92, 387.28), QPointF(225.368, 389.368), QPointF(227.096, 392.392));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(183, 114, 0, 255));
+    path.moveTo(164.96, 404.488);
+    path.cubicTo(QPointF(172.376, 402.328), QPointF(184.112, 403.048), QPointF(192.248, 404.632));
+    path.cubicTo(QPointF(200.384, 406.792), QPointF(222.056, 418.24), QPointF(245.024, 430.696));
+    path.cubicTo(QPointF(247.976, 432.208), QPointF(248.84, 437.104), QPointF(245.024, 438.688));
+    path.cubicTo(QPointF(239.12, 439.12), QPointF(249.272, 453.664), QPointF(238.904, 458.848));
+    path.cubicTo(QPointF(223.352, 462.88), QPointF(198.44, 485.992), QPointF(186.128, 487.864));
+    path.cubicTo(QPointF(179.288, 489.376), QPointF(172.232, 489.592), QPointF(164.6, 487.864));
+    path.cubicTo(QPointF(140.552, 482.968), QPointF(134.216, 455.608), QPointF(122.912, 450.064));
+    path.cubicTo(QPointF(119.816, 446.824), QPointF(121.4, 441.208), QPointF(122.408, 440.056));
+    path.cubicTo(QPointF(123.632, 434.224), QPointF(149.696, 406.216), QPointF(164.96, 404.488));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(242, 183, 0, 255));
+    path.moveTo(185.408, 405.856);
+    path.cubicTo(QPointF(198.44, 407.296), QPointF(226.088, 423.928), QPointF(239.408, 430.624));
+    path.cubicTo(QPointF(242.72, 432.424), QPointF(242.504, 437.824), QPointF(239.552, 438.688));
+    path.cubicTo(QPointF(236.384, 440.488), QPointF(235.448, 438.256), QPointF(232.928, 437.896));
+    path.cubicTo(QPointF(228.896, 435.736), QPointF(222.272, 440.92), QPointF(217.016, 444.88));
+    path.cubicTo(QPointF(186.704, 467.776), QPointF(180.656, 465.256), QPointF(156.176, 462.664));
+    path.cubicTo(QPointF(147.68, 460.576), QPointF(142.136, 457.984), QPointF(139.688, 455.968));
+    path.cubicTo(QPointF(141.488, 445.888), QPointF(160.496, 407.656), QPointF(166.76, 406.792));
+    path.cubicTo(QPointF(168.344, 404.704), QPointF(179.936, 404.632), QPointF(185.408, 405.856));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(183, 114, 0, 255));
+    path.moveTo(190.664, 412.048);
+    path.lineTo(193.76, 413.416);
+    path.cubicTo(QPointF(196.064, 414.712), QPointF(193.256, 418.168), QPointF(190.736, 417.088));
+    path.lineTo(186.2, 415.504);
+    path.cubicTo(QPointF(183.536, 413.272), QPointF(186.704, 410.104), QPointF(190.664, 412.048));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(268.568, 452.368);
+    path.cubicTo(QPointF(273.032, 454.384), QPointF(279.224, 457.192), QPointF(282.536, 460.144));
+    path.cubicTo(QPointF(285.488, 464.104), QPointF(286.784, 468.064), QPointF(286.424, 472.024));
+    path.cubicTo(QPointF(285.776, 474.544), QPointF(284.12, 476.344), QPointF(281.24, 477.424));
+    path.cubicTo(QPointF(277.856, 478.216), QPointF(273.68, 477.424), QPointF(271.376, 474.112));
+    path.cubicTo(QPointF(269.864, 471.448), QPointF(265.256, 462.16), QPointF(263.96, 460.576));
+    path.cubicTo(QPointF(262.232, 457.12), QPointF(261.944, 454.456), QPointF(262.88, 452.368));
+    path.cubicTo(QPointF(264.032, 451.288), QPointF(266.048, 451), QPointF(268.568, 452.368));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(255, 255, 255, 255));
+    path.moveTo(273.752, 461.584);
+    path.cubicTo(QPointF(275.48, 462.376), QPointF(277.928, 463.456), QPointF(279.224, 464.68));
+    path.cubicTo(QPointF(280.376, 466.264), QPointF(280.88, 467.776), QPointF(280.736, 469.36));
+    path.cubicTo(QPointF(280.52, 470.296), QPointF(279.8, 471.016), QPointF(278.72, 471.448));
+    path.cubicTo(QPointF(277.352, 471.808), QPointF(275.768, 471.448), QPointF(274.832, 470.152));
+    path.cubicTo(QPointF(274.256, 469.144), QPointF(272.456, 465.472), QPointF(271.952, 464.824));
+    path.cubicTo(QPointF(271.232, 463.456), QPointF(271.088, 462.448), QPointF(271.448, 461.584));
+    path.cubicTo(QPointF(271.952, 461.152), QPointF(272.744, 461.08), QPointF(273.752, 461.584));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(238.616, 358.552);
+    path.cubicTo(QPointF(239.048, 359.2), QPointF(238.976, 359.776), QPointF(238.4, 360.28));
+    path.cubicTo(QPointF(237.896, 360.784), QPointF(237.176, 360.712), QPointF(236.24, 360.208));
+    path.lineTo(231.632, 356.248);
+    path.cubicTo(QPointF(231.056, 355.744), QPointF(230.912, 354.952), QPointF(231.272, 354.088));
+    path.cubicTo(QPointF(232.28, 353.44), QPointF(233.144, 353.44), QPointF(233.936, 354.088));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(235.592, 305.992);
+    path.cubicTo(QPointF(239.624, 308.224), QPointF(240.848, 313.912), QPointF(238.184, 318.592));
+    path.cubicTo(QPointF(235.592, 323.2), QPointF(230.12, 325.144), QPointF(226.016, 322.84));
+    path.cubicTo(QPointF(221.984, 320.536), QPointF(220.76, 314.92), QPointF(223.424, 310.24));
+    path.cubicTo(QPointF(226.016, 305.56), QPointF(231.488, 303.688), QPointF(235.592, 305.992));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(374.912, 680.536);
+    path.cubicTo(QPointF(378.296, 683.128), QPointF(373.256, 687.376), QPointF(371.024, 686.296));
+    path.cubicTo(QPointF(369.152, 685.648), QPointF(367.784, 683.488), QPointF(366.92, 682.408));
+    path.cubicTo(QPointF(366.128, 681.184), QPointF(366.2, 679.168), QPointF(366.92, 678.448));
+    path.cubicTo(QPointF(367.712, 677.44), QPointF(369.728, 677.656), QPointF(371.024, 678.52));
+    path.cubicTo(QPointF(372.32, 679.168), QPointF(373.616, 679.888), QPointF(374.912, 680.536));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(297.44, 551.512);
+    path.cubicTo(QPointF(338.984, 572.896), QPointF(350, 611.56), QPointF(332.072, 664.192));
+    path.cubicTo(QPointF(330.992, 666.64), QPointF(334.16, 668.368), QPointF(335.24, 666.064));
+    path.cubicTo(QPointF(354.824, 610.336), QPointF(341.432, 571.312), QPointF(299.024, 548.56));
+    path.cubicTo(QPointF(296.864, 547.552), QPointF(295.28, 550.432), QPointF(297.44, 551.512));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(72.008, 569.512);
+    path.cubicTo(QPointF(38.312, 627.256), QPointF(38.096, 662.68), QPointF(62.504, 681.328));
+    path.cubicTo(QPointF(63.728, 682.264), QPointF(64.448, 680.032), QPointF(63.296, 679.168));
+    path.cubicTo(QPointF(36.296, 655.48), QPointF(48.896, 615.52), QPointF(74.168, 570.88));
+    path.cubicTo(QPointF(74.888, 569.584), QPointF(72.512, 568.432), QPointF(72.008, 569.512));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(289.376, 586.864);
+    path.cubicTo(QPointF(289.232, 589.168), QPointF(288.368, 589.528), QPointF(286.424, 587.368));
+    path.cubicTo(QPointF(279.8, 575.848), QPointF(235.088, 551.44), QPointF(213.344, 548.704));
+    path.cubicTo(QPointF(209.24, 547.264), QPointF(209.456, 545.392), QPointF(213.488, 544.816));
+    path.cubicTo(QPointF(229.184, 544.816), QPointF(241.28, 537.904), QPointF(254.96, 537.904));
+    path.cubicTo(QPointF(258.704, 538.048), QPointF(262.304, 539.488), QPointF(264.392, 541.648));
+    path.cubicTo(QPointF(269.504, 544.96), QPointF(288.08, 570.592), QPointF(289.376, 586.864));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(180.152, 546.832);
+    path.cubicTo(QPointF(180.872, 550.792), QPointF(163.808, 545.68), QPointF(164.744, 556.696));
+    path.cubicTo(QPointF(165.032, 559.72), QPointF(160.496, 561.376), QPointF(160.64, 556.696));
+    path.cubicTo(QPointF(160.64, 548.272), QPointF(161.072, 548.416), QPointF(152.72, 546.832));
+    path.cubicTo(QPointF(151.208, 546.76), QPointF(151.352, 544.528), QPointF(152.72, 544.816));
+    path.lineTo(152.72, 544.816);
+    path.cubicTo(QPointF(158.696, 546.472), QPointF(166.76, 542.872), QPointF(166.4, 538.84));
+    path.cubicTo(QPointF(166.256, 537.472), QPointF(168.56, 537.688), QPointF(168.488, 538.84));
+    path.cubicTo(QPointF(167.984, 545.248), QPointF(181.664, 542.152), QPointF(180.152, 546.832));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(193, 193, 191, 255));
+    path.moveTo(151.568, 705.376);
+    path.cubicTo(QPointF(151.64, 708.328), QPointF(148.76, 707.68), QPointF(148.544, 705.592));
+    path.cubicTo(QPointF(140.192, 680.536), QPointF(143.72, 618.832), QPointF(151.856, 598.96));
+    path.cubicTo(QPointF(152.432, 596.08), QPointF(156.248, 596.944), QPointF(155.744, 598.96));
+    path.cubicTo(QPointF(147.104, 635.464), QPointF(147.248, 673.048), QPointF(151.568, 705.376));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(183, 114, 0, 255));
+    path.moveTo(51.704, 684.424);
+    path.cubicTo(QPointF(75.68, 707.824), QPointF(91.376, 743.248), QPointF(114.632, 775.288));
+    path.cubicTo(QPointF(148.472, 816.04), QPointF(121.472, 858.304), QPointF(66.464, 845.56));
+    path.cubicTo(QPointF(38.888, 835.192), QPointF(-0.784, 836.344), QPointF(-32.68, 825.832));
+    path.cubicTo(QPointF(-55.072, 820.36), QPointF(-55.864, 809.272), QPointF(-44.416, 787.6));
+    path.cubicTo(QPointF(-40.384, 773.776), QPointF(-40.024, 751.312), QPointF(-43.768, 732.592));
+    path.cubicTo(QPointF(-45.784, 718.408), QPointF(-39.232, 710.488), QPointF(-24.112, 708.832));
+    path.lineTo(-24.112, 708.832);
+    path.cubicTo(QPointF(-11.296, 708.688), QPointF(6.56, 713.872), QPointF(16.28, 686.44));
+    path.cubicTo(QPointF(23.552, 673.336), QPointF(40.976, 672.976), QPointF(51.704, 684.424));
+    path.closeSubpath();
+    painter->drawPath(path);
+    path = QPainterPath();
+
+    painter->setBrush(QColor(242, 183, 0, 255));
+    path.moveTo(24.632, 699.04);
+    path.cubicTo(QPointF(23.84, 680.968), QPointF(39.32, 677.296), QPointF(49.688, 688.312));
+    path.cubicTo(QPointF(68.192, 710.992), QPointF(85.112, 736.048), QPointF(100.376, 764.992));
+    path.cubicTo(QPointF(124.712, 804.16), QPointF(104.624, 842.68), QPointF(67.904, 828.064));
+    path.cubicTo(QPointF(49.688, 817.84), QPointF(6.128, 813.304), QPointF(-17.344, 809.128));
+    path.cubicTo(QPointF(-33.04, 807.832), QPointF(-35.128, 797.608), QPointF(-29.152, 791.848));
+    path.cubicTo(QPointF(-20.944, 782.416), QPointF(-20.08, 759.808), QPointF(-27.856, 740.512));
+    path.cubicTo(QPointF(-35.56, 728.56), QPointF(-21.088, 715.384), QPointF(-9.712, 720.856));
+    path.cubicTo(QPointF(0.8, 727.048), QPointF(25.64, 713.08), QPointF(24.632, 699.04));
+    path.closeSubpath();
+    painter->drawPath(path);
+
+    painter->setPen(QPen(QColor(255, 0, 0, alpha), 0.25, Qt::SolidLine, Qt::FlatCap, Qt::BevelJoin));
+    painter->setBrush(Qt::NoBrush);
+    painter->drawRect(br.adjusted(-1, -1, 1, 1));
+}
+
+
+XFormWidget::XFormWidget(QWidget *parent)
+    : QWidget(parent), textEditor(new QLineEdit)
+{
+    setWindowTitle(tr("Affine Transformations"));
+
+    view = new XFormView(this);
+    view->setMinimumSize(200, 200);
+
+    QGroupBox *mainGroup = new QGroupBox(this);
+    mainGroup->setFixedWidth(180);
+    mainGroup->setTitle(tr("Affine Transformations"));
+
+    QGroupBox *rotateGroup = new QGroupBox(mainGroup);
+    rotateGroup->setTitle(tr("Rotate"));
+    QSlider *rotateSlider = new QSlider(Qt::Horizontal, rotateGroup);
+    rotateSlider->setRange(0, 3600);
+    rotateSlider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+
+    QGroupBox *scaleGroup = new QGroupBox(mainGroup);
+    scaleGroup->setTitle(tr("Scale"));
+    QSlider *scaleSlider = new QSlider(Qt::Horizontal, scaleGroup);
+    scaleSlider->setRange(1, 4000);
+    scaleSlider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+
+    QGroupBox *shearGroup = new QGroupBox(mainGroup);
+    shearGroup->setTitle(tr("Shear"));
+    QSlider *shearSlider = new QSlider(Qt::Horizontal, shearGroup);
+    shearSlider->setRange(-990, 990);
+    shearSlider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+
+    QGroupBox *typeGroup = new QGroupBox(mainGroup);
+    typeGroup->setTitle(tr("Type"));
+    QRadioButton *vectorType = new QRadioButton(typeGroup);
+    QRadioButton *pixmapType = new QRadioButton(typeGroup);
+    QRadioButton *textType= new QRadioButton(typeGroup);
+    vectorType->setText(tr("Vector Image"));
+    pixmapType->setText(tr("Pixmap"));
+    textType->setText(tr("Text"));
+
+    QPushButton *resetButton = new QPushButton(mainGroup);
+    resetButton->setText(tr("Reset Transform"));
+
+    QPushButton *animateButton = new QPushButton(mainGroup);
+    animateButton->setText(tr("Animate"));
+    animateButton->setCheckable(true);
+
+    QPushButton *showSourceButton = new QPushButton(mainGroup);
+    showSourceButton->setText(tr("Show Source"));
+#ifdef QT_OPENGL_SUPPORT
+    QPushButton *enableOpenGLButton = new QPushButton(mainGroup);
+    enableOpenGLButton->setText(tr("Use OpenGL"));
+    enableOpenGLButton->setCheckable(true);
+    enableOpenGLButton->setChecked(view->usesOpenGL());
+    if (!QGLFormat::hasOpenGL())
+        enableOpenGLButton->hide();
+#endif
+    QPushButton *whatsThisButton = new QPushButton(mainGroup);
+    whatsThisButton->setText(tr("What's This?"));
+    whatsThisButton->setCheckable(true);
+
+    QHBoxLayout *viewLayout = new QHBoxLayout(this);
+    viewLayout->addWidget(view);
+    viewLayout->addWidget(mainGroup);
+
+    QVBoxLayout *rotateGroupLayout = new QVBoxLayout(rotateGroup);
+    rotateGroupLayout->addWidget(rotateSlider);
+
+    QVBoxLayout *scaleGroupLayout = new QVBoxLayout(scaleGroup);
+    scaleGroupLayout->addWidget(scaleSlider);
+
+    QVBoxLayout *shearGroupLayout = new QVBoxLayout(shearGroup);
+    shearGroupLayout->addWidget(shearSlider);
+
+    QVBoxLayout *typeGroupLayout = new QVBoxLayout(typeGroup);
+    typeGroupLayout->addWidget(vectorType);
+    typeGroupLayout->addWidget(pixmapType);
+    typeGroupLayout->addWidget(textType);
+    typeGroupLayout->addSpacing(4);
+    typeGroupLayout->addWidget(textEditor);
+
+    QVBoxLayout *mainGroupLayout = new QVBoxLayout(mainGroup);
+    mainGroupLayout->addWidget(rotateGroup);
+    mainGroupLayout->addWidget(scaleGroup);
+    mainGroupLayout->addWidget(shearGroup);
+    mainGroupLayout->addWidget(typeGroup);
+    mainGroupLayout->addStretch(1);
+    mainGroupLayout->addWidget(resetButton);
+    mainGroupLayout->addWidget(animateButton);
+    mainGroupLayout->addWidget(showSourceButton);
+#ifdef QT_OPENGL_SUPPORT
+    mainGroupLayout->addWidget(enableOpenGLButton);
+#endif
+    mainGroupLayout->addWidget(whatsThisButton);
+
+    connect(rotateSlider, SIGNAL(valueChanged(int)), view, SLOT(changeRotation(int)));
+    connect(shearSlider, SIGNAL(valueChanged(int)), view, SLOT(changeShear(int)));
+    connect(scaleSlider, SIGNAL(valueChanged(int)), view, SLOT(changeScale(int)));
+
+    connect(vectorType, SIGNAL(clicked()), view, SLOT(setVectorType()));
+    connect(pixmapType, SIGNAL(clicked()), view, SLOT(setPixmapType()));
+    connect(textType, SIGNAL(clicked()), view, SLOT(setTextType()));
+    connect(textType, SIGNAL(toggled(bool)), textEditor, SLOT(setEnabled(bool)));
+    connect(textEditor, SIGNAL(textChanged(QString)), view, SLOT(setText(QString)));
+
+    connect(view, SIGNAL(rotationChanged(int)), rotateSlider, SLOT(setValue(int)));
+    connect(view, SIGNAL(scaleChanged(int)), scaleSlider, SLOT(setValue(int)));
+    connect(view, SIGNAL(shearChanged(int)), shearSlider, SLOT(setValue(int)));
+
+    connect(resetButton, SIGNAL(clicked()), view, SLOT(reset()));
+    connect(animateButton, SIGNAL(clicked(bool)), view, SLOT(setAnimation(bool)));
+    connect(whatsThisButton, SIGNAL(clicked(bool)), view, SLOT(setDescriptionEnabled(bool)));
+    connect(whatsThisButton, SIGNAL(clicked(bool)), view->hoverPoints(), SLOT(setDisabled(bool)));
+    connect(view, SIGNAL(descriptionEnabledChanged(bool)), view->hoverPoints(), SLOT(setDisabled(bool)));
+    connect(view, SIGNAL(descriptionEnabledChanged(bool)), whatsThisButton, SLOT(setChecked(bool)));
+    connect(showSourceButton, SIGNAL(clicked()), view, SLOT(showSource()));
+#ifdef QT_OPENGL_SUPPORT
+    connect(enableOpenGLButton, SIGNAL(clicked(bool)), view, SLOT(enableOpenGL(bool)));
+#endif
+    view->loadSourceFile(":res/affine/xform.cpp");
+    view->loadDescription(":res/affine/xform.html");
+
+    // defaults
+    view->reset();
+    vectorType->setChecked(true);
+    textEditor->setText("Qt Software");
+    textEditor->setEnabled(false);
+
+    animateButton->animateClick();
+}
diff --git a/demos/affine/xform.h b/demos/affine/xform.h
new file mode 100644
index 0000000000..f33e63de9f
--- /dev/null
+++ b/demos/affine/xform.h
@@ -0,0 +1,141 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef XFORM_H
+#define XFORM_H
+
+#include "arthurwidgets.h"
+
+#include <QBasicTimer>
+#include <QPolygonF>
+
+class HoverPoints;
+QT_FORWARD_DECLARE_CLASS(QLineEdit)
+
+class XFormView : public ArthurFrame
+{
+public:
+    Q_OBJECT
+
+    Q_PROPERTY(XFormType type READ type WRITE setType)
+    Q_PROPERTY(bool animation READ animation WRITE setAnimation)
+    Q_PROPERTY(qreal shear READ shear WRITE setShear)
+    Q_PROPERTY(qreal rotation READ rotation WRITE setRotation)
+    Q_PROPERTY(qreal scale READ scale WRITE setScale)
+    Q_PROPERTY(QString text READ text WRITE setText)
+    Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap)
+    Q_ENUMS(XFormType)
+
+public:
+    enum XFormType { VectorType, PixmapType, TextType };
+
+    XFormView(QWidget *parent);
+    void paint(QPainter *);
+    void drawVectorType(QPainter *painter);
+    void drawPixmapType(QPainter *painter);
+    void drawTextType(QPainter *painter);
+    QSize sizeHint() const { return QSize(500, 500); }
+
+    void mousePressEvent(QMouseEvent *e);
+    void resizeEvent(QResizeEvent *e);
+    HoverPoints *hoverPoints() { return pts; }
+
+    bool animation() const { return timer.isActive(); }
+    qreal shear() const { return m_shear; }
+    qreal scale() const { return m_scale; }
+    qreal rotation() const { return m_rotation; }
+    void setShear(qreal s);
+    void setScale(qreal s);
+    void setRotation(qreal r);
+
+    XFormType type() const;
+    QPixmap pixmap() const;
+    QString text() const;
+
+public slots:
+    void setAnimation(bool animate);
+    void updateCtrlPoints(const QPolygonF &);
+    void changeRotation(int rotation);
+    void changeScale(int scale);
+    void changeShear(int shear);
+
+    void setText(const QString &);
+    void setPixmap(const QPixmap &);
+    void setType(XFormType t);
+
+    void setVectorType();
+    void setPixmapType();
+    void setTextType();
+    void reset();
+
+signals:
+    void rotationChanged(int rotation);
+    void scaleChanged(int scale);
+    void shearChanged(int shear);
+
+protected:
+    void timerEvent(QTimerEvent *e);
+    void wheelEvent(QWheelEvent *);
+
+private:
+    QPolygonF ctrlPoints;
+    HoverPoints *pts;
+    qreal m_rotation;
+    qreal m_scale;
+    qreal m_shear;
+    XFormType m_type;
+    QPixmap m_pixmap;
+    QString m_text;
+    QBasicTimer timer;
+};
+
+class XFormWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    XFormWidget(QWidget *parent);
+
+private:
+    XFormView *view;
+    QLineEdit *textEditor;
+};
+
+#endif // XFORM_H
diff --git a/demos/affine/xform.html b/demos/affine/xform.html
new file mode 100644
index 0000000000..17325ac2a0
--- /dev/null
+++ b/demos/affine/xform.html
@@ -0,0 +1,23 @@
+<html>
+<center>
+<h2>Affine Transformations</h2>
+</center>
+
+<p>In this demo we demonstrate Qt's ability to perform affine transformations
+on painting operations.</p>
+
+<p>Transformations can be performed on any kind of graphics drawn using
+QPainter. The transformations used to display the vector graphics, images,
+and text can be adjusted in the following ways:</p>
+
+<ul>
+  <li>Dragging the red circle in the centre of each drawing moves it to a new
+      position.</li>
+  <li>Dragging the displaced red circle causes the current drawing to be
+      rotated about the central circle. Rotation can also be controlled with
+      the <b>Rotate</b> slider.</li>
+  <li>Scaling is controlled with the <b>Scale</b> slider.</li>
+  <li>Each drawing can be sheared with the <b>Shear</b> slider.</li>
+</ul>
+
+</html>
diff --git a/demos/arthurplugin/arthur_plugin.qrc b/demos/arthurplugin/arthur_plugin.qrc
new file mode 100644
index 0000000000..e5170e63c1
--- /dev/null
+++ b/demos/arthurplugin/arthur_plugin.qrc
@@ -0,0 +1,7 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/trolltech/arthurplugin">
+   <file>bg1.jpg</file>
+   <file>flower.jpg</file>
+   <file>flower_alpha.jpg</file>
+</qresource>
+</RCC>
diff --git a/demos/arthurplugin/arthurplugin.pro b/demos/arthurplugin/arthurplugin.pro
new file mode 100644
index 0000000000..e9eb1f3672
--- /dev/null
+++ b/demos/arthurplugin/arthurplugin.pro
@@ -0,0 +1,51 @@
+
+QTDIR       = $$QT_SOURCE_TREE
+
+CONFIG      += designer plugin
+TEMPLATE    = lib
+QTDIR_build:DESTDIR     = $$QT_BUILD_TREE/plugins/designer
+
+contains(QT_CONFIG, opengl) {
+	DEFINES += QT_OPENGL_SUPPORT
+	QT += opengl
+}
+
+SHARED_FOLDER = ../shared
+include(../shared/shared.pri)
+
+DEMO_DEFORM_DIR = ../deform
+DEMO_AFFINE_DIR = ../affine
+DEMO_GRADIENT_DIR = ../gradients
+DEMO_STROKE_DIR = ../pathstroke
+DEMO_COMPOSITION_DIR = ../composition
+
+INCLUDEPATH += $$DEMO_DEFORM_DIR $$DEMO_AFFINE_DIR $$DEMO_GRADIENT_DIR $$DEMO_STROKE_DIR $$DEMO_COMPOSITION_DIR
+
+SOURCES = plugin.cpp \
+	$$DEMO_COMPOSITION_DIR/composition.cpp \
+        $$DEMO_AFFINE_DIR/xform.cpp \
+        $$DEMO_DEFORM_DIR/pathdeform.cpp \
+        $$DEMO_GRADIENT_DIR/gradients.cpp \
+        $$DEMO_STROKE_DIR/pathstroke.cpp \
+
+
+HEADERS = \
+	$$DEMO_COMPOSITION_DIR/composition.h \
+        $$DEMO_AFFINE_DIR/xform.h \
+        $$DEMO_DEFORM_DIR/pathdeform.h \
+        $$DEMO_GRADIENT_DIR/gradients.h \
+        $$DEMO_STROKE_DIR/pathstroke.h \
+
+RESOURCES += arthur_plugin.qrc
+
+# install
+target.path = $$[QT_INSTALL_PLUGINS]/designer
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg *.png
+sources.path = $$[QT_INSTALL_DEMOS]/arthurplugin
+INSTALLS += target sources
+
+win32-msvc* {
+	QMAKE_CFLAGS += /Zm500
+	QMAKE_CXXFLAGS += /Zm500
+}
+
diff --git a/demos/arthurplugin/bg1.jpg b/demos/arthurplugin/bg1.jpg
new file mode 100644
index 0000000000..dfc7cee6ad
--- /dev/null
+++ b/demos/arthurplugin/bg1.jpg
diff --git a/demos/arthurplugin/flower.jpg b/demos/arthurplugin/flower.jpg
new file mode 100644
index 0000000000..f8e022c98c
--- /dev/null
+++ b/demos/arthurplugin/flower.jpg
diff --git a/demos/arthurplugin/flower_alpha.jpg b/demos/arthurplugin/flower_alpha.jpg
new file mode 100644
index 0000000000..6a3c2a02ef
--- /dev/null
+++ b/demos/arthurplugin/flower_alpha.jpg
diff --git a/demos/arthurplugin/plugin.cpp b/demos/arthurplugin/plugin.cpp
new file mode 100644
index 0000000000..c26aae792b
--- /dev/null
+++ b/demos/arthurplugin/plugin.cpp
@@ -0,0 +1,296 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtDesigner/QDesignerContainerExtension>
+#include <QtDesigner/QDesignerCustomWidgetInterface>
+
+#include <QtCore/qplugin.h>
+#include <QtGui/QIcon>
+#include <QtGui/QPixmap>
+
+#include "xform.h"
+#include "pathdeform.h"
+#include "gradients.h"
+#include "pathstroke.h"
+#include "hoverpoints.h"
+#include "composition.h"
+
+QT_FORWARD_DECLARE_CLASS(QDesignerFormEditorInterface)
+
+// Specify "text" to be a singleline property (no richtext)
+static inline QString textSingleLinePropertyDeclaration(const QString &className)
+{
+    QString rc = QLatin1String(
+            "<customwidgets>\n"
+            "  <customwidget>\n"
+            "    <class>");
+    rc += className;
+    rc += QLatin1String("</class>\n"
+            "    <propertyspecifications>\n"
+            "      <stringpropertyspecification name=\"text\" type=\"singleline\"/>\n"
+            "    </propertyspecifications>\n"
+            "  </customwidget>\n"
+            "</customwidgets>\n");
+    return rc;
+}
+
+// Plain XML for a custom widget
+static inline QString customWidgetDomXml(const QString &className,
+                                         const QString &customSection = QString())
+{
+    QString rc = QLatin1String("<ui language=\"c++\"><widget class=\"");
+    rc += className;
+    rc += QLatin1String("\" name=\"");
+    QString objectName = className;
+    objectName[0] = objectName.at(0).toLower();
+    rc += objectName;
+    rc += QLatin1String("\"/>");
+    rc += customSection;
+    rc += QLatin1String("</ui>");
+    return rc;
+}
+
+class PathDeformRendererEx : public PathDeformRenderer
+{
+    Q_OBJECT
+public:
+    PathDeformRendererEx(QWidget *parent) : PathDeformRenderer(parent) { }
+    QSize sizeHint() const { return QSize(300, 200); }
+};
+
+class DemoPlugin : public QDesignerCustomWidgetInterface
+{
+    Q_INTERFACES(QDesignerCustomWidgetInterface)
+
+protected:
+    explicit DemoPlugin(const QString &className, const QString &customSection = QString());
+
+public:
+    QString name() const { return m_className; }
+    bool isContainer() const { return false; }
+    bool isInitialized() const { return m_initialized; }
+    QIcon icon() const { return QIcon(); }
+    QString codeTemplate() const { return QString(); }
+    QString whatsThis() const { return QString(); }
+    QString toolTip() const { return QString(); }
+    QString group() const { return "Arthur Widgets [Demo]"; }
+    void initialize(QDesignerFormEditorInterface *)
+    {
+        if (m_initialized)
+            return;
+        m_initialized = true;
+    }
+    QString domXml() const { return m_domXml; }
+
+private:
+    const QString m_className;
+    const QString m_domXml;
+    bool m_initialized;
+};
+
+DemoPlugin::DemoPlugin(const QString &className, const QString &customSection) :
+    m_className(className),
+    m_domXml(customWidgetDomXml(className, customSection)),
+    m_initialized(false)
+{
+}
+
+class DeformPlugin : public QObject, public DemoPlugin
+{
+    Q_OBJECT
+
+public:
+    explicit DeformPlugin(QObject *parent = 0);
+    QString includeFile() const { return QLatin1String("deform.h"); }
+
+    QWidget *createWidget(QWidget *parent)
+    {
+        PathDeformRenderer *deform = new PathDeformRendererEx(parent);
+        deform->setRadius(70);
+        deform->setAnimated(false);
+        deform->setFontSize(20);
+        deform->setText(QLatin1String("Arthur Widgets Demo"));
+
+        return deform;
+    }
+};
+
+DeformPlugin::DeformPlugin(QObject *parent) :
+    QObject(parent),
+    DemoPlugin(QLatin1String("PathDeformRendererEx"),
+               textSingleLinePropertyDeclaration(QLatin1String("PathDeformRendererEx")))
+{
+}
+
+class XFormRendererEx : public XFormView
+{
+    Q_OBJECT
+public:
+    XFormRendererEx(QWidget *parent) : XFormView(parent) {}
+    QSize sizeHint() const { return QSize(300, 200); }
+};
+
+class XFormPlugin : public QObject, public DemoPlugin
+{
+    Q_OBJECT
+public:
+    explicit XFormPlugin(QObject *parent = 0);
+    QString includeFile() const { return QLatin1String("xform.h"); }
+
+    QWidget *createWidget(QWidget *parent)
+    {
+        XFormRendererEx *xform = new XFormRendererEx(parent);
+        xform->setText(QLatin1String("Qt - Hello World!!"));
+        xform->setPixmap(QPixmap(QLatin1String(":/trolltech/arthurplugin/bg1.jpg")));
+        return xform;
+    }
+};
+
+XFormPlugin::XFormPlugin(QObject *parent) :
+    QObject(parent),
+    DemoPlugin(QLatin1String("XFormRendererEx"),
+               textSingleLinePropertyDeclaration(QLatin1String("XFormRendererEx")))
+{
+}
+
+class GradientEditorPlugin : public QObject, public DemoPlugin
+{
+    Q_OBJECT
+public:
+    explicit GradientEditorPlugin(QObject *parent = 0) : QObject(parent), DemoPlugin(QLatin1String("GradientEditor")) { }
+    QString includeFile() const { return "gradients.h"; }
+
+    QWidget *createWidget(QWidget *parent)
+    {
+        GradientEditor *editor = new GradientEditor(parent);
+        return editor;
+    }
+};
+
+class GradientRendererEx : public GradientRenderer
+{
+    Q_OBJECT
+public:
+    GradientRendererEx(QWidget *p) : GradientRenderer(p) { }
+    QSize sizeHint() const { return QSize(300, 200); }
+};
+
+class GradientRendererPlugin : public QObject, public DemoPlugin
+{
+    Q_OBJECT
+public:
+    GradientRendererPlugin(QObject *parent = 0) : QObject(parent), DemoPlugin(QLatin1String("GradientRendererEx")) { }
+    QString includeFile() const { return QLatin1String("gradients.h"); }
+
+    QWidget *createWidget(QWidget *parent)
+    {
+        GradientRenderer *renderer = new GradientRendererEx(parent);
+        renderer->setConicalGradient();
+        return renderer;
+    }
+};
+
+class PathStrokeRendererEx : public PathStrokeRenderer
+{
+    Q_OBJECT
+public:
+    explicit PathStrokeRendererEx(QWidget *p) : PathStrokeRenderer(p) { }
+    QSize sizeHint() const { return QSize(300, 200); }
+};
+
+class StrokeRenderPlugin : public QObject, public DemoPlugin
+{
+    Q_OBJECT
+public:
+    explicit StrokeRenderPlugin(QObject *parent = 0) : QObject(parent), DemoPlugin(QLatin1String("PathStrokeRendererEx")) { }
+    QString includeFile() const { return QLatin1String("pathstroke.h"); }
+
+    QWidget *createWidget(QWidget *parent)
+    {
+        PathStrokeRenderer *stroke = new PathStrokeRendererEx(parent);
+        return stroke;
+    }
+};
+
+
+class CompositionModePlugin : public QObject, public DemoPlugin
+{
+    Q_OBJECT
+public:
+    explicit CompositionModePlugin(QObject *parent = 0) : QObject(parent), DemoPlugin(QLatin1String("CompositionRenderer")) { }
+    QString includeFile() const { return QLatin1String("composition.h"); }
+
+    QWidget *createWidget(QWidget *parent)
+    {
+        CompositionRenderer *renderer = new CompositionRenderer(parent);
+        renderer->setAnimationEnabled(false);
+        return renderer;
+    }
+};
+
+
+class ArthurPlugins : public QObject, public QDesignerCustomWidgetCollectionInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(QDesignerCustomWidgetCollectionInterface)
+
+public:
+    explicit ArthurPlugins(QObject *parent = 0);
+    QList<QDesignerCustomWidgetInterface*> customWidgets() const { return m_plugins; }
+
+private:
+    QList<QDesignerCustomWidgetInterface *> m_plugins;
+};
+
+ArthurPlugins::ArthurPlugins(QObject *parent) :
+    QObject(parent)
+{
+    m_plugins << new DeformPlugin(this)
+              << new XFormPlugin(this)
+              << new GradientEditorPlugin(this)
+              << new GradientRendererPlugin(this)
+              << new StrokeRenderPlugin(this)
+              << new CompositionModePlugin(this);
+}
+
+#include "plugin.moc"
+
+Q_EXPORT_PLUGIN2(ArthurPlugins, ArthurPlugins)
diff --git a/demos/books/bookdelegate.cpp b/demos/books/bookdelegate.cpp
new file mode 100644
index 0000000000..1322fd65dc
--- /dev/null
+++ b/demos/books/bookdelegate.cpp
@@ -0,0 +1,126 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "bookdelegate.h"
+
+#include <QtGui>
+
+BookDelegate::BookDelegate(QObject *parent)
+    : QSqlRelationalDelegate(parent), star(QPixmap(":images/star.png"))
+{
+}
+
+void BookDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
+                           const QModelIndex &index) const
+{
+    if (index.column() != 5) {
+        QStyleOptionViewItemV3 opt = option;
+        opt.rect.adjust(0, 0, -1, -1); // since we draw the grid ourselves
+        QSqlRelationalDelegate::paint(painter, opt, index);
+    } else {
+        const QAbstractItemModel *model = index.model();
+        QPalette::ColorGroup cg = (option.state & QStyle::State_Enabled) ?
+            (option.state & QStyle::State_Active) ? QPalette::Normal : QPalette::Inactive : QPalette::Disabled;
+
+        if (option.state & QStyle::State_Selected)
+            painter->fillRect(option.rect, option.palette.color(cg, QPalette::Highlight));
+
+        int rating = model->data(index, Qt::DisplayRole).toInt();
+        int width = star.width();
+        int height = star.height();
+        int x = option.rect.x();
+        int y = option.rect.y() + (option.rect.height() / 2) - (height / 2);
+        for (int i = 0; i < rating; ++i) {
+            painter->drawPixmap(x, y, star);
+            x += width;
+        }
+        drawFocus(painter, option, option.rect.adjusted(0, 0, -1, -1)); // since we draw the grid ourselves
+    }
+
+    QPen pen = painter->pen();
+    painter->setPen(option.palette.color(QPalette::Mid));
+    painter->drawLine(option.rect.bottomLeft(), option.rect.bottomRight());
+    painter->drawLine(option.rect.topRight(), option.rect.bottomRight());
+    painter->setPen(pen);
+}
+
+QSize BookDelegate::sizeHint(const QStyleOptionViewItem &option,
+                                 const QModelIndex &index) const
+{
+    if (index.column() == 5)
+        return QSize(5 * star.width(), star.height()) + QSize(1, 1);
+
+    return QSqlRelationalDelegate::sizeHint(option, index) + QSize(1, 1); // since we draw the grid ourselves
+}
+
+bool BookDelegate::editorEvent(QEvent *event, QAbstractItemModel *model,
+                               const QStyleOptionViewItem &option,
+                               const QModelIndex &index)
+{
+    if (index.column() != 5)
+        return QSqlRelationalDelegate::editorEvent(event, model, option, index);
+
+    if (event->type() == QEvent::MouseButtonPress) {
+        QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
+        int stars = qBound(0, int(0.7 + qreal(mouseEvent->pos().x()
+            - option.rect.x()) / star.width()), 5);
+        model->setData(index, QVariant(stars));
+        return false; //so that the selection can change
+    }
+
+    return true;
+}
+
+QWidget *BookDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option,
+                                    const QModelIndex &index) const
+{
+    if (index.column() != 4)
+        return QSqlRelationalDelegate::createEditor(parent, option, index);
+
+    // for editing the year, return a spinbox with a range from -1000 to 2100.
+    QSpinBox *sb = new QSpinBox(parent);
+    sb->setFrame(false);
+    sb->setMaximum(2100);
+    sb->setMinimum(-1000);
+
+    return sb;
+}
+
diff --git a/demos/books/bookdelegate.h b/demos/books/bookdelegate.h
new file mode 100644
index 0000000000..fb323356d0
--- /dev/null
+++ b/demos/books/bookdelegate.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BOOKDELEGATE_H
+#define BOOKDELEGATE_H
+
+#include <QModelIndex>
+#include <QPixmap>
+#include <QSize>
+#include <QSqlRelationalDelegate>
+
+QT_FORWARD_DECLARE_CLASS(QPainter)
+
+class BookDelegate : public QSqlRelationalDelegate
+{
+public:
+    BookDelegate(QObject *parent);
+
+    void paint(QPainter *painter, const QStyleOptionViewItem &option,
+               const QModelIndex &index) const;
+
+    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
+
+    bool editorEvent(QEvent *event, QAbstractItemModel *model,
+                     const QStyleOptionViewItem &option,
+                     const QModelIndex &index);
+
+    QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
+                                        const QModelIndex &index) const;
+
+private:
+    QPixmap star;
+};
+
+#endif
diff --git a/demos/books/books.pro b/demos/books/books.pro
new file mode 100644
index 0000000000..a2cd33f86e
--- /dev/null
+++ b/demos/books/books.pro
@@ -0,0 +1,21 @@
+TEMPLATE = app
+INCLUDEPATH += .
+
+HEADERS     = bookdelegate.h bookwindow.h initdb.h
+RESOURCES   = books.qrc
+SOURCES     = bookdelegate.cpp main.cpp bookwindow.cpp
+FORMS       = bookwindow.ui
+
+QT += sql
+
+target.path = $$[QT_INSTALL_DEMOS]/books
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images
+sources.path = $$[QT_INSTALL_DEMOS]/books
+INSTALLS += target sources
+
+wince*: {
+    CONFIG(debug, debug|release):sqlPlugins.sources = $$QT_BUILD_TREE/plugins/sqldrivers/*d4.dll
+    CONFIG(release, debug|release):sqlPlugins.sources = $$QT_BUILD_TREE/plugins/sqldrivers/*[^d]4.dll
+    sqlPlugins.path = sqldrivers
+    DEPLOYMENT += sqlPlugins
+}
\ No newline at end of file
diff --git a/demos/books/books.qrc b/demos/books/books.qrc
new file mode 100644
index 0000000000..342638ecb0
--- /dev/null
+++ b/demos/books/books.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+  <file>images/star.png</file>
+</qresource>
+</RCC>
diff --git a/demos/books/bookwindow.cpp b/demos/books/bookwindow.cpp
new file mode 100644
index 0000000000..e73f727dd5
--- /dev/null
+++ b/demos/books/bookwindow.cpp
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "bookwindow.h"
+#include "bookdelegate.h"
+#include "initdb.h"
+
+#include <QtSql>
+
+BookWindow::BookWindow()
+{
+    ui.setupUi(this);
+
+    if (!QSqlDatabase::drivers().contains("QSQLITE"))
+        QMessageBox::critical(this, "Unable to load database", "This demo needs the SQLITE driver");
+
+    // initialize the database
+    QSqlError err = initDb();
+    if (err.type() != QSqlError::NoError) {
+        showError(err);
+        return;
+    }
+
+    // Create the data model
+    model = new QSqlRelationalTableModel(ui.bookTable);
+    model->setEditStrategy(QSqlTableModel::OnManualSubmit);
+    model->setTable("books");
+
+    // Remeber the indexes of the columns
+    authorIdx = model->fieldIndex("author");
+    genreIdx = model->fieldIndex("genre");
+
+    // Set the relations to the other database tables
+    model->setRelation(authorIdx, QSqlRelation("authors", "id", "name"));
+    model->setRelation(genreIdx, QSqlRelation("genres", "id", "name"));
+
+    // Set the localized header captions
+    model->setHeaderData(authorIdx, Qt::Horizontal, tr("Author Name"));
+    model->setHeaderData(genreIdx, Qt::Horizontal, tr("Genre"));
+    model->setHeaderData(model->fieldIndex("title"), Qt::Horizontal, tr("Title"));
+    model->setHeaderData(model->fieldIndex("year"), Qt::Horizontal, tr("Year"));
+    model->setHeaderData(model->fieldIndex("rating"), Qt::Horizontal, tr("Rating"));
+
+    // Populate the model
+    if (!model->select()) {
+        showError(model->lastError());
+        return;
+    }
+
+    // Set the model and hide the ID column
+    ui.bookTable->setModel(model);
+    ui.bookTable->setItemDelegate(new BookDelegate(ui.bookTable));
+    ui.bookTable->setColumnHidden(model->fieldIndex("id"), true);
+    ui.bookTable->setSelectionMode(QAbstractItemView::SingleSelection);
+
+    // Initialize the Author combo box
+    ui.authorEdit->setModel(model->relationModel(authorIdx));
+    ui.authorEdit->setModelColumn(model->relationModel(authorIdx)->fieldIndex("name"));
+
+    ui.genreEdit->setModel(model->relationModel(genreIdx));
+    ui.genreEdit->setModelColumn(model->relationModel(genreIdx)->fieldIndex("name"));
+
+    QDataWidgetMapper *mapper = new QDataWidgetMapper(this);
+    mapper->setModel(model);
+    mapper->setItemDelegate(new BookDelegate(this));
+    mapper->addMapping(ui.titleEdit, model->fieldIndex("title"));
+    mapper->addMapping(ui.yearEdit, model->fieldIndex("year"));
+    mapper->addMapping(ui.authorEdit, authorIdx);
+    mapper->addMapping(ui.genreEdit, genreIdx);
+    mapper->addMapping(ui.ratingEdit, model->fieldIndex("rating"));
+
+    connect(ui.bookTable->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),
+            mapper, SLOT(setCurrentModelIndex(QModelIndex)));
+
+    ui.bookTable->setCurrentIndex(model->index(0, 0));
+}
+
+void BookWindow::showError(const QSqlError &err)
+{
+    QMessageBox::critical(this, "Unable to initialize Database",
+                "Error initializing database: " + err.text());
+}
+
diff --git a/demos/books/bookwindow.h b/demos/books/bookwindow.h
new file mode 100644
index 0000000000..3cc69d0694
--- /dev/null
+++ b/demos/books/bookwindow.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BOOKWINDOW_H
+#define BOOKWINDOW_H
+
+#include <QtGui>
+#include <QtSql>
+
+#include "ui_bookwindow.h"
+
+
+class BookWindow: public QMainWindow
+{
+    Q_OBJECT
+public:
+    BookWindow();
+
+private:
+    void showError(const QSqlError &err);
+    Ui::BookWindow ui;
+    QSqlRelationalTableModel *model;
+    int authorIdx, genreIdx;
+};
+
+#endif
diff --git a/demos/books/bookwindow.ui b/demos/books/bookwindow.ui
new file mode 100644
index 0000000000..659d324564
--- /dev/null
+++ b/demos/books/bookwindow.ui
@@ -0,0 +1,149 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>BookWindow</class>
+ <widget class="QMainWindow" name="BookWindow" >
+ <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>601</width>
+    <height>420</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Books</string>
+  </property>
+  <widget class="QWidget" name="centralWidget" >
+   <layout class="QVBoxLayout" >
+    <property name="margin" >
+     <number>9</number>
+    </property>
+    <property name="spacing" >
+     <number>6</number>
+    </property>
+    <item>
+     <widget class="QGroupBox" name="groupBox" >
+      <property name="title" >
+       <string>Books</string>
+      </property>
+      <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QTableView" name="bookTable" >
+         <property name="selectionBehavior" >
+          <enum>QAbstractItemView::SelectRows</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_2" >
+         <property name="title" >
+          <string>Details</string>
+         </property>
+         <layout class="QFormLayout" >
+	   <item row="0" column="0" >
+           <widget class="QLabel" name="label_5" >
+            <property name="text" >
+             <string>&lt;b>Title:&lt;/b></string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" >
+           <widget class="QLineEdit" name="titleEdit" >
+            <property name="enabled" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="label_2_2_2_2" >
+            <property name="text" >
+             <string>&lt;b>Author: &lt;/b></string>
+            </property>
+           </widget>
+	    </item>
+	     <item row="1" column="1" >
+           <widget class="QComboBox" name="authorEdit" >
+            <property name="enabled" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>	   
+	  <item row="2" column="0" >
+           <widget class="QLabel" name="label_3" >
+            <property name="text" >
+             <string>&lt;b>Genre:&lt;/b></string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1" >
+           <widget class="QComboBox" name="genreEdit" >
+            <property name="enabled" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0" >
+           <widget class="QLabel" name="label_4" >
+            <property name="text" >
+             <string>&lt;b>Year:&lt;/b></string>
+            </property>
+           </widget>
+          </item>       
+          <item row="3" column="1" >
+           <widget class="QSpinBox" name="yearEdit" >
+            <property name="enabled" >
+             <bool>true</bool>
+            </property>
+            <property name="prefix" >
+             <string/>
+            </property>
+            <property name="maximum" >
+             <number>2100</number>
+            </property>
+            <property name="minimum" >
+             <number>-1000</number>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0" >
+           <widget class="QLabel" name="label" >
+            <property name="text" >
+             <string>&lt;b>Rating:&lt;/b></string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1" >
+           <widget class="QSpinBox" name="ratingEdit" >
+            <property name="maximum" >
+             <number>5</number>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>bookTable</tabstop>
+  <tabstop>titleEdit</tabstop>
+  <tabstop>authorEdit</tabstop>
+  <tabstop>genreEdit</tabstop>
+  <tabstop>yearEdit</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/demos/books/images/star.png b/demos/books/images/star.png
new file mode 100644
index 0000000000..87f4464bd5
--- /dev/null
+++ b/demos/books/images/star.png
diff --git a/demos/books/initdb.h b/demos/books/initdb.h
new file mode 100644
index 0000000000..f9a94b7c12
--- /dev/null
+++ b/demos/books/initdb.h
@@ -0,0 +1,125 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef INITDB_H
+#define INITDB_H
+
+#include <QtSql>
+
+void addBook(QSqlQuery &q, const QString &title, int year, const QVariant &authorId,
+             const QVariant &genreId, int rating)
+{
+    q.addBindValue(title);
+    q.addBindValue(year);
+    q.addBindValue(authorId);
+    q.addBindValue(genreId);
+    q.addBindValue(rating);
+    q.exec();
+}
+
+QVariant addGenre(QSqlQuery &q, const QString &name)
+{
+    q.addBindValue(name);
+    q.exec();
+    return q.lastInsertId();
+}
+
+QVariant addAuthor(QSqlQuery &q, const QString &name, const QDate &birthdate)
+{
+    q.addBindValue(name);
+    q.addBindValue(birthdate);
+    q.exec();
+    return q.lastInsertId();
+}
+
+QSqlError initDb()
+{
+    QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
+    db.setDatabaseName(":memory:");
+
+    if (!db.open())
+        return db.lastError();
+
+    QStringList tables = db.tables();
+    if (tables.contains("books", Qt::CaseInsensitive)
+        && tables.contains("authors", Qt::CaseInsensitive))
+        return QSqlError();
+
+    QSqlQuery q;
+    if (!q.exec(QLatin1String("create table books(id integer primary key, title varchar, author integer, genre integer, year integer, rating integer)")))
+        return q.lastError();
+    if (!q.exec(QLatin1String("create table authors(id integer primary key, name varchar, birthdate date)")))
+        return q.lastError();
+    if (!q.exec(QLatin1String("create table genres(id integer primary key, name varchar)")))
+        return q.lastError();
+
+    if (!q.prepare(QLatin1String("insert into authors(name, birthdate) values(?, ?)")))
+        return q.lastError();
+    QVariant asimovId = addAuthor(q, QLatin1String("Isaac Asimov"), QDate(1920, 2, 1));
+    QVariant greeneId = addAuthor(q, QLatin1String("Graham Greene"), QDate(1904, 10, 2));
+    QVariant pratchettId = addAuthor(q, QLatin1String("Terry Pratchett"), QDate(1948, 4, 28));
+
+    if (!q.prepare(QLatin1String("insert into genres(name) values(?)")))
+        return q.lastError();
+    QVariant sfiction = addGenre(q, QLatin1String("Science Fiction"));
+    QVariant fiction = addGenre(q, QLatin1String("Fiction"));
+    QVariant fantasy = addGenre(q, QLatin1String("Fantasy"));
+
+    if (!q.prepare(QLatin1String("insert into books(title, year, author, genre, rating) values(?, ?, ?, ?, ?)")))
+        return q.lastError();
+    addBook(q, QLatin1String("Foundation"), 1951, asimovId, sfiction, 3);
+    addBook(q, QLatin1String("Foundation and Empire"), 1952, asimovId, sfiction, 4);
+    addBook(q, QLatin1String("Second Foundation"), 1953, asimovId, sfiction, 3);
+    addBook(q, QLatin1String("Foundation's Edge"), 1982, asimovId, sfiction, 3);
+    addBook(q, QLatin1String("Foundation and Earth"), 1986, asimovId, sfiction, 4);
+    addBook(q, QLatin1String("Prelude to Foundation"), 1988, asimovId, sfiction, 3);
+    addBook(q, QLatin1String("Forward the Foundation"), 1993, asimovId, sfiction, 3);
+    addBook(q, QLatin1String("The Power and the Glory"), 1940, greeneId, fiction, 4);
+    addBook(q, QLatin1String("The Third Man"), 1950, greeneId, fiction, 5);
+    addBook(q, QLatin1String("Our Man in Havana"), 1958, greeneId, fiction, 4);
+    addBook(q, QLatin1String("Guards! Guards!"), 1989, pratchettId, fantasy, 3);
+    addBook(q, QLatin1String("Night Watch"), 2002, pratchettId, fantasy, 3);
+    addBook(q, QLatin1String("Going Postal"), 2004, pratchettId, fantasy, 3);
+
+    return QSqlError();
+}
+
+#endif
diff --git a/demos/books/main.cpp b/demos/books/main.cpp
new file mode 100644
index 0000000000..f3ae325a69
--- /dev/null
+++ b/demos/books/main.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "bookwindow.h"
+
+#include <QtGui>
+
+int main(int argc, char * argv[])
+{
+    Q_INIT_RESOURCE(books);
+
+    QApplication app(argc, argv);
+
+    BookWindow win;
+    win.show();
+
+    return app.exec();
+}
diff --git a/demos/boxes/3rdparty/fbm.c b/demos/boxes/3rdparty/fbm.c
new file mode 100644
index 0000000000..98eb87a33b
--- /dev/null
+++ b/demos/boxes/3rdparty/fbm.c
@@ -0,0 +1,207 @@
+/*****************************************************************
+
+  Implementation of the fractional Brownian motion algorithm. These
+  functions were originally the work of F. Kenton Musgrave.
+  For documentation of the different functions please refer to the
+  book: 
+  "Texturing and modeling: a procedural approach"
+  by David S. Ebert et. al.
+
+******************************************************************/
+
+#if defined (_MSC_VER)
+#include <qglobal.h>
+#endif
+
+#include <time.h>
+#include <stdlib.h>
+#include "fbm.h"
+
+#if defined(Q_CC_MSVC)
+#pragma warning(disable:4244)
+#endif
+
+/* Definitions used by the noise2() functions */
+
+//#define B 0x100
+//#define BM 0xff
+#define B 0x20
+#define BM 0x1f
+
+#define N 0x1000
+#define NP 12   /* 2^N */
+#define NM 0xfff
+
+static int   p[B + B + 2];
+static float g3[B + B + 2][3];
+static float g2[B + B + 2][2];
+static float g1[B + B + 2];
+static int   start = 1;
+
+static void init(void);
+
+#define s_curve(t) ( t * t * (3. - 2. * t) )
+
+#define lerp(t, a, b) ( a + t * (b - a) )
+
+#define setup(i,b0,b1,r0,r1)\
+	t = vec[i] + N;\
+	b0 = ((int)t) & BM;\
+	b1 = (b0+1) & BM;\
+	r0 = t - (int)t;\
+	r1 = r0 - 1.;
+#define at3(rx,ry,rz) ( rx * q[0] + ry * q[1] + rz * q[2] )
+
+/* Fractional Brownian Motion function */
+
+double fBm( Vector point, double H, double lacunarity, double octaves,
+	    int init )
+{
+
+    double            value, frequency, remainder;
+    int               i;
+    static double     exponent_array[10];
+    float             vec[3];
+
+    /* precompute and store spectral weights */
+    if ( init ) {
+	start = 1;
+	srand( time(0) );
+	/* seize required memory for exponent_array */
+	frequency = 1.0;
+	for (i=0; i<=octaves; i++) {
+	    /* compute weight for each frequency */
+	    exponent_array[i] = pow( frequency, -H );
+	    frequency *= lacunarity;
+	}
+    }
+
+    value = 0.0;            /* initialize vars to proper values */
+    frequency = 1.0;
+    vec[0]=point.x;
+    vec[1]=point.y;
+    vec[2]=point.z;
+
+
+    /* inner loop of spectral construction */
+    for (i=0; i<octaves; i++) {
+	/* value += noise3( vec ) * exponent_array[i];*/
+	value += noise3( vec ) * exponent_array[i];
+	vec[0] *= lacunarity;
+	vec[1] *= lacunarity;
+	vec[2] *= lacunarity;
+    } /* for */
+
+    remainder = octaves - (int)octaves;
+    if ( remainder )      /* add in ``octaves''  remainder */
+	/* ``i''  and spatial freq. are preset in loop above */
+	value += remainder * noise3( vec ) * exponent_array[i];
+
+    return( value );
+
+} /* fBm() */
+
+
+float noise3(float vec[3])
+{
+    int bx0, bx1, by0, by1, bz0, bz1, b00, b10, b01, b11;
+    float rx0, rx1, ry0, ry1, rz0, rz1, *q, sy, sz, a, b, c, d, t, u, v;
+    register int i, j;
+
+    if (start) {
+	start = 0;
+	init();
+    }
+
+    setup(0, bx0,bx1, rx0,rx1);
+    setup(1, by0,by1, ry0,ry1);
+    setup(2, bz0,bz1, rz0,rz1);
+
+    i = p[ bx0 ];
+    j = p[ bx1 ];
+
+    b00 = p[ i + by0 ];
+    b10 = p[ j + by0 ];
+    b01 = p[ i + by1 ];
+    b11 = p[ j + by1 ];
+
+    t  = s_curve(rx0);
+    sy = s_curve(ry0);
+    sz = s_curve(rz0);
+
+
+    q = g3[ b00 + bz0 ] ; u = at3(rx0,ry0,rz0);
+    q = g3[ b10 + bz0 ] ; v = at3(rx1,ry0,rz0);
+    a = lerp(t, u, v);
+
+    q = g3[ b01 + bz0 ] ; u = at3(rx0,ry1,rz0);
+    q = g3[ b11 + bz0 ] ; v = at3(rx1,ry1,rz0);
+    b = lerp(t, u, v);
+
+    c = lerp(sy, a, b);
+
+    q = g3[ b00 + bz1 ] ; u = at3(rx0,ry0,rz1);
+    q = g3[ b10 + bz1 ] ; v = at3(rx1,ry0,rz1);
+    a = lerp(t, u, v);
+
+    q = g3[ b01 + bz1 ] ; u = at3(rx0,ry1,rz1);
+    q = g3[ b11 + bz1 ] ; v = at3(rx1,ry1,rz1);
+    b = lerp(t, u, v);
+
+    d = lerp(sy, a, b);
+
+    return lerp(sz, c, d);
+}
+
+static void normalize2(float v[2])
+{
+    float s;
+
+    s = sqrt(v[0] * v[0] + v[1] * v[1]);
+    v[0] = v[0] / s;
+    v[1] = v[1] / s;
+}
+
+static void normalize3(float v[3])
+{
+    float s;
+
+    s = sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
+    v[0] = v[0] / s;
+    v[1] = v[1] / s;
+    v[2] = v[2] / s;
+}
+
+static void init(void)
+{
+    int i, j, k;
+    
+    for (i = 0 ; i < B ; i++) {
+	p[i] = i;
+
+	g1[i] = (float)((rand() % (B + B)) - B) / B;
+
+	for (j = 0 ; j < 2 ; j++)
+	    g2[i][j] = (float)((rand() % (B + B)) - B) / B;
+	normalize2(g2[i]);
+
+	for (j = 0 ; j < 3 ; j++)
+	    g3[i][j] = (float)((rand() % (B + B)) - B) / B;
+	normalize3(g3[i]);
+    }
+
+    while (--i) {
+	k = p[i];
+	p[i] = p[j = rand() % B];
+	p[j] = k;
+    }
+
+    for (i = 0 ; i < B + 2 ; i++) {
+	p[B + i] = p[i];
+	g1[B + i] = g1[i];
+	for (j = 0 ; j < 2 ; j++)
+	    g2[B + i][j] = g2[i][j];
+	for (j = 0 ; j < 3 ; j++)
+	    g3[B + i][j] = g3[i][j];
+    }
+}
diff --git a/demos/boxes/3rdparty/fbm.h b/demos/boxes/3rdparty/fbm.h
new file mode 100644
index 0000000000..b8a4a99ae4
--- /dev/null
+++ b/demos/boxes/3rdparty/fbm.h
@@ -0,0 +1,40 @@
+/*****************************************************************
+
+  Prototypes for the fractional Brownian motion algorithm. These
+  functions were originally the work of F. Kenton Musgrave.  For
+  documentation of the different functions please refer to the book:
+  "Texturing and modeling: a procedural approach"
+  by David S. Ebert et. al.
+  
+******************************************************************/
+
+#ifndef _fbm_h
+#define _fbm_h
+
+#include  <math.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//#define TRUE    1
+//#define FALSE   0
+
+typedef struct {
+    double x;
+    double y;
+    double z;
+} Vector;
+    
+float noise3(float vec[]);
+double fBm( Vector point, double H, double lacunarity, double octaves, 
+	    int init );
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+
diff --git a/demos/boxes/basic.fsh b/demos/boxes/basic.fsh
new file mode 100644
index 0000000000..06ef24a047
--- /dev/null
+++ b/demos/boxes/basic.fsh
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+varying vec3 position, normal;
+varying vec4 specular, ambient, diffuse, lightDirection;
+
+uniform sampler2D tex;
+uniform vec4 basicColor;
+
+void main()
+{
+    vec3 N = normalize(normal);
+    // assume directional light
+
+    gl_MaterialParameters M = gl_FrontMaterial;
+
+    float NdotL = dot(N, lightDirection.xyz);
+    float RdotL = dot(reflect(normalize(position), N), lightDirection.xyz);
+
+    vec3 absN = abs(gl_TexCoord[1].xyz);
+    vec3 texCoord;
+    if (absN.x > absN.y && absN.x > absN.z)
+        texCoord = gl_TexCoord[1].yzx;
+    else if (absN.y > absN.z)
+        texCoord = gl_TexCoord[1].zxy;
+    else
+        texCoord = gl_TexCoord[1].xyz;
+    texCoord.y *= -sign(texCoord.z);
+    texCoord += 0.5;
+
+    vec4 texColor = texture2D(tex, texCoord.xy);
+    vec4 unlitColor = gl_Color * mix(basicColor, vec4(texColor.xyz, 1.0), texColor.w);
+    gl_FragColor = (ambient + diffuse * max(NdotL, 0.0)) * unlitColor +
+                    M.specular * specular * pow(max(RdotL, 0.0), M.shininess);
+}
diff --git a/demos/boxes/basic.vsh b/demos/boxes/basic.vsh
new file mode 100644
index 0000000000..5a02df2f68
--- /dev/null
+++ b/demos/boxes/basic.vsh
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+varying vec3 position, normal;
+varying vec4 specular, ambient, diffuse, lightDirection;
+
+uniform mat4 view;
+
+void main()
+{	
+    gl_TexCoord[0] = gl_MultiTexCoord0;
+    gl_TexCoord[1] = gl_Vertex;
+    specular = gl_LightSource[0].specular;
+    ambient = gl_LightSource[0].ambient;
+    diffuse = gl_LightSource[0].diffuse;
+    lightDirection = view * gl_LightSource[0].position;
+
+    normal = gl_NormalMatrix * gl_Normal;
+    position = (gl_ModelViewMatrix * gl_Vertex).xyz;
+
+    gl_FrontColor = gl_Color;
+    gl_Position = ftransform();
+}
diff --git a/demos/boxes/boxes.pro b/demos/boxes/boxes.pro
new file mode 100644
index 0000000000..6c1a33156c
--- /dev/null
+++ b/demos/boxes/boxes.pro
@@ -0,0 +1,50 @@
+######################################################################
+# Automatically generated by qmake (2.01a) ma 3. nov 17:33:30 2008
+######################################################################
+
+TEMPLATE = app
+TARGET =
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+HEADERS += 3rdparty/fbm.h \
+           glbuffers.h \
+           glextensions.h \
+           glshaders.h \
+           gltrianglemesh.h \
+           qtbox.h \
+           roundedbox.h \
+           scene.h \
+           trackball.h \
+           vector.h
+SOURCES += 3rdparty/fbm.c \
+           glbuffers.cpp \
+           glextensions.cpp \
+           glshaders.cpp \
+           main.cpp \
+           qtbox.cpp \
+           roundedbox.cpp \
+           scene.cpp \
+           trackball.cpp
+
+RESOURCES += boxes.qrc
+
+QT += opengl
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/boxes
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg *.png *.fsh *.vsh *.par
+sources.files -= 3rdparty/fbm.h 3rdparty/fbm.c
+sources.files += 3rdparty
+sources.path = $$[QT_INSTALL_DEMOS]/boxes
+INSTALLS += target sources
+
+wince*: {
+    DEPLOYMENT_PLUGIN += qjpeg
+}
+
+win32-msvc* {
+    QMAKE_CXXFLAGS += /Zm1200
+    QMAKE_CFLAGS += /Zm1200
+}
diff --git a/demos/boxes/boxes.qrc b/demos/boxes/boxes.qrc
new file mode 100644
index 0000000000..d27506dc5a
--- /dev/null
+++ b/demos/boxes/boxes.qrc
@@ -0,0 +1,25 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/res/boxes">
+    <file>cubemap_negx.jpg</file>
+    <file>cubemap_negy.jpg</file>
+    <file>cubemap_negz.jpg</file>
+    <file>cubemap_posx.jpg</file>
+    <file>cubemap_posy.jpg</file>
+    <file>cubemap_posz.jpg</file>
+    <file>square.jpg</file>
+    <file>basic.vsh</file>
+    <file>basic.fsh</file>
+    <file>dotted.fsh</file>
+    <file>fresnel.fsh</file>
+    <file>glass.fsh</file>
+    <file>granite.fsh</file>
+    <file>marble.fsh</file>
+    <file>reflection.fsh</file>
+    <file>refraction.fsh</file>
+    <file>wood.fsh</file>
+    <file>parameters.par</file>
+    <file>qt-logo.png</file>
+    <file>smiley.png</file>
+    <file>qt-logo.jpg</file>
+</qresource>
+</RCC>
diff --git a/demos/boxes/cubemap_negx.jpg b/demos/boxes/cubemap_negx.jpg
new file mode 100644
index 0000000000..07c282eab9
--- /dev/null
+++ b/demos/boxes/cubemap_negx.jpg
diff --git a/demos/boxes/cubemap_negy.jpg b/demos/boxes/cubemap_negy.jpg
new file mode 100644
index 0000000000..46cd2f9cf3
--- /dev/null
+++ b/demos/boxes/cubemap_negy.jpg
diff --git a/demos/boxes/cubemap_negz.jpg b/demos/boxes/cubemap_negz.jpg
new file mode 100644
index 0000000000..40c01ddff3
--- /dev/null
+++ b/demos/boxes/cubemap_negz.jpg
diff --git a/demos/boxes/cubemap_posx.jpg b/demos/boxes/cubemap_posx.jpg
new file mode 100644
index 0000000000..0b42e8a1b1
--- /dev/null
+++ b/demos/boxes/cubemap_posx.jpg
diff --git a/demos/boxes/cubemap_posy.jpg b/demos/boxes/cubemap_posy.jpg
new file mode 100644
index 0000000000..2aca9b1e98
--- /dev/null
+++ b/demos/boxes/cubemap_posy.jpg
diff --git a/demos/boxes/cubemap_posz.jpg b/demos/boxes/cubemap_posz.jpg
new file mode 100644
index 0000000000..2e49173848
--- /dev/null
+++ b/demos/boxes/cubemap_posz.jpg
diff --git a/demos/boxes/dotted.fsh b/demos/boxes/dotted.fsh
new file mode 100644
index 0000000000..26425f6d17
--- /dev/null
+++ b/demos/boxes/dotted.fsh
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+varying vec3 position, normal;
+varying vec4 specular, ambient, diffuse, lightDirection;
+
+uniform sampler2D tex;
+
+void main()
+{
+    vec3 N = normalize(normal);
+
+    gl_MaterialParameters M = gl_FrontMaterial;
+
+    // assume directional light
+    float NdotL = dot(N, lightDirection.xyz);
+    float RdotL = dot(reflect(normalize(position), N), lightDirection.xyz);
+
+    float r1 = length(fract(7.0 * gl_TexCoord[1].xyz) - 0.5);
+    float r2 = length(fract(5.0 * gl_TexCoord[1].xyz + 0.2) - 0.5);
+    float r3 = length(fract(11.0 * gl_TexCoord[1].xyz + 0.7) - 0.5);
+    vec4 rs = vec4(r1, r2, r3, 0.0);
+
+    vec4 unlitColor = gl_Color * (0.8 - clamp(10.0 * (0.4 - rs), 0.0, 0.2));
+    unlitColor.w = 1.0;
+    gl_FragColor = (ambient + diffuse * max(NdotL, 0.0)) * unlitColor +
+                    M.specular * specular * pow(max(RdotL, 0.0), M.shininess);
+}
diff --git a/demos/boxes/fresnel.fsh b/demos/boxes/fresnel.fsh
new file mode 100644
index 0000000000..dd98061c31
--- /dev/null
+++ b/demos/boxes/fresnel.fsh
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+varying vec3 position, normal;
+varying vec4 specular, ambient, diffuse, lightDirection;
+
+uniform sampler2D tex;
+uniform samplerCube env;
+uniform mat4 view;
+uniform vec4 basicColor;
+
+void main()
+{
+    vec3 N = normalize(normal);
+    // assume directional light
+
+    gl_MaterialParameters M = gl_FrontMaterial;
+
+    float NdotL = dot(N, lightDirection.xyz);
+    float RdotL = dot(reflect(normalize(position), N), lightDirection.xyz);
+
+    vec3 absN = abs(gl_TexCoord[1].xyz);
+    vec3 texCoord;
+    if (absN.x > absN.y && absN.x > absN.z)
+        texCoord = gl_TexCoord[1].yzx;
+    else if (absN.y > absN.z)
+        texCoord = gl_TexCoord[1].zxy;
+    else
+        texCoord = gl_TexCoord[1].xyz;
+    texCoord.y *= -sign(texCoord.z);
+    texCoord += 0.5;
+
+    vec4 texColor = texture2D(tex, texCoord.xy);
+    vec4 unlitColor = gl_Color * mix(basicColor, vec4(texColor.xyz, 1.0), texColor.w);
+    vec4 litColor = (ambient + diffuse * max(NdotL, 0.0)) * unlitColor +
+                     M.specular * specular * pow(max(RdotL, 0.0), M.shininess);
+
+    vec3 R = 2.0 * dot(-position, N) * N + position;
+    vec4 reflectedColor = textureCube(env, R * mat3(view[0].xyz, view[1].xyz, view[2].xyz));
+    gl_FragColor = mix(litColor, reflectedColor, 0.2 + 0.8 * pow(1.0 + dot(N, normalize(position)), 2.0));
+}
diff --git a/demos/boxes/glass.fsh b/demos/boxes/glass.fsh
new file mode 100644
index 0000000000..2b59a0a9cb
--- /dev/null
+++ b/demos/boxes/glass.fsh
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+varying vec3 position, normal;
+varying vec4 specular, ambient, diffuse, lightDirection;
+
+uniform sampler2D tex;
+uniform samplerCube env;
+uniform mat4 view;
+
+// Some arbitrary values
+// Arrays don't work here on glsl < 120, apparently.
+//const float coeffs[6] = float[6](1.0/4.0, 1.0/4.1, 1.0/4.2, 1.0/4.3, 1.0/4.4, 1.0/4.5);
+float coeffs(int i)
+{
+	return 1.0 / (3.0 + 0.1 * float(i));
+}
+
+void main()
+{
+    vec3 N = normalize(normal);
+    vec3 I = -normalize(position);
+    mat3 V = mat3(view[0].xyz, view[1].xyz, view[2].xyz);
+    float IdotN = dot(I, N);
+    float scales[6];
+    vec3 C[6];
+    for (int i = 0; i < 6; ++i) {
+        scales[i] = (IdotN - sqrt(1.0 - coeffs(i) + coeffs(i) * (IdotN * IdotN)));
+        C[i] = textureCube(env, (-I + coeffs(i) * N) * V).xyz;
+    }
+    vec4 refractedColor = 0.25 * vec4(C[5].x + 2.0*C[0].x + C[1].x, C[1].y + 2.0*C[2].y + C[3].y,
+                          C[3].z + 2.0*C[4].z + C[5].z, 4.0);
+
+    vec3 R = 2.0 * dot(-position, N) * N + position;
+    vec4 reflectedColor = textureCube(env, R * V);
+
+    gl_FragColor = mix(refractedColor, reflectedColor, 0.4 + 0.6 * pow(1.0 - IdotN, 2.0));
+}
diff --git a/demos/boxes/glbuffers.cpp b/demos/boxes/glbuffers.cpp
new file mode 100644
index 0000000000..b2a594e97e
--- /dev/null
+++ b/demos/boxes/glbuffers.cpp
@@ -0,0 +1,390 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "glbuffers.h"
+
+//============================================================================//
+//                                  GLTexture                                 //
+//============================================================================//
+
+GLTexture::GLTexture() : m_texture(0), m_failed(false)
+{
+    glGenTextures(1, &m_texture);
+}
+
+GLTexture::~GLTexture()
+{
+    glDeleteTextures(1, &m_texture);
+}
+
+//============================================================================//
+//                                 GLTexture2D                                //
+//============================================================================//
+
+GLTexture2D::GLTexture2D(int width, int height)
+{
+    glBindTexture(GL_TEXTURE_2D, m_texture);
+    glTexImage2D(GL_TEXTURE_2D, 0, 4, width, height, 0,
+        GL_BGRA, GL_UNSIGNED_BYTE, 0);
+
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    //glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
+    glBindTexture(GL_TEXTURE_2D, 0);
+}
+
+
+GLTexture2D::GLTexture2D(const QString& fileName, int width, int height)
+{
+    // TODO: Add error handling.
+    QImage image(fileName);
+
+    if (image.isNull()) {
+        m_failed = true;
+        return;
+    }
+
+    image = image.convertToFormat(QImage::Format_ARGB32);
+
+    //qDebug() << "Image size:" << image.width() << "x" << image.height();
+    if (width <= 0)
+        width = image.width();
+    if (height <= 0)
+        height = image.height();
+    if (width != image.width() || height != image.height())
+        image = image.scaled(width, height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+
+    glBindTexture(GL_TEXTURE_2D, m_texture);
+
+    // Works on x86, so probably works on all little-endian systems.
+    // Does it work on big-endian systems?
+    glTexImage2D(GL_TEXTURE_2D, 0, 4, image.width(), image.height(), 0,
+        GL_BGRA, GL_UNSIGNED_BYTE, image.bits());
+
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    //glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
+    glBindTexture(GL_TEXTURE_2D, 0);
+}
+
+void GLTexture2D::load(int width, int height, QRgb *data)
+{
+    glBindTexture(GL_TEXTURE_2D, m_texture);
+    glTexImage2D(GL_TEXTURE_2D, 0, 4, width, height, 0,
+        GL_BGRA, GL_UNSIGNED_BYTE, data);
+    glBindTexture(GL_TEXTURE_2D, 0);
+}
+
+void GLTexture2D::bind()
+{
+    glBindTexture(GL_TEXTURE_2D, m_texture);
+    glEnable(GL_TEXTURE_2D);
+}
+
+void GLTexture2D::unbind()
+{
+    glBindTexture(GL_TEXTURE_2D, 0);
+    glDisable(GL_TEXTURE_2D);
+}
+
+
+//============================================================================//
+//                                 GLTexture3D                                //
+//============================================================================//
+
+GLTexture3D::GLTexture3D(int width, int height, int depth)
+{
+    GLBUFFERS_ASSERT_OPENGL("GLTexture3D::GLTexture3D", glTexImage3D, return)
+
+    glBindTexture(GL_TEXTURE_3D, m_texture);
+    glTexImage3D(GL_TEXTURE_3D, 0, 4, width, height, depth, 0,
+        GL_BGRA, GL_UNSIGNED_BYTE, 0);
+
+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    //glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    //glTexParameteri(GL_TEXTURE_3D, GL_GENERATE_MIPMAP, GL_TRUE);
+    glBindTexture(GL_TEXTURE_3D, 0);
+}
+
+void GLTexture3D::load(int width, int height, int depth, QRgb *data)
+{
+    GLBUFFERS_ASSERT_OPENGL("GLTexture3D::load", glTexImage3D, return)
+
+    glBindTexture(GL_TEXTURE_3D, m_texture);
+    glTexImage3D(GL_TEXTURE_3D, 0, 4, width, height, depth, 0,
+        GL_BGRA, GL_UNSIGNED_BYTE, data);
+    glBindTexture(GL_TEXTURE_3D, 0);
+}
+
+void GLTexture3D::bind()
+{
+    glBindTexture(GL_TEXTURE_3D, m_texture);
+    glEnable(GL_TEXTURE_3D);
+}
+
+void GLTexture3D::unbind()
+{
+    glBindTexture(GL_TEXTURE_3D, 0);
+    glDisable(GL_TEXTURE_3D);
+}
+
+//============================================================================//
+//                                GLTextureCube                               //
+//============================================================================//
+
+GLTextureCube::GLTextureCube(int size)
+{
+    glBindTexture(GL_TEXTURE_CUBE_MAP, m_texture);
+
+    for (int i = 0; i < 6; ++i)
+        glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, 4, size, size, 0,
+            GL_BGRA, GL_UNSIGNED_BYTE, 0);
+
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    //glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    //glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_GENERATE_MIPMAP, GL_TRUE);
+    glBindTexture(GL_TEXTURE_CUBE_MAP, 0);
+}
+
+GLTextureCube::GLTextureCube(const QStringList& fileNames, int size)
+{
+    // TODO: Add error handling.
+
+    glBindTexture(GL_TEXTURE_CUBE_MAP, m_texture);
+
+    int index = 0;
+    foreach (QString file, fileNames) {
+        QImage image(file);
+        if (image.isNull()) {
+            m_failed = true;
+            break;
+        }
+
+        image = image.convertToFormat(QImage::Format_ARGB32);
+
+        //qDebug() << "Image size:" << image.width() << "x" << image.height();
+        if (size <= 0)
+            size = image.width();
+        if (size != image.width() || size != image.height())
+            image = image.scaled(size, size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+
+        // Works on x86, so probably works on all little-endian systems.
+        // Does it work on big-endian systems?
+        glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + index, 0, 4, image.width(), image.height(), 0,
+            GL_BGRA, GL_UNSIGNED_BYTE, image.bits());
+
+        if (++index == 6)
+            break;
+    }
+
+    // Clear remaining faces.
+    while (index < 6) {
+        glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + index, 0, 4, size, size, 0,
+            GL_BGRA, GL_UNSIGNED_BYTE, 0);
+        ++index;
+    }
+
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    //glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    //glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_GENERATE_MIPMAP, GL_TRUE);
+    glBindTexture(GL_TEXTURE_CUBE_MAP, 0);
+}
+
+void GLTextureCube::load(int size, int face, QRgb *data)
+{
+    glBindTexture(GL_TEXTURE_CUBE_MAP, m_texture);
+        glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, 0, 4, size, size, 0,
+            GL_BGRA, GL_UNSIGNED_BYTE, data);
+    glBindTexture(GL_TEXTURE_CUBE_MAP, 0);
+}
+
+void GLTextureCube::bind()
+{
+    glBindTexture(GL_TEXTURE_CUBE_MAP, m_texture);
+    glEnable(GL_TEXTURE_CUBE_MAP);
+}
+
+void GLTextureCube::unbind()
+{
+    glBindTexture(GL_TEXTURE_CUBE_MAP, 0);
+    glDisable(GL_TEXTURE_CUBE_MAP);
+}
+
+//============================================================================//
+//                            GLFrameBufferObject                             //
+//============================================================================//
+
+GLFrameBufferObject::GLFrameBufferObject(int width, int height)
+    : m_fbo(0)
+    , m_depthBuffer(0)
+    , m_width(width)
+    , m_height(height)
+    , m_failed(false)
+{
+    GLBUFFERS_ASSERT_OPENGL("GLFrameBufferObject::GLFrameBufferObject",
+        glGenFramebuffersEXT && glGenRenderbuffersEXT && glBindRenderbufferEXT && glRenderbufferStorageEXT, return)
+
+    // TODO: share depth buffers of same size
+    glGenFramebuffersEXT(1, &m_fbo);
+    //glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fbo);
+    glGenRenderbuffersEXT(1, &m_depthBuffer);
+    glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, m_depthBuffer);
+    glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT, m_width, m_height);
+    //glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, m_depthBuffer);
+    //glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+}
+
+GLFrameBufferObject::~GLFrameBufferObject()
+{
+    GLBUFFERS_ASSERT_OPENGL("GLFrameBufferObject::~GLFrameBufferObject",
+        glDeleteFramebuffersEXT && glDeleteRenderbuffersEXT, return)
+
+    glDeleteFramebuffersEXT(1, &m_fbo);
+    glDeleteRenderbuffersEXT(1, &m_depthBuffer);
+}
+
+void GLFrameBufferObject::setAsRenderTarget(bool state)
+{
+    GLBUFFERS_ASSERT_OPENGL("GLFrameBufferObject::setAsRenderTarget", glBindFramebufferEXT, return)
+
+    if (state) {
+        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fbo);
+        glPushAttrib(GL_VIEWPORT_BIT);
+        glViewport(0, 0, m_width, m_height);
+    } else {
+        glPopAttrib();
+        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+    }
+}
+
+bool GLFrameBufferObject::isComplete()
+{
+    GLBUFFERS_ASSERT_OPENGL("GLFrameBufferObject::isComplete", glCheckFramebufferStatusEXT, return false)
+
+    return GL_FRAMEBUFFER_COMPLETE_EXT == glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+}
+
+//============================================================================//
+//                             GLRenderTargetCube                             //
+//============================================================================//
+
+GLRenderTargetCube::GLRenderTargetCube(int size)
+    : GLTextureCube(size)
+    , m_fbo(size, size)
+{
+}
+
+void GLRenderTargetCube::begin(int face)
+{
+    GLBUFFERS_ASSERT_OPENGL("GLRenderTargetCube::begin",
+        glFramebufferTexture2DEXT && glFramebufferRenderbufferEXT, return)
+
+    m_fbo.setAsRenderTarget(true);
+    glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
+        GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, m_texture, 0);
+    glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, m_fbo.m_depthBuffer);
+}
+
+void GLRenderTargetCube::end()
+{
+    m_fbo.setAsRenderTarget(false);
+}
+
+void GLRenderTargetCube::getViewMatrix(gfx::Matrix4x4f& mat, int face)
+{
+    if (face < 0 || face >= 6) {
+        qWarning("GLRenderTargetCube::getViewMatrix: 'face' must be in the range [0, 6). (face == %d)", face);
+        return;
+    }
+
+    static int perm[6][3] = {
+        {2, 1, 0},
+        {2, 1, 0},
+        {0, 2, 1},
+        {0, 2, 1},
+        {0, 1, 2},
+        {0, 1, 2},
+    };
+
+    static float signs[6][3] = {
+        {-1.0f, -1.0f, -1.0f},
+        {+1.0f, -1.0f, +1.0f},
+        {+1.0f, +1.0f, -1.0f},
+        {+1.0f, -1.0f, +1.0f},
+        {+1.0f, -1.0f, -1.0f},
+        {-1.0f, -1.0f, +1.0f},
+    };
+
+    memset(mat.bits(), 0, sizeof(float) * 16);
+    for (int i = 0; i < 3; ++i)
+        mat(perm[face][i], i) = signs[face][i];
+    mat(3, 3) = 1.0f;
+}
+
+void GLRenderTargetCube::getProjectionMatrix(gfx::Matrix4x4f& mat, float nearZ, float farZ)
+{
+    float proj[] = {
+        1.0f, 0.0f, 0.0f, 0.0f,
+        0.0f, 1.0f, 0.0f, 0.0f,
+        0.0f, 0.0f, (nearZ+farZ)/(nearZ-farZ), -1.0f,
+        0.0f, 0.0f, 2.0f*nearZ*farZ/(nearZ-farZ), 0.0f,
+    };
+
+    memcpy(mat.bits(), proj, sizeof(float) * 16);
+}
diff --git a/demos/boxes/glbuffers.h b/demos/boxes/glbuffers.h
new file mode 100644
index 0000000000..88de4e82fa
--- /dev/null
+++ b/demos/boxes/glbuffers.h
@@ -0,0 +1,362 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GLBUFFERS_H
+#define GLBUFFERS_H
+
+//#include <GL/glew.h>
+#include "glextensions.h"
+
+#include <QtGui>
+#include <QtOpenGL>
+
+#include "vector.h"
+
+#define BUFFER_OFFSET(i) ((char*)0 + (i))
+#define SIZE_OF_MEMBER(cls, member) sizeof(static_cast<cls *>(0)->member)
+
+#define GLBUFFERS_ASSERT_OPENGL(prefix, assertion, returnStatement)                         \
+if (m_failed || !(assertion)) {                                                             \
+    if (!m_failed) qCritical(prefix ": The necessary OpenGL functions are not available."); \
+    m_failed = true;                                                                        \
+    returnStatement;                                                                        \
+}
+
+class GLTexture
+{
+public:
+    GLTexture();
+    virtual ~GLTexture();
+    virtual void bind() = 0;
+    virtual void unbind() = 0;
+    virtual bool failed() const {return m_failed;}
+protected:
+    GLuint m_texture;
+    bool m_failed;
+};
+
+class GLFrameBufferObject
+{
+public:
+    friend class GLRenderTargetCube;
+    // friend class GLRenderTarget2D;
+
+    GLFrameBufferObject(int width, int height);
+    virtual ~GLFrameBufferObject();
+    bool isComplete();
+    virtual bool failed() const {return m_failed;}
+protected:
+    void setAsRenderTarget(bool state = true);
+    GLuint m_fbo;
+    GLuint m_depthBuffer;
+    int m_width, m_height;
+    bool m_failed;
+};
+
+class GLTexture2D : public GLTexture
+{
+public:
+    GLTexture2D(int width, int height);
+    GLTexture2D(const QString& fileName, int width = 0, int height = 0);
+    void load(int width, int height, QRgb *data);
+    virtual void bind();
+    virtual void unbind();
+};
+
+class GLTexture3D : public GLTexture
+{
+public:
+    GLTexture3D(int width, int height, int depth);
+    // TODO: Implement function below
+    //GLTexture3D(const QString& fileName, int width = 0, int height = 0);
+    void load(int width, int height, int depth, QRgb *data);
+    virtual void bind();
+    virtual void unbind();
+};
+
+class GLTextureCube : public GLTexture
+{
+public:
+    GLTextureCube(int size);
+    GLTextureCube(const QStringList& fileNames, int size = 0);
+    void load(int size, int face, QRgb *data);
+    virtual void bind();
+    virtual void unbind();
+};
+
+// TODO: Define and implement class below
+//class GLRenderTarget2D : public GLTexture2D
+
+class GLRenderTargetCube : public GLTextureCube
+{
+public:
+    GLRenderTargetCube(int size);
+    // begin rendering to one of the cube's faces. 0 <= face < 6
+    void begin(int face);
+    // end rendering
+    void end();
+    virtual bool failed() {return m_failed || m_fbo.failed();}
+
+    static void getViewMatrix(gfx::Matrix4x4f& mat, int face);
+    static void getProjectionMatrix(gfx::Matrix4x4f& mat, float nearZ, float farZ);
+private:
+    GLFrameBufferObject m_fbo;
+};
+
+struct VertexDescription
+{
+    enum
+    {
+        Null = 0, // Terminates a VertexDescription array
+        Position,
+        TexCoord,
+        Normal,
+        Color,
+    };
+    int field; // Position, TexCoord, Normal, Color
+    int type; // GL_FLOAT, GL_UNSIGNED_BYTE
+    int count; // number of elements
+    int offset; // field's offset into vertex struct
+    int index; // 0 (unused at the moment)
+};
+
+// Implementation of interleaved buffers.
+// 'T' is a struct which must include a null-terminated static array
+// 'VertexDescription* description'.
+// Example:
+/*
+struct Vertex
+{
+    GLfloat position[3];
+    GLfloat texCoord[2];
+    GLfloat normal[3];
+    GLbyte color[4];
+    static VertexDescription description[];
+};
+
+VertexDescription Vertex::description[] = {
+    {VertexDescription::Position, GL_FLOAT, SIZE_OF_MEMBER(Vertex, position) / sizeof(GLfloat), offsetof(Vertex, position), 0},
+    {VertexDescription::TexCoord, GL_FLOAT, SIZE_OF_MEMBER(Vertex, texCoord) / sizeof(GLfloat), offsetof(Vertex, texCoord), 0},
+    {VertexDescription::Normal, GL_FLOAT, SIZE_OF_MEMBER(Vertex, normal) / sizeof(GLfloat), offsetof(Vertex, normal), 0},
+    {VertexDescription::Color, GL_BYTE, SIZE_OF_MEMBER(Vertex, color) / sizeof(GLbyte), offsetof(Vertex, color), 0},
+    {VertexDescription::Null, 0, 0, 0, 0},
+};
+*/
+template<class T>
+class GLVertexBuffer
+{
+public:
+    GLVertexBuffer(int length, const T *data = 0, int mode = GL_STATIC_DRAW)
+        : m_length(0)
+        , m_mode(mode)
+        , m_buffer(0)
+        , m_failed(false)
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLVertexBuffer::GLVertexBuffer", glGenBuffers && glBindBuffer && glBufferData, return)
+
+		glGenBuffers(1, &m_buffer);
+		glBindBuffer(GL_ARRAY_BUFFER, m_buffer);
+		glBufferData(GL_ARRAY_BUFFER, (m_length = length) * sizeof(T), data, mode);
+    }
+
+    ~GLVertexBuffer()
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLVertexBuffer::~GLVertexBuffer", glDeleteBuffers, return)
+
+        glDeleteBuffers(1, &m_buffer);
+    }
+
+    void bind()
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLVertexBuffer::bind", glBindBuffer, return)
+
+        glBindBuffer(GL_ARRAY_BUFFER, m_buffer);
+        for (VertexDescription *desc = T::description; desc->field != VertexDescription::Null; ++desc) {
+            switch (desc->field) {
+            case VertexDescription::Position:
+                glVertexPointer(desc->count, desc->type, sizeof(T), BUFFER_OFFSET(desc->offset));
+                glEnableClientState(GL_VERTEX_ARRAY);
+                break;
+            case VertexDescription::TexCoord:
+                glTexCoordPointer(desc->count, desc->type, sizeof(T), BUFFER_OFFSET(desc->offset));
+                glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+                break;
+            case VertexDescription::Normal:
+                glNormalPointer(desc->type, sizeof(T), BUFFER_OFFSET(desc->offset));
+                glEnableClientState(GL_NORMAL_ARRAY);
+                break;
+            case VertexDescription::Color:
+                glColorPointer(desc->count, desc->type, sizeof(T), BUFFER_OFFSET(desc->offset));
+                glEnableClientState(GL_COLOR_ARRAY);
+                break;
+            default:
+                break;
+            }
+        }
+    }
+
+    void unbind()
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLVertexBuffer::unbind", glBindBuffer, return)
+
+        glBindBuffer(GL_ARRAY_BUFFER, 0);
+        for (VertexDescription *desc = T::description; desc->field != VertexDescription::Null; ++desc) {
+            switch (desc->field) {
+            case VertexDescription::Position:
+                glDisableClientState(GL_VERTEX_ARRAY);
+                break;
+            case VertexDescription::TexCoord:
+                glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+                break;
+            case VertexDescription::Normal:
+                glDisableClientState(GL_NORMAL_ARRAY);
+                break;
+            case VertexDescription::Color:
+                glDisableClientState(GL_COLOR_ARRAY);
+                break;
+            default:
+                break;
+            }
+        }
+    }
+
+    int length() const {return m_length;}
+
+    T *lock()
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLVertexBuffer::lock", glBindBuffer && glMapBuffer, return 0)
+
+        glBindBuffer(GL_ARRAY_BUFFER, m_buffer);
+        //glBufferData(GL_ARRAY_BUFFER, m_length, NULL, m_mode);
+        GLvoid* buffer = glMapBuffer(GL_ARRAY_BUFFER, GL_READ_WRITE);
+        m_failed = (buffer == 0);
+        return reinterpret_cast<T *>(buffer);
+    }
+
+    void unlock()
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLVertexBuffer::unlock", glBindBuffer && glUnmapBuffer, return)
+
+        glBindBuffer(GL_ARRAY_BUFFER, m_buffer);
+        glUnmapBuffer(GL_ARRAY_BUFFER);
+    }
+
+    bool failed()
+    {
+        return m_failed;
+    }
+
+private:
+    int m_length, m_mode;
+    GLuint m_buffer;
+    bool m_failed;
+};
+
+template<class T>
+class GLIndexBuffer
+{
+public:
+    GLIndexBuffer(int length, const T *data = 0, int mode = GL_STATIC_DRAW)
+        : m_length(0)
+        , m_mode(mode)
+        , m_buffer(0)
+        , m_failed(false)
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLIndexBuffer::GLIndexBuffer", glGenBuffers && glBindBuffer && glBufferData, return)
+
+        glGenBuffers(1, &m_buffer);
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_buffer);
+        glBufferData(GL_ELEMENT_ARRAY_BUFFER, (m_length = length) * sizeof(T), data, mode);
+    }
+
+    ~GLIndexBuffer()
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLIndexBuffer::~GLIndexBuffer", glDeleteBuffers, return)
+
+        glDeleteBuffers(1, &m_buffer);
+    }
+
+    void bind()
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLIndexBuffer::bind", glBindBuffer, return)
+
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_buffer);
+    }
+
+    void unbind()
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLIndexBuffer::unbind", glBindBuffer, return)
+
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+    }
+
+    int length() const {return m_length;}
+
+    T *lock()
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLIndexBuffer::lock", glBindBuffer && glMapBuffer, return 0)
+
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_buffer);
+        GLvoid* buffer = glMapBuffer(GL_ELEMENT_ARRAY_BUFFER, GL_READ_WRITE);
+        m_failed = (buffer == 0);
+        return reinterpret_cast<T *>(buffer);
+    }
+
+    void unlock()
+    {
+        GLBUFFERS_ASSERT_OPENGL("GLIndexBuffer::unlock", glBindBuffer && glUnmapBuffer, return)
+
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_buffer);
+        glUnmapBuffer(GL_ELEMENT_ARRAY_BUFFER);
+    }
+
+    bool failed()
+    {
+        return m_failed;
+    }
+
+private:
+    int m_length, m_mode;
+    GLuint m_buffer;
+    bool m_failed;
+};
+
+#endif
diff --git a/demos/boxes/glextensions.cpp b/demos/boxes/glextensions.cpp
new file mode 100644
index 0000000000..59256a8494
--- /dev/null
+++ b/demos/boxes/glextensions.cpp
@@ -0,0 +1,135 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "glextensions.h"
+
+#define RESOLVE_GL_FUNC(f) ok &= bool((f = (_gl##f) context->getProcAddress(QLatin1String("gl" #f))));
+
+bool GLExtensionFunctions::resolve(const QGLContext *context)
+{
+	bool ok = true;
+
+	RESOLVE_GL_FUNC(CreateShaderObjectARB)
+	RESOLVE_GL_FUNC(ShaderSourceARB)
+	RESOLVE_GL_FUNC(CompileShaderARB)
+	RESOLVE_GL_FUNC(GetObjectParameterivARB)
+	RESOLVE_GL_FUNC(DeleteObjectARB)
+	RESOLVE_GL_FUNC(GetInfoLogARB)
+	RESOLVE_GL_FUNC(CreateProgramObjectARB)
+	RESOLVE_GL_FUNC(AttachObjectARB)
+	RESOLVE_GL_FUNC(DetachObjectARB)
+	RESOLVE_GL_FUNC(LinkProgramARB)
+	RESOLVE_GL_FUNC(UseProgramObjectARB)
+	RESOLVE_GL_FUNC(GetUniformLocationARB)
+	RESOLVE_GL_FUNC(Uniform1iARB)
+	RESOLVE_GL_FUNC(Uniform1fARB)
+	RESOLVE_GL_FUNC(Uniform4fARB)
+	RESOLVE_GL_FUNC(UniformMatrix4fvARB)
+
+	RESOLVE_GL_FUNC(GenFramebuffersEXT)
+	RESOLVE_GL_FUNC(GenRenderbuffersEXT)
+	RESOLVE_GL_FUNC(BindRenderbufferEXT)
+	RESOLVE_GL_FUNC(RenderbufferStorageEXT)
+	RESOLVE_GL_FUNC(DeleteFramebuffersEXT)
+	RESOLVE_GL_FUNC(DeleteRenderbuffersEXT)
+	RESOLVE_GL_FUNC(BindFramebufferEXT)
+	RESOLVE_GL_FUNC(FramebufferTexture2DEXT)
+	RESOLVE_GL_FUNC(FramebufferRenderbufferEXT)
+	RESOLVE_GL_FUNC(CheckFramebufferStatusEXT)
+
+        RESOLVE_GL_FUNC(ActiveTexture)
+	RESOLVE_GL_FUNC(TexImage3D)
+
+        RESOLVE_GL_FUNC(GenBuffers)
+	RESOLVE_GL_FUNC(BindBuffer)
+	RESOLVE_GL_FUNC(BufferData)
+	RESOLVE_GL_FUNC(DeleteBuffers)
+	RESOLVE_GL_FUNC(MapBuffer)
+	RESOLVE_GL_FUNC(UnmapBuffer)
+
+	return ok;
+}
+
+bool GLExtensionFunctions::glslSupported() {
+    return CreateShaderObjectARB
+	    && CreateShaderObjectARB
+	    && ShaderSourceARB
+	    && CompileShaderARB
+	    && GetObjectParameterivARB
+	    && DeleteObjectARB
+	    && GetInfoLogARB
+	    && CreateProgramObjectARB
+	    && AttachObjectARB
+	    && DetachObjectARB
+	    && LinkProgramARB
+	    && UseProgramObjectARB
+	    && GetUniformLocationARB
+	    && Uniform1iARB
+	    && Uniform1fARB
+	    && Uniform4fARB
+            && UniformMatrix4fvARB;
+}
+
+bool GLExtensionFunctions::fboSupported() {
+    return GenFramebuffersEXT
+	    && GenRenderbuffersEXT
+	    && BindRenderbufferEXT
+	    && RenderbufferStorageEXT
+	    && DeleteFramebuffersEXT
+	    && DeleteRenderbuffersEXT
+	    && BindFramebufferEXT
+	    && FramebufferTexture2DEXT
+	    && FramebufferRenderbufferEXT
+	    && CheckFramebufferStatusEXT;
+}
+
+bool GLExtensionFunctions::openGL15Supported() {
+    return ActiveTexture
+	    && TexImage3D
+            && GenBuffers
+	    && BindBuffer
+	    && BufferData
+	    && DeleteBuffers
+	    && MapBuffer
+	    && UnmapBuffer;
+}
+
+#undef RESOLVE_GL_FUNC
diff --git a/demos/boxes/glextensions.h b/demos/boxes/glextensions.h
new file mode 100644
index 0000000000..74617d6818
--- /dev/null
+++ b/demos/boxes/glextensions.h
@@ -0,0 +1,284 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GLEXTENSIONS_H
+#define GLEXTENSIONS_H
+
+#include <QtOpenGL>
+
+/*
+Functions resolved:
+
+glCreateShaderObjectARB
+glShaderSourceARB
+glCompileShaderARB
+glGetObjectParameterivARB
+glDeleteObjectARB
+glGetInfoLogARB
+glCreateProgramObjectARB
+glAttachObjectARB
+glDetachObjectARB
+glLinkProgramARB
+glUseProgramObjectARB
+glGetUniformLocationARB
+glUniform1iARB
+glUniform1fARB
+glUniform4fARB
+glUniformMatrix4fvARB
+
+glGenFramebuffersEXT
+glGenRenderbuffersEXT
+glBindRenderbufferEXT
+glRenderbufferStorageEXT
+glDeleteFramebuffersEXT
+glDeleteRenderbuffersEXT
+glBindFramebufferEXT
+glFramebufferTexture2DEXT
+glFramebufferRenderbufferEXT
+glCheckFramebufferStatusEXT
+
+glActiveTexture
+glTexImage3D
+
+glGenBuffers
+glBindBuffer
+glBufferData
+glDeleteBuffers
+glMapBuffer
+glUnmapBuffer
+*/
+
+#ifndef Q_WS_MAC
+# ifndef APIENTRYP
+#   ifdef APIENTRY
+#     define APIENTRYP APIENTRY *
+#   else
+#     define APIENTRY
+#     define APIENTRYP *
+#   endif
+# endif
+#else
+# define APIENTRY
+# define APIENTRYP *
+#endif
+
+#ifndef GL_VERSION_1_2
+#define GL_TEXTURE_3D 0x806F
+#define GL_TEXTURE_WRAP_R 0x8072
+#define GL_CLAMP_TO_EDGE 0x812F
+#define GL_BGRA 0x80E1
+#endif
+
+#ifndef GL_VERSION_1_3
+#define GL_TEXTURE0 0x84C0
+#define GL_TEXTURE1 0x84C1
+#define GL_TEXTURE2 0x84C2
+#define GL_TEXTURE_CUBE_MAP 0x8513
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515
+//#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516
+//#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517
+//#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518
+//#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519
+//#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A
+#endif
+
+#ifndef GL_VERSION_1_5
+typedef ptrdiff_t GLsizeiptr;
+#define GL_ARRAY_BUFFER 0x8892
+#define GL_ELEMENT_ARRAY_BUFFER 0x8893
+#define GL_READ_WRITE 0x88BA
+#define GL_STATIC_DRAW 0x88E4
+#endif
+
+#ifndef GL_EXT_framebuffer_object
+#define GL_RENDERBUFFER_EXT 0x8D41
+#define GL_FRAMEBUFFER_EXT 0x8D40
+#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5
+#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0
+#define GL_DEPTH_ATTACHMENT_EXT 0x8D00
+#endif
+
+#ifndef GL_ARB_vertex_shader
+#define GL_VERTEX_SHADER_ARB 0x8B31
+#endif
+
+#ifndef GL_ARB_fragment_shader
+#define GL_FRAGMENT_SHADER_ARB 0x8B30
+#endif
+
+#ifndef GL_ARB_shader_objects
+typedef char GLcharARB;
+typedef unsigned int GLhandleARB;
+#define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81
+#define GL_OBJECT_LINK_STATUS_ARB 0x8B82
+#define GL_OBJECT_INFO_LOG_LENGTH_ARB 0x8B84
+#endif
+
+typedef GLhandleARB (APIENTRY *_glCreateShaderObjectARB) (GLenum);
+typedef void (APIENTRY *_glShaderSourceARB) (GLhandleARB, GLuint, const GLcharARB**, GLint *);
+typedef void (APIENTRY *_glCompileShaderARB) (GLhandleARB);
+typedef void (APIENTRY *_glGetObjectParameterivARB) (GLhandleARB, GLenum, int *);
+typedef void (APIENTRY *_glDeleteObjectARB) (GLhandleARB);
+typedef void (APIENTRY *_glGetInfoLogARB) (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
+typedef GLhandleARB (APIENTRY *_glCreateProgramObjectARB) ();
+typedef void (APIENTRY *_glAttachObjectARB) (GLhandleARB, GLhandleARB);
+typedef void (APIENTRY *_glDetachObjectARB) (GLhandleARB, GLhandleARB);
+typedef void (APIENTRY *_glLinkProgramARB) (GLhandleARB);
+typedef void (APIENTRY *_glUseProgramObjectARB) (GLhandleARB);
+typedef GLint (APIENTRY *_glGetUniformLocationARB) (GLhandleARB, const GLcharARB *);
+typedef void (APIENTRY *_glUniform1iARB) (GLint, GLint);
+typedef void (APIENTRY *_glUniform1fARB) (GLint, GLfloat);
+typedef void (APIENTRY *_glUniform4fARB) (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY *_glUniformMatrix4fvARB) (GLint, GLuint, GLboolean, const GLfloat *);
+
+typedef void (APIENTRY *_glGenFramebuffersEXT) (GLsizei, GLuint *);
+typedef void (APIENTRY *_glGenRenderbuffersEXT) (GLsizei, GLuint *);
+typedef void (APIENTRY *_glBindRenderbufferEXT) (GLenum, GLuint);
+typedef void (APIENTRY *_glRenderbufferStorageEXT) (GLenum, GLenum, GLsizei, GLsizei);
+typedef void (APIENTRY *_glDeleteFramebuffersEXT) (GLsizei, const GLuint*);
+typedef void (APIENTRY *_glDeleteRenderbuffersEXT) (GLsizei, const GLuint*);
+typedef void (APIENTRY *_glBindFramebufferEXT) (GLenum, GLuint);
+typedef void (APIENTRY *_glFramebufferTexture2DEXT) (GLenum, GLenum, GLenum, GLuint, GLint);
+typedef void (APIENTRY *_glFramebufferRenderbufferEXT) (GLenum, GLenum, GLenum, GLuint);
+typedef GLenum (APIENTRY *_glCheckFramebufferStatusEXT) (GLenum);
+
+typedef void (APIENTRY *_glActiveTexture) (GLenum);
+typedef void (APIENTRY *_glTexImage3D) (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+
+typedef void (APIENTRY *_glGenBuffers) (GLsizei, GLuint *);
+typedef void (APIENTRY *_glBindBuffer) (GLenum, GLuint);
+typedef void (APIENTRY *_glBufferData) (GLenum, GLsizeiptr, const GLvoid *, GLenum);
+typedef void (APIENTRY *_glDeleteBuffers) (GLsizei, const GLuint *);
+typedef void *(APIENTRY *_glMapBuffer) (GLenum, GLenum);
+typedef GLboolean (APIENTRY *_glUnmapBuffer) (GLenum);
+
+struct GLExtensionFunctions
+{
+	bool resolve(const QGLContext *context);
+
+    bool glslSupported();
+    bool fboSupported();
+    bool openGL15Supported(); // the rest: multi-texture, 3D-texture, vertex buffer objects
+
+	_glCreateShaderObjectARB CreateShaderObjectARB;
+	_glShaderSourceARB ShaderSourceARB;
+	_glCompileShaderARB CompileShaderARB;
+	_glGetObjectParameterivARB GetObjectParameterivARB;
+	_glDeleteObjectARB DeleteObjectARB;
+	_glGetInfoLogARB GetInfoLogARB;
+	_glCreateProgramObjectARB CreateProgramObjectARB;
+	_glAttachObjectARB AttachObjectARB;
+	_glDetachObjectARB DetachObjectARB;
+	_glLinkProgramARB LinkProgramARB;
+	_glUseProgramObjectARB UseProgramObjectARB;
+	_glGetUniformLocationARB GetUniformLocationARB;
+	_glUniform1iARB Uniform1iARB;
+	_glUniform1fARB Uniform1fARB;
+	_glUniform4fARB Uniform4fARB;
+	_glUniformMatrix4fvARB UniformMatrix4fvARB;
+
+	_glGenFramebuffersEXT GenFramebuffersEXT;
+	_glGenRenderbuffersEXT GenRenderbuffersEXT;
+	_glBindRenderbufferEXT BindRenderbufferEXT;
+	_glRenderbufferStorageEXT RenderbufferStorageEXT;
+	_glDeleteFramebuffersEXT DeleteFramebuffersEXT;
+	_glDeleteRenderbuffersEXT DeleteRenderbuffersEXT;
+	_glBindFramebufferEXT BindFramebufferEXT;
+	_glFramebufferTexture2DEXT FramebufferTexture2DEXT;
+	_glFramebufferRenderbufferEXT FramebufferRenderbufferEXT;
+	_glCheckFramebufferStatusEXT CheckFramebufferStatusEXT;
+
+	_glActiveTexture ActiveTexture;
+	_glTexImage3D TexImage3D;
+
+	_glGenBuffers GenBuffers;
+	_glBindBuffer BindBuffer;
+	_glBufferData BufferData;
+	_glDeleteBuffers DeleteBuffers;
+	_glMapBuffer MapBuffer;
+	_glUnmapBuffer UnmapBuffer;
+};
+
+inline GLExtensionFunctions &getGLExtensionFunctions()
+{
+	static GLExtensionFunctions funcs;
+	return funcs;
+}
+
+#define glCreateShaderObjectARB getGLExtensionFunctions().CreateShaderObjectARB
+#define glShaderSourceARB getGLExtensionFunctions().ShaderSourceARB
+#define glCompileShaderARB getGLExtensionFunctions().CompileShaderARB
+#define glGetObjectParameterivARB getGLExtensionFunctions().GetObjectParameterivARB
+#define glDeleteObjectARB getGLExtensionFunctions().DeleteObjectARB
+#define glGetInfoLogARB getGLExtensionFunctions().GetInfoLogARB
+#define glCreateProgramObjectARB getGLExtensionFunctions().CreateProgramObjectARB
+#define glAttachObjectARB getGLExtensionFunctions().AttachObjectARB
+#define glDetachObjectARB getGLExtensionFunctions().DetachObjectARB
+#define glLinkProgramARB getGLExtensionFunctions().LinkProgramARB
+#define glUseProgramObjectARB getGLExtensionFunctions().UseProgramObjectARB
+#define glGetUniformLocationARB getGLExtensionFunctions().GetUniformLocationARB
+#define glUniform1iARB getGLExtensionFunctions().Uniform1iARB
+#define glUniform1fARB getGLExtensionFunctions().Uniform1fARB
+#define glUniform4fARB getGLExtensionFunctions().Uniform4fARB
+#define glUniformMatrix4fvARB getGLExtensionFunctions().UniformMatrix4fvARB
+
+#define glGenFramebuffersEXT getGLExtensionFunctions().GenFramebuffersEXT
+#define glGenRenderbuffersEXT getGLExtensionFunctions().GenRenderbuffersEXT
+#define glBindRenderbufferEXT getGLExtensionFunctions().BindRenderbufferEXT
+#define glRenderbufferStorageEXT getGLExtensionFunctions().RenderbufferStorageEXT
+#define glDeleteFramebuffersEXT getGLExtensionFunctions().DeleteFramebuffersEXT
+#define glDeleteRenderbuffersEXT getGLExtensionFunctions().DeleteRenderbuffersEXT
+#define glBindFramebufferEXT getGLExtensionFunctions().BindFramebufferEXT
+#define glFramebufferTexture2DEXT getGLExtensionFunctions().FramebufferTexture2DEXT
+#define glFramebufferRenderbufferEXT getGLExtensionFunctions().FramebufferRenderbufferEXT
+#define glCheckFramebufferStatusEXT getGLExtensionFunctions().CheckFramebufferStatusEXT
+
+#define glActiveTexture getGLExtensionFunctions().ActiveTexture
+#define glTexImage3D getGLExtensionFunctions().TexImage3D
+
+#define glGenBuffers getGLExtensionFunctions().GenBuffers
+#define glBindBuffer getGLExtensionFunctions().BindBuffer
+#define glBufferData getGLExtensionFunctions().BufferData
+#define glDeleteBuffers getGLExtensionFunctions().DeleteBuffers
+#define glMapBuffer getGLExtensionFunctions().MapBuffer
+#define glUnmapBuffer getGLExtensionFunctions().UnmapBuffer
+
+#endif
diff --git a/demos/boxes/glshaders.cpp b/demos/boxes/glshaders.cpp
new file mode 100644
index 0000000000..b6999a8e0f
--- /dev/null
+++ b/demos/boxes/glshaders.cpp
@@ -0,0 +1,266 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "glshaders.h"
+
+#define GLSHADERS_ASSERT_OPENGL(prefix, assertion, returnStatement)                         \
+if (m_failed || !(assertion)) {                                                             \
+    if (!m_failed) qCritical(prefix ": The necessary OpenGL functions are not available."); \
+    m_failed = true;                                                                        \
+    returnStatement;                                                                        \
+}
+
+
+GLShader::GLShader(const char *data, int size, GLenum shaderType)
+: m_compileError(false), m_failed(false)
+{
+    GLSHADERS_ASSERT_OPENGL("GLShader::GLShader",
+        glCreateShaderObjectARB && glShaderSourceARB && glCompileShaderARB && glGetObjectParameterivARB, return)
+
+    m_shader = glCreateShaderObjectARB(shaderType);
+
+    GLint glSize = size;
+    glShaderSourceARB(m_shader, 1, &data, &glSize);
+    glCompileShaderARB(m_shader);
+    int status;
+    glGetObjectParameterivARB(m_shader, GL_OBJECT_COMPILE_STATUS_ARB, &status);
+    m_compileError = (status != 1);
+}
+
+GLShader::GLShader(const QString& fileName, GLenum shaderType)
+    : m_compileError(false), m_failed(false)
+{
+    GLSHADERS_ASSERT_OPENGL("GLShader::GLShader",
+        glCreateShaderObjectARB && glShaderSourceARB && glCompileShaderARB && glGetObjectParameterivARB, return)
+
+    m_shader = glCreateShaderObjectARB(shaderType);
+
+    QFile file(fileName);
+    if (file.open(QIODevice::ReadOnly)) {
+        QByteArray bytes = file.readAll();
+        GLint size = file.size();
+        const char *p = bytes.data();
+        file.close();
+        glShaderSourceARB(m_shader, 1, &p, &size);
+        glCompileShaderARB(m_shader);
+        int status;
+        glGetObjectParameterivARB(m_shader, GL_OBJECT_COMPILE_STATUS_ARB, &status);
+        m_compileError = (status != 1);
+    } else {
+        m_compileError = true;
+    }
+}
+
+GLShader::~GLShader()
+{
+    GLSHADERS_ASSERT_OPENGL("GLShader::~GLShader", glDeleteObjectARB, return)
+
+    glDeleteObjectARB(m_shader);
+}
+
+QString GLShader::log()
+{
+    GLSHADERS_ASSERT_OPENGL("GLShader::log", glGetObjectParameterivARB
+        && glGetInfoLogARB, return QLatin1String("GLSL not supported."))
+
+    int length;
+    glGetObjectParameterivARB(m_shader, GL_OBJECT_INFO_LOG_LENGTH_ARB, &length);
+    char *log = new char[length + 1];
+    GLsizei glLength = length;
+    glGetInfoLogARB(m_shader, glLength, &glLength, log);
+    log[glLength] = '\0';
+    QString result(log);
+    delete log;
+    return result;
+}
+
+GLVertexShader::GLVertexShader(const char *data, int size) : GLShader(data, size, GL_VERTEX_SHADER_ARB)
+{
+}
+
+GLVertexShader::GLVertexShader(const QString& fileName) : GLShader(fileName, GL_VERTEX_SHADER_ARB)
+{
+}
+
+GLFragmentShader::GLFragmentShader(const char *data, int size) : GLShader(data, size, GL_FRAGMENT_SHADER_ARB)
+{
+}
+
+GLFragmentShader::GLFragmentShader(const QString& fileName) : GLShader(fileName, GL_FRAGMENT_SHADER_ARB)
+{
+}
+
+GLProgram::GLProgram() : m_linked(false), m_linkError(false), m_failed(false)
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::GLProgram", glCreateProgramObjectARB, return)
+
+    m_program = glCreateProgramObjectARB();
+}
+
+GLProgram::~GLProgram()
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::~GLProgram", glDeleteObjectARB, return)
+
+    glDeleteObjectARB(m_program);
+}
+
+void GLProgram::attach(const GLShader &shader)
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::attach", glAttachObjectARB, return)
+
+    glAttachObjectARB(m_program, shader.m_shader);
+    m_linked = m_linkError = false;
+}
+
+void GLProgram::detach(const GLShader &shader)
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::detach", glDetachObjectARB, return)
+
+    glDetachObjectARB(m_program, shader.m_shader);
+    m_linked = m_linkError = false;
+}
+
+bool GLProgram::failed()
+{
+    if (m_failed || m_linkError)
+        return true;
+
+    if (m_linked)
+        return false;
+
+    GLSHADERS_ASSERT_OPENGL("GLProgram::failed", glLinkProgramARB && glGetObjectParameterivARB, return true)
+
+    glLinkProgramARB(m_program);
+    int status;
+    glGetObjectParameterivARB(m_program, GL_OBJECT_LINK_STATUS_ARB, &status);
+    m_linkError = !(m_linked = (status == 1));
+    return m_linkError;
+}
+
+QString GLProgram::log()
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::log", glGetObjectParameterivARB && glGetInfoLogARB,
+        return QLatin1String("Failed."))
+
+    int length;
+    glGetObjectParameterivARB(m_program, GL_OBJECT_INFO_LOG_LENGTH_ARB, &length);
+    char *log = new char[length + 1];
+    GLsizei glLength = length;
+    glGetInfoLogARB(m_program, glLength, &glLength, log);
+    log[glLength] = '\0';
+    QString result(log);
+    delete log;
+    return result;
+}
+
+void GLProgram::bind()
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::bind", glUseProgramObjectARB, return)
+
+    if (!failed())
+        glUseProgramObjectARB(m_program);
+}
+
+void GLProgram::unbind()
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::bind", glUseProgramObjectARB, return)
+
+    glUseProgramObjectARB(0);
+}
+
+bool GLProgram::hasParameter(const QString& name)
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::hasParameter", glGetUniformLocationARB, return false)
+
+    if (!failed()) {
+        QByteArray asciiName = name.toAscii();
+        return -1 != glGetUniformLocationARB(m_program, asciiName.data());
+    }
+    return false;
+}
+
+void GLProgram::setInt(const QString& name, int value)
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::setInt", glGetUniformLocationARB && glUniform1iARB, return)
+
+    if (!failed()) {
+        QByteArray asciiName = name.toAscii();
+        int loc = glGetUniformLocationARB(m_program, asciiName.data());
+	    glUniform1iARB(loc, value);
+    }
+}
+
+void GLProgram::setFloat(const QString& name, float value)
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::setFloat", glGetUniformLocationARB && glUniform1fARB, return)
+
+    if (!failed()) {
+        QByteArray asciiName = name.toAscii();
+        int loc = glGetUniformLocationARB(m_program, asciiName.data());
+	    glUniform1fARB(loc, value);
+    }
+}
+
+void GLProgram::setColor(const QString& name, QRgb value)
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::setColor", glGetUniformLocationARB && glUniform4fARB, return)
+
+    //qDebug() << "Setting color" << name;
+    if (!failed()) {
+        QByteArray asciiName = name.toAscii();
+        int loc = glGetUniformLocationARB(m_program, asciiName.data());
+        //qDebug() << "Location of" << name << "is" << loc;
+        QColor color(value);
+	    glUniform4fARB(loc, color.redF(), color.greenF(), color.blueF(), color.alphaF());
+    }
+}
+
+void GLProgram::setMatrix(const QString& name, const gfx::Matrix4x4f &mat)
+{
+    GLSHADERS_ASSERT_OPENGL("GLProgram::setMatrix", glGetUniformLocationARB && glUniformMatrix4fvARB, return)
+
+    if (!failed()) {
+        QByteArray asciiName = name.toAscii();
+        int loc = glGetUniformLocationARB(m_program, asciiName.data());
+        //qDebug() << "Location of" << name << "is" << loc;
+	    glUniformMatrix4fvARB(loc, 1, GL_FALSE, mat.bits());
+    }
+}
\ No newline at end of file
diff --git a/demos/boxes/glshaders.h b/demos/boxes/glshaders.h
new file mode 100644
index 0000000000..2b6209a5ef
--- /dev/null
+++ b/demos/boxes/glshaders.h
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GLSHADERS_H
+#define GLSHADERS_H
+
+//#include <GL/glew.h>
+#include "glextensions.h"
+
+#include <QtGui>
+#include <QtOpenGL>
+
+#include "vector.h"
+
+class GLShader
+{
+public:
+    friend class GLProgram;
+    virtual ~GLShader();
+    bool failed() const {return m_failed;}
+    QString log();
+protected:
+    GLShader(const char *data, int size, GLenum shaderType);
+    GLShader(const QString& fileName, GLenum shaderType);
+
+    GLhandleARB m_shader;
+    bool m_compileError;
+    bool m_failed;
+};
+
+class GLVertexShader : public GLShader
+{
+public:
+    GLVertexShader(const char *data, int size);
+    GLVertexShader(const QString& fileName);
+};
+
+class GLFragmentShader : public GLShader
+{
+public:
+    GLFragmentShader(const char *data, int size);
+    GLFragmentShader(const QString& fileName);
+};
+
+class GLProgram
+{
+public:
+    GLProgram();
+    ~GLProgram();
+    void attach(const GLShader &shader);
+    void detach(const GLShader &shader);
+    void bind();
+    void unbind();
+    bool failed();
+    QString log();
+    bool hasParameter(const QString& name);
+    // use program before setting values
+    void setInt(const QString& name, int value);
+    void setFloat(const QString& name, float value);
+    void setColor(const QString& name, QRgb value);
+    void setMatrix(const QString& name, const gfx::Matrix4x4f &mat);
+    // TODO: add a bunch of set-functions for different types.
+private:
+    GLhandleARB m_program;
+    bool m_linked;
+    bool m_linkError;
+    bool m_failed;
+};
+
+#endif
diff --git a/demos/boxes/gltrianglemesh.h b/demos/boxes/gltrianglemesh.h
new file mode 100644
index 0000000000..c06ce90e14
--- /dev/null
+++ b/demos/boxes/gltrianglemesh.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GLTRIANGLEMESH_H
+#define GLTRIANGLEMESH_H
+
+//#include <GL/glew.h>
+#include "glextensions.h"
+
+#include <QtGui>
+#include <QtOpenGL>
+
+#include "glbuffers.h"
+
+template<class TVertex, class TIndex>
+class GLTriangleMesh
+{
+public:
+    GLTriangleMesh(int vertexCount, int indexCount) : m_vb(vertexCount), m_ib(indexCount)
+    {
+    }
+
+    virtual ~GLTriangleMesh()
+    {
+    }
+
+    virtual void draw()
+    {
+        if (failed())
+            return;
+
+        int type = GL_UNSIGNED_INT;
+        if (sizeof(TIndex) == sizeof(char)) type = GL_UNSIGNED_BYTE;
+        if (sizeof(TIndex) == sizeof(short)) type = GL_UNSIGNED_SHORT;
+
+        m_vb.bind();
+        m_ib.bind();
+        glDrawElements(GL_TRIANGLES, m_ib.length(), type, BUFFER_OFFSET(0));
+        m_vb.unbind();
+        m_ib.unbind();
+    }
+
+    bool failed()
+    {
+        return m_vb.failed() || m_ib.failed();
+    }
+protected:
+    GLVertexBuffer<TVertex> m_vb;
+    GLIndexBuffer<TIndex> m_ib;
+};
+
+
+#endif
diff --git a/demos/boxes/granite.fsh b/demos/boxes/granite.fsh
new file mode 100644
index 0000000000..9b75d1de2a
--- /dev/null
+++ b/demos/boxes/granite.fsh
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+varying vec3 position, normal;
+varying vec4 specular, ambient, diffuse, lightDirection;
+
+uniform sampler2D tex;
+uniform sampler3D noise;
+
+//const vec4 graniteColors[3] = {vec4(0.0, 0.0, 0.0, 1), vec4(0.30, 0.15, 0.10, 1), vec4(0.80, 0.70, 0.75, 1)};
+uniform vec4 graniteColors[3];
+
+float steep(float x)
+{
+    return clamp(5.0 * x - 2.0, 0.0, 1.0);
+}
+
+void main()
+{
+    vec2 turbulence = vec2(0, 0);
+    float scale = 1.0;
+    for (int i = 0; i < 4; ++i) {
+        turbulence += scale * (texture3D(noise, gl_TexCoord[1].xyz / scale).xy - 0.5);
+        scale *= 0.5;
+    }
+
+    vec3 N = normalize(normal);
+    // assume directional light
+
+    gl_MaterialParameters M = gl_FrontMaterial;
+
+    float NdotL = dot(N, lightDirection.xyz);
+    float RdotL = dot(reflect(normalize(position), N), lightDirection.xyz);
+
+    vec4 unlitColor = mix(graniteColors[1], mix(graniteColors[0], graniteColors[2], steep(0.5 + turbulence.y)), 4.0 * abs(turbulence.x));
+    gl_FragColor = (ambient + diffuse * max(NdotL, 0.0)) * unlitColor +
+                    M.specular * specular * pow(max(RdotL, 0.0), M.shininess);
+}
diff --git a/demos/boxes/main.cpp b/demos/boxes/main.cpp
new file mode 100644
index 0000000000..10bbde1e31
--- /dev/null
+++ b/demos/boxes/main.cpp
@@ -0,0 +1,149 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//#include <GL/glew.h>
+#include "glextensions.h"
+
+#include "scene.h"
+
+#include <QtGui>
+#include <QGLWidget>
+
+class GraphicsView : public QGraphicsView
+{
+public:
+    GraphicsView()
+    {
+        setWindowTitle(tr("Boxes"));
+        setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+        //setRenderHints(QPainter::SmoothPixmapTransform);
+    }
+
+protected:
+    void resizeEvent(QResizeEvent *event) {
+        if (scene())
+            scene()->setSceneRect(QRect(QPoint(0, 0), event->size()));
+        QGraphicsView::resizeEvent(event);
+    }
+};
+
+inline bool matchString(const char *extensionString, const char *subString)
+{
+    int subStringLength = strlen(subString);
+    return (strncmp(extensionString, subString, subStringLength) == 0) 
+        && ((extensionString[subStringLength] == ' ') || (extensionString[subStringLength] == '\0'));
+}
+
+bool necessaryExtensionsSupported()
+{
+    const char *extensionString = reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS));
+    const char *p = extensionString;
+
+    const int GL_EXT_FBO = 1;
+    const int GL_ARB_VS = 2;
+    const int GL_ARB_FS = 4;
+    const int GL_ARB_SO = 8;
+    int extensions = 0;
+
+    while (*p) {
+        if (matchString(p, "GL_EXT_framebuffer_object"))
+            extensions |= GL_EXT_FBO;
+        else if (matchString(p, "GL_ARB_vertex_shader"))
+            extensions |= GL_ARB_VS;
+        else if (matchString(p, "GL_ARB_fragment_shader"))
+            extensions |= GL_ARB_FS;
+        else if (matchString(p, "GL_ARB_shader_objects"))
+            extensions |= GL_ARB_SO;
+        while ((*p != ' ') && (*p != '\0'))
+            ++p;
+        if (*p == ' ')
+            ++p;
+    }
+    return (extensions == 15);
+}
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    if ((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_5) == 0) {
+        QMessageBox::critical(0, "OpenGL features missing",
+            "OpenGL version 1.5 or higher is required to run this demo.\n"
+            "The program will now exit.");
+        return -1;
+    }
+
+    int maxTextureSize = 1024;
+    QGLWidget *widget = new QGLWidget(QGLFormat(QGL::SampleBuffers));
+    widget->makeCurrent();
+
+    if (!necessaryExtensionsSupported()) {
+        QMessageBox::critical(0, "OpenGL features missing",
+            "The OpenGL extensions required to run this demo are missing.\n"
+            "The program will now exit.");
+        delete widget;
+        return -2;
+    }
+
+    // Check if all the necessary functions are resolved.
+    if (!getGLExtensionFunctions().resolve(widget->context())) {
+        QMessageBox::critical(0, "OpenGL features missing",
+            "Failed to resolve OpenGL functions required to run this demo.\n"
+            "The program will now exit.");
+        delete widget;
+        return -3;
+    }
+
+    // TODO: Make conditional for final release
+    QMessageBox::information(0, "For your information",
+        "This demo can be GPU and CPU intensive and may\n"
+        "work poorly or not at all on your system.");
+
+    GraphicsView view;
+    view.setViewport(widget);
+    view.setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+    widget->makeCurrent(); // The current context must be set before calling Scene's constructor
+    view.setScene(new Scene(1024, 768, maxTextureSize));
+    view.show();
+
+    return app.exec();
+}
+
diff --git a/demos/boxes/marble.fsh b/demos/boxes/marble.fsh
new file mode 100644
index 0000000000..62d3c9ff1f
--- /dev/null
+++ b/demos/boxes/marble.fsh
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+varying vec3 position, normal;
+varying vec4 specular, ambient, diffuse, lightDirection;
+
+uniform sampler2D tex;
+uniform sampler3D noise;
+
+//const vec4 marbleColors[2] = {vec4(0.9, 0.9, 0.9, 1), vec4(0.6, 0.5, 0.5, 1)};
+uniform vec4 marbleColors[2];
+
+void main()
+{
+    float turbulence = 0.0;
+    float scale = 1.0;
+    for (int i = 0; i < 4; ++i) {
+        turbulence += scale * (texture3D(noise, 0.125 * gl_TexCoord[1].xyz / scale).x - 0.5);
+        scale *= 0.5;
+    }
+
+    vec3 N = normalize(normal);
+    // assume directional light
+
+    gl_MaterialParameters M = gl_FrontMaterial;
+
+    float NdotL = dot(N, lightDirection.xyz);
+    float RdotL = dot(reflect(normalize(position), N), lightDirection.xyz);
+
+    vec4 unlitColor = mix(marbleColors[0], marbleColors[1], exp(-4.0 * abs(turbulence)));
+    gl_FragColor = (ambient + diffuse * max(NdotL, 0.0)) * unlitColor +
+                    M.specular * specular * pow(max(RdotL, 0.0), M.shininess);
+}
diff --git a/demos/boxes/parameters.par b/demos/boxes/parameters.par
new file mode 100644
index 0000000000..50e20739b9
--- /dev/null
+++ b/demos/boxes/parameters.par
@@ -0,0 +1,5 @@
+color basicColor ff0e3d0e
+color woodColors ff5e3d33 ffcc9966
+float woodTubulence 0.1
+color graniteColors ff000000 ff4d261a ffccb3bf
+color marbleColors ffe6e6e6 ff998080
diff --git a/demos/boxes/qt-logo.jpg b/demos/boxes/qt-logo.jpg
new file mode 100644
index 0000000000..4014b4659c
--- /dev/null
+++ b/demos/boxes/qt-logo.jpg
diff --git a/demos/boxes/qt-logo.png b/demos/boxes/qt-logo.png
new file mode 100644
index 0000000000..7d3e97eb36
--- /dev/null
+++ b/demos/boxes/qt-logo.png
diff --git a/demos/boxes/qtbox.cpp b/demos/boxes/qtbox.cpp
new file mode 100644
index 0000000000..060769801f
--- /dev/null
+++ b/demos/boxes/qtbox.cpp
@@ -0,0 +1,469 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qtbox.h"
+
+const qreal ROTATE_SPEED_X = 30.0 / 1000.0;
+const qreal ROTATE_SPEED_Y = 20.0 / 1000.0;
+const qreal ROTATE_SPEED_Z = 40.0 / 1000.0;
+const int MAX_ITEM_SIZE = 512;
+const int MIN_ITEM_SIZE = 16;
+
+//============================================================================//
+//                                  ItemBase                                  //
+//============================================================================//
+
+ItemBase::ItemBase(int size, int x, int y) : m_size(size), m_isResizing(false)
+{
+    setFlag(QGraphicsItem::ItemIsMovable, true);
+    setFlag(QGraphicsItem::ItemIsSelectable, true);
+    setFlag(QGraphicsItem::ItemIsFocusable, true);
+    setAcceptHoverEvents(true);
+    setPos(x, y);
+    m_startTime = QTime::currentTime();
+}
+
+ItemBase::~ItemBase()
+{
+}
+
+QRectF ItemBase::boundingRect() const
+{
+    return QRectF(-m_size / 2, -m_size / 2, m_size, m_size);
+}
+
+void ItemBase::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *)
+{
+    if (option->state & QStyle::State_Selected) {
+        painter->setRenderHint(QPainter::Antialiasing, true);
+        if (option->state & QStyle::State_HasFocus)
+            painter->setPen(Qt::yellow);
+        else
+            painter->setPen(Qt::white);
+        painter->drawRect(boundingRect());
+
+        painter->drawLine(m_size / 2 - 9, m_size / 2, m_size / 2, m_size / 2 - 9);
+        painter->drawLine(m_size / 2 - 6, m_size / 2, m_size / 2, m_size / 2 - 6);
+        painter->drawLine(m_size / 2 - 3, m_size / 2, m_size / 2, m_size / 2 - 3);
+
+        painter->setRenderHint(QPainter::Antialiasing, false);
+    }
+}
+
+void ItemBase::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
+{
+    if (!isSelected() && scene()) {
+        scene()->clearSelection();
+        setSelected(true);
+    }
+
+    QMenu menu;
+    QAction *delAction = menu.addAction("Delete");
+    QAction *newAction = menu.addAction("New");
+    QAction *growAction = menu.addAction("Grow");
+    QAction *shrinkAction = menu.addAction("Shrink");
+
+    QAction *selectedAction = menu.exec(event->screenPos());
+
+    if (selectedAction == delAction)
+        deleteSelectedItems(scene());
+    else if (selectedAction == newAction)
+        duplicateSelectedItems(scene());
+    else if (selectedAction == growAction)
+        growSelectedItems(scene());
+    else if (selectedAction == shrinkAction)
+        shrinkSelectedItems(scene());
+}
+
+void ItemBase::duplicateSelectedItems(QGraphicsScene *scene)
+{
+    if (!scene)
+        return;
+
+    QList<QGraphicsItem *> selected;
+    selected = scene->selectedItems();
+
+    foreach (QGraphicsItem *item, selected) {
+        ItemBase *itemBase = dynamic_cast<ItemBase *>(item);
+        if (itemBase)
+            scene->addItem(itemBase->createNew(itemBase->m_size, itemBase->pos().x() + itemBase->m_size, itemBase->pos().y()));
+    }
+}
+
+void ItemBase::deleteSelectedItems(QGraphicsScene *scene)
+{
+    if (!scene)
+        return;
+
+    QList<QGraphicsItem *> selected;
+    selected = scene->selectedItems();
+
+    foreach (QGraphicsItem *item, selected) {
+        ItemBase *itemBase = dynamic_cast<ItemBase *>(item);
+        if (itemBase)
+            delete itemBase;
+    }
+}
+
+void ItemBase::growSelectedItems(QGraphicsScene *scene)
+{
+    if (!scene)
+        return;
+
+    QList<QGraphicsItem *> selected;
+    selected = scene->selectedItems();
+
+    foreach (QGraphicsItem *item, selected) {
+        ItemBase *itemBase = dynamic_cast<ItemBase *>(item);
+        if (itemBase) {
+            itemBase->prepareGeometryChange();
+            itemBase->m_size *= 2;
+            if (itemBase->m_size > MAX_ITEM_SIZE)
+                itemBase->m_size = MAX_ITEM_SIZE;
+        }
+    }
+}
+
+void ItemBase::shrinkSelectedItems(QGraphicsScene *scene)
+{
+    if (!scene)
+        return;
+
+    QList<QGraphicsItem *> selected;
+    selected = scene->selectedItems();
+
+    foreach (QGraphicsItem *item, selected) {
+        ItemBase *itemBase = dynamic_cast<ItemBase *>(item);
+        if (itemBase) {
+            itemBase->prepareGeometryChange();
+            itemBase->m_size /= 2;
+            if (itemBase->m_size < MIN_ITEM_SIZE)
+                itemBase->m_size = MIN_ITEM_SIZE;
+        }
+    }
+}
+
+void ItemBase::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (m_isResizing) {
+        int dx = int(2.0 * event->pos().x());
+        int dy = int(2.0 * event->pos().y());
+        prepareGeometryChange();
+        m_size = (dx > dy ? dx : dy);
+        if (m_size < MIN_ITEM_SIZE)
+            m_size = MIN_ITEM_SIZE;
+        else if (m_size > MAX_ITEM_SIZE)
+            m_size = MAX_ITEM_SIZE;
+    } else {
+        QGraphicsItem::mouseMoveEvent(event);
+    }
+}
+
+void ItemBase::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
+{
+    if (m_isResizing || (isInResizeArea(event->pos()) && isSelected()))
+        setCursor(Qt::SizeFDiagCursor);
+    else
+        setCursor(Qt::ArrowCursor);
+    QGraphicsItem::hoverMoveEvent(event);
+}
+
+void ItemBase::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    static qreal z = 0.0;
+    setZValue(z += 1.0);
+    if (event->button() == Qt::LeftButton && isInResizeArea(event->pos())) {
+        m_isResizing = true;
+    } else {
+        QGraphicsItem::mousePressEvent(event);
+    }
+}
+
+void ItemBase::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton && m_isResizing) {
+        m_isResizing = false;
+    } else {
+        QGraphicsItem::mouseReleaseEvent(event);
+    }
+}
+
+void ItemBase::keyPressEvent(QKeyEvent *event)
+{
+    switch (event->key()) {
+    case Qt::Key_Delete:
+        deleteSelectedItems(scene());
+        break;
+    case Qt::Key_Insert:
+        duplicateSelectedItems(scene());
+        break;
+    case Qt::Key_Plus:
+        growSelectedItems(scene());
+        break;
+    case Qt::Key_Minus:
+        shrinkSelectedItems(scene());
+        break;
+    default:
+        QGraphicsItem::keyPressEvent(event);
+        break;
+    }
+}
+
+void ItemBase::wheelEvent(QGraphicsSceneWheelEvent *event)
+{
+    prepareGeometryChange();
+    m_size = int(m_size * exp(-event->delta() / 600.0));
+    if (m_size > MAX_ITEM_SIZE)
+        m_size = MAX_ITEM_SIZE;
+    else if (m_size < MIN_ITEM_SIZE)
+        m_size = MIN_ITEM_SIZE;
+}
+
+bool ItemBase::isInResizeArea(const QPointF &pos)
+{
+    return (-pos.y() < pos.x() - m_size + 9);
+}
+
+//============================================================================//
+//                                    QtBox                                   //
+//============================================================================//
+
+QtBox::QtBox(int size, int x, int y) : ItemBase(size, x, y), m_texture(0)
+{
+    for (int i = 0; i < 8; ++i) {
+        m_vertices[i][0] = (i & 1 ? 0.5f : -0.5f);
+        m_vertices[i][1] = (i & 2 ? 0.5f : -0.5f);
+        m_vertices[i][2] = (i & 4 ? 0.5f : -0.5f);
+    }
+    for (int i = 0; i < 4; ++i) {
+        m_texCoords[i][0] = (i & 1 ? 1.0f : 0.0f);
+        m_texCoords[i][1] = (i & 2 ? 1.0f : 0.0f);
+    }
+    memset(m_normals, 0, sizeof(m_normals));
+    for (int i = 0; i < 3; ++i) {
+        m_normals[2 * i + 0][i] = -1.0f;
+        m_normals[2 * i + 1][i] = 1.0f;
+    }
+}
+
+QtBox::~QtBox()
+{
+    if (m_texture)
+        delete m_texture;
+}
+
+ItemBase *QtBox::createNew(int size, int x, int y)
+{
+    return new QtBox(size, x, y);
+}
+
+void QtBox::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    QRectF rect = boundingRect().translated(pos());
+    float width = float(painter->device()->width());
+    float height = float(painter->device()->height());
+
+    float left = 2.0f * float(rect.left()) / width - 1.0f;
+    float right = 2.0f * float(rect.right()) / width - 1.0f;
+    float top = 1.0f - 2.0f * float(rect.top()) / height;
+    float bottom = 1.0f - 2.0f * float(rect.bottom()) / height;
+    float moveToRectMatrix[] = {
+        0.5f * (right - left), 0.0f, 0.0f, 0.0f,
+        0.0f, 0.5f * (bottom - top), 0.0f, 0.0f,
+        0.0f, 0.0f, 1.0f, 0.0f,
+        0.5f * (right + left), 0.5f * (bottom + top), 0.0f, 1.0f
+    };
+
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+    glLoadMatrixf(moveToRectMatrix);
+    gluPerspective(60.0, 1.0, 0.01, 10.0);
+
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+    glLoadIdentity();
+
+    //glEnable(GL_DEPTH_TEST);
+    glEnable(GL_CULL_FACE);
+    glEnable(GL_LIGHTING);
+    glEnable(GL_COLOR_MATERIAL);
+    glEnable(GL_NORMALIZE);
+
+    if(m_texture == 0)
+        m_texture = new GLTexture2D(":/res/boxes/qt-logo.jpg", 64, 64);
+    m_texture->bind();
+    glEnable(GL_TEXTURE_2D);
+
+    glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
+    float lightColour[] = {1.0f, 1.0f, 1.0f, 1.0f};
+    float lightDir[] = {0.0f, 0.0f, 1.0f, 0.0f};
+    glLightfv(GL_LIGHT0, GL_DIFFUSE, lightColour);
+    glLightfv(GL_LIGHT0, GL_POSITION, lightDir);
+    glEnable(GL_LIGHT0);
+
+    glTranslatef(0.0f, 0.0f, -1.5f);
+    glRotatef(ROTATE_SPEED_X * m_startTime.msecsTo(QTime::currentTime()), 1.0f, 0.0f, 0.0f);
+    glRotatef(ROTATE_SPEED_Y * m_startTime.msecsTo(QTime::currentTime()), 0.0f, 1.0f, 0.0f);
+    glRotatef(ROTATE_SPEED_Z * m_startTime.msecsTo(QTime::currentTime()), 0.0f, 0.0f, 1.0f);
+    int dt = m_startTime.msecsTo(QTime::currentTime());
+    if (dt < 500)
+        glScalef(dt / 500.0f, dt / 500.0f, dt / 500.0f);
+
+    for (int dir = 0; dir < 3; ++dir) {
+        glColor4f(1.0f, 1.0f, 1.0f, 1.0);
+
+        glBegin(GL_TRIANGLE_STRIP);
+        glNormal3fv(m_normals[2 * dir + 0].bits());
+        for (int i = 0; i < 2; ++i) {
+            for (int j = 0; j < 2; ++j) {
+                glTexCoord2fv(m_texCoords[(j << 1) | i].bits());
+                glVertex3fv(m_vertices[(i << ((dir + 2) % 3)) | (j << ((dir + 1) % 3))].bits());
+            }
+        }
+        glEnd();
+
+        glBegin(GL_TRIANGLE_STRIP);
+        glNormal3fv(m_normals[2 * dir + 1].bits());
+        for (int i = 0; i < 2; ++i) {
+            for (int j = 0; j < 2; ++j) {
+                glTexCoord2fv(m_texCoords[(j << 1) | i].bits());
+                glVertex3fv(m_vertices[(1 << dir) | (i << ((dir + 1) % 3)) | (j << ((dir + 2) % 3))].bits());
+            }
+        }
+        glEnd();
+    }
+    m_texture->unbind();
+
+    //glDisable(GL_DEPTH_TEST);
+    glDisable(GL_CULL_FACE);
+    glDisable(GL_LIGHTING);
+    glDisable(GL_COLOR_MATERIAL);
+    glDisable(GL_TEXTURE_2D);
+    glDisable(GL_LIGHT0);
+    glDisable(GL_NORMALIZE);
+
+    glPopMatrix();
+
+    glMatrixMode(GL_PROJECTION);
+    glPopMatrix();
+
+    ItemBase::paint(painter, option, widget);
+}
+
+//============================================================================//
+//                                 CircleItem                                 //
+//============================================================================//
+
+CircleItem::CircleItem(int size, int x, int y) : ItemBase(size, x, y)
+{
+     m_color = QColor::fromHsv(rand() % 360, 255, 255);
+}
+
+void CircleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    int dt = m_startTime.msecsTo(QTime::currentTime());
+
+    qreal r0 = 0.5 * m_size * (1.0 - exp(-0.001 * ((dt + 3800) % 4000)));
+    qreal r1 = 0.5 * m_size * (1.0 - exp(-0.001 * ((dt + 0) % 4000)));
+    qreal r2 = 0.5 * m_size * (1.0 - exp(-0.001 * ((dt + 1800) % 4000)));
+    qreal r3 = 0.5 * m_size * (1.0 - exp(-0.001 * ((dt + 2000) % 4000)));
+
+    if (r0 > r1)
+        r0 = 0.0;
+    if (r2 > r3)
+        r2 = 0.0;
+
+    QPainterPath path;
+    path.moveTo(r1, 0.0);
+    path.arcTo(-r1, -r1, 2 * r1, 2 * r1, 0.0, 360.0);
+    path.lineTo(r0, 0.0);
+    path.arcTo(-r0, -r0, 2 * r0, 2 * r0, 0.0, -360.0);
+    path.closeSubpath();
+    path.moveTo(r3, 0.0);
+    path.arcTo(-r3, -r3, 2 * r3, 2 * r3, 0.0, 360.0);
+    path.lineTo(r0, 0.0);
+    path.arcTo(-r2, -r2, 2 * r2, 2 * r2, 0.0, -360.0);
+    path.closeSubpath();
+    painter->setRenderHint(QPainter::Antialiasing, true);
+    painter->setBrush(QBrush(m_color));
+    painter->setPen(Qt::NoPen);
+    painter->drawPath(path);
+    painter->setBrush(Qt::NoBrush);
+    painter->setPen(Qt::SolidLine);
+    painter->setRenderHint(QPainter::Antialiasing, false);
+
+    ItemBase::paint(painter, option, widget);
+}
+
+ItemBase *CircleItem::createNew(int size, int x, int y)
+{
+    return new CircleItem(size, x, y);
+}
+
+//============================================================================//
+//                                 SquareItem                                 //
+//============================================================================//
+
+SquareItem::SquareItem(int size, int x, int y) : ItemBase(size, x, y)
+{
+    m_image = QPixmap(":/res/boxes/square.jpg");
+}
+
+void SquareItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    int dt = m_startTime.msecsTo(QTime::currentTime());
+    QTransform oldTransform = painter->worldTransform();
+    int dtMod = dt % 2000;
+    qreal amp = 0.002 * (dtMod < 1000 ? dtMod : 2000 - dtMod) - 1.0;
+
+    qreal scale = 0.6 + 0.2 * amp * amp;
+    painter->setWorldTransform(QTransform().rotate(15.0 * amp).scale(scale, scale), true);
+
+    painter->drawPixmap(-m_size / 2, -m_size / 2, m_size, m_size, m_image);
+
+    painter->setWorldTransform(oldTransform, false);
+    ItemBase::paint(painter, option, widget);
+}
+
+ItemBase *SquareItem::createNew(int size, int x, int y)
+{
+    return new SquareItem(size, x, y);
+}
diff --git a/demos/boxes/qtbox.h b/demos/boxes/qtbox.h
new file mode 100644
index 0000000000..aae8256811
--- /dev/null
+++ b/demos/boxes/qtbox.h
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTBOX_H
+#define QTBOX_H
+
+#include <QtGui>
+
+#include "vector.h"
+#include "glbuffers.h"
+
+class ItemBase : public QObject, public QGraphicsItem
+{
+    Q_OBJECT
+public:
+    ItemBase(int size, int x, int y);
+    virtual ~ItemBase();
+    virtual QRectF boundingRect() const;
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+protected:
+    virtual ItemBase *createNew(int size, int x, int y) = 0;
+    virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);
+    virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
+    virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    virtual void keyPressEvent(QKeyEvent *event);
+    virtual void wheelEvent(QGraphicsSceneWheelEvent *event);
+    bool isInResizeArea(const QPointF &pos);
+
+    static void duplicateSelectedItems(QGraphicsScene *scene);
+    static void deleteSelectedItems(QGraphicsScene *scene);
+    static void growSelectedItems(QGraphicsScene *scene);
+    static void shrinkSelectedItems(QGraphicsScene *scene);
+
+    int m_size;
+    QTime m_startTime;
+    bool m_isResizing;
+};
+
+class QtBox : public ItemBase
+{
+public:
+    QtBox(int size, int x, int y);
+    virtual ~QtBox();
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+protected:
+    virtual ItemBase *createNew(int size, int x, int y);
+private:
+    gfx::Vector3f m_vertices[8];
+    gfx::Vector2f m_texCoords[4];
+    gfx::Vector3f m_normals[6];
+    GLTexture *m_texture;
+};
+
+class CircleItem : public ItemBase
+{
+public:
+    CircleItem(int size, int x, int y);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+protected:
+    virtual ItemBase *createNew(int size, int x, int y);
+
+    QColor m_color;
+};
+
+class SquareItem : public ItemBase
+{
+public:
+    SquareItem(int size, int x, int y);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+protected:
+    virtual ItemBase *createNew(int size, int x, int y);
+
+    QPixmap m_image;
+};
+
+#endif
diff --git a/demos/boxes/reflection.fsh b/demos/boxes/reflection.fsh
new file mode 100644
index 0000000000..d5807ee025
--- /dev/null
+++ b/demos/boxes/reflection.fsh
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+varying vec3 position, normal;
+varying vec4 specular, ambient, diffuse, lightDirection;
+
+uniform sampler2D tex;
+uniform samplerCube env;
+uniform mat4 view;
+
+void main()
+{
+    vec3 N = normalize(normal);
+    vec3 R = 2.0 * dot(-position, N) * N + position;
+    gl_FragColor = textureCube(env, R * mat3(view[0].xyz, view[1].xyz, view[2].xyz));
+}
diff --git a/demos/boxes/refraction.fsh b/demos/boxes/refraction.fsh
new file mode 100644
index 0000000000..f91c24d4fb
--- /dev/null
+++ b/demos/boxes/refraction.fsh
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+varying vec3 position, normal;
+varying vec4 specular, ambient, diffuse, lightDirection;
+
+uniform sampler2D tex;
+uniform samplerCube env;
+uniform mat4 view;
+
+// Arrays don't work here on glsl < 120, apparently.
+//const float coeffs[6] = float[6](1.0/2.0, 1.0/2.1, 1.0/2.2, 1.0/2.3, 1.0/2.4, 1.0/2.5);
+float coeffs(int i)
+{
+	return 1.0 / (2.0 + 0.1 * float(i));
+}
+
+void main()
+{
+    vec3 N = normalize(normal);
+    vec3 I = -normalize(position);
+    float IdotN = dot(I, N);
+    float scales[6];
+    vec3 C[6];
+    for (int i = 0; i < 6; ++i) {
+        scales[i] = (IdotN - sqrt(1.0 - coeffs(i) + coeffs(i) * (IdotN * IdotN)));
+        C[i] = textureCube(env, (-I + coeffs(i) * N) * mat3(view[0].xyz, view[1].xyz, view[2].xyz)).xyz;
+    }
+
+    gl_FragColor = 0.25 * vec4(C[5].x + 2.0*C[0].x + C[1].x, C[1].y + 2.0*C[2].y + C[3].y,
+                   C[3].z + 2.0*C[4].z + C[5].z, 4.0);
+}
diff --git a/demos/boxes/roundedbox.cpp b/demos/boxes/roundedbox.cpp
new file mode 100644
index 0000000000..f238da249f
--- /dev/null
+++ b/demos/boxes/roundedbox.cpp
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "roundedbox.h"
+
+//============================================================================//
+//                                P3T2N3Vertex                                //
+//============================================================================//
+
+VertexDescription P3T2N3Vertex::description[] = {
+    {VertexDescription::Position, GL_FLOAT, SIZE_OF_MEMBER(P3T2N3Vertex, position) / sizeof(float), offsetof(P3T2N3Vertex, position), 0},
+    {VertexDescription::TexCoord, GL_FLOAT, SIZE_OF_MEMBER(P3T2N3Vertex, texCoord) / sizeof(float), offsetof(P3T2N3Vertex, texCoord), 0},
+    {VertexDescription::Normal, GL_FLOAT, SIZE_OF_MEMBER(P3T2N3Vertex, normal) / sizeof(float), offsetof(P3T2N3Vertex, normal), 0},
+    {VertexDescription::Null, 0, 0, 0, 0},
+};
+
+//============================================================================//
+//                                GLRoundedBox                                //
+//============================================================================//
+
+float lerp(float a, float b, float t)
+{
+    return a * (1.0f - t) + b * t;
+}
+
+GLRoundedBox::GLRoundedBox(float r, float scale, int n)
+    : GLTriangleMesh<P3T2N3Vertex, unsigned short>((n+2)*(n+3)*4, (n+1)*(n+1)*24+36+72*(n+1))
+{
+    int vidx = 0, iidx = 0;
+    int vertexCountPerCorner = (n + 2) * (n + 3) / 2;
+
+    P3T2N3Vertex *vp = m_vb.lock();
+    unsigned short *ip = m_ib.lock();
+
+    if (!vp || !ip) {
+        qWarning("GLRoundedBox::GLRoundedBox: Failed to lock vertex buffer and/or index buffer.");
+        m_ib.unlock();
+        m_vb.unlock();
+        return;
+    }
+
+    for (int corner = 0; corner < 8; ++corner) {
+        gfx::Vector3f centre;
+        centre[0] = (corner & 1 ? 1.0f : -1.0f);
+        centre[1] = (corner & 2 ? 1.0f : -1.0f);
+        centre[2] = (corner & 4 ? 1.0f : -1.0f);
+        int winding = (corner & 1) ^ ((corner >> 1) & 1) ^ (corner >> 2);
+        int offsX = ((corner ^ 1) - corner) * vertexCountPerCorner;
+        int offsY = ((corner ^ 2) - corner) * vertexCountPerCorner;
+        int offsZ = ((corner ^ 4) - corner) * vertexCountPerCorner;
+
+        // Face polygons
+        if (winding) {
+            ip[iidx++] = vidx;
+            ip[iidx++] = vidx + offsX;
+            ip[iidx++] = vidx + offsY;
+
+            ip[iidx++] = vidx + vertexCountPerCorner - n - 2;
+            ip[iidx++] = vidx + vertexCountPerCorner - n - 2 + offsY;
+            ip[iidx++] = vidx + vertexCountPerCorner - n - 2 + offsZ;
+
+            ip[iidx++] = vidx + vertexCountPerCorner - 1;
+            ip[iidx++] = vidx + vertexCountPerCorner - 1 + offsZ;
+            ip[iidx++] = vidx + vertexCountPerCorner - 1 + offsX;
+        }
+
+        for (int i = 0; i < n + 2; ++i) {
+
+            // Edge polygons
+            if (winding && i < n + 1) {
+                ip[iidx++] = vidx + i + 1;
+                ip[iidx++] = vidx;
+                ip[iidx++] = vidx + offsY + i + 1;
+                ip[iidx++] = vidx + offsY;
+                ip[iidx++] = vidx + offsY + i + 1;
+                ip[iidx++] = vidx;
+
+                ip[iidx++] = vidx + i;
+                ip[iidx++] = vidx + 2 * i + 2;
+                ip[iidx++] = vidx + i + offsX;
+                ip[iidx++] = vidx + 2 * i + offsX + 2;
+                ip[iidx++] = vidx + i + offsX;
+                ip[iidx++] = vidx + 2 * i + 2;
+
+                ip[iidx++] = (corner + 1) * vertexCountPerCorner - 1 - i;
+                ip[iidx++] = (corner + 1) * vertexCountPerCorner - 2 - i;
+                ip[iidx++] = (corner + 1) * vertexCountPerCorner - 1 - i + offsZ;
+                ip[iidx++] = (corner + 1) * vertexCountPerCorner - 2 - i + offsZ;
+                ip[iidx++] = (corner + 1) * vertexCountPerCorner - 1 - i + offsZ;
+                ip[iidx++] = (corner + 1) * vertexCountPerCorner - 2 - i;
+            }
+
+            for (int j = 0; j <= i; ++j) {
+                gfx::Vector3f normal = gfx::Vector3f::vector(i - j, j, n + 1 - i).normalized();
+                gfx::Vector3f pos = centre * (0.5f - r + r * normal);
+
+                vp[vidx].position = scale * pos;
+                vp[vidx].normal = centre * normal;
+                vp[vidx].texCoord = gfx::Vector2f::vector(pos[0], pos[1]) + 0.5f;
+
+                // Corner polygons
+                if (i < n + 1) {
+                    ip[iidx++] = vidx;
+                    ip[iidx++] = vidx + i + 2 - winding;
+                    ip[iidx++] = vidx + i + 1 + winding;
+                }
+                if (i < n) {
+                    ip[iidx++] = vidx + i + 1 + winding;
+                    ip[iidx++] = vidx + i + 2 - winding;
+                    ip[iidx++] = vidx + 2 * i + 4;
+                }
+
+                ++vidx;
+            }
+        }
+
+    }
+
+    m_ib.unlock();
+    m_vb.unlock();
+}
+
diff --git a/demos/boxes/roundedbox.h b/demos/boxes/roundedbox.h
new file mode 100644
index 0000000000..b934ade2e2
--- /dev/null
+++ b/demos/boxes/roundedbox.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ROUNDEDBOX_H
+#define ROUNDEDBOX_H
+
+//#include <GL/glew.h>
+#include "glextensions.h"
+
+#include <QtGui>
+#include <QtOpenGL>
+
+#include "gltrianglemesh.h"
+#include "vector.h"
+#include "glbuffers.h"
+
+struct P3T2N3Vertex
+{
+    gfx::Vector3f position;
+    gfx::Vector2f texCoord;
+    gfx::Vector3f normal;
+    static VertexDescription description[];
+};
+
+class GLRoundedBox : public GLTriangleMesh<P3T2N3Vertex, unsigned short>
+{
+public:
+    // 0 < r < 0.5, 0 <= n <= 125
+    GLRoundedBox(float r = 0.25f, float scale = 1.0f, int n = 10);
+};
+
+
+#endif
diff --git a/demos/boxes/scene.cpp b/demos/boxes/scene.cpp
new file mode 100644
index 0000000000..1040e17675
--- /dev/null
+++ b/demos/boxes/scene.cpp
@@ -0,0 +1,1057 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "scene.h"
+
+#include "3rdparty/fbm.h"
+
+void checkGLErrors(const QString& prefix)
+{
+    switch (glGetError()) {
+    case GL_NO_ERROR:
+        //qDebug() << prefix << tr("No error.");
+        break;
+    case GL_INVALID_ENUM:
+        qDebug() << prefix << QObject::tr("Invalid enum.");
+        break;
+    case GL_INVALID_VALUE:
+        qDebug() << prefix << QObject::tr("Invalid value.");
+        break;
+    case GL_INVALID_OPERATION:
+        qDebug() << prefix << QObject::tr("Invalid operation.");
+        break;
+    case GL_STACK_OVERFLOW:
+        qDebug() << prefix << QObject::tr("Stack overflow.");
+        break;
+    case GL_STACK_UNDERFLOW:
+        qDebug() << prefix << QObject::tr("Stack underflow.");
+        break;
+    case GL_OUT_OF_MEMORY:
+        qDebug() << prefix << QObject::tr("Out of memory.");
+        break;
+    default:
+        qDebug() << prefix << QObject::tr("Unknown error.");
+        break;
+    }
+}
+
+//============================================================================//
+//                                  ColorEdit                                 //
+//============================================================================//
+
+ColorEdit::ColorEdit(QRgb initialColor, int id)
+    : m_color(initialColor), m_id(id)
+{
+    QHBoxLayout *layout = new QHBoxLayout;
+    setLayout(layout);
+    layout->setContentsMargins(0, 0, 0, 0);
+
+    m_lineEdit = new QLineEdit(QString::number(m_color, 16));
+    layout->addWidget(m_lineEdit);
+
+    m_button = new QFrame;
+    QPalette palette = m_button->palette();
+    palette.setColor(QPalette::Window, QColor(m_color));
+    m_button->setPalette(palette);
+    m_button->setAutoFillBackground(true);
+    m_button->setMinimumSize(32, 0);
+    m_button->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
+    m_button->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
+    layout->addWidget(m_button);
+
+    connect(m_lineEdit, SIGNAL(editingFinished()), this, SLOT(editDone()));
+}
+
+void ColorEdit::editDone()
+{
+    bool ok;
+    QRgb newColor = m_lineEdit->text().toUInt(&ok, 16);
+    if (ok)
+        setColor(newColor);
+}
+
+void ColorEdit::mousePressEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton) {
+        QColor color(m_color);
+        QColorDialog dialog(color, 0);
+        dialog.setOption(QColorDialog::ShowAlphaChannel, true);
+// The ifdef block is a workaround for the beta, TODO: remove when bug 238525 is fixed
+#ifdef Q_WS_MAC
+        dialog.setOption(QColorDialog::DontUseNativeDialog, true);
+#endif
+        dialog.move(280, 120);
+        if (dialog.exec() == QDialog::Rejected)
+            return;
+        QRgb newColor = dialog.selectedColor().rgba();
+        if (newColor == m_color)
+            return;
+        setColor(newColor);
+    }
+}
+
+void ColorEdit::setColor(QRgb color)
+{
+    m_color = color;
+    m_lineEdit->setText(QString::number(m_color, 16)); // "Clean up" text
+    QPalette palette = m_button->palette();
+    palette.setColor(QPalette::Window, QColor(m_color));
+    m_button->setPalette(palette);
+    emit colorChanged(m_color, m_id);
+}
+
+//============================================================================//
+//                                  FloatEdit                                 //
+//============================================================================//
+
+FloatEdit::FloatEdit(float initialValue, int id)
+    : m_value(initialValue), m_id(id)
+{
+    QHBoxLayout *layout = new QHBoxLayout;
+    setLayout(layout);
+    layout->setContentsMargins(0, 0, 0, 0);
+
+    m_lineEdit = new QLineEdit(QString::number(m_value));
+    layout->addWidget(m_lineEdit);
+
+    connect(m_lineEdit, SIGNAL(editingFinished()), this, SLOT(editDone()));
+}
+
+void FloatEdit::editDone()
+{
+    bool ok;
+    float newValue = m_lineEdit->text().toFloat(&ok);
+    if (ok) {
+        m_value = newValue;
+        m_lineEdit->setText(QString::number(m_value)); // "Clean up" text
+        emit valueChanged(m_value, m_id);
+    }
+}
+
+//============================================================================//
+//                           TwoSidedGraphicsWidget                           //
+//============================================================================//
+
+TwoSidedGraphicsWidget::TwoSidedGraphicsWidget(QGraphicsScene *scene)
+    : QObject(scene)
+    , m_current(0)
+    , m_angle(0)
+    , m_delta(0)
+{
+    for (int i = 0; i < 2; ++i)
+        m_proxyWidgets[i] = 0;
+}
+
+void TwoSidedGraphicsWidget::setWidget(int index, QWidget *widget)
+{
+    if (index < 0 || index >= 2)
+	{
+		qWarning("TwoSidedGraphicsWidget::setWidget: Index out of bounds, index == %d", index);
+		return;
+	}
+
+    GraphicsWidget *proxy = new GraphicsWidget;
+    proxy->setWidget(widget);
+
+    if (m_proxyWidgets[index])
+        delete m_proxyWidgets[index];
+    m_proxyWidgets[index] = proxy;
+
+    proxy->setCacheMode(QGraphicsItem::ItemCoordinateCache);
+    proxy->setZValue(1e30); // Make sure the dialog is drawn on top of all other (OpenGL) items
+
+    if (index != m_current)
+        proxy->setVisible(false);
+
+    qobject_cast<QGraphicsScene *>(parent())->addItem(proxy);
+}
+
+QWidget *TwoSidedGraphicsWidget::widget(int index)
+{
+    if (index < 0 || index >= 2)
+	{
+		qWarning("TwoSidedGraphicsWidget::widget: Index out of bounds, index == %d", index);
+		return 0;
+	}
+    return m_proxyWidgets[index]->widget();
+}
+
+void TwoSidedGraphicsWidget::flip()
+{
+    m_delta = (m_current == 0 ? 9 : -9);
+    animateFlip();
+}
+
+void TwoSidedGraphicsWidget::animateFlip()
+{
+    m_angle += m_delta;
+    if (m_angle == 90) {
+        int old = m_current;
+        m_current ^= 1;
+        m_proxyWidgets[old]->setVisible(false);
+        m_proxyWidgets[m_current]->setVisible(true);
+        m_proxyWidgets[m_current]->setGeometry(m_proxyWidgets[old]->geometry());
+    }
+
+    QRectF r = m_proxyWidgets[m_current]->boundingRect();
+    m_proxyWidgets[m_current]->setTransform(QTransform()
+        .translate(r.width() / 2, r.height() / 2)
+        .rotate(m_angle - 180 * m_current, Qt::YAxis)
+        .translate(-r.width() / 2, -r.height() / 2));
+
+    if ((m_current == 0 && m_angle > 0) || (m_current == 1 && m_angle < 180))
+        QTimer::singleShot(25, this, SLOT(animateFlip()));
+}
+
+QVariant GraphicsWidget::itemChange(GraphicsItemChange change, const QVariant &value)
+{
+    if (change == ItemPositionChange && scene()) {
+        QRectF rect = boundingRect();
+        QPointF pos = value.toPointF();
+        QRectF sceneRect = scene()->sceneRect();
+        if (pos.x() + rect.left() < sceneRect.left())
+            pos.setX(sceneRect.left() - rect.left());
+        else if (pos.x() + rect.right() >= sceneRect.right())
+            pos.setX(sceneRect.right() - rect.right());
+        if (pos.y() + rect.top() < sceneRect.top())
+            pos.setY(sceneRect.top() - rect.top());
+        else if (pos.y() + rect.bottom() >= sceneRect.bottom())
+            pos.setY(sceneRect.bottom() - rect.bottom());
+        return pos;
+    }
+    return QGraphicsProxyWidget::itemChange(change, value);
+}
+
+void GraphicsWidget::resizeEvent(QGraphicsSceneResizeEvent *event)
+{
+    setCacheMode(QGraphicsItem::NoCache);
+    setCacheMode(QGraphicsItem::ItemCoordinateCache);
+    QGraphicsProxyWidget::resizeEvent(event);
+}
+
+void GraphicsWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    painter->setRenderHint(QPainter::Antialiasing, false);
+    QGraphicsProxyWidget::paint(painter, option, widget);
+    //painter->setRenderHint(QPainter::Antialiasing, true);
+}
+
+//============================================================================//
+//                             RenderOptionsDialog                            //
+//============================================================================//
+
+RenderOptionsDialog::RenderOptionsDialog()
+    : QDialog(0, Qt::CustomizeWindowHint | Qt::WindowTitleHint)
+{
+    setWindowOpacity(0.75);
+    setWindowTitle(tr("Options (double click to flip)"));
+    QGridLayout *layout = new QGridLayout;
+    setLayout(layout);
+    layout->setColumnStretch(1, 1);
+
+    int row = 0;
+
+    QCheckBox *check = new QCheckBox(tr("Dynamic cube map"));
+    check->setCheckState(Qt::Unchecked);
+    // Dynamic cube maps are only enabled when multi-texturing and render to texture are available.
+    check->setEnabled(glActiveTexture && glGenFramebuffersEXT);
+    connect(check, SIGNAL(stateChanged(int)), this, SIGNAL(dynamicCubemapToggled(int)));
+    layout->addWidget(check, 0, 0, 1, 2);
+    ++row;
+
+    QPalette palette;
+
+    // Load all .par files
+    // .par files have a simple syntax for specifying user adjustable uniform variables.
+    QSet<QByteArray> uniforms;
+    QList<QString> filter = QStringList("*.par");
+    QList<QFileInfo> files = QDir(":/res/boxes/").entryInfoList(filter, QDir::Files | QDir::Readable);
+
+    foreach (QFileInfo fileInfo, files) {
+        QFile file(fileInfo.absoluteFilePath());
+        if (file.open(QIODevice::ReadOnly)) {
+            while (!file.atEnd()) {
+                QList<QByteArray> tokens = file.readLine().simplified().split(' ');
+                QList<QByteArray>::const_iterator it = tokens.begin();
+                if (it == tokens.end())
+                    continue;
+                QByteArray type = *it;
+                if (++it == tokens.end())
+                    continue;
+                QByteArray name = *it;
+                bool singleElement = (tokens.size() == 3); // type, name and one value
+                char counter[10] = "000000000";
+                int counterPos = 8; // position of last digit
+                while (++it != tokens.end()) {
+                    m_parameterNames << name;
+                    if (!singleElement) {
+                        m_parameterNames.back() += "[";
+                        m_parameterNames.back() += counter + counterPos;
+                        m_parameterNames.back() += "]";
+                        int j = 8; // position of last digit
+                        ++counter[j];
+                        while (j > 0 && counter[j] > '9') {
+                            counter[j] = '0';
+                            ++counter[--j];
+                        }
+                        if (j < counterPos)
+                            counterPos = j;
+                    }
+
+                    if (type == "color") {
+                        layout->addWidget(new QLabel(m_parameterNames.back()));
+                        bool ok;
+                        ColorEdit *colorEdit = new ColorEdit(it->toUInt(&ok, 16), m_parameterNames.size() - 1);
+                        m_parameterEdits << colorEdit;
+                        layout->addWidget(colorEdit);
+                        connect(colorEdit, SIGNAL(colorChanged(QRgb, int)), this, SLOT(setColorParameter(QRgb, int)));
+                        ++row;
+                    } else if (type == "float") {
+                        layout->addWidget(new QLabel(m_parameterNames.back()));
+                        bool ok;
+                        FloatEdit *floatEdit = new FloatEdit(it->toFloat(&ok), m_parameterNames.size() - 1);
+                        m_parameterEdits << floatEdit;
+                        layout->addWidget(floatEdit);
+                        connect(floatEdit, SIGNAL(valueChanged(float, int)), this, SLOT(setFloatParameter(float, int)));
+                        ++row;
+                    }
+                }
+            }
+            file.close();
+        }
+    }
+
+    layout->addWidget(new QLabel(tr("Texture:")));
+    m_textureCombo = new QComboBox;
+    connect(m_textureCombo, SIGNAL(currentIndexChanged(int)), this, SIGNAL(textureChanged(int)));
+    layout->addWidget(m_textureCombo);
+    ++row;
+
+    layout->addWidget(new QLabel(tr("Shader:")));
+    m_shaderCombo = new QComboBox;
+    connect(m_shaderCombo, SIGNAL(currentIndexChanged(int)), this, SIGNAL(shaderChanged(int)));
+    layout->addWidget(m_shaderCombo);
+    ++row;
+
+    layout->setRowStretch(row, 1);
+}
+
+int RenderOptionsDialog::addTexture(const QString &name)
+{
+    m_textureCombo->addItem(name);
+    return m_textureCombo->count() - 1;
+}
+
+int RenderOptionsDialog::addShader(const QString &name)
+{
+    m_shaderCombo->addItem(name);
+    return m_shaderCombo->count() - 1;
+}
+
+void RenderOptionsDialog::emitParameterChanged()
+{
+    foreach (ParameterEdit *edit, m_parameterEdits)
+        edit->emitChange();
+}
+
+void RenderOptionsDialog::setColorParameter(QRgb color, int id)
+{
+    emit colorParameterChanged(m_parameterNames[id], color);
+}
+
+void RenderOptionsDialog::setFloatParameter(float value, int id)
+{
+    emit floatParameterChanged(m_parameterNames[id], value);
+}
+
+void RenderOptionsDialog::mouseDoubleClickEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton)
+        emit doubleClicked();
+}
+
+//============================================================================//
+//                                 ItemDialog                                 //
+//============================================================================//
+
+ItemDialog::ItemDialog()
+    : QDialog(0, Qt::CustomizeWindowHint | Qt::WindowTitleHint)
+{
+    setWindowTitle(tr("Items (double click to flip)"));
+    setWindowOpacity(0.75);
+    resize(160, 100);
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    setLayout(layout);
+    QPushButton *button;
+
+    button = new QPushButton(tr("Add Qt box"));
+    layout->addWidget(button);
+    connect(button, SIGNAL(clicked()), this, SLOT(triggerNewQtBox()));
+
+    button = new QPushButton(tr("Add circle"));
+    layout->addWidget(button);
+    connect(button, SIGNAL(clicked()), this, SLOT(triggerNewCircleItem()));
+
+    button = new QPushButton(tr("Add square"));
+    layout->addWidget(button);
+    connect(button, SIGNAL(clicked()), this, SLOT(triggerNewSquareItem()));
+
+    layout->addStretch(1);
+}
+
+void ItemDialog::triggerNewQtBox()
+{
+    emit newItemTriggered(QtBoxItem);
+}
+
+void ItemDialog::triggerNewCircleItem()
+{
+    emit newItemTriggered(CircleItem);
+}
+
+void ItemDialog::triggerNewSquareItem()
+{
+    emit newItemTriggered(SquareItem);
+}
+
+void ItemDialog::mouseDoubleClickEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton)
+        emit doubleClicked();
+}
+
+//============================================================================//
+//                                    Scene                                   //
+//============================================================================//
+
+const static char environmentShaderText[] =
+    "uniform samplerCube env;"
+    "void main() {"
+        "gl_FragColor = textureCube(env, gl_TexCoord[1].xyz);"
+    "}";
+
+Scene::Scene(int width, int height, int maxTextureSize)
+    : m_distExp(600)
+    , m_frame(0)
+    , m_maxTextureSize(maxTextureSize)
+    , m_currentShader(0)
+    , m_currentTexture(0)
+    , m_dynamicCubemap(false)
+    , m_updateAllCubemaps(true)
+    , m_box(0)
+    , m_vertexShader(0)
+    , m_environmentShader(0)
+    , m_environmentProgram(0)
+{
+    setSceneRect(0, 0, width, height);
+
+    m_trackBalls[0] = TrackBall(0.0005f, gfx::Vector3f::vector(0, 1, 0), TrackBall::Sphere);
+    m_trackBalls[1] = TrackBall(0.0001f, gfx::Vector3f::vector(0, 0, 1), TrackBall::Sphere);
+    m_trackBalls[2] = TrackBall(0.0f, gfx::Vector3f::vector(0, 1, 0), TrackBall::Plane);
+
+    m_renderOptions = new RenderOptionsDialog;
+    m_renderOptions->move(20, 120);
+    m_renderOptions->resize(m_renderOptions->sizeHint());
+
+    connect(m_renderOptions, SIGNAL(dynamicCubemapToggled(int)), this, SLOT(toggleDynamicCubemap(int)));
+    connect(m_renderOptions, SIGNAL(colorParameterChanged(const QString &, QRgb)), this, SLOT(setColorParameter(const QString &, QRgb)));
+    connect(m_renderOptions, SIGNAL(floatParameterChanged(const QString &, float)), this, SLOT(setFloatParameter(const QString &, float)));
+    connect(m_renderOptions, SIGNAL(textureChanged(int)), this, SLOT(setTexture(int)));
+    connect(m_renderOptions, SIGNAL(shaderChanged(int)), this, SLOT(setShader(int)));
+
+    m_itemDialog = new ItemDialog;
+    connect(m_itemDialog, SIGNAL(newItemTriggered(ItemDialog::ItemType)), this, SLOT(newItem(ItemDialog::ItemType)));
+
+    TwoSidedGraphicsWidget *twoSided = new TwoSidedGraphicsWidget(this);
+    twoSided->setWidget(0, m_renderOptions);
+    twoSided->setWidget(1, m_itemDialog);
+
+    connect(m_renderOptions, SIGNAL(doubleClicked()), twoSided, SLOT(flip()));
+    connect(m_itemDialog, SIGNAL(doubleClicked()), twoSided, SLOT(flip()));
+
+    addItem(new QtBox(64, width - 64, height - 64));
+    addItem(new QtBox(64, width - 64, 64));
+    addItem(new QtBox(64, 64, height - 64));
+    addItem(new QtBox(64, 64, 64));
+
+    initGL();
+
+    m_timer = new QTimer(this);
+    m_timer->setInterval(20);
+    connect(m_timer, SIGNAL(timeout()), this, SLOT(update()));
+    m_timer->start();
+
+    m_time.start();
+}
+
+Scene::~Scene()
+{
+    if (m_box)
+        delete m_box;
+    foreach (GLTexture *texture, m_textures)
+        if (texture) delete texture;
+    if (m_mainCubemap)
+        delete m_mainCubemap;
+    foreach (GLProgram *program, m_programs)
+        if (program) delete program;
+    if (m_vertexShader)
+        delete m_vertexShader;
+    foreach (GLFragmentShader *shader, m_fragmentShaders)
+        if (shader) delete shader;
+    foreach (GLRenderTargetCube *rt, m_cubemaps)
+        if (rt) delete rt;
+    if (m_environmentShader)
+        delete m_environmentShader;
+    if (m_environmentProgram)
+        delete m_environmentProgram;
+}
+
+void Scene::initGL()
+{
+    m_box = new GLRoundedBox(0.25f, 1.0f, 10);
+
+    m_vertexShader = new GLVertexShader(":/res/boxes/basic.vsh");
+
+    QStringList list;
+    list << ":/res/boxes/cubemap_posx.jpg" << ":/res/boxes/cubemap_negx.jpg" << ":/res/boxes/cubemap_posy.jpg"
+         << ":/res/boxes/cubemap_negy.jpg" << ":/res/boxes/cubemap_posz.jpg" << ":/res/boxes/cubemap_negz.jpg";
+    m_environment = new GLTextureCube(list, qMin(1024, m_maxTextureSize));
+    m_environmentShader = new GLFragmentShader(environmentShaderText, strlen(environmentShaderText));
+    m_environmentProgram = new GLProgram;
+    m_environmentProgram->attach(*m_vertexShader);
+    m_environmentProgram->attach(*m_environmentShader);
+
+    const int NOISE_SIZE = 128; // for a different size, B and BM in fbm.c must also be changed
+    m_noise = new GLTexture3D(NOISE_SIZE, NOISE_SIZE, NOISE_SIZE); 
+    QRgb *data = new QRgb[NOISE_SIZE * NOISE_SIZE * NOISE_SIZE];
+    memset(data, 0, NOISE_SIZE * NOISE_SIZE * NOISE_SIZE * sizeof(QRgb));
+    QRgb *p = data;
+    float pos[3];
+    for (int k = 0; k < NOISE_SIZE; ++k) {
+        pos[2] = k * (0x20 / (float)NOISE_SIZE);
+        for (int j = 0; j < NOISE_SIZE; ++j) {
+            for (int i = 0; i < NOISE_SIZE; ++i) {
+                for (int byte = 0; byte < 4; ++byte) {
+                    pos[0] = (i + (byte & 1) * 16) * (0x20 / (float)NOISE_SIZE);
+                    pos[1] = (j + (byte & 2) * 8) * (0x20 / (float)NOISE_SIZE);
+                    *p |= (int)(128.0f * (noise3(pos) + 1.0f)) << (byte * 8);
+                }
+                ++p;
+            }
+        }
+    }
+    m_noise->load(NOISE_SIZE, NOISE_SIZE, NOISE_SIZE, data);
+    delete[] data;
+
+    m_mainCubemap = new GLRenderTargetCube(512);
+
+    QStringList filter;
+    QList<QFileInfo> files;
+
+    // Load all .png files as textures
+    m_currentTexture = 0;
+    filter = QStringList("*.png");
+    files = QDir(":/res/boxes/").entryInfoList(filter, QDir::Files | QDir::Readable);
+
+    foreach (QFileInfo file, files) {
+        GLTexture *texture = new GLTexture2D(file.absoluteFilePath(), qMin(256, m_maxTextureSize), qMin(256, m_maxTextureSize));
+        if (texture->failed()) {
+            delete texture;
+            continue;
+        }
+        m_textures << texture;
+        m_renderOptions->addTexture(file.baseName());
+    }
+
+    if (m_textures.size() == 0)
+        m_textures << new GLTexture2D(qMin(64, m_maxTextureSize), qMin(64, m_maxTextureSize));
+
+    // Load all .fsh files as fragment shaders
+    m_currentShader = 0;
+    filter = QStringList("*.fsh");
+    files = QDir(":/res/boxes/").entryInfoList(filter, QDir::Files | QDir::Readable);
+    foreach (QFileInfo file, files) {
+        GLProgram *program = new GLProgram;
+        GLFragmentShader* shader = new GLFragmentShader(file.absoluteFilePath());
+        // The program does not take ownership over the shaders, so store them in a vector so they can be deleted afterwards.
+        program->attach(*m_vertexShader);
+        program->attach(*shader);
+        if (program->failed()) {
+            qWarning("Failed to compile and link shader program");
+            qWarning("Vertex shader log:");
+            qWarning() << m_vertexShader->log();
+            qWarning() << "Fragment shader log ( file =" << file.absoluteFilePath() << "):";
+            qWarning() << shader->log();
+            qWarning("Shader program log:");
+            qWarning() << program->log();
+
+            delete shader;
+            delete program;
+            continue;
+        }
+
+        m_fragmentShaders << shader;
+        m_programs << program;
+        m_renderOptions->addShader(file.baseName());
+
+        program->bind();
+        m_cubemaps << (program->hasParameter("env") ? new GLRenderTargetCube(qMin(256, m_maxTextureSize)) : 0);
+        program->unbind();
+    }
+
+    if (m_programs.size() == 0)
+        m_programs << new GLProgram;
+
+    m_renderOptions->emitParameterChanged();
+}
+
+// If one of the boxes should not be rendered, set excludeBox to its index.
+// If the main box should not be rendered, set excludeBox to -1.
+void Scene::renderBoxes(const gfx::Matrix4x4f &view, int excludeBox)
+{
+    gfx::Matrix4x4f invView = view.inverse();
+
+    // If multi-texturing is supported, use three saplers.
+    if (glActiveTexture) {
+        glActiveTexture(GL_TEXTURE0);
+        m_textures[m_currentTexture]->bind();
+        glActiveTexture(GL_TEXTURE2);
+        m_noise->bind();
+        glActiveTexture(GL_TEXTURE1);
+    } else {
+        m_textures[m_currentTexture]->bind();
+    }
+
+    glDisable(GL_LIGHTING);
+    glDisable(GL_CULL_FACE);
+
+    gfx::Matrix4x4f viewRotation(view);
+    viewRotation(3, 0) = viewRotation(3, 1) = viewRotation(3, 2) = 0.0f;
+    viewRotation(0, 3) = viewRotation(1, 3) = viewRotation(2, 3) = 0.0f;
+    viewRotation(3, 3) = 1.0f;
+    glLoadMatrixf(viewRotation.bits());
+    glScalef(20.0f, 20.0f, 20.0f);
+
+    // Don't render the environment if the environment texture can't be set for the correct sampler.
+    if (glActiveTexture) {
+        m_environment->bind();
+        m_environmentProgram->bind();
+        m_environmentProgram->setInt("tex", 0);
+        m_environmentProgram->setInt("env", 1);
+        m_environmentProgram->setInt("noise", 2);
+        m_box->draw();
+        m_environmentProgram->unbind();
+        m_environment->unbind();
+    }
+
+    glLoadMatrixf(view.bits());
+
+    glEnable(GL_CULL_FACE);
+    glEnable(GL_LIGHTING);
+
+    for (int i = 0; i < m_programs.size(); ++i) {
+        if (i == excludeBox)
+            continue;
+
+        glPushMatrix();
+        gfx::Matrix4x4f m;
+        m_trackBalls[1].rotation().matrix(m);
+        glMultMatrixf(m.bits());
+
+        glRotatef(360.0f * i / m_programs.size(), 0.0f, 0.0f, 1.0f);
+        glTranslatef(2.0f, 0.0f, 0.0f);
+        glScalef(0.3f, 0.6f, 0.6f);
+
+        if (glActiveTexture) {
+            if (m_dynamicCubemap && m_cubemaps[i])
+                m_cubemaps[i]->bind();
+            else
+                m_environment->bind();
+        }
+        m_programs[i]->bind();
+        m_programs[i]->setInt("tex", 0);
+        m_programs[i]->setInt("env", 1);
+        m_programs[i]->setInt("noise", 2);
+        m_programs[i]->setMatrix("view", view);
+        m_programs[i]->setMatrix("invView", invView);
+        m_box->draw();
+        m_programs[i]->unbind();
+
+        if (glActiveTexture) {
+            if (m_dynamicCubemap && m_cubemaps[i])
+                m_cubemaps[i]->unbind();
+            else
+                m_environment->unbind();
+        }
+        glPopMatrix();
+    }
+
+    if (-1 != excludeBox) {
+        gfx::Matrix4x4f m;
+        m_trackBalls[0].rotation().matrix(m);
+        glMultMatrixf(m.bits());
+
+        if (glActiveTexture) {
+            if (m_dynamicCubemap)
+                m_mainCubemap->bind();
+            else
+                m_environment->bind();
+        }
+
+        m_programs[m_currentShader]->bind();
+        m_programs[m_currentShader]->setInt("tex", 0);
+        m_programs[m_currentShader]->setInt("env", 1);
+        m_programs[m_currentShader]->setInt("noise", 2);
+        m_programs[m_currentShader]->setMatrix("view", view);
+        m_programs[m_currentShader]->setMatrix("invView", invView);
+        m_box->draw();
+        m_programs[m_currentShader]->unbind();
+
+        if (glActiveTexture) {
+            if (m_dynamicCubemap)
+                m_mainCubemap->unbind();
+            else
+                m_environment->unbind();
+        }
+    }
+
+    if (glActiveTexture) {
+        glActiveTexture(GL_TEXTURE2);
+        m_noise->unbind();
+        glActiveTexture(GL_TEXTURE0);
+    }
+    m_textures[m_currentTexture]->unbind();
+}
+
+void Scene::setStates()
+{
+    //glClearColor(0.25f, 0.25f, 0.5f, 1.0f);
+
+    glEnable(GL_DEPTH_TEST);
+    glEnable(GL_CULL_FACE);
+    glEnable(GL_LIGHTING);
+    //glEnable(GL_COLOR_MATERIAL);
+    glEnable(GL_TEXTURE_2D);
+    glEnable(GL_NORMALIZE);
+
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+    glLoadIdentity();
+
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+    glLoadIdentity();
+
+    setLights();
+
+    float materialSpecular[] = {0.5f, 0.5f, 0.5f, 1.0f};
+    glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, materialSpecular);
+    glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 32.0f);
+}
+
+void Scene::setLights()
+{
+    glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
+    //float lightColour[] = {1.0f, 1.0f, 1.0f, 1.0f};
+    float lightDir[] = {0.0f, 0.0f, 1.0f, 0.0f};
+    //glLightfv(GL_LIGHT0, GL_DIFFUSE, lightColour);
+    //glLightfv(GL_LIGHT0, GL_SPECULAR, lightColour);
+    glLightfv(GL_LIGHT0, GL_POSITION, lightDir);
+    glLightModelf(GL_LIGHT_MODEL_LOCAL_VIEWER, 1.0f);
+    glEnable(GL_LIGHT0);
+}
+
+void Scene::defaultStates()
+{
+    //glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_CULL_FACE);
+    glDisable(GL_LIGHTING);
+    //glDisable(GL_COLOR_MATERIAL);
+    glDisable(GL_TEXTURE_2D);
+    glDisable(GL_LIGHT0);
+    glDisable(GL_NORMALIZE);
+
+    glMatrixMode(GL_MODELVIEW);
+    glPopMatrix();
+
+    glMatrixMode(GL_PROJECTION);
+    glPopMatrix();
+
+    glLightModelf(GL_LIGHT_MODEL_LOCAL_VIEWER, 0.0f);
+    float defaultMaterialSpecular[] = {0.0f, 0.0f, 0.0f, 1.0f};
+    glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, defaultMaterialSpecular);
+    glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 0.0f);
+}
+
+void Scene::renderCubemaps()
+{
+    // To speed things up, only update the cubemaps for the small cubes every N frames.
+    const int N = (m_updateAllCubemaps ? 1 : 3);
+
+    gfx::Matrix4x4f mat;
+    GLRenderTargetCube::getProjectionMatrix(mat, 0.1f, 100.0f);
+
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+    glLoadMatrixf(mat.bits());
+
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+
+    gfx::Vector3f center;
+
+    for (int i = m_frame % N; i < m_cubemaps.size(); i += N) {
+        if (0 == m_cubemaps[i])
+            continue;
+
+        float angle = 2.0f * PI * i / m_cubemaps.size();
+        center = m_trackBalls[1].rotation().transform(gfx::Vector3f::vector(cos(angle), sin(angle), 0));
+
+        for (int face = 0; face < 6; ++face) {
+            m_cubemaps[i]->begin(face);
+
+            GLRenderTargetCube::getViewMatrix(mat, face);
+            gfx::Vector4f v = gfx::Vector4f::vector(-center[0], -center[1], -center[2], 1.0);
+            mat[3] = v * mat;
+
+            glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+            renderBoxes(mat, i);
+
+            m_cubemaps[i]->end();
+        }
+    }
+
+    for (int face = 0; face < 6; ++face) {
+        m_mainCubemap->begin(face);
+        GLRenderTargetCube::getViewMatrix(mat, face);
+
+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        renderBoxes(mat, -1);
+
+        m_mainCubemap->end();
+    }
+
+    glPopMatrix();
+
+    glMatrixMode(GL_PROJECTION);
+    glPopMatrix();
+
+    m_updateAllCubemaps = false;
+}
+
+void Scene::drawBackground(QPainter *painter, const QRectF &)
+{
+    float width = float(painter->device()->width());
+    float height = float(painter->device()->height());
+
+    setStates();
+
+    if (m_dynamicCubemap)
+        renderCubemaps();
+
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+    glMatrixMode(GL_PROJECTION);
+    gluPerspective(60.0, width / height, 0.01, 15.0);
+
+    glMatrixMode(GL_MODELVIEW);
+
+    //gfx::Matrix4x4f view = gfx::Matrix4x4f::identity();
+    //view(3, 2) -= 2.0f * exp(m_distExp / 1200.0f);
+
+    gfx::Matrix4x4f view;
+    m_trackBalls[2].rotation().matrix(view);
+    view(3, 2) -= 2.0f * exp(m_distExp / 1200.0f);
+    renderBoxes(view);
+
+    defaultStates();
+    ++m_frame;
+}
+
+QPointF Scene::pixelPosToViewPos(const QPointF& p)
+{
+    return QPointF(2.0 * float(p.x()) / width() - 1.0,
+                   1.0 - 2.0 * float(p.y()) / height());
+}
+
+void Scene::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    QGraphicsScene::mouseMoveEvent(event);
+    if (event->isAccepted())
+        return;
+
+    if (event->buttons() & Qt::LeftButton) {
+        m_trackBalls[0].move(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugate());
+        event->accept();
+    } else {
+        m_trackBalls[0].release(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugate());
+    }
+
+    if (event->buttons() & Qt::RightButton) {
+        m_trackBalls[1].move(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugate());
+        event->accept();
+    } else {
+        m_trackBalls[1].release(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugate());
+    }
+
+    if (event->buttons() & Qt::MidButton) {
+        m_trackBalls[2].move(pixelPosToViewPos(event->scenePos()), gfx::Quaternionf::identity());
+        event->accept();
+    } else {
+        m_trackBalls[2].release(pixelPosToViewPos(event->scenePos()), gfx::Quaternionf::identity());
+    }
+}
+
+void Scene::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    QGraphicsScene::mousePressEvent(event);
+    if (event->isAccepted())
+        return;
+
+    if (event->buttons() & Qt::LeftButton) {
+        m_trackBalls[0].push(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugate());
+        event->accept();
+    }
+
+    if (event->buttons() & Qt::RightButton) {
+        m_trackBalls[1].push(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugate());
+        event->accept();
+    }
+
+    if (event->buttons() & Qt::MidButton) {
+        m_trackBalls[2].push(pixelPosToViewPos(event->scenePos()), gfx::Quaternionf::identity());
+        event->accept();
+    }
+}
+
+void Scene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    QGraphicsScene::mouseReleaseEvent(event);
+    if (event->isAccepted())
+        return;
+
+    if (event->button() == Qt::LeftButton) {
+        m_trackBalls[0].release(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugate());
+        event->accept();
+    }
+
+    if (event->button() == Qt::RightButton) {
+        m_trackBalls[1].release(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugate());
+        event->accept();
+    }
+
+    if (event->button() == Qt::MidButton) {
+        m_trackBalls[2].release(pixelPosToViewPos(event->scenePos()), gfx::Quaternionf::identity());
+        event->accept();
+    }
+}
+
+void Scene::wheelEvent(QGraphicsSceneWheelEvent * event)
+{
+    QGraphicsScene::wheelEvent(event);
+    if (!event->isAccepted()) {
+        m_distExp += event->delta();
+        if (m_distExp < -8 * 120)
+            m_distExp = -8 * 120;
+        if (m_distExp > 10 * 120)
+            m_distExp = 10 * 120;
+        event->accept();
+    }
+}
+
+void Scene::setShader(int index)
+{
+    if (index >= 0 && index < m_fragmentShaders.size())
+        m_currentShader = index;
+}
+
+void Scene::setTexture(int index)
+{
+    if (index >= 0 && index < m_textures.size())
+        m_currentTexture = index;
+}
+
+void Scene::toggleDynamicCubemap(int state)
+{
+    if ((m_dynamicCubemap = (state == Qt::Checked)))
+        m_updateAllCubemaps = true;
+}
+
+void Scene::setColorParameter(const QString &name, QRgb color)
+{
+    // set the color in all programs
+    foreach (GLProgram *program, m_programs) {
+        program->bind();
+        program->setColor(name, color);
+        program->unbind();
+    }
+}
+
+void Scene::setFloatParameter(const QString &name, float value)
+{
+    // set the color in all programs
+    foreach (GLProgram *program, m_programs) {
+        program->bind();
+        program->setFloat(name, value);
+        program->unbind();
+    }
+}
+
+void Scene::newItem(ItemDialog::ItemType type)
+{
+    QSize size = sceneRect().size().toSize();
+    switch (type) {
+    case ItemDialog::QtBoxItem:
+        addItem(new QtBox(64, rand() % (size.width() - 64) + 32, rand() % (size.height() - 64) + 32));
+        break;
+    case ItemDialog::CircleItem:
+        addItem(new CircleItem(64, rand() % (size.width() - 64) + 32, rand() % (size.height() - 64) + 32));
+        break;
+    case ItemDialog::SquareItem:
+        addItem(new SquareItem(64, rand() % (size.width() - 64) + 32, rand() % (size.height() - 64) + 32));
+        break;
+    default:
+        break;
+    }
+}
diff --git a/demos/boxes/scene.h b/demos/boxes/scene.h
new file mode 100644
index 0000000000..2db9317042
--- /dev/null
+++ b/demos/boxes/scene.h
@@ -0,0 +1,243 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SCENE_H
+#define SCENE_H
+
+//#include <GL/glew.h>
+#include "glextensions.h"
+
+#include <QtGui>
+#include <QtOpenGL>
+
+#include "roundedbox.h"
+#include "gltrianglemesh.h"
+#include "vector.h"
+#include "trackball.h"
+#include "glbuffers.h"
+#include "glshaders.h"
+#include "qtbox.h"
+
+#define PI 3.14159265358979
+
+class ParameterEdit : public QWidget
+{
+public:
+    virtual void emitChange() = 0;
+};
+
+class ColorEdit : public ParameterEdit
+{
+    Q_OBJECT
+public:
+    ColorEdit(QRgb initialColor, int id);
+    QRgb color() const {return m_color;}
+    virtual void emitChange() {emit colorChanged(m_color, m_id);}
+public slots:
+    void editDone();
+signals:
+    void colorChanged(QRgb color, int id);
+protected:
+    virtual void mousePressEvent(QMouseEvent *event);
+    void setColor(QRgb color); // also emits colorChanged()
+private:
+    QGraphicsScene *m_dialogParentScene;
+    QLineEdit *m_lineEdit;
+    QFrame *m_button;
+    QRgb m_color;
+    int m_id;
+};
+
+class FloatEdit : public ParameterEdit
+{
+    Q_OBJECT
+public:
+    FloatEdit(float initialValue, int id);
+    float value() const {return m_value;}
+    virtual void emitChange() {emit valueChanged(m_value, m_id);}
+public slots:
+    void editDone();
+signals:
+    void valueChanged(float value, int id);
+private:
+    QGraphicsScene *m_dialogParentScene;
+    QLineEdit *m_lineEdit;
+    float m_value;
+    int m_id;
+};
+
+class GraphicsWidget : public QGraphicsProxyWidget
+{
+protected:
+    virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+    virtual void resizeEvent(QGraphicsSceneResizeEvent *event);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+};
+
+class TwoSidedGraphicsWidget : public QObject
+{
+    Q_OBJECT
+public:
+    TwoSidedGraphicsWidget(QGraphicsScene *scene);
+    void setWidget(int index, QWidget *widget);
+    QWidget *widget(int index);
+public slots:
+    void flip();
+protected slots:
+    void animateFlip();
+private:
+    GraphicsWidget *m_proxyWidgets[2];
+    int m_current;
+    int m_angle; // angle in degrees
+    int m_delta;
+};
+
+class RenderOptionsDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    RenderOptionsDialog();
+    int addTexture(const QString &name);
+    int addShader(const QString &name);
+    void emitParameterChanged();
+protected slots:
+    void setColorParameter(QRgb color, int id);
+    void setFloatParameter(float value, int id);
+signals:
+    void dynamicCubemapToggled(int);
+    void colorParameterChanged(const QString &, QRgb);
+    void floatParameterChanged(const QString &, float);
+    void textureChanged(int);
+    void shaderChanged(int);
+    void doubleClicked();
+protected:
+    virtual void mouseDoubleClickEvent(QMouseEvent *event);
+
+    QVector<QByteArray> m_parameterNames;
+    QComboBox *m_textureCombo;
+    QComboBox *m_shaderCombo;
+    QVector<ParameterEdit *> m_parameterEdits;
+};
+
+class ItemDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    enum ItemType {
+        QtBoxItem,
+        CircleItem,
+        SquareItem,
+    };
+
+    ItemDialog();
+public slots:
+    void triggerNewQtBox();
+    void triggerNewCircleItem();
+    void triggerNewSquareItem();
+signals:
+    void doubleClicked();
+    void newItemTriggered(ItemDialog::ItemType type);
+protected:
+    virtual void mouseDoubleClickEvent(QMouseEvent *event);
+};
+
+class Scene : public QGraphicsScene
+{
+    Q_OBJECT
+public:
+    Scene(int width, int height, int maxTextureSize);
+    ~Scene();
+    virtual void drawBackground(QPainter *painter, const QRectF &rect);
+
+public slots:
+    void setShader(int index);
+    void setTexture(int index);
+    void toggleDynamicCubemap(int state);
+    void setColorParameter(const QString &name, QRgb color);
+    void setFloatParameter(const QString &name, float value);
+    void newItem(ItemDialog::ItemType type);
+protected:
+    void renderBoxes(const gfx::Matrix4x4f &view, int excludeBox = -2);
+    void setStates();
+    void setLights();
+    void defaultStates();
+    void renderCubemaps();
+
+    virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    virtual void wheelEvent(QGraphicsSceneWheelEvent * event);
+private:
+    void initGL();
+    QPointF pixelPosToViewPos(const QPointF& p);
+
+    QTime m_time;
+    int m_lastTime;
+    int m_mouseEventTime;
+    int m_distExp;
+    int m_frame;
+    int m_maxTextureSize;
+
+    int m_currentShader;
+    int m_currentTexture;
+    bool m_dynamicCubemap;
+    bool m_updateAllCubemaps;
+
+    RenderOptionsDialog *m_renderOptions;
+    ItemDialog *m_itemDialog;
+    QTimer *m_timer;
+    GLRoundedBox *m_box;
+    TrackBall m_trackBalls[3];
+    QVector<GLTexture *> m_textures;
+    GLTextureCube *m_environment;
+    GLTexture3D *m_noise;
+    GLRenderTargetCube *m_mainCubemap;
+    QVector<GLRenderTargetCube *> m_cubemaps;
+    QVector<GLProgram *> m_programs;
+    GLVertexShader *m_vertexShader;
+    QVector<GLFragmentShader *> m_fragmentShaders;
+    GLFragmentShader *m_environmentShader;
+    GLProgram *m_environmentProgram;
+};
+
+
+
+#endif
diff --git a/demos/boxes/smiley.png b/demos/boxes/smiley.png
new file mode 100644
index 0000000000..41cfda6b23
--- /dev/null
+++ b/demos/boxes/smiley.png
diff --git a/demos/boxes/square.jpg b/demos/boxes/square.jpg
new file mode 100644
index 0000000000..03f53bd530
--- /dev/null
+++ b/demos/boxes/square.jpg
diff --git a/demos/boxes/trackball.cpp b/demos/boxes/trackball.cpp
new file mode 100644
index 0000000000..980f6ed6d1
--- /dev/null
+++ b/demos/boxes/trackball.cpp
@@ -0,0 +1,158 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "trackball.h"
+
+//============================================================================//
+//                                  TrackBall                                 //
+//============================================================================//
+
+TrackBall::TrackBall(TrackMode mode)
+    : m_angularVelocity(0)
+    , m_paused(false)
+    , m_pressed(false)
+    , m_mode(mode)
+{
+    m_axis = gfx::Vector3f::vector(0, 1, 0);
+    m_rotation = gfx::Quaternionf::quaternion(1.0f, 0.0f, 0.0f, 0.0f);
+    m_lastTime = QTime::currentTime();
+}
+
+TrackBall::TrackBall(float angularVelocity, const gfx::Vector3f& axis, TrackMode mode)
+    : m_axis(axis)
+    , m_angularVelocity(angularVelocity)
+    , m_paused(false)
+    , m_pressed(false)
+    , m_mode(mode)
+{
+    m_rotation = gfx::Quaternionf::quaternion(1.0f, 0.0f, 0.0f, 0.0f);
+    m_lastTime = QTime::currentTime();
+}
+
+void TrackBall::push(const QPointF& p, const gfx::Quaternionf &)
+{
+    m_rotation = rotation();
+    m_pressed = true;
+    m_lastTime = QTime::currentTime();
+    m_lastPos = p;
+    m_angularVelocity = 0.0f;
+}
+
+void TrackBall::move(const QPointF& p, const gfx::Quaternionf &transformation)
+{
+    if (!m_pressed)
+        return;
+
+    QTime currentTime = QTime::currentTime();
+    int msecs = m_lastTime.msecsTo(currentTime);
+    if (msecs <= 20)
+        return;
+
+    switch (m_mode) {
+    case Plane:
+        {
+            QLineF delta(m_lastPos, p);
+            m_angularVelocity = delta.length() / msecs;
+            m_axis = gfx::Vector3f::vector(delta.dy(), -delta.dx(), 0.0f).normalized();
+            m_axis = transformation.transform(m_axis);
+            m_rotation *= gfx::Quaternionf::rotation(delta.length(), m_axis);
+        }
+        break;
+    case Sphere:
+        {
+            gfx::Vector3f lastPos3D = gfx::Vector3f::vector(m_lastPos.x(), m_lastPos.y(), 0);
+            float sqrZ = 1 - lastPos3D.sqrNorm();
+            if (sqrZ > 0)
+                lastPos3D[2] = sqrt(sqrZ);
+            else
+                lastPos3D.normalize();
+
+            gfx::Vector3f currentPos3D = gfx::Vector3f::vector(p.x(), p.y(), 0);
+            sqrZ = 1 - currentPos3D.sqrNorm();
+            if (sqrZ > 0)
+                currentPos3D[2] = sqrt(sqrZ);
+            else
+                currentPos3D.normalize();
+
+            m_axis = gfx::Vector3f::cross(currentPos3D, lastPos3D);
+            float angle = asin(sqrt(m_axis.sqrNorm()));
+
+            m_angularVelocity = angle / msecs;
+            m_axis.normalize();
+            m_axis = transformation.transform(m_axis);
+            m_rotation *= gfx::Quaternionf::rotation(angle, m_axis);
+        }
+        break;
+    }
+
+    m_lastPos = p;
+    m_lastTime = currentTime;
+}
+
+void TrackBall::release(const QPointF& p, const gfx::Quaternionf &transformation)
+{
+    // Calling move() caused the rotation to stop if the framerate was too low.
+    move(p, transformation);
+    m_pressed = false;
+}
+
+void TrackBall::start()
+{
+    m_lastTime = QTime::currentTime();
+    m_paused = false;
+}
+
+void TrackBall::stop()
+{
+    m_rotation = rotation();
+    m_paused = true;
+}
+
+gfx::Quaternionf TrackBall::rotation() const
+{
+    if (m_paused || m_pressed)
+        return m_rotation;
+
+    QTime currentTime = QTime::currentTime();
+    float angle = m_angularVelocity * m_lastTime.msecsTo(currentTime);
+    return m_rotation * gfx::Quaternionf::rotation(angle, m_axis);
+}
+
diff --git a/demos/boxes/trackball.h b/demos/boxes/trackball.h
new file mode 100644
index 0000000000..5e3f40cb49
--- /dev/null
+++ b/demos/boxes/trackball.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TRACKBALL_H
+#define TRACKBALL_H
+
+#include <QtGui>
+
+#include "vector.h"
+
+class TrackBall
+{
+public:
+    enum TrackMode
+    {
+        Plane,
+        Sphere,
+    };
+    TrackBall(TrackMode mode = Sphere);
+    TrackBall(float angularVelocity, const gfx::Vector3f& axis, TrackMode mode = Sphere);
+    // coordinates in [-1,1]x[-1,1]
+    void push(const QPointF& p, const gfx::Quaternionf &transformation);
+    void move(const QPointF& p, const gfx::Quaternionf &transformation);
+    void release(const QPointF& p, const gfx::Quaternionf &transformation);
+    void start(); // starts clock
+    void stop(); // stops clock
+    gfx::Quaternionf rotation() const;
+private:
+    gfx::Quaternionf m_rotation;
+    gfx::Vector3f m_axis;
+    float m_angularVelocity;
+
+    QPointF m_lastPos;
+    QTime m_lastTime;
+    bool m_paused;
+    bool m_pressed;
+    TrackMode m_mode;
+};
+
+#endif
diff --git a/demos/boxes/vector.h b/demos/boxes/vector.h
new file mode 100644
index 0000000000..bb24531158
--- /dev/null
+++ b/demos/boxes/vector.h
@@ -0,0 +1,602 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef VECTOR_H
+#define VECTOR_H
+
+#include <cassert>
+#include <cmath>
+#include <iostream>
+
+namespace gfx
+{
+
+template<class T, int n>
+struct Vector
+{
+    // Keep the Vector struct a plain old data (POD) struct by avoiding constructors
+
+    static Vector vector(T x)
+    {
+        Vector result;
+        for (int i = 0; i < n; ++i)
+            result.v[i] = x;
+        return result;
+    }
+
+    // Use only for 2D vectors
+    static Vector vector(T x, T y)
+    {
+        assert(n == 2);
+        Vector result;
+        result.v[0] = x;
+        result.v[1] = y;
+        return result;
+    }
+
+    // Use only for 3D vectors
+    static Vector vector(T x, T y, T z)
+    {
+        assert(n == 3);
+        Vector result;
+        result.v[0] = x;
+        result.v[1] = y;
+        result.v[2] = z;
+        return result;
+    }
+
+    // Use only for 4D vectors
+    static Vector vector(T x, T y, T z, T w)
+    {
+        assert(n == 4);
+        Vector result;
+        result.v[0] = x;
+        result.v[1] = y;
+        result.v[2] = z;
+        result.v[3] = w;
+        return result;
+    }
+
+    // Pass 'n' arguments to this function.
+    static Vector vector(T *v)
+    {
+        Vector result;
+        for (int i = 0; i < n; ++i)
+            result.v[i] = v[i];
+        return result;
+    }
+
+    T &operator [] (int i) {return v[i];}
+    T operator [] (int i) const {return v[i];}
+
+#define VECTOR_BINARY_OP(op, arg, rhs)      \
+    Vector operator op (arg) const          \
+    {                                       \
+        Vector result;                      \
+        for (int i = 0; i < n; ++i)         \
+            result.v[i] = v[i] op rhs;      \
+        return result;                      \
+    }
+
+    VECTOR_BINARY_OP(+, const Vector &u, u.v[i])
+    VECTOR_BINARY_OP(-, const Vector &u, u.v[i])
+    VECTOR_BINARY_OP(*, const Vector &u, u.v[i])
+    VECTOR_BINARY_OP(/, const Vector &u, u.v[i])
+    VECTOR_BINARY_OP(+, T s, s)
+    VECTOR_BINARY_OP(-, T s, s)
+    VECTOR_BINARY_OP(*, T s, s)
+    VECTOR_BINARY_OP(/, T s, s)
+#undef VECTOR_BINARY_OP
+
+    Vector operator - () const
+    {
+        Vector result;
+        for (int i = 0; i < n; ++i)
+            result.v[i] = -v[i];
+        return result;
+    }
+
+#define VECTOR_ASSIGN_OP(op, arg, rhs)      \
+    Vector &operator op (arg)               \
+    {                                       \
+        for (int i = 0; i < n; ++i)         \
+            v[i] op rhs;                    \
+        return *this;                       \
+    }
+
+    VECTOR_ASSIGN_OP(+=, const Vector &u, u.v[i])
+    VECTOR_ASSIGN_OP(-=, const Vector &u, u.v[i])
+    VECTOR_ASSIGN_OP(=, T s, s)
+    VECTOR_ASSIGN_OP(*=, T s, s)
+    VECTOR_ASSIGN_OP(/=, T s, s)
+#undef VECTOR_ASSIGN_OP
+
+    static T dot(const Vector &u, const Vector &v)
+    {
+        T sum(0);
+        for (int i = 0; i < n; ++i)
+            sum += u.v[i] * v.v[i];
+        return sum;
+    }
+
+    static Vector cross(const Vector &u, const Vector &v)
+    {
+        assert(n == 3);
+        return vector(u.v[1] * v.v[2] - u.v[2] * v.v[1],
+                      u.v[2] * v.v[0] - u.v[0] * v.v[2],
+                      u.v[0] * v.v[1] - u.v[1] * v.v[0]);
+    }
+
+    T sqrNorm() const
+    {
+        return dot(*this, *this);
+    }
+
+    // requires floating point type T
+    void normalize()
+    {
+        T s = sqrNorm();
+        if (s != 0)
+            *this /= sqrt(s);
+    }
+
+    // requires floating point type T
+    Vector normalized() const
+    {
+        T s = sqrNorm();
+        if (s == 0)
+            return *this;
+        return *this / sqrt(s);
+    }
+
+    T *bits() {return v;}
+    const T *bits() const {return v;}
+
+    T v[n];
+};
+
+#define SCALAR_VECTOR_BINARY_OP(op)                     \
+template<class T, int n>                                \
+Vector<T, n> operator op (T s, const Vector<T, n>& u)   \
+{                                                       \
+    Vector<T, n> result;                                \
+    for (int i = 0; i < n; ++i)                         \
+        result[i] = s op u[i];                          \
+    return result;                                      \
+}
+
+SCALAR_VECTOR_BINARY_OP(+)
+SCALAR_VECTOR_BINARY_OP(-)
+SCALAR_VECTOR_BINARY_OP(*)
+SCALAR_VECTOR_BINARY_OP(/)
+#undef SCALAR_VECTOR_BINARY_OP
+
+template<class T, int n>
+std::ostream &operator << (std::ostream &os, const Vector<T, n> &v)
+{
+    assert(n > 0);
+    os << "[" << v[0];
+    for (int i = 1; i < n; ++i)
+        os << ", " << v[i];
+    os << "]";
+    return os;
+}
+
+typedef Vector<float, 2> Vector2f;
+typedef Vector<float, 3> Vector3f;
+typedef Vector<float, 4> Vector4f;
+
+template<class T, int rows, int cols>
+struct Matrix
+{
+    // Keep the Matrix struct a plain old data (POD) struct by avoiding constructors
+
+    static Matrix matrix(T x)
+    {
+        Matrix result;
+        for (int i = 0; i < rows; ++i) {
+            for (int j = 0; j < cols; ++j)
+                result.v[i][j] = x;
+        }
+        return result;
+    }
+
+    static Matrix matrix(T *m)
+    {
+        Matrix result;
+        for (int i = 0; i < rows; ++i) {
+            for (int j = 0; j < cols; ++j) {
+                result.v[i][j] = *m;
+                ++m;
+            }
+        }
+        return result;
+    }
+
+    T &operator () (int i, int j) {return v[i][j];}
+    T operator () (int i, int j) const {return v[i][j];}
+    Vector<T, cols> &operator [] (int i) {return v[i];}
+    const Vector<T, cols> &operator [] (int i) const {return v[i];}
+
+    // TODO: operators, methods
+
+    Vector<T, rows> operator * (const Vector<T, cols> &u) const
+    {
+        Vector<T, rows> result;
+        for (int i = 0; i < rows; ++i)
+            result[i] = Vector<T, cols>::dot(v[i], u);
+        return result;
+    }
+
+    template<int k>
+    Matrix<T, rows, k> operator * (const Matrix<T, cols, k> &m)
+    {
+        Matrix<T, rows, k> result;
+        for (int i = 0; i < rows; ++i)
+            result[i] = v[i] * m;
+        return result;
+    }
+
+    T* bits() {return reinterpret_cast<T *>(this);}
+    const T* bits() const {return reinterpret_cast<const T *>(this);}
+
+    // Simple Gauss elimination.
+    // TODO: Optimize and improve stability.
+    Matrix inverse(bool *ok = 0) const
+    {
+        assert(rows == cols);
+        Matrix rhs = identity();
+        Matrix lhs(*this);
+        T temp;
+        // Down
+        for (int i = 0; i < rows; ++i) {
+            // Pivoting
+            int pivot = i;
+            for (int j = i; j < rows; ++j) {
+                if (qAbs(lhs(j, i)) > lhs(pivot, i))
+                    pivot = j;
+            }
+			// TODO: fuzzy compare.
+            if (lhs(pivot, i) == T(0)) {
+                if (ok)
+                    *ok = false;
+                return rhs;
+            }
+            if (pivot != i) {
+                for (int j = i; j < cols; ++j) {
+                    temp = lhs(pivot, j);
+                    lhs(pivot, j) = lhs(i, j);
+                    lhs(i, j) = temp;
+                }
+                for (int j = 0; j < cols; ++j) {
+                    temp = rhs(pivot, j);
+                    rhs(pivot, j) = rhs(i, j);
+                    rhs(i, j) = temp;
+                }
+            }
+
+            // Normalize i-th row
+            rhs[i] /= lhs(i, i);
+            for (int j = cols - 1; j > i; --j)
+                lhs(i, j) /= lhs(i, i);
+
+			// Eliminate non-zeros in i-th column below the i-th row.
+            for (int j = i + 1; j < rows; ++j) {
+                rhs[j] -= lhs(j, i) * rhs[i];
+                for (int k = i + 1; k < cols; ++k)
+                    lhs(j, k) -= lhs(j, i) * lhs(i, k);
+            }
+        }
+        // Up
+        for (int i = rows - 1; i > 0; --i) {
+            for (int j = i - 1; j >= 0; --j)
+                rhs[j] -= lhs(j, i) * rhs[i];
+        }
+        if (ok)
+            *ok = true;
+        return rhs;
+    }
+
+    Matrix<T, cols, rows> transpose() const
+    {
+        Matrix<T, cols, rows> result;
+        for (int i = 0; i < rows; ++i) {
+            for (int j = 0; j < cols; ++j)
+                result.v[j][i] = v[i][j];
+        }
+        return result;
+    }
+
+    static Matrix identity()
+    {
+        Matrix result = matrix(T(0));
+        for (int i = 0; i < rows && i < cols; ++i)
+            result.v[i][i] = T(1);
+        return result;
+    }
+
+    Vector<T, cols> v[rows];
+};
+
+template<class T, int rows, int cols>
+Vector<T, cols> operator * (const Vector<T, rows> &u, const Matrix<T, rows, cols> &m)
+{
+    Vector<T, cols> result = Vector<T, cols>::vector(T(0));
+    for (int i = 0; i < rows; ++i)
+        result += m[i] * u[i];
+    return result;
+}
+
+template<class T, int rows, int cols>
+std::ostream &operator << (std::ostream &os, const Matrix<T, rows, cols> &m)
+{
+    assert(rows > 0);
+    os << "[" << m[0];
+    for (int i = 1; i < rows; ++i)
+        os << ", " << m[i];
+    os << "]";
+    return os;
+}
+
+
+typedef Matrix<float, 2, 2> Matrix2x2f;
+typedef Matrix<float, 3, 3> Matrix3x3f;
+typedef Matrix<float, 4, 4> Matrix4x4f;
+
+template<class T>
+struct Quaternion
+{
+    // Keep the Quaternion struct a plain old data (POD) struct by avoiding constructors
+
+    static Quaternion quaternion(T s, T x, T y, T z)
+    {
+        Quaternion result;
+        result.scalar = s;
+        result.vector[0] = x;
+        result.vector[1] = y;
+        result.vector[2] = z;
+        return result;
+    }
+
+    static Quaternion quaternion(T s, const Vector<T, 3> &v)
+    {
+        Quaternion result;
+        result.scalar = s;
+        result.vector = v;
+        return result;
+    }
+
+    static Quaternion identity()
+    {
+        return quaternion(T(1), T(0), T(0), T(0));
+    }
+
+    // assumes that all the elements are packed tightly
+    T& operator [] (int i) {return reinterpret_cast<T *>(this)[i];}
+    T operator [] (int i) const {return reinterpret_cast<const T *>(this)[i];}
+
+#define QUATERNION_BINARY_OP(op, arg, rhs)  \
+    Quaternion operator op (arg) const      \
+    {                                       \
+        Quaternion result;                  \
+        for (int i = 0; i < 4; ++i)         \
+            result[i] = (*this)[i] op rhs;  \
+        return result;                      \
+    }
+
+    QUATERNION_BINARY_OP(+, const Quaternion &q, q[i])
+    QUATERNION_BINARY_OP(-, const Quaternion &q, q[i])
+    QUATERNION_BINARY_OP(*, T s, s)
+    QUATERNION_BINARY_OP(/, T s, s)
+#undef QUATERNION_BINARY_OP
+
+    Quaternion operator - () const
+    {
+        return Quaternion(-scalar, -vector);
+    }
+
+    Quaternion operator * (const Quaternion &q) const
+    {
+        Quaternion result;
+        result.scalar = scalar * q.scalar - Vector<T, 3>::dot(vector, q.vector);
+        result.vector = scalar * q.vector + vector * q.scalar + Vector<T, 3>::cross(vector, q.vector);
+        return result;
+    }
+
+    Quaternion operator * (const Vector<T, 3> &v) const
+    {
+        Quaternion result;
+        result.scalar = -Vector<T, 3>::dot(vector, v);
+        result.vector = scalar * v + Vector<T, 3>::cross(vector, v);
+        return result;
+    }
+
+    friend Quaternion operator * (const Vector<T, 3> &v, const Quaternion &q)
+    {
+        Quaternion result;
+        result.scalar = -Vector<T, 3>::dot(v, q.vector);
+        result.vector = v * q.scalar + Vector<T, 3>::cross(v, q.vector);
+        return result;
+    }
+
+#define QUATERNION_ASSIGN_OP(op, arg, rhs)  \
+    Quaternion &operator op (arg)           \
+    {                                       \
+        for (int i = 0; i < 4; ++i)         \
+            (*this)[i] op rhs;              \
+        return *this;                       \
+    }
+
+    QUATERNION_ASSIGN_OP(+=, const Quaternion &q, q[i])
+    QUATERNION_ASSIGN_OP(-=, const Quaternion &q, q[i])
+    QUATERNION_ASSIGN_OP(=, T s, s)
+    QUATERNION_ASSIGN_OP(*=, T s, s)
+    QUATERNION_ASSIGN_OP(/=, T s, s)
+#undef QUATERNION_ASSIGN_OP
+
+    Quaternion& operator *= (const Quaternion &q)
+    {
+        Quaternion result;
+        result.scalar = scalar * q.scalar - Vector<T, 3>::dot(vector, q.vector);
+        result.vector = scalar * q.vector + vector * q.scalar + Vector<T, 3>::cross(vector, q.vector);
+        return (*this = result);
+    }
+
+    Quaternion& operator *= (const Vector<T, 3> &v)
+    {
+        Quaternion result;
+        result.scalar = -Vector<T, 3>::dot(vector, v);
+        result.vector = scalar * v + Vector<T, 3>::cross(vector, v);
+        return (*this = result);
+    }
+
+    Quaternion conjugate() const
+    {
+        return quaternion(scalar, -vector);
+    }
+
+    T sqrNorm() const
+    {
+        return scalar * scalar + vector.sqrNorm();
+    }
+
+    Quaternion inverse() const
+    {
+        return conjugate() / sqrNorm();
+    }
+
+    // requires floating point type T
+    Quaternion normalized() const
+    {
+        T s = sqrNorm();
+        if (s == 0)
+            return *this;
+        return *this / sqrt(s);
+    }
+
+    void matrix(Matrix<T, 3, 3>& m) const
+    {
+        T bb = vector[0] * vector[0];
+        T cc = vector[1] * vector[1];
+        T dd = vector[2] * vector[2];
+        T diag = scalar * scalar - bb - cc - dd;
+        T ab = scalar * vector[0];
+        T ac = scalar * vector[1];
+        T ad = scalar * vector[2];
+        T bc = vector[0] * vector[1];
+        T cd = vector[1] * vector[2];
+        T bd = vector[2] * vector[0];
+        m(0, 0) = diag + 2 * bb;
+        m(0, 1) = 2 * (bc - ad);
+        m(0, 2) = 2 * (ac + bd);
+        m(1, 0) = 2 * (ad + bc);
+        m(1, 1) = diag + 2 * cc;
+        m(1, 2) = 2 * (cd - ab);
+        m(2, 0) = 2 * (bd - ac);
+        m(2, 1) = 2 * (ab + cd);
+        m(2, 2) = diag + 2 * dd;
+    }
+
+    void matrix(Matrix<T, 4, 4>& m) const
+    {
+        T bb = vector[0] * vector[0];
+        T cc = vector[1] * vector[1];
+        T dd = vector[2] * vector[2];
+        T diag = scalar * scalar - bb - cc - dd;
+        T ab = scalar * vector[0];
+        T ac = scalar * vector[1];
+        T ad = scalar * vector[2];
+        T bc = vector[0] * vector[1];
+        T cd = vector[1] * vector[2];
+        T bd = vector[2] * vector[0];
+        m(0, 0) = diag + 2 * bb;
+        m(0, 1) = 2 * (bc - ad);
+        m(0, 2) = 2 * (ac + bd);
+        m(0, 3) = 0;
+        m(1, 0) = 2 * (ad + bc);
+        m(1, 1) = diag + 2 * cc;
+        m(1, 2) = 2 * (cd - ab);
+        m(1, 3) = 0;
+        m(2, 0) = 2 * (bd - ac);
+        m(2, 1) = 2 * (ab + cd);
+        m(2, 2) = diag + 2 * dd;
+        m(2, 3) = 0;
+        m(3, 0) = 0;
+        m(3, 1) = 0;
+        m(3, 2) = 0;
+        m(3, 3) = 1;
+    }
+
+    // assumes that 'this' is normalized
+    Vector<T, 3> transform(const Vector<T, 3> &v) const
+    {
+        Matrix<T, 3, 3> m;
+        matrix(m);
+        return v * m;
+    }
+
+    // assumes that all the elements are packed tightly
+    T* bits() {return reinterpret_cast<T *>(this);}
+    const T* bits() const {return reinterpret_cast<const T *>(this);}
+
+    // requires floating point type T
+    static Quaternion rotation(T angle, const Vector<T, 3> &unitAxis)
+    {
+        T s = sin(angle / 2);
+        T c = cos(angle / 2);
+        return quaternion(c, unitAxis * s);
+    }
+
+    T scalar;
+    Vector<T, 3> vector;
+};
+
+template<class T>
+Quaternion<T> operator * (T s, const Quaternion<T>& q)
+{
+    return Quaternion<T>::quaternion(s * q.scalar, s * q.vector);
+}
+
+typedef Quaternion<float> Quaternionf;
+
+} // end namespace gfx
+
+#endif
diff --git a/demos/boxes/wood.fsh b/demos/boxes/wood.fsh
new file mode 100644
index 0000000000..35bf7d6266
--- /dev/null
+++ b/demos/boxes/wood.fsh
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+varying vec3 position, normal;
+varying vec4 specular, ambient, diffuse, lightDirection;
+
+uniform sampler2D tex;
+uniform sampler3D noise;
+
+//const vec4 woodColors[2] = {vec4(0.37,0.24,0.20,1), vec4(0.8,0.6,0.4,1)};
+uniform vec4 woodColors[2];
+//const float woodTubulence = 0.1;
+uniform float woodTubulence;
+
+void main()
+{
+    float r = length(gl_TexCoord[1].yz);
+    r += woodTubulence * texture3D(noise, 0.25 * gl_TexCoord[1].xyz).x;
+
+    vec3 N = normalize(normal);
+    // assume directional light
+
+    gl_MaterialParameters M = gl_FrontMaterial;
+
+    float NdotL = dot(N, lightDirection.xyz);
+    float RdotL = dot(reflect(normalize(position), N), lightDirection.xyz);
+
+    float f = fract(16.0 * r);
+    vec4 unlitColor = mix(woodColors[0], woodColors[1], min(1.25 * f, 5.0 - 5.0 * f));
+    gl_FragColor = (ambient + diffuse * max(NdotL, 0.0)) * unlitColor +
+                    M.specular * specular * pow(max(RdotL, 0.0), M.shininess);
+}
diff --git a/demos/browser/Info_mac.plist b/demos/browser/Info_mac.plist
new file mode 100644
index 0000000000..5648631b04
--- /dev/null
+++ b/demos/browser/Info_mac.plist
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+	<key>CFBundleIconFile</key>
+	<string>@ICON@</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+        <key>CFBundleGetInfoString</key>
+	<string>Created by Qt/QMake</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.trolltech.DemoBrowser</string>
+	<key>CFBundleSignature</key>
+	<string>ttxt</string>
+	<key>CFBundleExecutable</key>
+	<string>@EXECUTABLE@</string>
+	<key>CFBundleDocumentTypes</key>
+        <array>
+                <dict>
+                        <key>CFBundleTypeExtensions</key>
+                        <array>
+                                <string>html</string>
+                                <string>htm</string>
+                                <string>shtml</string>
+                                <string>xht</string>
+                                <string>xhtml</string>
+                        </array>
+			<key>CFBundleTypeIconFile</key>
+			<string>@ICON@</string>
+                        <key>CFBundleTypeName</key>
+                        <string>HTML Document</string>
+                        <key>CFBundleTypeOSTypes</key>
+                        <array>
+                                <string>HTML</string>
+                        </array>
+                        <key>CFBundleTypeRole</key>
+                        <string>Viewer</string>
+                </dict>
+        </array>
+	<key>NOTE</key>
+	<string>DemoBrowser by Nokia Corporation and/or its subsidiary(-ies)</string>
+</dict>
+</plist>
diff --git a/demos/browser/addbookmarkdialog.ui b/demos/browser/addbookmarkdialog.ui
new file mode 100644
index 0000000000..3460d7bb89
--- /dev/null
+++ b/demos/browser/addbookmarkdialog.ui
@@ -0,0 +1,98 @@
+<ui version="4.0" >
+ <class>AddBookmarkDialog</class>
+ <widget class="QDialog" name="AddBookmarkDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>240</width>
+    <height>168</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Add Bookmark</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" >
+   <item>
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Type a name for the bookmark, and choose where to keep it.</string>
+     </property>
+     <property name="textFormat" >
+      <enum>Qt::PlainText</enum>
+     </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="name" />
+   </item>
+   <item>
+    <widget class="QComboBox" name="location" />
+   </item>
+   <item>
+    <spacer name="verticalSpacer" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>20</width>
+       <height>2</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+     <property name="centerButtons" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>AddBookmarkDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>AddBookmarkDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/demos/browser/autosaver.cpp b/demos/browser/autosaver.cpp
new file mode 100644
index 0000000000..4e945f0f20
--- /dev/null
+++ b/demos/browser/autosaver.cpp
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "autosaver.h"
+
+#include <QtCore/QDir>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QMetaObject>
+#include <QtDebug>
+
+#define AUTOSAVE_IN  1000 * 3  // seconds
+#define MAXWAIT      1000 * 15 // seconds
+
+AutoSaver::AutoSaver(QObject *parent) : QObject(parent)
+{
+    Q_ASSERT(parent);
+}
+
+AutoSaver::~AutoSaver()
+{
+    if (m_timer.isActive())
+        qWarning() << "AutoSaver: still active when destroyed, changes not saved.";
+}
+
+void AutoSaver::changeOccurred()
+{
+    if (m_firstChange.isNull())
+        m_firstChange.start();
+
+    if (m_firstChange.elapsed() > MAXWAIT) {
+        saveIfNeccessary();
+    } else {
+        m_timer.start(AUTOSAVE_IN, this);
+    }
+}
+
+void AutoSaver::timerEvent(QTimerEvent *event)
+{
+    if (event->timerId() == m_timer.timerId()) {
+        saveIfNeccessary();
+    } else {
+        QObject::timerEvent(event);
+    }
+}
+
+void AutoSaver::saveIfNeccessary()
+{
+    if (!m_timer.isActive())
+        return;
+    m_timer.stop();
+    m_firstChange = QTime();
+    if (!QMetaObject::invokeMethod(parent(), "save", Qt::DirectConnection)) {
+        qWarning() << "AutoSaver: error invoking slot save() on parent";
+    }
+}
+
diff --git a/demos/browser/autosaver.h b/demos/browser/autosaver.h
new file mode 100644
index 0000000000..bb340cd00c
--- /dev/null
+++ b/demos/browser/autosaver.h
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef AUTOSAVER_H
+#define AUTOSAVER_H
+
+#include <QtCore/QObject>
+#include <QtCore/QBasicTimer>
+#include <QtCore/QTime>
+
+/*
+    This class will call the save() slot on the parent object when the parent changes.
+    It will wait several seconds after changed() to combining multiple changes and
+    prevent continuous writing to disk.
+  */
+class AutoSaver : public QObject {
+
+Q_OBJECT
+
+public:
+    AutoSaver(QObject *parent);
+    ~AutoSaver();
+    void saveIfNeccessary();
+
+public slots:
+    void changeOccurred();
+
+protected:
+    void timerEvent(QTimerEvent *event);
+
+private:
+    QBasicTimer m_timer;
+    QTime m_firstChange;
+
+};
+
+#endif // AUTOSAVER_H
+
diff --git a/demos/browser/bookmarks.cpp b/demos/browser/bookmarks.cpp
new file mode 100644
index 0000000000..8e7823dd19
--- /dev/null
+++ b/demos/browser/bookmarks.cpp
@@ -0,0 +1,987 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "bookmarks.h"
+
+#include "autosaver.h"
+#include "browserapplication.h"
+#include "history.h"
+#include "xbel.h"
+
+#include <QtCore/QBuffer>
+#include <QtCore/QFile>
+#include <QtCore/QMimeData>
+
+#include <QtGui/QDesktopServices>
+#include <QtGui/QDragEnterEvent>
+#include <QtGui/QFileDialog>
+#include <QtGui/QHeaderView>
+#include <QtGui/QIcon>
+#include <QtGui/QMessageBox>
+#include <QtGui/QToolButton>
+
+#include <QtWebKit/QWebSettings>
+
+#include <QtCore/QDebug>
+
+#define BOOKMARKBAR "Bookmarks Bar"
+#define BOOKMARKMENU "Bookmarks Menu"
+
+BookmarksManager::BookmarksManager(QObject *parent)
+    : QObject(parent)
+    , m_loaded(false)
+    , m_saveTimer(new AutoSaver(this))
+    , m_bookmarkRootNode(0)
+    , m_bookmarkModel(0)
+{
+    connect(this, SIGNAL(entryAdded(BookmarkNode *)),
+            m_saveTimer, SLOT(changeOccurred()));
+    connect(this, SIGNAL(entryRemoved(BookmarkNode *, int, BookmarkNode *)),
+            m_saveTimer, SLOT(changeOccurred()));
+    connect(this, SIGNAL(entryChanged(BookmarkNode *)),
+            m_saveTimer, SLOT(changeOccurred()));
+}
+
+BookmarksManager::~BookmarksManager()
+{
+    m_saveTimer->saveIfNeccessary();
+}
+
+void BookmarksManager::changeExpanded()
+{
+    m_saveTimer->changeOccurred();
+}
+
+void BookmarksManager::load()
+{
+    if (m_loaded)
+        return;
+    m_loaded = true;
+
+    QString dir = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+    QString bookmarkFile = dir + QLatin1String("/bookmarks.xbel");
+    if (!QFile::exists(bookmarkFile))
+        bookmarkFile = QLatin1String(":defaultbookmarks.xbel");
+
+    XbelReader reader;
+    m_bookmarkRootNode = reader.read(bookmarkFile);
+    if (reader.error() != QXmlStreamReader::NoError) {
+        QMessageBox::warning(0, QLatin1String("Loading Bookmark"),
+            tr("Error when loading bookmarks on line %1, column %2:\n"
+               "%3").arg(reader.lineNumber()).arg(reader.columnNumber()).arg(reader.errorString()));
+    }
+
+    BookmarkNode *toolbar = 0;
+    BookmarkNode *menu = 0;
+    QList<BookmarkNode*> others;
+    for (int i = m_bookmarkRootNode->children().count() - 1; i >= 0; --i) {
+        BookmarkNode *node = m_bookmarkRootNode->children().at(i);
+        if (node->type() == BookmarkNode::Folder) {
+            // Automatically convert
+            if (node->title == tr("Toolbar Bookmarks") && !toolbar) {
+                node->title = tr(BOOKMARKBAR);
+            }
+            if (node->title == tr(BOOKMARKBAR) && !toolbar) {
+                toolbar = node;
+            }
+
+            // Automatically convert
+            if (node->title == tr("Menu") && !menu) {
+                node->title = tr(BOOKMARKMENU);
+            }
+            if (node->title == tr(BOOKMARKMENU) && !menu) {
+                menu = node;
+            }
+        } else {
+            others.append(node);
+        }
+        m_bookmarkRootNode->remove(node);
+    }
+    Q_ASSERT(m_bookmarkRootNode->children().count() == 0);
+    if (!toolbar) {
+        toolbar = new BookmarkNode(BookmarkNode::Folder, m_bookmarkRootNode);
+        toolbar->title = tr(BOOKMARKBAR);
+    } else {
+        m_bookmarkRootNode->add(toolbar);
+    }
+
+    if (!menu) {
+        menu = new BookmarkNode(BookmarkNode::Folder, m_bookmarkRootNode);
+        menu->title = tr(BOOKMARKMENU);
+    } else {
+        m_bookmarkRootNode->add(menu);
+    }
+
+    for (int i = 0; i < others.count(); ++i)
+        menu->add(others.at(i));
+}
+
+void BookmarksManager::save() const
+{
+    if (!m_loaded)
+        return;
+
+    XbelWriter writer;
+    QString dir = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+    QString bookmarkFile = dir + QLatin1String("/bookmarks.xbel");
+    if (!writer.write(bookmarkFile, m_bookmarkRootNode))
+        qWarning() << "BookmarkManager: error saving to" << bookmarkFile;
+}
+
+void BookmarksManager::addBookmark(BookmarkNode *parent, BookmarkNode *node, int row)
+{
+    if (!m_loaded)
+        return;
+    Q_ASSERT(parent);
+    InsertBookmarksCommand *command = new InsertBookmarksCommand(this, parent, node, row);
+    m_commands.push(command);
+}
+
+void BookmarksManager::removeBookmark(BookmarkNode *node)
+{
+    if (!m_loaded)
+        return;
+
+    Q_ASSERT(node);
+    BookmarkNode *parent = node->parent();
+    int row = parent->children().indexOf(node);
+    RemoveBookmarksCommand *command = new RemoveBookmarksCommand(this, parent, row);
+    m_commands.push(command);
+}
+
+void BookmarksManager::setTitle(BookmarkNode *node, const QString &newTitle)
+{
+    if (!m_loaded)
+        return;
+
+    Q_ASSERT(node);
+    ChangeBookmarkCommand *command = new ChangeBookmarkCommand(this, node, newTitle, true);
+    m_commands.push(command);
+}
+
+void BookmarksManager::setUrl(BookmarkNode *node, const QString &newUrl)
+{
+    if (!m_loaded)
+        return;
+
+    Q_ASSERT(node);
+    ChangeBookmarkCommand *command = new ChangeBookmarkCommand(this, node, newUrl, false);
+    m_commands.push(command);
+}
+
+BookmarkNode *BookmarksManager::bookmarks()
+{
+    if (!m_loaded)
+        load();
+    return m_bookmarkRootNode;
+}
+
+BookmarkNode *BookmarksManager::menu()
+{
+    if (!m_loaded)
+        load();
+
+    for (int i = m_bookmarkRootNode->children().count() - 1; i >= 0; --i) {
+        BookmarkNode *node = m_bookmarkRootNode->children().at(i);
+        if (node->title == tr(BOOKMARKMENU))
+            return node;
+    }
+    Q_ASSERT(false);
+    return 0;
+}
+
+BookmarkNode *BookmarksManager::toolbar()
+{
+    if (!m_loaded)
+        load();
+
+    for (int i = m_bookmarkRootNode->children().count() - 1; i >= 0; --i) {
+        BookmarkNode *node = m_bookmarkRootNode->children().at(i);
+        if (node->title == tr(BOOKMARKBAR))
+            return node;
+    }
+    Q_ASSERT(false);
+    return 0;
+}
+
+BookmarksModel *BookmarksManager::bookmarksModel()
+{
+    if (!m_bookmarkModel)
+        m_bookmarkModel = new BookmarksModel(this, this);
+    return m_bookmarkModel;
+}
+
+void BookmarksManager::importBookmarks()
+{
+    QString fileName = QFileDialog::getOpenFileName(0, tr("Open File"),
+                                                     QString(),
+                                                     tr("XBEL (*.xbel *.xml)"));
+    if (fileName.isEmpty())
+        return;
+
+    XbelReader reader;
+    BookmarkNode *importRootNode = reader.read(fileName);
+    if (reader.error() != QXmlStreamReader::NoError) {
+        QMessageBox::warning(0, QLatin1String("Loading Bookmark"),
+            tr("Error when loading bookmarks on line %1, column %2:\n"
+               "%3").arg(reader.lineNumber()).arg(reader.columnNumber()).arg(reader.errorString()));
+    }
+
+    importRootNode->setType(BookmarkNode::Folder);
+    importRootNode->title = (tr("Imported %1").arg(QDate::currentDate().toString(Qt::SystemLocaleShortDate)));
+    addBookmark(menu(), importRootNode);
+}
+
+void BookmarksManager::exportBookmarks()
+{
+    QString fileName = QFileDialog::getSaveFileName(0, tr("Save File"),
+                                tr("%1 Bookmarks.xbel").arg(QCoreApplication::applicationName()),
+                                tr("XBEL (*.xbel *.xml)"));
+    if (fileName.isEmpty())
+        return;
+
+    XbelWriter writer;
+    if (!writer.write(fileName, m_bookmarkRootNode))
+        QMessageBox::critical(0, tr("Export error"), tr("error saving bookmarks"));
+}
+
+RemoveBookmarksCommand::RemoveBookmarksCommand(BookmarksManager *m_bookmarkManagaer, BookmarkNode *parent, int row)
+    : QUndoCommand(BookmarksManager::tr("Remove Bookmark"))
+    , m_row(row)
+    , m_bookmarkManagaer(m_bookmarkManagaer)
+    , m_node(parent->children().value(row))
+    , m_parent(parent)
+    , m_done(false)
+{
+}
+
+RemoveBookmarksCommand::~RemoveBookmarksCommand()
+{
+    if (m_done && !m_node->parent()) {
+        delete m_node;
+    }
+}
+
+void RemoveBookmarksCommand::undo()
+{
+    m_parent->add(m_node, m_row);
+    emit m_bookmarkManagaer->entryAdded(m_node);
+    m_done = false;
+}
+
+void RemoveBookmarksCommand::redo()
+{
+    m_parent->remove(m_node);
+    emit m_bookmarkManagaer->entryRemoved(m_parent, m_row, m_node);
+    m_done = true;
+}
+
+InsertBookmarksCommand::InsertBookmarksCommand(BookmarksManager *m_bookmarkManagaer,
+                BookmarkNode *parent, BookmarkNode *node, int row)
+    : RemoveBookmarksCommand(m_bookmarkManagaer, parent, row)
+{
+    setText(BookmarksManager::tr("Insert Bookmark"));
+    m_node = node;
+}
+
+ChangeBookmarkCommand::ChangeBookmarkCommand(BookmarksManager *m_bookmarkManagaer, BookmarkNode *node,
+                        const QString &newValue, bool title)
+    : QUndoCommand()
+    , m_bookmarkManagaer(m_bookmarkManagaer)
+    , m_title(title)
+    , m_newValue(newValue)
+    , m_node(node)
+{
+    if (m_title) {
+        m_oldValue = m_node->title;
+        setText(BookmarksManager::tr("Name Change"));
+    } else {
+        m_oldValue = m_node->url;
+        setText(BookmarksManager::tr("Address Change"));
+    }
+}
+
+void ChangeBookmarkCommand::undo()
+{
+    if (m_title)
+        m_node->title = m_oldValue;
+    else
+        m_node->url = m_oldValue;
+    emit m_bookmarkManagaer->entryChanged(m_node);
+}
+
+void ChangeBookmarkCommand::redo()
+{
+    if (m_title)
+        m_node->title = m_newValue;
+    else
+        m_node->url = m_newValue;
+    emit m_bookmarkManagaer->entryChanged(m_node);
+}
+
+BookmarksModel::BookmarksModel(BookmarksManager *bookmarkManager, QObject *parent)
+    : QAbstractItemModel(parent)
+    , m_endMacro(false)
+    , m_bookmarksManager(bookmarkManager)
+{
+    connect(bookmarkManager, SIGNAL(entryAdded(BookmarkNode *)),
+            this, SLOT(entryAdded(BookmarkNode *)));
+    connect(bookmarkManager, SIGNAL(entryRemoved(BookmarkNode *, int, BookmarkNode *)),
+            this, SLOT(entryRemoved(BookmarkNode *, int, BookmarkNode *)));
+    connect(bookmarkManager, SIGNAL(entryChanged(BookmarkNode *)),
+            this, SLOT(entryChanged(BookmarkNode *)));
+}
+
+QModelIndex BookmarksModel::index(BookmarkNode *node) const
+{
+    BookmarkNode *parent = node->parent();
+    if (!parent)
+        return QModelIndex();
+    return createIndex(parent->children().indexOf(node), 0, node);
+}
+
+void BookmarksModel::entryAdded(BookmarkNode *item)
+{
+    Q_ASSERT(item && item->parent());
+    int row = item->parent()->children().indexOf(item);
+    BookmarkNode *parent = item->parent();
+    // item was already added so remove beore beginInsertRows is called
+    parent->remove(item);
+    beginInsertRows(index(parent), row, row);
+    parent->add(item, row);
+    endInsertRows();
+}
+
+void BookmarksModel::entryRemoved(BookmarkNode *parent, int row, BookmarkNode *item)
+{
+    // item was already removed, re-add so beginRemoveRows works
+    parent->add(item, row);
+    beginRemoveRows(index(parent), row, row);
+    parent->remove(item);
+    endRemoveRows();
+}
+
+void BookmarksModel::entryChanged(BookmarkNode *item)
+{
+    QModelIndex idx = index(item);
+    emit dataChanged(idx, idx);
+}
+
+bool BookmarksModel::removeRows(int row, int count, const QModelIndex &parent)
+{
+    if (row < 0 || count <= 0 || row + count > rowCount(parent))
+        return false;
+
+    BookmarkNode *bookmarkNode = node(parent);
+    for (int i = row + count - 1; i >= row; --i) {
+        BookmarkNode *node = bookmarkNode->children().at(i);
+        if (node == m_bookmarksManager->menu()
+            || node == m_bookmarksManager->toolbar())
+            continue;
+
+        m_bookmarksManager->removeBookmark(node);
+    }
+    if (m_endMacro) {
+        m_bookmarksManager->undoRedoStack()->endMacro();
+        m_endMacro = false;
+    }
+    return true;
+}
+
+QVariant BookmarksModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
+        switch (section) {
+            case 0: return tr("Title");
+            case 1: return tr("Address");
+        }
+    }
+    return QAbstractItemModel::headerData(section, orientation, role);
+}
+
+QVariant BookmarksModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || index.model() != this)
+        return QVariant();
+
+    const BookmarkNode *bookmarkNode = node(index);
+    switch (role) {
+    case Qt::EditRole:
+    case Qt::DisplayRole:
+        if (bookmarkNode->type() == BookmarkNode::Separator) {
+            switch (index.column()) {
+            case 0: return QString(50, 0xB7);
+            case 1: return QString();
+            }
+        }
+
+        switch (index.column()) {
+        case 0: return bookmarkNode->title;
+        case 1: return bookmarkNode->url;
+        }
+        break;
+    case BookmarksModel::UrlRole:
+        return QUrl(bookmarkNode->url);
+        break;
+    case BookmarksModel::UrlStringRole:
+        return bookmarkNode->url;
+        break;
+    case BookmarksModel::TypeRole:
+        return bookmarkNode->type();
+        break;
+    case BookmarksModel::SeparatorRole:
+        return (bookmarkNode->type() == BookmarkNode::Separator);
+        break;
+    case Qt::DecorationRole:
+        if (index.column() == 0) {
+            if (bookmarkNode->type() == BookmarkNode::Folder)
+                return QApplication::style()->standardIcon(QStyle::SP_DirIcon);
+            return BrowserApplication::instance()->icon(bookmarkNode->url);
+        }
+    }
+
+    return QVariant();
+}
+
+int BookmarksModel::columnCount(const QModelIndex &parent) const
+{
+    return (parent.column() > 0) ? 0 : 2;
+}
+
+int BookmarksModel::rowCount(const QModelIndex &parent) const
+{
+    if (parent.column() > 0)
+        return 0;
+
+    if (!parent.isValid())
+        return m_bookmarksManager->bookmarks()->children().count();
+
+    const BookmarkNode *item = static_cast<BookmarkNode*>(parent.internalPointer());
+    return item->children().count();
+}
+
+QModelIndex BookmarksModel::index(int row, int column, const QModelIndex &parent) const
+{
+    if (row < 0 || column < 0 || row >= rowCount(parent) || column >= columnCount(parent))
+        return QModelIndex();
+
+    // get the parent node
+    BookmarkNode *parentNode = node(parent);
+    return createIndex(row, column, parentNode->children().at(row));
+}
+
+QModelIndex BookmarksModel::parent(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return QModelIndex();
+
+    BookmarkNode *itemNode = node(index);
+    BookmarkNode *parentNode = (itemNode ? itemNode->parent() : 0);
+    if (!parentNode || parentNode == m_bookmarksManager->bookmarks())
+        return QModelIndex();
+
+    // get the parent's row
+    BookmarkNode *grandParentNode = parentNode->parent();
+    int parentRow = grandParentNode->children().indexOf(parentNode);
+    Q_ASSERT(parentRow >= 0);
+    return createIndex(parentRow, 0, parentNode);
+}
+
+bool BookmarksModel::hasChildren(const QModelIndex &parent) const
+{
+    if (!parent.isValid())
+        return true;
+    const BookmarkNode *parentNode = node(parent);
+    return (parentNode->type() == BookmarkNode::Folder);
+}
+
+Qt::ItemFlags BookmarksModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return Qt::NoItemFlags;
+
+    Qt::ItemFlags flags = Qt::ItemIsSelectable | Qt::ItemIsEnabled;
+
+    BookmarkNode *bookmarkNode = node(index);
+
+    if (bookmarkNode != m_bookmarksManager->menu()
+        && bookmarkNode != m_bookmarksManager->toolbar()) {
+        flags |= Qt::ItemIsDragEnabled;
+        if (bookmarkNode->type() != BookmarkNode::Separator)
+            flags |= Qt::ItemIsEditable;
+    }
+    if (hasChildren(index))
+        flags |= Qt::ItemIsDropEnabled;
+    return flags;
+}
+
+Qt::DropActions BookmarksModel::supportedDropActions () const
+{
+    return Qt::CopyAction | Qt::MoveAction;
+}
+
+#define MIMETYPE QLatin1String("application/bookmarks.xbel")
+
+QStringList BookmarksModel::mimeTypes() const
+{
+    QStringList types;
+    types << MIMETYPE;
+    return types;
+}
+
+QMimeData *BookmarksModel::mimeData(const QModelIndexList &indexes) const
+{
+    QMimeData *mimeData = new QMimeData();
+    QByteArray data;
+    QDataStream stream(&data, QIODevice::WriteOnly);
+    foreach (QModelIndex index, indexes) {
+        if (index.column() != 0 || !index.isValid())
+            continue;
+        QByteArray encodedData;
+        QBuffer buffer(&encodedData);
+        buffer.open(QBuffer::ReadWrite);
+        XbelWriter writer;
+        const BookmarkNode *parentNode = node(index);
+        writer.write(&buffer, parentNode);
+        stream << encodedData;
+    }
+    mimeData->setData(MIMETYPE, data);
+    return mimeData;
+}
+
+bool BookmarksModel::dropMimeData(const QMimeData *data,
+     Qt::DropAction action, int row, int column, const QModelIndex &parent)
+{
+    if (action == Qt::IgnoreAction)
+        return true;
+
+    if (!data->hasFormat(MIMETYPE)
+        || column > 0)
+        return false;
+
+    QByteArray ba = data->data(MIMETYPE);
+    QDataStream stream(&ba, QIODevice::ReadOnly);
+    if (stream.atEnd())
+        return false;
+
+    QUndoStack *undoStack = m_bookmarksManager->undoRedoStack();
+    undoStack->beginMacro(QLatin1String("Move Bookmarks"));
+
+    while (!stream.atEnd()) {
+        QByteArray encodedData;
+        stream >> encodedData;
+        QBuffer buffer(&encodedData);
+        buffer.open(QBuffer::ReadOnly);
+
+        XbelReader reader;
+        BookmarkNode *rootNode = reader.read(&buffer);
+        QList<BookmarkNode*> children = rootNode->children();
+        for (int i = 0; i < children.count(); ++i) {
+            BookmarkNode *bookmarkNode = children.at(i);
+            rootNode->remove(bookmarkNode);
+            row = qMax(0, row);
+            BookmarkNode *parentNode = node(parent);
+            m_bookmarksManager->addBookmark(parentNode, bookmarkNode, row);
+            m_endMacro = true;
+        }
+        delete rootNode;
+    }
+    return true;
+}
+
+bool BookmarksModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+    if (!index.isValid() || (flags(index) & Qt::ItemIsEditable) == 0)
+        return false;
+
+    BookmarkNode *item = node(index);
+
+    switch (role) {
+    case Qt::EditRole:
+    case Qt::DisplayRole:
+        if (index.column() == 0) {
+            m_bookmarksManager->setTitle(item, value.toString());
+            break;
+        }
+        if (index.column() == 1) {
+            m_bookmarksManager->setUrl(item, value.toString());
+            break;
+        }
+        return false;
+    case BookmarksModel::UrlRole:
+        m_bookmarksManager->setUrl(item, value.toUrl().toString());
+        break;
+    case BookmarksModel::UrlStringRole:
+        m_bookmarksManager->setUrl(item, value.toString());
+        break;
+    default:
+        break;
+        return false;
+    }
+
+    return true;
+}
+
+BookmarkNode *BookmarksModel::node(const QModelIndex &index) const
+{
+    BookmarkNode *itemNode = static_cast<BookmarkNode*>(index.internalPointer());
+    if (!itemNode)
+        return m_bookmarksManager->bookmarks();
+    return itemNode;
+}
+
+
+AddBookmarkProxyModel::AddBookmarkProxyModel(QObject *parent)
+    : QSortFilterProxyModel(parent)
+{
+}
+
+int AddBookmarkProxyModel::columnCount(const QModelIndex &parent) const
+{
+    return qMin(1, QSortFilterProxyModel::columnCount(parent));
+}
+
+bool AddBookmarkProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
+{
+    QModelIndex idx = sourceModel()->index(source_row, 0, source_parent);
+    return sourceModel()->hasChildren(idx);
+}
+
+AddBookmarkDialog::AddBookmarkDialog(const QString &url, const QString &title, QWidget *parent, BookmarksManager *bookmarkManager)
+    : QDialog(parent)
+    , m_url(url)
+    , m_bookmarksManager(bookmarkManager)
+{
+    setWindowFlags(Qt::Sheet);
+    if (!m_bookmarksManager)
+        m_bookmarksManager = BrowserApplication::bookmarksManager();
+    setupUi(this);
+    QTreeView *view = new QTreeView(this);
+    m_proxyModel = new AddBookmarkProxyModel(this);
+    BookmarksModel *model = m_bookmarksManager->bookmarksModel();
+    m_proxyModel->setSourceModel(model);
+    view->setModel(m_proxyModel);
+    view->expandAll();
+    view->header()->setStretchLastSection(true);
+    view->header()->hide();
+    view->setItemsExpandable(false);
+    view->setRootIsDecorated(false);
+    view->setIndentation(10);
+    location->setModel(m_proxyModel);
+    view->show();
+    location->setView(view);
+    BookmarkNode *menu = m_bookmarksManager->menu();
+    QModelIndex idx = m_proxyModel->mapFromSource(model->index(menu));
+    view->setCurrentIndex(idx);
+    location->setCurrentIndex(idx.row());
+    name->setText(title);
+}
+
+void AddBookmarkDialog::accept()
+{
+    QModelIndex index = location->view()->currentIndex();
+    index = m_proxyModel->mapToSource(index);
+    if (!index.isValid())
+        index = m_bookmarksManager->bookmarksModel()->index(0, 0);
+    BookmarkNode *parent = m_bookmarksManager->bookmarksModel()->node(index);
+    BookmarkNode *bookmark = new BookmarkNode(BookmarkNode::Bookmark);
+    bookmark->url = m_url;
+    bookmark->title = name->text();
+    m_bookmarksManager->addBookmark(parent, bookmark);
+    QDialog::accept();
+}
+
+BookmarksMenu::BookmarksMenu(QWidget *parent)
+    : ModelMenu(parent)
+    , m_bookmarksManager(0)
+{
+    connect(this, SIGNAL(activated(const QModelIndex &)),
+            this, SLOT(activated(const QModelIndex &)));
+    setMaxRows(-1);
+    setHoverRole(BookmarksModel::UrlStringRole);
+    setSeparatorRole(BookmarksModel::SeparatorRole);
+}
+
+void BookmarksMenu::activated(const QModelIndex &index)
+{
+    emit openUrl(index.data(BookmarksModel::UrlRole).toUrl());
+}
+
+bool BookmarksMenu::prePopulated()
+{
+    m_bookmarksManager = BrowserApplication::bookmarksManager();
+    setModel(m_bookmarksManager->bookmarksModel());
+    setRootIndex(m_bookmarksManager->bookmarksModel()->index(1, 0));
+    // initial actions
+    for (int i = 0; i < m_initialActions.count(); ++i)
+        addAction(m_initialActions.at(i));
+    if (!m_initialActions.isEmpty())
+        addSeparator();
+    createMenu(model()->index(0, 0), 1, this);
+    return true;
+}
+
+void BookmarksMenu::setInitialActions(QList<QAction*> actions)
+{
+    m_initialActions = actions;
+    for (int i = 0; i < m_initialActions.count(); ++i)
+        addAction(m_initialActions.at(i));
+}
+
+BookmarksDialog::BookmarksDialog(QWidget *parent, BookmarksManager *manager)
+    : QDialog(parent)
+{
+    m_bookmarksManager = manager;
+    if (!m_bookmarksManager)
+        m_bookmarksManager = BrowserApplication::bookmarksManager();
+    setupUi(this);
+
+    tree->setUniformRowHeights(true);
+    tree->setSelectionBehavior(QAbstractItemView::SelectRows);
+    tree->setSelectionMode(QAbstractItemView::ContiguousSelection);
+    tree->setTextElideMode(Qt::ElideMiddle);
+    m_bookmarksModel = m_bookmarksManager->bookmarksModel();
+    m_proxyModel = new TreeProxyModel(this);
+    connect(search, SIGNAL(textChanged(QString)),
+            m_proxyModel, SLOT(setFilterFixedString(QString)));
+    connect(removeButton, SIGNAL(clicked()), tree, SLOT(removeOne()));
+    m_proxyModel->setSourceModel(m_bookmarksModel);
+    tree->setModel(m_proxyModel);
+    tree->setDragDropMode(QAbstractItemView::InternalMove);
+    tree->setExpanded(m_proxyModel->index(0, 0), true);
+    tree->setAlternatingRowColors(true);
+    QFontMetrics fm(font());
+    int header = fm.width(QLatin1Char('m')) * 40;
+    tree->header()->resizeSection(0, header);
+    tree->header()->setStretchLastSection(true);
+    connect(tree, SIGNAL(activated(const QModelIndex&)),
+            this, SLOT(open()));
+    tree->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(tree, SIGNAL(customContextMenuRequested(const QPoint &)),
+            this, SLOT(customContextMenuRequested(const QPoint &)));
+    connect(addFolderButton, SIGNAL(clicked()),
+            this, SLOT(newFolder()));
+    expandNodes(m_bookmarksManager->bookmarks());
+    setAttribute(Qt::WA_DeleteOnClose);
+}
+
+BookmarksDialog::~BookmarksDialog()
+{
+    if (saveExpandedNodes(tree->rootIndex()))
+        m_bookmarksManager->changeExpanded();
+}
+
+bool BookmarksDialog::saveExpandedNodes(const QModelIndex &parent)
+{
+    bool changed = false;
+    for (int i = 0; i < m_proxyModel->rowCount(parent); ++i) {
+        QModelIndex child = m_proxyModel->index(i, 0, parent);
+        QModelIndex sourceIndex = m_proxyModel->mapToSource(child);
+        BookmarkNode *childNode = m_bookmarksModel->node(sourceIndex);
+        bool wasExpanded = childNode->expanded;
+        if (tree->isExpanded(child)) {
+            childNode->expanded = true;
+            changed |= saveExpandedNodes(child);
+        } else {
+            childNode->expanded = false;
+        }
+        changed |= (wasExpanded != childNode->expanded);
+    }
+    return changed;
+}
+
+void BookmarksDialog::expandNodes(BookmarkNode *node)
+{
+    for (int i = 0; i < node->children().count(); ++i) {
+        BookmarkNode *childNode = node->children()[i];
+        if (childNode->expanded) {
+            QModelIndex idx = m_bookmarksModel->index(childNode);
+            idx = m_proxyModel->mapFromSource(idx);
+            tree->setExpanded(idx, true);
+            expandNodes(childNode);
+        }
+    }
+}
+
+void BookmarksDialog::customContextMenuRequested(const QPoint &pos)
+{
+    QMenu menu;
+    QModelIndex index = tree->indexAt(pos);
+    index = index.sibling(index.row(), 0);
+    if (index.isValid() && !tree->model()->hasChildren(index)) {
+        menu.addAction(tr("Open"), this, SLOT(open()));
+        menu.addSeparator();
+    }
+    menu.addAction(tr("Delete"), tree, SLOT(removeOne()));
+    menu.exec(QCursor::pos());
+}
+
+void BookmarksDialog::open()
+{
+    QModelIndex index = tree->currentIndex();
+    if (!index.parent().isValid())
+        return;
+    emit openUrl(index.sibling(index.row(), 1).data(BookmarksModel::UrlRole).toUrl());
+}
+
+void BookmarksDialog::newFolder()
+{
+    QModelIndex currentIndex = tree->currentIndex();
+    QModelIndex idx = currentIndex;
+    if (idx.isValid() && !idx.model()->hasChildren(idx))
+        idx = idx.parent();
+    if (!idx.isValid())
+        idx = tree->rootIndex();
+    idx = m_proxyModel->mapToSource(idx);
+    BookmarkNode *parent = m_bookmarksManager->bookmarksModel()->node(idx);
+    BookmarkNode *node = new BookmarkNode(BookmarkNode::Folder);
+    node->title = tr("New Folder");
+    m_bookmarksManager->addBookmark(parent, node, currentIndex.row() + 1);
+}
+
+BookmarksToolBar::BookmarksToolBar(BookmarksModel *model, QWidget *parent)
+    : QToolBar(tr("Bookmark"), parent)
+    , m_bookmarksModel(model)
+{
+    connect(this, SIGNAL(actionTriggered(QAction*)), this, SLOT(triggered(QAction*)));
+    setRootIndex(model->index(0, 0));
+    connect(m_bookmarksModel, SIGNAL(modelReset()), this, SLOT(build()));
+    connect(m_bookmarksModel, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(build()));
+    connect(m_bookmarksModel, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SLOT(build()));
+    connect(m_bookmarksModel, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), this, SLOT(build()));
+    setAcceptDrops(true);
+}
+
+void BookmarksToolBar::dragEnterEvent(QDragEnterEvent *event)
+{
+    const QMimeData *mimeData = event->mimeData();
+    if (mimeData->hasUrls())
+        event->acceptProposedAction();
+    QToolBar::dragEnterEvent(event);
+}
+
+void BookmarksToolBar::dropEvent(QDropEvent *event)
+{
+    const QMimeData *mimeData = event->mimeData();
+    if (mimeData->hasUrls() && mimeData->hasText()) {
+        QList<QUrl> urls = mimeData->urls();
+        QAction *action = actionAt(event->pos());
+        QString dropText;
+        if (action)
+            dropText = action->text();
+        int row = -1;
+        QModelIndex parentIndex = m_root;
+        for (int i = 0; i < m_bookmarksModel->rowCount(m_root); ++i) {
+            QModelIndex idx = m_bookmarksModel->index(i, 0, m_root);
+            QString title = idx.data().toString();
+            if (title == dropText) {
+                row = i;
+                if (m_bookmarksModel->hasChildren(idx)) {
+                    parentIndex = idx;
+                    row = -1;
+                }
+                break;
+            }
+        }
+        BookmarkNode *bookmark = new BookmarkNode(BookmarkNode::Bookmark);
+        bookmark->url = urls.at(0).toString();
+        bookmark->title = mimeData->text();
+
+        BookmarkNode *parent = m_bookmarksModel->node(parentIndex);
+        BookmarksManager *bookmarksManager = m_bookmarksModel->bookmarksManager();
+        bookmarksManager->addBookmark(parent, bookmark, row);
+        event->acceptProposedAction();
+    }
+    QToolBar::dropEvent(event);
+}
+
+
+void BookmarksToolBar::setRootIndex(const QModelIndex &index)
+{
+    m_root = index;
+    build();
+}
+
+QModelIndex BookmarksToolBar::rootIndex() const
+{
+    return m_root;
+}
+
+void BookmarksToolBar::build()
+{
+    clear();
+    for (int i = 0; i < m_bookmarksModel->rowCount(m_root); ++i) {
+        QModelIndex idx = m_bookmarksModel->index(i, 0, m_root);
+        if (m_bookmarksModel->hasChildren(idx)) {
+            QToolButton *button = new QToolButton(this);
+            button->setPopupMode(QToolButton::InstantPopup);
+            button->setArrowType(Qt::DownArrow);
+            button->setText(idx.data().toString());
+            ModelMenu *menu = new ModelMenu(this);
+            connect(menu, SIGNAL(activated(const QModelIndex &)),
+                    this, SLOT(activated(const QModelIndex &)));
+            menu->setModel(m_bookmarksModel);
+            menu->setRootIndex(idx);
+            menu->addAction(new QAction(menu));
+            button->setMenu(menu);
+            button->setToolButtonStyle(Qt::ToolButtonTextOnly);
+            QAction *a = addWidget(button);
+            a->setText(idx.data().toString());
+        } else {
+            QAction *action = addAction(idx.data().toString());
+            action->setData(idx.data(BookmarksModel::UrlRole));
+        }
+    }
+}
+
+void BookmarksToolBar::triggered(QAction *action)
+{
+    QVariant v = action->data();
+    if (v.canConvert<QUrl>()) {
+        emit openUrl(v.toUrl());
+    }
+}
+
+void BookmarksToolBar::activated(const QModelIndex &index)
+{
+    emit openUrl(index.data(BookmarksModel::UrlRole).toUrl());
+}
+
diff --git a/demos/browser/bookmarks.h b/demos/browser/bookmarks.h
new file mode 100644
index 0000000000..fb47b4f476
--- /dev/null
+++ b/demos/browser/bookmarks.h
@@ -0,0 +1,310 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BOOKMARKS_H
+#define BOOKMARKS_H
+
+#include <QtCore/QObject>
+#include <QtCore/QAbstractItemModel>
+
+#include <QtGui/QUndoCommand>
+
+/*!
+    Bookmark manager, owner of the bookmarks, loads, saves and basic tasks
+  */
+class AutoSaver;
+class BookmarkNode;
+class BookmarksModel;
+class BookmarksManager : public QObject
+{
+    Q_OBJECT
+
+signals:
+    void entryAdded(BookmarkNode *item);
+    void entryRemoved(BookmarkNode *parent, int row, BookmarkNode *item);
+    void entryChanged(BookmarkNode *item);
+
+public:
+    BookmarksManager(QObject *parent = 0);
+    ~BookmarksManager();
+
+    void addBookmark(BookmarkNode *parent, BookmarkNode *node, int row = -1);
+    void removeBookmark(BookmarkNode *node);
+    void setTitle(BookmarkNode *node, const QString &newTitle);
+    void setUrl(BookmarkNode *node, const QString &newUrl);
+    void changeExpanded();
+
+    BookmarkNode *bookmarks();
+    BookmarkNode *menu();
+    BookmarkNode *toolbar();
+
+    BookmarksModel *bookmarksModel();
+    QUndoStack *undoRedoStack() { return &m_commands; };
+
+public slots:
+    void importBookmarks();
+    void exportBookmarks();
+
+private slots:
+    void save() const;
+
+private:
+    void load();
+
+    bool m_loaded;
+    AutoSaver *m_saveTimer;
+    BookmarkNode *m_bookmarkRootNode;
+    BookmarksModel *m_bookmarkModel;
+    QUndoStack m_commands;
+
+    friend class RemoveBookmarksCommand;
+    friend class ChangeBookmarkCommand;
+};
+
+class RemoveBookmarksCommand : public QUndoCommand
+{
+
+public:
+    RemoveBookmarksCommand(BookmarksManager *m_bookmarkManagaer, BookmarkNode *parent, int row);
+    ~RemoveBookmarksCommand();
+    void undo();
+    void redo();
+
+protected:
+    int m_row;
+    BookmarksManager *m_bookmarkManagaer;
+    BookmarkNode *m_node;
+    BookmarkNode *m_parent;
+    bool m_done;
+};
+
+class InsertBookmarksCommand : public RemoveBookmarksCommand
+{
+
+public:
+    InsertBookmarksCommand(BookmarksManager *m_bookmarkManagaer,
+        BookmarkNode *parent, BookmarkNode *node, int row);
+    void undo() { RemoveBookmarksCommand::redo(); }
+    void redo() { RemoveBookmarksCommand::undo(); }
+
+};
+
+class ChangeBookmarkCommand : public QUndoCommand
+{
+
+public:
+    ChangeBookmarkCommand(BookmarksManager *m_bookmarkManagaer,
+        BookmarkNode *node, const QString &newValue, bool title);
+    void undo();
+    void redo();
+
+private:
+    BookmarksManager *m_bookmarkManagaer;
+    bool m_title;
+    QString m_oldValue;
+    QString m_newValue;
+    BookmarkNode *m_node;
+};
+
+/*!
+    BookmarksModel is a QAbstractItemModel wrapper around the BookmarkManager
+  */
+#include <QtGui/QIcon>
+class BookmarksModel : public QAbstractItemModel
+{
+    Q_OBJECT
+
+public slots:
+    void entryAdded(BookmarkNode *item);
+    void entryRemoved(BookmarkNode *parent, int row, BookmarkNode *item);
+    void entryChanged(BookmarkNode *item);
+
+public:
+    enum Roles {
+        TypeRole = Qt::UserRole + 1,
+        UrlRole = Qt::UserRole + 2,
+        UrlStringRole = Qt::UserRole + 3,
+        SeparatorRole = Qt::UserRole + 4
+    };
+
+    BookmarksModel(BookmarksManager *bookmarkManager, QObject *parent = 0);
+    inline BookmarksManager *bookmarksManager() const { return m_bookmarksManager; }
+
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex index(int, int, const QModelIndex& = QModelIndex()) const;
+    QModelIndex parent(const QModelIndex& index= QModelIndex()) const;
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+    Qt::DropActions supportedDropActions () const;
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
+    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
+    QMimeData *mimeData(const QModelIndexList &indexes) const;
+    QStringList mimeTypes() const;
+    bool dropMimeData(const QMimeData *data,
+        Qt::DropAction action, int row, int column, const QModelIndex &parent);
+    bool hasChildren(const QModelIndex &parent = QModelIndex()) const;
+
+    BookmarkNode *node(const QModelIndex &index) const;
+    QModelIndex index(BookmarkNode *node) const;
+
+private:
+
+    bool m_endMacro;
+    BookmarksManager *m_bookmarksManager;
+};
+
+// Menu that is dynamically populated from the bookmarks
+#include "modelmenu.h"
+class BookmarksMenu : public ModelMenu
+{
+    Q_OBJECT
+
+signals:
+    void openUrl(const QUrl &url);
+
+public:
+     BookmarksMenu(QWidget *parent = 0);
+     void setInitialActions(QList<QAction*> actions);
+
+protected:
+    bool prePopulated();
+
+private slots:
+    void activated(const QModelIndex &index);
+
+private:
+    BookmarksManager *m_bookmarksManager;
+    QList<QAction*> m_initialActions;
+};
+
+/*
+    Proxy model that filters out the bookmarks so only the folders
+    are left behind.  Used in the add bookmark dialog combobox.
+ */
+#include <QtGui/QSortFilterProxyModel>
+class AddBookmarkProxyModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+public:
+    AddBookmarkProxyModel(QObject * parent = 0);
+    int columnCount(const QModelIndex & parent = QModelIndex()) const;
+
+protected:
+    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
+};
+
+/*!
+    Add bookmark dialog
+ */
+#include "ui_addbookmarkdialog.h"
+class AddBookmarkDialog : public QDialog, public Ui_AddBookmarkDialog
+{
+    Q_OBJECT
+
+public:
+    AddBookmarkDialog(const QString &url, const QString &title, QWidget *parent = 0, BookmarksManager *bookmarkManager = 0);
+
+private slots:
+    void accept();
+
+private:
+    QString m_url;
+    BookmarksManager *m_bookmarksManager;
+    AddBookmarkProxyModel *m_proxyModel;
+};
+
+#include "ui_bookmarks.h"
+class TreeProxyModel;
+class BookmarksDialog : public QDialog, public Ui_BookmarksDialog
+{
+    Q_OBJECT
+
+signals:
+    void openUrl(const QUrl &url);
+
+public:
+    BookmarksDialog(QWidget *parent = 0, BookmarksManager *manager = 0);
+    ~BookmarksDialog();
+
+private slots:
+    void customContextMenuRequested(const QPoint &pos);
+    void open();
+    void newFolder();
+
+private:
+    void expandNodes(BookmarkNode *node);
+    bool saveExpandedNodes(const QModelIndex &parent);
+
+    BookmarksManager *m_bookmarksManager;
+    BookmarksModel *m_bookmarksModel;
+    TreeProxyModel *m_proxyModel;
+};
+
+#include <QtGui/QToolBar>
+class BookmarksToolBar : public QToolBar
+{
+    Q_OBJECT
+
+signals:
+    void openUrl(const QUrl &url);
+
+public:
+    BookmarksToolBar(BookmarksModel *model, QWidget *parent = 0);
+    void setRootIndex(const QModelIndex &index);
+    QModelIndex rootIndex() const;
+
+protected:
+    void dragEnterEvent(QDragEnterEvent *event);
+    void dropEvent(QDropEvent *event);
+
+private slots:
+    void triggered(QAction *action);
+    void activated(const QModelIndex &index);
+    void build();
+
+private:
+    BookmarksModel *m_bookmarksModel;
+    QPersistentModelIndex m_root;
+};
+
+#endif // BOOKMARKS_H
diff --git a/demos/browser/bookmarks.ui b/demos/browser/bookmarks.ui
new file mode 100644
index 0000000000..c893e941d6
--- /dev/null
+++ b/demos/browser/bookmarks.ui
@@ -0,0 +1,106 @@
+<ui version="4.0" >
+ <class>BookmarksDialog</class>
+ <widget class="QDialog" name="BookmarksDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>758</width>
+    <height>450</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Bookmarks</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>252</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1" >
+    <widget class="SearchLineEdit" name="search" />
+   </item>
+   <item row="1" column="0" colspan="2" >
+    <widget class="EditTreeView" name="tree" />
+   </item>
+   <item row="2" column="0" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QPushButton" name="removeButton" >
+       <property name="text" >
+        <string>&amp;Remove</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="addFolderButton" >
+       <property name="text" >
+        <string>Add Folder</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox" >
+       <property name="standardButtons" >
+        <set>QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SearchLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>searchlineedit.h</header>
+  </customwidget>
+  <customwidget>
+   <class>EditTreeView</class>
+   <extends>QTreeView</extends>
+   <header>edittreeview.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>BookmarksDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>472</x>
+     <y>329</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>461</x>
+     <y>356</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/demos/browser/browser.icns b/demos/browser/browser.icns
new file mode 100644
index 0000000000..f591ae48ae
--- /dev/null
+++ b/demos/browser/browser.icns
diff --git a/demos/browser/browser.ico b/demos/browser/browser.ico
new file mode 100644
index 0000000000..7f9be934db
--- /dev/null
+++ b/demos/browser/browser.ico
diff --git a/demos/browser/browser.pro b/demos/browser/browser.pro
new file mode 100644
index 0000000000..d970f9970e
--- /dev/null
+++ b/demos/browser/browser.pro
@@ -0,0 +1,91 @@
+TEMPLATE = app
+TARGET = browser
+QT += webkit network
+
+CONFIG += qt warn_on
+contains(QT_BUILD_PARTS, tools): CONFIG += uitools
+else: DEFINES += QT_NO_UITOOLS
+
+FORMS += \
+    addbookmarkdialog.ui \
+    bookmarks.ui \
+    cookies.ui \
+    cookiesexceptions.ui \
+    downloaditem.ui \
+    downloads.ui \
+    history.ui \
+    passworddialog.ui \
+    proxy.ui \
+    settings.ui
+
+HEADERS += \
+    autosaver.h \
+    bookmarks.h \
+    browserapplication.h \
+    browsermainwindow.h \
+    chasewidget.h \
+    cookiejar.h \
+    downloadmanager.h \
+    edittableview.h \
+    edittreeview.h \
+    history.h \
+    modelmenu.h \
+    networkaccessmanager.h \
+    searchlineedit.h \
+    settings.h \
+    squeezelabel.h \
+    tabwidget.h \
+    toolbarsearch.h \
+    urllineedit.h \
+    webview.h \
+    xbel.h
+
+SOURCES += \
+    autosaver.cpp \
+    bookmarks.cpp \
+    browserapplication.cpp \
+    browsermainwindow.cpp \
+    chasewidget.cpp \
+    cookiejar.cpp \
+    downloadmanager.cpp \
+    edittableview.cpp \
+    edittreeview.cpp \
+    history.cpp \
+    modelmenu.cpp \
+    networkaccessmanager.cpp \
+    searchlineedit.cpp \
+    settings.cpp \
+    squeezelabel.cpp \
+    tabwidget.cpp \
+    toolbarsearch.cpp \
+    urllineedit.cpp \
+    webview.cpp \
+    xbel.cpp \
+    main.cpp
+
+RESOURCES += data/data.qrc htmls/htmls.qrc
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+win32 {
+   RC_FILE = browser.rc
+}
+
+mac {
+    ICON = browser.icns
+    QMAKE_INFO_PLIST = Info_mac.plist
+    TARGET = Browser
+}
+
+wince*: {
+    DEPLOYMENT_PLUGIN += qjpeg qgif
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/browser
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.plist *.icns *.ico *.rc *.pro *.html *.doc images htmls
+sources.path = $$[QT_INSTALL_DEMOS]/browser
+INSTALLS += target sources
diff --git a/demos/browser/browser.rc b/demos/browser/browser.rc
new file mode 100644
index 0000000000..89a237ce2f
--- /dev/null
+++ b/demos/browser/browser.rc
@@ -0,0 +1,2 @@
+IDI_ICON1               ICON    DISCARDABLE     "browser.ico"
+
diff --git a/demos/browser/browserapplication.cpp b/demos/browser/browserapplication.cpp
new file mode 100644
index 0000000000..543302277a
--- /dev/null
+++ b/demos/browser/browserapplication.cpp
@@ -0,0 +1,456 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "browserapplication.h"
+
+#include "bookmarks.h"
+#include "browsermainwindow.h"
+#include "cookiejar.h"
+#include "downloadmanager.h"
+#include "history.h"
+#include "networkaccessmanager.h"
+#include "tabwidget.h"
+#include "webview.h"
+
+#include <QtCore/QBuffer>
+#include <QtCore/QDir>
+#include <QtCore/QLibraryInfo>
+#include <QtCore/QSettings>
+#include <QtCore/QTextStream>
+#include <QtCore/QTranslator>
+
+#include <QtGui/QDesktopServices>
+#include <QtGui/QFileOpenEvent>
+#include <QtGui/QMessageBox>
+
+#include <QtNetwork/QLocalServer>
+#include <QtNetwork/QLocalSocket>
+#include <QtNetwork/QNetworkProxy>
+#include <QtNetwork/QSslSocket>
+
+#include <QtWebKit/QWebSettings>
+
+#include <QtCore/QDebug>
+
+DownloadManager *BrowserApplication::s_downloadManager = 0;
+HistoryManager *BrowserApplication::s_historyManager = 0;
+NetworkAccessManager *BrowserApplication::s_networkAccessManager = 0;
+BookmarksManager *BrowserApplication::s_bookmarksManager = 0;
+
+BrowserApplication::BrowserApplication(int &argc, char **argv)
+    : QApplication(argc, argv)
+    , m_localServer(0)
+{
+    QCoreApplication::setOrganizationName(QLatin1String("Trolltech"));
+    QCoreApplication::setApplicationName(QLatin1String("demobrowser"));
+    QCoreApplication::setApplicationVersion(QLatin1String("0.1"));
+#ifdef Q_WS_QWS
+    // Use a different server name for QWS so we can run an X11
+    // browser and a QWS browser in parallel on the same machine for
+    // debugging
+    QString serverName = QCoreApplication::applicationName() + QLatin1String("_qws");
+#else
+    QString serverName = QCoreApplication::applicationName();
+#endif
+    QLocalSocket socket;
+    socket.connectToServer(serverName);
+    if (socket.waitForConnected(500)) {
+        QTextStream stream(&socket);
+        QStringList args = QCoreApplication::arguments();
+        if (args.count() > 1)
+            stream << args.last();
+        else
+            stream << QString();
+        stream.flush();
+        socket.waitForBytesWritten();
+        return;
+    }
+
+#if defined(Q_WS_MAC)
+    QApplication::setQuitOnLastWindowClosed(false);
+#else
+    QApplication::setQuitOnLastWindowClosed(true);
+#endif
+
+    m_localServer = new QLocalServer(this);
+    connect(m_localServer, SIGNAL(newConnection()),
+            this, SLOT(newLocalSocketConnection()));
+    if (!m_localServer->listen(serverName)) {
+        if (m_localServer->serverError() == QAbstractSocket::AddressInUseError
+            && QFile::exists(m_localServer->serverName())) {
+            QFile::remove(m_localServer->serverName());
+            m_localServer->listen(serverName);
+        }
+    }
+
+#ifndef QT_NO_OPENSSL
+    if (!QSslSocket::supportsSsl()) {
+    QMessageBox::information(0, "Demo Browser",
+                 "This system does not support OpenSSL. SSL websites will not be available.");
+    }
+#endif
+
+    QDesktopServices::setUrlHandler(QLatin1String("http"), this, "openUrl");
+    QString localSysName = QLocale::system().name();
+
+    installTranslator(QLatin1String("qt_") + localSysName);
+
+    QSettings settings;
+    settings.beginGroup(QLatin1String("sessions"));
+    m_lastSession = settings.value(QLatin1String("lastSession")).toByteArray();
+    settings.endGroup();
+
+#if defined(Q_WS_MAC)
+    connect(this, SIGNAL(lastWindowClosed()),
+            this, SLOT(lastWindowClosed()));
+#endif
+
+    QTimer::singleShot(0, this, SLOT(postLaunch()));
+}
+
+BrowserApplication::~BrowserApplication()
+{
+    delete s_downloadManager;
+    for (int i = 0; i < m_mainWindows.size(); ++i) {
+        BrowserMainWindow *window = m_mainWindows.at(i);
+        delete window;
+    }
+    delete s_networkAccessManager;
+    delete s_bookmarksManager;
+}
+
+#if defined(Q_WS_MAC)
+void BrowserApplication::lastWindowClosed()
+{
+    clean();
+    BrowserMainWindow *mw = new BrowserMainWindow;
+    mw->slotHome();
+    m_mainWindows.prepend(mw);
+}
+#endif
+
+BrowserApplication *BrowserApplication::instance()
+{
+    return (static_cast<BrowserApplication *>(QCoreApplication::instance()));
+}
+
+#if defined(Q_WS_MAC)
+#include <QtGui/QMessageBox>
+void BrowserApplication::quitBrowser()
+{
+    clean();
+    int tabCount = 0;
+    for (int i = 0; i < m_mainWindows.count(); ++i) {
+        tabCount =+ m_mainWindows.at(i)->tabWidget()->count();
+    }
+
+    if (tabCount > 1) {
+        int ret = QMessageBox::warning(mainWindow(), QString(),
+                           tr("There are %1 windows and %2 tabs open\n"
+                              "Do you want to quit anyway?").arg(m_mainWindows.count()).arg(tabCount),
+                           QMessageBox::Yes | QMessageBox::No,
+                           QMessageBox::No);
+        if (ret == QMessageBox::No)
+            return;
+    }
+
+    exit(0);
+}
+#endif
+
+/*!
+    Any actions that can be delayed until the window is visible
+ */
+void BrowserApplication::postLaunch()
+{
+    QString directory = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+    if (directory.isEmpty())
+        directory = QDir::homePath() + QLatin1String("/.") + QCoreApplication::applicationName();
+    QWebSettings::setIconDatabasePath(directory);
+
+    setWindowIcon(QIcon(QLatin1String(":browser.svg")));
+
+    loadSettings();
+
+    // newMainWindow() needs to be called in main() for this to happen
+    if (m_mainWindows.count() > 0) {
+        QStringList args = QCoreApplication::arguments();
+        if (args.count() > 1)
+            mainWindow()->loadPage(args.last());
+        else
+            mainWindow()->slotHome();
+    }
+    BrowserApplication::historyManager();
+}
+
+void BrowserApplication::loadSettings()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("websettings"));
+
+    QWebSettings *defaultSettings = QWebSettings::globalSettings();
+    QString standardFontFamily = defaultSettings->fontFamily(QWebSettings::StandardFont);
+    int standardFontSize = defaultSettings->fontSize(QWebSettings::DefaultFontSize);
+    QFont standardFont = QFont(standardFontFamily, standardFontSize);
+    standardFont = qVariantValue<QFont>(settings.value(QLatin1String("standardFont"), standardFont));
+    defaultSettings->setFontFamily(QWebSettings::StandardFont, standardFont.family());
+    defaultSettings->setFontSize(QWebSettings::DefaultFontSize, standardFont.pointSize());
+
+    QString fixedFontFamily = defaultSettings->fontFamily(QWebSettings::FixedFont);
+    int fixedFontSize = defaultSettings->fontSize(QWebSettings::DefaultFixedFontSize);
+    QFont fixedFont = QFont(fixedFontFamily, fixedFontSize);
+    fixedFont = qVariantValue<QFont>(settings.value(QLatin1String("fixedFont"), fixedFont));
+    defaultSettings->setFontFamily(QWebSettings::FixedFont, fixedFont.family());
+    defaultSettings->setFontSize(QWebSettings::DefaultFixedFontSize, fixedFont.pointSize());
+
+    defaultSettings->setAttribute(QWebSettings::JavascriptEnabled, settings.value(QLatin1String("enableJavascript"), true).toBool());
+    defaultSettings->setAttribute(QWebSettings::PluginsEnabled, settings.value(QLatin1String("enablePlugins"), true).toBool());
+
+    QUrl url = settings.value(QLatin1String("userStyleSheet")).toUrl();
+    defaultSettings->setUserStyleSheetUrl(url);
+
+    settings.endGroup();
+}
+
+QList<BrowserMainWindow*> BrowserApplication::mainWindows()
+{
+    clean();
+    QList<BrowserMainWindow*> list;
+    for (int i = 0; i < m_mainWindows.count(); ++i)
+        list.append(m_mainWindows.at(i));
+    return list;
+}
+
+void BrowserApplication::clean()
+{
+    // cleanup any deleted main windows first
+    for (int i = m_mainWindows.count() - 1; i >= 0; --i)
+        if (m_mainWindows.at(i).isNull())
+            m_mainWindows.removeAt(i);
+}
+
+void BrowserApplication::saveSession()
+{
+    QWebSettings *globalSettings = QWebSettings::globalSettings();
+    if (globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
+        return;
+
+    clean();
+
+    QSettings settings;
+    settings.beginGroup(QLatin1String("sessions"));
+
+    QByteArray data;
+    QBuffer buffer(&data);
+    QDataStream stream(&buffer);
+    buffer.open(QIODevice::ReadWrite);
+
+    stream << m_mainWindows.count();
+    for (int i = 0; i < m_mainWindows.count(); ++i)
+        stream << m_mainWindows.at(i)->saveState();
+    settings.setValue(QLatin1String("lastSession"), data);
+    settings.endGroup();
+}
+
+bool BrowserApplication::canRestoreSession() const
+{
+    return !m_lastSession.isEmpty();
+}
+
+void BrowserApplication::restoreLastSession()
+{
+    QList<QByteArray> windows;
+    QBuffer buffer(&m_lastSession);
+    QDataStream stream(&buffer);
+    buffer.open(QIODevice::ReadOnly);
+    int windowCount;
+    stream >> windowCount;
+    for (int i = 0; i < windowCount; ++i) {
+        QByteArray windowState;
+        stream >> windowState;
+        windows.append(windowState);
+    }
+    for (int i = 0; i < windows.count(); ++i) {
+        BrowserMainWindow *newWindow = 0;
+        if (m_mainWindows.count() == 1
+            && mainWindow()->tabWidget()->count() == 1
+            && mainWindow()->currentTab()->url() == QUrl()) {
+            newWindow = mainWindow();
+        } else {
+            newWindow = newMainWindow();
+        }
+        newWindow->restoreState(windows.at(i));
+    }
+}
+
+bool BrowserApplication::isTheOnlyBrowser() const
+{
+    return (m_localServer != 0);
+}
+
+void BrowserApplication::installTranslator(const QString &name)
+{
+    QTranslator *translator = new QTranslator(this);
+    translator->load(name, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+    QApplication::installTranslator(translator);
+}
+
+#if defined(Q_WS_MAC)
+bool BrowserApplication::event(QEvent* event)
+{
+    switch (event->type()) {
+    case QEvent::ApplicationActivate: {
+        clean();
+        if (!m_mainWindows.isEmpty()) {
+            BrowserMainWindow *mw = mainWindow();
+            if (mw && !mw->isMinimized()) {
+                mainWindow()->show();
+            }
+            return true;
+        }
+    }
+    case QEvent::FileOpen:
+        if (!m_mainWindows.isEmpty()) {
+            mainWindow()->loadPage(static_cast<QFileOpenEvent *>(event)->file());
+            return true;
+        }
+    default:
+        break;
+    }
+    return QApplication::event(event);
+}
+#endif
+
+void BrowserApplication::openUrl(const QUrl &url)
+{
+    mainWindow()->loadPage(url.toString());
+}
+
+BrowserMainWindow *BrowserApplication::newMainWindow()
+{
+    BrowserMainWindow *browser = new BrowserMainWindow();
+    m_mainWindows.prepend(browser);
+    browser->show();
+    return browser;
+}
+
+BrowserMainWindow *BrowserApplication::mainWindow()
+{
+    clean();
+    if (m_mainWindows.isEmpty())
+        newMainWindow();
+    return m_mainWindows[0];
+}
+
+void BrowserApplication::newLocalSocketConnection()
+{
+    QLocalSocket *socket = m_localServer->nextPendingConnection();
+    if (!socket)
+        return;
+    socket->waitForReadyRead(1000);
+    QTextStream stream(socket);
+    QString url;
+    stream >> url;
+    if (!url.isEmpty()) {
+        QSettings settings;
+        settings.beginGroup(QLatin1String("general"));
+        int openLinksIn = settings.value(QLatin1String("openLinksIn"), 0).toInt();
+        settings.endGroup();
+        if (openLinksIn == 1)
+            newMainWindow();
+        else
+            mainWindow()->tabWidget()->newTab();
+        openUrl(url);
+    }
+    delete socket;
+    mainWindow()->raise();
+    mainWindow()->activateWindow();
+}
+
+CookieJar *BrowserApplication::cookieJar()
+{
+    return (CookieJar*)networkAccessManager()->cookieJar();
+}
+
+DownloadManager *BrowserApplication::downloadManager()
+{
+    if (!s_downloadManager) {
+        s_downloadManager = new DownloadManager();
+    }
+    return s_downloadManager;
+}
+
+NetworkAccessManager *BrowserApplication::networkAccessManager()
+{
+    if (!s_networkAccessManager) {
+        s_networkAccessManager = new NetworkAccessManager();
+        s_networkAccessManager->setCookieJar(new CookieJar);
+    }
+    return s_networkAccessManager;
+}
+
+HistoryManager *BrowserApplication::historyManager()
+{
+    if (!s_historyManager) {
+        s_historyManager = new HistoryManager();
+        QWebHistoryInterface::setDefaultInterface(s_historyManager);
+    }
+    return s_historyManager;
+}
+
+BookmarksManager *BrowserApplication::bookmarksManager()
+{
+    if (!s_bookmarksManager) {
+        s_bookmarksManager = new BookmarksManager;
+    }
+    return s_bookmarksManager;
+}
+
+QIcon BrowserApplication::icon(const QUrl &url) const
+{
+    QIcon icon = QWebSettings::iconForUrl(url);
+    if (!icon.isNull())
+        return icon.pixmap(16, 16);
+    if (m_defaultIcon.isNull())
+        m_defaultIcon = QIcon(QLatin1String(":defaulticon.png"));
+    return m_defaultIcon.pixmap(16, 16);
+}
+
diff --git a/demos/browser/browserapplication.h b/demos/browser/browserapplication.h
new file mode 100644
index 0000000000..6887dfd7a7
--- /dev/null
+++ b/demos/browser/browserapplication.h
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BROWSERAPPLICATION_H
+#define BROWSERAPPLICATION_H
+
+#include <QtGui/QApplication>
+
+#include <QtCore/QUrl>
+#include <QtCore/QPointer>
+
+#include <QtGui/QIcon>
+
+QT_BEGIN_NAMESPACE
+class QLocalServer;
+QT_END_NAMESPACE
+
+class BookmarksManager;
+class BrowserMainWindow;
+class CookieJar;
+class DownloadManager;
+class HistoryManager;
+class NetworkAccessManager;
+class BrowserApplication : public QApplication
+{
+    Q_OBJECT
+
+public:
+    BrowserApplication(int &argc, char **argv);
+    ~BrowserApplication();
+    static BrowserApplication *instance();
+    void loadSettings();
+
+    bool isTheOnlyBrowser() const;
+    BrowserMainWindow *mainWindow();
+    QList<BrowserMainWindow*> mainWindows();
+    QIcon icon(const QUrl &url) const;
+
+    void saveSession();
+    bool canRestoreSession() const;
+
+    static HistoryManager *historyManager();
+    static CookieJar *cookieJar();
+    static DownloadManager *downloadManager();
+    static NetworkAccessManager *networkAccessManager();
+    static BookmarksManager *bookmarksManager();
+
+#if defined(Q_WS_MAC)
+    bool event(QEvent *event);
+#endif
+
+public slots:
+    BrowserMainWindow *newMainWindow();
+    void restoreLastSession();
+#if defined(Q_WS_MAC)
+    void lastWindowClosed();
+    void quitBrowser();
+#endif
+
+private slots:
+    void postLaunch();
+    void openUrl(const QUrl &url);
+    void newLocalSocketConnection();
+
+private:
+    void clean();
+    void installTranslator(const QString &name);
+
+    static HistoryManager *s_historyManager;
+    static DownloadManager *s_downloadManager;
+    static NetworkAccessManager *s_networkAccessManager;
+    static BookmarksManager *s_bookmarksManager;
+
+    QList<QPointer<BrowserMainWindow> > m_mainWindows;
+    QLocalServer *m_localServer;
+    QByteArray m_lastSession;
+    mutable QIcon m_defaultIcon;
+};
+
+#endif // BROWSERAPPLICATION_H
+
diff --git a/demos/browser/browsermainwindow.cpp b/demos/browser/browsermainwindow.cpp
new file mode 100644
index 0000000000..f1dcaef657
--- /dev/null
+++ b/demos/browser/browsermainwindow.cpp
@@ -0,0 +1,991 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "browsermainwindow.h"
+
+#include "autosaver.h"
+#include "bookmarks.h"
+#include "browserapplication.h"
+#include "chasewidget.h"
+#include "downloadmanager.h"
+#include "history.h"
+#include "settings.h"
+#include "tabwidget.h"
+#include "toolbarsearch.h"
+#include "ui_passworddialog.h"
+#include "webview.h"
+
+#include <QtCore/QSettings>
+
+#include <QtGui/QDesktopWidget>
+#include <QtGui/QFileDialog>
+#include <QtGui/QPlainTextEdit>
+#include <QtGui/QPrintDialog>
+#include <QtGui/QPrintPreviewDialog>
+#include <QtGui/QPrinter>
+#include <QtGui/QMenuBar>
+#include <QtGui/QMessageBox>
+#include <QtGui/QStatusBar>
+#include <QtGui/QToolBar>
+#include <QtGui/QInputDialog>
+
+#include <QtWebKit/QWebFrame>
+#include <QtWebKit/QWebHistory>
+
+#include <QtCore/QDebug>
+
+BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags)
+    : QMainWindow(parent, flags)
+    , m_tabWidget(new TabWidget(this))
+    , m_autoSaver(new AutoSaver(this))
+    , m_historyBack(0)
+    , m_historyForward(0)
+    , m_stop(0)
+    , m_reload(0)
+{
+    setAttribute(Qt::WA_DeleteOnClose, true);
+    statusBar()->setSizeGripEnabled(true);
+    setupMenu();
+    setupToolBar();
+
+    QWidget *centralWidget = new QWidget(this);
+    BookmarksModel *boomarksModel = BrowserApplication::bookmarksManager()->bookmarksModel();
+    m_bookmarksToolbar = new BookmarksToolBar(boomarksModel, this);
+    connect(m_bookmarksToolbar, SIGNAL(openUrl(const QUrl&)),
+            m_tabWidget, SLOT(loadUrlInCurrentTab(const QUrl&)));
+    connect(m_bookmarksToolbar->toggleViewAction(), SIGNAL(toggled(bool)),
+            this, SLOT(updateBookmarksToolbarActionText(bool)));
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->setSpacing(0);
+    layout->setMargin(0);
+#if defined(Q_WS_MAC)
+    layout->addWidget(m_bookmarksToolbar);
+    layout->addWidget(new QWidget); // <- OS X tab widget style bug
+#else
+    addToolBarBreak();
+    addToolBar(m_bookmarksToolbar);
+#endif
+    layout->addWidget(m_tabWidget);
+    centralWidget->setLayout(layout);
+	setCentralWidget(centralWidget);
+
+    connect(m_tabWidget, SIGNAL(loadPage(const QString &)),
+        this, SLOT(loadPage(const QString &)));
+    connect(m_tabWidget, SIGNAL(setCurrentTitle(const QString &)),
+        this, SLOT(slotUpdateWindowTitle(const QString &)));
+    connect(m_tabWidget, SIGNAL(showStatusBarMessage(const QString&)),
+            statusBar(), SLOT(showMessage(const QString&)));
+    connect(m_tabWidget, SIGNAL(linkHovered(const QString&)),
+            statusBar(), SLOT(showMessage(const QString&)));
+    connect(m_tabWidget, SIGNAL(loadProgress(int)),
+            this, SLOT(slotLoadProgress(int)));
+    connect(m_tabWidget, SIGNAL(tabsChanged()),
+            m_autoSaver, SLOT(changeOccurred()));
+    connect(m_tabWidget, SIGNAL(geometryChangeRequested(const QRect &)),
+            this, SLOT(geometryChangeRequested(const QRect &)));
+    connect(m_tabWidget, SIGNAL(printRequested(QWebFrame *)),
+            this, SLOT(printRequested(QWebFrame *)));
+    connect(m_tabWidget, SIGNAL(menuBarVisibilityChangeRequested(bool)),
+            menuBar(), SLOT(setVisible(bool)));
+    connect(m_tabWidget, SIGNAL(statusBarVisibilityChangeRequested(bool)),
+            statusBar(), SLOT(setVisible(bool)));
+    connect(m_tabWidget, SIGNAL(toolBarVisibilityChangeRequested(bool)),
+            m_navigationBar, SLOT(setVisible(bool)));
+    connect(m_tabWidget, SIGNAL(toolBarVisibilityChangeRequested(bool)),
+            m_bookmarksToolbar, SLOT(setVisible(bool)));
+#if defined(Q_WS_MAC)
+    connect(m_tabWidget, SIGNAL(lastTabClosed()),
+            this, SLOT(close()));
+#else
+    connect(m_tabWidget, SIGNAL(lastTabClosed()),
+            m_tabWidget, SLOT(newTab()));
+#endif
+
+    slotUpdateWindowTitle();
+    loadDefaultState();
+    m_tabWidget->newTab();
+
+    int size = m_tabWidget->lineEditStack()->sizeHint().height();
+    m_navigationBar->setIconSize(QSize(size, size));
+
+}
+
+BrowserMainWindow::~BrowserMainWindow()
+{
+    m_autoSaver->changeOccurred();
+    m_autoSaver->saveIfNeccessary();
+}
+
+void BrowserMainWindow::loadDefaultState()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("BrowserMainWindow"));
+    QByteArray data = settings.value(QLatin1String("defaultState")).toByteArray();
+    restoreState(data);
+    settings.endGroup();
+}
+
+QSize BrowserMainWindow::sizeHint() const
+{
+    QRect desktopRect = QApplication::desktop()->screenGeometry();
+    QSize size = desktopRect.size() * qreal(0.9);
+    return size;
+}
+
+void BrowserMainWindow::save()
+{
+    BrowserApplication::instance()->saveSession();
+
+    QSettings settings;
+    settings.beginGroup(QLatin1String("BrowserMainWindow"));
+    QByteArray data = saveState(false);
+    settings.setValue(QLatin1String("defaultState"), data);
+    settings.endGroup();
+}
+
+static const qint32 BrowserMainWindowMagic = 0xba;
+
+QByteArray BrowserMainWindow::saveState(bool withTabs) const
+{
+    int version = 2;
+    QByteArray data;
+    QDataStream stream(&data, QIODevice::WriteOnly);
+
+    stream << qint32(BrowserMainWindowMagic);
+    stream << qint32(version);
+
+    stream << size();
+    stream << !m_navigationBar->isHidden();
+    stream << !m_bookmarksToolbar->isHidden();
+    stream << !statusBar()->isHidden();
+    if (withTabs)
+        stream << tabWidget()->saveState();
+    else
+        stream << QByteArray();
+    return data;
+}
+
+bool BrowserMainWindow::restoreState(const QByteArray &state)
+{
+    int version = 2;
+    QByteArray sd = state;
+    QDataStream stream(&sd, QIODevice::ReadOnly);
+    if (stream.atEnd())
+        return false;
+
+    qint32 marker;
+    qint32 v;
+    stream >> marker;
+    stream >> v;
+    if (marker != BrowserMainWindowMagic || v != version)
+        return false;
+
+    QSize size;
+    bool showToolbar;
+    bool showBookmarksBar;
+    bool showStatusbar;
+    QByteArray tabState;
+
+    stream >> size;
+    stream >> showToolbar;
+    stream >> showBookmarksBar;
+    stream >> showStatusbar;
+    stream >> tabState;
+
+    resize(size);
+
+    m_navigationBar->setVisible(showToolbar);
+    updateToolbarActionText(showToolbar);
+
+    m_bookmarksToolbar->setVisible(showBookmarksBar);
+    updateBookmarksToolbarActionText(showBookmarksBar);
+
+    statusBar()->setVisible(showStatusbar);
+    updateStatusbarActionText(showStatusbar);
+
+    if (!tabWidget()->restoreState(tabState))
+        return false;
+
+    return true;
+}
+
+void BrowserMainWindow::setupMenu()
+{
+    new QShortcut(QKeySequence(Qt::Key_F6), this, SLOT(slotSwapFocus()));
+
+    // File
+    QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
+
+    fileMenu->addAction(tr("&New Window"), this, SLOT(slotFileNew()), QKeySequence::New);
+    fileMenu->addAction(m_tabWidget->newTabAction());
+    fileMenu->addAction(tr("&Open File..."), this, SLOT(slotFileOpen()), QKeySequence::Open);
+    fileMenu->addAction(tr("Open &Location..."), this,
+                SLOT(slotSelectLineEdit()), QKeySequence(Qt::ControlModifier + Qt::Key_L));
+    fileMenu->addSeparator();
+    fileMenu->addAction(m_tabWidget->closeTabAction());
+    fileMenu->addSeparator();
+    fileMenu->addAction(tr("&Save As..."), this,
+                SLOT(slotFileSaveAs()), QKeySequence(QKeySequence::Save));
+    fileMenu->addSeparator();
+    BookmarksManager *bookmarksManager = BrowserApplication::bookmarksManager();
+    fileMenu->addAction(tr("&Import Bookmarks..."), bookmarksManager, SLOT(importBookmarks()));
+    fileMenu->addAction(tr("&Export Bookmarks..."), bookmarksManager, SLOT(exportBookmarks()));
+    fileMenu->addSeparator();
+    fileMenu->addAction(tr("P&rint Preview..."), this, SLOT(slotFilePrintPreview()));
+    fileMenu->addAction(tr("&Print..."), this, SLOT(slotFilePrint()), QKeySequence::Print);
+    fileMenu->addSeparator();
+    QAction *action = fileMenu->addAction(tr("Private &Browsing..."), this, SLOT(slotPrivateBrowsing()));
+    action->setCheckable(true);
+    fileMenu->addSeparator();
+
+#if defined(Q_WS_MAC)
+    fileMenu->addAction(tr("&Quit"), BrowserApplication::instance(), SLOT(quitBrowser()), QKeySequence(Qt::CTRL | Qt::Key_Q));
+#else
+    fileMenu->addAction(tr("&Quit"), this, SLOT(close()), QKeySequence(Qt::CTRL | Qt::Key_Q));
+#endif
+
+    // Edit
+    QMenu *editMenu = menuBar()->addMenu(tr("&Edit"));
+    QAction *m_undo = editMenu->addAction(tr("&Undo"));
+    m_undo->setShortcuts(QKeySequence::Undo);
+    m_tabWidget->addWebAction(m_undo, QWebPage::Undo);
+    QAction *m_redo = editMenu->addAction(tr("&Redo"));
+    m_redo->setShortcuts(QKeySequence::Redo);
+    m_tabWidget->addWebAction(m_redo, QWebPage::Redo);
+    editMenu->addSeparator();
+    QAction *m_cut = editMenu->addAction(tr("Cu&t"));
+    m_cut->setShortcuts(QKeySequence::Cut);
+    m_tabWidget->addWebAction(m_cut, QWebPage::Cut);
+    QAction *m_copy = editMenu->addAction(tr("&Copy"));
+    m_copy->setShortcuts(QKeySequence::Copy);
+    m_tabWidget->addWebAction(m_copy, QWebPage::Copy);
+    QAction *m_paste = editMenu->addAction(tr("&Paste"));
+    m_paste->setShortcuts(QKeySequence::Paste);
+    m_tabWidget->addWebAction(m_paste, QWebPage::Paste);
+    editMenu->addSeparator();
+
+    QAction *m_find = editMenu->addAction(tr("&Find"));
+    m_find->setShortcuts(QKeySequence::Find);
+    connect(m_find, SIGNAL(triggered()), this, SLOT(slotEditFind()));
+    new QShortcut(QKeySequence(Qt::Key_Slash), this, SLOT(slotEditFind()));
+
+    QAction *m_findNext = editMenu->addAction(tr("&Find Next"));
+    m_findNext->setShortcuts(QKeySequence::FindNext);
+    connect(m_findNext, SIGNAL(triggered()), this, SLOT(slotEditFindNext()));
+
+    QAction *m_findPrevious = editMenu->addAction(tr("&Find Previous"));
+    m_findPrevious->setShortcuts(QKeySequence::FindPrevious);
+    connect(m_findPrevious, SIGNAL(triggered()), this, SLOT(slotEditFindPrevious()));
+
+    editMenu->addSeparator();
+    editMenu->addAction(tr("&Preferences"), this, SLOT(slotPreferences()), tr("Ctrl+,"));
+
+    // View
+    QMenu *viewMenu = menuBar()->addMenu(tr("&View"));
+
+    m_viewBookmarkBar = new QAction(this);
+    updateBookmarksToolbarActionText(true);
+    m_viewBookmarkBar->setShortcut(tr("Shift+Ctrl+B"));
+    connect(m_viewBookmarkBar, SIGNAL(triggered()), this, SLOT(slotViewBookmarksBar()));
+    viewMenu->addAction(m_viewBookmarkBar);
+
+    m_viewToolbar = new QAction(this);
+    updateToolbarActionText(true);
+    m_viewToolbar->setShortcut(tr("Ctrl+|"));
+    connect(m_viewToolbar, SIGNAL(triggered()), this, SLOT(slotViewToolbar()));
+    viewMenu->addAction(m_viewToolbar);
+
+    m_viewStatusbar = new QAction(this);
+    updateStatusbarActionText(true);
+    m_viewStatusbar->setShortcut(tr("Ctrl+/"));
+    connect(m_viewStatusbar, SIGNAL(triggered()), this, SLOT(slotViewStatusbar()));
+    viewMenu->addAction(m_viewStatusbar);
+
+    viewMenu->addSeparator();
+
+    m_stop = viewMenu->addAction(tr("&Stop"));
+    QList<QKeySequence> shortcuts;
+    shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_Period));
+    shortcuts.append(Qt::Key_Escape);
+    m_stop->setShortcuts(shortcuts);
+    m_tabWidget->addWebAction(m_stop, QWebPage::Stop);
+
+    m_reload = viewMenu->addAction(tr("Reload Page"));
+    m_reload->setShortcuts(QKeySequence::Refresh);
+    m_tabWidget->addWebAction(m_reload, QWebPage::Reload);
+
+    viewMenu->addAction(tr("Zoom &In"), this, SLOT(slotViewZoomIn()), QKeySequence(Qt::CTRL | Qt::Key_Plus));
+    viewMenu->addAction(tr("Zoom &Out"), this, SLOT(slotViewZoomOut()), QKeySequence(Qt::CTRL | Qt::Key_Minus));
+    viewMenu->addAction(tr("Reset &Zoom"), this, SLOT(slotViewResetZoom()), QKeySequence(Qt::CTRL | Qt::Key_0));
+    QAction *zoomTextOnlyAction = viewMenu->addAction(tr("Zoom &Text Only"));
+    connect(zoomTextOnlyAction, SIGNAL(toggled(bool)), this, SLOT(slotViewZoomTextOnly(bool)));
+    zoomTextOnlyAction->setCheckable(true);
+    zoomTextOnlyAction->setChecked(false);
+
+    viewMenu->addSeparator();
+    viewMenu->addAction(tr("Page S&ource"), this, SLOT(slotViewPageSource()), tr("Ctrl+Alt+U"));
+    QAction *a = viewMenu->addAction(tr("&Full Screen"), this, SLOT(slotViewFullScreen(bool)),  Qt::Key_F11);
+    a->setCheckable(true);
+
+    // History
+    HistoryMenu *historyMenu = new HistoryMenu(this);
+    connect(historyMenu, SIGNAL(openUrl(const QUrl&)),
+            m_tabWidget, SLOT(loadUrlInCurrentTab(const QUrl&)));
+    connect(historyMenu, SIGNAL(hovered(const QString&)), this,
+            SLOT(slotUpdateStatusbar(const QString&)));
+    historyMenu->setTitle(tr("Hi&story"));
+    menuBar()->addMenu(historyMenu);
+    QList<QAction*> historyActions;
+
+    m_historyBack = new QAction(tr("Back"), this);
+    m_tabWidget->addWebAction(m_historyBack, QWebPage::Back);
+    m_historyBack->setShortcuts(QKeySequence::Back);
+    m_historyBack->setIconVisibleInMenu(false);
+
+    m_historyForward = new QAction(tr("Forward"), this);
+    m_tabWidget->addWebAction(m_historyForward, QWebPage::Forward);
+    m_historyForward->setShortcuts(QKeySequence::Forward);
+    m_historyForward->setIconVisibleInMenu(false);
+
+    QAction *m_historyHome = new QAction(tr("Home"), this);
+    connect(m_historyHome, SIGNAL(triggered()), this, SLOT(slotHome()));
+    m_historyHome->setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_H));
+
+    m_restoreLastSession = new QAction(tr("Restore Last Session"), this);
+    connect(m_restoreLastSession, SIGNAL(triggered()), BrowserApplication::instance(), SLOT(restoreLastSession()));
+    m_restoreLastSession->setEnabled(BrowserApplication::instance()->canRestoreSession());
+
+    historyActions.append(m_historyBack);
+    historyActions.append(m_historyForward);
+    historyActions.append(m_historyHome);
+    historyActions.append(m_tabWidget->recentlyClosedTabsAction());
+    historyActions.append(m_restoreLastSession);
+    historyMenu->setInitialActions(historyActions);
+
+    // Bookmarks
+    BookmarksMenu *bookmarksMenu = new BookmarksMenu(this);
+    connect(bookmarksMenu, SIGNAL(openUrl(const QUrl&)),
+            m_tabWidget, SLOT(loadUrlInCurrentTab(const QUrl&)));
+    connect(bookmarksMenu, SIGNAL(hovered(const QString&)),
+            this, SLOT(slotUpdateStatusbar(const QString&)));
+    bookmarksMenu->setTitle(tr("&Bookmarks"));
+    menuBar()->addMenu(bookmarksMenu);
+
+    QList<QAction*> bookmarksActions;
+
+    QAction *showAllBookmarksAction = new QAction(tr("Show All Bookmarks"), this);
+    connect(showAllBookmarksAction, SIGNAL(triggered()), this, SLOT(slotShowBookmarksDialog()));
+    m_addBookmark = new QAction(QIcon(QLatin1String(":addbookmark.png")), tr("Add Bookmark..."), this);
+    m_addBookmark->setIconVisibleInMenu(false);
+
+    connect(m_addBookmark, SIGNAL(triggered()), this, SLOT(slotAddBookmark()));
+    m_addBookmark->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_D));
+
+    bookmarksActions.append(showAllBookmarksAction);
+    bookmarksActions.append(m_addBookmark);
+    bookmarksMenu->setInitialActions(bookmarksActions);
+
+    // Window
+    m_windowMenu = menuBar()->addMenu(tr("&Window"));
+    connect(m_windowMenu, SIGNAL(aboutToShow()),
+            this, SLOT(slotAboutToShowWindowMenu()));
+    slotAboutToShowWindowMenu();
+
+    QMenu *toolsMenu = menuBar()->addMenu(tr("&Tools"));
+    toolsMenu->addAction(tr("Web &Search"), this, SLOT(slotWebSearch()), QKeySequence(tr("Ctrl+K", "Web Search")));
+#ifndef Q_CC_MINGW
+    a = toolsMenu->addAction(tr("Enable Web &Inspector"), this, SLOT(slotToggleInspector(bool)));
+    a->setCheckable(true);
+#endif
+
+    QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
+    helpMenu->addAction(tr("About &Qt"), qApp, SLOT(aboutQt()));
+    helpMenu->addAction(tr("About &Demo Browser"), this, SLOT(slotAboutApplication()));
+}
+
+void BrowserMainWindow::setupToolBar()
+{
+    setUnifiedTitleAndToolBarOnMac(true);
+    m_navigationBar = addToolBar(tr("Navigation"));
+    connect(m_navigationBar->toggleViewAction(), SIGNAL(toggled(bool)),
+            this, SLOT(updateToolbarActionText(bool)));
+
+    m_historyBack->setIcon(style()->standardIcon(QStyle::SP_ArrowBack, 0, this));
+    m_historyBackMenu = new QMenu(this);
+    m_historyBack->setMenu(m_historyBackMenu);
+    connect(m_historyBackMenu, SIGNAL(aboutToShow()),
+            this, SLOT(slotAboutToShowBackMenu()));
+    connect(m_historyBackMenu, SIGNAL(triggered(QAction *)),
+            this, SLOT(slotOpenActionUrl(QAction *)));
+    m_navigationBar->addAction(m_historyBack);
+
+    m_historyForward->setIcon(style()->standardIcon(QStyle::SP_ArrowForward, 0, this));
+    m_historyForwardMenu = new QMenu(this);
+    connect(m_historyForwardMenu, SIGNAL(aboutToShow()),
+            this, SLOT(slotAboutToShowForwardMenu()));
+    connect(m_historyForwardMenu, SIGNAL(triggered(QAction *)),
+            this, SLOT(slotOpenActionUrl(QAction *)));
+    m_historyForward->setMenu(m_historyForwardMenu);
+    m_navigationBar->addAction(m_historyForward);
+
+    m_stopReload = new QAction(this);
+    m_reloadIcon = style()->standardIcon(QStyle::SP_BrowserReload);
+    m_stopReload->setIcon(m_reloadIcon);
+
+    m_navigationBar->addAction(m_stopReload);
+
+    m_navigationBar->addWidget(m_tabWidget->lineEditStack());
+
+    m_toolbarSearch = new ToolbarSearch(m_navigationBar);
+    m_navigationBar->addWidget(m_toolbarSearch);
+    connect(m_toolbarSearch, SIGNAL(search(const QUrl&)), SLOT(loadUrl(const QUrl&)));
+
+    m_chaseWidget = new ChaseWidget(this);
+    m_navigationBar->addWidget(m_chaseWidget);
+}
+
+void BrowserMainWindow::slotShowBookmarksDialog()
+{
+    BookmarksDialog *dialog = new BookmarksDialog(this);
+    connect(dialog, SIGNAL(openUrl(const QUrl&)),
+            m_tabWidget, SLOT(loadUrlInCurrentTab(const QUrl&)));
+    dialog->show();
+}
+
+void BrowserMainWindow::slotAddBookmark()
+{
+    WebView *webView = currentTab();
+    QString url = webView->url().toString();
+    QString title = webView->title();
+    AddBookmarkDialog dialog(url, title);
+    dialog.exec();
+}
+
+void BrowserMainWindow::slotViewToolbar()
+{
+    if (m_navigationBar->isVisible()) {
+        updateToolbarActionText(false);
+        m_navigationBar->close();
+    } else {
+        updateToolbarActionText(true);
+        m_navigationBar->show();
+    }
+    m_autoSaver->changeOccurred();
+}
+
+void BrowserMainWindow::slotViewBookmarksBar()
+{
+    if (m_bookmarksToolbar->isVisible()) {
+        updateBookmarksToolbarActionText(false);
+        m_bookmarksToolbar->close();
+    } else {
+        updateBookmarksToolbarActionText(true);
+        m_bookmarksToolbar->show();
+    }
+    m_autoSaver->changeOccurred();
+}
+
+void BrowserMainWindow::updateStatusbarActionText(bool visible)
+{
+    m_viewStatusbar->setText(!visible ? tr("Show Status Bar") : tr("Hide Status Bar"));
+}
+
+void BrowserMainWindow::updateToolbarActionText(bool visible)
+{
+    m_viewToolbar->setText(!visible ? tr("Show Toolbar") : tr("Hide Toolbar"));
+}
+
+void BrowserMainWindow::updateBookmarksToolbarActionText(bool visible)
+{
+    m_viewBookmarkBar->setText(!visible ? tr("Show Bookmarks bar") : tr("Hide Bookmarks bar"));
+}
+
+void BrowserMainWindow::slotViewStatusbar()
+{
+    if (statusBar()->isVisible()) {
+        updateStatusbarActionText(false);
+        statusBar()->close();
+    } else {
+        updateStatusbarActionText(true);
+        statusBar()->show();
+    }
+    m_autoSaver->changeOccurred();
+}
+
+QUrl BrowserMainWindow::guessUrlFromString(const QString &string)
+{
+    QString urlStr = string.trimmed();
+    QRegExp test(QLatin1String("^[a-zA-Z]+\\:.*"));
+
+    // Check if it looks like a qualified URL. Try parsing it and see.
+    bool hasSchema = test.exactMatch(urlStr);
+    if (hasSchema) {
+        QUrl url = QUrl::fromEncoded(urlStr.toUtf8(), QUrl::TolerantMode);
+        if (url.isValid())
+            return url;
+    }
+
+    // Might be a file.
+    if (QFile::exists(urlStr)) {
+        QFileInfo info(urlStr);
+        return QUrl::fromLocalFile(info.absoluteFilePath());
+    }
+
+    // Might be a shorturl - try to detect the schema.
+    if (!hasSchema) {
+        int dotIndex = urlStr.indexOf(QLatin1Char('.'));
+        if (dotIndex != -1) {
+            QString prefix = urlStr.left(dotIndex).toLower();
+            QByteArray schema = (prefix == QLatin1String("ftp")) ? prefix.toLatin1() : "http";
+            QUrl url =
+                QUrl::fromEncoded(schema + "://" + urlStr.toUtf8(), QUrl::TolerantMode);
+            if (url.isValid())
+                return url;
+        }
+    }
+
+    // Fall back to QUrl's own tolerant parser.
+    QUrl url = QUrl::fromEncoded(string.toUtf8(), QUrl::TolerantMode);
+
+    // finally for cases where the user just types in a hostname add http
+    if (url.scheme().isEmpty())
+        url = QUrl::fromEncoded("http://" + string.toUtf8(), QUrl::TolerantMode);
+    return url;
+}
+
+void BrowserMainWindow::loadUrl(const QUrl &url)
+{
+    if (!currentTab() || !url.isValid())
+        return;
+
+    m_tabWidget->currentLineEdit()->setText(QString::fromUtf8(url.toEncoded()));
+    m_tabWidget->loadUrlInCurrentTab(url);
+}
+
+void BrowserMainWindow::slotDownloadManager()
+{
+    BrowserApplication::downloadManager()->show();
+}
+
+void BrowserMainWindow::slotSelectLineEdit()
+{
+    m_tabWidget->currentLineEdit()->selectAll();
+    m_tabWidget->currentLineEdit()->setFocus();
+}
+
+void BrowserMainWindow::slotFileSaveAs()
+{
+    BrowserApplication::downloadManager()->download(currentTab()->url(), true);
+}
+
+void BrowserMainWindow::slotPreferences()
+{
+    SettingsDialog *s = new SettingsDialog(this);
+    s->show();
+}
+
+void BrowserMainWindow::slotUpdateStatusbar(const QString &string)
+{
+    statusBar()->showMessage(string, 2000);
+}
+
+void BrowserMainWindow::slotUpdateWindowTitle(const QString &title)
+{
+    if (title.isEmpty()) {
+        setWindowTitle(tr("Qt Demo Browser"));
+    } else {
+#if defined(Q_WS_MAC)
+        setWindowTitle(title);
+#else
+        setWindowTitle(tr("%1 - Qt Demo Browser", "Page title and Browser name").arg(title));
+#endif
+    }
+}
+
+void BrowserMainWindow::slotAboutApplication()
+{
+    QMessageBox::about(this, tr("About"), tr(
+        "Version %1"
+        "<p>This demo demonstrates Qt's "
+        "webkit facilities in action, providing an example "
+        "browser for you to experiment with.<p>"
+        "<p>QtWebKit is based on the Open Source WebKit Project developed at <a href=\"http://webkit.org/\">http://webkit.org/</a>."
+        ).arg(QCoreApplication::applicationVersion()));
+}
+
+void BrowserMainWindow::slotFileNew()
+{
+    BrowserApplication::instance()->newMainWindow();
+    BrowserMainWindow *mw = BrowserApplication::instance()->mainWindow();
+    mw->slotHome();
+}
+
+void BrowserMainWindow::slotFileOpen()
+{
+    QString file = QFileDialog::getOpenFileName(this, tr("Open Web Resource"), QString(),
+            tr("Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)"));
+
+    if (file.isEmpty())
+        return;
+
+    loadPage(file);
+}
+
+void BrowserMainWindow::slotFilePrintPreview()
+{
+#ifndef QT_NO_PRINTER
+    if (!currentTab())
+        return;
+    QPrintPreviewDialog *dialog = new QPrintPreviewDialog(this);
+    connect(dialog, SIGNAL(paintRequested(QPrinter *)),
+            currentTab(), SLOT(print(QPrinter *)));
+    dialog->exec();
+#endif
+}
+
+void BrowserMainWindow::slotFilePrint()
+{
+    if (!currentTab())
+        return;
+    printRequested(currentTab()->page()->mainFrame());
+}
+
+void BrowserMainWindow::printRequested(QWebFrame *frame)
+{
+#ifndef QT_NO_PRINTER
+    QPrinter printer;
+    QPrintDialog *dialog = new QPrintDialog(&printer, this);
+    dialog->setWindowTitle(tr("Print Document"));
+    if (dialog->exec() != QDialog::Accepted)
+        return;
+    frame->print(&printer);
+#endif
+}
+
+void BrowserMainWindow::slotPrivateBrowsing()
+{
+    QWebSettings *settings = QWebSettings::globalSettings();
+    bool pb = settings->testAttribute(QWebSettings::PrivateBrowsingEnabled);
+    if (!pb) {
+        QString title = tr("Are you sure you want to turn on private browsing?");
+        QString text = tr("<b>%1</b><br><br>When private browsing in turned on,"
+            " webpages are not added to the history,"
+            " items are automatically removed from the Downloads window," \
+            " new cookies are not stored, current cookies can't be accessed," \
+            " site icons wont be stored, session wont be saved, " \
+            " and searches are not addded to the pop-up menu in the Google search box." \
+            "  Until you close the window, you can still click the Back and Forward buttons" \
+            " to return to the webpages you have opened.").arg(title);
+
+        QMessageBox::StandardButton button = QMessageBox::question(this, QString(), text,
+                               QMessageBox::Ok | QMessageBox::Cancel,
+                               QMessageBox::Ok);
+        if (button == QMessageBox::Ok) {
+            settings->setAttribute(QWebSettings::PrivateBrowsingEnabled, true);
+        }
+    } else {
+        settings->setAttribute(QWebSettings::PrivateBrowsingEnabled, false);
+
+        QList<BrowserMainWindow*> windows = BrowserApplication::instance()->mainWindows();
+        for (int i = 0; i < windows.count(); ++i) {
+            BrowserMainWindow *window = windows.at(i);
+            window->m_lastSearch = QString::null;
+            window->tabWidget()->clear();
+        }
+    }
+}
+
+void BrowserMainWindow::closeEvent(QCloseEvent *event)
+{
+    if (m_tabWidget->count() > 1) {
+        int ret = QMessageBox::warning(this, QString(),
+                           tr("Are you sure you want to close the window?"
+                              "  There are %1 tab open").arg(m_tabWidget->count()),
+                           QMessageBox::Yes | QMessageBox::No,
+                           QMessageBox::No);
+        if (ret == QMessageBox::No) {
+            event->ignore();
+            return;
+        }
+    }
+    event->accept();
+    deleteLater();
+}
+
+void BrowserMainWindow::slotEditFind()
+{
+    if (!currentTab())
+        return;
+    bool ok;
+    QString search = QInputDialog::getText(this, tr("Find"),
+                                          tr("Text:"), QLineEdit::Normal,
+                                          m_lastSearch, &ok);
+    if (ok && !search.isEmpty()) {
+        m_lastSearch = search;
+        if (!currentTab()->findText(m_lastSearch))
+            slotUpdateStatusbar(tr("\"%1\" not found.").arg(m_lastSearch));
+    }
+}
+
+void BrowserMainWindow::slotEditFindNext()
+{
+    if (!currentTab() && !m_lastSearch.isEmpty())
+        return;
+    currentTab()->findText(m_lastSearch);
+}
+
+void BrowserMainWindow::slotEditFindPrevious()
+{
+    if (!currentTab() && !m_lastSearch.isEmpty())
+        return;
+    currentTab()->findText(m_lastSearch, QWebPage::FindBackward);
+}
+
+void BrowserMainWindow::slotViewZoomIn()
+{
+    if (!currentTab())
+        return;
+    currentTab()->setZoomFactor(currentTab()->zoomFactor() + 0.1);
+}
+
+void BrowserMainWindow::slotViewZoomOut()
+{
+    if (!currentTab())
+        return;
+    currentTab()->setZoomFactor(currentTab()->zoomFactor() - 0.1);
+}
+
+void BrowserMainWindow::slotViewResetZoom()
+{
+    if (!currentTab())
+        return;
+    currentTab()->setZoomFactor(1.0);
+}
+
+void BrowserMainWindow::slotViewZoomTextOnly(bool enable)
+{
+    if (!currentTab())
+        return;
+    currentTab()->page()->settings()->setAttribute(QWebSettings::ZoomTextOnly, enable);
+}
+
+void BrowserMainWindow::slotViewFullScreen(bool makeFullScreen)
+{
+    if (makeFullScreen) {
+        showFullScreen();
+    } else {
+        if (isMinimized())
+            showMinimized();
+        else if (isMaximized())
+            showMaximized();
+        else showNormal();
+    }
+}
+
+void BrowserMainWindow::slotViewPageSource()
+{
+    if (!currentTab())
+        return;
+
+    QString markup = currentTab()->page()->mainFrame()->toHtml();
+    QPlainTextEdit *view = new QPlainTextEdit(markup);
+    view->setWindowTitle(tr("Page Source of %1").arg(currentTab()->title()));
+    view->setMinimumWidth(640);
+    view->setAttribute(Qt::WA_DeleteOnClose);
+    view->show();
+}
+
+void BrowserMainWindow::slotHome()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("MainWindow"));
+    QString home = settings.value(QLatin1String("home"), QLatin1String("http://qtsoftware.com/")).toString();
+    loadPage(home);
+}
+
+void BrowserMainWindow::slotWebSearch()
+{
+    m_toolbarSearch->lineEdit()->selectAll();
+    m_toolbarSearch->lineEdit()->setFocus();
+}
+
+void BrowserMainWindow::slotToggleInspector(bool enable)
+{
+    QWebSettings::globalSettings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, enable);
+    if (enable) {
+        int result = QMessageBox::question(this, tr("Web Inspector"),
+                                           tr("The web inspector will only work correctly for pages that were loaded after enabling.\n"
+                                           "Do you want to reload all pages?"),
+                                           QMessageBox::Yes | QMessageBox::No);
+        if (result == QMessageBox::Yes) {
+            m_tabWidget->reloadAllTabs();
+        }
+    }
+}
+
+void BrowserMainWindow::slotSwapFocus()
+{
+    if (currentTab()->hasFocus())
+        m_tabWidget->currentLineEdit()->setFocus();
+    else
+        currentTab()->setFocus();
+}
+
+void BrowserMainWindow::loadPage(const QString &page)
+{
+    QUrl url = guessUrlFromString(page);
+    loadUrl(url);
+}
+
+TabWidget *BrowserMainWindow::tabWidget() const
+{
+    return m_tabWidget;
+}
+
+WebView *BrowserMainWindow::currentTab() const
+{
+    return m_tabWidget->currentWebView();
+}
+
+void BrowserMainWindow::slotLoadProgress(int progress)
+{
+    if (progress < 100 && progress > 0) {
+        m_chaseWidget->setAnimated(true);
+        disconnect(m_stopReload, SIGNAL(triggered()), m_reload, SLOT(trigger()));
+        if (m_stopIcon.isNull())
+            m_stopIcon = style()->standardIcon(QStyle::SP_BrowserStop);
+        m_stopReload->setIcon(m_stopIcon);
+        connect(m_stopReload, SIGNAL(triggered()), m_stop, SLOT(trigger()));
+        m_stopReload->setToolTip(tr("Stop loading the current page"));
+    } else {
+        m_chaseWidget->setAnimated(false);
+        disconnect(m_stopReload, SIGNAL(triggered()), m_stop, SLOT(trigger()));
+        m_stopReload->setIcon(m_reloadIcon);
+        connect(m_stopReload, SIGNAL(triggered()), m_reload, SLOT(trigger()));
+        m_stopReload->setToolTip(tr("Reload the current page"));
+    }
+}
+
+void BrowserMainWindow::slotAboutToShowBackMenu()
+{
+    m_historyBackMenu->clear();
+    if (!currentTab())
+        return;
+    QWebHistory *history = currentTab()->history();
+    int historyCount = history->count();
+    for (int i = history->backItems(historyCount).count() - 1; i >= 0; --i) {
+        QWebHistoryItem item = history->backItems(history->count()).at(i);
+        QAction *action = new QAction(this);
+        action->setData(-1*(historyCount-i-1));
+        QIcon icon = BrowserApplication::instance()->icon(item.url());
+        action->setIcon(icon);
+        action->setText(item.title());
+        m_historyBackMenu->addAction(action);
+    }
+}
+
+void BrowserMainWindow::slotAboutToShowForwardMenu()
+{
+    m_historyForwardMenu->clear();
+    if (!currentTab())
+        return;
+    QWebHistory *history = currentTab()->history();
+    int historyCount = history->count();
+    for (int i = 0; i < history->forwardItems(history->count()).count(); ++i) {
+        QWebHistoryItem item = history->forwardItems(historyCount).at(i);
+        QAction *action = new QAction(this);
+        action->setData(historyCount-i);
+        QIcon icon = BrowserApplication::instance()->icon(item.url());
+        action->setIcon(icon);
+        action->setText(item.title());
+        m_historyForwardMenu->addAction(action);
+    }
+}
+
+void BrowserMainWindow::slotAboutToShowWindowMenu()
+{
+    m_windowMenu->clear();
+    m_windowMenu->addAction(m_tabWidget->nextTabAction());
+    m_windowMenu->addAction(m_tabWidget->previousTabAction());
+    m_windowMenu->addSeparator();
+    m_windowMenu->addAction(tr("Downloads"), this, SLOT(slotDownloadManager()), QKeySequence(tr("Alt+Ctrl+L", "Download Manager")));
+
+    m_windowMenu->addSeparator();
+    QList<BrowserMainWindow*> windows = BrowserApplication::instance()->mainWindows();
+    for (int i = 0; i < windows.count(); ++i) {
+        BrowserMainWindow *window = windows.at(i);
+        QAction *action = m_windowMenu->addAction(window->windowTitle(), this, SLOT(slotShowWindow()));
+        action->setData(i);
+        action->setCheckable(true);
+        if (window == this)
+            action->setChecked(true);
+    }
+}
+
+void BrowserMainWindow::slotShowWindow()
+{
+    if (QAction *action = qobject_cast<QAction*>(sender())) {
+        QVariant v = action->data();
+        if (v.canConvert<int>()) {
+            int offset = qvariant_cast<int>(v);
+            QList<BrowserMainWindow*> windows = BrowserApplication::instance()->mainWindows();
+            windows.at(offset)->activateWindow();
+            windows.at(offset)->currentTab()->setFocus();
+        }
+    }
+}
+
+void BrowserMainWindow::slotOpenActionUrl(QAction *action)
+{
+    int offset = action->data().toInt();
+    QWebHistory *history = currentTab()->history();
+    if (offset < 0)
+        history->goToItem(history->backItems(-1*offset).first()); // back
+    else if (offset > 0)
+        history->goToItem(history->forwardItems(history->count() - offset + 1).back()); // forward
+ }
+
+void BrowserMainWindow::geometryChangeRequested(const QRect &geometry)
+{
+    setGeometry(geometry);
+}
+
diff --git a/demos/browser/browsermainwindow.h b/demos/browser/browsermainwindow.h
new file mode 100644
index 0000000000..eaf976ca56
--- /dev/null
+++ b/demos/browser/browsermainwindow.h
@@ -0,0 +1,169 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BROWSERMAINWINDOW_H
+#define BROWSERMAINWINDOW_H
+
+#include <QtGui/QMainWindow>
+#include <QtGui/QIcon>
+#include <QtCore/QUrl>
+
+class AutoSaver;
+class BookmarksToolBar;
+class ChaseWidget;
+class QWebFrame;
+class TabWidget;
+class ToolbarSearch;
+class WebView;
+
+/*!
+    The MainWindow of the Browser Application.
+
+    Handles the tab widget and all the actions
+ */
+class BrowserMainWindow : public QMainWindow {
+    Q_OBJECT
+
+public:
+    BrowserMainWindow(QWidget *parent = 0, Qt::WindowFlags flags = 0);
+    ~BrowserMainWindow();
+    QSize sizeHint() const;
+
+public:
+    static QUrl guessUrlFromString(const QString &url);
+    TabWidget *tabWidget() const;
+    WebView *currentTab() const;
+    QByteArray saveState(bool withTabs = true) const;
+    bool restoreState(const QByteArray &state);
+
+public slots:
+    void loadPage(const QString &url);
+    void slotHome();
+
+protected:
+    void closeEvent(QCloseEvent *event);
+
+private slots:
+    void save();
+
+    void slotLoadProgress(int);
+    void slotUpdateStatusbar(const QString &string);
+    void slotUpdateWindowTitle(const QString &title = QString());
+
+    void loadUrl(const QUrl &url);
+    void slotPreferences();
+
+    void slotFileNew();
+    void slotFileOpen();
+    void slotFilePrintPreview();
+    void slotFilePrint();
+    void slotPrivateBrowsing();
+    void slotFileSaveAs();
+    void slotEditFind();
+    void slotEditFindNext();
+    void slotEditFindPrevious();
+    void slotShowBookmarksDialog();
+    void slotAddBookmark();
+    void slotViewZoomIn();
+    void slotViewZoomOut();
+    void slotViewResetZoom();
+    void slotViewZoomTextOnly(bool enable);
+    void slotViewToolbar();
+    void slotViewBookmarksBar();
+    void slotViewStatusbar();
+    void slotViewPageSource();
+    void slotViewFullScreen(bool enable);
+
+    void slotWebSearch();
+    void slotToggleInspector(bool enable);
+    void slotAboutApplication();
+    void slotDownloadManager();
+    void slotSelectLineEdit();
+
+    void slotAboutToShowBackMenu();
+    void slotAboutToShowForwardMenu();
+    void slotAboutToShowWindowMenu();
+    void slotOpenActionUrl(QAction *action);
+    void slotShowWindow();
+    void slotSwapFocus();
+
+    void printRequested(QWebFrame *frame);
+    void geometryChangeRequested(const QRect &geometry);
+    void updateToolbarActionText(bool visible);
+    void updateBookmarksToolbarActionText(bool visible);
+
+private:
+    void loadDefaultState();
+    void setupMenu();
+    void setupToolBar();
+    void updateStatusbarActionText(bool visible);
+
+private:
+    QToolBar *m_navigationBar;
+    ToolbarSearch *m_toolbarSearch;
+    BookmarksToolBar *m_bookmarksToolbar;
+    ChaseWidget *m_chaseWidget;
+    TabWidget *m_tabWidget;
+    AutoSaver *m_autoSaver;
+
+    QAction *m_historyBack;
+    QMenu *m_historyBackMenu;
+    QAction *m_historyForward;
+    QMenu *m_historyForwardMenu;
+    QMenu *m_windowMenu;
+
+    QAction *m_stop;
+    QAction *m_reload;
+    QAction *m_stopReload;
+    QAction *m_viewToolbar;
+    QAction *m_viewBookmarkBar;
+    QAction *m_viewStatusbar;
+    QAction *m_restoreLastSession;
+    QAction *m_addBookmark;
+
+    QIcon m_reloadIcon;
+    QIcon m_stopIcon;
+
+    QString m_lastSearch;
+};
+
+#endif // BROWSERMAINWINDOW_H
+
diff --git a/demos/browser/chasewidget.cpp b/demos/browser/chasewidget.cpp
new file mode 100644
index 0000000000..7ebe282a7f
--- /dev/null
+++ b/demos/browser/chasewidget.cpp
@@ -0,0 +1,142 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "chasewidget.h"
+
+#include <QtCore/QPoint>
+
+#include <QtGui/QApplication>
+#include <QtGui/QHideEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QShowEvent>
+
+ChaseWidget::ChaseWidget(QWidget *parent, QPixmap pixmap, bool pixmapEnabled)
+    : QWidget(parent)
+    , m_segment(0)
+    , m_delay(100)
+    , m_step(40)
+    , m_timerId(-1)
+    , m_animated(false)
+    , m_pixmap(pixmap)
+    , m_pixmapEnabled(pixmapEnabled)
+{
+}
+
+void ChaseWidget::setAnimated(bool value)
+{
+    if (m_animated == value)
+        return;
+    m_animated = value;
+    if (m_timerId != -1) {
+        killTimer(m_timerId);
+        m_timerId = -1;
+    }
+    if (m_animated) {
+        m_segment = 0;
+        m_timerId = startTimer(m_delay);
+    }
+    update();
+}
+
+void ChaseWidget::paintEvent(QPaintEvent *event)
+{
+    Q_UNUSED(event);
+    QPainter p(this);
+    if (m_pixmapEnabled && !m_pixmap.isNull()) {
+        p.drawPixmap(0, 0, m_pixmap);
+        return;
+    }
+
+    const int extent = qMin(width() - 8, height() - 8);
+    const int displ = extent / 4;
+    const int ext = extent / 4 - 1;
+
+    p.setRenderHint(QPainter::Antialiasing, true);
+
+    if(m_animated)
+        p.setPen(Qt::gray);
+    else
+        p.setPen(QPen(palette().dark().color()));
+
+    p.translate(width() / 2, height() / 2); // center
+
+    for (int segment = 0; segment < segmentCount(); ++segment) {
+        p.rotate(QApplication::isRightToLeft() ? m_step : -m_step);
+        if(m_animated)
+            p.setBrush(colorForSegment(segment));
+        else
+            p.setBrush(palette().background());
+        p.drawEllipse(QRect(displ, -ext / 2, ext, ext));
+    }
+}
+
+QSize ChaseWidget::sizeHint() const
+{
+    return QSize(32, 32);
+}
+
+void ChaseWidget::timerEvent(QTimerEvent *event)
+{
+    if (event->timerId() == m_timerId) {
+        ++m_segment;
+        update();
+    }
+    QWidget::timerEvent(event);
+}
+
+QColor ChaseWidget::colorForSegment(int seg) const
+{
+    int index = ((seg + m_segment) % segmentCount());
+    int comp = qMax(0, 255 - (index * (255 / segmentCount())));
+    return QColor(comp, comp, comp, 255);
+}
+
+int ChaseWidget::segmentCount() const
+{
+    return 360 / m_step;
+}
+
+void ChaseWidget::setPixmapEnabled(bool enable)
+{
+    m_pixmapEnabled = enable;
+}
+
diff --git a/demos/browser/chasewidget.h b/demos/browser/chasewidget.h
new file mode 100644
index 0000000000..78968ba4d8
--- /dev/null
+++ b/demos/browser/chasewidget.h
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CHASEWIDGET_H
+#define CHASEWIDGET_H
+
+#include <QtGui/QWidget>
+
+#include <QtCore/QSize>
+#include <QtGui/QColor>
+#include <QtGui/QPixmap>
+
+QT_BEGIN_NAMESPACE
+class QHideEvent;
+class QShowEvent;
+class QPaintEvent;
+class QTimerEvent;
+QT_END_NAMESPACE
+
+class ChaseWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    ChaseWidget(QWidget *parent = 0, QPixmap pixmap = QPixmap(), bool pixmapEnabled = false);
+
+    void setAnimated(bool value);
+    void setPixmapEnabled(bool enable);
+    QSize sizeHint() const;
+
+protected:
+    void paintEvent(QPaintEvent *event);
+    void timerEvent(QTimerEvent *event);
+
+private:
+    int segmentCount() const;
+    QColor colorForSegment(int segment) const;
+
+    int m_segment;
+    int m_delay;
+    int m_step;
+    int m_timerId;
+    bool m_animated;
+    QPixmap m_pixmap;
+    bool m_pixmapEnabled;
+};
+
+#endif
diff --git a/demos/browser/cookiejar.cpp b/demos/browser/cookiejar.cpp
new file mode 100644
index 0000000000..9e11c8e3ed
--- /dev/null
+++ b/demos/browser/cookiejar.cpp
@@ -0,0 +1,733 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "cookiejar.h"
+
+#include "autosaver.h"
+
+#include <QtCore/QDateTime>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QMetaEnum>
+#include <QtCore/QSettings>
+#include <QtCore/QUrl>
+
+#include <QtGui/QCompleter>
+#include <QtGui/QDesktopServices>
+#include <QtGui/QFont>
+#include <QtGui/QFontMetrics>
+#include <QtGui/QHeaderView>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QSortFilterProxyModel>
+
+#include <QtWebKit/QWebSettings>
+
+#include <QtCore/QDebug>
+
+static const unsigned int JAR_VERSION = 23;
+
+QT_BEGIN_NAMESPACE
+QDataStream &operator<<(QDataStream &stream, const QList<QNetworkCookie> &list)
+{
+    stream << JAR_VERSION;
+    stream << quint32(list.size());
+    for (int i = 0; i < list.size(); ++i)
+        stream << list.at(i).toRawForm();
+    return stream;
+}
+
+QDataStream &operator>>(QDataStream &stream, QList<QNetworkCookie> &list)
+{
+    list.clear();
+
+    quint32 version;
+    stream >> version;
+
+    if (version != JAR_VERSION)
+        return stream;
+
+    quint32 count;
+    stream >> count;
+    for(quint32 i = 0; i < count; ++i)
+    {
+        QByteArray value;
+        stream >> value;
+        QList<QNetworkCookie> newCookies = QNetworkCookie::parseCookies(value);
+        if (newCookies.count() == 0 && value.length() != 0) {
+            qWarning() << "CookieJar: Unable to parse saved cookie:" << value;
+        }
+        for (int j = 0; j < newCookies.count(); ++j)
+            list.append(newCookies.at(j));
+        if (stream.atEnd())
+            break;
+    }
+    return stream;
+}
+QT_END_NAMESPACE
+
+CookieJar::CookieJar(QObject *parent)
+    : QNetworkCookieJar(parent)
+    , m_loaded(false)
+    , m_saveTimer(new AutoSaver(this))
+    , m_acceptCookies(AcceptOnlyFromSitesNavigatedTo)
+{
+}
+
+CookieJar::~CookieJar()
+{
+    if (m_keepCookies == KeepUntilExit)
+        clear();
+    m_saveTimer->saveIfNeccessary();
+}
+
+void CookieJar::clear()
+{
+    setAllCookies(QList<QNetworkCookie>());
+    m_saveTimer->changeOccurred();
+    emit cookiesChanged();
+}
+
+void CookieJar::load()
+{
+    if (m_loaded)
+        return;
+    // load cookies and exceptions
+    qRegisterMetaTypeStreamOperators<QList<QNetworkCookie> >("QList<QNetworkCookie>");
+    QSettings cookieSettings(QDesktopServices::storageLocation(QDesktopServices::DataLocation) + QLatin1String("/cookies.ini"), QSettings::IniFormat);
+    setAllCookies(qvariant_cast<QList<QNetworkCookie> >(cookieSettings.value(QLatin1String("cookies"))));
+    cookieSettings.beginGroup(QLatin1String("Exceptions"));
+    m_exceptions_block = cookieSettings.value(QLatin1String("block")).toStringList();
+    m_exceptions_allow = cookieSettings.value(QLatin1String("allow")).toStringList();
+    m_exceptions_allowForSession = cookieSettings.value(QLatin1String("allowForSession")).toStringList();
+    qSort(m_exceptions_block.begin(), m_exceptions_block.end());
+    qSort(m_exceptions_allow.begin(), m_exceptions_allow.end());
+    qSort(m_exceptions_allowForSession.begin(), m_exceptions_allowForSession.end());
+
+    loadSettings();
+}
+
+void CookieJar::loadSettings()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("cookies"));
+    QByteArray value = settings.value(QLatin1String("acceptCookies"),
+                        QLatin1String("AcceptOnlyFromSitesNavigatedTo")).toByteArray();
+    QMetaEnum acceptPolicyEnum = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("AcceptPolicy"));
+    m_acceptCookies = acceptPolicyEnum.keyToValue(value) == -1 ?
+                        AcceptOnlyFromSitesNavigatedTo :
+                        static_cast<AcceptPolicy>(acceptPolicyEnum.keyToValue(value));
+
+    value = settings.value(QLatin1String("keepCookiesUntil"), QLatin1String("KeepUntilExpire")).toByteArray();
+    QMetaEnum keepPolicyEnum = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("KeepPolicy"));
+    m_keepCookies = keepPolicyEnum.keyToValue(value) == -1 ?
+                        KeepUntilExpire :
+                        static_cast<KeepPolicy>(keepPolicyEnum.keyToValue(value));
+
+    if (m_keepCookies == KeepUntilExit)
+        setAllCookies(QList<QNetworkCookie>());
+
+    m_loaded = true;
+    emit cookiesChanged();
+}
+
+void CookieJar::save()
+{
+    if (!m_loaded)
+        return;
+    purgeOldCookies();
+    QString directory = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+    if (directory.isEmpty())
+        directory = QDir::homePath() + QLatin1String("/.") + QCoreApplication::applicationName();
+    if (!QFile::exists(directory)) {
+        QDir dir;
+        dir.mkpath(directory);
+    }
+    QSettings cookieSettings(directory + QLatin1String("/cookies.ini"), QSettings::IniFormat);
+    QList<QNetworkCookie> cookies = allCookies();
+    for (int i = cookies.count() - 1; i >= 0; --i) {
+        if (cookies.at(i).isSessionCookie())
+            cookies.removeAt(i);
+    }
+    cookieSettings.setValue(QLatin1String("cookies"), qVariantFromValue<QList<QNetworkCookie> >(cookies));
+    cookieSettings.beginGroup(QLatin1String("Exceptions"));
+    cookieSettings.setValue(QLatin1String("block"), m_exceptions_block);
+    cookieSettings.setValue(QLatin1String("allow"), m_exceptions_allow);
+    cookieSettings.setValue(QLatin1String("allowForSession"), m_exceptions_allowForSession);
+
+    // save cookie settings
+    QSettings settings;
+    settings.beginGroup(QLatin1String("cookies"));
+    QMetaEnum acceptPolicyEnum = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("AcceptPolicy"));
+    settings.setValue(QLatin1String("acceptCookies"), QLatin1String(acceptPolicyEnum.valueToKey(m_acceptCookies)));
+
+    QMetaEnum keepPolicyEnum = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("KeepPolicy"));
+    settings.setValue(QLatin1String("keepCookiesUntil"), QLatin1String(keepPolicyEnum.valueToKey(m_keepCookies)));
+}
+
+void CookieJar::purgeOldCookies()
+{
+    QList<QNetworkCookie> cookies = allCookies();
+    if (cookies.isEmpty())
+        return;
+    int oldCount = cookies.count();
+    QDateTime now = QDateTime::currentDateTime();
+    for (int i = cookies.count() - 1; i >= 0; --i) {
+        if (!cookies.at(i).isSessionCookie() && cookies.at(i).expirationDate() < now)
+            cookies.removeAt(i);
+    }
+    if (oldCount == cookies.count())
+        return;
+    setAllCookies(cookies);
+    emit cookiesChanged();
+}
+
+QList<QNetworkCookie> CookieJar::cookiesForUrl(const QUrl &url) const
+{
+    CookieJar *that = const_cast<CookieJar*>(this);
+    if (!m_loaded)
+        that->load();
+
+    QWebSettings *globalSettings = QWebSettings::globalSettings();
+    if (globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled)) {
+        QList<QNetworkCookie> noCookies;
+        return noCookies;
+    }
+
+    return QNetworkCookieJar::cookiesForUrl(url);
+}
+
+bool CookieJar::setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url)
+{
+    if (!m_loaded)
+        load();
+
+    QWebSettings *globalSettings = QWebSettings::globalSettings();
+    if (globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
+        return false;
+
+    QString host = url.host();
+    bool eBlock = qBinaryFind(m_exceptions_block.begin(), m_exceptions_block.end(), host) != m_exceptions_block.end();
+    bool eAllow = qBinaryFind(m_exceptions_allow.begin(), m_exceptions_allow.end(), host) != m_exceptions_allow.end();
+    bool eAllowSession = qBinaryFind(m_exceptions_allowForSession.begin(), m_exceptions_allowForSession.end(), host) != m_exceptions_allowForSession.end();
+
+    bool addedCookies = false;
+    // pass exceptions
+    bool acceptInitially = (m_acceptCookies != AcceptNever);
+    if ((acceptInitially && !eBlock)
+        || (!acceptInitially && (eAllow || eAllowSession))) {
+        // pass url domain == cookie domain
+        QDateTime soon = QDateTime::currentDateTime();
+        soon = soon.addDays(90);
+        foreach(QNetworkCookie cookie, cookieList) {
+            QList<QNetworkCookie> lst;
+            if (m_keepCookies == KeepUntilTimeLimit
+                && !cookie.isSessionCookie()
+                && cookie.expirationDate() > soon) {
+                    cookie.setExpirationDate(soon);
+            }
+            lst += cookie;
+            if (QNetworkCookieJar::setCookiesFromUrl(lst, url)) {
+                addedCookies = true;
+            } else {
+                // finally force it in if wanted
+                if (m_acceptCookies == AcceptAlways) {
+                    QList<QNetworkCookie> cookies = allCookies();
+                    cookies += cookie;
+                    setAllCookies(cookies);
+                    addedCookies = true;
+                }
+#if 0
+                else
+                    qWarning() << "setCookiesFromUrl failed" << url << cookieList.value(0).toRawForm();
+#endif
+            }
+        }
+    }
+
+    if (addedCookies) {
+        m_saveTimer->changeOccurred();
+        emit cookiesChanged();
+    }
+    return addedCookies;
+}
+
+CookieJar::AcceptPolicy CookieJar::acceptPolicy() const
+{
+    if (!m_loaded)
+        (const_cast<CookieJar*>(this))->load();
+    return m_acceptCookies;
+}
+
+void CookieJar::setAcceptPolicy(AcceptPolicy policy)
+{
+    if (!m_loaded)
+        load();
+    if (policy == m_acceptCookies)
+        return;
+    m_acceptCookies = policy;
+    m_saveTimer->changeOccurred();
+}
+
+CookieJar::KeepPolicy CookieJar::keepPolicy() const
+{
+    if (!m_loaded)
+        (const_cast<CookieJar*>(this))->load();
+    return m_keepCookies;
+}
+
+void CookieJar::setKeepPolicy(KeepPolicy policy)
+{
+    if (!m_loaded)
+        load();
+    if (policy == m_keepCookies)
+        return;
+    m_keepCookies = policy;
+    m_saveTimer->changeOccurred();
+}
+
+QStringList CookieJar::blockedCookies() const
+{
+    if (!m_loaded)
+        (const_cast<CookieJar*>(this))->load();
+    return m_exceptions_block;
+}
+
+QStringList CookieJar::allowedCookies() const
+{
+    if (!m_loaded)
+        (const_cast<CookieJar*>(this))->load();
+    return m_exceptions_allow;
+}
+
+QStringList CookieJar::allowForSessionCookies() const
+{
+    if (!m_loaded)
+        (const_cast<CookieJar*>(this))->load();
+    return m_exceptions_allowForSession;
+}
+
+void CookieJar::setBlockedCookies(const QStringList &list)
+{
+    if (!m_loaded)
+        load();
+    m_exceptions_block = list;
+    qSort(m_exceptions_block.begin(), m_exceptions_block.end());
+    m_saveTimer->changeOccurred();
+}
+
+void CookieJar::setAllowedCookies(const QStringList &list)
+{
+    if (!m_loaded)
+        load();
+    m_exceptions_allow = list;
+    qSort(m_exceptions_allow.begin(), m_exceptions_allow.end());
+    m_saveTimer->changeOccurred();
+}
+
+void CookieJar::setAllowForSessionCookies(const QStringList &list)
+{
+    if (!m_loaded)
+        load();
+    m_exceptions_allowForSession = list;
+    qSort(m_exceptions_allowForSession.begin(), m_exceptions_allowForSession.end());
+    m_saveTimer->changeOccurred();
+}
+
+CookieModel::CookieModel(CookieJar *cookieJar, QObject *parent)
+    : QAbstractTableModel(parent)
+    , m_cookieJar(cookieJar)
+{
+    connect(m_cookieJar, SIGNAL(cookiesChanged()), this, SLOT(cookiesChanged()));
+    m_cookieJar->load();
+}
+
+QVariant CookieModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    if (role == Qt::SizeHintRole) {
+        QFont font;
+        font.setPointSize(10);
+        QFontMetrics fm(font);
+        int height = fm.height() + fm.height()/3;
+        int width = fm.width(headerData(section, orientation, Qt::DisplayRole).toString());
+        return QSize(width, height);
+    }
+
+    if (orientation == Qt::Horizontal) {
+        if (role != Qt::DisplayRole)
+            return QVariant();
+
+        switch (section) {
+            case 0:
+                return tr("Website");
+            case 1:
+                return tr("Name");
+            case 2:
+                return tr("Path");
+            case 3:
+                return tr("Secure");
+            case 4:
+                return tr("Expires");
+            case 5:
+                return tr("Contents");
+            default:
+                return QVariant();
+        }
+    }
+    return QAbstractTableModel::headerData(section, orientation, role);
+}
+
+QVariant CookieModel::data(const QModelIndex &index, int role) const
+{
+    QList<QNetworkCookie> lst;
+    if (m_cookieJar)
+        lst = m_cookieJar->allCookies();
+    if (index.row() < 0 || index.row() >= lst.size())
+        return QVariant();
+
+    switch (role) {
+    case Qt::DisplayRole:
+    case Qt::EditRole: {
+        QNetworkCookie cookie = lst.at(index.row());
+        switch (index.column()) {
+            case 0:
+                return cookie.domain();
+            case 1:
+                return cookie.name();
+            case 2:
+                return cookie.path();
+            case 3:
+                return cookie.isSecure();
+            case 4:
+                return cookie.expirationDate();
+            case 5:
+                return cookie.value();
+        }
+        }
+    case Qt::FontRole:{
+        QFont font;
+        font.setPointSize(10);
+        return font;
+        }
+    }
+
+    return QVariant();
+}
+
+int CookieModel::columnCount(const QModelIndex &parent) const
+{
+    return (parent.isValid()) ? 0 : 6;
+}
+
+int CookieModel::rowCount(const QModelIndex &parent) const
+{
+    return (parent.isValid() || !m_cookieJar) ? 0 : m_cookieJar->allCookies().count();
+}
+
+bool CookieModel::removeRows(int row, int count, const QModelIndex &parent)
+{
+    if (parent.isValid() || !m_cookieJar)
+        return false;
+    int lastRow = row + count - 1;
+    beginRemoveRows(parent, row, lastRow);
+    QList<QNetworkCookie> lst = m_cookieJar->allCookies();
+    for (int i = lastRow; i >= row; --i) {
+        lst.removeAt(i);
+    }
+    m_cookieJar->setAllCookies(lst);
+    endRemoveRows();
+    return true;
+}
+
+void CookieModel::cookiesChanged()
+{
+    reset();
+}
+
+CookiesDialog::CookiesDialog(CookieJar *cookieJar, QWidget *parent) : QDialog(parent)
+{
+    setupUi(this);
+    setWindowFlags(Qt::Sheet);
+    CookieModel *model = new CookieModel(cookieJar, this);
+    m_proxyModel = new QSortFilterProxyModel(this);
+    connect(search, SIGNAL(textChanged(QString)),
+            m_proxyModel, SLOT(setFilterFixedString(QString)));
+    connect(removeButton, SIGNAL(clicked()), cookiesTable, SLOT(removeOne()));
+    connect(removeAllButton, SIGNAL(clicked()), cookiesTable, SLOT(removeAll()));
+    m_proxyModel->setSourceModel(model);
+    cookiesTable->verticalHeader()->hide();
+    cookiesTable->setSelectionBehavior(QAbstractItemView::SelectRows);
+    cookiesTable->setModel(m_proxyModel);
+    cookiesTable->setAlternatingRowColors(true);
+    cookiesTable->setTextElideMode(Qt::ElideMiddle);
+    cookiesTable->setShowGrid(false);
+    cookiesTable->setSortingEnabled(true);
+    QFont f = font();
+    f.setPointSize(10);
+    QFontMetrics fm(f);
+    int height = fm.height() + fm.height()/3;
+    cookiesTable->verticalHeader()->setDefaultSectionSize(height);
+    cookiesTable->verticalHeader()->setMinimumSectionSize(-1);
+    for (int i = 0; i < model->columnCount(); ++i){
+        int header = cookiesTable->horizontalHeader()->sectionSizeHint(i);
+        switch (i) {
+        case 0:
+            header = fm.width(QLatin1String("averagehost.domain.com"));
+            break;
+        case 1:
+            header = fm.width(QLatin1String("_session_id"));
+            break;
+        case 4:
+            header = fm.width(QDateTime::currentDateTime().toString(Qt::LocalDate));
+            break;
+        }
+        int buffer = fm.width(QLatin1String("xx"));
+        header += buffer;
+        cookiesTable->horizontalHeader()->resizeSection(i, header);
+    }
+    cookiesTable->horizontalHeader()->setStretchLastSection(true);
+}
+
+
+
+CookieExceptionsModel::CookieExceptionsModel(CookieJar *cookiejar, QObject *parent)
+    : QAbstractTableModel(parent)
+    , m_cookieJar(cookiejar)
+{
+    m_allowedCookies = m_cookieJar->allowedCookies();
+    m_blockedCookies = m_cookieJar->blockedCookies();
+    m_sessionCookies = m_cookieJar->allowForSessionCookies();
+}
+
+QVariant CookieExceptionsModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    if (role == Qt::SizeHintRole) {
+        QFont font;
+        font.setPointSize(10);
+        QFontMetrics fm(font);
+        int height = fm.height() + fm.height()/3;
+        int width = fm.width(headerData(section, orientation, Qt::DisplayRole).toString());
+        return QSize(width, height);
+    }
+
+    if (orientation == Qt::Horizontal
+        && role == Qt::DisplayRole) {
+        switch (section) {
+            case 0:
+                return tr("Website");
+            case 1:
+                return tr("Status");
+        }
+    }
+    return QAbstractTableModel::headerData(section, orientation, role);
+}
+
+QVariant CookieExceptionsModel::data(const QModelIndex &index, int role) const
+{
+    if (index.row() < 0 || index.row() >= rowCount())
+        return QVariant();
+
+    switch (role) {
+    case Qt::DisplayRole:
+    case Qt::EditRole: {
+        int row = index.row();
+        if (row < m_allowedCookies.count()) {
+            switch (index.column()) {
+                case 0:
+                    return m_allowedCookies.at(row);
+                case 1:
+                    return tr("Allow");
+            }
+        }
+        row = row - m_allowedCookies.count();
+        if (row < m_blockedCookies.count()) {
+            switch (index.column()) {
+                case 0:
+                    return m_blockedCookies.at(row);
+                case 1:
+                    return tr("Block");
+            }
+        }
+        row = row - m_blockedCookies.count();
+        if (row < m_sessionCookies.count()) {
+            switch (index.column()) {
+                case 0:
+                    return m_sessionCookies.at(row);
+                case 1:
+                    return tr("Allow For Session");
+            }
+        }
+        }
+    case Qt::FontRole:{
+        QFont font;
+        font.setPointSize(10);
+        return font;
+        }
+    }
+    return QVariant();
+}
+
+int CookieExceptionsModel::columnCount(const QModelIndex &parent) const
+{
+    return (parent.isValid()) ? 0 : 2;
+}
+
+int CookieExceptionsModel::rowCount(const QModelIndex &parent) const
+{
+    return (parent.isValid() || !m_cookieJar) ? 0 : m_allowedCookies.count() + m_blockedCookies.count() + m_sessionCookies.count();
+}
+
+bool CookieExceptionsModel::removeRows(int row, int count, const QModelIndex &parent)
+{
+    if (parent.isValid() || !m_cookieJar)
+        return false;
+
+    int lastRow = row + count - 1;
+    beginRemoveRows(parent, row, lastRow);
+    for (int i = lastRow; i >= row; --i) {
+        if (i < m_allowedCookies.count()) {
+            m_allowedCookies.removeAt(row);
+            continue;
+        }
+        i = i - m_allowedCookies.count();
+        if (i < m_blockedCookies.count()) {
+            m_blockedCookies.removeAt(row);
+            continue;
+        }
+        i = i - m_blockedCookies.count();
+        if (i < m_sessionCookies.count()) {
+            m_sessionCookies.removeAt(row);
+            continue;
+        }
+    }
+    m_cookieJar->setAllowedCookies(m_allowedCookies);
+    m_cookieJar->setBlockedCookies(m_blockedCookies);
+    m_cookieJar->setAllowForSessionCookies(m_sessionCookies);
+    endRemoveRows();
+    return true;
+}
+
+CookiesExceptionsDialog::CookiesExceptionsDialog(CookieJar *cookieJar, QWidget *parent)
+    : QDialog(parent)
+    , m_cookieJar(cookieJar)
+{
+    setupUi(this);
+    setWindowFlags(Qt::Sheet);
+    connect(removeButton, SIGNAL(clicked()), exceptionTable, SLOT(removeOne()));
+    connect(removeAllButton, SIGNAL(clicked()), exceptionTable, SLOT(removeAll()));
+    exceptionTable->verticalHeader()->hide();
+    exceptionTable->setSelectionBehavior(QAbstractItemView::SelectRows);
+    exceptionTable->setAlternatingRowColors(true);
+    exceptionTable->setTextElideMode(Qt::ElideMiddle);
+    exceptionTable->setShowGrid(false);
+    exceptionTable->setSortingEnabled(true);
+    m_exceptionsModel = new CookieExceptionsModel(cookieJar, this);
+    m_proxyModel = new QSortFilterProxyModel(this);
+    m_proxyModel->setSourceModel(m_exceptionsModel);
+    connect(search, SIGNAL(textChanged(QString)),
+            m_proxyModel, SLOT(setFilterFixedString(QString)));
+    exceptionTable->setModel(m_proxyModel);
+
+    CookieModel *cookieModel = new CookieModel(cookieJar, this);
+    domainLineEdit->setCompleter(new QCompleter(cookieModel, domainLineEdit));
+
+    connect(domainLineEdit, SIGNAL(textChanged(const QString &)),
+            this, SLOT(textChanged(const QString &)));
+    connect(blockButton, SIGNAL(clicked()), this, SLOT(block()));
+    connect(allowButton, SIGNAL(clicked()), this, SLOT(allow()));
+    connect(allowForSessionButton, SIGNAL(clicked()), this, SLOT(allowForSession()));
+
+    QFont f = font();
+    f.setPointSize(10);
+    QFontMetrics fm(f);
+    int height = fm.height() + fm.height()/3;
+    exceptionTable->verticalHeader()->setDefaultSectionSize(height);
+    exceptionTable->verticalHeader()->setMinimumSectionSize(-1);
+    for (int i = 0; i < m_exceptionsModel->columnCount(); ++i){
+        int header = exceptionTable->horizontalHeader()->sectionSizeHint(i);
+        switch (i) {
+        case 0:
+            header = fm.width(QLatin1String("averagebiglonghost.domain.com"));
+            break;
+        case 1:
+            header = fm.width(QLatin1String("Allow For Session"));
+            break;
+        }
+        int buffer = fm.width(QLatin1String("xx"));
+        header += buffer;
+        exceptionTable->horizontalHeader()->resizeSection(i, header);
+    }
+}
+
+void CookiesExceptionsDialog::textChanged(const QString &text)
+{
+    bool enabled = !text.isEmpty();
+    blockButton->setEnabled(enabled);
+    allowButton->setEnabled(enabled);
+    allowForSessionButton->setEnabled(enabled);
+}
+
+void CookiesExceptionsDialog::block()
+{
+    if (domainLineEdit->text().isEmpty())
+        return;
+    m_exceptionsModel->m_blockedCookies.append(domainLineEdit->text());
+    m_cookieJar->setBlockedCookies(m_exceptionsModel->m_blockedCookies);
+    m_exceptionsModel->reset();
+}
+
+void CookiesExceptionsDialog::allow()
+{
+    if (domainLineEdit->text().isEmpty())
+        return;
+    m_exceptionsModel->m_allowedCookies.append(domainLineEdit->text());
+    m_cookieJar->setAllowedCookies(m_exceptionsModel->m_allowedCookies);
+    m_exceptionsModel->reset();
+}
+
+void CookiesExceptionsDialog::allowForSession()
+{
+    if (domainLineEdit->text().isEmpty())
+        return;
+    m_exceptionsModel->m_sessionCookies.append(domainLineEdit->text());
+    m_cookieJar->setAllowForSessionCookies(m_exceptionsModel->m_sessionCookies);
+    m_exceptionsModel->reset();
+}
+
diff --git a/demos/browser/cookiejar.h b/demos/browser/cookiejar.h
new file mode 100644
index 0000000000..ffcd4c189e
--- /dev/null
+++ b/demos/browser/cookiejar.h
@@ -0,0 +1,204 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef COOKIEJAR_H
+#define COOKIEJAR_H
+
+#include <QtNetwork/QNetworkCookieJar>
+
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QStringList>
+
+#include <QtGui/QDialog>
+#include <QtGui/QTableView>
+
+QT_BEGIN_NAMESPACE
+class QSortFilterProxyModel;
+class QKeyEvent;
+QT_END_NAMESPACE
+
+class AutoSaver;
+
+class CookieJar : public QNetworkCookieJar
+{
+    friend class CookieModel;
+    Q_OBJECT
+    Q_PROPERTY(AcceptPolicy acceptPolicy READ acceptPolicy WRITE setAcceptPolicy)
+    Q_PROPERTY(KeepPolicy keepPolicy READ keepPolicy WRITE setKeepPolicy)
+    Q_PROPERTY(QStringList blockedCookies READ blockedCookies WRITE setBlockedCookies)
+    Q_PROPERTY(QStringList allowedCookies READ allowedCookies WRITE setAllowedCookies)
+    Q_PROPERTY(QStringList allowForSessionCookies READ allowForSessionCookies WRITE setAllowForSessionCookies)
+    Q_ENUMS(KeepPolicy)
+    Q_ENUMS(AcceptPolicy)
+
+signals:
+    void cookiesChanged();
+
+public:
+    enum AcceptPolicy {
+        AcceptAlways,
+        AcceptNever,
+        AcceptOnlyFromSitesNavigatedTo
+    };
+
+    enum KeepPolicy {
+        KeepUntilExpire,
+        KeepUntilExit,
+        KeepUntilTimeLimit
+    };
+
+    CookieJar(QObject *parent = 0);
+    ~CookieJar();
+
+    QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const;
+    bool setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url);
+
+    AcceptPolicy acceptPolicy() const;
+    void setAcceptPolicy(AcceptPolicy policy);
+
+    KeepPolicy keepPolicy() const;
+    void setKeepPolicy(KeepPolicy policy);
+
+    QStringList blockedCookies() const;
+    QStringList allowedCookies() const;
+    QStringList allowForSessionCookies() const;
+
+    void setBlockedCookies(const QStringList &list);
+    void setAllowedCookies(const QStringList &list);
+    void setAllowForSessionCookies(const QStringList &list);
+
+public slots:
+    void clear();
+    void loadSettings();
+
+private slots:
+    void save();
+
+private:
+    void purgeOldCookies();
+    void load();
+    bool m_loaded;
+    AutoSaver *m_saveTimer;
+
+    AcceptPolicy m_acceptCookies;
+    KeepPolicy m_keepCookies;
+
+    QStringList m_exceptions_block;
+    QStringList m_exceptions_allow;
+    QStringList m_exceptions_allowForSession;
+};
+
+class CookieModel : public QAbstractTableModel
+{
+    Q_OBJECT
+
+public:
+    CookieModel(CookieJar *jar, QObject *parent = 0);
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
+
+private slots:
+    void cookiesChanged();
+
+private:
+    CookieJar *m_cookieJar;
+};
+
+#include "ui_cookies.h"
+#include "ui_cookiesexceptions.h"
+
+class CookiesDialog : public QDialog, public Ui_CookiesDialog
+{
+    Q_OBJECT
+
+public:
+    CookiesDialog(CookieJar *cookieJar, QWidget *parent = 0);
+
+private:
+    QSortFilterProxyModel *m_proxyModel;
+};
+
+class CookieExceptionsModel : public QAbstractTableModel
+{
+    Q_OBJECT
+    friend class CookiesExceptionsDialog;
+
+public:
+    CookieExceptionsModel(CookieJar *cookieJar, QObject *parent = 0);
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
+
+private:
+    CookieJar *m_cookieJar;
+
+    // Domains we allow, Domains we block, Domains we allow for this session
+    QStringList m_allowedCookies;
+    QStringList m_blockedCookies;
+    QStringList m_sessionCookies;
+};
+
+class CookiesExceptionsDialog : public QDialog, public Ui_CookiesExceptionsDialog
+{
+    Q_OBJECT
+
+public:
+    CookiesExceptionsDialog(CookieJar *cookieJar, QWidget *parent = 0);
+
+private slots:
+    void block();
+    void allow();
+    void allowForSession();
+    void textChanged(const QString &text);
+
+private:
+    CookieExceptionsModel *m_exceptionsModel;
+    QSortFilterProxyModel *m_proxyModel;
+    CookieJar *m_cookieJar;
+};
+
+#endif // COOKIEJAR_H
+
diff --git a/demos/browser/cookies.ui b/demos/browser/cookies.ui
new file mode 100644
index 0000000000..c4bccc5483
--- /dev/null
+++ b/demos/browser/cookies.ui
@@ -0,0 +1,106 @@
+<ui version="4.0" >
+ <class>CookiesDialog</class>
+ <widget class="QDialog" name="CookiesDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>550</width>
+    <height>370</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Cookies</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>252</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1" >
+    <widget class="SearchLineEdit" name="search" />
+   </item>
+   <item row="1" column="0" colspan="2" >
+    <widget class="EditTableView" name="cookiesTable" />
+   </item>
+   <item row="2" column="0" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QPushButton" name="removeButton" >
+       <property name="text" >
+        <string>&amp;Remove</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="removeAllButton" >
+       <property name="text" >
+        <string>Remove &amp;All Cookies</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox" >
+       <property name="standardButtons" >
+        <set>QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SearchLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>searchlineedit.h</header>
+  </customwidget>
+  <customwidget>
+   <class>EditTableView</class>
+   <extends>QTableView</extends>
+   <header>edittableview.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>CookiesDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>472</x>
+     <y>329</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>461</x>
+     <y>356</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/demos/browser/cookiesexceptions.ui b/demos/browser/cookiesexceptions.ui
new file mode 100644
index 0000000000..3d9ef62414
--- /dev/null
+++ b/demos/browser/cookiesexceptions.ui
@@ -0,0 +1,184 @@
+<ui version="4.0" >
+ <class>CookiesExceptionsDialog</class>
+ <widget class="QDialog" name="CookiesExceptionsDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>466</width>
+    <height>446</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Cookie Exceptions</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <widget class="QGroupBox" name="newExceptionGroupBox" >
+     <property name="title" >
+      <string>New Exception</string>
+     </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <layout class="QHBoxLayout" >
+        <item>
+         <widget class="QLabel" name="label" >
+          <property name="text" >
+           <string>Domain:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="domainLineEdit" />
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="0" >
+       <layout class="QHBoxLayout" >
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0" >
+           <size>
+            <width>81</width>
+            <height>25</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QPushButton" name="blockButton" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>Block</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="allowForSessionButton" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>Allow For Session</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="allowButton" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>Allow</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="ExceptionsGroupBox" >
+     <property name="title" >
+      <string>Exceptions</string>
+     </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" colspan="3" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>252</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="3" >
+       <widget class="SearchLineEdit" name="search" />
+      </item>
+      <item row="1" column="0" colspan="4" >
+       <widget class="EditTableView" name="exceptionTable" />
+      </item>
+      <item row="2" column="0" >
+       <widget class="QPushButton" name="removeButton" >
+        <property name="text" >
+         <string>&amp;Remove</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QPushButton" name="removeAllButton" >
+        <property name="text" >
+         <string>Remove &amp;All</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" colspan="2" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SearchLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>searchlineedit.h</header>
+  </customwidget>
+  <customwidget>
+   <class>EditTableView</class>
+   <extends>QTableView</extends>
+   <header>edittableview.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>CookiesExceptionsDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>381</x>
+     <y>428</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>336</x>
+     <y>443</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/demos/browser/data/addtab.png b/demos/browser/data/addtab.png
new file mode 100644
index 0000000000..20928fb402
--- /dev/null
+++ b/demos/browser/data/addtab.png
diff --git a/demos/browser/data/browser.svg b/demos/browser/data/browser.svg
new file mode 100644
index 0000000000..4b0fa72686
--- /dev/null
+++ b/demos/browser/data/browser.svg
@@ -0,0 +1,411 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2160"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   inkscape:export-filename="c:\icons\qtbrowser48.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:docbase="C:\icons"
+   sodipodi:docname="browser.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs2162"><linearGradient
+   id="linearGradient3808">
+  <stop
+     id="stop3810"
+     offset="0"
+     style="stop-color:#000000;stop-opacity:0.54263568;" />
+  <stop
+     id="stop3812"
+     offset="1"
+     style="stop-color:#000000;stop-opacity:0;" />
+</linearGradient>
+<inkscape:perspective
+   sodipodi:type="inkscape:persp3d"
+   inkscape:vp_x="0 : 24 : 1"
+   inkscape:vp_y="0 : 1000 : 0"
+   inkscape:vp_z="48 : 24 : 1"
+   inkscape:persp3d-origin="24 : 16 : 1"
+   id="perspective63" />
+<linearGradient
+   id="linearGradient3326">
+  <stop
+     style="stop-color:#000000;stop-opacity:0.3137255;"
+     offset="0"
+     id="stop3328" />
+  <stop
+     style="stop-color:#000000;stop-opacity:0;"
+     offset="1"
+     id="stop3330" />
+</linearGradient>
+<linearGradient
+   id="linearGradient3318">
+  <stop
+     style="stop-color:#000000;stop-opacity:0.3137255;"
+     offset="0"
+     id="stop3320" />
+  <stop
+     style="stop-color:#000000;stop-opacity:0;"
+     offset="1"
+     id="stop3322" />
+</linearGradient>
+<linearGradient
+   id="linearGradient3302">
+  <stop
+     style="stop-color:#000000;stop-opacity:0.3137255;"
+     offset="0"
+     id="stop3304" />
+  <stop
+     style="stop-color:#000000;stop-opacity:0;"
+     offset="1"
+     id="stop3306" />
+</linearGradient>
+<linearGradient
+   id="linearGradient3267">
+  <stop
+     style="stop-color:#000000;stop-opacity:1;"
+     offset="0"
+     id="stop3269" />
+  <stop
+     id="stop3275"
+     offset="0.79661018"
+     style="stop-color:#000000;stop-opacity:1;" />
+  <stop
+     style="stop-color:#000000;stop-opacity:0;"
+     offset="1"
+     id="stop3271" />
+</linearGradient>
+<linearGradient
+   id="linearGradient3745">
+  <stop
+     style="stop-color:#ffffff;stop-opacity:0.19587629;"
+     offset="0"
+     id="stop3747" />
+  <stop
+     style="stop-color:#7cb2ff;stop-opacity:0.07216495;"
+     offset="1"
+     id="stop3749" />
+</linearGradient>
+<linearGradient
+   inkscape:collect="always"
+   id="linearGradient3561">
+  <stop
+     style="stop-color:#b1d0ff;stop-opacity:1;"
+     offset="0"
+     id="stop3563" />
+  <stop
+     style="stop-color:#b1d0ff;stop-opacity:0;"
+     offset="1"
+     id="stop3565" />
+</linearGradient>
+<linearGradient
+   id="linearGradient3181">
+  <stop
+     style="stop-color:#4f7a33;stop-opacity:1;"
+     offset="0"
+     id="stop3183" />
+  <stop
+     style="stop-color:#204712;stop-opacity:1;"
+     offset="1"
+     id="stop3185" />
+</linearGradient>
+<linearGradient
+   id="linearGradient3143">
+  <stop
+     style="stop-color:#c1dbff;stop-opacity:1;"
+     offset="0"
+     id="stop3145" />
+  <stop
+     style="stop-color:#004e92;stop-opacity:1;"
+     offset="1"
+     id="stop3147" />
+</linearGradient>
+<radialGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient3143"
+   id="radialGradient3149"
+   cx="9.1428566"
+   cy="15.142858"
+   fx="9.1428566"
+   fy="15.142858"
+   r="20.121096"
+   gradientUnits="userSpaceOnUse" />
+<radialGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient3181"
+   id="radialGradient3187"
+   cx="10.739879"
+   cy="18.250999"
+   fx="10.739879"
+   fy="18.250999"
+   r="7.4191086"
+   gradientTransform="matrix(1.0504709,0,0,1.5077925,-0.3797113,-9.2677171)"
+   gradientUnits="userSpaceOnUse" />
+<radialGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient3181"
+   id="radialGradient3195"
+   cx="14.947268"
+   cy="35.920116"
+   fx="14.947268"
+   fy="35.920116"
+   r="6.0472684"
+   gradientTransform="matrix(1,0,0,0.7248478,0,9.8834985)"
+   gradientUnits="userSpaceOnUse" />
+<radialGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient3181"
+   id="radialGradient3203"
+   cx="34.227203"
+   cy="24.681196"
+   fx="34.227203"
+   fy="24.681196"
+   r="6.7517419"
+   gradientTransform="matrix(0.9941509,-0.1079997,0.2962199,2.7267411,-7.1108629,-38.921508)"
+   gradientUnits="userSpaceOnUse" />
+<radialGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient3561"
+   id="radialGradient3567"
+   cx="22.714285"
+   cy="23.571428"
+   fx="22.714285"
+   fy="23.571428"
+   r="19.828572"
+   gradientUnits="userSpaceOnUse" />
+<linearGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient3745"
+   id="linearGradient3751"
+   x1="0.84126461"
+   y1="13.678415"
+   x2="31.397495"
+   y2="13.678415"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.8791332,0.7829527,-0.6285195,1.0951445,14.147627,-10.49311)" />
+<filter
+   inkscape:collect="always"
+   id="filter4176">
+  <feGaussianBlur
+     inkscape:collect="always"
+     stdDeviation="0.27747502"
+     id="feGaussianBlur4178" />
+</filter>
+<radialGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient3267"
+   id="radialGradient3273"
+   cx="22.714285"
+   cy="23.571428"
+   fx="22.714285"
+   fy="23.571428"
+   r="19.428572"
+   gradientUnits="userSpaceOnUse" />
+<inkscape:perspective
+   id="perspective136"
+   inkscape:persp3d-origin="138.6795 : 92.479329 : 1"
+   inkscape:vp_z="277.35901 : 138.71899 : 1"
+   inkscape:vp_y="0 : 1000 : 0"
+   inkscape:vp_x="0 : 138.71899 : 1"
+   sodipodi:type="inkscape:persp3d" />
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+<linearGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient3808"
+   id="linearGradient3806"
+   x1="32.829472"
+   y1="32.055603"
+   x2="34.522324"
+   y2="-1.0290829"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.8832227,0,0,1,-8.0103007,9.1923882)" />
+</defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="30.924085"
+     inkscape:cy="24.59691"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1299"
+     inkscape:window-height="883"
+     inkscape:window-x="373"
+     inkscape:window-y="89"
+     showguides="false" />
+  <metadata
+     id="metadata2165">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Qt Browser</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jens Bache-Wiig</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</dc:title>
+          </cc:Agent>
+        </dc:rights>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.78108437;fill:url(#radialGradient3273);fill-opacity:1;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3407"
+       sodipodi:cx="22.714285"
+       sodipodi:cy="23.571428"
+       sodipodi:rx="19.428572"
+       sodipodi:ry="19.428572"
+       d="M 42.142857,23.571428 A 19.428572,19.428572 0 1 1 3.2857132,23.571428 A 19.428572,19.428572 0 1 1 42.142857,23.571428 z"
+       transform="matrix(1.0818892,0,0,1.0409446,-2.4313375,0.4303723)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3149);fill-opacity:1;stroke:none;stroke-width:0.80000000000000004;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2170"
+       sodipodi:cx="22.714285"
+       sodipodi:cy="23.571428"
+       sodipodi:rx="19.428572"
+       sodipodi:ry="19.428572"
+       d="M 42.142857 23.571428 A 19.428572 19.428572 0 1 1  3.2857132,23.571428 A 19.428572 19.428572 0 1 1  42.142857 23.571428 z" />
+    <path
+       d="M 26.602136,8.2160843 C 26.322653,8.1637524 26.048884,8.1512446 25.78375,8.1745351 L 25.783243,8.1743913 C 25.783243,8.1743913 23.973525,8.3138471 23.891496,8.3211793 C 22.239361,8.4705552 20.985434,10.008307 20.985434,12.131916 L 20.985434,37.174579 L 22.83515,39.126673 L 41.425135,33.998394 C 42.704203,33.746799 43.714709,33.629384 43.714709,31.78483 L 43.714709,11.392226 L 26.602136,8.2160843 z"
+       id="path2998"
+       style="fill:url(#linearGradient3806);fill-opacity:1"
+       sodipodi:nodetypes="cccsccccccc" />
+    <path
+       style="fill:url(#radialGradient3203);fill-opacity:1;fill-rule:evenodd;stroke:#1d3215;stroke-width:0.51392877000000003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 37.535517,11.721122 C 32.782916,8.7478602 30.602351,6.3542385 32.09957,13.4346 C 32.320572,14.27055 33.291276,13.739232 33.291276,14.862228 C 33.291276,16.155819 32.607502,17.380765 31.797574,18.146663 C 30.959323,18.939344 31.011357,20.258984 31.797574,21.002459 C 33.06234,22.198469 33.942515,22.715936 35.572536,22.715936 C 36.6448,22.715936 37.003629,23.274262 37.23352,24.143834 C 37.362263,24.630808 38.410486,25.085663 38.894503,25.428942 C 38.938905,25.460433 38.139512,26.551348 38.139512,27.999158 C 38.139512,29.113512 38.405167,29.358325 38.743505,29.998215 C 38.949111,30.387072 36.418877,30.283794 36.025532,30.283794 C 35.005751,30.283794 34.181701,30.712163 33.15656,30.712163 C 32.264543,30.712163 31.099578,30.3566 31.344578,31.283323 C 31.763542,32.868074 32.552566,33.932342 32.552566,35.709806 C 32.552566,36.862272 31.047367,37.598377 30.287588,38.137232 C 29.30273,38.835721 29.133207,39.307154 28.475606,40.136289 C 28.132145,40.569341 26.990548,41.409612 28.475606,40.707448 C 29.476144,40.234375 31.192063,39.423774 32.09957,38.565601 C 33.257846,37.470293 34.527421,37.269266 35.723534,36.138176 C 36.659137,35.253436 37.512933,34.691155 38.29051,33.710749 C 39.024031,32.785889 39.498498,31.90347 39.498498,30.712163 C 39.498498,29.682482 39.308098,28.750366 39.951493,28.141948 C 40.902684,24.235856 42.225874,19.789742 39.751646,16.005086 C 38.569376,15.014407 37.717516,13.109859 37.535517,11.721122 z "
+       id="path3151"
+       sodipodi:nodetypes="ccsssssssssssssssssssccc" />
+    <path
+       style="fill:url(#radialGradient3187);fill-opacity:1;fill-rule:evenodd;stroke:#063a0a;stroke-width:0.51231807;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 14.777083,7.8630009 C 14.047432,8.4403746 12.751987,10.898939 13.27641,12.146301 C 13.709874,13.177316 14.920827,13.613143 15.827553,13.859622 C 16.568703,14.061091 17.049015,14.457271 17.478293,15.001835 C 17.832696,15.451415 17.971105,16.346745 18.078563,16.857932 C 18.298637,17.904845 18.947911,17.058563 17.62836,18.000145 C 17.234352,18.281296 14.875696,18.000145 14.476948,18.000145 C 11.976825,18.384083 14.297504,19.464893 14.92715,20.712903 C 15.204987,21.770261 15.377352,22.405336 15.377352,23.711213 C 15.377352,24.875672 15.377352,24.78389 15.377352,25.99564 C 15.377352,27.194757 15.044241,27.28063 13.876679,27.28063 C 13.023055,27.28063 12.647321,26.423969 11.625669,26.423969 C 10.400599,26.423969 11.303539,27.667106 11.475602,27.994513 C 12.006402,29.004538 11.662121,29.599737 10.875334,28.851174 C 9.855722,27.881096 8.8280305,26.760556 8.0240557,25.99564 C 2.8789379,25.807372 4.5677903,23.466499 3.9722395,18.999582 C 5.041259,16.526382 4.7558935,17.248897 7.2737194,12.574632 C 10.149914,9.5491592 13.589212,5.9532919 14.777083,7.8630009 z"
+       id="path3159"
+       sodipodi:nodetypes="csssssccsssssscccc" />
+    <path
+       style="fill:url(#radialGradient3195);fill-opacity:1;fill-rule:evenodd;stroke:#163c0c;stroke-width:0.59999999999999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 10.265966,34.571429 C 9.245427,35.081699 8.6225774,36.042538 9.980252,36.857143 C 10.637564,37.25153 11.478587,37.606311 12.265966,38 C 13.258976,38.496505 14.481138,39.018522 15.408823,39.714286 C 16.227572,40.328348 15.587589,39.928184 16.123109,38.857143 C 16.827927,37.447507 18.14516,38.79674 18.837395,39.142857 C 20.044787,39.746554 20.46001,38.652394 20.694537,37.714286 C 20.459863,35.791335 18.579948,34.625723 17.123109,33.285715 C 16.704922,32.588736 15.507117,31.689713 14.837395,31.857143 C 13.49505,33.304042 12.350312,33.960279 10.265966,34.571429 z "
+       id="path3161"
+       sodipodi:nodetypes="cssssscccc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;fill-opacity:1;stroke:url(#radialGradient3567);stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.6502732"
+       id="path3557"
+       sodipodi:cx="22.714285"
+       sodipodi:cy="23.571428"
+       sodipodi:rx="19.428572"
+       sodipodi:ry="19.428572"
+       d="M 42.142857 23.571428 A 19.428572 19.428572 0 1 1  3.2857132,23.571428 A 19.428572 19.428572 0 1 1  42.142857 23.571428 z"
+       transform="matrix(0.95317,0,0,0.95317,0.9922816,1.1752786)" />
+    <path
+       style="fill:url(#linearGradient3751);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 39.916926,27.786316 C 44.588637,26.790847 38.225604,13.201712 32.946381,8.5000566 C 18.135275,-0.40265528 10.844456,5.6490056 3.6645529,16.333771 C 5.7478288,18.189127 14.704728,33.158645 39.916926,27.786316 z"
+       id="path3578"
+       sodipodi:nodetypes="cccs" />
+    <path
+       d="M 45.902562,20.610592 C 46.007701,20.610592 46.120332,20.603354 46.240455,20.590275 L 45.609873,20.590275 C 45.697743,20.603608 45.798946,20.610592 45.902562,20.610592 z"
+       id="path3012"
+       style="fill:#0a6333" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;fill-opacity:1;stroke:#273e5e;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3818"
+       sodipodi:cx="22.714285"
+       sodipodi:cy="23.571428"
+       sodipodi:rx="19.428572"
+       sodipodi:ry="19.428572"
+       d="M 42.142857,23.571428 A 19.428572,19.428572 0 1 1 3.2857132,23.571428 A 19.428572,19.428572 0 1 1 42.142857,23.571428 z"
+       transform="matrix(0.9754581,0,0,0.9754581,0.3821951,0.7002631)" />
+    <g
+       transform="matrix(0.1269799,0,0,0.1269799,23.283534,9.5774104)"
+       id="g236">
+	<path
+   style="fill:#024c1c"
+   id="path238"
+   d="M 44.233,0.368 C 42.032,0.004 39.876,-0.083 37.788,0.079 L 37.784,0.078 C 37.784,0.078 23.532,1.048 22.886,1.099 C 9.875,2.138 0,12.834 0,27.605 L 0,201.792 L 14.567,215.37 L 160.968,190.766 C 171.041,189.016 178.999,177.133 178.999,164.303 L 178.999,22.46 L 44.233,0.368 z" />
+
+	<path
+   style="fill:#66b036"
+   id="path240"
+   d="M 179,164.304 C 179,177.134 171.042,189.017 160.969,190.767 L 14.567,215.37 L 14.567,26.683 C 14.567,9.52 28.263,-2.264 44.231,0.368 L 179,22.462 L 179,164.304 z" />
+
+	<g
+   id="g242">
+		<path
+   style="fill:#ffffff"
+   id="path244"
+   d="M 133.897,47.137 L 145.72,48.411 L 145.72,69.158 L 159.025,70.099 L 159.025,83.113 L 145.72,82.502 L 145.72,130.066 C 145.72,134.207 146.176,136.869 147.093,138.064 C 147.919,139.158 149.195,139.697 150.907,139.697 C 151.069,139.697 151.24,139.695 151.414,139.683 C 154.031,139.533 156.878,138.728 159.98,137.314 L 159.98,149.275 C 154.707,151.591 149.532,152.966 144.452,153.398 C 143.716,153.457 143.005,153.486 142.317,153.486 C 137.716,153.486 134.199,152.152 131.797,149.451 C 128.998,146.318 127.598,141.285 127.598,134.387 L 127.598,81.661 L 121.209,81.368 L 121.209,67.424 L 129,67.985 L 133.897,47.137 z" />
+
+	</g>
+
+	<polygon
+   style="fill:#0a6333"
+   id="polygon246"
+   points="159.027,83.112 145.722,82.501 145.722,82.785 152.854,83.112 159.027,83.112 " />
+
+	<path
+   style="fill:#024c1c"
+   id="path248"
+   d="M 148.488,139.21 C 149.168,139.548 149.96,139.696 150.908,139.696 C 151.07,139.696 151.241,139.694 151.415,139.682 C 154.032,139.532 156.879,138.727 159.981,137.313 L 153.806,137.313 C 151.938,138.169 150.178,138.808 148.488,139.21 z" />
+
+	<path
+   style="fill:#024c1c"
+   id="path250"
+   d="M 133.897,47.137 L 127.723,47.137 L 122.93,67.549 L 129,67.985 L 133.897,47.137 z M 131.799,149.45 C 129,146.317 127.6,141.284 127.6,134.386 L 127.6,81.661 L 121.211,81.368 L 121.211,67.424 L 115.03,67.424 L 115.03,70.539 C 115.926,73.897 116.63,77.539 117.149,81.465 L 121.426,81.661 L 121.426,134.386 C 121.426,141.284 122.827,146.318 125.625,149.45 C 128.029,152.151 131.541,153.485 136.141,153.485 L 142.318,153.485 C 137.718,153.485 134.2,152.151 131.799,149.45 z" />
+
+	<path
+   style="fill:#0a6333"
+   id="path252"
+   d="M 102.954,170.419 C 103.782,170.419 104.669,170.362 105.615,170.259 L 100.649,170.259 C 101.341,170.364 102.138,170.419 102.954,170.419 z" />
+
+	<path
+   style="fill:#ffffff"
+   id="path254"
+   d="M 112.036,139.78 C 107.81,149.749 101.365,156.27 92.542,159.288 C 93.43,163.856 94.778,166.929 96.567,168.55 C 97.955,169.796 100.094,170.419 102.958,170.419 C 103.782,170.419 104.671,170.362 105.615,170.259 L 105.615,183.736 L 99.497,184.539 C 97.692,184.771 95.98,184.889 94.361,184.889 C 89.001,184.889 84.665,183.59 81.402,180.961 C 77.085,177.496 73.899,170.805 71.857,160.908 C 62.48,158.91 55.166,152.945 50.103,142.937 C 44.965,132.769 42.349,117.895 42.349,98.441 C 42.349,77.466 45.927,61.985 52.971,52.169 C 58.912,43.885 67.202,39.812 77.634,39.812 C 79.306,39.812 81.033,39.916 82.809,40.124 C 95.081,41.539 103.977,47.329 109.77,57.362 C 115.453,67.177 118.243,81.244 118.243,99.721 C 118.242,116.643 116.186,129.954 112.036,139.78 z M 93.582,135.933 C 95.996,129.724 97.189,117.54 97.189,99.37 C 97.189,83.054 96.007,71.837 93.608,65.682 C 91.21,59.496 87.622,56.153 82.808,55.731 C 82.441,55.7 82.075,55.681 81.724,55.681 C 77.264,55.681 73.84,58.283 71.447,63.508 C 68.863,69.201 67.555,81.003 67.555,98.866 C 67.555,116.129 68.826,128.379 71.388,135.569 C 73.804,142.419 77.423,145.813 82.174,145.813 C 82.384,145.813 82.593,145.805 82.809,145.79 C 87.566,145.489 91.148,142.202 93.582,135.933" />
+
+	<path
+   style="fill:#024c1c"
+   id="path256"
+   d="M 84.708,183.003 C 84.59,182.95 84.477,182.896 84.361,182.839 C 84.349,182.835 84.336,182.829 84.323,182.821 C 84.218,182.77 84.115,182.716 84.011,182.663 C 83.991,182.653 83.971,182.642 83.948,182.63 C 83.854,182.579 83.761,182.528 83.667,182.476 C 83.636,182.46 83.609,182.443 83.579,182.427 C 83.494,182.38 83.412,182.331 83.328,182.284 C 83.286,182.263 83.25,182.239 83.209,182.214 C 83.137,182.171 83.062,182.128 82.994,182.083 C 82.943,182.054 82.897,182.024 82.848,181.993 C 82.785,181.954 82.726,181.915 82.663,181.876 C 82.606,181.837 82.552,181.798 82.492,181.759 C 82.442,181.726 82.392,181.693 82.342,181.659 C 82.272,181.612 82.206,181.563 82.141,181.518 C 82.101,181.489 82.061,181.463 82.021,181.432 C 81.943,181.377 81.866,181.319 81.79,181.26 C 81.764,181.239 81.735,181.221 81.708,181.199 C 81.607,181.121 81.505,181.039 81.402,180.959 C 77.085,177.494 73.899,170.803 71.857,160.906 C 62.48,158.908 55.166,152.943 50.103,142.935 C 44.965,132.767 42.349,117.893 42.349,98.439 C 42.349,77.464 45.927,61.983 52.971,52.167 C 58.912,43.883 67.202,39.81 77.634,39.81 C 77.67,39.81 71.114,39.806 71.114,39.806 L 71.114,39.81 C 60.694,39.818 52.411,43.89 46.476,52.167 C 39.434,61.984 35.855,77.465 35.855,98.439 C 35.855,117.892 38.469,132.767 43.609,142.935 C 48.671,152.943 55.983,158.908 65.361,160.906 C 67.403,170.802 70.588,177.494 74.904,180.959 C 78.168,183.588 82.507,184.887 87.867,184.887 C 87.967,184.887 88.07,184.887 88.17,184.885 L 93.861,184.885 C 90.361,184.828 87.306,184.203 84.716,183.006 C 84.712,183.007 84.708,183.007 84.708,183.003 z M 87.113,65.681 C 89.511,71.837 90.69,83.054 90.69,99.369 C 90.69,117.539 89.502,129.723 87.083,135.932 C 85.142,140.942 82.439,144.047 79.013,145.248 C 79.999,145.621 81.058,145.81 82.173,145.81 C 82.383,145.81 82.592,145.802 82.808,145.787 C 87.567,145.488 91.149,142.201 93.582,135.932 C 95.996,129.723 97.189,117.539 97.189,99.369 C 97.189,83.053 96.007,71.836 93.608,65.681 C 91.21,59.495 87.622,56.152 82.808,55.73 C 82.441,55.699 82.075,55.68 81.724,55.68 C 80.601,55.68 79.549,55.845 78.556,56.173 L 78.556,56.175 L 78.556,56.175 C 82.254,57.322 85.104,60.5 87.113,65.681 z" />
+
+</g>
+  </g>
+</svg>
diff --git a/demos/browser/data/closetab.png b/demos/browser/data/closetab.png
new file mode 100644
index 0000000000..ab9d669eee
--- /dev/null
+++ b/demos/browser/data/closetab.png
diff --git a/demos/browser/data/data.qrc b/demos/browser/data/data.qrc
new file mode 100644
index 0000000000..c7d0294c1a
--- /dev/null
+++ b/demos/browser/data/data.qrc
@@ -0,0 +1,11 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>addtab.png</file>
+    <file>closetab.png</file>
+    <file>history.png</file>
+    <file>browser.svg</file>
+    <file>defaultbookmarks.xbel</file>
+    <file>loading.gif</file>
+    <file>defaulticon.png</file>
+</qresource>
+</RCC>
diff --git a/demos/browser/data/defaultbookmarks.xbel b/demos/browser/data/defaultbookmarks.xbel
new file mode 100644
index 0000000000..a168244584
--- /dev/null
+++ b/demos/browser/data/defaultbookmarks.xbel
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xbel>
+<xbel version="1.0">
+    <folder folded="yes">
+        <title>Bookmarks Bar</title>
+        <bookmark href="http://qtsoftware.com/">
+            <title>Qt Software</title>
+        </bookmark>
+        <bookmark href="http://webkit.org/">
+            <title>WebKit.org</title>
+        </bookmark>
+        <bookmark href="http://doc.trolltech.com/">
+            <title>Qt Documentation</title>
+        </bookmark>
+        <bookmark href="http://doc.trolltech.com/qq/">
+            <title>Qt Quarterly</title>
+        </bookmark>
+        <bookmark href="http://labs.trolltech.com/">
+            <title>Qt Labs</title>
+        </bookmark>
+        <bookmark href="http://www.qtcentre.org/">
+            <title>Qt Centre</title>
+        </bookmark>
+        <bookmark href="http://qt-apps.org/">
+            <title>Qt-Apps.org</title>
+        </bookmark>
+        <bookmark href="http://qtnode.net/">
+            <title>qtnode</title>
+        </bookmark>
+       <bookmark href="http://xkcd.com/">
+            <title>xkcd</title>
+        </bookmark>
+    </folder>
+    <folder folded="yes">
+        <title>Bookmarks Menu</title>
+        <bookmark href="http://reddit.com/">
+            <title>reddit.com: what's new online!</title>
+        </bookmark>
+    </folder>
+</xbel>
diff --git a/demos/browser/data/defaulticon.png b/demos/browser/data/defaulticon.png
new file mode 100644
index 0000000000..01a0920c93
--- /dev/null
+++ b/demos/browser/data/defaulticon.png
diff --git a/demos/browser/data/history.png b/demos/browser/data/history.png
new file mode 100644
index 0000000000..552a1cbd88
--- /dev/null
+++ b/demos/browser/data/history.png
diff --git a/demos/browser/data/loading.gif b/demos/browser/data/loading.gif
new file mode 100644
index 0000000000..c1545eb0ed
--- /dev/null
+++ b/demos/browser/data/loading.gif
diff --git a/demos/browser/downloaditem.ui b/demos/browser/downloaditem.ui
new file mode 100644
index 0000000000..4a0a0fd9aa
--- /dev/null
+++ b/demos/browser/downloaditem.ui
@@ -0,0 +1,134 @@
+<ui version="4.0" >
+ <class>DownloadItem</class>
+ <widget class="QWidget" name="DownloadItem" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>423</width>
+    <height>110</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="fileIcon" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text" >
+      <string>Ico</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout_2" >
+     <item>
+      <widget class="SqueezeLabel" native="1" name="fileNameLabel" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" stdset="0" >
+        <string>Filename</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QProgressBar" name="progressBar" >
+       <property name="value" >
+        <number>0</number>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="SqueezeLabel" native="1" name="downloadInfoLabel" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" stdset="0" >
+        <string/>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout" >
+     <item>
+      <spacer name="verticalSpacer" >
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>17</width>
+         <height>1</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="tryAgainButton" >
+       <property name="enabled" >
+        <bool>false</bool>
+       </property>
+       <property name="text" >
+        <string>Try Again</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="stopButton" >
+       <property name="text" >
+        <string>Stop</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="openButton" >
+       <property name="text" >
+        <string>Open</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="verticalSpacer_2" >
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>17</width>
+         <height>5</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SqueezeLabel</class>
+   <extends>QWidget</extends>
+   <header>squeezelabel.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/demos/browser/downloadmanager.cpp b/demos/browser/downloadmanager.cpp
new file mode 100644
index 0000000000..af3139153d
--- /dev/null
+++ b/demos/browser/downloadmanager.cpp
@@ -0,0 +1,579 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "downloadmanager.h"
+
+#include "autosaver.h"
+#include "browserapplication.h"
+#include "networkaccessmanager.h"
+
+#include <math.h>
+
+#include <QtCore/QMetaEnum>
+#include <QtCore/QSettings>
+
+#include <QtGui/QDesktopServices>
+#include <QtGui/QFileDialog>
+#include <QtGui/QHeaderView>
+#include <QtGui/QFileIconProvider>
+
+#include <QtCore/QDebug>
+
+#include <QtWebKit/QWebSettings>
+
+/*!
+    DownloadItem is a widget that is displayed in the download manager list.
+    It moves the data from the QNetworkReply into the QFile as well
+    as update the information/progressbar and report errors.
+ */
+DownloadItem::DownloadItem(QNetworkReply *reply, bool requestFileName, QWidget *parent)
+    : QWidget(parent)
+    , m_reply(reply)
+    , m_requestFileName(requestFileName)
+    , m_bytesReceived(0)
+{
+    setupUi(this);
+    QPalette p = downloadInfoLabel->palette();
+    p.setColor(QPalette::Text, Qt::darkGray);
+    downloadInfoLabel->setPalette(p);
+    progressBar->setMaximum(0);
+    tryAgainButton->hide();
+    connect(stopButton, SIGNAL(clicked()), this, SLOT(stop()));
+    connect(openButton, SIGNAL(clicked()), this, SLOT(open()));
+    connect(tryAgainButton, SIGNAL(clicked()), this, SLOT(tryAgain()));
+
+    init();
+}
+
+void DownloadItem::init()
+{
+    if (!m_reply)
+        return;
+
+    // attach to the m_reply
+    m_url = m_reply->url();
+    m_reply->setParent(this);
+    connect(m_reply, SIGNAL(readyRead()), this, SLOT(downloadReadyRead()));
+    connect(m_reply, SIGNAL(error(QNetworkReply::NetworkError)),
+            this, SLOT(error(QNetworkReply::NetworkError)));
+    connect(m_reply, SIGNAL(downloadProgress(qint64, qint64)),
+            this, SLOT(downloadProgress(qint64, qint64)));
+    connect(m_reply, SIGNAL(metaDataChanged()),
+            this, SLOT(metaDataChanged()));
+    connect(m_reply, SIGNAL(finished()),
+            this, SLOT(finished()));
+
+    // reset info
+    downloadInfoLabel->clear();
+    progressBar->setValue(0);
+    getFileName();
+
+    // start timer for the download estimation
+    m_downloadTime.start();
+
+    if (m_reply->error() != QNetworkReply::NoError) {
+        error(m_reply->error());
+        finished();
+    }
+}
+
+void DownloadItem::getFileName()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("downloadmanager"));
+    QString defaultLocation = QDesktopServices::storageLocation(QDesktopServices::DesktopLocation);
+    QString downloadDirectory = settings.value(QLatin1String("downloadDirectory"), defaultLocation).toString();
+    if (!downloadDirectory.isEmpty())
+        downloadDirectory += QLatin1Char('/');
+
+    QString defaultFileName = saveFileName(downloadDirectory);
+    QString fileName = defaultFileName;
+    if (m_requestFileName) {
+        fileName = QFileDialog::getSaveFileName(this, tr("Save File"), defaultFileName);
+        if (fileName.isEmpty()) {
+            m_reply->close();
+            fileNameLabel->setText(tr("Download canceled: %1").arg(QFileInfo(defaultFileName).fileName()));
+            return;
+        }
+    }
+    m_output.setFileName(fileName);
+    fileNameLabel->setText(QFileInfo(m_output.fileName()).fileName());
+    if (m_requestFileName)
+        downloadReadyRead();
+}
+
+QString DownloadItem::saveFileName(const QString &directory) const
+{
+    // Move this function into QNetworkReply to also get file name sent from the server
+    QString path = m_url.path();
+    QFileInfo info(path);
+    QString baseName = info.completeBaseName();
+    QString endName = info.suffix();
+
+    if (baseName.isEmpty()) {
+        baseName = QLatin1String("unnamed_download");
+        qDebug() << "DownloadManager:: downloading unknown file:" << m_url;
+    }
+    QString name = directory + baseName + QLatin1Char('.') + endName;
+    if (QFile::exists(name)) {
+        // already exists, don't overwrite
+        int i = 1;
+        do {
+            name = directory + baseName + QLatin1Char('-') + QString::number(i++) + QLatin1Char('.') + endName;
+        } while (QFile::exists(name));
+    }
+    return name;
+}
+
+
+void DownloadItem::stop()
+{
+    setUpdatesEnabled(false);
+    stopButton->setEnabled(false);
+    stopButton->hide();
+    tryAgainButton->setEnabled(true);
+    tryAgainButton->show();
+    setUpdatesEnabled(true);
+    m_reply->abort();
+}
+
+void DownloadItem::open()
+{
+    QFileInfo info(m_output);
+    QUrl url = QUrl::fromLocalFile(info.absolutePath());
+    QDesktopServices::openUrl(url);
+}
+
+void DownloadItem::tryAgain()
+{
+    if (!tryAgainButton->isEnabled())
+        return;
+
+    tryAgainButton->setEnabled(false);
+    tryAgainButton->setVisible(false);
+    stopButton->setEnabled(true);
+    stopButton->setVisible(true);
+    progressBar->setVisible(true);
+
+    QNetworkReply *r = BrowserApplication::networkAccessManager()->get(QNetworkRequest(m_url));
+    if (m_reply)
+        m_reply->deleteLater();
+    if (m_output.exists())
+        m_output.remove();
+    m_reply = r;
+    init();
+    emit statusChanged();
+}
+
+void DownloadItem::downloadReadyRead()
+{
+    if (m_requestFileName && m_output.fileName().isEmpty())
+        return;
+    if (!m_output.isOpen()) {
+        // in case someone else has already put a file there
+        if (!m_requestFileName)
+            getFileName();
+        if (!m_output.open(QIODevice::WriteOnly)) {
+            downloadInfoLabel->setText(tr("Error opening save file: %1")
+                    .arg(m_output.errorString()));
+            stopButton->click();
+            emit statusChanged();
+            return;
+        }
+        emit statusChanged();
+    }
+    if (-1 == m_output.write(m_reply->readAll())) {
+        downloadInfoLabel->setText(tr("Error saving: %1")
+                .arg(m_output.errorString()));
+        stopButton->click();
+    }
+}
+
+void DownloadItem::error(QNetworkReply::NetworkError)
+{
+    qDebug() << "DownloadItem::error" << m_reply->errorString() << m_url;
+    downloadInfoLabel->setText(tr("Network Error: %1").arg(m_reply->errorString()));
+    tryAgainButton->setEnabled(true);
+    tryAgainButton->setVisible(true);
+}
+
+void DownloadItem::metaDataChanged()
+{
+    qDebug() << "DownloadItem::metaDataChanged: not handled.";
+}
+
+void DownloadItem::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
+{
+    m_bytesReceived = bytesReceived;
+    if (bytesTotal == -1) {
+        progressBar->setValue(0);
+        progressBar->setMaximum(0);
+    } else {
+        progressBar->setValue(bytesReceived);
+        progressBar->setMaximum(bytesTotal);
+    }
+    updateInfoLabel();
+}
+
+void DownloadItem::updateInfoLabel()
+{
+    if (m_reply->error() == QNetworkReply::NoError)
+        return;
+
+    qint64 bytesTotal = progressBar->maximum();
+    bool running = !downloadedSuccessfully();
+
+    // update info label
+    double speed = m_bytesReceived * 1000.0 / m_downloadTime.elapsed();
+    double timeRemaining = ((double)(bytesTotal - m_bytesReceived)) / speed;
+    QString timeRemainingString = tr("seconds");
+    if (timeRemaining > 60) {
+        timeRemaining = timeRemaining / 60;
+        timeRemainingString = tr("minutes");
+    }
+    timeRemaining = floor(timeRemaining);
+
+    // When downloading the eta should never be 0
+    if (timeRemaining == 0)
+        timeRemaining = 1;
+
+    QString info;
+    if (running) {
+        QString remaining;
+        if (bytesTotal != 0)
+            remaining = tr("- %4 %5 remaining")
+            .arg(timeRemaining)
+            .arg(timeRemainingString);
+        info = QString(tr("%1 of %2 (%3/sec) %4"))
+            .arg(dataString(m_bytesReceived))
+            .arg(bytesTotal == 0 ? tr("?") : dataString(bytesTotal))
+            .arg(dataString((int)speed))
+            .arg(remaining);
+    } else {
+        if (m_bytesReceived == bytesTotal)
+            info = dataString(m_output.size());
+        else
+            info = tr("%1 of %2 - Stopped")
+                .arg(dataString(m_bytesReceived))
+                .arg(dataString(bytesTotal));
+    }
+    downloadInfoLabel->setText(info);
+}
+
+QString DownloadItem::dataString(int size) const
+{
+    QString unit;
+    if (size < 1024) {
+        unit = tr("bytes");
+    } else if (size < 1024*1024) {
+        size /= 1024;
+        unit = tr("kB");
+    } else {
+        size /= 1024*1024;
+        unit = tr("MB");
+    }
+    return QString(QLatin1String("%1 %2")).arg(size).arg(unit);
+}
+
+bool DownloadItem::downloading() const
+{
+    return (progressBar->isVisible());
+}
+
+bool DownloadItem::downloadedSuccessfully() const
+{
+    return (stopButton->isHidden() && tryAgainButton->isHidden());
+}
+
+void DownloadItem::finished()
+{
+    progressBar->hide();
+    stopButton->setEnabled(false);
+    stopButton->hide();
+    m_output.close();
+    updateInfoLabel();
+    emit statusChanged();
+}
+
+/*!
+    DownloadManager is a Dialog that contains a list of DownloadItems
+
+    It is a basic download manager.  It only downloads the file, doesn't do BitTorrent,
+    extract zipped files or anything fancy.
+  */
+DownloadManager::DownloadManager(QWidget *parent)
+    : QDialog(parent)
+    , m_autoSaver(new AutoSaver(this))
+    , m_manager(BrowserApplication::networkAccessManager())
+    , m_iconProvider(0)
+    , m_removePolicy(Never)
+{
+    setupUi(this);
+    downloadsView->setShowGrid(false);
+    downloadsView->verticalHeader()->hide();
+    downloadsView->horizontalHeader()->hide();
+    downloadsView->setAlternatingRowColors(true);
+    downloadsView->horizontalHeader()->setStretchLastSection(true);
+    m_model = new DownloadModel(this);
+    downloadsView->setModel(m_model);
+    connect(cleanupButton, SIGNAL(clicked()), this, SLOT(cleanup()));
+    load();
+}
+
+DownloadManager::~DownloadManager()
+{
+    m_autoSaver->changeOccurred();
+    m_autoSaver->saveIfNeccessary();
+    if (m_iconProvider)
+        delete m_iconProvider;
+}
+
+int DownloadManager::activeDownloads() const
+{
+    int count = 0;
+    for (int i = 0; i < m_downloads.count(); ++i) {
+        if (m_downloads.at(i)->stopButton->isEnabled())
+            ++count;
+    }
+    return count;
+}
+
+void DownloadManager::download(const QNetworkRequest &request, bool requestFileName)
+{
+    if (request.url().isEmpty())
+        return;
+    handleUnsupportedContent(m_manager->get(request), requestFileName);
+}
+
+void DownloadManager::handleUnsupportedContent(QNetworkReply *reply, bool requestFileName)
+{
+    if (!reply || reply->url().isEmpty())
+        return;
+    QVariant header = reply->header(QNetworkRequest::ContentLengthHeader);
+    bool ok;
+    int size = header.toInt(&ok);
+    if (ok && size == 0)
+        return;
+
+    qDebug() << "DownloadManager::handleUnsupportedContent" << reply->url() << "requestFileName" << requestFileName;
+    DownloadItem *item = new DownloadItem(reply, requestFileName, this);
+    addItem(item);
+}
+
+void DownloadManager::addItem(DownloadItem *item)
+{
+    connect(item, SIGNAL(statusChanged()), this, SLOT(updateRow()));
+    int row = m_downloads.count();
+    m_model->beginInsertRows(QModelIndex(), row, row);
+    m_downloads.append(item);
+    m_model->endInsertRows();
+    updateItemCount();
+    if (row == 0)
+        show();
+    downloadsView->setIndexWidget(m_model->index(row, 0), item);
+    QIcon icon = style()->standardIcon(QStyle::SP_FileIcon);
+    item->fileIcon->setPixmap(icon.pixmap(48, 48));
+    downloadsView->setRowHeight(row, item->sizeHint().height());
+}
+
+void DownloadManager::updateRow()
+{
+    DownloadItem *item = qobject_cast<DownloadItem*>(sender());
+    int row = m_downloads.indexOf(item);
+    if (-1 == row)
+        return;
+    if (!m_iconProvider)
+        m_iconProvider = new QFileIconProvider();
+    QIcon icon = m_iconProvider->icon(item->m_output.fileName());
+    if (icon.isNull())
+        icon = style()->standardIcon(QStyle::SP_FileIcon);
+    item->fileIcon->setPixmap(icon.pixmap(48, 48));
+    downloadsView->setRowHeight(row, item->minimumSizeHint().height());
+
+    bool remove = false;
+    QWebSettings *globalSettings = QWebSettings::globalSettings();
+    if (!item->downloading()
+        && globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
+        remove = true;
+
+    if (item->downloadedSuccessfully()
+        && removePolicy() == DownloadManager::SuccessFullDownload) {
+        remove = true;
+    }
+    if (remove)
+        m_model->removeRow(row);
+
+    cleanupButton->setEnabled(m_downloads.count() - activeDownloads() > 0);
+}
+
+DownloadManager::RemovePolicy DownloadManager::removePolicy() const
+{
+    return m_removePolicy;
+}
+
+void DownloadManager::setRemovePolicy(RemovePolicy policy)
+{
+    if (policy == m_removePolicy)
+        return;
+    m_removePolicy = policy;
+    m_autoSaver->changeOccurred();
+}
+
+void DownloadManager::save() const
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("downloadmanager"));
+    QMetaEnum removePolicyEnum = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("RemovePolicy"));
+    settings.setValue(QLatin1String("removeDownloadsPolicy"), QLatin1String(removePolicyEnum.valueToKey(m_removePolicy)));
+    settings.setValue(QLatin1String("size"), size());
+    if (m_removePolicy == Exit)
+        return;
+
+    for (int i = 0; i < m_downloads.count(); ++i) {
+        QString key = QString(QLatin1String("download_%1_")).arg(i);
+        settings.setValue(key + QLatin1String("url"), m_downloads[i]->m_url);
+        settings.setValue(key + QLatin1String("location"), QFileInfo(m_downloads[i]->m_output).filePath());
+        settings.setValue(key + QLatin1String("done"), m_downloads[i]->downloadedSuccessfully());
+    }
+    int i = m_downloads.count();
+    QString key = QString(QLatin1String("download_%1_")).arg(i);
+    while (settings.contains(key + QLatin1String("url"))) {
+        settings.remove(key + QLatin1String("url"));
+        settings.remove(key + QLatin1String("location"));
+        settings.remove(key + QLatin1String("done"));
+        key = QString(QLatin1String("download_%1_")).arg(++i);
+    }
+}
+
+void DownloadManager::load()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("downloadmanager"));
+    QSize size = settings.value(QLatin1String("size")).toSize();
+    if (size.isValid())
+        resize(size);
+    QByteArray value = settings.value(QLatin1String("removeDownloadsPolicy"), QLatin1String("Never")).toByteArray();
+    QMetaEnum removePolicyEnum = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("RemovePolicy"));
+    m_removePolicy = removePolicyEnum.keyToValue(value) == -1 ?
+                        Never :
+                        static_cast<RemovePolicy>(removePolicyEnum.keyToValue(value));
+
+    int i = 0;
+    QString key = QString(QLatin1String("download_%1_")).arg(i);
+    while (settings.contains(key + QLatin1String("url"))) {
+        QUrl url = settings.value(key + QLatin1String("url")).toUrl();
+        QString fileName = settings.value(key + QLatin1String("location")).toString();
+        bool done = settings.value(key + QLatin1String("done"), true).toBool();
+        if (!url.isEmpty() && !fileName.isEmpty()) {
+            DownloadItem *item = new DownloadItem(0, this);
+            item->m_output.setFileName(fileName);
+            item->fileNameLabel->setText(QFileInfo(item->m_output.fileName()).fileName());
+            item->m_url = url;
+            item->stopButton->setVisible(false);
+            item->stopButton->setEnabled(false);
+            item->tryAgainButton->setVisible(!done);
+            item->tryAgainButton->setEnabled(!done);
+            item->progressBar->setVisible(!done);
+            addItem(item);
+        }
+        key = QString(QLatin1String("download_%1_")).arg(++i);
+    }
+    cleanupButton->setEnabled(m_downloads.count() - activeDownloads() > 0);
+}
+
+void DownloadManager::cleanup()
+{
+    if (m_downloads.isEmpty())
+        return;
+    m_model->removeRows(0, m_downloads.count());
+    updateItemCount();
+    if (m_downloads.isEmpty() && m_iconProvider) {
+        delete m_iconProvider;
+        m_iconProvider = 0;
+    }
+    m_autoSaver->changeOccurred();
+}
+
+void DownloadManager::updateItemCount()
+{
+    int count = m_downloads.count();
+    itemCount->setText(count == 1 ? tr("1 Download") : tr("%1 Downloads").arg(count));
+}
+
+DownloadModel::DownloadModel(DownloadManager *downloadManager, QObject *parent)
+    : QAbstractListModel(parent)
+    , m_downloadManager(downloadManager)
+{
+}
+
+QVariant DownloadModel::data(const QModelIndex &index, int role) const
+{
+    if (index.row() < 0 || index.row() >= rowCount(index.parent()))
+        return QVariant();
+    if (role == Qt::ToolTipRole)
+        if (!m_downloadManager->m_downloads.at(index.row())->downloadedSuccessfully())
+            return m_downloadManager->m_downloads.at(index.row())->downloadInfoLabel->text();
+    return QVariant();
+}
+
+int DownloadModel::rowCount(const QModelIndex &parent) const
+{
+    return (parent.isValid()) ? 0 : m_downloadManager->m_downloads.count();
+}
+
+bool DownloadModel::removeRows(int row, int count, const QModelIndex &parent)
+{
+    if (parent.isValid())
+        return false;
+
+    int lastRow = row + count - 1;
+    for (int i = lastRow; i >= row; --i) {
+        if (m_downloadManager->m_downloads.at(i)->downloadedSuccessfully()
+            || m_downloadManager->m_downloads.at(i)->tryAgainButton->isEnabled()) {
+            beginRemoveRows(parent, i, i);
+            m_downloadManager->m_downloads.takeAt(i)->deleteLater();
+            endRemoveRows();
+        }
+    }
+    m_downloadManager->m_autoSaver->changeOccurred();
+    return true;
+}
+
diff --git a/demos/browser/downloadmanager.h b/demos/browser/downloadmanager.h
new file mode 100644
index 0000000000..85318dac14
--- /dev/null
+++ b/demos/browser/downloadmanager.h
@@ -0,0 +1,162 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DOWNLOADMANAGER_H
+#define DOWNLOADMANAGER_H
+
+#include "ui_downloads.h"
+#include "ui_downloaditem.h"
+
+#include <QtNetwork/QNetworkReply>
+
+#include <QtCore/QFile>
+#include <QtCore/QTime>
+
+class DownloadItem : public QWidget, public Ui_DownloadItem
+{
+    Q_OBJECT
+
+signals:
+    void statusChanged();
+
+public:
+    DownloadItem(QNetworkReply *reply = 0, bool requestFileName = false, QWidget *parent = 0);
+    bool downloading() const;
+    bool downloadedSuccessfully() const;
+
+    QUrl m_url;
+
+    QFile m_output;
+    QNetworkReply *m_reply;
+
+private slots:
+    void stop();
+    void tryAgain();
+    void open();
+
+    void downloadReadyRead();
+    void error(QNetworkReply::NetworkError code);
+    void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
+    void metaDataChanged();
+    void finished();
+
+private:
+    void getFileName();
+    void init();
+    void updateInfoLabel();
+    QString dataString(int size) const;
+
+    QString saveFileName(const QString &directory) const;
+
+    bool m_requestFileName;
+    qint64 m_bytesReceived;
+    QTime m_downloadTime;
+};
+
+class AutoSaver;
+class DownloadModel;
+QT_BEGIN_NAMESPACE
+class QFileIconProvider;
+QT_END_NAMESPACE
+
+class DownloadManager : public QDialog, public Ui_DownloadDialog
+{
+    Q_OBJECT
+    Q_PROPERTY(RemovePolicy removePolicy READ removePolicy WRITE setRemovePolicy)
+    Q_ENUMS(RemovePolicy)
+
+public:
+    enum RemovePolicy {
+        Never,
+        Exit,
+        SuccessFullDownload
+    };
+
+    DownloadManager(QWidget *parent = 0);
+    ~DownloadManager();
+    int activeDownloads() const;
+
+    RemovePolicy removePolicy() const;
+    void setRemovePolicy(RemovePolicy policy);
+
+public slots:
+    void download(const QNetworkRequest &request, bool requestFileName = false);
+    inline void download(const QUrl &url, bool requestFileName = false)
+        { download(QNetworkRequest(url), requestFileName); }
+    void handleUnsupportedContent(QNetworkReply *reply, bool requestFileName = false);
+    void cleanup();
+
+private slots:
+    void save() const;
+    void updateRow();
+
+private:
+    void addItem(DownloadItem *item);
+    void updateItemCount();
+    void load();
+
+    AutoSaver *m_autoSaver;
+    DownloadModel *m_model;
+    QNetworkAccessManager *m_manager;
+    QFileIconProvider *m_iconProvider;
+    QList<DownloadItem*> m_downloads;
+    RemovePolicy m_removePolicy;
+    friend class DownloadModel;
+};
+
+class DownloadModel : public QAbstractListModel
+{
+    friend class DownloadManager;
+    Q_OBJECT
+
+public:
+    DownloadModel(DownloadManager *downloadManager, QObject *parent = 0);
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
+
+private:
+    DownloadManager *m_downloadManager;
+
+};
+
+#endif // DOWNLOADMANAGER_H
+
diff --git a/demos/browser/downloads.ui b/demos/browser/downloads.ui
new file mode 100644
index 0000000000..a2e256935b
--- /dev/null
+++ b/demos/browser/downloads.ui
@@ -0,0 +1,83 @@
+<ui version="4.0" >
+ <class>DownloadDialog</class>
+ <widget class="QDialog" name="DownloadDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>332</width>
+    <height>252</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Downloads</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" colspan="3" >
+    <widget class="EditTableView" name="downloadsView" />
+   </item>
+   <item row="1" column="0" >
+    <layout class="QHBoxLayout" name="horizontalLayout" >
+     <item>
+      <widget class="QPushButton" name="cleanupButton" >
+       <property name="enabled" >
+        <bool>false</bool>
+       </property>
+       <property name="text" >
+        <string>Clean up</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>58</width>
+         <height>24</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QLabel" name="itemCount" >
+     <property name="text" >
+      <string>0 Items</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2" >
+    <spacer name="horizontalSpacer" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>148</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>EditTableView</class>
+   <extends>QTableView</extends>
+   <header>edittableview.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/demos/browser/edittableview.cpp b/demos/browser/edittableview.cpp
new file mode 100644
index 0000000000..0d776a760a
--- /dev/null
+++ b/demos/browser/edittableview.cpp
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "edittableview.h"
+#include <QtGui/QKeyEvent>
+
+EditTableView::EditTableView(QWidget *parent)
+    : QTableView(parent)
+{
+}
+
+void EditTableView::keyPressEvent(QKeyEvent *event)
+{
+    if ((event->key() == Qt::Key_Delete
+        || event->key() == Qt::Key_Backspace)
+        && model()) {
+        removeOne();
+    } else {
+        QAbstractItemView::keyPressEvent(event);
+    }
+}
+
+void EditTableView::removeOne()
+{
+    if (!model() || !selectionModel())
+        return;
+    int row = currentIndex().row();
+    model()->removeRow(row, rootIndex());
+    QModelIndex idx = model()->index(row, 0, rootIndex());
+    if (!idx.isValid())
+        idx = model()->index(row - 1, 0, rootIndex());
+    selectionModel()->select(idx, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
+}
+
+void EditTableView::removeAll()
+{
+    if (model())
+        model()->removeRows(0, model()->rowCount(rootIndex()), rootIndex());
+}
+
diff --git a/demos/browser/edittableview.h b/demos/browser/edittableview.h
new file mode 100644
index 0000000000..3ae63e0b44
--- /dev/null
+++ b/demos/browser/edittableview.h
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef EDITTABLEVIEW_H
+#define EDITTABLEVIEW_H
+
+#include <QtGui/QTableView>
+
+class EditTableView : public QTableView
+{
+    Q_OBJECT
+
+public:
+    EditTableView(QWidget *parent = 0);
+    void keyPressEvent(QKeyEvent *event);
+
+public slots:
+    void removeOne();
+    void removeAll();
+};
+
+#endif // EDITTABLEVIEW_H
+
diff --git a/demos/browser/edittreeview.cpp b/demos/browser/edittreeview.cpp
new file mode 100644
index 0000000000..0331ba7e86
--- /dev/null
+++ b/demos/browser/edittreeview.cpp
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "edittreeview.h"
+
+#include <QtGui/QKeyEvent>
+
+EditTreeView::EditTreeView(QWidget *parent)
+    : QTreeView(parent)
+{
+}
+
+void EditTreeView::keyPressEvent(QKeyEvent *event)
+{
+    if ((event->key() == Qt::Key_Delete
+        || event->key() == Qt::Key_Backspace)
+        && model()) {
+        removeOne();
+    } else {
+        QAbstractItemView::keyPressEvent(event);
+    }
+}
+
+void EditTreeView::removeOne()
+{
+    if (!model())
+        return;
+    QModelIndex ci = currentIndex();
+    int row = ci.row();
+    model()->removeRow(row, ci.parent());
+}
+
+void EditTreeView::removeAll()
+{
+    if (!model())
+        return;
+    model()->removeRows(0, model()->rowCount(rootIndex()), rootIndex());
+}
+
diff --git a/demos/browser/edittreeview.h b/demos/browser/edittreeview.h
new file mode 100644
index 0000000000..97b9804fe3
--- /dev/null
+++ b/demos/browser/edittreeview.h
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef EDITTREEVIEW_H
+#define EDITTREEVIEW_H
+
+#include <QtGui/QTreeView>
+
+class EditTreeView : public QTreeView
+{
+    Q_OBJECT
+
+public:
+    EditTreeView(QWidget *parent = 0);
+    void keyPressEvent(QKeyEvent *event);
+
+public slots:
+    void removeOne();
+    void removeAll();
+};
+
+#endif // EDITTREEVIEW_H
+
diff --git a/demos/browser/history.cpp b/demos/browser/history.cpp
new file mode 100644
index 0000000000..80e7372e7c
--- /dev/null
+++ b/demos/browser/history.cpp
@@ -0,0 +1,1282 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "history.h"
+
+#include "autosaver.h"
+#include "browserapplication.h"
+
+#include <QtCore/QBuffer>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QSettings>
+#include <QtCore/QTemporaryFile>
+#include <QtCore/QTextStream>
+
+#include <QtCore/QtAlgorithms>
+
+#include <QtGui/QClipboard>
+#include <QtGui/QDesktopServices>
+#include <QtGui/QHeaderView>
+#include <QtGui/QStyle>
+
+#include <QtWebKit/QWebHistoryInterface>
+#include <QtWebKit/QWebSettings>
+
+#include <QtCore/QDebug>
+
+static const unsigned int HISTORY_VERSION = 23;
+
+HistoryManager::HistoryManager(QObject *parent)
+    : QWebHistoryInterface(parent)
+    , m_saveTimer(new AutoSaver(this))
+    , m_historyLimit(30)
+    , m_historyModel(0)
+    , m_historyFilterModel(0)
+    , m_historyTreeModel(0)
+{
+    m_expiredTimer.setSingleShot(true);
+    connect(&m_expiredTimer, SIGNAL(timeout()),
+            this, SLOT(checkForExpired()));
+    connect(this, SIGNAL(entryAdded(const HistoryItem &)),
+            m_saveTimer, SLOT(changeOccurred()));
+    connect(this, SIGNAL(entryRemoved(const HistoryItem &)),
+            m_saveTimer, SLOT(changeOccurred()));
+    load();
+
+    m_historyModel = new HistoryModel(this, this);
+    m_historyFilterModel = new HistoryFilterModel(m_historyModel, this);
+    m_historyTreeModel = new HistoryTreeModel(m_historyFilterModel, this);
+
+    // QWebHistoryInterface will delete the history manager
+    QWebHistoryInterface::setDefaultInterface(this);
+}
+
+HistoryManager::~HistoryManager()
+{
+    m_saveTimer->saveIfNeccessary();
+}
+
+QList<HistoryItem> HistoryManager::history() const
+{
+    return m_history;
+}
+
+bool HistoryManager::historyContains(const QString &url) const
+{
+    return m_historyFilterModel->historyContains(url);
+}
+
+void HistoryManager::addHistoryEntry(const QString &url)
+{
+    QUrl cleanUrl(url);
+    cleanUrl.setPassword(QString());
+    cleanUrl.setHost(cleanUrl.host().toLower());
+    HistoryItem item(cleanUrl.toString(), QDateTime::currentDateTime());
+    addHistoryItem(item);
+}
+
+void HistoryManager::setHistory(const QList<HistoryItem> &history, bool loadedAndSorted)
+{
+    m_history = history;
+
+    // verify that it is sorted by date
+    if (!loadedAndSorted)
+        qSort(m_history.begin(), m_history.end());
+
+    checkForExpired();
+
+    if (loadedAndSorted) {
+        m_lastSavedUrl = m_history.value(0).url;
+    } else {
+        m_lastSavedUrl = QString();
+        m_saveTimer->changeOccurred();
+    }
+    emit historyReset();
+}
+
+HistoryModel *HistoryManager::historyModel() const
+{
+    return m_historyModel;
+}
+
+HistoryFilterModel *HistoryManager::historyFilterModel() const
+{
+    return m_historyFilterModel;
+}
+
+HistoryTreeModel *HistoryManager::historyTreeModel() const
+{
+    return m_historyTreeModel;
+}
+
+void HistoryManager::checkForExpired()
+{
+    if (m_historyLimit < 0 || m_history.isEmpty())
+        return;
+
+    QDateTime now = QDateTime::currentDateTime();
+    int nextTimeout = 0;
+
+    while (!m_history.isEmpty()) {
+        QDateTime checkForExpired = m_history.last().dateTime;
+        checkForExpired.setDate(checkForExpired.date().addDays(m_historyLimit));
+        if (now.daysTo(checkForExpired) > 7) {
+            // check at most in a week to prevent int overflows on the timer
+            nextTimeout = 7 * 86400;
+        } else {
+            nextTimeout = now.secsTo(checkForExpired);
+        }
+        if (nextTimeout > 0)
+            break;
+        HistoryItem item = m_history.takeLast();
+        // remove from saved file also
+        m_lastSavedUrl = QString();
+        emit entryRemoved(item);
+    }
+
+    if (nextTimeout > 0)
+        m_expiredTimer.start(nextTimeout * 1000);
+}
+
+void HistoryManager::addHistoryItem(const HistoryItem &item)
+{
+    QWebSettings *globalSettings = QWebSettings::globalSettings();
+    if (globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
+        return;
+
+    m_history.prepend(item);
+    emit entryAdded(item);
+    if (m_history.count() == 1)
+        checkForExpired();
+}
+
+void HistoryManager::updateHistoryItem(const QUrl &url, const QString &title)
+{
+    for (int i = 0; i < m_history.count(); ++i) {
+        if (url == m_history.at(i).url) {
+            m_history[i].title = title;
+            m_saveTimer->changeOccurred();
+            if (m_lastSavedUrl.isEmpty())
+                m_lastSavedUrl = m_history.at(i).url;
+            emit entryUpdated(i);
+            break;
+        }
+    }
+}
+
+int HistoryManager::historyLimit() const
+{
+    return m_historyLimit;
+}
+
+void HistoryManager::setHistoryLimit(int limit)
+{
+    if (m_historyLimit == limit)
+        return;
+    m_historyLimit = limit;
+    checkForExpired();
+    m_saveTimer->changeOccurred();
+}
+
+void HistoryManager::clear()
+{
+    m_history.clear();
+    m_lastSavedUrl = QString();
+    m_saveTimer->changeOccurred();
+    m_saveTimer->saveIfNeccessary();
+    historyReset();
+}
+
+void HistoryManager::loadSettings()
+{
+    // load settings
+    QSettings settings;
+    settings.beginGroup(QLatin1String("history"));
+    m_historyLimit = settings.value(QLatin1String("historyLimit"), 30).toInt();
+}
+
+void HistoryManager::load()
+{
+    loadSettings();
+
+    QFile historyFile(QDesktopServices::storageLocation(QDesktopServices::DataLocation)
+        + QLatin1String("/history"));
+    if (!historyFile.exists())
+        return;
+    if (!historyFile.open(QFile::ReadOnly)) {
+        qWarning() << "Unable to open history file" << historyFile.fileName();
+        return;
+    }
+
+    QList<HistoryItem> list;
+    QDataStream in(&historyFile);
+    // Double check that the history file is sorted as it is read in
+    bool needToSort = false;
+    HistoryItem lastInsertedItem;
+    QByteArray data;
+    QDataStream stream;
+    QBuffer buffer;
+    stream.setDevice(&buffer);
+    while (!historyFile.atEnd()) {
+        in >> data;
+        buffer.close();
+        buffer.setBuffer(&data);
+        buffer.open(QIODevice::ReadOnly);
+        quint32 ver;
+        stream >> ver;
+        if (ver != HISTORY_VERSION)
+            continue;
+        HistoryItem item;
+        stream >> item.url;
+        stream >> item.dateTime;
+        stream >> item.title;
+
+        if (!item.dateTime.isValid())
+            continue;
+
+        if (item == lastInsertedItem) {
+            if (lastInsertedItem.title.isEmpty() && !list.isEmpty())
+                list[0].title = item.title;
+            continue;
+        }
+
+        if (!needToSort && !list.isEmpty() && lastInsertedItem < item)
+            needToSort = true;
+
+        list.prepend(item);
+        lastInsertedItem = item;
+    }
+    if (needToSort)
+        qSort(list.begin(), list.end());
+
+    setHistory(list, true);
+
+    // If we had to sort re-write the whole history sorted
+    if (needToSort) {
+        m_lastSavedUrl = QString();
+        m_saveTimer->changeOccurred();
+    }
+}
+
+void HistoryManager::save()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("history"));
+    settings.setValue(QLatin1String("historyLimit"), m_historyLimit);
+
+    bool saveAll = m_lastSavedUrl.isEmpty();
+    int first = m_history.count() - 1;
+    if (!saveAll) {
+        // find the first one to save
+        for (int i = 0; i < m_history.count(); ++i) {
+            if (m_history.at(i).url == m_lastSavedUrl) {
+                first = i - 1;
+                break;
+            }
+        }
+    }
+    if (first == m_history.count() - 1)
+        saveAll = true;
+
+    QString directory = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+    if (directory.isEmpty())
+        directory = QDir::homePath() + QLatin1String("/.") + QCoreApplication::applicationName();
+    if (!QFile::exists(directory)) {
+        QDir dir;
+        dir.mkpath(directory);
+    }
+
+    QFile historyFile(directory + QLatin1String("/history"));
+    // When saving everything use a temporary file to prevent possible data loss.
+    QTemporaryFile tempFile;
+    tempFile.setAutoRemove(false);
+    bool open = false;
+    if (saveAll) {
+        open = tempFile.open();
+    } else {
+        open = historyFile.open(QFile::Append);
+    }
+
+    if (!open) {
+        qWarning() << "Unable to open history file for saving"
+                   << (saveAll ? tempFile.fileName() : historyFile.fileName());
+        return;
+    }
+
+    QDataStream out(saveAll ? &tempFile : &historyFile);
+    for (int i = first; i >= 0; --i) {
+        QByteArray data;
+        QDataStream stream(&data, QIODevice::WriteOnly);
+        HistoryItem item = m_history.at(i);
+        stream << HISTORY_VERSION << item.url << item.dateTime << item.title;
+        out << data;
+    }
+    tempFile.close();
+
+    if (saveAll) {
+        if (historyFile.exists() && !historyFile.remove())
+            qWarning() << "History: error removing old history." << historyFile.errorString();
+        if (!tempFile.rename(historyFile.fileName()))
+            qWarning() << "History: error moving new history over old." << tempFile.errorString() << historyFile.fileName();
+    }
+    m_lastSavedUrl = m_history.value(0).url;
+}
+
+HistoryModel::HistoryModel(HistoryManager *history, QObject *parent)
+    : QAbstractTableModel(parent)
+    , m_history(history)
+{
+    Q_ASSERT(m_history);
+    connect(m_history, SIGNAL(historyReset()),
+            this, SLOT(historyReset()));
+    connect(m_history, SIGNAL(entryRemoved(const HistoryItem &)),
+            this, SLOT(historyReset()));
+
+    connect(m_history, SIGNAL(entryAdded(const HistoryItem &)),
+            this, SLOT(entryAdded()));
+    connect(m_history, SIGNAL(entryUpdated(int)),
+            this, SLOT(entryUpdated(int)));
+}
+
+void HistoryModel::historyReset()
+{
+    reset();
+}
+
+void HistoryModel::entryAdded()
+{
+    beginInsertRows(QModelIndex(), 0, 0);
+    endInsertRows();
+}
+
+void HistoryModel::entryUpdated(int offset)
+{
+    QModelIndex idx = index(offset, 0);
+    emit dataChanged(idx, idx);
+}
+
+QVariant HistoryModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    if (orientation == Qt::Horizontal
+        && role == Qt::DisplayRole) {
+        switch (section) {
+            case 0: return tr("Title");
+            case 1: return tr("Address");
+        }
+    }
+    return QAbstractTableModel::headerData(section, orientation, role);
+}
+
+QVariant HistoryModel::data(const QModelIndex &index, int role) const
+{
+    QList<HistoryItem> lst = m_history->history();
+    if (index.row() < 0 || index.row() >= lst.size())
+        return QVariant();
+
+    const HistoryItem &item = lst.at(index.row());
+    switch (role) {
+    case DateTimeRole:
+        return item.dateTime;
+    case DateRole:
+        return item.dateTime.date();
+    case UrlRole:
+        return QUrl(item.url);
+    case UrlStringRole:
+        return item.url;
+    case Qt::DisplayRole:
+    case Qt::EditRole: {
+        switch (index.column()) {
+            case 0:
+                // when there is no title try to generate one from the url
+                if (item.title.isEmpty()) {
+                    QString page = QFileInfo(QUrl(item.url).path()).fileName();
+                    if (!page.isEmpty())
+                        return page;
+                    return item.url;
+                }
+                return item.title;
+            case 1:
+                return item.url;
+        }
+        }
+    case Qt::DecorationRole:
+        if (index.column() == 0) {
+            return BrowserApplication::instance()->icon(item.url);
+        }
+    }
+    return QVariant();
+}
+
+int HistoryModel::columnCount(const QModelIndex &parent) const
+{
+    return (parent.isValid()) ? 0 : 2;
+}
+
+int HistoryModel::rowCount(const QModelIndex &parent) const
+{
+    return (parent.isValid()) ? 0 : m_history->history().count();
+}
+
+bool HistoryModel::removeRows(int row, int count, const QModelIndex &parent)
+{
+    if (parent.isValid())
+        return false;
+    int lastRow = row + count - 1;
+    beginRemoveRows(parent, row, lastRow);
+    QList<HistoryItem> lst = m_history->history();
+    for (int i = lastRow; i >= row; --i)
+        lst.removeAt(i);
+    disconnect(m_history, SIGNAL(historyReset()), this, SLOT(historyReset()));
+    m_history->setHistory(lst);
+    connect(m_history, SIGNAL(historyReset()), this, SLOT(historyReset()));
+    endRemoveRows();
+    return true;
+}
+
+#define MOVEDROWS 15
+
+/*
+    Maps the first bunch of items of the source model to the root
+*/
+HistoryMenuModel::HistoryMenuModel(HistoryTreeModel *sourceModel, QObject *parent)
+    : QAbstractProxyModel(parent)
+    , m_treeModel(sourceModel)
+{
+    setSourceModel(sourceModel);
+}
+
+int HistoryMenuModel::bumpedRows() const
+{
+    QModelIndex first = m_treeModel->index(0, 0);
+    if (!first.isValid())
+        return 0;
+    return qMin(m_treeModel->rowCount(first), MOVEDROWS);
+}
+
+int HistoryMenuModel::columnCount(const QModelIndex &parent) const
+{
+    return m_treeModel->columnCount(mapToSource(parent));
+}
+
+int HistoryMenuModel::rowCount(const QModelIndex &parent) const
+{
+    if (parent.column() > 0)
+        return 0;
+
+    if (!parent.isValid()) {
+        int folders = sourceModel()->rowCount();
+        int bumpedItems = bumpedRows();
+        if (bumpedItems <= MOVEDROWS
+            && bumpedItems == sourceModel()->rowCount(sourceModel()->index(0, 0)))
+            --folders;
+        return bumpedItems + folders;
+    }
+
+    if (parent.internalId() == -1) {
+        if (parent.row() < bumpedRows())
+            return 0;
+    }
+
+    QModelIndex idx = mapToSource(parent);
+    int defaultCount = sourceModel()->rowCount(idx);
+    if (idx == sourceModel()->index(0, 0))
+        return defaultCount - bumpedRows();
+    return defaultCount;
+}
+
+QModelIndex HistoryMenuModel::mapFromSource(const QModelIndex &sourceIndex) const
+{
+    // currently not used or autotested
+    Q_ASSERT(false);
+    int sr = m_treeModel->mapToSource(sourceIndex).row();
+    return createIndex(sourceIndex.row(), sourceIndex.column(), sr);
+}
+
+QModelIndex HistoryMenuModel::mapToSource(const QModelIndex &proxyIndex) const
+{
+    if (!proxyIndex.isValid())
+        return QModelIndex();
+
+    if (proxyIndex.internalId() == -1) {
+        int bumpedItems = bumpedRows();
+        if (proxyIndex.row() < bumpedItems)
+            return m_treeModel->index(proxyIndex.row(), proxyIndex.column(), m_treeModel->index(0, 0));
+        if (bumpedItems <= MOVEDROWS && bumpedItems == sourceModel()->rowCount(m_treeModel->index(0, 0)))
+            --bumpedItems;
+        return m_treeModel->index(proxyIndex.row() - bumpedItems, proxyIndex.column());
+    }
+
+    QModelIndex historyIndex = m_treeModel->sourceModel()->index(proxyIndex.internalId(), proxyIndex.column());
+    QModelIndex treeIndex = m_treeModel->mapFromSource(historyIndex);
+    return treeIndex;
+}
+
+QModelIndex HistoryMenuModel::index(int row, int column, const QModelIndex &parent) const
+{
+    if (row < 0
+        || column < 0 || column >= columnCount(parent)
+        || parent.column() > 0)
+        return QModelIndex();
+    if (!parent.isValid())
+        return createIndex(row, column, -1);
+
+    QModelIndex treeIndexParent = mapToSource(parent);
+
+    int bumpedItems = 0;
+    if (treeIndexParent == m_treeModel->index(0, 0))
+        bumpedItems = bumpedRows();
+    QModelIndex treeIndex = m_treeModel->index(row + bumpedItems, column, treeIndexParent);
+    QModelIndex historyIndex = m_treeModel->mapToSource(treeIndex);
+    int historyRow = historyIndex.row();
+    if (historyRow == -1)
+        historyRow = treeIndex.row();
+    return createIndex(row, column, historyRow);
+}
+
+QModelIndex HistoryMenuModel::parent(const QModelIndex &index) const
+{
+    int offset = index.internalId();
+    if (offset == -1 || !index.isValid())
+        return QModelIndex();
+
+    QModelIndex historyIndex = m_treeModel->sourceModel()->index(index.internalId(), 0);
+    QModelIndex treeIndex = m_treeModel->mapFromSource(historyIndex);
+    QModelIndex treeIndexParent = treeIndex.parent();
+
+    int sr = m_treeModel->mapToSource(treeIndexParent).row();
+    int bumpedItems = bumpedRows();
+    if (bumpedItems <= MOVEDROWS && bumpedItems == sourceModel()->rowCount(sourceModel()->index(0, 0)))
+        --bumpedItems;
+    return createIndex(bumpedItems + treeIndexParent.row(), treeIndexParent.column(), sr);
+}
+
+
+HistoryMenu::HistoryMenu(QWidget *parent)
+    : ModelMenu(parent)
+    , m_history(0)
+{
+    connect(this, SIGNAL(activated(const QModelIndex &)),
+            this, SLOT(activated(const QModelIndex &)));
+    setHoverRole(HistoryModel::UrlStringRole);
+}
+
+void HistoryMenu::activated(const QModelIndex &index)
+{
+    emit openUrl(index.data(HistoryModel::UrlRole).toUrl());
+}
+
+bool HistoryMenu::prePopulated()
+{
+    if (!m_history) {
+        m_history = BrowserApplication::historyManager();
+        m_historyMenuModel = new HistoryMenuModel(m_history->historyTreeModel(), this);
+        setModel(m_historyMenuModel);
+    }
+    // initial actions
+    for (int i = 0; i < m_initialActions.count(); ++i)
+        addAction(m_initialActions.at(i));
+    if (!m_initialActions.isEmpty())
+        addSeparator();
+    setFirstSeparator(m_historyMenuModel->bumpedRows());
+
+    return false;
+}
+
+void HistoryMenu::postPopulated()
+{
+    if (m_history->history().count() > 0)
+        addSeparator();
+
+    QAction *showAllAction = new QAction(tr("Show All History"), this);
+    connect(showAllAction, SIGNAL(triggered()), this, SLOT(showHistoryDialog()));
+    addAction(showAllAction);
+
+    QAction *clearAction = new QAction(tr("Clear History"), this);
+    connect(clearAction, SIGNAL(triggered()), m_history, SLOT(clear()));
+    addAction(clearAction);
+}
+
+void HistoryMenu::showHistoryDialog()
+{
+    HistoryDialog *dialog = new HistoryDialog(this);
+    connect(dialog, SIGNAL(openUrl(const QUrl&)),
+            this, SIGNAL(openUrl(const QUrl&)));
+    dialog->show();
+}
+
+void HistoryMenu::setInitialActions(QList<QAction*> actions)
+{
+    m_initialActions = actions;
+    for (int i = 0; i < m_initialActions.count(); ++i)
+        addAction(m_initialActions.at(i));
+}
+
+TreeProxyModel::TreeProxyModel(QObject *parent) : QSortFilterProxyModel(parent)
+{
+    setSortRole(HistoryModel::DateTimeRole);
+    setFilterCaseSensitivity(Qt::CaseInsensitive);
+}
+
+bool TreeProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
+{
+    if (!source_parent.isValid())
+        return true;
+    return QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent);
+}
+
+HistoryDialog::HistoryDialog(QWidget *parent, HistoryManager *setHistory) : QDialog(parent)
+{
+    HistoryManager *history = setHistory;
+    if (!history)
+        history = BrowserApplication::historyManager();
+    setupUi(this);
+    tree->setUniformRowHeights(true);
+    tree->setSelectionBehavior(QAbstractItemView::SelectRows);
+    tree->setTextElideMode(Qt::ElideMiddle);
+    QAbstractItemModel *model = history->historyTreeModel();
+    TreeProxyModel *proxyModel = new TreeProxyModel(this);
+    connect(search, SIGNAL(textChanged(QString)),
+            proxyModel, SLOT(setFilterFixedString(QString)));
+    connect(removeButton, SIGNAL(clicked()), tree, SLOT(removeOne()));
+    connect(removeAllButton, SIGNAL(clicked()), history, SLOT(clear()));
+    proxyModel->setSourceModel(model);
+    tree->setModel(proxyModel);
+    tree->setExpanded(proxyModel->index(0, 0), true);
+    tree->setAlternatingRowColors(true);
+    QFontMetrics fm(font());
+    int header = fm.width(QLatin1Char('m')) * 40;
+    tree->header()->resizeSection(0, header);
+    tree->header()->setStretchLastSection(true);
+    connect(tree, SIGNAL(activated(const QModelIndex&)),
+            this, SLOT(open()));
+    tree->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(tree, SIGNAL(customContextMenuRequested(const QPoint &)),
+            this, SLOT(customContextMenuRequested(const QPoint &)));
+}
+
+void HistoryDialog::customContextMenuRequested(const QPoint &pos)
+{
+    QMenu menu;
+    QModelIndex index = tree->indexAt(pos);
+    index = index.sibling(index.row(), 0);
+    if (index.isValid() && !tree->model()->hasChildren(index)) {
+        menu.addAction(tr("Open"), this, SLOT(open()));
+        menu.addSeparator();
+        menu.addAction(tr("Copy"), this, SLOT(copy()));
+    }
+    menu.addAction(tr("Delete"), tree, SLOT(removeOne()));
+    menu.exec(QCursor::pos());
+}
+
+void HistoryDialog::open()
+{
+    QModelIndex index = tree->currentIndex();
+    if (!index.parent().isValid())
+        return;
+    emit openUrl(index.data(HistoryModel::UrlRole).toUrl());
+}
+
+void HistoryDialog::copy()
+{
+    QModelIndex index = tree->currentIndex();
+    if (!index.parent().isValid())
+        return;
+    QString url = index.data(HistoryModel::UrlStringRole).toString();
+
+    QClipboard *clipboard = QApplication::clipboard();
+    clipboard->setText(url);
+}
+
+HistoryFilterModel::HistoryFilterModel(QAbstractItemModel *sourceModel, QObject *parent)
+    : QAbstractProxyModel(parent),
+    m_loaded(false)
+{
+    setSourceModel(sourceModel);
+}
+
+int HistoryFilterModel::historyLocation(const QString &url) const
+{
+    load();
+    if (!m_historyHash.contains(url))
+        return 0;
+    return sourceModel()->rowCount() - m_historyHash.value(url);
+}
+
+QVariant HistoryFilterModel::data(const QModelIndex &index, int role) const
+{
+    return QAbstractProxyModel::data(index, role);
+}
+
+void HistoryFilterModel::setSourceModel(QAbstractItemModel *newSourceModel)
+{
+    if (sourceModel()) {
+        disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
+        disconnect(sourceModel(), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
+                   this, SLOT(dataChanged(const QModelIndex &, const QModelIndex &)));
+        disconnect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+                this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
+        disconnect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+                this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
+    }
+
+    QAbstractProxyModel::setSourceModel(newSourceModel);
+
+    if (sourceModel()) {
+        m_loaded = false;
+        connect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
+        connect(sourceModel(), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
+                   this, SLOT(sourceDataChanged(const QModelIndex &, const QModelIndex &)));
+        connect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+                this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
+        connect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+                this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
+    }
+}
+
+void HistoryFilterModel::sourceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
+{
+    emit dataChanged(mapFromSource(topLeft), mapFromSource(bottomRight));
+}
+
+QVariant HistoryFilterModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    return sourceModel()->headerData(section, orientation, role);
+}
+
+void HistoryFilterModel::sourceReset()
+{
+    m_loaded = false;
+    reset();
+}
+
+int HistoryFilterModel::rowCount(const QModelIndex &parent) const
+{
+    load();
+    if (parent.isValid())
+        return 0;
+    return m_historyHash.count();
+}
+
+int HistoryFilterModel::columnCount(const QModelIndex &parent) const
+{
+    return (parent.isValid()) ? 0 : 2;
+}
+
+QModelIndex HistoryFilterModel::mapToSource(const QModelIndex &proxyIndex) const
+{
+    load();
+    int sourceRow = sourceModel()->rowCount() - proxyIndex.internalId();
+    return sourceModel()->index(sourceRow, proxyIndex.column());
+}
+
+QModelIndex HistoryFilterModel::mapFromSource(const QModelIndex &sourceIndex) const
+{
+    load();
+    QString url = sourceIndex.data(HistoryModel::UrlStringRole).toString();
+    if (!m_historyHash.contains(url))
+        return QModelIndex();
+
+    // This can be done in a binary search, but we can't use qBinary find
+    // because it can't take: qBinaryFind(m_sourceRow.end(), m_sourceRow.begin(), v);
+    // so if this is a performance bottlneck then convert to binary search, until then
+    // the cleaner/easier to read code wins the day.
+    int realRow = -1;
+    int sourceModelRow = sourceModel()->rowCount() - sourceIndex.row();
+
+    for (int i = 0; i < m_sourceRow.count(); ++i) {
+        if (m_sourceRow.at(i) == sourceModelRow) {
+            realRow = i;
+            break;
+        }
+    }
+    if (realRow == -1)
+        return QModelIndex();
+
+    return createIndex(realRow, sourceIndex.column(), sourceModel()->rowCount() - sourceIndex.row());
+}
+
+QModelIndex HistoryFilterModel::index(int row, int column, const QModelIndex &parent) const
+{
+    load();
+    if (row < 0 || row >= rowCount(parent)
+        || column < 0 || column >= columnCount(parent))
+        return QModelIndex();
+
+    return createIndex(row, column, m_sourceRow[row]);
+}
+
+QModelIndex HistoryFilterModel::parent(const QModelIndex &) const
+{
+    return QModelIndex();
+}
+
+void HistoryFilterModel::load() const
+{
+    if (m_loaded)
+        return;
+    m_sourceRow.clear();
+    m_historyHash.clear();
+    m_historyHash.reserve(sourceModel()->rowCount());
+    for (int i = 0; i < sourceModel()->rowCount(); ++i) {
+        QModelIndex idx = sourceModel()->index(i, 0);
+        QString url = idx.data(HistoryModel::UrlStringRole).toString();
+        if (!m_historyHash.contains(url)) {
+            m_sourceRow.append(sourceModel()->rowCount() - i);
+            m_historyHash[url] = sourceModel()->rowCount() - i;
+        }
+    }
+    m_loaded = true;
+}
+
+void HistoryFilterModel::sourceRowsInserted(const QModelIndex &parent, int start, int end)
+{
+    Q_ASSERT(start == end && start == 0);
+    Q_UNUSED(end);
+    if (!m_loaded)
+        return;
+    QModelIndex idx = sourceModel()->index(start, 0, parent);
+    QString url = idx.data(HistoryModel::UrlStringRole).toString();
+    if (m_historyHash.contains(url)) {
+        int sourceRow = sourceModel()->rowCount() - m_historyHash[url];
+        int realRow = mapFromSource(sourceModel()->index(sourceRow, 0)).row();
+        beginRemoveRows(QModelIndex(), realRow, realRow);
+        m_sourceRow.removeAt(realRow);
+        m_historyHash.remove(url);
+        endRemoveRows();
+    }
+    beginInsertRows(QModelIndex(), 0, 0);
+    m_historyHash.insert(url, sourceModel()->rowCount() - start);
+    m_sourceRow.insert(0, sourceModel()->rowCount());
+    endInsertRows();
+}
+
+void HistoryFilterModel::sourceRowsRemoved(const QModelIndex &, int start, int end)
+{
+    Q_UNUSED(start);
+    Q_UNUSED(end);
+    sourceReset();
+}
+
+/*
+    Removing a continuous block of rows will remove filtered rows too as this is
+    the users intention.
+*/
+bool HistoryFilterModel::removeRows(int row, int count, const QModelIndex &parent)
+{
+    if (row < 0 || count <= 0 || row + count > rowCount(parent) || parent.isValid())
+        return false;
+    int lastRow = row + count - 1;
+    disconnect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+                this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
+    beginRemoveRows(parent, row, lastRow);
+    int oldCount = rowCount();
+    int start = sourceModel()->rowCount() - m_sourceRow.value(row);
+    int end = sourceModel()->rowCount() - m_sourceRow.value(lastRow);
+    sourceModel()->removeRows(start, end - start + 1);
+    endRemoveRows();
+    connect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+                this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
+    m_loaded = false;
+    if (oldCount - count != rowCount())
+        reset();
+    return true;
+}
+
+HistoryCompletionModel::HistoryCompletionModel(QObject *parent)
+    : QAbstractProxyModel(parent)
+{
+}
+
+QVariant HistoryCompletionModel::data(const QModelIndex &index, int role) const
+{
+    if (sourceModel()
+        && (role == Qt::EditRole || role == Qt::DisplayRole)
+        && index.isValid()) {
+        QModelIndex idx = mapToSource(index);
+        idx = idx.sibling(idx.row(), 1);
+        QString urlString = idx.data(HistoryModel::UrlStringRole).toString();
+        if (index.row() % 2) {
+            QUrl url = urlString;
+            QString s = url.toString(QUrl::RemoveScheme
+                                     | QUrl::RemoveUserInfo
+                                     | QUrl::StripTrailingSlash);
+            return s.mid(2);  // strip // from the front
+        }
+        return urlString;
+    }
+    return QAbstractProxyModel::data(index, role);
+}
+
+int HistoryCompletionModel::rowCount(const QModelIndex &parent) const
+{
+    return (parent.isValid() || !sourceModel()) ? 0 : sourceModel()->rowCount(parent) * 2;
+}
+
+int HistoryCompletionModel::columnCount(const QModelIndex &parent) const
+{
+    return (parent.isValid()) ? 0 : 1;
+}
+
+QModelIndex HistoryCompletionModel::mapFromSource(const QModelIndex &sourceIndex) const
+{
+    int row = sourceIndex.row() * 2;
+    return index(row, sourceIndex.column());
+}
+
+QModelIndex HistoryCompletionModel::mapToSource(const QModelIndex &proxyIndex) const
+{
+    if (!sourceModel())
+        return QModelIndex();
+    int row = proxyIndex.row() / 2;
+    return sourceModel()->index(row, proxyIndex.column());
+}
+
+QModelIndex HistoryCompletionModel::index(int row, int column, const QModelIndex &parent) const
+{
+    if (row < 0 || row >= rowCount(parent)
+        || column < 0 || column >= columnCount(parent))
+        return QModelIndex();
+    return createIndex(row, column, 0);
+}
+
+QModelIndex HistoryCompletionModel::parent(const QModelIndex &) const
+{
+    return QModelIndex();
+}
+
+void HistoryCompletionModel::setSourceModel(QAbstractItemModel *newSourceModel)
+{
+    if (sourceModel()) {
+        disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
+        disconnect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+                this, SLOT(sourceReset()));
+        disconnect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+                this, SLOT(sourceReset()));
+    }
+
+    QAbstractProxyModel::setSourceModel(newSourceModel);
+
+    if (newSourceModel) {
+        connect(newSourceModel, SIGNAL(modelReset()), this, SLOT(sourceReset()));
+        connect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+                this, SLOT(sourceReset()));
+        connect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+                this, SLOT(sourceReset()));
+    }
+
+    reset();
+}
+
+void HistoryCompletionModel::sourceReset()
+{
+    reset();
+}
+
+HistoryTreeModel::HistoryTreeModel(QAbstractItemModel *sourceModel, QObject *parent)
+    : QAbstractProxyModel(parent)
+{
+    setSourceModel(sourceModel);
+}
+
+QVariant HistoryTreeModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    return sourceModel()->headerData(section, orientation, role);
+}
+
+QVariant HistoryTreeModel::data(const QModelIndex &index, int role) const
+{
+    if ((role == Qt::EditRole || role == Qt::DisplayRole)) {
+        int start = index.internalId();
+        if (start == 0) {
+            int offset = sourceDateRow(index.row());
+            if (index.column() == 0) {
+                QModelIndex idx = sourceModel()->index(offset, 0);
+                QDate date = idx.data(HistoryModel::DateRole).toDate();
+                if (date == QDate::currentDate())
+                    return tr("Earlier Today");
+                return date.toString(QLatin1String("dddd, MMMM d, yyyy"));
+            }
+            if (index.column() == 1) {
+                return tr("%1 items").arg(rowCount(index.sibling(index.row(), 0)));
+            }
+        }
+    }
+    if (role == Qt::DecorationRole && index.column() == 0 && !index.parent().isValid())
+        return QIcon(QLatin1String(":history.png"));
+    if (role == HistoryModel::DateRole && index.column() == 0 && index.internalId() == 0) {
+        int offset = sourceDateRow(index.row());
+        QModelIndex idx = sourceModel()->index(offset, 0);
+        return idx.data(HistoryModel::DateRole);
+    }
+
+    return QAbstractProxyModel::data(index, role);
+}
+
+int HistoryTreeModel::columnCount(const QModelIndex &parent) const
+{
+    return sourceModel()->columnCount(mapToSource(parent));
+}
+
+int HistoryTreeModel::rowCount(const QModelIndex &parent) const
+{
+    if ( parent.internalId() != 0
+        || parent.column() > 0
+        || !sourceModel())
+        return 0;
+
+    // row count OF dates
+    if (!parent.isValid()) {
+        if (!m_sourceRowCache.isEmpty())
+            return m_sourceRowCache.count();
+        QDate currentDate;
+        int rows = 0;
+        int totalRows = sourceModel()->rowCount();
+
+        for (int i = 0; i < totalRows; ++i) {
+            QDate rowDate = sourceModel()->index(i, 0).data(HistoryModel::DateRole).toDate();
+            if (rowDate != currentDate) {
+                m_sourceRowCache.append(i);
+                currentDate = rowDate;
+                ++rows;
+            }
+        }
+        Q_ASSERT(m_sourceRowCache.count() == rows);
+        return rows;
+    }
+
+    // row count FOR a date
+    int start = sourceDateRow(parent.row());
+    int end = sourceDateRow(parent.row() + 1);
+    return (end - start);
+}
+
+// Translate the top level date row into the offset where that date starts
+int HistoryTreeModel::sourceDateRow(int row) const
+{
+    if (row <= 0)
+        return 0;
+
+    if (m_sourceRowCache.isEmpty())
+        rowCount(QModelIndex());
+
+    if (row >= m_sourceRowCache.count()) {
+        if (!sourceModel())
+            return 0;
+        return sourceModel()->rowCount();
+    }
+    return m_sourceRowCache.at(row);
+}
+
+QModelIndex HistoryTreeModel::mapToSource(const QModelIndex &proxyIndex) const
+{
+    int offset = proxyIndex.internalId();
+    if (offset == 0)
+        return QModelIndex();
+    int startDateRow = sourceDateRow(offset - 1);
+    return sourceModel()->index(startDateRow + proxyIndex.row(), proxyIndex.column());
+}
+
+QModelIndex HistoryTreeModel::index(int row, int column, const QModelIndex &parent) const
+{
+    if (row < 0
+        || column < 0 || column >= columnCount(parent)
+        || parent.column() > 0)
+        return QModelIndex();
+
+    if (!parent.isValid())
+        return createIndex(row, column, 0);
+    return createIndex(row, column, parent.row() + 1);
+}
+
+QModelIndex HistoryTreeModel::parent(const QModelIndex &index) const
+{
+    int offset = index.internalId();
+    if (offset == 0 || !index.isValid())
+        return QModelIndex();
+    return createIndex(offset - 1, 0, 0);
+}
+
+bool HistoryTreeModel::hasChildren(const QModelIndex &parent) const
+{
+    QModelIndex grandparent = parent.parent();
+    if (!grandparent.isValid())
+        return true;
+    return false;
+}
+
+Qt::ItemFlags HistoryTreeModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return Qt::NoItemFlags;
+    return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDragEnabled;
+}
+
+bool HistoryTreeModel::removeRows(int row, int count, const QModelIndex &parent)
+{
+    if (row < 0 || count <= 0 || row + count > rowCount(parent))
+        return false;
+
+    if (parent.isValid()) {
+        // removing pages
+        int offset = sourceDateRow(parent.row());
+        return sourceModel()->removeRows(offset + row, count);
+    } else {
+        // removing whole dates
+        for (int i = row + count - 1; i >= row; --i) {
+            QModelIndex dateParent = index(i, 0);
+            int offset = sourceDateRow(dateParent.row());
+            if (!sourceModel()->removeRows(offset, rowCount(dateParent)))
+                return false;
+        }
+    }
+    return true;
+}
+
+void HistoryTreeModel::setSourceModel(QAbstractItemModel *newSourceModel)
+{
+    if (sourceModel()) {
+        disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
+        disconnect(sourceModel(), SIGNAL(layoutChanged()), this, SLOT(sourceReset()));
+        disconnect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+                this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
+        disconnect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+                this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
+    }
+
+    QAbstractProxyModel::setSourceModel(newSourceModel);
+
+    if (newSourceModel) {
+        connect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
+        connect(sourceModel(), SIGNAL(layoutChanged()), this, SLOT(sourceReset()));
+        connect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+                this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
+        connect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+                this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
+    }
+
+    reset();
+}
+
+void HistoryTreeModel::sourceReset()
+{
+    m_sourceRowCache.clear();
+    reset();
+}
+
+void HistoryTreeModel::sourceRowsInserted(const QModelIndex &parent, int start, int end)
+{
+    Q_UNUSED(parent); // Avoid warnings when compiling release
+    Q_ASSERT(!parent.isValid());
+    if (start != 0 || start != end) {
+        m_sourceRowCache.clear();
+        reset();
+        return;
+    }
+
+    m_sourceRowCache.clear();
+    QModelIndex treeIndex = mapFromSource(sourceModel()->index(start, 0));
+    QModelIndex treeParent = treeIndex.parent();
+    if (rowCount(treeParent) == 1) {
+        beginInsertRows(QModelIndex(), 0, 0);
+        endInsertRows();
+    } else {
+        beginInsertRows(treeParent, treeIndex.row(), treeIndex.row());
+        endInsertRows();
+    }
+}
+
+QModelIndex HistoryTreeModel::mapFromSource(const QModelIndex &sourceIndex) const
+{
+    if (!sourceIndex.isValid())
+        return QModelIndex();
+
+    if (m_sourceRowCache.isEmpty())
+        rowCount(QModelIndex());
+
+    QList<int>::iterator it;
+    it = qLowerBound(m_sourceRowCache.begin(), m_sourceRowCache.end(), sourceIndex.row());
+    if (*it != sourceIndex.row())
+        --it;
+    int dateRow = qMax(0, it - m_sourceRowCache.begin());
+    int row = sourceIndex.row() - m_sourceRowCache.at(dateRow);
+    return createIndex(row, sourceIndex.column(), dateRow + 1);
+}
+
+void HistoryTreeModel::sourceRowsRemoved(const QModelIndex &parent, int start, int end)
+{
+    Q_UNUSED(parent); // Avoid warnings when compiling release
+    Q_ASSERT(!parent.isValid());
+    if (m_sourceRowCache.isEmpty())
+        return;
+    for (int i = end; i >= start;) {
+        QList<int>::iterator it;
+        it = qLowerBound(m_sourceRowCache.begin(), m_sourceRowCache.end(), i);
+        // playing it safe
+        if (it == m_sourceRowCache.end()) {
+            m_sourceRowCache.clear();
+            reset();
+            return;
+        }
+
+        if (*it != i)
+            --it;
+        int row = qMax(0, it - m_sourceRowCache.begin());
+        int offset = m_sourceRowCache[row];
+        QModelIndex dateParent = index(row, 0);
+        // If we can remove all the rows in the date do that and skip over them
+        int rc = rowCount(dateParent);
+        if (i - rc + 1 == offset && start <= i - rc + 1) {
+            beginRemoveRows(QModelIndex(), row, row);
+            m_sourceRowCache.removeAt(row);
+            i -= rc + 1;
+        } else {
+            beginRemoveRows(dateParent, i - offset, i - offset);
+            ++row;
+            --i;
+        }
+        for (int j = row; j < m_sourceRowCache.count(); ++j)
+            --m_sourceRowCache[j];
+        endRemoveRows();
+    }
+}
+
diff --git a/demos/browser/history.h b/demos/browser/history.h
new file mode 100644
index 0000000000..4f4edcdd33
--- /dev/null
+++ b/demos/browser/history.h
@@ -0,0 +1,350 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef HISTORY_H
+#define HISTORY_H
+
+#include "modelmenu.h"
+
+#include <QtCore/QDateTime>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+#include <QtCore/QUrl>
+
+#include <QtGui/QSortFilterProxyModel>
+
+#include <QWebHistoryInterface>
+
+class HistoryItem
+{
+public:
+    HistoryItem() {}
+    HistoryItem(const QString &u,
+                const QDateTime &d = QDateTime(), const QString &t = QString())
+        : title(t), url(u), dateTime(d) {}
+
+    inline bool operator==(const HistoryItem &other) const
+        { return other.title == title
+          && other.url == url && other.dateTime == dateTime; }
+
+    // history is sorted in reverse
+    inline bool operator <(const HistoryItem &other) const
+        { return dateTime > other.dateTime; }
+
+    QString title;
+    QString url;
+    QDateTime dateTime;
+};
+
+class AutoSaver;
+class HistoryModel;
+class HistoryFilterModel;
+class HistoryTreeModel;
+class HistoryManager : public QWebHistoryInterface
+{
+    Q_OBJECT
+    Q_PROPERTY(int historyLimit READ historyLimit WRITE setHistoryLimit)
+
+signals:
+    void historyReset();
+    void entryAdded(const HistoryItem &item);
+    void entryRemoved(const HistoryItem &item);
+    void entryUpdated(int offset);
+
+public:
+    HistoryManager(QObject *parent = 0);
+    ~HistoryManager();
+
+    bool historyContains(const QString &url) const;
+    void addHistoryEntry(const QString &url);
+
+    void updateHistoryItem(const QUrl &url, const QString &title);
+
+    int historyLimit() const;
+    void setHistoryLimit(int limit);
+
+    QList<HistoryItem> history() const;
+    void setHistory(const QList<HistoryItem> &history, bool loadedAndSorted = false);
+
+    // History manager keeps around these models for use by the completer and other classes
+    HistoryModel *historyModel() const;
+    HistoryFilterModel *historyFilterModel() const;
+    HistoryTreeModel *historyTreeModel() const;
+
+public slots:
+    void clear();
+    void loadSettings();
+
+private slots:
+    void save();
+    void checkForExpired();
+
+protected:
+    void addHistoryItem(const HistoryItem &item);
+
+private:
+    void load();
+
+    AutoSaver *m_saveTimer;
+    int m_historyLimit;
+    QTimer m_expiredTimer;
+    QList<HistoryItem> m_history;
+    QString m_lastSavedUrl;
+
+    HistoryModel *m_historyModel;
+    HistoryFilterModel *m_historyFilterModel;
+    HistoryTreeModel *m_historyTreeModel;
+};
+
+class HistoryModel : public QAbstractTableModel
+{
+    Q_OBJECT
+
+public slots:
+    void historyReset();
+    void entryAdded();
+    void entryUpdated(int offset);
+
+public:
+    enum Roles {
+        DateRole = Qt::UserRole + 1,
+        DateTimeRole = Qt::UserRole + 2,
+        UrlRole = Qt::UserRole + 3,
+        UrlStringRole = Qt::UserRole + 4
+    };
+
+    HistoryModel(HistoryManager *history, QObject *parent = 0);
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
+
+private:
+    HistoryManager *m_history;
+};
+
+/*!
+    Proxy model that will remove any duplicate entries.
+    Both m_sourceRow and m_historyHash store their offsets not from
+    the front of the list, but as offsets from the back.
+  */
+class HistoryFilterModel : public QAbstractProxyModel
+{
+    Q_OBJECT
+
+public:
+    HistoryFilterModel(QAbstractItemModel *sourceModel, QObject *parent = 0);
+
+    inline bool historyContains(const QString &url) const
+        { load(); return m_historyHash.contains(url); }
+    int historyLocation(const QString &url) const;
+
+    QModelIndex mapFromSource(const QModelIndex &sourceIndex) const;
+    QModelIndex mapToSource(const QModelIndex &proxyIndex) const;
+    void setSourceModel(QAbstractItemModel *sourceModel);
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex index(int, int, const QModelIndex& = QModelIndex()) const;
+    QModelIndex parent(const QModelIndex& index= QModelIndex()) const;
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+
+private slots:
+    void sourceReset();
+    void sourceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+    void sourceRowsInserted(const QModelIndex &parent, int start, int end);
+    void sourceRowsRemoved(const QModelIndex &, int, int);
+
+private:
+    void load() const;
+
+    mutable QList<int> m_sourceRow;
+    mutable QHash<QString, int> m_historyHash;
+    mutable bool m_loaded;
+};
+
+/*
+    The history menu
+    - Removes the first twenty entries and puts them as children of the top level.
+    - If there are less then twenty entries then the first folder is also removed.
+
+    The mapping is done by knowing that HistoryTreeModel is over a table
+    We store that row offset in our index's private data.
+*/
+class HistoryMenuModel : public QAbstractProxyModel
+{
+    Q_OBJECT
+
+public:
+    HistoryMenuModel(HistoryTreeModel *sourceModel, QObject *parent = 0);
+    int columnCount(const QModelIndex &parent) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex mapFromSource(const QModelIndex & sourceIndex) const;
+    QModelIndex mapToSource(const QModelIndex & proxyIndex) const;
+    QModelIndex index(int, int, const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex parent(const QModelIndex &index = QModelIndex()) const;
+
+    int bumpedRows() const;
+
+private:
+    HistoryTreeModel *m_treeModel;
+};
+
+// Menu that is dynamically populated from the history
+class HistoryMenu : public ModelMenu
+{
+    Q_OBJECT
+
+signals:
+    void openUrl(const QUrl &url);
+
+public:
+     HistoryMenu(QWidget *parent = 0);
+     void setInitialActions(QList<QAction*> actions);
+
+protected:
+    bool prePopulated();
+    void postPopulated();
+
+private slots:
+    void activated(const QModelIndex &index);
+    void showHistoryDialog();
+
+private:
+    HistoryManager *m_history;
+    HistoryMenuModel *m_historyMenuModel;
+    QList<QAction*> m_initialActions;
+};
+
+// proxy model for the history model that
+// exposes each url http://www.foo.com and it url starting at the host www.foo.com
+class HistoryCompletionModel : public QAbstractProxyModel
+{
+    Q_OBJECT
+
+public:
+    HistoryCompletionModel(QObject *parent = 0);
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex mapFromSource(const QModelIndex &sourceIndex) const;
+    QModelIndex mapToSource(const QModelIndex &proxyIndex) const;
+    QModelIndex index(int, int, const QModelIndex& = QModelIndex()) const;
+    QModelIndex parent(const QModelIndex& index= QModelIndex()) const;
+    void setSourceModel(QAbstractItemModel *sourceModel);
+
+private slots:
+    void sourceReset();
+
+};
+
+// proxy model for the history model that converts the list
+// into a tree, one top level node per day.
+// Used in the HistoryDialog.
+class HistoryTreeModel : public QAbstractProxyModel
+{
+    Q_OBJECT
+
+public:
+    HistoryTreeModel(QAbstractItemModel *sourceModel, QObject *parent = 0);
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    int columnCount(const QModelIndex &parent) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex mapFromSource(const QModelIndex &sourceIndex) const;
+    QModelIndex mapToSource(const QModelIndex &proxyIndex) const;
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex parent(const QModelIndex &index= QModelIndex()) const;
+    bool hasChildren(const QModelIndex &parent = QModelIndex()) const;
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+
+    void setSourceModel(QAbstractItemModel *sourceModel);
+
+private slots:
+    void sourceReset();
+    void sourceRowsInserted(const QModelIndex &parent, int start, int end);
+    void sourceRowsRemoved(const QModelIndex &parent, int start, int end);
+
+private:
+    int sourceDateRow(int row) const;
+    mutable QList<int> m_sourceRowCache;
+
+};
+
+// A modified QSortFilterProxyModel that always accepts the root nodes in the tree
+// so filtering is only done on the children.
+// Used in the HistoryDialog
+class TreeProxyModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+
+public:
+    TreeProxyModel(QObject *parent = 0);
+
+protected:
+    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
+};
+
+#include "ui_history.h"
+
+class HistoryDialog : public QDialog, public Ui_HistoryDialog
+{
+    Q_OBJECT
+
+signals:
+    void openUrl(const QUrl &url);
+
+public:
+    HistoryDialog(QWidget *parent = 0, HistoryManager *history = 0);
+
+private slots:
+    void customContextMenuRequested(const QPoint &pos);
+    void open();
+    void copy();
+
+};
+
+#endif // HISTORY_H
+
diff --git a/demos/browser/history.ui b/demos/browser/history.ui
new file mode 100644
index 0000000000..0944940e74
--- /dev/null
+++ b/demos/browser/history.ui
@@ -0,0 +1,106 @@
+<ui version="4.0" >
+ <class>HistoryDialog</class>
+ <widget class="QDialog" name="HistoryDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>758</width>
+    <height>450</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>History</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>252</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1" >
+    <widget class="SearchLineEdit" name="search" />
+   </item>
+   <item row="1" column="0" colspan="2" >
+    <widget class="EditTreeView" name="tree" />
+   </item>
+   <item row="2" column="0" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QPushButton" name="removeButton" >
+       <property name="text" >
+        <string>&amp;Remove</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="removeAllButton" >
+       <property name="text" >
+        <string>Remove &amp;All</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox" >
+       <property name="standardButtons" >
+        <set>QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SearchLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>searchlineedit.h</header>
+  </customwidget>
+  <customwidget>
+   <class>EditTreeView</class>
+   <extends>QTreeView</extends>
+   <header>edittreeview.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>HistoryDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>472</x>
+     <y>329</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>461</x>
+     <y>356</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/demos/browser/htmls/htmls.qrc b/demos/browser/htmls/htmls.qrc
new file mode 100644
index 0000000000..03b256ccb5
--- /dev/null
+++ b/demos/browser/htmls/htmls.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>notfound.html</file>
+</qresource>
+</RCC>
diff --git a/demos/browser/htmls/notfound.html b/demos/browser/htmls/notfound.html
new file mode 100644
index 0000000000..b04a9f83ff
--- /dev/null
+++ b/demos/browser/htmls/notfound.html
@@ -0,0 +1,63 @@
+<html>
+<head>
+<title>%1</title>
+<style>
+body {
+  padding: 3em 0em;
+  background: #eeeeee;
+}
+hr {
+  color: lightgray;
+  width: 100%;
+}
+img {
+  float: left;
+  opacity: .8;
+}
+#box {
+  background: white;
+  border: 1px solid lightgray;
+  width: 600px;
+  padding: 60px;
+  margin: auto;
+}
+h1 {
+  font-size: 130%;
+  font-weight: bold;
+  border-bottom: 1px solid lightgray;
+  margin-left: 48px;
+}
+h2 {
+  font-size: 100%;
+  font-weight: normal;
+  border-bottom: 1px solid lightgray;
+  margin-left: 48px;
+}
+ul {
+  font-size: 80%;
+  padding-left: 48px;
+  margin: 0;
+}
+#reloadButton {
+  padding-left: 48px;
+}
+</style>
+</head>
+<body>
+  <div id="box">
+    <img src="data:image/png;base64,IMAGE_BINARY_DATA_HERE" width="32" height="32"/>
+    <h1>%2</h1>
+    <h2>When connecting to: %3.</h2>
+    <ul>
+      <li>Check the address for errors such as <b>ww</b>.trolltech.com
+      instead of <b>www</b>.trolltech.com</li>
+      <li>If the address is correct, try checking the network
+      connection.</li>
+      <li>If your computer or network is protected by a firewall or
+      proxy, make sure that the browser demo is permitted to access
+      the network.</li>
+    </ul>
+    <br/><br/>
+  </div>
+</body>
+</html>
diff --git a/demos/browser/main.cpp b/demos/browser/main.cpp
new file mode 100644
index 0000000000..a59b2fb66d
--- /dev/null
+++ b/demos/browser/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "browserapplication.h"
+
+int main(int argc, char **argv)
+{
+    Q_INIT_RESOURCE(data);
+    BrowserApplication application(argc, argv);
+    if (!application.isTheOnlyBrowser())
+        return 0;
+    application.newMainWindow();
+    return application.exec();
+}
+
diff --git a/demos/browser/modelmenu.cpp b/demos/browser/modelmenu.cpp
new file mode 100644
index 0000000000..9403ef14d8
--- /dev/null
+++ b/demos/browser/modelmenu.cpp
@@ -0,0 +1,227 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "modelmenu.h"
+
+#include <QtCore/QAbstractItemModel>
+#include <qdebug.h>
+
+ModelMenu::ModelMenu(QWidget * parent)
+    : QMenu(parent)
+    , m_maxRows(7)
+    , m_firstSeparator(-1)
+    , m_maxWidth(-1)
+    , m_hoverRole(0)
+    , m_separatorRole(0)
+    , m_model(0)
+{
+    connect(this, SIGNAL(aboutToShow()), this, SLOT(aboutToShow()));
+}
+
+bool ModelMenu::prePopulated()
+{
+    return false;
+}
+
+void ModelMenu::postPopulated()
+{
+}
+
+void ModelMenu::setModel(QAbstractItemModel *model)
+{
+    m_model = model;
+}
+
+QAbstractItemModel *ModelMenu::model() const
+{
+    return m_model;
+}
+
+void ModelMenu::setMaxRows(int max)
+{
+    m_maxRows = max;
+}
+
+int ModelMenu::maxRows() const
+{
+    return m_maxRows;
+}
+
+void ModelMenu::setFirstSeparator(int offset)
+{
+    m_firstSeparator = offset;
+}
+
+int ModelMenu::firstSeparator() const
+{
+    return m_firstSeparator;
+}
+
+void ModelMenu::setRootIndex(const QModelIndex &index)
+{
+    m_root = index;
+}
+
+QModelIndex ModelMenu::rootIndex() const
+{
+    return m_root;
+}
+
+void ModelMenu::setHoverRole(int role)
+{
+    m_hoverRole = role;
+}
+
+int ModelMenu::hoverRole() const
+{
+    return m_hoverRole;
+}
+
+void ModelMenu::setSeparatorRole(int role)
+{
+    m_separatorRole = role;
+}
+
+int ModelMenu::separatorRole() const
+{
+    return m_separatorRole;
+}
+
+Q_DECLARE_METATYPE(QModelIndex)
+void ModelMenu::aboutToShow()
+{
+    if (QMenu *menu = qobject_cast<QMenu*>(sender())) {
+        QVariant v = menu->menuAction()->data();
+        if (v.canConvert<QModelIndex>()) {
+            QModelIndex idx = qvariant_cast<QModelIndex>(v);
+            createMenu(idx, -1, menu, menu);
+            disconnect(menu, SIGNAL(aboutToShow()), this, SLOT(aboutToShow()));
+            return;
+        }
+    }
+
+    clear();
+    if (prePopulated())
+        addSeparator();
+    int max = m_maxRows;
+    if (max != -1)
+        max += m_firstSeparator;
+    createMenu(m_root, max, this, this);
+    postPopulated();
+}
+
+void ModelMenu::createMenu(const QModelIndex &parent, int max, QMenu *parentMenu, QMenu *menu)
+{
+    if (!menu) {
+        QString title = parent.data().toString();
+        menu = new QMenu(title, this);
+        QIcon icon = qvariant_cast<QIcon>(parent.data(Qt::DecorationRole));
+        menu->setIcon(icon);
+        parentMenu->addMenu(menu);
+        QVariant v;
+        v.setValue(parent);
+        menu->menuAction()->setData(v);
+        connect(menu, SIGNAL(aboutToShow()), this, SLOT(aboutToShow()));
+        return;
+    }
+
+    int end = m_model->rowCount(parent);
+    if (max != -1)
+        end = qMin(max, end);
+
+    connect(menu, SIGNAL(triggered(QAction*)), this, SLOT(triggered(QAction*)));
+    connect(menu, SIGNAL(hovered(QAction*)), this, SLOT(hovered(QAction*)));
+
+    for (int i = 0; i < end; ++i) {
+        QModelIndex idx = m_model->index(i, 0, parent);
+        if (m_model->hasChildren(idx)) {
+            createMenu(idx, -1, menu);
+        } else {
+            if (m_separatorRole != 0
+                && idx.data(m_separatorRole).toBool())
+                addSeparator();
+            else
+                menu->addAction(makeAction(idx));
+        }
+        if (menu == this && i == m_firstSeparator - 1)
+            addSeparator();
+    }
+}
+
+QAction *ModelMenu::makeAction(const QModelIndex &index)
+{
+    QIcon icon = qvariant_cast<QIcon>(index.data(Qt::DecorationRole));
+    QAction *action = makeAction(icon, index.data().toString(), this);
+    QVariant v;
+    v.setValue(index);
+    action->setData(v);
+    return action;
+}
+
+QAction *ModelMenu::makeAction(const QIcon &icon, const QString &text, QObject *parent)
+{
+    QFontMetrics fm(font());
+    if (-1 == m_maxWidth)
+        m_maxWidth = fm.width(QLatin1Char('m')) * 30;
+    QString smallText = fm.elidedText(text, Qt::ElideMiddle, m_maxWidth);
+    return new QAction(icon, smallText, parent);
+}
+
+void ModelMenu::triggered(QAction *action)
+{
+    QVariant v = action->data();
+    if (v.canConvert<QModelIndex>()) {
+        QModelIndex idx = qvariant_cast<QModelIndex>(v);
+        emit activated(idx);
+    }
+}
+
+void ModelMenu::hovered(QAction *action)
+{
+    QVariant v = action->data();
+    if (v.canConvert<QModelIndex>()) {
+        QModelIndex idx = qvariant_cast<QModelIndex>(v);
+        QString hoveredString = idx.data(m_hoverRole).toString();
+        if (!hoveredString.isEmpty())
+            emit hovered(hoveredString);
+    }
+}
+
diff --git a/demos/browser/modelmenu.h b/demos/browser/modelmenu.h
new file mode 100644
index 0000000000..edd2e043b7
--- /dev/null
+++ b/demos/browser/modelmenu.h
@@ -0,0 +1,105 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MODELMENU_H
+#define MODELMENU_H
+
+#include <QtGui/QMenu>
+#include <QtCore/QAbstractItemModel>
+
+// A QMenu that is dynamically populated from a QAbstractItemModel
+class ModelMenu : public QMenu
+{
+    Q_OBJECT
+
+signals:
+    void activated(const QModelIndex &index);
+    void hovered(const QString &text);
+
+public:
+    ModelMenu(QWidget *parent = 0);
+
+    void setModel(QAbstractItemModel *model);
+    QAbstractItemModel *model() const;
+
+    void setMaxRows(int max);
+    int maxRows() const;
+
+    void setFirstSeparator(int offset);
+    int firstSeparator() const;
+
+    void setRootIndex(const QModelIndex &index);
+    QModelIndex rootIndex() const;
+
+    void setHoverRole(int role);
+    int hoverRole() const;
+
+    void setSeparatorRole(int role);
+    int separatorRole() const;
+
+    QAction *makeAction(const QIcon &icon, const QString &text, QObject *parent);
+
+protected:
+    // add any actions before the tree, return true if any actions are added.
+    virtual bool prePopulated();
+    // add any actions after the tree
+    virtual void postPopulated();
+    // put all of the children of parent into menu up to max
+    void createMenu(const QModelIndex &parent, int max, QMenu *parentMenu = 0, QMenu *menu = 0);
+
+private slots:
+    void aboutToShow();
+    void triggered(QAction *action);
+    void hovered(QAction *action);
+
+private:
+    QAction *makeAction(const QModelIndex &index);
+    int m_maxRows;
+    int m_firstSeparator;
+    int m_maxWidth;
+    int m_hoverRole;
+    int m_separatorRole;
+    QAbstractItemModel *m_model;
+    QPersistentModelIndex m_root;
+};
+
+#endif // MODELMENU_H
+
diff --git a/demos/browser/networkaccessmanager.cpp b/demos/browser/networkaccessmanager.cpp
new file mode 100644
index 0000000000..2e7b2fd541
--- /dev/null
+++ b/demos/browser/networkaccessmanager.cpp
@@ -0,0 +1,171 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "networkaccessmanager.h"
+
+#include "browserapplication.h"
+#include "browsermainwindow.h"
+#include "ui_passworddialog.h"
+#include "ui_proxy.h"
+
+#include <QtCore/QSettings>
+
+#include <QtGui/QDesktopServices>
+#include <QtGui/QDialog>
+#include <QtGui/QMessageBox>
+#include <QtGui/QStyle>
+#include <QtGui/QTextDocument>
+
+#include <QtNetwork/QAuthenticator>
+#include <QtNetwork/QNetworkDiskCache>
+#include <QtNetwork/QNetworkProxy>
+#include <QtNetwork/QNetworkReply>
+#include <QtNetwork/QSslError>
+
+NetworkAccessManager::NetworkAccessManager(QObject *parent)
+    : QNetworkAccessManager(parent)
+{
+    connect(this, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)),
+            SLOT(authenticationRequired(QNetworkReply*,QAuthenticator*)));
+    connect(this, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)),
+            SLOT(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)));
+#ifndef QT_NO_OPENSSL
+    connect(this, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)),
+            SLOT(sslErrors(QNetworkReply*, const QList<QSslError>&)));
+#endif
+    loadSettings();
+
+    QNetworkDiskCache *diskCache = new QNetworkDiskCache(this);
+    QString location = QDesktopServices::storageLocation(QDesktopServices::CacheLocation);
+    diskCache->setCacheDirectory(location);
+    setCache(diskCache);
+}
+
+void NetworkAccessManager::loadSettings()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("proxy"));
+    QNetworkProxy proxy;
+    if (settings.value(QLatin1String("enabled"), false).toBool()) {
+        if (settings.value(QLatin1String("type"), 0).toInt() == 0)
+            proxy = QNetworkProxy::Socks5Proxy;
+        else
+            proxy = QNetworkProxy::HttpProxy;
+        proxy.setHostName(settings.value(QLatin1String("hostName")).toString());
+        proxy.setPort(settings.value(QLatin1String("port"), 1080).toInt());
+        proxy.setUser(settings.value(QLatin1String("userName")).toString());
+        proxy.setPassword(settings.value(QLatin1String("password")).toString());
+    }
+    setProxy(proxy);
+}
+
+void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthenticator *auth)
+{
+    BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
+
+    QDialog dialog(mainWindow);
+    dialog.setWindowFlags(Qt::Sheet);
+
+    Ui::PasswordDialog passwordDialog;
+    passwordDialog.setupUi(&dialog);
+
+    passwordDialog.iconLabel->setText(QString());
+    passwordDialog.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
+
+    QString introMessage = tr("<qt>Enter username and password for \"%1\" at %2</qt>");
+    introMessage = introMessage.arg(Qt::escape(reply->url().toString())).arg(Qt::escape(reply->url().toString()));
+    passwordDialog.introLabel->setText(introMessage);
+    passwordDialog.introLabel->setWordWrap(true);
+
+    if (dialog.exec() == QDialog::Accepted) {
+        auth->setUser(passwordDialog.userNameLineEdit->text());
+        auth->setPassword(passwordDialog.passwordLineEdit->text());
+    }
+}
+
+void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth)
+{
+    BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
+
+    QDialog dialog(mainWindow);
+    dialog.setWindowFlags(Qt::Sheet);
+
+    Ui::ProxyDialog proxyDialog;
+    proxyDialog.setupUi(&dialog);
+
+    proxyDialog.iconLabel->setText(QString());
+    proxyDialog.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
+
+    QString introMessage = tr("<qt>Connect to proxy \"%1\" using:</qt>");
+    introMessage = introMessage.arg(Qt::escape(proxy.hostName()));
+    proxyDialog.introLabel->setText(introMessage);
+    proxyDialog.introLabel->setWordWrap(true);
+
+    if (dialog.exec() == QDialog::Accepted) {
+        auth->setUser(proxyDialog.userNameLineEdit->text());
+        auth->setPassword(proxyDialog.passwordLineEdit->text());
+    }
+}
+
+#ifndef QT_NO_OPENSSL
+void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError> &error)
+{
+    // check if SSL certificate has been trusted already
+    QString replyHost = reply->url().host() + ":" + reply->url().port();
+    if(! sslTrustedHostList.contains(replyHost)) {
+        BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
+
+        QStringList errorStrings;
+        for (int i = 0; i < error.count(); ++i)
+            errorStrings += error.at(i).errorString();
+        QString errors = errorStrings.join(QLatin1String("\n"));
+        int ret = QMessageBox::warning(mainWindow, QCoreApplication::applicationName(),
+                tr("SSL Errors:\n\n%1\n\n%2\n\n"
+                        "Do you want to ignore these errors for this host?").arg(reply->url().toString()).arg(errors),
+                        QMessageBox::Yes | QMessageBox::No,
+                        QMessageBox::No);
+        if (ret == QMessageBox::Yes) {
+            reply->ignoreSslErrors();
+            sslTrustedHostList.append(replyHost);
+        }
+    }
+}
+#endif
diff --git a/demos/browser/networkaccessmanager.h b/demos/browser/networkaccessmanager.h
new file mode 100644
index 0000000000..d016e768e6
--- /dev/null
+++ b/demos/browser/networkaccessmanager.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef NETWORKACCESSMANAGER_H
+#define NETWORKACCESSMANAGER_H
+
+#include <QtNetwork/QNetworkAccessManager>
+
+class NetworkAccessManager : public QNetworkAccessManager
+{
+    Q_OBJECT
+
+public:
+    NetworkAccessManager(QObject *parent = 0);
+
+private:
+    QList<QString> sslTrustedHostList;
+
+public slots:
+    void loadSettings();
+
+private slots:
+    void authenticationRequired(QNetworkReply *reply, QAuthenticator *auth);
+    void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth);
+#ifndef QT_NO_OPENSSL
+    void sslErrors(QNetworkReply *reply, const QList<QSslError> &error);
+#endif
+};
+
+#endif // NETWORKACCESSMANAGER_H
diff --git a/demos/browser/passworddialog.ui b/demos/browser/passworddialog.ui
new file mode 100644
index 0000000000..7c1665867a
--- /dev/null
+++ b/demos/browser/passworddialog.ui
@@ -0,0 +1,111 @@
+<ui version="4.0" >
+ <class>PasswordDialog</class>
+ <widget class="QDialog" name="PasswordDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>399</width>
+    <height>148</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Authentication Required</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QLabel" name="iconLabel" >
+       <property name="text" >
+        <string>DUMMY ICON</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="introLabel" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>INTRO TEXT DUMMY</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Username:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QLineEdit" name="userNameLineEdit" />
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="lblPassword" >
+     <property name="text" >
+      <string>Password:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QLineEdit" name="passwordLineEdit" >
+     <property name="echoMode" >
+      <enum>QLineEdit::Password</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>PasswordDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>PasswordDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/demos/browser/proxy.ui b/demos/browser/proxy.ui
new file mode 100644
index 0000000000..62a8be6273
--- /dev/null
+++ b/demos/browser/proxy.ui
@@ -0,0 +1,104 @@
+<ui version="4.0" >
+ <class>ProxyDialog</class>
+ <widget class="QDialog" name="ProxyDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>369</width>
+    <height>144</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Proxy Authentication</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="iconLabel" >
+     <property name="text" >
+      <string>ICON</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="2" >
+    <widget class="QLabel" name="introLabel" >
+     <property name="text" >
+      <string>Connect to proxy</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2" >
+    <widget class="QLabel" name="usernameLabel" >
+     <property name="text" >
+      <string>Username:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2" >
+    <widget class="QLineEdit" name="userNameLineEdit" />
+   </item>
+   <item row="2" column="0" colspan="2" >
+    <widget class="QLabel" name="passwordLabel" >
+     <property name="text" >
+      <string>Password:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2" >
+    <widget class="QLineEdit" name="passwordLineEdit" >
+     <property name="echoMode" >
+      <enum>QLineEdit::Password</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="3" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>ProxyDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>ProxyDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/demos/browser/searchlineedit.cpp b/demos/browser/searchlineedit.cpp
new file mode 100644
index 0000000000..8f668e0de7
--- /dev/null
+++ b/demos/browser/searchlineedit.cpp
@@ -0,0 +1,238 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "searchlineedit.h"
+
+#include <QtGui/QPainter>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QMenu>
+#include <QtGui/QStyle>
+#include <QtGui/QStyleOptionFrameV2>
+
+ClearButton::ClearButton(QWidget *parent)
+  : QAbstractButton(parent)
+{
+    setCursor(Qt::ArrowCursor);
+    setToolTip(tr("Clear"));
+    setVisible(false);
+    setFocusPolicy(Qt::NoFocus);
+}
+
+void ClearButton::paintEvent(QPaintEvent *event)
+{
+    Q_UNUSED(event);
+    QPainter painter(this);
+    int height = this->height();
+
+    painter.setRenderHint(QPainter::Antialiasing, true);
+    QColor color = palette().color(QPalette::Mid);
+    painter.setBrush(isDown()
+                     ? palette().color(QPalette::Dark)
+                     : palette().color(QPalette::Mid));
+    painter.setPen(painter.brush().color());
+    int size = width();
+    int offset = size / 5;
+    int radius = size - offset * 2;
+    painter.drawEllipse(offset, offset, radius, radius);
+
+    painter.setPen(palette().color(QPalette::Base));
+    int border = offset * 2;
+    painter.drawLine(border, border, width() - border, height - border);
+    painter.drawLine(border, height - border, width() - border, border);
+}
+
+void ClearButton::textChanged(const QString &text)
+{
+    setVisible(!text.isEmpty());
+}
+
+/*
+    Search icon on the left hand side of the search widget
+    When a menu is set a down arrow appears
+ */
+class SearchButton : public QAbstractButton {
+public:
+    SearchButton(QWidget *parent = 0);
+    void paintEvent(QPaintEvent *event);
+    QMenu *m_menu;
+
+protected:
+    void mousePressEvent(QMouseEvent *event);
+};
+
+SearchButton::SearchButton(QWidget *parent)
+  : QAbstractButton(parent),
+    m_menu(0)
+{
+    setObjectName(QLatin1String("SearchButton"));
+    setCursor(Qt::ArrowCursor);
+    setFocusPolicy(Qt::NoFocus);
+}
+
+void SearchButton::mousePressEvent(QMouseEvent *event)
+{
+    if (m_menu && event->button() == Qt::LeftButton) {
+        QWidget *p = parentWidget();
+        if (p) {
+            QPoint r = p->mapToGlobal(QPoint(0, p->height()));
+            m_menu->exec(QPoint(r.x() + height() / 2, r.y()));
+        }
+        event->accept();
+    }
+    QAbstractButton::mousePressEvent(event);
+}
+
+void SearchButton::paintEvent(QPaintEvent *event)
+{
+    Q_UNUSED(event);
+    QPainterPath myPath;
+
+    int radius = (height() / 5) * 2;
+    QRect circle(height() / 3 - 1, height() / 4, radius, radius);
+    myPath.addEllipse(circle);
+
+    myPath.arcMoveTo(circle, 300);
+    QPointF c = myPath.currentPosition();
+    int diff = height() / 7;
+    myPath.lineTo(qMin(width() - 2, (int)c.x() + diff), c.y() + diff);
+
+    QPainter painter(this);
+    painter.setRenderHint(QPainter::Antialiasing, true);
+    painter.setPen(QPen(Qt::darkGray, 2));
+    painter.drawPath(myPath);
+
+    if (m_menu) {
+        QPainterPath dropPath;
+        dropPath.arcMoveTo(circle, 320);
+        QPointF c = dropPath.currentPosition();
+        c = QPointF(c.x() + 3.5, c.y() + 0.5);
+        dropPath.moveTo(c);
+        dropPath.lineTo(c.x() + 4, c.y());
+        dropPath.lineTo(c.x() + 2, c.y() + 2);
+        dropPath.closeSubpath();
+        painter.setPen(Qt::darkGray);
+        painter.setBrush(Qt::darkGray);
+        painter.setRenderHint(QPainter::Antialiasing, false);
+        painter.drawPath(dropPath);
+    }
+    painter.end();
+}
+
+/*
+    SearchLineEdit is an enhanced QLineEdit
+    - A Search icon on the left with optional menu
+    - When there is no text and doesn't have focus an "inactive text" is displayed
+    - When there is text a clear button is displayed on the right hand side
+ */
+SearchLineEdit::SearchLineEdit(QWidget *parent) : ExLineEdit(parent),
+    m_searchButton(new SearchButton(this))
+{
+    connect(lineEdit(), SIGNAL(textChanged(const QString &)),
+            this, SIGNAL(textChanged(const QString &)));
+    setLeftWidget(m_searchButton);
+    m_inactiveText = tr("Search");
+
+    QSizePolicy policy = sizePolicy();
+    setSizePolicy(QSizePolicy::Preferred, policy.verticalPolicy());
+}
+
+void SearchLineEdit::paintEvent(QPaintEvent *event)
+{
+    if (lineEdit()->text().isEmpty() && !hasFocus() && !m_inactiveText.isEmpty()) {
+        ExLineEdit::paintEvent(event);
+        QStyleOptionFrameV2 panel;
+        initStyleOption(&panel);
+        QRect r = style()->subElementRect(QStyle::SE_LineEditContents, &panel, this);
+        QFontMetrics fm = fontMetrics();
+        int horizontalMargin = lineEdit()->x();
+        QRect lineRect(horizontalMargin + r.x(), r.y() + (r.height() - fm.height() + 1) / 2,
+                       r.width() - 2 * horizontalMargin, fm.height());
+        QPainter painter(this);
+        painter.setPen(palette().brush(QPalette::Disabled, QPalette::Text).color());
+        painter.drawText(lineRect, Qt::AlignLeft|Qt::AlignVCenter, m_inactiveText);
+    } else {
+        ExLineEdit::paintEvent(event);
+    }
+}
+
+void SearchLineEdit::resizeEvent(QResizeEvent *event)
+{
+    updateGeometries();
+    ExLineEdit::resizeEvent(event);
+}
+
+void SearchLineEdit::updateGeometries()
+{
+    int menuHeight = height();
+    int menuWidth = menuHeight + 1;
+    if (!m_searchButton->m_menu)
+        menuWidth = (menuHeight / 5) * 4;
+    m_searchButton->resize(QSize(menuWidth, menuHeight));
+}
+
+QString SearchLineEdit::inactiveText() const
+{
+    return m_inactiveText;
+}
+
+void SearchLineEdit::setInactiveText(const QString &text)
+{
+    m_inactiveText = text;
+}
+
+void SearchLineEdit::setMenu(QMenu *menu)
+{
+    if (m_searchButton->m_menu)
+        m_searchButton->m_menu->deleteLater();
+    m_searchButton->m_menu = menu;
+    updateGeometries();
+}
+
+QMenu *SearchLineEdit::menu() const
+{
+    if (!m_searchButton->m_menu) {
+        m_searchButton->m_menu = new QMenu(m_searchButton);
+        if (isVisible())
+            (const_cast<SearchLineEdit*>(this))->updateGeometries();
+    }
+    return m_searchButton->m_menu;
+}
+
diff --git a/demos/browser/searchlineedit.h b/demos/browser/searchlineedit.h
new file mode 100644
index 0000000000..be17e0550e
--- /dev/null
+++ b/demos/browser/searchlineedit.h
@@ -0,0 +1,103 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SEARCHLINEEDIT_H
+#define SEARCHLINEEDIT_H
+
+#include "urllineedit.h"
+
+#include <QtGui/QLineEdit>
+#include <QtGui/QAbstractButton>
+
+QT_BEGIN_NAMESPACE
+class QMenu;
+QT_END_NAMESPACE
+
+class SearchButton;
+
+/*
+    Clear button on the right hand side of the search widget.
+    Hidden by default
+    "A circle with an X in it"
+ */
+class ClearButton : public QAbstractButton
+{
+    Q_OBJECT
+
+public:
+    ClearButton(QWidget *parent = 0);
+    void paintEvent(QPaintEvent *event);
+
+public slots:
+    void textChanged(const QString &text);
+};
+
+
+class SearchLineEdit : public ExLineEdit
+{
+    Q_OBJECT
+    Q_PROPERTY(QString inactiveText READ inactiveText WRITE setInactiveText)
+
+signals:
+    void textChanged(const QString &text);
+
+public:
+    SearchLineEdit(QWidget *parent = 0);
+
+    QString inactiveText() const;
+    void setInactiveText(const QString &text);
+
+    QMenu *menu() const;
+    void setMenu(QMenu *menu);
+
+protected:
+    void resizeEvent(QResizeEvent *event);
+    void paintEvent(QPaintEvent *event);
+
+private:
+    void updateGeometries();
+
+    SearchButton *m_searchButton;
+    QString m_inactiveText;
+};
+
+#endif // SEARCHLINEEDIT_H
+
diff --git a/demos/browser/settings.cpp b/demos/browser/settings.cpp
new file mode 100644
index 0000000000..09f484605d
--- /dev/null
+++ b/demos/browser/settings.cpp
@@ -0,0 +1,324 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "settings.h"
+
+#include "browserapplication.h"
+#include "browsermainwindow.h"
+#include "cookiejar.h"
+#include "history.h"
+#include "networkaccessmanager.h"
+#include "webview.h"
+
+#include <QtCore/QSettings>
+#include <QtGui/QtGui>
+#include <QtWebKit/QtWebKit>
+
+SettingsDialog::SettingsDialog(QWidget *parent)
+    : QDialog(parent)
+{
+    setupUi(this);
+    connect(exceptionsButton, SIGNAL(clicked()), this, SLOT(showExceptions()));
+    connect(setHomeToCurrentPageButton, SIGNAL(clicked()), this, SLOT(setHomeToCurrentPage()));
+    connect(cookiesButton, SIGNAL(clicked()), this, SLOT(showCookies()));
+    connect(standardFontButton, SIGNAL(clicked()), this, SLOT(chooseFont()));
+    connect(fixedFontButton, SIGNAL(clicked()), this, SLOT(chooseFixedFont()));
+
+    loadDefaults();
+    loadFromSettings();
+}
+
+void SettingsDialog::loadDefaults()
+{
+    QWebSettings *defaultSettings = QWebSettings::globalSettings();
+    QString standardFontFamily = defaultSettings->fontFamily(QWebSettings::StandardFont);
+    int standardFontSize = defaultSettings->fontSize(QWebSettings::DefaultFontSize);
+    standardFont = QFont(standardFontFamily, standardFontSize);
+    standardLabel->setText(QString(QLatin1String("%1 %2")).arg(standardFont.family()).arg(standardFont.pointSize()));
+
+    QString fixedFontFamily = defaultSettings->fontFamily(QWebSettings::FixedFont);
+    int fixedFontSize = defaultSettings->fontSize(QWebSettings::DefaultFixedFontSize);
+    fixedFont = QFont(fixedFontFamily, fixedFontSize);
+    fixedLabel->setText(QString(QLatin1String("%1 %2")).arg(fixedFont.family()).arg(fixedFont.pointSize()));
+
+    downloadsLocation->setText(QDesktopServices::storageLocation(QDesktopServices::DesktopLocation));
+
+    enableJavascript->setChecked(defaultSettings->testAttribute(QWebSettings::JavascriptEnabled));
+    enablePlugins->setChecked(defaultSettings->testAttribute(QWebSettings::PluginsEnabled));
+}
+
+void SettingsDialog::loadFromSettings()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("MainWindow"));
+    QString defaultHome = QLatin1String("http://qtsoftware.com");
+    homeLineEdit->setText(settings.value(QLatin1String("home"), defaultHome).toString());
+    settings.endGroup();
+
+    settings.beginGroup(QLatin1String("history"));
+    int historyExpire = settings.value(QLatin1String("historyExpire")).toInt();
+    int idx = 0;
+    switch (historyExpire) {
+    case 1: idx = 0; break;
+    case 7: idx = 1; break;
+    case 14: idx = 2; break;
+    case 30: idx = 3; break;
+    case 365: idx = 4; break;
+    case -1: idx = 5; break;
+    default:
+        idx = 5;
+    }
+    expireHistory->setCurrentIndex(idx);
+    settings.endGroup();
+
+    settings.beginGroup(QLatin1String("downloadmanager"));
+    QString downloadDirectory = settings.value(QLatin1String("downloadDirectory"), downloadsLocation->text()).toString();
+    downloadsLocation->setText(downloadDirectory);
+    settings.endGroup();
+
+    settings.beginGroup(QLatin1String("general"));
+    openLinksIn->setCurrentIndex(settings.value(QLatin1String("openLinksIn"), openLinksIn->currentIndex()).toInt());
+
+    settings.endGroup();
+
+    // Appearance
+    settings.beginGroup(QLatin1String("websettings"));
+    fixedFont = qVariantValue<QFont>(settings.value(QLatin1String("fixedFont"), fixedFont));
+    standardFont = qVariantValue<QFont>(settings.value(QLatin1String("standardFont"), standardFont));
+
+    standardLabel->setText(QString(QLatin1String("%1 %2")).arg(standardFont.family()).arg(standardFont.pointSize()));
+    fixedLabel->setText(QString(QLatin1String("%1 %2")).arg(fixedFont.family()).arg(fixedFont.pointSize()));
+
+    enableJavascript->setChecked(settings.value(QLatin1String("enableJavascript"), enableJavascript->isChecked()).toBool());
+    enablePlugins->setChecked(settings.value(QLatin1String("enablePlugins"), enablePlugins->isChecked()).toBool());
+    userStyleSheet->setText(settings.value(QLatin1String("userStyleSheet")).toUrl().toString());
+    settings.endGroup();
+
+    // Privacy
+    settings.beginGroup(QLatin1String("cookies"));
+
+    CookieJar *jar = BrowserApplication::cookieJar();
+    QByteArray value = settings.value(QLatin1String("acceptCookies"), QLatin1String("AcceptOnlyFromSitesNavigatedTo")).toByteArray();
+    QMetaEnum acceptPolicyEnum = jar->staticMetaObject.enumerator(jar->staticMetaObject.indexOfEnumerator("AcceptPolicy"));
+    CookieJar::AcceptPolicy acceptCookies = acceptPolicyEnum.keyToValue(value) == -1 ?
+                        CookieJar::AcceptOnlyFromSitesNavigatedTo :
+                        static_cast<CookieJar::AcceptPolicy>(acceptPolicyEnum.keyToValue(value));
+    switch(acceptCookies) {
+    case CookieJar::AcceptAlways:
+        acceptCombo->setCurrentIndex(0);
+        break;
+    case CookieJar::AcceptNever:
+        acceptCombo->setCurrentIndex(1);
+        break;
+    case CookieJar::AcceptOnlyFromSitesNavigatedTo:
+        acceptCombo->setCurrentIndex(2);
+        break;
+    }
+
+    value = settings.value(QLatin1String("keepCookiesUntil"), QLatin1String("Expire")).toByteArray();
+    QMetaEnum keepPolicyEnum = jar->staticMetaObject.enumerator(jar->staticMetaObject.indexOfEnumerator("KeepPolicy"));
+    CookieJar::KeepPolicy keepCookies = keepPolicyEnum.keyToValue(value) == -1 ?
+                        CookieJar::KeepUntilExpire :
+                        static_cast<CookieJar::KeepPolicy>(keepPolicyEnum.keyToValue(value));
+    switch(keepCookies) {
+    case CookieJar::KeepUntilExpire:
+        keepUntilCombo->setCurrentIndex(0);
+        break;
+    case CookieJar::KeepUntilExit:
+        keepUntilCombo->setCurrentIndex(1);
+        break;
+    case CookieJar::KeepUntilTimeLimit:
+        keepUntilCombo->setCurrentIndex(2);
+        break;
+    }
+    settings.endGroup();
+
+
+    // Proxy
+    settings.beginGroup(QLatin1String("proxy"));
+    proxySupport->setChecked(settings.value(QLatin1String("enabled"), false).toBool());
+    proxyType->setCurrentIndex(settings.value(QLatin1String("type"), 0).toInt());
+    proxyHostName->setText(settings.value(QLatin1String("hostName")).toString());
+    proxyPort->setValue(settings.value(QLatin1String("port"), 1080).toInt());
+    proxyUserName->setText(settings.value(QLatin1String("userName")).toString());
+    proxyPassword->setText(settings.value(QLatin1String("password")).toString());
+    settings.endGroup();
+}
+
+void SettingsDialog::saveToSettings()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("MainWindow"));
+    settings.setValue(QLatin1String("home"), homeLineEdit->text());
+    settings.endGroup();
+
+    settings.beginGroup(QLatin1String("general"));
+    settings.setValue(QLatin1String("openLinksIn"), openLinksIn->currentIndex());
+    settings.endGroup();
+
+    settings.beginGroup(QLatin1String("history"));
+    int historyExpire = expireHistory->currentIndex();
+    int idx = -1;
+    switch (historyExpire) {
+    case 0: idx = 1; break;
+    case 1: idx = 7; break;
+    case 2: idx = 14; break;
+    case 3: idx = 30; break;
+    case 4: idx = 365; break;
+    case 5: idx = -1; break;
+    }
+    settings.setValue(QLatin1String("historyExpire"), idx);
+    settings.endGroup();
+
+    // Appearance
+    settings.beginGroup(QLatin1String("websettings"));
+    settings.setValue(QLatin1String("fixedFont"), fixedFont);
+    settings.setValue(QLatin1String("standardFont"), standardFont);
+    settings.setValue(QLatin1String("enableJavascript"), enableJavascript->isChecked());
+    settings.setValue(QLatin1String("enablePlugins"), enablePlugins->isChecked());
+    QString userStyleSheetString = userStyleSheet->text();
+    if (QFile::exists(userStyleSheetString))
+        settings.setValue(QLatin1String("userStyleSheet"), QUrl::fromLocalFile(userStyleSheetString));
+    else
+        settings.setValue(QLatin1String("userStyleSheet"), QUrl(userStyleSheetString));
+    settings.endGroup();
+
+    //Privacy
+    settings.beginGroup(QLatin1String("cookies"));
+
+    CookieJar::KeepPolicy keepCookies;
+    switch(acceptCombo->currentIndex()) {
+    default:
+    case 0:
+        keepCookies = CookieJar::KeepUntilExpire;
+        break;
+    case 1:
+        keepCookies = CookieJar::KeepUntilExit;
+        break;
+    case 2:
+        keepCookies = CookieJar::KeepUntilTimeLimit;
+        break;
+    }
+    CookieJar *jar = BrowserApplication::cookieJar();
+    QMetaEnum acceptPolicyEnum = jar->staticMetaObject.enumerator(jar->staticMetaObject.indexOfEnumerator("AcceptPolicy"));
+    settings.setValue(QLatin1String("acceptCookies"), QLatin1String(acceptPolicyEnum.valueToKey(keepCookies)));
+
+    CookieJar::KeepPolicy keepPolicy;
+    switch(keepUntilCombo->currentIndex()) {
+        default:
+    case 0:
+        keepPolicy = CookieJar::KeepUntilExpire;
+        break;
+    case 1:
+        keepPolicy = CookieJar::KeepUntilExit;
+        break;
+    case 2:
+        keepPolicy = CookieJar::KeepUntilTimeLimit;
+        break;
+    }
+
+    QMetaEnum keepPolicyEnum = jar->staticMetaObject.enumerator(jar->staticMetaObject.indexOfEnumerator("KeepPolicy"));
+    settings.setValue(QLatin1String("keepCookiesUntil"), QLatin1String(keepPolicyEnum.valueToKey(keepPolicy)));
+
+    settings.endGroup();
+
+    // proxy
+    settings.beginGroup(QLatin1String("proxy"));
+    settings.setValue(QLatin1String("enabled"), proxySupport->isChecked());
+    settings.setValue(QLatin1String("type"), proxyType->currentIndex());
+    settings.setValue(QLatin1String("hostName"), proxyHostName->text());
+    settings.setValue(QLatin1String("port"), proxyPort->text());
+    settings.setValue(QLatin1String("userName"), proxyUserName->text());
+    settings.setValue(QLatin1String("password"), proxyPassword->text());
+    settings.endGroup();
+
+    BrowserApplication::instance()->loadSettings();
+    BrowserApplication::networkAccessManager()->loadSettings();
+    BrowserApplication::cookieJar()->loadSettings();
+    BrowserApplication::historyManager()->loadSettings();
+}
+
+void SettingsDialog::accept()
+{
+    saveToSettings();
+    QDialog::accept();
+}
+
+void SettingsDialog::showCookies()
+{
+    CookiesDialog *dialog = new CookiesDialog(BrowserApplication::cookieJar(), this);
+    dialog->exec();
+}
+
+void SettingsDialog::showExceptions()
+{
+    CookiesExceptionsDialog *dialog = new CookiesExceptionsDialog(BrowserApplication::cookieJar(), this);
+    dialog->exec();
+}
+
+void SettingsDialog::chooseFont()
+{
+    bool ok;
+    QFont font = QFontDialog::getFont(&ok, standardFont, this);
+    if ( ok ) {
+        standardFont = font;
+        standardLabel->setText(QString(QLatin1String("%1 %2")).arg(font.family()).arg(font.pointSize()));
+    }
+}
+
+void SettingsDialog::chooseFixedFont()
+{
+    bool ok;
+    QFont font = QFontDialog::getFont(&ok, fixedFont, this);
+    if ( ok ) {
+        fixedFont = font;
+        fixedLabel->setText(QString(QLatin1String("%1 %2")).arg(font.family()).arg(font.pointSize()));
+    }
+}
+
+void SettingsDialog::setHomeToCurrentPage()
+{
+    BrowserMainWindow *mw = static_cast<BrowserMainWindow*>(parent());
+    WebView *webView = mw->currentTab();
+    if (webView)
+        homeLineEdit->setText(webView->url().toString());
+}
+
diff --git a/demos/browser/settings.h b/demos/browser/settings.h
new file mode 100644
index 0000000000..a7a0a3539a
--- /dev/null
+++ b/demos/browser/settings.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SETTINGS_H
+#define SETTINGS_H
+
+#include <QtGui/QDialog>
+#include "ui_settings.h"
+
+class SettingsDialog : public QDialog, public Ui_Settings
+{
+    Q_OBJECT
+
+public:
+    SettingsDialog(QWidget *parent = 0);
+    void accept();
+
+private slots:
+    void loadDefaults();
+    void loadFromSettings();
+    void saveToSettings();
+
+    void setHomeToCurrentPage();
+    void showCookies();
+    void showExceptions();
+
+    void chooseFont();
+    void chooseFixedFont();
+
+private:
+    QFont standardFont;
+    QFont fixedFont;
+};
+
+#endif // SETTINGS_H
+
diff --git a/demos/browser/settings.ui b/demos/browser/settings.ui
new file mode 100644
index 0000000000..3491ce0b0b
--- /dev/null
+++ b/demos/browser/settings.ui
@@ -0,0 +1,614 @@
+<ui version="4.0" >
+ <class>Settings</class>
+ <widget class="QDialog" name="Settings" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>657</width>
+    <height>322</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Settings</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="2" column="0" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QTabWidget" name="tabWidget" >
+     <property name="currentIndex" >
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="tab" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>627</width>
+        <height>243</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>General</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_4" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="label_3" >
+         <property name="text" >
+          <string>Home:</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" colspan="2" >
+        <widget class="QLineEdit" name="homeLineEdit" />
+       </item>
+       <item row="1" column="1" >
+        <widget class="QPushButton" name="setHomeToCurrentPageButton" >
+         <property name="text" >
+          <string>Set to current page</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="2" >
+        <spacer name="horizontalSpacer" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>280</width>
+           <height>18</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="2" column="0" >
+        <widget class="QLabel" name="label_4" >
+         <property name="text" >
+          <string>Remove history items:</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1" colspan="2" >
+        <widget class="QComboBox" name="expireHistory" >
+         <item>
+          <property name="text" >
+           <string>After one day</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>After one week</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>After two weeks</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>After one month</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>After one year</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>Manually</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="3" column="0" >
+        <widget class="QLabel" name="label_7" >
+         <property name="text" >
+          <string>Save downloads to:</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1" colspan="2" >
+        <widget class="QLineEdit" name="downloadsLocation" />
+       </item>
+       <item row="4" column="0" >
+        <widget class="QLabel" name="label_8" >
+         <property name="text" >
+          <string>Open links from applications:</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1" colspan="2" >
+        <widget class="QComboBox" name="openLinksIn" >
+         <item>
+          <property name="text" >
+           <string>In a tab in the current window</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>In a new window</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="5" column="1" colspan="2" >
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>391</width>
+           <height>262</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_3" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>627</width>
+        <height>243</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>Appearance</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_3" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="label_5" >
+         <property name="text" >
+          <string>Standard font:</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" >
+        <widget class="QLabel" name="standardLabel" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="frameShape" >
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="text" >
+          <string>Times 16</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="2" >
+        <widget class="QPushButton" name="standardFontButton" >
+         <property name="text" >
+          <string>Select...</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QLabel" name="label_6" >
+         <property name="text" >
+          <string>Fixed-width font:</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1" >
+        <widget class="QLabel" name="fixedLabel" >
+         <property name="frameShape" >
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="text" >
+          <string>Courier 13</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="2" >
+        <widget class="QPushButton" name="fixedFontButton" >
+         <property name="text" >
+          <string>Select...</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1" >
+        <spacer name="verticalSpacer" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>20</width>
+           <height>93</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_2" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>627</width>
+        <height>243</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>Privacy</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_3" >
+       <item>
+        <widget class="QGroupBox" name="groupBox" >
+         <property name="title" >
+          <string>Web Content</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_2" >
+          <item>
+           <widget class="QCheckBox" name="enablePlugins" >
+            <property name="text" >
+             <string>Enable Plugins</string>
+            </property>
+            <property name="checked" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="enableJavascript" >
+            <property name="text" >
+             <string>Enable Javascript</string>
+            </property>
+            <property name="checked" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="cookiesGroupBox" >
+         <property name="title" >
+          <string>Cookies</string>
+         </property>
+         <layout class="QGridLayout" >
+          <item row="0" column="0" >
+           <widget class="QLabel" name="label_2" >
+            <property name="text" >
+             <string>Accept Cookies:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" >
+           <widget class="QComboBox" name="acceptCombo" >
+            <item>
+             <property name="text" >
+              <string>Always</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>Never</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>Only from sites you navigate to</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="0" column="2" >
+           <widget class="QPushButton" name="exceptionsButton" >
+            <property name="text" >
+             <string>Exceptions...</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="label" >
+            <property name="text" >
+             <string>Keep until:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1" >
+           <widget class="QComboBox" name="keepUntilCombo" >
+            <item>
+             <property name="text" >
+              <string>They expire</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>I exit the application</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>At most 90 days</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="1" column="2" >
+           <widget class="QPushButton" name="cookiesButton" >
+            <property name="text" >
+             <string>Cookies...</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>371</width>
+           <height>177</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_4" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>627</width>
+        <height>243</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>Proxy</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout" >
+       <item>
+        <widget class="QGroupBox" name="proxySupport" >
+         <property name="title" >
+          <string>Enable proxy</string>
+         </property>
+         <property name="checkable" >
+          <bool>true</bool>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_6" >
+          <item row="0" column="0" >
+           <widget class="QLabel" name="label_9" >
+            <property name="text" >
+             <string>Type:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" colspan="2" >
+           <widget class="QComboBox" name="proxyType" >
+            <item>
+             <property name="text" >
+              <string>Socks5</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>Http</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="label_10" >
+            <property name="text" >
+             <string>Host:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1" colspan="2" >
+           <widget class="QLineEdit" name="proxyHostName" />
+          </item>
+          <item row="2" column="0" >
+           <widget class="QLabel" name="label_11" >
+            <property name="text" >
+             <string>Port:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1" >
+           <widget class="QSpinBox" name="proxyPort" >
+            <property name="maximum" >
+             <number>10000</number>
+            </property>
+            <property name="value" >
+             <number>1080</number>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="2" >
+           <spacer name="horizontalSpacer_2" >
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0" >
+             <size>
+              <width>293</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="3" column="0" >
+           <widget class="QLabel" name="label_12" >
+            <property name="text" >
+             <string>User Name:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1" colspan="2" >
+           <widget class="QLineEdit" name="proxyUserName" />
+          </item>
+          <item row="4" column="0" >
+           <widget class="QLabel" name="label_13" >
+            <property name="text" >
+             <string>Password:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1" colspan="2" >
+           <widget class="QLineEdit" name="proxyPassword" >
+            <property name="echoMode" >
+             <enum>QLineEdit::Password</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0" >
+           <spacer name="verticalSpacer_2" >
+            <property name="orientation" >
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0" >
+             <size>
+              <width>20</width>
+              <height>8</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_5" >
+      <attribute name="title" >
+       <string>Advanced</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_2" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="label_14" >
+         <property name="text" >
+          <string>Style Sheet:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" >
+        <widget class="QLineEdit" name="userStyleSheet" />
+       </item>
+       <item row="1" column="1" >
+        <spacer name="verticalSpacer_3" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>20</width>
+           <height>176</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>Settings</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>Settings</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/demos/browser/squeezelabel.cpp b/demos/browser/squeezelabel.cpp
new file mode 100644
index 0000000000..3209e16824
--- /dev/null
+++ b/demos/browser/squeezelabel.cpp
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "squeezelabel.h"
+
+SqueezeLabel::SqueezeLabel(QWidget *parent) : QLabel(parent)
+{
+}
+
+void SqueezeLabel::paintEvent(QPaintEvent *event)
+{
+    QFontMetrics fm = fontMetrics();
+    if (fm.width(text()) > contentsRect().width()) {
+        QString elided = fm.elidedText(text(), Qt::ElideMiddle, width());
+        QString oldText = text();
+        setText(elided);
+        QLabel::paintEvent(event);
+        setText(oldText);
+    } else {
+        QLabel::paintEvent(event);
+    }
+}
+
diff --git a/demos/browser/squeezelabel.h b/demos/browser/squeezelabel.h
new file mode 100644
index 0000000000..2f82240238
--- /dev/null
+++ b/demos/browser/squeezelabel.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SQUEEZELABEL_H
+#define SQUEEZELABEL_H
+
+#include <QtGui/QLabel>
+
+class SqueezeLabel : public QLabel
+{
+    Q_OBJECT
+
+public:
+    SqueezeLabel(QWidget *parent = 0);
+
+protected:
+    void paintEvent(QPaintEvent *event);
+
+};
+
+#endif // SQUEEZELABEL_H
+
diff --git a/demos/browser/tabwidget.cpp b/demos/browser/tabwidget.cpp
new file mode 100644
index 0000000000..7a2ee407e9
--- /dev/null
+++ b/demos/browser/tabwidget.cpp
@@ -0,0 +1,830 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "tabwidget.h"
+
+#include "browserapplication.h"
+#include "browsermainwindow.h"
+#include "history.h"
+#include "urllineedit.h"
+#include "webview.h"
+
+#include <QtGui/QClipboard>
+#include <QtGui/QCompleter>
+#include <QtGui/QListView>
+#include <QtGui/QMenu>
+#include <QtGui/QMessageBox>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QStackedWidget>
+#include <QtGui/QStyle>
+#include <QtGui/QToolButton>
+
+#include <QtCore/QDebug>
+
+TabBar::TabBar(QWidget *parent)
+    : QTabBar(parent)
+{
+    setContextMenuPolicy(Qt::CustomContextMenu);
+    setAcceptDrops(true);
+    connect(this, SIGNAL(customContextMenuRequested(const QPoint &)),
+            this, SLOT(contextMenuRequested(const QPoint &)));
+
+    QString alt = QLatin1String("Alt+%1");
+    for (int i = 1; i <= 10; ++i) {
+        int key = i;
+        if (key == 10)
+            key = 0;
+        QShortcut *shortCut = new QShortcut(alt.arg(key), this);
+        m_tabShortcuts.append(shortCut);
+        connect(shortCut, SIGNAL(activated()), this, SLOT(selectTabAction()));
+    }
+    setTabsClosable(true);
+    connect(this, SIGNAL(tabCloseRequested(int)),
+            this, SIGNAL(closeTab(int)));
+    setSelectionBehaviorOnRemove(QTabBar::SelectPreviousTab);
+    setMovable(true);
+}
+
+void TabBar::selectTabAction()
+{
+    if (QShortcut *shortCut = qobject_cast<QShortcut*>(sender())) {
+        int index = m_tabShortcuts.indexOf(shortCut);
+        if (index == 0)
+            index = 10;
+        setCurrentIndex(index);
+    }
+}
+
+void TabBar::contextMenuRequested(const QPoint &position)
+{
+    QMenu menu;
+    menu.addAction(tr("New &Tab"), this, SIGNAL(newTab()), QKeySequence::AddTab);
+    int index = tabAt(position);
+    if (-1 != index) {
+        QAction *action = menu.addAction(tr("Clone Tab"),
+                this, SLOT(cloneTab()));
+        action->setData(index);
+
+        menu.addSeparator();
+
+        action = menu.addAction(tr("&Close Tab"),
+                this, SLOT(closeTab()), QKeySequence::Close);
+        action->setData(index);
+
+        action = menu.addAction(tr("Close &Other Tabs"),
+                this, SLOT(closeOtherTabs()));
+        action->setData(index);
+
+        menu.addSeparator();
+
+        action = menu.addAction(tr("Reload Tab"),
+                this, SLOT(reloadTab()), QKeySequence::Refresh);
+        action->setData(index);
+    } else {
+        menu.addSeparator();
+    }
+    menu.addAction(tr("Reload All Tabs"), this, SIGNAL(reloadAllTabs()));
+    menu.exec(QCursor::pos());
+}
+
+void TabBar::cloneTab()
+{
+    if (QAction *action = qobject_cast<QAction*>(sender())) {
+        int index = action->data().toInt();
+        emit cloneTab(index);
+    }
+}
+
+void TabBar::closeTab()
+{
+    if (QAction *action = qobject_cast<QAction*>(sender())) {
+        int index = action->data().toInt();
+        emit closeTab(index);
+    }
+}
+
+void TabBar::closeOtherTabs()
+{
+    if (QAction *action = qobject_cast<QAction*>(sender())) {
+        int index = action->data().toInt();
+        emit closeOtherTabs(index);
+    }
+}
+
+void TabBar::mousePressEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton)
+        m_dragStartPos = event->pos();
+    QTabBar::mousePressEvent(event);
+}
+
+void TabBar::mouseMoveEvent(QMouseEvent *event)
+{
+    if (event->buttons() == Qt::LeftButton) {
+        int diffX = event->pos().x() - m_dragStartPos.x();
+        int diffY = event->pos().y() - m_dragStartPos.y();
+        if ((event->pos() - m_dragStartPos).manhattanLength() > QApplication::startDragDistance()
+            && diffX < 3 && diffX > -3
+            && diffY < -10) {
+            QDrag *drag = new QDrag(this);
+            QMimeData *mimeData = new QMimeData;
+            QList<QUrl> urls;
+            int index = tabAt(event->pos());
+            QUrl url = tabData(index).toUrl();
+            urls.append(url);
+            mimeData->setUrls(urls);
+            mimeData->setText(tabText(index));
+            mimeData->setData(QLatin1String("action"), "tab-reordering");
+            drag->setMimeData(mimeData);
+            drag->exec();
+        }
+    }
+    QTabBar::mouseMoveEvent(event);
+}
+
+// When index is -1 index chooses the current tab
+void TabWidget::reloadTab(int index)
+{
+    if (index < 0)
+        index = currentIndex();
+    if (index < 0 || index >= count())
+        return;
+
+    QWidget *widget = this->widget(index);
+    if (WebView *tab = qobject_cast<WebView*>(widget))
+        tab->reload();
+}
+
+void TabBar::reloadTab()
+{
+    if (QAction *action = qobject_cast<QAction*>(sender())) {
+        int index = action->data().toInt();
+        emit reloadTab(index);
+    }
+}
+
+TabWidget::TabWidget(QWidget *parent)
+    : QTabWidget(parent)
+    , m_recentlyClosedTabsAction(0)
+    , m_newTabAction(0)
+    , m_closeTabAction(0)
+    , m_nextTabAction(0)
+    , m_previousTabAction(0)
+    , m_recentlyClosedTabsMenu(0)
+    , m_lineEditCompleter(0)
+    , m_lineEdits(0)
+    , m_tabBar(new TabBar(this))
+{
+    setElideMode(Qt::ElideRight);
+
+    connect(m_tabBar, SIGNAL(newTab()), this, SLOT(newTab()));
+    connect(m_tabBar, SIGNAL(closeTab(int)), this, SLOT(closeTab(int)));
+    connect(m_tabBar, SIGNAL(cloneTab(int)), this, SLOT(cloneTab(int)));
+    connect(m_tabBar, SIGNAL(closeOtherTabs(int)), this, SLOT(closeOtherTabs(int)));
+    connect(m_tabBar, SIGNAL(reloadTab(int)), this, SLOT(reloadTab(int)));
+    connect(m_tabBar, SIGNAL(reloadAllTabs()), this, SLOT(reloadAllTabs()));
+    connect(m_tabBar, SIGNAL(tabMoved(int, int)), this, SLOT(moveTab(int, int)));
+    setTabBar(m_tabBar);
+    setDocumentMode(true);
+
+    // Actions
+    m_newTabAction = new QAction(QIcon(QLatin1String(":addtab.png")), tr("New &Tab"), this);
+    m_newTabAction->setShortcuts(QKeySequence::AddTab);
+    m_newTabAction->setIconVisibleInMenu(false);
+    connect(m_newTabAction, SIGNAL(triggered()), this, SLOT(newTab()));
+
+    m_closeTabAction = new QAction(QIcon(QLatin1String(":closetab.png")), tr("&Close Tab"), this);
+    m_closeTabAction->setShortcuts(QKeySequence::Close);
+    m_closeTabAction->setIconVisibleInMenu(false);
+    connect(m_closeTabAction, SIGNAL(triggered()), this, SLOT(closeTab()));
+
+    m_nextTabAction = new QAction(tr("Show Next Tab"), this);
+    QList<QKeySequence> shortcuts;
+    shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_BraceRight));
+    shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_PageDown));
+    shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_BracketRight));
+    shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_Less));
+    m_nextTabAction->setShortcuts(shortcuts);
+    connect(m_nextTabAction, SIGNAL(triggered()), this, SLOT(nextTab()));
+
+    m_previousTabAction = new QAction(tr("Show Previous Tab"), this);
+    shortcuts.clear();
+    shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_BraceLeft));
+    shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_PageUp));
+    shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_BracketLeft));
+    shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_Greater));
+    m_previousTabAction->setShortcuts(shortcuts);
+    connect(m_previousTabAction, SIGNAL(triggered()), this, SLOT(previousTab()));
+
+    m_recentlyClosedTabsMenu = new QMenu(this);
+    connect(m_recentlyClosedTabsMenu, SIGNAL(aboutToShow()),
+            this, SLOT(aboutToShowRecentTabsMenu()));
+    connect(m_recentlyClosedTabsMenu, SIGNAL(triggered(QAction *)),
+            this, SLOT(aboutToShowRecentTriggeredAction(QAction *)));
+    m_recentlyClosedTabsAction = new QAction(tr("Recently Closed Tabs"), this);
+    m_recentlyClosedTabsAction->setMenu(m_recentlyClosedTabsMenu);
+    m_recentlyClosedTabsAction->setEnabled(false);
+
+    connect(this, SIGNAL(currentChanged(int)),
+            this, SLOT(currentChanged(int)));
+
+    m_lineEdits = new QStackedWidget(this);
+}
+
+void TabWidget::clear()
+{
+    // clear the recently closed tabs
+    m_recentlyClosedTabs.clear();
+    // clear the line edit history
+    for (int i = 0; i < m_lineEdits->count(); ++i) {
+        QLineEdit *qLineEdit = lineEdit(i);
+        qLineEdit->setText(qLineEdit->text());
+    }
+}
+
+void TabWidget::moveTab(int fromIndex, int toIndex)
+{
+    QWidget *lineEdit = m_lineEdits->widget(fromIndex);
+    m_lineEdits->removeWidget(lineEdit);
+    m_lineEdits->insertWidget(toIndex, lineEdit);
+}
+
+void TabWidget::addWebAction(QAction *action, QWebPage::WebAction webAction)
+{
+    if (!action)
+        return;
+    m_actions.append(new WebActionMapper(action, webAction, this));
+}
+
+void TabWidget::currentChanged(int index)
+{
+    WebView *webView = this->webView(index);
+    if (!webView)
+        return;
+
+    Q_ASSERT(m_lineEdits->count() == count());
+
+    WebView *oldWebView = this->webView(m_lineEdits->currentIndex());
+    if (oldWebView) {
+        disconnect(oldWebView, SIGNAL(statusBarMessage(const QString&)),
+                this, SIGNAL(showStatusBarMessage(const QString&)));
+        disconnect(oldWebView->page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)),
+                this, SIGNAL(linkHovered(const QString&)));
+        disconnect(oldWebView, SIGNAL(loadProgress(int)),
+                this, SIGNAL(loadProgress(int)));
+    }
+
+    connect(webView, SIGNAL(statusBarMessage(const QString&)),
+            this, SIGNAL(showStatusBarMessage(const QString&)));
+    connect(webView->page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)),
+            this, SIGNAL(linkHovered(const QString&)));
+    connect(webView, SIGNAL(loadProgress(int)),
+            this, SIGNAL(loadProgress(int)));
+
+    for (int i = 0; i < m_actions.count(); ++i) {
+        WebActionMapper *mapper = m_actions[i];
+        mapper->updateCurrent(webView->page());
+    }
+    emit setCurrentTitle(webView->title());
+    m_lineEdits->setCurrentIndex(index);
+    emit loadProgress(webView->progress());
+    emit showStatusBarMessage(webView->lastStatusBarText());
+    if (webView->url().isEmpty())
+        m_lineEdits->currentWidget()->setFocus();
+    else
+        webView->setFocus();
+}
+
+QAction *TabWidget::newTabAction() const
+{
+    return m_newTabAction;
+}
+
+QAction *TabWidget::closeTabAction() const
+{
+    return m_closeTabAction;
+}
+
+QAction *TabWidget::recentlyClosedTabsAction() const
+{
+    return m_recentlyClosedTabsAction;
+}
+
+QAction *TabWidget::nextTabAction() const
+{
+    return m_nextTabAction;
+}
+
+QAction *TabWidget::previousTabAction() const
+{
+    return m_previousTabAction;
+}
+
+QWidget *TabWidget::lineEditStack() const
+{
+    return m_lineEdits;
+}
+
+QLineEdit *TabWidget::currentLineEdit() const
+{
+    return lineEdit(m_lineEdits->currentIndex());
+}
+
+WebView *TabWidget::currentWebView() const
+{
+    return webView(currentIndex());
+}
+
+QLineEdit *TabWidget::lineEdit(int index) const
+{
+    UrlLineEdit *urlLineEdit = qobject_cast<UrlLineEdit*>(m_lineEdits->widget(index));
+    if (urlLineEdit)
+        return urlLineEdit->lineEdit();
+    return 0;
+}
+
+WebView *TabWidget::webView(int index) const
+{
+    QWidget *widget = this->widget(index);
+    if (WebView *webView = qobject_cast<WebView*>(widget)) {
+        return webView;
+    } else {
+        // optimization to delay creating the first webview
+        if (count() == 1) {
+            TabWidget *that = const_cast<TabWidget*>(this);
+            that->setUpdatesEnabled(false);
+            that->newTab();
+            that->closeTab(0);
+            that->setUpdatesEnabled(true);
+            return currentWebView();
+        }
+    }
+    return 0;
+}
+
+int TabWidget::webViewIndex(WebView *webView) const
+{
+    int index = indexOf(webView);
+    return index;
+}
+
+WebView *TabWidget::newTab(bool makeCurrent)
+{
+    // line edit
+    UrlLineEdit *urlLineEdit = new UrlLineEdit;
+    QLineEdit *lineEdit = urlLineEdit->lineEdit();
+    if (!m_lineEditCompleter && count() > 0) {
+        HistoryCompletionModel *completionModel = new HistoryCompletionModel(this);
+        completionModel->setSourceModel(BrowserApplication::historyManager()->historyFilterModel());
+        m_lineEditCompleter = new QCompleter(completionModel, this);
+        // Should this be in Qt by default?
+        QAbstractItemView *popup = m_lineEditCompleter->popup();
+        QListView *listView = qobject_cast<QListView*>(popup);
+        if (listView)
+            listView->setUniformItemSizes(true);
+    }
+    lineEdit->setCompleter(m_lineEditCompleter);
+    connect(lineEdit, SIGNAL(returnPressed()), this, SLOT(lineEditReturnPressed()));
+    m_lineEdits->addWidget(urlLineEdit);
+    m_lineEdits->setSizePolicy(lineEdit->sizePolicy());
+
+    // optimization to delay creating the more expensive WebView, history, etc
+    if (count() == 0) {
+        QWidget *emptyWidget = new QWidget;
+        QPalette p = emptyWidget->palette();
+        p.setColor(QPalette::Window, palette().color(QPalette::Base));
+        emptyWidget->setPalette(p);
+        emptyWidget->setAutoFillBackground(true);
+        disconnect(this, SIGNAL(currentChanged(int)),
+            this, SLOT(currentChanged(int)));
+        addTab(emptyWidget, tr("(Untitled)"));
+        connect(this, SIGNAL(currentChanged(int)),
+            this, SLOT(currentChanged(int)));
+        return 0;
+    }
+
+    // webview
+    WebView *webView = new WebView;
+    urlLineEdit->setWebView(webView);
+    connect(webView, SIGNAL(loadStarted()),
+            this, SLOT(webViewLoadStarted()));
+    connect(webView, SIGNAL(loadFinished(bool)),
+            this, SLOT(webViewIconChanged()));
+    connect(webView, SIGNAL(iconChanged()),
+            this, SLOT(webViewIconChanged()));
+    connect(webView, SIGNAL(titleChanged(const QString &)),
+            this, SLOT(webViewTitleChanged(const QString &)));
+    connect(webView, SIGNAL(urlChanged(const QUrl &)),
+            this, SLOT(webViewUrlChanged(const QUrl &)));
+    connect(webView->page(), SIGNAL(windowCloseRequested()),
+            this, SLOT(windowCloseRequested()));
+    connect(webView->page(), SIGNAL(geometryChangeRequested(const QRect &)),
+            this, SIGNAL(geometryChangeRequested(const QRect &)));
+    connect(webView->page(), SIGNAL(printRequested(QWebFrame *)),
+            this, SIGNAL(printRequested(QWebFrame *)));
+    connect(webView->page(), SIGNAL(menuBarVisibilityChangeRequested(bool)),
+            this, SIGNAL(menuBarVisibilityChangeRequested(bool)));
+    connect(webView->page(), SIGNAL(statusBarVisibilityChangeRequested(bool)),
+            this, SIGNAL(statusBarVisibilityChangeRequested(bool)));
+    connect(webView->page(), SIGNAL(toolBarVisibilityChangeRequested(bool)),
+            this, SIGNAL(toolBarVisibilityChangeRequested(bool)));
+    addTab(webView, tr("(Untitled)"));
+    if (makeCurrent)
+        setCurrentWidget(webView);
+
+    // webview actions
+    for (int i = 0; i < m_actions.count(); ++i) {
+        WebActionMapper *mapper = m_actions[i];
+        mapper->addChild(webView->page()->action(mapper->webAction()));
+    }
+
+    if (count() == 1)
+        currentChanged(currentIndex());
+    emit tabsChanged();
+    return webView;
+}
+
+void TabWidget::reloadAllTabs()
+{
+    for (int i = 0; i < count(); ++i) {
+        QWidget *tabWidget = widget(i);
+        if (WebView *tab = qobject_cast<WebView*>(tabWidget)) {
+            tab->reload();
+        }
+    }
+}
+
+void TabWidget::lineEditReturnPressed()
+{
+    if (QLineEdit *lineEdit = qobject_cast<QLineEdit*>(sender())) {
+        emit loadPage(lineEdit->text());
+        if (m_lineEdits->currentWidget() == lineEdit)
+            currentWebView()->setFocus();
+    }
+}
+
+void TabWidget::windowCloseRequested()
+{
+    WebPage *webPage = qobject_cast<WebPage*>(sender());
+    WebView *webView = qobject_cast<WebView*>(webPage->view());
+    int index = webViewIndex(webView);
+    if (index >= 0) {
+        if (count() == 1)
+            webView->webPage()->mainWindow()->close();
+        else
+            closeTab(index);
+    }
+}
+
+void TabWidget::closeOtherTabs(int index)
+{
+    if (-1 == index)
+        return;
+    for (int i = count() - 1; i > index; --i)
+        closeTab(i);
+    for (int i = index - 1; i >= 0; --i)
+        closeTab(i);
+}
+
+// When index is -1 index chooses the current tab
+void TabWidget::cloneTab(int index)
+{
+    if (index < 0)
+        index = currentIndex();
+    if (index < 0 || index >= count())
+        return;
+    WebView *tab = newTab(false);
+    tab->setUrl(webView(index)->url());
+}
+
+// When index is -1 index chooses the current tab
+void TabWidget::closeTab(int index)
+{
+    if (index < 0)
+        index = currentIndex();
+    if (index < 0 || index >= count())
+        return;
+
+    bool hasFocus = false;
+    if (WebView *tab = webView(index)) {
+        if (tab->isModified()) {
+            QMessageBox closeConfirmation(tab);
+            closeConfirmation.setWindowFlags(Qt::Sheet);
+            closeConfirmation.setWindowTitle(tr("Do you really want to close this page?"));
+            closeConfirmation.setInformativeText(tr("You have modified this page and when closing it you would lose the modification.\n"
+                                                     "Do you really want to close this page?\n"));
+            closeConfirmation.setIcon(QMessageBox::Question);
+            closeConfirmation.addButton(QMessageBox::Yes);
+            closeConfirmation.addButton(QMessageBox::No);
+            closeConfirmation.setEscapeButton(QMessageBox::No);
+            if (closeConfirmation.exec() == QMessageBox::No)
+                return;
+        }
+        hasFocus = tab->hasFocus();
+
+        m_recentlyClosedTabsAction->setEnabled(true);
+        m_recentlyClosedTabs.prepend(tab->url());
+        if (m_recentlyClosedTabs.size() >= TabWidget::m_recentlyClosedTabsSize)
+            m_recentlyClosedTabs.removeLast();
+    }
+    QWidget *lineEdit = m_lineEdits->widget(index);
+    m_lineEdits->removeWidget(lineEdit);
+    lineEdit->deleteLater();
+    QWidget *webView = widget(index);
+    removeTab(index);
+    webView->deleteLater();
+    emit tabsChanged();
+    if (hasFocus && count() > 0)
+        currentWebView()->setFocus();
+    if (count() == 0)
+        emit lastTabClosed();
+}
+
+void TabWidget::webViewLoadStarted()
+{
+    WebView *webView = qobject_cast<WebView*>(sender());
+    int index = webViewIndex(webView);
+    if (-1 != index) {
+        QIcon icon(QLatin1String(":loading.gif"));
+        setTabIcon(index, icon);
+    }
+}
+
+void TabWidget::webViewIconChanged()
+{
+    WebView *webView = qobject_cast<WebView*>(sender());
+    int index = webViewIndex(webView);
+    if (-1 != index) {
+        QIcon icon = BrowserApplication::instance()->icon(webView->url());
+        setTabIcon(index, icon);
+    }
+}
+
+void TabWidget::webViewTitleChanged(const QString &title)
+{
+    WebView *webView = qobject_cast<WebView*>(sender());
+    int index = webViewIndex(webView);
+    if (-1 != index) {
+        setTabText(index, title);
+    }
+    if (currentIndex() == index)
+        emit setCurrentTitle(title);
+    BrowserApplication::historyManager()->updateHistoryItem(webView->url(), title);
+}
+
+void TabWidget::webViewUrlChanged(const QUrl &url)
+{
+    WebView *webView = qobject_cast<WebView*>(sender());
+    int index = webViewIndex(webView);
+    if (-1 != index) {
+        m_tabBar->setTabData(index, url);
+    }
+    emit tabsChanged();
+}
+
+void TabWidget::aboutToShowRecentTabsMenu()
+{
+    m_recentlyClosedTabsMenu->clear();
+    for (int i = 0; i < m_recentlyClosedTabs.count(); ++i) {
+        QAction *action = new QAction(m_recentlyClosedTabsMenu);
+        action->setData(m_recentlyClosedTabs.at(i));
+        QIcon icon = BrowserApplication::instance()->icon(m_recentlyClosedTabs.at(i));
+        action->setIcon(icon);
+        action->setText(m_recentlyClosedTabs.at(i).toString());
+        m_recentlyClosedTabsMenu->addAction(action);
+    }
+}
+
+void TabWidget::aboutToShowRecentTriggeredAction(QAction *action)
+{
+    QUrl url = action->data().toUrl();
+    loadUrlInCurrentTab(url);
+}
+
+void TabWidget::mouseDoubleClickEvent(QMouseEvent *event)
+{
+    if (!childAt(event->pos())
+            // Remove the line below when QTabWidget does not have a one pixel frame
+            && event->pos().y() < (tabBar()->y() + tabBar()->height())) {
+        newTab();
+        return;
+    }
+    QTabWidget::mouseDoubleClickEvent(event);
+}
+
+void TabWidget::contextMenuEvent(QContextMenuEvent *event)
+{
+    if (!childAt(event->pos())) {
+        m_tabBar->contextMenuRequested(event->pos());
+        return;
+    }
+    QTabWidget::contextMenuEvent(event);
+}
+
+void TabWidget::mouseReleaseEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::MidButton && !childAt(event->pos())
+            // Remove the line below when QTabWidget does not have a one pixel frame
+            && event->pos().y() < (tabBar()->y() + tabBar()->height())) {
+        QUrl url(QApplication::clipboard()->text(QClipboard::Selection));
+        if (!url.isEmpty() && url.isValid() && !url.scheme().isEmpty()) {
+            WebView *webView = newTab();
+            webView->setUrl(url);
+        }
+    }
+}
+
+void TabWidget::loadUrlInCurrentTab(const QUrl &url)
+{
+    WebView *webView = currentWebView();
+    if (webView) {
+        webView->loadUrl(url);
+        webView->setFocus();
+    }
+}
+
+void TabWidget::nextTab()
+{
+    int next = currentIndex() + 1;
+    if (next == count())
+        next = 0;
+    setCurrentIndex(next);
+}
+
+void TabWidget::previousTab()
+{
+    int next = currentIndex() - 1;
+    if (next < 0)
+        next = count() - 1;
+    setCurrentIndex(next);
+}
+
+static const qint32 TabWidgetMagic = 0xaa;
+
+QByteArray TabWidget::saveState() const
+{
+    int version = 1;
+    QByteArray data;
+    QDataStream stream(&data, QIODevice::WriteOnly);
+
+    stream << qint32(TabWidgetMagic);
+    stream << qint32(version);
+
+    QStringList tabs;
+    for (int i = 0; i < count(); ++i) {
+        if (WebView *tab = qobject_cast<WebView*>(widget(i))) {
+            tabs.append(tab->url().toString());
+        } else {
+            tabs.append(QString::null);
+        }
+    }
+    stream << tabs;
+    stream << currentIndex();
+    return data;
+}
+
+bool TabWidget::restoreState(const QByteArray &state)
+{
+    int version = 1;
+    QByteArray sd = state;
+    QDataStream stream(&sd, QIODevice::ReadOnly);
+    if (stream.atEnd())
+        return false;
+
+    qint32 marker;
+    qint32 v;
+    stream >> marker;
+    stream >> v;
+    if (marker != TabWidgetMagic || v != version)
+        return false;
+
+    QStringList openTabs;
+    stream >> openTabs;
+
+    for (int i = 0; i < openTabs.count(); ++i) {
+        if (i != 0)
+            newTab();
+        loadPage(openTabs.at(i));
+    }
+
+    int currentTab;
+    stream >> currentTab;
+    setCurrentIndex(currentTab);
+
+    return true;
+}
+
+WebActionMapper::WebActionMapper(QAction *root, QWebPage::WebAction webAction, QObject *parent)
+    : QObject(parent)
+    , m_currentParent(0)
+    , m_root(root)
+    , m_webAction(webAction)
+{
+    if (!m_root)
+        return;
+    connect(m_root, SIGNAL(triggered()), this, SLOT(rootTriggered()));
+    connect(root, SIGNAL(destroyed(QObject *)), this, SLOT(rootDestroyed()));
+    root->setEnabled(false);
+}
+
+void WebActionMapper::rootDestroyed()
+{
+    m_root = 0;
+}
+
+void WebActionMapper::currentDestroyed()
+{
+    updateCurrent(0);
+}
+
+void WebActionMapper::addChild(QAction *action)
+{
+    if (!action)
+        return;
+    connect(action, SIGNAL(changed()), this, SLOT(childChanged()));
+}
+
+QWebPage::WebAction WebActionMapper::webAction() const
+{
+    return m_webAction;
+}
+
+void WebActionMapper::rootTriggered()
+{
+    if (m_currentParent) {
+        QAction *gotoAction = m_currentParent->action(m_webAction);
+        gotoAction->trigger();
+    }
+}
+
+void WebActionMapper::childChanged()
+{
+    if (QAction *source = qobject_cast<QAction*>(sender())) {
+        if (m_root
+            && m_currentParent
+            && source->parent() == m_currentParent) {
+            m_root->setChecked(source->isChecked());
+            m_root->setEnabled(source->isEnabled());
+        }
+    }
+}
+
+void WebActionMapper::updateCurrent(QWebPage *currentParent)
+{
+    if (m_currentParent)
+        disconnect(m_currentParent, SIGNAL(destroyed(QObject *)),
+                   this, SLOT(currentDestroyed()));
+
+    m_currentParent = currentParent;
+    if (!m_root)
+        return;
+    if (!m_currentParent) {
+        m_root->setEnabled(false);
+        m_root->setChecked(false);
+        return;
+    }
+    QAction *source = m_currentParent->action(m_webAction);
+    m_root->setChecked(source->isChecked());
+    m_root->setEnabled(source->isEnabled());
+    connect(m_currentParent, SIGNAL(destroyed(QObject *)),
+            this, SLOT(currentDestroyed()));
+}
+
diff --git a/demos/browser/tabwidget.h b/demos/browser/tabwidget.h
new file mode 100644
index 0000000000..da3fe42adb
--- /dev/null
+++ b/demos/browser/tabwidget.h
@@ -0,0 +1,224 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TABWIDGET_H
+#define TABWIDGET_H
+
+#include <QtGui/QTabBar>
+
+#include <QtGui/QShortcut>
+/*
+    Tab bar with a few more features such as a context menu and shortcuts
+ */
+class TabBar : public QTabBar
+{
+    Q_OBJECT
+
+signals:
+    void newTab();
+    void cloneTab(int index);
+    void closeTab(int index);
+    void closeOtherTabs(int index);
+    void reloadTab(int index);
+    void reloadAllTabs();
+    void tabMoveRequested(int fromIndex, int toIndex);
+
+public:
+    TabBar(QWidget *parent = 0);
+
+protected:
+    void mousePressEvent(QMouseEvent* event);
+    void mouseMoveEvent(QMouseEvent* event);
+
+private slots:
+    void selectTabAction();
+    void cloneTab();
+    void closeTab();
+    void closeOtherTabs();
+    void reloadTab();
+    void contextMenuRequested(const QPoint &position);
+
+private:
+    QList<QShortcut*> m_tabShortcuts;
+    friend class TabWidget;
+
+    QPoint m_dragStartPos;
+    int m_dragCurrentIndex;
+};
+
+#include <QtWebKit/QWebPage>
+
+QT_BEGIN_NAMESPACE
+class QAction;
+QT_END_NAMESPACE
+class WebView;
+/*!
+    A proxy object that connects a single browser action
+    to one child webpage action at a time.
+
+    Example usage: used to keep the main window stop action in sync with
+    the current tabs webview's stop action.
+ */
+class WebActionMapper : public QObject
+{
+    Q_OBJECT
+
+public:
+    WebActionMapper(QAction *root, QWebPage::WebAction webAction, QObject *parent);
+    QWebPage::WebAction webAction() const;
+    void addChild(QAction *action);
+    void updateCurrent(QWebPage *currentParent);
+
+private slots:
+    void rootTriggered();
+    void childChanged();
+    void rootDestroyed();
+    void currentDestroyed();
+
+private:
+    QWebPage *m_currentParent;
+    QAction *m_root;
+    QWebPage::WebAction m_webAction;
+};
+
+#include <QtCore/QUrl>
+#include <QtGui/QTabWidget>
+QT_BEGIN_NAMESPACE
+class QCompleter;
+class QLineEdit;
+class QMenu;
+class QStackedWidget;
+QT_END_NAMESPACE
+/*!
+    TabWidget that contains WebViews and a stack widget of associated line edits.
+
+    Connects up the current tab's signals to this class's signal and uses WebActionMapper
+    to proxy the actions.
+ */
+class TabWidget : public QTabWidget
+{
+    Q_OBJECT
+
+signals:
+    // tab widget signals
+    void loadPage(const QString &url);
+    void tabsChanged();
+    void lastTabClosed();
+
+    // current tab signals
+    void setCurrentTitle(const QString &url);
+    void showStatusBarMessage(const QString &message);
+    void linkHovered(const QString &link);
+    void loadProgress(int progress);
+    void geometryChangeRequested(const QRect &geometry);
+    void menuBarVisibilityChangeRequested(bool visible);
+    void statusBarVisibilityChangeRequested(bool visible);
+    void toolBarVisibilityChangeRequested(bool visible);
+    void printRequested(QWebFrame *frame);
+
+public:
+    TabWidget(QWidget *parent = 0);
+    void clear();
+    void addWebAction(QAction *action, QWebPage::WebAction webAction);
+
+    QAction *newTabAction() const;
+    QAction *closeTabAction() const;
+    QAction *recentlyClosedTabsAction() const;
+    QAction *nextTabAction() const;
+    QAction *previousTabAction() const;
+
+    QWidget *lineEditStack() const;
+    QLineEdit *currentLineEdit() const;
+    WebView *currentWebView() const;
+    WebView *webView(int index) const;
+    QLineEdit *lineEdit(int index) const;
+    int webViewIndex(WebView *webView) const;
+
+    QByteArray saveState() const;
+    bool restoreState(const QByteArray &state);
+
+protected:
+    void mouseDoubleClickEvent(QMouseEvent *event);
+    void contextMenuEvent(QContextMenuEvent *event);
+    void mouseReleaseEvent(QMouseEvent *event);
+
+public slots:
+    void loadUrlInCurrentTab(const QUrl &url);
+    WebView *newTab(bool makeCurrent = true);
+    void cloneTab(int index = -1);
+    void closeTab(int index = -1);
+    void closeOtherTabs(int index);
+    void reloadTab(int index = -1);
+    void reloadAllTabs();
+    void nextTab();
+    void previousTab();
+
+private slots:
+    void currentChanged(int index);
+    void aboutToShowRecentTabsMenu();
+    void aboutToShowRecentTriggeredAction(QAction *action);
+    void webViewLoadStarted();
+    void webViewIconChanged();
+    void webViewTitleChanged(const QString &title);
+    void webViewUrlChanged(const QUrl &url);
+    void lineEditReturnPressed();
+    void windowCloseRequested();
+    void moveTab(int fromIndex, int toIndex);
+
+private:
+    QAction *m_recentlyClosedTabsAction;
+    QAction *m_newTabAction;
+    QAction *m_closeTabAction;
+    QAction *m_nextTabAction;
+    QAction *m_previousTabAction;
+
+    QMenu *m_recentlyClosedTabsMenu;
+    static const int m_recentlyClosedTabsSize = 10;
+    QList<QUrl> m_recentlyClosedTabs;
+    QList<WebActionMapper*> m_actions;
+
+    QCompleter *m_lineEditCompleter;
+    QStackedWidget *m_lineEdits;
+    TabBar *m_tabBar;
+};
+
+#endif // TABWIDGET_H
+
diff --git a/demos/browser/toolbarsearch.cpp b/demos/browser/toolbarsearch.cpp
new file mode 100644
index 0000000000..255b5e94bc
--- /dev/null
+++ b/demos/browser/toolbarsearch.cpp
@@ -0,0 +1,161 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "toolbarsearch.h"
+#include "autosaver.h"
+
+#include <QtCore/QSettings>
+#include <QtCore/QUrl>
+
+#include <QtGui/QCompleter>
+#include <QtGui/QMenu>
+#include <QtGui/QStringListModel>
+
+#include <QtWebKit/QWebSettings>
+
+/*
+    ToolbarSearch is a very basic search widget that also contains a small history.
+    Searches are turned into urls that use Google to perform search
+ */
+ToolbarSearch::ToolbarSearch(QWidget *parent)
+    : SearchLineEdit(parent)
+    , m_autosaver(new AutoSaver(this))
+    , m_maxSavedSearches(10)
+    , m_stringListModel(new QStringListModel(this))
+{
+    QMenu *m = menu();
+    connect(m, SIGNAL(aboutToShow()), this, SLOT(aboutToShowMenu()));
+    connect(m, SIGNAL(triggered(QAction*)), this, SLOT(triggeredMenuAction(QAction*)));
+
+    QCompleter *completer = new QCompleter(m_stringListModel, this);
+    completer->setCompletionMode(QCompleter::InlineCompletion);
+    lineEdit()->setCompleter(completer);
+
+    connect(lineEdit(), SIGNAL(returnPressed()), SLOT(searchNow()));
+    setInactiveText(tr("Google"));
+    load();
+}
+
+ToolbarSearch::~ToolbarSearch()
+{
+    m_autosaver->saveIfNeccessary();
+}
+
+void ToolbarSearch::save()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("toolbarsearch"));
+    settings.setValue(QLatin1String("recentSearches"), m_stringListModel->stringList());
+    settings.setValue(QLatin1String("maximumSaved"), m_maxSavedSearches);
+    settings.endGroup();
+}
+
+void ToolbarSearch::load()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("toolbarsearch"));
+    QStringList list = settings.value(QLatin1String("recentSearches")).toStringList();
+    m_maxSavedSearches = settings.value(QLatin1String("maximumSaved"), m_maxSavedSearches).toInt();
+    m_stringListModel->setStringList(list);
+    settings.endGroup();
+}
+
+void ToolbarSearch::searchNow()
+{
+    QString searchText = lineEdit()->text();
+    QStringList newList = m_stringListModel->stringList();
+    if (newList.contains(searchText))
+        newList.removeAt(newList.indexOf(searchText));
+    newList.prepend(searchText);
+    if (newList.size() >= m_maxSavedSearches)
+        newList.removeLast();
+
+    QWebSettings *globalSettings = QWebSettings::globalSettings();
+    if (!globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled)) {
+        m_stringListModel->setStringList(newList);
+        m_autosaver->changeOccurred();
+    }
+
+    QUrl url(QLatin1String("http://www.google.com/search"));
+    url.addQueryItem(QLatin1String("q"), searchText);
+    url.addQueryItem(QLatin1String("ie"), QLatin1String("UTF-8"));
+    url.addQueryItem(QLatin1String("oe"), QLatin1String("UTF-8"));
+    url.addQueryItem(QLatin1String("client"), QLatin1String("qtdemobrowser"));
+    emit search(url);
+}
+
+void ToolbarSearch::aboutToShowMenu()
+{
+    lineEdit()->selectAll();
+    QMenu *m = menu();
+    m->clear();
+    QStringList list = m_stringListModel->stringList();
+    if (list.isEmpty()) {
+        m->addAction(tr("No Recent Searches"));
+        return;
+    }
+
+    QAction *recent = m->addAction(tr("Recent Searches"));
+    recent->setEnabled(false);
+    for (int i = 0; i < list.count(); ++i) {
+        QString text = list.at(i);
+        m->addAction(text)->setData(text);
+    }
+    m->addSeparator();
+    m->addAction(tr("Clear Recent Searches"), this, SLOT(clear()));
+}
+
+void ToolbarSearch::triggeredMenuAction(QAction *action)
+{
+    QVariant v = action->data();
+    if (v.canConvert<QString>()) {
+        QString text = v.toString();
+        lineEdit()->setText(text);
+        searchNow();
+    }
+}
+
+void ToolbarSearch::clear()
+{
+    m_stringListModel->setStringList(QStringList());
+    m_autosaver->changeOccurred();;
+}
+
diff --git a/demos/browser/toolbarsearch.h b/demos/browser/toolbarsearch.h
new file mode 100644
index 0000000000..8e1be8d4b5
--- /dev/null
+++ b/demos/browser/toolbarsearch.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TOOLBARSEARCH_H
+#define TOOLBARSEARCH_H
+
+#include "searchlineedit.h"
+
+QT_BEGIN_NAMESPACE
+class QUrl;
+class QAction;
+class QStringListModel;
+QT_END_NAMESPACE
+
+class AutoSaver;
+
+class ToolbarSearch : public SearchLineEdit
+{
+    Q_OBJECT
+
+signals:
+    void search(const QUrl &url);
+
+public:
+    ToolbarSearch(QWidget *parent = 0);
+    ~ToolbarSearch();
+
+public slots:
+    void clear();
+    void searchNow();
+
+private slots:
+    void save();
+    void aboutToShowMenu();
+    void triggeredMenuAction(QAction *action);
+
+private:
+    void load();
+
+    AutoSaver *m_autosaver;
+    int m_maxSavedSearches;
+    QStringListModel *m_stringListModel;
+};
+
+#endif // TOOLBARSEARCH_H
+
diff --git a/demos/browser/urllineedit.cpp b/demos/browser/urllineedit.cpp
new file mode 100644
index 0000000000..f7a6345589
--- /dev/null
+++ b/demos/browser/urllineedit.cpp
@@ -0,0 +1,340 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "urllineedit.h"
+
+#include "browserapplication.h"
+#include "searchlineedit.h"
+#include "webview.h"
+
+#include <QtCore/QEvent>
+
+#include <QtGui/QApplication>
+#include <QtGui/QCompleter>
+#include <QtGui/QFocusEvent>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QPainter>
+#include <QtGui/QStyle>
+#include <QtGui/QStyleOptionFrameV2>
+
+#include <QtCore/QDebug>
+
+ExLineEdit::ExLineEdit(QWidget *parent)
+    : QWidget(parent)
+    , m_leftWidget(0)
+    , m_lineEdit(new QLineEdit(this))
+    , m_clearButton(0)
+{
+    setFocusPolicy(m_lineEdit->focusPolicy());
+    setAttribute(Qt::WA_InputMethodEnabled);
+    setSizePolicy(m_lineEdit->sizePolicy());
+    setBackgroundRole(m_lineEdit->backgroundRole());
+    setMouseTracking(true);
+    setAcceptDrops(true);
+    setAttribute(Qt::WA_MacShowFocusRect, true);
+    QPalette p = m_lineEdit->palette();
+    setPalette(p);
+
+    // line edit
+    m_lineEdit->setFrame(false);
+    m_lineEdit->setFocusProxy(this);
+    m_lineEdit->setAttribute(Qt::WA_MacShowFocusRect, false);
+    QPalette clearPalette = m_lineEdit->palette();
+    clearPalette.setBrush(QPalette::Base, QBrush(Qt::transparent));
+    m_lineEdit->setPalette(clearPalette);
+
+    // clearButton
+    m_clearButton = new ClearButton(this);
+    connect(m_clearButton, SIGNAL(clicked()),
+            m_lineEdit, SLOT(clear()));
+    connect(m_lineEdit, SIGNAL(textChanged(const QString&)),
+            m_clearButton, SLOT(textChanged(const QString&)));
+}
+
+void ExLineEdit::setLeftWidget(QWidget *widget)
+{
+    m_leftWidget = widget;
+}
+
+QWidget *ExLineEdit::leftWidget() const
+{
+    return m_leftWidget;
+}
+
+void ExLineEdit::resizeEvent(QResizeEvent *event)
+{
+    Q_ASSERT(m_leftWidget);
+    updateGeometries();
+    QWidget::resizeEvent(event);
+}
+
+void ExLineEdit::updateGeometries()
+{
+    QStyleOptionFrameV2 panel;
+    initStyleOption(&panel);
+    QRect rect = style()->subElementRect(QStyle::SE_LineEditContents, &panel, this);
+
+    int height = rect.height();
+    int width = rect.width();
+
+    int m_leftWidgetHeight = m_leftWidget->height();
+    m_leftWidget->setGeometry(rect.x() + 2,          rect.y() + (height - m_leftWidgetHeight)/2,
+                              m_leftWidget->width(), m_leftWidget->height());
+
+    int clearButtonWidth = this->height();
+    m_lineEdit->setGeometry(m_leftWidget->x() + m_leftWidget->width(),        0,
+                            width - clearButtonWidth - m_leftWidget->width(), this->height());
+
+    m_clearButton->setGeometry(this->width() - clearButtonWidth, 0,
+                               clearButtonWidth, this->height());
+}
+
+void ExLineEdit::initStyleOption(QStyleOptionFrameV2 *option) const
+{
+    option->initFrom(this);
+    option->rect = contentsRect();
+    option->lineWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth, option, this);
+    option->midLineWidth = 0;
+    option->state |= QStyle::State_Sunken;
+    if (m_lineEdit->isReadOnly())
+        option->state |= QStyle::State_ReadOnly;
+#ifdef QT_KEYPAD_NAVIGATION
+    if (hasEditFocus())
+        option->state |= QStyle::State_HasEditFocus;
+#endif
+    option->features = QStyleOptionFrameV2::None;
+}
+
+QSize ExLineEdit::sizeHint() const
+{
+    m_lineEdit->setFrame(true);
+    QSize size = m_lineEdit->sizeHint();
+    m_lineEdit->setFrame(false);
+    return size;
+}
+
+void ExLineEdit::focusInEvent(QFocusEvent *event)
+{
+    m_lineEdit->event(event);
+    QWidget::focusInEvent(event);
+}
+
+void ExLineEdit::focusOutEvent(QFocusEvent *event)
+{
+    m_lineEdit->event(event);
+
+    if (m_lineEdit->completer()) {
+        connect(m_lineEdit->completer(), SIGNAL(activated(QString)),
+                         m_lineEdit, SLOT(setText(QString)));
+        connect(m_lineEdit->completer(), SIGNAL(highlighted(QString)),
+                         m_lineEdit, SLOT(_q_completionHighlighted(QString)));
+    }
+    QWidget::focusOutEvent(event);
+}
+
+void ExLineEdit::keyPressEvent(QKeyEvent *event)
+{
+    m_lineEdit->event(event);
+}
+
+bool ExLineEdit::event(QEvent *event)
+{
+    if (event->type() == QEvent::ShortcutOverride)
+        return m_lineEdit->event(event);
+    return QWidget::event(event);
+}
+
+void ExLineEdit::paintEvent(QPaintEvent *)
+{
+    QPainter p(this);
+    QStyleOptionFrameV2 panel;
+    initStyleOption(&panel);
+    style()->drawPrimitive(QStyle::PE_PanelLineEdit, &panel, &p, this);
+}
+
+QVariant ExLineEdit::inputMethodQuery(Qt::InputMethodQuery property) const
+{
+    return m_lineEdit->inputMethodQuery(property);
+}
+
+void ExLineEdit::inputMethodEvent(QInputMethodEvent *e)
+{
+    m_lineEdit->event(e);
+}
+
+
+class UrlIconLabel : public QLabel
+{
+
+public:
+    UrlIconLabel(QWidget *parent);
+
+    WebView *m_webView;
+
+protected:
+    void mousePressEvent(QMouseEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
+
+private:
+    QPoint m_dragStartPos;
+
+};
+
+UrlIconLabel::UrlIconLabel(QWidget *parent)
+    : QLabel(parent)
+    , m_webView(0)
+{
+    setMinimumWidth(16);
+    setMinimumHeight(16);
+}
+
+void UrlIconLabel::mousePressEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton)
+        m_dragStartPos = event->pos();
+    QLabel::mousePressEvent(event);
+}
+
+void UrlIconLabel::mouseMoveEvent(QMouseEvent *event)
+{
+    if (event->buttons() == Qt::LeftButton
+        && (event->pos() - m_dragStartPos).manhattanLength() > QApplication::startDragDistance()
+         && m_webView) {
+        QDrag *drag = new QDrag(this);
+        QMimeData *mimeData = new QMimeData;
+        mimeData->setText(QString::fromUtf8(m_webView->url().toEncoded()));
+        QList<QUrl> urls;
+        urls.append(m_webView->url());
+        mimeData->setUrls(urls);
+        drag->setMimeData(mimeData);
+        drag->exec();
+    }
+}
+
+UrlLineEdit::UrlLineEdit(QWidget *parent)
+    : ExLineEdit(parent)
+    , m_webView(0)
+    , m_iconLabel(0)
+{
+    // icon
+    m_iconLabel = new UrlIconLabel(this);
+    m_iconLabel->resize(16, 16);
+    setLeftWidget(m_iconLabel);
+    m_defaultBaseColor = palette().color(QPalette::Base);
+
+    webViewIconChanged();
+}
+
+void UrlLineEdit::setWebView(WebView *webView)
+{
+    Q_ASSERT(!m_webView);
+    m_webView = webView;
+    m_iconLabel->m_webView = webView;
+    connect(webView, SIGNAL(urlChanged(const QUrl &)),
+        this, SLOT(webViewUrlChanged(const QUrl &)));
+    connect(webView, SIGNAL(loadFinished(bool)),
+        this, SLOT(webViewIconChanged()));
+    connect(webView, SIGNAL(iconChanged()),
+        this, SLOT(webViewIconChanged()));
+    connect(webView, SIGNAL(loadProgress(int)),
+        this, SLOT(update()));
+}
+
+void UrlLineEdit::webViewUrlChanged(const QUrl &url)
+{
+    m_lineEdit->setText(QString::fromUtf8(url.toEncoded()));
+    m_lineEdit->setCursorPosition(0);
+}
+
+void UrlLineEdit::webViewIconChanged()
+{
+    QUrl url = (m_webView)  ? m_webView->url() : QUrl();
+    QIcon icon = BrowserApplication::instance()->icon(url);
+    QPixmap pixmap(icon.pixmap(16, 16));
+    m_iconLabel->setPixmap(pixmap);
+}
+
+QLinearGradient UrlLineEdit::generateGradient(const QColor &color) const
+{
+    QLinearGradient gradient(0, 0, 0, height());
+    gradient.setColorAt(0, m_defaultBaseColor);
+    gradient.setColorAt(0.15, color.lighter(120));
+    gradient.setColorAt(0.5, color);
+    gradient.setColorAt(0.85, color.lighter(120));
+    gradient.setColorAt(1, m_defaultBaseColor);
+    return gradient;
+}
+
+void UrlLineEdit::focusOutEvent(QFocusEvent *event)
+{
+    if (m_lineEdit->text().isEmpty() && m_webView)
+        m_lineEdit->setText(QString::fromUtf8(m_webView->url().toEncoded()));
+    ExLineEdit::focusOutEvent(event);
+}
+
+void UrlLineEdit::paintEvent(QPaintEvent *event)
+{
+    QPalette p = palette();
+    if (m_webView && m_webView->url().scheme() == QLatin1String("https")) {
+        QColor lightYellow(248, 248, 210);
+        p.setBrush(QPalette::Base, generateGradient(lightYellow));
+    } else {
+        p.setBrush(QPalette::Base, m_defaultBaseColor);
+    }
+    setPalette(p);
+    ExLineEdit::paintEvent(event);
+
+    QPainter painter(this);
+    QStyleOptionFrameV2 panel;
+    initStyleOption(&panel);
+    QRect backgroundRect = style()->subElementRect(QStyle::SE_LineEditContents, &panel, this);
+    if (m_webView && !hasFocus()) {
+        int progress = m_webView->progress();
+        QColor loadingColor = QColor(116, 192, 250);
+        painter.setBrush(generateGradient(loadingColor));
+        painter.setPen(Qt::transparent);
+        int mid = backgroundRect.width() / 100 * progress;
+        QRect progressRect(backgroundRect.x(), backgroundRect.y(), mid, backgroundRect.height());
+        painter.drawRect(progressRect);
+    }
+}
diff --git a/demos/browser/urllineedit.h b/demos/browser/urllineedit.h
new file mode 100644
index 0000000000..6a718f071a
--- /dev/null
+++ b/demos/browser/urllineedit.h
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef URLLINEEDIT_H
+#define URLLINEEDIT_H
+
+#include <QtCore/QUrl>
+#include <QtGui/QWidget>
+#include <QtGui/QStyleOptionFrame>
+
+QT_BEGIN_NAMESPACE
+class QLineEdit;
+QT_END_NAMESPACE
+
+class ClearButton;
+class ExLineEdit : public QWidget
+{
+    Q_OBJECT
+
+public:
+    ExLineEdit(QWidget *parent = 0);
+
+    inline QLineEdit *lineEdit() const { return m_lineEdit; }
+
+    void setLeftWidget(QWidget *widget);
+    QWidget *leftWidget() const;
+
+    QSize sizeHint() const;
+
+    QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
+protected:
+    void focusInEvent(QFocusEvent *event);
+    void focusOutEvent(QFocusEvent *event);
+    void keyPressEvent(QKeyEvent *event);
+    void paintEvent(QPaintEvent *event);
+    void resizeEvent(QResizeEvent *event);
+    void inputMethodEvent(QInputMethodEvent *e);
+    bool event(QEvent *event);
+
+protected:
+    void updateGeometries();
+    void initStyleOption(QStyleOptionFrameV2 *option) const;
+
+    QWidget *m_leftWidget;
+    QLineEdit *m_lineEdit;
+    ClearButton *m_clearButton;
+};
+
+class UrlIconLabel;
+class WebView;
+class UrlLineEdit : public ExLineEdit
+{
+    Q_OBJECT
+
+public:
+    UrlLineEdit(QWidget *parent = 0);
+    void setWebView(WebView *webView);
+
+protected:
+    void paintEvent(QPaintEvent *event);
+    void focusOutEvent(QFocusEvent *event);
+
+private slots:
+    void webViewUrlChanged(const QUrl &url);
+    void webViewIconChanged();
+
+private:
+    QLinearGradient generateGradient(const QColor &color) const;
+    WebView *m_webView;
+    UrlIconLabel *m_iconLabel;
+    QColor m_defaultBaseColor;
+
+};
+
+
+#endif // URLLINEEDIT_H
+
diff --git a/demos/browser/webview.cpp b/demos/browser/webview.cpp
new file mode 100644
index 0000000000..6c4d857111
--- /dev/null
+++ b/demos/browser/webview.cpp
@@ -0,0 +1,304 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "browserapplication.h"
+#include "browsermainwindow.h"
+#include "cookiejar.h"
+#include "downloadmanager.h"
+#include "networkaccessmanager.h"
+#include "tabwidget.h"
+#include "webview.h"
+
+#include <QtGui/QClipboard>
+#include <QtGui/QMenu>
+#include <QtGui/QMessageBox>
+#include <QtGui/QMouseEvent>
+
+#include <QtWebKit/QWebHitTestResult>
+
+#include <QtUiTools/QUiLoader>
+
+#include <QtCore/QDebug>
+#include <QtCore/QBuffer>
+
+WebPage::WebPage(QObject *parent)
+    : QWebPage(parent)
+    , m_keyboardModifiers(Qt::NoModifier)
+    , m_pressedButtons(Qt::NoButton)
+    , m_openInNewTab(false)
+{
+    setNetworkAccessManager(BrowserApplication::networkAccessManager());
+    connect(this, SIGNAL(unsupportedContent(QNetworkReply *)),
+            this, SLOT(handleUnsupportedContent(QNetworkReply *)));
+}
+
+BrowserMainWindow *WebPage::mainWindow()
+{
+    QObject *w = this->parent();
+    while (w) {
+        if (BrowserMainWindow *mw = qobject_cast<BrowserMainWindow*>(w))
+            return mw;
+        w = w->parent();
+    }
+    return BrowserApplication::instance()->mainWindow();
+}
+
+bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type)
+{
+    // ctrl open in new tab
+    // ctrl-shift open in new tab and select
+    // ctrl-alt open in new window
+    if (type == QWebPage::NavigationTypeLinkClicked
+        && (m_keyboardModifiers & Qt::ControlModifier
+            || m_pressedButtons == Qt::MidButton)) {
+        bool newWindow = (m_keyboardModifiers & Qt::AltModifier);
+        WebView *webView;
+        if (newWindow) {
+            BrowserApplication::instance()->newMainWindow();
+            BrowserMainWindow *newMainWindow = BrowserApplication::instance()->mainWindow();
+            webView = newMainWindow->currentTab();
+            newMainWindow->raise();
+            newMainWindow->activateWindow();
+            webView->setFocus();
+        } else {
+            bool selectNewTab = (m_keyboardModifiers & Qt::ShiftModifier);
+            webView = mainWindow()->tabWidget()->newTab(selectNewTab);
+        }
+        webView->load(request);
+        m_keyboardModifiers = Qt::NoModifier;
+        m_pressedButtons = Qt::NoButton;
+        return false;
+    }
+    if (frame == mainFrame()) {
+        m_loadingUrl = request.url();
+        emit loadingUrl(m_loadingUrl);
+    }
+    return QWebPage::acceptNavigationRequest(frame, request, type);
+}
+
+QWebPage *WebPage::createWindow(QWebPage::WebWindowType type)
+{
+    Q_UNUSED(type);
+    if (m_keyboardModifiers & Qt::ControlModifier || m_pressedButtons == Qt::MidButton)
+        m_openInNewTab = true;
+    if (m_openInNewTab) {
+        m_openInNewTab = false;
+        return mainWindow()->tabWidget()->newTab()->page();
+    }
+    BrowserApplication::instance()->newMainWindow();
+    BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
+    return mainWindow->currentTab()->page();
+}
+
+#if !defined(QT_NO_UITOOLS)
+QObject *WebPage::createPlugin(const QString &classId, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues)
+{
+    Q_UNUSED(url);
+    Q_UNUSED(paramNames);
+    Q_UNUSED(paramValues);
+    QUiLoader loader;
+    return loader.createWidget(classId, view());
+}
+#endif // !defined(QT_NO_UITOOLS)
+
+void WebPage::handleUnsupportedContent(QNetworkReply *reply)
+{
+    if (reply->error() == QNetworkReply::NoError) {
+        BrowserApplication::downloadManager()->handleUnsupportedContent(reply);
+        return;
+    }
+
+    QFile file(QLatin1String(":/notfound.html"));
+    bool isOpened = file.open(QIODevice::ReadOnly);
+    Q_ASSERT(isOpened);
+    QString title = tr("Error loading page: %1").arg(reply->url().toString());
+    QString html = QString(QLatin1String(file.readAll()))
+                        .arg(title)
+                        .arg(reply->errorString())
+                        .arg(reply->url().toString());
+
+    QBuffer imageBuffer;
+    imageBuffer.open(QBuffer::ReadWrite);
+    QIcon icon = view()->style()->standardIcon(QStyle::SP_MessageBoxWarning, 0, view());
+    QPixmap pixmap = icon.pixmap(QSize(32,32));
+    if (pixmap.save(&imageBuffer, "PNG")) {
+        html.replace(QLatin1String("IMAGE_BINARY_DATA_HERE"),
+                     QString(QLatin1String(imageBuffer.buffer().toBase64())));
+    }
+
+    QList<QWebFrame*> frames;
+    frames.append(mainFrame());
+    while (!frames.isEmpty()) {
+        QWebFrame *frame = frames.takeFirst();
+        if (frame->url() == reply->url()) {
+            frame->setHtml(html, reply->url());
+            return;
+        }
+        QList<QWebFrame *> children = frame->childFrames();
+        foreach(QWebFrame *frame, children)
+            frames.append(frame);
+    }
+    if (m_loadingUrl == reply->url()) {
+        mainFrame()->setHtml(html, reply->url());
+    }
+}
+
+
+WebView::WebView(QWidget* parent)
+    : QWebView(parent)
+    , m_progress(0)
+    , m_page(new WebPage(this))
+{
+    setPage(m_page);
+    connect(page(), SIGNAL(statusBarMessage(const QString&)),
+            SLOT(setStatusBarText(const QString&)));
+    connect(this, SIGNAL(loadProgress(int)),
+            this, SLOT(setProgress(int)));
+    connect(this, SIGNAL(loadFinished(bool)),
+            this, SLOT(loadFinished()));
+    connect(page(), SIGNAL(loadingUrl(const QUrl&)),
+            this, SIGNAL(urlChanged(const QUrl &)));
+    connect(page(), SIGNAL(downloadRequested(const QNetworkRequest &)),
+            this, SLOT(downloadRequested(const QNetworkRequest &)));
+    page()->setForwardUnsupportedContent(true);
+
+}
+
+void WebView::contextMenuEvent(QContextMenuEvent *event)
+{
+    QWebHitTestResult r = page()->mainFrame()->hitTestContent(event->pos());
+    if (!r.linkUrl().isEmpty()) {
+        QMenu menu(this);
+        menu.addAction(pageAction(QWebPage::OpenLinkInNewWindow));
+        menu.addAction(tr("Open in New Tab"), this, SLOT(openLinkInNewTab()));
+        menu.addSeparator();
+        menu.addAction(pageAction(QWebPage::DownloadLinkToDisk));
+        // Add link to bookmarks...
+        menu.addSeparator();
+        menu.addAction(pageAction(QWebPage::CopyLinkToClipboard));
+        if (page()->settings()->testAttribute(QWebSettings::DeveloperExtrasEnabled))
+            menu.addAction(pageAction(QWebPage::InspectElement));
+        menu.exec(mapToGlobal(event->pos()));
+        return;
+    }
+    QWebView::contextMenuEvent(event);
+}
+
+void WebView::wheelEvent(QWheelEvent *event)
+{
+    if (QApplication::keyboardModifiers() & Qt::ControlModifier) {
+        int numDegrees = event->delta() / 8;
+        int numSteps = numDegrees / 15;
+        setTextSizeMultiplier(textSizeMultiplier() + numSteps * 0.1);
+        event->accept();
+        return;
+    }
+    QWebView::wheelEvent(event);
+}
+
+void WebView::openLinkInNewTab()
+{
+    m_page->m_openInNewTab = true;
+    pageAction(QWebPage::OpenLinkInNewWindow)->trigger();
+}
+
+void WebView::setProgress(int progress)
+{
+    m_progress = progress;
+}
+
+void WebView::loadFinished()
+{
+    if (100 != m_progress) {
+        qWarning() << "Recieved finished signal while progress is still:" << progress()
+                   << "Url:" << url();
+    }
+    m_progress = 0;
+}
+
+void WebView::loadUrl(const QUrl &url)
+{
+    m_initialUrl = url;
+    load(url);
+}
+
+QString WebView::lastStatusBarText() const
+{
+    return m_statusBarText;
+}
+
+QUrl WebView::url() const
+{
+    QUrl url = QWebView::url();
+    if (!url.isEmpty())
+        return url;
+
+    return m_initialUrl;
+}
+
+void WebView::mousePressEvent(QMouseEvent *event)
+{
+    m_page->m_pressedButtons = event->buttons();
+    m_page->m_keyboardModifiers = event->modifiers();
+    QWebView::mousePressEvent(event);
+}
+
+void WebView::mouseReleaseEvent(QMouseEvent *event)
+{
+    QWebView::mouseReleaseEvent(event);
+    if (!event->isAccepted() && (m_page->m_pressedButtons & Qt::MidButton)) {
+        QUrl url(QApplication::clipboard()->text(QClipboard::Selection));
+        if (!url.isEmpty() && url.isValid() && !url.scheme().isEmpty()) {
+            setUrl(url);
+        }
+    }
+}
+
+void WebView::setStatusBarText(const QString &string)
+{
+    m_statusBarText = string;
+}
+
+void WebView::downloadRequested(const QNetworkRequest &request)
+{
+    BrowserApplication::downloadManager()->download(request);
+}
+
diff --git a/demos/browser/webview.h b/demos/browser/webview.h
new file mode 100644
index 0000000000..a41bcf3fea
--- /dev/null
+++ b/demos/browser/webview.h
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WEBVIEW_H
+#define WEBVIEW_H
+
+#include <QtWebKit/QWebView>
+
+QT_BEGIN_NAMESPACE
+class QAuthenticator;
+class QMouseEvent;
+class QNetworkProxy;
+class QNetworkReply;
+class QSslError;
+QT_END_NAMESPACE
+
+class BrowserMainWindow;
+class WebPage : public QWebPage {
+    Q_OBJECT
+
+signals:
+    void loadingUrl(const QUrl &url);
+
+public:
+    WebPage(QObject *parent = 0);
+    BrowserMainWindow *mainWindow();
+
+protected:
+    bool acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type);
+    QWebPage *createWindow(QWebPage::WebWindowType type);
+#if !defined(QT_NO_UITOOLS)
+    QObject *createPlugin(const QString &classId, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues);
+#endif
+
+private slots:
+    void handleUnsupportedContent(QNetworkReply *reply);
+
+private:
+    friend class WebView;
+
+    // set the webview mousepressedevent
+    Qt::KeyboardModifiers m_keyboardModifiers;
+    Qt::MouseButtons m_pressedButtons;
+    bool m_openInNewTab;
+    QUrl m_loadingUrl;
+};
+
+class WebView : public QWebView {
+    Q_OBJECT
+
+public:
+    WebView(QWidget *parent = 0);
+    WebPage *webPage() const { return m_page; }
+
+    void loadUrl(const QUrl &url);
+    QUrl url() const;
+
+    QString lastStatusBarText() const;
+    inline int progress() const { return m_progress; }
+
+protected:
+    void mousePressEvent(QMouseEvent *event);
+    void mouseReleaseEvent(QMouseEvent *event);
+    void contextMenuEvent(QContextMenuEvent *event);
+    void wheelEvent(QWheelEvent *event);
+
+private slots:
+    void setProgress(int progress);
+    void loadFinished();
+    void setStatusBarText(const QString &string);
+    void downloadRequested(const QNetworkRequest &request);
+    void openLinkInNewTab();
+
+private:
+    QString m_statusBarText;
+    QUrl m_initialUrl;
+    int m_progress;
+    WebPage *m_page;
+};
+
+#endif
diff --git a/demos/browser/xbel.cpp b/demos/browser/xbel.cpp
new file mode 100644
index 0000000000..a92b649e32
--- /dev/null
+++ b/demos/browser/xbel.cpp
@@ -0,0 +1,320 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "xbel.h"
+
+#include <QtCore/QFile>
+
+BookmarkNode::BookmarkNode(BookmarkNode::Type type, BookmarkNode *parent) :
+     expanded(false)
+   , m_parent(parent)
+   , m_type(type)
+{
+    if (parent)
+        parent->add(this);
+}
+
+BookmarkNode::~BookmarkNode()
+{
+    if (m_parent)
+        m_parent->remove(this);
+    qDeleteAll(m_children);
+    m_parent = 0;
+    m_type = BookmarkNode::Root;
+}
+
+bool BookmarkNode::operator==(const BookmarkNode &other)
+{
+    if (url != other.url
+        || title != other.title
+        || desc != other.desc
+        || expanded != other.expanded
+        || m_type != other.m_type
+        || m_children.count() != other.m_children.count())
+        return false;
+
+    for (int i = 0; i < m_children.count(); ++i)
+        if (!((*(m_children[i])) == (*(other.m_children[i]))))
+            return false;
+    return true;
+}
+
+BookmarkNode::Type BookmarkNode::type() const
+{
+    return m_type;
+}
+
+void BookmarkNode::setType(Type type)
+{
+    m_type = type;
+}
+
+QList<BookmarkNode *> BookmarkNode::children() const
+{
+    return m_children;
+}
+
+BookmarkNode *BookmarkNode::parent() const
+{
+    return m_parent;
+}
+
+void BookmarkNode::add(BookmarkNode *child, int offset)
+{
+    Q_ASSERT(child->m_type != Root);
+    if (child->m_parent)
+        child->m_parent->remove(child);
+    child->m_parent = this;
+    if (-1 == offset)
+        offset = m_children.size();
+    m_children.insert(offset, child);
+}
+
+void BookmarkNode::remove(BookmarkNode *child)
+{
+    child->m_parent = 0;
+    m_children.removeAll(child);
+}
+
+
+XbelReader::XbelReader()
+{
+}
+
+BookmarkNode *XbelReader::read(const QString &fileName)
+{
+    QFile file(fileName);
+    if (!file.exists()) {
+        return new BookmarkNode(BookmarkNode::Root);
+    }
+    file.open(QFile::ReadOnly);
+    return read(&file);
+}
+
+BookmarkNode *XbelReader::read(QIODevice *device)
+{
+    BookmarkNode *root = new BookmarkNode(BookmarkNode::Root);
+    setDevice(device);
+    while (!atEnd()) {
+        readNext();
+        if (isStartElement()) {
+            QString version = attributes().value(QLatin1String("version")).toString();
+            if (name() == QLatin1String("xbel")
+                && (version.isEmpty() || version == QLatin1String("1.0"))) {
+                readXBEL(root);
+            } else {
+                raiseError(QObject::tr("The file is not an XBEL version 1.0 file."));
+            }
+        }
+    }
+    return root;
+}
+
+void XbelReader::readXBEL(BookmarkNode *parent)
+{
+    Q_ASSERT(isStartElement() && name() == QLatin1String("xbel"));
+
+    while (!atEnd()) {
+        readNext();
+        if (isEndElement())
+            break;
+
+        if (isStartElement()) {
+            if (name() == QLatin1String("folder"))
+                readFolder(parent);
+            else if (name() == QLatin1String("bookmark"))
+                readBookmarkNode(parent);
+            else if (name() == QLatin1String("separator"))
+                readSeparator(parent);
+            else
+                skipUnknownElement();
+        }
+    }
+}
+
+void XbelReader::readFolder(BookmarkNode *parent)
+{
+    Q_ASSERT(isStartElement() && name() == QLatin1String("folder"));
+
+    BookmarkNode *folder = new BookmarkNode(BookmarkNode::Folder, parent);
+    folder->expanded = (attributes().value(QLatin1String("folded")) == QLatin1String("no"));
+
+    while (!atEnd()) {
+        readNext();
+
+        if (isEndElement())
+            break;
+
+        if (isStartElement()) {
+            if (name() == QLatin1String("title"))
+                readTitle(folder);
+            else if (name() == QLatin1String("desc"))
+                readDescription(folder);
+            else if (name() == QLatin1String("folder"))
+                readFolder(folder);
+            else if (name() == QLatin1String("bookmark"))
+                readBookmarkNode(folder);
+            else if (name() == QLatin1String("separator"))
+                readSeparator(folder);
+            else
+                skipUnknownElement();
+        }
+    }
+}
+
+void XbelReader::readTitle(BookmarkNode *parent)
+{
+    Q_ASSERT(isStartElement() && name() == QLatin1String("title"));
+    parent->title = readElementText();
+}
+
+void XbelReader::readDescription(BookmarkNode *parent)
+{
+    Q_ASSERT(isStartElement() && name() == QLatin1String("desc"));
+    parent->desc = readElementText();
+}
+
+void XbelReader::readSeparator(BookmarkNode *parent)
+{
+    new BookmarkNode(BookmarkNode::Separator, parent);
+    // empty elements have a start and end element
+    readNext();
+}
+
+void XbelReader::readBookmarkNode(BookmarkNode *parent)
+{
+    Q_ASSERT(isStartElement() && name() == QLatin1String("bookmark"));
+    BookmarkNode *bookmark = new BookmarkNode(BookmarkNode::Bookmark, parent);
+    bookmark->url = attributes().value(QLatin1String("href")).toString();
+    while (!atEnd()) {
+        readNext();
+        if (isEndElement())
+            break;
+
+        if (isStartElement()) {
+            if (name() == QLatin1String("title"))
+                readTitle(bookmark);
+            else if (name() == QLatin1String("desc"))
+                readDescription(bookmark);
+            else
+                skipUnknownElement();
+        }
+    }
+    if (bookmark->title.isEmpty())
+        bookmark->title = QObject::tr("Unknown title");
+}
+
+void XbelReader::skipUnknownElement()
+{
+    Q_ASSERT(isStartElement());
+
+    while (!atEnd()) {
+        readNext();
+
+        if (isEndElement())
+            break;
+
+        if (isStartElement())
+            skipUnknownElement();
+    }
+}
+
+
+XbelWriter::XbelWriter()
+{
+    setAutoFormatting(true);
+}
+
+bool XbelWriter::write(const QString &fileName, const BookmarkNode *root)
+{
+    QFile file(fileName);
+    if (!root || !file.open(QFile::WriteOnly))
+        return false;
+    return write(&file, root);
+}
+
+bool XbelWriter::write(QIODevice *device, const BookmarkNode *root)
+{
+    setDevice(device);
+
+    writeStartDocument();
+    writeDTD(QLatin1String("<!DOCTYPE xbel>"));
+    writeStartElement(QLatin1String("xbel"));
+    writeAttribute(QLatin1String("version"), QLatin1String("1.0"));
+    if (root->type() == BookmarkNode::Root) {
+        for (int i = 0; i < root->children().count(); ++i)
+            writeItem(root->children().at(i));
+    } else {
+        writeItem(root);
+    }
+
+    writeEndDocument();
+    return true;
+}
+
+void XbelWriter::writeItem(const BookmarkNode *parent)
+{
+    switch (parent->type()) {
+    case BookmarkNode::Folder:
+        writeStartElement(QLatin1String("folder"));
+        writeAttribute(QLatin1String("folded"), parent->expanded ? QLatin1String("no") : QLatin1String("yes"));
+        writeTextElement(QLatin1String("title"), parent->title);
+        for (int i = 0; i < parent->children().count(); ++i)
+            writeItem(parent->children().at(i));
+        writeEndElement();
+        break;
+    case BookmarkNode::Bookmark:
+        writeStartElement(QLatin1String("bookmark"));
+        if (!parent->url.isEmpty())
+            writeAttribute(QLatin1String("href"), parent->url);
+        writeTextElement(QLatin1String("title"), parent->title);
+        if (!parent->desc.isEmpty())
+            writeAttribute(QLatin1String("desc"), parent->desc);
+        writeEndElement();
+        break;
+    case BookmarkNode::Separator:
+        writeEmptyElement(QLatin1String("separator"));
+        break;
+    default:
+        break;
+    }
+}
+
diff --git a/demos/browser/xbel.h b/demos/browser/xbel.h
new file mode 100644
index 0000000000..b736d020b9
--- /dev/null
+++ b/demos/browser/xbel.h
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef XBEL_H
+#define XBEL_H
+
+#include <QtCore/QXmlStreamReader>
+#include <QtCore/QDateTime>
+
+class BookmarkNode
+{
+public:
+    enum Type {
+        Root,
+        Folder,
+        Bookmark,
+        Separator
+    };
+
+    BookmarkNode(Type type = Root, BookmarkNode *parent = 0);
+    ~BookmarkNode();
+    bool operator==(const BookmarkNode &other);
+
+    Type type() const;
+    void setType(Type type);
+    QList<BookmarkNode *> children() const;
+    BookmarkNode *parent() const;
+
+    void add(BookmarkNode *child, int offset = -1);
+    void remove(BookmarkNode *child);
+
+    QString url;
+    QString title;
+    QString desc;
+    bool expanded;
+
+private:
+    BookmarkNode *m_parent;
+    Type m_type;
+    QList<BookmarkNode *> m_children;
+
+};
+
+class XbelReader : public QXmlStreamReader
+{
+public:
+    XbelReader();
+    BookmarkNode *read(const QString &fileName);
+    BookmarkNode *read(QIODevice *device);
+
+private:
+    void skipUnknownElement();
+    void readXBEL(BookmarkNode *parent);
+    void readTitle(BookmarkNode *parent);
+    void readDescription(BookmarkNode *parent);
+    void readSeparator(BookmarkNode *parent);
+    void readFolder(BookmarkNode *parent);
+    void readBookmarkNode(BookmarkNode *parent);
+};
+
+#include <QtCore/QXmlStreamWriter>
+
+class XbelWriter : public QXmlStreamWriter
+{
+public:
+    XbelWriter();
+    bool write(const QString &fileName, const BookmarkNode *root);
+    bool write(QIODevice *device, const BookmarkNode *root);
+
+private:
+    void writeItem(const BookmarkNode *parent);
+};
+
+#endif // XBEL_H
+
diff --git a/demos/chip/chip.cpp b/demos/chip/chip.cpp
new file mode 100644
index 0000000000..c2b22dad8b
--- /dev/null
+++ b/demos/chip/chip.cpp
@@ -0,0 +1,182 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "chip.h"
+
+#include <QtGui>
+
+Chip::Chip(const QColor &color, int x, int y)
+{
+    this->x = x;
+    this->y = y;
+    this->color = color;
+    setZValue((x + y) % 2);
+
+    setFlags(ItemIsSelectable | ItemIsMovable);
+    setAcceptsHoverEvents(true);
+}
+
+QRectF Chip::boundingRect() const
+{
+    return QRectF(0, 0, 110, 70);
+}
+
+QPainterPath Chip::shape() const
+{
+    QPainterPath path;
+    path.addRect(14, 14, 82, 42);
+    return path;
+}
+
+void Chip::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(widget);
+
+    QColor fillColor = (option->state & QStyle::State_Selected) ? color.dark(150) : color;
+    if (option->state & QStyle::State_MouseOver)
+        fillColor = fillColor.light(125);
+
+    if (option->levelOfDetail < 0.2) {
+        if (option->levelOfDetail < 0.125) {
+            painter->fillRect(QRectF(0, 0, 110, 70), fillColor);
+            return;
+        }
+
+        QBrush b = painter->brush();
+        painter->setBrush(fillColor);
+        painter->drawRect(13, 13, 97, 57);
+        painter->setBrush(b);
+        return;
+    }
+
+    QPen oldPen = painter->pen();
+    QPen pen = oldPen;
+    int width = 0;
+    if (option->state & QStyle::State_Selected)
+        width += 2;
+
+    pen.setWidth(width);
+    QBrush b = painter->brush();
+    painter->setBrush(QBrush(fillColor.dark(option->state & QStyle::State_Sunken ? 120 : 100)));
+
+    painter->drawRect(QRect(14, 14, 79, 39));
+    painter->setBrush(b);
+
+    if (option->levelOfDetail >= 1) {
+        painter->setPen(QPen(Qt::gray, 1));
+        painter->drawLine(15, 54, 94, 54);
+        painter->drawLine(94, 53, 94, 15);
+        painter->setPen(QPen(Qt::black, 0));
+    }
+
+    // Draw text
+    if (option->levelOfDetail >= 2) {
+        QFont font("Times", 10);
+        font.setStyleStrategy(QFont::ForceOutline);
+        painter->setFont(font);
+        painter->save();
+        painter->scale(0.1, 0.1);
+        painter->drawText(170, 180, QString("Model: VSC-2000 (Very Small Chip) at %1x%2").arg(x).arg(y));
+        painter->drawText(170, 200, QString("Serial number: DLWR-WEER-123L-ZZ33-SDSJ"));
+        painter->drawText(170, 220, QString("Manufacturer: Chip Manufacturer"));
+        painter->restore();
+    }
+
+    // Draw lines
+    QVarLengthArray<QLineF, 36> lines;
+    if (option->levelOfDetail >= 0.5) {
+        for (int i = 0; i <= 10; i += (option->levelOfDetail > 0.5 ? 1 : 2)) {
+            lines.append(QLineF(18 + 7 * i, 13, 18 + 7 * i, 5));
+            lines.append(QLineF(18 + 7 * i, 54, 18 + 7 * i, 62));
+        }
+        for (int i = 0; i <= 6; i += (option->levelOfDetail > 0.5 ? 1 : 2)) {
+            lines.append(QLineF(5, 18 + i * 5, 13, 18 + i * 5));
+            lines.append(QLineF(94, 18 + i * 5, 102, 18 + i * 5));
+        }
+    }
+    if (option->levelOfDetail >= 0.4) {
+        const QLineF lineData[] = {
+            QLineF(25, 35, 35, 35),
+            QLineF(35, 30, 35, 40),
+            QLineF(35, 30, 45, 35),
+            QLineF(35, 40, 45, 35),
+            QLineF(45, 30, 45, 40),
+            QLineF(45, 35, 55, 35)
+        };
+        lines.append(lineData, 6);
+    }
+    painter->drawLines(lines.data(), lines.size());
+
+    // Draw red ink
+    if (stuff.size() > 1) {
+        QPen p = painter->pen();
+        painter->setPen(QPen(Qt::red, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+        painter->setBrush(Qt::NoBrush);
+        QPainterPath path;
+        path.moveTo(stuff.first());
+        for (int i = 1; i < stuff.size(); ++i)
+            path.lineTo(stuff.at(i));
+        painter->drawPath(path);
+        painter->setPen(p);
+    }
+}
+
+void Chip::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    QGraphicsItem::mousePressEvent(event);
+    update();
+}
+
+void Chip::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (event->modifiers() & Qt::ShiftModifier) {
+        stuff << event->pos();
+        update();
+        return;
+    }
+    QGraphicsItem::mouseMoveEvent(event);
+}
+
+void Chip::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    QGraphicsItem::mouseReleaseEvent(event);
+    update();
+}
diff --git a/demos/chip/chip.h b/demos/chip/chip.h
new file mode 100644
index 0000000000..9866f802bf
--- /dev/null
+++ b/demos/chip/chip.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CHIP_H
+#define CHIP_H
+
+#include <QtGui/QColor>
+#include <QtGui/QGraphicsItem>
+
+class Chip : public QGraphicsItem
+{
+public:
+    Chip(const QColor &color, int x, int y);
+
+    QRectF boundingRect() const;
+    QPainterPath shape() const;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *item, QWidget *widget);
+
+protected:
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+
+private:
+    int x, y;
+    QColor color;
+    QList<QPointF> stuff;
+};
+
+#endif
diff --git a/demos/chip/chip.pro b/demos/chip/chip.pro
new file mode 100644
index 0000000000..53fa23b981
--- /dev/null
+++ b/demos/chip/chip.pro
@@ -0,0 +1,19 @@
+RESOURCES += images.qrc
+
+HEADERS += mainwindow.h view.h chip.h
+SOURCES += main.cpp
+SOURCES += mainwindow.cpp view.cpp chip.cpp
+
+contains(QT_CONFIG, opengl):QT += opengl
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/chip
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.pro *.html *.doc images
+sources.path = $$[QT_INSTALL_DEMOS]/chip
+INSTALLS += target sources
+
diff --git a/demos/chip/fileprint.png b/demos/chip/fileprint.png
new file mode 100644
index 0000000000..ba7c02dc18
--- /dev/null
+++ b/demos/chip/fileprint.png
diff --git a/demos/chip/images.qrc b/demos/chip/images.qrc
new file mode 100644
index 0000000000..c7cdf0c4c0
--- /dev/null
+++ b/demos/chip/images.qrc
@@ -0,0 +1,10 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>qt4logo.png</file>
+    <file>zoomin.png</file>
+    <file>zoomout.png</file>
+    <file>rotateleft.png</file>
+    <file>rotateright.png</file>
+    <file>fileprint.png</file>
+</qresource>
+</RCC>
diff --git a/demos/chip/main.cpp b/demos/chip/main.cpp
new file mode 100644
index 0000000000..e945026911
--- /dev/null
+++ b/demos/chip/main.cpp
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mainwindow.h"
+
+#include <QApplication>
+
+int main(int argc, char **argv)
+{
+    Q_INIT_RESOURCE(images);
+
+    QApplication app(argc, argv);
+    app.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
+
+    MainWindow window;
+    window.show();   
+
+    return app.exec();
+}
diff --git a/demos/chip/mainwindow.cpp b/demos/chip/mainwindow.cpp
new file mode 100644
index 0000000000..5222cd46fc
--- /dev/null
+++ b/demos/chip/mainwindow.cpp
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mainwindow.h"
+#include "view.h"
+#include "chip.h"
+
+#include <QtGui>
+
+MainWindow::MainWindow(QWidget *parent)
+    : QWidget(parent)
+{
+    populateScene();
+
+    h1Splitter = new QSplitter;
+    h2Splitter = new QSplitter;
+    
+    QSplitter *vSplitter = new QSplitter;
+    vSplitter->setOrientation(Qt::Vertical);
+    vSplitter->addWidget(h1Splitter);
+    vSplitter->addWidget(h2Splitter);
+
+    View *view = new View("Top left view");
+    view->view()->setScene(scene);
+    h1Splitter->addWidget(view);
+
+    view = new View("Top right view");
+    view->view()->setScene(scene);
+    h1Splitter->addWidget(view);
+
+    view = new View("Bottom left view");
+    view->view()->setScene(scene);
+    h2Splitter->addWidget(view);
+
+    view = new View("Bottom right view");
+    view->view()->setScene(scene);
+    h2Splitter->addWidget(view);
+
+    QHBoxLayout *layout = new QHBoxLayout;
+    layout->addWidget(vSplitter);
+    setLayout(layout);
+
+    setWindowTitle(tr("Chip Demo"));
+}
+
+void MainWindow::populateScene()
+{
+    scene = new QGraphicsScene;
+
+    QImage image(":/qt4logo.png");
+
+    // Populate scene
+    int xx = 0;
+    int nitems = 0;
+    for (int i = -11000; i < 11000; i += 110) {
+        ++xx;
+        int yy = 0;
+        for (int j = -7000; j < 7000; j += 70) {
+            ++yy;
+            qreal x = (i + 11000) / 22000.0;
+            qreal y = (j + 7000) / 14000.0;
+
+            QColor color(image.pixel(int(image.width() * x), int(image.height() * y)));
+            QGraphicsItem *item = new Chip(color, xx, yy);
+            item->setPos(QPointF(i, j));
+            scene->addItem(item);
+
+            ++nitems;
+        }
+    }
+}
diff --git a/demos/chip/mainwindow.h b/demos/chip/mainwindow.h
new file mode 100644
index 0000000000..5decca8090
--- /dev/null
+++ b/demos/chip/mainwindow.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QtGui/qwidget.h>
+
+QT_FORWARD_DECLARE_CLASS(QGraphicsScene)
+QT_FORWARD_DECLARE_CLASS(QGraphicsView)
+QT_FORWARD_DECLARE_CLASS(QLabel)
+QT_FORWARD_DECLARE_CLASS(QSlider)
+QT_FORWARD_DECLARE_CLASS(QSplitter)
+
+class MainWindow : public QWidget
+{
+    Q_OBJECT
+public:
+    MainWindow(QWidget *parent = 0);
+    
+private:
+    void setupMatrix();
+    void populateScene();
+    
+    QGraphicsScene *scene;
+    QSplitter *h1Splitter;
+    QSplitter *h2Splitter;
+};
+
+#endif
diff --git a/demos/chip/qt4logo.png b/demos/chip/qt4logo.png
new file mode 100644
index 0000000000..157e86ed64
--- /dev/null
+++ b/demos/chip/qt4logo.png
diff --git a/demos/chip/rotateleft.png b/demos/chip/rotateleft.png
new file mode 100644
index 0000000000..8cfa931986
--- /dev/null
+++ b/demos/chip/rotateleft.png
diff --git a/demos/chip/rotateright.png b/demos/chip/rotateright.png
new file mode 100644
index 0000000000..ec5e8664a1
--- /dev/null
+++ b/demos/chip/rotateright.png
diff --git a/demos/chip/view.cpp b/demos/chip/view.cpp
new file mode 100644
index 0000000000..f919af38ab
--- /dev/null
+++ b/demos/chip/view.cpp
@@ -0,0 +1,234 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "view.h"
+
+#include <QtGui>
+#ifndef QT_NO_OPENGL
+#include <QtOpenGL>
+#endif
+
+#include <qmath.h>
+
+View::View(const QString &name, QWidget *parent)
+    : QFrame(parent)
+{
+    setFrameStyle(Sunken | StyledPanel);
+    graphicsView = new QGraphicsView;
+    graphicsView->setRenderHint(QPainter::Antialiasing, false);
+    graphicsView->setDragMode(QGraphicsView::RubberBandDrag);
+    graphicsView->setOptimizationFlags(QGraphicsView::DontSavePainterState);
+    graphicsView->setViewportUpdateMode(QGraphicsView::SmartViewportUpdate);
+
+    int size = style()->pixelMetric(QStyle::PM_ToolBarIconSize);
+    QSize iconSize(size, size);
+
+    QToolButton *zoomInIcon = new QToolButton;
+    zoomInIcon->setAutoRepeat(true);
+    zoomInIcon->setAutoRepeatInterval(33);
+    zoomInIcon->setAutoRepeatDelay(0);
+    zoomInIcon->setIcon(QPixmap(":/zoomin.png"));
+    zoomInIcon->setIconSize(iconSize);
+    QToolButton *zoomOutIcon = new QToolButton;
+    zoomOutIcon->setAutoRepeat(true);
+    zoomOutIcon->setAutoRepeatInterval(33);
+    zoomOutIcon->setAutoRepeatDelay(0);
+    zoomOutIcon->setIcon(QPixmap(":/zoomout.png"));
+    zoomOutIcon->setIconSize(iconSize);
+    zoomSlider = new QSlider;
+    zoomSlider->setMinimum(0);
+    zoomSlider->setMaximum(500);
+    zoomSlider->setValue(250);
+    zoomSlider->setTickPosition(QSlider::TicksRight);
+
+    // Zoom slider layout
+    QVBoxLayout *zoomSliderLayout = new QVBoxLayout;
+    zoomSliderLayout->addWidget(zoomInIcon);
+    zoomSliderLayout->addWidget(zoomSlider);
+    zoomSliderLayout->addWidget(zoomOutIcon);
+
+    QToolButton *rotateLeftIcon = new QToolButton;
+    rotateLeftIcon->setIcon(QPixmap(":/rotateleft.png"));
+    rotateLeftIcon->setIconSize(iconSize);
+    QToolButton *rotateRightIcon = new QToolButton;
+    rotateRightIcon->setIcon(QPixmap(":/rotateright.png"));
+    rotateRightIcon->setIconSize(iconSize);
+    rotateSlider = new QSlider;
+    rotateSlider->setOrientation(Qt::Horizontal);
+    rotateSlider->setMinimum(-360);
+    rotateSlider->setMaximum(360);
+    rotateSlider->setValue(0);
+    rotateSlider->setTickPosition(QSlider::TicksBelow);
+
+    // Rotate slider layout
+    QHBoxLayout *rotateSliderLayout = new QHBoxLayout;
+    rotateSliderLayout->addWidget(rotateLeftIcon);
+    rotateSliderLayout->addWidget(rotateSlider);
+    rotateSliderLayout->addWidget(rotateRightIcon);
+
+    resetButton = new QToolButton;
+    resetButton->setText(tr("0"));
+    resetButton->setEnabled(false);
+
+    // Label layout
+    QHBoxLayout *labelLayout = new QHBoxLayout;
+    label = new QLabel(name);
+    antialiasButton = new QToolButton;
+    antialiasButton->setText(tr("Antialiasing"));
+    antialiasButton->setCheckable(true);
+    antialiasButton->setChecked(false);
+    openGlButton = new QToolButton;
+    openGlButton->setText(tr("OpenGL"));
+    openGlButton->setCheckable(true);
+#ifndef QT_NO_OPENGL
+    openGlButton->setEnabled(QGLFormat::hasOpenGL());
+#else
+    openGlButton->setEnabled(false);
+#endif
+    printButton = new QToolButton;
+    printButton->setIcon(QIcon(QPixmap(":/fileprint.png")));
+
+    labelLayout->addWidget(label);
+    labelLayout->addStretch();
+    labelLayout->addWidget(antialiasButton);
+    labelLayout->addWidget(openGlButton);
+    labelLayout->addWidget(printButton);
+
+    QGridLayout *topLayout = new QGridLayout;
+    topLayout->addLayout(labelLayout, 0, 0);
+    topLayout->addWidget(graphicsView, 1, 0);
+    topLayout->addLayout(zoomSliderLayout, 1, 1);
+    topLayout->addLayout(rotateSliderLayout, 2, 0);
+    topLayout->addWidget(resetButton, 2, 1);
+    setLayout(topLayout);
+
+    connect(resetButton, SIGNAL(clicked()), this, SLOT(resetView()));
+    connect(zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(setupMatrix()));
+    connect(rotateSlider, SIGNAL(valueChanged(int)), this, SLOT(setupMatrix()));
+    connect(graphicsView->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(setResetButtonEnabled()));
+    connect(graphicsView->horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(setResetButtonEnabled()));
+    connect(antialiasButton, SIGNAL(toggled(bool)), this, SLOT(toggleAntialiasing()));
+    connect(openGlButton, SIGNAL(toggled(bool)), this, SLOT(toggleOpenGL()));
+    connect(rotateLeftIcon, SIGNAL(clicked()), this, SLOT(rotateLeft()));
+    connect(rotateRightIcon, SIGNAL(clicked()), this, SLOT(rotateRight()));
+    connect(zoomInIcon, SIGNAL(clicked()), this, SLOT(zoomIn()));
+    connect(zoomOutIcon, SIGNAL(clicked()), this, SLOT(zoomOut()));
+    connect(printButton, SIGNAL(clicked()), this, SLOT(print()));
+
+    setupMatrix();
+}
+
+QGraphicsView *View::view() const
+{
+    return graphicsView;
+}
+
+void View::resetView()
+{
+    zoomSlider->setValue(250);
+    rotateSlider->setValue(0);
+    setupMatrix();
+    graphicsView->ensureVisible(QRectF(0, 0, 0, 0));
+
+    resetButton->setEnabled(false);
+}
+
+void View::setResetButtonEnabled()
+{
+    resetButton->setEnabled(true);
+}
+
+void View::setupMatrix()
+{
+    qreal scale = qPow(qreal(2), (zoomSlider->value() - 250) / qreal(50));
+
+    QMatrix matrix;
+    matrix.scale(scale, scale);
+    matrix.rotate(rotateSlider->value());
+
+    graphicsView->setMatrix(matrix);
+    setResetButtonEnabled();
+}
+
+void View::toggleOpenGL()
+{
+#ifndef QT_NO_OPENGL
+    graphicsView->setViewport(openGlButton->isChecked() ? new QGLWidget(QGLFormat(QGL::SampleBuffers)) : new QWidget);
+#endif
+}
+
+void View::toggleAntialiasing()
+{
+    graphicsView->setRenderHint(QPainter::Antialiasing, antialiasButton->isChecked());
+}
+
+void View::print()
+{
+#ifndef QT_NO_PRINTER
+    QPrinter printer;
+    QPrintDialog dialog(&printer, this);
+    if (dialog.exec() == QDialog::Accepted) {
+        QPainter painter(&printer);
+        graphicsView->render(&painter);
+    }
+#endif
+}
+
+void View::zoomIn()
+{
+    zoomSlider->setValue(zoomSlider->value() + 1);
+}
+
+void View::zoomOut()
+{
+    zoomSlider->setValue(zoomSlider->value() - 1);
+}
+
+void View::rotateLeft()
+{
+    rotateSlider->setValue(rotateSlider->value() - 10);
+}
+
+void View::rotateRight()
+{
+    rotateSlider->setValue(rotateSlider->value() + 10);
+}
+
diff --git a/demos/chip/view.h b/demos/chip/view.h
new file mode 100644
index 0000000000..4987f60192
--- /dev/null
+++ b/demos/chip/view.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef VIEW_H
+#define VIEW_H
+
+#include <QFrame>
+
+QT_FORWARD_DECLARE_CLASS(QGraphicsView)
+QT_FORWARD_DECLARE_CLASS(QLabel)
+QT_FORWARD_DECLARE_CLASS(QSlider)
+QT_FORWARD_DECLARE_CLASS(QToolButton)
+
+class View : public QFrame
+{
+    Q_OBJECT
+public:
+    View(const QString &name, QWidget *parent = 0);
+
+    QGraphicsView *view() const;
+
+private slots:
+    void resetView();
+    void setResetButtonEnabled();
+    void setupMatrix();
+    void toggleOpenGL();
+    void toggleAntialiasing();
+    void print();
+
+    void zoomIn();
+    void zoomOut();
+    void rotateLeft();
+    void rotateRight();
+    
+private:
+    QGraphicsView *graphicsView;
+    QLabel *label;
+    QToolButton *openGlButton;
+    QToolButton *antialiasButton;
+    QToolButton *printButton;
+    QToolButton *resetButton;
+    QSlider *zoomSlider;
+    QSlider *rotateSlider;
+};
+
+#endif
diff --git a/demos/chip/zoomin.png b/demos/chip/zoomin.png
new file mode 100644
index 0000000000..8b0daeea48
--- /dev/null
+++ b/demos/chip/zoomin.png
diff --git a/demos/chip/zoomout.png b/demos/chip/zoomout.png
new file mode 100644
index 0000000000..1575dd24f6
--- /dev/null
+++ b/demos/chip/zoomout.png
diff --git a/demos/composition/composition.cpp b/demos/composition/composition.cpp
new file mode 100644
index 0000000000..b43c66ba69
--- /dev/null
+++ b/demos/composition/composition.cpp
@@ -0,0 +1,511 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "composition.h"
+#include <QBoxLayout>
+#include <QRadioButton>
+#include <QTimer>
+#include <QDateTime>
+#include <QSlider>
+#include <QMouseEvent>
+#include <qmath.h>
+
+CompositionWidget::CompositionWidget(QWidget *parent)
+    : QWidget(parent)
+{
+    CompositionRenderer *view = new CompositionRenderer(this);
+
+    QGroupBox *mainGroup = new QGroupBox(parent);
+    mainGroup->setTitle(tr("Composition Modes"));
+
+    QGroupBox *modesGroup = new QGroupBox(mainGroup);
+    modesGroup->setTitle(tr("Mode"));
+
+    rbClear = new QRadioButton(tr("Clear"), modesGroup);
+    connect(rbClear, SIGNAL(clicked()), view, SLOT(setClearMode()));
+    rbSource = new QRadioButton(tr("Source"), modesGroup);
+    connect(rbSource, SIGNAL(clicked()), view, SLOT(setSourceMode()));
+    rbDest = new QRadioButton(tr("Destination"), modesGroup);
+    connect(rbDest, SIGNAL(clicked()), view, SLOT(setDestMode()));
+    rbSourceOver = new QRadioButton(tr("Source Over"), modesGroup);
+    connect(rbSourceOver, SIGNAL(clicked()), view, SLOT(setSourceOverMode()));
+    rbDestOver = new QRadioButton(tr("Destination Over"), modesGroup);
+    connect(rbDestOver, SIGNAL(clicked()), view, SLOT(setDestOverMode()));
+    rbSourceIn = new QRadioButton(tr("Source In"), modesGroup);
+    connect(rbSourceIn, SIGNAL(clicked()), view, SLOT(setSourceInMode()));
+    rbDestIn = new QRadioButton(tr("Dest In"), modesGroup);
+    connect(rbDestIn, SIGNAL(clicked()), view, SLOT(setDestInMode()));
+    rbSourceOut = new QRadioButton(tr("Source Out"), modesGroup);
+    connect(rbSourceOut, SIGNAL(clicked()), view, SLOT(setSourceOutMode()));
+    rbDestOut = new QRadioButton(tr("Dest Out"), modesGroup);
+    connect(rbDestOut, SIGNAL(clicked()), view, SLOT(setDestOutMode()));
+    rbSourceAtop = new QRadioButton(tr("Source Atop"), modesGroup);
+    connect(rbSourceAtop, SIGNAL(clicked()), view, SLOT(setSourceAtopMode()));
+    rbDestAtop = new QRadioButton(tr("Dest Atop"), modesGroup);
+    connect(rbDestAtop, SIGNAL(clicked()), view, SLOT(setDestAtopMode()));
+    rbXor = new QRadioButton(tr("Xor"), modesGroup);
+    connect(rbXor, SIGNAL(clicked()), view, SLOT(setXorMode()));
+
+    rbPlus = new QRadioButton(tr("Plus"), modesGroup);
+    connect(rbPlus, SIGNAL(clicked()), view, SLOT(setPlusMode()));
+    rbMultiply = new QRadioButton(tr("Multiply"), modesGroup);
+    connect(rbMultiply, SIGNAL(clicked()), view, SLOT(setMultiplyMode()));
+    rbScreen = new QRadioButton(tr("Screen"), modesGroup);
+    connect(rbScreen, SIGNAL(clicked()), view, SLOT(setScreenMode()));
+    rbOverlay = new QRadioButton(tr("Overlay"), modesGroup);
+    connect(rbOverlay, SIGNAL(clicked()), view, SLOT(setOverlayMode()));
+    rbDarken = new QRadioButton(tr("Darken"), modesGroup);
+    connect(rbDarken, SIGNAL(clicked()), view, SLOT(setDarkenMode()));
+    rbLighten = new QRadioButton(tr("Lighten"), modesGroup);
+    connect(rbLighten, SIGNAL(clicked()), view, SLOT(setLightenMode()));
+    rbColorDodge = new QRadioButton(tr("Color Dodge"), modesGroup);
+    connect(rbColorDodge, SIGNAL(clicked()), view, SLOT(setColorDodgeMode()));
+    rbColorBurn = new QRadioButton(tr("Color Burn"), modesGroup);
+    connect(rbColorBurn, SIGNAL(clicked()), view, SLOT(setColorBurnMode()));
+    rbHardLight = new QRadioButton(tr("Hard Light"), modesGroup);
+    connect(rbHardLight, SIGNAL(clicked()), view, SLOT(setHardLightMode()));
+    rbSoftLight = new QRadioButton(tr("Soft Light"), modesGroup);
+    connect(rbSoftLight, SIGNAL(clicked()), view, SLOT(setSoftLightMode()));
+    rbDifference = new QRadioButton(tr("Difference"), modesGroup);
+    connect(rbDifference, SIGNAL(clicked()), view, SLOT(setDifferenceMode()));
+    rbExclusion = new QRadioButton(tr("Exclusion"), modesGroup);
+    connect(rbExclusion, SIGNAL(clicked()), view, SLOT(setExclusionMode()));
+
+    QGroupBox *circleColorGroup = new QGroupBox(mainGroup);
+    circleColorGroup->setTitle(tr("Circle color"));
+    QSlider *circleColorSlider = new QSlider(Qt::Horizontal, circleColorGroup);
+    circleColorSlider->setRange(0, 359);
+    circleColorSlider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    connect(circleColorSlider, SIGNAL(valueChanged(int)), view, SLOT(setCircleColor(int)));
+
+    QGroupBox *circleAlphaGroup = new QGroupBox(mainGroup);
+    circleAlphaGroup->setTitle(tr("Circle alpha"));
+    QSlider *circleAlphaSlider = new QSlider(Qt::Horizontal, circleAlphaGroup);
+    circleAlphaSlider->setRange(0, 255);
+    circleAlphaSlider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    connect(circleAlphaSlider, SIGNAL(valueChanged(int)), view, SLOT(setCircleAlpha(int)));
+
+    QPushButton *showSourceButton = new QPushButton(mainGroup);
+    showSourceButton->setText(tr("Show Source"));
+#if defined(QT_OPENGL_SUPPORT) && !defined(QT_OPENGL_ES)
+    QPushButton *enableOpenGLButton = new QPushButton(mainGroup);
+    enableOpenGLButton->setText(tr("Use OpenGL"));
+    enableOpenGLButton->setCheckable(true);
+    enableOpenGLButton->setChecked(view->usesOpenGL());
+
+    if (!QGLFormat::hasOpenGL() || !QGLPixelBuffer::hasOpenGLPbuffers())
+        enableOpenGLButton->hide();
+#endif
+    QPushButton *whatsThisButton = new QPushButton(mainGroup);
+    whatsThisButton->setText(tr("What's This?"));
+    whatsThisButton->setCheckable(true);
+
+    QPushButton *animateButton = new QPushButton(mainGroup);
+    animateButton->setText(tr("Animated"));
+    animateButton->setCheckable(true);
+    animateButton->setChecked(true);
+
+    QHBoxLayout *viewLayout = new QHBoxLayout(this);
+    viewLayout->addWidget(view);
+    viewLayout->addWidget(mainGroup);
+
+    QVBoxLayout *mainGroupLayout = new QVBoxLayout(mainGroup);
+    mainGroupLayout->addWidget(circleColorGroup);
+    mainGroupLayout->addWidget(circleAlphaGroup);
+    mainGroupLayout->addWidget(modesGroup);
+    mainGroupLayout->addStretch();
+    mainGroupLayout->addWidget(animateButton);
+    mainGroupLayout->addWidget(whatsThisButton);
+    mainGroupLayout->addWidget(showSourceButton);
+#if defined(QT_OPENGL_SUPPORT) && !defined(QT_OPENGL_ES)
+    mainGroupLayout->addWidget(enableOpenGLButton);
+#endif
+
+    QGridLayout *modesLayout = new QGridLayout(modesGroup);
+    modesLayout->addWidget(rbClear,             0,      0);
+    modesLayout->addWidget(rbSource,            1,      0);
+    modesLayout->addWidget(rbDest,              2,      0);
+    modesLayout->addWidget(rbSourceOver,        3,      0);
+    modesLayout->addWidget(rbDestOver,          4,      0);
+    modesLayout->addWidget(rbSourceIn,          5,      0);
+    modesLayout->addWidget(rbDestIn,            6,      0);
+    modesLayout->addWidget(rbSourceOut,         7,      0);
+    modesLayout->addWidget(rbDestOut,           8,      0);
+    modesLayout->addWidget(rbSourceAtop,        9,      0);
+    modesLayout->addWidget(rbDestAtop,         10,      0);
+    modesLayout->addWidget(rbXor,              11,      0);
+
+    modesLayout->addWidget(rbPlus,              0,      1);
+    modesLayout->addWidget(rbMultiply,          1,      1);
+    modesLayout->addWidget(rbScreen,            2,      1);
+    modesLayout->addWidget(rbOverlay,           3,      1);
+    modesLayout->addWidget(rbDarken,            4,      1);
+    modesLayout->addWidget(rbLighten,           5,      1);
+    modesLayout->addWidget(rbColorDodge,        6,      1);
+    modesLayout->addWidget(rbColorBurn,         7,      1);
+    modesLayout->addWidget(rbHardLight,         8,      1);
+    modesLayout->addWidget(rbSoftLight,         9,      1);
+    modesLayout->addWidget(rbDifference,       10,      1);
+    modesLayout->addWidget(rbExclusion,        11,      1);
+
+
+    QVBoxLayout *circleColorLayout = new QVBoxLayout(circleColorGroup);
+    circleColorLayout->addWidget(circleColorSlider);
+
+    QVBoxLayout *circleAlphaLayout = new QVBoxLayout(circleAlphaGroup);
+    circleAlphaLayout->addWidget(circleAlphaSlider);
+
+    view->loadDescription(":res/composition/composition.html");
+    view->loadSourceFile(":res/composition/composition.cpp");
+
+    connect(whatsThisButton, SIGNAL(clicked(bool)), view, SLOT(setDescriptionEnabled(bool)));
+    connect(view, SIGNAL(descriptionEnabledChanged(bool)), whatsThisButton, SLOT(setChecked(bool)));
+    connect(showSourceButton, SIGNAL(clicked()), view, SLOT(showSource()));
+#if defined(QT_OPENGL_SUPPORT) && !defined(QT_OPENGL_ES)
+    connect(enableOpenGLButton, SIGNAL(clicked(bool)), view, SLOT(enableOpenGL(bool)));
+#endif
+    connect(animateButton, SIGNAL(toggled(bool)), view, SLOT(setAnimationEnabled(bool)));
+
+    circleColorSlider->setValue(270);
+    circleAlphaSlider->setValue(200);
+    rbSourceOut->animateClick();
+
+    setWindowTitle(tr("Composition Modes"));
+}
+
+
+void CompositionWidget::nextMode()
+{
+    /*
+      if (!m_animation_enabled)
+      return;
+      if (rbClear->isChecked()) rbSource->animateClick();
+      if (rbSource->isChecked()) rbDest->animateClick();
+      if (rbDest->isChecked()) rbSourceOver->animateClick();
+      if (rbSourceOver->isChecked()) rbDestOver->animateClick();
+      if (rbDestOver->isChecked()) rbSourceIn->animateClick();
+      if (rbSourceIn->isChecked()) rbDestIn->animateClick();
+      if (rbDestIn->isChecked()) rbSourceOut->animateClick();
+      if (rbSourceOut->isChecked()) rbDestOut->animateClick();
+      if (rbDestOut->isChecked()) rbSourceAtop->animateClick();
+      if (rbSourceAtop->isChecked()) rbDestAtop->animateClick();
+      if (rbDestAtop->isChecked()) rbXor->animateClick();
+      if (rbXor->isChecked()) rbClear->animateClick();
+    */
+}
+
+CompositionRenderer::CompositionRenderer(QWidget *parent)
+    : ArthurFrame(parent)
+{
+    m_animation_enabled = true;
+#ifdef Q_WS_QWS
+    m_image = QPixmap(":res/composition/flower.jpg");
+    m_image.setAlphaChannel(QPixmap(":res/composition/flower_alpha.jpg"));
+#else
+    m_image = QImage(":res/composition/flower.jpg");
+    m_image.setAlphaChannel(QImage(":res/composition/flower_alpha.jpg"));
+#endif
+    m_circle_alpha = 127;
+    m_circle_hue = 255;
+    m_current_object = NoObject;
+    m_composition_mode = QPainter::CompositionMode_SourceOut;
+
+    m_circle_pos = QPoint(200, 100);
+
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+#ifdef QT_OPENGL_SUPPORT
+    m_pbuffer = 0;
+    m_pbuffer_size = 1024;
+#endif
+}
+
+QRectF rectangle_around(const QPointF &p, const QSizeF &size = QSize(250, 200))
+{
+    QRectF rect(p, size);
+    rect.translate(-size.width()/2, -size.height()/2);
+    return rect;
+}
+
+void CompositionRenderer::updateCirclePos()
+{
+    if (m_current_object != NoObject)
+        return;
+    QDateTime dt = QDateTime::currentDateTime();
+    qreal t = (dt.toTime_t() * 1000 + dt.time().msec()) / 1000.0;
+
+    qreal x = width() / qreal(2) + (qCos(t*8/11) + qSin(-t)) * width() / qreal(4);
+    qreal y = height() / qreal(2) + (qSin(t*6/7) + qCos(t * qreal(1.5))) * height() / qreal(4);
+
+    setCirclePos(QLineF(m_circle_pos, QPointF(x, y)).pointAt(0.02));
+}
+
+void CompositionRenderer::drawBase(QPainter &p)
+{
+    p.setPen(Qt::NoPen);
+
+    QLinearGradient rect_gradient(0, 0, 0, height());
+    rect_gradient.setColorAt(0, Qt::red);
+    rect_gradient.setColorAt(.17, Qt::yellow);
+    rect_gradient.setColorAt(.33, Qt::green);
+    rect_gradient.setColorAt(.50, Qt::cyan);
+    rect_gradient.setColorAt(.66, Qt::blue);
+    rect_gradient.setColorAt(.81, Qt::magenta);
+    rect_gradient.setColorAt(1, Qt::red);
+    p.setBrush(rect_gradient);
+    p.drawRect(width() / 2, 0, width() / 2, height());
+
+    QLinearGradient alpha_gradient(0, 0, width(), 0);
+    alpha_gradient.setColorAt(0, Qt::white);
+    alpha_gradient.setColorAt(0.2, Qt::white);
+    alpha_gradient.setColorAt(0.5, Qt::transparent);
+    alpha_gradient.setColorAt(0.8, Qt::white);
+    alpha_gradient.setColorAt(1, Qt::white);
+
+    p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+    p.setBrush(alpha_gradient);
+    p.drawRect(0, 0, width(), height());
+
+    p.setCompositionMode(QPainter::CompositionMode_DestinationOver);
+
+    p.setPen(Qt::NoPen);
+    p.setRenderHint(QPainter::SmoothPixmapTransform);
+#ifdef Q_WS_QWS
+    p.drawPixmap(rect(), m_image);
+#else
+    p.drawImage(rect(), m_image);
+#endif
+}
+
+void CompositionRenderer::drawSource(QPainter &p)
+{
+    p.setPen(Qt::NoPen);
+    p.setRenderHint(QPainter::Antialiasing);
+    p.setCompositionMode(m_composition_mode);
+
+    QRectF circle_rect = rectangle_around(m_circle_pos);
+    QColor color = QColor::fromHsvF(m_circle_hue / 360.0, 1, 1, m_circle_alpha / 255.0);
+    QLinearGradient circle_gradient(circle_rect.topLeft(), circle_rect.bottomRight());
+    circle_gradient.setColorAt(0, color.light());
+    circle_gradient.setColorAt(0.5, color);
+    circle_gradient.setColorAt(1, color.dark());
+    p.setBrush(circle_gradient);
+
+    p.drawEllipse(circle_rect);
+}
+
+void CompositionRenderer::paint(QPainter *painter)
+{
+#if defined(QT_OPENGL_SUPPORT) && !defined(QT_OPENGL_ES)
+    if (usesOpenGL()) {
+
+        int new_pbuf_size = m_pbuffer_size;
+        if (size().width() > m_pbuffer_size ||
+            size().height() > m_pbuffer_size)
+            new_pbuf_size *= 2;
+
+        if (size().width() < m_pbuffer_size/2 &&
+            size().height() < m_pbuffer_size/2)
+            new_pbuf_size /= 2;
+
+        if (!m_pbuffer || new_pbuf_size != m_pbuffer_size) {
+            if (m_pbuffer) {
+                m_pbuffer->deleteTexture(m_base_tex);
+                m_pbuffer->deleteTexture(m_compositing_tex);
+                delete m_pbuffer;
+            }
+
+            m_pbuffer = new QGLPixelBuffer(QSize(new_pbuf_size, new_pbuf_size), QGLFormat::defaultFormat(), glWidget());
+            m_pbuffer->makeCurrent();
+            m_base_tex = m_pbuffer->generateDynamicTexture();
+            m_compositing_tex = m_pbuffer->generateDynamicTexture();
+            m_pbuffer_size = new_pbuf_size;
+        }
+
+        if (size() != m_previous_size) {
+            m_previous_size = size();
+            QPainter p(m_pbuffer);
+            p.setCompositionMode(QPainter::CompositionMode_Source);
+            p.fillRect(QRect(0, 0, m_pbuffer->width(), m_pbuffer->height()), Qt::transparent);
+            drawBase(p);
+            p.end();
+            m_pbuffer->updateDynamicTexture(m_base_tex);
+        }
+
+        qreal x_fraction = width()/float(m_pbuffer->width());
+        qreal y_fraction = height()/float(m_pbuffer->height());
+
+        {
+            QPainter p(m_pbuffer);
+            p.setCompositionMode(QPainter::CompositionMode_Source);
+            p.fillRect(QRect(0, 0, m_pbuffer->width(), m_pbuffer->height()), Qt::transparent);
+
+            p.save();
+            glBindTexture(GL_TEXTURE_2D, m_base_tex);
+            glEnable(GL_TEXTURE_2D);
+            glColor4f(1.,1.,1.,1.);
+
+            glBegin(GL_QUADS);
+            {
+                glTexCoord2f(0, 1.0);
+                glVertex2f(0, 0);
+
+                glTexCoord2f(x_fraction, 1.0);
+                glVertex2f(width(), 0);
+
+                glTexCoord2f(x_fraction, 1.0-y_fraction);
+                glVertex2f(width(), height());
+
+                glTexCoord2f(0, 1.0-y_fraction);
+                glVertex2f(0, height());
+            }
+            glEnd();
+
+            glDisable(GL_TEXTURE_2D);
+            p.restore();
+
+            drawSource(p);
+            p.end();
+            m_pbuffer->updateDynamicTexture(m_compositing_tex);
+        }
+
+        glWidget()->makeCurrent();
+        glBindTexture(GL_TEXTURE_2D, m_compositing_tex);
+        glEnable(GL_TEXTURE_2D);
+        glColor4f(1.,1.,1.,1.);
+        glBegin(GL_QUADS);
+        {
+            glTexCoord2f(0, 1.0);
+            glVertex2f(0, 0);
+
+            glTexCoord2f(x_fraction, 1.0);
+            glVertex2f(width(), 0);
+
+            glTexCoord2f(x_fraction, 1.0-y_fraction);
+            glVertex2f(width(), height());
+
+            glTexCoord2f(0, 1.0-y_fraction);
+            glVertex2f(0, height());
+        }
+        glEnd();
+        glDisable(GL_TEXTURE_2D);
+    } else
+#endif
+    {
+        // using a QImage
+        if (m_buffer.size() != size()) {
+#ifdef Q_WS_QWS
+            m_base_buffer = QPixmap(size());
+            m_base_buffer.fill(Qt::transparent);
+#else
+            m_buffer = QImage(size(), QImage::Format_ARGB32_Premultiplied);
+            m_base_buffer = QImage(size(), QImage::Format_ARGB32_Premultiplied);
+
+            m_base_buffer.fill(0);
+#endif
+
+            QPainter p(&m_base_buffer);
+
+            drawBase(p);
+        }
+
+#ifdef Q_WS_QWS
+        m_buffer = m_base_buffer;
+#else
+        memcpy(m_buffer.bits(), m_base_buffer.bits(), m_buffer.numBytes());
+#endif
+
+        {
+            QPainter p(&m_buffer);
+            drawSource(p);
+        }
+
+#ifdef Q_WS_QWS
+        painter->drawPixmap(0, 0, m_buffer);
+#else
+        painter->drawImage(0, 0, m_buffer);
+#endif
+    }
+
+    if (m_animation_enabled && m_current_object == NoObject) {
+        updateCirclePos();
+    }
+}
+
+void CompositionRenderer::mousePressEvent(QMouseEvent *e)
+{
+    setDescriptionEnabled(false);
+
+    QRectF circle = rectangle_around(m_circle_pos);
+
+    if (circle.contains(e->pos())) {
+        m_current_object = Circle;
+        m_offset = circle.center() - e->pos();
+    } else {
+        m_current_object = NoObject;
+    }
+}
+
+void CompositionRenderer::mouseMoveEvent(QMouseEvent *e)
+{
+    if (m_current_object == Circle) setCirclePos(e->pos() + m_offset);
+}
+
+void CompositionRenderer::mouseReleaseEvent(QMouseEvent *)
+{
+    m_current_object = NoObject;
+
+    if (m_animation_enabled)
+        updateCirclePos();
+}
+
+void CompositionRenderer::setCirclePos(const QPointF &pos)
+{
+    const QRect oldRect = rectangle_around(m_circle_pos).toAlignedRect();
+    m_circle_pos = pos;
+    const QRect newRect = rectangle_around(m_circle_pos).toAlignedRect();
+#if defined(QT_OPENGL_SUPPORT) && !defined(QT_OPENGL_ES)
+    if (usesOpenGL())
+        update();
+    else
+#endif
+        update(oldRect | newRect);
+}
+
diff --git a/demos/composition/composition.h b/demos/composition/composition.h
new file mode 100644
index 0000000000..1d504d0060
--- /dev/null
+++ b/demos/composition/composition.h
@@ -0,0 +1,190 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef COMPOSITION_H
+#define COMPOSITION_H
+
+#include "arthurwidgets.h"
+
+#include <QPainter>
+#include <QEvent>
+
+QT_FORWARD_DECLARE_CLASS(QPushButton)
+QT_FORWARD_DECLARE_CLASS(QRadioButton)
+
+#ifdef QT_OPENGL_SUPPORT
+#include <QtOpenGL>
+#endif
+
+class CompositionWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    CompositionWidget(QWidget *parent);
+
+public slots:
+void nextMode();
+
+private:
+    bool m_cycle_enabled;
+
+    QRadioButton *rbClear;
+    QRadioButton *rbSource;
+    QRadioButton *rbDest;
+    QRadioButton *rbSourceOver;
+    QRadioButton *rbDestOver;
+    QRadioButton *rbSourceIn;
+    QRadioButton *rbDestIn;
+    QRadioButton *rbSourceOut;
+    QRadioButton *rbDestOut;
+    QRadioButton *rbSourceAtop;
+    QRadioButton *rbDestAtop;
+    QRadioButton *rbXor;
+
+    QRadioButton *rbPlus;
+    QRadioButton *rbMultiply;
+    QRadioButton *rbScreen;
+    QRadioButton *rbOverlay;
+    QRadioButton *rbDarken;
+    QRadioButton *rbLighten;
+    QRadioButton *rbColorDodge;
+    QRadioButton *rbColorBurn;
+    QRadioButton *rbHardLight;
+    QRadioButton *rbSoftLight;
+    QRadioButton *rbDifference;
+    QRadioButton *rbExclusion;
+};
+
+class CompositionRenderer : public ArthurFrame
+{
+    Q_OBJECT
+
+    enum ObjectType { NoObject, Circle, Rectangle, Image };
+
+    Q_PROPERTY(int circleColor READ circleColor WRITE setCircleColor)
+    Q_PROPERTY(int circleAlpha READ circleAlpha WRITE setCircleAlpha)
+    Q_PROPERTY(bool animation READ animationEnabled WRITE setAnimationEnabled)
+
+public:
+    CompositionRenderer(QWidget *parent);
+
+    void paint(QPainter *);
+
+    void mousePressEvent(QMouseEvent *);
+    void mouseMoveEvent(QMouseEvent *);
+    void mouseReleaseEvent(QMouseEvent *);
+
+    void setCirclePos(const QPointF &pos);
+
+    QSize sizeHint() const { return QSize(500, 400); }
+
+    bool animationEnabled() const { return m_animation_enabled; }
+    int circleColor() const { return m_circle_hue; }
+    int circleAlpha() const { return m_circle_alpha; }
+
+public slots:
+    void setClearMode() { m_composition_mode = QPainter::CompositionMode_Clear; update(); }
+    void setSourceMode() { m_composition_mode = QPainter::CompositionMode_Source; update(); }
+    void setDestMode() { m_composition_mode = QPainter::CompositionMode_Destination; update(); }
+    void setSourceOverMode() { m_composition_mode = QPainter::CompositionMode_SourceOver; update(); }
+    void setDestOverMode() { m_composition_mode = QPainter::CompositionMode_DestinationOver; update(); }
+    void setSourceInMode() { m_composition_mode = QPainter::CompositionMode_SourceIn; update(); }
+    void setDestInMode() { m_composition_mode = QPainter::CompositionMode_DestinationIn; update(); }
+    void setSourceOutMode() { m_composition_mode = QPainter::CompositionMode_SourceOut; update(); }
+    void setDestOutMode() { m_composition_mode = QPainter::CompositionMode_DestinationOut; update(); }
+    void setSourceAtopMode() { m_composition_mode = QPainter::CompositionMode_SourceAtop; update(); }
+    void setDestAtopMode() { m_composition_mode = QPainter::CompositionMode_DestinationAtop; update(); }
+    void setXorMode() { m_composition_mode = QPainter::CompositionMode_Xor; update(); }
+
+    void setPlusMode() { m_composition_mode = QPainter::CompositionMode_Plus; update(); }
+    void setMultiplyMode() { m_composition_mode = QPainter::CompositionMode_Multiply; update(); }
+    void setScreenMode() { m_composition_mode = QPainter::CompositionMode_Screen; update(); }
+    void setOverlayMode() { m_composition_mode = QPainter::CompositionMode_Overlay; update(); }
+    void setDarkenMode() { m_composition_mode = QPainter::CompositionMode_Darken; update(); }
+    void setLightenMode() { m_composition_mode = QPainter::CompositionMode_Lighten; update(); }
+    void setColorDodgeMode() { m_composition_mode = QPainter::CompositionMode_ColorDodge; update(); }
+    void setColorBurnMode() { m_composition_mode = QPainter::CompositionMode_ColorBurn; update(); }
+    void setHardLightMode() { m_composition_mode = QPainter::CompositionMode_HardLight; update(); }
+    void setSoftLightMode() { m_composition_mode = QPainter::CompositionMode_SoftLight; update(); }
+    void setDifferenceMode() { m_composition_mode = QPainter::CompositionMode_Difference; update(); }
+    void setExclusionMode() { m_composition_mode = QPainter::CompositionMode_Exclusion; update(); }
+
+    void setCircleAlpha(int alpha) { m_circle_alpha = alpha; update(); }
+    void setCircleColor(int hue) { m_circle_hue = hue; update(); }
+    void setAnimationEnabled(bool enabled) { m_animation_enabled = enabled; update(); }
+
+private:
+    void updateCirclePos();
+    void drawBase(QPainter &p);
+    void drawSource(QPainter &p);
+
+    QPainter::CompositionMode m_composition_mode;
+
+#ifdef Q_WS_QWS
+    QPixmap m_image;
+    QPixmap m_buffer;
+    QPixmap m_base_buffer;
+#else
+    QImage m_image;
+    QImage m_buffer;
+    QImage m_base_buffer;
+#endif
+
+    int m_circle_alpha;
+    int m_circle_hue;
+
+    QPointF m_circle_pos;
+    QPointF m_offset;
+
+    ObjectType m_current_object;
+    bool m_animation_enabled;
+
+#ifdef QT_OPENGL_SUPPORT
+    QGLPixelBuffer *m_pbuffer;
+    GLuint m_base_tex;
+    GLuint m_compositing_tex;
+    int m_pbuffer_size; // width==height==size of pbuffer
+    QSize m_previous_size;
+#endif
+};
+
+#endif // COMPOSITION_H
diff --git a/demos/composition/composition.html b/demos/composition/composition.html
new file mode 100644
index 0000000000..1848ad8bd1
--- /dev/null
+++ b/demos/composition/composition.html
@@ -0,0 +1,23 @@
+<html>
+
+<h1>Demo for composition modes</h1>
+
+<p>
+  This demo shows some of the more advanced composition modes supported by Qt.
+</p>
+
+<p>
+  The two most common forms of composition are <b>Source</b> and <b>SourceOver</b>.
+  <b>Source</b> is used to draw opaque objects onto a paint device. In this mode,
+  each pixel in the source replaces the corresponding pixel in the destination.
+  In <b>SourceOver</b> composition mode, the source object is transparent and is
+  drawn on top of the destination.
+</p>
+
+<p>
+  In addition to these standard modes, Qt defines the complete set of composition
+  modes as defined by Thomas Porter and Tom Duff. See the <tt>QPainter</tt> documentation
+  for details.
+</p>
+
+</html>
diff --git a/demos/composition/composition.pro b/demos/composition/composition.pro
new file mode 100644
index 0000000000..d5c4a601b8
--- /dev/null
+++ b/demos/composition/composition.pro
@@ -0,0 +1,27 @@
+SOURCES += main.cpp composition.cpp
+HEADERS += composition.h
+
+SHARED_FOLDER = ../shared
+
+include($$SHARED_FOLDER/shared.pri)
+
+RESOURCES += composition.qrc
+contains(QT_CONFIG, opengl) {
+	DEFINES += QT_OPENGL_SUPPORT
+	QT += opengl
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/composition
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.jpg *.pro *.html
+sources.path = $$[QT_INSTALL_DEMOS]/composition
+INSTALLS += target sources
+
+win32-msvc* {
+    QMAKE_CXXFLAGS += /Zm500
+    QMAKE_CFLAGS += /Zm500
+}
+
+wince* {
+    DEPLOYMENT_PLUGIN += qjpeg
+}
diff --git a/demos/composition/composition.qrc b/demos/composition/composition.qrc
new file mode 100644
index 0000000000..d02c397ee8
--- /dev/null
+++ b/demos/composition/composition.qrc
@@ -0,0 +1,8 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/res/composition">
+   <file>composition.cpp</file>
+   <file>composition.html</file>
+   <file>flower.jpg</file>
+   <file>flower_alpha.jpg</file>
+</qresource>
+</RCC>
diff --git a/demos/composition/flower.jpg b/demos/composition/flower.jpg
new file mode 100644
index 0000000000..f8e022c98c
--- /dev/null
+++ b/demos/composition/flower.jpg
diff --git a/demos/composition/flower_alpha.jpg b/demos/composition/flower_alpha.jpg
new file mode 100644
index 0000000000..6a3c2a02ef
--- /dev/null
+++ b/demos/composition/flower_alpha.jpg
diff --git a/demos/composition/main.cpp b/demos/composition/main.cpp
new file mode 100644
index 0000000000..74055b2ce0
--- /dev/null
+++ b/demos/composition/main.cpp
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "composition.h"
+
+#include <QApplication>
+
+int main(int argc, char **argv)
+{
+ //   Q_INIT_RESOURCE(deform);
+
+    QApplication app(argc, argv);
+
+    CompositionWidget compWidget(0);
+    QStyle *arthurStyle = new ArthurStyle();
+    compWidget.setStyle(arthurStyle);
+
+    QList<QWidget *> widgets = qFindChildren<QWidget *>(&compWidget);
+    foreach (QWidget *w, widgets)
+        w->setStyle(arthurStyle);
+    compWidget.show();
+
+    return app.exec();
+}
diff --git a/demos/deform/deform.pro b/demos/deform/deform.pro
new file mode 100644
index 0000000000..db8484d4f0
--- /dev/null
+++ b/demos/deform/deform.pro
@@ -0,0 +1,19 @@
+SOURCES += main.cpp pathdeform.cpp
+HEADERS += pathdeform.h
+
+SHARED_FOLDER = ../shared
+
+include($$SHARED_FOLDER/shared.pri)
+
+RESOURCES += deform.qrc
+
+contains(QT_CONFIG, opengl) {
+	DEFINES += QT_OPENGL_SUPPORT
+	QT += opengl
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/deform
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
+sources.path = $$[QT_INSTALL_DEMOS]/deform
+INSTALLS += target sources
diff --git a/demos/deform/deform.qrc b/demos/deform/deform.qrc
new file mode 100644
index 0000000000..2e59ebcfc5
--- /dev/null
+++ b/demos/deform/deform.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/res/deform">
+   <file>pathdeform.cpp</file>
+   <file>pathdeform.html</file>
+</qresource>
+</RCC>
diff --git a/demos/deform/main.cpp b/demos/deform/main.cpp
new file mode 100644
index 0000000000..e32fa1260d
--- /dev/null
+++ b/demos/deform/main.cpp
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "pathdeform.h"
+
+#include <QApplication>
+#include <QDebug>
+
+int main(int argc, char **argv)
+{
+    Q_INIT_RESOURCE(deform);
+
+    QApplication app(argc, argv);
+
+    bool smallScreen = false;
+    for (int i=0; i<argc; i++)
+        if (QString(argv[i]) == "-small-screen")
+            smallScreen = true;
+
+    PathDeformWidget deformWidget(0, smallScreen);
+
+    QStyle *arthurStyle = new ArthurStyle();
+    deformWidget.setStyle(arthurStyle);
+    QList<QWidget *> widgets = qFindChildren<QWidget *>(&deformWidget);
+    foreach (QWidget *w, widgets)
+        w->setStyle(arthurStyle);
+
+    if (smallScreen)
+        deformWidget.showFullScreen();
+    else
+        deformWidget.show();
+
+    return app.exec();
+}
diff --git a/demos/deform/pathdeform.cpp b/demos/deform/pathdeform.cpp
new file mode 100644
index 0000000000..2e1d89a689
--- /dev/null
+++ b/demos/deform/pathdeform.cpp
@@ -0,0 +1,647 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "pathdeform.h"
+
+#include <QApplication>
+#include <QtDebug>
+#include <QMouseEvent>
+#include <QTimerEvent>
+#include <QLayout>
+#include <QLineEdit>
+#include <QPainter>
+#include <QSlider>
+#include <QLabel>
+#include <QDesktopWidget>
+#include <qmath.h>
+
+
+PathDeformControls::PathDeformControls(QWidget *parent, PathDeformRenderer* renderer, bool smallScreen)
+      : QWidget(parent)
+{
+    m_renderer = renderer;
+
+    if (smallScreen)
+        layoutForSmallScreen();
+    else
+        layoutForDesktop();
+}
+
+
+void PathDeformControls::layoutForDesktop()
+{
+    QGroupBox* mainGroup = new QGroupBox(this);
+    mainGroup->setTitle(tr("Controls"));
+
+    QGroupBox *radiusGroup = new QGroupBox(mainGroup);
+    radiusGroup->setTitle(tr("Lens Radius"));
+    QSlider *radiusSlider = new QSlider(Qt::Horizontal, radiusGroup);
+    radiusSlider->setRange(15, 150);
+    radiusSlider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+
+    QGroupBox *deformGroup = new QGroupBox(mainGroup);
+    deformGroup->setTitle(tr("Deformation"));
+    QSlider *deformSlider = new QSlider(Qt::Horizontal, deformGroup);
+    deformSlider->setRange(-100, 100);
+    deformSlider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+
+    QGroupBox *fontSizeGroup = new QGroupBox(mainGroup);
+    fontSizeGroup->setTitle(tr("Font Size"));
+    QSlider *fontSizeSlider = new QSlider(Qt::Horizontal, fontSizeGroup);
+    fontSizeSlider->setRange(16, 200);
+    fontSizeSlider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+
+    QGroupBox *textGroup = new QGroupBox(mainGroup);
+    textGroup->setTitle(tr("Text"));
+    QLineEdit *textInput = new QLineEdit(textGroup);
+
+    QPushButton *animateButton = new QPushButton(mainGroup);
+    animateButton->setText(tr("Animated"));
+    animateButton->setCheckable(true);
+
+    QPushButton *showSourceButton = new QPushButton(mainGroup);
+    showSourceButton->setText(tr("Show Source"));
+
+#ifdef QT_OPENGL_SUPPORT
+    QPushButton *enableOpenGLButton = new QPushButton(mainGroup);
+    enableOpenGLButton->setText(tr("Use OpenGL"));
+    enableOpenGLButton->setCheckable(true);
+    enableOpenGLButton->setChecked(m_renderer->usesOpenGL());
+    if (!QGLFormat::hasOpenGL())
+        enableOpenGLButton->hide();
+#endif
+
+    QPushButton *whatsThisButton = new QPushButton(mainGroup);
+    whatsThisButton->setText(tr("What's This?"));
+    whatsThisButton->setCheckable(true);
+
+
+    mainGroup->setFixedWidth(180);
+
+    QVBoxLayout *mainGroupLayout = new QVBoxLayout(mainGroup);
+    mainGroupLayout->addWidget(radiusGroup);
+    mainGroupLayout->addWidget(deformGroup);
+    mainGroupLayout->addWidget(fontSizeGroup);
+    mainGroupLayout->addWidget(textGroup);
+    mainGroupLayout->addWidget(animateButton);
+    mainGroupLayout->addStretch(1);
+#ifdef QT_OPENGL_SUPPORT
+    mainGroupLayout->addWidget(enableOpenGLButton);
+#endif
+    mainGroupLayout->addWidget(showSourceButton);
+    mainGroupLayout->addWidget(whatsThisButton);
+
+    QVBoxLayout *radiusGroupLayout = new QVBoxLayout(radiusGroup);
+    radiusGroupLayout->addWidget(radiusSlider);
+
+    QVBoxLayout *deformGroupLayout = new QVBoxLayout(deformGroup);
+    deformGroupLayout->addWidget(deformSlider);
+
+    QVBoxLayout *fontSizeGroupLayout = new QVBoxLayout(fontSizeGroup);
+    fontSizeGroupLayout->addWidget(fontSizeSlider);
+
+    QVBoxLayout *textGroupLayout = new QVBoxLayout(textGroup);
+    textGroupLayout->addWidget(textInput);
+
+    QVBoxLayout * mainLayout = new QVBoxLayout(this);
+    mainLayout->addWidget(mainGroup);
+    mainLayout->setMargin(0);
+
+    connect(radiusSlider, SIGNAL(valueChanged(int)), m_renderer, SLOT(setRadius(int)));
+    connect(deformSlider, SIGNAL(valueChanged(int)), m_renderer, SLOT(setIntensity(int)));
+    connect(fontSizeSlider, SIGNAL(valueChanged(int)), m_renderer, SLOT(setFontSize(int)));
+    connect(animateButton, SIGNAL(clicked(bool)), m_renderer, SLOT(setAnimated(bool)));
+#ifdef QT_OPENGL_SUPPORT
+    connect(enableOpenGLButton, SIGNAL(clicked(bool)), m_renderer, SLOT(enableOpenGL(bool)));
+#endif
+
+    connect(textInput, SIGNAL(textChanged(QString)), m_renderer, SLOT(setText(QString)));
+    connect(m_renderer, SIGNAL(descriptionEnabledChanged(bool)),
+            whatsThisButton, SLOT(setChecked(bool)));
+    connect(whatsThisButton, SIGNAL(clicked(bool)), m_renderer, SLOT(setDescriptionEnabled(bool)));
+    connect(showSourceButton, SIGNAL(clicked()), m_renderer, SLOT(showSource()));
+
+    animateButton->animateClick();
+    deformSlider->setValue(80);
+    fontSizeSlider->setValue(120);
+    radiusSlider->setValue(100);
+    textInput->setText(tr("Qt"));
+}
+
+void PathDeformControls::layoutForSmallScreen()
+{
+    QGroupBox* mainGroup = new QGroupBox(this);
+    mainGroup->setTitle(tr("Controls"));
+
+    QLabel *radiusLabel = new QLabel(mainGroup);
+    radiusLabel->setText(tr("Lens Radius:"));
+    QSlider *radiusSlider = new QSlider(Qt::Horizontal, mainGroup);
+    radiusSlider->setRange(15, 150);
+    radiusSlider->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+
+    QLabel *deformLabel = new QLabel(mainGroup);
+    deformLabel->setText(tr("Deformation:"));
+    QSlider *deformSlider = new QSlider(Qt::Horizontal, mainGroup);
+    deformSlider->setRange(-100, 100);
+    deformSlider->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+
+    QLabel *fontSizeLabel = new QLabel(mainGroup);
+    fontSizeLabel->setText(tr("Font Size:"));
+    QSlider *fontSizeSlider = new QSlider(Qt::Horizontal, mainGroup);
+    fontSizeSlider->setRange(16, 200);
+    fontSizeSlider->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+
+    QPushButton *animateButton = new QPushButton(tr("Animated"), mainGroup);
+    animateButton->setCheckable(true);
+
+#ifdef QT_OPENGL_SUPPORT
+    QPushButton *enableOpenGLButton = new QPushButton(mainGroup);
+    enableOpenGLButton->setText(tr("Use OpenGL"));
+    enableOpenGLButton->setCheckable(mainGroup);
+    enableOpenGLButton->setChecked(m_renderer->usesOpenGL());
+    if (!QGLFormat::hasOpenGL())
+        enableOpenGLButton->hide();
+#endif
+
+    QPushButton *quitButton = new QPushButton(tr("Quit"), mainGroup);
+    QPushButton *okButton = new QPushButton(tr("OK"), mainGroup);
+
+
+    QGridLayout *mainGroupLayout = new QGridLayout(mainGroup);
+    mainGroupLayout->setMargin(0);
+    mainGroupLayout->addWidget(radiusLabel, 0, 0, Qt::AlignRight);
+    mainGroupLayout->addWidget(radiusSlider, 0, 1);
+    mainGroupLayout->addWidget(deformLabel, 1, 0, Qt::AlignRight);
+    mainGroupLayout->addWidget(deformSlider, 1, 1);
+    mainGroupLayout->addWidget(fontSizeLabel, 2, 0, Qt::AlignRight);
+    mainGroupLayout->addWidget(fontSizeSlider, 2, 1);
+    mainGroupLayout->addWidget(animateButton, 3,0, 1,2);
+#ifdef QT_OPENGL_SUPPORT
+    mainGroupLayout->addWidget(enableOpenGLButton, 4,0, 1,2);
+#endif
+
+    QVBoxLayout *mainLayout = new QVBoxLayout(this);
+    mainLayout->addWidget(mainGroup);
+    mainLayout->addStretch(1);
+    mainLayout->addWidget(okButton);
+    mainLayout->addWidget(quitButton);
+
+    connect(quitButton, SIGNAL(clicked()), this, SLOT(emitQuitSignal()));
+    connect(okButton, SIGNAL(clicked()), this, SLOT(emitOkSignal()));
+    connect(radiusSlider, SIGNAL(valueChanged(int)), m_renderer, SLOT(setRadius(int)));
+    connect(deformSlider, SIGNAL(valueChanged(int)), m_renderer, SLOT(setIntensity(int)));
+    connect(fontSizeSlider, SIGNAL(valueChanged(int)), m_renderer, SLOT(setFontSize(int)));
+    connect(animateButton, SIGNAL(clicked(bool)), m_renderer, SLOT(setAnimated(bool)));
+#ifdef QT_OPENGL_SUPPORT
+    connect(enableOpenGLButton, SIGNAL(clicked(bool)), m_renderer, SLOT(enableOpenGL(bool)));
+#endif
+
+
+    animateButton->animateClick();
+    deformSlider->setValue(80);
+    fontSizeSlider->setValue(120);
+
+    QRect screen_size = QApplication::desktop()->screenGeometry();
+    radiusSlider->setValue(qMin(screen_size.width(), screen_size.height())/5);
+    m_renderer->setText(tr("Qt"));
+}
+
+
+void PathDeformControls::emitQuitSignal()
+{   emit quitPressed();  }
+
+void PathDeformControls::emitOkSignal()
+{   emit okPressed();   }
+
+
+PathDeformWidget::PathDeformWidget(QWidget *parent, bool smallScreen)
+    : QWidget(parent)
+{
+    setWindowTitle(tr("Vector Deformation"));
+
+    m_renderer = new PathDeformRenderer(this, smallScreen);
+    m_renderer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+
+    // Layouts
+    QHBoxLayout *mainLayout = new QHBoxLayout(this);
+    mainLayout->addWidget(m_renderer);
+
+    m_controls = new PathDeformControls(0, m_renderer, smallScreen);
+    m_controls->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
+
+    if (!smallScreen)
+        mainLayout->addWidget(m_controls);
+
+    m_renderer->loadSourceFile(":res/deform/pathdeform.cpp");
+    m_renderer->loadDescription(":res/deform/pathdeform.html");
+    m_renderer->setDescriptionEnabled(false);
+
+    connect(m_renderer, SIGNAL(clicked()), this, SLOT(showControls()));
+    connect(m_controls, SIGNAL(okPressed()), this, SLOT(hideControls()));
+    connect(m_controls, SIGNAL(quitPressed()), QApplication::instance(), SLOT(quit()));
+}
+
+
+void PathDeformWidget::showControls()
+{
+    m_controls->showFullScreen();
+}
+
+void PathDeformWidget::hideControls()
+{
+    m_controls->hide();
+}
+
+void PathDeformWidget::setStyle( QStyle * style )
+{
+    QWidget::setStyle(style);
+    if (m_controls != 0)
+    {
+        m_controls->setStyle(style);
+        
+        QList<QWidget *> widgets = qFindChildren<QWidget *>(m_controls);
+        foreach (QWidget *w, widgets)
+            w->setStyle(style);
+    }
+}
+
+static inline QRect circle_bounds(const QPointF &center, qreal radius, qreal compensation)
+{
+    return QRect(qRound(center.x() - radius - compensation),
+                 qRound(center.y() - radius - compensation),
+                 qRound((radius + compensation) * 2),
+                 qRound((radius + compensation) * 2));
+
+}
+
+const int LENS_EXTENT = 10;
+
+PathDeformRenderer::PathDeformRenderer(QWidget *widget, bool smallScreen)
+    : ArthurFrame(widget)
+{
+    m_radius = 100;
+    m_pos = QPointF(m_radius, m_radius);
+    m_direction = QPointF(1, 1);
+    m_fontSize = 24;
+    m_animated = true;
+    m_repaintTimer.start(25, this);
+    m_repaintTracker.start();
+    m_intensity = 100;
+    m_smallScreen = smallScreen;
+
+//     m_fpsTimer.start(1000, this);
+//     m_fpsCounter = 0;
+
+    generateLensPixmap();
+}
+
+void PathDeformRenderer::setText(const QString &text)
+{
+    m_text = text;
+
+    QFont f("times new roman,utopia");
+    f.setStyleStrategy(QFont::ForceOutline);
+    f.setPointSize(m_fontSize);
+    f.setStyleHint(QFont::Times);
+
+    QFontMetrics fm(f);
+
+    m_paths.clear();
+    m_pathBounds = QRect();
+
+    QPointF advance(0, 0);
+
+    bool do_quick = true;
+    for (int i=0; i<text.size(); ++i) {
+        if (text.at(i).unicode() >= 0x4ff && text.at(i).unicode() <= 0x1e00) {
+            do_quick = false;
+            break;
+        }
+    }
+
+    if (do_quick) {
+        for (int i=0; i<text.size(); ++i) {
+            QPainterPath path;
+            path.addText(advance, f, text.mid(i, 1));
+            m_pathBounds |= path.boundingRect();
+            m_paths << path;
+            advance += QPointF(fm.width(text.mid(i, 1)), 0);
+        }
+    } else {
+        QPainterPath path;
+        path.addText(advance, f, text);
+        m_pathBounds |= path.boundingRect();
+        m_paths << path;
+    }
+
+    for (int i=0; i<m_paths.size(); ++i)
+        m_paths[i] = m_paths[i] * QMatrix(1, 0, 0, 1, -m_pathBounds.x(), -m_pathBounds.y());
+
+    update();
+}
+
+
+void PathDeformRenderer::generateLensPixmap()
+{
+    qreal rad = m_radius + LENS_EXTENT;
+
+    QRect bounds = circle_bounds(QPointF(), rad, 0);
+
+    QPainter painter;
+
+    if (preferImage()) {
+        m_lens_image = QImage(bounds.size(), QImage::Format_ARGB32_Premultiplied);
+        m_lens_image.fill(0);
+        painter.begin(&m_lens_image);
+    } else {
+        m_lens_pixmap = QPixmap(bounds.size());
+        m_lens_pixmap.fill(Qt::transparent);
+        painter.begin(&m_lens_pixmap);
+    }
+
+    QRadialGradient gr(rad, rad, rad, 3 * rad / 5, 3 * rad / 5);
+    gr.setColorAt(0.0, QColor(255, 255, 255, 191));
+    gr.setColorAt(0.2, QColor(255, 255, 127, 191));
+    gr.setColorAt(0.9, QColor(150, 150, 200, 63));
+    gr.setColorAt(0.95, QColor(0, 0, 0, 127));
+    gr.setColorAt(1, QColor(0, 0, 0, 0));
+    painter.setRenderHint(QPainter::Antialiasing);
+    painter.setBrush(gr);
+    painter.setPen(Qt::NoPen);
+    painter.drawEllipse(0, 0, bounds.width(), bounds.height());
+}
+
+
+void PathDeformRenderer::setAnimated(bool animated)
+{
+    m_animated = animated;
+
+    if (m_animated) {
+//         m_fpsTimer.start(1000, this);
+//         m_fpsCounter = 0;
+        m_repaintTimer.start(25, this);
+        m_repaintTracker.start();
+    } else {
+//         m_fpsTimer.stop();
+        m_repaintTimer.stop();
+    }
+}
+
+void PathDeformRenderer::timerEvent(QTimerEvent *e)
+{
+
+    if (e->timerId() == m_repaintTimer.timerId()) {
+
+        if (QLineF(QPointF(0,0), m_direction).length() > 1)
+            m_direction *= 0.995;
+        qreal time = m_repaintTracker.restart();
+
+        QRect rectBefore = circle_bounds(m_pos, m_radius, m_fontSize);
+
+        qreal dx = m_direction.x();
+        qreal dy = m_direction.y();
+        if (time > 0) {
+            dx = dx * time * .1;
+            dy = dy * time * .1;
+        }
+
+        m_pos += QPointF(dx, dy);
+
+
+
+        if (m_pos.x() - m_radius < 0) {
+            m_direction.setX(-m_direction.x());
+            m_pos.setX(m_radius);
+        } else if (m_pos.x() + m_radius > width()) {
+            m_direction.setX(-m_direction.x());
+            m_pos.setX(width() - m_radius);
+        }
+
+        if (m_pos.y() - m_radius < 0) {
+            m_direction.setY(-m_direction.y());
+            m_pos.setY(m_radius);
+        } else if (m_pos.y() + m_radius > height()) {
+            m_direction.setY(-m_direction.y());
+            m_pos.setY(height() - m_radius);
+        }
+
+#ifdef QT_OPENGL_SUPPORT
+        if (usesOpenGL()) {
+            update();
+        } else
+#endif
+        {
+            QRect rectAfter = circle_bounds(m_pos, m_radius, m_fontSize);
+            update(rectAfter | rectBefore);
+            QApplication::syncX();
+        }
+    }
+//     else if (e->timerId() == m_fpsTimer.timerId()) {
+//         printf("fps: %d\n", m_fpsCounter);
+//         emit frameRate(m_fpsCounter);
+//         m_fpsCounter = 0;
+
+//     }
+}
+
+void PathDeformRenderer::mousePressEvent(QMouseEvent *e)
+{
+    setDescriptionEnabled(false);
+
+    m_repaintTimer.stop();
+    m_offset = QPointF();
+    if (QLineF(m_pos, e->pos()).length() <= m_radius)
+        m_offset = m_pos - e->pos();
+
+    m_mousePress = e->pos();
+    
+    // If we're not running in small screen mode, always assume we're dragging
+    m_mouseDrag = !m_smallScreen;
+
+    mouseMoveEvent(e);
+}
+
+void PathDeformRenderer::mouseReleaseEvent(QMouseEvent *e)
+{
+    if (e->buttons() == Qt::NoButton && m_animated) {
+        m_repaintTimer.start(10, this);
+        m_repaintTracker.start();
+    }
+
+    if (!m_mouseDrag && m_smallScreen)
+        emit clicked();
+}
+
+void PathDeformRenderer::mouseMoveEvent(QMouseEvent *e)
+{
+    if (!m_mouseDrag && (QLineF(m_mousePress, e->pos()).length() > 25.0) )
+        m_mouseDrag = true;
+
+    if (m_mouseDrag) {
+        QRect rectBefore = circle_bounds(m_pos, m_radius, m_fontSize);
+        if (e->type() == QEvent::MouseMove) {
+            QLineF line(m_pos, e->pos() + m_offset);
+            line.setLength(line.length() * .1);
+            QPointF dir(line.dx(), line.dy());
+            m_direction = (m_direction + dir) / 2;
+        }
+        m_pos = e->pos() + m_offset;
+#ifdef QT_OPENGL_SUPPORT
+        if (usesOpenGL()) {
+            update();
+        } else
+#endif
+        {
+            QRect rectAfter = circle_bounds(m_pos, m_radius, m_fontSize);
+            update(rectBefore | rectAfter);
+        }
+    }
+}
+
+QPainterPath PathDeformRenderer::lensDeform(const QPainterPath &source, const QPointF &offset)
+{
+    QPainterPath path;
+    path.addPath(source);
+
+    qreal flip = m_intensity / qreal(100);
+
+    for (int i=0; i<path.elementCount(); ++i) {
+        const QPainterPath::Element &e = path.elementAt(i);
+
+        qreal x = e.x + offset.x();
+        qreal y = e.y + offset.y();
+
+        qreal dx = x - m_pos.x();
+        qreal dy = y - m_pos.y();
+        qreal len = m_radius - qSqrt(dx * dx + dy * dy);
+
+        if (len > 0) {
+            path.setElementPositionAt(i,
+                                      x + flip * dx * len / m_radius,
+                                      y + flip * dy * len / m_radius);
+        } else {
+            path.setElementPositionAt(i, x, y);
+        }
+
+    }
+
+    return path;
+}
+
+
+void PathDeformRenderer::paint(QPainter *painter)
+{
+    int pad_x = 5;
+    int pad_y = 5;
+
+    int skip_x = qRound(m_pathBounds.width() + pad_x + m_fontSize/2);
+    int skip_y = qRound(m_pathBounds.height() + pad_y);
+
+    painter->setPen(Qt::NoPen);
+    painter->setBrush(Qt::black);
+
+    QRectF clip(painter->clipPath().boundingRect());
+
+    int overlap = pad_x / 2;
+
+    for (int start_y=0; start_y < height(); start_y += skip_y) {
+
+        if (start_y > clip.bottom())
+            break;
+
+        int start_x = -overlap;
+        for (; start_x < width(); start_x += skip_x) {
+
+            if (start_y + skip_y >= clip.top() &&
+                start_x + skip_x >= clip.left() &&
+                start_x <= clip.right()) {
+                for (int i=0; i<m_paths.size(); ++i) {
+                    QPainterPath path = lensDeform(m_paths[i], QPointF(start_x, start_y));
+                    painter->drawPath(path);
+                }
+            }
+        }
+        overlap = skip_x - (start_x - width());
+
+    }
+
+    if (preferImage()) {
+        painter->drawImage(m_pos - QPointF(m_radius + LENS_EXTENT, m_radius + LENS_EXTENT),
+                           m_lens_image);
+    } else {
+        painter->drawPixmap(m_pos - QPointF(m_radius + LENS_EXTENT, m_radius + LENS_EXTENT),
+                            m_lens_pixmap);
+    }
+}
+
+
+
+void PathDeformRenderer::setRadius(int radius)
+{
+    qreal max = qMax(m_radius, (qreal)radius);
+    m_radius = radius;
+    generateLensPixmap();
+    if (!m_animated || m_radius < max) {
+#ifdef QT_OPENGL_SUPPORT
+        if (usesOpenGL()) {
+            update();
+        } else
+#endif
+        {
+            update(circle_bounds(m_pos, max, m_fontSize));
+        }
+    }
+}
+
+void PathDeformRenderer::setIntensity(int intensity)
+{
+    m_intensity = intensity;
+    if (!m_animated) {
+#ifdef QT_OPENGL_SUPPORT
+        if (usesOpenGL()) {
+            update();
+        } else
+#endif
+        {
+            update(circle_bounds(m_pos, m_radius, m_fontSize));
+        }
+    }
+}
diff --git a/demos/deform/pathdeform.h b/demos/deform/pathdeform.h
new file mode 100644
index 0000000000..45edb26adc
--- /dev/null
+++ b/demos/deform/pathdeform.h
@@ -0,0 +1,153 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PATHDEFORM_H
+#define PATHDEFORM_H
+
+#include "arthurwidgets.h"
+
+#include <QPainterPath>
+#include <QBasicTimer>
+#include <QDateTime>
+
+class PathDeformRenderer : public ArthurFrame
+{
+    Q_OBJECT
+    Q_PROPERTY(bool animated READ animated WRITE setAnimated)
+    Q_PROPERTY(int radius READ radius WRITE setRadius)
+    Q_PROPERTY(int fontSize READ fontSize WRITE setFontSize)
+    Q_PROPERTY(int intensity READ intensity WRITE setIntensity)
+    Q_PROPERTY(QString text READ text WRITE setText)
+
+public:
+    PathDeformRenderer(QWidget *widget, bool smallScreen = false);
+
+    void paint(QPainter *painter);
+
+    void mousePressEvent(QMouseEvent *e);
+    void mouseReleaseEvent(QMouseEvent *e);
+    void mouseMoveEvent(QMouseEvent *e);
+    void timerEvent(QTimerEvent *e);
+
+    QSize sizeHint() const { return QSize(600, 500); }
+
+    bool animated() const { return m_animated; }
+    int radius() const { return int(m_radius); }
+    int fontSize() const { return m_fontSize; }
+    int intensity() const { return int(m_intensity); }
+    QString text() const { return m_text; }
+
+public slots:
+    void setRadius(int radius);
+    void setFontSize(int fontSize) { m_fontSize = fontSize; setText(m_text); }
+    void setText(const QString &text);
+    void setIntensity(int intensity);
+
+    void setAnimated(bool animated);
+
+signals:
+    void clicked();
+//     void frameRate(double fps);
+
+private:
+    void generateLensPixmap();
+    QPainterPath lensDeform(const QPainterPath &source, const QPointF &offset);
+
+    QBasicTimer m_repaintTimer;
+//     QBasicTimer m_fpsTimer;
+//     int m_fpsCounter;
+    QTime m_repaintTracker;
+
+    QVector<QPainterPath> m_paths;
+    QVector<QPointF> m_advances;
+    QRectF m_pathBounds;
+    QString m_text;
+
+    QPixmap m_lens_pixmap;
+    QImage m_lens_image;
+
+    int m_fontSize;
+    bool m_animated;
+
+    qreal m_intensity;
+    qreal m_radius;
+    QPointF m_pos;
+    QPointF m_offset;
+    QPointF m_direction;
+    QPointF m_mousePress;
+    bool    m_mouseDrag;
+    bool    m_smallScreen;
+};
+
+class PathDeformControls : public QWidget
+{
+    Q_OBJECT
+public:
+    PathDeformControls(QWidget *parent, PathDeformRenderer* renderer, bool smallScreen);
+signals:
+    void okPressed();
+    void quitPressed();
+private:
+    PathDeformRenderer* m_renderer;
+    void layoutForDesktop();
+    void layoutForSmallScreen();
+private slots:
+    void emitQuitSignal();
+    void emitOkSignal();
+};
+
+class PathDeformWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    PathDeformWidget(QWidget *parent, bool smallScreen);
+    void setStyle ( QStyle * style );
+
+private:
+    PathDeformRenderer *m_renderer;
+    PathDeformControls *m_controls;
+
+private slots:
+    void showControls();
+    void hideControls();
+};
+
+#endif // PATHDEFORM_H
diff --git a/demos/deform/pathdeform.html b/demos/deform/pathdeform.html
new file mode 100644
index 0000000000..b3f63a8e0a
--- /dev/null
+++ b/demos/deform/pathdeform.html
@@ -0,0 +1,24 @@
+<html>
+<center>
+<h2>Vector deformation</h2>
+</center>
+
+<p>This demo shows how to use advanced vector techniques to draw text 
+using a <code>QPainterPath</code>.</p>
+
+<p>We define a vector deformation field in the shape of a lens and apply
+this to all points in a path. This means that what is rendered on
+screen is not pixel manipulation, but modified vector representations of
+the glyphs themselves. This is visible from the high quality of the
+antialiased edges for the deformed glyphs.</p>
+
+<p>To get a fairly complex path we allow the user to type in text and
+convert the text to paths. This is done using the
+<code>QPainterPath::addText()</code> function.</p>
+
+<p>The lens is drawn using a single call to <code>drawEllipse()</code>, using
+a <code>QRadialGradient</code> to fill it with a specialized color table,
+giving the effect of the Sun's reflection and a drop shadow. The lens
+is cached as a pixmap for better performance.</p>
+
+</html>
diff --git a/demos/demos.pro b/demos/demos.pro
new file mode 100644
index 0000000000..9248ab8ada
--- /dev/null
+++ b/demos/demos.pro
@@ -0,0 +1,73 @@
+TEMPLATE    = subdirs
+SUBDIRS     = \
+	demos_shared \
+	demos_deform \
+	demos_gradients \
+	demos_pathstroke \
+	demos_affine \
+	demos_composition \
+        demos_books \
+        demos_interview \
+        demos_mainwindow \
+        demos_spreadsheet \
+        demos_textedit \
+        demos_chip \
+        demos_embeddeddialogs \
+        demos_undo 
+
+contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, opengles1cl):!contains(QT_CONFIG, opengles2):{
+SUBDIRS += demos_boxes
+}
+
+mac*: SUBDIRS += demos_macmainwindow
+wince*|embedded: SUBDIRS += embedded
+
+!contains(QT_EDITION, Console):!cross_compile:!embedded:!wince*:SUBDIRS += demos_arthurplugin
+
+!cross_compile:{
+contains(QT_BUILD_PARTS, tools):{
+!wince*:SUBDIRS += demos_sqlbrowser demos_qtdemo
+wince*: SUBDIRS += demos_sqlbrowser
+}
+}
+contains(QT_CONFIG, phonon)!static:SUBDIRS += demos_mediaplayer
+contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):SUBDIRS += demos_browser
+
+# install
+sources.files = README *.pro
+sources.path = $$[QT_INSTALL_DEMOS]
+INSTALLS += sources
+
+demos_chip.subdir = chip
+demos_embeddeddialogs.subdir = embeddeddialogs
+demos_shared.subdir = shared
+demos_deform.subdir = deform
+demos_gradients.subdir = gradients
+demos_pathstroke.subdir = pathstroke
+demos_affine.subdir = affine
+demos_composition.subdir = composition
+demos_books.subdir = books
+demos_interview.subdir = interview
+demos_macmainwindow.subdir = macmainwindow
+demos_mainwindow.subdir = mainwindow
+demos_spreadsheet.subdir = spreadsheet
+demos_textedit.subdir = textedit
+demos_arthurplugin.subdir = arthurplugin
+demos_sqlbrowser.subdir = sqlbrowser
+demos_undo.subdir = undo
+demos_qtdemo.subdir = qtdemo
+demos_mediaplayer.subdir = mediaplayer
+
+demos_browser.subdir = browser
+
+demos_boxes.subdir = boxes
+
+#CONFIG += ordered
+!ordered {
+     demos_affine.depends = demos_shared
+     demos_deform.depends = demos_shared
+     demos_gradients.depends = demos_shared
+     demos_composition.depends = demos_shared
+     demos_arthurplugin.depends = demos_shared
+     demos_pathstroke.depends = demos_shared
+}
diff --git a/demos/embedded/embedded.pro b/demos/embedded/embedded.pro
new file mode 100644
index 0000000000..7428b9f680
--- /dev/null
+++ b/demos/embedded/embedded.pro
@@ -0,0 +1,13 @@
+TEMPLATE  = subdirs
+SUBDIRS   = styledemo
+
+contains(QT_CONFIG, svg) {
+    SUBDIRS += embeddedsvgviewer \
+               fluidlauncher
+}
+
+# install
+sources.files = README *.pro
+sources.path = $$[QT_INSTALL_DEMOS]/embedded
+INSTALLS += sources
+
diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp
new file mode 100644
index 0000000000..1bd99c9ca0
--- /dev/null
+++ b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp
@@ -0,0 +1,181 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QPainter>
+#include <QApplication>
+
+#include "embeddedsvgviewer.h"
+
+
+
+EmbeddedSvgViewer::EmbeddedSvgViewer(const QString &filePath)
+{
+    qApp->setStyleSheet(" QSlider:vertical { width: 50px; } \
+                          QSlider::groove:vertical { border: 1px solid black; border-radius: 3px; width: 6px; } \
+                          QSlider::handle:vertical { height: 25px; margin: 0 -22px; image: url(':/files/v-slider-handle.svg'); } \
+                       ");
+
+    m_renderer = new QSvgRenderer(filePath);
+    m_imageSize = m_renderer->viewBox().size();
+
+    m_viewBoxCenter = (QPointF(m_imageSize.width() / qreal(2.0), m_imageSize.height() / qreal(2.0)));
+
+    m_zoomSlider = new QSlider(Qt::Vertical, this);
+    m_zoomSlider->setMaximum(150);
+    m_zoomSlider->setMinimum(1);
+
+    connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(setZoom(int)));
+    m_zoomSlider->setValue(100);
+
+    m_quitButton = new QPushButton("Quit", this);
+
+    connect(m_quitButton, SIGNAL(pressed()), QApplication::instance(), SLOT(quit()));
+
+    if (m_renderer->animated())
+        connect(m_renderer, SIGNAL(repaintNeeded()), this, SLOT(update()));
+
+}
+
+void EmbeddedSvgViewer::paintEvent(QPaintEvent *event)
+{
+    Q_UNUSED(event)
+    QPainter painter(this);
+    m_renderer->setViewBox(m_viewBox);
+    m_renderer->render(&painter);
+}
+
+
+void EmbeddedSvgViewer::mouseMoveEvent ( QMouseEvent * event )
+{
+    int incX = int((event->globalX() - m_mousePress.x()) * m_imageScale);
+    int incY = int((event->globalY() - m_mousePress.y()) * m_imageScale);
+
+    QPointF newCenter;
+    newCenter.setX(m_viewBoxCenterOnMousePress.x() - incX);
+    newCenter.setY(m_viewBoxCenterOnMousePress.y() - incY);
+  
+    QRectF newViewBox = getViewBox(newCenter);
+
+
+    // Do a bounded move on the horizontal:
+    if ( (newViewBox.left() >= m_viewBoxBounds.left()) &&
+         (newViewBox.right() <= m_viewBoxBounds.right()) ) 
+    {
+        m_viewBoxCenter.setX(newCenter.x());
+        m_viewBox.setLeft(newViewBox.left());
+        m_viewBox.setRight(newViewBox.right());
+    }
+
+    // do a bounded move on the vertical:
+    if (  (newViewBox.top() >= m_viewBoxBounds.top()) &&
+          (newViewBox.bottom() <= m_viewBoxBounds.bottom()) )
+    {
+        m_viewBoxCenter.setY(newCenter.y());
+        m_viewBox.setTop(newViewBox.top());
+        m_viewBox.setBottom(newViewBox.bottom());
+    }
+
+    update();
+}
+
+void EmbeddedSvgViewer::mousePressEvent ( QMouseEvent * event )
+{
+    m_viewBoxCenterOnMousePress = m_viewBoxCenter;
+    m_mousePress = event->globalPos();
+}
+
+
+QRectF EmbeddedSvgViewer::getViewBox(QPointF viewBoxCenter)
+{
+    QRectF result;
+    result.setLeft(viewBoxCenter.x() - (m_viewBoxSize.width() / 2));
+    result.setTop(viewBoxCenter.y() - (m_viewBoxSize.height() / 2));
+    result.setRight(viewBoxCenter.x() + (m_viewBoxSize.width() / 2));
+    result.setBottom(viewBoxCenter.y() + (m_viewBoxSize.height() / 2));
+    return result;
+}
+
+void EmbeddedSvgViewer::updateImageScale()
+{
+    m_imageScale = qMax( (qreal)m_imageSize.width() / (qreal)width(), 
+                               (qreal)m_imageSize.height() / (qreal)height())*m_zoomLevel;
+
+    m_viewBoxSize.setWidth((qreal)width() * m_imageScale);
+    m_viewBoxSize.setHeight((qreal)height() * m_imageScale);
+}
+
+
+void EmbeddedSvgViewer::resizeEvent ( QResizeEvent * event )
+{
+    qreal origZoom = m_zoomLevel;
+
+    // Get the new bounds:
+    m_zoomLevel = 1.0;
+    updateImageScale();
+    m_viewBoxBounds = getViewBox(QPointF(m_imageSize.width() / 2.0, m_imageSize.height() / 2.0));
+
+    m_zoomLevel = origZoom;
+    updateImageScale();
+    m_viewBox = getViewBox(m_viewBoxCenter);
+
+    QRect sliderRect;
+    sliderRect.setLeft(width() - m_zoomSlider->sizeHint().width());
+    sliderRect.setRight(width());
+    sliderRect.setTop(height()/4);
+    sliderRect.setBottom(height() - (height()/4));
+    m_zoomSlider->setGeometry(sliderRect);
+}
+
+
+void EmbeddedSvgViewer::setZoom(int newZoom)
+{
+    m_zoomLevel = qreal(newZoom) / qreal(100);
+    
+    updateImageScale();
+    m_viewBox = getViewBox(m_viewBoxCenter);
+
+    update();
+}
+
+
+
+
+
diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.h b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.h
new file mode 100644
index 0000000000..c0af3cfcd4
--- /dev/null
+++ b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef EMBEDDED_SVG_VIEWER_H
+#define EMBEDDED_SVG_VIEWER_H
+
+#include <QWidget>
+#include <QString>
+#include <QSvgRenderer>
+#include <QSize>
+#include <QMouseEvent>
+#include <QSlider>
+#include <QPushButton>
+
+class EmbeddedSvgViewer : public QWidget
+{
+    Q_OBJECT
+public:
+    EmbeddedSvgViewer(const QString& filePath);
+    virtual void paintEvent(QPaintEvent *event);
+    void mouseMoveEvent ( QMouseEvent * event );
+    void mousePressEvent ( QMouseEvent * event );
+    void resizeEvent ( QResizeEvent * event );
+
+public slots:
+    void setZoom(int); // 100 <= newZoom < 0
+
+private:
+    QSvgRenderer* m_renderer;
+    QSlider* m_zoomSlider;
+    QPushButton* m_quitButton;
+    QSize m_imageSize;
+    qreal m_zoomLevel;
+    qreal m_imageScale; // How many Image coords 1 widget pixel is worth
+
+    QRectF m_viewBox;
+    QRectF m_viewBoxBounds;
+    QSizeF m_viewBoxSize;
+    QPointF m_viewBoxCenter;
+    QPointF m_viewBoxCenterOnMousePress;
+    QPoint m_mousePress;
+
+    void updateImageScale();
+    QRectF getViewBox(QPointF viewBoxCenter);
+};
+
+
+
+#endif
diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
new file mode 100644
index 0000000000..505e6078ca
--- /dev/null
+++ b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
@@ -0,0 +1,16 @@
+TEMPLATE = app
+QT += svg
+
+# Input
+HEADERS += embeddedsvgviewer.h
+SOURCES += embeddedsvgviewer.cpp main.cpp
+RESOURCES += embeddedsvgviewer.qrc
+
+target.path = $$[QT_INSTALL_DEMOS]/embedded/embeddedsvgviewer
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.svg files
+sources.path = $$[QT_INSTALL_DEMOS]/embedded/embeddedsvgviewer
+INSTALLS += target sources 
+
+wince*: {
+   DEPLOYMENT_PLUGIN += qsvg
+}
diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.qrc b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.qrc
new file mode 100644
index 0000000000..bb02118c65
--- /dev/null
+++ b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.qrc
@@ -0,0 +1,7 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+    <file>files/v-slider-handle.svg</file>
+    <file>files/default.svg</file>
+</qresource>
+</RCC>
+
diff --git a/demos/embedded/embeddedsvgviewer/files/default.svg b/demos/embedded/embeddedsvgviewer/files/default.svg
new file mode 100644
index 0000000000..c28a71108b
--- /dev/null
+++ b/demos/embedded/embeddedsvgviewer/files/default.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="400px"
+   height="400px"
+   baseProfile="tiny"
+   id="svg8268"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docname="simple2.svg"
+   sodipodi:docbase="/nfs/OpenMoko/SVGs"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata8283">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8281" />
+  <sodipodi:namedview
+     inkscape:window-height="917"
+     inkscape:window-width="1324"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="2.1452345"
+     inkscape:cx="185.25"
+     inkscape:cy="214.75"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:current-layer="svg8268" />
+  <g
+     stroke="DarkBlue"
+     stroke-width="10"
+     id="g8270">
+    <rect
+       fill="blue"
+       fill-opacity="0.5"
+       x="25"
+       y="25"
+       width="175"
+       height="175"
+       id="rect8272" />
+  </g>
+  <circle
+     cx="200"
+     cy="200"
+     r="75"
+     id="circle8274"
+     sodipodi:cx="200"
+     sodipodi:cy="200"
+     sodipodi:rx="75"
+     sodipodi:ry="75"
+     transform="translate(-26.104372,21.909027)"
+     style="fill:#ffff00;fill-opacity:0.5;stroke:#000000" />
+  <polygon
+     fill="green"
+     stroke="black"
+     fill-opacity="0.5"
+     stroke-width="1"
+     points="200,225 350,225 275,350"
+     id="polygon8276" />
+  <path
+     style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50196081"
+     d="M 303.7037,50.705207 C 173.88522,56.588264 90.320951,92.710345 162.85059,120.82533 C 211.91719,139.84524 196.63811,214.12391 233.86243,192.59259 C 284.31755,163.4083 299.34345,193.75691 311.11111,187.30159 C 347.88407,167.12924 269.34382,134.85785 303.81608,114.5167 C 394.71183,60.881583 332.47907,46.043712 303.7037,50.705207 z "
+     id="path8289"
+     sodipodi:nodetypes="cssssc" />
+</svg>
diff --git a/demos/embedded/embeddedsvgviewer/files/v-slider-handle.svg b/demos/embedded/embeddedsvgviewer/files/v-slider-handle.svg
new file mode 100644
index 0000000000..4ee87f8438
--- /dev/null
+++ b/demos/embedded/embeddedsvgviewer/files/v-slider-handle.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="50"
+   height="25"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tcooksey/Projects/qt-4.4/demos/embedded/embeddedsvgviewer/files"
+   sodipodi:docname="v-slider-handle.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2158">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2160" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop2162" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2158"
+       id="linearGradient2164"
+       x1="26.10779"
+       y1="9.1025448"
+       x2="26.10779"
+       y2="-0.01334004"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9876687,0,0,2.5969342,0.3086332,-0.476397)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="12.256878"
+     inkscape:cx="42.920885"
+     inkscape:cy="4.2252457"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="50px"
+     height="25px"
+     inkscape:window-width="1282"
+     inkscape:window-height="879"
+     inkscape:window-x="137"
+     inkscape:window-y="30" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:url(#linearGradient2164);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.60153389px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 10.191803,24.254577 C 26.804559,24.254577 25.309299,24.303278 39.985656,24.303278 C 52.503796,24.303278 51.963217,0.91536797 40.722957,0.91536797 C 13.837108,0.91536797 16.298612,0.86901372 10.385089,0.86901372 C -2.0345215,0.86901372 -2.5249912,24.254577 10.191803,24.254577 z "
+       id="path2162"
+       sodipodi:nodetypes="csssc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#868686;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="path2166"
+       sodipodi:cx="9.4232807"
+       sodipodi:cy="13.169908"
+       sodipodi:rx="2.2436383"
+       sodipodi:ry="1.9580842"
+       d="M 9.4232808,15.127992 A 2.2436383,1.9580842 0 1 1 9.4232808,11.211823 L 9.4232807,13.169908 z"
+       sodipodi:start="1.5707963"
+       sodipodi:end="4.712389"
+       transform="matrix(4.3804554,0,0,2.228386,-25.247974,-16.463284)" />
+  </g>
+</svg>
diff --git a/demos/embedded/embeddedsvgviewer/main.cpp b/demos/embedded/embeddedsvgviewer/main.cpp
new file mode 100644
index 0000000000..80f92d698c
--- /dev/null
+++ b/demos/embedded/embeddedsvgviewer/main.cpp
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QDebug>
+
+#include "embeddedsvgviewer.h"
+
+int main(int argc, char** argv)
+{
+    QApplication app(argc, argv);
+    Q_INIT_RESOURCE(embeddedsvgviewer);
+
+    QString filePath;
+
+    if (argc == 1)
+      filePath = QLatin1String(":/files/default.svg");
+    else if (argc == 2)
+      filePath = argv[1];
+    else {
+        qDebug() << QLatin1String("Please specify an svg file!");
+        return -1;
+    }
+
+    EmbeddedSvgViewer viewer(filePath);
+
+    viewer.showFullScreen();
+
+    return app.exec();
+} 
diff --git a/demos/embedded/embeddedsvgviewer/shapes.svg b/demos/embedded/embeddedsvgviewer/shapes.svg
new file mode 100644
index 0000000000..c28a71108b
--- /dev/null
+++ b/demos/embedded/embeddedsvgviewer/shapes.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="400px"
+   height="400px"
+   baseProfile="tiny"
+   id="svg8268"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docname="simple2.svg"
+   sodipodi:docbase="/nfs/OpenMoko/SVGs"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata8283">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8281" />
+  <sodipodi:namedview
+     inkscape:window-height="917"
+     inkscape:window-width="1324"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="2.1452345"
+     inkscape:cx="185.25"
+     inkscape:cy="214.75"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:current-layer="svg8268" />
+  <g
+     stroke="DarkBlue"
+     stroke-width="10"
+     id="g8270">
+    <rect
+       fill="blue"
+       fill-opacity="0.5"
+       x="25"
+       y="25"
+       width="175"
+       height="175"
+       id="rect8272" />
+  </g>
+  <circle
+     cx="200"
+     cy="200"
+     r="75"
+     id="circle8274"
+     sodipodi:cx="200"
+     sodipodi:cy="200"
+     sodipodi:rx="75"
+     sodipodi:ry="75"
+     transform="translate(-26.104372,21.909027)"
+     style="fill:#ffff00;fill-opacity:0.5;stroke:#000000" />
+  <polygon
+     fill="green"
+     stroke="black"
+     fill-opacity="0.5"
+     stroke-width="1"
+     points="200,225 350,225 275,350"
+     id="polygon8276" />
+  <path
+     style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50196081"
+     d="M 303.7037,50.705207 C 173.88522,56.588264 90.320951,92.710345 162.85059,120.82533 C 211.91719,139.84524 196.63811,214.12391 233.86243,192.59259 C 284.31755,163.4083 299.34345,193.75691 311.11111,187.30159 C 347.88407,167.12924 269.34382,134.85785 303.81608,114.5167 C 394.71183,60.881583 332.47907,46.043712 303.7037,50.705207 z "
+     id="path8289"
+     sodipodi:nodetypes="cssssc" />
+</svg>
diff --git a/demos/embedded/embeddedsvgviewer/spheres.svg b/demos/embedded/embeddedsvgviewer/spheres.svg
new file mode 100644
index 0000000000..e10877741b
--- /dev/null
+++ b/demos/embedded/embeddedsvgviewer/spheres.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" standalone="no"?>
+<svg width="8cm" height="8cm" viewBox="0 0 400 400"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink/"
+    baseProfile="tiny" version="1.2">
+  <title>Spheres</title>
+  <desc>Gradient filled spheres with different colors.</desc>
+    <defs>
+      <!-- Create radial gradients for each circle to make them look like
+           spheres. -->
+      <radialGradient id="blueSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="blue" />
+        <stop offset="100%" stop-color="#222244" />
+      </radialGradient>
+      <radialGradient id="redSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="red" />
+        <stop offset="100%" stop-color="#442222" />
+      </radialGradient>
+      <radialGradient id="greenSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="green" />
+        <stop offset="100%" stop-color="#113311" />
+      </radialGradient>
+      <radialGradient id="yellowSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="yellow" />
+        <stop offset="100%" stop-color="#444422" />
+      </radialGradient>
+      <radialGradient id="shadowGrad" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="50">
+        <stop offset="0%" stop-color="black" stop-opacity="1.0" />
+        <stop offset="100%" stop-color="white" stop-opacity="0.0" />
+      </radialGradient>
+
+      <!-- Define a shadow for each sphere. -->
+      <circle id="shadow" fill="url(#shadowGrad)" cx="0" cy="0" r="100" />
+    </defs>
+  <g fill="#ffee99" stroke="none" >
+    <rect x="0" y="0" width="400" height="400" />
+  </g>
+  <g fill="white" stroke="none" >
+    <rect x="0" y="175" width="400" height="225" />
+  </g>
+  <g transform="translate(200,290) scale(2.0,1.0) rotate(45)" >
+    <rect fill="#a6ce39" x="-69" y="-69" width="138" height="138" />
+    <circle fill="black" cx="0" cy="0" r="50" />
+    <circle fill="#a6ce39" cx="0" cy="0" r="33" />
+    <path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10
+                          L -11,22 L -1,12 Z" />
+    <animateTransform attributeName="transform"  type="rotate" values="0; 360"
+	       begin="0s" dur="10s" fill="freeze" />
+  </g>
+  <g transform="translate(200,175)">
+    <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+    <circle fill="url(#blueSphere)" cx="0" cy="0" r="100" />
+  </g>
+  <g transform="translate(315,240)">
+    <g transform="scale(0.5,0.5)">
+      <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+      <circle fill="url(#redSphere)" cx="0" cy="0" r="100" />
+    </g>
+  </g>
+  <g transform="translate(80,275)">
+    <g transform="scale(0.65,0.65)">
+      <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+      <circle fill="url(#greenSphere)" cx="0" cy="0" r="100" />
+    </g>
+  </g>
+  <g transform="translate(255,325)">
+    <g transform="scale(0.3,0.3)">
+      <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+      <circle fill="url(#yellowSphere)" cx="0" cy="0" r="100" />
+    </g>
+  </g>
+</svg>
diff --git a/demos/embedded/fluidlauncher/config.xml b/demos/embedded/fluidlauncher/config.xml
new file mode 100644
index 0000000000..6cb4be762d
--- /dev/null
+++ b/demos/embedded/fluidlauncher/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<demolauncher>
+  <demos>
+    <example filename="../embeddedsvgviewer/embeddedsvgviewer" name="SVG Viewer" image="screenshots/embeddedsvgviewer.png" args="../embeddedsvgviewer/shapes.svg"/>
+    <example filename="../styledemo/styledemo" name="Stylesheets" image="screenshots/styledemo.png"/>
+    <example filename="../../deform/deform" name="Vector Deformation" image="screenshots/deform.png" args="-small-screen"/>
+    <example filename="../../pathstroke/pathstroke" name="Path Stroking" image="screenshots/pathstroke.png" args="-small-screen"/>
+    <example filename="../../../examples/widgets/wiggly/wiggly" name="Wiggly Text" image="screenshots/wiggly.png"/>
+    <example filename="../../../examples/painting/concentriccircles/concentriccircles" name="Concentric Circles" image="screenshots/concentriccircles.png"/>
+<!--
+    <example filename="../../../examples/graphicsview/elasticnodes/elasticnodes" name="Elastic Nodes" image="screenshots/elasticnodes.png" args="-maximize"/>
+    <example filename="../../../examples/assistant/simpletextviewer/simpletextviewer" name="Simple Text Viewer" image="../../../doc/html/images/simpletextviewer-mainwindow.png"/>
+    <example filename="../../../examples/dialogs/trivialwizard/trivialwizard" name="Trivial Wizard" image="../../../doc/html/images/trivialwizard-example-conclusion.png"/>
+    <example filename="../../../examples/draganddrop/draggableicons/draggableicons" name="Draggable Icons" image="../../../doc/html/images/draggableicons-example.png"/>
+    <example filename="../../../examples/draganddrop/draggabletext/draggabletext" name="Draggable Text" image="../../../doc/html/images/draggabletext-example.png"/>
+    <example filename="../../../examples/draganddrop/fridgemagnets/fridgemagnets" name="Fridge Magnets" image="../../../doc/html/images/fridgemagnets-example.png"/>
+    <example filename="../../../examples/graphicsview/collidingmice/collidingmice" name="Colliding Mice" image="../../../doc/html/images/collidingmice-example.png"/>
+    <example filename="../../../examples/graphicsview/padnavigator/padnavigator" name="Pad Navigator" image="../../../doc/html/images/padnavigator-example.png"/>
+    <example filename="../../../examples/itemviews/coloreditorfactory/coloreditorfactory" name="Color Editor" image="../../../doc/html/images/coloreditorfactoryimage.png"/>
+-->    
+    
+  </demos>
+  <slideshow timeout="60000" interval="10000">
+    <imagedir dir="slides"/>
+  </slideshow>
+</demolauncher>
diff --git a/demos/embedded/fluidlauncher/config_wince/config.xml b/demos/embedded/fluidlauncher/config_wince/config.xml
new file mode 100644
index 0000000000..3b57770855
--- /dev/null
+++ b/demos/embedded/fluidlauncher/config_wince/config.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<demolauncher>
+  <demos>
+    <example filename="embeddedsvgviewer" name="SVG Viewer" image="screenshots/embeddedsvgviewer.png" args="shapes.svg"/>
+    <example filename="styledemo" name="Stylesheets" image="screenshots/styledemo.png"/>
+    <example filename="deform" name="Vector Deformation" image="screenshots/deform.png" args="-small-screen"/>
+    <example filename="pathstroke" name="Path Stroking" image="screenshots/pathstroke.png" args="-small-screen"/>
+    <example filename="wiggly" name="Wiggly Text" image="screenshots/wiggly.png"/>
+  </demos>
+  <slideshow timeout="60000" interval="10000">
+    <imagedir dir="slides"/>
+  </slideshow>
+</demolauncher>
diff --git a/demos/embedded/fluidlauncher/demoapplication.cpp b/demos/embedded/fluidlauncher/demoapplication.cpp
new file mode 100644
index 0000000000..c5abfb96e7
--- /dev/null
+++ b/demos/embedded/fluidlauncher/demoapplication.cpp
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QDebug>
+#include <QDir>
+ 
+#include "demoapplication.h"
+
+
+
+DemoApplication::DemoApplication(QString executableName, QString caption, QString imageName, QStringList args)
+{
+    imagePath = imageName;
+    appCaption = caption;
+
+    if (executableName[0] == QLatin1Char('/'))
+        executablePath = executableName;
+    else
+        executablePath = QDir::cleanPath(QDir::currentPath() + QLatin1Char('/') + executableName);
+  
+    arguments = args;
+
+    process.setProcessChannelMode(QProcess::ForwardedChannels);
+
+    QObject::connect( &process, SIGNAL(finished(int, QProcess::ExitStatus)), 
+                      this, SLOT(processFinished(int, QProcess::ExitStatus)));
+
+    QObject::connect( &process, SIGNAL(error(QProcess::ProcessError)), 
+                      this, SLOT(processError(QProcess::ProcessError)));
+
+    QObject::connect( &process, SIGNAL(started()), this, SLOT(processStarted()));
+}
+
+
+void DemoApplication::launch()
+{
+    process.start(executablePath, arguments);
+}
+
+QImage* DemoApplication::getImage()
+{
+    return new QImage(imagePath);
+}
+
+QString DemoApplication::getCaption()
+{
+    return appCaption;
+}
+
+void DemoApplication::processFinished(int exitCode, QProcess::ExitStatus exitStatus)
+{
+    Q_UNUSED(exitCode);
+    Q_UNUSED(exitStatus);
+
+    emit demoFinished();
+
+    QObject::disconnect(this, SIGNAL(demoStarted()), 0, 0);
+    QObject::disconnect(this, SIGNAL(demoFinished()), 0, 0);
+}
+
+void DemoApplication::processError(QProcess::ProcessError err)
+{
+    qDebug() << "Process error: " << err;
+    if (err == QProcess::Crashed)
+        emit demoFinished();
+}
+
+
+void DemoApplication::processStarted()
+{
+    emit demoStarted();
+}
+
+
+
+
+
+
diff --git a/demos/embedded/fluidlauncher/demoapplication.h b/demos/embedded/fluidlauncher/demoapplication.h
new file mode 100644
index 0000000000..84ce1d4162
--- /dev/null
+++ b/demos/embedded/fluidlauncher/demoapplication.h
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DEMO_APPLICATION_H 
+#define DEMO_APPLICATION_H
+
+#include <QPixmap>
+#include <QImage>
+#include <QProcess>
+#include <QObject>
+
+class DemoApplication : public QObject
+{
+  Q_OBJECT
+
+public:
+    DemoApplication(QString executableName, QString caption, QString imageName, QStringList args);
+    void launch();
+    QImage* getImage();
+    QString getCaption();
+
+public slots:
+    void processStarted();
+    void processFinished(int exitCode, QProcess::ExitStatus exitStatus);
+    void processError(QProcess::ProcessError err);
+
+signals:
+    void demoStarted();
+    void demoFinished();
+
+private:
+    QString imagePath;
+    QString appCaption;
+    QString executablePath;
+    QStringList arguments;
+    QProcess process;
+};
+
+
+
+
+#endif
+
+
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.cpp b/demos/embedded/fluidlauncher/fluidlauncher.cpp
new file mode 100644
index 0000000000..f80e6ca133
--- /dev/null
+++ b/demos/embedded/fluidlauncher/fluidlauncher.cpp
@@ -0,0 +1,221 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtXml>
+
+#include "fluidlauncher.h"
+
+
+#define DEFAULT_INPUT_TIMEOUT 10000
+
+FluidLauncher::FluidLauncher(QStringList* args)
+{
+    pictureFlowWidget = new PictureFlow();
+    slideShowWidget = new SlideShow();
+    inputTimer = new QTimer();
+
+    QRect screen_size = QApplication::desktop()->screenGeometry();
+
+    QObject::connect(pictureFlowWidget, SIGNAL(itemActivated(int)), this, SLOT(launchApplication(int)));
+    QObject::connect(pictureFlowWidget, SIGNAL(inputReceived()),    this, SLOT(resetInputTimeout()));
+    QObject::connect(slideShowWidget,   SIGNAL(inputReceived()),    this, SLOT(switchToLauncher()));
+    QObject::connect(inputTimer,        SIGNAL(timeout()),          this, SLOT(inputTimedout()));
+
+    inputTimer->setSingleShot(true);
+    inputTimer->setInterval(DEFAULT_INPUT_TIMEOUT);
+
+    pictureFlowWidget->setSlideSize(QSize( (screen_size.width()*2)/5, (screen_size.height()*2)/5 ));
+
+    bool success;
+    int configIndex = args->indexOf("-config");
+    if ( (configIndex != -1) && (configIndex != args->count()-1) )
+        success = loadConfig(args->at(configIndex+1));
+    else
+        success = loadConfig("config.xml");
+
+    if (success) {
+      populatePictureFlow();
+
+      pictureFlowWidget->showFullScreen();
+      inputTimer->start();
+    } else {
+        pictureFlowWidget->setAttribute(Qt::WA_DeleteOnClose, true);
+        pictureFlowWidget->close();
+    }
+
+}
+
+FluidLauncher::~FluidLauncher()
+{
+    delete pictureFlowWidget;
+    delete slideShowWidget;
+}
+
+bool FluidLauncher::loadConfig(QString configPath)
+{
+    QFile xmlFile(configPath);
+
+    if (!xmlFile.exists() || (xmlFile.error() != QFile::NoError)) {
+        qDebug() << "ERROR: Unable to open config file " << configPath;
+        return false;
+    }
+
+    slideShowWidget->clearImages();
+
+    QDomDocument xmlDoc;
+    xmlDoc.setContent(&xmlFile, true);
+
+    QDomElement rootElement = xmlDoc.documentElement();
+
+    // Process the demos node:
+    QDomNodeList demoNodes = rootElement.firstChildElement("demos").elementsByTagName("example");
+    for (int i=0; i<demoNodes.size(); i++) {
+        QDomElement element = demoNodes.item(i).toElement();
+
+        if (element.hasAttribute("filename")) {
+            DemoApplication* newDemo = new DemoApplication( 
+                                                     element.attribute("filename"), 
+                                                     element.attribute("name", "Unamed Demo"),
+                                                     element.attribute("image"),
+                                                     element.attribute("args").split(" "));
+            demoList.append(newDemo);
+        }
+    }
+
+
+    // Process the slideshow node:
+    QDomElement slideshowElement = rootElement.firstChildElement("slideshow");
+
+    if (slideshowElement.hasAttribute("timeout")) {
+          bool valid;
+          int timeout = slideshowElement.attribute("timeout").toInt(&valid);
+          if (valid)
+            inputTimer->setInterval(timeout);
+    }
+
+    if (slideshowElement.hasAttribute("interval")) {
+          bool valid;
+          int interval = slideshowElement.attribute("interval").toInt(&valid);
+          if (valid)
+            slideShowWidget->setSlideInterval(interval);
+    }
+
+    for (QDomNode node=slideshowElement.firstChild(); !node.isNull(); node=node.nextSibling()) {
+        QDomElement element = node.toElement();
+
+        if (element.tagName() == "imagedir")
+            slideShowWidget->addImageDir(element.attribute("dir"));
+        else if (element.tagName() == "image")
+            slideShowWidget->addImage(element.attribute("image"));
+    }
+
+    // Append an exit Item
+    DemoApplication* exitItem = new DemoApplication(QString(), QLatin1String("Exit Embedded Demo"), QString(), QStringList());
+    demoList.append(exitItem);
+
+    return true;
+}
+
+
+void FluidLauncher::populatePictureFlow()
+{
+    pictureFlowWidget->setSlideCount(demoList.count());
+
+    for (int i=demoList.count()-1; i>=0; --i) {
+        pictureFlowWidget->setSlide(i, *(demoList[i]->getImage()));
+        pictureFlowWidget->setSlideCaption(i, demoList[i]->getCaption());
+    }
+
+    pictureFlowWidget->setCurrentSlide(demoList.count()/2);
+}
+
+
+void FluidLauncher::launchApplication(int index)
+{
+    // NOTE: Clearing the caches will free up more memory for the demo but will cause
+    // a delay upon returning, as items are reloaded.
+    //pictureFlowWidget->clearCaches();
+
+    if (index == demoList.size() -1) {
+        qApp->quit();
+        return;
+    }
+
+    inputTimer->stop();
+    pictureFlowWidget->hide();
+
+    QObject::connect(demoList[index], SIGNAL(demoFinished()), this, SLOT(demoFinished()));
+
+    demoList[index]->launch();
+}
+
+
+void FluidLauncher::switchToLauncher()
+{
+    slideShowWidget->stopShow();
+    inputTimer->start();
+}
+
+
+void FluidLauncher::resetInputTimeout()
+{
+    if (inputTimer->isActive())
+        inputTimer->start();
+}
+
+void FluidLauncher::inputTimedout()
+{
+    switchToSlideshow();
+}
+
+
+void FluidLauncher::switchToSlideshow()
+{
+    inputTimer->stop();
+    slideShowWidget->startShow();
+}
+
+void FluidLauncher::demoFinished()
+{
+    pictureFlowWidget->showFullScreen();
+    inputTimer->start();
+}
+
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.h b/demos/embedded/fluidlauncher/fluidlauncher.h
new file mode 100644
index 0000000000..3f4c1fe332
--- /dev/null
+++ b/demos/embedded/fluidlauncher/fluidlauncher.h
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef FLUID_LAUNCHER_H
+#define FLUID_LAUNCHER_H
+
+#include <QtGui>
+#include <QTimer>
+
+#include "pictureflow.h"
+#include "slideshow.h"
+#include "demoapplication.h"
+
+class FluidLauncher : public QObject
+{
+    Q_OBJECT
+
+public:
+    FluidLauncher(QStringList* args);
+    ~FluidLauncher();
+
+public slots:
+    void launchApplication(int index);
+    void switchToLauncher();
+    void resetInputTimeout();
+    void inputTimedout();
+    void demoFinished();
+
+private:
+    PictureFlow* pictureFlowWidget;
+    SlideShow* slideShowWidget;
+    QTimer* inputTimer;
+    QList<DemoApplication*> demoList;
+
+    bool loadConfig(QString configPath);
+    void populatePictureFlow();
+    void switchToSlideshow();
+
+
+};
+
+
+#endif
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro
new file mode 100644
index 0000000000..76d12adf84
--- /dev/null
+++ b/demos/embedded/fluidlauncher/fluidlauncher.pro
@@ -0,0 +1,56 @@
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+QT += xml
+
+# Input
+HEADERS += \
+           demoapplication.h \
+           fluidlauncher.h \
+           pictureflow.h \
+           slideshow.h
+
+SOURCES += \
+           demoapplication.cpp \
+           fluidlauncher.cpp \
+           main.cpp \
+           pictureflow.cpp \
+           slideshow.cpp
+
+embedded{
+    target.path = $$[QT_INSTALL_DEMOS]/embedded/fluidlauncher
+    sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html config.xml screenshots slides
+    sources.path = $$[QT_INSTALL_DEMOS]/embedded/fluidlauncher
+    INSTALLS += target sources
+}
+
+wince*{
+    QT += svg
+
+    BUILD_DIR = release
+    if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
+        BUILD_DIR = debug
+    }
+
+    executables.sources = \
+        $$QT_BUILD_TREE/demos/embedded/embeddedsvgviewer/$${BUILD_DIR}/embeddedsvgviewer.exe \
+        $$QT_BUILD_TREE/demos/embedded/styledemo/$${BUILD_DIR}/styledemo.exe \
+        $$QT_BUILD_TREE/demos/deform/$${BUILD_DIR}/deform.exe \
+        $$QT_BUILD_TREE/demos/pathstroke/$${BUILD_DIR}/pathstroke.exe \
+        $$QT_BUILD_TREE/examples/graphicsview/elasticnodes/$${BUILD_DIR}/elasticnodes.exe \
+        $$QT_BUILD_TREE/examples/widgets/wiggly/$${BUILD_DIR}/wiggly.exe \
+        $$QT_BUILD_TREE/examples/painting/concentriccircles/$${BUILD_DIR}/concentriccircles.exe
+
+    executables.path = .
+
+    files.sources = $$PWD/screenshots $$PWD/slides $$PWD/../embeddedsvgviewer/shapes.svg
+    files.path = .
+
+    config.sources = $$PWD/config_wince/config.xml
+    config.path = .
+
+    DEPLOYMENT += config files executables
+
+    DEPLOYMENT_PLUGIN += qgif qjpeg qmng qsvg
+}
diff --git a/demos/embedded/fluidlauncher/main.cpp b/demos/embedded/fluidlauncher/main.cpp
new file mode 100644
index 0000000000..05e820e0fb
--- /dev/null
+++ b/demos/embedded/fluidlauncher/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QStringList>
+
+#include "fluidlauncher.h"
+
+
+int main(int argc, char** argv)
+{
+    QStringList originalArgs;
+
+    for (int i=0; i<argc; i++)
+      originalArgs << argv[i];
+
+    QApplication app(argc, argv);
+    FluidLauncher launcher(&originalArgs);
+
+
+    return app.exec();
+} 
diff --git a/demos/embedded/fluidlauncher/pictureflow.cpp b/demos/embedded/fluidlauncher/pictureflow.cpp
new file mode 100644
index 0000000000..04bbf050a5
--- /dev/null
+++ b/demos/embedded/fluidlauncher/pictureflow.cpp
@@ -0,0 +1,1420 @@
+/****************************************************************************
+**
+* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
+* This is version of the Pictureflow animated image show widget modified by Nokia.
+*
+*  $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 either Technology Preview License Agreement or the
+*  Beta Release License Agreement.
+* 
+*  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.0, included in the file LGPL_EXCEPTION.txt in this
+*  package.
+* 
+*  GNU General Public License Usage
+*  Alternatively, this file may be used under the terms of the GNU
+*  General Public License version 3.0 as published by the Free Software
+*  Foundation and appearing in the file LICENSE.GPL included in the
+*  packaging of this file.  Please review the following information to
+*  ensure the GNU General Public License version 3.0 requirements will be
+*  met: http://www.gnu.org/copyleft/gpl.html.
+* 
+*  If you are unsure which license is appropriate for your use, please
+*  contact the sales department at qt-sales@nokia.com.
+*  $QT_END_LICENSE$
+*
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the <organization> nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY TROLLTECH ASA ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+****************************************************************************/
+
+/* 
+  ORIGINAL COPYRIGHT HEADER
+  PictureFlow - animated image show widget
+  http://pictureflow.googlecode.com
+
+  Copyright (C) 2007 Ariya Hidayat (ariya@kde.org)
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+
+#include "pictureflow.h"
+
+#include <QBasicTimer>
+#include <QCache>
+#include <QImage>
+#include <QKeyEvent>
+#include <QPainter>
+#include <QPixmap>
+#include <QTimer>
+#include <QVector>
+#include <QWidget>
+#include <QTime>
+
+#ifdef Q_WS_QWS
+#include <QScreen>
+#endif
+
+#include <QDebug>
+
+// uncomment this to enable bilinear filtering for texture mapping
+// gives much better rendering, at the cost of memory space
+// #define PICTUREFLOW_BILINEAR_FILTER
+
+// for fixed-point arithmetic, we need minimum 32-bit long
+// long long (64-bit) might be useful for multiplication and division
+typedef long PFreal;
+
+typedef unsigned short QRgb565;
+
+#define RGB565_RED_MASK 0xF800
+#define RGB565_GREEN_MASK 0x07E0
+#define RGB565_BLUE_MASK 0x001F
+
+#define RGB565_RED(col) ((col&RGB565_RED_MASK)>>11)
+#define RGB565_GREEN(col) ((col&RGB565_GREEN_MASK)>>5)
+#define RGB565_BLUE(col) (col&RGB565_BLUE_MASK)
+
+#define PFREAL_SHIFT 10
+#define PFREAL_FACTOR (1 << PFREAL_SHIFT)
+#define PFREAL_ONE (1 << PFREAL_SHIFT)
+#define PFREAL_HALF (PFREAL_ONE >> 1)
+
+inline PFreal fmul(PFreal a, PFreal b)
+{
+  return ((long long)(a))*((long long)(b)) >> PFREAL_SHIFT;
+}
+
+inline PFreal fdiv(PFreal num, PFreal den)
+{
+  long long p = (long long)(num) << (PFREAL_SHIFT*2);
+  long long q = p / (long long)den;
+  long long r = q >> PFREAL_SHIFT;
+
+  return r;
+}
+
+inline float fixedToFloat(PFreal val)
+{
+  return ((float)val) / (float)PFREAL_ONE;
+}
+
+inline PFreal floatToFixed(float val)
+{
+  return (PFreal)(val*PFREAL_ONE);
+}
+
+#define IANGLE_MAX 1024
+#define IANGLE_MASK 1023
+
+// warning: regenerate the table if IANGLE_MAX and PFREAL_SHIFT are changed!
+static const PFreal sinTable[IANGLE_MAX] = {
+     3,      9,     15,     21,     28,     34,     40,     47, 
+    53,     59,     65,     72,     78,     84,     90,     97, 
+   103,    109,    115,    122,    128,    134,    140,    147, 
+   153,    159,    165,    171,    178,    184,    190,    196, 
+   202,    209,    215,    221,    227,    233,    239,    245, 
+   251,    257,    264,    270,    276,    282,    288,    294, 
+   300,    306,    312,    318,    324,    330,    336,    342, 
+   347,    353,    359,    365,    371,    377,    383,    388, 
+   394,    400,    406,    412,    417,    423,    429,    434, 
+   440,    446,    451,    457,    463,    468,    474,    479, 
+   485,    491,    496,    501,    507,    512,    518,    523, 
+   529,    534,    539,    545,    550,    555,    561,    566, 
+   571,    576,    581,    587,    592,    597,    602,    607, 
+   612,    617,    622,    627,    632,    637,    642,    647, 
+   652,    656,    661,    666,    671,    675,    680,    685, 
+   690,    694,    699,    703,    708,    712,    717,    721, 
+   726,    730,    735,    739,    743,    748,    752,    756, 
+   760,    765,    769,    773,    777,    781,    785,    789, 
+   793,    797,    801,    805,    809,    813,    816,    820, 
+   824,    828,    831,    835,    839,    842,    846,    849, 
+   853,    856,    860,    863,    866,    870,    873,    876, 
+   879,    883,    886,    889,    892,    895,    898,    901, 
+   904,    907,    910,    913,    916,    918,    921,    924, 
+   927,    929,    932,    934,    937,    939,    942,    944, 
+   947,    949,    951,    954,    956,    958,    960,    963, 
+   965,    967,    969,    971,    973,    975,    977,    978, 
+   980,    982,    984,    986,    987,    989,    990,    992, 
+   994,    995,    997,    998,    999,   1001,   1002,   1003, 
+  1004,   1006,   1007,   1008,   1009,   1010,   1011,   1012, 
+  1013,   1014,   1015,   1015,   1016,   1017,   1018,   1018, 
+  1019,   1019,   1020,   1020,   1021,   1021,   1022,   1022, 
+  1022,   1023,   1023,   1023,   1023,   1023,   1023,   1023, 
+  1023,   1023,   1023,   1023,   1023,   1023,   1023,   1022, 
+  1022,   1022,   1021,   1021,   1020,   1020,   1019,   1019, 
+  1018,   1018,   1017,   1016,   1015,   1015,   1014,   1013, 
+  1012,   1011,   1010,   1009,   1008,   1007,   1006,   1004, 
+  1003,   1002,   1001,    999,    998,    997,    995,    994, 
+   992,    990,    989,    987,    986,    984,    982,    980, 
+   978,    977,    975,    973,    971,    969,    967,    965, 
+   963,    960,    958,    956,    954,    951,    949,    947, 
+   944,    942,    939,    937,    934,    932,    929,    927, 
+   924,    921,    918,    916,    913,    910,    907,    904, 
+   901,    898,    895,    892,    889,    886,    883,    879, 
+   876,    873,    870,    866,    863,    860,    856,    853, 
+   849,    846,    842,    839,    835,    831,    828,    824, 
+   820,    816,    813,    809,    805,    801,    797,    793, 
+   789,    785,    781,    777,    773,    769,    765,    760, 
+   756,    752,    748,    743,    739,    735,    730,    726, 
+   721,    717,    712,    708,    703,    699,    694,    690, 
+   685,    680,    675,    671,    666,    661,    656,    652, 
+   647,    642,    637,    632,    627,    622,    617,    612, 
+   607,    602,    597,    592,    587,    581,    576,    571, 
+   566,    561,    555,    550,    545,    539,    534,    529, 
+   523,    518,    512,    507,    501,    496,    491,    485, 
+   479,    474,    468,    463,    457,    451,    446,    440, 
+   434,    429,    423,    417,    412,    406,    400,    394, 
+   388,    383,    377,    371,    365,    359,    353,    347, 
+   342,    336,    330,    324,    318,    312,    306,    300, 
+   294,    288,    282,    276,    270,    264,    257,    251, 
+   245,    239,    233,    227,    221,    215,    209,    202, 
+   196,    190,    184,    178,    171,    165,    159,    153, 
+   147,    140,    134,    128,    122,    115,    109,    103, 
+    97,     90,     84,     78,     72,     65,     59,     53, 
+    47,     40,     34,     28,     21,     15,      9,      3, 
+    -4,    -10,    -16,    -22,    -29,    -35,    -41,    -48, 
+   -54,    -60,    -66,    -73,    -79,    -85,    -91,    -98, 
+  -104,   -110,   -116,   -123,   -129,   -135,   -141,   -148, 
+  -154,   -160,   -166,   -172,   -179,   -185,   -191,   -197, 
+  -203,   -210,   -216,   -222,   -228,   -234,   -240,   -246, 
+  -252,   -258,   -265,   -271,   -277,   -283,   -289,   -295, 
+  -301,   -307,   -313,   -319,   -325,   -331,   -337,   -343, 
+  -348,   -354,   -360,   -366,   -372,   -378,   -384,   -389, 
+  -395,   -401,   -407,   -413,   -418,   -424,   -430,   -435, 
+  -441,   -447,   -452,   -458,   -464,   -469,   -475,   -480, 
+  -486,   -492,   -497,   -502,   -508,   -513,   -519,   -524, 
+  -530,   -535,   -540,   -546,   -551,   -556,   -562,   -567, 
+  -572,   -577,   -582,   -588,   -593,   -598,   -603,   -608, 
+  -613,   -618,   -623,   -628,   -633,   -638,   -643,   -648, 
+  -653,   -657,   -662,   -667,   -672,   -676,   -681,   -686, 
+  -691,   -695,   -700,   -704,   -709,   -713,   -718,   -722, 
+  -727,   -731,   -736,   -740,   -744,   -749,   -753,   -757, 
+  -761,   -766,   -770,   -774,   -778,   -782,   -786,   -790, 
+  -794,   -798,   -802,   -806,   -810,   -814,   -817,   -821, 
+  -825,   -829,   -832,   -836,   -840,   -843,   -847,   -850, 
+  -854,   -857,   -861,   -864,   -867,   -871,   -874,   -877, 
+  -880,   -884,   -887,   -890,   -893,   -896,   -899,   -902, 
+  -905,   -908,   -911,   -914,   -917,   -919,   -922,   -925, 
+  -928,   -930,   -933,   -935,   -938,   -940,   -943,   -945, 
+  -948,   -950,   -952,   -955,   -957,   -959,   -961,   -964, 
+  -966,   -968,   -970,   -972,   -974,   -976,   -978,   -979, 
+  -981,   -983,   -985,   -987,   -988,   -990,   -991,   -993, 
+  -995,   -996,   -998,   -999,  -1000,  -1002,  -1003,  -1004, 
+ -1005,  -1007,  -1008,  -1009,  -1010,  -1011,  -1012,  -1013, 
+ -1014,  -1015,  -1016,  -1016,  -1017,  -1018,  -1019,  -1019, 
+ -1020,  -1020,  -1021,  -1021,  -1022,  -1022,  -1023,  -1023, 
+ -1023,  -1024,  -1024,  -1024,  -1024,  -1024,  -1024,  -1024, 
+ -1024,  -1024,  -1024,  -1024,  -1024,  -1024,  -1024,  -1023, 
+ -1023,  -1023,  -1022,  -1022,  -1021,  -1021,  -1020,  -1020, 
+ -1019,  -1019,  -1018,  -1017,  -1016,  -1016,  -1015,  -1014, 
+ -1013,  -1012,  -1011,  -1010,  -1009,  -1008,  -1007,  -1005, 
+ -1004,  -1003,  -1002,  -1000,   -999,   -998,   -996,   -995, 
+  -993,   -991,   -990,   -988,   -987,   -985,   -983,   -981, 
+  -979,   -978,   -976,   -974,   -972,   -970,   -968,   -966, 
+  -964,   -961,   -959,   -957,   -955,   -952,   -950,   -948, 
+  -945,   -943,   -940,   -938,   -935,   -933,   -930,   -928, 
+  -925,   -922,   -919,   -917,   -914,   -911,   -908,   -905, 
+  -902,   -899,   -896,   -893,   -890,   -887,   -884,   -880, 
+  -877,   -874,   -871,   -867,   -864,   -861,   -857,   -854, 
+  -850,   -847,   -843,   -840,   -836,   -832,   -829,   -825, 
+  -821,   -817,   -814,   -810,   -806,   -802,   -798,   -794, 
+  -790,   -786,   -782,   -778,   -774,   -770,   -766,   -761, 
+  -757,   -753,   -749,   -744,   -740,   -736,   -731,   -727, 
+  -722,   -718,   -713,   -709,   -704,   -700,   -695,   -691, 
+  -686,   -681,   -676,   -672,   -667,   -662,   -657,   -653, 
+  -648,   -643,   -638,   -633,   -628,   -623,   -618,   -613, 
+  -608,   -603,   -598,   -593,   -588,   -582,   -577,   -572, 
+  -567,   -562,   -556,   -551,   -546,   -540,   -535,   -530, 
+  -524,   -519,   -513,   -508,   -502,   -497,   -492,   -486, 
+  -480,   -475,   -469,   -464,   -458,   -452,   -447,   -441, 
+  -435,   -430,   -424,   -418,   -413,   -407,   -401,   -395, 
+  -389,   -384,   -378,   -372,   -366,   -360,   -354,   -348, 
+  -343,   -337,   -331,   -325,   -319,   -313,   -307,   -301, 
+  -295,   -289,   -283,   -277,   -271,   -265,   -258,   -252, 
+  -246,   -240,   -234,   -228,   -222,   -216,   -210,   -203, 
+  -197,   -191,   -185,   -179,   -172,   -166,   -160,   -154, 
+  -148,   -141,   -135,   -129,   -123,   -116,   -110,   -104, 
+   -98,    -91,    -85,    -79,    -73,    -66,    -60,    -54, 
+   -48,    -41,    -35,    -29,    -22,    -16,    -10,     -4 
+};
+
+// this is the program the generate the above table
+#if 0
+#include <stdio.h>
+#include <math.h>
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+#define PFREAL_ONE 1024
+#define IANGLE_MAX 1024
+
+int main(int, char**)
+{
+  FILE*f = fopen("table.c","wt");
+  fprintf(f,"PFreal sinTable[] = {\n");
+  for(int i = 0; i < 128; i++)
+  {
+    for(int j = 0; j < 8; j++)
+    {
+      int iang = j+i*8;
+      double ii = (double)iang + 0.5;
+      double angle = ii * 2 * M_PI / IANGLE_MAX;
+      double sinAngle = sin(angle);
+      fprintf(f,"%6d, ", (int)(floor(PFREAL_ONE*sinAngle)));
+    }
+    fprintf(f,"\n");
+  }
+  fprintf(f,"};\n");
+  fclose(f);
+
+  return 0;
+}
+#endif
+
+inline PFreal fsin(int iangle)
+{
+  while(iangle < 0)
+    iangle += IANGLE_MAX;
+  return sinTable[iangle & IANGLE_MASK];
+}  
+
+inline PFreal fcos(int iangle)
+{
+  // quarter phase shift
+  return fsin(iangle + (IANGLE_MAX >> 2));
+}
+
+struct SlideInfo
+{
+  int slideIndex;
+  int angle;
+  PFreal cx;
+  PFreal cy;
+};
+
+class PictureFlowPrivate
+{
+public:
+  PictureFlowPrivate(PictureFlow* widget);
+
+  int slideCount() const;
+  void setSlideCount(int count);
+
+  QSize slideSize() const;
+  void setSlideSize(QSize size);
+
+  int zoomFactor() const;
+  void setZoomFactor(int z);
+
+  QImage slide(int index) const;
+  void setSlide(int index, const QImage& image);
+
+  int currentSlide() const;
+  void setCurrentSlide(int index);
+
+  int getTarget() const;
+
+  void showPrevious();
+  void showNext();
+  void showSlide(int index);
+
+  void resize(int w, int h);
+
+  void render();
+  void startAnimation();
+  void updateAnimation();
+
+  void clearSurfaceCache();
+
+  QImage buffer;
+  QBasicTimer animateTimer;
+
+  bool   singlePress;
+  int    singlePressThreshold;
+  QPoint firstPress;
+  QPoint previousPos;
+  QTime  previousPosTimestamp;
+  int    pixelDistanceMoved;
+  int    pixelsToMovePerSlide;
+
+  QVector<QString> captions;
+
+private:
+  PictureFlow* widget;
+
+  int slideWidth;
+  int slideHeight;
+  int zoom;
+
+  QVector<QImage> slideImages;
+  int centerIndex;
+  SlideInfo centerSlide;
+  QVector<SlideInfo> leftSlides;
+  QVector<SlideInfo> rightSlides;
+
+  QVector<PFreal> rays;
+  int itilt;
+  int spacing;
+  PFreal offsetX;
+  PFreal offsetY;
+
+  QImage blankSurface;
+  QCache<int, QImage> surfaceCache;
+  QTimer triggerTimer;
+
+  int slideFrame;
+  int step;
+  int target;
+  int fade;
+
+  void recalc(int w, int h);
+  QRect renderSlide(const SlideInfo &slide, int alpha=256, int col1=-1, int col=-1);
+  QImage* surface(int slideIndex);
+  void triggerRender();
+  void resetSlides();
+};
+
+PictureFlowPrivate::PictureFlowPrivate(PictureFlow* w)
+{
+  widget = w;
+
+  slideWidth = 200;
+  slideHeight = 200;
+  zoom = 100;
+
+  centerIndex = 0;
+
+  slideFrame = 0;
+  step = 0;
+  target = 0;
+  fade = 256;
+
+  triggerTimer.setSingleShot(true);
+  triggerTimer.setInterval(0);
+  QObject::connect(&triggerTimer, SIGNAL(timeout()), widget, SLOT(render()));
+  
+  recalc(200, 200);
+  resetSlides();
+}
+
+int PictureFlowPrivate::slideCount() const
+{
+  return slideImages.count();
+}
+
+void PictureFlowPrivate::setSlideCount(int count)
+{
+  slideImages.resize(count);
+  captions.resize(count);
+  surfaceCache.clear();
+  resetSlides();
+  triggerRender();
+}
+
+QSize PictureFlowPrivate::slideSize() const
+{
+  return QSize(slideWidth, slideHeight);
+}
+
+void PictureFlowPrivate::setSlideSize(QSize size)
+{
+  slideWidth = size.width();
+  slideHeight = size.height();
+  recalc(buffer.width(), buffer.height());
+  triggerRender();
+}
+
+int PictureFlowPrivate::zoomFactor() const
+{
+  return zoom;
+}
+
+void PictureFlowPrivate::setZoomFactor(int z)
+{
+  if(z <= 0)
+    return;
+
+  zoom = z;
+  recalc(buffer.width(), buffer.height());
+  triggerRender();
+}
+
+QImage PictureFlowPrivate::slide(int index) const
+{
+  return slideImages[index];
+}
+
+void PictureFlowPrivate::setSlide(int index, const QImage& image)
+{
+  if((index >= 0) && (index < slideImages.count()))
+  {
+    slideImages[index] = image;
+    surfaceCache.remove(index);
+    triggerRender();
+  }  
+}
+
+int PictureFlowPrivate::getTarget() const
+{
+  return target;
+}
+
+int PictureFlowPrivate::currentSlide() const
+{
+  return centerIndex;
+} 
+
+void PictureFlowPrivate::setCurrentSlide(int index)
+{
+  step = 0;
+  centerIndex = qBound(index, 0, slideImages.count()-1);
+  target = centerIndex;
+  slideFrame = index << 16;
+  resetSlides();
+  triggerRender();
+}
+
+void PictureFlowPrivate::showPrevious()
+{
+  if(step >= 0)
+  {
+    if(centerIndex > 0)
+    {
+      target--;
+      startAnimation();
+    }
+  }
+  else
+  {
+    target = qMax(0, centerIndex - 2);
+  }
+}
+
+void PictureFlowPrivate::showNext()
+{
+  if(step <= 0)
+  {
+    if(centerIndex < slideImages.count()-1)
+    {
+      target++;
+      startAnimation();
+    }
+  }
+  else
+  {
+    target = qMin(centerIndex + 2, slideImages.count()-1);
+  }
+}
+
+void PictureFlowPrivate::showSlide(int index)
+{
+  index = qMax(index, 0);
+  index = qMin(slideImages.count()-1, index);
+  if(index == centerSlide.slideIndex)
+    return;
+
+  target = index;
+  startAnimation();
+}
+
+void PictureFlowPrivate::resize(int w, int h)
+{
+  recalc(w, h);
+  resetSlides();
+  triggerRender();
+}
+
+
+// adjust slides so that they are in "steady state" position
+void PictureFlowPrivate::resetSlides()
+{
+  centerSlide.angle = 0;
+  centerSlide.cx = 0;
+  centerSlide.cy = 0;
+  centerSlide.slideIndex = centerIndex;
+
+  leftSlides.clear();
+  leftSlides.resize(3);
+  for(int i = 0; i < leftSlides.count(); i++)
+  {
+    SlideInfo& si = leftSlides[i];
+    si.angle = itilt;
+    si.cx = -(offsetX + spacing*i*PFREAL_ONE);
+    si.cy = offsetY;
+    si.slideIndex = centerIndex-1-i;
+    //qDebug() << "Left[" << i << "] x=" << fixedToFloat(si.cx) << ", y=" << fixedToFloat(si.cy) ;
+  }
+
+  rightSlides.clear();
+  rightSlides.resize(3);
+  for(int i = 0; i < rightSlides.count(); i++)
+  {
+    SlideInfo& si = rightSlides[i];
+    si.angle = -itilt;
+    si.cx = offsetX + spacing*i*PFREAL_ONE;
+    si.cy = offsetY;
+    si.slideIndex = centerIndex+1+i;
+    //qDebug() << "Right[" << i << "] x=" << fixedToFloat(si.cx) << ", y=" << fixedToFloat(si.cy) ;
+  }
+}
+
+#define BILINEAR_STRETCH_HOR 4
+#define BILINEAR_STRETCH_VER 4
+
+static QImage prepareSurface(QImage img, int w, int h)
+{
+  Qt::TransformationMode mode = Qt::SmoothTransformation;
+  img = img.scaled(w, h, Qt::IgnoreAspectRatio, mode);
+
+  // slightly larger, to accomodate for the reflection
+  int hs = h * 2;
+  int hofs = h / 3;
+
+  // offscreen buffer: black is sweet
+  QImage result(hs, w, QImage::Format_RGB16);  
+  result.fill(0);
+
+  // transpose the image, this is to speed-up the rendering
+  // because we process one column at a time
+  // (and much better and faster to work row-wise, i.e in one scanline)
+  for(int x = 0; x < w; x++)
+    for(int y = 0; y < h; y++)
+      result.setPixel(hofs + y, x, img.pixel(x, y));
+
+  // create the reflection
+  int ht = hs - h - hofs;
+  int hte = ht;
+  for(int x = 0; x < w; x++)
+    for(int y = 0; y < ht; y++)
+    {
+      QRgb color = img.pixel(x, img.height()-y-1);
+      //QRgb565 color = img.scanLine(img.height()-y-1) + x*sizeof(QRgb565); //img.pixel(x, img.height()-y-1);
+      int a = qAlpha(color);
+      int r = qRed(color)   * a / 256 * (hte - y) / hte * 3/5;
+      int g = qGreen(color) * a / 256 * (hte - y) / hte * 3/5;
+      int b = qBlue(color)  * a / 256 * (hte - y) / hte * 3/5;
+      result.setPixel(h+hofs+y, x, qRgb(r, g, b));
+    }
+
+#ifdef PICTUREFLOW_BILINEAR_FILTER
+  int hh = BILINEAR_STRETCH_VER*hs;
+  int ww = BILINEAR_STRETCH_HOR*w;
+  result = result.scaled(hh, ww, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+#endif
+
+  return result;
+}
+
+
+// get transformed image for specified slide
+// if it does not exist, create it and place it in the cache
+QImage* PictureFlowPrivate::surface(int slideIndex)
+{
+  if(slideIndex < 0)
+    return 0;
+  if(slideIndex >= slideImages.count())
+    return 0;
+
+  if(surfaceCache.contains(slideIndex))
+    return surfaceCache[slideIndex];
+
+  QImage img = widget->slide(slideIndex);
+  if(img.isNull())
+  {
+    if(blankSurface.isNull())
+    {
+      blankSurface = QImage(slideWidth, slideHeight, QImage::Format_RGB16);
+
+      QPainter painter(&blankSurface);
+      QPoint p1(slideWidth*4/10, 0);
+      QPoint p2(slideWidth*6/10, slideHeight);
+      QLinearGradient linearGrad(p1, p2);
+      linearGrad.setColorAt(0, Qt::black);
+      linearGrad.setColorAt(1, Qt::white); 
+      painter.setBrush(linearGrad);
+      painter.fillRect(0, 0, slideWidth, slideHeight, QBrush(linearGrad));
+
+      painter.setPen(QPen(QColor(64,64,64), 4));
+      painter.setBrush(QBrush());
+      painter.drawRect(2, 2, slideWidth-3, slideHeight-3);
+      painter.end();
+      blankSurface = prepareSurface(blankSurface, slideWidth, slideHeight);
+    }
+    return &blankSurface;
+  }
+
+  surfaceCache.insert(slideIndex, new QImage(prepareSurface(img, slideWidth, slideHeight)));
+  return surfaceCache[slideIndex];
+}
+
+
+// Schedules rendering the slides. Call this function to avoid immediate 
+// render and thus cause less flicker.
+void PictureFlowPrivate::triggerRender()
+{
+  triggerTimer.start();
+}
+
+// Render the slides. Updates only the offscreen buffer.
+void PictureFlowPrivate::render()
+{
+  buffer.fill(0);
+
+  int nleft = leftSlides.count();
+  int nright = rightSlides.count();
+
+  QRect r = renderSlide(centerSlide);
+  int c1 = r.left();
+  int c2 = r.right();
+
+  if(step == 0)
+  {
+    // no animation, boring plain rendering
+    for(int index = 0; index < nleft-1; index++)
+    {
+      int alpha = (index < nleft-2) ? 256 : 128;
+      QRect rs = renderSlide(leftSlides[index], alpha, 0, c1-1);
+      if(!rs.isEmpty())
+        c1 = rs.left();
+    }  
+    for(int index = 0; index < nright-1; index++)
+    {
+      int alpha = (index < nright-2) ? 256 : 128;
+      QRect rs = renderSlide(rightSlides[index], alpha, c2+1, buffer.width());
+      if(!rs.isEmpty())
+        c2 = rs.right();
+    }
+
+    QPainter painter;
+    painter.begin(&buffer);
+
+    QFont font("Arial", 14);
+    font.setBold(true);
+    painter.setFont(font);
+    painter.setPen(Qt::white);
+    //painter.setPen(QColor(255,255,255,127));
+
+    if (!captions.isEmpty())
+        painter.drawText( QRect(0,0, buffer.width(), (buffer.height() - slideSize().height())/2),
+        Qt::AlignCenter, captions[centerIndex]);
+
+    painter.end();
+
+  }
+  else
+  {
+    // the first and last slide must fade in/fade out
+    for(int index = 0; index < nleft; index++)
+    {
+      int alpha = 256;
+      if(index == nleft-1)
+        alpha = (step > 0) ? 0 : 128-fade/2;
+      if(index == nleft-2)
+        alpha = (step > 0) ? 128-fade/2 : 256-fade/2;
+      if(index == nleft-3)
+        alpha = (step > 0) ? 256-fade/2 : 256;
+      QRect rs = renderSlide(leftSlides[index], alpha, 0, c1-1);
+      if(!rs.isEmpty())
+        c1 = rs.left();
+
+      alpha = (step > 0) ? 256-fade/2 : 256;
+    }  
+    for(int index = 0; index < nright; index++)
+    {
+      int alpha = (index < nright-2) ? 256 : 128;
+      if(index == nright-1)
+        alpha = (step > 0) ? fade/2 : 0;
+      if(index == nright-2)
+        alpha = (step > 0) ? 128+fade/2 : fade/2;
+      if(index == nright-3)
+        alpha = (step > 0) ? 256 : 128+fade/2;
+      QRect rs = renderSlide(rightSlides[index], alpha, c2+1, buffer.width());
+      if(!rs.isEmpty())
+        c2 = rs.right();
+    }
+
+
+
+    QPainter painter;
+    painter.begin(&buffer);
+
+    QFont font("Arial", 14);
+    font.setBold(true);
+    painter.setFont(font);
+
+    int leftTextIndex = (step>0) ? centerIndex : centerIndex-1;
+
+    painter.setPen(QColor(255,255,255, (255-fade) ));
+    painter.drawText( QRect(0,0, buffer.width(), (buffer.height() - slideSize().height())/2),
+                      Qt::AlignCenter, captions[leftTextIndex]);
+
+    painter.setPen(QColor(255,255,255, fade));
+    painter.drawText( QRect(0,0, buffer.width(), (buffer.height() - slideSize().height())/2),
+                      Qt::AlignCenter, captions[leftTextIndex+1]);
+
+
+    painter.end();
+  }
+}
+
+
+static inline uint BYTE_MUL_RGB16(uint x, uint a) {
+    a += 1;
+    uint t = (((x & 0x07e0)*a) >> 8) & 0x07e0;
+    t |= (((x & 0xf81f)*(a>>2)) >> 6) & 0xf81f;
+    return t;
+}
+
+static inline uint BYTE_MUL_RGB16_32(uint x, uint a) {
+    uint t = (((x & 0xf81f07e0) >> 5)*a) & 0xf81f07e0;
+    t |= (((x & 0x07e0f81f)*a) >> 5) & 0x07e0f81f;
+    return t;
+}
+
+
+// Renders a slide to offscreen buffer. Returns a rect of the rendered area.
+// alpha=256 means normal, alpha=0 is fully black, alpha=128 half transparent
+// col1 and col2 limit the column for rendering.
+QRect PictureFlowPrivate::renderSlide(const SlideInfo &slide, int alpha, 
+int col1, int col2)
+{
+  QImage* src = surface(slide.slideIndex);
+  if(!src)
+    return QRect();
+
+  QRect rect(0, 0, 0, 0);  
+  
+#ifdef PICTUREFLOW_BILINEAR_FILTER
+  int sw = src->height() / BILINEAR_STRETCH_HOR;
+  int sh = src->width() / BILINEAR_STRETCH_VER;
+#else
+  int sw = src->height();
+  int sh = src->width();
+#endif
+  int h = buffer.height();
+  int w = buffer.width();
+
+  if(col1 > col2)
+  {
+    int c = col2;
+    col2 = col1;
+    col1 = c;
+  }
+
+  col1 = (col1 >= 0) ? col1 : 0;
+  col2 = (col2 >= 0) ? col2 : w-1;
+  col1 = qMin(col1, w-1);
+  col2 = qMin(col2, w-1);
+
+  int distance = h * 100 / zoom;
+  PFreal sdx = fcos(slide.angle);
+  PFreal sdy = fsin(slide.angle);
+  PFreal xs = slide.cx - slideWidth * sdx/2;
+  PFreal ys = slide.cy - slideWidth * sdy/2;
+  PFreal dist = distance * PFREAL_ONE;
+
+  int xi = qMax((PFreal)0, ((w*PFREAL_ONE/2) + fdiv(xs*h, dist+ys)) >> PFREAL_SHIFT);
+  if(xi >= w)
+    return rect;
+
+  bool flag = false;
+  rect.setLeft(xi);
+  for(int x = qMax(xi, col1); x <= col2; x++)
+  {
+    PFreal hity = 0;
+    PFreal fk = rays[x];
+    if(sdy)
+    {
+      fk = fk - fdiv(sdx,sdy);
+      hity = -fdiv((rays[x]*distance - slide.cx + slide.cy*sdx/sdy), fk);
+    }
+
+    dist = distance*PFREAL_ONE + hity;
+    if(dist < 0)
+      continue;
+
+    PFreal hitx = fmul(dist, rays[x]);
+    PFreal hitdist = fdiv(hitx - slide.cx, sdx);
+
+#ifdef PICTUREFLOW_BILINEAR_FILTER
+    int column = sw*BILINEAR_STRETCH_HOR/2 + (hitdist*BILINEAR_STRETCH_HOR >> PFREAL_SHIFT);
+    if(column >= sw*BILINEAR_STRETCH_HOR)
+      break;
+#else
+    int column = sw/2 + (hitdist >> PFREAL_SHIFT);
+    if(column >= sw)
+      break;
+#endif
+    if(column < 0)
+      continue;
+
+    rect.setRight(x);  
+    if(!flag)
+      rect.setLeft(x);
+    flag = true;  
+
+    int y1 = h/2;
+    int y2 = y1+ 1;
+    QRgb565* pixel1 = (QRgb565*)(buffer.scanLine(y1)) + x;
+    QRgb565* pixel2 = (QRgb565*)(buffer.scanLine(y2)) + x;
+    int pixelstep = pixel2 - pixel1;
+
+#ifdef PICTUREFLOW_BILINEAR_FILTER
+    int center = (sh*BILINEAR_STRETCH_VER/2);
+    int dy = dist*BILINEAR_STRETCH_VER / h;
+#else
+    int center = (sh/2);
+    int dy = dist / h;
+#endif
+    int p1 = center*PFREAL_ONE - dy/2;
+    int p2 = center*PFREAL_ONE + dy/2;
+
+    const QRgb565 *ptr = (const QRgb565*)(src->scanLine(column));
+    if(alpha == 256)
+      while((y1 >= 0) && (y2 < h) && (p1 >= 0))
+      {
+        *pixel1 = ptr[p1 >> PFREAL_SHIFT];
+        *pixel2 = ptr[p2 >> PFREAL_SHIFT];
+        p1 -= dy;
+        p2 += dy;
+        y1--;
+        y2++;
+        pixel1 -= pixelstep;
+        pixel2 += pixelstep;
+      }  
+    else
+      while((y1 >= 0) && (y2 < h) && (p1 >= 0))
+      {
+        QRgb565 c1 = ptr[p1 >> PFREAL_SHIFT];
+        QRgb565 c2 = ptr[p2 >> PFREAL_SHIFT];
+
+        *pixel1 = BYTE_MUL_RGB16(c1, alpha);
+        *pixel2 = BYTE_MUL_RGB16(c2, alpha);
+
+/*
+        int r1 = qRed(c1) * alpha/256;
+        int g1 = qGreen(c1) * alpha/256;
+        int b1 = qBlue(c1) * alpha/256;
+        int r2 = qRed(c2) * alpha/256;
+        int g2 = qGreen(c2) * alpha/256;
+        int b2 = qBlue(c2) * alpha/256;
+        *pixel1 = qRgb(r1, g1, b1);
+        *pixel2 = qRgb(r2, g2, b2);
+*/
+        p1 -= dy;
+        p2 += dy;
+        y1--;
+        y2++;
+        pixel1 -= pixelstep;
+        pixel2 += pixelstep;
+     }  
+   }  
+
+   rect.setTop(0);
+   rect.setBottom(h-1);
+   return rect;
+}
+
+// Updates look-up table and other stuff necessary for the rendering.
+// Call this when the viewport size or slide dimension is changed.
+void PictureFlowPrivate::recalc(int ww, int wh)
+{
+  int w = (ww+1)/2;
+  int h = (wh+1)/2;
+  buffer = QImage(ww, wh, QImage::Format_RGB16);
+  buffer.fill(0);
+
+  rays.resize(w*2);
+
+  for(int i = 0; i < w; i++)
+  {
+    PFreal gg = (PFREAL_HALF + i * PFREAL_ONE) / (2*h);
+    rays[w-i-1] = -gg;
+    rays[w+i] = gg;
+  }
+
+  // pointer must move more than 1/15 of the window to enter drag mode
+  singlePressThreshold = ww / 15;
+//  qDebug() << "singlePressThreshold now set to " << singlePressThreshold;
+
+  pixelsToMovePerSlide = ww / 3;
+//  qDebug() << "pixelsToMovePerSlide now set to " << pixelsToMovePerSlide;
+
+  itilt = 80 * IANGLE_MAX / 360;  // approx. 80 degrees tilted
+
+  offsetY = slideWidth/2 * fsin(itilt);
+  offsetY += slideWidth * PFREAL_ONE / 4;
+
+//  offsetX = slideWidth/2 * (PFREAL_ONE-fcos(itilt));
+//  offsetX += slideWidth * PFREAL_ONE;
+
+  //         center slide             +         side slide
+  offsetX = slideWidth*PFREAL_ONE;
+//  offsetX = 150*PFREAL_ONE;//(slideWidth/2)*PFREAL_ONE + ( slideWidth*fcos(itilt) )/2;
+//  qDebug() << "center width = " << slideWidth;
+//  qDebug() << "side width = " << fixedToFloat(slideWidth/2 * (PFREAL_ONE-fcos(itilt)));
+//  qDebug() << "offsetX now " << fixedToFloat(offsetX);
+
+  spacing = slideWidth/5;
+
+  surfaceCache.clear();
+  blankSurface = QImage();
+}
+
+void PictureFlowPrivate::startAnimation()
+{
+  if(!animateTimer.isActive())
+  {
+    step = (target < centerSlide.slideIndex) ? -1 : 1;
+    animateTimer.start(30, widget);
+  }
+}
+
+// Updates the animation effect. Call this periodically from a timer.
+void PictureFlowPrivate::updateAnimation()
+{
+  if(!animateTimer.isActive())
+    return;
+  if(step == 0)
+    return;
+
+  int speed = 16384;
+
+  // deaccelerate when approaching the target
+  if(true)
+  {
+    const int max = 2 * 65536;
+
+    int fi = slideFrame;
+    fi -= (target << 16);  
+    if(fi < 0)
+      fi = -fi;
+    fi = qMin(fi, max);
+
+    int ia = IANGLE_MAX * (fi-max/2) / (max*2);
+    speed = 512 + 16384 * (PFREAL_ONE+fsin(ia))/PFREAL_ONE;
+  }
+
+  slideFrame += speed*step;
+
+  int index = slideFrame >> 16;
+  int pos = slideFrame & 0xffff;
+  int neg = 65536 - pos;
+  int tick = (step < 0) ? neg : pos;
+  PFreal ftick = (tick * PFREAL_ONE) >> 16;  
+
+  // the leftmost and rightmost slide must fade away
+  fade = pos / 256;
+
+  if(step < 0)
+    index++;
+  if(centerIndex != index)
+  {
+    centerIndex = index;
+    slideFrame = index << 16;
+    centerSlide.slideIndex = centerIndex;
+    for(int i = 0; i < leftSlides.count(); i++)
+      leftSlides[i].slideIndex = centerIndex-1-i;
+    for(int i = 0; i < rightSlides.count(); i++)
+      rightSlides[i].slideIndex = centerIndex+1+i;
+  }
+
+  centerSlide.angle = (step * tick * itilt) >> 16;
+  centerSlide.cx = -step * fmul(offsetX, ftick);
+  centerSlide.cy = fmul(offsetY, ftick);
+
+  if(centerIndex == target)
+  {
+    resetSlides();
+    animateTimer.stop();
+    triggerRender();
+    step = 0;
+    fade = 256;
+    return;
+  }  
+
+  for(int i = 0; i < leftSlides.count(); i++)
+  {
+    SlideInfo& si = leftSlides[i];
+    si.angle = itilt;
+    si.cx = -(offsetX + spacing*i*PFREAL_ONE + step*spacing*ftick);
+    si.cy = offsetY;
+  }
+
+  for(int i = 0; i < rightSlides.count(); i++)
+  {
+    SlideInfo& si = rightSlides[i];
+    si.angle = -itilt;
+    si.cx = offsetX + spacing*i*PFREAL_ONE - step*spacing*ftick;
+    si.cy = offsetY;
+  }
+
+  if(step > 0)
+  {
+    PFreal ftick = (neg * PFREAL_ONE) >> 16;
+    rightSlides[0].angle = -(neg * itilt) >> 16;
+    rightSlides[0].cx = fmul(offsetX, ftick);
+    rightSlides[0].cy = fmul(offsetY, ftick);
+  }
+  else
+  {
+    PFreal ftick = (pos * PFREAL_ONE) >> 16;
+    leftSlides[0].angle = (pos * itilt) >> 16;
+    leftSlides[0].cx = -fmul(offsetX, ftick);
+    leftSlides[0].cy = fmul(offsetY, ftick);
+  } 
+
+  // must change direction ?
+  if(target < index) if(step > 0)
+    step = -1;
+  if(target > index) if(step < 0)
+    step = 1;
+
+  triggerRender();
+}
+
+
+void PictureFlowPrivate::clearSurfaceCache()
+{
+  surfaceCache.clear();
+}
+
+// -----------------------------------------
+
+PictureFlow::PictureFlow(QWidget* parent): QWidget(parent)
+{
+  d = new PictureFlowPrivate(this);
+
+  setAttribute(Qt::WA_StaticContents, true);
+  setAttribute(Qt::WA_OpaquePaintEvent, true);
+  setAttribute(Qt::WA_NoSystemBackground, true);
+
+#ifdef Q_WS_QWS
+  if (QScreen::instance()->pixelFormat() != QImage::Format_Invalid)
+    setAttribute(Qt::WA_PaintOnScreen, true);
+#endif
+}
+
+PictureFlow::~PictureFlow()
+{
+  delete d;
+}  
+
+int PictureFlow::slideCount() const
+{
+  return d->slideCount();
+}
+
+void PictureFlow::setSlideCount(int count)
+{
+  d->setSlideCount(count);
+}
+
+QSize PictureFlow::slideSize() const
+{
+  return d->slideSize();
+}
+
+void PictureFlow::setSlideSize(QSize size)
+{
+  d->setSlideSize(size);
+}
+
+int PictureFlow::zoomFactor() const
+{
+  return d->zoomFactor();
+}
+
+void PictureFlow::setZoomFactor(int z)
+{
+  d->setZoomFactor(z);
+}
+
+QImage PictureFlow::slide(int index) const
+{
+  return d->slide(index);
+}
+
+void PictureFlow::setSlide(int index, const QImage& image)
+{
+  d->setSlide(index, image);
+}
+
+void PictureFlow::setSlide(int index, const QPixmap& pixmap)
+{
+  d->setSlide(index, pixmap.toImage());
+}
+
+void PictureFlow::setSlideCaption(int index, QString caption)
+{
+  d->captions[index] = caption;
+}
+
+
+int PictureFlow::currentSlide() const
+{
+  return d->currentSlide();
+}
+
+void PictureFlow::setCurrentSlide(int index)
+{
+  d->setCurrentSlide(index);
+}
+
+void PictureFlow::clear()
+{
+  d->setSlideCount(0);
+}
+
+void PictureFlow::clearCaches()
+{
+  d->clearSurfaceCache();
+}
+
+void PictureFlow::render()
+{
+  d->render();
+  update();
+}
+
+void PictureFlow::showPrevious()
+{
+  d->showPrevious();
+}
+
+void PictureFlow::showNext()
+{
+  d->showNext();
+}
+
+void PictureFlow::showSlide(int index)
+{
+  d->showSlide(index);
+}
+
+void PictureFlow::keyPressEvent(QKeyEvent* event)
+{
+  if(event->key() == Qt::Key_Left)
+  {
+    if(event->modifiers() == Qt::ControlModifier)
+      showSlide(currentSlide()-10);
+    else  
+      showPrevious();
+    event->accept();
+    return;
+  }
+
+  if(event->key() == Qt::Key_Right)
+  {
+    if(event->modifiers() == Qt::ControlModifier)
+      showSlide(currentSlide()+10);
+    else
+      showNext();
+    event->accept();
+    return;
+  }
+
+  event->ignore();
+}
+
+#define SPEED_LOWER_THRESHOLD 10
+#define SPEED_UPPER_LIMIT 40
+
+void PictureFlow::mouseMoveEvent(QMouseEvent* event)
+{
+  int distanceMovedSinceLastEvent = event->pos().x() - d->previousPos.x();
+
+  // Check to see if we need to switch from single press mode to a drag mode
+  if (d->singlePress)
+  {
+    // Increment the distance moved for this event
+    d->pixelDistanceMoved += distanceMovedSinceLastEvent;
+
+    // Check against threshold
+    if (qAbs(d->pixelDistanceMoved) > d->singlePressThreshold)
+    {
+      d->singlePress = false;
+//      qDebug() << "DRAG MODE ON";
+    }
+  }
+
+  if (!d->singlePress)
+  {
+    int speed;
+    // Calculate velocity in a 10th of a window width per second
+    if (d->previousPosTimestamp.elapsed() == 0)
+      speed = SPEED_LOWER_THRESHOLD;
+    else
+    {
+      speed = ((qAbs(event->pos().x()-d->previousPos.x())*1000) / d->previousPosTimestamp.elapsed())
+                    / (d->buffer.width() / 10);
+  
+      if (speed < SPEED_LOWER_THRESHOLD)
+        speed = SPEED_LOWER_THRESHOLD;
+      else if (speed > SPEED_UPPER_LIMIT)
+        speed = SPEED_UPPER_LIMIT;
+      else {
+        speed = SPEED_LOWER_THRESHOLD + (speed / 3);
+//        qDebug() << "ACCELERATION ENABLED Speed = " << speed << ", Distance = " << distanceMovedSinceLastEvent;
+        
+      }
+    }
+  
+
+//    qDebug() << "Speed = " << speed;
+
+//    int incr = ((event->pos().x() - d->previousPos.x())/10) * speed;
+    
+//    qDebug() << "Incremented by " << incr;
+
+    int incr = (distanceMovedSinceLastEvent * speed);
+    
+    //qDebug() << "(distanceMovedSinceLastEvent * speed) = " << incr;
+
+    if (incr > d->pixelsToMovePerSlide*2) {
+      incr = d->pixelsToMovePerSlide*2;
+      //qDebug() << "Limiting incr to " << incr;
+    }
+
+
+    d->pixelDistanceMoved += (distanceMovedSinceLastEvent * speed);
+ //   qDebug() << "distance: " << d->pixelDistanceMoved;
+
+    int slideInc;
+
+    slideInc = d->pixelDistanceMoved / (d->pixelsToMovePerSlide * 10);
+
+    if (slideInc != 0) {
+      int targetSlide = d->getTarget() - slideInc;
+      showSlide(targetSlide);
+//      qDebug() << "TargetSlide = " << targetSlide;
+
+      //qDebug() << "Decrementing pixelDistanceMoved by " << (d->pixelsToMovePerSlide *10) * slideInc;
+
+      d->pixelDistanceMoved -= (d->pixelsToMovePerSlide *10) * slideInc;
+
+/*
+      if ( (targetSlide <= 0) || (targetSlide >= d->slideCount()-1) )
+        d->pixelDistanceMoved = 0;
+*/
+    }
+
+    
+  }
+
+  d->previousPos = event->pos();
+  d->previousPosTimestamp.restart();
+
+  emit inputReceived();
+}
+
+void PictureFlow::mousePressEvent(QMouseEvent* event)
+{
+  d->firstPress = event->pos();
+  d->previousPos = event->pos();
+  d->previousPosTimestamp.start();
+  d->singlePress = true; // Initially assume a single press
+//  d->dragStartSlide = d->getTarget();
+  d->pixelDistanceMoved = 0;
+
+  emit inputReceived();
+}
+
+void PictureFlow::mouseReleaseEvent(QMouseEvent* event)
+{
+  int sideWidth = (d->buffer.width() - slideSize().width()) /2;
+
+  if (d->singlePress)
+  {
+    if (event->x() < sideWidth )
+    {
+      showPrevious();
+    } else if ( event->x() > sideWidth + slideSize().width() ) {
+      showNext();
+    } else {
+      emit itemActivated(d->getTarget());
+    }
+
+    event->accept();
+  }
+
+  emit inputReceived();
+}
+
+
+void PictureFlow::paintEvent(QPaintEvent* event)
+{
+  Q_UNUSED(event);
+  QPainter painter(this);
+  painter.setRenderHint(QPainter::Antialiasing, false);
+  painter.drawImage(QPoint(0,0), d->buffer);
+}
+
+void PictureFlow::resizeEvent(QResizeEvent* event)
+{
+  d->resize(width(), height());
+  QWidget::resizeEvent(event);
+}
+
+void PictureFlow::timerEvent(QTimerEvent* event)
+{
+  if(event->timerId() == d->animateTimer.timerId())
+  {
+//    QTime now = QTime::currentTime();
+    d->updateAnimation();
+//    d->animateTimer.start(qMax(0, 30-now.elapsed() ), this);
+  }
+  else
+    QWidget::timerEvent(event);
+}
diff --git a/demos/embedded/fluidlauncher/pictureflow.h b/demos/embedded/fluidlauncher/pictureflow.h
new file mode 100644
index 0000000000..fccc7a3bb2
--- /dev/null
+++ b/demos/embedded/fluidlauncher/pictureflow.h
@@ -0,0 +1,237 @@
+/****************************************************************************
+*
+* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
+* This is version of the Pictureflow animated image show widget modified by Nokia.
+*
+*  $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 either Technology Preview License Agreement or the
+*  Beta Release License Agreement.
+* 
+*  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.0, included in the file LGPL_EXCEPTION.txt in this
+*  package.
+* 
+*  GNU General Public License Usage
+*  Alternatively, this file may be used under the terms of the GNU
+*  General Public License version 3.0 as published by the Free Software
+*  Foundation and appearing in the file LICENSE.GPL included in the
+*  packaging of this file.  Please review the following information to
+*  ensure the GNU General Public License version 3.0 requirements will be
+*  met: http://www.gnu.org/copyleft/gpl.html.
+* 
+*  If you are unsure which license is appropriate for your use, please
+*  contact the sales department at qt-sales@nokia.com.
+*  $QT_END_LICENSE$
+*
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the <organization> nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY TROLLTECH ASA ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+****************************************************************************/
+/*
+  ORIGINAL COPYRIGHT HEADER
+  PictureFlow - animated image show widget
+  http://pictureflow.googlecode.com
+
+  Copyright (C) 2007 Ariya Hidayat (ariya@kde.org)
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+
+#ifndef PICTUREFLOW_H
+#define PICTUREFLOW_H
+
+#include <QWidget>
+
+class PictureFlowPrivate;
+
+/*!
+  Class PictureFlow implements an image show widget with animation effect 
+  like Apple's CoverFlow (in iTunes and iPod). Images are arranged in form 
+  of slides, one main slide is shown at the center with few slides on 
+  the left and right sides of the center slide. When the next or previous 
+  slide is brought to the front, the whole slides flow to the right or 
+  the right with smooth animation effect; until the new slide is finally 
+  placed at the center.
+
+ */ 
+class PictureFlow : public QWidget
+{
+Q_OBJECT
+
+  Q_PROPERTY(int slideCount READ slideCount WRITE setSlideCount)
+  Q_PROPERTY(int currentSlide READ currentSlide WRITE setCurrentSlide)
+  Q_PROPERTY(QSize slideSize READ slideSize WRITE setSlideSize)
+  Q_PROPERTY(int zoomFactor READ zoomFactor WRITE setZoomFactor)
+
+public:
+  /*!
+    Creates a new PictureFlow widget.
+  */  
+  PictureFlow(QWidget* parent = 0);
+
+  /*!
+    Destroys the widget.
+  */
+  ~PictureFlow();
+
+  /*!
+    Returns the total number of slides.
+  */
+  int slideCount() const;
+
+  /*!
+    Sets the total number of slides.
+  */
+  void setSlideCount(int count);
+
+  /*!
+    Returns the dimension of each slide (in pixels).
+  */  
+  QSize slideSize() const;
+
+  /*!
+    Sets the dimension of each slide (in pixels).
+  */  
+  void setSlideSize(QSize size);
+
+  /*!
+    Sets the zoom factor (in percent).
+  */ 
+  void setZoomFactor(int zoom);
+
+  /*!
+    Returns the zoom factor (in percent).
+  */
+  int zoomFactor() const;
+
+  /*!
+    Clears any caches held to free up memory
+  */
+  void clearCaches();
+
+  /*!
+    Returns QImage of specified slide.
+    This function will be called only whenever necessary, e.g. the 100th slide
+    will not be retrived when only the first few slides are visible.
+  */  
+  virtual QImage slide(int index) const;
+
+  /*!
+    Sets an image for specified slide. If the slide already exists,
+    it will be replaced.
+  */  
+  virtual void setSlide(int index, const QImage& image);
+
+  virtual void setSlideCaption(int index, QString caption);
+
+  /*!
+    Sets a pixmap for specified slide. If the slide already exists,
+    it will be replaced.
+  */  
+  virtual void setSlide(int index, const QPixmap& pixmap);
+
+  /*!
+    Returns the index of slide currently shown in the middle of the viewport.
+  */  
+  int currentSlide() const;
+
+public slots:
+
+  /*!
+    Sets slide to be shown in the middle of the viewport. No animation 
+    effect will be produced, unlike using showSlide.
+  */  
+  void setCurrentSlide(int index);
+
+  /*!
+    Clears images of all slides.
+  */
+  void clear();
+
+  /*!
+    Rerender the widget. Normally this function will be automatically invoked
+    whenever necessary, e.g. during the transition animation.
+  */
+  void render();
+
+  /*!
+    Shows previous slide using animation effect.
+  */
+  void showPrevious();
+
+  /*!
+    Shows next slide using animation effect.
+  */
+  void showNext();
+
+  /*!
+    Go to specified slide using animation effect.
+  */
+  void showSlide(int index);
+
+signals:
+  void itemActivated(int index);
+  void inputReceived();
+
+protected:
+  void paintEvent(QPaintEvent *event);
+  void keyPressEvent(QKeyEvent* event);
+  void mouseMoveEvent(QMouseEvent* event);
+  void mousePressEvent(QMouseEvent* event);
+  void mouseReleaseEvent(QMouseEvent* event);
+  void resizeEvent(QResizeEvent* event);
+  void timerEvent(QTimerEvent* event);
+
+private:
+  PictureFlowPrivate* d;
+};
+
+#endif // PICTUREFLOW_H
diff --git a/demos/embedded/fluidlauncher/screenshots/concentriccircles.png b/demos/embedded/fluidlauncher/screenshots/concentriccircles.png
new file mode 100644
index 0000000000..fd308b5642
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/concentriccircles.png
diff --git a/demos/embedded/fluidlauncher/screenshots/deform.png b/demos/embedded/fluidlauncher/screenshots/deform.png
new file mode 100644
index 0000000000..c22f2aef06
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/deform.png
diff --git a/demos/embedded/fluidlauncher/screenshots/elasticnodes.png b/demos/embedded/fluidlauncher/screenshots/elasticnodes.png
new file mode 100644
index 0000000000..bc157e53cf
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/elasticnodes.png
diff --git a/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer.png b/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer.png
new file mode 100644
index 0000000000..522f13b84c
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer.png
diff --git a/demos/embedded/fluidlauncher/screenshots/mediaplayer.png b/demos/embedded/fluidlauncher/screenshots/mediaplayer.png
new file mode 100644
index 0000000000..1304a19ad0
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/mediaplayer.png
diff --git a/demos/embedded/fluidlauncher/screenshots/pathstroke.png b/demos/embedded/fluidlauncher/screenshots/pathstroke.png
new file mode 100644
index 0000000000..c3d727e8f0
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/pathstroke.png
diff --git a/demos/embedded/fluidlauncher/screenshots/styledemo.png b/demos/embedded/fluidlauncher/screenshots/styledemo.png
new file mode 100644
index 0000000000..669c488880
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/styledemo.png
diff --git a/demos/embedded/fluidlauncher/screenshots/wiggly.png b/demos/embedded/fluidlauncher/screenshots/wiggly.png
new file mode 100644
index 0000000000..b20fbc445d
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/wiggly.png
diff --git a/demos/embedded/fluidlauncher/slides/demo_1.png b/demos/embedded/fluidlauncher/slides/demo_1.png
new file mode 100644
index 0000000000..d2952e527b
--- /dev/null
+++ b/demos/embedded/fluidlauncher/slides/demo_1.png
diff --git a/demos/embedded/fluidlauncher/slides/demo_2.png b/demos/embedded/fluidlauncher/slides/demo_2.png
new file mode 100644
index 0000000000..1899825ee9
--- /dev/null
+++ b/demos/embedded/fluidlauncher/slides/demo_2.png
diff --git a/demos/embedded/fluidlauncher/slides/demo_3.png b/demos/embedded/fluidlauncher/slides/demo_3.png
new file mode 100644
index 0000000000..8369bc0509
--- /dev/null
+++ b/demos/embedded/fluidlauncher/slides/demo_3.png
diff --git a/demos/embedded/fluidlauncher/slides/demo_4.png b/demos/embedded/fluidlauncher/slides/demo_4.png
new file mode 100644
index 0000000000..377e369fdd
--- /dev/null
+++ b/demos/embedded/fluidlauncher/slides/demo_4.png
diff --git a/demos/embedded/fluidlauncher/slides/demo_5.png b/demos/embedded/fluidlauncher/slides/demo_5.png
new file mode 100644
index 0000000000..239f08aa75
--- /dev/null
+++ b/demos/embedded/fluidlauncher/slides/demo_5.png
diff --git a/demos/embedded/fluidlauncher/slides/demo_6.png b/demos/embedded/fluidlauncher/slides/demo_6.png
new file mode 100644
index 0000000000..0addf370f6
--- /dev/null
+++ b/demos/embedded/fluidlauncher/slides/demo_6.png
diff --git a/demos/embedded/fluidlauncher/slideshow.cpp b/demos/embedded/fluidlauncher/slideshow.cpp
new file mode 100644
index 0000000000..8f643b4ad9
--- /dev/null
+++ b/demos/embedded/fluidlauncher/slideshow.cpp
@@ -0,0 +1,233 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QBasicTimer>
+#include <QList>
+#include <QImage>
+#include <QDir>
+#include <QPainter>
+#include <QPaintEvent>
+
+#include <QDebug>
+
+
+#include "slideshow.h"
+
+
+class SlideShowPrivate
+{
+public:
+    SlideShowPrivate();
+
+    int currentSlide;
+    int slideInterval;
+    QBasicTimer interSlideTimer;
+    QStringList imagePaths;
+
+    void showNextSlide();
+};
+
+
+
+SlideShowPrivate::SlideShowPrivate()
+{
+    currentSlide = 0;
+    slideInterval = 10000; // Default to 10 sec interval
+}
+
+
+void SlideShowPrivate::showNextSlide()
+{
+    currentSlide++;
+    if (currentSlide >= imagePaths.size())
+      currentSlide = 0;
+}
+
+
+
+SlideShow::SlideShow()
+{
+    d = new SlideShowPrivate;
+
+    setAttribute(Qt::WA_StaticContents, true);
+    setAttribute(Qt::WA_OpaquePaintEvent, true);
+    setAttribute(Qt::WA_NoSystemBackground, true);
+
+    setMouseTracking(true);
+}
+
+
+SlideShow::~SlideShow()
+{
+    delete d;
+}
+
+
+void SlideShow::addImageDir(QString dirName)
+{
+    QDir dir(dirName);
+
+    QStringList fileNames = dir.entryList(QDir::Files | QDir::Readable, QDir::Name);
+
+    for (int i=0; i<fileNames.count(); i++)
+        d->imagePaths << dir.absoluteFilePath(fileNames[i]);
+}
+
+void SlideShow::addImage(QString filename)
+{
+    d->imagePaths << filename;
+}
+
+
+void SlideShow::clearImages()
+{
+    d->imagePaths.clear();
+}
+
+
+void SlideShow::startShow()
+{
+    showFullScreen();
+    d->interSlideTimer.start(d->slideInterval, this);
+    d->showNextSlide();
+    update();
+}
+
+
+void SlideShow::stopShow()
+{
+    hide();
+    d->interSlideTimer.stop();
+}
+
+
+int SlideShow::slideInterval()
+{
+    return d->slideInterval;
+}
+
+void SlideShow::setSlideInterval(int val)
+{
+    d->slideInterval = val;
+}
+
+
+void SlideShow::timerEvent(QTimerEvent* event)
+{
+    Q_UNUSED(event);
+    d->showNextSlide();
+    update();
+}
+
+
+void SlideShow::paintEvent(QPaintEvent *event)
+{
+    QPainter painter(this);
+    painter.setRenderHint(QPainter::Antialiasing, false);
+
+    if (d->imagePaths.size() > 0) {
+        QPixmap slide = QPixmap(d->imagePaths[d->currentSlide]);
+        QSize slideSize = slide.size();
+        QSize scaledSize = QSize(qMin(slideSize.width(), size().width()),
+            qMin(slideSize.height(), size().height()));
+        if (slideSize != scaledSize)
+            slide = slide.scaled(scaledSize, Qt::KeepAspectRatio);
+
+        QRect pixmapRect(qMax( (size().width() - slide.width())/2, 0),
+                         qMax( (size().height() - slide.height())/2, 0),
+                         slide.width(),
+                         slide.height());
+
+        if (pixmapRect.top() > 0) {
+            // Fill in top & bottom rectangles:
+            painter.fillRect(0, 0, size().width(), pixmapRect.top(), Qt::black);
+            painter.fillRect(0, pixmapRect.bottom(), size().width(), size().height(), Qt::black);
+        }
+
+        if (pixmapRect.left() > 0) {
+            // Fill in left & right rectangles:
+            painter.fillRect(0, 0, pixmapRect.left(), size().height(), Qt::black);
+            painter.fillRect(pixmapRect.right(), 0, size().width(), size().height(), Qt::black);
+        }
+
+        painter.drawPixmap(pixmapRect, slide);
+
+    } else
+        painter.fillRect(event->rect(), Qt::black);
+}
+
+
+void SlideShow::keyPressEvent(QKeyEvent* event)
+{
+    Q_UNUSED(event);
+    emit inputReceived();
+}
+
+
+void SlideShow::mouseMoveEvent(QMouseEvent* event)
+{
+    Q_UNUSED(event);
+    emit inputReceived();
+}
+
+
+void SlideShow::mousePressEvent(QMouseEvent* event)
+{
+    Q_UNUSED(event);
+    emit inputReceived();
+}
+
+
+void SlideShow::mouseReleaseEvent(QMouseEvent* event)
+{
+    Q_UNUSED(event);
+    emit inputReceived();
+}
+
+
+void SlideShow::showEvent(QShowEvent * event )
+{
+    Q_UNUSED(event);
+#ifndef QT_NO_CURSOR
+    setCursor(Qt::BlankCursor);
+#endif
+}
+
diff --git a/demos/embedded/fluidlauncher/slideshow.h b/demos/embedded/fluidlauncher/slideshow.h
new file mode 100644
index 0000000000..27fb87b07e
--- /dev/null
+++ b/demos/embedded/fluidlauncher/slideshow.h
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SLIDESHOW_H 
+#define SLIDESHOW_H
+
+#include <QWidget>
+
+class SlideShowPrivate;
+
+class SlideShow : public QWidget
+{
+    Q_OBJECT
+
+    Q_PROPERTY(int slideInterval READ slideInterval WRITE setSlideInterval)
+
+public:
+    SlideShow();
+    ~SlideShow();
+    void addImage(QString filename);
+    void addImageDir(QString dirName);
+    void clearImages();
+    void startShow();
+    void stopShow();
+
+
+    int slideInterval();
+    void setSlideInterval(int val);
+
+signals:
+    void inputReceived();
+
+protected:
+    void paintEvent(QPaintEvent *event);
+    void keyPressEvent(QKeyEvent* event);
+    void mouseMoveEvent(QMouseEvent* event);
+    void mousePressEvent(QMouseEvent* event);
+    void mouseReleaseEvent(QMouseEvent* event);
+    void timerEvent(QTimerEvent* event);
+    void showEvent(QShowEvent * event );
+
+
+private:
+    SlideShowPrivate* d;
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
+#endif
diff --git a/demos/embedded/styledemo/files/add.png b/demos/embedded/styledemo/files/add.png
new file mode 100755
index 0000000000..fc5c16d4c8
--- /dev/null
+++ b/demos/embedded/styledemo/files/add.png
diff --git a/demos/embedded/styledemo/files/application.qss b/demos/embedded/styledemo/files/application.qss
new file mode 100644
index 0000000000..a632ad1c86
--- /dev/null
+++ b/demos/embedded/styledemo/files/application.qss
@@ -0,0 +1,125 @@
+QWidget#StyleWidget
+{
+	background-color: none;
+	background-image: url(icons:nature_1.jpg);
+}
+
+QLabel, QAbstractButton 
+{
+	font: 18px bold;
+	color: beige;
+}
+
+QAbstractButton 
+{
+	background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(173,216,230,60%), stop:1 rgba(0,0,139,60%) );
+	border-color: black;
+	border-style: solid;
+	border-width: 3px;
+	border-radius: 6px;
+}
+
+QAbstractButton:pressed, QAbstractButton:checked
+{
+	background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0,0,139,60%), stop:1 rgba(173,216,230,60%) );
+}
+
+QSpinBox {
+	padding-left: 24px;
+	padding-right: 24px;
+	border-color: darkkhaki;
+	border-style: solid;
+	border-radius: 5;
+	border-width: 3;
+}
+
+QSpinBox::up-button 
+{
+	subcontrol-origin: padding;
+	subcontrol-position: right; /* position at the top right corner */
+	width: 24px;
+	height: 24px;
+	border-width: 3px;
+	
+}
+
+QSpinBox::up-arrow 
+{
+	image: url(icons:add.png);
+	width: 18px;
+	height: 18px;
+}
+
+
+QSpinBox::down-button 
+{
+	subcontrol-origin: border;
+	subcontrol-position: left;
+	width: 24px;
+	height: 24px;
+	border-width: 3px;
+}
+
+QSpinBox::down-arrow 
+{
+	image: url(icons:remove.png);
+	width: 18px;
+	height: 18px;
+}
+
+
+QScrollBar:horizontal 
+{
+	border: 1px solid black;
+	background: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0,0,139,60%), stop:1 rgba(173,216,230,60%) );
+	height: 15px;
+	margin: 0px 20px 0 20px;
+}
+
+QScrollBar::handle:horizontal 
+{
+	border: 1px solid black;
+	background: rgba(0,0,139,60%);
+	min-width: 20px;
+}
+
+QScrollBar::add-line:horizontal 
+{
+	border: 1px solid black;
+	background: rgba(0,0,139,60%);
+	width: 20px;
+	subcontrol-position: right;
+	subcontrol-origin: margin;
+}
+
+QScrollBar::sub-line:horizontal 
+{
+	border: 1px solid black;
+	background: rgba(0,0,139,60%);
+	width: 20px;
+	subcontrol-position: left;
+	subcontrol-origin: margin;
+}
+
+QScrollBar:left-arrow:horizontal, QScrollBar::right-arrow:horizontal 
+{
+	border: none;
+	width: 16px;
+	height: 16px;
+}
+
+QScrollBar:left-arrow:horizontal 
+{
+	image: url(icons:add.png)
+}
+
+QScrollBar::right-arrow:horizontal 
+{
+	image: url(icons:remove.png)
+}
+
+QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal 
+{
+	background: none;
+}
+
diff --git a/demos/embedded/styledemo/files/blue.qss b/demos/embedded/styledemo/files/blue.qss
new file mode 100644
index 0000000000..aa87277f8d
--- /dev/null
+++ b/demos/embedded/styledemo/files/blue.qss
@@ -0,0 +1,39 @@
+*
+{
+	color: beige;
+}
+
+QLabel, QAbstractButton 
+{
+    font: 10pt bold;
+	color: yellow;
+}
+
+QFrame
+{
+    background-color: rgba(96,96,255,60%);
+    border-color: rgb(32,32,196);
+    border-width: 3px;
+    border-style: solid;
+    border-radius: 5;
+    padding: 3px;
+}
+
+QAbstractButton
+{
+    background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+                             stop:0 lightblue, stop:0.5 darkblue);
+    border-width: 3px;
+    border-color: darkblue;
+    border-style: solid;
+    border-radius: 5;
+    padding: 3px;
+	qproperty-focusPolicy: NoFocus;
+}
+
+QAbstractButton:pressed
+{
+    background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+                             stop:0.5 darkblue, stop:1 lightblue);
+    border-color: beige;
+}
diff --git a/demos/embedded/styledemo/files/khaki.qss b/demos/embedded/styledemo/files/khaki.qss
new file mode 100644
index 0000000000..9c0f77caa5
--- /dev/null
+++ b/demos/embedded/styledemo/files/khaki.qss
@@ -0,0 +1,100 @@
+
+QWidget#StartScreen, QWidget#MainWidget {
+   border: none;
+}
+
+QWidget#StartScreen, .QFrame {
+   background-color: beige;
+}
+
+QPushButton, QToolButton {
+    background-color: palegoldenrod;
+    border-width: 2px;
+    border-color: darkkhaki;
+    border-style: solid;
+    border-radius: 5;
+    padding: 3px;
+    /* min-width: 96px; */
+    /* min-height: 48px; */
+	qproperty-focusPolicy: NoFocus
+}
+
+QPushButton:hover, QToolButton:hover {
+   background-color: khaki;
+}
+
+QPushButton:pressed, QToolButton:pressed {
+    padding-left: 5px;
+    padding-top: 5px;
+    background-color: #d0d67c;
+}
+
+QLabel, QAbstractButton {
+    font: italic 11pt "Times New Roman";
+}
+
+QFrame, QLabel#title {
+    border-width: 2px;
+    padding: 1px;
+    border-style: solid;
+    border-color: darkkhaki;
+    border-radius: 5px;
+}
+
+QFrame:focus {
+    border-width: 3px;
+    padding: 0px;
+}
+
+
+QLabel {
+    border: none;
+    padding: 0;
+    background: none;
+}
+
+QLabel#title {
+	font: 32px bold;
+}
+
+QSpinBox {
+     padding-left: 24px;
+     padding-right: 24px;
+	 border-color: darkkhaki;
+	 border-style: solid;
+	 border-radius: 5;
+     border-width: 3;
+}
+
+QSpinBox::up-button 
+{
+     subcontrol-origin: padding;
+     subcontrol-position: right; /* position at the top right corner */
+     width: 24px;
+     height: 24px;
+     border-width: 3px;
+	 border-image: url(:/files/spindownpng) 1;
+}
+
+QSpinBox::up-arrow {
+     image: url(:/files/add.png);
+     width: 12px;
+     height: 12px;
+ }
+
+
+QSpinBox::down-button 
+{
+     subcontrol-origin: border;
+     subcontrol-position: left;
+     width: 24px;
+     height: 24px;
+     border-width: 3px;
+	 border-image: url(:/files/spindownpng) 1;
+}
+
+QSpinBox::down-arrow {
+     image: url(:/files/remove.png);
+     width: 12px;
+     height: 12px;
+ }
diff --git a/demos/embedded/styledemo/files/nature_1.jpg b/demos/embedded/styledemo/files/nature_1.jpg
new file mode 100644
index 0000000000..3a04edb96a
--- /dev/null
+++ b/demos/embedded/styledemo/files/nature_1.jpg
diff --git a/demos/embedded/styledemo/files/nostyle.qss b/demos/embedded/styledemo/files/nostyle.qss
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/demos/embedded/styledemo/files/nostyle.qss
diff --git a/demos/embedded/styledemo/files/remove.png b/demos/embedded/styledemo/files/remove.png
new file mode 100755
index 0000000000..a0ab1fa21a
--- /dev/null
+++ b/demos/embedded/styledemo/files/remove.png
diff --git a/demos/embedded/styledemo/files/transparent.qss b/demos/embedded/styledemo/files/transparent.qss
new file mode 100644
index 0000000000..e3a991265c
--- /dev/null
+++ b/demos/embedded/styledemo/files/transparent.qss
@@ -0,0 +1,140 @@
+QWidget#StyleWidget
+{
+	background-color: none;
+	background-image: url(:/files/nature_1.jpg);
+}
+
+QLabel, QAbstractButton 
+{
+	font: 13pt;
+	color: beige;
+}
+
+QFrame, QLabel#title {
+    border-width: 2px;
+    padding: 1px;
+    border-style: solid;
+    border-color: black;
+    border-radius: 5px;
+}
+
+QFrame:focus {
+    border-width: 3px;
+    padding: 0px;
+}
+
+
+
+QAbstractButton 
+{
+	background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(173,216,230,60%), stop:1 rgba(0,0,139,60%) );
+	border-color: black;
+	border-style: solid;
+	border-width: 3px;
+	border-radius: 6px;
+}
+
+QAbstractButton:pressed, QAbstractButton:checked
+{
+	background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0,0,139,60%), stop:1 rgba(173,216,230,60%) );
+}
+
+QSpinBox {
+	padding-left: 24px;
+	padding-right: 24px;
+	border-color: darkkhaki;
+	border-style: solid;
+	border-radius: 5;
+	border-width: 3;
+}
+
+QSpinBox::up-button 
+{
+	subcontrol-origin: padding;
+	subcontrol-position: right; /* position at the top right corner */
+	width: 24px;
+	height: 24px;
+	border-width: 3px;
+	
+}
+
+QSpinBox::up-arrow 
+{
+	image: url(:/files/add.png);
+	width: 18px;
+	height: 18px;
+}
+
+
+QSpinBox::down-button 
+{
+	subcontrol-origin: border;
+	subcontrol-position: left;
+	width: 24px;
+	height: 24px;
+	border-width: 3px;
+}
+
+QSpinBox::down-arrow 
+{
+	image: url(:/files/remove.png);
+	width: 18px;
+	height: 18px;
+}
+
+
+QScrollBar:horizontal 
+{
+	border: 1px solid black;
+	background: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0,0,139,60%), stop:1 rgba(173,216,230,60%) );
+	height: 15px;
+	margin: 0px 20px 0 20px;
+}
+
+QScrollBar::handle:horizontal 
+{
+	border: 1px solid black;
+	background: rgba(0,0,139,60%);
+	min-width: 20px;
+}
+
+QScrollBar::add-line:horizontal 
+{
+	border: 1px solid black;
+	background: rgba(0,0,139,60%);
+	width: 20px;
+	subcontrol-position: right;
+	subcontrol-origin: margin;
+}
+
+QScrollBar::sub-line:horizontal 
+{
+	border: 1px solid black;
+	background: rgba(0,0,139,60%);
+	width: 20px;
+	subcontrol-position: left;
+	subcontrol-origin: margin;
+}
+
+QScrollBar:left-arrow:horizontal, QScrollBar::right-arrow:horizontal 
+{
+	border: none;
+	width: 16px;
+	height: 16px;
+}
+
+QScrollBar:left-arrow:horizontal 
+{
+	image: url(:/files/add.png)
+}
+
+QScrollBar::right-arrow:horizontal 
+{
+	image: url(:/files/remove.png)
+}
+
+QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal 
+{
+	background: none;
+}
+
diff --git a/demos/embedded/styledemo/main.cpp b/demos/embedded/styledemo/main.cpp
new file mode 100644
index 0000000000..6a7472ebe8
--- /dev/null
+++ b/demos/embedded/styledemo/main.cpp
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QApplication>
+
+#include "stylewidget.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Q_INIT_RESOURCE(styledemo);
+
+    app.setApplicationName("style");
+    app.setOrganizationName("Trolltech");
+    app.setOrganizationDomain("com.trolltech");
+
+    StyleWidget widget;
+    widget.showFullScreen();
+
+    return app.exec();
+}
+
diff --git a/demos/embedded/styledemo/styledemo.pro b/demos/embedded/styledemo/styledemo.pro
new file mode 100644
index 0000000000..ee5e4d6cc2
--- /dev/null
+++ b/demos/embedded/styledemo/styledemo.pro
@@ -0,0 +1,12 @@
+TEMPLATE = app
+
+# Input
+HEADERS += stylewidget.h
+FORMS += stylewidget.ui
+SOURCES += main.cpp stylewidget.cpp
+RESOURCES += styledemo.qrc
+
+target.path = $$[QT_INSTALL_DEMOS]/embedded/styledemo
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.html
+sources.path = $$[QT_INSTALL_DEMOS]/embedded/styledemo
+INSTALLS += target sources
diff --git a/demos/embedded/styledemo/styledemo.qrc b/demos/embedded/styledemo/styledemo.qrc
new file mode 100644
index 0000000000..96237d4203
--- /dev/null
+++ b/demos/embedded/styledemo/styledemo.qrc
@@ -0,0 +1,13 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+    <file>files/add.png</file>
+    <file>files/blue.qss</file>
+    <file>files/khaki.qss</file>
+    <file>files/nostyle.qss</file>
+    <file>files/transparent.qss</file>
+    <file>files/application.qss</file>
+    <file>files/nature_1.jpg</file>
+    <file>files/remove.png</file>
+</qresource>
+</RCC>
+
diff --git a/demos/embedded/styledemo/stylewidget.cpp b/demos/embedded/styledemo/stylewidget.cpp
new file mode 100644
index 0000000000..304dd36604
--- /dev/null
+++ b/demos/embedded/styledemo/stylewidget.cpp
@@ -0,0 +1,112 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QApplication>
+#include <QString>
+#include <QFile>
+
+#include "stylewidget.h"
+
+
+
+StyleWidget::StyleWidget(QWidget *parent)
+ : QFrame(parent)
+{
+	m_ui.setupUi(this);
+}
+
+
+void StyleWidget::on_close_clicked()
+{
+    close();
+}
+
+void StyleWidget::on_blueStyle_clicked()
+{
+    QFile styleSheet(":/files/blue.qss");
+
+    if (!styleSheet.open(QIODevice::ReadOnly)) {
+        qWarning("Unable to open :/files/blue.qss");
+        return;
+    }
+
+    qApp->setStyleSheet(styleSheet.readAll());
+}
+
+void StyleWidget::on_khakiStyle_clicked()
+{
+    QFile styleSheet(":/files/khaki.qss");
+
+    if (!styleSheet.open(QIODevice::ReadOnly)) {
+        qWarning("Unable to open :/files/khaki.qss");
+        return;
+    }
+
+    qApp->setStyleSheet(styleSheet.readAll());
+}
+
+
+void StyleWidget::on_noStyle_clicked()
+{
+    QFile styleSheet(":/files/nostyle.qss");
+
+    if (!styleSheet.open(QIODevice::ReadOnly)) {
+        qWarning("Unable to open :/files/nostyle.qss");
+        return;
+    }
+
+    qApp->setStyleSheet(styleSheet.readAll());
+}
+
+
+void StyleWidget::on_transparentStyle_clicked()
+{
+    QFile styleSheet(":/files/transparent.qss");
+
+    if (!styleSheet.open(QIODevice::ReadOnly)) {
+        qWarning("Unable to open :/files/transparent.qss");
+        return;
+    }
+
+    qApp->setStyleSheet(styleSheet.readAll());
+}
+
+
+
diff --git a/demos/embedded/styledemo/stylewidget.h b/demos/embedded/styledemo/stylewidget.h
new file mode 100644
index 0000000000..5ccb418b51
--- /dev/null
+++ b/demos/embedded/styledemo/stylewidget.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef STYLEWIDGET_H
+#define STYLEWIDGET_H
+
+#include <QFrame>
+
+#include "ui_stylewidget.h"
+
+class StyleWidget : public QFrame
+{
+    Q_OBJECT
+public:
+    StyleWidget(QWidget *parent = 0);
+
+private:
+    Ui_StyleWidget m_ui;
+
+private slots:
+    void on_close_clicked();
+    void on_blueStyle_clicked();
+    void on_khakiStyle_clicked();
+    void on_noStyle_clicked();
+    void on_transparentStyle_clicked();
+};
+
+#endif
diff --git a/demos/embedded/styledemo/stylewidget.ui b/demos/embedded/styledemo/stylewidget.ui
new file mode 100644
index 0000000000..586faeac42
--- /dev/null
+++ b/demos/embedded/styledemo/stylewidget.ui
@@ -0,0 +1,429 @@
+<ui version="4.0" >
+ <class>StyleWidget</class>
+ <widget class="QWidget" name="StyleWidget" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>339</width>
+    <height>230</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" >
+   <property name="margin" >
+    <number>3</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string>Styles</string>
+     </property>
+     <layout class="QHBoxLayout" >
+      <property name="spacing" >
+       <number>3</number>
+      </property>
+      <property name="margin" >
+       <number>3</number>
+      </property>
+      <item>
+       <widget class="QPushButton" name="noStyle" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="focusPolicy" >
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="text" >
+         <string>No-Style</string>
+        </property>
+        <property name="checkable" >
+         <bool>true</bool>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+        <property name="autoExclusive" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="blueStyle" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="focusPolicy" >
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="text" >
+         <string>Blue</string>
+        </property>
+        <property name="checkable" >
+         <bool>true</bool>
+        </property>
+        <property name="checked" >
+         <bool>false</bool>
+        </property>
+        <property name="autoExclusive" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="khakiStyle" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="focusPolicy" >
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="text" >
+         <string>Khaki</string>
+        </property>
+        <property name="checkable" >
+         <bool>true</bool>
+        </property>
+        <property name="checked" >
+         <bool>false</bool>
+        </property>
+        <property name="autoExclusive" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="transparentStyle" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="focusPolicy" >
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="text" >
+         <string>Transparent</string>
+        </property>
+        <property name="checkable" >
+         <bool>true</bool>
+        </property>
+        <property name="checked" >
+         <bool>false</bool>
+        </property>
+        <property name="autoExclusive" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer_3" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QFrame" name="frame" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="MinimumExpanding" hsizetype="Expanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="frameShape" >
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow" >
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QVBoxLayout" name="frameLayout" >
+      <property name="margin" >
+       <number>3</number>
+      </property>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout" >
+        <item>
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string>My Value is:</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="spinBox" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="focusPolicy" >
+           <enum>Qt::NoFocus</enum>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+          </property>
+          <property name="keyboardTracking" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QGridLayout" name="gridLayout" >
+        <item row="0" column="0" >
+         <widget class="QScrollBar" name="horizontalScrollBar" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize" >
+           <size>
+            <width>0</width>
+            <height>24</height>
+           </size>
+          </property>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0" >
+         <widget class="QPushButton" name="pushButton_2" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="focusPolicy" >
+           <enum>Qt::NoFocus</enum>
+          </property>
+          <property name="text" >
+           <string>Show Scroller</string>
+          </property>
+          <property name="checkable" >
+           <bool>true</bool>
+          </property>
+          <property name="checked" >
+           <bool>true</bool>
+          </property>
+          <property name="flat" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1" >
+         <widget class="QScrollBar" name="horizontalScrollBar_2" >
+          <property name="minimumSize" >
+           <size>
+            <width>0</width>
+            <height>24</height>
+           </size>
+          </property>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1" >
+         <widget class="QPushButton" name="pushButton" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="focusPolicy" >
+           <enum>Qt::NoFocus</enum>
+          </property>
+          <property name="text" >
+           <string>Enable Scroller</string>
+          </property>
+          <property name="checkable" >
+           <bool>true</bool>
+          </property>
+          <property name="checked" >
+           <bool>true</bool>
+          </property>
+          <property name="flat" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="close" >
+       <property name="focusPolicy" >
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text" >
+        <string>Close</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="StyleDemo.qrc" />
+ </resources>
+ <connections>
+  <connection>
+   <sender>horizontalScrollBar</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>horizontalScrollBar_2</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>134</x>
+     <y>196</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>523</x>
+     <y>193</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>horizontalScrollBar_2</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>horizontalScrollBar</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>577</x>
+     <y>199</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>127</x>
+     <y>207</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>pushButton</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>horizontalScrollBar_2</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>566</x>
+     <y>241</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>492</x>
+     <y>207</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>pushButton_2</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>horizontalScrollBar</receiver>
+   <slot>setVisible(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>123</x>
+     <y>239</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>123</x>
+     <y>184</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>spinBox</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>horizontalScrollBar_2</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>603</x>
+     <y>136</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>575</x>
+     <y>199</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/demos/embeddeddialogs/No-Ones-Laughing-3.jpg b/demos/embeddeddialogs/No-Ones-Laughing-3.jpg
new file mode 100644
index 0000000000..445567fbda
--- /dev/null
+++ b/demos/embeddeddialogs/No-Ones-Laughing-3.jpg
diff --git a/demos/embeddeddialogs/customproxy.cpp b/demos/embeddeddialogs/customproxy.cpp
new file mode 100644
index 0000000000..56a0548ba8
--- /dev/null
+++ b/demos/embeddeddialogs/customproxy.cpp
@@ -0,0 +1,156 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "customproxy.h"
+
+#include <QtGui>
+
+CustomProxy::CustomProxy(QGraphicsItem *parent, Qt::WindowFlags wFlags)
+    : QGraphicsProxyWidget(parent, wFlags), popupShown(false)
+{
+    timeLine = new QTimeLine(250, this);
+    connect(timeLine, SIGNAL(valueChanged(qreal)),
+            this, SLOT(updateStep(qreal)));
+    connect(timeLine, SIGNAL(stateChanged(QTimeLine::State)),
+            this, SLOT(stateChanged(QTimeLine::State)));
+}
+
+QRectF CustomProxy::boundingRect() const
+{
+    return QGraphicsProxyWidget::boundingRect().adjusted(0, 0, 10, 10);
+}
+
+void CustomProxy::paintWindowFrame(QPainter *painter, const QStyleOptionGraphicsItem *option,
+                                   QWidget *widget)
+{
+    const QColor color(0, 0, 0, 64);
+   
+    QRectF r = windowFrameRect();
+    QRectF right(r.right(), r.top() + 10, 10, r.height() - 10);
+    QRectF bottom(r.left() + 10, r.bottom(), r.width(), 10);
+    bool intersectsRight = right.intersects(option->exposedRect);
+    bool intersectsBottom = bottom.intersects(option->exposedRect);
+    if (intersectsRight && intersectsBottom) {
+        QPainterPath path;
+        path.addRect(right);
+        path.addRect(bottom);
+        painter->setPen(Qt::NoPen);
+        painter->setBrush(color);
+        painter->drawPath(path);
+    } else if (intersectsBottom) {
+        painter->fillRect(bottom, color);
+    } else if (intersectsRight) {
+        painter->fillRect(right, color);
+    }
+
+    QGraphicsProxyWidget::paintWindowFrame(painter, option, widget);
+}
+
+void CustomProxy::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
+{
+    QGraphicsProxyWidget::hoverEnterEvent(event);
+    scene()->setActiveWindow(this);
+    if (timeLine->currentValue() != 1)
+        zoomIn();
+}
+
+void CustomProxy::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
+{
+    QGraphicsProxyWidget::hoverLeaveEvent(event);
+    if (!popupShown && (timeLine->direction() != QTimeLine::Backward || timeLine->currentValue() != 0))
+        zoomOut();
+}
+
+bool CustomProxy::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
+{
+    if (watched->isWindow() && (event->type() == QEvent::UngrabMouse || event->type() == QEvent::GrabMouse)) {
+        popupShown = watched->isVisible();
+        if (!popupShown && !isUnderMouse())
+            zoomOut();
+    }
+    return QGraphicsProxyWidget::sceneEventFilter(watched, event);
+}
+
+QVariant CustomProxy::itemChange(GraphicsItemChange change, const QVariant &value)
+{
+    if (change == ItemChildRemovedChange)
+        removeSceneEventFilter(this);
+    return QGraphicsProxyWidget::itemChange(change, value);
+}
+
+void CustomProxy::updateStep(qreal step)
+{
+    QRectF r = boundingRect();
+    setTransform(QTransform()
+                 .translate(r.width() / 2, r.height() / 2)
+                 .rotate(step * 30, Qt::XAxis)
+                 .rotate(step * 10, Qt::YAxis)
+                 .rotate(step * 5, Qt::ZAxis)
+                 .scale(1 + 1.5 * step, 1 + 1.5 * step)
+                 .translate(-r.width() / 2, -r.height() / 2));
+}
+
+void CustomProxy::stateChanged(QTimeLine::State state)
+{
+    if (state == QTimeLine::Running) {
+	if (timeLine->direction() == QTimeLine::Forward)
+            setCacheMode(ItemCoordinateCache);
+    } else if (state == QTimeLine::NotRunning) {
+	if (timeLine->direction() == QTimeLine::Backward)
+            setCacheMode(DeviceCoordinateCache);
+    }
+}
+
+void CustomProxy::zoomIn()
+{
+    if (timeLine->direction() != QTimeLine::Forward)
+        timeLine->setDirection(QTimeLine::Forward);
+    if (timeLine->state() == QTimeLine::NotRunning) 
+        timeLine->start();
+}
+
+void CustomProxy::zoomOut()
+{
+    if (timeLine->direction() != QTimeLine::Backward)
+        timeLine->setDirection(QTimeLine::Backward);
+    if (timeLine->state() == QTimeLine::NotRunning) 
+        timeLine->start();
+}
diff --git a/demos/embeddeddialogs/customproxy.h b/demos/embeddeddialogs/customproxy.h
new file mode 100644
index 0000000000..0a5fbaf3ed
--- /dev/null
+++ b/demos/embeddeddialogs/customproxy.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CUSTOMPROXY_H
+#define CUSTOMPROXY_H
+
+#include <QtCore/qtimeline.h>
+#include <QtGui/qgraphicsproxywidget.h>
+
+class CustomProxy : public QGraphicsProxyWidget
+{
+    Q_OBJECT
+public:
+    CustomProxy(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
+
+    QRectF boundingRect() const;
+    void paintWindowFrame(QPainter *painter, const QStyleOptionGraphicsItem *option,
+                          QWidget *widget);                          
+
+protected:
+    void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+    void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+    bool sceneEventFilter(QGraphicsItem *watched, QEvent *event);
+    QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+
+private slots:
+    void updateStep(qreal step);
+    void stateChanged(QTimeLine::State);
+    void zoomIn();
+    void zoomOut();
+
+private:
+    QTimeLine *timeLine;
+    bool popupShown;
+};
+
+#endif
diff --git a/demos/embeddeddialogs/embeddeddialog.cpp b/demos/embeddeddialogs/embeddeddialog.cpp
new file mode 100644
index 0000000000..40f361ce9c
--- /dev/null
+++ b/demos/embeddeddialogs/embeddeddialog.cpp
@@ -0,0 +1,106 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "embeddeddialog.h"
+#include "ui_embeddeddialog.h"
+
+#include <QtGui>
+
+EmbeddedDialog::EmbeddedDialog(QWidget *parent)
+    : QDialog(parent)
+{
+    ui = new Ui_embeddedDialog;
+    ui->setupUi(this);
+    ui->layoutDirection->setCurrentIndex(layoutDirection() != Qt::LeftToRight);
+
+    foreach (QString styleName, QStyleFactory::keys()) {
+        ui->style->addItem(styleName);
+        if (style()->objectName().toLower() == styleName.toLower())
+            ui->style->setCurrentIndex(ui->style->count() - 1);
+    }
+
+    connect(ui->layoutDirection, SIGNAL(activated(int)),
+            this, SLOT(layoutDirectionChanged(int)));
+    connect(ui->spacing, SIGNAL(valueChanged(int)),
+            this, SLOT(spacingChanged(int)));
+    connect(ui->fontComboBox, SIGNAL(currentFontChanged(const QFont &)),
+            this, SLOT(fontChanged(const QFont &)));
+    connect(ui->style, SIGNAL(activated(QString)),
+            this, SLOT(styleChanged(QString)));
+}
+
+EmbeddedDialog::~EmbeddedDialog()
+{
+    delete ui;
+}
+
+void EmbeddedDialog::layoutDirectionChanged(int index)
+{
+    setLayoutDirection(index == 0 ? Qt::LeftToRight : Qt::RightToLeft);
+}
+
+void EmbeddedDialog::spacingChanged(int spacing)
+{
+    layout()->setSpacing(spacing);
+    adjustSize();
+}
+
+void EmbeddedDialog::fontChanged(const QFont &font)
+{
+    setFont(font);
+}
+
+static void setStyleHelper(QWidget *widget, QStyle *style)
+{
+    widget->setStyle(style);
+    widget->setPalette(style->standardPalette());
+    foreach (QObject *child, widget->children()) {
+        if (QWidget *childWidget = qobject_cast<QWidget *>(child))
+            setStyleHelper(childWidget, style);
+    }
+}
+
+void EmbeddedDialog::styleChanged(const QString &styleName)
+{
+    QStyle *style = QStyleFactory::create(styleName);
+    if (style)
+        setStyleHelper(this, style);
+}
diff --git a/demos/embeddeddialogs/embeddeddialog.h b/demos/embeddeddialogs/embeddeddialog.h
new file mode 100644
index 0000000000..787196c499
--- /dev/null
+++ b/demos/embeddeddialogs/embeddeddialog.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef EMBEDDEDDIALOG_H
+#define EMBEDDEDDIALOG_H
+
+#include <QtGui/qdialog.h>
+
+QT_FORWARD_DECLARE_CLASS(Ui_embeddedDialog);
+
+class EmbeddedDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    EmbeddedDialog(QWidget *parent = 0);
+    ~EmbeddedDialog();
+
+private slots:
+    void layoutDirectionChanged(int index);
+    void spacingChanged(int spacing);
+    void fontChanged(const QFont &font);
+    void styleChanged(const QString &styleName);
+
+private:
+    Ui_embeddedDialog *ui;
+};
+
+#endif
diff --git a/demos/embeddeddialogs/embeddeddialog.ui b/demos/embeddeddialogs/embeddeddialog.ui
new file mode 100644
index 0000000000..f967b10085
--- /dev/null
+++ b/demos/embeddeddialogs/embeddeddialog.ui
@@ -0,0 +1,87 @@
+<ui version="4.0" >
+ <class>embeddedDialog</class>
+ <widget class="QDialog" name="embeddedDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>407</width>
+    <height>134</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Embedded Dialog</string>
+  </property>
+  <layout class="QFormLayout" name="formLayout" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Layout Direction:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>layoutDirection</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QComboBox" name="layoutDirection" >
+     <item>
+      <property name="text" >
+       <string>Left to Right</string>
+      </property>
+     </item>
+     <item>
+      <property name="text" >
+       <string>Right to Left</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="label_2" >
+     <property name="text" >
+      <string>Select Font:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>fontComboBox</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QFontComboBox" name="fontComboBox" />
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="label_3" >
+     <property name="text" >
+      <string>Style:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>style</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QComboBox" name="style" />
+   </item>
+   <item row="3" column="0" >
+    <widget class="QLabel" name="label_4" >
+     <property name="text" >
+      <string>Layout spacing:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>spacing</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" >
+    <widget class="QSlider" name="spacing" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/demos/embeddeddialogs/embeddeddialogs.pro b/demos/embeddeddialogs/embeddeddialogs.pro
new file mode 100644
index 0000000000..a38e3e8f9f
--- /dev/null
+++ b/demos/embeddeddialogs/embeddeddialogs.pro
@@ -0,0 +1,17 @@
+SOURCES += main.cpp
+SOURCES += customproxy.cpp embeddeddialog.cpp
+HEADERS += customproxy.h embeddeddialog.h
+
+FORMS += embeddeddialog.ui
+RESOURCES += embeddeddialogs.qrc
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/embeddeddialogs
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.png *.jpg *.plist *.icns *.ico *.rc *.pro *.html *.doc images
+sources.path = $$[QT_INSTALL_DEMOS]/embeddeddialogs
+INSTALLS += target sources
diff --git a/demos/embeddeddialogs/embeddeddialogs.qrc b/demos/embeddeddialogs/embeddeddialogs.qrc
new file mode 100644
index 0000000000..33be5038da
--- /dev/null
+++ b/demos/embeddeddialogs/embeddeddialogs.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource>
+        <file>No-Ones-Laughing-3.jpg</file>
+    </qresource>
+</RCC>
diff --git a/demos/embeddeddialogs/main.cpp b/demos/embeddeddialogs/main.cpp
new file mode 100644
index 0000000000..4cf73258ac
--- /dev/null
+++ b/demos/embeddeddialogs/main.cpp
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "customproxy.h"
+#include "embeddeddialog.h"
+
+#include <QtGui>
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(embeddeddialogs);
+    QApplication app(argc, argv);
+
+    QGraphicsScene scene;
+    scene.setStickyFocus(true);
+#ifndef Q_OS_WINCE
+    const int gridSize = 10;
+#else
+    const int gridSize = 5;
+#endif
+
+    for (int y = 0; y < gridSize; ++y) {
+        for (int x = 0; x < gridSize; ++x) {
+            CustomProxy *proxy = new CustomProxy(0, Qt::Window);
+            proxy->setWidget(new EmbeddedDialog);
+
+            QRectF rect = proxy->boundingRect();
+
+            proxy->setPos(x * rect.width() * 1.05, y * rect.height() * 1.05);
+            proxy->setCacheMode(QGraphicsItem::DeviceCoordinateCache);
+
+            scene.addItem(proxy);
+            proxy->installSceneEventFilter(proxy);
+        }
+    }
+    scene.setSceneRect(scene.itemsBoundingRect());
+
+    QGraphicsView view(&scene);
+    view.scale(0.5, 0.5);
+    view.setRenderHints(view.renderHints() | QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+    view.setBackgroundBrush(QPixmap(":/No-Ones-Laughing-3.jpg"));
+    view.setCacheMode(QGraphicsView::CacheBackground);
+    view.setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
+    view.show();
+    view.setWindowTitle("Embedded Dialogs Demo");
+    return app.exec();
+}
diff --git a/demos/gradients/gradients.cpp b/demos/gradients/gradients.cpp
new file mode 100644
index 0000000000..6256ba9444
--- /dev/null
+++ b/demos/gradients/gradients.cpp
@@ -0,0 +1,516 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "gradients.h"
+#include "hoverpoints.h"
+
+ShadeWidget::ShadeWidget(ShadeType type, QWidget *parent)
+    : QWidget(parent), m_shade_type(type), m_alpha_gradient(QLinearGradient(0, 0, 0, 0))
+{
+
+    // Checkers background
+    if (m_shade_type == ARGBShade) {
+        QPixmap pm(20, 20);
+        QPainter pmp(&pm);
+        pmp.fillRect(0, 0, 10, 10, Qt::lightGray);
+        pmp.fillRect(10, 10, 10, 10, Qt::lightGray);
+        pmp.fillRect(0, 10, 10, 10, Qt::darkGray);
+        pmp.fillRect(10, 0, 10, 10, Qt::darkGray);
+        pmp.end();
+        QPalette pal = palette();
+        pal.setBrush(backgroundRole(), QBrush(pm));
+        setAutoFillBackground(true);
+        setPalette(pal);
+
+    } else {
+        setAttribute(Qt::WA_NoBackground);
+
+    }
+
+    QPolygonF points;
+    points << QPointF(0, sizeHint().height())
+           << QPointF(sizeHint().width(), 0);
+
+    m_hoverPoints = new HoverPoints(this, HoverPoints::CircleShape);
+//     m_hoverPoints->setConnectionType(HoverPoints::LineConnection);
+    m_hoverPoints->setPoints(points);
+    m_hoverPoints->setPointLock(0, HoverPoints::LockToLeft);
+    m_hoverPoints->setPointLock(1, HoverPoints::LockToRight);
+    m_hoverPoints->setSortType(HoverPoints::XSort);
+
+    setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+
+    connect(m_hoverPoints, SIGNAL(pointsChanged(const QPolygonF &)), this, SIGNAL(colorsChanged()));
+}
+
+
+QPolygonF ShadeWidget::points() const
+{
+    return m_hoverPoints->points();
+}
+
+
+uint ShadeWidget::colorAt(int x)
+{
+    generateShade();
+
+    QPolygonF pts = m_hoverPoints->points();
+    for (int i=1; i < pts.size(); ++i) {
+        if (pts.at(i-1).x() <= x && pts.at(i).x() >= x) {
+            QLineF l(pts.at(i-1), pts.at(i));
+            l.setLength(l.length() * ((x - l.x1()) / l.dx()));
+            return m_shade.pixel(qRound(qMin(l.x2(), (qreal(m_shade.width() - 1)))),
+                                 qRound(qMin(l.y2(), qreal(m_shade.height() - 1))));
+        }
+    }
+    return 0;
+}
+
+
+void ShadeWidget::setGradientStops(const QGradientStops &stops)
+{
+    if (m_shade_type == ARGBShade) {
+        m_alpha_gradient = QLinearGradient(0, 0, width(), 0);
+
+        for (int i=0; i<stops.size(); ++i) {
+            QColor c = stops.at(i).second;
+            m_alpha_gradient.setColorAt(stops.at(i).first, QColor(c.red(), c.green(), c.blue()));
+        }
+
+        m_shade = QImage();
+        generateShade();
+        update();
+    }
+}
+
+
+void ShadeWidget::paintEvent(QPaintEvent *)
+{
+    generateShade();
+
+    QPainter p(this);
+    p.drawImage(0, 0, m_shade);
+
+    p.setPen(QColor(146, 146, 146));
+    p.drawRect(0, 0, width() - 1, height() - 1);
+}
+
+
+void ShadeWidget::generateShade()
+{
+    if (m_shade.isNull() || m_shade.size() != size()) {
+
+        if (m_shade_type == ARGBShade) {
+            m_shade = QImage(size(), QImage::Format_ARGB32_Premultiplied);
+            m_shade.fill(0);
+
+            QPainter p(&m_shade);
+            p.fillRect(rect(), m_alpha_gradient);
+
+            p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+            QLinearGradient fade(0, 0, 0, height());
+            fade.setColorAt(0, QColor(0, 0, 0, 255));
+            fade.setColorAt(1, QColor(0, 0, 0, 0));
+            p.fillRect(rect(), fade);
+
+        } else {
+            m_shade = QImage(size(), QImage::Format_RGB32);
+            QLinearGradient shade(0, 0, 0, height());
+            shade.setColorAt(1, Qt::black);
+
+            if (m_shade_type == RedShade)
+                shade.setColorAt(0, Qt::red);
+            else if (m_shade_type == GreenShade)
+                shade.setColorAt(0, Qt::green);
+            else
+                shade.setColorAt(0, Qt::blue);
+
+            QPainter p(&m_shade);
+            p.fillRect(rect(), shade);
+        }
+    }
+
+
+}
+
+
+GradientEditor::GradientEditor(QWidget *parent)
+    : QWidget(parent)
+{
+    QVBoxLayout *vbox = new QVBoxLayout(this);
+    vbox->setSpacing(1);
+    vbox->setMargin(1);
+
+    m_red_shade = new ShadeWidget(ShadeWidget::RedShade, this);
+    m_green_shade = new ShadeWidget(ShadeWidget::GreenShade, this);
+    m_blue_shade = new ShadeWidget(ShadeWidget::BlueShade, this);
+    m_alpha_shade = new ShadeWidget(ShadeWidget::ARGBShade, this);
+
+    vbox->addWidget(m_red_shade);
+    vbox->addWidget(m_green_shade);
+    vbox->addWidget(m_blue_shade);
+    vbox->addWidget(m_alpha_shade);
+
+    connect(m_red_shade, SIGNAL(colorsChanged()), this, SLOT(pointsUpdated()));
+    connect(m_green_shade, SIGNAL(colorsChanged()), this, SLOT(pointsUpdated()));
+    connect(m_blue_shade, SIGNAL(colorsChanged()), this, SLOT(pointsUpdated()));
+    connect(m_alpha_shade, SIGNAL(colorsChanged()), this, SLOT(pointsUpdated()));
+}
+
+
+inline static bool x_less_than(const QPointF &p1, const QPointF &p2)
+{
+    return p1.x() < p2.x();
+}
+
+
+void GradientEditor::pointsUpdated()
+{
+    qreal w = m_alpha_shade->width();
+
+    QGradientStops stops;
+
+    QPolygonF points;
+
+    points += m_red_shade->points();
+    points += m_green_shade->points();
+    points += m_blue_shade->points();
+    points += m_alpha_shade->points();
+
+    qSort(points.begin(), points.end(), x_less_than);
+
+    for (int i=0; i<points.size(); ++i) {
+        qreal x = int(points.at(i).x());
+        if (i < points.size() - 1 && x == points.at(i+1).x())
+            continue;
+        QColor color((0x00ff0000 & m_red_shade->colorAt(int(x))) >> 16,
+                     (0x0000ff00 & m_green_shade->colorAt(int(x))) >> 8,
+                     (0x000000ff & m_blue_shade->colorAt(int(x))),
+                     (0xff000000 & m_alpha_shade->colorAt(int(x))) >> 24);
+
+        if (x / w > 1)
+            return;
+
+        stops << QGradientStop(x / w, color);
+    }
+
+    m_alpha_shade->setGradientStops(stops);
+
+    emit gradientStopsChanged(stops);
+}
+
+
+static void set_shade_points(const QPolygonF &points, ShadeWidget *shade)
+{
+    shade->hoverPoints()->setPoints(points);
+    shade->hoverPoints()->setPointLock(0, HoverPoints::LockToLeft);
+    shade->hoverPoints()->setPointLock(points.size() - 1, HoverPoints::LockToRight);
+    shade->update();
+}
+
+void GradientEditor::setGradientStops(const QGradientStops &stops)
+{
+    QPolygonF pts_red, pts_green, pts_blue, pts_alpha;
+
+    qreal h_red = m_red_shade->height();
+    qreal h_green = m_green_shade->height();
+    qreal h_blue = m_blue_shade->height();
+    qreal h_alpha = m_alpha_shade->height();
+
+    for (int i=0; i<stops.size(); ++i) {
+        qreal pos = stops.at(i).first;
+        QRgb color = stops.at(i).second.rgba();
+        pts_red << QPointF(pos * m_red_shade->width(), h_red - qRed(color) * h_red / 255);
+        pts_green << QPointF(pos * m_green_shade->width(), h_green - qGreen(color) * h_green / 255);
+        pts_blue << QPointF(pos * m_blue_shade->width(), h_blue - qBlue(color) * h_blue / 255);
+        pts_alpha << QPointF(pos * m_alpha_shade->width(), h_alpha - qAlpha(color) * h_alpha / 255);
+    }
+
+    set_shade_points(pts_red, m_red_shade);
+    set_shade_points(pts_green, m_green_shade);
+    set_shade_points(pts_blue, m_blue_shade);
+    set_shade_points(pts_alpha, m_alpha_shade);
+
+}
+
+GradientWidget::GradientWidget(QWidget *parent)
+    : QWidget(parent)
+{
+    setWindowTitle(tr("Gradients"));
+
+    m_renderer = new GradientRenderer(this);
+
+    QGroupBox *mainGroup = new QGroupBox(this);
+    mainGroup->setTitle(tr("Gradients"));
+
+    QGroupBox *editorGroup = new QGroupBox(mainGroup);
+    editorGroup->setTitle(tr("Color Editor"));
+    m_editor = new GradientEditor(editorGroup);
+
+    QGroupBox *typeGroup = new QGroupBox(mainGroup);
+    typeGroup->setTitle(tr("Gradient Type"));
+    m_linearButton = new QRadioButton(tr("Linear Gradient"), typeGroup);
+    m_radialButton = new QRadioButton(tr("Radial Gradient"), typeGroup);
+    m_conicalButton = new QRadioButton(tr("Conical Gradient"), typeGroup);
+
+    QGroupBox *spreadGroup = new QGroupBox(mainGroup);
+    spreadGroup->setTitle(tr("Spread Method"));
+    m_padSpreadButton = new QRadioButton(tr("Pad Spread"), spreadGroup);
+    m_reflectSpreadButton = new QRadioButton(tr("Reflect Spread"), spreadGroup);
+    m_repeatSpreadButton = new QRadioButton(tr("Repeat Spread"), spreadGroup);
+
+    QGroupBox *defaultsGroup = new QGroupBox(mainGroup);
+    defaultsGroup->setTitle(tr("Defaults"));
+    QPushButton *default1Button = new QPushButton(tr("1"), defaultsGroup);
+    QPushButton *default2Button = new QPushButton(tr("2"), defaultsGroup);
+    QPushButton *default3Button = new QPushButton(tr("3"), defaultsGroup);
+    QPushButton *default4Button = new QPushButton(tr("Reset"), editorGroup);
+
+    QPushButton *showSourceButton = new QPushButton(mainGroup);
+    showSourceButton->setText(tr("Show Source"));
+#ifdef QT_OPENGL_SUPPORT
+    QPushButton *enableOpenGLButton = new QPushButton(mainGroup);
+    enableOpenGLButton->setText(tr("Use OpenGL"));
+    enableOpenGLButton->setCheckable(true);
+    enableOpenGLButton->setChecked(m_renderer->usesOpenGL());
+    if (!QGLFormat::hasOpenGL())
+        enableOpenGLButton->hide();
+#endif
+    QPushButton *whatsThisButton = new QPushButton(mainGroup);
+    whatsThisButton->setText(tr("What's This?"));
+    whatsThisButton->setCheckable(true);
+
+    // Layouts
+    QHBoxLayout *mainLayout = new QHBoxLayout(this);
+    mainLayout->addWidget(m_renderer);
+    mainLayout->addWidget(mainGroup);
+
+    mainGroup->setFixedWidth(180);
+    QVBoxLayout *mainGroupLayout = new QVBoxLayout(mainGroup);
+    mainGroupLayout->addWidget(editorGroup);
+    mainGroupLayout->addWidget(typeGroup);
+    mainGroupLayout->addWidget(spreadGroup);
+    mainGroupLayout->addWidget(defaultsGroup);
+    mainGroupLayout->addStretch(1);
+    mainGroupLayout->addWidget(showSourceButton);
+#ifdef QT_OPENGL_SUPPORT
+    mainGroupLayout->addWidget(enableOpenGLButton);
+#endif
+    mainGroupLayout->addWidget(whatsThisButton);
+
+    QVBoxLayout *editorGroupLayout = new QVBoxLayout(editorGroup);
+    editorGroupLayout->addWidget(m_editor);
+
+    QVBoxLayout *typeGroupLayout = new QVBoxLayout(typeGroup);
+    typeGroupLayout->addWidget(m_linearButton);
+    typeGroupLayout->addWidget(m_radialButton);
+    typeGroupLayout->addWidget(m_conicalButton);
+
+    QVBoxLayout *spreadGroupLayout = new QVBoxLayout(spreadGroup);
+    spreadGroupLayout->addWidget(m_padSpreadButton);
+    spreadGroupLayout->addWidget(m_repeatSpreadButton);
+    spreadGroupLayout->addWidget(m_reflectSpreadButton);
+
+    QHBoxLayout *defaultsGroupLayout = new QHBoxLayout(defaultsGroup);
+    defaultsGroupLayout->addWidget(default1Button);
+    defaultsGroupLayout->addWidget(default2Button);
+    defaultsGroupLayout->addWidget(default3Button);
+    editorGroupLayout->addWidget(default4Button);
+
+    connect(m_editor, SIGNAL(gradientStopsChanged(const QGradientStops &)),
+            m_renderer, SLOT(setGradientStops(const QGradientStops &)));
+
+    connect(m_linearButton, SIGNAL(clicked()), m_renderer, SLOT(setLinearGradient()));
+    connect(m_radialButton, SIGNAL(clicked()), m_renderer, SLOT(setRadialGradient()));
+    connect(m_conicalButton, SIGNAL(clicked()), m_renderer, SLOT(setConicalGradient()));
+
+    connect(m_padSpreadButton, SIGNAL(clicked()), m_renderer, SLOT(setPadSpread()));
+    connect(m_reflectSpreadButton, SIGNAL(clicked()), m_renderer, SLOT(setReflectSpread()));
+    connect(m_repeatSpreadButton, SIGNAL(clicked()), m_renderer, SLOT(setRepeatSpread()));
+
+    connect(default1Button, SIGNAL(clicked()), this, SLOT(setDefault1()));
+    connect(default2Button, SIGNAL(clicked()), this, SLOT(setDefault2()));
+    connect(default3Button, SIGNAL(clicked()), this, SLOT(setDefault3()));
+    connect(default4Button, SIGNAL(clicked()), this, SLOT(setDefault4()));
+
+    connect(showSourceButton, SIGNAL(clicked()), m_renderer, SLOT(showSource()));
+#ifdef QT_OPENGL_SUPPORT
+    connect(enableOpenGLButton, SIGNAL(clicked(bool)), m_renderer, SLOT(enableOpenGL(bool)));
+#endif    
+    connect(whatsThisButton, SIGNAL(clicked(bool)), m_renderer, SLOT(setDescriptionEnabled(bool)));
+    connect(whatsThisButton, SIGNAL(clicked(bool)),
+            m_renderer->hoverPoints(), SLOT(setDisabled(bool)));
+    connect(m_renderer, SIGNAL(descriptionEnabledChanged(bool)),
+            whatsThisButton, SLOT(setChecked(bool)));
+    connect(m_renderer, SIGNAL(descriptionEnabledChanged(bool)),
+            m_renderer->hoverPoints(), SLOT(setDisabled(bool)));
+
+    m_renderer->loadSourceFile(":res/gradients/gradients.cpp");
+    m_renderer->loadDescription(":res/gradients/gradients.html");
+
+    QTimer::singleShot(50, this, SLOT(setDefault1()));
+}
+
+void GradientWidget::setDefault(int config)
+{
+    QGradientStops stops;
+    QPolygonF points;
+    switch (config) {
+    case 1:
+        stops << QGradientStop(0.00, QColor::fromRgba(0));
+        stops << QGradientStop(0.04, QColor::fromRgba(0xff131360));
+        stops << QGradientStop(0.08, QColor::fromRgba(0xff202ccc));
+        stops << QGradientStop(0.42, QColor::fromRgba(0xff93d3f9));
+        stops << QGradientStop(0.51, QColor::fromRgba(0xffb3e6ff));
+        stops << QGradientStop(0.73, QColor::fromRgba(0xffffffec));
+        stops << QGradientStop(0.92, QColor::fromRgba(0xff5353d9));
+        stops << QGradientStop(0.96, QColor::fromRgba(0xff262666));
+        stops << QGradientStop(1.00, QColor::fromRgba(0));
+        m_linearButton->animateClick();
+        m_repeatSpreadButton->animateClick();
+        break;
+
+    case 2:
+        stops << QGradientStop(0.00, QColor::fromRgba(0xffffffff));
+        stops << QGradientStop(0.11, QColor::fromRgba(0xfff9ffa0));
+        stops << QGradientStop(0.13, QColor::fromRgba(0xfff9ff99));
+        stops << QGradientStop(0.14, QColor::fromRgba(0xfff3ff86));
+        stops << QGradientStop(0.49, QColor::fromRgba(0xff93b353));
+        stops << QGradientStop(0.87, QColor::fromRgba(0xff264619));
+        stops << QGradientStop(0.96, QColor::fromRgba(0xff0c1306));
+        stops << QGradientStop(1.00, QColor::fromRgba(0));
+        m_radialButton->animateClick();
+        m_padSpreadButton->animateClick();
+        break;
+
+    case 3:
+        stops << QGradientStop(0.00, QColor::fromRgba(0));
+        stops << QGradientStop(0.10, QColor::fromRgba(0xffe0cc73));
+        stops << QGradientStop(0.17, QColor::fromRgba(0xffc6a006));
+        stops << QGradientStop(0.46, QColor::fromRgba(0xff600659));
+        stops << QGradientStop(0.72, QColor::fromRgba(0xff0680ac));
+        stops << QGradientStop(0.92, QColor::fromRgba(0xffb9d9e6));
+        stops << QGradientStop(1.00, QColor::fromRgba(0));
+        m_conicalButton->animateClick();
+        m_padSpreadButton->animateClick();
+        break;
+
+    case 4:
+        stops << QGradientStop(0.00, QColor::fromRgba(0xff000000));
+        stops << QGradientStop(1.00, QColor::fromRgba(0xffffffff));
+        break;
+
+    default:
+        qWarning("bad default: %d\n", config);
+        break;
+    }
+
+    QPolygonF pts;
+    int h_off = m_renderer->width() / 10;
+    int v_off = m_renderer->height() / 8;
+    pts << QPointF(m_renderer->width() / 2, m_renderer->height() / 2)
+        << QPointF(m_renderer->width() / 2 - h_off, m_renderer->height() / 2 - v_off);
+
+    m_editor->setGradientStops(stops);
+    m_renderer->hoverPoints()->setPoints(pts);
+    m_renderer->setGradientStops(stops);
+}
+
+
+GradientRenderer::GradientRenderer(QWidget *parent)
+    : ArthurFrame(parent)
+{
+    m_hoverPoints = new HoverPoints(this, HoverPoints::CircleShape);
+    m_hoverPoints->setPointSize(QSize(20, 20));
+    m_hoverPoints->setConnectionType(HoverPoints::NoConnection);
+    m_hoverPoints->setEditable(false);
+
+    QVector<QPointF> points;
+    points << QPointF(100, 100) << QPointF(200, 200);
+    m_hoverPoints->setPoints(points);
+
+    m_spread = QGradient::PadSpread;
+    m_gradientType = Qt::LinearGradientPattern;
+}
+
+void GradientRenderer::setGradientStops(const QGradientStops &stops)
+{
+    m_stops = stops;
+    update();
+}
+
+
+void GradientRenderer::mousePressEvent(QMouseEvent *)
+{
+    setDescriptionEnabled(false);
+}
+
+void GradientRenderer::paint(QPainter *p)
+{
+    QPolygonF pts = m_hoverPoints->points();
+
+    QGradient g;
+
+    if (m_gradientType == Qt::LinearGradientPattern) {
+        g = QLinearGradient(pts.at(0), pts.at(1));
+
+    } else if (m_gradientType == Qt::RadialGradientPattern) {
+        g = QRadialGradient(pts.at(0), qMin(width(), height()) / 3.0, pts.at(1));
+
+    } else {
+        QLineF l(pts.at(0), pts.at(1));
+        qreal angle = l.angle(QLineF(0, 0, 1, 0));
+        if (l.dy() > 0)
+            angle = 360 - angle;
+        g = QConicalGradient(pts.at(0), angle);
+    }
+
+    for (int i=0; i<m_stops.size(); ++i)
+        g.setColorAt(m_stops.at(i).first, m_stops.at(i).second);
+
+    g.setSpread(m_spread);
+
+    p->setBrush(g);
+    p->setPen(Qt::NoPen);
+
+    p->drawRect(rect());
+
+}
diff --git a/demos/gradients/gradients.h b/demos/gradients/gradients.h
new file mode 100644
index 0000000000..74e8417ac7
--- /dev/null
+++ b/demos/gradients/gradients.h
@@ -0,0 +1,170 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GRADIENTS_H
+#define GRADIENTS_H
+
+#include "arthurwidgets.h"
+
+#include <QtGui>
+
+class HoverPoints;
+
+
+class ShadeWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    enum ShadeType {
+        RedShade,
+        GreenShade,
+        BlueShade,
+        ARGBShade
+    };
+
+    ShadeWidget(ShadeType type, QWidget *parent);
+
+    void setGradientStops(const QGradientStops &stops);
+
+    void paintEvent(QPaintEvent *e);
+
+    QSize sizeHint() const { return QSize(150, 40); }
+    QPolygonF points() const;
+
+    HoverPoints *hoverPoints() const { return m_hoverPoints; }
+
+    uint colorAt(int x);
+
+signals:
+    void colorsChanged();
+
+private:
+    void generateShade();
+
+    ShadeType m_shade_type;
+    QImage m_shade;
+    HoverPoints *m_hoverPoints;
+    QLinearGradient m_alpha_gradient;
+};
+
+class GradientEditor : public QWidget
+{
+    Q_OBJECT
+public:
+    GradientEditor(QWidget *parent);
+
+    void setGradientStops(const QGradientStops &stops);
+
+public slots:
+    void pointsUpdated();
+
+signals:
+    void gradientStopsChanged(const QGradientStops &stops);
+
+private:
+    ShadeWidget *m_red_shade;
+    ShadeWidget *m_green_shade;
+    ShadeWidget *m_blue_shade;
+    ShadeWidget *m_alpha_shade;
+};
+
+
+class GradientRenderer : public ArthurFrame
+{
+    Q_OBJECT
+public:
+    GradientRenderer(QWidget *parent);
+    void paint(QPainter *p);
+
+    QSize sizeHint() const { return QSize(400, 400); }
+
+    HoverPoints *hoverPoints() const { return m_hoverPoints; }
+    void mousePressEvent(QMouseEvent *e);
+
+public slots:
+    void setGradientStops(const QGradientStops &stops);
+
+    void setPadSpread() { m_spread = QGradient::PadSpread; update(); }
+    void setRepeatSpread() { m_spread = QGradient::RepeatSpread; update(); }
+    void setReflectSpread() { m_spread = QGradient::ReflectSpread; update(); }
+
+    void setLinearGradient() { m_gradientType = Qt::LinearGradientPattern; update(); }
+    void setRadialGradient() { m_gradientType = Qt::RadialGradientPattern; update(); }
+    void setConicalGradient() { m_gradientType = Qt::ConicalGradientPattern; update(); }
+
+
+private:
+    QGradientStops m_stops;
+    HoverPoints *m_hoverPoints;
+
+    QGradient::Spread m_spread;
+    Qt::BrushStyle m_gradientType;
+};
+
+
+class GradientWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    GradientWidget(QWidget *parent);
+
+public slots:
+    void setDefault1() { setDefault(1); }
+    void setDefault2() { setDefault(2); }
+    void setDefault3() { setDefault(3); }
+    void setDefault4() { setDefault(4); }
+
+private:
+    void setDefault(int i);
+
+    GradientRenderer *m_renderer;
+    GradientEditor *m_editor;
+
+    QRadioButton *m_linearButton;
+    QRadioButton *m_radialButton;
+    QRadioButton *m_conicalButton;
+    QRadioButton *m_padSpreadButton;
+    QRadioButton *m_reflectSpreadButton;
+    QRadioButton *m_repeatSpreadButton;
+
+};
+
+#endif // GRADIENTS_H
diff --git a/demos/gradients/gradients.html b/demos/gradients/gradients.html
new file mode 100644
index 0000000000..1ea2c0ed6c
--- /dev/null
+++ b/demos/gradients/gradients.html
@@ -0,0 +1,31 @@
+<html>
+<center>
+<h2>Gradients</h2>
+</center>
+
+<p>In this demo we show the various types of gradients that can
+be used in Qt.</p>
+
+<p>There are three types of gradients:
+
+<ul>
+  <li><b>Linear</b> gradients interpolate colors between start and end
+  points.</li>
+  <li><b>Radial</b> gradients interpolate colors between a focal point and the
+  points on a circle surrounding it.</li>
+  <li><b>Conical</b> gradients interpolate colors around a center point.</li>
+</ul>
+
+</p>
+
+<p>The panel on the right contains a color table editor that defines
+the colors in the gradient. The three topmost controls determine the red,
+green and blue components while the last defines the alpha of the
+gradient. You can move points, and add new ones, by clicking with the left
+mouse button, and remove points by clicking with the right button.</p>
+
+<p>There are three default configurations available at the bottom of
+the page that are provided as suggestions on how a color table could be
+configured.</p>
+
+</html>
diff --git a/demos/gradients/gradients.pro b/demos/gradients/gradients.pro
new file mode 100644
index 0000000000..167572bd4c
--- /dev/null
+++ b/demos/gradients/gradients.pro
@@ -0,0 +1,18 @@
+SOURCES += main.cpp gradients.cpp
+HEADERS += gradients.h
+
+SHARED_FOLDER = ../shared
+
+include($$SHARED_FOLDER/shared.pri)
+
+RESOURCES += gradients.qrc
+contains(QT_CONFIG, opengl) {
+	DEFINES += QT_OPENGL_SUPPORT
+	QT += opengl
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/gradients
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
+sources.path = $$[QT_INSTALL_DEMOS]/gradients
+INSTALLS += target sources
diff --git a/demos/gradients/gradients.qrc b/demos/gradients/gradients.qrc
new file mode 100644
index 0000000000..fb971eb17b
--- /dev/null
+++ b/demos/gradients/gradients.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/res/gradients">
+   <file>gradients.cpp</file>
+   <file>gradients.html</file>
+</qresource>
+</RCC>
diff --git a/demos/gradients/main.cpp b/demos/gradients/main.cpp
new file mode 100644
index 0000000000..f88051085a
--- /dev/null
+++ b/demos/gradients/main.cpp
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "gradients.h"
+
+#include <QApplication>
+
+int main(int argc, char **argv)
+{
+    Q_INIT_RESOURCE(gradients);
+
+    QApplication app(argc, argv);
+
+    GradientWidget gradientWidget(0);
+    QStyle *arthurStyle = new ArthurStyle();
+    gradientWidget.setStyle(arthurStyle);
+    QList<QWidget *> widgets = qFindChildren<QWidget *>(&gradientWidget);
+    foreach (QWidget *w, widgets)
+        w->setStyle(arthurStyle);
+    gradientWidget.show();
+
+    return app.exec();
+}
diff --git a/demos/interview/README b/demos/interview/README
new file mode 100644
index 0000000000..50894428f6
--- /dev/null
+++ b/demos/interview/README
@@ -0,0 +1,2 @@
+The interview example shows the same model and selection being shared
+between three different views.
diff --git a/demos/interview/images/folder.png b/demos/interview/images/folder.png
new file mode 100644
index 0000000000..589fd2df59
--- /dev/null
+++ b/demos/interview/images/folder.png
diff --git a/demos/interview/images/interview.png b/demos/interview/images/interview.png
new file mode 100644
index 0000000000..0c3d690258
--- /dev/null
+++ b/demos/interview/images/interview.png
diff --git a/demos/interview/images/services.png b/demos/interview/images/services.png
new file mode 100644
index 0000000000..6b2ad969d4
--- /dev/null
+++ b/demos/interview/images/services.png
diff --git a/demos/interview/interview.pro b/demos/interview/interview.pro
new file mode 100644
index 0000000000..c013755205
--- /dev/null
+++ b/demos/interview/interview.pro
@@ -0,0 +1,18 @@
+TEMPLATE = app
+
+CONFIG += qt warn_on
+HEADERS += model.h
+SOURCES += model.cpp main.cpp
+RESOURCES += interview.qrc
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/interview
+sources.files = $$SOURCES $$HEADERS $$RESOURCES README *.pro images
+sources.path = $$[QT_INSTALL_DEMOS]/interview
+INSTALLS += target sources
+
diff --git a/demos/interview/interview.qrc b/demos/interview/interview.qrc
new file mode 100644
index 0000000000..b28ea34d8a
--- /dev/null
+++ b/demos/interview/interview.qrc
@@ -0,0 +1,7 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+	<file>images/folder.png</file>
+	<file>images/services.png</file>
+	<file>images/interview.png</file>
+</qresource>
+</RCC>
diff --git a/demos/interview/main.cpp b/demos/interview/main.cpp
new file mode 100644
index 0000000000..9682322b30
--- /dev/null
+++ b/demos/interview/main.cpp
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "model.h"
+
+#include <QApplication>
+#include <QTableView>
+#include <QTreeView>
+#include <QListView>
+#include <QSplitter>
+#include <QHeaderView>
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(interview);
+
+    QApplication app(argc, argv);
+    QSplitter page;
+
+    QAbstractItemModel *data = new Model(1000, 10, &page);
+    QItemSelectionModel *selections = new QItemSelectionModel(data);
+
+    QTableView *table = new QTableView;
+    table->setModel(data);
+    table->setSelectionModel(selections);
+    table->horizontalHeader()->setMovable(true);
+    table->verticalHeader()->setMovable(true);
+    // Set StaticContents to enable minimal repaints on resizes.
+    table->viewport()->setAttribute(Qt::WA_StaticContents);
+    page.addWidget(table);
+
+    QTreeView *tree = new QTreeView;
+    tree->setModel(data);
+    tree->setSelectionModel(selections);
+    tree->setUniformRowHeights(true);
+    tree->header()->setStretchLastSection(false);
+    tree->viewport()->setAttribute(Qt::WA_StaticContents);
+    // Disable the focus rect to get minimal repaints when scrolling on Mac.
+    tree->setAttribute(Qt::WA_MacShowFocusRect, false);
+    page.addWidget(tree);
+
+    QListView *list = new QListView;
+    list->setModel(data);
+    list->setSelectionModel(selections);
+    list->setViewMode(QListView::IconMode);
+    list->setSelectionMode(QAbstractItemView::ExtendedSelection);
+    list->setAlternatingRowColors(false);
+    list->viewport()->setAttribute(Qt::WA_StaticContents);
+    list->setAttribute(Qt::WA_MacShowFocusRect, false);
+    page.addWidget(list);
+
+    page.setWindowIcon(QPixmap(":/images/interview.png"));
+    page.setWindowTitle("Interview");
+    page.show();
+
+    return app.exec();
+}
diff --git a/demos/interview/model.cpp b/demos/interview/model.cpp
new file mode 100644
index 0000000000..1d5040cab7
--- /dev/null
+++ b/demos/interview/model.cpp
@@ -0,0 +1,147 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "model.h"
+#include <QIcon>
+#include <QPixmap>
+
+Model::Model(int rows, int columns, QObject *parent)
+    : QAbstractItemModel(parent),
+      rc(rows), cc(columns),
+      tree(new QVector<Node>(rows, Node(0)))
+{
+
+}
+
+Model::~Model()
+{
+    delete tree;
+}
+
+QModelIndex Model::index(int row, int column, const QModelIndex &parent) const
+{
+    if (row < rc && row >= 0 && column < cc && column >= 0) {
+        Node *p = static_cast<Node*>(parent.internalPointer());
+        Node *n = node(row, p);
+	if (n)
+	    return createIndex(row, column, n);
+    }
+    return QModelIndex();
+}
+
+QModelIndex Model::parent(const QModelIndex &child) const
+{
+    if (child.isValid()) {
+        Node *n = static_cast<Node*>(child.internalPointer());
+        Node *p = parent(n);
+        if (p)
+            return createIndex(row(p), 0, p);
+    }
+    return QModelIndex();
+}
+
+int Model::rowCount(const QModelIndex &parent) const
+{
+    return (parent.isValid() && parent.column() != 0) ? 0 : rc;
+}
+
+int Model::columnCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+    return cc;
+}
+
+QVariant Model::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+    if (role == Qt::DisplayRole)
+	return "Item " + QString::number(index.row()) + ":" + QString::number(index.column());
+    if (role == Qt::DecorationRole) {
+        if (index.column() == 0)
+            return iconProvider.icon(QFileIconProvider::Folder);
+        return iconProvider.icon(QFileIconProvider::File);
+    }
+    return QVariant();
+}
+
+QVariant Model::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    static QIcon services(QPixmap(":/images/services.png"));
+    if (role == Qt::DisplayRole)
+        return QString::number(section);
+    if (role == Qt::DecorationRole)
+        return qVariantFromValue(services);
+    return QAbstractItemModel::headerData(section, orientation, role);
+}
+
+bool Model::hasChildren(const QModelIndex &parent) const
+{
+    if (parent.isValid() && parent.column() != 0)
+        return false;
+    return rc > 0 && cc > 0;
+}
+
+Qt::ItemFlags Model::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return 0;
+    return (Qt::ItemIsDragEnabled|Qt::ItemIsSelectable|Qt::ItemIsEnabled);
+}
+
+Model::Node *Model::node(int row, Node *parent) const
+{
+    if (parent && !parent->children)
+	parent->children = new QVector<Node>(rc, Node(parent));
+    QVector<Node> *v = parent ? parent->children : tree;
+    return const_cast<Node*>(&(v->at(row)));
+}
+
+Model::Node *Model::parent(Node *child) const
+{
+    return child ? child->parent : 0;
+}
+
+int Model::row(Node *node) const
+{
+     const Node *first = node->parent ? &(node->parent->children->at(0)) : &(tree->at(0));
+     return (node - first);
+}
diff --git a/demos/interview/model.h b/demos/interview/model.h
new file mode 100644
index 0000000000..96e6aea201
--- /dev/null
+++ b/demos/interview/model.h
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MODEL_H
+#define MODEL_H
+
+#include <QAbstractItemModel>
+#include <QFileIconProvider>
+#include <QVector>
+
+class Model : public QAbstractItemModel
+{
+    Q_OBJECT
+
+public:
+    Model(int rows, int columns, QObject *parent = 0);
+    ~Model();
+
+    QModelIndex index(int row, int column, const QModelIndex &parent) const;
+    QModelIndex parent(const QModelIndex &child) const;
+
+    int rowCount(const QModelIndex &parent) const;
+    int columnCount(const QModelIndex &parent) const;
+
+    QVariant data(const QModelIndex &index, int role) const;
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const;
+
+    bool hasChildren(const QModelIndex &parent) const;
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+
+private:
+
+    struct Node
+    {
+	Node(Node *parent = 0) : parent(parent), children(0) {}
+	~Node() { delete children; }
+	Node *parent;
+	QVector<Node> *children;
+    };
+
+    Node *node(int row, Node *parent) const;
+    Node *parent(Node *child) const;
+    int row(Node *node) const;
+
+    int rc, cc;
+    QVector<Node> *tree;
+    QFileIconProvider iconProvider;
+};
+
+#endif
diff --git a/demos/macmainwindow/macmainwindow.h b/demos/macmainwindow/macmainwindow.h
new file mode 100644
index 0000000000..b5e474014a
--- /dev/null
+++ b/demos/macmainwindow/macmainwindow.h
@@ -0,0 +1,137 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef MACMAINWINDOW_H
+#define MACMAINWINDOW_H
+
+#include <QtGui>
+
+#ifdef Q_WS_MAC
+
+#import <qmaccocoaviewcontainer_mac.h>
+
+#ifdef QT_MAC_USE_COCOA
+class SearchWidget : public QMacCocoaViewContainer
+{
+    Q_OBJECT
+public:
+    SearchWidget(QWidget *parent = 0);
+    ~SearchWidget();
+
+    QSize sizeHint() const;
+private:
+};
+
+#else
+#include <Carbon/Carbon.h>
+
+// The SearchWidget class wraps a native HISearchField.
+class SearchWidget : public QWidget
+{
+    Q_OBJECT
+private:
+    HIViewRef searchField;
+    CFStringRef searchFieldText;
+
+public:
+    QSize sizeHint() const;
+    SearchWidget(QWidget *parent = 0);
+    ~SearchWidget();
+};
+
+#endif
+
+QMenu *createMenu(QWidget *parent);
+
+class SearchWrapper : public QWidget
+{
+Q_OBJECT
+public:
+    SearchWrapper(QWidget *parent = 0);
+    QSize sizeHint() const;
+    QWidget *s;
+};
+
+class Spacer : public QWidget
+{
+Q_OBJECT
+public:
+    Spacer(QWidget *parent = 0);
+    QSize sizeHint() const;
+};
+
+class MacSplitterHandle : public QSplitterHandle
+{
+Q_OBJECT
+public:
+    MacSplitterHandle(Qt::Orientation orientation, QSplitter *parent);
+    void paintEvent(QPaintEvent *);
+    QSize sizeHint() const;
+};
+
+class MacSplitter : public QSplitter
+{
+public:
+    QSplitterHandle *createHandle();
+};
+
+class MacMainWindow : public QMainWindow
+{
+Q_OBJECT
+public:
+    MacMainWindow();
+    ~MacMainWindow();
+    QAbstractItemModel *createItemModel();
+    void resizeEvent(QResizeEvent *e);
+    QAbstractItemModel *createDocumentModel();
+public:
+    QSplitter *splitter;
+    QSplitter *horizontalSplitter;
+    QTreeView *sidebar;
+    QListView *documents;
+    QTextEdit *textedit;
+    QVBoxLayout *layout;
+    SearchWidget *searchWidget;
+    QToolBar * toolBar;
+};
+
+#endif // Q_WS_MAC
+
+#endif //MACMAINWINDOW_H
diff --git a/demos/macmainwindow/macmainwindow.mm b/demos/macmainwindow/macmainwindow.mm
new file mode 100644
index 0000000000..156e793004
--- /dev/null
+++ b/demos/macmainwindow/macmainwindow.mm
@@ -0,0 +1,347 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "macmainwindow.h"
+#import <Cocoa/Cocoa.h>
+#include <QtGui>
+
+
+#ifdef Q_WS_MAC
+
+#include <Carbon/Carbon.h>
+
+#ifdef QT_MAC_USE_COCOA
+
+//![0]
+SearchWidget::SearchWidget(QWidget *parent)
+    : QMacCocoaViewContainer(0, parent)
+{
+    // Many Cocoa objects create temporary autorelease objects,
+    // so create a pool to catch them.
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    // Create the NSSearchField, set it on the QCocoaViewContainer.
+    NSSearchField *search = [[NSSearchField alloc] init];
+    setCocoaView(search);
+
+    // Use a Qt menu for the search field menu.
+    QMenu *qtMenu = createMenu(this);
+    NSMenu *nsMenu = qtMenu->macMenu(0);
+    [[search cell] setSearchMenuTemplate:nsMenu];
+
+    // Release our reference, since our super class takes ownership and we
+    // don't need it anymore.
+    [search release];
+
+    // Clean up our pool as we no longer need it.
+    [pool release];
+}
+//![0]
+
+SearchWidget::~SearchWidget()
+{
+}
+
+QSize SearchWidget::sizeHint() const
+{
+    return QSize(150, 40);
+}
+
+#else
+
+// The SearchWidget class wraps a native HISearchField.
+SearchWidget::SearchWidget(QWidget *parent)
+    :QWidget(parent)
+{
+
+    // Create a native search field and pass its window id to QWidget::create.
+    searchFieldText = CFStringCreateWithCString(0, "search", 0);
+    HISearchFieldCreate(NULL/*bounds*/, kHISearchFieldAttributesSearchIcon | kHISearchFieldAttributesCancel,
+                        NULL/*menu ref*/, searchFieldText, &searchField);
+    create(reinterpret_cast<WId>(searchField));
+
+    // Use a Qt menu for the search field menu.
+    QMenu *searchMenu = createMenu(this);
+    MenuRef menuRef = searchMenu->macMenu(0);
+    HISearchFieldSetSearchMenu(searchField, menuRef);
+    setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+}
+
+SearchWidget::~SearchWidget()
+{
+    CFRelease(searchField);
+    CFRelease(searchFieldText);
+}
+
+// Get the size hint from the search field.
+QSize SearchWidget::sizeHint() const
+{
+    EventRef event;
+    HIRect optimalBounds;
+    CreateEvent(0, kEventClassControl,
+        kEventControlGetOptimalBounds,
+        GetCurrentEventTime(),
+        kEventAttributeUserEvent, &event);
+
+    SendEventToEventTargetWithOptions(event,
+        HIObjectGetEventTarget(HIObjectRef(winId())),
+        kEventTargetDontPropagate);
+
+    GetEventParameter(event,
+        kEventParamControlOptimalBounds, typeHIRect,
+        0, sizeof(HIRect), 0, &optimalBounds);
+
+    ReleaseEvent(event);
+    return QSize(optimalBounds.size.width + 100, // make it a bit wider.
+                 optimalBounds.size.height);
+}
+
+#endif
+
+QMenu *createMenu(QWidget *parent)
+{
+    QMenu *searchMenu = new QMenu(parent);
+    
+    QAction * indexAction = searchMenu->addAction("Index Search");
+    indexAction->setCheckable(true);
+    indexAction->setChecked(true);
+
+    QAction * fulltextAction = searchMenu->addAction("Full Text Search");
+    fulltextAction->setCheckable(true);
+
+    QActionGroup *searchActionGroup = new QActionGroup(parent);
+    searchActionGroup->addAction(indexAction);
+    searchActionGroup->addAction(fulltextAction);
+    searchActionGroup->setExclusive(true);
+    
+    return searchMenu;
+}
+
+SearchWrapper::SearchWrapper(QWidget *parent)
+:QWidget(parent)
+{
+    s = new SearchWidget(this);
+    s->move(2,2);
+    setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+}
+
+QSize SearchWrapper::sizeHint() const
+{
+    return s->sizeHint() + QSize(6, 2);
+}
+
+Spacer::Spacer(QWidget *parent)
+:QWidget(parent)
+{
+    QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    setSizePolicy(sizePolicy);
+}
+
+QSize Spacer::sizeHint() const
+{
+    return QSize(1, 1);
+}
+
+MacSplitterHandle::MacSplitterHandle(Qt::Orientation orientation, QSplitter *parent)
+: QSplitterHandle(orientation, parent) {   }
+
+// Paint the horizontal handle as a gradient, paint
+// the vertical handle as a line.
+void MacSplitterHandle::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+
+    QColor topColor(145, 145, 145);
+    QColor bottomColor(142, 142, 142);
+    QColor gradientStart(252, 252, 252);
+    QColor gradientStop(223, 223, 223);
+
+    if (orientation() == Qt::Vertical) {
+        painter.setPen(topColor);
+        painter.drawLine(0, 0, width(), 0);
+        painter.setPen(bottomColor);
+        painter.drawLine(0, height() - 1, width(), height() - 1);
+
+        QLinearGradient linearGrad(QPointF(0, 0), QPointF(0, height() -3));
+        linearGrad.setColorAt(0, gradientStart);
+        linearGrad.setColorAt(1, gradientStop);
+        painter.fillRect(QRect(QPoint(0,1), size() - QSize(0, 2)), QBrush(linearGrad));
+    } else {
+        painter.setPen(topColor);
+        painter.drawLine(0, 0, 0, height());
+    }
+}
+
+QSize MacSplitterHandle::sizeHint() const
+{
+    QSize parent = QSplitterHandle::sizeHint();
+    if (orientation() == Qt::Vertical) {
+        return parent + QSize(0, 3);
+    } else {
+        return QSize(1, parent.height());
+    }
+}
+
+QSplitterHandle *MacSplitter::createHandle()
+{
+    return new MacSplitterHandle(orientation(), this);
+}
+
+MacMainWindow::MacMainWindow()
+{
+    QSettings settings;
+    restoreGeometry(settings.value("Geometry").toByteArray());
+
+    setWindowTitle("Mac Main Window");
+
+    splitter = new MacSplitter();
+
+    // Set up the left-hand side blue side bar.
+    sidebar = new QTreeView();
+    sidebar->setFrameStyle(QFrame::NoFrame);
+    sidebar->setAttribute(Qt::WA_MacShowFocusRect, false);
+    sidebar->setAutoFillBackground(true);
+    
+    // Set the palette.
+    QPalette palette = sidebar->palette();
+    QColor macSidebarColor(231, 237, 246);
+    QColor macSidebarHighlightColor(168, 183, 205);
+    palette.setColor(QPalette::Base, macSidebarColor);
+    palette.setColor(QPalette::Highlight, macSidebarHighlightColor);
+    sidebar->setPalette(palette);
+
+    sidebar->setModel(createItemModel());
+    sidebar->header()->hide();
+    sidebar->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    sidebar->setTextElideMode(Qt::ElideMiddle);
+
+    splitter->addWidget(sidebar);
+
+    horizontalSplitter = new MacSplitter();
+    horizontalSplitter->setOrientation(Qt::Vertical);
+    splitter->addWidget(horizontalSplitter);
+    
+    splitter->setStretchFactor(0, 0);
+    splitter->setStretchFactor(1, 1);
+
+    // Set up the top document list view.
+    documents = new QListView();
+    documents->setFrameStyle(QFrame::NoFrame);
+    documents->setAttribute(Qt::WA_MacShowFocusRect, false);
+    documents->setModel(createDocumentModel());
+    documents->setAlternatingRowColors(true);
+    documents->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+    horizontalSplitter->addWidget(documents);
+    horizontalSplitter->setStretchFactor(0, 0);
+
+    // Set up the text view.
+    textedit = new QTextEdit();
+    textedit->setFrameStyle(QFrame::NoFrame);
+    textedit->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+    textedit->setText("<br><br><br><br><br><br><center><b>This demo shows how to create a \
+                       Qt main window application that has the same appearance as other \
+                       Mac OS X applications such as Mail or iTunes. This includes \
+                       customizing the item views and QSplitter and wrapping native widgets \
+                       such as the search field.</b></center>");
+
+    horizontalSplitter->addWidget(textedit);
+
+    setCentralWidget(splitter);
+
+    toolBar = addToolBar(tr("Search"));
+    toolBar->addWidget(new Spacer());
+    toolBar->addWidget(new SearchWrapper());
+    
+    setUnifiedTitleAndToolBarOnMac(true);
+}
+
+MacMainWindow::~MacMainWindow()
+{
+    QSettings settings;
+    settings.setValue("Geometry", saveGeometry());
+}
+
+QAbstractItemModel *MacMainWindow::createItemModel()
+{
+    QStandardItemModel *model = new QStandardItemModel();
+    QStandardItem *parentItem = model->invisibleRootItem();
+
+    QStandardItem *documentationItem = new QStandardItem("Documentation"); 
+    parentItem->appendRow(documentationItem);
+
+    QStandardItem *assistantItem = new QStandardItem("Qt MainWindow Manual"); 
+    documentationItem->appendRow(assistantItem);
+
+    QStandardItem *designerItem = new QStandardItem("Qt Designer Manual"); 
+    documentationItem->appendRow(designerItem);
+
+    QStandardItem *qtItem = new QStandardItem("Qt Reference Documentation"); 
+    qtItem->appendRow(new QStandardItem("Classes"));
+    qtItem->appendRow(new QStandardItem("Overviews"));
+    qtItem->appendRow(new QStandardItem("Tutorial & Examples"));
+    documentationItem->appendRow(qtItem);
+
+    QStandardItem *bookmarksItem = new QStandardItem("Bookmarks"); 
+    parentItem->appendRow(bookmarksItem);
+    bookmarksItem->appendRow(new QStandardItem("QWidget"));
+    bookmarksItem->appendRow(new QStandardItem("QObject"));
+    bookmarksItem->appendRow(new QStandardItem("QWizard"));
+
+    return model;
+}
+
+void MacMainWindow::resizeEvent(QResizeEvent *)
+{
+    if (toolBar)
+        toolBar->updateGeometry();
+}
+
+QAbstractItemModel *MacMainWindow::createDocumentModel()
+{
+    QStandardItemModel *model = new QStandardItemModel();
+    QStandardItem *parentItem = model->invisibleRootItem(); 
+    parentItem->appendRow(new QStandardItem("QWidget Class Reference"));
+    parentItem->appendRow(new QStandardItem("QObject Class Reference"));
+    parentItem->appendRow(new QStandardItem("QListView Class Reference"));
+
+    return model;
+}
+
+#endif // Q_WS_MAC
diff --git a/demos/macmainwindow/macmainwindow.pro b/demos/macmainwindow/macmainwindow.pro
new file mode 100644
index 0000000000..f5165a79c4
--- /dev/null
+++ b/demos/macmainwindow/macmainwindow.pro
@@ -0,0 +1,23 @@
+TEMPLATE        = app
+TARGET          = macmainwindow
+
+CONFIG          += qt warn_on console
+
+OBJECTIVE_SOURCES += macmainwindow.mm
+SOURCES += main.cpp 
+HEADERS += macmainwindow.h
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+LIBS += -framework Cocoa
+
+# install
+mac {
+target.path = $$[QT_INSTALL_DEMOS]/macmainwindow
+sources.files = $$SOURCES  *.pro *.html
+sources.path = $$[QT_INSTALL_DEMOS]/macmainwindow
+INSTALLS += target sources
+}
diff --git a/demos/macmainwindow/main.cpp b/demos/macmainwindow/main.cpp
new file mode 100644
index 0000000000..2b01cfe7b5
--- /dev/null
+++ b/demos/macmainwindow/main.cpp
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "macmainwindow.h"
+
+#ifdef Q_WS_MAC
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    MacMainWindow mainWindow;
+    mainWindow.show();
+    return app.exec();
+}
+
+#else
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    QLabel label;
+    label.resize(300, 200);
+    label.setText(" This demo requires Mac OS X.");
+    label.show();
+    return app.exec();
+}
+
+#endif
diff --git a/demos/mainwindow/colorswatch.cpp b/demos/mainwindow/colorswatch.cpp
new file mode 100644
index 0000000000..ba6a0765ae
--- /dev/null
+++ b/demos/mainwindow/colorswatch.cpp
@@ -0,0 +1,746 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "colorswatch.h"
+
+#include <QAction>
+#include <QtEvents>
+#include <QFrame>
+#include <QMainWindow>
+#include <QMenu>
+#include <QPainter>
+#include <QImage>
+#include <QColor>
+#include <QDialog>
+#include <QGridLayout>
+#include <QSpinBox>
+#include <QLabel>
+#include <QPainterPath>
+#include <QPushButton>
+#include <QHBoxLayout>
+#include <QBitmap>
+#include <QtDebug>
+
+#undef DEBUG_SIZEHINTS
+
+QColor bgColorForName(const QString &name)
+{
+    if (name == "Black")
+        return QColor("#D8D8D8");
+    else if (name == "White")
+        return QColor("#F1F1F1");
+    else if (name == "Red")
+        return QColor("#F1D8D8");
+    else if (name == "Green")
+        return QColor("#D8E4D8");
+    else if (name == "Blue")
+        return QColor("#D8D8F1");
+    else if (name == "Yellow")
+        return QColor("#F1F0D8");
+    return QColor(name).light(110);
+}
+
+QColor fgColorForName(const QString &name)
+{
+    if (name == "Black")
+        return QColor("#6C6C6C");
+    else if (name == "White")
+        return QColor("#F8F8F8");
+    else if (name == "Red")
+        return QColor("#F86C6C");
+    else if (name == "Green")
+        return QColor("#6CB26C");
+    else if (name == "Blue")
+        return QColor("#6C6CF8");
+    else if (name == "Yellow")
+        return QColor("#F8F76C");
+    return QColor(name);
+}
+
+class ColorDock : public QFrame
+{
+    Q_OBJECT
+public:
+    ColorDock(const QString &c, QWidget *parent);
+
+    virtual QSize sizeHint() const;
+    virtual QSize minimumSizeHint() const;
+
+    void setCustomSizeHint(const QSize &size);
+
+public slots:
+    void changeSizeHints();
+
+protected:
+    void paintEvent(QPaintEvent *);
+    QString color;
+    QSize szHint, minSzHint;
+};
+
+ColorDock::ColorDock(const QString &c, QWidget *parent)
+    : QFrame(parent) , color(c)
+{
+    QFont font = this->font();
+    font.setPointSize(8);
+    setFont(font);
+    szHint = QSize(-1, -1);
+    minSzHint = QSize(125, 75);
+}
+
+QSize ColorDock::sizeHint() const
+{
+    return szHint;
+}
+
+QSize ColorDock::minimumSizeHint() const
+{
+    return minSzHint;
+}
+
+void ColorDock::paintEvent(QPaintEvent *)
+{
+    QPainter p(this);
+    p.setRenderHint(QPainter::Antialiasing);
+    p.fillRect(rect(), bgColorForName(color));
+
+    p.save();
+
+    extern void render_qt_text(QPainter *, int, int, const QColor &);
+    render_qt_text(&p, width(), height(), fgColorForName(color));
+
+    p.restore();
+
+#ifdef DEBUG_SIZEHINTS
+    p.setRenderHint(QPainter::Antialiasing, false);
+
+    QSize sz = size();
+    QSize szHint = sizeHint();
+    QSize minSzHint = minimumSizeHint();
+    QSize maxSz = maximumSize();
+    QString text = QString::fromLatin1("sz: %1x%2\nszHint: %3x%4\nminSzHint: %5x%6\n"
+                                        "maxSz: %8x%9")
+                    .arg(sz.width()).arg(sz.height())
+                    .arg(szHint.width()).arg(szHint.height())
+                    .arg(minSzHint.width()).arg(minSzHint.height())
+                    .arg(maxSz.width()).arg(maxSz.height());
+
+    QRect r = fontMetrics().boundingRect(rect(), Qt::AlignLeft|Qt::AlignTop, text);
+    r.adjust(-2, -2, 1, 1);
+    p.translate(4, 4);
+    QColor bg = Qt::yellow;
+    bg.setAlpha(120);
+    p.setBrush(bg);
+    p.setPen(Qt::black);
+    p.drawRect(r);
+    p.drawText(rect(), Qt::AlignLeft|Qt::AlignTop, text);
+#endif // DEBUG_SIZEHINTS
+}
+
+static QSpinBox *createSpinBox(int value, QWidget *parent, int max = 1000)
+{
+    QSpinBox *result = new QSpinBox(parent);
+    result->setMinimum(-1);
+    result->setMaximum(max);
+    result->setValue(value);
+    return result;
+}
+
+void ColorDock::changeSizeHints()
+{
+    QDialog dialog(this);
+    dialog.setWindowTitle(color);
+
+    QVBoxLayout *topLayout = new QVBoxLayout(&dialog);
+
+    QGridLayout *inputLayout = new QGridLayout();
+    topLayout->addLayout(inputLayout);
+
+    inputLayout->addWidget(new QLabel(tr("Size Hint:"), &dialog), 0, 0);
+    inputLayout->addWidget(new QLabel(tr("Min Size Hint:"), &dialog), 1, 0);
+    inputLayout->addWidget(new QLabel(tr("Max Size:"), &dialog), 2, 0);
+    inputLayout->addWidget(new QLabel(tr("Dockwgt Max Size:"), &dialog), 3, 0);
+
+    QSpinBox *szHintW = createSpinBox(szHint.width(), &dialog);
+    inputLayout->addWidget(szHintW, 0, 1);
+    QSpinBox *szHintH = createSpinBox(szHint.height(), &dialog);
+    inputLayout->addWidget(szHintH, 0, 2);
+
+    QSpinBox *minSzHintW = createSpinBox(minSzHint.width(), &dialog);
+    inputLayout->addWidget(minSzHintW, 1, 1);
+    QSpinBox *minSzHintH = createSpinBox(minSzHint.height(), &dialog);
+    inputLayout->addWidget(minSzHintH, 1, 2);
+
+    QSize maxSz = maximumSize();
+    QSpinBox *maxSzW = createSpinBox(maxSz.width(), &dialog, QWIDGETSIZE_MAX);
+    inputLayout->addWidget(maxSzW, 2, 1);
+    QSpinBox *maxSzH = createSpinBox(maxSz.height(), &dialog, QWIDGETSIZE_MAX);
+    inputLayout->addWidget(maxSzH, 2, 2);
+
+    QSize dwMaxSz = parentWidget()->maximumSize();
+    QSpinBox *dwMaxSzW = createSpinBox(dwMaxSz.width(), &dialog, QWIDGETSIZE_MAX);
+    inputLayout->addWidget(dwMaxSzW, 3, 1);
+    QSpinBox *dwMaxSzH = createSpinBox(dwMaxSz.height(), &dialog, QWIDGETSIZE_MAX);
+    inputLayout->addWidget(dwMaxSzH, 3, 2);
+
+    inputLayout->setColumnStretch(1, 1);
+    inputLayout->setColumnStretch(2, 1);
+
+    topLayout->addStretch();
+
+    QHBoxLayout *buttonBox = new QHBoxLayout();
+    topLayout->addLayout(buttonBox);
+
+    QPushButton *okButton = new QPushButton(tr("Ok"), &dialog);
+    QPushButton *cancelButton = new QPushButton(tr("Cancel"), &dialog);
+    connect(okButton, SIGNAL(clicked()), &dialog, SLOT(accept()));
+    connect(cancelButton, SIGNAL(clicked()), &dialog, SLOT(reject()));
+    buttonBox->addStretch();
+    buttonBox->addWidget(cancelButton);
+    buttonBox->addWidget(okButton);
+
+
+    if (!dialog.exec())
+        return;
+
+    szHint = QSize(szHintW->value(), szHintH->value());
+    minSzHint = QSize(minSzHintW->value(), minSzHintH->value());
+    maxSz = QSize(maxSzW->value(), maxSzH->value());
+    setMaximumSize(maxSz);
+    dwMaxSz = QSize(dwMaxSzW->value(), dwMaxSzH->value());
+    parentWidget()->setMaximumSize(dwMaxSz);
+    updateGeometry();
+    update();
+}
+
+void ColorDock::setCustomSizeHint(const QSize &size)
+{
+    szHint = size;
+    updateGeometry();
+}
+
+ColorSwatch::ColorSwatch(const QString &colorName, QWidget *parent, Qt::WindowFlags flags)
+    : QDockWidget(parent, flags)
+{
+    setObjectName(colorName + QLatin1String(" Dock Widget"));
+    setWindowTitle(objectName() + QLatin1String(" [*]"));
+
+    QFrame *swatch = new ColorDock(colorName, this);
+    swatch->setFrameStyle(QFrame::Box | QFrame::Sunken);
+
+    setWidget(swatch);
+
+    changeSizeHintsAction = new QAction(tr("Change Size Hints"), this);
+    connect(changeSizeHintsAction, SIGNAL(triggered()), swatch, SLOT(changeSizeHints()));
+
+    closableAction = new QAction(tr("Closable"), this);
+    closableAction->setCheckable(true);
+    connect(closableAction, SIGNAL(triggered(bool)), SLOT(changeClosable(bool)));
+
+    movableAction = new QAction(tr("Movable"), this);
+    movableAction->setCheckable(true);
+    connect(movableAction, SIGNAL(triggered(bool)), SLOT(changeMovable(bool)));
+
+    floatableAction = new QAction(tr("Floatable"), this);
+    floatableAction->setCheckable(true);
+    connect(floatableAction, SIGNAL(triggered(bool)), SLOT(changeFloatable(bool)));
+
+    verticalTitleBarAction = new QAction(tr("Vertical title bar"), this);
+    verticalTitleBarAction->setCheckable(true);
+    connect(verticalTitleBarAction, SIGNAL(triggered(bool)),
+            SLOT(changeVerticalTitleBar(bool)));
+
+    floatingAction = new QAction(tr("Floating"), this);
+    floatingAction->setCheckable(true);
+    connect(floatingAction, SIGNAL(triggered(bool)), SLOT(changeFloating(bool)));
+
+    allowedAreasActions = new QActionGroup(this);
+    allowedAreasActions->setExclusive(false);
+
+    allowLeftAction = new QAction(tr("Allow on Left"), this);
+    allowLeftAction->setCheckable(true);
+    connect(allowLeftAction, SIGNAL(triggered(bool)), SLOT(allowLeft(bool)));
+
+    allowRightAction = new QAction(tr("Allow on Right"), this);
+    allowRightAction->setCheckable(true);
+    connect(allowRightAction, SIGNAL(triggered(bool)), SLOT(allowRight(bool)));
+
+    allowTopAction = new QAction(tr("Allow on Top"), this);
+    allowTopAction->setCheckable(true);
+    connect(allowTopAction, SIGNAL(triggered(bool)), SLOT(allowTop(bool)));
+
+    allowBottomAction = new QAction(tr("Allow on Bottom"), this);
+    allowBottomAction->setCheckable(true);
+    connect(allowBottomAction, SIGNAL(triggered(bool)), SLOT(allowBottom(bool)));
+
+    allowedAreasActions->addAction(allowLeftAction);
+    allowedAreasActions->addAction(allowRightAction);
+    allowedAreasActions->addAction(allowTopAction);
+    allowedAreasActions->addAction(allowBottomAction);
+
+    areaActions = new QActionGroup(this);
+    areaActions->setExclusive(true);
+
+    leftAction = new QAction(tr("Place on Left") , this);
+    leftAction->setCheckable(true);
+    connect(leftAction, SIGNAL(triggered(bool)), SLOT(placeLeft(bool)));
+
+    rightAction = new QAction(tr("Place on Right") , this);
+    rightAction->setCheckable(true);
+    connect(rightAction, SIGNAL(triggered(bool)), SLOT(placeRight(bool)));
+
+    topAction = new QAction(tr("Place on Top") , this);
+    topAction->setCheckable(true);
+    connect(topAction, SIGNAL(triggered(bool)), SLOT(placeTop(bool)));
+
+    bottomAction = new QAction(tr("Place on Bottom") , this);
+    bottomAction->setCheckable(true);
+    connect(bottomAction, SIGNAL(triggered(bool)), SLOT(placeBottom(bool)));
+
+    areaActions->addAction(leftAction);
+    areaActions->addAction(rightAction);
+    areaActions->addAction(topAction);
+    areaActions->addAction(bottomAction);
+
+    connect(movableAction, SIGNAL(triggered(bool)), areaActions, SLOT(setEnabled(bool)));
+
+    connect(movableAction, SIGNAL(triggered(bool)), allowedAreasActions, SLOT(setEnabled(bool)));
+
+    connect(floatableAction, SIGNAL(triggered(bool)), floatingAction, SLOT(setEnabled(bool)));
+
+    connect(floatingAction, SIGNAL(triggered(bool)), floatableAction, SLOT(setDisabled(bool)));
+    connect(movableAction, SIGNAL(triggered(bool)), floatableAction, SLOT(setEnabled(bool)));
+
+    tabMenu = new QMenu(this);
+    tabMenu->setTitle(tr("Tab into"));
+    connect(tabMenu, SIGNAL(triggered(QAction*)), this, SLOT(tabInto(QAction*)));
+
+    splitHMenu = new QMenu(this);
+    splitHMenu->setTitle(tr("Split horizontally into"));
+    connect(splitHMenu, SIGNAL(triggered(QAction*)), this, SLOT(splitInto(QAction*)));
+
+    splitVMenu = new QMenu(this);
+    splitVMenu->setTitle(tr("Split vertically into"));
+    connect(splitVMenu, SIGNAL(triggered(QAction*)), this, SLOT(splitInto(QAction*)));
+
+    windowModifiedAction = new QAction(tr("Modified"), this);
+    windowModifiedAction->setCheckable(true);
+    windowModifiedAction->setChecked(false);
+    connect(windowModifiedAction, SIGNAL(toggled(bool)), this, SLOT(setWindowModified(bool)));
+
+    menu = new QMenu(colorName, this);
+    menu->addAction(toggleViewAction());
+    QAction *action = menu->addAction(tr("Raise"));
+    connect(action, SIGNAL(triggered()), this, SLOT(raise()));
+    menu->addAction(changeSizeHintsAction);
+    menu->addSeparator();
+    menu->addAction(closableAction);
+    menu->addAction(movableAction);
+    menu->addAction(floatableAction);
+    menu->addAction(floatingAction);
+    menu->addAction(verticalTitleBarAction);
+    menu->addSeparator();
+    menu->addActions(allowedAreasActions->actions());
+    menu->addSeparator();
+    menu->addActions(areaActions->actions());
+    menu->addSeparator();
+    menu->addMenu(splitHMenu);
+    menu->addMenu(splitVMenu);
+    menu->addMenu(tabMenu);
+    menu->addSeparator();
+    menu->addAction(windowModifiedAction);
+
+    connect(menu, SIGNAL(aboutToShow()), this, SLOT(updateContextMenu()));
+
+    if(colorName == "Black") {
+        leftAction->setShortcut(Qt::CTRL|Qt::Key_W);
+        rightAction->setShortcut(Qt::CTRL|Qt::Key_E);
+        toggleViewAction()->setShortcut(Qt::CTRL|Qt::Key_R);
+    }
+}
+
+void ColorSwatch::updateContextMenu()
+{
+    QMainWindow *mainWindow = qobject_cast<QMainWindow *>(parentWidget());
+    const Qt::DockWidgetArea area = mainWindow->dockWidgetArea(this);
+    const Qt::DockWidgetAreas areas = allowedAreas();
+
+    closableAction->setChecked(features() & QDockWidget::DockWidgetClosable);
+    if (windowType() == Qt::Drawer) {
+        floatableAction->setEnabled(false);
+        floatingAction->setEnabled(false);
+        movableAction->setEnabled(false);
+        verticalTitleBarAction->setChecked(false);
+    } else {
+        floatableAction->setChecked(features() & QDockWidget::DockWidgetFloatable);
+        floatingAction->setChecked(isWindow());
+        // done after floating, to get 'floatable' correctly initialized
+        movableAction->setChecked(features() & QDockWidget::DockWidgetMovable);
+        verticalTitleBarAction
+            ->setChecked(features() & QDockWidget::DockWidgetVerticalTitleBar);
+    }
+
+    allowLeftAction->setChecked(isAreaAllowed(Qt::LeftDockWidgetArea));
+    allowRightAction->setChecked(isAreaAllowed(Qt::RightDockWidgetArea));
+    allowTopAction->setChecked(isAreaAllowed(Qt::TopDockWidgetArea));
+    allowBottomAction->setChecked(isAreaAllowed(Qt::BottomDockWidgetArea));
+
+    if (allowedAreasActions->isEnabled()) {
+        allowLeftAction->setEnabled(area != Qt::LeftDockWidgetArea);
+        allowRightAction->setEnabled(area != Qt::RightDockWidgetArea);
+        allowTopAction->setEnabled(area != Qt::TopDockWidgetArea);
+        allowBottomAction->setEnabled(area != Qt::BottomDockWidgetArea);
+    }
+
+    leftAction->blockSignals(true);
+    rightAction->blockSignals(true);
+    topAction->blockSignals(true);
+    bottomAction->blockSignals(true);
+
+    leftAction->setChecked(area == Qt::LeftDockWidgetArea);
+    rightAction->setChecked(area == Qt::RightDockWidgetArea);
+    topAction->setChecked(area == Qt::TopDockWidgetArea);
+    bottomAction->setChecked(area == Qt::BottomDockWidgetArea);
+
+    leftAction->blockSignals(false);
+    rightAction->blockSignals(false);
+    topAction->blockSignals(false);
+    bottomAction->blockSignals(false);
+
+    if (areaActions->isEnabled()) {
+        leftAction->setEnabled(areas & Qt::LeftDockWidgetArea);
+        rightAction->setEnabled(areas & Qt::RightDockWidgetArea);
+        topAction->setEnabled(areas & Qt::TopDockWidgetArea);
+        bottomAction->setEnabled(areas & Qt::BottomDockWidgetArea);
+    }
+
+    tabMenu->clear();
+    splitHMenu->clear();
+    splitVMenu->clear();
+    QList<ColorSwatch*> dock_list = qFindChildren<ColorSwatch*>(mainWindow);
+    foreach (ColorSwatch *dock, dock_list) {
+//        if (!dock->isVisible() || dock->isFloating())
+//            continue;
+        tabMenu->addAction(dock->objectName());
+        splitHMenu->addAction(dock->objectName());
+        splitVMenu->addAction(dock->objectName());
+    }
+}
+
+void ColorSwatch::splitInto(QAction *action)
+{
+    QMainWindow *mainWindow = qobject_cast<QMainWindow *>(parentWidget());
+    QList<ColorSwatch*> dock_list = qFindChildren<ColorSwatch*>(mainWindow);
+    ColorSwatch *target = 0;
+    foreach (ColorSwatch *dock, dock_list) {
+        if (action->text() == dock->objectName()) {
+            target = dock;
+            break;
+        }
+    }
+    if (target == 0)
+        return;
+
+    Qt::Orientation o = action->parent() == splitHMenu
+                        ? Qt::Horizontal : Qt::Vertical;
+    mainWindow->splitDockWidget(target, this, o);
+}
+
+void ColorSwatch::tabInto(QAction *action)
+{
+    QMainWindow *mainWindow = qobject_cast<QMainWindow *>(parentWidget());
+    QList<ColorSwatch*> dock_list = qFindChildren<ColorSwatch*>(mainWindow);
+    ColorSwatch *target = 0;
+    foreach (ColorSwatch *dock, dock_list) {
+        if (action->text() == dock->objectName()) {
+            target = dock;
+            break;
+        }
+    }
+    if (target == 0)
+        return;
+
+    mainWindow->tabifyDockWidget(target, this);
+}
+
+void ColorSwatch::contextMenuEvent(QContextMenuEvent *event)
+{
+    event->accept();
+    menu->exec(event->globalPos());
+}
+
+void ColorSwatch::resizeEvent(QResizeEvent *e)
+{
+    if (BlueTitleBar *btb = qobject_cast<BlueTitleBar*>(titleBarWidget()))
+        btb->updateMask();
+
+    QDockWidget::resizeEvent(e);
+}
+
+
+void ColorSwatch::allow(Qt::DockWidgetArea area, bool a)
+{
+    Qt::DockWidgetAreas areas = allowedAreas();
+    areas = a ? areas | area : areas & ~area;
+    setAllowedAreas(areas);
+
+    if (areaActions->isEnabled()) {
+        leftAction->setEnabled(areas & Qt::LeftDockWidgetArea);
+        rightAction->setEnabled(areas & Qt::RightDockWidgetArea);
+        topAction->setEnabled(areas & Qt::TopDockWidgetArea);
+        bottomAction->setEnabled(areas & Qt::BottomDockWidgetArea);
+    }
+}
+
+void ColorSwatch::place(Qt::DockWidgetArea area, bool p)
+{
+    if (!p) return;
+
+    QMainWindow *mainWindow = qobject_cast<QMainWindow *>(parentWidget());
+    mainWindow->addDockWidget(area, this);
+
+    if (allowedAreasActions->isEnabled()) {
+        allowLeftAction->setEnabled(area != Qt::LeftDockWidgetArea);
+        allowRightAction->setEnabled(area != Qt::RightDockWidgetArea);
+        allowTopAction->setEnabled(area != Qt::TopDockWidgetArea);
+        allowBottomAction->setEnabled(area != Qt::BottomDockWidgetArea);
+    }
+}
+
+void ColorSwatch::setCustomSizeHint(const QSize &size)
+{
+    if (ColorDock *dock = qobject_cast<ColorDock*>(widget()))
+        dock->setCustomSizeHint(size);
+}
+
+void ColorSwatch::changeClosable(bool on)
+{ setFeatures(on ? features() | DockWidgetClosable : features() & ~DockWidgetClosable); }
+
+void ColorSwatch::changeMovable(bool on)
+{ setFeatures(on ? features() | DockWidgetMovable : features() & ~DockWidgetMovable); }
+
+void ColorSwatch::changeFloatable(bool on)
+{ setFeatures(on ? features() | DockWidgetFloatable : features() & ~DockWidgetFloatable); }
+
+void ColorSwatch::changeFloating(bool floating)
+{ setFloating(floating); }
+
+void ColorSwatch::allowLeft(bool a)
+{ allow(Qt::LeftDockWidgetArea, a); }
+
+void ColorSwatch::allowRight(bool a)
+{ allow(Qt::RightDockWidgetArea, a); }
+
+void ColorSwatch::allowTop(bool a)
+{ allow(Qt::TopDockWidgetArea, a); }
+
+void ColorSwatch::allowBottom(bool a)
+{ allow(Qt::BottomDockWidgetArea, a); }
+
+void ColorSwatch::placeLeft(bool p)
+{ place(Qt::LeftDockWidgetArea, p); }
+
+void ColorSwatch::placeRight(bool p)
+{ place(Qt::RightDockWidgetArea, p); }
+
+void ColorSwatch::placeTop(bool p)
+{ place(Qt::TopDockWidgetArea, p); }
+
+void ColorSwatch::placeBottom(bool p)
+{ place(Qt::BottomDockWidgetArea, p); }
+
+void ColorSwatch::changeVerticalTitleBar(bool on)
+{
+    setFeatures(on ? features() | DockWidgetVerticalTitleBar
+                    : features() & ~DockWidgetVerticalTitleBar);
+}
+
+QSize BlueTitleBar::minimumSizeHint() const
+{
+    QDockWidget *dw = qobject_cast<QDockWidget*>(parentWidget());
+    Q_ASSERT(dw != 0);
+    QSize result(leftPm.width() + rightPm.width(), centerPm.height());
+    if (dw->features() & QDockWidget::DockWidgetVerticalTitleBar)
+        result.transpose();
+    return result;
+}
+
+BlueTitleBar::BlueTitleBar(QWidget *parent)
+    : QWidget(parent)
+{
+    leftPm = QPixmap(":/res/titlebarLeft.png");
+    centerPm = QPixmap(":/res/titlebarCenter.png");
+    rightPm = QPixmap(":/res/titlebarRight.png");
+}
+
+void BlueTitleBar::paintEvent(QPaintEvent*)
+{
+    QPainter painter(this);
+    QRect rect = this->rect();
+
+    QDockWidget *dw = qobject_cast<QDockWidget*>(parentWidget());
+    Q_ASSERT(dw != 0);
+
+    if (dw->features() & QDockWidget::DockWidgetVerticalTitleBar) {
+        QSize s = rect.size();
+        s.transpose();
+        rect.setSize(s);
+
+        painter.translate(rect.left(), rect.top() + rect.width());
+        painter.rotate(-90);
+        painter.translate(-rect.left(), -rect.top());
+    }
+
+    painter.drawPixmap(rect.topLeft(), leftPm);
+    painter.drawPixmap(rect.topRight() - QPoint(rightPm.width() - 1, 0), rightPm);
+    QBrush brush(centerPm);
+    painter.fillRect(rect.left() + leftPm.width(), rect.top(),
+                        rect.width() - leftPm.width() - rightPm.width(),
+                        centerPm.height(), centerPm);
+}
+
+void BlueTitleBar::mousePressEvent(QMouseEvent *event)
+{
+    QPoint pos = event->pos();
+
+    QRect rect = this->rect();
+
+    QDockWidget *dw = qobject_cast<QDockWidget*>(parentWidget());
+    Q_ASSERT(dw != 0);
+
+    if (dw->features() & QDockWidget::DockWidgetVerticalTitleBar) {
+        QPoint p = pos;
+        pos.setX(rect.left() + rect.bottom() - p.y());
+        pos.setY(rect.top() + p.x() - rect.left());
+
+        QSize s = rect.size();
+        s.transpose();
+        rect.setSize(s);
+    }
+
+    const int buttonRight = 7;
+    const int buttonWidth = 20;
+    int right = rect.right() - pos.x();
+    int button = (right - buttonRight)/buttonWidth;
+    switch (button) {
+        case 0:
+            event->accept();
+            dw->close();
+            break;
+        case 1:
+            event->accept();
+            dw->setFloating(!dw->isFloating());
+            break;
+        case 2: {
+            event->accept();
+            QDockWidget::DockWidgetFeatures features = dw->features();
+            if (features & QDockWidget::DockWidgetVerticalTitleBar)
+                features &= ~QDockWidget::DockWidgetVerticalTitleBar;
+            else
+                features |= QDockWidget::DockWidgetVerticalTitleBar;
+            dw->setFeatures(features);
+            break;
+        }
+        default:
+            event->ignore();
+            break;
+    }
+}
+
+void BlueTitleBar::updateMask()
+{
+    QDockWidget *dw = qobject_cast<QDockWidget*>(parent());
+    Q_ASSERT(dw != 0);
+
+    QRect rect = dw->rect();
+    QPixmap bitmap(dw->size());
+
+    {
+        QPainter painter(&bitmap);
+
+        ///initialize to transparent
+        painter.fillRect(rect, Qt::color0);
+
+        QRect contents = rect;
+        contents.setTopLeft(geometry().bottomLeft());
+        contents.setRight(geometry().right());
+        contents.setBottom(contents.bottom()-y());
+        painter.fillRect(contents, Qt::color1);
+
+
+
+        //let's pait the titlebar
+
+        QRect titleRect = this->geometry();
+
+        if (dw->features() & QDockWidget::DockWidgetVerticalTitleBar) {
+            QSize s = rect.size();
+            s.transpose();
+            rect.setSize(s);
+
+            QSize s2 = size();
+            s2.transpose();
+            titleRect.setSize(s2);
+
+            painter.translate(rect.left(), rect.top() + rect.width());
+            painter.rotate(-90);
+            painter.translate(-rect.left(), -rect.top());
+        }
+
+        contents.setTopLeft(titleRect.bottomLeft());
+        contents.setRight(titleRect.right());
+        contents.setBottom(rect.bottom()-y());
+
+        QRect rect = titleRect;
+
+
+        painter.drawPixmap(rect.topLeft(), leftPm.mask());
+        painter.fillRect(rect.left() + leftPm.width(), rect.top(),
+            rect.width() - leftPm.width() - rightPm.width(),
+            centerPm.height(), Qt::color1);
+        painter.drawPixmap(rect.topRight() - QPoint(rightPm.width() - 1, 0), rightPm.mask());
+
+        painter.fillRect(contents, Qt::color1);
+    }
+
+    dw->setMask(bitmap);
+}
+
+#include "colorswatch.moc"
diff --git a/demos/mainwindow/colorswatch.h b/demos/mainwindow/colorswatch.h
new file mode 100644
index 0000000000..57c5ac6f02
--- /dev/null
+++ b/demos/mainwindow/colorswatch.h
@@ -0,0 +1,136 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef COLORSWATCH_H
+#define COLORSWATCH_H
+
+#include <QDockWidget>
+
+QT_FORWARD_DECLARE_CLASS(QAction)
+QT_FORWARD_DECLARE_CLASS(QActionGroup)
+QT_FORWARD_DECLARE_CLASS(QMenu)
+
+class ColorSwatch : public QDockWidget
+{
+    Q_OBJECT
+
+    QAction *closableAction;
+    QAction *movableAction;
+    QAction *floatableAction;
+    QAction *floatingAction;
+    QAction *verticalTitleBarAction;
+
+    QActionGroup *allowedAreasActions;
+    QAction *allowLeftAction;
+    QAction *allowRightAction;
+    QAction *allowTopAction;
+    QAction *allowBottomAction;
+
+    QActionGroup *areaActions;
+    QAction *leftAction;
+    QAction *rightAction;
+    QAction *topAction;
+    QAction *bottomAction;
+
+    QAction *changeSizeHintsAction;
+
+    QMenu *tabMenu;
+    QMenu *splitHMenu;
+    QMenu *splitVMenu;
+
+    QAction *windowModifiedAction;
+
+public:
+    ColorSwatch(const QString &colorName, QWidget *parent = 0, Qt::WindowFlags flags = 0);
+
+    QMenu *menu;
+    void setCustomSizeHint(const QSize &size);
+
+protected:
+    virtual void contextMenuEvent(QContextMenuEvent *event);
+    virtual void resizeEvent(QResizeEvent *e);
+
+private:
+    void allow(Qt::DockWidgetArea area, bool allow);
+    void place(Qt::DockWidgetArea area, bool place);
+
+private slots:
+    void changeClosable(bool on);
+    void changeMovable(bool on);
+    void changeFloatable(bool on);
+    void changeFloating(bool on);
+    void changeVerticalTitleBar(bool on);
+    void updateContextMenu();
+
+    void allowLeft(bool a);
+    void allowRight(bool a);
+    void allowTop(bool a);
+    void allowBottom(bool a);
+
+    void placeLeft(bool p);
+    void placeRight(bool p);
+    void placeTop(bool p);
+    void placeBottom(bool p);
+
+    void splitInto(QAction *action);
+    void tabInto(QAction *action);
+};
+
+class BlueTitleBar : public QWidget
+{
+    Q_OBJECT
+public:
+    BlueTitleBar(QWidget *parent = 0);
+
+    QSize sizeHint() const { return minimumSizeHint(); }
+    QSize minimumSizeHint() const;
+protected:
+    void paintEvent(QPaintEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+public slots:
+    void updateMask();
+
+private:
+    QPixmap leftPm, centerPm, rightPm;
+};
+
+
+#endif
diff --git a/demos/mainwindow/main.cpp b/demos/mainwindow/main.cpp
new file mode 100644
index 0000000000..46268b5868
--- /dev/null
+++ b/demos/mainwindow/main.cpp
@@ -0,0 +1,164 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mainwindow.h"
+
+#include <QApplication>
+#include <QPainterPath>
+#include <QPainter>
+#include <QMap>
+#include <qdebug.h>
+
+void render_qt_text(QPainter *painter, int w, int h, const QColor &color) {
+    QPainterPath path;
+    path.moveTo(-0.083695, 0.283849);
+    path.cubicTo(-0.049581, 0.349613, -0.012720, 0.397969, 0.026886, 0.428917);
+    path.cubicTo(0.066493, 0.459865, 0.111593, 0.477595, 0.162186, 0.482108);
+    path.lineTo(0.162186, 0.500000);
+    path.cubicTo(0.115929, 0.498066, 0.066565, 0.487669, 0.014094, 0.468810);
+    path.cubicTo(-0.038378, 0.449952, -0.088103, 0.423839, -0.135082, 0.390474);
+    path.cubicTo(-0.182061, 0.357108, -0.222608, 0.321567, -0.256722, 0.283849);
+    path.cubicTo(-0.304712, 0.262250, -0.342874, 0.239362, -0.371206, 0.215184);
+    path.cubicTo(-0.411969, 0.179078, -0.443625, 0.134671, -0.466175, 0.081963);
+    path.cubicTo(-0.488725, 0.029255, -0.500000, -0.033043, -0.500000, -0.104932);
+    path.cubicTo(-0.500000, -0.218407, -0.467042, -0.312621, -0.401127, -0.387573);
+    path.cubicTo(-0.335212, -0.462524, -0.255421, -0.500000, -0.161752, -0.500000);
+    path.cubicTo(-0.072998, -0.500000, 0.003903, -0.462444, 0.068951, -0.387331);
+    path.cubicTo(0.133998, -0.312218, 0.166522, -0.217440, 0.166522, -0.102998);
+    path.cubicTo(0.166522, -0.010155, 0.143394, 0.071325, 0.097138, 0.141441);
+    path.cubicTo(0.050882, 0.211557, -0.009396, 0.259026, -0.083695, 0.283849);
+    path.moveTo(-0.167823, -0.456963);
+    path.cubicTo(-0.228823, -0.456963, -0.277826, -0.432624, -0.314831, -0.383946);
+    path.cubicTo(-0.361665, -0.323340, -0.385082, -0.230335, -0.385082, -0.104932);
+    path.cubicTo(-0.385082, 0.017569, -0.361376, 0.112025, -0.313964, 0.178433);
+    path.cubicTo(-0.277248, 0.229368, -0.228534, 0.254836, -0.167823, 0.254836);
+    path.cubicTo(-0.105088, 0.254836, -0.054496, 0.229368, -0.016045, 0.178433);
+    path.cubicTo(0.029055, 0.117827, 0.051605, 0.028691, 0.051605, -0.088975);
+    path.cubicTo(0.051605, -0.179562, 0.039318, -0.255803, 0.014744, -0.317698);
+    path.cubicTo(-0.004337, -0.365409, -0.029705, -0.400548, -0.061362, -0.423114);
+    path.cubicTo(-0.093018, -0.445680, -0.128505, -0.456963, -0.167823, -0.456963);
+    path.moveTo(0.379011, -0.404739);
+    path.lineTo(0.379011, -0.236460);
+    path.lineTo(0.486123, -0.236460);
+    path.lineTo(0.486123, -0.197292);
+    path.lineTo(0.379011, -0.197292);
+    path.lineTo(0.379011, 0.134913);
+    path.cubicTo(0.379011, 0.168117, 0.383276, 0.190442, 0.391804, 0.201886);
+    path.cubicTo(0.400332, 0.213330, 0.411246, 0.219052, 0.424545, 0.219052);
+    path.cubicTo(0.435531, 0.219052, 0.446227, 0.215264, 0.456635, 0.207689);
+    path.cubicTo(0.467042, 0.200113, 0.474993, 0.188910, 0.480486, 0.174081);
+    path.lineTo(0.500000, 0.174081);
+    path.cubicTo(0.488436, 0.210509, 0.471957, 0.237911, 0.450564, 0.256286);
+    path.cubicTo(0.429170, 0.274662, 0.407054, 0.283849, 0.384215, 0.283849);
+    path.cubicTo(0.368893, 0.283849, 0.353859, 0.279094, 0.339115, 0.269584);
+    path.cubicTo(0.324371, 0.260074, 0.313530, 0.246534, 0.306592, 0.228965);
+    path.cubicTo(0.299653, 0.211396, 0.296184, 0.184075, 0.296184, 0.147002);
+    path.lineTo(0.296184, -0.197292);
+    path.lineTo(0.223330, -0.197292);
+    path.lineTo(0.223330, -0.215667);
+    path.cubicTo(0.241833, -0.224049, 0.260697, -0.237992, 0.279922, -0.257495);
+    path.cubicTo(0.299147, -0.276999, 0.316276, -0.300129, 0.331310, -0.326886);
+    path.cubicTo(0.338826, -0.341070, 0.349523, -0.367021, 0.363400, -0.404739);
+    path.lineTo(0.379011, -0.404739);
+    path.moveTo(-0.535993, 0.275629);
+
+    painter->translate(w / 2, h / 2);
+    double scale = qMin(w, h) * 8 / 10.0;
+    painter->scale(scale, scale);
+
+    painter->setRenderHint(QPainter::Antialiasing);
+
+    painter->save();
+    painter->translate(.1, .1);
+    painter->fillPath(path, QColor(0, 0, 0, 63));
+    painter->restore();
+
+    painter->setBrush(color);
+    painter->setPen(QPen(Qt::black, 0.02, Qt::SolidLine, Qt::FlatCap, Qt::RoundJoin));
+    painter->drawPath(path);
+}
+
+void usage()
+{
+    qWarning() << "Usage: mainwindow [-SizeHint<color> <width>x<height>] ...";
+    exit(1);
+}
+
+QMap<QString, QSize> parseCustomSizeHints(int argc, char **argv)
+{
+    QMap<QString, QSize> result;
+
+    for (int i = 1; i < argc; ++i) {
+        QString arg = QString::fromLocal8Bit(argv[i]);
+
+        if (arg.startsWith(QLatin1String("-SizeHint"))) {
+            QString name = arg.mid(9);
+            if (name.isEmpty())
+                usage();
+            if (++i == argc)
+                usage();
+            QString sizeStr = QString::fromLocal8Bit(argv[i]);
+            int idx = sizeStr.indexOf(QLatin1Char('x'));
+            if (idx == -1)
+                usage();
+            bool ok;
+            int w = sizeStr.left(idx).toInt(&ok);
+            if (!ok)
+                usage();
+            int h = sizeStr.mid(idx + 1).toInt(&ok);
+            if (!ok)
+                usage();
+            result[name] = QSize(w, h);
+        }
+    }
+
+    return result;
+}
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    QMap<QString, QSize> customSizeHints = parseCustomSizeHints(argc, argv);
+    MainWindow mainWin(customSizeHints);
+    mainWin.resize(800, 600);
+    mainWin.show();
+    return app.exec();
+}
diff --git a/demos/mainwindow/mainwindow.cpp b/demos/mainwindow/mainwindow.cpp
new file mode 100644
index 0000000000..7edaf52eb7
--- /dev/null
+++ b/demos/mainwindow/mainwindow.cpp
@@ -0,0 +1,510 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mainwindow.h"
+#include "colorswatch.h"
+#include "toolbar.h"
+
+#include <QAction>
+#include <QLayout>
+#include <QMenu>
+#include <QMenuBar>
+#include <QStatusBar>
+#include <QTextEdit>
+#include <QFile>
+#include <QDataStream>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QSignalMapper>
+#include <QApplication>
+#include <QPainter>
+#include <QMouseEvent>
+#include <QLineEdit>
+#include <QComboBox>
+#include <QLabel>
+#include <QPushButton>
+#include <qdebug.h>
+
+static const char * const message =
+    "<p><b>Qt Main Window Demo</b></p>"
+
+    "<p>This is a demonstration of the QMainWindow, QToolBar and "
+    "QDockWidget classes.</p>"
+
+    "<p>The tool bar and dock widgets can be dragged around and rearranged "
+    "using the mouse or via the menu.</p>"
+
+    "<p>Each dock widget contains a colored frame and a context "
+    "(right-click) menu.</p>"
+
+#ifdef Q_WS_MAC
+    "<p>On Mac OS X, the \"Black\" dock widget has been created as a "
+    "<em>Drawer</em>, which is a special kind of QDockWidget.</p>"
+#endif
+    ;
+
+MainWindow::MainWindow(const QMap<QString, QSize> &customSizeHints,
+                        QWidget *parent, Qt::WindowFlags flags)
+    : QMainWindow(parent, flags)
+{
+    setObjectName("MainWindow");
+    setWindowTitle("Qt Main Window Demo");
+
+    center = new QTextEdit(this);
+    center->setReadOnly(true);
+    center->setMinimumSize(400, 205);
+    setCentralWidget(center);
+
+    setupToolBar();
+    setupMenuBar();
+    setupDockWidgets(customSizeHints);
+
+    statusBar()->showMessage(tr("Status Bar"));
+}
+
+void MainWindow::actionTriggered(QAction *action)
+{
+    qDebug("action '%s' triggered", action->text().toLocal8Bit().data());
+}
+
+void MainWindow::setupToolBar()
+{
+    for (int i = 0; i < 3; ++i) {
+        ToolBar *tb = new ToolBar(QString::fromLatin1("Tool Bar %1").arg(i + 1), this);
+        toolBars.append(tb);
+        addToolBar(tb);
+    }
+}
+
+void MainWindow::setupMenuBar()
+{
+    QMenu *menu = menuBar()->addMenu(tr("&File"));
+
+    QAction *action = menu->addAction(tr("Save layout..."));
+    connect(action, SIGNAL(triggered()), this, SLOT(saveLayout()));
+
+    action = menu->addAction(tr("Load layout..."));
+    connect(action, SIGNAL(triggered()), this, SLOT(loadLayout()));
+
+    action = menu->addAction(tr("Switch layout direction"));
+    connect(action, SIGNAL(triggered()), this, SLOT(switchLayoutDirection()));
+
+    menu->addSeparator();
+
+    menu->addAction(tr("&Quit"), this, SLOT(close()));
+
+    mainWindowMenu = menuBar()->addMenu(tr("Main window"));
+
+    action = mainWindowMenu->addAction(tr("Animated docks"));
+    action->setCheckable(true);
+    action->setChecked(dockOptions() & AnimatedDocks);
+    connect(action, SIGNAL(toggled(bool)), this, SLOT(setDockOptions()));
+
+    action = mainWindowMenu->addAction(tr("Allow nested docks"));
+    action->setCheckable(true);
+    action->setChecked(dockOptions() & AllowNestedDocks);
+    connect(action, SIGNAL(toggled(bool)), this, SLOT(setDockOptions()));
+
+    action = mainWindowMenu->addAction(tr("Allow tabbed docks"));
+    action->setCheckable(true);
+    action->setChecked(dockOptions() & AllowTabbedDocks);
+    connect(action, SIGNAL(toggled(bool)), this, SLOT(setDockOptions()));
+
+    action = mainWindowMenu->addAction(tr("Force tabbed docks"));
+    action->setCheckable(true);
+    action->setChecked(dockOptions() & ForceTabbedDocks);
+    connect(action, SIGNAL(toggled(bool)), this, SLOT(setDockOptions()));
+
+    action = mainWindowMenu->addAction(tr("Vertical tabs"));
+    action->setCheckable(true);
+    action->setChecked(dockOptions() & VerticalTabs);
+    connect(action, SIGNAL(toggled(bool)), this, SLOT(setDockOptions()));
+
+    QMenu *toolBarMenu = menuBar()->addMenu(tr("Tool bars"));
+    for (int i = 0; i < toolBars.count(); ++i)
+        toolBarMenu->addMenu(toolBars.at(i)->menu);
+
+    dockWidgetMenu = menuBar()->addMenu(tr("&Dock Widgets"));
+}
+
+void MainWindow::setDockOptions()
+{
+    DockOptions opts;
+    QList<QAction*> actions = mainWindowMenu->actions();
+
+    if (actions.at(0)->isChecked())
+        opts |= AnimatedDocks;
+    if (actions.at(1)->isChecked())
+        opts |= AllowNestedDocks;
+    if (actions.at(2)->isChecked())
+        opts |= AllowTabbedDocks;
+    if (actions.at(3)->isChecked())
+        opts |= ForceTabbedDocks;
+    if (actions.at(4)->isChecked())
+        opts |= VerticalTabs;
+
+    QMainWindow::setDockOptions(opts);
+}
+
+void MainWindow::saveLayout()
+{
+    QString fileName
+        = QFileDialog::getSaveFileName(this, tr("Save layout"));
+    if (fileName.isEmpty())
+        return;
+    QFile file(fileName);
+    if (!file.open(QFile::WriteOnly)) {
+        QString msg = tr("Failed to open %1\n%2")
+                        .arg(fileName)
+                        .arg(file.errorString());
+        QMessageBox::warning(this, tr("Error"), msg);
+        return;
+    }
+
+    QByteArray geo_data = saveGeometry();
+    QByteArray layout_data = saveState();
+
+    bool ok = file.putChar((uchar)geo_data.size());
+    if (ok)
+        ok = file.write(geo_data) == geo_data.size();
+    if (ok)
+        ok = file.write(layout_data) == layout_data.size();
+
+    if (!ok) {
+        QString msg = tr("Error writing to %1\n%2")
+                        .arg(fileName)
+                        .arg(file.errorString());
+        QMessageBox::warning(this, tr("Error"), msg);
+        return;
+    }
+}
+
+void MainWindow::loadLayout()
+{
+    QString fileName
+        = QFileDialog::getOpenFileName(this, tr("Load layout"));
+    if (fileName.isEmpty())
+        return;
+    QFile file(fileName);
+    if (!file.open(QFile::ReadOnly)) {
+        QString msg = tr("Failed to open %1\n%2")
+                        .arg(fileName)
+                        .arg(file.errorString());
+        QMessageBox::warning(this, tr("Error"), msg);
+        return;
+    }
+
+    uchar geo_size;
+    QByteArray geo_data;
+    QByteArray layout_data;
+
+    bool ok = file.getChar((char*)&geo_size);
+    if (ok) {
+        geo_data = file.read(geo_size);
+        ok = geo_data.size() == geo_size;
+    }
+    if (ok) {
+        layout_data = file.readAll();
+        ok = layout_data.size() > 0;
+    }
+
+    if (ok)
+        ok = restoreGeometry(geo_data);
+    if (ok)
+        ok = restoreState(layout_data);
+
+    if (!ok) {
+        QString msg = tr("Error reading %1")
+                        .arg(fileName);
+        QMessageBox::warning(this, tr("Error"), msg);
+        return;
+    }
+}
+
+QAction *addAction(QMenu *menu, const QString &text, QActionGroup *group, QSignalMapper *mapper,
+                    int id)
+{
+    bool first = group->actions().isEmpty();
+    QAction *result = menu->addAction(text);
+    result->setCheckable(true);
+    result->setChecked(first);
+    group->addAction(result);
+    QObject::connect(result, SIGNAL(triggered()), mapper, SLOT(map()));
+    mapper->setMapping(result, id);
+    return result;
+}
+
+void MainWindow::setupDockWidgets(const QMap<QString, QSize> &customSizeHints)
+{
+    mapper = new QSignalMapper(this);
+    connect(mapper, SIGNAL(mapped(int)), this, SLOT(setCorner(int)));
+
+    QMenu *corner_menu = dockWidgetMenu->addMenu(tr("Top left corner"));
+    QActionGroup *group = new QActionGroup(this);
+    group->setExclusive(true);
+    ::addAction(corner_menu, tr("Top dock area"), group, mapper, 0);
+    ::addAction(corner_menu, tr("Left dock area"), group, mapper, 1);
+
+    corner_menu = dockWidgetMenu->addMenu(tr("Top right corner"));
+    group = new QActionGroup(this);
+    group->setExclusive(true);
+    ::addAction(corner_menu, tr("Top dock area"), group, mapper, 2);
+    ::addAction(corner_menu, tr("Right dock area"), group, mapper, 3);
+
+    corner_menu = dockWidgetMenu->addMenu(tr("Bottom left corner"));
+    group = new QActionGroup(this);
+    group->setExclusive(true);
+    ::addAction(corner_menu, tr("Bottom dock area"), group, mapper, 4);
+    ::addAction(corner_menu, tr("Left dock area"), group, mapper, 5);
+
+    corner_menu = dockWidgetMenu->addMenu(tr("Bottom right corner"));
+    group = new QActionGroup(this);
+    group->setExclusive(true);
+    ::addAction(corner_menu, tr("Bottom dock area"), group, mapper, 6);
+    ::addAction(corner_menu, tr("Right dock area"), group, mapper, 7);
+
+    dockWidgetMenu->addSeparator();
+
+    static const struct Set {
+        const char * name;
+        uint flags;
+        Qt::DockWidgetArea area;
+    } sets [] = {
+#ifndef Q_WS_MAC
+        { "Black", 0, Qt::LeftDockWidgetArea },
+#else
+        { "Black", Qt::Drawer, Qt::LeftDockWidgetArea },
+#endif
+        { "White", 0, Qt::RightDockWidgetArea },
+        { "Red", 0, Qt::TopDockWidgetArea },
+        { "Green", 0, Qt::TopDockWidgetArea },
+        { "Blue", 0, Qt::BottomDockWidgetArea },
+        { "Yellow", 0, Qt::BottomDockWidgetArea }
+    };
+    const int setCount = sizeof(sets) / sizeof(Set);
+
+    for (int i = 0; i < setCount; ++i) {
+        ColorSwatch *swatch = new ColorSwatch(tr(sets[i].name), this, Qt::WindowFlags(sets[i].flags));
+        if (i%2)
+            swatch->setWindowIcon(QIcon(QPixmap(":/res/qt.png")));
+        if (qstrcmp(sets[i].name, "Blue") == 0) {
+            BlueTitleBar *titlebar = new BlueTitleBar(swatch);
+            swatch->setTitleBarWidget(titlebar);
+            connect(swatch, SIGNAL(topLevelChanged(bool)), titlebar, SLOT(updateMask()));
+            connect(swatch, SIGNAL(featuresChanged(QDockWidget::DockWidgetFeatures)), titlebar, SLOT(updateMask()));
+
+#ifdef Q_WS_QWS
+            QPalette pal = palette();
+            pal.setBrush(backgroundRole(), QColor(0,0,0,0));
+            swatch->setPalette(pal);
+#endif
+        }
+
+        QString name = QString::fromLatin1(sets[i].name);
+        if (customSizeHints.contains(name))
+            swatch->setCustomSizeHint(customSizeHints.value(name));
+
+        addDockWidget(sets[i].area, swatch);
+        dockWidgetMenu->addMenu(swatch->menu);
+    }
+
+    createDockWidgetAction = new QAction(tr("Add dock widget..."), this);
+    connect(createDockWidgetAction, SIGNAL(triggered()), this, SLOT(createDockWidget()));
+    destroyDockWidgetMenu = new QMenu(tr("Destroy dock widget"), this);
+    destroyDockWidgetMenu->setEnabled(false);
+    connect(destroyDockWidgetMenu, SIGNAL(triggered(QAction*)), this, SLOT(destroyDockWidget(QAction*)));
+
+    dockWidgetMenu->addSeparator();
+    dockWidgetMenu->addAction(createDockWidgetAction);
+    dockWidgetMenu->addMenu(destroyDockWidgetMenu);
+}
+
+void MainWindow::setCorner(int id)
+{
+    switch (id) {
+        case 0:
+            QMainWindow::setCorner(Qt::TopLeftCorner, Qt::TopDockWidgetArea);
+            break;
+        case 1:
+            QMainWindow::setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
+            break;
+        case 2:
+            QMainWindow::setCorner(Qt::TopRightCorner, Qt::TopDockWidgetArea);
+            break;
+        case 3:
+            QMainWindow::setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
+            break;
+        case 4:
+            QMainWindow::setCorner(Qt::BottomLeftCorner, Qt::BottomDockWidgetArea);
+            break;
+        case 5:
+            QMainWindow::setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
+            break;
+        case 6:
+            QMainWindow::setCorner(Qt::BottomRightCorner, Qt::BottomDockWidgetArea);
+            break;
+        case 7:
+            QMainWindow::setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
+            break;
+    }
+}
+
+void MainWindow::showEvent(QShowEvent *event)
+{
+    QMainWindow::showEvent(event);
+}
+
+void MainWindow::switchLayoutDirection()
+{
+    if (layoutDirection() == Qt::LeftToRight)
+        qApp->setLayoutDirection(Qt::RightToLeft);
+    else
+        qApp->setLayoutDirection(Qt::LeftToRight);
+}
+
+class CreateDockWidgetDialog : public QDialog
+{
+public:
+    CreateDockWidgetDialog(QWidget *parent = 0);
+
+    QString objectName() const;
+    Qt::DockWidgetArea location() const;
+
+private:
+    QLineEdit *m_objectName;
+    QComboBox *m_location;
+};
+
+CreateDockWidgetDialog::CreateDockWidgetDialog(QWidget *parent)
+    : QDialog(parent)
+{
+    QGridLayout *layout = new QGridLayout(this);
+
+    layout->addWidget(new QLabel(tr("Object name:")), 0, 0);
+    m_objectName = new QLineEdit;
+    layout->addWidget(m_objectName, 0, 1);
+
+    layout->addWidget(new QLabel(tr("Location:")), 1, 0);
+    m_location = new QComboBox;
+    m_location->setEditable(false);
+    m_location->addItem(tr("Top"));
+    m_location->addItem(tr("Left"));
+    m_location->addItem(tr("Right"));
+    m_location->addItem(tr("Bottom"));
+    m_location->addItem(tr("Restore"));
+    layout->addWidget(m_location, 1, 1);
+
+    QHBoxLayout *buttonLayout = new QHBoxLayout;
+    layout->addLayout(buttonLayout, 2, 0, 1, 2);
+    buttonLayout->addStretch();
+
+    QPushButton *cancelButton = new QPushButton(tr("Cancel"));
+    connect(cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
+    buttonLayout->addWidget(cancelButton);
+    QPushButton *okButton = new QPushButton(tr("Ok"));
+    connect(okButton, SIGNAL(clicked()), this, SLOT(accept()));
+    buttonLayout->addWidget(okButton);
+
+    okButton->setDefault(true);
+}
+
+QString CreateDockWidgetDialog::objectName() const
+{
+    return m_objectName->text();
+}
+
+Qt::DockWidgetArea CreateDockWidgetDialog::location() const
+{
+    switch (m_location->currentIndex()) {
+        case 0: return Qt::TopDockWidgetArea;
+        case 1: return Qt::LeftDockWidgetArea;
+        case 2: return Qt::RightDockWidgetArea;
+        case 3: return Qt::BottomDockWidgetArea;
+        default:
+            break;
+    }
+    return Qt::NoDockWidgetArea;
+}
+
+void MainWindow::createDockWidget()
+{
+    CreateDockWidgetDialog dialog(this);
+    int ret = dialog.exec();
+    if (ret == QDialog::Rejected)
+        return;
+
+    QDockWidget *dw = new QDockWidget;
+    dw->setObjectName(dialog.objectName());
+    dw->setWindowTitle(dialog.objectName());
+    dw->setWidget(new QTextEdit);
+
+    Qt::DockWidgetArea area = dialog.location();
+    switch (area) {
+        case Qt::LeftDockWidgetArea:
+        case Qt::RightDockWidgetArea:
+        case Qt::TopDockWidgetArea:
+        case Qt::BottomDockWidgetArea:
+            addDockWidget(area, dw);
+            break;
+        default:
+            if (!restoreDockWidget(dw)) {
+                QMessageBox::warning(this, QString(), tr("Failed to restore dock widget"));
+                delete dw;
+                return;
+            }
+            break;
+    }
+
+    extraDockWidgets.append(dw);
+    destroyDockWidgetMenu->setEnabled(true);
+    destroyDockWidgetMenu->addAction(new QAction(dialog.objectName(), this));
+}
+
+void MainWindow::destroyDockWidget(QAction *action)
+{
+    int index = destroyDockWidgetMenu->actions().indexOf(action);
+    delete extraDockWidgets.takeAt(index);
+    destroyDockWidgetMenu->removeAction(action);
+    action->deleteLater();
+
+    if (destroyDockWidgetMenu->isEmpty())
+        destroyDockWidgetMenu->setEnabled(false);
+}
diff --git a/demos/mainwindow/mainwindow.h b/demos/mainwindow/mainwindow.h
new file mode 100644
index 0000000000..9c7f620003
--- /dev/null
+++ b/demos/mainwindow/mainwindow.h
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include <QTextEdit>
+
+class ToolBar;
+QT_FORWARD_DECLARE_CLASS(QMenu)
+QT_FORWARD_DECLARE_CLASS(QSignalMapper)
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+    QTextEdit *center;
+    QList<ToolBar*> toolBars;
+    QMenu *dockWidgetMenu;
+    QMenu *mainWindowMenu;
+    QSignalMapper *mapper;
+    QList<QDockWidget*> extraDockWidgets;
+    QAction *createDockWidgetAction;
+    QMenu *destroyDockWidgetMenu;
+
+public:
+    MainWindow(const QMap<QString, QSize> &customSizeHints,
+                QWidget *parent = 0, Qt::WindowFlags flags = 0);
+
+protected:
+    void showEvent(QShowEvent *event);
+
+public slots:
+    void actionTriggered(QAction *action);
+    void saveLayout();
+    void loadLayout();
+    void setCorner(int id);
+    void switchLayoutDirection();
+    void setDockOptions();
+
+    void createDockWidget();
+    void destroyDockWidget(QAction *action);
+
+private:
+    void setupToolBar();
+    void setupMenuBar();
+    void setupDockWidgets(const QMap<QString, QSize> &customSizeHints);
+};
+
+
+#endif
diff --git a/demos/mainwindow/mainwindow.pro b/demos/mainwindow/mainwindow.pro
new file mode 100644
index 0000000000..9853a55a47
--- /dev/null
+++ b/demos/mainwindow/mainwindow.pro
@@ -0,0 +1,16 @@
+TEMPLATE = app
+HEADERS += colorswatch.h mainwindow.h toolbar.h
+SOURCES += colorswatch.cpp mainwindow.cpp toolbar.cpp main.cpp
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+RESOURCES += mainwindow.qrc
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/mainwindow
+sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.png *.jpg *.pro
+sources.path = $$[QT_INSTALL_DEMOS]/mainwindow
+INSTALLS += target sources
+
diff --git a/demos/mainwindow/mainwindow.qrc b/demos/mainwindow/mainwindow.qrc
new file mode 100644
index 0000000000..47ff22a3e4
--- /dev/null
+++ b/demos/mainwindow/mainwindow.qrc
@@ -0,0 +1,8 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/res">
+   <file>qt.png</file>
+   <file>titlebarLeft.png</file>
+   <file>titlebarCenter.png</file>
+   <file>titlebarRight.png</file>
+</qresource>
+</RCC>
diff --git a/demos/mainwindow/qt.png b/demos/mainwindow/qt.png
new file mode 100644
index 0000000000..48fa9fc2ef
--- /dev/null
+++ b/demos/mainwindow/qt.png
diff --git a/demos/mainwindow/titlebarCenter.png b/demos/mainwindow/titlebarCenter.png
new file mode 100644
index 0000000000..5cc141355c
--- /dev/null
+++ b/demos/mainwindow/titlebarCenter.png
diff --git a/demos/mainwindow/titlebarLeft.png b/demos/mainwindow/titlebarLeft.png
new file mode 100644
index 0000000000..315166202b
--- /dev/null
+++ b/demos/mainwindow/titlebarLeft.png
diff --git a/demos/mainwindow/titlebarRight.png b/demos/mainwindow/titlebarRight.png
new file mode 100644
index 0000000000..a4505268ec
--- /dev/null
+++ b/demos/mainwindow/titlebarRight.png
diff --git a/demos/mainwindow/toolbar.cpp b/demos/mainwindow/toolbar.cpp
new file mode 100644
index 0000000000..9de1348495
--- /dev/null
+++ b/demos/mainwindow/toolbar.cpp
@@ -0,0 +1,383 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "toolbar.h"
+
+#include <QMainWindow>
+#include <QMenu>
+#include <QPainter>
+#include <QPainterPath>
+#include <QSpinBox>
+#include <QLabel>
+#include <QToolTip>
+
+#include <stdlib.h>
+
+static QPixmap genIcon(const QSize &iconSize, const QString &, const QColor &color)
+{
+    int w = iconSize.width();
+    int h = iconSize.height();
+
+    QImage image(w, h, QImage::Format_ARGB32_Premultiplied);
+    image.fill(0);
+
+    QPainter p(&image);
+
+    extern void render_qt_text(QPainter *, int, int, const QColor &);
+    render_qt_text(&p, w, h, color);
+
+    return QPixmap::fromImage(image, Qt::DiffuseDither | Qt::DiffuseAlphaDither);
+}
+
+static QPixmap genIcon(const QSize &iconSize, int number, const QColor &color)
+{ return genIcon(iconSize, QString::number(number), color); }
+
+ToolBar::ToolBar(const QString &title, QWidget *parent)
+    : QToolBar(parent), spinbox(0), spinboxAction(0)
+{
+    tip = 0;
+    setWindowTitle(title);
+    setObjectName(title);
+
+    setIconSize(QSize(32, 32));
+
+    QColor bg(palette().background().color());
+    menu = new QMenu("One", this);
+    menu->setIcon(genIcon(iconSize(), 1, Qt::black));
+    menu->addAction(genIcon(iconSize(), "A", Qt::blue), "A");
+    menu->addAction(genIcon(iconSize(), "B", Qt::blue), "B");
+    menu->addAction(genIcon(iconSize(), "C", Qt::blue), "C");
+    addAction(menu->menuAction());
+
+    QAction *two = addAction(genIcon(iconSize(), 2, Qt::white), "Two");
+    QFont boldFont;
+    boldFont.setBold(true);
+    two->setFont(boldFont);
+
+    addAction(genIcon(iconSize(), 3, Qt::red), "Three");
+    addAction(genIcon(iconSize(), 4, Qt::green), "Four");
+    addAction(genIcon(iconSize(), 5, Qt::blue), "Five");
+    addAction(genIcon(iconSize(), 6, Qt::yellow), "Six");
+    orderAction = new QAction(this);
+    orderAction->setText(tr("Order Items in Tool Bar"));
+    connect(orderAction, SIGNAL(triggered()), SLOT(order()));
+
+    randomizeAction = new QAction(this);
+    randomizeAction->setText(tr("Randomize Items in Tool Bar"));
+    connect(randomizeAction, SIGNAL(triggered()), SLOT(randomize()));
+
+    addSpinBoxAction = new QAction(this);
+    addSpinBoxAction->setText(tr("Add Spin Box"));
+    connect(addSpinBoxAction, SIGNAL(triggered()), SLOT(addSpinBox()));
+
+    removeSpinBoxAction = new QAction(this);
+    removeSpinBoxAction->setText(tr("Remove Spin Box"));
+    removeSpinBoxAction->setEnabled(false);
+    connect(removeSpinBoxAction, SIGNAL(triggered()), SLOT(removeSpinBox()));
+
+    movableAction = new QAction(tr("Movable"), this);
+    movableAction->setCheckable(true);
+    connect(movableAction, SIGNAL(triggered(bool)), SLOT(changeMovable(bool)));
+
+    allowedAreasActions = new QActionGroup(this);
+    allowedAreasActions->setExclusive(false);
+
+    allowLeftAction = new QAction(tr("Allow on Left"), this);
+    allowLeftAction->setCheckable(true);
+    connect(allowLeftAction, SIGNAL(triggered(bool)), SLOT(allowLeft(bool)));
+
+    allowRightAction = new QAction(tr("Allow on Right"), this);
+    allowRightAction->setCheckable(true);
+    connect(allowRightAction, SIGNAL(triggered(bool)), SLOT(allowRight(bool)));
+
+    allowTopAction = new QAction(tr("Allow on Top"), this);
+    allowTopAction->setCheckable(true);
+    connect(allowTopAction, SIGNAL(triggered(bool)), SLOT(allowTop(bool)));
+
+    allowBottomAction = new QAction(tr("Allow on Bottom"), this);
+    allowBottomAction->setCheckable(true);
+    connect(allowBottomAction, SIGNAL(triggered(bool)), SLOT(allowBottom(bool)));
+
+    allowedAreasActions->addAction(allowLeftAction);
+    allowedAreasActions->addAction(allowRightAction);
+    allowedAreasActions->addAction(allowTopAction);
+    allowedAreasActions->addAction(allowBottomAction);
+
+    areaActions = new QActionGroup(this);
+    areaActions->setExclusive(true);
+
+    leftAction = new QAction(tr("Place on Left") , this);
+    leftAction->setCheckable(true);
+    connect(leftAction, SIGNAL(triggered(bool)), SLOT(placeLeft(bool)));
+
+    rightAction = new QAction(tr("Place on Right") , this);
+    rightAction->setCheckable(true);
+    connect(rightAction, SIGNAL(triggered(bool)), SLOT(placeRight(bool)));
+
+    topAction = new QAction(tr("Place on Top") , this);
+    topAction->setCheckable(true);
+    connect(topAction, SIGNAL(triggered(bool)), SLOT(placeTop(bool)));
+
+    bottomAction = new QAction(tr("Place on Bottom") , this);
+    bottomAction->setCheckable(true);
+    connect(bottomAction, SIGNAL(triggered(bool)), SLOT(placeBottom(bool)));
+
+    areaActions->addAction(leftAction);
+    areaActions->addAction(rightAction);
+    areaActions->addAction(topAction);
+    areaActions->addAction(bottomAction);
+
+    toolBarBreakAction = new QAction(tr("Insert break"), this);
+    connect(toolBarBreakAction, SIGNAL(triggered(bool)), this, SLOT(insertToolBarBreak()));
+
+    connect(movableAction, SIGNAL(triggered(bool)), areaActions, SLOT(setEnabled(bool)));
+
+    connect(movableAction, SIGNAL(triggered(bool)), allowedAreasActions, SLOT(setEnabled(bool)));
+
+    menu = new QMenu(title, this);
+    menu->addAction(toggleViewAction());
+    menu->addSeparator();
+    menu->addAction(orderAction);
+    menu->addAction(randomizeAction);
+    menu->addSeparator();
+    menu->addAction(addSpinBoxAction);
+    menu->addAction(removeSpinBoxAction);
+    menu->addSeparator();
+    menu->addAction(movableAction);
+    menu->addSeparator();
+    menu->addActions(allowedAreasActions->actions());
+    menu->addSeparator();
+    menu->addActions(areaActions->actions());
+    menu->addSeparator();
+    menu->addAction(toolBarBreakAction);
+
+    connect(menu, SIGNAL(aboutToShow()), this, SLOT(updateMenu()));
+
+    randomize();
+}
+
+void ToolBar::updateMenu()
+{
+    QMainWindow *mainWindow = qobject_cast<QMainWindow *>(parentWidget());
+    Q_ASSERT(mainWindow != 0);
+
+    const Qt::ToolBarArea area = mainWindow->toolBarArea(this);
+    const Qt::ToolBarAreas areas = allowedAreas();
+
+    movableAction->setChecked(isMovable());
+
+    allowLeftAction->setChecked(isAreaAllowed(Qt::LeftToolBarArea));
+    allowRightAction->setChecked(isAreaAllowed(Qt::RightToolBarArea));
+    allowTopAction->setChecked(isAreaAllowed(Qt::TopToolBarArea));
+    allowBottomAction->setChecked(isAreaAllowed(Qt::BottomToolBarArea));
+
+    if (allowedAreasActions->isEnabled()) {
+        allowLeftAction->setEnabled(area != Qt::LeftToolBarArea);
+        allowRightAction->setEnabled(area != Qt::RightToolBarArea);
+        allowTopAction->setEnabled(area != Qt::TopToolBarArea);
+        allowBottomAction->setEnabled(area != Qt::BottomToolBarArea);
+    }
+
+    leftAction->setChecked(area == Qt::LeftToolBarArea);
+    rightAction->setChecked(area == Qt::RightToolBarArea);
+    topAction->setChecked(area == Qt::TopToolBarArea);
+    bottomAction->setChecked(area == Qt::BottomToolBarArea);
+
+    if (areaActions->isEnabled()) {
+        leftAction->setEnabled(areas & Qt::LeftToolBarArea);
+        rightAction->setEnabled(areas & Qt::RightToolBarArea);
+        topAction->setEnabled(areas & Qt::TopToolBarArea);
+        bottomAction->setEnabled(areas & Qt::BottomToolBarArea);
+    }
+}
+
+void ToolBar::order()
+{
+    QList<QAction *> ordered, actions1 = actions(),
+                              actions2 = qFindChildren<QAction *>(this);
+    while (!actions2.isEmpty()) {
+        QAction *action = actions2.takeFirst();
+        if (!actions1.contains(action))
+            continue;
+        actions1.removeAll(action);
+        ordered.append(action);
+    }
+
+    clear();
+    addActions(ordered);
+
+    orderAction->setEnabled(false);
+}
+
+void ToolBar::randomize()
+{
+    QList<QAction *> randomized, actions = this->actions();
+    while (!actions.isEmpty()) {
+        QAction *action = actions.takeAt(rand() % actions.size());
+        randomized.append(action);
+    }
+    clear();
+    addActions(randomized);
+
+    orderAction->setEnabled(true);
+}
+
+void ToolBar::addSpinBox()
+{
+    if (!spinbox) {
+        spinbox = new QSpinBox(this);
+    }
+    if (!spinboxAction)
+        spinboxAction = addWidget(spinbox);
+    else
+        addAction(spinboxAction);
+
+    addSpinBoxAction->setEnabled(false);
+    removeSpinBoxAction->setEnabled(true);
+}
+
+void ToolBar::removeSpinBox()
+{
+    if (spinboxAction)
+        removeAction(spinboxAction);
+
+    addSpinBoxAction->setEnabled(true);
+    removeSpinBoxAction->setEnabled(false);
+}
+
+void ToolBar::allow(Qt::ToolBarArea area, bool a)
+{
+    Qt::ToolBarAreas areas = allowedAreas();
+    areas = a ? areas | area : areas & ~area;
+    setAllowedAreas(areas);
+
+    if (areaActions->isEnabled()) {
+        leftAction->setEnabled(areas & Qt::LeftToolBarArea);
+        rightAction->setEnabled(areas & Qt::RightToolBarArea);
+        topAction->setEnabled(areas & Qt::TopToolBarArea);
+        bottomAction->setEnabled(areas & Qt::BottomToolBarArea);
+    }
+}
+
+void ToolBar::place(Qt::ToolBarArea area, bool p)
+{
+    if (!p)
+        return;
+
+    QMainWindow *mainWindow = qobject_cast<QMainWindow *>(parentWidget());
+    Q_ASSERT(mainWindow != 0);
+
+    mainWindow->addToolBar(area, this);
+
+    if (allowedAreasActions->isEnabled()) {
+        allowLeftAction->setEnabled(area != Qt::LeftToolBarArea);
+        allowRightAction->setEnabled(area != Qt::RightToolBarArea);
+        allowTopAction->setEnabled(area != Qt::TopToolBarArea);
+        allowBottomAction->setEnabled(area != Qt::BottomToolBarArea);
+    }
+}
+
+void ToolBar::changeMovable(bool movable)
+{ setMovable(movable); }
+
+void ToolBar::allowLeft(bool a)
+{ allow(Qt::LeftToolBarArea, a); }
+
+void ToolBar::allowRight(bool a)
+{ allow(Qt::RightToolBarArea, a); }
+
+void ToolBar::allowTop(bool a)
+{ allow(Qt::TopToolBarArea, a); }
+
+void ToolBar::allowBottom(bool a)
+{ allow(Qt::BottomToolBarArea, a); }
+
+void ToolBar::placeLeft(bool p)
+{ place(Qt::LeftToolBarArea, p); }
+
+void ToolBar::placeRight(bool p)
+{ place(Qt::RightToolBarArea, p); }
+
+void ToolBar::placeTop(bool p)
+{ place(Qt::TopToolBarArea, p); }
+
+void ToolBar::placeBottom(bool p)
+{ place(Qt::BottomToolBarArea, p); }
+
+void ToolBar::insertToolBarBreak()
+{
+    QMainWindow *mainWindow = qobject_cast<QMainWindow *>(parentWidget());
+    Q_ASSERT(mainWindow != 0);
+
+    mainWindow->insertToolBarBreak(this);
+}
+
+void ToolBar::enterEvent(QEvent*)
+{
+/*
+    These labels on top of toolbars look darn ugly
+
+    if (tip == 0) {
+        tip = new QLabel(windowTitle(), this);
+        QPalette pal = tip->palette();
+        QColor c = Qt::black;
+        c.setAlpha(100);
+        pal.setColor(QPalette::Window, c);
+        pal.setColor(QPalette::Foreground, Qt::white);
+        tip->setPalette(pal);
+        tip->setAutoFillBackground(true);
+        tip->setMargin(3);
+        tip->setText(windowTitle());
+    }
+    QPoint c = rect().center();
+    QSize hint = tip->sizeHint();
+    tip->setGeometry(c.x() - hint.width()/2, c.y() - hint.height()/2,
+                        hint.width(), hint.height());
+
+    tip->show();
+*/
+}
+
+void ToolBar::leaveEvent(QEvent*)
+{
+    if (tip != 0)
+        tip->hide();
+}
diff --git a/demos/mainwindow/toolbar.h b/demos/mainwindow/toolbar.h
new file mode 100644
index 0000000000..a9b9af2db1
--- /dev/null
+++ b/demos/mainwindow/toolbar.h
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TOOLBAR_H
+#define TOOLBAR_H
+
+#include <QToolBar>
+
+QT_FORWARD_DECLARE_CLASS(QAction)
+QT_FORWARD_DECLARE_CLASS(QActionGroup)
+QT_FORWARD_DECLARE_CLASS(QMenu)
+QT_FORWARD_DECLARE_CLASS(QSpinBox)
+QT_FORWARD_DECLARE_CLASS(QLabel)
+
+class ToolBar : public QToolBar
+{
+    Q_OBJECT
+
+    QSpinBox *spinbox;
+    QAction *spinboxAction;
+
+    QAction *orderAction;
+    QAction *randomizeAction;
+    QAction *addSpinBoxAction;
+    QAction *removeSpinBoxAction;
+
+    QAction *movableAction;
+
+    QActionGroup *allowedAreasActions;
+    QAction *allowLeftAction;
+    QAction *allowRightAction;
+    QAction *allowTopAction;
+    QAction *allowBottomAction;
+
+    QActionGroup *areaActions;
+    QAction *leftAction;
+    QAction *rightAction;
+    QAction *topAction;
+    QAction *bottomAction;
+
+    QAction *toolBarBreakAction;
+
+public:
+    ToolBar(const QString &title, QWidget *parent);
+
+    QMenu *menu;
+
+protected:
+    void enterEvent(QEvent*);
+    void leaveEvent(QEvent*);
+
+private:
+    void allow(Qt::ToolBarArea area, bool allow);
+    void place(Qt::ToolBarArea area, bool place);
+    QLabel *tip;
+
+private slots:
+    void order();
+    void randomize();
+    void addSpinBox();
+    void removeSpinBox();
+
+    void changeMovable(bool movable);
+
+    void allowLeft(bool a);
+    void allowRight(bool a);
+    void allowTop(bool a);
+    void allowBottom(bool a);
+
+    void placeLeft(bool p);
+    void placeRight(bool p);
+    void placeTop(bool p);
+    void placeBottom(bool p);
+
+    void updateMenu();
+    void insertToolBarBreak();
+
+};
+
+#endif
diff --git a/demos/mediaplayer/images/screen.png b/demos/mediaplayer/images/screen.png
new file mode 100644
index 0000000000..a15df92e16
--- /dev/null
+++ b/demos/mediaplayer/images/screen.png
diff --git a/demos/mediaplayer/main.cpp b/demos/mediaplayer/main.cpp
new file mode 100644
index 0000000000..279a6c7422
--- /dev/null
+++ b/demos/mediaplayer/main.cpp
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+***************************************************************************/
+
+#include <QtGui>
+#include "mediaplayer.h"
+
+int main (int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(mediaplayer);
+    QApplication app(argc, argv);
+    app.setApplicationName("Media Player");
+    app.setOrganizationName("Trolltech");
+    app.setQuitOnLastWindowClosed(true);
+    
+    QString fileString = app.arguments().value(1);
+    MediaPlayer player(fileString);
+    player.show();
+
+    return app.exec();
+}
+
diff --git a/demos/mediaplayer/mediaplayer.cpp b/demos/mediaplayer/mediaplayer.cpp
new file mode 100644
index 0000000000..5f5a5dc467
--- /dev/null
+++ b/demos/mediaplayer/mediaplayer.cpp
@@ -0,0 +1,840 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+***************************************************************************/
+
+#include <QtGui>
+
+#define SLIDER_RANGE 8
+
+#include "mediaplayer.h"
+#include "ui_settings.h"
+
+
+class MediaVideoWidget : public Phonon::VideoWidget
+{
+public:
+    MediaVideoWidget(MediaPlayer *player, QWidget *parent = 0) : 
+        Phonon::VideoWidget(parent), m_player(player), m_action(this)
+    {
+        m_action.setCheckable(true);
+        m_action.setChecked(false);
+        m_action.setShortcut(QKeySequence( Qt::AltModifier + Qt::Key_Return));
+        m_action.setShortcutContext(Qt::WindowShortcut);
+        connect(&m_action, SIGNAL(toggled(bool)), SLOT(setFullScreen(bool)));
+        addAction(&m_action);
+        setAcceptDrops(true);
+    }
+
+protected:
+    void mouseDoubleClickEvent(QMouseEvent *e)
+    {
+        Phonon::VideoWidget::mouseDoubleClickEvent(e);
+        setFullScreen(!isFullScreen());
+    }
+
+    void keyPressEvent(QKeyEvent *e)
+    {
+        if (e->key() == Qt::Key_Space && !e->modifiers()) {
+            m_player->playPause();
+            e->accept();
+            return;
+        } else if (e->key() == Qt::Key_Escape && !e->modifiers()) {
+            setFullScreen(false);
+            e->accept();
+            return;
+        }
+        Phonon::VideoWidget::keyPressEvent(e);        
+    }
+
+    bool event(QEvent *e)
+    {
+        switch(e->type())
+        {
+        case QEvent::Close:
+            //we just ignore the cose events on the video widget
+            //this prevents ALT+F4 from having an effect in fullscreen mode
+            e->ignore(); 
+            return true;
+        case QEvent::MouseMove:
+#ifndef QT_NO_CURSOR
+            unsetCursor();
+#endif
+            //fall through
+        case QEvent::WindowStateChange:
+            {
+                //we just update the state of the checkbox, in case it wasn't already
+                m_action.setChecked(windowState() & Qt::WindowFullScreen);
+                const Qt::WindowFlags flags = m_player->windowFlags();
+                if (windowState() & Qt::WindowFullScreen) {
+                    m_timer.start(1000, this);
+                } else {
+                    m_timer.stop();
+#ifndef QT_NO_CURSOR
+                    unsetCursor();
+#endif
+                }
+            }
+            break;
+        default:
+            break;
+        }
+
+        return Phonon::VideoWidget::event(e);
+    }
+
+    void timerEvent(QTimerEvent *e)
+    {
+        if (e->timerId() == m_timer.timerId()) {
+            //let's store the cursor shape
+#ifndef QT_NO_CURSOR
+            setCursor(Qt::BlankCursor);
+#endif
+        }
+        Phonon::VideoWidget::timerEvent(e);
+    }
+
+    void dropEvent(QDropEvent *e)
+    {
+        m_player->handleDrop(e);
+    }
+
+    void dragEnterEvent(QDragEnterEvent *e) {
+        if (e->mimeData()->hasUrls())
+            e->acceptProposedAction();
+    }
+
+private:
+    MediaPlayer *m_player;
+    QBasicTimer m_timer;
+    QAction m_action;
+};
+
+
+MediaPlayer::MediaPlayer(const QString &filePath) :
+        playButton(0), nextEffect(0), settingsDialog(0), ui(0), 
+            m_AudioOutput(Phonon::VideoCategory),
+            m_videoWidget(new MediaVideoWidget(this))
+{
+    setWindowTitle(tr("Media Player"));
+    setContextMenuPolicy(Qt::CustomContextMenu);
+    m_videoWidget->setContextMenuPolicy(Qt::CustomContextMenu);
+ 
+    QSize buttonSize(34, 28);
+
+    QPushButton *openButton = new QPushButton(this);
+
+    openButton->setIcon(style()->standardIcon(QStyle::SP_DialogOpenButton));
+    QPalette bpal;
+    QColor arrowcolor = bpal.buttonText().color();
+    if (arrowcolor == Qt::black)
+        arrowcolor = QColor(80, 80, 80);
+    bpal.setBrush(QPalette::ButtonText, arrowcolor);
+    openButton->setPalette(bpal);
+
+    rewindButton = new QPushButton(this);
+    rewindButton->setIcon(style()->standardIcon(QStyle::SP_MediaSkipBackward));
+
+    forwardButton = new QPushButton(this);
+    forwardButton->setIcon(style()->standardIcon(QStyle::SP_MediaSkipForward));
+    forwardButton->setEnabled(false);
+
+    playButton = new QPushButton(this);
+    playIcon = style()->standardIcon(QStyle::SP_MediaPlay);
+    pauseIcon = style()->standardIcon(QStyle::SP_MediaPause);
+    playButton->setIcon(playIcon);
+
+    slider = new Phonon::SeekSlider(this);
+    slider->setMediaObject(&m_MediaObject);
+    volume = new Phonon::VolumeSlider(&m_AudioOutput);
+ 
+    QVBoxLayout *vLayout = new QVBoxLayout(this);
+    vLayout->setContentsMargins(8, 8, 8, 8);    
+
+    QHBoxLayout *layout = new QHBoxLayout();
+
+    info = new QLabel(this);
+    info->setMinimumHeight(70);
+    info->setAcceptDrops(false);
+    info->setMargin(2);
+    info->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
+    info->setLineWidth(2);
+    info->setAutoFillBackground(true);
+
+    QPalette palette;
+    palette.setBrush(QPalette::WindowText, Qt::white);
+#ifndef Q_WS_MAC
+    openButton->setMinimumSize(54, buttonSize.height());
+    rewindButton->setMinimumSize(buttonSize);
+    forwardButton->setMinimumSize(buttonSize);
+    playButton->setMinimumSize(buttonSize);
+#endif
+    info->setStyleSheet("border-image:url(:/images/screen.png) ; border-width:3px");
+    info->setPalette(palette);
+    info->setText(tr("<center>No media</center>"));
+
+    volume->setFixedWidth(120);
+
+    layout->addWidget(openButton);
+    layout->addWidget(rewindButton);
+    layout->addWidget(playButton);
+    layout->addWidget(forwardButton);
+
+    layout->addStretch();
+    layout->addWidget(volume);
+
+    vLayout->addWidget(info);
+    initVideoWindow();
+    vLayout->addWidget(&m_videoWindow);
+    QVBoxLayout *buttonPanelLayout = new QVBoxLayout();
+    m_videoWindow.hide();
+    buttonPanelLayout->addLayout(layout);
+    
+    timeLabel = new QLabel(this);
+    progressLabel = new QLabel(this);
+    QWidget *sliderPanel = new QWidget(this);
+    QHBoxLayout *sliderLayout = new QHBoxLayout();
+    sliderLayout->addWidget(slider);
+    sliderLayout->addWidget(timeLabel);    
+    sliderLayout->addWidget(progressLabel);    
+    sliderLayout->setContentsMargins(0, 0, 0, 0);
+    sliderPanel->setLayout(sliderLayout);
+
+    buttonPanelLayout->addWidget(sliderPanel);
+    buttonPanelLayout->setContentsMargins(0, 0, 0, 0);
+#ifdef Q_OS_MAC
+    layout->setSpacing(4);
+    buttonPanelLayout->setSpacing(0);
+    info->setMinimumHeight(100);
+    info->setFont(QFont("verdana", 15));
+    // QStyle *flatButtonStyle = new QWindowsStyle;
+    openButton->setFocusPolicy(Qt::NoFocus);
+    // openButton->setStyle(flatButtonStyle);
+    // playButton->setStyle(flatButtonStyle);
+    // rewindButton->setStyle(flatButtonStyle);
+    // forwardButton->setStyle(flatButtonStyle);
+ #endif
+    QWidget *buttonPanelWidget = new QWidget(this);
+    buttonPanelWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); 
+    buttonPanelWidget->setLayout(buttonPanelLayout);    
+    vLayout->addWidget(buttonPanelWidget);
+ 
+    QHBoxLayout *labelLayout = new QHBoxLayout();
+
+    vLayout->addLayout(labelLayout);
+    setLayout(vLayout);
+
+    // Create menu bar:
+    fileMenu = new QMenu(this);
+    QAction *openFileAction = fileMenu->addAction(tr("Open &File..."));
+    QAction *openUrlAction = fileMenu->addAction(tr("Open &Location..."));
+
+    fileMenu->addSeparator();  
+    QMenu *aspectMenu = fileMenu->addMenu(tr("&Aspect ratio"));
+    QActionGroup *aspectGroup = new QActionGroup(aspectMenu);
+    connect(aspectGroup, SIGNAL(triggered(QAction *)), this, SLOT(aspectChanged(QAction *)));
+    aspectGroup->setExclusive(true);
+    QAction *aspectActionAuto = aspectMenu->addAction(tr("Auto"));
+    aspectActionAuto->setCheckable(true);
+    aspectActionAuto->setChecked(true);
+    aspectGroup->addAction(aspectActionAuto);
+    QAction *aspectActionScale = aspectMenu->addAction(tr("Scale"));
+    aspectActionScale->setCheckable(true);
+    aspectGroup->addAction(aspectActionScale);
+    QAction *aspectAction16_9 = aspectMenu->addAction(tr("16/9"));
+    aspectAction16_9->setCheckable(true);
+    aspectGroup->addAction(aspectAction16_9);
+    QAction *aspectAction4_3 = aspectMenu->addAction(tr("4/3"));
+    aspectAction4_3->setCheckable(true);
+    aspectGroup->addAction(aspectAction4_3);
+
+    QMenu *scaleMenu = fileMenu->addMenu(tr("&Scale mode"));
+    QActionGroup *scaleGroup = new QActionGroup(scaleMenu);
+    connect(scaleGroup, SIGNAL(triggered(QAction *)), this, SLOT(scaleChanged(QAction *)));
+    scaleGroup->setExclusive(true);
+    QAction *scaleActionFit = scaleMenu->addAction(tr("Fit in view"));
+    scaleActionFit->setCheckable(true);
+    scaleActionFit->setChecked(true);
+    scaleGroup->addAction(scaleActionFit);
+    QAction *scaleActionCrop = scaleMenu->addAction(tr("Scale and crop"));
+    scaleActionCrop->setCheckable(true);
+    scaleGroup->addAction(scaleActionCrop);
+    
+    fileMenu->addSeparator();    
+    QAction *settingsAction = fileMenu->addAction(tr("&Settings..."));
+    
+    // Setup signal connections:
+    connect(rewindButton, SIGNAL(clicked()), this, SLOT(rewind()));
+    //connect(openButton, SIGNAL(clicked()), this, SLOT(openFile()));
+    openButton->setMenu(fileMenu);
+    
+    connect(playButton, SIGNAL(clicked()), this, SLOT(playPause()));
+    connect(forwardButton, SIGNAL(clicked()), this, SLOT(forward()));
+    //connect(openButton, SIGNAL(clicked()), this, SLOT(openFile()));
+    connect(settingsAction, SIGNAL(triggered(bool)), this, SLOT(showSettingsDialog()));
+    connect(openUrlAction, SIGNAL(triggered(bool)), this, SLOT(openUrl()));
+    connect(openFileAction, SIGNAL(triggered(bool)), this, SLOT(openFile()));
+    
+    connect(m_videoWidget, SIGNAL(customContextMenuRequested(const QPoint &)), SLOT(showContextMenu(const QPoint &)));
+    connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), SLOT(showContextMenu(const QPoint &)));
+    connect(&m_MediaObject, SIGNAL(metaDataChanged()), this, SLOT(updateInfo()));
+    connect(&m_MediaObject, SIGNAL(totalTimeChanged(qint64)), this, SLOT(updateTime()));
+    connect(&m_MediaObject, SIGNAL(tick(qint64)), this, SLOT(updateTime()));
+    connect(&m_MediaObject, SIGNAL(finished()), this, SLOT(finished()));
+    connect(&m_MediaObject, SIGNAL(stateChanged(Phonon::State, Phonon::State)), this, SLOT(stateChanged(Phonon::State, Phonon::State)));
+    connect(&m_MediaObject, SIGNAL(bufferStatus(int)), this, SLOT(bufferStatus(int)));
+
+    rewindButton->setEnabled(false);
+    playButton->setEnabled(false);
+    setAcceptDrops(true);
+
+    m_audioOutputPath = Phonon::createPath(&m_MediaObject, &m_AudioOutput);
+    Phonon::createPath(&m_MediaObject, m_videoWidget);
+
+    if (!filePath.isEmpty())
+        setFile(filePath);
+    resize(minimumSizeHint());
+}
+
+void MediaPlayer::stateChanged(Phonon::State newstate, Phonon::State oldstate)
+{
+    Q_UNUSED(oldstate);
+
+    if (oldstate == Phonon::LoadingState) {
+        m_videoWindow.setVisible(m_MediaObject.hasVideo());
+        info->setVisible(!m_MediaObject.hasVideo());        
+        QRect videoHintRect = QRect(QPoint(0, 0), m_videoWindow.sizeHint());
+        QRect newVideoRect = QApplication::desktop()->screenGeometry().intersected(videoHintRect);
+        if (m_MediaObject.hasVideo()){        
+            // Flush event que so that sizeHint takes the
+            // recently shown/hidden m_videoWindow into account:
+            qApp->processEvents();
+            resize(sizeHint());
+        } else
+            resize(minimumSize());
+    }
+
+    switch (newstate) {
+        case Phonon::ErrorState:
+            QMessageBox::warning(this, "Phonon Mediaplayer", m_MediaObject.errorString(), QMessageBox::Close);
+            if (m_MediaObject.errorType() == Phonon::FatalError) {
+                playButton->setEnabled(false);
+                rewindButton->setEnabled(false);
+            } else {
+                m_MediaObject.pause();
+            }
+            break;
+        case Phonon::PausedState:
+        case Phonon::StoppedState:
+            playButton->setIcon(playIcon);
+            if (m_MediaObject.currentSource().type() != Phonon::MediaSource::Invalid){
+                playButton->setEnabled(true);
+                rewindButton->setEnabled(true);
+            } else {
+                playButton->setEnabled(false);
+                rewindButton->setEnabled(false);
+            }
+            break;
+        case Phonon::PlayingState:
+            playButton->setEnabled(true);
+            playButton->setIcon(pauseIcon);
+            if (m_MediaObject.hasVideo())
+                m_videoWindow.show();
+            // Fall through
+        case Phonon::BufferingState:
+            rewindButton->setEnabled(true);
+            break;
+        case Phonon::LoadingState:
+            rewindButton->setEnabled(false);
+            break;
+    }
+
+}
+
+void MediaPlayer::initSettingsDialog()
+{
+    settingsDialog = new QDialog(this);
+    ui = new Ui_settings();
+    ui->setupUi(settingsDialog);
+
+    connect(ui->brightnessSlider, SIGNAL(valueChanged(int)), this, SLOT(setBrightness(int)));
+    connect(ui->hueSlider, SIGNAL(valueChanged(int)), this, SLOT(setHue(int)));
+    connect(ui->saturationSlider, SIGNAL(valueChanged(int)), this, SLOT(setSaturation(int)));
+    connect(ui->contrastSlider , SIGNAL(valueChanged(int)), this, SLOT(setContrast(int)));
+    connect(ui->aspectCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setAspect(int)));
+    connect(ui->scalemodeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setScale(int)));
+
+    ui->brightnessSlider->setValue(int(m_videoWidget->brightness() * SLIDER_RANGE));
+    ui->hueSlider->setValue(int(m_videoWidget->hue() * SLIDER_RANGE));
+    ui->saturationSlider->setValue(int(m_videoWidget->saturation() * SLIDER_RANGE));
+    ui->contrastSlider->setValue(int(m_videoWidget->contrast() * SLIDER_RANGE));
+    ui->aspectCombo->setCurrentIndex(m_videoWidget->aspectRatio());
+    ui->scalemodeCombo->setCurrentIndex(m_videoWidget->scaleMode());
+    connect(ui->effectButton, SIGNAL(clicked()), this, SLOT(configureEffect()));
+
+#ifdef Q_WS_X11
+    //Cross fading is not currently implemented in the GStreamer backend
+    ui->crossFadeSlider->setVisible(false);
+    ui->crossFadeLabel->setVisible(false);
+    ui->crossFadeLabel1->setVisible(false);
+    ui->crossFadeLabel2->setVisible(false);
+    ui->crossFadeLabel3->setVisible(false);
+#endif
+    ui->crossFadeSlider->setValue((int)(2 * m_MediaObject.transitionTime() / 1000.0f));
+    
+    // Insert audio devices:
+    QList<Phonon::AudioOutputDevice> devices = Phonon::BackendCapabilities::availableAudioOutputDevices();
+    for (int i=0; i<devices.size(); i++){
+        QString itemText = devices[i].name();
+        if (!devices[i].description().isEmpty()) {
+            itemText += QString::fromLatin1(" (%1)").arg(devices[i].description());
+        }
+        ui->deviceCombo->addItem(itemText);
+        if (devices[i] == m_AudioOutput.outputDevice())
+            ui->deviceCombo->setCurrentIndex(i);
+    }
+
+    // Insert audio effects:
+    ui->audioEffectsCombo->addItem(tr("<no effect>"));
+    QList<Phonon::Effect *> currEffects = m_audioOutputPath.effects();
+    Phonon::Effect *currEffect = currEffects.size() ? currEffects[0] : 0;
+    QList<Phonon::EffectDescription> availableEffects = Phonon::BackendCapabilities::availableAudioEffects();
+    for (int i=0; i<availableEffects.size(); i++){
+        ui->audioEffectsCombo->addItem(availableEffects[i].name());
+        if (currEffect && availableEffects[i] == currEffect->description())
+            ui->audioEffectsCombo->setCurrentIndex(i+1);
+    }
+    connect(ui->audioEffectsCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(effectChanged()));
+
+}
+
+void MediaPlayer::effectChanged()
+{
+    int currentIndex = ui->audioEffectsCombo->currentIndex();
+    if (currentIndex) {
+        QList<Phonon::EffectDescription> availableEffects = Phonon::BackendCapabilities::availableAudioEffects();
+        Phonon::EffectDescription chosenEffect = availableEffects[currentIndex - 1];
+
+        QList<Phonon::Effect *> currEffects = m_audioOutputPath.effects();
+        Phonon::Effect *currentEffect = currEffects.size() ? currEffects[0] : 0;
+
+        // Deleting the running effect will stop playback, it is deleted when removed from path
+        if (nextEffect && !(currentEffect && (currentEffect->description().name() == nextEffect->description().name())))
+            delete nextEffect;
+
+        nextEffect = new Phonon::Effect(chosenEffect);
+    }
+    ui->effectButton->setEnabled(currentIndex);
+}
+
+void MediaPlayer::showSettingsDialog()
+{
+    if (!settingsDialog)
+        initSettingsDialog();
+
+    float oldBrightness = m_videoWidget->brightness();
+    float oldHue = m_videoWidget->hue();
+    float oldSaturation = m_videoWidget->saturation();
+    float oldContrast = m_videoWidget->contrast();
+    Phonon::VideoWidget::AspectRatio oldAspect = m_videoWidget->aspectRatio();
+    Phonon::VideoWidget::ScaleMode oldScale = m_videoWidget->scaleMode();
+    int currentEffect = ui->audioEffectsCombo->currentIndex();
+    settingsDialog->exec();
+    
+    if (settingsDialog->result() == QDialog::Accepted){
+        m_MediaObject.setTransitionTime((int)(1000 * float(ui->crossFadeSlider->value()) / 2.0f));
+        QList<Phonon::AudioOutputDevice> devices = Phonon::BackendCapabilities::availableAudioOutputDevices();
+        m_AudioOutput.setOutputDevice(devices[ui->deviceCombo->currentIndex()]);
+        QList<Phonon::Effect *> currEffects = m_audioOutputPath.effects();
+        QList<Phonon::EffectDescription> availableEffects = Phonon::BackendCapabilities::availableAudioEffects();
+
+        if (ui->audioEffectsCombo->currentIndex() > 0){
+            Phonon::Effect *currentEffect = currEffects.size() ? currEffects[0] : 0;    
+            if (!currentEffect || currentEffect->description() != nextEffect->description()){
+                foreach(Phonon::Effect *effect, currEffects) {
+                    m_audioOutputPath.removeEffect(effect);
+                    delete effect;
+                }
+                m_audioOutputPath.insertEffect(nextEffect);
+            }
+        } else {
+            foreach(Phonon::Effect *effect, currEffects) {
+                m_audioOutputPath.removeEffect(effect);
+                delete effect;
+                nextEffect = 0;
+            }
+        }
+    } else {
+        // Restore previous settings
+        m_videoWidget->setBrightness(oldBrightness);
+        m_videoWidget->setSaturation(oldSaturation);
+        m_videoWidget->setHue(oldHue);
+        m_videoWidget->setContrast(oldContrast);
+        m_videoWidget->setAspectRatio(oldAspect);
+        m_videoWidget->setScaleMode(oldScale);
+        ui->audioEffectsCombo->setCurrentIndex(currentEffect);
+    }
+}
+
+void MediaPlayer::initVideoWindow()
+{
+    QVBoxLayout *videoLayout = new QVBoxLayout();
+    videoLayout->addWidget(m_videoWidget);
+    videoLayout->setContentsMargins(0, 0, 0, 0);
+    m_videoWindow.setLayout(videoLayout);
+    m_videoWindow.setMinimumSize(100, 100);
+}
+
+
+void MediaPlayer::configureEffect()
+{
+    if (!nextEffect)
+        return;
+
+
+    QList<Phonon::Effect *> currEffects = m_audioOutputPath.effects();
+    const QList<Phonon::EffectDescription> availableEffects = Phonon::BackendCapabilities::availableAudioEffects();
+    if (ui->audioEffectsCombo->currentIndex() > 0) {
+        Phonon::EffectDescription chosenEffect = availableEffects[ui->audioEffectsCombo->currentIndex() - 1];
+
+        QDialog effectDialog;
+        effectDialog.setWindowTitle(tr("Configure effect"));
+        QVBoxLayout *topLayout = new QVBoxLayout(&effectDialog);
+
+        QLabel *description = new QLabel("<b>Description:</b><br>" + chosenEffect.description(), &effectDialog);
+        description->setWordWrap(true); 
+        topLayout->addWidget(description);
+
+        QScrollArea *scrollArea = new QScrollArea(&effectDialog);
+        topLayout->addWidget(scrollArea);
+
+        QVariantList savedParamValues;
+        foreach(Phonon::EffectParameter param, nextEffect->parameters()) {
+            savedParamValues << nextEffect->parameterValue(param);
+        }
+
+        QWidget *scrollWidget = new Phonon::EffectWidget(nextEffect);
+        scrollWidget->setMinimumWidth(320);
+        scrollWidget->setContentsMargins(10, 10, 10,10);
+        scrollArea->setWidget(scrollWidget);
+
+        QDialogButtonBox *bbox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, &effectDialog);
+        connect(bbox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), &effectDialog, SLOT(accept()));
+        connect(bbox->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), &effectDialog, SLOT(reject()));
+        topLayout->addWidget(bbox);
+
+        effectDialog.exec();
+
+        if (effectDialog.result() != QDialog::Accepted) {
+            //we need to restore the paramaters values
+            int currentIndex = 0;
+            foreach(Phonon::EffectParameter param, nextEffect->parameters()) {
+                nextEffect->setParameterValue(param, savedParamValues.at(currentIndex++));
+            }
+
+        }
+    }
+}
+
+void MediaPlayer::handleDrop(QDropEvent *e)
+{
+    QList<QUrl> urls = e->mimeData()->urls();
+    if (e->proposedAction() == Qt::MoveAction){
+        // Just add to the queue:
+        for (int i=0; i<urls.size(); i++)
+            m_MediaObject.enqueue(Phonon::MediaSource(urls[i].toLocalFile()));
+    } else {
+        // Create new queue:
+        m_MediaObject.clearQueue();
+        if (urls.size() > 0) {
+            QString fileName = urls[0].toLocalFile();
+            QDir dir(fileName);
+            if (dir.exists()) {
+                dir.setFilter(QDir::Files);            
+                QStringList entries = dir.entryList();
+                if (entries.size() > 0) {
+                    setFile(fileName + QDir::separator() +  entries[0]);
+                    for (int i=1; i< entries.size(); ++i)
+                        m_MediaObject.enqueue(fileName + QDir::separator() + entries[i]);
+                }
+            } else {
+                setFile(fileName);
+                for (int i=1; i<urls.size(); i++)
+                    m_MediaObject.enqueue(Phonon::MediaSource(urls[i].toLocalFile()));
+            }        
+        }
+    }
+    forwardButton->setEnabled(m_MediaObject.queue().size() > 0);
+    m_MediaObject.play();
+}
+
+void MediaPlayer::dropEvent(QDropEvent *e)
+{
+    if (e->mimeData()->hasUrls() && e->proposedAction() != Qt::LinkAction) {
+        e->acceptProposedAction();
+        handleDrop(e);
+    } else {
+        e->ignore(); 
+    }
+}
+
+void MediaPlayer::dragEnterEvent(QDragEnterEvent *e)
+{
+    dragMoveEvent(e);
+}
+
+void MediaPlayer::dragMoveEvent(QDragMoveEvent *e)
+{
+    if (e->mimeData()->hasUrls()) {
+        if (e->proposedAction() == Qt::CopyAction || e->proposedAction() == Qt::MoveAction){
+            e->acceptProposedAction();
+        }
+    }
+}
+
+void MediaPlayer::playPause()
+{
+    if (m_MediaObject.state() == Phonon::PlayingState)
+        m_MediaObject.pause();
+    else {
+        if (m_MediaObject.currentTime() == m_MediaObject.totalTime())
+            m_MediaObject.seek(0);
+        m_MediaObject.play();
+    }
+}
+
+void MediaPlayer::setFile(const QString &fileName)
+{
+    setWindowTitle(fileName.right(fileName.length() - fileName.lastIndexOf('/') - 1));
+    m_MediaObject.setCurrentSource(Phonon::MediaSource(fileName));
+    m_MediaObject.play();
+}
+
+void MediaPlayer::openFile()
+{
+    QStringList fileNames = QFileDialog::getOpenFileNames(this);
+    m_MediaObject.clearQueue();
+    if (fileNames.size() > 0) {
+        QString fileName = fileNames[0];
+        setFile(fileName);
+        for (int i=1; i<fileNames.size(); i++)
+            m_MediaObject.enqueue(Phonon::MediaSource(fileNames[i]));
+    }
+    forwardButton->setEnabled(m_MediaObject.queue().size() > 0);
+}
+
+void MediaPlayer::bufferStatus(int percent)
+{
+    if (percent == 0 || percent == 100)
+        progressLabel->setText(QString());
+    else {
+        QString str = QString::fromLatin1("(%1%)").arg(percent);
+        progressLabel->setText(str);
+    }
+}
+
+void MediaPlayer::setSaturation(int val)
+{
+    m_videoWidget->setSaturation(val / qreal(SLIDER_RANGE));
+}
+
+void MediaPlayer::setHue(int val)
+{
+    m_videoWidget->setHue(val / qreal(SLIDER_RANGE));
+}
+
+void MediaPlayer::setAspect(int val)
+{
+    m_videoWidget->setAspectRatio(Phonon::VideoWidget::AspectRatio(val));
+}
+
+void MediaPlayer::setScale(int val)
+{
+    m_videoWidget->setScaleMode(Phonon::VideoWidget::ScaleMode(val));
+}
+
+void MediaPlayer::setBrightness(int val)
+{
+    m_videoWidget->setBrightness(val / qreal(SLIDER_RANGE));
+}
+
+void MediaPlayer::setContrast(int val)
+{
+    m_videoWidget->setContrast(val / qreal(SLIDER_RANGE));
+}
+
+void MediaPlayer::updateInfo()
+{
+    int maxLength = 30;
+    QString font = "<font color=#ffeeaa>";
+    QString fontmono = "<font family=\"monospace,courier new\" color=#ffeeaa>";
+
+    QMap <QString, QString> metaData = m_MediaObject.metaData();
+    QString trackArtist = metaData.value("ARTIST");
+    if (trackArtist.length() > maxLength)
+        trackArtist = trackArtist.left(maxLength) + "...";
+    
+    QString trackTitle = metaData.value("TITLE");
+    int trackBitrate = metaData.value("BITRATE").toInt();
+
+    QString fileName;
+    if (m_MediaObject.currentSource().type() == Phonon::MediaSource::Url) {
+        fileName = m_MediaObject.currentSource().url().toString();
+    } else {
+        fileName = m_MediaObject.currentSource().fileName();
+        fileName = fileName.right(fileName.length() - fileName.lastIndexOf('/') - 1);
+        if (fileName.length() > maxLength)
+            fileName = fileName.left(maxLength) + "...";
+    }
+    
+    QString title;    
+    if (!trackTitle.isEmpty()) {
+        if (trackTitle.length() > maxLength)
+            trackTitle = trackTitle.left(maxLength) + "...";
+        title = "Title: " + font + trackTitle + "<br></font>";
+    } else if (!fileName.isEmpty()) {
+        if (fileName.length() > maxLength)
+            fileName = fileName.left(maxLength) + "...";
+        title = font + fileName + "</font>";
+        if (m_MediaObject.currentSource().type() == Phonon::MediaSource::Url) {
+            title.prepend("Url: ");
+        } else {
+            title.prepend("File: ");
+        }
+    }
+        
+    QString artist;
+    if (!trackArtist.isEmpty())
+        artist = "Artist:  " + font + trackArtist + "</font>";
+
+    QString bitrate;
+    if (trackBitrate != 0)
+        bitrate = "<br>Bitrate:  " + font + QString::number(trackBitrate/1000) + "kbit</font>";
+
+    info->setText(title + artist + bitrate);
+}
+
+void MediaPlayer::updateTime()
+{
+    long len = m_MediaObject.totalTime();
+    long pos = m_MediaObject.currentTime();
+    QString timeString;    
+    if (pos || len)
+    {
+        int sec = pos/1000;
+        int min = sec/60;
+        int hour = min/60;
+        int msec = pos;
+
+        QTime playTime(hour%60, min%60, sec%60, msec%1000);
+        sec = len / 1000;
+        min = sec / 60;
+        hour = min / 60;
+        msec = len;
+
+        QTime stopTime(hour%60, min%60, sec%60, msec%1000);
+        QString timeFormat = "m:ss";
+        if (hour > 0)
+            timeFormat = "h:mm:ss";        
+        timeString = playTime.toString(timeFormat);
+        if (len)
+            timeString += " / " + stopTime.toString(timeFormat);
+    }
+    timeLabel->setText(timeString);
+}
+
+void MediaPlayer::rewind()
+{
+    m_MediaObject.seek(0);
+}
+
+void MediaPlayer::forward()
+{
+    QList<Phonon::MediaSource> queue = m_MediaObject.queue();
+    if (queue.size() > 0) {
+        m_MediaObject.setCurrentSource(queue[0]);
+        forwardButton->setEnabled(queue.size() > 1);
+        m_MediaObject.play();
+    }
+}
+
+void MediaPlayer::openUrl()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("BrowserMainWindow"));
+    QString sourceURL = settings.value("location").toString();
+    bool ok = false;
+    sourceURL = QInputDialog::getText(this, tr("Open Location"), tr("Please enter a valid address here:"), QLineEdit::Normal, sourceURL, &ok);
+    if (ok && !sourceURL.isEmpty()) {
+        setWindowTitle(sourceURL.right(sourceURL.length() - sourceURL.lastIndexOf('/') - 1));
+        m_MediaObject.setCurrentSource(Phonon::MediaSource(QUrl::fromEncoded(sourceURL.toUtf8())));
+        m_MediaObject.play();
+        settings.setValue("location", sourceURL);
+    }
+}
+
+void MediaPlayer::finished()
+{
+}
+
+void MediaPlayer::showContextMenu(const QPoint &p)
+{
+    fileMenu->popup(m_videoWidget->isFullScreen() ? p : mapToGlobal(p));
+}
+
+void MediaPlayer::scaleChanged(QAction *act)
+{
+    if (act->text() == tr("Scale and crop"))
+        m_videoWidget->setScaleMode(Phonon::VideoWidget::ScaleAndCrop);
+    else 
+        m_videoWidget->setScaleMode(Phonon::VideoWidget::FitInView);    
+}
+
+void MediaPlayer::aspectChanged(QAction *act)
+{
+    if (act->text() == tr("16/9"))
+        m_videoWidget->setAspectRatio(Phonon::VideoWidget::AspectRatio16_9);
+    else if (act->text() == tr("Scale"))
+        m_videoWidget->setAspectRatio(Phonon::VideoWidget::AspectRatioWidget);
+    else if (act->text() == tr("4/3"))
+        m_videoWidget->setAspectRatio(Phonon::VideoWidget::AspectRatio4_3);
+    else
+        m_videoWidget->setAspectRatio(Phonon::VideoWidget::AspectRatioAuto);    
+}
+
diff --git a/demos/mediaplayer/mediaplayer.h b/demos/mediaplayer/mediaplayer.h
new file mode 100644
index 0000000000..d162435c52
--- /dev/null
+++ b/demos/mediaplayer/mediaplayer.h
@@ -0,0 +1,137 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+***************************************************************************/
+
+#ifndef MEDIALAYER_H
+#define MEDIAPLAYER_H
+
+#include <QtGui/QWidget>
+#include <QtGui/QApplication>
+#include <QtCore/QTimerEvent>
+#include <QtGui/QShowEvent>
+#include <QtGui/QIcon>
+
+#include <Phonon/AudioOutput>
+#include <Phonon/BackendCapabilities>
+#include <Phonon/Effect>
+#include <Phonon/EffectParameter>
+#include <Phonon/EffectWidget>
+#include <Phonon/MediaObject>
+#include <Phonon/SeekSlider>
+#include <Phonon/VideoWidget>
+#include <Phonon/VolumeSlider>
+
+QT_BEGIN_NAMESPACE
+class QPushButton;
+class QLabel;
+class QSlider;
+class QTextEdit;
+class QMenu;
+class Ui_settings;
+QT_END_NAMESPACE
+
+class MediaPlayer :
+            public QWidget
+{
+    Q_OBJECT
+public:
+    MediaPlayer(const QString &);
+    
+    void dragEnterEvent(QDragEnterEvent *e);
+    void dragMoveEvent(QDragMoveEvent *e);
+    void dropEvent(QDropEvent *e);
+    void handleDrop(QDropEvent *e);
+    void setFile(const QString &text);
+    void initVideoWindow();
+    void initSettingsDialog();
+    
+public slots:
+    void openFile();
+    void rewind();
+    void forward();
+    void updateInfo();
+    void updateTime();
+    void finished();
+    void playPause();
+    void scaleChanged(QAction *);
+    void aspectChanged(QAction *);
+
+private slots:
+    void setAspect(int);
+    void setScale(int);
+    void setSaturation(int);
+    void setContrast(int);
+    void setHue(int);
+    void setBrightness(int);
+    void stateChanged(Phonon::State newstate, Phonon::State oldstate);
+    void effectChanged();
+    void showSettingsDialog();
+    void showContextMenu(const QPoint &);
+    void bufferStatus(int percent);
+    void openUrl();
+    void configureEffect();
+
+private:
+    QIcon playIcon;
+    QIcon pauseIcon;
+    QMenu *fileMenu;
+    QPushButton *playButton;
+    QPushButton *rewindButton;
+    QPushButton *forwardButton;
+    Phonon::SeekSlider *slider;
+    QLabel *timeLabel;
+    QLabel *progressLabel;
+    Phonon::VolumeSlider *volume;
+    QSlider *m_hueSlider;
+    QSlider *m_satSlider;
+    QSlider *m_contSlider;
+    QLabel *info;
+    Phonon::Effect *nextEffect;
+    QDialog *settingsDialog;
+    Ui_settings *ui;
+        
+    QWidget m_videoWindow;
+    Phonon::MediaObject m_MediaObject;
+    Phonon::AudioOutput m_AudioOutput;
+    Phonon::VideoWidget *m_videoWidget;
+    Phonon::Path m_audioOutputPath;
+};
+
+#endif //MEDIAPLAYER_H
diff --git a/demos/mediaplayer/mediaplayer.pro b/demos/mediaplayer/mediaplayer.pro
new file mode 100644
index 0000000000..c64abd9b0d
--- /dev/null
+++ b/demos/mediaplayer/mediaplayer.pro
@@ -0,0 +1,28 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Thu Aug 23 18:02:14 2007
+######################################################################
+
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += . build src ui
+
+QT += phonon
+
+FORMS += settings.ui
+RESOURCES += mediaplayer.qrc
+
+!win32:CONFIG += CONSOLE
+
+SOURCES += main.cpp mediaplayer.cpp
+HEADERS += mediaplayer.h
+
+target.path = $$[QT_INSTALL_DEMOS]/mediaplayer
+sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.html *.doc images
+sources.path = $$[QT_INSTALL_DEMOS]/mediaplayer
+INSTALLS += target sources
+
+wince*{
+DEPLOYMENT_PLUGIN += phonon_ds9 phonon_waveout
+}
+
+
diff --git a/demos/mediaplayer/mediaplayer.qrc b/demos/mediaplayer/mediaplayer.qrc
new file mode 100644
index 0000000000..bcdf404eb0
--- /dev/null
+++ b/demos/mediaplayer/mediaplayer.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>images/screen.png</file>
+</qresource>
+</RCC>
diff --git a/demos/mediaplayer/settings.ui b/demos/mediaplayer/settings.ui
new file mode 100644
index 0000000000..d2cedd4296
--- /dev/null
+++ b/demos/mediaplayer/settings.ui
@@ -0,0 +1,464 @@
+<ui version="4.0" >
+ <class>settings</class>
+ <widget class="QDialog" name="settings" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>360</width>
+    <height>362</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Settings</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2" >
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Video options:</string>
+     </property>
+     <property name="flat" >
+      <bool>true</bool>
+     </property>
+     <layout class="QGridLayout" name="gridLayout" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label_9" >
+        <property name="text" >
+         <string>Contrast:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" colspan="2" >
+       <widget class="QSlider" name="contrastSlider" >
+        <property name="minimum" >
+         <number>-8</number>
+        </property>
+        <property name="maximum" >
+         <number>8</number>
+        </property>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="tickPosition" >
+         <enum>QSlider::TicksBelow</enum>
+        </property>
+        <property name="tickInterval" >
+         <number>4</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_8" >
+        <property name="text" >
+         <string>Brightness:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="2" >
+       <widget class="QSlider" name="brightnessSlider" >
+        <property name="minimum" >
+         <number>-8</number>
+        </property>
+        <property name="maximum" >
+         <number>8</number>
+        </property>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="tickPosition" >
+         <enum>QSlider::TicksBelow</enum>
+        </property>
+        <property name="tickInterval" >
+         <number>4</number>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_7" >
+        <property name="text" >
+         <string>Saturation:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" colspan="2" >
+       <widget class="QSlider" name="saturationSlider" >
+        <property name="minimum" >
+         <number>-8</number>
+        </property>
+        <property name="maximum" >
+         <number>8</number>
+        </property>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="tickPosition" >
+         <enum>QSlider::TicksBelow</enum>
+        </property>
+        <property name="tickInterval" >
+         <number>4</number>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="label_2" >
+        <property name="text" >
+         <string>Hue:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="2" >
+       <widget class="QSlider" name="hueSlider" >
+        <property name="minimum" >
+         <number>-8</number>
+        </property>
+        <property name="maximum" >
+         <number>8</number>
+        </property>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="tickPosition" >
+         <enum>QSlider::TicksBelow</enum>
+        </property>
+        <property name="tickInterval" >
+         <number>4</number>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" colspan="2" >
+       <widget class="QLabel" name="label_10" >
+        <property name="text" >
+         <string>Aspect ratio:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="2" >
+       <widget class="QComboBox" name="aspectCombo" >
+        <property name="minimumSize" >
+         <size>
+          <width>180</width>
+          <height>0</height>
+         </size>
+        </property>
+        <item>
+         <property name="text" >
+          <string>Auto</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>Stretch</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>4/3</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>16/9</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="5" column="0" colspan="2" >
+       <widget class="QLabel" name="label_11" >
+        <property name="text" >
+         <string>Scale Mode:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="2" >
+       <widget class="QComboBox" name="scalemodeCombo" >
+        <property name="minimumSize" >
+         <size>
+          <width>180</width>
+          <height>0</height>
+         </size>
+        </property>
+        <item>
+         <property name="text" >
+          <string>Fit in view</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>Scale and crop</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="title" >
+      <string>Audio options:</string>
+     </property>
+     <property name="flat" >
+      <bool>true</bool>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout" >
+      <item>
+       <layout class="QHBoxLayout" >
+        <item>
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize" >
+           <size>
+            <width>90</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text" >
+           <string>Audio device:</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="deviceCombo" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout" >
+        <item>
+         <widget class="QLabel" name="label_6" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize" >
+           <size>
+            <width>90</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text" >
+           <string>Audio effect:</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="audioEffectsCombo" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Maximum" hsizetype="Minimum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="effectButton" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>Setup</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" >
+        <item>
+         <widget class="QLabel" name="crossFadeLabel" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize" >
+           <size>
+            <width>90</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text" >
+           <string>Cross fade:</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QVBoxLayout" >
+          <item>
+           <widget class="QSlider" name="crossFadeSlider" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimum" >
+             <number>-20</number>
+            </property>
+            <property name="maximum" >
+             <number>20</number>
+            </property>
+            <property name="singleStep" >
+             <number>1</number>
+            </property>
+            <property name="pageStep" >
+             <number>2</number>
+            </property>
+            <property name="value" >
+             <number>0</number>
+            </property>
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="tickPosition" >
+             <enum>QSlider::TicksBelow</enum>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" >
+            <item>
+             <widget class="QLabel" name="crossFadeLabel1" >
+              <property name="font" >
+               <font>
+                <pointsize>9</pointsize>
+               </font>
+              </property>
+              <property name="text" >
+               <string>-10 Sec</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer>
+              <property name="orientation" >
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0" >
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QLabel" name="crossFadeLabel2" >
+              <property name="font" >
+               <font>
+                <pointsize>9</pointsize>
+               </font>
+              </property>
+              <property name="text" >
+               <string>0</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer>
+              <property name="orientation" >
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0" >
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QLabel" name="crossFadeLabel3" >
+              <property name="font" >
+               <font>
+                <pointsize>9</pointsize>
+               </font>
+              </property>
+              <property name="text" >
+               <string>10 Sec</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>settings</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>settings</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/demos/pathstroke/main.cpp b/demos/pathstroke/main.cpp
new file mode 100644
index 0000000000..613d83559f
--- /dev/null
+++ b/demos/pathstroke/main.cpp
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "pathstroke.h"
+#include <QApplication>
+
+int main(int argc, char **argv)
+{
+    Q_INIT_RESOURCE(pathstroke);
+
+    QApplication app(argc, argv);
+
+    bool smallScreen = false;
+    for (int i=0; i<argc; i++)
+        if (QString(argv[i]) == "-small-screen")
+            smallScreen = true;
+
+    PathStrokeWidget pathStrokeWidget(smallScreen);
+    QStyle *arthurStyle = new ArthurStyle();
+    pathStrokeWidget.setStyle(arthurStyle);
+    QList<QWidget *> widgets = qFindChildren<QWidget *>(&pathStrokeWidget);
+    foreach (QWidget *w, widgets)
+        w->setStyle(arthurStyle);
+
+    if (smallScreen)
+        pathStrokeWidget.showFullScreen();
+    else
+        pathStrokeWidget.show();
+
+    return app.exec();
+}
diff --git a/demos/pathstroke/pathstroke.cpp b/demos/pathstroke/pathstroke.cpp
new file mode 100644
index 0000000000..d079490244
--- /dev/null
+++ b/demos/pathstroke/pathstroke.cpp
@@ -0,0 +1,599 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "pathstroke.h"
+#include "arthurstyle.h"
+#include "arthurwidgets.h"
+
+#include <stdio.h>
+
+extern void draw_round_rect(QPainter *p, const QRect &bounds, int radius);
+
+
+PathStrokeControls::PathStrokeControls(QWidget* parent, PathStrokeRenderer* renderer, bool smallScreen)
+      : QWidget(parent)
+{
+    m_renderer = renderer;
+
+    if (smallScreen)
+        layoutForSmallScreens();
+    else
+        layoutForDesktop();
+}
+
+void PathStrokeControls::createCommonControls(QWidget* parent)
+{
+    m_capGroup = new QGroupBox(parent);
+    m_capGroup->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+    QRadioButton *flatCap = new QRadioButton(m_capGroup);
+    QRadioButton *squareCap = new QRadioButton(m_capGroup);
+    QRadioButton *roundCap = new QRadioButton(m_capGroup);
+    m_capGroup->setTitle(tr("Cap Style"));
+    flatCap->setText(tr("Flat"));
+    squareCap->setText(tr("Square"));
+    roundCap->setText(tr("Round"));
+    flatCap->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    squareCap->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    roundCap->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+
+    m_joinGroup = new QGroupBox(parent);
+    m_joinGroup->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+    QRadioButton *bevelJoin = new QRadioButton(m_joinGroup);
+    QRadioButton *miterJoin = new QRadioButton(m_joinGroup);
+    QRadioButton *roundJoin = new QRadioButton(m_joinGroup);
+    m_joinGroup->setTitle(tr("Join Style"));
+    bevelJoin->setText(tr("Bevel"));
+    miterJoin->setText(tr("Miter"));
+    roundJoin->setText(tr("Round"));
+
+    m_styleGroup = new QGroupBox(parent);
+    m_styleGroup->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+    QRadioButton *solidLine = new QRadioButton(m_styleGroup);
+    QRadioButton *dashLine = new QRadioButton(m_styleGroup);
+    QRadioButton *dotLine = new QRadioButton(m_styleGroup);
+    QRadioButton *dashDotLine = new QRadioButton(m_styleGroup);
+    QRadioButton *dashDotDotLine = new QRadioButton(m_styleGroup);
+    QRadioButton *customDashLine = new QRadioButton(m_styleGroup);
+    m_styleGroup->setTitle(tr("Pen Style"));
+
+    QPixmap line_solid(":res/images/line_solid.png");
+    solidLine->setIcon(line_solid);
+    solidLine->setIconSize(line_solid.size());
+    QPixmap line_dashed(":res/images/line_dashed.png");
+    dashLine->setIcon(line_dashed);
+    dashLine->setIconSize(line_dashed.size());
+    QPixmap line_dotted(":res/images/line_dotted.png");
+    dotLine->setIcon(line_dotted);
+    dotLine->setIconSize(line_dotted.size());
+    QPixmap line_dash_dot(":res/images/line_dash_dot.png");
+    dashDotLine->setIcon(line_dash_dot);
+    dashDotLine->setIconSize(line_dash_dot.size());
+    QPixmap line_dash_dot_dot(":res/images/line_dash_dot_dot.png");
+    dashDotDotLine->setIcon(line_dash_dot_dot);
+    dashDotDotLine->setIconSize(line_dash_dot_dot.size());
+    customDashLine->setText(tr("Custom"));
+
+    int fixedHeight = bevelJoin->sizeHint().height();
+    solidLine->setFixedHeight(fixedHeight);
+    dashLine->setFixedHeight(fixedHeight);
+    dotLine->setFixedHeight(fixedHeight);
+    dashDotLine->setFixedHeight(fixedHeight);
+    dashDotDotLine->setFixedHeight(fixedHeight);
+
+    m_pathModeGroup = new QGroupBox(parent);
+    m_pathModeGroup->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+    QRadioButton *curveMode = new QRadioButton(m_pathModeGroup);
+    QRadioButton *lineMode = new QRadioButton(m_pathModeGroup);
+    m_pathModeGroup->setTitle(tr("Line Style"));
+    curveMode->setText(tr("Curves"));
+    lineMode->setText(tr("Lines"));
+
+
+    // Layouts
+    QVBoxLayout *capGroupLayout = new QVBoxLayout(m_capGroup);
+    capGroupLayout->addWidget(flatCap);
+    capGroupLayout->addWidget(squareCap);
+    capGroupLayout->addWidget(roundCap);
+
+    QVBoxLayout *joinGroupLayout = new QVBoxLayout(m_joinGroup);
+    joinGroupLayout->addWidget(bevelJoin);
+    joinGroupLayout->addWidget(miterJoin);
+    joinGroupLayout->addWidget(roundJoin);
+
+    QVBoxLayout *styleGroupLayout = new QVBoxLayout(m_styleGroup);
+    styleGroupLayout->addWidget(solidLine);
+    styleGroupLayout->addWidget(dashLine);
+    styleGroupLayout->addWidget(dotLine);
+    styleGroupLayout->addWidget(dashDotLine);
+    styleGroupLayout->addWidget(dashDotDotLine);
+    styleGroupLayout->addWidget(customDashLine);
+
+    QVBoxLayout *pathModeGroupLayout = new QVBoxLayout(m_pathModeGroup);
+    pathModeGroupLayout->addWidget(curveMode);
+    pathModeGroupLayout->addWidget(lineMode);
+
+
+    // Connections
+    connect(flatCap, SIGNAL(clicked()), m_renderer, SLOT(setFlatCap()));
+    connect(squareCap, SIGNAL(clicked()), m_renderer, SLOT(setSquareCap()));
+    connect(roundCap, SIGNAL(clicked()), m_renderer, SLOT(setRoundCap()));
+
+    connect(bevelJoin, SIGNAL(clicked()), m_renderer, SLOT(setBevelJoin()));
+    connect(miterJoin, SIGNAL(clicked()), m_renderer, SLOT(setMiterJoin()));
+    connect(roundJoin, SIGNAL(clicked()), m_renderer, SLOT(setRoundJoin()));
+
+    connect(curveMode, SIGNAL(clicked()), m_renderer, SLOT(setCurveMode()));
+    connect(lineMode, SIGNAL(clicked()), m_renderer, SLOT(setLineMode()));
+
+    connect(solidLine, SIGNAL(clicked()), m_renderer, SLOT(setSolidLine()));
+    connect(dashLine, SIGNAL(clicked()), m_renderer, SLOT(setDashLine()));
+    connect(dotLine, SIGNAL(clicked()), m_renderer, SLOT(setDotLine()));
+    connect(dashDotLine, SIGNAL(clicked()), m_renderer, SLOT(setDashDotLine()));
+    connect(dashDotDotLine, SIGNAL(clicked()), m_renderer, SLOT(setDashDotDotLine()));
+    connect(customDashLine, SIGNAL(clicked()), m_renderer, SLOT(setCustomDashLine()));
+
+    // Set the defaults:
+    flatCap->setChecked(true);
+    bevelJoin->setChecked(true);
+    curveMode->setChecked(true);
+    solidLine->setChecked(true);
+}
+
+
+void PathStrokeControls::layoutForDesktop()
+{
+    QGroupBox *mainGroup = new QGroupBox(this);
+    mainGroup->setFixedWidth(180);
+    mainGroup->setTitle(tr("Path Stroking"));
+
+    createCommonControls(mainGroup);
+
+    QGroupBox* penWidthGroup = new QGroupBox(mainGroup);
+    QSlider *penWidth = new QSlider(Qt::Horizontal, penWidthGroup);
+    penWidth->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    penWidthGroup->setTitle(tr("Pen Width"));
+    penWidth->setRange(0, 500);
+
+    QPushButton *animated = new QPushButton(mainGroup);
+    animated->setText(tr("Animate"));
+    animated->setCheckable(true);
+
+    QPushButton *showSourceButton = new QPushButton(mainGroup);
+    showSourceButton->setText(tr("Show Source"));
+#ifdef QT_OPENGL_SUPPORT
+    QPushButton *enableOpenGLButton = new QPushButton(mainGroup);
+    enableOpenGLButton->setText(tr("Use OpenGL"));
+    enableOpenGLButton->setCheckable(true);
+    enableOpenGLButton->setChecked(m_renderer->usesOpenGL());
+    if (!QGLFormat::hasOpenGL())
+        enableOpenGLButton->hide();
+#endif
+    QPushButton *whatsThisButton = new QPushButton(mainGroup);
+    whatsThisButton->setText(tr("What's This?"));
+    whatsThisButton->setCheckable(true);
+
+
+    // Layouts:
+    QVBoxLayout *penWidthLayout = new QVBoxLayout(penWidthGroup);
+    penWidthLayout->addWidget(penWidth);
+
+    QVBoxLayout * mainLayout = new QVBoxLayout(this);
+    mainLayout->setMargin(0);
+    mainLayout->addWidget(mainGroup);
+
+    QVBoxLayout *mainGroupLayout = new QVBoxLayout(mainGroup);
+    mainGroupLayout->setMargin(3);
+    mainGroupLayout->addWidget(m_capGroup);
+    mainGroupLayout->addWidget(m_joinGroup);
+    mainGroupLayout->addWidget(m_styleGroup);
+    mainGroupLayout->addWidget(penWidthGroup);
+    mainGroupLayout->addWidget(m_pathModeGroup);
+    mainGroupLayout->addWidget(animated);
+    mainGroupLayout->addStretch(1);
+    mainGroupLayout->addWidget(showSourceButton);
+#ifdef QT_OPENGL_SUPPORT
+    mainGroupLayout->addWidget(enableOpenGLButton);
+#endif
+    mainGroupLayout->addWidget(whatsThisButton);
+
+
+    // Set up connections
+    connect(animated, SIGNAL(toggled(bool)),
+            m_renderer, SLOT(setAnimation(bool)));
+
+    connect(penWidth, SIGNAL(valueChanged(int)),
+            m_renderer, SLOT(setPenWidth(int)));
+
+    connect(showSourceButton, SIGNAL(clicked()), m_renderer, SLOT(showSource()));
+#ifdef QT_OPENGL_SUPPORT
+    connect(enableOpenGLButton, SIGNAL(clicked(bool)), m_renderer, SLOT(enableOpenGL(bool)));
+#endif
+    connect(whatsThisButton, SIGNAL(clicked(bool)), m_renderer, SLOT(setDescriptionEnabled(bool)));
+    connect(m_renderer, SIGNAL(descriptionEnabledChanged(bool)),
+            whatsThisButton, SLOT(setChecked(bool)));
+
+
+    // Set the defaults
+    animated->setChecked(true);
+    penWidth->setValue(50);
+
+}
+
+void PathStrokeControls::layoutForSmallScreens()
+{
+    createCommonControls(this);
+
+    m_capGroup->layout()->setMargin(0);
+    m_joinGroup->layout()->setMargin(0);
+    m_styleGroup->layout()->setMargin(0);
+    m_pathModeGroup->layout()->setMargin(0);
+
+    QPushButton* okBtn = new QPushButton(tr("OK"), this);
+    okBtn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    okBtn->setMinimumSize(100,okBtn->minimumSize().height());
+
+    QPushButton* quitBtn = new QPushButton(tr("Quit"), this);
+    quitBtn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    quitBtn->setMinimumSize(100, okBtn->minimumSize().height());
+
+    QLabel *penWidthLabel = new QLabel(tr(" Width:"));
+    QSlider *penWidth = new QSlider(Qt::Horizontal, this);
+    penWidth->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    penWidth->setRange(0, 500);
+
+#ifdef QT_OPENGL_SUPPORT
+    QPushButton *enableOpenGLButton = new QPushButton(this);
+    enableOpenGLButton->setText(tr("Use OpenGL"));
+    enableOpenGLButton->setCheckable(true);
+    enableOpenGLButton->setChecked(m_renderer->usesOpenGL());
+    if (!QGLFormat::hasOpenGL())
+        enableOpenGLButton->hide();
+#endif
+
+    // Layouts:
+    QHBoxLayout *penWidthLayout = new QHBoxLayout(0);
+    penWidthLayout->addWidget(penWidthLabel, 0, Qt::AlignRight);
+    penWidthLayout->addWidget(penWidth);
+
+    QVBoxLayout *leftLayout = new QVBoxLayout(0);
+    leftLayout->addWidget(m_capGroup);
+    leftLayout->addWidget(m_joinGroup);
+#ifdef QT_OPENGL_SUPPORT
+    leftLayout->addWidget(enableOpenGLButton);
+#endif
+    leftLayout->addLayout(penWidthLayout);
+
+    QVBoxLayout *rightLayout = new QVBoxLayout(0);
+    rightLayout->addWidget(m_styleGroup);
+    rightLayout->addWidget(m_pathModeGroup);
+
+    QGridLayout *mainLayout = new QGridLayout(this);
+    mainLayout->setMargin(0);
+
+    // Add spacers around the form items so we don't look stupid at higher resolutions
+    mainLayout->addItem(new QSpacerItem(0,0), 0, 0, 1, 4);
+    mainLayout->addItem(new QSpacerItem(0,0), 1, 0, 2, 1);
+    mainLayout->addItem(new QSpacerItem(0,0), 1, 3, 2, 1);
+    mainLayout->addItem(new QSpacerItem(0,0), 3, 0, 1, 4);
+
+    mainLayout->addLayout(leftLayout, 1, 1);
+    mainLayout->addLayout(rightLayout, 1, 2);
+    mainLayout->addWidget(quitBtn, 2, 1, Qt::AlignHCenter | Qt::AlignTop);
+    mainLayout->addWidget(okBtn, 2, 2, Qt::AlignHCenter | Qt::AlignTop);
+
+#ifdef QT_OPENGL_SUPPORT
+    connect(enableOpenGLButton, SIGNAL(clicked(bool)), m_renderer, SLOT(enableOpenGL(bool)));
+#endif
+
+    connect(penWidth, SIGNAL(valueChanged(int)), m_renderer, SLOT(setPenWidth(int)));
+    connect(quitBtn, SIGNAL(clicked()), this, SLOT(emitQuitSignal()));
+    connect(okBtn, SIGNAL(clicked()), this, SLOT(emitOkSignal()));
+
+    m_renderer->setAnimation(true);
+    penWidth->setValue(50);
+}
+
+void PathStrokeControls::emitQuitSignal()
+{   emit quitPressed();  }
+
+void PathStrokeControls::emitOkSignal()
+{   emit okPressed();   }
+
+
+PathStrokeWidget::PathStrokeWidget(bool smallScreen)
+{
+    setWindowTitle(tr("Path Stroking"));
+
+    // Widget construction and property setting
+    m_renderer = new PathStrokeRenderer(this, smallScreen);
+
+    m_controls = new PathStrokeControls(0, m_renderer, smallScreen);
+
+    // Layouting
+    QHBoxLayout *viewLayout = new QHBoxLayout(this);
+    viewLayout->addWidget(m_renderer);
+
+    if (!smallScreen)
+        viewLayout->addWidget(m_controls);
+
+    m_renderer->loadSourceFile(":res/pathstroke/pathstroke.cpp");
+    m_renderer->loadDescription(":res/pathstroke/pathstroke.html");
+
+    connect(m_renderer, SIGNAL(clicked()), this, SLOT(showControls()));
+    connect(m_controls, SIGNAL(okPressed()), this, SLOT(hideControls()));
+    connect(m_controls, SIGNAL(quitPressed()), QApplication::instance(), SLOT(quit()));
+}
+
+
+void PathStrokeWidget::showControls()
+{
+    m_controls->showFullScreen();
+}
+
+
+void PathStrokeWidget::hideControls()
+{
+    m_controls->hide();
+}
+
+
+void PathStrokeWidget::setStyle( QStyle * style )
+{
+    QWidget::setStyle(style);
+    if (m_controls != 0)
+    {
+        m_controls->setStyle(style);
+        
+        QList<QWidget *> widgets = qFindChildren<QWidget *>(m_controls);
+        foreach (QWidget *w, widgets)
+            w->setStyle(style);
+    }
+}
+
+
+PathStrokeRenderer::PathStrokeRenderer(QWidget *parent, bool smallScreen)
+    : ArthurFrame(parent)
+{
+    m_smallScreen = smallScreen;
+    m_pointSize = 10;
+    m_activePoint = -1;
+    m_capStyle = Qt::FlatCap;
+    m_joinStyle = Qt::BevelJoin;
+    m_pathMode = CurveMode;
+    m_penWidth = 1;
+    m_penStyle = Qt::SolidLine;
+    m_wasAnimated = true;
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+}
+
+void PathStrokeRenderer::paint(QPainter *painter)
+{
+    if (m_points.isEmpty())
+        initializePoints();
+
+    painter->setRenderHint(QPainter::Antialiasing);
+
+    QPalette pal = palette();
+    painter->setPen(Qt::NoPen);
+
+    // Construct the path
+    QPainterPath path;
+    path.moveTo(m_points.at(0));
+
+    if (m_pathMode == LineMode) {
+        for (int i=1; i<m_points.size(); ++i) {
+            path.lineTo(m_points.at(i));
+        }
+    } else {
+        int i=1;
+        while (i + 2 < m_points.size()) {
+            path.cubicTo(m_points.at(i), m_points.at(i+1), m_points.at(i+2));
+            i += 3;
+        }
+        while (i < m_points.size()) {
+            path.lineTo(m_points.at(i));
+            ++i;
+        }
+    }
+
+    // Draw the path
+    {
+        QColor lg = Qt::red;
+
+        // The "custom" pen
+        if (m_penStyle == Qt::NoPen) {
+            QPainterPathStroker stroker;
+            stroker.setWidth(m_penWidth);
+            stroker.setJoinStyle(m_joinStyle);
+            stroker.setCapStyle(m_capStyle);
+
+            QVector<qreal> dashes;
+            qreal space = 4;
+            dashes << 1 << space
+                   << 3 << space
+                   << 9 << space
+                   << 27 << space
+                   << 9 << space
+                   << 3 << space;
+            stroker.setDashPattern(dashes);
+            QPainterPath stroke = stroker.createStroke(path);
+            painter->fillPath(stroke, lg);
+
+        } else {
+            QPen pen(lg, m_penWidth, m_penStyle, m_capStyle, m_joinStyle);
+            painter->strokePath(path, pen);
+        }
+    }
+
+    if (1) {
+        // Draw the control points
+        painter->setPen(QColor(50, 100, 120, 200));
+        painter->setBrush(QColor(200, 200, 210, 120));
+        for (int i=0; i<m_points.size(); ++i) {
+            QPointF pos = m_points.at(i);
+            painter->drawEllipse(QRectF(pos.x() - m_pointSize,
+                                       pos.y() - m_pointSize,
+                                       m_pointSize*2, m_pointSize*2));
+        }
+        painter->setPen(QPen(Qt::lightGray, 0, Qt::SolidLine));
+        painter->setBrush(Qt::NoBrush);
+        painter->drawPolyline(m_points);
+    }
+
+}
+
+void PathStrokeRenderer::initializePoints()
+{
+    const int count = 7;
+    m_points.clear();
+    m_vectors.clear();
+
+    QMatrix m;
+    qreal rot = 360 / count;
+    QPointF center(width() / 2, height() / 2);
+    QMatrix vm;
+    vm.shear(2, -1);
+    vm.scale(3, 3);
+
+    for (int i=0; i<count; ++i) {
+        m_vectors << QPointF(.1f, .25f) * (m * vm);
+        m_points << QPointF(0, 100) * m + center;
+        m.rotate(rot);
+    }
+}
+
+void PathStrokeRenderer::updatePoints()
+{
+    qreal pad = 10;
+    qreal left = pad;
+    qreal right = width() - pad;
+    qreal top = pad;
+    qreal bottom = height() - pad;
+
+    Q_ASSERT(m_points.size() == m_vectors.size());
+    for (int i=0; i<m_points.size(); ++i) {
+
+        if (i == m_activePoint)
+            continue;
+
+        QPointF pos = m_points.at(i);
+        QPointF vec = m_vectors.at(i);
+        pos += vec;
+        if (pos.x() < left || pos.x() > right) {
+            vec.setX(-vec.x());
+            pos.setX(pos.x() < left ? left : right);
+        } if (pos.y() < top || pos.y() > bottom) {
+            vec.setY(-vec.y());
+            pos.setY(pos.y() < top ? top : bottom);
+        }
+        m_points[i] = pos;
+        m_vectors[i] = vec;
+    }
+    update();
+}
+
+void PathStrokeRenderer::mousePressEvent(QMouseEvent *e)
+{
+    setDescriptionEnabled(false);
+    m_activePoint = -1;
+    qreal distance = -1;
+    for (int i=0; i<m_points.size(); ++i) {
+        qreal d = QLineF(e->pos(), m_points.at(i)).length();
+        if ((distance < 0 && d < 8 * m_pointSize) || d < distance) {
+            distance = d;
+            m_activePoint = i;
+        }
+    }
+
+    if (m_activePoint != -1) {
+        m_wasAnimated = m_timer.isActive();
+        setAnimation(false);
+        mouseMoveEvent(e);
+    }
+    
+    // If we're not running in small screen mode, always assume we're dragging
+    m_mouseDrag = !m_smallScreen;
+    m_mousePress = e->pos();
+}
+
+void PathStrokeRenderer::mouseMoveEvent(QMouseEvent *e)
+{
+    // If we've moved more then 25 pixels, assume user is dragging
+    if (!m_mouseDrag && QPoint(m_mousePress - e->pos()).manhattanLength() > 25)
+        m_mouseDrag = true;
+
+    if (m_mouseDrag && m_activePoint >= 0 && m_activePoint < m_points.size()) {
+        m_points[m_activePoint] = e->pos();
+        update();
+    }
+}
+
+void PathStrokeRenderer::mouseReleaseEvent(QMouseEvent *)
+{
+    m_activePoint = -1;
+    setAnimation(m_wasAnimated);
+
+    if (!m_mouseDrag && m_smallScreen)
+        emit clicked();
+}
+
+void PathStrokeRenderer::timerEvent(QTimerEvent *e)
+{
+    if (e->timerId() == m_timer.timerId()) {
+        updatePoints();
+        QApplication::syncX();
+    } // else if (e->timerId() == m_fpsTimer.timerId()) {
+//         emit frameRate(m_frameCount);
+//         m_frameCount = 0;
+//     }
+}
+
+void PathStrokeRenderer::setAnimation(bool animation)
+{
+    m_timer.stop();
+//     m_fpsTimer.stop();
+
+    if (animation) {
+        m_timer.start(25, this);
+//         m_fpsTimer.start(1000, this);
+//         m_frameCount = 0;
+    }
+}
diff --git a/demos/pathstroke/pathstroke.h b/demos/pathstroke/pathstroke.h
new file mode 100644
index 0000000000..99f17a71ba
--- /dev/null
+++ b/demos/pathstroke/pathstroke.h
@@ -0,0 +1,168 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PATHSTROKE_H
+#define PATHSTROKE_H
+
+#include "arthurwidgets.h"
+#include <QtGui>
+
+class PathStrokeRenderer : public ArthurFrame
+{
+    Q_OBJECT
+    Q_PROPERTY(bool animation READ animation WRITE setAnimation)
+    Q_PROPERTY(qreal penWidth READ realPenWidth WRITE setRealPenWidth)
+public:
+    enum PathMode { CurveMode, LineMode };
+
+    PathStrokeRenderer(QWidget *parent, bool smallScreen = false);
+
+    void paint(QPainter *);
+    void mousePressEvent(QMouseEvent *e);
+    void mouseMoveEvent(QMouseEvent *e);
+    void mouseReleaseEvent(QMouseEvent *e);
+    void timerEvent(QTimerEvent *e);
+
+    QSize sizeHint() const { return QSize(500, 500); }
+
+    bool animation() const { return m_timer.isActive(); }
+
+    qreal realPenWidth() const { return m_penWidth; }
+    void setRealPenWidth(qreal penWidth) { m_penWidth = penWidth; update(); }
+
+signals:
+    void clicked();
+
+public slots:
+    void setPenWidth(int penWidth) { m_penWidth = penWidth / 10.0; update(); }
+    void setAnimation(bool animation);
+
+    void setFlatCap() { m_capStyle = Qt::FlatCap; update(); }
+    void setSquareCap() { m_capStyle = Qt::SquareCap; update(); }
+    void setRoundCap() { m_capStyle = Qt::RoundCap; update(); }
+
+    void setBevelJoin() { m_joinStyle = Qt::BevelJoin; update(); }
+    void setMiterJoin() { m_joinStyle = Qt::MiterJoin; update(); }
+    void setRoundJoin() { m_joinStyle = Qt::RoundJoin; update(); }
+
+    void setCurveMode() { m_pathMode = CurveMode; update(); }
+    void setLineMode() { m_pathMode = LineMode; update(); }
+
+    void setSolidLine() { m_penStyle = Qt::SolidLine; update(); }
+    void setDashLine() { m_penStyle = Qt::DashLine; update(); }
+    void setDotLine() { m_penStyle = Qt::DotLine; update(); }
+    void setDashDotLine() { m_penStyle = Qt::DashDotLine; update(); }
+    void setDashDotDotLine() { m_penStyle = Qt::DashDotDotLine; update(); }
+    void setCustomDashLine() { m_penStyle = Qt::NoPen; update(); }
+
+private:
+    void initializePoints();
+    void updatePoints();
+
+    QBasicTimer m_timer;
+
+    PathMode m_pathMode;
+
+    bool m_wasAnimated;
+
+    qreal m_penWidth;
+    int m_pointCount;
+    int m_pointSize;
+    int m_activePoint;
+    QVector<QPointF> m_points;
+    QVector<QPointF> m_vectors;
+
+    Qt::PenJoinStyle m_joinStyle;
+    Qt::PenCapStyle m_capStyle;
+
+    Qt::PenStyle m_penStyle;
+
+    bool m_smallScreen;
+    QPoint m_mousePress;
+    bool m_mouseDrag;
+};
+
+class PathStrokeControls : public QWidget
+{
+    Q_OBJECT
+public:
+    PathStrokeControls(QWidget* parent, PathStrokeRenderer* renderer, bool smallScreen);
+
+signals:
+    void okPressed();
+    void quitPressed();
+
+private:
+    PathStrokeRenderer* m_renderer;
+
+    QGroupBox *m_capGroup;
+    QGroupBox *m_joinGroup;
+    QGroupBox *m_styleGroup;
+    QGroupBox *m_pathModeGroup;
+
+    void createCommonControls(QWidget* parent);
+    void layoutForDesktop();
+    void layoutForSmallScreens();
+
+private slots:
+    void emitQuitSignal();
+    void emitOkSignal();
+
+};
+
+class PathStrokeWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    PathStrokeWidget(bool smallScreen);
+    void setStyle ( QStyle * style );
+
+private:
+    PathStrokeRenderer *m_renderer;
+    PathStrokeControls *m_controls;
+
+private slots:
+    void showControls();
+    void hideControls();
+
+};
+
+#endif // PATHSTROKE_H
diff --git a/demos/pathstroke/pathstroke.html b/demos/pathstroke/pathstroke.html
new file mode 100644
index 0000000000..9e7e50de76
--- /dev/null
+++ b/demos/pathstroke/pathstroke.html
@@ -0,0 +1,20 @@
+<html>
+<center>
+<h2>Primitive Stroking</h2>
+</center>
+
+<p>In this demo we show some of the various types of pens that can be
+used in Qt.</p>
+
+<p>Qt defines cap styles for how the end points are treated and join
+styles for how path segments are joined together. A standard set of
+predefined dash patterns are also included that can be used with
+<code>QPen</code>.</p>
+
+<p>In addition to the predefined patterns available in
+<code>QPen</code> we also demonstrate direct use of the
+<code>QPainterPathStroker</code> class which can be used to define
+custom dash patterns. You can see this by enabling the
+<i>Custom Pattern</i> option.</p>
+
+</html>
diff --git a/demos/pathstroke/pathstroke.pro b/demos/pathstroke/pathstroke.pro
new file mode 100644
index 0000000000..50b4de2496
--- /dev/null
+++ b/demos/pathstroke/pathstroke.pro
@@ -0,0 +1,20 @@
+SOURCES += main.cpp pathstroke.cpp
+HEADERS += pathstroke.h
+
+SHARED_FOLDER = ../shared
+
+include($$SHARED_FOLDER/shared.pri)
+
+RESOURCES += pathstroke.qrc
+
+contains(QT_CONFIG, opengl) {
+	DEFINES += QT_OPENGL_SUPPORT
+	QT += opengl
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/pathstroke
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
+sources.path = $$[QT_INSTALL_DEMOS]/pathstroke
+INSTALLS += target sources
+
diff --git a/demos/pathstroke/pathstroke.qrc b/demos/pathstroke/pathstroke.qrc
new file mode 100644
index 0000000000..a9a723409e
--- /dev/null
+++ b/demos/pathstroke/pathstroke.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/res/pathstroke">
+   <file>pathstroke.cpp</file>
+   <file>pathstroke.html</file>
+</qresource>
+</RCC>
diff --git a/demos/qtdemo/Info_mac.plist b/demos/qtdemo/Info_mac.plist
new file mode 100644
index 0000000000..71b00591b4
--- /dev/null
+++ b/demos/qtdemo/Info_mac.plist
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+	<key>CFBundleIconFile</key>
+	<string>@ICON@</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+        <key>CFBundleGetInfoString</key>
+	<string>Created by Qt/QMake</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.trolltech.qt.demo</string>
+	<key>CFBundleExecutable</key>
+	<string>@EXECUTABLE@</string>
+</dict>
+</plist>
diff --git a/demos/qtdemo/colors.cpp b/demos/qtdemo/colors.cpp
new file mode 100644
index 0000000000..18343cbbf8
--- /dev/null
+++ b/demos/qtdemo/colors.cpp
@@ -0,0 +1,390 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "colors.h"
+
+#ifndef QT_NO_OPENGL
+    #include <QGLWidget>
+#endif
+//#define QT_NO_OPENGL
+
+// Colors:
+QColor Colors::sceneBg1(QColor(91, 91, 91));
+QColor Colors::sceneBg1Line(QColor(114, 108, 104));
+QColor Colors::sceneBg2(QColor(0, 0, 0));
+QColor Colors::sceneLine(255, 255, 255);
+QColor Colors::paperBg(QColor(100, 100, 100));
+QColor Colors::menuTextFg(QColor(255, 0, 0));
+QColor Colors::buttonBgLow(QColor(255, 255, 255, 90));
+QColor Colors::buttonBgHigh(QColor(255, 255, 255, 20));
+QColor Colors::buttonText(QColor(255, 255, 255));
+QColor Colors::tt_green(QColor(166, 206, 57));
+QColor Colors::fadeOut(QColor(206, 246, 117, 0));
+QColor Colors::heading(QColor(190,230,80));
+QString Colors::contentColor("<font color='#eeeeee'>");
+QString Colors::glVersion("Not detected!");
+
+// Guides:
+int Colors::stageStartY = 8;
+int Colors::stageHeight = 536;
+int Colors::stageStartX = 8;
+int Colors::stageWidth = 785;
+int Colors::contentStartY = 22;
+int Colors::contentHeight = 510;
+
+// Properties:
+bool Colors::openGlRendering = false;
+bool Colors::direct3dRendering = false;
+bool Colors::softwareRendering = false;
+bool Colors::openGlAwailable = true;
+bool Colors::direct3dAwailable = true;
+bool Colors::xRenderPresent = true;
+
+bool Colors::noTicker = false;
+bool Colors::noRescale = false;
+bool Colors::noAnimations = false;
+bool Colors::noBlending = false;
+bool Colors::noScreenSync = false;
+bool Colors::fullscreen = false;
+bool Colors::usePixmaps = false;
+bool Colors::useLoop = false;
+bool Colors::showBoundingRect = false;
+bool Colors::showFps = false;
+bool Colors::noAdapt = false;
+bool Colors::noWindowMask = true;
+bool Colors::useButtonBalls = false;
+bool Colors::useEightBitPalette = false;
+bool Colors::noTimerUpdate = false;
+bool Colors::noTickerMorph = false;
+bool Colors::adapted = false;
+bool Colors::verbose = false;
+bool Colors::pause = true;
+int Colors::fps = 100;
+int Colors::menuCount = 18;
+float Colors::animSpeed = 1.0;
+float Colors::animSpeedButtons = 1.0;
+float Colors::benchmarkFps = -1;
+int Colors::tickerLetterCount = 80;
+float Colors::tickerMoveSpeed = 0.4f;
+float Colors::tickerMorphSpeed = 2.5f;
+QString Colors::tickerText = ".EROM ETAERC .SSEL EDOC";
+QString Colors::rootMenuName = "Qt Examples and Demos";
+
+QFont Colors::contentFont()
+{
+    QFont font;
+    font.setStyleStrategy(QFont::PreferAntialias);
+#if defined(Q_OS_MAC)
+    font.setPixelSize(14);
+    font.setFamily("Arial");
+#else
+    font.setPixelSize(13);
+    font.setFamily("Verdana");
+#endif
+    return font;
+}
+
+QFont Colors::headingFont()
+{
+    QFont font;
+    font.setStyleStrategy(QFont::PreferAntialias);
+    font.setPixelSize(23);
+    font.setBold(true);
+    font.setFamily("Verdana");
+    return font;
+}
+
+QFont Colors::buttonFont()
+{
+    QFont font;
+    font.setStyleStrategy(QFont::PreferAntialias);
+#if 0//defined(Q_OS_MAC)
+    font.setPixelSize(11);
+    font.setFamily("Silom");
+#else
+    font.setPixelSize(11);
+    font.setFamily("Verdana");
+#endif
+    return font;
+}
+
+QFont Colors::tickerFont()
+{
+    QFont font;
+    font.setStyleStrategy(QFont::PreferAntialias);
+#if defined(Q_OS_MAC)
+    font.setPixelSize(11);
+    font.setBold(true);
+    font.setFamily("Arial");
+#else
+    font.setPixelSize(10);
+    font.setBold(true);
+    font.setFamily("sans serif");
+#endif
+    return font;
+}
+
+float parseFloat(const QString &argument, const QString &name)
+{
+    if (name.length() == argument.length()){
+        QMessageBox::warning(0, "Arguments",
+                                 QString("No argument number found for ")
+                                 + name
+                                 + ". Remember to put name and value adjacent! (e.g. -fps100)");
+        exit(0);
+    }
+    float value = argument.mid(name.length()).toFloat();
+    return value;
+}
+
+QString parseText(const QString &argument, const QString &name)
+{
+    if (name.length() == argument.length()){
+        QMessageBox::warning(0, "Arguments",
+                                 QString("No argument number found for ")
+                                 + name
+                                 + ". Remember to put name and value adjacent! (e.g. -fps100)");
+        exit(0);
+    }
+    QString value = argument.mid(name.length());
+    return value;
+}
+
+void Colors::parseArgs(int argc, char *argv[])
+{
+    // some arguments should be processed before
+    // others. Handle them now:
+    for (int i=1; i<argc; i++){
+        QString s(argv[i]);
+        if (s == "-verbose")
+            Colors::verbose = true;
+    }
+
+    Colors::detectSystemResources();
+
+    // Handle the rest of the arguments. They may
+    // override attributes already set:
+    for (int i=1; i<argc; i++){
+        QString s(argv[i]);
+        if (s == "-opengl")
+            Colors::openGlRendering = true;
+        else if (s == "-direct3d")
+            Colors::direct3dRendering = true;
+        else if (s == "-software")
+            Colors::softwareRendering = true;
+        else if (s == "-no-opengl") // support old style
+            Colors::softwareRendering = true;
+        else if (s == "-no-ticker") // support old style
+            Colors::noTicker = true;
+        else if (s.startsWith("-ticker"))
+            Colors::noTicker = !bool(parseFloat(s, "-ticker"));
+        else if (s == "-no-animations")
+            Colors::noAnimations = true; // support old style
+        else if (s.startsWith("-animations"))
+            Colors::noAnimations = !bool(parseFloat(s, "-animations"));
+        else if (s == "-no-adapt")
+            Colors::noAdapt = true;
+        else if (s == "-low")
+            Colors::setLowSettings();
+        else if (s == "-no-rescale")
+            Colors::noRescale = true;
+        else if (s == "-use-pixmaps")
+            Colors::usePixmaps = true;
+        else if (s == "-fullscreen")
+            Colors::fullscreen = true;
+        else if (s == "-show-br")
+            Colors::showBoundingRect = true;
+        else if (s == "-show-fps")
+            Colors::showFps = true;
+        else if (s == "-no-blending")
+            Colors::noBlending = true;
+        else if (s == "-no-sync")
+            Colors::noScreenSync = true;
+        else if (s.startsWith("-menu"))
+            Colors::menuCount = int(parseFloat(s, "-menu"));
+        else if (s.startsWith("-use-timer-update"))
+            Colors::noTimerUpdate = !bool(parseFloat(s, "-use-timer-update"));
+        else if (s.startsWith("-pause"))
+            Colors::pause = bool(parseFloat(s, "-pause"));
+        else if (s == "-no-ticker-morph")
+            Colors::noTickerMorph = true;
+        else if (s == "-use-window-mask")
+            Colors::noWindowMask = false;
+        else if (s == "-use-loop")
+            Colors::useLoop = true;
+        else if (s == "-use-8bit")
+            Colors::useEightBitPalette = true;
+        else if (s.startsWith("-8bit"))
+            Colors::useEightBitPalette = bool(parseFloat(s, "-8bit"));
+        else if (s == "-use-balls")
+            Colors::useButtonBalls = true;
+        else if (s.startsWith("-ticker-letters"))
+            Colors::tickerLetterCount = int(parseFloat(s, "-ticker-letters"));
+        else if (s.startsWith("-ticker-text"))
+            Colors::tickerText = parseText(s, "-ticker-text");
+        else if (s.startsWith("-ticker-speed"))
+            Colors::tickerMoveSpeed = parseFloat(s, "-ticker-speed");
+        else if (s.startsWith("-ticker-morph-speed"))
+            Colors::tickerMorphSpeed = parseFloat(s, "-ticker-morph-speed");
+        else if (s.startsWith("-animation-speed"))
+            Colors::animSpeed = parseFloat(s, "-animation-speed");
+        else if (s.startsWith("-fps"))
+            Colors::fps = int(parseFloat(s, "-fps"));
+        else if (s.startsWith("-h") || s.startsWith("-help")){
+            QMessageBox::warning(0, "Arguments",
+                                 QString("Usage: qtdemo [-verbose] [-no-adapt] [-opengl] [-direct3d] [-software] [-fullscreen] [-ticker[0|1]] ")
+                                 + "[-animations[0|1]] [-no-blending] [-no-sync] [-use-timer-update[0|1]] [-pause[0|1]]  "
+                                 + "[-use-window-mask] [-no-rescale] "
+                                 + "[-use-pixmaps] [-show-fps] [-show-br] [-8bit[0|1]] [-menu<int>] [-use-loop] [-use-balls] "
+                                 + "[-animation-speed<float>] [-fps<int>] "
+                                 + "[-low] [-ticker-letters<int>] [-ticker-speed<float>] [-no-ticker-morph] "
+                                 + "[-ticker-morph-speed<float>] [-ticker-text<string>]");
+            exit(0);
+        }
+    }
+
+    Colors::postConfigure();
+}
+
+void Colors::setLowSettings()
+{
+    Colors::openGlRendering = false;
+    Colors::direct3dRendering = false;
+    Colors::softwareRendering = true;
+    Colors::noTicker = true;
+    Colors::noTimerUpdate = true;
+    Colors::fps = 30;
+    Colors::usePixmaps = true;
+    Colors::noAnimations = true;
+    Colors::noBlending = true;
+}
+
+void Colors::detectSystemResources()
+{
+#ifndef QT_NO_OPENGL
+    if (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0)
+        Colors::glVersion = "2.0 or higher";
+    else if (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_5)
+        Colors::glVersion = "1.5";
+    else if (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_4)
+        Colors::glVersion = "1.4";
+    else if (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_3)
+        Colors::glVersion = "1.3 or lower";
+    if (Colors::verbose)
+        qDebug() << "- OpenGL version:" << Colors::glVersion;
+
+    QGLWidget glw;
+    if (!QGLFormat::hasOpenGL()
+        || !glw.format().directRendering()
+        || !(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_5)
+        || glw.depth() < 24
+    )
+#else
+    if (Colors::verbose)
+        qDebug() << "- OpenGL not supported by current build of Qt";
+#endif
+    {
+        Colors::openGlAwailable = false;
+        if (Colors::verbose)
+            qDebug("- OpenGL not recommended on this system");
+    }
+
+#if defined(Q_WS_WIN)
+    Colors::direct3dAwailable = false; // for now.
+#endif
+
+#if defined(Q_WS_X11)
+    // check if X render is present:
+    QPixmap tmp(1, 1);
+    if (!tmp.x11PictureHandle()){
+        Colors::xRenderPresent = false;
+        if (Colors::verbose)
+            qDebug("- X render not present");
+    }
+
+#endif
+
+    QWidget w;
+    if (Colors::verbose)
+        qDebug() << "- Color depth: " << QString::number(w.depth());
+}
+
+void Colors::postConfigure()
+{
+    if (!Colors::noAdapt){
+        QWidget w;
+        if (w.depth() < 16){
+            Colors::useEightBitPalette = true;
+            Colors::adapted = true;
+            if (Colors::verbose)
+                qDebug() << "- Adapt: Color depth less than 16 bit. Using 8 bit palette";
+        }
+
+        if (!Colors::xRenderPresent){
+            Colors::setLowSettings();
+            Colors::adapted = true;
+            if (Colors::verbose)
+                qDebug() << "- Adapt: X renderer not present. Using low settings";
+        }
+    }
+
+#if !defined(Q_WS_WIN)
+    if (Colors::direct3dRendering){
+        Colors::direct3dRendering = false;
+            qDebug() << "- WARNING: Direct3D specified, but not supported on this platform";
+    }
+#endif
+
+    if (!Colors::openGlRendering && !Colors::direct3dRendering && !Colors::softwareRendering){
+        // The user has not decided rendering system. So we do it instead:
+#if defined(Q_WS_WIN)
+        if (Colors::direct3dAwailable)
+            Colors::direct3dRendering = true;
+        else
+#endif
+        if (Colors::openGlAwailable)
+            Colors::openGlRendering = true;
+        else
+            Colors::softwareRendering = true;
+    }
+}
+
+
diff --git a/demos/qtdemo/colors.h b/demos/qtdemo/colors.h
new file mode 100644
index 0000000000..58865c6ec4
--- /dev/null
+++ b/demos/qtdemo/colors.h
@@ -0,0 +1,130 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef COLORS_H
+#define COLORS_H
+
+#include <QtGui>
+#include <QBrush>
+
+class Colors
+{
+private:
+    Colors(){};
+
+public:
+    static void parseArgs(int argc, char *argv[]);
+    static void detectSystemResources();
+    static void postConfigure();
+    static void setLowSettings();
+
+    // Colors:
+    static QColor sceneBg1;
+    static QColor sceneBg2;
+    static QColor sceneBg1Line;
+    static QColor paperBg;
+    static QColor menuTextFg;
+    static QColor buttonText;
+    static QColor buttonBgLow;
+    static QColor buttonBgHigh;
+    static QColor tt_green;
+    static QColor fadeOut;
+    static QColor sceneLine;
+    static QColor heading;
+    static QString contentColor;
+    static QString glVersion;
+
+    // Guides:
+    static int stageStartY;
+    static int stageHeight;
+    static int stageStartX;
+    static int stageWidth;
+    static int contentStartY;
+    static int contentHeight;
+
+    // properties:
+    static bool openGlRendering;
+    static bool direct3dRendering;
+    static bool softwareRendering;
+    static bool openGlAwailable;
+    static bool direct3dAwailable;
+    static bool xRenderPresent;
+    static bool noAdapt;
+    static bool noTicker;
+    static bool noRescale;
+    static bool noAnimations;
+    static bool noBlending;
+    static bool noScreenSync;
+    static bool useLoop;
+    static bool noWindowMask;
+    static bool usePixmaps;
+    static bool useEightBitPalette;
+    static bool fullscreen;
+    static bool showBoundingRect;
+    static bool showFps;
+    static bool noTimerUpdate;
+    static bool noTickerMorph;
+    static bool useButtonBalls;
+    static bool adapted;
+    static bool verbose;
+    static bool pause;
+
+    static float animSpeed;
+    static float animSpeedButtons;
+    static float benchmarkFps;
+    static int tickerLetterCount;
+    static int fps;
+    static int menuCount;
+    static float tickerMoveSpeed;
+    static float tickerMorphSpeed;
+    static QString tickerText;
+    static QString rootMenuName;
+
+    // fonts
+    static QFont contentFont();
+    static QFont headingFont();
+    static QFont buttonFont();
+    static QFont tickerFont();
+
+};
+
+#endif // COLORS_H
+
diff --git a/demos/qtdemo/demoitem.cpp b/demos/qtdemo/demoitem.cpp
new file mode 100644
index 0000000000..0335bd3938
--- /dev/null
+++ b/demos/qtdemo/demoitem.cpp
@@ -0,0 +1,280 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "demoitem.h"
+#include "menumanager.h"
+#include "guide.h"
+#include "colors.h"
+
+QHash<QString, SharedImage *> DemoItem::sharedImageHash;
+QMatrix DemoItem::matrix;
+
+DemoItem::DemoItem(QGraphicsScene *scene, QGraphicsItem *parent) : QGraphicsItem(parent, scene)
+{
+    this->opacity = 1.0;
+    this->locked = false;
+    this->prepared = false;
+    this->neverVisible = false;
+    this->noSubPixeling = false;
+    this->currentAnimation = 0;
+    this->currGuide = 0;
+    this->guideFrame = 0;
+    this->sharedImage = new SharedImage();
+    ++this->sharedImage->refCount;
+}
+
+DemoItem::~DemoItem()
+{
+    if(--this->sharedImage->refCount == 0){
+        if (!this->hashKey.isEmpty())
+            DemoItem::sharedImageHash.remove(this->hashKey);
+        delete this->sharedImage;
+    }
+}
+
+void DemoItem::setNeverVisible(bool never)
+{
+    Q_UNUSED(never);
+/*
+    this->neverVisible = never;
+    if (never){
+        this->setVisible(false);
+        QList<QGraphicsItem *> c = children();
+        for (int i=0; i<c.size(); i++){
+            DemoItem *d = dynamic_cast<DemoItem *>(c[i]); // Don't use dynamic cast because it needs RTTI support.
+            if (d)
+                d->setNeverVisible(true);
+            else{
+                c[i]->setVisible(false);
+            }
+        }
+    }
+*/
+}
+
+void DemoItem::setRecursiveVisible(bool visible){
+    if (visible && this->neverVisible){
+        this->setVisible(false);
+        return;
+    }
+
+    this->setVisible(visible);
+    QList<QGraphicsItem *> c = children();
+    for (int i=0; i<c.size(); i++){
+        // DemoItem *d = dynamic_cast<DemoItem *>(c[i]);
+        // if (d)
+        //     d->setRecursiveVisible(visible);
+        // else{
+            c[i]->setVisible(visible);
+        // }
+    }
+}
+
+void DemoItem::useGuide(Guide *guide, float startFrame)
+{
+    this->startFrame = startFrame;
+    this->guideFrame = startFrame;
+    while (this->guideFrame > guide->startLength + guide->length()){
+        if (guide->nextGuide == guide->firstGuide)
+            break;
+
+        guide = guide->nextGuide;
+    }
+    this->currGuide = guide;
+}
+
+void DemoItem::guideAdvance(float distance)
+{
+    this->guideFrame += distance;
+    while (this->guideFrame > this->currGuide->startLength + this->currGuide->length()){
+        this->currGuide = this->currGuide->nextGuide;
+        if (this->currGuide == this->currGuide->firstGuide)
+            this->guideFrame -= this->currGuide->lengthAll();
+    }
+}
+
+void DemoItem::guideMove(float moveSpeed)
+{
+    this->currGuide->guide(this, moveSpeed);
+}
+
+void DemoItem::setPosUsingSheepDog(const QPointF &dest, const QRectF &sceneFence)
+{
+    this->setPos(dest);
+    if (sceneFence.isNull())
+        return;
+
+    // I agree. This is not the optimal way of doing it.
+    // But don't want for use time on it now....
+    float itemWidth = this->boundingRect().width();
+    float itemHeight = this->boundingRect().height();
+    float fenceRight = sceneFence.x() + sceneFence.width();
+    float fenceBottom = sceneFence.y() + sceneFence.height();
+
+    if (this->scenePos().x() < sceneFence.x()) this->moveBy(this->mapFromScene(QPointF(sceneFence.x(), 0)).x(), 0);
+    if (this->scenePos().x() > fenceRight - itemWidth) this->moveBy(this->mapFromScene(QPointF(fenceRight - itemWidth, 0)).x(), 0);
+    if (this->scenePos().y() < sceneFence.y()) this->moveBy(0, this->mapFromScene(QPointF(0, sceneFence.y())).y());
+    if (this->scenePos().y() > fenceBottom - itemHeight) this->moveBy(0, this->mapFromScene(QPointF(0, fenceBottom - itemHeight)).y());
+}
+
+void DemoItem::setGuidedPos(const QPointF &pos)
+{
+    this->guidedPos = pos;
+}
+
+QPointF DemoItem::getGuidedPos()
+{
+    return this->guidedPos;
+}
+
+void DemoItem::switchGuide(Guide *guide)
+{
+    this->currGuide = guide;
+    this->guideFrame = 0;
+}
+
+bool DemoItem::inTransition()
+{
+    if (this->currentAnimation)
+        return this->currentAnimation->running();
+    else
+        return false;
+}
+
+void DemoItem::setMatrix(const QMatrix &matrix)
+{
+    DemoItem::matrix = matrix;
+}
+
+void DemoItem::useSharedImage(const QString &hashKey)
+{
+    this->hashKey = hashKey;
+    if (!sharedImageHash.contains(hashKey))
+        sharedImageHash.insert(hashKey, this->sharedImage);
+    else {
+        if(--this->sharedImage->refCount == 0)
+            delete this->sharedImage;
+        this->sharedImage = sharedImageHash.value(hashKey);
+        ++this->sharedImage->refCount;
+    }
+}
+
+bool DemoItem::validateImage()
+{
+    if ((this->sharedImage->matrix != DemoItem::matrix && !Colors::noRescale) || !(this->sharedImage->image || this->sharedImage->pixmap)){
+        // (Re)create image according to new matrix
+        delete this->sharedImage->image;
+        this->sharedImage->image = 0;
+        delete this->sharedImage->pixmap;
+        this->sharedImage->pixmap = 0;
+        this->sharedImage->matrix = DemoItem::matrix;
+
+        // Let subclass create and draw a new image according to the new matrix
+        QImage *image = this->createImage(Colors::noRescale ? QMatrix() : DemoItem::matrix);
+        if (image){
+            if (Colors::showBoundingRect){
+                // draw red transparent rect
+                QPainter painter(image);
+                painter.fillRect(image->rect(), QColor(255, 0, 0, 50));
+                painter.end();
+            }
+
+            this->sharedImage->unscaledBoundingRect = this->sharedImage->matrix.inverted().mapRect(image->rect());
+            if (Colors::usePixmaps){
+                if (image->isNull())
+                    this->sharedImage->pixmap = new QPixmap(1, 1);
+                else
+                    this->sharedImage->pixmap = new QPixmap(image->size());
+                this->sharedImage->pixmap->fill(QColor(0, 0, 0, 0));
+                QPainter painter(this->sharedImage->pixmap);
+                painter.drawImage(0, 0, *image);
+                delete image;
+            } else {
+                this->sharedImage->image = image;
+            }
+            return true;
+        } else
+            return false;
+    }
+    return true;
+}
+
+QRectF DemoItem::boundingRect() const
+{
+    const_cast<DemoItem *>(this)->validateImage();
+    return this->sharedImage->unscaledBoundingRect;
+}
+
+void DemoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    if (this->validateImage()){
+
+        bool wasSmoothPixmapTransform = painter->testRenderHint(QPainter::SmoothPixmapTransform);
+        painter->setRenderHint(QPainter::SmoothPixmapTransform);
+
+        if (Colors::noRescale){
+            // Let the painter scale the image for us.
+            // This may degrade both quality and performance
+            if (this->sharedImage->image)
+                painter->drawImage(this->pos(), *this->sharedImage->image);
+            else
+                painter->drawPixmap(this->pos(), *this->sharedImage->pixmap);
+        }
+        else {
+            QMatrix m = painter->worldMatrix();
+            painter->setWorldMatrix(QMatrix());
+            float x = this->noSubPixeling ? qRound(m.dx()) : m.dx();
+            float y = this->noSubPixeling ? qRound(m.dy()) : m.dy();
+            if (this->sharedImage->image)
+                painter->drawImage(QPointF(x, y), *this->sharedImage->image);
+            else
+                painter->drawPixmap(QPointF(x, y), *this->sharedImage->pixmap);
+        }
+
+        if (!wasSmoothPixmapTransform) {
+            painter->setRenderHint(QPainter::SmoothPixmapTransform, false);
+        }
+
+    }
+}
diff --git a/demos/qtdemo/demoitem.h b/demos/qtdemo/demoitem.h
new file mode 100644
index 0000000000..e03327b637
--- /dev/null
+++ b/demos/qtdemo/demoitem.h
@@ -0,0 +1,124 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DEMO_ITEM_H
+#define DEMO_ITEM_H
+
+#include <QtGui>
+
+class DemoItemAnimation;
+class Guide;
+
+class SharedImage
+{
+public:
+    SharedImage() : refCount(0), image(0), pixmap(0){};
+    ~SharedImage()
+    {
+        delete image;
+        delete pixmap;
+    }
+
+    int refCount;
+    QImage *image;
+    QPixmap *pixmap;
+    QMatrix matrix;
+    QRectF unscaledBoundingRect;
+};
+
+class DemoItem : public QGraphicsItem
+{
+
+public:
+    DemoItem(QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
+    virtual ~DemoItem();
+
+    bool inTransition();
+    virtual void animationStarted(int id = 0){ Q_UNUSED(id); };
+    virtual void animationStopped(int id = 0){ Q_UNUSED(id); };
+    virtual void prepare(){};
+    void setRecursiveVisible(bool visible);
+    void useSharedImage(const QString &hashKey);
+    void setNeverVisible(bool never = true);
+    static void setMatrix(const QMatrix &matrix);
+    virtual QRectF boundingRect() const; // overridden
+    void setPosUsingSheepDog(const QPointF &dest, const QRectF &sceneFence);
+
+    qreal opacity;
+    bool locked;
+    DemoItemAnimation *currentAnimation;
+    bool noSubPixeling;
+
+    // Used if controlled by a guide:
+    void useGuide(Guide *guide, float startFrame = 0);
+    void guideAdvance(float distance);
+    void guideMove(float moveSpeed);
+    void setGuidedPos(const QPointF &position);
+    QPointF getGuidedPos();
+    float startFrame;
+    float guideFrame;
+    Guide *currGuide;
+
+protected:
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option = 0, QWidget *widget = 0); // overridden
+    virtual QImage *createImage(const QMatrix &) const { return 0; };
+    virtual bool collidesWithItem(const QGraphicsItem *, Qt::ItemSelectionMode) const { return false; };
+    bool prepared;
+
+private:
+    SharedImage *sharedImage;
+    QString hashKey;
+    bool neverVisible;
+    bool validateImage();
+
+    // Used if controlled by a guide:
+    void switchGuide(Guide *guide);
+    friend class Guide;
+    QPointF guidedPos;
+
+    // The next static hash is shared amongst all demo items, and
+    // has the purpose of reusing images to save memory and time
+    static QHash<QString, SharedImage *> sharedImageHash;
+    static QMatrix matrix;
+};
+
+#endif // DEMO_ITEM_H
+
diff --git a/demos/qtdemo/demoitemanimation.cpp b/demos/qtdemo/demoitemanimation.cpp
new file mode 100644
index 0000000000..92b2d24516
--- /dev/null
+++ b/demos/qtdemo/demoitemanimation.cpp
@@ -0,0 +1,219 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "demoitemanimation.h"
+#include "demoitem.h"
+#include "colors.h"
+
+DemoItemAnimation::DemoItemAnimation(DemoItem *item, INOROUT inOrOut)
+{
+    this->opacityAt0 = 1.0;
+    this->opacityAt1 = 1.0;
+    this->startDelay = 0;
+    this->inOrOut = inOrOut;
+    this->hideOnFinished = false;
+    this->forcePlay = false;
+    this->timeline = new QTimeLine(5000);
+    this->timeline->setFrameRange(0, 2000);
+    this->timeline->setUpdateInterval(int(1000.0/Colors::fps));
+    this->moveOnPlay = false;
+    setTimeLine(this->timeline);
+    setItem(item);
+}
+
+DemoItemAnimation::~DemoItemAnimation()
+{
+    // Do not delete demoitem. It is not
+    // owned by an animation
+    delete this->timeline;
+}
+
+void DemoItemAnimation::prepare()
+{
+    this->demoItem()->prepare();
+}
+
+void DemoItemAnimation::setStartPos(const QPointF &pos){
+    this->startPos = pos;
+}
+
+void DemoItemAnimation::setDuration(int duration)
+{
+    duration = int(duration * Colors::animSpeed);
+    this->timeline->setDuration(duration);
+    this->moveOnPlay = true;
+}
+
+void DemoItemAnimation::setCurrentTime(int ms)
+{
+    this->timeline->setCurrentTime(ms);
+}
+
+bool DemoItemAnimation::notOwnerOfItem()
+{
+    return this != demoItem()->currentAnimation;
+}
+
+void DemoItemAnimation::play(bool fromStart, bool force)
+{
+    this->fromStart = fromStart;
+    this->forcePlay = force;
+
+    QPointF currPos = this->demoItem()->pos();
+
+    // If the item that this animation controls in currently under the
+    // control of another animation, stop that animation first
+    if (this->demoItem()->currentAnimation)
+        this->demoItem()->currentAnimation->timeline->stop();
+    this->demoItem()->currentAnimation = this;
+    this->timeline->stop();
+
+    if (Colors::noAnimations && !this->forcePlay){
+        this->timeline->setCurrentTime(1);
+        this->demoItem()->setPos(this->posAt(1));
+    }
+    else{
+        if (this->demoItem()->isVisible())
+            // If the item is already visible, start the animation from
+            // the items current position rather than from start.
+            this->setPosAt(0.0, currPos);
+        else
+            this->setPosAt(0.0, this->startPos);
+
+        if (this->fromStart){
+            this->timeline->setCurrentTime(0);
+            this->demoItem()->setPos(this->posAt(0));
+        }
+    }
+
+    if (this->inOrOut == ANIM_IN)
+        this->demoItem()->setRecursiveVisible(true);
+
+    if (this->startDelay){
+        QTimer::singleShot(this->startDelay, this, SLOT(playWithoutDelay()));
+        return;
+    }
+    else
+        this->playWithoutDelay();
+}
+
+void DemoItemAnimation::playWithoutDelay()
+{
+    if (this->moveOnPlay && !(Colors::noAnimations && !this->forcePlay))
+        this->timeline->start();
+    this->demoItem()->animationStarted(this->inOrOut);
+}
+
+void DemoItemAnimation::stop(bool reset)
+{
+    this->timeline->stop();
+    if (reset)
+        this->demoItem()->setPos(this->posAt(0));
+    if (this->hideOnFinished && !this->moveOnPlay)
+        this->demoItem()->setRecursiveVisible(false);
+    this->demoItem()->animationStopped(this->inOrOut);
+}
+
+void DemoItemAnimation::setRepeat(int nr)
+{
+    this->timeline->setLoopCount(nr);
+}
+
+void DemoItemAnimation::playReverse()
+{
+}
+
+bool DemoItemAnimation::running()
+{
+    return (this->timeLine()->state() == QTimeLine::Running);
+}
+
+bool DemoItemAnimation::runningOrItemLocked()
+{
+    return (this->running() || this->demoItem()->locked);
+}
+
+void DemoItemAnimation::lockItem(bool state)
+{
+    this->demoItem()->locked = state;
+}
+
+DemoItem *DemoItemAnimation::demoItem()
+{
+    return (DemoItem *) this->item();
+}
+
+void DemoItemAnimation::setOpacityAt0(qreal opacity)
+{
+    this->opacityAt0 = opacity;
+}
+
+void DemoItemAnimation::setOpacityAt1(qreal opacity)
+{
+    this->opacityAt1 = opacity;
+}
+
+void DemoItemAnimation::setOpacity(qreal step)
+{
+    DemoItem *demoItem = (DemoItem *) item();
+    demoItem->opacity = this->opacityAt0 + step * step * step * (this->opacityAt1 - this->opacityAt0);
+}
+
+void DemoItemAnimation::afterAnimationStep(qreal step)
+{
+    if (step == 1.0f){
+        if (this->timeline->loopCount() > 0){
+            // animation finished.
+            if (this->hideOnFinished)
+                this->demoItem()->setRecursiveVisible(false);
+            this->demoItem()->animationStopped(this->inOrOut);
+        }
+    } else if (Colors::noAnimations && !this->forcePlay){
+        // The animation is not at end, but
+        // the animations should not play, so go to end.
+        this->setStep(1.0f); // will make this method being called recursive.
+    }
+}
+
+
+
+
+
diff --git a/demos/qtdemo/demoitemanimation.h b/demos/qtdemo/demoitemanimation.h
new file mode 100644
index 0000000000..ad89ada84a
--- /dev/null
+++ b/demos/qtdemo/demoitemanimation.h
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DEMO_ITEM_ANIMATION_H
+#define DEMO_ITEM_ANIMATION_H
+
+#include <QtCore>
+#include <QtGui>
+
+class DemoItem;
+
+class DemoItemAnimation : public QGraphicsItemAnimation
+{
+    Q_OBJECT
+
+public:
+    enum INOROUT {ANIM_IN, ANIM_OUT, ANIM_UNSPECIFIED};
+
+    DemoItemAnimation(DemoItem *item, INOROUT inOrOut = ANIM_UNSPECIFIED);
+    virtual ~DemoItemAnimation();
+
+    virtual void play(bool fromStart = true, bool force = false);
+    virtual void playReverse();
+    virtual void stop(bool reset = true);
+    virtual void setRepeat(int nr = 0);
+
+    void setDuration(int duration);
+    void setDuration(float duration){ setDuration(int(duration)); };
+    void setOpacityAt0(qreal opacity);
+    void setOpacityAt1(qreal opacity);
+    void setOpacity(qreal step);
+    void setCurrentTime(int ms);
+    void setStartPos(const QPointF &pos);
+    bool notOwnerOfItem();
+
+    bool running();
+    bool runningOrItemLocked();
+    void lockItem(bool state);
+    void prepare();
+
+    DemoItem *demoItem();
+
+    virtual void afterAnimationStep(qreal step); // overridden
+
+    QTimeLine *timeline;
+    qreal opacityAt0;
+    qreal opacityAt1;
+    int startDelay;
+    QPointF startPos;
+    bool hideOnFinished;
+    bool moveOnPlay;
+    bool forcePlay;
+    bool fromStart;
+    INOROUT inOrOut;
+
+private slots:
+    virtual void playWithoutDelay();
+};
+
+#endif // DEMO_ITEM_ANIMATION_H
+
+
+
diff --git a/demos/qtdemo/demoscene.cpp b/demos/qtdemo/demoscene.cpp
new file mode 100644
index 0000000000..29b73d37fe
--- /dev/null
+++ b/demos/qtdemo/demoscene.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "demoscene.h"
+
+void DemoScene::drawItems(QPainter *painter, int numItems, QGraphicsItem *items[], const QStyleOptionGraphicsItem options[], QWidget *widget)
+{
+    for (int i=0; i<numItems; ++i) {
+        painter->save();
+        painter->setMatrix(items[i]->sceneMatrix(), true);
+        items[i]->paint(painter, &options[i], widget);
+        painter->restore();
+    }
+}
+
+
diff --git a/demos/qtdemo/demoscene.h b/demos/qtdemo/demoscene.h
new file mode 100644
index 0000000000..e4838c73e3
--- /dev/null
+++ b/demos/qtdemo/demoscene.h
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAIN_VIEW_H
+#define MAIN_VIEW_H
+
+#include <QtGui>
+
+class DemoScene : public QGraphicsScene
+{
+public:
+    DemoScene(QObject *parent) : QGraphicsScene(parent){};
+
+protected:
+    void drawItems(QPainter *painter, int numItems, QGraphicsItem *items[], const QStyleOptionGraphicsItem options[], QWidget *widget);
+};
+
+#endif // MAIN_VIEW_H
+
diff --git a/demos/qtdemo/demotextitem.cpp b/demos/qtdemo/demotextitem.cpp
new file mode 100644
index 0000000000..cd549fcc5f
--- /dev/null
+++ b/demos/qtdemo/demotextitem.cpp
@@ -0,0 +1,123 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "demotextitem.h"
+#include "colors.h"
+
+DemoTextItem::DemoTextItem(const QString &text, const QFont &font, const QColor &textColor,
+                           float textWidth, QGraphicsScene *scene, QGraphicsItem *parent, TYPE type, const QColor &bgColor)
+                           : DemoItem(scene, parent)
+{
+    this->type = type;
+    this->text = text;
+    this->font = font;
+    this->textColor = textColor;
+    this->bgColor = bgColor;
+    this->textWidth = textWidth;
+    this->noSubPixeling = true;
+}
+
+void DemoTextItem::setText(const QString &text)
+{
+    this->text = text;
+    this->update();
+}
+
+QImage *DemoTextItem::createImage(const QMatrix &matrix) const
+{
+    if (this->type == DYNAMIC_TEXT)
+        return 0;
+
+    float sx = qMin(matrix.m11(), matrix.m22());
+    float sy = matrix.m22() < sx ? sx : matrix.m22();
+
+    QGraphicsTextItem textItem(0, 0);
+    textItem.setHtml(this->text);
+    textItem.setTextWidth(this->textWidth);
+    textItem.setFont(this->font);
+    textItem.setDefaultTextColor(this->textColor);
+    textItem.document()->setDocumentMargin(2);
+
+    float w = textItem.boundingRect().width();
+    float h = textItem.boundingRect().height();
+    QImage *image = new QImage(int(w * sx), int(h * sy), QImage::Format_ARGB32_Premultiplied);
+    image->fill(QColor(0, 0, 0, 0).rgba());
+    QPainter painter(image);
+    painter.scale(sx, sy);
+    QStyleOptionGraphicsItem style;
+    textItem.paint(&painter, &style, 0);
+    return image;
+}
+
+
+void DemoTextItem::animationStarted(int)
+{
+    this->noSubPixeling = false;
+}
+
+
+void DemoTextItem::animationStopped(int)
+{
+    this->noSubPixeling = true;
+}
+
+QRectF DemoTextItem::boundingRect() const
+
+{
+    if (this->type == STATIC_TEXT)
+        return DemoItem::boundingRect();
+    return QRectF(0, 0, 50, 20); // Sorry for using magic number
+}
+
+
+void DemoTextItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    if (this->type == STATIC_TEXT) {
+        DemoItem::paint(painter, option, widget);
+        return;
+    }
+
+    painter->setPen(this->textColor);
+    painter->drawText(0, 0, this->text);
+}
diff --git a/demos/qtdemo/demotextitem.h b/demos/qtdemo/demotextitem.h
new file mode 100644
index 0000000000..679e3fb5a5
--- /dev/null
+++ b/demos/qtdemo/demotextitem.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DEMO_TEXT_ITEM_H
+#define DEMO_TEXT_ITEM_H
+
+#include <QtGui>
+#include "demoitem.h"
+
+class DemoTextItem : public DemoItem
+{
+public:
+    enum TYPE {STATIC_TEXT, DYNAMIC_TEXT};
+
+    DemoTextItem(const QString &text, const QFont &font, const QColor &textColor,
+        float textWidth, QGraphicsScene *scene = 0, QGraphicsItem *parent = 0, TYPE type = STATIC_TEXT, const QColor &bgColor = QColor());
+    void setText(const QString &text);
+    QRectF boundingRect() const; // overridden
+    void animationStarted(int id = 0);
+    void animationStopped(int id = 0);
+
+protected:
+    virtual QImage *createImage(const QMatrix &matrix) const; // overridden
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option = 0, QWidget *widget = 0); // overridden
+
+private:
+    float textWidth;
+    QString text;
+    QFont font;
+    QColor textColor;
+    QColor bgColor;
+    TYPE type;
+};
+
+#endif // DEMO_TEXT_ITEM_H
+
diff --git a/demos/qtdemo/dockitem.cpp b/demos/qtdemo/dockitem.cpp
new file mode 100644
index 0000000000..7f26f0420c
--- /dev/null
+++ b/demos/qtdemo/dockitem.cpp
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "dockitem.h"
+#include "colors.h"
+
+DockItem::DockItem(ORIENTATION orien, qreal x, qreal y, qreal width, qreal length, QGraphicsScene *scene, QGraphicsItem *parent)
+    : DemoItem(scene, parent)
+{
+    this->orientation = orien;
+    this->width = width;
+    this->length = length;
+    this->setPos(x, y);
+    this->setZValue(40);
+    this->setupPixmap();
+}
+
+void DockItem::setupPixmap()
+{
+    this->pixmap = new QPixmap(int(this->boundingRect().width()), int(this->boundingRect().height()));
+    this->pixmap->fill(QColor(0, 0, 0, 0));
+    QPainter painter(this->pixmap);
+    // create brush:
+    QColor background = Colors::sceneBg1;
+    QLinearGradient brush(0, 0, 0, this->boundingRect().height());
+    brush.setSpread(QGradient::PadSpread);
+
+    if (this->orientation == DOWN){
+        brush.setColorAt(0.0, background);
+        brush.setColorAt(0.2, background);
+        background.setAlpha(0);
+        brush.setColorAt(1.0, background);
+    }
+    else
+        if (this->orientation == UP){
+        brush.setColorAt(1.0, background);
+        brush.setColorAt(0.8, background);
+        background.setAlpha(0);
+        brush.setColorAt(0.0, background);
+    }
+    else
+        qWarning("DockItem doesn't support the orientation given!");
+
+    painter.fillRect(0, 0, int(this->boundingRect().width()), int(this->boundingRect().height()), brush);
+
+}
+
+DockItem::~DockItem()
+{
+    delete this->pixmap;
+}
+
+QRectF DockItem::boundingRect() const
+{
+    if (this->orientation == UP || this->orientation == DOWN)
+        return QRectF(0, 0, this->length, this->width);
+    else
+        return QRectF(0, 0, this->width, this->length);
+}
+
+void DockItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    painter->drawPixmap(0, 0, *this->pixmap);
+}
+
+
+
diff --git a/demos/qtdemo/dockitem.h b/demos/qtdemo/dockitem.h
new file mode 100644
index 0000000000..13473a3f7e
--- /dev/null
+++ b/demos/qtdemo/dockitem.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DOCK_ITEM_H
+#define DOCK_ITEM_H
+
+#include <QtGui>
+#include "demoitem.h"
+
+class DockItem : public DemoItem
+{
+public:
+    enum ORIENTATION {UP, DOWN, LEFT, RIGHT};
+
+    DockItem(ORIENTATION orien, qreal x, qreal y, qreal width, qreal length, QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
+    virtual ~DockItem();
+
+    virtual QRectF boundingRect() const; // overridden
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); // overridden
+
+    qreal length;
+    qreal width;
+    ORIENTATION orientation;
+
+private:
+    void setupPixmap();
+    QPixmap *pixmap;
+};
+
+#endif // DOCK_ITEM_H
+
diff --git a/demos/qtdemo/examplecontent.cpp b/demos/qtdemo/examplecontent.cpp
new file mode 100644
index 0000000000..a568b8cbaa
--- /dev/null
+++ b/demos/qtdemo/examplecontent.cpp
@@ -0,0 +1,158 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "examplecontent.h"
+#include "colors.h"
+#include "menumanager.h"
+#include "imageitem.h"
+#include "headingitem.h"
+
+ExampleContent::ExampleContent(const QString &name, QGraphicsScene *scene, QGraphicsItem *parent)
+    : DemoItem(scene, parent)
+{
+    this->name = name;
+    this->heading = 0;
+    this->description = 0;
+    this->screenshot = 0;
+}
+
+void ExampleContent::prepare()
+{
+    if (!this->prepared){
+        this->prepared = true;
+        this->createContent();
+    }
+}
+
+void ExampleContent::animationStopped(int id)
+{
+    if (id == DemoItemAnimation::ANIM_OUT){
+        // Free up some memory:
+        delete this->heading;
+        delete this->description;
+        delete this->screenshot;
+        this->heading = 0;
+        this->description = 0;
+        this->screenshot = 0;
+        this->prepared = false;
+    }
+}
+
+QString ExampleContent::loadDescription()
+{
+    QByteArray ba = MenuManager::instance()->getHtml(this->name);
+
+    QDomDocument exampleDoc;
+    exampleDoc.setContent(ba, false);
+
+    QDomNodeList paragraphs = exampleDoc.elementsByTagName("p");
+    if (paragraphs.length() < 1 && Colors::verbose)
+        qDebug() << "- ExampleContent::loadDescription(): Could not load description:" << MenuManager::instance()->info[this->name]["docfile"];
+    QString description = Colors::contentColor + QLatin1String("Could not load description. Ensure that the documentation for Qt is built.");
+    for (int p = 0; p < int(paragraphs.length()); ++p) {
+        description = this->extractTextFromParagraph(paragraphs.item(p));
+        if (this->isSummary(description)) {
+            break;
+        }
+    }
+    return Colors::contentColor + description;
+}
+
+bool ExampleContent::isSummary(const QString &text)
+{
+    return (!text.contains("[") &&
+        text.indexOf(QRegExp(QString("(In )?((The|This) )?(%1 )?.*(tutorial|example|demo|application)").arg(this->name), Qt::CaseInsensitive)) != -1);
+}
+
+QString ExampleContent::extractTextFromParagraph(const QDomNode &parentNode)
+{
+    QString description;
+    QDomNode node = parentNode.firstChild();
+
+    while (!node.isNull()) {
+        QString beginTag;
+        QString endTag;
+        if (node.isText())
+            description += Colors::contentColor + node.nodeValue();
+        else if (node.hasChildNodes()) {
+            if (node.nodeName() == "b") {
+                beginTag = "<b>";
+                endTag = "</b>";
+            } else if (node.nodeName() == "a") {
+                beginTag = Colors::contentColor;
+                endTag = "</font>";
+            } else if (node.nodeName() == "i") {
+                beginTag = "<i>";
+                endTag = "</i>";
+            } else if (node.nodeName() == "tt") {
+                beginTag = "<tt>";
+                endTag = "</tt>";
+            }
+            description += beginTag + this->extractTextFromParagraph(node) + endTag;
+        }
+        node = node.nextSibling();
+    }
+
+    return description;
+}
+
+void ExampleContent::createContent()
+{
+    // Create the items:
+    this->heading = new HeadingItem(this->name, this->scene(), this);
+    this->description = new DemoTextItem(this->loadDescription(), Colors::contentFont(),
+        Colors::heading, 500, this->scene(), this);
+    int imgHeight = 340 - int(this->description->boundingRect().height()) + 50;
+    this->screenshot = new ImageItem(QImage::fromData(MenuManager::instance()->getImage(this->name)),
+          550, imgHeight, this->scene(), this);
+
+    // Place the items on screen:
+    this->heading->setPos(0, 3);
+    this->description->setPos(0, this->heading->pos().y() + this->heading->boundingRect().height() + 10);
+    this->screenshot->setPos(0, this->description->pos().y() + this->description->boundingRect().height() + 10);
+}
+
+QRectF ExampleContent::boundingRect() const
+{
+    return QRectF(0, 0, 500, 100);
+}
+
+
diff --git a/demos/qtdemo/examplecontent.h b/demos/qtdemo/examplecontent.h
new file mode 100644
index 0000000000..850d64b78c
--- /dev/null
+++ b/demos/qtdemo/examplecontent.h
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CONTENT_ITEM_H
+#define CONTENT_ITEM_H
+
+#include <QtGui>
+#include <QtXml>
+#include "demoitem.h"
+
+class HeadingItem;
+class DemoTextItem;
+class ImageItem;
+
+class ExampleContent : public DemoItem
+{
+
+public:
+    ExampleContent(const QString &name, QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
+
+    virtual QRectF boundingRect() const;
+    virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0){};
+    void animationStopped(int id);
+    void prepare();
+
+private:
+    QString name;
+    HeadingItem *heading;
+    DemoTextItem *description;
+    ImageItem *screenshot;
+
+    QString loadDescription();
+    QString extractTextFromParagraph(const QDomNode &parentNode);
+    bool isSummary(const QString &text);
+    void createContent();
+};
+
+#endif // CONTENT_ITEM_H
+
diff --git a/demos/qtdemo/guide.cpp b/demos/qtdemo/guide.cpp
new file mode 100644
index 0000000000..1f3c355768
--- /dev/null
+++ b/demos/qtdemo/guide.cpp
@@ -0,0 +1,144 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <cmath>
+#include "guide.h"
+#include "colors.h"
+
+Guide::Guide(Guide *follows)
+{
+    this->scaleX = 1.0;
+    this->scaleY = 1.0;
+
+    if (follows){
+        while (follows->nextGuide != follows->firstGuide) // append to end
+            follows = follows->nextGuide;
+
+        follows->nextGuide = this;
+        this->prevGuide = follows;
+        this->firstGuide = follows->firstGuide;
+        this->nextGuide = follows->firstGuide;
+        this->startLength = int(follows->startLength + follows->length()) + 1;
+    }
+    else{
+        this->prevGuide = this;
+        this->firstGuide = this;
+        this->nextGuide = this;
+        this->startLength = 0;
+    }
+}
+
+void Guide::setScale(float scaleX, float scaleY, bool all)
+{
+    this->scaleX = scaleX;
+    this->scaleY = scaleY;
+
+    if (all){
+        Guide *next = this->nextGuide;
+        while(next != this){
+            next->scaleX = scaleX;
+            next->scaleY = scaleY;
+            next = next->nextGuide;
+        }
+    }
+}
+
+void Guide::setFence(const QRectF &fence, bool all)
+{
+    this->fence = fence;
+
+    if (all){
+        Guide *next = this->nextGuide;
+        while(next != this){
+            next->fence = fence;
+            next = next->nextGuide;
+        }
+    }
+}
+
+Guide::~Guide()
+{
+    if (this != this->nextGuide && this->nextGuide != this->firstGuide)
+        delete this->nextGuide;
+}
+
+float Guide::lengthAll()
+{
+    float len = length();
+    Guide *next = this->nextGuide;
+    while(next != this){
+        len += next->length();
+        next = next->nextGuide;
+    }
+    return len;
+}
+
+void Guide::move(DemoItem *item, QPointF &dest, float moveSpeed)
+{
+    QLineF walkLine(item->getGuidedPos(), dest);
+    if (moveSpeed >= 0 && walkLine.length() > moveSpeed){
+        // The item is too far away from it's destination point.
+        // So we choose to move it towards it instead.
+        float dx = walkLine.dx();
+        float dy = walkLine.dy();
+
+        if (qAbs(dx) > qAbs(dy)){
+            // walk along x-axis
+            if (dx != 0){
+                float d = moveSpeed * dy / qAbs(dx);
+                float s = dx > 0 ? moveSpeed : -moveSpeed;
+                dest.setX(item->getGuidedPos().x() + s);
+                dest.setY(item->getGuidedPos().y() + d);
+            }
+        }
+        else{
+            // walk along y-axis
+            if (dy != 0){
+                float d = moveSpeed * dx / qAbs(dy);
+                float s = dy > 0 ? moveSpeed : -moveSpeed;
+                dest.setX(item->getGuidedPos().x() + d);
+                dest.setY(item->getGuidedPos().y() + s);
+            }
+        }
+    }
+
+    item->setGuidedPos(dest);
+}
diff --git a/demos/qtdemo/guide.h b/demos/qtdemo/guide.h
new file mode 100644
index 0000000000..51ce6c353e
--- /dev/null
+++ b/demos/qtdemo/guide.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GUIDE_H
+#define GUIDE_H
+
+#include "demoitem.h"
+
+class Guide
+{
+public:
+    Guide(Guide *follows = 0);
+    virtual ~Guide();
+
+    virtual void guide(DemoItem *item, float moveSpeed) = 0;
+    void move(DemoItem *item, QPointF &dest, float moveSpeed);
+    virtual QPointF startPos(){ return QPointF(0, 0); };
+    virtual QPointF endPos(){ return QPointF(0, 0); };
+    virtual float length(){ return 1; };
+    float lengthAll();
+
+    void setScale(float scaleX, float scaleY, bool all = true);
+    void setFence(const QRectF &fence, bool all = true);
+
+    int startLength;
+    Guide *nextGuide;
+    Guide *firstGuide;
+    Guide *prevGuide;
+    float scaleX;
+    float scaleY;
+    QRectF fence;
+};
+
+#endif // GUIDE_H
+
diff --git a/demos/qtdemo/guidecircle.cpp b/demos/qtdemo/guidecircle.cpp
new file mode 100644
index 0000000000..98328dccb7
--- /dev/null
+++ b/demos/qtdemo/guidecircle.cpp
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "guidecircle.h"
+
+static float PI2 = 2*3.1415f;
+
+GuideCircle::GuideCircle(const QRectF &rect, float startAngle, float span, DIRECTION dir, Guide *follows) : Guide(follows)
+{
+    this->radiusX = rect.width() / 2.0;
+    this->radiusY = rect.height() / 2.0;
+    this->posX = rect.topLeft().x();
+    this->posY = rect.topLeft().y();
+    this->spanRad = span * PI2 / -360.0;
+    if (dir == CCW){
+        this->startAngleRad = startAngle * PI2 / -360.0;
+        this->endAngleRad = startAngleRad + spanRad;
+        this->stepAngleRad = this->spanRad / this->length();
+    }
+    else{
+        this->startAngleRad = spanRad + (startAngle * PI2 / -360.0);
+        this->endAngleRad = startAngle * PI2 / -360.0;
+        this->stepAngleRad = -this->spanRad / this->length();
+    }
+}
+
+float GuideCircle::length()
+{
+    return qAbs(this->radiusX * spanRad);
+}
+
+QPointF GuideCircle::startPos()
+{
+    return QPointF((posX + radiusX + radiusX * cos(startAngleRad)) * scaleX,
+                   (posY + radiusY + radiusY * sin(startAngleRad)) * scaleY);
+}
+
+QPointF GuideCircle::endPos()
+{
+    return QPointF((posX + radiusX + radiusX * cos(endAngleRad)) * scaleX,
+                   (posY + radiusY + radiusY * sin(endAngleRad)) * scaleY);
+}
+
+void GuideCircle::guide(DemoItem *item, float moveSpeed)
+{
+    float frame = item->guideFrame - this->startLength;
+    QPointF end((posX + radiusX + radiusX * cos(startAngleRad + (frame * stepAngleRad))) * scaleX,
+                (posY + radiusY + radiusY * sin(startAngleRad + (frame * stepAngleRad))) * scaleY);
+    this->move(item, end, moveSpeed);
+}
diff --git a/demos/qtdemo/guidecircle.h b/demos/qtdemo/guidecircle.h
new file mode 100644
index 0000000000..2179527224
--- /dev/null
+++ b/demos/qtdemo/guidecircle.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GUIDECIRCLE_H
+#define GUIDECIRCLE_H
+
+#include "guide.h"
+#include "demoitem.h"
+
+class GuideCircle : public Guide
+{
+public:
+    enum DIRECTION {CW = 1, CCW = -1};
+
+    GuideCircle(const QRectF &rect, float startAngle = 0, float span = 360, DIRECTION dir = CCW, Guide *follows = 0);
+
+    void guide(DemoItem *item, float moveSpeed); // overridden
+    QPointF startPos();
+    QPointF endPos();
+    float length();
+
+private:
+    float posX;
+    float posY;
+    float radiusX;
+    float radiusY;
+    float startAngleRad;
+    float endAngleRad;
+    float spanRad;
+    float stepAngleRad;
+};
+
+#endif // GUIDECIRCLE_H
+
diff --git a/demos/qtdemo/guideline.cpp b/demos/qtdemo/guideline.cpp
new file mode 100644
index 0000000000..ac013390e6
--- /dev/null
+++ b/demos/qtdemo/guideline.cpp
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "guideline.h"
+#include <cmath>
+
+GuideLine::GuideLine(const QLineF &line, Guide *follows) : Guide(follows)
+{
+    this->line = line;
+}
+
+GuideLine::GuideLine(const QPointF &end, Guide *follows) : Guide(follows)
+{
+    if (follows)
+        this->line = QLineF(prevGuide->endPos(), end);
+    else
+        this->line = QLineF(QPointF(0, 0), end);
+}
+
+float GuideLine::length()
+{
+    return line.length();
+}
+
+QPointF GuideLine::startPos()
+{
+    return QPointF(this->line.p1().x() * scaleX, this->line.p1().y() * scaleY);
+}
+
+QPointF GuideLine::endPos()
+{
+    return QPointF(this->line.p2().x() * scaleX, this->line.p2().y() * scaleY);
+}
+
+void GuideLine::guide(DemoItem *item, float moveSpeed)
+{
+    float frame = item->guideFrame - this->startLength;
+    float endX = (this->line.p1().x() + (frame * this->line.dx() / this->length())) * scaleX;
+    float endY = (this->line.p1().y() + (frame * this->line.dy() / this->length())) * scaleY;
+    QPointF pos(endX, endY);
+    this->move(item, pos, moveSpeed);
+}
+
diff --git a/demos/qtdemo/guideline.h b/demos/qtdemo/guideline.h
new file mode 100644
index 0000000000..93daaa8c75
--- /dev/null
+++ b/demos/qtdemo/guideline.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GUIDELINE_H
+#define GUIDELINE_H
+
+#include "guide.h"
+#include "demoitem.h"
+
+class GuideLine : public Guide
+{
+public:
+    GuideLine(const QLineF &line, Guide *follows = 0);
+    GuideLine(const QPointF &end, Guide *follows = 0);
+
+    void guide(DemoItem *item, float moveSpeed); // overridden
+    QPointF startPos();
+    QPointF endPos();
+    float length();
+
+private:
+    QLineF line;
+
+};
+
+#endif // GUIDELINE_H
+
diff --git a/demos/qtdemo/headingitem.cpp b/demos/qtdemo/headingitem.cpp
new file mode 100644
index 0000000000..80a255a16f
--- /dev/null
+++ b/demos/qtdemo/headingitem.cpp
@@ -0,0 +1,104 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "headingitem.h"
+#include "colors.h"
+
+HeadingItem::HeadingItem(const QString &text, QGraphicsScene *scene, QGraphicsItem *parent)
+    : DemoItem(scene, parent)
+{
+    this->text = text;
+    this->noSubPixeling = true;
+}
+
+QImage *HeadingItem::createImage(const QMatrix &matrix) const
+{
+    float sx = qMin(matrix.m11(), matrix.m22());
+    float sy = matrix.m22() < sx ? sx : matrix.m22();
+    QFontMetrics fm(Colors::headingFont());
+
+    float w = fm.width(this->text) + 1;
+    float h = fm.height();
+    float xShadow = 3.0f;
+    float yShadow = 3.0f;
+
+    QImage *image = new QImage(int((w + xShadow) * sx), int((h + yShadow) * sy), QImage::Format_ARGB32_Premultiplied);
+    image->fill(QColor(0, 0, 0, 0).rgba());
+    QPainter painter(image);
+    painter.setFont(Colors::headingFont());
+    painter.scale(sx, sy);
+
+    //draw shadow
+    QLinearGradient brush_shadow(xShadow, yShadow, w, yShadow);
+    brush_shadow.setSpread(QLinearGradient::PadSpread);
+    if (Colors::useEightBitPalette)
+        brush_shadow.setColorAt(0.0f, QColor(0, 0, 0));
+    else
+        brush_shadow.setColorAt(0.0f, QColor(0, 0, 0, 100));
+    QPen pen_shadow;
+    pen_shadow.setBrush(brush_shadow);
+    painter.setPen(pen_shadow);
+    painter.drawText(int(xShadow), int(yShadow), int(w), int(h), Qt::AlignLeft, this->text);
+
+    // draw text
+    QLinearGradient brush_text(0, 0, w, w);
+    brush_text.setSpread(QLinearGradient::PadSpread);
+    brush_text.setColorAt(0.0f, QColor(255, 255, 255));
+    brush_text.setColorAt(0.2f, QColor(255, 255, 255));
+    brush_text.setColorAt(0.5f, QColor(190, 190, 190));
+    QPen pen_text;
+    pen_text.setBrush(brush_text);
+    painter.setPen(pen_text);
+    painter.drawText(0, 0, int(w), int(h), Qt::AlignLeft, this->text);
+    return image;
+}
+
+
+void HeadingItem::animationStarted(int)
+{
+    this->noSubPixeling = false;
+}
+
+
+void HeadingItem::animationStopped(int)
+{
+    this->noSubPixeling = true;
+}
diff --git a/demos/qtdemo/headingitem.h b/demos/qtdemo/headingitem.h
new file mode 100644
index 0000000000..a5cb997258
--- /dev/null
+++ b/demos/qtdemo/headingitem.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef HEADING_ITEM_H
+#define HEADING_ITEM_H
+
+#include <QtGui>
+#include "demoitem.h"
+
+class HeadingItem : public DemoItem
+{
+public:
+    HeadingItem(const QString &text, QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
+    void animationStarted(int id = 0);
+    void animationStopped(int id = 0);
+
+protected:
+    virtual QImage *createImage(const QMatrix &matrix) const; // overridden
+
+private:
+    QString text;
+};
+
+#endif // HEADING_ITEM_H
+
diff --git a/demos/qtdemo/imageitem.cpp b/demos/qtdemo/imageitem.cpp
new file mode 100644
index 0000000000..e556011610
--- /dev/null
+++ b/demos/qtdemo/imageitem.cpp
@@ -0,0 +1,114 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "imageitem.h"
+#include "colors.h"
+
+ImageItem::ImageItem(const QImage &image, int maxWidth, int maxHeight, QGraphicsScene *scene,
+        QGraphicsItem *parent, bool adjustSize, float scale) : DemoItem(scene, parent)
+{
+    this->image = image;
+    this->maxWidth = maxWidth;
+    this->maxHeight = maxHeight;
+    this->adjustSize = adjustSize;
+    this->scale = scale;
+}
+
+QImage *ImageItem::createImage(const QMatrix &matrix) const
+{
+    QImage *original = new QImage(image);
+    if (original->isNull()){
+        return original; // nothing we can do about it...
+    }
+
+    QPoint size = matrix.map(QPoint(this->maxWidth, this->maxHeight));
+    float w = size.x(); // x, y is the used as width, height
+    float h = size.y();
+
+    // Optimization: if image is smaller than maximum allowed size, just return the loaded image
+    if (original->size().height() <= h && original->size().width() <= w && !this->adjustSize && this->scale == 1)
+        return original;
+
+    // Calculate what the size of the final image will be:
+    w = qMin(w, float(original->size().width()) * this->scale);
+    h = qMin(h, float(original->size().height()) * this->scale);
+
+    float adjustx = 1.0f;
+    float adjusty = 1.0f;
+    if (this->adjustSize){
+        adjustx = qMin(matrix.m11(), matrix.m22());
+        adjusty = matrix.m22() < adjustx ? adjustx : matrix.m22();
+        w *= adjustx;
+        h *= adjusty;
+    }
+
+    // Create a new image with correct size, and draw original on it
+    QImage *image = new QImage(int(w+2), int(h+2), QImage::Format_ARGB32_Premultiplied);
+    image->fill(QColor(0, 0, 0, 0).rgba());
+    QPainter painter(image);
+    painter.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+    if (this->adjustSize)
+        painter.scale(adjustx, adjusty);
+    if (this->scale != 1)
+       painter.scale(this->scale, this->scale);
+    painter.drawImage(0, 0, *original);
+
+    if (!this->adjustSize){
+       // Blur out edges
+       int blur = 30;
+       if (h < original->height()){
+           QLinearGradient brush1(0, h - blur, 0, h);
+           brush1.setSpread(QGradient::PadSpread);
+           brush1.setColorAt(0.0, QColor(0, 0, 0, 0));
+           brush1.setColorAt(1.0, Colors::sceneBg1);
+           painter.fillRect(0, int(h) - blur, original->width(), int(h), brush1);
+       }
+       if (w < original->width()){
+           QLinearGradient brush2(w - blur, 0, w, 0);
+           brush2.setSpread(QGradient::PadSpread);
+           brush2.setColorAt(0.0, QColor(0, 0, 0, 0));
+           brush2.setColorAt(1.0, Colors::sceneBg1);
+           painter.fillRect(int(w) - blur, 0, int(w), original->height(), brush2);
+       }
+    }
+    delete original;
+    return image;
+}
diff --git a/demos/qtdemo/imageitem.h b/demos/qtdemo/imageitem.h
new file mode 100644
index 0000000000..e73079a017
--- /dev/null
+++ b/demos/qtdemo/imageitem.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef IMAGE_ITEM_H
+#define IMAGE_ITEM_H
+
+#include <QtGui>
+#include "demoitem.h"
+
+class ImageItem : public DemoItem
+{
+public:
+    ImageItem(const QImage &image, int maxWidth, int maxHeight, QGraphicsScene *scene = 0, QGraphicsItem *parent = 0,
+         bool adjustSize = false, float scale = 1.0f);
+
+    bool adjustSize;
+    float scale;
+protected:
+    QImage *createImage(const QMatrix &matrix) const;
+
+private:
+    QImage image;
+    int maxWidth;
+    int maxHeight;
+};
+
+#endif // DOCK_ITEM_H
+
diff --git a/demos/qtdemo/images/demobg.png b/demos/qtdemo/images/demobg.png
new file mode 100755
index 0000000000..3280afaa3e
--- /dev/null
+++ b/demos/qtdemo/images/demobg.png
diff --git a/demos/qtdemo/images/qtlogo_small.png b/demos/qtdemo/images/qtlogo_small.png
new file mode 100644
index 0000000000..21b17dfa04
--- /dev/null
+++ b/demos/qtdemo/images/qtlogo_small.png
diff --git a/demos/qtdemo/images/trolltech-logo.png b/demos/qtdemo/images/trolltech-logo.png
new file mode 100644
index 0000000000..186c69c767
--- /dev/null
+++ b/demos/qtdemo/images/trolltech-logo.png
diff --git a/demos/qtdemo/itemcircleanimation.cpp b/demos/qtdemo/itemcircleanimation.cpp
new file mode 100644
index 0000000000..fff52bbd03
--- /dev/null
+++ b/demos/qtdemo/itemcircleanimation.cpp
@@ -0,0 +1,507 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "itemcircleanimation.h"
+#include "demoitemanimation.h"
+#include "colors.h"
+#include "menumanager.h"
+#include "mainwindow.h"
+#include "menumanager.h"
+
+static QGraphicsScene *sscene;
+
+//////////////////// POST EFFECT STUFF ////////////////////////////////////////
+
+class TickerPostEffect
+{
+public:
+    virtual ~TickerPostEffect(){};
+    virtual void tick(float){};
+    virtual void transform(DemoItem *, QPointF &){};
+};
+
+class PostRotateXY : public TickerPostEffect
+{
+public:
+    float currRotX, currRotY;
+    float speedx, speedy, curvx, curvy;
+
+    PostRotateXY(float speedx, float speedy, float curvx, float curvy)
+        : currRotX(0), currRotY(0),
+        speedx(speedx), speedy(speedy),
+        curvx(curvx), curvy(curvy){};
+
+    void tick(float adjust)
+    {
+        currRotX += speedx * adjust;
+        currRotY += speedy * adjust;
+    }
+
+    void transform(DemoItem *item, QPointF &pos)
+    {
+        DemoItem *parent = (DemoItem *) item->parentItem();
+        QPointF center = parent->boundingRect().center();
+        pos.setX(center.x() + (pos.x() - center.x()) * cos(currRotX + pos.x() * curvx));
+        pos.setY(center.y() + (pos.y() - center.y()) * cos(currRotY + pos.y() * curvy));
+    }
+};
+
+class PostRotateXYTwist : public TickerPostEffect
+{
+public:
+    float currRotX, currRotY;
+    float speedx, speedy, curvx, curvy;
+
+    PostRotateXYTwist(float speedx, float speedy, float curvx, float curvy)
+        : currRotX(0), currRotY(0),
+        speedx(speedx), speedy(speedy),
+        curvx(curvx), curvy(curvy){};
+
+    void tick(float adjust)
+    {
+        currRotX += speedx * adjust;
+        currRotY += speedy * adjust;
+    }
+
+    void transform(DemoItem *item, QPointF &pos)
+    {
+        DemoItem *parent = (DemoItem *) item->parentItem();
+        QPointF center = parent->boundingRect().center();
+        pos.setX(center.x() + (pos.x() - center.x()) * cos(currRotX + pos.y() * curvx));
+        pos.setY(center.y() + (pos.y() - center.y()) * cos(currRotY + pos.x() * curvy));
+    }
+};
+
+//////////////////// TICKER EFFECT STUFF //////////////////////////////////////
+
+class TickerEffect
+{
+    TickerPostEffect *postEffect;
+public:
+    enum EffectStatus{Normal, Intro, Outro} status;
+    LetterList *letters;
+    float morphSpeed, moveSpeed;
+    float normalMorphSpeed, normalMoveSpeed;
+    bool useSheepDog, morphBetweenModels;
+
+    TickerEffect(LetterList *letters)
+        : postEffect(new TickerPostEffect()), status(Intro), letters(letters),
+        morphSpeed(Colors::tickerMorphSpeed), moveSpeed(Colors::tickerMoveSpeed),
+        normalMorphSpeed(Colors::tickerMorphSpeed), normalMoveSpeed(Colors::tickerMoveSpeed),
+        useSheepDog(true), morphBetweenModels(!Colors::noTickerMorph){}
+
+    void setPostEffect(TickerPostEffect *effect)
+    {
+        delete postEffect;
+        postEffect = effect;
+    }
+
+    virtual ~TickerEffect()
+    {
+        delete postEffect;
+    }
+
+    void slowDownAfterIntro(float adjust)
+    {
+        if (morphBetweenModels){
+            if (status == Intro){
+                float dec = 0.1 * adjust;
+                moveSpeed -= dec;
+                if (moveSpeed < Colors::tickerMoveSpeed){
+                    moveSpeed = normalMoveSpeed;
+                    morphSpeed = normalMorphSpeed;
+                    status = Normal;
+                }
+            }
+        }
+    }
+
+    void moveLetters(float adjust)
+    {
+        float adaptedMoveSpeed = this->moveSpeed * adjust;
+        float adaptedMorphSpeed = this->morphSpeed * adjust;
+        postEffect->tick(adjust);
+
+        for (int i=0; i<letters->size(); i++){
+            LetterItem *letter = letters->at(i);
+            letter->guideAdvance(this->morphBetweenModels ? adaptedMoveSpeed : Colors::tickerMoveSpeed);
+            letter->guideMove(this->morphBetweenModels ? adaptedMorphSpeed : -1);
+
+            QPointF pos = letter->getGuidedPos();
+            postEffect->transform(letter, pos);
+
+            if (useSheepDog)
+                letter->setPosUsingSheepDog(pos, QRectF(0, 0, 800, 600));
+            else
+                letter->setPos(pos);
+        }
+    }
+
+    virtual void tick(float adjust)
+    {
+        slowDownAfterIntro(adjust);
+        moveLetters(adjust);
+    }
+
+};
+
+class EffectWhirlWind : public TickerEffect
+{
+public:
+    EffectWhirlWind(LetterList *letters) : TickerEffect(letters)
+    {
+        moveSpeed = 50;
+        for (int i=0; i<this->letters->size(); i++){
+            LetterItem *letter = this->letters->at(i);
+            letter->setGuidedPos(QPointF(0, 100));
+        }
+    }
+};
+
+class EffectSnake : public TickerEffect
+{
+public:
+    EffectSnake(LetterList *letters) : TickerEffect(letters)
+    {
+        moveSpeed = 40;
+        for (int i=0; i<this->letters->size(); i++){
+            LetterItem *letter = this->letters->at(i);
+            letter->setGuidedPos(QPointF(0, -250 - (i * 5)));
+        }
+    }
+};
+
+class EffectScan : public TickerEffect
+{
+public:
+    EffectScan(LetterList *letters) : TickerEffect(letters)
+    {
+        for (int i=0; i<this->letters->size(); i++){
+            LetterItem *letter = this->letters->at(i);
+            letter->setGuidedPos(QPointF(100, -300));
+        }
+    }
+};
+
+class EffectRaindrops : public TickerEffect
+{
+public:
+    EffectRaindrops(LetterList *letters) : TickerEffect(letters)
+    {
+        for (int i=0; i<this->letters->size(); i++){
+            LetterItem *letter = this->letters->at(i);
+            letter->setGuidedPos(QPointF(-100 + rand() % 200, - 200.0f - rand() % 1300));
+        }
+    }
+};
+
+class EffectLine : public TickerEffect
+{
+public:
+    EffectLine(LetterList *letters) : TickerEffect(letters)
+    {
+        for (int i=0; i<this->letters->size(); i++){
+            LetterItem *letter = this->letters->at(i);
+            letter->setGuidedPos(QPointF(100, 500.0f + i * 20));
+        }
+    }
+};
+
+//////////////////// TICKER STUFF /////////////////////////////////////////////
+
+ItemCircleAnimation::ItemCircleAnimation(QGraphicsScene *scene, QGraphicsItem *parent)
+    : DemoItem(scene, parent)
+{
+    sscene = scene;
+    this->letterCount = Colors::tickerLetterCount;
+    this->scale = 1;
+    this->showCount = -1;
+    this->tickOnPaint = false;
+    this->paused = false;
+    this->doIntroTransitions = true;
+    this->setAcceptsHoverEvents(true);
+    this->setCursor(Qt::OpenHandCursor);
+    this->setupGuides();
+    this->setupLetters();
+    this->useGuideQt();
+    this->effect = 0;//new TickerEffect(this->letterList);
+}
+
+ItemCircleAnimation::~ItemCircleAnimation()
+{
+    delete this->letterList;
+    delete this->qtGuide1;
+    delete this->qtGuide2;
+    delete this->qtGuide3;
+    delete this->effect;
+}
+
+void ItemCircleAnimation::createLetter(char c)
+{
+    LetterItem *letter = new LetterItem(c, sscene, this);
+    this->letterList->append(letter);
+}
+
+void ItemCircleAnimation::setupLetters()
+{
+    this->letterList = new LetterList();
+
+    QString s = Colors::tickerText;
+    int len = s.length();
+    int i = 0;
+    for (; i < this->letterCount - len; i += len)
+        for (int l=0; l<len; l++)
+            createLetter(s[l].toLatin1());
+
+    // Fill inn with blanks:
+    for (; i < this->letterCount; ++i)
+        createLetter(' ');
+}
+
+void ItemCircleAnimation::setupGuides()
+{
+    int x = 0;
+    int y = 20;
+
+    this->qtGuide1 = new GuideCircle(QRectF(x, y, 260, 260), -36, 342);
+    new GuideLine(QPointF(x + 240, y + 268), this->qtGuide1);
+    new GuideLine(QPointF(x + 265, y + 246), this->qtGuide1);
+    new GuideLine(QPointF(x + 158, y + 134), this->qtGuide1);
+    new GuideLine(QPointF(x + 184, y + 109), this->qtGuide1);
+    new GuideLine(QPointF(x + 160, y +  82), this->qtGuide1);
+    new GuideLine(QPointF(x +  77, y + 163), this->qtGuide1); // T-top
+    new GuideLine(QPointF(x + 100, y + 190), this->qtGuide1);
+    new GuideLine(QPointF(x + 132, y + 159), this->qtGuide1);
+    new GuideLine(QPointF(x + 188, y + 211), this->qtGuide1);
+    new GuideCircle(QRectF(x + 30, y + 30, 200, 200), -30, 336, GuideCircle::CW, this->qtGuide1);
+    new GuideLine(QPointF(x + 238, y + 201), this->qtGuide1);
+
+    y = 30;
+    this->qtGuide2 = new GuideCircle(QRectF(x + 30, y + 30, 200, 200), 135, 270, GuideCircle::CCW);
+    new GuideLine(QPointF(x + 222, y + 38), this->qtGuide2);
+    new GuideCircle(QRectF(x, y, 260, 260), 135, 270, GuideCircle::CW, this->qtGuide2);
+    new GuideLine(QPointF(x + 59, y + 59), this->qtGuide2);
+
+    x = 115;
+    y = 10;
+    this->qtGuide3 = new GuideLine(QLineF(x, y, x + 30, y));
+    new GuideLine(QPointF(x + 30, y + 170), this->qtGuide3);
+    new GuideLine(QPointF(x, y + 170), this->qtGuide3);
+    new GuideLine(QPointF(x, y), this->qtGuide3);
+
+    this->qtGuide1->setFence(QRectF(0, 0, 800, 600));
+    this->qtGuide2->setFence(QRectF(0, 0, 800, 600));
+    this->qtGuide3->setFence(QRectF(0, 0, 800, 600));
+}
+
+void ItemCircleAnimation::useGuide(Guide *guide, int firstLetter, int lastLetter)
+{
+    float padding = guide->lengthAll() / float(lastLetter - firstLetter);
+    for (int i=firstLetter; i<lastLetter; i++){
+        LetterItem *letter = this->letterList->at(i);
+        letter->useGuide(guide, (i - firstLetter) * padding);
+    }
+}
+
+void ItemCircleAnimation::useGuideQt()
+{
+    if (this->currGuide != this->qtGuide1){
+        this->useGuide(qtGuide1, 0, this->letterCount);
+        this->currGuide = qtGuide1;
+    }
+}
+
+void ItemCircleAnimation::useGuideTt()
+{
+    if (this->currGuide != this->qtGuide2){
+        int split = int(this->letterCount * 5.0 / 7.0);
+        this->useGuide(qtGuide2, 0, split);
+        this->useGuide(qtGuide3, split, this->letterCount);
+        this->currGuide = qtGuide2;
+    }
+}
+
+QRectF ItemCircleAnimation::boundingRect() const
+{
+    return QRectF(0, 0, 300, 320);
+}
+
+void ItemCircleAnimation::prepare()
+{
+}
+
+void ItemCircleAnimation::switchToNextEffect()
+{
+    ++this->showCount;
+    delete this->effect;
+
+    switch (this->showCount){
+    case 1:
+        this->effect = new EffectSnake(this->letterList);
+        break;
+    case 2:
+        this->effect = new EffectLine(this->letterList);
+        this->effect->setPostEffect(new PostRotateXYTwist(0.01f, 0.0f, 0.003f, 0.0f));
+        break;
+    case 3:
+        this->effect = new EffectRaindrops(this->letterList);
+        this->effect->setPostEffect(new PostRotateXYTwist(0.01f, 0.005f, 0.003f, 0.003f));
+        break;
+    case 4:
+        this->effect = new EffectScan(this->letterList);
+        this->effect->normalMoveSpeed = 0;
+        this->effect->setPostEffect(new PostRotateXY(0.008f, 0.0f, 0.005f, 0.0f));
+        break;
+    default:
+        this->showCount = 0;
+        this->effect = new EffectWhirlWind(this->letterList);
+    }
+}
+
+void ItemCircleAnimation::animationStarted(int id)
+{
+    if (id == DemoItemAnimation::ANIM_IN){
+        if (this->doIntroTransitions){
+            // Make all letters dissapear
+            for (int i=0; i<this->letterList->size(); i++){
+                LetterItem *letter = this->letterList->at(i);
+                letter->setPos(1000, 0);
+            }
+            this->switchToNextEffect();
+            this->useGuideQt();
+            this->scale = 1;
+            // The first time we run, we have a rather large
+            // delay to perform benchmark before the ticker shows.
+            // But now, since we are showing, use a more appropriate value:
+            this->currentAnimation->startDelay = 1500;
+        }
+    }
+    else if (this->effect)
+        this->effect->useSheepDog = false;
+
+    this->tickTimer = QTime::currentTime();
+}
+
+void ItemCircleAnimation::animationStopped(int)
+{
+    // Nothing to do.
+}
+
+void ItemCircleAnimation::swapModel(){
+    if (this->currGuide == this->qtGuide2)
+        this->useGuideQt();
+    else
+        this->useGuideTt();
+}
+
+void ItemCircleAnimation::hoverEnterEvent(QGraphicsSceneHoverEvent *)
+{
+//  Skip swap here to enhance ticker dragging
+//    this->swapModel();
+}
+
+void ItemCircleAnimation::hoverLeaveEvent(QGraphicsSceneHoverEvent *)
+{
+    this->swapModel();
+}
+
+void ItemCircleAnimation::setTickerScale(float s)
+{
+    this->scale = s;
+    qtGuide1->setScale(this->scale, this->scale);
+    qtGuide2->setScale(this->scale, this->scale);
+    qtGuide3->setScale(this->scale, this->scale);
+}
+
+void ItemCircleAnimation::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    this->mouseMoveLastPosition = event->scenePos();
+    if (event->button() == Qt::LeftButton)
+        this->setCursor(Qt::ClosedHandCursor);
+    else
+        this->switchToNextEffect();
+}
+
+void ItemCircleAnimation::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton)
+        this->setCursor(Qt::OpenHandCursor);
+}
+
+void ItemCircleAnimation::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    QPointF newPosition = event->scenePos();
+    this->setPosUsingSheepDog(this->pos() + newPosition - this->mouseMoveLastPosition, QRectF(-260, -280, 1350, 1160));
+    this->mouseMoveLastPosition = newPosition;
+}
+
+void ItemCircleAnimation::wheelEvent(QGraphicsSceneWheelEvent *event)
+{
+    this->effect->moveSpeed = this->effect->moveSpeed + (event->delta() > 0 ? -0.20 : 0.20);
+    if (this->effect->moveSpeed < 0)
+        this->effect->moveSpeed = 0;
+}
+
+void ItemCircleAnimation::pause(bool on)
+{
+    this->paused = on;
+    this->tickTimer = QTime::currentTime();
+}
+
+void ItemCircleAnimation::tick()
+{
+    if (this->paused || !this->effect)
+        return;
+
+    float t = this->tickTimer.msecsTo(QTime::currentTime());
+    this->tickTimer = QTime::currentTime();
+    this->effect->tick(t/10.0f);
+}
+
+void ItemCircleAnimation::paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *)
+{
+    if (this->tickOnPaint)
+        tick();
+}
+
+
+
+
diff --git a/demos/qtdemo/itemcircleanimation.h b/demos/qtdemo/itemcircleanimation.h
new file mode 100644
index 0000000000..27e399cbd8
--- /dev/null
+++ b/demos/qtdemo/itemcircleanimation.h
@@ -0,0 +1,110 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ITEM_CIRCLE_ANIMATION_H
+#define ITEM_CIRCLE_ANIMATION_H
+
+#include <QtCore>
+#include <QObject>
+#include <QtGui>
+#include <QTimeLine>
+#include <QList>
+#include "demoitem.h"
+#include "letteritem.h"
+#include "guideline.h"
+#include "guidecircle.h"
+
+typedef QList<LetterItem *> LetterList;
+class TickerEffect;
+
+class ItemCircleAnimation : public QObject, public DemoItem
+{
+public:
+    ItemCircleAnimation(QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
+    virtual ~ItemCircleAnimation();
+
+    // overidden methods:
+    QRectF boundingRect() const;
+    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0);
+    void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+    void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    void wheelEvent(QGraphicsSceneWheelEvent *event);
+    void animationStarted(int id = 0);
+    void animationStopped(int id = 0);
+    void prepare();
+    void tick();
+    void switchToNextEffect();
+    void useGuideQt();
+    void useGuideTt();
+    void pause(bool on);
+
+    bool tickOnPaint;
+    bool paused;
+    bool doIntroTransitions;
+
+private:
+    void setupLetters();
+    void createLetter(char c);
+    void setupGuides();
+    void useGuide(Guide *guide, int firstLetter, int lastLetter);
+    void swapModel();
+    void setTickerScale(float s);
+
+    int showCount;
+    float scale;
+    QPointF mouseMoveLastPosition;
+    int letterCount;
+    LetterList *letterList;
+    Guide *qtGuide1;
+    Guide *qtGuide2;
+    Guide *qtGuide3;
+    Guide *currGuide;
+    TickerEffect *effect;
+    QTime tickTimer;
+};
+
+#endif // ITEM_CIRCLE_ANIMATION_H
+
+
+
diff --git a/demos/qtdemo/letteritem.cpp b/demos/qtdemo/letteritem.cpp
new file mode 100644
index 0000000000..7b814b1d63
--- /dev/null
+++ b/demos/qtdemo/letteritem.cpp
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <cmath>
+#include "letteritem.h"
+#include "colors.h"
+
+LetterItem::LetterItem(char letter, QGraphicsScene *scene, QGraphicsItem *parent) : DemoItem(scene, parent), letter(letter)
+{
+    useSharedImage(QString(__FILE__) + letter);
+}
+
+LetterItem::~LetterItem()
+{
+}
+
+QImage *LetterItem::createImage(const QMatrix &matrix) const
+{
+    QRect scaledRect = matrix.mapRect(QRect(0, 0, 25, 25));
+    QImage *image = new QImage(scaledRect.width(), scaledRect.height(), QImage::Format_ARGB32_Premultiplied);
+    image->fill(0);
+    QPainter painter(image);
+    painter.scale(matrix.m11(), matrix.m22());
+    painter.setRenderHints(QPainter::TextAntialiasing | QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+    painter.setPen(Qt::NoPen);
+    if (Colors::useEightBitPalette){
+        painter.setBrush(QColor(102, 175, 54));
+        painter.drawEllipse(0, 0, 25, 25);
+        painter.setFont(Colors::tickerFont());
+        painter.setPen(QColor(255, 255, 255));
+        painter.drawText(10, 15, QString(this->letter));
+    }
+    else {
+        QLinearGradient brush(0, 0, 0, 25);
+        brush.setSpread(QLinearGradient::PadSpread);
+        brush.setColorAt(0.0, QColor(102, 175, 54, 200));
+        brush.setColorAt(1.0, QColor(102, 175, 54, 60));
+        painter.setBrush(brush);
+        painter.drawEllipse(0, 0, 25, 25);
+        painter.setFont(Colors::tickerFont());
+        painter.setPen(QColor(255, 255, 255, 255));
+        painter.drawText(10, 15, QString(this->letter));
+    }
+    return image;
+}
+
+
diff --git a/demos/qtdemo/letteritem.h b/demos/qtdemo/letteritem.h
new file mode 100644
index 0000000000..8c3f16e31f
--- /dev/null
+++ b/demos/qtdemo/letteritem.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef LETTER_ITEM_H
+#define LETTER_ITEM_H
+
+#include <QtGui>
+#include "demoitem.h"
+
+class LetterItem : public DemoItem
+{
+public:
+    LetterItem(char letter, QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
+    virtual ~LetterItem();
+
+protected:
+    QImage *createImage(const QMatrix &matrix) const;
+
+private:
+    char letter;
+};
+
+#endif // LETTER_ITEM_H
+
diff --git a/demos/qtdemo/main.cpp b/demos/qtdemo/main.cpp
new file mode 100644
index 0000000000..bf2028dd2c
--- /dev/null
+++ b/demos/qtdemo/main.cpp
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "mainwindow.h"
+#include "menumanager.h"
+#include "colors.h"
+
+static void artisticSleep(int sleepTime)
+{
+    QTime time;
+    time.restart();
+    while (time.elapsed() < sleepTime)
+        QCoreApplication::processEvents(QEventLoop::AllEvents, 50);
+}
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(qtdemo);
+    QApplication app(argc, argv);
+    Colors::parseArgs(argc, argv);
+    MainWindow mainWindow;
+    MenuManager::instance()->init(&mainWindow);
+    mainWindow.setFocus();
+
+    if (Colors::fullscreen)
+        mainWindow.showFullScreen();
+    else {
+        mainWindow.enableMask(true);
+        mainWindow.show();
+    }
+
+    artisticSleep(500);
+    mainWindow.start();
+    return app.exec();
+}
diff --git a/demos/qtdemo/mainwindow.cpp b/demos/qtdemo/mainwindow.cpp
new file mode 100644
index 0000000000..8723823526
--- /dev/null
+++ b/demos/qtdemo/mainwindow.cpp
@@ -0,0 +1,483 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mainwindow.h"
+#include "menumanager.h"
+#include "colors.h"
+#include "dockitem.h"
+#include "demotextitem.h"
+#include "imageitem.h"
+#include "demoitem.h"
+#include "demoscene.h"
+
+#ifndef QT_NO_OPENGL
+    #include <QGLWidget>
+#endif
+//#define QT_NO_OPENGL
+
+MainWindow::MainWindow(QWidget *parent) : QGraphicsView(parent), updateTimer(this)
+{
+    this->currentFps = Colors::fps;
+    this->loop = false;
+    this->fpsMedian = -1;
+    this->fpsLabel = 0;
+    this->pausedLabel = 0;
+    this->doneAdapt = false;
+    this->useTimer = false;
+    this->updateTimer.setSingleShot(true);
+    this->trolltechLogo = 0;
+    this->qtLogo = 0;
+    this->setupWidget();
+    this->setupScene();
+    this->setupSceneItems();
+    this->drawBackgroundToPixmap();
+}
+
+MainWindow::~MainWindow()
+{
+    delete this->trolltechLogo;
+    delete this->qtLogo;
+}
+
+void MainWindow::setupWidget()
+{
+    QRect screenRect = QApplication::desktop()->screenGeometry(QApplication::desktop()->primaryScreen());
+    QRect windowRect(0, 0, 800, 600);
+    if (screenRect.width() < 800)
+        windowRect.setWidth(screenRect.width());
+    if (screenRect.height() < 600)
+        windowRect.setHeight(screenRect.height());
+    windowRect.moveCenter(screenRect.center());
+    this->setGeometry(windowRect);
+    this->setMinimumSize(80, 60);
+    setWindowTitle(tr("Qt Examples and Demos"));
+    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setFrameStyle(QFrame::NoFrame);
+    this->setRenderingSystem();
+    connect(&this->updateTimer, SIGNAL(timeout()), this, SLOT(tick()));
+}
+
+void MainWindow::setRenderingSystem()
+{
+    QWidget *viewport = 0;
+
+    if (Colors::direct3dRendering){
+        viewport->setAttribute(Qt::WA_MSWindowsUseDirect3D);
+        setCacheMode(QGraphicsView::CacheNone);
+        if (Colors::verbose)
+            qDebug() << "- using Direct3D";
+    }
+#ifndef QT_NO_OPENGL
+    else if (Colors::openGlRendering){
+        QGLWidget *glw = new QGLWidget(QGLFormat(QGL::SampleBuffers));
+        if (Colors::noScreenSync)
+            glw->format().setSwapInterval(0);
+        glw->setAutoFillBackground(false);
+        viewport = glw;
+        setCacheMode(QGraphicsView::CacheNone);
+        if (Colors::verbose)
+            qDebug() << "- using OpenGL";
+    }
+#endif
+    else{ // software rendering
+        viewport = new QWidget;
+        setCacheMode(QGraphicsView::CacheBackground);
+        if (Colors::verbose)
+            qDebug() << "- using software rendering";
+    }
+
+    setViewport(viewport);
+}
+
+void MainWindow::start()
+{
+    this->switchTimerOnOff(true);
+    this->demoStartTime.restart();
+    MenuManager::instance()->itemSelected(MenuManager::ROOT, Colors::rootMenuName);
+    if (Colors::verbose)
+        qDebug("- starting demo");
+}
+
+void MainWindow::enableMask(bool enable)
+{
+    if (!enable || Colors::noWindowMask)
+        this->clearMask();
+    else {
+        QPolygon region;
+        region.setPoints(9,
+                                // north side:
+                                0, 0,
+                                800, 0,
+                                // east side:
+                                // 800, 70,
+                                // 790, 90,
+                                // 790, 480,
+                                // 800, 500,
+                                800, 600,
+                                // south side:
+                                700, 600,
+                                670, 590,
+                                130, 590,
+                                100, 600,
+                                0, 600,
+                                // west side:
+                                // 0, 550,
+                                // 10, 530,
+                                // 10, 520,
+                                // 0, 520,
+                                0, 0);
+        this->setMask(QRegion(region));
+    }
+}
+
+void MainWindow::setupScene()
+{
+    this->scene = new DemoScene(this);
+    this->scene->setSceneRect(0, 0, 800, 600);
+    setScene(this->scene);
+    this->scene->setItemIndexMethod(QGraphicsScene::NoIndex);
+}
+
+void MainWindow::drawItems(QPainter *painter, int numItems, QGraphicsItem **items, const QStyleOptionGraphicsItem* options)
+{
+    QGraphicsView::drawItems(painter, numItems, items, options);
+}
+
+void MainWindow::switchTimerOnOff(bool on)
+{
+    bool ticker = MenuManager::instance()->ticker && MenuManager::instance()->ticker->scene();
+    if (ticker)
+        MenuManager::instance()->ticker->tickOnPaint = !on || Colors::noTimerUpdate;
+
+    if (on && !Colors::noTimerUpdate){
+        this->useTimer = true;
+        this->setViewportUpdateMode(QGraphicsView::NoViewportUpdate);
+        this->fpsTime = QTime::currentTime();
+        this->updateTimer.start(int(1000 / Colors::fps));
+    }
+    else{
+        this->useTimer = false;
+        this->updateTimer.stop();
+        if (Colors::softwareRendering)
+            if (Colors::noTicker)
+                this->setViewportUpdateMode(QGraphicsView::MinimalViewportUpdate);
+            else
+                this->setViewportUpdateMode(QGraphicsView::SmartViewportUpdate);
+        else
+            this->setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+    }
+}
+
+bool MainWindow::measureFps()
+{
+    // Calculate time diff:
+    float t = this->fpsTime.msecsTo(QTime::currentTime());
+    if (t == 0)
+        t = 0.01f;
+    this->currentFps = (1000.0f / t);
+    this->fpsHistory += this->currentFps;
+    this->fpsTime = QTime::currentTime();
+
+    // Calculate median:
+    int size = this->fpsHistory.size();
+    if (size == 10){
+        qSort(this->fpsHistory.begin(), this->fpsHistory.end());
+        this->fpsMedian = this->fpsHistory.at(int(size/2));
+        if (this->fpsMedian == 0)
+            this->fpsMedian = 0.01f;
+        this->fpsHistory.clear();
+        return true;
+    }
+    return false;
+}
+
+/**
+    Used for adaption in case things are so slow
+    that no median  yet has been calculated
+*/
+void MainWindow::forceFpsMedianCalculation()
+{
+    if (this->fpsMedian != -1)
+        return;
+
+    int size = this->fpsHistory.size();
+    if (size == 0){
+        this->fpsMedian = 0.01f;
+        return;
+    }
+
+    qSort(this->fpsHistory.begin(), this->fpsHistory.end());
+    this->fpsMedian = this->fpsHistory.at(int(size/2));
+    if (this->fpsMedian == 0)
+        this->fpsMedian = 0.01f;
+}
+
+void MainWindow::tick()
+{
+    bool medianChanged = this->measureFps();
+    this->checkAdapt();
+
+    if (medianChanged && this->fpsLabel && Colors::showFps)
+        this->fpsLabel->setText(QString("FPS: ") + QString::number(int(this->currentFps)));
+
+    if (MenuManager::instance()->ticker)
+        MenuManager::instance()->ticker->tick();
+
+    this->viewport()->update();
+    if (Colors::softwareRendering)
+        QApplication::syncX();
+
+    if (this->useTimer)
+        this->updateTimer.start(int(1000 / Colors::fps));
+}
+
+void MainWindow::setupSceneItems()
+{
+    if (Colors::showFps){
+        this->fpsLabel = new DemoTextItem(QString("FPS: --"), Colors::buttonFont(), Qt::white, -1, this->scene, 0, DemoTextItem::DYNAMIC_TEXT);
+        this->fpsLabel->setZValue(100);
+        this->fpsLabel->setPos(Colors::stageStartX, 600 - QFontMetricsF(Colors::buttonFont()).height() - 5);
+    }
+
+    this->trolltechLogo = new ImageItem(QImage(":/images/trolltech-logo.png"), 1000, 1000, this->scene, 0, true, 0.5f);
+    this->qtLogo = new ImageItem(QImage(":/images/qtlogo_small.png"), 1000, 1000, this->scene, 0, true, 0.5f);
+    this->trolltechLogo->setZValue(100);
+    this->qtLogo->setZValue(100);
+    this->pausedLabel = new DemoTextItem(QString("PAUSED"), Colors::buttonFont(), Qt::white, -1, this->scene, 0);
+    this->pausedLabel->setZValue(100);
+    QFontMetricsF fm(Colors::buttonFont());
+    this->pausedLabel->setPos(Colors::stageWidth - fm.width("PAUSED"), 590 - fm.height());
+    this->pausedLabel->setRecursiveVisible(false);
+}
+
+void MainWindow::checkAdapt()
+{
+    if (this->doneAdapt
+        || Colors::noTimerUpdate
+        || this->demoStartTime.elapsed() < 2000)
+       return;
+
+    this->doneAdapt = true;
+    this->forceFpsMedianCalculation();
+    Colors::benchmarkFps = this->fpsMedian;
+    if (Colors::verbose)
+        qDebug() << "- benchmark:" << QString::number(Colors::benchmarkFps) << "FPS";
+
+    if (Colors::noAdapt)
+        return;
+
+    if (this->fpsMedian < 30){
+        if (MenuManager::instance()->ticker && MenuManager::instance()->ticker->scene()){
+            this->scene->removeItem(MenuManager::instance()->ticker);
+            Colors::noTimerUpdate = true;
+            this->switchTimerOnOff(false);
+            if (this->fpsLabel)
+               this->fpsLabel->setText(QString("FPS: (") + QString::number(this->fpsMedian) + QString(")"));
+            if (Colors::verbose)
+               qDebug() << "- benchmark adaption: removed ticker (fps < 30)";
+        }
+
+        if (this->fpsMedian < 20){
+            Colors::noAnimations = true;
+            if (Colors::verbose)
+               qDebug() << "- benchmark adaption: animations switched off (fps < 20)";
+        }
+
+        Colors::adapted = true;
+    }
+}
+
+int MainWindow::performBenchmark()
+{
+/*
+    QTime time;
+    time.restart();
+    while (time.elapsed() < 2000)
+        QCoreApplication::processEvents(QEventLoop::AllEvents, 50);
+*/
+    return 0;
+}
+
+void MainWindow::drawBackgroundToPixmap()
+{
+    const QRectF r = this->scene->sceneRect();
+    this->background = QPixmap(qRound(r.width()), qRound(r.height()));
+    this->background.fill(Qt::black);
+    QPainter painter(&this->background);
+
+    if (false && Colors::useEightBitPalette){
+        painter.fillRect(r, Colors::sceneBg1);
+    } else {
+        QImage bg(":/images/demobg.png");
+        painter.drawImage(0, 0, bg);
+    }
+}
+
+void MainWindow::drawBackground(QPainter *painter, const QRectF &rect)
+{
+    Q_UNUSED(rect);
+    painter->drawPixmap(QPoint(0, 0), this->background);
+}
+
+void MainWindow::showEvent(QShowEvent * event)
+{
+    Q_UNUSED(event);
+    QGraphicsView::showEvent(event);
+}
+
+void MainWindow::toggleFullscreen()
+{
+    if (this->isFullScreen()){
+        this->enableMask(true);
+        this->showNormal();
+        if (MenuManager::instance()->ticker)
+            MenuManager::instance()->ticker->pause(false);
+    }
+    else {
+        this->enableMask(false);
+        this->showFullScreen();
+    }
+}
+
+void MainWindow::keyPressEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_Escape){
+        this->loop = false;
+        QApplication::quit();
+    }
+    else if (event->key() == Qt::Key_1){
+            QString s("");
+            s += "Rendering system: ";
+            if (Colors::openGlRendering)
+                s += "OpenGL";
+            else if (Colors::direct3dRendering)
+                s += "Direct3D";
+            else
+                s += "software";
+
+            s += "\nAdapt: ";
+            s += Colors::noAdapt ? "off" : "on";
+            s += "\nAdaption occured: ";
+            s += Colors::adapted ? "yes" : "no";
+            s += "\nOpenGL version: ";
+            s += Colors::glVersion;
+            QWidget w;
+            s += "\nColor bit depth: ";
+            s += QString::number(w.depth());
+            s += "\nWanted FPS: ";
+            s += QString::number(Colors::fps);
+            s += "\nBenchmarked FPS: ";
+            s += Colors::benchmarkFps != -1 ? QString::number(Colors::benchmarkFps) : "not calculated";
+            s += "\nAnimations: ";
+            s += Colors::noAnimations ? "off" : "on";
+            s += "\nBlending: ";
+            s += Colors::useEightBitPalette ? "off" : "on";
+            s += "\nTicker: ";
+            s += Colors::noTicker ? "off" : "on";
+            s += "\nPixmaps: ";
+            s += Colors::usePixmaps ? "on" : "off";
+            s += "\nRescale images on resize: ";
+            s += Colors::noRescale ? "off" : "on";
+            s += "\nTimer based updates: ";
+            s += Colors::noTimerUpdate ? "off" : "on";
+            s += "\nSeparate loop: ";
+            s += Colors::useLoop ? "yes" : "no";
+            s += "\nScreen sync: ";
+            s += Colors::noScreenSync ? "no" : "yes";
+            QMessageBox::information(0, QString("Current configuration"), s);
+    }
+}
+
+void MainWindow::focusInEvent(QFocusEvent *)
+{
+    if (!Colors::pause)
+        return;
+
+    if (MenuManager::instance()->ticker)
+        MenuManager::instance()->ticker->pause(false);
+
+    int code = MenuManager::instance()->currentMenuCode;
+    if (code == MenuManager::ROOT || code == MenuManager::MENU1)
+        this->switchTimerOnOff(true);
+
+    this->pausedLabel->setRecursiveVisible(false);
+}
+
+void MainWindow::focusOutEvent(QFocusEvent *)
+{
+    if (!Colors::pause)
+        return;
+
+    if (MenuManager::instance()->ticker)
+        MenuManager::instance()->ticker->pause(true);
+
+    int code = MenuManager::instance()->currentMenuCode;
+    if (code == MenuManager::ROOT || code == MenuManager::MENU1)
+        this->switchTimerOnOff(false);
+
+    this->pausedLabel->setRecursiveVisible(true);
+}
+
+void MainWindow::resizeEvent(QResizeEvent *event)
+{
+    Q_UNUSED(event);
+
+    this->resetMatrix();
+    this->scale(event->size().width() / 800.0, event->size().height() / 600.0);
+    QGraphicsView::resizeEvent(event);
+    DemoItem::setMatrix(this->matrix());
+
+    if (this->trolltechLogo){
+        const QRectF r = this->scene->sceneRect();
+        QRectF ttb = this->trolltechLogo->boundingRect();
+        this->trolltechLogo->setPos(int((r.width() - ttb.width()) / 2), 595 - ttb.height());
+        QRectF qtb = this->qtLogo->boundingRect();
+        this->qtLogo->setPos(802 - qtb.width(), 0);
+    }
+
+    // Changing size will almost always
+    // hurt FPS during the changing. So
+    // ignore it.
+    this->fpsHistory.clear();
+}
+
+
diff --git a/demos/qtdemo/mainwindow.h b/demos/qtdemo/mainwindow.h
new file mode 100644
index 0000000000..388a392543
--- /dev/null
+++ b/demos/qtdemo/mainwindow.h
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAIN_WINDOW_H
+#define MAIN_WINDOW_H
+
+#include <QtGui>
+#include <QPixmap>
+
+class DemoTextItem;
+class ImageItem;
+
+class MainWindow : public QGraphicsView
+{
+    Q_OBJECT
+
+public:
+    MainWindow(QWidget *parent = 0);
+    ~MainWindow();
+    void enableMask(bool enable);
+    void toggleFullscreen();
+    int performBenchmark();
+    void switchTimerOnOff(bool on);
+    void start();
+
+    QGraphicsScene *scene;
+    bool loop;
+
+    // FPS stuff:
+    QList<QTime> frameTimeList;
+    QList<float> fpsHistory;
+    float currentFps;
+    float fpsMedian;
+    DemoTextItem *fpsLabel;
+
+protected:
+    // Overidden methods:
+    void showEvent(QShowEvent *event);
+    void keyPressEvent(QKeyEvent *event);
+    void resizeEvent(QResizeEvent *event);
+    void drawBackground(QPainter *painter, const QRectF &rect);
+    void drawItems(QPainter *painter, int numItems, QGraphicsItem ** items, const QStyleOptionGraphicsItem* options);
+    void focusInEvent(QFocusEvent *event);
+    void focusOutEvent(QFocusEvent *event);
+
+private slots:
+    void tick();
+
+private:
+    void setupWidget();
+    void setupSceneItems();
+    void drawBackgroundToPixmap();
+    void setupScene();
+    bool measureFps();
+    void forceFpsMedianCalculation();
+    void checkAdapt();
+    void setRenderingSystem();
+
+    QTimer updateTimer;
+    QTime demoStartTime;
+    QTime fpsTime;
+    QPixmap background;
+    ImageItem *trolltechLogo;
+    ImageItem *qtLogo;
+    bool doneAdapt;
+    bool useTimer;
+    DemoTextItem *pausedLabel;
+};
+
+#endif // MAIN_WINDOW_H
+
diff --git a/demos/qtdemo/menucontent.cpp b/demos/qtdemo/menucontent.cpp
new file mode 100644
index 0000000000..a74cfe4214
--- /dev/null
+++ b/demos/qtdemo/menucontent.cpp
@@ -0,0 +1,140 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "menucontent.h"
+#include "colors.h"
+#include "menumanager.h"
+#include "demotextitem.h"
+#include "headingitem.h"
+
+MenuContentItem::MenuContentItem(const QDomElement &el, QGraphicsScene *scene, QGraphicsItem *parent)
+    : DemoItem(scene, parent)
+{
+    this->name = el.attribute("name");
+    this->heading = 0;
+    this->description1 = 0;
+    this->description2 = 0;
+
+    if (el.tagName() == "demos")
+        this->readmePath = QLibraryInfo::location(QLibraryInfo::DemosPath) + "/README";
+    else
+        this->readmePath = QLibraryInfo::location(QLibraryInfo::ExamplesPath) + "/" + el.attribute("dirname") + "/README";
+
+}
+
+void MenuContentItem::prepare()
+{
+    if (!this->prepared){
+        this->prepared= true;
+        this->createContent();
+    }
+}
+
+void MenuContentItem::animationStopped(int id)
+{
+    if (this->name == Colors::rootMenuName)
+        return; // Optimization hack.
+
+    if (id == DemoItemAnimation::ANIM_OUT){
+        // Free up some memory:
+        delete this->heading;
+        delete this->description1;
+        delete this->description2;
+        this->heading = 0;
+        this->description1 = 0;
+        this->description2 = 0;
+        this->prepared = false;
+    }
+}
+
+QString MenuContentItem::loadDescription(int startPara, int nrPara)
+{
+    QString result;
+    QFile readme(this->readmePath);
+    if (!readme.open(QFile::ReadOnly)){
+        if (Colors::verbose)
+            qDebug() << "- MenuContentItem::loadDescription: Could not load:" << this->readmePath;
+        return "";
+    }
+
+    QTextStream in(&readme);
+    // Skip a certain number of paragraphs:
+    while (startPara)
+        if (in.readLine().isEmpty()) --startPara;
+
+    // Read in the number of wanted paragraphs:
+    QString line = in.readLine();
+    do {
+        result += line + " ";
+        line = in.readLine();
+        if (line.isEmpty()){
+            --nrPara;
+            line = "<br><br>" + in.readLine();
+        }
+    } while (nrPara && !in.atEnd());
+
+    return Colors::contentColor + result;
+}
+
+void MenuContentItem::createContent()
+{
+    // Create the items:
+    this->heading = new HeadingItem(this->name, this->scene(), this);
+    QString para1 = this->loadDescription(0, 1);
+    if (para1.isEmpty())
+        para1 = Colors::contentColor + QLatin1String("Could not load description. Ensure that the documentation for Qt is built.");
+    QColor bgcolor = Colors::sceneBg1.darker(200);
+    bgcolor.setAlpha(100);
+    this->description1 = new DemoTextItem(para1, Colors::contentFont(), Colors::heading, 500, this->scene(), this, DemoTextItem::STATIC_TEXT);
+    this->description2 = new DemoTextItem(this->loadDescription(1, 2), Colors::contentFont(), Colors::heading, 250, this->scene(), this, DemoTextItem::STATIC_TEXT);
+
+    // Place the items on screen:
+    this->heading->setPos(0, 3);
+    this->description1->setPos(0, this->heading->pos().y() + this->heading->boundingRect().height() + 10);
+    this->description2->setPos(0, this->description1->pos().y() + this->description1->boundingRect().height() + 15);
+}
+
+QRectF MenuContentItem::boundingRect() const
+{
+    return QRectF(0, 0, 500, 350);
+}
+
+
diff --git a/demos/qtdemo/menucontent.h b/demos/qtdemo/menucontent.h
new file mode 100644
index 0000000000..737492d3ea
--- /dev/null
+++ b/demos/qtdemo/menucontent.h
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MENU_CONTENT_ITEM_H
+#define MENU_CONTENT_ITEM_H
+
+#include <QtGui>
+#include <QtXml>
+#include "demoitem.h"
+
+class HeadingItem;
+class DemoTextItem;
+
+class MenuContentItem : public DemoItem
+{
+
+public:
+    MenuContentItem(const QDomElement &el, QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
+
+    virtual QRectF boundingRect() const; // overridden
+    virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0){}; // overridden
+    void animationStopped(int id);
+    void prepare();
+
+private:
+    QString name;
+    QString readmePath;
+    HeadingItem *heading;
+    DemoTextItem *description1;
+    DemoTextItem *description2;
+
+    QString loadDescription(int startPara, int nrPara);
+    QString extractTextFromParagraph(const QDomNode &parentNode);
+
+    void createContent();
+};
+
+#endif // MENU_CONTENT_ITEM_H
+
diff --git a/demos/qtdemo/menumanager.cpp b/demos/qtdemo/menumanager.cpp
new file mode 100644
index 0000000000..bfa2e3faae
--- /dev/null
+++ b/demos/qtdemo/menumanager.cpp
@@ -0,0 +1,876 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "menumanager.h"
+#include "colors.h"
+#include "menucontent.h"
+#include "examplecontent.h"
+
+MenuManager *MenuManager::pInstance = 0;
+
+MenuManager * MenuManager::instance()
+{
+    if (!MenuManager::pInstance)
+        MenuManager::pInstance = new MenuManager();
+    return MenuManager::pInstance;
+}
+
+MenuManager::MenuManager()
+{
+    this->ticker = 0;
+    this->tickerInAnim = 0;
+    this->upButton = 0;
+    this->downButton = 0;
+    this->helpEngine = 0;
+    this->score = new Score();
+    this->currentMenu = QLatin1String("[no menu visible]");
+    this->currentCategory = QLatin1String("[no category visible]");
+    this->currentMenuButtons = QLatin1String("[no menu buttons visible]");
+    this->currentInfo = QLatin1String("[no info visible]");
+    this->currentMenuCode = -1;
+    this->readXmlDocument();
+    this->initHelpEngine();
+}
+
+MenuManager::~MenuManager()
+{
+    delete this->score;
+    delete this->contentsDoc;
+    delete this->helpEngine;
+}
+
+QByteArray MenuManager::getResource(const QString &name)
+{
+    QByteArray ba = this->helpEngine->fileData(name);
+    if (Colors::verbose && ba.isEmpty())
+        qDebug() << " - WARNING: Could not get " << name;
+    return ba;
+}
+
+void MenuManager::readXmlDocument()
+{
+    this->contentsDoc = new QDomDocument();
+    QString errorStr;
+    int errorLine;
+    int errorColumn;
+
+    QFile file(":/xml/examples.xml");
+    bool statusOK = this->contentsDoc->setContent(&file, true, &errorStr, &errorLine, &errorColumn);
+    if (!statusOK){
+        QMessageBox::critical(0,
+                              QObject::tr("DOM Parser"),
+                              QObject::tr("Could not read or find the contents document. Error at line %1, column %2:\n%3")
+                              .arg(errorLine).arg(errorColumn).arg(errorStr)
+                              );
+        exit(-1);
+    }
+}
+
+void MenuManager::initHelpEngine()
+{
+    this->helpRootUrl = QString("qthelp://com.trolltech.qt.%1%2%3/qdoc/")
+        .arg(QT_VERSION >> 16).arg((QT_VERSION >> 8) & 0xFF)
+        .arg(QT_VERSION & 0xFF);
+
+    // Store help collection file in cache dir of assistant
+    QString cacheDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation)
+                     + QLatin1String("/Trolltech/Assistant/");
+    QString helpDataFile = QString(QLatin1String("qtdemo_%1.qhc")).arg(QLatin1String(QT_VERSION_STR));
+
+    QDir dir;
+    if (!dir.exists(cacheDir))
+        dir.mkpath(cacheDir);
+
+    // Create help engine (and new
+    // helpDataFile if it does not exist):
+    this->helpEngine = new QHelpEngineCore(cacheDir + helpDataFile);
+    this->helpEngine->setupData();
+
+    QString qtDocRoot = QLibraryInfo::location(QLibraryInfo::DocumentationPath) + QLatin1String("/qch");
+    qtDocRoot = QDir(qtDocRoot).absolutePath();
+
+    QStringList qchFiles;
+    qchFiles << QLatin1String("/qt.qch")
+             << QLatin1String("/designer.qch")
+             << QLatin1String("/linguist.qch");
+
+    QString oldDir = helpEngine->customValue(QLatin1String("docDir"), QString()).toString();
+    if (oldDir != qtDocRoot) {
+        foreach (const QString &qchFile, qchFiles)
+            helpEngine->unregisterDocumentation(QHelpEngineCore::namespaceName(qtDocRoot + qchFile));
+    }
+
+    // If the data that the engine will work
+    // on is not yet registered, do it now:
+    foreach (const QString &qchFile, qchFiles)
+        helpEngine->registerDocumentation(qtDocRoot + qchFile);
+
+    helpEngine->setCustomValue(QLatin1String("docDir"), qtDocRoot);
+}
+
+void MenuManager::itemSelected(int userCode, const QString &menuName)
+{
+    switch (userCode){
+    case LAUNCH:
+        this->launchExample(this->currentInfo);
+        break;
+    case DOCUMENTATION:
+        this->showDocInAssistant(this->currentInfo);
+        break;
+    case QUIT:
+        this->window->loop = false;
+        QCoreApplication::quit();
+        break;
+    case FULLSCREEN:
+        this->window->toggleFullscreen();
+        break;
+    case ROOT:
+        // out:
+        this->score->queueMovie(this->currentMenu + " -out", Score::FROM_START, Score::LOCK_ITEMS);
+        this->score->queueMovie(this->currentMenuButtons + " -out", Score::FROM_START, Score::LOCK_ITEMS);
+        this->score->queueMovie(this->currentInfo + " -out");
+        this->score->queueMovie(this->currentInfo + " -buttons -out", Score::NEW_ANIMATION_ONLY);
+        this->score->queueMovie("back -out", Score::ONLY_IF_VISIBLE);
+        // book-keeping:
+        this->currentMenuCode = ROOT;
+        this->currentMenu = menuName + " -menu1";
+        this->currentMenuButtons = menuName + " -buttons";
+        this->currentInfo = menuName + " -info";
+        // in:
+        this->score->queueMovie("upndown -shake");
+        this->score->queueMovie(this->currentMenu, Score::FROM_START, Score::UNLOCK_ITEMS);
+        this->score->queueMovie(this->currentMenuButtons, Score::FROM_START, Score::UNLOCK_ITEMS);
+        this->score->queueMovie(this->currentInfo);
+        if (!Colors::noTicker){
+            this->ticker->doIntroTransitions = true;
+            this->tickerInAnim->startDelay = 2000;
+            this->ticker->useGuideQt();
+            this->score->queueMovie("ticker", Score::NEW_ANIMATION_ONLY);
+            this->window->switchTimerOnOff(true);
+        }
+        break;
+    case MENU1:
+        // out:
+        this->score->queueMovie(this->currentMenu + " -out", Score::FROM_START, Score::LOCK_ITEMS);
+        this->score->queueMovie(this->currentMenuButtons + " -out", Score::FROM_START, Score::LOCK_ITEMS);
+        this->score->queueMovie(this->currentInfo + " -out");
+        // book-keeping:
+        this->currentMenuCode = MENU1;
+        this->currentCategory = menuName;
+        this->currentMenu = menuName + " -menu1";
+        this->currentInfo = menuName + " -info";
+        // in:
+        this->score->queueMovie("upndown -shake");
+        this->score->queueMovie("back -in");
+        this->score->queueMovie(this->currentMenu, Score::FROM_START, Score::UNLOCK_ITEMS);
+        this->score->queueMovie(this->currentInfo);
+        if (!Colors::noTicker)
+            this->ticker->useGuideTt();
+        break;
+    case MENU2:
+        // out:
+        this->score->queueMovie(this->currentInfo + " -out", Score::NEW_ANIMATION_ONLY);
+        this->score->queueMovie(this->currentInfo + " -buttons -out", Score::NEW_ANIMATION_ONLY);
+        // book-keeping:
+        this->currentMenuCode = MENU2;
+        this->currentInfo = menuName;
+        // in / shake:
+        this->score->queueMovie("upndown -shake");
+        this->score->queueMovie("back -shake");
+        this->score->queueMovie(this->currentMenu + " -shake");
+        this->score->queueMovie(this->currentInfo, Score::NEW_ANIMATION_ONLY);
+        this->score->queueMovie(this->currentInfo + " -buttons", Score::NEW_ANIMATION_ONLY);
+        if (!Colors::noTicker){
+            this->score->queueMovie("ticker -out", Score::NEW_ANIMATION_ONLY);
+            this->window->switchTimerOnOff(false);
+        }
+        break;
+    case UP:{
+        QString backMenu = this->info[this->currentMenu]["back"];
+        if (!backMenu.isNull()){
+            this->score->queueMovie(this->currentMenu + " -top_out", Score::FROM_START, Score::LOCK_ITEMS);
+            this->score->queueMovie(backMenu + " -bottom_in", Score::FROM_START, Score::UNLOCK_ITEMS);
+            this->currentMenu = backMenu;
+        }
+        break; }
+    case DOWN:{
+        QString moreMenu = this->info[this->currentMenu]["more"];
+        if (!moreMenu.isNull()){
+            this->score->queueMovie(this->currentMenu + " -bottom_out", Score::FROM_START, Score::LOCK_ITEMS);
+            this->score->queueMovie(moreMenu + " -top_in", Score::FROM_START, Score::UNLOCK_ITEMS);
+            this->currentMenu = moreMenu;
+        }
+        break; }
+    case BACK:{
+        if (this->currentMenuCode == MENU2){
+            // out:
+            this->score->queueMovie(this->currentInfo + " -out", Score::NEW_ANIMATION_ONLY);
+            this->score->queueMovie(this->currentInfo + " -buttons -out", Score::NEW_ANIMATION_ONLY);
+            // book-keeping:
+            this->currentMenuCode = MENU1;
+            this->currentMenuButtons = this->currentCategory + " -buttons";
+            this->currentInfo = this->currentCategory + " -info";
+            // in / shake:
+            this->score->queueMovie("upndown -shake");
+            this->score->queueMovie(this->currentMenu + " -shake");
+            this->score->queueMovie(this->currentInfo, Score::NEW_ANIMATION_ONLY);
+            this->score->queueMovie(this->currentInfo + " -buttons", Score::NEW_ANIMATION_ONLY);
+            if (!Colors::noTicker){
+                this->ticker->doIntroTransitions = false;
+                this->tickerInAnim->startDelay = 500;
+                this->score->queueMovie("ticker", Score::NEW_ANIMATION_ONLY);
+                this->window->switchTimerOnOff(true);
+            }
+        } else if (this->currentMenuCode != ROOT)
+            itemSelected(ROOT, Colors::rootMenuName);
+        break; }
+    }
+
+    // update back- and more buttons
+    bool noBackMenu = this->info[this->currentMenu]["back"].isNull();
+    bool noMoreMenu = this->info[this->currentMenu]["more"].isNull();
+    this->upButton->setState(noBackMenu ? TextButton::DISABLED : TextButton::OFF);
+    this->downButton->setState(noMoreMenu ? TextButton::DISABLED : TextButton::OFF);
+
+    if (this->score->hasQueuedMovies()){
+        this->score->playQue();
+        // Playing new movies might include
+        // loading etc. So ignore the FPS
+        // at this point
+        this->window->fpsHistory.clear();
+    }
+}
+
+void MenuManager::showDocInAssistant(const QString &name)
+{
+    QString url = this->resolveDocUrl(name);
+    if (Colors::verbose)
+        qDebug() << "Sending URL to Assistant:" << url;
+
+    // Start assistant if it's not already running:
+    if (this->assistantProcess.state() != QProcess::Running){
+        QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
+#if !defined(Q_OS_MAC)
+        app += QLatin1String("assistant");
+#else
+        app += QLatin1String("Assistant.app/Contents/MacOS/Assistant");
+#endif
+        QStringList args;
+        args << QLatin1String("-enableRemoteControl");
+        this->assistantProcess.start(app, args);
+        if (!this->assistantProcess.waitForStarted()) {
+            QMessageBox::critical(0, tr("Qt Demo"), tr("Could not start Qt Assistant.").arg(app));
+            return;
+        }
+    }
+
+    // Send command through remote control even if the process
+    // was started to activate assistant and bring it to front:
+    QTextStream str(&this->assistantProcess);
+    str << "SetSource " << url << QLatin1Char('\0') << endl;
+}
+
+void MenuManager::launchExample(const QString &name)
+{
+    QString executable = this->resolveExeFile(name);
+#ifdef Q_OS_MAC
+    if (Colors::verbose)
+        qDebug() << "Launching:" << executable;
+    bool success = QDesktopServices::openUrl(QUrl::fromLocalFile(executable));
+    if (!success){
+        QMessageBox::critical(0, tr("Failed to launch the example"),
+                          tr("Could not launch the example. Ensure that it has been built."),
+                          QMessageBox::Cancel);
+    }
+#else // Not mac. To not break anything regarding dll's etc, keep it the way it was before:
+    QProcess *process = new QProcess(this);
+    connect(process, SIGNAL(finished(int)), this, SLOT(exampleFinished()));
+    connect(process, SIGNAL(error(QProcess::ProcessError)), this, SLOT(exampleError(QProcess::ProcessError)));
+
+#ifdef Q_OS_WIN
+    //make sure it finds the dlls on windows
+    QString curpath = QString::fromLocal8Bit(qgetenv("PATH").constData());
+    QString newpath = QString("PATH=%1;%2").arg(QLibraryInfo::location(QLibraryInfo::BinariesPath), curpath);
+    process->setEnvironment(QStringList(newpath));
+#endif
+
+    if (info[name]["changedirectory"] != "false"){
+        QString workingDirectory = resolveDataDir(name);
+        process->setWorkingDirectory(workingDirectory);
+        if (Colors::verbose)
+            qDebug() << "Setting working directory:" << workingDirectory;
+    }
+
+    if (Colors::verbose)
+        qDebug() << "Launching:" << executable;
+    process->start(executable);
+#endif
+}
+
+void MenuManager::exampleFinished()
+{
+}
+
+void MenuManager::exampleError(QProcess::ProcessError error)
+{
+    if (error != QProcess::Crashed)
+        QMessageBox::critical(0, tr("Failed to launch the example"),
+                          tr("Could not launch the example. Ensure that it has been built."),
+                          QMessageBox::Cancel);
+}
+
+void MenuManager::init(MainWindow *window)
+{
+    this->window = window;
+
+    // Create div:
+    this->createTicker();
+    this->createUpnDownButtons();
+    this->createBackButton();
+
+    // Create first level menu:
+    QDomElement rootElement = this->contentsDoc->documentElement();
+    this->createRootMenu(rootElement);
+
+    // Create second level menus:
+    QDomNode level2MenuNode = rootElement.firstChild();
+    while (!level2MenuNode.isNull()){
+        QDomElement level2MenuElement = level2MenuNode.toElement();
+        this->createSubMenu(level2MenuElement);
+
+        // create leaf menu and example info:
+        QDomNode exampleNode = level2MenuElement.firstChild();
+        while (!exampleNode.isNull()){
+            QDomElement exampleElement = exampleNode.toElement();
+            this->readInfoAboutExample(exampleElement);
+            this->createLeafMenu(exampleElement);
+            exampleNode = exampleNode.nextSibling();
+        }
+
+        level2MenuNode = level2MenuNode.nextSibling();
+    }
+}
+
+void MenuManager::readInfoAboutExample(const QDomElement &example)
+{
+    QString name = example.attribute("name");
+    if (this->info.contains(name))
+        qWarning() << "__WARNING: MenuManager::readInfoAboutExample: Demo/example with name"
+                    << name << "appears twize in the xml-file!__";
+
+    this->info[name]["filename"] = example.attribute("filename");
+    this->info[name]["category"] = example.parentNode().toElement().tagName();
+    this->info[name]["dirname"] = example.parentNode().toElement().attribute("dirname");
+    this->info[name]["changedirectory"] = example.attribute("changedirectory");
+    this->info[name]["image"] = example.attribute("image");
+}
+
+QString MenuManager::resolveDataDir(const QString &name)
+{
+    QString dirName = this->info[name]["dirname"];
+    QString category = this->info[name]["category"];
+    QString fileName = this->info[name]["filename"];
+
+    QDir dir;
+    if (category == "demos")
+        dir = QDir(QLibraryInfo::location(QLibraryInfo::DemosPath));
+    else
+        dir = QDir(QLibraryInfo::location(QLibraryInfo::ExamplesPath));
+
+    dir.cd(dirName);
+    dir.cd(fileName);
+    return dir.absolutePath();
+}
+
+QString MenuManager::resolveExeFile(const QString &name)
+{
+    QString dirName = this->info[name]["dirname"];
+    QString category = this->info[name]["category"];
+    QString fileName = this->info[name]["filename"];
+
+    QDir dir;
+    if (category == "demos")
+        dir = QDir(QLibraryInfo::location(QLibraryInfo::DemosPath));
+    else
+        dir = QDir(QLibraryInfo::location(QLibraryInfo::ExamplesPath));
+
+    dir.cd(dirName);
+    dir.cd(fileName);
+
+    QFile unixFile(dir.path() + "/" + fileName);
+    if (unixFile.exists()) return unixFile.fileName();
+    QFile winR(dir.path() + "\\release\\" + fileName + ".exe");
+    if (winR.exists()) return winR.fileName();
+    QFile winD(dir.path() + "\\debug\\" + fileName + ".exe");
+    if (winD.exists()) return winD.fileName();
+    QFile mac(dir.path() + "/" + fileName + ".app");
+    if (mac.exists()) return mac.fileName();
+
+    if (Colors::verbose)
+        qDebug() << "- WARNING: Could not resolve executable:" << dir.path() << fileName;
+    return "__executable not found__";
+}
+
+QString MenuManager::resolveDocUrl(const QString &name)
+{
+    QString dirName = this->info[name]["dirname"];
+    QString category = this->info[name]["category"];
+    QString fileName = this->info[name]["filename"];
+
+    if (category == "demos")
+        return this->helpRootUrl + "demos-" + fileName + ".html";
+    else
+        return this->helpRootUrl + dirName.replace("/", "-") + "-" + fileName + ".html";
+}
+
+QString MenuManager::resolveImageUrl(const QString &name)
+{
+    return this->helpRootUrl + "images/" + name;
+}
+
+QByteArray MenuManager::getHtml(const QString &name)
+{
+    return getResource(this->resolveDocUrl(name));
+}
+
+QByteArray MenuManager::getImage(const QString &name)
+{
+    QString imageName = this->info[name]["image"];
+    QString category = this->info[name]["category"];
+    QString fileName = this->info[name]["filename"];
+
+    if (imageName.isEmpty()){
+        if (category == "demos")
+            imageName = fileName + "-demo.png";
+        else
+            imageName = fileName + "-example.png";
+        if ((getResource(resolveImageUrl(imageName))).isEmpty())
+            imageName = fileName + ".png";
+        if ((getResource(resolveImageUrl(imageName))).isEmpty())
+            imageName = fileName + "example.png";
+    }
+    return getResource(resolveImageUrl(imageName));
+}
+
+
+void MenuManager::createRootMenu(const QDomElement &el)
+{
+    QString name = el.attribute("name");
+    createMenu(el, MENU1);
+    createInfo(new MenuContentItem(el, this->window->scene, 0), name + " -info");
+
+    Movie *menuButtonsIn = this->score->insertMovie(name + " -buttons");
+    Movie *menuButtonsOut = this->score->insertMovie(name + " -buttons -out");
+    createLowLeftButton(QLatin1String("Quit"), QUIT, menuButtonsIn, menuButtonsOut, 0);
+    createLowRightButton("Toggle fullscreen", FULLSCREEN, menuButtonsIn, menuButtonsOut, 0);
+}
+
+void MenuManager::createSubMenu(const QDomElement &el)
+{
+    QString name = el.attribute("name");
+    createMenu(el, MENU2);
+    createInfo(new MenuContentItem(el, this->window->scene, 0), name + " -info");
+}
+
+void MenuManager::createLeafMenu(const QDomElement &el)
+{
+    QString name = el.attribute("name");
+    createInfo(new ExampleContent(name, this->window->scene, 0), name);
+
+    Movie *infoButtonsIn = this->score->insertMovie(name + " -buttons");
+    Movie *infoButtonsOut = this->score->insertMovie(name + " -buttons -out");
+    createLowRightLeafButton("Documentation", 600, DOCUMENTATION, infoButtonsIn, infoButtonsOut, 0);
+    if (el.attribute("executable") != "false")
+        createLowRightLeafButton("Launch", 405, LAUNCH, infoButtonsIn, infoButtonsOut, 0);
+}
+
+void MenuManager::createMenu(const QDomElement &category, BUTTON_TYPE type)
+{
+    qreal sw = this->window->scene->sceneRect().width();
+    int xOffset = 15;
+    int yOffset = 10;
+    int maxExamples = Colors::menuCount;
+    int menuIndex = 1;
+    QString name = category.attribute("name");
+    QDomNode currentNode = category.firstChild();
+    QString currentMenu = name + QLatin1String(" -menu") + QString::number(menuIndex);
+
+    while (!currentNode.isNull()){
+        Movie *movieIn = this->score->insertMovie(currentMenu);
+        Movie *movieOut = this->score->insertMovie(currentMenu + " -out");
+        Movie *movieNextTopOut = this->score->insertMovie(currentMenu + " -top_out");
+        Movie *movieNextBottomOut = this->score->insertMovie(currentMenu + " -bottom_out");
+        Movie *movieNextTopIn = this->score->insertMovie(currentMenu + " -top_in");
+        Movie *movieNextBottomIn = this->score->insertMovie(currentMenu + " -bottom_in");
+        Movie *movieShake = this->score->insertMovie(currentMenu + " -shake");
+
+        int i = 0;
+        while (!currentNode.isNull() && i < maxExamples){
+            TextButton *item;
+
+            // create normal menu button
+            QString label = currentNode.toElement().attribute("name");
+            item = new TextButton(label, TextButton::LEFT, type, this->window->scene, 0);
+            currentNode = currentNode.nextSibling();
+
+#ifndef QT_OPENGL_SUPPORT
+            if (currentNode.toElement().attribute("dirname") == "opengl")
+                currentNode = currentNode.nextSibling();
+#endif
+
+            item->setRecursiveVisible(false);
+            item->setZValue(10);
+            qreal ih = item->sceneBoundingRect().height();
+            qreal iw = item->sceneBoundingRect().width();
+            qreal ihp = ih + 3;
+
+            // create in-animation:
+            DemoItemAnimation *anim = new DemoItemAnimation(item, DemoItemAnimation::ANIM_IN);
+            anim->setDuration(float(1000 + (i * 20)) * Colors::animSpeedButtons);
+            anim->setStartPos(QPointF(xOffset, -ih));
+            anim->setPosAt(0.20, QPointF(xOffset, -ih));
+            anim->setPosAt(0.50, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY + (10 * float(i / 4.0f))));
+            anim->setPosAt(0.60, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY));
+            anim->setPosAt(0.70, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY + (5 * float(i / 4.0f))));
+            anim->setPosAt(0.80, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY));
+            anim->setPosAt(0.90, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY + (2 * float(i / 4.0f))));
+            anim->setPosAt(1.00, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY));
+            movieIn->append(anim);
+
+            // create out-animation:
+            anim = new DemoItemAnimation(item, DemoItemAnimation::ANIM_OUT);
+            anim->hideOnFinished = true;
+            anim->setDuration((700 + (30 * i)) * Colors::animSpeedButtons);
+            anim->setStartPos(QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY));
+            anim->setPosAt(0.60, QPointF(xOffset, 600 - ih - ih));
+            anim->setPosAt(0.65, QPointF(xOffset + 20, 600 - ih));
+            anim->setPosAt(1.00, QPointF(sw + iw, 600 - ih));
+            movieOut->append(anim);
+
+            // create shake-animation:
+            anim = new DemoItemAnimation(item);
+            anim->setDuration(700 * Colors::animSpeedButtons);
+            anim->setStartPos(QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY));
+            anim->setPosAt(0.55, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY - i*2.0));
+            anim->setPosAt(0.70, QPointF(xOffset - 10, (i * ihp) + yOffset + Colors::contentStartY - i*1.5));
+            anim->setPosAt(0.80, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY - i*1.0));
+            anim->setPosAt(0.90, QPointF(xOffset - 2, (i * ihp) + yOffset + Colors::contentStartY - i*0.5));
+            anim->setPosAt(1.00, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY));
+            movieShake->append(anim);
+
+            // create next-menu top-out-animation:
+            anim = new DemoItemAnimation(item, DemoItemAnimation::ANIM_OUT);
+            anim->hideOnFinished = true;
+            anim->setDuration((200 + (30 * i)) * Colors::animSpeedButtons);
+            anim->setStartPos(QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY));
+            anim->setPosAt(0.70, QPointF(xOffset, yOffset + Colors::contentStartY));
+            anim->setPosAt(1.00, QPointF(-iw, yOffset + Colors::contentStartY));
+            movieNextTopOut->append(anim);
+
+            // create next-menu bottom-out-animation:
+            anim = new DemoItemAnimation(item, DemoItemAnimation::ANIM_OUT);
+            anim->hideOnFinished = true;
+            anim->setDuration((200 + (30 * i)) * Colors::animSpeedButtons);
+            anim->setStartPos(QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY));
+            anim->setPosAt(0.70, QPointF(xOffset, (maxExamples * ihp) + yOffset + Colors::contentStartY));
+            anim->setPosAt(1.00, QPointF(-iw, (maxExamples * ihp) + yOffset + Colors::contentStartY));
+            movieNextBottomOut->append(anim);
+
+            // create next-menu top-in-animation:
+            anim = new DemoItemAnimation(item, DemoItemAnimation::ANIM_IN);
+            anim->setDuration((700 - (30 * i)) * Colors::animSpeedButtons);
+            anim->setStartPos(QPointF(-iw, yOffset + Colors::contentStartY));
+            anim->setPosAt(0.30, QPointF(xOffset, yOffset + Colors::contentStartY));
+            anim->setPosAt(1.00, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY));
+            movieNextTopIn->append(anim);
+
+            // create next-menu bottom-in-animation:
+            int reverse = maxExamples - i;
+            anim = new DemoItemAnimation(item, DemoItemAnimation::ANIM_IN);
+            anim->setDuration((1000 - (30 * reverse)) * Colors::animSpeedButtons);
+            anim->setStartPos(QPointF(-iw, (maxExamples * ihp) + yOffset + Colors::contentStartY));
+            anim->setPosAt(0.30, QPointF(xOffset, (maxExamples * ihp) + yOffset + Colors::contentStartY));
+            anim->setPosAt(1.00, QPointF(xOffset, (i * ihp) + yOffset + Colors::contentStartY));
+            movieNextBottomIn->append(anim);
+
+            i++;
+        }
+
+        if (!currentNode.isNull() && i == maxExamples){
+            // We need another menu, so register for 'more' and 'back' buttons
+            ++menuIndex;
+            this->info[currentMenu]["more"] = name + QLatin1String(" -menu") + QString::number(menuIndex);
+            currentMenu = name + QLatin1String(" -menu") + QString::number(menuIndex);
+            this->info[currentMenu]["back"] = name + QLatin1String(" -menu") + QString::number(menuIndex - 1);
+        }
+    }
+}
+
+
+void MenuManager::createLowLeftButton(const QString &label, BUTTON_TYPE type,
+    Movie *movieIn, Movie *movieOut, Movie *movieShake, const QString &menuString)
+{
+    TextButton *button = new TextButton(label, TextButton::RIGHT, type, this->window->scene, 0, TextButton::PANEL);
+    if (!menuString.isNull())
+        button->setMenuString(menuString);
+    button->setRecursiveVisible(false);
+    button->setZValue(10);
+
+    qreal iw = button->sceneBoundingRect().width();
+    int xOffset = 15;
+
+    // create in-animation:
+    DemoItemAnimation *buttonIn = new DemoItemAnimation(button, DemoItemAnimation::ANIM_IN);
+    buttonIn->setDuration(1800 * Colors::animSpeedButtons);
+    buttonIn->setStartPos(QPointF(-iw, Colors::contentStartY + Colors::contentHeight - 35));
+    buttonIn->setPosAt(0.5, QPointF(-iw, Colors::contentStartY + Colors::contentHeight - 35));
+    buttonIn->setPosAt(0.7, QPointF(xOffset, Colors::contentStartY + Colors::contentHeight - 35));
+    buttonIn->setPosAt(1.0, QPointF(xOffset, Colors::contentStartY + Colors::contentHeight - 26));
+    movieIn->append(buttonIn);
+
+    // create out-animation:
+    DemoItemAnimation *buttonOut = new DemoItemAnimation(button, DemoItemAnimation::ANIM_OUT);
+    buttonOut->hideOnFinished = true;
+    buttonOut->setDuration(400 * Colors::animSpeedButtons);
+    buttonOut->setStartPos(QPointF(xOffset, Colors::contentStartY + Colors::contentHeight - 26));
+    buttonOut->setPosAt(1.0, QPointF(-iw, Colors::contentStartY + Colors::contentHeight - 26));
+    movieOut->append(buttonOut);
+
+    if (movieShake){
+        DemoItemAnimation *shakeAnim = new DemoItemAnimation(button, DemoItemAnimation::ANIM_UNSPECIFIED);
+        shakeAnim->timeline->setCurveShape(QTimeLine::LinearCurve);
+        shakeAnim->setDuration(650);
+        shakeAnim->setStartPos(buttonIn->posAt(1.0f));
+        shakeAnim->setPosAt(0.60, buttonIn->posAt(1.0f));
+        shakeAnim->setPosAt(0.70, buttonIn->posAt(1.0f) + QPointF(-3, 0));
+        shakeAnim->setPosAt(0.80, buttonIn->posAt(1.0f) + QPointF(2, 0));
+        shakeAnim->setPosAt(0.90, buttonIn->posAt(1.0f) + QPointF(-1, 0));
+        shakeAnim->setPosAt(1.00, buttonIn->posAt(1.0f));
+        movieShake->append(shakeAnim);
+    }
+}
+
+void MenuManager::createLowRightButton(const QString &label, BUTTON_TYPE type, Movie *movieIn, Movie *movieOut, Movie * /*movieShake*/)
+{
+    TextButton *item = new TextButton(label, TextButton::RIGHT, type, this->window->scene, 0, TextButton::PANEL);
+    item->setRecursiveVisible(false);
+    item->setZValue(10);
+
+    qreal sw = this->window->scene->sceneRect().width();
+    int xOffset = 70;
+
+    // create in-animation:
+    DemoItemAnimation *anim = new DemoItemAnimation(item, DemoItemAnimation::ANIM_IN);
+    anim->setDuration(1800 * Colors::animSpeedButtons);
+    anim->setStartPos(QPointF(sw, Colors::contentStartY + Colors::contentHeight - 35));
+    anim->setPosAt(0.5, QPointF(sw, Colors::contentStartY + Colors::contentHeight - 35));
+    anim->setPosAt(0.7, QPointF(xOffset + 535, Colors::contentStartY + Colors::contentHeight - 35));
+    anim->setPosAt(1.0, QPointF(xOffset + 535, Colors::contentStartY + Colors::contentHeight - 26));
+    movieIn->append(anim);
+
+    // create out-animation:
+    anim = new DemoItemAnimation(item, DemoItemAnimation::ANIM_OUT);
+    anim->hideOnFinished = true;
+    anim->setDuration(400 * Colors::animSpeedButtons);
+    anim->setStartPos(QPointF(xOffset + 535, Colors::contentStartY + Colors::contentHeight - 26));
+    anim->setPosAt(1.0, QPointF(sw, Colors::contentStartY + Colors::contentHeight - 26));
+    movieOut->append(anim);
+}
+
+void MenuManager::createLowRightLeafButton(const QString &label, int xOffset, BUTTON_TYPE type, Movie *movieIn, Movie *movieOut, Movie * /*movieShake*/)
+{
+    TextButton *item = new TextButton(label, TextButton::RIGHT, type, this->window->scene, 0, TextButton::PANEL);
+    item->setRecursiveVisible(false);
+    item->setZValue(10);
+
+    qreal sw = this->window->scene->sceneRect().width();
+    qreal sh = this->window->scene->sceneRect().height();
+
+    // create in-animation:
+    DemoItemAnimation *anim = new DemoItemAnimation(item, DemoItemAnimation::ANIM_IN);
+    anim->setDuration(1050 * Colors::animSpeedButtons);
+    anim->setStartPos(QPointF(sw, Colors::contentStartY + Colors::contentHeight - 35));
+    anim->setPosAt(0.10, QPointF(sw, Colors::contentStartY + Colors::contentHeight - 35));
+    anim->setPosAt(0.30, QPointF(xOffset, Colors::contentStartY + Colors::contentHeight - 35));
+    anim->setPosAt(0.35, QPointF(xOffset + 30, Colors::contentStartY + Colors::contentHeight - 35));
+    anim->setPosAt(0.40, QPointF(xOffset, Colors::contentStartY + Colors::contentHeight - 35));
+    anim->setPosAt(0.45, QPointF(xOffset + 5, Colors::contentStartY + Colors::contentHeight - 35));
+    anim->setPosAt(0.50, QPointF(xOffset, Colors::contentStartY + Colors::contentHeight - 35));
+    anim->setPosAt(1.00, QPointF(xOffset, Colors::contentStartY + Colors::contentHeight - 26));
+    movieIn->append(anim);
+
+    // create out-animation:
+    anim = new DemoItemAnimation(item, DemoItemAnimation::ANIM_OUT);
+    anim->hideOnFinished = true;
+    anim->setDuration(300 * Colors::animSpeedButtons);
+    anim->setStartPos(QPointF(xOffset, Colors::contentStartY + Colors::contentHeight - 26));
+    anim->setPosAt(1.0, QPointF(xOffset, sh));
+    movieOut->append(anim);
+}
+
+void MenuManager::createInfo(DemoItem *item, const QString &name)
+{
+    Movie *movie_in = this->score->insertMovie(name);
+    Movie *movie_out = this->score->insertMovie(name + " -out");
+    item->setZValue(8);
+    item->setRecursiveVisible(false);
+
+    float xOffset = 230.0f;
+    DemoItemAnimation *infoIn = new DemoItemAnimation(item, DemoItemAnimation::ANIM_IN);
+    infoIn->timeline->setCurveShape(QTimeLine::LinearCurve);
+    infoIn->setDuration(650);
+    infoIn->setStartPos(QPointF(this->window->scene->sceneRect().width(), Colors::contentStartY));
+    infoIn->setPosAt(0.60, QPointF(xOffset, Colors::contentStartY));
+    infoIn->setPosAt(0.70, QPointF(xOffset + 20, Colors::contentStartY));
+    infoIn->setPosAt(0.80, QPointF(xOffset, Colors::contentStartY));
+    infoIn->setPosAt(0.90, QPointF(xOffset + 7, Colors::contentStartY));
+    infoIn->setPosAt(1.00, QPointF(xOffset, Colors::contentStartY));
+    movie_in->append(infoIn);
+
+    DemoItemAnimation *infoOut = new DemoItemAnimation(item, DemoItemAnimation::ANIM_OUT);
+    infoOut->timeline->setCurveShape(QTimeLine::EaseInCurve);
+    infoOut->setDuration(300);
+    infoOut->hideOnFinished = true;
+    infoOut->setStartPos(QPointF(xOffset, Colors::contentStartY));
+    infoOut->setPosAt(1.0, QPointF(-600, Colors::contentStartY));
+    movie_out->append(infoOut);
+}
+
+void MenuManager::createTicker()
+{
+    if (!Colors::noTicker){
+        Movie *movie_in = this->score->insertMovie("ticker");
+        Movie *movie_out = this->score->insertMovie("ticker -out");
+        Movie *movie_activate = this->score->insertMovie("ticker -activate");
+        Movie *movie_deactivate = this->score->insertMovie("ticker -deactivate");
+
+        this->ticker = new ItemCircleAnimation(this->window->scene, 0);
+        this->ticker->setZValue(50);
+        this->ticker->hide();
+
+        // Move ticker in:
+        int qtendpos = 485;
+        int qtPosY = 120;
+        this->tickerInAnim = new DemoItemAnimation(this->ticker, DemoItemAnimation::ANIM_IN);
+        this->tickerInAnim->setDuration(500);
+        this->tickerInAnim->setStartPos(QPointF(this->window->scene->sceneRect().width(), Colors::contentStartY + qtPosY));
+        this->tickerInAnim->setPosAt(0.60, QPointF(qtendpos, Colors::contentStartY + qtPosY));
+        this->tickerInAnim->setPosAt(0.70, QPointF(qtendpos + 30, Colors::contentStartY + qtPosY));
+        this->tickerInAnim->setPosAt(0.80, QPointF(qtendpos, Colors::contentStartY + qtPosY));
+        this->tickerInAnim->setPosAt(0.90, QPointF(qtendpos + 5, Colors::contentStartY + qtPosY));
+        this->tickerInAnim->setPosAt(1.00, QPointF(qtendpos, Colors::contentStartY + qtPosY));
+        movie_in->append(this->tickerInAnim);
+
+        // Move ticker out:
+        DemoItemAnimation *qtOut = new DemoItemAnimation(this->ticker, DemoItemAnimation::ANIM_OUT);
+        qtOut->hideOnFinished = true;
+        qtOut->setDuration(500);
+        qtOut->setStartPos(QPointF(qtendpos, Colors::contentStartY + qtPosY));
+        qtOut->setPosAt(1.00, QPointF(this->window->scene->sceneRect().width() + 700, Colors::contentStartY + qtPosY));
+        movie_out->append(qtOut);
+
+        // Move ticker in on activate:
+        DemoItemAnimation *qtActivate = new DemoItemAnimation(this->ticker);
+        qtActivate->setDuration(400);
+        qtActivate->setStartPos(QPointF(this->window->scene->sceneRect().width(), Colors::contentStartY + qtPosY));
+        qtActivate->setPosAt(0.60, QPointF(qtendpos, Colors::contentStartY + qtPosY));
+        qtActivate->setPosAt(0.70, QPointF(qtendpos + 30, Colors::contentStartY + qtPosY));
+        qtActivate->setPosAt(0.80, QPointF(qtendpos, Colors::contentStartY + qtPosY));
+        qtActivate->setPosAt(0.90, QPointF(qtendpos + 5, Colors::contentStartY + qtPosY));
+        qtActivate->setPosAt(1.00, QPointF(qtendpos, Colors::contentStartY + qtPosY));
+        movie_activate->append(qtActivate);
+
+        // Move ticker out on deactivate:
+        DemoItemAnimation *qtDeactivate = new DemoItemAnimation(this->ticker);
+        qtDeactivate->hideOnFinished = true;
+        qtDeactivate->setDuration(400);
+        qtDeactivate->setStartPos(QPointF(qtendpos, Colors::contentStartY + qtPosY));
+        qtDeactivate->setPosAt(1.00, QPointF(qtendpos, 800));
+        movie_deactivate->append(qtDeactivate);
+    }
+}
+
+void MenuManager::createUpnDownButtons()
+{
+    float xOffset = 15.0f;
+    float yOffset = 450.0f;
+
+    this->upButton = new TextButton("", TextButton::LEFT, MenuManager::UP, this->window->scene, 0, TextButton::UP);
+    this->upButton->prepare();
+    this->upButton->setPos(xOffset, yOffset);
+    this->upButton->setState(TextButton::DISABLED);
+
+    this->downButton = new TextButton("", TextButton::LEFT, MenuManager::DOWN, this->window->scene, 0, TextButton::DOWN);
+    this->downButton->prepare();
+    this->downButton->setPos(xOffset + 10 + this->downButton->sceneBoundingRect().width(), yOffset);
+
+    Movie *movieShake = this->score->insertMovie("upndown -shake");
+
+    DemoItemAnimation *shakeAnim = new DemoItemAnimation(this->upButton, DemoItemAnimation::ANIM_UNSPECIFIED);
+    shakeAnim->timeline->setCurveShape(QTimeLine::LinearCurve);
+    shakeAnim->setDuration(650);
+    shakeAnim->setStartPos(this->upButton->pos());
+    shakeAnim->setPosAt(0.60, this->upButton->pos());
+    shakeAnim->setPosAt(0.70, this->upButton->pos() + QPointF(-2, 0));
+    shakeAnim->setPosAt(0.80, this->upButton->pos() + QPointF(1, 0));
+    shakeAnim->setPosAt(0.90, this->upButton->pos() + QPointF(-1, 0));
+    shakeAnim->setPosAt(1.00, this->upButton->pos());
+    movieShake->append(shakeAnim);
+
+    shakeAnim = new DemoItemAnimation(this->downButton, DemoItemAnimation::ANIM_UNSPECIFIED);
+    shakeAnim->timeline->setCurveShape(QTimeLine::LinearCurve);
+    shakeAnim->setDuration(650);
+    shakeAnim->setStartPos(this->downButton->pos());
+    shakeAnim->setPosAt(0.60, this->downButton->pos());
+    shakeAnim->setPosAt(0.70, this->downButton->pos() + QPointF(-5, 0));
+    shakeAnim->setPosAt(0.80, this->downButton->pos() + QPointF(-3, 0));
+    shakeAnim->setPosAt(0.90, this->downButton->pos() + QPointF(-1, 0));
+    shakeAnim->setPosAt(1.00, this->downButton->pos());
+    movieShake->append(shakeAnim);
+}
+
+void MenuManager::createBackButton()
+{
+    Movie *backIn = this->score->insertMovie("back -in");
+    Movie *backOut = this->score->insertMovie("back -out");
+    Movie *backShake = this->score->insertMovie("back -shake");
+    createLowLeftButton(QLatin1String("Back"), ROOT, backIn, backOut, backShake, Colors::rootMenuName);
+}
diff --git a/demos/qtdemo/menumanager.h b/demos/qtdemo/menumanager.h
new file mode 100644
index 0000000000..3a12c54215
--- /dev/null
+++ b/demos/qtdemo/menumanager.h
@@ -0,0 +1,134 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MENU_MANAGER_H
+#define MENU_MANAGER_H
+
+#include <QtGui>
+#include <QtXml>
+#include <QtHelp/QHelpEngineCore>
+
+#include "score.h"
+#include "textbutton.h"
+#include "mainwindow.h"
+#include "itemcircleanimation.h"
+
+typedef QHash<QString, QString> StringHash;
+typedef QHash<QString, StringHash> HashHash;
+
+class TextButton;
+
+class MenuManager : public QObject
+{
+    Q_OBJECT
+
+public:
+    enum BUTTON_TYPE {ROOT, MENU1, MENU2, LAUNCH, DOCUMENTATION, QUIT, FULLSCREEN, UP, DOWN, BACK};
+
+    // singleton pattern:
+    static MenuManager *instance();
+    virtual ~MenuManager();
+
+    void init(MainWindow *window);
+    void itemSelected(int userCode, const QString &menuName = "");
+
+    QByteArray getHtml(const QString &name);
+    QByteArray getImage(const QString &name);
+    QString resolveExeFile(const QString &name);
+    QString resolveDocUrl(const QString &name);
+    QString resolveImageUrl(const QString &name);
+    QString resolveDataDir(const QString &name);
+
+    HashHash info;
+    ItemCircleAnimation *ticker;
+    MainWindow *window;
+    Score *score;
+    int currentMenuCode;
+
+private slots:
+    void exampleFinished();
+    void exampleError(QProcess::ProcessError error);
+
+private:
+    // singleton pattern:
+    MenuManager();
+    static MenuManager *pInstance;
+
+    QByteArray getResource(const QString &name);
+
+    void readXmlDocument();
+    void initHelpEngine();
+    void getDocumentationDir();
+    void readInfoAboutExample(const QDomElement &example);
+    void showDocInAssistant(const QString &docFile);
+    void launchExample(const QString &uniqueName);
+
+    void createMenu(const QDomElement &category, BUTTON_TYPE type);
+    void createLowLeftButton(const QString &label, BUTTON_TYPE type,
+        Movie *movieIn, Movie *movieOut, Movie *movieShake, const QString &menuString = QString());
+    void createLowRightButton(const QString &label, BUTTON_TYPE type, Movie *movieIn, Movie *movieOut, Movie *movieShake);
+    void createLowRightLeafButton(const QString &label, int pos, BUTTON_TYPE type, Movie *movieIn, Movie *movieOut, Movie * /*movieShake*/);
+    void createRootMenu(const QDomElement &el);
+    void createSubMenu(const QDomElement &el);
+    void createLeafMenu(const QDomElement &el);
+    void createInfo(DemoItem *item, const QString &name);
+    void createTicker();
+    void createUpnDownButtons();
+    void createBackButton();
+
+    QDomDocument *contentsDoc;
+    QProcess assistantProcess;
+    QString currentMenu;
+    QString currentCategory;
+    QString currentMenuButtons;
+    QString currentInfo;
+    QString helpRootUrl;
+    DemoItemAnimation *tickerInAnim;
+    QDir docDir;
+    QDir imgDir;
+    QHelpEngineCore *helpEngine;
+
+    TextButton *upButton;
+    TextButton *downButton;
+};
+
+#endif // MENU_MANAGER_H
+
diff --git a/demos/qtdemo/qtdemo.icns b/demos/qtdemo/qtdemo.icns
new file mode 100644
index 0000000000..def5f0e1bc
--- /dev/null
+++ b/demos/qtdemo/qtdemo.icns
diff --git a/demos/qtdemo/qtdemo.ico b/demos/qtdemo/qtdemo.ico
new file mode 100644
index 0000000000..016c77f018
--- /dev/null
+++ b/demos/qtdemo/qtdemo.ico
diff --git a/demos/qtdemo/qtdemo.pro b/demos/qtdemo/qtdemo.pro
new file mode 100644
index 0000000000..2534b752c9
--- /dev/null
+++ b/demos/qtdemo/qtdemo.pro
@@ -0,0 +1,72 @@
+CONFIG += assistant help x11inc
+TARGET = qtdemo
+DESTDIR = $$QT_BUILD_TREE/bin
+OBJECTS_DIR = .obj
+MOC_DIR = .moc
+INSTALLS += target sources
+QT += xml network
+
+contains(QT_CONFIG, opengl) {
+    DEFINES += QT_OPENGL_SUPPORT
+    QT += opengl
+}
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+RESOURCES = qtdemo.qrc
+HEADERS = mainwindow.h \
+    demoscene.h \
+    demoitem.h \
+    score.h \
+    demoitemanimation.h \
+    itemcircleanimation.h \
+    demotextitem.h \
+    headingitem.h \
+    dockitem.h \
+    scanitem.h \
+    letteritem.h \
+    examplecontent.h \
+    menucontent.h \
+    guide.h \
+    guideline.h \
+    guidecircle.h \
+    menumanager.h \
+    colors.h \
+    textbutton.h \
+    imageitem.h
+SOURCES = main.cpp \
+    demoscene.cpp \
+    mainwindow.cpp \
+    demoitem.cpp \
+    score.cpp \
+    demoitemanimation.cpp \
+    itemcircleanimation.cpp \
+    demotextitem.cpp \
+    headingitem.cpp \
+    dockitem.cpp \
+    scanitem.cpp \
+    letteritem.cpp \
+    examplecontent.cpp \
+    menucontent.cpp \
+    guide.cpp \
+    guideline.cpp \
+    guidecircle.cpp \
+    menumanager.cpp \
+    colors.cpp \
+    textbutton.cpp \
+    imageitem.cpp
+
+win32:RC_FILE = qtdemo.rc
+mac {
+ICON = qtdemo.icns
+QMAKE_INFO_PLIST = Info_mac.plist
+}
+
+# install
+target.path = $$[QT_INSTALL_BINS]
+sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES qtdemo.pro images xml *.ico *.icns *.rc *.plist
+sources.path = $$[QT_INSTALL_DEMOS]/qtdemo
+
diff --git a/demos/qtdemo/qtdemo.qrc b/demos/qtdemo/qtdemo.qrc
new file mode 100644
index 0000000000..b30dd5894e
--- /dev/null
+++ b/demos/qtdemo/qtdemo.qrc
@@ -0,0 +1,8 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+   <file>xml/examples.xml</file>
+   <file>images/qtlogo_small.png</file>
+   <file>images/trolltech-logo.png</file>
+   <file>images/demobg.png</file>
+</qresource>
+</RCC>
diff --git a/demos/qtdemo/qtdemo.rc b/demos/qtdemo/qtdemo.rc
new file mode 100644
index 0000000000..4cf2a63aca
--- /dev/null
+++ b/demos/qtdemo/qtdemo.rc
@@ -0,0 +1,2 @@
+IDI_ICON1               ICON    DISCARDABLE     "qtdemo.ico"
+
diff --git a/demos/qtdemo/scanitem.cpp b/demos/qtdemo/scanitem.cpp
new file mode 100644
index 0000000000..0eab840b92
--- /dev/null
+++ b/demos/qtdemo/scanitem.cpp
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "scanitem.h"
+#include "colors.h"
+
+#define ITEM_WIDTH 16
+#define ITEM_HEIGHT 16
+
+ScanItem::ScanItem(QGraphicsScene *scene, QGraphicsItem *parent)
+    : DemoItem(scene, parent)
+{
+    useSharedImage(QString(__FILE__));
+}
+
+ScanItem::~ScanItem()
+{
+}
+
+QImage *ScanItem::createImage(const QMatrix &matrix) const
+{
+    QRect scaledRect = matrix.mapRect(QRect(0, 0, ITEM_WIDTH, ITEM_HEIGHT));
+    QImage *image = new QImage(scaledRect.width(), scaledRect.height(), QImage::Format_ARGB32_Premultiplied);
+    image->fill(QColor(0, 0, 0, 0).rgba());
+    QPainter painter(image);
+    painter.setRenderHint(QPainter::Antialiasing);
+
+    if (Colors::useEightBitPalette){
+        painter.setPen(QPen(QColor(100, 100, 100), 2));
+        painter.setBrush(QColor(206, 246, 117));
+        painter.drawEllipse(1, 1, scaledRect.width()-2, scaledRect.height()-2);
+    }
+    else {
+        painter.setPen(QPen(QColor(0, 0, 0, 15), 1));
+//        painter.setBrush(QColor(206, 246, 117, 150));
+        painter.setBrush(QColor(0, 0, 0, 15));
+        painter.drawEllipse(1, 1, scaledRect.width()-2, scaledRect.height()-2);
+    }
+    return image;
+}
+
+
diff --git a/demos/qtdemo/scanitem.h b/demos/qtdemo/scanitem.h
new file mode 100644
index 0000000000..b0b5ffcb27
--- /dev/null
+++ b/demos/qtdemo/scanitem.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SCAN_ITEM_H
+#define SCAN_ITEM_H
+
+#include <QtGui>
+#include "demoitem.h"
+
+class ScanItem : public DemoItem
+{
+public:
+    ScanItem(QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
+    virtual ~ScanItem();
+
+protected:
+    QImage *createImage(const QMatrix &matrix) const;
+
+};
+
+#endif // SCAN_ITEM_H
+
diff --git a/demos/qtdemo/score.cpp b/demos/qtdemo/score.cpp
new file mode 100644
index 0000000000..f45ba0d790
--- /dev/null
+++ b/demos/qtdemo/score.cpp
@@ -0,0 +1,149 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "score.h"
+#include "colors.h"
+#include "demoitem.h"
+
+Score::Score()
+{
+}
+
+Score::~Score()
+{
+    // NB! Deleting all movies.
+    qDeleteAll(this->index);
+}
+
+void Score::prepare(Movie *movie, RUN_MODE runMode, LOCK_MODE lockMode)
+{
+    if (lockMode == LOCK_ITEMS){
+        for (int i=0; i<movie->size(); ++i){
+            if (runMode == ONLY_IF_VISIBLE && !movie->at(i)->demoItem()->isVisible())
+                continue;
+            movie->at(i)->lockItem(true);
+            movie->at(i)->prepare();
+        }
+    }
+    else if (lockMode == UNLOCK_ITEMS){
+        for (int i=0; i<movie->size(); ++i){
+            if (runMode == ONLY_IF_VISIBLE && !movie->at(i)->demoItem()->isVisible())
+                continue;
+            movie->at(i)->lockItem(false);
+            movie->at(i)->prepare();
+        }
+    }
+    else {
+        for (int i=0; i<movie->size(); ++i){
+            if (runMode == ONLY_IF_VISIBLE && !movie->at(i)->demoItem()->isVisible())
+                continue;
+            movie->at(i)->prepare();
+        }
+    }
+}
+
+void Score::play(Movie *movie, RUN_MODE runMode)
+{
+    if (runMode == NEW_ANIMATION_ONLY){
+        for (int i=0; i<movie->size(); ++i)
+            if (movie->at(i)->notOwnerOfItem())
+                movie->at(i)->play(true);
+    }
+    else if (runMode == ONLY_IF_VISIBLE){
+        for (int i=0; i<movie->size(); ++i)
+            if (movie->at(i)->demoItem()->isVisible())
+                movie->at(i)->play(runMode == FROM_START);
+    }
+    else {
+        for (int i=0; i<movie->size(); ++i)
+            movie->at(i)->play(runMode == FROM_START);
+    }
+}
+
+void Score::playMovie(const QString &indexName, RUN_MODE runMode, LOCK_MODE lockMode)
+{
+    MovieIndex::iterator movieIterator = this->index.find(indexName);
+    if (movieIterator == this->index.end())
+        return;
+
+    Movie *movie = *movieIterator;
+    this->prepare(movie, runMode, lockMode);
+    this->play(movie, runMode);
+}
+
+void Score::queueMovie(const QString &indexName, RUN_MODE runMode, LOCK_MODE lockMode)
+{
+    MovieIndex::iterator movieIterator = this->index.find(indexName);
+    if (movieIterator == this->index.end()){
+        if (Colors::verbose)
+            qDebug() << "Queuing movie:" << indexName << "(does not exist)";
+        return;
+    }
+
+    Movie *movie = *movieIterator;
+    this->prepare(movie, runMode, lockMode);
+    this->playList.append(PlayListMember(movie, int(runMode)));
+    if (Colors::verbose)
+        qDebug() << "Queuing movie:" << indexName;
+}
+
+void Score::playQue()
+{
+    int movieCount = this->playList.size();
+    for (int i=0; i<movieCount; i++)
+        this->play(this->playList.at(i).movie, RUN_MODE(this->playList.at(i).runMode));
+    this->playList.clear();
+    if (Colors::verbose)
+        qDebug() << "********* Playing que *********";
+}
+
+void Score::insertMovie(const QString &indexName, Movie *movie)
+{
+    this->index.insert(indexName, movie);
+}
+
+Movie *Score::insertMovie(const QString &indexName)
+{
+    Movie *movie = new Movie();
+    insertMovie(indexName, movie);
+    return movie;
+}
+
diff --git a/demos/qtdemo/score.h b/demos/qtdemo/score.h
new file mode 100644
index 0000000000..bfed5d2888
--- /dev/null
+++ b/demos/qtdemo/score.h
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SCORE_H
+#define SCORE_H
+
+#include <QList>
+#include <QHash>
+#include "demoitemanimation.h"
+
+typedef QList<DemoItemAnimation *> Movie;
+typedef QHash<QString, Movie*> MovieIndex;
+
+class PlayListMember
+{
+public:
+    PlayListMember(Movie *movie, int runMode) : movie(movie), runMode(runMode){};
+    Movie *movie;
+    int runMode;
+};
+typedef QList<PlayListMember> PlayList;
+
+class Score
+{
+public:
+    enum LOCK_MODE {LOCK_ITEMS, UNLOCK_ITEMS, SKIP_LOCK};
+    enum RUN_MODE {FROM_CURRENT, FROM_START, NEW_ANIMATION_ONLY, ONLY_IF_VISIBLE};
+
+    Score();
+    virtual ~Score();
+
+    void playMovie(const QString &indexName, RUN_MODE runMode = FROM_START, LOCK_MODE lockMode = SKIP_LOCK);
+    void insertMovie(const QString &indexName, Movie *movie);
+    Movie *insertMovie(const QString &indexName);
+    void queueMovie(const QString &indexName, RUN_MODE runMode = FROM_START, LOCK_MODE lockMode = SKIP_LOCK);
+    void playQue();
+    bool hasQueuedMovies(){ return this->playList.size() > 0; };
+
+    MovieIndex index;
+    PlayList playList;
+
+private:
+    void prepare(Movie *movie, RUN_MODE runMode, LOCK_MODE lockMode);
+    void play(Movie *movie, RUN_MODE runMode);
+};
+
+#endif // SCORE_H
+
diff --git a/demos/qtdemo/textbutton.cpp b/demos/qtdemo/textbutton.cpp
new file mode 100644
index 0000000000..96e1a23085
--- /dev/null
+++ b/demos/qtdemo/textbutton.cpp
@@ -0,0 +1,384 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "textbutton.h"
+#include "demoitemanimation.h"
+#include "demotextitem.h"
+#include "colors.h"
+#include "menumanager.h"
+
+#define BUTTON_WIDTH 180
+#define BUTTON_HEIGHT 19
+
+class ButtonBackground : public DemoItem
+{
+public:
+    TextButton::BUTTONTYPE type;
+    bool highlighted;
+    bool pressed;
+    QSize logicalSize;
+
+    ButtonBackground(TextButton::BUTTONTYPE type, bool highlighted, bool pressed, QSize logicalSize,
+        QGraphicsScene *scene, QGraphicsItem *parent) : DemoItem(scene, parent)
+    {
+        this->type = type;
+        this->highlighted = highlighted;
+        this->pressed = pressed;
+        this->logicalSize = logicalSize;
+        useSharedImage(QString(__FILE__) + static_cast<int>(type) + highlighted + pressed);
+    }
+
+protected:
+    QImage *createImage(const QMatrix &matrix) const
+    {
+        if (type == TextButton::SIDEBAR || type == TextButton::PANEL)
+            return createRoundButtonBackground(matrix);
+        else
+            return createArrowBackground(matrix);
+    }
+
+    QImage *createRoundButtonBackground(const QMatrix &matrix) const
+    {
+        QRect scaledRect;
+        scaledRect = matrix.mapRect(QRect(0, 0, this->logicalSize.width(), this->logicalSize.height()));
+
+        QImage *image = new QImage(scaledRect.width(), scaledRect.height(), QImage::Format_ARGB32_Premultiplied);
+        image->fill(QColor(0, 0, 0, 0).rgba());
+        QPainter painter(image);
+        painter.setRenderHint(QPainter::SmoothPixmapTransform);
+        painter.setRenderHint(QPainter::Antialiasing);
+        painter.setPen(Qt::NoPen);
+
+        if (Colors::useEightBitPalette){
+            painter.setPen(QColor(120, 120, 120));
+            if (this->pressed)
+                painter.setBrush(QColor(60, 60, 60));
+            else if (this->highlighted)
+                painter.setBrush(QColor(100, 100, 100));
+            else
+                painter.setBrush(QColor(80, 80, 80));
+        }
+        else {
+            QLinearGradient outlinebrush(0, 0, 0, scaledRect.height());
+            QLinearGradient brush(0, 0, 0, scaledRect.height());
+
+            brush.setSpread(QLinearGradient::PadSpread);
+            QColor highlight(255, 255, 255, 70);
+            QColor shadow(0, 0, 0, 70);
+            QColor sunken(220, 220, 220, 30);
+            QColor normal1(255, 255, 245, 60);
+            QColor normal2(255, 255, 235, 10);
+
+            if (this->type == TextButton::PANEL){
+                normal1 = QColor(200, 170, 160, 50);
+                normal2 = QColor(50, 10, 0, 50);
+            }
+
+           if (pressed) {
+               outlinebrush.setColorAt(0.0f, shadow);
+               outlinebrush.setColorAt(1.0f, highlight);
+               brush.setColorAt(0.0f, sunken);
+               painter.setPen(Qt::NoPen);
+           } else {
+               outlinebrush.setColorAt(1.0f, shadow);
+               outlinebrush.setColorAt(0.0f, highlight);
+               brush.setColorAt(0.0f, normal1);
+               if (!this->highlighted)
+                   brush.setColorAt(1.0f, normal2);
+               painter.setPen(QPen(outlinebrush, 1));
+           }
+           painter.setBrush(brush);
+        }
+
+        if (this->type == TextButton::PANEL)
+            painter.drawRect(0, 0, scaledRect.width(), scaledRect.height());
+        else
+            painter.drawRoundedRect(0, 0, scaledRect.width(), scaledRect.height(), 10, 90, Qt::RelativeSize);
+        return image;
+    }
+
+    QImage *createArrowBackground(const QMatrix &matrix) const
+    {
+        QRect scaledRect;
+        scaledRect = matrix.mapRect(QRect(0, 0, this->logicalSize.width(), this->logicalSize.height()));
+
+        QImage *image = new QImage(scaledRect.width(), scaledRect.height(), QImage::Format_ARGB32_Premultiplied);
+        image->fill(QColor(0, 0, 0, 0).rgba());
+        QPainter painter(image);
+        painter.setRenderHint(QPainter::SmoothPixmapTransform);
+        painter.setRenderHint(QPainter::Antialiasing);
+        painter.setPen(Qt::NoPen);
+
+        if (Colors::useEightBitPalette){
+            painter.setPen(QColor(120, 120, 120));
+            if (this->pressed)
+                painter.setBrush(QColor(60, 60, 60));
+            else if (this->highlighted)
+                painter.setBrush(QColor(100, 100, 100));
+            else
+                painter.setBrush(QColor(80, 80, 80));
+        }
+        else {
+            QLinearGradient outlinebrush(0, 0, 0, scaledRect.height());
+            QLinearGradient brush(0, 0, 0, scaledRect.height());
+
+            brush.setSpread(QLinearGradient::PadSpread);
+            QColor highlight(255, 255, 255, 70);
+            QColor shadow(0, 0, 0, 70);
+            QColor sunken(220, 220, 220, 30);
+            QColor normal1 = QColor(200, 170, 160, 50);
+            QColor normal2 = QColor(50, 10, 0, 50);
+
+           if (pressed) {
+               outlinebrush.setColorAt(0.0f, shadow);
+               outlinebrush.setColorAt(1.0f, highlight);
+               brush.setColorAt(0.0f, sunken);
+               painter.setPen(Qt::NoPen);
+           } else {
+               outlinebrush.setColorAt(1.0f, shadow);
+               outlinebrush.setColorAt(0.0f, highlight);
+               brush.setColorAt(0.0f, normal1);
+               if (!this->highlighted)
+                   brush.setColorAt(1.0f, normal2);
+               painter.setPen(QPen(outlinebrush, 1));
+           }
+           painter.setBrush(brush);
+        }
+
+        painter.drawRect(0, 0, scaledRect.width(), scaledRect.height());
+
+        float xOff = scaledRect.width() / 2;
+        float yOff = scaledRect.height() / 2;
+        float sizex = 3.0f * matrix.m11();
+        float sizey = 1.5f * matrix.m22();
+        if (this->type == TextButton::UP)
+            sizey *= -1;
+        QPainterPath path;
+        path.moveTo(xOff, yOff + (5 * sizey));
+        path.lineTo(xOff - (4 * sizex), yOff - (3 * sizey));
+        path.lineTo(xOff + (4 * sizex), yOff - (3 * sizey));
+        path.lineTo(xOff, yOff + (5 * sizey));
+        painter.drawPath(path);
+
+        return image;
+    }
+
+};
+
+TextButton::TextButton(const QString &text, ALIGNMENT align, int userCode,
+    QGraphicsScene *scene, QGraphicsItem *parent, BUTTONTYPE type)
+    : DemoItem(scene, parent)
+{
+    this->menuString = text;
+    this->buttonLabel = text;
+    this->alignment = align;
+    this->buttonType = type;
+    this->userCode = userCode;
+    this->bgOn = 0;
+    this->bgOff = 0;
+    this->bgHighlight = 0;
+    this->bgDisabled = 0;
+    this->state = OFF;
+
+    this->setAcceptsHoverEvents(true);
+    this->setCursor(Qt::PointingHandCursor);
+
+    // Calculate button size:
+    const int w = 180;
+    const int h = 19;
+    if (type == SIDEBAR || type == PANEL)
+        this->logicalSize = QSize(w, h);
+    else
+        this->logicalSize = QSize(int((w / 2.0f) - 5), int(h * 1.5f));
+}
+
+void TextButton::setMenuString(const QString &menu)
+{
+    this->menuString = menu;
+}
+
+void TextButton::prepare()
+{
+    if (!this->prepared){
+        this->prepared = true;
+        this->setupHoverText();
+        this->setupScanItem();
+        this->setupButtonBg();
+    }
+}
+
+TextButton::~TextButton()
+{
+    if (this->prepared){
+        if (Colors::useButtonBalls)
+            delete this->scanAnim;
+    }
+}
+
+QRectF TextButton::boundingRect() const
+{
+    return QRectF(0, 0, this->logicalSize.width(), this->logicalSize.height());
+};
+
+void TextButton::setupHoverText()
+{
+    if (this->buttonLabel.isEmpty())
+        return;
+
+    DemoTextItem *textItem = new DemoTextItem(this->buttonLabel, Colors::buttonFont(), Colors::buttonText, -1, this->scene(), this);
+    textItem->setZValue(zValue() + 2);
+    textItem->setPos(16, 0);
+}
+
+void TextButton::setupScanItem()
+{
+    if (Colors::useButtonBalls){
+        ScanItem *scanItem = new ScanItem(0, this);
+        scanItem->setZValue(zValue() + 1);
+
+        this->scanAnim = new DemoItemAnimation(scanItem);
+        this->scanAnim->timeline->setLoopCount(1);
+
+        float x = 1;
+        float y = 1.5f;
+        float stop = BUTTON_WIDTH - scanItem->boundingRect().width() - x;
+        if (this->alignment == LEFT){
+            this->scanAnim->setDuration(2500);
+            this->scanAnim->setPosAt(0.0, QPointF(x, y));
+            this->scanAnim->setPosAt(0.5, QPointF(x, y));
+            this->scanAnim->setPosAt(0.7, QPointF(stop, y));
+            this->scanAnim->setPosAt(1.0, QPointF(x, y));
+            scanItem->setPos(QPointF(x, y));
+        }
+        else {
+            this->scanAnim->setPosAt(0.0, QPointF(stop, y));
+            this->scanAnim->setPosAt(0.5, QPointF(x, y));
+            this->scanAnim->setPosAt(1.0, QPointF(stop, y));
+            scanItem->setPos(QPointF(stop, y));
+        }
+    }
+}
+
+void TextButton::setState(STATE state)
+{
+    this->state = state;
+    this->bgOn->setRecursiveVisible(state == ON);
+    this->bgOff->setRecursiveVisible(state == OFF);
+    this->bgHighlight->setRecursiveVisible(state == HIGHLIGHT);
+    this->bgDisabled->setRecursiveVisible(state == DISABLED);
+    this->setCursor(state == DISABLED ? Qt::ArrowCursor : Qt::PointingHandCursor);
+
+}
+
+void TextButton::setupButtonBg()
+{
+    this->bgOn = new ButtonBackground(this->buttonType, true, true, this->logicalSize, this->scene(), this);
+    this->bgOff = new ButtonBackground(this->buttonType, false, false, this->logicalSize, this->scene(), this);
+    this->bgHighlight = new ButtonBackground(this->buttonType, true, false, this->logicalSize, this->scene(), this);
+    this->bgDisabled = new ButtonBackground(this->buttonType, true, true, this->logicalSize, this->scene(), this);
+    this->setState(OFF);
+}
+
+void TextButton::hoverEnterEvent(QGraphicsSceneHoverEvent *)
+{
+    if (this->locked || this->state == DISABLED)
+        return;
+
+    if (this->state == OFF){
+        this->setState(HIGHLIGHT);
+
+        if (Colors::noAnimations && Colors::useButtonBalls){
+            // wait a bit in the beginning
+            // to enhance the effect. Have to this here
+            // so that the adaption can be dynamic
+            this->scanAnim->setDuration(1000);
+            this->scanAnim->setPosAt(0.2, this->scanAnim->posAt(0));
+        }
+
+        if (MenuManager::instance()->window->fpsMedian > 10
+            || Colors::noAdapt
+            || Colors::noTimerUpdate){
+            if (Colors::useButtonBalls)
+                this->scanAnim->play(true, true);
+        }
+    }
+}
+
+void TextButton::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
+{
+    Q_UNUSED(event);
+    if (this->state == DISABLED)
+        return;
+
+    this->setState(OFF);
+
+    if (Colors::noAnimations && Colors::useButtonBalls)
+        this->scanAnim->stop();
+}
+
+void TextButton::mousePressEvent(QGraphicsSceneMouseEvent *)
+{
+    if (this->state == DISABLED)
+        return;
+
+    if (this->state == HIGHLIGHT || this->state == OFF)
+        this->setState(ON);
+}
+
+void TextButton::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (this->state == ON){
+        this->setState(OFF);
+        if (!this->locked && this->boundingRect().contains(event->pos())){
+            MenuManager::instance()->itemSelected(this->userCode, this->menuString);
+        }
+    }
+}
+
+void TextButton::animationStarted(int)
+{
+    if (this->state == DISABLED)
+        return;
+    this->setState(OFF);
+}
+
+
+
diff --git a/demos/qtdemo/textbutton.h b/demos/qtdemo/textbutton.h
new file mode 100644
index 0000000000..b7c91fb23a
--- /dev/null
+++ b/demos/qtdemo/textbutton.h
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TEXT_BUTTON_H
+#define TEXT_BUTTON_H
+
+#include <QtGui>
+#include "demoitem.h"
+#include "demotextitem.h"
+#include "scanitem.h"
+
+class DemoItemAnimation;
+class ButtonBackground;
+
+class TextButton : public DemoItem
+{
+public:
+    enum ALIGNMENT {LEFT, RIGHT};
+    enum BUTTONTYPE {SIDEBAR, PANEL, UP, DOWN};
+    enum STATE {ON, OFF, HIGHLIGHT, DISABLED};
+
+    TextButton(const QString &text, ALIGNMENT align = LEFT, int userCode = 0,
+        QGraphicsScene *scene = 0, QGraphicsItem *parent = 0, BUTTONTYPE color = SIDEBAR);
+    virtual ~TextButton();
+
+    // overidden methods:
+    virtual QRectF boundingRect() const;
+    virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0){};
+    virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+    virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+    virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+
+    void animationStarted(int id = 0);
+    void prepare();
+    void setState(STATE state);
+    void setMenuString(const QString &menu);
+    void setDisabled(bool disabled);
+
+private:
+    void setupButtonBg();
+    void setupScanItem();
+    void setupHoverText();
+
+    DemoItemAnimation *scanAnim;
+    ButtonBackground *bgOn;
+    ButtonBackground *bgOff;
+    ButtonBackground *bgHighlight;
+    ButtonBackground *bgDisabled;
+
+    BUTTONTYPE buttonType;
+    ALIGNMENT alignment;
+    QString buttonLabel;
+    QString menuString;
+    int userCode;
+    QSize logicalSize;
+
+    STATE state;
+};
+
+#endif // TEXT_BUTTON_H
+
diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml
new file mode 100644
index 0000000000..df2d93ba76
--- /dev/null
+++ b/demos/qtdemo/xml/examples.xml
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<categories name="Qt Examples and Demos">
+  <demos dirname="." docname="demos" name="Demonstrations">
+    <example filename="affine" name="Affine Transformations" />
+    <example filename="arthurplugin" name="Arthur Plugin" executable="false" />
+    <example filename="composition" name="Composition Modes" />
+    <example filename="gradients" name="Gradients" />
+    <example filename="pathstroke" name="Path Stroking" />
+    <example filename="deform" name="Vector Deformation" />
+    <example filename="books" name="Books" />
+    <example filename="mainwindow" name="Main Window" />
+    <example filename="spreadsheet" name="Spreadsheet" />
+    <example filename="sqlbrowser" name="SQL Browser" />
+    <example filename="textedit" name="Text Edit" />
+    <example filename="chip" name="40000 Chips" />
+    <example filename="embeddeddialogs" name="Embedded Dialogs" />
+    <example filename="interview" name="Interview" />
+    <example filename="browser" name="Browser" />
+    <example filename="mediaplayer" name="Media Player" />
+    <example filename="boxes" name="Boxes" />
+  </demos>
+  <category dirname="qtconcurrent" name="Concurrent Programming">
+    <example filename="map" name="Map" executable="false" />
+    <example filename="progressdialog" name="Progress Dialog" />
+    <example filename="runfunction" name="Run Function" executable="false"/>
+    <example filename="wordcount" name="Word Count" executable="false" />
+  </category>
+  <category dirname="designer" name="Qt Designer">
+    <example filename="calculatorbuilder" name="Calculator Builder" />
+    <example filename="calculatorform" name="Calculator Form" />
+    <example filename="containerextension" name="Container Extension" executable="false"/>
+    <example filename="customwidgetplugin" name="Custom Widget Plugin" executable="false" />
+    <example filename="taskmenuextension" name="Task Menu Extension" executable="false" />
+    <example filename="worldtimeclockbuilder" name="World Time Clock Builder" />
+    <example filename="worldtimeclockplugin" name="World Time Clock Plugin" executable="false"/>
+  </category>
+  <category dirname="desktop" name="Desktop">
+    <example filename="systray" name="System Tray" image="systemtray-example.png"/>
+    <example filename="screenshot" name="Screenshot" />
+  </category>
+  <category dirname="dialogs" name="Dialogs">
+    <example filename="configdialog" name="Configuration Dialog" />
+    <example filename="extension" name="Extension Dialog" />
+    <example filename="findfiles" name="Find Files Dialog" />
+    <example filename="standarddialogs" name="Standard Dialogs" />
+    <example filename="tabdialog" name="Tab Dialog" />
+    <example filename="trivialwizard" name="Trivial Wizard" image="trivialwizard-example-introduction.png"/>
+    <example filename="licensewizard" name="License Wizard" />
+    <example filename="classwizard" name="Class Wizard" />
+  </category>
+  <category dirname="draganddrop" name="Drag and Drop">
+    <example filename="draggableicons" name="Draggable Icons" />
+    <example filename="draggabletext" name="Draggable Text" />
+    <example filename="dropsite" name="Drop Site" />
+    <example filename="fridgemagnets" name="Fridge Magnets" />
+    <example filename="puzzle" name="Puzzle" image="draganddroppuzzle-example.png"/>
+  </category>
+  <category dirname="graphicsview" name="Graphics View">
+    <example filename="elasticnodes" name="Elastic Nodes" />
+    <example filename="collidingmice" name="Colliding Mice" />
+    <example filename="diagramscene" name="Diagram Scene" />
+    <example filename="dragdroprobot" name="Drag and Drop Robot" />
+    <example filename="portedcanvas" name="Ported Canvas" />
+    <example filename="portedasteroids" name="Ported Asteroids" />
+    <example filename="padnavigator" name="Pad Navigator Example" />
+  </category>
+  <category dirname="ipc" name="IPC">
+    <example filename="sharedmemory" name="Shared Memory" image="sharedmemory-example_1.png"/>
+    <example filename="localfortuneclient" name="Local Fortune Client" image="localfortuneclient-example.png"/>
+    <example filename="localfortuneserver" name="Local Fortune Server" image="localfortuneserver-example.png"/>
+  </category>
+  <category dirname="itemviews" name="Item Views">
+    <example filename="addressbook" name="Address Book" />
+    <example filename="basicsortfiltermodel" name="Basic Sort/Filter Model" />
+    <example filename="chart" name="Chart" />
+    <example filename="customsortfiltermodel" name="Custom Sort/Filter Model" />
+    <example filename="coloreditorfactory" name="Color Editor Factory" image="coloreditorfactoryimage.png"/>
+    <example filename="combowidgetmapper" name="Combo Widget Mapper" />
+    <example filename="dirview" name="Directory View" />
+    <example filename="fetchmore" name="Fetch More" />
+    <example filename="pixelator" name="Pixelator" />
+    <example filename="puzzle" name="Puzzle " image="itemviewspuzzle-example.png"/>
+    <example filename="simpledommodel" name="Simple DOM Model" />
+    <example filename="simpletreemodel" name="Simple Tree Model" />
+    <example filename="simplewidgetmapper" name="Simple Widget Mapper" />
+    <example filename="spinboxdelegate" name="Spin Box Delegate" />
+    <example filename="stardelegate" name="Star Delegate" />
+  </category>
+  <category dirname="layouts" name="Layouts">
+    <example filename="basiclayouts" name="Basic Layouts" />
+    <example filename="borderlayout" name="Border Layout" />
+    <example filename="dynamiclayouts" name="Dynamic Layouts" />
+    <example filename="flowlayout" name="Flow Layout" />
+  </category>
+  <category dirname="linguist" name="Qt Linguist">
+    <example filename="arrowpad" name="Arrow Pad" image="linguist-arrowpad_en.png"/>
+    <example filename="hellotr" name="Hello World" image="linguist-hellotr_en.png"/>
+    <example filename="trollprint" name="Troll Print" image="linguist-trollprint_10_en.png"/>
+  </category>
+  <category dirname="mainwindows" name="Main Windows">
+    <example filename="application" name="Application" />
+    <example filename="dockwidgets" name="Dock Widgets" />
+    <example filename="mdi" name="MDI" />
+    <example filename="sdi" name="SDI" />
+    <example filename="menus" name="Menus" />
+    <example filename="recentfiles" name="Recent Files" />
+  </category>
+  <category dirname="network" name="Networking">
+    <example filename="blockingfortuneclient" name="Blocking Fortune Client" />
+    <example filename="broadcastreceiver" name="Broadcast Receiver" />
+    <example filename="broadcastsender" name="Broadcast Sender" />
+    <example filename="network-chat" name="Network Chat Client" />
+    <example filename="fortuneclient" name="Fortune Client" />
+    <example filename="fortuneserver" name="Fortune Server" />
+    <example filename="ftp" changedirectory="false" name="FTP Client" />
+    <example filename="http" changedirectory="false" name="HTTP Client" />
+    <example filename="loopback" name="Loopback" />
+    <example filename="threadedfortuneserver" name="Threaded Fort. Server" />
+    <example filename="torrent" name="Torrent Client" />
+    <example filename="securesocketclient" name="Secure Socket Client" />
+  </category>
+  <category dirname="opengl" name="OpenGL">
+    <example filename="2dpainting" name="2D Painting" />
+    <example filename="framebufferobject" name="Framebuffer Object" />
+    <example filename="framebufferobject2" name="Framebuffer Object 2" />
+    <example filename="grabber" name="Grabber" />
+    <example filename="hellogl" name="Hello GL" />
+    <example filename="overpainting" name="Overpainting" />
+    <example filename="pbuffers" name="Pixel Buffers" />
+    <example filename="pbuffers2" name="Pixel Buffers 2" />
+    <example filename="samplebuffers" name="Sample Buffers" />
+    <example filename="textures" name="Textures" />
+  </category>
+  <category dirname="painting" name="Painting">
+    <example filename="basicdrawing" name="Basic Drawing" />
+    <example filename="concentriccircles" name="Concentric Circles" />
+    <example filename="fontsampler" name="Font Sampler" />
+    <example filename="imagecomposition" name="Image Composition" />
+    <example filename="painterpaths" name="Painter Paths" />
+    <example filename="svgviewer" name="SVG Viewer" />
+    <example filename="transformations" name="Transformations" />
+  </category>
+  <category dirname="phonon" name="Phonon">
+    <example filename="musicplayer" name="Music Player" />
+  </category>
+  <category dirname="richtext" name="Rich Text">
+    <example filename="calendar" name="Calendar" />
+    <example filename="orderform" name="Order Form" />
+    <example filename="syntaxhighlighter" name="Syntax Highlighter" />
+    <example filename="textobject" name="Text Object" />
+  </category>
+  <category dirname="script" name="QtScript">
+    <example filename="calculator" name="Calculator" />
+    <example filename="context2d" name="Context2D" />
+    <example filename="defaultprototypes" name="Default Prototypes" />
+    <example filename="helloscript" name="Hello Script" image="t1.png"/>
+    <example filename="qstetrix" name="QSTetrix" image="tetrix-example.png" />
+  </category>
+  <category dirname="sql" name="SQL">
+    <example filename="cachedtable" name="Cached Table" />
+    <example filename="drilldown" name="Drill Down" />
+    <example filename="querymodel" name="Query Model" />
+    <example filename="relationaltablemodel" name="Relational Table Model" />
+    <example filename="tablemodel" name="Table Model" />
+    <example filename="masterdetail" name="Music Archive" />
+    <example filename="sqlwidgetmapper" name="SQL Widget Mapper" />
+  </category>
+  <category dirname="threads" name="Threading">
+    <example filename="mandelbrot" name="Mandelbrot" />
+  </category>
+  <category dirname="tools" name="Tools">
+    <example filename="codecs" name="Codecs" />
+    <example filename="completer" name="Completer" />
+    <example filename="customcompleter" name="Custom Completer" />
+    <example filename="i18n" name="Internationalization" />
+    <example filename="plugandpaint" name="Plug and Paint" />
+    <example filename="regexp" name="Regular Expressions" />
+    <example filename="settingseditor" name="Settings Editor" />
+    <example filename="treemodelcompleter" name="Tree Model Completer" />
+    <example filename="undoframework" name="Undo Framework"/>
+  </category>
+  <category dirname="tutorials/addressbook" name="Address Book Tutorial">
+    <example filename="part1" name="Part 1" image="addressbook-tutorial-part1-screenshot.png" />
+    <example filename="part2" name="Part 2" image="addressbook-tutorial-part2-add-contact.png" />
+    <example filename="part3" name="Part 3" image="addressbook-tutorial-part3-screenshot.png" />
+    <example filename="part4" name="Part 4" image="addressbook-tutorial-screenshot.png" />
+    <example filename="part5" name="Part 5" image="addressbook-tutorial-part5-screenshot.png" />
+    <example filename="part6" name="Part 6" image="addressbook-tutorial-part6-screenshot.png" />
+    <example filename="part7" name="Part 7" image="addressbook-tutorial-part7-screenshot.png" />
+  </category>
+  <category dirname="widgets" name="Widgets">
+    <example filename="analogclock" name="Analog Clock" />
+    <example filename="calculator" name="Calculator " />
+    <example filename="calendarwidget" name="Calendar Widget" />
+    <example filename="charactermap" name="Character Map" />
+    <example filename="codeeditor" name="Code Editor" />
+    <example filename="digitalclock" name="Digital Clock" />
+    <example filename="groupbox" name="Group Box" />
+    <example filename="icons" name="Icons" />
+    <example filename="imageviewer" name="Image Viewer" />
+    <example filename="lineedits" name="Line Edits" />
+    <example filename="movie" name="Movie Player" />
+    <example filename="scribble" name="Scribble" />
+    <example filename="shapedclock" name="Shaped Clock" />
+    <example filename="sliders" name="Sliders" />
+    <example filename="spinboxes" name="Spin Boxes" />
+    <example filename="styles" name="Styles" image="styles-enabledwood.png"/>
+    <example filename="stylesheet" name="Style Sheet" image="stylesheet-coffee-plastique.png"/>
+    <example filename="tablet" name="Tablet" />
+    <example filename="tetrix" name="Tetrix " />
+    <example filename="tooltips" name="Tool Tips" />
+    <example filename="wiggly" name="Wiggly" />
+    <example filename="windowflags" name="Window Flags" />
+  </category>
+  <category dirname="xml" name="XML">
+    <example filename="saxbookmarks" name="SAX Bookmarks" />
+    <example filename="dombookmarks" name="DOM Bookmarks" />
+    <example filename="rsslisting" name="RSS-Listing" />
+    <example filename="streambookmarks" name="QXmlStream Bookmarks" image="xmlstreamexample-screenshot.png"/>
+  </category>
+  <category dirname="xmlpatterns" name="XML Patterns">
+    <example filename="recipes" name="Recipes" />
+    <example filename="qobjectxmlmodel" name="QObjectXmlModel" />
+    <example filename="filetree" name="File Tree" />
+    <example filename="trafficinfo" name="Traffic Info" />
+  </category>  
+</categories>
diff --git a/demos/shared/arthurstyle.cpp b/demos/shared/arthurstyle.cpp
new file mode 100644
index 0000000000..846d2f3000
--- /dev/null
+++ b/demos/shared/arthurstyle.cpp
@@ -0,0 +1,452 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "arthurstyle.h"
+#include "arthurwidgets.h"
+#include <QLayout>
+#include <QPainter>
+#include <QPainterPath>
+#include <QPixmapCache>
+#include <QRadioButton>
+#include <QString>
+#include <QStyleOption>
+#include <QtDebug>
+
+QPixmap cached(const QString &img)
+{
+    if (QPixmap *p = QPixmapCache::find(img))
+        return *p;
+
+    QPixmap pm;
+    pm = QPixmap::fromImage(QImage(img), Qt::OrderedDither | Qt::OrderedAlphaDither);
+    if (pm.isNull())
+        return QPixmap();
+
+    QPixmapCache::insert(img, pm);
+    return pm;
+}
+
+
+ArthurStyle::ArthurStyle()
+    : QWindowsStyle()
+{
+    Q_INIT_RESOURCE(shared);
+}
+
+
+void ArthurStyle::drawHoverRect(QPainter *painter, const QRect &r) const
+{
+    qreal h = r.height();
+    qreal h2 = r.height() / qreal(2);
+    QPainterPath path;
+    path.addRect(r.x() + h2, r.y() + 0, r.width() - h2 * 2, r.height());
+    path.addEllipse(r.x(), r.y(), h, h);
+    path.addEllipse(r.x() + r.width() - h, r.y(), h, h);
+    path.setFillRule(Qt::WindingFill);
+    painter->setPen(Qt::NoPen);
+    painter->setBrush(QColor(191, 215, 191));
+    painter->setRenderHint(QPainter::Antialiasing);
+    painter->drawPath(path);
+}
+
+
+void ArthurStyle::drawPrimitive(PrimitiveElement element, const QStyleOption *option,
+                                QPainter *painter, const QWidget *widget) const
+{
+
+    Q_ASSERT(option);
+    switch (element) {
+    case PE_FrameFocusRect:
+        break;
+
+    case PE_IndicatorRadioButton:
+        if (const QStyleOptionButton *button = qstyleoption_cast<const QStyleOptionButton *>(option)) {
+            bool hover = (button->state & State_Enabled) && (button->state & State_MouseOver);
+            painter->save();
+            QPixmap radio;
+            if (hover)
+                drawHoverRect(painter, widget->rect());
+
+            if (button->state & State_Sunken)
+                radio = cached(":res/images/radiobutton-on.png");
+            else if (button->state & State_On)
+                radio = cached(":res/images/radiobutton_on.png");
+            else
+                radio = cached(":res/images/radiobutton_off.png");
+            painter->drawPixmap(button->rect.topLeft(), radio);
+
+            painter->restore();
+        }
+        break;
+
+    case PE_PanelButtonCommand:
+        if (const QStyleOptionButton *button = qstyleoption_cast<const QStyleOptionButton *>(option)) {
+            bool hover = (button->state & State_Enabled) && (button->state & State_MouseOver);
+
+            painter->save();
+            const QPushButton *pushButton = qobject_cast<const QPushButton *>(widget);
+            Q_ASSERT(pushButton);
+            QWidget *parent = pushButton->parentWidget();
+            if (parent && qobject_cast<QGroupBox *>(parent)) {
+                QLinearGradient lg(0, 0, 0, parent->height());
+                lg.setColorAt(0, QColor(224,224,224));
+                lg.setColorAt(1, QColor(255,255,255));
+                painter->setPen(Qt::NoPen);
+                painter->setBrush(lg);
+                painter->setBrushOrigin(-widget->mapToParent(QPoint(0,0)));
+                painter->drawRect(button->rect);
+                painter->setBrushOrigin(0,0);
+            }
+
+            bool down = (button->state & State_Sunken) || (button->state & State_On);
+
+            QPixmap left, right, mid;
+            if (down) {
+                left = cached(":res/images/button_pressed_cap_left.png");
+                right = cached(":res/images/button_pressed_cap_right.png");
+                mid = cached(":res/images/button_pressed_stretch.png");
+            } else {
+                left = cached(":res/images/button_normal_cap_left.png");
+                right = cached(":res/images/button_normal_cap_right.png");
+                mid = cached(":res/images/button_normal_stretch.png");
+            }
+            painter->drawPixmap(button->rect.topLeft(), left);
+            painter->drawTiledPixmap(QRect(button->rect.x() + left.width(),
+                                           button->rect.y(),
+                                           button->rect.width() - left.width() - right.width(),
+                                           left.height()),
+                                     mid);
+            painter->drawPixmap(button->rect.x() + button->rect.width() - right.width(),
+                                button->rect.y(),
+                                right);
+            if (hover)
+                painter->fillRect(widget->rect().adjusted(3,5,-3,-5), QColor(31,127,31,63));
+            painter->restore();
+        }
+        break;
+
+    case PE_FrameGroupBox:
+        if (const QStyleOptionFrameV2 *group
+                = qstyleoption_cast<const QStyleOptionFrameV2 *>(option)) {
+            const QRect &r = group->rect;
+
+            painter->save();
+            int radius = 14;
+            int radius2 = radius*2;
+            QPainterPath clipPath;
+            clipPath.moveTo(radius, 0);
+            clipPath.arcTo(r.right() - radius2, 0, radius2, radius2, 90, -90);
+            clipPath.arcTo(r.right() - radius2, r.bottom() - radius2, radius2, radius2, 0, -90);
+            clipPath.arcTo(r.left(), r.bottom() - radius2, radius2, radius2, 270, -90);
+            clipPath.arcTo(r.left(), r.top(), radius2, radius2, 180, -90);
+            painter->setClipPath(clipPath);
+            QPixmap titleStretch = cached(":res/images/title_stretch.png");
+            QPixmap topLeft = cached(":res/images/groupframe_topleft.png");
+            QPixmap topRight = cached(":res/images/groupframe_topright.png");
+            QPixmap bottomLeft = cached(":res/images/groupframe_bottom_left.png");
+            QPixmap bottomRight = cached(":res/images/groupframe_bottom_right.png");
+            QPixmap leftStretch = cached(":res/images/groupframe_left_stretch.png");
+            QPixmap topStretch = cached(":res/images/groupframe_top_stretch.png");
+            QPixmap rightStretch = cached(":res/images/groupframe_right_stretch.png");
+            QPixmap bottomStretch = cached(":res/images/groupframe_bottom_stretch.png");
+            QLinearGradient lg(0, 0, 0, r.height());
+            lg.setColorAt(0, QColor(224,224,224));
+            lg.setColorAt(1, QColor(255,255,255));
+            painter->setPen(Qt::NoPen);
+            painter->setBrush(lg);
+            painter->drawRect(r.adjusted(0, titleStretch.height()/2, 0, 0));
+            painter->setClipping(false);
+
+            int topFrameOffset = titleStretch.height()/2 - 2;
+            painter->drawPixmap(r.topLeft() + QPoint(0, topFrameOffset), topLeft);
+            painter->drawPixmap(r.topRight() - QPoint(topRight.width()-1, 0)
+                                + QPoint(0, topFrameOffset), topRight);
+            painter->drawPixmap(r.bottomLeft() - QPoint(0, bottomLeft.height()-1), bottomLeft);
+            painter->drawPixmap(r.bottomRight() - QPoint(bottomRight.width()-1,
+                                bottomRight.height()-1), bottomRight);
+
+            QRect left = r;
+            left.setY(r.y() + topLeft.height() + topFrameOffset);
+            left.setWidth(leftStretch.width());
+            left.setHeight(r.height() - topLeft.height() - bottomLeft.height() - topFrameOffset);
+            painter->drawTiledPixmap(left, leftStretch);
+
+            QRect top = r;
+            top.setX(r.x() + topLeft.width());
+            top.setY(r.y() + topFrameOffset);
+            top.setWidth(r.width() - topLeft.width() - topRight.width());
+            top.setHeight(topLeft.height());
+            painter->drawTiledPixmap(top, topStretch);
+
+            QRect right = r;
+            right.setX(r.right() - rightStretch.width()+1);
+            right.setY(r.y() + topRight.height() + topFrameOffset);
+            right.setWidth(rightStretch.width());
+            right.setHeight(r.height() - topRight.height()
+                            - bottomRight.height() - topFrameOffset);
+            painter->drawTiledPixmap(right, rightStretch);
+
+            QRect bottom = r;
+            bottom.setX(r.x() + bottomLeft.width());
+            bottom.setY(r.bottom() - bottomStretch.height()+1);
+            bottom.setWidth(r.width() - bottomLeft.width() - bottomRight.width());
+            bottom.setHeight(bottomLeft.height());
+            painter->drawTiledPixmap(bottom, bottomStretch);
+            painter->restore();
+        }
+        break;
+
+    default:
+        QWindowsStyle::drawPrimitive(element, option, painter, widget);
+        break;
+    }
+    return;
+}
+
+
+void ArthurStyle::drawComplexControl(ComplexControl control, const QStyleOptionComplex *option,
+                                     QPainter *painter, const QWidget *widget) const
+{
+    switch (control) {
+    case CC_Slider:
+        if (const QStyleOptionSlider *slider = qstyleoption_cast<const QStyleOptionSlider *>(option)) {
+            QRect groove = subControlRect(CC_Slider, option, SC_SliderGroove, widget);
+            QRect handle = subControlRect(CC_Slider, option, SC_SliderHandle, widget);
+
+            painter->save();
+
+            bool hover = (slider->state & State_Enabled) && (slider->state & State_MouseOver);
+            if (hover) {
+                QRect moderated = widget->rect().adjusted(0, 4, 0, -4);
+                drawHoverRect(painter, moderated);
+            }
+
+            if ((option->subControls & SC_SliderGroove) && groove.isValid()) {
+                QPixmap grv = cached(":res/images/slider_bar.png");
+                painter->drawPixmap(QRect(groove.x() + 5, groove.y(),
+                                          groove.width() - 10, grv.height()),
+                                    grv);
+            }
+            if ((option->subControls & SC_SliderHandle) && handle.isValid()) {
+                QPixmap hndl = cached(":res/images/slider_thumb_on.png");
+                painter->drawPixmap(handle.topLeft(), hndl);
+            }
+
+            painter->restore();
+        }
+        break;
+    case CC_GroupBox:
+        if (const QStyleOptionGroupBox *groupBox
+                = qstyleoption_cast<const QStyleOptionGroupBox *>(option)) {
+            QStyleOptionGroupBox groupBoxCopy(*groupBox);
+            groupBoxCopy.subControls &= ~SC_GroupBoxLabel;
+            QWindowsStyle::drawComplexControl(control, &groupBoxCopy, painter, widget);
+
+            if (groupBox->subControls & SC_GroupBoxLabel) {
+                const QRect &r = groupBox->rect;
+                QPixmap titleLeft = cached(":res/images/title_cap_left.png");
+                QPixmap titleRight = cached(":res/images/title_cap_right.png");
+                QPixmap titleStretch = cached(":res/images/title_stretch.png");
+                int txt_width = groupBox->fontMetrics.width(groupBox->text) + 20;
+                painter->drawPixmap(r.center().x() - txt_width/2, 0, titleLeft);
+                QRect tileRect = subControlRect(control, groupBox, SC_GroupBoxLabel, widget);
+                painter->drawTiledPixmap(tileRect, titleStretch);
+                painter->drawPixmap(tileRect.x() + tileRect.width(), 0, titleRight);
+                int opacity = 31;
+                painter->setPen(QColor(0, 0, 0, opacity));
+                painter->drawText(tileRect.translated(0, 1),
+                                  Qt::AlignVCenter | Qt::AlignHCenter, groupBox->text);
+                painter->drawText(tileRect.translated(2, 1),
+                                  Qt::AlignVCenter | Qt::AlignHCenter, groupBox->text);
+                painter->setPen(QColor(0, 0, 0, opacity * 2));
+                painter->drawText(tileRect.translated(1, 1),
+                                  Qt::AlignVCenter | Qt::AlignHCenter, groupBox->text);
+                painter->setPen(Qt::white);
+                painter->drawText(tileRect, Qt::AlignVCenter | Qt::AlignHCenter, groupBox->text);
+            }
+        }
+        break;
+    default:
+        QWindowsStyle::drawComplexControl(control, option, painter, widget);
+        break;
+    }
+    return;
+}
+
+QRect ArthurStyle::subControlRect(ComplexControl control, const QStyleOptionComplex *option,
+                                  SubControl subControl, const QWidget *widget) const
+{
+    QRect rect;
+
+    switch (control) {
+    default:
+        rect = QWindowsStyle::subControlRect(control, option, subControl, widget);
+        break;
+    case CC_GroupBox:
+        if (const QStyleOptionGroupBox *group
+                = qstyleoption_cast<const QStyleOptionGroupBox *>(option)) {
+            switch (subControl) {
+            default:
+                rect = QWindowsStyle::subControlRect(control, option, subControl, widget);
+                break;
+            case SC_GroupBoxContents:
+                rect = QWindowsStyle::subControlRect(control, option, subControl, widget);
+                rect.adjust(0, -8, 0, 0);
+                break;
+            case SC_GroupBoxFrame:
+                rect = group->rect;
+                break;
+            case SC_GroupBoxLabel:
+                QPixmap titleLeft = cached(":res/images/title_cap_left.png");
+                QPixmap titleRight = cached(":res/images/title_cap_right.png");
+                QPixmap titleStretch = cached(":res/images/title_stretch.png");
+                int txt_width = group->fontMetrics.width(group->text) + 20;
+                rect = QRect(group->rect.center().x() - txt_width/2 + titleLeft.width(), 0,
+                             txt_width - titleLeft.width() - titleRight.width(),
+                             titleStretch.height());
+                break;
+            }
+        }
+        break;
+    }
+
+    if (control == CC_Slider && subControl == SC_SliderHandle) {
+        rect.setWidth(13);
+        rect.setHeight(27);
+    } else if (control == CC_Slider && subControl == SC_SliderGroove) {
+        rect.setHeight(9);
+        rect.moveTop(27/2 - 9/2);
+    }
+    return rect;
+}
+
+QSize ArthurStyle::sizeFromContents(ContentsType type, const QStyleOption *option,
+                                    const QSize &size, const QWidget *widget) const
+{
+    QSize newSize = QWindowsStyle::sizeFromContents(type, option, size, widget);
+
+
+    switch (type) {
+    case CT_RadioButton:
+        newSize += QSize(20, 0);
+        break;
+
+    case CT_PushButton:
+        newSize.setHeight(26);
+        break;
+
+    case CT_Slider:
+        newSize.setHeight(27);
+        break;
+
+    default:
+        break;
+    }
+
+    return newSize;
+}
+
+int ArthurStyle::pixelMetric(PixelMetric pm, const QStyleOption *opt, const QWidget *widget) const
+{
+    if (pm == PM_SliderLength)
+        return 13;
+    return QWindowsStyle::pixelMetric(pm, opt, widget);
+}
+
+void ArthurStyle::polish(QWidget *widget)
+{
+    if (widget->layout() && qobject_cast<QGroupBox *>(widget)) {
+        if (qFindChildren<QGroupBox *>(widget).size() == 0) {
+            widget->layout()->setSpacing(0);
+            widget->layout()->setMargin(12);
+        } else {
+            widget->layout()->setMargin(13);
+        }
+    }
+
+    if (qobject_cast<QPushButton *>(widget)
+        || qobject_cast<QRadioButton *>(widget)
+        || qobject_cast<QSlider *>(widget)) {
+        widget->setAttribute(Qt::WA_Hover);
+    }
+
+    QPalette pal = widget->palette();
+    if (widget->isWindow()) {
+        pal.setColor(QPalette::Background, QColor(241, 241, 241));
+        widget->setPalette(pal);
+    }
+
+}
+
+void ArthurStyle::unpolish(QWidget *widget)
+{
+    if (qobject_cast<QPushButton *>(widget)
+        || qobject_cast<QRadioButton *>(widget)
+        || qobject_cast<QSlider *>(widget)) {
+        widget->setAttribute(Qt::WA_Hover, false);
+    }
+}
+
+void ArthurStyle::polish(QPalette &palette)
+{
+    palette.setColor(QPalette::Background, QColor(241, 241, 241));
+}
+
+QRect ArthurStyle::subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const
+{
+    QRect r;
+    switch(element) {
+    case SE_RadioButtonClickRect:
+        r = widget->rect();
+        break;
+    case SE_RadioButtonContents:
+        r = widget->rect().adjusted(20, 0, 0, 0);
+        break;
+    default:
+        r = QWindowsStyle::subElementRect(element, option, widget);
+        break;
+    }
+
+    if (qobject_cast<const QRadioButton*>(widget))
+        r = r.adjusted(5, 0, -5, 0);
+
+    return r;
+}
diff --git a/demos/shared/arthurstyle.h b/demos/shared/arthurstyle.h
new file mode 100644
index 0000000000..ec7936176e
--- /dev/null
+++ b/demos/shared/arthurstyle.h
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ARTHURSTYLE_H
+#define ARTHURSTYLE_H
+
+#include <QWindowsStyle>
+
+QT_USE_NAMESPACE
+
+class ArthurStyle : public QWindowsStyle
+{
+public:
+    ArthurStyle();
+
+    void drawHoverRect(QPainter *painter, const QRect &rect) const;
+
+    void drawPrimitive(PrimitiveElement element, const QStyleOption *option,
+                       QPainter *painter, const QWidget *widget = 0) const;
+//     void drawControl(ControlElement element, const QStyleOption *option,
+//                      QPainter *painter, const QWidget *widget) const;
+    void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option,
+                            QPainter *painter, const QWidget *widget) const;
+    QSize sizeFromContents(ContentsType type, const QStyleOption *option,
+                           const QSize &size, const QWidget *widget) const;
+
+    QRect subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const;
+    QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
+                         SubControl sc, const QWidget *widget) const;
+
+//     SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option,
+// 				     const QPoint &pos, const QWidget *widget = 0) const;
+
+    int pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const;
+
+    void polish(QPalette &palette);
+    void polish(QWidget *widget);
+    void unpolish(QWidget *widget);
+};
+
+#endif
diff --git a/demos/shared/arthurwidgets.cpp b/demos/shared/arthurwidgets.cpp
new file mode 100644
index 0000000000..f9eed99494
--- /dev/null
+++ b/demos/shared/arthurwidgets.cpp
@@ -0,0 +1,371 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "arthurwidgets.h"
+#include <QApplication>
+#include <QPainter>
+#include <QPainterPath>
+#include <QPixmapCache>
+#include <QtEvents>
+#include <QTextDocument>
+#include <QAbstractTextDocumentLayout>
+#include <QFile>
+#include <QTextBrowser>
+#include <QBoxLayout>
+
+#include <private/qpixmapdata_p.h>
+
+extern QPixmap cached(const QString &img);
+
+ArthurFrame::ArthurFrame(QWidget *parent)
+    : QWidget(parent)
+    , m_prefer_image(false)
+{
+#ifdef QT_OPENGL_SUPPORT
+    glw = 0;
+    m_use_opengl = false;
+    QGLFormat f = QGLFormat::defaultFormat();
+    f.setSampleBuffers(true);
+    f.setStencil(true);
+    f.setAlpha(true);
+    f.setAlphaBufferSize(8);
+    QGLFormat::setDefaultFormat(f);
+#endif
+    m_document = 0;
+    m_show_doc = false;
+
+    m_tile = QPixmap(128, 128);
+    m_tile.fill(Qt::white);
+    QPainter pt(&m_tile);
+    QColor color(230, 230, 230);
+    pt.fillRect(0, 0, 64, 64, color);
+    pt.fillRect(64, 64, 64, 64, color);
+    pt.end();
+
+//     QPalette pal = palette();
+//     pal.setBrush(backgroundRole(), m_tile);
+//     setPalette(pal);
+
+#ifdef Q_WS_X11
+    QPixmap xRenderPixmap(1, 1);
+    m_prefer_image = xRenderPixmap.pixmapData()->classId() == QPixmapData::X11Class && !xRenderPixmap.x11PictureHandle();
+#endif
+}
+
+
+#ifdef QT_OPENGL_SUPPORT
+void ArthurFrame::enableOpenGL(bool use_opengl)
+{
+    m_use_opengl = use_opengl;
+
+    if (!glw) {
+        glw = new GLWidget(this);
+        glw->setAutoFillBackground(false);
+        glw->disableAutoBufferSwap();
+        QApplication::postEvent(this, new QResizeEvent(size(), size()));
+    }
+
+    if (use_opengl) {
+        glw->show();
+    } else {
+        glw->hide();
+    }
+
+    update();
+}
+#endif
+
+void ArthurFrame::paintEvent(QPaintEvent *e)
+{
+#ifdef Q_WS_QWS
+    static QPixmap *static_image = 0;
+#else
+    static QImage *static_image = 0;
+#endif
+    QPainter painter;
+    if (preferImage()
+#ifdef QT_OPENGL_SUPPORT
+        && !m_use_opengl
+#endif
+        ) {
+        if (!static_image || static_image->size() != size()) {
+            delete static_image;
+#ifdef Q_WS_QWS
+            static_image = new QPixmap(size());
+#else
+            static_image = new QImage(size(), QImage::Format_RGB32);
+#endif
+        }
+        painter.begin(static_image);
+
+        int o = 10;
+
+        QBrush bg = palette().brush(QPalette::Background);
+        painter.fillRect(0, 0, o, o, bg);
+        painter.fillRect(width() - o, 0, o, o, bg);
+        painter.fillRect(0, height() - o, o, o, bg);
+        painter.fillRect(width() - o, height() - o, o, o, bg);
+    } else {
+#ifdef QT_OPENGL_SUPPORT
+        if (m_use_opengl) {
+            painter.begin(glw);
+            painter.fillRect(QRectF(0, 0, glw->width(), glw->height()), palette().color(backgroundRole()));
+        } else {
+            painter.begin(this);
+        }
+#else
+        painter.begin(this);
+#endif
+    }
+
+    painter.setClipRect(e->rect());
+
+    painter.setRenderHint(QPainter::Antialiasing);
+
+    QPainterPath clipPath;
+
+    QRect r = rect();
+    qreal left = r.x() + 1;
+    qreal top = r.y() + 1;
+    qreal right = r.right();
+    qreal bottom = r.bottom();
+    qreal radius2 = 8 * 2;
+
+    clipPath.moveTo(right - radius2, top);
+    clipPath.arcTo(right - radius2, top, radius2, radius2, 90, -90);
+    clipPath.arcTo(right - radius2, bottom - radius2, radius2, radius2, 0, -90);
+    clipPath.arcTo(left, bottom - radius2, radius2, radius2, 270, -90);
+    clipPath.arcTo(left, top, radius2, radius2, 180, -90);
+    clipPath.closeSubpath();
+
+    painter.save();
+    painter.setClipPath(clipPath, Qt::IntersectClip);
+
+    painter.drawTiledPixmap(rect(), m_tile);
+
+    // client painting
+
+    paint(&painter);
+
+    painter.restore();
+
+    painter.save();
+    if (m_show_doc)
+        paintDescription(&painter);
+    painter.restore();
+
+    int level = 180;
+    painter.setPen(QPen(QColor(level, level, level), 2));
+    painter.setBrush(Qt::NoBrush);
+    painter.drawPath(clipPath);
+
+    if (preferImage()
+#ifdef QT_OPENGL_SUPPORT
+        && !m_use_opengl
+#endif
+        ) {
+        painter.end();
+        painter.begin(this);
+#ifdef Q_WS_QWS
+        painter.drawPixmap(e->rect(), *static_image, e->rect());
+#else
+        painter.drawImage(e->rect(), *static_image, e->rect());
+#endif
+    }
+
+#ifdef QT_OPENGL_SUPPORT
+    if (m_use_opengl && (inherits("PathDeformRenderer") || inherits("PathStrokeRenderer") || inherits("CompositionRenderer") || m_show_doc))
+        glw->swapBuffers();
+#endif
+}
+
+void ArthurFrame::resizeEvent(QResizeEvent *e)
+{
+#ifdef QT_OPENGL_SUPPORT
+    if (glw)
+        glw->setGeometry(0, 0, e->size().width()-1, e->size().height()-1);
+#endif
+    QWidget::resizeEvent(e);
+}
+
+void ArthurFrame::setDescriptionEnabled(bool enabled)
+{
+    if (m_show_doc != enabled) {
+        m_show_doc = enabled;
+        emit descriptionEnabledChanged(m_show_doc);
+        update();
+    }
+}
+
+void ArthurFrame::loadDescription(const QString &fileName)
+{
+    QFile textFile(fileName);
+    QString text;
+    if (!textFile.open(QFile::ReadOnly))
+        text = QString("Unable to load resource file: '%1'").arg(fileName);
+    else
+        text = textFile.readAll();
+    setDescription(text);
+}
+
+
+void ArthurFrame::setDescription(const QString &text)
+{
+    m_document = new QTextDocument(this);
+    m_document->setHtml(text);
+}
+
+void ArthurFrame::paintDescription(QPainter *painter)
+{
+    if (!m_document)
+        return;
+
+    int pageWidth = qMax(width() - 100, 100);
+    int pageHeight = qMax(height() - 100, 100);
+    if (pageWidth != m_document->pageSize().width()) {
+        m_document->setPageSize(QSize(pageWidth, pageHeight));
+    }
+
+    QRect textRect(width() / 2 - pageWidth / 2,
+                   height() / 2 - pageHeight / 2,
+                   pageWidth,
+                   pageHeight);
+    int pad = 10;
+    QRect clearRect = textRect.adjusted(-pad, -pad, pad, pad);
+    painter->setPen(Qt::NoPen);
+    painter->setBrush(QColor(0, 0, 0, 63));
+    int shade = 10;
+    painter->drawRect(clearRect.x() + clearRect.width() + 1,
+                      clearRect.y() + shade,
+                      shade,
+                      clearRect.height() + 1);
+    painter->drawRect(clearRect.x() + shade,
+                      clearRect.y() + clearRect.height() + 1,
+                      clearRect.width() - shade + 1,
+                      shade);
+
+    painter->setRenderHint(QPainter::Antialiasing, false);
+    painter->setBrush(QColor(255, 255, 255, 220));
+    painter->setPen(Qt::black);
+    painter->drawRect(clearRect);
+
+    painter->setClipRegion(textRect, Qt::IntersectClip);
+    painter->translate(textRect.topLeft());
+
+    QAbstractTextDocumentLayout::PaintContext ctx;
+
+    QLinearGradient g(0, 0, 0, textRect.height());
+    g.setColorAt(0, Qt::black);
+    g.setColorAt(0.9, Qt::black);
+    g.setColorAt(1, Qt::transparent);
+
+    QPalette pal = palette();
+    pal.setBrush(QPalette::Text, g);
+
+    ctx.palette = pal;
+    ctx.clip = QRect(0, 0, textRect.width(), textRect.height());
+    m_document->documentLayout()->draw(painter, ctx);
+}
+
+void ArthurFrame::loadSourceFile(const QString &sourceFile)
+{
+    m_sourceFileName = sourceFile;
+}
+
+void ArthurFrame::showSource()
+{
+    // Check for existing source
+    if (qFindChild<QTextBrowser *>(this))
+        return;
+
+    QString contents;
+    if (m_sourceFileName.isEmpty()) {
+        contents = QString("No source for widget: '%1'").arg(objectName());
+    } else {
+        QFile f(m_sourceFileName);
+        if (!f.open(QFile::ReadOnly))
+            contents = QString("Could not open file: '%1'").arg(m_sourceFileName);
+        else
+            contents = f.readAll();
+    }
+
+    contents.replace('&', "&amp;");
+    contents.replace('<', "&lt;");
+    contents.replace('>', "&gt;");
+
+    QStringList keywords;
+    keywords << "for " << "if " << "switch " << " int " << "#include " << "const"
+             << "void " << "uint " << "case " << "double " << "#define " << "static"
+             << "new" << "this";
+
+    foreach (QString keyword, keywords)
+        contents.replace(keyword, QLatin1String("<font color=olive>") + keyword + QLatin1String("</font>"));
+    contents.replace("(int ", "(<font color=olive><b>int </b></font>");
+
+    QStringList ppKeywords;
+    ppKeywords << "#ifdef" << "#ifndef" << "#if" << "#endif" << "#else";
+
+    foreach (QString keyword, ppKeywords)
+        contents.replace(keyword, QLatin1String("<font color=navy>") + keyword + QLatin1String("</font>"));
+
+    contents.replace(QRegExp("(\\d\\d?)"), QLatin1String("<font color=navy>\\1</font>"));
+
+    QRegExp commentRe("(//.+)\\n");
+    commentRe.setMinimal(true);
+    contents.replace(commentRe, QLatin1String("<font color=red>\\1</font>\n"));
+
+    QRegExp stringLiteralRe("(\".+\")");
+    stringLiteralRe.setMinimal(true);
+    contents.replace(stringLiteralRe, QLatin1String("<font color=green>\\1</font>"));
+
+    QString html = contents;
+    html.prepend("<html><pre>");
+    html.append("</pre></html>");
+
+    QTextBrowser *sourceViewer = new QTextBrowser(0);
+    sourceViewer->setWindowTitle("Source: " + m_sourceFileName.mid(5));
+    sourceViewer->setParent(this, Qt::Dialog);
+    sourceViewer->setAttribute(Qt::WA_DeleteOnClose);
+    sourceViewer->setLineWrapMode(QTextEdit::NoWrap);
+    sourceViewer->setHtml(html);
+    sourceViewer->resize(600, 600);
+    sourceViewer->show();
+}
diff --git a/demos/shared/arthurwidgets.h b/demos/shared/arthurwidgets.h
new file mode 100644
index 0000000000..4d55b61de6
--- /dev/null
+++ b/demos/shared/arthurwidgets.h
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ARTHURWIDGETS_H
+#define ARTHURWIDGETS_H
+
+#include "arthurstyle.h"
+#include <QBitmap>
+#include <QPushButton>
+#include <QGroupBox>
+
+#if defined(QT_OPENGL_SUPPORT)
+#include <QGLWidget>
+class GLWidget : public QGLWidget
+{
+public:
+    GLWidget(QWidget *parent)
+        : QGLWidget(QGLFormat(QGL::SampleBuffers), parent) {}
+    void disableAutoBufferSwap() { setAutoBufferSwap(false); }
+    void paintEvent(QPaintEvent *) { parentWidget()->update(); }
+};
+#endif
+
+QT_FORWARD_DECLARE_CLASS(QTextDocument)
+QT_FORWARD_DECLARE_CLASS(QTextEdit)
+QT_FORWARD_DECLARE_CLASS(QVBoxLayout)
+
+class ArthurFrame : public QWidget
+{
+    Q_OBJECT
+public:
+    ArthurFrame(QWidget *parent);
+    virtual void paint(QPainter *) {}
+
+
+    void paintDescription(QPainter *p);
+
+    void loadDescription(const QString &filename);
+    void setDescription(const QString &htmlDesc);
+
+    void loadSourceFile(const QString &fileName);
+
+    bool preferImage() const { return m_prefer_image; }
+
+#if defined(QT_OPENGL_SUPPORT)
+    QGLWidget *glWidget() const { return glw; }
+#endif
+
+public slots:
+    void setPreferImage(bool pi) { m_prefer_image = pi; }
+    void setDescriptionEnabled(bool enabled);
+    void showSource();
+
+#if defined(QT_OPENGL_SUPPORT)
+    void enableOpenGL(bool use_opengl);
+    bool usesOpenGL() { return m_use_opengl; }
+#endif
+
+signals:
+    void descriptionEnabledChanged(bool);
+
+protected:
+    void paintEvent(QPaintEvent *);
+    void resizeEvent(QResizeEvent *);
+
+#if defined(QT_OPENGL_SUPPORT)
+    GLWidget *glw;
+    bool m_use_opengl;
+#endif
+    QPixmap m_tile;
+
+    bool m_show_doc;
+    bool m_prefer_image;
+    QTextDocument *m_document;
+
+    QString m_sourceFileName;
+
+};
+
+#endif
diff --git a/demos/shared/hoverpoints.cpp b/demos/shared/hoverpoints.cpp
new file mode 100644
index 0000000000..70062f6acf
--- /dev/null
+++ b/demos/shared/hoverpoints.cpp
@@ -0,0 +1,333 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifdef QT_OPENGL_SUPPORT
+#include <QGLWidget>
+#endif
+
+#include "arthurwidgets.h"
+#include "hoverpoints.h"
+
+#define printf
+
+HoverPoints::HoverPoints(QWidget *widget, PointShape shape)
+    : QObject(widget)
+{
+    m_widget = widget;
+    widget->installEventFilter(this);
+
+    m_connectionType = CurveConnection;
+    m_sortType = NoSort;
+    m_shape = shape;
+    m_pointPen = QPen(QColor(255, 255, 255, 191), 1);
+    m_connectionPen = QPen(QColor(255, 255, 255, 127), 2);
+    m_pointBrush = QBrush(QColor(191, 191, 191, 127));
+    m_pointSize = QSize(11, 11);
+    m_currentIndex = -1;
+    m_editable = true;
+    m_enabled = true;
+
+    connect(this, SIGNAL(pointsChanged(const QPolygonF &)),
+            m_widget, SLOT(update()));
+}
+
+
+void HoverPoints::setEnabled(bool enabled)
+{
+    if (m_enabled != enabled) {
+        m_enabled = enabled;
+        m_widget->update();
+    }
+}
+
+
+bool HoverPoints::eventFilter(QObject *object, QEvent *event)
+{
+    if (object == m_widget && m_enabled) {
+        switch (event->type()) {
+
+        case QEvent::MouseButtonPress:
+        {
+            QMouseEvent *me = (QMouseEvent *) event;
+
+            QPointF clickPos = me->pos();
+            int index = -1;
+            for (int i=0; i<m_points.size(); ++i) {
+                QPainterPath path;
+                if (m_shape == CircleShape)
+                    path.addEllipse(pointBoundingRect(i));
+                else
+                    path.addRect(pointBoundingRect(i));
+
+                if (path.contains(clickPos)) {
+                    index = i;
+                    break;
+                }
+            }
+
+            if (me->button() == Qt::LeftButton) {
+                if (index == -1) {
+                    if (!m_editable)
+                        return false;
+                    int pos = 0;
+                    // Insert sort for x or y
+                    if (m_sortType == XSort) {
+                        for (int i=0; i<m_points.size(); ++i)
+                            if (m_points.at(i).x() > clickPos.x()) {
+                                pos = i;
+                                break;
+                            }
+                    } else if (m_sortType == YSort) {
+                        for (int i=0; i<m_points.size(); ++i)
+                            if (m_points.at(i).y() > clickPos.y()) {
+                                pos = i;
+                                break;
+                            }
+                    }
+
+                    m_points.insert(pos, clickPos);
+                    m_locks.insert(pos, 0);
+                    m_currentIndex = pos;
+                    firePointChange();
+                } else {
+                    m_currentIndex = index;
+                }
+                return true;
+
+            } else if (me->button() == Qt::RightButton) {
+                if (index >= 0 && m_editable) {
+                    if (m_locks[index] == 0) {
+                        m_locks.remove(index);
+                        m_points.remove(index);
+                    }
+                    firePointChange();
+                    return true;
+                }
+            }
+
+        }
+        break;
+
+        case QEvent::MouseButtonRelease:
+            m_currentIndex = -1;
+            break;
+
+        case QEvent::MouseMove:
+            if (m_currentIndex >= 0)
+                movePoint(m_currentIndex, ((QMouseEvent *)event)->pos());
+            break;
+
+        case QEvent::Resize:
+        {
+            QResizeEvent *e = (QResizeEvent *) event;
+            if (e->oldSize().width() == 0 || e->oldSize().height() == 0)
+                break;
+            qreal stretch_x = e->size().width() / qreal(e->oldSize().width());
+            qreal stretch_y = e->size().height() / qreal(e->oldSize().height());
+            for (int i=0; i<m_points.size(); ++i) {
+                QPointF p = m_points[i];
+                movePoint(i, QPointF(p.x() * stretch_x, p.y() * stretch_y), false);
+            }
+
+            firePointChange();
+            break;
+        }
+
+        case QEvent::Paint:
+        {
+            QWidget *that_widget = m_widget;
+            m_widget = 0;
+            QApplication::sendEvent(object, event);
+            m_widget = that_widget;
+            paintPoints();
+#ifdef QT_OPENGL_SUPPORT
+            ArthurFrame *af = qobject_cast<ArthurFrame *>(that_widget);
+            if (af && af->usesOpenGL())
+                af->glWidget()->swapBuffers();
+#endif
+            return true;
+        }
+        default:
+            break;
+        }
+    }
+
+    return false;
+}
+
+
+void HoverPoints::paintPoints()
+{
+    QPainter p;
+#ifdef QT_OPENGL_SUPPORT
+    ArthurFrame *af = qobject_cast<ArthurFrame *>(m_widget);
+    if (af && af->usesOpenGL())
+        p.begin(af->glWidget());
+    else
+        p.begin(m_widget);
+#else
+    p.begin(m_widget);
+#endif
+
+    p.setRenderHint(QPainter::Antialiasing);
+
+    if (m_connectionPen.style() != Qt::NoPen && m_connectionType != NoConnection) {
+        p.setPen(m_connectionPen);
+
+        if (m_connectionType == CurveConnection) {
+            QPainterPath path;
+            path.moveTo(m_points.at(0));
+            for (int i=1; i<m_points.size(); ++i) {
+                QPointF p1 = m_points.at(i-1);
+                QPointF p2 = m_points.at(i);
+                qreal distance = p2.x() - p1.x();
+
+                path.cubicTo(p1.x() + distance / 2, p1.y(),
+                             p1.x() + distance / 2, p2.y(),
+                             p2.x(), p2.y());
+            }
+            p.drawPath(path);
+        } else {
+            p.drawPolyline(m_points);
+        }
+    }
+
+    p.setPen(m_pointPen);
+    p.setBrush(m_pointBrush);
+
+    for (int i=0; i<m_points.size(); ++i) {
+        QRectF bounds = pointBoundingRect(i);
+        if (m_shape == CircleShape)
+            p.drawEllipse(bounds);
+        else
+            p.drawRect(bounds);
+    }
+}
+
+static QPointF bound_point(const QPointF &point, const QRectF &bounds, int lock)
+{
+    QPointF p = point;
+
+    qreal left = bounds.left();
+    qreal right = bounds.right();
+    qreal top = bounds.top();
+    qreal bottom = bounds.bottom();
+
+    if (p.x() < left || (lock & HoverPoints::LockToLeft)) p.setX(left);
+    else if (p.x() > right || (lock & HoverPoints::LockToRight)) p.setX(right);
+
+    if (p.y() < top || (lock & HoverPoints::LockToTop)) p.setY(top);
+    else if (p.y() > bottom || (lock & HoverPoints::LockToBottom)) p.setY(bottom);
+
+    return p;
+}
+
+void HoverPoints::setPoints(const QPolygonF &points)
+{
+    m_points.clear();
+    for (int i=0; i<points.size(); ++i)
+        m_points << bound_point(points.at(i), boundingRect(), 0);
+
+    m_locks.clear();
+    if (m_points.size() > 0) {
+        m_locks.resize(m_points.size());
+
+        m_locks.fill(0);
+    }
+}
+
+
+void HoverPoints::movePoint(int index, const QPointF &point, bool emitUpdate)
+{
+    m_points[index] = bound_point(point, boundingRect(), m_locks.at(index));
+    if (emitUpdate)
+        firePointChange();
+}
+
+
+inline static bool x_less_than(const QPointF &p1, const QPointF &p2)
+{
+    return p1.x() < p2.x();
+}
+
+
+inline static bool y_less_than(const QPointF &p1, const QPointF &p2)
+{
+    return p1.y() < p2.y();
+}
+
+void HoverPoints::firePointChange()
+{
+//    printf("HoverPoints::firePointChange(), current=%d\n", m_currentIndex);
+
+    if (m_sortType != NoSort) {
+
+        QPointF oldCurrent;
+        if (m_currentIndex != -1) {
+            oldCurrent = m_points[m_currentIndex];
+        }
+
+        if (m_sortType == XSort)
+            qSort(m_points.begin(), m_points.end(), x_less_than);
+        else if (m_sortType == YSort)
+            qSort(m_points.begin(), m_points.end(), y_less_than);
+
+        // Compensate for changed order...
+        if (m_currentIndex != -1) {
+            for (int i=0; i<m_points.size(); ++i) {
+                if (m_points[i] == oldCurrent) {
+                    m_currentIndex = i;
+                    break;
+                }
+            }
+        }
+
+//         printf(" - firePointChange(), current=%d\n", m_currentIndex);
+
+    }
+
+//     for (int i=0; i<m_points.size(); ++i) {
+//         printf(" - point(%2d)=[%.2f, %.2f], lock=%d\n",
+//                i, m_points.at(i).x(), m_points.at(i).y(), m_locks.at(i));
+//     }
+
+    emit pointsChanged(m_points);
+}
diff --git a/demos/shared/hoverpoints.h b/demos/shared/hoverpoints.h
new file mode 100644
index 0000000000..cf8742dbe5
--- /dev/null
+++ b/demos/shared/hoverpoints.h
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef HOVERPOINTS_H
+#define HOVERPOINTS_H
+
+#include <QtGui>
+
+QT_FORWARD_DECLARE_CLASS(QBypassWidget)
+
+class HoverPoints : public QObject
+{
+    Q_OBJECT
+public:
+    enum PointShape {
+        CircleShape,
+        RectangleShape
+    };
+
+    enum LockType {
+        LockToLeft   = 0x01,
+        LockToRight  = 0x02,
+        LockToTop    = 0x04,
+        LockToBottom = 0x08
+    };
+
+    enum SortType {
+        NoSort,
+        XSort,
+        YSort
+    };
+
+    enum ConnectionType {
+        NoConnection,
+        LineConnection,
+        CurveConnection
+    };
+
+    HoverPoints(QWidget *widget, PointShape shape);
+
+    bool eventFilter(QObject *object, QEvent *event);
+
+    void paintPoints();
+
+    inline QRectF boundingRect() const;
+    void setBoundingRect(const QRectF &boundingRect) { m_bounds = boundingRect; }
+
+    QPolygonF points() const { return m_points; }
+    void setPoints(const QPolygonF &points);
+
+    QSizeF pointSize() const { return m_pointSize; }
+    void setPointSize(const QSizeF &size) { m_pointSize = size; }
+
+    SortType sortType() const { return m_sortType; }
+    void setSortType(SortType sortType) { m_sortType = sortType; }
+
+    ConnectionType connectionType() const { return m_connectionType; }
+    void setConnectionType(ConnectionType connectionType) { m_connectionType = connectionType; }
+
+    void setConnectionPen(const QPen &pen) { m_connectionPen = pen; }
+    void setShapePen(const QPen &pen) { m_pointPen = pen; }
+    void setShapeBrush(const QBrush &brush) { m_pointBrush = brush; }
+
+    void setPointLock(int pos, LockType lock) { m_locks[pos] = lock; }
+
+    void setEditable(bool editable) { m_editable = editable; }
+    bool editable() const { return m_editable; }
+
+public slots:
+    void setEnabled(bool enabled);
+    void setDisabled(bool disabled) { setEnabled(!disabled); }
+
+signals:
+    void pointsChanged(const QPolygonF &points);
+
+public:
+    void firePointChange();
+
+private:
+    inline QRectF pointBoundingRect(int i) const;
+    void movePoint(int i, const QPointF &newPos, bool emitChange = true);
+
+    QWidget *m_widget;
+
+    QPolygonF m_points;
+    QRectF m_bounds;
+    PointShape m_shape;
+    SortType m_sortType;
+    ConnectionType m_connectionType;
+
+    QVector<uint> m_locks;
+
+    QSizeF m_pointSize;
+    int m_currentIndex;
+    bool m_editable;
+    bool m_enabled;
+
+    QPen m_pointPen;
+    QBrush m_pointBrush;
+    QPen m_connectionPen;
+};
+
+
+inline QRectF HoverPoints::pointBoundingRect(int i) const
+{
+    QPointF p = m_points.at(i);
+    qreal w = m_pointSize.width();
+    qreal h = m_pointSize.height();
+    qreal x = p.x() - w / 2;
+    qreal y = p.y() - h / 2;
+    return QRectF(x, y, w, h);
+}
+
+inline QRectF HoverPoints::boundingRect() const
+{
+    if (m_bounds.isEmpty())
+        return m_widget->rect();
+    else
+        return m_bounds;
+}
+
+#endif // HOVERPOINTS_H
diff --git a/demos/shared/images/bg_pattern.png b/demos/shared/images/bg_pattern.png
new file mode 100644
index 0000000000..ee670266f0
--- /dev/null
+++ b/demos/shared/images/bg_pattern.png
diff --git a/demos/shared/images/button_normal_cap_left.png b/demos/shared/images/button_normal_cap_left.png
new file mode 100644
index 0000000000..db31dd971d
--- /dev/null
+++ b/demos/shared/images/button_normal_cap_left.png
diff --git a/demos/shared/images/button_normal_cap_right.png b/demos/shared/images/button_normal_cap_right.png
new file mode 100644
index 0000000000..38ead1c719
--- /dev/null
+++ b/demos/shared/images/button_normal_cap_right.png
diff --git a/demos/shared/images/button_normal_stretch.png b/demos/shared/images/button_normal_stretch.png
new file mode 100644
index 0000000000..87abe67ac9
--- /dev/null
+++ b/demos/shared/images/button_normal_stretch.png
diff --git a/demos/shared/images/button_pressed_cap_left.png b/demos/shared/images/button_pressed_cap_left.png
new file mode 100644
index 0000000000..66bfc13cb4
--- /dev/null
+++ b/demos/shared/images/button_pressed_cap_left.png
diff --git a/demos/shared/images/button_pressed_cap_right.png b/demos/shared/images/button_pressed_cap_right.png
new file mode 100644
index 0000000000..3d4cfe25b1
--- /dev/null
+++ b/demos/shared/images/button_pressed_cap_right.png
diff --git a/demos/shared/images/button_pressed_stretch.png b/demos/shared/images/button_pressed_stretch.png
new file mode 100644
index 0000000000..4dd4ad11e6
--- /dev/null
+++ b/demos/shared/images/button_pressed_stretch.png
diff --git a/demos/shared/images/curve_thing_edit-6.png b/demos/shared/images/curve_thing_edit-6.png
new file mode 100644
index 0000000000..034b474d02
--- /dev/null
+++ b/demos/shared/images/curve_thing_edit-6.png
diff --git a/demos/shared/images/frame_bottom.png b/demos/shared/images/frame_bottom.png
new file mode 100644
index 0000000000..889b40d304
--- /dev/null
+++ b/demos/shared/images/frame_bottom.png
diff --git a/demos/shared/images/frame_bottomleft.png b/demos/shared/images/frame_bottomleft.png
new file mode 100644
index 0000000000..0b3023f397
--- /dev/null
+++ b/demos/shared/images/frame_bottomleft.png
diff --git a/demos/shared/images/frame_bottomright.png b/demos/shared/images/frame_bottomright.png
new file mode 100644
index 0000000000..0021e35864
--- /dev/null
+++ b/demos/shared/images/frame_bottomright.png
diff --git a/demos/shared/images/frame_left.png b/demos/shared/images/frame_left.png
new file mode 100644
index 0000000000..40f331c293
--- /dev/null
+++ b/demos/shared/images/frame_left.png
diff --git a/demos/shared/images/frame_right.png b/demos/shared/images/frame_right.png
new file mode 100644
index 0000000000..023af8c700
--- /dev/null
+++ b/demos/shared/images/frame_right.png
diff --git a/demos/shared/images/frame_top.png b/demos/shared/images/frame_top.png
new file mode 100644
index 0000000000..001f3a7144
--- /dev/null
+++ b/demos/shared/images/frame_top.png
diff --git a/demos/shared/images/frame_topleft.png b/demos/shared/images/frame_topleft.png
new file mode 100644
index 0000000000..58c68d407a
--- /dev/null
+++ b/demos/shared/images/frame_topleft.png
diff --git a/demos/shared/images/frame_topright.png b/demos/shared/images/frame_topright.png
new file mode 100644
index 0000000000..6a7e8d3eb3
--- /dev/null
+++ b/demos/shared/images/frame_topright.png
diff --git a/demos/shared/images/groupframe_bottom_left.png b/demos/shared/images/groupframe_bottom_left.png
new file mode 100644
index 0000000000..af2fe061e3
--- /dev/null
+++ b/demos/shared/images/groupframe_bottom_left.png
diff --git a/demos/shared/images/groupframe_bottom_right.png b/demos/shared/images/groupframe_bottom_right.png
new file mode 100644
index 0000000000..fdf2e97b13
--- /dev/null
+++ b/demos/shared/images/groupframe_bottom_right.png
diff --git a/demos/shared/images/groupframe_bottom_stretch.png b/demos/shared/images/groupframe_bottom_stretch.png
new file mode 100644
index 0000000000..f47b67d7c0
--- /dev/null
+++ b/demos/shared/images/groupframe_bottom_stretch.png
diff --git a/demos/shared/images/groupframe_left_stretch.png b/demos/shared/images/groupframe_left_stretch.png
new file mode 100644
index 0000000000..c122f462ed
--- /dev/null
+++ b/demos/shared/images/groupframe_left_stretch.png
diff --git a/demos/shared/images/groupframe_right_stretch.png b/demos/shared/images/groupframe_right_stretch.png
new file mode 100644
index 0000000000..1056b7812a
--- /dev/null
+++ b/demos/shared/images/groupframe_right_stretch.png
diff --git a/demos/shared/images/groupframe_top_stretch.png b/demos/shared/images/groupframe_top_stretch.png
new file mode 100644
index 0000000000..5746ef96fc
--- /dev/null
+++ b/demos/shared/images/groupframe_top_stretch.png
diff --git a/demos/shared/images/groupframe_topleft.png b/demos/shared/images/groupframe_topleft.png
new file mode 100644
index 0000000000..98d9cd96b4
--- /dev/null
+++ b/demos/shared/images/groupframe_topleft.png
diff --git a/demos/shared/images/groupframe_topright.png b/demos/shared/images/groupframe_topright.png
new file mode 100644
index 0000000000..1a0a328c20
--- /dev/null
+++ b/demos/shared/images/groupframe_topright.png
diff --git a/demos/shared/images/line_dash_dot.png b/demos/shared/images/line_dash_dot.png
new file mode 100644
index 0000000000..1c61442d9f
--- /dev/null
+++ b/demos/shared/images/line_dash_dot.png
diff --git a/demos/shared/images/line_dash_dot_dot.png b/demos/shared/images/line_dash_dot_dot.png
new file mode 100644
index 0000000000..0d9bb972f9
--- /dev/null
+++ b/demos/shared/images/line_dash_dot_dot.png
diff --git a/demos/shared/images/line_dashed.png b/demos/shared/images/line_dashed.png
new file mode 100644
index 0000000000..d5bc7ea5fe
--- /dev/null
+++ b/demos/shared/images/line_dashed.png
diff --git a/demos/shared/images/line_dotted.png b/demos/shared/images/line_dotted.png
new file mode 100644
index 0000000000..a2f9a35925
--- /dev/null
+++ b/demos/shared/images/line_dotted.png
diff --git a/demos/shared/images/line_solid.png b/demos/shared/images/line_solid.png
new file mode 100644
index 0000000000..60ef3f9485
--- /dev/null
+++ b/demos/shared/images/line_solid.png
diff --git a/demos/shared/images/radiobutton-off.png b/demos/shared/images/radiobutton-off.png
new file mode 100644
index 0000000000..af1753a3e7
--- /dev/null
+++ b/demos/shared/images/radiobutton-off.png
diff --git a/demos/shared/images/radiobutton-on.png b/demos/shared/images/radiobutton-on.png
new file mode 100644
index 0000000000..f875838bb5
--- /dev/null
+++ b/demos/shared/images/radiobutton-on.png
diff --git a/demos/shared/images/radiobutton_off.png b/demos/shared/images/radiobutton_off.png
new file mode 100644
index 0000000000..400906ebfa
--- /dev/null
+++ b/demos/shared/images/radiobutton_off.png
diff --git a/demos/shared/images/radiobutton_on.png b/demos/shared/images/radiobutton_on.png
new file mode 100644
index 0000000000..50a049ec56
--- /dev/null
+++ b/demos/shared/images/radiobutton_on.png
diff --git a/demos/shared/images/slider_bar.png b/demos/shared/images/slider_bar.png
new file mode 100644
index 0000000000..1b3d62c007
--- /dev/null
+++ b/demos/shared/images/slider_bar.png
diff --git a/demos/shared/images/slider_thumb_off.png b/demos/shared/images/slider_thumb_off.png
new file mode 100644
index 0000000000..d7f141daef
--- /dev/null
+++ b/demos/shared/images/slider_thumb_off.png
diff --git a/demos/shared/images/slider_thumb_on.png b/demos/shared/images/slider_thumb_on.png
new file mode 100644
index 0000000000..8e1f510813
--- /dev/null
+++ b/demos/shared/images/slider_thumb_on.png
diff --git a/demos/shared/images/title_cap_left.png b/demos/shared/images/title_cap_left.png
new file mode 100644
index 0000000000..2d475070c8
--- /dev/null
+++ b/demos/shared/images/title_cap_left.png
diff --git a/demos/shared/images/title_cap_right.png b/demos/shared/images/title_cap_right.png
new file mode 100644
index 0000000000..dc3ff8536c
--- /dev/null
+++ b/demos/shared/images/title_cap_right.png
diff --git a/demos/shared/images/title_stretch.png b/demos/shared/images/title_stretch.png
new file mode 100644
index 0000000000..11043345d0
--- /dev/null
+++ b/demos/shared/images/title_stretch.png
diff --git a/demos/shared/shared.pri b/demos/shared/shared.pri
new file mode 100644
index 0000000000..b5515950a0
--- /dev/null
+++ b/demos/shared/shared.pri
@@ -0,0 +1,20 @@
+INCLUDEPATH += $$SHARED_FOLDER
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+contains(CONFIG, debug_and_release_target) {    
+    CONFIG(debug, debug|release) { 
+	LIBS+=-L$$SHARED_FOLDER/debug
+    } else {
+	LIBS+=-L$$SHARED_FOLDER/release
+    }
+} else {
+    LIBS += -L$$SHARED_FOLDER
+}
+
+hpux-acc*:LIBS += $$SHARED_FOLDER/libdemo_shared.a
+hpuxi-acc*:LIBS += $$SHARED_FOLDER/libdemo_shared.a
+!hpuxi-acc*:!hpux-acc*:LIBS += -ldemo_shared
+
diff --git a/demos/shared/shared.pro b/demos/shared/shared.pro
new file mode 100644
index 0000000000..cabce25d1a
--- /dev/null
+++ b/demos/shared/shared.pro
@@ -0,0 +1,33 @@
+TEMPLATE = lib
+CONFIG += static
+
+contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) {
+	DEFINES += QT_OPENGL_SUPPORT
+	QT += opengl
+}
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+TARGET = demo_shared
+
+SOURCES += \
+	arthurstyle.cpp\
+	arthurwidgets.cpp \
+	hoverpoints.cpp
+
+HEADERS += \
+	arthurstyle.h \
+	arthurwidgets.h \
+	hoverpoints.h
+
+RESOURCES += shared.qrc
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/shared
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.pri images
+sources.path = $$[QT_INSTALL_DEMOS]/shared
+INSTALLS += sources
+!cross_compile:INSTALLS += target
+
diff --git a/demos/shared/shared.qrc b/demos/shared/shared.qrc
new file mode 100644
index 0000000000..17336ecf80
--- /dev/null
+++ b/demos/shared/shared.qrc
@@ -0,0 +1,39 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/res">
+   <file>images/button_normal_cap_left.png</file>
+   <file>images/button_normal_cap_right.png</file>
+   <file>images/button_normal_stretch.png</file>
+   <file>images/button_pressed_cap_left.png</file>
+   <file>images/button_pressed_cap_right.png</file>
+   <file>images/button_pressed_stretch.png</file>
+   <file>images/radiobutton-on.png</file>
+   <file>images/radiobutton_on.png</file>
+   <file>images/radiobutton_off.png</file>
+   <file>images/slider_bar.png</file>
+   <file>images/slider_thumb_on.png</file>
+   <file>images/groupframe_topleft.png</file>
+   <file>images/groupframe_topright.png</file>
+   <file>images/groupframe_bottom_left.png</file>
+   <file>images/groupframe_bottom_right.png</file>
+   <file>images/groupframe_top_stretch.png</file>
+   <file>images/groupframe_bottom_stretch.png</file>
+   <file>images/groupframe_left_stretch.png</file>
+   <file>images/groupframe_right_stretch.png</file>
+   <file>images/frame_topleft.png</file>
+   <file>images/frame_topright.png</file>
+   <file>images/frame_bottomleft.png</file>
+   <file>images/frame_bottomright.png</file>
+   <file>images/frame_left.png</file>
+   <file>images/frame_top.png</file>
+   <file>images/frame_right.png</file>
+   <file>images/frame_bottom.png</file>
+   <file>images/title_cap_left.png</file>
+   <file>images/title_cap_right.png</file>
+   <file>images/title_stretch.png</file>
+   <file>images/line_dash_dot.png</file>
+   <file>images/line_dotted.png</file>
+   <file>images/line_dashed.png</file>
+   <file>images/line_solid.png</file>
+   <file>images/line_dash_dot_dot.png</file>
+</qresource>
+</RCC>
diff --git a/demos/spreadsheet/images/interview.png b/demos/spreadsheet/images/interview.png
new file mode 100644
index 0000000000..0c3d690258
--- /dev/null
+++ b/demos/spreadsheet/images/interview.png
diff --git a/demos/spreadsheet/main.cpp b/demos/spreadsheet/main.cpp
new file mode 100644
index 0000000000..7a71641854
--- /dev/null
+++ b/demos/spreadsheet/main.cpp
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include "spreadsheet.h"
+
+int main(int argc, char** argv) {
+    Q_INIT_RESOURCE(spreadsheet);
+    QApplication app(argc, argv);
+    SpreadSheet sheet(10, 6);
+    sheet.setWindowIcon(QPixmap(":/images/interview.png"));
+    sheet.resize(640, 420);
+    sheet.show();
+    return app.exec();
+}
+
+
diff --git a/demos/spreadsheet/printview.cpp b/demos/spreadsheet/printview.cpp
new file mode 100644
index 0000000000..76c4ae8bcd
--- /dev/null
+++ b/demos/spreadsheet/printview.cpp
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "printview.h"
+#include <QPrinter>
+#include <QStyleOptionViewItem>
+
+PrintView::PrintView()
+{
+    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+}
+
+void PrintView::print(QPrinter *printer)
+{
+#ifndef QT_NO_PRINTER
+    resize(printer->width(), printer->height());
+    render(printer);
+#endif
+}
+
diff --git a/demos/spreadsheet/printview.h b/demos/spreadsheet/printview.h
new file mode 100644
index 0000000000..3f2b91856c
--- /dev/null
+++ b/demos/spreadsheet/printview.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PRINTVIEW_H
+#define PRINTVIEW_H
+
+#include <QTableView>
+
+class PrintView : public QTableView
+{
+    Q_OBJECT
+
+public:
+    PrintView();
+
+public Q_SLOTS:
+    void print(QPrinter *printer);
+};
+
+#endif // PRINTVIEW_H
+
+
diff --git a/demos/spreadsheet/spreadsheet.cpp b/demos/spreadsheet/spreadsheet.cpp
new file mode 100644
index 0000000000..742855e379
--- /dev/null
+++ b/demos/spreadsheet/spreadsheet.cpp
@@ -0,0 +1,631 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "spreadsheet.h"
+#include "spreadsheetdelegate.h"
+#include "spreadsheetitem.h"
+#include "printview.h"
+
+SpreadSheet::SpreadSheet(int rows, int cols, QWidget *parent)
+        : QMainWindow(parent)
+{
+    addToolBar(toolBar = new QToolBar());
+    formulaInput = new QLineEdit();
+
+    cellLabel = new QLabel(toolBar);
+    cellLabel->setMinimumSize(80, 0);
+
+    toolBar->addWidget(cellLabel);
+    toolBar->addWidget(formulaInput);
+
+    table = new QTableWidget(rows, cols, this);
+    for (int c = 0; c < cols; ++c) {
+        QString character(QChar('A' + c));
+        table->setHorizontalHeaderItem(c, new QTableWidgetItem(character));
+    }
+
+    table->setItemPrototype(table->item(rows -1, cols - 1));
+    table->setItemDelegate(new SpreadSheetDelegate());
+
+    createActions();
+    updateColor(0);
+    setupMenuBar();
+    setupContents();
+    setCentralWidget(table);
+
+    statusBar();
+    connect(table, SIGNAL(currentItemChanged(QTableWidgetItem*, QTableWidgetItem*)),
+            this, SLOT(updateStatus(QTableWidgetItem*)));
+    connect(table, SIGNAL(currentItemChanged(QTableWidgetItem*, QTableWidgetItem*)),
+            this, SLOT(updateColor(QTableWidgetItem*)));
+    connect(table, SIGNAL(currentItemChanged(QTableWidgetItem*,QTableWidgetItem*)),
+            this, SLOT(updateLineEdit(QTableWidgetItem*)));
+    connect(table, SIGNAL(itemChanged(QTableWidgetItem*)),
+            this, SLOT(updateStatus(QTableWidgetItem*)));
+    connect(formulaInput, SIGNAL(returnPressed()), this, SLOT(returnPressed()));
+    connect(table, SIGNAL(itemChanged(QTableWidgetItem*)),
+            this, SLOT(updateLineEdit(QTableWidgetItem*)));
+
+    setWindowTitle(tr("Spreadsheet"));
+}
+
+void SpreadSheet::createActions()
+{
+    cell_sumAction = new QAction(tr("Sum"), this);
+    connect(cell_sumAction, SIGNAL(triggered()), this, SLOT(actionSum()));
+
+    cell_addAction = new QAction(tr("&Add"), this);
+    cell_addAction->setShortcut(Qt::CTRL | Qt::Key_Plus);
+    connect(cell_addAction, SIGNAL(triggered()), this, SLOT(actionAdd()));
+
+    cell_subAction = new QAction(tr("&Subtract"), this);
+    cell_subAction->setShortcut(Qt::CTRL | Qt::Key_Minus);
+    connect(cell_subAction, SIGNAL(triggered()), this, SLOT(actionSubtract()));
+
+    cell_mulAction = new QAction(tr("&Multiply"), this);
+    cell_mulAction->setShortcut(Qt::CTRL | Qt::Key_multiply);
+    connect(cell_mulAction, SIGNAL(triggered()), this, SLOT(actionMultiply()));
+
+    cell_divAction = new QAction(tr("&Divide"), this);
+    cell_divAction->setShortcut(Qt::CTRL | Qt::Key_division);
+    connect(cell_divAction, SIGNAL(triggered()), this, SLOT(actionDivide()));
+
+    fontAction = new QAction(tr("Font..."), this);
+    fontAction->setShortcut(Qt::CTRL | Qt::Key_F);
+    connect(fontAction, SIGNAL(triggered()), this, SLOT(selectFont()));
+
+    colorAction = new QAction(QPixmap(16, 16), tr("Background &Color..."), this);
+    connect(colorAction, SIGNAL(triggered()), this, SLOT(selectColor()));
+
+    clearAction = new QAction(tr("Clear"), this);
+    clearAction->setShortcut(Qt::Key_Delete);
+    connect(clearAction, SIGNAL(triggered()), this, SLOT(clear()));
+
+    aboutSpreadSheet = new QAction(tr("About Spreadsheet"), this);
+    connect(aboutSpreadSheet, SIGNAL(triggered()), this, SLOT(showAbout()));
+
+    exitAction = new QAction(tr("E&xit"), this);
+    connect(exitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+
+    printAction = new QAction(tr("&Print"), this);
+    connect(printAction, SIGNAL(triggered()), this, SLOT(print()));
+
+    firstSeparator = new QAction(this);
+    firstSeparator->setSeparator(true);
+
+    secondSeparator = new QAction(this);
+    secondSeparator->setSeparator(true);
+}
+
+void SpreadSheet::setupMenuBar()
+{
+    QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
+    fileMenu->addAction(printAction);
+    fileMenu->addAction(exitAction);
+
+    QMenu *cellMenu = menuBar()->addMenu(tr("&Cell"));
+    cellMenu->addAction(cell_addAction);
+    cellMenu->addAction(cell_subAction);
+    cellMenu->addAction(cell_mulAction);
+    cellMenu->addAction(cell_divAction);
+    cellMenu->addAction(cell_sumAction);
+    cellMenu->addSeparator();
+    cellMenu->addAction(colorAction);
+    cellMenu->addAction(fontAction);
+
+    menuBar()->addSeparator();
+
+    QMenu *aboutMenu = menuBar()->addMenu(tr("&Help"));
+    aboutMenu->addAction(aboutSpreadSheet);
+}
+
+void SpreadSheet::updateStatus(QTableWidgetItem *item)
+{
+    if (item && item == table->currentItem()) {
+        statusBar()->showMessage(item->data(Qt::StatusTipRole).toString(),
+                                 1000);
+        cellLabel->setText(tr("Cell: (%1)").arg(encode_pos(table->row(item),
+                                                           table->column(item))));
+    }
+}
+
+void SpreadSheet::updateColor(QTableWidgetItem *item)
+{
+    QPixmap pix(16, 16);
+    QColor col;
+    if (item)
+        col = item->backgroundColor();
+    if (!col.isValid())
+        col = palette().base().color();
+
+    QPainter pt(&pix);
+    pt.fillRect(0, 0, 16, 16, col);
+
+    QColor lighter = col.light();
+    pt.setPen(lighter);
+    QPoint lightFrame[] = { QPoint(0, 15), QPoint(0, 0), QPoint(15, 0) };
+    pt.drawPolyline(lightFrame, 3);
+
+    pt.setPen(col.dark());
+    QPoint darkFrame[] = { QPoint(1, 15), QPoint(15, 15), QPoint(15, 1) };
+    pt.drawPolyline(darkFrame, 3);
+
+    pt.end();
+
+    colorAction->setIcon(pix);
+}
+
+void SpreadSheet::updateLineEdit(QTableWidgetItem *item)
+{
+    if (item != table->currentItem())
+        return;
+    if (item)
+        formulaInput->setText(item->data(Qt::EditRole).toString());
+    else
+        formulaInput->clear();
+}
+
+void SpreadSheet::returnPressed()
+{
+    QString text = formulaInput->text();
+    int row = table->currentRow();
+    int col = table->currentColumn();
+    QTableWidgetItem *item = table->item(row, col);
+    if (!item)
+        table->setItem(row, col, new SpreadSheetItem(text));
+    else
+        item->setData(Qt::EditRole, text);
+    table->viewport()->update();
+}
+
+void SpreadSheet::selectColor()
+{
+    QTableWidgetItem *item = table->currentItem();
+    QColor col = item ? item->backgroundColor() : table->palette().base().color();
+    col = QColorDialog::getColor(col, this);
+    if (!col.isValid())
+        return;
+
+    QList<QTableWidgetItem*> selected = table->selectedItems();
+    if (selected.count() == 0)
+        return;
+
+    foreach(QTableWidgetItem *i, selected)
+        if (i)
+            i->setBackgroundColor(col);
+
+    updateColor(table->currentItem());
+}
+
+void SpreadSheet::selectFont()
+{
+    QList<QTableWidgetItem*> selected = table->selectedItems();
+    if (selected.count() == 0)
+        return;
+
+    bool ok = false;
+    QFont fnt = QFontDialog::getFont(&ok, font(), this);
+
+    if (!ok)
+        return;
+    foreach(QTableWidgetItem *i, selected)
+        if (i)
+            i->setFont(fnt);
+}
+
+bool SpreadSheet::runInputDialog(const QString &title,
+                                 const QString &c1Text,
+                                 const QString &c2Text,
+                                 const QString &opText,
+                                 const QString &outText,
+                                 QString *cell1, QString *cell2, QString *outCell)
+{
+    QStringList rows, cols;
+    for (int c = 0; c < table->columnCount(); ++c)
+        cols << QChar('A' + c);
+    for (int r = 0; r < table->rowCount(); ++r)
+        rows << QString::number(1 + r);
+
+    QDialog addDialog(this);
+    addDialog.setWindowTitle(title);
+
+    QGroupBox group(title, &addDialog);
+    group.setMinimumSize(250, 100);
+
+    QLabel cell1Label(c1Text, &group);
+    QComboBox cell1RowInput(&group);
+    int c1Row, c1Col;
+    decode_pos(*cell1, &c1Row, &c1Col);
+    cell1RowInput.addItems(rows);
+    cell1RowInput.setCurrentIndex(c1Row);
+
+    QComboBox cell1ColInput(&group);
+    cell1ColInput.addItems(cols);
+    cell1ColInput.setCurrentIndex(c1Col);
+
+    QLabel operatorLabel(opText, &group);
+    operatorLabel.setAlignment(Qt::AlignHCenter);
+
+    QLabel cell2Label(c2Text, &group);
+    QComboBox cell2RowInput(&group);
+    int c2Row, c2Col;
+    decode_pos(*cell2, &c2Row, &c2Col);
+    cell2RowInput.addItems(rows);
+    cell2RowInput.setCurrentIndex(c2Row);
+    QComboBox cell2ColInput(&group);
+    cell2ColInput.addItems(cols);
+    cell2ColInput.setCurrentIndex(c2Col);
+
+    QLabel equalsLabel("=", &group);
+    equalsLabel.setAlignment(Qt::AlignHCenter);
+
+    QLabel outLabel(outText, &group);
+    QComboBox outRowInput(&group);
+    int outRow, outCol;
+    decode_pos(*outCell, &outRow, &outCol);
+    outRowInput.addItems(rows);
+    outRowInput.setCurrentIndex(outRow);
+    QComboBox outColInput(&group);
+    outColInput.addItems(cols);
+    outColInput.setCurrentIndex(outCol);
+
+    QPushButton cancelButton(tr("Cancel"), &addDialog);
+    connect(&cancelButton, SIGNAL(clicked()), &addDialog, SLOT(reject()));
+
+    QPushButton okButton(tr("OK"), &addDialog);
+    okButton.setDefault(true);
+    connect(&okButton, SIGNAL(clicked()), &addDialog, SLOT(accept()));
+
+    QHBoxLayout *buttonsLayout = new QHBoxLayout;
+    buttonsLayout->addStretch(1);
+    buttonsLayout->addWidget(&okButton);
+    buttonsLayout->addSpacing(10);
+    buttonsLayout->addWidget(&cancelButton);
+
+    QVBoxLayout *dialogLayout = new QVBoxLayout(&addDialog);
+    dialogLayout->addWidget(&group);
+    dialogLayout->addStretch(1);
+    dialogLayout->addItem(buttonsLayout);
+
+    QHBoxLayout *cell1Layout = new QHBoxLayout;
+    cell1Layout->addWidget(&cell1Label);
+    cell1Layout->addSpacing(10);
+    cell1Layout->addWidget(&cell1ColInput);
+    cell1Layout->addSpacing(10);
+    cell1Layout->addWidget(&cell1RowInput);
+
+    QHBoxLayout *cell2Layout = new QHBoxLayout;
+    cell2Layout->addWidget(&cell2Label);
+    cell2Layout->addSpacing(10);
+    cell2Layout->addWidget(&cell2ColInput);
+    cell2Layout->addSpacing(10);
+    cell2Layout->addWidget(&cell2RowInput);
+
+    QHBoxLayout *outLayout = new QHBoxLayout;
+    outLayout->addWidget(&outLabel);
+    outLayout->addSpacing(10);
+    outLayout->addWidget(&outColInput);
+    outLayout->addSpacing(10);
+    outLayout->addWidget(&outRowInput);
+
+    QVBoxLayout *vLayout = new QVBoxLayout(&group);
+    vLayout->addItem(cell1Layout);
+    vLayout->addWidget(&operatorLabel);
+    vLayout->addItem(cell2Layout);
+    vLayout->addWidget(&equalsLabel);
+    vLayout->addStretch(1);
+    vLayout->addItem(outLayout);
+
+    if (addDialog.exec()) {
+        *cell1 = cell1ColInput.currentText() + cell1RowInput.currentText();
+        *cell2 = cell2ColInput.currentText() + cell2RowInput.currentText();
+        *outCell = outColInput.currentText() + outRowInput.currentText();
+        return true;
+    }
+
+    return false;
+}
+
+void SpreadSheet::actionSum()
+{
+    int row_first = 0;
+    int row_last = 0;
+    int row_cur = 0;
+
+    int col_first = 0;
+    int col_last = 0;
+    int col_cur = 0;
+
+    QList<QTableWidgetItem*> selected = table->selectedItems();
+
+    if (!selected.isEmpty()) {
+        QTableWidgetItem *first = selected.first();
+        QTableWidgetItem *last = selected.last();
+        row_first = table->row(first);
+        row_last = table->row(last);
+        col_first = table->column(first);
+        col_last = table->column(last);
+    }
+
+    QTableWidgetItem *current = table->currentItem();
+
+    if (current) {
+        row_cur = table->row(current);
+        col_cur = table->column(current);
+    }
+
+    QString cell1 = encode_pos(row_first, col_first);
+    QString cell2 = encode_pos(row_last, col_last);
+    QString out = encode_pos(row_cur, col_cur);
+
+    if (runInputDialog(tr("Sum cells"), tr("First cell:"), tr("Last cell:"),
+                       QString("%1").arg(QChar(0x03a3)), tr("Output to:"),
+                       &cell1, &cell2, &out)) {
+        int row, col;
+        decode_pos(out, &row, &col);
+        table->item(row, col)->setText(tr("sum %1 %2").arg(cell1, cell2));
+    }
+}
+
+void SpreadSheet::actionMath_helper(const QString &title, const QString &op)
+{
+    QString cell1 = "C1";
+    QString cell2 = "C2";
+    QString out = "C3";
+
+    QTableWidgetItem *current = table->currentItem();
+    if (current)
+        out = encode_pos(table->currentRow(), table->currentColumn());
+
+    if (runInputDialog(title, tr("Cell 1"), tr("Cell 2"), op, tr("Output to:"),
+                       &cell1, &cell2, &out)) {
+        int row, col;
+        decode_pos(out, &row, &col);
+        table->item(row, col)->setText(tr("%1, %2, %3").arg(op, cell1, cell2));
+    }
+}
+
+void SpreadSheet::actionAdd()
+{
+    actionMath_helper(tr("Addition"), "+");
+}
+
+void SpreadSheet::actionSubtract()
+{
+    actionMath_helper(tr("Subtraction"), "-");
+}
+
+void SpreadSheet::actionMultiply()
+{
+    actionMath_helper(tr("Multiplication"), "*");
+}
+void SpreadSheet::actionDivide()
+{
+    actionMath_helper(tr("Division"), "/");
+}
+
+void SpreadSheet::clear()
+{
+    foreach (QTableWidgetItem *i, table->selectedItems())
+        i->setText("");
+}
+
+void SpreadSheet::setupContextMenu()
+{
+    addAction(cell_addAction);
+    addAction(cell_subAction);
+    addAction(cell_mulAction);
+    addAction(cell_divAction);
+    addAction(cell_sumAction);
+    addAction(firstSeparator);
+    addAction(colorAction);
+    addAction(fontAction);
+    addAction(secondSeparator);
+    addAction(clearAction);
+    setContextMenuPolicy(Qt::ActionsContextMenu);
+}
+
+void SpreadSheet::setupContents()
+{
+    QColor titleBackground(Qt::lightGray);
+    QFont titleFont = table->font();
+    titleFont.setBold(true);
+
+    // column 0
+    table->setItem(0, 0, new SpreadSheetItem("Item"));
+    table->item(0, 0)->setBackgroundColor(titleBackground);
+    table->item(0, 0)->setToolTip("This column shows the purchased item/service");
+    table->item(0, 0)->setFont(titleFont);
+
+    table->setItem(1, 0, new SpreadSheetItem("AirportBus"));
+    table->setItem(2, 0, new SpreadSheetItem("Flight (Munich)"));
+    table->setItem(3, 0, new SpreadSheetItem("Lunch"));
+    table->setItem(4, 0, new SpreadSheetItem("Flight (LA)"));
+    table->setItem(5, 0, new SpreadSheetItem("Taxi"));
+    table->setItem(6, 0, new SpreadSheetItem("Diinner"));
+    table->setItem(7, 0, new SpreadSheetItem("Hotel"));
+    table->setItem(8, 0, new SpreadSheetItem("Flight (Oslo)"));
+    table->setItem(9, 0, new SpreadSheetItem("Total:"));
+
+    table->item(9, 0)->setFont(titleFont);
+    table->item(9, 0)->setBackgroundColor(Qt::lightGray);
+
+    // column 1
+    table->setItem(0, 1, new SpreadSheetItem("Date"));
+    table->item(0, 1)->setBackgroundColor(titleBackground);
+    table->item(0, 1)->setToolTip("This column shows the purchase date, double click to change");
+    table->item(0, 1)->setFont(titleFont);
+
+    table->setItem(1, 1, new SpreadSheetItem("15/6/2006"));
+    table->setItem(2, 1, new SpreadSheetItem("15/6/2006"));
+    table->setItem(3, 1, new SpreadSheetItem("15/6/2006"));
+    table->setItem(4, 1, new SpreadSheetItem("21/5/2006"));
+    table->setItem(5, 1, new SpreadSheetItem("16/6/2006"));
+    table->setItem(6, 1, new SpreadSheetItem("16/6/2006"));
+    table->setItem(7, 1, new SpreadSheetItem("16/6/2006"));
+    table->setItem(8, 1, new SpreadSheetItem("18/6/2006"));
+
+    table->setItem(9, 1, new SpreadSheetItem());
+    table->item(9, 1)->setBackgroundColor(Qt::lightGray);
+
+    // column 2
+    table->setItem(0, 2, new SpreadSheetItem("Price"));
+    table->item(0, 2)->setBackgroundColor(titleBackground);
+    table->item(0, 2)->setToolTip("This collumn shows the price of the purchase");
+    table->item(0, 2)->setFont(titleFont);
+
+    table->setItem(1, 2, new SpreadSheetItem("150"));
+    table->setItem(2, 2, new SpreadSheetItem("2350"));
+    table->setItem(3, 2, new SpreadSheetItem("-14"));
+    table->setItem(4, 2, new SpreadSheetItem("980"));
+    table->setItem(5, 2, new SpreadSheetItem("5"));
+    table->setItem(6, 2, new SpreadSheetItem("120"));
+    table->setItem(7, 2, new SpreadSheetItem("300"));
+    table->setItem(8, 2, new SpreadSheetItem("1240"));
+
+    table->setItem(9, 2, new SpreadSheetItem());
+
+    // column 3
+    table->setItem(0, 3, new SpreadSheetItem("Currency"));
+    table->item(0, 3)->setBackgroundColor(titleBackground);
+    table->item(0, 3)->setToolTip("This column shows the currency");
+    table->item(0, 3)->setFont(titleFont);
+
+    table->setItem(1, 3, new SpreadSheetItem("NOK"));
+    table->setItem(2, 3, new SpreadSheetItem("NOK"));
+    table->setItem(3, 3, new SpreadSheetItem("EUR"));
+    table->setItem(4, 3, new SpreadSheetItem("EUR"));
+    table->setItem(5, 3, new SpreadSheetItem("USD"));
+    table->setItem(6, 3, new SpreadSheetItem("USD"));
+    table->setItem(7, 3, new SpreadSheetItem("USD"));
+    table->setItem(8, 3, new SpreadSheetItem("USD"));
+
+    table->setItem(9, 3, new SpreadSheetItem());
+    table->item(9,3)->setBackgroundColor(Qt::lightGray);
+
+    // column 4
+    table->setItem(0, 4, new SpreadSheetItem("Ex. Rate"));
+    table->item(0, 4)->setBackgroundColor(titleBackground);
+    table->item(0, 4)->setToolTip("This column shows the exchange rate to NOK");
+    table->item(0, 4)->setFont(titleFont);
+
+    table->setItem(1, 4, new SpreadSheetItem("1"));
+    table->setItem(2, 4, new SpreadSheetItem("1"));
+    table->setItem(3, 4, new SpreadSheetItem("8"));
+    table->setItem(4, 4, new SpreadSheetItem("8"));
+    table->setItem(5, 4, new SpreadSheetItem("7"));
+    table->setItem(6, 4, new SpreadSheetItem("7"));
+    table->setItem(7, 4, new SpreadSheetItem("7"));
+    table->setItem(8, 4, new SpreadSheetItem("7"));
+
+    table->setItem(9, 4, new SpreadSheetItem());
+    table->item(9,4)->setBackgroundColor(Qt::lightGray);
+
+    // column 5
+    table->setItem(0, 5, new SpreadSheetItem("NOK"));
+    table->item(0, 5)->setBackgroundColor(titleBackground);
+    table->item(0, 5)->setToolTip("This column shows the expenses in NOK");
+    table->item(0, 5)->setFont(titleFont);
+
+    table->setItem(1, 5, new SpreadSheetItem("* C2 E2"));
+    table->setItem(2, 5, new SpreadSheetItem("* C3 E3"));
+    table->setItem(3, 5, new SpreadSheetItem("* C4 E4"));
+    table->setItem(4, 5, new SpreadSheetItem("* C5 E5"));
+    table->setItem(5, 5, new SpreadSheetItem("* C6 E6"));
+    table->setItem(6, 5, new SpreadSheetItem("* C7 E7"));
+    table->setItem(7, 5, new SpreadSheetItem("* C8 E8"));
+    table->setItem(8, 5, new SpreadSheetItem("* C9 E9"));
+
+    table->setItem(9, 5, new SpreadSheetItem("sum F2 F9"));
+    table->item(9,5)->setBackgroundColor(Qt::lightGray);
+}
+
+const char *htmlText =
+"<HTML>"
+"<p><b>This demo shows use of <c>QTableWidget</c> with custom handling for"
+" individual cells.</b></p>"
+"<p>Using a customized table item we make it possible to have dynamic"
+" output in different cells. The content that is implemented for this"
+" particular demo is:"
+"<ul>"
+"<li>Adding two cells.</li>"
+"<li>Subtracting one cell from another.</li>"
+"<li>Multiplying two cells.</li>"
+"<li>Dividing one cell with another.</li>"
+"<li>Summing the contents of an arbitrary number of cells.</li>"
+"</HTML>";
+
+void SpreadSheet::showAbout()
+{
+    QMessageBox::about(this, "About Spreadsheet", htmlText);
+}
+
+void decode_pos(const QString &pos, int *row, int *col)
+{
+    if (pos.isEmpty()) {
+        *col = -1;
+        *row = -1;
+    } else {
+        *col = pos.at(0).toLatin1() - 'A';
+        *row = pos.right(pos.size() - 1).toInt() - 1;
+    }
+}
+
+QString encode_pos(int row, int col)
+{
+    return QString(col + 'A') + QString::number(row + 1);
+}
+
+
+void SpreadSheet::print()
+{
+#ifndef QT_NO_PRINTER
+    QPrinter printer(QPrinter::ScreenResolution);
+    QPrintPreviewDialog dlg(&printer);
+    PrintView view;
+    view.setModel(table->model());
+    connect(&dlg, SIGNAL(paintRequested(QPrinter *)),
+            &view, SLOT(print(QPrinter *)));
+    dlg.exec();
+#endif
+}
+
diff --git a/demos/spreadsheet/spreadsheet.h b/demos/spreadsheet/spreadsheet.h
new file mode 100644
index 0000000000..944433d70b
--- /dev/null
+++ b/demos/spreadsheet/spreadsheet.h
@@ -0,0 +1,124 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SPREADSHEET_H
+#define SPREADSHEET_H
+
+#include <QMainWindow>
+
+QT_BEGIN_NAMESPACE
+class QAction;
+class QLabel;
+class QLineEdit;
+class QToolBar;
+class QTableWidgetItem;
+class QTableWidget;
+QT_END_NAMESPACE
+
+class SpreadSheet : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+
+    SpreadSheet(int rows, int cols, QWidget *parent = 0);
+
+public slots:
+    void updateStatus(QTableWidgetItem *item);
+    void updateColor(QTableWidgetItem *item);
+    void updateLineEdit(QTableWidgetItem *item);
+    void returnPressed();
+    void selectColor();
+    void selectFont();
+    void clear();
+    void showAbout();
+
+    void print();
+
+    void actionSum();
+    void actionSubtract();
+    void actionAdd();
+    void actionMultiply();
+    void actionDivide();  
+
+protected:
+    void setupContextMenu();
+    void setupContents();
+
+    void setupMenuBar();
+    void createActions();
+
+    void actionMath_helper(const QString &title, const QString &op);
+    bool runInputDialog(const QString &title,
+                        const QString &c1Text,
+                        const QString &c2Text,
+                        const QString &opText,
+                        const QString &outText,
+                        QString *cell1, QString *cell2, QString *outCell);
+private:
+    QToolBar *toolBar;
+    QAction *colorAction;
+    QAction *fontAction;
+    QAction *firstSeparator;
+    QAction *cell_sumAction;
+    QAction *cell_addAction;
+    QAction *cell_subAction;
+    QAction *cell_mulAction;
+    QAction *cell_divAction;
+    QAction *secondSeparator;
+    QAction *clearAction;
+    QAction *aboutSpreadSheet;
+    QAction *exitAction;
+
+    QAction *printAction;
+
+    QLabel *cellLabel;
+    QTableWidget *table;
+    QLineEdit *formulaInput;
+
+};
+
+void decode_pos(const QString &pos, int *row, int *col);
+QString encode_pos(int row, int col);
+
+
+#endif // SPREADSHEET_H
+
diff --git a/demos/spreadsheet/spreadsheet.pro b/demos/spreadsheet/spreadsheet.pro
new file mode 100644
index 0000000000..b62f244591
--- /dev/null
+++ b/demos/spreadsheet/spreadsheet.pro
@@ -0,0 +1,33 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Thu Mar 5 14:39:33 2009
+######################################################################
+
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+CONFIG += qt warn_on
+#unix:contains(QT_CONFIG, dbus):QT += dbus
+
+# Input
+HEADERS += printview.h spreadsheet.h spreadsheetdelegate.h spreadsheetitem.h
+SOURCES += main.cpp \
+           printview.cpp \
+           spreadsheet.cpp \
+           spreadsheetdelegate.cpp \
+           spreadsheetitem.cpp
+RESOURCES += spreadsheet.qrc
+
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/spreadsheet
+sources.files = $$SOURCES $$RESOURCES *.pro images
+sources.path = $$[QT_INSTALL_DEMOS]/spreadsheet
+INSTALLS += target sources
+
diff --git a/demos/spreadsheet/spreadsheet.qrc b/demos/spreadsheet/spreadsheet.qrc
new file mode 100644
index 0000000000..13f496d8e3
--- /dev/null
+++ b/demos/spreadsheet/spreadsheet.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+	<file>images/interview.png</file>
+</qresource>
+</RCC>
diff --git a/demos/spreadsheet/spreadsheetdelegate.cpp b/demos/spreadsheet/spreadsheetdelegate.cpp
new file mode 100644
index 0000000000..465c92f34d
--- /dev/null
+++ b/demos/spreadsheet/spreadsheetdelegate.cpp
@@ -0,0 +1,114 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "spreadsheetdelegate.h"
+#include <QtGui>
+
+SpreadSheetDelegate::SpreadSheetDelegate(QObject *parent)
+        : QItemDelegate(parent) {}
+
+QWidget *SpreadSheetDelegate::createEditor(QWidget *parent,
+                                          const QStyleOptionViewItem &,
+                                          const QModelIndex &index) const
+{
+    if (index.column() == 1) {
+        QDateTimeEdit *editor = new QDateTimeEdit(parent);
+        editor->setDisplayFormat("dd/M/yyy");
+        editor->setCalendarPopup(true);
+        return editor;
+    }
+
+    QLineEdit *editor = new QLineEdit(parent);
+
+    // create a completer with the strings in the column as model
+    QStringList allStrings;
+    for (int i = 1; i<index.model()->rowCount(); i++) {
+        QString strItem(index.model()->data(index.sibling(i, index.column()),
+            Qt::EditRole).toString());
+
+        if (!allStrings.contains(strItem))
+            allStrings.append(strItem);
+    }
+
+    QCompleter *autoComplete = new QCompleter(allStrings);
+    editor->setCompleter(autoComplete);
+    connect(editor, SIGNAL(editingFinished()),
+        this, SLOT(commitAndCloseEditor()));
+    return editor;
+}
+
+void SpreadSheetDelegate::commitAndCloseEditor()
+{
+    QLineEdit *editor = qobject_cast<QLineEdit *>(sender());
+    emit commitData(editor);
+    emit closeEditor(editor);
+}
+
+void SpreadSheetDelegate::setEditorData(QWidget *editor,
+    const QModelIndex &index) const
+{
+    QLineEdit *edit = qobject_cast<QLineEdit*>(editor);
+    if (edit) {
+        edit->setText(index.model()->data(index, Qt::EditRole).toString());
+    } else {
+        QDateTimeEdit *dateEditor = qobject_cast<QDateTimeEdit *>(editor);
+        if (dateEditor) {
+            dateEditor->setDate(QDate::fromString(
+            index.model()->data(index, Qt::EditRole).toString(),
+            "d/M/yy"));
+        }
+    }
+}
+
+void SpreadSheetDelegate::setModelData(QWidget *editor,
+    QAbstractItemModel *model, const QModelIndex &index) const
+{
+    QLineEdit *edit = qobject_cast<QLineEdit *>(editor);
+    if (edit) {
+        model->setData(index, edit->text());
+    } else {
+        QDateTimeEdit *dateEditor = qobject_cast<QDateTimeEdit *>(editor);
+        if (dateEditor) {
+            model->setData(index, dateEditor->date().toString("dd/M/yyy"));
+        }
+    }
+}
+
diff --git a/demos/spreadsheet/spreadsheetdelegate.h b/demos/spreadsheet/spreadsheetdelegate.h
new file mode 100644
index 0000000000..3b7b9acc86
--- /dev/null
+++ b/demos/spreadsheet/spreadsheetdelegate.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SPREADSHEETDELEGATE_H
+#define SPREADSHEETDELEGATE_H
+
+#include <QItemDelegate>
+#include "spreadsheet.h"
+
+class SpreadSheetDelegate : public QItemDelegate
+{
+    Q_OBJECT
+
+public:
+    SpreadSheetDelegate(QObject *parent = 0);
+    QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &,
+                          const QModelIndex &index) const;
+    void setEditorData(QWidget *editor, const QModelIndex &index) const;
+    void setModelData(QWidget *editor, QAbstractItemModel *model,
+                      const QModelIndex &index) const;
+
+private slots:
+    void commitAndCloseEditor();
+};
+
+#endif // SPREADSHEETDELEGATE_H
+
diff --git a/demos/spreadsheet/spreadsheetitem.cpp b/demos/spreadsheet/spreadsheetitem.cpp
new file mode 100644
index 0000000000..8f94b87c41
--- /dev/null
+++ b/demos/spreadsheet/spreadsheetitem.cpp
@@ -0,0 +1,167 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "spreadsheetitem.h"
+
+SpreadSheetItem::SpreadSheetItem()
+        : QTableWidgetItem(), isResolving(false)
+{
+}
+
+SpreadSheetItem::SpreadSheetItem(const QString &text)
+        : QTableWidgetItem(text), isResolving(false)
+{
+}
+
+QTableWidgetItem *SpreadSheetItem::clone() const
+{
+    SpreadSheetItem *item = new SpreadSheetItem();
+    *item = *this;
+    return item;
+}
+
+QVariant SpreadSheetItem::data(int role) const
+{
+    if (role == Qt::EditRole || role == Qt::StatusTipRole)
+        return formula();
+
+    if (role == Qt::DisplayRole)
+        return display();
+
+    QString t = display().toString();
+    bool isNumber = false;
+    int number = t.toInt(&isNumber);
+
+    if (role == Qt::TextColorRole) {
+        if (!isNumber)
+            return qVariantFromValue(QColor(Qt::black));
+        else if (number < 0)
+            return qVariantFromValue(QColor(Qt::red));
+        return qVariantFromValue(QColor(Qt::blue));
+    }
+
+     if (role == Qt::TextAlignmentRole)
+         if (!t.isEmpty() && (t.at(0).isNumber() || t.at(0) == '-'))
+             return (int)(Qt::AlignRight | Qt::AlignVCenter);
+
+     return QTableWidgetItem::data(role);
+ }
+
+void SpreadSheetItem::setData(int role, const QVariant &value)
+{
+    QTableWidgetItem::setData(role, value);
+    if (tableWidget())
+        tableWidget()->viewport()->update();
+}
+
+QVariant SpreadSheetItem::display() const
+{
+    // avoid circular dependencies
+    if (isResolving)
+        return QVariant();
+
+    isResolving = true;
+    QVariant result = computeFormula(formula(), tableWidget(), this);
+    isResolving = false;
+    return result;
+}
+
+QVariant SpreadSheetItem::computeFormula(const QString &formula,
+                                         const QTableWidget *widget,
+                                         const QTableWidgetItem *self)
+{
+    // check if the s tring is actually a formula or not
+    QStringList list = formula.split(' ');
+    if (list.isEmpty() || !widget)
+        return formula; // it is a normal string
+
+    QString op = list.value(0).toLower();
+
+    int firstRow = -1;
+    int firstCol = -1;
+    int secondRow = -1;
+    int secondCol = -1;
+
+    if (list.count() > 1)
+        decode_pos(list.value(1), &firstRow, &firstCol);
+
+    if (list.count() > 2)
+        decode_pos(list.value(2), &secondRow, &secondCol);
+
+    const QTableWidgetItem *start = widget->item(firstRow, firstCol);
+    const QTableWidgetItem *end = widget->item(secondRow, secondCol);
+
+    int firstVal = start ? start->text().toInt() : 0;
+    int secondVal = end ? end->text().toInt() : 0;
+
+    QVariant result;
+    if (op == "sum") {
+        int sum = 0;
+        for (int r = firstRow; r <= secondRow; ++r) {
+            for (int c = firstCol; c <= secondCol; ++c) {
+                const QTableWidgetItem *tableItem = widget->item(r, c);
+                if (tableItem && tableItem != self)
+                    sum += tableItem->text().toInt();
+            }
+        }
+
+        result = sum;
+    } else if (op == "+") {
+        result = (firstVal + secondVal);
+    } else if (op == "-") {
+        result = (firstVal - secondVal);
+    } else if (op == "*") {
+        result = (firstVal * secondVal);
+    } else if (op == "/") {
+        if (secondVal == 0)
+            result = QString("nan");
+        else
+            result = (firstVal / secondVal);
+    } else if (op == "=") {
+        if (start)
+            result = start->text();
+    } else {
+        result = formula;
+    }
+
+    return result;
+}
+
diff --git a/demos/spreadsheet/spreadsheetitem.h b/demos/spreadsheet/spreadsheetitem.h
new file mode 100644
index 0000000000..5996d730c5
--- /dev/null
+++ b/demos/spreadsheet/spreadsheetitem.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SPREADSHEETITEM_H
+#define SPREADSHEETITEM_H
+
+#include <QTableWidgetItem>
+#include <QtGui>
+#include "spreadsheet.h"
+
+class SpreadSheetItem : public QTableWidgetItem
+{
+public:
+    SpreadSheetItem();
+    SpreadSheetItem(const QString &text);
+
+    QTableWidgetItem *clone() const;
+
+    QVariant data(int role) const;
+    void setData(int role, const QVariant &value);
+    QVariant display() const;
+
+    inline QString formula() const
+    { return QTableWidgetItem::data(Qt::DisplayRole).toString(); }
+
+    static QVariant computeFormula(const QString &formula,
+                                   const QTableWidget *widget,
+                                   const QTableWidgetItem *self = 0);
+
+private:
+    mutable bool isResolving;
+};
+
+#endif // SPREADSHEETITEM_H
+
diff --git a/demos/sqlbrowser/browser.cpp b/demos/sqlbrowser/browser.cpp
new file mode 100644
index 0000000000..f7b24dbd7e
--- /dev/null
+++ b/demos/sqlbrowser/browser.cpp
@@ -0,0 +1,247 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "browser.h"
+#include "qsqlconnectiondialog.h"
+
+#include <QtGui>
+#include <QtSql>
+
+Browser::Browser(QWidget *parent)
+    : QWidget(parent)
+{
+    setupUi(this);
+
+    table->addAction(insertRowAction);
+    table->addAction(deleteRowAction);
+
+    if (QSqlDatabase::drivers().isEmpty())
+        QMessageBox::information(this, tr("No database drivers found"),
+                                 tr("This demo requires at least one Qt database driver. "
+                                    "Please check the documentation how to build the "
+                                    "Qt SQL plugins."));
+
+    emit statusMessage(tr("Ready."));
+}
+
+Browser::~Browser()
+{
+}
+
+void Browser::exec()
+{
+    QSqlQueryModel *model = new QSqlQueryModel(table);
+    model->setQuery(QSqlQuery(sqlEdit->toPlainText(), connectionWidget->currentDatabase()));
+    table->setModel(model);
+
+    if (model->lastError().type() != QSqlError::NoError)
+        emit statusMessage(model->lastError().text());
+    else if (model->query().isSelect())
+        emit statusMessage(tr("Query OK."));
+    else
+        emit statusMessage(tr("Query OK, number of affected rows: %1").arg(
+                           model->query().numRowsAffected()));
+
+    updateActions();
+}
+
+QSqlError Browser::addConnection(const QString &driver, const QString &dbName, const QString &host,
+                            const QString &user, const QString &passwd, int port)
+{
+    static int cCount = 0;
+
+    QSqlError err;
+    QSqlDatabase db = QSqlDatabase::addDatabase(driver, QString("Browser%1").arg(++cCount));
+    db.setDatabaseName(dbName);
+    db.setHostName(host);
+    db.setPort(port);
+    if (!db.open(user, passwd)) {
+        err = db.lastError();
+        db = QSqlDatabase();
+        QSqlDatabase::removeDatabase(QString("Browser%1").arg(cCount));
+    }
+    connectionWidget->refresh();
+
+    return err;
+}
+
+void Browser::addConnection()
+{
+    QSqlConnectionDialog dialog(this);
+    if (dialog.exec() != QDialog::Accepted)
+        return;
+
+    if (dialog.useInMemoryDatabase()) {
+        QSqlDatabase::database("in_mem_db", false).close();
+        QSqlDatabase::removeDatabase("in_mem_db");
+        QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "in_mem_db");
+        db.setDatabaseName(":memory:");
+        if (!db.open())
+            QMessageBox::warning(this, tr("Unable to open database"), tr("An error occurred while "
+                                                                         "opening the connection: ") + db.lastError().text());
+        QSqlQuery q("", db);
+        q.exec("drop table Movies");
+        q.exec("drop table Names");
+        q.exec("create table Movies (id integer primary key, Title varchar, Director varchar, Rating number)");
+        q.exec("insert into Movies values (0, 'Metropolis', 'Fritz Lang', '8.4')");
+        q.exec("insert into Movies values (1, 'Nosferatu, eine Symphonie des Grauens', 'F.W. Murnau', '8.1')");
+        q.exec("insert into Movies values (2, 'Bis ans Ende der Welt', 'Wim Wenders', '6.5')");
+        q.exec("insert into Movies values (3, 'Hardware', 'Richard Stanley', '5.2')");
+        q.exec("insert into Movies values (4, 'Mitchell', 'Andrew V. McLaglen', '2.1')");
+        q.exec("create table Names (id integer primary key, Firstname varchar, Lastname varchar, City varchar)");
+        q.exec("insert into Names values (0, 'Sala', 'Palmer', 'Morristown')");
+        q.exec("insert into Names values (1, 'Christopher', 'Walker', 'Morristown')");
+        q.exec("insert into Names values (2, 'Donald', 'Duck', 'Andeby')");
+        q.exec("insert into Names values (3, 'Buck', 'Rogers', 'Paris')");
+        q.exec("insert into Names values (4, 'Sherlock', 'Holmes', 'London')");
+        connectionWidget->refresh();
+    } else {
+        QSqlError err = addConnection(dialog.driverName(), dialog.databaseName(), dialog.hostName(),
+                           dialog.userName(), dialog.password(), dialog.port());
+        if (err.type() != QSqlError::NoError)
+            QMessageBox::warning(this, tr("Unable to open database"), tr("An error occurred while "
+                                       "opening the connection: ") + err.text());
+    }
+}
+
+void Browser::showTable(const QString &t)
+{
+    QSqlTableModel *model = new QSqlTableModel(table, connectionWidget->currentDatabase());
+    model->setEditStrategy(QSqlTableModel::OnRowChange);
+    model->setTable(t);
+    model->select();
+    if (model->lastError().type() != QSqlError::NoError)
+        emit statusMessage(model->lastError().text());
+    table->setModel(model);
+    table->setEditTriggers(QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed);
+
+    connect(table->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),
+            this, SLOT(currentChanged()));
+    updateActions();
+}
+
+void Browser::showMetaData(const QString &t)
+{
+    QSqlRecord rec = connectionWidget->currentDatabase().record(t);
+    QStandardItemModel *model = new QStandardItemModel(table);
+
+    model->insertRows(0, rec.count());
+    model->insertColumns(0, 7);
+
+    model->setHeaderData(0, Qt::Horizontal, "Fieldname");
+    model->setHeaderData(1, Qt::Horizontal, "Type");
+    model->setHeaderData(2, Qt::Horizontal, "Length");
+    model->setHeaderData(3, Qt::Horizontal, "Precision");
+    model->setHeaderData(4, Qt::Horizontal, "Required");
+    model->setHeaderData(5, Qt::Horizontal, "AutoValue");
+    model->setHeaderData(6, Qt::Horizontal, "DefaultValue");
+
+
+    for (int i = 0; i < rec.count(); ++i) {
+        QSqlField fld = rec.field(i);
+        model->setData(model->index(i, 0), fld.name());
+        model->setData(model->index(i, 1), fld.typeID() == -1
+                ? QString(QVariant::typeToName(fld.type()))
+                : QString("%1 (%2)").arg(QVariant::typeToName(fld.type())).arg(fld.typeID()));
+        model->setData(model->index(i, 2), fld.length());
+        model->setData(model->index(i, 3), fld.precision());
+        model->setData(model->index(i, 4), fld.requiredStatus() == -1 ? QVariant("?")
+                : QVariant(bool(fld.requiredStatus())));
+        model->setData(model->index(i, 5), fld.isAutoValue());
+        model->setData(model->index(i, 6), fld.defaultValue());
+    }
+
+    table->setModel(model);
+    table->setEditTriggers(QAbstractItemView::NoEditTriggers);
+
+    updateActions();
+}
+
+void Browser::insertRow()
+{
+    QSqlTableModel *model = qobject_cast<QSqlTableModel *>(table->model());
+    if (!model)
+        return;
+
+    QModelIndex insertIndex = table->currentIndex();
+    int row = insertIndex.row() == -1 ? 0 : insertIndex.row();
+    model->insertRow(row);
+    insertIndex = model->index(row, 0);
+    table->setCurrentIndex(insertIndex);
+    table->edit(insertIndex);
+}
+
+void Browser::deleteRow()
+{
+    QSqlTableModel *model = qobject_cast<QSqlTableModel *>(table->model());
+    if (!model)
+        return;
+
+    model->setEditStrategy(QSqlTableModel::OnManualSubmit);
+
+    QModelIndexList currentSelection = table->selectionModel()->selectedIndexes();
+    for (int i = 0; i < currentSelection.count(); ++i) {
+        if (currentSelection.at(i).column() != 0)
+            continue;
+        model->removeRow(currentSelection.at(i).row());
+    }
+
+    model->submitAll();
+    model->setEditStrategy(QSqlTableModel::OnRowChange);
+
+    updateActions();
+}
+
+void Browser::updateActions()
+{
+    bool enableIns = qobject_cast<QSqlTableModel *>(table->model());
+    bool enableDel = enableIns && table->currentIndex().isValid();
+
+    insertRowAction->setEnabled(enableIns);
+    deleteRowAction->setEnabled(enableDel);
+}
+
+void Browser::about()
+{
+    QMessageBox::about(this, tr("About"), tr("The SQL Browser demonstration "
+        "show how a data browser can be used to visualize the results of SQL"
+        "statements on a live database"));
+}
diff --git a/demos/sqlbrowser/browser.h b/demos/sqlbrowser/browser.h
new file mode 100644
index 0000000000..787675b482
--- /dev/null
+++ b/demos/sqlbrowser/browser.h
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BROWSER_H
+#define BROWSER_H
+
+#include <QWidget>
+#include "ui_browserwidget.h"
+
+class ConnectionWidget;
+QT_FORWARD_DECLARE_CLASS(QTableView)
+QT_FORWARD_DECLARE_CLASS(QPushButton)
+QT_FORWARD_DECLARE_CLASS(QTextEdit)
+QT_FORWARD_DECLARE_CLASS(QSqlError)
+
+class Browser: public QWidget, private Ui::Browser
+{
+    Q_OBJECT
+public:
+    Browser(QWidget *parent = 0);
+    virtual ~Browser();
+
+    QSqlError addConnection(const QString &driver, const QString &dbName, const QString &host,
+                  const QString &user, const QString &passwd, int port = -1);
+
+    void insertRow();
+    void deleteRow();
+    void updateActions();
+
+public slots:
+    void exec();
+    void showTable(const QString &table);
+    void showMetaData(const QString &table);
+    void addConnection();
+    void currentChanged() { updateActions(); }
+    void about();
+
+    void on_insertRowAction_triggered()
+    { insertRow(); }
+    void on_deleteRowAction_triggered()
+    { deleteRow(); }
+    void on_connectionWidget_tableActivated(const QString &table)
+    { showTable(table); }
+    void on_connectionWidget_metaDataRequested(const QString &table)
+    { showMetaData(table); }
+    void on_submitButton_clicked()
+    {
+        exec();
+        sqlEdit->setFocus();
+    }
+    void on_clearButton_clicked()
+    {
+        sqlEdit->clear();
+        sqlEdit->setFocus();
+    }
+
+signals:
+    void statusMessage(const QString &message);
+};
+
+#endif
diff --git a/demos/sqlbrowser/browserwidget.ui b/demos/sqlbrowser/browserwidget.ui
new file mode 100644
index 0000000000..20946f0ede
--- /dev/null
+++ b/demos/sqlbrowser/browserwidget.ui
@@ -0,0 +1,199 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>Browser</class>
+ <widget class="QWidget" name="Browser" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>765</width>
+    <height>515</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Qt SQL Browser</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>8</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QSplitter" name="splitter_2" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>7</hsizetype>
+       <vsizetype>7</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <widget class="ConnectionWidget" name="connectionWidget" >
+      <property name="sizePolicy" >
+       <sizepolicy>
+        <hsizetype>13</hsizetype>
+        <vsizetype>7</vsizetype>
+        <horstretch>1</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
+     <widget class="QTableView" name="table" >
+      <property name="sizePolicy" >
+       <sizepolicy>
+        <hsizetype>7</hsizetype>
+        <vsizetype>7</vsizetype>
+        <horstretch>2</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="contextMenuPolicy" >
+       <enum>Qt::ActionsContextMenu</enum>
+      </property>
+      <property name="selectionBehavior" >
+       <enum>QAbstractItemView::SelectRows</enum>
+      </property>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>3</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximumSize" >
+      <size>
+       <width>16777215</width>
+       <height>180</height>
+      </size>
+     </property>
+     <property name="title" >
+      <string>SQL Query</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QTextEdit" name="sqlEdit" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>7</hsizetype>
+          <vsizetype>3</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize" >
+         <size>
+          <width>0</width>
+          <height>18</height>
+         </size>
+        </property>
+        <property name="baseSize" >
+         <size>
+          <width>0</width>
+          <height>120</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>1</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QPushButton" name="clearButton" >
+          <property name="text" >
+           <string>&amp;Clear</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="submitButton" >
+          <property name="text" >
+           <string>&amp;Submit</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+  <action name="insertRowAction" >
+   <property name="enabled" >
+    <bool>false</bool>
+   </property>
+   <property name="text" >
+    <string>&amp;Insert Row</string>
+   </property>
+   <property name="statusTip" >
+    <string>Inserts a new Row</string>
+   </property>
+  </action>
+  <action name="deleteRowAction" >
+   <property name="enabled" >
+    <bool>false</bool>
+   </property>
+   <property name="text" >
+    <string>&amp;Delete Row</string>
+   </property>
+   <property name="statusTip" >
+    <string>Deletes the current Row</string>
+   </property>
+  </action>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>ConnectionWidget</class>
+   <extends>QTreeView</extends>
+   <header>connectionwidget.h</header>
+   <container>0</container>
+   <pixmap></pixmap>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>sqlEdit</tabstop>
+  <tabstop>clearButton</tabstop>
+  <tabstop>submitButton</tabstop>
+  <tabstop>connectionWidget</tabstop>
+  <tabstop>table</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/demos/sqlbrowser/connectionwidget.cpp b/demos/sqlbrowser/connectionwidget.cpp
new file mode 100644
index 0000000000..7df28ac409
--- /dev/null
+++ b/demos/sqlbrowser/connectionwidget.cpp
@@ -0,0 +1,165 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "connectionwidget.h"
+
+#include <QtGui>
+#include <QtSql>
+
+ConnectionWidget::ConnectionWidget(QWidget *parent)
+    : QWidget(parent)
+{
+    QVBoxLayout *layout = new QVBoxLayout(this);
+    tree = new QTreeWidget(this);
+    tree->setObjectName(QLatin1String("tree"));
+    tree->setHeaderLabels(QStringList(tr("database")));
+    tree->header()->setResizeMode(QHeaderView::Stretch);
+    QAction *refreshAction = new QAction(tr("Refresh"), tree);
+    metaDataAction = new QAction(tr("Show Schema"), tree);
+    connect(refreshAction, SIGNAL(triggered()), SLOT(refresh()));
+    connect(metaDataAction, SIGNAL(triggered()), SLOT(showMetaData()));
+    tree->addAction(refreshAction);
+    tree->addAction(metaDataAction);
+    tree->setContextMenuPolicy(Qt::ActionsContextMenu);
+
+    layout->addWidget(tree);
+
+    QMetaObject::connectSlotsByName(this);
+}
+
+ConnectionWidget::~ConnectionWidget()
+{
+}
+
+static QString qDBCaption(const QSqlDatabase &db)
+{
+    QString nm = db.driverName();
+    nm.append(QLatin1Char(':'));
+    if (!db.userName().isEmpty())
+        nm.append(db.userName()).append(QLatin1Char('@'));
+    nm.append(db.databaseName());
+    return nm;
+}
+
+void ConnectionWidget::refresh()
+{
+    tree->clear();
+    QStringList connectionNames = QSqlDatabase::connectionNames();
+
+    bool gotActiveDb = false;
+    for (int i = 0; i < connectionNames.count(); ++i) {
+        QTreeWidgetItem *root = new QTreeWidgetItem(tree);
+        QSqlDatabase db = QSqlDatabase::database(connectionNames.at(i), false);
+        root->setText(0, qDBCaption(db));
+        if (connectionNames.at(i) == activeDb) {
+            gotActiveDb = true;
+            setActive(root);
+        }
+        if (db.isOpen()) {
+            QStringList tables = db.tables();
+            for (int t = 0; t < tables.count(); ++t) {
+                QTreeWidgetItem *table = new QTreeWidgetItem(root);
+                table->setText(0, tables.at(t));
+            }
+        }
+    }
+    if (!gotActiveDb) {
+        activeDb = connectionNames.value(0);
+        setActive(tree->topLevelItem(0));
+    }
+
+    tree->doItemsLayout(); // HACK
+}
+
+QSqlDatabase ConnectionWidget::currentDatabase() const
+{
+    return QSqlDatabase::database(activeDb);
+}
+
+static void qSetBold(QTreeWidgetItem *item, bool bold)
+{
+    QFont font = item->font(0);
+    font.setBold(bold);
+    item->setFont(0, font);
+}
+
+void ConnectionWidget::setActive(QTreeWidgetItem *item)
+{
+    for (int i = 0; i < tree->topLevelItemCount(); ++i) {
+        if (tree->topLevelItem(i)->font(0).bold())
+            qSetBold(tree->topLevelItem(i), false);
+    }
+
+    if (!item)
+        return;
+
+    qSetBold(item, true);
+    activeDb = QSqlDatabase::connectionNames().value(tree->indexOfTopLevelItem(item));
+}
+
+void ConnectionWidget::on_tree_itemActivated(QTreeWidgetItem *item, int /* column */)
+{
+
+    if (!item)
+        return;
+
+    if (!item->parent()) {
+        setActive(item);
+    } else {
+        setActive(item->parent());
+        emit tableActivated(item->text(0));
+    }
+}
+
+void ConnectionWidget::showMetaData()
+{
+    QTreeWidgetItem *cItem = tree->currentItem();
+    if (!cItem || !cItem->parent())
+        return;
+    setActive(cItem->parent());
+    emit metaDataRequested(cItem->text(0));
+}
+
+void ConnectionWidget::on_tree_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *)
+{
+    metaDataAction->setEnabled(current && current->parent());
+}
+
diff --git a/demos/sqlbrowser/connectionwidget.h b/demos/sqlbrowser/connectionwidget.h
new file mode 100644
index 0000000000..5c4841451f
--- /dev/null
+++ b/demos/sqlbrowser/connectionwidget.h
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CONNECTIONWIDGET_H
+#define CONNECTIONWIDGET_H
+
+#include <QWidget>
+
+QT_FORWARD_DECLARE_CLASS(QTreeWidget)
+QT_FORWARD_DECLARE_CLASS(QTreeWidgetItem)
+QT_FORWARD_DECLARE_CLASS(QSqlDatabase)
+QT_FORWARD_DECLARE_CLASS(QMenu)
+
+class ConnectionWidget: public QWidget
+{
+    Q_OBJECT
+public:
+    ConnectionWidget(QWidget *parent = 0);
+    virtual ~ConnectionWidget();
+
+    QSqlDatabase currentDatabase() const;
+
+signals:
+    void tableActivated(const QString &table);
+    void metaDataRequested(const QString &tableName);
+
+public slots:
+    void refresh();
+    void showMetaData();
+    void on_tree_itemActivated(QTreeWidgetItem *item, int column);
+    void on_tree_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
+
+private:
+    void setActive(QTreeWidgetItem *);
+
+    QTreeWidget *tree;
+    QAction *metaDataAction;
+    QString activeDb;
+};
+
+#endif
diff --git a/demos/sqlbrowser/main.cpp b/demos/sqlbrowser/main.cpp
new file mode 100644
index 0000000000..b7b7fe5fa8
--- /dev/null
+++ b/demos/sqlbrowser/main.cpp
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "browser.h"
+
+#include <QtCore>
+#include <QtGui>
+#include <QtSql>
+
+void addConnectionsFromCommandline(const QStringList &args, Browser *browser)
+{
+    for (int i = 1; i < args.count(); ++i) {
+        QUrl url(args.at(i), QUrl::TolerantMode);
+        if (!url.isValid()) {
+            qWarning("Invalid URL: %s", qPrintable(args.at(i)));
+            continue;
+        }
+        QSqlError err = browser->addConnection(url.scheme(), url.path().mid(1), url.host(),
+                                               url.userName(), url.password(), url.port(-1));
+        if (err.type() != QSqlError::NoError)
+            qDebug() << "Unable to open connection:" << err;
+    }
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QMainWindow mainWin;
+    mainWin.setWindowTitle(QObject::tr("Qt SQL Browser"));
+
+    Browser browser(&mainWin);
+    mainWin.setCentralWidget(&browser);
+
+    QMenu *fileMenu = mainWin.menuBar()->addMenu(QObject::tr("&File"));
+    fileMenu->addAction(QObject::tr("Add &Connection..."), &browser, SLOT(addConnection()));
+    fileMenu->addSeparator();
+    fileMenu->addAction(QObject::tr("&Quit"), &app, SLOT(quit()));
+
+    QMenu *helpMenu = mainWin.menuBar()->addMenu(QObject::tr("&Help"));
+    helpMenu->addAction(QObject::tr("About"), &browser, SLOT(about()));
+    helpMenu->addAction(QObject::tr("About Qt"), qApp, SLOT(aboutQt()));
+
+    QObject::connect(&browser, SIGNAL(statusMessage(QString)),
+                     mainWin.statusBar(), SLOT(showMessage(QString)));
+
+    addConnectionsFromCommandline(app.arguments(), &browser);
+    mainWin.show();
+    if (QSqlDatabase::connectionNames().isEmpty())
+        QMetaObject::invokeMethod(&browser, "addConnection", Qt::QueuedConnection);
+
+    return app.exec();
+}
diff --git a/demos/sqlbrowser/qsqlconnectiondialog.cpp b/demos/sqlbrowser/qsqlconnectiondialog.cpp
new file mode 100644
index 0000000000..a2e3c89ac7
--- /dev/null
+++ b/demos/sqlbrowser/qsqlconnectiondialog.cpp
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qsqlconnectiondialog.h"
+#include "ui_qsqlconnectiondialog.h"
+
+#include <QSqlDatabase>
+
+QSqlConnectionDialog::QSqlConnectionDialog(QWidget *parent)
+    : QDialog(parent)
+{
+    ui.setupUi(this);
+
+    QStringList drivers = QSqlDatabase::drivers();
+
+    // remove compat names
+    drivers.removeAll("QMYSQL3");
+    drivers.removeAll("QOCI8");
+    drivers.removeAll("QODBC3");
+    drivers.removeAll("QPSQL7");
+    drivers.removeAll("QTDS7");
+
+    if (!drivers.contains("QSQLITE"))
+        ui.dbCheckBox->setEnabled(false);
+
+    ui.comboDriver->addItems(drivers);
+}
+
+QSqlConnectionDialog::~QSqlConnectionDialog()
+{
+}
+
+QString QSqlConnectionDialog::driverName() const
+{
+    return ui.comboDriver->currentText();
+}
+
+QString QSqlConnectionDialog::databaseName() const
+{
+    return ui.editDatabase->text();
+}
+
+QString QSqlConnectionDialog::userName() const
+{
+    return ui.editUsername->text();
+}
+
+QString QSqlConnectionDialog::password() const
+{
+    return ui.editPassword->text();
+}
+
+QString QSqlConnectionDialog::hostName() const
+{
+    return ui.editHostname->text();
+}
+
+int QSqlConnectionDialog::port() const
+{
+    return ui.portSpinBox->value();
+}
+
+bool QSqlConnectionDialog::useInMemoryDatabase() const
+{
+    return ui.dbCheckBox->isChecked();
+}
+
+void QSqlConnectionDialog::on_okButton_clicked()
+{
+    if (ui.comboDriver->currentText().isEmpty()) {
+        QMessageBox::information(this, tr("No database driver selected"),
+                                 tr("Please select a database driver"));
+        ui.comboDriver->setFocus();
+    } else {
+        accept();
+    }
+}
diff --git a/demos/sqlbrowser/qsqlconnectiondialog.h b/demos/sqlbrowser/qsqlconnectiondialog.h
new file mode 100644
index 0000000000..d5f3456b9f
--- /dev/null
+++ b/demos/sqlbrowser/qsqlconnectiondialog.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QSQLCONNECTIONDIALOG_H
+#define QSQLCONNECTIONDIALOG_H
+
+#include <QDialog>
+#include <QMessageBox>
+
+#include "ui_qsqlconnectiondialog.h"
+
+class QSqlConnectionDialog: public QDialog
+{
+    Q_OBJECT
+public:
+    QSqlConnectionDialog(QWidget *parent = 0);
+    ~QSqlConnectionDialog();
+
+    QString driverName() const;
+    QString databaseName() const;
+    QString userName() const;
+    QString password() const;
+    QString hostName() const;
+    int port() const;
+    bool useInMemoryDatabase() const;
+
+private slots:
+    void on_okButton_clicked();
+    void on_cancelButton_clicked() { reject(); }
+    void on_dbCheckBox_clicked() { ui.connGroupBox->setEnabled(!ui.dbCheckBox->isChecked()); }
+
+private:
+    Ui::QSqlConnectionDialogUi ui;
+};
+
+#endif
diff --git a/demos/sqlbrowser/qsqlconnectiondialog.ui b/demos/sqlbrowser/qsqlconnectiondialog.ui
new file mode 100644
index 0000000000..91a8700579
--- /dev/null
+++ b/demos/sqlbrowser/qsqlconnectiondialog.ui
@@ -0,0 +1,224 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>QSqlConnectionDialogUi</class>
+ <widget class="QDialog" name="QSqlConnectionDialogUi" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>315</width>
+    <height>302</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Connect...</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>8</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="connGroupBox" >
+     <property name="title" >
+      <string>Connection settings</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>8</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="1" >
+       <widget class="QComboBox" name="comboDriver" />
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="textLabel4" >
+        <property name="text" >
+         <string>&amp;Username:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>editUsername</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="textLabel2" >
+        <property name="text" >
+         <string>D&amp;river</string>
+        </property>
+        <property name="buddy" >
+         <cstring>comboDriver</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QLineEdit" name="editDatabase" />
+      </item>
+      <item row="5" column="1" >
+       <widget class="QSpinBox" name="portSpinBox" >
+        <property name="specialValueText" >
+         <string>Default</string>
+        </property>
+        <property name="maximum" >
+         <number>65535</number>
+        </property>
+        <property name="minimum" >
+         <number>-1</number>
+        </property>
+        <property name="value" >
+         <number>-1</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="textLabel3" >
+        <property name="text" >
+         <string>Database Name:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>editDatabase</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" >
+       <widget class="QLineEdit" name="editPassword" >
+        <property name="echoMode" >
+         <enum>QLineEdit::Password</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QLineEdit" name="editUsername" />
+      </item>
+      <item row="4" column="1" >
+       <widget class="QLineEdit" name="editHostname" />
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="textLabel5" >
+        <property name="text" >
+         <string>&amp;Hostname:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>editHostname</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="textLabel5_2" >
+        <property name="text" >
+         <string>P&amp;ort:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>portSpinBox</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="textLabel4_2" >
+        <property name="text" >
+         <string>&amp;Password:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>editPassword</cstring>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="dbCheckBox" >
+       <property name="text" >
+        <string>Us&amp;e predefined in-memory database</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okButton" >
+       <property name="text" >
+        <string>&amp;OK</string>
+       </property>
+       <property name="default" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton" >
+       <property name="text" >
+        <string>&amp;Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>comboDriver</tabstop>
+  <tabstop>editDatabase</tabstop>
+  <tabstop>editUsername</tabstop>
+  <tabstop>editPassword</tabstop>
+  <tabstop>editHostname</tabstop>
+  <tabstop>portSpinBox</tabstop>
+  <tabstop>dbCheckBox</tabstop>
+  <tabstop>okButton</tabstop>
+  <tabstop>cancelButton</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/demos/sqlbrowser/sqlbrowser.pro b/demos/sqlbrowser/sqlbrowser.pro
new file mode 100644
index 0000000000..920e8a0011
--- /dev/null
+++ b/demos/sqlbrowser/sqlbrowser.pro
@@ -0,0 +1,23 @@
+TEMPLATE        = app
+TARGET          = sqlbrowser
+
+QT              += sql
+
+HEADERS         = browser.h connectionwidget.h qsqlconnectiondialog.h
+SOURCES         = main.cpp browser.cpp connectionwidget.cpp qsqlconnectiondialog.cpp
+
+FORMS           = browserwidget.ui qsqlconnectiondialog.ui
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/sqlbrowser
+sources.files = $$SOURCES $$HEADERS $$FORMS *.pro
+sources.path = $$[QT_INSTALL_DEMOS]/sqlbrowser
+INSTALLS += target sources
+
+wince*: {
+    DEPLOYMENT_PLUGIN += qsqlite
+}
diff --git a/demos/textedit/example.html b/demos/textedit/example.html
new file mode 100644
index 0000000000..19b5520735
--- /dev/null
+++ b/demos/textedit/example.html
@@ -0,0 +1,79 @@
+<html><head><meta name="qrichtext" content="1" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>QTextEdit Demonstration</title><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
+<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:20pt; font-weight:600;">QTextEdit</span></p>
+<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">The QTextEdit widget is an advanced editor that supports formatted rich text. It can be used to display HTML and other rich document formats. Internally, QTextEdit uses the QTextDocument class to describe both the high-level structure of each document and the low-level formatting of paragraphs.</span></p>
+<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;">If you are viewing this document in the <span style=" font-style:italic;">textedit</span> demo, you can edit this document to explore Qt's rich text editing features. We have included some comments in each of the following sections to encourage you to experiment.  </p>
+<p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:18pt; font-weight:600;"><span style=" font-size:16pt;">Font and Paragraph Styles</span></p>
+<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">QTextEdit supports </span><span style=" font-size:11pt; font-weight:600;">bold</span><span style=" font-size:11pt;">, </span><span style=" font-size:11pt; font-style:italic;">italic</span><span style=" font-size:11pt;">, and </span><span style=" font-size:11pt; text-decoration: underline;">underlined</span><span style=" font-size:11pt;"> font styles, and can display </span><span style=" font-size:11pt; font-weight:600; color:#00007f;">multicolored</span><span style=" font-size:11pt;"> </span><span style=" font-size:11pt; font-weight:600; color:#aa0000;">text</span><span style=" font-size:11pt;">. Font families such as </span><span style=" font-family:'Times'; font-size:11pt; font-weight:600;">Times New Roman</span><span style=" font-size:11pt;"> and </span><span style=" font-family:'Courier'; font-size:11pt; font-weight:600;">Courier</span><span style=" font-size:11pt;"> can also be used directly. </span><span style=" font-size:11pt; font-style:italic;">If you place the cursor in a region of styled text, the controls in the tool bars will change to reflect the current style.</span></p>
+<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;">Paragraphs can be formatted so that the text is left-aligned, right-aligned, centered, or fully justified.</p>
+<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><span style=" font-style:italic;">Try changing the alignment of some text and resize the editor to see how the text layout changes.</span> </p>
+<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt; font-weight:600;">Lists</span></p>
+<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:16pt; font-weight:600;"><span style=" font-size:11pt; font-weight:400;">Different kinds of lists can be included in rich text documents. Standard bullet lists can be nested, using different symbols for each level of the list: </span></p>
+<ul style="-qt-list-indent: 1;"><li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Disc symbols are typically used for top-level list items. </li></ul>
+<ul type=circle style="-qt-list-indent: 2;"><li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Circle symbols can be used to distinguish between items in lower-level lists.</li></ul>
+<ul type=square style="-qt-list-indent: 3;"><li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Square symbols provide a reasonable alternative to discs and circles. </li></ul>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;">Ordered lists can be created that can be used for tables of contents. Different characters can be used to enumerate items, and we can use both Roman and Arabic numerals in the same list structure: </p>
+<ol style="-qt-list-indent: 1;"><li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Introduction</li>
+<li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Qt Tools </li></ol>
+<ol type=a style="-qt-list-indent: 2;"><li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Qt Assistant</li>
+<li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Qt Designer</li>
+<ol type=A style="-qt-list-indent: 3;"><li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Form Editor</li>
+<li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Component Architecture</li></ol>
+<li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Qt Linguist</li></ol>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;">The list will automatically be renumbered if you add or remove items. <span style=" font-style:italic;">Try adding new sections to the above list or removing existing item to see the numbers change.</span> </p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"></p>
+<p style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><span style=" font-size:16pt; font-weight:600;">Images</span></p>
+<p style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:16pt; font-weight:600;"><span style=" font-size:11pt; font-weight:400;">Inline images are treated like ordinary ranges of characters in the text editor, so they flow with the surrounding text. Images can also be selected in the same way as text, making it easy to cut, copy, and paste them. </span></p>
+<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><img src=":/images/logo32.png" /><span style=" font-style:italic;"> Try to select this image by clicking and dragging over it with the mouse, or use the text cursor to select it by holding down Shift and using the arrow keys. You can then cut or copy it, and pasting it into different parts of this document.</span></p>
+<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><span style=" font-size:16pt; font-weight:600;">Tables</span></p>
+<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:16pt; font-weight:600;"><span style=" font-size:11pt; font-weight:400;">QTextEdit can arrange and format tables, supporting features such as row and column spans, text formatting within cells, and size constraints for columns. </span></p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"></p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"></p>
+<table border="1" align="center" width="90%" cellspacing="0" cellpadding="4">
+<tr>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> </p></td>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Development Tools </span></p></td>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Programming Techniques </span></p></td>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Graphical User Interfaces </span></p></td></tr>
+<tr>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">9:00 - 11:00 </span></p></td>
+<td colspan="3">
+<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Introduction to <span style=" font-style:italic;">Qt </span></p></td></tr>
+<tr>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">11:00 - 13:00 </span></p></td>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Using <span style=" font-style:italic;">qmake</span> </p></td>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Object-oriented Programming </p></td>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Layouts in <span style=" font-style:italic;">Qt</span> </p></td></tr>
+<tr>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">13:00 - 15:00 </span></p></td>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Qt Designer</span> Tutorial </p></td>
+<td rowspan="2">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Extreme Programming </p></td>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Writing Custom Styles </p></td></tr>
+<tr>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">15:00 - 17:00 </span></p></td>
+<td>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Qt Linguist</span> and Internationalization </p></td>
+<td></td></tr></table>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt; font-style:italic;">Try adding text to the cells in the table and experiment with the alignment of the paragraphs.</p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><span style=" font-size:16pt; font-weight:600;">Hyperlinks</span></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">QTextEdit is designed to support hyperlinks between documents, and this feature is used extensively in </span><span style=" font-size:11pt; font-style:italic;">Qt Assistant</span><span style=" font-size:11pt;">. Hyperlinks are automatically created when an HTML file is imported into an editor. Since the rich text framework supports hyperlinks natively, they can also be created programatically.</span></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><span style=" font-size:16pt; font-weight:600;">Undo and Redo</span></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;">Full support for undo and redo operations is built into QTextEdit and the underlying rich text framework. Operations on a document can be packaged together to make editing a more comfortable experience for the user.</p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><span style=" font-style:italic;">Try making changes to this document and press Ctrl+Z to undo them. You can always recover  the original contents of the document.</span> </p></body></html>
diff --git a/demos/textedit/images/logo32.png b/demos/textedit/images/logo32.png
new file mode 100644
index 0000000000..5f91e9873b
--- /dev/null
+++ b/demos/textedit/images/logo32.png
diff --git a/demos/textedit/images/mac/editcopy.png b/demos/textedit/images/mac/editcopy.png
new file mode 100644
index 0000000000..f551364464
--- /dev/null
+++ b/demos/textedit/images/mac/editcopy.png
diff --git a/demos/textedit/images/mac/editcut.png b/demos/textedit/images/mac/editcut.png
new file mode 100644
index 0000000000..a784fd5709
--- /dev/null
+++ b/demos/textedit/images/mac/editcut.png
diff --git a/demos/textedit/images/mac/editpaste.png b/demos/textedit/images/mac/editpaste.png
new file mode 100644
index 0000000000..64c0b2d6ab
--- /dev/null
+++ b/demos/textedit/images/mac/editpaste.png
diff --git a/demos/textedit/images/mac/editredo.png b/demos/textedit/images/mac/editredo.png
new file mode 100644
index 0000000000..8875bf246c
--- /dev/null
+++ b/demos/textedit/images/mac/editredo.png
diff --git a/demos/textedit/images/mac/editundo.png b/demos/textedit/images/mac/editundo.png
new file mode 100644
index 0000000000..a3bd5e0bf2
--- /dev/null
+++ b/demos/textedit/images/mac/editundo.png
diff --git a/demos/textedit/images/mac/exportpdf.png b/demos/textedit/images/mac/exportpdf.png
new file mode 100644
index 0000000000..ebb44e6b88
--- /dev/null
+++ b/demos/textedit/images/mac/exportpdf.png
diff --git a/demos/textedit/images/mac/filenew.png b/demos/textedit/images/mac/filenew.png
new file mode 100644
index 0000000000..d3882c7b3f
--- /dev/null
+++ b/demos/textedit/images/mac/filenew.png
diff --git a/demos/textedit/images/mac/fileopen.png b/demos/textedit/images/mac/fileopen.png
new file mode 100644
index 0000000000..fc06c5ec63
--- /dev/null
+++ b/demos/textedit/images/mac/fileopen.png
diff --git a/demos/textedit/images/mac/fileprint.png b/demos/textedit/images/mac/fileprint.png
new file mode 100644
index 0000000000..10ca56c82a
--- /dev/null
+++ b/demos/textedit/images/mac/fileprint.png
diff --git a/demos/textedit/images/mac/filesave.png b/demos/textedit/images/mac/filesave.png
new file mode 100644
index 0000000000..b41ecf5319
--- /dev/null
+++ b/demos/textedit/images/mac/filesave.png
diff --git a/demos/textedit/images/mac/textbold.png b/demos/textedit/images/mac/textbold.png
new file mode 100644
index 0000000000..38400bd1f6
--- /dev/null
+++ b/demos/textedit/images/mac/textbold.png
diff --git a/demos/textedit/images/mac/textcenter.png b/demos/textedit/images/mac/textcenter.png
new file mode 100644
index 0000000000..2ef5b2ee6f
--- /dev/null
+++ b/demos/textedit/images/mac/textcenter.png
diff --git a/demos/textedit/images/mac/textitalic.png b/demos/textedit/images/mac/textitalic.png
new file mode 100644
index 0000000000..0170ee26a6
--- /dev/null
+++ b/demos/textedit/images/mac/textitalic.png
diff --git a/demos/textedit/images/mac/textjustify.png b/demos/textedit/images/mac/textjustify.png
new file mode 100644
index 0000000000..39cd6c1a9d
--- /dev/null
+++ b/demos/textedit/images/mac/textjustify.png
diff --git a/demos/textedit/images/mac/textleft.png b/demos/textedit/images/mac/textleft.png
new file mode 100644
index 0000000000..83a66d5535
--- /dev/null
+++ b/demos/textedit/images/mac/textleft.png
diff --git a/demos/textedit/images/mac/textright.png b/demos/textedit/images/mac/textright.png
new file mode 100644
index 0000000000..e7c04645cf
--- /dev/null
+++ b/demos/textedit/images/mac/textright.png
diff --git a/demos/textedit/images/mac/textunder.png b/demos/textedit/images/mac/textunder.png
new file mode 100644
index 0000000000..968bac5e90
--- /dev/null
+++ b/demos/textedit/images/mac/textunder.png
diff --git a/demos/textedit/images/mac/zoomin.png b/demos/textedit/images/mac/zoomin.png
new file mode 100644
index 0000000000..d46f5aff0d
--- /dev/null
+++ b/demos/textedit/images/mac/zoomin.png
diff --git a/demos/textedit/images/mac/zoomout.png b/demos/textedit/images/mac/zoomout.png
new file mode 100644
index 0000000000..46326566d1
--- /dev/null
+++ b/demos/textedit/images/mac/zoomout.png
diff --git a/demos/textedit/images/win/editcopy.png b/demos/textedit/images/win/editcopy.png
new file mode 100644
index 0000000000..1121b47d8b
--- /dev/null
+++ b/demos/textedit/images/win/editcopy.png
diff --git a/demos/textedit/images/win/editcut.png b/demos/textedit/images/win/editcut.png
new file mode 100644
index 0000000000..38e55f7420
--- /dev/null
+++ b/demos/textedit/images/win/editcut.png
diff --git a/demos/textedit/images/win/editpaste.png b/demos/textedit/images/win/editpaste.png
new file mode 100644
index 0000000000..ffab15aaf8
--- /dev/null
+++ b/demos/textedit/images/win/editpaste.png
diff --git a/demos/textedit/images/win/editredo.png b/demos/textedit/images/win/editredo.png
new file mode 100644
index 0000000000..9d679fe6fc
--- /dev/null
+++ b/demos/textedit/images/win/editredo.png
diff --git a/demos/textedit/images/win/editundo.png b/demos/textedit/images/win/editundo.png
new file mode 100644
index 0000000000..eee23d24a3
--- /dev/null
+++ b/demos/textedit/images/win/editundo.png
diff --git a/demos/textedit/images/win/exportpdf.png b/demos/textedit/images/win/exportpdf.png
new file mode 100644
index 0000000000..eef5132928
--- /dev/null
+++ b/demos/textedit/images/win/exportpdf.png
diff --git a/demos/textedit/images/win/filenew.png b/demos/textedit/images/win/filenew.png
new file mode 100644
index 0000000000..af5d122141
--- /dev/null
+++ b/demos/textedit/images/win/filenew.png
diff --git a/demos/textedit/images/win/fileopen.png b/demos/textedit/images/win/fileopen.png
new file mode 100644
index 0000000000..fc6f17e977
--- /dev/null
+++ b/demos/textedit/images/win/fileopen.png
diff --git a/demos/textedit/images/win/fileprint.png b/demos/textedit/images/win/fileprint.png
new file mode 100644
index 0000000000..ba7c02dc18
--- /dev/null
+++ b/demos/textedit/images/win/fileprint.png
diff --git a/demos/textedit/images/win/filesave.png b/demos/textedit/images/win/filesave.png
new file mode 100644
index 0000000000..8feec99bee
--- /dev/null
+++ b/demos/textedit/images/win/filesave.png
diff --git a/demos/textedit/images/win/textbold.png b/demos/textedit/images/win/textbold.png
new file mode 100644
index 0000000000..9cbc7138b9
--- /dev/null
+++ b/demos/textedit/images/win/textbold.png
diff --git a/demos/textedit/images/win/textcenter.png b/demos/textedit/images/win/textcenter.png
new file mode 100644
index 0000000000..11efb4b852
--- /dev/null
+++ b/demos/textedit/images/win/textcenter.png
diff --git a/demos/textedit/images/win/textitalic.png b/demos/textedit/images/win/textitalic.png
new file mode 100644
index 0000000000..b30ce14c14
--- /dev/null
+++ b/demos/textedit/images/win/textitalic.png
diff --git a/demos/textedit/images/win/textjustify.png b/demos/textedit/images/win/textjustify.png
new file mode 100644
index 0000000000..9de0c88085
--- /dev/null
+++ b/demos/textedit/images/win/textjustify.png
diff --git a/demos/textedit/images/win/textleft.png b/demos/textedit/images/win/textleft.png
new file mode 100644
index 0000000000..16f80bc325
--- /dev/null
+++ b/demos/textedit/images/win/textleft.png
diff --git a/demos/textedit/images/win/textright.png b/demos/textedit/images/win/textright.png
new file mode 100644
index 0000000000..16872df62a
--- /dev/null
+++ b/demos/textedit/images/win/textright.png
diff --git a/demos/textedit/images/win/textunder.png b/demos/textedit/images/win/textunder.png
new file mode 100644
index 0000000000..c72eff53fb
--- /dev/null
+++ b/demos/textedit/images/win/textunder.png
diff --git a/demos/textedit/images/win/zoomin.png b/demos/textedit/images/win/zoomin.png
new file mode 100644
index 0000000000..2e586fc7bf
--- /dev/null
+++ b/demos/textedit/images/win/zoomin.png
diff --git a/demos/textedit/images/win/zoomout.png b/demos/textedit/images/win/zoomout.png
new file mode 100644
index 0000000000..a736d39343
--- /dev/null
+++ b/demos/textedit/images/win/zoomout.png
diff --git a/demos/textedit/main.cpp b/demos/textedit/main.cpp
new file mode 100644
index 0000000000..fa38ecb36d
--- /dev/null
+++ b/demos/textedit/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "textedit.h"
+#include <QApplication>
+
+int main( int argc, char ** argv )
+{
+    Q_INIT_RESOURCE(textedit);
+
+    QApplication a( argc, argv );
+    TextEdit mw;
+    mw.resize( 700, 800 );
+    mw.show();
+    return a.exec();
+}
diff --git a/demos/textedit/textedit.cpp b/demos/textedit/textedit.cpp
new file mode 100644
index 0000000000..128cd6a101
--- /dev/null
+++ b/demos/textedit/textedit.cpp
@@ -0,0 +1,688 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "textedit.h"
+
+#include <QAction>
+#include <QApplication>
+#include <QClipboard>
+#include <QColorDialog>
+#include <QComboBox>
+#include <QFontComboBox>
+#include <QFile>
+#include <QFileDialog>
+#include <QFileInfo>
+#include <QFontDatabase>
+#include <QMenu>
+#include <QMenuBar>
+#include <QPrintDialog>
+#include <QPrinter>
+#include <QTextCodec>
+#include <QTextEdit>
+#include <QToolBar>
+#include <QTextCursor>
+#include <QTextDocumentWriter>
+#include <QTextList>
+#include <QtDebug>
+#include <QCloseEvent>
+#include <QMessageBox>
+#include <QPrintPreviewDialog>
+
+#ifdef Q_WS_MAC
+const QString rsrcPath = ":/images/mac";
+#else
+const QString rsrcPath = ":/images/win";
+#endif
+
+TextEdit::TextEdit(QWidget *parent)
+    : QMainWindow(parent)
+{
+    setupFileActions();
+    setupEditActions();
+    setupTextActions();
+
+    {
+        QMenu *helpMenu = new QMenu(tr("Help"), this);
+        menuBar()->addMenu(helpMenu);
+        helpMenu->addAction(tr("About"), this, SLOT(about()));
+        helpMenu->addAction(tr("About &Qt"), qApp, SLOT(aboutQt()));
+    }
+
+    textEdit = new QTextEdit(this);
+    connect(textEdit, SIGNAL(currentCharFormatChanged(const QTextCharFormat &)),
+            this, SLOT(currentCharFormatChanged(const QTextCharFormat &)));
+    connect(textEdit, SIGNAL(cursorPositionChanged()),
+            this, SLOT(cursorPositionChanged()));
+
+    setCentralWidget(textEdit);
+    textEdit->setFocus();
+    setCurrentFileName(QString());
+
+    fontChanged(textEdit->font());
+    colorChanged(textEdit->textColor());
+    alignmentChanged(textEdit->alignment());
+
+    connect(textEdit->document(), SIGNAL(modificationChanged(bool)),
+            actionSave, SLOT(setEnabled(bool)));
+    connect(textEdit->document(), SIGNAL(modificationChanged(bool)),
+            this, SLOT(setWindowModified(bool)));
+    connect(textEdit->document(), SIGNAL(undoAvailable(bool)),
+            actionUndo, SLOT(setEnabled(bool)));
+    connect(textEdit->document(), SIGNAL(redoAvailable(bool)),
+            actionRedo, SLOT(setEnabled(bool)));
+
+    setWindowModified(textEdit->document()->isModified());
+    actionSave->setEnabled(textEdit->document()->isModified());
+    actionUndo->setEnabled(textEdit->document()->isUndoAvailable());
+    actionRedo->setEnabled(textEdit->document()->isRedoAvailable());
+
+    connect(actionUndo, SIGNAL(triggered()), textEdit, SLOT(undo()));
+    connect(actionRedo, SIGNAL(triggered()), textEdit, SLOT(redo()));
+
+    actionCut->setEnabled(false);
+    actionCopy->setEnabled(false);
+
+    connect(actionCut, SIGNAL(triggered()), textEdit, SLOT(cut()));
+    connect(actionCopy, SIGNAL(triggered()), textEdit, SLOT(copy()));
+    connect(actionPaste, SIGNAL(triggered()), textEdit, SLOT(paste()));
+
+    connect(textEdit, SIGNAL(copyAvailable(bool)), actionCut, SLOT(setEnabled(bool)));
+    connect(textEdit, SIGNAL(copyAvailable(bool)), actionCopy, SLOT(setEnabled(bool)));
+
+    connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(clipboardDataChanged()));
+
+    QString initialFile = ":/example.html";
+    const QStringList args = QCoreApplication::arguments();
+    if (args.count() == 2)
+        initialFile = args.at(1);
+
+    if (!load(initialFile))
+        fileNew();
+}
+
+void TextEdit::closeEvent(QCloseEvent *e)
+{
+    if (maybeSave())
+        e->accept();
+    else
+        e->ignore();
+}
+
+void TextEdit::setupFileActions()
+{
+    QToolBar *tb = new QToolBar(this);
+    tb->setWindowTitle(tr("File Actions"));
+    addToolBar(tb);
+
+    QMenu *menu = new QMenu(tr("&File"), this);
+    menuBar()->addMenu(menu);
+
+    QAction *a;
+
+    a = new QAction(QIcon(rsrcPath + "/filenew.png"), tr("&New"), this);
+    a->setShortcut(QKeySequence::New);
+    connect(a, SIGNAL(triggered()), this, SLOT(fileNew()));
+    tb->addAction(a);
+    menu->addAction(a);
+
+    a = new QAction(QIcon(rsrcPath + "/fileopen.png"), tr("&Open..."), this);
+    a->setShortcut(QKeySequence::Open);
+    connect(a, SIGNAL(triggered()), this, SLOT(fileOpen()));
+    tb->addAction(a);
+    menu->addAction(a);
+
+    menu->addSeparator();
+
+    actionSave = a = new QAction(QIcon(rsrcPath + "/filesave.png"), tr("&Save"), this);
+    a->setShortcut(QKeySequence::Save);
+    connect(a, SIGNAL(triggered()), this, SLOT(fileSave()));
+    a->setEnabled(false);
+    tb->addAction(a);
+    menu->addAction(a);
+
+    a = new QAction(tr("Save &As..."), this);
+    connect(a, SIGNAL(triggered()), this, SLOT(fileSaveAs()));
+    menu->addAction(a);
+    menu->addSeparator();
+
+#ifndef QT_NO_PRINTER
+    a = new QAction(QIcon(rsrcPath + "/fileprint.png"), tr("&Print..."), this);
+    a->setShortcut(QKeySequence::Print);
+    connect(a, SIGNAL(triggered()), this, SLOT(filePrint()));
+    tb->addAction(a);
+    menu->addAction(a);
+
+    a = new QAction(QIcon(rsrcPath + "/fileprint.png"), tr("Print Preview..."), this);
+    connect(a, SIGNAL(triggered()), this, SLOT(filePrintPreview()));
+    menu->addAction(a);
+
+    a = new QAction(QIcon(rsrcPath + "/exportpdf.png"), tr("&Export PDF..."), this);
+    a->setShortcut(Qt::CTRL + Qt::Key_D);
+    connect(a, SIGNAL(triggered()), this, SLOT(filePrintPdf()));
+    tb->addAction(a);
+    menu->addAction(a);
+
+    menu->addSeparator();
+#endif
+
+    a = new QAction(tr("&Quit"), this);
+    a->setShortcut(Qt::CTRL + Qt::Key_Q);
+    connect(a, SIGNAL(triggered()), this, SLOT(close()));
+    menu->addAction(a);
+}
+
+void TextEdit::setupEditActions()
+{
+    QToolBar *tb = new QToolBar(this);
+    tb->setWindowTitle(tr("Edit Actions"));
+    addToolBar(tb);
+
+    QMenu *menu = new QMenu(tr("&Edit"), this);
+    menuBar()->addMenu(menu);
+
+    QAction *a;
+    a = actionUndo = new QAction(QIcon(rsrcPath + "/editundo.png"), tr("&Undo"), this);
+    a->setShortcut(QKeySequence::Undo);
+    tb->addAction(a);
+    menu->addAction(a);
+    a = actionRedo = new QAction(QIcon(rsrcPath + "/editredo.png"), tr("&Redo"), this);
+    a->setShortcut(QKeySequence::Redo);
+    tb->addAction(a);
+    menu->addAction(a);
+    menu->addSeparator();
+    a = actionCut = new QAction(QIcon(rsrcPath + "/editcut.png"), tr("Cu&t"), this);
+    a->setShortcut(QKeySequence::Cut);
+    tb->addAction(a);
+    menu->addAction(a);
+    a = actionCopy = new QAction(QIcon(rsrcPath + "/editcopy.png"), tr("&Copy"), this);
+    a->setShortcut(QKeySequence::Copy);
+    tb->addAction(a);
+    menu->addAction(a);
+    a = actionPaste = new QAction(QIcon(rsrcPath + "/editpaste.png"), tr("&Paste"), this);
+    a->setShortcut(QKeySequence::Paste);
+    tb->addAction(a);
+    menu->addAction(a);
+    actionPaste->setEnabled(!QApplication::clipboard()->text().isEmpty());
+}
+
+void TextEdit::setupTextActions()
+{
+    QToolBar *tb = new QToolBar(this);
+    tb->setWindowTitle(tr("Format Actions"));
+    addToolBar(tb);
+
+    QMenu *menu = new QMenu(tr("F&ormat"), this);
+    menuBar()->addMenu(menu);
+
+    actionTextBold = new QAction(QIcon(rsrcPath + "/textbold.png"), tr("&Bold"), this);
+    actionTextBold->setShortcut(Qt::CTRL + Qt::Key_B);
+    QFont bold;
+    bold.setBold(true);
+    actionTextBold->setFont(bold);
+    connect(actionTextBold, SIGNAL(triggered()), this, SLOT(textBold()));
+    tb->addAction(actionTextBold);
+    menu->addAction(actionTextBold);
+    actionTextBold->setCheckable(true);
+
+    actionTextItalic = new QAction(QIcon(rsrcPath + "/textitalic.png"), tr("&Italic"), this);
+    actionTextItalic->setShortcut(Qt::CTRL + Qt::Key_I);
+    QFont italic;
+    italic.setItalic(true);
+    actionTextItalic->setFont(italic);
+    connect(actionTextItalic, SIGNAL(triggered()), this, SLOT(textItalic()));
+    tb->addAction(actionTextItalic);
+    menu->addAction(actionTextItalic);
+    actionTextItalic->setCheckable(true);
+
+    actionTextUnderline = new QAction(QIcon(rsrcPath + "/textunder.png"), tr("&Underline"), this);
+    actionTextUnderline->setShortcut(Qt::CTRL + Qt::Key_U);
+    QFont underline;
+    underline.setUnderline(true);
+    actionTextUnderline->setFont(underline);
+    connect(actionTextUnderline, SIGNAL(triggered()), this, SLOT(textUnderline()));
+    tb->addAction(actionTextUnderline);
+    menu->addAction(actionTextUnderline);
+    actionTextUnderline->setCheckable(true);
+
+    menu->addSeparator();
+
+    QActionGroup *grp = new QActionGroup(this);
+    connect(grp, SIGNAL(triggered(QAction *)), this, SLOT(textAlign(QAction *)));
+
+    // Make sure the alignLeft  is always left of the alignRight
+    if (QApplication::isLeftToRight()) {
+        actionAlignLeft = new QAction(QIcon(rsrcPath + "/textleft.png"), tr("&Left"), grp);
+        actionAlignCenter = new QAction(QIcon(rsrcPath + "/textcenter.png"), tr("C&enter"), grp);
+        actionAlignRight = new QAction(QIcon(rsrcPath + "/textright.png"), tr("&Right"), grp);
+    } else {
+        actionAlignRight = new QAction(QIcon(rsrcPath + "/textright.png"), tr("&Right"), grp);
+        actionAlignCenter = new QAction(QIcon(rsrcPath + "/textcenter.png"), tr("C&enter"), grp);
+        actionAlignLeft = new QAction(QIcon(rsrcPath + "/textleft.png"), tr("&Left"), grp);
+    }
+    actionAlignJustify = new QAction(QIcon(rsrcPath + "/textjustify.png"), tr("&Justify"), grp);
+
+    actionAlignLeft->setShortcut(Qt::CTRL + Qt::Key_L);
+    actionAlignLeft->setCheckable(true);
+    actionAlignCenter->setShortcut(Qt::CTRL + Qt::Key_E);
+    actionAlignCenter->setCheckable(true);
+    actionAlignRight->setShortcut(Qt::CTRL + Qt::Key_R);
+    actionAlignRight->setCheckable(true);
+    actionAlignJustify->setShortcut(Qt::CTRL + Qt::Key_J);
+    actionAlignJustify->setCheckable(true);
+
+    tb->addActions(grp->actions());
+    menu->addActions(grp->actions());
+
+    menu->addSeparator();
+
+    QPixmap pix(16, 16);
+    pix.fill(Qt::black);
+    actionTextColor = new QAction(pix, tr("&Color..."), this);
+    connect(actionTextColor, SIGNAL(triggered()), this, SLOT(textColor()));
+    tb->addAction(actionTextColor);
+    menu->addAction(actionTextColor);
+
+
+    tb = new QToolBar(this);
+    tb->setAllowedAreas(Qt::TopToolBarArea | Qt::BottomToolBarArea);
+    tb->setWindowTitle(tr("Format Actions"));
+    addToolBarBreak(Qt::TopToolBarArea);
+    addToolBar(tb);
+
+    comboStyle = new QComboBox(tb);
+    tb->addWidget(comboStyle);
+    comboStyle->addItem("Standard");
+    comboStyle->addItem("Bullet List (Disc)");
+    comboStyle->addItem("Bullet List (Circle)");
+    comboStyle->addItem("Bullet List (Square)");
+    comboStyle->addItem("Ordered List (Decimal)");
+    comboStyle->addItem("Ordered List (Alpha lower)");
+    comboStyle->addItem("Ordered List (Alpha upper)");
+    connect(comboStyle, SIGNAL(activated(int)),
+            this, SLOT(textStyle(int)));
+
+    comboFont = new QFontComboBox(tb);
+    tb->addWidget(comboFont);
+    connect(comboFont, SIGNAL(activated(const QString &)),
+            this, SLOT(textFamily(const QString &)));
+
+    comboSize = new QComboBox(tb);
+    comboSize->setObjectName("comboSize");
+    tb->addWidget(comboSize);
+    comboSize->setEditable(true);
+
+    QFontDatabase db;
+    foreach(int size, db.standardSizes())
+        comboSize->addItem(QString::number(size));
+
+    connect(comboSize, SIGNAL(activated(const QString &)),
+            this, SLOT(textSize(const QString &)));
+    comboSize->setCurrentIndex(comboSize->findText(QString::number(QApplication::font()
+                                                                   .pointSize())));
+}
+
+bool TextEdit::load(const QString &f)
+{
+    if (!QFile::exists(f))
+        return false;
+    QFile file(f);
+    if (!file.open(QFile::ReadOnly))
+        return false;
+
+    QByteArray data = file.readAll();
+    QTextCodec *codec = Qt::codecForHtml(data);
+    QString str = codec->toUnicode(data);
+    if (Qt::mightBeRichText(str)) {
+        textEdit->setHtml(str);
+    } else {
+        str = QString::fromLocal8Bit(data);
+        textEdit->setPlainText(str);
+    }
+
+    setCurrentFileName(f);
+    return true;
+}
+
+bool TextEdit::maybeSave()
+{
+    if (!textEdit->document()->isModified())
+        return true;
+    if (fileName.startsWith(QLatin1String(":/")))
+        return true;
+    QMessageBox::StandardButton ret;
+    ret = QMessageBox::warning(this, tr("Application"),
+                               tr("The document has been modified.\n"
+                                  "Do you want to save your changes?"),
+                               QMessageBox::Save | QMessageBox::Discard
+                               | QMessageBox::Cancel);
+    if (ret == QMessageBox::Save)
+        return fileSave();
+    else if (ret == QMessageBox::Cancel)
+        return false;
+    return true;
+}
+
+void TextEdit::setCurrentFileName(const QString &fileName)
+{
+    this->fileName = fileName;
+    textEdit->document()->setModified(false);
+
+    QString shownName;
+    if (fileName.isEmpty())
+        shownName = "untitled.txt";
+    else
+        shownName = QFileInfo(fileName).fileName();
+
+    setWindowTitle(tr("%1[*] - %2").arg(shownName).arg(tr("Rich Text")));
+    setWindowModified(false);
+}
+
+void TextEdit::fileNew()
+{
+    if (maybeSave()) {
+        textEdit->clear();
+        setCurrentFileName(QString());
+    }
+}
+
+void TextEdit::fileOpen()
+{
+    QString fn = QFileDialog::getOpenFileName(this, tr("Open File..."),
+                                              QString(), tr("HTML-Files (*.htm *.html);;All Files (*)"));
+    if (!fn.isEmpty())
+        load(fn);
+}
+
+bool TextEdit::fileSave()
+{
+    if (fileName.isEmpty())
+        return fileSaveAs();
+
+    QTextDocumentWriter writer(fileName);
+    bool success = writer.write(textEdit->document());
+    if (success)
+        textEdit->document()->setModified(false);
+    return success;
+}
+
+bool TextEdit::fileSaveAs()
+{
+    QString fn = QFileDialog::getSaveFileName(this, tr("Save as..."),
+                                              QString(), tr("ODF files (*.odt);;HTML-Files (*.htm *.html);;All Files (*)"));
+    if (fn.isEmpty())
+        return false;
+    if (! (fn.endsWith(".odt", Qt::CaseInsensitive) || fn.endsWith(".htm", Qt::CaseInsensitive) || fn.endsWith(".html", Qt::CaseInsensitive)) )
+        fn += ".odt"; // default
+    setCurrentFileName(fn);
+    return fileSave();
+}
+
+void TextEdit::filePrint()
+{
+#ifndef QT_NO_PRINTER
+    QPrinter printer(QPrinter::HighResolution);
+    QPrintDialog *dlg = new QPrintDialog(&printer, this);
+    if (textEdit->textCursor().hasSelection())
+        dlg->addEnabledOption(QAbstractPrintDialog::PrintSelection);
+    dlg->setWindowTitle(tr("Print Document"));
+    if (dlg->exec() == QDialog::Accepted) {
+        textEdit->print(&printer);
+    }
+    delete dlg;
+#endif
+}
+
+void TextEdit::filePrintPreview()
+{
+#ifndef QT_NO_PRINTER
+    QPrinter printer(QPrinter::HighResolution);
+    QPrintPreviewDialog preview(&printer, this);
+    connect(&preview, SIGNAL(paintRequested(QPrinter *)), SLOT(printPreview(QPrinter *)));
+    preview.exec();
+#endif
+}
+
+void TextEdit::printPreview(QPrinter *printer)
+{
+#ifdef QT_NO_PRINTER
+    Q_UNUSED(printer);
+#else
+    textEdit->print(printer);
+#endif
+}
+
+
+void TextEdit::filePrintPdf()
+{
+#ifndef QT_NO_PRINTER
+//! [0]
+    QString fileName = QFileDialog::getSaveFileName(this, "Export PDF",
+                                                    QString(), "*.pdf");
+    if (!fileName.isEmpty()) {
+        if (QFileInfo(fileName).suffix().isEmpty())
+            fileName.append(".pdf");
+        QPrinter printer(QPrinter::HighResolution);
+        printer.setOutputFormat(QPrinter::PdfFormat);
+        printer.setOutputFileName(fileName);
+        textEdit->document()->print(&printer);
+    }
+//! [0]
+#endif
+}
+
+void TextEdit::textBold()
+{
+    QTextCharFormat fmt;
+    fmt.setFontWeight(actionTextBold->isChecked() ? QFont::Bold : QFont::Normal);
+    mergeFormatOnWordOrSelection(fmt);
+}
+
+void TextEdit::textUnderline()
+{
+    QTextCharFormat fmt;
+    fmt.setFontUnderline(actionTextUnderline->isChecked());
+    mergeFormatOnWordOrSelection(fmt);
+}
+
+void TextEdit::textItalic()
+{
+    QTextCharFormat fmt;
+    fmt.setFontItalic(actionTextItalic->isChecked());
+    mergeFormatOnWordOrSelection(fmt);
+}
+
+void TextEdit::textFamily(const QString &f)
+{
+    QTextCharFormat fmt;
+    fmt.setFontFamily(f);
+    mergeFormatOnWordOrSelection(fmt);
+}
+
+void TextEdit::textSize(const QString &p)
+{
+    qreal pointSize = p.toFloat();
+    if (p.toFloat() > 0) {
+        QTextCharFormat fmt;
+        fmt.setFontPointSize(pointSize);
+        mergeFormatOnWordOrSelection(fmt);
+    }
+}
+
+void TextEdit::textStyle(int styleIndex)
+{
+    QTextCursor cursor = textEdit->textCursor();
+
+    if (styleIndex != 0) {
+        QTextListFormat::Style style = QTextListFormat::ListDisc;
+
+        switch (styleIndex) {
+            default:
+            case 1:
+                style = QTextListFormat::ListDisc;
+                break;
+            case 2:
+                style = QTextListFormat::ListCircle;
+                break;
+            case 3:
+                style = QTextListFormat::ListSquare;
+                break;
+            case 4:
+                style = QTextListFormat::ListDecimal;
+                break;
+            case 5:
+                style = QTextListFormat::ListLowerAlpha;
+                break;
+            case 6:
+                style = QTextListFormat::ListUpperAlpha;
+                break;
+        }
+
+        cursor.beginEditBlock();
+
+        QTextBlockFormat blockFmt = cursor.blockFormat();
+
+        QTextListFormat listFmt;
+
+        if (cursor.currentList()) {
+            listFmt = cursor.currentList()->format();
+        } else {
+            listFmt.setIndent(blockFmt.indent() + 1);
+            blockFmt.setIndent(0);
+            cursor.setBlockFormat(blockFmt);
+        }
+
+        listFmt.setStyle(style);
+
+        cursor.createList(listFmt);
+
+        cursor.endEditBlock();
+    } else {
+        // ####
+        QTextBlockFormat bfmt;
+        bfmt.setObjectIndex(-1);
+        cursor.mergeBlockFormat(bfmt);
+    }
+}
+
+void TextEdit::textColor()
+{
+    QColor col = QColorDialog::getColor(textEdit->textColor(), this);
+    if (!col.isValid())
+        return;
+    QTextCharFormat fmt;
+    fmt.setForeground(col);
+    mergeFormatOnWordOrSelection(fmt);
+    colorChanged(col);
+}
+
+void TextEdit::textAlign(QAction *a)
+{
+    if (a == actionAlignLeft)
+        textEdit->setAlignment(Qt::AlignLeft | Qt::AlignAbsolute);
+    else if (a == actionAlignCenter)
+        textEdit->setAlignment(Qt::AlignHCenter);
+    else if (a == actionAlignRight)
+        textEdit->setAlignment(Qt::AlignRight | Qt::AlignAbsolute);
+    else if (a == actionAlignJustify)
+        textEdit->setAlignment(Qt::AlignJustify);
+}
+
+void TextEdit::currentCharFormatChanged(const QTextCharFormat &format)
+{
+    fontChanged(format.font());
+    colorChanged(format.foreground().color());
+}
+
+void TextEdit::cursorPositionChanged()
+{
+    alignmentChanged(textEdit->alignment());
+}
+
+void TextEdit::clipboardDataChanged()
+{
+    actionPaste->setEnabled(!QApplication::clipboard()->text().isEmpty());
+}
+
+void TextEdit::about()
+{
+    QMessageBox::about(this, tr("About"), tr("This example demonstrates Qt's "
+        "rich text editing facilities in action, providing an example "
+        "document for you to experiment with."));
+}
+
+void TextEdit::mergeFormatOnWordOrSelection(const QTextCharFormat &format)
+{
+    QTextCursor cursor = textEdit->textCursor();
+    if (!cursor.hasSelection())
+        cursor.select(QTextCursor::WordUnderCursor);
+    cursor.mergeCharFormat(format);
+    textEdit->mergeCurrentCharFormat(format);
+}
+
+void TextEdit::fontChanged(const QFont &f)
+{
+    comboFont->setCurrentIndex(comboFont->findText(QFontInfo(f).family()));
+    comboSize->setCurrentIndex(comboSize->findText(QString::number(f.pointSize())));
+    actionTextBold->setChecked(f.bold());
+    actionTextItalic->setChecked(f.italic());
+    actionTextUnderline->setChecked(f.underline());
+}
+
+void TextEdit::colorChanged(const QColor &c)
+{
+    QPixmap pix(16, 16);
+    pix.fill(c);
+    actionTextColor->setIcon(pix);
+}
+
+void TextEdit::alignmentChanged(Qt::Alignment a)
+{
+    if (a & Qt::AlignLeft) {
+        actionAlignLeft->setChecked(true);
+    } else if (a & Qt::AlignHCenter) {
+        actionAlignCenter->setChecked(true);
+    } else if (a & Qt::AlignRight) {
+        actionAlignRight->setChecked(true);
+    } else if (a & Qt::AlignJustify) {
+        actionAlignJustify->setChecked(true);
+    }
+}
+
diff --git a/demos/textedit/textedit.doc b/demos/textedit/textedit.doc
new file mode 100644
index 0000000000..53279b93e5
--- /dev/null
+++ b/demos/textedit/textedit.doc
@@ -0,0 +1,18 @@
+/*!   \page textedit-example.html
+
+  \ingroup examples
+  \title Text Edit Example
+
+  This example displays a text editor with the user interface written
+  in pure C++. 
+  
+  A similar example which uses \link designer-manual.book Qt
+  Designer\endlink to produce the user interface is in the \link
+  designer-manual.book Qt Designer manual\endlink.
+
+
+  See \c{$QTDIR/examples/textedit} for the source code.
+
+*/
+
+
diff --git a/demos/textedit/textedit.h b/demos/textedit/textedit.h
new file mode 100644
index 0000000000..1fb09f94e5
--- /dev/null
+++ b/demos/textedit/textedit.h
@@ -0,0 +1,129 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TEXTEDIT_H
+#define TEXTEDIT_H
+
+#include <QMainWindow>
+#include <QMap>
+#include <QPointer>
+
+QT_FORWARD_DECLARE_CLASS(QAction)
+QT_FORWARD_DECLARE_CLASS(QComboBox)
+QT_FORWARD_DECLARE_CLASS(QFontComboBox)
+QT_FORWARD_DECLARE_CLASS(QTextEdit)
+QT_FORWARD_DECLARE_CLASS(QTextCharFormat)
+QT_FORWARD_DECLARE_CLASS(QMenu)
+
+class TextEdit : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    TextEdit(QWidget *parent = 0);
+
+protected:
+    virtual void closeEvent(QCloseEvent *e);
+
+private:
+    void setupFileActions();
+    void setupEditActions();
+    void setupTextActions();
+    bool load(const QString &f);
+    bool maybeSave();
+    void setCurrentFileName(const QString &fileName);
+
+private slots:
+    void fileNew();
+    void fileOpen();
+    bool fileSave();
+    bool fileSaveAs();
+    void filePrint();
+    void filePrintPreview();
+    void filePrintPdf();
+
+    void textBold();
+    void textUnderline();
+    void textItalic();
+    void textFamily(const QString &f);
+    void textSize(const QString &p);
+    void textStyle(int styleIndex);
+    void textColor();
+    void textAlign(QAction *a);
+
+    void currentCharFormatChanged(const QTextCharFormat &format);
+    void cursorPositionChanged();
+
+    void clipboardDataChanged();
+    void about();
+    void printPreview(QPrinter *);
+
+private:
+    void mergeFormatOnWordOrSelection(const QTextCharFormat &format);
+    void fontChanged(const QFont &f);
+    void colorChanged(const QColor &c);
+    void alignmentChanged(Qt::Alignment a);
+
+    QAction *actionSave,
+        *actionTextBold,
+        *actionTextUnderline,
+        *actionTextItalic,
+        *actionTextColor,
+        *actionAlignLeft,
+        *actionAlignCenter,
+        *actionAlignRight,
+        *actionAlignJustify,
+        *actionUndo,
+        *actionRedo,
+        *actionCut,
+        *actionCopy,
+        *actionPaste;
+
+    QComboBox *comboStyle;
+    QFontComboBox *comboFont;
+    QComboBox *comboSize;
+
+    QToolBar *tb;
+    QString fileName;
+    QTextEdit *textEdit;
+};
+
+#endif
diff --git a/demos/textedit/textedit.pro b/demos/textedit/textedit.pro
new file mode 100644
index 0000000000..1ef4256a73
--- /dev/null
+++ b/demos/textedit/textedit.pro
@@ -0,0 +1,21 @@
+TEMPLATE        = app
+TARGET          = textedit
+
+CONFIG          += qt warn_on
+
+HEADERS         = textedit.h
+SOURCES         = textedit.cpp \
+                  main.cpp
+
+RESOURCES += textedit.qrc
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/textedit
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.doc images
+sources.path = $$[QT_INSTALL_DEMOS]/textedit
+INSTALLS += target sources
+
diff --git a/demos/textedit/textedit.qrc b/demos/textedit/textedit.qrc
new file mode 100644
index 0000000000..7d6efd7d67
--- /dev/null
+++ b/demos/textedit/textedit.qrc
@@ -0,0 +1,44 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+  <file>images/logo32.png</file>
+  <file>images/mac/editcopy.png</file>
+  <file>images/mac/editcut.png</file>
+  <file>images/mac/editpaste.png</file>
+  <file>images/mac/editredo.png</file>
+  <file>images/mac/editundo.png</file>
+  <file>images/mac/exportpdf.png</file>
+  <file>images/mac/filenew.png</file>
+  <file>images/mac/fileopen.png</file>
+  <file>images/mac/fileprint.png</file>
+  <file>images/mac/filesave.png</file>
+  <file>images/mac/textbold.png</file>
+  <file>images/mac/textcenter.png</file>
+  <file>images/mac/textitalic.png</file>
+  <file>images/mac/textjustify.png</file>
+  <file>images/mac/textleft.png</file>
+  <file>images/mac/textright.png</file>
+  <file>images/mac/textunder.png</file>
+  <file>images/mac/zoomin.png</file>
+  <file>images/mac/zoomout.png</file>
+  <file>images/win/editcopy.png</file>
+  <file>images/win/editcut.png</file>
+  <file>images/win/editpaste.png</file>
+  <file>images/win/editredo.png</file>
+  <file>images/win/editundo.png</file>
+  <file>images/win/exportpdf.png</file>
+  <file>images/win/filenew.png</file>
+  <file>images/win/fileopen.png</file>
+  <file>images/win/fileprint.png</file>
+  <file>images/win/filesave.png</file>
+  <file>images/win/textbold.png</file>
+  <file>images/win/textcenter.png</file>
+  <file>images/win/textitalic.png</file>
+  <file>images/win/textjustify.png</file>
+  <file>images/win/textleft.png</file>
+  <file>images/win/textright.png</file>
+  <file>images/win/textunder.png</file>
+  <file>images/win/zoomin.png</file>
+  <file>images/win/zoomout.png</file>
+  <file>example.html</file>
+</qresource>
+</RCC>
diff --git a/demos/undo/commands.cpp b/demos/undo/commands.cpp
new file mode 100644
index 0000000000..4802e34345
--- /dev/null
+++ b/demos/undo/commands.cpp
@@ -0,0 +1,180 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "commands.h"
+
+static const int setShapeRectCommandId = 1;
+static const int setShapeColorCommandId = 2;
+
+/******************************************************************************
+** AddShapeCommand
+*/
+
+AddShapeCommand::AddShapeCommand(Document *doc, const Shape &shape, QUndoCommand *parent)
+    : QUndoCommand(parent)
+{
+    m_doc = doc;
+    m_shape = shape;
+}
+
+void AddShapeCommand::undo()
+{
+    m_doc->deleteShape(m_shapeName);
+}
+
+void AddShapeCommand::redo()
+{
+    // A shape only gets a name when it is inserted into a document
+    m_shapeName = m_doc->addShape(m_shape);
+    setText(QObject::tr("Add %1").arg(m_shapeName));
+}
+
+/******************************************************************************
+** RemoveShapeCommand
+*/
+
+RemoveShapeCommand::RemoveShapeCommand(Document *doc, const QString &shapeName,
+                                        QUndoCommand *parent)
+    : QUndoCommand(parent)
+{
+    setText(QObject::tr("Remove %1").arg(shapeName));
+    m_doc = doc;
+    m_shape = doc->shape(shapeName);
+    m_shapeName = shapeName;
+}
+
+void RemoveShapeCommand::undo()
+{
+    m_shapeName = m_doc->addShape(m_shape);
+}
+
+void RemoveShapeCommand::redo()
+{
+    m_doc->deleteShape(m_shapeName);
+}
+
+/******************************************************************************
+** SetShapeColorCommand
+*/
+
+SetShapeColorCommand::SetShapeColorCommand(Document *doc, const QString &shapeName,
+                                            const QColor &color, QUndoCommand *parent)
+    : QUndoCommand(parent)
+{
+    setText(QObject::tr("Set %1's color").arg(shapeName));
+
+    m_doc = doc;
+    m_shapeName = shapeName;
+    m_oldColor = doc->shape(shapeName).color();
+    m_newColor = color;
+}
+
+void SetShapeColorCommand::undo()
+{
+    m_doc->setShapeColor(m_shapeName, m_oldColor);
+}
+
+void SetShapeColorCommand::redo()
+{
+    m_doc->setShapeColor(m_shapeName, m_newColor);
+}
+
+bool SetShapeColorCommand::mergeWith(const QUndoCommand *command)
+{
+    if (command->id() != setShapeColorCommandId)
+        return false;
+
+    const SetShapeColorCommand *other = static_cast<const SetShapeColorCommand*>(command);
+    if (m_shapeName != other->m_shapeName)
+        return false;
+
+    m_newColor = other->m_newColor;
+    return true;
+}
+
+int SetShapeColorCommand::id() const
+{
+    return setShapeColorCommandId;
+}
+
+/******************************************************************************
+** SetShapeRectCommand
+*/
+
+SetShapeRectCommand::SetShapeRectCommand(Document *doc, const QString &shapeName,
+                                            const QRect &rect, QUndoCommand *parent)
+    : QUndoCommand(parent)
+{
+    setText(QObject::tr("Change %1's geometry").arg(shapeName));
+
+    m_doc = doc;
+    m_shapeName = shapeName;
+    m_oldRect = doc->shape(shapeName).rect();
+    m_newRect = rect;
+}
+
+void SetShapeRectCommand::undo()
+{
+    m_doc->setShapeRect(m_shapeName, m_oldRect);
+}
+
+void SetShapeRectCommand::redo()
+{
+    m_doc->setShapeRect(m_shapeName, m_newRect);
+}
+
+bool SetShapeRectCommand::mergeWith(const QUndoCommand *command)
+{
+    if (command->id() != setShapeRectCommandId)
+        return false;
+
+    const SetShapeRectCommand *other = static_cast<const SetShapeRectCommand*>(command);
+    if (m_shapeName != other->m_shapeName)
+        return false;
+
+    m_newRect = other->m_newRect;
+    return true;
+}
+
+int SetShapeRectCommand::id() const
+{
+    return setShapeRectCommandId;
+}
diff --git a/demos/undo/commands.h b/demos/undo/commands.h
new file mode 100644
index 0000000000..f98cb6d403
--- /dev/null
+++ b/demos/undo/commands.h
@@ -0,0 +1,112 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef COMMANDS_H
+#define COMMANDS_H
+
+#include <QUndoCommand>
+#include "document.h"
+
+class AddShapeCommand : public QUndoCommand
+{
+public:
+    AddShapeCommand(Document *doc, const Shape &shape, QUndoCommand *parent = 0);
+    void undo();
+    void redo();
+
+private:
+    Document *m_doc;
+    Shape m_shape;
+    QString m_shapeName;
+};
+
+class RemoveShapeCommand : public QUndoCommand
+{
+public:
+    RemoveShapeCommand(Document *doc, const QString &shapeName, QUndoCommand *parent = 0);
+    void undo();
+    void redo();
+
+private:
+    Document *m_doc;
+    Shape m_shape;
+    QString m_shapeName;
+};
+
+class SetShapeColorCommand : public QUndoCommand
+{
+public:
+    SetShapeColorCommand(Document *doc, const QString &shapeName, const QColor &color,
+                            QUndoCommand *parent = 0);
+
+    void undo();
+    void redo();
+
+    bool mergeWith(const QUndoCommand *command);
+    int id() const;
+
+private:
+    Document *m_doc;
+    QString m_shapeName;
+    QColor m_oldColor;
+    QColor m_newColor;
+};
+
+class SetShapeRectCommand : public QUndoCommand
+{
+public:
+    SetShapeRectCommand(Document *doc, const QString &shapeName, const QRect &rect,
+                            QUndoCommand *parent = 0);
+
+    void undo();
+    void redo();
+
+    bool mergeWith(const QUndoCommand *command);
+    int id() const;
+
+private:
+    Document *m_doc;
+    QString m_shapeName;
+    QRect m_oldRect;
+    QRect m_newRect;
+};
+
+#endif // COMMANDS_H
diff --git a/demos/undo/document.cpp b/demos/undo/document.cpp
new file mode 100644
index 0000000000..df435fd784
--- /dev/null
+++ b/demos/undo/document.cpp
@@ -0,0 +1,445 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qevent.h>
+#include <QPainter>
+#include <QTextStream>
+#include <QUndoStack>
+#include "document.h"
+#include "commands.h"
+
+static const int resizeHandleWidth = 6;
+
+/******************************************************************************
+** Shape
+*/
+
+const QSize Shape::minSize(80, 50);
+
+Shape::Shape(Type type, const QColor &color, const QRect &rect)
+    : m_type(type), m_rect(rect), m_color(color)
+{
+}
+
+Shape::Type Shape::type() const
+{
+    return m_type;
+}
+
+QRect Shape::rect() const
+{
+    return m_rect;
+}
+
+QColor Shape::color() const
+{
+    return m_color;
+}
+
+QString Shape::name() const
+{
+    return m_name;
+}
+
+QRect Shape::resizeHandle() const
+{
+    QPoint br = m_rect.bottomRight();
+    return QRect(br - QPoint(resizeHandleWidth, resizeHandleWidth), br);
+}
+
+QString Shape::typeToString(Type type)
+{
+    QString result;
+
+    switch (type) {
+        case Rectangle:
+            result = QLatin1String("Rectangle");
+            break;
+        case Circle:
+            result = QLatin1String("Circle");
+            break;
+        case Triangle:
+            result = QLatin1String("Triangle");
+            break;
+    }
+
+    return result;
+}
+
+Shape::Type Shape::stringToType(const QString &s, bool *ok)
+{
+    if (ok != 0)
+        *ok = true;
+
+    if (s == QLatin1String("Rectangle"))
+        return Rectangle;
+    if (s == QLatin1String("Circle"))
+        return Circle;
+    if (s == QLatin1String("Triangle"))
+        return Triangle;
+
+    if (ok != 0)
+        *ok = false;
+    return Rectangle;
+}
+
+/******************************************************************************
+** Document
+*/
+
+Document::Document(QWidget *parent)
+    : QWidget(parent), m_currentIndex(-1), m_mousePressIndex(-1), m_resizeHandlePressed(false)
+{
+    m_undoStack = new QUndoStack(this);
+
+    setAutoFillBackground(true);
+    setBackgroundRole(QPalette::Base);
+
+    QPalette pal = palette();
+    pal.setBrush(QPalette::Base, QPixmap(":/icons/background.png"));
+    pal.setColor(QPalette::HighlightedText, Qt::red);
+    setPalette(pal);
+}
+
+QString Document::addShape(const Shape &shape)
+{
+    QString name = Shape::typeToString(shape.type());
+    name = uniqueName(name);
+
+    m_shapeList.append(shape);
+    m_shapeList[m_shapeList.count() - 1].m_name = name;
+    setCurrentShape(m_shapeList.count() - 1);
+
+    return name;
+}
+
+void Document::deleteShape(const QString &shapeName)
+{
+    int index = indexOf(shapeName);
+    if (index == -1)
+        return;
+
+    update(m_shapeList.at(index).rect());
+
+    m_shapeList.removeAt(index);
+
+    if (index <= m_currentIndex) {
+        m_currentIndex = -1;
+        if (index == m_shapeList.count())
+            --index;
+        setCurrentShape(index);
+    }
+}
+
+Shape Document::shape(const QString &shapeName) const
+{
+    int index = indexOf(shapeName);
+    if (index == -1)
+        return Shape();
+    return m_shapeList.at(index);
+}
+
+void Document::setShapeRect(const QString &shapeName, const QRect &rect)
+{
+    int index = indexOf(shapeName);
+    if (index == -1)
+        return;
+
+    Shape &shape = m_shapeList[index];
+
+    update(shape.rect());
+    update(rect);
+
+    shape.m_rect = rect;
+}
+
+void Document::setShapeColor(const QString &shapeName, const QColor &color)
+{
+
+    int index = indexOf(shapeName);
+    if (index == -1)
+        return;
+
+    Shape &shape = m_shapeList[index];
+    shape.m_color = color;
+
+    update(shape.rect());
+}
+
+QUndoStack *Document::undoStack() const
+{
+    return m_undoStack;
+}
+
+bool Document::load(QTextStream &stream)
+{
+    m_shapeList.clear();
+
+    while (!stream.atEnd()) {
+        QString shapeType, shapeName, colorName;
+        int left, top, width, height;
+        stream >> shapeType >> shapeName >> colorName >> left >> top >> width >> height;
+        if (stream.status() != QTextStream::Ok)
+            return false;
+        bool ok;
+        Shape::Type type = Shape::stringToType(shapeType, &ok);
+        if (!ok)
+            return false;
+        QColor color(colorName);
+        if (!color.isValid())
+            return false;
+
+        Shape shape(type);
+        shape.m_name = shapeName;
+        shape.m_color = color;
+        shape.m_rect = QRect(left, top, width, height);
+
+        m_shapeList.append(shape);
+    }
+
+    m_currentIndex = m_shapeList.isEmpty() ? -1 : 0;
+
+    return true;
+}
+
+void Document::save(QTextStream &stream)
+{
+    for (int i = 0; i < m_shapeList.count(); ++i) {
+        const Shape &shape = m_shapeList.at(i);
+        QRect r = shape.rect();
+        stream << Shape::typeToString(shape.type()) << QLatin1Char(' ')
+                << shape.name() << QLatin1Char(' ')
+                << shape.color().name() << QLatin1Char(' ')
+                << r.left() << QLatin1Char(' ')
+                << r.top() << QLatin1Char(' ')
+                << r.width() << QLatin1Char(' ')
+                << r.height();
+        if (i != m_shapeList.count() - 1)
+            stream << QLatin1Char('\n');
+    }
+    m_undoStack->setClean();
+}
+
+QString Document::fileName() const
+{
+    return m_fileName;
+}
+
+void Document::setFileName(const QString &fileName)
+{
+    m_fileName = fileName;
+}
+
+int Document::indexAt(const QPoint &pos) const
+{
+    for (int i = m_shapeList.count() - 1; i >= 0; --i) {
+        if (m_shapeList.at(i).rect().contains(pos))
+            return i;
+    }
+    return -1;
+}
+
+void Document::mousePressEvent(QMouseEvent *event)
+{
+    event->accept();
+    int index = indexAt(event->pos());;
+    if (index != -1) {
+        setCurrentShape(index);
+
+        const Shape &shape = m_shapeList.at(index);
+        m_resizeHandlePressed = shape.resizeHandle().contains(event->pos());
+
+        if (m_resizeHandlePressed)
+            m_mousePressOffset = shape.rect().bottomRight() - event->pos();
+        else
+            m_mousePressOffset = event->pos() - shape.rect().topLeft();
+    }
+    m_mousePressIndex = index;
+}
+
+void Document::mouseReleaseEvent(QMouseEvent *event)
+{
+    event->accept();
+    m_mousePressIndex = -1;
+}
+
+void Document::mouseMoveEvent(QMouseEvent *event)
+{
+    event->accept();
+
+    if (m_mousePressIndex == -1)
+        return;
+
+    const Shape &shape = m_shapeList.at(m_mousePressIndex);
+
+    QRect rect;
+    if (m_resizeHandlePressed) {
+        rect = QRect(shape.rect().topLeft(), event->pos() + m_mousePressOffset);
+    } else {
+        rect = shape.rect();
+        rect.moveTopLeft(event->pos() - m_mousePressOffset);
+    }
+
+    QSize size = rect.size().expandedTo(Shape::minSize);
+    rect.setSize(size);
+
+    m_undoStack->push(new SetShapeRectCommand(this, shape.name(), rect));
+}
+
+static QGradient gradient(const QColor &color, const QRect &rect)
+{
+    QColor c = color;
+    c.setAlpha(160);
+    QLinearGradient result(rect.topLeft(), rect.bottomRight());
+    result.setColorAt(0, c.dark(150));
+    result.setColorAt(0.5, c.light(200));
+    result.setColorAt(1, c.dark(150));
+    return result;
+}
+
+static QPolygon triangle(const QRect &rect)
+{
+    QPolygon result(3);
+    result.setPoint(0, rect.center().x(), rect.top());
+    result.setPoint(1, rect.right(), rect.bottom());
+    result.setPoint(2, rect.left(), rect.bottom());
+    return result;
+}
+
+void Document::paintEvent(QPaintEvent *event)
+{
+    QRegion paintRegion = event->region();
+    QPainter painter(this);
+    QPalette pal = palette();
+
+    for (int i = 0; i < m_shapeList.count(); ++i) {
+        const Shape &shape = m_shapeList.at(i);
+
+        if (!paintRegion.contains(shape.rect()))
+            continue;
+
+        QPen pen = pal.text().color();
+        pen.setWidth(i == m_currentIndex ? 2 : 1);
+        painter.setPen(pen);
+        painter.setBrush(gradient(shape.color(), shape.rect()));
+
+        QRect rect = shape.rect();
+        rect.adjust(1, 1, -resizeHandleWidth/2, -resizeHandleWidth/2);
+
+        // paint the shape
+        switch (shape.type()) {
+            case Shape::Rectangle:
+                painter.drawRect(rect);
+                break;
+            case Shape::Circle:
+                painter.setRenderHint(QPainter::Antialiasing);
+                painter.drawEllipse(rect);
+                painter.setRenderHint(QPainter::Antialiasing, false);
+                break;
+            case Shape::Triangle:
+                painter.setRenderHint(QPainter::Antialiasing);
+                painter.drawPolygon(triangle(rect));
+                painter.setRenderHint(QPainter::Antialiasing, false);
+                break;
+        }
+
+        // paint the resize handle
+        painter.setPen(pal.text().color());
+        painter.setBrush(Qt::white);
+        painter.drawRect(shape.resizeHandle().adjusted(0, 0, -1, -1));
+
+        // paint the shape name
+        painter.setBrush(pal.text());
+        if (shape.type() == Shape::Triangle)
+            rect.adjust(0, rect.height()/2, 0, 0);
+        painter.drawText(rect, Qt::AlignCenter, shape.name());
+    }
+}
+
+void Document::setCurrentShape(int index)
+{
+    QString currentName;
+
+    if (m_currentIndex != -1)
+        update(m_shapeList.at(m_currentIndex).rect());
+
+    m_currentIndex = index;
+
+    if (m_currentIndex != -1) {
+        const Shape &current = m_shapeList.at(m_currentIndex);
+        update(current.rect());
+        currentName = current.name();
+    }
+
+    emit currentShapeChanged(currentName);
+}
+
+int Document::indexOf(const QString &shapeName) const
+{
+    for (int i = 0; i < m_shapeList.count(); ++i) {
+        if (m_shapeList.at(i).name() == shapeName)
+            return i;
+    }
+    return -1;
+}
+
+QString Document::uniqueName(const QString &name) const
+{
+    QString unique;
+
+    for (int i = 0; ; ++i) {
+        unique = name;
+        if (i > 0)
+            unique += QString::number(i);
+        if (indexOf(unique) == -1)
+            break;
+    }
+
+    return unique;
+}
+
+QString Document::currentShapeName() const
+{
+    if (m_currentIndex == -1)
+        return QString();
+    return m_shapeList.at(m_currentIndex).name();
+}
+
diff --git a/demos/undo/document.h b/demos/undo/document.h
new file mode 100644
index 0000000000..0b12ad0cf7
--- /dev/null
+++ b/demos/undo/document.h
@@ -0,0 +1,125 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DOCUMENT_H
+#define DOCUMENT_H
+
+#include <QWidget>
+
+QT_FORWARD_DECLARE_CLASS(QUndoStack)
+QT_FORWARD_DECLARE_CLASS(QTextStream)
+
+class Shape
+{
+public:
+    enum Type { Rectangle, Circle, Triangle };
+
+    Shape(Type type = Rectangle, const QColor &color = Qt::red, const QRect &rect = QRect());
+
+    Type type() const;
+    QString name() const;
+    QRect rect() const;
+    QRect resizeHandle() const;
+    QColor color() const;
+
+    static QString typeToString(Type type);
+    static Type stringToType(const QString &s, bool *ok = 0);
+
+    static const QSize minSize;
+
+private:
+    Type m_type;
+    QRect m_rect;
+    QColor m_color;
+    QString m_name;
+
+    friend class Document;
+};
+
+class Document : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Document(QWidget *parent = 0);
+
+    QString addShape(const Shape &shape);
+    void deleteShape(const QString &shapeName);
+    Shape shape(const QString &shapeName) const;
+    QString currentShapeName() const;
+
+    void setShapeRect(const QString &shapeName, const QRect &rect);
+    void setShapeColor(const QString &shapeName, const QColor &color);
+
+    bool load(QTextStream &stream);
+    void save(QTextStream &stream);
+
+    QString fileName() const;
+    void setFileName(const QString &fileName);
+
+    QUndoStack *undoStack() const;
+
+signals:
+    void currentShapeChanged(const QString &shapeName);
+
+protected:
+    void paintEvent(QPaintEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+    void mouseReleaseEvent(QMouseEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
+
+private:
+    void setCurrentShape(int index);
+    int indexOf(const QString &shapeName) const;
+    int indexAt(const QPoint &pos) const;
+    QString uniqueName(const QString &name) const;
+
+    QList<Shape> m_shapeList;
+    int m_currentIndex;
+    int m_mousePressIndex;
+    QPoint m_mousePressOffset;
+    bool m_resizeHandlePressed;
+    QString m_fileName;
+
+    QUndoStack *m_undoStack;
+};
+
+#endif // DOCUMENT_H
diff --git a/demos/undo/icons/background.png b/demos/undo/icons/background.png
new file mode 100644
index 0000000000..3bc5ed8cf0
--- /dev/null
+++ b/demos/undo/icons/background.png
diff --git a/demos/undo/icons/blue.png b/demos/undo/icons/blue.png
new file mode 100644
index 0000000000..4e181bb61a
--- /dev/null
+++ b/demos/undo/icons/blue.png
diff --git a/demos/undo/icons/circle.png b/demos/undo/icons/circle.png
new file mode 100644
index 0000000000..ed16c6e144
--- /dev/null
+++ b/demos/undo/icons/circle.png
diff --git a/demos/undo/icons/exit.png b/demos/undo/icons/exit.png
new file mode 100644
index 0000000000..539cb2ead9
--- /dev/null
+++ b/demos/undo/icons/exit.png
diff --git a/demos/undo/icons/fileclose.png b/demos/undo/icons/fileclose.png
new file mode 100644
index 0000000000..c5483d14ab
--- /dev/null
+++ b/demos/undo/icons/fileclose.png
diff --git a/demos/undo/icons/filenew.png b/demos/undo/icons/filenew.png
new file mode 100644
index 0000000000..57e57e343b
--- /dev/null
+++ b/demos/undo/icons/filenew.png
diff --git a/demos/undo/icons/fileopen.png b/demos/undo/icons/fileopen.png
new file mode 100644
index 0000000000..33e0d6394c
--- /dev/null
+++ b/demos/undo/icons/fileopen.png
diff --git a/demos/undo/icons/filesave.png b/demos/undo/icons/filesave.png
new file mode 100644
index 0000000000..57fd5e2f34
--- /dev/null
+++ b/demos/undo/icons/filesave.png
diff --git a/demos/undo/icons/green.png b/demos/undo/icons/green.png
new file mode 100644
index 0000000000..e2e7cc9e50
--- /dev/null
+++ b/demos/undo/icons/green.png
diff --git a/demos/undo/icons/ok.png b/demos/undo/icons/ok.png
new file mode 100644
index 0000000000..e355ea91bc
--- /dev/null
+++ b/demos/undo/icons/ok.png
diff --git a/demos/undo/icons/rectangle.png b/demos/undo/icons/rectangle.png
new file mode 100644
index 0000000000..3a7d9795fd
--- /dev/null
+++ b/demos/undo/icons/rectangle.png
diff --git a/demos/undo/icons/red.png b/demos/undo/icons/red.png
new file mode 100644
index 0000000000..58c3e7253b
--- /dev/null
+++ b/demos/undo/icons/red.png
diff --git a/demos/undo/icons/redo.png b/demos/undo/icons/redo.png
new file mode 100644
index 0000000000..5591517e1c
--- /dev/null
+++ b/demos/undo/icons/redo.png
diff --git a/demos/undo/icons/remove.png b/demos/undo/icons/remove.png
new file mode 100644
index 0000000000..7a7b048c0a
--- /dev/null
+++ b/demos/undo/icons/remove.png
diff --git a/demos/undo/icons/triangle.png b/demos/undo/icons/triangle.png
new file mode 100644
index 0000000000..2969131c31
--- /dev/null
+++ b/demos/undo/icons/triangle.png
diff --git a/demos/undo/icons/undo.png b/demos/undo/icons/undo.png
new file mode 100644
index 0000000000..8cf63a8ec9
--- /dev/null
+++ b/demos/undo/icons/undo.png
diff --git a/demos/undo/main.cpp b/demos/undo/main.cpp
new file mode 100644
index 0000000000..f36a6e8e19
--- /dev/null
+++ b/demos/undo/main.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include "mainwindow.h"
+
+int main(int argc, char **argv)
+{
+    Q_INIT_RESOURCE(undo);
+
+    QApplication app(argc, argv);
+
+    MainWindow win;
+    win.resize(800, 600);
+    win.show();
+
+    return app.exec();
+};
diff --git a/demos/undo/mainwindow.cpp b/demos/undo/mainwindow.cpp
new file mode 100644
index 0000000000..409fd14199
--- /dev/null
+++ b/demos/undo/mainwindow.cpp
@@ -0,0 +1,446 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QUndoGroup>
+#include <QUndoStack>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QTextStream>
+#include <QToolButton>
+#include "document.h"
+#include "mainwindow.h"
+#include "commands.h"
+
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent)
+{
+    setupUi(this);
+
+    QWidget *w = documentTabs->widget(0);
+    documentTabs->removeTab(0);
+    delete w;
+
+    connect(actionOpen, SIGNAL(triggered()), this, SLOT(openDocument()));
+    connect(actionClose, SIGNAL(triggered()), this, SLOT(closeDocument()));
+    connect(actionNew, SIGNAL(triggered()), this, SLOT(newDocument()));
+    connect(actionSave, SIGNAL(triggered()), this, SLOT(saveDocument()));
+    connect(actionExit, SIGNAL(triggered()), this, SLOT(close()));
+    connect(actionRed, SIGNAL(triggered()), this, SLOT(setShapeColor()));
+    connect(actionGreen, SIGNAL(triggered()), this, SLOT(setShapeColor()));
+    connect(actionBlue, SIGNAL(triggered()), this, SLOT(setShapeColor()));
+    connect(actionAddCircle, SIGNAL(triggered()), this, SLOT(addShape()));
+    connect(actionAddRectangle, SIGNAL(triggered()), this, SLOT(addShape()));
+    connect(actionAddTriangle, SIGNAL(triggered()), this, SLOT(addShape()));
+    connect(actionRemoveShape, SIGNAL(triggered()), this, SLOT(removeShape()));
+    connect(actionAddRobot, SIGNAL(triggered()), this, SLOT(addRobot()));
+    connect(actionAddSnowman, SIGNAL(triggered()), this, SLOT(addSnowman()));
+    connect(actionAbout, SIGNAL(triggered()), this, SLOT(about()));
+    connect(actionAboutQt, SIGNAL(triggered()), this, SLOT(aboutQt()));
+
+    connect(undoLimit, SIGNAL(valueChanged(int)), this, SLOT(updateActions()));
+    connect(documentTabs, SIGNAL(currentChanged(int)), this, SLOT(updateActions()));
+
+    actionOpen->setShortcut(QString("Ctrl+O"));
+    actionClose->setShortcut(QString("Ctrl+W"));
+    actionNew->setShortcut(QString("Ctrl+N"));
+    actionSave->setShortcut(QString("Ctrl+S"));
+    actionExit->setShortcut(QString("Ctrl+Q"));
+    actionRemoveShape->setShortcut(QString("Del"));
+    actionRed->setShortcut(QString("Alt+R"));
+    actionGreen->setShortcut(QString("Alt+G"));
+    actionBlue->setShortcut(QString("Alt+B"));
+    actionAddCircle->setShortcut(QString("Alt+C"));
+    actionAddRectangle->setShortcut(QString("Alt+L"));
+    actionAddTriangle->setShortcut(QString("Alt+T"));
+
+    m_undoGroup = new QUndoGroup(this);
+    undoView->setGroup(m_undoGroup);
+    undoView->setCleanIcon(QIcon(":/icons/ok.png"));
+
+    QAction *undoAction = m_undoGroup->createUndoAction(this);
+    QAction *redoAction = m_undoGroup->createRedoAction(this);
+    undoAction->setIcon(QIcon(":/icons/undo.png"));
+    redoAction->setIcon(QIcon(":/icons/redo.png"));
+    menuShape->insertAction(menuShape->actions().at(0), undoAction);
+    menuShape->insertAction(undoAction, redoAction);
+
+    toolBar->addAction(undoAction);
+    toolBar->addAction(redoAction);
+
+    newDocument();
+    updateActions();
+};
+
+void MainWindow::updateActions()
+{
+    Document *doc = currentDocument();
+    m_undoGroup->setActiveStack(doc == 0 ? 0 : doc->undoStack());
+    QString shapeName = doc == 0 ? QString() : doc->currentShapeName();
+
+    actionAddRobot->setEnabled(doc != 0);
+    actionAddSnowman->setEnabled(doc != 0);
+    actionAddCircle->setEnabled(doc != 0);
+    actionAddRectangle->setEnabled(doc != 0);
+    actionAddTriangle->setEnabled(doc != 0);
+    actionClose->setEnabled(doc != 0);
+    actionSave->setEnabled(doc != 0 && !doc->undoStack()->isClean());
+    undoLimit->setEnabled(doc != 0 && doc->undoStack()->count() == 0);
+
+    if (shapeName.isEmpty()) {
+        actionRed->setEnabled(false);
+        actionGreen->setEnabled(false);
+        actionBlue->setEnabled(false);
+        actionRemoveShape->setEnabled(false);
+    } else {
+        Shape shape = doc->shape(shapeName);
+        actionRed->setEnabled(shape.color() != Qt::red);
+        actionGreen->setEnabled(shape.color() != Qt::green);
+        actionBlue->setEnabled(shape.color() != Qt::blue);
+        actionRemoveShape->setEnabled(true);
+    }
+
+    if (doc != 0) {
+        int index = documentTabs->indexOf(doc);
+        Q_ASSERT(index != -1);
+        static const QIcon unsavedIcon(":/icons/filesave.png");
+        documentTabs->setTabIcon(index, doc->undoStack()->isClean() ? QIcon() : unsavedIcon);
+
+        if (doc->undoStack()->count() == 0)
+            doc->undoStack()->setUndoLimit(undoLimit->value());
+    }
+}
+
+void MainWindow::openDocument()
+{
+    QString fileName = QFileDialog::getOpenFileName(this);
+    if (fileName.isEmpty())
+        return;
+
+    QFile file(fileName);
+    if (!file.open(QIODevice::ReadOnly)) {
+        QMessageBox::warning(this,
+                            tr("File error"),
+                            tr("Failed to open\n%1").arg(fileName));
+        return;
+    }
+    QTextStream stream(&file);
+
+    Document *doc = new Document();
+    if (!doc->load(stream)) {
+        QMessageBox::warning(this,
+                            tr("Parse error"),
+                            tr("Failed to parse\n%1").arg(fileName));
+        delete doc;
+        return;
+    }
+
+    doc->setFileName(fileName);
+    addDocument(doc);
+}
+
+QString MainWindow::fixedWindowTitle(const Document *doc) const
+{
+    QString title = doc->fileName();
+
+    if (title.isEmpty())
+        title = tr("Unnamed");
+    else
+        title = QFileInfo(title).fileName();
+
+    QString result;
+
+    for (int i = 0; ; ++i) {
+        result = title;
+        if (i > 0)
+            result += QString::number(i);
+
+        bool unique = true;
+        for (int j = 0; j < documentTabs->count(); ++j) {
+            const QWidget *widget = documentTabs->widget(j);
+            if (widget == doc)
+                continue;
+            if (result == documentTabs->tabText(j)) {
+                unique = false;
+                break;
+            }
+        }
+
+        if (unique)
+            break;
+    }
+
+    return result;
+}
+
+void MainWindow::addDocument(Document *doc)
+{
+    if (documentTabs->indexOf(doc) != -1)
+        return;
+    m_undoGroup->addStack(doc->undoStack());
+    documentTabs->addTab(doc, fixedWindowTitle(doc));
+    connect(doc, SIGNAL(currentShapeChanged(QString)), this, SLOT(updateActions()));
+    connect(doc->undoStack(), SIGNAL(indexChanged(int)), this, SLOT(updateActions()));
+    connect(doc->undoStack(), SIGNAL(cleanChanged(bool)), this, SLOT(updateActions()));
+
+    setCurrentDocument(doc);
+}
+
+void MainWindow::setCurrentDocument(Document *doc)
+{
+    documentTabs->setCurrentWidget(doc);
+}
+
+Document *MainWindow::currentDocument() const
+{
+    return qobject_cast<Document*>(documentTabs->currentWidget());
+}
+
+void MainWindow::removeDocument(Document *doc)
+{
+    int index = documentTabs->indexOf(doc);
+    if (index == -1)
+        return;
+
+    documentTabs->removeTab(index);
+    m_undoGroup->removeStack(doc->undoStack());
+    disconnect(doc, SIGNAL(currentShapeChanged(QString)), this, SLOT(updateActions()));
+    disconnect(doc->undoStack(), SIGNAL(indexChanged(int)), this, SLOT(updateActions()));
+    disconnect(doc->undoStack(), SIGNAL(cleanChanged(bool)), this, SLOT(updateActions()));
+
+    if (documentTabs->count() == 0) {
+        newDocument();
+        updateActions();
+    }
+}
+
+void MainWindow::saveDocument()
+{
+    Document *doc = currentDocument();
+    if (doc == 0)
+        return;
+
+    for (;;) {
+        QString fileName = doc->fileName();
+
+        if (fileName.isEmpty())
+            fileName = QFileDialog::getSaveFileName(this);
+        if (fileName.isEmpty())
+            break;
+
+        QFile file(fileName);
+        if (!file.open(QIODevice::WriteOnly)) {
+            QMessageBox::warning(this,
+                                tr("File error"),
+                                tr("Failed to open\n%1").arg(fileName));
+            doc->setFileName(QString());
+        } else {
+            QTextStream stream(&file);
+            doc->save(stream);
+            doc->setFileName(fileName);
+
+            int index = documentTabs->indexOf(doc);
+            Q_ASSERT(index != -1);
+            documentTabs->setTabText(index, fixedWindowTitle(doc));
+
+            break;
+        }
+    }
+}
+
+void MainWindow::closeDocument()
+{
+    Document *doc = currentDocument();
+    if (doc == 0)
+        return;
+
+    if (!doc->undoStack()->isClean()) {
+        int button
+            = QMessageBox::warning(this,
+                            tr("Unsaved changes"),
+                            tr("Would you like to save this document?"),
+                            QMessageBox::Yes, QMessageBox::No);
+        if (button == QMessageBox::Yes)
+            saveDocument();
+    }
+
+    removeDocument(doc);
+    delete doc;
+}
+
+void MainWindow::newDocument()
+{
+    addDocument(new Document());
+}
+
+static QColor randomColor()
+{
+    int r = (int) (3.0*(rand()/(RAND_MAX + 1.0)));
+    switch (r) {
+        case 0:
+            return Qt::red;
+        case 1:
+            return Qt::green;
+        default:
+            break;
+    }
+    return Qt::blue;
+}
+
+static QRect randomRect(const QSize &s)
+{
+    QSize min = Shape::minSize;
+
+    int left = (int) ((0.0 + s.width() - min.width())*(rand()/(RAND_MAX + 1.0)));
+    int top = (int) ((0.0 + s.height() - min.height())*(rand()/(RAND_MAX + 1.0)));
+    int width = (int) ((0.0 + s.width() - left - min.width())*(rand()/(RAND_MAX + 1.0))) + min.width();
+    int height = (int) ((0.0 + s.height() - top - min.height())*(rand()/(RAND_MAX + 1.0))) + min.height();
+
+    return QRect(left, top, width, height);
+}
+
+void MainWindow::addShape()
+{
+    Document *doc = currentDocument();
+    if (doc == 0)
+        return;
+
+    Shape::Type type;
+
+    if (sender() == actionAddCircle)
+        type = Shape::Circle;
+    else if (sender() == actionAddRectangle)
+        type = Shape::Rectangle;
+    else if (sender() == actionAddTriangle)
+        type = Shape::Triangle;
+    else return;
+
+    Shape newShape(type, randomColor(), randomRect(doc->size()));
+    doc->undoStack()->push(new AddShapeCommand(doc, newShape));
+}
+
+void MainWindow::removeShape()
+{
+    Document *doc = currentDocument();
+    if (doc == 0)
+        return;
+
+    QString shapeName = doc->currentShapeName();
+    if (shapeName.isEmpty())
+        return;
+
+    doc->undoStack()->push(new RemoveShapeCommand(doc, shapeName));
+}
+
+void MainWindow::setShapeColor()
+{
+    Document *doc = currentDocument();
+    if (doc == 0)
+        return;
+
+    QString shapeName = doc->currentShapeName();
+    if (shapeName.isEmpty())
+        return;
+
+    QColor color;
+
+    if (sender() == actionRed)
+        color = Qt::red;
+    else if (sender() == actionGreen)
+        color = Qt::green;
+    else if (sender() == actionBlue)
+        color = Qt::blue;
+    else
+        return;
+
+    if (color == doc->shape(shapeName).color())
+        return;
+
+    doc->undoStack()->push(new SetShapeColorCommand(doc, shapeName, color));
+}
+
+void MainWindow::addSnowman()
+{
+    Document *doc = currentDocument();
+    if (doc == 0)
+        return;
+
+    // Create a macro command using beginMacro() and endMacro()
+
+    doc->undoStack()->beginMacro(tr("Add snowman"));
+    doc->undoStack()->push(new AddShapeCommand(doc,
+                            Shape(Shape::Circle, Qt::blue, QRect(51, 30, 97, 95))));
+    doc->undoStack()->push(new AddShapeCommand(doc,
+                            Shape(Shape::Circle, Qt::blue, QRect(27, 123, 150, 133))));
+    doc->undoStack()->push(new AddShapeCommand(doc,
+                            Shape(Shape::Circle, Qt::blue, QRect(11, 253, 188, 146))));
+    doc->undoStack()->endMacro();
+}
+
+void MainWindow::addRobot()
+{
+    Document *doc = currentDocument();
+    if (doc == 0)
+        return;
+
+    // Compose a macro command by explicitly adding children to a parent command
+
+    QUndoCommand *parent = new QUndoCommand(tr("Add robot"));
+
+    new AddShapeCommand(doc, Shape(Shape::Rectangle, Qt::green, QRect(115, 15, 81, 70)), parent);
+    new AddShapeCommand(doc, Shape(Shape::Rectangle, Qt::green, QRect(82, 89, 148, 188)), parent);
+    new AddShapeCommand(doc, Shape(Shape::Rectangle, Qt::green, QRect(76, 280, 80, 165)), parent);
+    new AddShapeCommand(doc, Shape(Shape::Rectangle, Qt::green, QRect(163, 280, 80, 164)), parent);
+    new AddShapeCommand(doc, Shape(Shape::Circle, Qt::blue, QRect(116, 25, 80, 50)), parent);
+    new AddShapeCommand(doc, Shape(Shape::Rectangle, Qt::green, QRect(232, 92, 80, 127)), parent);
+    new AddShapeCommand(doc, Shape(Shape::Rectangle, Qt::green, QRect(2, 92, 80, 125)), parent);
+
+    doc->undoStack()->push(parent);
+}
+
+void MainWindow::about()
+{
+    QMessageBox::about(this, tr("About Undo"), tr("The Undo demonstration shows how to use the Qt Undo framework."));
+}
+
+void MainWindow::aboutQt()
+{
+    QMessageBox::aboutQt(this, tr("About Qt"));
+}
diff --git a/demos/undo/mainwindow.h b/demos/undo/mainwindow.h
new file mode 100644
index 0000000000..5340e94fa5
--- /dev/null
+++ b/demos/undo/mainwindow.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include "ui_mainwindow.h"
+
+class Document;
+
+class MainWindow : public QMainWindow, public Ui::MainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow(QWidget *parent = 0);
+
+    void addDocument(Document *doc);
+    void removeDocument(Document *doc);
+    void setCurrentDocument(Document *doc);
+    Document *currentDocument() const;
+
+public slots:
+    void openDocument();
+    void saveDocument();
+    void closeDocument();
+    void newDocument();
+
+    void addShape();
+    void removeShape();
+    void setShapeColor();
+
+    void addSnowman();
+    void addRobot();
+
+    void about();
+    void aboutQt();
+
+private slots:
+    void updateActions();
+
+private:
+    QUndoGroup *m_undoGroup;
+
+    QString fixedWindowTitle(const Document *doc) const;
+};
+
+#endif // MAINWINDOW_H
diff --git a/demos/undo/mainwindow.ui b/demos/undo/mainwindow.ui
new file mode 100644
index 0000000000..91a0b437e5
--- /dev/null
+++ b/demos/undo/mainwindow.ui
@@ -0,0 +1,322 @@
+<ui version="4.0" >
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>567</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="iconSize" >
+   <size>
+    <width>32</width>
+    <height>32</height>
+   </size>
+  </property>
+  <widget class="QWidget" name="centralwidget" >
+   <layout class="QVBoxLayout" >
+    <property name="margin" >
+     <number>0</number>
+    </property>
+    <property name="spacing" >
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="QTabWidget" name="documentTabs" >
+      <property name="currentIndex" >
+       <number>0</number>
+      </property>
+      <widget class="QWidget" name="tab" >
+       <attribute name="title" >
+        <string>Tab 1</string>
+       </attribute>
+      </widget>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menubar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>567</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuFile" >
+    <property name="title" >
+     <string>File</string>
+    </property>
+    <addaction name="actionNew" />
+    <addaction name="actionOpen" />
+    <addaction name="actionSave" />
+    <addaction name="actionClose" />
+    <addaction name="separator" />
+    <addaction name="actionExit" />
+   </widget>
+   <widget class="QMenu" name="menuShape" >
+    <property name="title" >
+     <string>Edit</string>
+    </property>
+    <widget class="QMenu" name="menuMacros" >
+     <property name="title" >
+      <string>Macros</string>
+     </property>
+     <addaction name="actionAddRobot" />
+     <addaction name="actionAddSnowman" />
+    </widget>
+    <addaction name="separator" />
+    <addaction name="actionAddCircle" />
+    <addaction name="actionAddRectangle" />
+    <addaction name="actionAddTriangle" />
+    <addaction name="actionRemoveShape" />
+    <addaction name="separator" />
+    <addaction name="actionRed" />
+    <addaction name="actionGreen" />
+    <addaction name="actionBlue" />
+    <addaction name="separator" />
+    <addaction name="menuMacros" />
+   </widget>
+   <widget class="QMenu" name="menuHelp" >
+    <property name="title" >
+     <string>Help</string>
+    </property>
+    <addaction name="actionAbout" />
+    <addaction name="actionAboutQt" />
+   </widget>
+   <addaction name="menuFile" />
+   <addaction name="menuShape" />
+   <addaction name="menuHelp" />
+  </widget>
+  <widget class="QStatusBar" name="statusbar" />
+  <widget class="QToolBar" name="toolBar" >
+   <property name="windowTitle" >
+    <string>File actions</string>
+   </property>
+   <property name="orientation" >
+    <enum>Qt::Horizontal</enum>
+   </property>
+   <attribute name="toolBarArea" >
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak" >
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionNew" />
+   <addaction name="actionOpen" />
+   <addaction name="actionSave" />
+   <addaction name="actionClose" />
+   <addaction name="separator" />
+  </widget>
+  <widget class="QToolBar" name="shapeToolBar" >
+   <property name="windowTitle" >
+    <string>Shape actions</string>
+   </property>
+   <property name="orientation" >
+    <enum>Qt::Vertical</enum>
+   </property>
+   <attribute name="toolBarArea" >
+    <enum>LeftToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak" >
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionAddRectangle" />
+   <addaction name="actionAddCircle" />
+   <addaction name="actionAddTriangle" />
+   <addaction name="actionRemoveShape" />
+   <addaction name="separator" />
+   <addaction name="actionRed" />
+   <addaction name="actionGreen" />
+   <addaction name="actionBlue" />
+  </widget>
+  <widget class="QDockWidget" name="dockWidget" >
+   <property name="windowTitle" >
+    <string>Undo Stack</string>
+   </property>
+   <attribute name="dockWidgetArea" >
+    <number>2</number>
+   </attribute>
+   <widget class="QWidget" name="dockWidgetContents" >
+    <layout class="QVBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>4</number>
+     </property>
+     <item>
+      <layout class="QHBoxLayout" >
+       <property name="margin" >
+        <number>0</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QLabel" name="label" >
+         <property name="text" >
+          <string>Undo limit</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="undoLimit" />
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QUndoView" name="undoView" >
+       <property name="alternatingRowColors" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <action name="actionOpen" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/fileopen.png</iconset>
+   </property>
+   <property name="text" >
+    <string>&amp;Open</string>
+   </property>
+  </action>
+  <action name="actionClose" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/fileclose.png</iconset>
+   </property>
+   <property name="text" >
+    <string>&amp;Close</string>
+   </property>
+  </action>
+  <action name="actionNew" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/filenew.png</iconset>
+   </property>
+   <property name="text" >
+    <string>&amp;New</string>
+   </property>
+  </action>
+  <action name="actionSave" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/filesave.png</iconset>
+   </property>
+   <property name="text" >
+    <string>&amp;Save</string>
+   </property>
+  </action>
+  <action name="actionExit" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/exit.png</iconset>
+   </property>
+   <property name="text" >
+    <string>E&amp;xit</string>
+   </property>
+  </action>
+  <action name="actionRed" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/red.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Red</string>
+   </property>
+  </action>
+  <action name="actionGreen" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/green.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Green</string>
+   </property>
+  </action>
+  <action name="actionBlue" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/blue.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Blue</string>
+   </property>
+  </action>
+  <action name="actionAddRectangle" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/rectangle.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Add Rectangle</string>
+   </property>
+  </action>
+  <action name="actionAddCircle" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/circle.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Add Circle</string>
+   </property>
+  </action>
+  <action name="actionRemoveShape" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/remove.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Remove Shape</string>
+   </property>
+  </action>
+  <action name="actionAddRobot" >
+   <property name="text" >
+    <string>Add robot</string>
+   </property>
+  </action>
+  <action name="actionAddSnowman" >
+   <property name="text" >
+    <string>Add snowan</string>
+   </property>
+  </action>
+  <action name="actionAddTriangle" >
+   <property name="icon" >
+    <iconset resource="undo.qrc" >:/icons/triangle.png</iconset>
+   </property>
+   <property name="text" >
+    <string>addTriangle</string>
+   </property>
+  </action>
+  <action name="actionAbout" >
+   <property name="text" >
+    <string>About</string>
+   </property>
+  </action>
+  <action name="actionAboutQt" >
+   <property name="text" >
+    <string>About Qt</string>
+   </property>
+  </action>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QUndoView</class>
+   <extends>QListView</extends>
+   <header>qundoview.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="undo.qrc" />
+ </resources>
+ <connections/>
+</ui>
diff --git a/demos/undo/undo.pro b/demos/undo/undo.pro
new file mode 100644
index 0000000000..e26d07c4be
--- /dev/null
+++ b/demos/undo/undo.pro
@@ -0,0 +1,17 @@
+SOURCES += main.cpp mainwindow.cpp commands.cpp document.cpp
+HEADERS += mainwindow.h commands.h document.h
+FORMS += mainwindow.ui
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+RESOURCES += undo.qrc
+
+# install
+target.path = $$[QT_INSTALL_DEMOS]/undo
+sources.files = $$SOURCES $$HEADERS *.pro icons $$RESOURCES $$FORMS
+sources.path = $$[QT_INSTALL_DEMOS]/undo
+INSTALLS += target sources
+
diff --git a/demos/undo/undo.qrc b/demos/undo/undo.qrc
new file mode 100644
index 0000000000..65619b8f1a
--- /dev/null
+++ b/demos/undo/undo.qrc
@@ -0,0 +1,20 @@
+<RCC>
+    <qresource prefix="/" >
+        <file>icons/background.png</file>
+        <file>icons/blue.png</file>
+        <file>icons/circle.png</file>
+        <file>icons/exit.png</file>
+        <file>icons/fileclose.png</file>
+        <file>icons/filenew.png</file>
+        <file>icons/fileopen.png</file>
+        <file>icons/filesave.png</file>
+        <file>icons/green.png</file>
+        <file>icons/ok.png</file>
+        <file>icons/rectangle.png</file>
+        <file>icons/red.png</file>
+        <file>icons/redo.png</file>
+        <file>icons/remove.png</file>
+        <file>icons/triangle.png</file>
+        <file>icons/undo.png</file>
+    </qresource>
+</RCC>
diff --git a/dist/README b/dist/README
new file mode 100644
index 0000000000..110be1cdf5
--- /dev/null
+++ b/dist/README
@@ -0,0 +1,134 @@
+This is Qt version %VERSION%.
+
+Qt is a comprehensive cross-platform C++ application framework. Qt 4
+introduces new features and many improvements over the 3.x series. See
+http://doc.trolltech.com/latest/qt4-intro.html for details.
+
+The Qt 4.x series is not binary compatible or source compatible with
+the 3.x series. For more information on porting from Qt 3 to Qt 4, see
+http://doc.trolltech.com/latest/porting4.html.
+
+
+INSTALLING Qt
+
+On Windows and Mac OS X, if you want to install the precompiled binary
+packages, simply launch the package and follow the instructions in the
+installation wizard.
+
+On Mac OS X, the binary package requires Mac OS X 10.4.x (Tiger) or
+later and GCC 4.0.1 to develop applications. Its applications will run
+on Mac OS X 10.3.9 and above.
+
+If you have a source package (a .tar.gz, .tar.bz2, or .zip file),
+follow the instructions in the INSTALL file.
+
+
+DEMOS AND EXAMPLES
+
+Once Qt is installed, we suggest that you take a look at the demos and
+examples to see Qt in action. Run the Qt Examples and Demos either by
+typing 'qtdemo' on the command line or through the desktop's Start
+menu. On Mac OS X, you can find it in /Developers/Applications/Qt.
+
+
+REFERENCE DOCUMENTATION
+
+The Qt reference documentation is available locally in Qt's doc/html
+directory. You can use Qt Assistant to view it; to launch Assistant,
+type 'assistant' on the command line or use the Start menu. On Mac OS
+X, you can find it in /Developer/Applications/Qt.  The latest
+documentation is available at http://doc.trolltech.com/.
+
+
+SUPPORTED PLATFORMS
+
+For this release, the following platforms have been tested:
+
+  win32-g++        (mingw)
+  win32-msvc
+  win32-msvc2003
+  win32-msvc2005
+  win32-msvc2008
+
+  aix-xlc
+  aix-xlc-64
+  hpux-acc
+  hpux-acc-64
+  hpux-acc-o64
+  hpux-g++
+  hpux-g++-64
+  hpuxi-acc-32
+  hpuxi-acc-64
+  linux-g++
+  linux-icc
+  linux-icc-32
+  linux-icc-64
+  solaris-cc
+  solaris-cc-64
+  solaris-g++
+  solaris-g++-64
+
+  macx-g++
+  macx-g++42
+
+  qws/linux-x86-g++
+  qws/linux-arm-g++
+
+  wince50standard-armv4i-msvc2005
+  wince50standard-armv4i-msvc2008
+  wince50standard-mipsii-msvc2005
+  wince50standard-mipsii-msvc2008
+  wince50standard-x86-msvc2005
+  wince50standard-x86-msvc2008
+  wincewm50pocket-msvc2005
+  wincewm50pocket-msvc2008
+  wincewm50smart-msvc2005
+  wincewm50smart-msvc2008
+  wincewm60professional-msvc2005
+  wincewm60professional-msvc2008
+  wincewm60standard-msvc2005
+  wincewm60standard-msvc2008
+
+For a complete list of supported platforms, see
+http://www.qtsoftware.com/developer/supported-platforms/supported-platforms/
+
+For a description of Qt's platform support policy, see
+http://www.qtsoftware.com/support-services/support/platform-support-policy
+
+
+COMMERCIAL EDITIONS
+
+Desktop Edition licensees can use all the modules provided with their
+Qt package.
+
+GUI Framework licensees may only use the classes contained in
+the QtCore, QtGui (except QGraphicsView), QtTest, QtDBus and
+Qt3Support modules.
+
+For a full listing of the contents of each module, please refer to 
+http://doc.trolltech.com/4.4/modules.html.
+
+
+HOW TO REPORT A BUG
+
+If you think you have found a bug in Qt, we would like to hear about
+it so that we can fix it. Before reporting a bug, please check
+http://qtsoftware.com/developer/faqs/ and
+http://qtsoftware.com/products/appdev/platform/platforms/ to see if the to see if
+the issue is already known.
+
+Always include the following information in your bug report: the name
+and version number of your compiler; the name and version number of
+your operating system; the version of Qt you are using, and what
+configure options it was compiled with.
+
+If the problem you are reporting is only visible at run-time, try to
+create a small test program that shows the problem when run. Often,
+such a program can be created with some minor changes to one of the
+many example programs in Qt's examples directory. Please submit the
+bug report using the Task Tracker on the Trolltech website:
+
+http://qtsoftware.com/developer/task-tracker
+
+
+Qt is a trademark of Nokia Corporation and/or its subsidiary(-ies).
diff --git a/dist/changes-0.92 b/dist/changes-0.92
new file mode 100644
index 0000000000..1226d65b0d
--- /dev/null
+++ b/dist/changes-0.92
@@ -0,0 +1,101 @@
+Here is a list of changes in Qt from 0.91 to 0.92.  Also look out
+for a few new classes; QPrinter, QFileDialog, QDir and QFileInfo.
+
+
+QApplication:
+-------------
+  Use setMainWidget( x ), not exec( x ).
+
+QString:
+--------
+  upper(), lower(), stripWhiteSpace() and simplifyWhiteSpace() etc.
+  do NOT modify the string, instead they return a new string.
+
+QList and QVector:
+------------------
+  Changed argument in QList::toVector() from reference to pointer
+  Changed argument in QVector::toList() from reference to pointer
+  Removed QVector::apply()
+  Removed QList::apply()
+
+QPainter:
+---------
+  pen(), brush() and font() no longer returns references.
+  You cannot do this any longer:
+	QPainter p;
+	...
+        p.pen().setColor( red );
+	p.brush().setStyle( NoBrush );
+  Instead, set a new pen or brush:
+	p.setPen( red );
+	p.setBrush( NoBrush );
+  This enables us to do better optimization, particularly for complex
+  programs.
+
+QFile, QFileInfo (new):
+-----------------------
+  Removed QFile::setFileName, 
+  QFile::isRegular   => QFileInfo::isFile
+  QFile::isDirectory => QFileInfo::isDir
+  QFile::isSymLink   => QFileInfo::isSymLink
+
+Q2DMatrix/QWMatrix:
+---------
+  Q2DMatrix has been replaced with QWMatrix (qwmatrix.h)
+
+QPixmap:
+--------
+  enableImageCache() renamed to setOptimization().
+  Optimization is now default ON.  See doc for other optimization functions.
+
+QImage:
+-------
+  scanline() => scanLine()
+
+QLineEdit/QLCDNumber:
+---------------------
+  signal textChanged( char * ) => textChanged( const char * );
+  slot   display( char * )     => display( const char * )
+
+QCursor:
+--------
+    hourGlassCursor => waitCursor
+
+QButton and friends:
+--------------------
+    QIconButton removed, setPixmap() added to QButton to replace QIconButton
+
+QTableWidget:
+-------------
+    Renamed to QTableView (qtablevw.h)
+    Using int to identify rows and columns, not long.
+
+QRangeControl:
+--------------
+    Using int values, not long.
+
+QScrollBar:
+-----------
+    Using int values, not long.
+
+QListBox:
+---------
+    removed setStrList(), use clear(); insertStrList( ... , 0 ); instead 
+
+QColor:
+-------
+    setRGB => setRgb
+    getRGB => rgb
+    setHSV => setHsv
+    getHSV => hsv
+
+QFontMetrics and QFontInfo:
+---------------------------
+    Get font metrics from QWidget::fontMetrics() and QPainter::fontMetrics().
+    Get font info    from QWidget::fontInfo()    and QPainter::fontInfo().
+    The QFontMetrics(QFont) constructor no longer works.
+    We had to do these changes to support printing and Windows.
+
+
+There are more changes, left out because we consider them minor and
+uninteresting or because we forgot to mention them. :)
diff --git a/dist/changes-0.93 b/dist/changes-0.93
new file mode 100644
index 0000000000..892395bc4b
--- /dev/null
+++ b/dist/changes-0.93
@@ -0,0 +1,74 @@
+Here is a list of (major) changes in Qt from 0.92 to 0.93.
+
+Bug-fixes, optimizations and much improved documentation, of course.
+
+There are not many changes in the API interface.
+Here's a list of the most important changes.
+
+
+QApplication:
+-------
+  setCursor(), restoreCursor() now uses a stack of cursors.
+  quit() is now a slot.
+  exit() replaces the old static quit() function.
+
+
+QColor:
+-------
+  New constructor that makes you set an RGB or HSV color directly,
+    like this: QColor(320, 255, 240, QColor::Hsv)
+
+
+QObject:
+--------
+  Has now a timerEvent(), which was moved from QWidget.
+  Compatible with old code.
+
+
+QPainter:
+---------
+  GC caching (internal optimization) makes drawing very fast.
+
+  drawShade* obsolete, moved to qdrawutl.h and renamed to qDrawShade*
+    - These are now global functions that take QPainter * and QColorGroup
+    - Added qDrawWinPanel and qDrawWinButton for Windows 95 look
+    - Added qDrawPlainRect
+
+
+QPixmap:
+-------
+  New fill() function that fills the pixmap with the background color
+    OR background pixmap of a widget.
+
+
+QRect:
+------
+  fixup() renamed to normalize(), returns a new QRect.
+
+
+QWidget:
+-------
+  New function setCaption(), setIcon() and setIconText(), moved from QWindow.
+
+
+New classes:
+------------
+  QSocketNotifier, makes it possible to write async socket code.
+
+
+New global functions:
+---------------------
+  qInstallMsgHandler() and qRound(), in qglobal.h.
+
+
+moc:
+----
+  Supports templates.
+
+
+Documentation:
+--------------
+  A tutorial.
+  Template classes (QArray, QList etc.) are documented.
+  Many more links in the examples.
+  Postscript documentation (around 400 pages).
diff --git a/dist/changes-0.94 b/dist/changes-0.94
new file mode 100644
index 0000000000..5353e12567
--- /dev/null
+++ b/dist/changes-0.94
@@ -0,0 +1,33 @@
+Here is a list of (major) changes in Qt from 0.93 to 0.94.
+
+Bug-fixes, optimizations and much improved documentation, of course.
+
+There are not many changes in the API interface.
+
+
+QTextStream:
+------------
+  eos() renamed to eof() for iostream compatibility.
+  operator>> for double, float, char*, QString are implemented
+  get() and getline() added.
+
+
+QDataStream:
+------------
+  eos() renamed to eof() for iostream compatibility.
+
+
+QPixmap:
+--------
+  Support for transparency: setMask(QBitmap) and bitBlt.
+
+
+QImage:
+-------
+  Scanline data is aligned on a 32 bit boundary (it used to be 8
+  bits). Conversion to and from QPixmap is now faster.
+
+
+Documentation:
+--------------
+  More documentation fixes.
diff --git a/dist/changes-0.95 b/dist/changes-0.95
new file mode 100644
index 0000000000..205a4763f7
--- /dev/null
+++ b/dist/changes-0.95
@@ -0,0 +1,54 @@
+Here is a list of (major) changes in Qt from 0.93 to 0.95.
+
+Bug-fixes, optimizations and much improved documentation, of course.
+
+There are few changes in the API (Qt header files).
+
+
+QPixmap:
+--------
+  Can draw transparent pixmaps. Call QPixmap::setMask(QBitmap) to
+  set a mask.
+
+
+QPainter:
+---------
+  Unified transformation. setWindow() and setViewport() now use
+  the same code as setWorldXForm() etc.
+  Internal xform routines have been optimized.
+
+
+QButton:
+--------
+  isUp() is obsolete, use !isDown() instead.
+  isOff() is obsolete, use !isOn() instead.
+  switchOn() is obsolete, use setOn(TRUE) instead.
+  switchOff() is obsolete, use setOn(FALSE) instead.
+
+
+QPushButton:
+------------
+  A push button can now be a toggle button.
+
+
+QWidget:
+--------
+  isActive() was never used and is now obsolete.
+
+
+QTextStream:
+------------
+  eos() renamed to eof() for iostream compatibility.
+  operator>> for double, float, char*, QString are implemented
+  get() and getline() added.
+
+
+QDataStream:
+------------
+  eos() renamed to eof() for iostream compatibility.
+
+
+QImage:
+-------
+  Scanline data is aligned on a 32 bit boundary (it used to be 8
+  bits). Conversion to and from QPixmap is now faster.
diff --git a/dist/changes-0.96 b/dist/changes-0.96
new file mode 100644
index 0000000000..52555d1ea5
--- /dev/null
+++ b/dist/changes-0.96
@@ -0,0 +1,263 @@
+Here is a list of (major) changes in Qt from 0.95 to 0.96.
+
+Bug-fixes, optimizations and improved documentation, of course.
+QClipboard is new.
+
+There are some changes in the API (Qt header files).  Some functions have
+been renamed or the arguments have changed. The old versions of these
+functions have been obsoleted. A call to an obsoleted function will by
+default generate a runtime warning the first time it is called, but it
+will be executed correctly. If you really need to ship code fast, you can
+turn off the runtime obsolescence warnings by calling
+qSuppressObsoleteWarnings().
+
+Obsoleted functions will disappear in a future release.  To get
+compile-time errors for each use of an obsoleted function, compile your
+code with -DTEST_OBSOLETE. You should recompile without this option when
+you have upgraded your code (otherwise, you may get linking errors). 
+Note: it is probably not a good idea to compile the Qt library with
+-DTEST_OBSOLETE, it may cause problems if you try to link or run
+programs that use obsoleted functions.
+
+For new users: obsoleted functions are no longer documented, in fact they
+are not even visible in the documentation.
+
+*************** Changes that might affect runtime behavior *****************
+
+QFileInfo:
+----------
+  size() returns uint(previousy int), 0 if the size cannot be fetched (was -1).
+	Use isFile() to check.
+
+
+QPopupMenu
+------------
+  When a popup menu is a submenu (directly or as a subsub...menu) of a
+  menu bar(QMenuBar), the menu bar will now always emit the activated() or
+  highlighted() signal when a submenu emits these signals. This fix might
+  have undesired effects if you previously have worked around it by
+  connecting to signals both in menu bar and its submenus.
+
+*************** Changes that might generate compile errors *****************
+**************           when compiling old code           *****************
+
+QDataStream:
+-----------
+  Serialization of int and uint is no longer supported. Use INT32 and
+  UINT32 instead. This had to be changed in order to run Qt on 64-bit
+  architectures.
+
+
+QImage:
+-------
+  24-bpp pixel format no longer supported, use 32-bpp instead.
+
+  This means that you have to use uint* instead of uchar* when accessing
+  pixel values. You cannot use the uchar* pointer directly, because the
+  pixel format depends on the byte order on the underlying platform. Use
+  qRgb() and friends (qcolor.h) to access the pixels.
+
+
+QWidget:
+--------
+  setMouseTracking() does not return bool. Call hasMouseTracking() to
+  determine the mouse tracking state. (This only affects code that
+  actually uses the return value.)
+
+  (There are other changes in QWidget, see below)
+
+
+*************** Type changes that might generate warnings: *****************
+
+
+QCache/QIntCache:
+-----------------
+  Using int/uint instead of long/ulong.
+
+
+QDate/QTime/QDateTime:
+----------------------
+  Using int/uint instead of long/ulong (MS-DOS required long).
+
+
+QIODevice/QBuffer/QFile:
+------------------------
+  Using int/uint instead of long/ulong.
+
+
+QKeyEvent:
+----------
+  ascii() now returns int (previously uchar).
+
+
+QTableView:
+------------
+  uint used instead of ulong (tableFlags() etc.)
+
+
+QTextStream:
+------------
+  int used instead of long (flags() etc.)
+
+
+*****************         Obsoleted functions         **********************
+
+QAccel:
+-------
+  enable(), disable() and isDisabled() are obsolete.
+  Use setEnabled(TRUE/FALSE) and !isEnabled() instead.
+  isItemDisabled(), enableItem(), disableItem() are obsolete.
+  Use !isItemEnabled(), setItemEnabled(TRUE/FALSE) instead.
+
+
+QApplication:
+-------------
+  cursor(), setCursor() and restoreCursor() obsoleted.
+  Use overrideCursor(), setOverrideCursor() and restoreOverrideCursor()
+  instead.
+
+
+QBitmap:
+--------
+  Constructor takes "const uchar *bits" instead of "const char *"
+  because of sign problems (uchar = unsigned char). Old constructors are
+  obsolete.
+
+
+QButton:
+--------
+  toggleButton() is obsolete, renamed to isToggleButton().
+
+
+QColor:
+-------
+  The functions QRED, QGREEN, QBLUE, QRGB, QGRAY obsolete.
+  Instead, use  qRed, qGreen, qBlue, qRgb, qGray.
+
+
+QComboBox:
+----------
+  setStrList() obsolete, use clear() + insertStrList() instead.
+  string() obsolete, use text() instead.
+
+
+QLCDNumber:
+----------
+  longValue() is obsolete, use intValue() instead.
+
+
+QListbox:
+---------
+  The macro LBI_String is obsolete, use LBI_text instead.
+  string() obsolete, use text() instead.
+  stringCopy() and setStringCopy() are obsolete.
+
+
+QMenuData:
+----------
+  string() obsolete, use text() instead.
+  isItemDisabled(), enableItem(), disableItem() are obsolete.
+  Use !isItemEnabled(), setItemEnabled(TRUE/FALSE) instead.
+  checkItem() and uncheckItem() are obsolete.
+  Use setItemChecked(TRUE/FALSE) instead.
+
+
+QPainter: 
+--------- 
+
+  drawBezier() is obsolete, general Bezier curves are rarely used and
+  cost too much. Qt will only support drawQuadBezier() (four-point
+  Bezier) in the future.
+
+QPointArray:
+-----------
+  move() is obsolete, use translate() instead.
+  bezier() is obsolete, general Bezier curves are rarely used and
+  cost too much. Qt will only support quadBezier() (four-point
+  Bezier) in the future.
+
+
+
+QRect:
+------
+  move() is obsolete, use moveBy() instead.
+  setTopLeft(), setTopRight(), setBottomLeft(), setBottomRight() and
+  setCenter() is obsolete, use moveTopLeft(), moveTopRight(),
+  moveBottomLeft(), moveBottomRight() and moveCenter() instead.
+
+
+QRegion:
+-------
+  move() is obsolete, use translate() instead.
+
+
+QSocketNotifier:
+----------------
+  enabled() is obsolete. Use isEnabled() instead.
+
+
+QWidget:
+--------
+  enable(), disable() and isDisabled() are obsolete.
+  Use setEnabled(TRUE/FALSE) and !isEnabled() instead.
+
+  setMinimumSize(), setMaximumSize(), minimumSize(), maximumSize() are obsolete
+  use setMinSize(), setMaxSize(), minSize(), maxSize() instead.
+
+  enableUpdates() obsolete, use isUpdatesEnabled()/setUpdatesEnabled().
+
+  id() is obsolete, it has been renamed to winId().
+
+***************** All other changes from 0.95 to 0.96 **********************
+
+moc
+----------
+    Gives a warning if no output is generated.
+
+
+qglobal.h:
+----------
+  INT32 and UINT32 typedefs changed to work with DEC Alpha.
+
+
+QApplication:
+-------------
+  clipboard() is new.
+
+
+QButtonGroup:
+-------------
+  Exclusive group setting added (isExclusive and setExclusive).
+  find() is new.
+
+
+QColor:
+-------
+  New type QRgb (uint), used for RGB triplet.
+
+
+QLineEdit:
+----------
+  You can now mark text, and copy and paste to/from the clipboard.
+
+
+QPaintDevice:
+---------
+  The bitblt function now takes an ignoreMask parameter. It has a default
+  value, so no old code will be broken.
+
+QPrinter:
+------------
+  fixed minor bugs in handling of polygons and beziers.
+
+
+QWidget:
+--------
+  New protected virtual functions styleChange(), backgroundColorChange(),
+  backgroundPixmapChange(), paletteChange() and fontChange().
+  These functions are called from setStyle(), setBackgroundColor() etc.
+  You can reimplement them to if you need to know when widget properties
+  changed and to optimize updates.
+
+  The destroyed() signal has been moved to QObject.
+
diff --git a/dist/changes-0.98 b/dist/changes-0.98
new file mode 100644
index 0000000000..a36abeb9e1
--- /dev/null
+++ b/dist/changes-0.98
@@ -0,0 +1,98 @@
+Here is a list of (major) changes in Qt from 0.96 to 0.98.
+As usual, we fixed some bugs and improved the documentation.
+
+
+*************** Changes that might affect runtime behavior *****************
+
+QWidget:
+--------
+  setMinimumSize() and setMaximumSize() now force the widget to 
+  a legal size.  resize() and setGeometry() obey the widget's
+  minimum/maximum size.
+
+  The default behaviour of QWidget::closeEvent is now to hide the widget,
+  not to delete it as before (which was potentially dangerous). This means
+  that if you have a top level widget and the user closes it via the close
+  box, it will now hide itself if you have not reimplemented closeEvent().
+  See the QWidget::closeEvent() and QCloseEvent documentation for details.
+
+  (There are other changes in QWidget, see below)
+
+
+*************** Changes that might generate compile errors *****************
+**************           when compiling old code           *****************
+
+Disabled copy constructors and operators=
+----------------------------------------- 
+  Copy constructors and operators= are disabled in the classes that cannot
+  be copied (this includes all classes that inherit from QObject). This
+  will let the compiler find bugs in your code, you'll get compile time 
+  errors where you most probably would have gotten core dumps before. 
+  This change has been done in the following classes:
+
+    QAccel QApplication QBuffer QButton QButtonGroup QCheckBox QClipboard
+    QComboBox QConnection QDataStream QDialog QFile QFileDialog QFrame
+    QGroupBox QIODevice QImageIO QLCDNumber QLabel QLineEdit QListBox
+    QMenuBar QMenuData QMenuItem QMessageBox QMetaObject QObject
+    QPSPrinter QPaintDevice QPainter QPicture QPopupMenu QPrintDialog
+    QPrinter QPushButton QRadioButton QRangeControl QScrollBar QSignal
+    QSocketNotifier QTableView QTextStream QTimer QWidget QWindow
+
+  The other classes all have sensible copy constructors and operators=.
+
+QDate:
+------
+  These were protected, now private:
+	static const char *monthNames[];
+ 	static const char *weekdayNames[];
+	uint  	 jd;
+
+QListBox:
+---------
+  The internals of QListBox are completely reworked. Definition of custom
+  QListBoxItems is now much easier. This is *not* compatible with the old
+  way of defining custom QLBItems. See the QListBoxItem documentation for
+  details.
+
+QTime:
+------
+  This was protected, now private:
+	uint   ds;
+
+*************** Type changes that might generate warnings: *****************
+
+none
+
+*****************         Obsoleted functions         **********************
+
+none
+
+***************** All other changes from 0.96 to 0.98 **********************
+
+moc:
+----
+  Moc previously gave a syntax error when the word "class" was found
+  in a string outside a class declaration. This bug has now been
+  fixed.
+
+  More moc arguments, check the manpage for details.
+
+QFont:
+------
+  Two new convenience functions; bold() and setBold().
+
+QLabel:
+-------
+  setMargin() and margin() are new. setMargin() specifies a minimum margin
+  when the label contents are justified.
+
+QWidget:
+--------
+  You can specify a custom widget frame for top level widgets, including
+  no frame at all. See the widget constructor doc. for details.
+
+  Qt now has enter and leave events. Reimplement the virtual functions  
+  void enterEvent( QEvent * ) and void leaveEvent( QEvent * ) to receive
+  events when the mouse cursor leaves or enters the visible part of the
+  widget.
+
diff --git a/dist/changes-0.99 b/dist/changes-0.99
new file mode 100644
index 0000000000..80be555ea0
--- /dev/null
+++ b/dist/changes-0.99
@@ -0,0 +1,60 @@
+Here is a list of user-visible changes in Qt from 0.98 to 0.99.
+As usual, we fixed some bugs and improved the documentation.
+
+Qt 0.99 includes makefiles for Linux, Solaris, SunOS, FreeBSD, OSF/1,
+Irix, BSD/OS, SCO and HP-UX. 
+
+
+*************** Changes that might affect runtime behavior *****************
+
+none
+
+*************** Changes that might generate compile errors *****************
+**************           when compiling old code           *****************
+
+QVector:
+--------
+
+Removed operator const type**().
+
+*************** Type changes that might generate warnings: *****************
+
+none
+
+*****************         Obsoleted functions         **********************
+
+none
+
+***************** All other changes from 0.98 to 0.99 **********************
+
+QApplication:
+-------------
+Added beep() to make a sound.
+
+
+QFileInfo
+---------
+Added readLink() to return the name of the file a symlink points to,
+fixed bug in isSymlink().
+
+
+QPrinter:
+---------
+The X11 version now supports landscape printing and different paper sizes.
+
+
+QTableView:
+-----------
+The functions horizontalScrollBar and verticalScrollBar gives access
+to the internal scroll bars so you can connect to their signals.
+
+
+QWidget:
+--------
+Added sizeHint virtual function which is implemented in subclasses to 
+return a recommended size.
+
+Added new function setFixedSize() to set both the minimum and maximum sizes
+at the same time.
+
+Added clearFocus() function to take keyboard focus from the widget.
diff --git a/dist/changes-1.0 b/dist/changes-1.0
new file mode 100644
index 0000000000..cf9f7a14d5
--- /dev/null
+++ b/dist/changes-1.0
@@ -0,0 +1,62 @@
+Here is a list of user-visible changes in Qt from 0.99 to 1.0.
+As usual, we fixed some bugs and improved the documentation.
+
+
+****************************************************************************
+*               Changes that might affect runtime behavior                 *
+****************************************************************************
+
+QComboBox:
+----------
+The combo box is resized to the largest item when automatic resizing
+is enabled. In 0.99 it resized itself to the current item.
+
+
+
+****************************************************************************
+*               Changes that might generate compile errors                 *
+*                        when compiling old code                           *
+****************************************************************************
+
+none
+
+
+
+****************************************************************************
+*               Type changes that might generate warnings:                 *
+****************************************************************************
+
+none
+
+
+
+****************************************************************************
+*                         Obsoleted functions                              *
+****************************************************************************
+
+All pre-1.0 obsoleted functions are now removed.
+
+
+
+****************************************************************************
+*                 All other changes from 0.99 to 1.0                       *
+****************************************************************************
+
+QBitmap:
+--------
+Added constructor that takes a file name. Loads an image from file.
+
+
+QDialog:
+--------
+QDialog inherits QWidget instead of QWindow.
+
+
+QPixmap:
+--------
+Added constructor that takes a file name. Loads an image from file.
+
+
+QTimer:
+-------
+Added static function singleShot(). Convenient function.
diff --git a/dist/changes-1.1 b/dist/changes-1.1
new file mode 100644
index 0000000000..ff9d2a768c
--- /dev/null
+++ b/dist/changes-1.1
@@ -0,0 +1,110 @@
+Here is a list of user-visible changes in Qt from 1.0 to 1.1.  As
+usual, we fixed some bugs, made some more speedups, and improved the
+documentation.
+
+
+****************************************************************************
+*               Changes that might affect runtime behavior                 *
+****************************************************************************
+
+We've added keyboard interface to more widgets, and changed the
+default focus policy radically.  For example, by default you can TAB
+to button, but it does not grab focus when you click it.  The new
+QWidget::setFocusPolicy() function can be used to change focus policy
+for all widgets.
+
+The font matching algorithm has been tweaked in order to provide more
+predictable fonts in more cases.  For some users (such as those with a
+75dpi X server and only 100dpi fonts installed) it may change the
+output of some programs.
+
+sizeHint() and hence default size has been tweaked for some widgets;
+QMenuBar and QPushButton in particular.
+
+
+****************************************************************************
+*               Changes that might generate compile errors                 *
+*                        when compiling old code                           *
+****************************************************************************
+
+We've renamed "declare" in qgeneric.h to Q_DECLARE due to naming
+conflicts.  Though we try to provide backward compatibility, there may
+be problems for a few programs.
+
+
+****************************************************************************
+*               Type changes that might generate warnings:                 *
+****************************************************************************
+
+none
+
+
+****************************************************************************
+*                         Obsoleted functions                              *
+****************************************************************************
+
+none
+
+
+****************************************************************************
+* 			     New classes				   *
+****************************************************************************
+
+QTabDialog (and QTabBar) provide a tabbed dialog.  examples/pref shows
+simple usage of QTabDialog.
+
+QMultiLineEditor is the long-awaited multi-line editor.
+
+QGridLayout provides grid-like geometry management for any widget,
+with flexible row/column elasticity, minimum and maximum sizes.
+
+QBoxLayout provides more complex and powerful geometry management:
+boxes and widgets stacked inside other boxes, and finally a top-level
+box connected to a widget.
+
+QToolTip provides tool tips for any widget.
+
+
+****************************************************************************
+*		       Other changes from 1.0 to 1.1			   *
+****************************************************************************
+
+Added QApplication::setColorMode() and colorMode().
+
+Added QColor::setAllocContext() and friends; these functions enable
+applications to allocate discardable colors and then discard them.
+
+Removed some GNU-make features from the makefiles.
+
+Added a QPalette constructor to construct an entire palette from a single
+background color, for convenience.
+
+moc output now has a version number #define.
+
+AIX support added.  IRIX and NetBSD fixed.
+
+Rewrote a couple of functions to work around compiler bugs, or
+purify/boundschecker overzealousness.
+
+Fixed that ugly man-page SYNOPSIS bug.
+
+Added the static function QMessageBox::query().
+
+QRect::unite() now produces the desired results if exactly one of the
+rectangles is invalid.
+
+QObject::parent() is now public.
+
+QPainter::drawWinFocusRect() draws a Windows 95-style focus rectangle.
+(A focus rectangle can not be drawn using ordinary Windows drawing
+functions.)
+
+QApplication::processEvents() added to cater for long-running
+computations; it processes one round of window system events and
+timers and then returns.
+
+QComboBox has been extended to provide an editable combo box and Motif
+2.x compatible look and feel.
+
+We've also added a host of new workarounds for bugs in Borland C++,
+Microsoft VC++, DEC CXX and HP CC.
diff --git a/dist/changes-1.2 b/dist/changes-1.2
new file mode 100644
index 0000000000..d4d2c2ca15
--- /dev/null
+++ b/dist/changes-1.2
@@ -0,0 +1,119 @@
+Here is a list of user-visible changes in Qt from 1.1 to 1.2.  As
+usual, we fixed some bugs, made some more speedups, and improved the
+documentation.
+
+
+****************************************************************************
+*               Changes that might affect runtime behavior                 *
+****************************************************************************
+
+QGridLayout::addWidget() and addMultiCellWidget(): The align parameter
+is now interpreted correctly. (Previously up/down and right/left were
+reversed.) If you have worked around this bug, your widgets may now be
+incorrectly aligned.
+
+QWidget: Every widget is now guaranteed move and resize events. The
+event is deferred until the first show(). This may cause problems in
+rare cases involving event filters.
+
+****************************************************************************
+*               Changes that might generate compile errors                 *
+*                        when compiling old code                           *
+****************************************************************************
+
+none
+
+****************************************************************************
+*               Type changes that might generate warnings:                 *
+****************************************************************************
+
+none
+
+****************************************************************************
+* 			Deprecated functions				   *
+****************************************************************************
+
+QApplication::setColorMode() and colorMode() will be obsoleted. Use
+setColorSpec() and colorSpec() instead.
+
+qchecksum() will be obsoleted. Please use qChecksum() instead.
+
+****************************************************************************
+* 			     New classes				   *
+****************************************************************************
+
+QSlider is a widget to input values from a range. If you have been
+using a standalone QScrollBar, you will probably want to switch to a
+QSlider.
+
+OpenGL/Mesa support: QGLWidget, QGLContext and QGLFormat. To use these
+classes you need to build the Qt/OpenGL library (qgl) in qt/opengl/src.
+
+****************************************************************************
+*		       Other changes from 1.1 to 1.2			   *
+****************************************************************************
+
+QApplication::setColorSpec() can specify private colormaps or
+non-default visuals
+
+New function QButton::setAutoRepeat().
+
+QComboBox: New function currentText(), two new insertion policies:
+AfterCurrent and BeforeCurrent.
+
+QCursor: added new global cursor blankCursor.
+
+QFont::key(), new function for caching.
+
+QFontMetrics::QFontMetrics( const QFont& ) new constructor gives
+fontmetrics directly for a font. This is much faster than using
+QWidget::fontMetrics() or QPainter::fontmetrics().
+
+QImage: image load/save functions:
+		QImage( const char *filename )
+		imageFormat(), load(), loadFromData(), save()
+		operator>>(), operator<<()
+	XPM support, QImage( const *xpm[] )
+	Alpha channel support: 
+		hasAlphaBuffer(), setAlphaBuffer()
+		createAlphaMask(), 
+	Automatic mask generaton: createHeuristicMask() 
+	Filling the entire image: fill()
+
+QLCDNumber now supports filled segments:
+	setSegmentStyle(), segmentStyle()
+
+QLabel now supports accellerated labels:
+	setBuddy(), buddy() and a  new constructor.
+
+QLineEdit new functions:
+	show/hide frame: setFrame(), frame()
+	password entry mode: setEchoMode(), echoMode()
+
+QMouseEvent: x() and y() convenience functions.
+
+QPainter: new constructor QPainter( const QPaintDevice* ) does automatic
+begin() and end(). New function	flush().
+
+QPixmap new functions:
+	serialNumber() for caching purposes.
+	selfMask()  QPixmap( const char *xpm[] )
+	createHeuristicMask()
+
+QPopupMenu: Added functions to enable checkmarks:
+	setCheckable(), isCheckable()
+
+QScrollBar: sizeHint() implemented.
+
+QTabBar now supports keyboard input. New function currentTab().
+
+QTabDialog: new function setOKButton().
+
+Added support for XFree86 on OS/2.
+
+New examples:
+	examples/tooltip demonstrates dynamic tooltips	
+	examples/table demonstrates QTableView
+	examples/hello is a different program
+
+examples/xshape has been removed.
diff --git a/dist/changes-1.30 b/dist/changes-1.30
new file mode 100644
index 0000000000..255d89c810
--- /dev/null
+++ b/dist/changes-1.30
@@ -0,0 +1,278 @@
+Here is a list of user-visible changes in Qt from 1.2 to 1.30.  As
+usual, we fixed some bugs, made some more speedups, and improved the
+documentation.
+
+Keyboard accelerators and traversal are significantly improved.
+
+Two new extensions included with Qt 1.30. They are not part of the library:
+
+Netscape plugin support. You can now write portable Netscape plugins
+using Qt. See the qt/extensions/nsplugin directory in the distribution.
+
+The ImageIO extension library gives a framework for adding new image
+formats, including PNG and JPEG in this release. See the qt/extensions/imageio
+directory in the distribution.
+
+The OpenGL extension for Qt now resides in qt/extensions.
+
+
+****************************************************************************
+* 			     New classes				   *
+****************************************************************************
+
+* QProgressBar displays a progress bar.
+
+* QProgressDialog uses QProgressBar to give the user feedback during long
+  operations, as well as a means of aborting.
+
+* QMovie supports animated GIFs and incremental loading of images.
+
+* QHBoxLayout and QVBoxLayout are convenience classes giving a simpler
+  interface to QBoxLayout.
+
+* QValidator provides a mechanism for validating input.
+
+
+****************************************************************************
+*		       Enhancements from 1.2 to 1.30			   *
+****************************************************************************
+
+QFont now supports charsets latin1 through latin9.
+
+New command-line arguments: -style motif and -style windows are
+accepted, as well as -style=motif and -style=windows, -visual, -ncols,
+-cmap.
+
+QMultiLineEdit is usable for much bigger documents than in 1.2
+
+More sizeHint() functions added, some existing ones tweaked.
+
+Many widgets have improved look and feel, particularly changes to
+Windows GUI style to match Windows more closely.
+
+Improved Postscript output.
+
+Color handling has been improved; better 32-to-8 conversion; Qt
+prefers to use Macintosh/Netscape color cube in 8-bit mode; more and
+better dithering support.
+
+GIF and PPM support.
+
+QMessageBox has a number of new static functions to replace the
+venerable message(): information(), warning(), critical() and about().
+
+QPopupMenu can now display icon and text in the same item.
+
+QPopupMenu::exec() to pop up a synchronous popup menu.
+
+QListBox now supports multi selection.
+
+QWidget::setBackgroundMode() gives a powerful way of managing widget
+backgrounds, to reduce flicker.
+
+QWidget::setIcon() now works under both X11 and Windows.
+
+The file dialog now remembers the previously selected directory.
+
+QApplication::setWinStyleHighlightColor() sets the highlight color in
+windows style.
+
+QApplication::setDoubleClickInterval() sets the double click timeout
+
+The layout example is new and more informative.
+
+There is a new openGL example; extension/opengl/examples/box/ shows
+how to control an openGL widget using Qt user interface components.
+
+
+****************************************************************************
+*               Changes that might affect runtime behavior                 *
+****************************************************************************
+
+Tab/Shift-Tab handling has been improved a lot; this means that
+widgets which couldn't get keyboard focus before now can.
+
+Some widgets (buttons, tab bars, tab dialogs) semi-automatically set
+up keyboard accelerators. ( setText("E&xit") will give Alt-X as an
+accelerator.)  In some very rare cases, this will cause changes of
+behaviour.
+
+The QColor::light() function now works, and anything which relied on
+its buggy behaviour might be a little darker than expected until changed,
+usually just recompiling (the default argument has also changed).
+
+The colors used have been tuned a bit; pixmaps that "know" the RGB
+values of colorGroup().background() and the like will look just a tiny
+bit wrong.
+
+QApplication calls setlocale to the local environment, except for
+LC_NUMERIC which is set to the C locale. This means that input/output
+of floating point numbers will always use '.' as the decimal separator, 
+while all other locale dependant operations will use the default locale.
+ 
+
+****************************************************************************
+*               Changes that might generate compile errors                 *
+*                        when compiling old code                           *
+****************************************************************************
+
+none
+
+****************************************************************************
+*               Type changes that might generate warnings:                 *
+****************************************************************************
+
+none
+
+****************************************************************************
+* 			Deprecated functions				   *
+****************************************************************************
+
+QApplication::setColorMode()
+ - see QApplication::setColorSpec(int)
+QRegion::xor()
+ - see QRegion::eor()
+QMessageBox::message()
+ - see QMessageBox::information/warning/critical
+QMultiLineEdit::getCursorPosition()
+ - see QMultiLineEdit::cursorPosition()
+QTabDialog::setOKButton()
+ - see QTabDialog::setOkButton()
+
+****************************************************************************
+*      New public/protected functions added to existing classes            *
+****************************************************************************
+
+QAccel::repairEventFilter()
+QApplication::activeModalWidget()
+QApplication::activePopupWidget()
+QApplication::allWidgets()
+QApplication::doubleClickInterval()
+QApplication::hasGlobalMouseTracking()
+QApplication::processEvents(int)
+QApplication::processOneEvent()
+QApplication::setDoubleClickInterval(int)
+QApplication::setGlobalMouseTracking(bool)
+QApplication::setWinStyleHighlightColor(QColor const &)
+QApplication::winStyleHighlightColor()
+QApplication::x11ProcessEvent(_XEvent *)
+QBoxLayout::className() const
+QButton::accel() const
+QButton::animateClick()
+QButton::enabledChange(bool)
+QButton::setAccel(int)
+QComboBox::clearValidator()
+QComboBox::setStyle(GUIStyle)
+QComboBox::setValidator(QValidator *)
+QComboBox::validator() const
+QDir::convertSeparators(char const *)
+QFrame::sizeHint() const
+QGridLayout::addColSpacing(int, int)
+QGridLayout::addRowSpacing(int, int)
+QGridLayout::className() const
+QImage::convertDepth(int, int) const
+QImage::create(QSize const &, int, int, QImage::Endian)
+QImage::createAlphaMask(int) const
+QImage::inputFormats()
+QImage::outputFormats()
+QImage::pixel(int, int) const
+QImage::pixelIndex(int, int) const
+QImage::setPixel(int, int, unsigned int)
+QImage::valid(int, int) const
+QImageIO::inputFormats()
+QImageIO::outputFormats()
+QLabel::movie() const
+QLabel::setMovie(QMovie const &)
+QLayout::className() const
+QLineEdit::clearValidator()
+QLineEdit::setValidator(QValidator *)
+QLineEdit::sizeHint() const
+QLineEdit::validator() const
+QListBox::clearSelection()
+QListBox::focusOutEvent(QFocusEvent *)
+QListBox::highlighted(char const *)
+QListBox::isMultiSelection() const
+QListBox::isSelected(int) const
+QListBox::selected(char const *)
+QListBox::selectionChanged()
+QListBox::setMultiSelection(bool)
+QListBox::setSelected(int, bool)
+QListBox::toggleCurrentItem()
+QMenuBar::heightForWidth(int) const
+QMenuBar::leaveEvent(QEvent *)
+QMenuBar::separator() const
+QMenuBar::setSeparator(QMenuBar::Separator)
+QMenuData::changeItem(QPixmap const &, char const *, int)
+QMenuData::insertItem(QPixmap const &, char const *, QObject const *, char const *, int)
+QMenuData::insertItem(QPixmap const &, char const *, QPopupMenu *, int, int)
+QMenuData::insertItem(QPixmap const &, char const *, int, int)
+QMessageBox::about(QWidget *, char const *, char const *)
+QMessageBox::aboutQt(QWidget *, char const *)
+QMessageBox::buttonText(int) const
+QMessageBox::critical(QWidget *, char const *, char const *, char const *, char const *, char const *, int, int)
+QMessageBox::critical(QWidget *, char const *, char const *, int, int, int)
+QMessageBox::icon() const
+QMessageBox::iconPixmap() const
+QMessageBox::information(QWidget *, char const *, char const *, char const *, char const *, char const *, int, int)
+QMessageBox::information(QWidget *, char const *, char const *, int, int, int)
+QMessageBox::setButtonText(int, char const *)
+QMessageBox::setIcon(QMessageBox::Icon)
+QMessageBox::setIconPixmap(QPixmap const &)
+QMessageBox::setStyle(GUIStyle)
+QMessageBox::standardIcon(QMessageBox::Icon, GUIStyle)
+QMessageBox::warning(QWidget *, char const *, char const *, char const *, char const *, char const *, int, int)
+QMessageBox::warning(QWidget *, char const *, char const *, int, int, int)
+QMultiLineEdit::cursorPoint() const
+QMultiLineEdit::cursorPosition(int *, int *) const
+QMultiLineEdit::getMarkedRegion(int *, int *, int *, int *) const
+QPainter::drawPoints(QPointArray const &, int, int)
+QPainter::drawWinFocusRect( int, int, int, int, const QColor & )
+QPalette::detach()
+QPicture::data() const
+QPicture::isNull() const
+QPicture::setData(char const *, unsigned int)
+QPicture::size() const
+QPixmap::convertFromImage(QImage const &, int)
+QPixmap::load(char const *, char const *, int)
+QPixmap::loadFromData(unsigned char const *, unsigned int, char const *, int)
+QPopupMenu::exec()
+QPopupMenu::setActiveItem(int)
+QRegion::eor(QRegion const &) const
+QSize::transpose()
+QTabBar::setCurrentTab(QTab *)
+QTabBar::setCurrentTab(int)
+QTabBar::setShape(QTabBar::Shape)
+QTabBar::shape() const
+QTabBar::tab(int)
+QTabBar::tabList()
+QTabDialog::addTab(QWidget *, QTab *)
+QTabDialog::hasOkButton() const
+QTabDialog::selected(char const *)
+QTabDialog::setTabBar(QTabBar *)
+QTabDialog::showPage(QWidget *)
+QTabDialog::styleChange(GUIStyle)
+QTabDialog::tabBar() const
+QTabDialog::tabLabel(QWidget *)
+QTableView::minViewX() const
+QTableView::minViewY() const
+QTableView::updateTableSize()
+QToolTip::font()
+QToolTip::palette()
+QToolTip::setFont(QFont const &)
+QToolTip::setPalette(QPalette const &)
+QWidget::backgroundMode() const
+QWidget::create(unsigned int, bool, bool)
+QWidget::destroy(bool, bool)
+QWidget::focusProxy() const
+QWidget::focusWidget() const
+QWidget::isVisibleToTLW() const
+QWidget::setBackgroundMode(QWidget::BackgroundMode)
+QWidget::setFixedHeight(int)
+QWidget::setFixedWidth(int)
+QWidget::setFocusProxy(QWidget *)
+QWidget::setMaximumHeight(int)
+QWidget::setMaximumWidth(int)
+QWidget::setMinimumHeight(int)
+QWidget::setMinimumWidth(int)
+QWidget::setTabOrder(QWidget *, QWidget *)
+QWidget::update(QRect const &)
diff --git a/dist/changes-1.31 b/dist/changes-1.31
new file mode 100644
index 0000000000..b6b2d65233
--- /dev/null
+++ b/dist/changes-1.31
@@ -0,0 +1,34 @@
+1.31 is a bug-fix release of Qt and only contains minor changes compared
+to Qt 1.30
+
+Here is a list of the bug-fixes made in Qt from 1.30 to 1.31.
+
+Changing the font of a QButton, QPushButton, QCheckBox or QRadioButton now
+works correctly.
+
+QRadiobutton:    Correct toggling in a QButtonGroup when activated by an
+                 accelerator.
+
+QPopupMenu:      Items updated correctly when activated by an accelerator.
+
+QProgressBar:    Base color is no longer fixed to white.
+
+QProgressDialog: setLabel() and setCancelButton() now ensure that a given
+	         widget is shown and is a child of QProgressDialog.
+
+QWidget:         setEnabled( FALSE ) now moves focus correctly.
+
+QLineEdit and
+QMultiLineEdit:  In keyPressEvent() backspace no longer inserts an
+                 unprintable character with some rare keyboard layouts.
+
+QMenubar:        Mouse presses on items without any popup menu are now
+		 always recognized.
+
+Changes to fix compile problems under IRIX.
+
+Changes to fix compile problems on some versions of AIX.
+
+Changes to fix compile problems with aCC on HP-UX.
+
+Minor documentation fixes.
diff --git a/dist/changes-1.39-19980327 b/dist/changes-1.39-19980327
new file mode 100644
index 0000000000..3c5843d401
--- /dev/null
+++ b/dist/changes-1.39-19980327
@@ -0,0 +1,963 @@
+src/widgets/qlabel.cpp    2.21  agulbra  +9 -5
+
+  new sizeHint(); "yes\nyes" is as tall as "Yes\nYes"
+
+
+src/tools/qstrlist.h    2.7  hanord  +10 -9  (1997/10/16)
+
+  Fixed STL crash reported by ust@egd.igd.fhg.de
+
+
+src/kernel/qregion.cpp    2.5  agulbra  +3 -3  (1997/10/19)
+src/kernel/qregion.h    2.6  agulbra  +2 -2
+
+  USL C++ understands xor
+
+
+src/kernel/qkeycode.h    2.5  hanord  +13 -2  (1997/10/22)
+
+  Added function keys F25..F35 for X only
+
+
+src/widgets/qpushbt.cpp    2.33  hanord  +5 -9
+
+  Always clear button background in Windows style
+
+
+src/widgets/qpushbt.cpp    2.32  hanord  +8 -8
+
+  Fixed background color for windows style
+
+
+src/kernel/qcur_win.cpp    2.5  hanord  +15 -5
+
+  Fix the cursor bug on Win95
+
+
+src/kernel/qobject.cpp    2.36  eiriken  +3 -3
+src/kernel/qwid_win.cpp    2.39  eiriken  +19 -17
+
+  Fixed bugs in setMaximumSize and setMinimumSize
+
+
+src/widgets/qlabel.cpp    2.23  agulbra  +11 -2
+src/widgets/qlabel.h    2.5  agulbra  +2 -1
+
+  add clear()
+
+
+src/kernel/qapp.cpp    2.38  eiriken  +8 -2  (1997/10/31)
+
+  Added warning in QApplication::palette() if called before a QApplication
+  is created.
+
+
+src/kernel/qcolor.h    2.8  hanord  +6 -7
+
+  Fixed the color== operator
+
+
+src/kernel/qcol_win.cpp    2.16  hanord  +13 -41
+src/kernel/qcolor.cpp    2.12  hanord  +118 -36
+src/kernel/qcolor.h    2.7  hanord  +7 -6
+
+  Moved platform independent functions into qcolor.cpp
+  Optimized setNamedColor for #RRGGBB style color names.
+  Doc warns that RGB bit format may change in the future.
+  setRgb(QRgb) optimized.
+  Added static class member color_init (not a global file variable)
+
+
+src/kernel/qapp_win.cpp    2.64  hanord  +67 -50
+
+  Detects the Windows version using GetVersionEx.
+  Moved the timer function to the appropriate section.
+
+
+src/kernel/qclb_x11.cpp    2.4  agulbra  +6 -5
+
+  call XInternAtoms() once instead of XInternAtom N times.  should
+  improve start-up time by about 3-5 times the ping time to the server.
+
+
+src/widgets/qlistbox.h    2.12  agulbra  +2 -1  (1997/11/09)
+
+  don't let down-arrow set the current item to be half-visible
+
+
+src/kernel/qpainter.cpp    2.17  hanord  +61 -5  (1997/11/12)
+src/kernel/qpainter.h    2.12  hanord  +2 -1
+
+  Added new begin() which takes a paint device and a widget to copy pen, font
+  etc. from.
+  Fixed inverted dense pattern on Windows.
+
+
+src/widgets/qslider.cpp    2.45  paul  +3 -2
+
+  fixing bug when setting value in constructor followed by resetting value
+  to zero.
+
+
+src/kernel/qimage.cpp    2.65.2.1  agulbra  +4 -4
+
+  avoid segfaults for image handlers where either read or
+  write is 0.  enables gif image handlers.
+
+
+src/qt.pro    2.6  agulbra  +4 -2  (1997/11/20)
+src/kernel/qdragobject.cpp    2.1  agulbra  initial checkin
+src/kernel/qdragobject.h    2.1  agulbra  initial checkin
+src/kernel/qevent.h    2.6  agulbra  +59 -2
+src/widgets/qlined.cpp    2.54  agulbra  +92 -3
+src/widgets/qlined.h    2.19  agulbra  +3 -1
+
+  QDragObject and related goodies.  not ready for prime time, but hey!
+
+
+src/widgets/qcombo.cpp    2.68  agulbra  +52 -2
+src/widgets/qcombo.h    2.20  agulbra  +5 -1
+
+  new function setListBox() - allows custom combos like the ones in ACT
+
+
+src/kernel/qapp_win.cpp    2.65  warwick  +4 -3
+src/kernel/qwid_win.cpp    2.43  warwick  +51 -19
+
+  Reimplement QWidget::recreate(), using almost same code as X11 version.
+
+
+src/kernel/qptr_win.cpp    2.21.2.1  hanord  +8 -8  (1997/11/25)
+
+  Fixed bad dense patterns
+
+
+src/widgets/qchkbox.cpp    2.17  warwick  +16 -7  (1997/11/28)
+src/widgets/qradiobt.cpp    2.21  warwick  +18 -7
+
+  Check pixmap in sizeHint()
+
+
+src/kernel/qpainter.h    2.14  hanord  +3 -1  (1997/12/02)
+
+  Added xForm and xFormDev with index,npoints arguments
+
+
+src/kernel/qpainter.cpp    2.19  hanord  +399 -2
+src/kernel/qptr_x11.cpp    2.31  hanord  +45 -333
+
+  Moved platform-independent xForm functions into qpainter.cpp.
+  Fixed bugs in drawPoints, drawPolyline, drawLineSegments and
+  drawPolygon where index > 0 or npoints < array size.
+  Added xForm(pointarray,index,size) and similar xFormDev().
+  Now Purify should shut up.
+  Removed some tests for cpen.style() != NoPen.  Makes some code
+  somewhat slower, but makes QPainter more consistent.
+
+
+src/kernel/qptd_x11.cpp    2.9  hanord  +11 -3
+src/kernel/qptr_x11.cpp    2.30  hanord  +11 -5
+
+  Set graphics exposures to FALSE except when bitBlt from widget to widget
+
+
+src/kernel/qpm_win.cpp    2.29  hanord  +12 -12
+
+  When converting an image to a pixmap, don't create a new pixmap unless
+  the depth or dimension changes.
+
+
+src/widgets/qlined.cpp    2.56  agulbra  +64 -41
+src/widgets/qlined.h    2.21  agulbra  +6 -3
+
+  various small fixes, mostly to draw correctly.  added setFont() and
+  setEnabled() to update correctly, I guess we need setStyle() and
+  setPalette() too.
+
+
+src/dialogs/qmsgbox.cpp    2.40  warwick  +8 -6  (1997/12/08)
+
+  Correct layout for text smaller than icon.
+
+
+src/widgets/qprogbar.cpp    2.15  warwick  +22 -8
+
+  Ensure display is up-to-date when a progress bar is re-used.
+
+
+src/kernel/qptr_x11.cpp    2.32  warwick  +4 -2
+
+  Fix out-of-bounds clipping.
+
+
+src/kernel/qapp_win.cpp    2.67  hanord  +23 -8
+
+  Get the app name even for console applications (when WinMain isn't called)
+
+
+src/kernel/qasyncimageio.cpp    1.23  warwick  +57 -26
+src/kernel/qasyncimageio.h    1.12  warwick  +2 -1
+
+  Handle nasty GIFs.
+
+
+src/widgets/qspinbox.cpp    2.24  aavit  +170 -25  (1997/12/09)
+src/widgets/qspinbox.h    2.14  aavit  +17 -8
+
+  Improved QSpinbox - now easier to subclass; and "Auto" choice added.
+
+
+src/tools/qregexp.cpp    2.6  hanord  +15 -12
+
+  Fixed serious bug: regular expression with characters > 127 now works.
+
+
+src/kernel/qprn_x11.cpp    2.6  warwick  +3 -3
+
+  QPrinter::newPage() previous always returned FALSE.  Fixed.
+
+
+src/widgets/qscrbar.cpp    2.30  agulbra  +6 -6
+
+  be a bit kinder and gentler about the hot zone in windows style.  the
+  old limit (30 pixels to either side of the bar) was too tight
+
+
+src/kernel/qapp_win.cpp    2.68  hanord  +6 -3  (1997/12/15)
+
+  Fixed the modal loop problem related to synch popups with signals
+
+
+src/widgets/qlined.cpp    2.57  agulbra  +8 -8  (1998/01/05)
+
+  don't allow paste from ****'ed line edits
+
+
+src/kernel/qasyncimageio.cpp    1.25  warwick  +14 -6  (1998/01/06)
+
+  Be more forgiving about broken GIF - as forgiving as netscape
+
+
+src/kernel/qasyncimageio.cpp    1.24  warwick  +5 -2
+
+  Protection against more broken GIFs.
+
+
+extensions/xt/doc.conf    1.1  warwick  initial checkin  (1998/01/07)
+extensions/xt/doc/annotated.doc    1.1  warwick  initial checkin
+extensions/xt/doc/classes.doc    1.1  warwick  initial checkin
+extensions/xt/doc/examples.doc    1.1  warwick  initial checkin
+extensions/xt/doc/index.doc    1.1  warwick  initial checkin
+extensions/xt/examples/mainlyMotif/editor.cpp    1.1  warwick  initial checkin
+extensions/xt/examples/mainlyMotif/editor.pro    1.1  warwick  initial checkin
+extensions/xt/examples/mainlyQt/editor.cpp    1.1  warwick  initial checkin
+extensions/xt/examples/mainlyQt/editor.pro    1.1  warwick  initial checkin
+extensions/xt/examples/mainlyXt/editor.cpp    1.1  warwick  initial checkin
+extensions/xt/examples/mainlyXt/editor.pro    1.1  warwick  initial checkin
+extensions/xt/src/qxt.cpp    1.1  warwick  initial checkin
+extensions/xt/src/qxt.h    1.1  warwick  initial checkin
+extensions/xt/src/qxt.pro    1.1  warwick  initial checkin
+
+  Qt Xt/Motif Extension, examples, docs.
+
+
+src/kernel/qevent.cpp    2.7  paul  +48 -9  (1998/01/08)
+src/kernel/qevent.h    2.9  paul  +17 -1
+src/kernel/qgmanagr.cpp    2.22  paul  +97 -10
+src/kernel/qgmanagr.h    2.7  paul  +3 -1
+src/kernel/qlayout.cpp    2.27  paul  +2 -23
+src/kernel/qwid_win.cpp    2.44  paul  +19 -3
+src/kernel/qwidget.cpp    2.85  paul  +10 -2
+
+  New events ChildInserted, ChildRemoved and LayoutHint. Not tested on Windows.
+  Use new events in GM.
+
+
+src/qt.pro    2.11  paul  +2 -0
+src/widgets/qsplitter.cpp    1.1  paul  initial checkin
+src/widgets/qsplitter.h    1.1  paul  initial checkin
+
+  New widget QSplitter
+
+
+src/kernel/qpntarry.cpp    2.12  warwick  +4 -4
+
+  Fix quad bezier for small curves
+
+
+src/kernel/qwidget.cpp    2.87  agulbra  +71 -16
+src/kernel/qwidget.h    2.38  agulbra  +5 -2
+src/kernel/qwindefs.h    2.20  agulbra  +2 -1
+
+  added setAutoMinimumSize().  fixed a couple of documentation errors.
+
+
+src/kernel/qwid_win.cpp    2.45  warwick  +4 -3  (1998/01/13)
+
+  Fix case of recreate(0,...) on tlw.
+
+
+src/widgets/qbutton.cpp    2.40.2.1  agulbra  +7 -7
+
+  paint correctly when there is a background color
+
+
+src/widgets/qlined.cpp    2.58  paul  +18 -8  (1998/01/14)
+
+  Correct cursor when end(). Better blinking
+
+
+src/dialogs/qtabdlg.cpp    2.36  agulbra  +172 -213
+src/dialogs/qtabdlg.h    2.17  agulbra  +2 -1
+src/kernel/qgmanagr.cpp    2.23  agulbra  +22 -21
+src/widgets/qtabbar.cpp    2.30  agulbra  +12 -15
+src/widgets/qwidgetstack.cpp    2.1  agulbra  initial checkin
+src/widgets/qwidgetstack.h    2.1  agulbra  initial checkin
+
+  The new class QWidgetStack encapsulates a bunch of widgets of the same
+  size, where the one on top of the stack is visible.  It provides slots
+  to raise any of the widgets to the top of the stack and so on.
+  
+  QTabDialog now uses QWidgetStack.  A couple of hacks went away, and it
+  now uses QBoxLayout to manage its children.  Some more minor changes
+  are desirable here.
+  
+  QTabBar now uses autoMinimumSize() appropriately, and is closer to the
+  new Windows look and feel (ie. it lost the bold stuff).  QTabDialog is
+  adapted accordingly.
+  
+  QGManager now has a one-line VERY INEFFICENT fix that SORELY NEEDS
+  OPTIMIZATION to make layout hint events propagate outwards correctly.
+  There's about twenty hashes on the relevant line.  This change is the
+  whole point of the check-in: Most things that use QWidgetStack will
+  really need this fix.  Paul, optimize it, please?
+
+
+src/kernel/qobject.cpp    2.42  agulbra  +13 -2
+
+  show geometry and visibility too in dumpObjectTree()
+
+
+src/qt.pro    2.12  agulbra  +10 -0
+src/widgets/qmainwindow.cpp    2.1  agulbra  initial checkin
+src/widgets/qmainwindow.h    2.1  agulbra  initial checkin
+src/widgets/qstatusbar.cpp    2.1  agulbra  initial checkin
+src/widgets/qstatusbar.h    2.1  agulbra  initial checkin
+src/widgets/qtoolbar.cpp    2.1  agulbra  initial checkin
+src/widgets/qtoolbar.h    2.1  agulbra  initial checkin
+src/widgets/qtoolbutton.cpp    2.1  agulbra  initial checkin
+src/widgets/qtoolbutton.h    2.1  agulbra  initial checkin
+
+  several new classes.  very rough and ready, but they're good enough to
+  talk about and play with.
+
+
+src/widgets/qframe.cpp    2.11  paul  +33 -5
+src/widgets/qframe.h    2.4  paul  +8 -2
+
+  New function setMargin()
+
+
+examples/showimg/showimg.cpp    2.18  warwick  +25 -6  (1998/01/21)
+examples/showimg/showimg.h    2.6  warwick  +3 -1
+src/kernel/qimage.h    2.22  warwick  +5 -1
+
+  QImage::smoothScale(int with, int height)
+
+
+src/widgets/qpopmenu.h    2.10  agulbra  +3 -2
+
+  new signal aboutToShow(), like the one in QTabDialog.
+
+
+src/tools/qstring.cpp    2.16  warwick  +44 -3  (1998/01/23)
+
+  Make QString implicitly shared.  Activates in Qt 2.00.
+  Try enabling this protection next time you have some weird bug.
+
+
+src/kernel/qclb_x11.cpp    2.6  hanord  +155 -46
+
+  INCR paste works.
+
+
+src/qt.pro    2.13  agulbra  +2 -0
+src/widgets/qwhatsthis.cpp    2.1  agulbra  initial checkin
+src/widgets/qwhatsthis.h    2.1  agulbra  initial checkin
+
+  what's this?  
+  it's not perfect, but it definitely is nice.
+
+
+extensions/imageio/src/qpngio.cpp    1.6  warwick  +9 -4  (1998/01/27)
+
+  Don't set alpha if not necessary.
+
+
+src/kernel/qpm_win.cpp    2.31  hanord  +5 -11
+
+  Preserves mask when converting an image to a pixmap
+
+
+src/kernel/qapp.cpp    2.42  agulbra  +7 -7
+
+  corrected dark shadow colour - has been too dark since warwick fixed
+  QColor::dark().
+
+
+src/kernel/qprn_win.cpp    2.6  hanord  +11 -5
+
+  Printing now works on DeskJet 890c (StretchDIBits didn't work)
+  We now do StretchBlt.
+
+
+src/widgets/qpopmenu.h    2.12  warwick  +2 -1  (1998/02/06)
+
+  Allow position in QPopupMenu::exec(...)
+
+
+src/kernel/qpntarry.cpp    2.13  warwick  +14 -15
+
+  QPointArray::makeArc() now works with negative "alen" angle.
+   - QPainter::drawArc() uses this for arcs under transformation.
+
+
+src/widgets/qbttngrp.cpp    2.8  aavit  +34 -10
+src/widgets/qbttngrp.h    2.3  aavit  +2 -1
+
+  bugfix: Untoggling of other buttons in an exclusive group
+  if a button was set with setChecked() did not work.
+
+
+src/widgets/qslider.cpp    2.47  agulbra  +15 -28
+
+  made valueChanged() work correctly with middle-button dragging when
+  !tracking().  simplified the mouse state machine a little.
+
+
+src/tools/qdir.cpp    2.16  hanord  +4 -8  (1998/02/11)
+src/tools/qfile.cpp    2.13  hanord  +36 -2
+src/tools/qfile.h    2.3  hanord  +4 -1
+
+  Added QFile::remove() which removes a file
+
+
+src/widgets/qlined.cpp    2.60  agulbra  +12 -2  (1998/02/19)
+src/widgets/qlined.h    2.23  agulbra  +5 -3
+
+  add clear(), make setText() and insert() public
+
+
+src/widgets/qlistview.cpp    2.52  agulbra  +33 -2
+src/widgets/qlistview.h    2.25  agulbra  +3 -1
+
+  added a sizeHint()
+
+
+src/tools/qdir.cpp    2.17  agulbra  +4 -4
+src/tools/qfileinf.cpp    2.7  agulbra  +5 -4
+
+  do what the docs say for absFilePath() (ie. no /usr/../usr/bin/ls names)
+
+
+src/widgets/qtablevw.cpp    2.41  agulbra  +31 -23
+
+  scrollLast*Cell and clipToCell could not be combined.  now they can.
+
+
+src/widgets/qframe.cpp    2.13  warwick  +4 -4  (1998/02/20)
+
+  Fix Box and H/VLine frames with margin() != 0.
+
+
+src/qt.pro    2.15  warwick  +2 -0
+src/widgets/qlabelled.cpp    1.1  warwick  initial checkin
+src/widgets/qlabelled.h    1.1  warwick  initial checkin
+
+  QLabelled widget (experimental)
+
+
+src/kernel/qapp.cpp    2.45  agulbra  +28 -13
+src/kernel/qapp_win.cpp    2.73  agulbra  +14 -13
+
+  deliver mouse events to application-wide event filters even if the
+  receiver object is disabled.  this allows tooltips to work for
+  disabled widgets.
+
+
+src/widgets/qcombo.h    2.23  agulbra  +3 -2
+
+  make eventFilter() public.  this may break binary compatibility on
+  msvc++, if anyone's built a dll yet.
+
+
+src/widgets/qradiobt.cpp    2.23  agulbra  +7 -17
+
+  support exclusive button group behaviour even when one of the buttons
+  is not a QRadioButton.
+
+
+src/qt.pro    2.16  paul  +6 -0
+src/widgets/qgrid.cpp    1.1  paul  initial checkin
+src/widgets/qgrid.h    1.1  paul  initial checkin
+src/widgets/qhbox.cpp    1.1  paul  initial checkin
+src/widgets/qhbox.h    1.1  paul  initial checkin
+src/widgets/qvbox.cpp    1.1  paul  initial checkin
+src/widgets/qvbox.h    1.1  paul  initial checkin
+
+  New layout widgets
+
+
+src/tools/qdstream.h    2.4  warwick  +2 -2
+
+  QDataStream::eof() now returns TRUE if no device is set (as documented).
+
+
+src/tools/qfile.cpp    2.14  warwick  +36 -19
+src/tools/qiodev.cpp    2.8  warwick  +8 -5
+
+  Test the file in QFile::open(FILE*) to see if it is seekable (not a
+  char device, fifo, or socket), rather than assuming stdin/out/err are not.
+  Set type to Sequential for such files, not default Direct.
+  
+  Don't use feof(fh) to mean at()==size().  QFile::atEnd() now works the
+  same as QIODevice and QBuffer.
+  
+  setStatus(IO_ReadError) in appropriate places (wasn't ever set for files).
+  Reading EOF is considered an error in the QIODevice model (see QBuffer).
+
+
+src/kernel/qasyncimageio.cpp    1.26  warwick  +37 -30
+src/kernel/qasyncimageio.h    1.13  warwick  +2 -2
+
+  Work for even weirder GIFs.
+
+
+src/tools/qfile.cpp    2.16  agulbra  +5 -4  (1998/02/25)
+
+  -1 in case of error...
+
+
+src/qt.pro    2.17  paul  +2 -0
+src/widgets/qbuttonrow.cpp    1.1  paul  initial checkin
+src/widgets/qbuttonrow.h    1.1  paul  initial checkin
+
+  New layout widget
+
+
+examples/aclock/GNUmakefile    2.1  hanord  initial checkin
+examples/aclock/Makefile    2.2  hanord  +6 -53
+examples/aclock/aclock.pro    1.4  hanord  +6 -6
+examples/application/GNUmakefile    1.1  hanord  initial checkin
+examples/application/application.pro    1.2  hanord  +6 -6
+examples/biff/GNUmakefile    2.1  hanord  initial checkin
+examples/biff/Makefile    2.2  hanord  +6 -54
+examples/biff/biff.pro    1.4  hanord  +6 -6
+examples/connect/GNUmakefile    2.1  hanord  initial checkin
+examples/connect/Makefile    2.2  hanord  +6 -46
+examples/connect/connect.pro    1.4  hanord  +5 -5
+examples/cursor/GNUmakefile    2.1  hanord  initial checkin
+examples/cursor/Makefile    2.2  hanord  +6 -46
+examples/cursor/cursor.pro    1.4  hanord  +5 -5
+examples/dclock/GNUmakefile    2.1  hanord  initial checkin
+examples/dclock/Makefile    2.2  hanord  +6 -54
+examples/dclock/dclock.pro    1.4  hanord  +6 -6
+examples/desktop/GNUmakefile    2.1  hanord  initial checkin
+examples/desktop/Makefile    2.2  hanord  +6 -46
+examples/desktop/desktop.pro    1.4  hanord  +5 -5
+examples/dirview/GNUmakefile    1.1  hanord  initial checkin
+examples/drawdemo/GNUmakefile    2.1  hanord  initial checkin
+examples/drawdemo/Makefile    2.2  hanord  +6 -52
+examples/drawdemo/drawdemo.pro    1.4  hanord  +5 -5
+examples/forever/GNUmakefile    2.1  hanord  initial checkin
+examples/forever/Makefile    2.3  hanord  +6 -42
+examples/forever/forever.pro    1.4  hanord  +5 -5
+examples/hello/GNUmakefile    2.1  hanord  initial checkin
+examples/hello/Makefile    2.8  hanord  +6 -61
+examples/hello/hello.pro    1.5  hanord  +6 -5
+examples/layout/GNUmakefile    1.1  hanord  initial checkin
+examples/layout/Makefile    1.11  hanord  +7 -50
+examples/layout/layout.pro    1.5  hanord  +5 -4
+examples/life/GNUmakefile    2.1  hanord  initial checkin
+examples/life/Makefile    2.2  hanord  +6 -57
+examples/life/life.pro    2.3  hanord  +8 -8
+examples/menu/GNUmakefile    2.1  hanord  initial checkin
+examples/menu/Makefile    2.4  hanord  +6 -55
+examples/menu/menu.pro    2.3  hanord  +5 -5
+examples/movies/GNUmakefile    1.1  hanord  initial checkin
+examples/movies/Makefile    1.11  hanord  +6 -50
+examples/movies/movies.pro    1.4  hanord  +5 -5
+examples/network/GNUmakefile    1.1  hanord  initial checkin
+examples/network/Makefile    1.7  hanord  +6 -82
+examples/picture/GNUmakefile    2.1  hanord  initial checkin
+examples/picture/Makefile    2.2  hanord  +6 -49
+examples/picture/picture.pro    1.2  hanord  +6 -3
+examples/pref/GNUmakefile    1.1  hanord  initial checkin
+examples/pref/Makefile    1.4  hanord  +6 -53
+examples/pref/pref.pro    1.4  hanord  +6 -6
+examples/progress/GNUmakefile    1.1  hanord  initial checkin
+examples/progress/Makefile    1.9  hanord  +6 -47
+examples/progress/progress.pro    1.3  hanord  +5 -5
+examples/qmag/GNUmakefile    2.1  hanord  initial checkin
+examples/qmag/Makefile    2.2  hanord  +6 -52
+examples/qmag/qmag.pro    2.3  hanord  +5 -5
+examples/qwerty/GNUmakefile    1.1  hanord  initial checkin
+examples/qwerty/Makefile    1.6  hanord  +5 -66
+examples/qwerty/qwerty.pro    1.4  hanord  +6 -6
+examples/scrollview/GNUmakefile    1.1  hanord  initial checkin
+examples/scrollview/Makefile    1.4  hanord  +6 -56
+examples/scrollview/scrollview.pro    1.3  hanord  +5 -5
+examples/sheet/GNUmakefile    2.1  hanord  initial checkin
+examples/sheet/Makefile    2.3  hanord  +6 -59
+examples/showimg/GNUmakefile    2.1  hanord  initial checkin
+examples/showimg/Makefile    2.12  hanord  +6 -58
+examples/showimg/showimg.pro    2.7  hanord  +6 -9
+examples/table/GNUmakefile    1.1  hanord  initial checkin
+examples/table/Makefile    1.5  hanord  +5 -67
+examples/table/table.pro    1.4  hanord  +6 -6
+examples/tetrix/GNUmakefile    2.1  hanord  initial checkin
+examples/tetrix/Makefile    2.5  hanord  +6 -70
+examples/tetrix/tetrix.pro    2.4  hanord  +14 -14
+examples/tictac/GNUmakefile    2.1  hanord  initial checkin
+examples/tictac/Makefile    2.2  hanord  +6 -54
+examples/tictac/tictac.pro    2.3  hanord  +6 -6
+examples/timestmp/GNUmakefile    2.1  hanord  initial checkin
+examples/timestmp/Makefile    2.2  hanord  +6 -46
+examples/tooltip/GNUmakefile    1.1  hanord  initial checkin
+examples/tooltip/Makefile    1.3  hanord  +6 -53
+examples/tooltip/tooltip.pro    1.3  hanord  +6 -6
+examples/validator/GNUmakefile    1.1  hanord  initial checkin
+examples/validator/Makefile    1.3  hanord  +6 -38
+examples/widgets/GNUmakefile    2.1  hanord  initial checkin
+examples/widgets/Makefile    2.4  hanord  +6 -67
+examples/widgets/widgets.pro    2.3  hanord  +5 -9
+examples/xform/GNUmakefile    2.1  hanord  initial checkin
+examples/xform/Makefile    2.4  hanord  +6 -52
+examples/xform/xform.pro    2.3  hanord  +6 -5
+src/GNUmakefile    2.1  hanord  initial checkin
+src/Makefile    2.22  hanord  +6 -156
+
+  New makefile system
+
+
+src/widgets/qframe.cpp    2.14  agulbra  +6 -6
+
+  no reason to call drawContents() in [HV]Line mode
+
+
+src/kernel/qfont.cpp    2.18  warwick  +3 -2
+src/kernel/qfontdta.h    2.8  warwick  +2 -1
+src/kernel/qfontmet.h    2.6  warwick  +9 -3
+src/kernel/qpainter.cpp    2.20  warwick  +564 -2
+src/kernel/qpainter.h    2.16  warwick  +2 -1
+src/kernel/qptr_x11.cpp    2.34  warwick  +2 -546
+
+  QPainter::drawText(...tf...) now takes into account the left and
+  right bearings of the font.  The bounding rectangle of text may now
+  be slightly larger (particularly italic text).  QFontMetrics has
+  the additional functionality allowing this.
+
+
+src/kernel/qaccel.cpp    2.8  agulbra  +70 -2  (1998/02/28)
+
+  added common accelerator keys for later inclusion into docs
+
+
+src/kernel/qfont.cpp    2.21  warwick  +110 -2  (1998/03/01)
+src/kernel/qfontmet.h    2.8  warwick  +7 -1
+src/kernel/qpainter.cpp    2.22  warwick  +43 -26
+src/kernel/qpainter.h    2.17  warwick  +5 -1
+src/widgets/qchkbox.cpp    2.18  warwick  +23 -29
+src/widgets/qpushbt.cpp    2.35  warwick  +5 -5
+src/widgets/qradiobt.cpp    2.24  warwick  +24 -29
+
+  QFontMetrics::size() and QFontMetrics::boundingRect() with all the
+  functionality of QPainter::boundingRect() - code now shared.
+  
+  Use QFontMetrics::size() in button size hints, thus allowing multi-line
+  button labels.  Position checkbox/radiobutton top-left.
+
+
+src/kernel/qpm_x11.cpp    2.30  eiriken  +78 -3  (1998/03/02)
+
+  Fix convertToImage() for pixmaps with other than 8-bit-per-channel.
+
+
+src/kernel/qpixmap.cpp    2.24  hanord  +7 -33
+src/kernel/qpixmap.h    2.16  hanord  +21 -2
+src/kernel/qpm_win.cpp    2.32  hanord  +110 -51
+src/kernel/qpm_x11.cpp    2.31  hanord  +165 -84
+src/kernel/qptd_win.cpp    2.7  hanord  +102 -29
+src/kernel/qptd_x11.cpp    2.10  hanord  +41 -11
+
+  Implemented masked bitBlt for Windows 95.
+  Added QPixmap::setOptimization() which replaces the old optimize function.
+  E.g. setOptimization(QPixmap::BestOptim) to get much faster masked bitBlts.
+  Removed the dirty system, instead delete cached data whenever the pixmap
+  is changed.
+
+
+src/kernel/qprinter.h    2.3  eiriken  +6 -1
+src/kernel/qprn_win.cpp    2.7  eiriken  +17 -7
+src/kernel/qprn_x11.cpp    2.7  eiriken  +10 -5
+src/kernel/qpsprn.cpp    2.9  eiriken  +8 -10
+
+  Take display vs. font resolution into account for printer font metrics.
+
+
+src/kernel/qpshdr.txt    2.3  agulbra  +91 -3
+src/kernel/qpsprn.cpp    2.10  agulbra  +644 -88
+
+  added iso-8859-1 support
+  
+  also added better font support.  try to print palatino, and the printer
+  goes "hm, is palatino installed?  if not, perhaps garamond is installed?
+  if not, is times installed?  if not, well, courier MUST work".
+  
+  finally, if I understand the postscript book correctly I think I made
+  two-font postscript text output a little faster.  the code now attempts
+  to use variables for fonts and call findfont/makefont just once per font
+  change per page.
+  
+  this code is not perfect.  the hacky stuff that does font substitution
+  needs tweaking, and at present the code believes that all the world is
+  iso-8859-1.  will fix that.
+  
+  postscript is fun.
+
+
+src/widgets/qmenudta.cpp    2.10  warwick  +4 -4
+
+  Fix this->changeItem(this->pixmap(), "crashme")
+
+
+src/kernel/qapp_win.cpp    2.74  agulbra  +7 -2  (1998/03/10)
+
+  Set WState_Visible correctly when the window is (de)iconified.
+  
+
+src/kernel/qdrawutl.cpp    2.16  warwick  +5 -3  (1998/03/11)
+src/kernel/qpmcache.cpp    2.3  warwick  +77 -5
+src/kernel/qpmcache.h    2.3  warwick  +3 -1
+src/kernel/qptr_x11.cpp    2.36  warwick  +5 -3
+src/tools/qgcache.cpp    2.5  warwick  +10 -2
+
+  Fix extremely-unlikely-to-be-triggered undeleted cached pixmaps.
+  Provide safer QPixmapCache find() and insert().
+
+
+src/widgets/qbutton.h    2.14  agulbra  +3 -2  (1998/03/12)
+
+  add toggle()
+
+
+src/tools/qregexp.cpp    2.7  agulbra  +23 -18
+
+  implement [] in wildcard mode
+
+
+src/kernel/qobject.cpp    2.44  agulbra  +29 -11
+src/kernel/qobject.h    2.9  agulbra  +5 -1
+src/widgets/qbuttonrow.cpp    1.3  agulbra  +8 -6
+src/widgets/qframe.cpp    2.16  agulbra  +4 -4
+src/widgets/qheader.cpp    2.30  agulbra  +6 -4
+src/widgets/qlcdnum.cpp    2.9  agulbra  +7 -5
+src/widgets/qmainwindow.cpp    2.9  agulbra  +4 -3
+src/widgets/qscrbar.cpp    2.33  agulbra  +14 -14
+src/widgets/qslider.cpp    2.48  agulbra  +4 -4
+src/widgets/qtablevw.cpp    2.42  agulbra  +10 -8
+src/widgets/qtoolbar.cpp    2.10  agulbra  +4 -4
+
+  provide QObject::name( const char * defaultName ).
+  
+  use name( "unnamed" ) in all the debug() calls, to avoid segfaults
+  where printf() won't handle null pointers.
+
+
+src/tools/qstring.cpp    2.18  agulbra  +5 -9
+
+  toDouble() of a null string now sets ok to FALSE
+
+
+src/widgets/qcombo.cpp    2.73  agulbra  +54 -49
+src/widgets/qcombo.h    2.25  agulbra  +3 -1
+
+  tweaked size hint for toolbar use.  provide functions to change the
+  line-edit without changint the combo's contents.
+
+
+src/kernel/qapp_win.cpp    2.78  warwick  +13 -2
+
+  Don't let Windows beep on WM_SYSCHAR events.
+  Beep on unaccepted accelerations.
+
+
+src/kernel/qpainter.cpp    2.29  hanord  +96 -17
+src/kernel/qptr_x11.cpp    2.40  hanord  +2 -70
+
+  Fixed QPainter::drawPixmap() bug (mono bitmaps with self-masks)
+  Moved platform indep. code to qpainter.cpp
+  Put back CtorBegin
+
+
+src/widgets/qbttngrp.cpp    2.9  agulbra  +14 -2
+src/widgets/qbttngrp.h    2.5  agulbra  +3 -1
+
+  added setButton() - very useful when you want to force one member of
+  an exclusive button group to on but not keep around pointers to
+  umpteen radio buttons.
+
+
+src/kernel/qprinter.cpp    2.5  agulbra  +31 -6
+src/kernel/qprinter.h    2.5  agulbra  +6 -2
+
+  added setPageOrder()
+
+
+src/kernel/qobject.cpp    2.45  agulbra  +18 -2
+
+  give better warnings in case of connect() mismatches.
+
+
+src/dialogs/qprndlg.cpp    2.4  agulbra  +258 -112
+src/dialogs/qprndlg.h    2.5  agulbra  +9 -2
+
+  it's finished.  please have a look.  and please do debug.  I don't
+  know about any bugs now, but I'm sure there are some.
+
+
+src/widgets/qcombo.cpp    2.75  agulbra  +15 -6
+
+  magic hack to make combos usable in dialogs.  (QDialog breaks the
+  combo Enter key press.)
+
+
+src/dialogs/qprndlg.cpp    2.3  agulbra  +543 -187
+src/dialogs/qprndlg.h    2.4  agulbra  +24 -10
+src/kernel/qprn_x11.cpp    2.8  agulbra  +4 -2
+
+  new better-looking print dialog and a new static function to configure
+  a QPrinter (replaces QPrinter::setup() - kernel/* should not use
+  dialogs/*).
+  
+  noteworthy points:
+  
+   - the new static function appears to write over something it
+     shouldn't.  I don't see why, but it does seem to cause crashes
+     later on.  the old function works.  I'm committing so I can run
+     purify on solaris.
+   - the dialog lacks accelerators.
+   - I haven't put in solaris /etc/lp/ support yet.  should be fairly
+     easy, but I haven't done it.
+   - the layout will benefit from Warwick's alternative space
+     distribution
+   - the awful message in qprndlg.h is gone gone gone.
+
+
+src/dialogs/qprndlg.cpp    2.5  agulbra  +119 -23  (1998/03/15)
+
+  /etc/lp support
+
+
+src/widgets/qcombo.cpp    2.76  agulbra  +2 -3
+
+  don't ignore key events, just don't accept them.
+
+
+src/kernel/qapp.cpp    2.48  agulbra  +3 -2
+src/kernel/qfont.cpp    2.27  agulbra  +11 -5
+
+  look at $LANG and try to pick an application font that suits $LANG.
+  the application font used is 12-point helvetica.  if the locale isn't
+  in the list I built from XFree86's locale.alias, I assume 8859-1 is
+  okay.
+  
+  copy character set from defFont in the relevant QFont constructor.
+  
+  this code assumes that helvetica includes the appropriate character
+  set.
+
+
+examples/qmag/qmag.cpp    2.13  warwick  +39 -2
+
+  Crazy hard-disk chewing MultiSave option.  Great when you want to make
+  animated GIFs for your web pages.
+
+
+src/dialogs/qprndlg.cpp    2.8  warwick  +4 -4
+src/kernel/qsize.cpp    2.6  warwick  +9 -3
+src/kernel/qsize.h    2.6  warwick  +9 -3
+
+  Add QSize::expandedTo(), and boundedTo().
+
+
+src/kernel/qwidget.cpp    2.92  agulbra  +7 -6
+
+  remove the widget's willingness to accept focus-in events very early
+  in the destructor
+
+
+src/tools/qgdict.cpp    2.11  warwick  +56 -11  (1998/03/17)
+src/tools/qgdict.h    2.3  warwick  +3 -1
+
+  Add QDict::resize(int).
+
+
+src/widgets/qlined.cpp    2.64  agulbra  +46 -9
+src/widgets/qlined.h    2.25  agulbra  +6 -2
+
+  add setSelection() and setCursorPosition()
+
+
+src/widgets/qcombo.cpp    2.77  agulbra  +86 -11
+src/widgets/qcombo.h    2.26  agulbra  +4 -1
+
+  setAutoCompletion() - works really nicely.
+
+
+src/kernel/qiconset.cpp    2.1  agulbra  initial checkin
+src/kernel/qiconset.h    2.1  agulbra  initial checkin
+
+  QIconSet first checking.  QIconSet is neat: You give it one or more
+  icons, and it completes the set so you get large and small disabled,
+  active and normal icons.  QToolButton uses it, QMenuData will soon.
+
+
+src/kernel/qpainter.cpp    2.31  agulbra  +18 -2
+src/kernel/qpainter.h    2.22  agulbra  +2 -1
+
+  added drawImage() by request of eng.  did NOT implement the QPrinter
+  shortcut he asked for.
+
+
+src/kernel/qapp.cpp    2.49  warwick  +10 -6  (1998/03/19)
+
+  Ensure mouserelease goes to widget that got mousepress.
+  Document -ncols better.
+
+
+examples/qdir/GNUmakefile    1.1  warwick  initial checkin
+examples/qdir/Makefile    1.1  warwick  initial checkin
+examples/qdir/qdir.cpp    1.1  warwick  initial checkin
+
+  Tests QFileDialog features.
+
+
+extensions/nsplugin/src/qnp.cpp    1.18  warwick  +4 -1
+
+  Work for multi-visual displays.
+
+
+extensions/opengl/examples/box/.cvsignore    1.2  aavit  +0 -1
+extensions/opengl/examples/box/glbox.cpp    1.4  aavit  +15 -6
+extensions/opengl/examples/box/glbox.h    1.5  aavit  +2 -1
+extensions/opengl/examples/gear/gear.cpp    1.5  aavit  +26 -35
+extensions/opengl/src/qgl.cpp    1.18  aavit  +127 -41
+extensions/opengl/src/qgl.h    1.8  aavit  +80 -77
+
+  New features in OpenGL extension:
+  1) virtual initalizeGL() method in QGLWidget; facilitates easier GL initialization.
+  2) Added support for using shared OpenGL display lists
+  3) Added sharedbox example showing this feature.
+
+
diff --git a/dist/changes-1.39-19980406 b/dist/changes-1.39-19980406
new file mode 100644
index 0000000000..63b3dbbc26
--- /dev/null
+++ b/dist/changes-1.39-19980406
@@ -0,0 +1,286 @@
+src/kernel/qpainter.cpp    2.127  agulbra  +37 -6  (1998/03/30)
+
+  sort of parse $LANG
+
+
+src/kernel/qpainter.cpp    2.35  warwick  +5 -4  (1998/03/30)
+
+  Fix TAB expansion in QPainter::drawText (and hence QMultiLineEdit).
+
+
+src/widgets/qlined.cpp    2.68  agulbra  +3 -3
+
+  didn't repaint cursor properly when moving the cursor leftwards
+
+
+src/kernel/qfnt_x11.cpp    2.34  warwick  +20 -13  (1998/03/31)
+
+  Some fonts don't have per_char information.
+
+
+src/kernel/qrgn_win.cpp    2.6  hanord  +11 -9  (1998/04/01)
+
+  Bug fixes for the new getRects and boundingRect functions
+
+
+src/kernel/qregion.h    2.8  hanord  +4 -1
+src/kernel/qrgn_win.cpp    2.5  hanord  +42 -2
+src/kernel/qrgn_x11.cpp    2.5  hanord  +50 -2
+
+  New QRegion functions:
+    boundingRect() returns the bounding rectangle of the region
+    getRects() returns an array of the rectangles that make up the region
+
+
+src/widgets/qmainwindow.cpp    2.13  agulbra  +46 -3  (1998/04/02)
+src/widgets/qmainwindow.h    2.9  agulbra  +9 -4
+src/widgets/qtoolbar.cpp    2.15  agulbra  +20 -5
+src/widgets/qtoolbar.h    2.7  agulbra  +5 -2
+src/widgets/qtoolbutton.cpp    2.20  agulbra  +25 -17
+
+  button pixmap size change support
+
+
+src/kernel/qiconset.cpp    2.5  agulbra  +18 -4
+src/kernel/qiconset.h    2.3  agulbra  +4 -3
+src/widgets/qpushbt.cpp    2.37  agulbra  +62 -3
+src/widgets/qpushbt.h    2.7  agulbra  +5 -1
+src/widgets/qtoolbutton.cpp    2.19  agulbra  +31 -5
+src/widgets/qtoolbutton.h    2.4  agulbra  +6 -2
+
+  new functionality, menu buttons
+
+
+src/kernel/qgmanagr.cpp    2.30  paul  +18 -2
+src/kernel/qgmanagr.h    2.11  paul  +3 -2
+src/widgets/qhbox.cpp    1.9  paul  +53 -2
+src/widgets/qhbox.h    1.6  paul  +6 -1
+
+  pack() added, addStretch() now work
+
+
+src/kernel/qpainter.cpp    2.37  warwick  +36 -8  (1998/04/03)
+src/kernel/qpainter.h    2.23  warwick  +11 -1
+
+  Add more QPainter::drawImage calls (but still not implement QPrinter stuff)
+
+
+src/widgets/qmainwindow.cpp    2.14  warwick  +4 -4
+src/widgets/qmainwindow.h    2.10  warwick  +2 -2
+
+  Allow WFlags to QMainWindow.
+
+
+src/kernel/qregion.cpp    2.7  warwick  +4 -2
+src/kernel/qrgn_x11.cpp    2.6  warwick  +4 -3
+
+  Disable BOP
+
+
+src/widgets/qscrollview.cpp    2.23  warwick  +7 -5
+src/widgets/qscrollview.h    2.13  warwick  +2 -2
+
+  Emit signal earlier.
+
+
+src/widgets/qscrollview.cpp    2.22  warwick  +34 -16
+src/widgets/qscrollview.h    2.12  warwick  +3 -1
+
+  Low level hook for painting on existing painter.
+  Direct position set function.
+
+
+src/kernel/qimage.cpp    2.80  warwick  +64 -6
+
+  Optimize a very common case.
+
+
+examples/showimg/showimg.cpp    2.21  warwick  +67 -9
+examples/showimg/showimg.h    2.8  warwick  +7 -0
+
+  Use new QImage bitBlt
+
+
+src/dialogs/qprndlg.cpp    2.15  agulbra  +35 -2
+src/dialogs/qprndlg.h    2.8  agulbra  +2 -1
+src/kernel/qprinter.cpp    2.7  agulbra  +53 -8
+src/kernel/qprinter.h    2.6  agulbra  +6 -2
+
+  added QPrinter::ColorMode and corresponding stuff in the printer
+  dialog.
+
+
+src/kernel/qimage.cpp    2.79  warwick  +183 -3
+src/kernel/qimage.h    2.25  warwick  +16 -1
+src/kernel/qpaintd.h    2.6  warwick  +5 -1
+src/kernel/qpainter.cpp    2.36  warwick  +12 -2
+src/kernel/qpixmap.h    2.19  warwick  +3 -1
+
+  bitBlt for QImages
+     - copy image subarea to position in paintdevice or an image
+
+
+src/kernel/qgmanagr.cpp    2.31  paul  +89 -25
+
+  handle empty layouts in a slightly better way
+
+
+src/dialogs/qprndlg.cpp    2.17  agulbra  +14 -5
+
+  move focus intelligently when the users clicks 'print to file' or
+  'print to printer'
+
+
+src/dialogs/qfiledlg.cpp    2.51  agulbra  +64 -4
+src/dialogs/qfiledlg.h    2.13  agulbra  +5 -1
+
+  new function, addWidgets().  very limited extensibility, designed so
+  that it's easier to reimplement it as syntax sugar if/when we put in a
+  proper extension method.
+
+
+src/dialogs/qprndlg.cpp    2.16  agulbra  +7 -12
+
+  no A3
+
+
+src/dialogs/qfiledlg.cpp    2.52  agulbra  +11 -7
+
+  save a little memory, be a little bug-free
+
+
+src/widgets/qcombo.cpp    2.81  agulbra  +24 -19
+
+  use 1-pixel frame around lineedit in motif style.
+
+
+src/widgets/qmainwindow.cpp    2.15  agulbra  +82 -14
+src/widgets/qmainwindow.h    2.11  agulbra  +7 -4
+src/widgets/qtoolbar.cpp    2.16  agulbra  +46 -11
+src/widgets/qtoolbar.h    2.8  agulbra  +8 -2
+src/widgets/qtoolbutton.cpp    2.21  agulbra  +4 -4
+
+  various improvements in look&feel, stretchable space, stretchable widgets
+
+
+src/kernel/qpainter.cpp    2.38  hanord  +72 -64  (1998/04/04)
+src/kernel/qpainter.h    2.24  hanord  +14 -4
+src/kernel/qptr_x11.cpp    2.43  hanord  +115 -2
+
+  Added QPainter::drawTiledPixmap, not for Windows yet
+
+
+src/kernel/qpainter.cpp    2.39  hanord  +6 -2
+src/kernel/qpainter.h    2.25  hanord  +8 -2
+src/kernel/qptr_x11.cpp    2.44  hanord  +5 -6
+
+  Added overloaded drawTiledPixmap( const QRect &r, const QPixmap &pm )
+
+
+src/widgets/qlistview.cpp    2.87  warwick  +5 -5
+src/widgets/qscrollview.cpp    2.25  warwick  +266 -96
+src/widgets/qscrollview.h    2.15  warwick  +19 -5
+
+  Allow arbitrary child objects positioned at int coords in QScrollView.
+
+
+src/widgets/qlistview.cpp    2.86  warwick  +5 -5
+src/widgets/qscrollview.cpp    2.24  warwick  +35 -11
+src/widgets/qscrollview.h    2.14  warwick  +3 -2
+
+  Fix refresh problen in QScrollView.
+
+
+examples/widgets/widgets.cpp    2.39  warwick  +4 -0
+
+  Show bug in recreate
+
+
+examples/scrollview/scrollview.cpp    1.8  warwick  +49 -5
+
+  Test new arbitrary-number-of-children code.
+
+
+src/qt.pro    2.20  warwick  +2 -0
+
+  fix dependencies
+
+
+src/widgets/qstatusbar.cpp    2.4  agulbra  +4 -2
+
+  less flicker
+
+
+src/widgets/qmainwindow.cpp    2.16  agulbra  +10 -18
+src/widgets/qtoolbar.cpp    2.17  agulbra  +6 -5
+
+  move motif style away from what the OSF probably would have done,
+  closer towards what Netscape and Microsoft has done.
+
+
+src/kernel/qptr_x11.cpp    2.45  hanord  +8 -11
+
+  tilepixmap optimized for the common case (no mask)
+
+src/widgets/qmenudta.cpp    2.13  eiriken  +101 -2  (1998/04/05)
+src/widgets/qmenudta.h    2.10  eiriken  +12 -1
+
+  Added new insertItem functions
+
+
+src/widgets/qmlined.cpp    2.89  eiriken  +14 -1
+src/widgets/qmlined.h    2.33  eiriken  +3 -1
+
+  Added setFixedVisibleLines
+
+
+src/widgets/qscrollview.cpp    2.29  warwick  +10 -4
+src/widgets/qscrollview.h    2.17  warwick  +2 -1
+
+  Fix child deletion.
+
+
+src/widgets/qscrollview.cpp    2.32  warwick  +2 -2
+src/widgets/qtoolbutton.cpp    2.22  warwick  +12 -2
+
+  Focus indication in toolbutton.
+
+
+src/kernel/qfocusdata.h    2.1  warwick  initial checkin
+src/kernel/qwidget.cpp    2.97  warwick  +24 -15
+src/kernel/qwidget.h    2.47  warwick  +4 -2
+src/widgets/qscrollview.cpp    2.31  warwick  +59 -7
+src/widgets/qscrollview.h    2.18  warwick  +3 -1
+
+  Focus traversal among QScrollView children.
+
+
+examples/scrollview/scrollview.cpp    1.9  warwick  +19 -20
+src/widgets/qlistview.cpp    2.88  warwick  +18 -18
+src/widgets/qscrollview.cpp    2.27  warwick  +38 -61
+src/widgets/qscrollview.h    2.16  warwick  +2 -1
+
+  Negate position sense.
+
+
+src/dialogs/qprndlg.cpp    2.18  hanord  +4 -3
+src/kernel/qprn_x11.cpp    2.9  hanord  +4 -4
+
+  QPrinter::setup() uses the QPrintDialog::getPrinterSetup() function
+
+
+src/kernel/qptr_win.cpp    2.31  hanord  +108 -2
+
+  Tiled pixmap implemented, but no optimization yet
+
+src/widgets/qlined.cpp    2.69  agulbra  +21 -3
+
+  handle double-click correctly
+  handle c-k
+
+src/widgets/qlistview.cpp    2.90  eiriken  +17 -2  (1998/04/06)
+src/widgets/qlistview.h    2.42  eiriken  +2 -1
+src/widgets/qstatusbar.cpp    2.5  eiriken  +8 -7
+
+  Added rightButtonPressed signal and removed the resizer
+
diff --git a/dist/changes-1.39-19980414 b/dist/changes-1.39-19980414
new file mode 100644
index 0000000000..11e9b37d13
--- /dev/null
+++ b/dist/changes-1.39-19980414
@@ -0,0 +1,173 @@
+examples/qdir/qdir.cpp    1.2  warwick  +4 -3  (1998/04/06)
+
+  better captions
+
+
+src/widgets/qscrollview.cpp    2.34  warwick  +11 -1
+
+  clean up in destructor code.
+
+
+src/widgets/qlined.cpp    2.70  agulbra  +6 -4
+
+  don't start drags just now
+
+
+examples/scrollview/scrollview.cpp    1.10  warwick  +2 -2
+
+  make it Big
+
+
+src/kernel/qapp_x11.cpp    2.127  agulbra  +37 -6
+src/kernel/qfont.h    2.9  agulbra  +3 -2
+
+  sort of parse $LANG
+
+
+examples/application/main.cpp    1.2  warwick  +3 -2
+
+  use setMainWidget
+
+
+extensions/opengl/src/qgl.pro    1.8  warwick  +1 -1  (1998/04/08)
+
+  Building libqgl doesn't need -lqgl
+
+
+src/dialogs/qfiledlg.cpp    2.54  agulbra  +74 -21
+src/dialogs/qfiledlg.h    2.14  agulbra  +5 -3
+
+  allow setting of initial file name when using statics.  
+
+src/dialogs/qfiledlg.cpp    2.55  agulbra  +11 -11
+
+  allow setting thename of a nonexistent file as initial default in
+  getSaveFileName()
+
+
+src/kernel/qpsprn.cpp    2.13  agulbra  +4 -4
+
+  avoid at-least-a-warning-at-most-an-UMR.
+
+
+src/moc/moc.pro    1.9  warwick  +1 -1
+
+  include qt include
+
+
+extensions/opengl/src/qgl.pro    1.9  warwick  +1 -1
+
+  more -lqgl
+
+
+src/tools/qglobal.h    2.48  agulbra  +4 -1
+
+  openbsd
+
+
+src/widgets/qsplitter.h    1.7  agulbra  +3 -3
+
+  remove semicolon after Q_OBJECT
+
+
+src/dialogs/qfiledlg.cpp    2.53  agulbra  +15 -3
+
+  say "Readable, writable" and so on instead of ASHR (shades of MS-DOS)
+
+
+src/widgets/qlcdnum.cpp    2.11  agulbra  +17 -2
+src/widgets/qlcdnum.h    2.7  agulbra  +3 -1
+
+  sizeHint().  decent minimum size using the golden mean.
+
+
+src/moc/GNUmakefile    2.4  warwick  +11 -3
+src/moc/moc.pro    1.8  warwick  +1 -1
+src/moc/moc.t    1.11  warwick  +1 -1
+src/moc/moc.t    1.10  warwick  +1 -1
+
+  yacc flags
+
+
+src/kernel/qpainter.cpp    2.40  warwick  +4 -4  (1998/04/09)
+src/widgets/qmlined.cpp    2.90  warwick  +4 -2
+src/widgets/qscrollview.cpp    2.35  warwick  +39 -33
+
+  Fixed cursor position in QMultiLineEdit.
+  Fixed focus navigation in QScrollView.
+
+
+src/widgets/qscrollview.cpp    2.36  agulbra  +8 -3
+
+  be a little more careful about event processing - removeChild() was
+  called from QScrollViewData destructor and didn't like that.
+
+
+src/kernel/qprn_x11.cpp    2.10  agulbra  +62 -77
+src/kernel/qpsprn.cpp    2.14  agulbra  +1525 -157
+src/kernel/qpsprn.h    2.5  agulbra  +17 -9
+
+  added support for character encodings other than iso 8859-1.  the
+  header is computed dynamically; the fonts and encodings used on the
+  first few pages are put in the header, any other fonts and encodings
+  are added to the output stream as necessary.  removed the need for a
+  temporary file.  rewrote the font name cache so two QPSPrinter objects
+  printing at the same time won't conflict.  put back in the header size
+  compression.
+
+
+src/widgets/qcombo.cpp    2.82  warwick  +3 -3  (1998/04/13)
+
+  Correct sizeHint.
+
+
+src/widgets/qscrollview.cpp    2.37  warwick  +22 -18
+src/widgets/qscrollview.h    2.19  warwick  +1 -2
+
+  Improve focus tabbing.
+
+
+src/kernel/qwidget.cpp    2.98  warwick  +60 -16
+src/kernel/qwidget.h    2.48  warwick  +3 -1
+
+  Inherit *parents* palette, not application palette *** CHANGED BEHAVIOUR ***
+  Generalize isEnabledToTLW and isVisibleToTLW
+
+
+src/widgets/qtablevw.cpp    2.44  warwick  +8 -28
+
+  Propagate palette changes to scrollbars.
+  Combine common code.
+
+
+src/widgets/qlistview.cpp    2.91  warwick  +24 -6
+src/widgets/qlistview.h    2.43  warwick  +5 -3
+
+  Provide parent() of list view item.
+
+
+src/widgets/qlistbox.cpp    2.61  warwick  +45 -3
+src/widgets/qlistbox.h    2.15  warwick  +6 -2
+
+  Update maxItemWidth on font change.
+  Add sizeHint()
+
+src/kernel/qregion.cpp    2.8  hanord  +84 -51  (1998/04/14)
+src/kernel/qregion.h    2.9  hanord  +12 -3
+src/kernel/qrgn_win.cpp    2.11  hanord  +39 -25
+src/kernel/qrgn_x11.cpp    2.11  hanord  +48 -29
+
+  Removed the internal (and slow) byte array.
+  Uses the region rectangles for saving complex regions.
+
+
+src/widgets/qchkbox.cpp    2.20  warwick  +5 -4
+src/widgets/qradiobt.cpp    2.25  warwick  +9 -4
+
+  Small sizeHint when no text or pixmap.
+
+
+src/kernel/qptr_win.cpp    2.32  agulbra  +5 -2
+src/kernel/qptr_x11.cpp    2.46  agulbra  +5 -2
+
+  clip properly in drawPixmap().
diff --git a/dist/changes-1.39-19980506 b/dist/changes-1.39-19980506
new file mode 100644
index 0000000000..35d9ed0072
--- /dev/null
+++ b/dist/changes-1.39-19980506
@@ -0,0 +1,555 @@
+doc/classes.doc    1.5  warwick  +3 -3
+
+  4 columns, not 3.
+
+
+doc/headers.doc    1.5  warwick  +4 -2
+
+  Multicolumns.
+
+
+doc/moc.doc    2.11  eiriken  +11 -4
+
+  Corrected nested classes bug
+
+
+examples/application/application.cpp    1.4  agulbra  +2 -3
+
+  updated for new qtoolbar api
+
+
+examples/scrollview/scrollview.cpp    1.11  warwick  +25 -9
+
+  Use older style.
+
+
+extensions/opengl/examples/sharedbox/GNUmakefile    1.1  hanord  initial checkin
+extensions/opengl/examples/sharedbox/Makefile    1.2  hanord  +6 -90
+
+  new makefiles
+
+
+extensions/opengl/examples/sharedbox/sharedbox.pro    1.2  hanord  +1 -1
+
+  Added "opengl" to CONFIG
+
+
+src/dialogs/qfiledlg.cpp    2.56  paul  +3 -3
+
+  make it compile on windows
+
+
+src/dialogs/qfiledlg.cpp    2.57  warwick  +6 -5
+
+  Implement "initial selection" for Win-specific calls.
+
+
+src/dialogs/qfiledlg.cpp    2.58  agulbra  +21 -2
+
+  insert the root drives in the paths combo
+
+
+src/dialogs/qfiledlg.cpp    2.59  agulbra  +11 -11
+
+  alight size stuff correctly
+  list all drives under windows
+  
+  there's an aborted attempt at handling double-click in multi-column
+  view in there, too.  I'll think about it and complete it asap.
+
+
+src/dialogs/qfiledlg.cpp    2.60  agulbra  +21 -8
+
+  draw the icons again.
+
+
+src/dialogs/qfiledlg.cpp    2.61  agulbra  +23 -6
+
+  output date and time in a better format.  handle column width better.
+
+
+src/dialogs/qfiledlg.cpp    2.62  agulbra  +190 -23
+src/dialogs/qfiledlg.h    2.15  agulbra  +20 -1
+
+  more polish.  in this round:
+   - correct handling of double-click and arrow keys in the multi-column
+     list (partly done using an evil hack, see mouseDoubleClickEvent())
+   - the ability to install file type icons (the default draws a
+     directory icon, nothing else)
+   - correct enter handling in the paths and types combo boxes
+   - correct tab order
+
+
+src/dialogs/qfiledlg.cpp    2.63  agulbra  +21 -26
+
+  setEnabled( cd up button )
+  tweak accessibility texts
+
+
+src/dialogs/qfiledlg.cpp    2.64  hanord  +3 -3
+
+  Adds cast to avoid compiling problem for MSVC++
+
+
+src/dialogs/qfiledlg.cpp    2.65  agulbra  +29 -7
+
+  experimental filename completion.  hacky and a little buggy in certain
+  odd and harmless cases.
+
+
+src/dialogs/qfiledlg.h    2.16  agulbra  +4 -5
+
+  remove unnecessary friend declaration
+
+
+src/dialogs/qprndlg.cpp    2.19  agulbra  +3 -3
+
+  work around broken gcc warning
+
+
+src/kernel/qapp_win.cpp    2.84  warwick  +5 -2
+
+  Work-around focus problem with recreate.
+
+
+src/kernel/qapp_win.cpp    2.85  warwick  +5 -4
+
+  Robustness.
+
+
+src/kernel/qapp_x11.cpp    2.128  warwick  +9 -9
+src/kernel/qclb_x11.cpp    2.9  warwick  +4 -4
+src/kernel/qcol_x11.cpp    2.26  warwick  +13 -12
+src/kernel/qimage.cpp    2.83  warwick  +11 -10
+src/kernel/qnpsupport.cpp    2.7  warwick  +3 -3
+src/kernel/qpm_x11.cpp    2.33  warwick  +12 -12
+src/kernel/qpsprn.cpp    2.16  warwick  +3 -3
+src/kernel/qrgn_x11.cpp    2.12  warwick  +3 -3
+src/kernel/qt_xdnd.cpp    2.7  warwick  +5 -5
+src/kernel/qwid_x11.cpp    2.89  warwick  +21 -19
+src/tools/qdatetm.cpp    2.12  warwick  +4 -4
+
+  Avoid warnings.
+
+
+src/kernel/qapp_x11.cpp    2.130  warwick  +3 -3
+
+  strcasecmp -> qstricmp
+
+
+src/kernel/qapp_x11.cpp    2.131  agulbra  +14 -3
+src/kernel/qclipbrd.cpp    2.7  agulbra  +2 -6
+src/kernel/qdnd_win.cpp    2.3  agulbra  +23 -1
+src/kernel/qdnd_x11.cpp    2.3  agulbra  +84 -8
+src/kernel/qdragobject.cpp    2.11  agulbra  +24 -23
+src/kernel/qdragobject.h    2.7  agulbra  +6 -3
+
+  some more stuff works
+
+
+src/kernel/qapp_x11.cpp    2.132  eiriken  +4 -3
+src/kernel/qcol_x11.cpp    2.27  eiriken  +6 -4
+src/kernel/qimage.cpp    2.84  eiriken  +11 -7
+src/kernel/qmetaobj.cpp    2.7  eiriken  +6 -4
+src/kernel/qmovie.cpp    1.31  eiriken  +8 -5
+src/kernel/qpm_x11.cpp    2.34  eiriken  +6 -4
+src/kernel/qwid_win.cpp    2.52  eiriken  +4 -4
+src/kernel/qwid_x11.cpp    2.91  eiriken  +4 -4
+src/kernel/qwidget.cpp    2.101  eiriken  +6 -4
+
+  Check for delete[] 0 to avoid purify warnings.
+
+
+src/kernel/qclb_x11.cpp    2.8  hanord  +5 -2
+
+  Debugging code commented out
+
+
+src/kernel/qclipbrd.h    2.4  agulbra  +2 -1
+src/kernel/qfocusdata.h    2.2  agulbra  +2 -2
+src/widgets/qlistview.h    2.45  agulbra  +3 -3
+src/widgets/qsplitter.h    1.8  agulbra  +2 -2
+
+  "friend class", not "friend"
+
+
+src/kernel/qdnd_win.cpp    2.2  agulbra  +2 -2
+src/kernel/qdnd_x11.cpp    2.2  agulbra  +3 -3
+src/kernel/qevent.h    2.13  agulbra  +2 -2
+
+  return a proper object for the drag data, not a reference to a
+  probably-deleted object.
+
+
+src/kernel/qdnd_x11.cpp    2.4  agulbra  +24 -18
+src/kernel/qdragobject.h    2.8  agulbra  +1 -2
+
+  another little bit.
+
+
+src/kernel/qdnd_x11.cpp    2.5  agulbra  +6 -24
+
+  drop some of the debugging messages
+
+
+src/kernel/qevent.cpp    2.13  aavit  +9 -6
+
+  Doc.
+
+
+src/kernel/qfnt_win.cpp    2.26  warwick  +4 -4
+
+  Typo.  Will fix (unreported) strange problems with some fonts on Windows.
+
+
+src/kernel/qgmanagr.cpp    2.32  warwick  +26 -22
+
+  Flatten.
+
+
+src/kernel/qimage.cpp    2.82  warwick  +6 -3
+src/widgets/qlistbox.cpp    2.62  warwick  +14 -2
+src/widgets/qlistview.cpp    2.98  warwick  +4 -4
+src/widgets/qscrollview.cpp    2.41  warwick  +5 -5
+
+  docs
+
+
+src/kernel/qpaintdc.h    2.5  eiriken  +4 -2
+src/kernel/qpainter.cpp    2.44  eiriken  +38 -11
+src/kernel/qprn_win.cpp    2.8  eiriken  +31 -13
+src/kernel/qpsprn.cpp    2.18  eiriken  +46 -30
+src/kernel/qpsprn.h    2.6  eiriken  +4 -1
+src/kernel/qptr_win.cpp    2.34  eiriken  +4 -2
+src/kernel/qregion.h    2.10  eiriken  +2 -1
+
+  drawImage support in QPrinter
+
+
+src/kernel/qpainter.cpp    2.41  warwick  +17 -2
+
+  Fix OpaqueMode in drawText(...QRect...).
+
+
+src/kernel/qpainter.cpp    2.42  warwick  +5 -9
+
+  fix.
+
+
+src/kernel/qpainter.cpp    2.43  warwick  +2 -12
+
+  Revert drawText semantics changed.
+
+
+src/kernel/qpainter.cpp    2.45  hanord  +6 -2
+src/kernel/qprn_win.cpp    2.9  hanord  +5 -4
+
+  Fixed Windows-specific typos, now compiles
+
+
+src/kernel/qprn_x11.cpp    2.11  agulbra  +14 -6
+
+  avoid getdtablesize(), and set FD_CLOEXEC on just the X connection
+  instead of on all open files.
+
+
+src/kernel/qpsprn.cpp    2.15  agulbra  +6 -6
+
+  mention the defining rfc for koi8-r
+
+
+src/kernel/qpsprn.cpp    2.17  warwick  +438 -428
+
+  Avoid a HUGE C string, save some memory.
+
+
+src/kernel/qptd_x11.cpp    2.12  warwick  +4 -4
+
+  Restore speed of normal-optimized pixmaps to Qt 1.3x height.
+
+
+src/kernel/qptd_x11.cpp    2.13  hanord  +7 -9
+
+  Warwick's change ACK'd
+
+
+src/kernel/qptr_win.cpp    2.32  agulbra  +5 -2
+src/kernel/qptr_x11.cpp    2.46  agulbra  +5 -2
+
+  clip properly in drawPixmap().
+
+
+src/kernel/qptr_x11.cpp    2.47  eiriken  +21 -17
+
+  Fixed infinite loop bug in internal function drawTile and
+  renamed variables to make the code readable.
+
+
+src/kernel/qregion.cpp    2.8  hanord  +84 -51
+src/kernel/qregion.h    2.9  hanord  +12 -3
+src/kernel/qrgn_win.cpp    2.11  hanord  +39 -25
+src/kernel/qrgn_x11.cpp    2.11  hanord  +48 -29
+
+  Removed the internal (and slow) byte array.
+  Uses the region rectangles for saving complex regions.
+
+
+src/kernel/qregion.cpp    2.9  warwick  +14 -2
+
+  Implement missing function.
+
+
+src/kernel/qsignalmapper.cpp    1.2  warwick  +2 -2
+src/kernel/qsignalmapper.h    1.2  warwick  +2 -2
+
+  fix function name
+
+
+src/kernel/qsignalmapper.cpp    1.3  warwick  +2 -2
+src/widgets/qtablevw.cpp    2.45  warwick  +3 -3
+
+  oops
+
+
+src/kernel/qwid_win.cpp    2.51  agulbra  +7 -2
+
+  if recreating a widget with no children that accept focus, and which
+  does not accept focus itself, to be a top-level widget, set up a focus
+  chain.  hopefully this will fix a focus bug on windows.
+
+
+src/kernel/qwidget.cpp    2.100  agulbra  +4 -4
+src/kernel/qwidget.cpp    2.99  agulbra  +9 -7
+
+  try a little harder to make QWidget::focusWidget() return something.
+  this should make focus in top-level widgets created by recreate()
+  behave like in top-level widgets created by new.
+
+
+src/moc/moc.1    2.6  eiriken  +20 -5
+
+  Corrected nested classes bug.
+
+
+src/moc/moc.y    2.21  eiriken  +3 -5
+
+  Removed warning "unexpected ':'" in nested classes.
+
+
+src/qt.pro    2.21  warwick  +2 -1
+
+  Dependencies under Windows.
+
+
+src/qt.pro    2.23  warwick  +2 -0
+src/kernel/qsignalmapper.cpp    1.1  warwick  initial checkin
+src/kernel/qsignalmapper.h    1.1  warwick  initial checkin
+
+  QSignalMapper - like a button group superclass.
+
+
+src/tools/qdir.cpp    2.19  agulbra  +36 -4
+src/tools/qdir.h    2.7  agulbra  +3 -1
+
+  added new QDir::drives()
+  
+  this breaks windows horribly, because I simply couldn't remember the
+  function call to use there.  haavard, add a few lines of code in the
+  morning, will you?
+
+
+src/tools/qdir.cpp    2.20  agulbra  +18 -10
+
+  implement drives() for windows.  now to test.
+
+
+src/tools/qfile.cpp    2.20  warwick  +10 -10
+
+  Casts from off_t to int.
+
+
+src/tools/qglobal.h    2.49  warwick  +4 -1
+
+  GNU Hurd
+
+
+src/tools/qglobal.h    2.50  warwick  +4 -1
+
+  DG Unix
+
+
+src/tools/qtstream.cpp    2.12  warwick  +14 -4
+src/widgets/qscrollview.cpp    2.42  warwick  +7 -1
+
+  doc
+
+
+src/widgets/qchkbox.cpp    2.20  warwick  +5 -4
+src/widgets/qradiobt.cpp    2.25  warwick  +9 -4
+
+  Small sizeHint when no text or pixmap.
+
+
+src/widgets/qcombo.cpp    2.83  agulbra  +10 -2
+
+  make sure highlighted() is emitted whenever current changes, as per
+  val gough's bug report.
+
+
+src/widgets/qframe.cpp    2.17  agulbra  +13 -2
+
+  added a hack to make kscd binaries keep working.  put in a nice
+  #if QT_VERSION >= 200 so the hack won't stay too long.
+
+
+src/widgets/qlabel.cpp    2.28  warwick  +6 -3
+
+  Flicker-free when no background.
+
+
+src/widgets/qlined.cpp    2.71  warwick  +3 -3
+
+  Efficiency.
+
+
+src/widgets/qlined.cpp    2.73  agulbra  +2 -10
+
+  disable some buggy code
+
+
+src/widgets/qlined.h    2.26  agulbra  +5 -4
+
+  make validateAndSet() public.  It's not a trvial function, but it
+  appears that event filters can reasonably want to use it.
+
+
+src/widgets/qlistview.cpp    2.100  agulbra  +30 -28
+
+  slightly better pixmap support
+
+
+src/widgets/qlistview.cpp    2.101  agulbra  +27 -9
+
+  added an evil hack to make sizeHint() return more realistic values
+  before the automagic column resizing magic has done its job.
+
+
+src/widgets/qlistview.cpp    2.102  agulbra  +3 -3
+
+  the list view is now the viewport's focus proxy, rather than the other
+  way around.
+
+
+src/widgets/qlistview.cpp    2.103  agulbra  +6 -7
+
+  fixed some logical/actual confusion.
+
+
+src/widgets/qlistview.cpp    2.92  agulbra  +22 -13
+
+  hamdle quick drags correctly, as per dimitri van heesch's bug report.
+
+
+src/widgets/qlistview.cpp    2.93  warwick  +3 -3
+src/widgets/qlistview.h    2.46  warwick  +2 -2
+
+  paintBranches is non-const
+
+
+src/widgets/qlistview.cpp    2.94  warwick  +6 -7
+
+  Remove unnecessary initial repaints.
+
+
+src/widgets/qlistview.cpp    2.95  agulbra  +16 -12
+
+  try to draw a little more efficiently by using OpaqueMode, and by
+  never inserting list view items into the repaint dict twice.  exposes
+  a QPainter::drawText() bug.
+
+
+src/widgets/qlistview.cpp    2.96  agulbra  +178 -53
+src/widgets/qlistview.h    2.47  agulbra  +13 -5
+
+  added column alignment (worked first try) and real pixmap support
+  (untested - I try not to push my luck)
+
+
+src/widgets/qlistview.cpp    2.97  agulbra  +13 -11
+
+  draw focus rectangle in the correct place
+
+
+src/widgets/qlistview.cpp    2.99  warwick  +9 -12
+
+  Revert change that required drawText semantics changed.
+
+
+src/widgets/qlistview.h    2.44  agulbra  +2 -1
+
+  avoid hiding text(int) with text() in qchecklistitem
+
+
+src/widgets/qmainwindow.cpp    2.17  agulbra  +35 -34
+src/widgets/qmainwindow.h    2.12  agulbra  +4 -3
+
+  handle children being deleted
+
+
+src/widgets/qmenubar.cpp    2.48  warwick  +9 -3
+src/widgets/qpopmenu.cpp    2.67  warwick  +4 -2
+
+  Accept keys so they don't propagate.
+
+
+src/widgets/qmenubar.cpp    2.49  warwick  +2 -5
+src/widgets/qpopmenu.cpp    2.68  warwick  +2 -4
+
+  undo accept()
+
+
+src/widgets/qmenubar.cpp    2.50  agulbra  +3 -4
+
+  remove unused variable
+
+
+src/widgets/qpopmenu.cpp    2.70  agulbra  +13 -16
+src/widgets/qpopmenu.cpp    2.69  agulbra  +10 -3
+
+  minor tweak of right/left submenu position algorithm
+
+
+src/widgets/qpopmenu.cpp    2.71  warwick  +5 -2
+
+  Add a reminder.
+
+
+src/widgets/qscrollview.cpp    2.39  warwick  +86 -67
+
+  Docs.
+  Remove over-optimization.
+
+
+src/widgets/qscrollview.cpp    2.40  warwick  +3 -3
+
+  Simplify.
+
+
+src/widgets/qscrollview.cpp    2.43  warwick  +45 -12
+
+  Propagate mouse events.
+
+
+src/widgets/qscrollview.h    2.20  warwick  +6 -1
+
+  Propagate mouse evetns.
+
+
+src/widgets/qtoolbutton.cpp    2.23  warwick  +4 -3
+
+  Make receiver/slot optional.
+
+
+src/widgets/qvalidator.cpp    2.18  agulbra  +19 -6
+
+  validate number of decimals.  amy watson.
diff --git a/dist/changes-1.39-19980529 b/dist/changes-1.39-19980529
new file mode 100644
index 0000000000..6c40f61a35
--- /dev/null
+++ b/dist/changes-1.39-19980529
@@ -0,0 +1,232 @@
+
+src/dialogs/qfiledlg.cpp    2.67  aavit  +24 -1
+
+  Fixed non-modality bug in GetOpen/SaveFileName on Windows.
+
+
+src/dialogs/qprndlg.cpp    2.21  agulbra  +14 -11
+
+  avoid double-delete of invisible QButtonGroup objects
+
+
+src/dialogs/qprndlg.cpp    2.22  eiriken  +4 -3
+src/tools/qregexp.cpp    2.9  eiriken  +4 -3
+src/widgets/qheader.cpp    2.36  eiriken  +5 -3
+src/widgets/qmenubar.cpp    2.51  eiriken  +6 -4
+src/widgets/qwhatsthis.cpp    2.12  eiriken  +3 -3
+
+  More tests before delete [] to avoid purify warnings.
+
+
+src/kernel/qapp_win.cpp    2.86  agulbra  +10 -19
+src/kernel/qapp_x11.cpp    2.134  agulbra  +35 -44
+
+  move the pending-events iterator to the next event before dispatching
+  the current one.  prevents recursion if enter_loop() is called within
+  the event handler.
+
+
+src/kernel/qapp_x11.cpp    2.133  warwick  +12 -4
+src/kernel/qevent.h    2.16  warwick  +27 -1
+src/kernel/qwidget.cpp    2.103  warwick  +9 -2
+
+  Provide Event_Hide and Event_Show.
+
+
+src/kernel/qasyncimageio.cpp    1.31  warwick  +32 -16
+src/kernel/qasyncimageio.h    1.16  warwick  +7 -1
+src/kernel/qasyncio.cpp    1.8  warwick  +3 -2
+src/kernel/qimage.cpp    2.88  warwick  +11 -2
+src/kernel/qpainter.cpp    2.47  warwick  +10 -4
+
+  QAsyncImageIO classes are now public.
+
+
+src/kernel/qdragobject.cpp    2.12  agulbra  +10 -4
+
+  stop the drag when appropriate
+
+
+src/kernel/qevent.cpp    2.14  agulbra  +24 -2
+src/kernel/qevent.h    2.15  agulbra  +2 -1
+
+  added new convenience function provides( const char * mimeType )
+
+
+src/kernel/qevent.h    2.14  agulbra  +2 -2
+
+  return a real QByteArray
+
+
+src/kernel/qpainter.cpp    2.48  warwick  +4 -4
+
+  Fix bitBlt with negative width/height.
+
+
+src/kernel/qpicture.cpp    2.4  eiriken  +13 -2
+
+  Added support for drawImage()
+
+ 
+src/kernel/qprn_x11.cpp    2.12  agulbra  +18 -10
+
+   close open files before exec'ing lpr.
+
+
+src/kernel/qpsprn.cpp    2.20  eiriken  +100 -24
+src/kernel/qpsprn.h    2.7  eiriken  +3 -2
+src/kernel/qptr_x11.cpp    2.48  eiriken  +4 -3
+src/kernel/qrgn_x11.cpp    2.13  eiriken  +3 -3
+
+  QPrinter now supports clipping of any arbitrary region.
+  The catch is that resolution is 72 dpi.
+  
+  Fixed bug in save()/restore() over page boundaries
+
+
+src/kernel/qpsprn.cpp    2.23  agulbra  +6 -3
+
+  setPen() immediately before drawPoly(most things) did not work.  now
+  it does.
+
+
+src/kernel/qptr_x11.cpp    2.49  warwick  +13 -2
+
+  Probably fix aix-g++ internal compiler error.
+
+
+src/kernel/qregion.cpp    2.10  eiriken  +7 -5
+src/kernel/qregion.h    2.11  eiriken  +2 -3
+
+  Rename  getRects() to rects()
+
+
+src/kernel/qregion.cpp    2.12  hanord  +18 -56
+
+  New region serializing code, writes only raw rectangles.
+  In Qt pre 2.0, we write a sort of recursive structure for backward
+  compatibility. It's large and inefficient. In Qt 2.0, we start using
+  a much slimmer structure and the reading code for this has already
+  been added for Qt 1.40.  I.e. Qt 1.3x programs won't be able to read
+  regions serialized with Qt 2.x.
+
+
+src/kernel/qregion.h    2.12  hanord  +2 -7
+src/kernel/qrgn_win.cpp    2.13  hanord  +12 -44
+src/kernel/qrgn_x11.cpp    2.15  hanord  +15 -50
+
+  Simplified the implementation, now it works with rects only,
+
+
+src/kernel/qwid_win.cpp    2.53  agulbra  +4 -3
+src/kernel/qwid_x11.cpp    2.92  agulbra  +4 -3
+
+  update() with w == 0 || h == 0 is a no-op, so exit quickly
+
+
+src/kernel/qwid_win.cpp    2.54  agulbra  +6 -2
+src/kernel/qwid_x11.cpp    2.93  agulbra  +8 -2
+src/kernel/qwidget.cpp    2.104  agulbra  +3 -10
+src/widgets/qmainwindow.cpp    2.20  agulbra  +16 -6
+
+  make isVisible() return TRUE during showEvent(), to match
+  e.g. resizeEvent().  make QMainWindow fix its geometry when toolbars
+  are hidden and shown.
+
+
+src/kernel/qwidget.h    2.49  agulbra  +2 -6
+
+  removed autoMinimumSize
+
+
+src/widgets/qbttngrp.cpp    2.10  agulbra  +3 -3
+
+  don't delete buttons in the list
+
+
+src/widgets/qbuttonrow.cpp    1.6  paul  +1 -1
+src/widgets/qbuttonrow.h    1.4  paul  +1 -1
+src/widgets/qgrid.cpp    1.9  paul  +1 -1
+src/widgets/qgrid.h    1.7  paul  +1 -1
+src/widgets/qhbox.cpp    1.10  paul  +1 -1
+src/widgets/qhbox.h    1.7  paul  +1 -1
+src/widgets/qlabelled.cpp    1.5  paul  +1 -1
+src/widgets/qlabelled.h    1.4  paul  +1 -1
+src/widgets/qvbox.cpp    1.5  paul  +1 -1
+src/widgets/qvbox.h    1.5  paul  +1 -1
+
+  removing the layout widgets from the library, moved to examples/layouts
+
+
+src/widgets/qheader.cpp    2.38  paul  +121 -62
+src/widgets/qheader.h    2.18  paul  +6 -11
+
+  Implemented setClickEnabled, setResizeEnabled and setMovingEnabled
+
+
+src/widgets/qlined.cpp    2.74  aavit  +8 -5
+src/widgets/qspinbox.cpp    2.30  aavit  +52 -19
+src/widgets/qspinbox.h    2.17  aavit  +3 -1
+
+  lineedit: better sizehint()
+  spinbox: added valuechanged( const char* ) signal
+
+
+src/widgets/qlined.cpp    2.75  agulbra  +11 -6
+
+  start drags when appropriate
+  fold multi-line paste to one line instead of truncating to the \n
+
+
+src/widgets/qlistview.cpp    2.109  agulbra  +17 -12
+src/widgets/qlistview.h    2.48  agulbra  +4 -4
+
+  addColumn() return the column number
+
+
+src/widgets/qmainwindow.cpp    2.18  warwick  +18 -2
+src/widgets/qmainwindow.h    2.13  warwick  +2 -1
+
+  Show/Hide event filters
+
+
+src/widgets/qmainwindow.cpp    2.19  agulbra  +19 -17
+src/widgets/qmainwindow.h    2.14  agulbra  +11 -11
+
+  make set* private as they're not really meaningful any more.
+
+src/widgets/qmainwindow.cpp    2.22  agulbra  +17 -1
+
+  be slightly more clever about autodetecting menu and status bar.
+
+
+src/widgets/qscrollview.cpp    2.45  warwick  +8 -4
+
+  Only enable WPaintClever in viewport if specifically requested.
+
+
+src/widgets/qstatusbar.cpp    2.8  agulbra  +9 -4
+
+  make sure the status bar is tall enough for text, even when there's
+  nothing in it.
+
+
+src/widgets/qtablevw.cpp    2.46  agulbra  +4 -4
+
+  last{Row,Col}Visible() could return >= num{Row,Col}s.  no more.
+
+
+src/kernel/qapp_x11.cpp    2.137  eiriken  +5 -2
+
+  Fixed bug when there are no events in the X queue and there are posted
+  events. The posted events will now be handled.
+
+
+src/kernel/qwidget.cpp    2.106  eiriken  +5 -2
+
+  Fixed bug in destruction of main widget. The application now
+  actually quits.
+
+src/kernel/qapp.cpp    2.55  hanord  +8 -4
+
+  The QApplication contructor now accepts argc=0 and argv=0.
diff --git a/dist/changes-1.39-19980611 b/dist/changes-1.39-19980611
new file mode 100644
index 0000000000..d99b6363cd
--- /dev/null
+++ b/dist/changes-1.39-19980611
@@ -0,0 +1,194 @@
+doc/binary.doc    1.2  warwick  +23 -26
+
+  Include margins into header graphic
+
+
+doc/examples.doc    2.15  agulbra  +19 -2
+examples/dirview/dirview.cpp    1.8  agulbra  +2 -2
+src/widgets/qlistview.cpp    2.112  agulbra  +163 -28
+src/widgets/qlistview.h    2.49  agulbra  +4 -4
+
+  rename children() to childCount()
+  add two images to the docs
+  update dirview and add it to the docs
+
+
+src/dialogs/qfiledlg.cpp    2.68  hanord  +8 -12
+
+  Rewrote setFilter to use QString and mid() - simpler code.
+  Borland C++ complained about modifying const char *.
+
+
+src/dialogs/qfiledlg.cpp    2.69  agulbra  +9 -7
+src/dialogs/qmsgbox.cpp    2.48  agulbra  +3 -1
+src/dialogs/qprndlg.cpp    2.26  agulbra  +213 -2
+src/widgets/qwidgetstack.cpp    2.6  agulbra  +8 -3
+
+  Call setPalettePropagation() and setFontPropagation() in the
+  initialization.  Note that QWidgetStack now defaults to use
+  AllChildren.
+
+
+src/dialogs/qmsgbox.cpp    2.47  hanord  +3 -3
+
+  icon widget gets widget name "icon" (previously none)
+  buttons get widget names button1, button2 (previously space before number)
+
+
+src/dialogs/qprndlg.cpp    2.24  agulbra  +163 -7
+
+  parse /etc/lp/member and /etc/printers.conf.  we still probably don't
+  detect the printers on irix and digital unix (except through sheer
+  good luck - I suppose there is a chance that digital or sgi might
+  choose to be compatible with something).
+
+
+src/dialogs/qprndlg.cpp    2.25  agulbra  +10 -10
+
+  one more minor cleanup.
+  
+  looks like the code we have works on both irix and digital unix.
+
+
+src/kernel/qapp_win.cpp    2.88  hanord  +2 -3
+
+  Posted event fix
+
+
+src/kernel/qapp_win.cpp    2.89  agulbra  +2 -2
+src/kernel/qapp_x11.cpp    2.138  agulbra  +3 -3
+
+  don't delete events destined for other objects in target-specific
+  sendPostedEvents()
+
+
+src/kernel/qasyncimageio.cpp    1.33  warwick  +42 -42
+src/kernel/qasyncimageio.h    1.17  warwick  +15 -15
+
+  New names.
+
+
+src/kernel/qdnd_x11.cpp    2.14  agulbra  +8 -5
+src/kernel/qdragobject.cpp    2.14  agulbra  +21 -9
+
+  right cursor
+
+
+src/kernel/qdnd_x11.cpp    2.15  agulbra  +6 -9
+
+  comment out old debug messages; delete some
+
+
+src/kernel/qdragobject.cpp    2.15  agulbra  +4 -6
+
+  ignore totally unexpected events
+
+
+src/kernel/qfnt_win.cpp    2.28  agulbra  +4 -4
+src/kernel/qfont.cpp    2.34  agulbra  +2 -4
+
+  be slightly more robust about setting the character encoding to the
+  defFont's.
+
+
+src/kernel/qfont.cpp    2.31  agulbra  +115 -63
+
+  overhauled class documentation; man function descriptions probably
+  also need an overhaul.
+
+
+src/kernel/qfont.cpp    2.32  agulbra  +56 -65
+
+  fixed some typos; removed some misleading text from the function
+  descriptions.
+
+
+src/kernel/qgmanagr.cpp    2.34  paul  +22 -66
+
+  Rolled back "empty layout" change, since it broke existing code.
+
+
+src/kernel/qiconset.cpp    2.9  paul  +16 -8
+
+  Handle mask better when generating disabled pixmaps
+
+
+src/kernel/qprn_x11.cpp    2.14  agulbra  +12 -1
+
+  if the application hasn't specified a non-default print program, try
+  HARD to find a decent lpr or lp.
+
+
+src/kernel/qpsprn.cpp    2.25  agulbra  +12 -7
+
+  discussed the "sometimes cannot print to /usr/bin/lpr even though
+  every other program works perfectly" bug with the code.
+  
+  also shrunk the output by a few bytes by removing extraneous newlines
+  and one comment.
+
+
+src/tools/qdatetm.cpp    2.14  agulbra  +19 -5
+
+  QDateTime::addSecs() used to not work across midnight or backwards.
+
+
+src/tools/qglobal.h    2.51  agulbra  +4 -2
+
+  detect unixware 7; detect bool on more irix stuff
+
+
+src/widgets/qbttngrp.cpp    2.12  agulbra  +5 -1
+
+  mention the existence of set*Propagation()
+
+
+src/widgets/qbutton.cpp    2.60  agulbra  +16 -17
+src/widgets/qbutton.h    2.16  agulbra  +3 -2
+
+  make setDown() public; this breaks binary compatibility on MSVC++
+  
+  The way to start a context menu on press used to be to make a
+  synthetic QMouseEvent indicating a release, and sendEvent() that.
+  not terribly nice.
+
+
+src/widgets/qheader.cpp    2.41  paul  +6 -1
+
+  Fix "Index out of range" bug.
+
+
+src/widgets/qlined.cpp    2.78  agulbra  +3 -6
+
+  when pasting multi-line stuff, fold to one line.
+
+
+src/widgets/qlined.cpp    2.79  paul  +2 -2
+
+  Fix "index out of range" bug when typing past maxLength.
+
+
+src/widgets/qpopmenu.cpp    2.75  aavit  +2 -2
+
+  minimal improvement of checkmark look in windows style.
+
+
+src/widgets/qsplitter.cpp    1.13  agulbra  +12 -12
+
+  more doc; mention setFixed()
+
+
+src/widgets/qtoolbar.cpp    2.21  agulbra  +46 -12
+
+  paint a tool bar handle in motif style too
+
+
+src/widgets/qtoolbar.cpp    2.22  paul  +3 -2
+
+  Don't override max/min sizes for children
+
+
+src/widgets/qtoolbutton.cpp    2.27  agulbra  +24 -22
+
+  handle text label correctly; check for null pointer; minor doc
+  improvements
diff --git a/dist/changes-1.39-19980616 b/dist/changes-1.39-19980616
new file mode 100644
index 0000000000..831dd876f7
--- /dev/null
+++ b/dist/changes-1.39-19980616
@@ -0,0 +1,810 @@
+doc/metaobjects.doc    2.9  warwick  +3 -3
+doc/tutorial.doc    2.13  warwick  +4 -4
+examples/aclock/aclock.h    2.3  warwick  +2 -2
+examples/aclock/main.cpp    2.3  warwick  +2 -2
+examples/application/application.cpp    1.12  warwick  +8 -8
+examples/application/main.cpp    1.6  warwick  +2 -2
+examples/biff/biff.cpp    2.3  warwick  +2 -2
+examples/biff/biff.h    2.3  warwick  +2 -2
+examples/biff/main.cpp    2.3  warwick  +2 -2
+examples/connect/connect.cpp    2.5  warwick  +2 -2
+examples/cursor/cursor.cpp    2.3  warwick  +2 -2
+examples/dclock/dclock.cpp    2.4  warwick  +2 -2
+examples/dclock/dclock.h    2.3  warwick  +2 -2
+examples/dclock/main.cpp    2.3  warwick  +2 -2
+examples/desktop/desktop.cpp    2.4  warwick  +2 -2
+examples/dirview/dirview.cpp    1.9  warwick  +2 -2
+examples/dirview/main.cpp    1.7  warwick  +2 -2
+examples/drawdemo/drawdemo.cpp    2.7  warwick  +5 -5
+examples/forever/forever.cpp    2.4  warwick  +2 -2
+examples/hello/hello.cpp    2.5  warwick  +2 -2
+examples/hello/main.cpp    2.6  warwick  +2 -2
+examples/layout/layout.cpp    1.6  warwick  +6 -6
+examples/layouts/layouts.cpp    1.5  warwick  +6 -6
+examples/layouts/qtbuttonrow.cpp    1.4  warwick  +4 -3
+examples/layouts/qthbox.cpp    1.4  warwick  +2 -2
+examples/life/life.cpp    2.5  warwick  +4 -4
+examples/life/lifedlg.cpp    2.8  warwick  +5 -5
+examples/life/main.cpp    2.3  warwick  +2 -2
+examples/menu/menu.cpp    2.15  warwick  +4 -4
+examples/movies/main.cpp    1.11  warwick  +4 -4
+examples/network/connection.cpp    1.7  warwick  +2 -2
+examples/network/finger.cpp    1.7  warwick  +6 -6
+examples/network/prime.cpp    1.6  warwick  +5 -5
+examples/network/primed.cpp    1.8  warwick  +4 -4
+examples/network/primespeed.cpp    1.5  warwick  +5 -5
+examples/network/server.cpp    1.8  warwick  +2 -2
+examples/network/share.cpp    1.6  warwick  +4 -4
+examples/picture/picture.cpp    1.6  warwick  +3 -3
+examples/pref/main.cpp    1.7  warwick  +2 -2
+examples/pref/pref.cpp    1.20  warwick  +5 -5
+examples/progress/progress.cpp    1.13  warwick  +4 -4
+examples/qdir/qdir.cpp    1.6  warwick  +3 -3
+examples/qmag/qmag.cpp    2.16  warwick  +5 -5
+examples/qwerty/main.cpp    1.6  warwick  +2 -2
+examples/qwerty/qwerty.cpp    1.11  warwick  +7 -7
+examples/qwerty/qwerty.h    1.8  warwick  +2 -2
+examples/scrollview/scrollview.cpp    1.15  warwick  +6 -6
+examples/sheet/main.cpp    2.5  warwick  +2 -2
+examples/sheet/sheet.cpp    2.5  warwick  +2 -2
+examples/sheet/sheetdlg.cpp    2.5  warwick  +2 -2
+examples/sheet/sheetdlg.h    2.3  warwick  +2 -2
+examples/sheet/table.cpp    2.4  warwick  +2 -2
+examples/sheet/table.h    2.4  warwick  +3 -3
+examples/showimg/main.cpp    2.18  warwick  +2 -2
+examples/showimg/showimg.cpp    2.24  warwick  +5 -5
+examples/table/main.cpp    1.4  warwick  +3 -3
+examples/table/table.h    1.5  warwick  +2 -2
+examples/tetrix/qdragapp.cpp    2.3  warwick  +5 -4
+examples/tetrix/qdragapp.h    2.3  warwick  +2 -2
+examples/tetrix/qtetrix.cpp    2.7  warwick  +3 -3
+examples/tetrix/qtetrix.h    2.4  warwick  +3 -3
+examples/tictac/main.cpp    2.3  warwick  +2 -2
+examples/tictac/tictac.cpp    2.8  warwick  +6 -6
+examples/tictac/tictac.h    2.3  warwick  +2 -2
+examples/timestmp/timestmp.cpp    2.4  warwick  +3 -3
+examples/tooltip/main.cpp    1.5  warwick  +2 -2
+examples/tooltip/tooltip.cpp    1.6  warwick  +2 -2
+examples/validator/main.cpp    1.5  warwick  +2 -2
+examples/validator/motor.cpp    1.9  warwick  +3 -3
+examples/validator/vw.cpp    1.8  warwick  +4 -4
+examples/widgets/widgets.cpp    2.43  warwick  +13 -13
+examples/xform/xform.cpp    2.9  warwick  +8 -8
+extensions/imageio/src/qjpegio.cpp    1.5  warwick  +2 -2
+extensions/imageio/src/qpngio.cpp    1.7  warwick  +2 -2
+extensions/nsplugin/examples/grapher/grapher.cpp    1.10  warwick  +3 -3
+extensions/nsplugin/examples/qtimage/qtimage.cpp    1.6  warwick  +2 -2
+extensions/nsplugin/examples/trivial/trivial.cpp    1.7  warwick  +1 -1
+extensions/nsplugin/src/qnp.cpp    1.19  warwick  +9 -9
+extensions/opengl/examples/box/globjwin.cpp    1.4  warwick  +4 -4
+extensions/opengl/examples/box/main.cpp    1.4  warwick  +1 -1
+extensions/opengl/examples/gear/gear.cpp    1.6  warwick  +1 -1
+extensions/opengl/examples/sharedbox/globjwin.cpp    1.2  warwick  +4 -4
+extensions/opengl/examples/sharedbox/main.cpp    1.2  warwick  +1 -1
+extensions/xt/examples/mainlyMotif/editor.cpp    1.3  warwick  +2 -2
+extensions/xt/examples/mainlyQt/editor.cpp    1.2  warwick  +2 -2
+extensions/xt/examples/mainlyXt/editor.cpp    1.2  warwick  +2 -2
+extensions/xt/src/qxt.cpp    1.3  warwick  +6 -6
+extensions/xt/src/qxt.h    1.2  warwick  +2 -2
+src/qt.pro    2.26  warwick  +110 -110
+src/qtinternal.pro    2.7  warwick  +5 -5
+src/dialogs/qfiledialog.cpp    2.71  warwick  +12 -12
+src/dialogs/qfiledialog.h    2.18  warwick  +4 -4
+src/dialogs/qfiledlg.cpp    2.71  warwick  +1 -1
+src/dialogs/qfiledlg.h    2.18  warwick  +2 -146
+src/dialogs/qfontdialog.cpp    2.13  warwick  +7 -7
+src/dialogs/qmessagebox.cpp    2.49  warwick  +5 -5
+src/dialogs/qmessagebox.h    2.26  warwick  +4 -4
+src/dialogs/qmsgbox.cpp    2.49  warwick  +1 -1
+src/dialogs/qmsgbox.h    2.26  warwick  +1 -132
+src/dialogs/qprintdialog.cpp    2.28  warwick  +10 -10
+src/dialogs/qprintdialog.h    2.9  warwick  +4 -4
+src/dialogs/qprndlg.cpp    2.28  warwick  +1 -1
+src/dialogs/qprndlg.h    2.9  warwick  +2 -63
+src/dialogs/qprogdlg.cpp    2.27  warwick  +1 -1
+src/dialogs/qprogdlg.h    2.14  warwick  +2 -75
+src/dialogs/qprogressdialog.cpp    2.27  warwick  +6 -6
+src/dialogs/qprogressdialog.h    2.14  warwick  +6 -6
+src/dialogs/qtabdialog.cpp    2.41  warwick  +7 -6
+src/dialogs/qtabdialog.h    2.19  warwick  +4 -4
+src/dialogs/qtabdlg.cpp    2.41  warwick  +1 -1
+src/dialogs/qtabdlg.h    2.19  warwick  +1 -84
+src/kernel/qaccel.cpp    2.13  warwick  +2 -2
+src/kernel/qapp.cpp    2.57  warwick  +1 -1
+src/kernel/qapp.h    2.27  warwick  +1 -205
+src/kernel/qapp_os2.cpp    2.5  warwick  +4 -3
+src/kernel/qapp_win.cpp    2.90  warwick  +1 -1
+src/kernel/qapp_x11.cpp    2.141  warwick  +1 -1
+src/kernel/qapplication.cpp    2.57  warwick  +13 -11
+src/kernel/qapplication.h    2.27  warwick  +5 -5
+src/kernel/qapplication_win.cpp    2.90  warwick  +9 -7
+src/kernel/qapplication_x11.cpp    2.141  warwick  +13 -11
+src/kernel/qasyncio.cpp    1.9  warwick  +2 -2
+src/kernel/qclb_win.cpp    2.7  warwick  +1 -1
+src/kernel/qclb_x11.cpp    2.13  warwick  +1 -1
+src/kernel/qclipboard.cpp    2.9  warwick  +4 -4
+src/kernel/qclipboard.h    2.5  warwick  +4 -4
+src/kernel/qclipboard_win.cpp    2.7  warwick  +4 -4
+src/kernel/qclipboard_x11.cpp    2.13  warwick  +5 -5
+src/kernel/qclipbrd.cpp    2.9  warwick  +1 -1
+src/kernel/qclipbrd.h    2.5  warwick  +2 -55
+src/kernel/qcol_win.cpp    2.18  warwick  +1 -1
+src/kernel/qcol_x11.cpp    2.31  warwick  +1 -1
+src/kernel/qcolor.cpp    2.15  warwick  +2 -2
+src/kernel/qcolor.h    2.10  warwick  +2 -2
+src/kernel/qcolor_win.cpp    2.18  warwick  +2 -2
+src/kernel/qcolor_x11.cpp    2.31  warwick  +4 -4
+src/kernel/qconnect.cpp    2.5  warwick  +1 -1
+src/kernel/qconnect.h    2.5  warwick  +2 -46
+src/kernel/qconnection.cpp    2.5  warwick  +3 -3
+src/kernel/qconnection.h    2.5  warwick  +4 -4
+src/kernel/qcur_os2.cpp    2.3  warwick  +2 -2
+src/kernel/qcur_win.cpp    2.7  warwick  +1 -1
+src/kernel/qcur_x11.cpp    2.11  warwick  +1 -1
+src/kernel/qcursor.cpp    2.8  warwick  +2 -2
+src/kernel/qcursor_win.cpp    2.7  warwick  +3 -3
+src/kernel/qcursor_x11.cpp    2.11  warwick  +3 -3
+src/kernel/qdialog.cpp    2.19  warwick  +5 -4
+src/kernel/qdnd_win.cpp    2.6  warwick  +2 -2
+src/kernel/qdnd_x11.cpp    2.18  warwick  +8 -7
+src/kernel/qdragobject.cpp    2.17  warwick  +4 -3
+src/kernel/qdrawutil.cpp    2.18  warwick  +3 -3
+src/kernel/qdrawutil.h    2.7  warwick  +4 -4
+src/kernel/qdrawutl.cpp    2.18  warwick  +1 -1
+src/kernel/qdrawutl.h    2.7  warwick  +2 -91
+src/kernel/qevent.h    2.17  warwick  +2 -2
+src/kernel/qfnt_win.cpp    2.30  warwick  +1 -1
+src/kernel/qfnt_x11.cpp    2.39  warwick  +1 -1
+src/kernel/qfont.cpp    2.35  warwick  +11 -11
+src/kernel/qfont.h    2.10  warwick  +2 -2
+src/kernel/qfont_win.cpp    2.30  warwick  +5 -5
+src/kernel/qfont_x11.cpp    2.39  warwick  +2 -2
+src/kernel/qfontdata.h    2.11  warwick  +4 -4
+src/kernel/qfontdta.h    2.11  warwick  +2 -65
+src/kernel/qfontinf.h    2.7  warwick  +1 -79
+src/kernel/qfontinfo.h    2.7  warwick  +4 -4
+src/kernel/qfontmet.h    2.14  warwick  +1 -95
+src/kernel/qfontmetrics.h    2.14  warwick  +4 -4
+src/kernel/qgmanager.cpp    2.36  warwick  +5 -5
+src/kernel/qgmanager.h    2.13  warwick  +4 -4
+src/kernel/qgmanagr.cpp    2.36  warwick  +1 -1
+src/kernel/qgmanagr.h    2.13  warwick  +2 -84
+src/kernel/qiconset.cpp    2.10  warwick  +2 -2
+src/kernel/qimage.cpp    2.91  warwick  +3 -3
+src/kernel/qlayout.h    2.18  warwick  +2 -2
+src/kernel/qmetaobj.cpp    2.9  warwick  +1 -1
+src/kernel/qmetaobj.h    2.4  warwick  +2 -66
+src/kernel/qmetaobject.cpp    2.9  warwick  +5 -4
+src/kernel/qmetaobject.h    2.4  warwick  +5 -5
+src/kernel/qmovie.cpp    1.33  warwick  +3 -3
+src/kernel/qmutex.h    1.5  warwick  +2 -2
+src/kernel/qnpsupport.cpp    2.11  warwick  +6 -6
+src/kernel/qobjcoll.h    2.6  warwick  +1 -1
+src/kernel/qobjdefs.h    2.4  warwick  +1 -78
+src/kernel/qobject.cpp    2.51  warwick  +5 -4
+src/kernel/qobject.h    2.10  warwick  +2 -2
+src/kernel/qobjectdefs.h    2.4  warwick  +4 -4
+src/kernel/qobjectdict.h    2.1  warwick  initial checkin
+src/kernel/qobjectlist.h    2.1  warwick  initial checkin
+src/kernel/qpaintd.h    2.7  warwick  +1 -170
+src/kernel/qpaintdc.h    2.6  warwick  +2 -97
+src/kernel/qpaintdevice.h    2.7  warwick  +6 -6
+src/kernel/qpaintdevice_win.cpp    2.10  warwick  +5 -5
+src/kernel/qpaintdevice_x11.cpp    2.15  warwick  +6 -6
+src/kernel/qpaintdevicedefs.h    2.6  warwick  +5 -5
+src/kernel/qpaintdevicemetrics.cpp    2.4  warwick  +3 -3
+src/kernel/qpaintdevicemetrics.h    2.3  warwick  +7 -7
+src/kernel/qpainter.cpp    2.53  warwick  +7 -7
+src/kernel/qpainter.h    2.26  warwick  +5 -5
+src/kernel/qpainter_win.cpp    2.37  warwick  +5 -5
+src/kernel/qpainter_x11.cpp    2.52  warwick  +4 -4
+src/kernel/qpalette.cpp    2.18  warwick  +2 -2
+src/kernel/qpalette.h    2.14  warwick  +2 -2
+src/kernel/qpdevmet.cpp    2.4  warwick  +1 -1
+src/kernel/qpdevmet.h    2.3  warwick  +2 -37
+src/kernel/qpic_win.cpp    2.3  warwick  +1 -1
+src/kernel/qpic_x11.cpp    2.3  warwick  +1 -1
+src/kernel/qpicture.cpp    2.6  warwick  +3 -3
+src/kernel/qpicture.h    2.5  warwick  +2 -2
+src/kernel/qpixmap.cpp    2.26  warwick  +2 -2
+src/kernel/qpixmap.h    2.20  warwick  +2 -2
+src/kernel/qpixmap_win.cpp    2.35  warwick  +3 -3
+src/kernel/qpixmap_x11.cpp    2.37  warwick  +3 -3
+src/kernel/qpixmapcache.cpp    2.7  warwick  +3 -3
+src/kernel/qpixmapcache.h    2.4  warwick  +4 -4
+src/kernel/qpm_win.cpp    2.35  warwick  +1 -1
+src/kernel/qpm_x11.cpp    2.37  warwick  +1 -1
+src/kernel/qpmcache.cpp    2.7  warwick  +1 -1
+src/kernel/qpmcache.h    2.4  warwick  +2 -31
+src/kernel/qpntarry.cpp    2.16  warwick  +1 -1
+src/kernel/qpntarry.h    2.7  warwick  +1 -155
+src/kernel/qpoint.cpp    2.4  warwick  +3 -3
+src/kernel/qpoint.h    2.3  warwick  +2 -2
+src/kernel/qpointarray.cpp    2.16  warwick  +6 -6
+src/kernel/qpointarray.h    2.7  warwick  +4 -4
+src/kernel/qprinter.cpp    2.9  warwick  +3 -3
+src/kernel/qprinter.h    2.7  warwick  +2 -2
+src/kernel/qprinter_win.cpp    2.11  warwick  +2 -2
+src/kernel/qprinter_x11.cpp    2.16  warwick  +6 -6
+src/kernel/qprn_win.cpp    2.11  warwick  +1 -1
+src/kernel/qprn_x11.cpp    2.16  warwick  +1 -1
+src/kernel/qpsprinter.cpp    2.26  warwick  +4 -4
+src/kernel/qpsprinter.h    2.8  warwick  +5 -5
+src/kernel/qpsprn.cpp    2.26  warwick  +1 -1
+src/kernel/qpsprn.h    2.8  warwick  +2 -70
+src/kernel/qptd_os2.cpp    2.3  warwick  +2 -2
+src/kernel/qptd_win.cpp    2.10  warwick  +1 -1
+src/kernel/qptd_x11.cpp    2.15  warwick  +1 -1
+src/kernel/qptr_os2.cpp    2.4  warwick  +2 -2
+src/kernel/qptr_win.cpp    2.37  warwick  +1 -1
+src/kernel/qptr_x11.cpp    2.52  warwick  +1 -1
+src/kernel/qrect.cpp    2.8  warwick  +3 -3
+src/kernel/qregion.cpp    2.14  warwick  +3 -3
+src/kernel/qregion_win.cpp    2.15  warwick  +2 -2
+src/kernel/qregion_x11.cpp    2.16  warwick  +2 -2
+src/kernel/qrgn_os2.cpp    2.4  warwick  +2 -2
+src/kernel/qrgn_win.cpp    2.15  warwick  +1 -1
+src/kernel/qrgn_x11.cpp    2.16  warwick  +1 -1
+src/kernel/qsemimodal.cpp    2.6  warwick  +2 -2
+src/kernel/qsignal.cpp    2.5  warwick  +2 -2
+src/kernel/qsize.cpp    2.9  warwick  +3 -3
+src/kernel/qsocketnotifier.cpp    2.7  warwick  +3 -3
+src/kernel/qsocketnotifier.h    2.4  warwick  +4 -4
+src/kernel/qsocknot.cpp    2.7  warwick  +1 -1
+src/kernel/qsocknot.h    2.4  warwick  +2 -60
+src/kernel/qt_x11.cpp    2.4  warwick  +1 -1
+src/kernel/qthread.h    1.5  warwick  +2 -2
+src/kernel/qtimer.cpp    2.9  warwick  +4 -3
+src/kernel/qwid_os2.cpp    2.6  warwick  +3 -2
+src/kernel/qwid_win.cpp    2.56  warwick  +1 -1
+src/kernel/qwid_x11.cpp    2.96  warwick  +1 -1
+src/kernel/qwidcoll.h    2.5  warwick  +1 -1
+src/kernel/qwidget.cpp    2.111  warwick  +10 -8
+src/kernel/qwidget.h    2.50  warwick  +5 -5
+src/kernel/qwidget_win.cpp    2.56  warwick  +11 -9
+src/kernel/qwidget_x11.cpp    2.96  warwick  +10 -8
+src/kernel/qwidgetintdict.h    2.1  warwick  initial checkin
+src/kernel/qwidgetlist.h    2.1  warwick  initial checkin
+src/kernel/qwindefs.h    2.23  warwick  +1 -313
+src/kernel/qwindowdefs.h    2.23  warwick  +5 -5
+src/kernel/qwmatrix.cpp    2.5  warwick  +3 -3
+src/kernel/qwmatrix.h    2.3  warwick  +3 -3
+src/moc/GNUmakefile    2.5  warwick  +13 -13
+src/moc/Makefile    2.10  warwick  +42 -42
+src/moc/moc.pro    1.10  warwick  +4 -4
+src/moc/moc.y    2.23  warwick  +5 -5
+src/tools/qbitarray.cpp    2.7  warwick  +5 -5
+src/tools/qbitarray.h    2.5  warwick  +4 -4
+src/tools/qbitarry.cpp    2.7  warwick  +1 -1
+src/tools/qbitarry.h    2.5  warwick  +2 -134
+src/tools/qbuffer.h    2.5  warwick  +2 -2
+src/tools/qcollect.cpp    2.5  warwick  +1 -1
+src/tools/qcollect.h    2.3  warwick  +2 -46
+src/tools/qcollection.cpp    2.5  warwick  +3 -3
+src/tools/qcollection.h    2.3  warwick  +4 -4
+src/tools/qdatastream.cpp    2.14  warwick  +3 -3
+src/tools/qdatastream.h    2.6  warwick  +5 -5
+src/tools/qdatetime.cpp    2.15  warwick  +6 -6
+src/tools/qdatetime.h    2.4  warwick  +4 -4
+src/tools/qdatetm.cpp    2.15  warwick  +1 -1
+src/tools/qdatetm.h    2.4  warwick  +2 -180
+src/tools/qdir.cpp    2.22  warwick  +3 -3
+src/tools/qdir.h    2.8  warwick  +2 -2
+src/tools/qdstream.cpp    2.14  warwick  +1 -1
+src/tools/qdstream.h    2.6  warwick  +2 -117
+src/tools/qfile.cpp    2.22  warwick  +2 -2
+src/tools/qfile.h    2.5  warwick  +2 -2
+src/tools/qfiledef.h    2.8  warwick  +3 -153
+src/tools/qfiledefs.h    2.8  warwick  +2 -2
+src/tools/qfileinf.cpp    2.11  warwick  +1 -1
+src/tools/qfileinf.h    2.3  warwick  +2 -96
+src/tools/qfileinfo.cpp    2.11  warwick  +6 -6
+src/tools/qfileinfo.h    2.3  warwick  +5 -5
+src/tools/qgcache.h    2.3  warwick  +2 -2
+src/tools/qgdict.cpp    2.16  warwick  +2 -2
+src/tools/qgdict.h    2.5  warwick  +2 -2
+src/tools/qglist.cpp    2.5  warwick  +2 -2
+src/tools/qglist.h    2.3  warwick  +2 -2
+src/tools/qglobal.cpp    2.15  warwick  +2 -2
+src/tools/qglobal.h    2.52  warwick  +2 -2
+src/tools/qgvector.cpp    2.7  warwick  +2 -2
+src/tools/qgvector.h    2.3  warwick  +2 -2
+src/tools/qintcach.h    2.3  warwick  +1 -168
+src/tools/qintcache.h    2.3  warwick  +4 -4
+src/tools/qiodev.cpp    2.11  warwick  +1 -1
+src/tools/qiodev.h    2.5  warwick  +2 -128
+src/tools/qiodevice.cpp    2.11  warwick  +3 -3
+src/tools/qiodevice.h    2.5  warwick  +4 -4
+src/tools/qstring.cpp    2.21  warwick  +2 -2
+src/tools/qstrlist.h    2.11  warwick  +2 -2
+src/tools/qstrvec.h    2.4  warwick  +2 -2
+src/tools/qtextstream.cpp    2.15  warwick  +4 -4
+src/tools/qtextstream.h    2.7  warwick  +5 -5
+src/tools/qtstream.cpp    2.15  warwick  +1 -1
+src/tools/qtstream.h    2.7  warwick  +2 -216
+src/widgets/qbttngrp.cpp    2.13  warwick  +1 -1
+src/widgets/qbttngrp.h    2.6  warwick  +2 -61
+src/widgets/qbutton.cpp    2.61  warwick  +3 -3
+src/widgets/qbutton.h    2.17  warwick  +2 -2
+src/widgets/qbuttongroup.cpp    2.13  warwick  +3 -3
+src/widgets/qbuttongroup.h    2.6  warwick  +5 -5
+src/widgets/qcheckbox.cpp    2.23  warwick  +5 -5
+src/widgets/qcheckbox.h    2.6  warwick  +4 -4
+src/widgets/qchkbox.cpp    2.23  warwick  +1 -1
+src/widgets/qchkbox.h    2.6  warwick  +2 -47
+src/widgets/qcombo.cpp    2.87  warwick  +1 -1
+src/widgets/qcombo.h    2.27  warwick  +2 -132
+src/widgets/qcombobox.cpp    2.87  warwick  +8 -8
+src/widgets/qcombobox.h    2.27  warwick  +3 -3
+src/widgets/qframe.cpp    2.19  warwick  +2 -2
+src/widgets/qgroupbox.cpp    2.12  warwick  +3 -3
+src/widgets/qgroupbox.h    2.4  warwick  +4 -4
+src/widgets/qgrpbox.cpp    2.12  warwick  +1 -1
+src/widgets/qgrpbox.h    2.4  warwick  +2 -46
+src/widgets/qheader.cpp    2.45  warwick  +3 -3
+src/widgets/qheader.h    2.19  warwick  +2 -2
+src/widgets/qlabel.cpp    2.32  warwick  +2 -2
+src/widgets/qlcdnum.cpp    2.13  warwick  +1 -1
+src/widgets/qlcdnum.h    2.8  warwick  +2 -95
+src/widgets/qlcdnumber.cpp    2.13  warwick  +4 -4
+src/widgets/qlcdnumber.h    2.8  warwick  +5 -5
+src/widgets/qlined.cpp    2.81  warwick  +1 -1
+src/widgets/qlined.h    2.28  warwick  +2 -138
+src/widgets/qlineedit.cpp    2.81  warwick  +7 -7
+src/widgets/qlineedit.h    2.28  warwick  +4 -4
+src/widgets/qlistbox.cpp    2.69  warwick  +4 -4
+src/widgets/qlistbox.h    2.16  warwick  +2 -2
+src/widgets/qlistview.cpp    2.117  warwick  +3 -3
+src/widgets/qmainwindow.cpp    2.27  warwick  +4 -3
+src/widgets/qmenubar.cpp    2.54  warwick  +3 -3
+src/widgets/qmenubar.h    2.11  warwick  +2 -2
+src/widgets/qmenudata.cpp    2.16  warwick  +5 -5
+src/widgets/qmenudata.h    2.11  warwick  +4 -4
+src/widgets/qmenudta.cpp    2.16  warwick  +1 -1
+src/widgets/qmenudta.h    2.11  warwick  +1 -182
+src/widgets/qmlined.cpp    2.93  warwick  +1 -1
+src/widgets/qmlined.h    2.36  warwick  +2 -189
+src/widgets/qmultilined.cpp    2.93  warwick  +6 -6
+src/widgets/qmultilined.h    2.36  warwick  +5 -5
+src/widgets/qpopmenu.cpp    2.78  warwick  +1 -1
+src/widgets/qpopmenu.h    2.14  warwick  +2 -110
+src/widgets/qpopupmenu.cpp    2.78  warwick  +6 -6
+src/widgets/qpopupmenu.h    2.14  warwick  +6 -6
+src/widgets/qprogbar.cpp    2.19  warwick  +1 -1
+src/widgets/qprogbar.h    2.9  warwick  +2 -65
+src/widgets/qprogressbar.cpp    2.19  warwick  +5 -5
+src/widgets/qprogressbar.h    2.9  warwick  +4 -4
+src/widgets/qpushbt.cpp    2.41  warwick  +1 -1
+src/widgets/qpushbt.h    2.8  warwick  +2 -70
+src/widgets/qpushbutton.cpp    2.41  warwick  +6 -6
+src/widgets/qpushbutton.h    2.8  warwick  +4 -4
+src/widgets/qradiobt.cpp    2.28  warwick  +1 -1
+src/widgets/qradiobt.h    2.8  warwick  +2 -55
+src/widgets/qradiobutton.cpp    2.28  warwick  +6 -6
+src/widgets/qradiobutton.h    2.8  warwick  +4 -4
+src/widgets/qrangecontrol.cpp    2.6  warwick  +3 -3
+src/widgets/qrangecontrol.h    2.3  warwick  +4 -4
+src/widgets/qrangect.cpp    2.6  warwick  +1 -1
+src/widgets/qrangect.h    2.3  warwick  +2 -76
+src/widgets/qscrbar.cpp    2.38  warwick  +1 -1
+src/widgets/qscrbar.h    2.6  warwick  +2 -115
+src/widgets/qscrollbar.cpp    2.38  warwick  +3 -3
+src/widgets/qscrollbar.h    2.6  warwick  +6 -6
+src/widgets/qscrollview.cpp    2.46  warwick  +5 -4
+src/widgets/qscrollview.h    2.21  warwick  +2 -2
+src/widgets/qslider.cpp    2.52  warwick  +2 -2
+src/widgets/qslider.h    2.23  warwick  +2 -2
+src/widgets/qspinbox.cpp    2.35  warwick  +3 -3
+src/widgets/qspinbox.h    2.20  warwick  +2 -2
+src/widgets/qsplitter.cpp    1.16  warwick  +2 -2
+src/widgets/qstatusbar.cpp    2.14  warwick  +3 -3
+src/widgets/qtableview.cpp    2.49  warwick  +5 -5
+src/widgets/qtableview.h    2.10  warwick  +4 -4
+src/widgets/qtablevw.cpp    2.49  warwick  +1 -1
+src/widgets/qtablevw.h    2.10  warwick  +2 -241
+src/widgets/qtoolbar.cpp    2.23  warwick  +5 -4
+src/widgets/qtoolbutton.cpp    2.28  warwick  +3 -3
+src/widgets/qtooltip.cpp    2.47  warwick  +4 -4
+src/widgets/qwellarray.cpp    1.4  warwick  +4 -3
+src/widgets/qwellarray.h    1.5  warwick  +2 -2
+src/widgets/qwhatsthis.cpp    2.15  warwick  +3 -3
+src/widgets/qwidgetstack.cpp    2.7  warwick  +3 -2
+tutorial/t1/main.cpp    2.1  warwick  +2 -2
+tutorial/t10/lcdrange.cpp    2.1  warwick  +2 -2
+tutorial/t10/main.cpp    2.3  warwick  +4 -4
+tutorial/t11/lcdrange.cpp    2.1  warwick  +2 -2
+tutorial/t11/main.cpp    2.3  warwick  +4 -4
+tutorial/t12/cannon.cpp    2.3  warwick  +1 -1
+tutorial/t12/lcdrange.cpp    2.1  warwick  +2 -2
+tutorial/t12/main.cpp    2.3  warwick  +4 -4
+tutorial/t13/cannon.cpp    2.3  warwick  +1 -1
+tutorial/t13/gamebrd.cpp    2.1  warwick  +3 -3
+tutorial/t13/lcdrange.cpp    2.1  warwick  +2 -2
+tutorial/t13/main.cpp    2.3  warwick  +1 -1
+tutorial/t14/cannon.cpp    2.3  warwick  +1 -1
+tutorial/t14/gamebrd.cpp    2.2  warwick  +3 -3
+tutorial/t14/lcdrange.cpp    2.1  warwick  +2 -2
+tutorial/t14/main.cpp    2.3  warwick  +1 -1
+tutorial/t2/main.cpp    2.1  warwick  +2 -2
+tutorial/t3/main.cpp    2.1  warwick  +2 -2
+tutorial/t4/main.cpp    2.1  warwick  +2 -2
+tutorial/t5/main.cpp    2.1  warwick  +4 -4
+tutorial/t6/main.cpp    2.1  warwick  +4 -4
+tutorial/t7/lcdrange.cpp    2.1  warwick  +2 -2
+tutorial/t7/main.cpp    2.1  warwick  +4 -4
+tutorial/t8/lcdrange.cpp    2.1  warwick  +2 -2
+tutorial/t8/main.cpp    2.1  warwick  +4 -4
+tutorial/t9/lcdrange.cpp    2.1  warwick  +2 -2
+tutorial/t9/main.cpp    2.3  warwick  +4 -4
+
+  The Big Renaming of '98
+
+
+doc/tutorial.doc    2.14  agulbra  +4 -4
+
+  new header files
+
+
+examples/validator/motor.cpp    1.8  agulbra  +2 -71
+examples/validator/motor.h    1.7  agulbra  +2 -29
+examples/validator/vw.cpp    1.7  agulbra  +11 -11
+examples/validator/vw.h    1.4  agulbra  +3 -3
+
+  some fixes for current QSpinBox
+
+
+extensions/nsplugin/src/qnp.pro    1.2  warwick  +1 -1
+
+  tmake workaround
+
+
+src/dialogs/qfiledialog.cpp    2.70  agulbra  +46 -1
+src/dialogs/qfiledialog.h    2.17  agulbra  +3 -1
+src/dialogs/qfiledlg.cpp    2.70  agulbra  +46 -1
+src/dialogs/qfiledlg.h    2.17  agulbra  +3 -1
+
+  support multile file types
+
+
+src/dialogs/qfiledlg.h    2.19  warwick  +0 -0
+src/dialogs/qmsgbox.h    2.27  warwick  +0 -0
+src/dialogs/qprndlg.h    2.10  warwick  +0 -0
+src/dialogs/qprogdlg.h    2.15  warwick  +0 -0
+src/dialogs/qtabdlg.h    2.20  warwick  +0 -0
+src/kernel/qapp.h    2.28  warwick  +0 -0
+src/kernel/qclipbrd.h    2.6  warwick  +0 -0
+src/kernel/qconnect.h    2.6  warwick  +0 -0
+src/kernel/qdrawutl.h    2.8  warwick  +0 -0
+src/kernel/qfontdta.h    2.12  warwick  +0 -0
+src/kernel/qfontinf.h    2.8  warwick  +0 -0
+src/kernel/qfontmet.h    2.15  warwick  +0 -0
+src/kernel/qgmanagr.h    2.14  warwick  +0 -0
+src/kernel/qmetaobj.h    2.5  warwick  +0 -0
+src/kernel/qobjdefs.h    2.5  warwick  +0 -0
+src/kernel/qpaintd.h    2.8  warwick  +0 -0
+src/kernel/qpaintdc.h    2.7  warwick  +0 -0
+src/kernel/qpdevmet.h    2.4  warwick  +0 -0
+src/kernel/qpmcache.h    2.5  warwick  +0 -0
+src/kernel/qpntarry.h    2.8  warwick  +0 -0
+src/kernel/qpsprn.h    2.9  warwick  +0 -0
+src/kernel/qsocknot.h    2.5  warwick  +0 -0
+src/kernel/qwindefs.h    2.24  warwick  +0 -0
+src/tools/qbitarry.h    2.6  warwick  +0 -0
+src/tools/qcollect.h    2.4  warwick  +0 -0
+src/tools/qdatetm.h    2.5  warwick  +0 -0
+src/tools/qdstream.h    2.7  warwick  +0 -0
+src/tools/qfiledef.h    2.9  warwick  +0 -0
+src/tools/qfileinf.h    2.4  warwick  +0 -0
+src/tools/qintcach.h    2.4  warwick  +0 -0
+src/tools/qiodev.h    2.6  warwick  +0 -0
+src/tools/qtstream.h    2.8  warwick  +0 -0
+src/widgets/qbttngrp.h    2.7  warwick  +0 -0
+src/widgets/qchkbox.h    2.7  warwick  +0 -0
+src/widgets/qcombo.h    2.28  warwick  +0 -0
+src/widgets/qgrpbox.h    2.5  warwick  +0 -0
+src/widgets/qlcdnum.h    2.9  warwick  +0 -0
+src/widgets/qlined.h    2.29  warwick  +0 -0
+src/widgets/qmenudta.h    2.12  warwick  +0 -0
+src/widgets/qmlined.h    2.37  warwick  +0 -0
+src/widgets/qpopmenu.h    2.15  warwick  +0 -0
+src/widgets/qprogbar.h    2.10  warwick  +0 -0
+src/widgets/qpushbt.h    2.9  warwick  +0 -0
+src/widgets/qradiobt.h    2.9  warwick  +0 -0
+src/widgets/qrangect.h    2.4  warwick  +0 -0
+src/widgets/qscrbar.h    2.7  warwick  +0 -0
+src/widgets/qtablevw.h    2.11  warwick  +0 -0
+
+  Move compatibility files out of the way.
+
+
+src/dialogs/qprintdialog.cpp    2.27  agulbra  +67 -1
+src/dialogs/qprndlg.cpp    2.27  agulbra  +67 -1
+
+  val's irix 6.3 printer discovery code
+
+
+src/kernel/qapp.cpp    2.56  agulbra  +14 -6
+src/kernel/qapplication.cpp    2.56  agulbra  +14 -6
+src/kernel/qasyncimageio.cpp    1.34  agulbra  +53 -15
+src/kernel/qregion.cpp    2.13  agulbra  +1 -8
+src/kernel/qregion.h    2.13  agulbra  +1 -4
+src/widgets/qheader.cpp    2.44  agulbra  +4 -5
+
+  Reginald Stadlbauer's alpha's egcs said to do this.  it doesn't like
+  static objects with non-default constructors.
+
+
+src/kernel/qapp_os2.cpp    2.6  warwick  +1 -1
+src/kernel/qcol_os2.cpp    2.4  warwick  +1 -1
+src/kernel/qcur_os2.cpp    2.4  warwick  +1 -1
+src/kernel/qfnt_os2.cpp    2.3  warwick  +1 -1
+src/kernel/qpic_os2.cpp    2.3  warwick  +1 -1
+src/kernel/qpm_os2.cpp    2.3  warwick  +1 -1
+src/kernel/qptd_os2.cpp    2.4  warwick  +1 -1
+src/kernel/qptr_os2.cpp    2.5  warwick  +1 -1
+src/kernel/qrgn_os2.cpp    2.5  warwick  +1 -1
+src/kernel/qwid_os2.cpp    2.7  warwick  +1 -1
+
+  Remove OS2 code.
+
+
+src/kernel/qapp_x11.cpp    2.139  hanord  +2 -4
+src/kernel/qapplication_x11.cpp    2.139  hanord  +2 -4
+
+  Fixed keyboard release event bug when the key press was done outside the
+  window (Morten Eriksen bug report).
+
+
+src/kernel/qapp_x11.cpp    2.140  warwick  +5 -5
+src/kernel/qapplication_x11.cpp    2.140  warwick  +5 -5
+src/kernel/qfnt_x11.cpp    2.37  warwick  +9 -23
+src/kernel/qfont_x11.cpp    2.37  warwick  +9 -23
+src/kernel/qimage.cpp    2.90  warwick  +13 -13
+src/kernel/qnpsupport.cpp    2.10  warwick  +2 -1
+src/kernel/qwidget.cpp    2.109  warwick  +17 -16
+
+  Fix pointer-to-int casts that 64-bit compiler don't like.
+
+
+src/kernel/qcol_x11.cpp    2.30  hanord  +2 -2
+src/kernel/qcolor_x11.cpp    2.30  hanord  +2 -2
+src/widgets/qheader.cpp    2.42  hanord  +2 -2
+
+  Don't do big changes in 1.40, wait until 1.49
+
+
+src/kernel/qdialog.cpp    2.18  warwick  +20 -4
+
+  Stay on-screen when centering relative to parent.  This code should
+  be shared.
+
+
+src/kernel/qdnd_x11.cpp    2.15  agulbra  +6 -9
+
+  comment out old debug messages; delete some
+
+
+src/kernel/qdnd_x11.cpp    2.16  agulbra  +8 -5
+
+  workaround for gcc/alpha brokenness.
+
+
+src/kernel/qdnd_x11.cpp    2.17  warwick  +9 -9
+src/kernel/qpainter.cpp    2.52  warwick  +14 -11
+src/kernel/qwid_x11.cpp    2.95  warwick  +2 -2
+src/kernel/qwidget_x11.cpp    2.95  warwick  +2 -2
+src/widgets/qwellarray.cpp    1.3  warwick  +10 -1
+src/widgets/qwellarray.h    1.4  warwick  +2 -1
+
+  Avoid HPUX warnings.
+
+
+src/kernel/qdragobject.cpp    2.15  agulbra  +4 -6
+
+  ignore totally unexpected events
+
+
+src/kernel/qdragobject.cpp    2.16  agulbra  +2 -2
+
+  stop warning
+
+
+src/kernel/qfnt_win.cpp    2.29  warwick  +3 -3
+src/kernel/qfnt_x11.cpp    2.38  warwick  +4 -4
+src/kernel/qfont_win.cpp    2.29  warwick  +3 -3
+src/kernel/qfont_x11.cpp    2.38  warwick  +4 -4
+
+  Fix width(char) for signed characters.
+
+
+src/kernel/qgmanager.cpp    2.35  paul  +48 -20
+src/kernel/qgmanager.h    2.12  paul  +3 -1
+src/kernel/qgmanagr.cpp    2.35  paul  +48 -20
+src/kernel/qgmanagr.h    2.12  paul  +3 -1
+src/kernel/qlayout.cpp    2.32  paul  +36 -22
+
+  Better debug output.
+
+
+src/kernel/qimage.cpp    2.92  warwick  +3 -3
+src/kernel/qlayout.cpp    2.34  agulbra  +10 -25
+src/kernel/qpainter.cpp    2.50  agulbra  +6 -12
+src/tools/qregexp.cpp    2.11  agulbra  +3 -3
+src/widgets/qstatusbar.cpp    2.12  agulbra  +4 -4
+
+  doc
+
+
+src/kernel/qlayout.cpp    2.31  agulbra  +75 -24
+src/widgets/qlistview.cpp    2.114  agulbra  +7 -2
+
+  some docs
+
+
+src/kernel/qlayout.cpp    2.33  agulbra  +183 -34
+src/widgets/qlistview.cpp    2.115  agulbra  +93 -22
+src/widgets/qlistview.h    2.50  agulbra  +4 -1
+src/widgets/qwhatsthis.cpp    2.14  agulbra  +152 -29
+
+  doc, doc, doc.  this round pushes qt over 3250 documented functions.
+  the next milestone is five megs of html doc (sixty-odd k left).
+
+
+src/kernel/qobjcoll.h    2.7  warwick  +4 -20
+src/kernel/qwidcoll.h    2.6  warwick  +3 -14
+
+  Broken in rename.
+
+
+src/kernel/qobjcoll.h    2.8  warwick  +1 -1
+src/kernel/qwidcoll.h    2.7  warwick  +1 -1
+
+  Moved.
+
+
+src/kernel/qpainter.cpp    2.51  warwick  +2 -2
+
+  Improve robustness.
+
+
+src/kernel/qprinter_x11.cpp    2.15  agulbra  +2 -1
+src/kernel/qprn_x11.cpp    2.15  agulbra  +2 -1
+
+  #include <errno.h>; necessary for some unixes
+
+
+src/kernel/qwidget.cpp    2.110  agulbra  +2 -2
+
+  make tab focus change work (at all!) in dialogs
+
+
+src/tools/qfileinf.cpp    2.10  agulbra  +17 -8
+src/tools/qfileinfo.cpp    2.10  agulbra  +17 -8
+
+  double the speed of isSymLink() (and hence the file dialog's repaint)
+  in one easy change.
+
+
+src/tools/qgdict.cpp    2.15  warwick  +2 -2
+
+  64-bit pointer to long fix.
+
+
+src/tools/qstring.cpp    2.20  warwick  +2 -2
+
+  Obscure safety improvement.
+
+
+src/widgets/qcombo.cpp    2.86  agulbra  +2 -2
+src/widgets/qcombobox.cpp    2.86  agulbra  +2 -2
+src/widgets/qlabel.cpp    2.31  agulbra  +2 -2
+
+  fix logic to decide when to locate the listbox above the combo itself
+  instead of below.
+
+
+src/widgets/qheader.cpp    2.43  agulbra  +2 -3
+
+  remove a "this should not happen" debug() because that situation
+  should happen.  can happen, anyway.
+
+
+src/widgets/qlined.cpp    2.80  warwick  +24 -6
+src/widgets/qlined.h    2.27  warwick  +2 -1
+src/widgets/qlineedit.cpp    2.80  warwick  +24 -6
+src/widgets/qlineedit.h    2.27  warwick  +2 -1
+src/widgets/qmlined.cpp    2.92  warwick  +36 -7
+src/widgets/qmlined.h    2.35  warwick  +2 -1
+src/widgets/qmultilined.cpp    2.92  warwick  +36 -7
+src/widgets/qmultilined.h    2.35  warwick  +2 -1
+
+  Make WindowsStyle under X11 still meet the X11 user's expectations
+  regarding auto-copy, while allowing the highlight-and-paste action
+  familiar to Windows users.  A compromise.
+  
+  Also make qmlined more similar to qlined.
+
+
+src/widgets/qlistbox.cpp    2.68  warwick  +2 -2
+
+  Use maximumSize() correctly.
+  (fixes kdisplay background problem)
+
+
+src/widgets/qlistview.cpp    2.116  agulbra  +25 -12
+
+  tweak mouse state machine a little.  make it harder to select a
+  non-selectable item.  doc fixes.
+
+
+src/widgets/qmainwindow.cpp    2.25  agulbra  +3 -5
+src/widgets/qmainwindow.cpp    2.24  agulbra  +245 -26
+src/widgets/qmainwindow.h    2.15  agulbra  +2 -1
+
+  if a dock contained only hidden toolbars, layout would be wrong.
+  also contains ifdef-ed out broken docking code.
+
+
+src/widgets/qmainwindow.cpp    2.26  warwick  +3 -1
+src/widgets/qsplitter.cpp    1.15  warwick  +3 -1
+src/widgets/qstatusbar.cpp    2.13  warwick  +3 -1
+
+  New documentation images.
+
+
+src/widgets/qmainwindow.h    2.16  agulbra  +2 -3
+
+  setRightJustification is now a slot
+
+
+src/widgets/qmenudata.cpp    2.15  warwick  +4 -2
+src/widgets/qmenudta.cpp    2.15  warwick  +4 -2
+
+  Warning about setCheckable in setItemChecked.
+
+
+src/widgets/qpopmenu.cpp    2.76  warwick  +4 -9
+src/widgets/qpopupmenu.cpp    2.76  warwick  +4 -9
+
+  Fix "need more than one off-menu click to cancel" bug.
+  Make Escape only pop down one popup (as per Windows and Motif).
+
+
+src/widgets/qpopmenu.cpp    2.77  warwick  +4 -2
+src/widgets/qpopupmenu.cpp    2.77  warwick  +4 -2
+
+  Correct drop-down-on-no-selection behaviour.
+
+
+src/widgets/qspinbox.cpp    2.33  agulbra  +5 -7
+
+  minor changes; this really need to take the validator into
+  consideration when the user has typed but I can't fix that now.
+
+
+src/widgets/qspinbox.cpp    2.34  agulbra  +18 -3
+src/widgets/qspinbox.h    2.19  agulbra  +3 -1
+
+  handle setEnabled() correctly
+
+
+src/widgets/qsplitter.cpp    1.14  paul  +10 -10
+
+  Fixed off-by-one error
+
+
+src/widgets/qtabbar.h    2.11  agulbra  +2 -1
+
+  one variable wasn't initialized.  initialize it.
+
+
+src/widgets/qtooltip.cpp    2.46  agulbra  +3 -3
+
+  stay up for ten seconds, not four.
+
+
+src/widgets/qvalidator.cpp    2.20  agulbra  +7 -4
+
+  "-" is a valid state for both validator; allows typing of -42 in the
+  natural way if -42 is valid.
+
diff --git a/dist/changes-1.39-19980623 b/dist/changes-1.39-19980623
new file mode 100644
index 0000000000..0a40bf9400
--- /dev/null
+++ b/dist/changes-1.39-19980623
@@ -0,0 +1,545 @@
+doc/annotated.doc    1.5  warwick  +6 -3
+
+  Try new tabled annotated list.
+
+
+doc/tutorial.doc    2.14  agulbra  +4 -4
+
+  new header files
+
+
+examples/application/application.cpp    1.13  warwick  +2 -2
+examples/layout/layout.cpp    1.7  warwick  +2 -2
+examples/network/finger.cpp    1.8  warwick  +2 -2
+examples/pref/pref.cpp    1.21  warwick  +2 -2
+examples/qwerty/qwerty.h    1.9  warwick  +2 -2
+examples/scrollview/scrollview.cpp    1.16  warwick  +2 -2
+examples/widgets/widgets.cpp    2.44  warwick  +2 -2
+src/widgets/qmultilinedit.cpp    2.94  warwick  +2 -2
+
+  Rename fix - "qmultilinedit.h" not "qmultilined.h"
+
+
+examples/application/application.cpp    1.14  agulbra  +32 -18
+
+  use QWhatsThis
+
+
+examples/application/application.cpp    1.15  warwick  +7 -6
+examples/application/application.h    1.5  warwick  +2 -1
+
+  Use persistent QPrinter.
+
+
+examples/dragdrop/.cvsignore    1.1  warwick  initial checkin
+examples/dragdrop/dragdrop.pro    1.1  warwick  initial checkin
+examples/dragdrop/main.cpp    1.6  warwick  +20 -7
+src/qt.pro    2.28  warwick  +3 -3
+
+  upd
+
+
+examples/dragdrop/GNUmakefile    1.1  warwick  initial checkin
+examples/dragdrop/Makefile    1.1  warwick  initial checkin
+examples/dragdrop/main.cpp    1.2  warwick  +2 -1
+
+  Quit.
+
+
+examples/dragdrop/dropsite.cpp    1.1  agulbra  initial checkin
+examples/dragdrop/dropsite.h    1.1  agulbra  initial checkin
+examples/dragdrop/main.cpp    1.1  agulbra  initial checkin
+
+  kind of like simple.c, except not 2000 lines
+
+
+examples/dragdrop/dropsite.cpp    1.2  warwick  +22 -3
+examples/dragdrop/main.cpp    1.3  warwick  +3 -3
+
+  Fixes, more debug options.
+
+
+examples/dragdrop/dropsite.cpp    1.3  warwick  +36 -34
+examples/dragdrop/main.cpp    1.4  warwick  +2 -2
+
+  Better feedback, more examples.
+
+
+examples/dragdrop/dropsite.cpp    1.4  warwick  +5 -3
+
+  Visualize DragLeave events.
+
+
+examples/dragdrop/dropsite.cpp    1.5  warwick  +15 -43
+examples/dragdrop/dropsite.h    1.2  warwick  +1 -7
+examples/dragdrop/main.cpp    1.5  warwick  +2 -10
+
+  Remove format choice - QImageDragObject deals with that.
+
+
+examples/dragdrop/dropsite.cpp    1.6  warwick  +4 -5
+src/kernel/qdragobject.cpp    2.25  warwick  +11 -6
+src/kernel/qdragobject.h    2.12  warwick  +3 -2
+
+  Set MIME format in QStoredDragObject constructor.
+
+
+examples/dragdrop/dropsite.cpp    1.7  warwick  +10 -3
+examples/dragdrop/dropsite.h    1.3  warwick  +2 -1
+
+  Use Event_DragEnter
+
+
+examples/movies/main.cpp    1.12  warwick  +4 -4
+
+  Warnings, robustness.
+
+
+examples/showimg/.cvsignore    2.1  warwick  +5 -0
+
+  Ignore images
+
+
+extensions/nsplugin/examples/Makefile    1.1  warwick  initial checkin
+extensions/xt/doc.conf    1.4  warwick  +1 -1
+
+  Oddsnends
+
+
+extensions/nsplugin/src/qnp.cpp    1.20  warwick  +19 -20
+
+  show() not required now.
+
+
+extensions/nsplugin/src/qnp.pro    1.2  warwick  +1 -1
+
+  tmake workaround
+
+
+src/compat/qmlined.h    1.2  warwick  +1 -1
+
+  edit not ed
+
+
+src/compat/qobjcoll.h    1.1  warwick  initial checkin
+src/compat/qwidcoll.h    1.1  warwick  initial checkin
+src/kernel/qobjcoll.h    2.8  warwick  +1 -1
+src/kernel/qwidcoll.h    2.7  warwick  +1 -1
+
+  Moved.
+
+
+src/dialogs/qfiledialog.cpp    2.72  agulbra  +79 -54
+
+  avoid one more static
+
+
+src/dialogs/qfiledialog.cpp    2.73  agulbra  +3 -3
+
+  use the right column width in multi-column mode
+
+
+src/dialogs/qfiledialog.cpp    2.74  agulbra  +1 -2
+
+  commit -without- debug feature
+
+
+src/dialogs/qfiledialog.cpp    2.75  agulbra  +22 -8
+
+  handle "type name of directory then press enter" case by switching to
+  that directory
+
+
+src/dialogs/qfiledialog.cpp    2.76  agulbra  +10 -7
+
+  minor tweak to make the ok button change less often
+
+
+src/dialogs/qfiledialog.cpp    2.77  agulbra  +2 -2
+
+  slightly better row height in the multi-column view
+
+
+src/kernel/qapp.cpp    2.56  agulbra  +14 -6
+src/kernel/qapplication.cpp    2.56  agulbra  +14 -6
+src/kernel/qasyncimageio.cpp    1.34  agulbra  +53 -15
+src/kernel/qregion.cpp    2.13  agulbra  +1 -8
+src/kernel/qregion.h    2.13  agulbra  +1 -4
+src/widgets/qheader.cpp    2.44  agulbra  +4 -5
+
+  Reginald Stadlbauer's alpha's egcs said to do this.  it doesn't like
+  static objects with non-default constructors.
+
+
+src/kernel/qapplication_win.cpp    2.91  warwick  +10 -1
+src/kernel/qdnd_x11.cpp    2.20  warwick  +1 -7
+src/kernel/qdragobject.h    2.9  warwick  +1 -4
+src/kernel/qwidget.cpp    2.112  warwick  +4 -11
+src/kernel/qwidget_win.cpp    2.57  warwick  +20 -3
+src/kernel/qwidget_x11.cpp    2.97  warwick  +12 -4
+src/kernel/qwindowdefs.h    2.24  warwick  +5 -1
+
+  Drag&dropery.
+
+
+src/kernel/qapplication_win.cpp    2.93  warwick  +4 -2
+src/kernel/qdnd_win.cpp    2.10  warwick  +483 -135
+src/kernel/qdnd_x11.cpp    2.24  warwick  +21 -1
+src/kernel/qdragobject.cpp    2.18  warwick  +5 -5
+src/kernel/qevent.cpp    2.17  warwick  +1 -21
+src/kernel/qimage.cpp    2.93  warwick  +73 -34
+src/kernel/qwidget_win.cpp    2.59  warwick  +4 -3
+
+  Windows Drap & Drop.
+
+
+src/kernel/qasyncimageio.cpp    1.35  agulbra  +2 -2
+
+  make cleanup() static
+
+
+src/kernel/qasyncimageio.cpp    1.37  warwick  +4 -2
+src/kernel/qasyncimageio.cpp    1.36  warwick  +30 -7
+src/kernel/qdragobject.cpp    2.22  warwick  +7 -5
+src/kernel/qimage.cpp    2.96  warwick  +4 -1
+src/kernel/qimage.cpp    2.95  agulbra  +8 -9
+src/kernel/qimage.cpp    2.92  warwick  +3 -3
+src/tools/qdir.cpp    2.24  agulbra  +7 -1
+
+  doc
+
+
+src/kernel/qclipboard_x11.cpp    2.14  agulbra  +26 -20
+
+  avoid statics that are troublesome on the alpha
+
+
+src/kernel/qdialog.cpp    2.20  agulbra  +39 -18
+
+  frameGeometry() is normally not meaningful before show(), so I
+  switched to a different way of ensuring that the dialog's default
+  position is entirely on-screen.  may not work perfectly with
+  Enlightenment :)
+
+
+src/kernel/qdnd_win.cpp    2.11  warwick  +5 -1
+src/kernel/qdnd_x11.cpp    2.25  warwick  +56 -1
+src/kernel/qdragobject.cpp    2.19  warwick  +8 -59
+
+  Move QDragManager::eventFilter code to X11-specifics.
+
+
+src/kernel/qdnd_win.cpp    2.12  warwick  +44 -31
+
+  Follow DnD API changes.
+  Add leave event.
+
+
+src/kernel/qdnd_win.cpp    2.13  warwick  +8 -3
+src/kernel/qevent.h    2.19  warwick  +15 -5
+
+  DragEnter events and final DragLeave to DropEvent targets.
+
+
+src/kernel/qdnd_win.cpp    2.14  warwick  +2 -6
+
+  spacing
+
+
+src/kernel/qdnd_win.cpp    2.7  warwick  +989 -12
+
+  First inclusion from tests/olednd code.
+
+
+src/kernel/qdnd_win.cpp    2.9  warwick  +162 -98
+
+  DND.
+
+
+src/kernel/qdnd_x11.cpp    2.17  warwick  +9 -9
+src/kernel/qpainter.cpp    2.52  warwick  +14 -11
+src/kernel/qwid_x11.cpp    2.95  warwick  +2 -2
+src/kernel/qwidget_x11.cpp    2.95  warwick  +2 -2
+src/widgets/qwellarray.cpp    1.3  warwick  +10 -1
+src/widgets/qwellarray.h    1.4  warwick  +2 -1
+
+  Avoid HPUX warnings.
+
+
+src/kernel/qdnd_x11.cpp    2.19  agulbra  +29 -25
+
+  egcs/alpha workarounds.
+
+
+src/kernel/qdnd_x11.cpp    2.22  agulbra  +2 -2
+src/kernel/qwidget_x11.cpp    2.98  agulbra  +2 -2
+
+  don't segfault on first registerDropType()
+
+
+src/kernel/qdnd_x11.cpp    2.23  paul  +5 -3
+
+  Ignore windows without clients.
+
+
+src/kernel/qdnd_x11.cpp    2.26  warwick  +18 -1
+src/kernel/qdragobject.cpp    2.20  warwick  +1 -16
+
+  Move DND cursor into X11-specifics.
+
+
+src/kernel/qdnd_x11.cpp    2.27  warwick  +16 -10
+src/kernel/qdragobject.cpp    2.23  warwick  +130 -71
+src/kernel/qdragobject.h    2.11  warwick  +14 -25
+
+  Multi-format QDragObject API.
+
+
+src/kernel/qdnd_x11.cpp    2.28  agulbra  +47 -18
+
+  updated to match windows version
+
+
+src/kernel/qdragobject.cpp    2.21  warwick  +99 -14
+src/kernel/qdragobject.h    2.10  warwick  +45 -3
+
+  QImageDragObject
+  Mark out problem areas for fixing.
+
+
+src/kernel/qdragobject.cpp    2.24  agulbra  +2 -2
+src/kernel/qlayout.cpp    2.35  agulbra  +3 -3
+src/kernel/qpixmapcache.cpp    2.8  agulbra  +2 -1
+src/tools/qgcache.cpp    2.7  agulbra  +12 -8
+src/widgets/qpushbutton.cpp    2.43  agulbra  +3 -3
+
+  speling
+
+
+src/kernel/qdragobject.cpp    2.26  warwick  +9 -17
+src/kernel/qdragobject.h    2.13  warwick  +3 -4
+
+  Simplify QStoredDragObject.
+
+
+src/kernel/qevent.h    2.20  agulbra  +9 -3
+
+  added no-answer-necessary rectangle to drag move event
+
+
+src/kernel/qfocusdata.h    2.3  warwick  +11 -3
+src/widgets/qscrollview.cpp    2.48  warwick  +12 -7
+src/widgets/qscrollview.cpp    2.47  warwick  +6 -4
+
+  Focus wrapping.
+
+
+src/kernel/qfont.cpp    2.36  agulbra  +19 -7
+
+  more alpha/egcs/linux workarounds
+
+
+src/kernel/qfont_x11.cpp    2.40  warwick  +3 -3
+
+  Go gray.
+
+
+src/kernel/qimage.cpp    2.94  warwick  +22 -1
+src/kernel/qimage.h    2.28  warwick  +2 -1
+src/kernel/qpixmap.cpp    2.27  warwick  +24 -1
+src/kernel/qpixmap.h    2.21  warwick  +5 -2
+
+  Convenient input from QByteArray.
+
+
+src/kernel/qimage.cpp    2.97  warwick  +2 -2
+src/kernel/qpixmap.cpp    2.28  warwick  +2 -2
+
+  Fix.
+
+
+src/kernel/qmovie.cpp    1.34  warwick  +11 -2
+
+  Code to be added and tested later.
+
+
+src/kernel/qmovie.cpp    1.35  warwick  +5 -9
+src/kernel/qmovie.h    1.11  warwick  +3 -2
+
+  Provide QDataSource source to QMovie.
+
+
+src/kernel/qobjcoll.h    2.7  warwick  +4 -20
+src/kernel/qwidcoll.h    2.6  warwick  +3 -14
+
+  Broken in rename.
+
+
+src/kernel/qprinter_x11.cpp    2.17  agulbra  +4 -3
+
+  roll back to 1.33 version
+
+
+src/kernel/qwidget.cpp    2.113  paul  +3 -2
+
+  Send queued-up childEvents before the first resize event
+
+
+src/kernel/qwidget.h    2.51  warwick  +3 -1
+
+  Separate sys-dep extra data create/delete.
+
+
+src/qt.pro    2.27  warwick  +1 -0
+src/dialogs/qfiledlg.cpp    2.72  warwick  +2 -1
+src/kernel/qapplication_win.cpp    2.92  warwick  +4 -4
+src/kernel/qdnd_win.cpp    2.8  warwick  +115 -505
+src/kernel/qdnd_x11.cpp    2.21  warwick  +2 -2
+src/kernel/qevent.h    2.18  warwick  +2 -2
+src/kernel/qwidget_win.cpp    2.58  warwick  +3 -1
+
+  Drag&Dropery.
+
+
+src/qt.pro    2.29  warwick  +2 -0
+src/kernel/qfocusdata.cpp    2.1  warwick  initial checkin
+src/kernel/qfocusdata.h    2.4  warwick  +6 -12
+src/kernel/qwidget.cpp    2.114  warwick  +3 -1
+src/widgets/qscrollview.cpp    2.49  warwick  +5 -8
+
+  Make QFocusData clean and public.
+
+
+src/tools/qdir.cpp    2.23  agulbra  +2 -2
+
+  avoid a static.   saves some memory.
+
+
+src/tools/qglobal.cpp    2.16  agulbra  +6 -4
+
+  void statics
+
+
+src/widgets/qbutton.cpp    2.62  agulbra  +5 -9
+
+  emit toggled() and clicked() even if this is a toggle button and will
+  not toggle off.
+
+
+src/widgets/qbutton.cpp    2.63  agulbra  +4 -4
+
+  correct toggling-when-in-group behaviour
+
+
+src/widgets/qheader.cpp    2.46  paul  +4 -4
+
+  Fix off by one error that caused "index out of range".
+
+
+src/widgets/qlistview.cpp    2.118  agulbra  +19 -12
+
+  much faster scrolling in unsorted mode; use about half as much memory
+  per item; free the items properly
+
+
+src/widgets/qlistview.cpp    2.119  agulbra  +2 -2
+
+  unsort/sort correctly
+
+
+src/widgets/qlistview.cpp    2.120  agulbra  +3 -3
+
+  finalize QListViewItem in the right way
+
+
+src/widgets/qlistview.cpp    2.121  agulbra  +35 -17
+
+  cut memory usage by another fifty per cent in the common case.  QLVI
+  now uses 150-200 bytes of memory, down from ~800 last week.
+  
+  default to the correct height (including itemMargin()).
+  
+  change itemMargin default to one pixel, from two.
+  
+  use itemMargin both on the left and on the right edge of each column.
+  
+  ensure that children are sorted correctly in QLV::firstChild(), as
+  they are in QLVI::firstChild().
+
+
+src/widgets/qlistview.h    2.51  agulbra  +2 -2
+
+  make setItemMargin() virtual.  who put in a non-virtual setter
+  function?
+
+
+src/widgets/qmenudata.cpp    2.17  agulbra  +8 -6
+
+  DWIM: call setCheckable() in setItemChecked() if necessary
+
+
+src/widgets/qmultilinedit.h    2.37  warwick  +3 -3
+
+  EDIT, not ED.
+
+
+src/widgets/qpopupmenu.cpp    2.79  warwick  +2 -4
+
+  Roll-back my menu-stays-up "fix".
+
+
+src/widgets/qpopupmenu.cpp    2.80  warwick  +7 -2
+
+  Worse but better fix for allow both popup and pulldown/pushup menus.
+
+
+src/widgets/qpushbutton.cpp    2.42  agulbra  +16 -57
+
+  use alternative (windows-like) motif indication of default button
+  status, rather than the nextstep/xforms/gtk-like indication.
+
+
+src/widgets/qsplitter.cpp    1.17  paul  +6 -5
+src/widgets/qsplitter.h    1.9  paul  +3 -2
+
+  Changed QSplitter::setFixed() to start counting at 0 instead of 1.
+  
+  *** WILL BREAK OLD CODE ***
+  
+  Also introduced FirstWidget and SecondWidget enum values to make setFixed()
+  calls more readable.
+
+
+src/widgets/qsplitter.cpp    1.18  paul  +160 -141
+src/widgets/qsplitter.h    1.10  paul  +16 -17
+
+  Reworked QSplitter API. Splitter now detects its children, addFirstWidget etc
+  disappears.
+  *** WILL BREAK OLD CODE ***
+
+
+src/widgets/qtooltip.cpp    2.48  agulbra  +4 -4
+
+  tweak periods a bit
+
+
+src/widgets/qtooltip.cpp    2.49  agulbra  +4 -3
+
+  paranoia fix: don't let buggy programs introduce an infinte loop by
+  calling tip() with the "wrong" rectangle.
+
+
+src/widgets/qwidgetstack.cpp    2.8  agulbra  +4 -1
+src/widgets/qwidgetstack.h    2.5  agulbra  +5 -1
+
+  aboutToShow()
+
+
+src/widgets/qwidgetstack.cpp    2.9  agulbra  +69 -12
+src/widgets/qwidgetstack.h    2.6  agulbra  +4 -2
+
+  added decent docs.
+  added a visibleWidget() access function
+  added an aboutToShow() signal.
+  fixed "value of NaN" bug (0 vs. -1)
+
diff --git a/dist/changes-1.39-19980625 b/dist/changes-1.39-19980625
new file mode 100644
index 0000000000..c71578f251
--- /dev/null
+++ b/dist/changes-1.39-19980625
@@ -0,0 +1,119 @@
+
+examples/application/application.cpp    1.14  agulbra  +32 -18
+
+  use QWhatsThis
+
+
+examples/application/application.cpp    1.15  warwick  +7 -6
+examples/application/application.h    1.5  warwick  +2 -1
+
+  Use persistent QPrinter.
+
+
+examples/dragdrop/dropsite.cpp    1.8  warwick  +44 -24
+
+  Improved usage #1.
+
+
+examples/dragdrop/dropsite.cpp    1.9  warwick  +36 -81
+examples/dragdrop/dropsite.h    1.4  warwick  +7 -9
+src/qt.pro    2.30  warwick  +2 -0
+src/kernel/qclipboard_x11.cpp    2.15  warwick  +10 -8
+src/kernel/qdnd_win.cpp    2.15  warwick  +1 -18
+src/kernel/qdnd_x11.cpp    2.33  warwick  +62 -67
+src/kernel/qdragobject.cpp    2.29  warwick  +73 -27
+src/kernel/qdragobject.h    2.16  warwick  +18 -12
+src/kernel/qdropsite.cpp    2.1  warwick  initial checkin
+src/kernel/qdropsite.h    2.1  warwick  initial checkin
+src/kernel/qwidget.h    2.52  warwick  +3 -2
+src/kernel/qwidget_win.cpp    2.60  warwick  +17 -7
+src/kernel/qwidget_x11.cpp    2.99  warwick  +22 -12
+src/kernel/qwindowdefs.h    2.25  warwick  +7 -3
+src/widgets/qlineedit.cpp    2.85  warwick  +3 -3
+
+  Don't declare MIME types for drop sites in advance, just enable drops.
+
+
+examples/examples.pro    2.9  agulbra  +1 -0
+
+  add dragdrop to examples makefile
+
+
+examples/movies/main.cpp    1.13  agulbra  +9 -2
+
+  add use of setFilters().  
+
+
+examples/splitter/splitter.cpp    1.1  paul  initial checkin
+examples/splitter/splitter.pro    1.1  paul  initial checkin
+
+  Simple QSplitter example
+
+
+src/dialogs/qprintdialog.cpp    2.29  warwick  +57 -60
+
+  Fixed QPrinter->QPrintDialog state-transfer bugs.
+
+
+src/kernel/qapplication_x11.cpp    2.142  agulbra  +7 -12
+src/kernel/qdnd_x11.cpp    2.37  agulbra  +22 -23
+src/kernel/qdragobject.cpp    2.32  agulbra  +5 -25
+src/kernel/qdragobject.h    2.19  agulbra  +1 -4
+
+  Completely reworked drag'n'drop.
+
+
+src/kernel/qimage.cpp    2.99  agulbra  +7 -6
+src/kernel/qimage.cpp    2.98  agulbra  +18 -14
+src/kernel/qmovie.cpp    1.38  agulbra  +8 -7
+src/kernel/qmovie.cpp    1.37  agulbra  +12 -3
+
+  discuss patent issues
+
+
+src/widgets/qlineedit.cpp    2.82  agulbra  +2 -3
+
+  reject drags that don't provide text/plain
+
+
+src/widgets/qlistview.cpp    2.122  warwick  +3 -3
+
+  Fix multiple-calls-to-setText() unreported bug.
+
+
+src/widgets/qlistview.cpp    2.123  paul  +16 -21
+src/widgets/qlistview.h    2.52  paul  +2 -2
+
+  Make setPixmap() override default pixmap
+
+
+src/widgets/qlistview.cpp    2.124  agulbra  +16 -17
+
+  adjust drawing of focus rectangle for trees
+
+
+src/widgets/qlistview.cpp    2.126  agulbra  +1 -2
+src/widgets/qlistview.cpp    2.125  agulbra  +6 -2
+
+  try even harder to not sort unless sorting is actually requested.
+
+
+src/widgets/qmultilinedit.cpp    2.95  agulbra  +4 -4
+
+  doc correction
+
+
+src/widgets/qsplitter.cpp    1.19  paul  +48 -45
+
+  fixing odds and ends after the API change
+
+
+src/widgets/qsplitter.cpp    1.23  warwick  +5 -4
+
+  Position internalsplitter in middle of mouse when dragging.
+
+
+src/widgets/qsplitter.cpp    1.24  warwick  +48 -45
+
+  Make bitmaps correspond to splitter dimensions.
+
diff --git a/dist/changes-1.39-19980706 b/dist/changes-1.39-19980706
new file mode 100644
index 0000000000..80e814a5e6
--- /dev/null
+++ b/dist/changes-1.39-19980706
@@ -0,0 +1,320 @@
+doc/indices.doc    2.17  agulbra  +4 -4
+doc/misc.doc    2.29  agulbra  +4 -4
+doc/qcache.doc    2.4  agulbra  +598 -304
+doc/qdict.doc    2.5  agulbra  +4 -3
+
+  documented QCache/QIntCache and the iterators, fixed some types
+
+
+doc/indices.doc    2.18  agulbra  +7 -7
+extensions/imageio/doc/index.doc    1.6  agulbra  +3 -3
+extensions/nsplugin/doc/annotated.doc    1.2  agulbra  +2 -2
+extensions/nsplugin/doc/classes.doc    1.2  agulbra  +2 -2
+extensions/opengl/src/qgl.cpp    1.20  agulbra  +5 -6
+extensions/xt/doc/annotated.doc    1.2  agulbra  +2 -2
+extensions/xt/doc/classes.doc    1.2  agulbra  +2 -2
+src/tools/qtextstream.cpp    2.16  agulbra  +1 -2
+
+  finished merge of qt/extensions documentation in one directory.
+
+
+doc/indices.doc    2.20  aavit  +3 -3
+doc/qcache.doc    2.8  aavit  +9 -1
+examples/application/application.cpp    1.16  aavit  +17 -17
+examples/widgets/widgets.cpp    2.45  aavit  +29 -5
+extensions/nsplugin/src/qnp.cpp    1.22  aavit  +5 -5
+extensions/opengl/doc.conf    1.14  aavit  +7 -0
+extensions/opengl/src/qgl.cpp    1.23  aavit  +4 -4
+extensions/xt/doc/index.doc    1.4  aavit  +18 -8
+extensions/xt/src/qxt.cpp    1.5  aavit  +3 -3
+src/dialogs/qmessagebox.cpp    2.50  aavit  +5 -5
+
+  Improved doc of extensions.
+
+
+doc/qcache.doc    2.9  aavit  +47 -8
+
+  Documented the remaining functions in qcache et al.
+
+
+examples/dragdrop/dropsite.cpp    1.12  paul  +76 -22
+examples/dragdrop/dropsite.h    1.5  paul  +14 -2
+examples/dragdrop/main.cpp    1.7  paul  +8 -3
+
+  How to make your own dragobject class
+
+
+examples/dragdrop/dropsite.cpp    1.9  warwick  +36 -81
+examples/dragdrop/dropsite.h    1.4  warwick  +7 -9
+src/qt.pro    2.30  warwick  +2 -0
+src/kernel/qclipboard_x11.cpp    2.15  warwick  +10 -8
+src/kernel/qdnd_win.cpp    2.15  warwick  +1 -18
+src/kernel/qdnd_x11.cpp    2.33  warwick  +62 -67
+src/kernel/qdragobject.cpp    2.29  warwick  +73 -27
+src/kernel/qdragobject.h    2.16  warwick  +18 -12
+src/kernel/qdropsite.cpp    2.1  warwick  initial checkin
+src/kernel/qdropsite.h    2.1  warwick  initial checkin
+src/kernel/qwidget.h    2.52  warwick  +3 -2
+src/kernel/qwidget_win.cpp    2.60  warwick  +17 -7
+src/kernel/qwidget_x11.cpp    2.99  warwick  +22 -12
+src/kernel/qwindowdefs.h    2.25  warwick  +7 -3
+src/widgets/qlineedit.cpp    2.85  warwick  +3 -3
+
+  Don't declare MIME types for drop sites in advance, just enable drops.
+
+
+examples/examples.pro    2.10  hanord  +1 -0
+
+  Added splitter
+
+
+examples/examples.pro    2.9  agulbra  +1 -0
+
+  add dragdrop to examples makefile
+
+
+examples/layouts/layouts.cpp    1.6  aavit  +2 -3
+
+  return value from main to avoid compiler warning
+
+
+extensions/nsplugin/src/qnp.cpp    1.21  agulbra  +34 -24
+extensions/opengl/src/qgl.cpp    1.22  agulbra  +7 -1
+extensions/xt/src/qxt.cpp    1.4  agulbra  +6 -2
+
+  use new \extension in qdoc
+
+
+src/dialogs/qprintdialog.cpp    2.30  aavit  +2 -2
+src/widgets/qspinbox.cpp    2.36  aavit  +22 -29
+src/widgets/qspinbox.h    2.21  aavit  +1 -3
+
+  spinbox: better looking in windows mode (more like win32)
+
+
+src/kernel/qapplication_x11.cpp    2.142  agulbra  +7 -12
+src/kernel/qdnd_x11.cpp    2.37  agulbra  +22 -23
+src/kernel/qdragobject.cpp    2.32  agulbra  +5 -25
+src/kernel/qdragobject.h    2.19  agulbra  +1 -4
+
+  protect another little bit against the other application crashing
+
+
+src/kernel/qclipboard_x11.cpp    2.16  agulbra  +2 -2
+
+  avoid double delete in certain cases.  would cause segfault.
+
+
+src/kernel/qdnd_win.cpp    2.16  warwick  +98 -59
+src/kernel/qdropsite.cpp    2.2  warwick  +3 -3
+src/kernel/qwidget_win.cpp    2.61  warwick  +1 -2
+
+  Update for X11 changes.
+
+
+src/kernel/qdnd_win.cpp    2.17  warwick  +22 -5
+src/kernel/qdnd_x11.cpp    2.36  warwick  +5 -3
+src/kernel/qdragobject.cpp    2.30  warwick  +63 -7
+src/kernel/qdragobject.h    2.17  warwick  +10 -3
+
+  Renaming; make space in API for Copy vs. Move
+
+
+src/kernel/qdnd_x11.cpp    2.32  agulbra  +13 -12
+src/kernel/qdnd_x11.cpp    2.31  agulbra  +33 -8
+
+  support accept/ignore rectangles properly.
+
+
+src/kernel/qdnd_x11.cpp    2.34  agulbra  +7 -2
+src/widgets/qlineedit.cpp    2.86  agulbra  +13 -13
+
+  isAccepted() of one drag enter/move is the default state for the next
+  (until the target changes).
+
+
+src/kernel/qdnd_x11.cpp    2.35  warwick  +20 -13
+
+  Fix lost-leaves.
+
+
+src/kernel/qdnd_x11.cpp    2.38  agulbra  +23 -22
+
+  always give the right cursor
+
+
+src/kernel/qdnd_x11.cpp    2.39  hanord  +2 -2
+
+  Patch from Bernd Unger to compile on irix-n64
+
+
+src/kernel/qdnd_x11.cpp    2.40  hanord  +5 -5
+src/widgets/qheader.cpp    2.47  hanord  +5 -5
+src/widgets/qstatusbar.cpp    2.15  hanord  +12 -12
+src/widgets/qtoolbar.cpp    2.24  hanord  +14 -15
+src/widgets/qtoolbutton.cpp    2.29  hanord  +4 -4
+src/widgets/qwellarray.cpp    1.5  hanord  +8 -10
+
+  Removed Sun CC warnings. All these warnings come from use of local
+  variables inside member functions clashing with private variable names
+  in the class. I think this is a correct warning, because if somebody
+  wants to access a private variable from a member function where it's
+  already used as a local variable, he will be somewhat confused.
+
+
+src/kernel/qdragobject.cpp    2.34  hanord  +3 -2
+
+  Avoid array-bounds error when copying text
+
+
+src/kernel/qdragobject.cpp    2.35  hanord  +15 -18
+src/kernel/qdragobject.h    2.20  hanord  +7 -7
+
+  QStoredDrag::setEncodedData takes a const byte array.
+  parent changed to dragSource everywhere.
+
+
+src/kernel/qimage.cpp    2.102  agulbra  +9 -5
+src/kernel/qpixmap.cpp    2.31  agulbra  +22 -32
+
+  mention the QPixmap/QImage differences prominently.  other minor doc
+  changes.
+
+
+src/kernel/qimage.cpp    2.99  agulbra  +7 -6
+src/kernel/qimage.cpp    2.98  agulbra  +18 -14
+src/kernel/qmovie.cpp    1.38  agulbra  +8 -7
+src/kernel/qmovie.cpp    1.37  agulbra  +12 -3
+
+  warn about unisys $#@! and about possible removal of gif support in a
+  future version of qt.
+
+
+src/kernel/qpainter_win.cpp    2.38  hanord  +2 -3
+src/kernel/qpainter_x11.cpp    2.53  hanord  +2 -3
+
+  Fixed UMR in drawText to external device. Could be serious and crash.
+
+
+src/kernel/qprinter_x11.cpp    2.18  agulbra  +38 -11
+
+  OS/2 fixes from miyata.
+
+
+src/kernel/qpsprinter.cpp    2.28  agulbra  +67 -19
+
+  oops.  we broke kmail by not supporting QFont::AnyCharSet at all.
+  fixed.
+  
+  also contains two other fixes that I'd delayed committing: use
+  colorimage only where available, else image.  produce 78-character
+  lines, not lines of several thousand characters.
+
+
+src/kernel/qpsprinter.cpp    2.29  agulbra  +49 -28
+
+  make the dicts slightly bigger so more level 1 printers are happy.
+  avoid a memory leak in drawPixmap().
+
+
+src/kernel/qwidget.cpp    2.116  hanord  +2 -2
+
+  Does destroy() AFTER deleteExtra(), because deleteExtra() calls
+  deleteSysExtra() which unregisters OLE stuff on Windows (and needs the Win
+  ID).
+
+
+src/moc/moc.1    2.7  hanord  +11 -3
+src/moc/moc.l    2.3  hanord  +57 -7
+src/moc/moc.y    2.24  hanord  +22 -12
+
+  Warwick's support for #ifdef and #ifndef added
+
+
+src/qt.pro    2.33  hanord  +8 -7
+
+  Changed DEPENDPATH to relative, makes makefiles movable.
+  Sorted a couple of filenames.
+
+
+src/qt.pro    2.34  hanord  +1 -1
+
+  Changed version number to 1.40
+
+
+src/tools/qglobal.h    2.53  agulbra  +3 -3
+
+  1.40.  yes it's true.
+
+
+src/tools/qglobal.h    2.55  agulbra  +3 -3
+
+  make one final snapshot
+
+
+src/widgets/qbuttongroup.cpp    2.14  agulbra  +3 -3
+
+  roll back my "don't delete twice" fix: it was a "don't delete once"
+  fix, in fact.  oops.
+
+
+src/widgets/qheader.cpp    2.49  agulbra  +2 -1
+
+  memory leak gone
+
+
+src/widgets/qlabel.cpp    2.34  agulbra  +6 -9
+
+  respect buddy's focus policy and other accessibility.
+
+
+src/widgets/qlineedit.cpp    2.83  agulbra  +4 -4
+
+  use enter event and accept drops in the entire rectangle.
+
+
+src/widgets/qlineedit.cpp    2.84  agulbra  +8 -1
+
+  ...and the drop should happen in the right place.  oooh, this is so
+  polished :)
+
+
+src/widgets/qlineedit.cpp    2.88  agulbra  +2 -2
+
+  avoid memory leak when dragging out of qle
+
+
+src/widgets/qlineedit.cpp    2.89  agulbra  +5 -1
+
+  #ifdef out dnd support.  it works on x11, not quite on windows.
+  besides, having QLineEdit work differently from typical windows
+  widgets and cannot be changed is a bad policy.
+
+
+src/widgets/qlistview.cpp    2.129  agulbra  +3 -2
+
+  don't accept() enter/return key presses.  qdialog.
+
+
+src/widgets/qlistview.cpp    2.130  agulbra  +8 -9
+
+  avoid a couple of memory leaks
+
+
+src/widgets/qprogressbar.cpp    2.21  aavit  +10 -1
+src/widgets/qtableview.cpp    2.51  aavit  +2 -2
+
+  Progressbar: allow changing of guistyle before show(). Should really
+  implement styleChanged(); in 2.0.
+  Tableview: Avoid infinite loop.
+
+
+src/widgets/qspinbox.cpp    2.38  aavit  +2 -2
+src/widgets/qwidgetstack.cpp    2.11  aavit  +13 -9
+
+  Widgetstack: be robust when got no children. spinbox: comment
+
+
+src/widgets/qsplitter.cpp    1.24  warwick  +48 -45
+
+  Make bitmaps correspond to splitter dimensions.
diff --git a/dist/changes-1.40 b/dist/changes-1.40
new file mode 100644
index 0000000000..1f5f98675e
--- /dev/null
+++ b/dist/changes-1.40
@@ -0,0 +1,291 @@
+Here is a list of user-visible changes in Qt from 1.33 to 1.40.  
+
+Qt 1.40 supports drag and drop, with a simple, platform independent
+API. There are eleven new widget classes in 1.40. Asynchronous I/O
+support is now in the official Qt API.
+
+Since Qt no longer supports any platforms that only supports 8.3
+format file names, the file names of the Qt source and include files
+have been made simpler.  #include <qcombobox.h> instead of qcombo.h,
+etc.  The old names are still present for compatibility.
+
+The new Qt Xt/Motif Extension allows Qt widgets and applications to
+coexist with old Xt/Motif-based applications and widgets.
+
+There are more than one hundred new functions added to existing
+classes and, as usual, we fixed some bugs, made some more speedups,
+and improved the documentation.
+
+
+****************************************************************************
+* 			     New classes				   *
+****************************************************************************
+
+* New widgets
+
+  QHeader	- Table header
+  QListView	- Multicolun listview/treeview
+  QMainWindow	- Application main window
+  QScrollView	- Scrolling area (successor of QwViewPort)
+  QSpinBox	- Spin button 
+  QSplitter	- Paned window
+  QStatusBar	- Status bar
+  QToolBar	- Container for tool buttons (and other widgets)
+  QToolButton	- Fancy push button with auto-raise
+  QWhatsThis	- Light weight help system
+  QWidgetStack	- Stack of widgets
+
+* Support classes
+
+  QFileIconProvider	- Provides icons for the file dialog
+  QIconSet		- Set of icons for different states
+  QListViewItem		- Content of a QListView 
+  QCheckListItem	- Checkable list view item
+
+* Drag and drop related classes
+  
+  QDragObject
+  QStoredDrag
+  QTextDrag
+  QImageDrag
+  QDragManager
+  QDropSite
+
+* Asynchronous I/O
+
+  QAsyncIO
+  QDataPump
+  QDataSink
+  QDataSource
+  QDataStream
+  QIODeviceSource
+  QImageConsumer
+  QImageDecoder
+  QImageFormat
+  QImageFormatType
+
+
+* New Events
+ 
+  QShowEvent 
+  QHideEvent 
+  QDragMoveEvent 
+  QDragEnterEvent
+  QDragResponseEvent 
+  QDragLeaveEvent 
+  QDropEvent 
+  QChildEvent 
+
+
+
+****************************************************************************
+*		       Enhancements from 1.33 to 1.40			   *
+****************************************************************************
+
+The file and print dialogs are far better.
+
+Layouts will now automatically readjust if child widgets change 
+maximum/minimum sizes, or are deleted.
+
+QFont now supports KOI8R
+
+The reference documentation of the extensions is now integrated with
+the main reference documentation in the qt/html directory.
+
+****************************************************************************
+*               Changes that might affect runtime behavior                 *
+****************************************************************************
+
+None known.
+ 
+
+****************************************************************************
+*               Changes that might generate compile errors                 *
+*                        when compiling old code                           *
+****************************************************************************
+
+none
+
+****************************************************************************
+*               Type changes that might generate warnings:                 *
+****************************************************************************
+
+none
+
+****************************************************************************
+* 			Deprecated functions				   *
+****************************************************************************
+Old function:			Replaced by:
+-------------			-----------
+QPixmap::isOptimized		QPixmap::optimization
+QPixmap::optimize		QPixmap::setOptimization
+QPixmap::isGloballyOptimized    QPixmap::defaultOptimization
+QPixmap::optimizeGlobally	QPixmap::setDefaultOptimization
+
+
+****************************************************************************
+*      New global functions
+****************************************************************************
+
+ bitBlt( QImage* dst, int dx, int dy, const QImage* src,
+         int, int, int, int, int conversion_flags );
+
+ bitBlt( QPaintDevice *dst, int, int, const QImage* src,
+	 int, int, int, int, int conversion_flags );
+
+****************************************************************************
+*      New public/protected functions added to existing classes            *
+****************************************************************************
+
+QApplication::sendPostedEvents( QObject *receiver, int event_type ) [static]
+
+QButton::setDown()
+QButton::toggle()
+ 
+QButtonGroup::setButton( int id )
+QButtonGroup::buttonToggled( bool on )
+ 
+QComboBox::setListBox( QListBox * )
+QComboBox::listBox() 
+
+QComboBox::setAutoCompletion( bool )
+QComboBox::autoCompletion() 
+
+QComboBox::clearEdit()
+QComboBox::setEditText( const char * )
+
+QDict::resize()
+
+QDir::drives() [static]
+QDir::remove()
+
+QFileDialog::getExistingDirectory() [static]
+QFileDialog::setIconProvider() [static]
+QFileDialog::iconProvider() [static]
+QFileDialog::setSelection( const char* )
+QFileDialog::setMode( Mode )
+QFileDialog::mode() 
+QFileDialog::setFilter( const char * )
+QFileDialog::setFilters( const char ** )
+QFileDialog::setFilters( const QStrList & )
+QFileDialog::addWidgets( QLabel *, QWidget *, QPushButton * ) [protected]
+
+QFont::isCopyOf( const QFont & ) 
+
+QFontMetrics::minLeftBearing() 
+QFontMetrics::minRightBearing() 
+QFontMetrics::inFont(char)	
+QFontMetrics::leftBearing(char) 
+QFontMetrics::rightBearing(char) 
+QFontMetrics::boundingRect( int x, int y, int w, int h, int flags,
+      			    const char *str, int, int, int *, char ** ) 
+QFontMetrics::size( int flags, char *str, int, int, int *, char ** ) 
+
+QFrame::margin()
+QFrame::setMargin( int )
+
+QGManager::unFreeze()
+QGManager::remove( QWidget *w )
+QGManager::setName( QChain *, const char * )
+
+QGridLayout::numRows()
+QGridLayout::numCols()
+QGridLayout::expand( int rows, int cols )
+
+
+QImage::copy(int x, int y, int w, int h, int conversion_flags=0) 
+QImage::copy(QRect&)	
+QImage::allGray() 
+QImage::isGrayscale() 
+QImage::convertDepthWithPalette( int, QRgb* p, int pc, int cf=0 ) 
+QImage::smoothScale(int width, int height) 
+QImage::loadFromData( QByteArray data, const char *format=0 )
+
+QIntDict::resize()
+
+QLabel::clear()
+ 
+QLCDNumber::sizeHint() const
+
+QLineEdit::setEnabled( bool )
+QLineEdit::setFont( const QFont & )
+QLineEdit::setSelection( int, int )
+QLineEdit::setCursorPosition( int )
+QLineEdit::cursorPosition() const
+QLineEdit::validateAndSet( const char *, int, int, int )
+QLineEdit::insert( const char * )
+QLineEdit::clear()
+QLineEdit::repaintArea( int, int ) [protected]
+ 
+QListBox::setFixedVisibleLines( int lines )
+QListBox::sizeHint()
+QListBox::ensureCurrentVisible( int )
+
+QMenuData::insertItem( const char *text,
+		       const QObject *receiver, const char *member,
+		       int accel, int id, int index = -1 )
+QMenuData::insertItem( const QPixmap &pixmap,
+    		       const QObject *receiver, const char *member,
+    		       int accel, int id, int index = -1 )
+QMenuData::insertItem( const QPixmap &pixmap, const char *text,
+    		       const QObject *receiver, const char *member,
+    		       int accel, int id, int index = -1 )
+QMenuData::findItem( int id, QMenuData ** parent )
+
+ 
+QMovie::QMovie(QDataSource*, int bufsize=1024)
+ 
+QMultiLineEdit::setFixedVisibleLines( int lines )
+
+QObject::tr( const char * ) 
+QObject::name( const char * defaultName )
+
+QPainter::QPainter( const QPaintDevice *, const QWidget * )
+QPainter::begin( const QPaintDevice *, const QWidget * )
+QPainter::xForm( const QPointArray &, int index, int npoints )
+QPainter::xFormDev( const QPointArray &, int index, int npoints )
+QPainter::drawImage()
+QPainter::drawTiledPixmap()
+QPainter::drawPicture( const QPicture & )
+ 
+QPalette::isCopyOf( const QPalette & )
+
+QPixmap::loadFromData( QByteArray data,
+		      const char *,
+		      int )
+QPixmap::optimization()
+QPixmap::setOptimization( Optimization )
+QPixmap::defaultOptimization()
+QPixmap::setDefaultOptimization( Optimization )
+
+QPopupMenu::exec( const QPoint &, int )
+QPopupMenu::aboutToShow()
+
+QPrinter::setPageOrder( PageOrder )
+QPrinter::pageOrder() 
+QPrinter::setColorMode( ColorMode )
+QPrinter::colorMode() 
+
+QPtrDict::resize()
+ 
+QPushButton::setIsMenuButton( bool )
+QPushButton::isMenuButton()
+
+QRegion::QRegion( int x, int y, int w, int h, RegionType = Rectangle )
+QRegion::boundingRect() 
+QRegion::rects()
+ 
+QSize::expandedTo()
+QSize::boundedTo()
+
+QWidget::isEnabledTo(QWidget*) 
+QWidget::isEnabledToTLW() 
+QWidget::fontPropagation() 
+QWidget::setFontPropagation( PropagationMode )
+QWidget::palettePropagation() 
+QWidget::setPalettePropagation( PropagationMode )
+QWidget::isVisibleTo(QWidget*) 
+QWidget::setAcceptDrops( bool on )
+QWidget::acceptDrops()
+QWidget::focusData() [protected]
+
diff --git a/dist/changes-1.41 b/dist/changes-1.41
new file mode 100644
index 0000000000..31ccc55e9e
--- /dev/null
+++ b/dist/changes-1.41
@@ -0,0 +1,76 @@
+Here is a list of user-visible changes in Qt from 1.40 to 1.41
+
+QT is now available as a DLL on Windows.
+
+Many bugfixes have been added.  The Windows keys are supported on X11,
+and the file dialog has been improved a little.
+
+Drag and drop has been considerably improved, both on Windows and X11.
+
+QPrinter now knows many more paper sizes.
+
+It now possible to create masked (nonrectangular) widgets.
+
+QScrollBar now supports insanely big ranges.
+
+QSlider now supports page step as well as line step.
+
+****************************************************************************
+* 			     New classes				   *
+****************************************************************************
+
+None.
+
+****************************************************************************
+*		       Enhancements from 1.33 to 1.40			   *
+****************************************************************************
+
+
+****************************************************************************
+*               Changes that might affect runtime behavior                 *
+****************************************************************************
+
+None.
+ 
+
+****************************************************************************
+*               Changes that might generate compile errors                 *
+*                        when compiling old code                           *
+****************************************************************************
+
+None
+
+****************************************************************************
+*               Type changes that might generate warnings:                 *
+****************************************************************************
+
+None
+
+****************************************************************************
+* 			Deprecated functions				   *
+****************************************************************************
+
+None.
+
+
+****************************************************************************
+*			 New global functions				   *
+****************************************************************************
+
+None.
+
+****************************************************************************
+*      New public/protected functions added to existing classes            *
+****************************************************************************
+
+QFileDialog::getOpenFileNames()
+QProgressDialog::setMinimumDuration( int )
+QProgressDialog::minimumDuration() const
+QMouseEvent::globalPos() const
+QMouseEvent::globalX() const
+QMouseEvent::globalY() const
+QFont::rawName() const
+QWidget::setMask(const QRegion& region)
+QWidget::setMask(QBitmap bitmap)
+QWidget::clearMask()
+QListView/QListViewItem: Various functions to create children in specified order
diff --git a/dist/changes-1.42 b/dist/changes-1.42
new file mode 100644
index 0000000000..7e47a53691
--- /dev/null
+++ b/dist/changes-1.42
@@ -0,0 +1,71 @@
+Here is a list of user-visible changes in Qt from 1.41 to 1.42.  The
+usual bugfixes have been added.
+
+****************************************************************************
+* 			     New classes				   *
+****************************************************************************
+
+None.
+
+****************************************************************************
+*		       Enhancements from 1.41 to 1.42			   *
+****************************************************************************
+
+The Windows version now builds as a DLL.
+
+The file dialog has various UI tweaks.
+
+More sanity checks have been added.
+
+On X11, the postscript output from a few programs will be much smaller
+than it used to be.
+
+Windows 98 is now treated as a separate version of Windows, like NT
+and Windows 95.
+
+The keyboard interface of buttons groups/dialogs has been improved.
+
+QMultiLineEdit avoids flicker in some cicumstances where it would
+flicker up to now.
+
+****************************************************************************
+*               Changes that might affect runtime behavior                 *
+****************************************************************************
+
+QKeyEvent now behaves as documented: isAccepted() is TRUE by default
+where it would sometimes default to FALSE.  Some dialogs may depend on
+the bug.  The most likely symptom of such buggy dialogs is that the
+Enter/Return key does not work, and the most likely fix for such bugs
+is to insert "e->ignore();" at the start of keyPressEvent(QKeyEvent*e)
+in such dialogs.
+
+****************************************************************************
+*               Changes that might generate compile errors                 *
+*                        when compiling old code                           *
+****************************************************************************
+
+None
+
+****************************************************************************
+*               Type changes that might generate warnings:                 *
+****************************************************************************
+
+None
+
+****************************************************************************
+* 			Deprecated functions				   *
+****************************************************************************
+
+None.
+
+
+****************************************************************************
+*			 New global functions				   *
+****************************************************************************
+
+None.
+
+****************************************************************************
+*      New public/protected functions added to existing classes            *
+****************************************************************************
+
diff --git a/dist/changes-2.0.1 b/dist/changes-2.0.1
new file mode 100644
index 0000000000..4a224bfe76
--- /dev/null
+++ b/dist/changes-2.0.1
@@ -0,0 +1,101 @@
+Changes in Qt 2.0.1
+-------------------
+
+Qt 2.0.1 is a bugfix release, forward and backward compatible with Qt 2.0.
+While all changes are behind the API, some bugfixes may cause differences
+in runtime behaviour - such fixes are marked in yellow with a "*".
+
+
+General improvements
+--------------------
+
+PNG/IO Fix crash on empty images.
+
+QAccel Fix accelerators using Shift with other metakeys.
+
+QFileInfo Fix for AIX/gcc.
+
+QFontDatabase Fix centered text for extreme-bearing fonts.
+
+QHeader Resizing cells of horizontal header is now more flicker-free.
+
+*QLayout Fix deletion of child layouts.  Let minimumSize() override
+Fixed sizePolicy().
+
+QLcdNumber Reduced flicker.
+
+QLineEdit Home etc. now clear selection even if the cursor doesn't move.
+
+QListBox Draw focus rect correctly.  Fix keyboard navigation.
+
+QListView Make resizing flicker-free.  No selection on release.
+
+QMainWindow Fix crash in addToolBar().
+
+QMap Work on more compilers.
+
+QMenuBar Less flicker.
+
+QPainter Fix QFontMetrics::width(QChar).  Speedup drawText/boundingRect.
+
+*QScrollView Put the scrollbars inside the frame in WindowsStyle.
+
+QSplitter Fix bug where a handle could be moved past the next.
+
+QString Fix QString::replace(QRegExp(),...).  Speed ups.  Fix fill()
+with zero length crash.
+
+QTL AIX fixes.
+
+QTextBrowser Fixed type=detail popup.
+
+*QTextCodec Use the defacto KOI8 standard if no charset specified for
+ru_ locale.
+
+QValueList AIX, aCC fixes.
+
+msg2qm More robust.
+
+
+
+Windows-specific fixes
+----------------------
+
+QApplication Fix Key_Enter (was always Key_Return). Fix numeric
+accelerators.
+
+QFontDatabase Fix italic fonts in Window font dialog.
+
+*QMime Use CRLF with text clip/dnd on Windows.
+
+QPainter Avoid failure when painting pixmap xformed into nothing.
+Improved drawing of scaled fonts on win95/98.
+
+*QPixmap Fix mask on QPixmap::convertToImage().
+
+QPrinter Fix setup() on Win95/98.
+
+QToolTip Use system settings for tool tips on Windows.
+
+*QWidget Fix QWidget::scroll(rect) for non-topleft rectangles.
+
+
+X11-specific fixes
+------------------
+
+DnD Fix Escape during DnD.
+
+*QApplication Generate MouseMove event on XCrossingEvent.  Support more
+XIM servers (eg. VJE Delta).  Use 11pt font as default rather than 12pt
+on larger than 95DPI displays.
+
+*QFont Correct DPI for fontsets (as for regular fonts).  Prefer unscaled
+(ie. perfect-match bitmaps) over scaled fonts.
+
+*QPaintDevice Round DPI.
+
+QWidget QWidget::showMaximized() works on X11 now. Fixed ReparentNotify
+handling.
+
+Xt extension Fixes.
+
diff --git a/dist/changes-2.00 b/dist/changes-2.00
new file mode 100644
index 0000000000..1dcfea7933
--- /dev/null
+++ b/dist/changes-2.00
@@ -0,0 +1,151 @@
+Qt 2.0 introduces a wide range of major new features as well as
+substantial improvements over the 1.x series.  The documentation has
+been significally extended and improved.
+
+This file will only give an overview of the main changes since version
+1.44.  A complete list would simply be too large to be useful.  For
+more detail see the online documentation which is included in this
+distribution, and also available on http://doc.trolltech.com/
+
+The Qt version 2.x series is not binary compatible with the 1.x
+series.  This means programs compiled with Qt version 1.x must be
+recompiled to work with Qt 2.0.
+
+Qt 2.0 is mostly, but not completely, source compatible with Qt 1.x.
+See the document "Porting from Qt 1.x to Qt 2.0" in the Online
+Reference Documentation for information on how to port an existing Qt
+1.x-based program to Qt 2.0.  Note in particular the automatic porting
+script included - it does a lot of the work for you.
+
+As for 1.x, the API and functionality of Qt is completely portable
+between Microsoft Windows and X11.  And between Windows 95, 98 and NT:
+Unlike most toolkits, Qt lets a single executable work on all three.
+
+****************************************************************************
+* 			   New major features				   *
+****************************************************************************
+
+
+* Support for international software development:
+    QTranslator and the QObject::tr() function
+    QTextCodec (and subclasses)
+    QString is now a 16-bit Unicode string with good support for
+	legacy 8-bit interoperation. (The old 8-bit string class
+	from Qt 1.x has been renamed to QCString.)
+    QChar - a Unicode character
+
+* Rich Text
+    QTextView - formatted text and images
+    QTextBrowser - navigate formatted text and images
+    QStyleSheet - define your own XML formatting tags
+    QSimpleRichText - display rich text anywhere
+
+* Convenient and powerful new collection classes:
+    QMap<Key,Type> - QDict with arbitrary keys
+    QValueList<Type> - QList of types other than pointers
+    QStringList - QValueList<QString> with helper functions
+
+* Dialogs
+    QColorDialog - user picks a color
+    QFontDialog - user picks a font
+    QWizard - framework for leading users through steps
+
+* Layout
+    QGrid/QHBox/QVBox - grid and boxes of widgets automatically assembled
+    QHGroupBox/QVGroupBox - easy framed groups of widgets
+    QSizePolicy - a widget's abilities to change size in different ways
+
+* Custom layouts
+    New, much simpler and more powerful API for creating custom layouts
+
+* PNG Support
+    PNG support is now included in the core library
+
+* Support for generalized configurable GUI styles:
+    QStyle and subclasses
+
+* Session management
+    QSessionManager - saving state when the system shuts down
+
+* Extended coordinate system
+    QPoint, QPointArray, QSize and QRect now have 32-bit coordinates
+
+* Cleaner namespace
+    Global functions, enums and macros now either start with a 'q' or
+    have been moved into the new namespace class "Qt"
+
+****************************************************************************
+* 			     List of removed classes			   *
+****************************************************************************
+
+* QGManager
+    Use the new custom layout API.
+
+* QPointVal, QPointData
+    Use QPoint.
+
+* QUrlDrag
+    Changed to QUriDrag
+
+* QWindow
+    Use QWidget
+
+****************************************************************************
+* 			     List of new classes			   *
+****************************************************************************
+
+* QCDEStyle
+* QChar
+* QColorDialog
+* QCommonStyle
+* QConstString
+* QCString
+* QDragEnterEvent
+* QDragLeaveEvent
+* QDropSite
+* QFontDialog
+* QGLayoutIterator
+* QGrid
+* QHBox
+* QHButtonGroup
+* QHGroupBox
+* QHideEvent
+* QLayoutItem
+* QLayoutIterator
+* QMimeSource
+* QMimeSourceFactory
+* QMotifStyle
+* QPlatinumStyle
+* QSessionManager
+* QShowEvent
+* QSimpleRichText
+* QSizeGrip
+* QSizePolicy
+* QSortedList
+* QSpacerItem
+* QStringList
+* QStyle
+* QStyleSheet
+* QStyleSheetItem
+* Qt
+* QTab
+* QTabWidget
+* QTextBrowser
+* QTextCodec
+* QTextDecoder
+* QTextEncoder
+* QTextIStream
+* QTextOStream
+* QTextView
+* QTranslator
+* QUriDrag
+* QVBox
+* QVButtonGroup
+* QVGroupBox
+* QWheelEvent
+* QWidgetItem
+* QWindowsStyle
+* QWizard
+
+For details, see e.g http://doc.trolltech.com/qcdestyle.html (or any
+other class name, lowercased).
diff --git a/dist/changes-2.00beta1 b/dist/changes-2.00beta1
new file mode 100644
index 0000000000..5dccbad577
--- /dev/null
+++ b/dist/changes-2.00beta1
@@ -0,0 +1,61 @@
+
+The Qt version 2.x series is not binary compatible with the 1.x
+series. This means programs compiled with Qt version 1.x must be
+recompiled to work with Qt 2.0.
+
+Qt 2.0 is mostly, but not completely, source compatible with Qt 1.x.
+See the document "Porting from Qt 1.x to Qt 2.0" in the Online
+Reference Documentation for information on how to port an existing
+Qt 1.x-based program to Qt 2.0.
+
+
+****************************************************************************
+* 			     New classes				   *
+****************************************************************************
+
+
+* Support for generalized configrable styles:
+
+    QStyle and subclasses
+
+* Support for international software development:
+
+    QTranslator and the QObject::tr() function
+    QTextCodec (and subclasses)
+    QString - a Unicode string
+    QChar - a Unicode character
+
+* Convenient and powerful new collection classes:
+    QMap<Key,Type> - QDict with arbitrary keys
+    QValueList<Type> - QList of types other than pointers
+    QStringList - QValueList<QString> with helper functions
+
+* Dialogs
+    QColorDialog - user picks a color
+    QFontDialog - user picks a font
+    QWizard - framework for leading users through steps
+
+* Layout
+    QGrid/QHBox/QVBox - grid and boxes of widgets automatically assembled
+    QHGroupBox/QVGroupBox - easy framed groups of widgets
+
+* PNG Support
+    PNG support is always compiled into Qt
+
+* Rich Text
+    QTextView - formatted text and images
+    QTextBrowser - navigate formatted text and images
+    QStyleSheet - define your own XML formatting tags
+    QSimpleRichText - display rixh text anywhere
+
+* Session management
+    QSessionManager - safe state when system shuts down
+
+
+****************************************************************************
+* 	              Major changes in existing classes			   *
+****************************************************************************
+
+QString is now 16-bit Unicode. 
+
+QPoint, QPointArray, QSize and QRect now have 32-bit coordinates.
\ No newline at end of file
diff --git a/dist/changes-2.00beta2 b/dist/changes-2.00beta2
new file mode 100644
index 0000000000..943c3685cf
--- /dev/null
+++ b/dist/changes-2.00beta2
@@ -0,0 +1,85 @@
+Qt 2.0 Beta2 is not binary compatible with Beta1, this means that any
+programs linked with Beta1 must be recompiled.
+
+The most important fixes since Beta 1:
+
+configure
+	Fixed the libzlib typo.
+	Added -lflags argument.
+
+Platforms
+	Fixes for Borland C++, Solaris and AIX
+
+QFileDialog
+	Several user interface improvements
+
+QPrinter
+	Plain text printing works again.
+	Multiple page printing fixed.
+
+QWidget
+	New widget flag WStyle_Dialog
+
+
+Major changes since 1.4x:
+
+The Qt version 2.x series is not binary compatible with the 1.x
+series. This means programs compiled with Qt version 1.x must be
+recompiled to work with Qt 2.0.
+
+Qt 2.0 is mostly, but not completely, source compatible with Qt 1.x.
+See the document "Porting from Qt 1.x to Qt 2.0" in the Online
+Reference Documentation for information on how to port an existing
+Qt 1.x-based program to Qt 2.0.
+
+
+****************************************************************************
+* 			     New classes				   *
+****************************************************************************
+
+
+* Support for generalized configrable styles:
+
+    QStyle and subclasses
+
+* Support for international software development:
+
+    QTranslator and the QObject::tr() function
+    QTextCodec (and subclasses)
+    QString - a Unicode string
+    QChar - a Unicode character
+
+* Convenient and powerful new collection classes:
+    QMap<Key,Type> - QDict with arbitrary keys
+    QValueList<Type> - QList of types other than pointers
+    QStringList - QValueList<QString> with helper functions
+
+* Dialogs
+    QColorDialog - user picks a color
+    QFontDialog - user picks a font
+    QWizard - framework for leading users through steps
+
+* Layout
+    QGrid/QHBox/QVBox - grid and boxes of widgets automatically assembled
+    QHGroupBox/QVGroupBox - easy framed groups of widgets
+
+* PNG Support
+    PNG support is always compiled into Qt
+
+* Rich Text
+    QTextView - formatted text and images
+    QTextBrowser - navigate formatted text and images
+    QStyleSheet - define your own XML formatting tags
+    QSimpleRichText - display rixh text anywhere
+
+* Session management
+    QSessionManager - safe state when system shuts down
+
+
+****************************************************************************
+* 	              Major changes in existing classes			   *
+****************************************************************************
+
+QString is now 16-bit Unicode. 
+
+QPoint, QPointArray, QSize and QRect now have 32-bit coordinates.
\ No newline at end of file
diff --git a/dist/changes-2.00beta3 b/dist/changes-2.00beta3
new file mode 100644
index 0000000000..08f222aac3
--- /dev/null
+++ b/dist/changes-2.00beta3
@@ -0,0 +1,35 @@
+Qt 2.0 Beta3 is not binary compatible with Beta2, this means that any
+programs linked with Beta2 must be recompiled.
+
+The most important fixes since Beta 2:
+
+platforms
+	64-bits, FreeBSD and gcc 2.7 fixes
+
+QLayoutIterator/QGLayoutIterator
+	The custom layout API has been changed: void removeCurrent()
+	has been replaced by QLayoutItem* takeCurrent().
+
+QLabel
+	The functions setMargin() and margin() have been renamed to
+	setIndent() and indent, to avoid collision with QFrame::setMargin().
+
+QAccel
+	Non-latin1 accelerators are now supported.
+
+QTranslator/findtr/msg2qm/mergetr
+	All reported bugs fixed and improvements made.
+
+Rich Text
+	Many improvements and fixes such as supressed warnings in the 
+	QBrowser example. Support for logical font sizes.
+
+QApplication
+	lastWindowClosed() now works with virtual desktops. Desktop settings
+	on Windows improved.
+
+QScrollView / QMultiLineEdit
+	Speedups with a new widget flag: WNorthWestGravity.
+
+QPopupMenu / QMenuBar
+	Speedups, less flicker.
diff --git a/dist/changes-2.1.0 b/dist/changes-2.1.0
new file mode 100644
index 0000000000..a0794cf86f
--- /dev/null
+++ b/dist/changes-2.1.0
@@ -0,0 +1,314 @@
+Qt 2.1 introduces new features as well as many improvements over the
+2.0.x series. This file will only give an overview of the main changes
+since version 2.0.2.  A complete list would simply be too large to be
+useful.  For more detail see the online documentation which is included
+in this distribution, and also available on
+http://doc.trolltech.com/
+
+The Qt version 2.1 series is binary compatible with the 2.0.x
+series - applications compiled for 2.0 will continue to run with 2.1.
+
+As with previous Qt releases, the API and functionality of Qt is
+completely portable between Microsoft Windows and X11.  It is also portable
+between Windows 95, 98 and NT; unlike most toolkits, Qt lets a single
+executable work on all three.
+
+****************************************************************************
+*			    Overview					   *
+****************************************************************************
+
+As usual, large sections of the documentation have been revised and
+lots of new documentation has been added.
+
+Much work went into existing classes, based on all the feedback we got
+from our users. A warm thank you to you all at this point, we honestly
+hope to satisfy most of your wishes with the new release.
+
+Among the things that got a lot of polishing is the new geometry
+management system that was introduced with the 2.x series. Some
+classes, such as QBoxLayout, have been rewritten and many size hints
+and size policies were optimized. As usual with newly introduced
+systems, the occasional bug has been fixed as well. As a result,
+layout in Qt-2.1 is not only nicer but also faster.
+
+Big parts of the file dialog have been rewritten. It is now
+synchronized in terms of features with the common Windows dialog,
+including fancy drag'n'drop and in-place renaming. You can customize
+both parts of the dialog, the front-end with info and preview widgets,
+the back-end with different network protocols (see the QFileDialog and
+QNetworkProtocol documentation for details).
+
+Especially interesting for dynamic Qt applications is the newly
+introduced property system. Many interesting things, from scripting up
+to graphical user interface builders, become easier. The technology
+requires a new macro Q_PROPERTY and a new revision of Qt's meta object
+compiler (moc). See the Qt documentation for details.
+
+Due to strong customer demand, we added a cross-platform way to easily
+implement multi-document interfaces (known as 'MDI'). The widget is
+called QWorkspace and makes this task trivial.
+
+On X11, text dropping from Motif drag'n'drop applications has been
+added, to make your Qt applications inter-operable with those Motif
+applications that survived Y2K.
+
+The rich text system, first introduced in Qt-2.0, has been
+revised. Apart from great speed improvements, it now supports HTML
+tables as well as floating images.
+
+QMultiLineEdit, the text input field in Qt, got the missing word wrap
+functionality. It's probably the last big extension we will add to
+that widget. In Qt 3.0, it will be replaced by a fancier, faster and
+more powerful QTextEdit widget that also deals with different colors
+and fonts in a way similar to the existing QTextView.
+
+Qt follows the respective GUI style guides even more closely. This
+includes honoring desktop settings, and keyboard shortcuts such as
+Ctrl-Z/Y for undo/redo in line edit and multi-line edit
+controls. Dialog handling for both modal and non-modal dialogs has
+been improved to follow the platform conventions precisely.
+
+With QIconView, we added a powerful new visualization widget similar
+to QListView and QListBox. It contains optinally labelled pixmap items
+that the user can select, drag around, rename, delete and more.
+
+Compared to the previous release, we have managed to reduce overall
+memory consumption while improving execution speed and features.
+
+Below is a list of the major new features in existing classes as well
+as short descriptions of all new classes and the changes in some of
+the extensions shipped with Qt.
+
+
+****************************************************************************
+* 		New major features in existing classes			   *
+****************************************************************************
+
+QApplication	- new function wakeUpGuiThread() to simplify using threads
+		  with Qt.
+
+QArray		- added sorting and binary search.
+
+QColor		- custom color support added.  qRgb(r,g,b) helper function
+		  now sets an opaque alpha value instead of a transparent
+		  one.
+
+QComboBox	- support for text items with icons.
+
+QFileDialog	- many new features including fancy drag'n'drop
+		  and in-place renaming.
+		  Methods like setInfoPreviewWidget()and
+		  setContentsPreviewWidget() make it easy to customize
+		  the dialog extensively. With QUrlOperator and the
+		  QNetworkProtocol abstraction, the dialog can operate
+		  transparently by various different network protocols,
+		  such as HTTP and FTP (see the Network Extension).
+
+QFocusEvent	- carries a reason() for the event. Possible reasons are
+		  Mouse, Tab, ActiveWindow, ShortCut and other. The
+		  addition makes line edit controls behave properly.
+
+QHeader		- added optional visual sort indicator. Revisited API that 
+		  operates on sections only (solves the 'logical' vs. 'actual' 
+		  index confusion). A reworked 'table' example shows how
+		  to use QHeader in combination with a scrollview to create
+		  a simple spreadsheet.
+
+QListBox	- many signals and functions added for convenience and
+		  greater flexibility.
+
+QListView	- various selections modes similar to QListBox, many
+		  new functions and signals added for convenience and
+		  greater flexibility.
+
+QMainWindow	- implemented draggable and hidable toolbars. A menubar
+		  can be made draggable by simply putting it in a toolbar.
+
+QMetaObject	- Parts of the API made public. The meta object allows
+		  applications to access information about an object's
+		  properties as well as its signals and slots.
+
+QMultiLineEdit	- added different word wrap modes: WidgetWidth,
+		  FixedPixelWidth and FixedColumnWidth.
+
+QObject		- property access functions property() and setProperty().
+
+QPen		- added adjustable cap and join styles.
+
+QPopupMenu	- added support for tear-off menus, custom items
+		  and widget items.
+		  A new function setItemParameter() makes it possible
+		  to distinguish between several menu items connected to
+		  one single slot.
+
+QPrinter        - Now allows printing to the default printer without doing
+                  setup() first.
+
+QProgressDialog	- auto-reset and auto-close modes.
+
+QPushButton	- added a menu button mode with setPopup().
+
+QScrollView	- support for auto-scrolling on drag move events (drag
+		  auto scroll mode).
+
+QSignal		- optional additional integer parameter for the emitted
+		  signal.
+
+QSimpleRichText - added adjustSize() function that implements a clever
+		  size hint. Vertical break support for printing. inText()
+		  hit test.
+
+QSpinBox	- different button symbols, currently UpDownArrows and
+		  PlusMinus.
+
+QSplitter	- supports three resize modes now, Stretch, KeepSize
+		  and FollowSizeHint.
+
+QString		- new functions setUnicode(), setUnicodeCodes(), setLatin1(),
+		  startsWith() and endsWith()
+
+QStringList	- new functions fromStrList(), split(), join() and grep().
+
+QStyle		- some extensions for menu button indicators, default
+		  button indicators, variable scrollbar extends and toolbar
+		  handles.
+
+QStyleSheet	- a couple of tags added to the default sheet, such as
+		  U, NOBR, HEAD, DL, DT, DD and table support (TABLE, TR,
+		  TD, TH). Many attributes added to existing tags.
+
+QTextView	- basic table support. Contents is selectable, selections
+		  can be pasted/dragged into other widgets.
+
+QToolBar	- stretchable depending on the orientation (setHorizontalStretchable()
+		  and setVerticalStretchable(). Added orientationChanged() signal.
+
+QToolButton	- added optional delayed menu with setPopup() and
+		  setPopupDelay(). Auto-raise behaviour adjustable.
+
+QWidget		- new widget flag WStyle_ContextHelp that adds a
+		  context-help button to the window titlebar. The
+		  button triggers "What's This?"-help. The flag works
+		  with MS-Windows and future versions of X11 desktops
+		  such as KDE-2.0.
+
+		- New function showFullScreen().
+
+		- Enabling and disabling with setEnabled() propagates to
+		  children.
+
+		- Changed isVisible(). It now returns whether a widget
+		  is mapped up to the toplevel widget (the previous
+		  implementation only returned isVisibleTo(parentWidget()).
+
+		- New property 'backgroundOrigin' that lets a widget draw 
+		  its background relatively to its parent widget's coordinate
+		  system. This makes pseudo-transparency possible, without
+		  the overhead of a real widget mask.
+
+
+****************************************************************************
+*				New clases				   *
+****************************************************************************
+
+QCustomMenuItem	- an abstract base class for custom menu items in
+		  popup menus.
+
+QFontDataBase	- provides information about the available fonts. Not really
+		  a new class (it was used internally for the QFontDialog),
+		  but for the first time public API.
+
+QGuardedPtr	- a template class that provides guarded pointers to
+		  QObjects.
+
+QIconView	- a sophisticated new widget similar to QListView and
+		  QListBox.  An iconview contains optinally labelled pixmap
+		  items that the user can select, drag around, rename, delete
+		  and more. The widget is highly optimized for speed and
+		  large amounts of icons.
+
+QInputDialog	- a convenience dialog to get some simple input values from
+		  the user.
+
+QMetaProperty	- stores meta data about properties. Part of the meta
+		  object system.
+
+QNetworkProtocol- base class for network protocols, provides
+		  a common API for network protocols.
+
+QUrl/
+QUrlOperator	- provides an easy way to work with URLs.
+
+QVariant	- a tagged union for the most common Qt data types.
+
+QValueStack	- a value-based stack container.
+
+QWorkspace	- provides a workspace that can contain decorated
+		  windows as opposed to frameless child widgets.
+		  QWorkspace makes it easy to implement a multi-document
+		  interface (MDI).
+
+QBig5Codec	- provides support for the Big5 Chinese encoding.
+
+
+****************************************************************************
+*		Changes which may affect runtime behaviour		   *
+****************************************************************************
+
+QDataStream / QPicture
+ To accomodate for improved functionality, the stream serialization format
+ of QString and QPen has changed in Qt 2.1. The format version
+ number has been increased to 3. Compatibility has been kept, so
+ applications built with this version of Qt are automatically able to read
+ QDataStream and QPicture data generated by earlier Qt 2.x versions. But if
+ your application needs to generate data that must be readable by
+ applications that are compiled with earlier versions of Qt, you must use
+ QDataStream::setVersion() (if the data contains QString or QPen objects).
+ See the documentation of this function for further discussion.
+
+QPainter::drawPolygon()
+ An outline is no longer drawn in the brush color if NoPen is specified.
+ This matches the behaviour on Windows and ensures that the area
+ painted in this case is the same pixels defined by a QRegion made
+ from the polygon.  To get the old behaviour, you can call
+ painter.setPen(painter.brush()) prior to painting, which will also
+ work on Windows.
+
+QPushButton::sizeHint()
+ The size hint of auto-default push buttons has been slightly
+ increased in order to reserve space for a default button indicator
+ frame. This is necessary for a proper Motif or Platinum emulation. If
+ this change destroys your geometry management, a auto-default button
+ is probably not what you wanted anyway. Simply call
+ setAutoDefault(FALSE) on these push buttons to get the old behaviour.
+
+QWidget
+ Font and palette propagation has changed totally (from "almost
+ brain-dead" to working).  In practice, the only changes we've seen are
+ to the better.
+
+QColor
+ qRgb(r,g,b) now sets a default opaque alpha value of 0xff instead of
+ a transparent 0x00 alpha value formerly.  Use qRgb(r,g,b,a) if you do
+ need a transparent alpha value.
+
+QPalette
+ It turned out that the old normal/active/disabled set of color groups
+ didn't work very well, except in the simplest hello-world examples,
+ that it couldn't be fixed without nasty hacks, and that during five
+ years nobody had discovered the bugs.  So, we've dropped our broken
+ attempt at Tcl/Tk L&F compatibility, and added support for Windows
+ 2000 and Macintosh L&F compatibility instead.  The Macintosh and
+ Windows 2000 looks differentiate between the window with focus and
+ other windows.  Qt calls the color groups QPalette::active() and
+ QPalette::inactive() respectively.
+
+QGridLayout/QBoxLayout 
+ setMargin() now also works on child layouts. As a result of this
+ change, the geometry() of a layout now includes margin(). This may
+ effect programs that use QLayout::geometry().
+
+QToolButton
+ The now adjustable auto-raise behaviour defaults to TRUE only when
+ a button is used inside a QToolBar. That's usually what you want. If not,
+ call setAutoRaise(FALSE).
diff --git a/dist/changes-2.1.1 b/dist/changes-2.1.1
new file mode 100644
index 0000000000..bb653fee6a
--- /dev/null
+++ b/dist/changes-2.1.1
@@ -0,0 +1,71 @@
+
+Qt 2.1.1 is a bugfix release. It keeps both forward and backward
+compatibility (source and binary) with Qt 2.1.
+
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+- Many documentation improvements
+
+- Various compilation problems relating to particular versions of xlC,
+MipsPRO, Solaris, Japanese Windows, old X11 libraries, and gcc 2.7.2
+fixed
+
+- 64bit HP build targets added
+
+- Qt OpenGL Extension updated; see details in qt/extensions/opengl/CHANGES
+
+- As usual, many minor bugfixes, too small to be mentioned here.
+
+
+****************************************************************************
+*			    Specific					   *
+****************************************************************************
+
+QToolbar:	fix of layout-saving when moving out of dock
+
+QAccel:		Support for non-alphanumeric keys
+
+QPrinter:	Better tolerance for PS interpreter peculiarities
+
+QPainter:	drawText() with rasterOp on Windows
+
+QIconView:	Drawing fixes
+
+QDate:		Ensure invalid status when created with invalid values
+
+Motif Dnd:	Fix possible crash
+
+QWorkSpace:	Proper minimize/maximize activation
+
+QListBox:	Optimization: better performance for lists with thousands of
+		elements. Selection problem fixed.
+		
+QFont:		Fontset matching fix for X11
+
+QMultiLineEdit:	Wordwrap/selection workaround
+
+QTabBar:	Refresh layout after style change. Optimization.
+
+QTimer:		Zero-timers on Windows speedup
+
+QFileDialog:	Correct caption on Windows
+
+QComboBox:	Accept only left button. Do proper font propagation.
+
+QMenuBar:	Accept only left button
+
+QDialog:	Modal dialogs after QApplication::exec() returns
+
+QWidget:	Optimization: fewer server round-trips
+
+QCheckBox:	Fixed mask drawing
+
+QSpinBox:	Accept '-' key, for negative values
+
+Dnd:		Allow disabling on X11
+	
+QFontDatabase:	Use QApplication's charset as default,
+		and fixed garbage on Win2000
diff --git a/dist/changes-2.2.0 b/dist/changes-2.2.0
new file mode 100644
index 0000000000..d5444a84cc
--- /dev/null
+++ b/dist/changes-2.2.0
@@ -0,0 +1,223 @@
+
+Qt 2.2 introduces new features as well as many improvements over the
+2.1.x series. This file will only give an overview of the main changes
+since version 2.1.  A complete list would simply be too large to be
+useful.  For more detail see the online documentation which is
+included in this distribution, and also available on
+http://doc.trolltech.com/
+
+The Qt version 2.2 series is binary compatible with the 2.1.x and
+2.0.x series - applications compiled for 2.0 or 2.1 will continue to
+run with 2.2.
+
+As with previous Qt releases, the API and functionality of Qt is
+completely portable between Microsoft Windows and X11.  It is also
+portable between Windows 95, 98, NT and 2000.
+
+****************************************************************************
+*			    Overview					   *
+****************************************************************************
+
+The greatest new feature in the 2.2 release is the Qt Designer, a
+visual GUI design tool. It makes it possible to cut down on
+development time even further through WYSIWYG dialog design. The
+designer makes use of improved runtime flexibility and a revised
+property system. Please see $QTDIR/doc/html/designer.html for a
+feature overview.
+
+Qt 2.2 integrates now fully on MS-Windows 2000.  This includes fade
+and scroll effects for popup windows and title bar gradients for MDI
+document windows in the MDI module. As with all Qt features, we
+provide the same visual effects on Unix/X11.
+
+Two new classes QAction and QActionGroup make it much easier to
+create sophisticated main windows for today's applications. A QAction
+abstracts a user interface action that can appear both in menus and
+tool bars.  An action group makes it easier to deal with groups of
+actions. It allows to add, remove or activate its children with a
+single call and provides "one of many" semantics for toggle
+actions. Changing an action's properties, for example using
+setEnabled(),setOn() or setText(), immediately shows up in all
+representations.
+
+Few people consider the original OSF Motif style the most elegant or
+flashy GUI style. Therefore several attempts have been made to come up
+with a slightly improved Motif-ish look and feel. One of them is the
+thinner CDE style, that was supported by Qt since version 2.0.  In the
+2.2 release, we now added support for SGI's very own Motif version on
+IRIX workstations.  With its more elegant bevelling of 3D elements and
+mouse-under highlight effects, it is quite appealing. For Linux users,
+we added a Motif plus style, that resembles the bevelling used by the
+GIMP toolkit (GTK+). Optionally, this style also does hovering
+highlight on buttons.
+
+Last but not least we added support for multi-threaded
+applications. The classes involved are QThread to start threads,
+QMutex to serialize them and QCondition to signal the occurrence of
+events between threads ("condition variables").
+
+Another major change was done regarding distribution. In order to
+address the steady growth of functionality in the Qt library, we
+split the source code into distinct modules that can be compiled
+in (or left out) separately. This also makes it possible for us to
+keep the cost of entry into the commercial Qt world as low as possible.
+
+The modules available in Qt 2.2 are:
+
+- Tools: platform-independent Non-GUI API for I/O, encodings, containers,
+    strings, time & date, and regular expressions.
+
+- Kernel: platform-independent GUI API, a complete window-system API.
+
+- Widgets: portable GUI controls.
+
+- Dialogs: ready-made common dialogs for selection of colors, files,
+    printers, fonts, and basic types, plus a wizard framework, message
+    boxes and progress indicator.
+
+- OpenGL 3D Graphics: integration of OpenGL with Qt, making it very
+    easy to use OpenGL rendering in a Qt application.
+
+- Network: advanced socket and server-socket handling plus
+    asynchronous DNS lookup.
+
+- Canvas: a highly optimized 2D graphic area.
+
+- Table:  a flexible and editable table widget
+
+- IconView: a powerful visualization widget similar to QListView and
+    QListBox. It contains optionally labelled pixmap items that the user
+    can select, drag around, rename, delete and more.
+
+- XML: a well-formed XML parser with SAX interface plus an
+    implementation of the DOM Level1
+
+- Workspace: a workspace window that can contain decorated document
+    windows for Multi Document Interfaces (MDI).
+
+
+Network, Canvas, Table and XML are entirely new modules.
+
+Below is a list of the major new features in existing classes as well
+as short descriptions of all new classes.
+
+
+****************************************************************************
+* 		New major features in existing classes			   *
+****************************************************************************
+
+QApplication: 	- "global strut", an adjustable minimum size for interactable
+		  control elements like the entries in a listbox, useful for
+		  touch-screens. Popup window effects ( setEffectEnabled() )
+		  and more threading support ( guiThreadTaken(), lock(),
+		  unlock(), locked() ).
+
+QCheckBox: 	- "tristate" is now a property.
+
+QClipboard: 	- text() supports subtypes.
+
+QComboBox: 	- "editable" is now a property that is changeable at runtime
+
+QDialog: 	- support for extensible dialogs ("More...") with
+		  setExtension() and setOrientation(). Optional size grip.
+
+QFont: 		- new functions styleStrategy() and  setStyleHint()
+
+QIconSet: 	- new constructor that takes both a small and a large pixmap
+
+QKeyEvent: 	- numeric keypad keys now set a Keypad flag
+
+QLabel: 	- support for scaled pixmap contents, "pixmap" as property
+
+QLayout:	- improved flexibility with setEnabled(), access to the
+		  laid out menu bar with menuBar().
+
+QListView: 	- "showSortIndicator" as property. New function
+		  QListViewItem::moveItem() to simplify drag and drop.
+
+QMovie: 	- new functions pushSpace(), pushData(), frameImage()
+
+QMultiLineEdit: - new functions pasteSubType() and copyAvailable()
+
+QObject: 	- new function normalizeSignalSlot(), tr() now supports a comment.
+
+QPicture: 	- streaming to and from QDataStream
+
+QPopupMenu: 	- new signal aboutToHide()
+
+QRegExp: 	- new functions setPattern() and find()
+
+QRegion: 	- new function setRects()
+
+QScrollView: 	- new property "staticBackground" to define a pixmap
+		  background that does not scroll with the contents.
+
+QStatusBar: 	- "sizeGripEnabled" as property
+
+QStyle: 	- themable menu bars with drawMenuBarItem(). New functions
+		  buttonMargin(), toolBarHandleExtent(), sliderThickness()
+
+QTabWidget: 	- new functions currentPageIndex(), setCurrentPage(), new
+		  signal currentChanged(). Similar extensions to QTabBar
+		  and QTabDialog
+
+QTranslator:	- new algorithmen for faster lookup. No more risk of
+		"hash collisions" when many translators are loaded.
+
+QVariant: 	- new subtype QSizePolicy. Necessary for QWidget's
+		   new sizePolicy property.
+
+QWidget: 	- new properties "sizePolicy", "ownPalette", "ownFont",
+		  "ownCursor" and "hidden". The size policy is now adjustable
+		  at runtime with setSizePolicy().  Added convenience slot
+		  setDisabled(). Fast geometry mapping functions mapTo() and
+		  mapFrom(). On X11, support for a new background mode
+		  X11ParentRelative.
+
+QWizard: 	- runtime changable titles with setTitle(), new signal
+		  selected()
+
+QWorkspace:	- support for more widget flags like WType_Tool. Titlebar
+		  blending effects on MS-Windows 98/2000.
+
+
+****************************************************************************
+*				New classes				   *
+****************************************************************************
+
+QAction 	- Abstracts a user interface action that can appear both in
+		  menus and tool bars. Changing an action's properties, for
+		  example using setEnabled(),setOn() or setText(),
+		  immediately shows up in all representations.
+
+QActionGroup 	- Combines actions to a group. An action group makes it easier
+		  to deal with groups of actions. It allows to add, remove or
+		  activate its children with a single call and provides
+		  "one of many" semantics for toggle actions.
+
+QDial		- A rounded rangecontrol (like a speedometer or
+		  potentiometer). Both API- and UI-wise the dial is very
+		  similar to a QSlider.
+
+QDom 		- [XML Module] DOM Level 1 Tree
+
+QMotifPlusStyle	- This class implements a Motif-ish look and feel with more
+		  sophisticated bevelling as used by the GIMP toolkit (GTK+)
+		  for Unix/X11.
+
+QMutex:		- Provides access serialization between threads.
+
+QSemaphore:	- A robust integer semaphore.  Another way of thread
+		  serialization.
+
+QThread 	- Baseclass for platform-independent threads.
+
+QWaitCondition 	- Provides signalling of the occurrence of events between
+		  threads ("condition variables")
+
+QCanvas 	- [Canvas Module] a highly optimized 2D graphic area.
+
+QTable 		- [Table Module] a flexible and editable table widget
+
+QXML 		- [XML Module] XML parser with SAX interface
+
diff --git a/dist/changes-2.2.1 b/dist/changes-2.2.1
new file mode 100644
index 0000000000..1df0851464
--- /dev/null
+++ b/dist/changes-2.2.1
@@ -0,0 +1,160 @@
+
+Qt 2.2.1 is a maintainance release. It keeps backward binary compatibility
+with Qt 2.1 and both forward and backward source compatibility with Qt 2.2.x.
+
+Qt 2.2.0 had a binary compatibility problem with the following:
+
+   bool QRect::contains( const QRect &r, bool proper=FALSE ) const
+
+Qt 2.2.1 corrects this. Programs compiled with 2.1.x now continue
+running with 2.2.1. Programs compiled with versions other than 2.2.0
+may not run with 2.2.0, so upgrading to 2.2.1 is additionally important.
+
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+- Various compilation problems on particular platforms fixed
+
+- Many improvments in QThread. More platforms supported
+  (e.g. HPUX 11.x), uses native threads on Solaris rather than
+  compatibility posix threads
+
+- A few newly discovered memory leaks and free memory reads fixed
+
+- As usual, many minor bugfixes, too small to be mentioned here.
+
+
+****************************************************************************
+*			   Designer					   *
+****************************************************************************
+
+- in KDE mode: don't show all KDE widgets in the toolbars, since we do
+  not have icons for them (yet). They are accessible through the menu
+  structure, though.
+
+- Introduced concept of a global /etc/designerrc and a templatePath
+  for the sake of Linux Standard Base (LSB) and the way Linux
+  ditributors like to package the Qt Free Edition.
+
+- Support for tab names in a QTabWidget, and page names in a QWizard.
+
+- Support for button IDs in a button group, makes it possible to utilize
+  one single slot for all buttons in a group.
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+QClipboard: 	X11 only: fixed occasional crashes, possibly corrupted
+		list of provided types and hangups of several seconds under
+		certain circumstances.
+
+QFileDialog:	Fixed update when renaming a file to an existing file
+		Unix only: Reset error status after attempting to read an
+		empty file
+		Fixed magical resetting of the "Open" label
+		Fixed duplicate entries in the history combobox
+
+QFont:		Fixes for Hewbrew, Arabic and Thai encodings
+		Added support for Ukrainian encodings
+		X11 only: loading fonts for a locale other than the
+		current now possible (allows displaying japanese characters
+		in a latin1 application without relying on the existence of
+		a unicode font)
+
+QHeader:	removing labels fixed, important for QTable and QListView
+
+QIconView:	drawing problem with missleading font metrices and
+		bounding rectangles fixed
+
+QInputDialog,
+QMessageBox:	use the main widget's or parent's icon if available
+
+QLayout:	synchronize the behaviour of sublayouts and subwidgets with
+		layouts.
+
+QLineEdit: 	Update cursor position if QValidator::fixup() truncates the
+		string
+
+QMainWindow:	Fixed calculated minimum size. Sometimes, the minimum width
+		of the central widget was disregarded.
+
+QMenuBar:	Sizing fixed for frameless menubars in toolbars in
+		Motif-based styles
+
+QMotifPlusStyle: correct drawing of triangular tabs
+
+QMovie:		keep frameImage() during EndOfMovie signal
+
+QDom:		add comments when reading a xml file into the dom
+
+QPrinter:	MS-Windows only: Fixed invalidation when setup dialog was
+		cancelled
+
+QSgiStyle:	Small drawing problem with QTabBar fixed.
+		Fixed drawing of special prefix in menu items
+
+QSizePolicy:	setHeightForWidth() was broken, works now
+
+QTextCodec:	significant speedups for latin1 conversion
+
+QTextStream:	small speed improvements for readLine()
+		Added codec for ukrainian (koi8-u) encoding
+
+QWheelEvent:	Support for the MSH_MOUSEWHEEL extension on MS-Windows 95
+
+QWidget:	X11 only: Fixed possible mouse lock-ups when re-entering
+		the event loop on mouse events for widgets of type
+		WType_Popup.
+		X11 only: set input context when setting the active
+		window
+		X11 only: when dialogs were closed, the main window looked
+		like it	lost focus with some window managers. This has been
+		fixed now.
+
+QWidgetStack:	potential flicker issue fixed
+
+QWorkspace: 	normalize minimized children when they get focus
+		removed occasional flashing (e.g. when maximizing child
+		windows)
+		Look and feel adjustments to emulate MS-Windows even
+		closer
+		Documented that the active window can be 0 if there is no
+		active window
+		Slightly modifed the button decorations to be more general
+		and less KDE2 specific
+
+
+****************************************************************************
+*               Changes that might affect runtime behavior                 *
+****************************************************************************
+
+QLayout:
+
+We synchronized the behaviour of sublayouts and subwidgets with
+layouts. This shows great effect in the designer, were you usually
+operate on container subwidgets in the design phase, but get a
+complete layout in the preview mode or the generated code. For
+example, the influence of a spacer item on a sublayout's size policy
+has been reduced. The modifications may slightly affect the layout of
+some dialogs.
+
+
+****************************************************************************
+*		    Qt/Embedded-specific changes		           *
+****************************************************************************
+
+- Rotated displays & fonts
+- QCOP, a simple interprocess messaging system
+- Threading support
+- Auto-detected mouse
+- VGA16 support
+- Improved thick lines
+- Optimize some double-painting
+- Allow setting of custom 8bpp colors: QApplication::qwsSetCustomColors()
+- Fix masked widget drawing and clicking
+- Fix mouse grabbing for popups
+
+
diff --git a/dist/changes-2.2.2 b/dist/changes-2.2.2
new file mode 100644
index 0000000000..5f271fe6c7
--- /dev/null
+++ b/dist/changes-2.2.2
@@ -0,0 +1,154 @@
+
+Qt 2.2.2 is a bugfix release. It keeps both forward and backward
+compatibility (source and binary) with Qt 2.2.1
+
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+OpenGL:		More Problems with the auto-detection of OpenGL
+		libraries have been fixed.
+
+
+****************************************************************************
+*			   Designer					   *
+****************************************************************************
+
+uic:		Added workaround for the QListView::Manual vs.
+		QScrollView::Manual enumeration clash.	
+		Fixed backslashes inside strings.
+		Obeys user defined layout names.
+
+RC2UI:		Converts Microsoft Dialog Resources (.rc) to
+		Qt Designer Dialog Userinterface Description Files (.ui).
+		You find it in $QTDIR/tools/designer/integration/rc2ui.
+		See the README file there.
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+QAction:	Fixed possible crash in removeFrom().
+
+QApplication:	X11 only: Add possibility to input text in more than
+		one encoding.
+
+QCanvas:	Deletes items at canvas destruction time. Without a
+		canvas, items are not deletable anyway as they need to
+		access their canvas during destruction.
+		Some performance optimizations.
+
+QCanvasItem:	More accurate rectangle collision detection.
+
+QClipboard:	X11 only: 64bit cleanness when transferring data
+		with format==32 using dnd/clipboard.
+
+QColorDialog:	MS-Windows only: Tries harder to use a nice icon.
+
+QDialog:	Keypard-Enter triggers default button.
+
+QFile:		Unix only: Safe access to files in the proc filesystem.
+
+QFileDialog:	Fixed reentrancy problem when used with qFtp.
+		MS-Windows only: Tries harder to use a nice icon.
+
+QFontCache:	Fixed possible crash in the rare case that the font
+		cache runs over.
+
+QGLWidget:	MS-Windows only: Fix for GL context switching.
+
+QIconView:	Fixed possible crash.
+
+QImage:		Increased number of colors when writing XPM files from
+		64^2 to 64^4.
+		Fixed 16-bit pixel().
+
+QImageIO:	MS-Windows only: exported qInitJpegIO function.
+		Fixed crash with libpng 1.0.8.
+		Fixed huge memory leak with PNG files.
+
+QLCDNumber:	Sensible precision when displaying doubles.
+
+QLineEdit:	Accepts text drops other than text/plain.
+		Fixed psosible crash when deleting a line edit while its
+		context menu is visible.
+
+QListView:	Less flicker. Improved performance on insertItem().
+
+QMainWindow:	Deletes its layout first on destruction time to avoid
+		possible crashes with subclasses.
+
+QMotifPlusStyle:Tuned drawing of tabs.
+
+QPainter:	Fixed rounded rectangle drawing with rotation and
+		viewport transformation turned on.
+		Ignores '\r' in drawText.
+
+QPopupMenu:	Ensure to emit the aboutToShow() signal only once
+		for submenus.
+
+QPrinter:	Unix only: Fixed output for when printing some but not all pages
+		of multi-page output.
+		Unix only: Fixed an infinite loop in the image compression
+		algorithm for some images.
+		Unix only: Added MIBs for 8859-13, -14 and -15.
+		MS-Windows only: Fixed system print dialog for Win9x.
+
+QPrintDialog:	MS-Windows only: Tries harder to use a nice icon.
+
+QProgressBar:	Fixed drawing problem with really large progress ranges.
+
+QPushButton:	Implemented "flat" property as advertised.
+
+QPrinter:	MS-Windows only: Keep the current printer name.
+
+QRichText:	Fixed line breaking for asian scripts. Support for
+		chinese punctuation.
+		Obeys <font color="..."> tags inside links.
+
+QString:	Allows 'G' in sprintf.
+
+QTextCodec:	Recognizes "he" and "he_IL" as 8859-8 locales.
+		Added latin4 locales.
+		Improved Thai support.
+		X11 only: fixed crashes when LANG=ko.
+		Improved conversion performance.
+
+QWidget:	X11 only: fixed a crash in case XmbTextListToTextProperty
+		fails for a certain locale.
+		Visiblity fix when reparenting a widget to 0.
+		X11 only: Improved transient placement for embedded
+		windows.
+		X11 only: Maintains XDND state when reparented.
+		X11 only: No more crashes in setActiveWindow() with
+		or without XIM support.
+		X11 only: small ICCCM compatibility issue with subsequent
+		hide and show fixed.
+
+QWorkspace:	Tab-focus remains inside a document window.
+		Fixed problem with menubars inside document windows.
+		Obeys initial child geometry.
+		Uses the children's size hint when cascading.
+
+QXmlInputSource:Fix for stream devices that do not support
+		direct access.
+
+****************************************************************************
+*			   Third party					   *
+****************************************************************************
+
+None
+
+****************************************************************************
+*               Changes that might affect runtime behavior                 *
+****************************************************************************
+
+None
+
+****************************************************************************
+*		    Qt/Embedded-specific changes		           *
+****************************************************************************
+
+ - Drawing speed-ups, especially rectangles, alpha blitting, horizontal lines.
+ - More control of qconfig.h
diff --git a/dist/changes-3.0.0 b/dist/changes-3.0.0
new file mode 100644
index 0000000000..1f6ad5bf38
--- /dev/null
+++ b/dist/changes-3.0.0
@@ -0,0 +1,720 @@
+Qt 3.0 adds a wide range of major new features as well as substantial
+improvements over the Qt 2.x series. Some internals have undergone
+major redesign and new classes and methods have been added.
+
+The Qt version 3.x series is not binary compatible with the 2.x
+series.  This means programs compiled with Qt version 2.x must be
+recompiled to work with Qt 3.0.
+
+In addition to the traditional Qt platforms Linux, Unix and the
+various flavours of MS-Windows.  Qt 3.0 for the first time introduces a
+native port to MacOS X. Like all Qt versions, Qt/Mac is source
+compatible with the other editions and follows closely the platform's
+native look and feel guidelines.
+
+We have tried to keep the API of Qt 3.0 as compatible as possible with
+the Qt 2.x series. For most applications, only minor changes will be
+needed to compile and run them successfully using Qt 3.0.
+
+One of the major new features that has been added in the 3.0 release
+is a module allowing you to easily work with databases. The API is
+platform independent and database neutral. This module is seamlessly
+integrated into Qt Designer, greatly simplifying the process of
+building database applications and using data aware widgets.
+
+Other major new features include a plugin architecture to extend Qt's
+functionality, for styles, text encodings, image formats and database
+drivers. The Unicode support of Qt 2.x has been greatly enhanced, it
+now includes full support for scripts written from right to left
+(e.g. Arabic and Hebrew) and also provides improved support for Asian
+languages.
+
+Many new classes have been added to the Qt Library. Amongst them are
+classes that provide a docking architecture (QDockArea/QDockWindow), a
+powerful rich text editor (QTextEdit), a class to store and access
+application settings (QSettings) and a class to create and communicate
+with processes (QProcess).
+
+Apart from the changes in the library itself a lot has been done to
+make the development of Qt applications with Qt 3.0 even easier than
+before. Two new applications have been added: Qt Linguist is a tool to
+help you translate your application into different languages; Qt
+Assistant is an easy to use help browser for the Qt documentation that
+supports bookmarks and can search by keyword.
+
+Another change concerns the Qt build system, which has been reworked
+to make it a lot easier to port Qt to new platforms. You can use this
+platform independent build system - called qmake - for your own
+applications.
+
+And last but not least we hope you will enjoy the revisited and widely
+extended documentation.
+
+
+Qt/Embedded
+----------
+
+Qt/Embedded 3.0 provides the same features as Qt 3.0, but currently
+lacks some of the memory optimizations and fine-tuning capabilities of
+Qt/Embedded 2.3.x. We will add these in the upcoming maintainance
+releases.
+
+If you develop a new product based on Qt/Embedded, we recommend
+switching to 3.0 because of the greatly improved functionality.
+However, if you are planning a release within the next two months and
+require memory optimizations not available with Qt/Embedded 3.0, we
+suggest using Qt/Embedded 2.3.x.
+
+
+The Qt Library
+========================================
+
+A large number of new features has been added to Qt 3.0. The following
+list gives an overview of the most important new and changed aspects
+of the Qt library.
+
+
+Database support
+----------------
+
+One of the major new features in Qt 3.0 is the SQL module that
+provides cross-platform access to SQL databases, making database
+application programming with Qt seamless and portable. The API, built
+with standard SQL, is database-neutral and software development is
+independent of the underlying database.
+
+A collection of tightly focused C++ classes are provided to give the
+programmer direct access to SQL databases. Developers can send raw SQL
+to the database server or have the Qt SQL classes generate SQL queries
+automatically.  Drivers for Oracle, PostgreSQL, MySQL and ODBC are
+available and writing new drivers is straightforward.
+
+Tying the results of SQL queries to GUI components is fully supported
+by Qt's SQL widgets. These classes include a tabular data widget
+(for spreadsheet-like data presentation with in-place editing), a
+form-based data browser (which provides data navigation and edit
+functions) and a form-based data viewer (which provides read-only
+forms). This framework can be extended by using custom field editors,
+allowing for example, a data table to use custom widgets for in-place
+editing. The SQL module fully supports Qt's signals/slots mechanism,
+making it easy for developers to include their own data validation and
+auditing code.
+
+Qt Designer fully supports Qt's SQL module. All SQL widgets can be
+laid out within Qt Designer, and relationships can be established
+between controls visually. Many interactions can be defined purely in
+terms of Qt's signals/slots mechanism directly in Qt Designer.
+
+
+Explicit linking and plugins
+-------------------------
+
+The QLibrary class provides a platform independent wrapper for runtime
+loading of shared libraries.
+
+Specialized classes that make it possible to extend Qt's functionality
+with plugins: QStylePlugin for user interface styles, QTextCodecPlugin
+for text encodings, QImageFormatPlugin for image formats and
+QSqlDriverPlugin for database drivers.
+
+It is possible to remove unused components from the Qt library, and
+easy to extend any application with 3rd party styles, database drivers
+or text codecs.
+
+Qt Designer supports custom widgets in plugins, and will use the
+widgets both when designing and previewing forms (QWidgetPlugin).
+
+
+Rich text engine and editor
+---------------------------
+
+The rich text engine originally introduced in Qt 2.0 has been further
+optimized and extended to support editing. It allows editing formatted
+text with different fonts, colors, paragraph styles, tables and
+images. The editor supports different word wrap modes, command-based
+undo/redo, multiple selections, drag and drop, and many other
+features.  The engine is highly optimized for proccesing and displaying
+large documents quickly and efficiently.
+
+
+Unicode
+-------
+
+Apart from the rich text engine, another new feature of Qt 3.0 that
+relates to text handling is the greatly improved Unicode support. Qt
+3.0 includes an implementation of the bidirectional algorithm (BiDi)
+as defined in the Unicode standard and a shaping engine for Arabic,
+which gives full native language support to Arabic and Hebrew speaking
+people. At the same time the support for Asian languages has been
+greatly enhanced.
+
+The support is almost transparent for the developer using Qt to
+develop their applications. This means that developers who developed
+applications using Qt 2.x will automatically gain the full support for
+these languages when switching to Qt 3.0. Developers can rely on their
+application to work for people using writing systems different from
+Latin1, without having to worry about the complexities involved with
+these scripts, as Qt takes care of this automatically.
+
+
+Docked and Floating Windows
+---------------------------
+
+Qt 3.0 introduces the concept of dock windows and dock areas. Dock
+windows are widgets, that can be attached to, and detached from, dock
+areas. The most common kind of dock window is a tool bar. Any number of
+dock windows may be placed in a dock area. A main window can have dock
+areas, for example, QMainWindow provides four dock areas (top, left,
+bottom, right) by default. The user can freely move dock windows and
+place them at a convenient place in a dock area, or drag them out of
+the application and have them float freely as top level windows in
+their own right. Dock windows can also be minimized or hidden.
+
+For developers, dock windows behave just like ordinary widgets. QToolbar
+for example is now a specialized subclass of a dock window.  The API
+of QMainWindow and QToolBar is source compatible with Qt 2.x, so
+existing code which uses these classes will continue to work.
+
+
+Regular Expressions
+-------------------
+
+Qt has always provided regular expression support, but that support
+was pretty much limited to what was required in common GUI control
+elements such as file dialogs. Qt 3.0 introduces a new regular
+expression engine that supports most of Perl's regex features and is
+Unicode based. The most useful additions are support for parentheses
+(capturing and non-capturing) and backreferences.
+
+
+Storing application settings
+----------------------------
+
+Most programs will need to store some settings between runs, for
+example, user selected fonts, colors and other preferences, or a list
+of recently used files.  The new QSettings class provides a platform
+independent way to achieve this goal. The API makes it easy to store
+and retrieve most of the basic data types used in Qt (such as basic
+C++ types, strings, lists, colors, etc). The class uses the registry
+on the Windows platform and traditional resource files on Unix.
+
+
+Creating and controlling other processes
+----------------------------------------
+
+QProcess is a class that allows you to start other programs from
+within a Qt application in a platform independent manner. It gives you
+full control over the started program.  For example you can redirect
+the input and output of console applications.
+
+
+Accessibility
+---------------
+
+Accessibility means making software usable and accessible to a wide
+range of users, including those with disabilities. In Qt 3.0, most
+widgets provide accessibility information for assistive tools that can
+be used by a wide range of disabled users. Qt standard widgets like
+buttons or range controls are fully supported. Support for complex
+widgets, like e.g. QListView, is in development. Existing applications
+that make use of standard widgets will become accessible just by using
+Qt 3.0.
+
+Qt uses the Active Accessibility infrastructure on Windows, and needs
+the MSAA SDK, which is part of most platform SDKs. With improving
+standardization of accessibility on other platforms, Qt will support
+assistive technologies on other systems too.
+
+
+XML Improvements
+----------------
+
+The XML framework introduced in Qt 2.2 has been vastly improved. Qt
+2.2 already supported level 1 of the Document Object Model (DOM), a
+W3C standard for accessing and modifying XML documents.  Qt 3.0 has
+added support for DOM Level 2 and XML namespaces.
+
+The XML parser has been extended to allow incremental parsing of XML
+documents. This allows you to start parsing the document directly
+after the first parts of the data have arrived, and to continue
+whenever new data is available.  This is especially useful if the XML
+document is read from a slow source, e.g. over the network, as it
+allows the application to start working on the data at a very early
+stage.
+
+
+SVG support
+-----------
+
+SVG is a W3C standard for "Scalable Vector Graphics". Qt 3.0's SVG
+support means that QPicture can optionally generate and import static
+SVG documents. All the SVG features that have an equivalent in
+QPainter are supported.
+
+
+Multihead support
+-----------------
+
+Many professional applications, such as DTP and CAD software, are able
+to display data on two or more monitors. In Qt 3.0 the QDesktopWidget
+class provides the application with runtime information about the
+number and geometry of the desktops on the different monitors and such
+allows applications to efficiently use a multi-monitor setup.
+
+The virtual desktop of Windows 98 and 2000 is supported, as well as
+the traditional multi-screen and the newer Xinerama multihead setups
+on X11.
+
+
+X11 specific enhancements
+-------------------------
+
+Qt 3.0 now complies with the NET WM Specification, recently adopted
+by KDE 2.0.  This allows easy integration and proper execution with
+desktop environments that support the NET WM specification.
+
+The font handling on X11 has undergone major changes.  QFont no longer
+has a one-to-one relation with window system fonts.  QFont is now a
+logical font that can load multiple window system fonts to simplify
+Unicode text display.  This completely removes the burden of
+changing/setting fonts for a specific locale/language from the
+programmer.  For end-users, any font can be used in any locale.  For
+example, a user in Norway will be able to see Korean text without
+having to set their locale to Korean.
+
+Qt 3.0 also supports the new render extension recently added to
+XFree86. This adds support for anti-aliased text and pixmaps with
+alpha channel (semi transparency) on the systems that support the
+rendering extension (at the moment XFree 4.0.3 and later).
+
+
+Printing
+--------
+
+Printing support has been enhanced on all platforms. The QPrinter
+class now supports setting a virtual resolution for the painting
+process. This makes WYSIWYG printing trivial, and also allows you to
+take full advantage of the high resolution of a printer when painting
+on it.
+
+The postscript driver built into Qt and used on Unix has been greatly
+enhanced. It supports the embedding of true/open type and type1 fonts
+into the document, and can correctly handle and display Unicode.
+Support for fonts built into the printer has been enhanced and Qt now
+knows about the most common printer fonts used for Asian languages.
+
+
+Networking
+-----------
+
+A new class QHttp provides a simple interface for HTTP downloads and
+uploads.
+
+
+Compatibility with the Standard Template Library (STL)
+------------------------------------------------------
+
+Support for the C++ Standard Template Library has been added to the Qt
+Template Library (QTL).  The QTL classes now contain appropriate copy
+constructors and typedefs so that they can be freely mixed with other
+STL containers and algorithms.  In addition, new member functions have
+been added to QTL template classes which correspond to STL-style
+naming conventions (e.g., push_back()).
+
+
+Qt Designer
+========================================
+
+Qt Designer was a pure dialog editor in Qt 2.2 but has now been
+extended to provide the full functionality of a GUI design tool.
+
+This includes the ability to lay out main windows with menus and
+toolbars. Actions can be edited within Qt Designer and then plugged
+into toolbars and menu bars via drag and drop. Splitters can now be
+used in a way similar to layouts to group widgets horizontally or
+vertically.
+
+In Qt 2.2, many of the dialogs created by Qt Designer had to be
+subclassed to implement functionality beyond the predefined signal and
+slot connections. Whilst the subclassing approach is still fully
+supported, Qt Designer now offers an alternative: a plugin for editing
+code. The editor offers features such as syntax highlighting,
+completion, parentheses matching and incremental search.
+
+The functionality of Qt Designer can now be extended via plugins.
+Using Qt Designer's interface or by implementing one of the provided
+interfaces in a plugin, a two way communication between plugin and Qt
+Designer can be established. This functionality is used to implement
+plugins for custom widgets, so that they can be used as real widgets
+inside the designer.
+
+Basic support for project management has been added. This allows you
+to read and edit *.pro files, add and remove files to/from the project
+and do some global operations on the project. You can now open the
+project file and have one-click access to all the *.ui forms in the
+project.
+
+In addition to generating code via uic, Qt Designer now supports the
+dynamic creation of widgets directly from XML user interface
+description files (*.ui files) at runtime. This eliminates the need of
+recompiling your application when the GUI changes, and could be used
+to enable your customers to do their own customizations. Technically,
+the feature is provided by a new class, QWidgetFactory in the
+UI-library.
+
+
+Qt Linguist
+========================================
+
+Qt Linguist is a GUI utility to support translating the user-visible
+text in applications written with Qt. It comes with two command-line
+tools: lupdate and lrelease.
+
+Translation of a Qt application is a three-step process:
+
+  1) Run lupdate to extract user-visible text from the C++ source
+     code of the Qt application, resulting in a translation source file
+     (a *.ts file).
+  2) Provide translations for the source texts in the *.ts file using
+     Qt Linguist.
+  3) Run lrelease to obtain a light-weight message file (a *.qm file)
+     from the *.ts file, which provides very fast lookup for released
+     applications.
+
+Qt Linguist is a tool suitable for use by translators. Each
+user-visible (source) text is characterized by the text itself, a
+context (usually the name of the C++ class containing the text), and
+an optional comment to help the translator. The C++ class name will
+usually be the name of the relevant dialog, and the comment will often
+contain instructions that describe how to navigate to the relevant
+dialog.
+
+You can create phrase books for Qt Linguist to provide common
+translations to help ensure consistency and to speed up the
+translation process. Whenever a translator navigates to a new text to
+translate, Qt Linguist uses an intelligent algorithm to provide a list
+of possible translations: the list is composed of relevant text from
+any open phrase books and also from identical or similar text that has
+already been translated.
+
+Once a translation is complete it can be marked as "done"; such
+translations are included in the *.qm file. Text that has not been
+"done" is included in the *.qm file in its original form. Although Qt
+Linguist is a GUI application with dock windows and mouse control,
+toolbars, etc., it has a full set of keyboard shortcuts to make
+translation as fast and efficient as possible.
+
+When the Qt application that you're developing evolves (e.g. from
+version 1.0 to version 1.1), the utility lupdate merges the source
+texts from the new version with the previous translation source file,
+reusing existing translations. In some typical cases, lupdate may
+suggest translations. These translations are marked as unfinished, so
+you can easily find and check them.
+
+
+Qt Assistant
+========================================
+
+Due to the positive feedback we received about the help system built
+into Qt Designer, we decided to offer this part as a separate
+application called Qt Assistant. Qt Assistant can be used to browse
+the Qt class documentation as well as the manuals for Qt Designer and
+Qt Linguist. It offers index searching, a contents overview, bookmarks
+history and incremental search. Qt Assistant is used by both Qt
+Designer and Qt Linguist for browsing their help documentation.
+
+
+qmake
+========================================
+
+qmake is a cross-platform make utility that makes it possible to build
+the Qt library and Qt-based applications on various target platforms
+from one single project description. It is the C++ successor of
+'tmake' which required Perl.
+
+qmake offers additional functionallity that is difficult to reproduce
+in tmake. Trolltech uses qmake in its build system for Qt and related
+products and we have released it as free software.
+
+
+
+Detailed changes
+=============
+
+Qt 3.0 went through 6 beta releases. These are the detailed changes
+since Beta 6 only. For other changes, please see the changes notes
+of the respective beta releases.
+
+
+Qt 3.0 final is not binary compatible with Beta6; any programs linked
+against Beta6 must be recompiled.
+
+Below you will find a description of general changes in the Qt
+Library, Qt Designer and Qt Assistant.  Followed by a detailed list of
+changes in the API.
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QApplication
+	make sure we process deferred deletes before leaving the event
+	loop. This fixes some ocassions of memory leaks on exit.
+	win32: some improvements for modality and dockwindow handling
+	x11 only: read non-gui QSettings when running without GUI.
+	
+
+- QCheckListItem
+	Make the checkboxes respect the AlignCenter flag. Also make
+	the boxes look better in case they are not placed in the first
+	column.
+
+- QComboBox
+	if we have a currentItem and then we set the combobox to be
+	editable then set the text in the lineedit to be of the
+	current item.
+
+- QCommonStyle
+	QToolButton: spacing between a toolbutton's icon and its label.
+	QProgressBar: text color fixed.
+
+- QCursor
+	added the What's This? cursor to the collection.
+
+- QDataTable
+	fixed broken context menus.
+
+- QDate
+	fixed addMonth() overflow.
+
+- QDesktopWidget
+	win32 only: works now also for cases where the card handles
+	multiple monitors and GetSystemMetrics returns a single screen
+	only.
+
+- QDomAttr
+	fixed a memory leak in setNodeValue()
+
+- QDomNodeMap
+	added count() as a Qt-style alias for length()
+
+- QDragObject
+	default to the middle of the pixmap as a hot spot, this looks
+	nicer.
+
+- QFileDialog (internal dialog)
+	make viewMode() return the correct value even after the dialog
+	is finished. Fixed getOpenFileName and getSaveFileName for
+	non-existant directories. Make sure that when it's in
+	directory mode that the filters reflect this, and change the
+	label from file name to directory.
+	win32 only: Improved modality when using the native file
+	dialog.
+
+- QFont
+	x11 only: speed up fontloading with even more clever
+	caching. Make sure we can match scaled bitmap fonts by
+	default. Do not load a backup font for a script that is not
+	default. Make sure the pixel size is correct, even for fonts
+	that are unavailable. Try even harder to find a fontname that
+	is not understood. Some RENDER performance optimizations.
+
+- QFontDialog
+	make sure the content is set up correctly when initializing
+	the dialog.
+
+- QGLWidget
+	IRIX only: fixed reparent/resize bug, QGLContext::setContext()
+	is incredibly sensitive on different X servers.
+
+- QHeader
+	fixed missing updates on height resp. width changes like the
+	occur when changing the application font.
+
+- QIconView
+	fixed updates of non-auto-arranged views.
+
+- QImage
+	no gamma correction by default.
+	x11 only: some alignment issue with the alpha masked fixed.
+
+- QIODevice
+	fixed return value of QIODevice::readLine() for sequential
+	access.
+
+- QKeyEvent
+	win32 only: generate Direction_R/L events for bidirectional
+	input.
+
+- QLabel
+	handle setPixmap( *pixmap() ) gracefully. Apply the WordBreak
+	alignment flag to both plaintext and richtext. Improved alignment of
+	richtext labels. Removed some sizepolicy magic, QLabel now
+	works fine with Preferred/Preferred in all modes.
+
+- QLineEdit
+	fixed a crash when doing undo and a validator is set. Emit
+	textChanged() also if the text changed because of undo or redo.
+
+- QListBox
+	fixed RMB context-menu offset.
+
+- QListView
+	do not start renaming an item is CTRL or SHIFT is
+	pressed. Start renaming on mouse release, not mouse press, so
+	click + click + move on the same item does not start a rename
+	operation.
+
+- QMainWindow
+	show dock-menu also when clicking on the menubar.
+
+- QPainter
+	win32 only: improved printing performance through printer font
+	caching.
+	boundingRect(): ignore 0-width in the constrain rectangle.
+
+- QPicture
+	added overload for load()  that takes a QIODevice.
+
+- QPrintDialog (internal dialog)
+	fixed enabling of the first page and last page labels.
+
+- QPrinter
+	win32 only: make setColorMode() work, some unicode fixes. Make
+	collate the default.  Enable the collate checkbox without
+	losing the page selection if you want to print multiple
+	pages. Make the collateCopies property work that it knows
+	checks/unchecks the collate checkbox in the printing
+	dialog. Make settings also work when the print dialog is not
+	shown at all.
+
+- QProcess
+	added a new communication mode that duplicates stderr to
+	stdout (i.e. the equivalent of the shell's 2>&1).
+
+- QPSPrinter (unix)
+	fixed collate.
+	
+- QRangeControl
+	simplified code.
+
+- QRichText
+	Propagate WhiteSpaceMode to subitems with
+	WhiteSpaceModeNormal. Hide DisplayModeNone
+	items without additional newline. Fixed links inside non-left
+	aligned tables. Fixed some bidi layout problems. Fixed last
+	line layout in right-aligned paragraphs. For plain text,
+	always use the palette's text color.
+
+- QScrollView
+	safer destruction.
+
+- QSettings
+	win32 only: fixed a dead lock situation when writing
+	to LOCAL_MACHINE, but reading from CURRENT_USER.
+
+- QSGIStyle
+	fixed drawing of checkable menu items.
+
+- QSimpleRichText
+	use the specified default font.
+
+- QSlider
+	optimized drawing in the new style engine.
+
+- QString
+	QString::replace() with a regular expression requires a
+	QRegExp object, passing a plain string will cause a compile
+	error.
+
+- QStyleSheet
+	additional parameter 'whitespacemode' for
+	QStyleSheet::convertFromPlainText(). Support for superscript
+	('sup') and subscript ( 'sub' ).
+
+- QTabBar
+	react properly on runtime font changes, less flicker.
+
+- QTable
+	take the pixmap of a header section into account when
+	adjusting the size.
+
+- QTabWidget
+	use the embedded tabbar as focus proxy.
+
+- QThread
+	win32 only: possible crash with the thread dictionary fixed.
+
+- QValidator
+	In Q{Int,Double}Validator, consider '-' as Invalid rather than
+	Intermediate if bottom() >= 0.
+	
+- QWidget
+	made showFullScreen() multihead aware.
+	win32 only: Better size and position restoring when switching
+	between fullscreen, maximized and minimized.
+	x11 only: improvements to XIM, overthespot works correctly
+	now.
+
+- QWorkspace
+	smarter placement of the minimize button when there is no
+	maximize button. Make titlebars of tool windows a bit smaller.
+	Improved styleability. Do not maximize a widget that has a
+	maximum size that is smaller than the workspace.
+
+
+
+****************************************************************************
+*			      Other					   *
+****************************************************************************
+
+- moc
+	fixed generation of uncompilable code in conjunction with
+	Q_ENUMS and signal/slots.
+
+- unicode
+	allow keyboard switching of paragraph directionality.
+
+- installation
+	install $QTDIR/doc/html/ instead of $QTDIR/doc/
+	install Qt Designer templates as well.
+
+- improved build on
+	HP-UX with cc.
+	Solaris 8 with gcc 3.0.1.
+	AIX with xlC and aCC.
+
+- inputmethods
+	x11 only: do not reset the input context on focus changes.
+
+- uic
+	smaller improvements, handle additional form signals.
+
+- Qt Designer
+	make it possible to add new signals to a form without
+	subclassing. Minor fixes.
+
+- Qt Assistant
+	fixed Shift-LMB selection bug. Fixed new window and window
+	restoration on restart.
+
+- Qt Linguist
+	change fourth parameter of QApplication::translate() from bool
+	to enum type. This affects MOC (new revision) and lupdate (new
+	syntax to parse). Change Qt Linguist's XML file format (.ts)
+	to be consistent with QApplication:<defaultcodec> (rather than
+	<codec>) to match QApp::defaultCodec(); encoding="UTF-8"
+	(rather than utf8="true") to match QApp::translate(). Fixed
+	window decoration on restart. Use 'finished', 'unfinished' and
+	'unresolved' instead of the (!), (?) symbols on printouts.
+
+- QMsDev
+	merge "Add UIC" and "New Dialog". Better user interface and
+	general cleanup. Wwrite (and merge) qmake pro file with active
+	project. Load qmake pro files into Visual Studio.
+
+
diff --git a/dist/changes-3.0.0-beta1 b/dist/changes-3.0.0-beta1
new file mode 100644
index 0000000000..2c73e7744b
--- /dev/null
+++ b/dist/changes-3.0.0-beta1
@@ -0,0 +1,1239 @@
+Qt 3.0 adds a lot of new features and improvements over the Qt 2.x
+series. Some internals have undergone major redesign and new classes
+and methods have been added.
+
+We have tried to keep the API of Qt 3.0 as compatible as possible with
+the Qt 2.x series. For most applications only minor changes will be
+needed to compile and run them successfully using Qt 3.0.
+
+One of the major new features that has been added in the 3.0 release
+is a module allowing you to easily work with databases. The API is
+platform independent and database neutral. This module is seamlessly
+integrated into Qt Designer, greatly simplifying the process of
+building database applications and using data aware widgets.
+
+Other major new features include a component architecture allowing you
+to build cross platform components, 'plugins' with Qt. You can use
+your own and third party plugins your own applications. The Unicode
+support of Qt 2.x has been greatly enhanced, it now includes full
+support for scripts written from right to left (e.g. Arabic and
+Hebrew) and also provides improved support for Asian languages.
+
+Many new classes have been added to the Qt Library. Amongst them are
+classes that provide a docking architecture (QDockArea/QDockWindow), a
+powerful rich text editor (QTextEdit), a class to store and access
+application settings (QSettings) and a class to create and communicate
+with processes (QProcess).
+
+Apart from the changes in the library itself a lot has been done to
+make the development of Qt applications with Qt 3.0 even easier than
+before. Two new applications have been added: Qt Linguist is a tool to
+help you translate your application into different languages; Qt
+Assistant is an easy to use help browser for the Qt documentation that
+supports bookmarks and can search by keyword.
+
+Another change concerns the Qt build system, which has been reworked
+to make it a lot easier to port Qt to new platforms. You can use this
+platform independent build system for your own applications.
+
+
+The Qt Library
+========================================
+
+A large number of new features has been added to Qt 3.0. The following
+list gives an overview of the most important new and changed aspects
+of the Qt library. A full list of every new method follows the
+overview.
+
+
+Database support
+----------------
+
+One of the major new features in Qt 3.0 is the SQL module that
+provides cross-platform access to SQL databases, making database
+application programming with Qt seamless and portable. The API, built
+with standard SQL, is database-neutral and software development is
+independent of the underlying database.
+
+A collection of tightly focused C++ classes are provided to give the
+programmer direct access to SQL databases. Developers can send raw SQL
+to the database server or have the Qt SQL classes generate SQL queries
+automatically.  Drivers for Oracle, PostgreSQL, MySQL and ODBC are
+available and writing new drivers is straightforward.
+
+Tying the results of SQL queries to GUI components is fully supported
+by Qt's SQL widgets. These classes include a tabular data widget
+(for spreadsheet-like data presentation with in-place editing), a
+form-based data browser (which provides data navigation and edit
+functions) and a form-based data viewer (which provides read-only
+forms). This framework can be extended by using custom field editors,
+allowing for example, a data table to use custom widgets for in-place
+editing. The SQL module fully supports Qt's signal/slots mechanism,
+making it easy for developers to include their own data validation and
+auditing code.
+
+Qt Designer fully supports Qt's SQL module. All SQL widgets can be
+laid out within Qt Designer, and relationships can be established
+between controls visually. Many interactions can be defined purely in
+terms of Qt's signals/slots mechanism directly in Qt Designer.
+
+
+Component model - plugins
+-------------------------
+
+The QLibrary class provides a platform independent wrapper for runtime
+loading of shared libraries. Access to the shared libraries uses a
+COM-like interface. QPluginManager makes it trivial to implement
+plugin support in applications. The Qt library is able to load
+additional styles, database drivers and text codecs from plugins which
+implement the relevant interfaces, e.g. QStyleFactoryInterface,
+QSqlDriverInterface or QTextCodecInterface. It is possible to remove
+unused components from the Qt library, and easy to extend any
+application with 3rd party styles, database drivers or text codecs.
+
+Qt Designer supports custom widgets in plugins, and will use the
+widgets both when designing and previewing forms.
+
+QComponentFactory makes it easy to register any kind of component in a
+global database (e.g. the Windows Registry) and to use any registered
+component.
+
+
+Rich text engine and editor
+---------------------------
+
+The rich text engine originally introduced in Qt 2.0 has been further
+optimized and extended to support editing. It allows editing formatted
+text with different fonts, colors, paragraph styles, tables and
+images. The editor supports different word wrap modes, command-based
+undo/redo, multiple selections, drag and drop, and many other
+features.  The engine is highly optimized for proccesing and displaying
+large documents quickly and efficiently.
+
+
+Unicode
+-------
+
+Apart from the rich text engine, another new feature of Qt 3.0 that
+relates to text handling is the greatly improved Unicode support. Qt
+3.0 includes an implementation of the bidirectional algorithm (BiDi)
+as defined in the Unicode standard and a shaping engine for Arabic,
+which gives full native language support to Arabic and Hebrew speaking
+people. At the same time the support for Asian languages has been
+greatly enhanced.
+
+The support is almost transparent for the developer using Qt to
+develop their applications. This means that developers who developed
+applications using Qt 2.x will automatically gain the full support for
+these languages when switching to Qt 3.0. Developers can rely on their
+application to work for people using writing systems different from
+Latin1, without having to worry about the complexities involved with
+these scripts, as Qt takes care of this automatically.
+
+
+Docked and Floating Windows
+---------------------------
+
+Qt 3.0 introduces the concept of Dock Windows and Dock Areas. Dock
+windows are widgets, that can be attached to, and detached from, dock
+areas. The commonest kind of dock window is a tool bar. Any number of
+dock windows may be placed in a dock area. A main window can have dock
+areas, for example, QMainWindow provides four dock areas (top, left,
+bottom, right) by default. The user can freely move dock windows and
+place them at a convenient place in a dock area, or drag them out of
+the application and have them float freely as top level windows in
+their own right. Dock windows can also be minimized or hidden.
+
+For developers, dock windows behave just like ordinary widgets. QToolbar
+for example is now a specialized subclass of a dock window.  The API
+of QMainWindow and QToolBar is source compatible with Qt 2.x, so
+existing code which uses these classes will continue to work.
+
+
+Regular Expressions
+-------------------
+
+Qt has always provided regular expression support, but that support
+was pretty much limited to what was required in common GUI control
+elements such as file dialogs. Qt 3.0 introduces a new regular
+expression engine that supports most of Perl's regex features and is
+Unicode based. The most useful additions are support for parentheses
+(capturing and non-capturing) and backreferences.
+
+
+Storing application settings
+----------------------------
+
+Most programs will need to store some settings between runs, for
+example, user selected fonts, colors and other preferences, or a list
+of recently used files.  The new QSettings class provides a platform
+independent way to achieve this goal. The API makes it easy to store
+and retrieve most of the basic data types used in Qt (such as basic
+C++ types, strings, lists, colors, etc). The class uses the registry
+on the Windows platform and traditional resource files on Unix.
+
+
+Creating and controlling other processes
+----------------------------------------
+
+QProcess is a class that allows you to start other programs from
+within a Qt application in a platform independent manner. It gives you
+full control over the started program, for example you can redirect
+the input and output of console applications.
+
+
+Accessibility (not part of the beta1 release)
+---------------------------------------------
+
+Accessibility means making software usable and accessible to a wide
+range of users, including those with disabilities. In Qt 3.0, most
+widgets provide accessibility information for assistive tools that can
+be used by a wide range of disabled users. Qt standard widgets like
+buttons or range controls are fully supported. Support for complex
+widgets, like e.g. QListView, is in development. Existing applications
+that make use of standard widgets will become accessible just by using
+Qt 3.0.
+
+Qt uses the Active Accessibility infrastructure on Windows, and needs
+the MSAA SDK, which is part of most platform SDKs. With improving
+standardization of accessibility on other platforms, Qt will support
+assistive technologies on other systems, too.
+
+The accessibility API in Qt is not yet stable, which is why we decided
+not to make it a part of the beta1 release.
+
+
+XML Improvements
+----------------
+
+The XML framework introduced in Qt 2.2 has been vastly improved. Qt
+2.2 already supported level 1 of the Document Object Model (DOM), a
+W3C standard for accessing and modifying XML documents.  Qt 3.0 has
+added support for DOM Level 2 and XML namespaces.
+
+The XML parser has been extended to allow incremental parsing of XML
+documents. This allows you to start parsing the document directly
+after the first parts of the data have arrived, and to continue
+whenever new data is available.  This is especially useful if the XML
+document is read from a slow source, e.g. over the network, as it
+allows the application to start working on the data at a very early
+stage.
+
+
+SVG support
+-----------
+
+SVG is a W3C standard for "Scalable Vector Graphics". Qt 3.0's SVG
+support means that QPicture can optionally generate and import static
+SVG documents. All the SVG features that have an equivalent in
+QPainter are supported.
+
+
+Multihead support
+-----------------
+
+Many professional applications, such as DTP and CAD software, are able
+to display data on two or more monitors. In Qt 3.0 the QDesktopWidget
+class provides the application with runtime information about the
+number and geometry of the desktops on the different monitors and such
+allows applications to efficiently use a multi-monitor setup.
+
+The virtual desktop of Windows 98 and 2000 is supported, as well as
+the traditional multi-screen and the newer Xinerama multihead setups
+on X11.
+
+
+X11 specific enhancements
+-------------------------
+
+Qt 3.0 now complies with the NET WM Specification, recently adopted
+by KDE 2.0.  This allows easy integration and proper execution with
+desktop environments that support the NET WM specification.
+
+The font handling on X11 has undergone major changes.  QFont no longer
+has a one-to-one relation with window system fonts.  QFont is now a
+logical font that can load multiple window system fonts to simplify
+Unicode text display.  This completely removes the burden of
+changing/setting fonts for a specific locale/language from the
+programmer.  For end-users, any font can be used in any locale.  For
+example, a user in Norway will be able to see Korean text without
+having to set their locale to Korean.
+
+Qt 3.0 also supports the new render extension recently added to
+XFree86. This adds support for anti aliased text and pixmaps with
+alpha channel (semi transparency) on the systems that support the
+rendering extension (at the moment XFree 4.0.3 and later).
+
+
+Printing
+--------
+
+Printing support has been enhanced on all platforms. The QPrinter
+class now supports setting a virtual resolution for the painting
+process. This makes WYSIWYG printing trivial, and also allows you to
+take full advantage of the high resolution of a printer when painting
+on it.
+
+The postscript driver built into Qt and used on Unix has been greatly
+enhanced. It supports the embedding of true/open type and type1 fonts
+into the document, and can correctly handle and display Unicode.
+Support for fonts built into the printer has been enhanced and Qt now
+knows about the most common printer fonts used for Asian languages.
+
+
+QHttp
+-----
+
+This class provides a simple interface for HTTP downloads and uploads.
+
+
+Compatibility with the Standard Template Library (STL)
+------------------------------------------------------
+
+Support for the C++ Standard Template Library has been added to the Qt
+Template Library (QTL).  The QTL classes now contain appropriate copy
+constructors and typedefs so that they can be freely mixed with other
+STL containers and algorithms.  In addition, new member functions have
+been added to QTL template classes which correspond to STL-style
+naming conventions (e.g., push_back()).
+
+
+Qt Designer
+========================================
+
+Qt Designer was a pure dialog editor in Qt 2.2 but has now been
+extended to provide the full functionality of a GUI design tool.
+
+This includes the ability to lay out main windows with menus and
+toolbars. Actions can be edited within Qt Designer and then plugged
+into toolbars and menu bars via drag and drop. Splitters can now be
+used in a way similar to layouts to group widgets horizontally or
+vertically.
+
+In Qt 2.2, many of the dialogs created by Qt Designer had to be
+subclassed to implement functionality beyond the predefined signal and
+slot connections. Whilst the subclassing approach is still fully supported,
+Qt Designer now offers an alternative: a plugin for editing 
+slots. The editor offers features such as syntax highlighting,
+completion, parentheses matching and incremental search.
+
+The functionality of Qt Designer can now be extended via plugins.
+Using Qt Designer's interface or by implementing one of the provided
+interfaces in a plugin, a two way communication between plugin and Qt
+Designer can be established. This functionality is used to implement
+plugins for custom widgets, so that they can be used as real widgets
+inside the designer.
+
+Basic support for project management has been added. This allows you
+to read and edit *.pro files, add and remove files to/from the project
+and do some global operations on the project. You can now open the
+project file and have one-click access to all the *.ui forms in the
+project.
+
+In addition to generating code via uic, Qt Designer now supports the
+dynamic creation of widgets directly from XML user interface
+description files (*.ui files) at runtime. This eliminates the need of
+recompiling your application when the GUI changes, and could be used
+to enable your customers to do their own customizations. Technically,
+the feature is provided by a new class, QWidgetFactory in the
+QResource library.
+
+
+Qt Linguist
+========================================
+
+Qt Linguist is a GUI utility to support translating the user-visible
+text in applications written with Qt. It comes with two command-line
+tools: lupdate and lrelease.
+
+Translation of a Qt application is a three-step process:
+
+  1) Run lupdate to extract user-visible text from the C++ source
+     code of the Qt application, resulting in a translation source file
+     (a *.ts file).
+  2) Provide translations for the source texts in the *.ts file using
+     Qt Linguist.
+  3) Run lrelease to obtain a light-weight message file (a *.qm file)
+     from the *.ts file, which provides very fast lookup for released
+     applications.
+
+Qt Linguist is a tool suitable for use by translators. Each
+user-visible (source) text is characterized by the text itself, a
+context (usually the name of the C++ class containing the text), and
+an optional comment to help the translator. The C++ class name will
+usually be the name of the relevant dialog, and the comment will often
+contain instructions that describe how to navigate to the relevant
+dialog.
+
+You can create phrase books for Qt Linguist to provide common
+translations to help ensure consistency and to speed up the
+translation process. Whenever a translator navigates to a new text to
+translate, Qt Linguist uses an intelligent algorithm to provide a list
+of possible translations: the list is composed of relevant text from
+any open phrase books and also from identical or similar text that has
+already been translated.
+
+Once a translation is complete it can be marked as "done"; such
+translations are included in the *.qm file. Text that has not been
+"done" is included in the *.qm file in its original form. Although Qt
+Linguist is a GUI application with dock windows and mouse control,
+toolbars, etc., it has a full set of keyboard shortcuts to make
+translation as fast and efficient as possible.
+
+When the Qt application that you're developing evolves (e.g. from
+version 1.0 to version 1.1), the utility lupdate merges the source
+texts from the new version with the previous translation source file,
+reusing existing translations. In some typical cases, lupdate may
+suggest translations. These translations are marked as unfinished, so
+you can easily find and check them.
+
+
+Qt Assistant
+========================================
+
+Due to the positive feedback we received about the help system built
+into Qt Designer, we decided to offer this part as a separate
+application called Qt Assistant. Qt Assistant can be used to browse
+the Qt class documentation as well as the manuals for Qt Designer and
+Qt Linguist. It offers index searching, a contents overview, bookmarks
+history and incremental search. Qt Assistant is used by both Qt
+Designer and Qt Linguist for browsing their help documentation.
+
+
+QMake
+========================================
+
+To ease portability we now provide the qmake utility to replace tmake.
+QMake is a C++ version of tmake which offers additional functionallity
+that is difficult to reproduce in tmake. Trolltech uses qmake in its
+build system for Qt and related products and we have released it as
+free software.
+
+
+Qt Functions
+========================================
+
+QAction
+-------
+
+All new functions:
+	void addedTo( QWidget *actionWidget, QWidget *container );
+	void addedTo( int index, QPopupMenu *menu );
+
+QActionGroup
+------------
+
+New mode "uses drop down", where members are shown in a separate
+subwidget such as a combobox or a submenu (enable with
+setUsesDropDown(TRUE) )
+
+All new functions:
+	void add(QAction*);
+	void addSeparator();
+	void addedTo( QWidget *actionWidget, QWidget *container, QAction *a );
+	void addedTo( int index, QPopupMenu *menu, QAction *a );
+	void setUsesDropDown( bool enable );
+	bool usesDropDown() const;
+
+
+QApplication
+------------
+
+Added the setStyle(const QString&) overload that takes the name of the
+style as its argument. This loads a style plugin via a QStyleFactory.
+
+desktop() now returns a QDesktopWidget that provides access to
+multi-head information. Prior to 3.0, it returned a normal QWidget.
+
+New functions to define the library search path for plugins
+(setLibraryPaths, ...).
+
+New functions to define reverse layout for bidirectional languages
+(setReverseLayout, ...).
+
+All new functions:
+	bool hasPendingEvents()
+
+	void setLibraryPaths(const QStringList &);
+	QStringList libraryPaths();
+	void addLibraryPath(const QString &);
+	void removeLibraryPath(const QString &);
+
+	void setReverseLayout( bool b );
+	bool reverseLayout();
+	int horizontalAlignment( int align );
+
+
+
+QClipboard
+----------
+
+On systems that support it, for example X11, QClipboard now
+differentiates between the primary selection and the data in the clipboard.
+
+All new functions:
+	bool supportsSelection() const;
+	bool ownsClipboard() const;
+	void setSelectionMode(bool enable);
+	bool selectionModeEnabled() const;
+New signals:
+	void selectionChanged()
+	
+
+
+QCursor
+-------
+
+Now inherits Qt namespace. Enum values like ArrowCursor,
+UpArrowCursor, CrossCursor etc. are now part of that namespace.
+
+
+QDataStream
+-----------
+
+Added missing operators for Q_LONG and Q_ULONG
+
+
+QDateTime / QDate / QTime
+-------------------------
+
+More sophisticated toString() function that takes a DateFormat, where
+DateFormat can be either TextDate (the default), ISODate (ISO 8601) or
+LocalDate (locale dependent).
+
+All new functions:
+	QDate addMonths( int months ) const;
+	QDate addYears( int years ) const;
+	QDate fromString( const QString& s, Qt::DateFormat f = Qt::TextDate );
+	static QString shortMonthName( int month );
+	static QString longMonthName( int month );
+	static QString shortDayName( int weekday );
+	static QString longDayName( int weekday );
+	static void setShortMonthNames( const QStringList& names );
+	static void setLongMonthNames( const QStringList& names );
+	static void setShortDayNames( const QStringList& names );
+	static void setLongDayNames( const QStringList& names );
+
+QDialog
+-------
+
+Merged with QSemiModal. Calling show() on a modal dialog will return
+immediately, not enter a local event loop. Showing a modal dialog in
+its own event loop is achieved using exec().
+
+exec() is now a public slot.
+
+Usability: For widgets supporting What's This help, QDialog
+automatically offers a context menu containing a "What's This?" entry.
+
+
+QEvent
+------
+
+Mouse events are now propagated up to the toplevel widget if no widget
+accepts them and no event filter filters them out. In previous Qt
+versions, only key events were propagated.
+
+All events carry a flag 'spontaneous' to determine whether the even
+came from the outside or was generated by code within the
+applications. Previously, only show and hide events had this flag.
+
+Enter/Leave event generation has been fixed. Previously, a widget
+received a leave event when the mouse pointer entered one of its
+children. This was both unnatural and contradictive to the
+documentation.
+
+QWheelevent now carries an orientation to differentiate between
+horizontal and vertical wheels.
+
+QFocusEvent: new reason 'Backtab' (previously only 'Tab' was
+available). This makes it possible to discover from what direction on
+the tab-focus chain the widget was entered.
+
+New events: QContextMenuEvent, QIMEvent
+
+
+QFile
+-----
+
+Ported from int to Q_LONG to prepare for large file sizes on 64 bit
+systems.
+
+Filter handling made more flexible.
+
+
+QFileDialog
+-----------
+
+All new Functions:
+	void setSelectedFilter( const QString& );
+	void setSelectedFilter( int );
+New signals:
+	void filesSelected( const QStringList& );
+	void filterSelected( const QString& );
+
+If you try to specify an invalid file when using getOpenFileName(s), an error message
+will appear and the file will not be accepted.  In 2.x, this function behaved differently
+because users were using getOpenFileName(s) as a Save File Dialog; you should use
+getSaveFileName() when you require a Save File Dialog.	
+
+
+QCanvas Module
+--------------
+
+	New classes:
+		QCanvasSpline - a multi-bezier spline
+
+	QCanvasItemList
+		void update();
+
+	QCanvas:
+		QRect rect() const;
+		void setUnchanged( const QRect& area );
+		void drawArea(const QRect&, QPainter* p, bool double_buffer);
+		void drawViewArea( QCanvasView* view, QPainter* p, const QRect& r, bool dbuf );
+		QRect changeBounds(const QRect& inarea);
+
+	QCanvasView:
+		const QWMatrix &worldMatrix() const;
+		const QWMatrix &inverseWorldMatrix() const;
+		void setWorldMatrix( const QWMatrix & );
+	QCanvasSprite:
+		int leftEdge() const;
+		int topEdge() const;
+		int rightEdge() const;
+		int bottomEdge() const;
+		int leftEdge(int nx) const;
+		int topEdge(int ny) const;
+		int rightEdge(int nx) const;
+		int bottomEdge(int ny) const;
+
+QCanvasSprite can now be set to animate its frames without the need to
+subclass.
+
+
+QFont, QFontDatabase, QFontInfo, QFontMetrics
+---------------------------------------------
+
+The QFont::CharSet enum has been removed and replaced with the
+QFont::Script enum. With this change, a QFont is not associated with a
+specific character set. Instead, QFont uses Unicode Scripts for
+loading fonts.  On platforms where most fonts do not use the Unicode
+encoding (currently only X11), multiple locale and character-set
+dependent fonts can be loaded for the individual Unicode Scripts.
+
+Another new feature of QFont is a much more flexible substitution
+mechanism. Each family can have a list of appropriate substitutes. The
+font substitution feature allows you to specify a list of substitute
+fonts. Substitute fonts are used when a font cannot be loaded, or if
+the specified font doesn't have a particular character (X11 only).
+
+For example (on X11), you select the font Lucida, which doesn't have
+Korean characters. For Korean text, you want to use the Mincho font
+family. By adding Mincho to the list, any Korean characters not found
+in Lucida will be used from Mincho. Because the font substitutions are
+lists, you can also select multiple families, such as Song Ti (for use
+with Chinese text).
+
+QFontInfo and QFontMetrics had small API changes related to the
+disappearance of QFont::CharSet.  In terms of functionality, the
+behavior of these classes is unchanged.
+
+QFontDatabase had several API cleanups related to the disappearance of
+QFont::CharSet.  Most QFontDatabase member functions take one less
+argument, yet compatibility functions still exist to keep old source
+code working.
+
+Family and style names returned from QFontDatabase are now processed
+and formatted in a way that is suitable for display to users.  Family
+and foundry names are capitalized and foundry names are enclosed in
+square brackets after the family name.  For example, the Helvetica
+font family might have 3 different foundries: Adobe, Cronyx and
+Phaisarn. In 2.x, QFontDatabase listed them like this:
+
+	adobe-helvetica
+	cronyx-helvetica
+	phaisarn-helvetica
+
+Starting with 3.0, QFontDatabase lists them like this:
+
+	Helvetica [Adobe]
+	Helvetica [Cronyx]
+	Helvetica [Phaisarn]
+
+
+QFrame
+------
+
+Two new frame shapes for more sophisticated style features:
+MenuBarPanel and ToolBarPanel.
+
+
+QGrid
+-----
+
+The member type
+
+    enum Direction { Horizontal, Vertical };
+
+has been eliminated, as it is redundant: use Qt::Orientation instead.
+Old code referring to QGrid::Horizontal or QGrid::Vertical will still
+work, as QGrid counts Qt among its ancestors.
+
+
+QGroupBox
+---------
+
+More functionality of the built-in layout is exposed:
+
+	int insideMargin() const;
+	int insideSpacing() const;
+	void setInsideMargin( int m );
+	void setInsideSpacing( int s );
+
+
+QHeader
+-------
+
+New property: bool stretching
+
+New functions:
+	bool isStretchEnabled( int section );
+	void setStretchEnabled( bool b, int section );
+	
+
+QIconSet
+--------
+
+In addition to the mode - which can be either Normal, Disabled or
+Active - QIconSet now supports different pixmaps for a state, i.e. On
+or Off. The functions pixmap() and setPixmap() have been extended
+accordingly.
+
+The default constructor no longer initializes the iconset to
+contain a null pixmap. QIconSet::isNull() returns TRUE for un-
+initialized iconsets, and pixmap() still returns a null pixmap for
+pixmaps that couldn't be generated.
+
+
+QIconView
+---------
+
+Extended findItem() to support ComparisonFlags. Support for
+soft-hyphens when doing word wrap.
+
+New signal:
+	contextMenuRequested( QIconViewItem*, const QPoint& pos);
+
+
+QIconViewItem
+-------------
+
+Added support for explicit rtti.
+
+New function:
+	int rtti() const;
+
+
+
+QListBox
+--------
+
+Extended findItem() to support ComparisonFlags.
+
+New signal:
+	void contextMenu( QListBoxItem *, const QPoint & );
+
+
+QListBoxItem
+------------
+
+Added support for explicit rtti.
+
+New function:
+	int rtti() const;
+
+
+
+QListView
+---------
+
+It was never really hard to implement drag and drop with QListView,
+but since many applications demand this functionality today, we
+decided to add it to the listview itself.
+
+In addition, in-place editing and per-item tooltips have been added.
+Extended findItem() to support ComparisonFlags
+
+New properties:
+	bool showToolTips
+	ResizeMode resizeMode
+
+New signals:
+	contextMenuRequested( QIconViewItem*, const QPoint& pos);
+	void dropped( QDropEvent *e );
+	void itemRenamed( QListViewItem *item, int col, const QString & );
+	void itemRenamed( QListViewItem *item, int col  );
+
+New functions:
+	void setResizeMode( ResizeMode m );
+	ResizeMode resizeMode() const;
+	QDragObject *dragObject();
+	void startDrag();
+	void startRename();
+
+
+QListViewItem
+-------------
+
+Added support for explicit rtti.
+
+New functions:
+	void setDragEnabled( bool allow );
+	void setDropEnabled( bool allow );
+	bool dragEnabled() const;
+	bool dropEnabled() const;
+	bool acceptDrop( const QMimeSource *mime ) const;
+	void setVisible( bool b );
+	bool isVisible() const;
+	void setRenameEnabled( int col, bool b );
+	bool renameEnabled( int col ) const;
+	void startRename( int col );
+	void setEnabled( bool b );
+	bool isEnabled() const;
+	int rtti() const;
+
+	void dropped( QDropEvent *e );
+	void dragEntered();
+	void dragLeft();
+	void okRename( int col );
+	void cancelRename( int col );
+
+
+QLabel
+------
+
+In addition to text, rich text, pixmaps and movies, QLabel can now
+display QPicture vector graphics.
+
+New functions:
+
+	QPicture *picture() const;
+	void setPicture( const QPicture & );
+
+
+QLineEdit
+---------
+
+New property: bool dragEnabled
+
+New signal:
+	contextMenuRequested( QIconViewItem*, const QPoint& pos);
+
+New functions:
+	void cursorForward( bool mark, int steps = 1 );
+	void cursorBackward( bool mark, int steps = 1 );
+	void cursorWordForward( bool mark );
+	void cursorWordBackward( bool mark );
+	bool dragEnabled();
+	void setDragEnabled( bool b );
+
+
+QMainWindow
+-----------
+
+Added a dock window architecture. Previous versions of QMainWindow
+could only deal with toolbars, now they handle generalized dock
+windows. QToolBar inherits QDockWindow.
+
+
+New property:
+	bool dockWindowsMovable;
+
+New signals:
+	void dockWindowPositionChanged( QDockWindow * );
+
+New functions:
+	void setDockEnabled( Dock dock, bool enable );
+	bool isDockEnabled( Dock dock ) const;
+	bool isDockEnabled( QDockArea *area ) const;
+	void setDockEnabled( QDockWindow *tb, Dock dock, bool enable );
+	bool isDockEnabled( QDockWindow *tb, Dock dock ) const;
+	bool isDockEnabled( QDockWindow *tb, QDockArea *area ) const;
+
+	void addDockWindow( QDockWindow *, Dock = Top, bool newLine = FALSE );
+	void addDockWindow( QDockWindow *, const QString &label, Dock = Top, bool newLine = FALSE );
+	void moveDockWindow( QDockWindow *, Dock = Top );
+	void moveDockWindow( QDockWindow *, Dock, bool nl, int index, int extraOffset = -1 );
+	void removeDockWindow( QDockWindow * );
+
+	QDockArea *dockingArea( const QPoint &p );
+	QDockArea *leftDock() const;
+	QDockArea *rightDock() const;
+	QDockArea *topDock() const;
+	QDockArea *bottomDock() const;
+	
+	bool isCustomizable() const;
+	bool appropriate( QDockWindow *dw ) const;
+	QPopupMenu *createDockWindowMenu( DockWindows dockWindows = AllDockWindows ) const;
+
+	bool showDockMenu( const QPoint &globalPos );
+
+
+QMetaObject
+-----------
+
+###TODO
+
+
+QMimeSourceFactory
+------------------
+
+New static functions:
+	QMimeSourceFactory* takeDefaultFactory();
+	static void addFactory( QMimeSourceFactory *f );
+
+
+QNetworkProtocol
+----------------
+
+Spelling fix in Error::ErrListChildren enum.
+
+
+QRegExp
+-------
+
+QRegExp now has a more complete regular expression engine similar to
+Perl's, with full Unicode and backreference support.
+
+New functions:
+	bool minimal() const;
+	void setMinimal( bool minimal );
+	bool exactMatch( const QString& str );
+	bool exactMatch( const QString& str ) const;
+	int search( const QString& str, int start = 0 );
+	int search( const QString& str, int start = 0 ) const;
+	int searchRev( const QString& str, int start = -1 );
+	int searchRev( const QString& str, int start = -1 ) const;
+	int matchedLength();
+	QStringList capturedTexts();
+	QString cap( int nth = 0 );
+	int pos( int nth = 0 );
+
+
+QSessionManager
+---------------
+
+Renamed the misnamed setProperty() overloads to setManagerProperty()
+to resolve the conflict with the now virtual QObject::setProperty().
+
+
+QString
+-------
+
+New functions:
+	bool endsWith( const QString & );
+	int similarityWith( const QString & );
+
+### TODO
+
+QStyle
+------
+
+### TODO
+
+QTabBar
+-------
+
+The extended QTabWidget support in Qt Designer made two more
+functions handy to have:
+	QTab * tabAt( int ) const;
+	int indexOf( int ) const;
+
+
+
+QToolBar
+--------
+
+Inherits QDockWindow now, previously only QWidget.
+
+
+QToolButton
+-----------
+
+New property:
+	QIconSet iconSet
+
+New functions:
+	QIconSet iconSet() const;
+	virtual void setIconSet( const QIconSet & );
+
+QWidget
+-------
+
+New functions:
+
+    const QColor & eraseColor() const;
+    virtual void setEraseColor( const QColor & );
+    const QPixmap * erasePixmap() const;
+    virtual void setErasePixmap( const QPixmap & );
+
+
+
+QWizard
+-------
+
+New property: QString titleFont
+
+New functions:
+	QFont titleFont() const;
+	void setTitleFont( const QFont & );
+	int indexOf( QWidget* ) const;
+
+
+QWMatrix
+--------
+
+New function:
+	bool isIdentity() const;
+	
+
+QGL Module
+----------
+
+QGLWidget
+New functions:
+	QGLFormat requestedFormat() const;
+	QImage grabFrameBuffer( bool withAlpha = FALSE );
+
+
+QWorkspace Module
+-----------------
+
+A new property scrollBarsEnabled makes it possible to add on-demand
+scrollbars to the workspace. We define this property in Qt Designer to
+make designing forms larger than the available space on the desktop
+more comfortable.
+
+New property:
+	bool scrollBarsEnabled
+
+
+QXML Module
+-----------
+Many new functions have been added:
+	QDomImplementation
+		QDomDocumentType createDocumentType( const QString& qName, const QString& publicId, const QString& systemId );
+		QDomDocument createDocument( const QString& nsURI, const QString& qName, const QDomDocumentType& doctype );
+	QDomNode
+		QDomNode insertBefore( const QDomNode& newChild, const QDomNode& refChild );
+		QDomNode insertAfter( const QDomNode& newChild, const QDomNode& refChild );
+		QDomNode replaceChild( const QDomNode& newChild, const QDomNode& oldChild );
+		QDomNode removeChild( const QDomNode& oldChild );
+		QDomNode appendChild( const QDomNode& newChild );
+		bool hasChildNodes() const;
+		QDomNode cloneNode( bool deep = TRUE ) const;
+		void normalize();
+		bool isSupported( const QString& feature, const QString& version ) const;
+		QString namespaceURI() const;
+		QString localName() const;
+		bool hasAttributes() const;
+	QDomDocument
+		bool setContent( const QCString& text, bool namespaceProcessing=FALSE );
+		bool setContent( const QByteArray& text, bool namespaceProcessing=FALSE );
+		bool setContent( const QString& text, bool namespaceProcessing=FALSE );
+		bool setContent( QIODevice* dev, bool namespaceProcessing=FALSE );
+	QDomNamedNodeMap
+		QDomNode namedItemNS( const QString& nsURI, const QString& localName ) const;
+		QDomNode setNamedItemNS( const QDomNode& newNode );
+		QDomNode removeNamedItemNS( const QString& nsURI, const QString& localName );
+
+	QDomElement
+		QString attributeNS( const QString nsURI, const QString& localName, const QString& defValue ) const;
+		void setAttributeNS( const QString nsURI, const QString& qName, const QString& value );
+		void setAttributeNS( const QString nsURI, const QString& qName, int value );
+		void setAttributeNS( const QString nsURI, const QString& qName, uint value );
+		void setAttributeNS( const QString nsURI, const QString& qName, double value );
+		void removeAttributeNS( const QString& nsURI, const QString& localName );
+		QDomAttr attributeNodeNS( const QString& nsURI, const QString& localName );
+		QDomAttr setAttributeNodeNS( const QDomAttr& newAttr );
+		QDomNodeList elementsByTagNameNS( const QString& nsURI, const QString& localName ) const;
+		bool hasAttributeNS( const QString& nsURI, const QString& localName ) const;
+
+	
+	QXmlAttributes
+		void clear();
+		void append( const QString &qName, const QString &uri, const QString &localPart, const QString &value );
+
+	QXmlInputSource:
+		void setData( const QByteArray& dat );
+		void fetchData();
+		QString data();
+		QChar next();
+		void reset();
+		QString fromRawData( const QByteArray &data, bool beginning = FALSE );
+
+	QXmlSimpleReader:
+		bool parse( const QXmlInputSource& input, bool incremental );
+		bool parseContinue();
+
+	QXmlEntityResolver:
+		bool startEntity( const QString& name );
+		bool endEntity( const QString& name );
+
+	
+
+New classes
+-----------
+
+QAquaStyle (only on MacOS X)
+QCleanupHandler
+QComponentFactory
+QComponentFactoryInterface
+QComponentServerInterface
+QContextMenuEvent
+QDesktopWidget
+QDockArea
+QDockWindow
+QErrorMessage
+QFeatureListInterface
+QHttp [network]
+QInterfaceListInterface
+QInterfacePtr
+QIMEvent
+QLibrary
+QLibraryInterface
+QStyleFactory
+QStyleInterface
+QTextCodecInterface
+QUnknownInterface
+QUuid
+QRegExpValidator
+QTextEdit
+
+
+Renamed Classes
+---------------
+
+QArray has been renamed QMemArray
+QCollection has been renamed QPtrCollection
+QList has been renamed QPtrList
+QListIterator has been renamed QPtrListIterator
+QQueue has been renamed QPtrQueue
+QStack has been renamed QPtrStack
+QVector has been renamed QPtrVector
+
+The include file names have changed accordingly (e.g., <qmemarray.h>).
+
+
+New Modules
+-----------
+
+SQL
+	QDataBrowser
+	QDataTable
+	QDataView
+	QDateTimeEdit
+	QEditFactory
+
+
+Obsolete classes
+----------------
+
+	QSemiModal, use QDialog instead.
+	QMultiLineEdit, use QTextEdit instead.
+	QTableView, use QScrollView or QTable instead.
+	QAsyncIO, QDataSink, QDataSource, QDataPump and QIODeviceSource
+
+
+Obsolete functions
+------------------
+	QActionGroup::insert( QAction * ),  use QActionGroup::add( QAction* ) instead.
+	QApplication::setWinStyleHighlightColor( const QColor &c ), use setPalette() instead
+	QApplication::winStyleHighlightColor(), use palette() instead
+	QDir::encodedEntryList( int filterSpec, int sortSpec ), use QDir::entryList() instead
+	QDir::encodedEntryList( const QString &nameFilter, int filterSpec, int sortSpec ), use QDir::entryList() instead
+	QMainWindow::addToolBar( QDockWindow *, Dock = Top, bool newLine = FALSE );
+	QMainWindow::addToolBar( QDockWindow *, const QString &label,  Dock = Top, bool newLine = FALSE );
+	QMainWindow::moveToolBar( QDockWindow *, Dock = Top );
+	QMainWindow::moveToolBar( QDockWindow *, Dock, bool nl, int index, int extraOffset = -1 );
+	QMainWindow::removeToolBar( QDockWindow * );
+	QMainWindow::toolBarsMovable() const;
+	QMainWindow::toolBars( Dock dock ) const;
+	QMainWindow::lineUpToolBars( bool keepNewLines = FALSE );
+	QRegExp::match( const QString& str, int index = 0, int *len = 0,
+			bool indexIsStart = TRUE );
+	QToolButton::setOnIconSet( const QIconSet & )
+	QToolButton::setOffIconSet( const QIconSet & )
+	QToolButton::onIconSet() const
+	QToolButton::offIconSet() const
+	QToolButton::setIconSet( const QIconSet & set, bool on )
+	QToolButton::iconSet( bool on ) const
+	QXmlInputSource::QXmlInputSource( QFile& file ), use QXmlInputSource( QIODevice *dev ) instead.
+	QXmlInputSource::QXmlInputSource( QTextStream& stream ), use QXmlInputSource( QIODevice *dev ) instead.
+
+Removed functions:
+	QWidget::setFontPropagation
+	QWidget::setPalettePropagation
+	QMenuBar::setActItem
+	QMenuBar::setWindowsAltMode
+	QCheckListItem::paintBranches
+	QString::visual
+	QString::basicDirection
+	QRegExp::find( const QString& str, int index ) const; - has been renamed QRegExp::search()
+	QFont::charSet() const, not needed anymore
+	QFont::setCharSet( QFont::CharSet ), not needed anymore
+	QPushButton::upButton(), not relevant anymore
+	QPushButton::downButton(), not relevant anymore
+	QSpinBox::upButton(), not relevant anymore
+	QSpinBox::downButton(), not relevant anymore
+
+
+Removed preprocessor directives
+-------------------------------
+
+	qcstring.h no longer contains the following defines:
+
+		#define strlen qstrlen
+		#define strcpy qstrcpy
+		#define strcmp qstrcmp
+		#define strncmp qstrncmp
+		#define stricmp	qstricmp
+		#define strnicmp qstrnicmp
+
+	These directives were meant to automagically replace calls to the
+	above listed standard C functions with the equivalent Qt wrappers.
+	The latter pre-check the input parameters for null pointers as those
+	might cause crashes on some platforms.
+
+	Although convenient, this trick turned out to sometimes conflict with
+	third-party code, or, simply be nullified by standard system and
+	library headers depending on version and include order.
+
+	The name of some debugging macro variables has been changed.
+
+		DEBUG becomes QT_DEBUG
+		NO_DEBUG becomes QT_NO_DEBUG
+		NO_CHECK becomes QT_NO_CHECK
+		CHECK_STATE becomes QT_CHECK_STATE
+		CHECK_RANGE becomes QT_CHECK_RANGE
+		CHECK_NULL becomes QT_CHECK_NULL
+		CHECK_MATH becomes QT_CHECK_MATH
+
+	The name of some other debugging macro functions has also been changed
+	but source compatibility should not be affected if the macro variable
+	QT_CLEAN_NAMESPACE is not defined:
+
+		ASSERT becomes Q_ASSERT
+		CHECK_PTR becomes Q_CHECK_PTR
+
+	For the record these undocumented macro variables that are not part of
+	the API have been changed:
+
+		_OS_*_ becomes Q_OS_*
+		_WS_*_ becomes Q_WS_*
+		_CC_*_ becomes Q_CC_*
+
+
+[Qt 3.0]
+
diff --git a/dist/changes-3.0.0-beta2 b/dist/changes-3.0.0-beta2
new file mode 100644
index 0000000000..0d55b124b4
--- /dev/null
+++ b/dist/changes-3.0.0-beta2
@@ -0,0 +1,363 @@
+Qt 3.0 Beta2 is not binary compatible with Beta1, this means that any
+programs linked with Beta1 must be recompiled.
+
+Below you'll find a description of general changes in the Qt Library
+and Qt Designer followed by a detailed list of changes in the
+programming API.
+
+
+The Qt Library
+========================================
+
+Wacom Tablet Support
+--------------------
+
+Support for Wacom brand tablets has been introduced on Irix and
+Windows.  These devices generate a QTabletEvent that can be handled by
+QWidget::tabletEvent(). The QTabletEvent holds information about
+pressure, X and Y tilt, and which device is being used (e.g. stylus or
+eraser).  Note: at present, there are known issues with the Windows
+version.
+
+Documentation
+-------------
+
+Overall enhancements including fixed typos and the addition of several
+images and code examples.
+
+QStyle (and derived classes)
+----------------------------
+
+The style API has been completely rewritten in Qt 3.0. The main reason
+for doing this was because it was getting inconsistent, hard to
+maintain and extend. Most of the old 2.x functions have been replaced
+by a small set of more general functions. The new API is:
+
+ - much more consistent
+ - less work have to be done to create custom styles
+ - easier to extend and maintain binary compatibility
+
+The old API relied upon a host of virtual functions that were
+re-implemented in the different styles. These functions were used to
+draw parts of, or entire widgets. The new API uses a small set of more
+general functions. Enumerated values are passed as parameters to these
+functions to specify which parts of a control or widget is to be drawn
+(e.g drawPrimitive( PE_ArrowUp, ...)).
+
+To create custom styles with the new API, simply subclass from the
+preferred base style and re-implement the function that draws the part
+of the widget you want to change. If you for example want to change
+the look of the arrows that are used in QWindowsStyle, subclass from
+it and re-implement the drawPrimitive() function. Your drawPrimitive()
+function may look something like this:
+
+void QMyStyle::drawPrimitive( PrimitiveElement pe, ... )
+{
+        switch( pe ) {
+        case PE_ArrowUp:
+                // draw up arrow
+                break;
+        case PE_ArrowDown:
+                // draw down arrow
+                break;
+        default:
+                // let the base class handle the rest of the drawing
+                QWindowsStyle::drawPrimitive( ... );
+                break;
+        }
+}
+
+For more information about the new style API, please read the QStyle
+documentation.
+
+
+Qt Designer
+========================================
+
+ - Improved indentation algorithm for the code editor.
+ - Allow multiple code editors to be open. This makes copy and paste
+   much easier.
+
+
+Qt Functions
+========================================
+
+QCanvas
+-------
+
+ - QCanvas does not react on windowActivationChange() anymore.
+ - 64 bit cleanup.
+
+QChar
+-----
+
+ - The Unicode character is stored host ordered now. Main advantage is
+   that you can directly cast a QChar array to an array of unsigned shorts.
+
+QCom
+----
+
+ - Introduced QS_OK, QS_FALSE, QE_NOINTERFACE, QE_INVALIDARG and
+   QE_NOIMPL as possible QRESULT return values.
+
+QDate, QTime and QDateTime
+--------------------------
+
+ - New function for outputting free form strings and new DateFormat
+   enum Qt::LocalDate.
+
+New functions:
+	QString	toString( const QString& format );
+
+QDir
+----
+
+ - entryInfoList() returns 0 for non-existing directories on Windows
+   as the documentation claims and the Unix version already does.
+ - On Windows, QDir tries a more failsafe way to determine the home
+   directory.
+
+QDom
+----
+
+ - QDomNode::hasChildNodes() now works as documented.
+ - QDomDocument::toString() includes now namespaces in its output.
+ - QDomDocument::QDomDocument() constructor now allows adding children
+   to the document.
+
+QFileDialog
+-----------
+
+ - Various fixes in file type filter and handling of file names and
+ directories.
+
+QEvent
+------
+
+ - New event type DeferredDelete. See QObject changes below.
+
+QGL
+---
+
+ - Fix for Irix in respect of installing colormaps.
+ - Swapped arguments of QGLColormap::setEntries() in order to be able
+   to use a meaningful default argument.
+
+New class:
+	QGLColormap - class for manipulating colormaps in GL index mode.
+
+QGridView
+---------
+
+A new class that provides an abstract base for fixed-size grids.
+
+QIconSet
+--------
+
+New function:
+	void clearGenerated();
+
+QImage
+------
+
+ - Handlers for image formats can be dynamically loaded as a plug-in by
+ using the QImageFormatInterface.
+
+QLabel
+------
+
+ - setIndent() behaves like documented.
+
+QLineEdit
+---------
+
+New function:
+	int characterAt( int xpos, QChar *chr ) const;
+
+QLibrary
+--------
+
+Enabled plug-in loading with static Qt library (Windows).
+
+QMovie
+------
+
+ - Does pixmap caching now. Reduces load e.g. on the X Server in the
+ case of animated gifs.
+
+QObject
+-------
+
+ - Added a deferredDelete() function that will cause the object to
+ delete itself once the event loop is entered again.
+
+ - A second type of destroyed signal - one that passes a pointer to
+ the destroyed object as a parameter - will be emitted in QObject's
+ destructor.
+
+New signal:
+	void destroyed( QObject* obj );
+
+New slot:
+	void deferredDelete();
+
+QPainter
+--------
+
+ - So far clipping had always been done in the device coordinate
+   system. The newly introduced ClipMode allows clipping regions to be
+   set via setClipRect() and setClipRegion() in painter coordinates.
+
+New enum:
+	enum ClipMode { ClipDevice, ClipPainter };
+
+Extended functions:
+	QRegion clipRegion( ClipMode = ClipDevice ) const;
+	void setClipRect( const QRect &, ClipMode = ClipDevice )
+	void setClipRect( int x, int y, int w, int h, ClipMode = ClipDevice );
+	void setClipRegion( const QRegion &, ClipMode = ClipDevice );
+
+QPrintDialog
+------------
+
+ - Allow overriding the default print dialog. This way it's possible
+   to better cope with the variety of existing print systems (API not
+   finalized, yet).
+ - The dialog reads current QPrinter on every invocation now.
+
+New functions:
+	static void setGlobalPrintDialog( QPrintDialog * );
+	virtual bool setupPrinters ( QListView *printers );
+
+QPrinter
+--------
+
+ - X11 version only: Introduced Qt settings switch 'embedFonts' that
+   allows disabling font embedding to reduce size of PostScript output.
+
+QProcess
+--------
+
+ - Added function to retrieve the pid (Unix) or PROCESS_INFORMATION
+   (Windows) from a running process.
+ - Extra parameter for environment settings in start() and launch()
+   functions.
+
+New/extended functions:
+	PID processIdentifier();
+	virtual bool start( QStringList *env=0 );
+	virtual bool launch( const QString& buf, QStringList *env=0  );
+	virtual bool launch( const QByteArray& buf, QStringList *env=0  );
+
+New signal:
+	void launchFinished();
+
+QServerSocket
+-------------
+
+ - Set the SO_REUSEADDR option so that the server can be restarted.
+
+QSocket
+-------
+
+ - Make deletion of QSocket instances safe if it is in response to a
+   signal emitted by the object itself.
+
+SocketDevice
+------------
+
+ - Optional boolean parameter to be able to distinguish between
+   timeout and connection closed by peer when waitForMore() returns.
+
+Extended functions:
+	int waitForMore( int msecs, bool *timeout=0 ) const;
+
+QStyleSheet
+-----------
+
+ - Added helper function that escapes HTML meta-characters.
+
+New function:
+	QString escape( const QString& plain);
+
+QSql
+----
+
+ - The source of the SQL driver plug-ins have been moved to
+   $QTDIR/plugins/src/sqldrivers/.
+ - The postgres driver checks the version number of the server. So there is
+   no need for different drivers: QPSQL6 no longer exists -- use QPSQL7
+   instead.
+ - Postgres driver supports now 3 PostgreSQL back ends: 6.x, 7.0.x and 7.1.x
+ - Better handling of errors coming from the database.
+ - SQL driver for Microsoft SQL Server and Sybase Adaptive Server (TDS).
+ - Added caching for forward-only cursors.
+ - Avoid crashes on the unloading of SQL plugins that occurred on some
+   platforms.
+ - QSqlResults can be forward only to improve performance
+   (QSqlResult::setForwardOnly()).
+ - QSqlDatabase passes the port number to the SQL driver.
+
+QTable
+------
+
+ - No longer calls processEvents() in columnWidthChanged() and
+   rowHeightChanged() in order to avoid any side effects.
+ - Ensure that mousePressEvent doesn't emit contextMenuRequested(),
+   unless it is called from the contextMenu event handler.
+ - For more useful subclassing the new functions listed below have
+   been added.
+
+New functions:
+	bool isEditing() const;
+	EditMode editMode() const;
+	int currEditRow() const;
+	int currEditCol() const;
+
+QTextCodec
+----------
+
+ - Fixes for characters in the 0x80..0xff range.
+
+QTextEdit
+---------
+
+ - The rich text engine has seen many internal improvements and
+   additions to the QTextEdit class.
+
+New functions:
+	virtual void scrollToBottom();
+	virtual void removeSelection( int selNum = 0 );
+	virtual bool getParagraphFormat(...);
+	virtual void insertParagraph( const QString &text, int para );
+	virtual void removeParagraph( int para );
+	virtual void insertAt( const QString &text, int para, int index );
+	QRect paragraphRect( int para ) const;
+	int paragraphAt( const QPoint &pos ) const;
+	int charAt( const QPoint &pos, int *para ) const;
+	
+QUrlOperator
+------------
+
+ - More precise error messages.
+
+QWidget
+-------
+
+ - Added a read-only property containing the widget's background brush.
+
+New function:
+	virtual const QBrush& backgroundBrush() const;
+
+QWMatrix
+--------
+
+ - New functions for mapping of geometric elements via matrix
+   multiplication semantics.
+
+New functions:
+	QRect mapRect( const QRect & );
+	QPoint operator * (const QPoint & ) const;
+	QRegion operator * (const QRect & ) const;
+	QRegion operator * (const QRegion & ) const;
+	QPointArray operator *  ( const QPointArray &a ) const;
diff --git a/dist/changes-3.0.0-beta3 b/dist/changes-3.0.0-beta3
new file mode 100644
index 0000000000..cc49e6e47c
--- /dev/null
+++ b/dist/changes-3.0.0-beta3
@@ -0,0 +1,278 @@
+Qt 3.0 Beta3 is not binary compatible with Beta2, this means that any
+programs linked with Beta2 must be recompiled.
+
+Below you'll find a description of general changes in the Qt Library
+and Qt Designer followed by a detailed list of changes in the
+programming API.
+
+
+The Qt Library
+========================================
+
+Documentation
+-------------
+
+Overall enhancements include fixed typos, corrected grammar and
+spelling, and the addition of several images and code examples. Most
+classes now have useful detailed descriptions. Documentation accuracy
+and usability has been generally improved.
+
+Styles
+------
+
+In Qt 3.0.0 Beta2, only the Windows and Motif styles were implemented with
+the new style API. Now the missing styles (MotifPlus, Platinum, SGI and
+CDE) are included.
+
+MNG
+---
+
+Updated the libmng that is shipped with Qt to version 1.0.2.
+
+Wacom Tablet Support
+--------------------
+
+Fixes for Windows to solve the problem of creating a context for every
+widget and the problem of opening the dialog and losing the ability to use
+the tablet afterwards.
+
+
+Qt Designer
+========================================
+
+ - Added the ability to sort the property editor either by category
+   (default and old behaviour) or alphabetically.
+
+ - Added the option "-nofwd" to uic which supresses the generation of
+   forward declarations for custom classes in the generated output.
+
+-  The way how custom slots and editing these slots directly in the Qt
+   Designer is handled has been changed. Originally the code for these
+   slots was saved into the .ui XML file together with the user
+   interface description and the uic did put this code into the
+   generated source files.
+   Now, if code of custom slots is edited directly in the Qt Designer,
+   additionally to the <filename>.ui of a form, a <filename>.ui.h file
+   is created. The code is written into this source file now instead
+   of the .ui file.
+   This way the code of custom slots can be also easily edited outside
+   the Qt Designer without subclassing, and it is possible to edit it
+   both, in the Qt Designer and outside the Qt Designer without
+   conflicts, as this is a plain text C++ file.
+   Uic now automatically includes this source file into the generated
+   sources (if it exists) and, in this case, does not create empty
+   stubs for the custom slots in the generated sources anymore. So
+   this code file has not to be added to the project Makefile. If the
+   source file does not exist, uic falls back to the old behavior and
+   creates the empty stubs in the generated source.
+   If a user does not want to subclass to implement the custom slots,
+   but also does not want to edit the code of the custom slots in the
+   Qt Designer, it is possible to always create the <formname>.ui.h
+   for a form (even if it was not edited in the Qt Designer) and edit
+   that file in a seperate editor. This feature can be configured in
+   the project settings dialog.
+   This way, the old approach of subclassing keeps working (and all
+   old .ui files keep working without any change). Also, for users of
+   the previous Qt 3.0 Beta versions, Qt Designer can still read the
+   .ui files which contain code. So also .ui files created with Qt 3.0
+   Beta versions of the Qt Designer keep working without any change.
+   Details about the possible concepts which can be used to add code
+   to a form created by the Qt Designer (subclassing and uic +
+   <filename>.ui.h) and related information about project management
+   can be found in the chapter about new features in Qt Designer 3.0
+   in the Qt Designer manual.
+
+
+Qt Functions
+========================================
+
+QApplication
+------------
+
+ - flush() no longer calls sendPostedEvents(), as this might be unsafe
+   under certain circumstances.
+
+QDataTable
+----------
+
+ - Now uses the new row selection mode of QTable.
+
+QDomDocument
+------------
+
+ - Fixed the toString() function to work properly with namespaces.
+ - In Qt 3.0.0 Beta2, there was a workaround for Microsoft's XML parser,
+   so that the toString() function did not output a doctype that consists
+   only of the name. This workaround is semantically wrong; it was
+   reverted.
+
+QDateEdit
+---------
+
+ - Fixed wrong default size policy and missing size hint.
+ - Improved focus and tab handling.
+
+QEffects
+--------
+
+ - Tooltips and popup menus scroll and fade again
+
+QTable
+------
+
+ - Fixed right mouse button handling.
+ - Implemented row selection modes. This implied adding the new enum values
+   SingleRow and MultiRow to the enum SelectionMode.
+ - Doubleclick clears selections completely now.
+ - Allow different focus styles, namely FollowStyle (draw it as the style
+   tells you) and SpreadSheet (draw it as it is done in common spreadsheet
+   programs).
+
+New functions:
+	virtual void setFocusStyle( FocusStyle fs );
+	FocusStyle focusStyle() const;
+	virtual QRect cellRect( int row, int col ) const;
+
+QTimeEdit
+---------
+
+ - Fixed wrong default size policy and missing size hint.
+ - Improved focus and tab handling.
+
+QTextEdit
+---------
+
+ - QTextCursor is an internal class, so the signal
+   cursorPositionChanged(QTextCursor*) is only of limited use. Added a
+   more useful signal in addition.
+
+ - Overrides accelerators for all shortcuts used to edit text.
+
+New signal:
+	void cursorPositionChanged( int para, int pos );
+
+QLineEdit
+---------
+
+ - Overrides accelerators for all shortcuts used to edit text.
+
+QLibrary
+--------
+
+ - Static overload for resolve as a convenience function.
+
+New function:
+	static void *resolve( const QString &filename, const char * );
+
+QListView
+---------
+
+ - A bug that was introduced in Qt 3.0.0 beta 2 made listviews with
+   lots of items very slow. This problem has been fixed.
+
+QProcess
+--------
+
+ - exitStatus() did not work for negative values on Unix. This is fixed
+   now.
+ - Fixed problems on Unixware.
+
+QRichtext
+---------
+
+ - Fixed searching backwards.
+ - Fixed some BIDI text-rendering problems.
+
+QSound
+------
+
+ - Simplified the API to allow easier extension.
+
+New functions:
+	bool isAvailable();
+	int loops() const;
+	int loopsRemaining() const;
+	void setLoops(int);
+	QString fileName() const;
+	bool isFinished() const;
+
+New slot:
+	void stop();
+
+Removed function:
+	bool available();
+
+QSpinBox
+--------
+
+ - Spin box arrows were not updated correctly when the widget was
+   disabled/enabled. This problem is fixed now.
+ - Improved handling of the case when a spinbox accepts a value: now it
+   also accepts it if the spinbox loses focus or is hidden.
+
+QSqlCursor
+----------
+
+ - Add functions to set the generated flag. This is used to avoid the
+   generation of malformed SQL statements.
+
+New functions:
+	void setGenerated( const QString& name, bool generated );
+	void setGenerated( int i, bool generated );
+
+QSqlDriver
+----------
+
+ - Add new function hasFeature( QSqlDriver::DriverFeature ) const which
+   allows you to query whether the driver supports features like SQL
+   transactions or Binary Large Object fields. The functions
+   hasQuerySizeSupport(), canEditBinaryFields() and hasTransactionSupport()
+   are therefore obsolete and have been removed.
+
+New function:
+	bool hasFeature( QSqlDriver::DriverFeature ) const;
+
+Removed functions:
+	bool hasQuerySizeSupport() const;
+	bool canEditBinaryFields() const;
+	bool hasTransactionSupport() const;
+
+QSqlField
+---------
+
+ - The bool argument of setNull() was removed since it does not make sense
+   to set a field to non null.
+
+QTabWidget
+----------
+
+ - Use the functions below to add tool tips to the individual tabs in a
+   QTabWidget.
+
+New functions:
+	void removeTabToolTip( QWidget * w );
+	void setTabToolTip( QWidget * w, const QString & tip );
+	QString tabToolTip( QWidget * w ) const;
+
+QTabBar
+-------
+
+ - Use the functions below to add tool tips to the individual tabs in a
+   QTabBar.
+
+New functions:
+	void removeToolTip( int id );
+	void setToolTip( int id, const QString & tip );
+	QString toolTip( int id ) const;
+
+QTextStream
+-----------
+
+ - The global functions setw(), setfill() and setprecison() were deleted
+   since they conflict with the std classes. If you need the functionality,
+   use qSetW(), qSetFill() and qSetPrecision() instead.
+
+Removed functions:
+	QTSManip setw( int w )
+	QTSManip setfill( int f )
+	QTSManip setprecision( int p )
diff --git a/dist/changes-3.0.0-beta4 b/dist/changes-3.0.0-beta4
new file mode 100644
index 0000000000..a3f44a5569
--- /dev/null
+++ b/dist/changes-3.0.0-beta4
@@ -0,0 +1,688 @@
+Qt 3.0 Beta4 is not binary compatible with Beta3; any programs linked
+against Beta3 must be recompiled.
+
+Below you will find a description of general changes in the Qt
+Library and Qt Designer followed by a detailed list of changes in the
+API.
+
+
+The Qt Library
+========================================
+
+Documentation
+-------------
+
+The extensive revision of the documentation is almost complete.
+We have added new navigation options, including a shorter list
+of classes entitled Main Classes.
+
+Translations
+------------
+
+Qt now includes French and German translations of the Qt library, as
+well as a template for translating Qt. These files are found in the
+translations directory of Qt, in both .ts and .qm formats.
+
+Style Fixes
+-----------
+
+Qt 3.0.0 beta2 introduced a new QStyle API. This new API has changed
+between beta3 and beta4. These changes will affect both widget
+writers and style writers. The QStyle entry below explains what has
+changed.
+
+Beta4 also introduces some fixes for bugs introduced during the port
+to the new API in various widgets, notably QComboBox and QSlider.
+
+LiveConnect Plugin
+------------------
+
+A few bugs were fixed in the LiveConnect Plugin so that the grapher
+example works again on Windows.
+
+
+Qt Designer
+========================================
+
+ - General usability improvements and bug fixes, and improved file
+   and project handling.
+ - Updated designer manual to cover the .ui.h mechanism.
+ - New auto-indentation algorithm in the code editor.
+
+
+Qt Assistant
+========================================
+
+ - Added a Settings dialog and made more features customizable.
+ - Sessions are now saved and restored.
+ - A brief introduction to using Qt Assistant is now included.
+
+
+Qt Linguist
+========================================
+
+ - Phrase books are now provided in tools/linguist/phrasebooks.
+ - Added support for Qt Designer's .ui.h mechanism to lupdate.
+ - Support for a larger subset of .pro file syntax in lupdate and
+   lrelease.
+
+
+Qt Functions
+========================================
+
+QApplication
+------------
+
+ - Ignore drag-and-drop events for disabled widgets.
+ - Always send ChildRemoved events, even if no ChildInserted event
+   was sent.
+ - Mouse events for popup menus are now sent to event filters.
+
+QCanvasItem
+-----------
+
+ - The functions visible(), selected() and active() have been renamed
+   setVisible(), setSelected() and setActive().
+
+New functions:
+	bool isVisible() const;
+	bool isSelected() const;
+	bool isActive() const;
+
+Removed functions:
+	bool visible() const;
+	bool selected() const;
+	bool active() const;
+
+QCanvasText
+-----------
+
+ - Fixed alignment flags.
+
+QChar
+-----
+
+New function:
+	bool isSymbol() const;
+
+QCheckBox
+---------
+
+ - Fixed a bug in pixmap caching which could result in using the
+   wrong pixmap.
+
+QCheckListItem
+--------------
+
+ - After a mouse click, the list view ignores the following double
+   click as in Windows XP.
+
+QClipboard
+----------
+
+ - Made clipboard operations faster on X11.
+
+QColorDialog
+------------
+
+ - Never show scrollbars in the color array.
+
+QComboBox
+---------
+
+ - Comboboxes are now drawn correctly in all styles.
+ - Fixed bug with auto completion. There was undefined behavior with
+   non-editable comboboxes when changing focus.
+
+New function:
+	virtual void setCurrentText( const QString& );
+
+New property:
+	QString currentText
+
+QDataBrowser
+------------
+
+ - The setCursor() function is obsolete and will be removed for Qt 3
+   release due to the incompatibility with some compilers. Use
+   setSqlCursor() instead.
+
+QDataTable
+----------
+
+ - Dates and times in tables can now be displayed in different
+   display formats.
+ - The setCursor() function is obsolete and will be removed for Qt 3
+   release due to the incompatibility with some compilers. Use
+   setSqlCursor() instead.
+
+QDateEdit
+---------
+
+ - The default separator and the day-month-year order respect the
+   user's settings.
+ - Pressing the separator key now skips to the next section.
+ - Fixed a usability flaw related to some months being longer than
+   others.
+
+New functions:
+	QString separator() const;
+	virtual void setSeparator( const QString& s );
+
+QDateTime
+---------
+
+ - Always initialize the tm struct completely. This fixes a problem
+   on some versions of Unix.
+
+QDir
+----
+
+ - QDir::homeDirectory() now always returns an existing directory on
+   Windows.
+
+QDockWindows
+------------
+
+ - Fixed dockwindows created in non-dock areas.
+ - Fixed constructor if InDock and the parent is a QMainWindow.
+
+QDom...
+-------
+
+ - Fixes in the conversion of the DOM tree to a string.
+
+QDomNodeList
+------------
+
+ - Fixed a crash.
+
+QFileDialog
+-----------
+
+ - Select contents of the line edit at startup (if any) so that the
+   user can overwrite the provided file name right away.
+
+QFileInfo
+---------
+
+ - In adition to lastModified() and lastRead(), provide created().
+
+New function:
+	QDateTime created() const;
+
+QFont
+-----
+
+ - Provide more correct font metrics under X11.
+ - Worked around X11 limits on length of strings to draw and on
+   coordinate sizes.
+ - Fixed sone point vs. pixel size issues under X11.
+ - Added PreferAntialias and NoAntialias flags to StyleStrategy enum
+   type.
+
+QFtp
+----
+
+ - Fixed a QSocket bug that made QFtp crash if the connection was
+   refused.
+ - Fixed operationRename() and operationRemove().
+ - Set the right state when finished.
+
+QGIFFormat
+----------
+
+ - Support GIF files with broken logical screen size.
+
+QHeader
+-------
+
+ - Added support for '\n' in header labels.
+ - Improved placement of icon.
+
+QHttp
+-----
+
+ - If the status code of the reply is an error code, it is now also
+   reflected in the status of the network operation. The error
+   handling in general was improved.
+
+QImageIO
+--------
+
+ - Allow gamma correction to be set programmatically.
+
+New functions:
+	void setGamma( float gamma );
+	float gamma() const;
+
+QKeyEvent
+---------
+
+ - Worked around an X11 bug in isAutoRepeat().
+
+QKeySequence
+------------
+
+A new class that encapsulates a key sequence as used by accelerators.
+
+QLabel
+------
+
+ - Made the WordBreak alignment property work with rich text labels
+   in addition to plain text labels.
+
+QLayout
+-------
+
+ - Fixed crashes with deleting widgets managed by the layout.
+ - Fixed problems with reparenting widgets managed by the layout.
+ - Respect maximumHeight() of items in heightForWidth().
+
+QLibrary
+--------
+
+ - Plugins now return the version number, threading model and debug
+   vs. release mode of the Qt library used in ucm_initialize(). If
+   there is any kind of incompatibility, cancel the loading.
+
+QLineEdit
+---------
+
+ - Update the "edited" flag and the accessibility data better than
+   before.
+ - Fixed setMaxLength().
+ - Fixed context menu problem on Windows.
+
+New functions:
+	bool isUndoAvailable() const;
+	bool isRedoAvailable() const;
+
+QListViewItem
+-------------
+
+ - Fixed setVisible(TRUE) which triggered an update too soon.
+
+QMenuBar
+--------
+
+ - Cancel alt-activation of menubar on mouse press/release.
+ - On wheel events, all popup menus are now closed instead of hidden.
+   Hiding popup menus confused QMenuBar.
+
+QObject
+-------
+
+ - Have QObject dispatch events to customEvents().
+
+QPainter
+--------
+
+ - Renamed the enum type ClipMode to CoordinateMode. The enum values
+   ClipDevice and ClipPainter are now called CoordDevice and
+   CoordPainter.
+ - Fixed escaping of ampersand character, so "&&", "&&&", etc., now
+   work as they did in Qt 2.x.
+
+New functions:
+	void drawPixmap( const QRect& r, const QPixmap& pm );
+	void drawImage( const QRect& r, const QImage& img );
+
+QPicture
+--------
+
+ - Respect the size of a loaded SVG document.
+ - Solved a replay-transformed-picture problem.
+ - Fixed format version number.
+
+QPluginManager
+--------------
+
+ - Fixed crash when loading a plugin fails.
+
+QPopupMenu
+----------
+
+ - Custom menu items that are separators now see their size hint
+   respected.
+ - Fixed crash when drawing an empty popup menu.
+
+QPrinter
+--------
+
+ - Better printing in different resolutions under both Windows and
+   X11.
+ - Support for collation under Windows and X11.
+ - Correct bounding rectangles for texts in all printer modes.
+ - Fixed pixmap printing on Windows.
+ - Fixed PostScript font names for fonts with foundries.
+ - Support for PostScript printing of scaled images.
+
+New functions:
+	bool collateCopiesEnabled() const;
+	void setCollateCopiesEnabled( bool enable ) const;
+	bool collateCopies() const;
+	void setCollateCopies( bool on );
+	int winPageSize() const; /* Windows only */
+
+QProcess
+--------
+
+ - The function hangUp() was renamed to tryTerminate() to make the
+   purpose more clear. Furthermore, under Unix, the signal that is
+   sent was changed from SIGHUP to SIGTERM.
+ - The function kill() and the function tryTerminate() (formerly
+   hangUp()) were made slots.
+
+New slots:
+	void tryTerminate();
+	void kill();
+
+Removed functions:
+	void hangUp();
+	void kill();
+
+QProgressBar
+------------
+
+ - Draw the progress bar correctly with respect to the properties
+   "percentageVisible", "indicatorFollowsStyle" and
+   "centerIndicator".
+
+QPtrVector
+----------
+
+ - Support null items without triggering an assert.
+
+QPushButton
+-----------
+
+ - Fixed the sizeHint() of buttons with an icon.
+
+QRegExp
+-------
+
+ - Fixed a subtle bug in regular expressions mixing anchors and
+   alternation.
+
+QRegion
+-------
+
+ - Don't crash when creating a QRegion from an empty point array.
+
+QRichText
+---------
+
+ - Improved alignment support, including nested alignments.
+ - Improved table margin support.
+ - Improved page break algorithm.
+ - Do not eat '\n' in preformatted items.
+ - Do not draw the internal trailing space at the end of a paragraph.
+ - Fixed link underlining in table cells and other subdocuments.
+ - Use larger vertical margin between paragraphs.
+ - Display paragraph spacing even when printing.
+ - Support vertical table cell alignment.
+ - Fix for floating items and table cell size calculation.
+ - Improved allignment handling.
+ - Offset fixes for tabs.
+ - Better <div> support.
+ - Fixed <br> tag.
+ - Fix for the <center> tag and centering tables.
+ - Fixed &nbsp; and <nobr>.
+ - Fixed off-by-one bug in gotoWordLeft() and gotoWordRight().
+ - Better positioning of super- and subscripts.
+ - Faster printing of large tables by using a clipping rectangle.
+ - Improved high-resolution printing.
+ - Correct sizes for images when printing.
+ - Fixed list painting when printing.
+ - Use right background for printing.
+
+QScrollBar
+----------
+
+ - Made setValue() a slot.
+
+New slot:
+	void setValue( int );
+
+Removed function:
+	void setValue( int );
+
+QSettings
+---------
+
+ - Added support for QStringLists without requiring a distinct
+   separator.
+ - Added support for null strings, empty lists and null strings in
+   lists.
+ - Fixed bug with values ending with a backslash.
+ - On Unix, don't overwrite files if the user doesn't have permission.
+
+QSimpleRichText
+---------------
+
+ - Implemented vertical breaks and floating elememts.
+ - Fixed bug with borders and clipping in printing.
+ - Fixed bug in adjustSize() cache.
+
+QSizePolicy
+-----------
+
+ - Stretch factors were added to QSizePolicy.
+ - Added a new size policy: Ignored.
+
+New functions:
+	uint horStretch() const;
+	uint verStretch() const;
+	void setHorStretch( uchar sf );
+	void setVerStretch( uchar sf );
+
+QSpinBox
+--------
+
+New slot:
+	virtual void selectAll();
+
+QSqlDatabase
+------------
+
+ - QSqlDatabase now provides access to meta-data. Meta-data is stored
+   in two new classes, QSqlFieldInfo and QSqlRecordInfo. See the
+   class documentation for details.
+
+New Functions:
+	QSqlRecordInfo recordInfo ( const QString & tablename ) const
+	QSqlRecordInfo recordInfo ( const QSqlQuery & query ) const
+
+
+QSqlFieldInfo
+-------------
+
+A new class that stores meta data associated with a SQL field.
+
+QSqlRecordInfo
+--------------
+
+A new class that is keeping a set of QSqlFieldInfo objects.
+
+QStatusBar
+----------
+
+ - Don't cut off the bottom line of the border of the status bar.
+ - Respect maximumHeight() of items in the status bar.
+
+QString
+-------
+
+ - QString now provides section(), a function that parses simple
+   fields.
+ - The function similarityWith() has been removed from the API. If
+   you need it, write to qt-bugs@trolltech.com.
+
+New functions:
+	QString section( QChar sep, int start, int end,
+			 int flags = SectionDefault ) const;
+	QString section( char sep, int start, int end = 0xffffffff,
+			 int flags = SectionDefault ) const;
+	QString section( const char *substr, int start, int end = 0xffffffff,
+			 int flags = SectionDefault ) const;
+	QString section( QString substr, int start, int end = 0xffffffff,
+			 int flags = SectionDefault ) const;
+	QString section( const QRegExp &regxp, int start, int end = 0xffffffff,
+			 int flags = SectionDefault ) const;
+	
+Removed function:
+	int similarityWith( const QString& target ) const;
+
+QStyle
+------
+
+ - Changed "void **" technique to QStyleOption technique. This
+   affects the interface of most of the QStyle member functions.
+   Please read the QStyle class documentation for details.
+
+QStyleOption
+------------
+
+A new class that encapsulates extra data sent to the style API.
+
+QTabBar
+-------
+
+ - The accelerators are now working correctly after changing a tab.
+
+QTable
+------
+
+ - Fixed crash related to popup menu and cell edition.
+ - Fixed not-drawing hidden cells.
+
+QTextCodec
+----------
+
+ - Added MIME names for codecs.
+ - Improved locale detection.
+ - Fixed the ISO 8859-6.8x (Arabic) font encoding.
+
+New function:
+	const char *mimeName() const;
+
+QTextStream
+-----------
+
+ - Fixed bug with stateful QTextEncoders.
+
+QTextEdit
+---------
+
+ - Respect disabling updates.
+ - Fixed link underlining in table cells and other subdocuments.
+ - Draw cursor on focus in.
+ - Emit cursorPositionChanged() where it previously was missing.
+ - Fixed sync().
+
+New functions:
+	bool isUndoAvailable() const;
+	bool isRedoAvailable() const;
+	bool isUndoRedoEnabled() const;
+	virtual void setUndoRedoEnabled( bool enabled ) const;
+
+New property:
+	bool undoRedoEnabled
+
+QThread
+-------
+
+ - Fixed QThread::sleep() on Unix.
+
+QTime
+-----
+
+ - fromString() with format Qt::ISODate now recognizes milliseconds
+   if they are specified.
+ - Make elapsed() a const function.
+
+QTimeEdit
+---------
+
+ - The default time separator respects the user's settings.
+ - Pressing the separator key now skips to the next section.
+
+New functions:
+	QString separator() const;
+	virtual void setSeparator( const QString& s );
+
+QTooltip
+--------
+
+ - Hide active tooltips when the user switches to another application.
+ - Fixed tooltips with Windows effects enabled.
+
+QUrl
+----
+
+ - Fixed password encoding.
+
+New function:
+	bool hasPort() const;
+
+QValidator
+----------
+
+ - Let QValidator, QIntValidator, QDoubleValidator and
+   QRegExpValidator have QObject parents rather than only QWidget
+   parents.
+
+QVariant
+--------
+
+ - Added QBitArray support.
+ - The QDateTime type now supports asDate() and asTime().
+ - The QByteArray type now supports toString().
+
+New functions:
+	QVariant( const QBitArray& );
+	const QBitArray toBitArray() const;
+	QBitArray& asBitArray();
+
+QWhatsThis
+----------
+
+ - Added support for hyperlinks in "What's This?" help windows.
+
+QWidget
+-------
+
+ - Fixed crashes related to LayoutHint events.
+
+QWizard
+-------
+
+ - Made removePage() behave as documented.
+ - Fixed back() so that it skips irrelevant pages like next().
+
+QWorkspace
+----------
+
+ - Make sure that the widget state is set before the first titlebar
+   painting is triggered.
+ - Use the right pixmap for titlebar.
+ - Respects widget flags better for titlebars in QCommonStyle.
+ - Fixed move and resize in the system menu bar of workspace
+   children.
+
+QXml
+----
+
+ - Made the "prefix" xmlns map to the namespace name
+   http://www.w3.org/2000/xmlns/.
+ - Fixed default namespaces.
+
+QXmlAttributes
+--------------
+
+ - Added count() as equivalent to length() to be consistent with Qt
+   conventions.
+
+New function:
+	int count() const;
diff --git a/dist/changes-3.0.0-beta5 b/dist/changes-3.0.0-beta5
new file mode 100644
index 0000000000..174a1b3e3a
--- /dev/null
+++ b/dist/changes-3.0.0-beta5
@@ -0,0 +1,316 @@
+Qt 3.0 beta 5 is not binary compatible with beta 4; any programs
+linked against beta 4 must be recompiled.
+
+Below you will find a description of general changes in the Qt
+Library and Qt Designer followed by a detailed list of changes in the
+API.
+
+
+The Qt Library
+========================================
+
+Documentation
+-------------
+
+The extensive revision of Qt classes' documentation is complete. The
+front page of the Qt documentation (index.html) has been redesigned
+to provide better access to other documentation than class
+documentation.
+
+OpenGL Module
+-------------
+
+Qt beta 5 provides some fixes which will make rendering GL widgets to
+pixmaps work on a wider range of X servers.
+
+QDateTimeEdit
+-------------
+
+The QDateTimeEdit, QDateEdit and QTimeEdit widgets have been moved
+from the SQL module to the Qt core widget set. All users of Qt can
+now use these widgets.
+
+
+Qt Designer
+========================================
+
+ - Some bugs related to the .ui.h feature were fixed.
+
+ - The generation of code related to QSqlCursor has been fixed.
+
+ - When removing a slot implementation from the Qt Designer
+   interface, do not accidentally remove a preceding comment.
+
+ - Improved the C++ code indenter in the editor for some C++
+   constructs, including try-catch blocks.
+
+
+Qt Linguist
+========================================
+
+ - Fixed problem with loading phrase books containing non-ASCII
+   characters.
+
+
+Qt Classes
+========================================
+
+QApplication
+------------
+
+ - Fixed a clipboard bug related to drag-and-drop on X11.
+
+QColorDialog
+------------
+
+ - Fixed repaint problem.
+
+QComboBox
+---------
+
+ - Never inserts empty strings in the list.
+ - Use the drop-down listbox's size hint in the combobox if the
+   listbox has been set manually.
+
+QComponentInterface
+-------------------
+
+ - This class has been renamed QComponentInformationInterface.
+
+QComponentServerInterface
+-------------------------
+
+ - This class has been renamed QComponentRegistrationInterface.
+
+QDataBrowser
+------------
+
+ - The setCursor() function is obsolete and has been removed due to
+   problems with some compilers. Use setSqlCursor() instead.
+
+QDataTable
+----------
+
+ - Fixed a rare crash when the database is deleted while its popup is
+   still open.
+ - Made setColumnWidth() a public slot like in the base class.
+ - The setCursor() function is obsolete and has been removed due to
+   problems with some compilers. Use setSqlCursor() instead.
+
+QDateTimeEdit
+-------------
+
+ - Fixed the minimumSizeHint() for better behavior in a layout.
+
+QDom
+----
+
+ - Added a sanity check.
+
+QFileDialog
+-----------
+
+ - Fixed a crash in MotifPlus style.
+ - Use the existing file-icon provider rather than the default
+   Windows one if one is set.
+
+QFont
+-----
+
+ - Fixed background color for more than 8 bits per channel.
+ - Added the font's pixel size to the value returned by key().
+
+QFtp
+----
+
+ - Correcty sets the default password to "anonymous".
+
+QGL
+---
+
+ - Added robustness on X11 for invalid pixmap parameters.
+
+QImage
+------
+
+ - Fixed loading of BGR BMP files.
+ - Changed the signature of the constructor to accept "const char *
+   const *" objects without a cast.
+
+QLatin1Codec
+------------
+
+ - Provide the missing mimeName().
+
+QLibrary
+--------
+
+ - Construct Unix-specific filenames correctly.
+
+QLineEdit
+---------
+
+ - Fixed offset for right-aligned text.
+
+QListView
+---------
+
+ - Fixed a bug with in-place renaming.
+
+QMime
+-----
+
+ - Fixed infinite loop when searching for a mime-source.
+
+QMutex
+------
+
+ - Unlock the Qt library mutex when enter_loop() is called the first
+   time, rather than when exec() is called. A programmer might call
+   QDialog::exec() and never QApplication::exec(), and then she will
+   wait for the mutex.
+
+QPixmap
+-------
+
+ - Do transformations correctly on big-endian systems.
+
+QPrinter
+--------
+
+ - Respect the PRINTER environment variable on X11, as stated in the
+   documentation.
+ - Work around a display-context bug on Windows 95 and 98.
+
+QProcess
+--------
+
+New functions:
+	void clearArguments();
+	int communication() const;
+	void setCommunication( int c );
+
+QProgressBar
+------------
+
+ - Fixed bug in repainting when a background pixmap is set.
+
+QPtrList
+--------
+
+ - Reverted a semantics change introduced in beta 4 when deleting the
+   current item.
+
+QRegExp
+-------
+
+ - Fixed matchedLength() when used with exactMatch(). This bug
+   affected QRegExpValidator.
+
+QRichText
+---------
+
+ - Added support for "color" attribute in <hr> tag.
+ - Fixed selectedText().
+
+QSqlCursor
+----------
+
+ - Don't generate calculated fields.
+
+QStatusBar
+----------
+
+ - Made addWidget() and removeWidget() virtual.
+
+QSpinBox
+--------
+
+ - Fixed the minimumSizeHint() for better behavior in a layout.
+
+QStyle
+------
+
+ - Allow separator custom menu items to use a different size than
+   specified by the style.
+
+Qt
+--
+
+ - Renamed Qt::Top, Qt::Bottom, Qt::Left, Qt::Right to Qt::DockTop,
+   Qt::DockBottom, Qt::DockLeft, Qt::DockRight.
+
+QTable
+------
+
+ - Fixed currentChanged() and valueChanged() emits.
+
+QTextEdit
+---------
+
+ - Moved eventFilter() from the public slots section to the public
+   section of the class definition.
+ - Reformat after changing tab-stop size.
+ - Implemented undo for clear().
+
+New function:
+	void zoomTo( int size );
+
+QTextIStream
+------------
+
+ - Fixed QTextIStream with a QString.
+
+QToolBar
+--------
+
+ - Fall back to text property in extension popup if no pixmap label
+   has been set.
+ - Made mainWindow() const.
+
+QToolButton
+-----------
+
+ - Fixed the minimumSizeHint() for better behavior in a layout.
+
+QToolTip
+--------
+
+ - Fixed the transparent tooltip effect a la Windows 2000.
+
+QUrl
+----
+
+ - Fixed the return value of QUrl::dirPath() on Windows.
+ - Set ref to nothing when merging URLs.
+
+QUrlOperator
+------------
+
+ - Added a default parameter for single copy to specify the "to" file
+   name and not just the file path.
+
+New function:
+	QPtrList<QNetworkOperation> copy( const QString& from,
+		const QString& to, bool move, bool toPath );
+
+QValueList
+----------
+
+ - Added a return value to remove(), as stated in the documentation.
+
+QWidget
+-------
+
+ - Fixed a bug in QPainter on X11 that caused a crash when paint
+   events were dispatched from other paint events.
+ - Fixed showMaximized() and deferred map handling.
+ - When specifying WDestructiveClose as a widget flag,
+ QWidget::close() does not immediately delete the widget anymore, but
+ calles QObject::deferredDelete()
+
+
+QWorkspace
+----------
+
+ - Fixed cascade().
diff --git a/dist/changes-3.0.0-beta6 b/dist/changes-3.0.0-beta6
new file mode 100644
index 0000000000..dbed1756c9
--- /dev/null
+++ b/dist/changes-3.0.0-beta6
@@ -0,0 +1,272 @@
+Qt 3.0 Beta6 is not binary compatible with Beta5; any programs linked
+against Beta5 must be recompiled.
+
+Below you will find a description of general changes in the Qt
+Library, Qt Designer and Qt Assistant.  Followed by a detailed list of
+changes in the API.
+
+
+The Qt Library
+========================================
+
+QCom postponed
+--------------
+
+Previous Qt 3.0 betas introduced a module called QCom that provides a
+COM-like component system. The feedback we received on this module
+during the 3.0 beta phase has been mixed. Many users think this module
+lacks the intuitiveness and compactness that they have learned to
+expect from a Qt API. Therefore, we have made the difficult decision
+to withdraw the QCom API from the Qt 3.0 release. We will continue to
+develop this API until it is evolved enough for our customers, and
+will include the improved version in a later release.
+
+We apologize for any inconvenience the QCom API change has
+caused. This decision was made as part of our ongoing efforts to
+maintain the soundness and quality of Qt.
+
+Please note that the new plugin functionality in 3.0 will still be
+provided. This includes using custom widgets in Qt Designer, as well
+as runtime addition of styles, codecs, SQL drivers, and image format
+handlers. This functionality is now available through a substantially
+simplified API.
+
+Also also note that it will still be convenient to add custom plugin
+capabilities to Qt 3.0 applications, since the new QLibrary class will
+still be available. This class takes care of the low-level,
+platform-dependent issues regarding loading of DLLs and obtaining
+pointers to the functions exported by the DLLs.
+
+
+Qt Designer
+========================================
+
+ - Improvements to the Designer reference manual.
+
+ - Improved the C++ code indenter in the editor for numbers and
+   handling of parenthesis.
+
+
+Qt Assistant
+========================================
+
+ - Added a context menu with common commands.
+
+ - Allow multiple windows to be opened and added the common shortcut
+    that Shift+Click on a link opens the link in a new window.
+
+
+Qt Functions
+========================================
+
+QAccel
+------
+
+ - Try harder to ensure that accelerators continue to work when a top
+   level widget is reparented into another window.
+
+QColor
+-----
+
+ - X11 only: better heuristic to decide if you use black or white when a
+   color could not be allocated.
+ - win32 only: improve color allocation on 8bit displays, e.g. when
+   using a terminal server.
+
+QComboBox
+---------
+
+ - Added a new function to be able to set a custom line edit.
+
+New function:
+	virtual void setLineEdit( QLineEdit *edit );
+
+QCString
+--------
+
+ - Implemented a dummy out-of-line destructor for QCString to help the
+   compiler to optimize the number of conflicts as the location of a vtable
+   is now known.
+
+QCursor
+-------
+
+ - win32 only: Added a constructor that takes a platform specific handle.
+
+New function:
+	QCursor( HCURSOR ); (win32 only)
+
+QDateTime and QDateTimeEdit
+---------------------------
+
+ - win32 only: better handling of localization settings.
+
+QDockWindow
+-----------
+
+ - Remeber last size of an undocked window, so when it is docked and
+   undocked again, use this size again.
+
+QDom
+----
+
+ - Fixed an infinite loop in QDomDocument::toString().
+
+QFileDialog
+-----------
+
+ - Improved handling of "~" to make it work as a directory.
+
+QFileInfo
+---------
+
+ - win32 only: permissions respects the read-only attribute now.
+
+QIconView
+---------
+
+ - Added a function to find out whether an item in a view is currently
+   being renamed.
+ - Fixed a crash.
+
+New function:
+	bool isRenaming() const;
+
+QInputDialog
+------------
+
+ - Improved the handling of double input formats.
+
+QListView
+---------
+
+ - Added a function to find out whether an item in a view is currently
+   being renamed.
+ - Fixed a possible infinite loop.
+ - Improved spacing handling for columns that can show a sort indicator.
+
+New function:
+	bool isRenaming() const;
+
+QMainWindow
+-----------
+
+ - Make menuAboutToShow() protected to allow customized dock menus.
+ - Fixed spacing problem for menu bars.
+
+QMap
+----
+
+ - Fixed infinite looping in count( const Key& k ).
+
+QObject
+-------
+
+ - The slot deferredDelete() was renamed to deleteLater() to be more
+   intuitive. Code that used deferredDelete() has to be adjusted for the
+   new name.
+
+New function:
+	void deleteLater();
+
+QPainter
+--------
+
+ - Fixed bounding rectangle when printing richtext.
+ - Restore brush origin in QPainter::restore().
+
+QPixmap
+-------
+
+ - X11 with render extension only: better support for alpha blending:
+    - QPixmap::xForm() keeps now the alpha channel information
+    - alpha channel information is kept when copying QPixamps
+    - alpha blending works with QMovie
+    - tiling pixmaps with alpha channel works now
+
+QPrinter
+--------
+
+ - Unix only: fixed dashed line drawing when using high resolution
+   printing.
+ - Better printing detection on Irix.
+
+QRadioButton
+------------
+
+ - Fixed focus problem for radio buttons in a button group.
+
+QSqlCursor
+----------
+
+ - Fixed primeInsert() to work if the primary key of the edit buffer has
+   changed.
+ - Changing primary index keys now also works if the cursor's position
+   moved in the meantime.
+
+QStyle
+------
+
+ - Added a base value (CC_CustomBase) for custom defined primitives,
+   controls, etc. -- this allows custom widgets to use the new style
+   engine.
+ - Fixed spacing problem for custom menu items.
+ - Improved the look of the Motif plus and the SGI style.
+
+QTable
+------
+
+ - Fixed a crash when drag source is the current table editor widget.
+ - Fixed a bug that prevented having different colors in different cells.
+
+QTabletEvent
+------------
+
+ - Improved Watcom tablet support to allow multiple devices to be used.
+
+QTextEdit
+---------
+
+ - Better handling for font sizes in the font tag.
+ - Parse the qt tag again.
+ - Fixed text() for read-only documents.
+ - Improved right mouse button menu handling.
+ - New function to pass the position to the createPopupMenu() function for
+   improved flexibility.
+
+New function:
+	virtual QPopupMenu *createPopupMenu( const QPoint& pos );
+
+QThread
+-------
+
+ - Unix only: Make sure that the seconds and nano-seconds in the sleep
+   functions are within the limits.
+
+QUrlInfo
+--------
+
+ - Added the concept of invalid QUrlInfo objects. This is useful in
+   conjunction with QUrlOperator::info().
+
+New function:
+	bool isValid() const;
+
+QWizard
+-------
+
+ - Set the previous pages nextEnabled to TRUE if we add a page to the end
+   of a wizard.
+
+QWMatrix
+--------
+
+ - mapRect() returns always a valid QRect now.
+
+QWorkspace
+----------
+
+ - Update the titlebar when toggling shaded/non-shaded.
+ - Update the titlebar to be deactivated when the application's activation
+   status changes.
+ - Improve placement of document windows.
diff --git a/dist/changes-3.0.1 b/dist/changes-3.0.1
new file mode 100644
index 0000000000..26fb022da5
--- /dev/null
+++ b/dist/changes-3.0.1
@@ -0,0 +1,540 @@
+Qt 3.0.1 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.0.0
+
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+- Style Engine fixes
+	Qt 3.0 introduced a new and more flexibile style engine. This
+	release should fix most of the small visual flaws that the new
+	styles introduced. It also greatly improves appearance in
+	right-to-left mode.
+
+- MS-Windows XP
+	This is the first release to fully support Windows XP,
+	including the new themable GUI styles.
+	The Windows XP style can only be built as a plugin, which requires
+	Qt to be configured as a shared library. To build the plugin
+	you must install a Microsoft Platform SDK for October 2001
+	or later. Your INCLUDE and LIB environment variables must
+	point to the respective directories in the SDK installation.
+
+- Reverse (right-to-left) layouts
+	Many classes have improved support for right-to-left layouts.
+
+- Compile fixes 
+	Solaris 7 Intel, g++ version 2.8.1.
+
+- Documentation updates
+	Some new and improved diagrams and minor textual revisions.
+
+- Mac only: Drag'n'drop
+	Mac only: QDropEvents can decode HFS flavors.
+
+- X11 only: Multi-head (multi-screen) improvements
+	Support for different TrueColor depths on each head (screen).
+	Drag'n'drop support across multiple screens. Tooltips always
+	stay on the correct screen. Improved OpenGL support on
+	multiple screens. Qt 3.1 will support different color depths
+	on every screen (e.g. one TrueColor screen, one 8-bit
+	PseudoColor and one 8-bit GreyScale).
+
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QAction
+	Fixed a memory leak in conjunction with action accelerators.
+	Turn toggle actions off when toggling is turned off with
+	setToggleAction(FALSE);
+
+- QApplication
+	Shared double buffers are cleaned up on destruction. 
+	Creating and using multiple QApplications in the same process
+	is supported.
+	- Solaris only: Default to the Interface System font (which is
+	  the default for the CDE)
+	- Win32 only: When WM_QUERYENDSESSION is received, _flushall
+	  is called to ensure that all open streams and buffers are
+	  flushed to disk (or to OS's buffers). 
+	  Better support for more input methods (e.g. Chinese). 
+	  Enter events are not propagated to modally blocked widgets. 
+	  Key_BackTab events are generated rather than Shift+Key_Tab.
+	  Floating toolbars are blocked when the application is modal. 
+	  Move and Resize are disabled in the system menu for
+	  maximized toplevel windows
+	- WinXP only: WM_THEMECHANGED messages are handled; widgets
+	  are repolished with the appropriate style.
+	- X11 only: Removed misleading warning message for main
+	  widgets on heads (screens) other than the default head.
+	  Input context: Solved a memory leak in Xlib, and saved a
+	  server round trip when updating the microfocushint. 
+	  Worked around some broken XmbLookupString implementations
+	  that do not report buffer overflows correctly. 
+	  Key events are never given to a widget after clearFocus()
+	  has been called for that widget; this is the same behavior
+	  as Windows.
+
+- QAquaStyle (MacOS X only)
+	More optimizations and several minor visual bugs fixed.
+
+- QCanvas
+	Erase any exposed empty space when shrinking the canvas.
+
+- QCanvasPixmapArray
+	Initialize the framecount to 0.
+
+- QCanvasView
+	Optimize background pixmaps: potentially they were drawn
+	twice, first untranslated then translated.
+
+- QClipboard (X11 only)
+	The race conditions that cause KDE to lock-up occasionally
+	should now be fixed.
+
+- QComboBox
+	Fixed behavior with non-selectable items. Fixed a crash when
+	calling setCurrentItem(-1). Fixed autoscrolling when dragging
+	the mouse directly after opening the dropdown.
+
+- QColor
+	Make invalid named colors return a non-valid QColor (as
+	documented).
+
+- QColorDialog (Win32 only)
+	Use WStyle_DialogBorder, since resizing this dialog does not
+	make much sense.
+
+- QCommonStyle
+	Respect QApplication::globalStrut() in scroll bars. Support
+	reverse layout in QTitleBar.
+
+- QCursor
+	Safer cleanup of cursor shapes (avoids possible free'd memory
+	read)
+	- Win32 only: fixed application override cursor with mouse
+	  grabbing.
+
+- QDate
+	Fixed some possible overflows.
+	- Win32 only: Improve locale support for short day and month
+	  names etc. Initialize milliseconds correctly.
+
+- QDateTimeEdit
+	Display AM/PM if set by locale. Improved sizeHint().
+
+- QDockAarea
+	More reliable sizeHint(). Better support for reverse layouts.
+
+- QDockWindow
+	Emit the placeChange() signal more reliably. Avoid floating
+	docks popping up everywhere before they have been positioned
+	and laid out.
+
+- QDesktopWidget
+	- X11 only: When using normal dualhead (not Xinerama), make
+	  sure we report the correct screen number.
+	- Win32 only: refresh on WM_DISPLAYCHANGE.
+
+- QFrame
+	New panel styles LineEditPanel and TabWidgetPanel. This was
+	required by the new for Windows XP support.
+
+- QFileDialog
+	Show unicode filenames to the user rather than encoded ASCII
+	(e.g. previously latin1 characters were shown as "%XX"
+	escapes).
+	Fixed multiple-selection of FTP files. 
+	Emit signal fileHighlighted in existingfile mode.
+	- Mac only: Fixed existingFolder(). Fixed window position so
+	  that it will never fall outside the screen.
+	- Win32 only: since files, directories and drives are not case
+	  sensitive, we don't add an extra entry in the paths box if
+	  the path already exists but with different case.
+
+- QFileInfo (Unix only) 
+	Make sure that symlinks pointing to invalid/non-existing
+	targets are reported as symlinks.
+
+- QFont
+	Ensure a rounded-off value is returned from pointSize().
+	- x11 only: improved line width calculation. Fixed off by one
+	  error in interpreting Xft font extents. Allow the use of
+	  both Xft and non Xft fonts in the same application. Make
+	  sure fonts are antialiased by default when using
+	  xftfreetype.
+
+- QFontDialog
+	Prevent re-laying out when the size of the preview label
+	changes.
+
+- QFtp
+	In parseDir(), do not compare English month names to
+	shortMonthName(), since the latter is localized.
+
+- QGList
+	Make self-assignments work.
+
+- QGLWidget
+	Fixed ARGB to RGBA conversion on BigEndian systems.
+	- Win32 only: fixed colormap for 8-bit RGBA GL mode.
+	- X11 only: multiple heads with different color depths fixes.
+
+- QHebrewCodec
+	Assume the bidi algorithm is a reversible operation for the
+	visual 8859-8 codec. This is not true for very complex strings
+	but should hold in most cases.
+
+- QIconSet
+	Fixed detach() to really detach the internal pixmaps. In case
+	no image formats are installed, show black pixmaps rather than
+	ASSERT.
+
+- QImage
+	Allow 16-bit DIBs. Allow > 32767 level PNMs. 
+	Fixed smoothscale() for the following bug: whenever 
+	(new_width / original_width * 4096) is not an integer the last
+	column of the scaled image is black.
+
+- QImageIO
+	Fixed plugin loading in cases where the image format is
+	explicitly defined.
+
+- QInputDialog
+	Disable the OK button when input is not Acceptable.
+	(See QValidator.)
+
+- QLabel
+	When showing rich text with tables (via QSimpleRichtext),
+	avoid drawing the table background.
+
+- QLayout
+	In reverse layout mode: fix off by one error when laying out
+	right to left or bottom to top.
+
+- QLineEdit
+	Fixed offset calculation for horizontal scrolling. Invoke
+	validator when the user presses Backspace or
+	Delete. Compression of the undo/redo stack fixed. Security: do
+	not reveal the position of spaces with Ctrl+RightArrow or
+	Ctrl+LeftArrow in password mode.
+
+- QListBox
+	Append items at the proper position even after sorting the
+	content. Made QWidget::setBackgroundMode() work correctly.
+
+- QListBoxPixmap
+	Use the function pixmap() when drawing the pixmap, so users
+	can reimplement QListBoxPixmap::pixmap().
+
+- QListView
+	Fix misalignment of checkbox click zone. Make the selected and
+	focus rectangles cover the entire column for QCheckListItems
+	if the listview root is not decorated. Make
+	QWidget::setBackgroundMode() on the viewport work correctly.
+	Comply with user interface guidelines: clear the selection
+	when a click is in an empty area unless the Ctrl key is down.
+	Fixed possible crash when starting a rename with a double
+	click. Smarter ensureItemVisible(). Draw listview background
+	in paintEmptyArea() with the current style. Ensure the
+	listview always has a current item.
+
+- QMainWindow
+	Better laying out of dockareas when they are all empty.
+	Otherwise an empty QMainWindow looks unappealing in a
+	workspace. Maintain the toplevel layout's resize mode.
+
+- QMessageBox
+	Avoid double deletion if the parent is destroyed while the
+	messagebox is open. Support y/n/c shortcuts without needing
+	the Alt key modifier.
+
+- QMovie
+	Allow pause() and restart() with MNG.
+
+- QMultiLineEdit
+	Remove internal trailing space when returning a textline with
+	textLine(int) and querying lineLength(int).
+
+- QPainter
+	The boundingRect() should now work properly for the
+	combination richtext, right-aligned and an empty initial rect.
+	Handle DontClip-flag in the painter's complex drawText()
+	function. Reset the cached composition matrix (and inverse)
+	when reinitialising a painter.
+
+- QPicture
+	Fixed the loading of binaries from older Qt versions.
+
+- QPixmap
+	grabWidget(): when the widget sets WRepaintNoErase it might
+	erase itself with the non-redirected QWidget::erase(); restore
+	those areas.
+	- X11 only: (with XRENDER extension) when copying a pixmap,
+	  bitBlt the entire data into the new pixmap instead of using
+	  alpha composition.
+
+- QPopupMenu
+	Fixed strange side effects with the menu effects. Support
+	minimumSize() for popups. Fixed a navigation issue where
+	Key_Right under certain circumstances was not propagated to
+	the menu bar. Speedups when disabling/enabling menu items
+	before showing them.
+	- X11 only: Fixed mouse and keyboard grabbing side effects
+	  with popup menu effects enabled.
+
+- QPrintDialog (built-in dialog)
+	Use the text in the lineedit for the file dialog.
+
+- QPrinter
+	Fixed crash when printing with incomplete combined unicode
+	fonts.
+	- Win32 only: fixed a very rare and mysterious crash.
+
+
+- QPSPrinter
+	Make sure the fontPath is read correctly by the postscript
+	driver, and the qtconfig program. Small memory leaks closed.
+	Better support for Asian printing. Limit line length of
+	Postscript DSC comments to 255 chars (as per the postscript
+	specification).
+
+-  QRichText
+	Fixed handling of &nbsp. Support both <qt title="..."> and
+	<title>. Avoid painting \n at the end of lines (these
+	sometimes appeared as an empty unicode box). Fixed find() in
+	"whole words only" mode. Fixed unicode auto alignment. Made
+	cursor movement in BiDi paragraphs compliant with MS-Windows.
+	Fixed paragraph right and center alignments when using <br>
+	tags. Fixed superscript/subscript confusion.
+
+- QScrollBar
+	Allow scrolling with modifier keys pressed.
+
+- QScrollView
+	Made autoscrolling work with drag and drop. Never generate
+	paintevents that are outside the visible area.
+
+- QSettings
+	- Unix only: search paths are valid for individual objects,
+	  NOT every object (windows behavior). When reading files,
+	  don't replace the old groups with contents of the new
+	  groups; merge them instead. Properly escape backslashes and
+	  newlines.
+	- win32 only: improved error handling. Fixed subKeyList() and
+	  entryList() for empty paths.
+
+- QSimpleRichText
+	Correctly transform clipping rectangle.
+
+- QSizeGrip
+	Reverted sizeHint() to the old size to avoid making the
+	statusbar a tiny bit too big. Support right-to-left layout.
+
+
+- QSgiStyle
+	Made the combobox arrow look nicer. Fixed disabled combobox
+	drawing.
+
+- QSlider
+	Fixed click handling for reverse layouts.
+
+- QSpinBox
+	Usability fix: when changing a value with the up/down arrow
+	keys or with the arrow buttons, select the new value.
+
+- QSplitter
+	Use the actual QSplitter pointer as documented (and not a
+	QSplitterHandle pointer) as the parameter to the
+	QStyle::sizeForContents() call. Fixed reverse layouts when
+	splitter movement is constrained.
+
+- QSqlRecord
+	Fixed double increment of the iterator in certain
+	circumstances.
+
+- QString
+	Fixed QString::setLatin1() when the length parameter is 0.
+	- Unix only: Use strcoll() in QString::localeAwareSorting().
+	- Mac only: clarify that local8Bit() is always utf8().
+
+- QStyle
+	New frame styles for tab widgets, window frames and line edit
+	controls. This was required by the new support for Windows XP.
+	Added SH_ScrollBar_StopMouseOverSlider style hint so that one can
+	turn on (or off) the ability to stop pageup/pagedown when the
+	slider hits the mouse (this is needed for Aqua on MacOS X).
+
+- QSvgDevice
+	Many fixes for saving and restoring attributes that are not
+	part of QPainter. Processing of 'tspan' elements. Now uses
+	double instead of int for internal 'path' arithmetic for
+	better scaling results. Supports QPicture's coordinate
+	transformations.
+
+- QTabBar
+	Fixed the focus rectangles and spacing with icons and label
+	texts.
+
+- QTable
+	Improved layout in right-to-left mode. Fixed adjustRow() when
+	using header items with icon sets. Do not let hidden
+	columns/rows re-appear when adjusting. Update header correctly
+	when changing a table's dimensions. Correctly reset the
+	updatesEnabled flag in sortColumn(). Fixed modifying the
+	contents of a combobox or checkbox table item while it is the
+	current cell.
+
+- QTableItem
+	Make sure an item cannot span over a table's maximum number of
+	rows and columns.
+
+- QTabWidget
+	Constrain the sizehint to avoid having oversized dialogs.
+
+- QTextCode
+	Rename iso8859-6-I to to 8859-6. The old name is still
+	supported for backwards compatibility.
+	- Win32: implemented locale().
+	- Mac: implemented locale().
+
+- QTextDrag (Win32 only)
+	Performance improvements in encodedData().
+
+- QTextEdit
+	Fixed HTML output. New property tabStopWidth. Fixed append()
+	and made it smarter: it only scrolls to the end if the view
+	was scrolled to the end before. Proper reformatting when
+	switching word wrap policies. Do not blink the cursor when the
+	textedit is disabled. Make isModified() return the new value
+	in slots connected to the modificationChanged() signal.
+	- X11 only: middle mouse selection pasting sets the cursor
+	  position.
+
+- QTextStream
+	Faster string output in latin1 mode.
+
+- QThread
+	- Unix only: initialize threads in non-GUI mode as well.
+	- Win32 only: fixed the initial value of QThread::running().
+
+- QToolButton
+	Fixed unwanted occurences of delayed popup menus.
+
+- QUrlOperator
+	Fixed the cache, so that QUrlInfo::name() is set correctly for
+	renamed files. This bug also affected QFileDialog. More
+	careful check whether a file is writable before renaming or
+	deleting it.
+
+- QValueVector
+	Make operator==() const. Fixed some sharing issues.
+
+- QVariant
+	Fixed a few memory leaks when casting complex values to simple
+	types. Faster operator==().
+
+- QWaitCondition (Win32 only)
+	Fixed wakeAll().
+
+- QWhatsThis
+	Make QWidget::customWhatsThis() work with menu accelerators.
+	Avoid infinite loops with menu effects.
+
+- QWidget
+	Fix default focus so that setTabOrder( X, Y ); setTabOrder( Y,
+	Z ); gives focus to X, not Y or Z. Closing a modal dialog with
+	a double click on a widget could result in a mouse release
+	event being delivered to the widget underneath; this has been
+	fixed.
+	Set/Reset WState_HasMouse on DragEnter/DragLeave.
+	- Win32 only: obey WPaintUnclipped. Make reparent() with 0,0
+	  positions do the requested positioning.
+	- X11 only: when reparenting widgets to/from toplevel, make
+	  sure the XdndAware property is set. Make input methods work
+	  with servers other than kinput2. More fixes for 4Dwm's
+	  incompliance with ICCCM 4.1.5 regarding geometry handling.
+	  When hiding toplevel windows, we call XFlush() to avoid
+	  having popup menus hanging around grabbing the mouse and
+	  keyboard while the application is busy. Obey the 'erase'
+	  value in repaint(const QRegion& reg, bool erase).
+
+- QWindowsStyle
+	Various visual fixes, including fixes for right-to-left
+	mode. Most significantly the light source now comes from the
+	top left also in reverse layout the same as modern versions of
+	Windows.
+
+- QWorkspace
+	Support document windows without title bars. Scroll to top
+	left corner when cascading/tiling a scrolled workspace. Define
+	a proper baseSize() for workspace children. Fix some side
+	effects with the workspace's maximize controls on Windows
+	style. Don't raise windows over scrollbars. Clients can now
+	call adjustSize() on the workspace when their sizeHint()
+	changes. When showing two scrollbars, maintain a solid corner.
+	Obey a document window's maximum size when tiling.
+
+****************************************************************************
+*			   Extensions					   *
+****************************************************************************
+
+NO CHANGES
+
+****************************************************************************
+*			      Other					   *
+****************************************************************************
+
+- qtconfig (X11 only)
+	It is now possible to turn Xft on and off, as well as turning
+	antialiasing-by-default on and off. This is necessary since
+	Xft doesn't work on dual head.
+
+- moc
+	Q_PROPERTY: Support QMap<QString, QVariant> and
+	QValueList<QVariant> as "QMap" and "QValueList". Support
+	parameters of nested template types, for example
+	QValueVector<QValueVector<double> >, as well as
+	Foo<const int>.
+
+- uic
+	Fix uic-generated code for QWizard with both "font" and
+	"titleFont" properties set. Put local includes after global
+	includes in generated files.
+
+- lupdate
+	Allow translation of menubar items generated with Qt Designer
+	(e.g. "&File", "&Edit", etc.).
+
+- libMNG
+	Updated to version 1.0.3.
+
+- libPNG
+	Updated to version 1.0.12.
+
+- Translations
+	Added Hebrew translations for Qt and the demo application.
+
+- Qt Designer
+	Support 'Ignored' size policy. Support properties of type
+	'double'. Fixed saving of custom widgets in toolbars. Various
+	smaller usability improvements.
+
+- Qt Assistant
+	When users starts Qt Assistant themselves, always make a new
+	instance. Only use the unique-instance feature when invoking
+	from Qt Designer.
+
+- QMsDev
+	Invoke Qt Linguist when opening a .ts file in Visual Studio.
+
+
+
+****************************************************************************
+*		    Qt/Embedded-specific changes		           *
+****************************************************************************
+
+NO CHANGES
diff --git a/dist/changes-3.0.2 b/dist/changes-3.0.2
new file mode 100644
index 0000000000..211c8ef122
--- /dev/null
+++ b/dist/changes-3.0.2
@@ -0,0 +1,325 @@
+Qt 3.0.2 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.0.1
+
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+- Improved building of Qt on SCO OpenServer 5.0.5, Sun WorkShop 4.2, MIPSpro
+7.2 and VC++.NET
+
+- Added support for NIS to the build system
+
+- BiDi on X11: direction key events for right-to-left are configurable
+in QSettings via qt/useRtlExtensions. In 3.0.1 they were always turned
+on.
+
+- basic table support with XFree86
+
+- unicode on X11: fix keysymbols 0x1000000-0x100ffff
+
+- moc: Generate correct code for N::B which inherits M::B. Don't warn
+on throw() specifications.
+
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QAbstractLayout
+	Fixed heightToWidth handling.
+
+- QApplication
+	X11 only: Stop compressing keys when a non printable key is
+	pressed. Fixed handling backtab (shift+tab) on HPUX. Better support
+	for currency symbol keys like the Euro key. Also fixed a crash when
+	tablet support is set up, but without a device attached.
+	Mac only: Adjust the desktop widget size when the display size
+	changes.
+
+- QAquaStyle
+	Better highlight color detection for the inactive case.
+
+- QCanvas
+	Let QCanvasPolygon::areaPoints() return a detached QPointArray
+	for safeness.
+
+- QColorDialog
+	Save and restore the custom colors via QSettings between Qt
+	applications.
+
+- QComboBox
+	Layout the popup listbox correctly before showing it. 
+
+- QContextMenuEvent
+	X11 only: Both the mouse press event and the context menu
+	are always sent now.
+
+- QClipboard
+	Mac only: Fixed pasting text from non-Qt applications to Qt
+	applications.
+
+- QDataTable	
+	Faster key event handling. Fixed crash when cancelling cell
+	editing. Fixed autoEdit mode.
+
+- QDesktopWidget
+	X11 only: Fixed screenNumber() in Xinerama mode.
+
+- QDateEdit
+	Gray out background if the widget is disabled. Fixed small
+	static memory leak on exit.
+
+- QDialog
+	On show(), send a tab-focus event to the focus widget, so that
+	e.g. in lineedits, all the text is selected when becoming visible.
+	Windows only: Position dialogs on the same screen as the mouse if
+	there is no parent widget that can be used.
+
+- QDockWindow
+	Use correct minimum size, taking frame into account. Less
+	flicker on (de)activation. undock() doesn't undock the window
+	if the TornOff dockarea is disabled.
+
+- QDragObject
+	Fixed crash when a drag object is created without parent.
+	
+- QFileDialog
+	Fixed an endless loop.
+	Windows only: In getExistingDirectory(), use QFileDialog and not
+	the Windows system one when the dirOnly flag is FALSE
+	Mac only: Fixed filtering when using the native Mac filedialog.
+
+- QFileInfo
+	Windows only: Fixed isWriteable() to check Windows permissions as
+	well.
+
+- QFont
+	Windows only: Fixed boundingBox() when called in a widget
+	constructor. Internal fixes for invalid HDCs. More
+	accurate exactMatch(). Fixed GDI resource leak.
+	X11 only: Fixed calculating the point size of default font, so
+	the default font on systems with only bitmap fonts doesn't look
+	ugly. Support for Ukranian fonts.
+
+- QFontDataBase
+	Win9x only: Fixed problem with multiple entries.
+
+- QGLWidget
+	X11 only: Fixed pixmap rendering with TrueColor visuals
+	on X servers with a default PseudoColor visual (introduced in
+	3.0.1). Fixed context sharing (introduced in 3.0.1).
+
+- QGroupBox
+	More predictable focus handling.
+
+- QHttp
+	Enable downloading from non-default websites.
+
+- QIconView
+	Initialise internal variable.
+
+- QImage
+	Fixed xForm() for bigendian bitmaps. Accept dots in XM
+	#define.
+
+- QImageIO
+	Correctly limit quality parameter when writing PNG and JPEG
+	files.
+
+- QLabel
+	Smarter minimumSizeHint() for word-break labels.
+
+- QLayout
+	Fixed possible crash when deleting/adding layout items. More
+	robust on runtime layout changes.
+
+- QLibrary
+	Windows only: Use an internal cache and refcount to avoid loading
+	the same library multiple times into the memory on Windows NT.
+
+- QLineEdit
+	Ctrl-V now calls the virtual paste() rather than duplicating
+	its functionality. Override accelerators for keypad keys.
+
+- QListBox
+	Center pixmaps in listbox items properly. Fixed isSelected().
+
+- QListView
+	Fix focus rects for QCheckList items that have a Controller as
+	a parent. Also, fix drawing of selected checklist boxes so
+	that the focus rect doesn't overlap it. Keep checklist items
+	working after the user swapped columns. Fixed drawing check
+	marks and the vertical branch lines for listview items with
+	multiple lines of text. Optimized the clear() function.
+	Improved the sorting for the case that entries have the same key.
+
+- QMenuBar
+	Fixed painting problems on content changes.
+	mostly X11: when the focus widget is unfocused, the menubar
+	should stop waiting for an alt release. On X11, when you use
+	an alt-key shortcut to switch desktops back and forth, then
+	you will get the menubar in altmode when you return to that
+	desktop
+	Mac only: Fixed keyboard modifiers.
+
+- QMovie
+	Animated gifs with a frame delay of 0 work nicer. Initialize
+	internal cache variable.
+
+- QMutex
+	Made tryLock() work on recursive mutexes.
+
+- QPainter
+	Return translated coordinates in pos(). Fixed translation in
+	calls to clipRegion(CoordPainter).
+
+- QPopupMenu
+	More fixes for the animate and fade effects. Fixed opening of
+	menus that was impossible under certain circumstances. Fixed
+	painting problems on content changes.
+
+- QPixmap
+	Make grabWidget() work with internally double-buffered widgets
+	X11 and Mac: Fixed a memory leak.
+
+- QPrinter
+	Win32 only: Resolution fix.
+
+- QRichText
+	Fixed crash bug when clearing a document. Fixed various layout
+	bugs, esp. with HTML tables. Fixed a memory leak. Fixed a
+	crash when placing a cursor on a hidden paragraph. Arabic and
+	Hebrew fixes. Make moving the cursor to the next word not
+	stumble upon multiple whitespaces.
+
+- QScrollBar
+	Make sure middle clicking a scrollbar doesn't allow the slider
+	to move outside the groove.
+
+- QSettings
+	In readEntry(), report 'ok' in all cases.  Make sure the
+	default value is returned correctly for bool entries that
+	do not exist in the settings files. Both readNumEntry()
+	and readDoubleEntry() report a false ok parameter if the
+	conversion fails
+	win32 only: Fixed default values
+
+- QSgiStyle
+	Minor visual improvements.
+
+- QSlider
+	Make setting a new size policy in Designer work.
+
+- QSound
+	Stop sound playing when distroying a QSound object.
+	Windows only: QSound::stop() really stops the sound now.
+
+- QSqlCursor
+	Fixed setMode().
+
+- QSqlDriver
+	Escape '\' characters in strings. Fix the QOCI8 driver so that
+	it compiles with the Oracle9i client libs. Major speedup fix 
+	for the QMYSQL3 driver.
+
+- QSqlRecord
+	Fixed crash when accessing values of non-existing fields.
+
+- QString
+	mid() works safely now for len > length() && len !=
+	0xffffffff. Some speed optimizations. Replace non-latin1
+	characters with '?' in unicodeToAscii().
+
+- QStyle
+	Added a style hint for a blinking text cursor when text is
+	selected.
+
+- QStyleFactory
+	Windows only: Don't load style plugins for static Qt builds.
+
+- QTable
+	Use correct style flags for QCheckTableItem drawing. The
+	internal event filter no longer consumes FocusIn/FocusOut,
+	meaning those events are accessible for subclasses now. Fixed
+	redraw problem with dynamically resized cells. Always return
+	the right text for items (fixed a caching problem). Fixed
+	emitting valueChanged(). Fixed a redraw problem with multispan
+	cells.
+
+- QTextCode
+	Support for @euro locales.
+
+- QTextEdit
+	The internal event filter no longer consumes FocusIn/FocusOut,
+	meaning these events accessible for subclasses now. Override
+	accelerators for keypad keys. Reduced memory consumption for
+	contents with many paragraphs. Emit selectionChanged() when
+	the selected text has been removed. Emitting the linkClicked()
+	signal may result in the cursor hovering over a new, valid link
+	- check this and set the appropriate cursor shape. Overwrite
+	mode fixed. Always emit currentAlignmentChanged() when the
+	paragraph alignment changed. Ignore key events which are not
+	handled. Fixed right-alignment in BiDi mode. Key_Direction_L/R
+	will now affect the whole document for non-richtext content.
+	X11 only: Fixed copy on mouse release. Lower impact of an
+	XFree memory leak.
+	Mac only: Always draw selections extended to the full width of the
+	view.
+
+- QTextStream
+	Speed optimization for QTextStream::write().
+
+- QToolBar:
+	Hint about explicit show() call for child widgets to ensure
+	future operability.
+
+- QToolTip
+	Fixed wordbreaking when using both rich text and plain text
+	tooltips. Fixed placement of tooltips for multi-head and Xinerama
+	systems.
+
+- QVariant
+	In toDateTime(), allow conversion from QDate.
+
+- QWhatsThis
+	X11 only: Fixed positioning on dualhead setups.
+	Windows XP only: Improved drawing.
+
+- QWidget
+	X11 only: fixed a show() problem that occurred
+	after few reparents from and to toplevel.
+	Mac only: Fixed showNormal().
+
+- QWindowsStyle
+	Minor visual improvements (popupmenu checkitems, listview
+	branches).
+
+- QWorkspace
+	Obey minimumSizeHint() of document widgets. Do not emit
+	windowActivated() for the already active document window.
+
+- QUrlOperator
+	Relaxed checks for directories.
+
+
+****************************************************************************
+*			   Extensions					   *
+****************************************************************************
+
+****************************************************************************
+*			      Other					   *
+****************************************************************************
+
+
+****************************************************************************
+*		    Qt/Embedded-specific changes		           *
+****************************************************************************
+
+****************************************************************************
+*		    Qt/Mac-specific changes		           	   *
+****************************************************************************
+
+Optimizations and fixes in QPainter and QFont fixed creation and
+raising of top level widgets fixed hovering over titlebar problems.
diff --git a/dist/changes-3.0.4 b/dist/changes-3.0.4
new file mode 100644
index 0000000000..e7089a70b1
--- /dev/null
+++ b/dist/changes-3.0.4
@@ -0,0 +1,214 @@
+Qt 3.0.4 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.0.3
+
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+- Qt 3.0.4 builds on VC++.NET.
+
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QApplication
+	Send wheel events for blocked widgets to the focus widget instead.
+	Windows only: Fixed problems with Korean input methods. Reset
+	the mouse state even when we ignore the next button release.
+
+- QColor:
+	Fixed marking colors created with an invalid color string as
+	invalid.
+
+- QComboBox:
+	QComboBox's listbox now takes the combobox's palette.
+
+- QDataTable:
+	Fixed the scrollbar behaviour when browsing result sets from
+	clients that do not return a query size. Make the table
+	adopt the filter and sort settings from the cursor when
+	setSqlCursor() is called.
+	
+- QDateTimeEdit:
+	Update the date/time edit even if the new date/time is
+	invalid.
+
+- QDialog:
+	Respect the minimum and maximum size of the extension grow
+	width/height in showExtension( TRUE ). Don't delete the object
+	immediately for WDestructiveClose, instead use deleteLater()
+	to allow queued events to be processed.
+
+- QDir:
+	Fixed crash when calling entryList() for non-existing
+	directories.
+
+- QDnD:
+	Mac only: Prevent crash when dropping onto a transparent part
+	of a widget.
+
+- QDockWindow:
+	Accelerators of the mainwindow now continue to work if a floating
+	dockwindow becomes active.
+
+- QFileDialog:
+	Windows only: Fixed displaying shared Windows directories
+	(e.g. \\Machine\Folder). Worked around a problem which made
+	QFileDialog hang.
+
+- QFontDataBase:
+	Enumerate all fonts correctly on Windows; also made it faster.
+
+- QGridLayout:
+	Do not crash when a widget inserted with addMultiCellWidget()
+	is deleted.
+
+- QHeader:
+	Fixed setOffset() for vertical headers.
+
+- QIconView:
+	Fixed when clicking and dragging from the edge of an icon, so
+	that the icon will drag immediately rather than when the mouse
+	next passes over it.
+
+- QKeyEvent:
+	Correctly deliver a KeyRelease event with isAutoRepeat
+	set to FALSE after releasing an auto-repeated key.
+
+- QLabel:
+	Fixed so that the label uses paletteForegroundColor() and not
+	the the colorgroup's 'text' color, when displaying richtext.
+
+- QListBox:
+	Performance improvements.
+
+- QListView:
+	When typing in a listview to search for an item, don't select
+	items in Extended selection mode. Speed improvements for
+	selectAll() or (un)selecting a large number of items (e.g by
+	pressing Shift+End) in big listviews (starting from 150.000
+	items).
+
+- QOCIDriver:
+	Allow access to tables not owned by the current user. Use
+	Oracle synonyms for table names. Tables can also be specified
+	as 'OWNER.TABLE'.
+
+- QPainter:
+	Don't delete the tabarray set in setTabArray() in the first
+	drawText() call.
+
+- QPopupMenu:
+	Fixed re-use of menus.
+
+- QPrintDialog:
+	Layout group boxes properly. Fixed function cast in NIS code
+	so that it works on all compiler-platform pairs. Allow NIS on
+	any Unix, not just Solaris.
+
+- QPrinter:
+	Windows only: Implemented printing of rotated pixmaps and
+	images.
+
+- QProcess:
+	Unix and Mac only: Make sure that the processExited() signal
+	is emitted only once for each process. This also fixes a crash
+	that occurred on very rare occasions.
+
+- QProgressBar:
+	Fixed crash bug when totalSteps() was 1. Fixed some painting
+	bugs.
+
+- QPSPrinter:
+	Improvements in printing Japanese. Big speed improvements.
+
+- QRichText:
+	Improved speed of loading plain text and rich text
+	documents. Fixed some internal links which didn't work
+	correctly. Fixed minimumWidth and usedWidth calculations for
+	table layouts of nested tables. Fixed <br> tags within list
+	items. Fixed some memory leaks and cleanup on exit. Now works
+	with fonts that specify sizes in pixels.
+
+- QScrollBar:
+	Release the control, when the scrollbar got hidden while a
+	control was pressed.
+
+- QSimpleRichText:
+	Make sure the painter's properties don't get changed in
+	setWidth().
+
+- QSpinBox:
+	Don't fire the autorepeat timer before valueChanged() is
+	completed, if the up or down button is pressed.
+
+- QSqlDriver:
+	Export DB driver classes under Windows if compiled into the
+	lib.
+
+- QSqlQuery:
+	Reset the last error before a new query is executed.
+
+- QTable:
+	If a row or column is hidden, setRowHeight() and
+	setColumnWidth() no longer cause an immediate resize; instead
+	they store the value for later use, i.e. for when the row or
+	column is shown. Fixed a problem which reset table header
+	sections after inserRows()/insertColumns() calls. showRow()
+	and showColumn() now do nothing if a row/column is already
+	visible. Windows only: Fixed the problem that combobox table
+	items never got smaller than a certain size.
+
+- QTextEdit:
+	Cleaner modified() and setModified() handling (doesn't rely on
+	internal signals anymore, so it is now safe to call
+	setModified() from a slot connected to textChanged()). Fixed
+	selecting text if a margin was set using setMargins(). Fixed
+	crash when calling removeSelectedText() with a selNum larger
+	than 0. Only auto-create a bullet list when typing - or * at
+	the beginning of a line if textFormat() is RichText, not
+	AutoFormat.
+
+- QTitleBar:
+	Don't paint all titlebars in a QWorkspace activated when a
+	dockwindow is the active window.
+
+- QToolBar:
+	Don't show the extension button when the extension menu would
+	not contain any items.
+
+- QUrlOperator
+	Fixed a crash.
+
+- QWaitCondition:
+	Fixed a problem with wait() using invalid timeout values.
+
+- QWorkspace:
+	Also show scrollbars (if enabled), when moving a document
+	window out of the workspace to the left at the top. Never show
+	scrollbars if a document window is maximized.
+
+
+
+****************************************************************************
+*			   Extensions					   *
+****************************************************************************
+
+****************************************************************************
+*			      Other					   *
+****************************************************************************
+
+Qt Config:
+	X11 only: The default X input methods are now configurable
+	through qtconfig.
+
+****************************************************************************
+*		    Qt/Embedded-specific changes		           *
+****************************************************************************
+
+****************************************************************************
+*		    Qt/Mac-specific changes		           	   *
+****************************************************************************
+
diff --git a/dist/changes-3.0.7 b/dist/changes-3.0.7
new file mode 100644
index 0000000000..ec084d6f18
--- /dev/null
+++ b/dist/changes-3.0.7
@@ -0,0 +1,375 @@
+Qt 3.0.7 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.0.6.
+
+****************************************************************************
+*                              General                                     *
+****************************************************************************
+
+Smaller documentation fixes. Some build issues fixed. Upgraded libpng
+to 1.0.15.
+
+****************************************************************************
+*                              Library                                     *
+****************************************************************************
+
+- QAction
+	Avoid emitting activated() twice for actions in a
+	toolbar. Possibility to remove an iconset from an action by
+	specifying a null iconset.
+
+- QApplication
+	Fixed a font sharing problem with setFont(). Fixed window
+	close with modality. Don't overwrite an explicitely set font
+	with the default font when using the static methods before
+	calling the constructor. When the programmer/user explicitly
+	sets the style (either with QApplication::setStyle or -style
+	command line option), do not reset the style on settings
+	changes.
+	Windows only: Serialize calls to OutputDebugString, as this
+	API is not reentrant. Emit aboutToQuit() when the user logs
+	off. Send a focusOut event to the focus widget when the user
+	tries to switch applications via Alt+Tab.
+	Windows95/98/Me: Fixed enter/leave handling. Among others this
+	makes tooltips work more reliable.
+	X11 only: Spit out warning then the user passes an invalid
+	Display* argument. Fixed figuring out the depth of the visual
+	in case a private colormap is supplied. Some startup
+	performance improvements with QSettings. Mark the internal
+	wakeUpGuiThread() pipe with FD_CLOEXEC. Call XFilterEvent
+	before the public X11 event filters to avoid applications
+	filtering out events that are necessary for input methods to
+	operate.
+
+- QBuffer
+	Make IO_Truncate not detach the explicitely shared byte array.
+
+- QButton
+	In setPixmap(), avoid relayouting if the new pixmap doesn't
+	change the size.
+
+- QCanvasEllipse
+	Windows only: Workaround a Windows limitation that doesn't
+	support 2x2 ellipse rendering without a pen. Don't try to
+	double buffer invalid areas.
+
+- QClipboard
+	Flush the clipboard contents when the application object is
+	destroyed.
+	X11 only: another race condition fixed. Handle paste
+	operations with empty data.
+
+- QComboBox
+	Accept enter/return key press events on the line edit. Fixed
+	vertical alignment of text when a global strut is set. Clip
+	drawing of large items. Fixed problem with items not being
+	highlighted the first time the popup is shown.
+
+- QCommonStyle
+	Fixed SR_CheckBoxFocusRect for empty checkboxes (now inside
+	the indicator)
+
+- QComplexText
+	Added correct positioning specs for all of thai and lao. Some
+	reordering fixes.
+
+- QCustomEvent
+	Removed bogus warning on illegal type ids.
+
+- QDataTable
+	Don't display a single empty row if result set is empty and
+	QuerySize cannot be determined. Don't resize the table after a
+	refresh() if the size is already known.
+	In closeEvent(), accept the event only when isHidden()
+
+- QDateTime
+	Fixed addYears() for days missing in certain years.
+
+- QDns
+	Slightly more reliable now, fixed a memory leak.
+
+- QDockArea
+	Fixed resizing of a QDockWindow is no longer affected by
+	another closed QDockWindow in the same QDockArea.
+
+- QDom
+	Fixed memory consumption when QDomElement::setAttribute() is
+	called multiple times to change the value of an
+	attribute. Fixed a memory leak in QDomDocument::importNode().
+
+- QDragManager
+	X11 only: Fixed a dangling pointer case when the current
+	widget was deleted. Raise cursor decoration.
+	Windows only: Made dropping of URLs work on Japanese Windows98
+
+- QEffects
+	More robust through deferred deletion. Some code improvements. 
+	X11 only: disable effects on displays with <16bpp (rather then
+	falling back to the scrolling).
+
+- QFileDialog
+	Fixed problems with '#' in path. Fixed creation on
+	non-existing directories. Make previewMode() check if
+	the preview widgets are visible. Enable renaming in
+	ExistingFiles mode. Fix drag'n'drop for the first click into
+	the listbox. Don't auto-complete when saving a file. Enabled
+	drag'n'drop of files for all modes.
+
+- QFont
+	Windows only: Fixed boundingRect(QChar) for non true type
+	fonts. Fixed some positioning issues with Thai diacritics.
+	Win95 only: Make symbol fonts work.
+	X11 only: Fixed some issues with diacritics in non unicode
+	encoded fonts.
+
+- QFontDialog
+	Fixed getFont() in case no default font is specified.
+
+- QFrame
+	Fixed erasing the margin region for flicker-optimized
+	subclasses (e.g. QLineEdit). Turn on focus and mouse-over
+	style flags for frame painting.
+
+- QHeader
+	Some speed improvements for the sake of QTable and
+	QListView. Fix redrawing problems when moving header sections.
+
+- QIconView
+	Fixed contentsContextMenuEvent(). Only call
+	QIconViewItem::dragLeft() when the cursor has left the
+	bounding rect and only call QIconViewItem::dragEnter() when
+	the cursor has entered the bounding rect. Some performance
+	improvements.
+
+- QInputContext
+	X11 only: Improved XFontSet cache (also for cases where the X
+	server does not know the locale).
+
+- QKeyEvent
+	Windows only: Fixed internal ascii to keycode conversion for
+	codes > 0x80.
+
+- QLineEdit
+	Fixed doubleclick selection to only use spaces as word
+	seperators. Don't validate twice in a row if fixup() did
+	nothing. Fixed support for background pixmaps. Improved undo
+	mechanism. Respect maxLength() in setText().
+
+- QListBox
+	Fixed null-pointer crash in extended selection mode.
+
+- QListView
+	Improved auto scrolling. Restrict drop events to items that
+	have drop enabled and accept the event. Added more
+	null-pointer checks to prevent crashes when reimplementing
+	insertItem. Try harder to draw the focus rectangle with an
+	appropriate contrast.  Do not resize a stretachable column in
+	widthChanged(). Fixed selecting when auto scrolling.
+
+- QLocalFs
+	The network protocol for local file systems sets sets the
+	right permissions for the QUrlInfo objects if you do a
+	QUrlOperator::listChildren().
+
+- QMainWindow
+	Fixed orientation handler calls.
+
+- QMenuBar
+	Fixed resizing when it was emptied. Caused some strange
+	problems in QMainWindow widgets. Allow stealing of focus in
+	alt-mode. Activate alt-mode only with the plain Alt key, not
+	AltGr.
+
+- QMimeSourceFactory
+	Windows only: If a path starts with \\ then it's an absolute
+	path pointing to a network drive
+
+- QMovie
+	For animated GIFs, use a minimum delay of 10ms. This is
+	compatible with both IE and Mozilla and avoids huge loads on
+	application and X-Server.
+
+-QPainter
+	Fixed pos() in combination with transformations save/restore
+	pairs. Fixed a bug in the BiDi algorithm.
+	X11 only: some problems when drawing rotated text on Solaris
+	fix (due to floating point arithmetrics). Fixed a matrix
+	related crash on Tru64.
+	Windows only: Draw end pixel in lineTo only for 0-width
+	pens. Avoid painting with invalid transformations.
+
+- QPaintDeviceMetrics
+	Windows only: Fixed numColors() for 32 bit displays.
+
+- QPixmap
+	Windodws only: Fixed array bounds read error in win32
+	function in convertFromImage.
+
+- QPopupMenu
+	Avoid flickering when showing a just created menu
+	immediately. If there is a custom QWhatsThis installed for the
+	whole menu but no whatsThis set for the item, use the custom
+	QWhatsThis to get the help text.
+	MacOS only: improved scrollable popups
+
+- QPrintDialog
+	Unix only: Continue parsing the nsswitch.conf file using
+	additional services when /etc/printers.conf is not found.
+	Windows only: Handle lack of default printers more
+	gracefully. Fix reentrancy issues when reading printer dialog
+	settings.
+
+- QPrinter
+	Unix only: Fixes for 64 bit safety.
+	Windows only: fixed a possible double-freeing of memory of a
+	hdc passed to the Windows Common Dialog.
+
+- QProcess
+	Windows only: Less command quoting for clients that use
+	GetCommandLine() directly. Make tryTerminate() robust in case
+	the process does not run. Make it possible to start batch
+	files with spaces in the filename. Make it safe to call
+	qApp->processEvents() in a slot connected to
+	QProcess::readyReadStdout().
+
+- QPSPrinter
+	Fixed codec for korean postscript fonts (ksc5601.1987-0, not
+	the listbox. Don't auto-complete when saving a fileeucKR).
+
+- QRichText
+	Fixed a case-sensitive compare for alignment. Fixed a free'd
+	memory access problem with floating items on destruction.
+
+- QScrollView
+	If a contents mouse event is accepted, don't propagate as
+	a normal mouse event.
+
+- QSemaphore
+	Fixed race condition in operator -=.
+	Unix only: a bit more robust.
+
+- QSettings
+	Unix only: Fixed requesting subkeylists for single
+	subkeys. Don't read in QSettings stuff in non-gui mode if
+	desktop-settings-aware is set to false.
+
+- QSlider
+	Emit sliderMoved() after the slider was moved.
+
+- QSocket
+	If the read retruns 0, safely assume assume that the peer
+	closed the connection. Fixed readyRead sometimes not being
+	emitted.
+
+- QSpinBox
+	Fixed setValue so it will ignore input but yet
+	not interpreted text
+
+- QSqlDatabase
+	Fixed a crash on manual deletion of the QApplication object.
+
+- QSqlDriver
+	Various fixes and improvements for Oracle, Postgres, MySQL
+
+- QSqlForm
+	Fixed crash in clearValues() on empty fields.
+
+- QString
+	Fixed setNum(n,base) with n == LONG_MIN and n != 10. Make
+	toLong() and toULong() 64bit clean (problems on Tru64).
+
+- QStyle
+	Make more use of Style_HasFocus. Enforce a usable size for
+	subcontrols for small scrollbars. Improve titlebar drawing
+	(e.g. no gradient on 95/NT). Allow drawing of list view
+	expand controls without branches .
+	In Windows style: increase default PM_MaximumDragDistance
+	value.
+	Windows only: fixed PM_ScrollBarExtent
+
+- QStyleSheet
+	More accurate mightBeRichText() heuristic. Fixed setMargin()
+	to only set left/right/top/bottom as documented, not the
+	firstline margin.
+
+- QSvgDevice
+	Fixed curve command mixup. Some bounding rect fixes. Fixed
+	output coordinates for drawArc, drawPie and drawChord. Proper
+	x-axis-rotation and other angle fixes for arcs, pies and
+	chords. Respect text alignments. No background for Bezier
+	the listbox. Don't auto-complete when saving a filecurves.
+
+- QTabBar
+	Move focus to the current tab if the tab with focus is being
+	removed.
+
+- QTable
+	Fixed contentsContextMenuEvent(). Fixed
+	adjustRow()/adjustColumn() for multi line sections. Support
+	for QApplicaton::globalStrut(). Speed improvements for
+	setNumRows(). Improved sizeHint() to include the left/top
+	header. Fix for mouse release handling. Update geometry of
+	cell widgets when changing rowHeight/colWidth. Fixed
+	QTableItem::sizeHint() for items with wordwrap. Catch
+	hideColumn() on tables with too few columns. Fixed an endless
+	recursion when swapping header sections.
+
+- QTableItem
+	Fixed multiple calls to setSpan().
+
+- QTextCodec:
+	Initialize locale before loading textcodec plugins. Fixed a
+	bug in the unicode -> jisx0208 conversion table.
+
+- QTextEdit	
+	Reset cursor on undos that leave us with an empty
+	textedit. Quote quotes when exporting rich text. Fixed
+	possible crash when appending empty paragraphs like
+	"<p>". Some drawing problems fixed. Made removeParagraph() and
+	friends work in read-only mode. Fixed cursor blinking with
+	setEnabled() / setDisabled(). When exporting HTML, quote the
+	src attribute of img tags tags that contains spaces. Made 
+	setFormat() much faster in case undo/redo is disabled. Fixed
+	double deletion crash when clearing a document with floating
+	custom items.
+
+- QToolButton
+	In sizeHint() don't reserve space for icons if button has
+	only a textlabel. Made popups more robust (e.g. if the slot
+	connected to the popup menu results in the destruction of the
+	toolbutton)
+
+- QVariant
+	Fixed canCast() for Bool -> String conversion. Fixed
+	operator== for maps.
+
+- QWaitCondition
+	Windows only: Fixed multiple waits()
+
+- QWheelEvent
+	X11 only: Support for two-wheel mice. This relies on the
+	X-Server option "ZAxisMapping" "4 5 6 7"
+	On Windows, we have not found a reliable way to distringuish
+	the two wheels. Some drivers use larger deltas, something that
+	breaks with other drivers.
+
+- QWidget
+	Make focusWidget() return the focus widget even if it has no
+	focus policy. In setEnabled(FALSE) always clear the focus.
+	Made grabWidget() more robust. Fixed isEnabledTo().
+	X11 only: set WM_WINDOW_ROLE instead of WINDOW_ROLE.
+	Windows only: fixed widget-origin pixmap backgrounds.
+
+- QWidgetStack
+	More fixes to reduce flicker.
+
+- QWorkspace
+	Traditional activeWindow() fixes. Make maximizing a window while
+	the workspace is invisible work. If the already active window
+	is clicked on, transfer focus to the child. Restore focus to
+	old subcontrol when changing the active MDI window. Make sure
+	a MDI window is not resized below a child widget's minimum
+	size. Do not allow resizing windows when we have an active
+	popup window.
+
+- QXmlSimpleReader
+	Fixed a memory leak for incremental parsing.
diff --git a/dist/changes-3.1.0 b/dist/changes-3.1.0
new file mode 100644
index 0000000000..f08094670c
--- /dev/null
+++ b/dist/changes-3.1.0
@@ -0,0 +1,334 @@
+Qt 3.1 introduces many significant new features and many improvements
+over the 3.0.x series. This file provides an overview of the main
+changes since version 3.0.x. For further details see the online
+documentation which is included in this distribution, and also
+available at http://doc.trolltech.com/.
+
+The Qt version 3.1 series is binary compatible with the 3.0.x series:
+applications compiled for 3.0 will continue to run with 3.1.
+
+
+****************************************************************************
+*                                 General                                  *
+****************************************************************************
+
+Qt Script for Applications
+--------------------------
+Qt 3.1 is the first Qt release that can be used with Qt Script for
+Applications (QSA). QSA provides a scripting engine, an IDE for
+creating and editing scripts and script forms, and bindings to the Qt
+API. Script-enabling a Qt application is not difficult and the IDE
+makes it easy for resellers and end-users to write their own scripts.
+QSA is due for release after Qt 3.1.
+
+
+Qt Designer
+-----------
+Qt Designer, the visual GUI builder, has undergone several usability
+improvements. A new dialog for creating and editing signals and slots
+connections has been created: it is much easier to use and much faster
+for setting up multiple connections. The widgets are now presented in
+an easy-to-use toolbox rather than in toolbars (although you can still
+have the toolbars if you want). The property editor now handles common
+properties in multiple widgets simultaneously. By popular demand,
+WYSIWYG support for QWidgetStack has been added. Rich text is now
+supported with a rich text editor. And the code editor can be used for
+ordinary member functions as well as for slots.
+
+
+Qt Assistant
+------------
+Qt Assistant, the Qt documentation browser, can now be used with
+custom documentation sets. This new functionality combined with the
+new QAssistantClient class means that you can use Qt Assistant as a
+help browser for your own applications. Qt Assistant has also been
+enhanced by the addition of a fast full text search engine.
+
+
+Motif
+-----
+The general industry-wide move away from Motif is leaving more and
+more companies in need of a migration solution. But converting large
+legacy applications in one step is often impractical. To minimize
+risks and to manage the workload companies often want to port code on
+a module by module basis. Qt 3.1 includeds a completely new Motif
+module that supports hybrid applications in which Qt code and Motif
+code coexist. (This obsoletes the earlier rudimentary Qt Xt/Motif
+extension.)
+
+
+ActiveX
+-------
+With the release of Qt 3.1, customers who use Qt for Microsoft Windows
+development can now use Qt with ActiveX. The new ActiveQt module
+provides a simple API for COM and ActiveX. The module can be used to
+create applications which host ActiveX controls, and also to create
+applications that serve ActiveX controls (e.g. Internet Explorer
+plugins).
+
+
+Qt/Mac
+------
+The introduction of Qt/Mac, a Mac OS X port of Qt, with Qt 3.0 has
+proved a great success. This port has undergone many improvements in
+Qt 3.1, especially with respect to Appearance Manager, anti-aliased
+text and user settings. The Qt OpenGL support is greatly improved, and
+uses the hardware-accelerated drivers.
+
+
+Qt/Embedded
+-----------
+Graphics, mouse and keyboard drivers can now be compiled as plugins.
+
+
+Qt library
+----------
+In addition to the new additions and enhancements referred to above,
+as with all major Qt releases, Qt 3.1 includes hundreds of
+improvements in the existing class library. Here is a brief summary of
+the most significant changes:
+
+- QTextEdit has a new text format: LogText. This is a performance and
+  memory optimized format especially designed for the fast display of
+  large amounts of text. The format supports basic highlighting,
+  including bold and colored text.
+
+- The new QSyntaxHighlighter class makes it both easy and efficient to
+  add syntax highlighting capabilities to a QTextEdit.
+
+- QHttp and QFtp in earlier Qt's were implementations of the
+  QNetworkProtocol. Both have been extended to stand in their own
+  right. If you missed some flexibility in the network protocol
+  abstractions of earlier Qt's, the new QHttp and QFtp classes should
+  provide the solution.
+
+- QAccel, used to handle keyboard shortcuts, now gracefully copes with
+  shortcut clashes. If a clash occurs, a new signal,
+  activatedAmbiguously(), is emitted. Classes that use QAccel, like
+  QButton's subclasses and QPopupMenu, make use of this new
+  functionality. Futhermore QAccel can now handle multi-key sequences,
+  for example, Ctrl+X,Ctrl+F.
+
+- QClipboard has been extended to simplify data exchange between
+  programs.
+
+- Thread support: almost all methods in the tools classes have been
+  made reentrant. QApplication::postEvent() and a few other methods
+  are now thread-safe if Qt is compiled as a multi-threaded library.
+  (The documentation now states if a class or function is thread-safe
+  or reentrant.)
+
+- A QMutexLocker class has been added to simplify the locking and
+  unlocking of mutexes.
+
+- Input methods: A selectionLength() function has been added to
+  QIMEvent. Japanese compositions are now handled correctly. Support
+  for AIMM based input methods (those working on non-Asian versions of
+  Win95/98/Me) has been added.
+
+- Large File support: Qt's internals have been modified to support
+  Large Files (> 2GB). QFileDialog will now correctly display and
+  select large files.
+
+- SQL module: Support for prepared query execution and value binding
+  has been added. Among other benefits, this makes it possible to
+  write large BLOBs (> 2 KB) to Oracle databases, and to write Unicode
+  strings to SQL Server databases.
+
+- Support for XIM on Solaris.
+
+Build process
+-------------
+The build process has been improved:
+
+- The configure script does not need QTDIR to be set anymore.
+
+- Improved support for building Qt on MSVC.NET.
+
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QAccel:
+	Corrected illegal accelerator state when using multiple
+	keysequences. (Resulted in no accelerator being triggered when
+	there's a partial match). Only triggers on enabled
+	accelerators and their enabled items. Eats all keys in a
+	keysequence, not just the first and last.
+
+- QCString:
+	Speed-optimized replace().
+
+- QDataStream:
+	Applies to printable data streams only: If the version number
+	of the device is less than 4, use the same streaming format
+	that was used in Qt 2.3 and earlier.
+
+- QDataTable:
+	Respect read-only columns. Make it possible to swap columns.
+
+- QDockWindow:
+	Added a standard widget constructor (taking a QWidget *parent,
+	const char *name and WFlags). Improved docking behavior.
+
+- QFileDialog:
+	Windows only: make Qt's filedialog work properly with network
+	paths.
+
+- QFontMetrics:
+	Windows only: Fixed QFontMetrics::boundingRect( QChar c ) to
+	work for non-TrueType fonts.
+
+- QHeader:
+	Optimized the sectionSizeHint() calculation, which in turn 
+	speeds up all QHeader size/label calculations.
+
+- QIconFactory:
+	Avoid infinite loops when recursively calling
+	QPixmap::pixmap().
+
+- QIconView:
+	Fixed navigation and selection with arrow keys. Some speedups
+	when repainting.
+
+- QKeySequence:
+	Treat Unicode characters in string defined sequences
+	correctly. So, now letters like Æ, Ø and Å should work as
+	accelerators, even through translation files.
+
+- QLayout:
+	alignmentRect() respects the layout's maximum size.
+
+- QLineEdit:
+	Added a lostFocus() signal. Double-clicking only uses spaces
+	as word bounderies for the selection now, not dots, commas,
+	etc. Support double-click+mousemove selection.
+
+- QListBox:
+	Fixed the item which is passed into the contextMenuRequested()
+	signal (this was sometimes wrong). Don't select items that are
+	not selectable.
+
+- QListView:
+	Shift selection in Extended mode now follows Windows
+	Shift-selection standard. Erase empty area when drawing
+	listviews without columns. Only drops on drop-enabled items
+	that accept drops.
+
+- QListViewItem:
+	Optimized size claculation for multi-line items.
+
+- QMainWindow:
+	Base the minimumSizeHint() on the sizeHint()s of the left hand
+	dock area (instead of the minimumSize()).
+
+- QMenuBar:
+	Fixed broken Alt release detection. Fixed flickering. Fixed
+	empty menubars resizing properly.
+
+- QObject:
+	Fixed return value of disconnect(). Fixed disconnect()ing
+	SIGNALs from SIGNALs and disconnect()ing multiple SLOTs with
+	the same name from a SIGNAL.
+
+- QProcess:
+	Unix only: Don't eat the file descriptors if a lot of
+	processes (with short runtimes) are started immediately after
+	each other.
+
+- QPSQLDriver:
+	Make the driver compile with the standard PostgreSQL source
+	distribution under Windows. Better handling of network,
+	datetime and geometrical datatypes.
+
+- QRegion:
+	Fixed setRects() to calculate the bounding rectangle
+	correctly.
+
+- QScrollView:
+	Doesn't reposition the view when the user is scrolling the
+	view.
+
+- QSpinBox:
+	Fixed setValue() so that any not-yet-interpreted input is
+	ignored when setting a new value.
+
+- QString:
+	Support QTextCodec::codecForCStrings(). Support
+	std::string<==>QString conversion when STL support is on.
+
+- QSyntaxHighlighter:
+	Added function rehighlight(). Improved internals to be more
+	efficient (less calls to highlightParagraph() necessary).
+
+- QTable:
+	Fixed Tab/BackTab handling to always work. Fixed
+	setColumnLabels() and setRowLabels().
+
+- QTableItem (and subclasses):
+	Now supports global struts. (See QApplication::globalStrut().)
+
+- QTDSDriver:
+	Added support for binary datatypes.
+
+- QTextCodec:
+	Added QTextCodec::codecForCStrings and QTextCodec::codecForTr.
+
+- QTextEdit:
+	Fixed a painting error which resulted in areas of the textedit
+	not being erased correctly. Make sure repainting is done after
+	changing the underline-links setting. Renamed 'allowTabs'
+	property to 'tabChangesFocus' (inverted value). Added a new
+	property 'autoFormatting'. When exporting HTML also quote
+	quotes. Fixed a background erasing bug which messed up the
+	view.
+
+- QUrl:
+	Recognize Windows drive letters not only in the form of "c:/"
+	but also in the form "c:" (without the '/').
+
+- QWidget:
+	Fixed some visibility issues.
+
+****************************************************************************
+*			   Qt Designer					   *
+****************************************************************************
+
+- Now displays the classname of "gray box" custom widgets in the gray
+  box on the form.
+
+- Accept tildes (~) in the project settings.
+
+- A new command line tool conv2ui (in qt/tools/designer/tools) has
+  been added, to convert dialog description files from different file
+  formats to .ui files without the need to invoke Qt Designer. This
+  tool uses the same plugins as Qt Designer for loading other dialog
+  description files.
+
+- An import filter for .kdevdlg files has been added.
+
+- Actions in the action editor are now sortable.
+
+- Improved usability of more dialogs (in-place renaming, drag'n'drop,
+  etc.)
+
+- Preserve creation order of forward declarations, variables, etc.
+
+- Save comments for actions.
+
+- uic: Fixed generating code for QStringList properties.
+
+****************************************************************************
+*			   Qt Assistant					   *
+****************************************************************************
+
+- Fixed some accelerator conflicts.
+
+****************************************************************************
+*			   Qt Linguist					   *
+****************************************************************************
+
+- Handle trailing backslash in strings correctly in lupdate.
+
+******************************** END ***************************************
diff --git a/dist/changes-3.1.0-b1 b/dist/changes-3.1.0-b1
new file mode 100644
index 0000000000..527992ff2c
--- /dev/null
+++ b/dist/changes-3.1.0-b1
@@ -0,0 +1,692 @@
+Qt 3.1 introduces many significant new features and many improvements
+over the 3.0.x series. This file provides an overview of the main
+changes since version 3.0.5. For further details see the online
+documentation which is included in this distribution, and also
+available at http://doc.trolltech.com/.
+
+The Qt version 3.1 series is binary compatible with the 3.0.x series:
+applications compiled for 3.0 will continue to run with 3.1.
+
+
+****************************************************************************
+*                                 General                                  *
+****************************************************************************
+
+Qt Script for Applications
+--------------------------
+Qt 3.1 is the first Qt release that can be used with Qt Script for
+Applications (QSA). QSA provides a scripting engine, an IDE for
+creating and editing scripts and script forms, and bindings to the Qt
+API. Script-enabling a Qt application is not difficult and the IDE
+makes it easy for resellers and end-users to write their own scripts.
+QSA is due for release after Qt 3.1.
+
+
+Qt Designer
+-----------
+Qt Designer, the visual GUI builder, has undergone several usability
+improvements. A new dialog for creating and editing signals and slots
+connections has been created: it is much easier to use and much faster
+for setting up multiple connections. The widgets are now presented in
+an easy-to-use toolbox rather than in toolbars (although you can still
+have the toolbars if you want). The property editor now handles common
+properties in multiple widgets simultaneously. By popular demand,
+WYSIWYG support for QWidgetStack has been added. Rich text is now
+supported with a rich text editor. And the code editor can be used for
+ordinary member functions as well as for slots.
+
+
+Qt Assistant
+------------
+Qt Assistant, the Qt documentation browser, can now be used with
+custom documentation sets. This new functionality combined with the
+new QAssistantClient class means that you can use Qt Assistant as a
+help browser for your own applications. Qt Assistant has also been
+enhanced by the addition of a fast full text search engine.
+
+
+Motif
+-----
+The general industry-wide move away from Motif is leaving more and
+more companies in need of a migration solution. But converting large
+legacy applications in one step is often impractical. To minimize
+risks and to manage the workload companies often want to port code on
+a module by module basis. Qt 3.1 includeds a completely new Motif
+module that supports hybrid applications in which Qt code and Motif
+code coexist. (This obsoletes the earlier rudimentary Qt Xt/Motif
+extension.)
+
+
+ActiveX
+-------
+With the release of Qt 3.1, customers who use Qt for Microsoft Windows
+development can now use Qt with ActiveX. The new ActiveQt module
+provides a simple API for COM and ActiveX. The module can be used to
+create applications which host ActiveX controls, and also to create
+applications that serve ActiveX controls (e.g. Internet Explorer
+plugins).
+
+
+Qt/Mac
+------
+The introduction of Qt/Mac, a Mac OS X port of Qt, with Qt 3.0 has
+proved a great success. This port has undergone many improvements in
+Qt 3.1, especially with respect to Appearance Manager, anti-aliased
+text and user settings. The Qt OpenGL support is greatly improved, and
+uses the hardware-accelerated drivers.
+
+
+Qt/Embedded
+-----------
+Graphics, mouse and keyboard drivers can now be compiled as plugins.
+
+
+Qt library
+----------
+In addition to the new additions and enhancements referred to above,
+as with all major Qt releases, Qt 3.1 includes hundreds of
+improvements in the existing class library. Here is a brief summary of
+the most significant changes:
+
+- QTextEdit has a new text format: LogText. This is a performance and
+  memory optimized format especially designed for the fast display of
+  large amounts of text. The format supports basic highlighting,
+  including bold and colored text.
+
+- The new QSyntaxHighlighter class makes it both easy and efficient to
+  add syntax highlighting capabilities to a QTextEdit.
+
+- QHttp and QFtp in earlier Qt's were implementations of the
+  QNetworkProtocol. Both have been extended to stand in their own
+  right. If you missed some flexibility in the network protocol
+  abstractions of earlier Qt's, the new QHttp and QFtp classes should
+  provide the solution.
+
+- QAccel, used to handle keyboard shortcuts, now gracefully copes with
+  shortcut clashes. If a clash occurs, a new signal,
+  activatedAmbiguously(), is emitted. Classes that use QAccel, like
+  QButton and QPopupMenu, make use of this new functionality.
+  Futhermore QAccel can now handle multi-key sequences, for example,
+  Ctrl+X,Ctrl+F.
+
+- QClipboard has been extended to simplify data exchange between
+  programs.
+
+- Thread support: almost all methods in the tools classes have been
+  made reentrant. QApplication::postEvent() and a few other methods
+  are now thread-safe if Qt is compiled as a multi-threaded library.
+  (The documentation now states if a class or function is thread-safe
+  or reentrant.)
+
+- A QMutexLocker class has been added to simplify the locking and
+  unlocking of mutexes.
+
+- Input methods: A selectionLength() function has been added to
+  QIMEvent. Japanese compositions are now handled correctly. Support
+  for AIMM based input methods (those working on non-Asian versions of
+  Win95/98/Me) has been added.
+
+- Large File support: Qt's internals have been modified to support
+  Large Files (> 2GB). QFileDialog will now correctly display and
+  select Large Files.
+
+- SQL module: Support for prepared query execution and value binding
+  has been added. Among other benefits, this makes it possible to
+  write large BLOBs (> 2 KB) to Oracle databases, and to write Unicode
+  strings to SQL Server databases.
+
+
+Build process
+-------------
+The build process has been improved:
+
+- The configure script does not need QTDIR to be set anymore.
+
+
+****************************************************************************
+*                                 Library                                  *
+****************************************************************************
+
+New classes
+==================
+
+- QBackInsertIterator
+- QEventLoop
+- QIconFactory
+- QMutexLocker
+- QSyntaxHighlighter
+
+
+QAction
+------------------
+New functions:
+	void setVisible( bool )
+	bool isVisible() const
+
+
+QCanvas
+------------------
+New functions:
+	void invalidate()
+	bool isValid() const
+
+
+QColorDialog
+------------------
+New functions:
+	static void setStandardColor( int, QRgb )
+
+
+QAccel
+------------------
+New signals:
+	void activatedAmbiguously( int id )
+
+
+QApplication
+------------------
+The event loop has been moved to the QEventLoop class, making it
+easier to integrate other toolkits with Qt.
+
+New functions:
+	QEventLoop *eventLoop() const
+	void setEventLoop( QEventLoop * )
+	QString sessionKey() const
+
+
+QClipboard
+------------------
+New functions:
+	void clear( Mode mode )
+	bool supportsSelection() const
+	bool ownsSelection() const
+	bool ownsClipboard() const
+	QString text( Mode mode )  const
+	QString text( QCString& subtype, Mode mode ) const
+	void setText( const QString &, Mode mode )
+	QMimeSource *data( Mode mode ) const
+	void setData( QMimeSource*, Mode mode )
+	QImage image( Mode mode ) const
+	QPixmap pixmap( Mode mode ) const
+	void setImage( const QImage &, Mode mode )
+	void setPixmap( const QPixmap &, Mode mode )
+
+
+QDesktopWidget
+------------------
+New functions:
+	const QRect& screenGeometry( QWidget *widget ) const
+	const QRect& screenGeometry( const QPoint &point ) const
+	const QRect& availableGeometry( int screen ) const
+	const QRect& availableGeometry( QWidget *widget ) const
+	const QRect& availableGeometry( const QPoint &point ) const
+
+
+QFileDialog
+------------------
+Large Files (> 2GB) are now correctly displayed and selected.
+
+
+QFileInfo
+------------------
+QFileInfo now supports Large Files (> 2GB) internally. To maintain
+binary compatibility the QFileInfo API cannot be adapted before Qt 4
+and will truncate file sizes and offsets to 4 GB.
+
+New functions:
+	bool isHidden() const
+
+
+QFile
+------------------
+QFile now supports Large Files (> 2GB) internally. To maintain binary
+compatibility the QFile API cannot be adapted before Qt 4 and will
+truncate file sizes and offsets to 4 GB.
+
+
+QDir
+------------------
+QDir now supports Large Files (> 2GB).
+
+
+QImEvent
+------------------
+New functions:
+	in selectionLength() const
+
+
+QIconSet
+------------------
+New functions:
+	void installIconFactory( QIconFactory *factory )
+
+
+QImage
+------------------
+New functions:
+	static QImage fromMimeSource( const QString& abs_name )
+
+
+QMetaObject
+------------------
+New functions:
+	QStrList enumeratorNames( bool super ) const
+	int numEnumerators( bool super ) const
+	static bool hasMetaObject( const char *class_name )
+
+
+QMenuData
+------------------
+New functions:
+	bool isItemVisible( int id ) const
+	void setItemVisible( int id, bool visible )
+Both functions are inherited by QMenuBar and QPopupMenu
+
+
+QPaintDevice
+------------------
+New functions (x11 only):
+	static Qt::HANDLE x11AppRootWindow()
+	static int x11AppDepth( int screen )
+	static int x11AppCells( int screen )
+	static Qt::HANDLE x11AppRootWindow( int screen )
+	static Qt::HANDLE x11AppColormap( int screen )
+	static void *x11AppVisual( int screen )
+	static bool x11AppDefaultColormap( int screen )
+	static bool x11AppDefaultVisual( int screen )
+	static int x11AppDpiX( int )
+	static int x11AppDpiY( int )
+	static void x11SetAppDpiX( int, int )
+	static void x11SetAppDpiY( int, int )
+
+
+QPicture
+------------------
+New functions:
+	void setBoundingRect( const QRect &r )
+
+
+QPixmap
+------------------
+New functions:
+	bool hasAlpha() const
+	static QPixmap fromMimeSource( const QString& abs_name )
+
+
+QPrinter
+------------------
+New functions:
+	void setMargins( uint top, uint left, uint bottom, uint right )
+	void margins( uint *top, uint *left, uint *bottom, uint *right ) const
+
+Improvements:
+	Handle masked images and pixmaps correctly. Add code to handle
+	asymmetrical printer margins correctly.
+
+
+QSessionManager
+------------------
+New functions:
+	QString sessionKey() const
+
+
+QStyleOption
+------------------
+New functions:
+	QStyleOption( QCheckListItem* i )
+	QCheckListItem* checkListItem() const
+
+New enums values:
+	PE_CheckListController, PE_CheckListIndicator,
+	    PE_CheckListExclusiveIndicator, PE_PanelGroupBox
+	CE_MenuBarEmptyArea
+	CE_DockWindowEmptyArea
+	PM_CheckListButtonSize
+	CT_TabBarTab, CT_Slider, CT_Header, CT_LineEdit
+	SH_GroupBox_TextLabelVerticalAlignment
+
+
+QThread
+------------------
+New functions:
+	void terminate()
+
+
+QTranslator
+------------------
+New functions:
+	bool load( const uchar *data, int len )
+
+
+QVariant
+------------------
+New functions:
+	QVariant( const QPen& )
+	const QPen toPen() const
+	QPen& asPen()
+	bool isNull() const
+
+New enum values:
+	KeySequence, Pen
+
+
+QWidget
+------------------
+All top-level widgets will now try to find an appropriate application
+icon when they're not given one, trying in this order
+ 1. Parent widget's icon
+ 2. Top-level widget's icon
+ 3. Application main widget's icon
+
+New functions:
+	bool isFullScreen() const
+	void setSizePolicy( QSizePolicy::SizeType hor, QSizePolicy::SizeType ver, bool hfw = FALSE )
+
+New enum values:
+	AncestorOrigin
+
+
+QWMatrix
+------------------
+Two different transformation modes for painter transformations are now
+available. See the QWMatrix documentation for details.
+
+New functions:
+	QPointArray mapToPolygon( const QRect &r ) const
+	double det() const
+	static void setTransformationMode( QWMatrix::TransformationMode m )
+	static TransformationMode transformationMode()
+
+New enums:
+	TransformationMode { Points, Areas }
+
+
+QFtp
+------------------
+While still remaining a subclass of QNetworkProtocol, QFtp can be now
+used directly for more advanced FTP operations. The QFtp documentation
+provides details of the extensions to the API.
+
+
+QHttp
+------------------
+While still remaining a subclass of QNetworkProtocol, QHttp can be now
+used directly for more advanced HTTP operations. The QHttp
+documentation provides details of the extensions to the API.
+ 
+Related new classes:
+	QHttpHeader
+	QHttpResponseHeader
+	QHttpRequestHeader
+
+
+QSqlDriver
+------------------
+New enum values:
+	Unicode, PreparedQueries, OracleBindingStyle, ODBCBindingStyle
+	
+
+QSqlQuery
+------------------
+New functions:
+	bool isForwardOnly() const
+	void setForwardOnly( bool forward )
+	bool exec()
+	bool prepare( const QString& query )
+	void bindValue( const QString& placeholder, const QVariant& val )
+	void bindValue( int pos, const QVariant& val )
+	void addBindValue( const QVariant& val )
+
+
+QTableSelection
+------------------
+New functions:
+	QTableSelection( int start_row, int start_col, int end_row, int end_col )
+
+
+QTable
+------------------
+New properties:
+	int numSelections
+
+New functions:
+	void selectCells( int start_row, int start_col, int end_row, int end_col )
+	void selectRow( int row )
+	void selectColumn( int col )
+	void updateHeaderStates()
+	void setRowLabels( const QStringList &labels )
+	void setColumnLabels( const QStringList &labels )
+
+
+QCString
+------------------
+New functions:
+    	QCString &replace( char c, const char *after )
+    	QCString &replace( const char *, const char * )
+    	QCString &replace( char, char )
+
+New global functions:
+	QByteArray qCompress( const uchar* data, int nbytes )
+	QByteArray qUncompress( const uchar* data, int nbytes )
+	QByteArray qCompress( const QByteArray& data )
+	QByteArray qUncompress( const QByteArray& data )
+Improvements:
+	Speed optimisations in lots of the old search and replace
+	functions.
+
+
+QDate
+------------------
+New functions:
+	int weekNumber( int *yearNum = 0 ) const
+	static QDate currentDate( Qt::DateTimeSpec )
+
+
+QTime
+------------------
+New functions:
+	static QTime currentTime( Qt::DateTimeSpec )
+
+
+QDateTime
+------------------
+New functions:
+	static QDateTime currentDateTime( Qt::DateTimeSpec )
+
+
+QPtrList
+------------------
+New functions:
+	bool replace( uint i, const type *d )
+
+
+QRegExp
+------------------
+New functions:
+	QString errorString()
+	static QString escape( const QString& str )
+	int numCaptures() const
+
+
+QSettings
+------------------
+New functions:
+	QSettings( Format format )
+	void setPath( const QString &domain, const QString &product, Scope = User )
+	void beginGroup( const QString &group )
+	void endGroup()
+	void resetGroup()
+	QString group() const
+
+New enums:
+	Format { Native = 0, Ini }
+	Scope { User, Global }
+
+
+QChar
+------------------
+Updated Unicode tables to Unicode-3.2
+
+
+QString
+------------------
+New functions:
+	QString &append( const QByteArray & )
+	QString &append( const char * )
+	QString &prepend( const QByteArray & )
+	QString &prepend( const char * )
+	QString &remove( QChar c )
+	QString &remove( char c )
+	QString &remove( const QString & )
+	QString &remove( const QRegExp & )
+	QString &remove( const char * )
+	QString &replace( uint index, uint len, QChar )
+	QString &replace( uint index, uint len, char c )
+	QString &replace( QChar c, const QString & )
+	QString &replace( char c, const QString & after )
+	QString &replace( const QString &, const QString & )
+	QString &replace( QChar, QChar )
+	QString &operator+=( const QByteArray &str )
+	QString &operator+=( const char *str )
+	static QString fromUcs2( const unsigned short *ucs2 )
+	const unsigned short *ucs2() const
+
+Improvements:
+	find(), findRev() and contains() use either a fast hashing
+	algorithm (for short strings) or an optimized Boyer-Moore
+	implementation for long strings. Lots of smaller performance
+	optimisations.
+
+
+QTextStream
+------------------
+New functions:
+	QTextCodec *codec()
+
+
+QTimeEdit
+------------------
+New properties:
+	Display display
+
+New functions:
+	uint display() const
+	void setDisplay( uint )
+
+New enums:
+	Display { Hours, Minutes, Seconds, AMPM }
+
+
+QFrame
+------------------
+New enum values:
+	GroupBoxPanel
+
+
+QGroupBox
+------------------
+New properties:
+	bool flat
+
+New functions:
+	bool isFlat() const
+	void setFlat( bool b )
+
+
+QListBox
+------------------
+New functions:
+	QListBoxItem* selectedItem() const
+
+
+QListView
+------------------
+New functions:
+	int sortColumn() const
+
+
+QSlider
+------------------
+New functions:
+	void addLine() ( as slot)
+	void subtractLine() (as slot)
+
+
+QTextBrowser
+------------------
+New functions:
+	void sourceChanged( const QString& )
+	void anchorClicked( const QString&, const QString& )
+
+
+QTextEdit
+------------------
+QTextEdit offers another TextFormat (LogText), which is optimized
+(speed and memory) for displaying large read-only texts normally used
+for logging.
+
+New properties:
+	bool allowTabs
+
+New functions:
+	QString anchorAt( const QPoint& pos, AnchorAttribute a )
+	void setAllowTabs( bool b )
+	bool allowTabs() const
+	void insert( const QString &text, uint insertionFlags = CheckNewLines | RemoveSelected )
+
+New signals:
+	void clicked( int parag, int index )
+	void doubleClicked( int parag, int index )
+
+New enums:
+	TextInsertionFlags { RedoIndentation, CheckNewLines, RemoveSelected }
+
+New enum values:
+	AtWordOrDocumentBoundary
+
+
+QToolButton
+------------------
+New properties:
+	TextPosition textPosition
+
+New functions:
+	TextPosition textPosition() const
+	void setTextPosition( TextPosition pos )
+
+New enums:
+	TextPosition { Right, Under }
+
+
+QTooltip
+------------------
+New functions:
+	static void setWakeUpDelay( int )
+
+
+QWhatsThis
+------------------
+New functions:
+	static void setFont( const QFont &font )
+
+
+QDomDocument
+------------------
+New functions:
+	QString toString( int ) const
+	QCString toCString( int ) const
+
+
+QFont on X11 
+------------------ 
+Improvements:
+	Safe handling of huge font sizes. Added support for the new
+	Xft2 font library on XFree-4.x.
+
+
+QRegion on X11 
+------------------ 
+Improvements:
+	Removed the 16 bit size limitation
+
+****************************************************************************
diff --git a/dist/changes-3.1.0-b2 b/dist/changes-3.1.0-b2
new file mode 100644
index 0000000000..f5c8c14a71
--- /dev/null
+++ b/dist/changes-3.1.0-b2
@@ -0,0 +1,220 @@
+Qt 3.1 introduces many significant new features and many improvements
+over the 3.0.x series. For an overview of the main changes between
+3.0.x and 3.1, look at the changes-3.1.0-b1 file. This file describes
+the changes between Qt 3.1 beta1 and Qt 3.1 beta2.
+
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+The binary incompatibilities that were introduced in Qt 3.1 beta1
+have been fixed.
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QAction
+	Don't update when nothing has changed.
+
+- QActionGroup
+	Syncronize comboboxes correctly for groups with
+	separators. Set the initial currentItem of comboboxes to the
+	action that is on when adding the group. Emit activated signal
+	for non-toggle actions selected from a combobox. Apply the
+	state of the action group for new widgets.
+
+- QApplication
+	Correctly set the accept() flag on accel events. Obsoleted
+	processOneEvent(), we have a better way for integrating
+	eventloops now. (See QEventLoop's documentation.)
+	Windows only: reserve more space for very long application
+	filenames.
+
+- QCheckTableItem
+	Use the colorgroup passed in for the background color and not
+	the viewport's.
+
+- QColor
+	Windows only: Fix palette allocation and ManyColor mode on
+	Windows.
+
+- QComboBox
+	Emit activated() signals from the wheel event handler.
+
+- QComboTableItem
+	Make sure stringlist is updated even if setStringList() is
+	called while an editor exists.
+
+- QDataTable
+	Windows only: If edit confirmation was switched on and
+	the user cancelled an update by clicking in a different field,
+	the current row was needlessly changed.
+
+- QDateTimeEdit/QTimeEdit
+	Now supports wraparound for time editing.
+	
+- QDesktopWidget
+	Windows only: Allow explicit creation of QDesktopWidgets.
+
+- QDns
+	Fix a crash when a QDns object is deleted in a slot connected
+	to its resultsReady() signal.
+
+- QDockWindow
+	Windows only: Don't pass window activation around
+	unnecessarily when the activation is ignored anyway. Also
+	fixed repaint errors while dragging dock windows. Remove
+	floating windows from the mainwindow's internal lists when
+	deleting.
+
+- QEventLoop
+	Renamed processNextEvent(flags,bool) to processEvents(flags)
+	and introduced new ProcessEvents flag, WaitForMore. Remove
+	processOneEvent since it is redundant.
+
+- QFileDialog
+	Windows only: Disable NTFS permission lookup during filedialog
+	population. This can take a long time, and the information is
+	not really required.
+
+- QGLContext
+	Added a workaround to get overlays to work on ATi FireGL
+	cards.
+
+- QGLWidget
+	Added support for rendering text into a GL context with the
+	renderText() calls.
+
+- QHeader
+	Draw the sort arrow at the right position with multi-line
+	header labels. Scale the correct sections when the header
+	sections are reordered. Respect orientation() in sizeHint().
+
+- qHeapSort()
+	Fixed to only require operator<, instead of a mix of
+	operator<, <=, and >.
+
+- QIconView
+	Optimize updates on focus/window activation changes.
+
+- QLibrary
+	Windows only: only append ".dll" extension if no extension has
+	been provided.
+
+- QListBox
+	Don't call ensureCurrentVisible() in resizeEvent() unless the
+	current item was visible when you started resizing.
+
+- QListView
+	Don't draw the cell if the cell wouldn't be visible due to
+	having a width or height of 0. Don't call cancelRename() when
+	the rename was OK'd. When showing a tooltip make sure it's
+	only for that column and not for the whole item.
+
+- QMacStyle
+	Many improvements to follow the native style more closely.
+
+- QMainWindow
+	Close all floating dockwindows of the mainwindow in the close
+	event.
+
+- QMenuData
+	Make removeItem(int id) work on trees like the other functions
+	that take IDs as arguments.
+
+- QObject
+	Make sender() a safer function to use:
+	- it cannot be dangling anymore (points to 0 if the sender was
+	  deleted or disconnected)
+	- it maintains its value after other signals have been emitted
+	Fixed compatibility problem in connect(). Remove quadratic
+	behaviour in insertChild()
+
+- QPicture
+	Proper streaming for null pictures.
+
+- QPixmap
+	X11 only: allow grabWindow() to work on a screen other than
+	the default screen.
+
+- QPopupMenu
+	Draw submenu items disabled if the submenu is disabled. Fix
+	null-pointer dereferencing for dynamically changing menus.
+
+- QProcess
+	Windows only: make the tryTerminate() function work for
+	windows applications (it still does not work for
+	consoleapplications, though).
+
+- QSocket
+	Don't crash if the readBlock() returned 0.
+
+- QSplitter
+	addWidget() now reparents the widget if necessary.
+
+- QTable
+	Set the table of the item to the table in insertItem(), so
+	takeItem()/insertItem() can be used to move items between
+	tables.
+
+- QWidget
+	Clear WDestructiveClose before calling deleteLater() on
+	widgets. Event processing during destruction might otherwise
+	have another close event come along, which would issue another
+	deleteLater() call. Added a new function toggleShowHide(bool show).
+	Simplified visible() handling and added a convenience property
+	"shown" and a write function for "hidden". Save WFlags in
+	showFullScreen() and restore them so flags are remembered
+	correctly.
+
+- QWindowsStyle
+	Make the Windowsstyle obey the system's scrollbar widths.
+
+- qUncompress()
+	Don't hang forever if the expected size passed in is 0. Return
+	an empty bytearray if something went wrong instead of garbage
+	data.
+
+
+
+
+****************************************************************************
+*			   Qt Designer					   *
+****************************************************************************
+
+- Improved the look of the Toolbox
+
+- Many small usibility improvements in the special editors for widgets
+  (drag'n'drop, in-place renaming, etc.).
+
+- New icon look.
+
+- Accept class names with "::" and generate correct namespace code in
+  uic.
+
+- Reduced startup time.
+
+- Fixed a crash when loading .ui files using QWidgetFactory.
+
+- Cleaned up some old dialogs and removed obsolete settings.
+
+- Improved the .dlg import plugin.
+
+- Button text properties can be edited in a multi-line editor now,
+  since all buttons support multi-line labels.
+
+****************************************************************************
+*			   Qt Assistant					   *
+****************************************************************************
+
+- Added commandline option -removeContentFile.
+
+- New icon look.
+
+****************************************************************************
+*			   Qt Linguist					   *
+****************************************************************************
+
+- New icon look.
diff --git a/dist/changes-3.1.1 b/dist/changes-3.1.1
new file mode 100644
index 0000000000..41a5742ee1
--- /dev/null
+++ b/dist/changes-3.1.1
@@ -0,0 +1,212 @@
+Qt 3.1.1 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.1.0
+
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+- The build issues with the Professional Edition have been solved.
+
+- The build problems reported on Solaris and HP-UX have been addressed.
+
+- Detection of Xft2 support has been added.
+
+- The installer and reconfigure tools on Windows have been fixed.
+
+- Look'n'Feel improvements have been made in the Qt/Mac version.
+
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QAccel
+	Fixed for single key accelerators. Made Shift modifier work
+	for all key combinations, unless an accelerator with Shift is
+	defined.
+
+- QAction
+	Remove iconset when a null-iconset is being set.
+
+- QApplication
+	Don't overwrite explicitly set font with the default font when
+	using the static methods before calling the constructor.
+	X11 only: Support custom color maps on 8-bit visuals.
+
+- QCheckBox
+	Draw focus indicator into indicator if the text label is empty.
+
+- QClipboard
+	X11 only: Null-terminate encoded strings.
+
+- QComboBox
+	Made sure the current item is selected in the list. Call
+	focusIn/OutEvent handlers when the lineedit changes focus.
+
+- QDataTable
+	Update the current cell when selecting rows.
+
+- QDialog
+	Don't find a place for dialogs that have been explicitly
+	moved.
+
+- QDir
+	Improved filtered lookup.
+
+- QDockWindow
+	Emit visibilityChanged signal only if visibility relative to
+	the dock area has changed.
+
+- QEventLoop
+	Implement this API on Windows and Mac.
+
+- QFileDialog
+	Fix visibility of preview widgets. Renaming files now also
+	works in ExistingFiles mode.
+
+- QFont
+	X11 only: Fixed width calculation for undefined characters.
+
+- QFrame
+	Erase the margin region for flicker-optimized subclasses.
+
+- QFtp
+	Don't try to connect multiple times to the server.
+
+- QHttp
+	Fix special case for "Content-Length: 0" transfers.
+
+- IME   (Input Methods)
+	Windows only: Accept the input when the widget loses focus.
+
+- QLibrary
+	Mac only: Implement path searching to look in standard loader places
+	for plugins.
+
+- QLineEdit
+	Draw background pixmap with the correct offset. Fixed
+	undo/redo.
+	Mac only: Support for native navigation and selection with keyboard.
+
+- QListBox
+	Fixed null-pointer crash in QFileDialog.
+
+- QListView
+	Fixed null-pointer crash when reimplementing insertItem.
+
+- QMenuBar
+	Improved focus handling.
+
+- QMime
+	Support URLs on Japanese Win98.
+	Windows only: Support URLs on network drives.
+
+- QOCIDriver
+	Improved handling for datatype mismatches
+
+- QODBCDriver
+	Don't report Unicode support on Win9x/Me. Support
+	high-precision values. Support fetchLast in forward-only
+	databases
+
+- QPainter
+	Make endpixel rendering consistent on all platforms. Draw
+	focus rectangles with better contrast. Fixed text rendering
+	with wordbreak.
+
+- QPixmap
+	Mac only: Support alpha channels when converting from a
+	QImage.
+
+- QPopupMenu
+	Fixed offset errors and keyboard navigation for invisible
+	items. Allow overlapping of menus with desktop elements (e.g.
+	taskbar). Avoid flicker for context menus.
+
+- QPrinterDialog
+	Unix only: Try harder to find all printers.
+
+- QProcess
+	Windows only : Start batch files with spaces in filename.
+
+- QScrollView
+	Don't propagate accepted contents mouse events.
+
+- QSettings
+	X11 only: Don't read Qt specific settings if application is
+	not desktop-settings-aware.
+	Windows only: Handle null-terminations correctly on
+	Win95/98/Me. Fixed a resource leak.
+
+- QSqlCursor
+	Improved performance for multiple inserts
+
+- QString
+	Pass base parameter to recursive calls in setNum().
+
+- QStyle
+	Make better use of the style flags.
+
+- QTabBar
+	Fixed focus handling for dynamically created tab widgets.
+
+- QTable
+	Make sizeHint implementation depend on header
+	visibility. Update the geometry of cell widgets in
+	setRowHeight() and setColumnWidth().
+
+- QTableItem
+	Fixed sizeHint() for items with wordwrap and items with
+	newlines in the text.
+
+- QTextCodecFactory
+	Load plugins correctly.
+
+- QTextEdit
+	Fixed rendering of selections in inactive windows. Return the
+	string with format tags in LogText mode. Non-breaking
+	whitespaces (0xA0) are no longer converted to spaces in text().
+
+- QWheelEvent
+	X11 only: Support second mouse wheel (since there is no
+	documented API for this on Windows).
+
+- QWidget
+	Fix showHidden(). Propagate palettes and fonts correctly to
+	children. Don't block modeless children of modal dialogs.
+
+- QWorkspace
+	Don't return invalid pointers to closed MDI clients.
+
+
+****************************************************************************
+*		   		Tools					   *
+****************************************************************************
+
+- moc and uic
+	Delete output files before aborting.
+
+- uic
+	Don't print debug messages from generated code. Fixed column
+	and row labeling. Don't generate code for database specific
+	properties.
+
+- Qt Designer
+	Fixed reported crashes.
+  
+- Qt Assistant
+	Flush stdout to make sure that clients get the correct port
+	number.
+
+
+****************************************************************************
+*			       Extensions				   *
+****************************************************************************
+
+- ActiveQt
+	Fixed null-pointer crashes for QVariant parameters. Try harder
+	to convert types. Fixed Qt control placement and property
+	handling in Visual Basic. Improved workaround for Word
+	type library problems. Integrated hosted controls in tab focus
+	chain. Support property overloading in Qt controls.
diff --git a/dist/changes-3.1.2 b/dist/changes-3.1.2
new file mode 100644
index 0000000000..79e01364d0
--- /dev/null
+++ b/dist/changes-3.1.2
@@ -0,0 +1,631 @@
+
+Qt 3.1.2 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.1.1
+
+
+****************************************************************************
+*                               General                                    *
+****************************************************************************
+
+Some build fixes on different platforms. Many small documentation
+fixes.
+
+XFree86 only: Tablet support now also looks for devices called "pen",
+not just "stylus" and "eraser".
+
+Animations: Less CPU-consuming roll effects.
+X11 only: Disable effects on displays with <16bpp (rather than
+falling back to the scrolling).
+
+
+****************************************************************************
+*                               Library                                    *
+****************************************************************************
+
+- QAccel
+	Allow localization of status bar messages. Try harder to
+	distinguish between an accelerator and the identical
+	accelerator with Shift in case on of them is currently
+	disabled.
+
+- QAccessible
+	Send accessibility notification for selection changes in
+	menubars and popup menus. Send accessibility
+	notifications for QListBox currentItem/selection changes.
+
+- QActionGroup
+	Implement visibility for drop-down actiongroups.
+
+- QApplication
+	Return focus to the widget that had it before a popup opened
+	even if the focus is passed on during the show event handling.
+	When the programmer/user explicitly sets the style (either
+	with QApplication::setStyle or the -style command line
+	option), do not reset the style on settings changes. Creating
+	a second QApplication reads the settings again.
+	Windows only: Emit aboutToQuit() when the user logs off. Send
+	a focusOut event to the focus widget when the user tries to
+	switch applications using Alt+Tab. Fixed setting of
+	desktop-wide fade and scroll effects.
+	Windows95/98/Me: Fixed enter/leave handling. Among other
+	benefits this makes tooltips work more reliably.
+	X11 only: Various fixes for input methods, e.g. Korean
+	'ami'. Some startup performance improvements with
+	QSettings. Mark the internal wakeUpGuiThread() pipe with
+	FD_CLOEXEC. Call XFilterEvent before the public X11 event
+	filters to avoid applications filtering out events that are
+	necessary for input methods to operate. Removed old en_US
+	locale workaround for Solaris. Close all open popups when 
+	clicking on a screen different from the popup's screen. Do not
+	force 256 colors on 8-bit display (used to be a workaround for
+	a vnc bug).
+	Mac only: Popupmenus that are dismissed by clicking outside of their
+	bounds will no longer send the event to the widget clicked on (to avoid
+	selection changing when canceling a context menu). QContextMenuEvents
+	will be sent in the same style as Windows/X11 to make the platforms
+	more consistent, additionally mapping of Ctrl+Click to RightButton has
+	been added to allow easy context menu handling. Added warnings when a
+	Qt application is run outside of an application bundle (in GUI mode)
+	this will prevent accidental starving from events. Correct state when a
+	modal dialog is shown (to disable the menubar) is used now, and is
+	emulated to feel like Carbon applications. Fixed bug so that
+	QApplication::processEvents() can be called before
+	QApplication::exec(). Window activation will not change when a popup
+	menu is displayed. Toolbar toggle button will only toggle the top dock
+	in a QMainWindow. European text composition is supported now to take
+	advantage of TextInput modules available on Mac OS X. Window activation
+	has been improved to allow interleaving windows of different classes
+	correctly (to decrease differences between X11/Windows and Mac).
+
+- QBuffer
+	IO_Truncate no longer detaches the explicitly shared byte array.
+
+- QButton
+	In setPixmap(), avoid laying out again if the new pixmap does
+	not change the size. Use QSharedDoubleBuffer only if it is
+	enabled (this avoids repainting errors).
+
+- QButtonGroup
+	Improve hit testing for cursor navigation.
+
+- QCanvas
+	Do not try to double buffer invalid areas.
+
+- QCanvasEllipse
+	Windows only: Workaround a Windows limitation that does not
+	support 2x2 ellipse rendering without a pen. Do not try to
+	double buffer invalid areas.
+
+- QColorDialog
+	Allow the setting of all 48 standard colors.
+
+- QComboBox
+	Close any popup menus or listboxes when disabling the combobox.
+	Fix text alignment when large pixmaps were inserted into the
+	combobox.
+
+- QComplexText
+	Added correct positioning specs for all of Thai and Lao. Some
+	reordering fixes.
+
+- QCursor
+	Mac only: Correct interpretation of mask/data of a QCursor so that the
+	mask will can be used as documented.
+
+- QDate
+	Fixed addYears() for days missing in certain years.
+
+- QDateTimeEdit
+	Compute an improved layout for the QDateEdit and QTimeEdit
+	components of the QDateTimeEdit (based on the size hints). Set
+	the size policy of the QDateTimeEdit to (Minimum, Fixed).
+	In time edit: If the display is AM/PM, do not accept 13-24 as
+	valid input for the hours. Go to the min/max value when
+	stepping down/up goes out of the valid range.
+
+- QDesktopWidget
+	Mac only: Fixes to availableGeometry().
+
+- QDialog
+	Fixed a visibility issue with setExtension().
+	X11 only: Modal dialogs that have no parent set their
+	WM_TRANSIENT_FOR hint to the main application widget (not
+	root). Do not raise the active modal widget if another one
+	gets focus. This used to be an incorrect workaround for a
+	now-obsolete problem where CDE would not keep modal dialogs
+	above their parents. 
+	Do not reposition laid out dialogs that restore their geometry
+	in a polish() reimplementation.
+
+- QDict
+	Handle zero sized hash tables.
+
+- QDns
+	Slightly more reliable now, fixed a memory leak.
+
+- QDockArea
+	Fixed resizing of a QDockWindow is no longer affected by
+	another closed QDockWindow in the same QDockArea. If a QDockWindow
+	has changed its sizeHint layout items use now the new size.
+
+- QDockWindow
+	When undocking a window, use the last undocked size if we have
+	one.
+	X11 only: Make sure the moving frame is drawn on the correct screen.
+	Windows only: Fixed some focus issues.
+
+- QDom
+	Create entity references for unknown entities.
+
+- QDragManager
+	X11 only: Raise cursor decoration. Improved Motif drop support
+	to support non-textual data.
+	Windows only: Do not send any drag events if we don't have a receiver.
+	Windows 2000 only: Ignore illegal requests for error-clipboard
+	format when dropping files onto Explorer.
+
+- QEventLoop
+	Window only: Fixed mutex lock problem. Fixed processEvents()
+	with ExcludeUserInput. Fixed QSocketNotifiers not being
+	removed when the notifier gets deleted and the event
+	loop is blocking.
+	Unix only: Fixed a 64 bit problem.
+	Mac only: Fixed hasPendingEvents() for non-gui apps.
+
+- QFileDialog
+	Fix drag'n'drop for the first click into the listbox. Do not
+	auto-complete when saving a file. Enabled drag'n'drop of files
+	for all modes. In Directory* mode, do not set the filter to a
+	non-existent directory if one is specified.
+	Windows only: Fixed icon lookup.
+	Win 98/Me only: Make sure getExistingDirectory() doesn't
+	modify the current directory.
+	Mac only: Encoding fixes.
+
+- QFont
+	Win95 only: Make symbol fonts work.
+	X11 only: Don't change the Xft enabled/disabled setting
+	at runtime. Avoid some X server roundtrips when loading fonts.
+
+- QFontDialog
+	Fixed getFont() in case no default font is specified.
+
+- QFrame
+	Turn on focus and mouse-over style flags for frame painting.
+
+- QFtp
+	If the server does not expect a password (i.e. if you are
+	already logged in after you sent the username), do not send
+	the password since this might lead to errors.
+
+- QGLWidget
+	X11 only: Xft fonts won't work with glXUseXFont() - so do not
+	try to use them.
+	Win32 only: Fixed text rendering to pixmap issues.
+	Mac only: Improved responsiveness when resizing opengl widgets.
+	Mac only: Optimized swapping between accelerated and
+	non-accelerated case.
+	Mac 10.2 only: Improved performance in the case of overlapping
+	opengl widgets.
+
+- QHBoxLayout
+	Handle direction changes in user code.
+
+- QHeader
+	Improved sizeHint() takes the arrows of sorted columns
+	into account. Fix redrawing problems when moving header
+	sections. Ignore grip-margin in mouse handling for
+	non-resizable sections.
+
+- QHttp
+	Fixed a memory leak. (With thanks to valgrind's developer for
+	this useful tool). Improved head() implementation to actually
+	use HEAD requests. Accepts responses from web servers that
+	return \n instead of \r\n as line separators. Fixed a rare
+	infinite loop issue.
+
+- QIconView:
+	Clip item drawing to current container to fix drawing of
+	pixmaps with alpha channels.
+
+- QImageIO
+	jpegio: Fixed potential buffer overrun.
+	gif: Fixed a crash for invalid gif files.
+
+- QInputContext
+	X11 only: Try harder to provide the input method with an
+	appropriate - and available - fontset.
+
+- QInputDialog
+	Fixed size hint when using height-for-width rich text.
+
+- QKeySequence
+	Fixed operator==() for some special cases.
+
+- QLabel
+	When the the label is disabled, use identical color roles for both
+	rich text and plain text.
+
+- QLibrary
+	Mac only: Return failure response when a library cannot be opened
+	due to missing symbols.
+
+- QLineEdit
+	Do not truncate the text when we validateAndSet a text which
+	is longer than maxLength, but disallow the input. Respect
+	maxLength() in setText(). Make displayText() and selectedText()
+	not strip non-breaking spaces anymore. Fixed memory leak when
+	adding and deleting line edits. Undo now clears the current
+	selection. Undo/redo now works when overwriting the selection.
+	Fixed memory leak on constructing/destructing line edits. Give
+	line edit ownership of the popup menu returned by the default
+	createPopupMenu() implementation.
+
+- QListView 
+	Fixed background brush origin when using double buffering. Do
+	not resize a stretchable column in widthChanged(). Fixed
+	selecting when auto-scrolling. Initialize multi-selection
+	anchor. Accept drops outside items when acceptDrops() is true.
+	Use anchor correctly in Extended selection mode (also for
+	mouseMove). Make right clicking on a selected item not change
+	the selection. The AlignHCenter flag of a QCheckListItem now
+	behaves like for normal QListViewItems. Speed up opening and
+	closing of invisible items. Fixed a memory leak in removeColumn()
+	Single selection mode: If the selected item is taken out of the 
+	listview, unselect it and emit selectionChanged(). Fixed
+	deselecting in multi-selection modes. Right release outside an
+	item in a listview no longer clears the selection if
+	ControlButton is set.
+
+- QListViewItem
+	Invalidate column sorting in moveToJustAfter().
+
+- QLocalFs
+	The network protocol for local file systems sets sets the
+	right permissions for the QUrlInfo objects if you do a
+	QUrlOperator::listChildren().
+
+- QMainWindow
+	Fixed orientation handler calls.
+
+- QMap
+	Fixed conversion from std::map.
+
+- QMenuBar
+	Mac only: Fix for destruction of menu bars.
+	Mac only: Use process name instead of argv.
+
+- QObject
+	Always emit the destroyed() signal, even when signals are
+	blocked.
+
+- QPaintDevice
+	Mac only: Fixed raster op. for bitBlt.
+
+- QPainter
+	X11 only: Fix for rotated rectangles. Fixed drawPolygon() with
+	winding being false.
+	Mac only: drawText() fixes.
+	Mac only: Fix for drawPie().
+
+- QPicture
+	Warn about and catch save operations on still active devices.
+
+- QPixmap
+	Made grabWidget() more robust. 
+	X11 only: Fixed a bug in grabWindow(), fixes in 
+	convertFromImage() for MonoOnly.
+
+- QPointArray
+	The makeArc() function is now inclusive in respect of the start and
+	end points.
+
+- QPopupMenu
+	If there is a custom QWhatsThis installed for the whole menu
+	but no whatsThis set for the item, use the custom QWhatsThis
+	to get the help text. Improved size for multi-column popups.
+	Mac only: Improved scrollable popups
+	Mac only: Fix handling of popupmenu dismissing mouse presses.
+
+- QPrintDialog
+	Fix reentrancy issues when reading printer dialog settings.
+	Windows only: Handle lack of default printers more
+	gracefully.
+
+- QPrinter
+	Windows only: Fix reentrancy issues and make sure that all
+	handles are updated correctly. Improved bottom and right
+	margin calculation. Fixed some problems with image printing.
+	Mac only: Support for high resolution printing. Support 1-bit
+	masking for pixmaps.
+
+- QProcess
+	If the process's file descriptor is closed for stdout or
+	stderr, but the line in the buffer does not end with a \n or
+	\r\n, it is still possible to read this data using readLine().
+	Windows only: Make it safe to call qApp->processEvents() in a
+	slot connected to QProcess::readyReadStdout(). Fixed start()
+	with no arguments. Use a non-blocking file descriptor for
+	writes to stdin. Avoid leaking of handles.
+
+- QPSPrinter
+	Fixed codec for Korean PostScript fonts (ksc5601.1987-0, not
+	the listbox. Do not auto-complete when saving a
+	fileeucKR). Fixed memory leak.
+
+- QRichText
+	Improved Asian line breaking: Avoid breaking before
+	punctuation and closing braces and after opening braces. Fixed
+	a freed memory access problem with floating items on
+	destruction. When copying rich application/x-qrichtext, include
+	format information for the initial characters until the first
+	complete span. Make text="color" attributes in qt and body
+	tags work again.
+
+- QScrollView
+	Restored the Qt 3 default sizeHint() that depends on the
+	scroll view's content, restricted within a 'sane' range (this
+	has no impact on most child classes, which already reimplement
+	sizeHint()).
+
+- QSemaphore
+	Fixed race condition in operator-=().
+	Unix only: A bit more robust.
+
+- QSettings
+	Implement scoping for file-based settings (Unix and
+	Ini-modes). Support storing and reading null strings. Other
+	fixes.
+	X11 only: Fixed rehash issues when using multiple screens.
+	Windows and Mac: Completed Ini mode.
+
+- QSocket
+	If the read retruns 0, safely assume that the peer closed the
+	connection. Fixed readyRead sometimes not being
+	emitted. Fixed a select bug when the other end terminates
+	the connection. Some 64 bit fixes.
+
+- QSound
+	Mac only: Implemented stop().
+
+- QSplitter
+	Make sizes() return 0 for collapsed widgets.
+
+- QSqlDriver
+	All drivers: Fixed crashes when accessing out of bound
+	fields. Clear the openError() flag when opening a connection
+	successfully.
+	MySQL only: Make use of mysql_use_result() in forward-only mode.
+	TDS only: Return NULL QVariants for NULL fields.
+	ODBC only: Do not require the SERVER keyword to be in a
+	connection string. Fix Unicode issues with MS Access. Allow 
+	MS Access people to create a connection string without 
+	creating a DSN entry first.
+
+- QSqlQuery
+	Real values in queries containing placeholders were in some
+	cases incorrectly replaced in emulated prepared queries.
+	Added support for forward only queries in MySQL.
+
+- QStatusBar
+	Make sure QStatusBar updates the minimum height when a child
+	widget triggers a relayout (e.g. from size/font/etc. changes).
+
+- QString
+	Safer QString->std::string conversion (handles null-string
+	case). Fixed 64-bit issue in toLong() and toULong(). Make
+	prepend(), append() and operator+=() work with a QByteArray
+	argument that is not 0-terminated. Since this
+	fix is done in inline functions, you must recompile your
+	application to benefit from it. Make QString(const
+	QByteArray&) respect the array's size where a codec for
+	C strings is defined. Performance improvements for lower() 
+	and upper(). Fix toDouble() when string contains trailing
+	whitespace.
+
+- QSvgDevice
+	No background for Bezier curves. Fixed omission of font-family
+	attribute in SVG generator. Fixed bounding rect mapping.
+
+- QStyle (and subclasses)
+	Usable size for subcontrols for small scrollbars. Fixed MDI
+	document window titlebar clipping.
+	XP style: Support non-default group boxes. Corrected tab
+	widget border drawing. More compliant dock window
+	appearance. Fixed translations for QCheckTableItem and
+	QComboTableItem.
+	Windows style: Use the highlighted text color role for arrows
+	in menus. Allow drawing of list view expand controls without
+	branches.
+	SGI style: Use correct background brush on pushbuttons with
+	popdown arrows.
+	Mac style (Mac only): Comboboxes will now be smaller (and closer to
+	Aqua Style suggested sizes). Expansion widgets (in a listview) will
+	now draw in the correct background color to allow non-white listviews.
+
+- QSpinBox
+	Stop spinning when users press a button other than the
+	left one. Support Key_Enter in addition to Key_Return as the
+	documentation always stated.
+
+- QTabBar
+	Let arrow buttons react correctly on style changes.
+
+- QTabDialog
+	Fix reverse layout for right to left languages.
+
+- QTable
+	Catch hideColumn() on tables with too few columns. Fixed an
+	endless recursion when swapping header sections. Fixed SingleRow
+	selection when using the vertical header. Emit the
+	sizeChange() signal when resizing a table header section with
+	a double click. Fixed set*MovingEnabled() when the selection
+	mode is NoSelection. Fix selection drawing for focusStyle ==
+	FollowFocus. Fixed a memory leak.
+
+- QTableItem
+	Use virtual text() method for calculations instead of accessing the
+	data member directly. Do not crash when destroying a table item that
+	is not in a table.
+
+- QTextCodec:
+	Fixed a bug in the Unicode -> jisx0208 conversion table.
+
+- QTextEdit
+	Made setFormat() much faster when undo/redo is
+	disabled. Fixed double deletion crash when clearing a document
+	with floating custom items. AccelOverride events with Shift
+	pressed now work the same as for a normal key press.
+	LogText mode: Allow spaces in the font color tag. Fixed
+	background redraw issue. Stop scrollbar from disappearing
+	due to laying out the document incorrectly.
+
+- QThread
+	Unix only: Do not rely on PTHREAD_MUTEX_INITIALIZER and
+	PTHREAD_COND_INITIALIZER. Fixed timeout calculation in
+	sleep().
+
+- QTimeEdit
+	Typing in input for the first time now overwrites the existing
+	value.
+
+- QToolButton
+	Fixed width calculation for multiline text.
+
+- QTooltip
+	Try hard to avoid tooltips for widgets in inactive
+	windows. Use screen geometry rather than available geometry
+	for positioning. Avoid the mouse cursor covering part of the
+	tooltip.
+
+- QTranslator
+	Notify main windows when installing an empty translator.
+
+- QUrlOperator
+	Make setNameFilter() work with FTP.
+
+- QValueVector
+	Fix operator==() to work as expected if the two vectors do not have
+	the same size.
+
+- QVariant
+	Fixed canCast() for Bool -> String and ByteArray -> String conversion. 
+	Fixed operator==() for maps. Fixed the asDouble() function to
+	detach first before a conversion is done. After streaming into
+	a QVariant isNull() now returns false.
+
+- QWaitCondition
+	Unix only: Make sure the mutex is destroyed after it is
+	unlocked.
+
+- QWhatsThis
+	Use screen geometry rather than available geometry
+	for positioning.
+
+- QWidget
+	In adjustSize(), process LayoutHint events for all widgets,
+	not only this widget. Fixed a visibility issue with
+	reparent(). Fixed recursive update of child widgets with
+	background origin not being WidgetOrigin. Fixed isEnabledTo().
+	Windows only: Fixed mapFromGlobal() / mapToGlobal() for
+	widgets that are not visible.
+	X11 only: Set the WM_CLIENT_LEADER and SM_CLIENT_ID properties
+	according to the ICCCM (section 5.1). We accomplish this by
+	creating a hidden toplevel window to act as the client leader,
+	and all toplevel widgets will use this window as the client
+	leader. Fixed calling show() on minimized windows. Fixes to
+	grabWindow() for platforms that support different color depths
+	on one display.
+	Windows only: Handle frameGeometry() changes when users change
+	the titlebar font.
+	Mac only: Reparent fixes so that visiblity of a toplevel window
+	will be retained as well as to avoid painting errors when reparented
+	onto a different window. Fixed painting errors when a widget is
+	interactively moved off screen. showNormal() will now toggle
+	correctly when a window is minimized, additionally toggling between
+	showMaximized()/showNormal() will operate as expected. Qt will now
+	try to prevent placing a window partially offscreen. This will not
+	over-ride explicit window positioning, but it will correct default
+	placement.
+
+- QWidgetStack
+	Make removeWidget() safe when there are several widgets
+	with the same id.
+
+- QWorkspace
+	If the active window is clicked on, transfer focus to
+	the child. Restore focus to old subcontrol when changing the
+	active MDI window. Make sure a MDI window is not resized below
+	a child widget's minimum size. Do not allow resizing windows
+	when we have an active popup window. Another fix to the
+	windowActivated() signal. Fixed resize handling for fixed-size
+	windows.
+
+- QXmlSimpleReader
+	Fixed a memory leak for incremental parsing.
+
+
+****************************************************************************
+*                                Tools                                     *
+****************************************************************************
+
+- Qt Designer
+	Some small usability improvements and crash fixes. Fixed
+	editing properties of multiple selected widgets for custom
+	widgets. Fixed some problems with pixmaps, when using a pixmap
+	function. Allow entering ':' in the class name in the
+	form settings dialog (for namespaces). Do not show deleted
+	toolbars in the object explorer. Fixed inserting widgets into
+	toolbars. Fixed displaying nested widget stacks in the object
+	explorer. Added an option to enable auto saving. Fixed some
+	issues with auto-indent in the C++ editor plugin. Fixed
+	problems with slots which have namespaces in their function
+	arguments. Do not save invalid pixmaps. whatsThis properties
+	can now be edited with the richtext editor.
+
+- Qt Assistant
+	Fixed crash when printing to file was cancelled. Fixed
+	mimesource settings when a link is opened in a new window.
+	Added missing translator. Fixed reloading pages when the
+	font was changed. Added accelerator for exiting Assistant.
+	Full text search now supports Unicode. Search accepts special
+	characters like '_'. Added option for disabling the first run
+	initialization. Now it is possible to open a link or new
+	window directly from the sidebar.
+
+- moc
+	Make 'moc -p foo bar/baz.h' generates #include "foo/baz.h"
+	instead of #include "foo/bar/baz.h". Also avoid redundant "./"
+	at the beginning. Accept identifiers trailing the function
+	signature to allows sneaking in compiler specific attributes
+	via a macro.
+
+- qmake
+	Qmake will no longer put the version number on plugins. These are
+	not a necessary part of the filename. A parser bug got into qmake
+	causing (right hand side) functions from being evaluated properly,
+	additionally the argument parser has been improved to allow functions
+	calling functions. Qmake now has support for ProjectBuilder 2.1, it
+	will no longer respect OBJECTS_DIR in ProjectBuilder (as this exposed
+	a bug in ProjectBuilder itself). It will automatically detect qt-mt
+	(when linking against Qt) so "CONFIG += thread" is not necessary,
+	however this will not turn on Q_THREAD_SUPPORT. A new test operator
+	has been added 'equals()' to allow testing for equality to a variable.
+	In 'project mode' qmake will now detect TRANSLATIONS files
+	automatically.
+
+- uic
+	Some small fixes in code generation.
+
+****************************************************************************
+*                              Extensions                                  *
+****************************************************************************
+
+- Netscape Plugin
+	The Netscape Plugin is supported again, now on both Netscape 4.x and
+	current versions based on the Mozilla code.
+
+- ActiveQt
+	Activate socket notifiers and process config requests even if
+	Qt does not own the event loop.
+
diff --git a/dist/changes-3.2.0 b/dist/changes-3.2.0
new file mode 100644
index 0000000000..6d99213f10
--- /dev/null
+++ b/dist/changes-3.2.0
@@ -0,0 +1,327 @@
+
+Qt 3.2 introduces new features as well as many improvements over the
+3.1.x series. This file gives an overview of the main changes since
+version 3.1.2.  For more details, see the online documentation which
+is included in this distribution. The documentation is also available
+at http://doc.trolltech.com/
+
+The Qt version 3.2 series is binary compatible with the 3.1.x series.
+Applications compiled for 3.1 will continue to run with 3.2.
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+Qt library
+----------
+
+New classes have been added to the Qt Library including a
+class to add splash screens to applications (QSplashScreen), a toolbox
+widget that provides a column of tabbed widgets (QToolBox), and a
+class to manage per-thread data storage (QThreadStorage).
+
+The SQL module received a fair bit of attention this time. The most
+notable improvements include a native IBM DB2 driver, complete support
+for stored procedures including the possibility to access
+out-parameters, and native support for 64 bit fields without having to
+convert to or from strings. We also added support for setting
+connection parameters. This way you can, for example, conveniently
+open an SSL connection to a MySQL or PostgreSQL database. If you need
+even more customization, e.g. for an Oracle database, you can set up
+the connection yourself and instantiate a Qt driver object on top of
+it. An extended SQL cursor class has been added that makes it more
+convenient to display result sets from general SQL queries
+(QSqlSelectCursor). QSqlDatabase::tables() is now capable to return
+tables, views and/or system tables. In addition, you can add custom
+database drivers without compiling them as plugins
+(see QSqlDatabase::registerSqlDriver()).
+
+QLineEdit, the one-line text editor, now supports validation input
+masks. The feature complements the previous QValidator concept and
+allows e.g. restriction of input to the IP address format (mask
+"990.990.990.990;_"), or to ISO date format (mask "0000-90-90;0").
+
+Qt's unicode code support has been extended. Most notably, full
+support for Indic scripts has been added, covering writing systems
+such as Devanagari, Tamil and Bengali. The group of right to left
+writing systems has been extended with support for Syriac. Both
+improvements are available on both Windows with Uniscribe installed,
+and on Unix/X11 when using XFT with OpenType fonts.
+
+All tool classes that support STL-like iterators with begin() and
+end(), contain two extra functions constBegin() and constEnd(). The
+const versions always return const iterators, and thus can be a little
+bit faster with Qt's implicitly shared containers.
+
+QPainter's complex drawText() function has been highly
+optimized. Despite its support for complex unicode scripts, it now
+performs better than its less unicode-capable counterpart in Qt 2.3.
+
+QPixmap now supports pixmaps with alpha channel (semi transparency) on
+all Windows versions except Windows 95 and Windows NT 4.0.
+
+The print dialog now supports "selection" as a print range as well as
+the possibility to enable/disable all different printer options
+individually.
+
+On Windows, the Qt installation includes a toolbar for Visual Studio.NET 
+that provides an integration of the Qt tools (ie. Qt Designer) with the 
+IDE.
+
+Many classes were improved; see the detailed overview that follows.
+
+Qt Motif Extension
+------------------
+
+Dialog handling has matured and has been extended since the
+extension's introduction in Qt 3.1.  The documentation and code
+examples have been improved, including a walkthrough that covers the
+complete migration of a real-world Motif example to Qt. The process
+contains four intermediate steps where the application utilizes both
+toolkits.
+
+ActiveQt Extension
+------------------
+
+Type handling has been extended on both the container and the server
+side. The new supported types are byte arrays and 64bit integers. The
+QAxServer module supports aggregation, as well as QObject subclasses as 
+return and parameter types of slots, and allows error reporting through 
+COM exceptions.
+The Designer integration has been extended to support property dialogs
+implemented by the control server.
+Controls developed with ActiveQt support aggregation, which makes it
+possible to use them in containers that require this form of containment to
+be supported. ActiveQt also supports masked controls in containers that
+support this for window'ed controls.
+
+Qt Designer
+-----------
+
+The popup menu editor has been rewritten. The new editor provides the
+the ability to add, edit and remove menus and menu items directly in
+the menubar and in the popup menu. Navigation and editing can be done
+using either the mouse or the keyboard.
+
+The property editor now allows editing of properties with or'd values
+(sets).
+
+Designer also supports the new QToolBox widget in a similar fashion to
+QTabWidget, etc.
+
+Qt Assistant
+------------
+
+Profiles have been introduced to allow applications to extend the use
+of Qt Assistant as a help system. Profiles describe the documentation
+to use so that only application specific documentation will be
+referenced in an end user installation. Profiles also allow some
+customization of the look in Qt Assistant. For detailed information,
+see the helpdemo example in $QTDIR/examples/helpdemo.
+
+Profiles replace the content files and categories system. The
+following command line options are removed since they no longer serve
+any purpose: addContentFile, removeContentFile, category, and
+disableFirstRun.
+
+Qt Assistant has multiple tabs for browsing, therefore enabling
+multiple pages to be browsed without opening a new window.
+
+It is possible to specify a default home page.
+
+It is possible to specify a PDF reader so that urls to PDF files can
+be opened from Qt Assistant.
+
+Compilers
+---------
+
+Note: Qt 3.2 is the last version to officially support IRIX MIPSpro
+o32 and Sun CC 5.0. A script, $QTDIR/bin/qt32castcompat, is provided
+for 3.2 which needs to be run for these compilers.
+
+Miscellaneous
+-------------
+
+Users of the 3.2.0 beta releases please note: The QWidgetContainerPlugin
+interfaces was removed from the final release due to some serious issues.
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QAction / QActionGroup
+	Simplified constructors so that it is no longer necessary to
+	specify texts for buttons and menu items separately.
+	For action groups, we fixed the enable/disable behavior. If
+	an action inside an action group is explicitly disabled, it is
+	no longer implicitly enabled together with the group.
+	This is identical to enabling/disabling widgets and their
+	children.
+
+- QApplication
+	Added the aboutQt() slot for convenience.
+
+- QAssistantClient
+	Added the new function, setArguments(), that invokes Qt
+	Assistant in different modes.
+
+- QAxBase
+	Added the new function, asVariant(), that passes a COM
+	object through dynamicCall().
+
+- QAxBindable
+	Added the new function, reportError(), that sends error
+	information to the ActiveX client.
+
+- QColor
+	Added the new static function, colorNames(), that retrieves a
+	list of all color names known to Qt.
+
+- QDeepCopy
+	Now also supports QDir, QFileInfo, and QStringList.
+
+- QDom
+	Now has long and ulong support for setAttribute() and
+	setAttributeNS().
+
+- QFont
+	Added the new properties: stretch and overline. Added the new
+	function, resolve(), that copies unspecified attributes from
+	one font to another.
+
+- QFontDataBase
+	Added a new overload for families() that restricts the
+	returned list to fonts supporting a specific QFont::Script,
+	e.g. QFont::Greek, QFont::Devanagari or QFont::Arabic.
+
+- QFontInfo / QFontMetrics
+	Added new constructors that force the info and metrics objects
+	to use a given QFont::Script.
+
+- QGLWidget
+	Added a new constructor that takes a QGLContext
+	parameter. Makes the undocumented setContext() obsolete.
+
+- QHeader
+	Added getters for the sort indicator (sortIndicatorSection()
+	and sortIndicatorOrder() ).
+
+- QImage
+	Added a new overload for save() that writes to a given
+	QIODevice*.
+
+- QListView
+	Added tristate support to check list items
+	(QCheckListItem::setTristate()). Added the new function,
+	setSelectionAnchor(), to set the list view's selection anchor
+	explicitly.
+
+- QLineEdit
+	Added input masks: setInputMask(), inputMask(), and
+	hasAcceptableInput(). Added new function selectionStart()
+	which returns the index of the first selected character in the
+	line edit.
+
+- QMacStyle
+	Added customizable focus rectangle policy.
+
+- QMessageBox
+	Added the new static function, question(), that complements
+	the existing information(), warning() and fatal() functions.
+
+- QMotifDialog [Qt Motif Extension]
+	Now has two distinct modes of operation: 1) it allows a Motif
+	dialog to have a Qt parent, and 2) it allows a Qt dialog to have
+	a Motif parent.
+
+- QMYSQLDriver
+	Better support for MySQL/embedded.
+
+- QPixmapCache
+	Added the new function, remove(), to explicitly remove a
+	pixmap from the cache.
+
+- QPrinter
+	Added the new functions: setPrintRange(), printRange(),
+	setOptionEnabled(), and optionEnabled(). For Windows only,
+	added the new function, setWinPageSize(), that allows setting
+	DEVMODE.dmPaperSize directly.
+
+- QPtrList
+	Added STL-like iterators with begin(), end(), and erase().
+
+- QScrollBar
+	Maintains a user defined size policy when the direction
+	changes.
+
+- QSplashScreen [new]
+	This new widget class provides a splash screen to be shown
+	during application startup.
+
+- QSplitter
+	Added the new properties: opaqueResize, childrenCollapsible,
+	and handleWidth.
+
+- QSqlError
+	Added a couple of convenience functions: text(), which returns
+	the concatenated database and driver texts. showMessage(),
+	which will pop up a QMessageBox with the text that text()
+	returns.
+
+- QSqlQuery
+	Added overloads for the bindValue() call which makes it
+	possible to specifiy what role a bound value should have: In,
+	Out or InOut.
+
+- QSqlSelectCursor [new]
+	This new QSqlCursor subclass provides browsing of general SQL
+	SELECT statements.
+
+- QSqlDatabase
+	Added overloaded tables() call which can return tables, views
+	and/or system tables.
+
+- QPSQLDriver
+	Calling tables() with no arguments will only return table names,
+	instead of table and view names as in Qt 3.1.
+	The new tables() call in QSqlDatabase can be used to get
+	table and/or view names.
+
+- QString
+	Added 64 bit support. Added the new functions: multiArg(),
+	reserve(), capacity(), squeeze(). Added case insensitive
+	overloads for startsWith() and endsWidth().
+
+- QStringList
+	Added the new function gres().
+
+- QStyle
+	Added support for toolbox, header, MDI frame, table grid line
+	color, line edit password character, and message box question.
+
+- QSyntaxHighlighter
+	Added the new function, currentParagraph().
+
+- QTabWidget
+	Added support for custom widgets to be placed beside
+	the tab bar: setCornerWidget() and cornerWidget().
+
+- QTextEdit
+	In Log mode, added the new functions: setMaxLogLines() and
+	maxLogLines(). Implemented insertAt() for LogText mode.
+
+- QThreadStorage [new]
+	This new tool class provides per-thread data storage, also
+	referred to as thread local storage or TLS.
+
+- QToolBox [new]
+	This new widget class provides a column of tabbed widgets, one
+	above the other, with the current page displayed below the
+	current tab.
+
+- QVariant
+	Added support for LongLong and ULongLong.
+
+- QWidget
+	Added a new widget flag, WNoAutoErase, that combines the now
+	obsolete WResizeNoErase and WRepaintNoErase flags.
diff --git a/dist/changes-3.2.0-b1 b/dist/changes-3.2.0-b1
new file mode 100644
index 0000000000..cdd351448c
--- /dev/null
+++ b/dist/changes-3.2.0-b1
@@ -0,0 +1,296 @@
+
+Qt 3.2 introduces new features as well as many improvements over the
+3.1.x series. This file gives an overview of the main changes since
+version 3.1.2.  For more details, see the online documentation which
+is included in this distribution. The documentation is also available
+at http://doc.trolltech.com/
+
+The Qt version 3.2 series is binary compatible with the 3.1.x series.
+Applications compiled for 3.1 will continue to run with 3.2.
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+
+Qt library
+----------
+
+New classes have been added to the Qt Library including a
+class to add splash screens to applications (QSplashScreen), a toolbox
+widget that provides a column of tabbed widgets (QToolBox), and a
+class to manage per-thread data storage (QThreadStorage).
+
+The SQL module received a fair bit of attention this time. The most
+notable improvements include a native IBM DB2 driver, complete support
+for stored procedures including the possibility to access
+out-parameters, and native support for 64 bit fields without having to
+convert to or from strings. We also added support for setting
+connection parameters. This way you can, for example, conveniently
+open an SSL connection to a MySQL or PostgreSQL database. If you need
+even more customization, e.g. for an Oracle database, you can set up
+the connection yourself and instantiate a Qt driver object on top of
+it. An extended SQL cursor class has been added that makes it more
+convenient to display result sets from general SQL queries
+(QSqlSelectCursor). In addition, you can add custom database drivers
+without compiling them as plugins (see
+QSqlDatabase::registerSqlDriver()).
+
+QLineEdit, the one-line text editor, now supports validation input
+masks. The feature complements the previous QValidator concept and
+allows e.g. restriction of input to the IP address format (mask
+"990.990.990.990;_"), or to ISO date format (mask "0000-90-90;0").
+
+Qt's unicode code support has been extended. Most notably, full
+support for Indic scripts has been added, covering writing systems
+such as Devanagari, Tamil and Bengali. The group of right to left
+writing systems has been extended with support for Syriac. Both
+improvements are available on both Windows with Uniscribe installed,
+and on Unix/X11 when using XFT with OpenType fonts.
+
+All tool classes that support STL-like iterators with begin() and
+end(), contain two extra functions constBegin() and constEnd(). The
+const versions always return const iterators, and thus can be a little
+bit faster with Qt's implicitly shared containers.
+
+QPainter's complex drawText() function has been highly
+optimized. Despite its support for complex unicode scripts, it now
+performs better than its less unicode-capable counterpart in Qt 2.3.
+
+QPixmap now supports pixmaps with alpha channel (semi transparency) on
+all Windows versions except Windows 95 and Windows NT.
+
+The print dialog now supports "selection" as a print range as well as
+the possibility to enable/disable all different printer options
+individually.
+
+Many classes were improved; see the detailed overview that follows.
+
+Qt Motif Extension
+------------------
+
+Dialog handling has matured and has been extended since the
+extension's introduction in Qt 3.1.  The documentation and code
+examples have been improved, including a walkthrough that covers the
+complete migration of a real-world Motif example to Qt. The process
+contains four intermediate steps where the application utilizes both
+toolkits.
+
+ActiveQt Extension
+------------------
+
+Type handling has been extended on both the container and the server
+side. The new supported types are byte arrays and 64bit integers. The
+QAxServer module supports QObject subclasses as return and parameter
+types of slots, and allows error reporting through COM exceptions.
+The Designer integration has been extended to support property dialogs
+implemented by the control server.
+
+Qt Designer
+-----------
+
+The popup menu editor has been rewritten. The new editor provides the
+the ability to add, edit and remove menus and menu items directly in
+the menubar and in the popup menu. Navigation and editing can be done
+using either the mouse or the keyboard.
+
+The new QWidgetContainerPlugin class provides support for complex
+custom container widgets in Designer, such as the custom tab widget,
+etc.
+
+The property editor now allows editing of properties with or'd values
+(sets).
+
+Designer also supports the new QToolBox widget in a similar fashion to
+QTabWidget, etc.
+
+Qt Assistant
+------------
+
+Profiles have been introduced to allow applications to extend the use
+of Qt Assistant as a help system. Profiles describe the documentation
+to use so that only application specific documentation will be
+referenced in an end user installation. Profiles also allow some
+customization of the look in Qt Assistant. For detailed information,
+see the helpdemo example in $QTDIR/examples/helpdemo.
+
+Profiles replace the content files and categories system. The
+following command line options are removed since they no longer serve
+any purpose: addContentFile, removeContentFile, category, and
+disableFirstRun.
+
+Qt Assistant has multiple tabs for browsing, therefore enabling
+multiple pages to be browsed without opening a new window.
+
+It is possible to specify a default home page.
+
+It is possible to specify a PDF reader so that urls to PDF files can
+be opened from Qt Assistant.
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QAction / QActionGroup
+	Simplified constructors so that it is no longer necessary to
+	specify texts for buttons and menu items separately.
+	For action groups, we fixed the enable/disable behavior. If
+	an action inside an action group is explicitly disabled, it is
+	no longer implicitly enabled together with the group.
+	This is identical to enabling/disabling widgets and their
+	children.
+
+- QApplication
+	Added the aboutQt() slot for convenience.
+
+- QAssistantClient
+	Added the new function, setArguments(), that invokes Qt
+	Assistant in different modes.
+
+- QAxBase
+	Added the new function, asVariant(), that passes a COM
+	object through dynamicCall().
+
+- QAxBindable
+	Added the new function, reportError(), that sends error
+	information to the ActiveX client.
+
+- QColor
+	Added the new static function, colorNames(), that retrieves a
+	list of all color names known to Qt.
+
+- QDeepCopy
+	Now also supports QDir, QFileInfo, and QStringList.
+
+- QDom
+	Now has long and ulong support for setAttribute() and
+	setAttributeNS().
+
+- QFont
+	Added the new properties: stretch and overline. Added the new
+	function, resolve(), that copies unspecified attributes from
+	one font to another.
+
+- QFontDataBase
+	Added a new overload for families() that restricts the
+	returned list to fonts supporting a specific QFont::Script,
+	e.g. QFont::Greek, QFont::Devanagari or QFont::Arabic.
+
+- QFontInfo / QFontMetrics
+	Added new constructors that force the info and metrics objects
+	to use a given QFont::Script.
+
+- QGLWidget
+	Added a new constructor that takes a QGLContext
+	parameter. Makes the undocumented setContext() obsolete.
+
+- QHeader
+	Added getters for the sort indicator (sortIndicatorSection()
+	and sortIndicatorOrder() ).
+
+- QImage
+	Added a new overload for save() that writes to a given
+	QIODevice*.
+
+- QListView
+	Added tristate support to check list items
+	(QCheckListItem::setTristate()). Added the new function,
+	setSelectionAnchor(), to set the list view's selection anchor
+	explicitly.
+
+- QLineEdit
+	Added input masks: setInputMask(), inputMask(), and
+	hasAcceptableInput().
+
+- QMessageBox
+	Added the new static function, question(), that complements
+	the existing information(), warning() and fatal() functions.
+
+- QMotifDialog [Qt Motif Extension]
+	Now has two distinct modes of operation: 1) it allows a Motif
+	dialog to have a Qt parent, and 2) it allows a Qt dialog to have
+	a Motif parent.
+
+- QPixmapCache
+	Added the new function, remove(), to explicitly remove a
+	pixmap from the cache.
+
+- QPrinter
+	Added the new functions: setPrintRange(), printRange(),
+	setOptionEnabled(), and optionEnabled(). For Windows only,
+	added the new function, setWinPageSize(), that allows setting
+	DEVMODE.dmPaperSize directly.
+
+- QPtrList
+	Added STL-like iterators with begin(), end(), and erase().
+
+- QScrollBar
+	Maintains a user defined size policy when the direction
+	changes.
+
+- QSplashScreen [new]
+	This new widget class provides a splash screen to be shown
+	during application startup.
+
+- QSplitter
+	Added the new properties: opaqueResize, childrenCollapsible,
+	and handleWidth.
+
+- QSqlError
+	Added a couple of convenience functions: text(), which returns
+	the concatenated database and driver texts. showMessage(),
+	which will pop up a QMessageBox with the text that text()
+	returns.
+
+- QSqlQuery
+	Added overloads for the bindValue() call which makes it
+	possible to specifiy what role a bound value should have: In,
+	Out or InOut.
+
+- QSqlSelectCursor [new]
+	This new QSqlCursor subclass provides browsing of general SQL
+	SELECT statements.
+
+- QString
+	Added 64 bit support. Added the new functions: multiArg(),
+	reserve(), capacity(), squeeze(). Added case insensitive
+	overloads for startsWith() and endsWidth().
+
+- QStringList
+	Added the new function gres().
+
+- QStyle
+	Added support for toolbox, header, MDI frame, table grid line
+	color, line edit password character, and message box question.
+
+- QSyntaxHighlighter
+	Added the new function, currentParagraph().
+
+- QTabWidget
+	Added support for custom widgets to be placed beside
+	the tab bar: setCornerWidget() and cornerWidget().
+
+- QTextEdit
+	In Log mode, added the new functions: setMaxLogLines() and
+	maxLogLines().
+
+- QThreadStorage [new]
+	This new tool class provides per-thread data storage, also
+	referred to as thread local storage or TLS.
+
+- QToolBox [new]
+	This new widget class provides a column of tabbed widgets, one
+	above the other, with the current page displayed below the
+	current tab.
+
+- QVariant
+	Added support for LongLong and ULongLong.
+
+- QWidget
+	Added a new widget flag, WNoAutoErase, that combines the now
+	obsolete WResizeNoErase and WRepaintNoErase flags.
+
+- QWidgetContainerPlugin [new]
+	This new plugin class complements QWidgetPlugin for custom
+	container widgets, i.e. widgets that can host child
+	widgets.
diff --git a/dist/changes-3.2.0-b2 b/dist/changes-3.2.0-b2
new file mode 100644
index 0000000000..98910a87b0
--- /dev/null
+++ b/dist/changes-3.2.0-b2
@@ -0,0 +1,121 @@
+
+Qt 3.2 introduces new features as well as many improvements over the
+3.1.x series. This file gives an overview of the main changes since
+version 3.1.2. For more details, see the online documentation which
+is included in this distribution. The documentation is also available
+at http://doc.trolltech.com/
+
+The Qt version 3.2 series is binary compatible with the 3.1.x series.
+Applications compiled for 3.1 will continue to run with 3.2.
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+ActiveQt
+--------
+
+Controls developed with ActiveQt support aggregation, which makes it
+possible to use them in containers that require this form of containment to
+be supported. ActiveQt also supports masked controls in containers that
+support this for window'ed controls.
+
+Compilers
+---------
+
+Note: Qt 3.2 is the last version to officially support IRIX MIPSpro
+o32 and Sun CC 5.0. A script, $QTDIR/bin/qt32castcompat, is provided
+for 3.2 which needs to be run for these compilers.
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QApplication
+	Win32 only: Stop compressing mouse move events when a change
+	in the key state is detected. Allow multiple QApplication
+	objects be created sequentially by resetting the pointers to
+	static objects on destruction.
+
+- QClipboard
+	X11 only: Various fixes.
+
+- QDockWindow
+	Various layout fixes.
+
+- QFont related classes
+	Many fixes and improvements.
+
+- QGLWidget
+	X11 only: Various fixes to make pixmap rendering work better
+	with accelerated nVidia drivers.
+
+- QImage
+	Fixed writing of QImages.
+
+- QLayout
+	Fixed layout to take the menu bar's minimum width into
+	consideration and correctly propagate spacing() from parent to
+	child layouts.
+
+- QLineEdit
+ 	Replace all non-printable characters with spaces when
+ 	drawing. Added new function selectionStart() which returns
+	the index of the first selected character in the line edit.
+
+- QListBox
+	Improved item search based on keystrokes.
+
+- QListView
+	Don't move the inline item editor out of the visible area for
+	wide items. Ignore +/- indicator for columns other than the
+	first one. Fixed keyboard handling in Multi selection
+	mode. Improve drawing of extremely long item texts.
+
+- QListViewItem
+	Respects icons vertical alignment properly.
+
+- QMYSQLDriver
+	Better support for MySQL/embedded. Bind TEXT blob fields as
+	strings instead of byte arrays.
+
+- QPainter
+	Qt/Embedded only: Fixed printing issues.
+
+- QPrinter
+	Mac only: Fixed printing issues.
+
+- QSocketDevice
+	Windows only: Fixed setBlocking(TRUE) to work properly.
+
+- QString
+	Fixed toShort() and toUShort() to behave correctly when passed
+	a null pointer as 'ok' value.
+
+- QStyleFactory
+	Return the correct style name from the factory for the
+	WindowsXP style.
+
+- QTable
+	Replace old contents when editing. Take hidden rows into
+	account when activating cells. Clear the cell widget when
+	clearing a cell.
+
+- QTextBrowser
+	Fixed table headers to be bold.
+
+- QTextEdit
+	Implemented insertAt() for LogText mode. Fixed undoAvailable
+	and redoAvailable to be emitted correctly from the context
+	menu. Fixed tripleclick selection in QTextEdit.
+
+- QToolButton
+	Prevent nested openings of the tool button popups.
+
+- QWindowsXPStyle
+	Various paint bug fixes.
+
+- QWorkspace
+	Fixed workspace to keep the active window when
+	tiling. Improved icon handling for maximized and minimized
+	windows.
diff --git a/dist/changes-3.2.1 b/dist/changes-3.2.1
new file mode 100644
index 0000000000..c5a2915d4f
--- /dev/null
+++ b/dist/changes-3.2.1
@@ -0,0 +1,143 @@
+Qt 3.2.1 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.2.0
+
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+Compilers
+---------
+
+Small fixes to build with gcc-3.4.  Build fix for the DB2 Sql driver
+on Borland.  Work around a compiler bug in Sun Forte 6.  Fix a build
+issue for 64bit HP/UC.
+
+Qt Motif Extension
+------------------
+
+Document a known problem related to clipboard and selection handling
+between Qt and Motif components.  See the Qt Motif Extension
+documentation for a more detailed description of the problem.
+
+Qt Designer
+-----------
+Correctly remove connections to deleted actions from the meta
+database.
+
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+General Fixes
+-------------
+
+- QApplication
+        Update arguments passed to the constructor correctly when
+        arguments have already been processed.
+- QDockWindow
+	Fix a regression against 3.1.2 with minimized dock windows.
+- QDom
+	Fix a bug in ownerDocument()
+- QFontDialog
+	Fix to small usability regressions from 3.1.2.
+- QLineEdit
+	Fix regression against 3.1.2: textChanged signal after 
+	setText("") should contain a non null string.
+- QMotifDialog [Qt Motif Extension]
+- QMotifWidget [Qt Motif Extension]
+	Fix incorrect usage of XtSetArg().  In certain cases, some
+	variables would be incorrectly modified, resulting in
+	out-of-bounds memory access and/or crashes.
+- QPainter/QFontMetrics
+	Fix some problems related to line breaking and size
+	calculation of multi line text layouts.
+- QSplitter
+	Fix a problem with setCollapsible.
+- QSqlCursor
+	Fix updates in tables without a primary key.
+- Sql
+	Fix crash in odbc and db2 drivers when using binary fields.
+- QTable
+	Fix possible crash in the QTable destructor.
+- QWidgetStack
+	Fix a slight behavioral change in the sizeHint between 3.1.2
+	and 3.2.
+- QApplication::reverseLayout
+	Fix some problems with dockwindows/toolbars in reverse layout
+	mode.
+- QListView
+	Fix emitting of dropped().	
+
+Platform Specific Issues
+------------------------
+
+Windows:
+
+- QFont
+	Fix possible memory corruption when printing.
+	Windows 98: Fix a problem with displaying of russian
+	text using the default font.
+- QPainter
+	Fix a regression printing text in high resolution mode.
+- QPrinter
+	Fix a problem in setPageSize().
+	Windows 95/98/Me: Fix a possible crash.
+- QWaitCondition and QThread
+	Fix two possible race conditions.
+- XP style
+	Fix resource leak.
+- QString
+	QString::sprintf() work around a memory leak in the Windows C
+	runtime.
+- Dnd
+	Fix problem with dragging URLs.
+	Reverted back accept(), ignore(), acceptAction() to 3.1.x behavior.
+- IME framework
+	Better positioning of the IME composition window.
+
+Mac:
+
+- QStyle:
+	Smaller fixes to the Mac Style.
+	Some fixes for Panther.
+- QFont
+	Fixes for arabic; speed improvements.
+	Make the NoAntialias flag work.
+
+X11:
+
+- QFont
+	Fix possible crash with broken open type fonts.
+- QWidget
+	Fix possible crash in setMicroFocusHint().
+- QPrinter
+	Fix possible crash when drawing text with opaque background.
+	Fix crash if printer tries to print to a nonexistant printer.
+- QRegion
+	Fix drawing problem when using some complex clip 
+	regions on the painter.
+- IME framework
+	Fix a possible performance problem and server side memory
+	leak.
+- DnD
+	Fix regression against 3.1.1 when dragging across multiple
+	screens.
+
+Embedded:
+
+- QApplication
+	Fix mouse event delivery bug with modal dialogs and touch
+	screens.
+- QRegion
+	An empty rectangle will now create an empty region, like on
+	the other platforms.
+- QPixmap
+	Preserve alpha channel in xform().
+- QFont
+	Make setPixelSize() work correctly.
+- QImage
+	Fix loading of BMP images.
+- Build system
+	Make the -no-zlib option work correctly.
diff --git a/dist/changes-3.2.2 b/dist/changes-3.2.2
new file mode 100644
index 0000000000..e6d142494a
--- /dev/null
+++ b/dist/changes-3.2.2
@@ -0,0 +1,155 @@
+Qt 3.2.2 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.2.1
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Compilers
+---------
+
+Make Qt work on Windows 9x compiled with Borland.
+
+Meta Object Compiler
+--------------------
+
+Generate safer code for signals with pointer-to-pointer arguments.
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General Fixes
+-------------
+
+- QButton
+        Make sure button pops up when mouse leaves the button.
+- QEffects
+        Don't crash when widget is destroyed during effect.
+- QFont
+        Load the correct font for characters that have the 'Unicode'
+        script assigned to them (e.g. the em-dash).
+        Fix exact match for raw mode fonts.
+        Fix conversion from unicode to gb2312 to make Chinese appear
+        correctly again when using xlfd fonts.
+- QLineEdit
+        Proper behavior when dragging text inside the same line edit.
+        Make sure the cursor is immediately displayed upon entering a
+        line edit.
+- QListView
+        Update the scroll bars correctly when double clicking on the
+        edge of the header.
+- QPainter
+        Fix case in text rendering, where overfull lines did not get
+        layouted correctly.
+        Fix the last known problems in Indic rendering.
+- QProcess
+        Make canReadLine...() work in a busy loop.
+- QPrinter
+        Set the default paper source properly.
+- QPSPrinter
+        Handle broken true type fonts better.
+        Handle true type fonts with spaces in the family name.
+- QRichText
+        Fix a crash when zooming.
+        Fix possible memory leak.
+- QScrollBar
+        Propagate context menu events that are not handled by the
+        scroll bar.
+
+- QString
+        Support non-'C' locales for string-to-double conversion.
+- QSql
+        Oracle crash fix in some really weird situations.
+- QTable
+        Handle icons correctly when swapping columns/rows.
+        Fix case where a dialog containing a table could hang when
+        opening.
+        Do not crash when QTableHeader::updateSelections() is called,
+        without a current selection.
+- QTextEdit
+        Fixed crash in setCurrentFont() when in LogText mode.
+        Fixed backward searches for the first character or word in a
+        document.
+- QTextEngine
+        Fix memory leaks.
+- QWidgetResizeHandler
+        Improve user interaction.
+- QXmlSimpleReader
+        Fix reading of events after a skippedEntity().
+
+Platform Specific Issues
+------------------------
+
+Windows:
+
+- QFontDatabase
+        Report fixedPitch attribute for fonts correctly.
+        Handle fonts with a hyphen in the name properly.
+- QGLContext
+        Thread safety fix for makeCurrent().
+- QPixmap
+        Detect alpha channel in pixmaps correctly.
+        Fix crash on Windows 9x using alpha blended pixmaps with
+        MemoryOptim.
+        Fix memory leak when detaching copies from pixmaps with
+        alpha channels.
+        Make sure that sizes are correct after xForm().
+        Fix drawing of a masked pixmap into a pixmap with an alpha
+        channel.
+- QPrinter
+        Fix printer output of the drawPixmap()/drawImage() functions
+        that take a rectangle as a parameter.
+        Block all application windows modally when the system printer
+        dialog is open.
+- QWidget
+        Speedup case where tablet support is enabled in library, but
+        no tablet device is present.
+- QWindowsXPStyle
+        Fix gradient background of QLabels within QTabWidgets.
+        Fix "password" character for systems without extended font
+        support.
+
+Mac:
+
+        Improved documentation of Mac-specific issues. A number of
+        general improvements, style fixes, optimizations and bugfixes
+        have been made for Qt/Mac in 3.2.2. Some of the most visible
+        are:
+
+- QSizeGrip
+        Handle hide/show better.
+- QSocket
+        More responsive handling of incoming data reads.
+- QWidget
+        Create widget even if widget flag combinations make no sense.
+        Widget clipping fixes for OpenGL.
+        Widget masking fixed.
+        Fix the problem of a window being set active in show() and
+        then losing its activation when returning from a second event
+        loop.
+
+X11:
+
+- Drag'n'drop
+        Stability improvements.
+- QApplication
+        Make sure that mouse events have proper coordinates when mouse
+        enters widget.
+- QFont
+        Make sure that screen and printer metrics are the same for
+        bitmapped fonts.
+        Avoid crashes with invalid fonts.
+- QPicture
+        Fix text drawing.
+
+Embedded:
+
+- QWSPcMouseHandler
+        Fix buffer overrun when reading from mouse device.
+        Also look for mouse in /dev/inputs/mice when autodetecting.
+
+- QPainter
+        Fix rotated text on 4, 8 and 16 bpp screens.
diff --git a/dist/changes-3.2.3 b/dist/changes-3.2.3
new file mode 100644
index 0000000000..a88e93085f
--- /dev/null
+++ b/dist/changes-3.2.3
@@ -0,0 +1,150 @@
+Qt 3.2.3 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.2.2
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Compilers
+---------
+
+Work around Solaris, AIX, and HP-UX bug affecting
+QString::operator=(const QString &) when linking statically.
+
+Fix gcc 3.4 compile problems.
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General Fixes
+-------------
+
+- QJpegIO
+	Fix memory leak when writing JPEG files.
+
+- QLineEdit
+	Preserve null and empty strings correctly in setText().
+
+- QMessageBox
+	Preserve undocumented behavior in 3.1: expand tabs.
+
+- QMimeSourceFactory
+	Don't crash when a factory uses a pointer to a QMimeSource
+	which is owned by another factory.
+
+- QMovie
+	Respect the background color of a movie when loading
+	animations with transparent pixels.
+	Fix color mode if reading 1-bpp images or frames.
+
+- QPainter
+	Fill the complete bounding rect when rendering text with an
+	opaque painter.
+
+- QRichtext
+	Fix special case where <nobr>\nfoo had an extra space.
+	Fix line breaking for Latin text.
+
+- QTextEdit
+	Improve speed of syntax highlighting.
+
+- QToolBar
+	Do not grow in height when put inside a normal widget.
+
+- QWheelEvent
+	Wheel events are now only sent to the focus widget if the
+	widget under the mouse doesn't handle the event.
+
+- QWMatrix 
+	Fix operator *(QRegion) when the world matrix is (-1 0 0 1 0 0)
+	or similar.
+
+
+Platform-Specific Issues
+------------------------
+
+Windows:
+
+- QPrinter
+	Fix resource leak when printing on Windows 9x.
+	Fix crash for Win98 with HP OfficeJet Pro 1150C.
+
+- QTextBrowser
+	Fixed weight problem in setFont().
+
+- QUriDrag
+	Fix bugs with encoding and separators.
+
+Mac:
+
+Mac OS X 10.3 (Panther) changes:
+
+- QMacStyle
+	Draw push button text vertically-centered.
+
+- QSplashScreen
+	Make the splash screen centered.
+
+- QWidget
+	Tooltips are displayed in the correct place in Panther.
+	Applications that save and restore their geometry will not
+	"walk up" the screen.
+
+General Mac OS X changes:
+
+Fix crash on exit problem (e.g. with Qt Designer).
+
+- QApplication
+	Fix mouse release problem when Control is used to emulate
+	mouse button 2.
+
+- QDesktopWidget
+	Fix problem with popup windows and dual monitors.
+
+- QFont
+	Improve fixed pitch font handling.
+
+- QMenuBar
+	Fix crash with empty menus.
+	Make sure that when we show the application menu, the items we
+	merged in from the other popup menu's are properly
+	enabled/disabled.
+	Fix case where clicking menu bar would stop timers firing.
+
+X11:
+
+- QApplication
+	Avoid endless client message loops when replying to
+	_NET_WM_PING events.
+
+- QFont
+	Fix crash when using high latin characters with GNU unifont.
+	Fix scale factor for printing (rounding error).
+
+- QPainter
+	Fix an endless loop and a bug in the shape engine for Hangul
+	Jamo. (Affects only ancient Korean texts.)
+
+- QPrinter
+	Work around bugs in Xft that cause memory corruption in the
+	postscript printer when downloading certain fonts.
+
+- QSound
+	Fixed crash when deleting a QSound object while it was
+	playing.
+
+
+Embedded:
+
+Fixed bug when applications connect then disconnect immediately.
+Added experimental code to handle 1-bpp and 4-bpp displays for
+big-endian architectures (turned off by default).
+
+- QEventLoop
+	Make processEvents(ExcludeUserInput) work.
+
+- QPrinter
+	Fix font metrics when printing with QPrinter::HighResolution.
diff --git a/dist/changes-3.3.0 b/dist/changes-3.3.0
new file mode 100644
index 0000000000..8523592f39
--- /dev/null
+++ b/dist/changes-3.3.0
@@ -0,0 +1,313 @@
+Qt 3.3 introduces many new features as well as many improvements over
+the 3.2.x series. For more details, see the online documentation which
+is included in this distribution. The documentation is also available
+at http://doc.trolltech.com/
+
+The Qt version 3.3 series is binary compatible with the 3.2.x series.
+Applications compiled for 3.2 will continue to run with 3.3.
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+Qt library
+----------
+
+Qt 3.3 is .NET enabled. This release shows how to use classes
+developed with Qt in a .NET environment. It includes an analysis of
+the different interoperability infrastructures provided by the .NET
+framework. An example demonstrates how to use both a manual approach
+with Microsoft's managed extensions to the C++ language, and also
+automated solutions based on COM and the ActiveQt framework to reuse
+native Qt classes and widgets in .NET projects. To learn more about Qt
+and .NET read the "Using Qt objects in Microsoft .NET" walkthrough
+found in the ActiveQt framework documentation.
+
+Qt 3.3 now supports IPv6 in addition to IPv4. New functions have been
+added for IPv6 support to QSocketDevice, QHostAddress and QDNns.
+
+Qt now includes a new tool class called QLocale. This class converts
+between numbers and their string representations in various languages.
+QLocale supports the concept of a default locale which allows a locale
+to be set globally for the entire application.
+
+Support for new 64bit platforms and compilers has been added for Qt
+3.3.  Qt now supports Itanium on both Linux (Intel C++ compiler) and
+Windows (MSVC and Intel C++ Compiler). Qt 3.3 now also officially
+supports FreeBSD.
+
+Qt 3.3 also supports precompiled headers for Windows, Mac OS X and
+X11. To use precompiled headers when compiling your Qt application
+simply add PRECOMPILED_HEADER and then specify the header file to 
+precompile in your .pro file. To learn more about precompiled headers
+see the "Using Precompiled Headers" chapter in the qmake User Guide.
+
+Two new database drivers have been added to the SQL module, InterBase
+and SQLite. This makes it possible to write database applications that
+do not require a database server. SQLite is provided in the Qt 3.3
+distribution and can be enabled with either -qt-sql-sqlite or
+-plugin-sql-sqlite. The InterBase plugin also works with Firebird, the
+open source version of InterBase.
+
+QWidget has a new function setWindowState() which is used to make a
+widget maximized, minimized, etc. This allows individual settings for
+the minimized/maximized/fullscreen properties.
+
+Support for semi-transparent top-level widgets on Mac OS X and Windows
+2000/XP has also been added.
+
+A new example, qregexptester, has been added that makes it easy to
+test QRegExps on sample strings.
+
+Qt 3.3 includes in addition to this, numerous bug fixes and
+improvements. Special thanks goes to KDE for their reports and
+suggestions.
+
+
+Qt/Embedded
+-----------
+
+Added support for SNAP graphics drivers from SciTech Software. This
+gives access to accelerated drivers for more than 150 graphics
+chipsets.
+
+
+Qt/Mac
+------
+
+QAccessible support has been introduced (implemented in terms of Apple's
+Universal Access API).
+
+Added support for Xcode project files in qmake.
+
+Added Tablet support for Mac OS X.
+
+Numerous visual improvements.
+
+
+Qt/X11
+------
+
+Added support for Xft2 client side fonts on X servers without the
+RENDER extension.
+
+Added a new configure option (-dlopen-opengl) which will remove the
+OpenGL and Xmu library dependencies in the Qt library. The functions
+used by Qt in those libraries are resolved manually using dlopen()
+when this option is used.
+
+Improved support for the Extended Window Manager Hints.
+
+
+Qt/Windows
+----------
+
+Added support for Windows Server 2003 (Win64/Itanium).
+
+
+Qt Motif Extension
+------------------
+
+Clipboard operations now work between Qt and Motif widgets in the same
+application. Click-to-focus works with Motif widgets that are children
+of a QMotifWidget.
+
+
+ActiveQt Extension
+------------------
+
+Two new functions, QAxFactory::startServer() and
+QAxFactory::stopServer(), can be used to start and stop an
+out-of-process ActiveQt server at runtime. The new functions
+QAxFactory::serverDirPath() and QAxFactory::serverFilePath() return
+the location of the COM server binary. Server binaries no longer
+need to implement a main() entry point function. A default
+implementation is used for out-of-process servers. IClassFactory2
+is supported for the development of licensed components, and
+QAxFactory supports the creation of non-visual COM objects. Class
+specific information can be provided directly in the C++ class
+declaration using the Q_CLASSINFO macro to control how objects and
+controls are registered and exposed. New helper classes and macros
+are avialable to make it even easier to expose object classes (see the
+QAxServer documentation for details).
+
+COM objects developed with ActiveQt are now supported in a wider range
+of clients, including Microsoft Office applications and .NET. Examples
+that demonstrate how to use the Qt objects from the examples in .NET
+languages like C# are included. QStringList is supported as a type,
+and QRect, QSize and QPoint are now supported datatypes for control
+properties and as reference parameters. Saving the controls to a
+storage or stream now includes the version number of the QDataStream
+used for the serialization (note that this might break existing
+storages).
+
+The QAxContainer library is now static even for shared configurations
+of Qt. This simplifies deployment and allows using both QAxServer and
+QAxContainer in one project, i.e. an OLE automatable application that
+uses COM objects itself. The semantics of QAxBase::setControl() have
+been extended to allow creating of COM objects on remote machines via
+DCOM, to create controls requiring a license key and to connect to
+already running objects. The implementation of QAxBase::dynamicCall()
+has been improved to support passing of parameter values directly in
+the function string. Three new classes, QAxScript, QAxScriptManager
+and QAxScriptEngine, can be used to script COM objects from within Qt
+applications using Windows Script Host.
+
+SAFEARRAY(BSTR) parameters are supported as QStringList. Calling COM
+object methods with out-parameters of type short, char and float is 
+now supported (the parameters are of type int& and double& in the Qt 
+wrapper), and QVariants used for out-parameters don't have to be 
+initialized to the expected type. Calling QByteArray functions in 
+out-of-process controls no longer returns an error code. The control's 
+client side is set to zero when the container releases the control.
+
+
+Qt Designer
+-----------
+
+Qt Designer, Qt's visual GUI builder, has received some speed
+optimizations, along with minor improvements to the menu editor.
+
+
+Qt Assistant
+------------
+
+Qt Assistant now saves the states of the tab bars between runs. This
+enables users to start browsing where they ended their previous
+assistant session.
+
+Shortcuts for Find Next (F3) and Find Previous (Shift+F3) have been
+implemented.
+
+
+Compilers
+---------
+
+Qt 3.3 adds support for two new compilers. The Intel C++ compiler is
+supported on Windows, Linux and FreeBSD. GNU gcc is supported on
+Windows using MinGW.
+
+Qt 3.3 no longer officially supports the Sun WorkShop 5.0 compiler or the
+SGI MIPSpro o32 mode.
+
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QAction
+	Added a setDisabled() slot similar to QWidget::setDisabled.
+	Added an activate() slot which activates the action and
+	executes all connected slots.
+	QActions::menuText() escapes ampersand characters ('&') when
+	using the value of the text property.
+
+- QButtonGroup
+	Added QButtonGroup::selectedId property to allow mapping with
+	SQL property sets.
+
+- QCursor
+	Added new enum value Qt::BusyCursor.
+	X11 only: Added QCursor constructor taking a X11 cursor handle.
+
+- QDom
+	The QDom classes are now reentrant.
+
+- QEvent
+	Added new event type WindowStateChange, obsoleting ShowNormal,
+	ShowMinimized, ShowMaximized and ShowFullScreen.
+
+- QHeader
+	The sizeChange() signal is emitted when the section sizes are
+	adjusted by double clicking.
+
+- QHostAddress
+	Added new constructor for IPv6 and new functions
+	isIPv6Address() and toIPv6Address(). Obsoleted the functions
+	isIp4Addr() and ip4Addr(), replacing them with isIPv4Address()
+	and toIPv4Address().
+
+- QIconView
+	Improved keyboard search to behave like QListView.
+
+- QListView
+	Improved alignment for text in QListViewItems. Right aligned
+	text now has the ellipsis on the left.
+	Keyboard search now uses the sort column as the column to
+	start searching in.
+	Improved branch drawing.
+
+- QLocale [new]
+	This new tool class converts between numbers and their string
+	representations in various languages.
+
+- QMacStyle
+	Allow disabling of size constraints.
+
+- QMovie
+	Added JNG support.
+
+- QPixmap
+	Support full alpha-maps for paletted (8-bit) images.
+	Support 16-bit grayscale PNG images with transparency.
+
+- QPushButton
+	A push button with both an iconset and text left-aligns the
+	text.
+
+- QSocketDevice
+	Added setProtocol() and protocol() for IPv6 support.
+
+- QSound
+	Windows: Support loop related APIs.
+
+- QSplashScreen
+	Less intrusive stay-on-top policy.
+
+- QSql
+	Support for InterBase and SQLite.
+
+- QStatusBar
+	Draw messages with the foreground() color of the palette,
+	rather than with the text() color.
+
+- QString
+	Added support for %lc and %ls to sprintf(). %lc takes a
+	Unicode character of type ushort, %ls takes a zero-terminated
+	array of Unicode characters of type ushort (i.e. const
+	ushort*). Also added support for precision (e.g. "%.5s").
+	Changed arg() to support "%L1" for localized conversions.
+	Windows only: QString::local8Bit() now returns an empty
+	QCString when called on a null QString to unify behavior
+	with the other platforms.
+
+- QStyle
+	Add a new primitive element: PE_RubberBand.
+	Added PM_MenuBarItemSpacing and PM_ToolBarItemSpacing pixel metrics.
+
+- QTextDrag
+	decode() now autodetects the encoding of text/html content.
+
+- QTextEdit
+	Reduced memory consumption by 20 bytes per line.
+	Added a getter for the currently set QSyntaxHighlighter.
+
+- QTextBrowser
+	Qt now automatically detects the charset of HTML files set
+	with setSource().
+	
+- QVariant
+	Comparison between variants where one of the variants is a
+	numeric value will compare on the numeric value. Type casting
+	between different variants is more consistent.
+
+- QWidget
+	Added setWindowOpacity() and windowOpacity() to support
+	transparent top-level widgets on Windows and Mac.
+	Added windowState() and setWindowState() to allow individual
+	setting of the minimized/maximized/fullscreen properties.
+
+- QWindowsStyle
+	Qt supports toggling of the accelerator underlines using the
+	Alt-key on Windows 98, 2000 and later. On other platforms this
+	change has no effect.
diff --git a/dist/changes-3.3.0-b1 b/dist/changes-3.3.0-b1
new file mode 100644
index 0000000000..8a7433b849
--- /dev/null
+++ b/dist/changes-3.3.0-b1
@@ -0,0 +1,284 @@
+Qt 3.3 introduces many new features as well as many improvements over
+the 3.2.x series. For more details, see the online documentation which
+is included in this distribution. The documentation is also available
+at http://doc.trolltech.com/
+
+The Qt version 3.3 series is binary compatible with the 3.2.x series.
+Applications compiled for 3.2 will continue to run with 3.3.
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+Qt library
+----------
+
+Qt 3.3 is .NET enabled. This release shows how to use classes
+developed with Qt in a .NET environment. It includes an analysis of
+the different interoperability infrastructures provided by the .NET
+framework. An example demonstrates how to use both a manual approach
+with Microsoft's managed extensions to the C++ language, and also
+automated solutions based on COM and the ActiveQt framework to reuse
+native Qt classes and widgets in .NET projects. To learn more about Qt
+and .NET read the "Using Qt objects in Microsoft .NET" walkthrough
+found in the ActiveQt framework documentation.
+
+Qt 3.3 now supports IPv6 in addition to IPv4. New functions have been
+added for IPv6 support to QSocketDevice, QHostAddress and QDNns.
+
+Qt now includes a new tool class called QLocale. This class converts
+between numbers and their string representations in various languages.
+QLocale supports the concept of a default locale which allows a locale
+to be set globally for the entire application.
+
+Support for new 64bit platforms and compilers has been added for Qt
+3.3.  Qt now supports Itanium on both Linux (Intel) and Windows
+(VC++). Qt 3.3 now also officially supports FreeBSD.
+
+Qt 3.3 also supports precompiled headers for both Windows and Mac OS
+X. To use precompiled headers when compiling your Qt application
+simply add PRECOMPH and then specify the header file to precompile in
+your .pro file. To learn more about precompiled headers see the
+"Using Precompiled Headers" chapter in the qmake User Guide.
+
+Two new database drivers have been added to the SQL module, InterBase
+and SQLite. This makes it possible to write database applications that
+do not require a database server. SQLite is provided in the Qt 3.3
+distribution and can be enabled with either -qt-sql-sqlite or
+-plugin-sql-sqlite. The InterBase plugin also works with Firebird, the
+open source version of InterBase.
+
+QWidget has a new function setWindowState() which is used to make a
+widget maximized, minimized, etc. This allows individual settings for
+the minimized/maximized/fullscreen properties.
+
+Support for semi-transparent top-level widgets on Mac OS X and Windows
+2000/XP has also been added.
+
+Qt 3.3 includes in addition to this, numerous bug fixes and
+improvements. Special thanks goes to KDE for their reports and
+suggestions.
+
+
+Qt/Embedded
+-----------
+
+Added support for SNAP graphics drivers from SciTech Software. This
+gives access to accelerated drivers for more than 150 graphics
+chipsets.
+
+
+Qt/Mac
+------
+
+Added support for Xcode project files in qmake.
+Added Tablet support for Mac OS X.
+Numerous visual improvements.
+
+
+Qt/X11
+------
+
+Added support for Xft2 client side fonts on X servers without the
+RENDER extension.
+
+Added a new configure option (-dlopen-opengl) which will remove the
+OpenGL and Xmu library dependencies in the Qt library. The functions
+used by Qt in those libraries are resolved manually using dlopen()
+when this option is used.
+
+Improved support for the Extended Window Manager Hints.
+
+
+Qt/Windows
+----------
+
+Added support for Windows Server 2003 (Win64/Itanium).
+
+
+Qt Motif Extension
+------------------
+
+Clipboard operations now work between Qt and Motif widgets in the same
+application. Click-to-focus works with Motif widgets that are children
+of a QMotifWidget.
+
+
+ActiveQt Extension
+------------------
+
+Two new functions, QAxFactory::startServer() and
+QAxFactory::stopServer(), can be used to start and stop an
+out-of-process ActiveQt server at runtime. The new functions
+QAxFactory::serverDirPath() and QAxFactory::serverFilePath() return
+the location of the COM server binary. Server binaries no longer
+need to implement a main() entry point function. A default
+implementation is used for out-of-process servers. IClassFactory2
+is supported for the development of licensed components, and
+QAxFactory supports the creation of non-visual COM objects. Class
+specific information can be provided directly in the C++ class
+declaration using the Q_CLASSINFO macro to control how objects and
+controls are registered and exposed. New helper classes and macros
+are avialable to make it even easier to expose object classes (see the
+QAxServer documentation for details).
+
+COM objects developed with ActiveQt are now supported in a wider range
+of clients, including Microsoft Office applications and .NET. Examples
+that demonstrate how to use the Qt objects from the examples in .NET
+languages like C# are included. QStringList is supported as a type,
+and QRect, QSize and QPoint are now supported datatypes for control
+properties and as reference parameters. Saving the controls to a
+storage or stream now includes the version number of the QDataStream
+used for the serialization (note that this might break existing
+storages).
+
+The QAxContainer library is now static even for shared configurations
+of Qt. This simplifies deployment and allows using both QAxServer and
+QAxContainer in one project, i.e. an OLE automatable application that
+uses COM objects itself. The semantics of QAxBase::setControl() have
+been extended to allow creating of COM objects on remote machines via
+DCOM, to create controls requiring a license key and to connect to
+already running objects. The implementation of QAxBase::dynamicCall()
+has been improved to support passing of parameter values directly in
+the function string. Three new classes, QAxScript, QAxScriptManager
+and QAxScriptEngine, can be used to script COM objects from within Qt
+applications using Windows Script Host.
+
+SAFEARRAY(BSTR) parameters are supported as QStringList. Calling COM
+object methods with out-parameters of type short is now supported (the
+parameters are of type int& in the Qt wrapper), and QVariants used for
+out-parameters don't have to be initialized to the expected type.
+Calling QByteArray functions in out-of-process controls no longer
+returns an error code. The control's client side is set to zero when
+the container releases the control.
+
+
+Qt Designer
+-----------
+
+Qt Designer, Qt's visual GUI builder, has received some speed
+optimizations, along with minor improvements to the menu editor.
+
+
+Qt Assistant
+------------
+
+Qt Assistant now saves the states of the tab bars between runs. This
+enables users to start browsing where they ended their previous
+assistant session.
+
+Shortcuts for Find Next (F3) and Find Previous (Shift+F3) have been
+implemented.
+
+
+Compilers
+---------
+
+Qt 3.3 adds support for two new compilers. The Intel C++ compiler is
+supported on Linux and FreeBSD. GNU gcc is supported on Windows using
+MinGW.
+
+Qt 3.3 no longer officially supports the Sun CC 5.0 compiler or the
+IRIX MIPSpro o32 mode.
+
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+- QAction
+	Added a setDisabled() slot similar to QWidget::setDisabled.
+	Added an activate() slot which activates the action and
+	executes all connected slots.
+	Added showStatusMessage() and whatsThisClicked() signals.
+
+- QButtonGroup
+	Added QButtonGroup::selectedId property to allow mapping with
+	SQL property sets.
+
+- QCursor
+	Added new enum value Qt::BusyCursor.
+
+- QDom
+	The QDom classes are now reentrant.
+
+- QEvent
+	Added new event type WindowStateChange, obsoleting ShowNormal,
+	ShowMinimized, ShowMaximized and ShowFullScreen.
+
+- QHeader
+	The sizeChange() signal is emitted when the section sizes are
+	adjusted by double clicking.
+
+- QHostAddress
+	Added new constructor for IPv6 and new functions
+	isIPv6Address() and toIPv6Address(). Obsoleted the functions
+	isIp4Addr() and ip4Addr(), replacing them with isIPv4Address()
+	and toIPv4Address().
+
+- QListView
+	Improved alignment for text in QListViewItems. Right aligned
+	text now has the ellipsis on the left.
+	Keyboard search now uses the sort column as the column to
+	start searching in.
+	Improved branch drawing.
+
+- QLocale [new]
+	This new tool class converts between numbers and their string
+	representations in various languages.
+
+- QMacStyle
+	Allow disabling of size constraints.
+
+- QMovie
+	Added JNG support.
+
+- QPixmap
+	Support full alpha-maps for paletted (8-bit) images.
+	Support 16-bit grayscale PNG images with transparency.
+
+- QSocketDevice
+	Added setProtocol() and protocol() for IPv6 support.
+
+- QSound
+	Windows: Support loop related APIs.
+
+- QSplashScreen
+	Less intrusive stay-on-top policy.
+
+- QSql
+	Support for InterBase and SQLite.
+
+- QStatusBar
+	Draw messages with the foreground() color of the palette,
+	rather than with the text() color.
+
+- QString
+	Added support for %lc and %ls to sprintf(). %lc takes a
+	Unicode character of type ushort, %ls takes a zero-terminated
+	array of Unicode characters of type ushort (i.e. const
+	ushort*). Also added support for precision (e.g. "%.5s").
+	Changed arg() to support "%L1" for localized conversions.
+
+- QStyle
+	Add a new primitive element: PE_RubberBand.
+
+- QTextEdit
+	Reduced memory consumption by 20 bytes per line.
+	Added a getter for the currently set QSyntaxHighlighter.
+
+- QVariant
+	Comparison between variants where one of the variants is a
+	numeric value will compare on the numeric value. Type casting
+	between different variants is more consistent.
+
+- QWidget
+	Added setWindowOpacity() and windowOpacity() to support
+	transparent top-level widgets on Windows and Mac.
+	Added windowState() and setWindowState() to allow individual
+	setting of the minimized/maximized/fullscreen properties.
+
+- QWindowsStyle
+	Qt supports toggling of the accelerator underlines using the
+	Alt-key on Windows 98, 2000 and later. On other platforms this
+	change has no effect.
diff --git a/dist/changes-3.3.1 b/dist/changes-3.3.1
new file mode 100644
index 0000000000..55ea305873
--- /dev/null
+++ b/dist/changes-3.3.1
@@ -0,0 +1,141 @@
+Qt 3.3.1 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.3.0
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Added support for animated cursors on Mac OS X.
+
+Compilers
+---------
+
+Fixed SQLite compilation on Solaris.
+
+Fixed problem with precompiled headers (PCH) and Platform SDK on
+Windows by removing winsock2.h dependency.
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General Fixes
+-------------
+
+Fixed drag and drop for modal dialogs.
+
+- QAction
+	Propagate visibility state correctly to actions added to an
+	invisible actiongroup.
+	
+- QHttp
+	Handle both upper and lower case in response headers.
+
+- QLineEdit
+	Fixed drawing problems that affected very long strings and
+	the handling of trailing spaces.
+
+- QObject
+	Fixed connectNotify() and disconnectNotify() for some special
+	cases.
+
+- QPixmap
+	Avoid calling detach() when setting a null mask on a pixmap.
+
+- QString
+	sprintf() again interprets strings, %s, as UTF-8 strings, not
+	as Latin1 strings.
+
+- QTabBar
+	Tabbars are now correctly left aligned again.
+
+- QTable
+	Fixed shift selections after editing.
+	
+- QTextEdit
+	Emits cursorPositionChanged() when cursor position changes
+	when find() has been called.
+	LogText mode: Changing fonts after appending text now
+	recalculates the scrollbars properly.
+	Optimized createPopupMenu().
+
+- QVariant
+	Added missing detach() calls in QVariant::as...() functions
+	(e.g. asInt()).
+
+- QWidget
+	setWindowState() fixed for WindowMaximized and
+	WindowFullScreen. showMaximized() and showFullScreen() now
+	work for laid out widgets that have not been explicitly
+	resized.
+	windowOpacity() correctly initialized.
+
+Platform-Specific Issues
+------------------------
+
+Windows:
+
+Fixed overflow error that sometimes affected the font engine.
+Fixed font drawing problems for some international versions of Win9x;
+also improved handling of spaces before Chinese characters.
+
+- QApplication
+	Fixed libraryPaths() to return the correct location of the
+	application executable, independently of whether it has been
+	called before the QApplication constructor or afterwards.
+
+- QFileInfo
+	Fixed readLink() for special cases.
+
+- QSound
+	Fixed isFinished() to work correctly.
+
+- QStyle
+	Fixed QWindowsXPStyle drawing flat toggle buttons.
+
+- QWidget
+	Turn off layered painting if window opacity is set back to
+	1.0; making widget redrawing fast again.
+
+Mac:
+
+Fixed crash on exit problem with Qt Designer.
+Fixed compilation of networking modules for Professional edition. 
+Fixed overflow error that sometimes occurred in the font engine.
+Fixed modal dialogs and contextMenuRequested() signals.
+
+- QMenuBar
+	Add separator after the "Abouts".
+	Fixed memory corruption.
+
+- QMessageBox
+	Improved handling of text and button size.
+
+- QPainter
+	Improved raster operations when using colors.
+	Improved polygon region handling and drawPolyLine().
+
+- QStyle
+	Fixed QAquaStyle to use setWindowOpacity().
+	Fixed QMacStyle drawing of flat toggle buttons.
+
+- QWidget
+	Fixed showFullScreen() to not hide the toolbar.
+
+X11:
+
+Fixed skipping of certain (bitmap) fonts for Xft2 when building up the
+font database.
+
+- QPrinter
+	Fixed regression with margins and Landscape.
+
+Embedded:
+
+- QPixmap
+	Fixed crash bug with transformed driver when using masked
+	pixmaps where width > height.
+	In xForm(), pre-fill the resulting pixmap with a transparent
+	color instead of white.
diff --git a/dist/changes-3.3.2 b/dist/changes-3.3.2
new file mode 100644
index 0000000000..72213deed6
--- /dev/null
+++ b/dist/changes-3.3.2
@@ -0,0 +1,390 @@
+Qt 3.3.2 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.3.1 and Qt 3.3.0.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Compilers
+---------
+
+MinGW: It is now possible to build the WinXP style on MinGW.
+
+FreeBSD: Enable DragonFly to build Qt with its native compiler.
+
+Mac: Assistant builds with Professional edition when Fink is installed.
+
+AIX: Fixed compile problem with OpenType.
+
+Tru64: Correctly detects the Compaq C++ compiler.
+
+HP-UX 64: Fixed link failure for Designer.
+
+Intel: Fixed compile failure on icc version 8.0 p42+.
+
+Qt/Embedded: Compiles with gcc 3.4.0 (prerelease).
+
+Added macro QT_QLOCALE_USES_FCVT for systems with non-IEEE-compliant
+floating point implementations (notably some versions of ARM
+Linux). These systems are not autodetected; use
+"-DQT_QLOCALE_USES_FCVT" as a parameter to ./configure.
+
+Qt Designer
+-----------
+
+Allows saving of the column and label information for QDataTable, even
+when Qt is compiled without the SQL module.
+
+Fixed data corruption in .pro files with whitespace.
+
+Fixed crash on closing a new, modified, unsaved C++ file.
+
+Fixed crash with QicsTable.
+
+Fixed corrupted .ui files caused by '<' or '>' in the object name.
+
+Fixed freeze when opening a modal Wizard Dialog from file.
+
+Fixed crash when adding a new separator using drag and drop.
+
+Qt Assistant
+------------
+
+Fixed the Settings font combobox to not re-add font entries.
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General Fixes
+-------------
+
+- QAction
+	Fixed bug when adding invisible/disabled actions to
+	visible/enabled action groups.
+
+- QCanvas
+	Cleans up old animations in setCanvas().
+
+- QClipboard
+	Fixed potential double deletion in clean up.
+
+- QColorDialog
+	Fixed crash when running on very small screens (less than
+	480x350).
+
+- QDateEdit
+	Fixed bug that would accept invalid dates when losing focus.
+
+- QDialog
+	Made showMaximized() and showFullScreen() work for dialogs
+	again.
+
+- QDns
+	Improved handling of literal IP addresses for both IPv4 and
+	IPv6.
+	Improved handling of disappearing/reappearing name servers.
+
+- QFont
+	Fixed handling of Oblique fonts.
+
+- QImage
+	Fixed crash when loading MNG animations.
+
+- QLabel
+	Fixed bug with labels without buddies that have '&' in the
+	text.
+
+- QLineEdit
+	Handles input method events according to the specification,
+	fixing severe problems with Korean input on Windows. This
+	change could show up problems with buggy input methods.
+	Fixed disappearing cursor for right-aligned text and Xft1.
+
+- QListBox
+	Fixed bug in itemAt() when listbox has wide line/framestyle.
+
+- QListView
+	Fixed problem with editor sometimes having zero width.
+
+- QLocale
+	Fixed crash on FreeBSD/Alpha.
+
+- QPainter
+	Fixed QPicture transformation bug.
+
+
+- QPopupMenu
+	Fixed crash-on-exit bug when using floating menus.
+
+- QRegExp
+	Fixed bug with patterns of the form "^A|B".
+
+- QSocket
+	Fixed bug where connecting two QSockets simultaneously would
+	cause both to connect to the same address.
+	Fixed bug where ErrConnectionRefused would not be emitted in
+	rare cases.
+
+- QSql
+	Fixed data corruption in OCI driver.
+	Fixed data corruption with SQLite driver when using non-UTF-8
+	databases with special characters.
+	Updated to work with SQLite version 2.8.13.
+
+- QString
+	Made string-to-number conversions interpret strings according
+	to the current locale.
+	Fixed the format of the %p sprintf flag.
+	Perform sanity check on the length parameter to fromUtf8().
+	Fixed toDouble() to again return a value even when failing on
+	trailing whitespace.
+	Performance optimization for startsWith()/endsWith().
+
+- QTable
+	Fixed crash caused by calling addLabel() on a horizontal header
+	when there are no columns in the table.
+	Fixed crash that occurs when deleting a QTable while editing
+	a cell.
+	Made it possible to override the grid line color.
+	Fixed selectionChanged() to be emitted correctly when dealing
+	with selections of multiple items.
+
+- QTabWidget
+	Fixed setAutoMask().
+
+- QToolButton
+	Icon and label now move the same distance when pressed.
+
+- QTextEdit
+	Does not override Ctrl+Alt+key accelerators.
+	Performance optimization: do not call ensureCursorVisible() when
+	isUpdatesEnabled() is not true.
+	Fixed crash when using removeParagraph() to remove QTextTable
+	items.
+	Fixed data corruption when saving documents with overline or
+	strikeout.
+
+- QTextBrowser
+	Fixed Purify warning about array-bound reads.
+
+- QVariant
+	Fixed bug in detaching LongLong and ULongLong values.
+
+- QWidget
+	Made showMaximized()/showFullScreen()/showMinimized() work
+	correctly again.
+	Posts events from the windowing system as before.
+
+- QWizard
+	Does not show enabled Next button on the last page if the
+	Finish button was enabled on an earlier page.
+
+- QWorkspace
+	Scales down maximize icon correctly.
+	Fixed active window/focus bug.
+	Ensured that children added to invisible workspaces are
+	painted correctly.
+	Fixed flicker with tooltips for maximize, minimize and close
+	buttons.
+
+- QXml
+	Fixed bug causing data corruption when reading invalid XML
+	files.
+
+
+Platform-Specific Issues
+------------------------
+
+Windows:
+
+- QApplication
+	Does not handle GUI messages for non-GUI appliations.
+	Disabled MenuItem highlight color for XP in non-themed
+	Classical Style.
+
+- QContextMenuEvent
+	Made right mouse button send menu event also for popup widgets
+	such as the QListBox in QComboBox.
+
+- QDesktopWidget
+	Made qApp->desktop()->size() give the correct size after a
+	display resolution change.
+
+- QFont
+	Loading a Japanese font using the English name now works when
+	running in a Japanese locale.
+
+- QLineEdit
+	Fixed drawing problems that affected very long strings and the
+	handling of trailing spaces when using Uniscribe.
+
+- QPainter
+	Fixed possible crash in setBrush().
+	Draw bitmaps using painter's foreground color when painter is
+	using a complex transformation.
+	Fixed inter-letter spacings for scaled fonts.
+
+- QPrinter
+	Fixed crash when using buggy printer drivers.
+
+- QSound
+	Made setLoops(-1) work again (plays the sound in a loop).
+	Made setLoops(0) play no sound.
+	Made setLoops(1) set isFinished() correctly.
+	Fixed memory leak.
+	If a new sound is started then stop the existing one, and play
+	the new one.
+
+- QTextEngine
+	Performs auto-detection of Asian scripts even if Uniscribe is
+	not installed.
+
+- QWidget
+	Returns correct isMinimized/isMaximized state if an application
+	is started through a shortcut using "Minimized" or "Maximized".
+
+Mac:
+
+- QAccel
+	Solved the problem where we received two accel override events
+	for each keypress.
+
+- QApplication
+	Uses better technique for obtaining applicationFilePath().
+	Allows non-GUI applications to run without the GUI.
+	Stopped using EnableSecureEventInput() because of
+	Jaguar/Panther compatibility problems.
+	Updates the text highlight color when the system changes it.
+
+- QClipboard
+	Fixed posting to the clipboard and access rights.
+
+- QComboBox
+	Ensures that the item list stays within the screen size.
+
+- QCursor
+	Uses native splitter cursors when available.
+
+- QFontMetrics
+	Fixed fontmetrics for Asian fonts.
+
+- QLineEdit
+	Uses secure keyboard input in Password mode, so that keyboard
+	events cannot be intercepted.
+
+- QMacStyle
+	Fixed painting of radio buttons to be perfectly circular.
+
+- QMenuBar
+	Fixed bug when using pixmaps without an alpha channel.
+
+- QPainter
+	Improved raster operations.
+	Made custom bitmap brushes work.
+	Draws text using painter's foreground color.
+
+- QPrinter
+	Ensures that the printer name and page range are correct after
+	setup.
+	Always uses the native print dialog.
+	Implemented setPageSize() and pageSize() properly.
+	Made QPrinter work when no printer is installed.
+	Fixed font width bug in postscript when font embedding is
+	disabled.
+
+- QSettings
+	Returns correct value for global settings when scope is User.
+
+- QSlider
+	Fixed drawing of tickmarks when minimum value is non-zero.
+
+- QStyle
+	Does not change pixmap of QToolbutton if the button is not
+	auto-raised.
+
+- QWidget
+	Fixed bug where the toolbar is partially hidden when showing a
+	mainwindow in fullscreen mode.
+	Made WStyle_StaysOnTop work in the same way as on the other
+	platforms.
+	Fixed bug in maximizing windows with a maximum size.
+
+- QWorkspace
+	Fixed bug giving frozen child windows when maximizing and
+	restoring.
+
+X11:
+
+Fixed crash bug when using X Input Method Chinput.
+
+- Drag and Drop
+	Ignores accelerator events when dragging.
+
+- QClipboard
+	Fixed bug where data()->format() would return the wrong value.
+	Fixed potential crashes with regards to iterators.
+
+- QFont
+	Avoids badly scaled fonts, and prefers exact matches.
+	Made sure symbol fonts get loaded correctly.
+	Made it possible to load Latin fonts that do not contain the
+	Euro symbol.
+	Fixed glyph width bug observed with some Khmer fonts.
+	Fixed crash with misconfigured Xft.
+	Fixed problem with font selection for Xft2 when having Latin
+	text with non-Latin locale.
+	Respects custom dpi settings for Xft.
+	Does not use Xft if we have FreeType1 but no XRender.
+	Fixed memory leak in the font engine when drawing transformed
+	fonts.
+
+- QGL
+	Fixed crash when rendering text in GL widgets.
+
+- QLocale
+	Tru64: Fixed crash when INFINITY is compared to another double.
+	Tru64: Uses DBL_INFINITY for Compaq C++ compiler.
+
+- QMimeSource
+	Does not re-enter the event loop in provides().
+
+- QPainter
+	Fixed rendering of anti-aliased text on non-XRender enabled
+	displays.
+
+- QPrinter
+	Fixed setFromTo().
+	Fixed printing of Arabic text with XLFD fonts.
+
+- QTextEdit
+	Fixed bug with extremely long lines.
+
+- QThread
+	Fixed bug that made program require superuser privileges on
+	some Linux machines.
+
+- QWidget
+	Fixed showFullScreen() and showMaximized() for window managers
+	that do not support extended window manager hints (EWMH).
+
+Embedded:
+
+- QFontInfo
+	Made QFontInfo work properly on Qt/Embedded.
+
+- QGfxVNC
+	Fixed crash if VNC viewer is closed while Qt/E is painting.
+
+- QWidget
+	Uses correct focus handling if the focus widget is hidden or
+	deleted while a popup is open.
+
+Linux virtual console switching:
+	Fixed race condition in handling of virtual console switching
+	that could cause a deadlock in some cases.
+	Switch consoles on key press event.
+	Fixed QWSServer::hideCursor()/showCursor() display locking bug
+	which could block client processes.
diff --git a/dist/changes-3.3.3 b/dist/changes-3.3.3
new file mode 100644
index 0000000000..8dde96a628
--- /dev/null
+++ b/dist/changes-3.3.3
@@ -0,0 +1,442 @@
+Qt 3.3.3 is a bugfix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.3.2, Qt 3.3.1 and Qt 3.3.0.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Compilers
+---------
+Added support for GNU gcc on AIX 64-bit.
+
+Fixed the issue of some compilers that produced bad output when
+compiling qlocale.cpp with -O2.
+
+Fixed include path problem with MinGW.
+
+Meta Object Compiler (moc)
+--------------------------
+Allow classnames containing the substring 'const' in signal
+parameters.
+
+Qt Assistant
+------------
+Fixed crash when an empty file is part of the profile.
+
+Qt Designer
+-----------
+Fixed occasional crash when closing the form window.
+
+Fixed bug that removed '@' characters from .pro files.
+
+Fixed bug resulting in invalid code for radio buttons with strong
+focus.
+
+Fixed crash when custom widget plugins based on QComboBox were edited or
+previewed in certain styles.
+
+Fixed bug in loading enum properties (e.g. slider tickmarks).
+
+Handle comments of the form '# {' correctly.
+
+Handle '$${}' variable expansion correctly.
+
+Fixed missing actions in drop down action groups created with the menu
+editor.
+
+Made sure that the item labels for toolboxes can be translated.
+
+Added CTRL + Key_Q as a shortcut to quit.
+
+Do not add unnecessary blank lines in .pro files.
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General Fixes
+-------------
+- Drag and drop
+	Handle filenames with '#' characters properly.
+
+- QAccel
+	Fixed bug where Alt + non-ASCII letter would require an additional
+	Shift.
+
+- QButtonGroup
+	Don't navigate out of the button group with the arrow keys.
+
+- QComboBox
+	Don't close the combobox when holding space down while clicking.
+	(Fixes GUI lock-up on Windows.)
+
+- QDateTimeEdit
+	Propagate enabled state correctly when adding a QDateEdit/QTimeEdit
+	to a disabled parent.
+
+- QDataStream
+	Fixed bug involving the output of doubles/floats in printable mode.
+
+- QFileDialog
+	Fixed crash when calling setContentsPreview() twice.
+
+- QFontDatabase
+	Made Tibetan text work even without OpenType tables.
+	When using XLFD fonts, make sure that the size selected actually
+	supports the script.
+	Fixed bug that caused fixed-pitch XLFD fonts to be reported as
+	variable pitch.
+	Fixed some issues in the CJK compatibility area, where we did
+	not always pick the correct CJK font.
+	Made isSmoothlyScalable() work when a font only exists in bold.
+	Fixed bug where font metrics for Asian fonts were wrong in some
+	circumstances.
+	Fixed bug involving certain open source Arabic fonts.
+
+- QFontDialog
+	Resize OK/Cancel buttons properly with large font sizes.
+
+- QFtp
+	Allow connection to FTP servers that return lower-case month
+	names.
+
+- QImage
+	Included fix for buffer overflow in libPNG.
+	Fixed bug that made copy constructor not copy the entire image.
+	Allow XPM images with colors that have more than one word in the
+	name.
+	Fixed crash when trying to load a corrupt/invalid BMP image.
+	Fixed crash when trying to load a corrupt/invalid GIF image.
+	Fixed crash when trying to load a JPEG image that is too big.
+	Fixed bug that caused dotsPerMeter() to be ignored when saving
+        JPEG images.
+
+- QLineEdit
+	Fixed memory leak for line edits with masks.
+	Fixed bug where QLineEdit::text() would return a null QString when
+	an input mask was set on an empty line edit.
+	Don't scroll when the text is wider than the widget.
+
+- QListView
+	Don't select a non-visible item when Right arrow key is pressed.
+	Fixed crash in setOpen(QListViewItem*, bool).
+
+- QLocale 
+	Now supports string-to-int conversions with base up to 36.
+	Handle space as a separator for large numbers in toDouble().
+
+- QMovie
+	Fixed offset bug.
+
+- QPainter
+	Don't crash if setWorldMatrix() is called on a painter that is not
+	active.
+
+- QPicture
+	Fixed bounding rect calculation.
+
+- QPixmap
+	Fixed rounding errors in xForm().
+
+- QPopupMenu
+	Fixed updateSize().
+	Fixed a crash when clearing and inserting new items while the tear
+	off is visible.
+
+- QRichText
+	Clear the focusIndicator paragraph when clearing the text.
+	Fixed bug with <td valign="middle">.
+
+- QSemaphore
+	Fixed possible starvation in operator-=().
+
+- QSlider
+	Fixed mouse handling for vertical sliders in reverse mode.
+
+- QSocket
+	Preserve readBufferSize() when doing connectToHost().
+
+- QSql
+	Fixed crash in ODBC-Driver in connection with Informix SE.
+
+- QSqlCursor
+	Fixed bug in del(true)
+
+- QSqlQuery
+	Fixed thread reentrancy bug.
+
+- QString
+	Made toFloat() fail if the number is too large for a float.
+	Fixed crash in fromUtf8 when argument is not 0-terminated.
+	Don't end up in an endless loop when setLength() is called with a
+	ridiculously large value (> 2^31).
+
+- QSvgDevice
+	Fixed some clipping issues.
+
+- QTable
+	Fixed memory leak in key event handling.
+	Fixed bug where calling setNumRows() or setNumCols() would not
+	change the sizeHint().
+	Improved speed of deleting rows/columns in big tables.
+
+- QTextEdit
+	Hide the cursor again when a drag leaves the text edit.
+	Don't crash if the text edit is deleted while the popup menu is
+	active.
+	Fixed undo/redo bug in overwrite mode.
+	Fixed crash when entering text in overwrite mode when entire text is
+	selected, on a single line, and the cursor is at the start of the
+	text.
+
+- QTextEngine
+	Fixed a small bug in the bidi engine.
+	Fixed two small issues with Bengali rendering.
+	Fixed small issue with Khmer rendering.
+	Fixed an issue with ideographic space (U+0x3000).
+
+- QThread
+	Fixed bug on HP-UX when starting a thread with LowPriority.
+	Provide a safety mechanism when trying to use QThreadStorage from
+	non-QThread threads: spit out a warning and do nothing.
+
+- QToolBar
+	Create a disabled popup menu when a disabled combobox is added to
+	the extension menu.
+
+- QWidget
+	Fixed bug that would sometimes make showMaximized() fail.
+
+- QWidgetStack
+	Set background properly when the current page has a maximum size
+	that is less than the size of the QWidgetStack.
+
+- QWorkspace
+	Fixed problems involving widgets with size constraints.
+	Don't normalize minimized widgets when cascading and tiling.
+
+- QXml
+	Speed optimizations.
+
+Platform-Specific Issues
+------------------------
+Windows:
+
+- Drag and drop
+	Ignore drag and drop events for modally shadowed windows.
+
+- Build system
+	Fixed qmake problem with QMAKE_EXTRA_WIN_TARGETS.
+
+- QApplication
+	Fixed restoring of windows when minimized using something other than
+	the window menu.
+	When restoring a modally blocked application after using "Minimize
+	All Windows" from the task bar, activate the modal dialog rather
+	than the blocked window.
+	Support Unicode application directories in applicationFilePath()
+	independently of the current locale.
+	Fixed accelerators with Ctrl+@ and Ctrl+[ to Ctrl+_ instead.
+
+- QAxWidget 
+	Fixed bug that could lead to windows no longer responding to mouse
+	events.
+	Fixed bug that would eat a mouse release event in some cases.
+
+- QFileDialog
+	Don't let getOpenFileName() fail immediately, even if passed invalid
+	characters.
+	Fixed bug that gave spurious mouse move events to other widgets when
+	closing a file (or printer) dialog.
+
+- QFontDatabase
+	Select correct font when family is empty and style hint is set.
+	Fixed problem where Chinese fonts were a pixel smaller than with
+	older Qt versions.
+
+- QFtp
+	Improved performance by increasing buffer sizes.
+
+- QLocale
+	Obtain correct locale information on Win95, so that
+	QTextCodec::locale() works properly.
+
+- QPixmap
+	Fixed problems when alpha blending in 32bpp depth.
+
+- QPrinter
+	Fixed problems caused by printing without first calling setup() when
+	using certain printers.
+
+- QSettings
+	Fixed bug that would add unnecessary size to the registry on Win98
+	in some circumstances.
+
+- QSocket
+	Worked around Windows bug which caused bytesAvailable() to be 1,
+	even if no data was available.
+
+- QSound
+	Removed race condition.
+
+- QTextEngine
+	Draw CJK compatibility characters in the 0xffxx range correctly.
+	Fixed crash on invalid UTF-8 when using the newest Uniscribe library
+	on XP.
+
+- QWidget
+	Don't clear the maximized state when moving a maximized window.
+	Don't move the widget to a silly position when showMinimized() is
+	called on a visible widget.
+	Let the size grip respect the same size limits as the window
+	manager.
+	Fixed bug where a widget with an empty region as mask would still
+	have one visible pixel.
+
+- QWindowsStyle
+	Always underline accelerator cues on Windows 98.
+
+- QWindowsXPStyle
+	Draw up/down buttons of QDateTimeEdit disabled when the widget is
+	disabled.
+	Draw toggle-toolbuttons as toggled even if they are not in a
+	toolbar.
+
+Mac:
+
+- Drag and drop
+	Fixed bug that would disrupt drag and drop when toggling
+	full-screen status.
+	Ignore drag and drop events for modally shadowed windows.
+        Show the correct cursor when copying.
+
+- QApplication
+	Fixed bug that could cause crash when allocating and deleting
+	QApplication repeatedly.
+	Properly animate the toolbar button.
+
+- QAquaStyle
+	Made sure that OK and Cancel buttons are big enough when icons are
+	added.
+	Fixed bug that would show focus rectangles around hidden widgets in
+	a QScrollView.
+	Fixed drawing errors in QComboBox and QSpinBox when building on
+	Panther and deploying on Jaguar.
+	Fixed bug that caused artifacts on the focus widget when embedded
+	inside a widget with a background pixmap.
+
+- QComboBox
+	Fixed crash when calling setListBox() and later popping up the popup
+	list.
+	Fixed size hint problems.
+
+- QFileDialog
+	Made the filter functionality work in getSaveFileName().
+
+- QFontEngine
+	Fixed bug showing strikeout text.
+
+- QHeader
+	Fixed drawing errors when moving columns.
+
+- QListView
+	Don't draw the disclosure triangle for items that aren't visible.
+
+- QMenuBar
+        Disable the quit option when there is a modal dialog.
+
+- QPixmap
+	Made copyBlt() copy the alpha channel properly again.
+
+- QPrinter
+	Fixed page range bug.
+
+- QProgressBar
+	Show something for indeterminate progress bars.
+
+- QScrollView
+	Fixed colors for the scrollview frame.
+
+- QSettings
+	Fixed bug that caused settings files to end up in the wrong place.
+
+- QTableHeader
+	Fixed sizing bug.
+
+- QWidget
+	Don't disable children of WStyle_Tool widgets.
+        The window proxy icon is only set for document windows.
+
+X11:
+
+- QApplication
+	Made the '-inputstyle' command line option override the ~/.qt/qtrc
+	setting.
+	Fixed crash when using the QApplication( Display *,...) constructor
+	without any settings file in ~/.qt/.
+	Fixed bug when passing a Tk Visual* to the QApplication constructor.
+
+- QClipboard
+	Fixed race condition in clear().
+
+- QFontDatabase
+	Fixed bug that caused some special TTF fonts to display incorrectly.
+	Fixed bug where Qt would not find some non-scalable fonts.
+
+- QFontEngine
+	Fixed bug that caused incorrect metrics and drawing in some cases
+	when a painter scales down very large fonts for display.
+
+- QMotif
+	Fixed crash when passing X11 command line parameters.
+	Fixed GUI freeze when using the system close menu on a QMotifWidget
+	window with some window managers.
+
+- QPainter
+	Fixed memory leak when more than 256 GCs are allocated.
+
+- QPrinter
+	Allow multiple space-separated options in
+	setPrinterSelectionOption().
+	Fixed printing to A3 sized paper.
+	Fixed printing using certain PFB fonts (e.g. the ones generated from
+	TeX).
+
+- QWidget
+	Fixed restoration from fullscreen/maximize on non-EWMH supporting
+	window managers.
+	Do not clear the fullscreen/maximize state if the window manager
+	ignores a resize request from Qt.
+	Worked around bugs in window placement for the SGI 4Dwm window
+	manager.
+
+Embedded:
+
+Makeqpf tool
+	Use the same way of finding the font directory as the rest of Qt.
+
+- QVNCServer
+	It is now possible to have several different VNC servers active on
+	the same machine (and even in the same process).
+	Fixed bug connecting a little-endian client to a big-endian server.
+
+- QPainter
+	Fixed bug making thick vertical lines one pixel too wide.
+	Worked around compiler bug in gcc 3.3.1 and 3.3.3 (but apparently
+	not in 3.3.2), causing artifacts when drawing anti-aliased text on
+	16-bpp displays in release mode. 
+
+- QWidget
+	Avoid creating a paint event in setMask() if the new mask is the
+	same as the old.
+
+- QWSManager
+	Fixed crash when widget is deleted during a window system mouse
+	grab.
+	Only move window on left mouse press.
+
+- QWSServer
+	Avoid possible race condition in sendPropertyNotifyEvent()
+	when client quits.
diff --git a/dist/changes-3.3.5 b/dist/changes-3.3.5
new file mode 100644
index 0000000000..8839f7692d
--- /dev/null
+++ b/dist/changes-3.3.5
@@ -0,0 +1,617 @@
+Qt 3.3.5 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.3.4, Qt 3.3.3, Qt 3.3.2,
+Qt 3.3.1 and Qt 3.3.0.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Platforms
+---------
+
+- Qt now supports Mac OS X 10.4 (Tiger)
+
+Compilers
+---------
+
+- Added support for VS 2005
+- Added support for GCC 4
+
+Windows Installer
+-----------------
+
+- The environment variables no longer contain invalid paths.
+- The user is warned if QTDIR is not set and the evaluation edition is
+  already installed, to avoid conflicts between the two packages.
+- A bug was fixed where a '\0' was appended to the end of a path.
+- Fixed the dependencies for image formats and styles.
+
+Qt Designer
+-----------
+
+- Fixed a problem with long string literals on certain Visual Studio
+  C++ compilers.
+- UIC now uses the include hints from the .ui file when generating
+  source files.
+- The "paste" action is now enabled and disabled correctly.
+- QWidgetFactory::supportsWidget() now returns true for QSplitter.
+- Parse files with more than one '.' in the file name correctly.
+- The project name is now displayed correctly also when the project is
+  created in a root directory.
+- Fixed a bug where Windows end-of-line terminators would be included
+  in string literals, which broke translation.
+- Several crashes were fixed related to cutting/copying/pasting menu
+  items.
+- Fixed some problems with designer generating corrupted pro files.
+- A crash was fixed for when designer loads a pro file with the same
+  file listed more than once.
+- The action editor is now closed when there is no main window form.
+- Stability fixes
+
+Qt Linguist
+-----------
+
+- lupdate now understands strings longer than 16384 characters.
+- Fixed escaping bugs for string that contain both ampersands and
+  double quotes.
+
+Qt Assistant
+------------
+
+- When printing, assistant now always uses the Active color group.
+- Fixed a rendering bug for paragraphs that start with a line break.
+- Support for setting the documentation root path, allowing
+  documentation files to be moved.
+- When opening a link in a new window, assistant will now properly
+  scroll to the correct anchor after the window has been shown.
+- Fixed full text search for documents not listed in the 'ref'
+  attribute of the <section> tag in the current .adp file.
+- The state of the forward/backward buttons now work properly when the
+  tabs are changed.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General Fixes
+-------------
+
+Added security patches for zlib: CAN-2005-1849, CAN-2005-2096
+The FreeType library was upgraded from version 2.0.9 to 2.1.9
+
+- Build system
+        Improved build keys for gcc 4 compilers, so plugins no longer
+        need rebuilding after upgrading gcc to a new patch release.
+
+- QCanvas
+        Fixed wrong text scaling and cut-off text.
+        Fixed drawing with a brush when double buffering is enabled.
+
+- QCommonStyle
+        Fixed the appearance of QSlider after setBackgroundOrigin has
+        been called.
+        Fixed an overflow in calculating the handle position for
+        QScrollBar.
+
+- QCString
+        Fixed a crash in qUncompress() if the resulting QByteArray was
+        too large to fit in memory.
+        Fixed potential security problems by using vsnprintf() instead
+        of the less secure vsprintf().
+
+- QDataStream
+        Fixed a data corruption bug when using stream version Qt_3_1 and using
+        operator<<(qint64).
+
+- QDateTime
+        Fixed QDateTime::secsTo() when crossing daylight savings hours
+        boundaries.
+
+- QDockWindow
+        Undocked windows now remember their size also if the user
+        changes it.
+
+- QDom
+        The default constructor for QDocDocument now creates an empty
+        document that can be used to create elements.
+        A warning is now displayed when trying to construct or save an
+        invalid document.
+        Characters that are not allowed in XML are now escaped
+        properly when saving.
+
+- QFileDialog
+        Shortcuts now show the icons of what they point to.
+        Entry sorting is now locale-aware, as opposed to sorting based
+        on Unicode order.
+        You can now select files by pressing 'enter' when using
+        QFileDialog::getOpenFileNames().
+        Fixed a missing repaint in contents preview after selecting a
+        file, then a directory, then the same file again.
+        dirPath() no longer chops off the last directory in a path.
+
+- QGVector
+        Fixed a bug that caused a memory leak and data corruption if
+        resize() failed.
+
+- QHeader
+        The header text is now rendered correctly next to the icon in
+        reverse layout mode.
+
+- QImage
+        Fixed comparison of images with alpha data, but with the alpha
+        channel disabled.
+
+- QKeySequence
+        Key sequences that ended with a ',' now work properly.
+
+- QLineEdit
+        Fixed the behavior of the delete key on the keypad.
+        Fixed support for transparent line edits.
+        Fixed a crash when opening the context menu in a QTextEdit
+        subclass that returns 0 for createPopupMenu().
+
+- QListBox
+        Fixed a crash when removing the current item while selecting
+        items with a rubberband.
+
+- QListView
+        Fixed the behavior of the Home and End keys when QListView
+        contains disabled and hidden items.
+        Fixed a problem with the QListView::...Clicked() signals were
+        emitted also when the root decorated section was not in the
+        left-most column.
+        HTML control characters in QListView's tool tip text are now
+        escaped properly.
+        sortChildren() now also sorts children of items with no
+        siblings.
+        Fixed a missing redraw after removing columns.
+        contentsWidth() now returns the correct value after
+        setContentsWidth() has been called.
+        Fixed a crash after a sequence of deleting and selecting
+        items.
+        Fixed the size of headers with multi-line text.
+        Fixed a lock-up and possible crash caused by an internal state
+        restore on controllers with no children.
+        Fixed keyboard navigation when jumping to entries by pressing
+        the key for the first character in the text of an item.
+
+- QLocale
+        Fixed support for NaN, which failed on certain compilers.
+        Passing Q_LLONG to toString() now properly includes the group
+        symbols.
+        Fixed locale detection when locale environment variables are
+        not set.
+        Added workarounds for compiler optimization bugs when parsing
+        doubles.
+
+- QLocalFS
+        Fixed a crash when canceling a QUrlOperator transfer before
+        completion.
+
+- QMenuData
+        Fixed a crash when closing an MDI application while the menu
+        bar has Alt-focus.
+
+- QMessageBox
+        Message boxes now work correctly in right-to-left mode.
+
+- QPaintDevice
+        Fixed drawing errors when using bitBlt() on a printer.
+
+- QPainter
+        Fixed drawing of rectangles with a negative (or 0) width.
+
+- QPopupMenu
+        The height of new columns is now initialized properly when
+        menu items are shown in multiple columns.
+
+- QProcess
+        Close socket connections properly when a
+        process is created after creating the socket connection.
+
+- QPSPrinter
+        Generate PS font names correctly.
+
+- QPushButton
+        Fixed a crash caused by deleting the button while the popup
+        menu is shown.
+
+- QRichText
+        Tab stops are now adjusted correctly when printing in high
+        resolution mode.
+        Reduced the number of memory allocations when deleting large
+        blocks of text.
+        Fixed parsing of hexadecimal HTML entities
+        Fixed a bug where the font changed after calling setText()
+        repeatedly.
+
+- QScriptEngine
+        Fixed an issue with shaping of Hebrew text, which lead to
+        layout problems in QTextLayout.
+        Fixed rendering of Hebrew text with punctuation.
+        Fixed bugs in Gurmukhi shaping.
+
+- QScrollView
+        Fixed the size hint when scrollbars are set to be permanently
+        on.
+        Fixed a drawing error seen on certain graphics drivers when a
+        scroll view spans multiple screens.
+        Fixed a bug where wheel events' horizontal/vertical status
+        were not forwarded to viewportWheelEvent().
+        Fixed a crash when mouse wheel events were sent to a scroll
+        view with disabled scroll bars.
+
+- QSettings
+        Fixed a bug when comparing keys with common prefixes.
+
+- QSGIStyle
+        Fixed the size of QComboBox.
+
+- QSizeGrip
+        Fixed a bug that caused the window to move when resizing to
+        the minimum size using the size grip.
+
+- QSocketDevice
+        Improved error reporting when the connection is unexpectedly
+        closed.
+        Fixed a bug where the socket would be closed if 0 was passed
+        as maxlen to readBlock().
+
+- QString
+        Fixed a lock-up in QString::section().
+        Let replace() behave as documented when the index is larger
+        than the length of the string.
+
+- QTable
+        Fixed positioning of QComboTableItems that span several rows.
+
+- QTextCodec
+        Fixed occasional crash in fromUnicode().
+        Fixed Big5 support to comply with the standards.
+
+- QTextEdit
+        Fixed bug in undo/redo history when input methods are used.
+        Fixed a crash caused by inserting text with an input method
+        during a focus change.
+        Fixed the behavior of the delete key on the keypad.
+        Fixed setMaxLogLines() when there are already too many lines.
+        Fixed crash when clearing a QTextEdit when the IME is active.
+        Fixed crash when the text edit is deleted while dragging text.
+
+- QTextLayout
+        Fixed layout of lines that are too long and do not contain a
+        possible break point.
+
+- QTimeEdit
+        Fixed several issues with stepUp() and stepDown().
+
+- QToolButton
+        Fixed a crash when assigning a tooltip to a tool button which
+        does not have QMainWindow as an ancestor.
+
+- QToolTip
+        Fixed an occasional crash.
+
+- QTranslator
+        Fixed a bug when calling messages() before tr() when using
+        compressed .qm files.
+
+- QUrlOperator
+        Fixed a crash when accessing invalid paths on an FTP server
+        using QFileDialog.
+        Fixed a bug where the source would be removed if the source
+        and destination were the same.
+
+- QVariant
+        Fixed a memory leak in clear().
+
+- QWidget
+        Fixed excessive flicker when reparenting a widget that has
+        tool windows.
+
+- QWorkspace
+        Fixed flickering when switching between maximized windows.
+        Fixed a lock-up when modal dialogs were created with
+        QWorkspace as parent.
+        Fixed a bug where modeless dialogs with QWorkspace as parent
+        would be drawn with no title bar.
+
+- SQL, DB2 driver
+        Compile fixes.
+        Fixed a bug where QSqlCursor::insert() would fail to insert
+        two blob fields at the same time.
+
+- SQL, MySQL driver
+        Fixed a crash when using empty database names.
+
+- SQL, Oracle driver
+        Fixed truncation of numeric data types to 22 digits.
+        Fixed UTF-8 support by ensuring that there is enough space to
+        store the text.
+
+- SQL, ODBC driver
+        Fixed problems with sorting and comparing strings larger than
+        8192 characters.
+
+- SQl, PostgreSQL driver
+        Temporary tables are now only visible for the connection that
+        created them.
+
+- SQL, TDS driver
+        Fixed problems with compiling the plugin with later versions
+        of the TDS library.
+
+- SVG support
+        Fixed support for SVG viewbox.
+        Added basic support for stroke-dasharray.
+
+
+Platform-Specific Issues
+------------------------
+
+Windows:
+
+- ActiveQt
+        Unrelated types are no longer converted.
+        The control container is now only reset if the CLSID changes.
+        Fixed a bug where QAxObject::clear() did not reset the
+        metaobject when it was cached.
+        Fixed a memory leak.
+        Fixed a bug that caused flicker when navigating away from a
+        page embedding a control.
+        The VARIANT out-parameters in signals now map to "QVariant &"
+        and not "const QVariant &".
+        Signal parameters of type "bool" are marshalled to the bool
+        slot also when the control sends an integer parameter.
+
+- Drag & drop
+        Fixed a bug with sending single-color pixmaps.
+        Fixed a crash caused by reading a drag object after it has
+        been deleted (before the drop event).
+        Dragged pixmaps are now cleaned up before drawn to avoid
+        problems with broken alpha values and resetting masked pixels.
+
+- QApplication
+        Fixed a lockup caused by showing a dialog while resizing a
+        window.
+        QWidget::grabKeyboard() now also grabs the menu button.
+        Fixed a bug where mouse events were sent to the wrong widget
+        after calling QEventLoop::processEvents() with
+        ExcludeUserInput.
+        Windows Server 2003 can now also use the Windows XP style.
+        Fixed a memory leak in QEventLoop.
+
+- QColor
+        Fixed failed initialization of the Qt colors (e.g., Qt::red) when
+        using the MinGW compiler.
+ 
+- QFile
+        Fixed a bug where a read error was not handled properly.
+
+- QFileInfo
+        permission() now uses the correct file name on Windows 9x.
+
+- QFontDataBase
+        Added support for scalable fonts.
+
+- QFontEngine
+        Fixed a problem with symbol fonts.
+        Fixed support for user defined characters.
+
+- QLibrary
+        Fixed the directory separators.
+        Fixed some library loading errors.
+
+- QLocale
+        The locale() function now returns the correct ISO name instead
+        of a number.
+
+- QNPWidget (NPAPI)
+        Fixed a bug where the widget was not clipped properly by the
+        browser.
+
+- QPainter
+        Fixed a bug where QPainter failed to fill ellipses of size
+        2x2.
+        Fixed a potential lock-up after failed GDI allocations.
+
+- QPrinter
+        Rich text tables are now printed correctly when the table
+        spans pages.
+        Fixed text printing errors on page 2 and out caused by the
+        background mode being reset to OPAQUE.
+
+- QProcess
+        The directory separators for the current working directory are
+        now converted properly, so that a UNC path can be used on
+        Windows.
+
+- QTranslator
+        Fixed an issue with isReadable() on NTFS.
+
+- QWindowsXPStyle
+        XP style now works when compiled as a plugin.
+        Fixed menu bar placement.
+        Fixed a bug in setting the background color of QTabWidget.
+        Fixed the position of the size grip in large QSizeGrip
+        widgets.
+        QGroupBox now uses the correct colors.
+
+- QWorkspace
+        Fixed bug where hidden windows would be shown after restoring
+        from maximized mode.
+
+- qmake
+        The Makefile generator now only searches for the latest
+        version of the Qt library, as opposed to searching all
+        libraries.
+        Dependency checking for pre-compiled headers were fixed.
+        Fixed support for listing .pro files in SUBDIRS in subdir .pro
+        files.
+        Fixed support for multiple -L and -I entries in QMAKE_LIBS.
+
+Mac:
+
+- Build system
+        When using Xcode, the optimization level is set to 0 in debug
+        mode.
+        Added support for Xcode 2.1 and up.
+        Fixed copying of target files when DESTDIR is set.
+
+- Drag & drop
+        Fixed a crash when deleting the drag object before dropping.
+
+- QApplication
+        The default font is now only set if the user has not set one.
+        Fixed a problem where popup menus would not go away after
+        releasing the mouse button outside the popup.
+        Added support for dual axis mouse wheels.
+        Fixed a bug in tablet identification.
+        Added support for tablet erasers.
+        Fixed a deadlock in postEvent() when there was contention for
+        a wakeup.
+        Fixed a crash when switching displays at the same time as
+        QApplication is destroyed.
+        Stability fixes.
+
+- QColorDialog
+        Fixed modality support.
+
+- QFileDialog
+        Let the file dialog remember the previous directory.
+        Fixed keyboard navigation when jumping to entries using the
+        first letter of a file name.
+        Fixed a memory leak.
+
+- QFontDatabase
+        Fall back to the "Geneva" font, which is guaranteed to be
+        available, instead of "Helvetica".
+
+- QFontEngine
+        Fixed a memory leak.
+        Fixed rendering of glyphs that modify previous glyphs,
+        including Indic text.
+
+- QMacStyle
+        Title bars are now shown as deactivated when the window is
+        deactivated.
+        Fixed a bug where buttons in button groups inside a container
+        would look like they were pressed.
+        Fixed a crash caused by drawing onto a non-pixmap background.
+        Fixed the width of QComboBox.
+        Improved drawing of size grips.
+        Improved drawing of sliders, and made QSlider slightly wider
+        by default.
+
+- QMenuBar
+        Fixed a lockup caused by menu items ending with an '&'.
+        Menu items with disabled popups are now also disabled.
+
+- QMessageBox
+        The resize handle is now shown.
+
+- QPainter
+        Fixed double transformation of ellipses with a transformed
+        width or height of 1.
+
+- QPixmap
+        Fixed a crash when loading a cursor from an embedded image.
+        The color depth is now set properly when converting a QBitmap.
+
+- QPrinter
+        Fixed a crash when using bitBlt() to copy a QBitmap onto a
+        printer.
+
+- QProcess
+        Fixed support for launching bundles.
+
+- QPushButton
+        Icons are now drawn properly.
+
+- QTextBrowser
+        Fixed a bug where a text browser popup triggered by a
+        hyperlink would pop up again when the user clicks inside the
+        first popup.
+
+- QToolButton
+        Fixed a painting problem when the button was pressed.
+
+- QWidget
+        Menubar popups no longer steal focus from QTextEdit.
+        Fixed collapsing of windows with no title bar decorations.
+        Several window activation bugs have been fixed.
+        Fixed a bug where modal dialogs would be modal to its own
+        children.
+        Fixed tablet support for multiple screens.
+        Fixed a memory leak.
+
+X11:
+
+- Build system
+        Removed aliasing/redefinitions of the 'which' command to fix
+        failures in the configure script on certain Unix systems.
+        Added some missing flags for the yacc tool on 64-bit Linux.
+        The -fn application command line option, which selects the
+        default application font, works again.
+        Fixed copying of target files when DESTDIR is set.
+
+- Drag and drop
+        Fixed a crash in the dragging application when the drop target
+        crashes.
+        Fixed a bug in finding the widget under the cursor while
+        dragging.
+        Some problems were fixed with the internal timestamp in the
+        drop event.
+
+- OpenGL
+        Fixed colors when rendering using glColor() onto an 8 bit
+        pixmap.
+
+- QApplication
+        Support the F11 and F12 keys on Sun keyboards.
+
+- QCanvasView
+        Support multiple shared views of a single canvas on multiple X11
+        screens.
+
+- QClipboard
+        Fixed a rare crash related to cut & paste with the Motif
+        extension.
+
+- QFontDatabase
+        Fixed a bug where QFontInfo would return an empty family and
+        point size after trying to select a font that was not
+        installed on the system.
+
+- QFontEngine
+        Fixed a bug where scaling italic fonts would sometimes cut
+        overhangs.
+
+- QInputContext
+        Fixed a bug that led to a corrupted display in QLineEdit and
+        QTextEdit when using Japanese input methods with very long
+        input selections.
+
+- QPainter
+        Fixed a crash when setting a pen on an inactive painter.
+
+- QPrinter
+        Fixed printing on Tru64 by removing the -o argument to the lp
+        command.
+
+- QScriptEngine
+        Added support for Khmer fonts.
+        Fixed shaping of Telugu text.
+        Fixed a crash when scaling Japanese XLFD fonts by a factor of
+        1000.
+
+Embedded:
+
+- QApplication
+        Fixed a memory leak.
+
+- VNC driver
+        Fixed a memory leak.
+
+- QWidget
+        Fixed a potential crash when reparenting widgets.
diff --git a/dist/changes-3.3.6 b/dist/changes-3.3.6
new file mode 100644
index 0000000000..d9464ed2ea
--- /dev/null
+++ b/dist/changes-3.3.6
@@ -0,0 +1,27 @@
+Qt 3.3.6 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.3.5, 3.3.4, Qt 3.3.3, Qt 3.3.2,
+Qt 3.3.1 and Qt 3.3.0.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Platforms
+---------
+
+- It is now possible to build Qt 3.3.6 on Intel Macs. A universal
+  Qt build however requires manual work by 'lipo'-ing a PPC Qt
+  and an Intel Qt together.
+
+Compilers
+---------
+
+- The build key when building Qt with gcc 4.x has changed. This means
+  you will have to either recompile your plugins or change the configure
+  script to not reduce the gcc version string to '4'.
+
+
+Translations
+------------
+
+Various Qt translations contributed by Novell.
diff --git a/dist/changes-3.3.7 b/dist/changes-3.3.7
new file mode 100644
index 0000000000..f95bf0c726
--- /dev/null
+++ b/dist/changes-3.3.7
@@ -0,0 +1,12 @@
+Qt 3.3.7 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.3.6, 3.3.5, 3.3.4, Qt 3.3.3,
+Qt 3.3.2, Qt 3.3.1 and Qt 3.3.0.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+- QImage
+        Fixed a potential security issue which could arise when transforming
+        images from untrusted sources.
+
diff --git a/dist/changes-3.3.8 b/dist/changes-3.3.8
new file mode 100644
index 0000000000..540d63615d
--- /dev/null
+++ b/dist/changes-3.3.8
@@ -0,0 +1,273 @@
+Qt 3.3.8 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 3.3.7, Qt 3.3.6, Qt 3.3.5, 3.3.4, Qt 3.3.3,
+Qt 3.3.2, Qt 3.3.1 and Qt 3.3.0.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Platforms
+---------
+
+- Oracle driver now builds on HP-UX
+
+Compilers
+---------
+
+Linguist
+--------
+
+- Fixed a bug where the translation area was not changed when the context was changed.
+
+Assistant
+---------
+
+- Fixed command line parsing when specifying the docPath option.
+
+Translations
+------------
+
+- Added support for Catalan.
+
+Third party components
+----------------------
+
+- libpng
+
+  * Security fix (CVE-2006-3334): Buffer overflow allows context-dependent
+    attackers to cause a denial of service and possibly execute arbitrary
+    code via unspecified vectors related to chunk error processing.
+
+  * Security fix (CVE-2006-5793): The sPLT chunk handling code
+    uses a sizeof operator on the wrong data type, which allows
+    context-dependent attackers to cause a denial of service (crash)
+    via malformed sPLT chunks that trigger an out-of-bounds read.
+
+  * Security fix: Avoid profile larger than iCCP chunk.
+    One might crash a decoder by putting a larger profile inside the
+    iCCP profile than is actually expected.
+
+  * Security fix: NULL pointer dereference.
+
+  * Disabled MMX assembler code for Intel-Mac platforms to work
+    around a compiler bug.
+
+  * Disabled MMX assembler code for x86_64 platforms.
+
+- freetype
+
+  * Security fix (CVE-2006-0747): Integer underflow allows remote
+    attackers to cause a denial of service (crash) via a font file
+    with an odd number of blue values, which causes the underflow
+    when decrementing by 2 in a context that assumes an even number
+    of values. 
+
+  * Security fix (CVE-2006-1861): Multiple integer overflows allow
+    remote attackers to cause a denial of service (crash) and possibly
+    execute arbitrary code.
+
+  * Security fix (CVE-2006-2661): A null dereference flaw allows
+    remote attackers to cause a denial of service (crash) via a
+    specially crafted font file.
+
+  * Fixed memory leak.
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General Fixes
+-------------
+
+- QAccessible
+        Fixed a potential crash when a key object is destroyed.
+
+- QApplication
+        argc() no longer returns 1 if 0 was passed as argc to the constructor.
+
+- QDateTime
+        Made QDateTime::fromString(QString(), Qt::TextDate) work with locales
+        that have two-digit day names (e.g. Di 16. Jan).
+
+- QDns
+        Stability fixes for networks with missing DNS settings.
+
+- QFileDialog
+        Ensured that files are not accidentally replaced or lost during drag 
+        and drop operations.
+
+- QFtp
+        Fixed a crash when uploading data from a closed QIODevice.
+        Fixed a potential crash when a FTP session gets deleted in a slot.
+	
+- QGLWidget
+        renderText() no longer tries to convert the text passed in to
+        a local 8 bit encoding (via local8Bit()). latin1() is used instead.
+
+- QGridLayout
+        Fixed incorrect minimum size with rich text labels in grid layouts.
+
+- QHttp
+        Fixed an overflow that could occur when chunked downloading caused
+        erroneous allocations.
+
+- QListBox
+        Fixed a potential crash that could occur if a list box is deleted in
+        a slot connected to the returnPressed() signal.
+
+- QListView
+        Set internal startDragItem pointer to 0 in clear(). This can prevent
+        crashes during drag and drop operations.
+        Fixed a documentation error in setSelectable.
+        Fixed regression in activation of leaf-nodes of type QCheckBoxController.
+
+- QTable
+        Fixed a memory leak when F2 is pressed in an empty table.
+        Ensured that the focus rectangle is painted correctly.
+        Ensured that editors in cells spanning multiple rows or columns are
+        closed correctly.
+	
+- QTextEdit
+        setDocument() no longer crashes when 0 is passed as an argument.
+        Fixed rendering of HTML tables with a fixed pixel width.
+        Fixed a potential crash when using undo/redo functionality.
+        Fixed a regression when searching for space using QTextEdit::find().
+
+- SQL plugins
+        Ensured that mysql_server_end() is only called once in the MySQL plugin.
+        Fixed fetching of strings larger than 255 characters from a
+        Sybase server through ODBC.
+        Ensured that milliseconds are not stripped from ODBC time values.
+
+- QWidget
+        Fixed an issue where adjustSize() would incorrectly take the size of
+        top-level widgets into account.
+
+
+Platform-Specific Issues
+------------------------
+
+Windows:
+
+- QAxServer
+        Fixed a regression in how the server registers type libraries.
+
+- Visual Studio 2005
+        Fixed compilation issue with the x64 compiler.
+        Fixed the behavior of qmake when executed with "qmake -tp vc".
+
+- QFont
+        Fixed crash that would occur when creating a font from an invalid string.
+        Fixed metric problems.
+
+- Fixed possible infinite loop when drawing text.
+	
+- Fixed an issue where flags specified by QMAKE_LFLAGS_RELEASE would not be
+  included in generated Visual Studio project files.
+	
+- Fixed issue that caused wizards to use the wrong class in the QMsDev plugin
+
+- Fixed an unexpected remote close in QSocket for Windows servers with a high
+  load.
+
+- Fixed crash in QFileDialog.
+
+- Fixed a regression in QWindowsXPStyle where tab widget backgrounds were
+  incorrectly propagated into child scroll views.
+  
+- Fixed issues related to using SJIS TextCodec with QSettings.
+
+- Fixed issue where a fixed size widget could change size after changing screen
+  resolution.
+
+- Fixed support for the Khmer writing system.
+
+
+Mac OS X:
+
+- Made the endian preprocessor define dependent on the architecture. This means
+  that it is possible to build a universal Qt library on one machine. However,
+  qmake_image_collection.cpp is still dependent upon the machine it was
+  generated on.
+
+- QComboBox
+        Fixed an issue where the popup would stay open after the window had
+        been minimized.
+  
+- QFont
+        Fixed support for QFont::setStretch().
+
+- QMacStyle
+        Fixed centering of items in large comboboxes.
+        Fixed editable comboboxes so that they don't truncate text.
+        Added support for Panther-style tabs for tabs on the bottom of a tab
+        widget.
+
+- QPrinter
+        Fixed Intel endian bug in printing of pixmaps with a mask/alpha
+        channel.
+        Fixed regression where active tool windows would always be disabled
+
+- QGLContext
+        Fixed a tearing issue caused by incorrect vertical sync.
+
+- Fixed a rendering issue with transparent cursors on Intel macs.
+
+- Fixed a rendering issue with icons in the dock on Intel macs.
+
+- Fixed a crash when playing back a file that does not exist.
+
+- Fixed a regression where full keyboard access was not being honored.
+
+- Fixed a regression preventing static file dialogs from being opened in a
+  contextMenuEvent() handler.
+ 
+- Fixed a regression in navigating nested popup menus.
+
+
+X11:
+
+- Fixed rendering of Japanese text with XLFD fonts.
+
+- Fixed rendering of text with stacking diacritics.
+
+- Rendering fixes for Indic scripts.
+
+- Fixed problem with applications hanging while querying the clipboard. This is
+  related to the KDE bug reported at http://bugs.kde.org/show_bug.cgi?id=80072.
+
+- Fixed a crash that could occur when Qt uses a DirectColor visual.
+
+- Fixed a rare crash in QPixmap::convertToImage() when XGetImage() fails.
+
+- Fixed issue where events were not being processed by Qt when using the Qt
+  Motif Extension.
+
+- The X input method language status window is no longer shown for popup menus
+  on Solaris.
+
+- Fixed incorrect use of colors when painting on the default (TrueColor) screen
+  when running a Qt application on a multi-screen display where the default
+  screen uses a TrueColor visual and the secondary screen a PseudoColor visual.
+
+- Fixed a bug where calling newPage() directly before destroying the QPrinter
+  caused the last page to be printed twice.
+
+- Fixed a bug on older Unix systems where incorrect font sizes could get used
+  when printing in HighResolution mode.
+
+- Fixed a crash when trying to load huge font files.
+
+- Ensured that fonts containing a '-' in the family name are correctly loaded.
+
+- Ensured that the QFont::NoAntialias flag is always honored.
+
+- Fixed incorrect shaping of some character combinations when writing Bengali.
+
+- Introduced workaround for some Arabic fonts with broken OpenType tables.
+
+- Fixed a bug where the wrong braces would get used when using the Hebrew Culmus
+  fonts.
+
+- Fixed crash in qtconfig when removing or shifting font substitution families.
diff --git a/dist/changes-4.0.1 b/dist/changes-4.0.1
new file mode 100644
index 0000000000..f08aac6e43
--- /dev/null
+++ b/dist/changes-4.0.1
@@ -0,0 +1,786 @@
+****************************************************************************
+*                          Important Notices                               *
+****************************************************************************
+
+Meta-Object System
+------------------
+
+Qt 4.0.0 introduced a change to the way type names outside the current
+scope were handled in signals and slots declarations and connections
+which differed from the behavior in Qt 3.x.
+
+Unfortunately, this could lead to signal-slot connections that were
+potentially type-unsafe. Therefore, in Qt 4.0.1 type names must be fully
+qualified in signal-slot declarations and connections.
+
+For example, in Qt 4.0.0, it was possible to write:
+
+    connect(socket, SIGNAL(error(SocketError)), ...);
+
+In Qt 4.0.1, the above connection must be made in the following way:
+
+    connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), ...);
+
+
+Library
+-------
+
+Support for SGI Altix has been added for both gcc and Intel icc.
+
+
+QX11EmbedContainer and QX11EmbedWidget are now exported classes.
+
+This change only affects developers using Qt/X11 with gcc >= 4.0 and
+symbol visibility enabled. Applications built against Qt 4.0.1 that
+use these classes cannot be linked against Qt 4.0.0.
+
+
+****************************************************************************
+*                                Changes                                   *
+****************************************************************************
+
+Qt Designer
+-----------
+
+Fixed crash in designer when using fonts in custom widgets that
+don't have a point size set but use a pixel size instead.
+
+Fixed initial positions of the form windows in the MDI mode.
+
+Ensured that the object inspector is updated when a page is added
+to a widget stack.
+
+Ensured that the SDK is installed and the library symbols are
+exported.
+
+Fixed crash when breaking a layout after deleting all widgets within.
+
+Fixed handling of nested action groups.
+
+Fixed mouse handling to match user expectations on different
+platforms.
+
+Don't change system setting for double click interval.
+
+Disabled the richtext editor for the "statusTip" property.
+
+Improved widget handling, loading and saving for QFrame, QTabWidget,
+and Q3GroupBox.
+
+Added a platform-neutral mechanism for saving key sequences.
+
+Used Qt's list of supported image formats rather than an incomplete
+static list.
+
+Provided a way for plugins to access to the layout of container
+widgets.
+
+Added support for editable byte arrays.
+
+
+Qt Linguist
+-----------
+
+Made lupdate handle cases where the compiler converts strings using
+a different codec to that used by lupdate.
+
+Fixed bug in lupdate and lrelease's .pro file parser.
+
+Fixed lupdate's octal sequence handling.
+
+Fixed duplicate context when two contexts have the same hash value.
+
+
+Qt 3 to 4 Porting Tool
+----------------------
+
+Fixed connnect statement that did not work with the new stricter moc.
+
+Fixed incorrect porting of enum values in switch statements.
+
+Fixed header file name replacements in include directives.
+
+
+Meta Object Compiler (moc)
+--------------------------
+
+Fixed VC6 compilation of moc generated code with namespaced
+superclasses.
+
+Fixed parsing of functions that throw exceptions.
+
+Fixed compilation of moc generated code with VC6 when inheriting
+from classes inside namespaces.
+
+Improved the efficiency of signals with default arguments.
+
+
+Qt Assistant
+------------
+
+Fixed the document list for full text search indexing.
+
+Fixed case sensitive completion in the find dialog combobox.
+
+Re-enabled the "add content file" option.
+
+Removed the "General" tab in the settings dialog.
+
+Fixed registry key handling and deletion of cache files.
+
+Made it possible to read titles in the tabs in assistant.
+
+Updated the QAssistantClient documentation.
+
+Added the QtAssistantClient headers to the other library headers
+for installation.
+
+Fixed full text search for phrases.
+
+
+General Fixes
+-------------
+
+- Dialogs
+        Removed hard-coded margin and spacing values from built-in
+        dialogs.
+
+- QAbstractItemModel
+        Fixed crash caused by removing an item with expanded children.
+        Added some more see also links and defined QModelIndexList.
+
+- QAbstractItemView
+        Fixed rendering and selection issues with MultiSelection
+        mode.
+        Improved handling of persistent editors.
+        Improved performance of item insertion.
+        Improved signal handling and emission.
+
+- QAbstractSlider
+        Ensured that no changes occur if the orientation doesn't
+        change in a call to setOrientation().
+        Introduced better keyboard control for sliders.
+        Fixed sliderPressed() and sliderReleased() signal emissions.
+
+- QAbstractSocket
+        Fixed race condition in connectToHost().
+        Made bytesAvailable() return the unget buffer size as well
+        as the size of any pending data.
+        Made NetworkLayerProtocol non-internal.
+
+- QAbstractSpinBox
+        Fixed problems with locale and the "." and "," separators.
+        Improved handling of extra whitespace at the beginning and
+        end of user input.
+
+- QApplication
+        Made closeAllWindows() respect windows that reject the close
+        event.
+        Fixed crash caused by calling QApplication::setStyle()
+        before a qApp was created.
+        Improved handling of the last open window for most cases.
+        Improved event handling.
+
+- QBezier
+        Used a new algorithm for offsetting curves.
+        Improved performance by using a more sophisticated
+        algorithm and by making QBezier a POD type.
+
+- QBrush
+        Improved radial gradient rendering.
+
+- QColorDialog
+        Process the return key correctly.
+
+- QComboBox
+        Fixed behaviour of setMaxItems() to enable new items to be
+        inserted within the range allowed.
+
+- QCommonStyle
+        Ensured that mnemonics are always shown for buttons.
+        Fixed position of right corner widget when used on its own.
+
+- QDateTimeEdit
+        Improved the range of input allowed for numbers.
+
+- QDial
+        Fixed valueChanged() signal emission.
+
+- QDialog
+        Fixed Lower QSizeGrip in QDialog instead of raising it.
+
+- QDir
+        Fixed relative path handling on Windows.
+        Reverted empty string matching behavior to match Qt 3's
+        behavior.
+        Restored API compatibility with Qt 3.
+
+- QDirModel
+        Fixed accidental deletion of directories in read-only mode.
+
+- QDockWidget
+        Ensured that the size of a floating dock widget is the same
+        regardless of how it was floated.
+        Reintroduced double-clicking behavior to float a dock
+        widget.
+        Fixed incorrect moving behavior for floating widgets.
+        Ensured that dock widgets display a close icon only if they
+        can be closed.
+
+- QDockWidgetLayout
+        See QMainWindow.
+
+- QDomNodeList
+        Fixed handling of out-of-range items.
+
+- QDoubleSpinBox
+        Improved decimals handling and rounding behavior in
+        QDoubleSpinBox.
+
+- QFile
+        Fixed problems with carriage return and line feed handling
+        in readLine().
+        Ensured that pos() returns the correct value if the file
+        shrinks.
+
+- QFileDialog
+        Fixed incorrect behavior where the dialog would go to the
+        root directory if the user tried to enter a non-existent
+        directory.
+        Fixed sorting by type behavior.
+
+- QFontDatabase
+        Fixed loading of special fonts.
+        Fixed sample characters for Chinese scripts.
+
+- QFontDialog
+        Switched the locations of the OK and Cancel buttons.
+        Made items in the font dialog read-only.
+        Improved handling of the OK and Cancel buttons when the
+        dialog is in reverse layout mode.
+
+- QGifHandler
+        Reintroduced GIF plugin support.
+
+- QGridLayout
+        Improved default size handling.
+
+- QHeaderView
+        Fixed section hiding behavior.
+        Fixed Out of bounds error and improper calculation of last
+        column.
+        Improved mouse handling and widget updating.
+        Fixed crashes caused by moving or removing sections, or by
+        updating the current section.
+        Improved signal behavior for resized or removed sections.
+
+- QHttp
+        Fixed proxy authentication.
+        Fixed broken behavior when scheduling many requests to
+        different hosts.
+        Fixed socket object ownership issues with setSocket() that
+        could lead to a crash.
+
+- QImage
+        Fixed smooth scaling for image formats other than RGB and
+        ARGB32.
+
+- QImageReader
+        Fixed the default implementation of imageCount() to return a
+        valid number of images.
+
+- QInputDialog
+        Switched the locations of the OK and Cancel buttons.
+
+- QIODevice
+        Fixed problems with carriage return and line feed handling
+        in readLine().
+        Made bytesAvailable() return the unget buffer size as well
+        as the size of any pending data.
+        Fixed error handling when reading lines with QFile.
+        Fixed seek() behavior with regard to the unget buffer.
+
+- QItemDelegate
+        Improved layout handling, redrawing, signal emission,
+        and mouse click behavior.
+
+- QKeySequence
+        Fixed accidental HTML escaping of ampersands.
+
+- QLayout
+        Print out object names in warnings.
+
+- QLineEdit
+        Enabled textChanged() signal emission when using input
+        methods.
+        Improved return key press handling for users of the
+        returnPressed() signal.
+        Fixed context menu action handling.
+        Fixed editingFinished() signal emission behavior.
+        Fixed Ctrl-K and Ctrl-U behavior to cut text rather than
+        just deleting it.
+        Fixed line edit selection behavior to maintain any current
+        selection when the widget receives the keyboard focus.
+
+- QListView
+        Improved handling of hidden rows.
+        Fixed rendering when used in reverse mode.
+
+- QListWidget
+        Fixed the size policy for laying out items in the list.
+        Improved sorting performance.
+        Fixed persistent index handling when sorting.
+
+- QMainWindow
+        Fixed problems with multiple connections from QMainWindow
+        signals to QToolBar slots.
+        Fixed dock widget handling (adding a widget to all dock
+        areas) and incorrect dock area splitting behavior that
+        could lead to crashes in QMainWindow.
+        Made QMainWindow's status bar have an "Ignored" horizontal
+        size policy.
+
+- QMetaObject
+        Fixed meta objects that reported far too many enums.
+        Fixed the behavior of sender() to return the correct value
+        during queued activation.
+
+- QMetaType
+        Fixed whitespace handling in template specialization.
+        Fixed missing qt_metatype_id implementation for <void *>.
+        Added more support for compilation with QT_NO_DATASTREAM.
+
+- QMenu
+        Fixed keyboard navigation when mouse navigation is also
+        being used.
+        Fixed menu bar merging behavior.
+
+- QMenuBar
+        Fixed Alt key navigation.
+
+- QObject
+        Fixed incorrect exception handling.
+
+- QPaintEngine
+        Suppressed warnings when drawing "empty" text.
+        Fixed rendering of Underline, Overline, and StrikeOut for
+        text drawn using outlines.
+
+- QPainter
+        Improved handling of clip regions when restore() is called.
+        Improved text drawing performance.
+
+- QPaintDevice
+        Allowed construction of QImage before QApplication.
+
+- QPainterPath
+        Improved performance and rendering accuracy.
+
+- QPen
+        Fixed missing detach in setWidth().
+
+- QPixmap
+        Improved drawing speed and mask handling.
+
+- QPlastiqueStyle
+        Improved visual feedback for scrollbar page buttons and
+        slider handle.
+        Improved Plastique style on non-XRender-enabled displays.
+
+- QProcess
+        Fixed endless loop of signal being emitted if model dialog
+        is used in slot.
+        Made bytesAvailable() return the unget buffer size as well
+        as the size of any pending data.
+
+- QProxyModel
+        Improved signal handling for propagated signals.
+
+- QResource
+        Fixed Latin-1 string handling.
+        Fixed unloading of resources.
+
+- QScrollArea
+        Fixed widget resizing so that widgets that are smaller than
+        the viewport remain visible.
+
+- QSettings
+        Made it possible to store QImage/QPixmap settings.
+        Fixed race conditions in QSettings with INI files.
+        Improved handling of non-terminated strings in INI files.
+
+- QSizeGrip
+        Made the Qt 3-style constructor public.
+
+- QSpinBox
+        Fixed problems with out-of-range integers and doubles.
+
+- QSqlQueryModel
+        Fixed integration between QSqlTableModel and MS Access.
+        Fixed signal emissions for tables with only one row.
+
+- QSqlTableModel
+        Fixed problems with multiple record insertion.
+
+- QStatusBar
+        Fixed status bar height without size grip.
+
+- QTabBar
+        Fixed handling of the current page index when adding the
+        first page to QTabWidget.
+        Improved tab bar icon handling to enable icons to be updated
+        without redrawing the entire tab bar.
+
+- QTableView
+        Improved text cursor handling and support for keyboard
+        modifiers.
+        Fixed problems with disappearing headers.
+        Disallowed selection of hidden rows and columns.
+        Fixed crashes involving empty models and tables with headers
+        but no rows or columns.
+
+- QTableWidget
+        Improved sorting and signal emission behavior.
+
+- QTabWidget
+        Fixed handling of the current widget to keep the tab bar
+        updated.
+
+- QTextBrowser
+        Removed temporary visible text selection when activating
+        anchors with Shift-click.
+
+- QTextCursor
+        Fixed selection behavior for words at the beginning of lines.
+        Fixed incorrect use of character formats when calling
+        insertFragment().
+        Fixed incorrect text insertion where line feeds and carriage
+        returns would not be transformed into Unicode block
+        separators.
+
+- QTextDocument
+        Added support for page breaking.
+        Added support for relative font sizes.
+        Added support for <hr /> tags.
+        Fixed clipboard handling and drag and drop of text frames.
+        Fixed handling of closing HTML </center> tags.
+        Fixed crash (failing assertion) on import of nested empty
+        HTML tables.
+        Fixed data corruption in fromPlainText().
+        Corrected the handling of image tags inside anchors.
+        Fixed introduction of empty spaces or lines before and after
+        tables.
+        Fixed misrendering of some nested HTML tables with variable
+        sized columns.
+        Fixed crash in table drawing due to out-of-bounds access.
+        Added support for the pageCountChanged() signal.
+        Improved performance and size of PostScript images when
+        printing high resolution or scaled images.
+
+- QTextEdit
+        Improved layout and selection handling.
+        Added configuration support for non-blinking cursors.
+        Improved keyboard handling.
+        Improved text insertion handling.
+
+- QTextFormat
+        Added support for horizontal rules.
+        Improved font handling.
+
+- QTextLayout
+        Allow line breaking at tabs.
+        Improved reporting of line widths for lines ending with a
+        QChar::LineSeparator.
+        Fixed reporting of the minimum width for layouts that have
+        NoWrap/ManualWrap as their wrap policy.
+
+- QTextStream
+        Fixed locking behavior when reading from stdin.
+        Fixed seek() behavior.
+        Improved Latin-1 string handling.
+
+- QTextTable
+        Improved performance and selection handling.
+
+- QToolBar
+        Fixed toolbar resizing behavior to handle icon size changes.
+
+- QTreeView
+        Improved handling of hidden rows, columns, and child items.
+        Fixed repainting issues with newly inserted child items
+        and selections.
+        Improved scrolling behavior.
+        Fixed crashes involving column handling and empty views.
+        Fixed sorting indicator behavior.
+
+- QTreeWidget
+        Improved item insertion performance.
+        Fixed clone() and operator=() for QTreeWidgetItem.
+        Fixed crash when removing or deleting items with children.
+        Improved sorting performance.
+        Fixed sorting indicator behavior.
+        Fixed persistent index handling when sorting.
+
+- QUrl
+        Improved the performance of removeDots().
+
+- QWidget
+        Fixed problems with adding an action multiple times.
+
+- QXmlInputSource
+        Improved heuristics for determining character encodings.
+
+- Q3FileDialog
+        Fixed file selection handling.
+
+
+Platform-Specific Issues
+------------------------
+
+Windows:
+
+- QApplication
+        Fixed Block modeless elements of client when ActiveX opens a
+        modal dialog
+        Enabled tablet support.
+        Improved event handling for popup widgets.
+
+- QAxWidget
+        Support a document site only if the COM object allows proper
+        initialization with a storage.
+
+- QFileDialog
+        Updated to use the latest native Windows dialogs.
+
+- QProcess
+        Fixed behavior of forwarded read channels.
+
+- QSettings
+        Fixed behavior of childKeys() with respect to the default
+        key.
+
+- QWindowsStyle
+        Fixed menu item size.
+        Improved drawing of default push buttons.
+        Fixed rendering of sliders to correctly differentiate
+        between those in enabled and disabled states.
+
+- QWindowsXPStyle
+        Fixed menu frame rendering.
+        Reduced the space allocate to menu items.
+
+
+X11:
+
+- QApplication
+        Fixed incorrect initialization of screen and resolution.
+        Improved mouse button handling.
+        Fixed handling of withdrawn windows.
+
+- QBitmap
+        Fixed bitmap brush textures to ensure that they use the
+        correct color with XRender.
+
+- QFont
+        Fixed handle() to return useful values.
+
+- QFontDatabase
+        Fixed fonts for some writing systems not being loaded on X11
+
+- QPaintEngine
+        Fixed multi-screen support.
+        Improved performance and rendering accuracy.
+        Fixed dot-dash patterns when drawing with large pen widths.
+        Improved text rendering on exported displays.
+
+- QWidget
+        Implemented support for window opacity.
+        Added support for widgets with 32 bit sizes.
+        Improved support for different active and inactive background
+        brushes.
+        Fixed window icons on X servers that have truecolor and
+        pseudocolor visuals with different depths.
+        Fixed text rendering on exported displays.
+
+- QXIMInputContext
+        Fixed crash in XIM code with newer x.org libraries.
+        Fixed support for switching input method styles.
+
+- QX11Embed
+        Exported QX11Embed (see the Important Changes section
+        above).
+        Improved handling of non-XEmbed clients.
+        Improved geometry and focus handling.
+
+
+UNIX:
+
+- QPageSetupDialog
+        Reduced the size of the dialog.
+
+- QPrintDialog
+        Fixed initialization of color and grayscale radio buttons.
+
+- QProcess
+        Fixed incorrect notification of process termination on
+        Linux kernels up to and including the 2.4 series.
+        Made QProcess emit an error() when failing to launch a
+        program.
+
+
+Mac OS X:
+
+- QApplication
+        Fixed widgetAt() to handle transparent widgets.
+        Handle keyboard events in the active window if no focus
+        window is available.
+        Changed wheel mouse scrolling speed to match that of
+        other applications.
+
+- QComboBox
+        Fixed rendering of combobox frames.
+
+- QDnD
+        Fixed URL handling.
+
+- QClipboard
+        Fixed Junk at end of pasted text on Qt/Mac.
+
+- QCursor
+        Fixed incorrect pixmap handling.
+
+- QFileDialog
+        Fixed sheet modality issues to prevent the dialog from being
+        hidden behind other windows.
+
+- QFont
+        Default to using the Geneva font.
+        Enable kerning and fix Arabic text handling.
+
+- QLibraryInfo
+        Fixed location of qt.conf in Mac OS X bundles.
+
+- QMacStyle
+        Improvements to rendering accuracy of comboboxes, tab bars,
+        workspace windows, tool buttons, and push buttons.
+        Fixed incorrect drawing of scrollbars with "inverted
+        appearance".
+        Fixed font-related crash for applications configured to
+        use the standard desktop settings.
+
+- QMenu
+        Improved menu bar handling on navigation dialogs.
+
+- QMenuBar
+        Improved menu bar hiding/wrapping behavior.
+
+- QPaintDevice
+        Removed byte order assumptions.
+
+- QPaintEngine
+        Improved brush handling, clipping, masking, and tiling
+        operations.
+
+- QPixmap
+        Improvements to pixmap copying and conversion, masking, and
+        alpha channel handling.
+        Removed byte order assumptions.
+
+- QPrintEngine
+        Made color printing the default behavior.
+
+- QSettings
+        Sync the application's setting on construction of a
+        QSettings object.
+
+- QSysInfo
+        Included enum values for Mac OS X codenames in the
+        MacVersion version enum.
+
+- QWidget
+        Improved mouse event handling.
+        Improved interoperability between modal widgets.
+
+
+Tools
+-----
+
+- uic3
+        Fixed class name handling when used in "-convert" mode.
+        Fixed vertical space issues with .ui files converted from
+        Qt 3 to Qt 4.
+        Improved support for Qt3Support widgets.
+        Improved support for deprecated enums.
+        Added a generator for dependencies in Qt 3 .ui files.
+
+- rcc
+        Added better error reporting.
+
+- uic
+        Added code generation for tab attributes.
+        Fixed text codec handling.
+        Used UTF-8 as the default enconding in .ui files.
+        Fixed code generation for QWizard.
+
+
+Documentation
+-------------
+
+Porting:
+
+Removed QMovie from the list of implicitly shared classes that were
+previously explicitly shared.
+
+Added .ui porting document to the 4.0.1 documentation.
+
+Added sections about QHBox, QVBox, and QGrid to the porting guide.
+
+Added QImageIO and QMovie to the porting guide.
+
+Added QRegExp and some QDir functions to the porting guide.
+
+Added QObject::objectTrees() to the porting guide.
+
+Added QPopupMenu to the porting guide.
+
+
+General:
+
+Fix documentation of amortized container behavior.
+
+Added information about using specific compilers to build Qt.
+
+Removed QtMotif documentation because it is now part of Qt Solutions.
+
+Clarify parent-child relationship within QThreads.
+
+Documented potential file name clashes when using precompiled headers.
+
+Added a Windows XP gallery.
+
+Added pages to contain lists of classes for each Commercial Edition.
+
+Reintroduced the QAssistantClient documentation as part of the
+QtAssistant module.
+
+Added missing Qt Designer API documentation.
+
+- QApplication
+        Documented correct use of QApplication::setStyle().
+
+- QComboBox
+        Made removeItem() and setRootModelIndex() visible in the
+        documentation.
+
+- QMetaObject
+        Added missing documentation for QGenericArgument and
+        QGenericReturnArgument, making them visible in the
+        documentation, but not recommended for casual use.
+
+- QPainter
+        Make QPainter::setRedirected() visible and fix its
+        description.
+
+- QSqlDatabase
+        Document what happens when passing an existing connection
+        name to addDatabase().
diff --git a/dist/changes-4.1.0 b/dist/changes-4.1.0
new file mode 100644
index 0000000000..396a5b7dc4
--- /dev/null
+++ b/dist/changes-4.1.0
@@ -0,0 +1,573 @@
+Qt 4.1 introduces many new features as well as many improvements and
+bugfixes over the 4.0.x series. For more details, see the online
+documentation which is included in this distribution. The
+documentation is also available at http://doc.trolltech.com/
+
+The Qt version 4.1 series is binary compatible with the 4.0.x series.
+Applications compiled for 4.0 will continue to run with 4.1.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Qt library
+----------
+
+- Introduced widget backing store support, allowing semi-transparent
+  (alpha-blended) child widgets and faster widget painting, as well
+  as solving long-lasting issues with non-rectangular widgets.
+
+- Integrated support for rendering Scalable Vector Graphics (SVG)
+  drawings and animations (QtSvg module).
+
+- A Portable Document Format (PDF) backend for Qt's printing system.
+
+- A unit testing framework for Qt applications and libraries.
+
+- Modules for extending Qt Designer and dynamic user interface
+  building.
+
+- Additional features for developers using OpenGL, such as support
+  for pixel and sample buffers.
+
+- A flexible syntax highlighting class based on the Scribe rich text
+  framework.
+
+- Support for network proxy servers using the SOCKS5 protocol.
+
+- Support for OLE verbs and MIME data handling in ActiveQt.
+
+- Support for universal binaries on Mac OS X.
+
+Qt Designer
+-----------
+
+- Added support for editing menu bars and tool bars.
+
+- Added support for adding comments to string properties.
+
+- Added new static QtUiTools library with improved
+  QUiLoader API for loading designer forms at run-time.
+
+- Added support for namespaces in uic generated code.
+
+- Added support for dock widgets in main windows.
+
+- Added support for editing table, tree and list widgets.
+
+- Improved palette editing and resource support.
+
+QTestLib
+--------
+
+- Added QTestLib, the Qt Unit Testing Library. See the "QTestLib"
+  chapter in the Qt documentation for more information.
+
+- Users of older versions of QtTestLib can use the updater utility in
+  tools/qtestlib/updater to convert existing autotests to work with
+  QTestLib.
+
+Boost
+-----
+
+Added boost compatible syntax for declaring signals and slots. If you
+define the macro QT_NO_KEYWORDS, "Q_SIGNALS" and "Q_SLOTS" are
+recognized as keywords instead of the default "signals" and "slots".
+Added a new keyword to qmake to enable this macro: CONFIG += no_keywords.
+
+ActiveQt
+--------
+
+QAxServer now supports mime-type handling - a ActiveX control can be
+registered to handle a certain file extension and mime-type, in which
+case QAxBindable::load and QAxBindable::save can be reimplemented to
+serialize the object.
+
+Build system
+------------
+
+Added support for linking static plugins into the application.
+
+Qt 3 to 4 Porting Tool
+----------------------
+
+Q(V|H)BoxLayout and QGridLayout usage is now ported to use
+Q3(V|H)BoxLayout/Q3GridLayout, to retain the margin/spacing behavior
+as in Qt 3.
+
+Meta Object Compiler (moc)
+--------------------------
+
+- Added support for const signals.
+
+Qt Assistant
+------------
+
+- Added -docPath command line option for easy setting of the
+  document root path.
+
+QMake
+-----
+
+- Added support for new FORMS3 profile variable to make it possible
+  to have Qt Designer forms from Qt 3 and Qt 4 in the same project.
+
+- Added support for precompiled headers on win32-g++ (MinGW)
+
+Compilers
+---------
+
+Added support for Solaris 10 on AMD64 with the compiler provided by
+Sun.
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+
+New classes
+-----------
+
+- QTreeWidgetItemIterator
+        Added iterator to help iterating over items in a QTreeWidget.
+
+- QStringFilterModel
+        Allows you to provide a subset of a model to a view based on a
+        regular expression.
+
+- QSyntaxHighlighter
+        The QSyntaxHighlighter class allows you to define syntax
+        highlighting rules.
+
+- QAbstractFileEngine
+        A base class for implementing your own file and directory
+        handling back-end for QFile, QFileInfo and QDir.
+
+- QAbstractFileEngineHandler
+        For registering a QAbstractFileEngine subclass with Qt.
+
+- QFSFileEngine
+        The default file engine for regular file and directory access
+        in Qt.
+
+- Q3(H|V)BoxLayout and Q3GridLayout
+        Layout classes provided for compatibility that behave the same
+        as the Qt 4 classes but use a zero margin/spacing by default,
+        just like in Qt 3.
+
+- Added qFromLittleEndian, qToLittleEndian, qFromBigEndian and
+  qToBigEndian endian helper conversion functions (qendian.h)
+
+- Q_EXPORT_PLUGIN2 macro
+        Obsoletes Q_EXPORT_PLUGIN and allows static linking of
+        plugins.
+
+- Q3ComboBox
+        For enhanced backwards compatibility with Qt 3.
+
+- QGLPbuffer
+        For creating and managing OpenGL pixel buffers.
+
+- QNetworkProxy
+        For setting up transparent (SOCKS5) networking proxying.
+
+- QDirectPainter (Qtopia Core only)
+        Provides direct access to video framebuffer hardware.
+
+
+General improvements
+--------------------
+
+- QByteArray
+        Added toLong() and 
+
+- QColorDialog
+        Fix shortcut and focus for "Alpha channel" spinbox.
+
+- QLinkedList
+        Added conversion methods to convert from/to STL lists.
+
+- QMap/QHash
+        Fixed operator>>() to read back multiple values associated
+        to a same key correctly.
+        Added constFind(), for finding an item without causing a
+        detach.
+
+- QMap/QHash
+        Const-correctness in const_iterator's operator--(int).
+
+- QMainWindow
+        The saveState() and restoreState() functions no longer
+        fallback to using the windowTitle property when the objectName
+        property is not set on a QToolBar or QDockWidget; this
+        behavior was undocumented and has been removed.
+
+- QToolBar
+        Added Qt 3 compatibility signal visibilityChanged(bool).
+
+- QMetaType
+        Class is now fully reentrant.
+        Metatypes can be registered or queried from multiple threads.
+        Added qMetaTypeId<T>(), which returns the meta type ID of T at
+        compile time.
+
+- QMetaProperty
+        Added isResettable().
+
+- QSql
+        Oracle plugin adds support for authentication using external
+        credentials.
+        Added isValid() to QSqlError.
+
+- QThread
+        Added setPriority() and priority(), for querying and setting
+        the priority of a thread.
+
+- QTreeWidgetItem/QTreeWidget
+        Added new constructors and addChildren(), insertChildren(),
+        takeChildren(), insertTopLevelItems(), addTopLevelItems to
+        speed up insertion of multiple items.
+
+- QTextDocument
+        Added the class QTextBlockUserData and added the possibility
+        of storing a state or custom user data in a QTextBlock
+        Added useDesignMetrics property, to enable the use of design
+        metrics for all fonts in a QTextDocument.
+
+- QTextFormat
+        Added support for setting the font pixel size.
+        Added UserObject to QTextFormat::ObjectTypes enum.
+
+- QMetaType
+        The value of QMetaTypeId<T>::Defined indicates whether a given
+        type T is supported by QMetaType.
+
+- QAbstractItemView
+        Added setIndexWidget() and indexWidget() which makes it
+        possible to set a widget at a given index.
+
+        Added a QAbstractItemView::ContiguousSelection mode.
+        Added scrollToTop() and scrollToBottom().
+        Changed signals pressed(), clicked() and doubleClicked() to
+        only emit when the index is valid.
+
+- QAbstractItemModel
+        Added a SizeHintRole that can be set for each item. The item
+        delegate will now check for this value before computing the
+        size hint based on other item data.
+
+        Add QModelIndex::operator<() so we are able to use them in
+        QMap and other containers.
+
+        Added qHash function for QModelIndex.
+
+- QTableWidget
+        Added cellWidget() and setCellWidget() which makes it possible
+        to set a widget at a specified cell.
+
+        Added setCurrentCell().
+
+        Added QTableWidgetItem copy constructors.
+
+
+- QTreeWidget
+        Added setItemWidget() and itemWidget() which makes it possible
+        to set a widget on an item.
+
+- QListWidget
+        Added setItemWidget() and itemWidget() which makes it possible
+        to set a widget on an item.
+
+        Added QListWidgetItem copy constructors.
+
+- QMutableMapIterator
+        Added value() overloads to Java-style iterators that return
+        non-const references.
+
+- QTextTable
+        Added mergeCells() and splitCells() to be able to set the row
+        or column span on a table cell.
+
+- QStyle
+        Added standardIcon() which returns a default icon for standard
+        operations.
+        Added State_ReadOnly, which is enabled for read-only widgets.
+
+        Renamed QStyleOption::init() to initFrom().
+        - QGroupBox is now completely stylable (QStyleOptionGroupBox).
+        - QToolBar is now stylable according to its position in the
+          toolbar dock area (QStyleOptionToolBar).
+        - Indeterminate (busy) progress bars are now animated properly
+          in all styles.
+        - By popular request, the default toolbar icon size
+          (PM_ToolBarIconSize) in Windows and Plastique styles has
+          been changed to 24 x 24 (instead of 16 x 16 in Windows and
+          32 x 32 in Plastique).
+
+        Added PM_DockWidgetTitleMargin as pixel metric.
+
+- QHash
+        Make it possible to use QHash with a type that has no default
+        constructor.
+
+- QTableView
+        Made QTableView::setShowGrid() a slot, like in Qt 3.
+        Added setRowHeight() and setColumnWidth().
+
+- QTableWidgetSelectionRange
+        Added rowCount() and columnCount() convenience functions.
+
+- QSettings
+        Added support for custom formats in QSettings.
+
+- QTextStream
+        Added status(), setStatus() and resetStatus() for improved
+        error handling.
+        Added read(qint64 maxlen), for reading parts of a text stream
+        into a QString.
+
+- QTextCursor
+        Added support for BlockUnderCursor selection type.
+
+- QHeaderView
+        Added defaultSectionSize property which tells the default size
+        of the header sections before resizing.
+
+- QScrollBar
+        Added context menu to the scrollbar with default navigation
+        options.
+
+- QScrollArea
+        Added ensureVisible(), which can scroll the scrollarea to make
+        sure a specific point is visible.
+
+- QDateTime
+        Added addMSecs(), which adds a number of milliseconds to the QDateTime.
+
+- QDateTimeEdit
+        Added support for more date/time formats.
+        Now allows multiple sections of the same type.
+
+- QButtonGroup
+        Added handling of buttons with IDs to the buttongroup like in
+        Qt 3.
+
+- QIODevice
+        Added peek() for peeking data from a device.
+
+- QTextEdit
+        Added property tabStopWidth which sets the tab stop width in
+        pixels.
+        append(const QString &) is now a public slot.
+        Added support for inserting Unicode control characters through
+        the context menu.
+        Added property acceptRichText, for whether or not the text
+        edit accepts rich text insertions by the user.
+        Added overwriteMode property.
+
+- QDataStream
+        Added skipRawData().
+        Added support for QRegExp.
+
+- QProgressBar
+        Added support for vertical progress bars.
+
+- QImageIOHandler
+        The name() function has been obsoleted; use format() instead.
+        Added QImageIOHandler::Animation, for determining if the image
+        format supports animation.
+        Added QImageIOHandler::BackgroundColor, for setting the
+        background color for the image loader.
+
+- QImageReader
+        Added setBackgroundColor() and backgroundColor(), for setting
+        the background color of an image before it is read.
+        Added supportsAnimation(), for checking if the image format
+        supports animation.
+
+- QImageWriter
+        Added support for saving image text.
+
+- QLocale
+        Added dateFormat()/timeFormat() to query the date/time format
+        for the current locale.
+        Added toString() overloads for localized QTime and QDate
+        output.
+        Added decimalPoint(), groupSeparator(), percent(),
+        zeroDigit(), negativeSign() and exponential(), which provide a
+        means to generate custom number formatting.
+
+- QHostInfo
+        Added support for reverse name lookups.
+
+- QHostAddress
+        Added a QString assignment operator
+        Added convenience functions for initializing from a native
+        sockaddr structure.
+        Added support for the IPv6 scope-id.
+
+- QPrinter
+        Added property "embedFonts" for embedding fonts into the
+        target document.
+        Added support for printing to PDF.
+        Added support for custom print and paint engines
+
+- QPrintEngine
+        Added PPK_SuppressSystemPrintStatus, for suppressing the
+        printer progress dialog on Mac OS X.
+
+- QKeySequence
+        Added fromString() and toString() for initializing a key
+        sequence from, and exporting a key sequence to a QString.
+
+- QUrl
+        Added the port(int) function, which provides a default value
+        for the port if the URL does not define a port.
+        Support for decoding Punycode encoded hostnames in URLs.
+        Made the parser more tolerant for mistakes, and added a
+        ParsingMode flag for selecting strict or tolerant parsing.
+        Added support for the NAMEPREP standard in our i18n domain
+        name support.
+
+- QDir
+        Added the filter QDir::NoDotAndDotDot, for the
+        special directories "." and "..".
+        Added the filter QDir::AllEntries, for all entries
+        in a directory, including symlinks.
+
+
+- QAbstractSocket
+        Added slots connectToHostImplementation() and
+        disconnectFromHostImplementation() to provide polymorphic
+        behavior for connectToHost() and disconnectFromHost().
+
+- QMenuBar
+        Added setActiveAction(), which makes the provided action
+        active.
+
+- QProxyModel
+        This class has been obsoleted (see QAbstractProxyModel)
+
+- QWidget
+        Now supports three modes of modality: NonModal, WindowModal
+        and ApplicationModal.
+        Added Qt::WindowModality, obsoleted WA_ShowModal and
+        WA_GroupLeader.
+        Added Qt::WA_OpaquePaintEvent widget attribute, obsoleting
+        Qt::WA_NoBackground.
+        Added boolean autoFillBackground property.
+        Child widgets now always inherit the contents of their parent.
+
+- QPalette
+        Added QPalette::Window (obsoletes Background) and
+        QPalette::WindowText (obsoletes Foreground).
+
+- QHttpResponseHeader
+        Added two constructors and the function setStatusLine() for
+        generating a response header.
+
+- QBitArray
+        Added count(bool), for counting on and off-bits in a bit
+        array.
+
+- QVariant
+        Added support for QRegExp
+
+- QRegExpValidator
+        Added the property "regExp".
+
+- QTabBar
+        Added the property "iconSize", for setting the size of the
+        icons on the tabs.
+
+- QLineEdit
+        Added support for inserting Unicode control characters through
+        the context menu.
+
+- QString
+        Added toLong() and toULong().
+        Support for std::string conversions with embedded \0
+        characters.
+
+- QRegion
+        Added translate(), like QRect::translated().
+
+- QProcess
+        Added systemEnvironment(), which returns the environment
+        variables of the calling process.
+        Added exitStatus(), and added a new finished() signal which
+        takes the exit status as a parameter.
+
+- QComboBox
+        Made setCurrentIndex() a slot.
+
+- QFontDataBase
+        Added styleString(), for retrieving the style string from a
+        QFontInfo.
+        Added support for Myanmar fonts.
+
+- QFontMetrics
+        Added xHeight(), which returns the 'X' height of the font.
+
+- QCoreApplication
+        Added arguments(), which returns a list of command line
+        arguments as a QStringList.
+
+- QTcpSocket
+        Added support for SOCKS5 via setProxy().
+
+- QUdpSocket
+        Added property "bindMode", for binding several sockets to the
+        same address and port.
+
+- QPen
+        Added support for custom dash pattern styles and miter limits.
+        Added support for QDebug.
+
+- QDebug
+        Added support for QVector and QPair output.
+
+- QStringListModel
+        Added support for sorting.
+
+- QOpenGLPaintEngine
+        Gradients in the OpenGL paint engine are now drawn using
+        fragment programs, if the extension is available. Lots of
+        fixes, speedups and tweaks.
+
+
+Platform-Specific changes
+-------------------------
+
+Windows:
+
+- Painting
+        Added support for ClearType text rendering.
+
+- File Engine
+        Added support for long filenames/paths.
+
+X11:
+
+- QWidget
+        Added support for freedesktop.org startup notifications.
+
+Mac OS X:
+
+- Added support for universal binaries
+- Improved support for the VoiceOver accessibility tool in Mac OS X 10.4
+  and later
+
+
+3rd-party libraries
+-------------------
+
+- zlib
+        Upgraded to zlib 1.2.3.
+
+- FreeType
+        Upgraded to FreeType 2.1.10.
+
+- SQLite
+        Upgraded to SQLite 3.2.7
diff --git a/dist/changes-4.1.0-rc1 b/dist/changes-4.1.0-rc1
new file mode 100644
index 0000000000..fac0ce0ef4
--- /dev/null
+++ b/dist/changes-4.1.0-rc1
@@ -0,0 +1,554 @@
+Qt 4.1 introduces many new features as well as many improvements and
+bugfixes over the 4.0.x series. For more details, see the online
+documentation which is included in this distribution. The
+documentation is also available at http://doc.trolltech.com/
+
+The Qt version 4.1 series is binary compatible with the 4.0.x series.
+Applications compiled for 4.0 will continue to run with 4.1.
+
+****************************************************************************
+*			    General					   *
+****************************************************************************
+
+Qt library
+----------
+
+  - Integrated support for rendering Scalable Vector Graphics (SVG)
+    drawings and animations (QtSvg module).
+
+  - A Portable Document Format (PDF) backend for Qt's printing system.
+
+  - A unit testing framework for Qt applications and libraries.
+
+  - Modules for extending Qt Designer and dynamic user interface
+    building.
+
+  - New proxy models to enable view-specific sorting and filtering of
+    data displayed using item views.
+
+  - Additional features for developers using OpenGL, such as support
+    for pixel and sample buffers.
+
+  - A flexible syntax highlighting class based on the Scribe rich text
+    framework.
+
+  - Support for network proxy servers using the SOCKS5 protocol.
+
+  - Support for OLE verbs and MIME data handling in ActiveQt.
+
+Qt Designer
+-----------
+
+- Added support for editing menu bars and tool bars.
+
+- Added support for adding comments to string properties.
+
+- Added new static QtForm library with improved
+  QForm::Loader API for loading designer forms at run-time.
+
+- Added support for namespaces in uic generated code.
+
+- Added support for dock widgets in main windows.
+
+- Added support for editing table, tree and list widgets.
+
+- Improved palette editing and resource support.
+
+QTestLib
+--------
+
+- Added QTestLib, the Qt Unit Testing Library. See the "QTestLib" chapter
+  in the Qt documentation for more information.
+
+- Users of older versions of QtTestLib can use the updater utility in
+  tools/qtestlib/updater to convert existing autotests to work with QTestLib.
+
+Boost
+-----
+
+Added boost compatible syntax for declaring signals and slots. If you
+define the macro QT_NO_KEYWORDS "Q_SIGNALS" and "Q_SLOTS" are
+recognized as keywords instead of the default "signals" and "slots".
+
+ActiveQt
+--------
+
+QAxServer now supports mime-type handling - a ActiveX control can be
+registered to handle a certain file extension and mime-type, in which case
+QAxBindable::load and QAxBindable::save can be reimplemented to serialize
+the object.
+
+Build system
+------------
+
+Added support for linking static plugins into the application.
+
+Qt 3 to 4 Porting Tool
+----------------------
+
+Q(V|H)BoxLayout and QGridLayout usage is now ported to use
+Q3(V|H)BoxLayout/Q3GridLayout, to retain the margin/spacing
+behavior as in Qt 3.
+
+Meta Object Compiler (moc)
+--------------------------
+
+- Added support for const signals.
+
+Qt Assistant
+------------
+
+- Added -docPath command line option for easy setting of the
+  document root path.
+
+QMake
+-----
+
+- Added support for new FORMS3 profile variable to make it possible
+  to have Qt Designer forms from Qt 3 and Qt 4 in the same project.
+
+- Added support for precompiled headers on win32-g++ (MinGW)
+
+Compilers
+---------
+
+Added support for Solaris 10 on AMD64 with the compiler provided by
+Sun.
+
+
+****************************************************************************
+*			   Library					   *
+****************************************************************************
+
+
+New classes
+-----------
+
+- QTreeWidgetItemIterator
+        Added iterator to help iterating over items in a QTreeWidget.
+
+- QSortingProxyModel
+        The QSortingProxyModel can contain another model and handles
+        the sorting of it.
+
+- QFilteringProxyModel
+        Allows you to provide a subset of a model to a view.
+
+- QStringFilterModel
+        Allows you to provide a subset of a model to a view based on a
+        regular expression.
+
+- QSyntaxHighlighter
+        The QSyntaxHighlighter class allows you to define syntax
+        highlighting rules.
+
+- QAbstractFileEngine
+        A base class for implementing your own file and directory handling
+        back-end for QFile, QFileInfo and QDir.
+
+- QAbstractFileEngineHandler
+        For registering a QAbstractFileEngine subclass with Qt.
+
+- QFSFileEngine
+        The default file engine for regular file and directory access in Qt.
+
+- Q3(H|V)BoxLayout and Q3GridLayout
+        Layout classes provided for compatibility that behave the same
+        as the Qt 4 classes but use a zero margin/spacing by default,
+        just like in Qt 3.
+
+- Added qFromLittleEndian, qToLittleEndian, qFromBigEndian and
+  qToBigEndian endian helper conversion functions (qendian.h)
+
+- Q_EXPORT_PLUGIN2 macro
+        Obsoletes Q_EXPORT_PLUGIN and allows static linking of
+        plugins.
+
+- Q3ComboBox
+        For enhanced backwards compatibility with Qt 3.
+
+- QGLPbuffer
+        For creating and managing OpenGL pixel buffers.
+
+- QNetworkProxy
+        For setting up transparent (SOCKS5) networking proxying.
+
+- QDirectPainter (Qtopia Core only)
+        Provides direct access to video framebuffer hardware.
+
+
+General improvements
+--------------------
+
+- QByteArray
+        Added toLong() and toULong().
+
+- QFileDialog
+        Fix shortcut and focus for "Alpha channel" spinbox.
+
+- QLinkedList
+        Added conversion methods to convert from/to STL lists.
+
+- QMap/QHash
+        Fixed operator>>() to read back multiple values associated
+        to a same key correctly.
+        Added constFind(), for finding an item without causing a detach.
+
+- QMap/QHash
+        Const-correctness in const_iterator's operator--(int).
+
+- QMainWindow
+        The saveState() and restoreState() functions no longer
+        fallback to using the windowTitle property when the objectName
+        property is not set on a QToolBar or QDockWidget; this
+        behavior was undocumented and has been removed.
+
+- QToolBar
+        Added Qt 3 compatibility signal visibilityChanged(bool).
+
+- QMetaType
+        Class is now fully reentrant.
+        Metatypes can be registered or queried from multiple threads.
+        Added qMetaTypeId<T>(), which returns the meta type ID of T at compile time.
+
+- QMetaProperty
+        Added isResettable().
+
+- QSql
+        Oracle plugin adds support for authentication using external credentials.
+        Added isValid() to QSqlError.
+
+- QThread
+        Added setPriority() and priority(), for querying and setting
+        the priority of a thread.
+
+- QTreeWidgetItem/QTreeWidget
+        Added new constructors and addChildren(), insertChildren(),
+        takeChildren(), insertTopLevelItems(), addTopLevelItems to
+        speed up insertion of multiple items.
+
+- QTextDocument
+        Added the class QTextBlockUserData and added the possibility
+        of storing a state or custom user data in a QTextBlock
+        Added useDesignMetrics property, to enable the use of design metrics for
+        all fonts in a QTextDocument.
+
+- QTextFormat
+        Added support for setting the font pixel size.
+        Added UserObject to QTextFormat::ObjectTypes enum.
+
+- QMetaType
+        The value of QMetaTypeId<T>::Defined indicates whether a given type T is
+        supported by QMetaType.
+
+- QAbstractItemView
+        Added setIndexWidget() and indexWidget() which makes it
+        possible to set a widget at a given index.
+
+        Added a QAbstractItemView::ContiguousSelection mode.
+        Added scrollToTop() and scrollToBottom().
+
+- QAbstractItemModel
+        Added a SizeHintRole that can be set for each item. The item
+        delegate will now check for this value before computing the
+        size hint based on other item data.
+
+        Add QModelIndex::operator<() so we are able to use them in
+        QMap and other containers.
+
+        Added qHash function for QModelIndex.
+
+- QTableWidget
+        Added cellWidget() and setCellWidget() which makes it possible
+        to set a widget at a specified cell.
+
+        Added setCurrentCell().
+
+        Added QTableWidgetItem copy constructors.
+
+
+- QTreeWidget
+        Added setItemWidget() and itemWidget() which makes it possible
+        to set a widget on an item.
+
+- QListWidget
+        Added setItemWidget() and itemWidget() which makes it possible
+        to set a widget on an item.
+
+        Added QListWidgetItem copy constructors.
+
+- QMutableMapIterator
+        Added value() overloads to Java-style iterators that return
+        non-const references.
+
+- QTextTable
+        Added mergeCells() and splitCells() to be able to set the row
+        or column span on a table cell.
+
+- QStyle
+        Added standardIcon() which returns a default icon for standard
+        operations.
+        Added State_ReadOnly, which is enabled for read-only widgets.
+
+        Renamed QStyleOption::init() to initFrom().
+        - QGroupBox is now completely stylable (QStyleOptionGroupBox)
+        - Indeterminate (busy) progress bars are now animated properly
+          in all styles.
+
+        Added PM_DockWidgetTitleMargin as pixel metric.
+
+- QHash
+        Make it possible to use QHash with a type that has no default
+        constructor.
+
+- QTableView
+        Made QTableView::setShowGrid() a slot, like in Qt 3.
+        Added setRowHeight() and setColumnWidth().
+
+- QTableWidgetSelectionRange
+        Added rowCount() and columnCount() convenience functions.
+
+- QSettings
+        Added support for custom formats in QSettings.
+
+- QTextStream
+        Added status(), setStatus() and resetStatus() for improved error handling.
+        Added read(qint64 maxlen), for reading parts of a text stream into a
+        QString.
+
+- QTextCursor
+        Added support for BlockUnderCursor selection type.
+
+- QHeaderView
+        Added defaultSectionSize property which tells the default size
+        of the header sections before resizing.
+
+- QScrollBar
+        Added context menu to the scrollbar with default navigation
+        options.
+
+- QScrollArea
+        Added ensureVisible(), which can scroll the scrollarea to make sure a
+        specific point is visible.
+
+- QDateTime
+        Added addMSecs(), which adds a number of milliseconds to the QDateTime.
+
+- QDateTimeEdit
+        Added support for more date/time formats.
+        Now allows multiple sections of the same type.
+
+- QButtonGroup
+        Added handling of buttons with IDs to the buttongroup like in
+        Qt 3.
+
+- QIODevice
+        Added peek() for peeking data from a device.
+
+- QTextEdit
+        Added property tabStopWidth which sets the tab stop width in
+        pixels.
+        append(const QString &) is now a public slot.
+        Added support for inserting Unicode control characters through the
+        context menu.
+        Added property acceptRichText, for whether or not the text edit
+        accepts rich text insertions by the user.
+        Added overwriteMode property.
+
+- QDataStream
+        Added skipRawData().
+        Added support for QRegExp.
+
+- QProgressBar
+        Added support for vertical progress bars.
+
+- QImageIOHandler
+        The name() function has been obsoleted; use format() instead.
+        Added QImageIOHandler::Animation, for determining if the image format
+        supports animation.
+        Added QImageIOHandler::BackgroundColor, for setting the background
+        color for the image loader.
+
+- QImageReader
+        Added setBackgroundColor() and backgroundColor(), for setting the
+        background color of an image before it is read.
+        Added supportsAnimation(), for checking if the image format supports
+        animation.
+
+- QImageWriter
+        Added support for saving image text.
+
+- QLocale
+        Added dateFormat()/timeFormat() to query the date/time format for the
+        current locale.
+        Added toString() overloads for localized QTime and QDate output.
+        Added decimalPoint(), groupSeparator(), percent(), zeroDigit(),
+        negativeSign() and exponential(), which provide a means to generate
+        custom number formatting.
+
+- QHostInfo
+        Added support for reverse name lookups.
+
+- QHostAddress
+        Added a QString assignment operator
+        Added convenience functions for initializing from a native sockaddr
+        structure.
+        Added support for the IPv6 scope-id.
+
+- QPrinter
+        Added property "embedFonts" for embedding fonts into the target
+        document.
+        Added support for printing to PDF.
+        Added support for custom print and paint engines
+
+- QPrintEngine
+        Added PPK_SuppressSystemPrintStatus, for suppressing the printer
+        progress dialog on Mac OS X.
+
+- QKeySequence
+        Added fromString() and toString() for initializing a key sequence
+        from, and exporting a key sequence to a QString.
+
+- QUrl
+        Added the port(int) function, which provides a default value for the
+        port if the URL does not define a port.
+        Support for decoding Punycode encoded hostnames in URLs.
+        Made the parser more tolerant for mistakes, and added a ParsingMode
+        flag for selecting strict or tolerant parsing.
+        Added support for the NAMEPREP standard in our i18n domain name support.
+
+- QDir
+        Added the filter QDir::NoDotAndDotDot, for the
+        special directories "." and "..".
+        Added the filter QDir::AllEntries, for all entries
+        in a directory, including symlinks.
+
+
+- QAbstractSocket
+        Added slots connectToHostImplementation() and
+        disconnectFromHostImplementation() to provide polymorphic behavior for
+        connectToHost() and disconnectFromHost().
+
+- QMenuBar
+        Added setActiveAction(), which makes the provided action
+        active.
+
+- QProxyModel
+        This class has been obsoleted (see QAbstractProxyModel)
+
+- QWidget
+        Now supports three modes of modality: NonModal, WindowModal and
+        ApplicationModal.
+        Added Qt::WindowModality, obsoleted WA_ShowModal and WA_GroupLeader.
+        Added Qt::WA_OpaquePaintEvent widget attribute, obsoleting Qt::WA_NoBackground.
+        Added boolean autoFillBackground property.
+        Child widgets now always inherit the contents of their parent.
+
+- QPalette
+        Added QPalette::Window (obsoletes Background) and
+              QPalette::WindowText (obsoletes Foreground).
+
+- QHttpResponseHeader
+        Added two constructors and the function setStatusLine() for generating
+        a response header.
+
+- QBitArray
+        Added count(bool), for counting on and off-bits in a bit array.
+
+- QVariant
+        Added support for QRegExp
+
+- QRegExpValidator
+        Added the property "regExp".
+
+- QTabBar
+        Added the property "iconSize", for setting the size of the icons on
+        the tabs.
+
+- QLineEdit
+        Added support for inserting Unicode control characters through the
+        context menu.
+
+- QString
+        Added toLong() and toULong().
+        Support for std::string conversions with embedded \0 characters.
+
+- QRegion
+        Added translate(), like QRect::translated().
+
+- QProcess
+        Added systemEnvironment(), which returns the environment variables
+        of the calling process.
+        Added exitStatus(), and added a new finished() signal which takes the
+        exit status as a parameter.
+
+- QComboBox
+        Made setCurrentIndex() a slot.
+
+- QFontDataBase
+        Added styleString(), for retrieving the style string from a QFontInfo.
+        Added support for Myanmar fonts.
+
+- QFontMetrics
+        Added xHeight(), which returns the 'X' height of the font.
+
+- QCoreApplication
+        Added arguments(), which returns a list of command line arguments as a
+        QStringList.
+
+- QTcpSocket
+        Added support for SOCKS5 via setProxy().
+
+- QUdpSocket
+        Added property "bindMode", for binding several sockets to the same
+        address and port.
+
+- QPen
+        Added support for custom dash pattern styles and miter limits.
+        Added support for QDebug.
+
+- QDebug
+        Added support for QVector and QPair output.
+
+- QStringListModel
+        Added support for sorting.
+
+- QOpenGLPaintEngine
+        Gradients in the OpenGL paint engine are now drawn using
+        fragment programs, if the extension is available. Lots of
+        fixes, speedups and tweaks.
+
+
+Platform-Specific changes
+-------------------------
+
+Windows:
+
+- Painting
+        Added support for ClearType text rendering.
+
+- File Engine
+        Added support for long filenames/paths.
+
+X11:
+
+- QWidget
+        Added support for freedesktop.org startup notifications.
+
+Mac OS X:
+
+- Improved support for the VoiceOver accessibility tool in Mac OS 10.4
+  and later
+
+
+3rd-party libraries
+-------------------
+
+- zlib
+        Upgraded to zlib 1.2.3.
+
+- FreeType
+        Upgraded to FreeType 2.1.10.
+
+- SQLite
+        Upgraded to SQLite 3.2.7
diff --git a/dist/changes-4.1.1 b/dist/changes-4.1.1
new file mode 100644
index 0000000000..b18539d684
--- /dev/null
+++ b/dist/changes-4.1.1
@@ -0,0 +1,693 @@
+Qt 4.1.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.1.0.
+
+The Qt version 4.1 series is binary compatible with the 4.0.x series.
+Applications compiled for 4.0 will continue to run with 4.1.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Meta Object Compiler (moc)
+        Better handling of preprocessor statements in combination with
+        multi line comments.
+	Fixed problem where moc would generate meta information for
+	invalid signals/slots.
+
+Configure / Compilation
+        Fix build of dumpcpp-dependent projects in Visual Studio 6.
+        Fixed compilation for solaris-cc-64.
+        Respect the -no-sql-mysql flag.
+	Fixed compilation with -no-qt3support on Mac OS 10.3
+	qmake now places PkgInfo in the "Contents" directory of the
+	.app bundle.
+
+Porting (qt3to4)
+	Fixed the issue where 'int red' would be translated to
+	'Qt::red'.
+	Improved handling of macros created by moc.
+
+Qt Designer
+	uic3: Prevent generation of invalid font tags
+        uic: Fixed bug that caused retranslateUI() to add existing
+        items in combo box once again
+	Fixed dependency problem where qtDesigner modules would depend
+	on a private class.
+	Added missing generation of setColumnCount() and setRowCount()
+	for QTableWidget.
+	Fixed a platform incompatibility when saving icon properties on
+	Windows.
+	Fixed a crash when breaking the layout in a dock widget.
+	Fixed a crash when opening a new .ui file while in "Edit Tab
+	Order" mode.
+	Fixed a crash when adding a widget to a QDockWidget.
+	Improved preview of signal/slot connections.
+	Fixed an issue where moving widgets in a form resulted in lost
+	signal/slot connections and tab order to get.
+	Fixed corruption of shortcut properties in .ui files when
+	saving under some locales.
+	Fixed preview of QComboBox with item icons.
+	Fixed an issue preventing cancellation of 'New resource file'
+	if previous resource file was deleted.
+	Fixed use of F1 as help shortcut.
+
+Qt Assistant 
+	Fixed problem with restoring window geometry on multi screen
+	configurations.
+
+Qt Linguist / Internationalization
+        Fixed tr() idioms, so that translation actually works.
+	Fixed encoding of translated text.
+
+Qt Translation
+	Added translation files for Simplified Chinese.
+	Fixed a problem with lupdate parsing output from uic.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General improvements
+--------------------
+
+- QAbstractItemView
+        Fix selections when mouse-tracking is turned on.
+	Fixed selection issues after row resizing.
+	Fixed focus after pressing enter.
+
+- QAbstractItemModel
+        More consistent behavior in drag-and-drop code.
+
+- QAbstractSlider
+	Ensure changed-signals are only emitted when the value
+	actually changed.
+
+- QAbstractSocket
+	Fixed a crash if disconnected during waitForReadyRead().
+
+- QAccessibleWidget 
+	Fix an off-by-one navigation error in the accessibility
+	support for menu bar and menus.
+
+- QByteArray
+	Fixed leftJustified() and rightJustified() when array contains
+	\0's.
+
+- QComboBox
+	Fixed a crash when setting and deleting the model.
+	Fixed a crash when using a QListWidget as the view.
+
+- QCoreApplication
+	Fixes race condition during plugin loading.
+
+- QCommonStyle
+	Fixed wrong size hint of PM_MenuButtonIndicator.
+
+- QDateTime
+	Fixed a regression in fromString().
+	Avoid potential hang when paring invalid date formats.
+
+- QDialog
+	Fixed an issue where setExtension()/showExtension() didn't
+	work in a constrained size mode.
+
+- QDir
+        cd() now fails when attempting to cd to a non-directory.
+
+- QDirModel
+	Improved stability when appending network drives.
+	Improved stability when handling symlinks with relative paths.
+
+- QDockWidget
+        Update toggleViewAction() when widget gets hidden with close
+        button.
+
+- QFile
+        Changed behavior of rename() to fail if a file of the same
+        name already exists.
+
+- QFileDialog
+        Make sure filter combo box gets enabled when changing from
+        Directory to ExistingFile mode.
+        Improve filename completion for files with the same name but
+        different extension.
+        Make sure the selection is updated when modifying the filename
+        by removing characters.
+        Allow typing in several file names in the file name line edit.
+        Improve handling of non-existent windows shares.
+        Improve handling of hidden directories.
+        Make it possible to create new folder when a folder called
+        "New Folder" already exists.
+	Improve usability by not changing the filename text when
+	directories are selected.
+	Improve usability by not autoselecting the first item when
+	changing directories.
+	Ensure that calling setDirectory() with a path shows the
+	directory when the path contains a file name.
+	Avoid unnecessary resolving of mount points, leading to
+	lockups on Unix.
+	Fixed potential crash when selecting an extension filter with
+	no matches in current directory.
+	Fixed a problem where using selectFilter() didn't update the
+	view.
+
+- QFileInfo
+	Fixed issue where copying a QFileInfo and calling refresh()
+	could result in file info data being cleared.
+	Fixed issue where calling readLink() would resolve link
+	targets incorrectly.
+
+- QGLWidget
+	Switching from full screen mode to normal mode no longer
+	results in incorrect window decorations.
+	Fixed overline, underline and strikethrough for text drawn
+	with renderText().
+
+- QGridLayout 
+        Respect specified alignment over default alignment.
+
+- QHeaderView
+        Respects dragDistance.
+        Respects TextColorRole.
+        Fixed painting problems caused by clicking both mouse buttons
+        at the same time.
+        Fixed painting flaws when using sort indicators.
+	Fixed issue where QStyleOptionHeader::End would not be set by
+	paintSection.
+	Only the left mouse button can now be used to move and resize
+	header sections.
+	Fixed incorrect header size after swapping header sections.
+	Fixed resize mode of header sections after section moves.
+	Fixed an assert when changing the selection model.
+
+- QHash / QSet
+        Make the operator==() not take the internal order of elements
+        into account when comparing.
+
+- QIcon
+	Fixed issue where creating QIcons with an invalid path could
+	result in a crash.
+
+- Improved handling of focus events when using input methods.
+
+- QInputDialog
+	Fixed handling of ampersands in labels.
+
+- QImage
+	Fixed drawing of QBitmap's onto a QImage.
+
+- QImageIOHandler
+        Made all supported image formats support the Size option.
+
+- QItemSelectionModel
+	Fixed an infinite loop in isRowSelected().
+
+- QItemDelegate
+        Better handling of QStyleOptionViewItem::Bottom.
+        Increased the delegate horizontal margin.
+
+- QLayout
+        Warn instead of crash when adding two layouts to a widget.
+
+- QLocale
+	Add missing entry for "nb".
+
+- QList
+	Fixed a memory leak when repeatedly removing items from the
+	end and inserting items in the middle.
+
+- QListView
+	Fixed an assert when using QProxyModel as the model.
+
+- QMainWindow
+        Handle RTL layout for dockwidgets properly.
+        Make dockwidgets remember their sizes after being hidden.
+	Improved reliability when saving and restoring state.
+
+- QMenu
+	Fixed shortcut handling of already selected submenus.
+        Fix setting the window title on torn off menus.
+        Fix bug where exec() returned the wrong QAction on some cases.
+
+- QMenuBar
+	Improved widget placement in setCornerWidget().
+
+- QMenuItem
+	Ensure space for both check mark and icon when using
+	QPlastiqueStyle.
+
+- QMYSQLDriver 
+        Fix crash when formatValue() is called without connection.
+
+- QMessageBox
+        information() now works correctly when calling it after
+        returning from QApplication::exec()
+
+- QPaintEngine
+	Fixed an out of memory issue when drawing very long lines.
+        OpenGL : Make sure the image and pixmap cache is used.
+        OpenGL : Faster rect outlining for the most common case.
+
+- QPrintEngine
+        Better font underlining/overlining.
+        Support PDF font embedding, resulting in smaller PDF files and
+        selectable text.
+        Made our generated PDFs readable by Ghostscript.
+        Support pens that have patterns/pixmaps for PDFs.
+	Support landscape mode for PDFs.
+
+- QPixmap
+	Fixed issue where save() in some cases would return true on
+	failure.
+
+- QProgressBar
+        Fix incorrect progress in some cases.
+
+- QPushButton
+        Buttons reparented into a dialog parent through the layout are
+        now auto-default.
+
+- QRadioButton
+	Fixed a potential crash in QRadioButton Qt 3 support
+	constructors.
+
+- QSortFilterProxyModel
+	Improve stability when adding rows to source model.
+	Fixed issue where some nodes would show up as expandable even
+	if all it's children had been filtered.
+	Fixed a crash when deleting rows.
+
+- QSizeGrip
+	Fixed size grip painting when maximizing a QMainWindow in a
+	QWorkspace.
+
+- QSvgRenderer
+        Better handling of invalid files.
+
+- QSvg
+        Improve stroking with pen width 0.
+        Fix rectangle filling bug.
+
+- QSyntaxHighlighter
+	Fixed missing handling of blocks of text under certain
+	conditions.
+	Improved interaction with input methods.
+
+- QScrollArea
+	Fixed an issue where the scroll area sometimes would not
+	resize to compensate for content change.
+
+- QString
+	Fixed regression in fromLocal8Bit().
+
+- QTextDocument
+        Support span style background-color.
+        Fix nested tables in html documents regression.
+
+- QTextLayout
+	Added support for soft-hyphens.
+        
+- QToolButton
+        Make popup menus appear on the correct screen.
+	Fixed ToolButtonPopupMode when QToolButton has a
+	QAction.
+
+- QToolBar
+        Combo boxes now appears as submenus in a toolbar extension.
+        setIconSize() now works correctly.
+	Relative position within toolbars are now kept when saving and
+	restoring state.
+
+- QTextBrowser
+	Fix missing line break after paragraph.
+        
+- QTextEdit
+        Improve handling of the TITLE tag.
+        Fixed navigating links via tab.
+        Improved handling of malformed html.
+        Fixed rendering for tables with thead/tbody/tfoot elements.
+	Improved copy and paste of content with whitespace
+	Make undo/redo update the cursor position.
+	Fixed lost cursorPositionChanged() signal in read-only mode.
+	Fixed memory leak when calling setHtml() repeatedly.
+	Significantly improved performance when appending and editing
+	text.
+	Improved performance when selecting all text.
+	Emit copyAvailable() on mouse selection.
+
+- QTableView
+        Fixed drawing of selections after moving columns.
+        Do not wrap to the top if Page Down is pressed.
+        Improve scrolling behavior.
+        QTableView now takes ownership of QHeaders set using
+        setHorizontalHeader()
+	Fixed issue where calling setModel(0) could result in a
+	crash.
+	
+- QTreeView
+        Fixed scrolling-related item expand bug.
+        Improve scrolling behavior.
+        QTreeView now takes ownership of QHeaders set using
+        setHorizontalHeader()
+        Avoid crash when calling setRowHidden with no model.
+	Avoid crash when calling sizeHintForColumn() in some cases.
+	Improved performance when adding rows.
+	Fixed update of view when changing row heights.
+	Fixed a bug where calling setCurrentIndex() did not update the
+	view correctly.
+	Removed extra emit of the expanded() signal on already
+	expanded branches.
+
+- QTreeWidget
+	Fixed tristate check item behavior.
+
+- QTabWidget
+        Fixed bug that caused missing resize when dynamically adding
+        widgets.
+	Fixed text positioning in a tab with an icon.
+
+        
+- QTemporaryFile
+	Fixed issue where calling open() could potentially change the
+	file name.
+
+- QTextDocument
+        Improved stability when importing incorrectly formed html
+        tables.
+	Improved stability when importing closing tags without
+	corresponding opening tags.
+        
+- QTextStream
+	Ensure valid codec converter state after calling seek(0).
+	Fixed issue where readAll() would not work with sequential
+	devices.
+
+- QTabBar
+        Improve handling of tab removal.
+
+- QUrl
+	Improve handling of hostnames containing digits.
+        Fix crash when calling hasQueryItem() on QUrl without any
+        query items.
+	Added support for parsing file names with '[' and ']'
+	characters.
+
+- QVariant
+        Improve operator==() behavior when comparing different types.
+        The QVariant(const char *) constructor is now unavailable when
+        QT_NO_CAST_TO_ASCII is set. Otherwise, it uses
+        QString::fromAscii to convert the const char * to a Unicode
+        QString to prevent loss of information.
+
+- QWidget
+        Fix regression in setMask().
+	Fixed issue where incorrect minimum size was reported after
+	reparenting from a top level widget.
+	Fixed return value of normalGeometry() after the widget has
+	been maximized.
+	Fixed crash on application exit if the widget was created
+	before the widget mapper is initialized.
+
+- QXpmHandler
+        Fixed handling of non-transparent XPM images.
+
+- XMLInputReader
+	Fixed issue where entities in XML files were not
+	resolved.
+
+- QXmlSimpleReader
+        A significant (approx. 50x) speedup in QXmlSimpleReader when
+        parsing documents which contain internal or external entities.
+
+- Q3DataTable
+	Drivers not supporting the QuerySize feature would display one
+	row of data too little.
+
+- Q3IconView
+	Fixed selection appearance.
+
+- Q3TextEdit
+        Fixed focus indicator tabbing through tables.
+	Fixed coloring when inserting text after use of setColor().
+
+- Q3TabDialog
+	Added missing selected() signal
+
+- Q3ListView
+	Fixed occasional crashes when deleting items.
+	Fixed wrong label after addLabel(QString()).
+
+- Q3ScrollView
+	Fixed default focus policy for deriving classes.
+
+- Q3ToolBar
+        Q3Action::setOn() now works correctly.
+	Adding an action now sets all action properties correctly.
+
+- Q3ActionGroup
+        Fix drop down drawing error.
+
+- Q3MainWindow
+	Fixed a regression in setUsesIconText().
+
+
+Platform-Specific changes
+-------------------------
+
+Windows:
+
+- QApplication
+	Timers now continue to fire when windows enters a modal event
+	loop.
+
+- QAxServer
+	Fixed issue where updateRegistry() would report success, even
+	though the operation failed.
+	Fixed comparison of class attributes.
+
+- QAxWidget
+	Support parameters of type short* and char* in signal/slots.
+
+- QClipboard
+        Make sure the dataChanged() signal is emitted correctly.
+
+- QColordialog
+	Fixed various selection issues in WindowsXP style.
+
+- QDockWidget
+        Improve the look of title bar buttons.
+        Improved appearance of dock widget title and frame.
+
+- QFileDialog
+        Improve handling of path names with special characters.
+        Maintain modality chain when showing a native modal inside a
+        qt modal.
+        Speedup when browsing dirs containing broken shortcuts.
+
+- QHeaderView
+	Improved header highlighting in WindowsXP style.
+
+- QInputDialog
+	Calling setText() also selects all text to be consistent with
+	other platforms.
+
+- QLabel
+	Improved appearance when disabled.
+
+- QLineEdit
+        Make QLineEdit respect the XP color scheme.
+
+- QOpenGL
+	Added workaround for missing OpenGL sample buffers on the
+	Mobile Intel 915GM Express Chipset.
+	Fixed rendering into a QPixmap.
+
+- QPainter
+	Improve Type 1 font rendering.
+	Improved performance of font rendering.
+	Use the standard fallback fonts for Asian languages.
+
+- QPrinter
+	Fixed issue where the orientation for a QPrinter would be
+	ignored.
+        Fix PCL printer line drawing bug.
+
+- QPrintDialog
+	Fix unhandled exception when a print dialog is launched from
+	within Visual Studio.
+
+- QPrintEngine
+	Ensure correct pageRect() and paperRect() when printer
+	resolution is set manually.
+
+- QTableView
+	Improved checkbox coloring within selections.
+
+- QUdpSocket
+        Better handling when sending to an unbound port.
+
+- QWidget
+        Fix setWindowOpacity() flicker.
+
+- QWindowsXPStyle
+	Fixed QApplication::setStyle() if called before construction
+	of the application object.
+
+- QWorkSpace
+        Improve window resizing.
+        Improve title bar and button appearance in XP style.
+	Improved focus handling.
+	Fixed update of child masks on style change.
+	Fixed restore action not being enabled on maximize and
+	minimize.
+	Fixed a potential crash in maximizeWindow().
+
+X11:
+
+	Reintroduced qt_x11_set_global_double_buffer() for binary
+	compatibility.
+	Improved tablet event handling.
+
+- QApplication
+	The KeypadModifier is now set when NumLock is enabled.
+
+- QBitmap
+	Fixed text drawing errors under some fontconfig
+	settings.
+
+- QLibrary
+	isLibrary() now returns true for .a and .so on AIX.
+
+- qmake
+	Improved stability when modifying environment variables
+	Allow '/' as a path separator on all platforms.
+
+- QPaintEngine
+	Fixed issue where filling and stroking ellipses could leave
+	pixel gaps.
+
+- QPainter
+        Implemented Porter-Duff composition support.
+        Fix artifacts when drawing aliased primitives with an alpha
+        pen.
+        Fixed issue where rotating pixmaps could add a pixel row in
+        some cases.
+	Fixed drawing of arcs of less than 1 degree.
+	Made drawText() honor the Qt::TextWrapAnywhere flag.
+
+- QPrinter
+	Fixed cleanup of child processes.
+
+- QPrintDialog
+	Fixed problems when using "From page" and "To page" spin
+	boxes.
+	Made it impossible to choose "OK" when no printers are
+	configured.
+
+- QProcess
+	Fixed possible deadlock when calling startDetatched().
+
+- QScrollArea
+	Catch double click also when size exceeds window system size
+	limits.
+
+- QTextEdit
+	Fixed an issue where the horizontal scrollbar did not show up.
+
+- QWorkspace
+	Fixed missing mouse event propagation to child widgets.
+
+Mac OS X:
+
+	General fixes to the drag and drop support.
+	Improved performance when resizing widgets.
+	Fixed font issues for input methods with Japanese.
+	Fixed issue with pasting Japanese text.
+	Correctly set architecture and SDKROOT when creating a Xcode
+	project.
+
+- QCursor
+        Fix alpha pixmap cursors.
+
+- QDesktopWidget
+	Improve stability when changing users.
+
+- QDockWidget 
+        Improve dock widget appearance.
+
+- QGroupBox
+	More conformant styling.
+
+- QHeaderView
+        Fix text truncating issue on headers.
+
+- QLabel
+	Fix labels painted incorrectly when using MacMetalStyle.
+
+- QMenu
+	Improved menu styling.
+	Improved popup appearance.
+
+- QPainter
+	Add support for SmoothPixmap transform.
+
+- QPushButton
+        Make Mac style obey the icon size set by setIconSize().
+	Make sure buttons are not shown as default on inactive
+	windows.
+
+- QPrintEngine
+	Fixed truncated PDF generation of large documents.
+
+- QSplashScreen
+        Fix painting errors when using showMessage().
+
+- QTextEdit
+	Fixed focus issues with Japanese input.
+	Fixed issue with pasting Unicode text between
+	applications.
+
+- QToolBar 
+        Improve tool bar appearance.
+
+- QTextFormat
+	Fixed a crash when setting a font's pixel size to -1.
+
+- QWorkSpace 
+        Improve workspace children appearance.
+
+- Q3TextEdit
+	Fixed a crash in paragraphRect() when all content had been
+	deleted.
+
+- Q3ListViewItem
+	Fixed a infinite loop when editing an item.
+
+Qtopia Core:
+
+	Removed flickering when mouse cursor is above an animation.
+	Optimized use of shared memory.
+	Optionally use iwmmxt intrinsics to optimize painting.
+	Added a simple example on how to calibrate touch screen mouse
+	handlers.
+
+- Fonts
+	Handle BDF fonts without the PIXEL_SIZE property.
+	Added Chinese and Japanese fonts.
+
+- PDF
+        Support PDF font embedding.
+
+- qvfb
+	Fixed a crash when increasing the display size in the
+	configuration dialog.
+
+- QPixmap
+	Implement QPixmap::grabWindow().
+
+3rd-party libraries
+-------------------
+
+- FreeType
+	Fix memory leak.
+
diff --git a/dist/changes-4.1.11 b/dist/changes-4.1.11
new file mode 100644
index 0000000000..7c26a30690
--- /dev/null
+++ b/dist/changes-4.1.11
@@ -0,0 +1,41 @@
+Qt 4.1.11 is an optimization release of 4.1.4. It maintains both forward and 
+backward compatibility (source and binary) with Qt 4.1.0.
+
+The Qt version 4.1 series is binary compatible with the 4.0.x series.
+Applications compiled for 4.0 will continue to run with 4.1.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General improvements
+--------------------
+
+- QByteArray
+	Optimized resize() on an empty array.
+
+- QDateTimeEdit
+	Improved usability by allowing steps rounded to 15 minutes blocks.
+
+- QFile
+	Optimized the unsetError() by only modifying state if it's really 
+	changed.
+
+- QFSFileEngine
+	Optimized buffered file reads.
+
+- QSettings
+	Implemented delayed parsing of the settings file.
+
+- QString
+	Optimized the size of the QString(const char*) constructor.
+
+- SQLite driver
+	Upgraded to SQLite version 3.3.5.
+	Minimized the time a result set is kept on the server.
+
+Qtopia Core-Specific changes
+-------------------------
+
+- Added 18 and 24 bit support to the Linux framebuffer screen driver.
+- Optimized the Transformed screen driver.
diff --git a/dist/changes-4.1.3 b/dist/changes-4.1.3
new file mode 100644
index 0000000000..59f0c71ad1
--- /dev/null
+++ b/dist/changes-4.1.3
@@ -0,0 +1,879 @@
+Qt 4.1.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.1.0.
+
+The Qt version 4.1 series is binary compatible with the 4.0.x series.
+Applications compiled for 4.0 will continue to run with 4.1.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Meta Object Compiler (moc)
+
+Configure / Compilation
+	Compile with NAS sound support enabled and no Qt 3 support.
+	Fixed some issues with resolving absolute paths when configuring
+	Qt using "-prefix".
+
+Porting (qt3to4)
+	qt3to4 now adds the needed include directive for
+	qPixmapFromMimeFactory().
+	Added rule for QDeepCopy.
+	Improved handling of files with non-unix line endings.
+	
+Qt Designer
+	Improved usability by letting the Find Icon dialog remember the last
+	path visited.
+	Fixed preview of DataTime and Date types.
+	Generate correct .ui code when saving forms containing Q3DateEdit,
+	Q3TimeEdit, Q3ProgressBar and Q3TextBrowser.
+	Fixed cursor position when editing text in QListWidget and QComboBox.
+	Fixed code generation for custom widgets containing a QComboBox.
+	Fixed a bug that prevented the windowTitle property for QDockWidgets
+        from being designable.
+	Fixed problem where Designer would fail to reflect QTreeWidget column
+        changes.
+	Fixed potential assert when font size is specified in points.
+	Fixed potential crash when breaking the layout of an empty splitter.
+	Ensured that Designer saves the used pixmap function.
+	Fixed potential crash on 64-bit platforms.
+	Ensured that windows show when restarting after a crash.
+	Improved geometry saving with multiple monitors.
+	Fixed a potential crash when using QVBoxLayout with certain widget
+        combinations.
+	Fixed a bug where breaking splitter layout would not work after
+        reopening the form.
+
+Qt Assistant
+	Assistant now sets the proper encoding attribute when saving files,
+	solving problems when viewing the page in some browsers.
+	Improved window placement on startup.
+	Improved performance of first-time keyword loading.
+
+Qt Linguist / Internationalization
+	Improved window placement on startup.
+	Fixed problem where .ts files for Qt 3 .ui files would be grayed out.
+
+uic
+	Fixed code generating bug for forms in namepsaces preventing
+        connections from being made.
+	Split large generated strings to avoid compiler errors.
+	Fixed a bug causing QLabel's font not to be set when using uic3.
+	Fixed a dependency issue when .ui files are in a subdirectory.
+	Ensured that "uic3 -convert" will convert connections.
+	Ensured that uic3 will convert QDataTable and QSqlCursor to Qt3
+        support classes.
+
+Demos / Examples
+	Fixed a bug in the Tooltips example when moving the cursor from one
+	circle to the next.
+	Fixed a bug in the FTP example which caused the Download button to be
+	incorrectly enabled/disabled.
+	Fixed a crash in the FTP example.
+	Made it easier to change the Arthur Widget properties in Designer.
+	Fixed indexing issues in the Spreadsheet demo.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General improvements
+--------------------
+
+- Fixed rendering of some GIF images.
+- Popup and Tool widgets are now correctly blocked by sibling modal dialogs.
+- Group-leader widgets are no longer blocked by non-child modal widgets.
+- A parent modal dialog of a child modal dialog can no longer be brought on
+  top of the child.
+- Made sure modal widgets are modal when opened on a closing parent.
+- Fixed expose painting error when closing a child popup.
+- Ensured that index widget pointers are maintained when a view is sorted.
+- Ensured that closingDown() returns true when the application 
+  objects are being destroyed.
+- Fixed a potential crash in the PNG image handler.
+- Improved stability of PDF font generation when embedding invalid fonts.
+
+- Q3ButtonGroup
+	Fixed incorrect behaviour when using setExclusive(false).
+
+- Q3DockWindow
+	Fixed placement when showing after being hidden.
+	Fixed issue where calling show() on a hidden Q3DockWindow would
+        make the dock window overlap the existing one.
+		
+- Q3GroupBox
+	Removed empty row at the bottom.
+
+- Q3TextEdit
+	Fixed some input method issues.
+	
+- Q3TextBrowser
+	Fixed a bug that prevented some Unicode HTML files from being
+        displayed.
+
+- Q3ToolBar
+	Ensured that toolbar separators are painted in all styles.
+
+- Q3IconView
+	Fixed a crash when disabling the view while an item is being edited.
+
+- Q3ListView
+	Fixed incorrect background color.
+	Fixed painting issues with disabled items.
+	Added support for tooltips.
+
+- Q3Table
+	Fixed a painting bug in the headers that occurred when a cell was
+	selected.
+	Ensured that checkbox backgrounds are filled.
+	Fixed issue where calling selectRow() would not deselect the current
+        row in SingleRow selection mode.
+	
+- Q3Header
+	Fixed incorrect vertical text alignment.
+	Fixed issue where a header label would be lost after swapping two
+        column headers.
+	
+- Q3UrlOperator
+	Fixed listChildren() for the case when setProtocol() hasn't been 
+	called.
+
+- Q3WhatsThis
+	Fixed handling of dynamic "What's This?" texts.
+
+- Q3WidgetStack
+	Fixed a potential crash.
+	Fixed a bug preventing arrows from showing up in some cases.
+
+- QAbstractButton
+	Ensured that QAbstractButton::setPixmap() also sets the size of the
+        pixmap.
+
+- QAbstractItemView
+	Fixed QStatusTipEvents for item views.
+	Fixed a crash occurring when removing a row in a slot connected to
+	selectionChanged().
+	Fixed issue where itemChanged() would be emitted twice.
+	Fixed issue where input methods would not work on editable itemviews.
+	Fixed potential crash.
+	Made sure the editor does not open when expanding and collapsing
+        branches in QTreeView. Note that this change introduces a system
+        dependent delay to differentiate between single and double clicks.
+	Made sure setIndexWidget() does not delete an old widget if one is
+        already set.
+	Fixed a bug causing fetchMore() to behave incorrectly with empty
+        models.
+	Fixed an issue that sometimes caused tab order to be incorrect after
+        editing items.
+
+- QAbstractSocket
+	Fixed potential crash when connecting to local sockets on BSD
+        systems.
+
+- QCheckBox
+	Only emit the stateChanged() signal when the state actually changes.
+	Improved performance.
+
+- QColorDialog
+	Improved usability.
+
+- QComboBox
+	Corrected escape of '&' in items.
+	Reset input context when showing the popup.
+	Fixed a missing update after model is reset.
+	Ensured that TextElideMode is respected.
+
+- QCommonStyle
+	Fixed incorrect values returned from sizeHintFromContents() for the
+        header sections.
+
+- QCheckBox
+	Fixed some painting issues when using CDE or Motif style.
+
+- QDatabase
+ 	Fixed bool values in prepared queries in the MYSQL driver.
+	Fixed use of stored procedures that returns a result set in MySQL
+        5.x.
+	Fixed queries on tables with a LONG field type in Oracle databases.
+	Fixed reading of large blobs from an Interbase database.
+
+- QDir
+	Fixed infinite loop in rename() when renaming a directory without
+        write permission.
+
+- QDirModel
+	Fixed possible assert on broken links.
+	Fixed a bug preventing links to "/" on Unix system from working
+        correctly.
+
+- QFile
+	Corrected error reporting on flush() and close().
+	Fixed caching issues causing wrong file sizes to be returned in some
+        cases.
+	Ensure that write() will fail when trying to write to a full disk.
+	
+- QFileDialog
+	Fixed a bug that allowed selection of multiple files in
+	getOpenFileName().
+	Ensured that the proper error message is given when deleting a
+        directory fails.
+	Fixed a bug preventing an update when changing the FileMode.
+	Added support to allow several new characters (such as @{},*~^) to be
+        used in dialog file filters.
+	Ensured that files are hidden when browsing in DirectoryOnly mode.
+	
+- QFtp
+	Fixed crash that occurred if an FTP session got deleted in a slot.
+
+- QGridLayout
+	All addWidget() functions now invalidate the layout.
+	Fixed minimum size for layouts containing widgets that maintain
+        a height-for-width size policy.
+
+- QGroupBox
+	Fixed some painting issues appearing on all styles except Windows XP.
+	Fixed keyboard handling if checkable.
+
+- QHeaderView
+	Fixed a bug preventing tooltips from being shown.
+	Fixed a painting error occurring when the sort indicator was enabled
+	and the column width became smaller than the indicator width.
+	Fixed a usability issue when resizing small headers in a fixed-width
+        QTreeWidget.
+	Ensured that the header has the correct size when the font changes.
+	Fixed a painting error that occurred when the header was hidden.
+	Fixed a painting error that occurred when the user activated the
+        context menu while pressing the left mouse key.
+	Fixed a bug giving the last section a resize cursor event though it
+        cannot be resized.
+	Icons in header views now respect the layout direction.
+	Added support for setting a pixmap.
+	Prevented views from deleting a view it does not own.
+
+- QHttp
+	Fixed issue where setProxy() would only work for the first get()
+        call.
+
+- QIcon
+	Ensured that visible icons on QToolButtons and QMenus are updated
+        when the icon of a QAction changes.
+	Fixed issue where actualSize() would return a bigger size than the
+        requested size.
+
+- QImage
+	Fixed writing to a PNG file when the alpha value is premultiplied.
+	Fixed a bug where dotsPerMeter was not preserved after a call to
+	convertToFormat().
+	Handle out of memory conditions gracefully.
+
+- QIODevice
+	Fixed return values for Qt 3 support members getch(), putch() and
+	ungetch().
+
+- QItemDelegate
+	Proper painting in inactive windows.
+	Improved hit detection for QTreeWidgetItem checkboxes.
+
+- QItemSelectionModel
+	Emit currentChanged() when the current item is deleted.
+	Fixed a bug causing the selection to be lost when an item was
+        removed.
+
+- QLibrary
+	Added support for suffixes before library extensions.
+
+- QLineEdit
+	Made sure QT_NO_CLIPBOARD is respected.
+	Fixed incorrect background color when disabled.
+
+- QListView
+	Fixed setRowHidden().
+	Made the decision to showing scrollbars independent of the previous
+        scrollbar state.
+	Ensured that setting the icon position programatically works as
+        intended.
+
+- QLocale
+	Fixed a bug causing toString() to return the wrong day of the week in
+        some cases.
+
+- QMainWindow
+	Fixed a crash when deleting the widget returned by
+        QMainWindow::statusBar().
+	Fixed a bug causing wrong behavior when removing a QToolBar with
+        removeToolBar()
+	Fixed layout error when showing the status bar after the main window.
+	Fixed incorrect assert in QMainWindowLayout::dockWidgetArea().
+	Fixed a bug making it impossible to have a dock widget under two
+        others in the same dock widget area.
+	Fixed a regression preventing insertToolBar() from inserting a
+        toolbar before an existing toolbar.
+	Ensured that QDockWidget's maximumWidth() is honored.
+	Ensured that window menu shortcuts are available before the window is
+        shown.
+
+- QMenu
+	Allowed setActiveAction() open a submenu, to be consistent with
+        QMenuBar.
+	Made it possible for the Alt key to be used to close a context menu.
+	Improved navigation behavior when using Home/End.  
+	Improved navigation behavior when using up/down arrows on a menu with
+        no selected items.
+	Fixed crash when clicking on cleared or disabled submenus.
+	Ensured that only the currently highlighted submenu is visible.
+
+- QMenuBar
+	Improved calculation of sizeHint().
+	Fixed a bug causing menu items after a spacer item to always appear
+	in the extension menu.
+	Changed activateItemAt() to behave more like its behavior in Qt 3.
+
+- QMotifStyle
+	Draw QSlider tick marks.
+	Fixed a bug preventing the focus frame background from being cleared.
+
+- QMovie
+	Improved frame delay calculations.
+
+- QObject
+	Fixed a crash when calling disconnect() on the last connection.
+
+- QPainter
+	Optimized drawing of dotted lines.
+	Fixed potential assert after calling setClipping(true).
+
+- QPainter
+	Fixed a bug causing contains(QPoint) to return the wrong result in some
+        cases.
+	Fixed some painting issues with drawArc().
+	Improved performance of drawLine() and drawEllipse().
+
+- QPen
+	Fixed a bug that caused the wrong dash patterns to be drawn when
+        changing styles.
+
+- QPicture
+	Fixed a DPI issue when drawing into a QLabel.
+	Made sure that the bounding rectangle is updated for all drawing
+        operations.
+	Improved stability when handling complex scenes.
+	Made sure SVG files saved by QPicture include namespace bindings in
+        the SVG tag.
+
+- QPlastiqueStyle
+	Improved usability in QSlider by making the hit rectangle for mouse
+	clicks wider.
+	Fixed animation of indeterminate progress bars.
+	Ensured that lines are drawn for the hierarchical relationships in
+        QTreeWidgets.
+
+- QPrinter
+	Optimized the size of PDF documents containing the same picture in
+	several places.
+	Ensured that systems with high resolution are correctly handled.
+	Fixed a bug preventing the setup() function from displaying the print
+        dialog.
+	Improved positioning of tiled pixmaps.
+
+- QPrintDialog
+	Fixed a crash that occurred when opening a page setup dialog on a PDF
+        printer.
+
+- QPushButton
+	Made sure that flat push buttons paint their contents.
+	
+- QProcess
+	Ensured that the exit status is reset after a sub-process crash.
+	Fixed a bug causing the system to lock on X11 after calling
+        startDetached() 65536 times.
+	Enabled QProcess to be used outside the GUI thread.
+
+- QScrollArea
+	Fixed problem where focusing the next child in a scroll area would
+        make the top-left part of the child scroll out of view.
+
+- QSettings
+	Made it possible to use the "Default" registry entry on Windows.
+
+- QSortFilterProxyModel
+	Fixed a crash that occurred when deleting rows.
+	Improved stability by checking the model index for validity.
+
+- QStandardItemModel
+	Made sure that the column count is updated after calling
+        removeColumn().
+
+- QSplashScreen
+	Made sure the font set with setFont() is actually used.
+
+- QSqlRelationalTableModel
+	Fixed a bug where inserting using the OnManualSubmit edit strategy
+        failed in some cases.
+	Fixed removeColumn() for columns that contain relations.
+
+- QSqlTableModel
+	Made the OnFieldChange edit strategy behave like OnRowChange when
+        inserting rows.
+
+- QStackedLayout
+	Fixed a bug causing a focus change when calling removeWidget().
+
+- QSvgRenderer
+	Fixed rendering into a QPicture.
+	Fixed issue where id attributes containing certain characters would
+	not render correctly.
+
+- QSplashScreen
+	Fixed rendering of pixmaps with alpha channels.
+
+- QSplitter
+	Ensured that non-collapsible children are respected.
+
+- QSqlRelationalTableModel
+	Fixed handling of mixed-case field names for relations.
+
+- QSqlTableModel
+	Fixed a bug preventing the value 'false' from being set on a field of
+        boolean type.
+
+- QSyntaxHighlighter
+	Fixed a regression.
+
+- QTabBar
+	Ensured that currentChanged() is only emitted when the current index
+        actually changes.
+
+- QTabWidget
+	Ensured that QTabWidget has the same behavior as QStackedWidget when
+        inserting a page at index <= currentIndex().
+
+- QTableView
+	Fixed selection handling in situations after rows/columns have been
+        moved.
+	Made decision to show scrollbars independent of the previous
+        scrollbar state.
+ 	Fixed a bug causing mouse clicks to be lost.
+	Fixed potential assertion when hiding columns in QTableView.
+	Fixed potential crash if indexes are invalid and sections have been
+        moved.
+
+- QTabWidget
+	Fixed drawing of icons.
+
+- QTextCodec
+	Fixed detection of locales with the '@' modifier.
+
+- QTextDocumentLayout
+	Made sure the right margin of a QTextBlock is filled with the
+        background color.
+
+- QTextEdit
+	Fixed a bug causing setPlainText() to emit textChanged() three times.
+	Fixed an infinte loop triggered when calling setHtml() inside
+	resizeEvent().
+	Added support for pasting text with '\r' line feeds.
+	Fixed a bug causing tables loaded from HTML to be saved incorrectly.
+	Made it possible to delete images using the Backspace key.
+	Fixed some issues with justified text in combination with forced line
+        breaks.
+	Improved stability when setting a null cursor.
+	Increased accuracy when moving text by drag and drop.
+
+- QTextBrowser
+	Fixed incorrect mouse cursor after right-clicking a link.
+	Fixed incorrect mouse cursor in read-only mode.
+	Fixed issue where arrow cursor would override custom cursors.
+	Fixed potential crash when inserting HTML.
+	Improved support for relative links.
+	Improved parsing of internal document anchors.
+
+- QTextHtmlParser
+	Fixed a bug in the whitespace handling.
+
+- QTreeWidget
+ 	Fixed a bug that caused itemChanged() to be emitted with a null
+        pointer.
+
+- QTreeWidgetItemIterator
+	Fixed incorrect assert caused by creating an iterator for an empty
+        QTreeWidget.
+
+- QToolBar
+	Fixed potential crash when resizing a tool bar with certain types of
+	widgets.
+	Fixed a bug causing hidden widgets to be shown when the toolbar is
+        moved.
+
+- QToolTip
+	Enable word breaking in rich-text tool tips.
+
+- QTextStream
+	Fixed a bug causing aboutToClose() to be connected to a NULL slot
+	after calling unsetDevice().
+	Fixed a bug causing read() or readLine() to sometimes return an empty
+        string.
+
+- QTreeView
+	Fixed some drag and drop issues.
+	Fixed a bug where the check state of an item was unchanged after an
+	itemClicked() signal was emitted.
+	Made decision to show scrollbars independent of the previous
+        scrollbar state.
+	Fixed a bug causing horizontal scrolling when only vertically
+        scrolling should occur.
+	Fixed painting of parent-child hierarchy decorations.
+	Fixed scrollbar visibility bug.
+	Fixed branch indicator painting error in right-to-left mode.
+	Fixed painting issues when using reverse layout on hidden headers.
+	Fixed a bug preventing the view from being scrolled when column 0 was
+        hidden.
+	Fixed a bug causing some custom index widgets to be incorrectly
+        placed.
+
+- QTreeWidget
+	Fixed selection handling in situations after sortItems() has been
+        called.
+
+- QUdpSocket
+	Fixed issue where unbuffered sockets would continuously emit
+        readyRead().
+
+- QUrl
+	Fixed behavior of setPort() when -1 is given as the port number.
+	setEncodedUrl() now escapes '[' and ']' after the host in tolerant
+        mode.
+	Made handling of IP encoding more consistent.
+
+- QUtf16Codec
+	Fixed bug in covertFromUnicode() on big-endian machines.
+
+- QVariant
+	Fixed handling of variants of type "QList<QVariant>".
+
+- QWidget
+	Made sure that the application does not close if a widget with a
+        visible parent exists.
+	Fixed issue where scroll() would scroll child widgets in some cases.
+	Fixed painting issues when resizing very large child widgets.
+	Fixed a bug preventing setCursor() from working with platform-
+	dependent cursors.
+
+- QWorkspace
+	Ensured that the correct position is set when maximizing a child with
+        the NoBorder hint.
+	Fixed MDI title bar text wrapping in Plastique style.
+	Fixed some painting issues when resizing child windows.
+	Improved accuracy when resizing child windows.
+
+- QXml
+	Improved parsing of entities.
+
+Platform-Specific changes
+-------------------------
+
+Windows:
+
+- Ensured that the correct default font is used on Windows 2000 and later
+  versions. This also fixes issues with international characters on some
+  systems.
+
+- Improved painting of rubber bands in Windows XP and Windows style.
+  
+- Calling showMaximixed() on a QDialog without minimize and maximize buttons
+  now behaves properly.
+
+- Improved calculation of bounding rectangles for text.
+
+- Fixed a bug making it possible to open multiple context menus using the 
+  context menu key.
+
+- Fixed writing of large files which failed on some systems.
+
+- Optimized painting of ellipses.
+
+- Fixed problem with release version of IDC.
+
+- Fixed window state bug when restoring minimized and maximized windows.
+
+- Fixed painting error on Windows XP style tabs in right-to-left mode.
+
+- Fixed incorrect toolbar button spacing in Windows XP and Windows style.
+
+- Fixed bug that caused QFontInfo::family() to return an empty string.
+
+- Ensured that tool windows are now resizable by default.
+
+- Improved precision for tablet coordinates.
+
+- Improved probing and detection for OpenGL overlay mode.
+
+- Improved the native look and feel of QComboBox.
+
+- Improved appearance of QToolButtons with menus.
+
+- Fixed issue where certain fonts would be incorrectly replaced when
+  printing.
+
+- Fixed issue where minimized fixed-size dialogs would not respond to user
+  input.
+
+- Fixed issue preventing bitmap fonts from being drawn using a scaled
+  painter.
+
+- Made sure that QMAKE_PRE_LINK is respected by qmake on Windows.
+
+- Fixed a bug causing tab widget contents to move when resized in Windows XP
+  style.
+
+- Q3FileDialog
+	Fixed potential crash in Q3FileDialog when resolving shortcuts.
+
+- QPainter
+	Fixed an issue where drawText() on a QPrinter would sometimes be
+        clipped away.
+	Fixed the behavior of drawEllipse() and drawLine() when used with
+        negative coordinates.
+	Fixed painting in OpaqueMode.
+	Fixed a bug preventing rectangles with negative coordinates from
+        being painted correctly by the raster engine.
+
+- QAxBase
+	Fixed a bug preventing proper interaction with Excel.
+
+- QAxWidget
+	Fixed conversion of short* and char* output parameters.
+
+- QFile
+	Made sure that copy() returns false when the copy target already
+        exists.
+
+- QFileInfo
+	Fixed crash that occurred when calling exists() on a invalid
+        shortcut.
+	Fixed absolute and canonical paths for files in the root directory.
+
+- QGLWidget
+	Fixed a bug causing renderPixmap() to fail on 16-bit color depths.
+
+- QLibrary
+	Enabled loading of filenames with non-standard suffixes.
+
+- QLocale
+	Added support for 'z' in time format strings.
+
+- QPrinter
+	Fixed setPageSize() to correctly update the page and paper
+        rectangles.
+
+- QTextBrowser
+	Made sure that QTextBrowser does not override
+        QApplication::setOverrideCursor().
+
+- QWindowsStyle
+	Ensured that the platform specific icons provided by the system are
+        used when appropriate.
+
+
+X11:
+
+- Fixed a bug in QFontDatabase which made isFixedPitch() return true for
+  certain non-fixed-pitch fonts, like "Sans Serif".
+
+- Correctly handle the .so file extension on HP/UX IA-64.
+
+- Fixed a crash that could occur when clicking a mouse button while dragging.
+
+- Improve QProcess resource usage by making sure it closes all unused pipes.
+
+- Made QFontEngine honor the autohinter setting from FontConfig. 
+
+- Fixed a potential crash that could occur when drawing a large number of
+  polygons/trapezoids.
+
+- QtConfig
+	Fixed missing update of window decorations.
+	Fixed assert when editing font family substitutions.
+
+- Fixed X Error that occurred when closing applications using the Motif
+  style.
+
+- Ensured that -style command line arguments are respected when using
+  customized visuals.
+
+- Fixed issues with multiple painters on the same device.
+
+- Improved backward compatibility for XCursors.
+
+- Fixed a bug causing text to be clipped incorrectly when printed.
+
+- Fixed issue where Qt::KeyPadModifier was not being set for non-numeric
+  keypad keys.
+
+- Ensured that files written by QSettings will only get user-readable
+  permissions by default.
+
+- Ensured that QContextMenuEvent is also delivered when a popup menu is
+  already open.
+
+- Added missing support for clipping of bitmaps on non-XRender systems.
+
+- Fixed platform inconsistency with cosmetic pens.
+
+- Fixed a potential crash when starting a QProcess for a non-existant
+  process.
+
+- QPainter
+	Improved stability of QPainter::setClipPath().
+	Fixed painting issues with transformed points drawn with an aliased
+        cosmetic pen.
+
+- QFontMetrics
+	Fixed a bug in boundingRect().
+	Fixed a potential crash in the constructor when it is passed a zero
+        paint device.
+
+
+Mac OS X:
+
+- Fixed issues with pasting of Japanese characters.
+
+- Fixed a bug that made the close button unavailable on modal windows.
+
+- Fixed icon rendering on x86 CPUs.
+
+- Fixed painting of QBitmap into a QPixmap.
+
+- Added the -framework and -F configure options.
+
+- Fixed a bug where the menu bar would not show all items.
+
+- Fixed several drag and drop issues.
+
+- Fixed a bug that caused the font size to change when clicking checkable
+  toolbar buttons.
+
+- Fixed a crash that occurred when using a Qt-plugin in a non-Qt application.
+
+- Fixed use of newlines in a QMessageBox.
+
+- Fixed painting of QGroupBox without any text.
+
+- Fixed rendering of Qt::FDiagPattern and Qt::BDiagPattern.
+
+- Fixed building with -no-qt3support.
+
+- Fixed painting of the sort indicator in item view headers.
+
+- Fixed text placement in QGroupBox.
+
+- Fixed icon placement in QPushButton when used with RTL scripts.
+
+- Fixed painting of read-only line edit widgets.
+
+- Fixed animation of the Composition Modes demo.
+
+- Fixed painting of QSpinBoxes smaller than 25 pixels.
+
+- Fixed a bug preventing the page ranges in the print dialog from being set.
+
+- Fixed a bug causing QPrinter::pageSize() to return incorrect sizes.
+
+- Fixed printer resolution setting.
+
+- Improved quality of PDF output.
+
+- Ensured that calling setDirtyRegion() from within dragMoveEvent() updates
+  item views correctly.
+
+- Fixed a bug resulting in painting and performance issues for embedded
+  QGLWidgets when using MacMetalStyle.
+
+- Fixed a bug that sometimes prevented widgets from being shown.
+
+- Ensured that the correct number of tick marks are painted on sliders.
+
+- Fixed issue where Qt::FramelessWindowHint widgets were not visible in
+  Expose.
+
+- Fixed a painting error that occurred when unchecking checkboxes.
+
+- Fixed a bug that caused file dialogs and frameless windows to appear
+  outside screen bounds.
+
+- Prevented windows from losing their shadows after using QRubberBand.
+
+- Fixed a potential crash in QPixmap::copy() when given an area outside image
+  bounds.
+
+- Improved QToolButton arrow appearance.
+
+- Fixed an issue causing QDateTime::toString(Qt::LocalDate) to return
+  incorrect dates.
+
+- Improved performance of QPainter::drawImage().
+
+- Fixed sometimes incorrect drawing with QPainterPath.
+
+- Improved key translation for non-Latin keyboard layouts.
+
+- QGLWidget
+	Fixed update issues when QGLWidgets are embedded in a QTabWidget.
+
+- QLibrary
+	isLibrary() now supports .dylib libraries with version numbers.
+
+- QWidget
+	Fixed a platform inconsistency with isActiveWindow().
+
+- Designer
+	Fixed some painting issues with widgets that are not laid out.
+	Allow dragging of widgets in Designer when the toolbox is hidden.
+        Fixed a bug preventing Designer from being hidden using
+        "Command + H".
+
+
+Qtopia Core:
+
+- Added configure options to build decorations and mouse drivers as plugins.
+
+- Lots of new documentation.
+
+- Added support for 8 and 16 bit screens.
+
+- Fixed a bug that could result in painting errors after setting a new
+  decoration with QApplication::qwsSetDocoration().
+
+- New skins for QVfb provided in the X11 package.
+
+- Fixed the transparent corners of the window decoration using the Plastique
+  style.
+
+- Removed dependency of shared memory when using QT_NO_QWS_MULTIPROCESS.
+
+- Fixed input method focus change problems.
+
+- Ensured that fonts are searched for using QLibraryInfo::LibrariesPath
+  instead of PrefixPath.
+
+- Ensured that the smooth font flag is respected when parsing the 'fontdir'
+  file.
+
+- Fixed crash on systems where Helvetica font is not available.
+
+- Reduced memory usage with large fonts.
+
+- Added support for QIODevice::canReadLine().
+
+- Ensured that the Qtopia Core data directory owner is checked against the
+  effective user.
+
+- Fixed appearance of the title bar font when the application font has not
+  been set.
+
+- Ensured that the correct keycodes are generated for SysRq and PrtSc.
+
+- Added support for transformed screens to QDirectPainter.
+
+- Fixed issues with -title and -geometry command line arguments.
+
+- Improved sound support.
diff --git a/dist/changes-4.1.4 b/dist/changes-4.1.4
new file mode 100644
index 0000000000..426959e606
--- /dev/null
+++ b/dist/changes-4.1.4
@@ -0,0 +1,125 @@
+Qt 4.1.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.1.0.
+
+The Qt version 4.1 series is binary compatible with the 4.0.x series.
+Applications compiled for 4.0 will continue to run with 4.1.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Configure / Compilation
+	Compile with -no-qt3support on Windows.
+	Compile on Linux with icc 9.1.
+	Compile on tru64-g++.
+	Compile MySQL plugin with client libraries below MySQL 4.1.
+	Compile SQLite on Tru64 V5.1B with gcc 3.3.4.
+	Compile ODBC plugin on 64-bit Windows.
+	Disable fastcall calling convention on faulty gcc compilers.
+
+Demos / Examples
+	Fixed a crash in the Torrent example.
+	Container extension example: Fixed regression that caused Designer
+	to crash when previewing a MultiPageWidget and changing the page.
+
+Designer
+	Generate unique object names for splitters.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General improvements
+--------------------
+
+- Fixed crash in QGLWidget::makeCurrent() when called from a thread not
+  created with QThread.
+- Fixed a crash that occurred when writing a PNG image when Qt is built
+  statically.
+- Fixed Arabic shaping for some fonts.
+- Limited the character string to 255 characters when writing Type1 fonts to
+  a PostScript file, in accordance with the PostScript specification.
+- Fixed regression in painting of clipped, cosmetic lines with angles of
+  0-45 degrees.
+- Documented the rules for starting and stopping timers in multithreaded
+  applications.
+
+- QCommonStyle
+	Added protection against null pointer in pixelMetric() for
+	PM_TabBarTabVSpace.
+
+- QDirModel
+	Fixed crash when dragging and dropping a file into a directory.
+
+- QHeaderView
+	Fixed painting errors when scrolling a header that has a large
+	number of sections.
+
+- QListView
+	Fixed assert when hiding all the rows.
+	Fixed crash when setting the model to a null pointer.
+
+- QMainWindow
+	Fixed possible crash when calling setCentralWidget() multiple
+        times.
+
+- QPainter
+	Fixed a regression in drawPoint() that caused painting errors
+	when setting the pen width to 0 (e.g. cosmetic pen) and then
+	setting a scale.
+
+- QPlastiqueStyle
+	Fixed a regression that caused flat push buttons to be painted
+	like normal push buttons.
+
+- QSortFilterProxyModel
+	Emit modelReset() signal when setting a source model.
+
+- QTextEdit
+        Ensure that the cursor is visible after dragging & dropping text
+
+- QTreeView
+	Fixed potential assert when asking for the coordinates of a
+	non-existing item.
+	Fixed a regression that caused selections to be	painted
+	incorrectly when the last column was hidden.
+
+- QWidget
+	Fixed crash when deleting the widget in closeEvent().
+
+- QWorkspace
+	Fixed crash caused by setting the window title when windowWidget is
+        null.
+
+Platform-Specific changes
+-------------------------
+
+Windows:
+
+- Fixed a bug that caused application text to be absent in Qt applications
+  on Windows NT 4.0.
+- Fixed resource leak in non-accelerated GL contexts.
+
+
+X11:
+
+- Improved performance of clipped bitmaps on systems that don't use XRender.
+- Made QFont::setStretch() work when using FontConfig/FreeType fonts.
+- Documented scrolling of transparent/opaque widgets.
+
+
+QPaintEngine
+	Support OddEven fill rule.
+
+QPainter
+	Fixed a regression that caused drawImage() to ignore the width
+	and height of the source rectangle and draw the whole image without
+	any clipping.
+
+
+Qtopia Core:
+
+- Fixed crash due to incorrect assembly code in implementation of
+  q_atomic_swp() for ARM.
+- Set the Q_PACKED macro when using icc on ARM, so that the generated
+  code is binary compatible with gcc-generated code.
diff --git a/dist/changes-4.1.5 b/dist/changes-4.1.5
new file mode 100644
index 0000000000..fefc91bc1b
--- /dev/null
+++ b/dist/changes-4.1.5
@@ -0,0 +1,14 @@
+Qt 4.1.5 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.1.0.
+
+The Qt version 4.1 series is binary compatible with the 4.0.x series.
+Applications compiled for 4.0 will continue to run with 4.1.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+- QImage
+        Fixed a potential security issue which could arise when transforming
+        images from untrusted sources.
+
diff --git a/dist/changes-4.2.0 b/dist/changes-4.2.0
new file mode 100644
index 0000000000..f42da271e5
--- /dev/null
+++ b/dist/changes-4.2.0
@@ -0,0 +1,2506 @@
+Qt 4.2 introduces many new features as well as many improvements and
+bugfixes over the 4.1.x series. For more details, see the online
+documentation which is included in this distribution. The
+documentation is also available at http://doc.trolltech.com/
+
+The Qt version 4.2 series is binary compatible with the 4.1.x series.
+Applications compiled for 4.1 will continue to run with 4.2.
+
+The Qtopia Core version 4.2 series is binary compatible with the 4.1.x
+series except for some parts of the device handling API, as detailed
+in Platform Specific Changes below.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+
+New features
+------------
+
+- QCalendarWidget provides a standard monthly calendar widget with date
+  selection features.
+
+- QCleanlooksStyle provides the new Cleanlooks style, a clone of the GNOME
+  ClearLooks style, giving Qt applications a native look on GNOME desktops.
+
+- QCompleter provides facilities for auto completion in text entry widgets.
+
+- QDataWidgetMapper can be used to make widgets data-aware by mapping them
+  to sections of an item model.
+
+- QDesktopServices provides desktop integration features, such as support
+  for opening URLs using system services.
+
+- QDialogButtonBox is used in dialogs to ensure that buttons are placed
+  according to platform-specific style guidelines.
+
+- QFileSystemWatcher enables applications to monitor files and directories
+  for changes.
+
+- QFontComboBox provides a standard font selection widget for document
+  processing applications.
+
+- QGraphicsView and related classes provide the Graphics View framework, a
+  replacement for Qt 3's canvas module that provides an improved API, enhanced
+  rendering, and more responsive handling of large numbers of canvas items.
+
+- QGLFramebufferObject encapsulates OpenGL framebuffer objects.
+
+- QMacPasteboardMime handles Pasteboard access on Qt/Mac. This obsoletes
+  QMacMime as the underlying system has changed to support Apple's new
+  Pasteboard Manager. Any old QMacMime objects will not be used.
+
+- QNetworkInterface represents a network interface, providing information
+  about the host's IP addresses and network interfaces.
+
+- QResource provides static functions that control resource lookup and
+  provides a way to navigate resources directly without levels of
+  indirection through QFile/QFileEngine.
+
+- QSystemTrayIcon allows applications to provide their own icon in the
+  system tray.
+
+- QTimeLine gives developers access to a standard time line class with which
+  to create widget animations.
+
+- The QtDBus module provides inter-process communication on platforms
+  that support the D-BUS protocol.
+
+- The QUndo* classes in Qt's Undo framework provide undo/redo functionality
+  for applications.
+
+- Support for the Glib event loop to enable integration between Qt and non-Qt
+  applications on the GNOME desktop environment.
+
+- Improved Accessibility for item-based views and QTextEdit.
+
+- Support for main window animations and tabbed dock widgets.
+
+- Added an SVG icon engine to enable SVG drawings to be used by QIcon.
+
+- Widgets can now be styled according to rules specified in a style sheet,
+  using a syntax familiar to users of Cascading Style Sheets (CSS). Style
+  sheets are set using the QWidget::styleSheet property.
+
+- Introduced a new key mapper system which improves the shortcut system by
+  only testing the real possible shortcuts, such as Ctrl+Shift+= and Ctrl++
+  on an English keyboard.
+
+- Improved and enhanced QMessageBox to support native look and feel on many
+  common platforms.
+
+- Experimental support for Qt usage reporting ("metered licenses") on Linux,
+  Windows and Mac OS X. Reporting is disabled by default.
+
+- A screen magnification utility, pixeltool, is provided. It is designed to help
+  with the process of fine-tuning styles and user interface features.
+
+- New qrand() and qsrand() functions to provide thread safe equivalents to
+  rand() and srand().
+
+
+General improvements
+--------------------
+
+- Item views
+
+      * Selections are maintained when the layout of the model changes
+        (e.g., due to sorting).
+
+      * Convenience views can perform dynamic sorting of items when the data
+        in items changes.
+
+      * QStandardItem provides an item-based API for use with
+        QStandardItemModel and the model/view item view classes.
+
+      * QStandardItemModel API provides a classic item-based approach to
+        working with models.
+
+      * Single selection item views on Mac OS X cannot change their current
+        item without changing the current selection when using keyboard
+        navigation.
+
+- Plastique style has improved support for palettes, and now requires
+  XRender support on X11 for alpha transparency.
+
+- Tulip containers
+
+      * Added typedefs for STL compatability.
+
+      * Added function overloads to make the API easier to use.
+
+- Added the Q3TextStream class for compatiblity with Qt 3 and to assist with
+  porting projects.
+
+- OpenGL paint engine
+
+      * Added support for all composition modes of QPainter natively using
+        OpenGL.
+
+      * Fixed a case where very large polygons failed to render correctly.
+
+      * Ensured that glClear() is only called in begin() if the
+        QGLWidget::autoFillBackground() property is true.
+
+      * Ensured that a buffer swap is only performed in end() if
+        QGLWidget::autoBufferSwap() is true.
+
+      * Improved text drawing speed and quality.
+
+- Raster paint engine
+
+      * Fixed blending of 8 bit indexed images with alpha values.
+
+      * Fixed drawing onto QImages that were wider than 2048 pixels.
+
+      * Fixed alpha-blending and anti-aliasing on ARGB32 images.
+
+      * Improved point drawing performance.
+
+      * Fixed issue where lines were drawn between coordinates that were
+        rounded instead of truncated.
+
+      * Ensured that setClipRegion(QRegion()) clips away all painting
+        operations as originally intended.
+
+
+Third party components
+----------------------
+
+- Dropped support for MySQL version 3.
+
+- Updated Qt's SQLite version to 3.3.6.
+
+- Updated Qt's FreeType version to 2.2.1.
+
+- Updated Qt's libpng version to 1.2.10.
+
+
+Build System
+------------
+
+- Auto-detect PostgreSQL and MySQL using pg_config and mysql_config on UNIX
+  based systems in the configure script
+
+- Added "-system-sqlite" option to configure to use the system's SQLite
+  library instead of Qt's SQLite version.
+
+- Added QT_ASCII_CAST_WARNINGS define that will output a warning on implicit
+  ascii to Unicode conversion when set. Only works if the compiler supports
+  deprecated API warnings.
+
+- Added Q_REQUIRED_RESULT to some functions. This macro triggers a warning
+  if the result of a function is discarded. Currently only supported by gcc.
+
+
+- Qt/X11, Qt/Mac and Qtopia Core only:
+
+     * Added all QT_NO_* defines to the build key.
+
+
+- Qt/X11 and Qtopia Core only:
+
+     * As in Qt 3, the configure script enables the -release option by
+       default, causing the Qt libraries to be built with optimizations. If
+       configured with the -debug option, the debug builds no longer result
+       in libraries with the _debug suffix.
+
+       On modern systems, flags are added to the Qt build to also
+       generate debugging information, which is then stored in a
+       separate .debug file. The additional debug information does not
+       affect the performance of the optimized code and tools like gdb
+       and valgrind automatically pick up the separate .debug
+       files. This way it is possible to get useful backtraces even
+       with release builds of Qt.
+
+     * Removed the last vestiges of the module options in the configure
+       script, previously they were available but did not function.
+
+     * Implemented a -build option in the configure script to conditionally
+       compile only certain sections of Qt.
+
+     * Made it possible to build Qt while having "xcode" set as your
+       QMAKESPEC on OSX.
+
+
+- Windows only:
+
+     * Populated the build key, as done on all the other platforms.
+
+     * Fixed dependency generation in Visual Studio Solutions (.sln)
+       created by qmake.
+
+     * Added missing platforms to the Visual Studio project generator (X64,
+       SH3DSP and EBC).
+
+     * Made UIC3 use a temporary file for long command lines.
+
+     * Removed the object file (.o) conflicts with MinGW that appeared when
+       embedding a native resource file which was named the same as a normal
+       source file.
+
+     * Fixed mkspec detection when generating project files outside of QTDIR.
+
+     * Removed compiler warnings with MinGW g++ 3.4.5.
+
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+
+- QAbstractButton
+
+      * Returns QPalette::Button and QPalette::ButtonText for
+        backgroundRole() and foregroundRole(), respectively, rather than
+        QPalette::Background and QPalette::Foreground.
+
+      * Ensured that nextCheckState() is called only when there is a state
+        change.
+
+- QAbstractItemModel
+
+      * When dropping rows only insert rows that were actually dropped, not
+        the continuous row count from first to last.
+
+      * Added a supportedDragActions property to be used by
+        QAbstractItemView when starting a drag.
+
+      * When updating changed persistent indexes, ignore those that haven't
+        actually changed.
+
+      * Fixed endian issue with createIndex().
+
+      * Added FixedString matching for match().
+
+      * Changed the sorting algorithm to use a stable sort.
+
+      * Added persistentIndexList() function.
+
+- QAbstractItemView
+
+      * Added possibility to copy elements to clipboard on read-only views.
+
+      * Improved handling of QAbstractItemModel::supportedDropActions().
+
+      * Ensured that the current item is selected when using keyboard
+        search.
+
+      * Ensured that the view starts with a valid current index.
+
+      * Ensured that data is only committed in currentChanged() if the
+        editor is not persistent.
+
+      * Fixed crash that occurred when a modal dialogs was opened when
+        closing an editor.
+
+      * Added verticalScrollMode and horizontalScrollMode properties.
+
+      * Added setItemDelegateForRow() and setItemDelegateForColumn().
+
+      * Ensured that existing models are disconnected properly when
+        replaced.
+
+      * Ensured that the doubleClicked() signal is only emitted when the
+        left button has been double-clicked.
+
+      * Changed setSelection(...) to work when given a non-normalized
+        rectangle.
+
+      * Fixed regression for shift-selections in ExtendedSelection for
+        all views.
+
+      * Added dragDropMode property and implemented move support in all of
+        the views and models.
+
+      * For edit triggers SelectedClicked and DoubleClicked, only trigger
+        editing when the left button is clicked.
+
+      * Trigger SelectedClicked editing on mouse release, not mouse press.
+
+      * Suppressed the doubleClicked() signal in cases where the clicks
+        happened on two different items.
+
+      * Enabled keyboard search to be programmatically reset by calling
+        keyboardSearch() with an empty string as argument.
+
+      * Don't allow drops on items that don't have the Qt::ItemIsDropEnabled
+        flag set.
+
+      * Added modelAboutToBeReset() and layoutAboutToBeChanged() signals.
+
+      * Suppressed assertion in dropMimeData() for cases where mimeTypes()
+        returns an empty list.
+
+      * Ensured consistent behavior of drag and drop when rootIndex() is a
+        valid model index.
+
+      * Made it possible to check a checkbox with only a single click when
+        using the CurrentChanged edit trigger.
+
+      * Ensured that WhatsThis events are propagated when the relevant item
+        doesn't have a valid "What's This?" value.
+
+      * Added PositionAtCenter scrollHint.
+
+      * Added support to allow items to be checked and unchecked using the
+        keyboard.
+
+      * Added support for keypad navigation.
+
+- QAbstractProxyModel
+
+      * Added default implementations for data(), headerData() and flags()
+
+- QAbstractScrollArea
+
+      * Added ability to set a corner widget.
+
+      * Added ability to set scroll bar widgets.
+
+      * Added support for custom scroll bars.
+
+- QAbstractSpinBox
+
+      * Added a hasAcceptableInput() property.
+
+      * Ensured that fixup/validate are called for third party subclasses of
+        QAbstractSpinBox as well.
+
+      * Fixed geometry issues when toggling frames on and off for spinboxes.
+
+      * Added a property for correctionMode.
+
+      * Added a property for acceleration.
+
+- QAbstractPrintDialog
+
+      * Fixed handling of existing printer options so that storage of page
+        ranges using setFromTo() works as expected when printing in PDF format.
+
+- QAction
+
+      * Added the setAutoRepeat(bool) function to disable auto-repeating
+        actions on keyboard shortcuts.
+
+- QApplication
+
+      * Added saveStateRequest() and commitDataRequest() signals so that
+        QApplication does not need to be subclassed to enable session
+        management in an application.
+
+      * Added the styleSheet property to get/set the application style sheet.
+
+      * Support sending key events to non-widget objects.
+
+      * Ensured that argc and argv as passed to the QApplication constructor
+        will always be zero-terminated on all platforms after QApplication
+        consumes command line options for itself.
+
+- QBrush
+
+      * Added a constructor that accepts a QImage.
+
+- QButtonGroup
+
+      * Added pressed() and released() signals.
+
+      * Fixed a bug caused by removing buttons from button groups. Removed the
+        internal mapping as well.
+
+      * Ensured that checkedButton() returns the correct value with
+        non-exclusive groups.
+
+- QClipboard
+
+      * Added support for find text buffer.
+
+- QColor
+
+      * Fixed corruption in setRed(), setGreen() and setBlue() for HSV/CMYK
+        colors.
+
+- QComboBox
+
+      * Fixed drawing issues related to certain FocusPolicy values.
+
+      * Ensured that the ItemFlags of an Item (ItemIsEnabled,...) are
+        respected.
+
+      * Fixed cases where the popup could be shown completly on screen, but
+        weren't.
+
+      * Added the InsertAlphabetically insert policy.
+
+      * Fixed case where a QPixmap could not be displayed using a QIcon.
+
+      * Fixed the type of the modelColumn property from bool to int.
+
+      * Updated documentation to clarify the differences between activated(),
+        highlighted() and currentIndexChanged(), and describe what they
+        actually mean.
+
+      * Updated the behavior to ensure that, if the combobox isn't editable,
+        the Qt::DisplayRole rather than the Qt::EditRole is used to query the
+        model.
+
+- QCoreApplication
+
+      * Added flags to enable/disable application-wide features such as
+        delayed widget creation.
+
+- QCursor
+
+      * Added support for the newly added Qt::OpenHandCursor and
+        Qt::ClosedHandCursor enum values.
+
+- QDate
+
+      * Support dates all the way down to Julian Day 1 (2 January 4713 B.C.)
+        using the Julian calendar when appropriate.
+
+- QDateTime
+
+      * Fixed parsing issue in fromString(const QString &, Qt::DateFormat).
+
+- QDateTimeEdit
+
+      * Added the calendarPopup property to enable date selection using the
+        new QCalendarWidget class.
+
+      * Added a setSelectedSection() function to allow the currently selected
+        section to be programmatically set.
+
+- QDesktopWidget
+
+      * Remove a potential out-of-bounds read.
+
+- QDialog
+
+      * Improved stability in cases where the default button is deleted.
+
+- QDir
+
+      * Improved support for i18n file paths in QDir::tempPath().
+
+      * Improved support for UNC paths when the application is run from a
+        share.
+
+      * Ensured that mkpath() properly supports UNC paths.
+
+      * Obsoleted QDir::convertSeparators().
+
+      * Introduced QDir::toNativeSeparators() and QDir::fromNativeSeparators().
+
+      * Added a QDebug streaming operator.
+
+- QDirModel
+
+      * Fixed conversion from bytes to larger units in QDirModel in the file
+        size display.
+
+      * Remove hardcoded filtering of the '.' and '..' entries.
+
+- QErrorMessage
+
+      * Made qtHandler() work in cases where the message handler is invoked
+        from threads other than the GUI thread.
+
+- QEvent
+
+      * Added the KeyboardLayoutChange event type which is sent when the
+        keyboard layout changes.
+
+- QFile
+
+      * Improved support for UNC paths when the application is run from a
+        share.
+
+      * Added support for physical drives (e.g., "//./Physical01").
+
+      * Ensured that QFile::error() and QIODevice::errorString() are set
+        whenever possible when errors occur.
+
+      * Renamed readLink() to symLinkTarget().
+
+- QFileDialog
+
+      * Fixed a case where view mode got disabled.
+
+- QFileInfo
+
+      * Improved support for UNC paths when the application is run from a
+        share.
+        
+      * Improved support for drive-local relative paths, such as "D:".
+
+      * Renamed readLink() to symLinkTarget().
+
+- QFlags
+
+      * Added the testFlag() convenience function.
+
+- QFont
+
+      * Added NoFontMerging as a flag to QFont::StyleStrategy.
+
+- QFontDatabase
+
+      * Added functions for handling application-local fonts at run-time:
+        addApplicationFont(), removeApplicationFont(),
+        applicationFontFamilies(), etc.
+
+- QFontDialog
+
+      * Enabled support for custom window titles.
+
+- QFontMetrics/QFontMetricsF
+
+      * Added the elidedText() function.
+
+      * Added the averageCharWidth() function.
+
+- QFrame
+
+      * Fixed a rendering issue when showing horizontal and vertical lines
+        created using Designer.
+
+- QFtp
+
+      * Improved parsing of the modified date in list().
+
+      * Ensured that all data has been received when downloading, before the
+        data connection is closed.
+
+      * Added support for FTP servers that reject commands with a 202 response.
+
+- QGLFormat
+
+      * Added the openGLVersionFlags() function.
+
+      * Added support for setting the swap interval for a context
+        (i.e., syncing to the vertical retrace).
+
+      * Added support for setting red, green and blue buffer sizes.
+
+- QGLWidget
+
+      * Fixed a resource leak that could occur when binding QImages with the
+        bindTexture() function.
+
+      * Fixed renderText() to produce proper output when depth buffering is
+        enabled.
+
+      * Fixed bindTexture() to respect premultiplied QImage formats.
+
+      * Ensured that the updatesEnabled property is respected.
+
+- QGradient
+
+      * Added default constructors and setter functions for all gradients and
+        their attributes.
+
+- QGridLayout
+
+      * Do not segfault if cellRect() is called before setGeometry(), 
+        even though the result is documented to be undefined.
+
+      * Fixed maximum size handling when adding spacing.
+
+- QGroupBox
+
+      * Activating a group box by a shortcut will now show the focus rectangle.
+
+      * Added the clicked() signal
+
+- QHash
+
+      * Prevent conversion of iterator or const_iterator to bool
+        (e.g., if (map->find(value))) because the conversion always returned
+        true. Qt 4.1 code that doesn't compile because of this change was most
+        probably buggy.
+
+      * Added the uniqueKeys() function.
+
+- QHeaderView
+
+      * Use the current resize mode to determine section sizes when
+        new rows are inserted.
+
+      * Recover the internal state if other widgets steal the mouse release
+        event.
+
+      * Ensure that moved sections can be removed without asserting.
+
+      * Be more robust with regards to arguments sent to the rowsInserted slot.
+
+      * Let the stretchLastSection property override the globalResizeMode in
+        the resizeSections() function.
+
+      * Renamed ResizeMode::Custom to ResizeMode::Fixed.
+
+      * Added the swapSections() convenience function.
+
+      * Added a more "splitter-like" resize mode.
+
+      * Added the possibility for the user to turn off stretch mode by
+        resizing the header section. This includes the stretchLastSection
+        property.
+
+      * Added the minimumSectionSize property.
+
+      * Get the section size hint from the Qt::SizeHintRole, if set.
+
+      * Added the ResizeToContents resize mode.
+
+      * Ensure that all header contents are centered by default.
+
+      * Improved the internal structure to be more memory efficient.
+
+- QHostAddress
+
+      * Added QDataStream streaming operators.
+
+- QHttp
+
+      * Support percent-encoded paths when used with a proxy server.
+
+      * Improved handling of unexpected remote socket close.
+
+- QHttpHeader
+
+      * Improved support for case-insensitive header searching.
+
+- QIcon
+
+      * Fixed issue where actualSize() might return a larger value than the
+        requested size.
+
+      * Fixed improper pixmap caching
+
+      * Added QDataStream operators for QIcon.
+
+      * Added the Selected mode.
+
+- QImage
+
+      * Added support for 16 bit RGB format.
+
+      * Added QPoint overloads to various (int x, int y) functions.
+
+      * Added support for faster/better rotation of images by 90/180/270
+        degrees.
+
+      * convertToFormat() now supports the color lookup table.
+
+      * Improved algorithm for smooth scaling to produce better results.
+
+- QImageReader
+
+      * Ensured that size() returns an invalid QSize if the image I/O handler
+        does not support the QImageIOHandler::Size extension.
+
+      * Added support for reading negative BMP images.
+
+      * Improved handling of invalid devices.
+
+      * Added optimizations to ensure that the most likely formats and plugins
+        are tested first when reading unknown image formats.
+
+      * Improved reading of BMP images from sequential QIODevices.
+
+      * Support for scaledSize() with JPEG images.
+
+      * It is now possible to query the supported options of an image by
+        calling supportedOptions().
+
+      * Stability fixes for the built-in XBM reader.
+
+- QImageWriter
+
+      * Ensured that an error is reported when attempting to write an image
+        to a non-writable device.
+
+      * It is now possible to query the supported options of an image by
+        calling supportedOptions().
+
+- QIODevice
+
+      * Fixed a casting bug in QIODevice::getChar().
+
+      * Improved reading performance significantly by using an internal buffer
+        when a device is opened in buffered mode.
+
+      * Some behavioral differences have been introduced:
+
+        + The following functions now need to call the base implementation
+          when reimplemented: atEnd(), bytesAvailable(), size(), canReadLine().
+
+        + pos() should return the base implementation directly.
+
+        + QIODevice now handles the device position internally. seek() should
+          always end up calling the base implementation.
+
+- QItemDelegate
+
+      * Use a widget's USER property to set and get the editor data.
+
+      * Removed unnecessary assertions.
+
+      * Added the clipping property to enable clipping when painting.
+
+      * When the model specifies a font, resolve the font over the existing
+        one rather than replacing it.
+
+      * Fixed issue with rendering of selected pixmaps.
+
+      * Ensured that QItemEditorFactory is called with the variant's
+        userType() so that the factory can distinguish between multiple user
+        types.
+
+      * Ensured that Key_Enter is propagated to the editor before data is
+        committed, so that the editor has a chance to perform custom input
+        validation/fixup.
+
+      * Let the line edit grow to accomodate long strings.
+
+      * Made it easer to subclass the item delegate.
+
+      * Added support for keypad navigation.
+
+- QItemSelectionModel
+
+      * Improved overall speed, particularly when isSelected() is used.
+
+      * Added functions for getting the selected rows or columns.
+
+      * Ensured that the current index is updated when it is being removed.
+
+      * Ensure that QAbstractItemView::clearSelection() only clears the
+        selection and not the current index.
+
+      * Added the hasSelection() function.
+
+      * Fixed some connection leaks (connections were not disconnected) when
+        an QItemSelectionModel was deleted. This should also speed up some
+        special cases.
+
+- QKeySequence
+
+      * Added a set of platform-dependent standard shortcuts.
+
+      * Fixed incorrect parsing of translated modifiers.
+
+- QLabel
+
+      * Added support for text selection and hyperlinks.
+
+      * Improved handling of scaled pixmaps.
+
+      * Made handling of QMovie safer to avoid object ownership issues.
+
+- QLibrary
+
+      * Added support for hints to control how libraries are opened on UNIX
+        systems.
+
+      * Added errorString() to report the causes of errors when libraries
+        fail to load.
+
+      * Added easier way to debug plugin loading: Setting QT_DEBUG_PLUGINS=1
+        in the environment will enable debug message printing on the
+        console.
+
+      * Increased the number of acceptable file name suffixes used to
+        recognize library files.
+
+- QLineEdit
+
+      * Ensured that the Unicode context menu gets shown if language
+        extensions are present.
+        
+      * Ensured that editingFinished() is not emitted if a validator is set
+        and the text cannot be validated.
+
+      * Ctrl+A now triggers select all on all platforms.
+
+      * Call fixup on focusOut() if !hasAcceptableInput().
+
+      * Added auto-completion support with the setCompleter() function.
+
+      * Fixed painting errors when contents margins were set.
+
+      * Invalid text set using setText() can now be edited where previously
+        it had to be deleted before new text could be inserted.
+
+      * Use SE_LineEditContents to control the contents rect of each
+        QLineEdit.
+
+- QListView
+
+      * Added the batchSize property.
+
+      * Don't un-hide currently hidden rows when new rows are inserted.
+
+      * Fixed partial repainting bug that occurred when alternatingRowColors
+        was enabled.
+
+      * Ensured that the resize mode is not reset in setViewMode() if it was
+        already set.
+
+      * Fixed crash that occurred when the first item was hidden and
+        uniformItemSizes was set.
+
+      * Added the wordWrap property for wrapping item text.
+
+      * Allow the user to select items consecutively when shift-selecting.
+
+      * Ensured that only the top item is selected when the user clicks on
+        an area with several items are stacked on top of each other.
+
+      * Optimized hiding and showing of items.
+
+      * Fixed issue where dragging an item in Snap mode did not respect the
+        scroll bar offsets.
+
+      * Fixed issue in Snap mode where a (drag and) drop did not always
+        query the item that existed in the corresponding cell for an enabled
+        Qt::ItemIsDropEnabled flag. 
+
+- QListWidget/QTreeWidget/QTableWidget
+
+      * Ensured the dataChanged() signal is emitted when flags are set on an
+        item.
+
+      * Removed unnecessary assertions.
+
+      * Added more convenience functions in QListWidget, QTableWidget and
+        QTreeWidget for selecting, hiding, showing, expanding and collapsing
+        nodes.
+
+      * Ensured that changes to items are reported.
+
+- QLocale
+
+      * Fixed bug in the string-to-number functions which sometimes caused
+        them to fail on negative numbers which contained thousand-
+        separators.
+
+      * Implemented the numberOptions property for specifying how
+        string-to-number and number-to-string conversions should be
+        performed.
+
+- QMainWindow
+
+      * Added support for tabbed dock widgets.
+
+      * Enhanced look and feel of dock widget handling. When a dock widget
+        hovers over a main window, the main window animates the existing
+        dock widgets and main area to show how it will accept the dock
+        widget if dropped.
+
+      * Fixed issues related to insertToolBarBreak().
+
+- QMap
+
+      * Prevent conversion of iterator or const_iterator to bool
+        (e.g., if (map->find(value))), because the conversion always
+        returned true. Qt 4.1 code that doesn't compile because of this
+        change was most probably buggy.
+
+      * Added the uniqueKeys() function.
+
+- QMenu
+
+      * Added the aboutToHide() signal.
+
+      * Added the isEmpty() accessor function.
+
+      * Clear menuAction() when setMenu(0)
+
+      * Added support for widgets in menus via QWidgetAction.
+
+      * Collapse multiple consecutive separators. This can be turned off
+        with the collapsibleSeparators property.
+
+      * Made scrollable menus wrap, just like non-scrollable ones.
+
+- QMessageBox
+
+      * Updated the API to allow more than 3 buttons to be used.
+
+      * Added support to display buttons in the order required by
+        platform-specific style guidelines.
+
+      * Added support for display of informative text using the
+        informativeText property.
+
+      * Added the detailedText property to allow detailed text to be
+        displayed.
+
+      * Improved sizing of message box (especially on Mac OS X).
+
+      * Changed the behavior so that long text strings are automatically
+        wrapped.
+
+      * Updated icon handling to use QStyle::standardIcon() where possible.
+
+- QMetaObject
+
+      * Added the userProperty() and normalizedType() functions.
+
+- QMetaType
+
+      * Ensured that all type names are normalized before registering them.
+
+      * Added support for handling Qt's integer typedefs: qint8, qint16,
+        etc.
+
+- QModelIndex
+
+      * Added the flags() convenience function.
+
+- QMutexLocker, QReadLocker, and QWriteLocker
+
+      * These classes now track the state of the lock they are holding.
+        They will not unlock on destruction if unlock() has been called.
+
+- QObject
+
+      * thread() will always return a valid thread, even if the object was
+        created before QApplication or in a non-QThread thread.
+
+      * When thread() returns zero, events are no longer sent to the object.
+        (Previous versions of Qt would send posted events to objects with no
+        thread; this does not happen in Qt 4.2).
+
+      * Added support for dynamically added properties via the new
+        property(), setProperty(), and dynamicPropertyNames() functions.
+
+      * Fixed a crash that could occur when a child deleted its sibling.
+
+- QPainter
+
+      * Fixed a crash the occurred when drawing cosmetic lines outside the
+        paint device boundaries.
+
+      * Fixed a pixel artifact issue that occurred when drawing cosmetic
+        diagonal lines.
+
+      * Fixed opaque backgrounds so that they are identical on all
+        platforms.
+
+      * Optimized drawing of cosmetic lines at angles between 315 and 360
+        degrees.
+
+      * Added the setRenderHints() function.
+
+      * Fixed a memory corruption issue in drawEllipse().
+
+- QPixmap
+
+      * Fixed crash caused by setting a mask or alpha channel on a pixmap
+        while it was being painted.
+
+      * Changed load() and save() to no longer require a format string.
+
+      * Ensured that grabWidget() works before the specified widget is first
+        shown.
+
+- QPluginLoader
+
+      * Added errorString() to report the causes of errors when plugins fail
+        to load.
+        
+- QPrinter
+
+      * Added support for PostScript as an output format on all platforms.
+
+      * Significantly reduced the size of the generated output when using
+        the PostScript and PDF drivers.
+
+      * Fixed issue where fromPage()/toPage() returned incorrect values when
+        generating PDF files.
+
+      * Ensured that setOutputFormat() preserves previously set printer
+        properties.
+
+      * Updated setOutputFileName() to automatically choose PostScript or
+        PDF as the output format for .ps or .pdf suffixes.
+
+- QProcess
+
+      * Added support for channel redirection to allow data to be redirected
+        to files or between processes.
+
+- QPushButton
+
+      * Ensured that, when a menu is added to a push button, its action is
+        also added to enable keyboard shortcuts.
+
+- QRect, QRectF, QRegion
+
+      * Renamed unite(), intersect(), subtract(), and eor() to united(),
+        intersected(), subtracted(), and xored() respectively.
+
+      * Added QRegion::intersects(QRegion) and QRegion::intersects(QRect).
+
+      * Fixed case where rect1 & rect2 & rect3 would return a non-empty
+        result for disjoint rectangles.
+
+- QRegExp
+
+      * Added RegExp2 syntax, providing greedy quantifiers (+, *, etc.).
+
+      * Marks (QChar::isMark()) are now treated as word characters,
+        affecting the behavior of '\b', '\w', and '\W' for languages
+        that use diacritic marks (e.g., Arabic).
+
+      * Fix reentrancy issue with the regexp cache.
+
+- QScrollArea
+
+      * Added the ensureWidgetVisible() function to facilitate scrolling to
+        specific child widgets in a scroll area.
+
+- QScrollBar
+
+      * Ensured that a SliderMove action is triggered when the slider value is
+        changed through a wheel event.
+
+- QSet
+
+      * Added QSet::iterator and QMutableSetIterator.
+
+- QSettings
+
+      * Store key sequences as readable entries in INI files.
+
+      * Detect NFS to prevent hanging when lockd isn't running.
+
+- QShortcut
+
+      * Added the setAutoRepeat(bool) function to disable auto-repeating
+        actions on keyboard shortcuts.
+
+- QSize
+
+      * Fixed potential overflow issue in scale().
+
+- QSlider
+
+      * Added support for jump-to-here positioning.
+
+- QSortFilterProxyModel
+
+      * Handle source model changes (e.g., data changes, item insertion
+        and removal) in a fine-grained manner, so that the proxy model
+        behaves more like a "real" model.
+
+      * Added sortRole, filterRole and dynamicSortFilter properties.
+
+      * Perform stable sorting of items.
+
+      * Fixed support for drag and drop operations where one item is dropped
+        on top of another.
+
+      * Ensure that persistent indexes are updated when the layout of the
+        source model changes.
+
+      * Made match() respect the current sorting and filtering settings.
+
+      * Forward mimeTypes() and supportedDropActions() calls to source
+        models.
+
+      * Added the ability to filter on all the columns.
+
+      * Added the filterChanged() function to enable custom filtering to be
+        implemented.
+
+- QSqlQuery
+
+      * Added execBatch() for executing SQL commands in a batch. Currently
+        only implemented for the Oracle driver.
+
+      * Fixed a case where executedQuery() would not return the executed
+        query.
+
+- QSqlRelationalTableModel
+
+      * Fixed issue related to sorting a relational column when using the
+        PostgreSQL driver.
+
+      * revertAll() now correctly reverts relational columns.
+
+- QStackedLayout
+
+      * Fixed crash that occurred when removing widgets under certain
+        conditions.
+
+- QStackedWidget
+
+      * Fixed crash that occurred when removing widgets under certain
+        conditions.
+
+      * Fixed issue where the size hint of the current widget would not be
+        respected.
+
+- QStandardItemModel
+
+      * Added an item-based API for use with QStandardItem.
+
+      * Reimplemented sort().
+
+      * Added the sortRole property.
+
+- QStatusBar
+
+      * Added the insertWidget() and insertPermanentWidget() functions.
+
+- QString
+
+      * Added support for case-insensitive comparison in compare().
+
+      * Added toUcs4() and fromUcs4() functions.
+
+- QStyle
+
+      * Added the following style hint selectors:
+        SH_Slider_AbsoluteSetButtons, SH_Slider_PageSetButtons,
+        SH_Menu_KeyboardSearch, SH_TabBar_ElideMode, SH_DialogButtonLayout,
+        SH_ComboBox_PopupFrameStyle, SH_MessageBox_TextInteractionFlags,
+        SH_DialogButtonBox_ButtonsHaveIcons, SH_SpellCheckUnderlineStyle,
+        SH_MessageBox_CenterButtons, SH_Menu_SelectionWrap,
+        SH_ItemView_MovementWithoutUpdatingSelection.
+
+      * Added the following standard pixmap selectors:
+        SP_DirIcon, SP_DialogOkButton, SP_DialogCancelButton,
+        SP_DialogHelpButton, SP_DialogOpenButton, SP_DialogSaveButton,
+        SP_DialogCloseButton, SP_DialogApplyButton, SP_DialogResetButton,
+        SP_DialogDiscardButton, SP_DialogYesButton, SP_DialogNoButton,
+        SP_ArrowUp, SP_ArrowDown, SP_ArrowLeft, SP_ArrowRight, SP_ArrowBack,
+        SP_ArrowForward.
+
+      * Added PE_PanelScrollAreaCorner and PE_Widget as primitive element
+        selectors.
+
+      * Added PM_MessageBoxIconSize and PM_ButtonIconSize as pixel metric
+        selectors.
+        
+      * Added SE_LineEditContents and SE_FrameContents as sub-element
+        selectors.
+
+      * Added SE_FrameContents to control the contents rectangle of a
+        QFrame.
+
+- QSvgHandler
+
+      * Improved style sheet parsing and handling.
+
+      * Added support for both embedded and external style sheets.
+
+      * Improved parsing of local url() references.
+
+      * Improved coordinate system handling.
+
+      * Fixed issue where the viewbox dimensions would be truncated to integer
+        values.
+
+      * Fixed support for gradient transformations.
+
+      * Fixed opacity inheritance behavior.
+
+      * Added support for gradient spreads.
+
+      * Fixed gradient stop inheritance behavior.
+
+      * Fixed parsing of fill and stroke properties specified in style sheets.
+
+      * Added support for reading and writing the duration of animated SVGs.
+
+      * Fixed incorrect rendering of SVGs that do not specify default viewboxes.
+
+      * Fixed radial gradient rendering for the case where no focal point is
+        specified.
+
+- QSyntaxHighlighter
+
+      * Added various performance improvements.
+
+- Qt namespace
+
+      * Added ForegroundRole and BackgroundRole, allowing itemviews to use
+        any QBrush (not just QColor, as previously) when rendering items.
+
+      * Added NoDockWidgetArea to the ToolBarArea enum.
+
+      * Added NoToolBarArea to the DockWidgetArea enum.
+
+      * Added GroupSwitchModifier to the KeyboardModifiers enum. It
+        represents special keys, such as the "AltGr" key found on many
+        keyboards.
+
+      * Added several missing keys to the Key enum: Key_Cancel, Key_Printer,
+        Key_Execute, Key_Sleep, Key_Play and Key_Zoom.
+
+      * Added OpenHandCursor and ClosedHandCursor for use with QCursor.
+
+- QTabBar
+
+      * QTabBar text can now be elided; this is controlled by the elideMode
+        property.
+
+      * You can now turn on or off the "scroll buttons" for the tab bar with
+        the usesScrollButtons property.
+
+      * Non-pixmap based styles will now fill the background of the tab with
+        the palette's window role.
+
+- QTabletEvent:
+
+      * Ensured that QTabletEvents are dispatched with the proper relative
+        coordinates.
+
+      * Added proximity as another type of a tablet event (currently only sent
+        to QApplication).
+
+- QTableView
+
+      * Added API for spanning cells.
+
+      * Ensured that cells are selected when the user right clicks on them.
+
+      * Added a corner widget.
+
+      * Added the setSortingEnabled property.
+
+- QTableWidget
+
+      * Added the clearContents() function to enable the contents of the view
+        to be cleared while not resetting the headers.
+
+      * QTableWidget now uses stable sorting.
+
+      * Allow sorting of non-numerical data.
+
+      * Add convenience table item constructor that takes an icon as well as
+        a string.
+
+- QTabWidget
+
+      * Added missing selected() Qt3Support signal.
+
+      * Clarified documentation for setCornerWidget().
+
+      * Ensured that the tab widget's frame is drawn correctly when the tab
+        bar is hidden.
+
+      * Ensured that the internal widgets have object names.
+
+      * Added iconSize, elideMode, and usesScrollButtons as properties (see
+        QTabBar).
+
+- QTcpSocket
+
+      * Fixed a rare data corruption problem occurring on heavily loaded
+        Windows servers.
+
+- QTemporaryFile
+
+      * Added support for file extensions and other suffixes.
+
+      * Fixed one constructor which could corrupt the temporary file path.
+
+- QTextBrowser
+
+      * Fixed various bugs with the handling of relative URLs and custom
+        protocols.
+
+      * Added isBackwardAvailable(), isForwardAvailable(), and
+        clearHistory() functions.
+
+- QTextCodec
+
+      * Allow locale-dependent features of Qt, such as QFile::exists(), to
+        be accessed during global destruction.
+
+- QTextCursor
+
+      * Added columnNumber(), blockNumber(), and insertHtml() convenience
+        functions.
+
+- QTextDocument
+
+      * Added convenience properties and functions: textWidth, idealWidth(),
+        size, adjustSize(), drawContents(), blockCount, maximumBlockCount.
+
+      * Added support for forced page breaks before/after paragraphs and
+        tables.
+
+      * Added CSS support to the HTML importer, including support for
+        CSS selectors.
+
+      * Added defaultStyleSheet property that is applied automatically for
+        every HTML import.
+
+      * Improved performance when importing HTML, especially with tables.
+
+      * Improved pagination of tables across page boundaries.
+
+- QTextEdit
+
+      * Fixed append() to use the current character format.
+
+      * Changed mergeCurrentCharFormat() to behave in the same way as
+        QTextCursor::mergeCharFormat, without applying the format to the
+        word under the cursor.
+
+      * QTextEdit now ensures that the cursor is visible the first time the
+        widget is shown or when replacing the contents entirely with
+        setPlainText() or setHtml().
+
+      * Fixed issue where the setPlainText() discarded the current character
+        format after the new text had been added to the document.
+
+      * Re-added setText() as non-compatibility function with well-defined
+        heuristics.
+
+      * Added a moveCursor() convenience function.
+
+      * Changed the default margin from 4 to 2 pixels for consistency with
+        QLineEdit.
+
+      * Added support for extra selections.
+
+- QTextFormat
+
+      * Fixed the default value for QTextBlockFormat::alignment() to return
+        a logical left alignment instead of an invalid alignment.
+
+      * Added UnderlineStyle formatting, including SpellCheckUnderline.
+
+- QTextStream
+
+      * Added the pos() function, which returns the current byte-position
+        of the stream.
+
+- QTextTableCell
+
+      * Added the setFormat() function to enable the cell's character format
+        to be changed.
+
+- QThread
+
+      * Related to changes to QObject, currentThread() always returns a
+        valid pointer. (Previous versions of Qt would return zero if called
+        from non-QThread threads; this does not happen in Qt 4.2).
+
+- QToolBar
+
+      * Introduced various fixes to better support tool buttons, button
+        groups and comboboxes in the toolbar extension menu.
+
+      * Fixed crash that occurred when QApplication::setStyle() was called
+        twice.
+
+- QToolButton
+
+      * Fixed an alignment bug for tool buttons with multi-line labels and
+        TextUnderIcon style.
+
+- QToolTip
+
+      * Added the hideText() convenience function.
+
+      * Added the showText() function that takes a QRect argument specifying
+        the valid area for the tooltip. (If you move the cursor outside this
+        area the tooltip will hide.)
+
+      * Added a widget attribute to show tooltips for inactive windows.
+
+- QTranslator
+
+      * Added support for plural forms through a new QObject::tr() overload.
+
+      * Ensured that a LanguageChange event is not generated if the
+        translator fails to load.
+
+      * Fixed a bug in isEmpty().
+
+      * Added Q_DECLARE_TR_FUNCTIONS() as a means for declaring tr()
+        functions in non-QObject classes.
+
+- QTreeView
+
+      * Ensured that no action is taken when the root index passed to
+        setRootIndex() is the same as the current root index.
+
+      * When hiding items the view no longer performs a complete re-layout.
+
+      * Fixed possible segfault in isRowHidden().
+
+      * Significantly speed up isRowHidden() for the common case.
+
+      * Improved row painting performance.
+
+      * After expanding, fetchMore() is called on the expanded index giving
+        the model a way to dynamically populate the children.
+
+      * Fixed issue where an item could expand when all children were
+        hidden.
+
+      * Added support for horizontal scrolling using the left/right arrow
+        keys.
+
+      * Added a property to enable the focus rectangle in a tree view to be
+        shown over all columns.
+
+      * Added more key bindings for expanding and collapsing the nodes.
+
+      * Added the expandAll() and collapseAll() slots.
+
+      * Added animations for expanding and collapsing branches.
+
+      * Take all rows into account when computing the size hint for a
+        column.
+
+      * Added the setSortingEnabled property.
+
+      * Fixed the behavior of the scrollbars so that they no longer
+        disappear after removing and re-inserting items while the view is
+        hidden.
+
+      * Fixed memory corruption that could occur when inserting and removing
+        rows.
+
+      * Don't draw branches for hidden rows.
+
+- QTreeWidget
+
+      * Added the const indexOfTopLevelItem() function.
+
+      * Improved item insertion speed.
+
+      * Fixed crash caused by calling QTreeWidgetItem::setData() with a
+        negative number.
+
+      * QTreeWidget now uses stable sorting.
+
+      * Made construction of single column items a bit more convenient.
+
+      * Added the invisibleRootItem() function.
+
+      * Made addTopLevelItems() add items in correct (not reverse) order.
+
+      * Ensured that the header is repainted immediately when the header
+        data changes.
+
+- QUiLoader
+
+      * Exposed workingDirectory() and setWorkingDirectory() from
+        QAbstractFormBuilder to assist with run-time form loading.
+
+- QUrl
+
+      * Added errorString() to improve error reporting.
+
+      * Added hasQuery() and hasFragment() functions.
+
+      * Correctly parse '+' when calling queryItems().
+
+      * Correctly parse the authority when calling setAuthority().
+
+      * Added missing implementation of StripTrailingSlash in toEncoded().
+
+- QVariant
+
+      * Added support for all QMetaType types.
+
+      * Added support for QMatrix as a known meta-type.
+
+      * Added support for conversions from QBrush to QColor and QPixmap,
+        and from QColor and QPixmap to QBrush.
+
+      * Added support for conversions between QSize and QSizeF, between
+        QLine and QLineF, from long long to char, and from unsigned long
+        long to char.
+
+      * Added support for conversions from QPointF to QPoint and from QRectF
+        to QRect.
+
+      * Fixed issue where QVariant(Qt::blue) would not create a variant of
+        type QVariant::Color.
+
+      * Added support for conversions from int, unsigned int, long long,
+        unsigned long long, and double to QByteArray.
+
+- QWhatsThis
+
+      * Improved look and feel.
+
+- QWidget
+
+      * Delayed creation: Window system resources are no longer allocated in
+        the QWidget constructor, but later on demand.
+
+      * Added a styleSheet property to set/read the widget style sheet.
+
+      * Added saveGeometry() and restoreGeometry() convenience functions for
+        saving and restoring a window's geometry.
+
+      * Fixed memory leak for Qt::WA_PaintOnScreen widgets with null paint
+        engines.
+        
+      * Ensured that widget styles propagate to child widgets.
+
+      * Reduced flicker when adding widget to layout with visible parent.
+
+      * Fixed child visibility when calling setLayout() on a visible widget.
+
+      * Speed up creation/destruction/showing of widgets with many children.
+
+      * Avoid painting obscured widgets when updating overlapping widgets.
+
+- QWorkspace
+
+      * Resolved issue causing the maximized controls to overlap with the
+        menu in reverse mode.
+
+      * Fixed issue where child windows could grow a few pixels when
+        restoring geometry in certain styles.
+
+      * Ensured that right-to-left layout is respected when positioning new
+        windows.
+
+      * Fixed crash that occurred when a child widget did not have a title
+        bar.
+
+      * Fixed issue where maximized child windows could be clipped at the
+        bottom of the workspace.
+
+- quintptr and qptrdiff
+
+      * New integral typedefs have been added.
+
+- Q3ButtonGroup
+
+      * Fixed inconsistencies with respect to exclusiveness of elements in
+        Qt 3.
+
+      * Fixed ID management to be consistent with Qt 3.
+
+- Q3Canvas
+
+      * Fixed several clipping bugs introduced in 4.1.0.
+
+- Q3CanvasView
+
+      * Calling setCanvas() now always triggers a full update.
+
+- Q3Grid, Q3Hbox, Q3VBox
+
+      * Fixed layout problem.
+
+- Q3IconView
+
+      * Fixed a case where selected icons disappeared.
+
+- Q3ListBox
+
+      * Fixed inconsistencies in selectAll() with respect to Qt 3.
+
+      * Fixed possible crash after deleting items.
+
+- Q3ListView
+
+        Fixed possible crash in Q3ListView after calling clear().
+
+        Fixed inconsistent drag and drop behavior with respect to Qt 3.
+
+- Q3Process
+
+      * Stability fixes in start().
+
+- Q3Socket
+
+      * No longer (incorrectly) reports itself as non-sequential.
+
+- Q3Table
+
+      * Improved behavior for combobox table elements.
+
+
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+- Interbase driver
+      
+      * Fixed data truncation for 64 bit integers on 64 bit operating
+        systems.
+
+- MySQL driver
+      
+      * When using MySQL 5.0.7 or larger, let the server do the text
+        encoding conversion.
+
+      * Added UNIX_SOCKET connection option.
+
+      * Improved handling of TEXT fields.
+
+- OCI driver
+    
+      * Improved speed for meta-data retrieval.
+     
+      * Fixed potential crash on Windows with string OUT parameters.
+
+      * Improved handling of mixed-case table and field names.
+
+- ODBC driver
+
+      * Improved error reporting if driver doesn't support static result
+        sets.
+
+      * Improved support for the Sybase ODBC driver.
+
+- SQLite driver
+
+      *  QSqlDatabase::tables() now also returns temporary tables.
+ 
+      *  Improved handling of mixed-case field names.
+
+
+
+****************************************************************************
+*                             QTestLib                                     *
+****************************************************************************
+
+- Added "-silent" options that outputs only test failures and warnings.
+
+- Reset failure count when re-executing a test object
+
+- Added nicer output for QRectF, QSizeF, and QPointF
+
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+
+Qtopia Core
+-----------
+
+- Fixed the -exceptions configure switch.
+
+- Fixed a build issue preventing the use of MMX instructions when
+  available.
+
+- Fixed leak of semaphore arrays during an application crash.
+
+- Fixed cases where the wrong cursor was shown.
+
+- Fixed cases where QWidget::normalGeometry() would return wrong value.
+
+- Allow widgets inside QScrollArea to have a minimum size larger than the 
+  screen size.
+
+- Allow (0,0) as a valid size for top-level windows.
+
+- VNC driver
+
+      * Fixed keyboard shortcut problem when using the VNC driver.
+
+      *  Fixed issue with the VNC driver that prevented client applications to
+         connect in some cases.
+
+      *  Fixed a leak of shared memory segments in the VNC driver.
+
+      *  Reduced CPU consumption in the VNC driver.
+
+      *  Implemented dynamic selection of the underlying driver for the VNC and
+         transformed screen drivers.
+
+      *  Improved error handling when clients connects to the server.
+
+- Graphics system
+
+      * Introduced new API for accelerated graphics hardware drivers.
+
+      * Implemented support for multiple screens.
+
+      * QScreen has binary incompatible changes. All existing screen drivers
+        must be recompiled.
+
+      * QWSWindow, QWSClient, QWSDisplay and QWSEvent have binary 
+        incompatible changes. QWSBackingStore has been removed. 
+        Existing code using these classes must be recompiled.
+
+      * Added support for OpenGL ES in QGLWidget. 
+
+      * Implemented support for actual screen resolution in QFont.
+
+      * Removed internal limitation of 10 display servers.
+
+      * Improved memory usage when using screens with depths less than 16
+        bits-per-pixel.
+
+      * Fixed 16 bits-per-pixel screens on big-endian CPUs.
+
+      * Optimized CPU usage when widgets are partially hidden.
+
+      * Improved detection of 18 bits-per-pixel framebuffers.
+
+      * Improved performance when using a rotated screen with 18 or 24
+        bits-per-pixel depths.
+
+      * Improved speed of drawing gradients.
+
+      * Introduced the QWSWindowSurface as a technique to create
+        accelerated paint engines derived from QPaintEngine.
+
+      * Implemented the Qt::WA_PaintOnScreen flag for top-level widgets.
+
+      * Extended QDirectPainter to include non-blocking API and support for 
+        overlapping windows. Existing code that subclasses QDirectPainter 
+        must be recompiled.
+
+      * Implemented QWSEmbedWidget which enables window embedding.
+
+      * Removed hardcoded 72 DPI display limitation.
+
+- Device handling
+
+      * QWSMouseHandler has binary incompatible changes. All existing mouse
+        drivers must be recompiled.
+
+      * Fixed an issue of getting delayed mouse events when using the
+        vr41xx driver.
+
+      * Improved event compression in the vr41xx mouse handler.
+
+      * Improved algorithm for mouse calibration which works for all
+        screen orientations.
+
+      * Fixed an issue causing mouse release events with wrong positions
+        when using a calibrated and filtered mouse handler on a rotated
+        screen.
+
+      * Made the tty device configurable for the Linux framebuffer screen
+        driver.
+
+      * Fixed a deadlock issue when using drag and drop and a calibrated
+        mouse handler.
+
+      * Autodetection of serial mice is turned off to avoid disrupt serial
+        port communication. Set QWS_MOUSE_PROTO to use a serial mouse.
+
+- QVFb
+
+      * Fixed an issue preventing QVFb from starting on some systems.
+
+      * Added support for dual screen device emulation in QVFb.
+
+- QCopChannel
+
+      *  Added a flush() function so that the QWS socket can be flushed,
+         enabling applications to ensure that QCop messages are delivered.
+
+
+Linux and UNIX systems
+----------------------
+
+- Printing
+ 
+      * Improved CUPS support by sending PDF instead of Postscript to
+        CUPS on systems that have a recent CUPS library, improving the
+        print quality.
+
+      * Added a new and improved QPrintDialog.
+
+      * Improved font embedding on systems without FontConfig.
+
+- QApplication
+
+      * When available, use Glib's mainloop functions to implement event
+        dispatching.
+
+- QPlastiqueStyle
+
+      * Added support to enable KDE icons to be automatically used on
+        systems where they are available.
+
+- QTextCodec
+     
+      * Uses iconv(3) (when available) to implement the codec returned by
+        QTextCodec::codecForLocale(). The new codec's name is "System"
+        (i.e., QTextCodec::codecForLocale()->name() returns "System"
+        when iconv(3) support is enabled).
+
+
+AIX
+---
+
+- The makeC++SharedLib tool is deprecated; use the "-qmkshrobj" compiler
+  option to generate shared libraries instead.
+
+
+X11
+---
+
+- Added support to internally detect the current desktop environment.
+
+- QAbstractItemView
+
+      * Fixed assertion caused by interrupting a drag and drop operation
+        with a modal dialog on X11.
+     
+      * Ensured that release events dispatched when closing a dialog
+        with a double click, are not propagated through to the window
+        underneath.
+
+- QCursor
+
+      * Fixed crash occuring when the X11 context had been released before
+        the cursor was destructed.
+
+- QGLWidget
+
+      * Fixed crashes that could occur with TightVNC.
+ 
+      * Improved interaction between QGLWidget and the Mesa library.
+
+- QMenu
+ 
+      * Made it possible for popup menus to cover the task bar on KDE.
+
+- QMotifStyle
+
+      * Ensured that the font set on a menu item is respected.
+
+- QX11EmbedContainer, QX11EmbedWidget
+
+      * Added missing error() functions.
+
+- QX11PaintEngine
+  
+      * Increased speed when drawing polygons with a solid pixmap brush.
+
+      * Fixed masked pixmap brushes.
+
+      * Increased QImage drawing performance.
+
+- Motif Drop support
+     
+      * Support for drops from Motif applications has been refactored and is
+        now working properly. QMimeData reports non-textual data offered in
+        Motif Drops using a MIME type of the form "x-motif-dnd/ATOM", where
+        ATOM is the name of the Atom offered by the Motif application.
+
+- Font rendering
+
+      * Improved stability when rendering huge scaled fonts.
+
+      * Enabled OpenType shaping for the Latin, Cyrillic, and Greek
+        writing systems.
+
+      * Improved sub-pixel anti-aliasing.
+
+      * Improved font loading speed.
+
+
+Mac OS X
+--------
+
+- Mac OS 10.2 support dropped.
+
+- QuickDraw support in QPaintEngine dropped; everything folded into the
+  CoreGraphics support.
+
+- All libraries in Qt are now built as frameworks when -framework mode is
+  selected (default) during the configuration process.
+ 
+- Many accessibility improvements, including better VoiceOver support. The
+  following widgets have had their accessibilty updated for this release:
+  QSplitter, QScrollBar, QLabel, QCheckBox, QRadioButton, QTabBar,
+  QTabWidget, QSlider, and QScrollBar.
+
+- Hidden files are now reported as hidden by QFileInfo, QDirModel, etc.
+
+- Windows now have a transparent size grips, an attribute for specifying an
+  opaque size grip was added.
+
+- Metrowerks generator has been removed.
+
+- Ensured that the anti-aliasing threshold setting is followed.
+
+- Added a standard "Minimize" menu item to Assistant's Window menu.
+
+- The documentation now has "Xcode-compatible" links so that it can be added
+  into Xcode's documentation viewer. This needs to be done by the developer
+  as regenerating Xcode's index takes quite a long time
+
+- QAbstractScrollArea
+
+      * Improved look and feel by aligning the scroll bars with the size
+        grip.
+
+- QClipboard
+ 
+      * Data copied to the clipboard now stays available after the
+        application exits.
+
+      * Added support for the Find clipboard buffer.
+
+      * Fixed encoding of URLs passed as MIME-encoded data.
+
+- QComboBox
+
+      * Improved the popup sizing so it's always wide enough to display its
+        contents.
+
+      * Improved the popup placement so it stays on screen and does not
+        overlap the Dock.
+
+      * The minimumSizeHint() and sizeHint() functions now honor
+        minimumContentsLength.
+
+- QKeyEvent
+
+      * The text() of a QKeyEvent is filled with the control character if
+        the user pressed the real Control key (Meta in Qt) and another key.
+        This brings the behavior of Qt on Mac OS X more in line with Qt on
+        other platforms.
+
+- QLibrary
+
+      * Removed the dependency on dlcompat for library loading and resolving
+        in favor of native calls. This means that you can unload libraries
+        on Mac OS X 10.4 or later, but not on 10.3 (since that uses dlcompat
+        itself).
+
+- QMacStyle
+
+      * QMacStyle only uses HITheme for drawing now (no use of Appearance
+        Manager).
+
+      * Fixed placement of text on buttons and group boxes for non-Latin
+        locales.
+
+      * Fixed rendering of small and mini buttons.
+
+      * Attempt to be a bit smarter before changing a push button to bevel
+        button when the size gets too small.
+
+      * Draws the focus ring for line edits when they are near the "top" of
+        the widget hierarchy.
+
+      * Ensured that the tickmarks are drawn correctly.
+
+      * Implemented the standardIconImplementation() function.
+
+      * Fixed the look of line edits.
+
+      * "Colorless" controls now look better.
+
+      * Fixed the sort indicator.
+
+      * Improved the look of text controls, such as QTextEdit, to fit in
+        better with the native style.
+
+- QMenu
+
+      * Popups no longer show up in Expose.
+
+      * Ensured that the proper PageUp and PageDown behavior are used.
+
+- QMenuBar
+
+      * Added support for explicit merging of items using QAction::MenuRole.
+
+      * Added support for localization of merged items.
+
+- QMessageBox
+
+      * A message box that is set to be window modal will automatically
+        become a sheet.
+
+      * Improved the look of the icons used to fit in with the native style.
+  
+- QPainter
+     
+      * Fixed off-by-one error when drawing certain primitives.
+
+      * Fixed off-by-many error when drawing certain primitives using a
+        scaling matrix.
+
+      * Fixed clipping so that setting an empty clip will clip away
+        everything.
+
+      * Fixed changing between custom dash patterns.
+
+      * Added combinedMatrix() which contains both world and viewport/window
+        transformations.
+      
+      * Added the setOpacity() function.
+
+      * Added MiterJoins that are compliant with SVG miter joins.
+
+- QPainterPath
+     
+      * Added the arcMoveTo() and setElementPosition() functions.
+
+- QPixmap
+
+      * Added functions to convert to/from a CGImageRef (for CoreGraphics
+        interoperability).
+ 
+      * Fixed various Qt/Mac masking and alpha transparency issues.
+
+- QPrinter
+     
+      * Made QPrinter objects resuable.
+
+- QProcess
+
+      * Always use UTF-8 encoding when passing commands.
+
+- QScrollBar
+
+      * Improved handling of the case where the scrollbar is to short to
+        draw all its controls.
+
+- QTextEdit
+
+      * Improved the look of the widget to fit in with the native style.
+
+- QWidget
+
+      * All HIViewRefs inside Qt/Mac are created with the
+        kWindowStandardHandlerAttribute.
+
+      * Added the ability to wrap a native HIViewRef with create().
+
+      * Windows that have parents with the WindowStaysOnTopHint also get the
+        WindowStaysOnTopHint.
+
+
+Windows
+-------
+
+- Ensured that widgets do not show themselves in a hover state if a popup
+  has focus.
+
+- Fixed issues with rendering system icons on 16 bits-per-pixel displays.
+
+- Fixed issue where fonts or colors would be reset on the application
+  whenever windows produced a WM_SETTINGSCHANGE event.
+
+- Fixed a bug with Japanese input methods.
+
+- Compile SQLite SQL plugin by default, as on all the other platforms.
+
+- Fixed build issue when not using Precompiled Headers (PCH).
+
+- Made Visual Studio compilers older than 2005 handle (NULL == p)
+  statements, where p is of QPointer type.
+
+- Fixed HDC leak that could cause applications to slow down significantly.
+
+- Ensured that timers with the same ID are not skipped if they go to different
+  HWNDs.
+
+- Improved MIME data handling
+
+      * Resolved an issue related to drag and drop of attachments from some
+        applications.
+
+      * Resolved an issue where pasting HTML into some applications would
+        include parts of the clipboard header.
+ 
+      * Improved support for drag and drop of Unicode text.
+
+      * Made it possible to set an arbitrary hotspot on the drag cursor on
+        Windows 98/Me.
+
+- ActiveQt
+
+    * Fixed issues with the compilation of code generated by dumpcpp.
+
+    * Made ActiveQt controls behave better when inserted into Office
+      applications.
+
+    * Ensured that slots and properties are generated for hidden functions and
+      classes.
+
+    * Ensured that the quitOnLastWindowClosed property is disabled when
+      QApplication runs an ActiveX server.
+
+    * Ensured that controls become active when the user clicks into a subwidget.
+
+    * Added support for CoClassAlias class information to give COM class a
+      different name than the C++ class.
+
+- QAccessible
+     
+      * Ensured that the application does not try to play a sound for
+        accessibility updates when no sound is registered.
+
+- QAxBase
+ 
+      * Fixed potential issue with undefined types.
+
+- QDir
+  
+      * Fixed bug where exists() would return true for a non-existent drive
+        simply because the specified string used the correct syntax.
+ 
+      * Improved homePath() to work with Japanese user names.
+
+- QFileDialog
+
+      * Added support for relative file paths in native dialogs.
+
+      * Enabled setLabelText() to allow context menu entries to be changed.
+      
+      * Ensured that users are denied entry into directories where they
+        don't have execution permission.
+
+      * Disabled renaming and deleting actions for non-editable items.
+
+      * Added a message box asking the user to confirm when deleting files.
+
+- QFileInfo
+      
+      * Fixed absoluteFilePath() to return a path that begins with the
+        current drive label.
+
+- QGLWidget
+       
+      * Fixed usage of GL/WGL extension function pointers. They are now
+        correctly resolved within the context in which they are used.
+
+- QGLColormap
+
+      * Fixed cases where the colormap was not applied correctly.
+
+- QMenu
+ 
+      * Made it possible for popup menus to cover the task bar.
+
+- QPrinter
+
+      * Added support for printers that do not have a DEVMODE.
+
+      * Fixed a drawing bug in the PDF generator on Windows 98/Me.
+
+      * Made it possible to programmatically change the number of copies
+        to be printed.
+
+      * Fixed possible crash when accessing non-existent printers.
+
+- QProcess
+
+      * Fixed lock-up when writing data to a dead child process.
+
+- QSettings
+
+      * Fixed bug causing byte arrays to be incorrectly stored on
+        Win95/98/Me.
+
+      * Allow keys to contain HKEY_CLASSES_ROOT and HKEY_USERS to allow all
+        registry keys to be read and prevent unintentional use of
+        HKEY_LOCAL_MACHINE.
+
+      * Fall back to the local machine handle if a key does not start with a
+        handle name.
+
+- QUdpSocket
+
+       * Introduced fixes for UDP broadcasting on Windows.
+
+- QWhatsThis
+
+       * Improved native appearance.
+
+- QWidget
+ 
+       * Top-level widgets now respect the closestAcceptableSize of their
+         layouts.
+
+       * Ensured that getDC() always returns a valid HDC.
+
+- QWindowsStyle
+
+      * We no longer draw splitter handles in Windows style. This resolves
+        an inconsistency with XP style, so that the two styles can use the
+        same layout interchangeably. Note that it is fully possible to style
+        splitter handles (if a custom style or handle is required) using
+        style sheets.
+
+      * Disabled comboboxes now have the same background color as disabled
+        line edits.
+ 
+- QWindowsXPStyle
+  
+      * Made QPushButton look more native when pressed.
+
+      * Improved the look of checked tool buttons.
+
+      * Defined several values that are not present in MinGW's header files.
+
+
+
+****************************************************************************
+*                   Significant Documentation Changes                      *
+****************************************************************************
+
+
+- Updated information about the mailing list to be used for porting issues
+  (qt-interest).
+
+- Demos / Examples
+
+      * Added a new directory containing desktop examples and moved the
+        Screenshot example into it.
+
+      * Added a new Chat client network example which uses QUdpSocket to
+        broadcast on all QNetworkInterface's interfaces to discover its
+        peers.
+
+      * The Spreadsheet demo now uses the QItemDelegate, QCompleter, and
+        QDateTimeEdit with calendar popup.
+
+      * An OpenGL button is added to some of the demos to toggle usage of
+        the OpenGL paint engine.
+
+      * Fixed crash resulting from incorrect painter usage in the Image
+        Composition example
+
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+
+Assistant
+---------
+
+- Middle clicking on links will open up new tabs.
+
+- Added "Find as you type" feature to search documentation pages.
+
+- Added "Sync with Table of Contents" feature to select the current page in
+  the contents.
+
+- Fixed issue where activating a context menu over a link would cause the
+  link to be activated.
+
+- Provides a default window title when not specified in a profile.
+
+- Fixed JPEG viewing support for static builds.
+
+- Fixed crash that could occur when opening Assistant with old and invalid
+  settings.
+
+- Fixed display of Unicode text in the About dialog.
+
+
+Designer
+--------
+
+- Added QWidget and the new widgets in this release to Designer's widget
+  box.
+
+- Updated the dialog templates to use the new QDialogButtonBox class.
+
+- Backup files created by Designer no longer overwrite existing files.
+
+- Promoted widgets inherit the task menu items of the base class.
+
+- Enums are no longer ordered alphabetically in the property editor.
+
+- Fixed issue where shortcuts could be corrupted in certain situations.
+
+- Line endings in .ui files now match the standard line endings for the
+  platform the files are created on.
+
+- Ensured that a warning is displayed whenever duplicate connections are
+  made in the connections editor.
+
+- Added shortcuts for the "Bring to Front" and "Send to Back" form editor
+  actions.
+
+- Added new 22 x 22 icons.
+ 
+- Fixed selection of dock widgets in loaded forms.
+
+- Made QWidget::windowOpacity a designable property.
+
+- Numerous improvements and fixes to the action and property editors.
+
+- Windows only
+
+      * The default mode is Docked Window.
+
+- Mac OS X only
+
+      * Preview of widgets is no longer modal.
+
+      * Passing really long relative paths into the resource will no longer
+        cause a crash.
+
+
+Linguist
+--------
+
+- Added a new "Check for place markers" validation feature.
+
+- Added the "Search And Translate" feature.
+
+- Added the "Batch translation" feature.
+
+- Added support for editing plural forms.
+
+- Extended the .ts file format to support target language, plural forms,
+  source filename, and line numbers.
+
+- Added the "Translated Form Preview" feature.
+
+- Added placeholders for "hidden" whitespace (i.e., tabs and newlines) in
+  the translation editor.
+
+
+lupdate
+-------
+
+- Added the -extensions command-line option in order to recursively scan
+  through a large set of files with the specified extensions.
+
+- Made lupdate verbose by default (use -silent to obtain the old behavior).
+
+- Improved parsing of project files.
+
+- Fixed some issues related to parsing C++ source files.
+
+
+lrelease
+--------
+
+- Made lrelease verbose by default (use -silent to obtain the old behavior).
+
+- Disabled .qm file compression by default (pass -compress to obtain the old
+  behavior).
+  
+      
+moc
+---
+
+- Fixed support for enums and flags defined in classes that are themselves
+  declared in namespaces.
+
+- Added support for the -version and -help command line options (for
+  consistency with the other tools).
+
+
+rcc
+---
+
+- Added support for the -binary option to generate resources that are
+  registered at run-time.
+
+
+qmake
+-----
+
+- Added support for an Objective C compiler on platforms that support it via
+  OBJECTIVE_SOURCES. Additionally, Objective C precompiled headers are
+  generated as necessary.
+
+- Added support for a qt.conf to allow easy changing of internal target
+  directories in qmake.
+
+- Added support for the recursive switch (-r) in shadow builds.
+
+- Introduced QMAKE_CFLAGS_STATIC_LIB to allow modified flags to be
+  passed to temporary files when compiling a static library.
+
+- Added a target.targets for extra qmake INSTALLS. The $files() function
+  is now completely consistent with wildcard matching as specified to
+  input file variables.
+
+- Added QMAKE_FUNC_* variables to EXTRA_COMPILERS for late evaluation
+  of paths to be calculated at generation time. $$fromfile() will no
+  longer parse input file multiple times.
+
+- Added support for -F arguments in LIBS line in the Xcode generator.
+
+- $$quote() has changed to only do an explicit quote, no escape sequences
+  are expanded. A new function $$escape_expand() has been added to allow
+  expansion of escape sequences: \n, \t, etc.
+
+- Added a $$QMAKE_HOST variable to express host information about the
+  machine running qmake.
+
+- Added a $$replace() function.
+
+- Ensured that PWD is always consulted first when attempting to resolve an
+  include for dependency analysis.
+
+- Added support for UTF-8 encoded text in .pro files.
+
+- Variables $$_PRO_FILE_ and $$_PRO_FILE_PWD_ added for features to detect
+  where the .pro really lives.
+
+- Added QMAKE_FRAMEWORK_VERSION to override the version inside a .framework,
+  though VERSION is still the default value.
+
+- Added support for custom bundle types on Mac OS X.
+
+- Added support for Mac OS X resources (.rsrc) in REZ_FILES.
+
+
+qt3to4
+------
+
+- qt3to4 now appends to the log file instead of overwriting it.
+
+- Fixed one case where qt3to4 was inserting UNIX-style line endings on
+  Windows.
+
+- Added the new Q3VGroupBox and Q3HGroupBox classes to ease porting.
+
+- Updated the porting rules for this release.
+
+
+uic
+---
+
+- Added support for more variant types: QStringList, QRectF, QSizeF,
+  QPointF, QUrl, QChar, qlonglong, and qulonglong.
+
+- Fixed code generated by uic for retranslating item view widgets so that
+  the widgets are not cleared when they are retranslated.
+
+- Ensured that no code is generated to translate empty strings.
+
+
+uic3
+----
+
+- Added line numbers to warnings.
+
+- Ensured that warnings show the objectName of the widget in question.
+
+- Added support for word wrapping in labels when converting files from uic3
+  format.
+
+- Ensured that the default layouts are respected when converting files from
+  uic3 format.
+
+- Ensured that double type properties are handled correctly.
diff --git a/dist/changes-4.2.0-tp1 b/dist/changes-4.2.0-tp1
new file mode 100644
index 0000000000..b2a994d6c3
--- /dev/null
+++ b/dist/changes-4.2.0-tp1
@@ -0,0 +1,20 @@
+Qt 4.2 introduces many new features as well as many improvements and
+bugfixes over the 4.1.x series. For more details, see the online
+documentation which is included in this distribution. The
+documentation is also available at http://doc.trolltech.com/
+
+The Qt version 4.2 series is binary compatible with the 4.1.x series.
+Applications compiled for 4.0 or 4.1 will continue to run with 4.2.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+Qt 4.2 contains a lot of changes, which will be fully documented in the
+final release.
+
+For this tech preview, please concentrate on the new features and provide
+feedback on the qt4-preview-feedback mailing list (see
+http://lists.trolltech.com/ for details)
+
+
diff --git a/dist/changes-4.2.1 b/dist/changes-4.2.1
new file mode 100644
index 0000000000..5cbcc2ca73
--- /dev/null
+++ b/dist/changes-4.2.1
@@ -0,0 +1,14 @@
+Qt 4.2.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.2.0.
+
+The Qt version 4.2 series is binary compatible with the 4.1.x and 4.0.x series.
+Applications compiled for 4.0 or 4.1 will continue to run with 4.2.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+- QImage
+        Fixed a potential security issue which could arise when transforming
+        images from untrusted sources.
+
diff --git a/dist/changes-4.2.2 b/dist/changes-4.2.2
new file mode 100644
index 0000000000..25131a1a77
--- /dev/null
+++ b/dist/changes-4.2.2
@@ -0,0 +1,827 @@
+Qt 4.2.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.2.0.
+
+The Qt version 4.2 series is binary compatible with the 4.1.x and 4.0.x
+series. Applications compiled for 4.0 or 4.1 will continue to run with 4.2.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- Configuration/Compilation
+
+  * Fixed issues with unresolved zlib symbols on aix-g++ resulting from a
+    missing "-lz" in gui/Makefile.
+
+  * Fixed compilation when an unsupported version of MySQL is auto-detected
+    by the configure script.
+
+  * Fixed QtDBus linking errors when compiling with the Intel C++ Compiler
+    for Linux.
+
+  * Fixed compilation when using Q_ARG and Q_RETURN_ARG macros with template
+    types.
+
+  * Make Qt compile with QT_NO_TOOLTIP and QT_NO_STATUSBAR
+
+- Documentation
+
+  * Added new overviews and substantially improved Qtopia Core-specific
+    documentation.
+
+- Demos / Examples
+
+  * Fixed crash in the Settings Editor example resulting from entering
+    certain input to a QTreeWidget using QLineEdit as an inline editor.
+
+  * Fixed crash in the Ported Canvas example that occurred when creating a
+    new canvas from one that was shrunk to its minimum size.
+
+- I/O
+
+  * Fixed divide by zero when loading malformed BMP files.
+
+- Qt Assistant
+
+  * Fixed a bug that prevented the view from scrolling to anchors within
+    pages.
+
+- Qt Designer
+
+  * Fixed crash that could occur when pasting a QGridLayout into a
+    QTabWidget.
+
+  * Fixed the signals & slots connection editor to automatically scroll to 
+    the correct items.
+
+  * Fixed blocking behavior that would occur when previewing modal forms.
+
+  * Made OK the default button in the "Promote to Custom Widget" dialog.
+
+  * Ensured that main window forms that include size grips are repainted
+    correctly when they are resized.
+
+  * Fixed bug in Form Settings dialog - it wasn't possible to reset the
+    "Pixmap Function" field.
+
+- Qt Linguist
+
+  * Fixed bug where lupdate would leave out the namespace part of the context.
+  
+  * Fixed bug in lupdate where the paths of the generated ts files was not 
+    relative to the pro file.
+
+  * Fixed bug in lupdate that caused strings that contained \r\n were not 
+    translated.
+
+  * Improved the user interface with some minor layout changes.
+
+  * Improved handling of forms without layouts.
+
+  * Fixed crash caused by navigating to the previous node when the current
+    node was the first and topmost node.
+
+  * Fixed bug in the preview translation feature where forms that did not
+    have any layout got a height of 0.
+
+  * Fixed bug where "Search and Translate" did not trigger a repaint on the
+    items that got translated, leading people to believe that 
+    "Search and Translate" did not work.
+
+  * Fixed a layout problem with the "Search and Translate" dialog.
+
+- qmake
+
+  * Fixed crash that could occur when using the LIB_PATH variable if a .libs
+    directory is located on one of the paths held by the variable.
+
+  * Improved generation of Xcode projects to avoid problems with qmake
+    project files that contain certain Qt-dependent declarations.
+
+  * Improved support for Objective C sources in the Xcode project generator
+    to ensure that they are added to the project's target.
+
+
+Third party components
+----------------------
+
+- libpng
+
+  * Security fix (CVE-2006-5793): The sPLT chunk handling code
+    uses a sizeof operator on the wrong data type, which allows
+    context-dependent attackers to cause a denial of service (crash)
+    via malformed sPLT chunks that trigger an out-of-bounds read.
+
+  * Security fix: Avoid profile larger than iCCP chunk.
+    One might crash a decoder by putting a larger profile inside the
+    iCCP profile than is actually expected.
+
+  * Security fix: Avoid null dereference.
+
+  * Disabled MMX assembler code for Intel-Mac platforms to work
+    around a compiler bug.
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General improvements
+--------------------
+
+- Accessibility
+
+  * Fixed a potential assert when navigating menus while assistive tools are
+    running.
+
+  * Fixed a crash when getting accessibility information from an item view
+    without a model.
+
+  * Fixed item view accessibility bug where QAccessibleInterface::text()
+    would return an empty string for child indexes larger
+    than one.
+
+- Item views
+
+  * Fixed QHeaderView and QTableView overflow issues when the length
+    of all the rows or columns went over the maximum allowed integer value.
+
+  * When reset is emitted by a QAbstractItemModel, QHeaderView will now
+    always update the header count().
+
+  * Fixed incorrect scrolling in QHeaderView when items are hidden.
+
+  * Fixed bug where QHeaderView would disappear if the sections were moved
+    and the model was reset.
+
+  * QDataWidgetMapper::mappedWidgetAt() now always returns the right
+    mapped index for a widget no matter in which order they were inserted
+
+  * Fixed crash due to incorrect update of persistent model indexes in
+    QSortFilterProxyModel::layoutChanged().
+
+  * Fixed bug that could cause QSortFilterProxyModel::removeRows() and
+    QSortFilterProxyModel::removeColumns() to remove the wrong source model
+    items.
+
+  * Fixed bug in QSortFilterProxyModel that caused stale proxy mappings to
+    remain when source model items were removed and later reinserted,
+    resulting in an incorrect proxy model.
+
+  * Fixed bug in QSortFilterProxyModel that caused items to not appear
+    in a QTreeView when adding children to a formerly childless source item.
+
+  * Fixed painting bug for spanning cells in QTableView when the item
+    background is transparent.
+
+  * Fixed regression in QListWidget and QTreeWidget that caused persistent
+    indexes to not be updated when sorting items.
+
+  * Enter key can now be used to start item editing when the edit trigger
+    is AnyKeyPressed.
+
+  * Fixed regression where QAbstractItemView::setRootIndex() wasn't
+    always updating the view, causing possibly painting errors.
+
+  * Fixed regression that caused incorrect propagation of Enter key press
+    from a QAbstractItemView in editing mode.
+
+  * Date and time editors are now initialized correctly with the current
+    date and time.
+
+  * QTableView tab focus handling has been improved. Although tab key
+    navigation is enabled by default, you can tab out of a view if the
+    model is either missing or unable to handle the key (e.g., an empty
+    model).
+
+  * Fixed bug in QItemDelegate that would scale decoration pixmaps.
+
+  * Fixed buge that would not let the column delegate create the editor
+    for an edited item.
+
+  * Fixed bug where the QTableCornerButton would ignore the view
+    selectionMode.
+
+  * Fixed compatibility issue with QTreeWidgetItem serialization
+    between Qt 4.2.x and Qt 4.(0/1).x.
+
+  * Made sure the QTableWidget::cellEntered() signal is emitted
+    correctly.
+
+  * Made sure that commitData() uses the row/column delegate
+    when these are set.
+
+  * Fixed incorrect QTableView scrollbar ranges when rows were hidden.
+
+  * Fixed QItemDelegate to let text be bottom aligned.
+
+- Graphics View
+
+  * The background cache in QGraphicsView is now properly initialized to
+    the full viewport.
+
+  * Fixed incorrect cursor updates when moving between items.
+
+  * QGraphicsItem::setMatrix() now properly clears the original item before
+    repainting.
+
+  * QGraphicsEllipseItem is now only drawn as a full ellipse at angles that
+    are multiples of 360 degrees (..., -720, -360, 360, 720, ...).
+
+  * Fixed a crash when selecting one selectable item, then moving another
+    movable item.
+
+  * Fixed a crash during item construction caused by a pure virtual function
+    call in QGraphicsItem.
+
+  * Fixed mouse grabber book-keeping problems in QGraphicsScene which fell out
+    of sync when opening modal dialogs or popups from within a mouse event
+    handlers.
+
+  * QGraphicsScene now forwards unhandled events to QObject, allowing the use
+    of timers in QGraphicsScene subclasses.
+
+- Meta-Object Compiler (moc)
+
+  * Split long string literals in the generated code to work around
+    limitations in MSVC.
+
+  * Fixed crash on *BSD that could occur on invalid input.
+
+- Painting
+
+  * Improved numerical stability in the path stroker, fixing a crash when
+    stroking paths containing curve segments whose control points are
+    approximately on the same line.
+
+  * Fixed raster paint engine memory corruption in QBitmap when source buffer
+    was smaller than the destination buffer.
+
+  * Avoid rounding errors when drawing parts of a pixmap using the Quartz 2D
+    engine.
+
+  * Added caching of QGradient's color table for the raster paint engine.
+    This means that if a gradient with the same stops and colors is used
+    again, it will be quickly fetched from the cache, avoiding the
+    expensive calculations of the color lookup table.
+
+  * Fixed a crash on Windows and with QImage caused by specifying
+    Qt::CustomDashLine without an actual pattern.
+
+  * Fixed a bug in the raster paint engine which would occasionally cause
+    pixel errors when drawing polygons.
+
+  * Fixed memory corruption in the OpenGL paint engine when drawing complex
+    polygons with a cosmetic pen.
+
+  * Fixed rendering of transformed brushes when drawing linear gradients
+    with the OpenGL paint engine where the transformations used were not
+    angle-preserving.
+
+  * Improved handling of OpenGL errors.
+
+  * Fixed bug in the raster paint engine where extra lines would be drawn
+    when drawing a path partially outside the viewport using a dashed pen.
+
+  * Fixed an assert in QImage that was triggered when reading PNG files
+    with certain palettes.
+
+  * Fixed an issue where stroking and drawing aliased QPainterPaths with a
+    non-cosmetic pen would produce incorrect results.
+
+  * Fixed an issue where text was cut off when drawn onto a QImage.
+
+  * Fixed an issue where text would be drawn onto a QPicture with an
+    incorrect position.
+
+  * Fixed an issue where enabling/disabling clipping when drawing into a
+    QImage did not have any effect.
+
+  * Fixed bug in QImage::createHeuristicMask where the color table was not 
+    initialized properly.
+
+- Qt Resource Compiler (rcc)
+
+  * Improved handling of relative paths in .qrc files.
+
+- Style Sheets
+
+  * Made general performance improvements.
+
+  * Fixed crash that could occur when a widget with a style sheet was
+    reparented into a widget with no style sheet.
+
+  * Ensured that a widget's custom palette is not overwritten when not styled
+    using a style sheet.
+
+  * Added support to allow colors to be specified with alpha components.
+
+  * Added support for group box styling.
+
+  * Removed broken support for automatic image scaling.
+
+- SQL plugins
+
+  * Fixed incorrect translation of error strings in the Oracle plugin.
+  
+  * Made sure PQfreemem is called to free allocated buffers in PostgreSQL.
+
+  * Fixed regression from Qt 4.1.4 behavior that prevented tables in schemas
+    from working correctly in the SQL data models.
+
+  * Prevented possible trailing garbage for TEXT fields in the MySQL plugin.
+
+- Text handling
+
+  * Fixed a bug in the Bidi algorithm.
+
+- QAbstractItemView
+
+  * Made commitData() more robust by ignoring cases in which no valid index
+    is associated with the editor.
+
+  * Ensured that the itemEntered() signal is emitted consistently on all
+    platforms.
+
+- QBrush
+
+  * Ensured that transformations are correctly copied when brushes are copied.
+
+- QCalendarWidget
+
+  * Fixed setting the text format, correcting repainting and date resetting
+    issues.
+
+- QComboBox
+
+  * Fixed wrong scroll arrows for the popup menu.
+
+- QCompleter
+
+  * Fixed issue where the highlighted() signal was emitted twice if
+    setModel() was called twice.
+
+  * Made completers usable inside dialogs.
+
+- QDataStream
+
+  * Fixed streaming of qreal on (embedded) platforms where qreal values are
+    not equivalent to double values; i.e., sizeof(qreal) != sizeof(double).
+
+- QDateTime/QDateTimeEdit
+
+  * Fixed a bug that allowed you to type in larger numbers than 12 in 12-hour
+    fields.
+
+  * Fixed a bug that occurred when QDate::shortMonthName() was longer than
+    3 characters.
+
+  * Improved the handling of left-to-right languages.
+
+- QDialogButtonBox
+
+  * QDialogButtonBox now sets the default button to the first button with
+    the Accept role if no other button has explicitly been set as the
+    default when it is shown. This is to stop a regression where using the
+    autoDefault property with the Mac and Cleanlooks styles would set the
+    Cancel button as the default.
+
+- QDir
+
+  * Fixed an assert in QDir::entryList() when reading file entries with
+    names containing invalid Unicode encodings.
+
+- QFileDialog
+  * Fixed bug that showed a non-existing folder for every space the user typed 
+    after a dot (.) in the lineedit.
+
+- QFileSystemWatcher
+
+  * Fixed compilation on Linux/HPPA.
+
+- QFSFileEngine
+
+  * Fixed broken UNC path support.
+
+- QIODevice
+
+  * Fixed a data corruption bug when reading large blocks from devices
+    opened in Text mode.
+
+  * Fixed seeking to positions larger than the maximum allowed integer value.
+
+- QLineEdit
+
+  * Fixed scrolling in line edits with custom paddings.
+
+  * Fixed crash on Linux when the text contains QChar::LineSeparator.
+
+- QListView/QListWidget
+
+  * Fixed bug with cursor navigation in cases where a grid size has been
+    set.
+
+  * Ensured that the drop indicator is not shown in icon view mode to avoid
+    painting artifacts.
+
+- QLocale
+
+  * Fixed crash on Mac OS X and Windows caused when one of the separator
+    strings was an empty string.
+
+  * Fixed double to string conversion bug on embedded architectures.
+
+- QMainWindow
+
+  * Fixed bug allowing non-floatable dock widgets to be floated when the
+    DockWidgetMoveable option is set.
+
+  * Fixed several bugs in laying out docked QDockWidgets which have
+    minimumSize() and/or maximumSize() set.
+
+  * Improved saving and restoring of the state of main windows and their dock
+    widgets when using saveState() and restoreState().
+
+  * Fixed handling of dock widgets that are non-closable to the user so that
+    they can be programmatically closed.
+
+  * Fixed regression from Qt 4.1.4 behavior to ensure that palette changes
+    to main windows are also propagated to their children.
+
+- QMenuBar
+
+  * Improved event handling to avoid sending events when a menu bar has no
+    parent widget.
+
+- QObject
+
+  * Fixed memory leak when calling QObject::moveToThread(0).
+
+- QPainter
+
+  * Fixed reentrancy issue that would otherwise lead to crashes if more than
+    one QImage is deleted at the same time (from different threads).
+
+- QPalette
+
+  * Improved handling of the palette obtained from QApplication::palette()
+    in cases where QApplication::setStyle() has been called before a
+    QApplication instance has been constructed (as recommended by the
+    documentation).
+
+- QPluginLoader
+
+  * Fixed a potential crash that could occur when calling staticInstances()
+    from a global destructor.
+
+- QProgressBar
+
+  * Document that drawing of text in vertical progress bars is style-dependent.
+
+- QSqlRelationalTableModel
+
+  * Ensured that the internal cache is correctly cleared when reverting
+    inserted rows.
+
+- QSvg
+
+  * Improved parser robustness and parsing speed.
+
+- QTextCodec
+
+  * Fixed race-condition in QTextCodec::codecForLocale().
+
+  * Fixed potential off-by-one string handling bug.
+
+- QTextDocument
+
+  * Fixed support for pixel font sizes in imported HTML.
+
+- QTextOption
+
+  * Ensured that the textDirection property is respected.
+
+- QTextStream
+
+  * Ensured that readLine() no longer treats "\r\n" as being two lines if
+    called after QTextStream::pos().
+
+- QToolButton
+
+  * Fixed an issue where tool button popup menus were positioned incorrectly
+    on multi-screen setups.
+
+- QTreeView/QTreeWidget
+
+  * Fixed possible assert when painting if there were layouts pending.
+
+  * Fixed possible segfault when a model emits layoutChanged().
+
+  * Fixed erroneous expanding/collapsing of items when the user
+    double-clicked in the checkbox area of an item.
+
+  * Fixed a crash in setRowHidden() caused by hiding then un-hiding items
+    in a hierarchy.
+
+  * Fixed setSortingEnabled() which could could cause incorrect painting.
+
+- QVariant
+
+  * Fixed behavior where conversion of invalid variants to integers would be
+    incorrectly reported as successful.
+
+  * Fixed a crash in the compatibility function QVariant::asByteArray()
+    when called on a null variant.
+
+- QWidget
+
+  * Made setWindowTitle() work on hidden widgets that are never shown.
+    (Fixing a bug in QtSingleApplication on Windows.)
+
+  * Made QWidget::restoreGeometry() restore windows to the correct screen
+    on multi-screen systems.
+
+  * Fixed a bug where the stacking order of widgets would get out of sync
+    and cause entire widgets, or parts of them, not to be updated properly.
+
+  * Fixed QWidget::setParent() to not recreate the native window ID of
+    all child widgets when reparenting the parent to top-level.
+
+  * Fixed incorrect resize handling of dock widgets that are resized to the
+    extent of the screen or to their maximum defined sizes.
+
+- QWorkspace
+
+  * Fixed memory corruption that caused crashes inside Visual Studio.
+
+- QMessageBox
+
+  * Made QMessageBox::setText() adjust the size of the text area
+    when setting a new text. 
+
+- QXmlInputSource
+
+  * Ensured that QXmlInputSource does not read in the whole document at once,
+    enabling arbitrarily large files to be parsed with QXmlSimpleReader.
+
+- Qt3 support
+
+  * Fixed QPainter::xForm() and QPainter::xFormDev().
+
+  * Fixed crash in Q3IconView when selecting several items without releasing
+    the left mouse button, then clicking the right mouse button.
+
+  * Fixed incorrect behavior of setLabel() to replace labels rather than
+    inserting more of them.
+
+  * Ensured that Q3IconView is included in the Desktop Light package.
+
+  * Fixed regression of a feature in Qt 4.1.4 by reintroducing support for
+    Q3Accel.
+
+- QDBus
+
+  * Fixed getting and setting of invalid properties
+    so the don't cause errors in in libdbus-1.
+
+  * Fixed bug where QtDBus could generate invalid XML in some cases.
+
+  * Fixed bug where QtDBus can sometimes generate names that break
+    the standard.
+
+  * Fixed crash in QtDBus when connecting a signal to a slot with
+    less parameters.
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+X11
+---
+
+  * Fixed positioning of text with stacking diacritics.
+
+  * Added fixes for Indic text rendering.
+
+  * Fixed rendering of Greek and other latin scripts with XLFD fonts.
+
+  * Fixed encoding detection of XLFD fonts.
+
+  * Fixed crash in QX11EmbedContainer.
+
+  * Ensured that QPrinter doesn't generate PDF when printing to raw CUPS
+    printers.
+
+  * Improved behavior of QPrintDialog so that, if CUPS is not installed or
+    reports that no printers are available, it falls back to the printers
+    set up for lpr/lprng.
+
+  * Fixed paper size selection when printing with CUPS.
+
+  * Suppressed/avoided the generation of floating point exceptions in the
+    X11 paint engine.
+
+  * Fixed an endianess issue when drawing QImages.
+
+  * Fixed X errors when scaling/copying null pixmaps.
+
+  * Fixed an issue where bitmap/XLFD fonts where drawn garbled.
+
+  * Fixed X error when resizing to its minimum size.
+
+  * Fixed widgets painted all black if the system palette contains X11
+    color names.
+
+  * Fixed loading plugins built in debug mode and linked against the
+    default (release) build.
+
+  * Fixed input of non-ascii chars in Qt widgets when application was
+    run with empty LANG environment variable.
+
+  * Fixed QApplication::hasPendingEvents() returning true even if no
+    events were pending when using the Glib event dispatcher.
+
+  * Fixed rare event loop dead-lock when posting many custom events to
+    a receiver in another thread.
+
+- QPlastiqueStyle
+
+  * Disabled checked radio buttons and checkboxes are now rendered correctly.
+
+
+Windows
+-------
+
+  * Fixed drawing of the 0xad character with symbol fonts.
+
+  * Fixed stacking order of dialogs when a child is created before its
+    parent.
+
+  * Fixed printing to PDF when no printers are installed.
+
+  * Fixed "print to file" dialog only showing once after it has been canceled.
+
+  * Fixed name clashes in enum values when running dumpcpp (ActiveQt).
+
+  * Fixed a lock-up in QNetworkInterface for machines with multiple network
+    interfaces.
+
+  * Fixed a lock-up in QAbstractSocket::waitForReadyRead() when 0 was passed
+    as a timeout value.
+
+  * Fixed "Invalid HANDLE" exception when a non-Qt thread that owns Qt
+    objects terminates.
+
+  * Fixed potential crash when calling QCoreApplication::applicationFilePath().
+
+  * Fixed compilation problem with precompiled headers in qt3support. PCH is
+    now disabled for qt3support.
+
+  * Fixed issues with low-level keyboard handling for certain (international)
+    keyboard layouts where input of accented characters would only work
+    inconsistently.
+
+  * Fixed bug in QWidget::setGeometry() caused by incorrectly taking the
+    geometry of the window decoration into account.
+
+  * Made it possible to load files in a Japanese environment.
+
+  * Improved the appearance of dock widgets on Windows XP.
+
+  * Fixed the appearance of the window menu when triggered with Alt-Space.
+
+- QAxServer
+
+  * Ensured that characters that some IStorage implementations don't support
+    are removed from stream names.
+
+  * Fixed regression that prevented ActiveQt controls from being activated
+    once they had been closed.
+
+- QSettings
+
+  * Fixed potential deadlocks that could occur when saving settings,
+    particularly if an error occurs while settings are being written.
+
+Mac OS X
+--------
+
+  * Fixed a regression that made it impossible to drag images from non-Qt
+    application to Qt applications.
+
+  * Fixed an issue with flickering/disappearing widgets when the
+    Qt::WA_MacMetalStyle attribute is set.
+
+  * Updated the documentation to clarify QActionWidget behavior with regard
+    to adding a QActionWidget to a menu in the menu bar and using the same
+    menu as a popup.
+
+  * Ensured that the correct QList<QUrl> is returned when dragging Finder
+    items to Qt applications.
+
+  * Documented how to debug with debug frameworks.
+
+  * Fixed text selection in the PDF generator.
+
+  * Fixed a bug where the cursor would not switch to the arrow cursor over
+    child widgets with that cursor set.
+
+  * Fixed incorrect handling of FramelessWindow modal dialogs to ensure that
+    they do not have title bars and cannot be moved.
+
+  * Fixed a crash that could occur when enabling "Accessibility for assistive
+    devices" in System Preferences while a Qt application was running.
+
+  * Fixed a painting error where a one-pixel border at the bottom-right
+    corner of widgets wasn't being (re)painted correctly.
+
+  * Fixed an item view scrolling bug where cell widgets were scrolled
+    incorrectly.
+
+  * Made handling of popup behavior depend on the window type to ensure that
+    they are raised above other windows correctly.
+
+  * Fixed crashes caused by incorrect pointer handling for contexts.
+
+  * Ensured that the resize cursor shape is shown when the mouse cursor is
+    positioned over the edges of floating dock widgets.
+
+  * Fixed issue that caused menus to be opened behind widgets with the
+    WindowStaysOnTopHint hint set.
+    
+  * Fixed handling of the QAssistantClient class for framework builds.
+
+- QMacStyle
+
+  * Fixed a crash that occurred when an invalid rectangle was given for an
+    inactive button.
+      
+	  * Improved performance when rendering vertical gradients.
+	
+- QSystemTrayIcon
+
+  * Ensured that the enable state of actions are properly handled and that
+    aboutToShow() is emitted when appropriate.
+
+
+- Qtopia Core
+
+  * Fixed delivery of mouse events to overlapping popups.
+
+  * VNC: Fixed use of the VNC driver with the Multi driver.
+
+  * Fixed cursor state when switching between different screens.
+
+  * Improved performance when using an accelerated mouse cursor.
+
+  * Optimized linear gradient drawing using fixed point math for use on
+    platforms without floating point hardware.
+
+  * QCustomRasterPaintDevice::metric(): Fixed default values of PdmWidth and
+    PdmHeight.
+
+  * Fixed bug in QWidget::setMask().
+
+  * Fixed incorrect line edit editing behavior where the contents would be
+    cleared even for read-only line edits in certain situations.
+
+  * Fixed calibration of rotated screens in the Mouse Calibration example.
+
+  * Fixed setMode() in the LinuxFb, VNC and Transformed screen drivers.
+
+  * Fixed crash when using QWSCalibratedMouseHandler with filter size < 3.
+
+  * Fixed QScreen::alloc() for non-default color maps.
+
+  * Fixed a bug preventing a QWSEmbedWidget from being displayed if the
+    remote widget was hidden before it was embedded.
+
+  * Fixed screen area reservation when using the QDirectPainter class.
+
+  * Fixed compilation of the MySQL driver when using the minimum
+    configuration.
+
+  * Fixed left-to-right positioning for menu items in XP style.
+
+- QVFb
+
+  * Fixed crash that could occur when switching between certain skins.
+
+  * Fixed crash that could occur when recording.
+
+  * Enabled saving of animations in locations other than in /tmp.
+
+- QWhatsThis
+
+  * Fixed the unintentional double shadow effect for "What's This?" help.
+
+
+****************************************************************************
+*                             QTestLib                                     *
+****************************************************************************
+
+   * Added missing documentation for the QVERIFY2 macro.
diff --git a/dist/changes-4.2.3 b/dist/changes-4.2.3
new file mode 100644
index 0000000000..8041602b2b
--- /dev/null
+++ b/dist/changes-4.2.3
@@ -0,0 +1,373 @@
+Qt 4.2.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.2.0.
+
+The Qt version 4.2 series is binary compatible with the 4.1.x and 4.0.x
+series. Applications compiled for 4.0 or 4.1 will continue to run with 4.2.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- Configuration/Compilation
+    * Fixed architecture detection on UltraSPARC-T1 systems.
+    * Fixed compilation on embedded architectures when qreal is not double.
+    * Compile on OpenBSD.
+
+- Documentation
+    * Completed documentation for "Implementing Atomic Operations",
+      which is useful for people porting Qt to a new hardware architecture.
+
+- Translations
+    * Added a new unofficial Portuguese translation courtesy of Helder
+      Correia.
+
+- Qt Linguist
+    * Made the columns in the phrasebook resizeable.
+
+- lupdate
+    * Fixed bug in the .pro parser of lupdate. It should accept backslashes.
+    * Fixed a severe slowdown in lupdate. (~400x speedup.)
+    * Fixed traversal of subdirectories.
+
+- moc
+    * Don't create trigraphs in the generated code for C++ casts.
+
+- uic
+    * Fixed a bug that generated excessive margins for Q3GroupBox.
+
+Third party components
+----------------------
+
+- libpng
+
+  * Security fix: Avoid null dereferences.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General improvements
+--------------------
+
+- Graphics View
+
+    * Calling QGraphicsScene::update() without arguments now correctly
+      updates the entire scene.
+    * Changing the background brush in QGraphicsScene now correctly updates
+      the entire scene
+    * Fixed a crash in QGraphicsScene due to stale pointers in the BSP tree.
+    * QGraphicsScene::createItemGroup() now allows you to create an empty
+      group (previously caused an assert in debug mode).
+    * Fixed rendering bugs with QGraphicsPixmapItem::offset().
+    * Adding an item to a QGraphicsScene now always implicitly causes an
+      update.
+    * Fixed a crash caused by deleting a QGraphicsScene that is being viewed
+      by a QGraphicsView.
+    * Items with zero width or height (e.g., a horizontal or vertical line
+      with a zero-width cosmetic pen) are now rendered correctly.
+    * Fixed a crash in QGraphicsScene::destroyItemGroup(), and when removing
+      items from a group.
+
+- Item views
+    * Fixed data loss in QTreeWidget, QTableWidget and QListWidget that
+      occurred when performing a drag and drop copy operation on items
+      containing data in custom roles.
+
+    * Fixed signal emission bugs in QSqlQueryModel and QSqlTableModel that
+      caused the view to contain invalid items when used with a
+      QSortFilterProxyModel.
+
+    * Fixed a bug in word-wrapped text that could cause all new-line
+      characters, and the last line in string containing at least one
+      newline character, to be removed.
+
+    * Fixed bug in QListView where the last item of a batch was not always
+      displayed.
+
+- QAction
+    * Fixed a possible crash when using alternate shortcuts on a QAction.
+
+- QByteArray
+    * Fixed a crash in toUpper().
+
+- QCleanlooksStyle
+    * Indeterminate progress bars are now correctly animated.
+
+- QComboBox
+    * Fixed broken case sensitive completion.
+    * Changing the font on a QComboBox now changes the font on the popup as
+      well.
+
+- Q3TextEdit
+    * Fixed regression where some shortcuts didn't work on Mac OS X.
+
+- Q3Canvas
+    * Fixed potential memory overrun when determining a clipping chunk.
+
+- Q3Socket
+    * Fixed unexpected remote disconnection bugs (also QTcpSocket).
+
+- QFile
+    * Performance enhancements in QFile::copy().
+    * Allow reading past the previous end of the file if the file grows.
+    * Reliably allow QFile::readLine() and QFile::readAll() to be used to
+      read from stdin on all platforms.
+
+- QFileDialog
+    * Fixed crash that could occur when the filter began with ';;'.
+    * Fixed assertion caused by calling setFilters() with an empty list.
+    * Fixed problem with file entries not being laid out correctly.
+
+- QGridLayout
+    * Fixed bug in handling of fixed size spacers spanning multiple
+      rows/columns
+
+- QLayout
+    * Fixed bug caused by setting minimumSize() and SizePolicy::Fixed on a
+      widget that implements minimumSizeHint() but not sizeHint().
+
+- QLineEdit
+    * Fixed crash caused by moving the cursor over a QChar::LineSeparator
+      in the text.
+
+- QPainter
+    * Fixed bug in QPainter::drawPoints() when using the raster paint engine
+      which caused some points to be missing.
+    * Removed memory leak in raster paint engine when drawing complex
+      polygons/paths.
+
+- QProcess
+    * Fixed a crash that could occur when calling QProcess::waitForFinished()
+      from inside a slot connected to a signal emitted by QProcess.
+    * Fixed a race condition on Windows where QProcess::bytesToWrite() would
+      return a short byte count.
+
+- QTextDocument
+    * Fixed find() with backward searches.
+    * Match CSS style selector case insensitively.
+    * Fixed HTML import for tables with missing cells and rowspan/colspan
+      attributes. 
+
+- QSortFilterProxyModel
+    * Fixed a crash caused by calling filterChanged().
+    * Fixed a crash caused by removing items from the source model.
+    * Fixed a bug that could cause a model to enter an invalid state when
+      filtering items in a hierarchy, causing items in a QTreeView to
+      erroneously be collapsed.
+    * Fixed a bug that could cause invalid items to be added when inserting
+      new items to the source model.
+
+- QSyntaxHighlighter
+    * Fixed failing assertion that could occur when installing a syntax
+      highlighter before the document has created a layout.
+
+- QPluginLoader
+    * Fixed compilation of Q_EXPORT_PLUGIN when used with templates.
+
+- QTcpSocket
+    * Fixed a bug where QTcpSocket would time out when connecting to a
+      closed service on Windows.
+    * Fixed a race condition when calling waitFor...() functions with a very
+      short timeout value.
+    * Fixed unexpected remote disconnect problems on Windows.
+    * Improved the reliability of the waitFor...() functions with SOCKS5
+      proxy support.
+
+- QTextLayout
+    * Fixed rendering of surrogate pairs and cursor navigation with them.
+
+- QTextEdit
+    * Fixed crash in QTextEdit::setExtraSelection() that could occur when
+      used with null cursors.
+    * Fixed scrollbar bug which could cause the bottom of the text to be
+      unreachable.
+
+- QTextStream
+    * Fixed QTextStream::readLine() so it can be used reliably with stdin on
+      all platforms, and updated the documentation to reflect this.
+
+- QMacStyle
+    * Ensured that tab bars are drawn correctly regardless of the font used.
+
+- QMenuBar
+    * Properly marked the "text heuristic matching" strings for translation.
+
+- QMenu
+    * Fixed incorrect scrolling on large menus on Mac OS X.
+
+- QPlastiqueStyle
+    * Ensured that indeterminate progress bars are now always animated and
+      fixed a rendering bug.
+
+- QPrinter
+    * Fixed a bug on X11 that caused the printer to generate too many
+      copies.
+    * Fixed a bug in the PostScript driver that could cause invalid
+      PostScript to be generated.
+
+- QSqlRelationalTableModel
+    * Ensured that the internal cache is cleared after
+      QSqlRelationalTableModel::submitAll() is called. 
+
+- QSqlDriver
+    * Ensured that QSqlDriver::formatValue() doesn't cut off characters from
+      field names.
+
+- QTextTable
+    * Removed false assertion when deleting the first row or column in a
+      table.
+    * Fixed crash when splitting cells in the rightmost column of a table.
+    * Fixed issue where QTextTable::splitCells() would shift cells further
+      down in the table.
+    * Fixed crash in QTextTable::mergeCells() caused by merging an already
+      merged cell.
+    
+- QToolTip
+    * Fixed QToolTip sizes when used with HTML tags like <BR>.
+
+- QUdpSocket
+    * Fixed a busy-wait causing the event loop to spin when writing a
+      datagram to an unbound port.
+    * QUdpSocket now reliably emits readyRead() in connected mode.
+
+- QUrl
+    * Fixed a crash that would occur as a result of calling errorString() on
+      an empty URL.
+
+- SQL plugins
+    * Prevent crashes in QSqlQuery after reopening a closed ODBC connection.
+    * Prevent crash when retrieving binary data from ODBC.
+    * The Interbase driver now returns a valid handle through
+      QSqlDriver::handle().
+
+- QMutex
+    * Fixed race condition in QMutex::tryLock() that would prevent all
+      other threads from acquiring the mutex
+
+- QList
+    * Fixed crash when modifying a QList that must be detached from a
+      separate thread
+
+- QWidget
+    * Fixed case where a modal dialog could be stacked below its parent
+      window when the dialog was shown first
+    * Fixed an erroneous hideEvent() from being sent immediately after
+      window creation
+    * Fixed problem with missing text in QWidget::whatsThis().
+
+- QWindowsStyle
+    * Fixed a crash that could occur when deleting a QProgressBar after its
+      style was changed.
+
+- QVariant
+    * Fixed assertion caused by streaming in a variant containing a float.
+
+- QAbstractItemView
+    * Fixed focus problem with cell widgets.
+
+- QTableView
+    * Fixed problem with context menus clearing the selections.
+
+- QHeaderView
+    * Fixed assertion that could occur when removing all sections when some
+      sections had been moved.
+    * Fixed a bug that could prevent the user from resizing the last 
+      visible section if the "real" last section was invisible.
+
+- QListView
+    * Fixed crash when calling reset.
+
+- QTableWidget
+    * Fixed painting problem that could occur when rows were swapped.
+
+- QTreeView
+    * Fixed a crash that could appear when removing all the children of an
+      item.
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+X11
+---
+    * Fixed detection of Type1 symbol fonts.
+    * Fixed crash on exit in QSystemTrayIcon when QApplication is used
+      as the parent.
+    * Fixed animation GUI effects on tooltips, menus, and comboboxes.
+    * Fixed crashes in threaded programs when Qt uses the Glib main
+      loop.
+    * Fixed bug where an empty LANG environment variable could prevent input
+      of non-ASCII chars in Qt widgets.
+    * Fixed leak of initial style created by QApplication after calling
+      QApplication::setStyle().
+    * Fixed erroneous event delivery to a widget that has been destroyed.
+    * Prevent shortcuts for keypad arrow keys from being activated when
+      Num Lock is on.
+    * Fixed bug which caused incorrect drawing of subrectangles of bitmaps.
+    * Fixed bug in rendering of the Bengali script.
+
+Windows
+-------
+    * Fixed compilation with -no-stl.
+    * Fixed compilation with Windows SDK for Vista.
+    * Fixed an issue that could cause missing text when Cleartype was used.
+    * Fixed the hot-spot locations for OpenHandCursor and CloseHandCursor.
+    * Fixed infinite warning loop about adopted threads in applications with
+      many threads.
+    * Fixed assertion caused by hiding a child widget whose window has not
+      yet been created.
+    * Fixed QWindowsXPStyle so that it is possible to draw a
+      QStyle::CE_DockWidgetTitle without having an actual instance of
+      QDockWidget.
+    * Fixed crash when drawing text with large font sizes.
+    * Fixed support for the Khmer language.
+    * Fixed incorrect reporting of frameGeometry() after a window is closed.
+    * Fixed crash when handling spurious WM_CHAR from Remote Desktop Client.
+    * Fixed crash in JPEG plugin while loading.
+    * Fixed crash in QFileDialog::getExistingDirectory() when specifying
+      a parent that has not been shown yet.
+
+Mac OS X
+--------
+    * Fixed regression where dragging/copying Unicode text in Qt to another
+      application would only export the non-Unicode version.
+    * Fixed regression where releasing the mouse button would send two mouse
+      releas events to a widget.
+    * Fixed regression where the drop action would be reset after a native
+      "DragLeave" event was received.
+    * Wrapping a (non-Qt) window's content view and resizing before showing
+      the window for the first time now works correctly.
+    * Ensured that the content view is always created before we QWidgets are
+      added to a window - this allows better integration with Cocoa apps.
+    * Fixed regression where text/uri-list was inadvertently disabled for
+      clipboards.
+    * Fixed regression where setting the brushed metal style on a message
+      box would show the label in a non-metallic style.
+    * Fixed the open source binary package to have the correct definitions
+      for development.
+
+Qtopia Core
+-----------
+    * Fixed a data corruption bug in QDataStream on ARM processors where
+      reading and writing doubles/qreals would be incompatible with streams
+      on other platforms.
+      Note: corrupt data streams generated with previous versions of Qtopia
+      Core on ARM platforms cannot be read with this version.
+    * Fixed a possible buffer overflow in the VNC driver.
+    * Fixed a memory leak in the windowing system.
+    * Fixed painting errors occuring with use of QT::WA_PaintOnScreen on
+      certain screen configurations.
+    * Improved performance when using a 16-bit brush as the background on a 
+      16-bit screen.
+    * Improved performance of 16-bit semi-transparent solid fills.
+    * Fixed crash that could occur when saving a 16-bit image in BMP or PPM
+      formats.
+    * Fixed bug where window icons would not be shown in Plastique style.
+    * Fixed bug in QWSServer::setMaxWindowRect() on rotated displays.
+    * Fixed crash with normalized Unicode characters and QPF fonts.
+    * Ensured that QWidget::minimumSize() does not become larger than the
+      screen size.
+
diff --git a/dist/changes-4.2CEping b/dist/changes-4.2CEping
new file mode 100644
index 0000000000..530c650acc
--- /dev/null
+++ b/dist/changes-4.2CEping
@@ -0,0 +1,73 @@
+Changes for Qt/CE 4.2.x "Ping" release.
+
+****************************************************************************
+*                           Features                                       *
+****************************************************************************
+
+- Added QtNetwork
+
+- Added QFEATURES system
+
+- Added more examples/demos
+
+- configure.exe
+    * additions for QFEATURES
+
+- Native look and feel
+    * click&hold opens context menu
+    * only allow single application launch, second startup changes to running instance
+    * added experimental Windows CE 6 support
+
+****************************************************************************
+*                           Bug fixes                                      *
+****************************************************************************
+
+- qmake
+    * fix Visual Studio project file generator for THUMB instructions
+
+- Styles
+    * removed big icon images to reduce library sizes
+
+- QColorDialog
+    * fix size issues for Windows CE
+
+- QDebug
+    * fix multiple output of lines when using Visual Studio
+
+- QFile
+    * fix creation/resolving links
+
+- QFontDatabase
+    * fix bug for multiple system fonts available on device
+
+- QFontEngine
+    * fix alignment issues for line edits
+
+- qgetenv/qputenv
+    * fix memory leak
+
+- QLocale
+    * fix timezone issues regarding standard SDK.
+
+- QMessageBox 
+    * fix OK button bug
+
+- QSessionManager
+    * fix id creation
+
+- QTabWidget
+    * fix positioning bug
+
+- QWidget
+    * fix size related bugs
+    * fix window-animation when switching between menus (WindowsCEStyle)
+
+- QWindowsCEStyle
+    * various fixes
+
+- QWindowsMobileStyle
+    * smartphone fixes
+
+- winmain module
+    * fix leak
+
diff --git a/dist/changes-4.3.0 b/dist/changes-4.3.0
new file mode 100644
index 0000000000..f4e1d1a393
--- /dev/null
+++ b/dist/changes-4.3.0
@@ -0,0 +1,2445 @@
+Qt 4.3 introduces many new features as well as many improvements and
+bugfixes over the 4.2.x series. For more details, see the online
+documentation which is included in this distribution. The
+documentation is also available at http://doc.trolltech.com/4.3
+
+The Qt version 4.3 series is binary compatible with the 4.2.x series.
+Applications compiled for 4.2 will continue to run with 4.3.
+
+The Qtopia Core version 4.3 series is binary compatible with the 4.2.x
+series except for some parts of the device handling API, as detailed
+in Platform Specific Changes below.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Task Tracker:
+
+  http://www.trolltech.com/developer/task-tracker
+
+Each of these identifiers can be entered in the task tracker to obtain
+more information about a particular change.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- Configuration/Compilation
+    * Fixed OpenBSD and NetBSD build issues.
+
+- Legal
+    * Added information about the OpenSSL exception to the GPL.
+
+- Documentation and Examples
+    * Added information about the TS file format used in Linguist.
+    * Moved platform and compiler support information from
+      www.trolltech.com into the documentation.
+    * Added an Accessibility overview document.
+    * Added new example to show usage of QCompleter with custom tree models.
+
+- Translations
+    * Added a Slovak translation of Qt courtesy of Richard Fric.
+    * Added a Ukrainian translation of Qt courtesy of Andriy Rysin.
+    * Added a Polish translation of the Qt libraries and tools courtesy of
+      Marcin Giedz, who also provided a Polish phrasebook for Qt Linguist.
+    * [155464] Added a German translation for Qt Designer.
+
+- Added support for the CP949 Korean Codec.
+
+- [138140] The whole Qt source compiles with the QT_NO_CAST_FROM_ASCII
+  and QT_NO_CAST_TO_ASCII defines and therefore is more robust when
+  using codecs.
+
+- Added support for HP-UX 11i (Itanium) with the aCC compiler
+
+- Changed dialogs to respond much better to the LanguageChange event.
+  (i.e. run time translation now works much better.)
+
+- Signals and slots
+    * [61295] Added Qt::BlockingQueuedConnection connection type, which
+      waits for all slots to be called before continuing.
+    * [128646] Ignore optional keywords specified in SIGNAL() and SLOT()
+      signatures (struct, class, and enum).
+    * Optimize emitting signals that do not have anything connected to them.
+
+- [121629] Added support for the MinGW/MSYS platform.
+
+- [102293] Added search path functionality (QDir::addSearchPath)
+
+- Almost all widgets are now styleable using Qt Style Sheets.
+
+Third party components
+----------------------
+
+- Updated Qt's SQLite version to 3.3.17.
+
+- Updated Qt's FreeType version to 2.3.4.
+
+- Updated Qt's libpng version to 1.2.16.
+
+- Added libtiff version 3.8.2 for the TIFF plugin.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+- QAbstractButton
+    * [138210] Ensured strictly alternating ordering of signals resulting
+      from auto-repeating shortcuts. Fixed a repeat timer bug that cause
+      cause infinite retriggering to occur.
+    * [150995] Fixed bug where non-checkable buttons take focus when
+      activating shortcuts.
+    * [120409] Fixed bug where the button was set to unpressed when the
+      right mouse button was released.
+
+- QAbstractItemView
+    * [111503] Ensured that focus is given back to the view when the Tab key
+      is pressed while inside an editor.
+    * [156290] Use slower scrolling when the ScrollMode is set to
+      ScrollPerItem.
+    * Ensured that the item view classes use the locale property when
+      displaying dates and numbers to allow easy customization.
+    * Fixed a repaint issue with the focus rectangle in cases where
+      selection mode is NoSelection.
+    * [147422] Detect when persistent editors take/lose focus and update the
+      view accordingly.
+    * [146292] Items are now updated even if they contain an editor.
+    * [130168] Auto-scrolling when clicking is now delayed to allow
+      double-clicking to happen.
+    * [139247] Fixed bug where clicking on a partially visible item was
+      triggering a scroll and the wrong item was then clicked.
+    * [137729] Use dropAction() instead of proposedAction() in
+      QAbstractItemView::dropEvent().
+    * Fixed a bug that prevented keyboardSearch() from ignoring disabled
+      items.
+    * [151491] Ensured that we pass a proper MouseButtonPress event in
+      QAbstractItemView::mouseDoubleClickEvent().
+    * [147990] Ensured that double-clicking does not open an editor when
+      the edit trigger is set to SelectedClicked.
+    * [144095] Ensured that sizeHintForIndex() uses the correct item
+      delegate.
+    * [140180] Ensured that clicking a selected item clears all old
+      selections when the view is using the ExtendedSelection selection mode
+      and SelectedClicked as an edit trigger.
+    * [130168] Fixed bug where double clicking on partially visible items
+      would not activate them.
+    * [139342] Allow editing to be started programatically, even if there
+      are no edit triggers.
+    * [130135] Added public slot, updateIndex(const QModelIndex &index).
+
+- QAbstractProxyModel
+    * [154393] QAbstractProxyModel now reimplements itemData().
+
+- QAbstractSlider
+    * [76155] Fixed bug where the slider handle did not stop under the
+      mouse.
+
+- QAbstractSocket
+    * [128546] Fixed bug where an error was emitted with the wrong type.
+
+- QAccessible
+    * Added preliminary support for the upcoming IAccessible2 standard.
+    * Made improvements to most of the accessible interfaces.
+    * [154534] Ensured that our accessible interfaces honour
+      QWidget::setAccessibleName() and QWidget::setAccessibleDescription().
+    * Avoid crash if QAccessibleInterface::object() returns 0.
+      (It is absolutely legal to return a null value.)
+
+- QApplication
+    * Added a flash() method for marking windows that need attention.
+    * [86725] Allow the -style command line argument to override a
+      style set with QApplication::setStyle() before QApplication
+      construction.
+    * [111892] Fixed a bug that caused Qt to steal all input when
+      connecting the QAction::hovered() signal to a slot that called
+      QMainWindow::setEnabled(false).
+    * [148512] Fixed QApplication::keyboardModifiers() to update
+      correctly when minimizing the window when Qt::MetaModifier is held
+      down.
+    * [148796] Fixed a bug that prevented Qt from detecting system font
+      changes.
+    * [154727] Prevent a crash when a widget deletes itself in an key
+      event handler without accepting the event.
+    * [156484] Fixed a bug where lastWindowClosed() was emitted for each
+      top-level window when calling QApplication::closeAllWindows().
+    * [157667] Ensured that widgets with the Qt::WA_DeleteOnClose property
+      set are properly deleted when they are closed in the dropEvent()
+      handler following a drag that was started in the same application.
+    * [156410] Implemented QEvent::ApplicationActivate and
+      QEvent::ApplicationDeactivate on all platforms. Note that
+      QEvent::ApplicationActivated and QEvent::ApplicationDeactivated are
+      now deprecated.
+
+- QAtomic
+    * [126321] Fixed several flaws in the inline assembler implementations
+      for several architectures (ARM, i386, PowerPC, x86-64).
+    * [133043] Added support for atomic fetch-and-add.
+
+- QAuthenticator
+    * New Class. Needed for authentication support in the Network module.
+      Currently supports the Basic, Digest-MD5 and NTLM authentication
+      mechanisms.
+
+- QBitArray
+    * [158816] Fixed crash in operator~().
+
+- QCalendarWidget
+    * Don't set maximum width for month/year buttons.
+    * Ensured that the QPalette::Text role is used for default text.
+    * Added a date editor which can be configured with the dateEditEnabled
+      and dateEditAcceptDelay properties.
+    * [137031] Ensured that grid lines are drawn properly when headers are
+      not visible.
+    * [151828] Ensured that the language can be set with
+      QCalendarWidget::setLocale().
+
+- QChar
+    * Updated the Unicode tables to Unicode 5.0.
+    * Added foldCase() and toTitleCase() methods.
+    * Added public API to handle the full Unicode range.
+
+- QCleanlooksStyle
+    * [129506] Sliders now look and behave correctly in both reversed and
+      inverted appearance modes.
+    * [131490] Group boxes no longer reserve space for their titles when no
+      title is set.
+    * [134344] A sunken frame is now used to indicate checked menu items
+      with icons.
+    * [133691] Improved the appearance of spin boxes and buttons when used
+      against dark backgrounds.
+    * [154499] Fixed a rendering issue with disabled, checked push buttons.
+    * [154862] Fixed an issue causing combo boxes to sometimes show clipped
+      text.
+    * Slider appearance is now based on Clearlooks Cairo and the performance
+      on X11 has been improved.
+    * The appearance of tab bars when used with Qt::RightToLeft layout
+      direction has been improved.
+    * Dock widget titles are now elided if they are too long to fit in the
+      available space.
+
+- QClipboard
+    * Ensured that calling clear() on the Mac OS X clipboard really clears
+      its data.
+    * [143927] Don't drop alpha channel information when pasting pixmaps on
+      Mac OS X.
+    * The Mac OS X clipboard support now understands TIFF information and
+      can export images as TIFF as well.
+    * [145437] Fixed crash that could occur when calling setMimeData() twice
+      with the same data.
+    * QMacMime now does correct normalization of file names in a URL list
+      from foreign applications.
+
+- QColor
+    * [140150] Fixed bug where QColor::isValid() would return true for
+      certain invalid color strings.
+    * [120367] Added QColor::setAllowX11ColorNames(bool), which enables
+      applications to use X11 color names.
+    * Fixed internal errors in toHsv() due to inexact floating point
+      comparisions.
+
+- QColorDialog
+    * [131160] Enabled the color dialog to be used to specify an alpha color
+      on Mac OS X.
+
+- QColumnView
+    * A new widget that provide a column-based implementation of
+      QAbstractItemView.
+
+- QComboBox
+    * Significantly reduced the construction time of this widget.
+    * [155614] Speeded up addItem() and addItems().
+    * [150768] Ensured that inserting items doesn't change the current text
+      on editable combo boxes.
+    * [150902] Ensured that only the left mouse button can be used to open
+      the popup list.
+    * [150735] Fixed pop-up hiding behind top-level windows on Mac OS X.
+    * [156700] Fixed bug where the popup could be closed when pressing the
+      scroll arrows.
+    * [133328] Fixed bug where disabled entries were not grayed out.
+    * [134085] Fixed bug where the AdjustToContents size policy had no
+      effect.
+    * [152840] Fixed bug where QComboBox would not automatically scroll to
+      the current item.
+    * [90172] Fixed bug where the sizeHint() implementation iterated over
+      all icons to detect their availability.
+
+- QCompleter
+    * Significantly reduced the construction time of this widget.
+    * Added support for lazily-populated models.
+    * [135735] Made QCompleter work when used in a QLineEdit with a
+      QValidator.
+    * Added the wrapAround property to allow the list of completions to
+      wrap around in popup mode.
+    * Added support for sharing of completers, making it possible for the
+      same QCompleter object to be set on multiple widgets.
+    * [143441] Added support for models that sort their items in descending
+      order.
+
+- QCoreApplication
+    * Added support for posted event priorities.
+    * [34019] Added the QCoreApplication::removePostedEvents() overload
+      for removing events of a specific type.
+    * Documented QCoreApplication::processEvents() as thread-safe;
+      calling it will process events for the calling thread.
+    * Optimized delivery of QEvent::ChildInserted compatibility events.
+    * [154727] Enabled compression of posted QEvent::DeferredDelete events
+      (used by QObject::deleteLater()) to prevent objects from being deleted
+      unexpectedly when many such events are posted.
+    * Ensured that duplicate entries in library paths are ignored.
+
+- QCryptographicHash
+    * New Class. Provides support for the MD4, MD5 and SHA1 hash functions.
+
+- QCursor
+    * [154593] Fixed hotspot bug for cursors on Mac OS X.
+    * [153381] Fixed crash in the assignment operator in cases where the
+      cursor was created before a QApplication instance.
+
+- QDataWidgetMapper
+    * [125493] Added addMapping(QWidget *, int, const QByteArray &) and
+      mappedPropertyName(QWidget *) functions.
+
+- QDateTime
+    * [151789] Allow passing of date-only format to QDateTime::fromString()
+      (according to ISO 8601).
+    * [153114, 145167] Fixed bugs that could occur when parsing strings to
+      create dates.
+    * [122047] Removed legacy behavior which assumed that a year between 0
+      and 99 meant a year between 1900 and 1999.
+    * [136043] Fixed the USER properties.
+
+- QDateTimeEdit
+    * [111557, 141266] Improved the behavior of the widget with regard to
+      two-digit years. Made stepping work properly.
+    * [110034] Don't change current section when a WheelEvent is received.
+    * [152622] Don't switch section when a FocusInEvent is received if the
+      reason is Popup.
+    * Fixed a bug that would cause problems with formats like dd.MMMM.yyyy.
+    * [148522] Ensured that the dateRange is valid for editors that only
+      show the time.
+    * [148725] Fixed a bug with wrapping and months with fewer than 31 days.
+    * [149097] Ensured that dateTimeChanged() is emitted, even if only date
+      or time is shown.
+    * [108572] Fixed the behavior to ensure that typing 2 into a zzz field
+      results in a value of 200 rather than 002.
+    * Ensured that the next field is entered when a separator is typed.
+    * [141703] Allow empty input when only one section is displayed.
+    * [134392] Added a sectionCount property.
+    * [134392] Added sectionAt(), currentSectionIndex(), and
+      setCurrentSectionIndex() functions.
+    * Added a NoButtons value for the buttonSymbols property.
+
+- QDesktopWidget
+    * [135002] Ensured that the resized() signal is emitted after the
+      desktop is resized on Mac OS X.
+
+- QDial
+    * [151897] Ensured that, even with tracking disabled, the signal
+      sliderMoved() is always emitted.
+    * [70209] Added support for the inverted appearance property.
+
+- QDialog
+    * [131396] Fixed a crash in QDialog::exec() that could occur when the
+      dialog was deleted from an event handler.
+    * [124269] Ensured that the size grip is hidden for extended dialogs.
+    * [151328] Allow the use of buttons on the title bar to be explicitly
+      specified on Mac OS X.
+
+- QDialogButtonBox
+    * [154493] Moved the Action role before the Reject role on Windows to
+      conform with platform guidelines.
+
+- QDir
+    * [136380] QDir's permission filters on Unix now behave the same as on
+      Windows (previously the filters' behavior was reversed on Unix).
+    * [158610] Passing QDir::Unsorted now properly bypasses sorting.
+    * [136989] Ensured that removed dirs are reported as non-existent.
+    * [129488] Fixed cleanPath() for paths with  the "foo/../bar" pattern.
+
+- QDirIterator
+    * New class. Introduced to provide a convenient way to examine the
+      contents of directories.
+
+- QDockWidget
+    * [130773] Ensure that dock widgets remember their undocked positions
+      and sizes.
+    * Added support for vertical title bars, which can be used to save space
+      in a QMainWindow.
+    * Added support for setting an arbitrary widget as a custom dock widget
+      title bar.
+    * [141792] Added the visibilityChanged() signal which is emitted when
+      dock widgets change visibility due to show or hide events, or when
+      being selected or deselected in a tabbed dock area.
+    * Added the dockLocationChanged() signal which is emitted when dock
+      widgets are moved around in a QMainWindow.
+    * [135878] Titlebars now support mnemonics properly.
+    * [138995] Dock widget titlebars now correctly indicate their activation
+      state.
+    * [145798] Ensured that calling setWindowTitle() on a nested, docked
+      dock widget causes the title in the tab bar to be updated.
+
+- QDomDocument
+    * [128594] Ensured that comment nodes are indented correctly when
+      serializing a document to a string.
+    * [144781] Fixed crash that would occur when the owner document of new
+      attributes was not adjusted.
+    * [107123] Ensured that appendChild() does not erroneously add two
+      elements to document nodes in certain cases.
+
+- QDoubleSpinBox
+    * [99254] Allow higher settings for decimals.
+
+- QDrag
+    * [124962] Added QDrag::exec() to allow the default proposed action to
+      be changed.
+
+- QFile
+    * [128352] Refactored the backend on Windows with major performance
+      improvements; in particular line and character reading is now much
+      faster.
+    * [146693] Fixed a lock-up in copy().
+    * [148447] QFile now supports large files on Windows where support is
+      available.
+    * Generally improved support for stdin.
+    * Byte writing performance has improved on all platforms.
+    * [151898] Added support for reading lines with an embedded '\0'
+      character.
+
+- QFileDialog
+    * Updated the dialog to use native icons.
+    * Made general improvements to the dialog's performance.
+    * Added a sidebar to show commonly used folders.
+    * [134557] Added the ability to use a proxy model.
+    * Added dirEntered() and filterSelected() signals, previously found in
+      Qt 3's file dialog.
+    * [130353] Fixed Qt/Mac native file dialog pattern splitting
+    * [140332] Made the dialog respond much better to the LanguageChange
+      event.
+    * [154173] Fixed a memory deallocation error.
+    * Made the selected filter argument work for native Mac OS X file
+      dialogs.
+
+- QFileInfo
+    * Ensured that the value of Mac FS hidden flag is returned for symbolic
+      links and not their targets; i.e., hidden links are not followed.
+    * [128604] Introduced isBundle() for Mac OS X bundle types.
+    * [139106] Fixed bug that could cause drives to be reported as hidden
+      on Windows.
+
+- QFileSystemWatcher
+    * [155548] Reliability fixes.
+    * When in polling mode, send change notification when file permissions
+      change.
+    * [144049, 149637] Fixed a bug that prevented watching a directory
+      for notification on Windows.
+    * [143381] Fixed bug that caused addPath() and removePath() to fail when
+      passing an empty string.
+
+- QFocusFrame
+    * [128713, 129126] Made the focus frame visible in more situations on
+      Mac OS X.
+
+- QFont
+    * X11: Add a method to retrieve the FreeType handle from the QFont.
+
+- QFontComboBox
+    * [132826] Fixed a bug that could cause the popup list to be shown
+      off-screen.
+    * [155614] Speeded up addItem() and addItems().
+    * [160110] Fixed crash that could occur when setting a pixel size for
+      the fonts.
+
+- QFontMetrics
+    * [152013] Fixed bug where boundingRect() gave sizes that were too large
+      when compiled using Visual Studio 6.
+    * [145980] Added tightBoundingBox() method.
+
+- QFrame
+    * [156112] Fixed bug where the default frame was not correct when
+      created without a parent and reparented afterwards.
+    * [150995] Fixed bug where setting the frame style did not invalidate
+      the size hint
+
+- QFSFileEngine
+    * Fixed bug in fileTime() on Win98 and WinME
+    * Ensured that the working directory of a Windows shortcut is set when
+      a link is created.
+    * Improved the reliability of buffered reads on platforms that cache
+      their EOF status.
+
+- QFtp
+    * [107381] Greatly improved LIST support; QFtp now supports more server
+      types.
+    * [136008] Improved tolerance for servers with no EPRT/EPSV support.
+    * [150607] Fixed a race condition when using ActiveMode for uploading.
+
+- QGL
+    * [158971] Fixed a resource leak in the GL texture cache.
+
+- QGLFramebufferObject
+    * Made it possible to configure the depth/stencil buffer in a
+      framebuffer object.
+    * Added support for floating point formats for the texture in a
+      framebuffer object.
+
+- QGLPixelBuffer
+    * [138393] Made QGLPixelbuffer work under Windows on systems without the
+      render_texture extension.
+
+- QGLWidget
+    * [145621] Avoided a QGLFormat object copy when checking the buffer
+      format with the doubleBuffer() function.
+    * [100519] Rewritten renderText(). It now supports Unicode text, and it
+      doesn't try to overwrite previously defined display lists.
+
+- QGraphicsItem
+    * [151271] Fixed crash that could occur when calling update on items
+      that are not fully constructed.
+    * Ensured that the selected state no longer changes state twice
+      for each mouse click.
+    * [138576] setParent() now correctly adds the child to the parent's
+      scene.
+    * [130263] Added support for partial obscurity testing with the
+      isObscured(QRectF) function.
+    * [140725] QGraphicsTextItem is now also selectable when editable.
+    * [141694] QGraphicsTextItem now calls ensureVisible() if it has input
+      focus.
+    * [144734] Fixed bugs in unsetCursor().
+    * [144895] Improved bounding rectangle calculations for all standard
+      items.
+    * Added support for QTransform.
+    * [137055] Added QGraphicsItem::ItemPositionHasChanged and
+      ItemTransformHasChanged.
+    * Added several convenience functions.
+    * [146863] Added ItemClipsToShape and ItemClipsChildrenToShape clipping
+      flags.
+    * [139782] Greatly improved hit and selection tests.
+    * [123942] Added the ItemIgnoresTransformations flag to allow items to
+      bypass any inherited transformations.
+    * All QGraphicsItem and standard item classes constructors have now had
+      their scene arguments obsoleted.
+    * [150767] Added support for implicit and explicit show and hide.
+      Explicitly hidden items are no longer implicitly shown when their
+      parent is shown.
+    * [151522] Fixed crash when nesting QGraphicsItems that enabled child
+      event handling.
+    * [151265] Cursors now change correctly without mouse interaction.
+    * Added deviceTransform() which returns a matrix that maps between item
+      and device (viewport) coordinates.
+    * Added the ItemSceneChange notification flag.
+    * [128696] Enabled moving of editable text items.
+    * [128684] Improved highlighting of selected items.
+
+- QGraphicsItemAnimation
+    * [140522] Fixed special case interpolation bug.
+    * [140079] Fixed ambiguity in the position of insertions when multiple
+      items are inserted for the same step in an animation.
+
+- QGraphicsScene
+    * [130614] Added the invalidate() function for resetting the cache
+      individually for each scene layer.
+    * [139747] Fixed slow memory leaks caused by repeatedly scheduling
+      single-shot timers.
+    * [128581] Added the selectionChanged() signal which is emitted when
+      the selection changes.
+    * Introduced delayed item reindexing which greatly improves performance
+      when moving items.
+    * The BSP tree implementation has undergone several optimizations.
+    * Added new bspTreeDepth property for fixating the BSP tree depth.
+    * Optimization: Reduced the number of unnecessary index lookups.
+    * [146518] Added the selectionArea() function.
+
+- QGraphicsSceneWheelEvent
+    * [146864] Added wheel orientation.
+
+- QGraphicsView
+    * [136173] Hit-tests are now greatly improved for thin items.
+    * [133680] The scroll bars are now shown at their maximum extents
+      instead of overflowing when the transformed scene is larger than
+      the maximum allowed integer range.
+    * [129946] Changing the viewport no longer resets the acceptsDrops()
+      property.
+    * [139752] ScrollHandDrag is now allowed also in non-interactive mode.
+    * [128226] Fixed rubber band rendering bugs (flicker and transparency).
+    * [144276] The selection is no longer reset by scroll-dragging.
+    * Added support for QTransform.
+    * [137027] Added new viewportUpdateMode() property for better control
+      over how QGraphicsView schedules updates.
+    * Several convenience functions have been added.
+    * [146517] Added rubberBandSelectionMode() for controlling how items are
+      selected with the rubber band.
+    * [150344] Fixed the scroll bar ranges to prevent the scroll bars from
+      hiding parts of the scene.
+    * [150321] Added new optimizationFlags() property, allowing individual
+      features to be disabled in order to speed up rendering.
+    * The level of detail algorithm has been changed to improve support for
+      transformations that change the view's aspect ratio.
+    * [154942] Fixed background rendering in render().
+    * [156922] render() now properly supports all transformations, source
+      and target rectangles.
+    * [158245] Calling setScene(0) now implicitly calls update().
+    * [149317] Added NoViewportUpdate to the set of modes that can be set
+      for updating a view.
+
+- QGridLayout
+    * [156497] Fix a one-off error that could cause the bottom button in
+      a QDialogButtonBox to be cropped.
+
+- QHeaderView
+    * This widget now uses Qt::NoFocus as its default focus policy.
+    * [99569] Improved performance, providing up to a 2x speed increase for
+      some cases.
+    * [146292] Fixed bug that made it impossible to resize the last section
+      under certain circumstances.
+    * [144452] Fixed bug that caused setDefaultAlignment() to have no
+      effect.
+    * [156453] Fixed column resizing bug that could cause branches in one
+      column to be drawn in the next.
+    * [142640] Ensured that the Qt::SizeHintRole is used when available.
+    * [142994] Hidden items are now restored to their original size when
+      shown.
+    * [127430] Added saveState() and restoreState().
+    * [105635] Added support for drag selecting.
+
+- QHostInfo
+    * [141946] No longer stops working after QCoreApplication is destroyed.
+    * [152805] Now periodically reinitializes DNS settings on Unix.
+
+- QHttp
+    * [139575] Fixed state for servers that use the "100 Continue" response.
+    * Added support for the HTTPS protocol.
+    * Improved proxy support.
+    * Added support for server and proxy authentication.
+
+- QIcon
+    * Added cacheKey() as a replacement for serialNumber().
+    * Fixed the streaming operators.
+
+- QImage
+    * [157549] Fixed a crash that could occur when calling copy() with
+      negative coordinates.
+    * Added cacheKey() as a replacement for serialNumber().
+    * [131852] Optimized rotations by 90 and 270 degrees.
+    * [158986] Fixed painting onto an images with the Format_RGB16 image
+      format.
+    * Fixed rotations by 90 and 270 degrees for images with the Format_RGB16
+      image format.
+    * [152850] Fixed bugs in text() and setText().
+    * Fixed a crash that could occur when passing a 0 pointer to the
+      constructor that accepts XPM format image data.
+    * [150746] Added a constructor that accepts an existing memory buffer
+      with non-default stride (bytes per line).
+
+- QImageReader
+    * [141781] Fixed support for double byte PPM files (>256 colors).
+
+- QImageWriter
+    * Added support to enable compression if a plugin supports it.
+
+- QInputDialog
+    * [115565] Disabled OK button for non-acceptable text (getInteger() and
+      getDouble()).
+    * [90535] Input dialogs now have a size grip
+
+- QIntValidator, QDoubleValidator
+    * Validators now use the locale property to recognize numbers
+      formatted for various locales.
+
+- QItemDelegate
+    * [145142] Ensured that text is not drawn outside the bounds of a cell.
+    * [137198] Fixed handling of cases where the decoration position is set
+      to be at the bottom of an item to prevent the text from being
+      incorrectly positioned.
+    * [142593] Take word wrap into account when calculating an item's size
+      hint.
+    * [139160] Ensured that the focus rectangle is shown, even for empty
+      cells.
+
+- QItemSelectionModel
+    * Made optimizations for some common cases.
+    * [143383] Fixed incorrect behavior of hasSelection().
+
+- QLabel
+    * [133589] Fixed performance problems with plain text labels.
+    * Fixed support for buddies with rich text labels.
+    * [136918] Fixed setText() to not turn off mouse tracking when the text
+      used is plain text.
+    * [143063] Ensured that the mouse cursor is reset when a link is
+      clicked.
+    * [156912] Fixed bug where the mouse cursor shape was changed to the
+      pointing hand cursor, but would not be correctly cleared afterwards.
+
+- QLayout
+    * Added new features to Qt's layout system to enable:
+      - independent values for all of the four margins,
+      - independent horizontal spacing and vertical spacing in QGridLayout,
+      - non-uniform spacing between layout items,
+      - layout items to occupy parts of the margin or spacing when required
+        by the application or style.
+
+- QLibrary
+    * Fixed bug that caused QLibrary::load() to discard the real error
+      message if the error was something else than ERROR_MOD_NOT_FOUND.
+      (Win32)
+    * Fixed bug that prevented QLibrary::load() from loading a library with
+      no suffix (because LoadLibrary automagically appended the .dll suffix
+      on Win32).
+    * Corrected behavior of fileName() to ensure that, if we loaded a
+      library without specifying a suffix and the file found had the .dll
+      suffix, the fileName found is returned instead of the fileName
+      searched for (as was previously the case).
+    * [156276] Fixed behavior of unload() to return true only if the library
+      could be unloaded.
+
+- QLineEdit
+    * [156104] Ensured that input methods are disabled when not in the
+      Normal edit mode.
+    * [157355] Fixed drag and drop bug on Mac OS X that could occur when
+      dragging inside the widget.
+    * [151328] Ensured that the caret is removed when text is selected on
+      Mac OS X.
+    * [136919] Ensured that fewer non-printable characters are replaced
+      with spaces.
+
+- QList
+    * Fixed a race-condition in QList::detach() which could cause an
+      assertion in debug mode.
+
+- QListView
+    * [136614] Fixed the behavior of Batched mode to ensure that the last
+      item of the batch is displayed.
+    * Fixed some issues with jerky scrolling in ScrollPerItem mode if the
+      grid size was different to the delegate's size hint.
+    * [113437] Prevent noticeable flicker on slow systems in Batched mode
+      by laying out the first batch immediately.
+    * [114473] Added a new property to QListView: selectionRectVisible.
+    * Fixed a bug that could cause too many items to be selected.
+    * Fixed issue that could cause list views to have incorrect scroll bar
+      ranges if their grid sizes differed from their item sizes.
+    * [144378] Improved navigation for cases where an item is taller than
+      the viewport.
+    * [148846] Fixed an issue that prevented scroll bars from being updated
+      correctly when items were moved programmatically.
+    * [143306] Improved support for keyboard navigation and selection.
+    * [137917] Shift-click extended mode selection in icon mode now selects
+      the correct items.
+    * [138411] Fixed bug where hidden items would cause drawing problems
+      when pressing Ctrl+A.
+
+- QListWidget
+    * [146284] Ensured that the effect of SingleSelection mode is also taken
+      into account when setSelected() is called on items.
+    * [151211] Added removeCellWidget() and removeItemWidget() functions.
+
+- QLocale
+    * Updated the locale database to CLDR 1.4: more locales supported;
+      numerous fixes to existing locales.
+
+- QMacStyle
+    * [159270] Fixed drawing of icons on buttons with no text.
+    * [146364] Fixed drawing of multi-line text for items in a QToolBar.
+    * [145346] Removed unwanted wrapping of text in a QPushButton.
+    * Fixed drawing of "Flat" group boxes.
+    * [113472] Fixed drawing of text on vertical headers when resizing.
+    * [148509] Ensured that the correct font is used for buttons and labels
+      when the application is not configured to use the desktop settings.
+    * [106100] Improved the look of push buttons with menus.
+    * Made fixes to Qt's layout system that enable more native-looking
+      forms.
+    * [151739] Buttons with an icon are now centered correctly.
+    * [142672] Fixed font size bug on the drop down box for QComboBox.
+    * [148832] The button on a combo box is now showing as pressed when the
+      drop down menu is shown.
+    * [147377] Ensured that combo boxes now scale correctly on Mac OS X.
+    * [143901] Fixed the highlight color for widgets such as QComboBox so
+      that it follows the system settings on Mac OS X.
+    * [151852] Fixed size calculation for QPushButton with an icon.
+    * [133263] Removed the coupling of text size and button kind, enabling
+      them to be set independently.
+    * [133263] Ensured that QPushButton respects calls to setFont().
+    * [141980] Text with small font sizes is now centered vertically correct
+      inside push buttons.
+    * [149631] Ensure that beveled button types are chosen if text doesn't
+      fit inside a button instead of cutting the text.
+    * [151500] Fixed incorrect QPushButton text clipping behavior.
+    * [147653] Fixed bug that caused the sort indicator to be drawn on top
+      of the text in QHeaderView.
+    * [139149] Fixed issues with CE_SizeGrip in right-to-left mode.
+    * [139311] Improved drawing of the title in QGroupBox.
+    * [128713] Ensured that drawing of the focus frame now follows pixel
+      metrics.
+    * [142274] Made QSlider tickmark drawing more like Cocoa.
+    * focusRectPolicy() is now obsolete. This is now controlled by the
+      Qt::WA_MacShowFocusRect attribute.
+    * widgetSizePolicy() is now obsolete. This is now controlled by the
+      Qt::WA_Mac*Size attribute.
+    * [129503] Ensured that a group box without a title no longer allocates
+      space for it.
+    * Ensured that a more appropriate width is used for push buttons.
+    * [132674] Ensured that tab bar drawing is correct when the tab's font
+      isn't as tall as the default.
+    * [126214] Ensured that the QSizeGrip is drawn correctly in brushed
+      metal windows.
+    * Improved styling of docked QDockWidgets.
+
+- QMainWindow
+    * [145493] Fixed a crash that could occur when calling setMainWindow(0)
+      on X11.
+    * [137013, 158094] Fixed bugs relating to the handling of size hints,
+      minimum/maximum sizes and size policies of QDockWidgets in main
+      windows.
+    * [147964] Animated tool bar areas adjust dynamically when a QToolBar is
+      dragged over them.
+    * Added the dockOptions property. This makes it possible to:
+        - specify that tabbed dock areas should have vertical tab bars,
+        - disable tabbed docking altogether,
+        - force tabbed docking, disallowing the placement of dock widgets
+          next to each other.
+    * Fixed bugs in saving and restoring main window state.
+    * [143026] Fixed support for hiding and showing toolbars on Mac OS X.
+    * [131695] Add unified toolbar support on Mac OS X.
+
+- QMdiArea
+- QMdiSubWindow
+    * New classes. QMdiArea is a replacement for QWorkspace.
+
+- QMenu
+    * The addAction() overloads that accept a slot argument now honor the
+      slot's bool argument correctly.
+    * [129289] Added support for handling context menus from within a menu.
+    * [144054] Fixed scrolling logic.
+    * [132524] Allow setVisible() of separator items on Mac OS X native
+      menu items.
+    * [131408] Torn-off menus now have fixed sizes to prevent the window
+      system from resizing them.
+    * [113989] Added some fuzziness to the "snap to" detection.
+    * [155030] Do not disable command actions when merge is disabled.
+    * [131702] Tear-off menus no longer appear only once.
+    * [138464] Ensured that, if a popup menu does not fit on the right-hand
+      side of the screen, it is aligned with the right side of the parent
+      widget instead of the left side.
+    * [130343] Ensured that only the left mouse button triggers menu actions
+      on Windows.
+    * [139332] Fixed an issue that caused submenus to close when moving the
+      mouse over a separator.
+    * [157218] Ensured that torn-off menus are not closed when Alt is
+      pressed.
+    * [135193] Ensured that the size hint, maximum size and minimum size are
+      taken into account for each QWidgetAction.
+    * [133232] Improved handling of menus that are opened at specified
+      positions.
+    * [141856] Fixed bug where exec() would return NULL if the user pressed
+      a mnemonic shortcut.
+    * [133633] Fixed focus problem with keyboard navigation between menus
+      and widget actions.
+    * [134560] Fixed bug that prevented status tips from being shown for
+      actions in tool button menus.
+    * [150545] Fixed memory leak on Mac OS X.
+    * [138331] Fixed bug that could cause menus to stay highlighted after
+      the closing of a dialog.
+    * Menu shortcuts are now cleared if the corresponding QAction is cleared
+      on Mac OS X.
+    * Fixed bug that could cause changes to shortcut to not take effect on
+      Mac OS X.
+    * [12536] Don't allow Tab to be used to navigate menus on Mac OS X.
+    * [108509] Prevented shortcuts from stealing keyboard navigation keys.
+    * [134190] Added support for Shift+Tab to enable backwards navigation.
+
+- QMenuBar
+    * [135320] Make show() a no-op on Mac OS X to prevent the menu bar from
+      being visible at the same time as a native Mac menu bar.
+    * [115471] Fixed torn-off menu behavior to ensure that mouse events
+      are propagated correctly on second level tear-offs.
+    * [126856] Fixed an issue that could cause several menus to be open at
+      the same time.
+    * [47589] The position of the menu is now shifted horizontally when
+      there is not enough space (neither above nor below) to display it.
+    * [131010] Fixed bug where adding an action and setting its menu would
+      prevent the action from being triggered through its shortcut.
+    * [142749] Fixed bug where setEnabled(false) had no effect on Mac OS X.
+    * [141255] Made it possible to make an existing menu bar an application-
+      wide menu bar with setParent(0) on Mac OS X.
+
+- QMessageBox
+    * [119777] Ensured that pressing Ctrl+C in message boxes on Windows
+      copies text to the clipboard.
+    * Added setDefaultButton(StandardButton) and
+      setEscapeButton(StandardButton) functions.
+
+- QMetaObject
+    * Optimized invokeMethod() to avoid calling type() unnecessarily.
+
+- QMetaType
+    * [143011] Fixed isRegistered() to return false when the type ID does
+      not correspond to a user-registered type.
+
+- QModelIndex
+    * [144919] Added more rigorous identity tests for model indexes.
+
+- QMotifStyle
+    * [38624] Fixed the behavior when clicking on a menu bar item a
+      second time; the menu will now close in the same way that native
+      Motif menus do.
+
+- QMutex
+    * [106089] Added tryLock(int timeout), which allows a thread to specify
+      the maximum amount of time to wait for the mutex to become available.
+    * [137309] Fixed a rare deadlock that was caused by compiling with
+      optimizations enabled.
+    * Optimized recursive locking to avoid two unnecessary atomic operations
+      when the current thread already owns the lock.
+    * Optimized non-recursive mutexes by avoiding a call to pthread_self()
+      on Unix.
+
+- QNetworkInterface
+    * [146834] Now properly generates broadcast addresses on Windows XP.
+
+- QNetworkProxy
+    * Added support for transparent HTTP CONNECT client proxying.
+    * Added support for complex authenticators through QAuthenticator.
+
+- QObject
+    * Added a compile time check to ensure that the objects passed to
+      qobject_cast contain a Q_OBJECT macro.
+    * [133901] Improved the run time warnings from setParent() that is
+      output when trying to set a new parent that is in a different thread.
+    * [140106] Fixed a deadlock that could occur when deleting a QObject
+      from the destructor of a QEvent subclass.
+    * [133739] Fixed compiler warnings from g++ in findChildren<T>().
+    * Documented the QEvent::ThreadChange that is sent by moveToThread().
+    * [130367] Improved the run time warning that is output when creating
+      a QObject with a parent from a different thread.
+    * [114049] Made dumpObjectInfo() also dump connection information.
+
+- QPageSetupDialog
+    * [136041] Margins are now saved and used properly when printing.
+
+- QPainter
+    * Fixed stroking of non-closed polygons with non-cosmetic pens in the
+      OpenGL paint engine.
+    * [133980] Fixed stroking bug for RoundJoin and MiterJoin with paths
+      containing successive line segments with a 180 degree angle between
+      them.
+    * [141826] Fixed stroking with MiterJoin of paths with duplicated
+      control points.
+    * [139454, 139209] Fixed problem with SmoothTransformation that caused
+      images to fade out toward the edges in raster paint engine.
+    * Added the HighQualityAntialiasing render hint to enable pixel shaders
+      for anti-aliasing in the OpenGL paint engine.
+    * [143503] Fixed broken painting when using a QPainter on a
+      non-top-level widget where the world matrix is disabled then
+      re-enabled.
+    * [142471] Fixed dashed line drawing of lines that are clipped against
+      the device rectangle.
+    * [147001] Fixed bug with drawing of polygons with more than 65536
+      points in the raster paint engine.
+    * [157639] Calling drawPolygon() from multiple threads no longer causes
+      an assertion.
+    * Optimized line and rectangle drawing in the raster paint engine.
+    * [159047] Fixed case where fillRect() would ignore the brush origin.
+    * [143119] Fixed bug where drawing a scaled image on another image would
+      cause black lines to appear on the edges of the scaled image.
+    * [159894] Fixed X11 errors when using brush patterns on multiple
+      screens.
+    * [148524] Fixed X11 errors when drawing bitmaps containing a color
+      table with alpha values.
+    * [141871] Optimized and fixed drawing of extremely large polygons.
+    * [140952] Fixed transformed text drawing on X11 setups that used
+      fontconfig without Xrender.
+    * [139611] Fixed smooth transformation of pixmaps for X11.
+    * [132837] Fixed text drawing on images with certain fonts on Mac OS X.
+    * [147911] Use font anti-aliasing when rotating small fonts on Windows.
+    * [127901] Optimized gradient calculations.
+    * [139705, 151562] Optimized clipping algorithms in the raster paint
+      engine.
+    * Optimized blending operations in the raster paint engine using MMX,
+      3DNOW and SSE2.
+    * Optimized fillRect() for opaque brushes.
+    * Made general speed optimizations, especially in the OpenGL and raster
+      paint engines.
+
+- QPainterPath
+    * [136924] Correctly convert Traditional Chinese fonts (e.g., MingLiu)
+      to painter paths.
+
+- QPicture
+    * [142703] QPicture now correctly preserves composition mode changes.
+    * Fixed QPicture text size handling on devices with non-default DPI.
+    * [133727] Fixed text alignment handling when drawing right-to-left
+      formatted text into a QPicture.
+    * [154088] Fixed bugs that could occur when reading QPicture files
+      generated with Qt 3.
+
+- QPixmap
+    * Added cacheKey() as a replacement for serialNumber().
+    * [97426] Added a way to invert masks created with createMaskFromColor().
+    * Fixed a crash that could occur when passing a 0 pointer to the
+      constructor that accepts XPM format image data.
+
+- QPixmapCache
+    * [144319] Reinserting a pixmap now moves it to the top of the Least
+      Recently Used list.
+
+- QPlastiqueStyle
+    * [133220] Fixed QProgressBar rendering bugs.
+
+- QPrintDialog
+    * [128964] Made "Print" the default button.
+    * [138924] Ensured that the file name is shown in the file dialog when
+      printing to a file
+    * [141486] Ensured that setPrintRange() correctly updates the print
+      dialog on X11.
+    * [154690] Ensured that "Print last page first" updates the QPrinter
+      instance on X11.
+    * [149991] Added support for more text encodings in the PPD subdialog.
+    * [158824] Disable the OK button in the dialog if no printers are
+      installed.
+    * [128990] X11: Don't immediately create an output file when a file name
+      is entered in the print dialog.
+    * [143804] Ensured that the default printer is set to the one specified
+      by the PRINTER environment variable.
+
+- QPrinter
+    * Added the supportedPaperSources() function.
+    * [153735] Significantly speeded up generation of PDF documents with Asian
+      characters.
+    * [140759] Documented that the orientation cannot be changed on an active
+      printer on Mac OS X (native format).
+    * [136242] PostScript generator: Don't generate huge PostScript files for
+      pattern brushes.
+    * [139566] Added support for alpha blending when printing on Windows.
+    * [151495] Fixed image scaling problems when printing on Windows.
+    * [146788] Optimized drawTiledPixmap() on Windows.
+    * [152637] PDF generator: Ensured that the pageRect property is set up
+      correctly.
+    * [152222] PDF generator: Fixed bug that lead to fonts being too small on
+      Mac OS X.
+    * [151126] Ensured that ScreenResolution is respected on Mac OS X.
+    * [151141] PDF generator: Make PDFs using the default font on Mac OS X
+      searchable.
+    * [129297, 140555] PS/PDF generator: Drastically reduced the sizes of
+      generated files and speeded up generation when using simple pens.
+    * [143803] Correctly set the default printer name on X11.
+    * [134204] PDF generator: Ensured that the correct output is generated
+      when drawing 1-bit images
+    * [152068] PS generator: Ensured that the correct PostScript is generated
+      when embedding TrueType fonts with broken POST tables.
+    * [143270] X11: Ensure that sigpipe is ignored when printing to an
+      invalid printer using the PDF generator.
+
+- QProcess
+    * [97517] Added suport for specifying the working directory of detached
+      processes as well as retrieving the PID of such processes.
+    * [138770] Greatly improved the performance of stdin and stdout handling
+      on Windows.
+    * [154135] Fixed crashes and lock-ups due to use of non-signal-safe
+      functions on Unix.
+    * [144728] Fixed race conditions on Windows that would occur when
+      calling bytesWritten() while using the waitFor...() functions.
+    * [152838] Ensured that finished() is no longer emitted if a process
+      could not start.
+
+- QProgressBar
+    * [146855] Ensured that setFormat() now calls update() if the format
+      changes.
+    * [152227] Improved support for wide ranges across the entire integer
+      range.
+    * The setRange() function is now a slot.
+    * [137020] Ensured setValue() forces a repaint for %v.
+
+- QProgressDialog
+    * The setRange() function is now a slot.
+    * [123199] Ensured that the Escape key closes dialog even when the
+      cancel text is empty.
+
+- QPushButton
+    * [114245] Fixed some styling issues for push buttons with popup menus.
+    * [158951] Buttons with icons now center their content to be more
+      consistent with buttons that do not have icons in most styles.
+    * [132211] Fixed setDefault() behavior.
+
+- QReadWriteLock
+    * [106089] Added the tryLockForRead(int) and tryLockForWrite(int)
+      functions which allow a thread to specify the maximum amount of time
+      to wait for the lock to become available.
+    * [131880] Added support for recursive write locking.
+
+- QRectF
+    * [143550] Added the QRectF(topRight,bottomLeft) constructor.
+
+- QRegion
+    * Added several optimizations for common operations on X11 and Qtopia
+      Core.
+
+- QResource
+    * Allow a QByteArray to be used for run time resource registration.
+
+- QScrollArea
+    * [140603] Fixed flickering when the scroll widget is right-aligned.
+
+- QSemaphore
+    * Add the tryAcquire(int n, int timeout) function which allows a thread
+      to specify the maximum amount of time to wait for the semaphore to
+      become available.
+
+- QSettings
+    * [153758] Fixed various bugs that could occur when writing to and
+      reading from the Windows registry.
+
+- QSizeGrip
+    * Added support for size grips in TopLeftCorner/TopRightCorner on Windows.
+    * Added support for size grips on subwindows.
+    * [150109] Fixed bug where the position could change during resize.
+    * [156114] Fixed incorrect size grip orientation on X11.
+
+- QSlider
+    * Prevent the widget from getting into infinite loops when extreme
+      values are used.
+
+- QSocketNotifier
+    * [148472] Mac OS X now prevents the file descriptor from being closed
+      when a socket notifier is deregistered.
+    * [140018] Mac OS X will now invalidate the backing native socket
+      notifier upon deregistration.
+    * Optimized performance by avoiding some debugging code in release
+      builds.
+
+- QSortFilterProxyModel
+    * [151352] Ensured that the dataChanged() signal is emitted when
+      sorting.
+    * [154075] Added support to handle the insertion of rows in the source
+      model.
+    * [140152] Added a property to force the proxy model to use QString's
+      locale-aware compare method.
+
+- QSpinBox
+    * [141569] Disallow typing -0 in a QSpinBox with a positive range.
+    * [158445] Add the keyboardTracking property. When set to false, don't
+      send valueChanged() with every key press.
+    * [143504] Made undo/redo work correctly.
+    * [131165] Fixed highlighting according to the native look on Mac OS X.
+
+- QSplashScreen
+    * [38269] Added support for rich text.
+
+- QSplitter
+    * [139262] Fixed bug that caused the splitter to snap back and forth in
+      certain situations.
+
+- QSql
+    * Added NumericalPrecisionPolicy to allow numbers to be retrieved as
+      double or float.
+
+- QSqlDriver
+    * [128671] Added SimpleLocking to DriverFeature.
+
+- QSqlQueryModel
+    * [155402] Fixed bug where the rowsAboutToBeRemoved() and rowsRemoved()
+      signals were emitted when setQuery() was called on an already empty
+      model.
+    * [149491] Fixed bug where blank rows were inserted into the model if
+      the database driver didn't support the QuerySize feature and the
+      result set contained more than 256 rows.
+
+- QSqlRelationalTableModel
+    * [142865] Fixed support for Interbase and Firebird by not using 'AS' in
+      generated SQL statements.
+
+- QSqlTableModel
+    * [128671] Ensured that the model has no read locks on a table before
+      updating it. Fixes parallel access for in-process databases like
+      SQLite.
+    * [140210] Fixed bug where setting a sort order for a column caused no
+      rows to be selected with PostgreSQL and Oracle databases due to
+      missing escape identifiers in the generated SQL statement.
+    * [118547] Don't issue asserts when inserting records before calling
+      select() on the model.
+    * [118547] Improved error reporting.
+
+- QSslCertificate
+- QSslCipher
+- QSslError
+- QSslKey
+- QSslSocket
+    * New classes. Added support for SSL to QtNetwork.
+
+- QStandardItemModel
+    * Reduced the construction time when rows and columns are given.
+    * [133449] Improve the speed of setData()
+    * [153238] Moving an item will no longer cause that item to lose its
+      flags.
+    * [143073] Calling setItemData() now triggers the emission of the
+      dataChanged() signal.
+
+- QStatusbar
+    * [131558] Increased text margin and fixed a look and feel issue on
+      Windows.
+
+- QString
+    * fromUtf8() now discards UTF-8 encoded byte order marks just like the
+      UTF-8 QTextCodec.
+    * [154454] Fixed several UTF-8 decoder compliance problems (also affects
+      the UTF-8 QTextCodec).
+    * Removed old compatibility hack in fromUtf8()/toUtf8() to allow round
+      trip conversions of invalid UTF-8 text.
+    * Added support for full Unicode case mappings to toUpper() and
+      toLower().
+    * Correctly implemented case folding with the foldCase() method. (Also
+      for QChar.)
+    * [54399] Added more overloads (taking up to 9 arguments) for arg().
+
+- QStringListModel
+    * Made it possible for items to be dropped below the other visible items
+      on a view with a QStringListModel.
+
+- QStyle
+    * Added the SP_DirHomeIcon standard pixmap to provide the native icon
+      for the home directory.
+    * Added documentation to indicate that pixel metrics are not necessarily
+      followed for all styles.
+    * standardPixmap() has been obsoleted. Use standardIcon() instead.
+    * Added SP_VistaShield to support Vista UAC prompts on Windows Vista.
+    * [103150] Added SH_FocusFrame_AboveWidget to allow the focus frame to
+      be stacked above the widget it has focus on.
+    * The default password character is now a Unicode circle, the asterisk
+      is still used for QMotifStyle and its subclasses.
+    * [127454] CE_ToolBoxTab now draws two parts, CE_ToolBoxTabShape and
+      CE_ToolBoxTabLabel. This should make QToolBox more styleable.
+    * [242107] Added a QStyleOptionToolBoxV2 with tab position and selected
+      position enums.
+
+- QStyleOption
+    * [86988] Added an initializeFromStyleOption() function for the many
+      widgets that need to create a QStyleOption subclass for style-related
+      calls.
+
+- QSyntaxHighligher
+    * [151831] Fixed bug where calling rehighlight() caused highlighBlock()
+      to be called twice for each block of text.
+
+- QSystemTrayIcon
+    * [131892] Added support to allow messages to be reported via AppleScript
+      on Mac OS X.
+    * [151666] Increased the maximum tool tip size to 128 characters on the
+      Windows platforms that support it.
+    * [135645] Fixed an issue preventing system tray messages from working
+      on some Windows platforms.
+    * Addded the geometry() function to allow the global position of the
+      tray icon to be obtained.
+	
+- QTabBar
+    * [126438] Added the tabAt(const QPoint &pos) function.
+    * [143760] Fixed a bug where scroll buttons were shown even when
+      disabled.
+    * [130089] Ensured that the tool tip help is shown on disabled tabs.
+    * [118712] Enabled auto-repeat on scroll buttons.
+    * [146903] Ensured that the currentChanged() signal is emitted when a
+      tab is removed
+    * Ensured that corner widgets are taken into account when calculating
+      tab position in the case where the tab bar is centered.
+    * [132091] Re-introduced the Qt 3 behavior for backwards scrolling of
+      tabs.
+    * [132074] Ensured that currentChanged() is always emitted when the
+      current tab is deleted.
+
+- QTableView
+    * No longer allow invalid spans to be created.
+    * [145446] Fixed bug where setting minimum height on horizontal header
+      caused the the table to be rendered incorrectly.
+    * [131388] Fixed case where information set using setRowHeight() was
+      lost on a subsequent call to insertRow().
+    * [141750] Fixed issue where spanned table items were painted twice per
+      paint event.
+    * [150683] Added property for enabling/disabling the corner button.
+    * [135727] Added the wordWrap property.
+    * [158096] resizeColumnToContents(int i) now has the same behavior that
+      resizeColumnsToContents() uses for individual columns.
+
+- QTableWidget
+    * [125285] Ensured that dataChanged() is only emitted once when
+      setItemData() is used to set data for more than one role.
+    * [151211] Added removeCellWidget() and removeItemWidget().
+    * [140186] Fixed bug where calling setAutoScroll(false) would have no
+      effect.
+
+- QTabWidget
+    * Tab widgets now take ownership of their corner widgets and allow
+      corner widgets to be unset.
+    * [142464] Fixed incorrect navigation behavior that previously made it
+      possible to navigate to disabled tabs.
+    * [124987] Ensured that a re-layout occurs when a corner widget is set.
+    * [111672] Added the clear() function.
+
+- QtAlgorithms
+   * [140027] Improved the performance of qStableSort() on large data sets.
+
+- QTcpSocket
+    * Added several fixes to improve connection reliability on Windows.
+    * Made a number of optimizations.
+    * Improved detection of ConnectionRefusedError on Windows and older
+      Unixes.
+    * Added support for proxy authentication.
+
+- QTemporaryFile
+    * [150770] Fixed large file support on Unix.
+
+- QTextBrowser
+    * [126914] Fixed drawing of the focus indicator when activating links.
+    * [82277] Added the openLinks property to prevent QTextBrowser from
+      automatically opening any links that are activated.
+
+- QTextCodec
+    * Improved the UTF-8 codec's handling of large, rare codepoints.
+    * [154932] The UTF-8 codec now keeps correct state for sequence
+      f0 90 80 80 f4 8f bf bd.
+    * [154454] Fixed several UTF-8 decoder compliance problems also
+      affecting QString::fromUtf8().
+    * Fixed the UTF-8 codec's handling of incomplete trailing UTF sequences
+      to be the same as QString::fromUtf8().
+
+- QTextCursor
+    * The definition of the block character format (obtained using the
+      blockCharFormat() and QTextBlock::charFormat() functions) has been
+      changed to be the format used only when inserting text into an empty
+      block.
+      If a QTextCursor is positioned at the beginning of a block and the
+      text block is not empty then the character format to the right of the
+      cursor (the first character in the block) is returned.
+      If the block is empty, the block character format is returned.
+      List markers are now also drawn with the character format of the first
+      character in a block instead of the invisible block character format.
+
+- QTextDecoder
+    * Added the hasFailure() function to indicate whether input was
+      correctly encoded.
+
+- QTextDocument
+    * [152692] Ensured that the print() function uses the document's default
+      font size.
+    * Added the defaultTextOption property.
+    * Setting a maximum block count implicitly now causes the undo/redo
+      history to be disabled.
+    * Made numerous fixes and speed-ups to the HTML import.
+    * [143296] Fixed HTML import bug where adding a <br> tag after a table
+      would cause two empty lines to be inserted instead of one.
+    * [144637, 144653] Ensured that the user state property of QTextBlock is
+      now preserved.
+    * [140147] Fixed layout bug where the document size would not be updated
+      properly.
+    * [151526] Fixed problem where the margins of an empty paragraph above a
+      table would be ignored.
+    * [136013] The "id" tag can now be used to specify anchors.
+    * [144129] Root frame properties are now properly exported/imported.
+
+- QTextDocumentFragment
+    * QTextDocumentFragment no longer stores the root frame properties,
+      the document title or the document default font when it is created
+      from a document or from HTML. Use QTextDocument's toHtml() and
+      setHtml() function if you want to propagate these properties to and
+      from HTML.
+
+- QTextEdit
+    * [152208] Ensured that the undo/redo enabled state is preserved across
+      setPlainText() and setHtml() calls.
+    * [125177] Added a print() convenience function that makes it possible
+      to support QPrinter::Selection as selection range.
+    * [126422] Fixed bug in copy/paste which could cause the background
+      color of pasted text to differ from that of the copied text.
+    * [147603] Fixed various cases where parts of a text document would be
+      inaccessible or hidden by the scroll bars.
+    * [148739] Fixed bug where setting the ensureCursorVisible property
+      would not result in a visible cursor.
+    * [152065] Fixed cases where currentCharFormatChanged() would not be
+      emitted.
+    * [154151] The undoAvailable() and redoAvailable() signals are no longer
+      emitted too many times when entering or pasting text.
+    * [137706] Made the semantics of the selectionChanged() signal more like
+      QLineEdit::selectionChanged().
+
+- QTextFormat
+    * [156343] Fixed crash that could occur when streaming QTextFormat
+      instances.
+
+- QTextLayout
+    * Fixed support for justified Arabic text.
+    * [152248] Fixed assert in sub/superscript handling of fonts specified
+      in pixel sizes.
+    * Optimized text layout handling for pure Latin text.
+    * Ensured that OpenType processing is skipped altogether if a font does
+      not contain OpenType tables.
+    * Fixed some issues in the shaper for Indic languages.
+    * Upgraded the line breaking algorithm to the newest version
+      (http://www.unicode.org/reports/tr14/tr14-19.html).
+    * [140165] Changed boundingRect() to report the actual position of the
+      top left line instead of incorrectly reporting (0, 0) for the top-left
+      corner in every case.
+    * Fixed various problems with text kerning.
+
+- QTextStream
+    * [141391] Fixed bug that could occur when reusing a text stream with
+      the setString() method.
+    * [133063] atEnd() now works properly with stdin.
+    * [152819] Added support for reading and writing NaN and Inf.
+    * [125496] Ensured that uppercasebase and uppercasedigits work as
+      expected.
+
+- QTextTable
+    * [138905] Fixed bug where merging cells in a QTextTable would cause
+      text to end up in the wrong cells.
+    * [139074] Fixed incorrect export of cell widths to HTML when exporting
+      tables containing column spans.
+    * [137236] Fixed bug where a text table would ignore page breaks.
+    * [96765] Improved handling of page breaks for table rows spanning
+      several pages.
+    * [144291] Fixed crash that could occur when using setFormat() with an
+      old format after inserting or removing columns.
+    * [143501] Added support for vertical alignment of table cells.
+    * [136397, 144320, 144322] Various border styles and border brushes are
+      now properly supported.
+    * [139052] Made sure that empty text table cells get a visible
+      selection.
+
+- QtGlobal
+    * Added Q_FUNC_INFO, a macro that expands to a string describing the
+      function it is used in.
+    * [132145] Fixed Q_FOREACH to protect against for-scoping compiler bugs.
+    * Fixed a race condition in the internal Q_GLOBAL_STATIC() macro.
+    * [123910] Fixed crashes on some systems when passing 0 as the
+      message to qDebug(), qWarning(), and qFatal().
+
+- QThread
+    * [140734] Fixed a bug that prevented exec() from being called more than
+      once per thread.
+    * Optimized the currentThread() function on Unix.
+    * Added the idealThreadCount() function, which returns the ideal number
+      of threads that can be run on the system.
+
+- QThreadStorage
+    * [131944] Refactored to allow an arbitrary number of instances to be
+      created (not just 256 as in previous versions).
+    * Updated documentation, as many caveats have been removed in Qt 4.2 and
+      Qt 4.3.
+
+- QTimeEdit
+    * [136043] Fixed the USER properties.
+
+- QTimeLine
+    * [145592] Fixed the time line state after finished() has been emitted.
+    * [125135] Added the resume() function to allow time lines to be resumed
+      as well as restarted.
+    * [153425] Fixed support for cases where loopCount >= 2.
+
+- QTimer
+    * Added the active property to determine if the timer is active.
+
+- QToolBar
+    * [128156, 138908] Added an animation for the case where a tool bar is
+      expanded to display all its actions when its extension button is
+      pressed.
+
+- QToolBox
+    * [107787] Fixed rendering bugs in reversed mode.
+
+- QToolButton
+    * [127814] Ensured that the popup delay respects style changes.
+    * [130358] Ensured that Hover events are sent to the associated QAction
+      when the cursor enters a button.
+    * [106760] Fixed bug where the button was drawn as pressed when using
+      MenuButtonPopup as its popup mode.
+
+- QToolTip
+    * [135988] Allow tool tips to be shown immediately below the cursor
+    * [148546] The usage of tool tip fading now adheres to the user settings
+      on Mac OS X.
+    * [145458] Tool tip fading now looks native on Mac OS X (fading out
+      rather than in).
+    * [145557] Fixed bug that caused tool tips to remain visible if the
+      cursor left the application quickly enough on Mac OS X.
+    * [143701] Fixed bug that caused tool tips to hide behind stay-on-top
+      windows on Mac OS X.
+    * [158794] Fixed bug on Mac OS X where isVisible() returned true even
+      if the tool tip was hidden.
+
+- QTreeView
+    * [158096] Added checks to prevent items from being dropped on their own
+      children.
+    * [113800] When dragging an item over an item that has child items,
+      QTreeView will now automatically expand after a set time.
+    * [107766] Added a style option (enabled in the Windows style) to
+      select the first child when the right arrow key is pressed.
+    * [157790] It was possible to get in a state where clicking on a branch
+      (+/- in some styles) to expand an item didn't do anything until
+      another location in the view was clicked.
+    * Made it possible to create a selection with a rectangle of negative
+      width or height.
+    * [153238] Ensured that drops on branches are interpreted as drops onto
+      the root node.
+    * [152868] Fixed setSelection() so that it works with negative
+      y-coordinates.
+    * [156522] Fixed repaint errors for selections in reversed mode.
+    * [155449] Prevented the tree from having huge columns when setting the
+      alignment before it is shown.
+    * [151686] Hidden rows are now filtered out of the user selection range.
+    * [146468] Fixed bug where the indexRowSizeHint could be incorrect in
+      the case where columns were moved.
+    * [138938] Fixed an infinite loop when calling expandAll() with no
+      column.
+    * [142074] Scroll bars are no longer shown when there are no items.
+    * [143127] Fixed bug that prevented the collapsed() signal from being
+      emitted when the animated property was set to true.
+    * [145199] Fixed crash that could occur when column 0 with expanded
+      items was removed and inserted.
+    * [151165] Added the indexRowHeight(const QModelIndex &index) function.
+    * [151156] Add support for hover appearance.
+    * [140377] Add the expandTo(int depth) function.
+    * Clicking in the empty area no longer selects all items.
+    * [135727] Added the wordWrap property.
+    * [121646] setSelection() now selects the item within the given
+      rectangle.
+    * Added the setRowSpanning(int row, const QModelIndex &parent) and
+      isRowSpanning(int row, const QModelIndex &parent) functions.
+
+- QTreeWidget
+    * [159078] Fixed drag and drop bug on Mac OS X that could occur when
+      dragging inside the widget.
+    * [159726] Fixed crash that could occur when dragging a QTreeWidgetItem
+      object with an empty last column.
+    * [154092] Fixed case where the drag pixmap could get the wrong position
+      when dragging many items quickly.
+    * [152970] Hidden items are no longer returned as selected from the
+      selectedItems() function.
+    * [151211] Added the removeCellWidget() and removeItemWidget()
+      functions.
+    * [151149] Made the header text left-aligned instead of center-aligned
+      by default.
+    * [131234] Made it possible to do lazy population by introducing the
+      QTreeWidgetItem::ChildIndicatorPolicy enum.
+    * [134194] Added the itemAbove() and itemBelow() functions.
+    * [128935] The disabled state of an item is now propagated to its
+      children.
+    * [103421] Added the QTreeWidgetItem::setExpandable() function.
+    * [134138] Added the QTreeWidgetItem::removeChild() function.
+    * [153361] Ensured that items exist before emitting itemChanged().
+    * [155700] Fixed a crash in QTreeWidget where deleted items could still
+      be referenced by a selection model.
+
+- QUdpSocket
+    * [142853] Now continues to emit readyRead() if the peer temporarily
+      disappears.
+    * [154913] Now detects datagrams even when the sender's port is invalid.
+
+- QUndoStack
+    * [142276] Added the undoLimit property which controls the maximum
+      number of commands on the stack.
+
+- QUrl
+    * [134604] Fixed the behavior of the obsolete dirPath() function on
+      Windows.
+
+- QValidator
+    * [34933] Added support for scientific notation.
+
+- QVariant
+    * [127225] Unloading a GUI plugin will no longer cause a crash in
+      QVariant in a pure QtCore application.
+
+- QWaitCondition
+    * [126007] Made the behavior of wakeOne() consistent between Windows and
+      Unix in the case where wakeOne() is called twice when exactly 2
+      threads are waiting (the correct behavior is to wake up both threads).
+
+- QWidget
+    * [139359] Added the locale property to make it easy to customize how
+      individual widgets display dates and numbers.
+    * [155100] Fixed a regression that could cause Qt::FramelessWindowHint
+      to be ignored for frameless windows.
+    * [137190] Ensured that windows with masks are now rendered correctly
+      with respect to window shadows on Mac OS X.
+    * [139182] Added the render() function to allow the widget to be
+      rendered onto another QPaintDevice.
+    * [131917] Fixed bug where minimum and maximum sizes were not respected
+      when using X11BypassWindowManagerHint.
+    * [117896] Fixed setGeometry() to be more consistent across Mac OS X,
+      Windows, X11 and Qtopia Core.
+    * [132827] Allow the focus to be given to a hidden widget; it will
+      receive the focus when shown.
+    * Reduced the overhead of repainting a widget with lots of children.
+    * Clarified the documentation for the Qt::WA_AlwaysShowToolTips widget
+      attribute.
+    * [154634] Ensured that the Qt::WA_AlwaysShowToolTips widget attribute
+      is respected for all widgets.
+    * [151858] Improved the approximation returned by visibleRegion().
+    * [129486] Ensured that calling setLayout() on a visible widget causes
+      its children to be shown, making its behavior consistent with the
+      QLayout::addWidget() behavior.
+
+- QWindowsStyle
+    * [110784] Scroll bar and spin box arrows now scale with the widget size.
+    * Given certain panel and button frames a more native appearance.
+    * [142599] Ensured that a QDockWidget subclass is not required when
+      using the style to draw a CE_DockWidgetTitle.
+
+- QWindowsXPStyle
+    * [150579] Fixed the use of the wrong background color for QSlider.
+    * [133517] Fixed styling of the unused area in header sections.
+    * [48387] Fixed styling of MDI/Workspace controls.
+    * [109317] Fixed a rendering issue with tab widgets in the Silver color
+      scheme.
+    * [114120] Ensured that the frame property for combo boxes is respected.
+    * [138444] Fixed crash that could occur when passing 0 as the widget
+      argument to drawComplexControl().
+
+- QWizard
+- QWizardPage
+    * New classes. Based on QtWizard and QtWizardPage in Qt 4 Solutions.
+      Redesign of QWizard from Qt 3.
+
+- QXmlParseException
+    * [137998] Fixed incorrect behavior where systemId/publicId was never
+      reported.
+
+- QXmlSimpleReader
+    * QXmlSimpleReader no longer reads entire files into memory, allowing
+      it to handle large XML files.
+
+- Q3DateEdit
+    * [131577] Fix a bug that could occur when entering out-of-range years
+      in a Q3DateEdit.
+
+- Q3DockWindow
+    * [125117] Fixed some style issues with Windows XP and Plastique styles.
+
+- Q3GroupBox
+    * Added FrameShape, FrameShadow, lineWidth, and midLineWidth properties.
+
+- Q3ListView
+    * [150781] Fixed a crash in setOpen() (previously fixed in Qt 3).
+
+- Q3ScrollView
+    * [125149] Mouse events should not be delivered if the Q3ScrollView is
+      disabled.
+      This fixed the case where items were still selectable when Q3ListView
+      was disabled using the setEnabled() function.
+
+- Q3SqlCursor
+    * [117996] Improved support for tables and views that have fields with
+      whitespace in their names.
+
+- Q3TextEdit
+    * [136214] Fixed invalid memory reads when using undo/redo
+      functionality.
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+- Interbase driver
+
+    * [127724] Added support for OUT values from stored procedures. (See the
+      SQL Database Drivers documentation for details.)
+    * [159123] Fixed crash that could occur when fetching data from
+      Interbase 2007 databases.
+    * [143474] Added support for SQL security-based roles.
+    * [134608] Fixed bug where queries in some cases returned empty VARCHAR
+      fields if they contained non-ASCII characters.
+    * [143471] Fixed bug that caused fetching of multisegment BLOB fields to
+      fail in some cases.
+    * [125053] Fixed bugs where NUMERIC fields were corrupted or returned as
+      the wrong type in some cases.
+
+- MySQL driver
+    * [156342] Fixed bug where BINARY and VARBINARY fields were returned as
+      QString instead of QByteArray.
+    * [144331] Fixed bug where a query would become unusable after executing
+      a stored procedure that returns multiple result sets.
+
+- OCI driver
+
+    * Added support for low-precision retrieval of floating point numbers.
+    * [124834] Fixed bug where the binding strings failed on certain
+      configurations.
+    * [154518] Fixed bug where connections were not properly terminated,
+      which lead to resource leaks and connection failures.
+
+- ODBC driver
+
+    * Increased performance for iterating a query backwards.
+    * [89844] Added support for fetching multiple error messages from an
+      ODBC driver.
+    * [114440] Fixed bug where binding strings longer that 127 characters
+      failed with Microsoft Access databases.
+    * [139891] Fixed bug where unsigned ints were returned as ints.
+
+- SQLite driver
+    * [130799] Improved support for attatched databases when used with
+      QSqlTableModel.
+    * [142374] Improved error reporting in cases where fetching a row fails.
+    * [144572] Fixed the implementation of escapeIdentifier() to improve
+      support for identifiers containing whitespace and reserved words when
+      used with the model classes.
+
+- PostgreSQL driver
+
+    * [135403] Properly quote schemas in table names ("schema"."tablename").
+    * [138424] Fixed resource leak that occurred after failed connection
+      attempts.
+
+- DB2 driver
+
+    * [110259] Fixed bug where random characters were prepended to BLOB
+      fields when fetched.
+    * [91441] Fixed bug where binding strings resulted in only parts of the
+      strings being stored.
+
+****************************************************************************
+*                             QTestLib                                     *
+****************************************************************************
+
+  * [138388] Floating point numbers are now printed in printf's "%g" format.
+  * [145643] QEXPECT_FAIL does not copy or take ownership of "comment"
+    pointer.
+  * [156346] Gracefully handle calls to qFatal().
+  * [154013] Don't count skips as passes.
+  * [145208] Display QByteArrays in convenient ways.
+  * Output well-formed XML.
+
+****************************************************************************
+*                               QDBus                                      *
+****************************************************************************
+
+- Library
+
+    * Added support for QList<QDBusObjectPath> and QList<QDBusSignature>
+      to allow them to be used without first having to register the types.
+
+    * Added support for using QtDBus from multiple threads.
+
+    * Made it possible to marshal custom types into QDBusArgument.
+
+    * qdbuscpp2xml:
+        * [153102] Ensure that Q_NOREPLY is ignored.
+        * [144663] Fixed problems with executing qdbuscpp2xml on Windows.
+        * Don't require moc to be on a path listed in the PATH environment
+          variable.
+
+    * QDBusInterface:
+	* Changed asserts in the QDBusInterface constructor to QDBusErrors.
+    * QDBusConnection:
+	* Added a separate slot for delivering errors when calling
+          callWithCallback().
+
+
+- Viewer
+
+    * Moved QDBusViewer from demos to QDBus tools.
+    * Added ability to get and set properties.
+    * Added support for demarshalling D-Bus variants.
+    * Added a property dialog for entering arguments.
+    * Made QDBusObjectPath clickable in the output pane.
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+X11
+---
+    * [153346] Ensured that tablet events are not delivered while a drag and
+      drop operation is in progress.
+    * [141756] Ensured that the Plastique or Cleanlooks styles are not used
+      as default styles when Xrender is not available.
+    * [139455] Fixed QX11EmbedContainer race causing sudden unembedding of
+      clients.
+    * [96507] Added support for using _POSIX_MONOTONIC_CLOCK as the
+      timer source (also affects Qtopia Core).
+    * [128118] Fixed garbage output when calling QPixmap::grabWindow()
+      on a window on a non-default screen.
+    * [133119] Ensured that X11 color names are detected in the
+      RESOURCE_MANAGER property.
+    * [56319] Added support for _NET_WM_MOVERESIZE to QSizeGrip, which
+      cooperates with the window manager to do the resizing.
+    * Fixed QWidget::isMaximized() to return false when the window is
+      only maximized in a single direction.
+    * [67263] Fixed a bug that could cause applications to freeze while
+      querying the clipboard for data.
+    * [89224] Fixed the behavior of minimized Qt applications to show the
+      correct icon (instead of the standard OpenWindows icon) on Solaris.
+    * [116080] Ensured that the TIMESTAMP clipboard property is set using
+      XA_INTEGER (as defined in the ICCCM).
+    * [127556] Refactored timer accounting code to be more efficient and
+      less cumbersome to maintain.
+    * [132241] Add support for DirectColor visuals. Qt will now create and
+      initialize a colormap when using such visuals.
+    * [140737] Fixed QEventDispatcherGlib::versionSupported() to be much
+      simpler.
+    * Fixed a bug where QWidget::windowFlags() would not include
+      Qt::X11BypassWindowManagerHint for Qt::ToolTip and Qt::Popup windows.
+    * [146472] Fixed a bug where QWidget::setWindowFlags() would disable
+      drag and drop operations from outside Qt applications.
+    * [150352] Fixed painting errors after show(), hide(), then show()
+      under GNOME.
+    * [150348] Fixed a bug that would incorrectly set the Qt::WA_SetCursor
+      attribute on top-level windows.
+    * [135054] Fixed system palette detection code to use contrast that is
+      more similar to the desktop settings.
+    * [124689] Documented potential QDrag::setHotSpot() inefficiency on X11.
+    * [121547] Fixed QWidget::underMouse() to ensure that the value it
+      returns is correctly updated after the mouse button is released.
+    * [151742] Improved robustness when executing in an X11-SECURITY
+      reduced ssh-forwarded session.
+    * [142009] Fixed a bug that caused an application using the Qt Motif
+      Extension to freeze when trying to copy text into a QTextEdit.
+    * [124723] Fixed PseudoColor detection to correctly handle cases where
+      the colormap is not sequential.
+    * [140484] Don't use the GLib event dispatcher if GLib version is too
+      old.
+    * Fixed a bug where a window would get an incorrect size after the
+      second call to show().
+    * [153379] Fixed shortcuts where the modifier also includes Mode_switch
+      in the modifier mask; for example, Alt+F on HP-UX.
+    * [154369] Fixed drag and drop to work properly after re-creating a
+      window ID.
+    * [151778] Fixed mouse enter/leave event platform inconsistencies.
+    * [153155] Added the QT_NO_THREADED_GLIB environment variable, which
+      tells Qt to use Glib only for the GUI thread.
+    * Fixed restoreGeometry() to ensure that full-screen windows are moved
+      to the correct position.
+    * [155083] Don't use legacy xlfd fonts if we have fontconfig available
+      on Solaris.
+    * [150348] Fixed bug where setCursor() would not work properly after a
+      setParent() call.
+    * Made Plastique the default style on X11.
+
+Windows
+-------
+    * Added an experimental DirectX-based paint engine.
+    * [141503] Ensured that clicks inside tool windows won't cause them to
+      be activated if there is no child widget to take focus.
+    * [153315] Improved handling of Synaptic touchpad wheel messages.
+    * [150639] Added support for CF_DIBV5 format and improved support for
+      transparent images on the clipboard.
+    * [146862] Improved readability of progress bar text when shown in
+      the Highlight palette color.
+    * [146928] Fixed issue where shortcut events were discarded when auto-
+      repeat was disabled.
+    * [141079] Ensured that wheel events contain button information.
+    * [149367] Ensured that QMimeData::formats() returns all the available
+      formats in the object.
+    * [135417] Ensured that WM_SYSCOLORCHANGE does not trigger resetting of
+      fonts.
+    * [137023] Fixed a crash that could occur while translating mouse
+      events.
+    * [138349] Fixed incorrect focus handling with multiple top-level
+      widgets.
+    * [111211] Ensured that tool windows don't steal focus from their
+      parents while opening.
+    * [143812] Fixed a bug which can break the widget's ability to maximize
+      after saving and restoring its state.
+    * [111501] Ensured that SPI_SETWORKAREA messages trigger calls to
+      QDesktopWidget::workAreaResized().
+    * [141633] Fixed command line parsing for GUI applications.
+    * [134984] Ensured that SockAct events are not triggered from
+      processEvents(ExcludeSocketNotifiers).
+    * [134164] Ensured that top-level widgets configured with
+      MSWindowsFixedSizeDialogHint are centered properly.
+    * [145270] Fixed mapFromGlobal() and mapToGlobal() for minimized or
+      invisible widgets.
+    * [132695] Fixed a potential crash that could occur when changing the
+      application style after the system theme had been changed.
+    * [103739] Workspace title bars now respect custom title bar heights in
+      the Windows XP style.
+    * [48770] Improved size grip behavior in top-level widgets.
+    * [113739] Fixed an issue that could occur when using QWidget::scroll()
+      with on-screen painting.
+    * [129589] Added support for moving the mouse cursor to the default
+      button in dialogs.
+    * [139120] Added support for resolving native file icons through
+      QFileIconProvider.
+    * [129927] Added the QWindowsVista style to support native look and feel
+      on Windows Vista.
+    * [106437] Removed the Windows XP style from the list of keys supplied
+      by QStyleFactory::keys() on platforms where it is not available.
+    * [109814] Improved UNC path support.
+    * [157261] Fixed crash that could occur when using Alt keycodes with
+      text handling widgets.
+    * [116307] Ensured that QEvent::WindowActivate is sent for tool windows.
+    * [150346] Fixed a bug that would cause an application to exit when its
+      last window (a modal dialog) was closed and a new window shown
+      immediately afterwards.
+    * [90144] Fixed a bug that caused QApplication::keyboardModifiers() to
+      return modifiers even after they had been released.
+    * [142767] Fixed a bug that allowed a QPushButton to become pressed even
+      though its mousePressEvent() handler function was never called.
+    * [151199] Usage of blocking QProcess API in a thread no longer hangs
+      the desktop.
+    * [144430] Made the shortcut system distinguish between Key_Return and
+      Key_Enter.
+    * [144663] Made sure qdbuscpp2xml can parse moc output on Windows.
+    * [126332] Made QDBus compile on Windows platforms.
+    * [133823, 160131] Fixed bug in the QWidget::scroll() overload that
+      accepts a rectangle argument.
+
+- ActiveQt
+    * Ensured that, when loading a typelib file to obtain information about
+      a control, the typelib is processed correctly.
+    * [158990] Ambient property change events are now emitted regardless of
+      the container's state.
+    * [150327] ActiveQt based controls will now return the correct Extents
+      depending on the size restrictions set on the widget.
+    * [141296] Ensured that the ActiveQt DLL is unloaded from the same
+      thread which loaded it.
+
+- Qt Style Sheets
+    * Added support for background clipping using the border-radius
+      property.
+    * Almost all widgets are now styleable using style sheets.
+    * Added support for the -stylesheet command line option to QApplication.
+    * Added support for styling through SVG.
+    * Added support to allow colors and brushes to be specified as
+      gradients.
+
+Mac OS X
+--------
+
+    * qtconfig is no longer available on Mac OS X. All settings are read
+      from the system's configuration.
+    * [156965] Always offers a 'TEXT' type flavor for non-Pasteboard-aware
+      Mac Application pastes.
+    * [158087] Fixed various mouse event propagation bugs.
+    * Introduced Q_WS_MAC32/Q_WS_MAC64 for 64 vs. 32-bit detection compile
+      time infrastructure.
+    * [156431] Introduced WA_MacAlwaysShowToolWindow to allow windows to
+      behave as utility windows as opposed to floating windows.
+    * [155651] Qt will now follow the HIView focus chain to allow wrapped
+      HIViewRef's to take focus when appropriate.
+    * [149753] Qt will not deliver mouse release events to widgets that do
+      not process mouse press events (including widgets with the
+      WA_MacNoClickThrough attribute set).
+    * Introduced support for 64-bit Mac OS X builds. Only available on
+      Mac OS X 10.5 (Leopard).
+    * [145166] Ensured that CoreGraphics high quality interpolation is used
+      when using SmoothPixmapTransform.
+    * [134873] Ensured that the widget hierarchy is used to find a widget
+      with a cursor rather than using the frontmost widget.
+    * [132178] Enforced the requirement for double click detection that the
+      second click must be near the previous click to prevent false double
+      clicks being reported.
+    * [131327] Fixed mouse propagation for top-level widgets with the
+      WA_MacNoClickThrough attribute set.
+    * Now entirely QuickDraw clean.
+    * [155540] Ensured that asymmetic scales work with cosmetic pens.
+    * [141300] Fixed an issue that prevented QFontDatabase/QFontDialog from
+      showing all fonts installed on the system.
+    * Fixed writing system detection in QFontDatabase.
+    * [148876] Fixed bug that caused characters to be committed twice in the
+      Chinese Input method.
+    * Removed the use of an extra setFocus() in the event loop when a window
+      is activated.
+    * [152224] Fixed bug in QWidget's window state.
+    * [156431] Added the WA_MacAlwaysShowToolWindow widget attribute to
+      allow Mac users to create utility-window-style applications.
+    * [144110] Fixed resizing of sheets on Panther.
+    * [140014] Made it possible to drag QUrls on Panther.
+    * [155312] Fixed bug that could occur when dragging several URLs to
+      Finder and certain other applications.
+    * [155244] Fixed bug that could occur when dragging a URL to Finder.
+    * [153413] Fixed bug that could occur when dragging URLs between Qt applications.
+    * [152450] Fixed bug that could occur when dragging URLs to applications
+      such as the trash can.
+    * [151158] Fixed an issue that prevented widgets from receiving drag
+      events if a move event was ignored.
+    * [145876] Ensured that a drag move event is always received directly
+      after a drag enter event (according to the documentation).
+    * [156365] Fixed event bug when dragging URLs to receivers that only
+      refer to a drop location.
+    * [119251] Tool tips and dialogs no longer cause full-screen windows to
+      show their menu bar and the dock.
+    * [147640] Fixed QScrollArea scrolling behavior when showing regions
+      with dimensions between 2^15 and 2^16 pixels.
+    * [158988] Ensured that a mouse enter event is now sent before a mouse
+      press event upon window activation.
+    * [157313] Fixed hanging bug that could occur if the system clock was
+      adjusted backwards while using sockets.
+    * [151411] Fixed window switching bug (Cmd + ~) that could occur when
+      showing a modal dialog with a popup.
+    * Ensured that changing a shortcut containing a cursor movement key now
+      works correctly.
+    * [143912] Fixed focus problem caused by mouse hovering over widgets
+      with modal sheets.
+    * [141456] Fixed activation bug exhibited by minimized windows upon
+      being shown.
+    * [155394] Fixed issue where a widget's move and resize state were not
+      set correctly upon widget initialization.
+    * [254325] Fixed sheet transparency bug.
+    * [152481] Fixed crash that could occur when clicking in a window when a
+      modal print dialog is showing.
+    * [143835] Removed unnecessary window updates for active windows.
+    * [145552] A mouse up event is now sent when a window drag has finished
+      after a mouse press.
+    * [146443] Ensure that, if a window is moved before it is shown for the
+      first time, it is placed correctly when it is shown.
+    * [141387] Fixed bug that caused two near-simultaneous mouse presses on
+      different widgets to be interpreted as a single click.
+    * [139087] Fixed activation for some types of shortcuts, such as
+      QKeySequence(Qt::CTRL | Qt::Key_Plus).
+    * Only use Roman for determining with System Fonts since Mac OS X will
+      perform the necessary translation.
+    * When using OpenGL, ensured that the 32-bit accumulation buffer is used
+      in preference to the 64-bit accumulation buffer by default.
+    * [123467] Fixed bug where the event loop would spin and not emit
+      aboutToBlock() when popup menus were shown.
+    * [137677] QString::localAwareCompare() now respects the sorting order
+      set in the system preferences.
+    * [139658] Mac OS X accessibility no longer requires that
+      QApplication::exec() is called.
+    * [118814, 126253, 105525] Fixed several QCombobox look and feel issues.
+    * [145075] Fixed aliased line drawing bug.
+    * [122826] Fixed QScrollBar painting error.
+    * [131794] PixelTool and QWidget::grabWindow() now work on non-primary
+      monitors.
+    * [160228] The Quartz 2D-based paint engine now respects the font style
+      strategy.
+    * Made miscellaneous changes to make wrapping non-Qt HIViews easier.
+    * Qt is now built with MACOSX_DEPLOYMENT_TARGET set to 10.3 (since Qt
+      can only be run on Mac OS X 10.3 and above).
+    * QSound now uses NSSound for its implementation instead of the
+      deprecated C QuickTime API. This means that the QtGui library is no
+      longer dependant on the QuickTime framework.
+    * Added a -dwarf-2 configure option to allow people to turn on DWARF2
+      debugging symbols when that is not the default.
+      The ability to use DWARF2 debugging symbols was added in later version
+      of the Xcode 2.x series.
+    * Fixed many assertions when running against Carbon_debug.
+    * Renamed the Qt::WA_MacMetalStyle attribute to WA_MacBrushedMetal.
+    * Changing the Qt::WA_MacBrushedMetal attribute will now cause a
+      StyleChange event to be sent.
+    * The Qt translations and Qt Linguist phrase books have been added to
+      the binary package.
+    * [134630] Fixed loading of plugins in the case where universal plugins
+      are used but the wrong architecture is accidentally read first,
+      instead of returning an architecture mismatch.
+    * QCursor now uses NSCursor internally instead of the deprecated
+      QuickDraw functions.
+    * Corrected the encoding and decoding functions for QFile to handle
+      different Unicode normalization forms.
+
+Qtopia Core
+-----------
+
+ - New font system
+    * A new font subsystem has been implemented that, by default, allows
+      glyphs rendered at run time to be shared between applications. A new
+      pre-rendered font format (QPF2) has also been implemented together
+      with a new "makeqpf" tool to generate them.
+    * Support for custom font engine plugins has been added through
+      QAbstractFontEngine and QFontEnginePlugin.
+    * The default font family has been changed to DejaVu Sans.
+
+- OpenGL ES
+    * [126421, 126424] Added QGLWindowSurface and QGLScreen framework for
+      OpenGLES (and others) on Qtopia Core. A sample implementation can be
+      found in the examples/qtopiacore directory.
+
+ - Accelerated graphics API
+    * [150564] API changes in QWSWindowSurface. New functions include
+      QWSWindowSurface::move() to enable accelerated movement of top-level
+      windows.
+    * [152755] API clarification: The windowIndex parameter to
+      exposeRegion() now always refers to the window that is being changed.
+    * [150569, 139550] Made API additions to QWSWindow to give QScreen
+      information about the window state, window flags, and window dirty
+      region
+    * [150746] Added QScreen::pixelFormat() and QScreen::setPixelFormat() to
+      enable drawing optimizations for some formats.
+
+ - General fixes
+    * Improved support for compiling a LSB (Linux Standard Base) compliant
+      Qtopia Core library.
+    * [133365] Added the QWSServer::setScreenSaverBlockLevel() function to
+      make it possible to block the key/mouse event that stops the screen
+      saver at a particular level.
+    * Fixed QFontDatabase::addApplicationFont() for Qtopia Core.
+    * [131714] Fixed performance problems with drag and drop operations.
+    * [96507] Added support for using _POSIX_MONOTONIC_CLOCK as the timer
+      source (also effects Qt/X11).
+    * [132346] Fixed a performance bug causing unnecessary screen copies
+      when using a hardware cursor.
+    * [121496] Made lots of performance improvements in the VNC driver.
+    * [138615] Fixed color conversion for cases where the VNC server is
+      running on a big-endian machine.
+    * [131321] Optimized text drawing.
+    * [136282] Fixed a bug preventing QWidget::setCursor() and
+      QWidget::unsetCursor() from taking effect immediately.
+    * [139318] Fixed a performance bug that would cause non-visible regions
+      to receive paint events.
+    * [139858] Implemented acceleration for the 'pc' mouse handler.
+    * [140705, 140760] Improved release of used resources (e.g, shared
+      memory and hardware resources) when the application exits
+      unexpectedly.
+    * [144245] Fixed a problem with some cross-compilers triggered by using
+      math.h functions taking a double argument when using float data.
+    * Optimized QSocketNotifier activation.
+    * [156511] Implemented QDirectPainter::ReservedSynchronous which makes
+      a QDirectPainter object behave as a QDirectPainter region allocated
+      using the static functions.
+    * [94856] Fixed console switching when using the Tty keyboard driver.
+    * [157705] Ensured that device parameters are passed to keyboard and
+      mouse plugins.
+    * [156704] Fixed QPixmap::grabWindow() for 18 and 24-bit screens.
+    * [154689] Fixed the -no-gfx-multiscreen configure script option.
+    * [160404] Fixed 4-bit grayscale support in QVFb and QScreen.
+    * Optimized QCop communication.
+    * Fixed bug in QWidget::setMask() for visible widgets.
+    * [152738] Allow transparent windows to be shown on top of unbuffered
+      windows.
+    * [154244] Fixed bug where a client process would not terminate when
+      server closed.
+    * [152234] No longer send key events for one client to other client
+      processes for security and performance reasons.
+    * [148996] Added checks in the server to avoid buffer overruns if
+      clients send malformed commands
+    * [154203] Fixed mouse calibration bug with mirrored/180-degree-rotated
+      touch screens.
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+- MinGW
+    * [119777] Removed the dependency on mingwm.dll when compiled with the
+      -no-exceptions option.
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+- Build System
+    * Auto-detect Xoreax IncrediBuild with XGE technology, and enable
+      distribution of moc and uic.
+    * Shadow builds are now supported by nmake/mingw-make of the Qt build
+      system.
+    * [151184] Separated the -make options for demos and examples
+    * [150610] Fixed the build system to take into account that fvisibility
+      requires gcc on Unix builds.
+    * [77152] Ensured that, at "make install" time, all meta-information
+      files will be cleaned up to remove reference to source code path.
+    * [139399] Ensured that the environment CC/CXX on Unix are taken into
+      account when running the build tests.
+    * [145344] Ensured that "make confclean" will remove all files
+      generated by configure.
+    * [145659] Added ability to disable SSE.
+    * Added DWARF2 detection and support into the build system to reduce
+      the debug library size.
+    * Added macx-g++-64 meta-spec for Qt configuration purposes.
+    * [127840] The pkgconfig files (.pc) are now placed into lib/pkgconfig.
+    * [135547] Allow Windows line endings on UNIX and vice versa in
+      .qt-license files.
+    * [133068] GIF support is now enabled by default.
+    * [137728] Fixed failed build on Mac OS X and Solaris when using the
+      -separate-debug-info command line option for the configure script.
+    * [137819] Added support for precompiled headers with the Intel C++
+      Compiler for Linux.
+    * Re-used qplatformdefs.h from linux-g++ in the linux-icc mkspec.
+    * [121633] Added linux-icc-64 mkspec which is needed for building on
+      some 64-bit hosts.
+    * Removed cd_change_global from win32-msvc's qmake.conf file.
+    * [116532] Keep intermediate manifest file in object directory instead
+      of the destination directory.
+    * Added a configuration type to qconfig.pri on Windows.
+    * Corrected paths in Makefile generation when configuring with the
+      -fast command line option.
+    * Added tests to auto-detect a suitable TIFF library.
+    * [152252] Fixed auto-detection of MSVC.NET 2005 Express Edition in
+      configure.exe.
+    * [151267] Ensured that the manifest tool does not get forward slashes
+      when writing paths to manifest files.
+    * [153711] Ensured that the directory separators used in .qmake.cache
+      are correct for normal MinGW and Cygwin MinGW.
+    * [154192] Fixed a problem with configure.exe executing non-existing
+      scripts.
+    * [128667] Added a confclean build target on Windows for the top-level
+      project file.
+
+
+- Assistant
+    * [99923] Added a context menu for the tabs in the tab bar. Right click
+      on a tab to get a list of common options.
+    * Assistant now uses the "unified toolbar" look on Mac OS X.
+
+- Designer
+    * [151376] Added a context menu to the tab order editor.
+    * [39163] Added a tab order editor shortcut - using Ctrl with the left
+      mouse button makes it possible to start ordering from the selected
+      widget.
+    * [159129] Fixed a crash in the tab order editor.
+    * Improved snapping behavior for multi-selections and negative
+      positions.
+    * [126671] Made it possible to move widgets by using the cursor keys
+      without modifiers. The Shift modifier enables resizing, the Control
+      modifier enables snapping behavior.
+    * [111093] Added a file tool bar.
+    * [156225] Fixed the delete widget command for cases where the deleted
+      widget is a child of a QSplitter widget.
+    * [101420] Improved the WYSIWYG properties of forms with respect to the
+      background colors used.
+    * [112034] Enabled Ctrl + drag as a shortcut for copying actions in
+      menus and tool bars.
+    * [128334] Double clicking on a widget now invokes the default action
+      from its task menu.
+    * [129473] Fixed bug in the handling of default tab orders.
+    * [131994] Made it possible to set the tab order for checkable group
+      boxes.
+    * Added new cursor shapes.
+    * [137879] Improved the editor for key sequence properties.
+    * [150634] Improved refreshing behavior of all properties after property
+      changes.
+    * [147655] Fixed shadow build issues.
+    * [151567, 149966] Ensured that object names are unique.
+    * [80270] Fixed bug with saving icons taken from resources which are
+      specified with aliases.
+    * [152417] Fixed loading/saving of header labels of Q3Table widgets.
+    * Added the QColumnView widget to the widget box.
+    * Added support for new margin (left, top, right and bottom) and spacing
+      (horizontal and vertical) properties of the layout classes.
+    * [146337] Ensure that the margin and spacing properties are not saved
+      if they have the default values.
+    * Fixed layout handling in Q3GroupBox
+    * [124680] Ensured that the correct pages are displayed when selecting a
+      QStackedWidget page in the object inspector.
+    * [88264] Ensured that breaking a nested layout doesn't break the parent
+      container's layout.
+    * [129477] Added support for dynamic properties via the context menu in
+      the property editor.
+    * [101166] Added an "Add separator" action to the standard context menu.
+    * [132238] Added a "Recent files" button to the New Form dialog.
+    * [107934] Updated the font anti-aliasing property from a boolean
+      property to a property with 3 values.
+    * [155464] Added a German translation.
+    * [146953] Enabled support to allow widgets to be dragged onto the
+      object inspector.
+    * [152475] Ensured that the widget box saves and restores its state.
+    * [111092] Added support to allow images to be dragged from the resource
+      editor and dropped onto the action editor or icon properties in the
+      property editor.
+    * [111091] By default, icon dialogs now open to show the resource
+      browser.
+    * [152475] Added a button to load newly found custom widget plugins to
+      the plugin dialog.
+    * [151122] Added warnings for custom widget plugin issues such as load
+      failures and class name mismatches.
+    * [138645] Improved the form preview on Mac OS X, provided a close
+      button and a menu entry.
+    * [103801] Made buddy editing possible for custom widgets derived from
+      QLabel.
+    * [148677] Added a font chooser for tool windows.
+    * [107233] Made the grid customizable, provided default and per-form
+      grid settings.
+    * [149325] Provided a form editor context menu in the object inspector.
+    * [147174] Changed the elide mode and improved column resizing behavior
+      of property editor and object inspector.
+    * [147317] Improved handling for switching user interface modes,
+      preventing the geometries of form window from being changed.
+      Made 'Bring to front' deiconify windows.
+    * [146629] Fixed never ending loop on Linux triggered by scrolling
+      quickly through the pages of a QStackedWidget.
+    * [145806] Enabled KDialog to be used as a template.
+    * [142723] Enabled the pages of QStackedWidget, QTabWidget and QToolBox
+      to be promoted.
+    * [105916] Enabled QMenuBar to be promoted.
+    * [147317] Improved the New Form dialog.
+    * [95038] Fixed handling of layout defaults.
+    * [103326] Made it possible to make connections to form signals.
+    * [145954] Added a new dialog for promoted widgets with the ability to
+      specify global include files.
+      Added promotion candidates to the form's context menu.
+    * [127232] Ensured that global include files returned by
+      QDesignerCustomWidgetInterface::includeFile() are handled correctly.
+    * [139985] Improved handling of layouts for custom widgets.
+    * [99129] Made custom implementations of QDesignerMemberSheetExtension
+      work correctly.
+    * [87181] Added support for setting properties on items in a multi-
+      selection.
+      Added support for sub-properties. For example, changing the font size
+      of a multi-selection does not overwrite other font settings.
+      Added undo-support for property comments.
+    * [135360] Added tooltips to the property editor, action editor and
+      object inspector.
+    * [103215] Added handling of escaped newline characters for text
+      properties.
+      Added support for validators and syntax highlighting for style sheets.
+    * [135468] Added support for tool bar breaks.
+    * [135620] Fixed several issues concerning handling of properties of
+      promoted widgets.
+    * [109077] Provided multi-selection support in the object inspector.
+    * [133907] Made in-place editing of plain label texts possible.
+    * [134657] Fixed table widget editor.
+    * [90085] Made the resource editor consume a little less horizontal
+      screen real estate.
+    * [105671] Added support to allow main windows to be maximized while
+      being previewed.
+    * Added a style sheet editor.
+
+- Linguist
+    * Translations can be exported to and imported from XLIFF files.
+    * [136633] Fixed "Find" so that it searches in comments.
+    * [129163] Fixed bug that prevented "Next Unfinished" from working if
+      there was no selected item.
+    * [125131] Made the translation loading behavior consistent with
+      Assistant and Designer.
+    * [125130] Added the -resourceDir command line argument for consistency
+      with Assistant and Designer, to allow the path of translation files
+      to be specified.
+    * [124932] XML files (.ts and .xlf) are now written with platform-
+      specific line endings.
+    * [128081] Ensure that the tree view does not lose focus when the up
+      and down cursor keys are used for navigation.
+      Use Shift+Ctrl+K and Shift+Ctrl+L instead if you really want this
+      behavior.
+    * [139079] Added a DTD to document the TS file format.
+
+- lupdate
+    * Made some small improvements in lupdate's .pro file parser.
+      Fixed bug in inclusion of relative .pri files.
+    * [140581] Improved namespace/context parsing.
+    * [142373] Fixed bug when running lupdate on a SUBDIRS .pro file that
+      prevented TS files from being created.
+    * [135991] Ensure that .pro file comments are handled correctly when
+      they occur within a list of several variable assignments.
+    * [154553] Fixed bug with CODECFORTR that caused saving of incorrect
+      characters.
+
+- rcc
+    * [158522] By default compression is now set to the zlib default
+      (normally level 6).
+    * [133837] Allow absolute paths in .qrc files (accessible through the
+      original filesystem path).
+    * [146958] No longer returns error when a .qrc is empty. A (mostly)
+      empty file is generated instead.
+
+- moc
+    * [149054] Fixed parsing of old-style C enums.
+    * [145205] Ensured that a warning is given when a known interface
+      (marked with Q_DECLARE_INTERFACE) is subclassed that is not mentioned
+      in Q_INTERFACES.
+    * [97300] Allow @file to be given as the options input file to handle
+      command lines larger than allowed by the operating system.
+
+- uic
+    * [144383] Added checks to prevent generated code from calling
+      ensurePolished() before each constructor is finished.
+    * [138949] Ensured that font and size policy instances are reused in
+      generated code.
+    * [141350] Ensured that color brushes are reused in generated code.
+    * [141217] Improved handling of include files of Qt 3 classes.
+    * [144371] Ensure that each form's objectName property is not set in
+      setupUi() to avoid problems in cases where the name was already set.
+    * Added support for the QWidget::locale property.
+    * [141820] Fixed generation of connections in the form.
+    * [137520] Ensured that code to set toolTip, statusTip and whatsThis
+      properties is not generated when the corresponding QT_NO_*
+      preprocessor macros are defined.
+    * [128958] Ensured that static casts are not used in generated code.
+    * [116280] Added support for qulonglong and uint types.
+
+-uic3
+    * [137915] Added functionality to extract images via the -extract
+      command line option.
+    * [129950] Added the -wrap command line option which specifies that a
+      wrapper class which is Qt 3 source compatible should be generated.
+
+- qmake
+    * [121965] Implemented DSW (Workspace files) generation for MSVC 6.0
+      users.
+    * [132154] Added support for /bigobj option in the vcproj generator.
+    * Fixed crash with dependency analysis.
+    * Ensure that cleanup rules are not added for extra compilers with no
+      inputs.
+    * LEX/YACC support has been moved into .prf files.
+    * [156793] Introduced PRECOMPILED_DIR for PCH output (defaults to
+      OBJECTS_DIR).
+    * [257985] Fixed qmake location detection bug.
+    * Ensured that empty INCLUDEPATH definitions are stripped out.
+    * Allow QMAKE_UUID to override qmake deteremined UUID in the vcproj
+      generator.
+    * [151332] Ensured that .pc files are terminated with an extra carriage
+      return.
+    * [148535] Introduced QMAKE_FRAMEWORKPATH and used it internally.
+    * [127415] Fixed object_with_source.
+    * [127413] Introduced QMAKE_FILE_IN_PATH placeholder for extra
+      compilers.
+    * [95975] Replaced QMAKE_FILE_IN for custom build steps in DSP
+      generator.
+    * [141749] Added checks to prevent cyclical dependencies.
+    * [146368] Ensured that GNUmake .d files are removed upon distclean.
+    * Improved extensibility of the precompiled header support to allow icc
+      precompiled headers.
+    * [147142] Short-circuit previously seen library paths to avoid
+      cyclical .prl processing.
+    * [144492] Ensured that INSTALL_PROGRAM is set for INSTALLS in
+      macx-xcode projects.
+    * [143720] Extra compilers will now depend upon the input file
+      automatically.
+    * Introduced QMAKE_DISTCLEAN for extra files to be removed upon
+      invocation of "make distclean".
+    * [133518] Reduced the noise created by qmake warnings.
+    * [108012] Brought macx-xcode into line with macx-g++ with regards to
+      custom bundle types.
+    * [128759] Added support for spaces in paths to linked libraries.
+    * [83445] Made sure that "make distclean" in a library with a DESTDIR
+      really does remove the destination symbolic links.
+    * The subdir generator will now use - to separate target words and _ to
+      separate internally appended words.
+    * [125557] Fixed broken generation of dependencies for extra compilers.
+    * Ensured that the QMAKE_QMAKE variable is given a reasonable default
+      before parsing and evaluating project files.
+    * For Unix/Mac OS X, configure now has an -optimized-qmake option that
+      allows people to build qmake with optimizations.
+      This is disabled by default as older versions of some compilers take
+      a long time to build an optimized qmake. qmake is already built with
+      optimizations on Windows.
+    * [130979] Made the incremental link option case-insensitive.
+    * Ensured that paths for custom build steps in vcproj files have the
+      correct seperators.
+    * Avoid duplicate dependency paths, reduce file stats.
+    * [91313] Ensured that multiple commands in the DSP generator are
+      separated with \n\t characters.
+    * [108681] Added checks to avoid problems with uic3 files having
+      dependencies on themselves.
+    * [130977] Added support for non-flat output for vcproj files with
+      single configuration.
+    * [134971] Added support for more compiler and linker options for
+      vcproj files, and added catch-all cases which add options to
+      AdditionalOptions variables.
+    * [140548] Fixed escaping of the custom build step for image
+      collections.
+    * [114833] Ensured that paths in vcproj always have native filing
+      system separators.
+    * [144020] Only allow CONFIG+=staticlib for TEMPLATE==lib.
+    * [97300] Handle large number of include paths on Windows for moc by
+      using temporary files. (See moc changes.)
+    * [150519] Ensured that qmake is compiled with the correct mkspec on
+      Windows.
+    * [148724] Added manifest files to project clean up.
+    * [123501] Added /LIBPATH to AdditionalLibraryPaths in vcproj files.
+    * [80526] Made sure that extra compiler commands are not corrupted due
+      to path separator fixing.
+    * [109322] Moved hardcoded extra compilers, yacc and lex, into the PRF
+      (feature) system.
+    * [101783] Added a _DEBUG to Resource Tool for debug builds on Windows.
+    * [145074] Added a custom build step on input files, for extra compiler
+      files with built-in compilers for the output files.
+    * [150961] Added support for QMAKE_PRE_LINK in the DSP and VCPROJ
+      generators.
+    * Added checks to avoid double escaping of DESTDIR_TARGET file paths in
+      Windows Makefiles.
+    * Ensured that file paths for COPY_FILE and QMAKE_BUNDLE are escaped.
+    * [83765] Ensured that input files instead of output files are added to
+      extra compiler steps under certain conditions.
+    * [101482] Fixed relative path handling for RC_FILE.
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
+- QTiffPlugin
+    * [93364] Added support for the TIFF image format.
diff --git a/dist/changes-4.3.1 b/dist/changes-4.3.1
new file mode 100644
index 0000000000..71de8e9bff
--- /dev/null
+++ b/dist/changes-4.3.1
@@ -0,0 +1,519 @@
+Qt 4.3.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.3.0.
+
+The Qt version 4.3 series is binary compatible with the 4.2.x, 4.1.x and
+4.0.x series. Applications compiled for Qt 4.0, 4.1 or 4.2 will continue to
+run with Qt 4.3.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- Translations
+    * Updated the German translation to provide complete coverage of Qt.
+
+- QDBusView
+    * Added icons for Mac OS X and Windows.
+
+- Intel C++ Compiler for Linux
+    * Added support for version 10 of the compiler. See the Compiler
+      Notes documentation for known problems and work-arounds for this
+      compiler.
+    * Added linux-icc-32 mkspec, for building with the 32-bit compiler
+      on 64-bit hosts.
+
+Third party components
+----------------------
+
+- FreeType
+    * Security fix (CVE-2007-2754): Integer overflow in the
+      TT_Load_Simple_Glyph function in freetype 2.3.4 and earlier allows
+      remote authenticated users to execute arbitrary code via crafted BDF
+      fonts.
+
+- SQLite
+    * File descriptors are not inherited during spawn() anymore.
+
+Build System
+------------
+
+    * Fixed native builds on ARM architectures.
+
+****************************************************************************
+*                           Library                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- QAbstractItemView
+    * [166605] Fixed regression causing keyboard modifiers to have no effect
+      during drag and drop operations.
+    * [169233] Fixed bug that would prevent text from being selected in
+      double spin box editors.
+    * [168917] Text would sometimes not be selected in the editor.
+
+- QAbstractItemModel
+    * [166714] Fixed regression causing persistent indexes to not be
+      correctly updated.
+
+- QAbstractPrintDialog
+    * [163000] Fixed bug on Unix where the PrintSelection option would not
+      be enabled unless PrintPageRange was also enabled.
+
+- QApplication
+    * [166677] Windows only: Fixed an issue with alert() where windows
+      would keep flashing after being activated by the user.
+    * [168974] Fixed problems with compilation that could occur when
+      QT3_SUPPORT and QT_NO_CURSOR were defined.
+
+- QComboBox
+    * [165130] Mac OS X only: Fixed bug that caused an editable combo box to
+      cut off list entries.
+
+- QDesktopServices
+   * [165817] Fixed misleading documentation of
+     QDesktopServices::setUrlHandler().
+
+- QDialog
+    * [166900, 166514] Fixed bug where a dialog could remain visible after
+      hide() had been called.
+
+- QFile
+   * [167217] Fixed regression that prevented the sequential bit from being
+     reset when reopening a file.
+
+- QFileDialog:
+   * [164947] Mac OS X only: Ensure that the parent of a native sheet dialog
+     is activated before a sheet is shown.
+
+- QFSFileEngine:
+   * [163406] Ensured that QFile::readLine() works on all platforms when
+     QFile is opened on file descriptor 0.
+
+- QGLWidget
+    * [162085] X11 only: Fixed usage of QGLWidget on multiple X11 screens.
+    * [164707] X11 only: Fixed the transparent overlay color usage to make
+      it possible to draw with a solid black color. Qt::transparent is now
+      always returned as the transparent color in an overlay.
+    * [162143] Fixed a crash that could occur when calling renderPixmap()
+      with extremely large sizes. It now gracefully fails instead.
+
+- QGraphicsItem
+    * [163430] Improved precision of QGraphicsItem::ItemIsMovable move
+      operations, and fixed move support for
+      QGraphicsItem::ItemIgnoresTransformations.
+
+- QGraphicsItemAnimation
+    * [164585] Fixed setTimeLine(0) to properly remove the existing timeline,
+      and also ensured that setting the same timeline twice works fine.
+
+- QGraphicsScene
+    * [163555] Flat items (items whose bounding rect width or height is 0)
+      no longer cause a full viewport update when they are updated.
+
+- QGraphicsView
+    * [160828] Fixed bug in QGraphicsScene/View::render() which could cause
+      nothing to be rendered for QPicture target devices.
+    * [163919] Scroll bar ranges are no longer reset to (0,0) when the
+      scroll bars are disabled (Qt::ScrollBarAlwaysOff).
+    * [163537] Scroll bar ranges are now correct also for styles with a
+      viewport frame only around the viewport itself (e.g., Motif and Mac
+      OS X style).
+    * [158245] Calling setScene(0) now recalculates the scroll bar ranges.
+    * [170619, 157400] Fixed rendering bugs that could occur when using a
+      semi-transparent foreground or background brush.
+    * [170619, 168885] Fixed a bug that would cause the rubber band to
+      appear after invoking a context menu.
+
+- QHostInfo
+    * [168233] Ensured that all pending look-ups are terminated on
+      application exit to avoid a delayed application shutdown while waiting
+      for the look-ups to complete.
+    * [167487] Fixed support for Unix platforms that allow IPv6 look-ups
+      through getaddrinfo(), but that don't support IPv6 sockets.
+
+- QImage
+    * [163727] Fixed artifacts in scaled images that could occur when using
+      Qt::FastTransformation.
+    * [169908] Fixed a crash that could occur when reading 4-bit
+      uncompressed BMP images.
+
+- QLocale
+    * [167534] Fixed bug that would cause QLocale::toString() to return
+      garbage if passed an invalid time or date.
+
+- QMainWindow
+    * [166004, 167651] Made the unified toolbar handle layout requests.
+    * Mac OS X only: Don't move the window's title bar when clicking on the
+      toolbar button.
+    * [164105] Made the unified toolbar handle showMaximized().
+    * [162555] Move OpenGL contexts when the toolbar button is pressed and
+      we are using the unified toolbar.
+    * [169063] Fixed a crash that could occur when setting a new menu bar
+      and the old one contained corner widgets.
+
+- QMdiArea
+    * [162573] Improved switching between maximized subwindows (less
+      flickering).
+    * [162046, 164264] Improved activation behavior.
+    * [170770] Fixed inconsistent behavior with scroll bars when a subwindow
+      is maximized.
+    * [169873] Fixed incorrect positions of tiled subwindows.
+
+- QMdiSubWindow
+    * [168129] Improved the way a default window icon is selected.
+    * [169859] Improved menu bar buttons for maximized subwindows.
+    * Improved support for size grips.
+    * [169543] Windows only (XP style): Fixed a problem where the frame
+      width was 1 pixel wider than it should have been.
+    * [168829] Fixed incorrect margins of maximized subwindows inside
+      QMainWindow.
+
+- QMenu
+    * [166652] Fixed a regression where context menus could not be triggered
+      with the right mouse button.
+    * [161789] Fixed a bug that prevented tear-off handles from being
+      activated when they were dragged down from the menu bar item.
+
+- QMenuBar
+    * [168892] Fixed bug that made the extension always appear when adding a
+      separator to a menu bar.
+    * [166181] Fixed bug that caused extensions to be misplaced.
+    * [166242] Fixed bug that could cause menus to be collapsed.
+
+- QMessageBox
+    * Ensured that the default button isn't lost when the modality of the
+      message box is changed.
+
+- QMacStyle
+    * Ensured that items with State_Focus actually get the focus ring drawn.
+
+- QNetworkProxy
+    * [170549] Fixed a regression from 4.2.3 in the default constructor; if
+      used before any other proxy settings were applied, it would fail to
+      initialize the proxy handlers, effectively disabling support for
+      SOCKS5 and HTTP proxies.
+
+- QOpenGLPaintEngine
+    * [166087] Fixed a memory leak caused by not releasing GL program
+      handles if they failed to compile.
+    * [166054] Ensured that push and pop operations are performed on the
+      texture matrix stack and the client state attributes when begin()
+      and end() are called.
+    * [161021] Fixed rendering of points with cosmetic pens with widths
+      greater than 0.
+
+- QPainter
+    * [158815] Fixed rendering artifacts for extended composition modes with
+      semi-transparent or anti-aliased drawing.
+    * [163744] Fixed aliased ellipse drawing artifacts (horizontal lines)
+      in raster engine.
+    * [166623] Fixed bug where gradients with ObjectBoundingMode would be
+      drawn at an incorrect offset.
+    * [167497] Fixed color bleeding artifacts at the edges when drawing
+      images/pixmaps with SmoothPixmapTransform on X11.
+    * [168621] Fixed bug which would cause projective transformations to be
+      incorrectly applied for non-top-level widgets.
+    * [168623] Fixed drawing of gradients with projective transformations.
+    * [167891] Fixed an assert in QBezier::shifted() that occured when
+      drawing certain paths.
+
+- QPlastiqueStyle
+    * [167145] Fixed a regression with combo and spin box text margins.
+
+- QPrintDialog
+    X11 only:
+    * [142701] Fixed an assert which could occur on a system with CUPS
+      setup, but no printers available.
+    * [165957] Added support to allow printers to be chosen from the
+      NPRINTER and NGPRINTER enviroment variables.
+      Ensured that CUPS command line options are not used when not using
+      CUPS.
+    * [158807] Fixed page ordering when printing to a CUPS printer or to PDF
+      files.
+    * [155129] Fixed Landscape printing with CUPS version < 1.2.
+
+    Windows only:
+    * [166054] Fixed a crash which could occur when trying to use a
+      QPrintDialog to configure a printer set to use
+      QPrinter::PostScriptFormat as output format.
+    * [162729] Fixed an assert that could occur when entering an invalid
+      page range.
+
+- QPrintEngine
+    * [166499] Windows only: Fixed a bug that could cause printing from a
+      QTextEdit to produce incorrect wrong results under certain
+      circumstances.
+    * [161915] Mac OS X only: Drawing vertical lines with a dot pattern now
+      work correctly on OS X 10.3.9.
+
+- QProcess
+    * [161944] QProcess::setReadChannel() no longer affects the contents of
+      the stderr / stdout / unget buffers. QProcess::readAllStandardError()
+      and QProcess::readAllStandardOutput() no longer clear any unget data
+      or buffered data.
+
+- QPixmap
+    * [167841] Fixed bug where filling a QPixmap with an alpha color would
+      fail to detach the pixmap, causing copies of the pixmap to be changed
+      as well.
+    * [157166] X11 only: Fixed problem with disappearing icons on 8-bit
+      TrueColor displays.
+    * [161307] Mac OS X only: Drawing bitmaps on pixmaps now works
+      correctly.
+
+- QRasterPaintEngine
+    * [166710] Fixed bug that prevented Qt::OpaqueMode from being taken into
+      account under certain circumstances when QPainter::fillRect() was
+      called.
+    * [159538] Fixed drawing of a monochrome image into another monochrome
+      image.
+    * [166000] Fixed compilation of mmxext optimizations.
+    * [156925] Fixed performance bug in 3DNow! optimizations.
+
+- QRegion
+    * [167445] Removed potential assert in QRegion::operator^ on Unix.
+
+- QScriptEngine
+    * [165899] Fixed bug where calling an overloaded slot from a script
+      would pick the wrong overload when the argument is a QObject.
+    * [166903] Fixed crash when evaluating a call to a script function that
+      ends with an if-statement with a true-part that ends with a return
+      statement (and has no else-part).
+
+- QScrollArea
+    * [167838] Use micro focus rectangle (if "active") instead of the entire
+      widget in ensureWidgetVisible().
+
+- QSortFilterProxyModel
+    * [167273] Fixed regression that caused QSortFilterProxyModel to assert
+      when changing data in a QSqlTableModel source model with the
+      OnFieldChange edit strategy.
+
+- QSqlQueryModel
+    * [166880] Fixed a bug where setQuery() could cause a crash by calling
+      hasFeature() on the wrong driver instance.
+
+- QSqlRelationalTableModel
+    * [140782] Fixed a bug which caused insertRecord() to fail when record()
+      returns a record containing duplicate field names.
+
+- QSslCertificate
+    * [168116] Don't crash when passing 0 to QSslCertificate::fromDevice();
+      issue a warning instead. This fix also removes warnings about
+      uninitialized symbols when accessing the static functions in
+      QSslCertificate before creating a QSslSocket.
+
+- QSslSocket
+    * [164356] Fixed a crash that could occur when passing a string to
+      setCiphers().
+    * [166633] Fixed a memory leak that would occur with each established
+      connection.
+    * [165962] Fixed support for wildcard certificates.
+    * [167593] Fixed a bug that caused QSslSocket::protocol() to be ignored
+      and set to the default of SSLv3 under certain circumstances.
+    * [167380] Fixed a crash when assigning a null key for SSL servers.
+    * [169571] Fixed a crash that could occur after disconnecting from a
+      remote address.
+
+- QTcpSocket
+    * [169183] Removed a qWarning() when reading from a closed socket
+      (regression from 4.2.3).
+
+- QTemporaryFile
+    * [167565] Fixed a regression from 4.2.3; size() would always return 0.
+
+- QTextEdit
+    * [161577] Fixed regression causing Shift-Backspace to be ignored.
+    * [165833] Fixed floating point overflow causing incorrect page heights
+      for text documents.
+    * [167377] Fixed performance regression when appending a lot of text in
+      NoWrap line break mode when there is a horizontal scroll bar.
+    * [163446] Fixed excessive emission of selectionChanged() signals when
+      moving the cursor.
+    * [167701] Fixed QTextEdit::setLineWrapMode to not change the
+      wordWrapMode property when called with NoWrap.
+
+- QTextDocument
+    * [160631] Fixed missing HTML export of page break policies.
+    * [163258] Fixed bug that prevented text table borders from being drawn
+      in QLabels and tool tips.
+    * [166670] Fixed layout bug that caused the right margin property of
+      paragraphs inside table cells to be ignored.
+    * [168406] Fixed rendering bug which would cause incorrect background
+      fills for paragraphs with a left margin set.
+
+- QTextLayout
+    * [166083] Fixed incorrect line breaking when breaking at a tab
+      character.
+    * [165861] Fixed support for QTextOption::NoWrap.
+
+- QLabel
+    * [162515] Fixed bug that prevented QLabel's alignment from being
+      applied properly to rich text.
+
+- QUrl
+    * Fixed a bug in QUrl::clear() which left some internal data uncleared.
+
+- QWidget
+    * [165177] Fixed crash that could occur when deleting a focus widget from a
+      window with a non-null parent.
+    * [165654] Fixed issue with incorrect repainting that could occur when
+      deleting an opaque child widget.
+
+- QWindowsVistaStyle
+    * [162730] Fixed the use of an incorrect font for item views on Windows
+      Vista.
+    * [157324] Improved the native appearance of indeterminate progress
+      bars.
+    * [170012] Fixed a bug which prevented the busy mode of a progress bar
+      from working when both its range and value were set to zero.
+
+- QWindowsXPStyle
+    * [132695] Fixed a crash issue that could occur after multiple system
+      theme changes.
+
+- QWizard
+    * [159684] AeroStyle: Fixed bug that caused the minimum height to be set
+      too low.
+    * [161670] AeroStyle: Fixed a problem that caused title bar buttons to
+      remaining glowing after the mouse had left the window.
+    * [161678] AeroStyle: Fixed a problem with incorrect vertical center
+      alignment of wizard buttons.
+
+- Q3Header
+    * [167283] Fixed regression in painting of the header.
+
+- Q3ListViewItem
+    * [165853] Fixed background coloring of a cell.
+
+- Q3Socket
+    * [163563] Fixed regression in canReadLine(); it now properly searches
+      all internal buffers.
+
+- Q3Table
+    * [168497] Fixed incorrect updates when using setUpdatesEnabled().
+
+- Q3Wizard
+    * [168195] Fixed bug that could cause the wrong page to be shown when
+      reopening a wizard.
+
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+- Interbase driver
+    * [149761] Added support for compiling Firebird 2.0 on 64-bit platforms.
+    * [165423] Fixed a regression causing an assert when calling a stored
+      procedure without out-parameters.
+    * [166238] Fixed a bug that caused only the first segment of multi-
+      segmented BLOBs to be retrieved in some cases.
+
+- ODBC driver
+    * [167167] Fixed a regression that caused a crash when checking DBMS
+      general information when connecting to a database.
+    
+- SQLite driver
+    * Use new sqlite3_prepare16_v2 instead of sqlite3_prepare16 when
+      possible.
+    * [167665] Fixed a regression that caused field names to be escaped
+      multiple times when selecting from views.
+    
+****************************************************************************
+*                               Examples                                   *
+****************************************************************************
+
+- Secure Socket Client
+    * New example, showing how to use QSslSocket to communicate over an
+      encrypted (SSL) connection.
+    
+- Accelerated Screen Driver
+    * Ensured that the example does not crash if it is unable to get a
+      pointer to the frame buffer.
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+X11
+---
+
+    * [163862] Fixed a bug where QClipboard would escape all non-ASCII
+      characters that were copied from GTK+ applications.
+    * [165182] Fixed building with the Intel C++ Compiler for Linux on
+      IA-64 (Itanium) (missing functions in qatomic_ia64.h)
+    * [163861] Fixed building on AIX 5.3 where the _POSIX_MONOTONIC_CLOCK
+      macro was accidentally redefined.
+    * [166650] Fixed a regression from 4.2.3 where calling QWidget::move()
+      in a reimplementation of QWidget::showEvent() did not work.
+    * [166097] QWidget::show() no longer overwrites the _NET_WM_STATE
+      property. Instead, QWidget now merges any existing _NET_WM_STATE
+      property together with its own state.
+    * Fixed the QAtomic implementation on the Alpha, which previously
+      caused all applications to hang on start-up.
+    * [165229] Changed the linux-lsb-g++ specification to avoid linking with
+      libGLU (which is not part of the LSB specification).
+    * [155083, 146833] Ensure that all font substitutions from fontconfig
+      are obeyed by using a strong binding for QFont's family with
+      fontconfig.
+
+Windows
+-------
+
+    * [169105] Fixed a regression where calling resize() on a minimized
+      window did not work.
+    * [169376] Fixed a race condition that would cause a crash when
+      stopping timers in a thread.
+    * [165440] Fixed a crash that could occur when using Google's Pinyin
+      input method with Qt.
+
+Mac OS X
+--------
+
+    * QMake's Xcode generator is now more robust when determining which
+      version of Xcode projects it should generate. It also uses launch
+      services to determine Xcode's location as well.
+    * Small changes to be more Leopard compatible
+    * [167020] Ensured that the translations are really included in the
+      binary package.
+    * [164530] Ensured that the DPI for fonts don't change when the
+      resolution changes.
+    * [165530] Fixed a bug that caused Q_DECLARE_METATYPE() in a
+      precompiled header to interfere with the Objective-C 'id' keyword.
+    * [165659] Fixed bold/italic font rendering for some fonts.
+
+Qtopia Core
+-----------
+
+    * Fixed support for bitmap fonts.
+    * [164297] Fixed a potential crash in accelerated paint engines.
+    * [160970] Fixed support for 1-bit black and white screens.
+    * [164783] Fixed bug in 4-bit grayscale support which resulted in pink
+      colors under certain circumstances.
+    * [164955] Fixed painting error when using QWidget::move().
+    * [166368] Fixed bug in QWidget::setFixedSize() when using multiple
+      screens.
+    * [165686] Fixed bug in QPixmap::grabWindow() when using multiple
+      screens.
+    * [130925] Fixed use of QWSWindowSurface::move() when acceleration is
+      available.
+    * [143865] Implemented QWSCalibratedMouseHandler::getCalibration()
+      properly to fill all return values.
+    * [161820] Fixed incorrect detection of glib libraries when cross-
+      compiling.
+    * [152914] Improved the framebuffer test example.
+    * [171454] Fixed painting errors when zooming in QVFb.
+
+
+****************************************************************************
+*                   Important Behavior Changes
+****************************************************************************
+
+- QScrollArea
+    * [167838] Use micro focus rectangle (if "active") instead of the entire
+      widget in ensureWidgetVisible().
diff --git a/dist/changes-4.3.2 b/dist/changes-4.3.2
new file mode 100644
index 0000000000..2bec4e643f
--- /dev/null
+++ b/dist/changes-4.3.2
@@ -0,0 +1,604 @@
+Qt 4.3.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.3.0 and Qt 4.3.1.
+
+The Qt version 4.3 series is binary compatible with the 4.2.x, 4.1.x and
+4.0.x series. Applications compiled for Qt 4.0, 4.1 or 4.2 will continue to
+run with Qt 4.3.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- Legal
+    * This version adds the Academic Free License 3.0, Artistic License 2.0,
+      Zope Public License 2.1 and Eclipse Public License to the GPL
+      Exception for developers using the Open Source Edition of Qt.
+      See the Trolltech GPL Exception Version 1.1 page in the documentation
+      for more information.
+
+Tools
+-----
+
+- Designer
+    * [175822] Fixed incorrect behavior of the widget editing mode that
+      could occur when a form was resized.
+    * [174797] Fixed a crash that could occur when several commands were
+      redone in one go.
+
+Build System
+------------
+
+    * Enabled MSVC project generator for the Qt Open Source edition.
+    * Ensured that the QMAKE_CC and QMAKE_CXX variables are not defined in
+      the Xcode project generator to allow distributed (distcc) builds to
+      work again.
+    * [165183] Make DESTDIR work again in the Xcode generator.
+    * Fixed a bug in escape_expand() that could cause text to be corrupted.
+    * Updated the compiler notes for version 10.0.026 of the Intel C++
+      Compiler for Linux. Precompiled header support has been fixed in
+      this version of the compiler, so the -no-pch workaround is no longer
+      needed. Note that there is still one outstanding bug in the 64-bit
+      compiler that requires configuring and building Qt with -debug.
+    * Updated the compiler notes for HP-UX platforms and compilers.
+    * Introduced support for 32-bit builds on HP-UXi Itanium: hpuxi-acc-32.
+    * [163661] Fixed the dependency generator for ActiveQt server projects
+      and certain custom compilers
+    * [169756] Fixed mocinclude.tmp usage for Visual Studio 6.0 project
+      files for cases where the length of the includes exceeds the amount
+      allowed on the command line.
+    * [166407] Fixed the generated target rules when using YACCSOURCES.
+    * [156948] Ensured that QTPLUGIN libraries come before the Qt libraries
+      on the link line.
+    * Ensured that support for libtiff is not built if Qt is configured
+      without zlib support.
+    * [172629] Ensured that syncqt does not generate zero-size master
+      include files for modules that are not found.
+    * Fixed generation of dependencies for EXTRA_TARGETS.
+    * [159113] Ensured that the description for the Post Link build step in
+      VS 2003 does not contain any \n characters.
+
+I18n
+----
+    * Fixed a crash in lupdate/lrelease that could occur if the XML parser
+      reported an error.
+
+****************************************************************************
+*                           Library                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- Qt Script
+    * QScriptEngine::evaluate() no longer throws a syntax error in the case
+      where the script contains no actual statements.
+    * [175714] Fixed parsing of octal numbers on Windows and Mac OS X.
+
+- Style Sheets
+    * QMainWindow now respects the background-image style property.
+    * [171858] Ensured that QPushButton uses the correct color when the
+      text-align property is set.
+    * Fixed various bugs in QMenu styling.
+    * [168286] Fixed a bug that prevented the background from being clipped
+      correctly when the border-radius and background-clip properties were
+      defined.
+    * Fixed a QComboBox styling bug where the popup would show an extra row
+      when a style sheet was used.
+    * [177168] Fixed a memory leak where QStyleSheetStyle is never
+      destroyed.
+    * [172315] Fixed a stack-overflow when using the isActiveWindow
+      property as a selector.
+
+- Text rendering
+    * [168625] Fixed rendering of text with perspective transforms on X11
+      and Qtopia Core.
+    * [173792] Fixed transformed rendering of non-scalable/bitmap Freetype
+      glyphs.
+
+- QAbstractItemView
+    * [168493] Fixed drag and drop regression when a parent item in a tree
+      doesn't allow item to be dropped on it.
+    * [174848] Fixed a crash that could occur if the row currently being
+      edited was removed.
+
+- QCalendarWidget
+    * [171532] Fixed keyboard navigation (pressing "w" doesn't select the
+      "Wed" cell anymore).
+    * [173852] Fixed SingleLetterDayNames mode for the Chinese language.
+
+- QColorDialog
+    * [153436] Fixed a crash in QColorDialog that could occur when choosing
+      a color in the Gray colorspace.
+
+- QColumnView
+    * Ensured that selectAll() selects all items in cases where the
+      selection range contained multiple items.
+    * [170751] Fixed incorrect selection behavior caused by clicking on a
+      previously selected folder.
+    * [170753] Prevented items from being reselected on deselection in some
+      cases.
+    * [170753] Ensured that the full path is selected when passing an index
+      to select.
+    * [170753] Fixed a bug that could occur when deselecting an item that
+      caused its parent to be deselected.
+
+- QCoreGraphicsPaintEngine
+    * [170352] Fixed aliased strokes that were drawn 1 pixel too far to the
+      left on Mac OS X versions < 10.4.
+    * [172006] Fixed point drawing with a scaled painter on Mac OS X.
+
+- QDataWidgetMapper
+    * [172427] Fixed a crash that could occur when submitting data from the
+      mapped widget to the model.
+
+- QDateTimeEdit
+    * [118867] Fixed a bug that prevented valid values from being entered
+      when certain range restrictions were applied.
+    * [171920] Fixed a bug with parsing long day names.
+
+- QDir
+    * [176078] Fixed a crash that could occur when entering directories with
+      very long path entries.
+
+- QDirIterator
+    * [176078] Fixed a crash that could occur when entering directories with
+      very long path entries.
+
+- QDockWidget
+    * [174249] Fixed bug where it was possible to dock into a minimized
+      QMainWindow.
+
+- QFile
+    * [175022] Fix regression in handle() on Windows.
+
+- QFileDialog
+    * Fixed possible deadlock.
+    * Ensured that selection changed signals are reconnected when setting a
+      filter on a dialog.
+    * [171158] Fixed a crash that could occur when using the Forward button
+      to navigate into a folder that was deleted.
+    * [166786] (Windows) Fixed bug that prevented some files from being
+      shown in certain cases.
+    * [165289] (Windows) Fixed issue that caused UNC paths to be ignored
+      when used as initial paths for a file dialog.
+    * [140539] (Windows) Dialog no longer accesses floppy drives
+      automatically when launched.
+
+- QFontDatabase
+    * [176450] Added some missing tr() calls and made all strings
+      localizable.
+
+- QFSFileEngine
+    * [177363] Fixed a bug in fileTime() that caused the time returned to
+      depend on whether or not it was called during a Daylight Saving Time
+      period.
+
+- QGLPixelBuffer
+    * [179143] (Windows) Fixed a memory leak that would occur when a
+      QGLPixelBuffer was deleted. This would appear as a slowdown in
+      performance to the user.
+
+- QGLWidget
+    * [169131] Fixed an issue with renderPixmap() where text drawn with
+      renderText() was clipped to the size of widget, not the resulting
+      pixmap.
+    * [175513] Fixed an issue with renderText() which would cause artifacts
+      when bitmap fonts were used.
+    * [172474] (Windows) Fixed an issue with disappearing text when using
+      renderText() together with renderPixmap().
+    * [173944] (Mac OS X) Fixed a crash that could occur when requesting a
+      GL context with an overlay.
+
+- QGraphicsItem
+    * [174299] Fixed and improved bounding rect calculations for most
+      standard items.
+
+- QGraphicsScene
+    * [174450] Flat items are now rendered correctly also when NoIndex is
+      set.
+
+- QGraphicsTextItem
+    * [174429] This item now respects QGraphicsItem::ItemClipsParentToShape.
+
+- QGraphicsView
+    * (X11) A workaround has been applied to resolve random clipping errors
+      that would sometimes leave trailing artifacts and horizontal/vertical
+      white lines in the viewport.
+
+- QHeaderView
+    * [178483] Prevented crash that could occur when recomputing the layout
+      under certain conditions.
+
+- QHttp
+    * [176822] Fixed a bug that caused POST requests to submit an empty body
+      after a proxy authentication request.
+    * [176403] QHttp no longer resets proxy settings on sockets set with
+      QHttp::setSocket() (regression from 4.2.3).
+    * [175170] Prevent live lock when response ends with a stray '\r'.
+    * [172763] Fixed a bug that caused QHttp to ask the proxy server to
+      connect to the wrong address when in SSL (non-caching) mode.
+    * [172775] Fixed the emission of the done() signal under some conditions
+      (mostly SSL only).
+
+- QImage
+    * [176831] Fixed a bug that caused conversions to Format_RGB16 to give
+      incorrect colors.
+    * [169908] Fixed a crash that could occur when reading 4 bits per pixel
+      uncompressed BMP images.
+
+- QItemDelegate
+    * [173969] QDoubleSpinBox editors now allow negative input.
+    * [179119] Item checkboxes were rendered without a margin.
+
+- QLabel
+    * Fixed a crash that could occur when changing the contents of a label
+      in a slot connected to the linkActivated() signal.
+
+- QLayout
+    * Fixed a performance regression from Qt 4.2 related to the introduction
+      of QStyle::layoutSpacing().
+
+- QLibrary
+    * [178304] Fixed a bug that caused a crash if QLibrary::errorString()
+      was called before QLibrary had a file name associated with it.
+
+- QListView
+    * [270837] Fixed assert that could occur when setting a root index with
+      no children in icon mode.
+
+- QMainWindow
+    * [175479] Fixed unified toolbar handling on Mac OS X to prevent
+      assertions in the layout engine.
+    * [174575] Several crashes fixed.
+
+- QMdiArea
+    * [173391] (Windows) Fixed bug where a subWindowActivated() signal was
+      not emitted when the top-level window was minimized.
+    * [173628] Fixed bug that could cause an endless resize loop when using
+      Qt::ScrollBarAsNeeded as the scroll bar policy.
+
+- QMdiSubWindow
+    * [176769] Fixed bug where the title bar font was not updated on
+      QEvent::FontChange.
+    * [173087] Ensured that double-clicking the system menu closes the
+      window.
+    * [173363] Fixed bug where the title bar was not immediately updated
+      after changing the window title.
+
+- QMenu
+    * [111348] QMenu now takes focus with the QPopupMenuReason.
+    * [176201] Fixed possible crash when clearing the menu from a triggered
+      signal.
+
+- QPainter
+    * [168621] Fixed an offset bug in drawing with perspective transforms.
+    * [172017] (X11 and OpenGL) Fixed drawing of non-cosmetic points with
+      the FlatCap cap style.
+    * [175010] Fixed some bugs related to dash offsets.
+    * [170517] Fixed issue with missing tab stops when painting to a
+      printer.
+
+- QPainterPath
+    * Fixed the behavior of addText() when used with italic fonts.
+    * [178515] Fixed QPainterPath::pointAtPercent() to work correctly on
+      line segments in a path.
+
+- QPicture
+    * [168621] Ensured that the correct scale is used when rendering to a
+      device with different x and y resolutions.
+
+- QPixmap
+    * Ensure that the proper color space is used in QPixmap::grabWindow() on
+      Mac OS X.
+
+- QPlastiqueStyle
+    * [174104] Fixed a regression in Plastique that caused spin boxes to
+      have incorrect heights.
+
+- QRasterPaintEngine
+    * [169997] Fixed aliased rendering of complex paths with a large number
+      of subpaths.
+    * [174914] Fixed use of QPainter::setOpacity() when drawing a pixmap
+      into a 16-bit buffer.
+    * [177919] Fixed a problem with drawing bitmaps.
+    * [177654] (Windows) Fixed an issue with transformed bitmaps being
+      returned as pixmaps.
+
+- QSqlQuery
+    * [173710] Fixed a bug that caused value() to return null-variants
+      instead of real values after re-executing a prepared query.
+
+- QSqlRelationalTableModel
+    * [176374] Fixed an unfortunate change in 4.3.0. Display column names
+      were aliased to prevent duplicate column names in records in order to
+      fix a bug in insertRecord().
+      However all display columns were always aliased - even when not
+      necessary. From now on, display column names will only be aliased when
+      there are name clashes, and only the conflicting columns will be
+      aliased.
+
+- QSqlTableModel
+    * [170783] Fixed a bug that caused empty rows to be displayed in a
+      QTableView when a new model was set on the view. This was caused by
+      QSqlTableModel emitting the rowsAboutToBeInserted() and rowsInserted()
+      signals even when the new model was empty.
+
+- QSslSocket
+    * [177198] Fixed the emission of the proxyAuthenticationRequired()
+      signal.
+    * [174625] Ensured that only one attempt is made to resolve OpenSSL
+      symbols.
+    * [173734] Removed two memory leaks.
+    * [172285] (Windows) Fixed link error that occurred when Qt was built
+      as a static library with OpenSSL enabled.
+
+- QSvgGenerator
+    * [167921] Fixed a rounding error; improved precision.
+    * [167921] Allow rendering to a device that's not open; warn if the
+      device is not writable.
+    * [167921] Fixed a bug that caused QSvgGenerator to confuse 'cm' units
+      with 'mm' units.
+
+- QSvgRenderer
+    * [172550] Fixed incorrect linear gradient parsing for certain SVGs.
+    * [175651] Fixed a crash that could occur when loading SVGs with
+      undefined URLs.
+
+- QTableView
+    * [171128] Fixed painting problems caused by deleting hidden rows.
+    * [175462] Fixed a bug where the region for selection spanning items was
+      calculated incorrectly.
+
+- QTcpSocket
+    * Fixed a crash that could occur when using SOCKS5 proxy before
+      constructing a QCoreApplication.
+    * [174517] (Windows) Prevented stalling when connecting to offline
+      hosts.
+
+- QTextBrowser
+    * [173945] Fixed bug that could prevent scrolling to an anchor in an
+      HTML file from working successfully.
+
+- QTextEdit
+    * [171130] Fixed bug that could occur when appending text lists to a
+      document, causing the first list element to be treated as normal text
+      instead of a list element.
+    * [172367] Fixed a bug that caused the result of setPlainText() to use
+      HTML attributes if preceded by a call to setHtml().
+    * [173574] Fixed a bug that prevented floating image links from being
+      clickable.
+    * [174276] Fixed resizing performance in cases where wrapping is
+      disabled.
+    * [172646] Fixed a bug that caused leading spaces in marked up text to
+      be lost when the text was copied and pasted.
+
+- QTextLayout
+    * Fixed a regression in the line breaking algorithm that lead to wrong
+      results for justified text.
+
+- QTextStream
+    * [174516] (Windows) Fixed a bug in readLine() when reading "\r\r\n"
+      from devices opened in QIODevice::Text mode.
+
+- QToolBar
+    * [270967] Fixed the behavior of floating toolbars.
+
+- QTreeView
+    * [171947] Fixed a bug that prevented alternate colors in an inactive
+      QTreeView from being painted with the correct inactive palette role.
+    * Prevented a number of possible crashes that could occur when there are
+      pending changes.
+    * [177165] Fixed a bug that caused minimum column widths to become
+      independent of the width of the text in the header.
+    * [177945] (Mac OS X) Fixed a crash that could occur when dragging over
+      an empty region.
+    * [174437] Fixed a bug that made it possible to interactively change
+      the check state of an item, even if it was disabled.
+    * [172426] Fixed a segmentation fault in QModelIndex that would occur
+      when showing QTreeView with QSortFilterProxyModel and delayed layout
+      changes were pending.
+
+- QTreeWidget
+    * [174396] Fixed an issue that could cause setItemExpanded() to fail.
+    * [172876] Ensured that itemBelow() and itemAbove() return correct
+      values.
+    * [171271] Fixed a possible crash caused by updating items too quickly.
+
+- QUtf8Codec
+    * [175794] Fixed an off-by-one buffer overflow bug.
+
+- QWidget
+    * [157496] (Windows) Fixed a memory leak in setWindowIcon().
+    * [175114] Fixed issue with missing update after hiding a child of a
+      hidden widget.
+    * [176455] Fixed a regression that prevented a parent layout from being
+      invalidated in certain situations if the widget had a fixed size.
+
+- QWizard
+    * [177716] Ensured that the commit button is enabled and disabled
+      correctly according to QWizardPage::isComplete().
+
+- QX11PaintEngine
+    * [173977] Fixed drawing of tiled bitmaps into a bitmap when XRender is
+      used.
+    * [175481] Fixed a crash that could occur when performing complex
+      transformations with a QRegion.
+
+- Q3Action
+    * [175536] Fixed a formatting error in the tool tip string
+      representation of actions with shortcuts.
+
+- Q3ButtonGroup
+    * [177677] Fixed a application freeze that could occur when resetting
+      the ID of a button inside a button group.
+
+- Q3FileDialog
+    * [165470] Fixed broken scrolling behavior that occurred after toggling
+      between detail/list view mode.
+
+- Q3Header
+    * [176202] Fixed memory leak when replacing icons using setLabel().
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+Build System
+------------
+
+- Q3ToolBar
+    * [176525] Ensured that the tool buttons of a vertical tool bar are
+      center-aligned instead of left-aligned.
+
+I18n
+----
+    * Fix crash in lupdate/lrelease that occured if the xml parser threw an error.
+
+Linguist
+--------
+
+    * [276076] Let Linguist show existing translations to other languages
+      as "auxillary sources" 
+
+
+****************************************************************************
+*                           Library                                        *
+****************************************************************************
+
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+- Interbase driver
+    * [175144] Fixed a build issue that prevented the QIBASE driver from
+      being built at the same time as the QODBC driver if Firebird header
+      files older than v2.0 were used.
+    * [177530] Fixed a regression introduced in Qt 4.3.0 that broke stored
+      procedure support for Interbase/Firebird. When executing a procedure
+      without parameters, the values were not retrievable.
+
+****************************************************************************
+*                               Examples                                   *
+****************************************************************************
+
+- Draggable Text Example
+    * Fixed usability bugs.
+
+- Torrent Client Example
+    * Several stability fixes have been applied.
+
+- Ported Asteroids Example
+    * Modifications to significantly improve performance.
+
+- Ported Canvas Example
+    * [139392] Prevented a crash that could occur when adding items after
+      shrinking the canvas to zero width and zero height.
+
+- Secure Socket Example
+    * [173550] Usability fixes.
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+X11
+---
+    * [169366] Fixed intermittent program hangs in the 64-bit PowerPC
+      implementation used on AIX.
+    * [176192] Fixed the behavior of show() followed by move() to correctly
+      place the window when called before the event loop is running.
+    * [133870] Fixed crashes in the 64-bit PowerPC implementation used
+      on Linux.
+    * [177143] Fixed a bug where the last activated QShortcut would be
+      incorrectly repeated when pressing a key with no KeySym defined.
+    * [171224] Fix copy and paste of non-ASCII text from Qt 3 to Qt 4
+      applications.
+    * Applied a workaround for a bug in gcc 3.4.2 that would cause 64-bit,
+      bootstrapped applications to crash on Solaris.
+    * [170792] Fixed subpixel anti-aliasing of fonts across X11
+      server/clients with different endianness.
+
+Windows
+-------
+    * [172621] Fixed an issue that caused large pixmaps to be printed
+      incorrectly.
+    * [170000, 171239, 173213] Fixed several issues with printing that
+      resulted in single and multipage printing being garbled.
+    * [168642] Fixed an issue with text disappearing when printing.
+    * [175517] Fixed a crash that could occur when calling setNumCopies() on
+      an invalid/non-existing printer.
+    * [173219] Fixed an issue that caused fonts to be incorrectly scaled
+      beyond 64 point font sizes.
+    * [276527] Fixed a memory leak in QWindowsVistaStyle.
+
+Mac OS X
+--------
+    * Note for Leopard pre-release builds: Qt 4.3.x applications running on
+      the August Leopard pre-release (build 9A527) will not show any windows
+      because of a regression in the Carbon library. This has been addressed
+      for a future OS X release. In the meantime, if you *must* test your
+      application against this Leopard build, please contact Trolltech.
+    * [178551] Fixed a regression that made it impossible to deliver mouse
+      move events to other widgets after a double-click on a widget that was
+      immediately hidden as a result of the double-click event.
+    * [172475] Ensured that OpenGL top-level widgets are not repainted when
+      another, independent, top-level widget is resized.
+    * Ensured that the maximized bit is removed when a window is resized by
+      user interaction.
+    * [170000] Fixed an issue that caused QPrinter::newPage() to incorrectly
+      reset the current QPainter state.
+    * [178531] Fixed an OpenGL text rendering issue that could cause garbled
+      text.
+    * [171173] Fixed a crash at application exit that could occur if
+      accessibility features had been used.
+    * [175164] Fixed a regression where font base lines for labels,
+      checkboxes and radio buttons were not properly aligned.
+    * [173007] Fixed a regression that prevented qt_mac_set_native_menubar()
+      from working.
+    * [130809] Ensured that bold fonts are used correctly when generating
+      PDFs.
+    * [164962] Improved support for Mac drawers in QMainWindow.
+
+Qtopia Core
+-----------
+    * Ensured that the font database cache is preserved across QWS server
+      restarts.
+    * Made some start-up time improvements for the server process.
+    * [272527] Fixed a bug in the internal crash handler that released
+      resources in some non-fatal incidents.
+    * [169569] Fixed a bug that caused uninitialized data to be blitted to
+      the screen when a window was shown and resized before the first paint
+      event.
+    * [274291] Added support for setting the QT_QWS_FONTDIR environment
+      variable to set the font installation path.
+    * [174264] Fixed synchronization of QDirectPainter::startPainting() to
+      be able to guarantee that QDirectPainter::allocatedRegion() returns
+      the correct result.
+    * [175994] Fixed missing updates in parent and sibling widgets when
+      using the QWindowSurface::buffer() and QWindowSurface::flush()
+      mechanism to paint outside a paint event.
+    * [170488] Implemented true synchronous behavior when creating a
+      QDirectPainter with the ReservedSynchronous flag.
+    * [275284] Fixed implementation of the Hybrid OpenGL integration.
+    * [178269] Fixed loading of the VNC screen driver when compiled as a
+      plugin.
+    * [178261] Fixed loading of the Transformed screen driver when compiled
+      as a plugin.
+    * [276651] Fixed mouse calibration in some configurations when using the
+      tslib mouse driver.
+    * [173037] Fixed re-entrancy problem that could cause
+      QClipboard::mimeData() to block in some situations.
+    * [174076] Added the QWS_CONNECTION_TIMEOUT environment variable to
+      allow the time out to be customized for client applications connecting
+      to the QWS server.
+    * [167661] Added support to enable some "broken" BMP images to be
+      rendered correctly.
+    * [176445] Added support for the Glib event loop; this is disabled by
+      default.
+    * Added livelock protection: events from the QWS server can no longer
+      starve local timer events or posted events.
diff --git a/dist/changes-4.3.3 b/dist/changes-4.3.3
new file mode 100644
index 0000000000..5bf6da0c08
--- /dev/null
+++ b/dist/changes-4.3.3
@@ -0,0 +1,358 @@
+Qt 4.3.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.3.0 through Qt 4.3.2.
+
+The Qt version 4.3 series is binary compatible with the 4.2.x, 4.1.x and
+4.0.x series. Applications compiled for Qt 4.0, 4.1 or 4.2 will continue to
+run with Qt 4.3.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- Legal
+
+    * This version adds the Common Development and Distribution License
+      (CDDL) to the GPL Exception for developers using the Open Source
+      Edition of Qt.
+      See the Trolltech GPL Exception Version 1.1 page in the documentation
+      for more information.
+    * This version upgrades the Qt Commercial License to version 3.4,
+      the Qtopia Core Commercial License to 1.2 and the Qt Academic
+      License to 1.4
+
+Build System
+------------
+
+    * [177865] Fixed the Unix configure script to correctly identify
+      g++ 4.3.0 as "g++-4" in the build key.
+    * [186588] Added the missing QSsl forwarding header file.
+    * [181414] Fixed an issue that caused moc to bail out on C++0X >> as
+      used in some templates.
+
+****************************************************************************
+*                           Library                                        *
+****************************************************************************
+
+- QDir
+    * [186068] Fixed documentation for QDir::CaseSensitive.
+    * [177988] Fixed a regression from 4.2.3 causing entryList() to ignore
+      QDir::System.
+
+- QDirIterator
+    * [185502] Fixed fileInfo() which could return an incorrect value for
+      some paths.
+
+- QDockWidget
+    * Fixed an issue that caused close buttons of dock widgets to be hidden
+      when they were resized to their minimum sizes.
+    * [180199] Dock widgets with vertical title bars can now be re-docked
+      on Mac OS X.
+    * [184668] Fixed crash that could occur when setting the title bar
+      widget twice.
+
+- QFileDialog
+    * [178894] Fixed a bug that prevented the OK button from being enabled
+      when there were files selected, but no current file.
+    * [179146] Fixed abug in selectFile() that prevented the selection from
+      being cleared when called with an empty string.
+    * [279490] Ensured that filesSelected() is emitted in AnyFile mode and
+      directoryEntered() is emitted when the sidebar is clicked.
+    * [277161] Fixed a bug that caused incorrect permissions for files to be
+      obtained, resulting in the Delete action being incorrectly enabled.
+    * [184314] Fixed an assertion in completer on Windows and fixed top-
+      level completion on all platforms.
+
+- QGLWidget
+    * [177996] Fixed a crash that could occur when drawing QImages created
+      outside of the GUI thread.
+    * [180832] Fixed potential crashes in renderText().
+
+- QGraphicsScene
+    * [182442] Fixed regression from 4.2 that could cause a crash when
+      deleting a scene being viewed by more than one view.
+
+- QGraphicsTextItem
+    * [181027] Fixed regression from 4.3.0 that caused movable text items to
+      jump around.
+
+- QHeaderView
+    * [178483] Fixed crash that would occur when attempting to compute a
+      visual index for an invalid model index.
+    * [182501] Fixed regression that caused stretched sections to use the
+      minimum size when not visible.
+
+- QTableView
+    * [175328] Fixed grid drawing errors in table views containing spanned
+      items.
+
+- QListView
+    * [184204] Fixed broken layout in right-to-left mode with no horizontal
+      scroll bar.
+
+- QTreeView
+    * [182041] Fixed problem with drag and drop in cases where the columns
+      were swapped.
+    * [186624] Fixed branch expanding animation.
+
+- QItemDelegate
+    * [181221] Fixed problem with the rectangle that was used to check the
+      mouse coordinates when clicking on the check box.
+
+- QHttp
+    * [178715] Fixed a problem where QHttp would not correctly parse the
+      server response if Content-Length was 0 and authentication was
+      required.
+    * [170860] Fixed a problem where QHttp would emit the done() signal
+      if the HTTP proxy server closed the connection after requesting
+      authentication.
+
+- QLabel
+    * [173188] Fixed QLabel::setAlignment(Qt::AlignJustify) to have the
+      desired effect.
+
+- QMainWindow
+    * [154834] Fixed restoreState() to be able to load data from previous
+      minor releases.
+    * [179713] Fixed failed assertions when inserting toolbars.
+    * [180824] Fixed a crash when removing a toolbar on a main window with
+      the unifiedTitleAndToolBarOnMac property set.
+
+- QMdiArea
+    * [185281] Fixed a bug where closing a modal dialog caused a different
+      sub-window to be activated.
+
+- QMdiSubWindow
+    * [183647] Improved WindowBlinds support.
+    * [188849] Fixed a crash that occurred when using a regular QWidget as
+      the menu bar in a QMainWindow.
+
+- QMenuBar
+    * [173556] Fixed a bug where the corner widgets did not swap sides when
+      changing layout direction.
+
+- QProcess
+    * [180836] Fixed issue with defunct processes on Unix.
+
+- QPainter
+    * Made the QPainter::drawText() overload with the QTextOption argument
+      support justified text.
+    * [179726] Fixed a problem with the bounds calculation for handling
+      fallback in certain painting operations. This could be perceived as a
+      clipping bug on some platforms.
+
+- QPainterPath
+    * [169280, 170046, 173034] Fixed cases where calling
+      QPainterPath::united(), QPainterPath::intersected(), or
+      QPainterPath::subtracted() would cause infinite loops or would not
+      produce the expected result.
+    * [178260] Fixed a bug in the stroking of painter paths which could
+      cause uninitialized data access for paths with extreme curvature.
+    * [183725] Fixed a bug where intersecting a path against itself would
+      return an empty path.
+
+- QPixmap
+    * [178986] Fixed a regression from 4.2: image/pixmap scaling caused the
+      sampling to be shifted by half a pixel.
+
+- QRasterPaintEngine
+    * [177919] Fixed a problem with drawing bitmaps.
+
+- QScriptEngine
+    * Fixed the parsing of large numbers (larger than 2^32).
+
+- QStyle
+    * [186511] Fixed the default QStyle() constructor to create a
+      QStylePrivate object, which is required by QStyle::layoutSpacing().
+
+- QStyleSheet
+    * [178598] Fixed a memory leak when using border images.
+    * [175722] Fixed a bug which broke mouse handling in checkbox items
+      when styling the check mark.
+
+- QStyleSheetStyle
+    * [182862] Setting a stylesheet with background-image on QMenu::item
+      now works.
+
+- QSvgGenerator
+    * [176705] Fixed a bug which caused radial gradients to produce
+      malformed XML output.
+    * [182196] Fixed a regression which caused gradient fills to be stored
+      as image data instead of native data.
+    * [182244] Fixed a bug in SVG export of ObjectBoundingMode gradients.
+
+- QStringListModel
+    * [180184] Fixed a bug that prevented sorting from updating persistent
+      model indexes.
+
+- QTableView
+    * [182210] Fixed a bug which caused the table view to hang when it had
+      views with 100,000,000 rows.
+
+- QTextBrowser
+    * [176042] Fixed incorrect behavior with selectAll() that caused it to
+      select all links if a link had the focus.
+
+- QTextDocument
+    * [177489] Fixed a bug in page breaking of text frames which could cause
+      missing page breaks and overdrawing.
+
+- QTreeView
+    * Fixed a possible crash that could occur when setting scrollPerPixel
+      while height was 0.
+    * [178771] Fixed an assertion that could occur when pressing the left or
+      right arrow key when the root index had no children, but when the
+      current index had not been set to invalid.
+    * [182618] Improved the performance of adding expanded or spanned items.
+    * [184072] Improved the performance of hiding rows.
+
+- Q3DockWindow
+    * [176167] Fixed an issue that made it impossible to move a Q3DockWindow
+      with the mouse if it did not have a title.
+
+- Q3ToolBar
+    * [182657, 185381] Fixed crashes caused by calling clear() and then
+      re-adding items.
+
+- Q3Wizard
+    * [176548] Fixed a crash caused by calling removePage() before a wizard
+      is shown.
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+X11
+---
+
+- QApplication
+    * Fixed a bug that could cause a programmer specified application font
+      to be overridden by the automatically-detected system font.
+
+- QCUPSSupport
+    * [180669] QCUPSSupport::QCUPSSupport() no longer crashes when the CUPS
+      library cannot be loaded.
+
+- QPrintDialog
+    * Fixed a bug that caused the selected file to be truncated before the
+      overwrite dialog was shown.
+
+- QWidget
+    * Fixed a bug that caused QWidget::windowState() to return an incorrect
+      state after restoring a maximized window.
+
+- QX11EmbedContainer
+    * [186819] Fixed embedClient() to not cause an X server lock-up when
+      passed an invalid window ID.
+
+  HP-UX
+  -----
+    * [179538] Fixed a bug that caused uic3 to hang in q_atomic_lock()
+      on PA-RISC based HP-UX machines.
+    * [177397] Fixed a QGL module compile problem on HP-UX systems.
+
+Windows
+-------
+
+- QFileDialog
+    * Fixed occasional crashes when dealing with the system icons.
+    * [175041] [181912] Ensured that shortcuts are handled correctly.
+    * Fixed a crash that could occur when opened with QDir::temp() as the
+      initial path.
+
+- QGLPixelBuffer
+    * [177154] Fixed support for floating point buffers with NVIDIA hardware
+      through the GL_NV_float_buffer extension.
+    * [179143] Fixed a memory leak that could occur when deleting a
+      QGLPixelBuffer.
+
+- QPixmap
+    * [185715] Fixed an assertion that could occur when reading icon
+      information for file types.
+
+- QPixmapCache
+    * [182363] Fixed a crash that could occur when inserting a null pixmap.
+
+Mac OS X
+--------
+
+- Fixed multiple issues preventing binaries built on Leopard from being
+  deployed on Tiger and Panther systems.
+
+- QCoreGraphicsPaintEngine
+    * [170352] Fixed a problem where all aliased strokes were offset by
+      1 pixel to the left on Mac OS X < 10.4.
+    * [172006] Fixed a problem with drawing points when FlatCap or
+      SquareCap was set as the pen style.
+
+- QGLWidget
+    * [181819] Fixed a bug that caused the contents of QGLWidgets not to
+      be moved or updated.
+
+- QCheckBox
+    * [182827] Fixed a crash caused by deleting a QCheckBox in an event
+      posted from the toggled() slot.
+
+- QDialog
+    * [281331] Fixed a bug that caused a QDialog with a modal parent to not
+      be modal.
+    * [279513] Fixed a bug that could occur when using the
+      Qt::WindowStaysOnTopHint flag on dialogs that would cause the drop down
+      menu to be hidden.
+
+- [180466] Ensured that an Embedded HIWebView in a floating window will
+  receive an activation.
+
+- Fixed brushed metal windows on Leopard.
+
+- Made QMenus have proper rounded edges on Leopard.
+
+- Fixed a regression that caused text to always be rendered with anti-
+  aliasing in OpenGL.
+
+- [179882] Fixed a regression where applications with both full-screen and
+  non-full-screen windows could get into an indeterminate state.
+
+- [182908] Fixed a crash on PPC which was caused by using a static Qt in a
+  plugin in another application.
+
+Qtopia Core
+-----------
+
+    * [179060] Fixed a potential crash when Qtopia Core is compiled without
+      FreeType support.
+    * [187589] Fixed a problem that caused windows not to appear on screen
+      when using gcc 4.1.1 ARM EABI toolchains.
+    * [179533] Fixed temporary blitting of uninitialized data to the screen
+      areas of some windows when they are shown for the first time.
+    * [180487] Fixed the use of FreeType fonts for unprivileged processes
+      in a LIDS environment.
+    * [179883] Fixed the use of -D QT_QWS_DEPTH_GENERIC configure options
+      when using a transformed screen driver.
+    * [182150] Fixed the use of incorrect colors that resulted from using
+      the VNC driver on top of the Linux framebuffer driver on big-endian
+      systems.
+    * Optimized drawing of images on 16-bit screens when using a painter
+      with an opacity value of less than 1.0.
+    * [183118] Updated the framebuffer test application to work on 18 bit
+      screens.
+    * [184181] Ensured that the QDesktopWidget::workAreaChanged() is emitted
+      when the available screen geometry is changed.
+    * [185508] Fixed missing mouse move/press event on touch screens when
+      pressing on a newly-activated window.
+    * [185301] Fixed a crash in QImage::convertToFormat() that could occur
+      when converting an image having a stride that is not a multiple of 4.
+    * [186266] Fixed a race condition which could result in painting errors
+      around the window decoration under certain circumstances.
+    * [186409] Fixed string to number conversions in QtScript when
+      configured with -D QT_QLOCALE_USES_FCVT.
+    * [186611] Fixed color conversion in QScreen::solidFill() (used when
+      drawing the screen background) when configured with
+      -D QT_QWS_DEPTH_GENERIC.
+    * [125481] Fixed a painting error with RGBA framebuffers and partially
+      transparent windows.
+    * Fixed inconsistency in 16-bit alpha blending which caused the
+      leftmost/rightmost pixels to be calculated differently due to
+      rounding errors.
diff --git a/dist/changes-4.3.4 b/dist/changes-4.3.4
new file mode 100644
index 0000000000..fe076d9911
--- /dev/null
+++ b/dist/changes-4.3.4
@@ -0,0 +1,112 @@
+Qt 4.3.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.3.0 through Qt 4.3.3.
+
+The Qt version 4.3 series is binary compatible with the 4.2.x, 4.1.x and
+4.0.x series. Applications compiled for Qt 4.0, 4.1 or 4.2 will continue to
+run with Qt 4.3.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- Legal
+
+    * This version adds the GNU General Public License (GPL) version 3
+      to all Qt Open Source editions. The GPL Exception version 1.1
+      applies to both versions of the GPL license.
+
+Build System
+------------
+    * Ensure that Qt plugin paths are only added once to the LIBS variable.
+    * MinGW: Ensure that PRE_TARGETDEPS and POST_TARGETDEPS are properly
+      escaped in dependency lists, so they match the rules in the Makefiles.
+
+I18n
+----
+
+****************************************************************************
+*                           Library                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- QApplication
+    * [193842] Fixed a bug where a statically built Qt would still try
+      to load Qt plugins (such as style, imageformat, and sqldriver
+      plugins) which causes the application to crash.
+
+- QCoreApplication
+    * [190356] Fixed a regression from 4.2 where the order of posted
+      events with the same priority would be sent out of order.
+
+- QComboBox
+    * [166349] Fixed crash resulting from making the combo box non-editable from a
+      slot caused by a line edit Key_Enter event.
+
+- QFileDialog
+    * [193483] Fixed crash when hidden directory is set as the current directory
+      and hidden directories are not set to be visible.
+    * [191301] Fixed QFileDialog closes even if the users indicate they do not
+      wish to replace.
+
+- QSslSocket
+    * [191705] Fixed crash on remote disconnect
+    * [190133] Fixed security bug in QSslSocket's certificate verification
+
+- QTreeWidget
+    * [191300] Adding QTreeWidgetItems into a sorted QTreeWidget can be slow.
+    * [155700] Fixed potential assert when deleting QTreeWidgetItems with
+      sorting enabled.
+
+- QDirModel
+    * [191765] Fixed crash when using QModelIndex from QDirModel::index()
+      for a UNC path.
+
+- QHeaderView
+    * [190624] Fixed case when stretch resize sections would give wrong
+      section sizes to all other sections.
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+
+****************************************************************************
+*                               Examples                                   *
+****************************************************************************
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+X11
+---
+
+Windows
+-------
+* [191309] Fixed a bug preventing browsing to UNC paths in the file dialog.
+* [180010] Fixed a memleak in the raster paint engine. The HDC for the raster buffer was
+	   not cleaned up correctly.
+* [191305] Fixed a possible memleak and problem with calling QGLPixelBuffer::doneCurrent()
+	   under Windows.
+
+Mac OS X
+--------
+* [188837] Fixed a bug that would make Qt applications not quit when someone logs out of Leopard
+* [192030] Prevent a crash when dragging over a widget that has a focus frame
+* [291319] Send the kEventQtRequestWindowChange event when moving QGLWidgets.
+* Fix binary compatibility issue in the OpenGL module that could cause problems when using
+   Qt binaries compiled on Tiger for development on Leopard. The Mac binary package now supports 
+   development on Leopard.
+
+Qtopia Core
+-----------
+* [189195] Fix crash when using fonts containing embedded bitmaps with
+  zero width and non-zero height.
+* [189829] Fixed parsing of device specification in the QWS_KEYBOARD
+  environment variable when specifying multiple keyboards.
diff --git a/dist/changes-4.3.5 b/dist/changes-4.3.5
new file mode 100644
index 0000000000..c674d87b8c
--- /dev/null
+++ b/dist/changes-4.3.5
@@ -0,0 +1,109 @@
+Qt 4.3.5 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.3.0 through Qt 4.3.4.
+
+The Qt version 4.3 series is binary compatible with the 4.2.x, 4.1.x and
+4.0.x series. Applications compiled for Qt 4.0, 4.1 or 4.2 will continue to
+run with Qt 4.3.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+    * [201242] Fixed an bug that caused bootstrapped tools (qmake,
+      moc, uic, and rcc) to crash or run into infinite loops.
+    * [190776] Fixed a bug that would generate invalid build keys in
+      some gcc compiler versions. Backported from Qt 4.4.
+
+- Legal
+
+    * This version updates the GPL Exception to version 1.2 in all
+      Open Source editions of Qt. This version is compatible with the
+      GPL version 3 and adds the LGPL version 3 to its list of
+      acceptable licenses.
+
+Third party components
+----------------------
+
+- libpng
+    * Security fix (CVE-2008-1382)
+
+Build System
+------------
+
+I18n
+----
+
+****************************************************************************
+*                           Library                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- QCalendarWidget
+    * Fixed handling of leap year while changing the date in calendar widget.
+
+- QComboBox
+    * [203827] Fixed problems caused by the line edit not being hidden for
+      a non-editable QComboBox.
+
+- QMdiArea
+    * [209615] Fixed an assert when removing a sub-window from one QMdiArea and
+      adding it to another QMdiArea.
+
+- QMdiSubWindow
+    * [192794] Fixed a bug where installed event filters were removed
+      when maximizing a window.
+
+- QPainter
+    * [204194] Fixed division-by-zero issue in raster paint engine when
+      calling drawLine with the same starting and ending point.
+    * [205443, 207147] Fixed floating point exception when drawing near-vertical
+      or near-horizontal lines in the raster paint engine.
+
+- QWizard
+    * [180397] Fixed crash resulting from AeroStyle being assumed even when
+      some of the required symbols were unresolved.
+    * [197953] QWizard no longer crashes on Windows if an accessibility
+      application (like Microsoft Narrator) is running.
+
+- QWorkspace
+    * [206368] Fixed a crash resulting from the icon in the title bar not
+      being deleted when deleting a sub-window.
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+
+****************************************************************************
+*                               Examples                                   *
+****************************************************************************
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+X11
+---
+
+Windows
+-------
+
+- QRasterPaintEngine
+    * [198509] Fixed a resource leak which occured when QPainter::drawText()
+    was called.
+
+Mac OS X
+--------
+
+- QRasterPaintEngine
+    * [198924] Fixed a byte order problem when drawing QImages on an X11
+    server running on PPC Macs.
+
+Qtopia Core
+-----------
diff --git a/dist/changes-4.3CE-tp1 b/dist/changes-4.3CE-tp1
new file mode 100644
index 0000000000..41aaea8c93
--- /dev/null
+++ b/dist/changes-4.3CE-tp1
@@ -0,0 +1,53 @@
+Changes for Qt/CE 4.3.x "Feierabend" release.
+
+****************************************************************************
+*                           Features                                       *
+****************************************************************************
+
+- Added precompiled platform tools to package
+
+- Added/Updated documentation
+
+- Added/Updated examples
+
+****************************************************************************
+*                           Bug fixes                                      *
+****************************************************************************
+
+- cetest
+   * cleanup directory hierarchy in case user specified.
+   * fixed libpath option which was not case-insensitive.
+
+- configure.exe
+   * fixed order of c-runtime deployment.
+   * fixed --(xy)prefix options to work in Windows Command Prompt.
+
+- QDesktopWidget
+   * fixed SIP handling bug.
+
+- QFeatures
+   * fixed custom configuration build issues.
+
+- QFileDialog
+   * updated UI to fit on embedded screen.
+   * in case no native dialog exists on device, use Qt FileDialog instead.
+   * fixed file extension bug.
+
+- QFSFileEngine
+   * workaround for Windows Mobile for taking MAX_PATH not into account.
+
+- QGraphicsView
+   * fixed bug when qreal is not double.
+
+- QLibraryInfo
+   * fixed legacy bug about not finding the plugins path.
+
+- QSysInfo
+   * added Windows CE 6.
+
+- QWidget
+   * fixed potential minimize/maximize bug.
+
+- QPaintEngine
+   * detect bitdepth on startup and create 16bit buffers, if possible.
+
diff --git a/dist/changes-4.3CEconan b/dist/changes-4.3CEconan
new file mode 100644
index 0000000000..5d78e5710b
--- /dev/null
+++ b/dist/changes-4.3CEconan
@@ -0,0 +1,72 @@
+Changes for Qt/CE 4.3.x "Conan the Librarian" release.
+
+****************************************************************************
+*                           Features                                       *
+****************************************************************************
+
+- Added QtSql
+
+- Added QSqlite plugin
+
+- Added sql examples
+
+- Added 16bit painting engine
+
+- Added options to cetest
+
+- Added Windows Mobile 6 mkspecs
+
+****************************************************************************
+*                           Bug fixes                                      *
+****************************************************************************
+
+- cetest
+   * added -conf option to specify a qt.conf file to be deployed
+   * added -f option to specify a .pro file to be parsed
+   * copy in buffered mode
+   * deployment rules can use wildcard logic
+   * fixed a bug in debug/release parsing
+   * try to get results though unittest might have crashed
+
+- configure.exe
+   * fixed usage of c-runtime deployment on desktop win32 build
+   * new parameters for cross-compilation
+
+- QApplication 
+   * fixed minimal qfeature build configuration
+
+- QEventDispatcher
+   * fixed minimal qfeature build configuration
+
+- QFileDialog
+   * fixed internal handling of path separators
+   * fixed unexpected behaviour due to uninitialized memory
+
+- QFileSystemModel
+   * fixed different behaviour for Qt/CE
+
+- QFileSystemWatcher
+   * updated documentation
+
+- QtGui
+   * fixed floating point issues
+
+- QKeyMapper
+   * fixed short-cut algorithm
+   * fixed virtual key handling
+
+- QMessageBox
+   * fixed minimal qfeature build configuration
+
+- qmake.exe
+   * deployment rules can use wildcard logic
+
+- QTableView
+   * fixed style issue for header item
+
+- shadow build
+   * locate qglobal.h in correct directory
+
+- zlib
+   * fix build logic
+
diff --git a/dist/changes-4.3CEkicker b/dist/changes-4.3CEkicker
new file mode 100644
index 0000000000..009dc33852
--- /dev/null
+++ b/dist/changes-4.3CEkicker
@@ -0,0 +1,53 @@
+Changes for Qt/CE 4.3.x "Kicker" release.
+
+****************************************************************************
+*                           Features                                       *
+****************************************************************************
+
+- Integrated to Qt 4.3
+
+- Added QtXml
+
+- Added QtSvg
+
+- Added full QCursor support in case SDK supports it
+
+- Added temporary tool sdkscanner for reading Visual Studio configuration
+
+****************************************************************************
+*                           Bug fixes                                      *
+****************************************************************************
+
+- configure.exe
+   * Fixed qconfig.h creation using host platform paths
+   * Fixed sanity check for -host parameter
+
+- drag'n'drop
+   * Fixed for SDKs with cursor support
+   * Added examples
+
+- Example portedasteroids
+   * Fixed linking issues
+
+- QFileIconProvider
+   * Windows CE specific path fixes
+
+- QFsFileEngine
+   * Windows CE specific path fixes
+
+- QPixmap
+   * Fixed icon library loading
+
+- QSplashScreen
+   * Fixed painting bug
+
+- QTestLib
+   * Allow more than 256 bytes for qDebug() while debugging
+
+- QWidget
+   * Fixed bug in maximize()/minimize()
+
+- WIMMXT support
+
+- Windows CE 6.0 support
+   * fixed network issues with wince6* mkspecs
diff --git a/dist/changes-4.3CEsweetandsour b/dist/changes-4.3CEsweetandsour
new file mode 100644
index 0000000000..fab21ad420
--- /dev/null
+++ b/dist/changes-4.3CEsweetandsour
@@ -0,0 +1,43 @@
+Changes for Qt/CE 4.3.x "SweetAndSour" release.
+
+****************************************************************************
+*                           Features                                       *
+****************************************************************************
+
+- Added QtScript
+
+- Added cetest/QtRemote
+
+- Added MIPS/SH4 compilation support
+
+****************************************************************************
+*                           Bug fixes                                      *
+****************************************************************************
+
+- configure.exe
+   * Added c-runtime deployment options.
+   * Added cetest installation option.
+
+- qmake
+   * Fixed DEPLOYMENT rule to allow recursive directory deployment.
+
+- QProcess
+   * Fixed usage of DuplicateHandle, which got implemented for CE 6.
+
+- libpng
+   * Fixed crash bug concerning strtod which exists on CE 5 by default.
+
+- QFSFileEngine
+   * Fixed bug to access file size of POSIX opened file.
+
+- QWidget
+   * Fixed maximization bug.
+   * Fixed deadlock bug caused by invalid state.
+
+- QDateTimeEdit
+   * Fixed support for QT_KEYPAD_NAVIGATION
+
+- QPixmap
+   * Fixed toWinHBITMAP
+   * Fixed fromWinHBITMAP
+   * Fixed icon handling
\ No newline at end of file
diff --git a/dist/changes-4.4.0 b/dist/changes-4.4.0
new file mode 100644
index 0000000000..7875f2c48a
--- /dev/null
+++ b/dist/changes-4.4.0
@@ -0,0 +1,2419 @@
+Qt 4.4 introduces many new features as well as many improvements and
+bugfixes over the 4.3.x series. For more details, see the online
+documentation which is included in this distribution. The
+documentation is also available at http://doc.trolltech.com/4.4
+
+The Qt version 4.4 series is binary compatible with the 4.3.x series.
+The Qt for Embedded Linux version 4.4 series is binary compatible with the
+Qtopia Core 4.3.x series. Applications compiled for 4.3 will continue to
+run with 4.4.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Task Tracker:
+
+  http://www.trolltech.com/developer/task-tracker
+
+Each of these identifiers can be entered in the task tracker to obtain
+more information about a particular change.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- Legal
+    * This version introduces the GPL version 3 as an alternative
+      license for the Open Source Edition of Qt, in addition to the
+      existing licenses.
+    * Updated the GPL Exception to version 1.2, which grants additional
+      rights to developers using the LGPL version 3.0 and other licenses
+      for their software.
+
+- Configuration/Compilation
+    * [102113, 151125] Make it possible to use Qt headers with MSVC's
+      warning level 4.
+    * [129841] Make Qt compile with Intel C++ 9.0 and Intel C++ 10 compilers
+      on Windows.
+    * [168868] Add experimental support for the Blackfin processor.
+    * [188167] Fixed a bug in the solaris-cc mkspec that would cause
+      it to always use RPATH, even when configured with -no-rpath.
+    * [176029] Added qmalloc.cpp with qMalloc() and qFree() implementation
+      to make it easier to replace the default container allocators with
+      custom allocators (by providing your own qmalloc.o(bj) file).
+    * Enable -reduce-exports automatically on linux-icc* mkspecs when
+      using version 10.1 of the Intel C++ Compiler for Linux.
+    * Add experimental support for the AVR32 processor.
+    * Allow building Qt with -release and the Intel C++ Compiler for
+      Linux. This required working around several compiler bugs by
+      turning optimizations off for certain modules. See the compiler
+      notes for more details.
+    * Add support for MSVC 2008, and add separate mkspecs for MSVC 2002 &
+      2003.
+    * [189185] Avoid quoting the the include and library paths for iconv.
+
+- Documentation and Examples
+    * The Qt Designer Manual was updated to include new Qt Designer features.
+    * QtScript module overview was updated with more examples and reference
+      material.
+    * [161404] The 40000 Chips demo no longer shifts when clicking the OpenGL
+      button.
+    * [188676] Fixed text item moving in Diagram Scene example.
+    * New demo: Embedded Dialogs
+    * New demo: Browser
+    * New example: Graphics View / Pad Navigator
+    * New example: Item Views / Address Book
+    * New example: WebKit / Previewer
+    * New Example: XmlPatterns / Recipes
+    * New tutorial: Address Book
+    * Multiple bug fixes for the Torrent Client example.
+    * Speed-ups in the Ported Asteroids Example.
+    * [164223] All examples that use resources now include
+      Q_INIT_RESOURCES to avoid breakage in static builds.
+
+- Translations
+    * Added a Traditional Chinese translation of the Qt and tools courtesy
+      of Franklin.
+    * Added a Spanish translation of Qt courtesy of Enrique Matias Sanchez.
+
+- Signals and slots
+    * [147681] Added support for 'long long' and 'unsigned long long'
+      in queued connections.
+    * [125987] Optimized QMetaObject::activate(), the function that
+      actually delivers signals to all connected slots.
+    * [164558] Fixed a bug that caused queued signals to be delivered out
+      of order (not in the order they are emitted).
+    * [169554] Added Q_EMIT, to correspond to Q_SIGNAL and Q_SLOT.
+
+- Multithreaded painting
+    * [66358, 142031] Added support for painting on QImage, QPicture,
+      and QPrinter in multiple threads. See the Multithreaded
+      Programming documentation for more details on supported features
+      and known limitations.
+
+- Embedded QWidget support for Graphics View
+    * [177204] Added support for using layouts, styles, palettes and fonts,
+      as well as embedding QWidgets into a QGraphicsScene.
+
+- XML support in QtCore
+    * The QXmlStreamReader, QXmlStreamWriter and supporting classes
+      have moved from the QtXml module to the QtCore module. This change is
+      both source- and binary-compatible with previous versions. New
+      applications can opt to not link to QtXml when using these classes.
+
+- Printing
+      Made a number of improvements to printing in Qt 4.4, including
+      support for setting custom page sizes and custom margins as well as
+      the ability to programatically enumerate printers via the new
+      QPrinterInfo class. A couple of new classes, QPrintPreviewWidget
+      and QPrintPreviewDialog, have been added to make it easy to add a
+      print preview to an application. The QPrintDialog and QPageSetupDialog
+      for X11 have been redesigned and are hopefully easier to use.
+
+New features
+------------
+
+- XQuery 1.0 and XPath 2.0 support provided through the new QtXmlPatterns
+  module.
+
+- Qt Help module for embedding documentation into applications.
+
+- QSystemSemaphore provides a general counting system semaphore.
+
+- QSharedMemory provides access to a shared memory segment between multiple
+  threads and processes.
+
+- QLocalServer class provides a local socket-based server with a matching
+  new QLocalSocket class.
+
+- QFileSystemModel provides a data model for the local file system. Unlike
+  QDirModel, QFileSystemModel will fetch directory listings in a background
+  thread to prevent any locking in the GUI. QFileSystemModel is also much
+  faster and has a few more features then QDirModel.
+
+- QCommandLinkButton to support Vista style command links on all platforms.
+
+- QFormLayout provides a layout designed for convenient form creation with
+  the appropriate appearance on different platforms. This class previously
+  appeared in Qtopia/4.3, but has been integrated into Qt.
+
+- QtConcurrent provides a high level multi-threading API.
+
+- QPlainTextEdit provides a highly scalable plain text editor. It uses
+  similar technology and concepts as QTextEdit, but is optimized for plain
+  text handling; e.g. as a log viewer.
+
+- QTextBoundaryFinder is a new class implementing the Unicode text
+  boundaries specification.
+
+
+Third party components
+----------------------
+
+- Updated Qt's SQLite version to 3.5.4.
+
+- Updated Qt's libpng version to 1.2.25.
+
+- Added CLucene version 0.9.17.
+
+- Added WebKit (see the src/3rdparty/webkit/VERSION file for the version).
+
+- Added Phonon version 4.1.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+- General Fixes
+    * [147201] Assert in debug mode when using QReadLocker, QWriteLocker,
+    or QMutexLocker with unaligned pointers.
+
+- QAbstractButton
+    * [190739] Ensure button with the TabFocus policy doesn't receive focus
+      through others ways.
+    * [192074] Disable key navigation for buttons in a item view.
+
+- QAbstractItemModel
+    * [171469] Speed up insertion of rows into a model.
+
+- QAbstractItemView
+    * [162487] Check canFetchMore() on the model before calling fetchMore().
+    * [179163] The virtual selectAll() is now called when the user types
+      "Ctrl+A"
+    * [181413] Fixed InternalMove for MoveAction-only models.
+    * [181988, 192114] Made mouse wheel smarter on ScrollPerPixel mode.
+    * [182248] Trasparent background for the dragged visual.
+    * [184507] setVerticalScrollMode(ScrollPerItem) can cause the view to
+      scroll to the bottom.
+    * Add autoScrollMargin property.
+    * [162547] Make the current index stay in the viewport when sorting.
+    * [165404] Make the drop indicator stylable.
+    * [160611] Ensured that the hover item is updated when dragging over the view.
+    * [162497] Allow key events to be propagated.
+    * [186052] Mac: The alternatingRowColors property now honors the
+      Graphite color setting.
+    * [202276] Fixed crash when pressing Ctrl+C in a view with no model.
+    * [202034] Ensured that the editor's geometry is kept up to date when rows
+      are inserted.
+    * [204403] Only scroll to the current index on reset if the view is
+      editing.
+
+- QAbstractProxyModel
+    * [156789] Fixed a crash when deleting the source model.
+    * [194765] Made headerData() call mapToSource() when asking for data.
+    * [195023] Added setData() and setHeaderData() implementation.
+
+- QAbstractScrollArea
+    * [159949] Fixed a bug where setting the horizontal scroll had no effect.
+
+- QAbstractSpinBox
+    * [183108] Allowed a spin box to be cleared before it is visible.
+    * [198687] Always reset modified and undo states of the line edit upon
+      pressing Enter.
+
+- QAccessible
+    * [177706] Windows narrator will now read Tooltips properly.
+    * [182437] Tooltips are now read aloud once instead of twice.
+
+- QAction
+    * [200823] Fixed regression that caused the tool tip of an action not to
+      show the shortcut by default.
+    * [97238] Introduced the iconVisibleInMenu.
+
+- QApplication
+    * [100630, 153895] Fixed a bug where key press events were always
+      sent as non-spontaneous events, while the key release event was
+      spontaneous.
+    * [194454, 196062] Fixed QApplication::quitOnLastWindowClosed to
+      work as documented.
+    * [97238] Introduce an attribute (AA_DontShowIconsInMenus) to control
+      the default behavior of icons in menus. This obsoletes the
+      qt_mac_set_menubar_icons() function.
+    * [201218] Fix bug on Mac OS X where Qt::WA_DeleteOnClose failed to
+      delete on close.
+
+- QAtomicInt
+
+- QAtomicPointer
+    * [168853] Introduced QAtomicInt and QAtomicPointer into the public API.
+      These classes provide a cross-platform API for doing atomic operations.
+    * Optimized testAndSet*() on PowerPC to not branch in the best case
+      (when value == expectedValue).
+    * [197244] Fixed the gcc inline assembler constraints for the PowerPC
+      implementation.
+    * [198399] Applied patch from SUSE to add S390(x) support.
+
+- QBoxLayout
+    * [103626] Added insertSpacerItem() and addSpacerItem().
+    * [127621] Made setStretchFactor() behave correctly if widget == 0.
+
+- QBrush
+    * [179308] Fixed a bug which caused QBrush to forget the color if it was
+      passed in the constructor along with Qt::NoBrush.
+    * [169502] Fixed a threading issue with setTextureImage().
+
+- QBuffer
+    * [184730] A TIFF image can now be stored correctly in a QByteArray.
+
+- QByteArray
+    * [193870] Copy the data of a QByteArray that is taken from
+      QByteArray::fromRawData() when appending more data.
+    * [82509] Added QT_NO_CAST_FROM_BYTEARRAY to disable "operator const
+      char *" and "operator const void *".
+
+- QCalendarWidget
+    * [181388] Added support for updating the cell of a particular QDate.
+    * [172053] Fixed palette bug for calendar's buttons.
+
+- QChar
+
+- QCleanlooksStyle
+    * [194082] Fixed disabled checkbox painted as unchecked.
+    * [189609] Fixed an issue where QMdiSubWindow could have incorrect
+      buttons.
+    * [182806] Retain hover appearance on slider while dragging.
+    * [180105] Fixed gradient backgrounds shown as black on a pressed
+      QPushButton.
+    * [176674] Fixed combobox drop down ignoring custom icon sizes.
+    * [197691] Made the style work better on older X11 servers without
+      XRender support.
+
+- QColorDialog
+    * [142706] use QDialogButtonBox to conform with the style it is running
+      in.
+
+- QColumnView
+    * [167408] Added createColumn() to help make subclassing easier.
+
+- QComboBox
+    * [155578] Improved calculation of size hint for combo box pop-up.
+    * [183982] Fix bug where the combobox width was not wide enough in some
+      styles.
+    * [187744] Made QComboBox behave slightly better when the view is a tree.
+    * [189444] Allowed separators in the list.
+    * [190332] Made the popup respect the view's selection behavior.
+    * Made setEditable(false) explicitly hide the lineEdit, otherwise it may
+      remain visible when executing a modal dialog immediately afterwards.
+    * [154884] Fixed a bug where the popup was hidden without calling
+      QComboBox::hidePopup().
+    * [169848] Fixed a bug where the combo box did not open as expected when
+      using a touch screen.
+    * [153975] Mac OS X: Improved the visual appearance (flash selected item
+      and fade away when hiding the menu).
+    * [190351] Fixed setView() for style using SH_ComboBox_Popup.
+    * [191329] Fixed the height calculation of the popup for custom view.
+
+- QCommonStyle
+    * [173539] Make the combo label draw according to the combo box's layout
+      direction and not the application's.
+
+- QCompleter
+    * [189564] Prevented unselectable items from appearing in the completion
+      list.
+    * [180785] Ensured that QCompleter emits activated() after pressing the
+      Return key.
+
+- QCoreApplication
+    * [157435] Fixed the posted event implementation to prevent the pending
+      queue from growing endlessly while a modal event loop is running.
+    * [132395] Sent DeferredDelete events at the right time. Specifying the
+      QEventLoop::DeferredDeletion flag (now deprecated) to processEvents()
+      is no longer necessary.
+    * [131235] Added QCoreApplication::applicationPid().
+    * [132859] Don't explicitly set the LC_NUMBERIC locale to "C" on UNIX
+      systems.
+    * [187044] Fixed a crash when addLibraryPath() or setLibraryPaths()
+      is invoked before creating QCoreApplication.
+    * [161049, 171670] Don't leak the single QThread instance that Qt creates
+      to represent the main() thread.
+    * [143743] Added the QCoreApplication::applicationVersion property.
+
+- QCryptographicHash
+    * [190062] Ensured that calling result() twice returns the same value.
+
+- QDataWidgetMapper
+    * [194784] Allowed setting NULL values for editors.
+
+- QDataStream
+    * [196100] Fixed compatibility issue with QCString in Qt3.x streams.
+    * [196415] Fixed compatibility issue with invalid colors in Qt 3.x
+      streams.
+
+- QDateTime, QDate, QTime
+    * [189882] Optimized {QDate,QTime,QDateTime}::fromString() so that it
+      is about 40% faster than before.
+    * [193079] Have {QDate,QTime,QDateTime}::fromString() understand
+      locale-dependent string formats.
+    * Added enum values to distinguish between short and long formats.
+
+- QDateTimeEdit
+    * Added properties minimumDateTime/maximumDateTime
+    * [169916] Added a timeSpec property for QDateTimeEdit
+    * [178027] Make QDateTimeEdit respect the locale property
+    * [158950] Disable QCalendarWidget popup when the dateTimeEdit is
+      read-only.
+    * [145872] Added a getter and setter for the QCalendarWidget popup.
+
+- QDateEdit
+    * Don't interpret time-specific formats as special fields in a QDateEdit
+      and vice versa for QTimeEdit.
+
+- QDesktopServices
+    * [89584] Added a way to get users Documents, Desktop, Movies
+      directories.
+    * [105740] Added a way to determine the location to store data files.
+
+- QDialog
+    * [174842] Ignore the close event if the reimplementation of reject()
+      doesn't close the dialog.
+
+- QDialogButtonBox
+    * [191642] Don't steal the default button if there is one already.
+    * [196352] Fixed roles of QDialogButtonBox::Abort and
+      QDialogButtonBox::Ignore.
+
+- QDir
+    * [172057] Fixed bug when sorting directories containing files larger
+      than 2GB.
+    * [177904] Fixed a problem with QDir::tempPath() and QDir::homePath()
+      returning trailing slashes inconsistently. Now it returns the
+      absolute path name, without the trailing slash.
+
+- QDirModel
+    * [176323] Fixed display of files moved by drag and drop (on a QTreeView).
+    * [196768] Fixed sorting.
+
+- QDockWidget
+    * [171661] Fixed setTitlebarWidget(0) to reset the native decoration.
+    * [169808] SizeHint is now taken into account.
+    * [188583] Fixed a bug making dockLocationChanged signal not always
+      emitted.
+    * [193613] Highlighted splitters between QDockWidgets, now go back to
+      inactive state when the cursor have passed over it.
+
+- QDoubleSpinBox
+    * [164696] QWidget::locale() is now used for all string-to-number
+      conversions.
+
+- QErrorMessage
+    * [189429] Fixed "do not show again" with rich text message.
+
+- QEvent
+    * [37536] Add QEvent:registerEventType() for obtaining a unique
+      event type ID.
+    * [161940] Fix QContextMenuEvent::modifiers() on X11 and Qt for Embedded
+      Linux to behave like the Windows and Mac OS X. Previously, this
+    * [166605] A drop event's drop action is now initialized to the drag
+      manager's current default action.
+
+- QFile
+    * [107448] Fixed bug where QFile::write() would fail to report an error
+      on disk full.
+    * Added map() and unmap() to map files into memory.
+
+- QFileDialog
+    * [71645] Added a property to hide filter details.
+    * [174510] Ensured that when multiple files are selected, all of them
+      will be deleted, not just the current one.
+    * [172254] selectFile should also set the current directory.
+    * [185930] getExistingDirectory directory file not updated after
+      renaming the new directory.
+    * [164591] Provided a way to set the QDir::filter on the model.
+    * [180459] Native OS X file dialog forgets last visited directory.
+    * [184508] Improved speed when showing a lot of files.
+    * [184508] Improved launch speed.
+
+- QFont
+    * Add Capitalize font-capitalization feature including small caps.
+    * [191756] Do not crash when font config finds no fonts on the system.
+    * [145015] Don't replace '-' characters in font names anymore.
+    * Fixed a bug where glyphs sometimes showed up in italic for a non italic
+      font (X11/Embedded Linux only).
+    * Fixed a bug where xHeight() sometimes returned a wrong number
+      (X11/Embedded Linux only).
+    * Added support for word- and letter-spacing.
+
+- QFontComboBox
+    * Fixed a bug where font name would not be displayed in some cases.
+
+- QFontMetrics
+    * [179946] Fixed averageCharWidth() to change return value after adding
+      text to a QPainterPath.
+
+- QFSFileEngine
+    * [200220] Fixed a potential crash and removed some potential resource
+      leaks.
+    * [190377] Fixed a reentrancy bug on all platforms; querying the canonical
+      path no longer relies on chdir() and realpath().
+    * [155284] Fixed uninitialized memory problem when calling realpath()
+      with an empty name on Solaris.
+
+- QGL
+    * [137573] Fixed drawing of images/pixmaps larger than the maximum texture
+      size in the OpenGL paint engine.
+    * [175853] Added new drawTexture member functions for convenient drawing
+      of textures in QGLWidget, QGLContext, QGLFramebufferObject, and
+      QGLPixelBuffer.
+    * [187954] Fixed an issue with missing corner pixels when drawing
+      rectangles in the OpenGL paint engine.
+
+- QGLContext
+    * [184996] Made isSharing() return something useful after a QGLWidget has
+      been reparented under Windows.
+
+- QGLPixelBuffer
+    * [195317] Make QGLPixelBuffer::hasOpenGLPbuffers() preserve the current
+      GL context when called.
+
+- QGLWidget
+    * [128157] QPixmap::grabWidget() now works on a QGLWidget.
+    * Added support for syncing drawing to QGLWidgets under X11 via the
+      QGLFormat::setSwapInterval() mechanism. This requires the
+      GLX_SGI_video_sync extension to be present.
+    * [183472] Made renderText() respect the currently set GL scissor box
+      and GL viewport.
+    * [182849] Fixed a crash on the Mac when renderPixmap() was called on a
+      multisampled GL context.
+    * [176618] Don't require depth testing to be enabled for the 3D version
+      of renderText() to work.
+
+- QGradient
+    * [178299] Fixed an issue where calling setColorAt twice with the same
+      position would not replace the existing color at that position.
+
+- QGraphicsItem
+    * [161160] Speedup when removing children from an item.
+    * [158799] QGraphicsItem now returns a different scene from 
+      itemChange(ItemSceneChange).
+    * [127051] Added support for item caching in local and device
+      coordinates.
+    * [183996] Fixed a bug caused when items are moved by pressing many mouse
+      buttons at the same time.
+    * [192983] Added QGraphicsItem::boundingRegion(), which allows updating
+      items based on their shape instead of their bounding rect.
+    * Improved QGraphicsItem::isObscured() and QGraphicsItem::opaqueArea()
+      speed and accuracy.
+    * [195916] Fixed crash when deleting an item as it receives a
+      contextMenuEvent().
+    * [202476] DeviceCoordinateCache now works with perspective
+      transformations.
+    * [202718] DeviceCoordinateCache performance improved greatly when
+      the cached item does minimal updates.
+    * [202689] Scrolling works (but is slow) for cached items.
+
+- QGraphicsItemAnimation
+    * [164587] QGraphicsItemAnimation::reset() has been marked as obsolete.
+
+- QGraphicsLineItem
+    * [177918] Lines with the same start and end point are now valid, and
+      rendered as a point.
+
+- QGraphicsScene
+    * [160463] QGraphicsScene::clearSelection() is now a slot.
+    * [161284] Added Q_DISABLE_COPY.
+    * [163854] QGraphicsScene no longer sends events to a disabled mouse
+    grabber item.
+    * [176902] Add support for context menu event propagation.
+    * [176178] QGraphicsScene::sceneRect() now auto-updates also with NoIndex
+      set.
+    * [186398] Added a fast QGraphicsScene::clear(), and massive speed-up in
+      recursive scene destruction.
+    * [180663] Fixed miscalculated expose rects in QGraphicsScene::render().
+    * [176124] Ensure that all mouse events that should have a widget assigned
+      do have a widget assigned.
+    * [174238] The selectionChanged() signal is no longer emitted twice when
+      replacing one selection with another.
+    * [160653] selectionChanged is now emitted when reselecting an already
+    selected item.
+    * QGraphicsScene::mouseMoveEvent now receives all mouse move events from
+    the views, and translates them into hover events for the items. This
+    allows you to track all mouse move events for the entire scene, without
+    having to reimplement QGraphicsScene::event() and duplicating the
+    QGraphicsScene implementation.
+
+- QGraphicsSceneHoverEvent
+    * [151155] Added support for keyboard modifiers.
+    * [157222] Added support for lastPos, lastScenePos, and lastScreenPos.
+
+- QGraphicsSceneWheelEvent
+
+- QGraphicsSvgItem
+    * [171131] Fixed painting error caused by using obsolete pixmap cache
+      entry.
+
+- QGraphicsView
+    * [152477] Fix to QGraphicsView's scroll bar range calculation.
+    * [161284] Added Q_DISABLE_COPY.
+    * [164025] Mouse press events now propagate through the view if ignored
+      by the scene.
+    * New ViewportUpdateMode: QGraphicsView::BoundingRectViewportUpdate
+    * [180429] Mouse release events propagate properly in RubberBandDrag
+      mode.
+    * [176902] Add support for context menu event propagation.
+    * [180663] Fixed miscalculated expose rects in QGraphicsView::render().
+    * [187791] QGraphicsView::setScene() now always updates the view
+      properly.
+    * [186827] Fixed an infinite loop caused by mouse replay after deleting
+      items in response to receiving mouse move events.
+    * [172231] Fixed erroneous clipping of untransformable items by scaled
+      graphics view.
+    * Fixed redraw bugs in QGraphicsView background rendering when using an
+      OpenGL viewport.
+
+- QGridLayout
+    * [121549] Added itemAtPosition(int, int).
+
+- QGroupBox
+    * [159480] QGroupBox's clicked() behavior is now the same as QCheckBox.
+    * [186297] Right-clicking a checkable group box now has no effect, which
+      is consistent with the behavior of QCheckBox.
+    * [178797] A checkable group box now correctly updates the sunken state
+      of its check box.
+    * Don't call updateGeometry() needlessly from resizeEvent().
+
+- QHash
+    * [171909] Don't rehash in operator[] and insert() when the key already
+      exists -- to avoid subtle bugs when iterating on a QHash. (This is
+      documented as being undefined, since these functions are non-const,
+      but it's easy to avoid the rehashing.)
+
+- QHeaderView
+    * [173773] QHeaderView now updates properly upon sorting a column.
+    * [192884] When the model emits layout changed unhide old hidden rows
+      and hide new hidden rows.
+    * [170935] QHeaderView now updates properly when swapping columns.
+    * [157081] Made headerviews semi-transparent while dragged.
+    * [148198] Optimize hiding sections when the resize mode is ResizeToContents.
+    * [168128] Fixed problem where the last section was resized when the last two sections are swapped.
+    * [168209] Update the header section when the font size changes.
+
+- QHostInfo
+    * [194539] Fixed the ordering of IP addresses returned by the
+      host-lookup procedures. Qt respects the order supplied by the
+      system libraries.
+    * [176527] Fixed a problem in QHostInfo that would cause it to
+      print warnings if it was used before QCoreApplication is created
+
+- QHttpHeaders
+    * [104648] Fixed QHttpHeaders to not change the order or
+      capitalisation of headers received or sent. QHttpHeaders is now
+      case-insensitive but case-preserving
+
+- QHttp
+    * [181506] Fixed a bug that would cause QHttp to emit a warning
+      from QIODevice when connecting to some servers.
+    * [190605] Fixed a memory leak.
+    * [175357] Fixed a deadlock when trying to parse an empty HTTP
+      reply which did not contain Content-Length: 0 (such as those
+      found in 304 replies)
+    * [170860] Fixed a problem which would make QHttp emit the done()
+      signal too soon (before it was finished).
+
+- QIcon
+    * [168488] Reduce memory usage if you call addPixmap severals times with the same arguments.
+
+- QImage
+    * [176566] Fixed problem in scale() which would cause downscaled images to
+      become darker due to precision loss in the image scaling.
+    * [181265] Fixed crash in scale() when downscaling very large images.
+    * Added new image formats: QImage::Format_ARGB8565_Premultiplied,
+      QImage::Format_RGB666, QImage::Format_ARGB6666_Premultiplied,
+      QImage::Format_RGB555, QImage::Format_ARGB8555_Premultiplied,
+      QImage::Format_RGB444, QImage::Format_ARGB4444_Premultiplied,
+      and QImage::Format_RGB888.
+    * Added support for the ICO image format (from Qt Solutions)
+    * Fix drawing of text into a QImage on the Mac so that the native
+      CoreGraphics engine is used. This makes aliased text, or text with
+      a small point size, look much better.
+    * [188102] For Indexed image, fixed setColor() to expand the
+      colortable if necessary. Made colortable manipulation more robust.
+
+- QImageReader
+
+- QImageWriter
+
+- QInputDialog
+
+- QIntValidator
+    * [179131] Reverted QIntValidator's out-of-range semantics to Qt 4.2
+      behavior, at popular demand.
+
+- QItemDelegate
+    * [175982] Escape did not close the editor if the application had registered
+      escape as a shortcut.
+    * [177039] Handle double precision properly.
+    * Don't finish editing if the validator is still in intermediate mode.
+
+- QItemSelectionModel
+    * [169285] Items are now deselected properly.
+    * [192147] Fix an off-by-one bug in QItemSelectionModel
+
+- QLabel
+
+- QLayout
+    * Cache sizeHint() and minimumSizeHint() of widgets in a layout using
+      the internal class QWidgetItemV2, leading to significant performance
+      gains for widgets that have an expensive size hint implementation.
+
+- QLibrary
+    * [155884] Fixed QPluginLoader to not load plugins with unresolved symbols.
+    * [170013] Make sure that libraries are opened with RTLD_LOCAL by default
+      on *all* platforms.  (On Mac it was RTLD_GLOBAL by default). This should
+      make plugin loading more consistent.
+    * [190831] Fixed crash when calling loadHints on a default constructed
+      QLibrary.
+    * [155109] The real error message was discarded if the library existed,
+      but failed for another reason.
+
+- QLineF
+    * [170170] Introduce new member function angleTo() which returns the angle
+      between two lines, also taking the direction into account.
+    * [174122] Added new member functions in QLineF for setting and getting
+      the angle of the line, as well as translating a line, and constructing
+      a line from polar coordinates.
+
+- QLineEdit
+    * [151414] Add protected function to access the cursor rectangle.
+    * [153563] Don't show blinking cursor on read only line edit with input mask
+    * [174640] Emit editingFinished() when the user open a menu.
+    * [178752] Reverted to Qt3's behavior of using an arrow cursor instead of
+      a beam cursor when the QLineEdit is read only.
+    * [180999] Old selection now cleared upon activating a window.
+    * [188877] Fixed painting error resulting from pasting into a selection.
+
+- QLinkedList
+    * Add QLinkedList::removeOne(), which removes the first occurrence of a
+    value from the list.
+
+- QList
+    * Add QList::removeOne(), which removes the first occurrence of a value
+    from the list.
+
+- QListView
+    * [158122] Wordwrap in ListMode
+    * [177028] Make sure that the scrollbars is automatically removed when the
+      model has less than two items.
+    * [186050] Make sure the content size is updated when moving item.
+    * [182816] Combine wordwrap and text eliding.
+
+- QListWidget
+   * [199503] Fixed a crash when calling clear inside a slot connected to
+              currentItemChanged.
+   * [159792, 184946] Keyboard navigation fixed with non uniform item sizes.
+    * [255512] Add function to allow setting the current item without selecting it.
+
+- QLocale
+    * [161049] Fixed a couple of static memory leaks in QLocale.
+    * Added the following functions to QLocale:
+        QString toString(const QDateTime &dateTime, FormatType format = LongFormat) const;
+        QString toString(const QDateTime &dateTime, const QString &format) const;
+        QString dateTimeFormat(FormatType format = LongFormat) const;
+    * Added the following enum values to QLocale::QueryType:
+        DateTimeFormatLong
+        DateTimeFormatShort
+        DateTimeToStringLong
+        DateTimeToStringShort
+
+- QMacStyle
+    * [142746] Now respects the QComboBox::iconSize property.
+    * [184566] Make sure we pick up changes to QPushButton::setDefault().
+    * [174284] Don't truncate text on tabs in the small and mini size.
+    * [170971] Don't try to draw a mini scrollbar as it doesn't exist, draw a small one instead.
+    * [170977] Correct checkmarks for small and mini non-editable comboboxes.
+    * [170978] Prevent mini push buttons from being clipped.
+    * [202959] Draw the correct number of tickmarks for sliders.
+
+- QMainWindow
+   * [178510] Context menu is not shown if all toggle view actions are invisible.
+   * [195945] Fixed resizing of QDockWidgets in QMainWindow without using any
+              central widget.
+   * [196569] Don't override the cursor set by the user with setCursor when hovering dock widgets.
+
+- QMdiArea
+    * [155815] Fixed a bug causing sub-windows to overlap when tiling them.
+    * [148183] Added support activation order.
+    * [153175] Added support for tabbed workspace.
+    * [182852] Don't overwrite mainwindow title.
+    * [189758] Fixed a bug causing sub-windows to be squeezed when tiling them.
+    * [202657] Fixed focus issue on dockwidget when activating the main window.
+
+- QMdiSubWindow
+    * [198638] Fixed so that minimumSize() and minimumSizeHint() was respected (it was
+               possible to resize the window to a smaller size earlier).
+    * [171207] Added tooltips for the buttons in the title bar.
+    * [169874, 47106] Added support for switching between sub-windows using Ctrl-Tab.
+    * [169734] Added an access function to QMdiArea.
+    * [192794] Fixed a bug causing installed event filters to be removed after maximizing a sub-window.
+
+- QMenu
+    * [165457] Fixed torn-off QMenus to have the correct stacking order.
+    * [167894] Fixed focus management when activating an action from the keyboard.
+    * [167954] Increased the size of the tear-off handle.
+    * [172423] Mac OS X: Improved the visual appearance (flash selected item and fade away when hiding the menu).
+    * [183777] Fixed a bug with tear off menu making impossible to tear some menu off.
+
+- QMenuBar
+    * [193355] Fied bug with action plugged in menu which did not return to their normal state
+      after being clicked
+    * [194677] Fixed a bug causing the corner widgets to be laid out incorrectly when adding them right
+      before the menu bar was shown.
+
+- QMessageBox
+    * [176281] By default, if there is exactly one button with the RejectRole or
+      MessageBox::NoRole, it is now made the escape button.
+    * [181688] Better look with setInformativeText.
+
+- QMetaObject
+    * [197741] Fixed a memory leak in QMetaObject::invokeMethod() when
+      called with unregistered data types.
+    * [171723] Support for 'unsigned' type in the meta-object system.
+
+- QMetaType
+   * [179191] Added QMetaType::unregisterType() for unregistering a metatype.
+
+- QMimeData
+   * Added a removeFormat() method.
+
+- QMngHandler
+    * [155269] QMngHandler now initializes image backgrounds properly.
+
+- QModelIndex
+    * [176068] optimize QModelIndex operator<
+
+- QMotifStyle
+    * [185649] Fixed incorrect positioning of itemview frames in reverse mode.
+
+- QMutex
+    * [151077] Optimized QMutex locking path to be comparable to Win32
+      CRITICAL_SECTIONs.
+    * [186088] Clarify documentation of lock() and tryLock() to be
+      more explicit about the behavior of these functions in recursive
+      vs. non-recursive mode.
+
+- QNetworkInterface
+
+- QNetworkProxy
+
+- QObject
+    * [144976] Fix QObject::property() to return a QVariant that can be
+      converted to an enum if the enum is known to QMetaType.
+    * [171612] Fix QObject::removeEventFilter() to work as documented.
+    * [172061] convert() now return false if the result is invalid for date types.
+    * [184003] Fix a crash in QObject::queryList() when called from an
+      object's destructor.
+    * [173218] Document deleteLater()'s behavior when called before
+      QCoreApplication::exec().
+
+- QOpenGLPaintEngine
+    * [183995] Reset the GL_TEXTURE_ENV attribute and pixel transfer modes to the
+      default values when QPainter::begin() is called.
+    * [174273] Fixed the annoying "Unable to compile fragment programs" problem
+      by adding a GL program cache, and compiling the programs on demand.
+
+- QPainter
+    * [121105] Added drawEllipse overload that takes a center point and two
+      radii.
+    * [124248] Fixed some rounding issues causing inconsistencies between
+      text and line drawing.
+    * [142470] Fixed performance issue with non-cleartype text drawing on
+      Windows when doing several calls to QPainter::drawText().
+    * [142514] Fixed bug in X11 paint engine where a pixmap drawn
+      at non-integer coordinates would be drawn at different offsets depending
+      on whether opacity was set or not.
+    * [156787] Fixed problem with SmoothPixmapTransform and source rects in
+      drawImage and drawPixmap which would cause color bleeding from pixels
+      outside the source rect at the image borders.
+    * [156964] Improved accuracy of arc drawing, ensuring that arcs drawn
+      with same control rect but different sweeps are still coinciding.
+    * [162153] Fixed bug caused by integer overflow in QPainter::boundingBox
+      when passing a very large rectangle.
+    * [163605] Introduced new drawRoundedRect API with support for absolute
+      coordinates for the corner radii.
+    * [166702] Fixed some potential floating point exceptions in raster
+      paint engine line drawing.
+    * [167890] Prevent crash when drawing zero-length lines; these are now
+      drawn as points.
+    * [169711] Ensured that calling setClipRect with negative width/height
+      is treated as an empty clip region.
+    * [170208, 170213] Fixed some bugs with dashed line drawing and dash
+      dash offsets in the mac paint engine.
+    * [175912, 176386, 194360] Fixed some precision issues with projective
+      transformed pixmaps and images.
+    * [179507] Ensure that the final stop color is always used beyond the
+      radius when using a QRadialGradient.
+    * [180245] Fixed bug which caused setOpacity to be ignored when drawing
+      transformed RGB32 images.
+    * [182658] Fixed a problem with drawPoint in X11 paint engine which would
+      cause a one-pixel point to sometimes be drawn as two pixels.
+    * [184746] Fixed performance regression in drawEllipse() with raster paint
+      engine.
+    * [188012] Fixed stroking of empty rectangles in X11 paint engine.
+    * [190336] Fixed text drawing performance issue on Windows when using
+      setPixelSize to draw large fonts.
+    * [190394] setOpacity() now correctly paints transparent regions when
+      outputting to PDF.
+    * [190634] Fixed bug where drawLine would fill part of the paint device
+      instead of just drawing a line.
+    * [190733] Fixed some precision problems with miter joins and curve
+      segments which could cause ugly painting artifacts.
+    * [191531] Fixed a bug with alpha or pattern brush drawing to mono images.
+    * [191761] Fixed rendering of transformed ObjectBoundingMode gradients.
+    * [199234] Fixed a bug causing fillRect with a gradient fill to not work
+      with ObjectBoundingMode gradients in the raster paint engine.
+    * Introduced a new rasterizer for aliased drawing to address performance
+      and precision issues in the existing rasterizer.
+    * Remove warnings emitted when setting Source or SourceOver composition
+      modes on certain paint devices.
+    * [192820] Fix drawImage()/drawPixmap() with a source rect parameter outside
+      of the range of the source image dimensions.
+    * [183745] Fixed setting font point sizes < .5, would in some cases cause
+      the font size to default back to 12 points.
+    * [157547] Fixed inconsistent pen styles for DashLine, DotLine, DashDotLine
+      and DashDotDotLine across Win/Linux.
+    * [143526] Fixed a problem with drawing text or shapes that were drawn
+      with a very large scale factor. Typically you would get a crash after
+      memory was exhausted.
+    * [186070] Fixed potential integer overflow when drawing texture or pattern
+      brushes with a transform that has a small scale.
+    * [200616] Fixed bug causing transformed cosmetic pens with width > 0 and a
+      dash pattern to be partially or completely clipped (raster engine).
+    * [206050] Fixed QImage::scale with a SmoothTransformation to handle alpha
+      channel correctly when scaling.
+
+
+- QPainterPath
+    * [121105] Added addEllipse overload that takes a center point and two
+      radii.
+    * [181774] Remove assert that could occur when calling pointAtPercent()
+      with parameters close to 0 or 1.
+    * [189695] Fixed bug relating to 360-degree arcs and winding fill.
+    * [187779, 187780] Fixed some bugs in intersects() and contains() when
+      dealing with paths with multiple subpaths.
+    * [191706] Fixed intersects(QRectF) for paths that represent vertical or
+      horizontal lines.
+    * [193367] Introduced simplified() to simplify paths with multiple
+      subpaths and/or self-intersections.
+    * [206160] Modify QPainterPath::operator== to do point comparisons with
+      an epsilon relative to the painter path's bounding rect size.
+
+- QPainterPathStroker
+    * [174436] Fixed some bugs relating to dash offsets and dashing of
+      paths with multiple subpaths.
+
+- QPalette
+    * [170106] Added QPalette::ToolTipBase and QPalette::ToolTipText.
+
+- QPicture
+
+- QPixmap
+    * [164116] QPixmap::x11Info() didn't report the correct depth when
+      the pixmap depth and the desktop depth was different.
+
+- QPixmapCache
+
+- QPlastiqueStyle
+    * More native appearance of button, combobox, spinbox and slider.
+
+- QPolygon
+    * [163219] Added missing datastream operators to QPolygon.
+
+- QPrintDialog
+    * [182255] Don't ask whice to overwrite axisting file.
+    * [183028] Changed to default for maxPage() to INT_MAX.
+
+
+- QPrinter
+    * PDF engine now supports hyperlinks.
+    * [180313] Fixed a bug where QPrinter could not be used more than once
+      per instantiation.
+    * [121907] Change begin() to properly return 'false' when the file we
+      want to write to can not be written to.
+    * [189604] Make the pdf printer capable of having a different page size
+      and orientation for each page.
+    * [99441] Add setPaperSize(const QSizeF &paperSize, Unit unit).
+    * [182245] Make pageRect() return consistent values across
+      Mac/Win/Linux when fullPage() is set, and fix an off by one error in
+      the width()/height() functions on the Mac.
+    * [156508] PS/PDF generators: Correctly generate grayscale output when
+      requested.
+
+- QPrintEngine
+    * [193986] Fixed the Trolltech copyright date on PDF files
+
+- QProcess
+    * [162522] QProcess now emits stateChanged() consistently for all state
+      changes.
+    * [153565] Add define to make it compile with QNX RTOS.
+    * [196323] Try to unregister SIGCHLD while Qt is unloaded.
+
+- QProgressBar
+    * [189512] sizeHint() doesn't depends anymore on PM_ProgressBarChunkWidth
+
+- QProgressDialog
+    * [190318] Use the size of the label if setMinimumSize() and setLabel()
+      are called.
+    * [198202] Wixed crash when calling setLabel(0).
+
+- QPushButton
+
+- QReadWriteLock
+    * [131880, 170085] Add support for recursive read-lock
+      support. See the not below in the Important Behavior Changes
+      section.
+
+- QRect
+    * Fixed a bug in normalized() when width() == 0 and height() < 0
+      or vice versa.
+
+- QRectF
+
+- QRegion
+    * Added numRects() which returns the number of rectangles in the region.
+    * [193612] Various optimizations for regions consisting of only one
+      rectangle.
+
+- QResource
+
+- QScriptEngine
+    * [200225] Made uncaughtExceptionBacktrace() return a correct backtrace
+      in the case where the value thrown is not an Error object.
+    * [202454] Made QScriptContext::isCalledAsConstructor() return the right
+      result for constructors registered with newQMetaObject().
+    * [198166] Made canEvaluate() handle C-style comments correctly.
+    * [202606] Made it possible to invoke slots with const QObject* arguments.
+    * [200599] Removed the need to register the metatype-id of QObject-derived types
+               before they can be used as arguments to slots where the type occurs
+               in the signature.
+    * [185580] Fixed a bug with automatic semi-colon insertion that caused the
+               prefix ++ operator to behave incorrectly.
+    * [190991] Implemented iteration for arguments objects.
+    * [175697] Made conditional function declarations have the same semantics as in
+               other popular ECMAScript implementations.
+    * [176020] Fixed a crash that occurred when the left-hand side of an assignment
+               was an object literal.
+    * [176020] Fixed a crash that occurred when an if-statement inside a function
+               contained a return statement in the false-branch but not in the
+               true-branch, and the function didn't contain any more statements.
+    * [182578] Fixed a bug that caused automatic QList<int>-to-QScriptValue
+               conversion to fail.
+    * [163318] Added abortEvaluation() function.
+    * [167711] Added qScriptConnect() and qScriptDisconnect() functions, so that
+               a signal can be connected to a script function from C++.
+
+- QScrollArea
+    * Fixed an issue with child widgets with heightForWidth sizing behavior.
+
+- QScrollBar
+    * [178919] Fixed a bug where the slider kept moving after the mouse button was released.
+
+- QSemaphore
+
+- QSettings
+    * [199061] Don't use more permissions than we have to, when opening the registry.
+    * [142457] Preserve the order of keys in .ini files when regenerating them.
+    * [186232] Unix and Mac OS X: OR the needed permissions flags with the
+      default flags (instead of overriding them).
+    * [184754] Hande out-of-disk-space condition more smoothly, by keeping the
+      old .ini/.conf file if possible (instead of trashing it).
+    * [189589] Don't create empty directories when accessing QSettings read-only.
+    * [182712] Added QSettings::setDefaultFormat(), defaultFormat(), and
+      format() to give more control over the format of QSettings objects
+      created using the default constructor.
+    * [183068] Added QSettings::scope(), applicationName(), and
+      organizationName() for retrieving the values passed to the constructor.
+
+- QShortcut
+    * [141646] Add ShortcutContext::WidgetWithChildrenShortcut context, for shortcuts
+      which are valid for a widget and all it's children.
+- QSize
+    * [172712] Fixed bug in QSize::scale() when passing INT_MAX as height and
+      KeepAspectRatio as mode.
+    * [191533] Fixed bug in QSize::scale() where scaling a size with zero
+      width or height would cause a division by zero.
+
+- QSizeGrip
+    * [193199] Made the size grip always respect height-for-width on all
+      platforms.
+    * [161173] Fixed a bug causing the size grip to be visible when it shouldn't be.
+    * [184528] Windows: Fixed a bug causing a mouse press event not to be sent.
+    * [193350] Fixed a bug with QVBoxLayout.
+
+- QSlider
+    * [180474] Fixed regression causing a tick mark not to be shown at the max value for
+      certain common cases.
+
+- QSocketNotifier
+
+- QSortFilterProxyModel
+    * [162503] Call mapToSource when mapping from proxy to source indexes.
+    * [146684] Allow the original order of the source model to be restored.
+    * [199518] Don't assert if the source model emits unbalanced change signals.
+    * [202908] dropMimeData incorrectly maps when row is rowCount(parent).
+
+- QSpinBox
+    * [157520] Adopt the special value text when the value is explicitly set to the
+      minimum value with the keyboard
+    * [164696] QWidget::locale() is now used for all string-to-number conversions.
+
+- QSplashScreen
+
+- QSplitter
+    * [169702] Respect the minimum size of widgets.
+    * [187373] Ensure that widgets are properly initialized before being added to a QSplitter.
+
+- QSql
+
+- QSqlDatabase
+    * [129992] Make it possible to retrieve the connection name from a connection.
+      Use the connectionName() function.
+
+    * [143878] Give a warning if there is no QCoreApplication instance (required
+      when using a plug-in driver).
+
+- QSqlDriver
+    * [141269] Add support for asynchronous database event notifications.
+
+- QSqlQuery
+    * [157397] Set an error if QSqlQuery is used with an invalid database
+      connection.
+
+    * [122336] Support queries returning multiple result sets. Use the
+      nextResult() function.
+
+    * [149743] Fixed bug where seek() to a record which was not the next one
+      returned true, but the data could not be retrieved.
+
+    * [186812] Improved error handling for exec().
+
+- QSqlQueryModel
+
+- QSqlRelationalTableModel
+
+- QSqlTableModel
+    * [160135] Emit headerDataChanged when removing rows when using the
+      OnManualSubmit edit strategy.
+
+- QSslCertificate
+    * [186791] Fixed wildcard support in QSslCertificate::fromPath().
+
+- QSslCipher
+- QSslError
+- QSslKey
+
+- QSslSocket
+    * [190133] Fixed security hole in certificate verification.
+    * [186077] Fixed bug in ASN1 time parsing.
+    * [177375] Added support for peer verification.
+    * [191705] Fixed crash on remote disconnect.
+    * [177285, 170458] Enabled run-time resolving of OpenSSL libs also in
+      static Qt builds. Enabled by default, with configure option to force
+      (static) linkage.
+
+- QStackedLayout
+- QStackedWidget
+    * [124966] Honor QSizePolicy::Ignored in pages like we did in Qt 3.
+
+- QStandardItemModel
+    * Improved general performance
+    * [133449] Improved setData() performance
+
+- QStatusBar
+    * [194017] Ensure that explicitly hidden Widget in the status bar stay invisible.
+
+- QString
+    * [202871] QString::sprintf() crashed with size_t format.
+    * [193684] Optimized common case in QString::replace(int, int, QString).
+    * [190186] Handle multiple-digit %n args in QString::arg(QString,
+      QString, ...) gracefully.
+
+- QStringListModel
+    * [158908] Add MoveAction to the default supportedDropActions
+    * [180184] sort() was not updating the persistant model index's
+
+- QStyle
+    * [127923] All implementations of QStyle::subControlRect() now respect QStyleOption::rect for
+      spin boxes.
+    * Added SH_SpinBox_ClickAutoRepeatThreshold which used to be hardcoded in QAbstractSpinBox
+
+- QStyleOption
+
+- QSvg
+    * [185844] Fixed parsing of the gradientUnits attribute to support
+      objectBoundingBox for gradients.
+    * [161275] Fixed parsing of repeatCount attribute for animateColor
+      and animateTransform tags.
+    * [176835] Fixed a memory leak in QSvgGenerator.
+    * [182196] Fixed problem in QSvgGenerator which would cause gradient
+      fills to be stored as images instead of using native SVG gradients.
+    * [187994] Always encode generated SVGs in UTF-8, and specify that
+      in the xml tag.
+    * [188847] Fixed a crash when an SVG file contains empty url keywords.
+    * [190936] Ensure properly sized viewport and viewbox, even when
+      the paint device does not have a size (such as QPicture).
+    * [191353, 192220] Fixed a couple of floating point exceptions occuring
+      when rendering certain SVGs containing curved paths.
+    * Added correct default attribute values for SVG gradients.
+
+- QSyntaxHighligher
+
+- QSystemTrayIcon
+
+- QTabBar
+    * [182473] Fixed a bug causing the tabs to stay unchanged after calling setElideMode().
+
+- QTableView
+    * [192919] Drag-selection from QTableView now respects single-selection mode.
+    * [172201] Painting errors when there are multiple regions that overlap that need to be painted.
+    * [148565] setSpan() and other spanning operations is slow when there are a lot of spans.
+    * [186431] Fix bug in wrapping to the next/previous line while doing cursor navigation.
+    * [189251] corner widget is hidden with header, but not unhidden
+    * [196532] Fixed bad repaint with hidden header and scrollPerItem.
+    * [158258] Add clearSpanns() function.
+
+- QTableWidget
+    * [255512] Add function to allow setting the current item without selecting it.
+
+- QTabWidget
+    * [159433] Emit currentChanged() when the first tab is created.
+    * [171464] QTabWidget::minimumSizeHint() now respects the orientation.
+    * [188357] Fixed a bug causing the corner widget to be displayed incorrectly.
+
+- QtAlgorithms
+    * [304394] qBinaryFind() can potentially end up in an infinite loop with large collections
+
+- QTcpSocket
+    * [149200] Fixed crash when using QTcpSocket without constructing
+      Q(Core)Application.
+
+- QTemporaryFile
+    * [192890] Fixed resize bug on Windows.
+    * [194130] Fixed creation of temp files in toplevel directories on
+      Windows.
+
+- QTextBrowser
+    * [166040] Detects the right format when calling setText() severals times.
+    * [177036] Fix handling of encoded urls.
+    * [169621] Fixes clearHistory() removes all history items except the first,
+      while it should keep the last entry.
+    * [176042] Fix selectAll to sometimes show focus frames instead of selected
+      text.
+
+- QTextCodec
+    * [169065] Make calling QTextCodec::setCodecForLocale() with NULL
+      reset codecForLocale() to the default, instead of causing a crash.
+    * [167709] Improved support for cp932 codec.
+    * [185085] Make sure every codec has a unique mibEnum
+    * Added UTF-32 codecs
+
+- QTextCursor
+    * [179634] Fixes loosing of x position when using vertical navigation
+      in a not yet fully layed out document.
+    * [178499] Add functionality to interpolate inside the glyph size if it
+      takes multiple characters to decide on the position.
+    * [182914] '/' is now considered a word separator.
+    * Faster QTextCursor::blockNumber().
+
+- QTextDecoder
+
+- QTextDocument
+    * [135133] Add proper support for the background attribute of HTML
+      tags, which enables specifying background images.
+    * [148847] Add support for padding-left, padding-right, padding-top,
+      and padding-bottom for table cells in the HTML import.
+    * [169724] Added API for changing the indent width in a QTextDocument.
+    * [173258] Fixed bug in text layout of tables with row spans and
+      empty cells.
+    * [174405] Added support for the border-width css property in the HTML
+      import.
+    * [176162] Fixed bug in HTML import which would cause block properties
+      of empty paragraphs to be transfered to following paragraphs.
+    * [179330] Fixed performance problem when a maximum block count is reached
+      which caused the whole document to be relayouted.
+    * Numerous fixes in the import of malformed HTML.
+    * QTextDocument::print() now preserves formats set by a syntax highlighter.
+    * Added QTextDocument::firstBlock() and lastBlock() for convenient iteration
+    * Added QTextDocument::undoCommandAdded() signal.
+    * [189691] Fixed bug in HTML image tags showing in incorrect width/height
+      when only one was provided.
+    * [193122] QTextTable::removeRows() correctly removes one row after a
+      mergeCells()
+    * [55520] Fix bi-directional text showing correctly when mixed with tabs.
+    * [170376] Fixes text layout QTextLine::setNumColumns(1) combined with
+      alignment not left
+    * [177024] Fixed bug in definition of &current; entity.
+    * [176898] QTextDocument loses UndoRedo stack when setting it on QTextEdit by
+      calling QTextEdit::setDocument()
+    * [180657] QTextDocument::documentSize() returns an incorrect width when there
+      is a long line with only spaces.
+    * [180430] Stop compression of space after an image tag.
+    * [154330] Implement Right, Justified and Center tabs and make Left tabs
+      behave as expected in all cases.
+    * [196744] Fixes colspan making a table cell multiply given user width.
+    * [197769] Fixed wrong modified state while undo/redo.
+    * Added QTextDocument::findBlockByNumber() and QTextBlock::blockNumber().
+    * Added QTextDocument::revision() and QTextBlock::setRevision()/revision().
+    * Added QTextBlock::setVisible()/visible() and QTextCursor::setVisualNavigation()/
+      visualNavigation().
+
+- QTextDocumentFragment
+
+- QTextEdit
+    * [80240] Fixed text color bug when creating a text edit with a disabled
+      parent widget that is then reenabled.
+    * [104778] Added convenience functions for getting/setting the background
+      color of text.
+    * [150562] Wrap correctly the text in a <table> when the flag
+      WrapAtWordBoundaryOrAnywhere is set.
+    * [165610] Fixed bug where a text fragment's underline would be drawn
+      too long.
+    * [166486] Fixed bug which caused the cursor to not be shown when
+      setting the cursor flash time to 0.
+    * [190852] Fixed a bug which caused the font sizes in tables to be wrong
+      in QTextEdit documents exported to HTML.
+    * Many performance improvements
+    * [190723] Fix problem where the bullet might disappear if there was an
+      extra selection selecting the word next to the bullet.
+    * [182200] Make the selectionChanged signal be emitted when pressing
+      "Ctrl+A" and there is already a selection present.
+    * [188589] Fixes regression in QTextEdit::keyReleaseEvent where it makes
+      the release events not be ignored when unused.
+    * [175825] Allow stopping auto-scrolling feature by moving the cursor
+      to a position other then the last position.
+    * [177151] Fix the "Copy Link Location" is always disabled in context
+      menus created with createStandardContextMenu()
+    * [182180] The value of cursor width desktop settings on windows is now
+      respected.
+    * [108739] Added DnD scrolling and made selection scrolling smoother.
+    * [202319] More precise QTextEdit::cursorRect().
+    * [181572] Accept Key_Up and Key_Down ShortcutOverride events.
+
+- QTextFormat
+    * Fixed bug which caused QTextCharFormat::font() to return a wrong font
+      after changing font-unrelated properties in QTextCharFormat.
+    * [181177] Fix text directionality changing.
+
+- QTextLayout
+    * Support WrapAtWordBoundaryOrAnywhere with QTextLine::setColumns.
+    * [188594] Make nextword and previous word be more synchronous by making
+      them stop at the same word boundaries.
+
+- QTextStream
+    * [178772] setCodec() take effect immediatly even on open stream.
+    * [180679] Implemented AlignAccountingStyle.
+    * Add UTF-32 autodetection
+
+- QTextTable
+
+- QtGlobal
+    * [186969] Fixed theQT_NO_WARNING_OUTPUT define to work properly.
+    * qFuzzyCompare() is now part of Qt's API and is public.
+
+- QThread
+    * QThread is no longer abstract. The default implementation of
+      QThread::run() function now calls QThread::exec().
+
+- QThreadStorage
+
+- QTimeEdit
+
+- QTimeLine
+    * Add CosineShape.
+
+- QTimer
+
+- QToolBar
+    * [159715] If the main window is to small to contains the extension, show it in a menu.
+    * [179202] Toolbars can be resized by dragging them with the mouse.
+    * [175325] Changing toolButtonStyle on floating toolbars is handled correctly.
+    * [187996] Ensure that invisible action are invisible in the toolbar.
+    * [191727] Fix layouting issue with widgets on the toolbar.
+
+- QToolBox
+
+- QToolButton
+    * [QToolButton] Emit triggered(QAction*) on the activation of the default action even if
+      triggered from the menu.
+
+- QToolTip
+    * [183679] Fixed problem of tool tip being closed when pressing certain keys.
+    * [191550] Fixed a regression causing the palette not to be updated after calling
+       QToolTip::setPalette.
+    * Added functions text() and isVisible().
+    * Fixed QToolTip::showText() with rectangle, it always created a new tip.
+
+- QTransform
+    * [178609] Fixed division by zero in QTransform::mapRect when passing an
+      invalid QRect.
+    * Fixed problem with QTransform::inverted() returning the identity matrix
+      for transforms with a low scale factor.
+
+- QTranslator
+    * [168416] Make it possible for QTranlator to open qm files generated with msgfmt.
+      (regression from Qt3)
+
+- QTreeView
+    * [41004] Deleting a directory will delete all of its children.
+    * [174627] Moving left towards a custom root index now works correctly.
+    * [154742] Add property to hide the header
+    * [166175] Improve the performance of hide() and isHidden()
+    * [166175] Improve the performance of expanded() and isExpanded()
+    * [181508] adding a row to a item that is visible and not expanded wont update the '+'
+    * [179635] Incorrect row height if column with a multi-line item is not visible when tree is first shown.
+    * [187745] When the context key is pressed first check for a micro focus, but if that isn't valid then go to the mouse cursor position.
+    * [188862] Crash if a parent index of the root index in the view is removed
+    * Improving performance by reduce the number of calls to model->parent()
+    * [167811] Improve insertion speed
+    * [192104] scrollTo(PositionAtCenter) can scroll beyond the item if item is at 0
+    * [168237] Fixed selection when using SelectItems selection behavior and ExtendedSelection selection mode.
+    * [171902] Expansion is not managed correctly when the 1st column is hidden.
+    * [130628] Add expandsOnDoubleClick property.
+    * [189956] Make scrollTo() scroll correctly when the scrollHint is PositionAtBottom.
+    * [185068] Update editor geometries when columns are moved.
+    * [120922] Mac OS X: Improved the selection behavior.
+    * [197650] Fixed spanning items in "right to left" layouts, or if the first column is
+      moved in another position.
+    * [204726] Don't assert when sorting an unchanged tree.
+    * [185994] Introduce a style hint that describes how the view should treat empty areas.
+
+- QTreeWidget
+    * [172685] When setting flags don't do anything if the new flag is the same as the old.
+    * [162736] Fixed potential slowness in QTreeWidget::isItemSelected()
+    * [167811] Improve insertion speed
+    * [255512] Add funtion to allow setting the current item without selecting it.
+    * [183566] Make rows containing widgets resize correctly.
+    * [189071] Make it possible to disable drop dirrectly on the viewport.
+    * [192840] Only paint disabled cells as disabled, not the entire row.
+    * [191329] The checkable items are now checkable even in RightToLeft mode.
+
+- QTreeWidgetItemIterator
+    * [172275] Optimize QTreeWidgetItemIterator to not query various states
+      unless the user explictly specified the corresponding flags.
+
+- QUdpSocket
+
+- QUndoStack
+   * [143285] Added API to access individual commands in the undo stack.
+
+- QUrl
+    * [162669] Fixed bug in QUrl::setAuthority() when input ends with a digit.
+    * [199967] Fixed a regression from Qt 4.4.0 Technical Preview 1
+      that caused isEmpty() to return true on non-empty URLs in some cases.
+
+- QValidator
+
+- QExplicitlySharedDataPointer
+    * A new reference counting pointer which doesn't perform copy on write.
+
+- QVariant
+    * [186447] Do not call qFatal() when QVariant::load() enconters a UserType
+      that's unknown to the meta object system.
+    * [170901] Compare values _and_ keys in QVariant::operator==() when
+      applied to maps.
+
+- QVarLengthArray
+    * [177708] Fix crash in QVarLengthArray::append() for types with a
+      non-trivial constructor (e.g., QString).
+
+- QVector
+    * [161376] Fix unitialized read reported by Valgrind in QVector<T> for
+      sizeof(T) < 4.
+
+- QWaitCondition
+    * [106086] Add support for QReadWriteLock to QWaitCondition::wait().
+
+- QWidget
+    * [323] Add the Qt::WA_ShowWithoutActivating attribute, which can
+      be used to show a window without activating it.
+    * [176809] When using the Qt::PreventContextMenu policy, the
+      context menu key should be sent to the widget (instead of
+      consuming the event).
+    * [83698] Introduce QWidget::setWindowFilePath() that allows setting a
+      proxy icon on the mac and sets the window title if the window title
+      hasn't been set previously.
+    * X11/Win: Added support for non-native child widgets.
+    * [173044] Added support for rendering widgets before they are shown.
+    * [152962] Fixed a bug causing the widget to repaint itself twice when calling show().
+    * Added a render() overload taking an arbitrary QPainter.
+    * [183466] Fixed a bug where the mouse button release event was sent to wrong widget
+      when having a mouse grabber.
+    * [177605, 171333] Windows: Fixed a bug causing painting artifacts when using the
+      Qt::WA_PaintOnScreen attribute.
+    * [141857] Fixed a bug causing painting artifacts when using the Qt::WA_OpaquePaintEvent attribute.
+    * [198794] Fixed wrong calculation of the target offset in render().
+    * [180009] Fixed order dependency of setWindowFlags() and setWindowTitle() on Windows.
+    * [155297] Avoid crash in QWidget::setLayout() if the layout already has
+      a parent.
+
+- QWidgetAction
+    * [193061] Fixed setEnabled that has no effect.
+
+- QWindowsStyle
+    * [162326] Removed a warning when rendering to small rectangles.
+
+- QWindowsXPStyle
+    * [189527] Fixed incorrect tab indentation on XP/Vista styles.
+    * [177846] Fixed setAutoRaise beeing ignored for tool buttons.
+    * [168515] Allow changing the background color of a disabled spinbox.
+    * [165124] Fixed context help button beeing ignored for QMdiSubWindows.
+
+- QWindowsVistaStyle
+    * [164016] More native menu borders on Vista.
+    * [168611] Allow progress bar animation to complete after reaching 100%.
+
+- QWizard
+    * [177022] Respect the minimum and maximum size.
+    * [189333] The (re)size behavior is now correct for Windows Me.
+    * [183550] Fixed wrong stretch factor for a wizard page in the interal layout.
+    * [166559] Honor isAcceptableInput().
+    * [170447] Make sure that the virtual QWizard::nextId() function is
+      called from QWizardPage::isFinalPage().
+
+- QWizardPage
+
+- QXmlStreamReader
+    * Added convenience function prefix() to the reader and the attributes, previously
+      we only had name() and qualifiedName().
+    * Added more DTD reporting.
+    * Added QXmlStreamEntityResolver for undeclared entities.
+    * [179320] Fixed wrongly reported premature end of document for non-recoverable errors
+    * [192810] Fixed namespace declarations in DTD attribute lists.
+    * Add UTF-32 autodetection
+
+- QXmlStreamWriter
+    * Improvements to conformance to XML 1.0
+    * Added autoFormattingIndent property to customize the auto-formatted output.
+    * [18911] Fixed auto formatting for XML comments.
+
+- QXmlStreamWriter
+    * Added autoFormatting() property which controls whether the output should be indented
+      for readability.
+
+- QXmlSimpleReader
+    * [201459] That the class is not reentrant, has been documented.
+    * Add UTF-32 autodetection
+
+- Q3ButtonGroup
+    * [198864] Fixed bug that caused Q3ButtonGroup::insert() to generate wrong
+      (typically non-unique) ids.
+
+- Q3DateEdit
+
+- Q3DockWindow
+    * [173255] When docked, relayout improved when the content is changed.
+
+- Q3FileDialog
+    * [200264] Fixed the "QObject: Do not delete object, 'unnamed',
+      during its event handler!" warning found in the 4.4.0 beta.
+
+- Q3GroupBox
+
+- Q3ImageDrag
+    * [184521] Q3ImageDrag::canDecode() will now return true for image data that can be decoded.
+
+- Q3ListView
+    * [127037] Q3ListView::paintCell() now uses the viewport's background role.
+
+- Q3MainWindow
+    * [176544] Q3MainWindow::setDockEnabled() no longer adds dock windows that are already there.
+    * [176129] Q3MainWindow::setUsesBigPixmap now works.
+
+- Q3PopupMenu
+    * [177490] Fixed regression causing activated and highlighted signals to be
+      emitted multiple times.
+
+- Q3ScrollView
+
+- Q3SqlCursor
+
+- Q3Table
+    * [171801] Fixed a graphical error in Q3CheckTableItem.
+    * [196074] Fixed a crash when using Q3Table and Q3ComboTableItem together
+      with stylesheets.
+
+- Q3TextEdit
+    * [197033] Fixed "select-and-copy" on X11
+
+- Q3Toolbar
+    * [171843] QComboBox in a Q3Toolbar was generating warnings
+
+- QSvgWidget
+    * Support for xml:space
+
+- QWhatsThis
+    [177416] Fix sizing hints when using rich-text.
+
+- Qt Style Sheets
+    * [163429] Stylesheet backgrounds now work on Mac. Note that there are
+      still issues with stylesheets on that platform.
+    * [169855] Setting a style sheet with gridline-color on QTableView now
+      works correctly.
+    * [182917] :hover no longer applies to disabled widgets.
+    * [184867] Several speedups to stylesheet parsing.
+    * [188344] Style sheets no longer reset font settings. They now
+      take precedence over manually set font settings, and will leave other
+      settings alone. The font is restored to the manual settings if
+      the style sheet is removed.
+    * [188702] Fixed a bug where QLineEdit would not react to the :focus
+      pseudo state.
+    * [190422] Fixed a bug where the width of QSpinBox subcontrols would not
+      be properly respected.
+    * [190423] Fixed a bug where gradient backgrounds were not shown correctly
+      in QComboBox.
+    * [191189] Fixed a bug where classes derived from QDialog by more than two
+      levels (QDialog -> MySubClass -> MySubSubClass) would not receive the
+      styled background.
+    * [191216] Menus with a background color will now be rendered using the
+      native style.
+    * [191822] Fixed a crash in subElementRect when widget pointer is null.
+    * [192374] An offset ::tab-bar element no longer offsets scroll buttons.
+    * [192535] Fixed a bug where a QComboBox would not always draw its
+      dropdown button when styled.
+    * [192655] Fixed a bug where it was sometimes impossible to toggle a
+      styled, checkable menu item.
+    * [199912] QHeaderView no longer collapses to zero contentsRect if size
+      is not specified.
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+- Interbase driver
+    * [185482] Fixed bug where data corruption occurred when inserting data into
+      numeric fields on some platforms.
+
+    * [156090] Fixed bug where the connection information was always assumed to
+      be Latin1 encoded.
+
+- MySQL driver
+    * [190311] Fixed bug where fetching BLOBs with a prepared query would fail
+      if the second BLOB was larger than the first.
+
+    * [184354] Implement QSqlDriver::escapeIdentifier() allowing reserved words and
+      white spaces in table and column names.
+
+    * [129925] Communicate with the database using UTF8 encoding for MySQL
+      versions >= 4.1.13 and < 5.0.0. This makes the behavior consistent with MySQL
+      versions >= 5.0.7.
+
+- OCI driver
+    * [167644] Set an error when failing to start a transaction in addition to
+      printing an error.
+
+    * [177054] Fixed bug that caused QSqlField::length() to always return 38 for
+      non-numeric fields.
+
+    * [141706] Added support for the using the hostname and port number provided by
+      QSqlDatabase. This makes it possible to connect to Oracle databases without
+      a tnsnames.ora file on the client.
+
+- ODBC driver
+    * [164680] Don't crash when updating a view displaying a model after the
+      database connection has been closed.
+
+    * [166003] Use SQLFetch() if SQLFetchScroll() isn't supported in the driver.
+
+    * [116534] Allow closing cursor without destruction of QSqlQuery object. Use
+      QSqlQuery::finish().
+
+    * [181039] Added support for a connection option to instruct the driver to
+      connect as an ODBC 3 application; SQL_OV_ODBC3. This is needed in order to
+      make the QODBC driver work with some ODBC drivers.
+
+    * [176233] Connection options are no longer case-sensitive (according to the
+      ODBC standard).
+
+    * [178532] Fixed bug where binding bools would fail.
+
+    * [176231] Support passing the username and password as part of a connection string
+      instead of using QSqlDatabase::setUserName() and QSqlDatabase::setPassword().
+
+    * [141822] Support the SQL_GUID type.
+
+    * [187936] Improved support for the Linux Easysoft ODBC driver.
+
+    * [165923] Improved error handling.
+
+- SQLite driver
+    * [174340] Bind QVariant::UInt as int64 instead of string.
+
+- PostgreSQL driver
+    * [152770] Support prepared queries natively for PostgreSQL 8.2.
+
+    * [164233] Fixed bug where QSqlDatabase::primaryIndex() would fail if the
+      table name was used in multiple schemas.
+
+    * [168934] Make a real error message available when failing to connect to a
+      database.
+
+    * [150373] Added support for NumericalPrecisionPolicy, allowing the user to
+      instruct the driver not to return NUMERICs as strings.
+
+- DB2 driver
+    * [189727] Fixed bug where fetching the fields in a row multiple time would
+      fail unless the fields were fetched in order.
+
+
+****************************************************************************
+*                             QTestLib                                     *
+****************************************************************************
+* The display is now enabled on Mac OS X just before a test in run and qtestlib will ensure
+  the application under test is the "front process" if it is a GUI application.
+
+****************************************************************************
+*                               QDBus                                      *
+****************************************************************************
+
+- Library
+    * [195515] Fixed a bug where the Qt application would crash if it
+      tried to send some types of messages after the connection to the
+      bus was broken.
+    * [188728] Fixed a freeze caused by connecting to a slot that did
+      not exist
+
+- Viewer
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+MIPS Linux
+    * [188320] Build Qt/X11 with FPU support, breaking binary
+      compatibility; see "Important Behavior Changes" below.
+
+X11
+---
+    * Improved GNOME platform detection.
+    * [193845] Improved support for KDE palette settings.
+    * [179200] Fixed an issue where Qt would print "QProcess: Destroyed
+      while process is still running." when using Cleanlooks.
+    * [155704] Fixed a bug where widgets with MSWindowsFixedSizeDialogHint
+      flag would be minimized when their parent QMainWindow was minimized.
+      The MSWindowsFixedSizeDialogHint is now ignored on X11.
+    * [153155] Make it possible to bypass g_thread_init() and have the
+      Unix event dispatcher be used in threads instead by setting the
+      QT_NO_THREADED_GLIB environment variable.
+    * [157807] Fix an inefficiency in the Glib dispatcher's
+      timerSourcePrepare() implementation.
+    * [158332] Fix a bug where text/uri-list drops from Qt 3 would
+      append a single, empty url to the uri-list.
+    * [166097] QWidget::show() no longer resets the WM_TRANSIENT_FOR
+      property if the Qt::WA_X11BybassTransientForHint attribute is
+      set.
+    * [166097] QWidget::show() no longer resets the _NET_WM_STATE
+      property. Qt now merges its own state with any previous state
+      set by the application programmer.
+    * [168285] Fixed QDrag to correctly reset the override cursor.
+    * [17566] Don't impose FD_SETSIZE limit when using the Glib event
+      dispatcher.
+    * [171513] Fixed a bug where an application would take up 100% CPU
+      after starting a QDrag.
+    * [184482] Fixed QApplication::setOverrideCursor() to not change
+      the cursor for the root window.
+    * [185048] Fixed a bug where calling QClipboard::set*()
+      immediately after QClipboard::clear() would result in the
+      clipboard staying cleared.
+    * [182840] Fixed a bug where QApplication::mouseButtons() would
+      sometimes report the wrong state.
+    * [173328] Fixed QEventLoop::exec(ExcludeUserInputEvents) to not
+      consume 100% when using the Glib event dispatcher.
+    * [179536] Make QEventLoop::X11ExcludeTimers work as expected with
+      the Glib event dispatcher.
+    * [182913] Qt will now always look for the _MOTIF_DRAG_WINDOW
+      property on screen 0 (instead of the default screen).
+    * [187752] Fixed a bug where calling show() and hide() on a window
+      before the event loop starts would prevent the window from ever
+      being shown.
+    * [189045] Reset the keyboard and mouse grabs to the current
+      grabber when the last popup is closed.
+    * [167707] Add support for all known _NET_WM_WINDOW_TYPE_* types
+      via QWidget::setAttribute(). The attributes follow the
+      Qt::WA_X11NetWmWindowType* naming scheme.
+    * [172623] Don't create a pipe in the Glib event dispatcher (as it
+      is not necessary).
+    * [192871] Fixed a regression found in the 4.4.0 snapshots that
+      broke QX11EmbedContainer.
+    * [192526] Similar to 170768 below, fixed the spin locking in the
+      QAtomic* implementation for 32-bit SPARC processors to yield
+      instead of busy waiting.
+    * [194566] Fixed a bug found in the 4.4.0 snapshots that would
+      always cause the cursor to change when QWidget::setCursor() was
+      called on a widget that was not under the mouse.
+    * [173746] Fixed a bug in QDialog that would cause the "What's
+      This?" popup menu to appear on the wrong X11 screen.
+    * [187965] Fixed a bug where moving a widget that is hidden could
+      cause the positioning to be incorrect.
+    * [160206] Fixed some bugs in QX11EmbedWidget and
+      QX11EmbedContainer to provide minimal support for multiple
+      containers and multiple embedded widgets in the same
+      application.
+    * [182898] Fixed a crash in Motif Drag-and-Drop support when the
+      _MOTIF_DRAG_WINDOW property is missing.
+    * [183477] Fixed a bug that would cause a window to disappear
+      after restoring it with QWidget::restoreGeometry().
+    * [163507] Fixed a couple of memory errors reported by valgrind.
+    * [192654] Fixed drag-and-drop of more than one URL (using the
+      text/uri-list mime type) between applications.
+    * [198709] Fix QDesktopWidget to not report overlapping screens on
+      servers with Xrandr 1.2.
+    * [146336] On UNIX systems without CUPS support, the
+      $HOME/.printers is now checked for a default printer.
+    * [185864] Allow Qt to find the OpenSSL libraries dynamically even
+      if the libssl.so file is not present.
+    * [168283] Set WM_WINDOW_ROLE directly from QWidget's windowRole() property.
+    * [187660] Implemented rotation for tablets on non-Irix X11 platforms.
+    * [192818] Fixed drawing shapes with a textured brush that had an offset.
+    * [133291] Fixed slow line drawing when using dashing under X11.
+    * [183070] Make it possible to filter events for overlay widgets in OpenGL
+      under X11.
+    * [176485] Make drawing text through FreeType beyond the SHORT_MIN/MAX
+      coordinate range work. Note that this won't work for XLFD based fonts.
+    * [182264] Fixed a crash in QClipboard::setMimeData() when several
+      clipboards share the same QMimeData instance.
+    * [182264] Copying rich-text contents of a QTextEdit and pasting
+      them to an editor that accepts rich text didn't work.
+
+- QPrintDialog
+    * [128956] Fixed a bug which caused the print dialog to become hidden
+      while the overwrite dialog was shown.
+    * [192764] /etc/printcap with blank lines is now correctly parsed.
+    * Redesigned the print dialog and pagesetup dialog to be much nicer.
+
+- QPrinter
+    * [148125] Switched to printing through the CUPS API. This should fix the
+      problem where the wrong lp/lpr command was picked up, and therefore
+      printed through the wrong print system. If CUPS is enabled at compile
+      time, it will always be used if available.
+    * [161936] lp no longer outputs job ID to the console when printing.
+    * [180669] QPrinter no longer crashes if the CUPS library cannot be found.
+
+Windows
+-------
+    * [185702] Fixed qatomic_windows.h to properly forward declare the
+      _Interlocked*() functions to avoid conflicts with other headers
+      that also use these functions.
+    * [183547] Replaced scalar delete with array delete in windows socket engine.
+    * [190066] Fixed setting spinbox and combobox bgcolor with stylesheets on Vista.
+    * [197055] Fixed a stylesheet background issue with TextEdit on Vista.
+    * Black regions are no longer exposed when resizing windows on Vista using Aero.
+    * [172757] Respect system font changes on Windows.
+    * [194803] Pass the keyboard modifiers in QTabletEvent on Windows.
+    * [194089] Avoid adding the current screen point when translating tablet events on Windows.
+    * [187712] Fixed QT_WA() macros to use correct windows version in static builds.
+    * [183975] Handle 'Win+M' key while showing modal dialogs.
+    * [187729] Fixed incorrect focus behavior when main-window is shown minimized.
+    * [187900] Increased area for scrolbar thumb dragging.
+    * [180416] Fixed incorrect command line parsing on windows.
+    * [169703] Fixed Drag & Drop returning Invalid data.
+    * [181816] Fixed drawing ClearType text into a QImage with the Format_ARGB32 format.
+    * [123455] Make QWidget::numColors() return something useful for widgets that's not
+      been shown yet.
+
+- QApplication
+    * [167897] Fixed a bug where QApplication would treat single quotes
+      as a quote to signify the end of an argument.
+
+- QFileDialog
+    * [173402] Fixed wrong sort order if cou reopen a file dialog.
+    * [178279] Be more smart for enabling or disabling the open button.
+    * [178897] Fixed QFileDialog minimym size while very long path are in the history.
+    * [181912] Not following folders that are symlinks.
+    * [187959] Change the button caption from "save" to "open" when selecting a folder
+      in a save dialog.
+    * [196062] HANDLEs are now freed when searching the paths.
+    * [198049] Selecting a file in the completer would display the full path rather then just the file name if it was in the current directory.
+
+- QDesktopServices
+    * [194046] Fixed support for percentage encoded URL strings with openUrl().
+    * [172914] Fixed an issue where openUrl() would incorrectly return true
+      after failing to open on Windows.
+
+- QFileSystemWatcher
+    * [170021] Make it possible to monitor FAT32 directories.
+
+- QFont
+    * Use Harfbuzz instead of Uniscribe for complex text shaping enabling support of a broader
+      range of writing systems on all Windows versions.
+
+- QKeySequence
+    * [187917] Fixed incorrect standard shortcut for PreviousChild.
+
+- QListView
+    * [183299] More native appearance on list view selection backgrounds.
+
+- QLocale
+    * [139582] An unrecognized LANG environment variable will now make QLocale
+      fall back to the Windows locale, instead of the C locale.
+
+- QMenu
+    * [140954] Fixed an issue where pressing the Alt-key would not correctly
+      show and hide menu accelerators.
+
+- QMutex
+    * [179050] Fixed a bug that cause a warning on startup from QMutex
+      running an application build with MinGW on Windows 9x.
+
+- QPrintDialog
+    * [183448] Fixed a bug where the print-to-file setting would remain stuck
+      even after disabling it in the dialog.
+
+- QPrinter
+    * [185751] Fixed a crash in QPrinter if QPainter.begin() failed.
+    * [191316] Fixed a crash when using certain nonstandard printer drivers.
+
+- QScriptEngine
+    * [182241] Fixed a bug that caused qScriptValueFromQMetaObject() to generate
+      the wrong script constructor function with VC6.
+
+- QSyntaxHighlighter
+    * Added QSyntaxHighlighter::currentBlock().
+
+- QSystemTrayIcon
+    * [189196] Fixed showMessage timeout interval being ignored on windows.
+
+- QTimer
+    * [179238] Make QTimer behavior consistent with UNIX by not
+      allowing them to fire recursively.
+    * [188820] Fixed a bug found in the 4.4.0 snapshots that caused
+      menu effects to "freeze."
+
+- QWizard
+    * [180397] Fixed crash resulting from AeroStyle being assumed even when some of the required
+      symbols were unresolved.
+
+- ActiveQt
+    * [198021] Optimized QAxHostWidget::paintEvent(), the painting code is required only when the
+      widget is being grabbed.
+    * [191314] Support browsing of ActiveQt controls in Microsoft Visual Studio.
+    * [190584] Support for large strings in code generated by dumpcpp.
+    * [190538] Fixed incomplete function declarations generated by dumpcpp.
+    * [90634]  Support for 2D safe arrays.
+    * [158785] Support for ActiveX control initialization using stored data.
+
+Mac OS X
+--------
+    * [168290] Input Methods can now be used on windows of type Qt::Popup.
+    * [195099] Fixed a problem with posted an event to quit in one thread to
+      another thread would not quit the other threads loop.
+    * [193047] Extend support for all the function keys on a standard Apple keyboard.
+    * [193096] QtUiTools_debug.a is now included in the debuglibraries binary package.
+    * [141602] pixeltool is also included in the binary package.
+    * [188580] Respect the LSUIElements key in an application's Info.plist.
+    * [188267] Ensure that qAppName() checks CFBundleName before using the executable name.
+    * [183464] Fix "wrong clippboard content" issue.
+    * [189587] Prevent triggering menu shortcuts when showing native dialogs.
+    * [174769] Add separator above the "Preferences" menu item in the application menu.
+    * Some fixes to color space handling to ensure that the display color space is used when
+      drawing items to the screen (and printer). This works even if the display has a non-standard colorspace.
+    * Apply a fix so that programs using the sqlite plugin and built on Mac OS X 10.5 will run on older versions of Mac OS X.
+
+- QAction
+    * [196332] Make actions with ApplicationSpecificRole get merged in all cases.
+
+- QApplication
+    * [180466] Ensure that non Qt Windows get an activate.
+    * [171181] QApplication no longer send key events to disabled widgets.
+
+- QContextMenuEvent
+    * [161940] Implement support for QContextMenuEvent::modifiers()
+
+- QImage
+    * [182655] Switch off antialiasing when drawng to 1bpp images on Mac
+
+- QMainWindow
+    * [171931] Fix crash when calling addToolBar while the user is dragging toolbars.
+    * [191544] Fix unified toolbar size constraint issues.
+
+- QMime
+    Implement text/html for cutting and pasting.
+
+- QPixmap
+    * QPixmap no longer breaks CGImageRef's immutability.
+
+- QPushButton
+    * [183084] QPushButton will no longer change appearance between mini, small, and large
+      according to the size of it's contents. This behaviour can be switched on by using
+      WA_MacVariableSize.
+    * [172108] Unset the mnemonic if setText() is called with no &.
+
+- QPrinter
+    * [189182, 194085] Querying printer properties on Mac now works after QPainter::end().
+
+- QSettings
+    * Fixed QSettings::sync() spurious error on Mac OS X 10.5.
+    * Improved the Mac .plist serialization so that it doesn't generate
+      needless one-element CFArrays.
+
+- QTextCodec
+    * Fixed "System" locale codec on little-endian Mac OS X (Intel).
+
+- QTextEdit
+    * [176378] Make selections be shown full-width.
+    * [182243] Fix a regression where text editing widgets would insert command-keys that weren't shortcuts.
+
+- QWidget
+    * [197087] Make masks work correctly for splashscreens and popups on Leopard.
+    * [167974] Fix offset issue when seMask() was used in combinatiojn with Qt::FramelessWindowHint.
+    * [192527] Fix a regression where Cmd+MouseButton on a window icon no longer sent a QIconDragEvent.
+    * [179073] WA_MacMiniSize and MA_MacSmallSize have an effect on the default fonts for a widget.
+    * [175199] Ensure sheets that later become normal windows have the correct opacity.
+    * [139002] Ensure macEvent() is called.
+
+- QCoreGraphicsPaintEngine
+    * Implement Porter-Duff operations.
+
+- QPageSetupDialog
+- QPrintDialog
+    * Make both these dialogs sheets if they are given a parent.
+
+- Q3ComboBox
+    * Make up/down arrows work when the popup is closed.
+
+
+Qt for Embedded Linux
+---------------------
+
+ - Screen drivers
+   * LinuxFB: Improved support for BGR framebuffers
+   * LinuxFB: Added 12, 15, 18 and 24 bit pixel depth detection.
+   * AHI: New driver using the ATI Handheld Interface library.
+   * DirectFB: New driver using the DirectFB library.
+   * SVGAlib: Add support for 4 and 8 bit mode.
+   * SVGAlib: Fixed the background color for 16 bit mode.
+   * Transformed: Fix bug preventing driver to load as a plugin
+   * VNC: Added support for the client cursor pseudo encoding.
+   * Added QProxyScreen, a class for simplifying proxy based screen drivers.
+     Currently used by the VNC and Transformed screen driver.
+   * Added framework for letting the screen driver control the QPixmap
+     implementation.
+   * [194139] Fixed background initialization in a multiscreen environment.
+   * [195661] Fixed disappearing mouse cursor in a multiscreen environment.
+
+ - Mouse drivers
+   * Made the Yopy, VR41xx, PC, LinuxTP, and Bus drivers available as plugins.
+   * [194413] Fixed missing newline when writing the calibration file.
+   * Configurable double-click jitter sensitivity through the
+     QWS_DBLCLICK_DISTANCE environment variable.
+
+ - Keyboard drivers
+   * Made the SL5000, USB, VR41xx and Yopy drivers available as plugins.
+
+ - Decoration drivers
+   * Made the Styled, Windows and Default decorations avaiable as plugins
+
+ - Demo applications
+   * Added embeddedsvgviewer, styledemo & fluidlauncher applications to
+     demos/embedded to demonstrate Qt/Embedded on small screens (QVGA/VGA).
+     Fluidlauncher is used to launch the demos.
+   * Modified the existing pathstroke & deform demos to add a -small-screen
+     command line option to optimize layout for small screens (QVGA/VGA).
+
+ - Windowing system
+   * Removed redundant blits to the screen.
+   * Fixed a bug in QWSWindowSurface preventing the Opaque property to be used.
+   * Fixed a bug making the window surface valid when the
+     windowEvent(QWSServer::Hide) signal is emitted.
+   * Fixed a crash when no mouse driver is installed.
+   * Fixed bug where QWSWindow::name() would be incorrect unless
+     setWindowTitle() was called.
+   * Allow normal windows to be raised above full screen windows.
+   * [179884] Fixed bug when calling showMaximized() on a FramelessWindowHint
+     window.
+   * Fixed bug where children of a StaysOnTop window would be shown below the
+     parent.
+   * Fixed painting bug when configuring with -opengl and resizing/showing
+     child widget of visible window.
+
+ - QDirectPainter
+   * [100114] Implemented lock() and unlock().
+   * default parameter bug fixed for startPainting(); see "Important Behavior Changes" below.
+
+ - QScreen
+   * Added classId() to enable safe casting to specific subclasses.
+
+ - QPixmap
+   * Fixed grabWindow() on 12, 15, 18 and 24 bit screens.
+   * Fixed grabWindow() on BGR framebuffers.
+   * Fixed grabWindow() on rotated screens.
+
+ - QVFb
+   * Fixed 12-bit support.
+   * Added 15-bit support.
+   * Added support for 32-bit ARGB
+   * [127623] Tab key presses are now passed to the embedded application.
+
+ - General fixes
+   * [181906] Fixed case insensitive key comparisions in the keyboard, mouse
+     and screen plugin factory.
+   * [170768] For ARM processors, fixed the spin lock protecting the
+   * QAtomic* implementations to yield instead busy waiting.
+   * Reduced number of double precision floating point operations as an
+     optimization for platforms without a floating point processor.
+   * Reduced memory usage in the backing store.
+   * [177057] Fixed use of the modifier window title tag.
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+- ICC
+   * [169196] Use -fpic instead of deprecated -KPIC option.
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+- Build System
+    * Make it possible to use QT+=dbus and QT+=testlib to enable
+      compiling against the QtDBus and QtTestLib libraries.
+
+- Assistant
+    * Renamed the existing Assistant to Assistant_adp and adjusted the QtAssistantClient library accordingly.
+
+    * Added the new Assistant based on the Qt Help module.
+
+    * Introduced qhelpconverter to convert adp or dcf files to the new file formats.
+
+    * Added the qhelpgenerator tool to create qch documentation files.
+
+    * Introduced qcollectiongenerator to create help collections.
+
+- Designer
+    * [191493] Fixed issues with small widgets in grid layouts on Mac
+
+    * [177564] Fixed autoFillBackground being reverted when setting a stylesheet on a QLabel.
+
+    * [171900] Made Qt3Support functions visually different (signals and slots, widget icons)
+
+    * [182037] Fixed a bug which made it possible to resize QFrame-based containers to arbitrarily small sizes
+
+    * [176678] Made "Current Widget Help" work
+
+    * [193885] Fixed a crash caused by a widget box widget not having a geometry nor a valid sizeHint.
+
+    * [122185] Added support for QMdiArea, QWorkspace
+
+    * [173873] Made pasted widgets appear at mouse position
+
+    * [191789] Added QtDesigner.pc for pkg-config
+
+    * [157152] Added a context menu to the buddy editor
+
+    * [189739] Fixed a crash caused by internal layouts of custom widget plugins
+
+    * [133687] Fixed QDesignerContainerExtension; provided way to specify a method to add pages in domXML
+
+    * [161643] Changed rich text editor to detect plain text and store it as such
+
+    * [183110] Added a dialog for setting the tab order by sorting the list of widgets
+
+    * [188548] Added support for static custom widget plugins to QUiLoader
+
+    * [157164] Made QStackedWidget context menu available on browse buttons
+
+    * [157217] Fixed default size of spacers
+
+    * [182448] Fixed a bug that caused additional spacing between toolbar's last action and consecutive toolbar
+
+    * [84089]  Added containers and custom containers to the "New Form" dialog
+
+    * [165443] Grey out the geometry property in Designer when it has no functionality
+
+    * [119506] Made comments available for shortcut properties
+
+    * [161480] Added detailed view to action editor
+
+    * [175146] Improved the signal/slot editor; do not reset the column sizes when switching forms
+
+    * [176121] Added "Save As" to code preview
+
+    * [176122] Added code preview
+
+    * [79138]  Added support for QLayout::sizeConstraint
+
+    * [156718] Made it possible to copy actions between forms
+
+    * [168648] Improved object inspector selection
+
+    * [166406] Fixed a selection bug affecting custom subclasses of QTabBar
+
+    * [151323] Made it possible to use subclasses of QTabWidget, QToolBox or QStackedWidget as custom widgets
+
+    * [168564] Fixed a bug in table widget editor
+
+    * [132874] Added support for user-defined signals and slots of promoted widgets and main container
+
+    * [202256] Made header section size of the action editor persist when switching forms
+
+    * [201505] Extended the QDesignerIntegration::objectNameChanged() signal to carry the previous object name
+
+    * [196304] Exclude C++ and java keywords as names for objects
+
+    * [199838] Breaking layout didn't update properly minimumSize of a form
+
+    * [118874] Added spacing property for the QToolBox
+
+    * [120274] Q3Wizard - "currentPageText" property added, "caption" properly converted to "windowTitle"
+
+    * [181567] Added support for loading and saving items for Q3ListBox and Q3ListView
+
+    * [187593] Fixed issue with dynamic properties
+
+    * [107935] Actions provided by task menu extension are appended to the list of actions of superclass
+
+    * [188823] Compress margin/spacing properties in case all values are the same, for legacy reasons
+
+    * [160635] Make Z-order working properly
+
+    * [171900] Signals and slots from compat layer marked with red italic
+
+    * [177398] Added notr="true" attribite to styleSheet property - in this way styleSheet string will not appear in linguist
+
+    * [180367] Greyed out X and Y properties of geometry in case of main container
+
+    * [118393] Collapsing property groups in property editor allowed
+
+    * [190703] Fixed in-place editor behaviour
+
+    * [154745] Guidelines provided for grid layout
+
+    * [173516] New resource system integrated
+
+    * [142477] Improved rich text editor and added HTML editing
+
+    * Gradient editor added to stylesheet editor
+
+    * Resetting font and palette subproperties handled properly
+
+    * uint, qlonglong, qulonglong and QByteArray properties supported
+
+    * Property Browser Solution integrated
+
+    * Property Editor - added toolbar with object and class name, and some actions
+
+    * Property Editor - remember expansion state
+
+    * Property Editor - style sheet editor added
+
+    * Property Editor - sorting and coloring added
+
+    * Added basic fixup for URL properties to prevent data loss when the
+      user enters an intermediate URL (such as www.google.com).
+
+- Linguist
+    * [39078] Added shortcut for adding an entry to a phrase book.
+
+    * [116913] Added tooltips to messages view and phrases view to be able to see the full text as well as to see a preview of HTML rendering.
+
+    * [142628] Fix a "What's this?" message in Linguist.
+
+    * [170053], [183645] Split the context / items tree up into a contexts window and a messages window.
+
+    * [171829] Added support for syntax highlighting in source/translation strings.
+
+    * [179415] When previewing a dialog via Qt Linguist that has the window
+      modality set to ApplicationModal do not block linguist.
+
+    * [181411] Make xliff utf-8 export use non-ascii characters, too.
+
+    * [183713] Identify the line number in the code for strings.
+
+    * [184586] Added ability to show multiple auxiliary (read-only) translations.
+
+    * [194325] Fixed an error with loading XLIFF files containing consecutive internal whitespace.
+
+    * Added a source code window. It shows the source file when available and highlights the line on which the source text was found.
+
+    * Added a window for showing warnings.
+
+    * Allow a translation to be marked as done when there are still warnings.
+
+    * Fixed undo/redo functionality.
+
+    * Show obsolete entries in grey.
+
+    * Ask whether modified phrase books should be saved on quit.
+
+    * Re-open phrasebooks at startup.
+
+- lupdate
+    * [80235]  Introduce QT_TRANSLATE_NOOP3 as a QT_TRANSLATE_NOOP3 variant
+      taking a comments parameter.
+
+    * [161106] When specifying ::QObject::tr() lupdate will no more take
+      the previous word as namespace.
+
+    * [165460] Make lupdate work with relative paths.
+
+    * [165679] Prevent lupdate from crashing on special string patterns.
+
+    * [179506] Handle the case of a class in a namespace inheriting from
+      another class in a different namespace correctly.
+
+    * [180318] Make lupdate work properly on deeply nested directories.
+
+    * Added an option (-pluralonly) that will only extract strings which
+      require a plural form, to ease adding plural translations for the same
+      language as the source messages.
+
+    * Do not require administrative privileges to run lupdate on Windows Vista.
+
+- lrelease
+    * [187375] Allow lrelease to be run from a directory outside the .pro file.
+
+    * Added an option (-removeidentical) that omits translated strings that
+      are exactly the same as the source string, to reduce file size.
+
+- rcc
+    * [105595] Add QT_NO_CAST_TO_ASCII define to tools by default.
+
+    * [188891] Fix crash when QResource is loaded from stream that was
+      rcc'd from an empty qrc file.
+    * [164840] Allow use of chinese characters in commandline arguments to rcc.
+
+- moc
+    * Treat -DFOO as -DFOO=1 for macros defined on the commandline.
+
+- uic
+    * [189327] Added support for QT_NO_ACCESSIBILITY
+
+    * [170919] Fixed a bug that caused nonsensical includes to appear in
+      conjunction with Qt support classes
+
+    * [171228] Fixed a bug that caused nonsensical includes to appear in
+      conjunction with Qt support classes
+
+    * [105595] Add QT_NO_CAST_TO_ASCII define to tools by default.
+
+    * [186989, 158836] Fixed invalid code generation in some cases when
+      cross-compiling.
+
+- uic3
+    * [179540] Added support for QPushButton's "on"-property
+
+    * [170919] Fixed a bug regarding includes for classes in namespaces
+
+    * [299175] Transform Qt3's QSlider property tickmarks to Qt4's
+      tickPosition
+
+- qmake
+    * [187938] Fix a bug that would cause Xcode projects generated by qmake to fail to link in Xcode 3.
+    * The pkgconfig files generated for the frameworks on Mac OS X are now correct.
+    * Makefiles for Mac OS X now always set QMAKE_MACOSX_DEPLOYMENT_TARGET=10.3
+      unless it is overridden in the .pro file, this will solves linking errors
+      on Leopard.
+    * [189409] The default Xcode generator format is now Xcode 2.2.
+    * Added an unsupported mkspec for LLVM on Mac OS X.
+    * [198562, 201942] Added support for overriding bundle extentions for Mac
+    * [152932] Specify the /MANIFEST option when embedding manifests into the application/library.
+    * Avoid adding silencing echos to the compiler when generating XCode projects.
+    * [191267] Only include the -L$$QT_PLUGINPATH option once in a project.
+    * Avoid memmoving data from outside a memory block.
+    * Generate proper MSVC 2008 VCPROJ and SLN files.
+    * [168308] Avoid double dir separators in subdir Makefiles.
+    * [168075] Make distcc work on Mac.
+
+- configure
+
+    * [180315] Implement -qtlibinfix configure option to allow renaming of Qt
+      libraries.
+    * [180315] Implement -qtnamespace configure option to allow compiling all
+      Qt symbols in a user-defined namespace.
+
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
+- QTiffPlugin
+    * [187169] Return an error if loading fails instead of empty image.
+
+- QSvgIconEngine
+    The qsvg icon engine plugin has been renamed to qsvgicon to disambiguate
+    it from the qsvg image format plugin.
+    * Now allows multiple SVG files and/or other images to be added to
+      QIcon for different modes.
+    * Streaming of SVG icons is fixed.
+
+****************************************************************************
+*                   Important Behavior Changes                             *
+****************************************************************************
+
+- Event filters
+
+        The behavior of event filters has changed starting with
+        4.4. Previously, thread affinity was ignored when adding,
+        removing, and activating an object's event filters. Now, event
+        filters must have the same thread affinity as the object they
+        are filtering. Qt will warn when it detects a filter that is
+        in a different thread from the object being filtered.
+
+- QFont
+        Starting with Qt 4.4, the '-' characters in the raw font names
+        are no longer substituted with a ' ' (space character). This
+        may impact your application if you use fonts that have '-'
+        characters in their raw font names.
+
+- QReadWriteLock
+        Starting with Qt 4.4, recursive lock support is disabled by
+        default in QReadWriteLock. Code that relies on recursive write
+        locking will need to be changed to construct the
+        QReadWriteLock with recursive lock support enabled. Previously,
+        recursive write-lock support (introduced in 4.3) was enabled by
+        default, but QReadWriteLock did not properly support recursive
+        read-lock support. QReadWriteLock now supports both and needs to
+        be constructed explicitly with recurive lock support enabled
+        (QMutex works in the same way).
+
+- QPainterPath
+        We have changed QPainterPath::angleAtPercent() to use the same
+        angle definition as in the rest of Qt. This means that the angle
+        returned will be from 0 to but not including 360, specifying
+        the degrees from the 3 o'clock position in the counter-clockwise
+        direction.
+
+- QDirectPainter [Qt for Embedded Linux-specific class]
+        startPainting() in Qt 4.3 had a default parameter lock=false,
+        the value of which was not used. The function would lock for
+        client processes, but not for the server process. From Qt 4.4,
+        the default value is changed to true, and startPainting() will
+        lock if lock == true, and not lock if lock == false. This means
+        that client processes running code that has not been recompiled
+        with Qt 4.4 may show flicker and/or painting problems. To get
+        exactly the same behaviour as for Qt 4.3, change startPainting()
+        to startPainting(QApplication::type() == QApplication::GuiClient).
+
+- QPrinter
+        QPrinter::pageRect() did not return consistent values on
+        Linux/Mac/Windows when QPrinter::fullPage() was set to true. On
+        Mac and Windows pageRect() was not influenced by the fullPage()
+        setting. This has now been changed so that pageRect() returns
+        the same as paperRect() when fullPage() is true on all
+        platforms.
+
+- QPixmap
+        Using QPixmap outside of the GUI thread is dangerous and error
+        prone. Because of this, starting with 4.4, any QPixmap created
+        outside of the GUI thread will always be a null pixmap.
+
+- QDateTime
+        When using QDateTime::fromString() to parse dates, QDateTime
+        no longer tries to use English month names because that would
+        cause some dates to become unparseable. If you need to parse
+        date times in the English locale, use QLocale::toDateTime (in
+        specific, the QLocale::c() locale).
+
+- Qt/Mac
+        Starting a Qt application no longer makes it the front process. This is
+        more in-line with other applications on Mac OS X. What this means is
+        that you can start a Qt application, do something else and not have the
+        Qt application steal your focus. If you desire for the Qt application
+        to become the front process, you can call QWidget::raise()
+        programmatically or launch the application with open(1) or using
+        QDesktopServices.  This should not have any affect if launched from
+        double-clicking in Finder or run in a debugger.
+
+- Qt/X11 on MIPS Linux
+        qreal is changed from float to double, breaking binary compatibility.
+        This change fixes a bug introduced in Qt 4.3.0 when qreal was
+        changed from double to float for embedded MIPS processors.
diff --git a/dist/changes-4.4.1 b/dist/changes-4.4.1
new file mode 100644
index 0000000000..4995a86836
--- /dev/null
+++ b/dist/changes-4.4.1
@@ -0,0 +1,619 @@
+Qt 4.4.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.4.0.
+
+The Qt version 4.4 series is binary compatible with the 4.3.x series.
+The Qt for Embedded Linux version 4.4 series is binary compatible with
+the Qtopia Core 4.3.x series. Applications compiled for 4.0, 4.1, 4.2,
+and 4.3 will continue to run with 4.4.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Task Tracker:
+
+  http://www.trolltech.com/developer/task-tracker
+
+Each of these identifiers can be entered in the task tracker to obtain
+more information about a particular change.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- Documentation and Examples
+   * [202630] Fixed a problem in the network/http example: it couldn't
+   download anything if the URL had a space.
+
+Third party components
+----------------------
+
+- Updated Qt's libpng version to 1.2.29.
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+- QAbstractItemView
+    * [199822] Fixed issue with broken extended selections.
+
+- QButtonGroup
+    * [209485] Prevented a crash caused by removing a button from its button
+      group while inside a slot triggered by the button's clicked() signal.
+
+- QDirModel
+    * [213519] Fix crashes when drag'n'dropping files into a subdirectory
+
+- QFtp
+    * [189374] Fixed a bug that would cause QFtp to fail to parse
+    dates if the application was being run on some locales, like fr_FR.
+
+- QGraphicsProxyWidget
+    * [208773] Input methods now work properly for embedded widgets.
+    * [207644] Fixed a bug where the painter was restored incorrectly.
+
+- QGraphicsScene
+    * [209125] QGraphicsScene::style() and QGraphicsWidget::style() fixes.
+    * [202774] [207076] Focus and activation fixes for embedded widgets.
+    * [212950] The scene no longer removes focus from the focus item if a
+      mouse press propagates to the scene (and then to the view). This was
+      a behavior regression to QWidget.
+
+- QString
+    * [205093] Printing QString after using replace()followed by truncate(-1) crashes
+    * [209078] Problem in QString::resize
+
+- QGraphicsView
+    * [209154] Mouse replay regressions since 4.3 have been fixed.
+
+- QObject
+    * Fixed a regression from 4.3 to 4.4 in QObject::receivers() where
+      the function would return >0 even after disconnection all
+      signals.
+
+- QScriptEngine
+    * [208489] Made the instanceof operator work when used with
+      QMetaObject wrappers created by newQMetaObject().
+    * [206188] Fixed a bug that caused scripts to hang when using
+      "continue;" inside a switch-case block.
+    * [205473] Fixed a bug that caused slots to be called even when
+      argument conversion failed.
+
+- QSslSocket
+    * [212177] QSslSocket::peerVerifyError() supports all errors now.
+    * [212022] Fixed a bug that would cause no default CA certificates
+    to be present in static Qt builds.
+    * [212412] Fixed a bug that could cause a deadlock in
+    waitForReadyRead() in encrypted mode.
+
+- QtWebKit
+    * Ensured that relative URLs are converted to absolute URLs.
+    * Ensured that the cursor is changed into a resize cursor when hovering
+      over and dragging the resizeable frame borders.
+    * [206999] Fixed a problem which would make an empty URL being passed to
+      QWebPluginFactory::create()
+    * [208215] Fixed a bug that prevents linkClicked signal to be emitted
+      when opening a local HTML file.
+    * [208342] Ensured that the cursor is updated after a web frame or page
+      has finished loading.
+    * [210920] Fixed showing/hiding of the Web Inspector.
+    * [207050] Fixed input of characters into form elements using AltGr on Windows.
+    * Fixed a crash related to XML HTTP requests.
+    * Fixed QWebPage::acceptNavigationRequest not being called when opening new Windows.
+    * Fixed emission of linkClicked() signal when clicking on target=_blank links.
+    * Fixed painting artifacts when scrolling embedded widgets.
+    * Fixed logic errors in QWebHitTestResult::isNull() and QWebHistory::forward().
+    * Fixed encoding of [ and ] in the host part of URLs
+    * Fixed a crash related to QWebPage::unsupportedContent.
+    * Fixed a memory leak on application shutdown.
+    * Fixed painting errors when scrolling embedded widgets.
+    * Fixed support for custom cursors set on a QWebView.
+    * Fixed various build problems on Mac OS X, Windows and Solaris
+    * Fixed crash with CSS text transformations.
+    * Fixed infinite recursion when converting DOM objects with cyclic references to QVariants.
+
+- QVariant
+    * [201918] QVariant convert to QDateTime warnings
+
+- QWidget
+    * Fixed a regression when setting masks for splashscreens on Mac OS X Tiger.
+    * [210544] Fixed a regression where Qt::WA_PaintOnScreen widgets were painted on
+      top of overlapping siblings.
+    * [211796] Fixed a crash occurring when calling render() from a resize event.
+    * [210960] Fixed a regression where an invisible top-level widget was resized when calling render().
+    * [210822] Fixed a bug causing QGLWidgets to not behave correctly when setting window title.
+    * [208413] Fixed issues when creating a child widget of Qt::WA_PaintOnScreen widgets.
+  
+- QWidgetAction
+    * [207433] Fix enabling and disabling toolbar containings actions widget.
+
+- QWorkspace
+    * [206368] Fixed a crash occurring when deleting a QWorkspaceChild.
+
+- QPainter
+    * [186327] Fixed inconsistent outline and fill drawing for drawPolygon in
+      raster paint engine, where the fill would be visible outside the outlines
+      or there would be missing pixels between outline and fill.
+    * [208530] Fixed some drawing issues with projective transform related to
+      near-plane clipping.
+    * [209095] Fixed infinite loop that could occur on certain architectures on
+      rare occasions when drawing outlines.
+    * [208090] Fixed issue with outline drawing where subsequent points on a
+      path or polygon are equal according to qFuzzyCompare, but treated as
+      different, causing stroke artifacts.
+    * [206785] Fixed potential pixmap drawing artifacts when drawing stretched
+      pixmaps at non-integer coordinates.
+    * Fixed potential rect/line drawing issue when drawing on non-integer
+      offsets in raster paint engine.
+    * [209462] Fixed regression when redirecting widgets to another paint device.
+
+- QPainterPath
+    * [209056] Fixes potential assert in the boolean operations (difference,
+      intersect, and union).
+
+- QRasterPaintEngine
+    * [208644] Fixed a crash in qt_intersect_spans.
+
+- QApplication
+    * [213116] Fixd a regression on Mac OS X where you could not access the
+    menu bar after minimizing a window with no click through.
+
+- QColor
+    * [193671] Fixed a problem with QColor::setNamedColor() not returning the correct
+    alpha value for the "transparent" color.
+
+- QMacStyle
+    * [212037] Adjusted the size of text in an editable combo box on Mac OS X Panther.
+    * [216905] Fix a regression when drawing table headers on Mac OS X Panther.
+
+- QMainWindow
+    * [210216] Calling setCentralWidget, setMenuBar, setMenuWidget or setStatusBar
+    several times could cause a crash.
+    * [206870] Fixed a bug causing dual screen layouts to not restore correctly.
+
+- QMdiArea
+    * [202657] Fixed focus issue when navigating between window with focus on the DockWidget
+    * [211302] Fixed a bug where the activation order was not respected when tiling and cascading.
+
+- QOpengGLPaintEngine
+    * [208419] Fixed wrong clipping of widgets.
+
+- QDockWidget
+    * [179989] Maximum size is now taken into account by the dock widget.
+
+- QCommonStyle
+    * [204016] Fixed west tab positions.
+
+- QCryptographicHash
+    * [206712] Fixed a bug that would make QCryptographicHash return
+    invalid results if you called result() before the last addData()
+    call.
+
+- QTcpSocket
+    * [208948] Fixed a bug that would cause QTcpSocket and QSslSocket
+    not to flush all of their buffers if the socket disconnects and
+    reconnects.
+    * [182669/192445] Fixed a bug that would cause QTcpSocket to stop
+    emitting readyRead() if a previous waitForReadyRead() timed out.
+
+- QDataStream
+    * [211301] Fixed an issue where Qt 2 and Qt 3 applications might
+    crash or hang when run under KDE 4.
+
+- QDateTime
+    * [137698] Fixed a bug that caused QDateTime to perform weird
+    1-hour jumps when dealing with dates in Daylight Savings Time.
+
+- QSslCertificate
+    * [185067/186087] Fixed a bug that would cause QSslCertificate
+    parsing of certificate timestamps to be off by a few hours
+    (timezone issue).
+
+- QFile
+    * [192752] Fixed a bug that would make QFile leak file descriptors
+    if QFile::handle() was called.
+
+- QFileDialog
+    * [208383] Crash when a proxy model is set and multiple files are selected.
+    * [165503] DirectoryEntered not emitted when go-to-parent button is clicked.
+
+- QFileInfo
+    * [212291] Fixed a bug that would cause QFileInfo to return empty
+    group or owner names for files under MacOS X and maybe some other
+    Unix platforms.
+
+- QFuture
+    * [214874] Fixed possible deadlock when using nested calls to QtConcurrent::run().
+
+- QGLContext
+    * [210427] In 4.4.0 we removed the automatic mipmap generation for
+    textures bound with QGLContext::bindTexture(). This change has been
+    reverted for compatibility reasons.
+    * [214078] Fixed a problem that caused OpenGL textures to always be
+    downscaled to 64x64 in size on Intel graphics hardware. This caused,
+    among other things, the Qt Demo to look utterly broken on these systems.
+
+- QOpenGLPaintEngine
+    * [191777] Set default values for GL_PACK_*/GL_UNPACK_* values with
+    glPixelStore() when QPainter::begin() is called.
+    * [201167] Don't assume the GL error state is cleared when QPainter::begin()
+    is called. Clear the state explicitly before we make internal state checks.
+    * [204578] Fixed a problem where the GL error state was set on
+    some system because an extension enum was used unprotected.
+
+- QHostInfo
+    * [213187] Made QHostInfo not issue IPv6 name lookups if the
+    machine does not have any IPv6 addresses configured (Unix change
+    only).
+
+- QHttp
+    * [213220] Fixed a bug that could make QHttp open unencrypted
+    connections if HTTPS mode was requested but SSL support was not
+    present in Qt.
+    * [193738] Fixed a bug that would make QHttp continue reading the
+    HTTP server's response and emit a readyRead() signal even if
+    abort() had already been called.
+
+- QNetworkAccessManager
+    *  When a http 302 location url is not an encoded url try QUrl's human readable parsing for more compatibility with websites.
+
+- QPainter
+    * [211403] Fixed handling of negative target rect offsets and negative
+    source offsets in QPainter::drawPixmap()/drawImage().
+
+- QPixmap
+    * [202903] Fix an infinite recursion in QPixmap::fromImage() that occured
+    when converting mono images.
+    * [206174] Reverse the order of the tests done in QPixmap::hasAlpha()
+    in order to speed it up.
+    * [210275] Fixed a crash in QPixmap::resize().
+
+- QSharedMemory
+    * Compile fix on QNX when QT_NO_SHAREDMEMORY was defined
+
+- QStyleSheetStyle
+   * [179629] Fixed SpinBox with gradient background.
+   * [188305] Respect the max-with property for more elements (such as QTabBar::tab)
+   * [189951] Fixed the align: property for QTabBar
+   * [194149] Fixed the background:transparent property
+   * [198926] Fixed the background:none property on some component of the scrollbar
+   * [206238] Fixed inconsistency with rules without selector applied to widget. They
+     now always applies to all childs
+   * [207420] Fixed the ~= attribute selector.
+   * [207819] Fixed few performences issues.
+   * [208001] Fixed crash crash with QMenu[title=...] in the stylesheet.
+
+- QHeaderView
+    * [207869] Fixed possible division by zero.
+
+- QTableView
+    * [207270] Painting errors in reverse mode and when there was spans.
+    * [210608] Fixed regression in the handling of spanning cells.
+
+- QTableWidget
+    * [213118] Fixed a bug where moving the first or the last row triggered an assert.
+
+- QTreeView
+    * [213737] Fixed regression where ctrl+a would select all items regardless of the selection mode.
+    * [202355] Fixed issue where items inserted in a view with all header sections hidden did not show
+      themselves properly later.
+    * [211296] When a column is hidden QItemSelectionModel::selectedRows and QItemSelectionModel::selectedColumns returns the wrong values.
+
+- QTreeWidget
+    * [305084] Fixed duplicate items that may appears when programaticaly
+      expanding items.
+    * [209590] itemSelectionChanged was being emited before item selection was updated
+
+- Q3DragObject
+    * [203288] Fixed regression against Qt 3 so that the drag() function now correctly uses
+      MoveAction (and not CopyAction) as the default action.
+
+- Q3TextBrowser
+    * [197836] Fix assert when zooming out.
+
+- QTextDocument
+    * [204965] Fix html export to use indent as textIndent
+
+- QTextBrowser
+    * [192803] Fix loading of files from resources with a resource prefix.
+
+- QTextEdit
+    * [211617] Fixed crash when moving the first paragraph by drag and Drop
+
+- QTextTable
+    * [194229] Fix removing of a row with merged cells causing a crash.
+    * [194253] Fix calling removeColumn on a Column with selectedCell causing an assert.
+    * Fix assert on selecting the whole table after an insert/remove of column.
+    * [175676] Fix calling of resize() making updates in layouting fail.
+
+- QSpinBox
+    * [213137] Fixed thousand-delimiters to not show for value = INT_MIN.
+
+- QScrollArea
+    * [210567] Fixed issues when scrolling a native widget.
+
+- QScrollBar
+    * [209492] Fixed a bug causing the scroll bar actions to be invoked twice.
+
+- QToolbBarLayout
+    * [207946] Prevented a crash caused by assuming that the parent widget always exists.
+
+- QThreadPool
+    * Fixed issues with thread termination during dll unloading on windows. QThreadPool::
+      waitForDone() now completely stops all threads, on all platforms. In addition, the
+      QCoreApplication destructor now calls waitForDone() to make sure all threads are 
+      stopped before the Qt dlls are unloaded.
+      
+- QNetworkReply
+    * [207283] Fixed support for HTTP 101 responses.
+    * Fixed parsing of cookies with special timezone specifiers.
+
+- QWebHistory
+    * Fixed a bug where calling forward() would go backwards and not forwards.
+
+- QFontMetrics
+    * [212485] Fixed boundingRect() returning the proper size when there is a tab.
+
+- QItemDelegate
+    * [206762] Fixed painting when using a QBrush() for the text.
+
+- QtXmlPatterns
+    * [207584] When using the same QXmlQuery for a new query then evaluateTo()
+      can return false even if the query is valid.
+    * [214180] Fixed fn:replace fails when inside function.
+    * Fixed crash when unary operator has empty sequence as operand.
+    * Fixed that axis preceding or descendant-or-self when combined with
+      function last() on a custom node model crashes.
+    * Fixed that xml:id is not whitespace normalized.
+    * Fixed that QXmlFormatter produces no output on single top-level text nodes.
+    * Fixed infinite loop triggered by fn:matches().
+    * Fixed crash when compiling one of the FunctX queries.
+
+- VideoPlayer
+    * [210170] Fixed an issue that prevented VideoPlayer::play to start when 
+      called with an argument. 
+
+- Accessibility
+    * [199241] Fix an issue where the screen reader would read the content of
+      a password line edit. The screen reader will now only read it if its Normal.
+
+- QLocalSocket
+    * [210886] Fixed a bug that would cause QLocalSocket to overrun
+    its buffers on very long socket names.
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+X11
+---
+    * [208354] Fixed a crash in Qt's XIM implementation when exiting
+      applications after using the skim input method.
+    * [207800] Fixed a regression from 4.3 to 4.4 where putting a
+      QX11EmbedContainer into a QWidgetStack would case the container
+      stay visible permanently.
+    * [207423] In QDesktopWidget, workaround a change in behavior in
+      newer X.Org X servers where Xinerama would always be used even
+      when using a multi-screen setup.
+    * [206139] Fixed a bug where Qt could incorrectly recurse into the
+      Xlib error handler (causing Xlib to assert).
+    * [207057] Fixed a regression from 4.3 to 4.4 where
+      QX11EmbedContainer would sometimes destroy the embedded client's
+      window.
+    * [209057] Fixed a Q3Process which triggered a "Do not delete
+      object" warning.
+    * QPrintDialog crashed on unix in some cases.
+    * [214103] Fixed a regression with string to double conversion
+      becoming locale-aware in QTextStream.
+    * [210922] Fix crash in input methods when toggling the InputMethodEnabled
+      attribute.
+    * [210831] Fixed a problem where preview pages in the QPrintPreviewDialog
+      would not appear or be drawn correctly on X servers without
+      Xrender support.
+    * [206165],[213457] Fixed bugs which show the wrong cursor on some widget.
+	* Fixed bug regarding the usage of encoded URLs in Phonon
+
+
+Windows
+-------
+
+    * [207888] Fixed a regression from 4.3 which caused crashes in
+      Assistant and Designer when an accessibility client is running
+      (this includes applications that query for accessibility
+      features, like Notepad++).
+    * Several fixes related to crashes and hangs when the user has an
+      accessibility client running in the background.
+    * [208782] Fixed a problem with non-cosmetic lines with widths < 2
+      not being printed correctly with certain printer drivers.
+    * [208859] Fixed a problem with strokes not being printed correctly. Both
+      the stroke offsets and thinkness of the stroke were sometimes printed
+      incorrectly.
+    * [206473] Entering UNC paths is slow in the Qt file dialog.
+    * [309241] Trying to stream mp3 content with phonon would cause a crash.
+    * [210115] Fixed a problem causing "mailto" links not to work when the
+      mail application path contains unexpanded environment variables.
+    * [203012] Fixed a problem where "WriteOnly named pipes" failed to
+      open using QFile.
+    * [205685] Fixed the handling of TranslateAccelerator for windows key messages.
+    * Add support for (not) embedding manifests in plugins, on Windows.
+    * [211893] Fixed a crash related to using QtDotNetStyle.
+
+
+Mac OS X
+--------
+    * Fix a regression where inserting widgets into native menus would cause
+      the program to crash.
+    * [209785] Fixed a regression from 4.3 to 4.4 in DeferredDelete
+      event handling.
+    * The "debuglibraries" binary package now includes dSYM bundles, which
+      makes it possible to debug with them.
+    * [207371] The CoreGraphics paint engine ignored the transform set
+      on a QBrush with QBrush::setTransform().
+    * Fixed insertation of 'space' char in QLineEdit when EISU key is being held down
+    * Fixed fullscreen widget not regaining full focus after a dialog has been shown
+    * Fixed bug regarding the usage of encoded URLs in Phonon
+    * [212719] Fixed a bug that could cause text drawn into a QImage to be clipped
+      incorrectly.
+    * [216563] Fixed a case where failing to get the display's colorspace
+      would result in many widget being painted all black.
+    * [216544, 213316] Fixed several accessibility-related crashes.
+    * [210401] Fixed memory leak in QWidget::setWindowIcon().
+    * [211195] Fixed problem that caused crashes with the Mac binary package
+      when entering long licensee names during the installation.
+
+Qt for Embedded Linux
+---------------------
+
+- QWSEmbedWidget
+   * Fixed propagation of the Qt::WindowStaysOnTopHint window property.
+
+- QDirectPainter
+   * [209068] Fixed region coordinates for QDirectPainter when used on a
+     rotated screen.
+
+- DirectFB screen driver
+   * Fixed window placements of windows with initial top-left coordinate (0,0).
+   * Improved deallocation of resources when an application exits unexpectedly.
+   * Fixed bug in QPixmap::rotate().
+   * Fixed QPixmap::fromImage() with an image of format QImage::Format_Indexed8
+     when compiling with QT_NO_DIRECTFB_PALETTE.
+   * Fixed small memory leak in QPainter::drawImage()
+
+- LinuxFB screen driver
+   * Added a workaround screen driver when the kernel fails to report the
+     length of the color components.
+   * Improved performance of the non-accelerated screen cursor.
+   * Disable the console cursor in graphics mode.
+
+- Tslib mouse driver
+   * [200995] Fixed crash when initialization fails.
+   * [207117] Improved filtering during calibration.
+
+- Ahi screen driver
+   * Fixed link issue.
+   * Fixed QScreen::setMode().
+   * Improved support for different screen modes.
+
+Qt for Windows CE
+-----------------
+
+   * Support for Visual Studio 2008 added
+   * Improved QRegion to perform faster
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+- [212852] Fixed GCC 4.3 compiler warnings.
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+- Build System
+    * [209866, 213084] Fix compilation errors in QtWebKit when using
+      GCC 3.4 with precompiled headers. Precompiled header support is
+      documented as experimental in the GCC 3.4 documentation, and as
+      such, precompiled header support is disabled by default with
+      this compiler.
+    * [212330] Correct Makefile generation for src/corelib, which
+      would sometimes include multiple qatomic.o targets.
+    * [210016] Fix a build failure on 64-bit Linux when using the
+      linux-*-32 mkspecs.
+    * [206966] Fixed compilation errors on Linux when building for the
+      MIPS architecture.
+    * [212132] Workaround compiler crash bug for Linux on
+      SPARC64. This is a generalization of a similar change done for
+      Solaris in the 4.3 series.
+    * [211326, 211703] Fixed compilation errors when using the Intel
+      C++ Compiler for Linux on IA-64 (Itanium) hardware.
+    * [171222] Ignore duplicate -L<path> options
+
+- Assistant
+    * [212875] Don't sort the entries in the contents view according to the
+      help files names.
+    * [212444] Use the default help collection when registering or unregistering
+      help files without having a collection file specified.
+    * [210704] Make sure the sql-plugin is correctly used when building
+      Qt statically.
+    * [208834] When highlighting a find result, ensure that the active
+      highlighting color is used.
+    * Introduced the -assistant-webkit configure flag to make use of WebKit as
+      html renderer in Qt Assistant.
+
+
+- Designer
+
+    * [213481] Fixed crash that occurs when encountering an invalid .ui file.
+    * [211422] Fixed a crash resulting from a conflict between the newly added
+      support for QScrollArea and custom widgets derived from QScrollArea.
+    * [209995] Fixed a bug in the property editor that caused it not to
+      select values in spin boxes on editing.
+    * [205448] Fixed a bug related to drag and drop and Windows accessibility.
+    * [205899] Removed the windowModality property for non-form children to
+      prevent it from locking up the form preview.
+    * [212077] Fixed retranslateUi call in case of combo box items
+    * [210866] Dynamic properties of type QByteArray are not converted anymore to type QString when reloading the form
+    * [207187] Designer's property editor has better colors in case of inverted color scheme
+    * [202257] The geometry of the resource dialog is saved in settings
+    * [211677] Remove a crash in case of reloading resources
+
+- Linguist
+
+- lupdate
+    * [209122] Fixed same-text heuristic missing existing plurals
+    * [212465] Standardize on the default context being empty, not "@default"
+
+- lrelease
+
+
+- rcc
+
+
+- moc
+
+   * [189996] Fixed a bug that caused inline slots with throw()
+     declarations to be parsed incorrectly.
+   * [192552] Fixed a bug that caused "< ::" to be parsed incorrectly
+     (e.g. "QList< ::Foo>").
+   * [199427] Fixed the code generator so that it generates normal
+     spaces everywhere, no tabs.
+   * [204730] Fixed a skipt token after Q_PRIVATE_SLOT
+
+- uic
+
+   * [205439] Added a warning that is  printed when encountering
+   non-obvious Qt3 dependencies (qPixmapFromMimeSource).
+
+- uic3
+
+   * [205834] Process non-ASCII filenames correctly.
+
+- qmake
+
+
+- configure
+
+    * Fixed auto-detection of the XKB library on old Unix systems
+    * Fixed auto-detection of getaddrinfo on old Unix systems
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
+
+****************************************************************************
+*                   Important Behavior Changes                             *
+****************************************************************************
+
+Unix
+----
+    * [203063] Changed the behaviour of qFatal and Q_ASSERT to always
+    produce a SIGABRT signal in all build modes of Qt. (Previous
+    versions called the exit function if Qt was built in release mode)
diff --git a/dist/changes-4.4.2 b/dist/changes-4.4.2
new file mode 100644
index 0000000000..192bbd108a
--- /dev/null
+++ b/dist/changes-4.4.2
@@ -0,0 +1,512 @@
+Qt 4.4.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.4.1 and 4.4.0.
+
+The Qt version 4.4 series is binary compatible with the 4.3.x series.
+The Qt for Embedded Linux version 4.4 series is binary compatible with
+the Qtopia Core 4.3.x series. Applications compiled for 4.0, 4.1, 4.2,
+and 4.3 will continue to run with 4.4.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Task Tracker:
+
+  http://www.trolltech.com/developer/task-tracker
+
+Each of these identifiers can be entered in the task tracker to obtain
+more information about a particular change.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+Third party components
+----------------------
+
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+QtCore
+------
+
+- QVariant
+    * [220112] correct documentation with respect to conversions
+    involving QTime.
+
+- QHash
+    * [215348] Document that uniqueKeys() doesn't sort its keys.
+
+- QFlags
+    * [221702] Fix QFlags::testFlag gives a surprising result on enums with
+    many bits.
+
+- QLibrary
+    * [219456] Fix QLibrary problems on Windows, loading the C runtime library
+    without a manifest.
+
+- QDataStream
+    * Fixed storing a QPalette into a stream with a version older than Qt_2_1
+
+- QtConcurrent
+    * [221671] Fixed filtered() compile error when using filter functions that
+      takes its argument by const reference.
+    * [220804] Fix several compile errors with STL containers.
+    
+- QThreadPool
+    * [215365] The Q[Core]Application destructor now waits for all QThreadPool
+      threads to finish. This fixes ussues when unloading the Qt dlls on windows
+      as well as when using Qt features that need on a QApplication instance
+      in a worker thread.
+QtGui
+-------------
+
+   * [215794] setWindowFilePath() didn't update window title until the
+     window is resized.
+   * [212316] Window position changed when setWindowFlags was called.
+   * [223814] Fixed a crash in QDockWidget when the docking window was
+     closed during the dock animation.
+   * [223339] Fixed a crash when a pop-up widget had the
+     WA_DeleteOnClose attribute.
+
+   * [214742, 205222] QFormLayout - fix nested QFormLayouts expanding
+     unnecessarily.
+   * [217123] Fixed a regression in QWidgetItem::setGeometry() that made an item
+     with both an Alignment and QSizePolicy::Ignored set got squeezed down to
+     a size of 0.
+
+- QCDEStyle
+   * [220803] Improved the contrast of CE_RubberBand when painted on top of a dark background.
+
+- QPlastiqueStyle
+   * [312723] Fixed broken painting on QSpinBox when using NoButtons.
+
+- QGraphicsEllipseItem
+   * [207826] setStartAngle() and setSpanAngle() now call
+     prepareGeometryChange(), removing rendering artifacts.
+
+- QGraphicsLinearLayout
+   * [218400] Fix crash when assigning a layout with stretches to a widget.
+
+- QGraphicsView
+   * [216741] Fix QGraphicsView::DontSavePainterState (regression to 4.3)
+
+- QGraphicsWidget
+   * [215417] Fixed setting the correct layoutDirection on the painter before
+     we called QGraphicsWidget::paint.
+
+- QMdiArea
+   * [221527] Fixed a bug where the [*] placeholder was not updated correctly in tabbed view mode.
+
+- QMdiSubWindow
+   * [214964] Tooltips in children of the subwindow closed too fast
+
+- QMessageBox
+   * [221721] Fix crash when trying to obtain the default value for QMessageBox::iconPixmap().
+
+- QSplitter
+   * [214480] Improve docs on how the effective stretch facors are calculated.
+
+- QTextEdit
+   * [214956] Fix painting problems with text in floating frames
+   * [215192] Fix HTML alignment in QLabels with RTL
+   * [213259] Fix to handle ShortcutOverride for Ctrl+Shift+Right
+
+- QTextCursor
+   * [214457] Fix assert when deleting empty cells
+   * [210496] Fix the usecase that  QTextCursor::select( QTextCursor::LineUnderCursor )
+     doesn't work when the text has not been layed out yet
+
+- QTextDocument
+   * [207779] Fix HTML import of page-breaks on empty lines to not get lost
+   * [212848] Fix  FullWidthSelection to work if LineWrapMode set to NoWrap
+   * Fixes the positioning of bullets to always honor the text direction
+
+- QWidget
+   * [219446] Fixed a bug where calling repaint() before QApplication::exec() did not
+     invoke a paintEvent().
+
+QtScript
+--------
+
+    * [219126] Fixed bug that caused the decimal point to appear in
+    the wrong position when converting a number with a negative
+    exponent to a string.
+
+QtGui
+-----
+
+- QDateTimeEdit
+    * [220926] QDateTimeEdit::textFromDateTime: valueFromText vs. date
+    TimeFromText -- clarify documentation
+
+- QTimeEdit
+    * [215426] Fixed a typo in the declaration of a Q_PROPERTY
+
+- QPainter
+    * [216948] Fix one-pixel shifting of integer lines in raster paint
+      engine when current matrix has negative dx or dy.
+    * [218682] Fixed bug in QBitmap::fromData that could cause the bitmaps
+      to turn completely black on Windows and Embedded Linux.
+    * [220544] Fix issue in Freetype font engine where painting text using
+      the same font and transform on both images and pixmaps would result in
+      text not being transformed or not shown at all.
+    * [222520] Fixed issue in raster paint engine where StretchToDevice
+      mode for gradients wasn't respected.
+    * [222848] Prevent potential crash on NaN in qt_curves_for_arc()
+      when drawing squiggly underlined text.
+
+- QBrush
+   * [215090] Avoid "QPixmap created outside the GUI thread" warning when
+     creating a QImage based brush.
+
+- QFileDialog
+    * [223813] Prevent an assert when "Shift + C" was pressed if the directory
+      set was "C:/".
+- QImage
+    * [215985] Reduce memory usage in TIFF import/export to avoid failing
+      due to out-of-memory errors on large images.
+    * [217101] Make sure QImage::setPixel() doesn't call detach twice, to
+      improve the performance a bit.
+
+- QPicture
+    * [215227] Fixed a problem that could occur when drawing a QPicture to a
+      QImage or QPixmap due to differing device DPIs.
+
+- QPixmap
+    * [214340] Prevent QPixmap::scaled() from leaving white lines at right/lower
+      edges in some cases.
+    * [214344] Make QPixmap::transformed() work correctly with perspective
+      transforms.
+    * [214855] Make sure QPixmap::transformed with a 90-degree rotation transform
+      doesn't increase the size of the pixmap.
+    * [215190] Fixed crash on Windows and Embedded Linux due to QPixmap::detach()
+      not detaching the underlying QImage.
+    * [216648] QPixmap turned a QBitmap into a 32 bit QPixmap
+      when QPixmap::resize() was called on the QBitmap.
+
+- QMatrix
+    * [198791] Fixed bug in QMatrix::map(const QPolygon &) causing a behavioral
+      difference from Qt 3's QWMatrix.
+
+* Fixed bugs in QPolygon to QRegion conversion causing to many rectangles to be
+  generated.
+
+* [206138] Fix unaligned double access in src/corelib/global/qnumeric_p.h
+
+* [216189] Fix a crash when calling QObject::dumpObjectInfo() after
+  disconnecting a signal.
+
+* [216910] Use the 'eieio' instruction instead of 'lwsync' in the
+  PowerPC implementation of QAtomicInt and QAtomicPointer since the
+  latter is not available in all hardware implementations. The 'eieio'
+  instruction was used successfully in Qt 4.3 and earlier.
+
+- QDockWidget
+    * [222222] The sizeHint for dockwidget is now respected when it is redocked
+    * [222030] The minimum size and minimum size hint are now respected
+
+- QToolBar
+    * [216929] Fixed the extension when the orientation is vertical
+
+- QTabBar
+    * [214527] Fixed the geometry of QTabBarnot being correctly updated when
+               adding a tab.
+
+- QMainWindow
+    * [218288] Fixed save/restore that would not work correctly if the window
+               was not yet shown on screen.
+
+- QStyleSheetStyle
+    * [158984] Fixed crash while using stylesheet in combinaison with a proxy style
+    * [217470] Fixed setting a stylesheet on a QDockWidget remove its border
+
+- QTreeView
+    * [220298] Fixed regression where clicking outside of the first column doesn't
+               always select the item.
+    * [224598] Fixed item not always appearing when QStandardItemModel::appendColumns
+               was used
+    * [212056,216390] Fixed bug where hidden items in the treeview got visible after
+      a sort.
+    * [209473] Fixed assert/crash when selectAll were called on a treeview with no
+      items.
+
+- QTableView
+    * [314519] Fixed crash with very big models.
+    * [211039] Fixed assert when moving a header section in a vertical header.
+
+QtGui
+-----
+* [214146, 215170] Fix a regression with multiple screens on
+  X11. Multiple screens are now reported with their correct size
+  regardless of how X11 is configured.
+
+QtOpenGL
+--------
+
+* [217429] Fixed issue on certain Intel drivers causing a GL error to be
+  generated when computing the max texture size in qt_gl_maxTextureSize().
+
+QtWebKit
+--------
+* Fixed potential crash when deleting QWebView instances.
+* Fixed blurry widgets in the web page due to antialiased painting.
+* [221518] Fixed using modifiers to type special symbols (e.g '@','$')
+           does not work on Mac OS X.
+* [216179] Fixed potential crash on Windows, when performing JavaScript
+           date conversion.
+* Fix rendering of scrollbars with some styles
+* Fix state of web actions when showing the context menu
+* Fix parsing of stylesheets and JavaScripts to not depend on the current locale
+* Fix return value of QWebPage::isModified()
+* Fix QWebFrame::setHtml() not setting the contents immediately
+* [218789] Fix WebKit not displaying content on 403 HTTP responses
+
+QtXml
+-----
+
+- QDomElement
+    * [220115] Document QDomElement::setAttribute(double)'s behavior with
+    respect to locale.
+
+QtXmlPatterns
+-------------
+
+- QXmlQuery
+    * [219070] Fix after the QXmlQuery object is deleted it doesn't
+    seem to be cleaning up afterwards.
+
+QtNetwork
+---------
+
+- QNetworkReply & QNetworkAccessManager
+    * [223580] Fixed the handling of HTTP replies with code 400.
+    * [215010] Fixed a bug that made SOCKSv5 proxies not be used.
+    * [217091] Fixed a bug that made the HTTP backend issue CONNECT
+    commands for HTTP (not HTTPS) requests to proxy servers
+
+- QHttp
+    * [197694] Fixed a bug that prevented QHttp from uploading data of
+    length 0 when reading from a QIODevice.
+
+
+QtTest
+------
+
+- QCOMPARE
+    * [219067] Document behavior of qFuzzyCompare/QCOMPARE when
+    comparing with 0.0.
+
+QtDBus
+------
+
+- QDBusConnection
+    * [220140] Fixed a bug that would make objects registered with
+    ExportSlots not have interfaces inherited from parent classes
+    callable.
+    * [218733] Fixed the delivery of errors resulting of an outgoing
+    method call timing out.
+
+- QDBusReply
+    * [190546] Improved the error messages generated by QDBusReply in
+    case of mismatched signatures.
+
+QtHelp
+------
+
+   * [219454] Index also .htm and .txt files for the full text search.
+   * [233415] Use the proper encoding when parsing the title of a html
+   document.
+
+Qt3Support
+----------
+
+    * [216806] Fixed a crash in Q3ScrollView when setting a null corner widget
+    * [215041] Fixed a crash in Q3Table when using a Q3TextEdit as the editor
+    * [217218] Fix support for images in Q3TextBrowser
+
+Phonon
+------
+    * [214080] Fixed a failure on path reconnections between VideoWidget and MediaObject
+
+
+Accessibility
+-------------
+    * [222660] Made it possible to navigate from the application through the menubar,
+      toolbars etc, and down to the textedit without ending up on a QRubberBand or QMenu.
+      This left the AT client in a confused state.
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+X11
+---
+   * [211678] Fixed a problem where using widgets and pixmaps on two different
+     X11 screens resulted in X11 errors.
+   * [217250] Fixed a problem where QGLWidgets on some older X servers would
+     not get the correct colormaps set, resulting in distorted colors.
+   * [214713] Fixed a problem where text would get clipped incorrectly
+     when using QPainter::drawText() on a QGLWidget, or QGLWidget::renderText().
+   * [223085] Fixed a regression where creating a style before QApplications could
+    result in incorrect font metrics.
+
+Windows
+-------
+   * [207506] Fixed a bug that causes input widgets to switch the text alignment
+     when pressing 'Ctrl+Shift' on Vista platforms (regardless of supported
+     keyboard layouts).
+   * [223951] Fixed a crash while accessing 'QAxObject*' for methods returning a
+     VARIANT with IDispatch inside.
+   * [223145] Fixed a regression which prevented use of Qt::WindowSystemMenuHint
+     together with flags like Qt::FramelessWindowHint.
+   * [224063] Fixed a crash in QFile when QFile::handle() was called.
+   * [221924] Fixed the binary installer for Visual Studio 2005 Express.
+   * [218215] Fix custom paper sizes for printing under Windows.
+   * [210830] Fixed incorrect tooltip text color on Vista.
+
+Mac OS X
+--------
+   * [216650] Fix a regression from 4.4 in the handling of DeferredDelete
+     events. This solves the reported problem that using Cmd+W does not
+     close a form properly in the Designer.
+   * Fix an error in the qconfig.h header file that occurred on Mac OS X
+     during configure when not using Terminal.app.
+   * [222349] Fix a potential out-of-bounds read when getting data from the clipboard.
+   * [213116] Fix a regression where minimizing a window would cause a window
+     with widgets that had no click through enabled to never get enabled.
+   * [215985] Fixed QPixmap::fromImage() to not do an extra copy of the image data
+     which could cause a lot of memory to be used.
+   * [217197] Fix crash when dragging text with object replacement characters on the Mac.
+   * [212884] Fixed a crash that could occur when printing images on the Mac.
+   * [215909] Fixed a problem where text drawn into a QGLWidget on the Mac would appear
+     to be drawn with a bold type, when it shouldn't have.
+   * [215761] Fixed a problem that could make top part of text drawn
+     into a QGLWidget appear cropped.
+   * [214960] Fixed a problem where custom page margins were not taken
+     into account, unless QPrinter::fullPage() was set to true. Also,
+     margins from the QPageSetupDialog should now update the internal
+     QPrinter margins correctly.
+   * [216563] Fix "black widgets" regression from 4.4.
+   * [214681] Fixed bug that the menu bar and other parts of the application
+     responds to the same shortcuts.
+   * [312012] Fixed support for secondary shortcuts on menu bar.
+   * [315450] Fixed build issue for Phonon on OS 10.4/Macbooks regarding OpenGL headers.
+
+Qt for Embedded Linux
+---------------------
+
+- Raster paint engine
+   * Fixed pixel errors when drawing pixmaps into a semi-transparent window.
+   * Fixed an assert when drawing an 16-bit image onto an image of format
+     QImage::Format_ARGB8565_Premultiplied.
+   * [217400] Fixed painting errors with Qt::WA_NoSystemBackground used on
+     a 16bit screen.
+   * Fixed CompositionMode_Source with new QImage formats introduced in 4.4.0.
+
+- QWSServer
+   * [210865] Fixed crash due to missing null-pointer check in
+     QWSServer::sendIMEvent().
+
+- DirectFB screen driver
+   * Fixed a cache corruption which randomly resulting in painting errors
+     when using QPainter::drawImage().
+   * Fixed use of Qt::SmoothTransformation with QPixmap::scaled().
+   * Fixed painting errors when drawing transparent windows and compiled
+     width QT_NO_DIRECTFB_VM.
+   * Added QT_NO_DIRECTFB_PREALLOCATED to work around issues with drivers
+     not properly implementing blitting to/from preallocated surfaces.
+
+- VNC screen driver
+   * Fixed a crash when used on top of a screen with a non-standard line step.
+   * Fixed remote cursor when used on top of a hardware accelerated cursor.
+
+Qt for Windows CE
+-----------------
+   * [219644] Maximized MDI windows had a double title bar on Windows Mobile.
+   * [223975] Qt version displayed wrong in Windows Explorer.
+   * [217576] QLocale always displayed "C" as language.
+   * [215020] Windows with parent were always embedded into the parent window
+     instead of being toplevel itself.
+
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+- Build System
+
+- Assistant
+   * [221298] When triggering the sync contents action, activate the contents
+   widget.
+   * [171654] Use the title of the .html file as the about dialog window title.
+   * [219939] When specifying a .html file for the about dialog contents,
+   ensure that the referenced image files are displayed as well.
+   * [219936] When a collection file has been changed, make sure to syncronize
+   all relavant settings with the cached collection file.
+   * [206321] Display .svg files in Assistant.
+   * [219176] Escape '&' characters in the title of a document.
+
+
+- Designer
+    * [219670] Fixed a bug related to layout handling of form classes generated
+      by the Visual Studio integration.
+    * [220299] Fixed a crash that occurred when breaking a layout containing
+      zero-sized spacers.
+    * [217464] Fixed a bug related to using resource-dependent properties
+      for QDialog-based forms.
+    * [215188] Stabilized reading of corrupted ui files.
+    * [215648] Don't show the rich text editor for iconText property of QAction
+    * [214854] Fix displaying of icons in the VS integration
+    * [217093] Make non-letter shortcuts with Shift modifier working
+    * [223114] Fixed a crash when removing a dynamic url property
+    * [220998] Default precision of float property in property editor changed to 6
+
+- Linguist
+
+- lupdate
+
+- lrelease
+
+
+- rcc
+
+
+- moc
+
+
+- uic
+
+
+- uic3
+
+
+- qmake
+
+
+- configure
+
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
+
+****************************************************************************
+*                   Important Behavior Changes                             *
+****************************************************************************
+
diff --git a/dist/changes-4.4.3 b/dist/changes-4.4.3
new file mode 100644
index 0000000000..f33cede92b
--- /dev/null
+++ b/dist/changes-4.4.3
@@ -0,0 +1,31 @@
+Qt 4.4.3 is a rebranding-only release. In all other aspects, it is the
+same release as Qt 4.4.2. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.4.2, 4.4.1 and 4.4.0.
+
+The Qt version 4.4 series is binary compatible with the 4.3.x series.
+The Qt for Embedded Linux version 4.4 series is binary compatible with
+the Qtopia Core 4.3.x series. Applications compiled for 4.0, 4.1, 4.2,
+and 4.3 will continue to run with 4.4.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Task Tracker:
+
+  http://www.trolltech.com/developer/task-tracker
+
+Each of these identifiers can be entered in the task tracker to obtain
+more information about a particular change.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+ - Updated application icons and other graphics to reflect the look
+   and feel of the new Qt brand.
+
+Legal
+-----
+
+ - Copyright of Qt has been transferred to Nokia Corporation.
diff --git a/dist/changes-4.5.0 b/dist/changes-4.5.0
new file mode 100644
index 0000000000..3fc075fc68
--- /dev/null
+++ b/dist/changes-4.5.0
@@ -0,0 +1,1496 @@
+Qt 4.5 introduces many new features and improvements as well as bugfixes
+over the 4.4.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+  http://doc.trolltech.com/4.5
+
+The Qt version 4.5 series is binary compatible with the 4.4.x series.
+Applications compiled for 4.4 will continue to run with 4.5.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Task Tracker:
+
+  http://www.qtsoftware.com/developer/task-tracker
+
+Each of these identifiers can be entered in the task tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+New features
+------------
+
+- Disk Caching in QtNetwork
+    * Added support for http caching in QNetworkAccessManager.
+    * New classes:  QAbstractNetworkCache, QNetworkDiskCache.
+    * QNetworkDiskCache is a simple disk-based cache.
+
+- QDate
+    * [207690] Added QDate::getDate().
+
+- QDateTimeEdit
+    * [196924] Improved QDateTimeEdit's usability. It now skips ahead to the
+      next field when input can't be valid for the current section.
+
+- QDateTime
+    * [178738] Fixed QDateTime::secsTo() to return the correct value.
+
+- QDBusPendingCall / QDBusPendingCallWatcher / QDBusPendingReply
+    * New classes to make calls whose replies can be received later.
+
+- QDesktopServices
+    * Added the ability to determine the proper location to store cache files.
+
+- QGraphicsItem
+    * Added the QGraphicsItem::itemTransform() function.
+    * [209357] Added the QGraphicsItem::opacity() function.
+    * [209978] Added the QGraphicsItem::ItemStacksBehindParent flag to allow
+      children to be stacked behind their parent item.
+    * Added QGraphicsItem::mapRect() functions.
+
+- QGraphicsScene
+    * Added the QGraphicsScene::sortCacheEnabled property.
+    * Added the QGraphicsScene::stickyFocus property.
+
+- QGraphicsTextItem
+    * [242331] Added the QGraphicsTextItem::tabChangesFocus() function.
+
+- QGraphicsView
+    * [210121] Added action, shortcut and shortcut override support to
+      QGraphicsView and QGraphicsItem.
+
+- QLineEdit
+    * Added the ability to set the text margin size.
+
+- QMainWindow
+    * Added API to detect which dock widget is tabified together with another
+      dock widget.
+
+- QMessageBox
+    * It is now possible to create categories in QErrorMessage to avoid error
+      messages from the same category popping up repeatedly.
+
+- QMetaObject
+    * Added introspection of constructors, including the ability to invoke a
+      constructor.
+
+- QMetaProperty
+    * [217531] Added the notifySignalIndex() function, which can be used to
+      introspect which signal (if any) is emitted when a property is changed.
+
+- QNetworkCookie
+    * [206125] Added support for HTTP-only cookies.
+
+- QNetworkProxyFactory
+    * Added support for a factory of QNetworkProxy whose result can
+      change depending on the connection being attempted.
+    * Added support for querying system proxy settings on Mac OS X and
+      Windows.
+
+- QSharedPointer / QWeakPointer
+    * Added two new classes for sharing pointers with support for atomic
+      reference counting and custom destructors.
+
+- QStringRef
+  * [191369] Added QStringRef::localeAwareCompare() functions.
+
+- QTabBar
+    * Added the ability to place close buttons and widgets on tabs.
+    * Added the ability to choose the selection behavior after a tab is
+      removed.
+    * Added a document mode which, on Mac OS X, paints the widget like
+      Safari's tabs.
+    * Added the movable property so that the user can move tabs easily.
+    * Added mouse wheel support so that the mouse wheel can be used to change
+      tabs.
+
+- QTabWidget
+    * Added a document mode that removes the tab widget border.
+
+- QTcpSocket
+    * [183743] Added support for requesting connections via proxies by
+      hostname (no DNS resolution made on the client machine).
+
+- QTextDocument / QTextDocumentWriter
+    * Added the QTextDocumentWriter class which allows exporting of
+      QTextDocument text and images to the OpenDocument format
+      (ISO/IEC 26300).
+
+- QtScriptTools
+    * Added a new module to provide a debugger for Qt Script.
+
+- Qt::WA_TranslucentBackground
+    * Added this new window attribute to be able to have per-pixel
+      translucency for top-level windows.
+
+- Qt::WindowCloseButtonHint
+    * Added a new window hint to control the visibility of the window close
+      button.
+
+- Qt::WindowStaysOnBottomHint
+    * Added a new window hint to allow the window to stay below all other
+      windows.
+
+- Q_SIGNAL and Q_SLOT
+    * Added new keywords to allow a single function to be marked as a signal
+      or slot.
+
+- QT4_IM_MODULE
+    * [227849] Added a new environment variable that specifies the input
+      method module to use and takes precedence over the QT_IM_MODULE
+      enviroment variable. This environment variable allows the user to
+      configure the environment to use different input methods for Qt 3 and
+      Qt 4-based applications.
+
+- QXmlQuery
+    * Added a number of overloads to the bindVariable(), setFocus(), and
+      evaluateTo() functions.
+    * Added a property for controlling the network access manager.
+    * Partial support for XSL-T has been added. See the main documentation for
+      the QtXmlPatterns module for details.
+
+Optimizations
+-------------
+
+- The backing store has been re-factored and optimized
+    * Significant improvement in overall performance of painting for widgets.
+    * Reduced the number of QRegion operations.
+    * Improved update handling.
+    * Improved the performance of clipping.
+    * Support for full static contents.
+
+- QGraphicsView has been optimized in several areas
+    * Reduced the number of floating point operations.
+    * Improved update handling.
+    * Improved handling of deeply nested item trees.
+    * Improved the performance of clipping for ItemClipChildrenToShape.
+    * Improved sorting speed, so scenes with deeply nested item hierarchies do
+      not affect the performance as compared to Qt 4.4.
+
+- Widget style sheets optimisations
+    * Improved the speed of style sheet initialization.
+
+- QAbstractItemModel
+    * Optimized QPersistantModelIndex creation and deletion.
+    * Optimized adding and removing rows and columns.
+
+- QFileSystemModel
+    * Ensured that the model is always sorted when required.
+
+- QTreeView
+    * Optimized expanding and collapsing items.
+    * Optimized expanding animations with large views.
+
+- QRect and QRectF
+    * Improves on functions like intersect(), contains(), etc.
+
+- QTransform
+    * Reduced the number of multiplications used for simple matrix types.
+
+- QRasterPaintEngine
+    * Reduced overhead of state changes; e.g., setPen() and setBrush().
+    * Introduced a cache scheme for Windows glyphs, thus improving text
+      drawing performance significantly.
+    * Reduced the cost of doing rectangular clipping.
+    * Improved pixmap drawing.
+    * Improved pixmap scaling.
+    * Optimized drawing of anti-aliased lines.
+    * Optimized drawing of anti-aliased dashed lines.
+
+Third party components
+----------------------
+
+- Updated Qt's SQLite version to 3.5.9.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+- General Fixes
+    * [217988] Fixed a thread safety issue in QFontPrivate::engineForScript
+      which could lead to buggy text rendering when rendering text from
+      several threads.
+    * [233703] Fixed a crash that occured when the input method (for example
+      SCIM) was destroyed while the application is still running.
+    * [233634] When there are several input method plugins available, they are
+      now initialized only when the user switches to them.
+    * [231089] Fixed an issue which caused HTTP GET to fail for chunk
+      transfers.
+    * [193475] Consumer tablet devices (like Wacom Graphite and Bamboo) now
+      work on Windows and Mac OS X.
+    * [203864] Do not warn when deleting objects in their event handler except
+      for Qt Jambi.
+
+- QAbstractItemModel
+    * [233058] Fixed the sorting algorithm used in rowsRemoved().
+
+- QAbstractItemView
+    * [221955] Fixed a bug that allowed rows to be selected even if the
+      selection mode was NoSelection.
+    * [244716] Fixed a possible crash when an edited cell was moved.
+    * [239642] Ensured that a rubber band selection is clear if the selection
+      ends on the viewport.
+    * [239121] Ensured that the old selection is clear when starting a
+      selection on the viewport.
+    * [219380] Fixed an update issue when removing rows.
+
+- QAbstractSpinBox
+    * [221221] Fixed a usability issue with QAbstractSpinBox subclasses in
+      itemviews.
+
+- QBitmap
+    * [216648] Fixed a problem where QBitmaps were being converted to 32-bit
+      QPixmaps when QPixmap::resize() was called.
+
+- QByteArray and QString
+    * [239351] Fixed a bug in QCharRef and QByteRef that would cause them to
+      fail to detach properly in some cases. Applications need to be
+      recompiled to use the fix.
+    * [212140] Added repeated() functions to these classes.
+    * [82509] Added QT_NO_CAST_FROM_BYTEARRAY to disable "operator const
+      char *" and "operator const void *" in QByteArray.
+
+- QCalendarWidget
+    * [206017] Fixed minimumSize to be calculated correctly in the case where
+      the vertical header has a different text format set.
+    * [206282] Added support for browsing months using the mouse wheel.
+    * [238384] A click on the date cell will now be ignored if the year
+      spin box is opened.
+
+- QCleanlooksStyle
+    * [195446] Skip disabled menu and menu bar items when using keyboard
+      navigation.
+    * Fixed a problem with wrapped text eliding on titlebars.
+    * [204269] Fixed a sizing problem with push buttons having mnemonics.
+    * [216172] Fixed a problem with check box on inverted color schemes.
+
+- QColor
+    * [196704] Fixed a problem where the QColor::fromHsvF() function could
+      return incorrect values.
+
+- QComboBox
+    * [167106] Fixed a problem where the combobox menu would incorrectly show
+      check boxes after a style change.
+    * [227080] Fixed handling of the style sheet background-color attribute on
+      Windows.
+    * [227080] Adjusted pop-up size when using style sheet border.
+    * [238559] Fixed the completer as it was not using the right column with
+      setModelColumn().
+
+- QCommandLinkButton
+    * [220475] Added support for On/Off icon states.
+
+- QCommonStyle
+    * [211489] Ensured that checkable group boxes with no title are drawn
+      correctly.
+    * [222561] Made more standard icons available.
+
+- QCOMPARE(QtTest)
+    * [183525] Fixed issue that caused QCOMPARE to give incomplete
+      information when comparing two string lists.
+    * [193456] Ensured that nmake install for QTestLib copies the DLL into the
+      bin directory.
+
+- QCoreApplication
+    * [224233] Ensured that QCoreApplication::arguments() skips the
+      -stylesheet argument.
+
+- QDate
+    * [222937] QDate - fixed issue preventing a minimum date of 01-01-01
+      from being set.
+
+- QDataStream
+    * [230777] Fixed a bug that would cause skipRawBytes() to go
+      backwards if the correct resulting position was larger than 2 GB.
+
+- QDateTimeEdit
+    * [196924] Improved QDateTimeEdit's usability. It now skips ahead to the
+      next field when input can't be valid for the current section.
+
+- QDBusConnection
+    * [211797] Added support for the GetAll call in the standard
+      org.freedesktop.DBus.Properties interface.
+    * [229318] Fixed race conditions caused by timers being deleted in
+      the wrong thread.
+
+- QDesktopServices
+    * [237398] Ensured that, on Mac OS X, returned paths do not have a
+      trailing '/'.
+
+- QDesktopWidget
+    * [244004] Fixed a coordinate issue on Mac OS X with multi-screen setups
+      where the screen sizes differ.
+
+- QDialog
+    * [214987] Ensured that maximize buttons are not put on dialogs by default
+      on Mac OS X.
+
+- QDialogButtonBox
+    * [224781] Dialog buttons without icons now get the same height as dialog
+      buttons with icons to maintain the alignment.
+
+- QDockWidget
+    * [237438] Fixed a crash in setFloat() for parentless dock widgets.
+    * [204184] Subclasses are now allowed to handle mouse events.
+    * [173854] Ensured that the size of the dock widget is remembered when it
+      is hidden.
+
+- QDomDocument
+    * [212446] Ensured that a new line inserted after an element that
+      indicates whitespace is preserved.
+
+- QDomAttr
+    * [226681] Fixed issue that caused specified() to return false if the
+      attribute is specified in the XML.
+
+- QEvent
+    * Added more debug operators for common event types.
+
+- QFlags
+    * [221702] Fixed issue with testFlag() that gave a surprising result on
+      enums with many bits.
+
+- QFormLayout
+    * [240759] Fixed crash in QFormLayout that could occur when a layout was
+      alone in a row.
+
+- QFile
+    * [238027] Fixed a bug that would cause QFile not to be able to map a file
+      to memory if QFile::open() was called with extra flags, like
+      QIODevice::Unbuffered.
+
+- QFileInfo
+    * [166546] Fixed QFileInfo operator== bug involving trailing directory
+      separators.
+
+- QFileDialog
+    * [240823] Fixed issues with file paths over 270 characters in length on
+      Windows.
+    * [212102] Fixed ".." directory issue.
+    * [241213] Fixed some problems when renaming files.
+    * [232613] Fixed a usability issue with UNC path on Windows.
+    * [228844] Fixed a wrong insertion in the filesystemModel that caused
+      persistant model index to be broken.
+    * [190145] [203703] Fixed a bug in getExistingDirectory() that returned
+      /home/ instead of /home, or on Windows, returned c:/temp/ instead of
+      c:/temp. We now match the native behavior.
+    * [236402] Fixed warning in the QFileDialog caused by deleting a directory
+      we have previously visited.
+    * [235069] Fixed issue that prevented QFileDialog from being closed on
+      Escape when the list view had focus.
+    * [233037] Fixed issue that caused the "Open" button to be disabled even
+      if we want to enter a directory (in AcceptSave mode).
+    * [223831] Ensured that the "Recent Places" string is translatable.
+    * Fixed crash on Windows caused by typing \\\ (empty UNC Path).
+    * [226366] Fixed issue that prevented the completer of the line edit from
+      being shown when setting a directory with lower case letter.
+    * [228158] Fixed issue that could cause the dialog to be closed when
+      pressing Enter with a directory selected.
+    * [231094] Fixed a hang that could occur when pressing a key.
+    * [227304] Fixed a crash that could occur when the dialog had a completer
+      and a QSortFilterProxyModel set.
+    * [228566] Fixed the layout to avoid cyclically showing and hiding the
+      scroll bars.
+    * [206221] Ensured that the view is updated after editing a value with a
+      custom editor.
+    * [196561] Fixed the static API to return the path of the file instead of
+      the link (.lnk) on Windows.
+    * [239706] Fixed a crash that could occur when adding a name filter from
+      an editable combo box.
+    * [198193] Ensured that directory paths on Windows have a trailing
+      backslash.
+
+- QFrame
+    * [215772] Style sheets: Ensured that the shape of the frame is respected
+      when not styling the border.
+
+- QFont
+    * [223402] QFont's QDataStream operators will now save and restore the
+      letter/word spacing.
+
+- QFontMetrics
+    * [225031] Fixed issue where QFontMetrics::averageCharWidth() could return
+      0 on Mac OS X.
+
+- QFtp
+    * [227271] Added support for old FTP servers that do not recognize the
+      "SIZE" and "MDTM" commands.
+
+- QFuture
+    * [214874] Fixed deadlock issue that could occur when cascading QFutures.
+
+- QGLContext
+    * [231613] Fixed a crash that could occur when trying to create a
+      QGLContext without a valid paint device.
+
+- QGLFramebufferObject
+    * [236979] Fixed a problem with drawing to multiple, non-shared,
+      QGLFramebufferObjects from the same thread using QPainter.
+
+- QGraphicsEllipseItem
+    * [207826] Fixed boundingRect() for spanAngle() != 360.
+
+- QGraphicsGridLayout
+    * [236367] Removed (0, 0) maximum size restriction of a QGraphicsItem by
+      an empty QGridLayout.
+
+- QGraphicsItem
+    * [238655] Fixed slowdown in QGraphicsItem::collidesWithItem() that was
+      present in Qt 4.4.
+    * [198912] ItemClipsChildrenToShape now propagates to descendants.
+    * [200229] Ensured that context menu events respect the
+      ItemIgnoresTransformations flag.
+    * Enabling ItemCoordinateCache with no default size now automatically
+      resizes the item cache if the item's bounding rectangle changes.
+    * [230312] Mac OS X: Fixed a bug where update() issued two paint events.
+
+- QGraphicsLayout
+    * [244402] Fixed issue that could cause a horizontal QGraphicsLinearLayout
+      to stretch line edits vertically.
+
+- QGraphicsLayoutItem
+    * Fixed a crash that could occur with custom layouts which did not delete
+      children.
+
+- QGraphicsScene
+    * [236127] Fixed BSP tree indexing error when setting the geometry of
+      a QGraphicsWidget.
+
+- QGraphicsWidget
+    * [223403] Ensured that QGraphicsWidget(0, Qt::Popup) will close when you
+      click outside it.
+    * [236127] Fixed QGraphicsScene BSP tree indexing error.
+    * Improved rendering of window title bars.
+    * Fixed crash that could occur when a child that previously had the focus
+      died without having the focus anymore.
+
+- QGraphicsProxyWidget
+    * [223616] Ensure that context menus triggered by ActionsContextMenu are
+      embedded.
+    * [227990] Widgets are not longer resized/moved when switching themes on
+      Windows.
+    * [219058] [237237] Fixed scroll artifacts in embedded widgets.
+    * [236545] Ensured that the drag and drop cursor pixmap is not embedded
+      into the scene on X11.
+    * [238224] Fixed a crash that could occur when a proxy widget item was
+      deleted.
+    * [242553] Fixed drag and drop propagation for embedded widgets.
+
+- QGraphicsSvgItem
+    * [241475] Fixed update on geometry change.
+
+- QGraphicsTextItem
+    * [240400] Fixed bugs in mouse press handling.
+    * [242331] Add tabChangesFocus() to let the user control whether the text
+      item should process Tab input as a character, or just switch Tab focus.
+
+- QGraphicsView
+    * [236453] Improved Tab focus handling (propagate Tab and Backtab to items
+      and widgets).
+    * [239047] Improved stability of fitInView() with a very small viewport.
+    * [242178] Fixed rubber band debris left in Windows XP style (potentially
+      any style).
+    * Fixed a crash in QGraphicsView resulting from the non-deletion of
+      sub-proxy widgets.
+    * Fixed issue that caused items() to return an incorrect list with an
+      incorrect sort order when an item in the scene has the
+      IgnoresTransformations flag set to true.
+    * Ensured that the painter properly saves/restores its state after a call
+      to drawBackground().
+    * [197993] Allow any render hint to be set/cleared by the
+      QGraphicsView::renderHints property.
+    * [216741] Fixed handling of QGraphicsView::DontSavePainterState (broken
+      in Qt 4.3).
+    * [235101] [222323] [217819] [209977] Implemented proper font and palette
+      propagation in Graphics View.
+    * [238876] Fixed scroll artifacts in reverse mode.
+    * [153586] Ensured that the text cursor is drawn correctly in transformed
+      text controls in a QGraphicsView.
+    * [224242] Added support for embedding nested graphics views.
+
+- QGroupBox
+    * [204823] Fixed a palette inconsistency when using certain styles.
+
+- QHeaderView
+    * [239684] Fixed sorting that wouldn't happen when clicking unless the
+      sort indicator is shown.
+    * [236907] Fixed bug that could cause hidden columns to become visible.
+    * [215867] Resizing sections after moving sections could resize the wrong
+      columns.
+    * [211697] Fixed ResizeToContents to always show the full content of
+      cells.
+
+- QImage
+    * [240047] Fixed a problem with drawing/transforming sub-images.
+
+- QImageReader
+    * [138500] Added the QImageReader::autoDetectImageFormat() function.
+
+- QKeySequence:
+    * Added QKeySequence::SaveAs which has values for both GNOME and Mac OS X.
+    * [154172] Improved toString(NativeText) to return more native glyphs on
+      Mac OS X.
+
+- QLabel
+    * [226479] Fixed update if showing a QMovie that changes its size.
+    * [233538] Fixed behavior involving changing the color of a label with a
+      style sheet and pseudo-state.
+
+- QLineEdit
+    * [179777] Ensured that PasswordEchoOnEdit shows asterisks correctly.
+    * [229938] Fixed issue that could cause textChanged() to be emitted when
+      there was a maximum length set, even though the text was not changed.
+    * [210502] Fixed case-insensitive inline completion.
+
+- QLineF
+    * [241464] Fixed issue that could cause intersects() to be numerically
+      unstable in corner cases.
+      The function has been rewritten to be faster and more robust.
+
+- QListView
+    * [217070] Fixed issue that could cause scroll bars to appear in adjusted
+      icon mode.
+    * [210733] Made improvements in the way the pagestep is computed.
+    * [197825] Ensured that hidden items are not selectable.
+
+- QLocalServer
+    * Added new removeServer() static method to allow the socket file to be
+      deleted after an application has crashed.
+
+- QMacStyle
+    * [232298] Draw the sort indicators in the correct direction for table
+      headers.
+    * [198372] Give context sub-menus the correct mask.
+    * [209103] [232218] QToolButton::DelayedPopup is now displayed correctly.
+    * [221967] Bold header text now uses the correct color.
+    * [234491] Also the menu's QFont when when drawing menu items.
+    * Ensure the proper pressed look for tabs on Leopard.
+
+- QMainWindow
+    * [192392] Stop excessive updates with unified toolbars when changing the
+      enabled status of an action.
+    * [195259] Ensured that the toolbar button is shown when the unified
+      toolbar is created later.
+
+- QMessageBox
+    * [224094] Fixed crash that could occur when specifying a default button
+      that was not one of the buttons listed.
+    * [223451] Fixed a memory leak on a static pointer when the application
+      exits.
+
+- QMainWindow
+    * [224116] [228995] [228738] save/restoreState() would not always restore
+      the toolbars in the correct positions.
+    * [215430] Fixed issue that meant that the user could dock widgets and
+      they wouldn't be tabbed even if ForceTabbedDocks was set.
+    * [240184] Fixed an issue that caused QDockWidget to get smaller and
+      smaller by docking and undocking.
+    * [186562] Fixed layout when saving the state with an undocked dock widget
+      and then restoring it
+    * [228110] Re-adding a toobar now also re-docks it.
+    * [232431] Fixed a memory leak caused by setting centralWidget multiple
+      times.
+
+- QMenu
+    * [220965] [222978] Style sheets: Made it possible to set border and
+      gradient on items.
+
+- QMenuBar
+    * [228658] Fixed broken activated signal behavior.
+    * [233622] Fixed the repaint when a dialog is invoked
+
+- QMdiArea
+    * [233264] Mac OS X: Improved performance when dragging sub-windows
+      around.
+    * [233267] [234002] [219646] Removed flickering behavior that could occur
+      when switching between maximized sub-windows.
+
+- QNetworkReply:
+    * [235584] Fixed a bug that would cause sslConfiguration() to
+      return a null object if finished() had already been emitted.
+
+- QOpenGLPaintEngine
+    * [244918] Fixed a problem with drawing text and polygons onto software
+      rendering GL contexts.
+
+- QPainterPath
+    * [234220] Fixed crash due to a division by zero function in
+      addRoundedRect().
+
+- QPicture
+    * [226315] Fixed an assert when trying to load picture files created with
+      Qt 3 into Qt 4.
+
+- QPixmap
+    * [223800] Fixed a bug where grabWindow() on a QScrollArea did not work
+      the first time.
+    * [217815] Fixed a bug where grabWidget() did not work properly for
+      resized and hidden widgets.
+    * [229095] Mac OS X: Fixed issue that could cause grabWindow() to grab the
+      wrong parts of the window for child widgets.
+
+- QPlastiqueStyle
+    * [195446] Ensured that the background is now painted on selected but
+      disabled menu items for improved keyboard navigation.
+    * [231660] Fixed support for custom icon size in tab bars.
+    * [211679] drawPartialFrame() now passes the widget pointer.
+
+- QPainter
+    * QPainter::font(), brush(), pen(), background():
+      These functions will return default constructed objects when the
+      painter is inactive.
+    * [242780] Fixed segmentation fault that could occur when setting
+      parameters on an uninitialized QPainter.
+    * [89727] Added support for raster operations.
+    * [197104] More well-defined gradient lookup (linear gradients are now
+      perfectly symmetric if inverting the color stops).
+    * [239817] Fixed bug where overline/strike-out would be drawn with the
+      wrong line width compared to the underline.
+    * [243759] Fixed some off-by-one errors in the extended composition modes
+      in the raster paint engine.
+    * [234891, 229459, 232012] Fixed some corner case bugs in the raster paint
+      engine line/rectangle drawing.
+    * Fixed the "one pixel less" clipping bug caused by precision lost when
+      converting to int.
+    * Fixed the composition mode in QPainter raster which was not properly set.
+    * Fixed an assert when the painter is reused after a previous bad usage
+      (e.g., painting on a null pixmap).
+
+- QPainterPath
+    * Added convenience operators: +, -, &, |, +=, -=, &= and |=.
+
+- QPrinter
+    * [232415] Fixed a problem that caused a an invalid QPrinter
+      object to not update its validity after being passed into a
+      QPrintDialog.
+    * [215401] Fixed the size of the Executive paper format.
+    * [202113] Improved speed when printing to a highres PostScript printer.
+    * [195028] Trying to print to a non-existing file didn't update the validity
+      of the QPrinter object correctly.
+    * [134820] Support CUPS printer instances on Unix systems (Mac and X11).
+    * [201875] Fixed a bug that caused the fill opacity of a brush to be used
+      for the stroke in certain cases.
+    * [222056] Fixed absolute letter spacing when printing.
+    * [234135] Fixed a problem with custom margins for CUPS printers.
+
+- QPrintDialog
+    * [232207] When printing to a Qt .pdf or .ps printer under Windows or
+      Mac OS X, pop up a file dialog instead of the native print dialog.
+
+- QPrintPreviewDialog
+    * [236418] Fixed a problem that caused opening several QPrintPreviewDialogs
+      and printing to them at the same time crash.
+
+- QProcess
+    * [230929] (Unix) Open redirection files in 64-bit mode wherever supported.
+
+- QProgressDialog
+    * [215050] Properly stop internal timer that retriggered for no reason.
+
+- QProgressBar
+    * [216911] stylesheet bug if minimum value != 0
+    * [222872] Use the orientation when determining if we should repaint.
+
+- QRadioButton
+    * [235761] Fixed navigation with arrow keys when buttons are in different layout
+
+- QRegion
+    * [200586] Make QRegion a lot smarter when converting from a QPolygon, to avoid
+      creating a lot of needless rectangles.
+    * For Mac OS X, add QRegion::toQDRgn(), QRegion::toHIMutableShape() and
+      corresponding ::fromQDRgn() and ::fromHIShape(). The ::handle() is still
+      available for 32-bit Mac OS X builds and is the equivalent of ::toQDRgn().
+
+- QScrollArea
+    * [206497] Stylesheet: It's now possible to style the corner with ::corner
+
+- QScrollBar
+    * [230253] Simple stylesheets doesn't break the scrollbar anymore.
+
+- QSettings
+    * [191901] Added methods setIniCodec() and iniCodec() for changing the codec of .ini files.
+
+- QSharedMemory
+    * Don't deadlock when locking an already-held lock.
+
+- QSortFilterProxyModel
+    * [236755] Hidden columns in QTableView could become visible
+    * [234419] Fixed a data corruption when adding child and row is filtered out
+
+- QSslSocket
+    * [189980] Ensure OpenSSL_add_all_algorithms() is called.
+
+- QSslCertificate
+    * [186084] Fixed a bug that would cause timezones in certificate
+      times not to be parsed correctly, leading to valid certificates
+      not being accepted
+
+- QSslConfiguration
+    * [237535] Fixed a bug that would cause QSslConfiguration objects
+      to leak memory and eventually corrupt data due to wrong
+      reference counting.
+
+- QStandardItemModel
+    * [227426] Fixed drag and drop of hierarchy
+    * [242918] Added ability to change flags of the root item.
+
+- QString
+    * [205837] Qt 4.4: format string warnings / small QString conversion
+      clean up.
+
+- QSvgRenderer
+    * [226522] Fixed fill-opacity when fill is a gradient.
+    * [241357] Fixed gradients with two or more stop colors at the same offset.
+    * [180846] Fixed small font sizes.
+    * [192203] Add support for gzip-compressed SVG files.
+    * [172004] Respect the text-anchor attribute for embedded SVG-fonts.
+    * [199176] Ensure QSvgGenerator handles fractional font sizes
+    * [151078] Fix parsing of embedded fonts in files that have <metadata> tags
+
+- QSystemTrayIcon
+    * [195943] QSystemTrayIcon now accepts right mouse clicks on Mac OS X.
+    * [241613] Hide the tooltip when open the menu on Mac OS X.
+    * [237911] Only emit QMenu::triggered once on Mac OS X.
+    * [196024] Make it possible to disable context menus on Mac OS X.
+
+- QTabBar
+    * [213374] Fixed position of label in vertical bar with stylesheet
+
+- QtScript
+    * [177665] Added QScriptEngine::checkSyntax(), which provides information
+      about the syntactical (in)correctness of a program.
+      QScriptEngine::canEvaluate() has been obsoleted.
+    * [192955] Added the ability to exclude the QObject::deleteLater() slot
+      from the dynamic QObject binding, so that scripts can't delete
+      application objects.
+    * [212277] Fixed issue where the wrong prototype object was set when a
+      polymorphic type was returned from a slot.
+    * [213853] Fixed issue that could cause events to be processed less
+      frequently than what's set with QScriptEngine::setProcessEventsInterval().
+    * [217781] Fixed bug that caused the typeof operator to return "function"
+      when applied to a QObject wrapper object.
+    * [219412] Fixed bug that could cause the in operator to produce wrong results
+      for properties of Array objects.
+    * [227063] Fixed issue where a break statement caused an infinite loop.
+    * [231741] Fixed bug that could cause the implementation of the delete
+      operator to assert.
+    * [232987] QtScript now calls QObject::connectNotify() and
+      QObject::disconnectNotify().
+    * [233346] Fixed issue where the garbage collector would not be triggered when
+      very long strings were created, causing excessive memory usage.
+    * [233624] Fixed bug that caused enums in namespaces to be handled incorrectly.
+    * [235675] Fixed issue where creating a QScriptEngine would interfere with
+      ActiveQt's QVariant handling.
+    * [236467] Fixed bug that caused QtScript to treat a virtual slot redeclared by
+      a subclass as an overload of the base class's slot.
+    * [240331] Fixed bug that caused QtScript to crash when one of the unary
+      operators ++ and -- was applied to an undefined variable.
+    * If a signal has overloads, an error will now be thrown if you try to connect
+      to the signal only by name; the full signature of a specific overload must
+      be used.
+    * Added support for multi-line string literals.
+    * Added QScriptEngine::setGlobalObject().
+    * Made it possible to use reserved identifiers as property names in
+      contexts where there is no ambiguity.
+
+- QTcpSocket
+    * [235173] Fixed a bug that would cause QTcpSocket re-enter
+    select(2) with an uninitialized timer (when the first call got
+    interrupted by a signal).
+
+- QTextCursor
+    * [244408] Fixed regression in QTextCursor::WordUnderCursor behavior.
+
+- QTextCodec
+    * [227865] QTextCodec::codecForIndex(int) broken in Qt3Support
+
+- QTextEdit
+    * [164503, 232857] Fixed issues where using NoWrap caused
+      selection/background colors to not cover full width of text control.
+    * [186044] Fixed whitespace handling when copying text from Microsoft Word
+      or Firefox.
+    * [228406] Fixed parenthesis characters with RTL layout direction on
+      Embedded Linux.
+    * [189989] Fixed QTextEdit update after layout direction change.
+
+- QTextStream
+    * [210933] It is now possible to specify a locale which
+      QTextStream should use for text conversions.
+
+- QToolBar
+    * [193511] Fixed stylesheet on undocked toolbar
+    * [226487] Fixed the layout when the QMainWindow as a central widget with
+      fixed size.
+    * [220177] Fixed the layout not taking the spacing into account
+
+- QToolButton
+    * [222578] Fixed issues with checked and disabled tool buttons in some
+      styles.
+    * Tool button now allows independent hover styling on it's subcontrols.
+    * [167075] [220448] [216715] Polished stylesheet color, background, and
+      border.
+    * [229397] Fixed regression against Qt3 where setPopupDelay(0) did not
+      work as expected.
+
+- QToolTip
+    * [228416] Fixed style sheet tooltips on windows.
+
+- QTreeView
+    * [220494] scrollTo() didn't scroll horizontally if the vertical bar was
+      already at the correct position.
+    * [216717] Fixed update when children are added.
+    * [225029] Fixed bug that prevented focus from being shown for
+      non-selectable items when allColumnsShowFocus is set to true.
+    * [226160] Fixed hit detection when first column is moved.
+    * [225539] Fixed a crash when deleting the model.
+    * [241208] Fixed animation when using persistent editors.
+    * [202073] Fixed visualRect which would not take the indentation into
+      account when 1st column is moved.
+    * [230123] Item can no more be expanded with keyboard if
+      setItemsExpandable has been set to false.
+
+- QTreeWidget
+    * [243165] selectAll didn't work before the widget was shown
+    * [238003] setCurrentItem would not expand the parent item
+    * [223130] Fixed drag&drop when sort is enabled that would only drop the
+      first column.
+    * [223950] Only allow to drag items when they have the
+      Qt::ItemIsDragEnabled flag set.
+    * [218661] Made sure our internal model can pass the "modeltest" test
+      suite.
+    * [217309] Fixed issue that caused data() for CheckStateRole to return
+      Checked even if some children were partially checked.
+    * [229807] Fix a redrawing problem when scrolling with a different palette
+      role set on Mac OS X.
+    * [236868] Prevent a crash when dragging an item hidden by a tooltip on
+      Mac OS X.
+
+- QLocale
+    * Added support for narrow format for day and month names.
+    * Day and month names can now also be fetched as a standalone text.
+
+- QDebug
+    * Values of type QBool are now properly outputted with QDebug.
+
+- QUndoStack
+    * [227714] Don't crash when owner group is deleted.
+
+- QUrl
+    * [204981] Made the QUrl tolerant parser more tolerant
+    * Fixed a bug in QUrl's tolerant parsing of stray % characters
+      (not part of %HH sequences), which would cause it to make the
+      URL even worse
+    * [227069] Fixed a bug that would cause QUrl to not parse URLs
+      whose hostnames start with an IP address (like
+      http://1.2.3.4.example.com)
+    * [230642] Fixed a bug that made QUrl not properly produce proper
+      URLs with relative paths
+    * Modified QUrl to not normalize %HH in URLs unless strictly
+      necessary. QUrl now keeps the original %-encoding of the input
+      unless some operation is executed in the QString
+      components. This also allows for %2f to exist in path components.
+
+- QVariant
+    * [215610] prevented assertion when reading from an invalid QDataStream.
+
+- QWidget
+    * [222323] [217819] [209977] Improve Qt's font and palette propagation.
+    * [218568] Revert and reopen task 176809 ("when using
+      Qt::PreventContextMenu policy, the context key menu is still not sent to
+      the widget").
+    * [220502] Ensure that setWindowFilePath() when called with an empty
+      string clears the proxy icon in Mac OS X.
+    * [240147] Enforce exclusivity between the Qt::WA_(Normal|Small|Mini)Size
+    * [168641] Ensure that tablet releases go to the correct widget on X11 and
+      Carbon (i.e., the widget that received the press).
+    * [192565] Fixed a problem with calling QWidget::render(), using a
+      QPrinter as a paint device.
+    * [236565] [168570] Fix regression on X11 where QWidget::restoreGeometry()
+      would restore incorrect geometry if the window was maximized when saved.
+    * [201655] Fix QWidget::scroll() acceleration issue with child widgets on
+      Mac OS X.
+    * [210734] [210734] Fixed a bug where changing the visibility of alien
+      widgets did not generate proper enter/leave events.
+    * [228764] Major improvement of scroll performance.
+    * [238258] [229067] [239678] Flickering with widgets larger than
+      4096x4096 pixels in size.
+    * [141091] Added full support for Qt::WA_StaticContents.
+    * [238709] Fixed a bug where calling clearMask() did not update the view
+      properly.
+    * [213512] Fixed clipping issue with Qt::WA_PaintOutsidePaintEvent widgets.
+    * [230175] Added support for calling render() recursively.
+    * [238115] Fixed painting issues after calling winId().
+
+- QWindowsStyle
+    * [210069] Fixed a bug in the drawing of comboboxes.
+
+- QWindowsVistaStyle
+    * [221668] Respect background color role for item views.
+    * [227360] Current item now gets focus for multiselection views.
+    * [224251] Fixed incorrect painting of inverted and reversed progress
+      bars.
+    * [207836] Fixed a problem with vertical toolbar separators.
+    * [202895] Fixed problem where indeterminate progress bars were not
+      animated when Vista animations were explicitly disabled.
+    * [200899] Message box buttons are now right aligned.
+
+- QWindowsXPStyle
+    * [207242] Fixed a static memleak.
+    * [206418] Fixed missing focus rect on tool buttons.
+    * [188850] Fixed a problem with offsets for sliders.
+    * [110091] Tool buttons with arrows are not styled using black
+      windows arrows due to consistency issues with the native theme.
+
+- QWizard
+    * [204643] Make sure the maximum size of QWizard is computed properly.
+
+- QWorkspace
+    * [125281] fixed active child to be the same when minimizing and restoring
+      the main window.
+
+- QtWebKit
+    * ACID3 score 100 out of 100.
+    * Added support for plugins using Netscape Plugin API (NPAPI) for Windows,
+      Mac OS X, and X11.
+    * [211228] Fixed invisible focus rectangle on push buttons.
+    * [211256] Fixed dragging an image from the web view.
+    * [211273] Fixed static build of Qt with QtWebKit.
+    * [213966] Fixed wrong placement of native widget plugins after scrolling.
+    * [214946] Ensured native plugin instances are deleted properly.
+    * [217574] Fixed cursor problem on text input field after focus change.
+    * [218957] Fixed rendering of form elements when using Windows style.
+    * [219344] Added a remark that some web actions have an effect only
+      when contentEditable is true.
+    * [220127] Fixed mouse right click still allowed for disabled view.
+    * [222544] Added an option to print background elements.
+    * [222558] Fixed input method does not work after changing the focus.
+    * [222710, 222713] Fixed issues with TinyMCE editor.
+    * [223447] Ensured that CSS with relative path works on Windows.
+    * [224539] Fixed linkClicked() emitted only once for local anchor URLs.
+    * [225062] Fixed links do not work for QWebView embedded in QGraphicsScene.
+    * [227053] Fixed problem with percent encoded URLs.
+    * [230175] Fixed video rendering when embedded in Graphics View.
+    * [235270] Showed module name when plugin loading fails.
+    * [238330] Prevented multiple instantiation of native widget plugin.
+    * [238391] Prevented crash when printing to file is cancelled.
+    * [238662] Fixed function keys are not mapped.
+    * [241050] Implemented proper painting of CSS gradient.
+    * [241144] Ensured proper actions for some web action types.
+    * [241239] Ensured plugins are not loaded when disabled.
+    * [231301] Fixed an issue on Windows mobile when switching between input
+      modes.
+
+- Q3ButtonGroup
+    * [238902] Q3ButtonGroup now looks for children recursively rather than
+      just the direct children like it did in Qt 3.
+    * [200764] Fixed insertion of buttons with IDs in arbitrary order.
+
+- Q3FileDialog
+    * [230979] Fixed a crash after a resize and drag on scroll bars.
+
+- Q3MainWindow
+    * [240766] Crash while resizing the window while updating layouts.
+
+- Q3ListView
+    * [225648] Fixes infinite update.
+
+- Q3ProgressBar
+    * [132254] Fixed incorrect painting when totalSteps = 0.
+    * [231137] Fixes progress bar disappearing if you set a style sheet to the
+      application.
+
+- StyleSheets
+    * [224095] Fixed white space inside palette().
+    * Fixed setting style on the application may change the appearance of some
+      widgets.
+    * [209123] Fixed Stylesheets causing unnecessary paint events on
+      enterEvent() and leaveEvent().
+    * [209123] Fixed setting gradient background to custom widget.
+
+- QXmlQuery
+    * [223539] Summary: "node" and other typekind keywords are not allowed as
+      an element name when part of for loop.
+
+- QXmlStreamReader
+    * [207024] Added the QXmlStreamAttribute::hasAttribute() function.
+    * [231516] Regression: QXmlStreamWriter produces garbage in "version"
+      attribute of XMLDeclaration.
+
+****************************************************************************
+*                          Examples and demos                              *
+****************************************************************************
+
+- Pad Navigator example
+    * [236416] Provide a minimum window size for this example.
+    * [208616] No longer builds in console mode on Windows.
+
+- Diagram Scene example
+    * [244996] Fix crash when changing the font of a text item and then
+      select other items.
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+- Interbase driver
+
+- MySQL driver
+
+****************************************************************************
+*                             QTestLib                                     *
+****************************************************************************
+
+ - QTestLib now supports writing benchmarks.
+ - Fixed an issue where tests returned exit code 0, even though tests
+   failed in some rare cases.
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Unix
+    * Made the iconv-based QTextCodec class (the "System" codec on
+      Unix systems that support it) stateful. So it's now possible to
+      feed incomplete multibyte sequences to the toUnicode function,
+      as well as the first character in a UTF-16 surrogate pair.
+
+X11
+    * Added a QGtkStyle to integrate with GTK+ based desktop environments.
+    * If font config is used the default font-substitutions will no longer be
+      used instead we rely on fontconfig to determine font substitutions as
+      required.
+    * Improved support for KDE4 desktop settings.
+    * [214071] Improved support for custom freedesktop icon themes.
+    * [195256] Use FreeType's subpixel filtering if available, thus honoring
+      Font Config's LCD filter settings.
+    * Added supported for XFIXES X11 extension for proper clipboard
+      support when non-Qt application owns the clipboard.
+    * Icon support for top level windows (_NET_WM_ICON) was improved
+      to support several icons with different sizes.
+    * [211240] In some cases QFileSystemWatcher didn't notify about
+      files that were moved over another files.
+    * [238743] Added support for the _NET_SYSTEM_TRAY_VISUAL property
+      to use the same visual the system tray manager asks us to use.
+    * [229593] Fix font matching with old fontconfig versions.
+    * [167873] Proper event compression for mouse events when using tablets.
+    * [208181] Fix averageCharWidth to be consistent for y!=x ppem
+    * [229070] Fix QPrintDialog assertion
+    * [211678] Fixed a problem with drawing a QPixmaps on different X11
+      screens.
+    * [221362] Fixed a problem where pixmaps only appeared on the first page
+      in a print preview.
+    * [232666] Fixed a problem with custom page sizes for CUPS printers.
+    * [228770] Fixed a problem that caused the .ps and .pdf filename
+      extensions
+      to not update in the CUPS printer dialog when printing to file.
+    * [230372] Fixed a problem where the number of copies set on a QPrinter
+      object wasn't picked up and updated properly in a QPrintDialog.
+
+Windows
+    * Cleartype rendering was previously supported onto QImages with
+      an ARGB32 channel. For performance reasons, cleartype is now
+      only supported on opaque images using the RGB32 or
+      ARGB32_Premultipled format. Widget and pixmap rendering is
+      unchanged
+    * [175075] Antialiased font rendering quality has been greatly improved
+      by taking gamma correction into account. We should now match the native
+      Windows font rendering better, and the fonts look better in general when
+      drawing fonts on different backgrounds.
+    * [221132] Fixed a problem with System Tray menu visibility.
+    * [221653] Fixed a problem incorrectly causing a Task Bar status change.
+    * [202890] Improved platform consistency with spacing in menus.
+    * [157323] QCombobox now slides to open on relevant platforms.
+    * [237067] Calling showMessage on QSystemTrayIcon with empty arguments
+      now hides the current message.
+    * [145612] Setting an object name for a QThread sets the name that
+      is visible in the debugger for more easy debugging
+      multi-threaded application.
+    * [216664] QLocale now follows the current system locale when the
+      user changes it in the Windows Control Panel.
+    * [223921] Fix writing system detection of TrueType fonts added
+      via a QByteArray in QFontDatabase::addApplicationFont on Windows.
+    * [205455] 'mailto:' links works properly with QDesktopServices::openUrl().
+    * [205516] standardPalette() now returns the system palette for XP and
+      Vista styles.
+    * [207506] Fixed an issue which switches the alignment for input widgets
+      on Vista.
+    * [223951] Added support for VARIANT with IDispatch in ActiveQt.
+    * [224910] Fixed a crash when using the Hierarchy ActiveQt example.
+    * [201223] 'dumpcpp' now prepends the 'classname_' to resolve conflicts.
+    * [198556] QAxServer registering now takes care of '.' before MIME
+      extension.
+    * [223973] Fixed a deadlock in QLocalSocket.
+    * [193077] Fixed activation of ActiveQt widgets in MFC MDI applications.
+    * [238273] Fixed a crash while editing QTableView using japanese IME.
+    * [238672] Fixed a crash when deleting a widget while dragging.
+    * [241901] ActiveQt now supports [out VARIANT*] parameters.
+    * Fix a GDI object leak on the qfileiconprovider.
+    * [200269] Application and systray icons on Windows that had an alpha
+      channel were not drawn correctly.
+    * [239558] Fix a possible crash when reading XPM data containing trigraphs
+      with the Microsoft compilers.
+    * [204440] Fixed a problem with software rendering contexts on Windows,
+      which might have caused rendering errors due to to unresolved extension
+      pointers.
+    * [232263] Fixed a problem with binding textures to a software context
+      under Windows.
+    * [238715] Fixed a problem with alpha-blended cursors under Windows.
+    * [227297] and [232666] Fixed some problems with custom paper
+      sizes under Windows.
+    * [217259] The default printer wasn't correcly detected with some versions
+      of Windows.
+    * [212886] Fixed a problem with network printers not being listed by
+      the QPrinterInfo::availablePrinters() function under Windows.
+    * [205985] Fixed a problem with reusing a QPrinter object to print several
+      jobs with the Microsoft XPS printer driver.
+    * [196281] Fixed QPrinter::setPrintRange() to work under Windows.
+
+Windows CE
+    * Support for QLocalSocket and QLocalServer added.
+    * QtWebKit and Phonon are now supported.
+    * One can mark a widget with the attribute WA_ExpectsKeyboardInput
+      to automatically display / hide the standard input panel on focus
+      events.
+    * [223523] Reimplementations of standard library functions filled the
+      global namespace causing problems when linking statically to other third
+      party libraries using the same attempt.
+    * Support for using OpenSSL with Qt on Windows CE
+
+Mac OS X
+    * Added the macdeployqt tool that simplifies application deployment.
+    * Improved support of widget stylesheet in Mac.
+    * [218980] - Stacking order of windows and dialogs is fixed, such that
+      dialogs always floats above normal windows, even when the dialog is told
+      to behave as a window.
+    * [219844] - A crash that occurred when using the search buttons on a
+      native file dialog is fixed.
+    * [225705] - FileDialog filters not displaying correctly is fixed.
+    * [239155] - Pop-ups will now close when clicking on a window other than
+      the modal window that opened the pop-up.
+    * [210912] - Show event not sent when reshowing a window from minimized
+      state is fixed.
+    * [228017] - QMenu will now close when expanding a system menu.
+    * Added support for Qt to use Cocoa as its backend instead of Carbon. This
+      is primarily for 64-bit applications, but is also available for 32-bit
+      frameworks as well. 32-bit is still Carbon by default. Passing a 64-bit
+      architecture or -cocoa on the command-line will build Qt against Cocoa.
+      Using Cocoa requires Mac OS X 10.5 (or higher) and cannot be used with
+      the -static nor -no-frameworks option. The define QT_MAC_USE_COCOA is
+      available when Qt is built against Cocoa.
+    * Fix a bug that would prevent a window that had been maximized via
+      setMaximized() to go back to normal size when clicking on the window's
+      maximize button.
+    * Added QMacCocoaViewContainer for embedding Cocoa (NSView) controls into
+      a Qt hierarchy. This feature works for either Carbon or Cocoa, but
+      requires Mac OS X 10.5 or greater.
+    * Added QMacNativeWidget for embedding Qt widgets into non-Qt windows
+      (Carbon or Cocoa).
+    * Added MacWindowToolBarButtonHint for controlling whether or not the
+      toolbar button is shown in Qt windows.
+    * QEvents posted via QEventLoop::postEvent() are now treated as a standard
+      event loop source, like timers and normal input events. This means that
+      is should no longer be necessary to run a busy loop to sendPostedEvents()
+      when QApplication is not the main event loop (e.g. when using Qt in a
+      plugin).
+    * [239646] Shortcuts for sub-menu are now disabled when the menu item is
+      disabled.
+    * [241434] Honor the LSBackgroundOnly attribute if it exists in the
+      application's Info.plist.
+    * [239908] More robustness when encountering different types in reading
+      LSUIElement value.
+    * [234742] Add support Qt::XButton1 and Qt::XButton2.
+    * [236203] Much better support for loading multiple Qt's with different
+      namespaces.
+    * Add Qt::AA_MacPluginApplication that allows bypassing some native menu
+      bar initialization that is usually not desired when running Qt in a
+      plugin.
+    * [205297] Applications Dialogs are now marked as application modal in
+      Carbon.
+    * Tooltip base is now set correctly in the application palette.
+    * [222912] [241603] Qt applications no longer reset their palette back to
+      the system palette on every application activate. Only if the values
+      from the system are different from the last time. This should result in
+      custom palette colors/brushes being kept across application activations.
+    * [211758] Fixed a clipping problem when printing multiple pages on a Mac
+      OS X printer.
+    * [212884] Fixed a crash when printing images on Mac OS X.
+    * [219877] Fixed a problem with a QPrinter object not being valid after
+      setting the output format to PDF or PostScript.
+    * [229406] Fixed crash when display mirroring gets enabled.
+    * [189588] Fixed a bug where QColorDialog::getColor(...) always returned a
+      valid color.
+
+Qt for Embedded Linux
+ - Screen drivers
+   * The SVGAlib driver is no longer supported, due to architectural changes.
+   * [235785] Detect VGA16 video mode and warn that it is not supported.
+
+ - Mouse and keyboard drivers
+   * [243374] Fixed bug where PC mouse driver could not be loaded when
+     configured as loadable plugins.
+   * Added Linux Input Subsystem mouse and keypad drivers
+
+ - General fixes
+   * [242922] Run as server by default when compiled with the
+     QT_NO_QWS_MULTIPROCESS macro defined.
+   * Fixed bugs where wrong cursor would be shown in some cases.
+   * Respect min/max size on initial show also for windows without a layout.
+   * Fixed loading of font plugins when QT_NO_FREETYPE is defined.
+   * Autodetect PowerPC in configure.
+   * Add support for precompiled headers.
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+- Build System
+    * [218795] add support for -nomake configure option on Windows to
+      exclude build parts like on other platforms
+    * The -tablet configure option on X11 was renamed to -xinput
+    * [136723] Have moc issue a warning if a Q_PROPERTY declaration does not
+      contain a READ accessor function.
+    * [188529] Fixed bug that caused moc to get stuck in an infinite loop if
+      two files included eachother and the include path had the prefix "./".
+    * [203379] Changed moc code generator so that lint no longer reports
+      problems with the generated code.
+    * [210879] moc no longer generates any implementation for pure virtual
+       signals.
+    * [234909] Fixed bug that caused moc to treat /*/ as a full C comment.
+
+- Assistant
+
+- Designer
+    * Added filter widgets in Widget Box and Property Editor.
+    * Added layout state display to Object Inspector.
+    * Enabled changing the layout type of laid-out containers.
+    * Added handling of spanning QFormLayout columns.
+    * Added convenience dialog to quickly populate QFormLayouts.
+    * Added support for embedded device design profiles.
+    * Changed the selection modifiers to comply to standards; enabled
+      rectangle selection using the middle mouse button; added
+      shift-click-modifier to cycle parents when selecting.
+    * Added "translatable" flag and disambiguation comment to string
+      properties.
+    * Added attribute editors to item-based widgets.
+    * Changed QUiLoader to use QXmlStreamReader instead of QDom.
+    * Ui files with unknown elements are now rejected.
+    * [123592] While dropping a dock widget a main window - make the dock
+      "docked".
+    * [126269] Added the ability to morph widgets into compatible widgets.
+    * [126997] Added support for QButtonGroup.
+    * [145813] Added a listing function to obtain the available layouts to
+      QUiLoader.
+    * [155837] Added support for QWizard.
+    * [164520] Added automatic detection of changes to the qrc resource files
+      from external sources.
+    * [166501] Added "translatable" checkbox to string properties making it
+      possible to exclude it from the translation.
+    * [171900] Indicate Qt 3 compatibility signals and slots using a different
+      color.
+    * [173873] Position pasted widgets at mouse position if possible.
+    * [183637] Introduced Widget Box "Icon view" mode to reduce scrolling,
+      available via context menu.
+    * [183671] Added automatic retranslation upon language change of UIs
+      loaded via QUiLoader.
+    * [185283] Added incremental search facility to Object Inspector.
+    * [191789] Added pkgconfig-Files for Qt Designer libraries.
+    * [198414] Enabled promotion of QMenu/QMenuBar by object inspector context
+      menu.
+    * [201505] Extended QDesignerIntegration::objectNameChanged() to pass on
+      old object name.
+    * [202256] Fixed action editor and object inspector not to resize header
+      when switching forms.
+    * [211422] Fixed QScrollArea support to handle custom QScrollArea widgets
+      with internal children.
+    * [211906] Enable promotion of unmanaged widgets by object inspector
+      context menu.
+    * [211962] Enabled widgets to span columns in a QFormLayout.
+    * [212378] Made the rich text editor dialog, the plain text editor dialog
+      and the style sheet editor dialog remember their geometry.
+    * [213481] Fixed a crash while form loading by preventing it from
+      adding layouts to unknown layout types.
+    * [219381] Fixed Action editor to reflect changing the shortcut in the
+      property editor.
+    * [219382] Added tooltip, checkable and shortcut properties to the action
+      editor dialog.
+    * [219405] Added support for the stretch and minimum size properties of
+      QBoxLayout and QGridLayout.
+    * [219492] Added an icon preview to the resource image file dialog on X11.
+    * [220148] Fixed handling of the QMainWindow::unifiedTitleAndToolBarOnMac
+      property.
+    * [223114] Fixed a crash on removing a dynamic QUrl property.
+    * [229568] Added Q3ComboBox.
+    * [230818] Fixed a bug which caused duplicate names to occur when
+      copying & pasting spacers.
+    * [233403] Fixed a painting bug which caused red line layout markers to
+      disappear depending on grid settings.
+    * [233711] Added a warning when saving a container-extension-type
+      container with unmanaged pages.
+    * [234222] Fixed a bug which caused the autoFillBackground property to be
+      reset during Drag and Drop operations.
+    * [234326] Fixed the QDesignerIntegration::objectNameChanged() signal to
+      work correctly.
+    * [236193] Fixed a crash caused by invalid QSizePolicy values resulting
+      from Qt 3 conversion.
+    * [238524] Ignore constructor-added items of custom widgets inheriting
+      QComboBox.
+    * [238707] Fixed pkgconfig file generation to honour -qt-libinfix.
+    * [238907] Disabled reordering of Spacers and Layouts causing uic to
+      warn "<name> isn't a valid widget".
+    * [232811] Correctly show empty string values in preview.
+    * [214637] Single click expands/collapses classes in property editor
+    * [241949] Update the object inspector properly in case of undoing a
+      reparent widget command.
+
+- uic
+  * Ui files with unknown XML elements are now rejected.
+  * [220796] Added code for adding items to widgets of class Q3ComboBox.
+
+- uic3
+
+  * [231911] Fixed the conversion of boolean font attributes.
+  * [233802] Fixed -extract option on Windows.
+  * [236193] Fixed the conversion of QSizePolicy's "Ignored" value.
+
+- Linguist
+
+  - Linguist GUI
+
+    * Much improved form preview tool
+    * Removed translations column from message index for it being useless.
+    * Phrasebooks have language settings now
+    * [141788] Support translating into multiple languages simultaneously.
+    * [183210] Whitespace is now visualized
+    * [182866] Font resizing in translation textedits
+    * [187765] Support opening files via Drag & Drop
+
+  - Entire Linguist toolchain
+
+   - [201713] Add support for specifying the source language.
+
+    - file formats
+
+      * The .qm files now can be read back by the toolchain, not only Qt.
+      * Added support for GNU Gettext .po files.
+
+      - Qt's own .ts format
+
+        * New element <extracomment> to store purely informative comments
+        * New element <translatorcomment> to store comments from translators
+        * New element wildcard <extra:*> to support user extensions
+        * New elements <oldsource> and <oldcomment> to store values from
+          before the last heuristic merge by lupdate
+
+  - lupdate
+
+    * Parse //: and /*: */ comments as extra comments for translations.
+    * Added support for new QT_TR*() macros.
+    * Added support for QtScript.
+    * Better error reporting.
+    * More accurate processing of .pro files.
+    * Added options -disable-heuristic, -nosort, -target-language,
+      -source-language.
+    * [197391] Support for storing source code references with relative
+      line numbers or no references at all. Omit line numbers from .ui file
+      references at all. These reduce the size of patches and avoid merge
+      conflicts. Option -locations.
+    * [197818] Add support for UTF-16 encoded sources.
+    * [209778, 222637] Somewhat improved C++ parser, in particular with
+      respect to namespaces.
+    * [218671] Accept Q_DECLARE_TR_FUNCTIONS.
+    * [212465] Default context is now the empty string, not "@default".
+      This codifies what previously was an intermittent bug.
+    * [220459] Collect all source code references for each message.
+
+  - lconvert
+
+    * New tool for converting between file formats and filtering file contents.
+
+- configure
+
+- qtconfig
+  * Added option to set style and palette settings back to system defaults.
+
+- qt3to4
+  * [218928] [219127] [219132] [219482] Misc. updates to the porting replacement rules.
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
+- QTiffPlugin
+- QSvgIconEngine
+
+****************************************************************************
+*                   Important Behavior Changes                             *
+****************************************************************************
+
+- Event filters
+
+- QFileDialog
+        On Mac, native dialogs are now used when calling show, open, or exec
+        on a QFileDialog, QColorDialog, QPrintDialog, or QFontDialog (i.e not
+        only when using the static functions)
+
+        QFileDialog/QFileSystemModel always return Qt separators ("/")
+        regardless of the platform. It can still handle native separators for
+        Windows. To convert the Qt separators to native separators use
+        QDir::toNativeSeparators().
+
+- QGraphicsTextItem
+        Tab input is send to the document by default, inserting a <tab>
+        character. You can get the old behavior of switching Tab focus by
+        setting setTabChangesFocus(true) (QGraphicsTextItem's Tab handling now
+        behaves identically to QTextEdit and QTextBrowser).
+
+- QGraphicsView
+        QGraphicsView now propagates Qt::Key_Tab and Qt::Key_Backtab to the
+        scene, which sends this to the items. Similar to how QWidget works,
+        this event is caught in QGraphicsItem::sceneEvent() and
+        QGraphicsWidget::event() to handle tab input. Tab input is also
+        proxied to embedded widgets. This allows and item or widget to handle
+        Tab keys (e.g., text input).
+
+- QLocale
+        The locale database was updated to the Unicode CLDR database
+        version 1.6.1
+
+        When the system locale is changed, the LocaleChange event will
+        be sent to all widgets that don't have a locale explicitely
+        set.
+
+- QWebPage
+        Starting with Qt 4.5, the base brush is used for the default
+        background color of the web page. Before, it was the background
+        brush.
+
+- QWidget
+        Font and palette settings assigned to QWidget directly take
+        precedence over application fonts and palettes.
+
+        Focus policies that are set on a widget are now propagated to
+        a focus proxy widget if there is one.
+
+        Windows with fixed size (that are set with QWidget::setFixedSize()
+        function or Qt::MSWindowsFixedSizeDialogHint window hint) might
+        not have a maximize button on the titlebar.
+
+        The behaviour of the window hints was changed to follow the
+        documentation. When the Qt::CustomizeWindowHint is set, the
+        window will not have a titlebar, system menu and titlebar
+        buttons unless the corresponding window hints were explicitely
+        set.
+
+        Setting Qt::WA_PaintOnScreen no longer has any effect on
+        normal widgets. The flag can still be used in conjuction with
+        reimplementing paintEngine() to return 0 so that GDI or
+        DirectX can be used, as previously documented.
diff --git a/doc/doc.pri b/doc/doc.pri
new file mode 100644
index 0000000000..6b77f88d45
--- /dev/null
+++ b/doc/doc.pri
@@ -0,0 +1,72 @@
+#####################################################################
+# Qt documentation build
+#####################################################################
+
+win32 {
+    QT_WINCONFIG = release/
+    CONFIG(debug, debug|release) {
+        QT_WINCONFIG = debug/
+    }
+}
+
+DOCS_GENERATION_DEFINES = -Dopensourceedition
+GENERATOR = $$QT_BUILD_TREE/bin/qhelpgenerator
+
+win32:!win32-g++ {
+    unixstyle = false
+} else :win32-g++:isEmpty(QMAKE_SH) {
+    unixstyle = false
+} else {
+    unixstyle = true
+}
+
+$$unixstyle {
+    QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && QT_BUILD_TREE=$$QT_BUILD_TREE QT_SOURCE_TREE=$$QT_SOURCE_TREE $$QT_BUILD_TREE/tools/qdoc3/$${QT_WINCONFIG}qdoc3 $$DOCS_GENERATION_DEFINES
+} else {
+    QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QT_BUILD_TREE/tools/qdoc3/$${QT_WINCONFIG}qdoc3.exe $$DOCS_GENERATION_DEFINES
+    QDOC = $$replace(QDOC, "/", "\\\\")
+}
+macx {
+    ADP_DOCS_QDOCCONF_FILE = qt-build-docs-with-xcode.qdocconf
+} else {
+    ADP_DOCS_QDOCCONF_FILE = qt-build-docs.qdocconf
+}
+QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \
+                    linguist.qdocconf qmake.qdocconf) && \
+               (cd $$QT_BUILD_TREE && \
+                    $$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \
+                    $$GENERATOR doc-build/html-assistant/assistant.qhp -o doc/qch/assistant.qch && \
+                    $$GENERATOR doc-build/html-designer/designer.qhp -o doc/qch/designer.qch && \
+                    $$GENERATOR doc-build/html-linguist/linguist.qhp -o doc/qch/linguist.qch && \
+                    $$GENERATOR doc-build/html-qmake/qmake.qhp -o doc/qch/qmake.qch \
+               )
+
+win32-g++:isEmpty(QMAKE_SH) {
+	QT_DOCUMENTATION = $$replace(QT_DOCUMENTATION, "/", "\\\\")
+}
+
+
+!wince*:!cross_compile:SUBDIRS += tools/qdoc3
+
+# Build rules:
+adp_docs.commands = ($$QDOC $$ADP_DOCS_QDOCCONF_FILE)
+adp_docs.depends += sub-tools-qdoc3
+qch_docs.commands = $$QT_DOCUMENTATION
+qch_docs.depends += sub-tools
+
+docs.depends = adp_docs qch_docs
+
+# Install rules
+htmldocs.files = $$QT_BUILD_TREE/doc/html
+htmldocs.path = $$[QT_INSTALL_DOCS]
+htmldocs.CONFIG += no_check_exist
+
+qchdocs.files= $$QT_BUILD_TREE/doc/qch
+qchdocs.path = $$[QT_INSTALL_DOCS]
+qchdocs.CONFIG += no_check_exist
+
+docimages.files = $$QT_BUILD_TREE/doc/src/images
+docimages.path = $$[QT_INSTALL_DOCS]/src
+
+QMAKE_EXTRA_TARGETS += qdoc adp_docs qch_docs docs
+INSTALLS += htmldocs qchdocs docimages
diff --git a/doc/src/3rdparty.qdoc b/doc/src/3rdparty.qdoc
new file mode 100644
index 0000000000..a87878e8be
--- /dev/null
+++ b/doc/src/3rdparty.qdoc
@@ -0,0 +1,272 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page 3rdparty.html
+
+    \title Third-Party Licenses Used in Qt
+    \ingroup licensing
+    \brief License information for third-party libraries supplied with Qt.
+
+    Qt includes a number of third-party libraries that are used to provide
+    certain features. Unlike the code described in the
+    \l{Other Licenses Used in Qt}{code used in Qt} document, these
+    libraries are supplied alongside the Qt modules.
+
+    Third Party Software may impose additional restrictions and it is the
+    user's responsibility to ensure that they have met the licensing
+    requirements of the GPL, LGPL, or Qt Commercial license and the relevant
+    license of the Third Party Software they are using.
+
+    Run \c{configure -help} to see any options that may be available for
+    controlling the use of these libraries.
+
+    \tableofcontents
+
+    \section1 FreeType 2 (\c freetype) version 2.3.6
+
+    \e{The FreeType project is a team of volunteers who develop free, portable
+    and high-quality software solutions for digital typography. We specifically
+    target embedded systems and focus on bringing small, efficient and
+    ubiquitous products.} -- quoted from \c 3rdparty/freetype/docs/freetype2.html.
+
+    See \c src/3rdparty/freetype/docs/FTL.txt and \c
+    src/3rdparty/freetype/docs/GPL.txt for license details.
+
+    See also the files in \c src/3rdparty/harfbuzz, which are used by
+    FreeType.
+
+    Parts of the FreeType projects have been modified and put into Qt
+    for use in the painting subsystem. These files are ftraster.h,
+    ftraster.c, ftgrays.h and ftgrays.c. The following modifications
+    has been made to these files:
+
+    \list
+    \i Renamed FT_ and ft_ symbols to QT_FT_ and qt_ft_ to avoid name
+    conflicts.
+    \i Removed parts of code not relevant when compiled with
+    _STANDALONE_ defined.
+    \i Changed behavior in ftraster.c to follow X polygon filling
+    rules.
+    \i Implemented support in ftraster.c for winding / odd even
+    polygon fill rules.
+    \i Replaced bitmap generation with span generation in ftraster.c
+    \i Renamed: ftraster.h to qblackraster_p.h
+    \i Renamed: ftraster.c to qblackraster.c
+    \i Renamed: ftgrays.h to qgrayraster_p.h
+    \i Renamed: ftgrays.c to qgrayraster.c
+    \endlist
+
+    \section1 HarfBuzz (\c harfbuzz)
+
+    \e{This is HarfBuzz, an OpenType Layout engine.}
+
+    \e{It was derived originally from the OpenType code in FreeType-1.x, ported to
+    FreeType2.  (This code has been abandoned for FreeType2, but until something
+    better comes along, should serve our purposes.) In addition to porting to
+    FreeType-2, it has been modified in various other ways.} -- quoted from
+    \c src/3rdparty/harfbuzz/README.
+
+    See \c src/3rdparty/harfbuzz/COPYING.FTL and src/3rdparty/harfbuzz/COPYING.GPL
+    for license details.
+
+    \section1 MD5 (\c md5.cpp and \c md5.h)
+
+    \e{This code implements the MD5 message-digest algorithm.
+    The algorithm is due to Ron Rivest.  This code was
+    written by Colin Plumb in 1993, no copyright is claimed.
+    This code is in the public domain; do with it what you wish.} -- quoted from
+    \c src/3rdparty/md5/md5.h
+
+    See \c src/3rdparty/md5/md5.cpp and \c src/3rdparty/md5/md5.h for more
+    information about the terms and conditions under which the code is
+    supplied.
+
+    \section1 The Independent JPEG Group's JPEG Software (\c libjpeg) version 6b
+
+    \e{This package contains C software to implement JPEG image compression and
+    decompression.  JPEG (pronounced "jay-peg") is a standardized compression
+    method for full-color and gray-scale images.  JPEG is intended for compressing
+    "real-world" scenes; line drawings, cartoons and other non-realistic images
+    are not its strong suit.  JPEG is lossy, meaning that the output image is not
+    exactly identical to the input image.} -- quoted from \c
+    src/3rdparty/libjpeg/README.
+
+    See \c src/3rdparty/libjpeg/README for license details.
+
+    \section1 MNG Library (\c libmng) version 1.0.10
+
+    \e{The libmng library supports decoding, displaying, encoding, and various
+    other manipulations of the Multiple-image Network Graphics (MNG) format
+    image files. It uses the zlib compression library, and optionally the
+    JPEG library by the Independant JPEG Group (IJG) and/or
+    lcms (little cms), a color-management library by Marti Maria Saguer.}
+    -- quoted from \c src/3rdparty/libmng/doc/libmng.txt
+
+    See \c src/3rdparty/libmng/LICENSE for license details.
+
+    \section1 PNG Reference Library (\c libpng) version 1.2.29
+
+    \e{Libpng was written as a companion to the PNG specification, as a way
+    of reducing the amount of time and effort it takes to support the PNG
+    file format in application programs.} -- quoted from \c
+    src/3rdparty/libpng/libpng.txt.
+
+    See \c src/3rdparty/libpng/LICENSE for license details.
+
+    \section1 TIFF Software Distribution (\c libtiff) version 3.8.2
+
+    \e {libtiff is a set of C functions (a library) that support the
+    manipulation of TIFF image files.} -- quoted from \c
+    src/libtiff/html/libtiff.html
+
+    \hr
+
+    Copyright (c) 1988-1997 Sam Leffler\br
+    Copyright (c) 1991-1997 Silicon Graphics, Inc.\br
+    Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>\br
+    Copyright (c) 1997 Greg Ward Larson
+
+    Permission to use, copy, modify, distribute, and sell this software and 
+    its documentation for any purpose is hereby granted without fee, provided
+    that (i) the above copyright notices and this permission notice appear in
+    all copies of the software and related documentation, and (ii) the names of
+    Sam Leffler and Silicon Graphics may not be used in any advertising or
+    publicity relating to the software without the specific, prior written
+    permission of Sam Leffler and Silicon Graphics.
+
+    THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
+    EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
+    WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+
+    IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+    ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+    OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+    WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
+    LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
+    OF THIS SOFTWARE.
+
+    \hr
+
+    Copyright (c) 1996-1997 Sam Leffler\br
+    Copyright (c) 1996 Pixar
+
+    Permission to use, copy, modify, distribute, and sell this software and 
+    its documentation for any purpose is hereby granted without fee, provided
+    that (i) the above copyright notices and this permission notice appear in
+    all copies of the software and related documentation, and (ii) the names of
+    Pixar, Sam Leffler and Silicon Graphics may not be used in any advertising or
+    publicity relating to the software without the specific, prior written
+    permission of Pixar, Sam Leffler and Silicon Graphics.
+
+    THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
+    EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
+    WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+
+    IN NO EVENT SHALL PIXAR, SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+    ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+    OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+    WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
+    LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
+    OF THIS SOFTWARE.
+
+    \hr
+
+    See \c src/3rdparty/libtiff/COPYRIGHT for license details.
+
+    \section1 SQLite (\c sqlite) version 3.5.9
+
+    \e{SQLite is a small C library that implements a
+    self-contained, embeddable, zero-configuration SQL database engine.}
+    -- quoted from \l{http://www.sqlite.org/}{www.sqlite.org}.
+
+    According to the comments in the source files, the code is in the public
+    domain. See the
+    \l{http://www.sqlite.org/copyright.html}{SQLite Copyright} page on the
+    SQLite web site for further information.
+
+    \section1 Wintab API (\c wintab)
+
+    Wintab is a de facto API for pointing devices on Windows. The
+    wintab code is from \l{http://www.pointing.com/WINTAB.HTM}.
+
+    See \c src/3rdparty/wintab/wintab.h for license details.
+
+    \section1 Data Compression Library (\c zlib) version 1.2.3
+
+    \e{zlib is a general purpose data compression library.  All the code
+    is thread safe.  The data format used by the zlib library is described
+    by RFCs (Request for Comments) 1950 to 1952} -- quoted from \c
+    src/3rdparty/zlib/README.
+
+    See \c src/3rdparty/zlib/README for license details.
+
+    \section1 The ptmalloc memory allocator (\c ptmalloc3) version 1.8
+
+    \e ptmcalloc3 is a scalable concurrent memory allocator suitable
+    for use in multi-threaded programs.
+
+    \hr
+
+    Copyright (c) 2001-2006 Wolfram Gloger
+
+    Permission to use, copy, modify, distribute, and sell this software
+    and its documentation for any purpose is hereby granted without fee,
+    provided that (i) the above copyright notices and this permission
+    notice appear in all copies of the software and related documentation,
+    and (ii) the name of Wolfram Gloger may not be used in any advertising
+    or publicity relating to the software.
+
+    THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+    WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+    IN NO EVENT SHALL WOLFRAM GLOGER BE LIABLE FOR ANY SPECIAL,
+    INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY
+    DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+    WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY
+    OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+    PERFORMANCE OF THIS SOFTWARE.
+
+    \hr
+
+    See \c src/3rdparty/ptmalloc/COPYRIGHT for license details.
+*/
diff --git a/doc/src/accelerators.qdoc b/doc/src/accelerators.qdoc
new file mode 100644
index 0000000000..538a245fb9
--- /dev/null
+++ b/doc/src/accelerators.qdoc
@@ -0,0 +1,137 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page accelerators.html
+    \title Standard Accelerator Keys
+    \ingroup gui-programming
+
+    Applications invariably need to define accelerator keys for actions.
+    Qt fully supports accelerators, for example with \l Q3Accel::shortcutKey().
+
+    Here are Microsoft's recommendations for accelerator keys, with
+    comments about the Open Group's recommendations where they exist
+    and differ. For most commands, the Open Group either has no advice or
+    agrees with Microsoft.
+
+    The emboldened letter plus Alt is Microsoft's recommended choice, and
+    we recommend supporting it. For an Apply button, for example, we
+    recommend QAbstractButton::setText(\link QWidget::tr() tr \endlink("&Apply"));
+
+    If you have conflicting commands (e.g. About and Apply buttons in the
+    same dialog), you must decide for yourself.
+
+    \list
+    \i \bold{\underline{A}}bout
+    \i Always on \bold{\underline{T}}op
+    \i \bold{\underline{A}}pply
+    \i \bold{\underline{B}}ack
+    \i \bold{\underline{B}}rowse
+    \i \bold{\underline{C}}lose (CDE: Alt+F4; Alt+F4 is "close window" in Windows)
+    \i \bold{\underline{C}}opy (CDE: Ctrl+C, Ctrl+Insert)
+    \i \bold{\underline{C}}opy Here
+    \i Create \bold{\underline{S}}hortcut
+    \i Create \bold{\underline{S}}hortcut Here
+    \i Cu\bold{\underline{t}}
+    \i \bold{\underline{D}}elete
+    \i \bold{\underline{E}}dit
+    \i \bold{\underline{E}}xit (CDE: E\bold{\underline{x}}it)
+    \i \bold{\underline{E}}xplore
+    \i \bold{\underline{F}}ile
+    \i \bold{\underline{F}}ind
+    \i \bold{\underline{H}}elp
+    \i Help \bold{\underline{T}}opics
+    \i \bold{\underline{H}}ide
+    \i \bold{\underline{I}}nsert
+    \i Insert \bold{\underline{O}}bject
+    \i \bold{\underline{L}}ink Here
+    \i Ma\bold{\underline{x}}imize
+    \i Mi\bold{\underline{n}}imize
+    \i \bold{\underline{M}}ove
+    \i \bold{\underline{M}}ove Here
+    \i \bold{\underline{N}}ew
+    \i \bold{\underline{N}}ext
+    \i \bold{\underline{N}}o
+    \i \bold{\underline{O}}pen
+    \i Open \bold{\underline{W}}ith
+    \i Page Set\bold{\underline{u}}p
+    \i \bold{\underline{P}}aste
+    \i Paste \bold{\underline{L}}ink
+    \i Paste \bold{\underline{S}}hortcut
+    \i Paste \bold{\underline{S}}pecial
+    \i \bold{\underline{P}}ause
+    \i \bold{\underline{P}}lay
+    \i \bold{\underline{P}}rint
+    \i \bold{\underline{P}}rint Here
+    \i P\bold{\underline{r}}operties
+    \i \bold{\underline{Q}}uick View
+    \i \bold{\underline{R}}edo (CDE: Ctrl+Y, Shift+Alt+Backspace)
+    \i \bold{\underline{R}}epeat
+    \i \bold{\underline{R}}estore
+    \i \bold{\underline{R}}esume
+    \i \bold{\underline{R}}etry
+    \i \bold{\underline{R}}un
+    \i \bold{\underline{S}}ave
+    \i Save \bold{\underline{A}}s
+    \i Select \bold{\underline{A}}ll
+    \i Se\bold{\underline{n}}d To
+    \i \bold{\underline{S}}how
+    \i \bold{\underline{S}}ize
+    \i S\bold{\underline{p}}lit
+    \i \bold{\underline{S}}top
+    \i \bold{\underline{U}}ndo (CDE: Ctrl+Z or Alt+Backspace)
+    \i \bold{\underline{V}}iew
+    \i \bold{\underline{W}}hat's This?
+    \i \bold{\underline{W}}indow
+    \i \bold{\underline{Y}}es
+    \endlist
+
+    There are also a lot of other keys and actions (that use other
+    modifier keys than Alt). See the Microsoft and The Open Group
+    documentation for details.
+
+    The
+    \l{http://www.amazon.com/exec/obidos/ASIN/0735605661/trolltech/t}{Microsoft book}
+    has ISBN 0735605661. The corresponding Open Group
+    book is very hard to find, rather expensive and we cannot recommend
+    it. However, if you really want it, ogpubs@opengroup.org might be able
+    to help. Ask them for ISBN 1859121047.
+*/
diff --git a/doc/src/accessible.qdoc b/doc/src/accessible.qdoc
new file mode 100644
index 0000000000..090da86e86
--- /dev/null
+++ b/doc/src/accessible.qdoc
@@ -0,0 +1,600 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page accessible.html
+    \title Accessibility
+    \ingroup accessibility
+
+    \tableofcontents
+
+    \section1 Introduction
+
+    Accessibility in computer software is making applications usable
+    for people with disabilities. This could be achieved by providing
+    keyboard shortcuts, a high-contrast user interface that uses
+    specially selected colors and fonts, or support for assistive tools
+    such as screen readers and braille displays.
+
+    An application does not usually communicate directly with
+    assistive tools but through an assistive technology, which is a
+    bridge for exchange of information between the applications and
+    the tools. Information about user interface elements, such
+    as buttons and scroll bars, is exposed to the assistive technologies.
+    Qt supports Microsoft Active Accessibility (MSAA) on Windows and
+    Mac OS X Accessibility on Mac OS X.
+    On Unix/X11, support is preliminary. The individual technologies
+    are abstracted from Qt, and there is only a single interface to
+    consider. We will use MSAA throughout this document when we need
+    to address technology related issues.
+
+    In this overview document, we will examine the overall Qt
+    accessibility architecture, and how to implement accessibility for
+    custom widgets and elements. 
+
+    \section1 Architecture
+
+    Providing accessibility is a collaboration between accessibility
+    compliant applications, the assistive technology, and the
+    assistive tools. 
+
+    \image accessibilityarchitecture.png
+
+    Accessibility compliant applications are called AT-Servers while
+    assistive tools are called AT-Clients. A Qt application will
+    typically be an AT-Server, but specialized programs might also
+    function like AT-Clients. We will refer to clients and servers
+    when talking about AT-Clients and AT-Servers in the rest of this
+    document.
+
+    We will from now on focus on the Qt accessibility interface and
+    how it is implemented to create Qt applications that support
+    accessibility.
+
+    \section2 Accessibility in Qt
+
+    When we communicate with the assistive technologies, we need to
+    describe Qt's user interface in a way that they can understand. Qt
+    applications use QAccessibleInterface to expose information about the
+    individual UI elements. Currently, Qt provides support for its widgets
+    and widget parts, e.g., slider handles, but the interface could
+    also be implemented for any QObject if necessary. QAccessible
+    contains enums that describe the UI. The description is mainly
+    based on MSAA and is independent of Qt. We will examine the enums
+    in the course of this document.
+
+    The structure of the UI is represented as a tree of
+    QAccessibleInterface subclasses. You can think of this as a
+    representation of a UI like the QObject tree built by Qt. Objects
+    can be widgets or widget parts (such as scroll bar handles). We
+    examine the tree in detail in the next section.
+
+    Servers notify clients through \l{QAccessible::}{updateAccessibility()}
+    about changes in objects by sending events, and the clients
+    register to receive the events. The available events are defined
+    by the QAccessible::Event enum. The clients may then query for
+    the object that generated the event through
+    QAccessible::queryAccessibleInterface().
+
+    Three of the enums in QAccessible help clients query and alter
+    accessible objects:
+
+    \list
+        \o \l{QAccessible::}{Role}: Describes the role the object
+            fills in the user interface, e.g., if it is a main
+            window, a text caret, or a cell in an item view.
+        \o \l{QAccessible::}{Action}: The actions that the
+            clients can perform on the objects, e.g., pushing a
+            button.
+        \o \l{QAccessible::}{Relation}: Describes the relationship
+            between objects in the object tree.
+            This is used for navigation.
+    \endlist
+
+    The clients also have some possibilities to get the content of
+    objects, e.g., a button's text; the object provides strings
+    defined by the QAccessible::Text enum, that give information
+    about content.
+
+    The objects can be in a number of different states as defined by
+    the \l{QAccessible::}{State} enum. Examples of states are whether
+    the object is disabled, if it has focus, or if it provides a pop-up
+    menu.
+
+    \section2 The Accessible Object Tree
+
+    As mentioned, a tree structure is built from the accessible
+    objects of an application. By navigating through the tree, the
+    clients can access all elements in the UI. Object relations give
+    clients information about the UI. For instance, a slider handle is
+    a child of the slider to which it belongs. QAccessible::Relation
+    describes the various relationships the clients can ask objects
+    for.
+
+    Note that there are no direct mapping between the Qt QObject tree
+    and the accessible object tree. For instance, scroll bar handles
+    are accessible objects but are not widgets or objects in Qt.
+
+    AT-Clients have access to the accessibility object tree through
+    the root object in the tree, which is the QApplication. They can
+    query other objects through QAccessible::navigate(), which fetches
+    objects based on \l{QAccessible::}{Relation}s. The children of any
+    node is 1-based numbered. The child numbered 0 is the object
+    itself. The children of all interfaces are numbered this way,
+    i.e., it is not a fixed numbering from the root node in the entire
+    tree.
+
+    Qt provides accessible interfaces for its widgets. Interfaces for
+    any QObject subclass can be requested through
+    QAccessible::queryInterface(). A default implementation is
+    provided if a more specialized interface is not defined. An
+    AT-Client cannot acquire an interface for accessible objects that
+    do not have an equivalent QObject, e.g., scroll bar handles, but
+    they appear as normal objects through interfaces of parent
+    accessible objects, e.g., you can query their relationships with
+    QAccessible::relationTo().
+
+    To illustrate, we present an image of an accessible object tree.
+    Beneath the tree is a table with examples of object relationships.
+
+    \image accessibleobjecttree.png
+
+    The labels in top-down order are: the QAccessibleInterface class
+    name, the widget for which an interface is provided, and the
+    \l{QAccessible::}{Role} of the object. The Position, PageLeft and 
+    PageRight correspond to the slider handle, the slider groove left
+    and the slider groove right, respectively. These accessible objects
+    do not have an equivalent QObject.
+
+    \table 40%
+        \header
+            \o Source Object
+            \o Target Object
+            \o Relation
+        \row
+            \o Slider
+            \o Indicator
+            \o Controller
+        \row
+            \o Indicator
+            \o Slider
+            \o Controlled
+        \row
+            \o Slider
+            \o Application
+            \o Ancestor
+        \row
+            \o Application
+            \o Slider
+            \o Child
+        \row
+            \o PushButton
+            \o Indicator
+            \o Sibling
+    \endtable
+
+    \section2 The Static QAccessible Functions
+
+    The accessibility is managed by QAccessible's static functions,
+    which we will examine shortly. They produce QAccessible
+    interfaces, build the object tree, and initiate the connection
+    with MSAA or the other platform specific technologies. If you are
+    only interested in learning how to make your application
+    accessible, you can safely skip over this section to
+    \l{Implementing Accessibility}.
+
+    The communication between clients and the server is initiated when
+    \l{QAccessible::}{setRootObject()} is called. This is done when
+    the QApplication instance is instantiated and you should not have
+    to do this yourself.
+
+    When a QObject calls \l{QAccessible::}{updateAccessibility()},
+    clients that are listening to events are notified of the
+    change. The function is used to post events to the assistive
+    technology, and accessible \l{QAccessible::Event}{events} are
+    posted by \l{QAccessible::}{updateAccessibility()}.
+
+    \l{QAccessible::}{queryAccessibleInterface()} returns accessible
+    interfaces for \l{QObject}s. All widgets in Qt provide interfaces;
+    if you need interfaces to control the behavior of other \l{QObject}
+    subclasses, you must implement the interfaces yourself, although
+    the QAccessibleObject convenience class implements parts of the
+    functionality for you.
+
+    The factory that produces accessibility interfaces for QObjects is
+    a function of type QAccessible::InterfaceFactory. It is possible
+    to have several factories installed. The last factory installed
+    will be the first to be asked for interfaces.
+    \l{QAccessible::}{queryAccessibleInterface()} uses the factories
+    to create interfaces for \l{QObject}s. Normally, you need not be
+    concerned about factories because you can implement plugins that
+    produce interfaces. We will give examples of both approaches
+    later.
+
+    \section1 Implementing Accessibility
+
+    To provide accessibility support for a widget or other user
+    interface element, you need to implement the QAccessibleInterface
+    and distribute it in a QAccessiblePlugin. It is also possible to
+    compile the interface into the application and provide a
+    QAccessible::InterfaceFactory for it. The factory can be used if
+    you link statically or do not want the added complexity of
+    plugins.  This can be an advantage if you, for instance, are
+    delivering a 3-rd party library.
+
+    All widgets and other user interface elements should have
+    interfaces and plugins. If you want your application to support
+    accessibility, you will need to consider the following:
+
+    \list
+        \o Qt already implements accessibility for its own widgets.
+           We therefore recommend that you use Qt widgets where possible.
+        \o A QAccessibleInterface needs to be implemented for each element
+           that you want to make available to accessibility clients.
+        \o You need to send accessibility events from the custom
+           user interface elements that you implement.
+    \endlist
+
+    In general, it is recommended that you are somewhat familiar with
+    MSAA, which Qt originally was built for. You should also study
+    the enum values of QAccessible, which describe the roles, actions,
+    relationships, and events that you need to consider.
+
+    Note that you can examine how Qt's widgets implement their
+    accessibility. One major problem with the MSAA standard is that
+    interfaces are often implemented in an inconsistent way. This
+    makes life difficult for clients and often leads to guesswork on
+    object functionality.
+
+    It is possible to implement interfaces by inheriting
+    QAccessibleInterface and implementing its pure virtual functions.
+    In practice, however, it is usually preferable to inherit
+    QAccessibleObject or QAccessibleWidget, which implement part of
+    the functionality for you. In the next section, we will see an
+    example of implementing accessibility for a widget by inheriting
+    the QAccessibleWidget class.
+
+    \section2 The QAccessibleObject and QAccessibleWidget Convenience Classes
+
+    When implementing an accessibility interface for widgets, one would
+    as a rule inherit QAccessibleWidget, which is a convenience class
+    for widgets. Another available convenience class, which is
+    inherited by QAccessibleWidget, is the QAccessibleObject, which
+    implements part of the interface for QObjects.
+
+    The QAccessibleWidget provides the following functionality:
+
+    \list
+        \o It handles the navigation of the tree and
+           hit testing of the objects. 
+        \o It handles events, roles, and actions that are common for all
+           \l{QWidget}s.
+        \o It handles action and methods that can be performed on
+           all widgets.
+        \o It calculates bounding rectangles with
+           \l{QAccessibleInterface::}{rect()}.
+        \o It gives \l{QAccessibleInterface::}{text()} strings that are
+           appropriate for a generic widget.
+        \o It sets the \l{QAccessible::State}{states} that
+           are common for all widgets.
+    \endlist
+
+    \section2 QAccessibleWidget Example
+
+    Instead of creating a custom widget and implementing an interface
+    for it, we will show how accessibility can be implemented for one of
+    Qt's standard widgets: QSlider. Making this widget accessible
+    demonstrates many of the issues that need to be faced when making
+    a custom widget accessible.
+
+    The slider is a complex control that functions as a
+    \l{QAccessible::}{Controller} for its accessible children.
+    This relationship must be known by the interface (for
+    \l{QAccessibleInterface::}{relationTo()} and
+    \l{QAccessibleInterface::}{navigate()}). This can be done
+    using a controlling signal, which is a mechanism provided by
+    QAccessibleWidget. We do this in the constructor:
+
+    \snippet doc/src/snippets/accessibilityslidersnippet.cpp 0
+
+    The choice of signal shown is not important; the same principles
+    apply to all signals that are declared in this way. Note that we
+    use QLatin1String to ensure that the signal name is correctly
+    specified.
+
+    When an accessible object is changed in a way that users need
+    to know about, it notifies clients of the change by sending them
+    an event via the accessible interface. This is how QSlider calls
+    \l{QAccessibleInterface::}{updateAccessibility()} to indicate that
+    its value has changed:
+
+    \snippet doc/src/snippets/qabstractsliderisnippet.cpp 0
+    \dots
+    \snippet doc/src/snippets/qabstractsliderisnippet.cpp 1
+    \dots
+    \snippet doc/src/snippets/qabstractsliderisnippet.cpp 2
+
+    Note that the call is made after the value of the slider has
+    changed because clients may query the new value immediately after
+    receiving the event.
+
+    The interface must be able to calculate bounding rectangles of
+    itself and any children that do not provide an interface of their
+    own. The \c QAccessibleSlider has three such children identified by
+    the private enum, \c SliderElements, which has the following values:
+    \c PageLeft (the rectangle on the left hand side of the slider
+    handle), \c PageRight (the rectangle on the right hand side of the
+    handle), and \c Position (the slider handle). Here is the
+    implementation of \l{QAccessibleInterface::}{rect()}:
+
+    \snippet doc/src/snippets/accessibilityslidersnippet.cpp 1
+    \dots
+    \snippet doc/src/snippets/accessibilityslidersnippet.cpp 2
+    \dots
+
+    The first part of the function, which we have omitted, uses the
+    current \l{QStyle}{style} to calculate the slider handle's
+    bounding rectangle; it is stored in \c srect. Notice that child 0,
+    covered in the default case in the above code, is the slider itself,
+    so we can simply return the QSlider bounding rectangle obtained
+    from the superclass, which is effectively the value obtained from
+    QAccessibleWidget::rect().
+
+    \snippet doc/src/snippets/accessibilityslidersnippet.cpp 3
+
+    Before the rectangle is returned it must be mapped to screen
+    coordinates.
+
+    The QAccessibleSlider must reimplement
+    QAccessibleInterface::childCount() since it manages children
+    without interfaces.
+
+    The \l{QAccessibleInterface::}{text()} function returns the
+    QAccessible::Text strings for the slider:
+
+    \snippet doc/src/snippets/accessibilityslidersnippet.cpp 4
+
+    The \c slider() function returns a pointer to the interface's
+    QSlider. Some values are left for the superclass's implementation.
+    Not all values are appropriate for all accessible objects, as you
+    can see for QAccessible::Value case. You should just return an
+    empty string for those values where no relevant text can be
+    provided.
+
+    The implementation of the \l{QAccessibleInterface::}{role()}
+    function is straightforward:
+
+    \snippet doc/src/snippets/accessibilityslidersnippet.cpp 5
+
+    The role function should be reimplemented by all objects and
+    describes the role of themselves and the children that do not
+    provide accessible interfaces of their own.
+
+    Next, the accessible interface needs to return the
+    \l{QAccessible::State}{states} that the slider can be in. We look
+    at parts of the \c state() implementation to show how just a few
+    of the states are handled:
+
+    \snippet doc/src/snippets/accessibilityslidersnippet.cpp 6
+    \dots
+    \snippet doc/src/snippets/accessibilityslidersnippet.cpp 7
+
+    The superclass implementation of
+    \l{QAccessibleInterface::}{state()}, uses the
+    QAccessibleInterface::state() implementation. We simply need to
+    disable the buttons if the slider is at its minimum or maximum.
+
+    We have now exposed the information we have about the slider to
+    the clients. For the clients to be able to alter the slider - for
+    example, to change its value - we must provide information about
+    the actions that can be performed and perform them upon request.
+    We discuss this in the next section.
+
+    \section2 Handling Action Requests from Clients
+
+    QAccessible provides a number of \l{QAccessible::}{Action}s
+    that can be performed on request from clients. If an
+    accessible object supports actions, it should reimplement the
+    following functions from QAccessibleInterface:
+
+    \list
+        \o \l{QAccessibleInterface::}{actionText()} returns
+            strings that describe each action. The descriptions
+            to be made available are one for each
+            \l{QAccessible::}{Text} enum value.
+        \o  \l{QAccessibleInterface::}{doAction()} executes requests
+            from clients to perform actions.
+    \endlist
+
+    Note that a client can request any action from an object. If
+    the object does not support the action, it returns false from
+    \l{QAccessibleInterface::}{doAction()}.
+
+    None of the standard actions take any parameters. It is possible
+    to provide user-defined actions that can take parameters.
+    The interface must then also reimplement
+    \l{QAccessibleInterface::}{userActionCount()}. Since this is not
+    defined in the MSAA specification, it is probably only useful to
+    use this if you know which specific AT-Clients will use the
+    application.
+
+    QAccessibleInterface gives another technique for clients to handle
+    accessible objects. It works basically the same way, but uses the
+    concept of methods in place of actions. The available methods are
+    defined by the QAccessible::Method enum. The following functions
+    need to be reimplemented from QAccessibleInterface if the
+    accessible object is to support methods:
+
+    \list
+        \o \l{QAccessibleInterface::}{supportedMethods()} returns
+            a QSet of \l{QAccessible::}{Method} values that are 
+            supported by the object.
+        \o \l{QAccessibleInterface::}{invokeMethod()} executes
+           methods requested by clients.
+    \endlist
+
+    The action mechanism will probably be substituted by providing
+    methods in place of the standard actions. 
+
+    To see examples on how to implement actions and methods, you
+    could examine the QAccessibleObject and QAccessibleWidget
+    implementations. You might also want to take a look at the
+    MSAA documentation.
+
+    \section2 Implementing Accessible Plugins
+
+    In this section we will explain the procedure of implementing
+    accessible plugins for your interfaces. A plugin is a class stored
+    in a shared library that can be loaded at run-time. It is
+    convenient to distribute interfaces as plugins since they will only
+    be loaded when required.
+
+    Creating an accessible plugin is achieved by inheriting
+    QAccessiblePlugin, reimplementing \l{QAccessiblePlugin::}{keys()}
+    and \l{QAccessiblePlugin::}{create()} from that class, and adding
+    one or two macros. The \c .pro file must be altered to use the
+    plugin template, and the library containing the plugin must be
+    placed on a path where Qt searches for accessible plugins.
+
+    We will go through the implementation of \c SliderPlugin, which is an
+    accessible plugin that produces interfaces for the
+    QAccessibleSlider we implemented in the \l{QAccessibleWidget Example}.
+    We start with the \c key() function:
+
+    \snippet doc/src/snippets/accessibilitypluginsnippet.cpp 0
+
+    We simply need to return the class name of the single interface
+    our plugin can create an accessible interface for. A plugin
+    can support any number of classes; just add more class names
+    to the string list. We move on to the \c create() function:
+
+    \snippet doc/src/snippets/accessibilitypluginsnippet.cpp 1
+
+    We check whether the interface requested is for the QSlider; if it
+    is, we create and return an interface for it. Note that \c object
+    will always be an instance of \c classname. You must return 0 if
+    you do not support the class.
+    \l{QAccessible::}{updateAccessibility()} checks with the
+    available accessibility plugins until it finds one that does not
+    return 0.
+
+    Finally, you need to include macros in the cpp file:
+
+    \snippet doc/src/snippets/accessibilitypluginsnippet.cpp 2
+
+    The Q_EXPORT_PLUGIN2 macro exports the plugin in the \c
+    SliderPlugin class into the \c acc_sliderplugin library. The first
+    argument is the name of the plugin library file, excluding the
+    file suffix, and the second is the class name. For more information
+    on plugins, consult the plugins \l{How to Create Qt
+    Plugins}{overview document}.
+
+    You can omit the the first macro unless you want the plugin
+    to be statically linked with the application.
+
+    \section2 Implementing Interface Factories
+
+    If you do not want to provide plugins for your accessibility
+    interfaces, you can use an interface factory
+    (QAccessible::InterfaceFactory), which is the recommended way to
+    provide accessible interfaces in a statically-linked application.
+
+    A factory is a function pointer for a function that takes the same
+    parameters as \l{QAccessiblePlugin}'s
+    \l{QAccessiblePlugin::}{create()} - a QString and a QObject. It
+    also works the same way. You install the factory with the
+    \l{QAccessible::}{installFactory()} function. We give an example
+    of how to create a factory for the \c SliderPlugin class:
+
+    \snippet doc/src/snippets/accessibilityfactorysnippet.cpp 0
+    \dots
+    \snippet doc/src/snippets/accessibilityfactorysnippet.cpp 1
+
+    \omit
+
+    \section1 Implementing Bridges for Other Assistive Technologies
+
+    An accessibility bridge provides the means for an assistive
+    technology to talk to Qt. On Windows and Mac, the built-in bridges
+    will be used. On UNIX, however, there are no built-in standard
+    assistive technology, and it might therefore be necessary to
+    implement an accessible bridge.
+
+    A bridge is implemented by inheriting QAccessibleBridge for the
+    technology to support. The class defines the interface that Qt
+    needs an assistive technology to support:
+
+    \list
+        \o A root object. This is the root in the accessible
+           object tree and is of type QAccessibleInterface.
+        \o Receive events from from accessible objects.
+    \endlist
+
+    The root object is set with the
+    \l{QAccessibleBridge::}{setRootObject()}. In the case of Qt, this
+    will always be an interface for the QApplication instance of the
+    application.
+
+    Event notification is sent through
+    \l{QAccessibleBridge::}{notifyAccessibilityUpdate()}. This
+    function is called by \l{QAccessible::}{updateAccessibility()}. Even
+    though the bridge needs only to implement these two functions, it
+    must be able to communicate the entire QAccessibleInterface to the
+    underlying technology. How this is achieved is, naturally, up to
+    the individual bridge and none of Qt's concern.
+
+    As with accessible interfaces, you distribute accessible bridges
+    in plugins. Accessible bridge plugins are subclasses of the
+    QAccessibleBridgePlugin class; the class defines the functions
+    \l{QAccessibleBridgePlugin::}{create()} and
+    \l{QAccessibleBridgePlugin::}{keys()}, which must me
+    reimplemented. If Qt finds a built-in bridge to use, it will
+    ignore any available plugins.
+
+    \endomit
+
+    \section1 Further Reading
+
+    The \l{Cross-Platform Accessibility Support in Qt 4} document contains a more
+    general overview of Qt's accessibility features and discusses how it is
+    used on each platform.
+    issues
+*/
diff --git a/doc/src/activeqt-dumpcpp.qdoc b/doc/src/activeqt-dumpcpp.qdoc
new file mode 100644
index 0000000000..9465a31d5b
--- /dev/null
+++ b/doc/src/activeqt-dumpcpp.qdoc
@@ -0,0 +1,143 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \page activeqt-dumpcpp.html
+    \title The dumpcpp Tool (ActiveQt)
+
+    \ingroup activeqt-tools
+
+    \keyword dumpcpp
+
+    The \c dumpcpp tool generates a C++ namespace for a type library.
+
+    To generate a C++ namespace for a type library, call \c dumpcpp with the following 
+    command line parameters:
+
+    \table
+    \header
+    \i Option
+    \i Result
+    \row
+    \i input
+    \i Generate documentation for \e input. \e input can specify a type library file or a type 
+    library ID, or a CLSID or ProgID for an object
+    \row
+    \i -o file
+    \i Writes the class declaration to \e {file}.h and meta object infomation to \e {file}.cpp
+    \row
+    \i -n namespace
+    \i Generate a C++ namespace \e namespace
+    \row
+    \i -nometaobject
+    \i Do not generate a .cpp file with the meta object information. 
+    The meta object is then generated in runtime.
+    \row
+    \i -getfile libid
+    \i Print the filename for the typelibrary \e libid to stdout
+    \row
+    \i -compat
+    \i Generate namespace with dynamicCall-compatible API
+    \row
+    \i -v
+    \i Print version information
+    \row
+    \i -h
+    \i Print help
+    \endtable
+
+    \c dumpcpp can be integrated into the \c qmake build system. In your .pro file, list the type 
+    libraries you want to use in the TYPELIBS variable:
+
+    \snippet examples/activeqt/qutlook/qutlook.pro 0
+
+    The generated namespace will declare all enumerations, as well as one QAxObject subclass 
+    for each \c coclass and \c interface declared in the type library. coclasses marked with 
+    the \c control attribute will be wrapped by a QAxWidget subclass.
+
+    Those classes that wrap creatable
 coclasses 
(i.e. coclasses that are not marked 
+    as \c noncreatable) have a default constructor; this is typically a single class 
+    of type \c Application. 
+
+    \snippet doc/src/snippets/code/doc_src_activeqt-dumpcpp.qdoc 0
+
+    All other classes can only be created by passing an IDispatch interface pointer 
+    to the constructor; those classes should however not 
be created explicitly. 
+    Instead, use the appropriate API of already created
 objects.
+
+    \snippet doc/src/snippets/code/doc_src_activeqt-dumpcpp.qdoc 1
+
+    All coclass wrappers also have one constructors taking an interface wrapper class
+    for each interface implemented.
+
+    \snippet doc/src/snippets/code/doc_src_activeqt-dumpcpp.qdoc 2
+
+    You have to create coclasses to be able to connect to signals of the subobject.
+    Note that the constructor deletes the interface object, so the following will
+    cause a segmentation fault:
+
+    \snippet doc/src/snippets/code/doc_src_activeqt-dumpcpp.qdoc 3
+
+    If the return type is of a coclass or interface type declared in another type 
+    library you have to include the namespace header for that other type library 
+    before including the header for the namespace you want to use (both header have 
+    to be generated with this tool).
+
+    By default, methods and property returning subobjects will use the type as in 
+    the type library. The caller of the function is responsible for deleting or 
+    reparenting the object
 returned. If the \c -compat switch is set, properties 
+    and method returning a COM object have the return type \c IDispatch*, and 
+    the namespace will not declare wrapper classes for
 interfaces. 
+
+    In this case, create the correct wrapper class explicitly:
+
+    \snippet doc/src/snippets/code/doc_src_activeqt-dumpcpp.qdoc 4
+
+    You can of course use the IDispatch* returned directly, in which case you have to 
+    call
 \c Release() when finished with the interface.
+
+    All classes in the namespace are tagged with a macro that allows you to export
+    or import them from a DLL. To do that, declare the macro to expand to 
+    \c __declspec(dllimport/export) before including the header file.
+
+    To build the tool you must first build the QAxContainer library.
+    Then run your make tool in \c tools/dumpcpp.
+*/
diff --git a/doc/src/activeqt-dumpdoc.qdoc b/doc/src/activeqt-dumpdoc.qdoc
new file mode 100644
index 0000000000..b9156f05ea
--- /dev/null
+++ b/doc/src/activeqt-dumpdoc.qdoc
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \page activeqt-dumpdoc.html
+    \title The dumpdoc Tool (ActiveQt)
+
+    \ingroup activeqt-tools
+
+    \keyword dumpdoc
+
+    The \c dumpdoc tool generates Qt-style documentation for any
+    COM object and writes it into the file specified.
+
+    Call \c dumpdoc with the following command line parameters:
+
+    \table
+    \header
+    \i Option
+    \i Result
+    \row
+    \i -o file
+    \i Writes output to \e file
+    \row
+    \i object
+    \i Generate documentation for \e object
+    \row
+    \i -v
+    \i Print version information
+    \row
+    \i -h
+    \i Print help
+    \endtable
+
+    \e object must be an object installed on the local machine (ie.
+    remote objects are not supported), and can include subobjects
+    accessible through properties, ie.
+    \c Outlook.Application/Session/CurrentUser
+
+    The generated file will be an HTML file using Qt documentation
+    style.
+
+    To build the tool you must first build the QAxContainer library.
+    Then run your make tool in \c tools/dumpdoc.
+*/
diff --git a/doc/src/activeqt-idc.qdoc b/doc/src/activeqt-idc.qdoc
new file mode 100644
index 0000000000..c570dcd2af
--- /dev/null
+++ b/doc/src/activeqt-idc.qdoc
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \page activeqt-idc.html
+    \title IDC - The Interface Description Compiler (ActiveQt)
+
+    \ingroup activeqt-tools
+
+    \keyword idc
+
+    The IDC tool is part of the ActiveQt build system and makes
+    it possible to turn any Qt binary into a full COM object server 
+    with only a few lines of code.
+
+    IDC understands the following command line parameters:
+
+    \table
+    \header
+    \i Option
+    \i Result
+    \row
+    \i dll -idl idl -version x.y
+    \i Writes the IDL of the server \e dll to the file \e idl. The
+       type library wll have version x.y.
+    \row
+    \i dll -tlb tlb
+    \i Replaces the type library in \e dll with \e tlb
+    \row
+    \i -v
+    \i Print version information
+    \row
+    \i -regserver dll
+    \i Register the COM server \e dll
+    \row
+    \i -unregserver
+    \i Unregister the COM server \e dll
+    \endtable
+
+    It is usually never necessary to invoke IDC manually, as the \c
+    qmake build system takes care of adding the required post 
+    processing steps to the build process. See the  \l{ActiveQt}
+    documentation for details.
+*/
diff --git a/doc/src/activeqt-testcon.qdoc b/doc/src/activeqt-testcon.qdoc
new file mode 100644
index 0000000000..aba0b5892a
--- /dev/null
+++ b/doc/src/activeqt-testcon.qdoc
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \page activeqt-testcon.html
+    \title testcon - An ActiveX Test Container (ActiveQt)
+
+    \ingroup activeqt-tools
+
+    \keyword testcon
+
+    This application implements a generic test container for ActiveX
+    controls. You can insert ActiveX controls installed on your
+    system, and execute methods and modify properties. The container
+    will log information about events and property changes as well
+    as debug output in the log window.
+
+    Parts of the code use internals of the Qt meta object and ActiveQt 
+    framework and are not recommended to be used in application code.
+
+    Use the application to view the slots, signals and porperties 
+    available through the QAxWidget class when instantiated with a 
+    certain ActiveX, and to test ActiveX controls you implement or
+    want to use in your Qt application.
+
+    The application can load and execute script files in JavaScript, 
+    VBScript, Perl and Python (if installed) to automate the controls 
+    loaded. Example script files using the QAxWidget2 class are available 
+    in the \c scripts subdirectory.
+
+    Note that the qmake project of this example includes a resource file
+    \c testcon.rc with a version resource. This is required by some
+    ActiveX controls (ie. Shockwave ActiveX Controls), which might crash
+    or misbehave otherwise if such version information is missing.
+
+    To build the tool you must first build the QAxContainer and the
+    QAxServer libraries. Then run your make  tool in \c tools/testcon
+    and run the resulting \c testcon.exe.
+*/
diff --git a/doc/src/activeqt.qdoc b/doc/src/activeqt.qdoc
new file mode 100644
index 0000000000..ea13e5916a
--- /dev/null
+++ b/doc/src/activeqt.qdoc
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page activeqt.html
+    \title ActiveQt Framework
+    \brief An overview of Qt's ActiveX and COM integration on Windows.
+
+    \ingroup platform-notes
+    \keyword ActiveQt
+
+    Qt's ActiveX and COM support allows Qt for Windows developers to:
+
+    \list 1
+    \o Access and use ActiveX controls and COM objects provided by any 
+    ActiveX server in their Qt applications.
+    \o Make their Qt applications available as COM servers, with
+    any number of Qt objects and widgets as COM objects and ActiveX 
+    controls.
+    \endlist
+
+    The ActiveQt framework consists of two modules:
+
+    \list
+    \o The \l QAxContainer module is a static
+       library implementing QObject and QWidget subclasses, QAxObject and
+       QAxWidget, that act as containers for COM objects and ActiveX
+       controls.
+    \o The \l QAxServer module is a static library that implements
+       functionality for in-process and executable COM servers. This
+       module provides the QAxAggregated, QAxBindable and QAxFactory
+       classes.
+    \endlist
+
+    To build the static libraries, change into the \c activeqt directory 
+    (usually \c QTDIR/src/activeqt), and run \c qmake and your make
+    tool in both the \c container and the \c control subdirectory.
+    The libraries \c qaxcontainer.lib and \c qaxserver.lib will be linked 
+    into \c QTDIR/lib.
+
+    If you are using a shared configuration of Qt enter the \c plugin
+    subdirectory and run \c qmake and your make tool to build a
+    plugin that integrates the QAxContainer module into \l{Qt
+    Designer}.
+
+    The ActiveQt modules are part of the \l{Qt Full Framework Edition}. They
+    are \e not part of the \l{Open Source Versions of Qt}.
+
+    \sa {QAxContainer Module}, {QAxServer Module}
+*/
diff --git a/doc/src/annotated.qdoc b/doc/src/annotated.qdoc
new file mode 100644
index 0000000000..1950c45da4
--- /dev/null
+++ b/doc/src/annotated.qdoc
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** Documentation for class overview.
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Qt GUI Toolkit.
+** EDITIONS: FREE, PROFESSIONAL, ENTERPRISE
+**
+****************************************************************************/
+
+/*!
+    \page annotated.html
+    \title Annotated Class Index
+    \ingroup classlists
+
+    Qt's classes with brief descriptions:
+
+    \generatelist annotatedclasses
+*/
diff --git a/doc/src/appicon.qdoc b/doc/src/appicon.qdoc
new file mode 100644
index 0000000000..4d293374c7
--- /dev/null
+++ b/doc/src/appicon.qdoc
@@ -0,0 +1,226 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** Qt Application Icon Usage Documentation.
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Qt GUI Toolkit.
+** EDITIONS: FREE, PROFESSIONAL, ENTERPRISE
+**
+****************************************************************************/
+
+/*!
+    \page appicon.html
+    \title Setting the Application Icon
+    \ingroup gui-programming
+
+    The application icon, typically displayed in the top-left corner of an
+    application's top-level windows, is set by calling the
+    QWidget::setWindowIcon() method on top-level widgets.
+
+    In order to change the icon of the executable application file
+    itself, as it is presented on the desktop (i.e., prior to
+    application execution), it is necessary to employ another,
+    platform-dependent technique.
+
+    \tableofcontents
+
+    \section1 Setting the Application Icon on Windows
+
+    First, create an ICO format bitmap file that contains the icon
+    image. This can be done with e.g. Microsoft Visual C++: Select
+    \menu{File|New}, then select the \menu{File} tab in the dialog
+    that appears, and choose \menu{Icon}. (Note that you do not need
+    to load your application into Visual C++; here we are only using
+    the icon editor.)
+
+    Store the ICO file in your application's source code directory,
+    for example, with the name \c myappico.ico. Then, create a text
+    file called, say, \c myapp.rc in which you put a single line of
+    text:
+
+    \snippet doc/src/snippets/code/doc_src_appicon.qdoc 0
+
+    Finally, assuming you are using \c qmake to generate your
+    makefiles, add this line to your \c myapp.pro file:
+
+    \snippet doc/src/snippets/code/doc_src_appicon.qdoc 1
+
+    Regenerate your makefile and your application. The \c .exe file
+    will now be represented with your icon in Explorer.
+
+    If you do not use \c qmake, the necessary steps are: first, run
+    the \c rc program on the \c .rc file, then link your application
+    with the resulting \c .res file.
+
+    \section1 Setting the Application Icon on Mac OS X
+
+    The application icon, typically displayed in the application dock
+    area, is set by calling QWidget::setWindowIcon() on a top-level
+    widget. It is possible that the program could appear in the
+    application dock area before the function call, in which case a
+    default icon will appear during the bouncing animation.
+
+    To ensure that the correct icon appears, both when the application is
+    being launched, and in the Finder, it is necessary to employ a
+    platform-dependent technique.
+
+    Although many programs can create icon files (\c .icns), the
+    recommended approach is to use the \e{Icon Composer} program
+    supplied by Apple (in the \c Developer/Application folder).
+    \e{Icon Composer} allows you to import several different sized
+    icons (for use in different contexts) as well as the masks that
+    go with them. Save the set of icons to a file in your project
+    directory.
+
+    If you are using qmake to generate your makefiles, you only need
+    to add a single line to your \c .pro project file. For example,
+    if the name of your icon file is \c{myapp.icns}, and your project
+    file is \c{myapp.pro}, add this line to \c{myapp.pro}:
+
+    \snippet doc/src/snippets/code/doc_src_appicon.qdoc 2
+
+    This will ensure that \c qmake puts your icons in the proper
+    place and creates an \c{Info.plist} entry for the icon.
+
+    If you do not use \c qmake, you must do the following manually:
+    \list 1
+    \i Create an \c Info.plist file for your application (using the
+       \c PropertyListEditor, found in \c Developer/Applications).
+    \i Associate your \c .icns record with the \c CFBundleIconFile record in the
+       \c Info.plist file (again, using the \c PropertyListEditor).
+    \i Copy the \c Info.plist file into your application bundle's \c Contents
+       directory.
+    \i Copy the \c .icns file into your application bundle's \c Contents/Resources
+       directory.
+    \endlist
+
+    \section1 Setting the Application Icon on Common Linux Desktops
+
+    In this section we briefly describe the issues involved in providing
+    icons for applications for two common Linux desktop environments:
+    \l{http://www.kde.org/}{KDE} and \l{http://www.gnome.org/}{GNOME}.
+    The core technology used to describe application icons
+    is the same for both desktops, and may also apply to others, but there
+    are details which are specific to each. The main source of information
+    on the standards used by these Linux desktops is
+    \l{http://www.freedesktop.org/}{freedesktop.org}. For information
+    on other Linux desktops please refer to the documentation for the
+    desktops you are interested in.
+
+    Often, users do not use executable files directly, but instead launch
+    applications by clicking icons on the desktop. These icons are
+    representations of "desktop entry files" that contain a description of
+    the application that includes information about its icon. Both desktop
+    environments are able to retrieve the information in these files, and
+    they use it to generate shortcuts to applications on the desktop, in
+    the start menu, and on the panel.
+
+    More information about desktop entry files can be found in the
+    \l{http://www.freedesktop.org/Standards/desktop-entry-spec}{Desktop Entry
+    Specification}.
+
+    Although desktop entry files can usefully encapsulate the application's details,
+    we still need to store the icons in the conventional location for each desktop
+    environment. A number of locations for icons are given in the
+    \l{http://www.freedesktop.org/Standards/icon-theme-spec}{Icon Theme
+    Specification}.
+
+    Although the path used to locate icons depends on the desktop in use,
+    and on its configuration, the directory structure beneath each of
+    these should follow the same pattern: subdirectories are arranged by
+    theme, icon size, and application type. Generally, application icons
+    are added to the hicolor theme, so a square application icon 32 pixels
+    in size would be stored in the \c hicolor/32x32/apps directory beneath
+    the icon path.
+
+    \section2 K Desktop Environment (KDE)
+
+    Application icons can be installed for use by all users, or on a per-user basis.
+    A user currently logged into their KDE desktop can discover these locations
+    by using \l{http://developer.kde.org/documentation/other/kde-config.html}{kde-config},
+    for example, by typing the following in a terminal window:
+
+    \snippet doc/src/snippets/code/doc_src_appicon.qdoc 3
+
+    Typically, the list of colon-separated paths printed to stdout includes the
+    user-specific icon path and the system-wide path. Beneath these
+    directories, it should be possible to locate and install icons according
+    to the conventions described in the
+    \l{http://www.freedesktop.org/Standards/icon-theme-spec}{Icon Theme Specification}.
+
+    If you are developing exclusively for KDE, you may wish to take
+    advantage of the \link
+    http://developer.kde.org/documentation/other/makefile_am_howto.html
+    KDE build system\endlink to configure your application. This ensures
+    that your icons are installed in the appropriate locations for KDE.
+
+    The KDE developer website is at \l{http://developer.kde.org/}.
+
+    \section2 GNOME
+
+    Application icons are stored within a standard system-wide
+    directory containing architecture-independent files. This
+    location can be determined by using \c gnome-config, for example
+    by typing the following in a terminal window:
+
+    \snippet doc/src/snippets/code/doc_src_appicon.qdoc 4
+
+    The path printed on stdout refers to a location that should contain a directory
+    called \c{pixmaps}; the directory structure within the \c pixmaps
+    directory is described in the \link
+    http://www.freedesktop.org/Standards/icon-theme-spec Icon Theme
+    Specification \endlink.
+
+    If you are developing exclusively for GNOME, you may wish to use
+    the standard set of \link
+    http://developer.gnome.org/tools/build.html GNU Build Tools\endlink,
+    also described in the relevant section of
+    the \link http://developer.gnome.org/doc/GGAD/ggad.html GTK+/Gnome
+    Application Development book\endlink. This ensures that your icons are
+    installed in the appropriate locations for GNOME.
+
+    The GNOME developer website is at \l{http://developer.gnome.org/}.
+*/
diff --git a/doc/src/assistant-manual.qdoc b/doc/src/assistant-manual.qdoc
new file mode 100644
index 0000000000..6a735d2299
--- /dev/null
+++ b/doc/src/assistant-manual.qdoc
@@ -0,0 +1,810 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page assistant-manual.html
+    \title Qt Assistant Manual
+    \ingroup qttools
+
+    \startpage {index.html}{Qt Reference Documentation}
+    \nextpage Qt Assistant in More Detail
+
+    \keyword Qt Assistant
+
+    This document introduces \QA, a tool for presenting on-line
+    documentation. The document is divided into the following sections:
+
+    Table of contents:
+
+    \list
+    \o \l{The One-Minute Guide to Using Qt Assistant}
+    \o \l{Qt Assistant in More Detail}
+    \o \l{Using Qt Assistant as a Custom Help Viewer}
+    \endlist
+
+    \chapter The One-Minute Guide to Using Qt Assistant
+
+    Once you have installed Qt, \QA should be ready to run:
+
+    \list
+    \o On Windows, \QA is available as a menu option on the Qt menu.
+    \o On Mac OS X, \QA is installed in the /Developer/Applications/Qt directory.
+    \o On Unix/Linux, open a terminal, type \c{assistant} and press \key{Enter}.
+    \endlist
+
+    When you start up \QA, you will be presented with a standard main window
+    application, with a menu bar and toolbar. Below these, on the left hand
+    side are navigation windows called \e{Contents}, \e{Index} and \e{Bookmarks}.
+    On the right, taking up most of the space, is the \e{Documentation} window.
+    By default, \QA loads the Qt reference documentation along with the manuals
+    of other Qt tools, like \QD or \QL.
+
+    \QA works in a similar way to a Web browser. If you click hyperlinks
+    (cross-references), the \e{Documentation} window will present the relevant
+    page. You can bookmark pages of particular interest and you can click the
+    \gui{Previous} and \gui{Next} toolbar buttons to navigate within the pages
+    you have visited.
+
+    Although \QA can be used just like a Web browser to navigate through
+    the documentation, \QA offers a powerful means of navigation that Web
+    browsers do not provide. \QA uses an advanced full text search engine
+    to index all the pages in each compressed help file so that you can
+    search for particular words and phrases.
+
+    To perform an index search, click the \gui{Index} tab on the Sidebar
+    (or press \key{Alt+I}). In the \gui{'Look For'} line edit enter a word;
+    e.g., 'homedirpath'. As you type, words are found and highlighted in a list
+    beneath the line edit. If the highlighted text matches what you're
+    looking for, double click it, (or press \key{Enter}) and the
+    \e{Documentation} window will display the relevant page. You rarely have
+    to type in the whole word before \QA finds a match. Note that for some
+    words there may be more than one possible page that is relevant.
+
+    \QA also provides full text searching for finding specific words in
+    the documentation. To activate the full text search, either press \key(Alt+S)
+    or click on the \gui{Search} tab in the \e{Documentation} window. Then
+    enter the term you're looking for and hit the \gui{Search} button. All
+    documents containing the specified term will then be listed in the list box
+    below.
+*/
+
+/*!
+    \page assistant-details.html
+    \title Qt Assistant in More Detail
+
+    \contentspage {Qt Assistant Manual}{Contents}
+    \previouspage Qt Assistant Manual
+    \nextpage Using Qt Assistant as a Custom Help Viewer
+
+    \tableofcontents
+
+    \img assistant-assistant.png
+
+    \section1 Command Line Options
+
+    \QA handles the following command line options:
+
+    \table
+        \header
+            \o Command Line Option
+            \o Brief Description
+        \row
+            \o -collectionFile <file.qhc>
+            \o Uses the specified collection file instead of the default one.
+        \row
+            \o -showUrl URL
+            \o Shows the document referenced by URL.
+        \row
+            \o -enableRemoteControl
+            \o Enables \QA to be remotly controlled.
+        \row
+            \o -show <widget>
+            \o Shows the specified dockwidget which can be "contents", "index",
+            "bookmarks" or "search".
+        \row
+            \o -hide <widget>
+            \o Hides the specified dockwidget which can be "contents", "index",
+            "bookmarks" or "search.
+        \row
+            \o -activate <widget>
+            \o Activates the specified dockwidget which can be "contents",
+            "index", "bookmarks" or "search.
+        \row
+            \o -register <doc.qch>
+            \o Registers the specified compressed help file in the given help
+            collection.
+        \row
+            \o -unregister <doc.qch>
+            \o Unregisters the specified compressed help file from the given
+            collection file.
+        \row
+            \o -setCurrentFilter filter
+            \o Sets the given filter as the active filter.
+        \row
+            \o -quiet
+            \o Doesn't show any error, warning or success messages.
+    \endtable
+
+    \section1 Tool Windows
+
+    \img assistant-dockwidgets.png
+
+    The tool windows provide four ways to navigate the documentation:
+
+    \list
+    \o The \gui{Contents} window presents a table of contents implemented as a
+    tree view for the documentation that is available. If you click an item,
+    its documentation will appear in the \e{Documentation} window. If you double
+    click an item or click on the control to the left of it, the item's sub-items
+    will appear. Click a sub-item to make its page appear in the \e{Documentation}
+    window. Click on the control next to an open item to hide its sub-items.
+    \o The \gui{Index} window is used to look up key words or phrases.
+    See \l{The One-Minute Guide to Using Qt Assistant} for how to use this
+    window.
+    \o The \gui{Bookmarks} window lists any bookmarks you have made. Double
+    click a bookmark to make its page appear in the \e{Documentation} window.
+    The \gui{Bookmarks} window provides a context menu with \gui{Show Item},
+    \gui{Delete Item} as well as \gui{Rename Item}. Click in the main menu
+    \menu{Bookmark|Add Bookmark...} (or press \key{Ctrl+B}) to bookmark the
+    page that is currently showing in the \e{Documentation} window. Right click
+    a bookmark in the list to rename or delete the highlighted bookmark.
+    \endlist
+
+    If you want the \gui{Documentation} window to use as much space as possible,
+    you can easily group, move or hide the tool windows. To group the windows,
+    drag one on top of the other and release the mouse. If one or all tool
+    windows are not shown, press \key{Alt+C}, \key{Alt+I} or \key{Alt+O} to show
+    the required window.
+
+    The tool windows can be docked into the main window, so you can drag them
+    to the top, left, right or bottom of \e{Qt Assistant's} window, or you can
+    drag them outside \QA to float them as independent windows.
+
+    \section1 Documentation Window
+
+    \img assistant-docwindow.png
+
+    The \gui{Documentation} window lets you create a tab for each
+    documentation page that you view. Click the \gui{Add Tab} button and a new
+    tab will appear with the page name as the tab's caption. This makes it
+    convenient to switch between pages when you are working with different
+    documentation. You can delete a tab by clicking the \gui{Close Tab} button
+    located on the right side of the \gui{Documentation} window.
+
+    \section1 Toolbars
+
+    \img assistant-toolbar.png
+
+    The main toolbar provides fast access to the most common actions.
+
+    \table
+    \header \o Action \o Description \o Menu Item \o Shortcut
+    \row \o \gui{Previous} \o Takes you to the previous page in the history.
+         \o \menu{Go|Previous} \o \key{Alt+Left Arrow}
+    \row \o \gui{Next} \o Takes you to the next page in the history.
+         \o \menu{Go|Next} \o \key{Alt+Right Arrow}
+    \row \o \gui{Home}
+         \o Takes you to the home page as specified in the Preferences Dialog.
+         \o \menu{Go|Home} \o \key{Ctrl+Home}.
+    \row \o \gui{Sync with Table of Contents}
+         \o Synchronizes the \gui{Contents} tool window with the page currently
+            shown in the \gui{Documentation} window.
+         \o \menu{Go|Sync with Table of Contents} \o
+    \row \o \gui{Copy} \o Copies any selected text to the clipboard.
+         \o \menu{Edit|Copy} \o \key{Ctrl+C}
+    \row \o \gui{Print} \o Opens the \gui{Print} dialog.
+         \o \menu{File|Print} \o \key{Ctrl+P}
+    \row \o \gui{Find in Text} \o Opens the \gui{Find Text} dialog.
+         \o \menu{Edit|Find in Text} \o \key{Ctrl+F}
+    \row \o \gui{Zoom in}
+         \o Increases the font size used to display text in the current tab.
+         \o \menu{View|Zoom in} \o \key{Ctrl++}
+    \row \o \gui{Zoom out}
+         \o Decreases the font size used to display text in the current tab.
+         \o \menu{View|Zoom out} \o \key{Ctrl+-}
+    \row \o \gui{Normal Size}
+         \o Resets the font size to its normal size in the current tab.
+         \o \menu{View|Normal Size} \o \key{Ctrl+0}
+    \endtable
+
+    \img assistant-address-toolbar.png
+
+    The address toolbar provides a fast way to enter a specific URL for a
+    documentation file. By default, the address toolbar is not shown, so it
+    has to be activated via \menu{View|Toolbars|Address Toolbar}.
+
+    \img assistant-filter-toolbar.png
+
+    The filter toolbar allows you to apply a filter to the currently installed
+    documentation. As with the address toolbar, the filter toolbar is not visible
+    by default and has to be activated via \menu{View|Toolbars|Filter Toolbar}.
+
+    \section1 Menus
+
+    \section2 File Menu
+
+    \list
+    \o \menu{File|Page Setup...} invokes a dialog allowing you to define
+    page layout properties, such as margin sizes, page orientation and paper size.
+    \o \menu{File|Print Preview...} provides a preview of the printed pages.
+    \o \menu{File|Print...} opens the \l{#Print Dialog}{\gui{Print} dialog}.
+    \o \menu{File|New Tab} opens a new empty tab in the \gui{Documentation}
+    window.
+    \o \menu{File|Close Tab} closes the current tab of the
+    \gui{Documentation} window.
+    \o \menu{File|Exit} closes the \QA application.
+    \endlist
+
+    \section2 Edit Menu
+
+    \list
+    \o \menu{Edit|Copy} copies any selected text to the clipboard.
+    \o \menu{Edit|Find in Text} invokes the \l{#Find Text Control}{\gui{Find Text}
+    control} at the lower end of the \gui{Documentation} window.
+    \o \menu{Edit|Find Next} looks for the next occurance of the specified
+    text in the \gui{Find Text} control.
+    \o \menu{Edit|Find Previous} looks for the previous occurance of
+    the specified text in the \l{#Find Text Control}{\gui{Find Text} control}.
+    \o \menu{Edit|Preferences} invokes the \l{#Preferences Dialog}{\gui{Preferences} dialog}.
+    \endlist
+
+    \section2 View Menu
+
+    \list
+    \o \menu{View|Zoom in} increases the font size in the current tab.
+    \o \menu{View|Zoom out} decreases the font size in the current tab.
+    \o \menu{View|Normal Size} resets the font size in the current tab.
+    \o \menu{View|Contents} toggles the display of the \gui{Contents} tool window.
+    \o \menu{View|Index} toggles the display of the \gui{Index} tool window.
+    \o \menu{View|Bookmarks} toggles the display of the \gui{Bookmarks} tool window.
+    \o \menu{View|Search} toggles the display of the Search in the \gui{Documentation} window.
+    \endlist
+
+    \section2 Go Menu
+
+    \list
+    \o \menu{Go|Home} goes to the home page.
+    \o \menu{Go|Back} displays the previous page in the history.
+    \o \menu{Go|Forward} displays the next page in the history.
+    \o \menu{Go|Sync with Table of Contents} syncs the \gui{Contents} tool window to the currently shown page.
+    \o \menu{Go|Next Page} selects the next tab in the \gui{Documentation} window.
+    \o \menu{Go|Previous Page} selects the previous tab in the \gui{Documentation} window.
+    \endlist
+
+    \section2 Bookmarks Menu
+
+    \list
+    \o \menu{Bookmarks|Add} adds the current page to the list of bookmarks.
+    \endlist
+
+    \section1 Dialogs
+
+    \section2 Print Dialog
+
+    This dialog is platform-specific. It gives access to various printer
+    options and can be used to print the document shown in the current tab.
+
+    \section2 Preferences Dialog
+
+    \img assistant-preferences-fonts.png
+
+    The \menu{Fonts} page allows you to change the font family and font sizes of the
+    browser window displaying the documentation or the application itself.
+
+    \img assistant-preferences-filters.png
+
+    The \menu{Filters} page lets you create and remove documentation
+    filters. To add a new filter, click the \gui{Add} button, specify a
+    filter name in the pop-up dialog and click \gui{OK}, then select
+    the filter attributes in the list box on the right hand side.
+    You can delete a filter by selecting it and clicking the \gui{Remove}
+    button.
+
+    \img assistant-preferences-documentation.png
+
+    The \menu{Documentation} page lets you install and remove compressed help
+    files. Click the \gui{Install} button and choose the path of the compressed
+    help file (*.qch) you would like to install.
+    To delete a help file, select a documentation set in the list and click
+    \gui{Remove}.
+
+    \img assistant-preferences-options.png
+
+    The \menu{Options} page lets you specify the homepage \QA will display when
+    you click the \gui{Home} button in \QA's main user interface. You can specify
+    the hompage by typing it here or clicking on one of the buttons below the
+    textbox. \gui{Current Page} sets the currently displayed page as your home
+    page while \gui{Restore to default} will reset your home page to the default
+    home page.
+
+    \section1 Find Text Control
+
+    This control is used to find text in the current page. Enter the text you want
+    to find in the line edit. The search is incremental, meaning that the most
+    relevant result is shown as you enter characters into the line edit.
+
+    If you check the \gui{Whole words only} checkbox, the search will only consider
+    whole words; for example, if you search for "spin" with this checkbox checked it will
+    not match "spinbox", but will match "spin". If you check the \gui{Case sensitive}
+    checkbox then, for example, "spin" will match "spin" but not "Spin". You can
+    search forwards or backwards from your current position in the page by clicking
+    the \gui{Previous} or \gui{Next} buttons. To hide the find control, either click the
+    \gui{Close} button or hit the \key{Esc} key.
+
+    \section1 Filtering Help Contents
+
+    \QA allows you to install any kind of documentation as long as it is organized
+    in Qt compressed help files (*.qch). For example, it is possible to install the
+    Qt reference documentation for Qt 4.4.0 and Qt 4.4.1 at the same time. In many
+    respects, this is very convenient since only one version of \QA is needed.
+    However, at the same time it becomes more complicated when performing tasks like
+    searching the index because nearly every keyword is defined in Qt 4.4.0 as well
+    as in Qt 4.4.1. This means that \QA will always ask the user to choose which one
+    should be displayed.
+
+    We use documentation filters to solve this issue. A filter is identified by its
+    name, and contains a list of filter attributes. An attribute is just a string and
+    can be freely chosen. Attributes are defined by the documentation itself, this
+    means that every documentation set usually has one or more attributes.
+
+    For example, the Qt 4.4.0 \QA documentation defines the attributes \c {assistant},
+    \c{tools} and \c{4.4.0}, \QD defines \c{designer}, \c{tools} and \c{4.4.0}.
+    The filter to display all tools would then define only the attribute
+    \c{tools} since this attribute is part of both documentation sets.
+    Adding the attribute \c{assistant} to the filter would then only show \QA
+    documentation since the \QD documentation does not contain this
+    attribute. Having an empty list of attributes in a filter will match all
+    documentation; i.e., it is equivalent to requesting unfiltered documentation.
+
+    \section1 Full Text Searching
+
+    \img assistant-search.png
+
+    \QA provides a powerful full text search engine. To search
+    for certain words or text, click the \gui{Search} tab in the \gui{Documentation}
+    window. Then enter the text you want to look for and press \key{Enter}
+    or click the \gui{Search} button. The search is not case sensitive, so,
+    for example, Foo, fOo and FOO are all treated as the same. The following are
+    examples of common search patterns:
+
+    \list
+    \o \c deep -- lists all the documents that contain the word 'deep'
+    \o \c{deep*} -- lists all the documents that contain a word beginning
+    with 'deep'
+    \o \c{deep copy} -- lists all documents that contain both 'deep' \e
+    and 'copy'
+    \o \c{"deep copy"} -- list all documents that contain the phrase 'deep copy'
+    \endlist
+
+    It is also possible to use the \gui{Advanced search} to get more flexibility.
+    You can specify some words so that hits containing these are excluded from the
+    result, or you can search for an exact phrase. Searching for similar words will
+    give results like these:
+
+    \list
+    \o \c{QStin} -- lists all the documents with titles that are similar, such as \c{QString}
+    \o \c{QSting} -- lists all the documents with titles that are similar, such as \c{QString}
+    \o \c{QStrin} -- lists all the documents with titles that are similar, such as \c{QString}
+    \endlist
+
+    Options can be combined to improve the search results.
+
+    The list of documents found is ordered according to the number of
+    occurrences of the search text which they contain, with those containing
+    the highest number of occurrences appearing first. Simply click any
+    document in the list to display it in the \gui{Documentation} window.
+
+    If the documentation has changed \mdash for example, if documents have been added
+    or removed \mdash \QA will index them again.
+
+*/
+
+/*!
+    \page assistant-custom-help-viewer.html
+    \title Using Qt Assistant as a Custom Help Viewer
+
+    \contentspage {Qt Assistant Manual}{Contents}
+    \previouspage Qt Assistant in More Detail
+
+    Using \QA as custom help viewer requires more than just being able to
+    display custom documentation. It is equally important that the
+    appearance of \QA can be customized so that it is seen as a
+    application-specific help viewer rather than \QA. This is achieved by
+    changing the window title or icon, as well as some application-specific
+    menu texts and actions. The complete list of possible customizations
+    can be found in the \l{Creating a Custom Help Collection File} section.
+
+    Another requirement of a custom help viewer is the ability to receive
+    actions or commands from the application it provides help for. This is
+    especially important when the application offers context sensitive help.
+    When used in this way, the help viewer may need to change its contents
+    depending on the state the application is currently in. This means that
+    the application has to communicate the current state to the help viewer.
+    The section about \l{Using Qt Assistant Remotely} explains how this can
+    be done.
+
+    \tableofcontents
+
+    The \l{Simple Text Viewer Example}{Simple Text Viewer} example uses the
+    techniques described in this document to show how to use \QA as a custom
+    help viewer for an application.
+
+    \warning In order to ship Qt Assistant in your application, it is crucial
+    that you include the sqlite plugin. For more information on how to include
+    plugins in your application, refer to the \l{Deploying Qt Applications}
+    {deployment documentation}.
+
+    \section1 Qt Help Collection Files
+
+    The first important point to know about \QA is that it stores all
+    settings related to its appearance \e and a list of installed
+    documentation in a help collection file. This means, when starting \QA
+    with different collection files, \QA may look totally different. This
+    complete separation of settings makes it possible to deploy \QA as a
+    custom help viewer for more than one application on one machine
+    without risk of interference between different instances of \QA.
+
+    To apply a certain help collection to \QA, specify the respective
+    collection file on the command line when starting it. For example:
+
+    \snippet doc/src/snippets/code/doc_src_assistant-manual.qdoc 8
+
+    However, storing all settings in one collection file raises some problems.
+    The collection file is usually installed in the same directory as the
+    application itself, or one of its subdirectories. Depending on the
+    directory and the operating system, the user may not have any permissions
+    to modify this file which would happen when the user settings are stored.
+    Also, it may not even be possible to give the user write permissions;
+    e.g., when the file is located on a read-only medium like a CD-ROM.
+
+    Even if it is possible to give everybody the right to store their settings
+    in a globally available collection file, the settings from one user would
+    be overwritten by another user when exiting \QA.
+
+    To solve this dilemma, \QA creates user specific collection files which
+    are more or less copied from the original collection file. The user-specific
+    collection file will be saved in a subdirectory of the path returned by
+    QDesktopServices::DataLocation. The subdirectory, or \e{cache directory}
+    within this user-specific location, can be defined in the help collection
+    project file. For example:
+
+    \snippet doc/src/snippets/code/doc_src_assistant-manual.qdoc 7
+
+    So, when calling
+
+    \snippet doc/src/snippets/code/doc_src_assistant-manual.qdoc 8
+
+    \QA actually uses the collection file:
+
+    \snippet doc/src/snippets/code/doc_src_assistant-manual.qdoc 9
+
+    There is no need ever to start \QA with the user specific collection
+    file. Instead, the collection file shipped with the application should
+    always be used. Also, when adding or removing documentation from the
+    collection file (see next section) always use the normal collection file.
+    \QA will take care of synchronizing the user collection files when the
+    list of installed documentation has changed.
+
+    \section1 Displaying Custom Documentation
+
+    Before \QA is able to show documentation, it has to know where it can
+    find the actual documentation files, meaning that it has to know the
+    location of the Qt compressed help file (*.qch). As already mentioned,
+    \QA stores references to the compressed help files in the currently used
+    collection file. So, when creating a new collection file you can list
+    all compressed help files \QA should display.
+
+    \snippet doc/src/snippets/code/doc_src_assistant-manual.qdoc 5
+
+    Sometimes, depending on the application for which \QA acts as a
+    help viewer, more documentation needs to be added over time; for
+    example, when installing more application components or plugins.
+    This can be done manually by starting \QA, opening the \gui{Edit|Preferences}
+    dialog and navigating to the \gui{Documentation} tab page. Then click
+    the \gui{Add...} button, select a Qt compressed help file (*.qch)
+    and press \gui{Open}. However, this approach has the disadvantage
+    that every user has to do it manually to get access to the new
+    documentation.
+
+    The prefered way of adding documentation to an already existing collection
+    file is to use the \c{-register} command line flag of \QA. When starting
+    \QA with this flag, the documentation will be added and \QA will
+    exit right away displaying a message if the registration was successful
+    or not.
+
+    \snippet doc/src/snippets/code/doc_src_assistant-manual.qdoc 6
+
+    The \c{-quiet} flag can be passed on to \QA to prevent it from writing
+    out the status message.
+
+    \bold{Note:} \QA will show the documentation in the contents view in the same
+    order as it was registered.
+
+
+    \section1 Changing the Appearance of Qt Assistant
+
+    The appearance of \QA can be changed by passing different command line options
+    on startup. However, these command line options only allow to show or hide
+    specific widgets, like the contents or index view. Other customizations, such
+    as changing the application title or icon, or disabling the filter functionality,
+    can be done by creating a custom help collection file.
+
+    \section2 Creating a Custom Help Collection File
+
+    The help collection file (*.qhc) used by \QA is created when running the
+    \c qcollectiongenerator tool on a help collection project file (*.qhcp).
+    The project file format is XML and supports the following tags:
+
+    \table
+        \header
+            \o Tag
+            \o Brief Description
+        \row
+            \o \c{<title>}
+            \o This property is used to specify a window title for \QA.
+        \row
+            \o \c{<homePage>}
+            \o This tag specifies which page should be display when
+            pressing the home button in \QA's main user interface.
+        \row
+            \o \c{<startPage>}
+            \o This tag specifies which page \QA should initially
+            display when the help collection is used.
+        \row
+            \o \c{<currentFilter>}
+            \o This tag specifies the \l{Qt Assistant in More Detail#Preferences Dialog}{filter}
+            that is initially used.
+            If this filter is not specified, the documentation will not be filtered. This has
+            no impact if only one documentation set is installed.
+        \row
+            \o \c{<applicationIcon>}
+            \o This tag describes an icon that will be used instead of the normal \QA
+            application icon. This is specified as a relative path from the directory
+            containing the collection file.
+        \row
+            \o \c{<enableFilterFunctionality>}
+            \o This tag is used to enable or disable user accessible filter functionality,
+            making it possible to prevent the user from changing any filter when running \QA.
+            It does not mean that the internal filter functionality is completely disabled.
+            Set the value to \c{false} if you want to disable the filtering. If the filter
+            toolbar should be shown by default, set the attribute \c{visible} to \c{true}.
+        \row
+            \o \c{<enableDocumentationManager>}
+            \o This tag is used to specify whether the documentation manager should be shown
+            in the preferences dialog. Disabling the Documentation Manager allows you to limit
+            \QA to display a specific documentation set or make it impossible for the end user
+            to accidentally remove or install documentation. To hide the documentation manager,
+            set the tag value to \c{false}.
+        \row
+            \o \c{<enableAddressBar>}
+            \o This tag describes if the address bar can be shown. By default it is
+            enabled; if you want to disable it set the tag value to \c{false}. If the
+            address bar functionality is enabled, the address bar can be shown by setting the
+            tag attribute \c{visible} to \c{true}.
+        \row
+            \o \c{<aboutMenuText>, <text>}
+            \o The \c{aboutMenuText} tag lists texts for different languages which will
+            later appear in the \menu{Help} menu; e.g., "About Application". A text is
+            specified within the \c{text} tags; the \c{language} attribute takes the two
+            letter language name. The text is used as the default text if no language
+            attribute is specified.
+        \row
+            \o \c{<aboutDialog>, <file>, <icon>}
+            \o The \c{aboutDialog} tag can be used to specify the text for the \gui{About}
+            dialog that can be opened from the \menu{Help} menu. The text is taken from the
+            file in the \c{file} tags. It is possible to specify a different file or any
+            language. The icon defined by the \c{icon} tags is applied to any language.
+        \row
+            \o \c{<cacheDirectory>}
+            \o Specified as a path relative to the directory given by
+            QDesktopServices::DataLocation, the cache path is used to store index files
+            needed for the full text search and a copy of the collection file.
+            The copy is needed because \QA stores all its settings in the collection file;
+            i.e., it must be writable for the user.
+    \endtable
+
+    In addition to those \QA specific tags, the tags for generating and registering
+    documentation can be used. See \l{QtHelp Module#Creating a Qt Help Collection}{Qt Help Collection}
+    documentation for more information.
+
+    An example of a help collection file that uses all the available tags is shown below:
+
+    \snippet doc/src/snippets/code/doc_src_assistant-manual.qdoc 1
+
+    To create the binary collection file, run the \c qcollectiongenerator tool:
+
+    \snippet doc/src/snippets/code/doc_src_assistant-manual.qdoc 10
+
+    To test the generated collection file, start \QA in the following way:
+
+    \snippet doc/src/snippets/code/doc_src_assistant-manual.qdoc 8
+
+    \section1 Using Qt Assistant Remotely
+
+    Even though the help viewer is a standalone application, it will mostly
+    be launched by the application it provides help for. This approach
+    gives the application the possibility to ask for specific help contents
+    to be displayed as soon as the help viewer is started. Another advantage
+    with this approach is that the application can communicate with the
+    help viewer process and can therefore request other help contents to be
+    shown depending on the current state of the application.
+
+    So, to use \QA as the custom help viewer of your application, simply
+    create a QProcess and specify the path to the Assistant executable. In order
+    to make Assistant listen to your application, turn on its remote control
+    functionality by passing the \c{-enableRemoteControl} command line option.
+
+    \warning The trailing '\0' must be appended separately to the QByteArray,
+    e.g., \c{QByteArray("command" + '\0')}.
+
+    The following example shows how this can be done:
+
+    \snippet doc/src/snippets/code/doc_src_assistant-manual.qdoc 2
+
+    Once \QA is running, you can send commands by using the stdin channel of
+    the process. The code snippet below shows how to tell \QA to show a certain
+    page in the documentation.
+
+    \snippet doc/src/snippets/code/doc_src_assistant-manual.qdoc 3
+
+    The following commands can be used to control \QA:
+
+    \table
+        \header
+            \o Command
+            \o Brief Description
+        \row
+            \o \c{show <Widget>}
+            \o Shows the dock widget specified by <Widget>. If the widget
+            is already shown and this command is sent again, the widget will be
+            activated, meaning that it will be raised and given the input focus.
+            Possible values for <Widget> are "contents", "index", "bookmarks" or "search".
+        \row
+            \o \c{hide <Widget>}
+            \o Hides the dock widget specified by <Widget>. Possible values for
+            <Widget> are "contents", "index", "bookmarks" and "search".
+        \row
+            \o \c{setSource <Url>}
+            \o Displays the given <Url>. The URL can be absolute or relative
+            to the currently displayed page. If the URL is absolute, it has to
+            be a valid Qt help system URL; i.e., starting with "qthelp://".
+        \row
+            \o \c{activateKeyword <Keyword>}
+            \o Inserts the specified <Keyword> into the line edit of the
+            index dock widget and activates the corresponding item in the
+            index list. If such an item has more than one link associated
+            with it, a topic chooser will be shown.
+        \row
+            \o \c{activateIdentifier <Id>}
+            \o Displays the help contents for the given <Id>. An ID is unique
+            in each namespace and has only one link associated to it, so the
+            topic chooser will never pop up.
+        \row
+            \o \c{syncContents}
+            \o Selects the item in the contents widget which corresponds to
+            the currently displayed page.
+        \row
+            \o \c{setCurrentFilter}
+            \o Selects the specified filter and updates the visual representation
+            accordingly.
+        \row
+            \o \c{expandToc <Depth>}
+            \o Expands the table of contents tree to the given depth. If depth
+            is less than 1, the tree will be collapsed completely.
+    \endtable
+
+    If you want to send several commands within a short period of time, it is
+    recommended that you write only a single line to the stdin of the process
+    instead of one line for every command. The commands have to be separated by
+    a semicolon, as shown in the following example:
+
+    \snippet doc/src/snippets/code/doc_src_assistant-manual.qdoc 4
+
+    \section1 Compatibility with Old Formats
+
+    In older versions of Qt, the help system was based on Document Content File
+    (DCF) and Qt Assistant Documentation Profile (ADP) formats. In contrast,
+    Qt Assistant and the help system used in Qt 4.4 use the formats described
+    earlier in this manual.
+
+    Unfortunately, the old file formats are not compatible with the new ones.
+    In general, the differences are not that big \mdash in most cases is the old
+    format is just a subset of the new one. One example is the \c namespace tag in
+    the Qt Help Project format, which was not part of the old format, but plays a vital
+    role in the new one. To help you to move to the new file format, we have created
+    a conversion wizard.
+
+    The wizard is started by executing \c qhelpconverter. It guides you through the
+    conversion of different parts of the file and generates a new \c qch or \c qhcp
+    file.
+
+    Once the wizard is finished and the files created, run the \c qhelpgenerator
+    or the \c qcollectiongenerator tool to generate the binary help files used by \QA.
+*/
+
+/*
+\section2 Modifying \QA with Command Line Options
+
+    Different help collections can be shown by simply passing the help collection
+    path to \QA. For example:
+
+    \snippet doc/src/snippets/code/doc_src_assistant-manual.qdoc 0
+
+    Other available options the can be passed on the command line.
+
+    \table
+        \header
+            \o Command Line Option
+            \o Brief Description
+        \row
+            \o -collectionFile <file.qhc>
+            \o Uses the specified collection file instead of the default one.
+        \row
+            \o -showUrl URL
+            \o Shows the document referenced by URL.
+        \row
+            \o -enableRemoteControl
+            \o Enables \QA to be remotly controlled.
+        \row
+            \o -show <widget>
+            \o Shows the specified dockwidget which can be "contents", "index",
+            "bookmarks" or "search".
+        \row
+            \o -hide <widget>
+            \o Hides the specified dockwidget which can be "contents", "index",
+            "bookmarks" or "search.
+        \row
+            \o -activate <widget>
+            \o Activates the specified dockwidget which can be "contents",
+            "index", "bookmarks" or "search.
+        \row
+            \o -register <doc.qch>
+            \o Registers the specified compressed help file in the given help
+            collection.
+        \row
+            \o -unregister <doc.qch>
+            \o Unregisters the specified compressed help file from the given
+            collection file.
+        \row
+            \o -quiet
+            \o Doesn't show any error, warning or success messages.
+    \endtable
+    */
diff --git a/doc/src/atomic-operations.qdoc b/doc/src/atomic-operations.qdoc
new file mode 100644
index 0000000000..5c0973be88
--- /dev/null
+++ b/doc/src/atomic-operations.qdoc
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page atomic-operations.html
+    \title Implementing Atomic Operations
+    \ingroup architecture
+    \ingroup qt-embedded-linux
+    \brief A guide to implementing atomic operations on new architectures.
+
+    Qt uses an optimization called \l {Implicitly Shared
+    Classes}{implicit sharing} for many of its value classes.
+
+    Starting with Qt 4, all of Qt's implicitly shared classes can
+    safely be copied across threads like any other value classes,
+    i.e., they are fully \l {Thread Support in Qt#Reentrancy and
+    Thread-Safety}{reentrant}. This is accomplished by implementing
+    reference counting operations using atomic hardware instructions
+    on all the different platforms supported by Qt.
+
+    To support a new architecture, it is important to ensure that
+    these platform-specific atomic operations are implemented in a
+    corresponding header file (\c qatomic_ARCH.h), and that this file
+    is located in Qt's \c src/corelib/arch directory. For example, the
+    Intel 80386 implementation is located in \c
+    src/corelib/arch/qatomic_i386.h.
+
+    Currently, Qt provides two classes providing several atomic
+    operations, QAtomicInt and QAtomicPointer. These classes inherit
+    from QBasicAtomicInt and QBasicAtomicPointer, respectively.
+
+    When porting Qt to a new architecture, the QBasicAtomicInt and
+    QBasicAtomicPointer classes must be implemented, \e not QAtomicInt
+    and QAtomicPointer. The former classes do not have constructors,
+    which makes them POD (plain-old-data). Both classes only have a
+    single member variable called \c _q_value, which stores the
+    value. This is the value that all of the atomic operations read
+    and modify.
+
+    All of the member functions mentioned in the QAtomicInt and
+    QAtomicPointer API documentation must be implemented. Note that
+    these the implementations of the atomic operations in these
+    classes must be atomic with respect to both interrupts and
+    multiple processors.
+
+    \warning The QBasicAtomicInt and QBasicAtomicPointer classes
+    mentioned in this document are used internally by Qt and are not
+    part of the public API. They may change in future versions of
+    Qt. The purpose of this document is to aid people interested in
+    porting Qt to a new architecture.
+*/
diff --git a/doc/src/bughowto.qdoc b/doc/src/bughowto.qdoc
new file mode 100644
index 0000000000..2a17a3497b
--- /dev/null
+++ b/doc/src/bughowto.qdoc
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page bughowto.html
+    \title How to Report a Bug
+    \brief Information about ways to report bugs in Qt.
+    \ingroup howto
+
+    If you think you have found a bug in Qt, we would like to hear
+    about it so that we can fix it.
+
+    Before reporting a bug, please check the \l{FAQs}, \l{Platform
+    Notes}, and the \l{Task Tracker} on the Qt website to see
+    if the issue is already known.
+
+    Always include the following information in your bug report:
+
+    \list 1
+    \o The name and version number of your compiler
+    \o The name and version number of your operating system
+    \o The version of Qt you are using, and what configure options it was
+       compiled with.
+    \endlist
+
+    If the problem you are reporting is only visible at run-time, try to
+    create a small test program that shows the problem when run. Often,
+    such a program can be created with some minor changes to one
+    of the many example programs in Qt's \c examples directory.
+
+    Please submit the bug report using the \l{Task Tracker} on the Qt
+    website.
+*/
diff --git a/doc/src/classes.qdoc b/doc/src/classes.qdoc
new file mode 100644
index 0000000000..c25da2b1e7
--- /dev/null
+++ b/doc/src/classes.qdoc
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page classes.html
+    \title Qt's Classes
+    \ingroup classlists
+
+    This is a list of all Qt classes excluding the \l{Qt 3
+    compatibility classes}. For a shorter list that only includes the
+    most frequently used classes, see \l{Qt's Main Classes}.
+    \omit This is old and dingy now.
+    and the \l{http://doc.trolltech.com/extras/qt43-class-chart.pdf}{Qt 4.3 Class Chart (PDF)}.
+    \endomit
+
+    \generatelist classes
+
+    \sa {Qt 3 Compatibility Classes}, {Qt's Modules}
+*/
+
+/*!
+    \page namespaces.html
+    \title Qt's Namespaces
+    \ingroup classlists
+
+    This is a list of the main namespaces in Qt. For a list of classes in
+    Qt, see \l{Qt's Classes}.
+
+    \generatelist{namespaces}
+*/
diff --git a/doc/src/codecs.qdoc b/doc/src/codecs.qdoc
new file mode 100644
index 0000000000..eaeed3e9f2
--- /dev/null
+++ b/doc/src/codecs.qdoc
@@ -0,0 +1,534 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page codec-big5.html
+    \title Big5 Text Codec
+    \ingroup codecs
+
+    The Big5 codec provides conversion to and from the Big5 encoding.
+    The code was originally contributed by Ming-Che Chuang
+    \<mingche@cobra.ee.ntu.edu.tw\> for the Big-5+ encoding, and was
+    included in Qt with the author's permission, and the grateful
+    thanks of the Trolltech team. (Note: Ming-Che's code is QPL'd, as
+    per an mail to qt-info@nokia.com.)
+
+    However, since Big-5+ was never formally approved, and was never
+    used by anyone, the Taiwan Free Software community and the Li18nux
+    Big5 Standard Subgroup agree that the de-facto standard Big5-ETen
+    (zh_TW.Big5 or zh_TW.TW-Big5) be used instead.
+
+    The Big5 is currently implemented as a pure subset of the
+    Big5-HKSCS codec, so more fine-tuning is needed to make it
+    identical to the standard Big5 mapping as determined by
+    Li18nux-Big5.  See \l{http://www.autrijus.org/xml/} for the draft
+    Big5 (2002) standard.
+
+    James Su \<suzhe@turbolinux.com.cn\> \<suzhe@gnuchina.org\>
+    generated the Big5-HKSCS-to-Unicode tables with a very
+    space-efficient algorithm. He generously donated his code to glibc
+    in May 2002.  Subsequently, James has kindly allowed Anthony Fok
+    \<anthony@thizlinux.com\> \<foka@debian.org\> to adapt the code
+    for Qt.
+
+    \legalese
+    Copyright (C) 2000  Ming-Che Chuang \BR
+    Copyright (C) 2002  James Su, Turbolinux Inc. \BR
+    Copyright (C) 2002  Anthony Fok, ThizLinux Laboratory Ltd.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    \list 1
+    \o Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    \o Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    \endlist
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+    \endlegalese
+*/
+
+/*!
+    \page codec-big5hkscs.html
+    \title Big5-HKSCS Text Codec
+    \ingroup codecs
+
+    The Big5-HKSCS codec provides conversion to and from the
+    Big5-HKSCS encoding.
+
+    The codec grew out of the QBig5Codec originally contributed by
+    Ming-Che Chuang \<mingche@cobra.ee.ntu.edu.tw\>.  James Su
+    \<suzhe@turbolinux.com.cn\> \<suzhe@gnuchina.org\> and Anthony Fok
+    \<anthony@thizlinux.com\> \<foka@debian.org\> implemented HKSCS-1999
+    QBig5hkscsCodec for Qt-2.3.x, but it was too late in Qt development
+    schedule to be officially included in the Qt-2.3.x series.
+
+    Wu Yi \<wuyi@hancom.com\> ported the HKSCS-1999 QBig5hkscsCodec to
+    Qt-3.0.1 in March 2002.
+
+    With the advent of the new HKSCS-2001 standard, James Su
+    \<suzhe@turbolinux.com.cn\> \<suzhe@gnuchina.org\> generated the
+    Big5-HKSCS<->Unicode tables with a very space-efficient algorithm.
+    He generously donated his code to glibc in May 2002.  Subsequently,
+    James has generously allowed Anthony Fok to adapt the code for
+    Qt-3.0.5.
+
+    Currently, the Big5-HKSCS tables are generated from the following
+    sources, and with the Euro character added:
+    \list 1
+    \o \l{http://www.microsoft.com/typography/unicode/950.txt}
+    \o \l{http://www.info.gov.hk/digital21/chi/hkscs/download/big5-iso.txt}
+    \o \l{http://www.info.gov.hk/digital21/chi/hkscs/download/big5cmp.txt}
+    \endlist
+
+    There may be more fine-tuning to the QBig5hkscsCodec to maximize its
+    compatibility with the standard Big5 (2002) mapping as determined by
+    Li18nux Big5 Standard Subgroup.  See \l{http://www.autrijus.org/xml/}
+    for the various Big5 CharMapML tables.
+
+    \legalese
+    Copyright (C) 2000  Ming-Che Chuang \BR
+    Copyright (C) 2001, 2002  James Su, Turbolinux Inc. \BR
+    Copyright (C) 2002  WU Yi, HancomLinux Inc. \BR
+    Copyright (C) 2001, 2002  Anthony Fok, ThizLinux Laboratory Ltd.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    \list 1
+    \o Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    \o Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    \endlist
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+    \endlegalese
+*/
+
+/*!
+    \page codec-eucjp.html
+    \title EUC-JP Text Codec
+    \ingroup codecs
+
+    The EUC-JP codec provides conversion to and from EUC-JP, the main
+    legacy encoding for Unix machines in Japan.
+
+    The environment variable \c UNICODEMAP_JP can be used to
+    fine-tune the JIS, Shift-JIS, and EUC-JP codecs. The \l{ISO
+    2022-JP (JIS) Text Codec} documentation describes how to use this
+    variable.
+
+    Most of the code here was written by Serika Kurusugawa,
+    a.k.a. Junji Takagi, and is included in Qt with the author's
+    permission and the grateful thanks of the Trolltech team. Here is
+    the copyright statement for that code:
+
+    \legalese
+
+    Copyright (C) 1999 Serika Kurusugawa. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    \list 1
+    \o Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    \o Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    \endlist
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS".
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+    \endlegalese
+*/
+
+/*!
+    \page codec-euckr.html
+    \title EUC-KR Text Codec
+    \ingroup codecs
+
+    The EUC-KR codec provides conversion to and from EUC-KR, KR, the
+    main legacy encoding for Unix machines in Korea.
+
+    It was largely written by Mizi Research Inc. Here is the
+    copyright statement for the code as it was at the point of
+    contribution. Trolltech's subsequent modifications are covered by
+    the usual copyright for Qt.
+
+    \legalese
+
+    Copyright (C) 1999-2000 Mizi Research Inc. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    \list 1
+    \o Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    \o Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    \endlist
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+    \endlegalese
+*/
+
+/*!
+    \page codec-gbk.html
+    \title GBK Text Codec
+    \ingroup codecs
+
+    The GBK codec provides conversion to and from the Chinese
+    GB18030/GBK/GB2312 encoding.
+
+    GBK, formally the Chinese Internal Code Specification, is a commonly
+    used extension of GB 2312-80.  Microsoft Windows uses it under the
+    name codepage 936.
+
+    GBK has been superseded by the new Chinese national standard
+    GB 18030-2000, which added a 4-byte encoding while remaining
+    compatible with GB2312 and GBK.  The new GB 18030-2000 may be described
+    as a special encoding of Unicode 3.x and ISO-10646-1.
+
+    Special thanks to charset gurus Markus Scherer (IBM),
+    Dirk Meyer (Adobe Systems) and Ken Lunde (Adobe Systems) for publishing
+    an excellent GB 18030-2000 summary and specification on the Internet.
+    Some must-read documents are:
+
+    \list
+    \o \l{ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/pdf/GB18030_Summary.pdf}
+    \o \l{http://oss.software.ibm.com/cvs/icu/~checkout~/charset/source/gb18030/gb18030.html}
+    \o \l{http://oss.software.ibm.com/cvs/icu/~checkout~/charset/data/xml/gb-18030-2000.xml}
+    \endlist
+
+    The GBK codec was contributed to Qt by
+    Justin Yu \<justiny@turbolinux.com.cn\> and
+    Sean Chen \<seanc@turbolinux.com.cn\>.  They may also be reached at
+    Yu Mingjian \<yumj@sun.ihep.ac.cn\>, \<yumingjian@china.com\>
+    Chen Xiangyang \<chenxy@sun.ihep.ac.cn\>
+
+    The GB18030 codec Qt functions were contributed to Qt by
+    James Su \<suzhe@gnuchina.org\>, \<suzhe@turbolinux.com.cn\>
+    who pioneered much of GB18030 development on GNU/Linux systems.
+
+    The GB18030 codec was contributed to Qt by
+    Anthony Fok \<anthony@thizlinux.com\>, \<foka@debian.org\>
+    using a Perl script to generate C++ tables from gb-18030-2000.xml
+    while merging contributions from James Su, Justin Yu and Sean Chen.
+    A copy of the source Perl script is available at
+    \l{http://people.debian.org/~foka/gb18030/gen-qgb18030codec.pl}
+
+    The copyright notice for their code follows:
+
+    \legalese
+    Copyright (C) 2000 TurboLinux, Inc.  Written by Justin Yu and Sean Chen. \BR
+    Copyright (C) 2001, 2002 Turbolinux, Inc.  Written by James Su. \BR
+    Copyright (C) 2001, 2002 ThizLinux Laboratory Ltd.  Written by Anthony Fok.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    \list 1
+    \o Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    \o Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    \endlist
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+    \endlegalese
+*/
+
+/*!
+    \page codecs-jis.html
+    \title ISO 2022-JP (JIS) Text Codec
+    \ingroup codecs
+
+    The JIS codec provides conversion to and from ISO 2022-JP.
+
+    The environment variable \c UNICODEMAP_JP can be used to
+    fine-tune the JIS, Shift-JIS, and EUC-JP codecs. The mapping
+    names are as for the Japanese XML working group's \link
+    http://www.y-adagio.com/public/standards/tr_xml_jpf/toc.htm XML
+    Japanese Profile\endlink, because it names and explains all the
+    widely used mappings. Here are brief descriptions, written by
+    Serika Kurusugawa:
+
+    \list
+
+    \o "unicode-0.9" or "unicode-0201" for Unicode style. This assumes
+    JISX0201 for 0x00-0x7f. (0.9 is a table version of jisx02xx mapping
+    used for Unicode 1.1.)
+
+    \o "unicode-ascii" This assumes US-ASCII for 0x00-0x7f; some
+    chars (JISX0208 0x2140 and JISX0212 0x2237) are different from
+    Unicode 1.1 to avoid conflict.
+
+    \o "open-19970715-0201" ("open-0201" for convenience) or
+    "jisx0221-1995" for JISX0221-JISX0201 style. JIS X 0221 is JIS
+    version of Unicode, but a few chars (0x5c, 0x7e, 0x2140, 0x216f,
+    0x2131) are different from Unicode 1.1. This is used when 0x5c is
+    treated as YEN SIGN.
+
+    \o "open-19970715-ascii" ("open-ascii" for convenience) for
+    JISX0221-ASCII style. This is used when 0x5c is treated as REVERSE
+    SOLIDUS.
+
+    \o "open-19970715-ms" ("open-ms" for convenience) or "cp932" for
+    Microsoft Windows style. Windows Code Page 932. Some chars (0x2140,
+    0x2141, 0x2142, 0x215d, 0x2171, 0x2172) are different from Unicode
+    1.1.
+
+    \o "jdk1.1.7" for Sun's JDK style. Same as Unicode 1.1, except that
+    JIS 0x2140 is mapped to UFF3C. Either ASCII or JISX0201 can be used
+    for 0x00-0x7f.
+
+    \endlist
+
+    In addition, the extensions "nec-vdc", "ibm-vdc" and "udc" are
+    supported.
+
+    For example, if you want to use Unicode style conversion but with
+    NEC's extension, set \c UNICODEMAP_JP to \c {unicode-0.9,
+    nec-vdc}. (You will probably need to quote that in a shell
+    command.)
+
+    Most of the code here was written by Serika Kurusugawa,
+    a.k.a. Junji Takagi, and is included in Qt with the author's
+    permission and the grateful thanks of the Trolltech team. Here is
+    the copyright statement for that code:
+
+    \legalese
+
+    Copyright (C) 1999 Serika Kurusugawa. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    \list 1
+    \o Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    \o Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    \endlist
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS".
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+    \endlegalese
+*/
+
+/*!
+    \page codec-sjis.html
+    \title Shift-JIS Text Codec
+    \ingroup codecs
+
+    The Shift-JIS codec provides conversion to and from Shift-JIS, an
+    encoding of JIS X 0201 Latin, JIS X 0201 Kana and JIS X 0208.
+
+    The environment variable \c UNICODEMAP_JP can be used to
+    fine-tune the codec. The \l{ISO 2022-JP (JIS) Text Codec}
+    documentation describes how to use this variable.
+
+    Most of the code here was written by Serika Kurusugawa, a.k.a.
+    Junji Takagi, and is included in Qt with the author's permission
+    and the grateful thanks of the Trolltech team. Here is the
+    copyright statement for the code as it was at the point of
+    contribution. Trolltech's subsequent modifications are covered by
+    the usual copyright for Qt.
+
+    \legalese
+
+    Copyright (C) 1999 Serika Kurusugawa. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    \list 1
+    \o Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    \o Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    \endlist
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS".
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+    \endlegalese
+*/
+
+/*!
+    \page codec-tscii.html
+    \title TSCII Text Codec
+    \ingroup codecs
+
+    The TSCII codec provides conversion to and from the Tamil TSCII
+    encoding.
+
+    TSCII, formally the Tamil Standard Code Information Interchange
+    specification, is a commonly used charset for Tamils. The
+    official page for the standard is at
+    \link http://www.tamil.net/tscii/ http://www.tamil.net/tscii/\endlink
+
+    This codec uses the mapping table found at
+    \link http://www.geocities.com/Athens/5180/tsciiset.html
+    http://www.geocities.com/Athens/5180/tsciiset.html\endlink.
+    Tamil uses composed Unicode which might cause some
+    problems if you are using Unicode fonts instead of TSCII fonts.
+
+    Most of the code was written by Hans Petter Bieker and is
+    included in Qt with the author's permission and the grateful
+    thanks of the Trolltech team. Here is the copyright statement for
+    the code as it was at the point of contribution. Trolltech's
+    subsequent modifications are covered by the usual copyright for
+    Qt:
+
+    \legalese
+
+    Copyright (c) 2000 Hans Petter Bieker.  All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    \list 1
+    \o Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    \o Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    \endlist
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+    \endlegalese
+*/
diff --git a/doc/src/commercialeditions.qdoc b/doc/src/commercialeditions.qdoc
new file mode 100644
index 0000000000..987468cadc
--- /dev/null
+++ b/doc/src/commercialeditions.qdoc
@@ -0,0 +1,135 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page commercialeditions.html
+    \title Qt Commercial Editions
+    \ingroup licensing
+    \brief Information about the license and features of the Commercial Edition.
+
+    \keyword Qt Full Framework Edition
+    \keyword Qt GUI Framework Edition
+
+    Two editions of Qt are available under a commercial license:
+    Qt GUI Framework Edition, and Qt Full Framework Edition.
+
+    If you want to develop Free or Open Source software for release using a recognized
+    Open Source license, you can use the \l{Open Source Versions of Qt}.
+
+    The table below summarizes the differences between the three
+    commercial editions:
+
+    \table 75%
+    \header \o{1,2} Features                                      \o{2,1} Editions
+    \header                                                       \o Qt GUI Framework \o Qt Full Framework
+    \row    \o \l{QtCore}{Qt Core classes (QtCore)}               \o \bold{X}         \o \bold{X}
+    \row    \o \l{QtGui}{Qt GUI classes (QtGui)}                  \o \bold{(X)}       \o \bold{X}
+    \row    \o \l{Graphics View Classes} (part of QtGui)          \o                  \o \bold{X}
+    \row    \o \l{QtNetwork}{Networking (QtNetwork)}              \o                  \o \bold{X}
+    \row    \o \l{QtOpenGL}{OpenGL (QtOpenGL)}                    \o                  \o \bold{X}
+    \row    \o \l{QtScript}{Scripting (QtScript)}                 \o                  \o \bold{X}
+    \row    \o \l{QtScriptTools}{Script Debugging (QtScriptTools)}\o                  \o \bold{X}
+    \row    \o \l{QtSql}{Database/SQL (QtSql)}                    \o                  \o \bold{X}
+    \row    \o \l{QtSvg}{SVG (QtSvg)}                             \o                  \o \bold{X}
+    \row    \o \l{QtWebKit}{WebKit integration (QtWebKit)}        \o                  \o \bold{X}
+    \row    \o \l{QtXml}{XML (QtXml)}                             \o                  \o \bold{X}
+    \row    \o \l{QtXmlPatterns}{XQuery and XPath (QtXmlPatterns)}\o                  \o \bold{X}
+    \row    \o \l{Qt3Support}{Qt 3 Support (Qt3Support)}          \o \bold{(X)}       \o \bold{X}
+    \row    \o \l{QtHelp}{Help system (QtHelp)}                   \o                  \o \bold{X}
+    \row    \o \l{QtDBus}{D-Bus IPC support (QtDBus)}             \o \bold{X}         \o \bold{X}
+    \row    \o \l{QtDesigner}{\QD extension classes (QtDesigner)} \o                  \o \bold{X}
+    \row    \o \l{QtTest}{Unit testing framework (QtTest)}        \o \bold{X}         \o \bold{X}
+    \row    \o \l{QtUiTools}{Run-time form handling (QtUiTools)}  \o                  \o \bold{X}
+    \row    \o \l{Phonon Module}{Phonon Multimedia Framework}     \o                  \o \bold{X}
+    \row    \o \l{ActiveQt}                                       \o                  \o \bold{<X>}
+    \endtable
+
+    \bold{(X)} The Qt GUI Framework Edition contains selected classes from the QtGui and
+    Qt3Support modules corresponding to the functionality available in the Qt 3 Professional
+    Edition.
+
+    \bold{<X>} The ActiveQt module is only available on Windows.
+
+    Lists of the classes available in each edition are available on the
+    following pages:
+
+    \list
+    \o \l{Qt GUI Framework Edition Classes}
+    \o \l{Qt Full Framework Edition Classes}
+    \endlist
+
+    Please see the \l{Supported Platforms}{list of supported
+    platforms} for up-to-date information about the various platforms
+    and compilers that Qt supports.
+
+    On the Qt web site, you can find a
+    \l{Qt Licensing Overview} and information on \l{Qt License Pricing}
+    for commercial editions of Qt and other Qt-related products.
+
+    To purchase, please visit the \l{How to Order}{online order
+    form}.
+
+    For further information and assistance, please contact Qt
+    sales.
+
+    Email: \l{mailto:qt-sales@nokia.com}{qt-sales@nokia.com}.
+
+    Phone, U.S. office (for North America): \bold{1-650-813-1676}.
+
+    Phone, Norway office (for the rest of the world): \bold{+47 21 60
+    48 00}.
+*/
+
+/*!
+    \page full-framework-edition-classes.html
+    \title Qt Full Framework Edition Classes
+    \ingroup classlists
+
+    \generatelist{classesbyedition Desktop}
+*/
+
+/*!
+    \page gui-framework-edition-classes.html
+    \title Qt GUI Framework Edition Classes
+    \ingroup classlists
+
+    \generatelist{classesbyedition DesktopLight}
+*/
diff --git a/doc/src/compatclasses.qdoc b/doc/src/compatclasses.qdoc
new file mode 100644
index 0000000000..62bbdb5367
--- /dev/null
+++ b/doc/src/compatclasses.qdoc
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page compatclasses.html
+    \title Qt 3 Compatibility Classes
+    \ingroup classlists
+
+    This is a list of the classes that Qt provides for compatibility
+    with Qt 3. The vast majority of these are provided by the
+    Qt3Support module.
+
+    \generatelist compatclasses
+
+    \sa {Qt's Classes}, {Qt's Modules}
+*/
diff --git a/doc/src/containers.qdoc b/doc/src/containers.qdoc
new file mode 100644
index 0000000000..d1072773f5
--- /dev/null
+++ b/doc/src/containers.qdoc
@@ -0,0 +1,775 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \group containers
+    \title Generic Containers
+    \ingroup architecture
+    \ingroup groups
+    \keyword container class
+    \keyword container classes
+
+    \brief Qt's template-based container classes.
+
+    \tableofcontents
+
+    \section1 Introduction
+
+    The Qt library provides a set of general purpose template-based
+    container classes. These classes can be used to store items of a
+    specified type. For example, if you need a resizable array of
+    \l{QString}s, use QVector<QString>.
+
+    These container classes are designed to be lighter, safer, and
+    easier to use than the STL containers. If you are unfamiliar with
+    the STL, or prefer to do things the "Qt way", you can use these
+    classes instead of the STL classes.
+
+    The container classes are \l{implicitly shared}, they are
+    \l{reentrant}, and they are optimized for speed, low memory
+    consumption, and minimal inline code expansion, resulting in
+    smaller executables. In addition, they are \l{thread-safe}
+    in situations where they are used as read-only containers
+    by all threads used to access them.
+
+    For traversing the items stored in a container, you can use one
+    of two types of iterators: \l{Java-style iterators} and
+    \l{STL-style iterators}. The Java-style iterators are easier to
+    use and provide high-level functionality, whereas the STL-style
+    iterators are slightly more efficient and can be used together
+    with Qt's and STL's \l{generic algorithms}.
+
+    Qt also offers a \l{foreach} keyword that make it very
+    easy to iterate over all the items stored in a container.
+
+    \section1 The Container Classes
+
+    Qt provides the following container classes:
+
+    \table
+    \header \o Class \o Summary
+
+    \row \o \l{QList}<T>
+    \o This is by far the most commonly used container class. It
+    stores a list of values of a given type (T) that can be accessed
+    by index. Internally, the QList is implemented using an array,
+    ensuring that index-based access is very fast.
+
+    Items can be added at either end of the list using
+    QList::append() and QList::prepend(), or they can be inserted in
+    the middle using QList::insert(). More than any other container
+    class, QList is highly optimized to expand to as little code as
+    possible in the executable. QStringList inherits from
+    QList<QString>.
+
+    \row \o \l{QLinkedList}<T>
+    \o This is similar to QList, except that it uses
+    iterators rather than integer indexes to access items. It also
+    provides better performance than QList when inserting in the
+    middle of a huge list, and it has nicer iterator semantics.
+    (Iterators pointing to an item in a QLinkedList remain valid as
+    long as the item exists, whereas iterators to a QList can become
+    invalid after any insertion or removal.)
+
+    \row \o \l{QVector}<T>
+    \o This stores an array of values of a given type at adjacent
+    positions in memory. Inserting at the front or in the middle of
+    a vector can be quite slow, because it can lead to large numbers
+    of items having to be moved by one position in memory.
+
+    \row \o \l{QStack}<T>
+    \o This is a convenience subclass of QVector that provides
+    "last in, first out" (LIFO) semantics. It adds the following
+    functions to those already present in QVector:
+    \l{QStack::push()}{push()}, \l{QStack::pop()}{pop()},
+    and \l{QStack::top()}{top()}.
+
+    \row \o \l{QQueue}<T>
+    \o This is a convenience subclass of QList that provides
+    "first in, first out" (FIFO) semantics. It adds the following
+    functions to those already present in QList:
+    \l{QQueue::enqueue()}{enqueue()},
+    \l{QQueue::dequeue()}{dequeue()}, and \l{QQueue::head()}{head()}.
+
+    \row \o \l{QSet}<T>
+    \o This provides a single-valued mathematical set with fast
+    lookups.
+
+    \row \o \l{QMap}<Key, T>
+    \o This provides a dictionary (associative array) that maps keys
+    of type Key to values of type T. Normally each key is associated
+    with a single value. QMap stores its data in Key order; if order
+    doesn't matter QHash is a faster alternative.
+
+    \row \o \l{QMultiMap}<Key, T>
+    \o This is a convenience subclass of QMap that provides a nice
+    interface for multi-valued maps, i.e. maps where one key can be
+    associated with multiple values.
+
+    \row \o \l{QHash}<Key, T>
+    \o This has almost the same API as QMap, but provides
+    significantly faster lookups. QHash stores its data in an
+    arbitrary order.
+
+    \row \o \l{QMultiHash}<Key, T>
+    \o This is a convenience subclass of QHash that
+    provides a nice interface for multi-valued hashes.
+
+    \endtable
+
+    Containers can be nested. For example, it is perfectly possible
+    to use a QMap<QString, QList<int> >, where the key type is
+    QString and the value type QList<int>. The only pitfall is that
+    you must insert a space between the closing angle brackets (>);
+    otherwise the C++ compiler will misinterpret the two >'s as a
+    right-shift operator (>>) and report a syntax error.
+
+    The containers are defined in individual header files with the
+    same name as the container (e.g., \c <QLinkedList>). For
+    convenience, the containers are forward declared in \c
+    <QtContainerFwd>.
+
+    \keyword assignable data type
+    \keyword assignable data types
+
+    The values stored in the various containers can be of any
+    \e{assignable data type}. To qualify, a type must provide a
+    default constructor, a copy constructor, and an assignment
+    operator. This covers most data types you are likely to want to
+    store in a container, including basic types such as \c int and \c
+    double, pointer types, and Qt data types such as QString, QDate,
+    and QTime, but it doesn't cover QObject or any QObject subclass
+    (QWidget, QDialog, QTimer, etc.). If you attempt to instantiate a
+    QList<QWidget>, the compiler will complain that QWidget's copy
+    constructor and assignment operators are disabled. If you want to
+    store these kinds of objects in a container, store them as
+    pointers, for example as QList<QWidget *>.
+
+    Here's an example custom data type that meets the requirement of
+    an assignable data type:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 0
+
+    If we don't provide a copy constructor or an assignment operator,
+    C++ provides a default implementation that performs a
+    member-by-member copy. In the example above, that would have been
+    sufficient. Also, if you don't provide any constructors, C++
+    provides a default constructor that initializes its member using
+    default constructors. Although it doesn't provide any
+    explicit constructors or assignment operator, the following data
+    type can be stored in a container:
+
+    \snippet doc/src/snippets/streaming/main.cpp 0
+
+    Some containers have additional requirements for the data types
+    they can store. For example, the Key type of a QMap<Key, T> must
+    provide \c operator<(). Such special requirements are documented
+    in a class's detailed description. In some cases, specific
+    functions have special requirements; these are described on a
+    per-function basis. The compiler will always emit an error if a
+    requirement isn't met.
+
+    Qt's containers provide operator<<() and operator>>() so that they
+    can easily be read and written using a QDataStream. This means
+    that the data types stored in the container must also support
+    operator<<() and operator>>(). Providing such support is
+    straightforward; here's how we could do it for the Movie struct
+    above:
+
+    \snippet doc/src/snippets/streaming/main.cpp 1
+    \codeline
+    \snippet doc/src/snippets/streaming/main.cpp 2
+
+    \keyword default-constructed values
+
+    The documentation of certain container class functions refer to
+    \e{default-constructed values}; for example, QVector
+    automatically initializes its items with default-constructed
+    values, and QMap::value() returns a default-constructed value if
+    the specified key isn't in the map. For most value types, this
+    simply means that a value is created using the default
+    constructor (e.g. an empty string for QString). But for primitive
+    types like \c{int} and \c{double}, as well as for pointer types,
+    the C++ language doesn't specify any initialization; in those
+    cases, Qt's containers automatically initialize the value to 0.
+
+    \section1 The Iterator Classes
+
+    Iterators provide a uniform means to access items in a container.
+    Qt's container classes provide two types of iterators: Java-style
+    iterators and STL-style iterators.
+
+    \section2 Java-Style Iterators
+
+    The Java-style iterators are new in Qt 4 and are the standard
+    ones used in Qt applications. They are more convenient to use than
+    the STL-style iterators, at the price of being slightly less
+    efficient. Their API is modelled on Java's iterator classes.
+
+    For each container class, there are two Java-style iterator data
+    types: one that provides read-only access and one that provides
+    read-write access.
+
+    \table
+    \header \o Containers                         \o Read-only iterator
+                                                  \o Read-write iterator
+    \row    \o QList<T>, QQueue<T>                \o QListIterator<T>
+                                                  \o QMutableListIterator<T>
+    \row    \o QLinkedList<T>                     \o QLinkedListIterator<T>
+                                                  \o QMutableLinkedListIterator<T>
+    \row    \o QVector<T>, QStack<T>              \o QVectorIterator<T>
+                                                  \o QMutableVectorIterator<T>
+    \row    \o QSet<T>                            \o QSetIterator<T>
+                                                  \o QMutableSetIterator<T>
+    \row    \o QMap<Key, T>, QMultiMap<Key, T>    \o QMapIterator<Key, T>
+                                                  \o QMutableMapIterator<Key, T>
+    \row    \o QHash<Key, T>, QMultiHash<Key, T>  \o QHashIterator<Key, T>
+                                                  \o QMutableHashIterator<Key, T>
+    \endtable
+
+    In this discussion, we will concentrate on QList and QMap. The
+    iterator types for QLinkedList, QVector, and QSet have exactly
+    the same interface as QList's iterators; similarly, the iterator
+    types for QHash have the same interface as QMap's iterators.
+
+    Unlike STL-style iterators (covered \l{STL-style
+    iterators}{below}), Java-style iterators point \e between items
+    rather than directly \e at items. For this reason, they are
+    either pointing to the very beginning of the container (before
+    the first item), at the very end of the container (after the last
+    item), or between two items. The diagram below shows the valid
+    iterator positions as red arrows for a list containing four
+    items:
+
+    \img javaiterators1.png
+
+    Here's a typical loop for iterating through all the elements of a
+    QList<QString> in order and printing them to the console:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 1
+
+    It works as follows: The QList to iterate over is passed to the
+    QListIterator constructor. At that point, the iterator is located
+    just in front of the first item in the list (before item "A").
+    Then we call \l{QListIterator::hasNext()}{hasNext()} to
+    check whether there is an item after the iterator. If there is, we
+    call \l{QListIterator::next()}{next()} to jump over that
+    item. The next() function returns the item that it jumps over. For
+    a QList<QString>, that item is of type QString.
+
+    Here's how to iterate backward in a QList:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 2
+
+    The code is symmetric with iterating forward, except that we
+    start by calling \l{QListIterator::toBack()}{toBack()}
+    to move the iterator after the last item in the list.
+
+    The diagram below illustrates the effect of calling
+    \l{QListIterator::next()}{next()} and
+    \l{QListIterator::previous()}{previous()} on an iterator:
+
+    \img javaiterators2.png
+
+    The following table summarizes the QListIterator API:
+
+    \table
+    \header \o Function \o Behavior
+    \row    \o \l{QListIterator::toFront()}{toFront()}
+            \o Moves the iterator to the front of the list (before the first item)
+    \row    \o \l{QListIterator::toBack()}{toBack()}
+            \o Moves the iterator to the back of the list (after the last item)
+    \row    \o \l{QListIterator::hasNext()}{hasNext()}
+            \o Returns true if the iterator isn't at the back of the list
+    \row    \o \l{QListIterator::next()}{next()}
+            \o Returns the next item and advances the iterator by one position
+    \row    \o \l{QListIterator::peekNext()}{peekNext()}
+            \o Returns the next item without moving the iterator
+    \row    \o \l{QListIterator::hasPrevious()}{hasPrevious()}
+            \o Returns true if the iterator isn't at the front of the list
+    \row    \o \l{QListIterator::previous()}{previous()}
+            \o Returns the previous item and moves the iterator back by one position
+    \row    \o \l{QListIterator::peekPrevious()}{peekPrevious()}
+            \o Returns the previous item without moving the iterator
+    \endtable
+
+    QListIterator provides no functions to insert or remove items
+    from the list as we iterate. To accomplish this, you must use
+    QMutableListIterator. Here's an example where we remove all
+    odd numbers from a QList<int> using QMutableListIterator:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 3
+
+    The next() call in the loop is made every time. It jumps over the
+    next item in the list. The
+    \l{QMutableListIterator::remove()}{remove()} function removes the
+    last item that we jumped over from the list. The call to
+    \l{QMutableListIterator::remove()}{remove()} does not invalidate
+    the iterator, so it is safe to continue using it. This works just
+    as well when iterating backward:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 4
+
+    If we just want to modify the value of an existing item, we can
+    use \l{QMutableListIterator::setValue()}{setValue()}. In the code
+    below, we replace any value larger than 128 with 128:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 5
+
+    Just like \l{QMutableListIterator::remove()}{remove()},
+    \l{QMutableListIterator::setValue()}{setValue()} operates on the
+    last item that we jumped over. If we iterate forward, this is the
+    item just before the iterator; if we iterate backward, this is
+    the item just after the iterator.
+
+    The \l{QMutableListIterator::next()}{next()} function returns a
+    non-const reference to the item in the list. For simple
+    operations, we don't even need
+    \l{QMutableListIterator::setValue()}{setValue()}:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 6
+
+    As mentioned above, QLinkedList's, QVector's, and QSet's iterator
+    classes have exactly the same API as QList's. We will now turn to
+    QMapIterator, which is somewhat different because it iterates on
+    (key, value) pairs.
+
+    Like QListIterator, QMapIterator provides 
+    \l{QMapIterator::toFront()}{toFront()}, 
+    \l{QMapIterator::toBack()}{toBack()}, 
+    \l{QMapIterator::hasNext()}{hasNext()}, 
+    \l{QMapIterator::next()}{next()}, 
+    \l{QMapIterator::peekNext()}{peekNext()}, 
+    \l{QMapIterator::hasPrevious()}{hasPrevious()}, 
+    \l{QMapIterator::previous()}{previous()}, and
+    \l{QMapIterator::peekPrevious()}{peekPrevious()}. The key and
+    value components are extracted by calling key() and value() on
+    the object returned by next(), peekNext(), previous(), or
+    peekPrevious().
+
+    The following example removes all (capital, country) pairs where
+    the capital's name ends with "City":
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 7
+
+    QMapIterator also provides a key() and a value() function that
+    operate directly on the iterator and that return the key and
+    value of the last item that the iterator jumped above. For
+    example, the following code copies the contents of a QMap into a
+    QHash:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 8
+
+    If we want to iterate through all the items with the same
+    value, we can use \l{QMapIterator::findNext()}{findNext()}
+    or \l{QMapIterator::findPrevious()}{findPrevious()}.
+    Here's an example where we remove all the items with a particular
+    value:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 9
+
+    \section2 STL-Style Iterators
+
+    STL-style iterators have been available since the release of Qt
+    2.0. They are compatible with Qt's and STL's \l{generic
+    algorithms} and are optimized for speed.
+
+    For each container class, there are two STL-style iterator types:
+    one that provides read-only access and one that provides
+    read-write access. Read-only iterators should be used wherever
+    possible because they are faster than read-write iterators.
+
+    \table
+    \header \o Containers                         \o Read-only iterator
+                                                  \o Read-write iterator
+    \row    \o QList<T>, QQueue<T>                \o QList<T>::const_iterator
+                                                  \o QList<T>::iterator
+    \row    \o QLinkedList<T>                     \o QLinkedList<T>::const_iterator
+                                                  \o QLinkedList<T>::iterator
+    \row    \o QVector<T>, QStack<T>              \o QVector<T>::const_iterator
+                                                  \o QVector<T>::iterator
+    \row    \o QSet<T>                            \o QSet<T>::const_iterator
+                                                  \o QSet<T>::iterator
+    \row    \o QMap<Key, T>, QMultiMap<Key, T>    \o QMap<Key, T>::const_iterator
+                                                  \o QMap<Key, T>::iterator
+    \row    \o QHash<Key, T>, QMultiHash<Key, T>  \o QHash<Key, T>::const_iterator
+                                                  \o QHash<Key, T>::iterator
+    \endtable
+
+    The API of the STL iterators is modelled on pointers in an array.
+    For example, the \c ++ operator advances the iterator to the next
+    item, and the \c * operator returns the item that the iterator
+    points to. In fact, for QVector and QStack, which store their
+    items at adjacent memory positions, the
+    \l{QVector::iterator}{iterator} type is just a typedef for \c{T *},
+    and the \l{QVector::iterator}{const_iterator} type is
+    just a typedef for \c{const T *}.
+
+    In this discussion, we will concentrate on QList and QMap. The
+    iterator types for QLinkedList, QVector, and QSet have exactly
+    the same interface as QList's iterators; similarly, the iterator
+    types for QHash have the same interface as QMap's iterators.
+
+    Here's a typical loop for iterating through all the elements of a
+    QList<QString> in order and converting them to lowercase:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 10
+
+    Unlike \l{Java-style iterators}, STL-style iterators point
+    directly at items. The begin() function of a container returns an
+    iterator that points to the first item in the container. The
+    end() function of a container returns an iterator to the
+    imaginary item one position past the last item in the container.
+    end() marks an invalid position; it must never be dereferenced.
+    It is typically used in a loop's break condition. If the list is
+    empty, begin() equals end(), so we never execute the loop.
+
+    The diagram below shows the valid iterator positions as red
+    arrows for a vector containing four items:
+
+    \img stliterators1.png
+
+    Iterating backward with an STL-style iterator requires us to
+    decrement the iterator \e before we access the item. This
+    requires a \c while loop:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 11
+
+    In the code snippets so far, we used the unary \c * operator to
+    retrieve the item (of type QString) stored at a certain iterator
+    position, and we then called QString::toLower() on it. Most C++
+    compilers also allow us to write \c{i->toLower()}, but some
+    don't.
+
+    For read-only access, you can use const_iterator, constBegin(),
+    and constEnd(). For example:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 12
+
+    The following table summarizes the STL-style iterators' API:
+
+    \table
+    \header \o Expression \o Behavior
+    \row    \o \c{*i}     \o Returns the current item
+    \row    \o \c{++i}    \o Advances the iterator to the next item
+    \row    \o \c{i += n} \o Advances the iterator by \c n items
+    \row    \o \c{--i}    \o Moves the iterator back by one item
+    \row    \o \c{i -= n} \o Moves the iterator back by \c n items
+    \row    \o \c{i - j}  \o Returns the number of items between iterators \c i and \c j
+    \endtable
+
+    The \c{++} and \c{--} operators are available both as prefix
+    (\c{++i}, \c{--i}) and postfix (\c{i++}, \c{i--}) operators. The
+    prefix versions modify the iterators and return a reference to
+    the modified iterator; the postfix versions take a copy of the
+    iterator before they modify it, and return that copy. In
+    expressions where the return value is ignored, we recommend that
+    you use the prefix operators (\c{++i}, \c{--i}), as these are
+    slightly faster.
+
+    For non-const iterator types, the return value of the unary \c{*}
+    operator can be used on the left side of the assignment operator.
+
+    For QMap and QHash, the \c{*} operator returns the value
+    component of an item. If you want to retrieve the key, call key()
+    on the iterator. For symmetry, the iterator types also provide a
+    value() function to retrieve the value. For example, here's how
+    we would print all items in a QMap to the console:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 13
+
+    Thanks to \l{implicit sharing}, it is very inexpensive for a
+    function to return a container per value. The Qt API contains
+    dozens of functions that return a QList or QStringList per value
+    (e.g., QSplitter::sizes()). If you want to iterate over these
+    using an STL iterator, you should always take a copy of the
+    container and iterate over the copy. For example:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 14
+
+    This problem doesn't occur with functions that return a const or
+    non-const reference to a container.
+
+    \l{Implicit sharing} has another consequence on STL-style
+    iterators: You must not take a copy of a container while
+    non-const iterators are active on that container. Java-style
+    iterators don't suffer from that limitation.
+
+    \keyword foreach
+    \section1 The foreach Keyword
+
+    If you just want to iterate over all the items in a container
+    in order, you can use Qt's \c foreach keyword. The keyword is a
+    Qt-specific addition to the C++ language, and is implemented
+    using the preprocessor.
+
+    Its syntax is: \c foreach (\e variable, \e container) \e
+    statement. For example, here's how to use \c foreach to iterate
+    over a QLinkedList<QString>:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 15
+
+    The \c foreach code is significantly shorter than the equivalent
+    code that uses iterators:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 16
+
+    Unless the data type contains a comma (e.g., \c{QPair<int,
+    int>}), the variable used for iteration can be defined within the
+    \c foreach statement:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 17
+
+    And like any other C++ loop construct, you can use braces around
+    the body of a \c foreach loop, and you can use \c break to leave
+    the loop:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 18
+
+    With QMap and QHash, \c foreach accesses the value component of
+    the (key, value) pairs. If you want to iterate over both the keys
+    and the values, you can use iterators (which are fastest), or you
+    can write code like this:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 19
+
+    For a multi-valued map:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 20
+
+    Qt automatically takes a copy of the container when it enters a
+    \c foreach loop. If you modify the container as you are
+    iterating, that won't affect the loop. (If you don't modify the
+    container, the copy still takes place, but thanks to \l{implicit
+    sharing} copying a container is very fast.) Similarly, declaring
+    the variable to be a non-const reference, in order to modify the
+    current item in the list will not work either.
+
+    In addition to \c foreach, Qt also provides a \c forever
+    pseudo-keyword for infinite loops:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 21
+
+    If you're worried about namespace pollution, you can disable
+    these macros by adding the following line to your \c .pro file:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 22
+
+    \section1 Other Container-Like Classes
+
+    Qt includes three template classes that resemble containers in
+    some respects. These classes don't provide iterators and cannot
+    be used with the \c foreach keyword.
+
+    \list
+    \o QVarLengthArray<T, Prealloc> provides a low-level
+       variable-length array. It can be used instead of QVector in
+       places where speed is particularly important.
+
+    \o QCache<Key, T> provides a cache to store objects of a certain
+       type T associated with keys of type Key.
+
+    \o QPair<T1, T2> stores a pair of elements.
+    \endlist
+
+    Additional non-template types that compete with Qt's template
+    containers are QBitArray, QByteArray, QString, and QStringList.
+
+    \section1 Algorithmic Complexity
+
+    Algorithmic complexity is concerned about how fast (or slow) each
+    function is as the number of items in the container grow. For
+    example, inserting an item in the middle of a QLinkedList is an
+    extremely fast operation, irrespective of the number of items
+    stored in the QLinkedList. On the other hand, inserting an item
+    in the middle of a QVector is potentially very expensive if the
+    QVector contains many items, since half of the items must be
+    moved one position in memory.
+
+    To describe algorithmic complexity, we use the following
+    terminology, based on the "big Oh" notation:
+
+    \keyword constant time
+    \keyword logarithmic time
+    \keyword linear time
+    \keyword linear-logarithmic time
+    \keyword quadratic time
+
+    \list
+    \o \bold{Constant time:} O(1). A function is said to run in constant
+       time if it requires the same amount of time no matter how many
+       items are present in the container. One example is
+       QLinkedList::insert().
+
+    \o \bold{Logarithmic time:} O(log \e n). A function that runs in
+       logarithmic time is a function whose running time is
+       proportional to the logarithm of the number of items in the
+       container. One example is qBinaryFind().
+
+    \o \bold{Linear time:} O(\e n). A function that runs in linear time
+       will execute in a time directly proportional to the number of
+       items stored in the container. One example is
+       QVector::insert().
+
+    \o \bold{Linear-logarithmic time:} O(\e{n} log \e n). A function
+       that runs in linear-logarithmic time is asymptotically slower
+       than a linear-time function, but faster than a quadratic-time
+       function.
+
+    \o \bold{Quadratic time:} O(\e{n}\unicode{178}). A quadratic-time function
+       executes in a time that is proportional to the square of the
+       number of items stored in the container.
+    \endlist
+
+    The following table summarizes the algorithmic complexity of Qt's
+    sequential container classes:
+
+    \table
+    \header \o                \o Index lookup \o Insertion \o Prepending         \o Appending
+    \row    \o QLinkedList<T> \o O(\e n)      \o O(1)      \o O(1)               \o O(1)
+    \row    \o QList<T>       \o O(1)         \o O(n)      \o Amort. O(1)        \o Amort. O(1)
+    \row    \o QVector<T>     \o O(1)         \o O(n)      \o O(n)               \o Amort. O(1)
+    \endtable
+
+    In the table, "Amort." stands for "amortized behavior". For
+    example, "Amort. O(1)" means that if you call the function
+    only once, you might get O(\e n) behavior, but if you call it
+    multiple times (e.g., \e n times), the average behavior will be
+    O(1).
+
+    The following table summarizes the algorithmic complexity of Qt's
+    associative containers and sets:
+
+    \table
+    \header \o{1,2}          \o{2,1} Key lookup            \o{2,1} Insertion
+    \header                  \o Average     \o Worst case  \o Average            \o Worst case
+    \row    \o QMap<Key, T>  \o O(log \e n) \o O(log \e n) \o O(log \e n)        \o O(log \e n)
+    \row    \o QMultiMap<Key, T>  \o O((log \e n) \o O(log \e n) \o O(log \e n)   \o O(log \e n)
+    \row    \o QHash<Key, T> \o Amort. O(1) \o O(\e n)     \o Amort. O(1)        \o O(\e n)
+    \row    \o QSet<Key>     \o Amort. O(1) \o O(\e n)     \o Amort. O(1)        \o O(\e n)
+    \endtable
+
+    With QVector, QHash, and QSet, the performance of appending items
+    is amortized O(log \e n). It can be brought down to O(1) by
+    calling QVector::reserve(), QHash::reserve(), or QSet::reserve()
+    with the expected number of items before you insert the items.
+    The next section discusses this topic in more depth.
+
+    \section1 Growth Strategies
+
+    QVector<T>, QString, and QByteArray store their items
+    contiguously in memory; QList<T> maintains an array of pointers
+    to the items it stores to provide fast index-based access (unless
+    T is a pointer type or a basic type of the size of a pointer, in
+    which case the value itself is stored in the array); QHash<Key,
+    T> keeps a hash table whose size is proportional to the number
+    of items in the hash. To avoid reallocating the data every single
+    time an item is added at the end of the container, these classes
+    typically allocate more memory than necessary.
+
+    Consider the following code, which builds a QString from another
+    QString:
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 23
+
+    We build the string \c out dynamically by appending one character
+    to it at a time. Let's assume that we append 15000 characters to
+    the QString string. Then the following 18 reallocations (out of a
+    possible 15000) occur when QString runs out of space: 4, 8, 12,
+    16, 20, 52, 116, 244, 500, 1012, 2036, 4084, 6132, 8180, 10228,
+    12276, 14324, 16372. At the end, the QString has 16372 Unicode
+    characters allocated, 15000 of which are occupied.
+
+    The values above may seem a bit strange, but here are the guiding
+    principles:
+    \list
+    \o QString allocates 4 characters at a time until it reaches size 20.
+    \o From 20 to 4084, it advances by doubling the size each time.
+       More precisely, it advances to the next power of two, minus
+       12. (Some memory allocators perform worst when requested exact
+       powers of two, because they use a few bytes per block for
+       book-keeping.)
+    \o From 4084 on, it advances by blocks of 2048 characters (4096
+       bytes). This makes sense because modern operating systems
+       don't copy the entire data when reallocating a buffer; the
+       physical memory pages are simply reordered, and only the data
+       on the first and last pages actually needs to be copied.
+    \endlist
+
+    QByteArray and QList<T> use more or less the same algorithm as
+    QString.
+
+    QVector<T> also uses that algorithm for data types that can be
+    moved around in memory using memcpy() (including the basic C++
+    types, the pointer types, and Qt's \l{shared classes}) but uses a
+    different algorithm for data types that can only be moved by
+    calling the copy constructor and a destructor. Since the cost of
+    reallocating is higher in that case, QVector<T> reduces the
+    number of reallocations by always doubling the memory when
+    running out of space.
+
+    QHash<Key, T> is a totally different case. QHash's internal hash
+    table grows by powers of two, and each time it grows, the items
+    are relocated in a new bucket, computed as qHash(\e key) %
+    QHash::capacity() (the number of buckets). This remark applies to
+    QSet<T> and QCache<Key, T> as well.
+
+    For most applications, the default growing algorithm provided by
+    Qt does the trick. If you need more control, QVector<T>,
+    QHash<Key, T>, QSet<T>, QString, and QByteArray provide a trio of
+    functions that allow you to check and specify how much memory to
+    use to store the items:
+
+    \list
+    \o \l{QString::capacity()}{capacity()} returns the
+       number of items for which memory is allocated (for QHash and
+       QSet, the number of buckets in the hash table).
+    \o \l{QString::reserve()}{reserve}(\e size) explicitly
+       preallocates memory for \e size items.
+    \o \l{QString::squeeze()}{squeeze()} frees any memory
+       not required to store the items.
+    \endlist
+
+    If you know approximately how many items you will store in a
+    container, you can start by calling reserve(), and when you are
+    done populating the container, you can call squeeze() to release
+    the extra preallocated memory.
+*/
diff --git a/doc/src/coordsys.qdoc b/doc/src/coordsys.qdoc
new file mode 100644
index 0000000000..604d233143
--- /dev/null
+++ b/doc/src/coordsys.qdoc
@@ -0,0 +1,486 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** Qt Coordinate System Documentation.
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Qt GUI Toolkit.
+** EDITIONS: FREE, PROFESSIONAL, ENTERPRISE
+**
+****************************************************************************/
+
+/*!
+    \page coordsys.html
+    \title The Coordinate System
+    \ingroup architecture
+    \brief Information about the coordinate system used by the paint
+    system.
+
+    The coordinate system is controlled by the QPainter
+    class. Together with the QPaintDevice and QPaintEngine classes,
+    QPainter form the basis of Qt's painting system, Arthur. QPainter
+    is used to perform drawing operations, QPaintDevice is an
+    abstraction of a two-dimensional space that can be painted on
+    using a QPainter, and QPaintEngine provides the interface that the
+    painter uses to draw onto different types of devices.
+
+    The QPaintDevice class is the base class of objects that can be
+    painted: Its drawing capabilities are inherited by the QWidget,
+    QPixmap, QPicture, QImage, and QPrinter classes. The default
+    coordinate system of a paint device has its origin at the top-left
+    corner. The \e x values increase to the right and the \e y values
+    increase downwards. The default unit is one pixel on pixel-based
+    devices and one point (1/72 of an inch) on printers.
+
+    The mapping of the logical QPainter coordinates to the physical
+    QPaintDevice coordinates are handled by QPainter's transformation
+    matrix, viewport and "window". The logical and physical coordinate
+    systems coincide by default. QPainter also supports coordinate
+    transformations (e.g. rotation and scaling).
+
+    \tableofcontents
+
+    \section1 Rendering
+
+    \section2 Logical Representation
+
+    The size (width and height) of a graphics primitive always
+    correspond to its mathematical model, ignoring the width of the
+    pen it is rendered with:
+
+    \table
+    \row
+    \o \inlineimage coordinatesystem-rect.png
+    \o \inlineimage coordinatesystem-line.png
+    \row
+    \o QRect(1, 2, 6, 4)
+    \o QLine(2, 7, 6, 1)
+    \endtable
+
+    \section2 Aliased Painting
+
+    When drawing, the pixel rendering is controlled by the
+    QPainter::Antialiasing render hint.
+
+    The \l {QPainter::RenderHint}{RenderHint} enum is used to specify
+    flags to QPainter that may or may not be respected by any given
+    engine. The QPainter::Antialiasing value indicates that the engine
+    should antialias edges of primitives if possible, i.e. smoothing
+    the edges by using different color intensities.
+
+    But by default the painter is \e aliased and other rules apply:
+    When rendering with a one pixel wide pen the pixels will be
+    rendered to the \e {right and below the mathematically defined
+    points}. For example:
+
+    \table
+    \row
+    \o \inlineimage coordinatesystem-rect-raster.png
+    \o \inlineimage coordinatesystem-line-raster.png
+
+    \row
+    \o
+    \snippet doc/src/snippets/code/doc_src_coordsys.qdoc 0
+
+    \o
+    \snippet doc/src/snippets/code/doc_src_coordsys.qdoc 1
+    \endtable
+
+    When rendering with a pen with an even number of pixels, the
+    pixels will be rendered symetrically around the mathematical
+    defined points, while rendering with a pen with an odd number of
+    pixels, the spare pixel will be rendered to the right and below
+    the mathematical point as in the one pixel case. See the QRectF
+    diagrams below for concrete examples.
+
+    \table
+    \header
+    \o {3,1} QRectF
+    \row
+    \o \inlineimage qrect-diagram-zero.png
+    \o \inlineimage qrectf-diagram-one.png
+    \row
+    \o Logical representation
+    \o One pixel wide pen
+    \row
+    \o \inlineimage qrectf-diagram-two.png
+    \o \inlineimage qrectf-diagram-three.png
+    \row
+    \o Two pixel wide pen
+    \o Three pixel wide pen
+    \endtable
+
+    Note that for historical reasons the return value of the
+    QRect::right() and QRect::bottom() functions deviate from the true
+    bottom-right corner of the rectangle.
+
+    QRect's \l {QRect::right()}{right()} function returns \l
+    {QRect::left()}{left()} + \l {QRect::width()}{width()} - 1 and the
+    \l {QRect::bottom()}{bottom()} function returns \l
+    {QRect::top()}{top()} + \l {QRect::height()}{height()} - 1.  The
+    bottom-right green point in the diagrams shows the return
+    coordinates of these functions.
+
+    We recommend that you simply use QRectF instead: The QRectF class
+    defines a rectangle in the plane using floating point coordinates
+    for accuracy (QRect uses integer coordinates), and the
+    QRectF::right() and QRectF::bottom() functions \e do return the
+    true bottom-right corner.
+
+    Alternatively, using QRect, apply \l {QRect::x()}{x()} + \l
+    {QRect::width()}{width()} and \l {QRect::y()}{y()} + \l
+    {QRect::height()}{height()} to find the bottom-right corner, and
+    avoid the \l {QRect::right()}{right()} and \l
+    {QRect::bottom()}{bottom()} functions.
+
+    \section2 Anti-aliased Painting
+
+    If you set QPainter's \l {QPainter::Antialiasing}{anti-aliasing}
+    render hint, the pixels will be rendered symetrically on both
+    sides of the mathematically defined points:
+
+    \table
+    \row
+    \o \inlineimage coordinatesystem-rect-antialias.png
+    \o \inlineimage coordinatesystem-line-antialias.png
+    \row
+    \o
+
+    \snippet doc/src/snippets/code/doc_src_coordsys.qdoc 2
+
+    \o
+    \snippet doc/src/snippets/code/doc_src_coordsys.qdoc 3
+    \endtable
+
+    \section1 Transformations
+
+    By default, the QPainter operates on the associated device's own
+    coordinate system, but it also has complete support for affine
+    coordinate transformations.
+
+    You can scale the coordinate system by a given offset using the
+    QPainter::scale() function, you can rotate it clockwise using the
+    QPainter::rotate() function and you can translate it (i.e. adding
+    a given offset to the points) using the QPainter::translate()
+    function.
+
+    \table
+    \row
+    \o \inlineimage qpainter-clock.png
+    \o \inlineimage qpainter-rotation.png
+    \o \inlineimage qpainter-scale.png
+    \o \inlineimage qpainter-translation.png
+    \row
+    \o nop
+    \o \l {QPainter::rotate()}{rotate()}
+    \o \l {QPainter::scale()}{scale()}
+    \o \l {QPainter::translate()}{translate()}
+    \endtable
+
+    You can also twist the coordinate system around the origin using
+    the QPainter::shear() function. See the \l {demos/affine}{Affine
+    Transformations} demo for a visualization of a sheared coordinate
+    system. All the transformation operations operate on QPainter's
+    transformation matrix that you can retrieve using the
+    QPainter::worldMatrix() function. A matrix transforms a point in the
+    plane to another point.
+
+    If you need the same transformations over and over, you can also
+    use QMatrix objects and the QPainter::worldMatrix() and
+    QPainter::setWorldMatrix() functions. You can at any time save the
+    QPainter's transformation matrix by calling the QPainter::save()
+    function which saves the matrix on an internal stack. The
+    QPainter::restore() function pops it back.
+
+    One frequent need for the transformation matrix is when reusing
+    the same drawing code on a variety of paint devices. Without
+    transformations, the results are tightly bound to the resolution
+    of the paint device. Printers have high resolution, e.g. 600 dots
+    per inch, whereas screens often have between 72 and 100 dots per
+    inch.
+
+    \table 100%
+    \header
+    \o {2,1} Analog Clock Example
+    \row
+    \o \inlineimage coordinatesystem-analogclock.png
+    \o
+    The Analog Clock example shows how to draw the contents of a
+    custom widget using QPainter's transformation matrix.
+
+    Qt's example directory provides a complete walk-through of the
+    example. Here, we will only review the example's \l
+    {QWidget::paintEvent()}{paintEvent()} function to see how we can
+    use the transformation matrix (i.e. QPainter's matrix functions)
+    to draw the clock's face.
+
+    We recommend compiling and running this example before you read
+    any further. In particular, try resizing the window to different
+    sizes.
+
+    \row
+    \o {2,1}
+
+    \snippet examples/widgets/analogclock/analogclock.cpp 9
+
+    First, we set up the painter. We translate the coordinate system
+    so that point (0, 0) is in the widget's center, instead of being
+    at the top-left corner. We also scale the system by \c side / 100,
+    where \c side is either the widget's width or the height,
+    whichever is shortest. We want the clock to be square, even if the
+    device isn't.
+
+    This will give us a 200 x 200 square area, with the origin (0, 0)
+    in the center, that we can draw on. What we draw will show up in
+    the largest possible square that will fit in the widget.
+
+    See also the \l {Window-Viewport Conversion} section.
+
+    \snippet examples/widgets/analogclock/analogclock.cpp 18
+
+    We draw the clock's hour hand by rotating the coordinate system
+    and calling QPainter::drawConvexPolygon(). Thank's to the
+    rotation, it's drawn pointed in the right direction.
+
+    The polygon is specified as an array of alternating \e x, \e y
+    values, stored in the \c hourHand static variable (defined at the
+    beginning of the function), which corresponds to the four points
+    (2, 0), (0, 2), (-2, 0), and (0, -25).
+
+    The calls to QPainter::save() and QPainter::restore() surrounding
+    the code guarantees that the code that follows won't be disturbed
+    by the transformations we've used.
+
+    \snippet examples/widgets/analogclock/analogclock.cpp 24
+
+    We do the same for the clock's minute hand, which is defined by
+    the four points (1, 0), (0, 1), (-1, 0), and (0, -40). These
+    coordinates specify a hand that is thinner and longer than the
+    minute hand.
+
+    \snippet examples/widgets/analogclock/analogclock.cpp 27
+
+    Finally, we draw the clock face, which consists of twelve short
+    lines at 30-degree intervals. At the end of that, the painter is
+    rotated in a way which isn't very useful, but we're done with
+    painting so that doesn't matter.
+    \endtable
+
+    For a demonstation of Qt's ability to perform affine
+    transformations on painting operations, see the \l
+    {demos/affine}{Affine Transformations} demo which allows the user
+    to experiment with the transformation operations.  See also the \l
+    {painting/transformations}{Transformations} example which shows
+    how transformations influence the way that QPainter renders
+    graphics primitives. In particular, it shows how the order of
+    transformations affects the result.
+
+    For more information about the transformation matrix, see the
+    QMatrix documentation.
+
+    \section1 Window-Viewport Conversion
+
+    When drawing with QPainter, we specify points using logical
+    coordinates which then are converted into the physical coordinates
+    of the paint device.
+
+    The mapping of the logical coordinates to the physical coordinates
+    are handled by QPainter's world transformation \l
+    {QPainter::worldMatrix()}{worldMatrix()} (described in the \l
+    Transformations section), and QPainter's \l
+    {QPainter::viewport()}{viewport()} and \l
+    {QPainter::window()}{window()}.  The viewport represents the
+    physical coordinates specifying an arbitrary rectangle. The
+    "window" describes the same rectangle in logical coordinates. By
+    default the logical and physical coordinate systems coincide, and
+    are equivalent to the paint device's rectangle.
+
+    Using window-viewport conversion you can make the logical
+    coordinate system fit your preferences. The mechanism can also be
+    used to make the drawing code independent of the paint device. You
+    can, for example, make the logical coordinates extend from (-50,
+    -50) to (50, 50) with (0, 0) in the center by calling the
+    QPainter::setWindow() function:
+
+    \snippet doc/src/snippets/code/doc_src_coordsys.qdoc 4
+
+    Now, the logical coordinates (-50,-50) correspond to the paint
+    device's physical coordinates (0, 0). Independent of the paint
+    device, your painting code will always operate on the specified
+    logical coordinates.
+
+    By setting the "window" or viewport rectangle, you perform a
+    linear transformation of the coordinates. Note that each corner of
+    the "window" maps to the corresponding corner of the viewport, and
+    vice versa. For that reason it normally is a good idea to let the
+    viewport and "window" maintain the same aspect ratio to prevent
+    deformation:
+
+    \snippet doc/src/snippets/code/doc_src_coordsys.qdoc 5
+
+    If we make the logical coordinate system a square, we should also
+    make the viewport a square using the QPainter::setViewport()
+    function. In the example above we make it equivalent to the
+    largest square that fit into the paint device's rectangle. By
+    taking the paint device's size into consideration when setting the
+    window or viewport, it is possible to keep the drawing code
+    independent of the paint device.
+
+    Note that the window-viewport conversion is only a linear
+    transformation, i.e. it does not perform clipping. This means that
+    if you paint outside the currently set "window", your painting is
+    still transformed to the viewport using the same linear algebraic
+    approach.
+
+    \image coordinatesystem-transformations.png
+
+    The viewport, "window" and transformation matrix determine how
+    logical QPainter coordinates map to the paint device's physical
+    coordinates. By default the world transformation matrix is the
+    identity matrix, and the "window" and viewport settings are
+    equivalent to the paint device's settings, i.e. the world,
+    "window" and device coordinate systems are equivalent, but as we
+    have seen, the systems can be manipulated using transformation
+    operations and window-viewport conversion. The illustration above
+    describes the process.
+
+    \omit
+    \section1 Related Classes
+
+    Qt's paint system, Arthur, is primarily based on the QPainter,
+    QPaintDevice, and QPaintEngine classes:
+
+    \table
+    \header \o Class \o Description
+    \row
+    \o QPainter
+    \o
+    The QPainter class performs low-level painting on widgets and
+    other paint devices.  QPainter can operate on any object that
+    inherits the QPaintDevice class, using the same code.
+    \row
+    \o QPaintDevice
+    \o
+    The QPaintDevice class is the base class of objects that can be
+    painted. Qt provides several devices: QWidget, QImage, QPixmap,
+    QPrinter and QPicture, and other devices can also be defined by
+    subclassing QPaintDevice.
+    \row
+    \o QPaintEngine
+    \o
+    The QPaintEngine class provides an abstract definition of how
+    QPainter draws to a given device on a given platform.  Qt 4
+    provides several premade implementations of QPaintEngine for the
+    different painter backends we support; it provides one paint
+    engine for each supported window system and painting
+    frameworkt. You normally don't need to use this class directly.
+    \endtable
+
+    The 2D transformations of the coordinate system are specified
+    using the QMatrix class:
+
+    \table
+    \header \o Class \o Description
+    \row
+    \o QMatrix
+    \o
+    A 3 x 3 transformation matrix. Use QMatrix to rotate, shear,
+    scale, or translate the coordinate system.
+    \endtable
+
+    In addition Qt provides several graphics primitive classes. Some
+    of these classes exist in two versions: an \c{int}-based version
+    and a \c{qreal}-based version. For these, the \c qreal version's
+    name is suffixed with an \c F.
+
+    \table
+    \header \o Class \o Description
+    \row
+    \o \l{QPoint}(\l{QPointF}{F})
+    \o
+    A single 2D point in the coordinate system. Most functions in Qt
+    that deal with points can accept either a QPoint, a QPointF, two
+    \c{int}s, or two \c{qreal}s.
+    \row
+    \o \l{QSize}(\l{QSizeF}{F})
+    \o
+    A single 2D vector. Internally, QPoint and QSize are the same, but
+    a point is not the same as a size, so both classes exist.  Again,
+    most functions accept either QSizeF, a QSize, two \c{int}s, or two
+    \c{qreal}s.
+    \row
+    \o \l{QRect}(\l{QRectF}{F})
+    \o
+    A 2D rectangle. Most functions accept either a QRectF, a QRect,
+    four \c{int}s, or four \c {qreal}s.
+    \row
+    \o \l{QLine}(\l{QLineF}{F})
+    \o
+    A 2D finite-length line, characterized by a start point and an end
+    point.
+    \row
+    \o \l{QPolygon}(\l{QPolygonF}{F})
+    \o
+    A 2D polygon. A polygon is a vector of \c{QPoint(F)}s. If the
+    first and last points are the same, the polygon is closed.
+    \row
+    \o QPainterPath
+    \o
+    A vectorial specification of a 2D shape. Painter paths are the
+    ultimate painting primitive, in the sense that any shape
+    (rectange, ellipse, spline) or combination of shapes can be
+    expressed as a path. A path specifies both an outline and an area.
+    \row
+    \o QRegion
+    \o
+    An area in a paint device, expressed as a list of
+    \l{QRect}s. In general, we recommend using the vectorial
+    QPainterPath class instead of QRegion for specifying areas,
+    because QPainterPath handles painter transformations much better.
+    \endtable
+    \endomit
+
+    \sa {Analog Clock Example}, {Transformations Example}
+*/
diff --git a/doc/src/credits.qdoc b/doc/src/credits.qdoc
new file mode 100644
index 0000000000..114e28ddb1
--- /dev/null
+++ b/doc/src/credits.qdoc
@@ -0,0 +1,348 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page credits.html
+
+    \title Thanks!
+    \ingroup licensing
+    \brief A list of contributors to Qt.
+
+    The following (and probably many others) have provided bug reports,
+    suggestions, patches, beta testing, or done us other favors.  We thank
+    you all:
+
+    Adam P. Jenkins <ajenkins at cs.umass.edu>\br
+    Ahmed Metwally <ametwaly at auc-cs28.eun.eg>\br
+    Aidas Kasparas <kaspar at soften.ktu.lt>\br
+    Alejandro Aguilar Sierra <asierra at servidor.unam.mx>\br
+    Alex <steeper at dial.pipex.com>\br
+    Alex Kambis <kambis at eos913c.gsfc.nasa.gov>\br
+    Alexander Kozlov <alex at hale.appl.sci-nnov.ru>\br
+    Alexander Sanda <alex at darkstar.ping.at>\br
+    Amos Leffler <leffler at netaxs.com>\br
+    Anders Hanson <andhan at lls.se>\br
+    Andi Peredri <andi at ukr.net>\br
+    Andreas Schlempp <schlempp at egd.igd.fhg.de>\br
+    Andrew Bell <abell at vsys.com>\br
+    Andrew Gillham <gillhaa at ghost.whirlpool.com>\br
+    Andrew J. Robinson <robinson at eclipse.net>\br
+    Andrew Pavlomanolakos <app at novanet.net.au>\br
+    Andrew R. Tefft <teffta at crypt.erie.ge.com>\br
+    Andrew Vajoczki <vajoczki at interlog.com>\br
+    Andr\eacute Johansen <Andre.Johansen at funcom.no>\br
+    Andr\eacute Kramer <Andre.Kramer at glpg.com>\br     
+    Andriy Rysin <arysin at yahoo.com>\br
+    Andy Brice <andyb at suntail.net>\br
+    Andy Shaw <andy at east.no>\br
+    Anton Keyter <ant at intekom.co.za>\br
+    Arabeyes Project (http://www.arabeyes.org) <doc at arabeyes.org> \br
+    ARISE - Marcin Giedz <giedz at arise.pl>\br
+    Arnt Gulbrandsen <arnt at gulbrandsen.priv.no>\br
+    Ashley Winters <jql at accessone.com>\br
+    Aubrey Soper <azdak at ix.netcom.com>\br
+    Axel Schwenke <schwenke at HTWM.DE>\br
+    Ben Bergen <ben at gmg.com>\br
+    Bernard Leach <B.Leach at compsoc.cs.latrobe.edu.au>\br
+    Bernd Johannes Wuebben <wuebben at math.cornell.edu>\br
+    Bernd S. Brentrup <bsb at uni-muenster.de>\br
+    Bert Haverkamp <b.r.j.haverkamp at et.tudelft.nl>\br
+    Bjorn Reese <breese at dit.ou.dk>\br
+    Bj\ouml\c{}rn Bergstr\ouml\c{}rm <bjorn.bergstrom at roguelikedevelopment.org>\br
+    Brian Beattie <beattie at drcpdx.stt3.com>\br
+    Brian P. Theodore <theodore at std.saic.com>\br
+    Brian White <bcwhite at verisim.com>\br
+    Bryan Scattergood <bryan at fsel.com>\br
+    Carsten Steckel <carsten at cs.newcastle.edu.au>\br
+    Chao-Hsin, Lin <linchao at charlie.cns.iit.edu>\br
+    Chip Salzenberg <chip at atlantic.net>\br
+    Chris Zwilling <crzwlng at cloudnet.com>\br
+    Christian Czezatke <e9025461 at student.tuwien.ac.at>\br
+    Christopher Andrew Spiking <cas at Cs.Nott.AC.UK>\br
+    Christopher J. White <cjwhite at rgit.wustl.edu>\br
+    Clarence Dang <dang at kde.org>\br
+    Claus Werner <lzu96cw at reading.ac.uk>\br
+    Cloyce D. Spradling <cloyce at austin.ibm.com>\br
+    Colin Paul Adams <colin at colina.demon.co.uk>\br
+    Cristiano Verondini <cverond at deis219.deis.unibo.it>\br
+    Damyan Pepper <damyanp at cogs.susx.ac.uk>\br
+    Dan Nickerson <nickersond at uthscsa.edu>\br
+    Daniel Brahneborg <basic at well.com>\br
+    Daniel Gruner <dgruner at tikva.chem.utoronto.ca>\br
+    Daniel J Mitchell <dan at rebellion.co.uk>\br
+    Danilo Fiorenzano <danilo at terranet.ab.ca>\br
+    Daniel M. Duley <daniel.duley at verizon.net>\br
+    Dante Profeta <profeta at neomedia.it>\br
+    Darryl Ruggles <001654r at dragon.acadiau.ca>\br
+    Dave <dave at stellacore.com>\br
+    Dave Steffen <steffend at glitch.physics.colostate.edu>\br
+    Dean Hall <dwhall at deskstation.com>\br
+    Denis Y. Pershin <dyp at isis.nsu.ru>\br
+    Diedrich Vorberg <Diedrich_Vorberg at cp.prima.ruhr.de>\br
+    Dietmar Schaefer <dietmar at cs.newcastle.edu.au>\br
+    Dimitri Papadopoulos <dpo at club-internet.fr>\br
+    Dirk Mueller <mueller at kde.org>\br
+    Dirk Schwartmann <dirk.schwartmann at dlr.de>\br
+    Dominik Jergus <djergus at ics.uci.edu>\br
+    Don Sanders <sanders at kde.org>\br
+    Donald A. Seielstad <donald at gromit.scs.uiuc.edu>\br
+    Donna J. Armijo <donna at KachinaTech.COM>\br
+    Doug Boreland <dborel at amex-trs.com>\br
+    Douglas Lenz <dlenz at spedsoft.com>\br
+    Dr Mek Buhl Nielsen <m.b.nielsen at bham.ac.uk>\br
+    Dr Willem A. Schreuder <Willem.Schreuder at prinmath.com>\br
+    E. Kevin Hall <hall at boston.sgi.com>\br
+    Ed Mackey <emackey at Early.com>\br
+    Edmund Taylor <etaylor at interaccess.com>\br
+    Enrique Mat\iacute\c{}as S\aacute\c{}nchez <cronopios at gmail.com>\br
+    Eric Bos <Eric.Bos at adelaide.maptek.com.au>\br
+    Eric Brunson <brunson at brunson.com>\br
+    Eric Jansen <jansen at photon.com>\br
+    Erik Norell <erik at Astrakan.HGS.SE>\br
+    Erik Thiele <erik at unterland.de>\br
+    Ernie Pasveer <erniep at vsl.com>\br
+    F R Ball <frb at umr.edu>\br
+    Fergal Mc Carthy <fergal at ilo.dec.com>\br
+    Frank Gockel <gockel at etecs4.uni-duisburg.de>\br
+    Frank Roscher <frank at chemnitz.abs-rz.de>\br
+    Franklin <franklin at goodhorse.idv.tw>\br
+    Fredrik Markstr\ouml\c{}m <fredrik at zod.campus.luth.se>\br
+    Fredrik Nehr <fredrik_nehr at ivab.se>\br
+    FrenzelBhv at aol.com\br
+    Frugal <frugal at wardrobe.demon.co.uk>\br
+    Frugal the Curious <Chris.Ward at softcare.co.uk>\br
+    Fujimoto Koji <kochan at mbox.kyoto-inet.or.jp>\br
+    Gabor V. Gulyas <gabor at robiomat.com>\br
+    Gary E. Sherman <sherman at mrcc.com>\br
+    Geoff Carpenter <GCC at watson.ibm.com>\br
+    Geoffrey Higginson <ghiggins at gulf.uvic.ca>\br
+    Georg Filios <Georg.Filios at post.rwth-aachen.de>\br
+    George Simunovich <george at cia-g.com>\br
+    Giovanni Bajo <giovannibajo at gmail.com>\br
+    Giovanni Carapelli <gcarapel at mbox.vol.it>\br
+    Greg Tomalesky <tomalesk at yrkpa.kias.com>\br
+    Gregg Jensen <gwj at stl.nexen.com>\br
+    Gustav "Gurre" Kalvesten <a94guska at ida.his.se>\br
+    Hal DeVore <hdevore at crow.bmc.com>\br
+    Hans Flaechsig <hans at hannes.owl.de>\br
+    Hans Schlenker <schlenkh at informatik.uni-muenchen.de>\br
+    Hardo Mueller <hardo at ipb.uni-bonn.de>\br
+    Heiko Gerdau <heiko.gerdau at t-online.de>\br
+    Helder Correia <helder.pereira.correia at gmail.com>\br
+    Henty Waker <henty at foxbat.sur.uct.ac.za>\br
+    Holger Hans Peter Freyther <zecke at selfish.org>\br
+    Hrafnkell Eiriksson <hkelle at mmedia.is>\br
+    Ildefonso Junquero Martin-Arroyo <junquero at sainsel.es>\br
+    Ingo Stapel <ingo.stapel at tu-clausthal.de>\br
+    J. Solomon Kostelnik <roz at one.net>\br
+    Jae Cho <cs184-dc at ute.CS.Berkeley.EDU>\br
+    James McIninch <james at amber.biology.gatech.edu>\br
+    Jan Aarsaether <jaa at metis.no>\br
+    Jaromir Dolecek <dolecek at ics.muni.cz>\br
+    Jasmin Blanchette <jasminb at corel.com>\br
+    Jason Evans <evans911 at cs.uidaho.edu>\br
+    Jay Painter <jay at a42.com>\br
+    Jean-Philippe Langlois <jpl at iname.com>\br
+    Jeff Harris <jharris at cis.ohio-state.edu>\br
+    Jeff Largent <jlargent at iu.net>\br
+    Jeffrey Vetter <vetter at lanl.gov>\br
+    Jeremy Wohl <jeremy at godzilli.cs.sunysb.edu>\br
+    Jesper K. Pedersen <blackie atklaralvdalens-datakonsult.se>\br
+    Jim Lauchlan <jim.lauchlan at gecm.com>\br
+    Joachim Backes <backes at rhrk.uni-kl.de>\br
+    Jochen R&ouml;mmler <jochen at concept.de>\br
+    Jochen Scharrlach <jscharrl at BA-Stuttgart.De>\br
+    Joe Croft <jcroft at swbell.net>\br
+    Joel Lindholm <wizball at kewl.campus.luth.se>\br
+    John H. Reppy <jhr at research.att.com>\br
+    John Huertas - Jourda <octarine at gte.net>\br
+    John Ouellette <ouellet at beluga.phys.UVic.CA>\br
+    John Vidar Larring <larring at weatherone.tv>\br
+    Jon Brumfitt <jbrumfit at astro.estec.esa.nl>\br
+    Jose Castro <jocastro at erols.com>\br
+    Jukka Heinonen <jhei at iki.fi>\br
+    Julian Enticknap <Julian.Enticknap at UK.Sun.COM>\br
+    Jussi-Pekka Sairanen <jussi-pekka.sairanen at research.nokia.com>\br
+    Kalle Dalheimer <kalle at dalheimer.hh.eunet.de>\br
+    Karl Robillard <karl at skygames.com>\br
+    Keith Brown <ksbrown at ix.netcom.com>\br
+    Keith Dowsett <kdowsett at rpms.ac.uk>\br
+    Ken Hollis <khollis at northwest.com>\br
+    Kirill Konyagin <kirill at asplinux.ru>\br
+    Klaus Ebner <klaus at gaspode.ndh.com>\br
+    Klaus-Georg Adams <Klaus-Georg.Adams at chemie.uni-karlsruhe.de>\br
+    Klaus Schmidinger <Klaus.Schmidinger at cadsoft.de>\br
+    Kristian Freed <d00freed at dtek.chalmers.se>\br
+    Kristof Depraetere <Kristof.Depraetere at rug.ac.be>\br
+    Kurt L Anderson <kurt+ at osu.edu>\br
+    Larry Lee <lclee at primenet.com>\br
+    Lars Knoll <knoll at mpi-hd.mpg.de>\br
+    M. G. Berberich <berberic at fmi.uni-passau.de>\br
+    Maas-Maarten Zeeman <mzeeman at cs.vu.nl>\br
+    Magnus Persson <mpersson at eritel.se>\br
+    Mario Weilguni <mweilguni at arctica.sime.com>\br
+    Marius Storm-Olsen <marius at storm-olsen.com>\br
+    Mariya <muha at iclub.nsu.ru>\br
+    Mark Summerfield <summer at perlpress.com>\br
+    Markku Hihnala <mah at ee.oulu.fi>\br
+    Marko Macek <Marko.Macek at snet.fer.uni-lj.si>\br
+    Martin Baehr <mbaehr at email.archlab.tuwien.ac.at>\br
+    Martin Mueller <mm at lunetix.de>\br
+    Martin van Velsen <vvelsen at ronix.ptf.hro.nl>\br
+    Matthias Ettrich <ettrich at fisher.informatik.uni-tuebingen.de>\br
+    Matthias Kretz <kretz at kde.org>
+    Matthias Suencksen <msuencks at techfak.uni-bielefeld.de>\br
+    Mattias Engdeg\aring\c{}rd <f91-men at nada.kth.se>\br
+    Michael Doppler <m.doppler at icoserve.com>\br
+    Michael Figley <figley at ibmoto.com>\br
+    Michael George <george at quark.im4u.net>\br
+    Michael Graff <explorer at flame.org>\br
+    Michael H. Price II <price at ERC.MsState.Edu>\br
+    Michael Harnois <mharnois at sbt.net>\br
+    Michael Hohmuth <hohmuth at inf.tu-dresden.de>\br
+    Michael Leodolter <michael at lab1.psy.univie.ac.at>\br
+    Michael Roth <mroth at nessie.de>\br
+    Michael Schwendt <Michael_Schwendt at public.uni-hamburg.de>\br
+    Michal Polak <mpolak at fi.muni.cz>\br
+    Mikael Bourges-Sevenier <bourges at int-evry.fr>\br
+    Mike Fearn <hp003 at dra.hmg.gb>\br
+    Mike Perik <mikep at crt.com>\br
+    Mike Sharkey <msharkey at softarc.com>\br
+    Mikko Ala-Fossi <mikko.ala-fossi at vaisala.com>\br
+    Miroslav Flidr <flidr at kky.zcu.cz>\br
+    Miyata Shigeru <miyata at kusm.kyoto-u.ac.jp>\br
+    Myron Uecker <muecker at csd.net>\br
+    Neal Sanche <neal at nsdev.org>\br
+    Ngok Yuk Yau <zzy at compuserve.com>\br
+    Niclas Anderberg <agony at sparta.lu.se>\br
+    Nicolas Goutte <goutte at kde.org>\br
+    Oliver Eiden <o.eiden at pop.ruhr.de>\br
+    Oliver Elphick <olly at lfix.co.uk>\br
+    Olivier Verloove <overloov at ulb.ac.be>\br
+    Osku Salerma <osku at iki.fi>\br
+    P. J. Leonard <eespjl at ee.bath.ac.uk>\br
+    Paolo Galatola <paolo at iris.polito.it>\br
+    Pat Dowler <dowler at pt1B1106.FSH.UVic.CA>\br
+    Patrice Trognon <trognon at apogee-com.fr>\br
+    Patrick Voigt <Patrick.Voigt at Informatik.TU-Chemnitz.DE>\br
+    Paul Bucheit <ptb at k2.cwru.edu>\br
+    Paul Curtis <plc at rowley.co.uk>\br
+    Paul Kendall <paul at kcbbs.gen.nz>\br
+    Paul Marquis <pmarquis at iddptm.iddis.com>\br
+    Peter Bender <bender at iib.bauwesen.th-darmstadt.de>\br
+    Peter Klotz <p.klotz at icoserve.com>\br
+    Peter Pletcher <peter at delilah>\br
+    Pierre Rocque <rocque at CRHSC.Umontreal.CA>\br
+    Pohorecki Wladyslaw <pohorecki at novell.ftj.agh.edu.pl>\br
+    R.S. Mallozzi, <mallozzi at bowie.msfc.nasa.gov>\br
+    Ralf Stanke <ralf at mcshh.hanse.de>\br
+    Reginald Stadlbauer <reggie at kde.org>\br
+    Richard Fric <Richard.Fric at kdemail.net>\br
+    Richard D. Jackson <rjackson at bga.com>\br
+    Richard Keech <rkeech at colesmyer.com.au>\br
+    Richard Moore <rich at kde.org>\br
+    Rick Brohl <rbrohl at uswest.com>\br
+    Robert Anderson <Robert.E.Anderson at unh.edu>\br
+    Robert Cimrman <cimrman at marius.univ-mrs.fr>\br
+    Roberto Alsina <ralsina at ultra7.unl.edu.ar>\br
+    Robin Helgelin <robin at garcio.com>\br
+    Rohlfs Reiner <Reiner.Rohlfs at obs.unige.ch>\br
+    Salman Sheikh <salman at vdragon.gsfc.nasa.gov>\br
+    Sandro Giessl <sandro at giessl.com>\br
+    Sandro Sigala <ssigala at globalnet.it>\br
+    Scott Coppen <scoppen at emerald.tufts.edu>\br
+    Sean Echevarria <sean at beatnik.com>\br
+    Sean Vyain <svyain at mail.tds.net>\br
+    Sirtaj Singh Kang <ssk at physics.unimelb.EDU.AU>\br
+    Sivan Toledo\br
+    Stefan Cronert <d93-scr at nada.kth.se>\br
+    Stefan Taferner <taf at porsche.co.at>\br
+    Steffen Hansen <stefh at dit.ou.dk>\br
+    Stephan Pfab <pfab at mathematik.uni-ulm.de>\br
+    Stephane Zermatten <szermat at ibm.net>\br
+    Sven Fischer <sven at comnets.rwth-aachen.de>\br
+    Sven Riedel <lynx at heim8.tu-clausthal.de>\br
+    Terje Dalen <terje at norcontrol.no>\br
+    Thomas Degrange <thomas.degrange at danaher-motion.ch>\br
+    Thomas Lineal <thomas at ricci.allcon.com>\br
+    Thomas Rath <rath at mac-info-link.de>\br
+    Thorsten Ende <the at is-bremen.de>\br
+    Tiaan Wessels <tiaan at inetsys.alt.za>\br
+    Tim D. Gilman <tdgilman at best.com>\br
+    Tom Houlder <thoulder at icor.fr>\br
+    Tony Albrecht <Tony.Albrecht at adelaide.maptek.com.au>\br
+    Torgeir Hovden <hovden at akkurat.idt.ntnu.no>\br
+    Trenton W. Schulz <twschulz at cord.edu>\br
+    Trond Hellem B\oslash <s638 at ii.uib.no>\br
+    Trond Solli <Trond.Solli at marintek.sintef.no>\br
+    Ulf Stelbe <ust at egd.igd.fhg.de>\br
+    Ulrich Hertlein <uhe at cs.tu-berlin.de>\br
+    Ulrich Ring <ur at daveg.com>\br
+    Uwe Thiem <uwe at uwix.alt.na>\br
+    Vadim Zaliva <lord at crocodile.org>\br
+    Val Gough <val at stellacore.com>\br
+    Vilhelm Sj\ouml\c{}berg <ville at swipnet.se>\br
+    Vlad Karpinsky <vlad at crocodile.org>\br
+    Volker Hilsheimer <vohi at gmx.de>\br
+    Volker Poplawski <volkerp at stepnet.de>\br
+    Warwick Allison <warwick at it.uq.edu.au>\br
+    Witold Wysota <wysota at qtcentre.org>\br
+    Xiaojian Li <lixj at monte.rutgers.edu>\br
+    Ximenes <ximenes at netset.com>\br
+    Y. N. Lo <ynlo at netcom.ca>\br
+    Zyklon <zyk at dds.nl>\br
+    atsushi konno <jibe at ppp.bekkoame.or.jp>\br
+    berry at hxi.com\br
+    boris passek <boris at ice.fb12.TU-Berlin.DE>\br
+    fidaire <fidaire at bip.fr>\br
+    joeh at sugar-river.net\br
+    rinsch at aea.ruhr-uni-bochum.de\br
+    tsutsui at kekvax.kek.jp\br
+    vandevod at cs.rpi.edu\br
+    Vincent Ricard <magic at magicninja.org>\br
+    vinckeg at sebb.bel.alcatel.be\br
+    yleffler at ucis.vill.edu\br
+    Houssem BDIOUI <houssem.bdioui at gmail.com>\br
+
+    We hope there are not too many omissions from the list.
+    Please submit any corrections to the \l{Task Tracker}
+    on the Qt website.
+*/
diff --git a/doc/src/custom-types.qdoc b/doc/src/custom-types.qdoc
new file mode 100644
index 0000000000..81eecfcd48
--- /dev/null
+++ b/doc/src/custom-types.qdoc
@@ -0,0 +1,178 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page custom-types.html
+    \title Creating Custom Qt Types
+    \ingroup architecture
+    \brief How to create and register new types with Qt.
+
+    \tableofcontents
+
+    \section1 Overview
+
+    When creating user interfaces with Qt, particularly those with specialized controls and
+    features, developers sometimes need to create new data types that can be used alongside
+    or in place of Qt's existing set of value types.
+
+    Standard types such as QSize, QColor and QString can all be stored in QVariant objects,
+    used as the types of properties in QObject-based classes, and emitted in signal-slot
+    communication.
+
+    In this document, we take a custom type and describe how to integrate it into Qt's object
+    model so that it can be stored in the same way as standard Qt types. We then show how to
+    register the custom type to allow it to be used in signals and slots connections.
+
+    \section1 Creating a Custom Type
+
+    Before we begin, we need to ensure that the custom type we are creating meets all the
+    requirements imposed by QMetaType. In other words, it must provide:
+
+    \list
+    \o a public default constructor,
+    \o a public copy constructor, and
+    \o a public destructor.
+    \endlist
+
+    The following \c Message class definition includes these members:
+
+    \snippet examples/tools/customtype/message.h custom type definition
+
+    The class also provides a constructor for normal use and two public member functions
+    that are used to obtain the private data.
+
+    \section1 Declaring the Type with QMetaType
+
+    The \c Message class only needs a suitable implementation in order to be usable.
+    However, Qt's type system will not be able to understand how to store, retrieve
+    and serialize instances of this class without some assistance. For example, we
+    will be unable to store \c Message values in QVariant.
+
+    The class in Qt responsible for custom types is QMetaType. To make the type known
+    to this class, we invoke the Q_DECLARE_METATYPE() macro on the class in the header
+    file where it is defined:
+
+    \snippet examples/tools/customtype/message.h custom type meta-type declaration
+
+    This now makes it possible for \c Message values to be stored in QVariant objects
+    and retrieved later. See the \l{Custom Type Example} for code that demonstrates
+    this.
+
+    The Q_DECLARE_METATYPE() macro also makes it possible for these values to be used as
+    arguments to signals, but \e{only in direct signal-slot connections}.
+    To make the custom type generally usable with the signals and slots mechanism, we
+    need to perform some extra work.
+
+    \section1 Creating and Destroying Custom Objects
+
+    Although the declaration in the previous section makes the type available for use
+    in direct signal-slot connections, it cannot be used for queued signal-slot
+    connections, such as those that are made between objects in different threads.
+    This is because the meta-object system does not know how to handle creation and
+    destruction of objects of the custom type at run-time.
+
+    To enable creation of objects at run-time, call the qRegisterMetaType() template
+    function to register it with the meta-object system. This also makes the type
+    available for queued signal-slot communication as long as you call it before you
+    make the first connection that uses the type.
+
+    The \l{Queued Custom Type Example} declares a \c Block class which is registered
+    in the \c{main.cpp} file:
+
+    \snippet examples/threads/queuedcustomtype/main.cpp main start
+    \dots
+    \snippet examples/threads/queuedcustomtype/main.cpp register meta-type for queued communications
+    \dots
+    \snippet examples/threads/queuedcustomtype/main.cpp main finish
+
+    This type is later used in a signal-slot connection in the \c{window.cpp} file:
+
+    \snippet examples/threads/queuedcustomtype/window.cpp Window constructor start
+    \dots
+    \snippet examples/threads/queuedcustomtype/window.cpp connecting signal with custom type
+    \dots
+    \snippet examples/threads/queuedcustomtype/window.cpp Window constructor finish
+
+    If a type is used in a queued connection without being registered, a warning will be
+    printed at the console; for example:
+
+    \code
+    QObject::connect: Cannot queue arguments of type 'Block'
+    (Make sure 'Block' is registered using qRegisterMetaType().)
+    \endcode
+
+    \section1 Making the Type Printable
+
+    It is often quite useful to make a custom type printable for debugging purposes,
+    as in the following code:
+
+    \snippet examples/tools/customtype/main.cpp printing a custom type
+
+    This is achieved by creating a streaming operator for the type, which is often
+    defined in the header file for that type:
+
+    \snippet examples/tools/customtype/message.h custom type streaming operator
+
+    The implementation for the \c Message type in the \l{Custom Type Example}
+    goes to some effort to make the printable representation as readable as
+    possible:
+
+    \snippet examples/tools/customtype/message.cpp custom type streaming operator
+
+    The output sent to the debug stream can, of course, be made as simple or as
+    complicated as you like. Note that the value returned by this function is
+    the QDebug object itself, though this is often obtained by calling the
+    maybeSpace() member function of QDebug that pads out the stream with space
+    characters to make it more readable.
+
+    \section1 Further Reading
+
+    The Q_DECLARE_METATYPE() macro and qRegisterMetaType() function documentation
+    contain more detailed information about their uses and limitations.
+
+    The \l{Custom Type Example}{Custom Type},
+    \l{Custom Type Sending Example}{Custom Type Sending}
+    and \l{Queued Custom Type Example}{Queued Custom Type} examples show how to
+    implement a custom type with the features outlined in this document.
+
+    The \l{Debugging Techniques} document provides an overview of the debugging
+    mechanisms discussed above.
+*/
diff --git a/doc/src/datastreamformat.qdoc b/doc/src/datastreamformat.qdoc
new file mode 100644
index 0000000000..3c651fbeb4
--- /dev/null
+++ b/doc/src/datastreamformat.qdoc
@@ -0,0 +1,312 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** Documentation of the Format of the QDataStream operators.
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Qt GUI Toolkit.
+** EDITIONS: FREE, PROFESSIONAL, ENTERPRISE
+**
+****************************************************************************/
+
+/*!
+    \page datastreamformat.html
+    \title Format of the QDataStream Operators
+    \ingroup architecture
+    \brief Representations of data types that can be serialized by QDataStream.
+
+    The \l QDataStream allows you to serialize some of the Qt data types.
+    The table below lists the data types that QDataStream can serialize
+    and how they are represented. The format described below is
+    \l{QDataStream::setVersion()}{version 8}.
+
+    It is always best to cast integers to a Qt integer type, such as
+    qint16 or quint32, when reading and writing. This ensures that
+    you always know exactly what size integers you are reading and
+    writing, no matter what the underlying platform and architecture
+    the application happens to be running on.
+
+    \table
+    \row \o qint8
+         \o \list
+            \o signed byte
+            \endlist
+    \row \o qint16
+         \o \list
+            \o signed 16-bit integer
+            \endlist
+    \row \o qint32
+         \o \list
+            \o signed 32-bit integer
+            \endlist
+    \row \o qint64
+         \o \list
+            \o signed 64-bit integer
+            \endlist
+    \row \o quint8
+         \o \list
+            \o unsigned byte
+            \endlist
+    \row \o quint16
+         \o \list
+            \o unsigned 16-bit integer
+            \endlist
+    \row \o quint32
+         \o \list
+            \o unsigned 32-bit integer
+            \endlist
+    \row \o quint64
+         \o \list
+            \o unsigned 64-bit integer
+            \endlist
+    \row \o \c float
+         \o \list
+            \o 32-bit floating point number using the standard IEEE 754 format
+            \endlist
+    \row \o \c double
+         \o \list
+            \o 64-bit floating point number using the standard IEEE 754 format
+            \endlist
+    \row \o \c {const char *}
+         \o \list
+            \o The string length (quint32)
+            \o The string bytes, excluding the terminating 0
+            \endlist
+    \row \o QBitArray
+         \o \list
+            \o The array size (quint32)
+            \o The array bits, i.e. (size + 7)/8 bytes
+            \endlist
+    \row \o QBrush
+         \o \list
+            \o The brush style (quint8)
+            \o The brush color (QColor)
+            \o If style is CustomPattern, the brush pixmap (QPixmap)
+            \endlist
+    \row \o QByteArray
+         \o \list
+            \o If the byte array is null: 0xFFFFFFFF (quint32)
+            \o Otherwise: the array size (quint32) followed by the array bytes, i.e. size bytes
+            \endlist
+    \row \o \l QColor
+         \o \list
+            \o Color spec (qint8)
+            \o Alpha value (quint16)
+            \o Red value (quint16)
+            \o Green value (quint16)
+            \o Blue value (quint16)
+            \o Pad value (quint16)
+            \endlist
+    \row \o QCursor
+         \o \list
+            \o Shape ID (qint16)
+            \o If shape is BitmapCursor: The bitmap (QPixmap), mask (QPixmap), and hot spot (QPoint)
+            \endlist
+    \row \o QDate
+         \o \list
+            \o Julian day (quint32)
+            \endlist
+    \row \o QDateTime
+         \o \list
+            \o Date (QDate)
+            \o Time (QTime)
+            \o 0 for Qt::LocalTime, 1 for Qt::UTC (quint8)
+            \endlist
+    \row \o QFont
+         \o \list
+            \o The family (QString)
+            \o The point size (qint16)
+            \o The style hint (quint8)
+            \o The char set (quint8)
+            \o The weight (quint8)
+            \o The font bits (quint8)
+            \endlist
+    \row \o QHash<Key, T>
+         \o \list
+            \o The number of items (quint32)
+            \o For all items, the key (Key) and value (T)
+            \endlist
+    \row \o QIcon
+         \o \list
+            \o The number of pixmap entries (quint32)
+            \o For all pixmap entries:
+               \list
+               \o The pixmap (QPixmap)
+               \o The file name (QString)
+               \o The pixmap size (QSize)
+               \o The \l{QIcon::Mode}{mode} (quint32)
+               \o The \l{QIcon::State}{state} (quint32)
+               \endlist
+            \endlist
+    \row \o QImage
+         \o \list
+            \o If the image is null a "null image" marker is saved;
+            otherwise the image is saved in PNG or BMP format (depending
+            on the stream version). If you want control of the format,
+            stream the image into a QBuffer (using QImageIO) and stream
+            that.
+            \endlist
+    \row \o QKeySequence
+         \o \list
+            \o A QList<int>, where each integer is a key in the key sequence
+            \endlist
+    \row \o QLinkedList<T>
+         \o \list
+            \o The number of items (quint32)
+            \o The items (T)
+            \endlist
+    \row \o QList<T>
+         \o \list
+            \o The number of items (quint32)
+            \o The items (T)
+            \endlist
+    \row \o QMap<Key, T>
+         \o \list
+            \o The number of items (quint32)
+            \o For all items, the key (Key) and value (T)
+            \endlist
+    \row \o QMatrix
+         \o \list
+            \o m11 (double)
+            \o m12 (double)
+            \o m21 (double)
+            \o m22 (double)
+            \o dx (double)
+            \o dy (double)
+            \endlist
+    \row \o QPair<T1, T2>
+         \o \list
+            \o first (T1)
+            \o second (T2)
+            \endlist
+    \row \o QPalette
+         \o The disabled, active, and inactive color groups, each of which consists
+            of the following:
+            \list
+            \o foreground (QBrush)
+            \o button (QBrush)
+            \o light (QBrush)
+            \o midlight (QBrush)
+            \o dark (QBrush)
+            \o mid (QBrush)
+            \o text (QBrush)
+            \o brightText (QBrush)
+            \o buttonText (QBrush)
+            \o base (QBrush)
+            \o background (QBrush)
+            \o shadow (QBrush)
+            \o highlight (QBrush)
+            \o highlightedText (QBrush)
+            \o link (QBrush)
+            \o linkVisited (QBrush)
+            \endlist
+    \row \o QPen
+         \o \list
+            \o The pen styles (quint8)
+            \o The pen width (quint16)
+            \o The pen color (QColor)
+            \endlist
+    \row \o QPicture
+         \o \list
+            \o The size of the picture data (quint32)
+            \o The raw bytes of picture data (char)
+            \endlist
+    \row \o QPixmap
+         \o \list
+            \o Save it as a PNG image.
+            \endlist
+    \row \o QPoint
+         \o \list
+            \o The x coordinate (qint32)
+            \o The y coordinate (qint32)
+            \endlist
+    \row \o QRect
+         \o \list
+            \o left (qint32)
+            \o top (qint32)
+            \o right (qint32)
+            \o bottom (qint32)
+            \endlist
+    \row \o QRegExp
+         \o \list
+            \o The regexp pattern (QString)
+            \o Case sensitivity (quint8)
+            \o Regular expression syntax (quint8)
+            \o Minimal matching (quint8)
+            \endlist
+    \row \o QRegion
+         \o \list
+            \o The size of the data, i.e. 8 + 16 * (number of rectangles) (quint32)
+            \o 10 (qint32)
+            \o The number of rectangles (quint32)
+            \o The rectangles in sequential order (QRect)
+            \endlist
+    \row \o QSize
+         \o \list
+            \o width (qint32)
+            \o height (qint32)
+            \endlist
+    \row \o QString
+         \o \list
+            \o If the string is null: 0xFFFFFFFF (quint32)
+            \o Otherwise: The string length in bytes (quint32) followed by the data in UTF-16
+            \endlist
+    \row \o QTime
+         \o \list
+            \o Milliseconds since midnight (quint32)
+            \endlist
+    \row \o QVariant
+         \o \list
+            \o The type of the data (quint32)
+            \o The null flag (qint8)
+            \o The data of the specified type
+            \endlist
+    \row \o QVector<T>
+         \o \list
+            \o The number of items (quint32)
+            \o The items (T)
+            \endlist
+    \endtable
+*/
diff --git a/doc/src/debug.qdoc b/doc/src/debug.qdoc
new file mode 100644
index 0000000000..da5a82f093
--- /dev/null
+++ b/doc/src/debug.qdoc
@@ -0,0 +1,256 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** Qt Debugging Techniques
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Qt GUI Toolkit.
+** EDITIONS: FREE, PROFESSIONAL, ENTERPRISE
+**
+****************************************************************************/
+
+/*!
+    \page debug.html
+    \title Debugging Techniques
+    \ingroup buildsystem
+
+    Here we present some useful hints to help you with debugging your
+    Qt-based software.
+
+    \tableofcontents
+
+    \section1 Configuring Qt for Debugging
+
+    When \l{Installation}{configuring Qt for installation}, it is possible
+    to ensure that it is built to include debug symbols that can make it
+    easier to track bugs in applications and libraries. However, on some
+    platforms, building Qt in debug mode will cause applications to be larger
+    than desirable.
+
+    \section2 Debugging in Mac OS X and Xcode
+
+    \section3 Debugging With/Without Frameworks
+
+    The basic stuff you need to know about debug libraries and
+    frameworks is found at developer.apple.com in: 
+    \l{http://developer.apple.com/technotes/tn2004/tn2124.html#SECDEBUGLIB}
+    {Apple Technicle Note TN2124} Qt follows that. 
+
+    When you build Qt, frameworks are built by default, and inside the
+    framework you will find both a release and a debug version (e.g.,
+    QtCore and QtCore_debug). If you pass the \c{-no-framework} flag
+    when you build Qt, two dylibs are built for each Qt library (e.g.,
+    libQtCore.4.dylib and libQtCore_debug.4.dylib).
+
+    What happens when you link depends on whether you use frameworks
+    or not. We don't see a compelling reason to recommend one over the
+    other.
+
+    \section4 With Frameworks:
+
+    Since the release and debug libraries are inside the framework,
+    the app is simply linked against the framework. Then when you run
+    in the debugger, you will get either the release version or the
+    debug version, depending on whether you set \c{DYLD_IMAGE_SUFFIX}.
+    If you don't set it, you get the release version by default (i.e.,
+    non _debug). If you set \c{DYLD_IMAGE_SUFFIX=_debug}, you get the
+    debug version.
+
+    \section4 Without Frameworks:
+
+    When you tell \e{qmake} to generate a Makefile with the debug
+    config, it will link against the _debug version of the libraries
+    and generate debug symbols for the app. Running this program in
+    GDB will then work like running GDB on other platforms, and you
+    will be able to trace inside Qt.
+
+    \section3 Debug Symbols and Size
+
+    The amount of space taken up by debug symbols generated by GCC can
+    be excessively large. However, with the release of Xcode 2.3 it is
+    now possible to use Dwarf symbols which take up a significantly
+    smaller amount of space.  To enable this feature when configuring
+    Qt, pass the \c{-dwarf-2} option to the configure script.
+
+    This is not enabled by default because previous versions of Xcode
+    will not work with the compiler flag used to implement this
+    feature. Mac OS X 10.5 will use dwarf-2 symbols by default.
+
+    dwarf-2 symbols contain references to source code, so the size of
+    the final debug application should compare favorably to a release
+    build.
+
+    \omit
+    Although it is not necessary to build Qt with debug symbols to use the
+    other techniques described in this document, certain features are only
+    available when Qt is configured for debugging.
+    \endomit
+
+    \section1 Command Line Options Recognized by Qt
+
+    When you run a Qt application, you can specify several
+    command-line options that can help with debugging. These are
+    recognized by QApplication.
+
+    \table
+    \header \o Option \o Description
+    \row \o \c -nograb
+         \o The application should never grab \link QWidget::grabMouse()
+            the mouse\endlink or \link QWidget::grabKeyboard() the
+            keyboard \endlink. This option is set by default when the
+            program is running in the \c gdb debugger under Linux.
+    \row \o \c -dograb
+         \o Ignore any implicit or explicit \c{-nograb}. \c -dograb wins over
+            \c -nograb even when \c -nograb is last on the command line.
+    \row \o \c -sync
+         \o Runs the application in X synchronous mode. Synchronous mode
+            forces the X server to perform each X client request
+            immediately and not use buffer optimization. It makes the
+            program easier to debug and often much slower. The \c -sync
+            option is only valid for the X11 version of Qt.
+    \endtable
+
+    \section1 Warning and Debugging Messages
+
+    Qt includes four global functions for writing out warning and debug
+    text. You can use them for the following purposes:
+
+    \list
+    \o qDebug() is used for writing custom debug output.
+    \o qWarning() is used to report warnings and recoverable errors in
+       your application.
+    \o qCritical() is used for writing critical error mesages and
+       reporting system errors.
+    \o qFatal() is used for writing fatal error messages shortly before exiting.
+    \endlist
+
+    If you include the <QtDebug> header file, the \c qDebug() function
+    can also be used as an output stream. For example:
+
+    \snippet doc/src/snippets/code/doc_src_debug.qdoc 0
+
+    The Qt implementation of these functions prints the text to the
+    \c stderr output under Unix/X11 and Mac OS X. With Windows, if it
+    is a console application, the text is sent to console; otherwise, it
+    is sent to the debugger. You can take over these functions by
+    installing a message handler using qInstallMsgHandler().
+
+    If the \c QT_FATAL_WARNINGS environment variable is set,
+    qWarning() exits after printing the warning message. This makes
+    it easy to obtain a backtrace in the debugger.
+
+    Both qDebug() and qWarning() are debugging tools. They can be
+    compiled away by defining \c QT_NO_DEBUG_OUTPUT and \c
+    QT_NO_WARNING_OUTPUT during compilation.
+
+    The debugging functions QObject::dumpObjectTree() and
+    QObject::dumpObjectInfo() are often useful when an application
+    looks or acts strangely. More useful if you use \l{QObject::setObjectName()}{object names}
+    than not, but often useful even without names.
+
+    \section1 Providing Support for the qDebug() Stream Operator
+
+    You can implement the stream operator used by qDebug() to provide
+    debugging support for your classes. The class that implements the
+    stream is \c QDebug. The functions you need to know about in \c
+    QDebug are \c space() and \c nospace(). They both return a debug
+    stream; the difference between them is whether a space is inserted
+    between each item. Here is an example for a class that represents
+    a 2D coordinate.
+
+    \snippet doc/src/snippets/qdebug/qdebugsnippet.cpp 0
+
+    Integration of custom types with Qt's meta-object system is covered
+    in more depth in the \l{Creating Custom Qt Types} document.
+
+    \section1 Debugging Macros
+
+    The header file \c <QtGlobal> contains some debugging macros and
+    \c{#define}s.
+
+    Three important macros are:
+    \list
+    \o \l{Q_ASSERT()}{Q_ASSERT}(cond), where \c cond is a boolean
+       expression, writes the warning "ASSERT: '\e{cond}' in file xyz.cpp, line
+       234" and exits if \c cond is false.
+    \o \l{Q_ASSERT_X()}{Q_ASSERT_X}(cond, where, what), where \c cond is a
+       boolean expression, \c where a location, and \c what a message,
+       writes the warning: "ASSERT failure in \c{where}: '\c{what}', file xyz.cpp, line 234"
+       and exits if \c cond is false.
+    \o \l{Q_CHECK_PTR()}{Q_CHECK_PTR}(ptr), where \c ptr is a pointer.
+       Writes the warning "In file xyz.cpp, line 234: Out of memory" and
+       exits if \c ptr is 0.
+    \endlist
+
+    These macros are useful for detecting program errors, e.g. like this:
+
+    \snippet doc/src/snippets/code/doc_src_debug.qdoc 1
+
+    Q_ASSERT(), Q_ASSERT_X(), and Q_CHECK_PTR() expand to nothing if
+    \c QT_NO_DEBUG is defined during compilation. For this reason,
+    the arguments to these macro should not have any side-effects.
+    Here is an incorrect usage of Q_CHECK_PTR():
+
+    \snippet doc/src/snippets/code/doc_src_debug.qdoc 2
+
+    If this code is compiled with \c QT_NO_DEBUG defined, the code in
+    the Q_CHECK_PTR() expression is not executed and \e alloc returns
+    an unitialized pointer.
+
+    The Qt library contains hundreds of internal checks that will
+    print warning messages when a programming error is detected. We
+    therefore recommend that you use a debug version of Qt when
+    developing Qt-based software.
+
+    \section1 Common Bugs
+
+    There is one bug that is so common that it deserves mention here:
+    If you include the Q_OBJECT macro in a class declaration and
+    run \link moc.html the meta-object compiler\endlink (\c{moc}),
+    but forget to link the \c{moc}-generated object code into your
+    executable, you will get very confusing error messages. Any link
+    error complaining about a lack of \c{vtbl}, \c{_vtbl}, \c{__vtbl}
+    or similar is likely to be a result of this problem.
+*/
diff --git a/doc/src/demos.qdoc b/doc/src/demos.qdoc
new file mode 100644
index 0000000000..9cc8df539a
--- /dev/null
+++ b/doc/src/demos.qdoc
@@ -0,0 +1,151 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page demos.html
+    \title Qt Demonstrations
+    \brief Information about the demonstration programs provided with Qt.
+    \ingroup howto
+
+    This is the list of demonstrations in Qt's \c demos directory.
+    These are larger and more complicated programs than the
+    \l{Qt Examples} and are used to highlight certain features of
+    Qt. You can launch any of these programs from the
+    \l{Examples and Demos Launcher} application.
+
+    If you are new to Qt, and want to start developing applications,
+    you should probably start by going through the \l{Tutorials}.
+
+    \section1 Painting
+
+    \list
+    \o \l{demos/composition}{Composition Modes} demonstrates the range of
+       composition modes available with Qt.
+    \o \l{demos/deform}{Vector Deformation} demonstrates effects that are made
+       possible with a vector-oriented paint engine.
+    \o \l{demos/gradients}{Gradients} shows the different types of gradients
+       that are available in Qt.
+    \o \l{demos/pathstroke}{Path Stroking} shows Qt's built-in dash patterns
+       and shows how custom patterns can be used to extend the range of
+       available patterns.
+    \o \l{demos/affine}{Affine Transformations} demonstrates the different
+       affine transformations that can be used to influence painting operations.
+    \o \l{demos/arthurplugin}{Arthur Plugin} shows the widgets from the
+       other painting demos packaged as a custom widget plugin for \QD.
+    \endlist
+
+    \section1 Item Views
+
+    \list
+    \o \l{demos/interview}{Interview} shows the same model and selection being
+       shared between three different views.
+    \o \l{demos/spreadsheet}{Spreadsheet} demonstrates the use of a table view
+       as a spreadsheet, using custom delegates to render each item according to
+       the type of data it contains.
+    \endlist
+
+    \section1 SQL
+
+    \list
+    \o \l{demos/books}{Books} shows how Qt's SQL support and model/view integration
+       enables the user to modify the contents of a database without requiring
+       knowledge of SQL.
+    \o \l{demos/sqlbrowser}{SQL Browser} demonstrates a console for executing SQL
+       statements on a live database and provides a data browser for interactively
+       visualizing the results.
+    \endlist
+
+    \section1 Rich Text
+
+    \list
+    \o \l{demos/textedit}{Text Edit} shows Qt's rich text editing features and provides
+       an environment for experimenting with them.
+    \endlist
+
+    \section1 Main Window
+
+    \list
+    \o \l{demos/mainwindow}{Main Window} shows Qt's extensive support for main window
+       features, such as tool bars, dock windows, and menus.
+    \o \l{demos/macmainwindow}{Mac Main Window} shows how to create main window applications that has 
+      the same appearance as other Mac OS X applications.
+    \endlist
+
+    \section1 Graphics View
+
+    \list
+    \o \l{demos/chip}{40000 Chips} uses the
+       \l{The Graphics View Framework}{Graphics View} framework to efficiently
+       display a large number of individual graphical items on a scrolling canvas,
+       highlighting features such as rotation, zooming, level of detail control,
+       and item selection.
+    \o \l{demos/embeddeddialogs}{Embedded Dialogs} showcases Qt 4.4's \e{Widgets on
+       the Canvas} feature by embedding a multitude of fully-working dialogs into a
+       scene.
+    \o \l{demos/boxes}{Boxes} showcases Qt's OpenGL support and the
+       integration with the Graphics View framework.
+    \endlist
+
+    \section1 Tools
+
+    \list
+    \o \l{demos/undo}{Undo Framework} demonstrates how Qt's
+        \l{Overview of Qt's Undo Framework}{undo framework} is used to
+        provide advanced undo/redo functionality.
+    \endlist
+
+    \section1 QtWebKit
+
+    \list
+    \o \l{Web Browser} demonstrates how Qt's \l{QtWebKit Module}{WebKit module}
+        can be used to implement a small Web browser.
+    \endlist
+
+    \section1 Phonon
+
+    \list
+    \o \l{demos/mediaplayer}{Media Player} demonstrates how the \l{Phonon Module} can be
+    used to implement a basic media player application.
+    \endlist
+
+    \note The Phonon demos are currently not available for the MinGW platform.
+
+*/
diff --git a/doc/src/demos/affine.qdoc b/doc/src/demos/affine.qdoc
new file mode 100644
index 0000000000..25e496eaf6
--- /dev/null
+++ b/doc/src/demos/affine.qdoc
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example demos/affine
+    \title Affine Transformations
+
+    In this demo we show Qt's ability to perform affine transformations
+    on painting operations.
+
+    \image affine-demo.png
+
+    Transformations can be performed on any kind of graphics drawn using QPainter.
+    The transformations used to display the vector graphics, images, and text can be adjusted
+    in the following ways:
+
+    \list
+    \o Dragging the red circle in the centre of each drawing moves it to a new position.
+    \o Dragging the displaced red circle causes the current drawing to be rotated about the
+       central circle. Rotation can also be controlled with the \key Rotate slider.
+    \o Scaling is controlled with the \key Scale slider.
+    \o Each drawing can be sheared with the \key Shear slider.
+    \endlist
+*/
diff --git a/doc/src/demos/arthurplugin.qdoc b/doc/src/demos/arthurplugin.qdoc
new file mode 100644
index 0000000000..38c5d3c3a0
--- /dev/null
+++ b/doc/src/demos/arthurplugin.qdoc
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example demos/arthurplugin
+    \title Arthur Plugin
+
+    In this demo we demonstrate the abilities of Qt's painting system
+    in combination with \QD's custom widget plugin facilities.
+
+    \image arthurplugin-demo.png
+
+    The specialized widgets used in the other demonstrations of the Arthur
+    painting system are provided as custom widgets to be used with \QD.
+    Since each of the widgets provides a set of signals and slots, the
+    effects they show can be controlled by connecting them up to standard
+    input widgets.
+*/
diff --git a/doc/src/demos/books.qdoc b/doc/src/demos/books.qdoc
new file mode 100644
index 0000000000..b491b2aedb
--- /dev/null
+++ b/doc/src/demos/books.qdoc
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example demos/books
+    \title Books Demonstration
+
+    The Books demonstration shows how Qt's SQL classes can be used with the model/view
+    framework to create rich user interfaces for information stored in a database.
+
+    \image books-demo.png
+
+    Information about a collection of books is held in a database. The books are
+    catalogued by author, title, genre, and year of publication. Although each of
+    these fields can be displayed and edited using standard widgets, an additional
+    field describing an arbitrary rating for the book needs something extra.
+
+    Books are rated using a system where each is allocated a number of stars; the
+    more a book has, the better it is supposed to be. By clicking on a cell
+    containing the rating, the number of stars can be modified, and the rating in
+    the database is updated.
+*/
diff --git a/doc/src/demos/boxes.qdoc b/doc/src/demos/boxes.qdoc
new file mode 100644
index 0000000000..db1155e40a
--- /dev/null
+++ b/doc/src/demos/boxes.qdoc
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example demos/boxes
+    \title Boxes
+
+    This demo shows Qt's ability to combine advanced OpenGL rendering with the
+    the \l{The Graphics View Framework}{Graphics View} framework.
+
+    \image boxes-demo.png
+
+    Elements in the demo can be controlled using the mouse in the following
+    ways:
+    \list
+        \o Dragging the mouse while pressing the left mouse button rotates the
+           box in the center.
+        \o Dragging the mouse while pressing the right mouse button rotates the
+           satellite boxes.
+        \o Scrolling the mouse wheel zooms in and out of the scene.
+    \endlist
+
+    The options pane can be used to fine-tune various parameters in the demo,
+    including colors and pixel shaders.
+*/
diff --git a/doc/src/demos/browser.qdoc b/doc/src/demos/browser.qdoc
new file mode 100644
index 0000000000..34bb80de64
--- /dev/null
+++ b/doc/src/demos/browser.qdoc
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page demos-browser.html
+    \title Web Browser
+
+    The Web Browser demonstration shows Qt's WebKit module in action,
+    providing a little Web browser application.
+
+    \image browser-demo.png
+
+    This browser is the foundation for the \l{Arora Browser}, a simple cross-platform
+    Web browser.
+*/
diff --git a/doc/src/demos/chip.qdoc b/doc/src/demos/chip.qdoc
new file mode 100644
index 0000000000..9e9b7b49b4
--- /dev/null
+++ b/doc/src/demos/chip.qdoc
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example demos/chip
+    \title 40000 Chips
+
+    This demo shows how to visualize a huge scene with 40000 chip items
+    using Graphics View. It also shows Graphics View's powerful navigation
+    and interaction features, allowing you to zoom and rotate each of four
+    views independently, and you can select and move items around the scene.
+
+    \image chip-demo.png
+*/
diff --git a/doc/src/demos/composition.qdoc b/doc/src/demos/composition.qdoc
new file mode 100644
index 0000000000..9c2c9d7fb6
--- /dev/null
+++ b/doc/src/demos/composition.qdoc
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example demos/composition
+    \title Composition Modes
+
+    This demo shows some of the more advanced composition modes supported by Qt.
+
+    \image composition-demo.png
+
+    The two most common forms of composition are \bold{Source} and \bold{SourceOver}.
+    \bold{Source} is used to draw opaque objects onto a paint device. In this mode,
+    each pixel in the source replaces the corresponding pixel in the destination.
+    In \bold{SourceOver} composition mode, the source object is transparent and is
+    drawn on top of the destination.
+
+    In addition to these standard modes, Qt defines the complete set of composition modes
+    as defined by X. Porter and Y. Duff. See the QPainter documentation for details.
+*/
diff --git a/doc/src/demos/deform.qdoc b/doc/src/demos/deform.qdoc
new file mode 100644
index 0000000000..2b94e1555d
--- /dev/null
+++ b/doc/src/demos/deform.qdoc
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example demos/deform
+    \title Vector Deformation
+
+    This demo shows how to use advanced vector techniques to draw text 
+    using a \c QPainterPath.
+
+    \image deform-demo.png
+
+    We define a vector deformation field in the shape of a lens and apply
+    this to all points in a path. This means that what is rendered on
+    screen is not pixel manipulation, but modified vector representations of
+    the glyphs themselves. This is visible from the high quality of the
+    antialiased edges for the deformed glyphs.
+
+    To get a fairly complex path we allow the user to type in text and
+    convert the text to paths. This is done using the
+    QPainterPath::addText() function.
+
+    The lens is drawn using a single call to QPainter::drawEllipse(),
+    using a QRadialGradient to fill it with a specialized color
+    table, giving the effect of the sun's reflection and a drop
+    shadow. The lens is cached as a pixmap for better performance.
+*/
diff --git a/doc/src/demos/embeddeddialogs.qdoc b/doc/src/demos/embeddeddialogs.qdoc
new file mode 100644
index 0000000000..f7d20cc0fb
--- /dev/null
+++ b/doc/src/demos/embeddeddialogs.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example demos/embeddeddialogs
+    \title Embedded Dialogs
+
+    This example shows how to embed standard dialogs into
+    Graphics View. It also shows how you can customize the
+    proxy class and add window shadows.
+
+    \image embeddeddialogs-demo.png
+*/
diff --git a/doc/src/demos/gradients.qdoc b/doc/src/demos/gradients.qdoc
new file mode 100644
index 0000000000..3e8575a018
--- /dev/null
+++ b/doc/src/demos/gradients.qdoc
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example demos/gradients
+    \title Gradients
+
+    In this demo we show the various types of gradients that can
+    be used in Qt.
+
+    \image gradients-demo.png
+
+    There are three types of gradients:
+
+    \list
+      \o \bold{Linear} gradients interpolate colors between start and end points.
+      \o \bold{Radial} gradients interpolate colors between a focal point and the
+          points on a circle surrounding it.
+      \o \bold{Conical} gradients interpolate colors around a center point.
+    \endlist
+
+    The panel on the right contains a color table editor that defines
+    the colors in the gradient. The three topmost controls determine the red,
+    green and blue components while the last defines the alpha of the
+    gradient. You can move points, and add new ones, by clicking with the left
+    mouse button, and remove points by clicking with the right button.
+
+    There are three default configurations available at the bottom of
+    the page that are provided as suggestions on how a color table could be
+    configured.
+*/
diff --git a/doc/src/demos/interview.qdoc b/doc/src/demos/interview.qdoc
new file mode 100644
index 0000000000..c32c13c2bc
--- /dev/null
+++ b/doc/src/demos/interview.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example demos/interview
+    \title Interview
+
+    The Interview demonstration explores the flexibility and scalability of the
+    model/view framework by presenting an infinitely deep data structure using a model
+    and three different types of view.
+
+    \image interview-demo.png
+*/
diff --git a/doc/src/demos/macmainwindow.qdoc b/doc/src/demos/macmainwindow.qdoc
new file mode 100644
index 0000000000..3a5927519d
--- /dev/null
+++ b/doc/src/demos/macmainwindow.qdoc
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \example demos/macmainwindow
+  \title Mac Main Window Demo
+
+  This demo shows how to create a main window that has the
+  same appearance as other Mac OS X applications such as Mail or iTunes.
+  This includes customizing the item views and QSplitter and wrapping native
+  widgets such as the search field.
+
+  \image macmainwindow.png
+
+  See \c{$QTDIR/demos/macmainwindow} for the source code.
+*/
+
+
diff --git a/doc/src/demos/mainwindow.qdoc b/doc/src/demos/mainwindow.qdoc
new file mode 100644
index 0000000000..58f2b65d99
--- /dev/null
+++ b/doc/src/demos/mainwindow.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example demos/mainwindow
+    \title Main Window
+
+    The Main Window demonstration shows Qt's extensive support for tool bars,
+    dock windows, menus, and other standard application features.
+
+    \image mainwindow-demo.png
+*/
diff --git a/doc/src/demos/mediaplayer.qdoc b/doc/src/demos/mediaplayer.qdoc
new file mode 100644
index 0000000000..0e66908d0e
--- /dev/null
+++ b/doc/src/demos/mediaplayer.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example demos/mediaplayer
+    \title Media Player
+
+    The Media Player demonstration shows how \l{Phonon Module}{Phonon}
+    can be used in Qt applications to handle audio and video playback.
+
+    \image mediaplayer-demo.png
+*/
diff --git a/doc/src/demos/pathstroke.qdoc b/doc/src/demos/pathstroke.qdoc
new file mode 100644
index 0000000000..1c817f6179
--- /dev/null
+++ b/doc/src/demos/pathstroke.qdoc
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example demos/pathstroke
+    \title Path Stroking
+
+    In this demo we show some of the various types of pens that can be
+    used in Qt.
+
+    \image pathstroke-demo.png
+
+    Qt defines cap styles for how the end points are treated and join
+    styles for how path segments are joined together. A standard set of
+    predefined dash patterns are also included that can be used with
+    QPen.
+
+    In addition to the predefined patterns available in
+    QPen we also demonstrate direct use of the
+    QPainterPathStroker class which can be used to define
+    custom dash patterns. You can see this by enabling the
+    \e{Custom Pattern} option.
+*/
diff --git a/doc/src/demos/spreadsheet.qdoc b/doc/src/demos/spreadsheet.qdoc
new file mode 100644
index 0000000000..88eb7d6ff4
--- /dev/null
+++ b/doc/src/demos/spreadsheet.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example demos/spreadsheet
+    \title Spreadsheet
+
+    The Spreadsheet demonstration shows how a table view can be used to create a
+    simple spreadsheet application. Custom delegates are used to render different
+    types of data in distinctive colors.
+
+    \image spreadsheet-demo.png
+*/
diff --git a/doc/src/demos/sqlbrowser.qdoc b/doc/src/demos/sqlbrowser.qdoc
new file mode 100644
index 0000000000..68c3656d85
--- /dev/null
+++ b/doc/src/demos/sqlbrowser.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example demos/sqlbrowser
+    \title SQL Browser
+
+    The SQL Browser demonstration shows how a data browser can be used to visualize
+    the results of SQL statements on a live database.
+
+    \image sqlbrowser-demo.png
+*/
diff --git a/doc/src/demos/textedit.qdoc b/doc/src/demos/textedit.qdoc
new file mode 100644
index 0000000000..a99fc4ade6
--- /dev/null
+++ b/doc/src/demos/textedit.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example demos/textedit
+    \title Text Edit
+
+    The Text Edit demonstration shows Qt's rich text editing facilities in action,
+    providing an example document for you to experiment with.
+
+    \image textedit-demo.png
+*/
diff --git a/doc/src/demos/undo.qdoc b/doc/src/demos/undo.qdoc
new file mode 100644
index 0000000000..401986ad22
--- /dev/null
+++ b/doc/src/demos/undo.qdoc
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example demos/undo
+    \title Undo Framework
+
+    This demo shows Qt's undo framework in action.
+
+    \image undodemo.png
+
+    Qt's undo framework is an implementation of the Command
+    pattern, which provides advanced undo/redo functionality. 
+
+    To show the abilities of the framework, we have implemented a
+    small diagram application in which the diagram items are geometric
+    primitives.  You can edit the diagram in the following ways: add,
+    move, change the color of, and delete the items.
+*/
diff --git a/doc/src/deployment.qdoc b/doc/src/deployment.qdoc
new file mode 100644
index 0000000000..d2c7a9e14d
--- /dev/null
+++ b/doc/src/deployment.qdoc
@@ -0,0 +1,1472 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Qt GUI Toolkit.
+** EDITIONS: FREE, PROFESSIONAL, ENTERPRISE
+**
+****************************************************************************/
+
+/*!
+    \group deployment
+    \title Deploying Qt Applications
+    \ingroup buildsystem
+
+    Deploying an Qt application does not require any C++
+    programming. All you need to do is to build Qt and your
+    application in release mode, following the procedures described in
+    this documentation. We will demonstrate the procedures in terms of
+    deploying the \l {tools/plugandpaint}{Plug & Paint} application
+    that is provided in Qt's examples directory.
+
+    \section1 Static vs. Shared Libraries
+
+    There are two ways of deploying an application:
+
+    \list
+        \o Static Linking
+        \o Shared Libraries (Frameworks on Mac)
+    \endlist
+
+    Static linking results in a stand-alone executable. The advantage
+    is that you will only have a few files to deploy. The
+    disadvantages are that the executables are large and with no
+    flexibility (i.e a new version of the application, or of Qt, will
+    require that the deployment process is repeated), and that you
+    cannot deploy plugins.
+
+    To deploy plugin-based applications, you can use the shared
+    library approach. Shared libraries also provide smaller, more
+    flexible executables. For example, using the shared library
+    approach, the user is able to independently upgrade the Qt library
+    used by the application.
+
+    Another reason why you might want to use the shared library
+    approach, is if you want to use the same Qt libraries for a family
+    of applications. In fact, if you download the binary installation
+    of Qt, you get Qt as a shared library.
+
+    The disadvantage with the shared library approach is that you
+    will get more files to deploy.
+
+    \section1 Deploying Qt's Libraries
+
+    \table
+    \header
+        \o {4,1} Qt's Libraries
+    \row
+        \o \l {QtAssistant}
+        \o \l {QAxContainer}
+        \o \l {QAxServer}
+        \o \l {QtCore}
+    \row
+        \o \l {QtDBus}
+        \o \l {QtDesigner}
+        \o \l {QtGui}
+        \o \l {QtHelp}
+    \row
+        \o \l {QtNetwork}
+        \o \l {QtOpenGL}
+        \o \l {QtScript}
+        \o \l {QtSql}
+    \row
+        \o \l {QtSvg}
+        \o \l {QtWebKit}
+        \o \l {QtXml}
+        \o \l {QtXmlPatterns}
+    \row
+        \o \l {Phonon Module}{Phonon}
+        \o \l {Qt3Support}
+    \endtable
+
+    Since Qt is not a system library, it has to be redistributed along
+    with your application; the minimum is to redistribute the run-time
+    of the libraries used by the application.  Using static linking,
+    however, the Qt run-time is compiled into the executable.
+
+    In particular, you will need to deploy Qt plugins, such as
+    JPEG support or SQL drivers. For more information about plugins,
+    see the \l {plugins-howto.html}{How to Create Qt Plugins}
+    documentation.
+
+    When deploying an application using the shared library approach
+    you must ensure that the Qt libraries will use the correct path to
+    find the Qt plugins, documentation, translation etc. To do this you
+    can use a \c qt.conf file. For more information, see the \l {Using
+    qt.conf} documentation.
+
+    Depending on configuration, compiler specific libraries must be
+    redistributed as well. For more information, see the platform
+    specific Application Dependencies sections: \l
+    {deployment-x11.html#application-dependencies}{X11}, \l
+    {deployment-windows.html#application-dependencies}{Windows}, \l
+    {deployment-mac.html#application-dependencies}{Mac}.
+
+    \section1 Licensing
+
+    Some of Qt's libraries are based on third party libraries that are
+    not licensed using the same dual-license model as Qt. As a result,
+    care must be taken when deploying applications that use these
+    libraries, particularly when the application is statically linked
+    to them.
+
+    The following table contains an inexhaustive summary of the issues
+    you should be aware of.
+
+    \table
+    \header \o Qt Library \o Dependency
+            \o Licensing Issue
+    \row    \o QtHelp     \o CLucene
+    \o The version of clucene distributed with Qt is licensed
+    under the GNU LGPL version 2.1 or later. This has implications for
+    developers of closed source applications. Please see
+    \l{QtHelp Module#License Information}{the QtHelp module documentation}
+    for more information.
+
+    \row    \o QtNetwork  \o OpenSSL
+    \o Some configurations of QtNetwork use OpenSSL at run-time. Deployment
+    of OpenSSL libraries is subject to both licensing and export restrictions.
+    More information can be found in the \l{Secure Sockets Layer (SSL) Classes}
+    documentation.
+
+    \row    \o QtWebKit   \o WebKit
+    \o WebKit is licensed under the GNU LGPL version 2 or later.
+    This has implications for developers of closed source applications.
+    Please see \l{QtWebKit Module#License Information}{the QtWebKit module
+    documentation} for more information.
+
+    \row    \o Phonon     \o Phonon
+    \o Phonon relies on the native multimedia engines on different platforms.
+    Phonon itself is licensed under the GNU LGPL version 2. Please see
+    \l{Phonon Module#License Information}{the Phonon module documentation}
+    for more information.
+    \endtable
+
+    \section1 Platform-Specific Notes
+
+    The procedure of deploying Qt applications is different for the
+    various platforms:
+
+    \list
+        \o \l{Deploying an Application on X11 Platforms}{Qt for X11 Platforms}
+        \o \l{Deploying an Application on Windows}{Qt for Windows}
+        \o \l{Deploying an Application on Mac OS X}{Qt for Mac OS X}
+        \o \l{Deploying Qt for Embedded Linux Applications}{Qt for Embedded Linux}
+    \endlist
+
+    \sa Installation {Window System Specific Notes}
+*/
+
+/*!
+    \page deployment-x11.html
+    \contentspage Deploying Qt Applications
+
+    \title Deploying an Application on X11 Platforms
+    \ingroup deployment
+
+    Due to the proliferation of Unix systems (commercial Unices, Linux
+    distributions, etc.), deployment on Unix is a complex
+    topic. Before we start, be aware that programs compiled for one
+    Unix flavor will probably not run on a different Unix system. For
+    example, unless you use a cross-compiler, you cannot compile your
+    application on Irix and distribute it on AIX.
+
+    Contents:
+
+    \tableofcontents
+
+    This documentation will describe how to determine which files you
+    should include in your distribution, and how to make sure that the
+    application will find them at run-time. We will demonstrate the
+    procedures in terms of deploying the \l {tools/plugandpaint}{Plug
+    & Paint} application that is provided in Qt's examples directory.
+
+    \section1 Static Linking
+
+    Static linking is often the safest and easiest way to distribute
+    an application on Unix since it relieves you from the task of
+    distributing the Qt libraries and ensuring that they are located
+    in the default search path for libraries on the target system.
+
+    \section2 Building Qt Statically
+
+    To use this approach, you must start by installing a static version
+    of the Qt library:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 0
+
+    We specify the prefix so that we do not overwrite the existing Qt
+    installation. The example above only builds the Qt libraries,
+    i.e. the examples and Qt Designer will not be built.  When \c make
+    is done, you will find the Qt libraries in the \c /path/to/Qt/lib
+    directory.
+
+    When linking your application against static Qt libraries, note
+    that you might need to add more libraries to the \c LIBS line in
+    your project file. For more information, see the \l {Application
+    Dependencies} section.
+
+    \section2 Linking the Application to the Static Version of Qt
+
+    Once Qt is built statically, the next step is to regenerate the
+    makefile and rebuild the application. First, we must go into the
+    directory that contains the application:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 1
+
+    Now run qmake to create a new makefile for the application, and do
+    a clean build to create the statically linked executable:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 2
+
+    You probably want to link against the release libraries, and you
+    can specify this when invoking \c qmake. Note that we must set the
+    path to the static Qt that we just built.
+
+    To check that the application really links statically with Qt, run
+    the \c ldd tool (available on most Unices):
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 3
+
+    Verify that the Qt libraries are not mentioned in the output.
+
+    Now, provided that everything compiled and linked without any
+    errors, we should have a \c plugandpaint file that is ready for
+    deployment. One easy way to check that the application really can
+    be run stand-alone is to copy it to a machine that doesn't have Qt
+    or any Qt applications installed, and run it on that machine.
+
+    Remember that if your application depends on compiler specific
+    libraries, these must still be redistributed along with your
+    application. For more information, see the \l {Application
+    Dependencies} section.
+
+    The \l {tools/plugandpaint}{Plug & Paint} example consists of
+    several components: The core application (\l
+    {tools/plugandpaint}{Plug & Paint}), and the \l
+    {tools/plugandpaintplugins/basictools}{Basic Tools} and \l
+    {tools/plugandpaintplugins/extrafilters}{Extra Filters}
+    plugins. Since we cannot deploy plugins using the static linking
+    approach, the executable we have prepared so far is
+    incomplete. The application will run, but the functionality will
+    be disabled due to the missing plugins. To deploy plugin-based
+    applications we should use the shared library approach.
+
+    \section1 Shared Libraries
+
+    We have two challenges when deploying the \l
+    {tools/plugandpaint}{Plug & Paint} application using the shared
+    libraries approach: The Qt runtime has to be correctly
+    redistributed along with the application executable, and the
+    plugins have to be installed in the correct location on the target
+    system so that the application can find them.
+
+    \section2 Building Qt as a Shared Library
+
+    We assume that you already have installed Qt as a shared library,
+    which is the default when installing Qt, in the \c /path/to/Qt
+    directory. For more information on how to build Qt, see the \l
+    {Installation} documentation.
+
+    \section2 Linking the Application to Qt as a Shared Library
+
+    After ensuring that Qt is built as a shared library, we can build
+    the \l {tools/plugandpaint}{Plug & Paint} application. First, we
+    must go into the directory that contains the application:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 4
+
+    Now run qmake to create a new makefile for the application, and do
+    a clean build to create the dynamically linked executable:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 5
+
+    This builds the core application, the following will build the
+    plugins:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 6
+
+    If everything compiled and linked without any errors, we will get
+    a \c plugandpaint executable and the \c libpnp_basictools.so and
+    \c libpnp_extrafilters.so plugin files.
+
+    \section2 Creating the Application Package
+
+    There is no standard package management on Unix, so the method we
+    present below is a generic solution. See the documentation for
+    your target system for information on how to create a package.
+
+    To deploy the application, we must make sure that we copy the
+    relevant Qt libraries (corresponding to the Qt modules used in the
+    application) as well as the executable to the same
+    directory. Remember that if your application depends on compiler
+    specific libraries, these must also be redistributed along with
+    your application. For more information, see the \l {Application
+    Dependencies} section.
+
+    We'll cover the plugins shortly, but the main issue with shared
+    libraries is that you must ensure that the dynamic linker will
+    find the Qt libraries. Unless told otherwise, the dynamic linker
+    doesn't search the directory where your application resides. There
+    are many ways to solve this:
+
+    \list
+    \o You can install the Qt libraries in one of the system
+       library paths (e.g. \c /usr/lib on most systems).
+
+    \o You can pass a predetermined path to the \c -rpath command-line
+       option when linking the application. This will tell the dynamic
+       linker to look in this directory when starting your application.
+
+    \o You can write a startup script for your application, where you
+       modify the dynamic linker configuration (e.g.  adding your
+       application's directory to the \c LD_LIBRARY_PATH environment
+       variable. \note If your application will be running with "Set
+       user ID on execution," and if it will be owned by root, then
+       LD_LIBRARY_PATH will be ignored on some platforms. In this
+       case, use of the LD_LIBRARY_PATH approach is not an option).
+
+    \endlist
+
+    The disadvantage of the first approach is that the user must have
+    super user privileges. The disadvantage of the second approach is
+    that the user may not have privileges to install into the
+    predetemined path. In either case, the users don't have the option
+    of installing to their home directory. We recommend using the
+    third approach since it is the most flexible. For example, a \c
+    plugandpaint.sh script will look like this:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 7
+
+    By running this script instead of the executable, you are sure
+    that the Qt libraries will be found by the dynamic linker. Note
+    that you only have to rename the script to use it with other
+    applications.
+
+    When looking for plugins, the application searches in a plugins
+    subdirectory inside the directory of the application
+    executable. Either you have to manually copy the plugins into the
+    \c plugins directory, or you can set the \c DESTDIR in the
+    plugins' project files:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 8
+
+    An archive distributing all the Qt libraries, and all the plugins,
+    required to run the \l {tools/plugandpaint}{Plug & Paint}
+    application, would have to include the following files:
+
+    \table 100%
+    \header
+        \o Component \o {2, 1} File Name
+    \row
+        \o The executable
+        \o {2, 1} \c plugandpaint
+    \row
+        \o The script to run the executable
+        \o {2, 1} \c plugandpaint.sh
+    \row
+        \o The Basic Tools plugin
+        \o {2, 1} \c plugins\libpnp_basictools.so
+    \row
+        \o The ExtraFilters plugin
+        \o {2, 1} \c plugins\libpnp_extrafilters.so
+    \row
+        \o The Qt Core module
+        \o {2, 1} \c libQtCore.so.4
+    \row
+        \o The Qt GUI module
+        \o {2, 1} \c libQtGui.so.4
+    \endtable
+
+    On most systems, the extension for shared libraries is \c .so. A
+    notable exception is HP-UX, which uses \c .sl.
+
+    Remember that if your application depends on compiler specific
+    libraries, these must still be redistributed along with your
+    application. For more information, see the \l {Application
+    Dependencies} section.
+
+    To verify that the application now can be successfully deployed,
+    you can extract this archive on a machine without Qt and without
+    any compiler installed, and try to run it, i.e. run the \c
+    plugandpaint.sh script.
+
+    An alternative to putting the plugins in the \c plugins
+    subdirectory is to add a custom search path when you start your
+    application using QApplication::addLibraryPath() or
+    QApplication::setLibraryPaths().
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 9
+
+    \section1 Application Dependencies
+
+    \section2 Additional Libraries
+
+    To find out which libraries your application depends on, run the
+    \c ldd tool (available on most Unices):
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 10
+
+    This will list all the shared library dependencies for your
+    application. Depending on configuration, these libraries must be
+    redistributed along with your application. In particular, the
+    standard C++ library must be redistributed if you're compiling
+    your application with a compiler that is binary incompatible with
+    the system compiler. When possible, the safest solution is to link
+    against these libraries statically.
+
+    You will probably want to link dynamically with the regular X11
+    libraries, since some implementations will try to open other
+    shared libraries with \c dlopen(), and if this fails, the X11
+    library might cause your application to crash.
+
+    It's also worth mentioning that Qt will look for certain X11
+    extensions, such as Xinerama and Xrandr, and possibly pull them
+    in, including all the libraries that they link against. If you
+    can't guarantee the presence of a certain extension, the safest
+    approach is to disable it when configuring Qt (e.g. \c {./configure
+    -no-xrandr}).
+
+    FontConfig and FreeType are other examples of libraries that
+    aren't always available or that aren't always binary
+    compatible. As strange as it may sound, some software vendors have
+    had success by compiling their software on very old machines and
+    have been very careful not to upgrade any of the software running
+    on them.
+
+    When linking your application against the static Qt libraries, you
+    must explicitly link with the dependent libraries mentioned
+    above. Do this by adding them to the \c LIBS variable in your
+    project file.
+
+    \section2 Qt Plugins
+
+    Your application may also depend on one or more Qt plugins, such
+    as the JPEG image format plugin or a SQL driver plugin. Be sure
+    to distribute any Qt plugins that you need with your application,
+    and note that each type of plugin should be located within a
+    specific subdirectory (such as \c imageformats or \c sqldrivers)
+    within your distribution directory, as described below.
+
+    \note If you are deploying an application that uses QtWebKit to display
+    HTML pages from the World Wide Web, you should include all text codec
+    plugins to support as many HTML encodings possible. 
+
+    The search path for Qt plugins (as well as a few other paths) is
+    hard-coded into the QtCore library. By default, the first plugin
+    search path will be hard-coded as \c /path/to/Qt/plugins. As
+    mentioned above, using pre-determined paths has certain
+    disadvantages, so you need to examine various alternatives to make
+    sure that the Qt plugins are found:
+
+    \list
+
+    \o \l{qt-conf.html}{Using \c qt.conf}. This is the recommended
+    approach since it provides the most flexibility.
+
+    \o Using QApplication::addLibraryPath() or
+    QApplication::setLibraryPaths().
+
+    \o Using a third party installation utility or the target system's
+    package manager to change the hard-coded paths in the QtCore
+    library.
+
+    \endlist
+
+    The \l{How to Create Qt Plugins} document outlines the issues you
+    need to pay attention to when building and deploying plugins for
+    Qt applications.
+*/
+
+/*!
+    \page deployment-windows.html
+    \contentspage Deploying Qt Applications
+
+    \title Deploying an Application on Windows
+    \ingroup deployment
+
+    This documentation will describe how to determine which files you
+    should include in your distribution, and how to make sure that the
+    application will find them at run-time. We will demonstrate the
+    procedures in terms of deploying the \l {tools/plugandpaint}{Plug
+    & Paint} application that is provided in Qt's examples directory.
+
+    Contents:
+
+    \tableofcontents
+
+    \section1 Static Linking
+
+    If you want to keep things simple by only having a few files to
+    deploy, i.e. a stand-alone executable with the associated compiler
+    specific DLLs, then you must build everything statically.
+
+    \section2 Building Qt Statically
+
+    Before we can build our application we must make sure that Qt is
+    built statically. To do this, go to a command prompt and type the
+    following:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 11
+
+    Remember to specify any other options you need, such as data base
+    drivers, as arguments to \c configure. Once \c configure has
+    finished, type the following:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 12
+
+    This will build Qt statically. Note that unlike with a dynamic build,
+    building Qt statically will result in libraries without version numbers;
+    e.g. \c QtCore4.lib will be \c QtCore.lib. Also, we have used \c nmake
+    in all the examples, but if you use MinGW you must use
+    \c mingw32-make instead.
+
+    \note If you later need to reconfigure and rebuild Qt from the
+    same location, ensure that all traces of the previous configuration are
+    removed by entering the build directory and typing \c{nmake distclean}
+    before running \c configure again.
+
+    \section2 Linking the Application to the Static Version of Qt
+
+    Once Qt has finished building we can build the \l
+    {tools/plugandpaint}{Plug & Paint} application. First we must go
+    into the directory that contains the application:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 13
+
+    We must then run \c qmake to create a new makefile for the
+    application, and do a clean build to create the statically linked
+    executable:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 14
+
+    You probably want to link against the release libraries, and you
+    can specify this when invoking \c qmake. Now, provided that
+    everything compiled and linked without any errors, we should have
+    a \c plugandpaint.exe file that is ready for deployment. One easy
+    way to check that the application really can be run stand-alone is
+    to copy it to a machine that doesn't have Qt or any Qt
+    applications installed, and run it on that machine.
+
+    Remember that if your application depends on compiler specific
+    libraries, these must still be redistributed along with your
+    application. You can check which libraries your application is
+    linking against by using the \c depends tool. For more
+    information, see the \l {Application Dependencies} section.
+
+    The \l {tools/plugandpaint}{Plug & Paint} example consists of
+    several components: The application itself (\l
+    {tools/plugandpaint}{Plug & Paint}), and the \l
+    {tools/plugandpaintplugins/basictools}{Basic Tools} and \l
+    {tools/plugandpaintplugins/extrafilters}{Extra Filters}
+    plugins. Since we cannot deploy plugins using the static linking
+    approach, the application we have prepared is incomplete. It will
+    run, but the functionality will be disabled due to the missing
+    plugins. To deploy plugin-based applications we should use the
+    shared library approach.
+
+    \section1 Shared Libraries
+
+    We have two challenges when deploying the \l
+    {tools/plugandpaint}{Plug & Paint} application using the shared
+    libraries approach: The Qt runtime has to be correctly
+    redistributed along with the application executable, and the
+    plugins have to be installed in the correct location on the target
+    system so that the application can find them.
+
+    \section2 Building Qt as a Shared Library
+
+    We assume that you already have installed Qt as a shared library,
+    which is the default when installing Qt, in the \c C:\path\to\Qt
+    directory. For more information on how to build Qt, see the \l
+    {Installation} documentation.
+
+    \section2 Linking the Application to Qt as a Shared Library
+
+    After ensuring that Qt is built as a shared library, we can build
+    the \l {tools/plugandpaint}{Plug & Paint} application. First, we
+    must go into the directory that contains the application:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 15
+
+    Now run \c qmake to create a new makefile for the application, and
+    do a clean build to create the dynamically linked executable:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 16
+
+    This builds the core application, the following will build the
+    plugins:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 17
+
+    If everything compiled and linked without any errors, we will get
+    a \c plugandpaint.exe executable and the \c pnp_basictools.dll and
+    \c pnp_extrafilters.dll plugin files.
+
+    \section2 Creating the Application Package
+
+    To deploy the application, we must make sure that we copy the
+    relevant Qt DLL (corresponding to the Qt modules used in
+    the application) as well as the executable to the same directory
+    in the \c release subdirectory.
+
+    Remember that if your application depends on compiler specific
+    libraries, these must be redistributed along with your
+    application. You can check which libraries your application is
+    linking against by using the \c depends tool. For more
+    information, see the \l {Application Dependencies} section.
+
+    We'll cover the plugins shortly, but first we'll check that the
+    application will work in a deployed environment: Either copy the
+    executable and the Qt DLLs to a machine that doesn't have Qt
+    or any Qt applications installed, or if you want to test on the
+    build machine, ensure that the machine doesn't have Qt in its
+    environment.
+
+    If the application starts without any problems, then we have
+    successfully made a dynamically linked version of the \l
+    {tools/plugandpaint}{Plug & Paint} application. But the
+    application's functionality will still be missing since we have
+    not yet deployed the associated plugins.
+
+    Plugins work differently to normal DLLs, so we can't just
+    copy them into the same directory as our application's executable
+    as we did with the Qt DLLs.  When looking for plugins, the
+    application searches in a \c plugins subdirectory inside the
+    directory of the application executable.
+
+    So to make the plugins available to our application, we have to
+    create the \c plugins subdirectory and copy over the relevant DLLs:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 18
+
+    An archive distributing all the Qt DLLs and application
+    specific plugins required to run the \l {tools/plugandpaint}{Plug
+    & Paint} application, would have to include the following files:
+
+    \table 100%
+    \header
+        \o Component \o {2, 1} File Name
+    \row
+        \o The executable
+        \o {2, 1} \c plugandpaint.exe
+    \row
+        \o The Basic Tools plugin
+        \o {2, 1} \c plugins\pnp_basictools.dll
+    \row
+        \o The ExtraFilters plugin
+        \o {2, 1} \c plugins\pnp_extrafilters.dll
+    \row
+        \o The Qt Core module
+        \o {2, 1} \c qtcore4.dll
+    \row
+        \o The Qt GUI module
+        \o {2, 1} \c qtgui4.dll
+    \endtable
+
+    In addition, the archive must contain the following compiler
+    specific libraries depending on your version of Visual Studio:
+
+    \table 100%
+    \header
+        \o \o VC++ 6.0 \o VC++ 7.1 (2003) \o VC++ 8.0 (2005)
+    \row
+        \o The C run-time
+        \o \c msvcrt.dll
+        \o \c msvcr71.dll
+        \o \c msvcr80.dll
+    \row
+        \o The C++ run-time
+        \o \c msvcp60.dll
+        \o \c msvcp71.dll
+        \o \c msvcp80.dll
+    \endtable
+
+    To verify that the application now can be successfully deployed,
+    you can extract this archive on a machine without Qt and without
+    any compiler installed, and try to run it.
+
+    An alternative to putting the plugins in the plugins subdirectory
+    is to add a custom search path when you start your application
+    using QApplication::addLibraryPath() or
+    QApplication::setLibraryPaths().
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 19
+
+    One benefit of using plugins is that they can easily be made
+    available to a whole family of applications.
+
+    It's often most convenient to add the path in the application's \c
+    main() function, right after the QApplication object is
+    created. Once the path is added, the application will search it
+    for plugins, in addition to looking in the \c plugins subdirectory
+    in the application's own directory. Any number of additional paths
+    can be added.
+
+    \section2 Visual Studio 2005 Onwards
+
+    When deploying an application compiled with Visual Studio 2005 onwards,
+    there are some additional steps to be taken.
+
+    First, we need to copy the manifest file created when linking the
+    application. This manifest file contains information about the
+    application's dependencies on side-by-side assemblies, such as the runtime
+    libraries.
+
+    The manifest file needs to be copied into the \bold same folder as the
+    application executable. You do not need to copy the manifest files for
+    shared libraries (DLLs), since they are not used.
+
+    If the shared library has dependencies that are different from the
+    application using it, the manifest file needs to be embedded into the DLL
+    binary. Since Qt 4.1.3, the follwoing \c CONFIG options are available for
+    embedding manifests:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 20
+
+    To use the options, add
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 21
+
+    to your .pro file. The \c embed_manifest_dll option is enabled by default.
+
+    You can find more information about manifest files and side-by-side
+    assemblies at the
+    \l {http://msdn.microsoft.com/en-us/library/aa376307.aspx}{MSDN website}.
+
+    There are two ways to include the run time libraries: by bundling them
+    directly with your application or by installing them on the end-user's
+    system.
+
+    To bundle the run time libraries with your application, copy the directory
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 22
+
+    into the folder where your executable is, so that you are including a
+    \c Microsoft.VC80.CRT directory alongside your application's executable. If
+    you are bundling the runtimes and need to deploy plugins as well, you have
+    to remove the manifest from the plugins (embedded as a resource) by adding
+    the following line to the \c{.pro} file of the plugins you are compiling:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 23
+
+    \warning If you skip the step above, the plugins will not load on some
+    systems.
+
+    To install the runtime libraries on the end-user's system, you need to
+    include the appropriate Visual C++ Redistributable Package (VCRedist)
+    executable with your application and ensure that it is executed when the
+    user installs your application.
+
+    For example, on an 32-bit x86-based system, you would include the
+    \l{http://www.microsoft.com/downloads/details.aspx?FamilyId=32BC1BEE-A3F9-4C13-9C99-220B62A191EE}{vcredist_x86.exe}
+    executable. The \l{http://www.microsoft.com/downloads/details.aspx?familyid=526BF4A7-44E6-4A91-B328-A4594ADB70E5}{vcredist_IA64.exe}
+    and \l{http://www.microsoft.com/downloads/details.aspx?familyid=90548130-4468-4BBC-9673-D6ACABD5D13B}{vcredist_x64.exe}
+    executables provide the appropriate libraries for the IA64 and 64-bit x86
+    architectures, respectively.
+
+    \note The application you ship must be compiled with exactly the same
+    compiler version against the same C runtime version. This prevents
+    deploying errors caused by different versions of the C runtime libraries.
+
+
+    \section1 Application Dependencies
+
+    \section2 Additional Libraries
+
+    Depending on configuration, compiler specific libraries must be
+    redistributed along with your application. You can check which
+    libraries your application is linking against by using the
+    \l{Dependency Walker} tool. All you need to do is to run it like
+    this:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 24
+
+    This will provide a list of the libraries that your application
+    depends on and other information.
+
+    \image deployment-windows-depends.png
+
+    When looking at the release build of the Plug & Paint executable
+    (\c plugandpaint.exe) with the \c depends tool, the tool lists the
+    following immediate dependencies to non-system libraries:
+
+    \table 100%
+        \header
+            \o Qt
+            \o VC++ 6.0
+            \o VC++ 7.1 (2003)
+            \o VC++ 8.0 (2005)
+            \o MinGW
+        \row
+        \o \list
+               \o QTCORE4.DLL - The QtCore runtime
+               \o QTGUI4.DLL - The QtGui runtime
+           \endlist
+        \o \list
+               \o MSVCRT.DLL - The C runtime
+               \o MSVCP60.DLL - The C++ runtime (only when STL is installed)
+           \endlist
+        \o \list
+               \o MSVCR71.DLL - The C runtime
+               \o MSVCP71.DLL - The C++ runtime (only when STL is installed)
+           \endlist
+        \o \list
+               \o MSVCR80.DLL - The C runtime
+               \o MSVCP80.DLL - The C++ runtime (only when STL is installed)
+           \endlist
+        \o \list
+               \o MINGWM10.DLL - The MinGW run-time
+           \endlist
+    \endtable
+
+    When looking at the plugin DLLs the exact same dependencies
+    are listed.
+
+    \section2 Qt Plugins
+
+    Your application may also depend on one or more Qt plugins, such
+    as the JPEG image format plugin or a SQL driver plugin. Be sure
+    to distribute any Qt plugins that you need with your application,
+    and note that each type of plugin should be located within a
+    specific subdirectory (such as \c imageformats or \c sqldrivers)
+    within your distribution directory, as described below.
+
+    \note If you are deploying an application that uses QtWebKit to display
+    HTML pages from the World Wide Web, you should include all text codec
+    plugins to support as many HTML encodings possible. 
+
+    The search path for Qt plugins is hard-coded into the QtCore library. 
+    By default, the plugins subdirectory of the Qt installation is the first 
+    plugin search path. However, pre-determined paths like the default one 
+    have certain disadvantages. For example, they may not exist on the target 
+    machine. For that reason, you need to examine various alternatives to make 
+    sure that the Qt plugins are found:
+
+    \list
+
+    \o \l{qt-conf.html}{Using \c qt.conf}. This approach is the recommended 
+    if you have executables in different places sharing the same plugins.
+    
+    \o Using QApplication::addLibraryPath() or
+    QApplication::setLibraryPaths(). This approach is recommended if you only 
+    have one executable that will use the plugin. 
+
+    \o Using a third party installation utility to change the
+    hard-coded paths in the QtCore library.
+
+    \endlist
+    
+    If you add a custom path using QApplication::addLibraryPath it could 
+    look like this:
+    
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 54
+
+    Then qApp->libraryPaths() would return something like this:
+
+    "C:/customPath/plugins " 
+    "C:/Qt/4.5.0/plugins" 
+    "E:/myApplication/directory/"
+
+    The executable will look for the plugins in these directories and 
+    the same order as the QStringList returned by qApp->libraryPaths(). 
+    The newly added path is prepended to the qApp->libraryPaths() which 
+    means that it will be searched through first. However, if you use 
+    qApp->setLibraryPaths(), you will be able to determend which paths 
+    and in which order they will be searched.
+
+    The \l{How to Create Qt Plugins} document outlines the issues you
+    need to pay attention to when building and deploying plugins for
+    Qt applications.
+*/
+
+/*!
+    \page deployment-mac.html
+    \contentspage Deploying Qt Applications
+
+    \title Deploying an Application on Mac OS X
+    \ingroup deployment
+
+    Starting with version 4.5, Qt now includes a \l {macdeploy}{deployment tool}
+    that automates the prodecures described in this document.
+
+    This documentation will describe how to create a bundle, and how
+    to make sure that the application will find the resources it needs
+    at run-time. We will demonstrate the procedures in terms of
+    deploying the \l {tools/plugandpaint}{Plug & Paint} application
+    that is provided in Qt's examples directory.
+    
+    \tableofcontents
+
+    \section1 The Bundle
+
+    On the Mac, a GUI application must be built and run from a
+    bundle. A bundle is a directory structure that appears as a single
+    entity when viewed in the Finder. A bundle for an application
+    typcially contains the executable and all the resources it
+    needs. See the image below:
+
+    \image deployment-mac-bundlestructure.png
+
+    The bundle provides many advantages to the user. One primary
+    advantage is that, since it is a single entity, it allows for
+    drag-and-drop installation. As a programmer you can access bundle
+    information in your own code. This is specific to Mac OS X and
+    beyond the scope of this document. More information about bundles
+    is available on \l
+    {http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFBundles/index.html}{Apple's Developer Website}.
+
+    A Qt command line application on Mac OS X works similar to a
+    command line application on Unix and Windows. You probably don't
+    want to run it in a bundle: Add this to your application's .pro:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 26
+
+    This will tell \c qmake not to put the executable inside a
+    bundle. Please refer to the \l{Deploying an Application on
+    X11 Platforms}{X11 deployment documentation} for information about how
+    to deploy these "bundle-less" applications.
+
+    \section1 Xcode
+
+    We will only concern ourselves with command-line tools here. While
+    it is possible to use Xcode for this, Xcode has changed enough
+    between each version that it makes it difficult to document it
+    perfectly for each version. A future version of this document may
+    include more information for using Xcode in the deployment
+    process.
+
+    \section1 Static Linking
+
+    If you want to keep things simple by only having a few files to
+    deploy, then you must build everything statically.
+
+    \section2 Building Qt Statically
+
+    Start by installing a static version of the Qt library. Remember
+    that you will not be able to use plugins and you must build in all
+    the image formats, SQL drivers, etc..
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 27
+
+    You can check the various options that are available by running \c
+    configure -help.
+
+    \section2 Linking the Application to the Static Version of Qt
+
+    Once Qt is built statically, the next step is to regenerate the
+    makefile and rebuild the application. First, we must go into the
+    directory that contains the application:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 28
+
+    Now run \c qmake to create a new makefile for the application, and do
+    a clean build to create the statically linked executable:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 29
+
+    You probably want to link against the release libraries, and you
+    can specify this when invoking \c qmake. If you have Xcode Tools
+    1.5 or higher installed, you may want to take advantage of "dead
+    code stripping" to reduce the size of your binary even more. You
+    can do this by passing \c {LIBS+= -dead_strip} to \c qmake in
+    addition to the \c {-config release} parameter. This doesn't have
+    as large an effect if you are using GCC 4, since Qt will then have
+    function visibility hints built-in, but if you use GCC 3.3, it
+    could make a difference.
+
+    Now, provided that everything compiled and linked without any
+    errors, we should have a \c plugandpaint.app bundle that is ready
+    for deployment. One easy way to check that the application really
+    can be run stand-alone is to copy the bundle to a machine that
+    doesn't have Qt or any Qt applications installed, and run the
+    application on that machine.
+
+    You can check what other libraries your application links to using
+    the \c otool:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 30
+
+    Here is what the output looks like for the static \l
+    {tools/plugandpaint}{Plug & Paint}:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 31
+
+    For more information, see the \l {Application Dependencies}
+    section.
+
+    If you see \e Qt libraries in the output, it probably
+    means that you have both dynamic and static Qt libraries installed
+    on your machine. The linker will always choose dynamic over
+    static. There are two solutions: Either move your Qt dynamic
+    libraries (\c .dylibs) away to another directory while you link
+    the application and then move them back, or edit the \c Makefile
+    and replace link lines for the Qt libraries with the absolute path
+    to the static libraries. For example, replace
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 32
+
+    with
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 33
+
+    The \l {tools/plugandpaint}{Plug & Paint} example consists of
+    several components: The core application (\l
+    {tools/plugandpaint}{Plug & Paint}), and the \l
+    {tools/plugandpaintplugins/basictools}{Basic Tools} and \l
+    {tools/plugandpaintplugins/extrafilters}{Extra Filters}
+    plugins. Since we cannot deploy plugins using the static linking
+    approach, the bundle we have prepared so far is incomplete. The
+    application will run, but the functionality will be disabled due
+    to the missing plugins. To deploy plugin-based applications we
+    should use the framework approach.
+
+    \section1 Frameworks
+
+    We have two challenges when deploying the \l
+    {tools/plugandpaint}{Plug & Paint} application using frameworks:
+    The Qt runtime has to be correctly redistributed along with the
+    application bundle, and the plugins have to be installed in the
+    correct location so that the application can find them.
+
+    When distributing Qt with your application using frameworks, you
+    have two options: You can either distribute Qt as a private
+    framework within your application bundle, or you can distribute Qt
+    as a standard framework (alternatively use the Qt frameworks in
+    the installed binary). These two approaches are essentially the
+    same. The latter option is good if you have many Qt applications
+    and you would prefer to save memory. The former is good if you
+    have Qt built in a special way, or want to make sure the framework
+    is there. It just comes down to where you place the Qt frameworks.
+
+    \section2 Building Qt as Frameworks
+
+    We assume that you already have installed Qt as frameworks, which
+    is the default when installing Qt, in the /path/to/Qt
+    directory. For more information on how to build Qt, see the \l
+    Installation documentation.
+
+    When installing, the identification name of the frameworks will
+    also be set. The identification name is what the dynamic linker
+    (\c dyld) uses to find the libraries for your application.
+
+    \section2 Linking the Application to Qt as Frameworks
+
+    After ensuring that Qt is built as frameworks, we can build the \l
+    {tools/plugandpaint}{Plug & Paint} application. First, we must go
+    into the directory that contains the application:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 34
+
+    Now run qmake to create a new makefile for the application, and do
+    a clean build to create the dynamically linked executable:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 35
+
+    This builds the core application, the following will build the
+    plugins:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 36
+
+    Now run the \c otool for the Qt frameworks, for example Qt Gui:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 37
+
+    You will get the following output:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 38
+
+    For the Qt frameworks, the first line (i.e. \c
+    {path/to/Qt/lib/QtGui.framework/Versions/4/QtGui (compatibility
+    version 4.0.0, current version 4.0.1)}) becomes the framework's
+    identification name which is used by the dynamic linker (\c dyld).
+
+    But when you are deploying the application, your users may not
+    have the Qt frameworks installed in the specified location. For
+    that reason, you must either provide the frameworks in an agreed
+    upon location, or store the frameworks in the bundle itself.
+    Regardless of which solution you choose, you must make sure that
+    the frameworks return the proper identification name for
+    themselves, and that the application will look for these
+    names. Luckily we can control this with the \c install_name_tool
+    command-line tool.
+
+    The \c install_name_tool works in two modes, \c -id and \c
+    -change. The \c -id mode is for libraries and frameworks, and
+    allows us to specify a new identification name. We use the \c
+    -change mode to change the paths in the application.
+
+    Let's test this out by copying the Qt frameworks into the Plug &
+    Paint bundle. Looking at \c otool's output for the bundle, we can
+    see that we must copy both the QtCore and QtGui frameworks into
+    the bundle. We will assume that we are in the directory where we
+    built the bundle.
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 39
+
+    First we create a \c Frameworks directory inside the bundle. This
+    follows the Mac OS X application convention. We then copy the
+    frameworks into the new directory. Since frameworks contain
+    symbolic links, and we want to preserve them, we use the \c -R
+    option.
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 40
+
+    Then we run \c install_name_tool to set the identification names
+    for the frameworks. The first argument after \c -id is the new
+    name, and the second argument is the framework which
+    identification we wish to change.  The text \c @executable_path is
+    a special \c dyld variable telling \c dyld to start looking where
+    the executable is located. The new names specifies that these
+    frameworks will be located "one directory up and over" in the \c
+    Frameworks directory.
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 41
+
+    Now, the dynamic linker knows where to look for QtCore and
+    QtGui. Then we must make the application aware of the library
+    locations as well using \c install_name_tool's \c -change mode.
+    This basically comes down to string replacement, to match the
+    identification names that we set for the frameworks.
+
+    Finally, since the QtGui framework depends on QtCore, we must
+    remember to change the reference for QtGui:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 42
+
+    After all this we can run \c otool again and see that the
+    application will look in the right locations.
+
+    Of course, the thing that makes the \l {tools/plugandpaint}{Plug &
+    Paint} example interesting are its plugins. The basic steps we
+    need to follow with plugins are:
+
+    \list
+        \o Put the plugins inside the bundle
+        \o Make sure that the plugins use the correct library using the
+           \c install_name_tool
+        \o Make sure that the application knows where to get the plugins
+    \endlist
+
+    While we can put the plugins anywhere we want in the bundle, the
+    best location to put them is under Contents/Plugins. When we built
+    the Plug & Paint plugins, the \c DESTDIR variable in their \c .pro
+    file put the plugins' \c .dylib files in a \c plugins subdirectory
+    in the \c plugandpaint directory. So, in this example, all we need
+    to do is move this directory:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 43
+
+    If we run \c otool on for example the \l
+    {tools/plugandpaintplugins/basictools}{Basic Tools} plugin's \c
+    .dylib file we get the following information.
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 44
+
+    Then we can see that the plugin links to the Qt frameworks it was
+    built against. Since we want the plugins to use the framework in
+    the application bundle we change them the same way as we did for
+    the application. For example for the Basic Tools plugin:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 45
+
+
+    We must also modify the code in \c
+    tools/plugandpaint/mainwindow.cpp to \l {QDir::cdUp()}{cdUp()} one
+    directory since the plugins live in the bundle. Add the following
+    code to the \c mainwindow.cpp file:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 46
+
+    \table
+    \row
+    \o \inlineimage deployment-mac-application.png
+    \o
+    The additional code in \c tools/plugandpaint/mainwindow.cpp also
+    enables us to view the plugins in the Finder, as shown to the left.
+
+    We can also add plugins extending Qt, for example adding SQL
+    drivers or image formats. We just need to follow the directory
+    structure outlined in plugin documentation, and make sure they are
+    included in the QCoreApplication::libraryPaths(). Let's quickly do
+    this with the image formats, following the approach from above.
+
+    Copy Qt's image format plugins into the bundle:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 47
+
+    Use \c install_name_tool to link the plugins to the frameworks in
+    the bundle:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 48
+
+    Then we update the source code in \c tools/plugandpaint/main.cpp
+    to look for the the new plugins. After constructing the
+    QApplication, we add the following code:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 49
+
+    First, we tell the application to only look for plugins in this
+    directory. In our case, this is what we want since we only want to
+    look for the plugins that we distribute with the bundle. If we
+    were part of a bigger Qt installation we could have used
+    QCoreApplication::addLibraryPath() instead.
+
+    \endtable
+
+    \warning When deploying plugins, and thus make changes to the
+    source code, the default identification names are reset when
+    rebuilding the application, and you must repeat the process of
+    making your application link to the Qt frameworks in the bundle
+    using \c install_name_tool.
+
+    Now you should be able to move the application to another Mac OS X
+    machine and run it without Qt installed. Alternatively, you can
+    move your frameworks that live outside of the bundle to another
+    directory and see if the application still runs.
+
+    If you store the frameworks in another location than in the
+    bundle, the technique of linking your application is similar; you
+    must make sure that the application and the frameworks agree where
+    to be looking for the Qt libraries as well as the plugins.
+
+    \section2 Creating the Application Package
+
+    When you are done linking your application to Qt, either
+    statically or as frameworks, the application is ready to be
+    distributed. Apple provides a fair bit of information about how to
+    do this and instead of repeating it here, we recommend that you
+    consult their \l
+    {http://developer.apple.com/documentation/DeveloperTools/Conceptual/SoftwareDistribution/index.html}{software delivery}
+    documentation.
+
+    Although the process of deploying an application do have some
+    pitfalls, once you know the various issues you can easily create
+    packages that all your Mac OS X users will enjoy.
+
+    \section1 Application Dependencies
+
+    \section2 Qt Plugins
+
+    Your application may also depend on one or more Qt plugins, such
+    as the JPEG image format plugin or a SQL driver plugin. Be sure
+    to distribute any Qt plugins that you need with your application,
+    and note that each type of plugin should be located within a
+    specific subdirectory (such as \c imageformats or \c sqldrivers)
+    within your distribution directory, as described below.
+
+    \note If you are deploying an application that uses QtWebKit to display
+    HTML pages from the World Wide Web, you should include all text codec
+    plugins to support as many HTML encodings possible. 
+
+    The search path for Qt plugins (as well as a few other paths) is
+    hard-coded into the QtCore library. By default, the first plugin
+    search path will be hard-coded as \c /path/to/Qt/plugins. But
+    using pre-determined paths has certain disadvantages. For example,
+    they may not exist on the target machine. For that reason you need
+    to examine various alternatives to make sure that the Qt plugins
+    are found:
+
+    \list
+
+    \o \l{qt-conf.html}{Using \c qt.conf}. This is the recommended
+    approach since it provides the most flexibility.
+
+    \o Using QApplication::addLibraryPath() or
+    QApplication::setLibraryPaths().
+
+    \o Using a third party installation utility to change the
+    hard-coded paths in the QtCore library.
+
+    \endlist
+
+    The \l{How to Create Qt Plugins} document outlines the issues you
+    need to pay attention to when building and deploying plugins for
+    Qt applications.
+
+    \section2 Additional Libraries
+
+    You can check which libraries your application is linking against
+    by using the \c otool tool. To use \c otool, all you need to do is
+    to run it like this:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 50
+
+    Unlike the deployment processes on \l {Deploying an Application on
+    X11 Platforms}{X11} and \l {Deploying an Application on
+    Windows}{Windows}, compiler specific libraries rarely have to
+    be redistributed along with your application. But since Qt can be
+    configured, built, and installed in several ways on Mac OS X,
+    there are also several ways to deploy applications. Typically your
+    goals help determine how you are going to deploy the
+    application. The last sections describe a couple of things to keep
+    in mind when you are deploying your application.
+
+    \section2 Mac OS X Version Dependencies
+
+    Qt 4.2 has been designed to be built and deployed on Mac OS X 10.3
+    up until the current version as of this writing, Mac OS X 10.4 and
+    all their minor releases. Qt achieves this by using "weak
+    linking." This means that Qt tests if a function added in newer
+    versions of Mac OS X is available on the computer it is running on
+    before it uses it. This results in getting access to newer
+    features when running on newer versions of OS X while still
+    remaining compatible on older versions.
+
+    For more information about cross development issues on Mac OS X,
+    see \l
+    {http://developer.apple.com/documentation/DeveloperTools/Conceptual/cross_development/index.html}{Apple's Developer Website}.
+
+    Since the linker is set to be compatible with all OS X version, you have to
+    change the \c MACOSX_DEPLOYMENT_TARGET environment variable to get weak
+    linking to work for your application. You can add:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 51
+
+    to your .pro file and qmake will take care of this for you.
+
+    However, there is a bit of a wrinkle to keep in mind when your are
+    deploying. Mac OS X 10.4 ("Tiger") ships GCC 4.0 as its default
+    compiler. This is also the GCC compiler we use for building the
+    binary Qt package. If you use GCC 4.0 to build your application,
+    it will link against a dynamic libstdc++ that is only available on
+    Mac OS X 10.4 and Mac OS X 10.3.9.  The application will refuse to
+    run on older versions of the operating system.
+
+    For more information about C++ runtime environment, see \l
+    {http://developer.apple.com/documentation/DeveloperTools/Conceptual/CppRuntimeEnv/index.html}{Apple's Developer Website}
+
+    If you want to deploy to versions of Mac OS X earlier than 10.3.9,
+    you must build with GCC 3.3 which is the default on Mac OS X
+    10.3. GCC 3.3 is also available on the Mac OS X 10.4 "Xcode Tools"
+    CD and as a download for earlier versions of Mac OS X from Apple
+    (\l {https://connect.apple.com/}{connect.apple.com}). You can use
+    Apple's \c gcc_select(1) command line tool to switch the default
+    complier on your system.
+
+    \section3 Deploying Phonon Applications on Mac OS X
+
+    \list
+        \o If you build your Phonon application on Tiger, it will work on
+           Tiger, Leopard and Panther.
+        \o If you build your application on Leopard, it will \bold not work
+        on Panther unless you rename the libraries with the following command
+        after you have built your application:
+
+        \snippet doc/src/snippets/code/doc_src_deployment.qdoc 51a
+
+        This command must be invoked in the directory where
+        \c{libphonon_qt7.dylib} is located, usually in 
+        \c{yourapp.app/Contents/plugins/phonon_backend/}.
+        \o The \l {macdeploy}{deployment tool} will perform this step for you.
+
+        \o If you are using Leopard, but would like to build your application
+        against Tiger, you can use:
+
+        \snippet doc/src/snippets/code/doc_src_deployment.qdoc 51b
+    \endlist
+
+    \section2 Architecture Dependencies
+
+    The Qt for Mac OS X libraries, tools, and examples can be built "universal"
+    (i.e. they run natively on both Intel and PowerPC machines).  This
+    is accomplished by passing \c -universal on the \c configure line
+    of the source package, and requires that you use GCC 4.0.x. On
+    PowerPC hardware you will need to pass the universal SDK as a
+    command line argument to the Qt configure command. For example:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 52
+
+    From 4.1.1 the Qt binary package is already universal.
+
+    If you want to create a binary that runs on older versions of
+    PowerPC and x86, it is possible to build Qt for the PowerPC using
+    GCC 3.3, and for x86 one using GCC 4.0, and use Apple's \c lipo(1)
+    tool to stitch them together. This is beyond the scope of this
+    document and is not something we have tried, but Apple documents
+    it on their \l
+    {http://developer.apple.com/documentation/}{developer website}.
+
+    Once you have a universal Qt, \a qmake will generate makefiles
+    that will build for its host architecture by default. If you want
+    to build for a specific architecture, you can control this with
+    the \c CONFIG line in your \c .pro file. Use \c CONFIG+=ppc for
+    PowerPC, and \c CONFIG+=x86 for x86. If you desire both, simply
+    add both to the \c CONFIG line. PowerPC users also need an
+    SDK. For example:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 53
+
+    Besides \c lipo, you can also check your binaries with the \c file(1)
+    command line tool or the Finder.
+    
+    \section1 The Mac Deployment Tool
+    \target macdeploy
+    The Mac deployment tool can be found in QTDIR/bin/macdeployqt. It is
+    designed to automate the process of creating a deployable
+    application bundle that contains the Qt libraries as private
+    frameworks.
+    
+    The mac deployment tool also deploys the Qt plugins, according
+    to the following rules:
+    \list
+    \o Debug versions of the plugins are not deployed.
+    \o The designer plugins are not deployed.
+    \o The Image format plugins are always deployed.
+    \o SQL driver plugins are deployed if the application uses the QtSql module.
+    \o Script plugins are deployed if the application uses the QtScript module.
+    \o The Phonon backend plugin is deployed if the application uses the \l{Phonon Module} {Phonon} module.
+    \o The svg icon plugin is deployed if the application uses the QtSvg module.
+    \o The accessibility plugin is always deployed.
+    \o Accessibility for Qt3Support is deployed if the application uses the Qt3Support module.
+    \endlist
+
+    macdeployqt supports the following options:
+    \list
+    \o -no-plugins: Skip plugin deployment 
+    \o -dmg       : Create a .dmg disk image 
+    \o -no-strip  : Don't run 'strip' on the binaries 
+    \endlist    
+*/
diff --git a/doc/src/designer-manual.qdoc b/doc/src/designer-manual.qdoc
new file mode 100644
index 0000000000..083d782ab4
--- /dev/null
+++ b/doc/src/designer-manual.qdoc
@@ -0,0 +1,2856 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page designer-manual.html
+
+    \title Qt Designer Manual
+    \ingroup qttools
+    \keyword Qt Designer
+
+    \QD is Qt Software's tool for designing and building graphical user
+    interfaces (GUIs) from Qt components. You can compose and customize your
+    widgets or dialogs in a what-you-see-is-what-you-get (WYSIWYG) manner, and
+    test them using different styles and resolutions.
+
+    Widgets and forms created with \QD integrated seamlessly with programmed
+    code, using Qt's signals and slots mechanism, that lets you easily assign
+    behavior to graphical elements. All properties set in \QD can be changed
+    dynamically within the code. Furthermore, features like widget promotion
+    and custom plugins allow you to use your own components with \QD.
+
+    If you are new to \QD, you can take a look at the
+    \l{Getting To Know Qt Designer} document.
+
+    Qt Designer 4.5 boasts a long list of improvements. For a detailed list of
+    what is new, refer \l{What's New in Qt Designer 4.5}.
+
+    \image designer-multiple-screenshot.png
+
+    For more information on using \QD, you can take a look at the following
+    links:
+
+    \list
+        \o  \l{Qt Designer's Editing Modes}
+            \list
+                \o  \l{Qt Designer's Widget Editing Mode}{Widget Editing Mode}
+                \o  \l{Qt Designer's Signals and Slots Editing Mode}
+                      {Signals and Slots Editing Mode}
+                \o  \l{Qt Designer's Buddy Editing Mode}
+                      {Buddy Editing Mode}
+                \o  \l{Qt Designer's Tab Order Editing Mode}
+                      {Tab Order Editing Mode}
+            \endlist
+        \o  \l{Using Layouts in Qt Designer}
+        \o  \l{Saving, Previewing and Printing Forms in Qt Designer}
+        \o  \l{Using Containers in Qt Designer}
+        \o  \l{Creating Main Windows in Qt Designer}
+        \o  \l{Editing Resources with Qt Designer}
+        \o  \l{Using Stylesheets with Qt Designer}
+        \o  \l{Using a Designer .ui File in Your Application}
+    \endlist
+
+    For advanced usage of \QD, you can refer to these links:
+
+    \list
+        \o  \l{Customizing Qt Designer Forms}
+        \o  \l{Using Custom Widgets with Qt Designer}
+        \o  \l{Creating Custom Widgets for Qt Designer}
+        \o  \l{Creating Custom Widget Extensions}
+        \o  \l{Qt Designer's UI File Format}
+    \endlist
+
+
+    \section1 Legal Notices
+
+    Some source code in \QD is licensed under specific highly permissive
+    licenses from the original authors. Trolltech gratefully acknowledges
+    these contributions to \QD and all uses of \QD should also acknowledge
+    these contributions and quote the following license statements in an
+    appendix to the documentation.
+
+    \list
+    \i \l{Implementation of the Recursive Shadow Casting Algorithm in Qt Designer}
+    \endlist
+*/
+
+
+
+/*!
+    \page designer-whats-new.html
+    \contentspage {Qt Designer Manual}{Contents}
+
+
+    \title What's New in Qt Designer 4.5
+
+    \section1 General Changes
+
+
+    \table
+        \header
+            \i  Widget Filter Box
+            \i  Widget Morphing
+            \i  Disambiguation Field
+        \row
+            \i  \inlineimage designer-widget-filter.png
+            \i  \inlineimage designer-widget-morph.png
+            \i  \inlineimage designer-disambiguation.png
+    \endtable
+
+    \list 1
+        \i  Displaying only icons in the \gui{Widget Box}: It is now possible
+            for the \gui{Widget Box} to display icons only. Simply select
+            \gui{Icon View} from the context menu.
+        \i  Filter for \gui{Widget Box}: A filter is now provided to quickly
+            locate the widget you need. If you use a particular widget
+            frequently, you can always add it to the
+            \l{Getting to Know Qt Designer#WidgetBox}{scratch pad}.
+        \i  Support for QButtonGroup: It is available via the context
+            menu of a selection of QAbstractButton objects.
+        \i  Improved support for item widgets: The item widgets' (e.g.,
+            QListWidget, QTableWidget, and QTreeWidget) contents dialogs have
+            been improved. You can now add translation comments and also modify
+            the header properties.
+        \i  Widget morphing: A widget can now be morphed from one type to
+            another with its layout and properties preserved. To begin, click
+            on your widget and select \gui{Morph into} from the context menu.
+        \i  Disambiguation field: The property editor now shows this extra
+            field under the \gui{accessibleDescription} property. This field
+            has been introduced to aid translators in the case of two source
+            texts being the same but used for different purposes. For example,
+            a dialog could have two \gui{Add} buttons for two different
+            reasons. \note To maintain compatibility, comments in \c{.ui} files
+            created prior to Qt 4.5 will be listed in the \gui{Disambiguation}
+            field.
+    \endlist
+
+
+
+    \section1 Improved Shortcuts for the Editing Mode
+
+    \list
+        \i  The \key{Shift+Click} key combination now selects the ancestor for
+            nested layouts. This iterates from one ancestor to the other.
+
+        \i  The \key{Ctrl} key is now used to toggle and copy drag. Previously
+            this was done with the \key{Shift} key but is now changed to
+            conform to standards.
+
+        \i  The left mouse button does rubber band selection for form windows;
+            the middle mouse button does rubber band selection everywhere.
+    \endlist
+
+
+    \section1 Layouts
+    \list
+        \i  It is now possible to switch a widget's layout without breaking it
+            first. Simply select the existing layout and change it to another
+            type using the context menu or the layout buttons on the toolbar.
+
+        \i  To quickly populate a \gui{Form Layout}, you can now use the
+            \gui{Add form layout row...} item available in the context menu or
+            double-click on the red layout.
+    \endlist
+
+
+    \section1 Support for Embedded Design
+
+    \table
+        \header
+            \i  Comboboxes to Select a Device Profile
+        \row
+            \i  \inlineimage designer-embedded-preview.png
+    \endtable
+
+    It is now possible to specify embedded device profiles, e.g., Style, Font,
+    Screen DPI, resolution, default font, etc., in \gui{Preferences}. These
+    settings will affect the \gui{Form Editor}. The profiles will also be
+    visible with \gui{Preview}.
+
+
+    \section1 Related Classes
+
+    \list
+        \i  QUiLoader \mdash forms loaded with this class will now react to
+            QEvent::LanguageChange if QUiLoader::setLanguageChangeEnabled() or
+            QUiLoader::isLanguageChangeEnabled() is set to true.
+
+        \i  QDesignerCustomWidgetInterface \mdash the
+            \l{QDesignerCustomWidgetInterface::}{domXml()} function now has new
+            attributes for its \c{<ui>} element. These attributes are
+            \c{language} and \c{displayname}. The \c{language} element can be
+            one of the following "", "c++", "jambi". If this element is
+            specified, it must match the language in which Designer is running.
+            Otherwise, this element will not be available. The \c{displayname}
+            element represents the name that will be displayed in the
+            \gui{Widget Box}. Previously this was hardcoded to be the class
+            name.
+
+        \i  QWizard \mdash QWizard's page now has a string \c{id} attribute that
+            can be used to fill in enumeration values to be used by the
+            \c{uic}. However, this attribute has no effect on QUiLoader.
+    \endlist
+*/
+
+
+/*!
+    \page designer-to-know.html
+    \contentspage {Qt Designer Manual}{Contents}
+
+    \title Getting to Know Qt Designer
+
+    \tableofcontents
+
+    \image designer-screenshot.png
+
+    \section1 Launching Designer
+
+    The way that you launch \QD depends on your platform:
+
+    \list
+        \i On Windows, click the Start button, under the \gui Programs submenu,
+           open the \gui{Qt 4} submenu and click \gui Designer.
+        \i On Unix or Linux, you might find a \QD icon on the desktop
+           background or in the desktop start menu under the \gui Programming
+           or \gui Development submenus. You can launch \QD from this icon.
+           Alternatively, you can type \c{designer} in a terminal window.
+        \i On Mac OS X, double click on \QD in \gui Finder.
+    \endlist
+
+    \section1 The User Interface
+
+    When used as a standalone application, \QD's user interface can be
+    configured to provide either a multi-window user interface (the default
+    mode), or it can be used in docked window mode. When used from within an
+    integrated development environment (IDE) only the multi-window user
+    interface is available. You can switch modes in the \gui Preferences dialog
+    from the \gui Edit menu.
+
+    In multi-window mode, you can arrange each of the tool windows to suit your
+    working style. The main window consists of a menu bar, a tool bar, and a
+    widget box that contains the widgets you can use to create your user
+    interface.
+
+    \target MainWindow
+    \table
+        \row
+            \i \inlineimage designer-main-window.png
+            \i \bold{Qt Designer's Main Window}
+
+        The menu bar provides all the standard actions for managing forms,
+        using the clipboard, and accessing application-specific help.
+        The current editing mode, the tool windows, and the forms in use can
+        also be accessed via the menu bar.
+
+        The tool bar displays common actions that are used when editing a form.
+        These are also available via the main menu.
+
+        The widget box provides common widgets and layouts that are used to
+        design components. These are grouped into categories that reflect their
+        uses or features.
+    \endtable
+
+    Most features of \QD are accessible via the menu bar, the tool bar, or the
+    widget box. Some features are also available through context menus that can
+    be opened over the form windows. On most platforms, the right mouse is used
+    to open context menus.
+
+    \target WidgetBox
+    \table
+        \row
+            \i \inlineimage designer-widget-box.png
+            \i \bold{Qt Designer's Widget Box}
+        
+        The widget box provides a selection of standard Qt widgets, layouts,
+        and other objects that can be used to create user interfaces on forms.
+        Each of the categories in the widget box contain widgets with similar
+        uses or related features.
+        
+        \note Since Qt 4.4, new widgets have been included, e.g.,
+        QPlainTextEdit, QCommandLinkButton, QScrollArea, QMdiArea, and
+        QWebView.
+
+        You can display all of the available objects in a category by clicking
+        on the handle next to the category label. When in
+        \l{Qt Designer's Widget Editing Mode}{Widget Editing
+        Mode}, you can add objects to a form by dragging the appropriate items
+        from the widget box onto the form, and dropping them in the required
+        locations.
+
+        \QD provides a scratch pad feature that allows you to collect
+        frequently used objects in a separate category. The scratch pad
+        category can be filled with any widget currently displayed in a form
+        by dragging them from the form and dropping them onto the widget box.
+        These widgets can be used in the same way as any other widgets, but
+        they can also contain child widgets. Open a context menu over a widget
+        to change its name or remove it from the scratch pad.
+    \endtable
+
+
+    \section1 The Concept of Layouts in Qt
+
+    A layout is used to arrange and manage the elements that make up a user
+    interface. Qt provides a number of classes to automatically handle layouts
+    -- QHBoxLayout, QVBoxLayout, QGridLayout, and QFormLayout. These classes
+    solve the challenge of laying out widgets automatically, providing a user
+    interface that behaves predictably. Fortunately knowledge of the layout
+    classes is not required to arrange widgets with \QD. Instead, select one of
+    the \gui{Lay Out Horizontally}, \gui{Lay Out in a Grid}, etc., options from
+    the context menu.
+
+    Each Qt widget has a recommended size, known as \l{QWidget::}{sizeHint()}.
+    The layout manager will attempt to resize a widget to meet its size hint.
+    In some cases, there is no need to have a different size. For example, the
+    height of a QLineEdit is always a fixed value, depending on font size and
+    style. In other cases, you may require the size to change, e.g., the width
+    of a QLineEdit or the width and height of item view widgets. This is where
+    the widget size constraints -- \l{QWidget::minimumSize()}{minimumSize} and
+    \l{QWidget::maximumSize()}{maximumSize} constraints come into play. These
+    are properties you can set in the property editor. Alternatively, to use
+    the current size as a size constraint value, choose one of the
+    \gui{Size Constraint} options from the widget's context menu. The layout
+    will then ensure that those constraints are met.
+
+    The screenshot below shows the breakdown of a basic user interface designed
+    using a grid. The coordinates on the screenshot show the position of each
+    widget within the grid.
+
+    \image addressbook-tutorial-part3-labeled-layout.png    
+
+    \note Inside the grid, the QPushButton objects are actually nested. The
+    buttons on the right are first placed in a QVBoxLayout; the buttons at the
+    bottom are first placed in a QHBoxLayout. Finally, they are put into
+    coordinates (1,2) and (3,1) of the QGridLayout.
+
+    To visualize, imagine the layout as a box that shrinks as much as possible,
+    attempting to \e squeeze your widgets in a neat arrangement, and, at the
+    same time, maximize the use of available space. 
+
+    Qt's layouts help when you:
+
+    \list 1
+        \i  Resize the user face to fit different window sizes.
+        \i  Resize elements within the user interface to suit different
+            localizations.
+        \i  Arrange elements to adhere to layout guidelines for different
+            platforms.
+    \endlist
+
+    So, you no longer have to worry about rearranging widgets for different
+    platforms, settings, and languages.
+
+    The example below shows how different localizations can affect the user
+    interface. When a localization requires more space for longer text strings
+    the Qt layout automatically scales to accommodate this, while ensuring that
+    the user interface looks presentable and still matches the platform
+    guidelines.
+
+    \table
+        \header
+            \i  A Dialog in English
+            \i  A Dialog in French
+        \row
+            \i  \image designer-english-dialog.png
+            \i  \image designer-french-dialog.png
+    \endtable
+
+    The process of laying out widgets consists of creating the layout hierarchy
+    while setting as few widget size constraints as possible.
+
+    For a more technical perspective on Qt's layout classes, refer to the
+    \l{Layout Classes} document.
+*/
+
+
+/*!
+    \page designer-quick-start.html
+    \contentspage {Qt Designer Manual}{Contents}
+
+    \title A Quick Start to Qt Designer
+
+    Using \QD involves \bold four basic steps:
+
+    \list 1
+        \o  Choose your form and objects
+        \o  Lay the objects out on the form
+        \o  Connect the signals to the slots
+        \o  Preview the form
+    \endlist
+
+    \omit
+    \image rgbController-screenshot.png
+    \endomit
+
+    Suppose you would like to design a small widget (see screenshot above)
+    that contains the controls needed to manipulate Red, Green and Blue (RGB)
+    values -- a type of widget that can be seen everywhere in image
+    manipulation programs.
+
+   \table
+    \row
+    \i \inlineimage designer-choosing-form.png
+    \i \bold{Choosing a Form}
+
+    You start by choosing \gui Widget from the \gui{New Form} dialog.
+    \endtable
+
+    Then you drag three labels, three spin boxes and three vertical sliders
+    on to your form. You can roughly arrange them according to how you would
+    like them to be laid out.
+
+    \omit
+    \table
+    \row \o \inlineimage rgbController-widgetBox.png
+         \o \inlineimage rgbController-arrangement.png
+    \endtable
+    \endomit
+
+    To ensure that they are laid out exactly like this in your program, you
+    need to place these widgets into a layout. We will do this in groups of
+    three. Select the "RED" label. Then, hold down \key Shift while you select
+    its corresponding spin box and slider. In the \gui{Form} menu, select
+    \gui{Lay Out in a Grid}.
+
+    \omit
+    \table
+        \row
+            \i \inlineimage rgbController-form-gridLayout.png
+            \i \inlineimage rgbController-selectForLayout.png
+    \endtable
+    \endomit
+
+
+    Repeat the step for the other two labels along with their corresponding
+    spin boxes and sliders as well. Your form will now look similar to the
+    screenshot below.
+
+    \omit
+    \image rgbController-almostLaidOut.png
+    \endomit
+
+    The next step is to combine all three layouts into one \bold{main layout}.
+    It is important that your form has a main layout; otherwise, the widgets
+    on your form will not resize when your form is resized. To set the main
+    layout, \gui{Right click} anywhere on your form, outside of the three
+    separate layouts, and select \gui{Lay Out Horizontally}. Alternatively, you
+    could also select \gui{Lay Out in a Grid} -- you will still see the same
+    arrangement.
+
+    \note Main layouts cannot be seen on the form. To check if you have a main
+    layout installed, try resizing your form; your widgets should resize
+    accordingly.
+
+    When you click on the slider and drag it to a certain value, you want the
+    spin box to display the slider's position. To do this, you need to connect
+    the slider's \l{QAbstractSlider::}{valueChanged()} signal to the spin box's
+    \l{QSpinBox::}{setValue()} slot. You also need to make the reverse
+    connections, e.g., connect the spin box's \l{QSpinBox::}{valueChanged()}
+    signal to the slider's \l{QAbstractSlider::value()}{setValue()} slot.
+
+    To do this, you have to switch to \gui{Edit Signals/Slots} mode, either by
+    pressing \key{F4} or something \gui{Edit Signals/Slots} from the \gui{Edit}
+    menu.
+
+    \omit
+    \table
+        \row
+            \i \inlineimage rgbController-signalsAndSlots.png
+            \i \bold{Connecting Signals to Slots}
+
+        Click on the slider and drag the cursor towards the spin box. The
+        \gui{Configure Connection} dialog, shown below, will pop up. Select the
+        correct signal and slot and click \gui OK.
+    \endtable
+    \endomit
+
+    \omit
+    \image rgbController-configureConnection.png
+    \endomit
+
+    Repeat the step (in reverse order), clicking on the spin box and dragging
+    the cursor towards the slider, to connect the spin box's
+    \l{QSpinBox::}{valueChanged()} signal to the slider's
+    \l{QAbstractSlider::value()}{setValue()} slot.
+
+    Now that you have successfully connected the objects for the "RED"
+    component of the RGB Controller, do the same for the "GREEN" and "BLUE"
+    components as well.
+
+    Since RGB values range between 0 and 255, we need to limit the spin box
+    and slider to that particular range.
+
+    \omit
+    \table
+        \row
+            \i \inlineimage rgbController-property-editing.png
+            \i \bold{Setting Widget Properties}
+
+        Click on the first spin box. Within the \gui{Property Editor}, you will
+        see \l{QSpinBox}'s properties. Enter "255" for the
+        \l{QSpinBox::}{maximum} property. Then, click on the first vertical
+        slider, you will see \l{QAbstractSlider}'s properties. Enter "255" for
+        the \l{QAbstractSlider::}{maximum} property as well. Repeat this
+        process for the remaining spin boxes and sliders.
+    \endtable
+    \endomit
+
+    Now, we preview your form to see how it would look in your application. To
+    preview your form, press \key{Ctrl + R} or select \gui Preview from the
+    \gui Form menu.
+
+    \omit
+    \image rgbController-preview.png
+    \endomit
+
+    Try dragging the slider - the spin box will mirror its value too (and vice
+    versa). Also, you can resize it to see how the layouts used to manage the
+    child widgets respond to different window sizes.
+*/
+
+
+/*!
+    \page designer-editing-mode.html
+    \previouspage Getting to Know Qt Designer
+    \contentspage {Qt Designer Manual}{Contents}
+    \nextpage Using Layouts in Qt Designer
+
+    \title Qt Designer's Editing Modes
+
+    \QD provides four editing modes: \l{Qt Designer's Widget Editing Mode}
+    {Widget Editing Mode}, \l{Qt Designer's Signals and Slots Editing Mode}
+    {Signals and Slots Editing Mode}, \l{Qt Designer's Buddy Editing Mode}
+    {Buddy Editing Mode} and \l{Qt Designer's Tab Order Editing Mode}
+    {Tab Order Editing Mode}. When working with \QD, you will always be in one
+    of these four modes. To switch between modes, simply select it from the
+    \gui{Edit} menu or the toolbar. The table below describes these modes in
+    further detail.
+
+    \table
+        \header \i  \i  \bold{Editing Modes}
+        \row
+            \i  \inlineimage designer-widget-tool.png
+            \i  In \l{Qt Designer's Widget Editing Mode}{Edit} mode, we can
+                change the appearance of the form, add layouts, and edit the
+                properties of each widget. To switch to this mode, press
+                \key{F3}. This is \QD's default mode.
+
+        \row
+            \i  \inlineimage designer-connection-tool.png
+            \i  In \l{Qt Designer's Signals and Slots Editing Mode}
+                {Signals and Slots} mode, we can connect widgets together using
+                Qt's signals and slots mechanism. To switch to this mode, press
+                \key{F4}.
+
+        \row
+            \i  \inlineimage designer-buddy-tool.png
+            \i  In \l{Qt Designer's Buddy Editing Mode}{Buddy Editing Mode},
+                buddy widgets can be assigned to label widgets to help them
+                handle keyboard focus correctly.
+
+        \row
+            \i  \inlineimage designer-tab-order-tool.png
+            \i  In \l{Qt Designer's Tab Order Editing Mode}
+                {Tab Order Editing Mode}, we can set the order in which widgets
+                receive the keyboard focus.
+    \endtable
+
+*/
+
+
+/*!
+    \page designer-widget-mode.html
+    \previouspage Qt Designer's Editing Modes
+    \contentspage {Qt Designer Manual}{Contents}
+    \nextpage Qt Designer's Signals and Slots Editing Mode
+
+    \title Qt Designer's Widget Editing Mode
+
+    \image designer-editing-mode.png
+
+    In the Widget Editing Mode, objects can be dragged from the main window's
+    widget box to a form, edited, resized, dragged around on the form, and even
+    dragged between forms. Object properties can be modified interactively, so
+    that changes can be seen immediately. The editing interface is intuitive
+    for simple operations, yet it still supports Qt's powerful layout
+    facilities.
+
+
+    \tableofcontents
+
+    To create and edit new forms, open the \gui File menu and select
+    \gui{New Form...} or press \key{Ctrl+N}. Existing forms can also be edited
+    by selecting \gui{Open Form...} from the \gui File menu or pressing
+    \key{Ctrl+O}.
+
+    At any point, you can save your form by selecting the \gui{Save From As...}
+    option from the \gui File menu. The \c{.ui} files saved by \QD contain
+    information about the objects used, and any details of signal and slot
+    connections between them.
+
+
+    \section1 Editing A Form
+
+    By default, new forms are opened in widget editing mode. To switch to Edit
+    mode from another mode, select \gui{Edit Widgets} from the \gui Edit menu
+    or press the \key F3 key.
+
+    Objects are added to the form by dragging them from the main widget box
+    and dropping them in the desired location on the form. Once there, they
+    can be moved around simply by dragging them, or using the cursor keys.
+    Pressing the \key Ctrl key at the same time moves the selected widget
+    pixel by pixel, while using the cursor keys alone make the selected widget
+    snap to the grid when it is moved. Objects can be selected by clicking on
+    them with the left mouse button. You can also use the \key Tab key to
+    change the selection.
+
+    ### Screenshot of widget box, again
+
+    The widget box contains objects in a number of different categories, all of
+    which can be placed on the form as required. The only objects that require
+    a little more preparation are the \gui Container widgets. These are
+    described in further detail in the \l{Using Containers in Qt Designer}
+    chapter.
+
+
+    \target SelectingObjects
+    \table
+        \row
+            \i  \inlineimage designer-selecting-widget.png
+            \i  \bold{Selecting Objects}
+
+        Objects on the form are selected by clicking on them with the left
+        mouse button. When an object is selected, resize handles are shown at
+        each corner and the midpoint of each side, indicating that it can be
+        resized.
+
+        To select additional objects, hold down the \key Shift key and click on
+        them. If more than one object is selected, the current object will be
+        displayed with resize handles of a different color.
+
+        To move a widget within a layout, hold down \key Shift and \key Control
+        while dragging the widget. This extends the selection to the widget's
+        parent layout.
+
+        Alternatively, objects can be selected in the
+        \l{The Object Inspector}{Object Inspector}.
+    \endtable
+
+    When a widget is selected, normal clipboard operations such as cut, copy,
+    and paste can be performed on it. All of these operations can be done and
+    undone, as necessary.
+
+    The following shortcuts can be used:
+
+    \target ShortcutsForEditing
+    \table
+        \header \i Action       \i Shortcut     \i Description
+        \row
+            \i Cut
+            \i \key{Ctrl+X}
+            \i Cuts the selected objects to the clipboard.
+        \row
+            \i Copy
+            \i \key{Ctrl+C}
+            \i Copies the selected objects to the clipboard.
+        \row
+            \i Paste
+            \i \key{Ctrl+V}
+            \i Pastes the objects in the clipboard onto the form.
+        \row
+            \i Delete
+            \i \key Delete
+            \i Deletes the selected objects.
+        \row
+            \i Clone object
+            \i \key{Ctrl+drag} (leftmouse button)
+            \i Makes a copy of the selected object or group of objects.
+        \row
+            \i Preview
+            \i \key{Ctrl+R}
+            \i Shows a preview of the form.
+    \endtable
+
+    All of the above actions (apart from cloning) can be accessed via both the
+    \gui Edit menu and the form's context menu. These menus also provide
+    funcitons for laying out objects as well as a \gui{Select All} function to
+    select all the objects on the form.
+
+    Widgets are not unique objects; you can make as many copies of them as you
+    need. To quickly duplicate a widget, you can clone it by holding down the
+    \key Ctrl key and dragging it. This allows widgets to be copied and placed
+    on the form more quickly than with clipboard operations.
+
+
+    \target DragAndDrop
+    \table
+        \row
+            \i \inlineimage designer-dragging-onto-form.png
+            \i \bold{Drag and Drop}
+
+        \QD makes extensive use of the drag and drop facilities provided by Qt.
+        Widgets can be dragged from the widget box and dropped onto the form.
+
+        Widgets can also be "cloned" on the form: Holding down \key Ctrl and
+        dragging the widget creates a copy of the widget that can be dragged to
+        a new position.
+
+        It is also possible to drop Widgets onto the \l {The Object Inspector}
+        {Object Inspector} to handle nested layouts easily.
+    \endtable
+
+    \QD allows selections of objects to be copied, pasted, and dragged between
+    forms. You can use this feature to create more than one copy of the same
+    form, and experiment with different layouts in each of them.
+
+
+    \section2 The Property Editor
+
+    The Property Editor always displays properties of the currently selected
+    object on the form. The available properties depend on the object being
+    edited, but all of the widgets provided have common properties such as
+    \l{QObject::}{objectName}, the object's internal name, and
+    \l{QWidget::}{enabled}, the property that determines whether an
+    object can be interacted with or not.
+
+
+    \target EditingProperties
+    \table
+        \row
+            \i \inlineimage designer-property-editor.png
+            \i \bold{Editing Properties}
+
+        The property editor uses standard Qt input widgets to manage the
+        properties of jbects on the form. Textual properties are shown in line
+        edits, integer properties are displayed in spinboxes, boolean
+        properties are displayed in check boxes, and compound properties such
+        as colors and sizes are presented in drop-down lists of input widgets.
+
+        Modified properties are indicated with bold labels. To reset them, click
+        the arrow button on the right.
+
+        Changes in properties are applied to all selected objects that have the
+        same property.
+    \endtable
+
+    Certain properties are treated specially by the property editor:
+
+    \list
+        \o Compound properties -- properties that are made up of more than one
+           value -- are represented as nodes that can be expanded, allowing
+           their values to be edited.
+        \o Properties that contain a choice or selection of flags are edited
+           via combo boxes with checkable items.
+        \o Properties that allow access to rich data types, such as QPalette,
+           are modified using dialogs that open when the properties are edited.
+           QLabel and the widgets in the \gui Buttons section of the widget box
+           have a \c text property that can also be edited by double-clicking
+           on the widget or by pressing \gui F2. \QD interprets the backslash
+           (\\) character specially, enabling newline (\\n) characters to be
+           inserted into the text; the \\\\ character sequence is used to 
+           insert a single backslash into the text. A context menu can also be
+           opened while editing, providing another way to insert special
+           characters and newlines into the text.
+    \endlist    
+
+
+    \section2 Dynamic Properties
+
+    The property editor can also be used to add new
+    \l{QObject#Dynamic Properties}{dynamic properties} to both standard Qt
+    widgets and to forms themselves. Since Qt 4.4, dynamic properties are added
+    and removed via the property editor's toolbar, shown below.
+
+    \image designer-property-editor-toolbar.png
+
+    To add a dynamic property, clcik on the \gui Add button 
+    \inlineimage designer-property-editor-add-dynamic.png
+    . To remove it, click on the \gui Remove button 
+    \inlineimage designer-property-editor-remove-dynamic.png
+     instead. You can also sort the properties alphabetically and change the
+    color groups by clickinig on the \gui Configure button 
+    \inlineimage designer-property-editor-configure.png
+    .
+
+    \section2 The Object Inspector
+    \table
+        \row
+            \i  \inlineimage designer-object-inspector.png
+            \i  \bold{The Object Inspector}
+
+        The \gui{Object Inspector} displays a hierarchical list of all the
+        objects on the form that is currently being edited. To show the child
+        objects of a container widget or a layout, click the handle next to the
+        object label.
+
+        Each object on a form can be selected by clicking on the corresponding
+        item in the \gui{Object Inspector}. Right-clicking opens the form's
+        context menu. These features can be useful if you have many overlapping
+        objects. To locate an object in the \gui{Object Inspector}, use
+        \key{Ctrl+F}.
+
+        Since Qt 4.4, double-clicking on the object's name allows you to change
+        the object's name with the in-place editor.
+
+        Since Qt 4.5, the \gui{Object Inspector} displays the layout state of
+        the containers. The broken layout icon ###ICON is displayed if there is
+        something wrong with the layouts.
+
+    \endtable
+*/
+
+
+/*!
+    \page designer-layouts.html
+    \previouspage Qt Designer's Widget Editing Mode
+    \contentspage
+    \nextpage Qt Designer's Signals and Slots Editing Mode
+
+    \title Using Layouts in Qt Designer
+
+    Before a form can be used, the objects on the form need to be placed into
+    layouts. This ensures that the objects will be displayed properly when the
+    form is previewed or used in an application. Placing objects in a layout
+    also ensures that they will be resized correctly when the form is resized.
+
+
+    \tableofcontents
+
+    \section1 Applying and Breaking Layouts
+
+    The simplest way to manage objects is to apply a layout to a group of
+    existing objects. This is achieved by selecting the objects that you need
+    to manage and applying one of the standard layouts using the main toolbar,
+    the \gui Form menu, or the form's context menu.
+
+    Once widgets have been inserted into a layout, it is not possible to move
+    and resize them individually because the layout itself controls the
+    geometry of each widget within it, taking account of the hints provided by
+    spacers. Instead, you must either break the layout and adjust each object's
+    geometry manually, or you can influence the widget's geometry by resizing
+    the layout.
+
+    To break the layout, press \key{Ctrl+0} or choose \gui{Break Layout} from
+    the form's context menu, the \gui Form menu or the main toolbar. You can
+    also add and remove spacers from the layout to influence the geometries of
+    the widgets.
+
+
+    \target InsertingObjectsIntoALayout
+    \table
+        \row
+            \i  \inlineimage designer-layout-inserting.png
+            \i  \bold{Inserting Objects into a Layout}
+
+        Objects can be inserted into an existing layout by dragging them from
+        their current positions and dropping them at the required location. A
+        blue cursor is displayed in the layout as an object is dragged over
+        it to indicate where the object will be added.
+    \endtable
+
+
+    \section2 Setting A Top Level Layout
+
+    The form's top level layout can be set by clearing the slection (click the
+    left mouse button on the form itself) and applying a layout. A top level
+    layout is necessary to ensure that your widgets will resize correctly when
+    its window is resized. To check if you have set a top level layout, preview
+    your widget and attempt to resize the window by dragging the size grip.
+
+    \table
+        \row
+            \i  \inlineimage designer-set-layout.png
+            \i  \bold{Applying a Layout}
+
+        To apply a layout, you can select your choice of layout from the
+        toolbar shown on the left, or from the context menu shown below.
+    \endtable
+
+    \image designer-set-layout2.png
+
+
+    \section2 Horizontal and Vertical Layouts
+    
+    The simplest way to arrange objects on a form is to place them in a
+    horizontal or vertical layout. Horizontal layouts ensure that the widgets
+    within are aligned horizontally; vertical layouts ensure that they are
+    aligned vertically.
+
+    Horizontal and vertical layouts can be combined and nested to any depth.
+    However, if you need more control over the placement of objects, consider
+    using the grid layout.
+
+
+    \section3 The Grid Layout
+
+    Complex form layouts can be created by placing objects in a grid layout.
+    This kind of layout gives the form designer much more freedom to arrange
+    widgets on the form, but can result in a much less flexible layout.
+    However, for some kinds of form layout, a grid arrangement is much more
+    suitable than a nested arrangement of horizontal and vertical layouts.
+
+
+    \section3 Splitter Layouts
+
+    Another common way to manage the layout of objects on a form is to place
+    them in a splitter. These splitters arrange the objects horizontally or
+    vertically in the same way as normal layouts, but also allow the user to
+    adjust the amount of space allocated to each object.
+
+    \image designer-splitter-layout.png
+
+    Although QSplitter is a container widget, \QD treats splitter objects as
+    layouts that are applied to existing widgets. To place a group of widgets
+    into a splitter, select them
+    \l{Qt Designer's Widget Editing Mode#SelectingObjects}{as described here}
+    then apply the splitter layout by using the appropriate toolbar button,
+    keyboard shortcut, or \gui{Lay out} context menu entry.
+
+
+    \section3 The Form Layout
+
+    Since Qt 4.4, another layout class has been included -- QFormLayout. This
+    class manages widgets in a two-column form; the left column holds labels
+    and the right column holds field widgets such as line edits, spin boxes,
+    etc. The QFormLayout class adheres to various platform look and feel
+    guidelines and supports wrapping for long rows.
+
+    \image designer-form-layout.png
+
+    The \c{.ui} file above results in the previews shown below.
+
+    \table
+        \header
+            \i  Windows XP
+            \i  Mac OS X
+            \i  Cleanlooks
+        \row
+            \i  \inlineimage designer-form-layout-windowsXP.png
+            \i  \inlineimage designer-form-layout-macintosh.png
+            \i  \inlineimage designer-form-layout-cleanlooks.png
+    \endtable
+
+
+    \section2 Shortcut Keys
+
+    In addition to the standard toolbar and context menu entries, there is also
+    a set of keyboard shortcuts to apply layouts on widgets.
+
+    \target LayoutShortcuts
+    \table
+        \header
+            \i  Layout
+            \i  Shortcut
+            \i  Description
+        \row
+            \i  Horizontal
+            \i  \key{Ctrl+1}
+            \i  Places the selected objects in a horizontal layout.
+        \row
+            \i  Vertical
+            \i  \key{Ctrl+2}
+            \i  Places the selected objects in a vertical layout.
+        \row
+            \i  Grid
+            \i  \key{Ctrl+5}
+            \i  Places the selected objects in a grid layout.
+        \row
+            \i  Form
+            \i  \key{Ctrl+6}
+            \i  Places the selected objects in a form layout.
+        \row
+            \i  Horizontal splitter
+            \i  \key{Ctrl+3}
+            \i  Creates a horizontal splitter and places the selected objects
+                inside it.
+        \row
+            \i  Vertical splitter
+            \i  \key{Ctrl+4}
+            \i  Creates a vertical splitter and places the selected objects
+                inside it.
+        \row
+            \i  Adjust size
+            \i  \key{Ctrl+J}
+            \i  Adjusts the size of the layout to ensure that each child object
+                has sufficient space to display its contents. See
+                QWidget::adjustSize() for more information.
+    \endtable
+
+    \note \key{Ctrl+0} is used to break a layout.
+
+*/
+
+
+/*!
+    \page designer-preview.html
+    \contentspage {Qt Designer Manual}{Contents}
+    \previouspage Using Layouts in Qt Designer
+    \nextpage Qt Designer's Buddy Editing Mode
+    \title Saving, Previewing and Printing Forms in Qt Designer
+
+    Although \QD's forms are accurate representations of the components being
+    edited, it is useful to preview the final appearance while editing. This
+    feature can be activated by opening the \gui Form menu and selecting
+    \gui Preview, or by pressing \key{Ctrl+R} when in the form.
+
+    \image designer-dialog-preview.png
+
+    The preview shows exactly what the final component will look like when used
+    in an application.
+
+    Since Qt 4.4, it is possible to preview forms with various skins - default
+    skins, skins created with Qt Style Sheets or device skins. This feature
+    simulates the effect of calling \c{QApplication::setStyleSheet()} in the
+    application.
+
+    To preview your form with skins, open the \gui Edit menu and select
+    \gui{Preferences...}
+
+    You will see the dialog shown below:
+
+    \image designer-preview-style.png
+
+    The \gui{Print/Preview Configuration} checkbox must be checked to activate
+    previews of skins. You can select the styles provided from the \gui{Style}
+    drop-down box.
+
+    \image designer-preview-style-selection.png
+
+    Alternatively, you can preview custom style sheet created with Qt Style
+    Sheets. The figure below shows an example of Qt Style Sheet syntax and the
+    corresponding output.
+
+    \image designer-preview-stylesheet.png
+
+    Another option would be to preview your form with device skins. A list of
+    generic device skins are available in \QD, however, you may also use
+    other QVFB skins with the \gui{Browse...} option.
+
+    \image designer-preview-deviceskin-selection.png
+
+
+    \section1 Viewing the Form's Code
+
+    Since Qt 4.4, it is possible to view code generated by the User Interface
+    Compiler (uic) for the \QD form.
+
+    \image designer-form-viewcode.png
+
+    Select \gui{View Code...} from the \gui{Form} menu and a dialog with the
+    generated code will be displayed. The screenshot below is an example of
+    code generated by the \c{uic}.
+
+    \image designer-code-viewer.png
+
+    \section1 Saving and Printing the Form
+
+    Forms created in \QD can be saved to an image or printed.
+
+    \table
+    \row
+    \i \inlineimage designer-file-menu.png
+    \i \bold{Saving Forms}
+
+    To save a form as an image, choose the \gui{Save Image...} option. The file
+    will be saved in \c{.png} format.
+
+    \bold{Printing Forms}
+
+    To print a form, select the \gui{Print...} option.
+
+    \endtable
+*/
+
+
+/*!
+    \page designer-connection-mode.html
+    \contentspage {Qt Designer Manual}{Contents}
+    \previouspage Using Layouts in Qt Designer
+    \nextpage Qt Designer's Buddy Editing Mode
+
+
+    \title Qt Designer's Signals and Slots Editing Mode
+
+    \image designer-connection-mode.png
+
+    In \QD's signals and slots editing mode, you can connect objects in a form
+    together using Qt's signals and slots mechanism. Both widgets and layouts
+    can be connected via an intuitive connection interface, using the menu of
+    compatible signals and slots provided by \QD. When a form is saved, all
+    connections are preserved so that they will be ready for use when your
+    project is built.
+
+
+    \tableofcontents
+
+    For more information on Qt's signals and sltos mechanism, refer to the
+    \l{Signals and Slots} document.
+
+
+    \section1 Connecting Objects
+
+    To begin connecting objects, enter the signals and slots editing mode by
+    opening the \gui Edit menu and selecting \gui{Edit Signals/Slots}, or by
+    pressing the \key F4 key.
+
+    All widgets and layouts on the form can be connected together. However,
+    spacers just provide spacing hints to layouts, so they cannot be connected
+    to other objects.
+
+    
+    \target HighlightedObjects
+    \table
+        \row
+            \i  \inlineimage designer-connection-highlight.png
+            \i  \bold{Highlighted Objects}
+
+        When the cursor is over an object that can be used in a connection, the
+        object will be highlighted.
+    \endtable
+
+    To make a connectionn, press the left mouse button and drag the cursor
+    towards the object you want to connect it to. As you do this, a line will
+    extend from the source object to the cursor. If the cursor is over another
+    object on the form, the line will end with an arrow head that points to the
+    destination object. This indicates that a connection will be made between
+    the two objects when you release the mouse button.
+
+    You can abandon the connection at any point while you are dragging the
+    connection path by pressing \key{Esc}.
+
+    \target MakingAConnection
+    \table
+        \row
+            \i  \inlineimage designer-connection-making.png
+            \i  \bold{Making a Connection}
+
+        The connection path will change its shape as the cursor moves around
+        the form. As it passes over objects, they are highlighted, indicating
+        that they can be used in a signal and slot connection. Release the
+        mouse button to make the connection.
+    \endtable
+
+    The \gui{Configure Connection} dialog (below) is displayed, showing signals
+    from the source object and slots from the destination object that you can
+    use.
+
+    \image designer-connection-dialog.png
+
+    To complete the connection, select a signal from the source object and a 
+    slot from the destination object, then click \key OK. Click \key Cancel if
+    you wish to abandon the connection.
+
+    \note If the \gui{Show all signals and slots} checkbox is selected, all
+    available signals from the source object will be shown. Otherwise, the
+    signals and slots inherited from QWidget will be hidden.
+
+    You can make as many connections as you like between objects on the form;
+    it is possible to connect signals from objects to slots in the form itself.
+    As a result, the signal and slot connections in many dialogs can be
+    completely configured from within \QD.
+
+    \target ConnectingToTheForm
+    \table
+        \row
+            \i  \inlineimage designer-connection-to-form.png
+            \i  \bold{Connecting to a Form}
+
+        To connect an object to the form itself, simply position the cursor
+        over the form and release the mouse button. The end point of the
+        connection changes to the electrical "ground" symbol.
+    \endtable
+
+
+    \section1 Editing and Deleting Connections
+
+    By default, connection paths are created with two labels that show the
+    signal and slot involved in the connection. These labels are usually
+    oriented along the line of the connection. You can move them around inside
+    their host widgets by dragging the red square at each end of the connection
+    path.
+
+    \target ConnectionEditor
+    \table
+        \row
+            \i  \inlineimage designer-connection-editor.png
+            \i  \bold{The Signal/Slot Editor}
+
+        The signal and slot used in a connection can be changed after it has
+        been set up. When a connection is configured, it becomes visible in
+        \QD's signal and slot editor where it can be further edited. You can
+        also edit signal/slot connections by double-clicking on the connection
+        path or one of its labels to display the Connection Dialog.
+    \endtable
+
+    \target DeletingConnections
+    \table
+        \row
+            \i  \inlineimage designer-connection-editing.png
+            \i  \bold{Deleting Connections}
+
+        The whole connection can be selected by clicking on any of its path
+        segments. Once selected, a connection can be deleted with the
+        \key Delete key, ensuring that it will not be set up in the \c{.ui}
+        file.
+    \endtable
+*/
+
+
+/*!
+    \page designer-buddy-mode.html
+    \contentspage{Qt Designer Manual}{Contents}
+    \previouspage Qt Designer's Signals and Slots Editing Mode
+    \nextpage Qt Designer's Tab Order Editing Mode
+
+    \title Qt Designer's Buddy Editing Mode
+
+    \image designer-buddy-mode.png
+
+    One of the most useful basic features of Qt is the support for buddy
+    widgets. A buddy widget accepts the input focus on behalf of a QLabel when
+    the user types the label's shortcut key combination. The buddy concept is
+    also used in Qt's \l{Model/View Programming}{model/view} framework.
+
+
+    \section1 Linking Labels to Buddy Widgets
+
+    To enter buddy editing mode, open the \gui Edit menu and select
+    \gui{Edit Buddies}. This mode presents the widgets on the form in a similar
+    way to \l{Qt Designer's Signals and Slots Editing Mode}{signals and slots
+    editing mode} but in this mode, connections must start at label widgets.
+    Ideally, you should connect each label widget that provides a shortcut with
+    a suitable input widget, such as a QLineEdit.
+
+
+    \target MakingBuddies
+    \table
+        \row
+            \i  \inlineimage designer-buddy-making.png
+            \i  \bold{Making Buddies}
+
+        To define a buddy widget for a label, click on the label, drag the
+        connection to another widget on the form, and release the mouse button.
+        The connection shown indicates how input focus is passed to the buddy
+        widget. You can use the form preview to test the connections between
+        each label and its buddy.
+    \endtable
+
+
+    \section1 Removing Buddy Connections
+
+    Only one buddy widget can be defined for each label. To change the buddy
+    used, it is necessary to delete any existing buddy connection before you
+    create a new one.
+
+    Connections between labels and their buddy widgets can be deleted in the
+    same way as signal-slot connections in signals and slots editing mode:
+    Select the buddy connection by clicking on it and press the \key Delete
+    key. This operation does not modify either the label or its buddy in any
+    way.
+*/
+
+
+/*!
+    \page designer-tab-order.html
+    \contentspage {Qt Designer Manual}{Contents}
+    \previouspage Qt Designer's Buddy Editing Mode
+    \nextpage Using Containers in Qt Designer
+
+    \title Qt Designer's Tab Order Editing Mode
+
+    \image designer-tab-order-mode.png
+
+    Many users expect to be able to navigate between widgets and controls
+    using only the keyboard. Qt lets the user navigate between input widgets
+    with the \key Tab and \key{Shift+Tab} keyboard shortcuts. The default
+    \e{tab order} is based on the order in which widgets are constructed.
+    Although this order may be sufficient for many users, it is often better
+    to explicitly specify the tab order to make your application easier to
+    use.
+
+
+    \section1 Setting the Tab Order
+
+    To enter tab order editing mode, open the \gui Edit menu and select
+    \gui{Edit Tab Order}. In this mode, each input widget in the form is shown
+    with a number indicating its position in the tab order. So, if the user
+    gives the first input widget the input focus and then presses the tab key,
+    the focus will move to the second input widget, and so on.
+
+    The tab order is defined by clicking on each of the numbers in the correct
+    order. The first number you click will change to red, indicating the
+    currently edited position in the tab order chain. The widget associated
+    with the number will become the first one in the tab order chain. Clicking
+    on another widget will make it the second in the tab order, and so on.
+
+    Repeat this process until you are satisfied with the tab order in the form
+    -- you do not need to click every input widget if you see that the
+    remaining widgets are already in the correct order. Numbers, for which you
+    already set the order, change to green, while those which are not clicked
+    yet, remain blue.
+
+    If you make a mistake, simply double click outside of any number or choose
+    \gui{Restart} from the form's context menu to start again. If you have many
+    widgets on your form and would like to change the tab order in the middle or
+    at the end of the tab order chain, you can edit it at any position. Press
+    \key{Ctrl} and click the number from which you want to start.
+    Alternatively, choose \gui{Start from Here} in the context menu.
+
+*/
+
+
+/*!
+    \page designer-using-containers.html
+    \contentspage {Qt Designer Manual}{Contents}
+    \previouspage Qt Designer's Tab Order Editing Mode
+    \nextpage Creating Main Windows in Qt Designer
+
+
+    \title Using Containers in Qt Designer
+
+    Container widgets provide high level control over groups of objects on a
+    form. They can be used to perform a variety of functions, such as managing
+    input widgets, providing paged and tabbed layouts, or just acting as
+    decorative containers for other objects.
+
+    \image designer-widget-morph.png
+
+    \QD provides visual feedback to help you place objects inside your
+    containers. When you drag an object from the widget box (or elsewhere) on
+    the form, each container will be highlighted when the cursor is positioned
+    over it. This indicates that you can drop the object inside, making it a
+    child object of the container. This feedback is important because it is
+    easy to place objects close to containers without actually placing them
+    inside. Both widgets and spacers can be used inside containers.
+
+    Stacked widgets, tab widgets, and toolboxes are handled specially in \QD.
+    Norwally, when adding pages (tabs, pages, compartments) to these containers
+    in your own code, you need to supply existing widgets, either as
+    placeholders or containing child widgets. In \QD, these are automatically
+    created for you, so you can add child objects to each page straight away.
+
+    Each container typically allows its child objects to be arranged in one or
+    more layouts. The type of layout management provided depends on each
+    container, although setting the layout is usually just a matter of
+    selecting the container by clicking it, and applying a layout. The table
+    below shows a list of available containers.
+
+    \table
+        \row
+            \i  \inlineimage designer-containers-frame.png
+            \i  \bold Frames
+
+        Frames are used to enclose and group widgets, as well as to provide
+        decoration. They are used as the foundation for more complex
+        containers, but they can also be used as placeholders in forms.
+
+        The most important properties of frames are \c frameShape,
+        \c frameShadow, \c lineWidth, and \c midLineWidth. These are described
+        in more detail in the QFrame class description.
+
+        \row
+            \i  \inlineimage designer-containers-groupbox.png
+            \i  \bold{Group Boxes}
+
+        Group boxes are usually used to group together collections of
+        checkboxes and radio buttons with similar purposes.
+
+        Among the significant properties of group boxes are \c title, \c flat,
+        \c checkable, and \c checked. These are demonstrated in the
+        \l{widgets/groupbox}{Group Box} example, and described in the QGroupBox
+        class documentation. Each group box can contain its own layout, and
+        this is necessary if it contains other widgets. To add a layout to the
+        group box, click inside it and apply the layout as usual.
+
+        \row
+            \i  \inlineimage designer-containers-stackedwidget.png
+            \i  \bold{Stacked Widgets}
+
+        Stacked widgets are collections of widgets in which only the topmost
+        layer is visible. Control over the visible layer is usually managed by
+        another widget, such as combobox, using signals and slots.
+
+        \QD shows arrows in the top-right corner of the stack to allow you to
+        see all the widgets in the stack when designing it. These arrows do not
+        appear in the preview or in the final component. To navigate between
+        pages in the stack, select the stacked widget and use the
+        \gui{Next Page} and \gui{Previous Page} entries from the context menu.
+        The \gui{Insert Page} and \gui{Delete Page} context menu options allow
+        you to add and remove pages.
+
+        \row
+            \i  \inlineimage designer-containers-tabwidget.png
+            \i  \bold{Tab Widgets}
+
+        Tab widgets allow the developer to split up the contents of a widget
+        into different labelled sections, only one of which is displayed at any
+        given time. By default, the tab widget contains two tabs, and these can
+        be deleted or renamed as required. You can also add additional tabs.
+
+        To delete a tab:
+        \list
+            \o  Click on its label to make it the current tab.
+            \o  Select the tab widget and open its context menu.
+            \o  Select \gui{Delete Page}.
+        \endlist
+
+        To add a new tab:
+        \list
+            \o  Select the tab widget and open its context menu.
+            \o  Select \gui{Insert Page}.
+            \o  You can add a page before or after the \e current page. \QD
+                will create a new widget for that particular tab and insert it
+                into the tab widget.
+            \o  You can set the title of the current tab by changing the
+                \c currentTabText property in the \gui{Property Editor}.
+        \endlist
+
+        \row
+            \i  \inlineimage designer-containers-toolbox.png
+            \i  \bold{ToolBox Widgets}
+
+        Toolbox widgets provide a series of pages or compartments in a toolbox.
+        They are handled in a way similar to stacked widgets.
+
+        To rename a page in a toolbox, make the toolbox your current pange and
+        change its \c currentItemText property from the \gui{Property Editor}.
+
+        To add a new page, select \gui{Insert Page} from the toolbox widget's
+        context menu. You can add the page before or after the current page.
+
+        To delete a page, select \gui{Delete Page} from the toolbox widget's
+        context menu.
+
+        \row
+            \i  \inlineimage designer-containers-dockwidget.png
+            \i  \bold{Dock Widgets}
+
+        Dock widgets are floating panels, often containing input widgets and
+        more complex controls, that are either attached to the edges of the
+        main window in "dock areas", or floated as independent tool windows.
+
+        Although dock widgets can be added to any type of form, they are
+        typically used with forms created from the
+        \l{Creating Main Windows in Qt Designer}{main window template}.
+
+    \endtable
+*/
+
+
+/*!
+    \page designer-creating-mainwindows.html
+    \contentspage {Qt Designer Manual}{Contents}
+    \previouspage Using Containers in Qt Designer
+    \nextpage Editing Resources with Qt Designer
+
+    \title Creating Main Windows in Qt Designer
+
+    \QD can be used to create user interfaces for different purposes, and
+    it provides different kinds of form templates for each user interface. The
+    main window template is used to create application windows with menu bars,
+    toolbars, and dock widgets.
+
+    \omit
+    \image designer-mainwindow-example.png
+    \endomit
+
+    Create a new main window by opening the \gui File menu and selecting the
+    \gui{New Form...} option, or by pressing \key{Ctrl+N}. Then, select the
+    \gui{Main Window} template. This template provides a main application
+    window containing a menu bar and a toolbar by default -- these can be
+    removed if they are not required.
+
+    If you remove the menu bar, a new one can be created by selecting the
+    \gui{Create Menu Bar} option from the context menu, obtained by
+    right-clicking within the main window form.
+
+    An application can have only \bold one menu bar, but \bold several
+    toolbars.
+
+
+    \section1 Menus
+
+    Menus are added to the menu bar by modifying the \gui{Type Here}
+    placeholders. One of these is always present for editing purposes, and
+    will not be displayed in the preview or in the finished window.
+
+    Once created, the properties of a menu can be accessed using the
+    \l{Qt Designer's Widget Editing Mode#The Property Editor}{Property Editor},
+    and each menu can be accessed for this purpose via the
+    \l{Qt Designer's Widget Editing Mode#The Object Inspector}{The Object Inspector}.
+
+    Existing menus can be removed by opening a context menu over the label in
+    the menu bar, and selecting \gui{Remove Menu 'menu_name'}.
+
+
+    \target CreatingAMenu
+    \table
+        \row
+            \i  \inlineimage designer-creating-menu1.png
+            \i  \inlineimage designer-creating-menu2.png
+            \i  \bold{Creating a Menu}
+
+        Double-click the placeholder item to begin editing. The menu text,
+        displayed using a line edit, can be modified.
+
+        \row
+            \i  \inlineimage designer-creating-menu3.png
+            \i  \inlineimage designer-creating-menu4.png
+            \i  Insert the required text for the new menu. Inserting an
+                ampersand character (&) causes the letter following it to be
+                used as a mnemonic for the menu.
+
+        Press \key Return or \key Enter to accept the new text, or press
+        \key Escape to reject it. You can undo the editing operation later if
+        required.
+    \endtable
+
+    Menus can also be rearranged in the menu bar simply by dragging and
+    dropping them in the preferred location. A vertical red line indicates the
+    position where the menu will be inserted.
+
+    Menus can contain any number of entries and separators, and can be nested
+    to the required depth. Adding new entries to menus can be achieved by
+    navigating the menu structure in the usual way.
+
+    \target CreatingAMenuEntry
+    \table
+        \row
+            \i  \inlineimage designer-creating-menu-entry1.png
+            \i  \inlineimage designer-creating-menu-entry2.png
+            \i  \bold{Creating a Menu Entry}
+
+        Double-click the \gui{new action} placeholder to begin editing, or
+        double-click \gui{new separator} to insert a new separator line after
+        the last entry in the menu.
+
+        The menu entry's text is displayed using a line edit, and can be
+        modified.
+
+        \row
+            \i  \inlineimage designer-creating-menu-entry3.png
+            \i  \inlineimage designer-creating-menu-entry4.png
+            \i  Insert the required text for the new entry, optionally using
+                the ampersand character (&) to mark the letter to use as a
+                mnemonic for the entry.
+
+        Press \key Return or \key Enter to accept the new text, or press
+        \key Escape to reject it. The action created for this menu entry will
+        be accessible via the \l{#TheActionEditor}{Action Editor}, and any
+        associated keyboard shortcut can be set there.
+    \endtable
+
+    Just like with menus, entries can be moved around simply by dragging and
+    dropping them in the preferred location. When an entry is dragged over a
+    closed menu, the menu will open to allow it to be inserted there. Since
+    menu entries are based on actions, they can also be dropped onto toolbars,
+    where they will be displayed as toolbar buttons.
+
+
+    \section1 Toolbars
+
+
+    ### SCREENSHOT
+
+    Toolbars ared added to a main window in a similar way to the menu bar:
+    Select the \gui{Add Tool Bar} option from the form's context menu.
+    Alternatively, if there is an existing toolbar in the main window, you can
+    click the arrow on its right end to create a new toolbar.
+
+    Toolbar buttons are created using the action system to populate each
+    toolbar, rather than by using specific button widgets from the widget box.
+    Since actions can be represented by menu entries and toolbar buttons, they
+    can be moved between menus and toolbars. To share an action between a menu
+    and a toolbar, drag its icon from the \l{#TheActionEditor}{Action Editor}
+    to the toolbar rather than from the menu where its entry is located.
+
+    New actions for menus and toolbars can be created in the
+    \l{#TheActionEditor}{Action Editor}.
+
+
+    \section1 Actions
+
+    With the menu bar and the toolbars in place, it's time to populate them
+    with action: \QD provides an action editor to simplify the creation and
+    management of actions.
+
+
+    \target TheActionEditor
+    \table
+        \row
+            \i  \inlineimage designer-action-editor.png
+            \i  \bold{The Action Editor}
+
+        Enable the action editor by opening the \gui Tools menu, and switching
+        on the \gui{Action Editor} option.
+
+        The action editor allows you to create \gui New actions and \gui Delete
+        actions. It also provides a search function, \gui Filter, using the
+        action's text.
+
+        \QD's action editor can be viewed in the classic \gui{Icon View} and
+        \gui{Detailed View}. The screenshot below shows the action editor in
+        \gui{Detailed View}. You can also copy and paste actions between menus,
+        toolbars and forms.
+    \endtable
+
+    To create an action, use the action editor's \gui New button, which will
+    then pop up an input dialog. Provide the new action with a \gui Text --
+    this is the text that will appear in a menu entry and as the action's
+    tooltip. The text is also automatically added to an "action" prefix,
+    creating the action's \gui{Object Name}.
+
+    In addition, the dialog provides the option of selecting an \gui Icon for
+    the action, as well as removing the current icon.
+
+    Once the action is created, it can be used wherever actions are applicable.
+
+
+    \target AddingAnAction
+    \table
+        \row
+            \i  \inlineimage designer-adding-menu-action.png
+            \i  \inlineimage designer-adding-toolbar-action.png
+            \i  \bold{Adding an Action}
+
+        To add an action to a menu or a toolbar, simply press the left mouse
+        button over the action in the action editor, and drag it to the
+        preferred location.
+
+        \QD provides highlighted guide lines that tell you where the action
+        will be added. Release the mouse button to add the action when you have
+        found the right spot.
+    \endtable
+
+
+    \section1 Dock Widgets
+
+    Since dock widgets are \l{Using Containers in Qt Designer}
+    {container widgets}, they can be added to a form in the usuasl way. Once
+    added to a form, dock widgets are not placed in any particular dock area by
+    default; you need to set the \gui{docked} property to true for each widget
+    and choose an appropriate value for its \gui{dockWidgetArea} property.
+
+    \target AddingADockWidget
+    \table
+        \row
+            \i  \inlineimage designer-adding-dockwidget.png
+            \i  \bold{Adding a Dock Widget}
+
+        To add a dock widget, simply drag one from the \gui Containers section
+        of the widget box, and drop it onto the main form area. Just like other
+        widgets, its properties can be modified with the \gui{Property Editor}.
+
+        Dock widgets can be optionally floated as indpendent tool windows.
+        Hence, it is useful to give them window titles by setting their
+        \gui{windowTitle} property. This also helps to identify them on the
+        form.
+
+    \endtable
+*/
+
+
+/*!
+    \page designer-resources.html
+    \contentspage {Qt Designer Manual}{Contents}
+    \previouspage Creating Main Windows in Qt Designer
+    \nextpage Using Stylesheets with Qt Designer
+
+    \title Editing Resources with Qt Designer
+
+    \image designer-resources-editing.png
+
+    \QD fully supports the \l{The Qt Resource System}{Qt Resource System},
+    enabling resources to be specified together with forms as they are
+    designed. To aid designers and developers manage resources for their
+    applications, \QD's resource editor allows resources to be defined on a
+    per-form basis. In other words, each form can have a separate resource
+    file.
+
+    \section1 Defining a Resource File
+
+    To specify a resource file you must enable the resource editor by opening
+    the \gui Tools menu, and switching on the \gui{Resource Browser} option.
+
+    \target ResourceFiles
+    \table
+        \row
+            \i  \inlineimage designer-resource-browser.png
+            \i  \bold{Resource Files}
+
+        Within the resource browser, you can open existing resource files or
+        create new ones. Click the \gui{Edit Resources} button 
+        \inlineimage designer-edit-resources-button.png
+         to edit your resources. To reload resources, click on the \gui Reload
+        button 
+        \inlineimage designer-reload-resources-button.png
+        .
+    \endtable
+
+
+    Once a resource file is loaded, you can create or remove entries in it
+    using the given \gui{Add Files} 
+    \inlineimage designer-add-resource-entry-button.png 
+    and \gui{Remove Files} 
+    \inlineimage designer-remove-resource-entry-button.png
+     buttons, and specify resources (e.g., images) using the \gui{Add Files}
+    button 
+    \inlineimage designer-add-files-button.png
+    . Note that these resources must reside within the current resource file's
+    directory or one of its subdirectories.
+
+
+    \target EditResource
+    \table
+        \row
+            \i  \inlineimage designer-edit-resource.png
+            \i  \bold{Editing Resource Files}
+
+        Press the 
+        \inlineimage designer-add-resource-entry-button.png
+         button to add a new resource entry to the file. Then use the
+        \gui{Add Files} button 
+        \inlineimage designer-add-files-button.png
+         to specify the resource.
+
+        You can remove resources by selecting the corresponding entry in the
+        resource editor, and pressing the 
+        \inlineimage designer-remove-resource-entry-button.png
+         button.
+    \endtable
+
+
+    \section1 Using the Resources
+
+    Once the resources are defined you can use them actively when composing
+    your form. For example, you might want to create a tool button using an
+    icon specified in the resource file.
+
+    \target UsingResources
+    \table
+        \row
+            \i  \inlineimage designer-resources-using.png
+            \i  \bold{Using Resources}
+
+        When changing properties with values that may be defined within a
+        resource file, \QD's property editor allows you to specify a resource
+        in addition to the option of selecting a source file in the ordinary
+        way.
+
+        \row
+            \i  \inlineimage designer-resource-selector.png
+            \i  \bold{Selecting a Resource}
+
+        You can open the resource selector by clicking \gui{Choose Resource...}
+        to add resources any time during the design process.
+
+\omit
+... check with Friedemann
+To quickly assign icon pixmaps to actions or pixmap properties, you may
+drag the pixmap from the resource editor to the action editor, or to the
+pixmap property in the property editor.
+\endomit
+
+    \endtable
+*/
+
+
+/*!
+    \page designer-stylesheet.html
+    \contentspage {Qt Designer Manual}{Contents}
+    \previouspage Editing Resources with Qt Designer
+    \nextpage Using a Designer .ui File in Your Application
+
+    \title Using Stylesheets with Qt Designer
+
+    Since Qt 4.2, it is possible to edit stylesheets in \QD with the stylesheet
+    editor.
+
+    \target UsingStylesheets
+    \table
+        \row
+            \i \inlineimage designer-stylesheet-options.png
+            \bold{Setting a Stylesheet}
+
+            The stylesheet editor can be accessed by right-clicking a widget
+            and selecting \gui{Change styleSheet...}
+
+        \row
+            \i \inlineimage designer-stylesheet-usage.png
+    \endtable
+
+*/
+
+
+/*!
+    \page designer-using-a-ui-file.html
+    \previouspage Using Stylesheets with Qt Designer
+    \contentspage {Qt Designer Manual}{Contents}
+    \nextpage Using Custom Widgets with Qt Designer
+
+    \title Using a Designer .ui File in Your Application
+
+    With Qt's integrated build tools, \l{qmake Manual}{qmake} and \l uic, the
+    code for user interface components created with \QD is automatically
+    generated when the rest of your application is built. Forms can be included
+    and used directly from your application. Alternatively, you can use them to
+    extend subclasses of standard widgets. These forms can be processed at
+    compile time or at run time, depending on the approach used.
+
+
+    \tableofcontents
+    \section1 Compile Time Form Processing
+
+    A compile time processed form can be used in your application with one of
+    the following approaches:
+
+    \list
+        \o  The Direct Approach: you construct a widget to use as a placeholder
+            for the component, and set up the user interface inside it.
+        \o  The Single Inheritance Approach: you subclass the form's base class
+            (QWidget or QDialog, for example), and include a private instance
+            of the form's user interface object.
+        \o  The MultipleInheritance Approach: you subclass both the form's base
+            class and the form's user interface object. This allows the widgets
+            defined in the form to be used directly from within the scope of
+            the subclass.
+    \endlist
+
+
+    \section2 The Direct Approach
+
+    To demonstrate how to use user interface (\c{.ui}) files straight from
+    \QD, we create a simple Calculator Form application. This is based on the
+    original \l{Calculator Form Example}{Calculator Form} example.
+
+    The application consists of one source file, \c main.cpp and a \c{.ui}
+    file.
+
+    The \c{calculatorform.ui} file designed with \QD is shown below:
+
+    \image directapproach-calculatorform.png
+
+    We will use \c qmake to build the executable, so we need to write a
+    \c{.pro} file:
+
+    \snippet doc/src/snippets/uitools/calculatorform/calculatorform.pro 0
+
+    The special feature of this file is the \c FORMS declaration that tells
+    \c qmake which files to process with \c uic. In this case, the
+    \c calculatorform.ui file is used to create a \c ui_calculatorform.h file
+    that can be used by any file listed in the \c SOURCES declaration. To
+    ensure that \c qmake generates the \c ui_calculatorform.h file, we need to
+    include it in a file listed in \c SOURCES. Since we only have \c main.cpp,
+    we include it there:
+
+    \snippet doc/src/snippets/uitools/calculatorform/main.cpp 0
+
+    This include is an additional check to ensure that we do not generate code
+    for \c .ui files that are not used.
+
+    The \c main function creates the calculator widget by constructing a
+    standard QWidget that we use to host the user interface described by the
+    \c calculatorform.ui file.
+
+    \snippet doc/src/snippets/uitools/calculatorform/main.cpp 1
+
+    In this case, the \c{Ui::CalculatorForm} is an interface description object
+    from the \c ui_calculatorform.h file that sets up all the dialog's widgets
+    and the connections between its signals and slots.
+
+    This approach provides a quick and easy way to use simple, self-contained
+    components in your applications, but many componens created with \QD will
+    require close integration with the rest of the application code. For
+    instance, the \c CalculatorForm code provided above will compile and run,
+    but the QSpinBox objects will not interact with the QLabel as we need a
+    custom slot to carry out the add operation and display the result in the
+    QLabel. To achieve this, we need to subclass a standard Qt widget (known as
+    the single inheritance approach).
+
+
+    \section2 The Single Inheritance Approach
+
+    In this approach, we subclass a Qt widget and set up the user interface
+    from within the constructor. Components used in this way expose the widgets
+    and layouts used in the form to the Qt widget subclass, and provide a
+    standard system for making signal and slot connections between the user
+    interface and other objects in your application.
+
+    This approach is used in the \l{Calculator Form Example}{Calculator Form}
+    example.
+
+    To ensure that we can use the user interface, we need to include the header
+    file that \c uic generates before referring to \c{Ui::CalculatorForm}:
+
+    \snippet examples/designer/calculatorform/calculatorform.h 0
+
+    This means that the \c{.pro} file must be updated to include
+    \c{calculatorform.h}:
+
+    \snippet examples/designer/calculatorform/calculatorform.pro 0
+
+    The subclass is defined in the following way:
+
+    \snippet examples/designer/calculatorform/calculatorform.h 1
+
+    The important feature of the class is the private \c ui object which
+    provides the code for setting up and managing the user interface.
+
+    The constructor for the subclass constructs and configures all the widgets
+    and layouts for the dialog just by calling the \c ui object's \c setupUi()
+    function. Once this has been done, it is possible to modify the user
+    interface as needed.
+
+    \snippet examples/designer/calculatorform/calculatorform.cpp 0
+
+    We can connect signals and slots in user interface widgets in the usual
+    way, taking care to prefix the \c ui object to each widget used.
+
+    The advantages of this approach are its simple use of inheritance to
+    provide a QWidget-based interface, and its encapsulation of the user
+    interface widget variables within the \c ui data member. We can use this
+    method to define a number of user interfaces within the same widget, each
+    of which is contained within its own namespace, and overlay (or compose)
+    them. This approach can be used to create individual tabs from existing
+    forms, for example.
+
+
+    \section2 The Multiple Inheritance Approach
+
+    Forms created with \QD can be subclassed together with a standard
+    QWidget-based class. This approach makes all the user interface components
+    defined in the form directly accessible within the scope of the subclass,
+    and enables signal and slot connections to be made in the usual way with
+    the \l{QObject::connect()}{connect()} function.
+
+    This approach is used in the \l{Multiple Inheritance Example}
+    {Multiple Inheritance} example.
+
+    We need to include the header file that \c uic generates from the
+    \c calculatorform.ui file:
+
+    \snippet examples/uitools/multipleinheritance/calculatorform.h 0
+
+    The class is defined in a similar way to the one used in the
+    \l{The Single Inheritance Approach}{single inheritance approach}, except that
+    this time we inherit from \e{both} QWidget and \c{Ui::CalculatorForm}:
+
+    \snippet examples/uitools/multipleinheritance/calculatorform.h 1
+
+    We inherit \c{Ui::CalculatorForm} privately to ensure that the user
+    interface objects are private in our subclass. We can also inherit it with
+    the \c public or \c protected keywords in the same way that we could have
+    made \c ui public or protected in the previous case.
+
+    The constructor for the subclass performs many of the same tasks as the
+    constructor used in the \l{The Single Inheritance Approach}
+    {single inheritance} example:
+
+    \snippet examples/uitools/multipleinheritance/calculatorform.cpp 0
+
+    In this case, the widgets used in the user interface can be accessed in the
+    same say as a widget created in code by hand. We no longer require the
+    \c{ui} prefix to access them.
+
+    Subclassing using multiple inheritance gives us more direct access to the
+    contents of the form, is slightly cleaner than the single inheritance
+    approach, but does not conveniently support composition of multiple user
+    interfaces.
+
+
+    \section1 Run Time Form Processing
+
+    Alternatively, forms can be processed at run time, producing dynamically-
+    generated user interfaces. This can be done using the QtUiTools module
+    that provides the QUiLoader class to handle forms created with \QD.
+
+
+    \section2 The UiTools Approach
+
+    A resource file containing a \c{.ui} file is required to process forms at
+    run time. Also, the application needs to be configured to use the QtUiTools
+    module. This is done by including the following declaration in a \c qmake
+    project file, ensuring that the application is compiled and linked
+    appropriately.
+
+    \snippet doc/src/snippets/code/doc_src_designer-manual.qdoc 0
+
+    The QUiLoader class provides a form loader object to construct the user
+    interface. This user interface can be retrieved from any QIODevice, e.g.,
+    a QFile object, to obtain a form stored in a project's resource file. The
+    QUiLoader::load() function constructs the form widget using the user
+    interface description contained in the file.
+
+    The QtUiTools module classes can be included using the following directive:
+
+    \snippet doc/src/snippets/code/doc_src_designer-manual.qdoc 1
+
+    The QUiLoader::load() function is invoked as shown in this code from the
+    \l{Text Finder Example}{Text Finder} example:
+
+    \snippet examples/uitools/textfinder/textfinder.cpp 4
+
+    In a class that uses QtUiTools to build its user interface at run time, we
+    can locate objects in the form using qFindChild(). For example, in the
+    follownig code, we locate some components based on their object names and
+    widget types:
+
+    \snippet examples/uitools/textfinder/textfinder.cpp 1
+
+    Processing forms at run-time gives the developer the freedom to change a
+    program's user interface, just by changing the \c{.ui} file. This is useful
+    when customizing programs to suit various user needs, such as extra large
+    icons or a different colour scheme for accessibility support.
+
+
+    \section1 Automatic Connections
+
+    The signals and slots connections defined for compile time or run time
+    forms can either be set up manually or automatically, using QMetaObject's
+    ability to make connections between signals and suitably-named slots.
+
+    Generally, in a QDialog, if we want to process the information entered by
+    the user before accepting it, we need to connect the clicked() signal from
+    the \gui OK button to a custom slot in our dialog. We will first show an
+    example of the dialog in which the slot is connected by hand then compare
+    it with a dialog that uses automatic connection.
+
+
+    \section2 A Dialog Without Auto-Connect
+
+    We define the dialog in the same way as before, but now include a slot in
+    addition to the constructor:
+
+    \snippet doc/src/snippets/designer/noautoconnection/imagedialog.h 0
+
+    The \c checkValues() slot will be used to validate the values provided by
+    the user.
+
+    In the dialog's constructor we set up the widgets as before, and connect
+    the \gui Cancel button's \l{QPushButton::clicked()}{clicked()} signal to
+    the dialog's reject() slot. We also disable the
+    \l{QPushButton::autoDefault}{autoDefault} property in both buttons to
+    ensure that the dialog does not interfere with the way that the line edit
+    handles return key events:
+
+    \snippet doc/src/snippets/designer/noautoconnection/imagedialog.cpp 0
+    \dots
+    \snippet doc/src/snippets/designer/noautoconnection/imagedialog.cpp 1
+
+    We connect the \gui OK button's \l{QPushButton::clicked()}{clicked()}
+    signal to the dialog's checkValues() slot which we implement as follows:
+
+    \snippet doc/src/snippets/designer/noautoconnection/imagedialog.cpp 2
+
+    This custom slot does the minimum necessary to ensure that the data
+    entered by the user is valid - it only accepts the input if a name was
+    given for the image.
+
+    \section2 Widgets and Dialogs with Auto-Connect
+
+    Although it is easy to implement a custom slot in the dialog and connect
+    it in the constructor, we could instead use QMetaObject's auto-connection
+    facilities to connect the \gui OK button's clicked() signal to a slot in
+    our subclass. \c{uic} automatically generates code in the dialog's
+    \c setupUi() function to do this, so we only need to declare and
+    implement a slot with a name that follows a standard convention:
+
+    \snippet doc/src/snippets/code/doc_src_designer-manual.qdoc 2
+
+    Using this convention, we can define and implement a slot that responds to
+    mouse clicks on the \gui OK button:
+
+    \snippet doc/src/snippets/designer/autoconnection/imagedialog.h 0
+
+    Another example of automatic signal and slot connection would be the
+    \l{Text Finder Example}{Text Finder} with its \c{on_findButton_clicked()}
+    slot.
+
+    We use QMetaObject's system to enable signal and slot connections:
+
+    \snippet examples/uitools/textfinder/textfinder.cpp 2
+
+    This enables us to implement the slot, as shown below:
+
+    \snippet examples/uitools/textfinder/textfinder.cpp 6
+    \dots
+    \snippet examples/uitools/textfinder/textfinder.cpp 8
+
+    Automatic connection of signals and slots provides both a standard naming
+    convention and an explicit interface for widget designers to work to. By
+    providing source code that implements a given interface, user interface
+    designers can check that their designs actually work without having to
+    write code themselves.
+*/
+
+
+/*!
+    \page designer-customizing-forms.html
+    \contentspage {Qt Designer Manual}{Contents}
+    \previouspage Using Stylesheets with Qt Designer
+    \nextpage Using Custom Widgets with Qt Designer
+
+    \title Customizing Qt Designer Forms
+
+    \image designer-form-settings.png
+
+    When saving a form in \QD, it is stored as an \c .ui file. Several form
+    settings, for example the grid settings or the margin and spacing for the
+    default layout, are stored along with the form's components. These settings
+    are used when the \l uic generates the form's C++ code. For more
+    information on how to use forms in your application, see the
+    \l{Using a Designer .ui File in Your Application} section.
+
+
+    \section1 Modifying the Form Settings
+
+    To modify the form settings, open the \gui Form menu and select \gui{Form
+    Settings...}
+
+    In the forms settings dialog you can specify the \gui Author of the form.
+
+    You can also alter the margin and spacing properties for the form's default
+    layout (\gui {Layout Default}). These default layout properties will be
+    replaced by the corresponding \gui {Layout Function}, if the function is
+    specified, when \c uic generates code for the form. The form settings
+    dialog lets you specify functions for both the margin and the spacing.
+
+    \target LayoutFunction
+    \table
+    \row
+    \i \inlineimage designer-form-layoutfunction.png
+    \i \bold{Layout Function}
+
+    The default layout properties will be replaced by the corresponding
+    \gui{Layout Function}, when \c uic generates code for the form. This is
+    useful when different environments requires different layouts for the same
+    form.
+
+    To specify layout functions for the form's margin and spacing, check the
+    \gui{Layout Function} group box to enable the line edits.
+    \endtable
+
+    You can also specify the form's \gui{Include Hints}; i.e., provide a list
+    of the header files which will then be included in the form window's
+    associated \c .ui file. Header files may be local, i.e., relative to the
+    project's directory, \c "mywidget.h", or global, i.e. part of Qt or the
+    compilers standard libraries: \c <QtGui/QWidget>.
+
+    Finally, you can specify the function used to load pixmaps into the form
+    window (the \gui {Pixmap Function}).
+*/
+
+
+/*!
+    \page designer-using-custom-widgets.html
+    \contentspage {Qt Designer Manual}{Contents}
+    \previouspage Customizing Qt Designer Forms
+    \nextpage Creating Custom Widgets for Qt Designer
+
+    \title Using Custom Widgets with Qt Designer
+
+    \QD can display custom widgets through its extensible plugin mechanism,
+    allowing the range of designable widgets to be extended by the user and
+    third parties. This feature also allows \QD to optionally support
+    \l{Qt3Support}{Qt 3 compatibility widgets}. Alternatively, it is possible
+    to use existing widgets as placeholders for widget classes that provide
+    similar APIs.
+
+    Widgets from the Qt3Support library are made available via in \QD's support
+    for custom widgets.
+
+
+    \section1 Handling Custom Widgets
+
+    Although \QD supports all of the standard Qt widgets, and can be configured
+    to handle widgets supplied in the Qt3Support library, some specialized
+    widgets may not be available as standard for a number of reasons:
+
+    \list
+        \i Custom widgets may not be available at the time the user interface
+           is being designed.
+        \i Custom widgets may be platform-specific, and designers may be
+           developing the user interface on a different platform to end users.
+        \i The source code for a custom widget is not available, or the user
+           interface designers are unable to use the widget for non-technical
+           reasons.
+    \endlist
+
+    In the above situations, it is still possible to design forms with the aim
+    of using custom widgets in the application. To achieve this, we can use
+    the widget promotion feature of \QD.
+
+    In all other cases, where the source code to the custom widgets is
+    available, we can adapt the custom widget for use with \QD.
+
+
+    \section2 Promoting Widgets
+
+    \image designer-promoting-widgets.png
+
+    If some forms must be designed, but certain custom widgets are unavailble
+    to the designer, we can substitute similar widgets to represent the missing
+    widgets. For example, we might represent instances of a custom push button
+    class, \c MyPushButton, with instances of QPushButton and promote these to
+    \c MyPushButton so that \l{uic.html}{uic} generates suitable code for this
+    missing class.
+
+    When choosing a widget to use as a placeholder, it is useful to compare the
+    API of the missing widget with those of standard Qt widgets. For
+    specialized widgets that subclass standard classes, the obvious choice of
+    placeholder is the base class of the custom widget; for example, QSlider
+    might be used for specialized QSlider subclasses.
+
+    For specialized widgets that do not share a common API with standard Qt
+    widgets, it is worth considering adapting a custom widget for use in \QD.
+    If this is not possible then QWidget is the obvious choice for a
+    placeholder widget since it is the lowest common denominator for all
+    widgets.
+
+    To add a placeholder, select an object of a suitable base class and choose
+    \gui{Promote to ...} from the form's context menu. After entering the class
+    name and header file in the lower part of the dialog, choose \gui{Add}. The
+    placeholder class will now appear along with the base class in the upper
+    list. Click the \gui{Promote} button to accept this choice.
+
+    Now, when the form's context menu is opened over objects of the base class,
+    the placeholder class will appear in the \gui{Promote to} submenu, allowing
+    for convenient promotion of objects to that class.
+
+    A promoted widget can be reverted to its base class by choosing
+    \gui{Demote to} from the form's context menu.
+
+
+    \section2 User Defined Custom Widgets
+
+    \image worldtimeclockplugin-example.png
+
+    Custom widgets can be adapted for use with \QD, giving designers the
+    opportunity to configure the user interface using the actual widgets that
+    will be used in an application rather than placeholder widgets. The process
+    of creating a custom widget plugin is described in the
+    \l{Creating Custom Widgets for Qt Designer} chapter of this manual.
+
+    To use a plugin created in this way, it is necessary to ensure that the
+    plugin is located on a path that \QD searches for plugins. Generally,
+    plugins stored in \c{$QTDIR/plugins/designer} will be loaded when \QD
+    starts. Further information on building and installing plugins can be found
+    \l{Creating Custom Widgets for Qt Designer#BuildingandInstallingthePlugin}
+    {here}. You can also refer to the \l{How to Create Qt Plugins}
+    {Plugins HOWTO} document for information about creating plugins.
+*/
+
+
+/*!
+    \page designer-creating-custom-widgets.html
+    \previouspage Using Custom Widgets with Qt Designer
+    \contentspage {Qt Designer Manual}{Contents}
+    \nextpage Creating Custom Widget Extensions
+
+    \title Creating Custom Widgets for Qt Designer
+
+    \QD's plugin-based architecture allows user-defined and third party custom
+    widgets to be edited just like you do with standard Qt widgets. All of the
+    custom widget's features are made available to \QD, including widget
+    properties, signals, and slots. Since \QD uses real widgets during the form
+    design process, custom widgets will appear the same as they do when
+    previewed.
+
+    \image worldtimeclockplugin-example.png
+
+    The \l QtDesigner module provides you with the ability to create custom
+    widgets in \QD.
+
+
+    \section1 Getting Started
+
+    To integrate a custom widget with \QD, you require a suitable description
+    for the widget and an appropriate \c{.pro} file.
+
+
+    \section2 Providing an Interface Description
+
+    To inform \QD about the type of widget you want to provide, create a
+    subclass of QDesignerCustomWidgetInterface that describes the various
+    properties your widget exposes. Most of these are supplied by functions
+    that are pure virtual in the base class, because only the author of the
+    plugin can provide this information.
+
+    \table
+        \header
+            \o  Function
+            \o  Description of the return value
+        \row
+            \o  \c name()
+            \o  The name of the class that provides the widget.
+        \row
+            \o  \c group()
+            \o  The group in \QD's widget box that the widget belongs to.
+        \row
+            \o  \c toolTip()
+            \o  A short description to help users identify the widget in \QD.
+        \row
+            \o  \c whatsThis()
+            \o  A longer description of the widget for users of \QD.
+        \row
+            \o  \c includeFile()
+            \o  The header file that must be included in applications that use
+                this widget. This information is stored in .ui files and will
+                be used by \c uic to create a suitable \c{#includes} statement
+                in the code it generates for the form containing the custom
+                widget.
+        \row
+            \o  \c icon()
+            \o  An icon that can be used to represent the widget in \QD's
+                widget box.
+        \row
+            \o  \c isContainer()
+            \o  True if the widget will be used to hold child widgets;
+                false otherwise.
+        \row
+            \o  \c createWidget()
+            \o  A QWidget pointer to an instance of the custom widget,
+                constructed with the parent supplied.
+                \note createWidget() is a factory function responsible for
+                creating the widget only. The custom widget's properties will
+                not be available until load() returns.
+        \row
+            \o  \c domXml()
+            \o  A description of the widget's properties, such as its object
+                name, size hint, and other standard QWidget properties.
+        \row
+            \o  \c codeTemplate()
+            \o  This function is reserved for future use by \QD.
+    \endtable
+
+    Two other virtual functions can also be reimplemented:
+
+    \table
+        \row
+            \o  \c initialize()
+            \o  Sets up extensions and other features for custom widgets. Custom
+                container extensions (see QDesignerContainerExtension) and task
+                menu extensions (see QDesignerTaskMenuExtension) should be set
+                up in this function.
+        \row
+            \o  \c isInitialized()
+            \o  Returns true if the widget has been initialized; returns false
+                otherwise. Reimplementations usually check whether the
+                \c initialize() function has been called and return the result
+                of this test.
+    \endtable
+
+
+    \section2 Notes on the \c{domXml()} Function
+
+    The \c{domXml()} function returns a \c{.ui} file snippet that is used by
+    \QD's widget factory to create a custom widget and its applicable
+    properties.
+
+    Since Qt 4.4, \QD's widget box allows for a complete \c{.ui} file to
+    describe \bold one custom widget. The \c{.ui} file can be loaded using the
+    \c{<ui>} tag. Specifying the <ui> tag allows for adding the <customwidget>
+    element that contains additional information for custom widgets. The
+    \c{<widget>} tag is sufficient if no additional information is required
+
+    If the custom widget does not provide a reasonable size hint, it is
+    necessary to specify a default geometry in the string returned by the
+    \c domXml() function in your subclass. For example, the
+    \c AnalogClockPlugin provided by the \l{designer/customwidgetplugin}
+    {Custom Widget Plugin} example, defines a default widgetgeometry in the
+    following way:
+
+    \dots
+    \snippet examples/designer/customwidgetplugin/customwidgetplugin.cpp 11
+    \dots
+
+    An additional feature of the \c domXml() function is that, if it returns
+    an empty string, the widget will not be installed in \QD's widget box.
+    However, it can still be used by other widgets in the form. This feature
+    is used to hide widgets that should not be explicitly created by the user,
+    but are required by other widgets.
+
+    
+    A complete custom widget specification looks like:
+    
+    \code
+<ui language="c++"> displayname="MyWidget">
+    <widget class="widgets::MyWidget" name="mywidget"/>
+    <customwidgets>
+        <customwidget>
+            <class>widgets::MyWidget</class>
+            <addpagemethod>addPage</addpagemethod>
+            <propertyspecifications>
+                <stringpropertyspecification name="fileName" notr="true" type="singleline"
+                <stringpropertyspecification name="text" type="richtext"
+            </propertyspecifications>
+        </customwidget>
+    </customwidgets>
+</ui>
+    \endcode
+
+    Attributes of the \c{<ui>} tag:
+        \table
+        \header
+            \o  Attribute
+            \o  Presence
+            \o  Values
+            \o  Comment
+        \row
+            \o  \c{language}
+            \o  optional
+            \o  "c++", "jambi"
+            \o  This attribute specifies the language the custom widget is intended for.
+                It is mainly there to prevent C++-plugins from appearing in Qt Jambi.
+        \row
+            \o \c{displayname}
+            \o optional
+            \o Class name
+            \o The value of the attribute appears in the Widget box and can be used to
+                strip away namespaces.
+    \endtable
+
+    The \c{<addpagemethod>} tag tells \QD and \l uic which method should be used to
+    add pages to a container widget. This applies to container widgets that require
+    calling a particular method to add a child rather than adding the child by passing
+    the parent. In particular, this is relevant for containers that are not a
+    a subclass of the containers provided in \QD, but are based on the notion
+    of \e{Current Page}. In addition,  you need to provide a container extension
+    for them.
+
+    The \c{<propertyspecifications>} element can contain a list of property meta information.
+    Currently, properties of type string are supported. For these properties, the
+    \c{<stringpropertyspecification>} tag can be used. This tag has the following attributes:
+
+
+    \table
+        \header
+            \o  Attribute
+            \o  Presence
+            \o  Values
+            \o  Comment
+        \row
+            \o  \c{name}
+            \o  required
+            \o  Name of the property
+        \row
+            \o \c{type}
+            \o required
+            \o See below table
+            \o The value of the attribute determines how the property editor will handle them.
+        \row
+            \o \c{notr}
+            \o optional
+            \o "true", "false"
+            \o If the attribute is "true", the value is not meant to be translated.
+    \endtable
+
+    Values of the \c{type} attribute of the string property:
+
+    \table
+        \header
+            \o  Value
+            \o  Type
+        \row
+            \o \c{"richtext"}
+            \o Rich text.
+        \row
+            \o \c{"multiline"}
+            \o Multi-line plain text.
+        \row
+            \o \c{"singleline"}
+            \o Single-line plain text.
+        \row
+            \o \c{"stylesheet"}
+            \o A CSS-style sheet.
+        \row
+            \o \c{"objectname"}
+            \o An object name (restricted set of valid characters).
+        \row
+            \o \c{"url"}
+            \o URL, file name.
+    \endtable
+
+    \section1 Plugin Requirements
+
+    In order for plugins to work correctly on all platforms, you need to ensure
+    that they export the symbols needed by \QD.
+
+    First of all, the plugin class must be exported in order for the plugin to
+    be loaded by \QD. Use the Q_EXPORT_PLUGIN2() macro to do this. Also, the
+    QDESIGNER_WIDGET_EXPORT macro must be used to define each custom widget class
+    within a plugin, that \QD will instantiate.
+
+
+    \section1 Creating Well Behaved Widgets
+
+    Some custom widgets have special user interface features that may make them
+    behave differently to many of the standard widgets found in \QD.
+    Specifically, if a custom widget grabs the keyboard as a result of a call
+    to QWidget::grabKeyboard(), the operation of \QD will be affected.
+
+    To give custom widgets special behavior in \QD, provide an implementation
+    of the initialize() function to configure the widget construction process
+    for \QD specific behavior. This function will be called for the first time
+    before any calls to createWidget() and could perhaps set an internal flag
+    that can be tested later when \QD calls the plugin's createWidget()
+    function.
+
+
+    \target BuildingandInstallingthePlugin
+    \section1 Building and Installing the Plugin
+
+    The \c{.pro} file for a plugin must specify the headers and sources for
+    both the custom widget and the plugin interface. Typically, this file only
+    has to specify that the plugin's project is to be built as a library, but
+    with specific plugin support for \QD. This is done with the following
+    declarations:
+
+    \snippet examples/designer/customwidgetplugin/customwidgetplugin.pro 1
+
+    If Qt is configured to build in both debug and release modes, \QD will be
+    built in release mode. When this occurs, it is necessary to ensure that
+    plugins are also built in release mode. To do this, include the following
+    declaration in the plugin's \c{.pro} file:
+
+    \snippet doc/src/snippets/code/doc_src_designer-manual.qdoc 3
+
+    If plugins are built in a mode that is incompatible with \QD, they will
+    not be loaded and installed. For more information about plugins, see the
+    \l{plugins-howto.html}{Plugins HOWTO} document.
+
+    It is also necessary to ensure that the plugin is installed together with
+    other \QD widget plugins:
+
+    \snippet doc/src/snippets/code/doc_src_designer-manual.qdoc 4
+
+    The \c $[QT_INSTALL_PLUGINS] variable is a placeholder to the location of
+    the installed Qt plugins. You can configure \QD to look for plugins in
+    other locations by setting the \c QT_PLUGIN_PATH environment variable
+    before running the application.
+
+    \note \QD will look for a \c designer subdirectory in each path supplied.
+
+    See QCoreApplication::libraryPaths() for more information about customizing
+    paths for libraries and plugins with Qt applications.
+
+\omit
+    \section1 Using Qt Script to Aid in Building Forms
+
+    Starting with Qt 4.3, \c .ui files may contain
+    \l{QtScript}{Qt Script} snippets that are executed by \l uic or QUiLoader
+    when building forms.
+
+    The snippets are executed per widget. The snippet may modify properties
+    or invoke slots on the widget.
+
+    Special variables are used to access the widget:
+
+    \table
+    \header
+    \o Name
+    \o Value
+    \row \o \c  widget
+         \o The widget being built.
+    \row \o \c  childWidgets
+         \o An array containing the child widgets. This is useful
+         for QDesignerContainerExtension subclasses.
+    \endtable
+
+    If scripts are present in an \c {uic}-generated form, the application
+    must be configured with Qt Script support.
+
+    \snippet doc/src/snippets/code/doc_src_designer-manual.qdoc 5
+
+    For security reasons, the execution of scripts is disabled
+    by default in QUiLoader. You can enable it by
+    calling the QUiLoader::setScriptingEnabled() method.
+
+    The resulting script snippet is concatenated from snippets occurring in
+    several places:
+
+    \table
+    \header
+    \o Source
+    \o Usage
+    \row \o The \c codeTemplate() function of QDesignerCustomWidgetInterface
+         \o Allows snippets to be run on a per-class basis; for example, to set up a
+            container using the QDesignerContainerExtension.
+    \row \o The \c script() method of QDesignerScriptExtension
+         \o Allows snippets to be run on a per-widget basis; for example,
+            to set up the internal state of a custom widget.
+
+            Such an internal state might be, for example, the contents of
+            a custom item view container widget, for which an editor
+            is provided by an QDesignerTaskMenuExtension object.
+
+    \row \o Snippets entered at run-time using the \gui{Change script...}
+            option of the form's context menu
+         \o Fast prototyping. To get an idea,
+            drag a QLineEdit onto the form, enter the script
+            \snippet doc/src/snippets/code/doc_src_designer-manual.qdoc 6
+            and preview the form.
+    \endtable
+\endomit
+
+
+    \section1 Related Examples
+
+    For more information on using custom widgets in \QD, refer to the
+    \l{designer/customwidgetplugin}{Custom Widget Plugin} and
+    \l{designer/worldtimeclockplugin}{World Time Clock Plugin} examples for more
+    information about using custom widgets in \QD. Also, you can use the
+    QDesignerCustomWidgetCollectionInterface class to combine several custom
+    widgets into a single library.
+*/
+
+
+/*!
+    \page designer-creating-custom-widgets-extensions.html
+    \previouspage Creating Custom Widgets for Qt Designer
+    \nextpage Qt Designer's UI File Format
+    \contentspage {Qt Designer Manual}{Contents}
+
+    \title Creating Custom Widget Extensions
+
+    Once you have a custom widget plugin for \QD, you can provide it with the
+    expected behavior and functionality within \QD's workspace, using custom
+    widget extensions.
+
+
+    \section1 Extension Types
+
+    There are several available types of extensions in \QD. You can use all of
+    these extensions in the same pattern, only replacing the respective
+    extension base class.
+
+    QDesignerContainerExtension is necessary when implementing a custom
+    multi-page container.
+
+    \table
+        \row
+            \i  \inlineimage designer-manual-taskmenuextension.png
+            \i  \bold{QDesignerTaskMenuExtension}
+
+        QDesignerTaskMenuExtension is useful for custom widgets. It provides an
+        extension that allows you to add custom menu entries to \QD's task
+        menu.
+    
+        The \l{designer/taskmenuextension}{Task Menu Extension} example
+        illustrates how to use this class.
+
+        \row
+            \i  \inlineimage designer-manual-containerextension.png
+            \i  \bold{QDesignerContainerExtension}
+
+        QDesignerContainerExtension is necessary when implementing a custom
+        multi-page container. It provides an extension that allows you to add
+        and delete pages for a multi-page container plugin in \QD.
+
+        The \l{designer/containerextension}{Container Extension} example
+        further explains how to use this class.
+
+        \note It is not possible to add custom per-page properties for some
+        widgets (e.g., QTabWidget) due to the way they are implemented.
+    \endtable
+
+    \table
+        \row
+            \i  \inlineimage designer-manual-membersheetextension.png
+            \i  \bold{QDesignerMemberSheetExtension}
+
+        The QDesignerMemberSheetExtension class allows you to manipulate a
+        widget's member functions displayed when connecting signals and slots.
+
+        \row
+            \i  \inlineimage designer-manual-propertysheetextension.png
+            \i  \bold{QDesignerPropertySheetExtension,
+                QDesignerDynamicPropertySheetExtension}
+
+        These extension classes allow you to control how a widget's properties
+        are displayed in \QD's property editor.
+    \endtable
+
+\omit
+     \row
+        \o
+        \o \bold {QDesignerScriptExtension}
+
+         The QDesignerScriptExtension class allows you to define script
+         snippets that are executed when a form is loaded. The extension
+         is primarily intended to be used to set up the internal states
+         of custom widgets.
+    \endtable
+\endomit
+
+
+    \QD uses the QDesignerPropertySheetExtension and the
+    QDesignerMemberSheetExtension classes to feed its property and signal and
+    slot editors. Whenever a widget is selected in its workspace, \QD will
+    query for the widget's property sheet extension; likewise, whenever a
+    connection between two widgets is requested, \QD will query for the
+    widgets' member sheet extensions.
+
+    \warning All widgets have default property and member sheets. If you
+    implement custom property sheet or member sheet extensions, your custom
+    extensions will override the default sheets.
+
+
+    \section1 Creating an Extension
+
+    To create an extension you must inherit both QObject and the appropriate
+    base class, and reimplement its functions. Since we are implementing an
+    interface, we must ensure that it is made known to the meta object system
+    using the Q_INTERFACES() macro in the extension class's definition. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_designer-manual.qdoc 7
+
+    This enables \QD to use the qobject_cast() function to query for supported
+    interfaces using a QObject pointer only.
+
+
+    \section1 Exposing an Extension to Qt Designer
+
+    In \QD the extensions are not created until they are required. For this
+    reason, when implementing extensions, you must subclass QExtensionFactory
+    to create a class that is able to make instances of your extensions. Also,
+    you must register your factory with \QD's extension manager; the extension
+    manager handles the construction of extensions.
+
+    When an extension is requested, \QD's extension manager will run through
+    its registered factories calling QExtensionFactory::createExtension() for
+    each of them until it finds one that is able to create the requested
+    extension for the selected widget. This factory will then make an instance
+    of the extension.
+
+    \image qtdesignerextensions.png
+
+
+    \section2 Creating an Extension Factory
+
+    The QExtensionFactory class provides a standard extension factory, but it
+    can also be used as an interface for custom extension factories.
+
+    The purpose is to reimplement the QExtensionFactory::createExtension()
+    function, making it able to create your extension, such as a
+     \l{designer/containerextension}{MultiPageWidget} container extension.
+
+    You can either create a new QExtensionFactory and reimplement the 
+    QExtensionFactory::createExtension() function:
+
+    \snippet doc/src/snippets/code/doc_src_designer-manual.qdoc 8
+
+    or you can use an existing factory, expanding the
+    QExtensionFactory::createExtension() function to enable the factory to
+    create your custom extension as well:
+
+    \snippet doc/src/snippets/code/doc_src_designer-manual.qdoc 9
+
+
+    \section2 Accessing Qt Designer's Extension Manager
+
+    When implementing a custom widget plugin, you must subclass the
+    QDesignerCustomWidgetInterface to expose your plugin to \QD. This is
+    covered in more detail in the
+    \l{Creating Custom Widgets for Qt Designer} section. The registration of
+    an extension factory is typically made in the
+    QDesignerCustomWidgetInterface::initialize() function:
+
+    \snippet doc/src/snippets/code/doc_src_designer-manual.qdoc 10
+
+    The \c formEditor parameter in the
+    QDesignerCustomWidgetInterface::initialize() function is a pointer to \QD's
+    current QDesignerFormEditorInterface object. You must use the
+    QDesignerFormEditorInterface::extensionManager() function to retrieve an
+    interface to \QD's extension manager. Then you use the
+    QExtensionManager::registerExtensions() function to register your custom
+    extension factory.
+
+
+    \section1 Related Examples
+
+    For more information on creating custom widget extensions in \QD, refer to
+    the \l{designer/taskmenuextension}{Task Menu Extension} and
+    \l{designer/containerextension}{Container Extension} examples.
+*/
+
+
+/*!
+    \page designer-ui-file-format.html
+    \previouspage Creating Custom Widget Extensions
+    \contentspage {Qt Designer Manual}{Contents}
+
+    \title Qt Designer's UI File Format
+
+    The \c .ui file format used by \QD is described by the
+    \l{http://www.w3.org/XML/Schema}{XML schema} presented below,
+    which we include for your convenience. Be aware that the format
+    may change in future Qt releases.
+
+    \quotefile tools/designer/data/ui4.xsd
+*/
+
+
+/*!
+    \page designer-recursive-shadow-casting.html
+    \title Implementation of the Recursive Shadow Casting Algorithm in Qt Designer
+    \contentspage {Qt Designer Manual}{Contents}
+
+    \ingroup licensing
+    \brief License information for contributions to specific parts of the Qt
+    Designer source code.
+
+    \legalese
+    Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). \BR
+    Copyright (C) 2005 Bjoern Bergstroem
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, modify, market, reproduce,
+    grant sublicenses and distribute subject to the following conditions:
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software. These
+    files are provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+    WARRANTY OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE.
+    \endlegalese
+*/
diff --git a/doc/src/desktop-integration.qdoc b/doc/src/desktop-integration.qdoc
new file mode 100644
index 0000000000..e52b8d8db7
--- /dev/null
+++ b/doc/src/desktop-integration.qdoc
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \page desktop-integration.html
+  \title Desktop Integration
+  \ingroup gui-programming
+
+  Various classes in Qt are designed to help developers integrate applications into
+  users' desktop environments. These classes enable developers to take advantage
+  of native services while still using a cross-platform API.
+
+  \tableofcontents
+
+  \section1 Opening External Resources
+
+  Although Qt provides facilities to handle and display resources, such as
+  \l{QImageIOHandler}{common image formats} and \l{QTextDocument}{HTML},
+  it is sometimes necessary to open files and external resources using external
+  applications.
+
+  QDesktopServices provides an interface to services offered by the user's desktop
+  environment. In particular, the \l{QDesktopServices::}{openUrl()} function is
+  used to open resources using the appropriate application, which may have been
+  specifically configured by the user.
+
+  \section1 System Tray Icons
+
+  Many modern desktop environments feature docks or panels with \e{system trays}
+  in which applications can install icons. Applications often use system tray icons
+  to display status information, either by updating the icon itself or by showing
+  information in "balloon messages". Additionally, many applications provide
+  pop-up menus that can be accessed via their system tray icons.
+
+  The QSystemTrayIcon class exposes all of the above features via an intuitive
+  Qt-style API that can be used on all desktop platforms.
+
+  \section1 Desktop Widgets
+
+  On systems where the user's desktop is displayed using more than one screen,
+  certain types of applications may need to obtain information about the
+  configuration of the user's workspace to ensure that new windows and dialogs
+  are opened in appropriate locations.
+
+  The QDesktopWidget class can be used to monitor the positions of widgets and
+  notify applications about changes to the way the desktop is split over the
+  available screens. This enables applications to implement policies for
+  positioning new windows so that, for example, they do not distract a user
+  who is working on a specific task.
+
+
+*/
diff --git a/doc/src/developing-on-mac.qdoc b/doc/src/developing-on-mac.qdoc
new file mode 100644
index 0000000000..00c54b6b00
--- /dev/null
+++ b/doc/src/developing-on-mac.qdoc
@@ -0,0 +1,254 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page developing-on-mac.html
+    \title Developing Qt Applications on Mac OS X
+    \brief A overview of items to be aware of when developing Qt applications
+        on Mac OS X
+    \ingroup platform-notes
+
+    \tableofcontents
+
+    Mac OS X is a UNIX platform and behaves similar to other Unix-like
+    platforms. The main difference is X11 is not used as the primary windowing
+    system. Instead, Mac OS X uses its own native windowing system that is
+    accessible through the Carbon and Cocoa APIs.  Application development on
+    Mac OS X is done using Xcode Tools, an optional install included on every
+    Mac with updates available from \l {http://developer.apple.com}{Apple's
+    developer website}. Xcode Tools includes Apple-modified versions of the GCC
+    compiler.
+
+
+    \section1 What Versions of Mac OS X are Supported?
+
+    As of Qt 4.5, Qt supports Mac OS X versions 10.3 (for \bold{deployment
+    only}, not for development), 10.4 and 10.5. It is usually in the best
+    interest of the developer and user to be running the latest updates to any
+    version. We test internally against Mac OS X 10.3.9 and Mac OS X 10.4.11 as
+    well as the updated release of Mac OS X 10.5.
+
+
+    \section2 Carbon or Cocoa?
+    
+    Historically, Qt has used the Carbon toolkit, which supports 32-bit
+    applications on Mac OS X 10.3 and up. Qt 4.5 adds support for the Cocoa
+    toolkit, which requires 10.5 and provides 64-bit support.
+
+    This detail is typically not important to Qt application developers.  Qt is
+    cross-platform across Carbon and Cocoa, and Qt applications behave
+    the same way when configured for either one. Eventually, the Carbon
+    version will be discontinued. This is something to keep in mind when you
+    consider writing code directly against native APIs.
+
+    The current binary for Qt is built for Carbon. If you want to choose which
+    framework Qt will use, you must build from scratch. Carbon or Cocoa is
+    chosen when configuring the package for building. The configure process
+    selects Carbon by default, to specify Cocoa use the \c{-cocoa} flag.
+    configure for a 64-bit architecture using one of the \c{-arch} flags (see
+    \l{universal binaries}{Universal Binaries}).
+
+    Currently, Apple's GCC 4.0.1 is used by default. When building on 10.5,
+    Apple's GCC 4.2 is also available and selectable with the configure flag:
+    \c{-platform macx-g++42}. GCC 3.x will \e not work. Experimental LLVM-GCC
+    support is available by passing in the \c{-platform macx-llvm} flag.
+
+    The following table summarizes the different versions of Mac OS X and what
+    capabilities are used by Qt.
+
+    \table
+        \header
+            \o Mac OS X Version
+            \o Cat Name
+            \o Native API Used by Qt
+            \o Bits available to address memory
+            \o CPU Architecture Supported
+            \o Development Platform
+        \row
+            \o 10.3
+            \o Panther
+            \o Carbon
+            \o 32
+            \o PPC
+            \o No
+        \row
+            \o 10.4
+            \o Tiger
+            \o Carbon
+            \o 32
+            \o PPC/Intel
+            \o Yes
+        \row
+            \o 10.5
+            \o Leopard
+            \o Carbon
+            \o 32
+            \o PPC/Intel
+            \o Yes
+        \row
+            \o 10.5
+            \o Leopard
+            \o Cocoa
+            \o 32/64
+            \o PPC/Intel
+            \o Yes
+    \endtable
+
+    \section2 Which One Should I Use?
+
+    Carbon and Cocoa both have their advantages and disadvantages. Probably the
+    easiest way to determine is to look at the version of Mac OS X you are
+    targetting.  If you are starting a new application and can target 10.5 and
+    up, then please consider Cocoa only. If you have an existing application or
+    need to target earlier versions of the operating system and do not need
+    access to 64-bit or newer Apple technologies, then Carbon is a good fit. If
+    your needs fall in between, you can go with a 64-bit Cocoa and 32-bit
+    Carbon universal application with the appropriate checks in your code to
+    choose the right path based on where you are running the application.
+
+    \target universal binaries
+    \section1 Universal Binaries
+
+    In 2006, Apple begin transitioning from PowerPC (PPC) to Intel (x86)
+    systems.  Both architectures are supported by Qt. The release of Mac OS X
+    10.5 in October 2007 added the possibility of writing and deploying 64-bit
+    GUI applications. Qt 4.5 supports both the 32-bit (PPC and x86) and 64-bit
+    (PPC64 and x86-64) versions of PowerPC and Intel-based systems are
+    supported.
+
+    Universal binaries are used to bundle binaries for more than one
+    architecture into a single package, simplifying deployment and
+    distribution. When running an application the operating system will select
+    the most appropriate architecture. Universal binaries support the following
+    architectures; they can be added to the build at configure time using the
+    \c{-arch} arguments:
+
+    \table
+        \header
+            \o Architecture		
+            \o Flag
+        \row
+            \o Intel, 32-bit
+            \o \c{-arch x86}
+        \row
+            \o Intel, 64-bit
+            \o \c{-arch x86_64}
+        \row
+            \o PPC, 32-bit
+            \o \c{-arch ppc}
+        \row
+            \o PPC, 64-bit
+            \o \c{-arch ppc64}
+    \endtable
+
+    If there are no \c{-arch} flags specified, configure builds for the 32-bit
+    architecture, if you are currently on one. Universal binaries were initially
+    used to simplify the PPC to Intel migration. You can use \c{-universal} to
+    build for both the 32-bit Intel and PPC architectures.
+
+    \note The \c{-arch} flags at configure time only affect how Qt is built.
+    Applications are by default built for the 32-bit architecture you are
+    currently on. To build a universal binary, add the architectures to the
+    CONFIG variable in the .pro file:
+
+    \code
+    CONFIG += x86 ppc x86_64 ppc64
+    \endcode
+
+
+    \section1 Day-to-Day Application Development on OS X
+
+    On the command-line, applications can be built using \c qmake and \c make.
+    Optionally, \c qmake can generate project files for Xcode with
+    \c{-spec macx-xcode}. If you are using the binary package, \c qmake
+    generates Xcode projects by default; use \c{-spec macx-gcc} to generate
+    makefiles.
+
+    The result of the build process is an application bundle, which is a
+    directory structure that contains the actual application executable. The
+    application can be launched by double-clicking it in Finder, or by
+    referring directly to its executable from the command line, i. e.
+    \c{myApp.app/Contents/MacOS/myApp}.
+
+    If you wish to have a command-line tool that does not use the GUI (e.g.,
+    \c moc, \c uic or \c ls), you can tell \c qmake not to execute the bundle
+    creating steps by removing it from the \c{CONFIG} in your \c{.pro} file:
+
+    \code
+    CONFIG -= app_bundle
+    \endcode
+
+
+    \section1 Deployment - "Compile once, deploy everywhere"
+
+    In general, Qt supports building on one Mac OS X version and deploying on
+    all others, both forward and backwards. You can build on 10.4 Tiger and run
+    the same binary on 10.3 and 10.5.
+
+    Some restrictions apply:
+
+    \list
+        \o  Some functions and optimization paths that exist in later versions
+            of Mac OS X will not be available if you build on an earlier
+            version of Mac OS X.
+        \o  The CPU architecture should match.
+        \o  Cocoa support is only available for Mac OS X 10.5 and up.
+    \endlist
+
+    Universal binaries can be used to provide a smorgasbord of configurations
+    catering to all possible architectures.
+
+    Mac applications are typically deployed as self-contained application
+    bundles. The application bundle contains the application executable as well
+    as dependencies such as the Qt libraries, plugins, translations and other
+    resources you may need. Third party libraries like Qt are normally not
+    installed system-wide; each application provides its own copy.
+
+    The most common way to distribute applications is to provide a compressed
+    disk image (.dmg file) that the user can mount in Finder. The Mac
+    deployment tool (macdeployqt) can be used to create the self-contained bundles, and
+    optionally also create a .dmg archive. See the
+    \l{Deploying an Application on Mac OS X}{Mac deployment guide} for more
+    information about deployment. It is also possible to use an installer
+    wizard. More information on this option can be found in
+    \l{http://developer.apple.com/mac/}{Apple's documentation}.
+*/
+
diff --git a/doc/src/diagrams/arthurplugin-demo.png b/doc/src/diagrams/arthurplugin-demo.png
new file mode 100644
index 0000000000..3b033416f6
--- /dev/null
+++ b/doc/src/diagrams/arthurplugin-demo.png
diff --git a/doc/src/diagrams/arthurplugin-demo.ui b/doc/src/diagrams/arthurplugin-demo.ui
new file mode 100644
index 0000000000..1bf39c2552
--- /dev/null
+++ b/doc/src/diagrams/arthurplugin-demo.ui
@@ -0,0 +1,58 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>Form</class>
+ <widget class="QWidget" name="Form" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>532</width>
+    <height>452</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <widget class="PathDeformRendererEx" name="pathdeformrendererex" >
+   <property name="geometry" >
+    <rect>
+     <x>20</x>
+     <y>20</y>
+     <width>300</width>
+     <height>200</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="PathStrokeRendererEx" name="pathstrokerendererex" >
+   <property name="geometry" >
+    <rect>
+     <x>210</x>
+     <y>230</y>
+     <width>300</width>
+     <height>200</height>
+    </rect>
+   </property>
+  </widget>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>PathStrokeRendererEx</class>
+   <extends></extends>
+   <header>pathstroke.h</header>
+   <container>0</container>
+   <pixmap></pixmap>
+  </customwidget>
+  <customwidget>
+   <class>PathDeformRendererEx</class>
+   <extends></extends>
+   <header>deform.h</header>
+   <container>0</container>
+   <pixmap></pixmap>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/doc/src/diagrams/assistant-manual/assistant-assistant.png b/doc/src/diagrams/assistant-manual/assistant-assistant.png
new file mode 100644
index 0000000000..d728889e6f
--- /dev/null
+++ b/doc/src/diagrams/assistant-manual/assistant-assistant.png
diff --git a/doc/src/diagrams/assistant-manual/assistant-assistant.zip b/doc/src/diagrams/assistant-manual/assistant-assistant.zip
new file mode 100644
index 0000000000..3ea5921ef9
--- /dev/null
+++ b/doc/src/diagrams/assistant-manual/assistant-assistant.zip
diff --git a/doc/src/diagrams/assistant-manual/assistant-temp-toolbar.png b/doc/src/diagrams/assistant-manual/assistant-temp-toolbar.png
new file mode 100644
index 0000000000..d85439c181
--- /dev/null
+++ b/doc/src/diagrams/assistant-manual/assistant-temp-toolbar.png
diff --git a/doc/src/diagrams/boat.png b/doc/src/diagrams/boat.png
new file mode 100644
index 0000000000..3401dc3be8
--- /dev/null
+++ b/doc/src/diagrams/boat.png
diff --git a/doc/src/diagrams/boat.sk b/doc/src/diagrams/boat.sk
new file mode 100644
index 0000000000..01ff8ce5d2
--- /dev/null
+++ b/doc/src/diagrams/boat.sk
@@ -0,0 +1,65 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+le()
+lw(1)
+r(90,0,0,-65,35,810)
+G()
+gl([(0,(0.718,0.667,0.533)),(1,(0.839,0.739,0.586))])
+pgl(0,-1,0)
+fp()
+lw(1)
+b()
+bs(82.5,765,0)
+bs(82.5,805,0)
+bs(77.5,805,0)
+bs(77.5,765,0)
+bs(82.5,765,0)
+bC()
+G()
+fp((0.718,0.082,0.108))
+lw(1)
+b()
+bs(82.5,805,0)
+bs(82.5,800,0)
+bs(92.5,802.5,0)
+bs(82.5,805,0)
+bC()
+G()
+gl([(0,(0.718,0.667,0.533)),(1,(0.839,0.739,0.586))])
+pgl(0,-1,0)
+fp()
+lw(1)
+b()
+bs(67.5,750,0)
+bs(92.5,750,0)
+bs(117.5,765,0)
+bs(42.5,765,0)
+bs(67.5,750,0)
+bC()
+gl([(0,(0.718,0.718,0.718)),(1,(1,1,1))])
+pgl(0,-1,0)
+fp()
+lw(1)
+b()
+bs(77.5,800,0)
+bs(47.5,770,0)
+bs(77.5,770,0)
+bs(77.5,800,0)
+bC()
+gl([(0,(0.718,0.718,0.718)),(1,(1,1,1))])
+pgl(0,-1,0)
+fp()
+lw(1)
+b()
+bs(82.5,800,0)
+bs(82.5,770,0)
+bs(112.5,770,0)
+bs(82.5,800,0)
+bC()
+G_()
+G_()
+G_()
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/car.png b/doc/src/diagrams/car.png
new file mode 100644
index 0000000000..99c741d5d7
--- /dev/null
+++ b/doc/src/diagrams/car.png
diff --git a/doc/src/diagrams/car.sk b/doc/src/diagrams/car.sk
new file mode 100644
index 0000000000..4c4c51d12a
--- /dev/null
+++ b/doc/src/diagrams/car.sk
@@ -0,0 +1,69 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((0.846,0.35,0.35))
+lw(1)
+b()
+bs(65,765,0)
+bs(95,765,0)
+bs(115,765,0)
+bs(120,770,0)
+bs(120,780,0)
+bs(115,785,0)
+bs(105,785,0)
+bs(95,795,0)
+bs(65,795,0)
+bs(55,785,0)
+bs(45,785,0)
+bs(40,780,0)
+bs(40,770,0)
+bs(45,765,0)
+bs(65,765,0)
+bC()
+fp((1,1,1))
+lw(1)
+e(7.5,0,0,-7.5,57.5,765)
+fp((1,1,1))
+lw(1)
+e(7.5,0,0,-7.5,102.5,765)
+gl([(0,(1,1,1)),(1,(0.839,0.839,0.839))])
+pgl(-0.812015,0.583636,0)
+fp()
+lw(1)
+b()
+bs(55,785,0)
+bs(105,785,0)
+bs(95,795,0)
+bs(85,795,0)
+bs(85,785,0)
+bs(80,785,0)
+bs(80,795,0)
+bs(65,795,0)
+bs(55,785,0)
+bC()
+fp((0.966,0.4,0.4))
+lw(1)
+b()
+bs(65,785,0)
+bs(65,770,0)
+bs(70,765,0)
+bs(80,765,0)
+bs(80,785,0)
+bs(65,785,0)
+bC()
+fp((0.966,0.4,0.4))
+lw(1)
+b()
+bs(80,785,0)
+bs(80,765,0)
+bs(90,765,0)
+bs(95,770,0)
+bs(95,785,0)
+bs(80,785,0)
+bC()
+le()
+lw(1)
+r(90,0,0,-65,35,810)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/chip-demo.png b/doc/src/diagrams/chip-demo.png
new file mode 100644
index 0000000000..cd81ebec40
--- /dev/null
+++ b/doc/src/diagrams/chip-demo.png
diff --git a/doc/src/diagrams/chip-demo.zip b/doc/src/diagrams/chip-demo.zip
new file mode 100644
index 0000000000..dcc6072509
--- /dev/null
+++ b/doc/src/diagrams/chip-demo.zip
diff --git a/doc/src/diagrams/cleanlooks-dialogbuttonbox.png b/doc/src/diagrams/cleanlooks-dialogbuttonbox.png
new file mode 100644
index 0000000000..21c7981b1f
--- /dev/null
+++ b/doc/src/diagrams/cleanlooks-dialogbuttonbox.png
diff --git a/doc/src/diagrams/clock.png b/doc/src/diagrams/clock.png
new file mode 100644
index 0000000000..c4bbeeaa5b
--- /dev/null
+++ b/doc/src/diagrams/clock.png
diff --git a/doc/src/diagrams/completer-example-shaped.png b/doc/src/diagrams/completer-example-shaped.png
new file mode 100644
index 0000000000..a3afed4066
--- /dev/null
+++ b/doc/src/diagrams/completer-example-shaped.png
diff --git a/doc/src/diagrams/complexwizard-flow.sk b/doc/src/diagrams/complexwizard-flow.sk
new file mode 100644
index 0000000000..a4b06688d3
--- /dev/null
+++ b/doc/src/diagrams/complexwizard-flow.sk
@@ -0,0 +1,62 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+bm(1083919052,'../images/complexwizard-evaluatepage.png')
+im((96.171,8.31514),1083919052)
+G()
+bm(1083939916,'../images/complexwizard-finishpage.png')
+im((598.76,309.977),1083939916)
+bm(1083947948,'../images/complexwizard-titlepage.png')
+im((-426.888,309.977),1083947948)
+G_()
+G()
+bm(1083738188,'../images/complexwizard-detailspage.png')
+im((438.772,659.042),1083738188)
+bm(1083948908,'../images/complexwizard-registerpage.png')
+im((-246.43,659.042),1083948908)
+G_()
+fp((1,1,0))
+lp((1,0,0))
+lw(4)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(-135.462,551.306,0)
+bs(-53.5823,638.572,0)
+fp((1,1,0))
+lp((1,0,0))
+lw(4)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(266.571,764.5,0)
+bs(411,764.5,0)
+fp((1,1,0))
+lp((1,0,0))
+lw(4)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(-112.837,286.275,0)
+bs(63.8503,162.378,0)
+fp((1,1,0))
+lp((1,0,0))
+lw(4)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(617.918,157.295,0)
+bs(794.606,281.191,0)
+fp((1,1,0))
+lp((1,0,0))
+lw(4)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(682.256,643.959,0)
+bs(764.136,556.693,0)
+fp((1,1,0))
+lp((1,0,0))
+lw(4)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(196,641,0)
+bs(567,443.5,0)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,0.5,0.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/composition-demo.png b/doc/src/diagrams/composition-demo.png
new file mode 100644
index 0000000000..22689ea992
--- /dev/null
+++ b/doc/src/diagrams/composition-demo.png
diff --git a/doc/src/diagrams/contentspropagation/background.png b/doc/src/diagrams/contentspropagation/background.png
new file mode 100644
index 0000000000..21d205e671
--- /dev/null
+++ b/doc/src/diagrams/contentspropagation/background.png
diff --git a/doc/src/diagrams/contentspropagation/base.png b/doc/src/diagrams/contentspropagation/base.png
new file mode 100644
index 0000000000..a9fc405e10
--- /dev/null
+++ b/doc/src/diagrams/contentspropagation/base.png
diff --git a/doc/src/diagrams/contentspropagation/customwidget.py b/doc/src/diagrams/contentspropagation/customwidget.py
new file mode 100755
index 0000000000..89e0b1bfc4
--- /dev/null
+++ b/doc/src/diagrams/contentspropagation/customwidget.py
@@ -0,0 +1,135 @@
+#!/usr/bin/env python
+
+import os, sys
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
+
+class CustomWidget(QWidget):
+
+    def __init__(self, parent, fake = False):
+    
+        QWidget.__init__(self, parent)
+        gradient = QLinearGradient(QPointF(0, 0), QPointF(100.0, 100.0))
+        baseColor = QColor(0xa6, 0xce, 0x39, 0x7f)
+        gradient.setColorAt(0.0, baseColor.light(150))
+        gradient.setColorAt(0.75, baseColor.light(75))
+        self.brush = QBrush(gradient)
+        self.fake = fake
+        self.fakeBrush = QBrush(Qt.red, Qt.DiagCrossPattern)
+        
+        qtPath = QPainterPath()
+        qtPath.setFillRule(Qt.OddEvenFill)
+        qtPath.moveTo(-45.0, -20.0)
+        qtPath.lineTo(0.0, -45.0)
+        qtPath.lineTo(45.0, -20.0)
+        qtPath.lineTo(45.0, 45.0)
+        qtPath.lineTo(-45.0, 45.0)
+        qtPath.lineTo(-45.0, -20.0)
+        qtPath.closeSubpath()
+        qtPath.moveTo(15.0, 5.0)
+        qtPath.lineTo(35.0, 5.0)
+        qtPath.lineTo(35.0, 40.0)
+        qtPath.lineTo(15.0, 40.0)
+        qtPath.lineTo(15.0, 5.0)
+        qtPath.moveTo(-35.0, -15.0)
+        qtPath.closeSubpath()
+        qtPath.lineTo(-10.0, -15.0)
+        qtPath.lineTo(-10.0, 10.0)
+        qtPath.lineTo(-35.0, 10.0)
+        qtPath.lineTo(-35.0, -15.0)
+        qtPath.closeSubpath()
+        self.path = qtPath
+
+    def paintEvent(self, event):
+    
+        painter = QPainter()
+        painter.begin(self)
+        painter.setRenderHint(QPainter.Antialiasing)
+        if self.fake:
+            painter.fillRect(event.rect(), QBrush(Qt.white))
+            painter.fillRect(event.rect(), self.fakeBrush)
+        painter.setBrush(self.brush)
+        painter.translate(60, 60)
+        painter.drawPath(self.path)
+        painter.end()
+    
+    def sizeHint(self):
+    
+        return QSize(120, 120)
+    
+    def minimumSizeHint(self):
+    
+        return QSize(120, 120)
+
+
+if __name__ == "__main__":
+
+    try:
+        qt = sys.argv[1]
+    except IndexError:
+        qt = "4.1"
+    
+    if qt != "4.0" and qt != "4.1":
+        sys.stderr.write("Usage: %s [4.0|4.1]\n" % sys.argv[0])
+        sys.exit(1)
+    
+    app = QApplication(sys.argv)
+    exec_dir = os.path.split(os.path.abspath(sys.argv[0]))[0]
+    label = QLabel()
+    label.setPixmap(QPixmap(os.path.join(exec_dir, "background.png")))
+    
+    layout = QGridLayout()
+    label.setLayout(layout)
+    if qt == "4.0":
+        layout.addWidget(CustomWidget(label), 0, 0, Qt.AlignCenter)
+        caption = QLabel("Opaque (Default)", label)
+        caption.setMargin(2)
+        layout.addWidget(caption, 1, 0, Qt.AlignCenter | Qt.AlignTop)
+    elif qt == "4.1":
+        layout.addWidget(CustomWidget(label), 0, 0, Qt.AlignCenter)
+        caption = QLabel("Contents Propagated (Default)", label)
+        caption.setAutoFillBackground(True)
+        caption.setMargin(2)
+        layout.addWidget(caption, 1, 0, Qt.AlignCenter | Qt.AlignTop)
+    
+    if qt == "4.0":
+        contentsWidget = CustomWidget(label)
+        contentsWidget.setAttribute(Qt.WA_ContentsPropagated, True)
+        layout.addWidget(contentsWidget, 0, 1, Qt.AlignCenter)
+        caption = QLabel("With WA_ContentsPropagated set", label)
+        caption.setMargin(2)
+        layout.addWidget(caption, 1, 1, Qt.AlignCenter | Qt.AlignTop)
+    elif qt == "4.1":
+        autoFillWidget = CustomWidget(label)
+        autoFillWidget.setAutoFillBackground(True)
+        layout.addWidget(autoFillWidget, 0, 1, Qt.AlignCenter)
+        caption = QLabel("With autoFillBackground set", label)
+        caption.setAutoFillBackground(True)
+        caption.setMargin(2)
+        layout.addWidget(caption, 1, 1, Qt.AlignCenter | Qt.AlignTop)
+    
+    if qt == "4.0":
+        noBackgroundWidget = CustomWidget(label, fake = True)
+        noBackgroundWidget.setAttribute(Qt.WA_NoBackground, True)
+        layout.addWidget(noBackgroundWidget, 0, 2, Qt.AlignCenter)
+        caption = QLabel("With WA_NoBackground set", label)
+        caption.setWordWrap(True)
+        caption.setMargin(2)
+        layout.addWidget(caption, 1, 2, Qt.AlignCenter | Qt.AlignTop)
+    elif qt == "4.1":
+        opaqueWidget = CustomWidget(label, fake = True)
+        opaqueWidget.setAttribute(Qt.WA_OpaquePaintEvent, True)
+        layout.addWidget(opaqueWidget, 0, 2, Qt.AlignCenter)
+        caption = QLabel("With WA_OpaquePaintEvent set", label)
+        caption.setAutoFillBackground(True)
+        caption.setMargin(2)
+        layout.addWidget(caption, 1, 2, Qt.AlignCenter | Qt.AlignTop)
+    
+    if qt == "4.0":
+        label.setWindowTitle("Qt 4.0: Painting Custom Widgets")
+    elif qt == "4.1":
+        label.setWindowTitle("Qt 4.1: Painting Custom Widgets")
+    
+    label.resize(404, 160)
+    label.show()
+    sys.exit(app.exec_())
diff --git a/doc/src/diagrams/contentspropagation/lightbackground.png b/doc/src/diagrams/contentspropagation/lightbackground.png
new file mode 100644
index 0000000000..3006044205
--- /dev/null
+++ b/doc/src/diagrams/contentspropagation/lightbackground.png
diff --git a/doc/src/diagrams/contentspropagation/standardwidgets.py b/doc/src/diagrams/contentspropagation/standardwidgets.py
new file mode 100755
index 0000000000..975287d60d
--- /dev/null
+++ b/doc/src/diagrams/contentspropagation/standardwidgets.py
@@ -0,0 +1,144 @@
+#!/usr/bin/env python
+
+import os, sys
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
+
+
+def createGroupBox(parent, attributes = None, fill = False, fake = False):
+
+    background = CustomWidget(parent, fake)
+    backgroundLayout = QVBoxLayout()
+    backgroundLayout.setMargin(4)
+    background.setLayout(backgroundLayout)
+    
+    groupBox = QGroupBox("&Options")
+    layout = QGridLayout()
+    groupBox.setLayout(layout)
+    layout.addWidget(QCheckBox("C&ase sensitive"), 0, 0)
+    layout.addWidget(QCheckBox("W&hole words"), 0, 1)
+    checkedBox = QCheckBox("Search &forwards")
+    checkedBox.setChecked(True)
+    layout.addWidget(checkedBox, 1, 0)
+    layout.addWidget(QCheckBox("From &start of text"), 1, 1)
+    
+    backgroundLayout.addWidget(groupBox)
+    
+    if attributes:
+        for attr in attributes:
+            groupBox.setAttribute(attr, True)
+            if not fake:
+                background.setAttribute(attr, True)
+    
+    groupBox.setAutoFillBackground(fill)
+    background.setAutoFillBackground(fill)
+    
+    return background
+    
+class CustomWidget(QWidget):
+
+    def __init__(self, parent, fake = False):
+    
+        QWidget.__init__(self, parent)
+        self.fake = fake
+        self.fakeBrush = QBrush(Qt.red, Qt.DiagCrossPattern)
+
+    def paintEvent(self, event):
+    
+        painter = QPainter()
+        painter.begin(self)
+        painter.setRenderHint(QPainter.Antialiasing)
+        if self.fake:
+            painter.fillRect(event.rect(), QBrush(Qt.white))
+            painter.fillRect(event.rect(), self.fakeBrush)
+        painter.end()
+
+
+if __name__ == "__main__":
+
+    try:
+        qt = sys.argv[1]
+    except IndexError:
+        qt = "4.1"
+    
+    if qt != "4.0" and qt != "4.1":
+        sys.stderr.write("Usage: %s [4.0|4.1]\n" % sys.argv[0])
+        sys.exit(1)
+    
+    app = QApplication(sys.argv)
+    exec_dir = os.path.split(os.path.abspath(sys.argv[0]))[0]
+    label = QLabel()
+    label.setPixmap(QPixmap(os.path.join(exec_dir, "lightbackground.png")))
+    
+    layout = QGridLayout()
+    label.setLayout(layout)
+    if qt == "4.0":
+        layout.addWidget(createGroupBox(label), 0, 0, Qt.AlignCenter)
+        caption = QLabel("Opaque (Default)", label)
+        caption.setMargin(2)
+        layout.addWidget(caption, 1, 0, Qt.AlignCenter | Qt.AlignTop)
+    elif qt == "4.1":
+        layout.addWidget(createGroupBox(label), 0, 0, Qt.AlignCenter)
+        caption = QLabel("Contents Propagated (Default)", label)
+        caption.setAutoFillBackground(True)
+        caption.setMargin(2)
+        layout.addWidget(caption, 1, 0, Qt.AlignCenter | Qt.AlignTop)
+    
+    if qt == "4.0":
+        contentsWidget = createGroupBox(label)
+        contentsWidget.setAttribute(Qt.WA_ContentsPropagated, True)
+        layout.addWidget(contentsWidget, 0, 1, Qt.AlignCenter)
+        caption = QLabel("With WA_ContentsPropagated set", label)
+        caption.setMargin(2)
+        layout.addWidget(caption, 1, 1, Qt.AlignCenter | Qt.AlignTop)
+    elif qt == "4.1":
+        autoFillWidget = createGroupBox(label, fill = True)
+        layout.addWidget(autoFillWidget, 0, 1, Qt.AlignCenter)
+        caption = QLabel("With autoFillBackground set", label)
+        caption.setAutoFillBackground(True)
+        caption.setMargin(2)
+        layout.addWidget(caption, 1, 1, Qt.AlignCenter | Qt.AlignTop)
+    
+#    if qt == "4.0":
+#        noBackgroundWidget = createGroupBox(
+#            label, attributes = [Qt.WA_NoBackground], fake = True)
+#        layout.addWidget(noBackgroundWidget, 2, 0, Qt.AlignCenter)
+#        caption = QLabel("With WA_NoBackground set", label)
+#        caption.setWordWrap(True)
+#        caption.setMargin(2)
+#        layout.addWidget(caption, 3, 0, Qt.AlignCenter | Qt.AlignTop)
+#    elif qt == "4.1":
+#        opaqueWidget = createGroupBox(
+#            label, attributes = [Qt.WA_OpaquePaintEvent], fake = True)
+#        layout.addWidget(opaqueWidget, 2, 0, Qt.AlignCenter)
+#        caption = QLabel("With WA_OpaquePaintEvent set", label)
+#        caption.setAutoFillBackground(True)
+#        caption.setMargin(2)
+#        layout.addWidget(caption, 3, 0, Qt.AlignCenter | Qt.AlignTop)
+#    
+#    if qt == "4.0":
+#        contentsNoBackgroundWidget = createGroupBox(
+#            label, attributes = [Qt.WA_ContentsPropagated, Qt.WA_NoBackground],
+#            fake = True)
+#        layout.addWidget(contentsNoBackgroundWidget, 2, 1, Qt.AlignCenter)
+#        caption = QLabel("With WA_ContentsPropagated and WA_NoBackground set", label)
+#        caption.setMargin(2)
+#        layout.addWidget(caption, 3, 1, Qt.AlignCenter | Qt.AlignTop)
+#    elif qt == "4.1":
+#        opaqueAutoFillWidget = createGroupBox(
+#            label, attributes = [Qt.WA_OpaquePaintEvent], fill = True, fake = True)
+#        layout.addWidget(opaqueAutoFillWidget, 2, 1, Qt.AlignCenter)
+#        caption = QLabel("With WA_OpaquePaintEvent and autoFillBackground set", label)
+#        caption.setWordWrap(True)
+#        caption.setAutoFillBackground(True)
+#        caption.setMargin(2)
+#        layout.addWidget(caption, 3, 1, Qt.AlignCenter | Qt.AlignTop)
+    
+    if qt == "4.0":
+        label.setWindowTitle("Qt 4.0: Painting Standard Qt Widgets")
+    elif qt == "4.1":
+        label.setWindowTitle("Qt 4.1: Painting Standard Qt Widgets")
+    
+    label.resize(480, 140)
+    label.show()
+    sys.exit(app.exec_())
diff --git a/doc/src/diagrams/coordinatesystem-line-antialias.sk b/doc/src/diagrams/coordinatesystem-line-antialias.sk
new file mode 100644
index 0000000000..323065e554
--- /dev/null
+++ b/doc/src/diagrams/coordinatesystem-line-antialias.sk
@@ -0,0 +1,310 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+r(25,0,0,-25,120.125,734.875)
+lw(1)
+r(25,0,0,-25,120.125,584.875)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,270.125,734.875)
+lw(1)
+r(25,0,0,-25,270.125,584.875)
+lw(1)
+r(25,0,0,-25,120.125,659.875)
+lw(1)
+r(25,0,0,-25,270.125,659.875)
+lw(1)
+r(25,0,0,-25,120,760)
+lw(1)
+r(25,0,0,-25,120,610)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,270,760)
+lw(1)
+r(25,0,0,-25,270,610)
+lw(1)
+r(25,0,0,-25,120,685)
+lw(1)
+r(25,0,0,-25,270,685)
+lw(1)
+r(25,0,0,-25,120.125,710.125)
+lw(1)
+r(25,0,0,-25,120.125,560.125)
+lw(1)
+r(25,0,0,-25,270.125,710.125)
+lw(1)
+r(25,0,0,-25,270.125,560.125)
+lw(1)
+r(25,0,0,-25,120.125,635.125)
+lw(1)
+r(25,0,0,-25,270.125,635.125)
+lw(1)
+r(25,0,0,-25,195.125,734.875)
+lw(1)
+r(25,0,0,-25,195.125,584.875)
+lw(1)
+r(25,0,0,-25,320.125,734.875)
+lw(1)
+r(25,0,0,-25,320.125,584.875)
+fp((0.255,0.517,0.194))
+lw(1)
+r(25,0,0,-25,195.125,659.875)
+lw(1)
+r(25,0,0,-25,320.125,659.875)
+lw(1)
+r(25,0,0,-25,195,760)
+lw(1)
+r(25,0,0,-25,195,610)
+lw(1)
+r(25,0,0,-25,320,760)
+lw(1)
+r(25,0,0,-25,320,610)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,195,685)
+lw(1)
+r(25,0,0,-25,320,685)
+lw(1)
+r(25,0,0,-25,195.125,710.125)
+lw(1)
+r(25,0,0,-25,195.125,560.125)
+lw(1)
+r(25,0,0,-25,320.125,710.125)
+lw(1)
+r(25,0,0,-25,320.125,560.125)
+fp((0.336,0.691,0.26))
+lw(1)
+r(25,0,0,-25,195.125,635.125)
+lw(1)
+r(25,0,0,-25,320.125,635.125)
+lw(1)
+r(25,0,0,-25,145.125,734.875)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,145.125,584.875)
+lw(1)
+r(25,0,0,-25,145.125,659.875)
+lw(1)
+r(25,0,0,-25,145,760)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,145,610)
+lw(1)
+r(25,0,0,-25,145,685)
+lw(1)
+r(25,0,0,-25,145.125,710.125)
+lw(1)
+r(25,0,0,-25,145.125,560.125)
+lw(1)
+r(25,0,0,-25,145.125,635.125)
+lw(1)
+r(25,0,0,-25,220.125,734.875)
+lw(1)
+r(25,0,0,-25,220.125,584.875)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,220.125,659.875)
+lw(1)
+r(25,0,0,-25,220,760)
+lw(1)
+r(25,0,0,-25,220,610)
+fp((0.255,0.517,0.194))
+lw(1)
+r(25,0,0,-25,220,685)
+fp((0.336,0.691,0.26))
+lw(1)
+r(25,0,0,-25,220.125,710.125)
+lw(1)
+r(25,0,0,-25,220.125,560.125)
+lw(1)
+r(25,0,0,-25,220.125,635.125)
+lw(1)
+r(25,0,0,-25,170.125,734.875)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,170.125,584.875)
+lw(1)
+r(25,0,0,-25,295.125,734.875)
+lw(1)
+r(25,0,0,-25,295.125,584.875)
+lw(1)
+r(25,0,0,-25,170.125,659.875)
+lw(1)
+r(25,0,0,-25,295.125,659.875)
+lw(1)
+r(25,0,0,-25,170,760)
+fp((0.255,0.517,0.194))
+lw(1)
+r(25,0,0,-25,170,610)
+lw(1)
+r(25,0,0,-25,295,760)
+lw(1)
+r(25,0,0,-25,295,610)
+lw(1)
+r(25,0,0,-25,170,685)
+lw(1)
+r(25,0,0,-25,295,685)
+lw(1)
+r(25,0,0,-25,170.125,710.125)
+lw(1)
+r(25,0,0,-25,170.125,560.125)
+lw(1)
+r(25,0,0,-25,295.125,710.125)
+lw(1)
+r(25,0,0,-25,295.125,560.125)
+fp((0.336,0.691,0.26))
+lw(1)
+r(25,0,0,-25,170.125,635.125)
+lw(1)
+r(25,0,0,-25,295.125,635.125)
+fp((0.255,0.517,0.194))
+lw(1)
+r(25,0,0,-25,245.125,734.875)
+lw(1)
+r(25,0,0,-25,245.125,584.875)
+lw(1)
+r(25,0,0,-25,245.125,659.875)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,245,760)
+lw(1)
+r(25,0,0,-25,245,610)
+lw(1)
+r(25,0,0,-25,245,685)
+fp((0.336,0.691,0.26))
+lw(1)
+r(25,0,0,-25,245.125,710.125)
+lw(1)
+r(25,0,0,-25,245.125,560.125)
+lw(1)
+r(25,0,0,-25,245.125,635.125)
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('1  ',(141.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('1  ',(105.496,729.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('2',(166,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('2',(105.496,703.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('3',(191,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('3',(105.496,678.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('4',(215,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('4',(105.496,653.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('5',(240.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('5',(105.496,628.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('6',(265,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('6',(105.496,604.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('7',(291,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('7',(105.496,577.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('8',(314,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('8',(105.496,553.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('9',(340.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('9',(105.496,527.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('0',(115.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('0',(105.496,752.445))
+fp((0.631,0.207,0.072))
+lw(1)
+e(5,0,0,-5,270.5,735.5)
+fp((0.631,0.207,0.072))
+lw(1)
+e(5,0,0,-5,169.5,584.75)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/coordinatesystem-line-raster.sk b/doc/src/diagrams/coordinatesystem-line-raster.sk
new file mode 100644
index 0000000000..fe73f5a169
--- /dev/null
+++ b/doc/src/diagrams/coordinatesystem-line-raster.sk
@@ -0,0 +1,301 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+r(25,0,0,-25,120.125,734.875)
+lw(1)
+r(25,0,0,-25,120.125,584.875)
+fp((0.255,0.517,0.194))
+lw(1)
+r(25,0,0,-25,270.125,734.875)
+lw(1)
+r(25,0,0,-25,270.125,584.875)
+lw(1)
+r(25,0,0,-25,120.125,659.875)
+lw(1)
+r(25,0,0,-25,270.125,659.875)
+lw(1)
+r(25,0,0,-25,120,760)
+lw(1)
+r(25,0,0,-25,120,610)
+lw(1)
+r(25,0,0,-25,270,760)
+lw(1)
+r(25,0,0,-25,270,610)
+lw(1)
+r(25,0,0,-25,120,685)
+lw(1)
+r(25,0,0,-25,270,685)
+lw(1)
+r(25,0,0,-25,120.125,710.125)
+lw(1)
+r(25,0,0,-25,120.125,560.125)
+lw(1)
+r(25,0,0,-25,270.125,710.125)
+lw(1)
+r(25,0,0,-25,270.125,560.125)
+lw(1)
+r(25,0,0,-25,120.125,635.125)
+lw(1)
+r(25,0,0,-25,270.125,635.125)
+lw(1)
+r(25,0,0,-25,195.125,734.875)
+lw(1)
+r(25,0,0,-25,195.125,584.875)
+lw(1)
+r(25,0,0,-25,320.125,734.875)
+lw(1)
+r(25,0,0,-25,320.125,584.875)
+lw(1)
+r(25,0,0,-25,195.125,659.875)
+lw(1)
+r(25,0,0,-25,320.125,659.875)
+lw(1)
+r(25,0,0,-25,195,760)
+fp((0.255,0.517,0.194))
+lw(1)
+r(25,0,0,-25,195,610)
+lw(1)
+r(25,0,0,-25,320,760)
+lw(1)
+r(25,0,0,-25,320,610)
+lw(1)
+r(25,0,0,-25,195,685)
+lw(1)
+r(25,0,0,-25,320,685)
+lw(1)
+r(25,0,0,-25,195.125,710.125)
+lw(1)
+r(25,0,0,-25,195.125,560.125)
+lw(1)
+r(25,0,0,-25,320.125,710.125)
+lw(1)
+r(25,0,0,-25,320.125,560.125)
+fp((0.255,0.517,0.194))
+lw(1)
+r(25,0,0,-25,195.125,635.125)
+lw(1)
+r(25,0,0,-25,320.125,635.125)
+lw(1)
+r(25,0,0,-25,145.125,734.875)
+lw(1)
+r(25,0,0,-25,145.125,584.875)
+lw(1)
+r(25,0,0,-25,145.125,659.875)
+lw(1)
+r(25,0,0,-25,145,760)
+lw(1)
+r(25,0,0,-25,145,610)
+lw(1)
+r(25,0,0,-25,145,685)
+lw(1)
+r(25,0,0,-25,145.125,710.125)
+lw(1)
+r(25,0,0,-25,145.125,560.125)
+lw(1)
+r(25,0,0,-25,145.125,635.125)
+lw(1)
+r(25,0,0,-25,220.125,734.875)
+lw(1)
+r(25,0,0,-25,220.125,584.875)
+fp((0.255,0.517,0.194))
+lw(1)
+r(25,0,0,-25,220.125,659.875)
+lw(1)
+r(25,0,0,-25,220,760)
+lw(1)
+r(25,0,0,-25,220,610)
+lw(1)
+r(25,0,0,-25,220,685)
+lw(1)
+r(25,0,0,-25,220.125,710.125)
+lw(1)
+r(25,0,0,-25,220.125,560.125)
+lw(1)
+r(25,0,0,-25,220.125,635.125)
+lw(1)
+r(25,0,0,-25,170.125,734.875)
+fp((0.255,0.517,0.194))
+lw(1)
+r(25,0,0,-25,170.125,584.875)
+lw(1)
+r(25,0,0,-25,295.125,734.875)
+lw(1)
+r(25,0,0,-25,295.125,584.875)
+lw(1)
+r(25,0,0,-25,170.125,659.875)
+lw(1)
+r(25,0,0,-25,295.125,659.875)
+lw(1)
+r(25,0,0,-25,170,760)
+lw(1)
+r(25,0,0,-25,170,610)
+lw(1)
+r(25,0,0,-25,295,760)
+lw(1)
+r(25,0,0,-25,295,610)
+lw(1)
+r(25,0,0,-25,170,685)
+lw(1)
+r(25,0,0,-25,295,685)
+lw(1)
+r(25,0,0,-25,170.125,710.125)
+lw(1)
+r(25,0,0,-25,170.125,560.125)
+lw(1)
+r(25,0,0,-25,295.125,710.125)
+lw(1)
+r(25,0,0,-25,295.125,560.125)
+lw(1)
+r(25,0,0,-25,170.125,635.125)
+lw(1)
+r(25,0,0,-25,295.125,635.125)
+lw(1)
+r(25,0,0,-25,245.125,734.875)
+lw(1)
+r(25,0,0,-25,245.125,584.875)
+lw(1)
+r(25,0,0,-25,245.125,659.875)
+lw(1)
+r(25,0,0,-25,245,760)
+lw(1)
+r(25,0,0,-25,245,610)
+fp((0.255,0.517,0.194))
+lw(1)
+r(25,0,0,-25,245,685)
+fp((0.255,0.517,0.194))
+lw(1)
+r(25,0,0,-25,245.125,710.125)
+lw(1)
+r(25,0,0,-25,245.125,560.125)
+lw(1)
+r(25,0,0,-25,245.125,635.125)
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('1  ',(141.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('1  ',(105.496,729.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('2',(166,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('2',(105.496,703.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('3',(191,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('3',(105.496,678.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('4',(215,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('4',(105.496,653.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('5',(240.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('5',(105.496,628.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('6',(265,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('6',(105.496,604.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('7',(291,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('7',(105.496,577.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('8',(314,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('8',(105.496,553.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('9',(340.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('9',(105.496,527.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('0',(115.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('0',(105.496,752.445))
+fp((0.631,0.207,0.072))
+lw(1)
+e(5,0,0,-5,270,736)
+fp((0.631,0.207,0.072))
+lw(1)
+e(5,0,0,-5,170.5,585.75)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/coordinatesystem-line.sk b/doc/src/diagrams/coordinatesystem-line.sk
new file mode 100644
index 0000000000..24f46c47c0
--- /dev/null
+++ b/doc/src/diagrams/coordinatesystem-line.sk
@@ -0,0 +1,297 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+r(25,0,0,-25,120.125,734.875)
+lw(1)
+r(25,0,0,-25,120.125,584.875)
+lw(1)
+r(25,0,0,-25,270.125,734.875)
+lw(1)
+r(25,0,0,-25,270.125,584.875)
+lw(1)
+r(25,0,0,-25,120.125,659.875)
+lw(1)
+r(25,0,0,-25,270.125,659.875)
+fp((0.255,0.517,0.194))
+lw(1)
+r(114.376,169.485,19.5726,-13.2045,152.901,582.485)
+lw(1)
+r(25,0,0,-25,120,760)
+lw(1)
+r(25,0,0,-25,120,610)
+lw(1)
+r(25,0,0,-25,270,760)
+lw(1)
+r(25,0,0,-25,270,610)
+lw(1)
+r(25,0,0,-25,120,685)
+lw(1)
+r(25,0,0,-25,270,685)
+lw(1)
+r(25,0,0,-25,120.125,710.125)
+lw(1)
+r(25,0,0,-25,120.125,560.125)
+lw(1)
+r(25,0,0,-25,270.125,710.125)
+lw(1)
+r(25,0,0,-25,270.125,560.125)
+lw(1)
+r(25,0,0,-25,120.125,635.125)
+lw(1)
+r(25,0,0,-25,270.125,635.125)
+lw(1)
+r(25,0,0,-25,195.125,734.875)
+lw(1)
+r(25,0,0,-25,195.125,584.875)
+lw(1)
+r(25,0,0,-25,320.125,734.875)
+lw(1)
+r(25,0,0,-25,320.125,584.875)
+lw(1)
+r(25,0,0,-25,195.125,659.875)
+lw(1)
+r(25,0,0,-25,320.125,659.875)
+lw(1)
+r(25,0,0,-25,195,760)
+lw(1)
+r(25,0,0,-25,195,610)
+lw(1)
+r(25,0,0,-25,320,760)
+lw(1)
+r(25,0,0,-25,320,610)
+lw(1)
+r(25,0,0,-25,195,685)
+lw(1)
+r(25,0,0,-25,320,685)
+lw(1)
+r(25,0,0,-25,195.125,710.125)
+lw(1)
+r(25,0,0,-25,195.125,560.125)
+lw(1)
+r(25,0,0,-25,320.125,710.125)
+lw(1)
+r(25,0,0,-25,320.125,560.125)
+lw(1)
+r(25,0,0,-25,195.125,635.125)
+lw(1)
+r(25,0,0,-25,320.125,635.125)
+lw(1)
+r(25,0,0,-25,145.125,734.875)
+lw(1)
+r(25,0,0,-25,145.125,584.875)
+lw(1)
+r(25,0,0,-25,145.125,659.875)
+lw(1)
+r(25,0,0,-25,145,760)
+lw(1)
+r(25,0,0,-25,145,610)
+lw(1)
+r(25,0,0,-25,145,685)
+lw(1)
+r(25,0,0,-25,145.125,710.125)
+lw(1)
+r(25,0,0,-25,145.125,560.125)
+lw(1)
+r(25,0,0,-25,145.125,635.125)
+lw(1)
+r(25,0,0,-25,220.125,734.875)
+lw(1)
+r(25,0,0,-25,220.125,584.875)
+lw(1)
+r(25,0,0,-25,220.125,659.875)
+lw(1)
+r(25,0,0,-25,220,760)
+lw(1)
+r(25,0,0,-25,220,610)
+lw(1)
+r(25,0,0,-25,220,685)
+lw(1)
+r(25,0,0,-25,220.125,710.125)
+lw(1)
+r(25,0,0,-25,220.125,560.125)
+lw(1)
+r(25,0,0,-25,220.125,635.125)
+lw(1)
+r(25,0,0,-25,170.125,734.875)
+lw(1)
+r(25,0,0,-25,170.125,584.875)
+lw(1)
+r(25,0,0,-25,295.125,734.875)
+lw(1)
+r(25,0,0,-25,295.125,584.875)
+lw(1)
+r(25,0,0,-25,170.125,659.875)
+lw(1)
+r(25,0,0,-25,295.125,659.875)
+lw(1)
+r(25,0,0,-25,170,760)
+lw(1)
+r(25,0,0,-25,170,610)
+lw(1)
+r(25,0,0,-25,295,760)
+lw(1)
+r(25,0,0,-25,295,610)
+lw(1)
+r(25,0,0,-25,170,685)
+lw(1)
+r(25,0,0,-25,295,685)
+lw(1)
+r(25,0,0,-25,170.125,710.125)
+lw(1)
+r(25,0,0,-25,170.125,560.125)
+lw(1)
+r(25,0,0,-25,295.125,710.125)
+lw(1)
+r(25,0,0,-25,295.125,560.125)
+lw(1)
+r(25,0,0,-25,170.125,635.125)
+lw(1)
+r(25,0,0,-25,295.125,635.125)
+lw(1)
+r(25,0,0,-25,245.125,734.875)
+lw(1)
+r(25,0,0,-25,245.125,584.875)
+lw(1)
+r(25,0,0,-25,245.125,659.875)
+lw(1)
+r(25,0,0,-25,245,760)
+lw(1)
+r(25,0,0,-25,245,610)
+lw(1)
+r(25,0,0,-25,245,685)
+lw(1)
+r(25,0,0,-25,245.125,710.125)
+lw(1)
+r(25,0,0,-25,245.125,560.125)
+lw(1)
+r(25,0,0,-25,245.125,635.125)
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('1  ',(141.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('1  ',(105.496,729.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('2',(166,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('2',(105.496,703.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('3',(191,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('3',(105.496,678.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('4',(215,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('4',(105.496,653.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('5',(240.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('5',(105.496,628.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('6',(265,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('6',(105.496,604.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('7',(291,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('7',(105.496,577.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('8',(314,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('8',(105.496,553.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('9',(340.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('9',(105.496,527.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('0',(115.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('0',(105.496,752.445))
+fp((0.631,0.207,0.072))
+lw(1)
+e(5,0,0,-5,270.5,735.5)
+fp((0.631,0.207,0.072))
+lw(1)
+e(5,0,0,-5,169.5,584.75)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/coordinatesystem-rect-antialias.sk b/doc/src/diagrams/coordinatesystem-rect-antialias.sk
new file mode 100644
index 0000000000..30d7a610d4
--- /dev/null
+++ b/doc/src/diagrams/coordinatesystem-rect-antialias.sk
@@ -0,0 +1,334 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((0.73,0.866,0.68))
+lw(1)
+r(25,0,0,-25,120.125,734.875)
+lw(1)
+r(25,0,0,-25,120.125,584.875)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,270.125,734.875)
+lw(1)
+r(25,0,0,-25,270.125,584.875)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,120.125,659.875)
+fp((0.336,0.691,0.26))
+lw(1)
+r(25,0,0,-25,270.125,659.875)
+lw(1)
+r(25,0,0,-25,120,760)
+fp((0.73,0.866,0.68))
+lw(1)
+r(25,0,0,-25,120,610)
+lw(1)
+r(25,0,0,-25,270,760)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,270,610)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,120,685)
+fp((0.336,0.691,0.26))
+lw(1)
+r(25,0,0,-25,270,685)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,120.125,710.125)
+lw(1)
+r(25,0,0,-25,120.125,560.125)
+fp((0.255,0.517,0.194))
+lw(1)
+r(25,0,0,-25,270.125,710.125)
+lw(1)
+r(25,0,0,-25,270.125,560.125)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,120.125,635.125)
+fp((0.255,0.517,0.194))
+lw(1)
+r(25,0,0,-25,270.125,635.125)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,195.125,734.875)
+lw(1)
+r(25,0,0,-25,195.125,584.875)
+lw(1)
+r(25,0,0,-25,320.125,734.875)
+lw(1)
+r(25,0,0,-25,320.125,584.875)
+lw(1)
+r(25,0,0,-25,195.125,659.875)
+lw(1)
+r(25,0,0,-25,320.125,659.875)
+lw(1)
+r(25,0,0,-25,195,760)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,195,610)
+lw(1)
+r(25,0,0,-25,320,760)
+lw(1)
+r(25,0,0,-25,320,610)
+lw(1)
+r(25,0,0,-25,195,685)
+lw(1)
+r(25,0,0,-25,320,685)
+fp((0.336,0.691,0.26))
+lw(1)
+r(25,0,0,-25,195.125,710.125)
+lw(1)
+r(25,0,0,-25,195.125,560.125)
+lw(1)
+r(25,0,0,-25,320.125,710.125)
+lw(1)
+r(25,0,0,-25,320.125,560.125)
+fp((0.336,0.691,0.26))
+lw(1)
+r(25,0,0,-25,195.125,635.125)
+lw(1)
+r(25,0,0,-25,320.125,635.125)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,145.125,734.875)
+lw(1)
+r(25,0,0,-25,145.125,584.875)
+fp((0.336,0.691,0.26))
+lw(1)
+r(25,0,0,-25,145.125,659.875)
+lw(1)
+r(25,0,0,-25,145,760)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,145,610)
+fp((0.336,0.691,0.26))
+lw(1)
+r(25,0,0,-25,145,685)
+fp((0.255,0.517,0.194))
+lw(1)
+r(25,0,0,-25,145.125,710.125)
+lw(1)
+r(25,0,0,-25,145.125,560.125)
+fp((0.255,0.517,0.194))
+lw(1)
+r(25,0,0,-25,145.125,635.125)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,220.125,734.875)
+lw(1)
+r(25,0,0,-25,220.125,584.875)
+lw(1)
+r(25,0,0,-25,220.125,659.875)
+lw(1)
+r(25,0,0,-25,220,760)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,220,610)
+lw(1)
+r(25,0,0,-25,220,685)
+fp((0.336,0.691,0.26))
+lw(1)
+r(25,0,0,-25,220.125,710.125)
+lw(1)
+r(25,0,0,-25,220.125,560.125)
+fp((0.336,0.691,0.26))
+lw(1)
+r(25,0,0,-25,220.125,635.125)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,170.125,734.875)
+lw(1)
+r(25,0,0,-25,170.125,584.875)
+fp((0.73,0.866,0.68))
+lw(1)
+r(25,0,0,-25,295.125,734.875)
+lw(1)
+r(25,0,0,-25,295.125,584.875)
+lw(1)
+r(25,0,0,-25,170.125,659.875)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,295.125,659.875)
+lw(1)
+r(25,0,0,-25,170,760)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,170,610)
+lw(1)
+r(25,0,0,-25,295,760)
+fp((0.73,0.866,0.68))
+lw(1)
+r(25,0,0,-25,295,610)
+lw(1)
+r(25,0,0,-25,170,685)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,295,685)
+fp((0.336,0.691,0.26))
+lw(1)
+r(25,0,0,-25,170.125,710.125)
+lw(1)
+r(25,0,0,-25,170.125,560.125)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,295.125,710.125)
+lw(1)
+r(25,0,0,-25,295.125,560.125)
+fp((0.336,0.691,0.26))
+lw(1)
+r(25,0,0,-25,170.125,635.125)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,295.125,635.125)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,245.125,734.875)
+lw(1)
+r(25,0,0,-25,245.125,584.875)
+lw(1)
+r(25,0,0,-25,245.125,659.875)
+lw(1)
+r(25,0,0,-25,245,760)
+fp((0.583,0.819,0.374))
+lw(1)
+r(25,0,0,-25,245,610)
+lw(1)
+r(25,0,0,-25,245,685)
+fp((0.336,0.691,0.26))
+lw(1)
+r(25,0,0,-25,245.125,710.125)
+lw(1)
+r(25,0,0,-25,245.125,560.125)
+fp((0.336,0.691,0.26))
+lw(1)
+r(25,0,0,-25,245.125,635.125)
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('1  ',(141.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('1  ',(105.496,729.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('2',(166,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('2',(105.496,703.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('3',(191,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('3',(105.496,678.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('4',(215,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('4',(105.496,653.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('5',(240.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('5',(105.496,628.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('6',(265,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('6',(105.496,604.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('7',(291,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('7',(105.496,577.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('8',(314,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('8',(105.496,553.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('9',(340.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('9',(105.496,527.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('0',(115.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('0',(105.496,752.445))
+fp((0.631,0.207,0.072))
+lw(1)
+e(5,0,0,-5,295,610)
+fp((0.631,0.207,0.072))
+lw(1)
+e(5,0,0,-5,144.5,709.75)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/coordinatesystem-rect-raster.sk b/doc/src/diagrams/coordinatesystem-rect-raster.sk
new file mode 100644
index 0000000000..7de01afb1b
--- /dev/null
+++ b/doc/src/diagrams/coordinatesystem-rect-raster.sk
@@ -0,0 +1,314 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+r(25,0,0,-25,120.125,734.875)
+lw(1)
+r(25,0,0,-25,120.125,584.875)
+lw(1)
+r(25,0,0,-25,270.125,734.875)
+lw(1)
+r(25,0,0,-25,270.125,584.875)
+lw(1)
+r(25,0,0,-25,120.125,659.875)
+lw(1)
+r(25,0,0,-25,270.125,659.875)
+lw(1)
+r(25,0,0,-25,120,760)
+lw(1)
+r(25,0,0,-25,120,610)
+lw(1)
+r(25,0,0,-25,270,760)
+fp((0.34,0.564,0.196))
+lw(1)
+r(25,0,0,-25,270,610)
+lw(1)
+r(25,0,0,-25,120,685)
+lw(1)
+r(25,0,0,-25,270,685)
+lw(1)
+r(25,0,0,-25,120.125,710.125)
+lw(1)
+r(25,0,0,-25,120.125,560.125)
+fp((0.34,0.564,0.196))
+lw(1)
+r(25,0,0,-25,270.125,710.125)
+lw(1)
+r(25,0,0,-25,270.125,560.125)
+lw(1)
+r(25,0,0,-25,120.125,635.125)
+lw(1)
+r(25,0,0,-25,270.125,635.125)
+lw(1)
+r(25,0,0,-25,195.125,734.875)
+lw(1)
+r(25,0,0,-25,195.125,584.875)
+lw(1)
+r(25,0,0,-25,320.125,734.875)
+lw(1)
+r(25,0,0,-25,320.125,584.875)
+lw(1)
+r(25,0,0,-25,195.125,659.875)
+lw(1)
+r(25,0,0,-25,320.125,659.875)
+lw(1)
+r(25,0,0,-25,195,760)
+fp((0.34,0.564,0.196))
+lw(1)
+r(25,0,0,-25,195,610)
+lw(1)
+r(25,0,0,-25,320,760)
+lw(1)
+r(25,0,0,-25,320,610)
+lw(1)
+r(25,0,0,-25,195,685)
+lw(1)
+r(25,0,0,-25,320,685)
+fp((0.34,0.564,0.196))
+lw(1)
+r(25,0,0,-25,195.125,710.125)
+lw(1)
+r(25,0,0,-25,195.125,560.125)
+lw(1)
+r(25,0,0,-25,320.125,710.125)
+lw(1)
+r(25,0,0,-25,320.125,560.125)
+lw(1)
+r(25,0,0,-25,195.125,635.125)
+lw(1)
+r(25,0,0,-25,320.125,635.125)
+lw(1)
+r(25,0,0,-25,145.125,734.875)
+lw(1)
+r(25,0,0,-25,145.125,584.875)
+fp((0.34,0.564,0.196))
+lw(1)
+r(25,0,0,-25,145.125,659.875)
+lw(1)
+r(25,0,0,-25,145,760)
+fp((0.34,0.564,0.196))
+lw(1)
+r(25,0,0,-25,145,610)
+fp((0.34,0.564,0.196))
+lw(1)
+r(25,0,0,-25,145,685)
+fp((0.34,0.564,0.196))
+lw(1)
+r(25,0,0,-25,145.125,710.125)
+lw(1)
+r(25,0,0,-25,145.125,560.125)
+fp((0.34,0.564,0.196))
+lw(1)
+r(25,0,0,-25,145.125,635.125)
+lw(1)
+r(25,0,0,-25,220.125,734.875)
+lw(1)
+r(25,0,0,-25,220.125,584.875)
+lw(1)
+r(25,0,0,-25,220.125,659.875)
+lw(1)
+r(25,0,0,-25,220,760)
+fp((0.34,0.564,0.196))
+lw(1)
+r(25,0,0,-25,220,610)
+lw(1)
+r(25,0,0,-25,220,685)
+fp((0.34,0.564,0.196))
+lw(1)
+r(25,0,0,-25,220.125,710.125)
+lw(1)
+r(25,0,0,-25,220.125,560.125)
+lw(1)
+r(25,0,0,-25,220.125,635.125)
+lw(1)
+r(25,0,0,-25,170.125,734.875)
+lw(1)
+r(25,0,0,-25,170.125,584.875)
+lw(1)
+r(25,0,0,-25,295.125,734.875)
+lw(1)
+r(25,0,0,-25,295.125,584.875)
+lw(1)
+r(25,0,0,-25,170.125,659.875)
+fp((0.34,0.564,0.196))
+lw(1)
+r(25,0,0,-25,295.125,659.875)
+lw(1)
+r(25,0,0,-25,170,760)
+fp((0.34,0.564,0.196))
+lw(1)
+r(25,0,0,-25,170,610)
+lw(1)
+r(25,0,0,-25,295,760)
+fp((0.34,0.564,0.196))
+lw(1)
+r(25,0,0,-25,295,610)
+lw(1)
+r(25,0,0,-25,170,685)
+fp((0.34,0.564,0.196))
+lw(1)
+r(25,0,0,-25,295,685)
+fp((0.34,0.564,0.196))
+lw(1)
+r(25,0,0,-25,170.125,710.125)
+lw(1)
+r(25,0,0,-25,170.125,560.125)
+fp((0.34,0.564,0.196))
+lw(1)
+r(25,0,0,-25,295.125,710.125)
+lw(1)
+r(25,0,0,-25,295.125,560.125)
+lw(1)
+r(25,0,0,-25,170.125,635.125)
+fp((0.34,0.564,0.196))
+lw(1)
+r(25,0,0,-25,295.125,635.125)
+lw(1)
+r(25,0,0,-25,245.125,734.875)
+lw(1)
+r(25,0,0,-25,245.125,584.875)
+lw(1)
+r(25,0,0,-25,245.125,659.875)
+lw(1)
+r(25,0,0,-25,245,760)
+fp((0.34,0.564,0.196))
+lw(1)
+r(25,0,0,-25,245,610)
+lw(1)
+r(25,0,0,-25,245,685)
+fp((0.34,0.564,0.196))
+lw(1)
+r(25,0,0,-25,245.125,710.125)
+lw(1)
+r(25,0,0,-25,245.125,560.125)
+lw(1)
+r(25,0,0,-25,245.125,635.125)
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('1  ',(141.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('1  ',(105.496,729.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('2',(166,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('2',(105.496,703.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('3',(191,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('3',(105.496,678.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('4',(215,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('4',(105.496,653.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('5',(240.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('5',(105.496,628.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('6',(265,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('6',(105.496,604.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('7',(291,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('7',(105.496,577.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('8',(314,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('8',(105.496,553.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('9',(340.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('9',(105.496,527.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('0',(115.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('0',(105.496,752.445))
+fp((0.631,0.207,0.072))
+lw(1)
+e(5,0,0,-5,145,710)
+fp((0.631,0.207,0.072))
+lw(1)
+e(5,0,0,-5,294.75,610)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/coordinatesystem-rect.sk b/doc/src/diagrams/coordinatesystem-rect.sk
new file mode 100644
index 0000000000..2b95f6433a
--- /dev/null
+++ b/doc/src/diagrams/coordinatesystem-rect.sk
@@ -0,0 +1,305 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((0.371,0.57,0.195))
+lw(1)
+r(174.5,0,0,-125.5,133.138,722.445)
+phs((0.216,0.403,0.141),(0.371,0.569,0.195),1,0,2,0.5)
+fp()
+lw(1)
+r(150,0,0,-100,145.138,709.945)
+phs((0.216,0.403,0.141),(0.991,1,0.991),1,0,2,0.5)
+fp()
+lw(1)
+r(127,0,0,-79.5,155.638,699.945)
+lw(1)
+r(25,0,0,-25,120.125,734.875)
+lw(1)
+r(25,0,0,-25,120.125,584.875)
+lw(1)
+r(25,0,0,-25,270.125,734.875)
+lw(1)
+r(25,0,0,-25,270.125,584.875)
+lw(1)
+r(25,0,0,-25,120.125,659.875)
+lw(1)
+r(25,0,0,-25,270.125,659.875)
+lw(1)
+r(25,0,0,-25,120,760)
+lw(1)
+r(25,0,0,-25,120,610)
+lw(1)
+r(25,0,0,-25,270,760)
+lw(1)
+r(25,0,0,-25,270,610)
+lw(1)
+r(25,0,0,-25,120,685)
+lw(1)
+r(25,0,0,-25,270,685)
+lw(1)
+r(25,0,0,-25,120.125,710.125)
+lw(1)
+r(25,0,0,-25,120.125,560.125)
+lw(1)
+r(25,0,0,-25,270.125,710.125)
+lw(1)
+r(25,0,0,-25,270.125,560.125)
+lw(1)
+r(25,0,0,-25,120.125,635.125)
+lw(1)
+r(25,0,0,-25,270.125,635.125)
+lw(1)
+r(25,0,0,-25,195.125,734.875)
+lw(1)
+r(25,0,0,-25,195.125,584.875)
+lw(1)
+r(25,0,0,-25,320.125,734.875)
+lw(1)
+r(25,0,0,-25,320.125,584.875)
+lw(1)
+r(25,0,0,-25,195.125,659.875)
+lw(1)
+r(25,0,0,-25,320.125,659.875)
+lw(1)
+r(25,0,0,-25,195,760)
+lw(1)
+r(25,0,0,-25,195,610)
+lw(1)
+r(25,0,0,-25,320,760)
+lw(1)
+r(25,0,0,-25,320,610)
+lw(1)
+r(25,0,0,-25,195,685)
+lw(1)
+r(25,0,0,-25,320,685)
+lw(1)
+r(25,0,0,-25,195.125,710.125)
+lw(1)
+r(25,0,0,-25,195.125,560.125)
+lw(1)
+r(25,0,0,-25,320.125,710.125)
+lw(1)
+r(25,0,0,-25,320.125,560.125)
+lw(1)
+r(25,0,0,-25,195.125,635.125)
+lw(1)
+r(25,0,0,-25,320.125,635.125)
+lw(1)
+r(25,0,0,-25,145.125,734.875)
+lw(1)
+r(25,0,0,-25,145.125,584.875)
+lw(1)
+r(25,0,0,-25,145.125,659.875)
+lw(1)
+r(25,0,0,-25,145,760)
+lw(1)
+r(25,0,0,-25,145,610)
+lw(1)
+r(25,0,0,-25,145,685)
+lw(1)
+r(25,0,0,-25,145.125,710.125)
+lw(1)
+r(25,0,0,-25,145.125,560.125)
+lw(1)
+r(25,0,0,-25,145.125,635.125)
+lw(1)
+r(25,0,0,-25,220.125,734.875)
+lw(1)
+r(25,0,0,-25,220.125,584.875)
+lw(1)
+r(25,0,0,-25,220.125,659.875)
+lw(1)
+r(25,0,0,-25,220,760)
+lw(1)
+r(25,0,0,-25,220,610)
+lw(1)
+r(25,0,0,-25,220,685)
+lw(1)
+r(25,0,0,-25,220.125,710.125)
+lw(1)
+r(25,0,0,-25,220.125,560.125)
+lw(1)
+r(25,0,0,-25,220.125,635.125)
+lw(1)
+r(25,0,0,-25,170.125,734.875)
+lw(1)
+r(25,0,0,-25,170.125,584.875)
+lw(1)
+r(25,0,0,-25,295.125,734.875)
+lw(1)
+r(25,0,0,-25,295.125,584.875)
+lw(1)
+r(25,0,0,-25,170.125,659.875)
+lw(1)
+r(25,0,0,-25,295.125,659.875)
+lw(1)
+r(25,0,0,-25,170,760)
+lw(1)
+r(25,0,0,-25,170,610)
+lw(1)
+r(25,0,0,-25,295,760)
+lw(1)
+r(25,0,0,-25,295,610)
+lw(1)
+r(25,0,0,-25,170,685)
+lw(1)
+r(25,0,0,-25,295,685)
+lw(1)
+r(25,0,0,-25,170.125,710.125)
+lw(1)
+r(25,0,0,-25,170.125,560.125)
+lw(1)
+r(25,0,0,-25,295.125,710.125)
+lw(1)
+r(25,0,0,-25,295.125,560.125)
+lw(1)
+r(25,0,0,-25,170.125,635.125)
+lw(1)
+r(25,0,0,-25,295.125,635.125)
+lw(1)
+r(25,0,0,-25,245.125,734.875)
+lw(1)
+r(25,0,0,-25,245.125,584.875)
+lw(1)
+r(25,0,0,-25,245.125,659.875)
+lw(1)
+r(25,0,0,-25,245,760)
+lw(1)
+r(25,0,0,-25,245,610)
+lw(1)
+r(25,0,0,-25,245,685)
+lw(1)
+r(25,0,0,-25,245.125,710.125)
+lw(1)
+r(25,0,0,-25,245.125,560.125)
+lw(1)
+r(25,0,0,-25,245.125,635.125)
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('1  ',(141.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('1  ',(105.496,729.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('2',(166,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('2',(105.496,703.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('3',(191,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('3',(105.496,678.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('4',(215,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('4',(105.496,653.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('5',(240.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('5',(105.496,628.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('6',(265,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('6',(105.496,604.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('7',(291,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('7',(105.496,577.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('8',(314,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('8',(105.496,553.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('9',(340.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('9',(105.496,527.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('0',(115.5,766.794))
+fp((0,0,0))
+le()
+lw(1)
+Fn('NimbusSanL-Bold')
+Fs(14)
+txt('0',(105.496,752.445))
+fp((0.631,0.207,0.072))
+lw(1)
+e(5,0,0,-5,145,710)
+fp((0.631,0.207,0.072))
+lw(1)
+e(5,0,0,-5,294.75,610)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/coordinatesystem-transformations.sk b/doc/src/diagrams/coordinatesystem-transformations.sk
new file mode 100644
index 0000000000..cdadf105d6
--- /dev/null
+++ b/doc/src/diagrams/coordinatesystem-transformations.sk
@@ -0,0 +1,121 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+ld((4, 4))
+r(54,0,0,-54,47.6378,695.445)
+lw(1)
+ld((4, 4))
+r(54,0,0,-54,287.138,692.945)
+lw(1)
+ld((4, 4))
+r(54,0,0,-54,507.638,691.945)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+txt('World Coordinates',(11.6378,604.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+txt('"Window" Coordinates',(236.638,604.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+txt('Device Coordinates',(477.638,605.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+txt('(logical)',(36.6378,588.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+txt('transformation matrix',(85.6378,522.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+txt('window-viewport conversion',(303.138,522.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+txt('(physical)',(505.138,589.945))
+fp((0.346,0.523,0.281))
+lw(1)
+b()
+bs(151.638,704.445,0)
+bs(152.138,658.945,0)
+bs(185.638,658.945,0)
+bs(186.138,636.445,0)
+bs(218.638,680.945,0)
+bs(185.638,726.445,0)
+bs(185.638,705.445,0)
+bs(151.638,705.445,0)
+fp((0.346,0.523,0.281))
+lw(1)
+b()
+bs(381.638,704.445,0)
+bs(382.138,658.945,0)
+bs(415.638,658.945,0)
+bs(416.138,636.445,0)
+bs(448.638,680.945,0)
+bs(415.638,726.445,0)
+bs(415.638,705.445,0)
+bs(381.638,705.445,0)
+gl([(0,(0.705,0.623,0.285)),(0.39,(0.664,0.587,0.267)),(1,(0.987,0.995,1))])
+pgc(0.5,0.5,1,0)
+fp()
+lw(1)
+e(24,0,0,-24,313.638,665.945)
+gl([(0,(0.705,0.623,0.285)),(0.39,(0.664,0.587,0.267)),(1,(0.987,0.995,1))])
+pgc(0.5,0.5,1,0)
+fp()
+lw(1)
+e(24,0,0,-24,534.138,664.945)
+gl([(0,(0.705,0.623,0.285)),(0.39,(0.664,0.587,0.267)),(1,(0.987,0.995,1))])
+pgc(0.5,0.5,1,0)
+fp()
+lw(1)
+e(24,0,0,-24,47.6378,696.945)
+fp((0.346,0.523,0.281))
+lw(1)
+e(2.25,0,0,-2.25,47.8878,696.695)
+fp((0.346,0.523,0.281))
+lw(1)
+e(2.25,0,0,-2.25,314.388,666.695)
+fp((0.346,0.523,0.281))
+lw(1)
+e(2.25,0,0,-2.25,534.888,664.195)
+lp((0.624,0.168,0.168))
+lw(1)
+b()
+bs(183.638,680.945,0)
+bc(183.638,680.945,249.138,604.945,139.138,541.945,2)
+lp((0.651,0.201,0.087))
+lw(1)
+b()
+bs(417.638,678.445,0)
+bc(417.638,678.445,483.138,602.445,373.138,539.445,2)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+txt('(0,0)',(36.6378,702.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+txt('(50,50)',(272.638,671.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+txt('(296, 296)',(478.638,670.445))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/customcompleter-example.png b/doc/src/diagrams/customcompleter-example.png
new file mode 100644
index 0000000000..a525208118
--- /dev/null
+++ b/doc/src/diagrams/customcompleter-example.png
diff --git a/doc/src/diagrams/customcompleter-example.zip b/doc/src/diagrams/customcompleter-example.zip
new file mode 100644
index 0000000000..fead6c4789
--- /dev/null
+++ b/doc/src/diagrams/customcompleter-example.zip
diff --git a/doc/src/diagrams/customwidgetplugin-example.png b/doc/src/diagrams/customwidgetplugin-example.png
new file mode 100644
index 0000000000..f20856954e
--- /dev/null
+++ b/doc/src/diagrams/customwidgetplugin-example.png
diff --git a/doc/src/diagrams/datetimewidgets.ui b/doc/src/diagrams/datetimewidgets.ui
new file mode 100644
index 0000000000..27e4637a27
--- /dev/null
+++ b/doc/src/diagrams/datetimewidgets.ui
@@ -0,0 +1,116 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>DateTimeWidgetsForm</class>
+ <widget class="QWidget" name="DateTimeWidgetsForm" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>328</width>
+    <height>105</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Date Time Widgets</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="label_3" >
+     <property name="font" >
+      <font>
+       <family>Bitstream Vera Sans</family>
+       <pointsize>9</pointsize>
+       <weight>75</weight>
+       <italic>false</italic>
+       <bold>true</bold>
+       <underline>false</underline>
+       <strikeout>false</strikeout>
+      </font>
+     </property>
+     <property name="text" >
+      <string>QDateTimeEdit</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="label_5" >
+     <property name="font" >
+      <font>
+       <family>Bitstream Vera Sans</family>
+       <pointsize>9</pointsize>
+       <weight>75</weight>
+       <italic>false</italic>
+       <bold>true</bold>
+       <underline>false</underline>
+       <strikeout>false</strikeout>
+      </font>
+     </property>
+     <property name="text" >
+      <string>QDateEdit</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="label_4" >
+     <property name="font" >
+      <font>
+       <family>Bitstream Vera Sans</family>
+       <pointsize>9</pointsize>
+       <weight>75</weight>
+       <italic>false</italic>
+       <bold>true</bold>
+       <underline>false</underline>
+       <strikeout>false</strikeout>
+      </font>
+     </property>
+     <property name="text" >
+      <string>QTimeEdit</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QDateTimeEdit" name="dateTimeEdit" >
+     <property name="displayFormat" >
+      <string>MMM d, yyyy hh:mm:ss</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QTimeEdit" name="timeEdit" >
+     <property name="time" >
+      <time>
+       <hour>1</hour>
+       <minute>45</minute>
+       <second>2</second>
+      </time>
+     </property>
+     <property name="displayFormat" >
+      <string>hh:mm:ss</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QDateEdit" name="dateEdit" >
+     <property name="time" >
+      <time>
+       <hour>13</hour>
+       <minute>45</minute>
+       <second>2</second>
+      </time>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/doc/src/diagrams/datetimewidgets.zip b/doc/src/diagrams/datetimewidgets.zip
new file mode 100644
index 0000000000..84fd5614cf
--- /dev/null
+++ b/doc/src/diagrams/datetimewidgets.zip
diff --git a/doc/src/diagrams/dbus-chat-example.png b/doc/src/diagrams/dbus-chat-example.png
new file mode 100644
index 0000000000..96a878ec48
--- /dev/null
+++ b/doc/src/diagrams/dbus-chat-example.png
diff --git a/doc/src/diagrams/dependencies.lout b/doc/src/diagrams/dependencies.lout
new file mode 100644
index 0000000000..d20f4f1105
--- /dev/null
+++ b/doc/src/diagrams/dependencies.lout
@@ -0,0 +1,106 @@
+@SysInclude { picture }
+@SysInclude { tbl }
+@SysInclude { diag }
+# lout -EPS dependencies.lout > dependencies.eps
+macro @TTGreenColour { {cmyk 0.40 0.00 1.00 0.01} }
+macro @TTPurpleColour { {cmyk 0.39 0.39 0.00 0.00} }
+macro @DefaultColour { rgb { 0.961 0.961 0.863 } }
+macro @FreetypeColour { rgb { 0.902 0.902 0.980 } }
+macro @GLColour { rgb { 1.000 0.753 0.796 } }
+macro @PthreadColour { rgb { 0.741 0.718 0.420 } }
+macro @OptionalColour { rgb { 0.792 0.882 1.000 } }
+macro @SMColour { rgb { 0.761 0.980 0.980 } }
+macro @MiscColour { rgb { 0.941 0.973 1.000 } }
+macro @GlibColour { rgb { 0.7 0.7 0.7 } }
+@Illustration
+    @InitialFont { Helvetica Base 14p }
+{
+@Centre @Diag
+    outline { shadowbox }
+    shadow { 0.15f }
+    margin { 0.5f }
+    hsize { 5f }
+    paint { @MiscColour }
+    arrowwidth { 0.55f }
+    arrowlength { 0.55f }
+    pathwidth { medium }
+    zindent { 0.1f }
+    radius { 0.5f }
+    #
+    bmargin { 0.5f }
+    boutlinestyle { noline }
+    #
+    coutlinestyle { noline }
+    cmargin { 0.5f }
+{
+@Tbl
+#    rule { yes } rulecolour { red }
+    indent { ctr }
+    iv { ctr }
+    marginvertical { 1.25f }
+    div { top }
+#    fmarginbelow { 0c }
+
+    aformat { @Cell A | @Cell B | @Cell marginbelow { 0c } font { +2p } C | @Cell D | @Cell E }
+    bformat { @Cell A | @Cell B | @Cell C | @Cell D | @Cell E | @Cell F }
+    cformat { @Cell A | @Cell B | @Cell C | @Cell D | @Cell marginleft { 1.5c } E | @Cell F }
+    dformat { @Cell A | @Cell B | @Cell C | @Cell D | @Cell E | @Cell F }
+    eformat { @Cell A | @Cell B | @Cell C | @Cell D | @Cell E | @Cell F }
+    fformat { @Cell A | @Cell B | @Cell C | @Cell D | @Cell E | @Cell F }
+    gformat { @Cell A | @Cell B | @Cell C | @Cell D | @StartHSpan @Cell E | @HSpan }
+{
+    @Rowa C { Qt"/"X11 library dependencies }
+    @Rowb C { QTGUI:: @Node paint { @TTGreenColour } QtGui }
+    @Rowc B { XCURSOR:: @Node paint { @OptionalColour } Xcursor }
+          C { XRANDR:: @Node paint { @OptionalColour } Xrandr }
+          D { XINERAMA:: @Node paint { @OptionalColour } Xinerama }
+          E { Xi:: @Node paint { @OptionalColour } Xi }
+    @Rowd C { XRENDER:: @Node paint { @OptionalColour } XRender }
+          F { Xt:: @Node paint { @DefaultColour } Xt* }
+    @Rowe A { QTCORE:: @Node paint { @TTPurpleColour } QtCore }
+          C { XFIXES:: @Node paint { @OptionalColour } Xfixes }
+	  D { XEXT:: @Node paint { @DefaultColour } Xext }
+          F { SM:: @Node paint { @SMColour } SM }
+    @Rowf A { PTHREAD:: @Node paint { @PthreadColour } pthread }
+          B { GLIB:: @Node paint { @GlibColour } Glib }
+          D { X:: @Node paint { @DefaultColour } X11 }
+          F { ICE:: @Node paint { @SMColour } ICE }
+    @Rowg E {
+	@Tbl
+	    font { -2p }
+	    margin { 0.15f }
+	    cmarginabove { 0c }
+	    iv { top }
+	    bformat { @Cell A | @Cell B | @Cell C }
+	    cformat { @Cell A | @Cell B | @Cell C }
+	    aformat { @StartHSpan @Cell A | @HSpan | @HSpan }
+	{
+	    @Rowb A { C:: @BNode {} } B { D:: @BNode {} }
+	          C { some configurations only }
+            @Rowb B { * } C { Xt intrinsics only }
+	}
+	} 
+}
+//
+@VHVCurveArrow from { QTGUI } to { XINERAMA } pathstyle { dotted }
+@VHVCurveArrow from { QTGUI } to { Xi } pathstyle { dotted }
+@HVCurveArrow from { QTGUI } to { QTCORE }
+@Arrow from { QTCORE } to { PTHREAD }
+@VHVCurveArrow from { QTCORE } to { GLIB } pathstyle { dotted }
+@HVCurveArrow from { QTGUI } to { Xt }
+@Arrow from { QTGUI } to { XRANDR } pathstyle { dotted }
+@VHVCurveArrow from { QTGUI } to { XCURSOR } pathstyle { dotted }
+@Arrow from { XRANDR } to { XRENDER }
+@Arrow from { XINERAMA } to { XEXT }
+@VHCurveArrow from { XCURSOR } to { XRENDER }
+@HVCurveArrow from { XRENDER } to { XEXT }
+@HVHCurveArrow from { Xi } to { XEXT }
+@Arrow from { Xt } to { SM }
+@HVHCurveArrow from { Xt } to { X }
+@Arrow from { SM } to { ICE }
+@Arrow from { XEXT } to { X }
+@VHCurveArrow from { XCURSOR } to { XFIXES }
+@VHVCurveArrow from { XFIXES } to { X }
+@Link from { C@W } to { D@E } pathstyle { dotted }
+}
+}
diff --git a/doc/src/diagrams/designer-adding-actions.txt b/doc/src/diagrams/designer-adding-actions.txt
new file mode 100644
index 0000000000..4124eccc7a
--- /dev/null
+++ b/doc/src/diagrams/designer-adding-actions.txt
@@ -0,0 +1,15 @@
+# Cropping and fading the Qt Designer action images.
+
+cropimage.py designer-adding-menu-action1.png designer-adding-menu-action1-crop.png left 57
+cropimage.py designer-adding-menu-action1-crop.png designer-adding-menu-action1-crop.png top 41
+cropimage.py designer-adding-menu-action1-crop.png designer-adding-menu-action1-crop.png right -180
+cropimage.py designer-adding-menu-action1-crop.png designer-adding-menu-action1-crop.png bottom -124
+fadeedges.py designer-adding-menu-action1-crop.png ../images/designer-adding-menu-action.png right,bottom 16
+rm designer-adding-menu-action1-crop.png
+
+cropimage.py designer-adding-toolbar-action1.png designer-adding-toolbar-action1-crop.png left 57
+cropimage.py designer-adding-toolbar-action1-crop.png designer-adding-toolbar-action1-crop.png top 41
+cropimage.py designer-adding-toolbar-action1-crop.png designer-adding-toolbar-action1-crop.png right -144
+cropimage.py designer-adding-toolbar-action1-crop.png designer-adding-toolbar-action1-crop.png bottom -124
+fadeedges.py designer-adding-toolbar-action1-crop.png ../images/designer-adding-toolbar-action.png right,bottom 16
+rm designer-adding-toolbar-action1-crop.png
diff --git a/doc/src/diagrams/designer-adding-dockwidget.txt b/doc/src/diagrams/designer-adding-dockwidget.txt
new file mode 100644
index 0000000000..97b4beb058
--- /dev/null
+++ b/doc/src/diagrams/designer-adding-dockwidget.txt
@@ -0,0 +1,8 @@
+# Cropping and fading the Qt Designer dock widget images.
+
+cropimage.py designer-adding-dockwidget1.png designer-adding-dockwidget1-crop.png left 11
+cropimage.py designer-adding-dockwidget1-crop.png designer-adding-dockwidget1-crop.png top 6
+cropimage.py designer-adding-dockwidget1-crop.png designer-adding-dockwidget1-crop.png right -201
+cropimage.py designer-adding-dockwidget1-crop.png designer-adding-dockwidget1-crop.png bottom -236
+fadeedges.py designer-adding-dockwidget1-crop.png ../images/designer-adding-dockwidget.png right,bottom 16
+rm designer-adding-dockwidget1-crop.png
diff --git a/doc/src/diagrams/designer-adding-dockwidget1.png b/doc/src/diagrams/designer-adding-dockwidget1.png
new file mode 100644
index 0000000000..960da833bb
--- /dev/null
+++ b/doc/src/diagrams/designer-adding-dockwidget1.png
diff --git a/doc/src/diagrams/designer-adding-dockwidget1.zip b/doc/src/diagrams/designer-adding-dockwidget1.zip
new file mode 100644
index 0000000000..0492df68a9
--- /dev/null
+++ b/doc/src/diagrams/designer-adding-dockwidget1.zip
diff --git a/doc/src/diagrams/designer-adding-dynamic-property.png b/doc/src/diagrams/designer-adding-dynamic-property.png
new file mode 100644
index 0000000000..8e81dd9cf8
--- /dev/null
+++ b/doc/src/diagrams/designer-adding-dynamic-property.png
diff --git a/doc/src/diagrams/designer-adding-menu-action1.png b/doc/src/diagrams/designer-adding-menu-action1.png
new file mode 100644
index 0000000000..cde92d997a
--- /dev/null
+++ b/doc/src/diagrams/designer-adding-menu-action1.png
diff --git a/doc/src/diagrams/designer-adding-menu-action1.zip b/doc/src/diagrams/designer-adding-menu-action1.zip
new file mode 100644
index 0000000000..08395eb873
--- /dev/null
+++ b/doc/src/diagrams/designer-adding-menu-action1.zip
diff --git a/doc/src/diagrams/designer-adding-menu-action2.zip b/doc/src/diagrams/designer-adding-menu-action2.zip
new file mode 100644
index 0000000000..ca1a5b3cd5
--- /dev/null
+++ b/doc/src/diagrams/designer-adding-menu-action2.zip
diff --git a/doc/src/diagrams/designer-adding-toolbar-action1.png b/doc/src/diagrams/designer-adding-toolbar-action1.png
new file mode 100644
index 0000000000..6b82373887
--- /dev/null
+++ b/doc/src/diagrams/designer-adding-toolbar-action1.png
diff --git a/doc/src/diagrams/designer-adding-toolbar-action1.zip b/doc/src/diagrams/designer-adding-toolbar-action1.zip
new file mode 100644
index 0000000000..e673b3ca42
--- /dev/null
+++ b/doc/src/diagrams/designer-adding-toolbar-action1.zip
diff --git a/doc/src/diagrams/designer-adding-toolbar-action2.zip b/doc/src/diagrams/designer-adding-toolbar-action2.zip
new file mode 100644
index 0000000000..96a9d69bfd
--- /dev/null
+++ b/doc/src/diagrams/designer-adding-toolbar-action2.zip
diff --git a/doc/src/diagrams/designer-creating-dynamic-property.png b/doc/src/diagrams/designer-creating-dynamic-property.png
new file mode 100644
index 0000000000..1c3d3cacc4
--- /dev/null
+++ b/doc/src/diagrams/designer-creating-dynamic-property.png
diff --git a/doc/src/diagrams/designer-creating-menu-entry1.png b/doc/src/diagrams/designer-creating-menu-entry1.png
new file mode 100644
index 0000000000..33aa0d605a
--- /dev/null
+++ b/doc/src/diagrams/designer-creating-menu-entry1.png
diff --git a/doc/src/diagrams/designer-creating-menu-entry1.zip b/doc/src/diagrams/designer-creating-menu-entry1.zip
new file mode 100644
index 0000000000..f9e64c8050
--- /dev/null
+++ b/doc/src/diagrams/designer-creating-menu-entry1.zip
diff --git a/doc/src/diagrams/designer-creating-menu-entry2.png b/doc/src/diagrams/designer-creating-menu-entry2.png
new file mode 100644
index 0000000000..8338d08614
--- /dev/null
+++ b/doc/src/diagrams/designer-creating-menu-entry2.png
diff --git a/doc/src/diagrams/designer-creating-menu-entry2.zip b/doc/src/diagrams/designer-creating-menu-entry2.zip
new file mode 100644
index 0000000000..67d81e4d21
--- /dev/null
+++ b/doc/src/diagrams/designer-creating-menu-entry2.zip
diff --git a/doc/src/diagrams/designer-creating-menu-entry3.png b/doc/src/diagrams/designer-creating-menu-entry3.png
new file mode 100644
index 0000000000..d2426464f8
--- /dev/null
+++ b/doc/src/diagrams/designer-creating-menu-entry3.png
diff --git a/doc/src/diagrams/designer-creating-menu-entry3.zip b/doc/src/diagrams/designer-creating-menu-entry3.zip
new file mode 100644
index 0000000000..d530186c49
--- /dev/null
+++ b/doc/src/diagrams/designer-creating-menu-entry3.zip
diff --git a/doc/src/diagrams/designer-creating-menu-entry4.png b/doc/src/diagrams/designer-creating-menu-entry4.png
new file mode 100644
index 0000000000..07a49ba1d3
--- /dev/null
+++ b/doc/src/diagrams/designer-creating-menu-entry4.png
diff --git a/doc/src/diagrams/designer-creating-menu-entry4.zip b/doc/src/diagrams/designer-creating-menu-entry4.zip
new file mode 100644
index 0000000000..d800c311e7
--- /dev/null
+++ b/doc/src/diagrams/designer-creating-menu-entry4.zip
diff --git a/doc/src/diagrams/designer-creating-menu.txt b/doc/src/diagrams/designer-creating-menu.txt
new file mode 100644
index 0000000000..b5b2934257
--- /dev/null
+++ b/doc/src/diagrams/designer-creating-menu.txt
@@ -0,0 +1,49 @@
+# Cropping and fading the Qt Designer menu creation images.
+
+cropimage.py designer-creating-menu1.png designer-creating-menu1-crop.png bottom -100
+cropimage.py designer-creating-menu1-crop.png designer-creating-menu1-crop.png right -120
+fadeedges.py designer-creating-menu1-crop.png ../images/designer-creating-menu1.png right,bottom 16
+rm designer-creating-menu1-crop.png
+
+cropimage.py designer-creating-menu2.png designer-creating-menu2-crop.png bottom -100
+cropimage.py designer-creating-menu2-crop.png designer-creating-menu2-crop.png right -120
+fadeedges.py designer-creating-menu2-crop.png ../images/designer-creating-menu2.png right,bottom 16
+rm designer-creating-menu2-crop.png
+
+cropimage.py designer-creating-menu3.png designer-creating-menu3-crop.png bottom -100
+cropimage.py designer-creating-menu3-crop.png designer-creating-menu3-crop.png right -120
+fadeedges.py designer-creating-menu3-crop.png ../images/designer-creating-menu3.png right,bottom 16
+rm designer-creating-menu3-crop.png
+
+cropimage.py designer-creating-menu4.png designer-creating-menu4-crop.png bottom -100
+cropimage.py designer-creating-menu4-crop.png designer-creating-menu4-crop.png right -120
+fadeedges.py designer-creating-menu4-crop.png ../images/designer-creating-menu4.png right,bottom 16
+rm designer-creating-menu4-crop.png
+
+cropimage.py designer-creating-menu-entry1.png designer-creating-menu-entry1-crop.png left 54
+cropimage.py designer-creating-menu-entry1-crop.png designer-creating-menu-entry1-crop.png top 45
+cropimage.py designer-creating-menu-entry1-crop.png designer-creating-menu-entry1-crop.png right -160
+cropimage.py designer-creating-menu-entry1-crop.png designer-creating-menu-entry1-crop.png bottom -144
+fadeedges.py designer-creating-menu-entry1-crop.png ../images/designer-creating-menu-entry1.png right,bottom 16
+rm designer-creating-menu-entry1-crop.png
+
+cropimage.py designer-creating-menu-entry2.png designer-creating-menu-entry2-crop.png left 54
+cropimage.py designer-creating-menu-entry2-crop.png designer-creating-menu-entry2-crop.png top 45
+cropimage.py designer-creating-menu-entry2-crop.png designer-creating-menu-entry2-crop.png right -160
+cropimage.py designer-creating-menu-entry2-crop.png designer-creating-menu-entry2-crop.png bottom -144
+fadeedges.py designer-creating-menu-entry2-crop.png ../images/designer-creating-menu-entry2.png right,bottom 16
+rm designer-creating-menu-entry2-crop.png
+
+cropimage.py designer-creating-menu-entry3.png designer-creating-menu-entry3-crop.png left 54
+cropimage.py designer-creating-menu-entry3-crop.png designer-creating-menu-entry3-crop.png top 45
+cropimage.py designer-creating-menu-entry3-crop.png designer-creating-menu-entry3-crop.png right -160
+cropimage.py designer-creating-menu-entry3-crop.png designer-creating-menu-entry3-crop.png bottom -144
+fadeedges.py designer-creating-menu-entry3-crop.png ../images/designer-creating-menu-entry3.png right,bottom 16
+rm designer-creating-menu-entry3-crop.png
+
+cropimage.py designer-creating-menu-entry4.png designer-creating-menu-entry4-crop.png left 54
+cropimage.py designer-creating-menu-entry4-crop.png designer-creating-menu-entry4-crop.png top 45
+cropimage.py designer-creating-menu-entry4-crop.png designer-creating-menu-entry4-crop.png right -160
+cropimage.py designer-creating-menu-entry4-crop.png designer-creating-menu-entry4-crop.png bottom -144
+fadeedges.py designer-creating-menu-entry4-crop.png ../images/designer-creating-menu-entry4.png right,bottom 16
+rm designer-creating-menu-entry4-crop.png
diff --git a/doc/src/diagrams/designer-creating-menu1.png b/doc/src/diagrams/designer-creating-menu1.png
new file mode 100644
index 0000000000..d92a88ada8
--- /dev/null
+++ b/doc/src/diagrams/designer-creating-menu1.png
diff --git a/doc/src/diagrams/designer-creating-menu1.zip b/doc/src/diagrams/designer-creating-menu1.zip
new file mode 100644
index 0000000000..780b1ac090
--- /dev/null
+++ b/doc/src/diagrams/designer-creating-menu1.zip
diff --git a/doc/src/diagrams/designer-creating-menu2.png b/doc/src/diagrams/designer-creating-menu2.png
new file mode 100644
index 0000000000..7be4891b2e
--- /dev/null
+++ b/doc/src/diagrams/designer-creating-menu2.png
diff --git a/doc/src/diagrams/designer-creating-menu2.zip b/doc/src/diagrams/designer-creating-menu2.zip
new file mode 100644
index 0000000000..00664a6eaf
--- /dev/null
+++ b/doc/src/diagrams/designer-creating-menu2.zip
diff --git a/doc/src/diagrams/designer-creating-menu3.png b/doc/src/diagrams/designer-creating-menu3.png
new file mode 100644
index 0000000000..c2f1bebf0f
--- /dev/null
+++ b/doc/src/diagrams/designer-creating-menu3.png
diff --git a/doc/src/diagrams/designer-creating-menu3.zip b/doc/src/diagrams/designer-creating-menu3.zip
new file mode 100644
index 0000000000..76ecbe01dd
--- /dev/null
+++ b/doc/src/diagrams/designer-creating-menu3.zip
diff --git a/doc/src/diagrams/designer-creating-menu4.png b/doc/src/diagrams/designer-creating-menu4.png
new file mode 100644
index 0000000000..3a3ab54c6b
--- /dev/null
+++ b/doc/src/diagrams/designer-creating-menu4.png
diff --git a/doc/src/diagrams/designer-creating-menubar.png b/doc/src/diagrams/designer-creating-menubar.png
new file mode 100644
index 0000000000..e8078e09a1
--- /dev/null
+++ b/doc/src/diagrams/designer-creating-menubar.png
diff --git a/doc/src/diagrams/designer-creating-menubar.zip b/doc/src/diagrams/designer-creating-menubar.zip
new file mode 100644
index 0000000000..bddbf0e7a7
--- /dev/null
+++ b/doc/src/diagrams/designer-creating-menubar.zip
diff --git a/doc/src/diagrams/designer-edit-resource.zip b/doc/src/diagrams/designer-edit-resource.zip
new file mode 100644
index 0000000000..dc43d9ec7c
--- /dev/null
+++ b/doc/src/diagrams/designer-edit-resource.zip
diff --git a/doc/src/diagrams/designer-find-icon.zip b/doc/src/diagrams/designer-find-icon.zip
new file mode 100644
index 0000000000..e94abd962e
--- /dev/null
+++ b/doc/src/diagrams/designer-find-icon.zip
diff --git a/doc/src/diagrams/designer-form-layoutfunction-crop.png b/doc/src/diagrams/designer-form-layoutfunction-crop.png
new file mode 100644
index 0000000000..e8dd39fd79
--- /dev/null
+++ b/doc/src/diagrams/designer-form-layoutfunction-crop.png
diff --git a/doc/src/diagrams/designer-form-layoutfunction.png b/doc/src/diagrams/designer-form-layoutfunction.png
new file mode 100644
index 0000000000..9101e89de0
--- /dev/null
+++ b/doc/src/diagrams/designer-form-layoutfunction.png
diff --git a/doc/src/diagrams/designer-form-layoutfunction.zip b/doc/src/diagrams/designer-form-layoutfunction.zip
new file mode 100644
index 0000000000..fcce637f61
--- /dev/null
+++ b/doc/src/diagrams/designer-form-layoutfunction.zip
diff --git a/doc/src/diagrams/designer-main-window.zip b/doc/src/diagrams/designer-main-window.zip
new file mode 100644
index 0000000000..69b7ee6300
--- /dev/null
+++ b/doc/src/diagrams/designer-main-window.zip
diff --git a/doc/src/diagrams/designer-mainwindow-actions.ui b/doc/src/diagrams/designer-mainwindow-actions.ui
new file mode 100644
index 0000000000..593a2dee2b
--- /dev/null
+++ b/doc/src/diagrams/designer-mainwindow-actions.ui
@@ -0,0 +1,88 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>497</width>
+    <height>347</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralWidget" >
+   <layout class="QVBoxLayout" >
+    <property name="margin" >
+     <number>9</number>
+    </property>
+    <property name="spacing" >
+     <number>6</number>
+    </property>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menuBar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>497</width>
+     <height>29</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menu_Badger" >
+    <property name="title" >
+     <string>&amp;Badger</string>
+    </property>
+   </widget>
+   <widget class="QMenu" name="menu_Hippo" >
+    <property name="tearOffEnabled" >
+     <bool>true</bool>
+    </property>
+    <property name="title" >
+     <string>&amp;Hippo</string>
+    </property>
+   </widget>
+   <widget class="QMenu" name="menu_File" >
+    <property name="title" >
+     <string>&amp;File...</string>
+    </property>
+   </widget>
+   <addaction name="menu_File" />
+  </widget>
+  <widget class="QToolBar" name="mainToolBar" >
+   <property name="orientation" >
+    <enum>Qt::Horizontal</enum>
+   </property>
+   <attribute name="toolBarArea" >
+    <number>4</number>
+   </attribute>
+   <addaction name="action_Open" />
+  </widget>
+  <widget class="QStatusBar" name="statusBar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>325</y>
+     <width>497</width>
+     <height>22</height>
+    </rect>
+   </property>
+  </widget>
+  <action name="action_Open" >
+   <property name="icon" >
+    <iconset>../../../examples/mainwindows/application/images/open.png</iconset>
+   </property>
+   <property name="text" >
+    <string>&amp;Open...</string>
+   </property>
+  </action>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/doc/src/diagrams/designer-palette-brush-editor.zip b/doc/src/diagrams/designer-palette-brush-editor.zip
new file mode 100644
index 0000000000..698f27195a
--- /dev/null
+++ b/doc/src/diagrams/designer-palette-brush-editor.zip
diff --git a/doc/src/diagrams/designer-palette-editor.zip b/doc/src/diagrams/designer-palette-editor.zip
new file mode 100644
index 0000000000..96646ab0b5
--- /dev/null
+++ b/doc/src/diagrams/designer-palette-editor.zip
diff --git a/doc/src/diagrams/designer-palette-gradient-editor.zip b/doc/src/diagrams/designer-palette-gradient-editor.zip
new file mode 100644
index 0000000000..46965161df
--- /dev/null
+++ b/doc/src/diagrams/designer-palette-gradient-editor.zip
diff --git a/doc/src/diagrams/designer-palette-pattern-editor.zip b/doc/src/diagrams/designer-palette-pattern-editor.zip
new file mode 100644
index 0000000000..7382bad6ab
--- /dev/null
+++ b/doc/src/diagrams/designer-palette-pattern-editor.zip
diff --git a/doc/src/diagrams/designer-resource-editor.zip b/doc/src/diagrams/designer-resource-editor.zip
new file mode 100644
index 0000000000..2c11da4202
--- /dev/null
+++ b/doc/src/diagrams/designer-resource-editor.zip
diff --git a/doc/src/diagrams/designer-widget-box.zip b/doc/src/diagrams/designer-widget-box.zip
new file mode 100644
index 0000000000..7ba8f77c66
--- /dev/null
+++ b/doc/src/diagrams/designer-widget-box.zip
diff --git a/doc/src/diagrams/diagrams.txt b/doc/src/diagrams/diagrams.txt
new file mode 100644
index 0000000000..a985b70d53
--- /dev/null
+++ b/doc/src/diagrams/diagrams.txt
@@ -0,0 +1,16 @@
+Use makeimage.py (//depot/devtools/main/doctools/bin/makeimage.py) to generate
+images from these diagrams.
+
+Diagram                 Scale factor
+
+treemodel-structure.sk  0.28
+modelview-listmodel.sk  0.28
+modelview-models.sk     0.28
+modelview-overview.sk   0.28
+modelview-tablemodel.sk 0.28
+modelview-treemodel.sk  0.28
+plaintext-layout.png    0.8
+standard-views.sk       0.22
+boat.png                0.2
+car.png                 0.2
+house.png               0.2
diff --git a/doc/src/diagrams/dockwidget-cross.sk b/doc/src/diagrams/dockwidget-cross.sk
new file mode 100644
index 0000000000..6be469ca56
--- /dev/null
+++ b/doc/src/diagrams/dockwidget-cross.sk
@@ -0,0 +1,110 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((0.75,0.919,0.548))
+lw(2)
+r(337.214,0,0,-225.169,-36.3448,740.113)
+fp((0.848,0.848,0.848))
+lw(2)
+r(337.214,0,0,-35.553,-36.3448,740.113)
+lp((0.185,0,1))
+lw(1)
+ld((1, 1))
+b()
+bs(-13.7198,773.512,0)
+bs(278.245,481.547,0)
+lp((0.185,0,1))
+lw(1)
+ld((1, 1))
+b()
+bs(278.245,773.512,0)
+bs(-13.7198,481.547,0)
+fp((0.75,0.919,0.548))
+lw(2)
+r(337.214,0,0,-225.169,392.446,740.113)
+fp((0.848,0.848,0.848))
+lw(2)
+r(337.214,0,0,-35.553,392.446,740.113)
+lp((0.185,0,1))
+lw(1)
+ld((1, 1))
+b()
+bs(415.07,773.512,0)
+bs(707.035,481.547,0)
+lp((0.185,0,1))
+lw(1)
+ld((1, 1))
+b()
+bs(707.035,773.512,0)
+bs(415.07,481.547,0)
+fp((0.75,0.919,0.548))
+lw(2)
+r(337.214,0,0,-225.169,-36.3448,406.94)
+fp((0.848,0.848,0.848))
+lw(2)
+r(337.214,0,0,-35.553,-36.3448,406.94)
+lp((0.185,0,1))
+lw(1)
+ld((1, 1))
+b()
+bs(-13.7198,440.338,0)
+bs(278.245,148.373,0)
+lp((0.185,0,1))
+lw(1)
+ld((1, 1))
+b()
+bs(278.245,440.338,0)
+bs(-13.7198,148.373,0)
+fp((0.75,0.919,0.548))
+lw(2)
+r(337.214,0,0,-225.169,392.446,406.94)
+fp((0.848,0.848,0.848))
+lw(2)
+r(337.214,0,0,-35.553,392.446,406.94)
+lp((0.185,0,1))
+lw(1)
+ld((1, 1))
+b()
+bs(415.07,440.338,0)
+bs(707.035,148.373,0)
+lp((0.185,0,1))
+lw(1)
+ld((1, 1))
+b()
+bs(707.035,440.338,0)
+bs(415.07,148.373,0)
+lw(4)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(42.8417,641.804,0)
+bs(56.8474,613.793,0)
+lw(4)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(636.468,641.804,0)
+bs(650.474,613.793,0)
+lw(4)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(125.26,363.306,0)
+bs(139.266,335.295,0)
+lw(4)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(554.05,254.493,0)
+bs(568.056,226.481,0)
+lp((1,0,0))
+lw(3)
+r(163.759,0,0,-217.627,561.591,736.612)
+lp((1,0,0))
+lw(3)
+r(163.759,0,0,-217.627,-32.0348,736.612)
+lp((1,0,0))
+lw(3)
+r(328.595,0,0,-108.814,-32.0348,403.707)
+lp((1,0,0))
+lw(3)
+r(328.595,0,0,-108.814,396.755,294.894)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/dockwidget-neighbors.sk b/doc/src/diagrams/dockwidget-neighbors.sk
new file mode 100644
index 0000000000..293394fcf6
--- /dev/null
+++ b/doc/src/diagrams/dockwidget-neighbors.sk
@@ -0,0 +1,136 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((0.576,0.833,1))
+lw(2)
+r(178.842,0,0,-225.169,262.138,6.39015)
+fp((0.869,0.579,0.579))
+lw(2)
+r(178.842,0,0,-225.169,-212.068,325.597)
+fp((0.848,0.848,0.848))
+lw(2)
+r(178.842,0,0,-35.553,-212.068,325.597)
+fp((0.576,0.833,1))
+lw(2)
+r(178.842,0,0,-225.169,-34.034,325.597)
+fp((0.848,0.848,0.848))
+lw(2)
+r(178.842,0,0,-35.553,-34.034,325.597)
+lw(4)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(-121.652,218.992,0)
+bs(-107.647,190.981,0)
+fp((0.869,0.579,0.579))
+lw(2)
+r(178.842,0,0,-225.169,262.138,325.597)
+fp((0.848,0.848,0.848))
+lw(2)
+r(178.842,0,0,-35.553,262.138,325.597)
+fp((0.576,0.833,1))
+lw(2)
+r(178.842,0,0,-225.169,440.172,325.597)
+fp((0.848,0.848,0.848))
+lw(2)
+r(178.842,0,0,-35.553,440.172,325.597)
+lw(4)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(484.554,266.992,0)
+bs(498.56,238.981,0)
+fp((0.869,0.579,0.579))
+lw(2)
+r(178.842,0,0,-225.169,-212.068,6.39015)
+fp((0.848,0.848,0.848))
+lw(2)
+r(178.842,0,0,-35.553,-212.068,6.39015)
+fp((0.576,0.833,1))
+lw(2)
+r(178.842,0,0,-225.169,-34.034,6.39015)
+fp((0.848,0.848,0.848))
+lw(2)
+r(178.842,0,0,-35.553,-34.034,6.39015)
+fp((0.869,0.579,0.579))
+lw(2)
+r(178.842,0,0,-225.169,440.138,6.39015)
+fp((0.848,0.848,0.848))
+lw(2)
+r(178.842,0,0,-35.553,440.138,6.39014)
+fp((0.848,0.848,0.848))
+lw(2)
+r(178.842,0,0,-35.553,262.138,6.39015)
+lw(4)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(568.554,-100.215,0)
+bs(582.56,-128.226,0)
+lp((0.185,0,1))
+lw(1)
+ld((1, 1))
+b()
+bs(58.0644,80.9449,0)
+bs(57.6378,341.945,0)
+lp((0.185,0,1))
+lw(1)
+ld((1, 1))
+b()
+bs(532.064,80.9449,0)
+bs(531.638,341.945,0)
+G()
+lp((0.185,0,1))
+lw(1)
+ld((1, 1))
+b()
+bs(57.0644,-236.055,0)
+bs(56.6378,24.945,0)
+lp((0.185,0,1))
+lw(1)
+ld((1, 1))
+b()
+bs(531.064,-236.055,0)
+bs(530.638,24.9451,0)
+G_()
+lw(4)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(6.63782,-148.044,0)
+bs(20.6435,-176.055,0)
+lp((0.185,0,1))
+lw(1)
+ld((1, 1))
+b()
+bs(56.4642,213.012,0)
+bs(-46.9624,213.013,0)
+lp((0.185,0,1))
+lw(1)
+ld((1, 1))
+b()
+bs(56.4642,-106.194,0)
+bs(-46.9624,-106.194,0)
+lp((0.185,0,1))
+lw(1)
+ld((1, 1))
+b()
+bs(530.671,-106.194,0)
+bs(427.244,-106.194,0)
+lp((0.185,0,1))
+lw(1)
+ld((1, 1))
+b()
+bs(530.671,213.012,0)
+bs(427.244,213.013,0)
+lp((1,0,0))
+lw(3)
+r(170.759,0,0,-217.627,-208.027,321.826)
+lp((1,0,0))
+lw(3)
+r(170.759,0,0,-105.627,444.179,321.826)
+lp((1,0,0))
+lw(3)
+r(170.759,0,0,-105.627,-30.3622,-109.428)
+lp((1,0,0))
+lw(3)
+r(170.759,0,0,-217.627,444.179,2.61914)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/fontsampler-example.zip b/doc/src/diagrams/fontsampler-example.zip
new file mode 100644
index 0000000000..a68ef21e15
--- /dev/null
+++ b/doc/src/diagrams/fontsampler-example.zip
diff --git a/doc/src/diagrams/framebufferobject-example.png b/doc/src/diagrams/framebufferobject-example.png
new file mode 100644
index 0000000000..a97840f831
--- /dev/null
+++ b/doc/src/diagrams/framebufferobject-example.png
diff --git a/doc/src/diagrams/framebufferobject2-example.png b/doc/src/diagrams/framebufferobject2-example.png
new file mode 100644
index 0000000000..80dc2f116a
--- /dev/null
+++ b/doc/src/diagrams/framebufferobject2-example.png
diff --git a/doc/src/diagrams/ftp-example.zip b/doc/src/diagrams/ftp-example.zip
new file mode 100644
index 0000000000..5075128616
--- /dev/null
+++ b/doc/src/diagrams/ftp-example.zip
diff --git a/doc/src/diagrams/gallery-images/cde-calendarwidget.png b/doc/src/diagrams/gallery-images/cde-calendarwidget.png
new file mode 100644
index 0000000000..90cfb51a3b
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-calendarwidget.png
diff --git a/doc/src/diagrams/gallery-images/cde-checkbox.png b/doc/src/diagrams/gallery-images/cde-checkbox.png
new file mode 100644
index 0000000000..1e20f396f4
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-checkbox.png
diff --git a/doc/src/diagrams/gallery-images/cde-combobox.png b/doc/src/diagrams/gallery-images/cde-combobox.png
new file mode 100644
index 0000000000..74586433eb
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-combobox.png
diff --git a/doc/src/diagrams/gallery-images/cde-dateedit.png b/doc/src/diagrams/gallery-images/cde-dateedit.png
new file mode 100644
index 0000000000..91a4e97174
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-dateedit.png
diff --git a/doc/src/diagrams/gallery-images/cde-datetimeedit.png b/doc/src/diagrams/gallery-images/cde-datetimeedit.png
new file mode 100644
index 0000000000..cc2242e62b
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-datetimeedit.png
diff --git a/doc/src/diagrams/gallery-images/cde-dial.png b/doc/src/diagrams/gallery-images/cde-dial.png
new file mode 100644
index 0000000000..cdf852dd2d
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-dial.png
diff --git a/doc/src/diagrams/gallery-images/cde-doublespinbox.png b/doc/src/diagrams/gallery-images/cde-doublespinbox.png
new file mode 100644
index 0000000000..74749287c1
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-doublespinbox.png
diff --git a/doc/src/diagrams/gallery-images/cde-fontcombobox.png b/doc/src/diagrams/gallery-images/cde-fontcombobox.png
new file mode 100644
index 0000000000..dd1b00df15
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-fontcombobox.png
diff --git a/doc/src/diagrams/gallery-images/cde-frame.png b/doc/src/diagrams/gallery-images/cde-frame.png
new file mode 100644
index 0000000000..69d63b8046
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-frame.png
diff --git a/doc/src/diagrams/gallery-images/cde-groupbox.png b/doc/src/diagrams/gallery-images/cde-groupbox.png
new file mode 100644
index 0000000000..710e2fcf4c
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-groupbox.png
diff --git a/doc/src/diagrams/gallery-images/cde-horizontalscrollbar.png b/doc/src/diagrams/gallery-images/cde-horizontalscrollbar.png
new file mode 100644
index 0000000000..f52ba98d8a
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-horizontalscrollbar.png
diff --git a/doc/src/diagrams/gallery-images/cde-label.png b/doc/src/diagrams/gallery-images/cde-label.png
new file mode 100644
index 0000000000..a508261c3c
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-label.png
diff --git a/doc/src/diagrams/gallery-images/cde-lcdnumber.png b/doc/src/diagrams/gallery-images/cde-lcdnumber.png
new file mode 100644
index 0000000000..ecc50015c9
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-lcdnumber.png
diff --git a/doc/src/diagrams/gallery-images/cde-lineedit.png b/doc/src/diagrams/gallery-images/cde-lineedit.png
new file mode 100644
index 0000000000..d9e5876f77
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-lineedit.png
diff --git a/doc/src/diagrams/gallery-images/cde-listview.png b/doc/src/diagrams/gallery-images/cde-listview.png
new file mode 100644
index 0000000000..d69841390e
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-listview.png
diff --git a/doc/src/diagrams/gallery-images/cde-progressbar.png b/doc/src/diagrams/gallery-images/cde-progressbar.png
new file mode 100644
index 0000000000..16e0bb2a0f
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-progressbar.png
diff --git a/doc/src/diagrams/gallery-images/cde-pushbutton.png b/doc/src/diagrams/gallery-images/cde-pushbutton.png
new file mode 100644
index 0000000000..b66a851def
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-pushbutton.png
diff --git a/doc/src/diagrams/gallery-images/cde-radiobutton.png b/doc/src/diagrams/gallery-images/cde-radiobutton.png
new file mode 100644
index 0000000000..31da50debe
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-radiobutton.png
diff --git a/doc/src/diagrams/gallery-images/cde-slider.png b/doc/src/diagrams/gallery-images/cde-slider.png
new file mode 100644
index 0000000000..6b6c544205
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-slider.png
diff --git a/doc/src/diagrams/gallery-images/cde-spinbox.png b/doc/src/diagrams/gallery-images/cde-spinbox.png
new file mode 100644
index 0000000000..4533469ddf
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-spinbox.png
diff --git a/doc/src/diagrams/gallery-images/cde-tableview.png b/doc/src/diagrams/gallery-images/cde-tableview.png
new file mode 100644
index 0000000000..fec7b44f90
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-tableview.png
diff --git a/doc/src/diagrams/gallery-images/cde-tabwidget.png b/doc/src/diagrams/gallery-images/cde-tabwidget.png
new file mode 100644
index 0000000000..758283e513
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-tabwidget.png
diff --git a/doc/src/diagrams/gallery-images/cde-textedit.png b/doc/src/diagrams/gallery-images/cde-textedit.png
new file mode 100644
index 0000000000..426dbcc24d
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-textedit.png
diff --git a/doc/src/diagrams/gallery-images/cde-timeedit.png b/doc/src/diagrams/gallery-images/cde-timeedit.png
new file mode 100644
index 0000000000..be2bd38e47
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-timeedit.png
diff --git a/doc/src/diagrams/gallery-images/cde-toolbox.png b/doc/src/diagrams/gallery-images/cde-toolbox.png
new file mode 100644
index 0000000000..4394f58c75
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-toolbox.png
diff --git a/doc/src/diagrams/gallery-images/cde-toolbutton.png b/doc/src/diagrams/gallery-images/cde-toolbutton.png
new file mode 100644
index 0000000000..6bd0495e15
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-toolbutton.png
diff --git a/doc/src/diagrams/gallery-images/cde-treeview.png b/doc/src/diagrams/gallery-images/cde-treeview.png
new file mode 100644
index 0000000000..2fc78c6738
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cde-treeview.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-calendarwidget.png b/doc/src/diagrams/gallery-images/cleanlooks-calendarwidget.png
new file mode 100644
index 0000000000..7ec25aec46
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-calendarwidget.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-checkbox.png b/doc/src/diagrams/gallery-images/cleanlooks-checkbox.png
new file mode 100644
index 0000000000..c30aa8468d
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-checkbox.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-combobox.png b/doc/src/diagrams/gallery-images/cleanlooks-combobox.png
new file mode 100644
index 0000000000..5484fab15c
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-combobox.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-dateedit.png b/doc/src/diagrams/gallery-images/cleanlooks-dateedit.png
new file mode 100644
index 0000000000..3d781b5bd0
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-dateedit.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-datetimeedit.png b/doc/src/diagrams/gallery-images/cleanlooks-datetimeedit.png
new file mode 100644
index 0000000000..f91ad48082
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-datetimeedit.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-dial.png b/doc/src/diagrams/gallery-images/cleanlooks-dial.png
new file mode 100644
index 0000000000..7e546efa94
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-dial.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-doublespinbox.png b/doc/src/diagrams/gallery-images/cleanlooks-doublespinbox.png
new file mode 100644
index 0000000000..fe86c194bd
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-doublespinbox.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-fontcombobox.png b/doc/src/diagrams/gallery-images/cleanlooks-fontcombobox.png
new file mode 100644
index 0000000000..7170bb60b6
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-fontcombobox.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-frame.png b/doc/src/diagrams/gallery-images/cleanlooks-frame.png
new file mode 100644
index 0000000000..94965124dc
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-frame.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-groupbox.png b/doc/src/diagrams/gallery-images/cleanlooks-groupbox.png
new file mode 100644
index 0000000000..106f86ddfd
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-groupbox.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-horizontalscrollbar.png b/doc/src/diagrams/gallery-images/cleanlooks-horizontalscrollbar.png
new file mode 100644
index 0000000000..78cab5661c
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-horizontalscrollbar.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-label.png b/doc/src/diagrams/gallery-images/cleanlooks-label.png
new file mode 100644
index 0000000000..a0b80644f6
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-label.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-lcdnumber.png b/doc/src/diagrams/gallery-images/cleanlooks-lcdnumber.png
new file mode 100644
index 0000000000..d0892e54ba
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-lcdnumber.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-lineedit.png b/doc/src/diagrams/gallery-images/cleanlooks-lineedit.png
new file mode 100644
index 0000000000..d79e94f22d
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-lineedit.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-listview.png b/doc/src/diagrams/gallery-images/cleanlooks-listview.png
new file mode 100644
index 0000000000..df0466bb0a
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-listview.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-progressbar.png b/doc/src/diagrams/gallery-images/cleanlooks-progressbar.png
new file mode 100644
index 0000000000..fc3c97a094
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-progressbar.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-pushbutton.png b/doc/src/diagrams/gallery-images/cleanlooks-pushbutton.png
new file mode 100644
index 0000000000..07f388bbd5
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-pushbutton.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-radiobutton.png b/doc/src/diagrams/gallery-images/cleanlooks-radiobutton.png
new file mode 100644
index 0000000000..eb00206b13
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-radiobutton.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-slider.png b/doc/src/diagrams/gallery-images/cleanlooks-slider.png
new file mode 100644
index 0000000000..907ff3c067
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-slider.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-spinbox.png b/doc/src/diagrams/gallery-images/cleanlooks-spinbox.png
new file mode 100644
index 0000000000..ca7c3db03c
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-spinbox.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-tableview.png b/doc/src/diagrams/gallery-images/cleanlooks-tableview.png
new file mode 100644
index 0000000000..64c630ae8c
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-tableview.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-tabwidget.png b/doc/src/diagrams/gallery-images/cleanlooks-tabwidget.png
new file mode 100644
index 0000000000..4d5bf37182
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-tabwidget.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-textedit.png b/doc/src/diagrams/gallery-images/cleanlooks-textedit.png
new file mode 100644
index 0000000000..0a90fa9863
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-textedit.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-timeedit.png b/doc/src/diagrams/gallery-images/cleanlooks-timeedit.png
new file mode 100644
index 0000000000..09fede7dbf
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-timeedit.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-toolbox.png b/doc/src/diagrams/gallery-images/cleanlooks-toolbox.png
new file mode 100644
index 0000000000..7bb3762d1a
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-toolbox.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-toolbutton.png b/doc/src/diagrams/gallery-images/cleanlooks-toolbutton.png
new file mode 100644
index 0000000000..0fdc02a6df
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-toolbutton.png
diff --git a/doc/src/diagrams/gallery-images/cleanlooks-treeview.png b/doc/src/diagrams/gallery-images/cleanlooks-treeview.png
new file mode 100644
index 0000000000..bd9a0798d6
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/cleanlooks-treeview.png
diff --git a/doc/src/diagrams/gallery-images/designer-creating-menubar.png b/doc/src/diagrams/gallery-images/designer-creating-menubar.png
new file mode 100644
index 0000000000..87606f73b1
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/designer-creating-menubar.png
diff --git a/doc/src/diagrams/gallery-images/gtk-calendarwidget.png b/doc/src/diagrams/gallery-images/gtk-calendarwidget.png
new file mode 100644
index 0000000000..008eadfc21
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-calendarwidget.png
diff --git a/doc/src/diagrams/gallery-images/gtk-checkbox.png b/doc/src/diagrams/gallery-images/gtk-checkbox.png
new file mode 100644
index 0000000000..eb683b60d6
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-checkbox.png
diff --git a/doc/src/diagrams/gallery-images/gtk-columnview.png b/doc/src/diagrams/gallery-images/gtk-columnview.png
new file mode 100644
index 0000000000..6469c8cdfe
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-columnview.png
diff --git a/doc/src/diagrams/gallery-images/gtk-combobox.png b/doc/src/diagrams/gallery-images/gtk-combobox.png
new file mode 100644
index 0000000000..bfdf68bee7
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-combobox.png
diff --git a/doc/src/diagrams/gallery-images/gtk-dateedit.png b/doc/src/diagrams/gallery-images/gtk-dateedit.png
new file mode 100644
index 0000000000..cbf595c442
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-dateedit.png
diff --git a/doc/src/diagrams/gallery-images/gtk-datetimeedit.png b/doc/src/diagrams/gallery-images/gtk-datetimeedit.png
new file mode 100644
index 0000000000..746b22da77
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-datetimeedit.png
diff --git a/doc/src/diagrams/gallery-images/gtk-dial.png b/doc/src/diagrams/gallery-images/gtk-dial.png
new file mode 100644
index 0000000000..1df0de5c56
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-dial.png
diff --git a/doc/src/diagrams/gallery-images/gtk-doublespinbox.png b/doc/src/diagrams/gallery-images/gtk-doublespinbox.png
new file mode 100644
index 0000000000..f784d59eea
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-doublespinbox.png
diff --git a/doc/src/diagrams/gallery-images/gtk-fontcombobox.png b/doc/src/diagrams/gallery-images/gtk-fontcombobox.png
new file mode 100644
index 0000000000..878257b217
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-fontcombobox.png
diff --git a/doc/src/diagrams/gallery-images/gtk-frame.png b/doc/src/diagrams/gallery-images/gtk-frame.png
new file mode 100644
index 0000000000..b1c9b86a85
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-frame.png
diff --git a/doc/src/diagrams/gallery-images/gtk-groupbox.png b/doc/src/diagrams/gallery-images/gtk-groupbox.png
new file mode 100644
index 0000000000..a8a7b137cf
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-groupbox.png
diff --git a/doc/src/diagrams/gallery-images/gtk-horizontalscrollbar.png b/doc/src/diagrams/gallery-images/gtk-horizontalscrollbar.png
new file mode 100644
index 0000000000..53a65e9618
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-horizontalscrollbar.png
diff --git a/doc/src/diagrams/gallery-images/gtk-label.png b/doc/src/diagrams/gallery-images/gtk-label.png
new file mode 100644
index 0000000000..d34dacd3f5
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-label.png
diff --git a/doc/src/diagrams/gallery-images/gtk-lcdnumber.png b/doc/src/diagrams/gallery-images/gtk-lcdnumber.png
new file mode 100644
index 0000000000..cb0cfe0bc2
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-lcdnumber.png
diff --git a/doc/src/diagrams/gallery-images/gtk-lineedit.png b/doc/src/diagrams/gallery-images/gtk-lineedit.png
new file mode 100644
index 0000000000..a11a3b5812
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-lineedit.png
diff --git a/doc/src/diagrams/gallery-images/gtk-listview.png b/doc/src/diagrams/gallery-images/gtk-listview.png
new file mode 100644
index 0000000000..a7258a4dde
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-listview.png
diff --git a/doc/src/diagrams/gallery-images/gtk-progressbar.png b/doc/src/diagrams/gallery-images/gtk-progressbar.png
new file mode 100644
index 0000000000..6de60c4a2b
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-progressbar.png
diff --git a/doc/src/diagrams/gallery-images/gtk-pushbutton.png b/doc/src/diagrams/gallery-images/gtk-pushbutton.png
new file mode 100644
index 0000000000..85340ced60
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-pushbutton.png
diff --git a/doc/src/diagrams/gallery-images/gtk-radiobutton.png b/doc/src/diagrams/gallery-images/gtk-radiobutton.png
new file mode 100644
index 0000000000..20ee523a78
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-radiobutton.png
diff --git a/doc/src/diagrams/gallery-images/gtk-slider.png b/doc/src/diagrams/gallery-images/gtk-slider.png
new file mode 100644
index 0000000000..140f00ad9b
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-slider.png
diff --git a/doc/src/diagrams/gallery-images/gtk-spinbox.png b/doc/src/diagrams/gallery-images/gtk-spinbox.png
new file mode 100644
index 0000000000..f1062cb205
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-spinbox.png
diff --git a/doc/src/diagrams/gallery-images/gtk-tableview.png b/doc/src/diagrams/gallery-images/gtk-tableview.png
new file mode 100644
index 0000000000..6705317478
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-tableview.png
diff --git a/doc/src/diagrams/gallery-images/gtk-tabwidget.png b/doc/src/diagrams/gallery-images/gtk-tabwidget.png
new file mode 100644
index 0000000000..7a73e5931e
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-tabwidget.png
diff --git a/doc/src/diagrams/gallery-images/gtk-textedit.png b/doc/src/diagrams/gallery-images/gtk-textedit.png
new file mode 100644
index 0000000000..e9f77e6927
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-textedit.png
diff --git a/doc/src/diagrams/gallery-images/gtk-timeedit.png b/doc/src/diagrams/gallery-images/gtk-timeedit.png
new file mode 100644
index 0000000000..cf87c3abe4
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-timeedit.png
diff --git a/doc/src/diagrams/gallery-images/gtk-toolbox.png b/doc/src/diagrams/gallery-images/gtk-toolbox.png
new file mode 100644
index 0000000000..b40411412f
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-toolbox.png
diff --git a/doc/src/diagrams/gallery-images/gtk-toolbutton.png b/doc/src/diagrams/gallery-images/gtk-toolbutton.png
new file mode 100644
index 0000000000..779cc827f8
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-toolbutton.png
diff --git a/doc/src/diagrams/gallery-images/gtk-treeview.png b/doc/src/diagrams/gallery-images/gtk-treeview.png
new file mode 100644
index 0000000000..0abbbfa04b
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/gtk-treeview.png
diff --git a/doc/src/diagrams/gallery-images/linguist-menubar.png b/doc/src/diagrams/gallery-images/linguist-menubar.png
new file mode 100644
index 0000000000..a73f135646
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/linguist-menubar.png
diff --git a/doc/src/diagrams/gallery-images/macintosh-tabwidget.png b/doc/src/diagrams/gallery-images/macintosh-tabwidget.png
new file mode 100644
index 0000000000..b4a36afc53
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/macintosh-tabwidget.png
diff --git a/doc/src/diagrams/gallery-images/motif-calendarwidget.png b/doc/src/diagrams/gallery-images/motif-calendarwidget.png
new file mode 100644
index 0000000000..42d1644ddb
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-calendarwidget.png
diff --git a/doc/src/diagrams/gallery-images/motif-checkbox.png b/doc/src/diagrams/gallery-images/motif-checkbox.png
new file mode 100644
index 0000000000..f8e9b4f045
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-checkbox.png
diff --git a/doc/src/diagrams/gallery-images/motif-combobox.png b/doc/src/diagrams/gallery-images/motif-combobox.png
new file mode 100644
index 0000000000..2a288d9f40
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-combobox.png
diff --git a/doc/src/diagrams/gallery-images/motif-dateedit.png b/doc/src/diagrams/gallery-images/motif-dateedit.png
new file mode 100644
index 0000000000..48aecbae61
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-dateedit.png
diff --git a/doc/src/diagrams/gallery-images/motif-datetimeedit.png b/doc/src/diagrams/gallery-images/motif-datetimeedit.png
new file mode 100644
index 0000000000..628df46aab
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-datetimeedit.png
diff --git a/doc/src/diagrams/gallery-images/motif-dial.png b/doc/src/diagrams/gallery-images/motif-dial.png
new file mode 100644
index 0000000000..e920e7c1f8
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-dial.png
diff --git a/doc/src/diagrams/gallery-images/motif-doublespinbox.png b/doc/src/diagrams/gallery-images/motif-doublespinbox.png
new file mode 100644
index 0000000000..6941c811f1
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-doublespinbox.png
diff --git a/doc/src/diagrams/gallery-images/motif-fontcombobox.png b/doc/src/diagrams/gallery-images/motif-fontcombobox.png
new file mode 100644
index 0000000000..8c288542a0
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-fontcombobox.png
diff --git a/doc/src/diagrams/gallery-images/motif-frame.png b/doc/src/diagrams/gallery-images/motif-frame.png
new file mode 100644
index 0000000000..4868352ae2
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-frame.png
diff --git a/doc/src/diagrams/gallery-images/motif-groupbox.png b/doc/src/diagrams/gallery-images/motif-groupbox.png
new file mode 100644
index 0000000000..aeadd1c32a
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-groupbox.png
diff --git a/doc/src/diagrams/gallery-images/motif-horizontalscrollbar.png b/doc/src/diagrams/gallery-images/motif-horizontalscrollbar.png
new file mode 100644
index 0000000000..2a91be64f8
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-horizontalscrollbar.png
diff --git a/doc/src/diagrams/gallery-images/motif-label.png b/doc/src/diagrams/gallery-images/motif-label.png
new file mode 100644
index 0000000000..96aedb8512
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-label.png
diff --git a/doc/src/diagrams/gallery-images/motif-lcdnumber.png b/doc/src/diagrams/gallery-images/motif-lcdnumber.png
new file mode 100644
index 0000000000..3b7270127b
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-lcdnumber.png
diff --git a/doc/src/diagrams/gallery-images/motif-lineedit.png b/doc/src/diagrams/gallery-images/motif-lineedit.png
new file mode 100644
index 0000000000..653735e177
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-lineedit.png
diff --git a/doc/src/diagrams/gallery-images/motif-listview.png b/doc/src/diagrams/gallery-images/motif-listview.png
new file mode 100644
index 0000000000..05b66206e9
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-listview.png
diff --git a/doc/src/diagrams/gallery-images/motif-menubar.png b/doc/src/diagrams/gallery-images/motif-menubar.png
new file mode 100644
index 0000000000..76a7c43eca
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-menubar.png
diff --git a/doc/src/diagrams/gallery-images/motif-progressbar.png b/doc/src/diagrams/gallery-images/motif-progressbar.png
new file mode 100644
index 0000000000..5acb425ab6
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-progressbar.png
diff --git a/doc/src/diagrams/gallery-images/motif-pushbutton.png b/doc/src/diagrams/gallery-images/motif-pushbutton.png
new file mode 100644
index 0000000000..4c6f6f3e0b
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-pushbutton.png
diff --git a/doc/src/diagrams/gallery-images/motif-radiobutton.png b/doc/src/diagrams/gallery-images/motif-radiobutton.png
new file mode 100644
index 0000000000..7dd1d74aac
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-radiobutton.png
diff --git a/doc/src/diagrams/gallery-images/motif-slider.png b/doc/src/diagrams/gallery-images/motif-slider.png
new file mode 100644
index 0000000000..3dbbe646e0
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-slider.png
diff --git a/doc/src/diagrams/gallery-images/motif-spinbox.png b/doc/src/diagrams/gallery-images/motif-spinbox.png
new file mode 100644
index 0000000000..b5087a6d1e
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-spinbox.png
diff --git a/doc/src/diagrams/gallery-images/motif-tableview.png b/doc/src/diagrams/gallery-images/motif-tableview.png
new file mode 100644
index 0000000000..fcafe6736b
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-tableview.png
diff --git a/doc/src/diagrams/gallery-images/motif-tabwidget.png b/doc/src/diagrams/gallery-images/motif-tabwidget.png
new file mode 100644
index 0000000000..2c18459a26
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-tabwidget.png
diff --git a/doc/src/diagrams/gallery-images/motif-textedit.png b/doc/src/diagrams/gallery-images/motif-textedit.png
new file mode 100644
index 0000000000..b232c14ab8
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-textedit.png
diff --git a/doc/src/diagrams/gallery-images/motif-timeedit.png b/doc/src/diagrams/gallery-images/motif-timeedit.png
new file mode 100644
index 0000000000..8a994063f5
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-timeedit.png
diff --git a/doc/src/diagrams/gallery-images/motif-toolbox.png b/doc/src/diagrams/gallery-images/motif-toolbox.png
new file mode 100644
index 0000000000..6b1f2903fc
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-toolbox.png
diff --git a/doc/src/diagrams/gallery-images/motif-toolbutton.png b/doc/src/diagrams/gallery-images/motif-toolbutton.png
new file mode 100644
index 0000000000..7ea7fe3ebf
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-toolbutton.png
diff --git a/doc/src/diagrams/gallery-images/motif-treeview.png b/doc/src/diagrams/gallery-images/motif-treeview.png
new file mode 100644
index 0000000000..093735be1c
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/motif-treeview.png
diff --git a/doc/src/diagrams/gallery-images/plastique-calendarwidget.png b/doc/src/diagrams/gallery-images/plastique-calendarwidget.png
new file mode 100644
index 0000000000..404ab2b7a0
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-calendarwidget.png
diff --git a/doc/src/diagrams/gallery-images/plastique-checkbox.png b/doc/src/diagrams/gallery-images/plastique-checkbox.png
new file mode 100644
index 0000000000..54868cbe0b
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-checkbox.png
diff --git a/doc/src/diagrams/gallery-images/plastique-colordialog.png b/doc/src/diagrams/gallery-images/plastique-colordialog.png
new file mode 100644
index 0000000000..6cc18ab9ac
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-colordialog.png
diff --git a/doc/src/diagrams/gallery-images/plastique-combobox.png b/doc/src/diagrams/gallery-images/plastique-combobox.png
new file mode 100644
index 0000000000..e3bf8a321f
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-combobox.png
diff --git a/doc/src/diagrams/gallery-images/plastique-dateedit.png b/doc/src/diagrams/gallery-images/plastique-dateedit.png
new file mode 100644
index 0000000000..f71163fede
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-dateedit.png
diff --git a/doc/src/diagrams/gallery-images/plastique-datetimeedit.png b/doc/src/diagrams/gallery-images/plastique-datetimeedit.png
new file mode 100644
index 0000000000..dc84d1997d
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-datetimeedit.png
diff --git a/doc/src/diagrams/gallery-images/plastique-dial.png b/doc/src/diagrams/gallery-images/plastique-dial.png
new file mode 100644
index 0000000000..d1adec124d
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-dial.png
diff --git a/doc/src/diagrams/gallery-images/plastique-doublespinbox.png b/doc/src/diagrams/gallery-images/plastique-doublespinbox.png
new file mode 100644
index 0000000000..2c8af54cbb
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-doublespinbox.png
diff --git a/doc/src/diagrams/gallery-images/plastique-fontcombobox.png b/doc/src/diagrams/gallery-images/plastique-fontcombobox.png
new file mode 100644
index 0000000000..c2ed76c5a4
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-fontcombobox.png
diff --git a/doc/src/diagrams/gallery-images/plastique-fontdialog.png b/doc/src/diagrams/gallery-images/plastique-fontdialog.png
new file mode 100644
index 0000000000..209e59b883
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-fontdialog.png
diff --git a/doc/src/diagrams/gallery-images/plastique-frame.png b/doc/src/diagrams/gallery-images/plastique-frame.png
new file mode 100644
index 0000000000..d20d69b1d2
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-frame.png
diff --git a/doc/src/diagrams/gallery-images/plastique-groupbox.png b/doc/src/diagrams/gallery-images/plastique-groupbox.png
new file mode 100644
index 0000000000..624f2790f9
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-groupbox.png
diff --git a/doc/src/diagrams/gallery-images/plastique-horizontalscrollbar.png b/doc/src/diagrams/gallery-images/plastique-horizontalscrollbar.png
new file mode 100644
index 0000000000..df50e03209
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-horizontalscrollbar.png
diff --git a/doc/src/diagrams/gallery-images/plastique-label.png b/doc/src/diagrams/gallery-images/plastique-label.png
new file mode 100644
index 0000000000..1423b0580d
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-label.png
diff --git a/doc/src/diagrams/gallery-images/plastique-lcdnumber.png b/doc/src/diagrams/gallery-images/plastique-lcdnumber.png
new file mode 100644
index 0000000000..8b13ea9b67
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-lcdnumber.png
diff --git a/doc/src/diagrams/gallery-images/plastique-lineedit.png b/doc/src/diagrams/gallery-images/plastique-lineedit.png
new file mode 100644
index 0000000000..d2ed505f68
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-lineedit.png
diff --git a/doc/src/diagrams/gallery-images/plastique-listview.png b/doc/src/diagrams/gallery-images/plastique-listview.png
new file mode 100644
index 0000000000..76dfd0c572
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-listview.png
diff --git a/doc/src/diagrams/gallery-images/plastique-menubar.png b/doc/src/diagrams/gallery-images/plastique-menubar.png
new file mode 100644
index 0000000000..62fdc91e10
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-menubar.png
diff --git a/doc/src/diagrams/gallery-images/plastique-messagebox.png b/doc/src/diagrams/gallery-images/plastique-messagebox.png
new file mode 100644
index 0000000000..c927ad91e8
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-messagebox.png
diff --git a/doc/src/diagrams/gallery-images/plastique-progressbar.png b/doc/src/diagrams/gallery-images/plastique-progressbar.png
new file mode 100644
index 0000000000..d02187e1a3
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-progressbar.png
diff --git a/doc/src/diagrams/gallery-images/plastique-progressdialog.png b/doc/src/diagrams/gallery-images/plastique-progressdialog.png
new file mode 100644
index 0000000000..d6f426a74c
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-progressdialog.png
diff --git a/doc/src/diagrams/gallery-images/plastique-pushbutton.png b/doc/src/diagrams/gallery-images/plastique-pushbutton.png
new file mode 100644
index 0000000000..a476b58ed4
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-pushbutton.png
diff --git a/doc/src/diagrams/gallery-images/plastique-radiobutton.png b/doc/src/diagrams/gallery-images/plastique-radiobutton.png
new file mode 100644
index 0000000000..373e04c644
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-radiobutton.png
diff --git a/doc/src/diagrams/gallery-images/plastique-sizegrip.png b/doc/src/diagrams/gallery-images/plastique-sizegrip.png
new file mode 100644
index 0000000000..a83fd44f73
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-sizegrip.png
diff --git a/doc/src/diagrams/gallery-images/plastique-slider.png b/doc/src/diagrams/gallery-images/plastique-slider.png
new file mode 100644
index 0000000000..a5698bbb69
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-slider.png
diff --git a/doc/src/diagrams/gallery-images/plastique-spinbox.png b/doc/src/diagrams/gallery-images/plastique-spinbox.png
new file mode 100644
index 0000000000..2a4008cb5d
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-spinbox.png
diff --git a/doc/src/diagrams/gallery-images/plastique-statusbar.png b/doc/src/diagrams/gallery-images/plastique-statusbar.png
new file mode 100644
index 0000000000..c3923a58fc
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-statusbar.png
diff --git a/doc/src/diagrams/gallery-images/plastique-tabbar-truncated.png b/doc/src/diagrams/gallery-images/plastique-tabbar-truncated.png
new file mode 100644
index 0000000000..868a36a691
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-tabbar-truncated.png
diff --git a/doc/src/diagrams/gallery-images/plastique-tabbar.png b/doc/src/diagrams/gallery-images/plastique-tabbar.png
new file mode 100644
index 0000000000..721cb307e5
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-tabbar.png
diff --git a/doc/src/diagrams/gallery-images/plastique-tableview.png b/doc/src/diagrams/gallery-images/plastique-tableview.png
new file mode 100644
index 0000000000..7dd40fd28b
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-tableview.png
diff --git a/doc/src/diagrams/gallery-images/plastique-tabwidget.png b/doc/src/diagrams/gallery-images/plastique-tabwidget.png
new file mode 100644
index 0000000000..200f348b81
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-tabwidget.png
diff --git a/doc/src/diagrams/gallery-images/plastique-textedit.png b/doc/src/diagrams/gallery-images/plastique-textedit.png
new file mode 100644
index 0000000000..5599cdb5ef
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-textedit.png
diff --git a/doc/src/diagrams/gallery-images/plastique-timeedit.png b/doc/src/diagrams/gallery-images/plastique-timeedit.png
new file mode 100644
index 0000000000..c638dbcd5d
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-timeedit.png
diff --git a/doc/src/diagrams/gallery-images/plastique-toolbox.png b/doc/src/diagrams/gallery-images/plastique-toolbox.png
new file mode 100644
index 0000000000..9212594862
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-toolbox.png
diff --git a/doc/src/diagrams/gallery-images/plastique-toolbutton.png b/doc/src/diagrams/gallery-images/plastique-toolbutton.png
new file mode 100644
index 0000000000..eac876306d
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-toolbutton.png
diff --git a/doc/src/diagrams/gallery-images/plastique-treeview.png b/doc/src/diagrams/gallery-images/plastique-treeview.png
new file mode 100644
index 0000000000..34de0e9ff6
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/plastique-treeview.png
diff --git a/doc/src/diagrams/gallery-images/windows-calendarwidget.png b/doc/src/diagrams/gallery-images/windows-calendarwidget.png
new file mode 100644
index 0000000000..573410390f
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-calendarwidget.png
diff --git a/doc/src/diagrams/gallery-images/windows-checkbox.png b/doc/src/diagrams/gallery-images/windows-checkbox.png
new file mode 100644
index 0000000000..cc40f16e95
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-checkbox.png
diff --git a/doc/src/diagrams/gallery-images/windows-combobox.png b/doc/src/diagrams/gallery-images/windows-combobox.png
new file mode 100644
index 0000000000..218d90e354
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-combobox.png
diff --git a/doc/src/diagrams/gallery-images/windows-dateedit.png b/doc/src/diagrams/gallery-images/windows-dateedit.png
new file mode 100644
index 0000000000..8e98d42a17
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-dateedit.png
diff --git a/doc/src/diagrams/gallery-images/windows-datetimeedit.png b/doc/src/diagrams/gallery-images/windows-datetimeedit.png
new file mode 100644
index 0000000000..6cd5b2a161
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-datetimeedit.png
diff --git a/doc/src/diagrams/gallery-images/windows-dial.png b/doc/src/diagrams/gallery-images/windows-dial.png
new file mode 100644
index 0000000000..36dd3e2627
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-dial.png
diff --git a/doc/src/diagrams/gallery-images/windows-doublespinbox.png b/doc/src/diagrams/gallery-images/windows-doublespinbox.png
new file mode 100644
index 0000000000..0e12fc4130
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-doublespinbox.png
diff --git a/doc/src/diagrams/gallery-images/windows-fontcombobox.png b/doc/src/diagrams/gallery-images/windows-fontcombobox.png
new file mode 100644
index 0000000000..80bbb5aef3
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-fontcombobox.png
diff --git a/doc/src/diagrams/gallery-images/windows-frame.png b/doc/src/diagrams/gallery-images/windows-frame.png
new file mode 100644
index 0000000000..5e72c369bd
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-frame.png
diff --git a/doc/src/diagrams/gallery-images/windows-groupbox.png b/doc/src/diagrams/gallery-images/windows-groupbox.png
new file mode 100644
index 0000000000..8a9d8f341e
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-groupbox.png
diff --git a/doc/src/diagrams/gallery-images/windows-horizontalscrollbar.png b/doc/src/diagrams/gallery-images/windows-horizontalscrollbar.png
new file mode 100644
index 0000000000..da35a4a881
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-horizontalscrollbar.png
diff --git a/doc/src/diagrams/gallery-images/windows-label.png b/doc/src/diagrams/gallery-images/windows-label.png
new file mode 100644
index 0000000000..9d2da07504
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-label.png
diff --git a/doc/src/diagrams/gallery-images/windows-lcdnumber.png b/doc/src/diagrams/gallery-images/windows-lcdnumber.png
new file mode 100644
index 0000000000..7503cc8baa
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-lcdnumber.png
diff --git a/doc/src/diagrams/gallery-images/windows-lineedit.png b/doc/src/diagrams/gallery-images/windows-lineedit.png
new file mode 100644
index 0000000000..ffbdb5a4f6
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-lineedit.png
diff --git a/doc/src/diagrams/gallery-images/windows-listview.png b/doc/src/diagrams/gallery-images/windows-listview.png
new file mode 100644
index 0000000000..9e0427131c
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-listview.png
diff --git a/doc/src/diagrams/gallery-images/windows-progressbar.png b/doc/src/diagrams/gallery-images/windows-progressbar.png
new file mode 100644
index 0000000000..86ca13ebd0
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-progressbar.png
diff --git a/doc/src/diagrams/gallery-images/windows-pushbutton.png b/doc/src/diagrams/gallery-images/windows-pushbutton.png
new file mode 100644
index 0000000000..d095655c96
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-pushbutton.png
diff --git a/doc/src/diagrams/gallery-images/windows-radiobutton.png b/doc/src/diagrams/gallery-images/windows-radiobutton.png
new file mode 100644
index 0000000000..65a2967f38
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-radiobutton.png
diff --git a/doc/src/diagrams/gallery-images/windows-slider.png b/doc/src/diagrams/gallery-images/windows-slider.png
new file mode 100644
index 0000000000..38115a282f
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-slider.png
diff --git a/doc/src/diagrams/gallery-images/windows-spinbox.png b/doc/src/diagrams/gallery-images/windows-spinbox.png
new file mode 100644
index 0000000000..69d4af4867
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-spinbox.png
diff --git a/doc/src/diagrams/gallery-images/windows-tableview.png b/doc/src/diagrams/gallery-images/windows-tableview.png
new file mode 100644
index 0000000000..c42af7fa9e
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-tableview.png
diff --git a/doc/src/diagrams/gallery-images/windows-tabwidget.png b/doc/src/diagrams/gallery-images/windows-tabwidget.png
new file mode 100644
index 0000000000..22651b8ac7
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-tabwidget.png
diff --git a/doc/src/diagrams/gallery-images/windows-textedit.png b/doc/src/diagrams/gallery-images/windows-textedit.png
new file mode 100644
index 0000000000..ea930d5e4a
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-textedit.png
diff --git a/doc/src/diagrams/gallery-images/windows-timeedit.png b/doc/src/diagrams/gallery-images/windows-timeedit.png
new file mode 100644
index 0000000000..ed228841dc
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-timeedit.png
diff --git a/doc/src/diagrams/gallery-images/windows-toolbox.png b/doc/src/diagrams/gallery-images/windows-toolbox.png
new file mode 100644
index 0000000000..50a5d5a37b
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-toolbox.png
diff --git a/doc/src/diagrams/gallery-images/windows-toolbutton.png b/doc/src/diagrams/gallery-images/windows-toolbutton.png
new file mode 100644
index 0000000000..b762be3bab
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-toolbutton.png
diff --git a/doc/src/diagrams/gallery-images/windows-treeview.png b/doc/src/diagrams/gallery-images/windows-treeview.png
new file mode 100644
index 0000000000..68f98ae70c
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windows-treeview.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-calendarwidget.png b/doc/src/diagrams/gallery-images/windowsvista-calendarwidget.png
new file mode 100644
index 0000000000..050f0ac890
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-calendarwidget.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-checkbox.png b/doc/src/diagrams/gallery-images/windowsvista-checkbox.png
new file mode 100644
index 0000000000..c533809e2f
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-checkbox.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-combobox.png b/doc/src/diagrams/gallery-images/windowsvista-combobox.png
new file mode 100644
index 0000000000..8ab83cb3d9
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-combobox.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-dateedit.png b/doc/src/diagrams/gallery-images/windowsvista-dateedit.png
new file mode 100644
index 0000000000..85e6ed404d
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-dateedit.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-datetimeedit.png b/doc/src/diagrams/gallery-images/windowsvista-datetimeedit.png
new file mode 100644
index 0000000000..390c9569e1
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-datetimeedit.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-dial.png b/doc/src/diagrams/gallery-images/windowsvista-dial.png
new file mode 100644
index 0000000000..86f3a86a02
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-dial.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-doublespinbox.png b/doc/src/diagrams/gallery-images/windowsvista-doublespinbox.png
new file mode 100644
index 0000000000..bf3d2cce72
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-doublespinbox.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-fontcombobox.png b/doc/src/diagrams/gallery-images/windowsvista-fontcombobox.png
new file mode 100644
index 0000000000..7810fdbcb2
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-fontcombobox.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-frame.png b/doc/src/diagrams/gallery-images/windowsvista-frame.png
new file mode 100644
index 0000000000..d3e28856f4
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-frame.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-groupbox.png b/doc/src/diagrams/gallery-images/windowsvista-groupbox.png
new file mode 100644
index 0000000000..917eea1e62
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-groupbox.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-horizontalscrollbar.png b/doc/src/diagrams/gallery-images/windowsvista-horizontalscrollbar.png
new file mode 100644
index 0000000000..103a2e603b
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-horizontalscrollbar.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-label.png b/doc/src/diagrams/gallery-images/windowsvista-label.png
new file mode 100644
index 0000000000..3f6f2c020d
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-label.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-lcdnumber.png b/doc/src/diagrams/gallery-images/windowsvista-lcdnumber.png
new file mode 100644
index 0000000000..7e875dd745
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-lcdnumber.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-lineedit.png b/doc/src/diagrams/gallery-images/windowsvista-lineedit.png
new file mode 100644
index 0000000000..5f13d9b3d8
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-lineedit.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-listview.png b/doc/src/diagrams/gallery-images/windowsvista-listview.png
new file mode 100644
index 0000000000..a2d0c66ff2
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-listview.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-progressbar.png b/doc/src/diagrams/gallery-images/windowsvista-progressbar.png
new file mode 100644
index 0000000000..6d4da7b23d
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-progressbar.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-pushbutton.png b/doc/src/diagrams/gallery-images/windowsvista-pushbutton.png
new file mode 100644
index 0000000000..128f2323f6
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-pushbutton.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-radiobutton.png b/doc/src/diagrams/gallery-images/windowsvista-radiobutton.png
new file mode 100644
index 0000000000..f739ae0536
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-radiobutton.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-slider.png b/doc/src/diagrams/gallery-images/windowsvista-slider.png
new file mode 100644
index 0000000000..a3a5d93362
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-slider.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-spinbox.png b/doc/src/diagrams/gallery-images/windowsvista-spinbox.png
new file mode 100644
index 0000000000..79115d6d95
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-spinbox.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-tableview.png b/doc/src/diagrams/gallery-images/windowsvista-tableview.png
new file mode 100644
index 0000000000..b94b07fc09
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-tableview.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-tabwidget.png b/doc/src/diagrams/gallery-images/windowsvista-tabwidget.png
new file mode 100644
index 0000000000..28b0a3912e
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-tabwidget.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-textedit.png b/doc/src/diagrams/gallery-images/windowsvista-textedit.png
new file mode 100644
index 0000000000..c9527319ee
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-textedit.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-timeedit.png b/doc/src/diagrams/gallery-images/windowsvista-timeedit.png
new file mode 100644
index 0000000000..9a4b053dbc
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-timeedit.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-toolbox.png b/doc/src/diagrams/gallery-images/windowsvista-toolbox.png
new file mode 100644
index 0000000000..b3477e8b6f
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-toolbox.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-toolbutton.png b/doc/src/diagrams/gallery-images/windowsvista-toolbutton.png
new file mode 100644
index 0000000000..0ab376b554
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-toolbutton.png
diff --git a/doc/src/diagrams/gallery-images/windowsvista-treeview.png b/doc/src/diagrams/gallery-images/windowsvista-treeview.png
new file mode 100644
index 0000000000..7626820af9
--- /dev/null
+++ b/doc/src/diagrams/gallery-images/windowsvista-treeview.png
diff --git a/doc/src/diagrams/graphicsview-map.png b/doc/src/diagrams/graphicsview-map.png
new file mode 100644
index 0000000000..5ad12c65c8
--- /dev/null
+++ b/doc/src/diagrams/graphicsview-map.png
diff --git a/doc/src/diagrams/graphicsview-map.zip b/doc/src/diagrams/graphicsview-map.zip
new file mode 100644
index 0000000000..a80ade527c
--- /dev/null
+++ b/doc/src/diagrams/graphicsview-map.zip
diff --git a/doc/src/diagrams/graphicsview-shapes.png b/doc/src/diagrams/graphicsview-shapes.png
new file mode 100644
index 0000000000..01fcca1793
--- /dev/null
+++ b/doc/src/diagrams/graphicsview-shapes.png
diff --git a/doc/src/diagrams/graphicsview-text.png b/doc/src/diagrams/graphicsview-text.png
new file mode 100644
index 0000000000..47a55059cd
--- /dev/null
+++ b/doc/src/diagrams/graphicsview-text.png
diff --git a/doc/src/diagrams/hellogl-example.png b/doc/src/diagrams/hellogl-example.png
new file mode 100644
index 0000000000..82b6f2c220
--- /dev/null
+++ b/doc/src/diagrams/hellogl-example.png
diff --git a/doc/src/diagrams/house.png b/doc/src/diagrams/house.png
new file mode 100644
index 0000000000..9b7b5871ce
--- /dev/null
+++ b/doc/src/diagrams/house.png
diff --git a/doc/src/diagrams/house.sk b/doc/src/diagrams/house.sk
new file mode 100644
index 0000000000..997153dd4a
--- /dev/null
+++ b/doc/src/diagrams/house.sk
@@ -0,0 +1,33 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+le()
+lw(1)
+r(90,0,0,-65,35,810)
+gl([(0,(0.866,0.684,0.208)),(1,(0.913,0.888,0.165))])
+pgl(0,-1,0)
+fp()
+lw(1)
+r(60,0,0,35,50,750)
+gl([(0,(0.866,0.358,0.337)),(1,(0.913,0.651,0.313))])
+pgl(0,-1,0)
+fp()
+lw(1)
+b()
+bs(120,785,0)
+bs(100,805,0)
+bs(60,805,0)
+bs(40,785,0)
+bs(120,785,0)
+bC()
+fp((1,1,1))
+lw(1)
+r(15,0,0,-15,60,780)
+gl([(0,(0.866,0.358,0.337)),(1,(0.913,0.651,0.313))])
+pgl(0,-1,0)
+fp()
+lw(1)
+r(15,0,0,25,85,750)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/httpstack.sk b/doc/src/diagrams/httpstack.sk
new file mode 100644
index 0000000000..9a93682f7e
--- /dev/null
+++ b/doc/src/diagrams/httpstack.sk
@@ -0,0 +1,112 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((0.808,0.4,0.4))
+lw(1)
+r(150,0,0,-20,97.5,732.5)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Client Application',(126.15,718.5))
+fp((0.9,0.9,0.9))
+lw(1)
+r(150,0,0,-20,97.5,712.5)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('HTTP/FTP',(143.832,698.5))
+fp((0.8,0.8,0.8))
+lw(1)
+r(150,0,0,-20,97.5,692.5)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('TCP',(160.5,678.5))
+fp((0.7,0.7,0.7))
+lw(1)
+r(150,0,0,-20,97.5,672.5)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('IP',(166.83,658.5))
+fp((0.625,0.625,0.625))
+lw(1)
+r(150,0,0,-20,97.5,652.5)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Link Layer',(144.822,638.5))
+fp((0.55,0.55,0.55))
+lw(1)
+r(150,0,0,-20,97.5,632.5)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Physical Layer',(133.488,618.5))
+fp((0.245,0.484,0.808))
+lw(1)
+r(150,0,0,-20,337.5,732.5)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Server Application',(363.816,718.5))
+fp((0.9,0.9,0.9))
+lw(1)
+r(150,0,0,-20,337.5,712.5)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('HTTP/FTP',(383.832,698.5))
+fp((0.8,0.8,0.8))
+lw(1)
+r(150,0,0,-20,337.5,692.5)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('TCP',(400.5,678.5))
+fp((0.7,0.7,0.7))
+lw(1)
+r(150,0,0,-20,337.5,672.5)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('IP',(406.83,658.5))
+fp((0.625,0.625,0.625))
+lw(1)
+r(150,0,0,-20,337.5,652.5)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Link Layer',(384.822,638.5))
+fp((0.55,0.55,0.55))
+lw(1)
+r(150,0,0,-20,337.5,632.5)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Physical Layer',(373.488,618.5))
+lp((0.217,0.6,0))
+lw(1.5)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(252.5,622.5,0)
+bs(332.5,622.5,0)
+le()
+lw(1)
+r(410,0,0,-140,87.5,742.5)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/itemviews/editabletreemodel-indexes.sk b/doc/src/diagrams/itemviews/editabletreemodel-indexes.sk
new file mode 100644
index 0000000000..ad5738417e
--- /dev/null
+++ b/doc/src/diagrams/itemviews/editabletreemodel-indexes.sk
@@ -0,0 +1,92 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(212.5,0,0,-180,165,730)
+fp((0,0,0.631))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(10)
+txt('TreeItem::parent()',(180,637.82))
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('B',(188.33,678.14))
+lw(1)
+r(30,0,0,-30,180,700)
+G_()
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('C',(187.78,590.64))
+lw(1)
+r(30,0,0,-30,180,612.5)
+G_()
+fp((0,0,0.631))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(10)
+txt('TreeModel::internalPointer()',(207.5,560))
+fp((0,0,0.631))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(10)
+txt('TreeModel::createIndex()',(207.5,715.32))
+lw(1)
+ld((2, 2))
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(180.125,665,0)
+bc(175.352,655.495,173.294,646.758,173.836,638.714,1)
+bc(174.37,630.789,177.818,624.278,182.5,616.996,1)
+lw(1)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(215,582.5,0)
+bc(240,573.01,270,572.5,295,582.5,1)
+lw(1)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(294.998,700.41,0)
+bc(269.947,709.762,239.944,710.108,215,699.97,1)
+lw(1)
+r(70,0,0,-30,300,612.5)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(10)
+txt('child',(324.72,600.32))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(10)
+txt('model index',(308.045,587.82))
+lw(1)
+r(70,0,0,-30,300,700)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(10)
+txt('parent',(320.825,687.82))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(10)
+txt('model index',(308.045,675.32))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/itemviews/editabletreemodel-items.sk b/doc/src/diagrams/itemviews/editabletreemodel-items.sk
new file mode 100644
index 0000000000..8c7bfacc8a
--- /dev/null
+++ b/doc/src/diagrams/itemviews/editabletreemodel-items.sk
@@ -0,0 +1,119 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(227.5,0,0,-225,140,740)
+fp((0,0,0.631))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(10)
+txt('parent()',(327.49,578.25))
+fp((0,0,0.631))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(10)
+txt('parent()',(272.49,692.5))
+fp((0,0,0.631))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(10)
+txt('parent()',(180,617.82))
+fp((0,0,0.631))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(10)
+txt('child(0)',(228.976,678.25))
+fp((0,0,0.631))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(10)
+txt('child(0)',(287.22,555.75))
+fp((0,0,0.631))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(10)
+txt('child(1)',(235,625))
+lw(1)
+ld((5, 5))
+r(30,0,0,-30,205,735.43)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Oblique')
+txt('root item',(145.128,716.814))
+lw(1)
+ld((2, 2))
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(327.5,555.43,0)
+bc(326.189,566.2,323.978,574.469,319.693,579.482,1)
+bc(315.471,584.421,309.225,586.174,301.476,587.5,1)
+lw(1)
+ld((2, 2))
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(271.476,675.43,0)
+bc(270.016,686.345,267.555,694.724,262.783,699.805,1)
+bc(258.083,704.81,251.128,706.586,242.5,707.93,1)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(216.476,700.43,0)
+bc(218.411,687.052,221.761,676.771,228.35,670.517,1)
+bc(234.84,664.355,244.494,662.134,256.476,660.43,1)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(276.476,580,0)
+bc(278.169,566.622,281.1,556.341,286.865,550.087,1)
+bc(292.545,543.925,300.992,541.704,311.476,540,1)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(213.976,700.43,0)
+bc(216.032,668.656,219.591,644.241,226.592,629.386,1)
+bc(233.488,614.753,243.745,609.476,256.476,605.43,1)
+lw(1)
+ld((2, 2))
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(207.5,700.43,0)
+bc(210,645.43,215,605.43,257.5,595.43,1)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('A',(273.33,648.57))
+lw(1)
+r(30,0,0,-30,265,670.43)
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('B',(273.33,593.14))
+lw(1)
+r(30,0,0,-30,265,615)
+G_()
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('C',(327.78,528.14))
+lw(1)
+r(30,0,0,-30,320,550)
+G_()
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/itemviews/editabletreemodel-model.sk b/doc/src/diagrams/itemviews/editabletreemodel-model.sk
new file mode 100644
index 0000000000..cbd3c89772
--- /dev/null
+++ b/doc/src/diagrams/itemviews/editabletreemodel-model.sk
@@ -0,0 +1,392 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((0.503,0.503,0.503))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 2',(270.316,591.384))
+fp((0.503,0.503,0.503))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 3',(270.316,561.384))
+le()
+lw(1)
+ld((3, 3))
+r(280,0,0,-247.5,135,715)
+gl([(0,(1,1,1)),(0.47,(0.899,0.899,0.899)),(1,(0.899,0.899,0.899))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+r(5.51073e-15,-30,30,5.51073e-15,235,610)
+gl([(0,(1,1,1)),(0.19,(1,1,1)),(0.815,(0.899,0.899,0.899)),(1,(0.899,0.899,0.899))])
+pgr(-0.00900901,1,0)
+fp()
+le()
+lw(1)
+ld((3, 3))
+r(-30,0,0,-30,265,580)
+gl([(0,(1,1,1)),(0.47,(0.899,0.899,0.899)),(1,(0.899,0.899,0.899))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+ld((3, 3))
+r(-30,0,0,-30,205,580)
+fp((0.899,0.899,0.899))
+lp((0.503,0.503,0.503))
+lw(1)
+r(30,0,0,-30,175,610)
+fp((0.866,0.866,0.866))
+lw(1)
+r(30,0,0,-30,175,640)
+gl([(0,(1,1,1)),(0.47,(0.899,0.899,0.899)),(1,(0.899,0.899,0.899))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+ld((3, 3))
+r(-30,0,0,-30,235,580)
+G()
+lw(1)
+b()
+bs(235,610,0)
+bs(255,610,0)
+lw(1)
+ld((2, 2))
+b()
+bs(255,610,0)
+bs(265,610,0)
+G_()
+fp((0.899,0.899,0.899))
+lp((0.503,0.503,0.503))
+lw(1)
+r(30,0,0,-30,205,610)
+gl([(0,(1,1,1)),(0.47,(0.866,0.866,0.866)),(1,(0.866,0.866,0.866))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+r(5.51073e-15,-30,30,5.51073e-15,235,640)
+fp((0.866,0.866,0.866))
+lw(1)
+r(30,0,0,-30,175,670)
+lw(1)
+ld((5, 5))
+r(30,0,0,-30,140,710)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Oblique')
+txt('root item',(180,691.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 0',(270.316,651.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 1',(270.316,621.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 1',(370.316,546.384))
+lw(1)
+b()
+bs(155,680,0)
+bs(155,655,0)
+lw(1)
+b()
+bs(155,655,0)
+bs(175,655,0)
+fp((0.866,0.866,0.866))
+lw(1)
+r(30,0,0,-30,205,640)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('a',(184.44,650))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('b',(184.44,618.14))
+gl([(0,(1,1,1)),(0.47,(0.866,0.866,0.866)),(1,(0.866,0.866,0.866))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+ld((3, 3))
+r(5.51073e-15,-30,30,5.51073e-15,235,670)
+fp((0.866,0.866,0.866))
+lw(1)
+r(30,0,0,-30,205,670)
+G()
+lw(1)
+b()
+bs(235,670,0)
+bs(255,670,0)
+lw(1)
+ld((2, 2))
+b()
+bs(255,670,0)
+bs(265,670,0)
+G_()
+G()
+lw(1)
+b()
+bs(235,640,0)
+bs(255,640,0)
+lw(1)
+ld((2, 2))
+b()
+bs(255,640,0)
+bs(265,640,0)
+G_()
+lw(1)
+b()
+bs(190,615,0)
+bs(190,587.5,0)
+bs(275,587.5,0)
+G()
+lp((0.503,0.503,0.503))
+lw(1)
+b()
+bs(235,580,0)
+bs(235,560,0)
+lp((0.503,0.503,0.503))
+lw(1)
+ld((2, 2))
+b()
+bs(235,560,0)
+bs(235,550,0)
+G_()
+G()
+lp((0.503,0.503,0.503))
+lw(1)
+b()
+bs(205,580,0)
+bs(205,560,0)
+lp((0.503,0.503,0.503))
+lw(1)
+ld((2, 2))
+b()
+bs(205,560,0)
+bs(205,550,0)
+G_()
+G()
+lp((0.503,0.503,0.503))
+lw(1)
+b()
+bs(175,580,0)
+bs(175,560,0)
+lp((0.503,0.503,0.503))
+lw(1)
+ld((2, 2))
+b()
+bs(175,560,0)
+bs(175,550,0)
+G_()
+G()
+lw(1)
+b()
+bs(235,610,0)
+bs(255,610,0)
+lw(1)
+ld((2, 2))
+b()
+bs(255,610,0)
+bs(265,610,0)
+G_()
+G()
+lp((0.503,0.503,0.503))
+lw(1)
+b()
+bs(235,580,0)
+bs(255,580,0)
+lp((0.503,0.503,0.503))
+lw(1)
+ld((2, 2))
+b()
+bs(255,580,0)
+bs(265,580,0)
+G_()
+G()
+gl([(0,(1,1,1)),(0.47,(0.866,0.866,0.866)),(1,(0.866,0.866,0.866))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+ld((3, 3))
+r(5.51073e-15,-30,30,5.51073e-15,335,595)
+G()
+lw(1)
+b()
+bs(335,595,0)
+bs(355,595,0)
+lw(1)
+ld((2, 2))
+b()
+bs(355,595,0)
+bs(365,595,0)
+G_()
+G()
+lw(1)
+b()
+bs(335,565,0)
+bs(355,565,0)
+lw(1)
+ld((2, 2))
+b()
+bs(355,565,0)
+bs(365,565,0)
+G_()
+G_()
+gl([(0,(1,1,1)),(0.19,(1,1,1)),(0.815,(0.899,0.899,0.899)),(1,(0.899,0.899,0.899))])
+pgr(-0.00900901,1,0)
+fp()
+le()
+lw(1)
+ld((3, 3))
+r(-30,0,0,-30,365,565)
+lp((0.503,0.503,0.503))
+lw(1)
+ld((2, 2))
+b()
+bs(280,572.5,0)
+bs(290,572.5,0)
+gl([(0,(1,1,1)),(0.47,(0.899,0.899,0.899)),(1,(0.899,0.899,0.899))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+ld((3, 3))
+r(-30,0,0,-30,305,565)
+gl([(0,(1,1,1)),(0.47,(0.899,0.899,0.899)),(1,(0.899,0.899,0.899))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+ld((3, 3))
+r(-30,0,0,-30,335,565)
+G()
+lw(1)
+b()
+bs(300,577.5,0)
+bs(320,577.5,0)
+lw(1)
+ld((2, 2))
+b()
+bs(320,577.5,0)
+bs(330,577.5,0)
+G_()
+fp((0.866,0.866,0.866))
+lw(1)
+r(30,0,0,-30,305,595)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 0',(370.316,576.384))
+fp((0.866,0.866,0.866))
+lw(1)
+r(30,0,0,-30,275,595)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('c',(315,574.89))
+G()
+lp((0.503,0.503,0.503))
+lw(1)
+b()
+bs(335,565,0)
+bs(335,545,0)
+lp((0.503,0.503,0.503))
+lw(1)
+ld((2, 2))
+b()
+bs(335,545,0)
+bs(335,535,0)
+G_()
+G()
+lp((0.503,0.503,0.503))
+lw(1)
+b()
+bs(305,565,0)
+bs(305,545,0)
+lp((0.503,0.503,0.503))
+lw(1)
+ld((2, 2))
+b()
+bs(305,545,0)
+bs(305,535,0)
+G_()
+G()
+lp((0.503,0.503,0.503))
+lw(1)
+b()
+bs(275,565,0)
+bs(275,545,0)
+lp((0.503,0.503,0.503))
+lw(1)
+ld((2, 2))
+b()
+bs(275,545,0)
+bs(275,535,0)
+G_()
+lw(1)
+b()
+bs(335,565,0)
+bs(355,565,0)
+lw(1)
+ld((2, 2))
+b()
+bs(355,565,0)
+bs(365,565,0)
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('column = 1',(0,-1,1,0,317.484,530))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('column = 0',(0,-1,1,0,287.484,530))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('column = 2',(0,-1,1,0,347.484,530))
+G_()
+G()
+fp((0,0,0))
+lw(1)
+ld((3, 3))
+Fn('Helvetica')
+txt('column = 1',(0,-1,1,0,216.384,545))
+fp((0,0,0))
+lw(1)
+ld((3, 3))
+Fn('Helvetica')
+txt('column = 0',(0,-1,1,0,186.384,545))
+fp((0,0,0))
+lw(1)
+ld((3, 3))
+Fn('Helvetica')
+txt('column = 2',(0,-1,1,0,246.384,545))
+G_()
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/itemviews/editabletreemodel-values.sk b/doc/src/diagrams/itemviews/editabletreemodel-values.sk
new file mode 100644
index 0000000000..50f8543090
--- /dev/null
+++ b/doc/src/diagrams/itemviews/editabletreemodel-values.sk
@@ -0,0 +1,263 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+ld((1, 1))
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(111.719,739.57,0)
+bs(134.219,739.57,0)
+bs(137.5,732.07,0)
+lw(1)
+ld((1, 1))
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(111.719,639.57,0)
+bs(134.219,639.57,0)
+bs(137.5,632.07,0)
+fp((0,0,0.631))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(10)
+txt('data(...)',(78.04,747.82))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('itemData',(153.012,718.454))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('itemData',(153.012,618.454))
+lw(1)
+r(15,0,0,-15,70,730)
+lw(1)
+r(15,0,0,-15,70,630)
+lw(1)
+r(15,0,0,-15,85,730)
+lw(1)
+r(15,0,0,-15,85,630)
+lw(1)
+r(15,0,0,-15,100,730)
+lw(1)
+r(15,0,0,-15,100,630)
+lw(1)
+r(15,0,0,-15,115,730)
+lw(1)
+r(15,0,0,-15,115,630)
+lw(1)
+ld((3, 3))
+r(15,0,0,-15,130,730)
+lw(1)
+ld((3, 3))
+r(15,0,0,-15,130,630)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(50,735,0)
+bs(52.5,739.57,0)
+bs(75,739.57,0)
+bs(77.5,732.07,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(50,635,0)
+bs(52.5,639.57,0)
+bs(75,639.57,0)
+bs(77.5,632.07,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(68.315,739.57,0)
+bs(90.815,739.57,0)
+bs(92.5,732.07,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(68.315,639.57,0)
+bs(90.815,639.57,0)
+bs(92.5,632.07,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(83.038,739.57,0)
+bs(105.538,739.57,0)
+bs(107.5,732.07,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(83.038,639.57,0)
+bs(105.538,639.57,0)
+bs(107.5,632.07,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(97.417,739.57,0)
+bs(119.917,739.57,0)
+bs(122.5,732.07,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(97.417,639.57,0)
+bs(119.917,639.57,0)
+bs(122.5,632.07,0)
+fp((0.706,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('0',(74.164,718.595))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('0',(74.164,618.595))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('1',(89.164,718.595))
+fp((0.706,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('1',(89.164,618.595))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('2',(104.164,718.595))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('2',(104.164,618.595))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('3',(119.164,718.595))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('3',(119.164,618.595))
+lw(1)
+r(180,0,0,-160,25,760)
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('C',(37.78,613.14))
+lw(1)
+r(30,0,0,-30,30,635)
+G_()
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('A',(38.33,713.14))
+lw(1)
+r(30,0,0,-30,30,735)
+G_()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('c',(89.5,604.314))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('a',(74.164,703.884))
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('B',(38.33,663.14))
+lw(1)
+r(30,0,0,-30,30,685)
+G_()
+lw(1)
+ld((1, 1))
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(111.719,690,0)
+bs(134.219,690,0)
+bs(137.5,682.5,0)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('itemData',(153.012,668.884))
+lw(1)
+r(15,0,0,-15,70,680.43)
+lw(1)
+r(15,0,0,-15,85,680.43)
+lw(1)
+r(15,0,0,-15,100,680.43)
+lw(1)
+r(15,0,0,-15,115,680.43)
+lw(1)
+ld((3, 3))
+r(15,0,0,-15,130,680.43)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(50,685.43,0)
+bs(52.5,690,0)
+bs(75,690,0)
+bs(77.5,682.5,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(68.315,690,0)
+bs(90.815,690,0)
+bs(92.5,682.5,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(83.038,690,0)
+bs(105.538,690,0)
+bs(107.5,682.5,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(97.417,690,0)
+bs(119.917,690,0)
+bs(122.5,682.5,0)
+fp((0.706,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('0',(74.164,669.025))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('1',(89.164,669.025))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('2',(104.164,669.025))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('3',(119.164,669.025))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('b',(74.164,654.025))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/licensewizard-flow.sk b/doc/src/diagrams/licensewizard-flow.sk
new file mode 100644
index 0000000000..79fae26171
--- /dev/null
+++ b/doc/src/diagrams/licensewizard-flow.sk
@@ -0,0 +1,54 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+bm(1083898156,'/tmp/x/licensewizard-evaluate.gif')
+im((851.299,69.838),1083898156)
+lp((1,0,0))
+lw(7)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(496.05,895.241,0)
+bs(597.322,1024.52,0)
+lp((1,0,0))
+lw(7)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(1010.49,1262.08,0)
+bs(1200.11,1262.08,0)
+lp((1,0,0))
+lw(7)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(1675.76,1024.52,0)
+bs(1777.03,895.241,0)
+lp((1,0,0))
+lw(7)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(890.669,1026.68,0)
+bs(1537.09,725.018,0)
+bm(1081732172,'/tmp/x/licensewizard-conclusion.gif')
+im((1580.67,443.683),1081732172)
+bm(1083701292,'/tmp/x/licensewizard-details.gif')
+im((1239.15,1048.08),1083701292)
+bm(1083701484,'/tmp/x/licensewizard-intro.gif')
+im((121.925,443.683),1083701484)
+bm(1083722348,'/tmp/x/licensewizard-register.gif')
+im((463.448,1048.08),1083722348)
+G()
+lp((1,0,0))
+lw(7)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(522.833,413.964,0)
+bs(818.03,278.216,0)
+lp((1,0,0))
+lw(7)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(1392.57,278.216,0)
+bs(1687.76,413.964,0)
+G_()
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,10000,10000),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/linguist-icons/appicon.png b/doc/src/diagrams/linguist-icons/appicon.png
new file mode 100644
index 0000000000..dab379fd58
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/appicon.png
diff --git a/doc/src/diagrams/linguist-icons/linguist.qrc b/doc/src/diagrams/linguist-icons/linguist.qrc
new file mode 100644
index 0000000000..1972905313
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/linguist.qrc
@@ -0,0 +1,51 @@
+<RCC>
+<qresource>
+    <file>images/appicon.png</file>
+    <file>images/splash.png</file>
+    <file>images/s_check_danger.png</file>
+    <file>images/s_check_empty.png</file>
+    <file>images/s_check_warning.png</file>
+    <file>images/s_check_obsolete.png</file>
+    <file>images/s_check_off.png</file>
+    <file>images/s_check_on.png</file>
+    <file>images/pagecurl.png</file>
+    <file>images/mac/accelerator.png</file>
+    <file>images/mac/book.png</file>
+    <file>images/mac/doneandnext.png</file>
+    <file>images/mac/editcopy.png</file>
+    <file>images/mac/editcut.png</file>
+    <file>images/mac/editpaste.png</file>
+    <file>images/mac/fileopen.png</file>
+    <file>images/mac/filesave.png</file>
+    <file>images/mac/next.png</file>
+    <file>images/mac/nextunfinished.png</file>
+    <file>images/mac/phrase.png</file>
+    <file>images/mac/prev.png</file>
+    <file>images/mac/prevunfinished.png</file>
+    <file>images/mac/print.png</file>
+    <file>images/mac/punctuation.png</file>
+    <file>images/mac/redo.png</file>
+    <file>images/mac/searchfind.png</file>
+    <file>images/mac/undo.png</file>
+    <file>images/mac/whatsthis.png</file>
+    <file>images/win/accelerator.png</file>
+    <file>images/win/book.png</file>
+    <file>images/win/doneandnext.png</file>
+    <file>images/win/editcopy.png</file>
+    <file>images/win/editcut.png</file>
+    <file>images/win/editpaste.png</file>
+    <file>images/win/fileopen.png</file>
+    <file>images/win/filesave.png</file>
+    <file>images/win/next.png</file>
+    <file>images/win/nextunfinished.png</file>
+    <file>images/win/phrase.png</file>
+    <file>images/win/prev.png</file>
+    <file>images/win/prevunfinished.png</file>
+    <file>images/win/print.png</file>
+    <file>images/win/punctuation.png</file>
+    <file>images/win/redo.png</file>
+    <file>images/win/searchfind.png</file>
+    <file>images/win/undo.png</file>
+    <file>images/win/whatsthis.png</file>
+</qresource>
+</RCC>
diff --git a/doc/src/diagrams/linguist-icons/pagecurl.png b/doc/src/diagrams/linguist-icons/pagecurl.png
new file mode 100644
index 0000000000..2d3f2ff8e2
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/pagecurl.png
diff --git a/doc/src/diagrams/linguist-icons/s_check_danger.png b/doc/src/diagrams/linguist-icons/s_check_danger.png
new file mode 100644
index 0000000000..e10157768c
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/s_check_danger.png
diff --git a/doc/src/diagrams/linguist-icons/s_check_empty.png b/doc/src/diagrams/linguist-icons/s_check_empty.png
new file mode 100644
index 0000000000..759a41b6c1
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/s_check_empty.png
diff --git a/doc/src/diagrams/linguist-icons/s_check_obsolete.png b/doc/src/diagrams/linguist-icons/s_check_obsolete.png
new file mode 100644
index 0000000000..b852b639fe
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/s_check_obsolete.png
diff --git a/doc/src/diagrams/linguist-icons/s_check_off.png b/doc/src/diagrams/linguist-icons/s_check_off.png
new file mode 100644
index 0000000000..640b689729
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/s_check_off.png
diff --git a/doc/src/diagrams/linguist-icons/s_check_on.png b/doc/src/diagrams/linguist-icons/s_check_on.png
new file mode 100644
index 0000000000..afcaf634dd
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/s_check_on.png
diff --git a/doc/src/diagrams/linguist-icons/s_check_warning.png b/doc/src/diagrams/linguist-icons/s_check_warning.png
new file mode 100644
index 0000000000..f689c33031
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/s_check_warning.png
diff --git a/doc/src/diagrams/linguist-icons/splash.png b/doc/src/diagrams/linguist-icons/splash.png
new file mode 100644
index 0000000000..e6c8f8552d
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/splash.png
diff --git a/doc/src/diagrams/linguist-icons/win/accelerator.png b/doc/src/diagrams/linguist-icons/win/accelerator.png
new file mode 100644
index 0000000000..4f726487f8
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/win/accelerator.png
diff --git a/doc/src/diagrams/linguist-icons/win/book.png b/doc/src/diagrams/linguist-icons/win/book.png
new file mode 100644
index 0000000000..1b354555e7
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/win/book.png
diff --git a/doc/src/diagrams/linguist-icons/win/doneandnext.png b/doc/src/diagrams/linguist-icons/win/doneandnext.png
new file mode 100644
index 0000000000..18f2fb6537
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/win/doneandnext.png
diff --git a/doc/src/diagrams/linguist-icons/win/editcopy.png b/doc/src/diagrams/linguist-icons/win/editcopy.png
new file mode 100644
index 0000000000..d542c3b21f
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/win/editcopy.png
diff --git a/doc/src/diagrams/linguist-icons/win/editcut.png b/doc/src/diagrams/linguist-icons/win/editcut.png
new file mode 100644
index 0000000000..38e55f7420
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/win/editcut.png
diff --git a/doc/src/diagrams/linguist-icons/win/editpaste.png b/doc/src/diagrams/linguist-icons/win/editpaste.png
new file mode 100644
index 0000000000..717dd86755
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/win/editpaste.png
diff --git a/doc/src/diagrams/linguist-icons/win/filenew.png b/doc/src/diagrams/linguist-icons/win/filenew.png
new file mode 100644
index 0000000000..dd795cfffc
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/win/filenew.png
diff --git a/doc/src/diagrams/linguist-icons/win/fileopen.png b/doc/src/diagrams/linguist-icons/win/fileopen.png
new file mode 100644
index 0000000000..1b3e69f6aa
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/win/fileopen.png
diff --git a/doc/src/diagrams/linguist-icons/win/fileprint.png b/doc/src/diagrams/linguist-icons/win/fileprint.png
new file mode 100644
index 0000000000..808c97ea3c
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/win/fileprint.png
diff --git a/doc/src/diagrams/linguist-icons/win/filesave.png b/doc/src/diagrams/linguist-icons/win/filesave.png
new file mode 100644
index 0000000000..46eac82ad1
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/win/filesave.png
diff --git a/doc/src/diagrams/linguist-icons/win/next.png b/doc/src/diagrams/linguist-icons/win/next.png
new file mode 100644
index 0000000000..7700d6fce6
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/win/next.png
diff --git a/doc/src/diagrams/linguist-icons/win/nextunfinished.png b/doc/src/diagrams/linguist-icons/win/nextunfinished.png
new file mode 100644
index 0000000000..05c92bdf80
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/win/nextunfinished.png
diff --git a/doc/src/diagrams/linguist-icons/win/phrase.png b/doc/src/diagrams/linguist-icons/win/phrase.png
new file mode 100644
index 0000000000..30c3ee61b6
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/win/phrase.png
diff --git a/doc/src/diagrams/linguist-icons/win/prev.png b/doc/src/diagrams/linguist-icons/win/prev.png
new file mode 100644
index 0000000000..99dc8733c7
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/win/prev.png
diff --git a/doc/src/diagrams/linguist-icons/win/prevunfinished.png b/doc/src/diagrams/linguist-icons/win/prevunfinished.png
new file mode 100644
index 0000000000..15c13eaf4d
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/win/prevunfinished.png
diff --git a/doc/src/diagrams/linguist-icons/win/print.png b/doc/src/diagrams/linguist-icons/win/print.png
new file mode 100644
index 0000000000..2afb769ee2
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/win/print.png
diff --git a/doc/src/diagrams/linguist-icons/win/punctuation.png b/doc/src/diagrams/linguist-icons/win/punctuation.png
new file mode 100644
index 0000000000..3492f95eb7
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/win/punctuation.png
diff --git a/doc/src/diagrams/linguist-icons/win/redo.png b/doc/src/diagrams/linguist-icons/win/redo.png
new file mode 100644
index 0000000000..9d679fe6fc
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/win/redo.png
diff --git a/doc/src/diagrams/linguist-icons/win/searchfind.png b/doc/src/diagrams/linguist-icons/win/searchfind.png
new file mode 100644
index 0000000000..6ea35e930d
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/win/searchfind.png
diff --git a/doc/src/diagrams/linguist-icons/win/undo.png b/doc/src/diagrams/linguist-icons/win/undo.png
new file mode 100644
index 0000000000..eee23d24a3
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/win/undo.png
diff --git a/doc/src/diagrams/linguist-icons/win/whatsthis.png b/doc/src/diagrams/linguist-icons/win/whatsthis.png
new file mode 100644
index 0000000000..0b5d46aade
--- /dev/null
+++ b/doc/src/diagrams/linguist-icons/win/whatsthis.png
diff --git a/doc/src/diagrams/linguist-linguist.png b/doc/src/diagrams/linguist-linguist.png
new file mode 100644
index 0000000000..fd63bb46f6
--- /dev/null
+++ b/doc/src/diagrams/linguist-linguist.png
diff --git a/doc/src/diagrams/linguist-menubar.ui b/doc/src/diagrams/linguist-menubar.ui
new file mode 100644
index 0000000000..b1322823fc
--- /dev/null
+++ b/doc/src/diagrams/linguist-menubar.ui
@@ -0,0 +1,123 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>31</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralwidget" />
+  <widget class="QMenuBar" name="menubar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>800</width>
+     <height>29</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menu_File" >
+    <property name="title" >
+     <string>&amp;File</string>
+    </property>
+   </widget>
+   <widget class="QMenu" name="menu_Edit" >
+    <property name="title" >
+     <string>&amp;Edit</string>
+    </property>
+   </widget>
+   <widget class="QMenu" name="menu_Translation" >
+    <property name="title" >
+     <string>&amp;Translation</string>
+    </property>
+   </widget>
+   <widget class="QMenu" name="menu_Validation" >
+    <property name="title" >
+     <string>&amp;Validation</string>
+    </property>
+   </widget>
+   <widget class="QMenu" name="menu_Phrases" >
+    <property name="title" >
+     <string>&amp;Phrases</string>
+    </property>
+   </widget>
+   <widget class="QMenu" name="menu_View" >
+    <property name="title" >
+     <string>&amp;View</string>
+    </property>
+   </widget>
+   <widget class="QMenu" name="menu_Help" >
+    <property name="title" >
+     <string>&amp;Help</string>
+    </property>
+   </widget>
+   <widget class="QMenu" name="menu" >
+    <property name="title" >
+     <string> </string>
+    </property>
+   </widget>
+   <widget class="QMenu" name="menu_2" >
+    <property name="title" >
+     <string>     </string>
+    </property>
+   </widget>
+   <widget class="QMenu" name="menu_3" >
+    <property name="title" >
+     <string>          </string>
+    </property>
+   </widget>
+   <widget class="QMenu" name="menu_4" >
+    <property name="title" >
+     <string>                                                </string>
+    </property>
+   </widget>
+   <addaction name="menu_File" />
+   <addaction name="menu_Edit" />
+   <addaction name="menu_Translation" />
+   <addaction name="menu_Validation" />
+   <addaction name="menu_Phrases" />
+   <addaction name="menu_View" />
+   <addaction name="menu_Help" />
+   <addaction name="menu" />
+   <addaction name="menu_2" />
+   <addaction name="menu_3" />
+   <addaction name="menu_4" />
+  </widget>
+  <widget class="QStatusBar" name="statusbar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>9</y>
+     <width>800</width>
+     <height>0</height>
+    </rect>
+   </property>
+   <property name="sizePolicy" >
+    <sizepolicy>
+     <hsizetype>5</hsizetype>
+     <vsizetype>5</vsizetype>
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="autoFillBackground" >
+    <bool>false</bool>
+   </property>
+   <property name="sizeGripEnabled" >
+    <bool>false</bool>
+   </property>
+  </widget>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/doc/src/diagrams/linguist-previewtool.png b/doc/src/diagrams/linguist-previewtool.png
new file mode 100644
index 0000000000..02cb31101b
--- /dev/null
+++ b/doc/src/diagrams/linguist-previewtool.png
diff --git a/doc/src/diagrams/linguist-toolbar.png b/doc/src/diagrams/linguist-toolbar.png
new file mode 100644
index 0000000000..784f4867e1
--- /dev/null
+++ b/doc/src/diagrams/linguist-toolbar.png
diff --git a/doc/src/diagrams/linguist-toolbar.ui b/doc/src/diagrams/linguist-toolbar.ui
new file mode 100644
index 0000000000..3018c12ab5
--- /dev/null
+++ b/doc/src/diagrams/linguist-toolbar.ui
@@ -0,0 +1,252 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>744</width>
+    <height>38</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralwidget" />
+  <widget class="QStatusBar" name="statusbar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>16</y>
+     <width>744</width>
+     <height>22</height>
+    </rect>
+   </property>
+   <property name="sizeGripEnabled" >
+    <bool>false</bool>
+   </property>
+  </widget>
+  <widget class="QToolBar" name="toolBar" >
+   <property name="orientation" >
+    <enum>Qt::Horizontal</enum>
+   </property>
+   <attribute name="toolBarArea" >
+    <number>4</number>
+   </attribute>
+   <addaction name="actionOpen" />
+   <addaction name="actionSave" />
+   <addaction name="actionPrint" />
+   <addaction name="separator" />
+   <addaction name="actionOpen_Phrase_Book" />
+  </widget>
+  <widget class="QToolBar" name="toolBar_2" >
+   <property name="orientation" >
+    <enum>Qt::Horizontal</enum>
+   </property>
+   <attribute name="toolBarArea" >
+    <number>4</number>
+   </attribute>
+   <addaction name="actionUndo" />
+   <addaction name="actionRedo" />
+   <addaction name="separator" />
+   <addaction name="actionCut" />
+   <addaction name="actionCopy" />
+   <addaction name="actionPaste" />
+   <addaction name="separator" />
+   <addaction name="actionFind" />
+  </widget>
+  <widget class="QToolBar" name="toolBar_3" >
+   <property name="orientation" >
+    <enum>Qt::Horizontal</enum>
+   </property>
+   <attribute name="toolBarArea" >
+    <number>4</number>
+   </attribute>
+   <addaction name="actionPrev" />
+   <addaction name="actionNext" />
+   <addaction name="actionPrev_Unfinished" />
+   <addaction name="actionNext_Unfinished" />
+   <addaction name="actionDone_and_Next" />
+  </widget>
+  <widget class="QToolBar" name="toolBar_4" >
+   <property name="orientation" >
+    <enum>Qt::Horizontal</enum>
+   </property>
+   <attribute name="toolBarArea" >
+    <number>4</number>
+   </attribute>
+   <addaction name="actionAccelerators" />
+   <addaction name="actionEnding_Punctuation" />
+   <addaction name="actionPhrase_Matches" />
+  </widget>
+  <widget class="QToolBar" name="toolBar_5" >
+   <property name="orientation" >
+    <enum>Qt::Horizontal</enum>
+   </property>
+   <attribute name="toolBarArea" >
+    <number>4</number>
+   </attribute>
+   <addaction name="actionWhat_s_This" />
+  </widget>
+  <action name="actionOpen" >
+   <property name="icon" >
+    <iconset resource="../../../tools/linguist/linguist/linguist.qrc" >:/images/win/fileopen.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Open</string>
+   </property>
+  </action>
+  <action name="actionSave" >
+   <property name="icon" >
+    <iconset resource="../../../tools/linguist/linguist/linguist.qrc" >:/images/win/filesave.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Save</string>
+   </property>
+  </action>
+  <action name="actionPrint" >
+   <property name="icon" >
+    <iconset resource="../../../tools/linguist/linguist/linguist.qrc" >:/images/win/print.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Print</string>
+   </property>
+  </action>
+  <action name="actionOpen_Phrase_Book" >
+   <property name="icon" >
+    <iconset resource="../../../tools/linguist/linguist/linguist.qrc" >:/images/win/book.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Open Phrase Book</string>
+   </property>
+  </action>
+  <action name="actionUndo" >
+   <property name="icon" >
+    <iconset resource="../../../tools/linguist/linguist/linguist.qrc" >:/images/win/undo.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Undo</string>
+   </property>
+  </action>
+  <action name="actionRedo" >
+   <property name="icon" >
+    <iconset resource="../../../tools/linguist/linguist/linguist.qrc" >:/images/win/redo.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Redo</string>
+   </property>
+  </action>
+  <action name="actionCut" >
+   <property name="icon" >
+    <iconset resource="../../../tools/linguist/linguist/linguist.qrc" >:/images/win/editcut.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Cut</string>
+   </property>
+  </action>
+  <action name="actionCopy" >
+   <property name="icon" >
+    <iconset resource="../../../tools/linguist/linguist/linguist.qrc" >:/images/win/editcopy.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Copy</string>
+   </property>
+  </action>
+  <action name="actionPaste" >
+   <property name="icon" >
+    <iconset resource="../../../tools/linguist/linguist/linguist.qrc" >:/images/win/editpaste.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Paste</string>
+   </property>
+  </action>
+  <action name="actionFind" >
+   <property name="icon" >
+    <iconset resource="../../../tools/linguist/linguist/linguist.qrc" >:/images/win/searchfind.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Find</string>
+   </property>
+  </action>
+  <action name="actionPrev" >
+   <property name="icon" >
+    <iconset resource="../../../tools/linguist/linguist/linguist.qrc" >:/images/win/prev.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Prev</string>
+   </property>
+  </action>
+  <action name="actionNext" >
+   <property name="icon" >
+    <iconset resource="../../../tools/linguist/linguist/linguist.qrc" >:/images/win/next.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Next</string>
+   </property>
+  </action>
+  <action name="actionPrev_Unfinished" >
+   <property name="icon" >
+    <iconset resource="../../../tools/linguist/linguist/linguist.qrc" >:/images/win/prevunfinished.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Prev Unfinished</string>
+   </property>
+  </action>
+  <action name="actionNext_Unfinished" >
+   <property name="icon" >
+    <iconset resource="../../../tools/linguist/linguist/linguist.qrc" >:/images/win/nextunfinished.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Next Unfinished</string>
+   </property>
+  </action>
+  <action name="actionDone_and_Next" >
+   <property name="icon" >
+    <iconset resource="../../../tools/linguist/linguist/linguist.qrc" >:/images/win/doneandnext.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Done and Next</string>
+   </property>
+  </action>
+  <action name="actionAccelerators" >
+   <property name="icon" >
+    <iconset resource="../../../tools/linguist/linguist/linguist.qrc" >:/images/win/accelerator.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Accelerators</string>
+   </property>
+  </action>
+  <action name="actionEnding_Punctuation" >
+   <property name="icon" >
+    <iconset resource="../../../tools/linguist/linguist/linguist.qrc" >:/images/win/punctuation.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Ending Punctuation</string>
+   </property>
+  </action>
+  <action name="actionPhrase_Matches" >
+   <property name="icon" >
+    <iconset resource="../../../tools/linguist/linguist/linguist.qrc" >:/images/win/phrase.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Phrase Matches</string>
+   </property>
+  </action>
+  <action name="actionWhat_s_This" >
+   <property name="icon" >
+    <iconset resource="../../../tools/linguist/linguist/linguist.qrc" >:/images/win/whatsthis.png</iconset>
+   </property>
+   <property name="text" >
+    <string>What's This?</string>
+   </property>
+  </action>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <resources>
+  <include location="../../../tools/linguist/linguist/linguist.qrc" />
+ </resources>
+ <connections/>
+</ui>
diff --git a/doc/src/diagrams/linguist-toolbar.zip b/doc/src/diagrams/linguist-toolbar.zip
new file mode 100644
index 0000000000..d2392503e2
--- /dev/null
+++ b/doc/src/diagrams/linguist-toolbar.zip
diff --git a/doc/src/diagrams/macintosh-menu.png b/doc/src/diagrams/macintosh-menu.png
new file mode 100644
index 0000000000..1013115563
--- /dev/null
+++ b/doc/src/diagrams/macintosh-menu.png
diff --git a/doc/src/diagrams/macintosh-unified-toolbar.png b/doc/src/diagrams/macintosh-unified-toolbar.png
new file mode 100644
index 0000000000..9cba683b34
--- /dev/null
+++ b/doc/src/diagrams/macintosh-unified-toolbar.png
diff --git a/doc/src/diagrams/mainwindow-contextmenu.png b/doc/src/diagrams/mainwindow-contextmenu.png
new file mode 100644
index 0000000000..78ebe89506
--- /dev/null
+++ b/doc/src/diagrams/mainwindow-contextmenu.png
diff --git a/doc/src/diagrams/mainwindow-custom-dock.png b/doc/src/diagrams/mainwindow-custom-dock.png
new file mode 100644
index 0000000000..865ba9c771
--- /dev/null
+++ b/doc/src/diagrams/mainwindow-custom-dock.png
diff --git a/doc/src/diagrams/mainwindow-docks.sk b/doc/src/diagrams/mainwindow-docks.sk
new file mode 100644
index 0000000000..15352b22f6
--- /dev/null
+++ b/doc/src/diagrams/mainwindow-docks.sk
@@ -0,0 +1,78 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((0.879,0.879,0.879))
+lw(1)
+r(465,0,0,-305,65.1378,580)
+fp((1,1,1))
+lw(1)
+r(405,0,0,-245,95.1378,550)
+gl([(0,(0.875,0.624,0.627)),(1,(1,1,1))])
+pgr(0.5,0.5,0)
+fp()
+lw(1)
+r(295,0,0,-145,150,500)
+lw(1)
+ld((4, 4))
+b()
+bs(445,500,0)
+bs(445,550,0)
+lw(1)
+ld((4, 4))
+b()
+bs(150,550,0)
+bs(150,500,0)
+lw(1)
+ld((4, 4))
+b()
+bs(95,500,0)
+bs(150,500,0)
+lw(1)
+ld((4, 4))
+b()
+bs(445,500,0)
+bs(500,500,0)
+lw(1)
+ld((4, 4))
+b()
+bs(95,355,0)
+bs(150,355,0)
+lw(1)
+ld((4, 4))
+b()
+bs(445,355,0)
+bs(500,355,0)
+lw(1)
+ld((4, 4))
+b()
+bs(445,355,0)
+bs(445,305,0)
+lw(1)
+ld((4, 4))
+b()
+bs(150,355,0)
+bs(150,305,0)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('Toolbars',(270.408,560))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('Dock windows',(252.908,521.423))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('Central widget',(252.763,421.416))
+le()
+lw(1)
+r(475,0,0,-315,60,585)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/mainwindow-vertical-dock.png b/doc/src/diagrams/mainwindow-vertical-dock.png
new file mode 100644
index 0000000000..e5289acd18
--- /dev/null
+++ b/doc/src/diagrams/mainwindow-vertical-dock.png
diff --git a/doc/src/diagrams/mainwindow-vertical-tabs.png b/doc/src/diagrams/mainwindow-vertical-tabs.png
new file mode 100644
index 0000000000..4479a13976
--- /dev/null
+++ b/doc/src/diagrams/mainwindow-vertical-tabs.png
diff --git a/doc/src/diagrams/modelview-begin-append-columns.sk b/doc/src/diagrams/modelview-begin-append-columns.sk
new file mode 100644
index 0000000000..32a4606552
--- /dev/null
+++ b/doc/src/diagrams/modelview-begin-append-columns.sk
@@ -0,0 +1,176 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,100,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,100,580)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,160,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,160,580)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,190,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,190,580)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,220,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,220,580)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,130,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,130,580)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,70,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,70,580)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,250,637.5)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,250,580)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,280,637.5)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,280,580)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,310,637.5)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,310,580)
+le()
+lw(1)
+r(290,0,0,-165,60,705)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('0',(79.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('0',(79.44,558.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('1',(109.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('1',(109.44,558.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('2',(139.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('2',(139.44,558.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('3',(169.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('3',(169.44,558.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('4',(199.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('4',(199.44,558.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('5',(229.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('5',(229.44,558.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('6',(259.44,615.64))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('6',(259.44,558.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('7',(289.44,615.64))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('7',(289.44,558.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('8',(319.44,615.64))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('8',(319.44,558.14))
+lw(1.5)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(250,640,0)
+bs(250,660,0)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/modelview-begin-append-rows.sk b/doc/src/diagrams/modelview-begin-append-rows.sk
new file mode 100644
index 0000000000..7e9dfacad6
--- /dev/null
+++ b/doc/src/diagrams/modelview-begin-append-rows.sk
@@ -0,0 +1,122 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,335,605)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,335,635)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,220,665)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,335,665)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,220,605)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,220,635)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,220,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,335,695)
+le()
+lw(1)
+r(165,0,0,-200,210,705)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,277.5,575)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,335,575)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,277.5,545)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,335,545)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('0',(229.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('0',(344.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('1',(229.44,643.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('1',(344.44,643.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('2',(229.44,613.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('2',(344.44,613.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('3',(229.44,583.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('3',(344.44,583.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('4',(286.94,553.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('4',(344.44,553.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('5',(286.94,523.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('5',(344.44,523.14))
+lw(1.5)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(275,575,0)
+bs(255,575,0)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/modelview-begin-insert-columns.sk b/doc/src/diagrams/modelview-begin-insert-columns.sk
new file mode 100644
index 0000000000..cc194601c6
--- /dev/null
+++ b/doc/src/diagrams/modelview-begin-insert-columns.sk
@@ -0,0 +1,193 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((1,1,1))
+lw(1)
+ld((5, 5))
+r(30,0,0,-30,310,580)
+fp((1,1,1))
+lw(1)
+ld((5, 5))
+r(30,0,0,-30,310,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,100,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,100,580)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,160,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,160,580)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,190,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,280,580)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,220,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,250,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,280,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,130,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,130,580)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,70,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,70,580)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,250,637.5)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,250,580)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,190,637.5)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,190,580)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,220,637.5)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,220,580)
+le()
+lw(1)
+r(290,0,0,-165,60,705)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('0',(79.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('0',(79.44,558.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('1',(109.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('1',(109.44,558.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('2',(139.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('2',(139.44,558.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('3',(169.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('3',(169.44,558.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('4',(199.44,673.14))
+fp((0.503,0.503,0.503))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('4',(289.44,558.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('4',(199.44,615.64))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('4',(199.44,558.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('5',(229.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('5',(229.44,615.64))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('5',(229.44,558.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('6',(259.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('6',(259.44,615.64))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('6',(259.44,558.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('7',(289.44,673.14))
+lw(1.5)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(190,640,0)
+bs(190,660,0)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/modelview-begin-insert-rows.sk b/doc/src/diagrams/modelview-begin-insert-rows.sk
new file mode 100644
index 0000000000..3c8ad7dadf
--- /dev/null
+++ b/doc/src/diagrams/modelview-begin-insert-rows.sk
@@ -0,0 +1,157 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((1,1,1))
+lw(1)
+ld((5, 5))
+r(30,0,0,-30,220,515)
+fp((1,1,1))
+lw(1)
+ld((5, 5))
+r(30,0,0,-30,335,515)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,220,665)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,335,665)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,220,605)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,220,575)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,277.5,575)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,335,575)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,220,545)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,220,635)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,335,545)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,220,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,335,695)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,277.5,605)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,335,605)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,277.5,635)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,335,635)
+le()
+lw(1)
+r(165,0,0,-230,210,705)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('0',(229.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('0',(344.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('1',(229.44,643.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('1',(344.44,643.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('2',(229.44,613.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('2',(286.94,613.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('2',(344.44,613.14))
+fp((0.503,0.503,0.503))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('2',(344.44,523.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('3',(229.44,583.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('3',(286.94,583.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('3',(344.44,583.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('4',(229.44,553.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('4',(286.94,553.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('4',(344.44,553.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('5',(229.44,523.14))
+lw(1.5)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(275,635,0)
+bs(255,635,0)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/modelview-begin-remove-columns.sk b/doc/src/diagrams/modelview-begin-remove-columns.sk
new file mode 100644
index 0000000000..ac5529a3ad
--- /dev/null
+++ b/doc/src/diagrams/modelview-begin-remove-columns.sk
@@ -0,0 +1,193 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((1,1,1))
+lw(1)
+ld((5, 5))
+r(30,0,0,-30,310,580)
+fp((1,1,1))
+lw(1)
+ld((5, 5))
+r(30,0,0,-30,310,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,100,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,100,580)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,160,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,160,580)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,280,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,130,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,130,580)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,70,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,70,580)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,190,580)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,220,580)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,250,580)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,280,580)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,190,695)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,220,695)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,250,695)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,250,637.5)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,190,637.5)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,220,637.5)
+le()
+lw(1)
+r(290,0,0,-165,60,705)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('0',(79.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('0',(79.44,558.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('1',(109.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('1',(109.44,558.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('2',(139.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('2',(139.44,558.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('3',(169.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('3',(169.44,558.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('4',(199.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('4',(199.44,615.64))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('5',(229.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('5',(229.44,615.64))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('6',(259.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('6',(259.44,615.64))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('7',(289.44,673.14))
+lw(1.5)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(190,642.5,0)
+bs(190,662.5,0)
+fp((0.503,0.503,0.503))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('7',(199.44,558.14))
+fp((0.503,0.503,0.503))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('8',(229.44,558.14))
+fp((0.503,0.503,0.503))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('9',(259.44,558.14))
+fp((0.503,0.503,0.503))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('10',(283.88,558.14))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/modelview-begin-remove-rows.sk b/doc/src/diagrams/modelview-begin-remove-rows.sk
new file mode 100644
index 0000000000..cf77802738
--- /dev/null
+++ b/doc/src/diagrams/modelview-begin-remove-rows.sk
@@ -0,0 +1,130 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((1,1,1))
+lw(1)
+ld((5, 5))
+r(30,0,0,-30,220,515)
+fp((1,1,1))
+lw(1)
+ld((5, 5))
+r(30,0,0,-30,335,575)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,220,665)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,335,665)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,220,575)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,335,635)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,220,545)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,335,605)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,220,695)
+fp((1,1,1))
+lw(1)
+r(30,0,0,-30,335,695)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,220,605)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,220,635)
+le()
+lw(1)
+r(165,0,0,-230,210,705)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,277.5,605)
+fp((0.753,0.753,1))
+lw(1)
+r(30,0,0,-30,277.5,635)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('0',(229.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('0',(344.44,673.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('1',(229.44,643.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('1',(344.44,643.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('2',(229.44,613.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('2',(286.94,613.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('3',(229.44,583.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('3',(286.94,583.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('4',(229.44,553.14))
+fp((0.502,0.502,0.502))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('4',(344.44,613.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('5',(229.44,523.14))
+fp((0.502,0.502,0.502))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('5',(344.44,583.14))
+lw(1.5)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(272.5,635,0)
+bs(252.5,635,0)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/modelview-listmodel.sk b/doc/src/diagrams/modelview-listmodel.sk
new file mode 100644
index 0000000000..89c19ccda2
--- /dev/null
+++ b/doc/src/diagrams/modelview-listmodel.sk
@@ -0,0 +1,87 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+le()
+lw(1)
+ld((3, 3))
+r(120,0,0,-195,30,745)
+G()
+G()
+lw(1)
+ld((3, 3))
+b()
+bs(50,580,0)
+bs(50,555,0)
+lw(1)
+ld((5, 5))
+r(30,0,0,-30,35,715)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Oblique')
+txt('Root item',(75,696.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 0',(105,656.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('A',(78.33,653.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('B',(78.646,613.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('C',(78.096,573.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 1',(105.316,616.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 2',(105.316,576.384))
+lw(1)
+b()
+bs(50,685,0)
+bs(50,580,0)
+lw(1)
+r(30,0,0,-30,70.316,635)
+lw(1)
+r(30,0,0,-30,70.316,595)
+lw(1)
+b()
+bs(50.316,620,0)
+bs(70.316,620,0)
+lw(1)
+b()
+bs(50.316,580,0)
+bs(70.316,580,0)
+lw(1)
+r(30,0,0,-30,70,675)
+lw(1)
+b()
+bs(50,660,0)
+bs(70,660,0)
+G_()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+txt('List Model',(60.33,731.384))
+G_()
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/modelview-models.png b/doc/src/diagrams/modelview-models.png
new file mode 100644
index 0000000000..9e6b30c214
--- /dev/null
+++ b/doc/src/diagrams/modelview-models.png
diff --git a/doc/src/diagrams/modelview-models.sk b/doc/src/diagrams/modelview-models.sk
new file mode 100644
index 0000000000..19e69b0e6c
--- /dev/null
+++ b/doc/src/diagrams/modelview-models.sk
@@ -0,0 +1,287 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+ld((3, 3))
+b()
+bs(425,490,0)
+bs(425,465,0)
+lw(1)
+ld((5, 5))
+r(30,0,0,-30,410,715)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Oblique')
+txt('Root item',(450,696.384))
+lw(1)
+b()
+bs(425,685,0)
+bs(425,490,0)
+lw(1)
+r(30,0,0,-30,480,635)
+lw(1)
+b()
+bs(460,620,0)
+bs(480,620,0)
+lw(1)
+r(30,0,0,-30,480,595)
+lw(1)
+r(30,0,0,-30,445,505)
+lw(1)
+r(30,0,0,-30,445,545)
+lw(1)
+b()
+bs(460,580,0)
+bs(480,580,0)
+lw(1)
+b()
+bs(425,490,0)
+bs(445,490,0)
+lw(1)
+b()
+bs(425,530,0)
+bs(445,530,0)
+lw(1)
+b()
+bs(460,645,0)
+bs(460,580,0)
+lw(1)
+r(30,0,0,-30,445,675)
+lw(1)
+b()
+bs(425,660,0)
+bs(445,660,0)
+lw(1)
+ld((3, 3))
+b()
+bs(460,580,0)
+bs(460,555,0)
+lw(1)
+ld((3, 3))
+b()
+bs(50,580,0)
+bs(50,555,0)
+lw(1)
+ld((5, 5))
+r(30,0,0,-30,35,715)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Oblique')
+txt('Root item',(75,696.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 0',(105,656.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 1',(105.316,616.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 2',(105.316,576.384))
+lw(1)
+b()
+bs(50,685,0)
+bs(50,580,0)
+lw(1)
+r(30,0,0,-30,70.316,635)
+lw(1)
+r(30,0,0,-30,70.316,595)
+lw(1)
+b()
+bs(50.316,620,0)
+bs(70.316,620,0)
+lw(1)
+b()
+bs(50.316,580,0)
+bs(70.316,580,0)
+lw(1)
+r(30,0,0,-30,70,675)
+lw(1)
+b()
+bs(50,660,0)
+bs(70,660,0)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+txt('Table Model',(245.168,731.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+txt('List Model',(60.33,731.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+txt('Tree Model',(450.668,731.384))
+le()
+lw(1)
+r(530,0,0,-285,30,745)
+lw(1)
+ld((5, 5))
+r(30,0,0,-30,180,715)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Oblique')
+txt('Root item',(219.668,696.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 0',(339.668,656.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 2',(339.668,596.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 3',(339.668,566.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 1',(340,626.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('column = 1',(0,-1,1,0,256.934,550))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('column = 0',(0,-1,1,0,226.934,550))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('column = 2',(0,-1,1,0,286.934,550))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('column = 3',(0,-1,1,0,316.934,550))
+lw(1)
+b()
+bs(195,685,0)
+bs(195,660,0)
+lw(1)
+r(30,0,0,-30,215,645)
+lw(1)
+ld((3, 3))
+r(30,0,0,-30,305,645)
+lw(1)
+r(30,0,0,-30,275,645)
+lw(1)
+r(30,0,0,-30,245,645)
+lw(1)
+r(30,0,0,-30,215,615)
+lw(1)
+ld((3, 3))
+r(30,0,0,-30,245,585)
+lw(1)
+ld((3, 3))
+r(30,0,0,-30,305,585)
+lw(1)
+r(30,0,0,-30,245,615)
+lw(1)
+r(30,0,0,-30,215,675)
+lw(1)
+r(30,0,0,-30,275,675)
+lw(1)
+r(30,0,0,-30,275,615)
+lw(1)
+r(30,0,0,-30,245,675)
+lw(1)
+b()
+bs(194.668,660,0)
+bs(214.668,660,0)
+lw(1)
+ld((3, 3))
+b()
+bs(215,585,0)
+bs(215,555,0)
+bs(245,555,0)
+lw(1)
+ld((3, 3))
+b()
+bs(305,675,0)
+bs(335,675,0)
+bs(335,645,0)
+lw(1)
+ld((3, 3))
+b()
+bs(275,555,0)
+bs(305,555,0)
+lw(1)
+ld((3, 3))
+b()
+bs(335,615,0)
+bs(335,585,0)
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 0',(540,656.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 0',(575,616.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 1',(575,576.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 1',(540,526.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 2',(540,486.384))
+G_()
+lw(1)
+r(30,0,0,-30,475,675)
+lw(1)
+r(30,0,0,-30,510,635)
+lw(1)
+r(30,0,0,-30,510,595)
+lw(1)
+r(30,0,0,-30,475,545)
+lw(1)
+r(30,0,0,-30,475,505)
+lw(1)
+ld((3, 3))
+r(30,0,0,-30,505,675)
+lw(1)
+ld((3, 3))
+r(30,0,0,-30,540,635)
+lw(1)
+ld((3, 3))
+r(30,0,0,-30,540,595)
+lw(1)
+ld((3, 3))
+r(30,0,0,-30,505,545)
+lw(1)
+ld((3, 3))
+r(30,0,0,-30,505,505)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/modelview-overview.sk b/doc/src/diagrams/modelview-overview.sk
new file mode 100644
index 0000000000..1ba0473d16
--- /dev/null
+++ b/doc/src/diagrams/modelview-overview.sk
@@ -0,0 +1,82 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+le()
+lw(1)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(205,0,0,-220,50,755)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Data',(93.286,726.384))
+fp((0.627,0.745,1))
+lw(1)
+r(75,0,0,-45,68.63,685)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(106.13,640,0)
+bs(106.13,587.5,0)
+fp((0.627,1,0.498))
+lw(1)
+e(10,0,0,-10,186.13,587.5)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Model',(89.792,658.884))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Delegate',(200.606,583.884))
+lw(1)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(106.13,707.5,0)
+bs(106.13,687.5,0)
+lw(1)
+ld((4, 4))
+r(45,0,0,-40,83.63,750)
+G()
+fp((1,0.627,0.498))
+lw(1)
+r(75,0,0,-45,68.63,585)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('View',(93.128,558.884))
+G_()
+lw(1)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(-50,0,0,-50,143.63,612.5,1.62075,2.35619,0)
+lw(1)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(-50,0,0,-50,143.63,612.5,2.87243,4.66243,0)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Oblique')
+Fs(10)
+txt('Editing',(191.13,637.5))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Oblique')
+Fs(10)
+txt('Rendering',(165,555.32))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Oblique')
+Fs(10)
+txt('Rendering',(55,609.57))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/modelview-tablemodel.sk b/doc/src/diagrams/modelview-tablemodel.sk
new file mode 100644
index 0000000000..4e8a492329
--- /dev/null
+++ b/doc/src/diagrams/modelview-tablemodel.sk
@@ -0,0 +1,142 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+le()
+lw(1)
+ld((3, 3))
+r(210,0,0,-260,175,745)
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+txt('Table Model',(245.168,731.384))
+G()
+lw(1)
+ld((5, 5))
+r(30,0,0,-30,180,715)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Oblique')
+txt('Root item',(219.668,696.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 0',(339.668,656.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 2',(339.668,596.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 3',(339.668,566.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('A',(222.998,653.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('B',(253.33,623.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('C',(252.78,593.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 1',(340,626.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('column = 1',(0,-1,1,0,256.934,550))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('column = 0',(0,-1,1,0,226.934,550))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('column = 2',(0,-1,1,0,286.934,550))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('column = 3',(0,-1,1,0,316.934,550))
+lw(1)
+b()
+bs(195,685,0)
+bs(195,660,0)
+lw(1)
+r(30,0,0,-30,215,645)
+lw(1)
+ld((3, 3))
+r(30,0,0,-30,305,645)
+lw(1)
+r(30,0,0,-30,275,645)
+lw(1)
+r(30,0,0,-30,245,645)
+lw(1)
+r(30,0,0,-30,215,615)
+lw(1)
+ld((3, 3))
+r(30,0,0,-30,245,585)
+lw(1)
+ld((3, 3))
+r(30,0,0,-30,305,585)
+lw(1)
+r(30,0,0,-30,245,615)
+lw(1)
+r(30,0,0,-30,215,675)
+lw(1)
+r(30,0,0,-30,275,675)
+lw(1)
+r(30,0,0,-30,275,615)
+lw(1)
+r(30,0,0,-30,245,675)
+lw(1)
+b()
+bs(194.668,660,0)
+bs(214.668,660,0)
+lw(1)
+ld((3, 3))
+b()
+bs(215,585,0)
+bs(215,555,0)
+bs(245,555,0)
+lw(1)
+ld((3, 3))
+b()
+bs(305,675,0)
+bs(335,675,0)
+bs(335,645,0)
+lw(1)
+ld((3, 3))
+b()
+bs(275,555,0)
+bs(305,555,0)
+lw(1)
+ld((3, 3))
+b()
+bs(335,615,0)
+bs(335,585,0)
+G_()
+G_()
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/modelview-treemodel.sk b/doc/src/diagrams/modelview-treemodel.sk
new file mode 100644
index 0000000000..717d9da566
--- /dev/null
+++ b/doc/src/diagrams/modelview-treemodel.sk
@@ -0,0 +1,139 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+le()
+lw(1)
+ld((3, 3))
+r(215,0,0,-285,135,745)
+lw(1)
+ld((3, 3))
+b()
+bs(155,490,0)
+bs(155,465,0)
+lw(1)
+ld((5, 5))
+r(30,0,0,-30,140,715)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Oblique')
+txt('Root item',(180,696.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 0',(270.316,656.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 0',(305,616.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('A',(183.33,653.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('B',(218.33,573.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('C',(212.78,483.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 1',(305,576.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 1',(270,526.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 2',(270,486.384))
+lw(1)
+b()
+bs(155,685,0)
+bs(155,490,0)
+lw(1)
+r(30,0,0,-30,210,635)
+lw(1)
+r(30,0,0,-30,240,635)
+lw(1)
+ld((3, 3))
+r(30,0,0,-30,270,635)
+lw(1)
+r(30,0,0,-30,240,595)
+lw(1)
+b()
+bs(190,620,0)
+bs(210,620,0)
+lw(1)
+r(30,0,0,-30,210,595)
+lw(1)
+ld((3, 3))
+r(30,0,0,-30,270,595)
+lw(1)
+r(30,0,0,-30,175,505)
+lw(1)
+ld((3, 3))
+r(30,0,0,-30,235,505)
+lw(1)
+r(30,0,0,-30,175,545)
+lw(1)
+r(30,0,0,-30,205,545)
+lw(1)
+r(30,0,0,-30,205,505)
+lw(1)
+ld((3, 3))
+r(30,0,0,-30,235,545)
+lw(1)
+b()
+bs(190,580,0)
+bs(210,580,0)
+lw(1)
+b()
+bs(155,490,0)
+bs(175,490,0)
+lw(1)
+b()
+bs(155,530,0)
+bs(175,530,0)
+lw(1)
+b()
+bs(190,645,0)
+bs(190,580,0)
+lw(1)
+r(30,0,0,-30,175,675)
+lw(1)
+ld((3, 3))
+r(30,0,0,-30,235.316,675)
+lw(1)
+r(30,0,0,-30,205,675)
+lw(1)
+b()
+bs(155,660,0)
+bs(175,660,0)
+lw(1)
+ld((3, 3))
+b()
+bs(190,580,0)
+bs(190,555,0)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+txt('Tree Model',(180.668,731.384))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/paintsystem-core.sk b/doc/src/diagrams/paintsystem-core.sk
new file mode 100644
index 0000000000..2501124b29
--- /dev/null
+++ b/doc/src/diagrams/paintsystem-core.sk
@@ -0,0 +1,76 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+gl([(0,(0.598,0.866,0.321)),(1,(0.799,0.899,0.724))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+r(104,0,0,-38,146.138,825.695)
+gl([(0,(0.598,0.866,0.321)),(1,(0.799,0.899,0.724))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+r(104,0,0,-38,277.138,825.695)
+gl([(0,(0.598,0.866,0.321)),(1,(0.799,0.899,0.724))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+ld((2, 2))
+r(104,0,0,-38,13.1378,825.695)
+fp((0,0,0))
+lw(1)
+ld((2, 2))
+Fn('Helvetica')
+txt('QPaintEngine',(162.138,803.629))
+fp((0,0,0))
+lw(1)
+ld((2, 2))
+Fn('Helvetica')
+txt('QPaintDevice',(292.638,803.629))
+fp((0,0,0))
+lw(1)
+ld((2, 2))
+Fn('Helvetica')
+txt('QPainter',(40.6378,803.629))
+gl([(0,(0.374,0.544,0.203)),(1,(0.889,1,0.805))])
+pgr(0.5,0.5,0)
+fp()
+lw(1)
+b()
+bs(117.138,806.695,0)
+bs(145.638,806.695,0)
+lw(1)
+b()
+bs(249.888,806.695,0)
+bs(275.888,806.695,0)
+gl([(0,(0.323,0.47,0.175)),(1,(0.763,0.859,0.694))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+ld((2, 2))
+b()
+bs(137.028,811.945,0)
+bs(146.388,806.761,0)
+bs(137.028,801.445,0)
+bs(136.888,811.878,0)
+gl([(0,(0.323,0.47,0.175)),(1,(0.763,0.859,0.694))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+b()
+bs(267.777,811.945,0)
+bs(277.138,806.761,0)
+bs(267.777,801.445,0)
+bs(267.638,811.878,0)
+le()
+lw(1)
+ld((2, 2))
+r(387.5,0,0,-64.5,4.1378,838.945)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/paintsystem-devices.sk b/doc/src/diagrams/paintsystem-devices.sk
new file mode 100644
index 0000000000..f66d5fac71
--- /dev/null
+++ b/doc/src/diagrams/paintsystem-devices.sk
@@ -0,0 +1,220 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lp((0.503,0.503,0.503))
+lw(1)
+r(109,0,0,-43,277,828)
+gl([(0,(0.598,0.866,0.321)),(1,(0.799,0.899,0.724))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+r(104,0,0,-38,279.5,825.5)
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('QPaintDevice',(294.822,803.434))
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('inherits',(312,755.309))
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('inherits',(35.05,656.129))
+gl([(0,(0.374,0.544,0.203)),(1,(0.889,1,0.805))])
+pgr(0.500001,0.5,0)
+fp()
+lw(1)
+b()
+bs(54.4205,666.57,0)
+bs(54.3555,685.07,0)
+gl([(0,(0.374,0.544,0.203)),(1,(0.889,1,0.805))])
+pgr(0.500001,0.5,0)
+fp()
+lw(1)
+b()
+bs(332,747,0)
+bs(331.935,753,0)
+gl([(0,(0.374,0.544,0.203)),(1,(0.889,1,0.805))])
+pgr(0.500001,0.5,0)
+fp()
+lw(1)
+b()
+bs(54.4205,647.07,0)
+bs(54.3555,653.07,0)
+gl([(0,(0.323,0.47,0.175)),(1,(0.763,0.859,0.694))])
+pgr(0.499002,0.499373,0)
+fp()
+b()
+bs(59.638,676.472,0)
+bs(54.433,685.82,0)
+bs(49.138,676.448,0)
+bs(59.571,676.332,0)
+lw(1)
+b()
+bs(55,730,0)
+bs(55,747,0)
+bs(126,747,0)
+lw(1)
+b()
+bs(125,730,0)
+bs(125,747,0)
+bs(197,747,0)
+lw(1)
+b()
+bs(197,730,0)
+bs(197,747,0)
+bs(250,747,0)
+lw(1)
+b()
+bs(285,730,0)
+bs(285,747,0)
+bs(232,747,0)
+lw(1)
+b()
+bs(518,730,0)
+bs(518,747,0)
+bs(409,747,0)
+lw(1)
+b()
+bs(591.862,730,0)
+bs(591.862,747,0)
+bs(517.362,747,0)
+lp((0.517,0.517,0.517))
+lw(1)
+r(63.5,0,0,-43,94.6378,729.695)
+lp((0.517,0.517,0.517))
+lw(1)
+r(68,0,0,-43,162.638,729.695)
+lp((0.517,0.517,0.517))
+lw(1)
+r(96.5,0,0,-43,235.638,729.695)
+lp((0.517,0.517,0.517))
+lw(1)
+r(141.5,0,0,-43,338.5,730)
+lp((0.517,0.517,0.517))
+lw(1)
+r(70.5,0,0,-43,19.138,645.695)
+gl([(0,(0.598,0.866,0.321)),(1,(0.799,0.899,0.724))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+r(58,0,0,-38,97.3878,727.195)
+gl([(0,(0.598,0.866,0.321)),(1,(0.799,0.899,0.724))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+r(63,0,0,-38,165.138,727.195)
+gl([(0,(0.598,0.866,0.321)),(1,(0.799,0.899,0.724))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+r(91.5,0,0,-38,238.138,727.195)
+gl([(0,(0.598,0.866,0.321)),(1,(0.799,0.899,0.724))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+r(136,0,0,-38,341.25,727.5)
+gl([(0,(0.598,0.866,0.321)),(1,(0.799,0.899,0.724))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+r(65,0,0,-38,21.638,643.195)
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('QImage',(105.046,705.129))
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('QPixmap',(171.966,705.129))
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('QGLPixelBuffer',(242.206,705.129))
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('QGLFramebufferObject',(345.068,705.434))
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('QGLWidget',(23.044,621.129))
+lp((0.517,0.517,0.517))
+lw(1)
+r(69.5,0,0,-43,19.638,729.695)
+lp((0.517,0.517,0.517))
+lw(1)
+r(67.5,0,0,-43,486,730)
+lp((0.517,0.517,0.517))
+lw(1)
+r(70.5,0,0,-43,558.5,729.695)
+gl([(0,(0.598,0.866,0.321)),(1,(0.799,0.899,0.724))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+r(64,0,0,-38,22.388,727.195)
+gl([(0,(0.598,0.866,0.321)),(1,(0.799,0.899,0.724))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+r(62,0,0,-38,488.75,727.5)
+gl([(0,(0.598,0.866,0.321)),(1,(0.799,0.899,0.724))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+r(65.5,0,0,-38,561,727.195)
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('QWidget',(31.048,705.129))
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('QPicture',(496.41,705.434))
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('QPrinter',(571.412,705.129))
+le()
+lw(1)
+r(479,0,0,243.5,7.1378,592.445)
+G()
+gl([(0,(0.374,0.544,0.203)),(1,(0.889,1,0.805))])
+pgr(0.500001,0.5,0)
+fp()
+lw(1)
+b()
+bs(331.782,765.75,0)
+bs(331.717,784.25,0)
+gl([(0,(0.323,0.47,0.175)),(1,(0.763,0.859,0.694))])
+pgr(0.499002,0.499373,0)
+fp()
+b()
+bs(337,775.652,0)
+bs(331.795,785,0)
+bs(326.5,775.628,0)
+bs(336.933,775.512,0)
+G_()
+lw(1)
+b()
+bs(285,730,0)
+bs(285,747,0)
+bs(338,747,0)
+lw(1)
+b()
+bs(408,730,0)
+bs(408,747,0)
+bs(338,747,0)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,1,1),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/paintsystem-gradients.sk b/doc/src/diagrams/paintsystem-gradients.sk
new file mode 100644
index 0000000000..6513c12168
--- /dev/null
+++ b/doc/src/diagrams/paintsystem-gradients.sk
@@ -0,0 +1,94 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lp((0.503,0.503,0.503))
+lw(1)
+r(109,0,0,-43,163.638,805.695)
+gl([(0,(0.779,0.726,0.314)),(1,(1,0.954,0.705))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+r(104,0,0,-38,166.138,803.195)
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('QGradient',(190.46,781.129))
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('inherits',(199.3,733.629))
+gl([(0,(0.374,0.544,0.203)),(1,(0.889,1,0.805))])
+pgr(0.500001,0.5,0)
+fp()
+lw(1)
+b()
+bs(218.17,744.07,0)
+bs(218.105,762.57,0)
+gl([(0,(0.374,0.544,0.203)),(1,(0.889,1,0.805))])
+pgr(0.500001,0.5,0)
+fp()
+lw(1)
+b()
+bs(218.67,709.57,0)
+bs(218.605,730.57,0)
+gl([(0,(0.323,0.47,0.175)),(1,(0.763,0.859,0.694))])
+pgr(0.499002,0.499373,0)
+fp()
+b()
+bs(223.388,753.972,0)
+bs(218.183,763.32,0)
+bs(212.888,753.948,0)
+bs(223.321,753.832,0)
+lp((0.517,0.517,0.517))
+lw(1)
+r(109,0,0,-43,47.6378,709.195)
+lp((0.517,0.517,0.517))
+lw(1)
+r(109,0,0,-43,164.638,709.195)
+lp((0.517,0.517,0.517))
+lw(1)
+r(109,0,0,-43,280.638,709.195)
+gl([(0,(0.779,0.726,0.314)),(1,(1,0.954,0.705))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+r(104,0,0,-38,50.1378,706.695)
+gl([(0,(0.779,0.726,0.314)),(1,(1,0.954,0.705))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+r(104,0,0,-38,167.138,706.695)
+gl([(0,(0.779,0.726,0.314)),(1,(1,0.954,0.705))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+r(104,0,0,-38,283.138,706.695)
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('QLinearGradient',(57.7858,684.629))
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('QRadialGradient',(174.456,684.629))
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('QConicalGradient',(287.456,684.629))
+lw(1)
+b()
+bs(104.138,709.445,0)
+bs(104.138,726.445,0)
+bs(222.638,726.445,0)
+lw(1)
+b()
+bs(335.638,709.445,0)
+bs(335.638,726.445,0)
+bs(217.138,726.445,0)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/paintsystem-stylepainter.sk b/doc/src/diagrams/paintsystem-stylepainter.sk
new file mode 100644
index 0000000000..8e27015190
--- /dev/null
+++ b/doc/src/diagrams/paintsystem-stylepainter.sk
@@ -0,0 +1,58 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lp((0.503,0.503,0.503))
+lw(1)
+r(109,0,0,-43,210.138,827.945)
+gl([(0,(0.598,0.866,0.321)),(1,(0.799,0.899,0.724))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+r(104,0,0,-38,212.638,825.445)
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('QPainter',(240.962,803.379))
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('inherits',(145.3,803.379))
+lp((0.517,0.517,0.517))
+lw(1)
+r(109,0,0,-43,17.1378,827.945)
+gl([(0,(0.598,0.866,0.321)),(1,(0.799,0.899,0.724))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+r(104,0,0,-38,19.6378,825.445)
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('QStylePainter',(34.6238,803.379))
+gl([(0,(0.374,0.544,0.203)),(1,(0.889,1,0.805))])
+pgr(0.5,0.499997,0)
+fp()
+lw(1)
+b()
+bs(189.262,806.242,0)
+bs(207.758,806.648,0)
+gl([(0,(0.374,0.544,0.203)),(1,(0.889,1,0.805))])
+pgr(0.5,0.500003,0)
+fp()
+lw(1)
+b()
+bs(126.268,806.219,0)
+bs(141.763,806.671,0)
+gl([(0,(0.323,0.47,0.175)),(1,(0.763,0.859,0.694))])
+pgr(0.498297,0.509099,0)
+fp()
+b()
+bs(199.259,801.196,0)
+bs(208.509,806.573,0)
+bs(199.041,811.694,0)
+bs(199.118,801.26,0)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/palette-diagram/dialog-crop-fade.png b/doc/src/diagrams/palette-diagram/dialog-crop-fade.png
new file mode 100644
index 0000000000..faf7e1113a
--- /dev/null
+++ b/doc/src/diagrams/palette-diagram/dialog-crop-fade.png
diff --git a/doc/src/diagrams/palette-diagram/dialog-crop.png b/doc/src/diagrams/palette-diagram/dialog-crop.png
new file mode 100644
index 0000000000..df5474365b
--- /dev/null
+++ b/doc/src/diagrams/palette-diagram/dialog-crop.png
diff --git a/doc/src/diagrams/palette-diagram/dialog.png b/doc/src/diagrams/palette-diagram/dialog.png
new file mode 100644
index 0000000000..5fe142da73
--- /dev/null
+++ b/doc/src/diagrams/palette-diagram/dialog.png
diff --git a/doc/src/diagrams/palette-diagram/palette.sk b/doc/src/diagrams/palette-diagram/palette.sk
new file mode 100644
index 0000000000..53ab0b53d4
--- /dev/null
+++ b/doc/src/diagrams/palette-diagram/palette.sk
@@ -0,0 +1,95 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+bm(-1228628980,'dialog-crop-fade.png')
+im((115,661),-1228628980)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Window',(130,642.484))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('WindowText',(195,642.484))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('HighlightedText',(20,705))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Highlight',(50,686.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('ButtonText',(620,736.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Button',(620,721.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('3D effects with Light,',(620,696.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Midlight, Dark, and',(620,681.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Shadow',(620,666.384))
+lw(1)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(190,680,0)
+bs(195,655,0)
+lw(1)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(175,670,0)
+bs(170,655,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(110,710,0)
+bs(220,725,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(100,695,0)
+bs(222.693,717.307,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(615,740,0)
+bs(560,725,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(615,725,0)
+bs(580,720,0)
+lw(1)
+b()
+bs(615,705,0)
+bs(615,665,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(615,690,0)
+bs(585,690,0)
+le()
+lw(1)
+r(720,0,0,-180,15,835)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/parent-child-widgets.png b/doc/src/diagrams/parent-child-widgets.png
new file mode 100644
index 0000000000..6d9eb3614f
--- /dev/null
+++ b/doc/src/diagrams/parent-child-widgets.png
diff --git a/doc/src/diagrams/parent-child-widgets.sk b/doc/src/diagrams/parent-child-widgets.sk
new file mode 100644
index 0000000000..b6046fc9e3
--- /dev/null
+++ b/doc/src/diagrams/parent-child-widgets.sk
@@ -0,0 +1,130 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+bm(-1227761876,'parent-child-widgets.png')
+im((140,526),-1227761876)
+G()
+fp((0,0.012,0.878))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QLabel',(46.312,698.884))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('child widgets',(46.312,683.884))
+G_()
+lp((0.879,0,0))
+lw(1)
+b()
+bs(155,732.5,0)
+bs(135,732.5,0)
+bs(135,762.5,0)
+lp((0.879,0,0))
+lw(1)
+b()
+bs(155,702.5,0)
+bs(90,702.5,0)
+lp((0.879,0,0))
+lw(1)
+b()
+bs(165,605,0)
+bs(105,605,0)
+lp((0.879,0,0))
+lw(1)
+b()
+bs(155,785,0)
+bs(115,785,0)
+lp((0.879,0,0))
+lw(1)
+b()
+bs(420,700,0)
+bs(385,700,0)
+lp((0.879,0,0))
+lw(1)
+b()
+bs(420,735,0)
+bs(370,735,0)
+lp((0.879,0,0))
+lw(1)
+b()
+bs(420,770,0)
+bs(370,770,0)
+lp((0.879,0,0))
+lw(1)
+b()
+bs(135,702.5,0)
+bs(135,762.5,0)
+bs(155,762.5,0)
+lp((0.879,0,0))
+lw(1)
+r(60,0,0,-15,155,770)
+lp((0.879,0,0))
+lw(1)
+r(60,0,0,-15,155,740)
+lp((0.879,0,0))
+lw(1)
+r(60,0,0,-15,155,710)
+G()
+fp((0,0.012,0.878))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QTextEdit',(46.312,601.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('child widget',(46.312,586.384))
+G_()
+G()
+fp((0,0.012,0.878))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QGroupBox',(46.312,781.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+txt('parent widget',(46.312,766.384))
+G_()
+G()
+fp((0,0.012,0.878))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QLineEdit',(425,694.984))
+fp((0,0.012,0.878))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QTimeEdit',(425,729.984))
+fp((0,0.012,0.878))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QDateEdit',(425,764.984))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('child widget',(425,679.984))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('child widget',(425,714.984))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('child widget',(425,749.984))
+G_()
+le()
+lw(1)
+r(455,0,0,-300,40,817.5)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/pathstroke-demo.png b/doc/src/diagrams/pathstroke-demo.png
new file mode 100644
index 0000000000..260488de70
--- /dev/null
+++ b/doc/src/diagrams/pathstroke-demo.png
diff --git a/doc/src/diagrams/patternist-importFlow.odg b/doc/src/diagrams/patternist-importFlow.odg
new file mode 100644
index 0000000000..ee71214197
--- /dev/null
+++ b/doc/src/diagrams/patternist-importFlow.odg
diff --git a/doc/src/diagrams/patternist-wordProcessor.odg b/doc/src/diagrams/patternist-wordProcessor.odg
new file mode 100644
index 0000000000..b8c603bc59
--- /dev/null
+++ b/doc/src/diagrams/patternist-wordProcessor.odg
diff --git a/doc/src/diagrams/pbuffers-example.png b/doc/src/diagrams/pbuffers-example.png
new file mode 100644
index 0000000000..cb3b0418e8
--- /dev/null
+++ b/doc/src/diagrams/pbuffers-example.png
diff --git a/doc/src/diagrams/pbuffers2-example.png b/doc/src/diagrams/pbuffers2-example.png
new file mode 100644
index 0000000000..b2b408a3b6
--- /dev/null
+++ b/doc/src/diagrams/pbuffers2-example.png
diff --git a/doc/src/diagrams/plaintext-layout.png b/doc/src/diagrams/plaintext-layout.png
new file mode 100644
index 0000000000..1e9e85139c
--- /dev/null
+++ b/doc/src/diagrams/plaintext-layout.png
diff --git a/doc/src/diagrams/plastique-dialogbuttonbox.png b/doc/src/diagrams/plastique-dialogbuttonbox.png
new file mode 100644
index 0000000000..1e37cd3949
--- /dev/null
+++ b/doc/src/diagrams/plastique-dialogbuttonbox.png
diff --git a/doc/src/diagrams/plastique-filedialog.png b/doc/src/diagrams/plastique-filedialog.png
new file mode 100644
index 0000000000..f043ca78a1
--- /dev/null
+++ b/doc/src/diagrams/plastique-filedialog.png
diff --git a/doc/src/diagrams/plastique-fontcombobox-open.png b/doc/src/diagrams/plastique-fontcombobox-open.png
new file mode 100644
index 0000000000..97fa569109
--- /dev/null
+++ b/doc/src/diagrams/plastique-fontcombobox-open.png
diff --git a/doc/src/diagrams/plastique-fontcombobox-open.zip b/doc/src/diagrams/plastique-fontcombobox-open.zip
new file mode 100644
index 0000000000..ed401cc83e
--- /dev/null
+++ b/doc/src/diagrams/plastique-fontcombobox-open.zip
diff --git a/doc/src/diagrams/plastique-menu.png b/doc/src/diagrams/plastique-menu.png
new file mode 100644
index 0000000000..5358cee27a
--- /dev/null
+++ b/doc/src/diagrams/plastique-menu.png
diff --git a/doc/src/diagrams/plastique-printdialog-properties.png b/doc/src/diagrams/plastique-printdialog-properties.png
new file mode 100644
index 0000000000..cbeac4096f
--- /dev/null
+++ b/doc/src/diagrams/plastique-printdialog-properties.png
diff --git a/doc/src/diagrams/plastique-printdialog.png b/doc/src/diagrams/plastique-printdialog.png
new file mode 100644
index 0000000000..f1538207f1
--- /dev/null
+++ b/doc/src/diagrams/plastique-printdialog.png
diff --git a/doc/src/diagrams/plastique-sizegrip.png b/doc/src/diagrams/plastique-sizegrip.png
new file mode 100644
index 0000000000..ebc4357366
--- /dev/null
+++ b/doc/src/diagrams/plastique-sizegrip.png
diff --git a/doc/src/diagrams/printer-rects.sk b/doc/src/diagrams/printer-rects.sk
new file mode 100644
index 0000000000..e5202850a6
--- /dev/null
+++ b/doc/src/diagrams/printer-rects.sk
@@ -0,0 +1,114 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((0.879,0.879,0.879))
+lp((1,0,0))
+lw(1)
+ld((4, 4))
+r(150,0,0,-190,65,815)
+fp((0.879,0.879,0.879))
+lw(1)
+r(150,0,0,-190,250,815)
+fp((1,1,1))
+lw(1)
+r(110,0,0,-140,85,790)
+fp((1,1,1))
+le()
+lw(1)
+r(110,0,0,-140,270,790)
+fp((1,1,1))
+lp((1,0,0))
+lw(1)
+ld((4, 4))
+b()
+bs(380,695,0)
+bs(380,650,0)
+bs(345,650,0)
+bn()
+bs(305,650,0)
+bs(270,650,0)
+bs(270,790,0)
+bs(380,790,0)
+bs(380,745,0)
+le()
+lw(1)
+ld((4, 4))
+r(375,0,0,-235,45,835)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('paperRect()',(146.652,632.484))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Page coordinate system',(75.638,607.484))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Painter coordinate system',(255.64,607.484))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('pageRect()',(110.324,716.934))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('pageRect()',(295.324,716.934))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('height()',(0,-1,1,0,376.384,740))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('width()',(307,646.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('(0, 0)',(66.992,801.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('(0, 0)',(271.992,776.384))
+lw(1)
+b()
+bs(75,815,0)
+bs(65,815,0)
+bs(65,805,0)
+lw(1)
+b()
+bs(280,790,0)
+bs(270,790,0)
+bs(270,780,0)
+lw(1.5)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(305,650,0)
+bs(275,650,0)
+lw(1.5)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(380,695,0)
+bs(380,655,0)
+lw(1.5)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(380,745,0)
+bs(380,785,0)
+lw(1.5)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(345,650,0)
+bs(375,650,0)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/programs/mdiarea.py b/doc/src/diagrams/programs/mdiarea.py
new file mode 100644
index 0000000000..c78659f2ee
--- /dev/null
+++ b/doc/src/diagrams/programs/mdiarea.py
@@ -0,0 +1,71 @@
+#!/usr/bin/env python
+
+import sys
+from PyQt4.QtCore import SIGNAL
+from PyQt4.QtGui import QApplication, QColor, QIcon, QLabel, QMdiArea, QPixmap, \
+                        QPushButton, QTableWidget, QTableWidgetItem, QTextEdit
+
+
+class Changer:
+
+    def __init__(self, mdiArea):
+    
+        self.mdiArea = mdiArea
+        self.state = 0
+    
+    def change(self):
+    
+        if self.state == 0:
+            self.mdiArea.cascadeSubWindows()
+            self.mdiArea.setWindowTitle("Cascade")
+        elif self.state == 1:
+            self.mdiArea.tileSubWindows()
+            self.mdiArea.setWindowTitle("Tile")
+        self.state = (self.state + 1) % 2
+
+
+if __name__ == "__main__":
+
+    app = QApplication(sys.argv)
+    pixmap = QPixmap(16, 16)
+    pixmap.fill(QColor(0, 0, 0, 0))
+    icon = QIcon(pixmap)
+    app.setWindowIcon(icon)
+    
+    mdiArea = QMdiArea()
+    
+    textEdit = QTextEdit()
+    textEdit.setPlainText("Qt Quarterly is a paper-based newsletter "
+                          "exclusively available to Qt customers. Every "
+                          "quarter we mail out an issue that we hope will "
+                          "bring added insight and pleasure to your Qt "
+                          "programming, with high-quality technical articles "
+                          "written by Qt experts.")
+    textWindow = mdiArea.addSubWindow(textEdit)
+    textWindow.setWindowTitle("A Text Editor")
+    
+    label = QLabel()
+    label.setPixmap(QPixmap("../../images/qt-logo.png"))
+    labelWindow = mdiArea.addSubWindow(label)
+    labelWindow.setWindowTitle("A Label")
+    
+    items = (("Henry", 23), ("Bill", 56), ("Susan", 19), ("Jane", 47))
+    table = QTableWidget(len(items), 2)
+    
+    for i in range(len(items)):
+        name, age = items[i]
+        item = QTableWidgetItem(name)
+        table.setItem(i, 0, item)
+        item = QTableWidgetItem(str(age))
+        table.setItem(i, 1, item)
+    
+    tableWindow = mdiArea.addSubWindow(table)
+    tableWindow.setWindowTitle("A Table Widget")
+    
+    mdiArea.show()
+    
+    changer = Changer(mdiArea)
+    button = QPushButton("Cascade")
+    button.connect(button, SIGNAL("clicked()"), changer.change)
+    button.show()
+    sys.exit(app.exec_())
diff --git a/doc/src/diagrams/programs/qpen-dashpattern.py b/doc/src/diagrams/programs/qpen-dashpattern.py
new file mode 100644
index 0000000000..095d51f78b
--- /dev/null
+++ b/doc/src/diagrams/programs/qpen-dashpattern.py
@@ -0,0 +1,70 @@
+#!/usr/bin/env python
+
+import sys
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
+from PyQt4.QtSvg import QSvgGenerator
+
+if __name__ == "__main__":
+
+    app = QApplication(sys.argv)
+    
+    #device = QSvgGenerator()
+    #device.setFileName("qpen-dashpattern.svg")
+    #device.setSize(QSize(216, 144))
+    #device.setResolution(72)
+    
+    device = QImage(192, 144, QImage.Format_ARGB32)
+    device.fill(qRgba(0, 0, 0, 0))
+    
+    #resolution = device.resolution() # dpi
+    #dpp = resolution / 72.0
+    
+    p = QPainter()
+    p.begin(device)
+    
+    width = 8
+    
+    pen = QPen()
+    pen.setWidth(width)
+    pen.setDashPattern([4, 2])
+    pen.setCapStyle(Qt.FlatCap)
+    
+    faded_pen = QPen()
+    faded_pen.setWidth(width)
+    faded_pen.setDashPattern([4, 2])
+    faded_pen.setColor(QColor(160, 160, 160))
+    faded_pen.setCapStyle(Qt.FlatCap)
+    
+    font = QFont("Monospace")
+    font.setPointSize(12)
+    p.setFont(font)
+    p.setBrush(QColor(160, 0, 0))
+    
+    for x in range(-6, 9):
+    
+        if x % 4 == 0:
+            length = 6
+        else:
+            length = 2
+        
+        p.drawLine(64 + x * width, 4, 64 + x * width, 4 + length)
+        p.drawLine(64 + x * width, 136, 64 + x * width, 136 - length)
+    
+    offsets = (0, 2, 3.5, 4, 5, 6)
+    for i in range(len(offsets)):
+    
+        offset = offsets[i]
+        pen.setDashOffset(offset)
+        
+        p.setPen(faded_pen)
+        p.drawLine(64 - offset * width, 20 + (i * 20), 64, 20 + (i * 20))
+        
+        p.setPen(pen)
+        p.drawLine(64, 20 + (i * 20), 128, 20 + (i * 20))
+        
+        p.drawText(150, 25 + (i * 20), str(offset))
+    
+    p.end()
+    device.save("qpen-dashpattern.png")
+    sys.exit()
diff --git a/doc/src/diagrams/qactiongroup-align.png b/doc/src/diagrams/qactiongroup-align.png
new file mode 100644
index 0000000000..f35b48be0d
--- /dev/null
+++ b/doc/src/diagrams/qactiongroup-align.png
diff --git a/doc/src/diagrams/qcolor-cmyk.sk b/doc/src/diagrams/qcolor-cmyk.sk
new file mode 100644
index 0000000000..593861e088
--- /dev/null
+++ b/doc/src/diagrams/qcolor-cmyk.sk
@@ -0,0 +1,77 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+e(95,0,0,-95.125,174.638,717.57)
+lw(1)
+b()
+bs(257.335,764.341,0)
+bs(91.9083,670.173,0)
+lw(1)
+b()
+bs(256.594,669.129,0)
+bs(91.8985,764.386,0)
+lw(1)
+b()
+bs(174.388,811.945,0)
+bs(174.388,621.445,0)
+fp((0,1,0))
+lw(1)
+r(15.7306,27.291,27.291,-15.7306,71.4706,757.982)
+fp((1,0.976,0))
+lw(1)
+r(31.5,0,0,-31.5,158.638,827.695)
+fp((1,0,0))
+lw(1)
+r(15.5923,-27.3702,-27.3702,-15.5923,262.67,785.579)
+fp((0.993,0,1))
+lw(1)
+r(15.7306,27.291,-27.291,15.7306,262.074,648.117)
+fp((0,0,1))
+lw(1)
+r(31.5,0,0,31.5,158.638,607.695)
+fp((0,1,0.98))
+lw(1)
+r(15.5923,-27.3702,27.3702,15.5923,71.5131,676.681)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('(0, 0, 1, 0)',(195.97,820.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('(0, 1, 0, 0)',(271.47,685.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('(0, 1, 1, 0)',(273.47,740.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('(1, 1, 0, 0)',(197.47,609.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('(1, 0, 0, 0)',(9.9698,687.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('(1, 0, 1, 0)',(10.4698,737.445))
+le()
+lw(1)
+r(347.295,0,0,-250.844,0.969879,841.052)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qcolor-hsv.sk b/doc/src/diagrams/qcolor-hsv.sk
new file mode 100644
index 0000000000..bc455e5356
--- /dev/null
+++ b/doc/src/diagrams/qcolor-hsv.sk
@@ -0,0 +1,77 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+e(95,0,0,-95.125,188.71,717.57)
+lw(1)
+b()
+bs(271.407,764.341,0)
+bs(105.98,670.173,0)
+lw(1)
+b()
+bs(270.666,669.129,0)
+bs(105.97,764.386,0)
+lw(1)
+b()
+bs(188.46,811.945,0)
+bs(188.46,621.445,0)
+fp((0,1,0))
+lw(1)
+r(15.7306,27.291,27.291,-15.7306,85.5423,757.982)
+fp((1,0.976,0))
+lw(1)
+r(31.5,0,0,-31.5,172.71,827.695)
+fp((1,0,0))
+lw(1)
+r(15.5923,-27.3702,-27.3702,-15.5923,276.742,785.579)
+fp((0.993,0,1))
+lw(1)
+r(15.7306,27.291,-27.291,15.7306,276.146,648.117)
+fp((0,0,1))
+lw(1)
+r(31.5,0,0,31.5,172.71,607.695)
+fp((0,1,0.98))
+lw(1)
+r(15.5923,-27.3702,27.3702,15.5923,85.5848,676.681)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('(60/360, 1, 1)',(210.042,820.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('(300/360, 1, 1)',(285.542,685.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('(0, 1, 1)',(287.542,740.825))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('(240/360, 1, 1)',(211.542,609.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('(180/360, 1, 1)',(3.76462,685.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('(120/360, 1, 1)',(3.17503,740.825))
+le()
+lw(1)
+r(347.295,0,0,-250.844,14.9326,840.981)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qcolor-hue.sk b/doc/src/diagrams/qcolor-hue.sk
new file mode 100644
index 0000000000..9bb503d6e5
--- /dev/null
+++ b/doc/src/diagrams/qcolor-hue.sk
@@ -0,0 +1,71 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+e(82.602,-46.9244,-46.9862,-82.7107,209.03,683.511)
+lw(1)
+b()
+bs(304.537,682.094,0)
+bs(114.185,681.927,0)
+lw(1)
+b()
+bs(256.363,600.91,0)
+bs(160.213,765.086,0)
+lw(1)
+b()
+bs(255.428,765.693,0)
+bs(161.333,600.054,0)
+fp((0,1,0))
+lw(1)
+r(27.1578,15.9594,15.9594,-27.1578,139.288,769.608)
+fp((1,0.976,0))
+lw(1)
+r(27.3891,-15.5592,-15.5592,-27.3891,249.513,787.167)
+fp((1,0,0))
+lw(1)
+r(0.0381551,-31.4999,-31.4999,-0.0381551,319.166,699.162)
+fp((0.993,0,1))
+lw(1)
+r(27.1578,15.9594,-15.9594,27.1578,250.75,579.934)
+fp((0,0,1))
+lw(1)
+r(27.3891,-15.5592,15.5592,27.3891,140.846,595.878)
+fp((0,1,0.98))
+lw(1)
+r(0.0381551,-31.4999,31.4999,0.0381551,99.1666,698.896)
+le()
+lw(1)
+r(347.295,0,0,-250.844,34.848,809.427)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('180',(75.6378,678.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('240',(125.638,582.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('300',(274.638,582.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('120',(132.138,780.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('0',(326.138,678.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('60',(267.638,780.945))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qcolor-rgb.sk b/doc/src/diagrams/qcolor-rgb.sk
new file mode 100644
index 0000000000..58f5cad604
--- /dev/null
+++ b/doc/src/diagrams/qcolor-rgb.sk
@@ -0,0 +1,77 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+e(95,0,0,-95.125,174.638,717.57)
+lw(1)
+b()
+bs(257.335,764.341,0)
+bs(91.9083,670.173,0)
+lw(1)
+b()
+bs(256.594,669.129,0)
+bs(91.8985,764.386,0)
+lw(1)
+b()
+bs(174.388,811.945,0)
+bs(174.388,621.445,0)
+fp((0,1,0))
+lw(1)
+r(15.7306,27.291,27.291,-15.7306,71.4706,757.982)
+fp((1,0.976,0))
+lw(1)
+r(31.5,0,0,-31.5,158.638,827.695)
+fp((1,0,0))
+lw(1)
+r(15.5923,-27.3702,-27.3702,-15.5923,262.67,785.579)
+fp((0.993,0,1))
+lw(1)
+r(15.7306,27.291,-27.291,15.7306,262.074,648.117)
+fp((0,0,1))
+lw(1)
+r(31.5,0,0,31.5,158.638,607.695)
+fp((0,1,0.98))
+lw(1)
+r(15.5923,-27.3702,27.3702,15.5923,71.5131,676.681)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('(1, 1, 0)',(195.97,820.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('(1, 0, 1)',(271.47,685.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('(1, 0, 0)',(273.47,741.824))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('(0, 0, 1)',(197.47,609.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('(0, 1, 1)',(26.5236,685.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('(0, 1, 0)',(23.5056,741.824))
+le()
+lw(1)
+r(347.295,0,0,-250.844,0.969879,840.811)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qcolor-saturation.sk b/doc/src/diagrams/qcolor-saturation.sk
new file mode 100644
index 0000000000..7842769bf6
--- /dev/null
+++ b/doc/src/diagrams/qcolor-saturation.sk
@@ -0,0 +1,26 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+gl([(0,(1,1,1)),(1,(0,0,1))])
+pgl(-1,-0.00066387,0)
+fp()
+le()
+lw(1)
+r(0.0128449,-19.3485,-146.873,-0.0975046,211.927,793.765)
+lw(1)
+e(0,0,0,0,92.8878,797.945)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(9)
+txt('0',(62.6378,762.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(9)
+txt('255',(196.638,762.445))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qcolor-value.sk b/doc/src/diagrams/qcolor-value.sk
new file mode 100644
index 0000000000..203befda91
--- /dev/null
+++ b/doc/src/diagrams/qcolor-value.sk
@@ -0,0 +1,26 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+gl([(0,(1,1,1)),(1,(0,0,0))])
+pgl(1,-0.00066387,0)
+fp()
+le()
+lw(1)
+r(-0.0128449,-19.3485,146.873,-0.0975046,65.0669,793.765)
+lw(1)
+e(0,0,0,0,92.8878,797.945)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(9)
+txt('0',(62.6378,762.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(9)
+txt('255',(196.638,762.445))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qfiledialog-expanded.png b/doc/src/diagrams/qfiledialog-expanded.png
new file mode 100644
index 0000000000..6473e212bb
--- /dev/null
+++ b/doc/src/diagrams/qfiledialog-expanded.png
diff --git a/doc/src/diagrams/qfiledialog-small.png b/doc/src/diagrams/qfiledialog-small.png
new file mode 100644
index 0000000000..92ed546f8f
--- /dev/null
+++ b/doc/src/diagrams/qfiledialog-small.png
diff --git a/doc/src/diagrams/qframe-shapes-table.ui b/doc/src/diagrams/qframe-shapes-table.ui
new file mode 100644
index 0000000000..371327fbf0
--- /dev/null
+++ b/doc/src/diagrams/qframe-shapes-table.ui
@@ -0,0 +1,12964 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>Form</class>
+ <widget class="QWidget" name="Form" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>656</width>
+    <height>664</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy>
+    <hsizetype>0</hsizetype>
+    <vsizetype>0</vsizetype>
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <widget class="QFrame" name="frame_2" >
+   <property name="geometry" >
+    <rect>
+     <x>40</x>
+     <y>70</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_3" >
+   <property name="geometry" >
+    <rect>
+     <x>70</x>
+     <y>70</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_4" >
+   <property name="geometry" >
+    <rect>
+     <x>100</x>
+     <y>70</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_6" >
+   <property name="geometry" >
+    <rect>
+     <x>130</x>
+     <y>70</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_8" >
+   <property name="geometry" >
+    <rect>
+     <x>190</x>
+     <y>70</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_7" >
+   <property name="geometry" >
+    <rect>
+     <x>220</x>
+     <y>70</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_5" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>70</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_9" >
+   <property name="geometry" >
+    <rect>
+     <x>250</x>
+     <y>70</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_11" >
+   <property name="geometry" >
+    <rect>
+     <x>280</x>
+     <y>70</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_12" >
+   <property name="geometry" >
+    <rect>
+     <x>310</x>
+     <y>70</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_10" >
+   <property name="geometry" >
+    <rect>
+     <x>340</x>
+     <y>70</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_16" >
+   <property name="geometry" >
+    <rect>
+     <x>370</x>
+     <y>70</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_14" >
+   <property name="geometry" >
+    <rect>
+     <x>400</x>
+     <y>70</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_13" >
+   <property name="geometry" >
+    <rect>
+     <x>430</x>
+     <y>70</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_15" >
+   <property name="geometry" >
+    <rect>
+     <x>460</x>
+     <y>70</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_18" >
+   <property name="geometry" >
+    <rect>
+     <x>40</x>
+     <y>100</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_32" >
+   <property name="geometry" >
+    <rect>
+     <x>70</x>
+     <y>100</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_28" >
+   <property name="geometry" >
+    <rect>
+     <x>100</x>
+     <y>100</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_17" >
+   <property name="geometry" >
+    <rect>
+     <x>130</x>
+     <y>100</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_27" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>100</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_29" >
+   <property name="geometry" >
+    <rect>
+     <x>190</x>
+     <y>100</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_21" >
+   <property name="geometry" >
+    <rect>
+     <x>220</x>
+     <y>100</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_26" >
+   <property name="geometry" >
+    <rect>
+     <x>250</x>
+     <y>100</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_23" >
+   <property name="geometry" >
+    <rect>
+     <x>280</x>
+     <y>100</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_20" >
+   <property name="geometry" >
+    <rect>
+     <x>310</x>
+     <y>100</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_24" >
+   <property name="geometry" >
+    <rect>
+     <x>340</x>
+     <y>100</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_30" >
+   <property name="geometry" >
+    <rect>
+     <x>370</x>
+     <y>100</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_19" >
+   <property name="geometry" >
+    <rect>
+     <x>400</x>
+     <y>100</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_25" >
+   <property name="geometry" >
+    <rect>
+     <x>430</x>
+     <y>100</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_31" >
+   <property name="geometry" >
+    <rect>
+     <x>460</x>
+     <y>100</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_22" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>100</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_33" >
+   <property name="geometry" >
+    <rect>
+     <x>40</x>
+     <y>130</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_37" >
+   <property name="geometry" >
+    <rect>
+     <x>70</x>
+     <y>130</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_40" >
+   <property name="geometry" >
+    <rect>
+     <x>100</x>
+     <y>130</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_44" >
+   <property name="geometry" >
+    <rect>
+     <x>130</x>
+     <y>130</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_41" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>130</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_45" >
+   <property name="geometry" >
+    <rect>
+     <x>220</x>
+     <y>130</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_38" >
+   <property name="geometry" >
+    <rect>
+     <x>250</x>
+     <y>130</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_34" >
+   <property name="geometry" >
+    <rect>
+     <x>280</x>
+     <y>130</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_47" >
+   <property name="geometry" >
+    <rect>
+     <x>310</x>
+     <y>130</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_39" >
+   <property name="geometry" >
+    <rect>
+     <x>340</x>
+     <y>130</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_36" >
+   <property name="geometry" >
+    <rect>
+     <x>370</x>
+     <y>130</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_48" >
+   <property name="geometry" >
+    <rect>
+     <x>400</x>
+     <y>130</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_42" >
+   <property name="geometry" >
+    <rect>
+     <x>430</x>
+     <y>130</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_35" >
+   <property name="geometry" >
+    <rect>
+     <x>460</x>
+     <y>130</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_64" >
+   <property name="geometry" >
+    <rect>
+     <x>40</x>
+     <y>170</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_91" >
+   <property name="geometry" >
+    <rect>
+     <x>70</x>
+     <y>170</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_62" >
+   <property name="geometry" >
+    <rect>
+     <x>100</x>
+     <y>170</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_95" >
+   <property name="geometry" >
+    <rect>
+     <x>130</x>
+     <y>170</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_75" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>170</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_81" >
+   <property name="geometry" >
+    <rect>
+     <x>190</x>
+     <y>170</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_66" >
+   <property name="geometry" >
+    <rect>
+     <x>220</x>
+     <y>170</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_84" >
+   <property name="geometry" >
+    <rect>
+     <x>250</x>
+     <y>170</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_79" >
+   <property name="geometry" >
+    <rect>
+     <x>280</x>
+     <y>170</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_76" >
+   <property name="geometry" >
+    <rect>
+     <x>310</x>
+     <y>170</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_71" >
+   <property name="geometry" >
+    <rect>
+     <x>340</x>
+     <y>170</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_83" >
+   <property name="geometry" >
+    <rect>
+     <x>370</x>
+     <y>170</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_94" >
+   <property name="geometry" >
+    <rect>
+     <x>400</x>
+     <y>170</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_58" >
+   <property name="geometry" >
+    <rect>
+     <x>430</x>
+     <y>170</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_82" >
+   <property name="geometry" >
+    <rect>
+     <x>40</x>
+     <y>200</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_96" >
+   <property name="geometry" >
+    <rect>
+     <x>70</x>
+     <y>200</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_61" >
+   <property name="geometry" >
+    <rect>
+     <x>100</x>
+     <y>200</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_88" >
+   <property name="geometry" >
+    <rect>
+     <x>130</x>
+     <y>200</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_89" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>200</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_92" >
+   <property name="geometry" >
+    <rect>
+     <x>190</x>
+     <y>200</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_49" >
+   <property name="geometry" >
+    <rect>
+     <x>220</x>
+     <y>200</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_87" >
+   <property name="geometry" >
+    <rect>
+     <x>250</x>
+     <y>200</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_77" >
+   <property name="geometry" >
+    <rect>
+     <x>280</x>
+     <y>200</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_70" >
+   <property name="geometry" >
+    <rect>
+     <x>310</x>
+     <y>200</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_85" >
+   <property name="geometry" >
+    <rect>
+     <x>340</x>
+     <y>200</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_78" >
+   <property name="geometry" >
+    <rect>
+     <x>370</x>
+     <y>200</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_54" >
+   <property name="geometry" >
+    <rect>
+     <x>400</x>
+     <y>200</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_51" >
+   <property name="geometry" >
+    <rect>
+     <x>430</x>
+     <y>200</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_73" >
+   <property name="geometry" >
+    <rect>
+     <x>460</x>
+     <y>200</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_63" >
+   <property name="geometry" >
+    <rect>
+     <x>40</x>
+     <y>230</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_74" >
+   <property name="geometry" >
+    <rect>
+     <x>70</x>
+     <y>230</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_69" >
+   <property name="geometry" >
+    <rect>
+     <x>100</x>
+     <y>230</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_90" >
+   <property name="geometry" >
+    <rect>
+     <x>130</x>
+     <y>230</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_67" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>230</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_93" >
+   <property name="geometry" >
+    <rect>
+     <x>190</x>
+     <y>230</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_52" >
+   <property name="geometry" >
+    <rect>
+     <x>220</x>
+     <y>230</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_55" >
+   <property name="geometry" >
+    <rect>
+     <x>250</x>
+     <y>230</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_86" >
+   <property name="geometry" >
+    <rect>
+     <x>280</x>
+     <y>230</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_72" >
+   <property name="geometry" >
+    <rect>
+     <x>340</x>
+     <y>230</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_50" >
+   <property name="geometry" >
+    <rect>
+     <x>370</x>
+     <y>230</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_65" >
+   <property name="geometry" >
+    <rect>
+     <x>400</x>
+     <y>230</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_80" >
+   <property name="geometry" >
+    <rect>
+     <x>430</x>
+     <y>230</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_56" >
+   <property name="geometry" >
+    <rect>
+     <x>460</x>
+     <y>230</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_59" >
+   <property name="geometry" >
+    <rect>
+     <x>310</x>
+     <y>230</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_131" >
+   <property name="geometry" >
+    <rect>
+     <x>130</x>
+     <y>270</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_145" >
+   <property name="geometry" >
+    <rect>
+     <x>190</x>
+     <y>570</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_146" >
+   <property name="geometry" >
+    <rect>
+     <x>190</x>
+     <y>600</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_147" >
+   <property name="geometry" >
+    <rect>
+     <x>340</x>
+     <y>600</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_148" >
+   <property name="geometry" >
+    <rect>
+     <x>310</x>
+     <y>630</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_149" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>600</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_150" >
+   <property name="geometry" >
+    <rect>
+     <x>40</x>
+     <y>570</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_151" >
+   <property name="geometry" >
+    <rect>
+     <x>70</x>
+     <y>600</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_152" >
+   <property name="geometry" >
+    <rect>
+     <x>250</x>
+     <y>630</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_153" >
+   <property name="geometry" >
+    <rect>
+     <x>400</x>
+     <y>630</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_154" >
+   <property name="geometry" >
+    <rect>
+     <x>460</x>
+     <y>600</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_155" >
+   <property name="geometry" >
+    <rect>
+     <x>430</x>
+     <y>570</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_156" >
+   <property name="geometry" >
+    <rect>
+     <x>100</x>
+     <y>600</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_157" >
+   <property name="geometry" >
+    <rect>
+     <x>130</x>
+     <y>570</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_158" >
+   <property name="geometry" >
+    <rect>
+     <x>370</x>
+     <y>600</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_160" >
+   <property name="geometry" >
+    <rect>
+     <x>40</x>
+     <y>600</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_161" >
+   <property name="geometry" >
+    <rect>
+     <x>370</x>
+     <y>570</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_162" >
+   <property name="geometry" >
+    <rect>
+     <x>340</x>
+     <y>570</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_163" >
+   <property name="geometry" >
+    <rect>
+     <x>280</x>
+     <y>570</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_164" >
+   <property name="geometry" >
+    <rect>
+     <x>100</x>
+     <y>630</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_165" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>570</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_166" >
+   <property name="geometry" >
+    <rect>
+     <x>340</x>
+     <y>630</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_167" >
+   <property name="geometry" >
+    <rect>
+     <x>400</x>
+     <y>600</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_168" >
+   <property name="geometry" >
+    <rect>
+     <x>190</x>
+     <y>630</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_169" >
+   <property name="geometry" >
+    <rect>
+     <x>370</x>
+     <y>630</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_170" >
+   <property name="geometry" >
+    <rect>
+     <x>310</x>
+     <y>570</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_171" >
+   <property name="geometry" >
+    <rect>
+     <x>250</x>
+     <y>570</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_172" >
+   <property name="geometry" >
+    <rect>
+     <x>130</x>
+     <y>600</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_173" >
+   <property name="geometry" >
+    <rect>
+     <x>40</x>
+     <y>630</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_174" >
+   <property name="geometry" >
+    <rect>
+     <x>460</x>
+     <y>570</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_175" >
+   <property name="geometry" >
+    <rect>
+     <x>70</x>
+     <y>570</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_176" >
+   <property name="geometry" >
+    <rect>
+     <x>70</x>
+     <y>630</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_178" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>600</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_179" >
+   <property name="geometry" >
+    <rect>
+     <x>280</x>
+     <y>600</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_180" >
+   <property name="geometry" >
+    <rect>
+     <x>400</x>
+     <y>570</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_181" >
+   <property name="geometry" >
+    <rect>
+     <x>250</x>
+     <y>600</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_183" >
+   <property name="geometry" >
+    <rect>
+     <x>430</x>
+     <y>600</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_184" >
+   <property name="geometry" >
+    <rect>
+     <x>100</x>
+     <y>570</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_186" >
+   <property name="geometry" >
+    <rect>
+     <x>430</x>
+     <y>630</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_187" >
+   <property name="geometry" >
+    <rect>
+     <x>130</x>
+     <y>630</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_188" >
+   <property name="geometry" >
+    <rect>
+     <x>220</x>
+     <y>600</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_189" >
+   <property name="geometry" >
+    <rect>
+     <x>220</x>
+     <y>630</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_190" >
+   <property name="geometry" >
+    <rect>
+     <x>310</x>
+     <y>600</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_191" >
+   <property name="geometry" >
+    <rect>
+     <x>460</x>
+     <y>630</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_192" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>630</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_125" >
+   <property name="geometry" >
+    <rect>
+     <x>40</x>
+     <y>270</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_142" >
+   <property name="geometry" >
+    <rect>
+     <x>70</x>
+     <y>270</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_104" >
+   <property name="geometry" >
+    <rect>
+     <x>100</x>
+     <y>270</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_138" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>270</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_100" >
+   <property name="geometry" >
+    <rect>
+     <x>190</x>
+     <y>270</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_130" >
+   <property name="geometry" >
+    <rect>
+     <x>220</x>
+     <y>270</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_121" >
+   <property name="geometry" >
+    <rect>
+     <x>250</x>
+     <y>270</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_105" >
+   <property name="geometry" >
+    <rect>
+     <x>280</x>
+     <y>270</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_103" >
+   <property name="geometry" >
+    <rect>
+     <x>310</x>
+     <y>270</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_119" >
+   <property name="geometry" >
+    <rect>
+     <x>340</x>
+     <y>270</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_132" >
+   <property name="geometry" >
+    <rect>
+     <x>370</x>
+     <y>270</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_127" >
+   <property name="geometry" >
+    <rect>
+     <x>400</x>
+     <y>270</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_137" >
+   <property name="geometry" >
+    <rect>
+     <x>430</x>
+     <y>270</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_140" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>300</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_143" >
+   <property name="geometry" >
+    <rect>
+     <x>40</x>
+     <y>300</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_118" >
+   <property name="geometry" >
+    <rect>
+     <x>70</x>
+     <y>300</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_113" >
+   <property name="geometry" >
+    <rect>
+     <x>100</x>
+     <y>300</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_120" >
+   <property name="geometry" >
+    <rect>
+     <x>130</x>
+     <y>300</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_117" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>300</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_102" >
+   <property name="geometry" >
+    <rect>
+     <x>190</x>
+     <y>300</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_116" >
+   <property name="geometry" >
+    <rect>
+     <x>220</x>
+     <y>300</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_134" >
+   <property name="geometry" >
+    <rect>
+     <x>250</x>
+     <y>300</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_112" >
+   <property name="geometry" >
+    <rect>
+     <x>280</x>
+     <y>300</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_122" >
+   <property name="geometry" >
+    <rect>
+     <x>310</x>
+     <y>300</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_135" >
+   <property name="geometry" >
+    <rect>
+     <x>340</x>
+     <y>300</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_99" >
+   <property name="geometry" >
+    <rect>
+     <x>370</x>
+     <y>300</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_144" >
+   <property name="geometry" >
+    <rect>
+     <x>400</x>
+     <y>300</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_115" >
+   <property name="geometry" >
+    <rect>
+     <x>430</x>
+     <y>300</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_111" >
+   <property name="geometry" >
+    <rect>
+     <x>460</x>
+     <y>300</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_123" >
+   <property name="geometry" >
+    <rect>
+     <x>40</x>
+     <y>330</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_114" >
+   <property name="geometry" >
+    <rect>
+     <x>70</x>
+     <y>330</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_97" >
+   <property name="geometry" >
+    <rect>
+     <x>100</x>
+     <y>330</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_106" >
+   <property name="geometry" >
+    <rect>
+     <x>130</x>
+     <y>330</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_129" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>330</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_124" >
+   <property name="geometry" >
+    <rect>
+     <x>190</x>
+     <y>330</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_98" >
+   <property name="geometry" >
+    <rect>
+     <x>220</x>
+     <y>330</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_108" >
+   <property name="geometry" >
+    <rect>
+     <x>250</x>
+     <y>330</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_101" >
+   <property name="geometry" >
+    <rect>
+     <x>280</x>
+     <y>330</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_136" >
+   <property name="geometry" >
+    <rect>
+     <x>310</x>
+     <y>330</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_109" >
+   <property name="geometry" >
+    <rect>
+     <x>340</x>
+     <y>330</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_139" >
+   <property name="geometry" >
+    <rect>
+     <x>370</x>
+     <y>330</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_110" >
+   <property name="geometry" >
+    <rect>
+     <x>400</x>
+     <y>330</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_133" >
+   <property name="geometry" >
+    <rect>
+     <x>430</x>
+     <y>330</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_141" >
+   <property name="geometry" >
+    <rect>
+     <x>460</x>
+     <y>330</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_185" >
+   <property name="geometry" >
+    <rect>
+     <x>280</x>
+     <y>630</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_177" >
+   <property name="geometry" >
+    <rect>
+     <x>220</x>
+     <y>570</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_68" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>200</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_46" >
+   <property name="geometry" >
+    <rect>
+     <x>190</x>
+     <y>130</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_208" >
+   <property name="geometry" >
+    <rect>
+     <x>40</x>
+     <y>370</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_235" >
+   <property name="geometry" >
+    <rect>
+     <x>70</x>
+     <y>370</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_206" >
+   <property name="geometry" >
+    <rect>
+     <x>100</x>
+     <y>370</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_239" >
+   <property name="geometry" >
+    <rect>
+     <x>130</x>
+     <y>370</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_219" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>370</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_225" >
+   <property name="geometry" >
+    <rect>
+     <x>190</x>
+     <y>370</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_210" >
+   <property name="geometry" >
+    <rect>
+     <x>220</x>
+     <y>370</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_228" >
+   <property name="geometry" >
+    <rect>
+     <x>250</x>
+     <y>370</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_223" >
+   <property name="geometry" >
+    <rect>
+     <x>280</x>
+     <y>370</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_220" >
+   <property name="geometry" >
+    <rect>
+     <x>310</x>
+     <y>370</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_227" >
+   <property name="geometry" >
+    <rect>
+     <x>370</x>
+     <y>370</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_238" >
+   <property name="geometry" >
+    <rect>
+     <x>400</x>
+     <y>370</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_202" >
+   <property name="geometry" >
+    <rect>
+     <x>430</x>
+     <y>370</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_201" >
+   <property name="geometry" >
+    <rect>
+     <x>460</x>
+     <y>370</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_212" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>400</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_226" >
+   <property name="geometry" >
+    <rect>
+     <x>40</x>
+     <y>400</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_240" >
+   <property name="geometry" >
+    <rect>
+     <x>70</x>
+     <y>400</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_205" >
+   <property name="geometry" >
+    <rect>
+     <x>100</x>
+     <y>400</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_232" >
+   <property name="geometry" >
+    <rect>
+     <x>130</x>
+     <y>400</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_233" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>400</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_236" >
+   <property name="geometry" >
+    <rect>
+     <x>190</x>
+     <y>400</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_193" >
+   <property name="geometry" >
+    <rect>
+     <x>220</x>
+     <y>400</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_231" >
+   <property name="geometry" >
+    <rect>
+     <x>250</x>
+     <y>400</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_221" >
+   <property name="geometry" >
+    <rect>
+     <x>280</x>
+     <y>400</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_214" >
+   <property name="geometry" >
+    <rect>
+     <x>310</x>
+     <y>400</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_229" >
+   <property name="geometry" >
+    <rect>
+     <x>340</x>
+     <y>400</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_222" >
+   <property name="geometry" >
+    <rect>
+     <x>370</x>
+     <y>400</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_198" >
+   <property name="geometry" >
+    <rect>
+     <x>400</x>
+     <y>400</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_195" >
+   <property name="geometry" >
+    <rect>
+     <x>430</x>
+     <y>400</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_217" >
+   <property name="geometry" >
+    <rect>
+     <x>460</x>
+     <y>400</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_207" >
+   <property name="geometry" >
+    <rect>
+     <x>40</x>
+     <y>430</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_218" >
+   <property name="geometry" >
+    <rect>
+     <x>70</x>
+     <y>430</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_213" >
+   <property name="geometry" >
+    <rect>
+     <x>100</x>
+     <y>430</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_234" >
+   <property name="geometry" >
+    <rect>
+     <x>130</x>
+     <y>430</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_211" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>430</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_237" >
+   <property name="geometry" >
+    <rect>
+     <x>190</x>
+     <y>430</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_196" >
+   <property name="geometry" >
+    <rect>
+     <x>220</x>
+     <y>430</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_199" >
+   <property name="geometry" >
+    <rect>
+     <x>250</x>
+     <y>430</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_203" >
+   <property name="geometry" >
+    <rect>
+     <x>310</x>
+     <y>430</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_216" >
+   <property name="geometry" >
+    <rect>
+     <x>340</x>
+     <y>430</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_194" >
+   <property name="geometry" >
+    <rect>
+     <x>370</x>
+     <y>430</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_209" >
+   <property name="geometry" >
+    <rect>
+     <x>400</x>
+     <y>430</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_224" >
+   <property name="geometry" >
+    <rect>
+     <x>430</x>
+     <y>430</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_230" >
+   <property name="geometry" >
+    <rect>
+     <x>280</x>
+     <y>430</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_215" >
+   <property name="geometry" >
+    <rect>
+     <x>340</x>
+     <y>370</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_266" >
+   <property name="geometry" >
+    <rect>
+     <x>40</x>
+     <y>470</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_255" >
+   <property name="geometry" >
+    <rect>
+     <x>70</x>
+     <y>470</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_264" >
+   <property name="geometry" >
+    <rect>
+     <x>100</x>
+     <y>470</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_265" >
+   <property name="geometry" >
+    <rect>
+     <x>100</x>
+     <y>500</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_276" >
+   <property name="geometry" >
+    <rect>
+     <x>70</x>
+     <y>500</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_246" >
+   <property name="geometry" >
+    <rect>
+     <x>40</x>
+     <y>500</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_243" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>500</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_248" >
+   <property name="geometry" >
+    <rect>
+     <x>40</x>
+     <y>530</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_245" >
+   <property name="geometry" >
+    <rect>
+     <x>70</x>
+     <y>530</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_283" >
+   <property name="geometry" >
+    <rect>
+     <x>100</x>
+     <y>530</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_280" >
+   <property name="geometry" >
+    <rect>
+     <x>130</x>
+     <y>470</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_241" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>470</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_275" >
+   <property name="geometry" >
+    <rect>
+     <x>190</x>
+     <y>470</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_272" >
+   <property name="geometry" >
+    <rect>
+     <x>220</x>
+     <y>470</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_261" >
+   <property name="geometry" >
+    <rect>
+     <x>130</x>
+     <y>500</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_279" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>500</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_253" >
+   <property name="geometry" >
+    <rect>
+     <x>190</x>
+     <y>500</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_277" >
+   <property name="geometry" >
+    <rect>
+     <x>220</x>
+     <y>500</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_286" >
+   <property name="geometry" >
+    <rect>
+     <x>130</x>
+     <y>530</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_281" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>530</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_259" >
+   <property name="geometry" >
+    <rect>
+     <x>190</x>
+     <y>530</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_273" >
+   <property name="geometry" >
+    <rect>
+     <x>220</x>
+     <y>530</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>2</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_267" >
+   <property name="geometry" >
+    <rect>
+     <x>250</x>
+     <y>470</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_263" >
+   <property name="geometry" >
+    <rect>
+     <x>280</x>
+     <y>470</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_282" >
+   <property name="geometry" >
+    <rect>
+     <x>310</x>
+     <y>470</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_278" >
+   <property name="geometry" >
+    <rect>
+     <x>340</x>
+     <y>470</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_244" >
+   <property name="geometry" >
+    <rect>
+     <x>250</x>
+     <y>500</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_249" >
+   <property name="geometry" >
+    <rect>
+     <x>250</x>
+     <y>530</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_268" >
+   <property name="geometry" >
+    <rect>
+     <x>280</x>
+     <y>530</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_287" >
+   <property name="geometry" >
+    <rect>
+     <x>280</x>
+     <y>500</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_271" >
+   <property name="geometry" >
+    <rect>
+     <x>310</x>
+     <y>500</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_252" >
+   <property name="geometry" >
+    <rect>
+     <x>310</x>
+     <y>530</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_269" >
+   <property name="geometry" >
+    <rect>
+     <x>340</x>
+     <y>530</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_250" >
+   <property name="geometry" >
+    <rect>
+     <x>340</x>
+     <y>500</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>3</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_274" >
+   <property name="geometry" >
+    <rect>
+     <x>370</x>
+     <y>470</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_288" >
+   <property name="geometry" >
+    <rect>
+     <x>370</x>
+     <y>500</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_284" >
+   <property name="geometry" >
+    <rect>
+     <x>370</x>
+     <y>530</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_254" >
+   <property name="geometry" >
+    <rect>
+     <x>400</x>
+     <y>470</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_258" >
+   <property name="geometry" >
+    <rect>
+     <x>400</x>
+     <y>500</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_247" >
+   <property name="geometry" >
+    <rect>
+     <x>400</x>
+     <y>530</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>1</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_262" >
+   <property name="geometry" >
+    <rect>
+     <x>430</x>
+     <y>470</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_251" >
+   <property name="geometry" >
+    <rect>
+     <x>430</x>
+     <y>500</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_257" >
+   <property name="geometry" >
+    <rect>
+     <x>430</x>
+     <y>530</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>2</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_285" >
+   <property name="geometry" >
+    <rect>
+     <x>460</x>
+     <y>500</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_242" >
+   <property name="geometry" >
+    <rect>
+     <x>460</x>
+     <y>530</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_107" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>270</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_159" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>630</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_270" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>530</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_182" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>570</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_197" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>430</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_256" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>470</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_126" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>330</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_204" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>370</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_53" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>230</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_43" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>130</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_60" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>170</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_23" >
+   <property name="geometry" >
+    <rect>
+     <x>500</x>
+     <y>73</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="text" >
+    <string>Box, Plain</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_24" >
+   <property name="geometry" >
+    <rect>
+     <x>500</x>
+     <y>103</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="text" >
+    <string>Box, Raised</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_25" >
+   <property name="geometry" >
+    <rect>
+     <x>500</x>
+     <y>133</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="text" >
+    <string>Box, Sunken</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_57" >
+   <property name="geometry" >
+    <rect>
+     <x>460</x>
+     <y>170</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_128" >
+   <property name="geometry" >
+    <rect>
+     <x>460</x>
+     <y>270</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::WinPanel</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_31" >
+   <property name="geometry" >
+    <rect>
+     <x>500</x>
+     <y>273</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="text" >
+    <string>WinPanel, Plain</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_30" >
+   <property name="geometry" >
+    <rect>
+     <x>500</x>
+     <y>303</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="text" >
+    <string>WinPanel, Raised</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_29" >
+   <property name="geometry" >
+    <rect>
+     <x>500</x>
+     <y>333</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="text" >
+    <string>WinPanel, Sunken</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_32" >
+   <property name="geometry" >
+    <rect>
+     <x>500</x>
+     <y>372</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="text" >
+    <string>HLine, Plain</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_33" >
+   <property name="geometry" >
+    <rect>
+     <x>500</x>
+     <y>402</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="text" >
+    <string>HLine, Raised</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_34" >
+   <property name="geometry" >
+    <rect>
+     <x>500</x>
+     <y>432</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="text" >
+    <string>HLine, Sunken</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_37" >
+   <property name="geometry" >
+    <rect>
+     <x>500</x>
+     <y>472</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="text" >
+    <string>VLine, Plain</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_36" >
+   <property name="geometry" >
+    <rect>
+     <x>500</x>
+     <y>502</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="text" >
+    <string>VLine, Raised</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_35" >
+   <property name="geometry" >
+    <rect>
+     <x>500</x>
+     <y>532</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="text" >
+    <string>VLine, Sunken</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_260" >
+   <property name="geometry" >
+    <rect>
+     <x>460</x>
+     <y>470</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::VLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_200" >
+   <property name="geometry" >
+    <rect>
+     <x>460</x>
+     <y>430</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::HLine</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth" >
+    <number>4</number>
+   </property>
+   <property name="midLineWidth" >
+    <number>3</number>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_28" >
+   <property name="geometry" >
+    <rect>
+     <x>500</x>
+     <y>173</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="text" >
+    <string>Panel, Plain</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_26" >
+   <property name="geometry" >
+    <rect>
+     <x>500</x>
+     <y>203</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="text" >
+    <string>Panel, Raised</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_27" >
+   <property name="geometry" >
+    <rect>
+     <x>500</x>
+     <y>233</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="text" >
+    <string>Panel, Sunken</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_40" >
+   <property name="geometry" >
+    <rect>
+     <x>500</x>
+     <y>573</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="text" >
+    <string>StyledPanel, Plain</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_39" >
+   <property name="geometry" >
+    <rect>
+     <x>500</x>
+     <y>603</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="text" >
+    <string>StyledPanel, Raised</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_38" >
+   <property name="geometry" >
+    <rect>
+     <x>500</x>
+     <y>633</y>
+     <width>146</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="text" >
+    <string>StyledPanel, Sunken</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>70</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::Box</enum>
+   </property>
+   <property name="frameShadow" >
+    <enum>QFrame::Plain</enum>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_16" >
+   <property name="geometry" >
+    <rect>
+     <x>460</x>
+     <y>40</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="autoFillBackground" >
+    <bool>true</bool>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="text" >
+    <string>3</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_12" >
+   <property name="geometry" >
+    <rect>
+     <x>430</x>
+     <y>40</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="autoFillBackground" >
+    <bool>true</bool>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="text" >
+    <string>2</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_8" >
+   <property name="geometry" >
+    <rect>
+     <x>400</x>
+     <y>40</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="autoFillBackground" >
+    <bool>true</bool>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="text" >
+    <string>1</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_41" >
+   <property name="geometry" >
+    <rect>
+     <x>370</x>
+     <y>40</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="autoFillBackground" >
+    <bool>true</bool>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="text" >
+    <string>0</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_15" >
+   <property name="geometry" >
+    <rect>
+     <x>340</x>
+     <y>40</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="autoFillBackground" >
+    <bool>true</bool>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="text" >
+    <string>3</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_11" >
+   <property name="geometry" >
+    <rect>
+     <x>310</x>
+     <y>40</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="autoFillBackground" >
+    <bool>true</bool>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="text" >
+    <string>2</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_7" >
+   <property name="geometry" >
+    <rect>
+     <x>280</x>
+     <y>40</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="autoFillBackground" >
+    <bool>true</bool>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="text" >
+    <string>1</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_4" >
+   <property name="geometry" >
+    <rect>
+     <x>250</x>
+     <y>40</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="autoFillBackground" >
+    <bool>true</bool>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="text" >
+    <string>0</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_14" >
+   <property name="geometry" >
+    <rect>
+     <x>220</x>
+     <y>40</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="autoFillBackground" >
+    <bool>true</bool>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="text" >
+    <string>3</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_10" >
+   <property name="geometry" >
+    <rect>
+     <x>190</x>
+     <y>40</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="autoFillBackground" >
+    <bool>true</bool>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="text" >
+    <string>2</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_6" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>40</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="autoFillBackground" >
+    <bool>true</bool>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="text" >
+    <string>1</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_5" >
+   <property name="geometry" >
+    <rect>
+     <x>40</x>
+     <y>40</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="autoFillBackground" >
+    <bool>true</bool>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="text" >
+    <string>1</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_9" >
+   <property name="geometry" >
+    <rect>
+     <x>70</x>
+     <y>40</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="autoFillBackground" >
+    <bool>true</bool>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="text" >
+    <string>2</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>40</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="autoFillBackground" >
+    <bool>true</bool>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="text" >
+    <string>0</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_13" >
+   <property name="geometry" >
+    <rect>
+     <x>100</x>
+     <y>40</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="autoFillBackground" >
+    <bool>true</bool>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="text" >
+    <string>3</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_17" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>114</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="autoFillBackground" >
+    <bool>true</bool>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="text" >
+    <string>0</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_3" >
+   <property name="geometry" >
+    <rect>
+     <x>130</x>
+     <y>40</y>
+     <width>24</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="autoFillBackground" >
+    <bool>true</bool>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="text" >
+    <string>0</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_18" >
+   <property name="geometry" >
+    <rect>
+     <x>130</x>
+     <y>10</y>
+     <width>114</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="autoFillBackground" >
+    <bool>true</bool>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="text" >
+    <string>1</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_19" >
+   <property name="geometry" >
+    <rect>
+     <x>250</x>
+     <y>10</y>
+     <width>114</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="autoFillBackground" >
+    <bool>true</bool>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="text" >
+    <string>2</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_20" >
+   <property name="geometry" >
+    <rect>
+     <x>370</x>
+     <y>10</y>
+     <width>114</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="autoFillBackground" >
+    <bool>true</bool>
+   </property>
+   <property name="frameShape" >
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="text" >
+    <string>3</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_22" >
+   <property name="geometry" >
+    <rect>
+     <x>500</x>
+     <y>42</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>79</green>
+       <blue>175</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>239</red>
+       <green>239</green>
+       <blue>239</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>79</green>
+       <blue>175</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>239</red>
+       <green>239</green>
+       <blue>239</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>239</red>
+       <green>239</green>
+       <blue>239</blue>
+      </color>
+      <color>
+       <red>239</red>
+       <green>239</green>
+       <blue>239</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="text" >
+    <string>midLineWidth()</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_21" >
+   <property name="geometry" >
+    <rect>
+     <x>500</x>
+     <y>12</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="palette" >
+    <palette>
+     <active>
+      <color>
+       <red>0</red>
+       <green>79</green>
+       <blue>175</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>239</red>
+       <green>239</green>
+       <blue>239</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </active>
+     <inactive>
+      <color>
+       <red>0</red>
+       <green>79</green>
+       <blue>175</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>239</red>
+       <green>239</green>
+       <blue>239</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>103</red>
+       <green>141</green>
+       <blue>178</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </inactive>
+     <disabled>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>221</red>
+       <green>223</green>
+       <blue>228</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>85</red>
+       <green>85</green>
+       <blue>85</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>199</red>
+       <green>199</green>
+       <blue>199</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>128</red>
+       <green>128</green>
+       <blue>128</blue>
+      </color>
+      <color>
+       <red>239</red>
+       <green>239</green>
+       <blue>239</blue>
+      </color>
+      <color>
+       <red>239</red>
+       <green>239</green>
+       <blue>239</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+      <color>
+       <red>86</red>
+       <green>117</green>
+       <blue>148</blue>
+      </color>
+      <color>
+       <red>255</red>
+       <green>255</green>
+       <blue>255</blue>
+      </color>
+      <color>
+       <red>0</red>
+       <green>0</green>
+       <blue>238</blue>
+      </color>
+      <color>
+       <red>82</red>
+       <green>24</green>
+       <blue>139</blue>
+      </color>
+      <color>
+       <red>232</red>
+       <green>232</green>
+       <blue>232</blue>
+      </color>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="text" >
+    <string>lineWidth()</string>
+   </property>
+   <property name="alignment" >
+    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+   </property>
+  </widget>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/doc/src/diagrams/qimage-32bit.sk b/doc/src/diagrams/qimage-32bit.sk
new file mode 100644
index 0000000000..0c1919780f
--- /dev/null
+++ b/doc/src/diagrams/qimage-32bit.sk
@@ -0,0 +1,18 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+G()
+lw(1)
+r(200,0,0,-200,21.921,817.509)
+lw(1)
+r(134.5,0,0,-133.5,87.421,751.009)
+lw(1)
+r(132.5,0,0,-134,21.921,817.509)
+lw(1)
+r(65.5,0,0,-66.5,21.921,817.509)
+lw(1)
+r(67.5,0,0,-66,154.421,683.509)
+G_()
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qimage-8bit.sk b/doc/src/diagrams/qimage-8bit.sk
new file mode 100644
index 0000000000..a08a122904
--- /dev/null
+++ b/doc/src/diagrams/qimage-8bit.sk
@@ -0,0 +1,50 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+G()
+lw(1)
+r(200,0,0,-200,14.2453,827.844)
+lw(1)
+r(134.5,0,0,-133.5,79.7453,761.344)
+lw(1)
+r(132.5,0,0,-134,14.2453,827.844)
+lw(1)
+r(65.5,0,0,-66.5,14.2453,827.844)
+lw(1)
+r(67.5,0,0,-66,146.745,693.844)
+G_()
+lw(1)
+r(65.5,0,0,-24.875,243.995,827.344)
+lw(1)
+r(20.5,0,0,-24.875,223.875,827.344)
+lw(1)
+r(65.5,0,0,-24.875,243.995,727.844)
+lw(1)
+r(20.5,0,0,-24.875,223.875,727.844)
+lw(1)
+r(65.5,0,0,-24.875,243.995,777.594)
+lw(1)
+r(20.5,0,0,-24.875,223.875,777.594)
+lw(1)
+r(65.5,0,0,-24.875,243.995,678.094)
+lw(1)
+r(20.5,0,0,-24.875,223.875,678.094)
+lw(1)
+r(65.5,0,0,-24.875,243.995,802.469)
+lw(1)
+r(20.5,0,0,-24.875,223.875,802.469)
+lw(1)
+r(65.5,0,0,-24.875,243.995,702.969)
+lw(1)
+r(20.5,0,0,-24.875,223.875,702.969)
+lw(1)
+r(65.5,0,0,-24.875,243.995,752.719)
+lw(1)
+r(20.5,0,0,-24.875,223.875,752.719)
+lw(1)
+r(65.5,0,0,-24.875,243.995,653.219)
+lw(1)
+r(20.5,0,0,-24.875,223.875,653.219)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qline-coordinates.sk b/doc/src/diagrams/qline-coordinates.sk
new file mode 100644
index 0000000000..1f741f3162
--- /dev/null
+++ b/doc/src/diagrams/qline-coordinates.sk
@@ -0,0 +1,61 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(2)
+b()
+bs(138.776,520.124,0)
+bs(319.58,700.927,0)
+fp((0.254,0.664,0.072))
+lw(1)
+e(6.02587,0,0,-6.0259,316.516,698.083)
+fp((0.254,0.664,0.072))
+lw(1)
+e(6.02587,0,0,-6.0259,139.569,520.916)
+lw(1)
+b()
+bs(139.654,500.815,0)
+bs(139.654,498.287,0)
+bs(139.654,479.75,0)
+bs(212.502,479.75,0)
+lw(1)
+b()
+bs(320.458,499.937,0)
+bs(320.458,479.75,0)
+bs(248.487,479.75,0)
+lw(1)
+b()
+bs(120.345,700.05,0)
+bs(100.158,700.05,0)
+bs(100.158,628.079,0)
+lw(1)
+b()
+bs(99.2803,590.339,0)
+bs(99.2803,589.306,0)
+bs(99.2803,520.124,0)
+bs(121.222,520.124,0)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('dx()',(219.524,477.117))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('dy()',(90.5034,606.137))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('x1(), y1()',(80.8488,499.059))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('x2(), y2()',(244.099,690.395))
+le()
+lw(1)
+r(320,0,0,-300,59.7843,740.254)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qline-point.sk b/doc/src/diagrams/qline-point.sk
new file mode 100644
index 0000000000..d62303f6a0
--- /dev/null
+++ b/doc/src/diagrams/qline-point.sk
@@ -0,0 +1,61 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(2)
+b()
+bs(138.776,520.124,0)
+bs(319.58,700.927,0)
+lw(1)
+b()
+bs(139.654,500.815,0)
+bs(139.654,498.287,0)
+bs(139.654,479.75,0)
+bs(212.502,479.75,0)
+lw(1)
+b()
+bs(320.458,499.937,0)
+bs(320.458,479.75,0)
+bs(248.487,479.75,0)
+lw(1)
+b()
+bs(120.345,700.05,0)
+bs(100.158,700.05,0)
+bs(100.158,628.079,0)
+lw(1)
+b()
+bs(99.2803,590.339,0)
+bs(99.2803,589.306,0)
+bs(99.2803,520.124,0)
+bs(121.222,520.124,0)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('dx()',(219.524,477.117))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('dy()',(90.5034,606.137))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('p1()',(104.546,497.304))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('p2()',(299.393,661.431))
+fp((0.254,0.664,0.072))
+lw(1)
+e(6.02587,0,0,-6.0259,138.219,520.006)
+fp((0.254,0.664,0.072))
+lw(1)
+e(6.02587,0,0,-6.0259,319.369,700.716)
+le()
+lw(1)
+r(320,0,0,-300,59.6378,739.945)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qlinef-angle-identicaldirection.sk b/doc/src/diagrams/qlinef-angle-identicaldirection.sk
new file mode 100644
index 0000000000..5064938a47
--- /dev/null
+++ b/doc/src/diagrams/qlinef-angle-identicaldirection.sk
@@ -0,0 +1,28 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+b()
+bs(4.13779,835.945,0)
+bs(105.138,784.445,0)
+lw(1)
+b()
+bs(3.88779,783.695,0)
+bs(104.888,835.195,0)
+lw(1)
+b()
+bs(104.638,834.945,0)
+bs(94.3878,833.945,0)
+bs(104.638,829.945,0)
+bs(104.388,834.195,0)
+lw(1)
+b()
+bs(4.13779,836.195,0)
+bs(14.3878,835.195,0)
+bs(4.13779,831.195,0)
+bs(4.38779,835.445,0)
+lw(1)
+e(22.5,0,0,-11.5,55.1378,810.445)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qlinef-angle-oppositedirection.sk b/doc/src/diagrams/qlinef-angle-oppositedirection.sk
new file mode 100644
index 0000000000..69fa46df94
--- /dev/null
+++ b/doc/src/diagrams/qlinef-angle-oppositedirection.sk
@@ -0,0 +1,28 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+b()
+bs(4.13779,835.945,0)
+bs(105.138,784.445,0)
+lw(1)
+b()
+bs(3.88779,783.695,0)
+bs(104.888,835.195,0)
+lw(1)
+b()
+bs(4.13779,783.695,0)
+bs(14.3878,784.695,0)
+bs(4.13779,788.695,0)
+bs(4.38779,784.445,0)
+lw(1)
+b()
+bs(4.13779,836.195,0)
+bs(14.3878,835.195,0)
+bs(4.13779,831.195,0)
+bs(4.38779,835.445,0)
+lw(1)
+e(22.5,0,0,-11.5,55.1378,810.445)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qlistview.png b/doc/src/diagrams/qlistview.png
new file mode 100644
index 0000000000..986fbc56d8
--- /dev/null
+++ b/doc/src/diagrams/qlistview.png
diff --git a/doc/src/diagrams/qmatrix.sk b/doc/src/diagrams/qmatrix.sk
new file mode 100644
index 0000000000..83bb4a68d0
--- /dev/null
+++ b/doc/src/diagrams/qmatrix.sk
@@ -0,0 +1,74 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lp((0,0.174,1))
+lw(1)
+r(90,0,0,-90,12.1378,827.945)
+lp((0,0.054,1))
+lw(1)
+b()
+bs(41.6378,827.945,0)
+bs(41.6378,737.945,0)
+lp((0,0.054,1))
+lw(1)
+b()
+bs(11.6378,797.445,0)
+bs(101.638,797.445,0)
+lp((0,0.054,1))
+lw(1)
+b()
+bs(11.6378,767.945,0)
+bs(101.638,767.945,0)
+lp((0.007,0.06,1))
+lw(1)
+b()
+bs(71.6378,827.445,0)
+bs(71.6378,738.445,0)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('m11',(15.8878,806.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('m12',(45.8878,806.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('m22',(45.8878,777.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('m21',(15.8878,777.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('dx',(21.2218,747.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('dy',(51.2218,747.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('1',(82.6378,747.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('0',(82.6378,806.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('0',(82.6378,777.945))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qpainter-pathstroking.png b/doc/src/diagrams/qpainter-pathstroking.png
new file mode 100644
index 0000000000..4896a11e01
--- /dev/null
+++ b/doc/src/diagrams/qpainter-pathstroking.png
diff --git a/doc/src/diagrams/qrect-coordinates.sk b/doc/src/diagrams/qrect-coordinates.sk
new file mode 100644
index 0000000000..4c0792de3b
--- /dev/null
+++ b/doc/src/diagrams/qrect-coordinates.sk
@@ -0,0 +1,102 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('topLeft()',(91.1378,721.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('topRight()',(271.642,721.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('bottomRight()',(251.638,593.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('bottomLeft()',(71.1338,593.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('left()',(135.138,518.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('right()',(317.138,518.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('top()',(405.142,709.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('bottom()',(405.142,583.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('x(), y()',(153.138,696.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('center()',(224.638,652.945))
+lp((0.866,0,0))
+lw(1)
+ld((4, 4))
+b()
+bs(145.138,742.445,0)
+bs(145.138,529.945,0)
+lp((0.866,0,0))
+lw(1)
+ld((4, 4))
+b()
+bs(329.638,744.445,0)
+bs(329.638,530.945,0)
+lp((0.866,0,0))
+lw(1)
+ld((4, 4))
+b()
+bs(401.138,587.945,0)
+bs(67.1378,587.945,0)
+lp((0.866,0,0))
+lw(1)
+ld((4, 4))
+b()
+bs(398.138,713.445,0)
+bs(68.1378,713.445,0)
+lw(1)
+r(197.5,0,0,-137.5,145.138,713.445)
+fp((0.852,0,0))
+le()
+lw(1)
+e(3,0,0,-3,144.638,713.445)
+fp((0.852,0,0))
+le()
+lw(1)
+e(3,0,0,-3,144.638,588.945)
+fp((0.852,0,0))
+le()
+lw(1)
+e(3,0,0,-3,329.638,587.945)
+fp((0.852,0,0))
+le()
+lw(1)
+e(3,0,0,-3,242.638,646.945)
+fp((0.852,0,0))
+le()
+lw(1)
+e(3,0,0,-3,329.138,713.445)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qrect-diagram-one.sk b/doc/src/diagrams/qrect-diagram-one.sk
new file mode 100644
index 0000000000..0396d80455
--- /dev/null
+++ b/doc/src/diagrams/qrect-diagram-one.sk
@@ -0,0 +1,69 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+le()
+lw(1)
+r(400.24,0,0,-299.507,39.5975,801.199)
+fp((0.228,0.228,0.228))
+lw(1)
+r(228.418,0,0,-163.469,128.024,741.52)
+fp((1,1,1))
+lw(1)
+r(188.922,0,0,-121.779,149.309,720.237)
+lp((0.799,0.109,0.048))
+lw(2)
+r(209.605,0,0,-142.77,128.75,741.136)
+fp((0.254,0.664,0.072))
+lw(1)
+e(9.42692,0,0,-9.42693,128.75,741.136)
+fp((0.254,0.664,0.072))
+lw(1)
+e(9.42692,0,0,-9.42693,319.305,616.689)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('height()',(52.7628,664.942))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('left(), top()',(108.935,771.142))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('right(), bottom()',(345.033,544.699))
+G()
+lw(1)
+b()
+bs(112.866,598.944,0)
+bs(83.0108,598.944,0)
+bs(83.0108,649.497,0)
+bs(83.0108,652.933,0)
+lw(1)
+b()
+bs(82.5719,684.034,0)
+bs(82.5719,742.871,0)
+bs(112.2,742.871,0)
+G_()
+lw(1)
+b()
+bs(129.505,573.041,0)
+bs(129.505,540.72,0)
+bs(203.382,540.72,0)
+lw(1)
+b()
+bs(337.804,572.907,0)
+bs(337.797,540.759,0)
+bs(262.698,540.759,0)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('width()',(214.257,537.543))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+guide(-42.3082,0)
+guide(437.823,1)
+grid((0,0,20,20),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qrect-diagram-three.sk b/doc/src/diagrams/qrect-diagram-three.sk
new file mode 100644
index 0000000000..77be4eed5f
--- /dev/null
+++ b/doc/src/diagrams/qrect-diagram-three.sk
@@ -0,0 +1,67 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+le()
+lw(1)
+r(400.24,0,0,-299.507,39.5975,801.199)
+lw(1)
+b()
+bs(124.239,550.355,0)
+bs(124.239,518.034,0)
+bs(199.871,518.034,0)
+lw(1)
+b()
+bs(336.049,550.221,0)
+bs(336.042,518.073,0)
+bs(260.943,518.073,0)
+lw(1)
+b()
+bs(103.65,598.944,0)
+bs(73.795,598.944,0)
+bs(73.795,649.497,0)
+bs(73.795,652.933,0)
+lw(1)
+b()
+bs(73.3561,684.034,0)
+bs(73.3561,742.871,0)
+bs(102.984,742.871,0)
+fp((0.228,0.228,0.228))
+lw(1)
+r(275.594,0,0,-203.623,107.179,759.732)
+fp((1,1,1))
+lw(1)
+r(145.696,0,0,-80.7471,168.618,700.928)
+lp((0.799,0.109,0.048))
+lw(2)
+r(209.605,0,0,-142.77,128.75,741.136)
+fp((0.254,0.664,0.072))
+lw(1)
+e(9.42692,0,0,-9.42693,128.75,741.136)
+fp((0.254,0.664,0.072))
+lw(1)
+e(9.42692,0,0,-9.42693,311.59,622.904)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('height()',(52.7628,664.942))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('width()',(208.991,514.857))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('left(), top()',(108.935,771.142))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('right(), bottom()',(345.911,537.678))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+guide(-42.3082,0)
+guide(458.887,1)
+grid((0,0,20,20),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qrect-diagram-two.sk b/doc/src/diagrams/qrect-diagram-two.sk
new file mode 100644
index 0000000000..4447923eef
--- /dev/null
+++ b/doc/src/diagrams/qrect-diagram-two.sk
@@ -0,0 +1,67 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+le()
+lw(1)
+r(400.24,0,0,-299.507,39.5975,801.199)
+lw(1)
+b()
+bs(125.117,574.053,0)
+bs(125.117,541.732,0)
+bs(200.749,541.732,0)
+lw(1)
+b()
+bs(335.171,573.919,0)
+bs(335.164,541.771,0)
+bs(260.065,541.771,0)
+lw(1)
+b()
+bs(103.65,598.944,0)
+bs(73.795,598.944,0)
+bs(73.795,649.497,0)
+bs(73.795,652.933,0)
+lw(1)
+b()
+bs(73.3561,684.034,0)
+bs(73.3561,742.871,0)
+bs(102.984,742.871,0)
+fp((0.228,0.228,0.228))
+lw(1)
+r(249.263,0,0,-181.681,107.179,759.732)
+fp((1,1,1))
+lw(1)
+r(165.005,0,0,-103.567,149.309,720.237)
+lp((0.799,0.109,0.048))
+lw(2)
+r(209.605,0,0,-142.77,128.75,741.136)
+fp((0.254,0.664,0.072))
+lw(1)
+e(9.42692,0,0,-9.42693,128.75,741.136)
+fp((0.254,0.664,0.072))
+lw(1)
+e(9.42692,0,0,-9.42693,314.228,619.387)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('height()',(52.7628,664.942))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('width()',(211.624,538.555))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('left(), top()',(108.935,771.142))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('right(), bottom()',(345.033,544.699))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+guide(-42.3082,0)
+guide(600.195,1)
+grid((0,0,20,20),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qrect-diagram-zero.sk b/doc/src/diagrams/qrect-diagram-zero.sk
new file mode 100644
index 0000000000..d5198dcb1e
--- /dev/null
+++ b/doc/src/diagrams/qrect-diagram-zero.sk
@@ -0,0 +1,48 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+b()
+bs(109.757,614.427,0)
+bs(109.757,582.106,0)
+bs(191.533,582.106,0)
+lw(1)
+b()
+bs(319.372,614.732,0)
+bs(319.366,582.584,0)
+bs(244.266,582.584,0)
+lw(1)
+b()
+bs(95.7507,625.714,0)
+bs(65.8958,625.714,0)
+bs(65.8958,676.267,0)
+bs(65.8958,679.703,0)
+lw(1)
+b()
+bs(65.8958,708.171,0)
+bs(65.8958,768.763,0)
+bs(98.1562,768.763,0)
+lp((0.799,0.109,0.048))
+lw(2)
+r(209.605,0,0,-142.77,111.196,769.222)
+lw(1)
+r(0,0,0,0,288.422,731.646)
+lw(1)
+r(0,0,0,0,264.724,735.596)
+lw(1)
+r(0,0,0,0,241.027,741.301)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('width()',(198.459,578.929))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('height()',(45.7413,688.64))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+guide(-63.3727,0)
+guide(433.434,1)
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qrect-intersect.sk b/doc/src/diagrams/qrect-intersect.sk
new file mode 100644
index 0000000000..7e5da3e531
--- /dev/null
+++ b/doc/src/diagrams/qrect-intersect.sk
@@ -0,0 +1,62 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((0.378,0.772,0.399))
+lw(1)
+r(200.113,0,0,-119.366,79.9711,759.732)
+fp((0.49,0.49,0.49))
+lw(1)
+r(200.113,0,0,-120.243,159.841,700.05)
+fp((0.491,0.625,0.785))
+lp((0.732,0.198,0.029))
+lw(2)
+r(120.243,0,0,-59.6828,159.841,700.05)
+lw(1)
+b()
+bs(379.702,700.05,0)
+bs(400.327,700.05,0)
+bs(400.327,679.424,0)
+lw(1)
+b()
+bs(380.14,639.489,0)
+bs(380.14,639.938,0)
+bs(399.888,639.938,0)
+bs(399.888,660.115,0)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('r.intersect(s).height()',(377.638,666.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('r',(84.6378,624.945))
+lw(1)
+b()
+bs(160.138,779.945,0)
+bs(160.138,800.445,0)
+bs(180.138,800.445,0)
+lw(1)
+b()
+bs(260.138,799.445,0)
+bs(280.138,799.445,0)
+bs(280.138,779.445,0)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('r.intersect(s).',(187.138,802.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('width()',(200.638,790.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('s',(145.207,584.51))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qrect-unite.sk b/doc/src/diagrams/qrect-unite.sk
new file mode 100644
index 0000000000..975183bc6d
--- /dev/null
+++ b/doc/src/diagrams/qrect-unite.sk
@@ -0,0 +1,63 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((0.47,0.47,0.47))
+lw(1)
+r(200.113,0,0,-120.243,159.841,700.05)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('r',(84.6378,624.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('s',(149.138,584.945))
+fp((0.378,0.772,0.399))
+lw(1)
+r(200.113,0,0,-119.366,79.9711,759.732)
+lw(1)
+b()
+bs(80.1378,778.445,0)
+bs(80.1378,799.445,0)
+bs(160.138,799.445,0)
+lw(1)
+b()
+bs(360.138,779.945,0)
+bs(360.138,799.945,0)
+bs(279.638,799.945,0)
+lw(1)
+b()
+bs(380.138,759.924,0)
+bs(380.138,760.445,0)
+bs(400.138,760.445,0)
+bs(400.138,698.945,0)
+lw(1)
+b()
+bs(380.138,579.945,0)
+bs(400.138,579.945,0)
+bs(400.138,641.445,0)
+lp((0.819,0.075,0.043))
+lw(2)
+r(280,0,0,-180,80.1378,759.945)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('r.united(s).width()',(179.638,796.945))
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('height()',(380.638,661.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('r.united(s).',(375.638,675.445))
+G_()
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qrectf-coordinates.sk b/doc/src/diagrams/qrectf-coordinates.sk
new file mode 100644
index 0000000000..76223c2bac
--- /dev/null
+++ b/doc/src/diagrams/qrectf-coordinates.sk
@@ -0,0 +1,102 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('topLeft()',(90.6378,721.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('topRight()',(349.638,721.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('bottomRight()',(349.638,560.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('bottomLeft()',(70.6338,560.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('left()',(135.138,519.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('right()',(327.638,519.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('top()',(446.142,708.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('bottom()',(447.142,570.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('x(), y()',(153.138,696.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('center()',(225.138,630.445))
+lp((0.866,0,0))
+lw(1)
+ld((4, 4))
+b()
+bs(145.138,742.445,0)
+bs(145.138,529.945,0)
+lp((0.866,0,0))
+lw(1)
+ld((4, 4))
+b()
+bs(342.638,745.445,0)
+bs(342.638,531.945,0)
+lp((0.866,0,0))
+lw(1)
+ld((4, 4))
+b()
+bs(441.638,575.945,0)
+bs(68.1378,575.945,0)
+lp((0.866,0,0))
+lw(1)
+ld((4, 4))
+b()
+bs(436.138,713.445,0)
+bs(68.1378,713.445,0)
+lw(1)
+r(197.5,0,0,-137.5,145.138,713.445)
+fp((0.852,0,0))
+le()
+lw(1)
+e(3,0,0,-3,144.638,713.445)
+fp((0.852,0,0))
+le()
+lw(1)
+e(3,0,0,-3,144.638,575.945)
+fp((0.852,0,0))
+le()
+lw(1)
+e(3,0,0,-3,342.138,576.445)
+fp((0.852,0,0))
+le()
+lw(1)
+e(3,0,0,-3,242.638,646.945)
+fp((0.852,0,0))
+le()
+lw(1)
+e(3,0,0,-3,342.638,713.945)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,20,20),0,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qrectf-diagram-one.sk b/doc/src/diagrams/qrectf-diagram-one.sk
new file mode 100644
index 0000000000..4e445ddda2
--- /dev/null
+++ b/doc/src/diagrams/qrectf-diagram-one.sk
@@ -0,0 +1,69 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+le()
+lw(1)
+r(400.24,0,0,-299.507,39.5975,801.199)
+fp((0.228,0.228,0.228))
+lw(1)
+r(228.418,0,0,-163.469,128.024,741.52)
+fp((1,1,1))
+lw(1)
+r(188.922,0,0,-121.779,149.309,720.237)
+lp((0.799,0.109,0.048))
+lw(2)
+r(209.605,0,0,-142.77,128.75,741.136)
+fp((0.254,0.664,0.072))
+lw(1)
+e(9.42692,0,0,-9.42693,128.75,741.136)
+fp((0.254,0.664,0.072))
+lw(1)
+e(9.42692,0,0,-9.42693,336.256,599.116)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('height()',(52.7628,664.942))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('left(), top()',(108.935,771.142))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('right(), bottom()',(345.911,559.62))
+G()
+lw(1)
+b()
+bs(112.866,598.944,0)
+bs(83.0108,598.944,0)
+bs(83.0108,649.497,0)
+bs(83.0108,652.933,0)
+lw(1)
+b()
+bs(82.5719,684.034,0)
+bs(82.5719,742.871,0)
+bs(112.2,742.871,0)
+G_()
+lw(1)
+b()
+bs(129.505,573.041,0)
+bs(129.505,540.72,0)
+bs(203.382,540.72,0)
+lw(1)
+b()
+bs(337.804,572.907,0)
+bs(337.797,540.759,0)
+bs(262.698,540.759,0)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('width()',(214.257,537.543))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+guide(-42.3082,0)
+guide(437.823,1)
+grid((0,0,20,20),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qrectf-diagram-three.sk b/doc/src/diagrams/qrectf-diagram-three.sk
new file mode 100644
index 0000000000..21c5b145a4
--- /dev/null
+++ b/doc/src/diagrams/qrectf-diagram-three.sk
@@ -0,0 +1,67 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+le()
+lw(1)
+r(400.24,0,0,-299.507,39.5975,801.199)
+lw(1)
+b()
+bs(124.239,550.355,0)
+bs(124.239,518.034,0)
+bs(199.871,518.034,0)
+lw(1)
+b()
+bs(336.049,550.221,0)
+bs(336.042,518.073,0)
+bs(260.943,518.073,0)
+lw(1)
+b()
+bs(103.65,598.944,0)
+bs(73.795,598.944,0)
+bs(73.795,649.497,0)
+bs(73.795,652.933,0)
+lw(1)
+b()
+bs(73.3561,684.034,0)
+bs(73.3561,742.871,0)
+bs(102.984,742.871,0)
+fp((0.228,0.228,0.228))
+lw(1)
+r(275.594,0,0,-203.623,107.179,759.732)
+fp((1,1,1))
+lw(1)
+r(145.696,0,0,-80.7471,168.618,700.928)
+lp((0.799,0.109,0.048))
+lw(2)
+r(209.605,0,0,-142.77,128.75,741.136)
+fp((0.254,0.664,0.072))
+lw(1)
+e(9.42692,0,0,-9.42693,128.75,741.136)
+fp((0.254,0.664,0.072))
+lw(1)
+e(9.42692,0,0,-9.42693,337.134,598.238)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('height()',(52.7628,664.942))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('width()',(208.991,514.857))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('left(), top()',(108.935,771.142))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('right(), bottom()',(345.911,537.678))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+guide(-42.3082,0)
+guide(458.887,1)
+grid((0,0,20,20),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qrectf-diagram-two.sk b/doc/src/diagrams/qrectf-diagram-two.sk
new file mode 100644
index 0000000000..50d462ec33
--- /dev/null
+++ b/doc/src/diagrams/qrectf-diagram-two.sk
@@ -0,0 +1,67 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+le()
+lw(1)
+r(400.24,0,0,-299.507,39.5975,801.199)
+lw(1)
+b()
+bs(125.117,574.053,0)
+bs(125.117,541.732,0)
+bs(200.749,541.732,0)
+lw(1)
+b()
+bs(335.171,573.919,0)
+bs(335.164,541.771,0)
+bs(260.065,541.771,0)
+lw(1)
+b()
+bs(103.65,598.944,0)
+bs(73.795,598.944,0)
+bs(73.795,649.497,0)
+bs(73.795,652.933,0)
+lw(1)
+b()
+bs(73.3561,684.034,0)
+bs(73.3561,742.871,0)
+bs(102.984,742.871,0)
+fp((0.228,0.228,0.228))
+lw(1)
+r(249.263,0,0,-181.681,107.179,759.732)
+fp((1,1,1))
+lw(1)
+r(165.005,0,0,-103.567,149.309,720.237)
+lp((0.799,0.109,0.048))
+lw(2)
+r(209.605,0,0,-142.77,128.75,741.136)
+fp((0.254,0.664,0.072))
+lw(1)
+e(9.42692,0,0,-9.42693,128.75,741.136)
+fp((0.254,0.664,0.072))
+lw(1)
+e(9.42692,0,0,-9.42693,338.012,598.238)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('height()',(52.7628,664.942))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('width()',(211.624,538.555))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('left(), top()',(108.935,771.142))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('right(), bottom()',(345.033,544.699))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+guide(-42.3082,0)
+guide(600.195,1)
+grid((0,0,20,20),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qstyleoptiontoolbar-position.sk b/doc/src/diagrams/qstyleoptiontoolbar-position.sk
new file mode 100644
index 0000000000..d877f9838f
--- /dev/null
+++ b/doc/src/diagrams/qstyleoptiontoolbar-position.sk
@@ -0,0 +1,125 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+r(347.5,0,0,-199,162.138,754.445)
+lw(1)
+r(430.5,0,0,-25,79.6378,523.945)
+lw(1)
+b()
+bs(161.638,733.945,0)
+bs(509.638,734.445,0)
+lw(1)
+b()
+bs(162.138,714.445,0)
+bs(508.638,714.945,0)
+lw(1)
+b()
+bs(162.138,673.945,0)
+bs(510.138,674.445,0)
+lw(1)
+b()
+bs(162.138,694.445,0)
+bs(509.138,694.945,0)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Middle (m)',(444.638,717.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Middle',(218.138,506.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Middle',(327.138,506.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Middle (m)',(445.138,697.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Beginning (b)',(428.638,737.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('b',(86.1378,566.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Beginning',(105.138,507.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QStyleOptionToolBar::positionOfLine',(185.138,762.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QStyleOptionToolBar::positionWithinLine',(184.138,532.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('End (e)',(460.638,677.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('End',(443.638,506.945))
+lw(1)
+b()
+bs(182.138,524.445,0)
+bs(182.138,499.445,0)
+lw(1)
+b()
+bs(100.138,754.945,0)
+bs(100.138,555.945,0)
+lw(1)
+b()
+bs(120.138,754.945,0)
+bs(120.138,555.945,0)
+lw(1)
+b()
+bs(141.138,754.445,0)
+bs(141.138,555.445,0)
+lw(1)
+b()
+bs(403.138,523.445,0)
+bs(403.138,499.445,0)
+lw(1)
+b()
+bs(291.638,523.445,0)
+bs(291.638,499.445,0)
+lw(1)
+r(82.5,0,0,199,79.6378,555.445)
+lw(1)
+r(0,0,0,0,124.638,535.945)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('m',(105.138,567.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('m',(125.638,567.945))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('e',(147.138,567.445))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+guide(509.138,0)
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qt-embedded-vnc-screen.png b/doc/src/diagrams/qt-embedded-vnc-screen.png
new file mode 100644
index 0000000000..b6fb649572
--- /dev/null
+++ b/doc/src/diagrams/qt-embedded-vnc-screen.png
diff --git a/doc/src/diagrams/qtableview-resized.png b/doc/src/diagrams/qtableview-resized.png
new file mode 100644
index 0000000000..709aef1d91
--- /dev/null
+++ b/doc/src/diagrams/qtableview-resized.png
diff --git a/doc/src/diagrams/qtableview-small.png b/doc/src/diagrams/qtableview-small.png
new file mode 100644
index 0000000000..036390434e
--- /dev/null
+++ b/doc/src/diagrams/qtableview-small.png
diff --git a/doc/src/diagrams/qtableview-stretched.png b/doc/src/diagrams/qtableview-stretched.png
new file mode 100644
index 0000000000..4441427fee
--- /dev/null
+++ b/doc/src/diagrams/qtableview-stretched.png
diff --git a/doc/src/diagrams/qtableview.png b/doc/src/diagrams/qtableview.png
new file mode 100644
index 0000000000..c2b57878a9
--- /dev/null
+++ b/doc/src/diagrams/qtableview.png
diff --git a/doc/src/diagrams/qtconfig-appearance.png b/doc/src/diagrams/qtconfig-appearance.png
new file mode 100644
index 0000000000..9d2d9e782a
--- /dev/null
+++ b/doc/src/diagrams/qtconfig-appearance.png
diff --git a/doc/src/diagrams/qtdemo-example.png b/doc/src/diagrams/qtdemo-example.png
new file mode 100644
index 0000000000..8a399d6750
--- /dev/null
+++ b/doc/src/diagrams/qtdemo-example.png
diff --git a/doc/src/diagrams/qtdemo.png b/doc/src/diagrams/qtdemo.png
new file mode 100644
index 0000000000..2db5399de8
--- /dev/null
+++ b/doc/src/diagrams/qtdemo.png
diff --git a/doc/src/diagrams/qtdesignerextensions.sk b/doc/src/diagrams/qtdesignerextensions.sk
new file mode 100644
index 0000000000..6c991cc129
--- /dev/null
+++ b/doc/src/diagrams/qtdesignerextensions.sk
@@ -0,0 +1,254 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((0.906,0.732,0.467))
+lw(1)
+e(63,0,0,-24.5,506.638,720.945)
+fp((0.633,0.805,0.54))
+lw(1)
+r(228.847,0,0,-31.9855,160.081,797.596)
+fp((0.654,0.799,0.611))
+lw(1)
+r(126.847,0,0,-32.3666,415.674,589.688)
+lw(1)
+r(120.347,0,0,-32.3666,24.0692,505.37)
+fp((0.596,0.758,0.524))
+lw(1)
+r(230.847,0,0,-32.3666,157.485,463.23)
+lw(1)
+r(179.347,0,0,-31.8666,189.83,588.259)
+fp((0.543,0.82,0.899))
+lw(1)
+r(179.847,0,0,-33.3666,189.366,669.613)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QExtensionManager',(423.494,568.427))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QExtensionFactory',(226.125,443.933))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('MyExtensionFactory',(225.078,566.617))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('MyCustomWidgetInterface',(1,0,0,1.06376,207.091,646.338))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Qt Designer',(472.469,715.932))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('MyExtension',(49.3756,486.573))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('can create',(103.516,647.507))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('can create',(102.516,567.507))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QDesignerCustomWidgetInterface',(183.016,776.507))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('can identify',(59.6232,608.689))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('accesses',(400.623,647.189))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('accesses',(499.623,630.189))
+lw(1)
+b()
+bs(84.1673,725.837,0)
+bs(84.1673,650.617,0)
+bs(100.267,650.617,0)
+lw(1)
+b()
+bs(38.1673,726.255,0)
+bs(38.1673,611.117,0)
+bs(54.2666,611.117,0)
+lw(1)
+r(120.347,0,0,-31.9855,23.5806,758.096)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('MyCustomWidget',(1.02995,0,0,1.0597,36.9433,736.685))
+lw(1)
+b()
+bs(278.138,765.445,0)
+bs(278.138,723.445,0)
+lw(1)
+b()
+bs(523.638,697.445,0)
+bs(523.638,643.445,0)
+lw(1)
+b()
+bs(164.638,650.445,0)
+bs(189.138,650.445,0)
+lw(1)
+b()
+bs(163.638,571.945,0)
+bs(190.638,571.945,0)
+lw(1)
+b()
+bs(369.638,649.945,0)
+bs(395.638,649.945,0)
+lw(1)
+b()
+bs(488.138,695.945,0)
+bs(488.138,650.445,0)
+bs(457.638,650.445,0)
+lw(1)
+b()
+bs(83.1378,505.445,0)
+bs(83.1378,571.945,0)
+bs(99.6378,571.945,0)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('inherits',(260.016,708.007))
+lw(1)
+b()
+bs(278.638,700.445,0)
+bs(278.638,669.445,0)
+lw(1)
+b()
+bs(524.138,620.445,0)
+bs(524.138,589.445,0)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('inherits',(257.516,510.007))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('initializes',(277.016,609.507))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('controls',(349.016,523.507))
+lw(1)
+b()
+bs(277.138,463.445,0)
+bs(277.138,505.445,0)
+lw(1)
+b()
+bs(299.638,590.445,0)
+bs(299.638,606.445,0)
+lw(1)
+b()
+bs(278.638,524.945,0)
+bs(278.638,555.945,0)
+lw(1)
+b()
+bs(299.138,619.945,0)
+bs(299.138,635.945,0)
+lw(1)
+b()
+bs(124.638,611.945,0)
+bs(214.138,611.945,0)
+bs(214.138,588.945,0)
+fp((0,0,0))
+lw(1)
+b()
+bs(523.888,589.695,0)
+bs(518.638,597.445,0)
+bs(528.888,597.445,0)
+bs(523.888,590.195,0)
+fp((0,0,0))
+lw(1)
+b()
+bs(83.3878,506.195,0)
+bs(78.1378,513.945,0)
+bs(88.3878,513.945,0)
+bs(83.3878,506.695,0)
+fp((0,0,0))
+lw(1)
+b()
+bs(277.388,463.695,0)
+bs(272.138,471.445,0)
+bs(282.388,471.445,0)
+bs(277.388,464.195,0)
+fp((0,0,0))
+lw(1)
+b()
+bs(299.888,588.695,0)
+bs(294.638,596.445,0)
+bs(304.888,596.445,0)
+bs(299.888,589.195,0)
+fp((0,0,0))
+lw(1)
+b()
+bs(84.3878,726.445,0)
+bs(79.1378,718.695,0)
+bs(89.3878,718.695,0)
+bs(84.3878,725.945,0)
+fp((0,0,0))
+lw(1)
+b()
+bs(38.3878,726.445,0)
+bs(33.1378,718.695,0)
+bs(43.3878,718.695,0)
+bs(38.3878,725.945,0)
+fp((0,0,0))
+lw(1)
+b()
+bs(324.138,556.445,0)
+bs(329.388,548.695,0)
+bs(319.138,548.695,0)
+bs(324.138,555.945,0)
+fp((0,0,0))
+lw(1)
+b()
+bs(278.388,765.945,0)
+bs(273.138,758.195,0)
+bs(283.388,758.195,0)
+bs(278.388,765.445,0)
+fp((0,0,0))
+lw(1)
+b()
+bs(369.638,649.945,0)
+bs(377.263,654.945,0)
+bs(377.263,644.945,0)
+bs(369.763,650.07,0)
+lw(1)
+b()
+bs(460.888,557.945,0)
+bs(460.888,528.445,0)
+bs(398.388,528.445,0)
+lw(1)
+b()
+bs(324.388,554.945,0)
+bs(324.388,527.945,0)
+bs(344.388,527.945,0)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qtexttable-cells.sk b/doc/src/diagrams/qtexttable-cells.sk
new file mode 100644
index 0000000000..3e6eb5bd79
--- /dev/null
+++ b/doc/src/diagrams/qtexttable-cells.sk
@@ -0,0 +1,107 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+le()
+lw(1)
+r(167.5,0,0,-95,120,825)
+lp((0.631,0,0))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(162.5,810,0)
+bc(167.5,815.625,182.5,815.625,187.5,810,2)
+lp((0.631,0,0))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(217.5,810,0)
+bc(222.5,815.625,237.5,815.625,242.5,810,2)
+G()
+lw(1)
+r(50,0,0,-25,177.5,820)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Cell',(192.168,802.484))
+G_()
+G()
+lw(1)
+r(50,0,0,-25,177.5,790)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Cell',(192.168,772.484))
+G_()
+lp((0.631,0.631,0.631))
+lw(1)
+r(50,0,0,-25,177.5,760)
+fp((0.631,0.631,0.631))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Cell',(192.168,742.484))
+G()
+lw(1)
+r(50,0,0,-25,232.5,820)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Cell',(247.168,802.484))
+G_()
+G()
+lw(1)
+r(50,0,0,-25,232.5,790)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Cell',(247.168,772.484))
+G_()
+lp((0.631,0.631,0.631))
+lw(1)
+r(50,0,0,-25,232.5,760)
+fp((0.631,0.631,0.631))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Cell',(247.168,742.484))
+G()
+lw(1)
+r(47.5,0,0,-25,125,820)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Cell',(138.418,802.484))
+G_()
+G()
+lw(1)
+r(47.5,0,0,-25,125,790)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Cell',(138.418,772.484))
+G_()
+lp((0.631,0.631,0.631))
+lw(1)
+r(47.5,0,0,-25,125,760)
+fp((0.631,0.631,0.631))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Cell',(138.418,742.484))
+lp((0.631,0,0))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(275,802.5,0)
+bc(270,795,262.5,792.5,250,792.5,1)
+bc(245,792.5,157.5,792.5,152.5,792.5,1)
+bc(140,792.5,137.306,786.007,132.5,780,1)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qtexttableformat-cell.sk b/doc/src/diagrams/qtexttableformat-cell.sk
new file mode 100644
index 0000000000..75b45f5fe8
--- /dev/null
+++ b/doc/src/diagrams/qtexttableformat-cell.sk
@@ -0,0 +1,67 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lp((0.627,0.627,0.627))
+lw(1)
+ld((2, 2))
+r(-210,0,0,-60,255,670)
+lp((0.627,0.627,0.627))
+lw(1)
+ld((2, 2))
+r(-65,0,0,-135,320,805)
+lp((0.627,0.627,0.627))
+lw(1)
+ld((2, 2))
+r(-210,0,0,-135,255,805)
+lw(1)
+r(275,0,0,-195,45,805)
+lw(1)
+ld((2, 2))
+r(170,0,0,-95,65,785)
+lw(1)
+ld((2, 2))
+r(45,0,0,-95,275,785)
+lw(1)
+ld((2, 2))
+r(170,0,0,-40,65,650)
+lw(1)
+ld((2, 2))
+r(45,0,0,-40,275,650)
+lw(1)
+r(130,0,0,-55,85,765)
+lw(1)
+r(25,0,0,-55,295,765)
+lw(1)
+r(130,0,0,-20,85,630)
+lw(1)
+r(25,0,0,-20,295,630)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Cell padding',(116.652,696.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Cell spacing',(117.324,790))
+fp((0.627,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('Cell contents',(92.2,732.39))
+fp((1,1,1))
+le()
+lw(1)
+r(10,0,0,-205,315,810)
+fp((1,1,1))
+le()
+lw(1)
+r(280,0,0,-10,40,615)
+le()
+lw(1)
+r(280,0,0,-200,40,810)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qtopiacore/architecture-emb.sk b/doc/src/diagrams/qtopiacore/architecture-emb.sk
new file mode 100644
index 0000000000..cca31f3b84
--- /dev/null
+++ b/doc/src/diagrams/qtopiacore/architecture-emb.sk
@@ -0,0 +1,425 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(284.808,62.5,0)
+bs(282.5,62.5,0)
+bs(282.5,67.5,0)
+bs(287.5,67.5,0)
+bs(287.5,62.5,0)
+bs(284.808,62.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(134.808,72.5,0)
+bs(132.5,72.5,0)
+bs(132.5,77.5,0)
+bs(137.5,77.5,0)
+bs(137.5,72.5,0)
+bs(134.808,72.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(22.308,72.5,0)
+bs(20,72.5,0)
+bs(20,77.5,0)
+bs(25,77.5,0)
+bs(25,72.5,0)
+bs(22.308,72.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(78.7166,72.5,0)
+bs(22.5,72.5,0)
+bs(22.5,75,0)
+bs(135,75,0)
+bs(135,72.5,0)
+bs(78.7166,72.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(152.308,62.5,0)
+bs(150,62.5,0)
+bs(150,67.5,0)
+bs(155,67.5,0)
+bs(155,62.5,0)
+bs(152.308,62.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(218.711,62.5,0)
+bs(152.5,62.5,0)
+bs(152.5,65,0)
+bs(285,65,0)
+bs(285,62.5,0)
+bs(218.711,62.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(284.808,27.5,0)
+bs(282.5,27.5,0)
+bs(282.5,32.5,0)
+bs(287.5,32.5,0)
+bs(287.5,27.5,0)
+bs(284.808,27.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(284.808,127.5,0)
+bs(282.5,127.5,0)
+bs(282.5,132.5,0)
+bs(287.5,132.5,0)
+bs(287.5,127.5,0)
+bs(284.808,127.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(12.308,27.5,0)
+bs(10,27.5,0)
+bs(10,32.5,0)
+bs(15,32.5,0)
+bs(15,27.5,0)
+bs(12.308,27.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(12.308,127.5,0)
+bs(10,127.5,0)
+bs(10,132.5,0)
+bs(15,132.5,0)
+bs(15,127.5,0)
+bs(12.308,127.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(284.808,55,0)
+bs(282.5,55,0)
+bs(282.5,60,0)
+bs(287.5,60,0)
+bs(287.5,55,0)
+bs(284.808,55,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(284.808,165,0)
+bs(282.5,165,0)
+bs(282.5,170,0)
+bs(287.5,170,0)
+bs(287.5,165,0)
+bs(284.808,165,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(284.808,120,0)
+bs(282.5,120,0)
+bs(282.5,125,0)
+bs(287.5,125,0)
+bs(287.5,120,0)
+bs(284.808,120,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(134.808,110,0)
+bs(132.5,110,0)
+bs(132.5,115,0)
+bs(137.5,115,0)
+bs(137.5,110,0)
+bs(134.808,110,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(148.669,27.5,0)
+bs(12.5,27.5,0)
+bs(12.5,30,0)
+bs(285,30,0)
+bs(285,27.5,0)
+bs(148.669,27.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(148.669,127.5,0)
+bs(12.5,127.5,0)
+bs(12.5,130,0)
+bs(285,130,0)
+bs(285,127.5,0)
+bs(148.669,127.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(286.249,30,0)
+bs(285,30,0)
+bs(285,57.5,0)
+bs(287.5,57.5,0)
+bs(287.5,30,0)
+bs(286.249,30,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(286.249,130,0)
+bs(285,130,0)
+bs(285,167.5,0)
+bs(287.5,167.5,0)
+bs(287.5,130,0)
+bs(286.249,130,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(286.249,65,0)
+bs(285,65,0)
+bs(285,122.5,0)
+bs(287.5,122.5,0)
+bs(287.5,65,0)
+bs(286.249,65,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(136.249,75,0)
+bs(135,75,0)
+bs(135,112.5,0)
+bs(137.5,112.5,0)
+bs(137.5,75,0)
+bs(136.249,75,0)
+gl([(0,(0,0,0)),(1,(0.362,0.362,0.362))])
+pgl(0,-1,0)
+fp()
+r(275,0,0,-30,10,60)
+fp((1,1,1))
+b()
+bs(10,150,0)
+bs(285,150,0)
+bs(285,170,0)
+bs(10,170,0)
+bs(10,150,0)
+bC()
+fp((0.8,0.8,0.8))
+b()
+bs(10,130,0)
+bs(285,130,0)
+bs(285,150,0)
+bs(10,150,0)
+bs(10,130,0)
+bC()
+fp((0.651,0.808,0.224))
+b()
+bs(150,105,0)
+bs(285,105,0)
+bs(285,125,0)
+bs(150,125,0)
+bs(150,105,0)
+bC()
+fp((0.5,0.5,0.5))
+b()
+bs(150,85,0)
+bs(285,85,0)
+bs(285,105,0)
+bs(150,105,0)
+bs(150,85,0)
+bC()
+fp((0.651,0.808,0.224))
+b()
+bs(20,75,0)
+bs(135,75,0)
+bs(135,115,0)
+bs(20,115,0)
+bs(20,75,0)
+bC()
+lp((0.785,0.785,0.785))
+b()
+bs(10,65,0)
+bs(145,65,0)
+bs(145,125,0)
+bs(10,125,0)
+bs(10,65,0)
+bC()
+lp((0.631,0.631,0.631))
+b()
+bs(15,70,0)
+bs(140,70,0)
+bs(140,120,0)
+bs(15,120,0)
+bs(15,70,0)
+bC()
+fp((0.5,0.5,0.5))
+b()
+bs(150,65,0)
+bs(285,65,0)
+bs(285,85,0)
+bs(150,85,0)
+bs(150,65,0)
+bC()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Application Source Code',(81.47,156.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Qt API',(129.824,136.384))
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Qt for X11',(190.152,111.384))
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Xlib',(207.498,90))
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+txt('X Window Server',(171.156,71.384))
+gl([(0,(0.248,0.248,0.248)),(1,(0.362,0.362,0.362))])
+pgl(0,-1,0)
+fp()
+le()
+lw(0.5)
+b()
+bs(105,35,0)
+bs(115,55,0)
+bs(200,55,0)
+bs(190,35,0)
+bs(105,35,0)
+bC()
+fp((0.788,0.13,0.13))
+le()
+lw(0.5)
+b()
+bs(190,35,0)
+bs(200,55,0)
+bs(280,55,0)
+bs(280,35,0)
+bs(190,35,0)
+bC()
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Framebuffer',(120,41.384))
+gl([(0,(0.248,0.248,0.248)),(1,(0.362,0.362,0.362))])
+pgl(0,-1,0)
+fp()
+le()
+lw(0.5)
+b()
+bs(15,35,0)
+bs(15,55,0)
+bs(110,55,0)
+bs(99.4444,35,0)
+bs(15,35,0)
+bC()
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Linux Kernel',(25,41.384))
+G()
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(8)
+txt('Accelerated',(217.76,46.756))
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(8)
+txt('Graphics',(222.876,37.6))
+G_()
+G()
+fp((1,1,1))
+Fn('Helvetica')
+txt('Qt for',(62.494,98.742))
+fp((1,1,1))
+Fn('Helvetica')
+txt('Embedded Linux',(32.476,85.126))
+G_()
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qtopiacore/clamshell-phone.png b/doc/src/diagrams/qtopiacore/clamshell-phone.png
new file mode 100644
index 0000000000..07f562d807
--- /dev/null
+++ b/doc/src/diagrams/qtopiacore/clamshell-phone.png
diff --git a/doc/src/diagrams/qtopiacore/launcher.png b/doc/src/diagrams/qtopiacore/launcher.png
new file mode 100644
index 0000000000..a72671f6c8
--- /dev/null
+++ b/doc/src/diagrams/qtopiacore/launcher.png
diff --git a/doc/src/diagrams/qtopiacore/qt-embedded-opengl1.sk b/doc/src/diagrams/qtopiacore/qt-embedded-opengl1.sk
new file mode 100644
index 0000000000..abacde9ade
--- /dev/null
+++ b/doc/src/diagrams/qtopiacore/qt-embedded-opengl1.sk
@@ -0,0 +1,410 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(217.308,642.5,0)
+bs(215,642.5,0)
+bs(215,647.5,0)
+bs(220,647.5,0)
+bs(220,642.5,0)
+bs(217.308,642.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(339.808,642.5,0)
+bs(337.5,642.5,0)
+bs(337.5,647.5,0)
+bs(342.5,647.5,0)
+bs(342.5,642.5,0)
+bs(339.808,642.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(278.714,642.5,0)
+bs(217.5,642.5,0)
+bs(217.5,645,0)
+bs(340,645,0)
+bs(340,642.5,0)
+bs(278.714,642.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(339.808,695,0)
+bs(337.5,695,0)
+bs(337.5,700,0)
+bs(342.5,700,0)
+bs(342.5,695,0)
+bs(339.808,695,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(341.249,645,0)
+bs(340,645,0)
+bs(340,697.5,0)
+bs(342.5,697.5,0)
+bs(342.5,645,0)
+bs(341.249,645,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(169.808,642.5,0)
+bs(167.5,642.5,0)
+bs(167.5,647.5,0)
+bs(172.5,647.5,0)
+bs(172.5,642.5,0)
+bs(169.808,642.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(349.808,512.5,0)
+bs(347.5,512.5,0)
+bs(347.5,517.5,0)
+bs(352.5,517.5,0)
+bs(352.5,512.5,0)
+bs(349.808,512.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(349.808,572.5,0)
+bs(347.5,572.5,0)
+bs(347.5,577.5,0)
+bs(352.5,577.5,0)
+bs(352.5,572.5,0)
+bs(349.808,572.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(62.308,512.5,0)
+bs(60,512.5,0)
+bs(60,517.5,0)
+bs(65,517.5,0)
+bs(65,512.5,0)
+bs(62.308,512.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(142.308,572.5,0)
+bs(140,572.5,0)
+bs(140,577.5,0)
+bs(145,577.5,0)
+bs(145,572.5,0)
+bs(142.308,572.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(139.808,732.5,0)
+bs(137.5,732.5,0)
+bs(137.5,737.5,0)
+bs(142.5,737.5,0)
+bs(142.5,732.5,0)
+bs(139.808,732.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(169.808,695,0)
+bs(167.5,695,0)
+bs(167.5,700,0)
+bs(172.5,700,0)
+bs(172.5,695,0)
+bs(169.808,695,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(139.808,785,0)
+bs(137.5,785,0)
+bs(137.5,790,0)
+bs(142.5,790,0)
+bs(142.5,785,0)
+bs(139.808,785,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(171.249,645,0)
+bs(170,645,0)
+bs(170,697.5,0)
+bs(172.5,697.5,0)
+bs(172.5,645,0)
+bs(171.249,645,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(141.249,735,0)
+bs(140,735,0)
+bs(140,787.5,0)
+bs(142.5,787.5,0)
+bs(142.5,735,0)
+bs(141.249,735,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(62.308,642.5,0)
+bs(60,642.5,0)
+bs(60,647.5,0)
+bs(65,647.5,0)
+bs(65,642.5,0)
+bs(62.308,642.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(62.308,732.5,0)
+bs(60,732.5,0)
+bs(60,737.5,0)
+bs(65,737.5,0)
+bs(65,732.5,0)
+bs(62.308,732.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(116.218,642.5,0)
+bs(62.5,642.5,0)
+bs(62.5,645,0)
+bs(170,645,0)
+bs(170,642.5,0)
+bs(116.218,642.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(101.227,732.5,0)
+bs(62.5,732.5,0)
+bs(62.5,735,0)
+bs(140,735,0)
+bs(140,732.5,0)
+bs(101.227,732.5,0)
+fp((0.651,0.808,0.224))
+b()
+bs(215,645,0)
+bs(340,645,0)
+bs(340,700,0)
+bs(215,700,0)
+bs(215,645,0)
+bC()
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(349.808,535,0)
+bs(347.5,535,0)
+bs(347.5,540,0)
+bs(352.5,540,0)
+bs(352.5,535,0)
+bs(349.808,535,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(349.808,595,0)
+bs(347.5,595,0)
+bs(347.5,600,0)
+bs(352.5,600,0)
+bs(352.5,595,0)
+bs(349.808,595,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(206.165,512.5,0)
+bs(62.5,512.5,0)
+bs(62.5,515,0)
+bs(350,515,0)
+bs(350,512.5,0)
+bs(206.165,512.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(246.188,572.5,0)
+bs(142.5,572.5,0)
+bs(142.5,575,0)
+bs(350,575,0)
+bs(350,572.5,0)
+bs(246.188,572.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(351.249,515,0)
+bs(350,515,0)
+bs(350,537.5,0)
+bs(352.5,537.5,0)
+bs(352.5,515,0)
+bs(351.249,515,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(351.249,575,0)
+bs(350,575,0)
+bs(350,597.5,0)
+bs(352.5,597.5,0)
+bs(352.5,575,0)
+bs(351.249,575,0)
+fp((0.503,0.503,0.503))
+r(290,0,0,-25,60,540)
+fp((0.503,0.503,0.503))
+r(210,0,0,-25,140,600)
+fp((0.337,0.357,1))
+b()
+bs(60,735,0)
+bs(140,735,0)
+bs(140,790,0)
+bs(60,790,0)
+bs(60,735,0)
+bC()
+fp((0.651,0.808,0.224))
+b()
+bs(60,645,0)
+bs(170,645,0)
+bs(170,700,0)
+bs(60,700,0)
+bs(60,645,0)
+bC()
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Application',(70.654,759.434))
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Framebuffer',(172.5,523.884))
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Acceleration Hardware',(184.316,583.884))
+G()
+fp((0,0,0))
+Fn('Helvetica')
+txt('Qt for',(99.994,676.242))
+fp((0,0,0))
+Fn('Helvetica')
+txt('Embedded Linux',(69.976,662.626))
+G_()
+fp((0,0,0))
+Fn('Helvetica')
+txt('Acceleration Plugin',(226.146,669.434))
+lw(1.25)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(100,735,0)
+bs(100,702.5,0)
+lw(1.25)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(115,645,0)
+bs(115,542.5,0)
+lw(1.25)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(280,645,0)
+bs(280,602.5,0)
+lw(1.25)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(170,682.5,0)
+bs(212.5,682.5,0)
+lw(1.25)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(215,662.5,0)
+bs(172.5,662.5,0)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qtopiacore/qt-embedded-opengl2.sk b/doc/src/diagrams/qtopiacore/qt-embedded-opengl2.sk
new file mode 100644
index 0000000000..531a34c415
--- /dev/null
+++ b/doc/src/diagrams/qtopiacore/qt-embedded-opengl2.sk
@@ -0,0 +1,592 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(227.308,642.5,0)
+bs(225,642.5,0)
+bs(225,647.5,0)
+bs(230,647.5,0)
+bs(230,642.5,0)
+bs(227.308,642.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(269.808,547.5,0)
+bs(267.5,547.5,0)
+bs(267.5,552.5,0)
+bs(272.5,552.5,0)
+bs(272.5,547.5,0)
+bs(269.808,547.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(62.308,547.5,0)
+bs(60,547.5,0)
+bs(60,552.5,0)
+bs(65,552.5,0)
+bs(65,547.5,0)
+bs(62.308,547.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(349.808,642.5,0)
+bs(347.5,642.5,0)
+bs(347.5,647.5,0)
+bs(352.5,647.5,0)
+bs(352.5,642.5,0)
+bs(349.808,642.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(339.808,547.5,0)
+bs(337.5,547.5,0)
+bs(337.5,552.5,0)
+bs(342.5,552.5,0)
+bs(342.5,547.5,0)
+bs(339.808,547.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(244.808,547.5,0)
+bs(242.5,547.5,0)
+bs(242.5,552.5,0)
+bs(247.5,552.5,0)
+bs(247.5,547.5,0)
+bs(244.808,547.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(288.714,642.5,0)
+bs(227.5,642.5,0)
+bs(227.5,645,0)
+bs(350,645,0)
+bs(350,642.5,0)
+bs(288.714,642.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(304.979,547.5,0)
+bs(270,547.5,0)
+bs(270,550,0)
+bs(340,550,0)
+bs(340,547.5,0)
+bs(304.979,547.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(153.696,547.5,0)
+bs(62.5,547.5,0)
+bs(62.5,550,0)
+bs(245,550,0)
+bs(245,547.5,0)
+bs(153.696,547.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(349.808,695,0)
+bs(347.5,695,0)
+bs(347.5,700,0)
+bs(352.5,700,0)
+bs(352.5,695,0)
+bs(349.808,695,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(339.808,595,0)
+bs(337.5,595,0)
+bs(337.5,600,0)
+bs(342.5,600,0)
+bs(342.5,595,0)
+bs(339.808,595,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(244.808,595,0)
+bs(242.5,595,0)
+bs(242.5,600,0)
+bs(247.5,600,0)
+bs(247.5,595,0)
+bs(244.808,595,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(351.249,645,0)
+bs(350,645,0)
+bs(350,697.5,0)
+bs(352.5,697.5,0)
+bs(352.5,645,0)
+bs(351.249,645,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(341.249,550,0)
+bs(340,550,0)
+bs(340,597.5,0)
+bs(342.5,597.5,0)
+bs(342.5,550,0)
+bs(341.249,550,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(246.249,550,0)
+bs(245,550,0)
+bs(245,597.5,0)
+bs(247.5,597.5,0)
+bs(247.5,550,0)
+bs(246.249,550,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(189.808,642.5,0)
+bs(187.5,642.5,0)
+bs(187.5,647.5,0)
+bs(192.5,647.5,0)
+bs(192.5,642.5,0)
+bs(189.808,642.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(349.808,432.5,0)
+bs(347.5,432.5,0)
+bs(347.5,437.5,0)
+bs(352.5,437.5,0)
+bs(352.5,432.5,0)
+bs(349.808,432.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(309.808,482.5,0)
+bs(307.5,482.5,0)
+bs(307.5,487.5,0)
+bs(312.5,487.5,0)
+bs(312.5,482.5,0)
+bs(309.808,482.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(62.308,432.5,0)
+bs(60,432.5,0)
+bs(60,437.5,0)
+bs(65,437.5,0)
+bs(65,432.5,0)
+bs(62.308,432.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(102.308,482.5,0)
+bs(100,482.5,0)
+bs(100,487.5,0)
+bs(105,487.5,0)
+bs(105,482.5,0)
+bs(102.308,482.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(139.808,732.5,0)
+bs(137.5,732.5,0)
+bs(137.5,737.5,0)
+bs(142.5,737.5,0)
+bs(142.5,732.5,0)
+bs(139.808,732.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(189.808,695,0)
+bs(187.5,695,0)
+bs(187.5,700,0)
+bs(192.5,700,0)
+bs(192.5,695,0)
+bs(189.808,695,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(139.808,785,0)
+bs(137.5,785,0)
+bs(137.5,790,0)
+bs(142.5,790,0)
+bs(142.5,785,0)
+bs(139.808,785,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(191.249,645,0)
+bs(190,645,0)
+bs(190,697.5,0)
+bs(192.5,697.5,0)
+bs(192.5,645,0)
+bs(191.249,645,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(141.249,735,0)
+bs(140,735,0)
+bs(140,787.5,0)
+bs(142.5,787.5,0)
+bs(142.5,735,0)
+bs(141.249,735,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(82.308,642.5,0)
+bs(80,642.5,0)
+bs(80,647.5,0)
+bs(85,647.5,0)
+bs(85,642.5,0)
+bs(82.308,642.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(62.308,732.5,0)
+bs(60,732.5,0)
+bs(60,737.5,0)
+bs(65,737.5,0)
+bs(65,732.5,0)
+bs(62.308,732.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(136.218,642.5,0)
+bs(82.5,642.5,0)
+bs(82.5,645,0)
+bs(190,645,0)
+bs(190,642.5,0)
+bs(136.218,642.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(101.227,732.5,0)
+bs(62.5,732.5,0)
+bs(62.5,735,0)
+bs(140,735,0)
+bs(140,732.5,0)
+bs(101.227,732.5,0)
+fp((0.651,0.808,0.224))
+b()
+bs(225,645,0)
+bs(350,645,0)
+bs(350,700,0)
+bs(225,700,0)
+bs(225,645,0)
+bC()
+fp((0.965,0.522,0.439))
+b()
+bs(267.5,550,0)
+bs(340,550,0)
+bs(340,600,0)
+bs(267.5,600,0)
+bs(267.5,550,0)
+bC()
+fp((0.965,0.522,0.439))
+b()
+bs(60,550,0)
+bs(245,550,0)
+bs(245,600,0)
+bs(60,600,0)
+bs(60,550,0)
+bC()
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(349.808,455,0)
+bs(347.5,455,0)
+bs(347.5,460,0)
+bs(352.5,460,0)
+bs(352.5,455,0)
+bs(349.808,455,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(309.808,505,0)
+bs(307.5,505,0)
+bs(307.5,510,0)
+bs(312.5,510,0)
+bs(312.5,505,0)
+bs(309.808,505,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(206.165,432.5,0)
+bs(62.5,432.5,0)
+bs(62.5,435,0)
+bs(350,435,0)
+bs(350,432.5,0)
+bs(206.165,432.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(206.188,482.5,0)
+bs(102.5,482.5,0)
+bs(102.5,485,0)
+bs(310,485,0)
+bs(310,482.5,0)
+bs(206.188,482.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(351.249,435,0)
+bs(350,435,0)
+bs(350,457.5,0)
+bs(352.5,457.5,0)
+bs(352.5,435,0)
+bs(351.249,435,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(311.249,485,0)
+bs(310,485,0)
+bs(310,507.5,0)
+bs(312.5,507.5,0)
+bs(312.5,485,0)
+bs(311.249,485,0)
+fp((0.503,0.503,0.503))
+r(290,0,0,-25,60,460)
+fp((0.503,0.503,0.503))
+r(210,0,0,-25,100,510)
+fp((0.337,0.357,1))
+b()
+bs(60,735,0)
+bs(140,735,0)
+bs(140,790,0)
+bs(60,790,0)
+bs(60,735,0)
+bC()
+fp((0.651,0.808,0.224))
+b()
+bs(80,645,0)
+bs(190,645,0)
+bs(190,700,0)
+bs(80,700,0)
+bs(80,645,0)
+bC()
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Application',(70.654,759.434))
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Framebuffer',(172.5,443.884))
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Acceleration Hardware',(144.316,493.884))
+G()
+fp((0,0,0))
+Fn('Helvetica')
+txt('Qt for',(119.994,676.242))
+fp((0,0,0))
+Fn('Helvetica')
+txt('Embedded Linux',(89.976,662.626))
+G_()
+fp((0,0,0))
+Fn('Helvetica')
+txt('EGL',(291.744,571.384))
+fp((0,0,0))
+Fn('Helvetica')
+txt('OpenGL ES',(120.148,571.384))
+lw(1.25)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(100,735,0)
+bs(100,702.5,0)
+lw(1.25)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(70,735,0)
+bs(70,602.5,0)
+lw(1.25)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(137.5,645,0)
+bs(137.5,602.5,0)
+lw(1.25)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(80,550,0)
+bs(80,462.5,0)
+lw(1.25)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(325,550,0)
+bs(325,462.5,0)
+lw(1.25)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(150,550,0)
+bs(150,512.5,0)
+lw(1.25)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(290,550,0)
+bs(290,512.5,0)
+lw(1.25)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(305,645,0)
+bs(305,602.5,0)
+lw(1.25)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(190,682.5,0)
+bs(222.5,682.5,0)
+lw(1.25)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(225,662.5,0)
+bs(192.5,662.5,0)
+G()
+fp((0,0,0))
+Fn('Helvetica')
+txt('Reference',(259.822,676.384))
+fp((0,0,0))
+Fn('Helvetica')
+txt('Implementation',(246.484,662.768))
+G_()
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qtopiacore/qtopiacore-accelerateddriver.sk b/doc/src/diagrams/qtopiacore/qtopiacore-accelerateddriver.sk
new file mode 100644
index 0000000000..d2b5c18e5c
--- /dev/null
+++ b/doc/src/diagrams/qtopiacore/qtopiacore-accelerateddriver.sk
@@ -0,0 +1,70 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+G()
+lw(1)
+ld((4, 4))
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(243.103,720,0)
+bc(243.103,720,312.371,742.5,243.103,780,2)
+lw(1)
+ld((4, 4))
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(225.786,720,0)
+bc(225.786,720,156.518,742.5,225.786,780,2)
+G_()
+fp((0.636,0.839,0.81))
+lw(1)
+r(130,0,0,-40,15,770)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Client Application',(32.3,746.934))
+fp((0.772,0.913,0.89))
+lw(1)
+r(130,0,0,-40,170,820)
+fp((0.772,0.913,0.89))
+lw(1)
+r(130,0,0,-40,170,720)
+fp((0.772,0.913,0.89))
+lw(1)
+r(130,0,0,-20,170,760)
+fp((0.636,0.839,0.81))
+lw(1)
+r(130,0,0,-40,325,770)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Paint Engine',(200.98,796.934))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Widget',(216.328,746.934))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Paint Device',(201.322,696.934))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Window Surface',(346.32,746.934))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(145,750,0)
+bs(170,750,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(300,750,0)
+bs(325,750,0)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qtopiacore/qtopiacore-architecture-emb.svg b/doc/src/diagrams/qtopiacore/qtopiacore-architecture-emb.svg
new file mode 100644
index 0000000000..5f4d889e77
--- /dev/null
+++ b/doc/src/diagrams/qtopiacore/qtopiacore-architecture-emb.svg
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="285.482"
+   height="140.482"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.42"
+   sodipodi:docname="architecture-emb.svg"
+   sodipodi:docbase="/home/dboddie/dev/whitepapers/qtopia-core/diagrams">
+  <metadata
+     id="metadata88">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="574"
+     inkscape:window-width="924"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="true"
+     inkscape:grid-points="true"
+     inkscape:zoom="2.1612571"
+     inkscape:cx="142.74100"
+     inkscape:cy="70.240997"
+     inkscape:window-x="61"
+     inkscape:window-y="164"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <marker
+       id="ArrowEnd"
+       viewBox="0 0 10 10"
+       refX="0"
+       refY="5"
+       markerUnits="strokeWidth"
+       markerWidth="4"
+       markerHeight="3"
+       orient="auto">
+      <path
+         d="M 0 0 L 10 5 L 0 10 z"
+         id="path7" />
+    </marker>
+    <marker
+       id="ArrowStart"
+       viewBox="0 0 10 10"
+       refX="10"
+       refY="5"
+       markerUnits="strokeWidth"
+       markerWidth="4"
+       markerHeight="3"
+       orient="auto">
+      <path
+         d="M 10 0 L 0 5 L 10 10 z"
+         id="path10" />
+    </marker>
+  </defs>
+  <g
+     id="g12">
+    <defs
+       id="defs14">
+      <linearGradient
+         id="1"
+         x1="142.741"
+         y1="140.482"
+         x2="142.741"
+         y2="100"
+         gradientUnits="userSpaceOnUse">
+        <stop
+           offset="0"
+           style="stop-color:#000000"
+           id="stop17" />
+        <stop
+           offset="1"
+           style="stop-color:#5c5c5c"
+           id="stop19" />
+      </linearGradient>
+    </defs>
+    <path
+       style="stroke:#000000; stroke-width:1; fill-rule:evenodd; fill:url(#1)"
+       d="M 5.24084 105.241L 280.241 105.241L 280.241 135.241L 5.24084 135.241L 5.24084 105.241z"
+       id="path21" />
+    <path
+       style="stroke:#000000; stroke-width:1; fill-rule:evenodd; fill:#ffffff"
+       d="M 5.24084 25.2408L 280.241 25.2408L 280.241 5.24084L 5.24084 5.24084L 5.24084 25.2408z"
+       id="path23" />
+    <path
+       style="stroke:none; fill-rule:evenodd; fill:#cccccc"
+       d="M 280.141 9.44084L 280.741 9.44084L 280.741 8.84085L 280.141 8.84085L 280.141 9.44084z"
+       id="path25" />
+    <path
+       style="stroke:none; fill-rule:evenodd; fill:#cccccc"
+       d="M 280.141 28.6408L 280.741 28.6408L 280.741 28.0408L 280.141 28.0408L 280.141 28.6408z"
+       id="path27" />
+    <path
+       style="stroke:#000000; stroke-width:1; fill-rule:evenodd; fill:#cccccc"
+       d="M 5.24084 45.2408L 280.241 45.2408L 280.241 25.2408L 5.24084 25.2408L 5.24084 45.2408z"
+       id="path29" />
+    <path
+       style="stroke:none; fill-rule:evenodd; fill:#cccccc"
+       d="M 280.141 47.8408L 280.741 47.8408L 280.741 47.2408L 280.141 47.2408L 280.141 47.8408z"
+       id="path31" />
+    <path
+       style="stroke:#000000; stroke-width:1; fill-rule:evenodd; fill:#a6ce39"
+       d="M 145.241 65.2408L 280.241 65.2408L 280.241 45.2408L 145.241 45.2408L 145.241 65.2408z"
+       id="path33" />
+    <path
+       style="stroke:none; fill-rule:evenodd; fill:#cccccc"
+       d="M 141.991 66.4407L 142.591 66.4407L 142.591 47.2408L 141.991 47.2408L 141.991 66.4407z"
+       id="path35" />
+    <path
+       style="stroke:#000000; stroke-width:1; fill-rule:evenodd; fill:#7f7f7f"
+       d="M 145.241 85.2408L 280.241 85.2408L 280.241 65.2408L 145.241 65.2408L 145.241 85.2408z"
+       id="path37" />
+    <path
+       style="stroke:none; fill-rule:evenodd; fill:#cccccc"
+       d="M 141.991 85.6406L 142.591 85.6406L 142.591 66.4407L 141.991 66.4407L 141.991 85.6406z"
+       id="path39" />
+    <path
+       style="stroke:#000000; stroke-width:1; fill-rule:evenodd; fill:#a6ce39"
+       d="M 5.24084 105.241L 145.241 105.241L 145.241 45.2408L 5.24084 45.2408L 5.24084 105.241z"
+       id="path41" />
+    <text
+       style="stroke:none; fill-rule:evenodd; fill:#ffffff; font-family:FreeSans; font-size:12.0"
+       transform="matrix(1 0 0 1 42.8948 78.8568)"
+       id="text43">
+Qtopia Core
+</text>
+    <path
+       style="stroke:#000000; stroke-width:1; fill-rule:evenodd; fill:#7f7f7f"
+       d="M 145.241 105.241L 280.241 105.241L 280.241 85.2408L 145.241 85.2408L 145.241 105.241z"
+       id="path45" />
+    <text
+       style="stroke:none; fill-rule:evenodd; fill:#000000; font-family:FreeSans; font-size:12.0"
+       transform="matrix(1 0 0 1 76.7108 18.8568)"
+       id="text47">
+Application Source Code
+</text>
+    <text
+       style="stroke:none; fill-rule:evenodd; fill:#000000; font-family:FreeSans; font-size:12.0"
+       transform="matrix(1 0 0 1 125.065 38.8568)"
+       id="text49">
+Qt API
+</text>
+    <text
+       style="stroke:none; fill-rule:evenodd; fill:#ffffff; font-family:FreeSans; font-size:12.0"
+       transform="matrix(1 0 0 1 194.063 60.2408)"
+       id="text51">
+Qt/X11
+</text>
+    <text
+       style="stroke:none; fill-rule:evenodd; fill:#ffffff; font-family:FreeSans; font-size:12.0"
+       transform="matrix(1 0 0 1 202.739 80.2408)"
+       id="text53">
+Xlib
+</text>
+    <text
+       style="stroke:none; fill-rule:evenodd; fill:#ffffff; font-family:FreeSans; font-size:12.0"
+       transform="matrix(1 0 0 1 166.397 98.8568)"
+       id="text55">
+X Window Server
+</text>
+    <defs
+       id="defs57">
+      <linearGradient
+         id="2"
+         x1="147.741"
+         y1="130.241"
+         x2="147.741"
+         y2="110.241"
+         gradientUnits="userSpaceOnUse">
+        <stop
+           offset="0"
+           style="stop-color:#3f3f3f"
+           id="stop60" />
+        <stop
+           offset="1"
+           style="stop-color:#5c5c5c"
+           id="stop62" />
+      </linearGradient>
+    </defs>
+    <path
+       style="stroke:none; fill-rule:evenodd; fill:url(#2)"
+       d="M 100.241 130.241L 110.241 110.241L 195.241 110.241L 185.241 130.241L 100.241 130.241z"
+       id="path64" />
+    <path
+       style="stroke:none; fill-rule:evenodd; fill:#c82121"
+       d="M 185.241 130.241L 195.241 110.241L 275.241 110.241L 275.241 130.241L 185.241 130.241z"
+       id="path66" />
+    <text
+       style="stroke:none; fill-rule:evenodd; fill:#ffffff; font-family:FreeSans; font-size:12.0"
+       transform="matrix(1 0 0 1 115.241 123.857)"
+       id="text68">
+Framebuffer
+</text>
+    <defs
+       id="defs70">
+      <linearGradient
+         id="3"
+         x1="57.7408"
+         y1="130.241"
+         x2="57.7408"
+         y2="110.241"
+         gradientUnits="userSpaceOnUse">
+        <stop
+           offset="0"
+           style="stop-color:#3f3f3f"
+           id="stop73" />
+        <stop
+           offset="1"
+           style="stop-color:#5c5c5c"
+           id="stop75" />
+      </linearGradient>
+    </defs>
+    <path
+       style="stroke:none; fill-rule:evenodd; fill:url(#3)"
+       d="M 10.2408 130.241L 10.2408 110.241L 105.241 110.241L 94.6852 130.241L 10.2408 130.241z"
+       id="path77" />
+    <text
+       style="stroke:none; fill-rule:evenodd; fill:#ffffff; font-family:FreeSans; font-size:12.0"
+       transform="matrix(1 0 0 1 20.2408 123.857)"
+       id="text79">
+Linux Kernel
+</text>
+    <g
+       id="g81">
+      <text
+         style="stroke:none; fill-rule:evenodd; fill:#ffffff; font-family:FreeSans; font-size:8"
+         transform="matrix(1 0 0 1 213.001 118.485)"
+         id="text83">
+Accelerated
+</text>
+      <text
+         style="stroke:none; fill-rule:evenodd; fill:#ffffff; font-family:FreeSans; font-size:8"
+         transform="matrix(1 0 0 1 218.117 127.641)"
+         id="text85">
+Graphics
+</text>
+    </g>
+  </g>
+</svg>
diff --git a/doc/src/diagrams/qtopiacore/qtopiacore-architecture.sk b/doc/src/diagrams/qtopiacore/qtopiacore-architecture.sk
new file mode 100644
index 0000000000..e670eac650
--- /dev/null
+++ b/doc/src/diagrams/qtopiacore/qtopiacore-architecture.sk
@@ -0,0 +1,136 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+bm(-1228916532,'clamshell-phone.png')
+im((17,498),-1228916532)
+fp((1,1,1))
+ft(0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(130,0,0,-40,364.61,761.65)
+fp((0.688,0.839,0.475))
+lw(1)
+r(130,0,0,-40,204.942,761.65)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QWS Server',(236.27,738.584))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Memory',(504.551,724.079))
+phs((0.349,0.349,0.349),(1,1,1),1,0,5,0.5)
+fp()
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(18.5714,0,0,-30,395.562,756.65)
+phs((0.349,0.349,0.349),(1,1,1),1,0,5,0.5)
+fp()
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(18.5714,0,0,-30,445.086,756.65)
+phs((0.349,0.349,0.349),(1,1,1),1,0,5,0.5)
+fp()
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(18.5714,0,0,-30,420.324,756.65)
+phs((0.349,0.349,0.349),(1,1,1),1,0,5,0.5)
+fp()
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(18.5714,0,0,-30,370.8,756.65)
+phs((0.349,0.349,0.349),(1,1,1),1,0,5,0.5)
+fp()
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(18.5714,0,0,-30,469.848,756.65)
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('2',(427.452,816.049))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(10,0,0,-10,430.124,820.297)
+G_()
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('3',(322.628,699.078))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(10,0,0,-10,325.3,703.826)
+G_()
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('1',(178.299,751.825))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(10,0,0,-10,181.299,755.709)
+G_()
+lw(1)
+b()
+bs(276.959,770.65,0)
+bc(276.959,770.65,86.959,790.65,346.959,810.65,2)
+lw(1)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(412.959,771.65,0)
+bc(412.959,771.65,602.959,791.65,342.959,811.65,2)
+fp((0.636,0.839,0.81))
+lw(1)
+r(130,0,0,-40,289.177,829.533)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QWS Client',(322.839,808.584))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(339.942,741.65,0)
+bs(358.589,741.65,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(166.646,741.65,0)
+bs(199.058,741.65,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(385,713,0)
+bs(385,695,0)
+le()
+lw(1)
+r(540.005,0,0,-59.2946,10.1647,575.005)
+G()
+fp((0.688,0.839,0.475))
+lw(1)
+r(15,0,0,-15,453.816,561.299)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Server side',(475.472,550.733))
+fp((0.636,0.839,0.81))
+lw(1)
+r(15,0,0,-15,453.816,541.299)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Client side',(475.472,530.733))
+G_()
+bm(-1229576468,'home-screen.png')
+im((295,560),-1229576468)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qtopiacore/qtopiacore-characterinputlayer.sk b/doc/src/diagrams/qtopiacore/qtopiacore-characterinputlayer.sk
new file mode 100644
index 0000000000..bcf52bb348
--- /dev/null
+++ b/doc/src/diagrams/qtopiacore/qtopiacore-characterinputlayer.sk
@@ -0,0 +1,118 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(264.98,607,0)
+bc(264.98,607,364.98,652,264.98,727,2)
+fp((0.688,0.839,0.475))
+lw(1)
+r(130,0,0,-40,194.98,772)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QWS Server',(226.308,748.934))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(239.98,607,0)
+bc(239.98,607,139.98,652,239.98,727,2)
+fp((0.688,0.839,0.475))
+lw(1)
+r(130,0,0,-40,194.98,602)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Keyboard Handler',(211.626,578.934))
+fp((0.812,0.906,0.651))
+lw(1)
+r(135,0,0,-20,260,667)
+fp((0.812,0.906,0.651))
+lw(1)
+r(135,0,0,-20,260,692)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Key pressed!',(29.968,564.616))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Start application',(357.968,747.616))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Keyboard Driver Factory',(263.809,653.934))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Keyboard Driver Plugin',(265.814,678.934))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(149.506,582,0)
+bs(189.98,582,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(351.454,752,0)
+bs(329.98,752,0)
+fp((1,1,1))
+lw(1)
+r(65,0,0,-45,164.98,692)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QWSEvent',(167.804,665.684))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(32.3079,0,0,-32.0833,90,632,0.0416667,0.0555556)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(32.3079,0,0,-32.0833,108.846,594.083,0.0416667,0.0555556)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(32.3079,0,0,-32.0833,127.692,632,0.0416667,0.0555556)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(26.9232,0,0,-26.25,92.6923,629.083,0.05,0.0714286)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(26.9232,0,0,-26.25,111.538,591.167,0.05,0.0714286)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(26.9232,0,0,-26.25,130.384,629.083,0.05,0.0714286)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(36)
+txt('J',(0.666667,0,0,0.666667,100,607.837))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(36)
+txt('GO!',(0.666667,0,0,0.666667,450.984,745.232))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(36)
+txt('M',(0.666667,0,0,0.666667,115,569.504))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(36)
+txt('K',(0.666667,0,0,0.666667,133.992,607.232))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qtopiacore/qtopiacore-client.sk b/doc/src/diagrams/qtopiacore/qtopiacore-client.sk
new file mode 100644
index 0000000000..e339a63d75
--- /dev/null
+++ b/doc/src/diagrams/qtopiacore/qtopiacore-client.sk
@@ -0,0 +1,51 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((0.688,0.839,0.475))
+lw(1)
+r(85,0,0,-40,9.99982,795)
+fp((0.636,0.839,0.81))
+lw(1)
+r(90,0,0,-40,135,795)
+fp((0.636,0.839,0.81))
+lw(1)
+r(90,0,0,-40,265,795)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QWSServer',(20.4958,771.934))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QWSClient',(150.33,771.934))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('UNIX Domain Socket',(191.636,687.616))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QApplication',(274.318,771.934))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(94.526,775,0)
+bs(135,775,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(224.526,775,0)
+bs(265,775,0)
+lw(1)
+ld((5, 5))
+b()
+bs(245,835,0)
+bs(245,705,0)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qtopiacore/qtopiacore-clientrendering.sk b/doc/src/diagrams/qtopiacore/qtopiacore-clientrendering.sk
new file mode 100644
index 0000000000..b37c5a696a
--- /dev/null
+++ b/doc/src/diagrams/qtopiacore/qtopiacore-clientrendering.sk
@@ -0,0 +1,166 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+G()
+fp((1,1,1))
+ft(0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(130,0,0,-40,264,675)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Memory',(351,620.252))
+phs((0.349,0.349,0.349),(1,1,1),1,0,5,0.5)
+fp()
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(18.5714,0,0,-30,294.952,670)
+phs((0.349,0.349,0.349),(1,1,1),1,0,5,0.5)
+fp()
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(18.5714,0,0,-30,344.476,670)
+phs((0.349,0.349,0.349),(1,1,1),1,0,5,0.5)
+fp()
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(18.5714,0,0,-30,319.714,670)
+phs((0.349,0.349,0.349),(1,1,1),1,0,5,0.5)
+fp()
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(18.5714,0,0,-30,270.19,670)
+phs((0.349,0.349,0.349),(1,1,1),1,0,5,0.5)
+fp()
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(18.5714,0,0,-30,369.238,670)
+G_()
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(393.5,734,0)
+bc(393.5,734,681.5,699.384,393.5,659,2)
+lw(1)
+b()
+bs(332.018,759,0)
+bc(332.018,759,142.018,779,402.018,799,2)
+lw(1)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(468.018,760,0)
+bc(468.018,760,658.018,780,398.018,800,2)
+fp((0.636,0.839,0.81))
+lw(1)
+r(130,0,0,-40,264,749.636)
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('2',(270.328,691.752))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(10,0,0,-10,273,696)
+G_()
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('3',(412.328,641.252))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(10,0,0,-10,415,646)
+G_()
+fp((0.688,0.839,0.475))
+lw(1)
+r(130,0,0,-40,99,748.939)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QWS Server',(130.328,725.873))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Client Application',(281.3,726.57))
+fp((0.772,0.913,0.89))
+lw(1)
+r(130,0,0,-21,334,829)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Decoration Plugin',(351.648,815.434))
+fp((0.772,0.913,0.89))
+lw(1)
+r(130,0,0,-21,334,800)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Decoration Factory',(348.318,786.434))
+fp((0.772,0.913,0.89))
+lw(1)
+r(130,0,0,-40,414,749.636)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Decoration',(449.99,726.57))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Something happened!',(1,682.116))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(69,729,0)
+bs(94,729,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(228.526,719,0)
+bs(264,719,0)
+lw(1)
+ld((4, 4))
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(264,734,0)
+bs(228.526,734,0)
+G()
+lw(1)
+b()
+bs(43.5002,769.5,0)
+bs(43.5002,769.5,0)
+bs(68.5,769.5,0)
+bs(58.5,719.5,0)
+bs(53.5,719.5,0)
+bs(43.5002,769.5,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(7.5,0,0,-7.5,56,707)
+G_()
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(334,709,0)
+bs(334,679,0)
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('1',(108.164,757.934))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(10,0,0,-10,111,762)
+G_()
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qtopiacore/qtopiacore-clientservercommunication.sk b/doc/src/diagrams/qtopiacore/qtopiacore-clientservercommunication.sk
new file mode 100644
index 0000000000..4f8bcb6a6a
--- /dev/null
+++ b/doc/src/diagrams/qtopiacore/qtopiacore-clientservercommunication.sk
@@ -0,0 +1,130 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+b()
+bs(236.982,752,0)
+bc(236.982,752,46.9824,772,306.982,792,2)
+lw(1)
+ld((5, 5))
+b()
+bs(236.982,704,0)
+bc(236.982,704,46.9824,684,306.982,664,2)
+lw(1)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(372.982,753,0)
+bc(372.982,753,562.982,773,302.982,793,2)
+lw(1)
+ld((5, 5))
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(372.982,703,0)
+bc(372.982,703,562.982,683,302.982,663,2)
+fp((0.688,0.839,0.475))
+lw(1)
+r(130,0,0,-40,130,748)
+fp((0.636,0.839,0.81))
+lw(1)
+r(130,0,0,-40,350,748)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QWS Server',(161.328,724.934))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Something happened!',(10,679.252))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QWS Client',(383.662,724.934))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Top-level Windows',(380,795.616))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(265,728,0)
+bs(345,728,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(90,728,0)
+bs(125,728,0)
+G()
+lw(1)
+b()
+bs(55,768,0)
+bs(55,768,0)
+bs(80,768,0)
+bs(70,718,0)
+bs(65,718,0)
+bs(55,768,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(7.5,0,0,-7.5,67.5,705.5)
+G_()
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('1',(102,740.116))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(10,0,0,-10,105,744)
+G_()
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('2',(202.328,793.752))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(10,0,0,-10,205,798)
+G_()
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('3',(277.328,739.252))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(10,0,0,-10,280,744)
+G_()
+fp((0.812,0.906,0.651))
+lw(1)
+r(130,0,0,-18,240,673)
+fp((0.812,0.906,0.651))
+lw(1)
+r(130,0,0,-18,240,698)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Input Method Filter',(254.65,684.934))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Keyboard Filter',(263.32,658.934))
+fp((0.887,0.946,0.764))
+lw(1)
+r(130,0,0,40,225,788)
+fp((0.887,0.946,0.764))
+lw(1)
+r(130,0,0,40,235,778)
+fp((0.812,0.906,0.651))
+lw(1)
+r(130,0,0,40,245,768)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qtopiacore/qtopiacore-drawingonscreen.sk b/doc/src/diagrams/qtopiacore/qtopiacore-drawingonscreen.sk
new file mode 100644
index 0000000000..58d7c28176
--- /dev/null
+++ b/doc/src/diagrams/qtopiacore/qtopiacore-drawingonscreen.sk
@@ -0,0 +1,144 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+b()
+bs(117.018,750,0)
+bc(117.018,750,-72.9824,770,187.018,790,2)
+lw(1)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(253.018,751,0)
+bc(253.018,751,443.018,771,183.018,791,2)
+fp((0.688,0.839,0.475))
+lw(1)
+r(-130,0,0,-40,335,740)
+fp((0.772,0.913,0.89))
+lw(1)
+r(-130,0,0,-40,510,740)
+fp((0.688,0.839,0.475))
+lw(1)
+r(-130,0,0,-40,160,740)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Screen Driver',(233.328,716.934))
+fp((0.812,0.906,0.651))
+lw(1)
+r(-130,0,0,-21,245,817.232)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Screen Plugin',(142.65,803.484))
+fp((0.812,0.906,0.651))
+lw(1)
+r(-130,0,0,-21,245,791)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Screen Factory',(139.32,777.434))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QWS Server',(61.328,716.934))
+fp((1,1,1))
+ft(0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(130,0,0,-40,380,670)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Memory',(465,611.252))
+phs((0.349,0.349,0.349),(1,1,1),1,0,5,0.5)
+fp()
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(18.5714,0,0,-30,410.952,665)
+phs((0.349,0.349,0.349),(1,1,1),1,0,5,0.5)
+fp()
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(18.5714,0,0,-30,460.476,665)
+phs((0.349,0.349,0.349),(1,1,1),1,0,5,0.5)
+fp()
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(18.5714,0,0,-30,435.714,665)
+phs((0.349,0.349,0.349),(1,1,1),1,0,5,0.5)
+fp()
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(18.5714,0,0,-30,386.19,665)
+phs((0.349,0.349,0.349),(1,1,1),1,0,5,0.5)
+fp()
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(18.5714,0,0,-30,485.238,665)
+le()
+lw(1)
+r(530,0,0,-270,10,830)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(160,720,0)
+bs(205,720,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(335,720,0)
+bs(380,720,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(380,650,0)
+bs(335,650,0)
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('2',(354.828,735.752))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(10,0,0,-10,357.5,740)
+G_()
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('3',(354.828,660.252))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(10,0,0,-10,357.5,665)
+G_()
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('1',(181.862,735.939))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(10,0,0,-10,185,740)
+G_()
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('Window Surface',(401.32,716.934))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(450,700,0)
+bs(450,670,0)
+bm(-1229773172,'launcher.png')
+im((0.35,0,0,0.35,241,573),-1229773172)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qtopiacore/qtopiacore-opengl.sk b/doc/src/diagrams/qtopiacore/qtopiacore-opengl.sk
new file mode 100644
index 0000000000..96076edadf
--- /dev/null
+++ b/doc/src/diagrams/qtopiacore/qtopiacore-opengl.sk
@@ -0,0 +1,38 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((0.704,0.775,0.846))
+le()
+lw(1)
+e(100,0,0,-32.5,175,795)
+fp((0.545,0.819,0.302))
+le()
+lw(1)
+r(120,0,0,-30,210,780)
+fp((0.545,0.819,0.302))
+le()
+lw(1)
+r(120,0,0,-30,15,780)
+fp((0.309,0.309,0.309))
+le()
+lw(1)
+Fn('Helvetica')
+txt('OpenGL',(52.32,761.934))
+fp((0.309,0.309,0.309))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Q Window System',(220.656,761.934))
+fp((0.369,0.369,0.369))
+le()
+lw(1)
+Fn('Helvetica')
+txt('EGL',(160.988,807.616))
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+txt('(Native Platform Graphics Interface)',(79.306,791.934))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qtopiacore/qtopiacore-pointerhandlinglayer.sk b/doc/src/diagrams/qtopiacore/qtopiacore-pointerhandlinglayer.sk
new file mode 100644
index 0000000000..8d3886402f
--- /dev/null
+++ b/doc/src/diagrams/qtopiacore/qtopiacore-pointerhandlinglayer.sk
@@ -0,0 +1,94 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(250,625,0)
+bc(250,625,350,670,250,745,2)
+fp((0.688,0.839,0.475))
+lw(1)
+r(130,0,0,-40,180,790)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QWS Server',(211.328,766.934))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(225,625,0)
+bc(225,625,125,670,225,745,2)
+fp((0.688,0.839,0.475))
+lw(1)
+r(130,0,0,-40,180,620)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Mouse Handler',(204.32,596.934))
+fp((0.812,0.906,0.651))
+lw(1)
+r(130,0,0,-20,245,685)
+fp((0.812,0.906,0.651))
+lw(1)
+r(130,0,0,-20,245,710)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Pointer pressed!',(22.592,582.616))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Mouse Driver Factory',(252.658,671.934))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Mouse Driver Plugin',(255.988,696.934))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(134.526,600,0)
+bs(175,600,0)
+fp((1,1,1))
+lw(1)
+r(65,0,0,-43.5,150,708.5)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QWSEvent',(152.824,683.684))
+lw(1)
+lc(2)
+lj(1)
+b()
+bs(95,595,0)
+bs(105,605,0)
+bs(125,580,0)
+bs(135,590,0)
+bs(115,615,0)
+bs(125,625,0)
+bs(95,625,0)
+bs(95,595,0)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Start application',(343.039,762.252))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(336.525,766.636,0)
+bs(315.051,766.636,0)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(36)
+txt('GO!',(0.666667,0,0,0.666667,440,760))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qtopiacore/qtopiacore-reserveregion.sk b/doc/src/diagrams/qtopiacore/qtopiacore-reserveregion.sk
new file mode 100644
index 0000000000..04f9c9904a
--- /dev/null
+++ b/doc/src/diagrams/qtopiacore/qtopiacore-reserveregion.sk
@@ -0,0 +1,89 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((1,1,1))
+lw(1)
+e(10,0,0,-10,365,625)
+fp((1,1,1))
+lw(1)
+e(10,0,0,-10,195,630)
+fp((1,1,1))
+lw(1)
+e(10,0,0,-10,235,755)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(171.344,700,0)
+bc(171.344,700,25.7042,670,225,640,2)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(403.656,700,0)
+bc(403.656,700,549.296,670,350,640,2)
+fp((0.636,0.839,0.81))
+lw(1)
+r(130,0,0,-40,150,740)
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('2',(232.328,750.752))
+fp((0.688,0.839,0.475))
+lw(1)
+r(130,0,0,-40,150,810)
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('QWS Server',(181.328,786.934))
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('Client Application',(168.65,716.934))
+fp((0.772,0.913,0.89))
+lw(1)
+r(130,0,0,-40,45,660)
+fp((0.772,0.913,0.89))
+lw(1)
+r(130,0,0,-40,305,740)
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('Direct Painter',(73.658,636.934))
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('Widget',(351.328,716.934))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(280,720,0)
+bs(300,720,0)
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('1',(191.862,625.939))
+fp((0,0,0))
+lw(1)
+Fn('Helvetica')
+txt('3',(362.328,620.252))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(215,770,0)
+bs(215,767.272,0)
+bs(215,740,0)
+lw(1)
+ld((5, 5))
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(205,740,0)
+bs(205,742.728,0)
+bs(205,770,0)
+le()
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(440,0,0,-260,30,820)
+bm(-1229732052,'launcher.png')
+im((0.45,0,0,0.45,232,541),-1229732052)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qtopiacore/qtopiacore-setwindowattribute.sk b/doc/src/diagrams/qtopiacore/qtopiacore-setwindowattribute.sk
new file mode 100644
index 0000000000..78d705dff0
--- /dev/null
+++ b/doc/src/diagrams/qtopiacore/qtopiacore-setwindowattribute.sk
@@ -0,0 +1,102 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((1,1,1))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(10,0,0,-10,430,725)
+fp((1,1,1))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(10,0,0,-10,340,810)
+fp((1,1,1))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(10,0,0,-10,140,760)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(228.165,800,0)
+bc(228.165,800,91.5416,775,278.5,750,2)
+fp((0.636,0.839,0.81))
+lw(1)
+r(130,0,0,-40,195,820)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('2',(337.328,805.752))
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('3',(277.328,720.252))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(10,0,0,-10,280,725)
+G_()
+fp((0.688,0.839,0.475))
+lw(1)
+r(130,0,0,-40,20,820)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QWS Server',(51.328,796.934))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Client Application',(213.65,796.934))
+fp((0.772,0.913,0.89))
+lw(1)
+r(130,0,0,-40,280,770)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Widget',(326.328,746.934))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(150,800,0)
+bs(193.765,800,0)
+lw(1)
+ld((4, 4))
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(187.882,810,0)
+bs(151.235,810,0)
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(420,745,0)
+bs(445,745,0)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('1',(136.862,755.939))
+fp((1,1,1))
+lw(1)
+r(95,0,0,-25,240,740)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Paint On Screen',(243.478,724.434))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('3',(427.328,720.252))
+le()
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+r(570,0,0,-140,10,830)
+bm(-1229691508,'launcher.png')
+im((0.35,0,0,0.35,455,713),-1229691508)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qtopiacore/qtopiacore-vanilla.sk b/doc/src/diagrams/qtopiacore/qtopiacore-vanilla.sk
new file mode 100644
index 0000000000..73a99370df
--- /dev/null
+++ b/doc/src/diagrams/qtopiacore/qtopiacore-vanilla.sk
@@ -0,0 +1,43 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((0.545,0.819,0.302))
+le()
+lw(1)
+r(370,0,0,-65,20,795)
+fp((0.309,0.309,0.309))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Q Window System',(286.312,737.616))
+fp((0.467,0.555,0.644))
+le()
+lw(1)
+e(150,0,0,-37.5,200,795)
+fp((0.704,0.775,0.846))
+le()
+lw(1)
+e(92.5,0,0,-25,167.5,800)
+fp((0.369,0.369,0.369))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Vanilla EGL Implementation',(101.272,800.626))
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+txt('(Hybrid Graphics Ltd.)',(115,787.616))
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Qtopia Core',(265,800.626))
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+txt('interface',(274.336,787.616))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qtreeview.png b/doc/src/diagrams/qtreeview.png
new file mode 100644
index 0000000000..05a70bf254
--- /dev/null
+++ b/doc/src/diagrams/qtreeview.png
diff --git a/doc/src/diagrams/qtscript-calculator.png b/doc/src/diagrams/qtscript-calculator.png
new file mode 100644
index 0000000000..9ab824f21a
--- /dev/null
+++ b/doc/src/diagrams/qtscript-calculator.png
diff --git a/doc/src/diagrams/qtscript-context2d.png b/doc/src/diagrams/qtscript-context2d.png
new file mode 100644
index 0000000000..d3ad995b82
--- /dev/null
+++ b/doc/src/diagrams/qtscript-context2d.png
diff --git a/doc/src/diagrams/qtwizard-page.sk b/doc/src/diagrams/qtwizard-page.sk
new file mode 100644
index 0000000000..bd7b9ef5eb
--- /dev/null
+++ b/doc/src/diagrams/qtwizard-page.sk
@@ -0,0 +1,144 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+bm(1089094028,'/tmp/wizard2.png')
+im((-71.3622,789.945),1089094028)
+bm(1083700940,'qtwizard-page.png')
+im((45.535,207.627),1083700940)
+lp((1,0,0))
+lw(1.5)
+r(158.372,0,0,-22.6246,57.6554,643.69,0.0680272,0.487805)
+lp((1,0,0))
+lw(1.5)
+r(165.372,0,0,-22.6246,131.655,1241.69,0.0680272,0.487805)
+lp((1,0,0))
+lw(1.5)
+r(384.08,0,0,-39.8624,72.5035,624.062,0.0680272,0.487805)
+lp((1,0,0))
+lw(1.5)
+r(419.371,0,0,-39.8624,141.212,1197.06,0.0680272,0.487805)
+fp((1,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+Fs(18)
+txt('title',(-19.9279,627.778))
+fp((1,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+Fs(18)
+txt('title',(-111.95,1225.78))
+fp((0.064,0.45,0.228))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+Fs(18)
+txt('banner',(587.072,627.778))
+fp((0.064,0.45,0.228))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+Fs(18)
+txt('logo',(587.072,601.278))
+fp((1,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+Fs(18)
+txt('subtitle',(-51.9319,599.532))
+fp((1,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+Fs(18)
+txt('subtitle',(1.06195,0,0,1,-147.919,1172.53))
+lp((0.064,0.45,0.228))
+lw(1.5)
+r(61.1473,0,0,-57.6388,476.211,642.073,0.123333,0.130841)
+lp((0.064,0.45,0.228))
+lw(1.5)
+r(494.509,0,0,-69.4899,52.5723,647.764,0.0217865,0.155038)
+lp((1,0,0))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(18.3317,632.377,0)
+bs(55.5006,632.377,0)
+bs(55.5006,632.377,0)
+bs(55.5006,632.377,0)
+lp((1,0,0))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(-67.6683,1230.38,0)
+bs(129.501,1230.38,0)
+bs(129.501,1230.38,0)
+bs(129.501,1230.38,0)
+lp((0.064,0.45,0.228))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(577.821,632.377,0)
+bs(549.809,632.377,0)
+lp((0.064,0.45,0.228))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(577.821,605.877,0)
+bs(539.809,605.877,0)
+lp((1,0,0))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(19.1741,604.131,0)
+bs(69.8101,604.131,0)
+bs(69.8101,604.131,0)
+bs(69.8101,604.131,0)
+lp((1,0,0))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(-66.9213,1177.13,0)
+bs(135.351,1177.13,0)
+bs(135.351,1177.13,0)
+bs(135.351,1177.13,0)
+G()
+fp((0.064,0.45,0.228))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+Fs(18)
+txt('watermark',(-77.9599,415.278))
+lp((0.064,0.45,0.228))
+lw(1.5)
+r(162.143,0,0,-304.355,52.3374,571.575,0.0664452,0.0353982)
+lp((0.064,0.45,0.228))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(19.8675,419.877,0)
+bs(49.8789,419.877,0)
+bs(49.8789,419.877,0)
+bs(49.8789,419.877,0)
+G_()
+fp((0.064,0.45,0.228))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+Fs(18)
+txt('background',(-182.96,1038.55))
+lp((0.064,0.45,0.228))
+lw(1.5)
+r(239.143,0,0,-345.855,-34.1627,1216.07,0.0664452,0.0353982)
+lp((0.064,0.45,0.228))
+lw(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(-66.6325,1043.15,0)
+bs(-36.6211,1043.15,0)
+bs(-36.6211,1043.15,0)
+bs(-36.6211,1043.15,0)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,10000,10000),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qwsserver_keyboardfilter.sk b/doc/src/diagrams/qwsserver_keyboardfilter.sk
new file mode 100644
index 0000000000..3ac0f805aa
--- /dev/null
+++ b/doc/src/diagrams/qwsserver_keyboardfilter.sk
@@ -0,0 +1,39 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(1)
+b()
+bs(78.195,794,0)
+bc(78.195,794,-115.245,809.5,149.463,825,2)
+lw(1)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(216.804,795,0)
+bc(216.804,795,410.246,810,145.537,825,2)
+fp((0.688,0.839,0.475))
+lw(1)
+r(130,0,0,-40,10,790)
+fp((0.636,0.839,0.81))
+lw(1)
+r(130,0,0,-40,155,790)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Qtopia Core Server',(23.316,766.934))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Qtopia Core Client',(170.65,766.934))
+fp((0.812,0.906,0.651))
+lw(1)
+r(130,0,0,-18,80,830)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Keyboard Filter',(103.32,815.934))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/resources.sk b/doc/src/diagrams/resources.sk
new file mode 100644
index 0000000000..a679205118
--- /dev/null
+++ b/doc/src/diagrams/resources.sk
@@ -0,0 +1,125 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lw(5)
+la2(([(-6.0, 3.0), (-5.0, 0.0, 0.0, 0.0, 1.0, 0.0), (0.0, 0.0, -5.0, 0.0, -6.0, -3.0)], 0))
+b()
+bs(266.638,603.695,0)
+bs(344.138,603.695,0)
+G()
+fp((0.727,0.843,1))
+lw(1)
+r(150,0,0,-20,90.5128,722.445)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('application.pro',(126.495,708.445))
+fp((0.727,0.843,1))
+lw(1)
+r(150,0,0,-20,90.5128,694.945)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('application.qrc',(126.831,680.945))
+fp((0.727,0.843,1))
+lw(1)
+r(150,0,0,-20,90.5128,667.445)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('main.cpp',(141.171,653.445))
+fp((0.727,0.843,1))
+lw(1)
+r(150,0,0,-20,90.5128,639.445)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('mainwindow.cpp',(121.167,625.445))
+fp((0.727,0.843,1))
+lw(1)
+r(150,0,0,-20,90.5128,612.445)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('mainwindow.h',(127.503,598.445))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Times-Roman')
+txt('. . .',(0.000374682,-1,1,0.000374682,162.714,532.24))
+fp((1,0.756,0.576))
+lw(1)
+r(150,0,0,-20,90.5128,585)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('images/copy.png',(120.159,571))
+fp((1,0.756,0.576))
+lw(1)
+r(150,0,0,-20,90.5128,557.445)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('images/cut.png',(124.827,543.445))
+fp((1,0.756,0.576))
+lw(1)
+r(150,0,0,-20,90.5128,514.945)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('images/save.png',(120.159,500.945))
+G_()
+fp((0.941,0.941,0.941))
+lw(1)
+r(178,0,0,-154.5,370.138,671.945)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(18)
+txt('application.exe',(399.108,647.929))
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Times-Roman')
+txt('. . .',(0.000374682,-1,1,0.000374682,458.951,572.295))
+fp((1,0.756,0.576))
+lw(1)
+r(150,0,0,-20,385,625.055)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt(':/images/copy.png',(411.31,611.055))
+fp((1,0.756,0.576))
+lw(1)
+r(150,0,0,-20,385,597.5)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt(':/images/cut.png',(415.978,583.5))
+fp((1,0.756,0.576))
+lw(1)
+r(150,0,0,-20,385,555)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt(':/images/save.png',(411.31,541))
+G_()
+le()
+lw(1)
+r(482.5,0,0,-252.5,80,735)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/shapedclock.sk b/doc/src/diagrams/shapedclock.sk
new file mode 100644
index 0000000000..ba3b02018a
--- /dev/null
+++ b/doc/src/diagrams/shapedclock.sk
@@ -0,0 +1,46 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+bm(-1214279092,'clock.png')
+im((30,697.5),-1214279092)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(10)
+txt('frameGeometry().topLeft()',(23.86,822.07))
+fp((0,0,0))
+lp((0.631,0,0))
+lw(2)
+Fn('Helvetica')
+Fs(10)
+txt('event->globalPos()',(92.5,767.07))
+lp((0.631,0,0))
+lw(1)
+lc(2)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(25,817.5,0)
+bs(87.5,765,0)
+lw(1)
+ld((1, 1))
+b()
+bs(25,817.5,0)
+bs(32.5,817.5,0)
+lw(1)
+ld((1, 1))
+b()
+bs(25,817.5,0)
+bs(25,810,0)
+fp((0.631,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(10)
+txt('dragPosition',(0.758173,-0.652054,0.652054,0.758173,38.8498,810.656))
+le()
+lw(1)
+r(177.5,0,0,-152.5,10,840)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/sharedmodel-tableviews.zip b/doc/src/diagrams/sharedmodel-tableviews.zip
new file mode 100644
index 0000000000..5a62f021aa
--- /dev/null
+++ b/doc/src/diagrams/sharedmodel-tableviews.zip
diff --git a/doc/src/diagrams/sharedselection-tableviews.zip b/doc/src/diagrams/sharedselection-tableviews.zip
new file mode 100644
index 0000000000..b591e19c75
--- /dev/null
+++ b/doc/src/diagrams/sharedselection-tableviews.zip
diff --git a/doc/src/diagrams/standard-views.sk b/doc/src/diagrams/standard-views.sk
new file mode 100644
index 0000000000..d67a603944
--- /dev/null
+++ b/doc/src/diagrams/standard-views.sk
@@ -0,0 +1,16 @@
+##Sketch 1 2
+document()
+layout('A3',1)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((1,1,1))
+le()
+lw(1)
+r(845,0,0,-240,70,310)
+bm(-1090754548,'gallery-images/plastique-listview.png')
+im((80,82),-1090754548)
+bm(-1090737652,'gallery-images/plastique-treeview.png')
+im((360,82),-1090737652)
+bm(-1090629812,'gallery-images/plastique-tableview.png')
+im((640,82),-1090629812)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/standarddialogs-example.png b/doc/src/diagrams/standarddialogs-example.png
new file mode 100644
index 0000000000..73a8e8ae13
--- /dev/null
+++ b/doc/src/diagrams/standarddialogs-example.png
diff --git a/doc/src/diagrams/standarddialogs-example.zip b/doc/src/diagrams/standarddialogs-example.zip
new file mode 100644
index 0000000000..109b69ec03
--- /dev/null
+++ b/doc/src/diagrams/standarddialogs-example.zip
diff --git a/doc/src/diagrams/stylesheet/coffee-plastique.png b/doc/src/diagrams/stylesheet/coffee-plastique.png
new file mode 100644
index 0000000000..7da1fdc439
--- /dev/null
+++ b/doc/src/diagrams/stylesheet/coffee-plastique.png
diff --git a/doc/src/diagrams/stylesheet/coffee-windows.png b/doc/src/diagrams/stylesheet/coffee-windows.png
new file mode 100644
index 0000000000..9083a07677
--- /dev/null
+++ b/doc/src/diagrams/stylesheet/coffee-windows.png
diff --git a/doc/src/diagrams/stylesheet/coffee-xp.png b/doc/src/diagrams/stylesheet/coffee-xp.png
new file mode 100644
index 0000000000..4188a23022
--- /dev/null
+++ b/doc/src/diagrams/stylesheet/coffee-xp.png
diff --git a/doc/src/diagrams/stylesheet/pagefold.png b/doc/src/diagrams/stylesheet/pagefold.png
new file mode 100644
index 0000000000..b479d4d311
--- /dev/null
+++ b/doc/src/diagrams/stylesheet/pagefold.png
diff --git a/doc/src/diagrams/stylesheet/pagefold.svg b/doc/src/diagrams/stylesheet/pagefold.svg
new file mode 100644
index 0000000000..5f20e2edb7
--- /dev/null
+++ b/doc/src/diagrams/stylesheet/pagefold.svg
@@ -0,0 +1,1678 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="/home/qt/dev/qt/doc/src/diagrams/stylesheet"
+   sodipodi:docname="pagefold.svg"
+   inkscape:export-filename="c:\lineedit.png"
+   inkscape:export-xdpi="18.619444"
+   inkscape:export-ydpi="18.619444">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2650">
+      <stop
+         style="stop-color:#8b8b8b;stop-opacity:1;"
+         offset="0"
+         id="stop2652" />
+      <stop
+         style="stop-color:#8b8b8b;stop-opacity:0;"
+         offset="1"
+         id="stop2654" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2530">
+      <stop
+         id="stop2532"
+         offset="0"
+         style="stop-color:#fafafa;stop-opacity:0.74509805;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.37254903;"
+         offset="1"
+         id="stop2536" />
+      <stop
+         id="stop2534"
+         offset="1"
+         style="stop-color:#666666;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2287">
+      <stop
+         id="stop2289"
+         offset="0"
+         style="stop-color:#dfbbbb;stop-opacity:1;" />
+      <stop
+         id="stop2291"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient14054">
+      <stop
+         id="stop14056"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop14058"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11371">
+      <stop
+         id="stop11373"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop11375"
+         offset="1"
+         style="stop-color:#611a02;stop-opacity:0.88659793;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11290">
+      <stop
+         id="stop11292"
+         offset="0"
+         style="stop-color:#c8c8c8;stop-opacity:0.86666667;" />
+      <stop
+         id="stop11294"
+         offset="1"
+         style="stop-color:#ded5cf;stop-opacity:0.86274511;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient10355">
+      <stop
+         id="stop10357"
+         offset="0"
+         style="stop-color:#eeeae6;stop-opacity:0.86274511;" />
+      <stop
+         id="stop10359"
+         offset="1"
+         style="stop-color:white;stop-opacity:0.86666667;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8520">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop8522" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop8524" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8477">
+      <stop
+         style="stop-color:#ded5cf;stop-opacity:0.86274511;"
+         offset="0"
+         id="stop8479" />
+      <stop
+         style="stop-color:white;stop-opacity:0.86666667;"
+         offset="1"
+         id="stop8481" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6598">
+      <stop
+         style="stop-color:#d0c7c7;stop-opacity:0.84705883;"
+         offset="0"
+         id="stop6600" />
+      <stop
+         id="stop6606"
+         offset="0.5"
+         style="stop-color:#997e7e;stop-opacity:0.42352942;" />
+      <stop
+         style="stop-color:#887f7f;stop-opacity:0;"
+         offset="1"
+         id="stop6602" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6584">
+      <stop
+         style="stop-color:#887f7f;stop-opacity:0.84705883;"
+         offset="0"
+         id="stop6586" />
+      <stop
+         style="stop-color:#887f7f;stop-opacity:0.84705883;"
+         offset="1"
+         id="stop6588" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6569">
+      <stop
+         style="stop-color:#d8cfcf;stop-opacity:0.11340206;"
+         offset="0"
+         id="stop6571" />
+      <stop
+         style="stop-color:#9f9f9f;stop-opacity:0.84705883;"
+         offset="1"
+         id="stop6573" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5655">
+      <stop
+         id="stop5657"
+         offset="0"
+         style="stop-color:#795e5e;stop-opacity:1;" />
+      <stop
+         id="stop5659"
+         offset="1"
+         style="stop-color:#170000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4756">
+      <stop
+         style="stop-color:#dfc8c8;stop-opacity:1;"
+         offset="0"
+         id="stop4758" />
+      <stop
+         style="stop-color:#f7f7f7;stop-opacity:1;"
+         offset="1"
+         id="stop4760" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7289">
+      <stop
+         id="stop7291"
+         offset="0"
+         style="stop-color:#616161;stop-opacity:1;" />
+      <stop
+         id="stop7293"
+         offset="1"
+         style="stop-color:white;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4599">
+      <stop
+         style="stop-color:#616161;stop-opacity:1;"
+         offset="0"
+         id="stop4601" />
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="1"
+         id="stop4603" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3671">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop3673" />
+      <stop
+         style="stop-color:#e8e6fc;stop-opacity:0;"
+         offset="1"
+         id="stop3675" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2760">
+      <stop
+         style="stop-color:#ffc476;stop-opacity:1;"
+         offset="0"
+         id="stop2762" />
+      <stop
+         style="stop-color:#fcf95c;stop-opacity:1;"
+         offset="1"
+         id="stop2764" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4599"
+       id="linearGradient4605"
+       x1="743.97229"
+       y1="10.354198"
+       x2="665.18542"
+       y2="103.28822"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6584"
+       id="radialGradient6596"
+       cx="56.730461"
+       cy="175.79576"
+       fx="56.730461"
+       fy="175.79576"
+       r="33.814732"
+       gradientTransform="matrix(-2.331063e-2,0.911966,-0.685725,-1.752744e-2,186.5197,128.41)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="linearGradient6604"
+       x1="39.926405"
+       y1="177.065"
+       x2="63.861485"
+       y2="207.90289"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6569"
+       id="radialGradient7498"
+       cx="73.741135"
+       cy="177.065"
+       fx="73.741135"
+       fy="177.065"
+       r="39.288086"
+       gradientTransform="matrix(1,0,0,0.987144,0,2.276301)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6569"
+       id="radialGradient7532"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.987144,0,2.276301)"
+       cx="73.741135"
+       cy="177.065"
+       fx="73.741135"
+       fy="177.065"
+       r="39.288086" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="linearGradient7560"
+       gradientUnits="userSpaceOnUse"
+       x1="39.926405"
+       y1="177.065"
+       x2="63.861485"
+       y2="207.90289" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6584"
+       id="radialGradient7562"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.331063e-2,0.911966,-0.685725,-1.752744e-2,186.5197,128.41)"
+       cx="56.730461"
+       cy="175.79576"
+       fx="56.730461"
+       fy="175.79576"
+       r="33.814732" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11290"
+       id="linearGradient11306"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.718783,0,0,1.40468,-208.8971,-30.27314)"
+       x1="331.16711"
+       y1="199.51926"
+       x2="331.16711"
+       y2="177.27299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8520"
+       id="linearGradient11310"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.986928,0,0,1,8.175633,-10.42983)"
+       x1="358.32635"
+       y1="172.3678"
+       x2="358.32635"
+       y2="177.58272" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10355"
+       id="linearGradient11314"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.718783,0,0,1.40468,-211.1668,-83.31197)"
+       x1="331.16711"
+       y1="199.51926"
+       x2="331.16711"
+       y2="177.27299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8520"
+       id="linearGradient11318"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.986928,0,0,1,8.324065,-66.639)"
+       x1="358.32635"
+       y1="172.3678"
+       x2="358.32635"
+       y2="177.58272" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8477"
+       id="linearGradient11328"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.718783,0,0,1.40468,-211.0184,-139.5212)"
+       x1="331.16711"
+       y1="199.51926"
+       x2="331.16711"
+       y2="177.27299" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11371"
+       id="radialGradient11369"
+       cx="58.5"
+       cy="327.36218"
+       fx="58.5"
+       fy="327.36218"
+       r="29.5"
+       gradientTransform="matrix(1,0,0,0.983051,0,5.548512)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6569"
+       id="linearGradient14052"
+       x1="216"
+       y1="342.36218"
+       x2="176"
+       y2="297.36218"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2287"
+       id="linearGradient2285"
+       x1="328"
+       y1="282.86218"
+       x2="328"
+       y2="358.86218"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.655738,0,0,0.625,102.418,113.1983)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2528"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5"
+       gradientTransform="matrix(1,0,0,1.058824,-6.299127e-14,-21.31542)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2540"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,-2.288447e-14,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2544"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,-4.936329e-14,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2548"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,-5.097311e-14,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2552"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,-6.823707e-14,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2556"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,-7.367717e-14,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2560"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,-3.060052e-14,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2564"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,-6.49064e-14,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2568"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,-8.000546e-14,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2572"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,-1.133121e-13,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2586"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,7.160949e-15,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2588"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,9.328648e-14,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2590"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,7.746581e-14,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2592"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,8.586184e-14,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2594"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,1.825207e-13,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2596"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,4.617141e-14,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2598"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,1.225548e-13,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2600"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,8.193448e-14,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2602"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,4.961308e-14,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2604"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,2.60764e-14,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2616"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,4.556079e-14,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2618"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,2.11359e-14,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2620"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,4.184152e-14,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,8.16708e-14,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2624"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,8.19379e-14,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2530"
+       id="radialGradient2626"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.058824,1.20513e-13,-21.31542)"
+       cx="404.5"
+       cy="362.36218"
+       fx="404.5"
+       fy="362.36218"
+       r="8.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2650"
+       id="linearGradient2658"
+       x1="260.63467"
+       y1="439.97522"
+       x2="323.47839"
+       y2="502.97522"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2650"
+       id="linearGradient2662"
+       gradientUnits="userSpaceOnUse"
+       x1="260.63467"
+       y1="439.97522"
+       x2="323.47839"
+       y2="502.97522"
+       gradientTransform="matrix(0.848296,0,0,0.848296,53.62318,81.14764)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2650"
+       id="linearGradient2668"
+       gradientUnits="userSpaceOnUse"
+       x1="260.63467"
+       y1="439.97522"
+       x2="323.47839"
+       y2="502.97522"
+       gradientTransform="translate(-7,-7)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2650"
+       id="linearGradient2852"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.718744,0,0,0.718744,83.39873,135.0499)"
+       x1="260.63467"
+       y1="439.97522"
+       x2="323.47839"
+       y2="502.97522" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2650"
+       id="linearGradient2856"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.475495,0,0,0.475495,163.1776,260.7723)"
+       x1="260.63467"
+       y1="439.97522"
+       x2="323.47839"
+       y2="502.97522" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2650"
+       id="linearGradient2859"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.718744,0,0,0.718744,88.64874,139.3206)"
+       x1="260.63467"
+       y1="439.97522"
+       x2="323.47839"
+       y2="502.97522" />
+    <pattern
+       patternUnits="userSpaceOnUse"
+       width="17"
+       height="17"
+       patternTransform="translate(363,334.3622)"
+       id="pattern3055">
+      <image
+         y="0"
+         x="0"
+         xlink:href="/tmp/sizegrip.png"
+         sodipodi:absref="/tmp/sizegrip.png"
+         width="17"
+         height="17"
+         id="image3052" />
+    </pattern>
+    <pattern
+       patternUnits="userSpaceOnUse"
+       width="17"
+       height="17"
+       patternTransform="translate(363,334.3622)"
+       id="pattern3062">
+      <image
+         y="0"
+         x="0"
+         xlink:href="/tmp/sizegrip.png"
+         sodipodi:absref="/tmp/sizegrip.png"
+         width="17"
+         height="17"
+         id="image3060" />
+    </pattern>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2287"
+       id="linearGradient3171"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.655738,0,0,-0.625,533.082,557.5261)"
+       x1="328"
+       y1="282.86218"
+       x2="328"
+       y2="358.86218" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8520"
+       id="linearGradient2346"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.986928,0,0,1,55.64416,318.6709)"
+       x1="358.32635"
+       y1="172.3678"
+       x2="358.32635"
+       y2="177.58272" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8477"
+       id="linearGradient4123"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.718783,0,0,1.40468,-211.0184,-139.5212)"
+       x1="331.16711"
+       y1="199.51926"
+       x2="331.16711"
+       y2="177.27299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8520"
+       id="linearGradient4125"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.986928,0,0,1,8.324065,-66.639)"
+       x1="358.32635"
+       y1="172.3678"
+       x2="358.32635"
+       y2="177.58272" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8520"
+       id="linearGradient4128"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.986928,0,0,1,-177.3558,334.6709)"
+       x1="358.32635"
+       y1="172.3678"
+       x2="358.32635"
+       y2="177.58272" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8477"
+       id="linearGradient4132"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.718783,0,0,1.40468,-396.6983,261.7887)"
+       x1="331.16711"
+       y1="199.51926"
+       x2="331.16711"
+       y2="177.27299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8477"
+       id="linearGradient4149"
+       x1="357.17999"
+       y1="469.23767"
+       x2="357.17999"
+       y2="415.86218"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.543478,0,0,1.09434,-491.6195,14.76774)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10355"
+       id="linearGradient5042"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.718783,0,0,1.40468,-211.1668,-83.31197)"
+       x1="331.16711"
+       y1="199.51926"
+       x2="331.16711"
+       y2="177.27299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8520"
+       id="linearGradient5044"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.986928,0,0,1,8.175633,-10.42983)"
+       x1="358.32635"
+       y1="172.3678"
+       x2="358.32635"
+       y2="177.58272" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8520"
+       id="linearGradient5048"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.986928,0,0,1,-200.3559,296.6709)"
+       x1="358.32635"
+       y1="172.3678"
+       x2="358.32635"
+       y2="177.58272" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10355"
+       id="linearGradient5051"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.718783,0,0,1.40468,-419.6983,223.7887)"
+       x1="331.16711"
+       y1="199.51926"
+       x2="331.16711"
+       y2="177.27299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11290"
+       id="linearGradient5060"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.718783,0,0,1.40468,-208.8971,-30.27314)"
+       x1="331.16711"
+       y1="199.51926"
+       x2="331.16711"
+       y2="177.27299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11290"
+       id="linearGradient5063"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.718783,0,0,1.40468,-416.6983,243.7888)"
+       x1="331.16711"
+       y1="199.51926"
+       x2="331.16711"
+       y2="177.27299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8477"
+       id="linearGradient5955"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.543478,0,0,1.09434,-213.0217,14.29092)"
+       x1="357.17999"
+       y1="469.23767"
+       x2="357.17999"
+       y2="415.86218" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10355"
+       id="linearGradient5959"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.543478,0,0,1.09434,-400.0217,15.29092)"
+       x1="357.17999"
+       y1="469.23767"
+       x2="357.17999"
+       y2="415.86218" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11290"
+       id="linearGradient5963"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.543478,0,0,1.09434,-306.0217,15.29092)"
+       x1="357.17999"
+       y1="469.23767"
+       x2="357.17999"
+       y2="415.86218" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8477"
+       id="linearGradient5973"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.543478,0,0,-1.09434,-489.7228,1063.41)"
+       x1="357.00003"
+       y1="415.53799"
+       x2="357.00003"
+       y2="469.14316" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8477"
+       id="linearGradient5975"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.543478,0,0,-1.09434,-212.3206,1059.933)"
+       x1="357.17999"
+       y1="415.53723"
+       x2="357.17999"
+       y2="470.05835" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10355"
+       id="linearGradient5977"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.543478,0,0,-1.09434,-396.3206,1061.933)"
+       x1="357.17999"
+       y1="415.53705"
+       x2="357.17999"
+       y2="469.14362" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11290"
+       id="linearGradient5979"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.543478,0,0,-1.09434,-303.3206,1059.933)"
+       x1="357.17999"
+       y1="415.53699"
+       x2="357.17999"
+       y2="469.14362" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8477"
+       id="linearGradient1500"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.543478,0,0,1.09434,-481.6711,170.2793)"
+       x1="357.17999"
+       y1="469.23767"
+       x2="357.17999"
+       y2="415.86218" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8477"
+       id="linearGradient1503"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.543478,0,0,1.09434,-209.0216,170.7205)"
+       x1="357.17999"
+       y1="469.23767"
+       x2="357.17999"
+       y2="415.86218" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11290"
+       id="linearGradient1507"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.543478,0,0,1.09434,-301.5216,169.7205)"
+       x1="357.17999"
+       y1="469.23767"
+       x2="357.17999"
+       y2="415.86218" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10355"
+       id="linearGradient1511"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.543478,0,0,1.09434,-391.5216,170.2205)"
+       x1="357.17999"
+       y1="469.23767"
+       x2="357.17999"
+       y2="415.86218" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8477"
+       id="linearGradient2394"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.543478,0,0,-1.09434,-481.3464,1204.445)"
+       x1="357.17999"
+       y1="469.23767"
+       x2="357.17999"
+       y2="415.86218" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8477"
+       id="linearGradient2396"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.543478,0,0,-1.09434,-208.6969,1204.004)"
+       x1="357.17999"
+       y1="469.23767"
+       x2="357.17999"
+       y2="415.86218" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11290"
+       id="linearGradient2398"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.543478,0,0,-1.09434,-301.1969,1205.004)"
+       x1="357.17999"
+       y1="469.23767"
+       x2="357.17999"
+       y2="415.86218" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10355"
+       id="linearGradient2400"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.543478,0,0,-1.09434,-391.1969,1204.504)"
+       x1="357.17999"
+       y1="469.23767"
+       x2="357.17999"
+       y2="415.86218" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8477"
+       id="linearGradient2428"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.718783,0,0,1.40468,-211.0184,-139.5212)"
+       x1="331.16711"
+       y1="199.51926"
+       x2="331.16711"
+       y2="177.27299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8520"
+       id="linearGradient2430"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.986928,0,0,1,8.324065,-66.639)"
+       x1="358.32635"
+       y1="172.3678"
+       x2="358.32635"
+       y2="177.58272" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11290"
+       id="linearGradient2432"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.718783,0,0,1.40468,-208.8971,-30.27314)"
+       x1="331.16711"
+       y1="199.51926"
+       x2="331.16711"
+       y2="177.27299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10355"
+       id="linearGradient2434"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.718783,0,0,1.40468,-211.1668,-83.31197)"
+       x1="331.16711"
+       y1="199.51926"
+       x2="331.16711"
+       y2="177.27299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8520"
+       id="linearGradient2436"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.986928,0,0,1,8.175633,-10.42983)"
+       x1="358.32635"
+       y1="172.3678"
+       x2="358.32635"
+       y2="177.58272" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2"
+     inkscape:cx="146.93424"
+     inkscape:cy="238.10225"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1017"
+     inkscape:window-height="703"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#dcdcdc;fill-opacity:0.35526314;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 587.40371,4.7760765 L 743.97735,115.89285 C 743.97735,115.89285 714.96821,103.50692 666.19562,146.19742 C 662.12502,149.76041 661.14485,70.435993 587.40371,4.7760765 z "
+       id="path7285"
+       sodipodi:nodetypes="ccsc"
+       inkscape:export-filename="c:\pagefold.png"
+       inkscape:export-xdpi="51.43"
+       inkscape:export-ydpi="51.43" />
+    <path
+       style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 745.49258,1.7858134 L 746.50273,117.97107 L 745.49258,1.7858134 z "
+       id="path3710"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:url(#linearGradient4605);fill-rule:evenodd;stroke:#8b8b8b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0"
+       d="M 586.89863,1.8035354 L 743.47227,112.92031 C 743.47227,112.92031 702.3413,100.53438 653.56871,143.22488 C 649.49811,146.78787 660.63977,67.463454 586.89863,1.8035354 z "
+       id="path3712"
+       sodipodi:nodetypes="ccsc"
+       inkscape:export-filename="c:\pagefold.png"
+       inkscape:export-xdpi="51.43"
+       inkscape:export-ydpi="51.43" />
+    <path
+       style="fill:#e5ecf8;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.32236841"
+       d="M 586.89863,1.8035355 C 743.47227,1.8035355 743.47227,1.8035355 743.47227,1.8035355 L 743.47227,111.91016 L 586.89863,1.8035355 z "
+       id="path4608"
+       inkscape:export-xdpi="28.74"
+       inkscape:export-ydpi="28.74" />
+    <rect
+       style="fill:#f7f7f7;fill-opacity:0.78947371;stroke:#8b8b8b;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect1872"
+       width="298.86383"
+       height="60.557034"
+       x="24.819391"
+       y="12.94127"
+       rx="14.293656"
+       inkscape:export-filename="c:\lineedit.png"
+       inkscape:export-xdpi="28.74"
+       inkscape:export-ydpi="28.74" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#f7f7f7;fill-opacity:0.78431374;stroke:#8b8b8b;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path2978"
+       sodipodi:cx="73.741135"
+       sodipodi:cy="177.065"
+       sodipodi:rx="31.31473"
+       sodipodi:ry="30.809652"
+       d="M 105.05586 177.065 A 31.31473 30.809652 0 1 1  42.426405,177.065 A 31.31473 30.809652 0 1 1  105.05586 177.065 z"
+       transform="translate(-20.20305,-25.25381)"
+       inkscape:export-filename="c:\depot\qt\4.2\examples\widgets\stylesheet\images\radiobutton_unchecked.png"
+       inkscape:export-xdpi="17.299999"
+       inkscape:export-ydpi="17.299999" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#f7f7f7;fill-opacity:0.78431373;stroke:url(#radialGradient7498);stroke-width:15.94671249;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path3867"
+       sodipodi:cx="73.741135"
+       sodipodi:cy="177.065"
+       sodipodi:rx="31.31473"
+       sodipodi:ry="30.809652"
+       d="M 105.05586 177.065 A 31.31473 30.809652 0 1 1  42.426405,177.065 A 31.31473 30.809652 0 1 1  105.05586 177.065 z"
+       transform="matrix(0.909446,0,0,0.907961,60.2157,-8.95693)"
+       inkscape:export-filename="c:\depot\qt\4.2\examples\widgets\stylesheet\images\radiobutton_unchecked_hover.png"
+       inkscape:export-xdpi="16.336388"
+       inkscape:export-ydpi="16.336388" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#linearGradient6604);fill-opacity:1;stroke:url(#radialGradient6596);stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path3869"
+       sodipodi:cx="73.741135"
+       sodipodi:cy="177.065"
+       sodipodi:rx="31.31473"
+       sodipodi:ry="30.809652"
+       d="M 105.05586 177.065 A 31.31473 30.809652 0 1 1  42.426405,177.065 A 31.31473 30.809652 0 1 1  105.05586 177.065 z"
+       transform="translate(144.4518,-28.78935)"
+       inkscape:export-filename="c:\depot\qt\4.2\examples\widgets\stylesheet\images\radiobutton_unchecked_pressed.png"
+       inkscape:export-xdpi="17.299999"
+       inkscape:export-ydpi="17.299999" />
+    <g
+       id="g7526"
+       inkscape:export-filename="c:\depot\qt\4.2\examples\widgets\stylesheet\images\radiobutton_checked.png"
+       inkscape:export-xdpi="17.299999"
+       inkscape:export-ydpi="17.299999">
+      <path
+         inkscape:export-ydpi="17.299999"
+         inkscape:export-xdpi="17.299999"
+         inkscape:export-filename="c:\depot\qt\4.2\examples\widgets\stylesheet\images\radiobutton.png"
+         transform="translate(-19.1929,50.00255)"
+         d="M 105.05586 177.065 A 31.31473 30.809652 0 1 1  42.426405,177.065 A 31.31473 30.809652 0 1 1  105.05586 177.065 z"
+         sodipodi:ry="30.809652"
+         sodipodi:rx="31.31473"
+         sodipodi:cy="177.065"
+         sodipodi:cx="73.741135"
+         id="path7500"
+         style="fill:#f7f7f7;fill-opacity:0.78431373;stroke:#8b8b8b;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.772198,0,0,0.675157,10.75109,73.06635)"
+         d="M 64.649762 229.59293 A 8.586297 7.5761442 0 1 1  47.477168,229.59293 A 8.586297 7.5761442 0 1 1  64.649762 229.59293 z"
+         sodipodi:ry="7.5761442"
+         sodipodi:rx="8.586297"
+         sodipodi:cy="229.59293"
+         sodipodi:cx="56.063465"
+         id="path7512"
+         style="fill:#f7f7f7;fill-opacity:0.78431373;stroke:#b7adad;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.80921056"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g7536"
+       inkscape:export-filename="c:\depot\qt\4.2\examples\widgets\stylesheet\images\radiobutton_checked_hover.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999">
+      <path
+         inkscape:export-ydpi="16.336388"
+         inkscape:export-xdpi="16.336388"
+         inkscape:export-filename="c:\depot\qt\4.2\examples\widgets\stylesheet\images\radiobutton_hover.png"
+         transform="matrix(0.909446,0,0,0.907961,66.27656,65.28928)"
+         d="M 105.05586 177.065 A 31.31473 30.809652 0 1 1  42.426405,177.065 A 31.31473 30.809652 0 1 1  105.05586 177.065 z"
+         sodipodi:ry="30.809652"
+         sodipodi:rx="31.31473"
+         sodipodi:cy="177.065"
+         sodipodi:cx="73.741135"
+         id="path7530"
+         style="fill:#f7f7f7;fill-opacity:0.78431373;stroke:url(#radialGradient7532);stroke-width:15.94671249;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.772198,0,0,0.675157,90.04808,71.04611)"
+         d="M 64.649762 229.59293 A 8.586297 7.5761442 0 1 1  47.477168,229.59293 A 8.586297 7.5761442 0 1 1  64.649762 229.59293 z"
+         sodipodi:ry="7.5761442"
+         sodipodi:rx="8.586297"
+         sodipodi:cy="229.59293"
+         sodipodi:cx="56.063465"
+         id="path7534"
+         style="fill:#f7f7f7;fill-opacity:0.78431373;stroke:#b7adad;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.80921056"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g7556"
+       transform="matrix(1.074683,0,0,1.060652,-15.71476,-12.762)"
+       inkscape:export-filename="c:\depot\qt\4.2\examples\widgets\stylesheet\images\radiobutton_checked_pressed.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999">
+      <path
+         transform="matrix(0.772198,0,0,0.675157,174.3959,72.05619)"
+         d="M 64.649762 229.59293 A 8.586297 7.5761442 0 1 1  47.477168,229.59293 A 8.586297 7.5761442 0 1 1  64.649762 229.59293 z"
+         sodipodi:ry="7.5761442"
+         sodipodi:rx="8.586297"
+         sodipodi:cy="229.59293"
+         sodipodi:cx="56.063465"
+         id="path7524"
+         style="fill:#f7f7f7;fill-opacity:0.78431373;stroke:#b7adad;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.80921056"
+         sodipodi:type="arc" />
+      <path
+         inkscape:transform-center-x="70.710678"
+         inkscape:export-ydpi="17.299999"
+         inkscape:export-xdpi="17.299999"
+         inkscape:export-filename="c:\depot\qt\4.2\examples\widgets\stylesheet\images\radiobutton_pressed.png"
+         transform="translate(143.4416,50.00254)"
+         d="M 105.05586 177.065 A 31.31473 30.809652 0 1 1  42.426405,177.065 A 31.31473 30.809652 0 1 1  105.05586 177.065 z"
+         sodipodi:ry="30.809652"
+         sodipodi:rx="31.31473"
+         sodipodi:cy="177.065"
+         sodipodi:cx="73.741135"
+         id="path7540"
+         style="fill:url(#linearGradient7560);fill-opacity:1;stroke:url(#radialGradient7562);stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g11333">
+      <rect
+         inkscape:export-ydpi="34.630928"
+         inkscape:export-xdpi="34.630928"
+         inkscape:export-filename="c:\pushbutton.png"
+         rx="8.4277067"
+         y="109.12024"
+         x="302.04776"
+         height="40.971741"
+         width="119.00411"
+         id="rect8557"
+         style="fill:black;fill-opacity:0.0657895;stroke:none;stroke-width:2.38755798;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         inkscape:export-ydpi="34.630928"
+         inkscape:export-xdpi="34.630928"
+         inkscape:export-filename="c:\pushbutton.png"
+         rx="8.5229921"
+         y="103.71593"
+         x="298.01132"
+         height="42.515831"
+         width="120.34961"
+         id="rect8559"
+         style="fill:url(#linearGradient11328);fill-opacity:1;stroke:#8b8b8b;stroke-width:3.40678048;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         inkscape:export-ydpi="34.630928"
+         inkscape:export-xdpi="34.630928"
+         inkscape:export-filename="c:\pushbutton.png"
+         ry="3.3333139"
+         rx="0.90303022"
+         y="107.7652"
+         x="298.56201"
+         height="34.143112"
+         width="3.1697834"
+         id="rect8561"
+         style="fill:white;fill-opacity:0.66447371;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         inkscape:export-ydpi="34.630928"
+         inkscape:export-xdpi="34.630928"
+         inkscape:export-filename="c:\pushbutton.png"
+         ry="1.5026071"
+         rx="0.78104818"
+         y="105.7288"
+         x="305.26501"
+         height="3.0052142"
+         width="106.77315"
+         id="rect8563"
+         style="fill:url(#linearGradient11318);fill-opacity:1;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <g
+       id="g11345">
+      <rect
+         inkscape:export-ydpi="34.630936"
+         inkscape:export-xdpi="34.630936"
+         inkscape:export-filename="c:\pushbutton_pressed.png"
+         rx="8.4277067"
+         y="218.36829"
+         x="304.1691"
+         height="40.971741"
+         width="119.00411"
+         id="rect10379"
+         style="fill:black;fill-opacity:0.0657895;stroke:none;stroke-width:2.38755798;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         inkscape:export-ydpi="34.630936"
+         inkscape:export-xdpi="34.630936"
+         inkscape:export-filename="c:\pushbutton_pressed.png"
+         rx="8.5229921"
+         y="212.96397"
+         x="300.13266"
+         height="42.515831"
+         width="120.34961"
+         id="rect10381"
+         style="fill:url(#linearGradient11306);fill-opacity:1;stroke:#8b8b8b;stroke-width:3.40678048;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <g
+       id="g11339">
+      <rect
+         inkscape:export-ydpi="34.630928"
+         inkscape:export-xdpi="34.630928"
+         inkscape:export-filename="c:\pushbutton_hover.png"
+         rx="8.4277067"
+         y="165.32945"
+         x="301.89935"
+         height="40.971741"
+         width="119.00411"
+         id="rect7570"
+         style="fill:black;fill-opacity:0.0657895;stroke:none;stroke-width:2.38755798;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         inkscape:export-ydpi="34.630928"
+         inkscape:export-xdpi="34.630928"
+         inkscape:export-filename="c:\pushbutton_hover.png"
+         rx="8.5229921"
+         y="159.92514"
+         x="297.86288"
+         height="42.515831"
+         width="120.34961"
+         id="rect8483"
+         style="fill:url(#linearGradient11314);fill-opacity:1;stroke:#8b8b8b;stroke-width:3.40678048;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         inkscape:export-ydpi="34.630928"
+         inkscape:export-xdpi="34.630928"
+         inkscape:export-filename="c:\pushbutton_hover.png"
+         ry="1.5026071"
+         rx="0.78104818"
+         y="161.93797"
+         x="305.11658"
+         height="3.0052142"
+         width="106.77315"
+         id="rect8518"
+         style="fill:url(#linearGradient11310);fill-opacity:1;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         inkscape:export-ydpi="34.630928"
+         inkscape:export-xdpi="34.630928"
+         inkscape:export-filename="c:\pushbutton_hover.png"
+         ry="3.3333139"
+         rx="0.90303022"
+         y="164.66541"
+         x="298.93549"
+         height="34.143112"
+         width="3.1697834"
+         id="rect11331"
+         style="fill:white;fill-opacity:0.66447371;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <rect
+       style="fill:white;fill-opacity:0.50196078;stroke:#818181;stroke-width:10;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect12262"
+       width="54"
+       height="52"
+       x="38"
+       y="309.36218"
+       rx="0"
+       inkscape:export-filename="c:\checkbox_unchecked.png"
+       inkscape:export-xdpi="18.619444"
+       inkscape:export-ydpi="18.619444" />
+    <rect
+       style="fill:white;fill-opacity:0.50196078;stroke:#9a9a9a;stroke-width:10;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect14034"
+       width="54"
+       height="52"
+       x="111"
+       y="310.36218"
+       rx="0"
+       inkscape:export-filename="c:\checkbox_unchecked_hover.png"
+       inkscape:export-xdpi="18.619444"
+       inkscape:export-ydpi="18.619444" />
+    <rect
+       style="fill:url(#linearGradient14052);fill-opacity:1;stroke:#9a9a9a;stroke-width:10;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect14036"
+       width="54"
+       height="52"
+       x="182"
+       y="308.36218"
+       rx="0"
+       inkscape:export-filename="c:\checkbox_unchecked_pressed.png"
+       inkscape:export-xdpi="18.619444"
+       inkscape:export-ydpi="18.619444" />
+    <rect
+       style="fill:white;fill-opacity:0.50196078;stroke:#818181;stroke-width:10;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect14062"
+       width="54"
+       height="52"
+       x="114"
+       y="382.36218"
+       rx="0"
+       inkscape:export-filename="c:\checkbox_unchecked.png"
+       inkscape:export-xdpi="18.619444"
+       inkscape:export-ydpi="18.619444" />
+    <rect
+       style="fill:white;fill-opacity:0.50196078;stroke:#818181;stroke-width:10;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect14064"
+       width="54"
+       height="52"
+       x="186"
+       y="381.36218"
+       rx="0"
+       inkscape:export-filename="c:\checkbox_unchecked.png"
+       inkscape:export-xdpi="18.619444"
+       inkscape:export-ydpi="18.619444" />
+    <g
+       id="g14074"
+       inkscape:export-filename="c:\checkbox_checked.png"
+       inkscape:export-xdpi="18.619444"
+       inkscape:export-ydpi="18.619444">
+      <rect
+         inkscape:export-ydpi="18.619444"
+         inkscape:export-xdpi="18.619444"
+         inkscape:export-filename="c:\checkbox_unchecked.png"
+         rx="0"
+         y="383.36218"
+         x="41"
+         height="52"
+         width="54"
+         id="rect14060"
+         style="fill:white;fill-opacity:0.50196078;stroke:#818181;stroke-width:10;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         id="path14066"
+         d="M 53,410.36218 C 62,421.36218 62,421.36218 62,421.36218 L 83,398.36218"
+         style="fill:white;fill-opacity:0.50196078;fill-rule:evenodd;stroke:#818181;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <path
+       style="fill:url(#linearGradient2285);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.6401844px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 337.17213,302.17468 L 297.82787,302.17468 L 316.18852,331.54968 L 337.17213,302.17468 z "
+       id="path1402"
+       inkscape:export-filename="/home/qt/down-arrow.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient2594);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:80.00000187;stroke-opacity:1"
+       id="path2550"
+       sodipodi:cx="404.5"
+       sodipodi:cy="362.36218"
+       sodipodi:rx="8.5"
+       sodipodi:ry="9"
+       d="M 413 362.36218 A 8.5 9 0 1 1  396,362.36218 A 8.5 9 0 1 1  413 362.36218 z"
+       transform="matrix(1.173299,0,0,1.083714,49.6358,-39.58126)" />
+    <image
+       id="image3150"
+       height="17"
+       width="17"
+       sodipodi:absref="/tmp/sizegrip.png"
+       xlink:href="/tmp/sizegrip.png"
+       x="514.5"
+       y="283.36218" />
+    <path
+       style="fill:url(#linearGradient3171);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.6401844px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 298.32787,368.54968 L 337.67213,368.54968 L 319.31148,339.17468 L 298.32787,368.54968 z "
+       id="path3169"
+       inkscape:export-filename="/home/qt/up_arrow.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999" />
+    <rect
+       style="fill:url(#linearGradient2346);fill-opacity:1;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2339"
+       width="106.77315"
+       height="3.0052142"
+       x="352.58511"
+       y="491.0387"
+       rx="0.78104818"
+       ry="1.5026071"
+       inkscape:export-filename="c:\pushbutton.png"
+       inkscape:export-xdpi="34.630928"
+       inkscape:export-ydpi="34.630928" />
+    <path
+       style="fill:url(#linearGradient4149);fill-opacity:1;fill-rule:nonzero;stroke:#8b8b8b;stroke-width:3.89894915;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 22.3587,471.50369 L 20.81522,526.12633 L 97.98913,526.22067 L 97.98913,490.91878 C 97.98913,474.71285 91.53261,470.59803 69.83696,471.59803 L 22.3587,471.50369 z "
+       id="path3226"
+       sodipodi:nodetypes="cccccc"
+       inkscape:export-filename="/home/qt/spinbutton.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999" />
+    <path
+       style="fill:url(#linearGradient5955);fill-opacity:1;fill-rule:nonzero;stroke:#c7c7c7;stroke-width:3.89894915;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 300.95652,471.02687 L 299.41304,526.64951 L 376.58695,526.74385 L 376.58695,490.44196 C 376.58695,474.23603 370.13043,470.12121 348.43478,471.12121 L 300.95652,471.02687 z "
+       id="path5953"
+       sodipodi:nodetypes="cccccc"
+       inkscape:export-filename="/home/qt/spinbutton_off.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999" />
+    <path
+       style="fill:url(#linearGradient5959);fill-opacity:1.0;fill-rule:nonzero;stroke:#8b8b8b;stroke-width:3.89894915;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 113.95652,472.02687 L 112.41304,526.64951 L 189.58695,526.74385 L 189.58695,491.44196 C 189.58695,475.23603 183.13043,471.12121 161.43478,472.12121 L 113.95652,472.02687 z "
+       id="path5957"
+       sodipodi:nodetypes="cccccc"
+       inkscape:export-filename="/home/qt/spinbutton_hover.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999" />
+    <path
+       style="fill:url(#linearGradient5963);fill-opacity:1.0;fill-rule:nonzero;stroke:#8b8b8b;stroke-width:3.89894915;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 207.95652,472.02687 L 206.41304,526.64951 L 283.58695,526.74385 L 283.58695,491.44196 C 283.58695,475.23603 277.13043,471.12121 255.43478,472.12121 L 207.95652,472.02687 z "
+       id="path5961"
+       sodipodi:nodetypes="cccccc"
+       inkscape:export-filename="/home/qt/spinbutton_pressed.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999" />
+    <path
+       style="fill:url(#linearGradient5973);fill-opacity:1;fill-rule:nonzero;stroke:#8b8b8b;stroke-width:3.89894915;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 24.25543,606.67432 L 22.71195,552.05168 L 99.88586,551.95734 L 99.88586,587.25923 C 99.88586,603.46516 93.42934,607.57998 71.73369,606.57998 L 24.25543,606.67432 z "
+       id="path5965"
+       sodipodi:nodetypes="cccccc"
+       inkscape:export-filename="/home/qt/spindown.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999" />
+    <path
+       style="fill:url(#linearGradient5975);fill-opacity:1;fill-rule:nonzero;stroke:#c7c7c7;stroke-width:3.89894915;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 301.65761,603.1975 L 300.11413,547.57486 L 377.28804,547.48052 L 377.28804,583.78241 C 377.28804,599.98834 370.83152,604.10316 349.13587,603.10316 L 301.65761,603.1975 z "
+       id="path5967"
+       sodipodi:nodetypes="cccccc"
+       inkscape:export-filename="/home/qt/spindown_off.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999" />
+    <path
+       style="fill:url(#linearGradient5977);fill-opacity:1;fill-rule:nonzero;stroke:#8b8b8b;stroke-width:3.89894915;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 117.65761,605.1975 L 116.11413,550.57486 L 193.28804,550.48052 L 193.28804,585.78241 C 193.28804,601.98834 186.83152,606.10316 165.13587,605.10316 L 117.65761,605.1975 z "
+       id="path5969"
+       sodipodi:nodetypes="cccccc"
+       inkscape:export-filename="/home/qt/spindown_hover.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999" />
+    <path
+       style="fill:url(#linearGradient5979);fill-opacity:1;fill-rule:nonzero;stroke:#8b8b8b;stroke-width:3.89894915;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 210.65761,603.1975 L 209.11413,548.57486 L 286.28804,548.48052 L 286.28804,583.78241 C 286.28804,599.98834 279.83152,604.10316 258.13587,603.10316 L 210.65761,603.1975 z "
+       id="path5971"
+       sodipodi:nodetypes="cccccc"
+       inkscape:export-filename="/home/qt/spindown_pressed.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999" />
+    <path
+       style="fill:#c8c8c8;fill-opacity:0.96022725;fill-rule:evenodd;stroke:#000000;stroke-width:0.6401844px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 396.42213,301.17468 L 357.07787,301.17468 L 375.43852,330.54968 L 396.42213,301.17468 z "
+       id="path5981"
+       inkscape:export-filename="/home/qt/down_arrow_disabled.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999" />
+    <path
+       style="fill:#c8c8c8;fill-opacity:0.96078432;fill-rule:evenodd;stroke:#000000;stroke-width:0.6401844px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 357.57787,366.54968 L 396.92213,366.54968 L 378.56148,337.17468 L 357.57787,366.54968 z "
+       id="path5983"
+       inkscape:export-filename="/home/qt/up_arrow_enabled.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999" />
+    <path
+       style="fill:url(#linearGradient1500);fill-opacity:1;fill-rule:nonzero;stroke:#8b8b8b;stroke-width:3.89894915;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 31.30707,642.01528 L 30.76359,681.63792 L 107.9375,681.73226 L 107.9375,646.43037 C 107.9375,630.22444 107.98098,627.85962 79.78533,627.10962 C 31.37591,627.57817 31.21649,625.79673 31.30707,642.01528 z "
+       id="path1484"
+       sodipodi:nodetypes="cccccc"
+       inkscape:export-filename="/home/qt/scrollup.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999" />
+    <path
+       style="fill:url(#linearGradient1503);fill-opacity:1;fill-rule:nonzero;stroke:#c7c7c7;stroke-width:3.89894915;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 303.95653,642.45652 L 303.41305,682.07916 L 380.58695,682.1735 L 380.58695,646.87161 C 380.58695,630.66568 380.63043,628.30086 352.43479,627.55086 C 304.02537,628.01941 303.86595,626.23797 303.95653,642.45652 z "
+       id="path1500"
+       sodipodi:nodetypes="cccccc"
+       inkscape:export-filename="/home/qt/scrollup_disabled.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999" />
+    <path
+       style="fill:url(#linearGradient1507);fill-opacity:1.0;fill-rule:nonzero;stroke:#8b8b8b;stroke-width:3.89894915;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 211.45653,641.45652 L 210.91305,681.07916 L 288.08695,681.1735 L 288.08695,645.87161 C 288.08695,629.66568 288.13043,627.30086 259.93479,626.55086 C 211.52537,627.01941 211.36595,625.23797 211.45653,641.45652 z "
+       id="path1505"
+       sodipodi:nodetypes="cccccc"
+       inkscape:export-filename="/home/qt/scrollup_pressed.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999" />
+    <path
+       style="fill:url(#linearGradient1511);fill-opacity:1.0;fill-rule:nonzero;stroke:#8b8b8b;stroke-width:3.89894915;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 121.45653,641.95652 L 120.91305,681.57916 L 198.08695,681.6735 L 198.08695,646.37161 C 198.08695,630.16568 198.13043,627.80086 169.93479,627.05086 C 121.52537,627.51941 121.36595,625.73797 121.45653,641.95652 z "
+       id="path1509"
+       sodipodi:nodetypes="cccccc"
+       inkscape:export-filename="/home/qt/scrollup_hover.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999" />
+    <path
+       style="fill:url(#linearGradient2394);fill-opacity:1;fill-rule:nonzero;stroke:#8b8b8b;stroke-width:3.89894915;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 31.6318,732.70908 L 31.08832,693.08644 L 108.26223,692.9921 L 108.26223,728.29399 C 108.26223,744.49992 108.30571,746.86474 80.11006,747.61474 C 31.70064,747.14619 31.54122,748.92763 31.6318,732.70908 z "
+       id="path2386"
+       sodipodi:nodetypes="cccccc"
+       inkscape:export-filename="/home/qt/scrolldown.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999" />
+    <path
+       style="fill:url(#linearGradient2396);fill-opacity:1;fill-rule:nonzero;stroke:#c7c7c7;stroke-width:3.89894915;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 304.28126,732.26784 L 303.73778,692.6452 L 380.91168,692.55086 L 380.91168,727.85275 C 380.91168,744.05868 380.95516,746.4235 352.75952,747.1735 C 304.3501,746.70495 304.19068,748.48639 304.28126,732.26784 z "
+       id="path2388"
+       sodipodi:nodetypes="cccccc"
+       inkscape:export-filename="/home/qt/spinbutton.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999" />
+    <path
+       style="fill:url(#linearGradient2398);fill-opacity:1;fill-rule:nonzero;stroke:#8b8b8b;stroke-width:3.89894915;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 211.78126,733.26784 L 211.23778,693.6452 L 288.41168,693.55086 L 288.41168,728.85275 C 288.41168,745.05868 288.45516,747.4235 260.25952,748.1735 C 211.8501,747.70495 211.69068,749.48639 211.78126,733.26784 z "
+       id="path2390"
+       sodipodi:nodetypes="cccccc"
+       inkscape:export-filename="/home/qt/scrolldown_disabled.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999" />
+    <path
+       style="fill:url(#linearGradient2400);fill-opacity:1;fill-rule:nonzero;stroke:#8b8b8b;stroke-width:3.89894915;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 121.78126,732.76784 L 121.23778,693.1452 L 198.41168,693.05086 L 198.41168,728.35275 C 198.41168,744.55868 198.45516,746.9235 170.25952,747.6735 C 121.8501,747.20495 121.69068,748.98639 121.78126,732.76784 z "
+       id="path2392"
+       sodipodi:nodetypes="cccccc"
+       inkscape:export-filename="/home/qt/scrolldown_hover.png"
+       inkscape:export-xdpi="16.379999"
+       inkscape:export-ydpi="16.379999" />
+  </g>
+</svg>
diff --git a/doc/src/diagrams/stylesheet/stylesheet-boxmodel.svg b/doc/src/diagrams/stylesheet/stylesheet-boxmodel.svg
new file mode 100644
index 0000000000..833f606866
--- /dev/null
+++ b/doc/src/diagrams/stylesheet/stylesheet-boxmodel.svg
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.44"
+   sodipodi:docbase="C:\Documents and Settings\Girish\Desktop"
+   sodipodi:docname="box.svg"
+   inkscape:export-filename="C:\Documents and Settings\Girish\Desktop\box.png"
+   inkscape:export-xdpi="51.43"
+   inkscape:export-ydpi="51.43">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="375"
+     inkscape:cy="520"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1600"
+     inkscape:window-height="1140"
+     inkscape:window-x="1196"
+     inkscape:window-y="-4"
+     showgrid="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <text
+       xml:space="preserve"
+       style="font-size:23.51597595px;font-style:normal;font-weight:normal;fill:white;fill-opacity:1;stroke:white;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="335.02917"
+       y="277.45633"
+       id="text9058"
+       transform="scale(0.889318,1.124457)"><tspan
+         sodipodi:role="line"
+         x="335.02917"
+         y="277.45633"
+         id="tspan9064">B O R D E R</tspan></text>
+    <rect
+       style="fill:white;fill-opacity:1;stroke:black;stroke-width:4.25704765;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:8.51409454, 4.25704727;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2760"
+       width="695.74298"
+       height="515.74292"
+       x="22.128525"
+       y="214.49071"
+       rx="6.996594"
+       ry="0" />
+    <rect
+       style="fill:#e8e6cd;fill-opacity:1;stroke:black;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3655"
+       width="580"
+       height="400"
+       x="81"
+       y="271.36218"
+       rx="6.6371522" />
+    <rect
+       style="fill:#e8e6fc;fill-opacity:1;stroke:black;stroke-width:1.81467748;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3657"
+       width="463.04248"
+       height="284.47104"
+       x="137.05019"
+       y="332.26953"
+       rx="6.1465664"
+       ry="0" />
+    <rect
+       style="fill:#d5d5d5;fill-opacity:1;stroke:black;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4547"
+       width="340"
+       height="160"
+       x="200"
+       y="392.36218"
+       rx="6.6371522" />
+    <text
+       xml:space="preserve"
+       style="font-size:24.11601067px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="326.578"
+       y="229.81458"
+       id="text9012"
+       transform="scale(0.912007,1.096483)"><tspan
+         sodipodi:role="line"
+         id="tspan9014"
+         x="326.578"
+         y="229.81458">M A R G I N</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:23.5159874px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="336.01672"
+       y="419.74713"
+       id="text9026"
+       transform="scale(0.889318,1.124457)"><tspan
+         sodipodi:role="line"
+         id="tspan9028"
+         x="336.01672"
+         y="419.74713">C O N T E N T</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:23.51598358px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="336.01666"
+       y="330.81543"
+       id="text9036"
+       transform="scale(0.889318,1.124457)"><tspan
+         sodipodi:role="line"
+         x="336.01666"
+         y="330.81543"
+         id="tspan9040">P A D D I N G</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:23.98760986px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="341.32919"
+       y="276.49072"
+       id="text12608"
+       transform="scale(0.884818,1.130176)"><tspan
+         sodipodi:role="line"
+         id="tspan12610"
+         x="341.32919"
+         y="276.49072">B O R D E R</tspan></text>
+    <rect
+       style="fill:white;fill-opacity:1;stroke:black;stroke-width:1.72772717;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect12612"
+       width="40.016171"
+       height="30.904003"
+       x="38.863865"
+       y="755.78369"
+       rx="6.9994221" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot13507"
+       transform="matrix(2.291562,0,0,2.696637,-268.2496,-1290.608)"><flowRegion
+         id="flowRegion13509"><rect
+           id="rect13511"
+           width="277.14285"
+           height="37.142857"
+           x="161.42857"
+           y="775.2193" /></flowRegion><flowPara
+         id="flowPara13513">Border Rectangle</flowPara></flowRoot>    <rect
+       style="fill:#e8e6cd;fill-opacity:1;stroke:black;stroke-width:1.72772717;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect14400"
+       width="40.016171"
+       height="30.904003"
+       x="40.864674"
+       y="797.98364"
+       rx="6.9994221" />
+    <rect
+       style="fill:#e8e6fc;fill-opacity:1;stroke:black;stroke-width:1.77121222;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect14402"
+       width="39.972687"
+       height="32.514557"
+       x="401.03195"
+       y="753.24774"
+       rx="6.991816" />
+    <rect
+       style="fill:#d5d5d5;fill-opacity:1;stroke:black;stroke-width:1.72772717;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect14404"
+       width="40.016171"
+       height="30.904003"
+       x="401.01019"
+       y="797.98358"
+       rx="6.9994221" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot17946"
+       transform="matrix(2.291562,0,0,2.696635,-270.0219,-1336.443)"><flowRegion
+         id="flowRegion17948"><rect
+           id="rect17950"
+           width="277.14285"
+           height="37.142857"
+           x="161.42857"
+           y="775.2193" /></flowRegion><flowPara
+         id="flowPara17952">Margin Rectangle</flowPara></flowRoot>    <flowRoot
+       xml:space="preserve"
+       id="flowRoot17954"
+       transform="matrix(2.291562,0,0,2.696637,87.39117,-1337.924)"><flowRegion
+         id="flowRegion17956"><rect
+           id="rect17958"
+           width="277.14285"
+           height="37.142857"
+           x="161.42857"
+           y="775.2193" /></flowRegion><flowPara
+         id="flowPara17960">Padding Rectangle</flowPara></flowRoot>    <flowRoot
+       xml:space="preserve"
+       id="flowRoot17962"
+       transform="matrix(2.291562,0,0,2.696635,87.39117,-1293.164)"><flowRegion
+         id="flowRegion17964"><rect
+           id="rect17966"
+           width="277.14285"
+           height="37.142857"
+           x="161.42857"
+           y="775.2193" /></flowRegion><flowPara
+         id="flowPara17968">Content Rectangle</flowPara></flowRoot>  </g>
+</svg>
diff --git a/doc/src/diagrams/stylesheet/treeview.svg b/doc/src/diagrams/stylesheet/treeview.svg
new file mode 100644
index 0000000000..1d2d4ce6d1
--- /dev/null
+++ b/doc/src/diagrams/stylesheet/treeview.svg
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45"
+   sodipodi:docbase="/home/qt/Desktop"
+   sodipodi:docname="drawing.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="TRUE">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4175">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4177" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4179" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3159">
+      <stop
+         style="stop-color:#360d08;stop-opacity:1;"
+         offset="0"
+         id="stop3161" />
+      <stop
+         style="stop-color:#360d08;stop-opacity:0;"
+         offset="1"
+         id="stop3163" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3159"
+       id="linearGradient3165"
+       x1="-9.5219469"
+       y1="122.3622"
+       x2="567.62091"
+       y2="-23.352087"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3159"
+       id="linearGradient3169"
+       gradientUnits="userSpaceOnUse"
+       x1="-9.5219469"
+       y1="122.3622"
+       x2="567.62091"
+       y2="-23.352087" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3159"
+       id="linearGradient3173"
+       gradientUnits="userSpaceOnUse"
+       x1="-9.5219469"
+       y1="122.3622"
+       x2="567.62091"
+       y2="-23.352087" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="369.55257"
+     inkscape:cy="750.96613"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1018"
+     inkscape:window-height="710"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       sodipodi:type="star"
+       style="opacity:0.95999995;fill:url(#linearGradient3165);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1"
+       id="path3157"
+       sodipodi:sides="3"
+       sodipodi:cx="170"
+       sodipodi:cy="248.07648"
+       sodipodi:r1="76.197914"
+       sodipodi:r2="38.098953"
+       sodipodi:arg1="0"
+       sodipodi:arg2="1.0471976"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 246.19791,248.07648 L 189.04948,281.07114 L 131.90104,314.06581 L 131.90105,248.07648 L 131.90104,182.08715 L 189.04948,215.08182 L 246.19791,248.07648 z "
+       transform="matrix(0,0.8547291,-1.1082434,0,407.78631,67.649535)"
+       inkscape:export-filename="/tmp/downarrow.png"
+       inkscape:export-xdpi="7.3838849"
+       inkscape:export-ydpi="7.3838849" />
+    <path
+       sodipodi:type="star"
+       style="opacity:0.95999995;fill:url(#linearGradient3173);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1"
+       id="path3171"
+       sodipodi:sides="3"
+       sodipodi:cx="170"
+       sodipodi:cy="248.07648"
+       sodipodi:r1="76.197914"
+       sodipodi:r2="38.098953"
+       sodipodi:arg1="0"
+       sodipodi:arg2="1.0471976"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 246.19791,248.07648 L 189.04948,281.07114 L 131.90104,314.06581 L 131.90105,248.07648 L 131.90104,182.08715 L 189.04948,215.08182 L 246.19791,248.07648 z "
+       transform="matrix(0.8547291,0,0,1.1082434,-51.586095,-168.28122)"
+       inkscape:export-filename="/tmp/rightarrow.png"
+       inkscape:export-xdpi="7.3838849"
+       inkscape:export-ydpi="7.3838849" />
+    <g
+       id="g7143"
+       transform="matrix(1.9467612,0,0,1.49,-171.55861,-412.48606)"
+       inkscape:export-filename="/tmp/branch.png"
+       inkscape:export-xdpi="7.3838849"
+       inkscape:export-ydpi="7.3838849">
+      <rect
+         style="opacity:0.95999995;fill:#63564d;fill-opacity:0.50574712;fill-rule:nonzero;stroke:none;stroke-width:2.02099991;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1"
+         id="rect5182"
+         width="72"
+         height="7.1428542"
+         x="287.14282"
+         y="361.64792"
+         rx="0"
+         ry="2.3969309" />
+      <rect
+         inkscape:export-ydpi="24.70105"
+         inkscape:export-xdpi="24.70105"
+         inkscape:export-filename="/tmp/vline.png"
+         style="opacity:0.95999995;fill:#63564d;fill-opacity:0.50574712;fill-rule:nonzero;stroke:none;stroke-width:2.02099991;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1"
+         id="rect5184"
+         width="142.85713"
+         height="7.2871542"
+         x="298.07648"
+         y="-286.58728"
+         rx="0"
+         ry="1.947962"
+         transform="matrix(0,1,-1,0,0,0)" />
+      <rect
+         style="opacity:0.95999995;fill:none;fill-opacity:0.50574712;fill-rule:nonzero;stroke:none;stroke-width:2.02099991;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1"
+         id="rect5203"
+         width="72"
+         height="7.1428542"
+         x="206.85713"
+         y="361.64792"
+         rx="0"
+         ry="2.3969309" />
+    </g>
+    <rect
+       ry="3.5714271"
+       rx="0"
+       y="425.65506"
+       x="-33.231937"
+       height="10.642853"
+       width="140.16681"
+       id="rect7154"
+       style="opacity:0.95999995;fill:none;fill-opacity:0.50574712;fill-rule:nonzero;stroke:none;stroke-width:2.02099991;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1" />
+    <g
+       id="g10132"
+       inkscape:export-filename="/tmp/branch2.png"
+       inkscape:export-xdpi="24.70105"
+       inkscape:export-ydpi="24.70105">
+      <rect
+         style="opacity:0.95999995;fill:#63564d;fill-opacity:0.50574712;fill-rule:nonzero;stroke:none;stroke-width:2.02099991;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1"
+         id="rect9152"
+         width="141.59538"
+         height="10.642853"
+         x="469.49371"
+         y="436.36935"
+         rx="0"
+         ry="3.5714271" />
+      <rect
+         inkscape:export-ydpi="24.70105"
+         inkscape:export-xdpi="24.70105"
+         inkscape:export-filename="/tmp/vline.png"
+         style="opacity:0.95999995;fill:#63564d;fill-opacity:0.50574712;fill-rule:nonzero;stroke:none;stroke-width:2.02099991;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1"
+         id="rect9154"
+         width="105.71427"
+         height="14.186349"
+         x="341.64789"
+         y="-469.84076"
+         rx="0"
+         ry="3.792217"
+         transform="matrix(0,1,-1,0,0,0)" />
+      <rect
+         style="opacity:0.95999995;fill:none;fill-opacity:0.50574712;fill-rule:nonzero;stroke:none;stroke-width:2.02099991;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1"
+         id="rect9156"
+         width="140.16681"
+         height="10.642853"
+         x="314.62521"
+         y="436.36935"
+         rx="0"
+         ry="3.5714271" />
+      <rect
+         inkscape:export-ydpi="24.70105"
+         inkscape:export-xdpi="24.70105"
+         inkscape:export-filename="/tmp/vline.png"
+         style="opacity:0.95999995;fill:none;fill-opacity:0.50574712;fill-rule:nonzero;stroke:none;stroke-width:2.02099991;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1"
+         id="rect9161"
+         width="107.14285"
+         height="13.140697"
+         x="447.36218"
+         y="-469.42749"
+         rx="0"
+         ry="3.7922168"
+         transform="matrix(0,1,-1,0,0,0)" />
+    </g>
+    <g
+       id="g11122"
+       inkscape:export-filename="/tmp/vline.png"
+       inkscape:export-xdpi="24.70105"
+       inkscape:export-ydpi="24.70105">
+      <rect
+         style="opacity:0.95999995;fill:none;fill-opacity:0.50574712;fill-rule:nonzero;stroke:none;stroke-width:2.02099991;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1"
+         id="rect10144"
+         width="140.16681"
+         height="10.642853"
+         x="179.4937"
+         y="409.2265"
+         rx="0"
+         ry="3.5714271" />
+      <rect
+         inkscape:export-ydpi="24.70105"
+         inkscape:export-xdpi="24.70105"
+         inkscape:export-filename="/tmp/vline.png"
+         style="opacity:0.95999995;fill:#63564d;fill-opacity:0.50574712;fill-rule:nonzero;stroke:none;stroke-width:2.02099991;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1"
+         id="rect10146"
+         width="212.85713"
+         height="14.186349"
+         x="314.50507"
+         y="-178.41219"
+         rx="0"
+         ry="3.792217"
+         transform="matrix(0,1,-1,0,0,0)" />
+      <rect
+         style="opacity:0.95999995;fill:none;fill-opacity:0.50574712;fill-rule:nonzero;stroke:none;stroke-width:2.02099991;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1"
+         id="rect10148"
+         width="140.16681"
+         height="10.642853"
+         x="23.196629"
+         y="409.2265"
+         rx="0"
+         ry="3.5714271" />
+    </g>
+  </g>
+</svg>
diff --git a/doc/src/diagrams/tcpstream.sk b/doc/src/diagrams/tcpstream.sk
new file mode 100644
index 0000000000..6c1be60a53
--- /dev/null
+++ b/doc/src/diagrams/tcpstream.sk
@@ -0,0 +1,48 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+bm(1083919052,'../images/complexwizard-evaluatepage.png')
+im((96.171,-22.9284),1083919052)
+G()
+bm(1083939916,'../images/complexwizard-finishpage.png')
+im((598.76,309.977),1083939916)
+bm(1083947948,'../images/complexwizard-titlepage.png')
+im((-426.888,309.977),1083947948)
+G_()
+G()
+bm(1083738188,'../images/complexwizard-detailspage.png')
+im((438.772,659.042),1083738188)
+bm(1083948908,'../images/complexwizard-registerpage.png')
+im((-246.43,659.042),1083948908)
+G_()
+fp((1,1,0))
+lp((1,0,0))
+lw(4)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(-177.479,552.383,0)
+bs(-44.9634,640.727,0)
+fp((1,1,0))
+lp((1,0,0))
+lw(4)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(661.786,645.036,0)
+bs(794.302,556.693,0)
+fp((1,1,0))
+lp((1,0,0))
+lw(4)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(270.704,772.165,0)
+bs(403.219,772.165,0)
+fp((1,1,0))
+lp((1,0,0))
+lw(4)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(-166.705,280.888,0)
+bs(46.6125,138.676,0)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,0.5,0.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/threadsandobjects.sk b/doc/src/diagrams/threadsandobjects.sk
new file mode 100644
index 0000000000..1523dad1b2
--- /dev/null
+++ b/doc/src/diagrams/threadsandobjects.sk
@@ -0,0 +1,149 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+G()
+fp((0.808,0.89,1))
+lw(1)
+e(108.938,0,0,-67.3351,546.062,772.5)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QThread::exec()',(502.382,747.769))
+lw(2)
+lc(2)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(37.5,0,0,-12.5,546.062,775.165,4.77896,4.51499,0)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(18)
+txt('Thread B',(509.045,812.871))
+fp((1,0.616,0.639))
+lw(1)
+r(45,0,0,-20.225,467.124,805.39,0.0957655,0.213075)
+fp((1,0.616,0.639))
+lw(1)
+r(45,0,0,-20.225,597.124,770.39,0.0957655,0.213075)
+fp((1,0.616,0.639))
+lw(1)
+r(45,0,0,-20.225,502.124,735.39,0.0957655,0.213075)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Obj 8',(475.284,792.212))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Obj 10',(601.948,757.212))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Obj 9',(510.284,722.212))
+G_()
+G()
+fp((0.808,0.89,1))
+lw(1)
+e(108.938,0,0,-67.3351,61.062,772.5)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QThread::exec()',(17.382,747.769))
+lw(2)
+lc(2)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(37.5,0,0,-12.5,61.062,775.165,4.77896,4.51499,0)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(18)
+txt('Thread A',(24.045,812.871))
+fp((1,0.616,0.639))
+lw(1)
+r(45,0,0,-20.225,-30,800.165,0.0957655,0.213075)
+fp((1,0.616,0.639))
+lw(1)
+r(45,0,0,-20.225,115,790.39,0.0957655,0.213075)
+fp((1,0.616,0.639))
+lw(1)
+r(45,0,0,-20.225,50,735.165,0.0957655,0.213075)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Obj 5',(-21.84,786.986))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Obj 7',(123.16,777.212))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Obj 6',(58.16,721.986))
+G_()
+G()
+fp((0.737,1,0.849))
+lw(1)
+r(215,0,0,-125,197.5,835,0.0465116,0.08)
+lw(2)
+lc(2)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+e(37.5,0,0,-12.5,304.55,777.5,4.77896,4.51499,0)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(18)
+txt('Main Thread',(254.483,812.706))
+fp((1,0.616,0.639))
+lw(1)
+r(45,0,0,-20.225,207.5,795.225,0.0957655,0.213075)
+fp((1,0.616,0.639))
+lw(1)
+r(45,0,0,-20.225,357.5,805,0.0957655,0.213075)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Obj 1',(215.66,782.047))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Obj 4',(365.66,791.821))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('QApplication::exec()',(250.982,750.104))
+fp((1,0.616,0.639))
+lw(1)
+r(45,0,0,-20.225,352.5,740.225,0.0957655,0.213075)
+fp((1,0.616,0.639))
+lw(1)
+r(45,0,0,-20.225,222.5,740.225,0.0957655,0.213075)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Obj 3',(360.66,727.047))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Obj 2',(230.66,727.047))
+G_()
+le()
+lw(1)
+r(725,0,0,-155,-60,850)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/treemodel-structure.sk b/doc/src/diagrams/treemodel-structure.sk
new file mode 100644
index 0000000000..a76246cbed
--- /dev/null
+++ b/doc/src/diagrams/treemodel-structure.sk
@@ -0,0 +1,114 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+le()
+lw(1)
+r(165,0,0,-300,30,785)
+lw(1)
+ld((3, 3))
+b()
+bs(55,520,0)
+bs(55,495,0)
+lw(1)
+ld((5, 5))
+r(30,0,0,-30,40,775)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica-Bold')
+txt('Root item (empty)',(80,756.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 0',(110,716.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 0',(145,676.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('A',(83.33,713.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('B',(118.33,633.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(20)
+txt('C',(82.78,553.14))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 1',(145,636.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 1',(110,556.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 2',(145,596.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('row = 2',(110,516.384))
+lw(1)
+b()
+bs(55,745,0)
+bs(55,520,0)
+lw(1)
+r(30,0,0,-30,110,695)
+lw(1)
+b()
+bs(90,680,0)
+bs(110,680,0)
+lw(1)
+r(30,0,0,-30,110,655)
+lw(1)
+r(30,0,0,-30,110,615)
+lw(1)
+r(30,0,0,-30,75,535)
+lw(1)
+r(30,0,0,-30,75,575)
+lw(1)
+b()
+bs(90,640,0)
+bs(110,640,0)
+lw(1)
+b()
+bs(90,600,0)
+bs(110,600,0)
+lw(1)
+b()
+bs(55,520,0)
+bs(75,520,0)
+lw(1)
+b()
+bs(55,560,0)
+bs(75,560,0)
+lw(1)
+b()
+bs(90,705,0)
+bs(90,600,0)
+lw(1)
+r(30,0,0,-30,75,735)
+lw(1)
+b()
+bs(55,720,0)
+bs(75,720,0)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/tutorial8-layout.sk b/doc/src/diagrams/tutorial8-layout.sk
new file mode 100644
index 0000000000..f4ea2de02b
--- /dev/null
+++ b/doc/src/diagrams/tutorial8-layout.sk
@@ -0,0 +1,55 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+fp((0.65,0.748,0.919))
+lw(1)
+r(74,0,0,-36,84,776)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('(1, 0)',(106.996,754.934))
+fp((0.65,0.748,0.919))
+lw(1)
+r(104,0,0,-80,166,776)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('(1, 1)',(203.996,754.934))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('(2, 1)',(203.996,710.934))
+fp((1,1,1))
+lp((0.5,0.5,0.5))
+lw(1)
+r(74,0,0,-36,84,732)
+fp((0.5,0.5,0.5))
+le()
+lw(1)
+Fn('Helvetica')
+txt('(2, 0)',(106.996,710.934))
+fp((1,1,1))
+lp((0.5,0.5,0.5))
+lw(1)
+r(104,0,0,-28,166,812)
+fp((0.5,0.5,0.5))
+le()
+lw(1)
+Fn('Helvetica')
+txt('(0, 1)',(203.996,794.934))
+fp((0.65,0.748,0.919))
+lw(1)
+r(73.8045,0,0,-28,84.1955,812)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('(0, 0)',(107.094,794.934))
+lw(1)
+r(202,0,0,-132,76,820)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2,2),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/udppackets.sk b/doc/src/diagrams/udppackets.sk
new file mode 100644
index 0000000000..71a94cce39
--- /dev/null
+++ b/doc/src/diagrams/udppackets.sk
@@ -0,0 +1,128 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+lp((0.217,0.6,0))
+lw(2)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(342.5,680,0)
+bs(182.5,680,0)
+lp((0.217,0.6,0))
+lw(2)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(162.5,712.5,0)
+bs(327.5,712.5,0)
+fp((0.245,0.484,0.808))
+lw(1)
+r(95,0,0,-56.1059,335,725)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('UDP Receiver',(344.496,693.881))
+fp((0.808,0.4,0.4))
+lw(1)
+r(95,0,0,-55,80,725)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('UDP Sender',(93.822,694.434))
+le()
+lw(1)
+r(360,0,0,-65,75,730)
+fp((0.217,0.6,0))
+lp((0.217,0.6,0))
+lw(1)
+r(27.5,0,0,-25,202.5,725)
+fp((1,0.97,0))
+le()
+lw(1)
+Fn('Courier-Bold')
+Fs(8)
+txt('01011',(204.443,717.828))
+fp((1,0.97,0))
+le()
+lw(1)
+Fn('Courier-Bold')
+Fs(8)
+txt('10110',(204.443,710.328))
+fp((1,0.97,0))
+le()
+lw(1)
+Fn('Courier-Bold')
+Fs(8)
+txt('11010',(204.443,702.828))
+fp((0.217,0.6,0))
+lp((0.217,0.6,0))
+lw(1)
+r(27.5,0,0,-25,222.5,692.5)
+fp((1,0.97,0))
+le()
+lw(1)
+Fn('Courier-Bold')
+Fs(8)
+txt('10100',(224.443,685.328))
+fp((1,0.97,0))
+le()
+lw(1)
+Fn('Courier-Bold')
+Fs(8)
+txt('01101',(224.443,677.828))
+fp((1,0.97,0))
+le()
+lw(1)
+Fn('Courier-Bold')
+Fs(8)
+txt('10110',(224.443,670.328))
+fp((0.217,0.6,0))
+lp((0.217,0.6,0))
+lw(1)
+r(27.5,0,0,-25,280,692.5)
+fp((1,0.97,0))
+le()
+lw(1)
+Fn('Courier-Bold')
+Fs(8)
+txt('01100',(281.943,685.328))
+fp((1,0.97,0))
+le()
+lw(1)
+Fn('Courier-Bold')
+Fs(8)
+txt('10101',(281.943,677.828))
+fp((1,0.97,0))
+le()
+lw(1)
+Fn('Courier-Bold')
+Fs(8)
+txt('01100',(281.943,670.328))
+fp((0.217,0.6,0))
+lp((0.217,0.6,0))
+lw(1)
+r(27.5,0,0,-25,260,725)
+fp((1,0.97,0))
+le()
+lw(1)
+Fn('Courier-Bold')
+Fs(8)
+txt('11010',(261.943,717.828))
+fp((1,0.97,0))
+le()
+lw(1)
+Fn('Courier-Bold')
+Fs(8)
+txt('10101',(261.943,710.328))
+fp((1,0.97,0))
+le()
+lw(1)
+Fn('Courier-Bold')
+Fs(8)
+txt('01110',(261.943,702.828))
+le()
+lw(1)
+r(360,0,0,-67.5,75,730)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/wVista-Cert-border.png b/doc/src/diagrams/wVista-Cert-border.png
new file mode 100644
index 0000000000..5b0f1ba4af
--- /dev/null
+++ b/doc/src/diagrams/wVista-Cert-border.png
diff --git a/doc/src/diagrams/widgetmapper/sql-widget-mapper.png b/doc/src/diagrams/widgetmapper/sql-widget-mapper.png
new file mode 100644
index 0000000000..0ef3e40f6b
--- /dev/null
+++ b/doc/src/diagrams/widgetmapper/sql-widget-mapper.png
diff --git a/doc/src/diagrams/widgetmapper/widgetmapper-sql-mapping.sk b/doc/src/diagrams/widgetmapper/widgetmapper-sql-mapping.sk
new file mode 100644
index 0000000000..dedac0ddad
--- /dev/null
+++ b/doc/src/diagrams/widgetmapper/widgetmapper-sql-mapping.sk
@@ -0,0 +1,246 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+bm(140229452,'sql-widget-mapper.png')
+im((70,477.5),140229452)
+lp((1,1,1))
+lw(3)
+lj(1)
+b()
+bs(145,747.5,0)
+bc(145,722.5,142.5,697.5,152.5,657.5,1)
+lw(1)
+r(37.5,0,0,-30,305,742.5)
+fp((0.753,1,0.753))
+lw(1)
+r(37.5,0,0,-30,305,772.5)
+lp((1,1,1))
+lw(2.75)
+b()
+bs(402.5,722.5,1)
+bc(365,725,350,732.5,335,747.5,0)
+fp((0.753,1,0.753))
+lw(1)
+r(82.5,0,0,-30,410,742.5)
+lp((1,1,1))
+lw(3)
+b()
+bs(404.376,716.319,1)
+bc(397.281,600.953,335.819,523.389,202.5,505,0)
+fp((0.753,0.753,1))
+lw(1)
+r(155,0,0,-30,150,772.5)
+lw(1)
+r(155,0,0,-30,150,742.5)
+fp((1,0.753,0.753))
+lw(1)
+r(69.9999,0,0,-30,80,772.5)
+lw(1)
+r(69.9999,0,0,-30,80,742.5)
+lw(1)
+r(69.9999,0,0,-30,80,802.5)
+lw(1)
+r(37.5,0,0,-30,305,802.5)
+lw(1)
+r(155,0,0,-30,150,802.5)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(18)
+txt('Carol',(93.499,751.226))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(18)
+txt('Donald',(85,721.226))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(18)
+txt('Bob',(98.989,781.226))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('PO Box 32',(154.48,789.692))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Mail Handling Service',(154.48,775.792))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('47338 Park Avenue',(156.142,729.692))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Big City',(156.142,716.384))
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('The Lighthouse',(156.142,759.692))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Remote Island',(156.142,745.792))
+G_()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('101',(382.5,790.398))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('102',(382.5,760.398))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(14)
+txt('103',(382.5,730.398))
+fp((0,0,0))
+le()
+lw(1)
+b()
+bs(345,757.5,0)
+bs(355,750,0)
+bs(355,755,0)
+bs(365,755,0)
+bs(365,760,0)
+bs(355,760,0)
+bs(355,765,0)
+bs(345,757.5,0)
+bC()
+lw(1)
+ld((2, 2))
+b()
+bs(80,713.092,0)
+bs(80,700.592,0)
+lw(1)
+ld((2, 2))
+b()
+bs(80,815,0)
+bs(80,802.5,0)
+lw(1)
+ld((2, 2))
+b()
+bs(150,712.5,0)
+bs(150,700,0)
+lw(1)
+ld((2, 2))
+b()
+bs(150,815,0)
+bs(150,802.5,0)
+lw(1)
+ld((2, 2))
+b()
+bs(305,713.092,0)
+bs(305,700.592,0)
+lw(1)
+ld((2, 2))
+b()
+bs(305,815,0)
+bs(305,802.5,0)
+lw(1)
+ld((2, 2))
+b()
+bs(342.5,712.5,0)
+bs(342.5,700,0)
+lw(1)
+ld((2, 2))
+b()
+bs(342.5,816.908,0)
+bs(342.5,804.408,0)
+lp((1,1,1))
+lw(3)
+lj(1)
+b()
+bs(287.002,750,1)
+bc(299.502,720,302.002,647.5,259.502,602.5,0)
+lp((0,0,0.627))
+lw(2)
+lj(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(287.002,750,1)
+bc(299.502,720,302.002,647.5,259.502,602.5,0)
+lp((0.624,0,0))
+lw(2)
+lj(1)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(145,747.5,0)
+bc(145,722.5,142.5,697.5,152.5,657.5,1)
+lp((0,0.624,0))
+lw(2)
+la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(404.376,716.319,1)
+bc(397.281,600.953,335.819,523.389,202.5,505,0)
+lp((0,0.624,0))
+lw(1.75)
+la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
+b()
+bs(402.5,722.5,1)
+bc(365,725,350,732.5,335,747.5,0)
+fp((1,1,1))
+lw(1)
+r(82.5,0,0,-30,410,772.5)
+lw(1)
+r(82.5,0,0,-30,410,802.5)
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(18)
+txt('103',(308.738,751.226))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(18)
+txt('101',(308.738,721.226))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(18)
+txt('102',(308.738,781.226))
+G_()
+G()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(18)
+txt('Work',(430.253,751.226))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(18)
+txt('Other',(428.741,721.226))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(18)
+txt('Home',(427.247,781.226))
+G_()
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/windowsxp-menu.png b/doc/src/diagrams/windowsxp-menu.png
new file mode 100644
index 0000000000..a1fda3f820
--- /dev/null
+++ b/doc/src/diagrams/windowsxp-menu.png
diff --git a/doc/src/diagrams/worldtimeclock-connection.zip b/doc/src/diagrams/worldtimeclock-connection.zip
new file mode 100644
index 0000000000..8303215738
--- /dev/null
+++ b/doc/src/diagrams/worldtimeclock-connection.zip
diff --git a/doc/src/diagrams/worldtimeclockplugin-example.zip b/doc/src/diagrams/worldtimeclockplugin-example.zip
new file mode 100644
index 0000000000..ef2f6e47b2
--- /dev/null
+++ b/doc/src/diagrams/worldtimeclockplugin-example.zip
diff --git a/doc/src/diagrams/x11_dependencies.sk b/doc/src/diagrams/x11_dependencies.sk
new file mode 100644
index 0000000000..5f6b3048c7
--- /dev/null
+++ b/doc/src/diagrams/x11_dependencies.sk
@@ -0,0 +1,1416 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+G()
+fp((0,0,0))
+le()
+b()
+bs(268.8,339.25,0)
+bs(268.8,337.15,0)
+bs(352.8,337.15,0)
+bs(352.8,362.2,0)
+bs(350.7,362.2,0)
+bs(350.7,339.25,0)
+bs(268.8,339.25,0)
+bC()
+fp((0.59,0.99,0))
+le()
+b()
+bs(266.7,339.25,0)
+bs(350.7,339.25,0)
+bs(350.7,364.3,0)
+bs(266.7,364.3,0)
+bs(266.7,339.25,0)
+lw(1.12)
+lc(2)
+b()
+bs(266.7,339.25,0)
+bs(350.7,339.25,0)
+lw(1.12)
+lc(2)
+b()
+bs(350.7,339.25,0)
+bs(350.7,364.3,0)
+lw(1.12)
+lc(2)
+b()
+bs(350.7,364.3,0)
+bs(266.7,364.3,0)
+lw(1.12)
+lc(2)
+b()
+bs(266.7,364.3,0)
+bs(266.7,339.25,0)
+fp((0,0,0))
+Fn('Helvetica')
+Fs(14)
+txt('QtGui',(290.95,347))
+fp((0,0,0))
+le()
+b()
+bs(111.3,280.05,0)
+bs(111.3,277.95,0)
+bs(195.3,277.95,0)
+bs(195.3,302.15,0)
+bs(193.2,302.15,0)
+bs(193.2,280.05,0)
+bs(111.3,280.05,0)
+bC()
+fp((0.792,0.882,1))
+le()
+b()
+bs(109.2,280.05,0)
+bs(193.2,280.05,0)
+bs(193.2,304.25,0)
+bs(109.2,304.25,0)
+bs(109.2,280.05,0)
+lw(1.12)
+lc(2)
+b()
+bs(109.2,280.05,0)
+bs(193.2,280.05,0)
+lw(1.12)
+lc(2)
+b()
+bs(193.2,280.05,0)
+bs(193.2,304.25,0)
+lw(1.12)
+lc(2)
+b()
+bs(193.2,304.25,0)
+bs(109.2,304.25,0)
+lw(1.12)
+lc(2)
+b()
+bs(109.2,304.25,0)
+bs(109.2,280.05,0)
+fp((0,0,0))
+Fn('Helvetica')
+Fs(14)
+txt('Xcursor',(127.15,287.25))
+fp((0,0,0))
+le()
+b()
+bs(268.8,280.05,0)
+bs(268.8,277.95,0)
+bs(352.8,277.95,0)
+bs(352.8,302.15,0)
+bs(350.7,302.15,0)
+bs(350.7,280.05,0)
+bs(268.8,280.05,0)
+bC()
+fp((0.792,0.882,1))
+le()
+b()
+bs(266.7,280.05,0)
+bs(350.7,280.05,0)
+bs(350.7,304.25,0)
+bs(266.7,304.25,0)
+bs(266.7,280.05,0)
+lw(1.12)
+lc(2)
+b()
+bs(266.7,280.05,0)
+bs(350.7,280.05,0)
+lw(1.12)
+lc(2)
+b()
+bs(350.7,280.05,0)
+bs(350.7,304.25,0)
+lw(1.12)
+lc(2)
+b()
+bs(350.7,304.25,0)
+bs(266.7,304.25,0)
+lw(1.12)
+lc(2)
+b()
+bs(266.7,304.25,0)
+bs(266.7,280.05,0)
+fp((0,0,0))
+Fn('Helvetica')
+Fs(14)
+txt('Xr',(287.8,287.25))
+fp((0,0,0))
+Fn('Helvetica')
+Fs(14)
+txt('andr',(301.7,287.25))
+fp((0,0,0))
+le()
+b()
+bs(426.3,280.05,0)
+bs(426.3,277.95,0)
+bs(510.3,277.95,0)
+bs(510.3,302.15,0)
+bs(508.2,302.15,0)
+bs(508.2,280.05,0)
+bs(426.3,280.05,0)
+bC()
+fp((0.792,0.882,1))
+le()
+b()
+bs(424.2,280.05,0)
+bs(508.2,280.05,0)
+bs(508.2,304.25,0)
+bs(424.2,304.25,0)
+bs(424.2,280.05,0)
+lw(1.12)
+lc(2)
+b()
+bs(424.2,280.05,0)
+bs(508.2,280.05,0)
+lw(1.12)
+lc(2)
+b()
+bs(508.2,280.05,0)
+bs(508.2,304.25,0)
+lw(1.12)
+lc(2)
+b()
+bs(508.2,304.25,0)
+bs(424.2,304.25,0)
+lw(1.12)
+lc(2)
+b()
+bs(424.2,304.25,0)
+bs(424.2,280.05,0)
+fp((0,0,0))
+Fn('Helvetica')
+Fs(14)
+txt('Xiner',(436.55,287.25))
+fp((0,0,0))
+Fn('Helvetica')
+Fs(14)
+txt('ama',(469.125,287.25))
+fp((0,0,0))
+le()
+b()
+bs(561.2,280.15,0)
+bs(561.2,278.05,0)
+bs(645.2,278.05,0)
+bs(645.2,302.05,0)
+bs(643.1,302.05,0)
+bs(643.1,280.15,0)
+bs(561.2,280.15,0)
+bC()
+fp((0.792,0.882,1))
+le()
+b()
+bs(559.1,280.15,0)
+bs(643.1,280.15,0)
+bs(643.1,304.15,0)
+bs(559.1,304.15,0)
+bs(559.1,280.15,0)
+lw(1.12)
+lc(2)
+b()
+bs(559.1,280.15,0)
+bs(643.1,280.15,0)
+lw(1.12)
+lc(2)
+b()
+bs(643.1,280.15,0)
+bs(643.1,304.15,0)
+lw(1.12)
+lc(2)
+b()
+bs(643.1,304.15,0)
+bs(559.1,304.15,0)
+lw(1.12)
+lc(2)
+b()
+bs(559.1,304.15,0)
+bs(559.1,280.15,0)
+fp((0,0,0))
+Fn('Helvetica')
+Fs(14)
+txt('Xi',(595.35,287.15))
+fp((0,0,0))
+le()
+b()
+bs(268.8,220.85,0)
+bs(268.8,218.75,0)
+bs(352.8,218.75,0)
+bs(352.8,242.95,0)
+bs(350.7,242.95,0)
+bs(350.7,220.85,0)
+bs(268.8,220.85,0)
+bC()
+fp((0.792,0.882,1))
+le()
+b()
+bs(266.7,220.85,0)
+bs(350.7,220.85,0)
+bs(350.7,245.05,0)
+bs(266.7,245.05,0)
+bs(266.7,220.85,0)
+lw(1.12)
+lc(2)
+b()
+bs(266.7,220.85,0)
+bs(350.7,220.85,0)
+lw(1.12)
+lc(2)
+b()
+bs(350.7,220.85,0)
+bs(350.7,245.05,0)
+lw(1.12)
+lc(2)
+b()
+bs(350.7,245.05,0)
+bs(266.7,245.05,0)
+lw(1.12)
+lc(2)
+b()
+bs(266.7,245.05,0)
+bs(266.7,220.85,0)
+fp((0,0,0))
+Fn('Helvetica')
+Fs(14)
+txt('XRender',(281.15,228.05))
+fp((0,0,0))
+le()
+b()
+bs(662,220.95,0)
+bs(662,218.85,0)
+bs(746,218.85,0)
+bs(746,242.95,0)
+bs(743.9,242.95,0)
+bs(743.9,220.95,0)
+bs(662,220.95,0)
+bC()
+fp((0.961,0.961,0.863))
+le()
+b()
+bs(659.9,220.95,0)
+bs(743.9,220.95,0)
+bs(743.9,245.05,0)
+bs(659.9,245.05,0)
+bs(659.9,220.95,0)
+lw(1.12)
+lc(2)
+b()
+bs(659.9,220.95,0)
+bs(743.9,220.95,0)
+lw(1.12)
+lc(2)
+b()
+bs(743.9,220.95,0)
+bs(743.9,245.05,0)
+lw(1.12)
+lc(2)
+b()
+bs(743.9,245.05,0)
+bs(659.9,245.05,0)
+lw(1.12)
+lc(2)
+b()
+bs(659.9,245.05,0)
+bs(659.9,220.95,0)
+fp((0,0,0))
+Fn('Helvetica')
+Fs(14)
+txt('Xt*',(692.9,228.05))
+fp((0,0,0))
+le()
+b()
+bs(10.4998,160.8,0)
+bs(10.4998,158.7,0)
+bs(94.4998,158.7,0)
+bs(94.4998,183.75,0)
+bs(92.3999,183.75,0)
+bs(92.3999,160.8,0)
+bs(10.4998,160.8,0)
+bC()
+fp((0.61,0.61,1))
+le()
+b()
+bs(8.3999,160.8,0)
+bs(92.3999,160.8,0)
+bs(92.3999,185.85,0)
+bs(8.3999,185.85,0)
+bs(8.3999,160.8,0)
+lw(1.12)
+lc(2)
+b()
+bs(8.3999,160.8,0)
+bs(92.3999,160.8,0)
+lw(1.12)
+lc(2)
+b()
+bs(92.3999,160.8,0)
+bs(92.3999,185.85,0)
+lw(1.12)
+lc(2)
+b()
+bs(92.3999,185.85,0)
+bs(8.3999,185.85,0)
+lw(1.12)
+lc(2)
+b()
+bs(8.3999,185.85,0)
+bs(8.3999,160.8,0)
+fp((0,0,0))
+Fn('Helvetica')
+Fs(14)
+txt('QtCore',(28.1997,168.55))
+fp((0,0,0))
+le()
+b()
+bs(268.8,161.15,0)
+bs(268.8,159.05,0)
+bs(352.8,159.05,0)
+bs(352.8,183.4,0)
+bs(350.7,183.4,0)
+bs(350.7,161.15,0)
+bs(268.8,161.15,0)
+bC()
+fp((0.792,0.882,1))
+le()
+b()
+bs(266.7,161.15,0)
+bs(350.7,161.15,0)
+bs(350.7,185.5,0)
+bs(266.7,185.5,0)
+bs(266.7,161.15,0)
+lw(1.12)
+lc(2)
+b()
+bs(266.7,161.15,0)
+bs(350.7,161.15,0)
+lw(1.12)
+lc(2)
+b()
+bs(350.7,161.15,0)
+bs(350.7,185.5,0)
+lw(1.12)
+lc(2)
+b()
+bs(350.7,185.5,0)
+bs(266.7,185.5,0)
+lw(1.12)
+lc(2)
+b()
+bs(266.7,185.5,0)
+bs(266.7,161.15,0)
+fp((0,0,0))
+Fn('Helvetica')
+Fs(14)
+txt('Xfix',(290.1,168.35))
+fp((0,0,0))
+Fn('Helvetica')
+Fs(14)
+txt('es',(313.038,168.35))
+fp((0,0,0))
+le()
+b()
+bs(426.3,161.25,0)
+bs(426.3,159.15,0)
+bs(510.3,159.15,0)
+bs(510.3,183.35,0)
+bs(508.2,183.35,0)
+bs(508.2,161.25,0)
+bs(426.3,161.25,0)
+bC()
+fp((0.961,0.961,0.863))
+le()
+b()
+bs(424.2,161.25,0)
+bs(508.2,161.25,0)
+bs(508.2,185.45,0)
+bs(424.2,185.45,0)
+bs(424.2,161.25,0)
+lw(1.12)
+lc(2)
+b()
+bs(424.2,161.25,0)
+bs(508.2,161.25,0)
+lw(1.12)
+lc(2)
+b()
+bs(508.2,161.25,0)
+bs(508.2,185.45,0)
+lw(1.12)
+lc(2)
+b()
+bs(508.2,185.45,0)
+bs(424.2,185.45,0)
+lw(1.12)
+lc(2)
+b()
+bs(424.2,185.45,0)
+bs(424.2,161.25,0)
+fp((0,0,0))
+Fn('Helvetica')
+Fs(14)
+txt('Xe',(452.55,168.45))
+fp((0,0,0))
+Fn('Helvetica')
+Fs(14)
+txt('xt',(469.272,168.45))
+fp((0,0,0))
+le()
+b()
+bs(662,161.05,0)
+bs(662,158.95,0)
+bs(746,158.95,0)
+bs(746,183.5,0)
+bs(743.9,183.5,0)
+bs(743.9,161.05,0)
+bs(662,161.05,0)
+bC()
+fp((0.761,0.98,0.98))
+le()
+b()
+bs(659.9,161.05,0)
+bs(743.9,161.05,0)
+bs(743.9,185.6,0)
+bs(659.9,185.6,0)
+bs(659.9,161.05,0)
+lw(1.12)
+lc(2)
+b()
+bs(659.9,161.05,0)
+bs(743.9,161.05,0)
+lw(1.12)
+lc(2)
+b()
+bs(743.9,161.05,0)
+bs(743.9,185.6,0)
+lw(1.12)
+lc(2)
+b()
+bs(743.9,185.6,0)
+bs(659.9,185.6,0)
+lw(1.12)
+lc(2)
+b()
+bs(659.9,185.6,0)
+bs(659.9,161.05,0)
+fp((0,0,0))
+Fn('Helvetica')
+Fs(14)
+txt('SM',(691.9,168.3))
+fp((0,0,0))
+le()
+b()
+bs(10.4998,98.9001,0)
+bs(10.4998,96.8003,0)
+bs(94.4998,96.8003,0)
+bs(94.4998,123.7,0)
+bs(92.3999,123.7,0)
+bs(92.3999,98.9001,0)
+bs(10.4998,98.9001,0)
+bC()
+fp((0.741,0.718,0.42))
+le()
+b()
+bs(8.3999,98.9001,0)
+bs(92.3999,98.9001,0)
+bs(92.3999,125.8,0)
+bs(8.3999,125.8,0)
+bs(8.3999,98.9001,0)
+lw(1.12)
+lc(2)
+b()
+bs(8.3999,98.9001,0)
+bs(92.3999,98.9001,0)
+lw(1.12)
+lc(2)
+b()
+bs(92.3999,98.9001,0)
+bs(92.3999,125.8,0)
+lw(1.12)
+lc(2)
+b()
+bs(92.3999,125.8,0)
+bs(8.3999,125.8,0)
+lw(1.12)
+lc(2)
+b()
+bs(8.3999,125.8,0)
+bs(8.3999,98.9001,0)
+fp((0,0,0))
+Fn('Helvetica')
+Fs(14)
+txt('pthread',(27.1499,108.8))
+fp((0,0,0))
+le()
+b()
+bs(111.3,100.1,0)
+bs(111.3,98.0002,0)
+bs(195.3,98.0002,0)
+bs(195.3,122.55,0)
+bs(193.2,122.55,0)
+bs(193.2,100.1,0)
+bs(111.3,100.1,0)
+bC()
+fp((0.7,0.7,0.7))
+le()
+b()
+bs(109.2,100.1,0)
+bs(193.2,100.1,0)
+bs(193.2,124.65,0)
+bs(109.2,124.65,0)
+bs(109.2,100.1,0)
+lw(1.12)
+lc(2)
+b()
+bs(109.2,100.1,0)
+bs(193.2,100.1,0)
+lw(1.12)
+lc(2)
+b()
+bs(193.2,100.1,0)
+bs(193.2,124.65,0)
+lw(1.12)
+lc(2)
+b()
+bs(193.2,124.65,0)
+bs(109.2,124.65,0)
+lw(1.12)
+lc(2)
+b()
+bs(109.2,124.65,0)
+bs(109.2,100.1,0)
+fp((0,0,0))
+Fn('Helvetica')
+Fs(14)
+txt('Glib',(139.05,107.35))
+fp((0,0,0))
+le()
+b()
+bs(426.3,100.35,0)
+bs(426.3,98.2502,0)
+bs(510.3,98.2502,0)
+bs(510.3,122.25,0)
+bs(508.2,122.25,0)
+bs(508.2,100.35,0)
+bs(426.3,100.35,0)
+bC()
+fp((0.961,0.961,0.863))
+le()
+b()
+bs(424.2,100.35,0)
+bs(508.2,100.35,0)
+bs(508.2,124.35,0)
+bs(424.2,124.35,0)
+bs(424.2,100.35,0)
+lw(1.12)
+lc(2)
+b()
+bs(424.2,100.35,0)
+bs(508.2,100.35,0)
+lw(1.12)
+lc(2)
+b()
+bs(508.2,100.35,0)
+bs(508.2,124.35,0)
+lw(1.12)
+lc(2)
+b()
+bs(508.2,124.35,0)
+bs(424.2,124.35,0)
+lw(1.12)
+lc(2)
+b()
+bs(424.2,124.35,0)
+bs(424.2,100.35,0)
+fp((0,0,0))
+Fn('Helvetica')
+Fs(14)
+txt('X11',(455.15,107.35))
+fp((0,0,0))
+le()
+b()
+bs(662,100.1,0)
+bs(662,98.0002,0)
+bs(746,98.0002,0)
+bs(746,122.55,0)
+bs(743.9,122.55,0)
+bs(743.9,100.1,0)
+bs(662,100.1,0)
+bC()
+fp((0.761,0.98,0.98))
+le()
+b()
+bs(659.9,100.1,0)
+bs(743.9,100.1,0)
+bs(743.9,124.65,0)
+bs(659.9,124.65,0)
+bs(659.9,100.1,0)
+lw(1.12)
+lc(2)
+b()
+bs(659.9,100.1,0)
+bs(743.9,100.1,0)
+lw(1.12)
+lc(2)
+b()
+bs(743.9,100.1,0)
+bs(743.9,124.65,0)
+lw(1.12)
+lc(2)
+b()
+bs(743.9,124.65,0)
+bs(659.9,124.65,0)
+lw(1.12)
+lc(2)
+b()
+bs(659.9,124.65,0)
+bs(659.9,100.1,0)
+fp((0,0,0))
+Fn('Helvetica')
+Fs(14)
+txt('ICE',(690.6,107.35))
+fp((0,0,0))
+Fn('Helvetica')
+txt('some',(585.05,38.7002))
+fp((0,0,0))
+Fn('Helvetica')
+txt('configur',(617.15,38.7002))
+fp((0,0,0))
+Fn('Helvetica')
+txt('ations',(659.733,38.7002))
+fp((0,0,0))
+Fn('Helvetica')
+txt('only',(694.4,38.7002))
+fp((0,0,0))
+Fn('Helvetica')
+txt('*',(568.85,22.5002))
+fp((0,0,0))
+Fn('Helvetica')
+txt('Xt',(585.05,22.5002))
+fp((0,0,0))
+Fn('Helvetica')
+txt('intr',(599.4,22.5002))
+fp((0,0,0))
+Fn('Helvetica')
+txt('insics',(616.217,22.5002))
+fp((0,0,0))
+Fn('Helvetica')
+txt('only',(648.95,22.5002))
+lw(1.12)
+lc(2)
+ld((0, 2.4999899999999999))
+b()
+bs(308.7,339.25,0)
+bs(308.7,328.05,0)
+lw(1.12)
+lc(2)
+ld((0, 2.0312000000000001))
+b()
+bs(308.7,328.05,0)
+bs(308.7,332.6,0)
+lw(1.12)
+lc(2)
+ld((0, 2.45438))
+b()
+bs(308.7,332.6,0)
+bs(308.7,332.6,0)
+bc(308.7,330.744,309.438,328.963,310.75,327.651,0)
+lw(1.12)
+lc(2)
+ld((0, 2.4543599999999999))
+b()
+bs(310.75,327.65,0)
+bs(310.75,327.651,0)
+bc(312.063,326.338,313.844,325.6,315.7,325.6,0)
+lw(1.12)
+lc(2)
+ld((0, 2.4639500000000001))
+b()
+bs(315.7,325.6,0)
+bs(387.45,325.6,0)
+lw(1.12)
+lc(2)
+ld((0, 2.4639500000000001))
+b()
+bs(387.45,325.6,0)
+bs(459.2,325.6,0)
+lw(1.12)
+lc(2)
+ld((0, 2.45438))
+b()
+bs(459.2,325.6,0)
+bs(459.2,325.6,0)
+bc(461.056,325.6,462.837,324.863,464.15,323.55,0)
+lw(1.12)
+lc(2)
+ld((0, 2.45438))
+b()
+bs(464.15,323.55,0)
+bs(464.15,323.55,0)
+bc(465.462,322.237,466.2,320.457,466.2,318.6,0)
+lw(1.12)
+lc(2)
+ld((0, 2.3437899999999998))
+b()
+bs(466.2,318.6,0)
+bs(466.2,313.35,0)
+lw(1.12)
+lc(2)
+ld((0, 2.5))
+b()
+bs(466.2,313.35,0)
+bs(466.2,311.95,0)
+fp((0,0,0))
+le()
+b()
+bs(462.35,311.95,0)
+bs(466.199,304.25,0)
+bs(470.05,311.95,0)
+lw(1.12)
+lc(2)
+ld((0, 2.4999899999999999))
+b()
+bs(308.7,339.25,0)
+bs(308.7,328.05,0)
+lw(1.12)
+lc(2)
+ld((0, 2.0088900000000001))
+b()
+bs(308.7,328.05,0)
+bs(308.7,332.55,0)
+lw(1.12)
+lc(2)
+ld((0, 2.45438))
+b()
+bs(308.7,332.55,0)
+bs(308.7,332.55,0)
+bc(308.7,330.694,309.438,328.913,310.75,327.601,0)
+lw(1.12)
+lc(2)
+ld((0, 2.4543599999999999))
+b()
+bs(310.75,327.6,0)
+bs(310.75,327.601,0)
+bc(312.063,326.288,313.844,325.55,315.7,325.55,0)
+lw(1.12)
+lc(2)
+ld((0, 2.4857100000000001))
+b()
+bs(459.2,325.6,0)
+bs(594.1,325.55,0)
+lw(1.12)
+lc(2)
+ld((0, 2.4543900000000001))
+b()
+bs(594.1,325.55,0)
+bs(594.1,325.55,0)
+bc(595.956,325.55,597.737,324.813,599.05,323.5,0)
+lw(1.12)
+lc(2)
+ld((0, 2.4544100000000002))
+b()
+bs(599.05,323.5,0)
+bs(599.05,323.5,0)
+bc(600.362,322.187,601.1,320.407,601.1,318.55,0)
+lw(1.12)
+lc(2)
+ld((0, 2.3660899999999998))
+b()
+bs(601.1,318.55,0)
+bs(601.1,313.25,0)
+lw(1.12)
+lc(2)
+ld((0, 2.5))
+b()
+bs(601.1,313.25,0)
+bs(601.1,311.85,0)
+fp((0,0,0))
+le()
+b()
+bs(597.25,311.85,0)
+bs(601.099,304.15,0)
+bs(604.949,311.85,0)
+lw(1.12)
+lc(2)
+b()
+bs(266.7,351.775,0)
+bs(255.5,351.775,0)
+lw(1.12)
+lc(2)
+b()
+bs(255.5,351.775,0)
+bs(57.3999,351.775,0)
+lw(1.12)
+lc(2)
+b()
+bs(57.3999,351.775,0)
+bs(57.3999,351.775,0)
+bc(53.5339,351.775,50.3999,348.641,50.3999,344.775,0)
+lw(1.12)
+lc(2)
+b()
+bs(50.3999,344.775,0)
+bs(50.3999,194.95,0)
+lw(1.12)
+lc(2)
+b()
+bs(50.3999,194.95,0)
+bs(50.3999,193.55,0)
+fp((0,0,0))
+le()
+b()
+bs(46.5496,193.55,0)
+bs(50.3994,185.85,0)
+bs(54.2495,193.55,0)
+lw(1.12)
+lc(2)
+b()
+bs(50.3999,160.8,0)
+bs(50.3999,133.5,0)
+fp((0,0,0))
+le()
+b()
+bs(46.5496,133.5,0)
+bs(50.3994,125.8,0)
+bs(54.2495,133.5,0)
+lw(1.12)
+lc(2)
+ld((0, 2))
+b()
+bs(50.3999,160.8,0)
+bs(50.3999,149.6,0)
+lw(1.12)
+lc(2)
+ld((0, 1.7745500000000001))
+b()
+bs(50.3999,149.6,0)
+bs(50.3999,153.575,0)
+lw(1.12)
+lc(2)
+ld((0, 2.4543599999999999))
+b()
+bs(50.3999,153.575,0)
+bs(50.3999,153.575,0)
+bc(50.3999,151.719,51.1375,149.938,52.4502,148.625,0)
+lw(1.12)
+lc(2)
+ld((0, 2.4543699999999999))
+b()
+bs(52.45,148.625,0)
+bs(52.4502,148.625,0)
+bc(53.7629,147.313,55.5435,146.575,57.3999,146.575,0)
+lw(1.12)
+lc(2)
+ld((0, 2.4218799999999998))
+b()
+bs(57.3999,146.575,0)
+bs(100.8,146.575,0)
+lw(1.12)
+lc(2)
+ld((0, 2.4218799999999998))
+b()
+bs(100.8,146.575,0)
+bs(144.2,146.575,0)
+lw(1.12)
+lc(2)
+ld((0, 2.45438))
+b()
+bs(144.2,146.575,0)
+bs(144.2,146.575,0)
+bc(146.056,146.575,147.837,145.838,149.15,144.525,0)
+lw(1.12)
+lc(2)
+ld((0, 2.4543699999999999))
+b()
+bs(149.15,144.525,0)
+bs(149.15,144.525,0)
+bc(150.462,143.212,151.2,141.432,151.2,139.575,0)
+lw(1.12)
+lc(2)
+ld((0, 1.73363))
+b()
+bs(151.2,139.575,0)
+bs(151.2,133.75,0)
+lw(1.12)
+lc(2)
+ld((0, 2.5))
+b()
+bs(151.2,133.75,0)
+bs(151.2,132.35,0)
+fp((0,0,0))
+le()
+b()
+bs(147.35,132.35,0)
+bs(151.199,124.65,0)
+bs(155.05,132.35,0)
+lw(1.12)
+lc(2)
+b()
+bs(350.7,351.775,0)
+bs(361.9,351.775,0)
+lw(1.12)
+lc(2)
+b()
+bs(361.9,351.775,0)
+bs(694.9,351.775,0)
+lw(1.12)
+lc(2)
+b()
+bs(694.9,351.775,0)
+bs(694.9,351.775,0)
+bc(698.766,351.775,701.9,348.641,701.9,344.775,0)
+lw(1.12)
+lc(2)
+b()
+bs(701.9,344.775,0)
+bs(701.9,254.15,0)
+lw(1.12)
+lc(2)
+b()
+bs(701.9,254.15,0)
+bs(701.9,252.75,0)
+fp((0,0,0))
+le()
+b()
+bs(698.05,252.75,0)
+bs(701.899,245.05,0)
+bs(705.75,252.75,0)
+lw(1.12)
+lc(2)
+ld((0, 2.4375200000000001))
+b()
+bs(308.7,339.25,0)
+bs(308.7,311.95,0)
+fp((0,0,0))
+le()
+b()
+bs(304.85,311.95,0)
+bs(308.699,304.25,0)
+bs(312.55,311.95,0)
+lw(1.12)
+lc(2)
+ld((0, 2.4999899999999999))
+b()
+bs(308.7,339.25,0)
+bs(308.7,328.05,0)
+lw(1.12)
+lc(2)
+ld((0, 2.0312000000000001))
+b()
+bs(308.7,328.05,0)
+bs(308.7,332.6,0)
+lw(1.12)
+lc(2)
+ld((0, 2.45438))
+b()
+bs(308.7,332.6,0)
+bs(308.7,332.6,0)
+bc(308.7,330.744,307.962,328.963,306.65,327.651,0)
+lw(1.12)
+lc(2)
+ld((0, 2.45438))
+b()
+bs(306.65,327.65,0)
+bs(306.65,327.651,0)
+bc(305.337,326.338,303.556,325.601,301.7,325.601,0)
+lw(1.12)
+lc(2)
+ld((0, 2.4639500000000001))
+b()
+bs(301.7,325.6,0)
+bs(229.95,325.6,0)
+lw(1.12)
+lc(2)
+ld((0, 2.4639500000000001))
+b()
+bs(229.95,325.6,0)
+bs(158.2,325.6,0)
+lw(1.12)
+lc(2)
+ld((0, 2.4543699999999999))
+b()
+bs(158.2,325.6,0)
+bs(158.2,325.6,0)
+bc(156.344,325.6,154.563,324.863,153.25,323.55,0)
+lw(1.12)
+lc(2)
+ld((0, 2.45438))
+b()
+bs(153.25,323.55,0)
+bs(153.25,323.55,0)
+bc(151.938,322.237,151.2,320.457,151.2,318.6,0)
+lw(1.12)
+lc(2)
+ld((0, 2.3437899999999998))
+b()
+bs(151.2,318.6,0)
+bs(151.2,313.35,0)
+lw(1.12)
+lc(2)
+ld((0, 2.5))
+b()
+bs(151.2,313.35,0)
+bs(151.2,311.95,0)
+fp((0,0,0))
+le()
+b()
+bs(147.35,311.95,0)
+bs(151.199,304.25,0)
+bs(155.05,311.95,0)
+lw(1.12)
+lc(2)
+b()
+bs(308.7,280.05,0)
+bs(308.7,252.75,0)
+fp((0,0,0))
+le()
+b()
+bs(304.85,252.75,0)
+bs(308.699,245.05,0)
+bs(312.55,252.75,0)
+lw(1.12)
+lc(2)
+b()
+bs(466.2,280.05,0)
+bs(466.2,193.15,0)
+fp((0,0,0))
+le()
+b()
+bs(462.35,193.15,0)
+bs(466.199,185.45,0)
+bs(470.05,193.15,0)
+lw(1.12)
+lc(2)
+b()
+bs(151.2,280.05,0)
+bs(151.2,268.85,0)
+lw(1.12)
+lc(2)
+b()
+bs(151.2,268.85,0)
+bs(151.2,239.95,0)
+lw(1.12)
+lc(2)
+b()
+bs(151.2,239.95,0)
+bs(151.2,239.95,0)
+bc(151.2,236.084,154.334,232.95,158.2,232.95,0)
+lw(1.12)
+lc(2)
+b()
+bs(158.2,232.95,0)
+bs(257.6,232.95,0)
+lw(1.12)
+lc(2)
+b()
+bs(257.6,232.95,0)
+bs(259,232.95,0)
+fp((0,0,0))
+le()
+b()
+bs(259,229.1,0)
+bs(266.699,232.95,0)
+bs(259,236.8,0)
+lw(1.12)
+lc(2)
+b()
+bs(350.7,232.95,0)
+bs(361.9,232.95,0)
+lw(1.12)
+lc(2)
+b()
+bs(361.9,232.95,0)
+bs(459.2,232.95,0)
+lw(1.12)
+lc(2)
+b()
+bs(459.2,232.95,0)
+bs(459.2,232.95,0)
+bc(463.066,232.95,466.2,229.816,466.2,225.95,0)
+lw(1.12)
+lc(2)
+b()
+bs(466.2,225.95,0)
+bs(466.2,194.55,0)
+lw(1.12)
+lc(2)
+b()
+bs(466.2,194.55,0)
+bs(466.2,193.15,0)
+fp((0,0,0))
+le()
+b()
+bs(462.35,193.15,0)
+bs(466.199,185.45,0)
+bs(470.05,193.15,0)
+lw(1.12)
+lc(2)
+b()
+bs(559.1,292.15,0)
+bs(547.9,292.15,0)
+lw(1.12)
+lc(2)
+b()
+bs(547.9,292.15,0)
+bs(544.5,292.15,0)
+lw(1.12)
+lc(2)
+b()
+bs(544.5,292.15,0)
+bs(544.5,292.15,0)
+bc(542.643,292.15,540.863,291.413,539.55,290.1,0)
+lw(1.12)
+lc(2)
+b()
+bs(539.55,290.1,0)
+bs(539.55,290.1,0)
+bc(538.238,288.787,537.5,287.007,537.5,285.15,0)
+lw(1.12)
+lc(2)
+b()
+bs(537.5,285.15,0)
+bs(537.5,232.75,0)
+lw(1.12)
+lc(2)
+b()
+bs(537.5,232.75,0)
+bs(537.5,180.35,0)
+lw(1.12)
+lc(2)
+b()
+bs(537.5,180.35,0)
+bs(537.5,180.35,0)
+bc(537.5,178.494,536.762,176.713,535.449,175.401,0)
+lw(1.12)
+lc(2)
+b()
+bs(535.449,175.4,0)
+bs(535.449,175.401,0)
+bc(534.137,174.088,532.356,173.35,530.5,173.35,0)
+lw(1.12)
+lc(2)
+b()
+bs(530.5,173.35,0)
+bs(517.3,173.35,0)
+lw(1.12)
+lc(2)
+b()
+bs(517.3,173.35,0)
+bs(515.9,173.35,0)
+fp((0,0,0))
+le()
+b()
+bs(515.9,177.2,0)
+bs(508.2,173.351,0)
+bs(515.9,169.5,0)
+lw(1.12)
+lc(2)
+b()
+bs(701.9,220.95,0)
+bs(701.9,193.3,0)
+fp((0,0,0))
+le()
+b()
+bs(698.05,193.3,0)
+bs(701.899,185.6,0)
+bs(705.75,193.3,0)
+lw(1.12)
+lc(2)
+b()
+bs(659.9,233,0)
+bs(648.7,233,0)
+lw(1.12)
+lc(2)
+b()
+bs(648.7,233,0)
+bs(594.9,233,0)
+lw(1.12)
+lc(2)
+b()
+bs(594.9,233,0)
+bs(594.9,233,0)
+bc(593.043,233,591.263,232.263,589.95,230.95,0)
+lw(1.12)
+lc(2)
+b()
+bs(589.95,230.95,0)
+bs(589.95,230.95,0)
+bc(588.638,229.637,587.9,227.857,587.9,226,0)
+lw(1.12)
+lc(2)
+b()
+bs(587.9,226,0)
+bs(587.9,172.675,0)
+lw(1.12)
+lc(2)
+b()
+bs(587.9,172.675,0)
+bs(587.9,119.35,0)
+lw(1.12)
+lc(2)
+b()
+bs(587.9,119.35,0)
+bs(587.9,119.35,0)
+bc(587.9,117.494,587.162,115.713,585.85,114.401,0)
+lw(1.12)
+lc(2)
+b()
+bs(585.85,114.4,0)
+bs(585.85,114.401,0)
+bc(584.537,113.088,582.756,112.35,580.9,112.35,0)
+lw(1.12)
+lc(2)
+b()
+bs(580.9,112.35,0)
+bs(517.3,112.35,0)
+lw(1.12)
+lc(2)
+b()
+bs(517.3,112.35,0)
+bs(515.9,112.35,0)
+fp((0,0,0))
+le()
+b()
+bs(515.9,116.2,0)
+bs(508.2,112.35,0)
+bs(515.9,108.5,0)
+lw(1.12)
+lc(2)
+b()
+bs(701.9,161.05,0)
+bs(701.9,132.35,0)
+fp((0,0,0))
+le()
+b()
+bs(698.05,132.35,0)
+bs(701.899,124.65,0)
+bs(705.75,132.35,0)
+lw(1.12)
+lc(2)
+b()
+bs(466.2,161.25,0)
+bs(466.2,132.05,0)
+fp((0,0,0))
+le()
+b()
+bs(462.35,132.05,0)
+bs(466.199,124.35,0)
+bs(470.05,132.05,0)
+lw(1.12)
+lc(2)
+b()
+bs(151.2,280.05,0)
+bs(151.2,268.85,0)
+lw(1.12)
+lc(2)
+b()
+bs(151.2,268.85,0)
+bs(151.2,180.325,0)
+lw(1.12)
+lc(2)
+b()
+bs(151.2,180.325,0)
+bs(151.2,180.325,0)
+bc(151.2,176.459,154.334,173.325,158.2,173.325,0)
+lw(1.12)
+lc(2)
+b()
+bs(158.2,173.325,0)
+bs(257.6,173.325,0)
+lw(1.12)
+lc(2)
+b()
+bs(257.6,173.325,0)
+bs(259,173.325,0)
+fp((0,0,0))
+le()
+b()
+bs(259,169.475,0)
+bs(266.699,173.325,0)
+bs(259,177.175,0)
+lw(1.12)
+lc(2)
+b()
+bs(308.7,161.15,0)
+bs(308.7,149.95,0)
+lw(1.12)
+lc(2)
+b()
+bs(308.7,149.95,0)
+bs(308.7,153.6,0)
+lw(1.12)
+lc(2)
+b()
+bs(308.7,153.6,0)
+bs(308.7,153.6,0)
+bc(308.7,151.744,309.438,149.963,310.75,148.651,0)
+lw(1.12)
+lc(2)
+b()
+bs(310.75,148.65,0)
+bs(310.75,148.651,0)
+bc(312.063,147.338,313.844,146.6,315.7,146.6,0)
+lw(1.12)
+lc(2)
+b()
+bs(315.7,146.6,0)
+bs(387.45,146.6,0)
+lw(1.12)
+lc(2)
+b()
+bs(387.45,146.6,0)
+bs(459.2,146.6,0)
+lw(1.12)
+lc(2)
+b()
+bs(459.2,146.6,0)
+bs(459.2,146.6,0)
+bc(461.056,146.6,462.837,145.863,464.15,144.55,0)
+lw(1.12)
+lc(2)
+b()
+bs(464.15,144.55,0)
+bs(464.15,144.55,0)
+bc(465.462,143.237,466.2,141.457,466.2,139.6,0)
+lw(1.12)
+lc(2)
+b()
+bs(466.2,139.6,0)
+bs(466.2,133.45,0)
+lw(1.12)
+lc(2)
+b()
+bs(466.2,133.45,0)
+bs(466.2,132.05,0)
+fp((0,0,0))
+le()
+b()
+bs(462.35,132.05,0)
+bs(466.199,124.35,0)
+bs(470.05,132.05,0)
+lw(1.12)
+lc(2)
+ld((0, 2.2889599999999999))
+b()
+bs(552.65,41.8,0)
+bs(580.85,41.8,0)
+G_()
+G()
+fp((0,0,0))
+Fn('Helvetica')
+Fs(16)
+txt('libr',(341.317,393.4))
+fp((0,0,0))
+Fn('Helvetica')
+Fs(16)
+txt('ar',(362.494,393.4))
+fp((0,0,0))
+Fn('Helvetica')
+Fs(16)
+txt('y',(377.168,393.4))
+fp((0,0,0))
+Fn('Helvetica')
+Fs(16)
+txt('dependencies',(389.267,393.4))
+fp((0,0,0))
+Fn('Helvetica')
+Fs(16)
+txt('Qt for X11',(265.517,393.4))
+G_()
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,5,5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/xmlpatterns-qobjectxmlmodel.png b/doc/src/diagrams/xmlpatterns-qobjectxmlmodel.png
new file mode 100644
index 0000000000..69e5f15dc7
--- /dev/null
+++ b/doc/src/diagrams/xmlpatterns-qobjectxmlmodel.png
diff --git a/doc/src/distributingqt.qdoc b/doc/src/distributingqt.qdoc
new file mode 100644
index 0000000000..9b88dc4ce3
--- /dev/null
+++ b/doc/src/distributingqt.qdoc
@@ -0,0 +1,154 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** Documentation on deploying Qt.
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Qt GUI Toolkit.
+** EDITIONS: FREE, PROFESSIONAL, ENTERPRISE
+**
+****************************************************************************/
+
+/*
+\page distributingqt.html
+
+\title Deploying Qt Applications
+
+This document lists the platform-specific files needed to distribute
+Qt applications. We do not include any compiler-specific files that
+may also be required. (See also, \link winsystem.html Window
+System-specific Notes\endlink.)
+
+\tableofcontents
+
+Also see the "deployment" articles in
+\e{\link http://doc.trolltech.com/qq/ Qt Quarterly\endlink}:
+\list
+\i \link http://doc.trolltech.com/qq/qq09-mac-deployment.html
+Deploying Applications on Mac OS X\endlink
+\i \link http://doc.trolltech.com/qq/qq10-windows-deployment.html
+Deploying Applications on Windows\endlink
+\i \link http://doc.trolltech.com/qq/qq11-unix-deployment.html
+Deploying Applications on X11\endlink
+\endlist
+
+\section1 Static Qt Applications
+
+To distribute static Qt applications, you need the following file for
+all platforms:
+
+\list
+\i your application's executable
+\endlist
+
+\section1 Dynamic Qt Applications
+
+To distribute dynamic Qt applications, you will need the following
+files for all platforms:
+
+\list
+\i application executable
+\i the Qt library
+\endlist
+
+The Qt library must either be in the same directory as the application
+executable or in a directory which is included in the system library
+path.
+
+The library is provided by the following platform specific files:
+
+\table
+\header \i Platform \i File
+\row \i Windows \i \c qt[version].dll
+\row \i Unix/Linux \i \c libqt[version].so
+\row \i Mac \i \c libqt[version].dylib
+\endtable
+
+\e version includes the three version numbers.
+
+\section2 Distributing Plugins
+
+You must include any plugin files required by the application.
+
+Plugins must be put into a subdirectory under a directory known to
+Qt as a plugin directory. The subdirectory must have the name of the
+plugin category (e.g. \c styles, \c sqldrivers, \c designer, etc.).
+
+Qt searches in the following directories for plugin categories:
+
+\list
+\i Application specific plugin paths
+\i Build-directory of Qt
+\i The application directory
+\endlist
+
+Application specific plugin paths can be added using
+QCoreApplication::addLibraryPath(). The build-directory of Qt is hardcoded
+in the Qt library and can be changed as a part of the installation
+process.
+
+\section1 Dynamic Dialogs
+
+For dynamic dialogs if you use QWidgetFactory, you need the following
+files for all platforms:
+
+\list
+\i The same files as used for dynamic Qt applications
+\i The QUI Library
+\endlist
+
+The QUI library is provided by the following platform specific files:
+\table
+\header \i Platform \i File
+\row \i Windows  \i\c qui.lib
+\row \i Unix/Linux  \i\c libqui.so
+\row \i Mac \i \c libqui.dylib
+\endtable
+
+The QUI library must either be in the same directory as the
+application executable or in a directory which is included in the
+system library path.
+
+*/
diff --git a/doc/src/dnd.qdoc b/doc/src/dnd.qdoc
new file mode 100644
index 0000000000..119922b5bf
--- /dev/null
+++ b/doc/src/dnd.qdoc
@@ -0,0 +1,543 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page dnd.html
+    \title Drag and Drop
+    \ingroup architecture
+    \brief An overview of the drag and drop system provided by Qt.
+
+    Drag and drop provides a simple visual mechanism which users can use
+    to transfer information between and within applications. (In the
+    literature this is referred to as a "direct manipulation model".) Drag
+    and drop is similar in function to the clipboard's cut and paste
+    mechanism.
+
+    \tableofcontents
+
+    This document describes the basic drag and drop mechanism and
+    outlines the approach used to enable it in custom widgets. Drag
+    and drop operations are also supported by Qt's item views and by
+    the graphics view framework; more information is available in the
+    \l{Using Drag and Drop with Item Views} and \l{The Graphics View
+    Framework} documents.
+
+    \section1 Configuration
+
+    The QApplication object provides some properties that are related
+    to drag and drop operations:
+
+    \list
+    \i \l{QApplication::startDragTime} describes the amount of time in
+       milliseconds that the user must hold down a mouse button over an
+       object before a drag will begin.
+    \i \l{QApplication::startDragDistance} indicates how far the user has to
+       move the mouse while holding down a mouse button before the movement
+       will be interpreted as dragging. Use of high values for this quantity
+       prevents accidental dragging when the user only meant to click on an
+       object.
+    \endlist
+
+    These quantities provide sensible default values for you to use if you
+    provide drag and drop support in your widgets.
+
+    \section1 Dragging
+
+    To start a drag, create a QDrag object, and call its
+    exec() function. In most applications, it is a good idea to begin a drag
+    and drop operation only after a mouse button has been pressed and the
+    cursor has been moved a certain distance. However, the simplest way to
+    enable dragging from a widget is to reimplement the widget's
+    \l{QWidget::mousePressEvent()}{mousePressEvent()} and start a drag
+    and drop operation:
+
+    \snippet doc/src/snippets/dragging/mainwindow.cpp 0
+    \dots 8
+    \snippet doc/src/snippets/dragging/mainwindow.cpp 2
+
+    Although the user may take some time to complete the dragging operation,
+    as far as the application is concerned the exec() function is a blocking
+    function that returns with \l{Qt::DropActions}{one of several values}.
+    These indicate how the operation ended, and are described in more detail
+    below.
+
+    Note that the exec() function does not block the main event loop.
+
+    For widgets that need to distinguish between mouse clicks and drags, it
+    is useful to reimplement the widget's
+    \l{QWidget::mousePressEvent()}{mousePressEvent()} function to record to
+    start position of the drag:
+
+    \snippet doc/src/snippets/draganddrop/dragwidget.cpp 6
+
+    Later, in \l{QWidget::mouseMoveEvent()}{mouseMoveEvent()}, we can determine
+    whether a drag should begin, and construct a drag object to handle the
+    operation:
+
+    \snippet doc/src/snippets/draganddrop/dragwidget.cpp 7
+    \dots
+    \snippet doc/src/snippets/draganddrop/dragwidget.cpp 8
+
+    This particular approach uses the \l QPoint::manhattanLength() function
+    to get a rough estimate of the distance between where the mouse click
+    occurred and the current cursor position. This function trades accuracy
+    for speed, and is usually suitable for this purpose.
+
+    \section1 Dropping
+
+    To be able to receive media dropped on a widget, call
+    \l{QWidget::setAcceptDrops()}{setAcceptDrops(true)} for the widget,
+    and reimplement the \l{QWidget::dragEnterEvent()}{dragEnterEvent()} and
+    \l{QWidget::dropEvent()}{dropEvent()} event handler functions.
+
+    For example, the following code enables drop events in the constructor of
+    a QWidget subclass, making it possible to usefully implement drop event
+    handlers:
+
+    \snippet doc/src/snippets/dropevents/window.cpp 0
+    \dots
+    \snippet doc/src/snippets/dropevents/window.cpp 1
+    \snippet doc/src/snippets/dropevents/window.cpp 2
+
+    The dragEnterEvent() function is typically used to inform Qt about the
+    types of data that the widget accepts.
+    You must reimplement this function if you want to receive either
+    QDragMoveEvent or QDropEvent in your reimplementations of
+    \l{QWidget::dragMoveEvent()}{dragMoveEvent()} and dropEvent().
+
+    The following code shows how dragEnterEvent() can be reimplemented to
+    tell the drag and drop system that we can only handle plain text:
+
+    \snippet doc/src/snippets/dropevents/window.cpp 3
+
+    The dropEvent() is used to unpack dropped data and handle it in way that
+    is suitable for your application.
+
+    In the following code, the text supplied in the event is passed to a
+    QTextBrowser and a QComboBox is filled with the list of MIME types that
+    are used to describe the data:
+
+    \snippet doc/src/snippets/dropevents/window.cpp 4
+
+    In this case, we accept the proposed action without checking what it is.
+    In a real world application, it may be necessary to return from the
+    dropEvent() function without accepting the proposed action or handling
+    the data if the action is not relevant. For example, we may choose to
+    ignore Qt::LinkAction actions if we do not support
+    links to external sources in our application.
+
+    \section2 Overriding Proposed Actions
+
+    We may also ignore the proposed action, and perform some other action on
+    the data. To do this, we would call the event object's
+    \l{QDropEvent::setDropAction()}{setDropAction()} with the preferred
+    action from Qt::DropAction before calling \l{QEvent::}{accept()}.
+    This ensures that the replacement drop action is used instead of the
+    proposed action.
+
+    For more sophisticated applications, reimplementing
+    \l{QWidget::dragMoveEvent()}{dragMoveEvent()} and
+    \l{QWidget::dragLeaveEvent()}{dragLeaveEvent()} will let you make
+    certain parts of your widgets sensitive to drop events, and give you more
+    control over drag and drop in your application.
+
+    \section2 Subclassing Complex Widgets
+
+    Certain standard Qt widgets provide their own support for drag and drop.
+    When subclassing these widgets, it may be necessary to reimplement
+    \l{QWidget::dragMoveEvent()}{dragMoveEvent()} in addition to
+    \l{QWidget::dragEnterEvent()}{dragEnterEvent()} and
+    \l{QWidget::dropEvent()}{dropEvent()} to prevent the base class from
+    providing default drag and drop handling, and to handle any special
+    cases you are interested in.
+
+    \section1 Drag and Drop Actions
+
+    In the simplest case, the target of a drag and drop action receives a
+    copy of the data being dragged, and the source decides whether to
+    delete the original. This is described by the \c CopyAction action.
+    The target may also choose to handle other actions, specifically the
+    \c MoveAction and \c LinkAction actions. If the source calls
+    QDrag::exec(), and it returns \c MoveAction, the source is responsible
+    for deleting any original data if it chooses to do so. The QMimeData
+    and QDrag objects created by the source widget \e{should not be deleted}
+    - they will be destroyed by Qt. The target is responsible for taking
+    ownership of the data sent in the drag and drop operation; this is
+    usually done by keeping references to the data.
+
+    If the target understands the \c LinkAction action, it should
+    store its own reference to the original information; the source
+    does not need to perform any further processing on the data. The
+    most common use of drag and drop actions is when performing a
+    Move within the same widget; see the section on \l{Drop Actions}
+    for more information about this feature.
+
+    The other major use of drag actions is when using a reference type
+    such as text/uri-list, where the dragged data are actually references
+    to files or objects.
+
+    \section1 Adding New Drag and Drop Types
+
+    Drag and drop is not limited to text and images. Any type of information
+    can be transferred in a drag and drop operation. To drag information
+    between applications, the applications must be able to indicate to each
+    other which data formats they can accept and which they can produce.
+    This is achieved using
+    \l{http://www.rfc-editor.org/rfc/rfc1341.txt}{MIME types}. The QDrag
+    object constructed by the source contains a list of MIME types that it
+    uses to represent the data (ordered from most appropriate to least
+    appropriate), and the drop target uses one of these to access the data.
+    For common data types, the convenience functions handle the MIME types
+    used transparently but, for custom data types, it is necessary to
+    state them explicitly.
+
+    To implement drag and drop actions for a type of information that is
+    not covered by the QDrag convenience functions, the first and most
+    important step is to look for existing formats that are appropriate:
+    The Internet Assigned Numbers Authority (\l{http://www.iana.org}{IANA})
+    provides a
+    \l{http://www.iana.org/assignments/media-types/}{hierarchical
+    list of MIME media types} at the Information Sciences Institute
+    (\l{http://www.isi.edu}{ISI}).
+    Using standard MIME types maximizes the interoperability of
+    your application with other software now and in the future.
+
+    To support an additional media type, simply set the data in the QMimeData
+    object with the \l{QMimeData::setData()}{setData()} function, supplying
+    the full MIME type and a QByteArray containing the data in the appropriate
+    format. The following code takes a pixmap from a label and stores it
+    as a Portable Network Graphics (PNG) file in a QMimeData object:
+
+    \snippet doc/src/snippets/separations/finalwidget.cpp 0
+
+    Of course, for this case we could have simply used
+    \l{QMimeData::setImageData()}{setImageData()} instead to supply image data
+    in a variety of formats:
+
+    \snippet doc/src/snippets/separations/finalwidget.cpp 1
+
+    The QByteArray approach is still useful in this case because it provides
+    greater control over the amount of data stored in the QMimeData object.
+
+    Note that custom datatypes used in item views must be declared as
+    \l{QMetaObject}{meta objects} and that stream operators for them
+    must be implemented.
+
+    \section1 Drop Actions
+
+    In the clipboard model, the user can \e cut or \e copy the source
+    information, then later paste it. Similarly in the drag and drop
+    model, the user can drag a \e copy of the information or they can drag
+    the information itself to a new place (\e moving it). The
+    drag and drop model has an additional complication for the programmer:
+    The program doesn't know whether the user wants to cut or copy the
+    information until the operation is complete. This often makes no
+    difference when dragging information between applications, but within
+    an application it is important to check which drop action was used.
+
+    We can reimplement the mouseMoveEvent() for a widget, and start a drag
+    and drop operation with a combination of possible drop actions. For
+    example, we may want to ensure that dragging always moves objects in
+    the widget:
+
+    \snippet doc/src/snippets/draganddrop/dragwidget.cpp 7
+    \dots
+    \snippet doc/src/snippets/draganddrop/dragwidget.cpp 8
+
+    The action returned by the exec() function may default to a
+    \c CopyAction if the information is dropped into another application
+    but, if it is dropped in another widget in the same application, we
+    may obtain a different drop action.
+
+    The proposed drop actions can be filtered in a widget's dragMoveEvent()
+    function. However, it is possible to accept all proposed actions in
+    the dragEnterEvent() and let the user decide which they want to accept
+    later:
+
+    \snippet doc/src/snippets/draganddrop/dragwidget.cpp 0
+
+    When a drop occurs in the widget, the dropEvent() handler function is
+    called, and we can deal with each possible action in turn. First, we
+    deal with drag and drop operations within the same widget:
+
+    \snippet doc/src/snippets/draganddrop/dragwidget.cpp 1
+
+    In this case, we refuse to deal with move operations. Each type of drop
+    action that we accept is checked and dealt with accordingly:
+
+    \snippet doc/src/snippets/draganddrop/dragwidget.cpp 2
+    \snippet doc/src/snippets/draganddrop/dragwidget.cpp 3
+    \snippet doc/src/snippets/draganddrop/dragwidget.cpp 4
+    \dots
+    \snippet doc/src/snippets/draganddrop/dragwidget.cpp 5
+
+    Note that we checked for individual drop actions in the above code.
+    As mentioned above in the section on
+    \l{#Overriding Proposed Actions}{Overriding Proposed Actions}, it is
+    sometimes necessary to override the proposed drop action and choose a
+    different one from the selection of possible drop actions.
+    To do this, you need to check for the presence of each action in the value
+    supplied by the event's \l{QDropEvent::}{possibleActions()}, set the drop
+    action with \l{QDropEvent::}{setDropAction()}, and call
+    \l{QEvent::}{accept()}.
+
+    \section1 Drop Rectangles
+
+    The widget's dragMoveEvent() can be used to restrict drops to certain parts
+    of the widget by only accepting the proposed drop actions when the cursor
+    is within those areas. For example, the following code accepts any proposed
+    drop actions when the cursor is over a child widget (\c dropFrame):
+
+    \snippet doc/src/snippets/droprectangle/window.cpp 0
+
+    The dragMoveEvent() can also be used if you need to give visual
+    feedback during a drag and drop operation, to scroll the window, or
+    whatever is appropriate.
+
+    \section1 The Clipboard
+
+    Applications can also communicate with each other by putting data on
+    the clipboard. To access this, you need to obtain a QClipboard object
+    from the QApplication object:
+
+    \snippet examples/widgets/charactermap/mainwindow.cpp 3
+
+    The QMimeData class is used to represent data that is transferred to and
+    from the clipboard. To put data on the clipboard, you can use the
+    setText(), setImage(), and setPixmap() convenience functions for common
+    data types. These functions are similar to those found in the QMimeData
+    class, except that they also take an additional argument that controls
+    where the data is stored: If \l{QClipboard::Mode}{Clipboard} is
+    specified, the data is placed on the clipboard; if
+    \l{QClipboard::Mode}{Selection} is specified, the data is placed in the
+    mouse selection (on X11 only). By default, data is put on the clipboard.
+
+    For example, we can copy the contents of a QLineEdit to the clipboard
+    with the following code:
+
+    \snippet examples/widgets/charactermap/mainwindow.cpp 11
+
+    Data with different MIME types can also be put on the clipboard.
+    Construct a QMimeData object and set data with setData() function in
+    the way described in the previous section; this object can then be
+    put on the clipboard with the
+    \l{QClipboard::setMimeData()}{setMimeData()} function.
+
+    The QClipboard class can notify the application about changes to the
+    data it contains via its \l{QClipboard::dataChanged()}{dataChanged()}
+    signal. For example, we can monitor the clipboard by connecting this
+    signal to a slot in a widget:
+
+    \snippet doc/src/snippets/clipboard/clipwindow.cpp 0
+
+    The slot connected to this signal can read the data on the clipboard
+    using one of the MIME types that can be used to represent it:
+
+    \snippet doc/src/snippets/clipboard/clipwindow.cpp 1
+    \dots
+    \snippet doc/src/snippets/clipboard/clipwindow.cpp 2
+
+    The \l{QClipboard::selectionChanged()}{selectionChanged()} signal can
+    be used on X11 to monitor the mouse selection.
+
+    \section1 Examples
+
+    \list
+    \o \l{draganddrop/draggableicons}{Draggable Icons}
+    \o \l{draganddrop/draggabletext}{Draggable Text}
+    \o \l{draganddrop/dropsite}{Drop Site}
+    \o \l{draganddrop/fridgemagnets}{Fridge Magnets}
+    \o \l{draganddrop/puzzle}{Drag and Drop Puzzle}
+    \endlist
+
+    \section1 Interoperating with Other Applications
+
+    On X11, the public \l{http://www.newplanetsoftware.com/xdnd/}{XDND
+    protocol} is used, while on Windows Qt uses the OLE standard, and
+    Qt for Mac OS X uses the Carbon Drag Manager. On X11, XDND uses MIME,
+    so no translation is necessary. The Qt API is the same regardless of
+    the platform. On Windows, MIME-aware applications can communicate by
+    using clipboard format names that are MIME types. Already some
+    Windows applications use MIME naming conventions for their
+    clipboard formats. Internally, Qt uses QWindowsMime and
+    QMacPasteboardMime for translating proprietary clipboard formats
+    to and from MIME types.
+
+    On X11, Qt also supports drops via the Motif Drag & Drop Protocol. The
+    implementation incorporates some code that was originally written by
+    Daniel Dardailler, and adapted for Qt by Matt Koss <koss@napri.sk>
+    and Trolltech. Here is the original copyright notice:
+
+    \legalese
+    Copyright 1996 Daniel Dardailler.
+
+    Permission to use, copy, modify, distribute, and sell this software
+    for any purpose is hereby granted without fee, provided that the above
+    copyright notice appear in all copies and that both that copyright
+    notice and this permission notice appear in supporting documentation,
+    and that the name of Daniel Dardailler not be used in advertising or
+    publicity pertaining to distribution of the software without specific,
+    written prior permission. Daniel Dardailler makes no representations
+    about the suitability of this software for any purpose. It is
+    provided "as is" without express or implied warranty.
+
+    Modifications Copyright 1999 Matt Koss, under the same license as
+    above.
+    \endlegalese
+    \omit NOTE: The copyright notice is from qmotifdnd_x11.cpp. \endomit
+
+    Note: The Motif Drag \& Drop Protocol only allows receivers to
+    request data in response to a QDropEvent. If you attempt to
+    request data in response to e.g. a QDragMoveEvent, an empty
+    QByteArray is returned.
+*/
+
+/*!
+    \page porting4-dnd.html
+    \title Porting to Qt 4 - Drag and Drop
+    \contentspage {Porting Guides}{Contents}
+    \previouspage Porting to Qt 4 - Virtual Functions
+    \nextpage Porting .ui Files to Qt 4
+    \ingroup porting
+    \brief An overview of the porting process for applications that use drag and drop.
+
+    Qt 4 introduces a new set of classes to handle drag and drop operations
+    that aim to be easier to use than their counterparts in Qt 3. As a result,
+    the way that drag and drop is performed is quite different to the way
+    developers of Qt 3 applications have come to expect. In this guide, we
+    show the differences between the old and new APIs and indicate where
+    applications need to be changed when they are ported to Qt 4.
+
+    \tableofcontents
+
+    \section1 Dragging
+
+    In Qt 3, drag operations are encapsulated by \c QDragObject (see Q3DragObject)
+    and its subclasses. These objects are typically constructed on the heap in
+    response to mouse click or mouse move events, and ownership of them is
+    transferred to Qt so that they can be deleted when the corresponding drag and
+    drop operations have been completed. The drag source has no control over how
+    the drag and drop operation is performed once the object's
+    \l{Q3DragObject::}{drag()} function is called, and it receives no information
+    about how the operation ended.
+
+    \snippet doc/src/snippets/code/doc_src_dnd.qdoc 0
+
+    Similarly, in Qt 4, drag operations are also initiated when a QDrag object
+    is constructed and its \l{QDrag::}{exec()} function is called. In contrast,
+    these objects are typically constructed on the stack rather than the heap
+    since each drag and drop operation is performed synchronously as far as the
+    drag source is concerned. One key benefit of this is that the drag source
+    can receive information about how the operation ended from the value returned
+    by \l{QDrag::}{exec()}.
+
+    \snippet doc/src/snippets/porting4-dropevents/window.cpp 2
+    \snippet doc/src/snippets/porting4-dropevents/window.cpp 3
+    \dots 8
+    \snippet doc/src/snippets/porting4-dropevents/window.cpp 4
+    \snippet doc/src/snippets/porting4-dropevents/window.cpp 5
+
+    A key difference in the above code is the use of the QMimeData class to hold
+    information about the data that is transferred. Qt 3 relies on subclasses
+    of \c QDragObject to provide support for specific MIME types; in Qt 4, the
+    use of QMimeData as a generic container for data makes the relationship
+    between MIME type and data more tranparent. QMimeData is described in more
+    detail later in this document.
+
+    \section1 Dropping
+
+    In both Qt 3 and Qt 4, it is possible to prepare a custom widget to accept
+    dropped data by enabling the \l{QWidget::}{acceptDrops} property of a widget,
+    usually in the widget's constructor. As a result, the widget will receive
+    drag enter events that can be handled by its \l{QWidget::}{dragEnterEvent()}
+    function.
+    As in Qt 3, custom widgets in Qt 4 handle these events by determining
+    whether the data supplied by the drag and drop operation can be dropped onto
+    the widget. Since the classes used to encapsulate MIME data are different in
+    Qt 3 and Qt 4, the exact implementations differ.
+
+    In Qt 3, the drag enter event is handled by checking whether each of the
+    standard \c QDragObject subclasses can decode the data supplied, and
+    indicating success or failure of these checks via the event's
+    \l{QDragEnterEvent::}{accept()} function, as shown in this simple example:
+
+    \snippet doc/src/snippets/code/doc_src_dnd.qdoc 1
+
+    In Qt 4, you can examine the MIME type describing the data to determine
+    whether the widget should accept the event or, for common data types, you
+    can use convenience functions:
+
+    \snippet doc/src/snippets/porting4-dropevents/window.cpp 0
+
+    The widget has some control over the type of drag and drop operation to be
+    performed. In the above code, the action proposed by the drag source is
+    accepted, but
+    \l{Drag and Drop#Overriding Proposed Actions}{this can be overridden} if
+    required.
+
+    In both Qt 3 and Qt 4, it is necessary to accept a given drag event in order
+    to receive the corresponding drop event. A custom widget in Qt 3 that can
+    accept dropped data in the form of text or images might provide an
+    implementation of \l{QWidget::}{dropEvent()} that looks like the following:
+
+    \snippet doc/src/snippets/code/doc_src_dnd.qdoc 2
+
+    In Qt 4, the event is handled in a similar way:
+
+    \snippet doc/src/snippets/porting4-dropevents/window.cpp 1
+
+    It is also possible to extract data stored for a particular MIME type if it
+    was specified by the drag source.
+
+    \section1 MIME Types and Data
+
+    In Qt 3, data to be transferred in drag and drop operations is encapsulated
+    in instances of \c QDragObject and its subclasses, representing specific
+    data formats related to common MIME type and subtypes.
+
+    In Qt 4, only the QMimeData class is used to represent data, providing a
+    container for data stored in multiple formats, each associated with
+    a relevant MIME type. Since arbitrary MIME types can be specified, there is
+    no need for an extensive class hierarchy to represent different kinds of
+    information. Additionally, QMimeData it provides some convenience functions
+    to allow the most common data formats to be stored and retrieved with less
+    effort than for arbitrary MIME types.
+*/
diff --git a/doc/src/ecmascript.qdoc b/doc/src/ecmascript.qdoc
new file mode 100644
index 0000000000..303b752e7d
--- /dev/null
+++ b/doc/src/ecmascript.qdoc
@@ -0,0 +1,313 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page ecmascript.html
+    \title ECMAScript Reference
+    \ingroup scripting
+    \brief A list of objects, functions and properties supported by QtScript.
+
+    This reference contains a list of objects, functions and
+    properties supported by QtScript.
+
+    \tableofcontents
+
+    \section1 The Global Object
+
+    \section2 Value Properties
+
+    \list
+    \o NaN
+    \o Infinity
+    \o undefined
+    \o Math
+    \endlist
+
+    \section2 Function Properties
+
+    \list
+    \o eval(x)
+    \o parseInt(string, radix)
+    \o parseFloat(string)
+    \o isNaN(number)
+    \o isFinite(number)
+    \o decodeURI(encodedURI)
+    \o decodeURIComponent(encodedURIComponent)
+    \o encodeURI(uri)
+    \o encodeURIComponent(uriComponent)
+    \endlist
+
+    \section2 Constructor Properties
+
+    \list
+    \o Object
+    \o Function
+    \o Array
+    \o String
+    \o Boolean
+    \o Number
+    \o Date
+    \o RegExp
+    \o Error
+    \o EvalError
+    \o RangeError
+    \o ReferenceError
+    \o SyntaxError
+    \o TypeError
+    \o URIError
+    \endlist
+
+    \section1 Object Objects
+
+    \section2 Object Prototype Object
+
+    \list
+    \o toString()
+    \o toLocaleString()
+    \o valueOf()
+    \o hasOwnProperty(V)
+    \o isPrototypeOf(V)
+    \o propertyIsEnumerable(V)
+    \endlist
+
+    \section1 Function Objects
+
+    \section2 Function Prototype Object
+
+    \section3 Function Properties
+
+    \list
+    \o toString()
+    \o apply(thisArg, argArray)
+    \o call(thisArg [, arg1 [, arg2, ...]])
+    \endlist
+
+    \section1 Array Objects
+
+    \section2 Array Prototype Object
+
+    \section3 Function Properties
+
+    \list
+    \o toString()
+    \o toLocaleString()
+    \o concat([item1 [, item2 [, ...]]])
+    \o join(separator)
+    \o pop()
+    \o push([item1 [, item2 [, ...]]])
+    \o reverse()
+    \o shift()
+    \o slice(start, end)
+    \o sort(comparefn)
+    \o splice(start, deleteCount[, item1 [, item2 [, ...]]])
+    \o unshift([item1 [, item2 [, ...]]])
+    \endlist
+
+    \section1 String Objects
+
+    \section2 String Prototype Object
+
+    \section3 Function Properties
+
+    \list
+    \o toString()
+    \o valueOf()
+    \o charAt(pos)
+    \o charCodeAt(pos)
+    \o concat([string1 [, string2 [, ...]]])
+    \o indexOf(searchString ,position)
+    \o lastIndexOf(searchString, position)
+    \o localeCompare(that)
+    \o match(regexp)
+    \o replace(searchValue, replaceValue)
+    \o search(regexp)
+    \o slice(start, end)
+    \o split(separator, limit)
+    \o substring(start, end)
+    \o toLowerCase()
+    \o toLocaleLowerCase()
+    \o toUpperCase()
+    \o toLocaleUpperCase()
+    \endlist
+
+    \section1 Boolean Objects
+
+    \section2 Boolean Prototype Object
+
+    \section3 Function Properties
+
+    \list
+    \o toString()
+    \o valueOf()
+    \endlist
+
+    \section1 Number Objects
+
+    \section2 Number Prototype Object
+
+    \section3 Function Properties
+
+    \list
+    \o toString(radix)
+    \o toLocaleString()
+    \o toFixed(fractionDigits)
+    \o toExponential(fractionDigits)
+    \o toPrecision(precision)
+    \endlist
+
+    \section1 The Math Object
+
+    \section2 Value Properties
+
+    \list
+    \o E
+    \o LN10
+    \o LN2
+    \o LOG2E
+    \o LOG10E
+    \o PI
+    \o SQRT1_2
+    \o SQRT2
+    \endlist
+
+    \section2 Function Properties
+
+    \list
+    \o abs(x)
+    \o acos(x)
+    \o asin(x)
+    \o atan(x)
+    \o atan2(y, x)
+    \o ceil(x)
+    \o cos(x)
+    \o exp(x)
+    \o floor(x)
+    \o log(x)
+    \o max([value1 [, value2 [, ...]]])
+    \o min([value1 [, value2 [, ...]]])
+    \o pow(x, y)
+    \o random()
+    \o round(x)
+    \o sin(x)
+    \o sqrt(x)
+    \o tan(x)
+    \endlist
+
+    \section1 Date Objects
+
+    \section2 Date Prototype Object
+
+    \section3 Function Properties
+
+    \list
+    \o toString()
+    \o toDateString()
+    \o toTimeString()
+    \o toLocaleString()
+    \o toLocaleDateString()
+    \o toLocaleTimeString()
+    \o valueOf()
+    \o getTime()
+    \o getFullYear()
+    \o getUTCFullYear()
+    \o getMonth()
+    \o getUTCMonth()
+    \o getDate()
+    \o getUTCDate()
+    \o getDay()
+    \o getUTCDay()
+    \o getHours()
+    \o getUTCHours()
+    \o getMinutes()
+    \o getUTCMinutes()
+    \o getSeconds()
+    \o getUTCSeconds()
+    \o getMilliseconds()
+    \o getUTCMilliseconds()
+    \o getTimeZoneOffset()
+    \o setTime(time)
+    \o setMilliseconds(ms)
+    \o setUTCMilliseconds(ms)
+    \o setSeconds(sec [, ms])
+    \o setUTCSeconds(sec [, ms])
+    \o setMinutes(min [, sec [, ms]])
+    \o setUTCMinutes(min [, sec [, ms]])
+    \o setHours(hour [, min [, sec [, ms]]])
+    \o setUTCHours(hour [, min [, sec [, ms]]])
+    \o setDate(date)
+    \o setUTCDate(date)
+    \o setMonth(month [, date])
+    \o setUTCMonth(month [, date])
+    \o setFullYear(year [, month [, date]])
+    \o setUTCFullYear(year [, month [, date]])
+    \o toUTCString()
+    \endlist
+
+    \section1 RegExp Objects
+
+    \section2 RegExp Prototype Object
+
+    \section3 Function Properties
+
+    \list
+    \o exec(string)
+    \o test(string)
+    \o toString()
+    \endlist
+
+    \section1 Error Objects
+
+    \section2 Error Prototype Object
+
+    \section3 Value Properties
+
+    \list
+    \o name
+    \o message
+    \endlist
+
+    \section3 Function Properties
+
+    \list
+    \o toString()
+    \endlist
+
+*/
diff --git a/doc/src/editions.qdoc b/doc/src/editions.qdoc
new file mode 100644
index 0000000000..5d3b35c291
--- /dev/null
+++ b/doc/src/editions.qdoc
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** Documentation of Qt editions.
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Qt GUI Toolkit.
+** EDITIONS: FREE, PROFESSIONAL, ENTERPRISE
+**
+****************************************************************************/
+
+/*!
+    \page editions.html
+    \title Qt Editions
+    \ingroup licensing
+    \brief Information about the different editions of Qt.
+
+    Qt can be used to create both commercial and non-commercial
+    software for a wide range of different deployment environments,
+    and is supplied in a number of different forms to suit the needs
+    of different kinds of developers.
+
+    In terms of license conditions, there are two main forms of Qt:
+
+    \list
+    \o The \l{Qt Commercial Editions} are the commercial
+       versions of \l{About Qt}{Qt}.
+    \o The \l{Open Source Versions of Qt} are freely available for download.
+    \endlist
+
+    On the Qt web site, you can find a
+    \l{Qt Licensing Overview} and information on \l{Qt License Pricing}
+    for commercial editions of Qt and other Qt-related products.
+*/
diff --git a/doc/src/emb-accel.qdoc b/doc/src/emb-accel.qdoc
new file mode 100644
index 0000000000..67fe8e6012
--- /dev/null
+++ b/doc/src/emb-accel.qdoc
@@ -0,0 +1,143 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt-embedded-accel.html
+
+    \target add your graphics driver to Qt for Embedded Linux
+
+    \title Adding an Accelerated Graphics Driver to Qt for Embedded Linux
+    \ingroup qt-embedded-linux
+
+    In \l{Qt for Embedded Linux}, painting is a pure software implementation
+    normally performed in two steps. First, each window is rendered
+    onto a QWSWindowSurface using QPaintEngine. Second, the server
+    composes the surface images and copies the composition to the
+    screen (see \l{Qt for Embedded Linux Architecture} for details).
+    \l{Qt for Embedded Linux} uses QRasterPaintEngine (a raster-based implementation of
+    QPaintEngine) to implement painting operations, and uses QScreen
+    to implement window composition.
+
+    It is possible to add an accelerated graphics driver to take
+    advantage of available hardware resources. This is described in
+    detail in the \l {Accelerated Graphics Driver Example} which uses
+    the following approach:
+
+    \tableofcontents
+
+    \warning This feature is under development and is subject to
+    change.
+
+    \section1 Step 1: Create a Custom Screen
+
+    Create a custom screen by deriving from the QScreen class.
+
+    The \l {QScreen::}{connect()}, \l {QScreen::}{disconnect()}, \l
+    {QScreen::}{initDevice()} and \l {QScreen::}{shutdownDevice()}
+    functions are declared as pure virtual functions in QScreen and
+    must be implemented. These functions are used to configure the
+    hardware, or query its configuration. The \l
+    {QScreen::}{connect()} and \l {QScreen::}{disconnect()} are called
+    by both the server and client processes, while the \l
+    {QScreen::}{initDevice()} and \l {QScreen::}{shutdownDevice()}
+    functions are only called by the server process.
+
+    You might want to accelerate the final copying to the screen by
+    reimplementing the \l {QScreen::}{blit()} and \l
+    {QScreen::}{solidFill()} functions.
+
+    \section1 Step 2: Implement a Custom Raster Paint Engine
+
+    Implement the painting operations by subclassing the
+    QRasterPaintEngine class.
+
+    To accelerate a graphics primitive, simply reimplement the
+    corresponding function in your custom paint engine. If there is
+    functionality you do not want to reimplement (such as certain
+    pens, brushes, modes, etc.), you can just call the corresponding
+    base class implementation.
+
+    \section1 Step 3: Make the Paint Device Aware of Your Paint Engine
+
+    To activate your paint engine you must create a subclass of the
+    QCustomRasterPaintDevice class and reimplement its \l
+    {QCustomRasterPaintDevice::}{paintEngine()} function. Let this
+    function return a pointer to your paint engine. In addition, the
+    QCustomRasterPaintDevice::memory() function must be reimplemented
+    to return a pointer to the buffer where the painting should be
+    done.
+
+    \table
+    \header \o Acceleration Without a Memory Buffer
+    \row
+    \o
+
+    By default the QRasterPaintEngine draws into a memory buffer (this can
+    be local memory, shared memory or graphics memory mapped into
+    application memory).
+    In some cases you might want to avoid using a memory buffer directly,
+    e.g if you want to use an accelerated graphic controller to handle all
+    the buffer manipulation. This can be implemented by  reimplementing
+    the QCustomRasterPaintDevice::memory() function to return 0 (meaning
+    no buffer available). Then, whenever a color or image buffer normally
+    would be written into paint engine buffer, the paint engine will call the
+    QRasterPaintEngine::drawColorSpans() and
+    QRasterPaintEngine::drawBufferSpan() functions instead.
+
+    Note that the default implementations of these functions only
+    calls qFatal() with an error message; reimplement the functions
+    and let them do the appropriate communication with the accelerated
+    graphics controller.
+
+    \endtable
+
+    \section1 Step 4: Make the Window Surface Aware of Your Paint Device
+
+    Derive from the QWSWindowSurface class and reimplement its \l
+    {QWSWindowSurface::}{paintDevice()} function. Make this function
+    return a pointer to your custom raster paint device.
+
+    \section1 Step 5: Enable Creation of an Instance of Your Window Surface
+
+    Finally, reimplement QScreen's \l {QScreen::}{createSurface()}
+    function and make this function able to create an instance of your
+    QWSWindowSurface subclass.
+*/
diff --git a/doc/src/emb-charinput.qdoc b/doc/src/emb-charinput.qdoc
new file mode 100644
index 0000000000..e38ebe337a
--- /dev/null
+++ b/doc/src/emb-charinput.qdoc
@@ -0,0 +1,126 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt-embedded-charinput.html
+
+    \title Qt for Embedded Linux Character Input
+    \ingroup qt-embedded-linux
+
+    When running a \l {Qt for Embedded Linux} application, it either runs as a
+    server or connects to an existing server.  The keyboard driver is
+    loaded by the server application when it starts running, using
+    Qt's \l {How to Create Qt Plugins}{plugin system}.
+
+    Internally in the client/server protocol, all system generated
+    events, including key events, are passed to the server application
+    which then propagates the event to the appropriate client.  Note
+    that key events do not always come from a keyboard device, they
+    can can also be generated by the server process using input
+    widgets.
+
+    \table
+    \header \o Input Widgets
+    \row
+    \o
+
+    The server process may call the static QWSServer::sendKeyEvent()
+    function at any time. Typically, this is done by popping up a
+    widget that enables the user specify characters with the pointer
+    device.
+
+    Note that the key input widget should not take focus since the
+    server would then just send the key events back to the input
+    widget. One way to make sure that the input widget never takes
+    focus is to set the Qt::Tool widget flag in the QWidget
+    constructor.
+
+    The \l{Qt Extended} environment contains various input widgets such as
+    Handwriting Recognition and Virtual Keyboard.
+
+    \endtable
+
+    \tableofcontents
+
+    \section1 Available Keyboard Drivers
+
+    \l {Qt for Embedded Linux} provides ready-made drivers for the SL5000, Yopy,
+    Vr41XX, console (TTY) and USB protocols. Run the \c configure
+    script to list the available drivers:
+
+    \snippet doc/src/snippets/code/doc_src_emb-charinput.qdoc 0
+
+    Note that the console keyboard driver also handles console
+    switching (\bold{Ctrl+Alt+F1}, ..., \bold{Ctrl+Alt+F10}) and
+    termination (\bold{Ctrl+Alt+Backspace}).
+
+    In the default Qt configuration, only the "TTY" driver is
+    enabled. The various drivers can be enabled and disabled using the
+    \c configure script. For example:
+
+    \snippet doc/src/snippets/code/doc_src_emb-charinput.qdoc 1
+
+    Custom keyboard drivers can be implemented by subclassing the
+    QWSKeyboardHandler class and creating a keyboard driver plugin
+    (derived from the QKbdDriverPlugin class). The default
+    implementation of the QKbdDriverFactory class will automatically
+    detect the plugin, loading the driver into the server application
+    at run-time.
+
+    \section1 Specifying a Keyboard Driver
+
+    To specify which driver to use, set the QWS_KEYBOARD environment
+    variable. For example (if the current shell is bash, ksh, zsh or
+    sh):
+
+    \snippet doc/src/snippets/code/doc_src_emb-charinput.qdoc 2
+
+    The \c <driver> argument are \c SL5000, \c Yopy, \c VR41xx, \c
+    TTY, \c USB and \l {QKbdDriverPlugin::keys()}{keys} identifying
+    custom drivers, and the driver specific options are typically a
+    device, e.g., \c /dev/tty0.
+
+    Multiple keyboard drivers can be specified in one go:
+
+    \snippet doc/src/snippets/code/doc_src_emb-charinput.qdoc 3
+
+    Input will be read from all specified drivers.
+*/
diff --git a/doc/src/emb-crosscompiling.qdoc b/doc/src/emb-crosscompiling.qdoc
new file mode 100644
index 0000000000..54e65c5ab5
--- /dev/null
+++ b/doc/src/emb-crosscompiling.qdoc
@@ -0,0 +1,191 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt-embedded-crosscompiling.html
+
+    \title Cross-Compiling Qt for Embedded Linux Applications
+    \ingroup qt-embedded-linux
+
+    Cross-compiling is the process of compiling an application on one
+    machine, producing executable code for a different machine or
+    device. To cross-compile a \l{Qt for Embedded Linux} application,
+    use the following approach:
+
+    \tableofcontents
+
+    \note The cross-compiling procedure has the configuration
+    process in common with the installation procedure; i.e., you might
+    not necessarily have to perform all the mentioned actions
+    depending on your current configuration.
+
+    \section1 Step 1: Set the Cross-Compiler's Path
+
+    Specify which cross-compiler to use by setting the \c PATH
+    environment variable. For example, if the current shell is bash,
+    ksh, zsh or sh:
+
+    \snippet doc/src/snippets/code/doc_src_emb-crosscompiling.qdoc 0
+
+    \section1 Step 2: Create a Target Specific qmake Specification
+
+    The qmake tool requires a platform and compiler specific \c
+    qmake.conf file describing the various default values, to generate
+    the appropriate Makefiles. The standard \l{Qt for Embedded Linux}
+    distribution provides such files for several combinations of
+    platforms and compilers. These files are located in the
+    distribution's \c mkspecs/qws subdirectory.
+
+    Each platform has a default specification. \l{Qt for Embedded Linux} will
+    use the default specification for the current platform unless told
+    otherwise. To override this behavior, you can use the \c configure
+    script's \c -platform option to change the specification for the host
+    platform (where compilation will take place).
+
+    The \c configure script's \c -xplatform option is used to provide a
+    specification for the target architecture (where the library will be
+    deployed).
+
+    For example, to cross-compile an application to run on a device with
+    an ARM architecture, using the GCC toolchain, run the configure
+    script at the command line in the following way:
+
+    \snippet doc/src/snippets/code/doc_src_emb-crosscompiling.qdoc 1
+
+    If neither of the provided specifications fits your target device,
+    you can create your own.  To create a custom \c qmake.conf file,
+    just copy and customize an already existing file. For example:
+
+    \snippet doc/src/snippets/code/doc_src_emb-crosscompiling.qdoc 2
+
+    \note When defining a mkspec for a Linux target, the directory must
+    be prefixed with "linux-". We recommend that you copy the entire
+    directory.
+
+    Note also that when providing you own qmake specifcation, you must
+    use the \c configure script's \c -xplatform option to make
+    \l{Qt for Embedded Linux} aware of the custom \c qmake.conf file.
+
+    \section1 Step 3: Provide Architecture Specific Files
+
+    Starting with Qt 4, all of Qt's implicitly shared classes can
+    safely be copied across threads like any other value classes,
+    i.e., they are fully reentrant. This is accomplished by
+    implementing reference counting operations using atomic hardware
+    instructions on all the different platforms supported by Qt.
+
+    To support a new architecture, it is important to ensure that
+    these platform-specific atomic operations are implemented in a
+    corresponding header file (\c qatomic_ARCH.h), and that this file
+    is located in Qt's \c src/corelib/arch directory. For example, the
+    Intel 80386 implementation is located in \c
+    src/corelib/arch/qatomic_i386.h.
+
+    See the \l {Implementing Atomic Operations} documentation for
+    details.
+
+    \section1 Step 4: Provide Hardware Drivers
+
+    Without the proper mouse and keyboard drivers, you will not be
+    able to give any input to your application when it is installed on
+    the target device. You must also ensure that the appropriate
+    screen driver is present to make the server process able to put
+    the application's widgets on screen.
+
+    \l{Qt for Embedded Linux} provides several ready-made mouse, keyboard and
+    screen drivers, see the \l{Qt for Embedded Linux Pointer Handling}{pointer
+    handling}, \l{Qt for Embedded Linux Character Input}{character input} and
+    \l{Qt for Embedded Linux Display Management}{display management}
+    documentation for details.
+
+    In addition, custom drivers can be added by deriving from the
+    QWSMouseHandler, QWSKeyboardHandler and QScreen classes
+    respectively, and by creating corresponding plugins to make use of
+    Qt's plugin mechanism (dynamically loading the drivers into the
+    server application at runtime). Note that the plugins must be
+    located in a location where Qt will look for plugins, e.g., the
+    standard \c plugin directory.
+
+    See the \l {How to Create Qt Plugins} documentation and the \l
+    {tools/plugandpaint}{Plug & Paint} example for details.
+
+    \section1 Step 5: Build the Target Specific Executable
+
+    Before building the executable, you must specify the target
+    architecture as well as the target specific hardware drivers by
+    running the \c configure script:
+
+    \snippet doc/src/snippets/code/doc_src_emb-crosscompiling.qdoc 3
+
+    It is also important to make sure that all the third party
+    libraries that the application and the Qt libraries require, are
+    present in the tool chain. In particular, if the zlib and jpeg
+    libraries are not available, they must be included by running the
+    \c configure script with the \c -L and \c -I options. For example:
+
+    \snippet doc/src/snippets/code/doc_src_emb-crosscompiling.qdoc 4
+
+    The JPEG source can be downloaded from \l http://www.ijg.org/. The
+    \l{Qt for Embedded Linux} distribution includes a version of the zlib source
+    that can be compiled into the Qt for Embedded Linux library. If integrators
+    wish to use a later version of the zlib library, it can be
+    downloaded from the \l http://www.gzip.org/zlib/ website.
+
+    Then build the executable:
+
+    \snippet doc/src/snippets/code/doc_src_emb-crosscompiling.qdoc 5
+
+    That's all. Your target specific executable is ready for deployment.
+
+    \table 100%
+    \row
+    \o \bold {See also:}
+
+    \l{Qt for Embedded Linux Architecture} and \l{Deploying Qt for Embedded Linux
+    Applications}.
+
+    \row
+    \o \bold{Third party resources:}
+
+    \l{http://silmor.de/29}{Cross compiling Qt/Win Apps on Linux} covers the
+    process of cross-compiling Windows applications on Linux.
+    \endtable
+*/
diff --git a/doc/src/emb-deployment.qdoc b/doc/src/emb-deployment.qdoc
new file mode 100644
index 0000000000..2c1ff00103
--- /dev/null
+++ b/doc/src/emb-deployment.qdoc
@@ -0,0 +1,111 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt-embedded-deployment.html
+
+    \title Deploying Qt for Embedded Linux Applications
+    \ingroup qt-embedded-linux
+
+    The procedure of deploying an Qt application on \l{Qt for Embedded Linux}
+    is essentially the same as the deployment procedure on X11 platforms
+    which is described in detail in the \l {Deploying an Application
+    on X11 Platforms} documentation. See also the \l {Deploying Qt
+    applications}{general remarks} about deploying Qt applications.
+
+    In addition, there is a couple of Qt for Embedded Linux specific issues to
+    keep in mind:
+
+    \tableofcontents
+
+    \section1 Fonts
+
+    When Qt for Embedded Linux applications run, they look for a file called
+    \c fontdir in Qt's \c /lib/fonts/ directory defining the
+    fonts that are available to the application (i.e. the fonts
+    located in the mentioned directory).
+
+    For that reason, the preferred fonts must be copied to the \c
+    /lib/fonts/ directory, and the \c fontdir file must be customized
+    accordingly.  See the \l {Qt for Embedded Linux Fonts}{fonts} documentation
+    for more details about the supported font formats.
+
+    Note that the application will look for the \c /lib/fonts/
+    directory relative to the path set using the \c -prefix parameter
+    when running the \c configure script; ensure that this is a
+    sensible path in the target device environment. See the \l
+    {Installing Qt for Embedded Linux#Step 3: Building the
+    Library}{installation} documentation for more details.
+
+    \section1 Environment Variables
+
+    In general, any variable value that differs from the provided
+    default values must be set explicitly in the target device
+    environment.  Typically, these include the QWS_MOUSE_PROTO,
+    QWS_KEYBOARD and QWS_DISPLAY variables specifying the drivers for
+    pointer handling, character input and display management,
+    respectively.
+
+    For example, without the proper mouse and keyboard drivers, there
+    is no way to give any input to the application when it is
+    installed on the target device. By running the \c configure script
+    using the \c -qt-kbd-<keyboarddriver> and \c
+    -qt-mouse-<mousedriver> options, the drivers are enabled, but in
+    addition the drivers and the preferred devices must be specified
+    as the ones to use in the target environment, by setting the
+    environment variables.
+
+    See the \l{Qt for Embedded Linux Pointer Handling}{pointer handling},
+    \l{Qt for Embedded Linux Character Input}{character input} and
+    \l{Qt for Embedded Linux Display Management}{display management}
+    documentation for more information.
+
+    \section1 Framebuffer Support
+
+    No particular actions are required to enable the framebuffer on
+    target devices: The Linux framebuffer is enabled by default on all
+    modern Linux distributions. For information on older versions, see
+    \l http://en.tldp.org/HOWTO/Framebuffer-HOWTO.html.
+
+    To test that the Linux framebuffer is set up correctly, and that
+    the device permissions are correct, use the program provided by
+    the \l {Testing the Linux Framebuffer} document.
+*/
diff --git a/doc/src/emb-differences.qdoc b/doc/src/emb-differences.qdoc
new file mode 100644
index 0000000000..b6fb631346
--- /dev/null
+++ b/doc/src/emb-differences.qdoc
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt-embedded-differences.html
+
+    \title Porting Qt Applications to Qt for Embedded Linux
+    \ingroup porting
+    \ingroup qt-embedded-linux
+
+    Existing Qt applications should require no porting provided there is no
+    platform dependent code.
+
+    \table 100%
+    \header \o Platform Dependent Code
+
+    \row
+    \o
+    Platform dependent code includes system calls, calls to the
+    underlying window system (Windows or X11), and Qt platform
+    specific methods such as QApplication::x11EventFilter().
+
+    For cases where it is necessary to use platform dependent code
+    there are macros defined that can be used to enable and disable
+    code for each platform using \c #ifdef directives:
+
+    \list
+    \o Qt for Embedded Linux: Q_WS_QWS
+    \o Qt for Mac OS X: Q_WS_MAC
+    \o Qt for Windows: Q_WS_WIN
+    \o Qt for X11: Q_WS_X11
+    \endlist
+    \endtable
+*/
diff --git a/doc/src/emb-envvars.qdoc b/doc/src/emb-envvars.qdoc
new file mode 100644
index 0000000000..b06c132853
--- /dev/null
+++ b/doc/src/emb-envvars.qdoc
@@ -0,0 +1,168 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt-embedded-envvars.html
+
+    \title Qt for Embedded Linux Environment Variables
+    \ingroup qt-embedded-linux
+
+    These environment variables are relevant to \l{Qt for Embedded Linux}
+    users.
+
+    \table
+    \header \o Variable \o Description
+
+    \row
+    \o \bold POINTERCAL_FILE \target POINTERCAL_FILE
+
+    \o Specifies the file containing the data used to calibrate the
+    pointer device.
+
+    See also QWSCalibratedMouseHandler and \l{Qt for Embedded Linux Pointer
+    Handling}.
+
+    \row
+    \o \bold QT_ONSCREEN_PAINT \target QT_ONSCREEN_PAINT
+
+    \o If defined, the application will render its widgets directly on
+    screen. The affected regions of the screen will not be modified by
+    the screen driver unless another window with a higher focus
+    requests (parts of) the same region.
+
+    Setting this environment variable is equivalent to setting the
+    Qt::WA_PaintOnScreen attribute for all the widgets in the
+    application.
+
+    See also the Qt for Embedded Linux \l{Qt for Embedded Linux Architecture#Graphics
+    Rendering}{graphics rendering} documentation.
+
+    \row
+    \o \bold QWS_SW_CURSOR \target QWS_SW_CURSOR
+    \o If defined, the software mouse cursor is always used (even when using an
+    accelerated driver that supports a hardware cursor).
+
+    \row
+    \o \bold QWS_DISPLAY \target QWS_DISPLAY
+    \o
+
+    Specifies the display type and framebuffer. For example, if the
+    current shell is bash, ksh, zsh or sh:
+
+    \snippet doc/src/snippets/code/doc_src_emb-envvars.qdoc 0
+
+    The valid values for the \c <driver> argument are \c LinuxFb, \c
+    QVFb, \c VNC, \c Transformed, \c Multi and \l
+    {QScreenDriverPlugin::keys()}{keys} identifying custom drivers,
+    and the \c {<display num>} argument is used to separate screens
+    that are using the same screen driver and to enable multiple
+    displays (see the \l {Running Qt for Embedded Linux Applications}
+    documentation for more details).
+
+    The driver specific options are described in the \l{Qt for Embedded Linux
+    Display Management}{display management} documentation.
+
+    \row
+    \o \bold QWS_SIZE \target QWS_SIZE
+    \o
+
+    Specifies the size of the \l{Qt for Embedded Linux} window which is centered
+    within the screen. For example, if the current shell is bash, ksh,
+    zsh or sh:
+
+    \snippet doc/src/snippets/code/doc_src_emb-envvars.qdoc 1
+
+    \row
+    \o \bold QWS_MOUSE_PROTO \target QWS_MOUSE_PROTO
+    \o
+
+    Specifies the driver for pointer handling. For example, if the
+    current shell is bash, ksh, zsh or sh:
+
+    \snippet doc/src/snippets/code/doc_src_emb-envvars.qdoc 2
+
+    The valid values for the \c <driver> argument are \c MouseMan, \c
+    IntelliMouse, \c Microsoft, \c VR41xx, \c LinuxTP, \c Yopy. \c
+    Tslib and \l {QMouseDriverPlugin::keys()}{keys} identifying
+    custom drivers, and the driver specific options are typically a
+    device, e.g., \c /dev/mouse for mouse devices and \c /dev/ts for
+    touch panels.
+
+    Multiple keyboard drivers can be specified in one go:
+
+    \snippet doc/src/snippets/code/doc_src_emb-envvars.qdoc 3
+
+    Input will be read from all specified drivers.
+    Note that the \c Vr41xx driver also accepts two optional
+    arguments: \c press=<value> defining a mouseclick (the default
+    value is 750) and \c filter=<value> specifying the length of the
+    filter used to eliminate noise (the default length is 3). For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_emb-envvars.qdoc 4
+
+    See also \l {Qt for Embedded Linux Pointer Handling}.
+
+    \row
+    \o \bold QWS_KEYBOARD \target QWS_KEYBOARD
+    \o
+
+    Specifies the driver and device for character input. For example, if the
+    current shell is bash, ksh, zsh or sh:
+
+    \snippet doc/src/snippets/code/doc_src_emb-envvars.qdoc 5
+
+    The valid values for the \c <driver> argument are \c SL5000, \c
+    Yopy, \c VR41xx, \c TTY, \c USB and \l
+    {QKbdDriverPlugin::keys()}{keys} identifying custom drivers,
+    and the driver specific options are typically a device, e.g., \c
+    /dev/tty0.
+
+    Multiple keyboard drivers can be specified in one go:
+
+    \snippet doc/src/snippets/code/doc_src_emb-envvars.qdoc 6
+
+    Input will be read from all specified drivers.
+
+    See also \l {Qt for Embedded Linux Character Input}.
+
+    \endtable
+*/
diff --git a/doc/src/emb-features.qdoc b/doc/src/emb-features.qdoc
new file mode 100644
index 0000000000..67f92a5a31
--- /dev/null
+++ b/doc/src/emb-features.qdoc
@@ -0,0 +1,147 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page fine-tuning-features.html
+    \title Fine-Tuning Features in Qt
+    \ingroup qtce
+    \ingroup qt-embedded-linux
+    \brief Describes how to reduce the size of Qt libraries by selecting only
+    the features that are needed.
+
+    In many cases, only a fixed set of applications are deployed on an
+    embedded device, making it possible to save resources by minimizing
+    the size of the associated libraries. The Qt installation can easily
+    be optimized by avoiding to compile in the features that are not
+    required.
+
+    \tableofcontents
+
+    A wide range of features are defined, covering classes and technologies
+    provided by several of Qt's modules.
+    You can look up the different feature definitions in the
+    \c{src/corelib/global/qfeatures.txt} file within the Qt source
+    distribution.
+
+    \section1 Simple Customization
+
+    \section2 Embedded Linux
+
+    To disable a particular feature, just run the \c configure script 
+    for Qt for Embedded Linux with the \c -no-feature-<feature> option.
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_emb-features.qdoc 1
+
+    The feature can easily be enabled again by running \c configure
+    with the \c -feature-<feature> option.
+
+    See also \l{Qt Performance Tuning}.
+
+    \section2 Windows CE
+
+    To disable a particular feature, just run the \c configure script 
+    with the set of required \c -D<feature> options. For example,
+    you can use the \c -D option to define \c{QT_NO_THREAD}:
+
+    \snippet doc/src/snippets/code/doc_src_emb-features.qdoc 0
+
+    The \c -D option only creates a Qt internal define. If you get linker
+    errors you have to define \c QT_NO_THREAD also for your project.
+    You can do this by adding \c DEFINES += \c QT_NO_THREAD to your
+    \c .pro file.
+
+    See also \l{Qt Performance Tuning}.
+
+    \section1 Managing Large Numbers of Features
+
+    If you want to disable a lot of features, it is more comfortable
+    to use the \c qconfig tool.
+    You can disable a \e set of features by creating a custom
+    configuration file that defines the preferred subset of Qt's
+    functionality. Such a file uses macros to disable the unwanted
+    features, and can be created manually or by using the \c qconfig
+    tool located in the \c{tools/qconfig} directory of the Qt source
+    distribution.
+
+    \note The \c qconfig tool is intended to be built against Qt on
+    desktop platforms.
+
+    \bold{Windows CE:} The Qt for Windows CE package contains a \c qconfig
+    executable that you can run on a Windows desktop to configure the build.
+
+    \image qt-embedded-qconfigtool.png
+
+    The \c qconfig tool's interface displays all of Qt's
+    functionality, and allows the user to both disable and enable
+    features. The user can open and edit any custom configuration file
+    located in the \c{src/corelib/global} directory. When creating a
+    custom configuration file manually, a description of the currently
+    available Qt features can be found in the
+    \c{src/corelib/global/qfeatures.txt} file.
+
+    Note that some features depend on others; disabling any feature
+    will automatically disable all features depending on it. The
+    feature dependencies can be explored using the \c qconfig tool,
+    but they are also described in the \c{src/corelib/global/qfeatures.h}
+    file.
+
+    To be able to apply the custom configuration, it must be saved in
+    a file called \c qconfig-myfile.h in the \c{src/corelib/global}
+    directory. Then use the \c configure tool's \c -qconfig option
+    and pass the configuration's file name without the \c qconfig-
+    prefix and \c .h extension, as argument.
+    The following examples show how this is invoked on each of the
+    embedded platforms for a file called \c{qconfig-myfile.h}:
+
+    \bold{Embedded Linux:}
+
+    \snippet doc/src/snippets/code/doc_src_emb-features.qdoc 3
+
+    \bold{Windows CE:}
+
+    \snippet doc/src/snippets/code/doc_src_emb-features.qdoc 2
+
+    Qt provides several ready-made custom configuration files,
+    defining minimal, small, medium and large installations,
+    respectively. These files are located in the
+    \c{/src/corelib/global} directory in the Qt source distribution.
+*/
diff --git a/doc/src/emb-fonts.qdoc b/doc/src/emb-fonts.qdoc
new file mode 100644
index 0000000000..3ed23c3cf7
--- /dev/null
+++ b/doc/src/emb-fonts.qdoc
@@ -0,0 +1,201 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt-embedded-fonts.html
+
+    \title Qt for Embedded Linux Fonts
+    \ingroup qt-embedded-linux
+
+    \l {Qt for Embedded Linux} uses the
+    \l{http://freetype.sourceforge.net/freetype2/index.html}{FreeType 2}
+    font engine to produce font output. The formats supported depends on
+    the locally installed version of the FreeType library. In addition,
+    \l{Qt for Embedded Linux} supports the Qt Prerendered Font formats (\l QPF and \l QPF2):
+    light-weight non-scalable font formats specific to \l {Qt for Embedded Linux}.
+    QPF2 is the native format of \l{Qt for Embedded Linux}. QPF is the legacy
+    format used by Qt/Embedded 2.x and 3.x. Several of the formats may be rendered
+    using anti-aliasing for improved readability.
+
+    When \l{Qt for Embedded Linux} applications run, they look for fonts in
+    Qt's \c lib/fonts/ directory. \l {Qt for Embedded Linux} will automatically detect
+    prerendered fonts and TrueType fonts. For compatibility, it will also read the
+    legacy \c lib/fonts/fontdir file.
+
+    Support for other font formats can be added, contact
+    \l{mailto:qt-info@nokia.com}{qt-info@nokia.com} for more
+    information.
+
+    \tableofcontents
+
+    \table 100%
+    \row
+    \o
+    \bold {Optimization}
+
+    The \l FreeType, \l QPF2 and \l QPF formats are features that can be
+    disabled using the
+    \l{Fine-Tuning Features in Qt}{feature definition system},
+    reducing the size of Qt and saving resources.
+
+    Note that at least one font format must be defined.
+
+    See the \l {Fine-Tuning Features in Qt} documentation for
+    details.
+
+    \o
+    \inlineimage qt-embedded-fontfeatures.png
+    \endtable
+
+    All supported fonts use the Unicode character encoding. Most fonts
+    available today do, but they usually don't contain \e all the
+    Unicode characters. A complete 16-point Unicode font uses over 1
+    MB of memory.
+
+    \target FreeType
+    \section1 FreeType Formats
+
+    The \l {http://freetype.sourceforge.net/freetype2/index.html}{FreeType 2}
+    library (and therefore \l{Qt for Embedded Linux}) can support the following font formats:
+
+    \list
+        \o TrueType (TTF)
+        \o PostScript Type1 (PFA/PFB)
+        \o Bitmap Distribution Format (BDF)
+        \o CID-keyed Type1
+        \o Compact Font Format (CFF)
+        \o OpenType fonts
+        \o SFNT-based bitmap fonts
+        \o Portable Compiled Format (PCF)
+        \o Microsoft Windows Font File Format (Windows FNT)
+        \o Portable Font Resource (PFR)
+        \o Type 42 (limited support)
+    \endlist
+
+    It is possible to add modules to the \l
+    {http://freetype.sourceforge.net/freetype2/index.html}{FreeType 2}
+    font engine to support other types of font files. For more
+    information, see the font engine's own website: \l
+    http://freetype.sourceforge.net/freetype2/index.html.
+
+    Glyphs rendered using FreeType are shared efficiently between applications,
+    reducing memory requirements and speeding up text rendering.
+
+    \omit
+    \l {Qt for Embedded Linux} will by default use the system FreeType library if it exists.
+    Otherwise it will use a copy of the FreeType library in Qt, which by default only
+    supports TrueType fonts to reduce footprint.
+    \endomit
+
+    \target QPF2
+    \section1 Qt Prerendered Font (QPF2)
+
+    The Qt Prerendered Font (QPF2) is an architecture-independent,
+    light-weight and non-scalable font format specific to \l{Qt for Embedded Linux}.
+
+    Nokia provides the cross-platform \c makeqpf tool, included in the
+    \c tools directory of both \l {Qt} and \l{Qt for Embedded Linux}, which allows
+    generation of QPF2 files from system fonts.
+
+    QPF2 supports anti-aliasing and complex writing systems, using information
+    from the corresponding TrueType font, if present on the system. The format
+    is designed to be mapped directly to memory. The same format is used to
+    share glyphs from non-prerendered fonts between applications.
+
+    \target QPF
+    \section1 Legacy Qt Prerendered Font (QPF)
+
+    Nokia provides support for the legacy QPF format for compatibility
+    reasons. QPF is based on the internal font engine data structure of Qt/Embedded
+    versions 2 and 3.
+
+    Note that the file name describes the font, for example \c helvetica_120_50.qpf
+    is 12 point Helvetica while \c helvetica_120_50i.qpf is 12 point Helvetica \e italic.
+
+    \omit
+    \section1 Memory Requirements
+
+    Taking advantage of the way the QPF format is structured, Qt for
+    Embedded Linux memory-maps the data rather than reading and parsing it.
+    This reduces RAM consumption even further.
+
+    Scalable fonts use a larger amount of memory per font, but
+    these fonts provide a memory saving if many different sizes of each
+    font are needed.
+    \endomit
+
+    \section1 The Legacy \c fontdir File
+
+    For compatibility reasons \l{Qt for Embedded Linux} supports the \c fontdir
+    file, if present. The file defines additional fonts available to the
+    application, and has the following format:
+
+    \snippet doc/src/snippets/code/doc_src_emb-fonts.qdoc 0
+
+    \table 100%
+    \header \o Field \o Description
+    \row \o \bold name
+    \o The name of the font format, e.g.,\c Helvetica, \c Times, etc.
+    \row \o \bold file
+    \o The name of the file containing the font, e.g., \c
+    helvR0810.bdf, \c verdana.ttf, etc.
+    \row \o \bold renderer
+    \o Specifies the font engine that should be used to render the
+    font, currently only the FreeType font engine (\c FT) is
+    supported.
+    \row \o \bold italic
+    \o Specifies whether the font is italic or not; the accepted
+    values are \c y or \c n.
+    \row \o \bold weight
+    \o Specifies the font's weight: \c 50 is normal, \c 75 is bold,
+    etc.
+    \row \o \bold size
+    \o Specifies the font size, i.e., point size * 10. For example, a
+    value of 120 means 12pt. A value of 0 means that the font is
+    scalable.
+    \row \o \bold flags
+    \o The following flag is supported:
+    \list
+        \o \c s: smooth (anti-aliased)
+    \endlist
+    All other flags are ignored.
+    \endtable
+*/
diff --git a/doc/src/emb-framebuffer-howto.qdoc b/doc/src/emb-framebuffer-howto.qdoc
new file mode 100644
index 0000000000..fc86dd99e7
--- /dev/null
+++ b/doc/src/emb-framebuffer-howto.qdoc
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt-embedded-testingframebuffer.html
+
+    \title Testing the Linux Framebuffer
+    \subtitle for Qt for Embedded Linux
+    \ingroup qt-embedded-linux
+
+    To test that the Linux framebuffer is set up correctly, and that
+    the device permissions are correct, use the program found in 
+    \c examples/qws/framebuffer which opens the frame buffer and draws
+    three squares of different colors.
+*/
diff --git a/doc/src/emb-install.qdoc b/doc/src/emb-install.qdoc
new file mode 100644
index 0000000000..11b3f030af
--- /dev/null
+++ b/doc/src/emb-install.qdoc
@@ -0,0 +1,197 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt-embedded-install.html
+
+    \title Installing Qt for Embedded Linux
+    \ingroup qt-embedded-linux
+    \ingroup installation
+    \brief How to install Qt for Embedded Linux.
+
+    This document describes how to install \l{Qt for Embedded Linux} in your
+    development environment:
+
+    \tableofcontents
+
+    Please see the \l{Cross-Compiling Qt for Embedded Linux Applications}{cross
+    compiling} and \l{Deploying Qt for Embedded Linux Applications}{deployment}
+    documentation for details on how to install \l{Qt for Embedded Linux} on
+    your target device.
+
+    Note also that this installation procedure is written for Linux,
+    and that it may need to be modified for other platforms.
+
+    \section1 Step 1: Installing the License File (commercial editions only)
+
+    If you have the commercial edition of \l{Qt for Embedded Linux}, the first step
+    is to install your license file as \c $HOME/.qt-license.
+
+    For the open source version you do not need a license file.
+
+    \section1 Step 2: Unpacking the Archive
+
+    First uncompress the archive in the preferred location, then
+    unpack it:
+
+    \snippet doc/src/snippets/code/doc_src_emb-install.qdoc 0
+
+    This document assumes that the archive is unpacked in the
+    following directory:
+
+    \snippet doc/src/snippets/code/doc_src_emb-install.qdoc 1
+
+    \section1 Step 3: Building the Library
+
+    Before building the \l{Qt for Embedded Linux} library, run the \c
+    ./configure script to configure the library for your development
+    architecture. You can list all of the configuration system's
+    options by typing \c {./configure -help}.
+
+    Note that by default, \l{Qt for Embedded Linux} is configured for
+    installation in the \c{/usr/local/Trolltech/QtEmbedded-%VERSION%}
+    directory, but this can be changed by using the \c{-prefix}
+    option. Alternatively, the \c{-prefix-install} option can be used
+    to specify a "local" installation within the source directory.
+
+    The configuration system is also designed to allow you to specify
+    your platform architecture:
+
+    \snippet doc/src/snippets/code/doc_src_emb-install.qdoc 2
+
+    In general, all Linux systems which have framebuffer support can
+    use the \c generic architecture. Other typical architectures are
+    \c x86, \c arm and \c mips.
+
+    \note If you want to build Qt for Embedded Linux for use with a virtual
+    framebuffer, pass the \c{-qvfb} option to the \c configure
+    script.
+
+    To create the library and compile all the demos, examples, tools,
+    and tutorials, type:
+
+    \snippet doc/src/snippets/code/doc_src_emb-install.qdoc 3
+
+    On some systems the \c make utility is named differently, e.g. \c
+    gmake. The \c configure script tells you which \c make utility to
+    use.
+
+    If you did not configure \l{Qt for Embedded Linux} using the \c{-prefix-install}
+    option, you need to install the library, demos, examples, tools,
+    and tutorials in the appropriate place. To do this, type:
+
+    \snippet doc/src/snippets/code/doc_src_emb-install.qdoc 4
+
+    and enter the root password.
+
+    \note You can use the \c INSTALL_ROOT environment variable to specify
+    the location of the installed files when invoking \c{make install}.
+
+    \section1 Step 4: Adjusting the Environment Variables
+
+    In order to use \l{Qt for Embedded Linux}, the \c PATH variable must be extended
+    to locate \c qmake, \c moc and other \l{Qt for Embedded Linux} tools, and the \c
+    LD_LIBRARY_PATH must be extended for compilers that do not support
+    \c rpath.
+
+    To set the \c PATH variable, add the following lines to your \c
+    .profile file if your shell is bash, ksh, zsh or sh:
+
+    \snippet doc/src/snippets/code/doc_src_emb-install.qdoc 5
+
+    In case your shell is csh or tcsh, add the following line to the
+    \c .login file instead:
+
+    \snippet doc/src/snippets/code/doc_src_emb-install.qdoc 6
+
+    If you use a different shell, please modify your environment
+    variables accordingly.
+
+    For compilers that do not support \c rpath you must also extend
+    the \c LD_LIBRARY_PATH environment variable to include
+    \c /usr/local/Trolltech/QtEmbedded-%VERSION%/lib. Note that on Linux
+    with GCC, this step is not needed.
+
+    \section1 Step 5: Building the Virtual Framebuffer
+
+    For development and debugging, \l{Qt for Embedded Linux} provides a virtual
+    framebuffer as well as the option of running \l{Qt for Embedded Linux} as a VNC
+    server. For a description of how to install the virtual
+    framebuffer and how to use the VNC protocol, please consult the
+    documentation at:
+
+    \list
+       \o \l {The Virtual Framebuffer}
+       \o \l {The VNC Protocol and Qt for Embedded Linux}
+    \endlist
+
+    Note that the virtual framebuffer requires a Qt for X11
+    installation. See \l {Installing Qt on X11 Platforms} for details.
+
+    The Linux framebuffer, on the other hand, is enabled by default on
+    all modern Linux distributions. For information on older versions,
+    see \l http://en.tldp.org/HOWTO/Framebuffer-HOWTO.html. To test
+    that the Linux framebuffer is set up correctly, use the program
+    provided by the \l {Testing the Linux Framebuffer} document.
+
+    That's all. \l{Qt for Embedded Linux} is now installed.
+
+    \table 100%
+    \row
+    \o
+    \bold {Customizing the Qt for Embedded Linux Library}
+
+    When building embedded applications on low-powered devices,
+    reducing the memory and CPU requirements is important.
+
+    A number of options tuning the library's performance are
+    available. But the most direct way of saving resources is to
+    fine-tune the set of Qt features that is compiled. It is also
+    possible to make use of accelerated graphics hardware.
+
+    \list
+        \o \l {Fine-Tuning Features in Qt}
+        \o \l {Qt Performance Tuning}
+        \o \l {Adding an Accelerated Graphics Driver to Qt for Embedded Linux}
+    \endlist
+
+    \endtable
+*/
diff --git a/doc/src/emb-makeqpf.qdoc b/doc/src/emb-makeqpf.qdoc
new file mode 100644
index 0000000000..ca33edacc8
--- /dev/null
+++ b/doc/src/emb-makeqpf.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt-embedded-makeqpf.html
+    \title makeqpf
+    \ingroup qt-embedded-linux
+
+    \c makeqpf is not part of Qt 4. However, Qt 4 can still read QPF
+    files generated by Qt 2 or 3. To generate QPF files, use makeqpf from Qt 2
+    or 3.
+*/
diff --git a/doc/src/emb-performance.qdoc b/doc/src/emb-performance.qdoc
new file mode 100644
index 0000000000..79edf34dd7
--- /dev/null
+++ b/doc/src/emb-performance.qdoc
@@ -0,0 +1,152 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt-performance.html
+    \title Qt Performance Tuning
+    \ingroup qtce
+    \ingroup qt-embedded-linux
+    \brief Ways to improve performance on embedded platforms.
+
+    When building embedded applications on low-powered devices,
+    \l{Qt for Windows CE} and \l{Qt for Embedded Linux} provide
+    a number of options that reduce the memory and/or CPU requirements
+    by making various trade-offs. These options range from variations
+    in programming style, to linking and memory allocation.
+
+    Note that the most direct way of saving resources, is to avoid compiling
+    in features that are not required. See the \l{Fine-Tuning Features in Qt}
+    {fine tuning features} documentation for details.
+
+    \tableofcontents
+
+    \section1 Programming Style
+
+    Rather than creating dialogs and widgets every time they are
+    needed, and delete them when they are no longer required, create
+    them once and use the QWidget::hide() and QWidget::show()
+    functions whenever appropriate. To avoid a slow startup of the
+    application, delay the creation of dialogs and widgets until they
+    are requested. All this will improve the CPU performance, it
+    requires a little more memory, but will be much faster.
+
+    \section1 Static vs. Dynamic Linking
+
+    A lot of CPU and memory is used by the ELF (Executable and Linking
+    Format) linking process. Significant savings can be achieved by
+    using a static build of the application suite; rather than having
+    a collection of executables which link dynamically to Qt's
+    libraries, all the applications is built into into a single
+    executable which is statically linked to Qt's libraries.
+
+    This improves the start-up time and reduces memory usage at the
+    expense of flexibility (to add a new application, you must
+    recompile the single executable) and robustness (if one
+    application has a bug, it might harm other applications).
+
+    \table 100%
+    \row
+    \o \bold {Creating a Static Build}
+
+    To compile Qt as a static library, use the \c -static option when
+    running configure:
+
+    \snippet doc/src/snippets/code/doc_src_emb-performance.qdoc 0
+
+    To build the application suite as an all-in-one application,
+    design each application as a stand-alone widget (or set of
+    widgets) with only minimal code in the \c main() function. Then,
+    write an application that provides a means of switching between
+    the applications.  The \l Qt Extended platform is an example using this
+    approach: It can be built either as a set of dynamically linked
+    executables, or as a single static application.
+
+    Note that the application still should link dynamically against
+    the standard C library and any other libraries which might be used
+    by other applications on the target device.
+
+    \endtable
+
+    When installing end-user applications, this approach may not be an
+    option, but when building a single application suite for a device
+    with limited CPU power and memory, this option could be very
+    beneficial.
+
+    \section1 Alternative Memory Allocation
+
+    The libraries shipped with some C++ compilers on some platforms
+    have poor performance in the built-in "new" and "delete"
+    operators. Improved memory allocation and performance may be
+    gained by re-implementing these functions:
+
+    \snippet doc/src/snippets/code/doc_src_emb-performance.qdoc 1
+
+    The example above shows the necessary code to switch to the plain
+    C memory allocators.
+
+    \section1 Bypassing the Backing Store
+
+    When rendering, Qt uses the concept of a backing store; i.e., a
+    paint buffer, to reduce flicker and to support graphics operations
+    such as blending.
+
+    The default behavior is for each client to render
+    its widgets into memory while the server is responsible for
+    putting the contents of the memory onto the screen. But when the
+    hardware is known and well defined, as is often the case with
+    software for embedded devices, it might be useful to bypass the
+    backing store, allowing the clients to manipulate the underlying
+    hardware directly.
+    \if defined(qtce)
+    This is achieved by setting the Qt::WA_PaintOnScreen window attribute
+    for each widget.
+    \else
+
+    There are two approaches to direct painting: The first approach is
+    to set the Qt::WA_PaintOnScreen window attribute for each widget,
+    the other is to use the QDirectPainter class to reserve a region
+    of the framebuffer.
+      For more information, see the
+      \l{Qt for Embedded Linux Architecture#Direct Painting}{direct painting}
+      section of the \l{Qt for Embedded Linux Architecture}{architecture}
+      documentation.
+    \endif
+*/
diff --git a/doc/src/emb-pointer.qdoc b/doc/src/emb-pointer.qdoc
new file mode 100644
index 0000000000..d52abfb261
--- /dev/null
+++ b/doc/src/emb-pointer.qdoc
@@ -0,0 +1,216 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt-embedded-pointer.html
+
+    \title Qt for Embedded Linux Pointer Handling
+    \ingroup qt-embedded-linux
+
+    When running a \l{Qt for Embedded Linux} application, it either runs as a
+    server or connects to an existing server. The mouse driver is
+    loaded by the server application when it starts running, using
+    Qt's \l {How to Create Qt Plugins}{plugin system}.
+
+    Internally in the client/server protocol, all system generated
+    events, including pointer events, are passed to the server
+    application which then propagates the event to the appropriate
+    client. Note that pointer handling in \l{Qt for Embedded Linux} works for
+    both mouse and mouse-like devices such as touch panels and
+    trackballs.
+
+    Contents:
+
+    \tableofcontents
+
+    \section1 Available Drivers
+
+    \l{Qt for Embedded Linux} provides ready-made drivers for the MouseMan,
+    IntelliMouse, Microsoft, NEC Vr41XX, Linux Touch Panel and Yopy
+    protocols as well as the universal touch screen library,
+    tslib. Run the \c configure script to list the available drivers:
+
+    \if defined(QTOPIA_PHONE)
+
+        \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 0
+
+        \bold{Note:} By default only the PC mouse driver is enabled.
+
+        The various drivers can be enabled and disabled using the \c
+        configure script. For example:
+
+        \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 1
+
+    \else
+
+        \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 2
+
+        In the default Qt configuration, only the "pc" mouse driver is
+        enabled. The various drivers can be enabled and disabled using
+        the \c configure script. For example:
+
+        \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 3
+    \endif
+
+    Custom mouse drivers can be implemented by subclassing the
+    QWSMouseHandler class and creating a mouse driver plugin (derived
+    from the QMouseDriverPlugin class). The default implementation of the
+    QMouseDriverFactory class will automatically detect the plugin,
+    loading the driver into the server application at run-time.
+
+    If you are creating a driver for a device that needs calibration
+    or noise reduction, such as a touchscreen, derive from the
+    QWSCalibratedMouseHandler subclass instead to take advantage of
+    its calibration functionality.
+
+    \if defined(QTOPIA_PHONE)
+        For a tutorial on how to add a new keyboard driver plug-in
+        see: \l {Tutorial: Implementing a Device Plug-in}.
+    \endif
+
+    \section1 Specifying a Driver
+
+    Provided that the "pc" mouse driver is enabled, \l{Qt for Embedded Linux} will
+    try to auto-detect the mouse device if it is one of the supported
+    types on \c /dev/psaux or one of the \c /dev/ttyS?  serial
+    lines. If multiple mice are detected, all may be used
+    simultaneously.
+
+    Note that \l{Qt for Embedded Linux} does not support auto-detection of \e
+    {touch panels} in which case the driver must be specified
+    explicitly to determine which device to use.
+
+    To manually specify which driver to use, set the QWS_MOUSE_PROTO
+    environment variable. For example (if the current shell is bash,
+    ksh, zsh or sh):
+
+    \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 4
+
+    The valid values for the \c <driver> argument are \c MouseMan, \c
+    IntelliMouse, \c Microsoft, \c VR41xx, \c LinuxTP, \c Yopy, \c
+    Tslib and \l {QMouseDriverPlugin::keys()}{keys} identifying custom
+    drivers, and the driver specific options are typically a device,
+    e.g., \c /dev/mouse for mouse devices and \c /dev/ts for touch
+    panels.
+
+    Multiple mouse drivers can be specified in one go:
+
+    \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 5
+
+    Input will be read from all specified drivers.
+
+    Note that the \c Vr41xx driver also accepts two optional
+    arguments: \c press=<value> defining a mouse click (the default
+    value is 750) and \c filter=<value> specifying the length of the
+    filter used to eliminate noise (the default length is 3). For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 6
+
+    \table
+    \header \o The Tslib Mouse Driver
+    \row
+    \o
+
+    The tslib mouse driver inherits the QWSCalibratedMouseHandler
+    class, providing calibration and noise reduction functionality in
+    addition to generating mouse events for devices using the
+    Universal Touch Screen Library.
+
+    To be able to compile this mouse handler, \l{Qt for Embedded Linux} must be
+    configured with the \c -qt-mouse-tslib option as described
+    above. In addition, the tslib headers and library must be present
+    in the build environment.
+
+    The tslib sources can be downloaded from \l
+    http://tslib.berlios.de. Use the \c configure script's -L and
+    -I options to explicitly specify the location of the library and
+    its headers:
+
+    \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 7
+
+    In order to use this mouse driver, tslib must also be correctly
+    installed on the target machine. This includes providing a \c
+    ts.conf configuration file and setting the neccessary environment
+    variables (see the README file provided with tslib for details).
+
+    The \c ts.conf file will usually contain the following two lines:
+
+    \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 8
+
+    To make \l{Qt for Embedded Linux} explicitly choose the tslib mouse
+    handler, set the QWS_MOUSE_PROTO environment variable as explained
+    above.
+
+    \endtable
+
+    \section1 Troubleshooting
+
+    \section2 Device Files
+
+    Make sure you are using the correct device file.
+
+    As a first step, you can test whether the device file actually gives any
+    output. For instance, if you have specified the mouse driver with
+    \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 9
+    then try examining
+    the output from the device by entering the following command in a console:
+    \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 10
+
+    If you see output from the device printed on the console when you move
+    the mouse, you are probably using the correct device file; otherwise, you
+    will need to experiment to find the correct device file.
+
+    \section2 File Permissions
+
+    Make sure you have sufficient permissions to access the device file.
+
+    The Qt for Embedded Linux server process needs at least read permission for the 
+    device file. Some drivers also require write access to the device file. 
+    For instance, if you have specified the mouse driver with
+    \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 11
+    then examine the permissions of the device file by entering the following
+    command in a console:
+    \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 12
+
+    If the device file is actually a symbolic link to another file, you must
+    change the permissions of the actual file instead.
+*/
diff --git a/doc/src/emb-porting.qdoc b/doc/src/emb-porting.qdoc
new file mode 100644
index 0000000000..9d6fad6157
--- /dev/null
+++ b/doc/src/emb-porting.qdoc
@@ -0,0 +1,193 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt-embedded-porting-operatingsystem.html
+
+    \title Porting Qt for Embedded Linux to Another Operating System
+    \ingroup qt-embedded-linux
+
+    \l{Qt for Embedded Linux} is reasonably platform-independent, making use of
+    the standard C library and some POSIX functions, but only a Linux
+    implementation is publically available. If you are looking for a
+    non-Linux commercial implementation, it is worth contacting \l
+    {mailto:sales@trolltech.com}{sales@trolltech.com} to see if we can
+    help.
+
+    There are several issues to be aware of if you plan to do your own
+    port to another operating system. In particular you must resolve
+    \l{Qt for Embedded Linux}'s shared memory and semaphores (used to share
+    window regions), and you must provide something similar to
+    Unix-domain sockets for inter-application communication. You must
+    also provide a screen driver, and if you want to implement sound
+    you must provide your own sound server. Finally you must modify
+    the event dispatcher used by \l{Qt for Embedded Linux}.
+
+    Contents:
+
+    \tableofcontents
+
+    \section1 Shared Memory and Semaphores
+
+    \l{Qt for Embedded Linux} uses System V IPC (shared memory and semaphores)
+    to share window regions between client and server. When porting,
+    something similar must be provided; otherwise it will not be
+    possible to run multiple applications.
+
+    System V semaphores are also used for synchronizing access to the
+    framebuffer.
+
+    \list
+        \o Modify \c qsharedmemory_p.cpp
+        \o Modify \c qlock_qws.cpp
+        \o Modify \c qwslock.cpp
+    \endlist
+
+    \section1 Inter-Application Communication
+
+    To communicate between applications, \l{Qt for Embedded Linux} uses the
+    Unix-domain sockets. When porting, something similar must be
+    provided; otherwise it will not be possible to run multiple
+    applications.
+
+    It should be possible to use message queues or similar mechanisms
+    to achieve this. With the exception of QCOP messages, individual
+    messages should be no more than a few bytes in length (QCOP
+    messages are generated by the client applications and not Qt for
+    Embedded Linux).
+
+    \list
+        \o Modify \c qwssocket_qws.cpp
+    \endlist
+
+    \section1 Screen Management
+
+    When rendering, the default behavior in \l{Qt for Embedded Linux} is
+    for each client to render its widgets into memory while the server is
+    responsible for putting the contents of the memory onto the screen
+    using the screen driver.
+
+    When porting, a new screen driver must be implemented, providing a
+    byte pointer to a memory-mapped framebuffer and information about
+    width, height and bit depth (the latter information can most
+    likely be hard-coded).
+
+    \list
+        \o Reimplement \c qscreen_qws.cpp
+    \endlist
+
+    \section1 Sound Management
+
+    To implement sound, \l{Qt for Embedded Linux} uses a Linux style device (\c
+    /dev/dsp). If you want to use the \l{Qt for Embedded Linux} sound server on
+    another platform you must reimplement it.
+
+    \list
+        \o Reimplement \c qsoundqss_qws.cpp
+    \endlist
+
+    \section1 Event Dispatching
+
+    \l{Qt for Embedded Linux} uses an event dispatcher to pass events to and
+    from the \l{Qt for Embedded Linux} server application. Reimplement the \c
+    select() function to enable \l{Qt for Embedded Linux} to dispatch events on
+    your platform.
+
+    \list
+        \o Modify \c qeventdispatcher_qws.cpp
+    \endlist
+*/
+
+/*!
+    \page qt-embedded-porting-device.html
+
+    \title Porting Qt for Embedded Linux to a New Architecture
+    \ingroup qt-embedded-linux
+
+    When porting \l{Qt for Embedded Linux} to a new architecture there are
+    several issues to be aware of: You must provide suitable hardware
+    drivers, and you must ensure to implement platform dependent
+    atomic operations to enable multithreading on the new
+    architecture.
+
+    \section1 Hardware Drivers
+
+    When running a \l{Qt for Embedded Linux} application, it either runs as a
+    server or connects to an existing server. All system generated
+    events, including keyboard and mouse events, are passed to the
+    server application which then propagates the event to the
+    appropriate client. When rendering, the default behavior is for
+    each client to render its widgets into memory while the server is
+    responsible for putting the contents of the memory onto the
+    screen.
+
+    The various hardware drivers are loaded by the server
+    application when it starts running, using Qt's \l {How to Create
+    Qt Plugins}{plugin system}.
+
+    Derive from the QWSMouseHandler, QWSKeyboardHandler and QScreen
+    classes to create a custom mouse, keyboard and screen driver
+    respectively. To load the drivers into the server application at
+    runtime, you must also create corresponding plugins. See the
+    following documentation for more details:
+
+    \list
+        \o \l{Qt for Embedded Linux Pointer Handling}{Pointer Handling}
+        \o \l{Qt for Embedded Linux Character Input}{Character Input}
+        \o \l{Qt for Embedded Linux Display Management}{Display Management}
+    \endlist
+
+    \section1 Atomic Operations
+
+    Qt uses an optimization called \l {Implicitly Shared Classes}{implicit sharing}
+    for many of its value classes; implicitly shared classes can safely be
+    copied across threads. This technology is implemented using atomic
+    operations; i.e., \l{Qt for Embedded Linux} requires that platform-specific
+    atomic operations are implemented to support Linux.
+
+    When porting \l{Qt for Embedded Linux} to a new architecture, it is
+    important to ensure that the platform-specific atomic operations
+    are implemented in a corresponding header file, and that this file
+    is located in Qt's \c src/corelib/arch directory.
+
+    See the \l {Implementing Atomic Operations}{atomic operations}
+    documentation for more details.
+*/
diff --git a/doc/src/emb-qvfb.qdoc b/doc/src/emb-qvfb.qdoc
new file mode 100644
index 0000000000..8b819b61fa
--- /dev/null
+++ b/doc/src/emb-qvfb.qdoc
@@ -0,0 +1,296 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qvfb.html
+
+    \title The Virtual Framebuffer
+    \ingroup qt-embedded-linux
+
+    \l{Qt for Embedded Linux} applications write directly to the
+    framebuffer, eliminating the need for the X Window System and
+    saving memory. For development and debugging purposes, a virtual
+    framebuffer can be used, allowing \l{Qt for Embedded Linux}
+    programs to be developed on a desktop machine, without switching
+    between consoles and X11.
+
+    QVFb is an X11 application supplied with Qt for X11 that provides
+    a virtual framebuffer for Qt for Embedded Linux to use. To use it,
+    you need to \l{Installing Qt on X11 Platforms}{configure and
+    install Qt on X11 platforms} appropriately. Further requirements
+    can be found in the \l{Qt for Embedded Linux Requirements}
+    document.
+
+    \image qt-embedded-virtualframebuffer.png
+
+    The virtual framebuffer emulates a framebuffer using a shared
+    memory region and the \c qvfb tool to display the framebuffer in a
+    window. The \c qvfb tool also supports a feature known as a skin
+    which can be used to change the look and feel of the display. The
+    tool is located in Qt's \c tools/qvfb directory, and provides
+    several additional features accessible through its \gui File and
+    \gui View menus.
+
+    Please note that the virtual framebuffer is a development tool
+    only. No security issues have been considered in the virtual
+    framebuffer design. It should be avoided in a production
+    environment; i.e. do not configure production libraries with the
+    \c -qvfb option.
+
+    \tableofcontents
+
+    \section1 Displaying the Virtual Framebuffer
+
+    To run the \c qvfb tool displaying the virtual framebuffer, the
+    \l{Qt for Embedded Linux} library must be configured and compiled
+    with the \c -qvfb option:
+
+    \snippet doc/src/snippets/code/doc_src_emb-qvfb.qdoc 0
+
+    Ensure that you have all the
+    \l{Qt for Embedded Linux Requirements#Additional X11 Libraries for QVFb}
+    {necessary libraries} needed to build the tool, then compile and run the
+    \c qvfb tool as a normal Qt for X11 application (i.e., do \e not compile
+    it as a \l{Qt for Embedded Linux} application):
+
+    \snippet doc/src/snippets/code/doc_src_emb-qvfb.qdoc 1
+
+    The \c qvfb application supports the following command line
+    options:
+
+    \table
+    \header \o Option \o Description
+    \row
+    \o \c {-width <value>}
+    \o The width of the virtual framebuffer (default: 240).
+    \row
+    \o \c {-height <value>}
+    \o The height of the virtual framebuffer (default: 320).
+    \row
+    \o \c {-depth <value>}
+    \o The depth of the virtual framebuffer (1, 8 or 32; default: 8).
+    \row
+    \o \c -nocursor
+    \o Do not display the X11 cursor in the framebuffer window.
+    \row
+    \o \c {-qwsdisplay <:id>}
+    \o The \l{Qt for Embedded Linux} display ID (default: 0).
+    \row
+    \o \c {-skin <name>.skin}
+    \o The preferred skin. Note that the skin must be located in Qt's
+    \c /tools/qvfb/ directory.
+    \row
+    \o \c {-zoom <factor>}
+    \o Scales the application view with the given factor.
+
+    \endtable
+
+    \section2 Skins
+
+    A skin is a set of XML and pixmap files that tells the vitual
+    framebuffer what it should look like and how it should behave; a
+    skin can change the unrealistic default display into a display
+    that is similar to the target device. To access the \c qvfb tool's
+    menus when a skin is activated, right-click over the display.
+
+    Note that a skin can have buttons which (when clicked) send
+    signals to the Qt Extended application running inside the virtual
+    framebuffer, just as would happen on a real device.
+
+    \table 100%
+    \row
+        \o
+        \bold {Target Device Environment}
+
+        The \c qvfb tool provides various skins by default, allowing
+        the user to view their application in an environment similar
+        to their target device. The provided skins are:
+
+        \list
+            \o ClamshellPhone
+            \o pda
+            \o PDAPhone
+            \o Qt ExtendedPDA
+            \o Qt ExtendedPhone-Advanced
+            \o Qt ExtendedPhone-Simple
+            \o SmartPhone
+            \o SmartPhone2
+            \o SmartPhoneWithButtons
+            \o TouchscreenPhone
+            \o Trolltech-Keypad
+            \o Trolltech-Touchscreen
+        \endlist
+
+        In addition, it is possible to create custom skins.
+
+        \o \image qt-embedded-phone.png
+        \o \image qt-embedded-pda.png
+    \endtable
+
+    \bold {Creating Custom Skins}
+
+    The XML and pixmap files specifying a custom skin must be located
+    in subdirectory of the Qt's \c /tools/qvfb directory, called \c
+    /customskin.skin. See the ClamshellPhone skin for an example of the
+    file structure:
+
+    \snippet doc/src/snippets/code/doc_src_emb-qvfb.qdoc 2
+
+    The \c /ClamshellPhone.skin directory contains the following files:
+
+    \list
+        \o \c ClamshellPhone.skin
+        \o \c ClamshellPhone1-5.png
+        \o \c ClamshellPhone1-5-pressed.png
+        \o \c ClamshellPhone1-5-closed.png
+        \o \c defaultbuttons.conf (only necessary for \l Qt Extended)
+    \endlist
+
+    Note that the \c defaultbuttons.conf file is only necessary if the
+    skin is supposed to be used with \l Qt Extended (The file customizes
+    the launch screen applications, orders the soft keys and provides
+    input method hints). See the \l Qt Extended documentation for more
+    information.
+
+    \table 100%
+    \header
+    \o {3,1} The ClamshellPhone Skin
+    \row
+    \o {3,1}
+
+    \snippet doc/src/snippets/code/doc_src_emb-qvfb.qdoc 3
+
+    The \c ClamShellPhone.skin file quoted above, specifies three
+    pixmaps: One for the normal skin (\c Up), one for the activated
+    skin (\c Down) and one for the closed skin (\c Closed). In
+    addition, it is possible to specify a pixmap for the cursor (using
+    a \c Cursor variable).
+
+    The file also specifies the screen size (\c Screen) and the number
+    of available buttons (\c Areas). Then it describes the buttons
+    themselves; each button is specified by its name, keycode and
+    coordinates.
+
+    The coordinates are a list of at least 2 points in clockwise order
+    that define a shape for the button; a click inside this shape will
+    be treated as a click on that button. While pressed, the pixels
+    for the button are redrawn from the activated skin.
+
+    \row
+    \row
+    \o
+    \image qt-embedded-clamshellphone-closed.png The ClamshellPhone Skin (closed)
+    \o
+    \image qt-embedded-clamshellphone.png The ClamshellPhone Skin
+    \o
+    \image qt-embedded-clamshellphone-pressed.png The ClamshellPhone Skin (pressed)
+    \row
+    \o \c ClamshellPhone1-5-closed.png
+    \o \c ClamshellPhone1-5.png
+    \o \c ClamshellPhone1-5-pressed.png
+    \endtable
+
+    \section2 The File Menu
+
+    \image qt-embedded-qvfbfilemenu.png
+
+    The \gui File menu allows the user to configure the virtual
+    framebuffer display (\gui File|Configure...), save a snapshot of
+    the framebuffer contents (\gui {File|Save Image...}) and record
+    the movements in the framebuffer (\gui File|Animation...).
+
+    When choosing the \gui File|Configure menu item, the \c qvfb tool
+    provides a configuration dialog allowing the user to customize the
+    display of the virtual framebuffer. The user can modify the size
+    and depth as well as the Gamma values, and also select the
+    preferred skin (i.e. making the virtual framebuffer simulate the
+    target device environment). In addition, it is possible to emulate
+    a touch screen and a LCD screen.
+
+    Note that when configuring (except when changing the Gamma values
+    only), any applications using the virtual framebuffer will be
+    terminated.
+
+    \section2 The View Menu
+
+    \image qt-embedded-qvfbviewmenu.png
+
+    The \gui View menu allows the user to modify the target's refresh
+    rate (\gui {View|Refresh Rate...}), making \c qvfb check for
+    updated regions more or less frequently.
+
+    The regions of the display that have changed are updated
+    periodically, i.e. the virtual framebuffer is displaying discrete
+    snapshots of the framebuffer rather than each individual drawing
+    operation. For this reason drawing problems such as flickering may
+    not be apparent until the program is run using a real framebuffer.
+    If little drawing is being done, the framebuffer will not show any
+    updates between drawing events. If an application is displaying an
+    animation, the updates will be frequent, and the application and
+    \c qvfb will compete for processor time.
+
+    The \gui View menu also allows the user to zoom the view of the
+    application  (\gui {View|Zoom *}).
+
+    \section1 Running Applications Using the Virtual Framebuffer
+
+    Once the virtual framebuffer (the \c qvfb application) is running,
+    it is ready for use: Start a server application (i.e. construct a
+    QApplication object with the QApplication::GuiServer flag or use
+    the \c -qws command line parameter. See the
+    \l {Running Qt for Embedded Linux Applications}{running applications}
+    documentation for details). For example:
+
+    \snippet doc/src/snippets/code/doc_src_emb-qvfb.qdoc 4
+
+    Note that as long as the virtual framebuffer is running and the
+    current \l{Qt for Embedded Linux} configuration supports \c qvfb,
+    \l{Qt for Embedded Linux} will automatically detect it and use it by
+    default. Alternatively, the \c -display option can be used to
+    specify the virtual framebuffer driver. For example:
+
+    \snippet doc/src/snippets/code/doc_src_emb-qvfb.qdoc 5
+
+    \warning If \c qvfb is not running (or the current
+    \l{Qt for Embedded Linux} configuration doesn't support it) and the
+    driver is not explicitly specified, \l{Qt for Embedded Linux} will
+    write to the real framebuffer and the X11 display will be corrupted.
+*/
diff --git a/doc/src/emb-running.qdoc b/doc/src/emb-running.qdoc
new file mode 100644
index 0000000000..9cdf41444a
--- /dev/null
+++ b/doc/src/emb-running.qdoc
@@ -0,0 +1,210 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt-embedded-running.html
+
+    \title Running Qt for Embedded Linux Applications
+    \ingroup qt-embedded-linux
+
+    A \l{Qt for Embedded Linux} application requires a server application to be
+    running, or to be the server application itself. Any \l{Qt for Embedded Linux}
+    application can be the server application by constructing the QApplication
+    object with the QApplication::GuiServer type, or by running the application
+    with the \c -qws command line option.
+
+    Applications can run using both single and multiple displays, and
+    various command line options are available.
+
+    Note that this document assumes that you either are using the
+    \l{The Virtual Framebuffer} or that you are running \l{Qt for Embedded Linux}
+    using the \l {The VNC Protocol and Qt for Embedded Linux}{VNC} protocol,
+    \e or that you have the Linux framebuffer configured
+    correctly and that no server process is running. (To test that the
+    Linux framebuffer is set up correctly, use the program provided by
+    the \l {Testing the Linux Framebuffer} document.)
+
+    \tableofcontents
+
+    \section1 Using a Single Display
+
+    To run the application using a single display, change to a Linux
+    console and select an application to run, e.g. \l {Text
+    Edit}{demos/textedit}.  Run the application with the \c -qws
+    option:
+
+    \snippet doc/src/snippets/code/doc_src_emb-running.qdoc 0
+
+    \table 100%
+    \row
+    \o
+    Provided that the environment variables are adjusted properly
+    during the \l {Installing Qt for Embedded Linux}{installation process}, you
+    should see the \l {Text Edit} demo appear.
+
+    It might be that the hardware drivers must be specified explicitly
+    to make everything work properly. For more information, please
+    consult the following documentation:
+
+    \list
+        \o \l{Qt for Embedded Linux Pointer Handling}{Pointer Handling}
+        \o \l{Qt for Embedded Linux Character Input}{Character Input}
+        \o \l{Qt for Embedded Linux Display Management}{Display Management}
+    \endlist
+
+    \o
+    \inlineimage qt-embedded-runningapplication.png
+    \endtable
+
+    Additional applications can be run as clients, i.e., by running
+    these applications \e without the \c -qws option they will connect
+    to the existing server as clients. You can exit the server
+    application at any time using \gui{Ctrl+Alt+Backspace}.
+
+    \section1 Using Multiple Displays
+
+    Qt for Embedded Linux also allows multiple displays to be used
+    simultaneously. There are two ways of achieving this: Either run
+    multiple Qt for Embedded Linux server processes, or use the
+    ready-made \c Multi screen driver.
+
+    When running multiple server processes, the screen driver (and
+    display number) must be specified for each process using the \c
+    -display command line option or by setting the QWS_DISPLAY
+    environment variable. For example:
+
+    \snippet doc/src/snippets/code/doc_src_emb-running.qdoc 1
+
+    See the \l {Qt for Embedded Linux Display Management}{display management}
+    documentation for more details on how to specify a screen
+    driver. Note that you must also specify the display (i.e., server
+    process) when starting client applications:
+
+    \snippet doc/src/snippets/code/doc_src_emb-running.qdoc 2
+
+    There is no way of moving a client from one display to another
+    when running multiple server processes. Using the \c Multi screen
+    driver, on the other hand, applications can easiliy be moved
+    between the various screens.
+
+    The \c Multi screen driver can be specified just like any other
+    screen driver by using the \c -display command line option or by
+    setting the QWS_DISPLAY environment variable. For example:
+
+    \snippet doc/src/snippets/code/doc_src_emb-running.qdoc 3
+
+    See the \l {Qt for Embedded Linux Display Management}{display management}
+    documentation for details regarding arguments.
+
+    \section1 Command Line Options
+
+    \table 100%
+    \header
+    \o Option \o Description
+    \row
+    \o \bold -fn <font>
+    \o
+    Defines the application font. For example:
+    \snippet doc/src/snippets/code/doc_src_emb-running.qdoc 4
+    The font should be specified using an X logical font description.
+    \row
+    \o \bold -bg <color>
+    \o
+    Sets the default application background color. For example:
+    \snippet doc/src/snippets/code/doc_src_emb-running.qdoc 5
+    The color-name must be one of the names recognized by the QColor constructor.
+    \row
+    \o \bold -btn <color> \o
+    Sets the default button color. For example:
+    \snippet doc/src/snippets/code/doc_src_emb-running.qdoc 6
+    The color-name must be one of the names recognized by the QColor constructor.
+    \row
+    \o \bold -fg <color> \o
+    Sets the default application foreground color. For example:
+    \snippet doc/src/snippets/code/doc_src_emb-running.qdoc 7
+    The color-name must be one of the names recognized by the QColor constructor.
+    \row
+    \o \bold -name <objectname> \o
+    Sets the application name, i.e. the application object's object name. For example:
+    \snippet doc/src/snippets/code/doc_src_emb-running.qdoc 8
+    \row
+    \o \bold -title <title> \o
+    Sets the application's title. For example:
+    \snippet doc/src/snippets/code/doc_src_emb-running.qdoc 9
+    \row
+    \o \bold -geometry <width>x<height>+<Xoffset>+<Yoffset> \o
+    Sets the client geometry of the first window that is shown. For example:
+    \snippet doc/src/snippets/code/doc_src_emb-running.qdoc 10
+    \row
+    \o \bold -keyboard \o
+    Enables the keyboard.
+
+    See also: \l {Qt for Embedded Linux Character Input}.
+    \row
+    \o \bold -nokeyboard \o
+    Disables the keyboard.
+    \row
+    \o \bold -mouse \o
+    Enables the mouse cursor.
+
+    See also: \l {Qt for Embedded Linux Pointer Handling}.
+    \row
+    \o \bold -nomouse \o
+    Disables the mouse cursor.
+    \row
+    \o \bold -qws \o
+    Runs the application as a server application, i.e. constructs a
+    QApplication object of the QApplication::GuiServer type.
+    \row
+    \o \bold -display \o
+    Specifies the screen driver.
+
+    See also: \l {Qt for Embedded Linux Display Management}.
+    \row
+    \o \bold -decoration <style>\o
+    Sets the application decoration. For example:
+    \snippet doc/src/snippets/code/doc_src_emb-running.qdoc 11
+    The supported styles are \c windows, \c default and \c styled.
+
+    See also QDecoration.
+
+    \endtable
+*/
diff --git a/doc/src/emb-vnc.qdoc b/doc/src/emb-vnc.qdoc
new file mode 100644
index 0000000000..283193c0a6
--- /dev/null
+++ b/doc/src/emb-vnc.qdoc
@@ -0,0 +1,141 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt-embedded-vnc.html
+    \brief A guide to using Qt for Embedded Linux applications as VNC servers
+    and clients.
+
+    \title The VNC Protocol and Qt for Embedded Linux
+    \ingroup qt-embedded-linux
+
+    VNC (Virtual Network Computing) software makes it possible to view
+    and interact with one computer (the "server") from any other
+    computer or mobile device (the "viewer") anywhere on a network.
+
+    \image qt-embedded-vnc-screen.png
+
+    VNC clients are available for a vast array of display systems, including
+    X11, Mac OS X and Windows.
+
+    \section1 Configuring Qt with VNC Capabilities
+
+    To run a \l{Qt for Embedded Linux} application using the VNC protocol, the
+    \l{Qt for Embedded Linux} library must be configured and compiled with the
+    \c -qt-gfx-vnc option:
+
+    \snippet doc/src/snippets/code/doc_src_emb-vnc.qdoc 0
+
+    \section1 Running a Server Application
+
+    Start a server application by specifying the \c -qws command
+    line option when running the application. (This can also be
+    specified in the application's source code.)
+    Use the \c -display command line option to specify the VNC server's
+    driver and the virtual screen to use. For example:
+
+    \snippet doc/src/snippets/code/doc_src_emb-vnc.qdoc 1
+
+    The application will act as a VNC server which can be accessed using
+    an ordinary VNC client, either on the development machine or from a
+    different machine on a network.
+
+    For example, using the X11 VNC client to view the application from the
+    same machine:
+
+    \snippet doc/src/snippets/code/doc_src_emb-vnc.qdoc 2
+
+    To interact with the application from another machine on the network,
+    run a VNC client pointing to the machine that is running the server
+    application.
+
+    \l{Qt for Embedded Linux} will create a 640 by 480 pixel display by
+    default. Alternatively, the \c QWS_SIZE environment variable can be
+    used to set another size; e.g., \c{QWS_SIZE=240x320}.
+
+    \section1 Running Client Applications
+
+    If you want to run more than one application on the same display, you
+    only need to start the first one as a server application, using the
+    \c -qws command line option to indicate that it will manage other
+    windows.
+
+    \snippet doc/src/snippets/code/doc_src_emb-vnc.qdoc Starting server
+
+    Subsequent client applications can be started \e without the \c -qws
+    option, but will each require the same \c -display option and argument
+    as those used for the server.
+
+    \snippet doc/src/snippets/code/doc_src_emb-vnc.qdoc Starting clients
+
+    However, for the clients, this option will not cause a new VNC server
+    to be started, but only indicates that their windows will appear on the
+    virtual screen managed by the server application.
+
+    \section1 Related Resources
+
+    It is not always necessary to specify the \c -qws command line option
+    when running a server application as long as the QApplication object
+    used by the application has been constructed with the
+    QApplication::GuiServer flag.
+
+    See the \l{Running Qt for Embedded Linux Applications}{running applications}
+    documentation for more details about server and client applications.
+
+    \table
+    \row
+    \o \bold {The Virtual Framebuffer}
+
+    The \l{The Virtual Framebuffer}{virtual framebuffer} is
+    an alternative technique recommended for development and debugging
+    purposes.
+
+    The virtual framebuffer emulates a framebuffer using a shared
+    memory region and the \c qvfb tool to display the framebuffer in a
+    window.
+
+    Its use of shared memory makes the virtual framebuffer much faster
+    and smoother than using the VNC protocol, but it does not operate
+    over a network.
+
+    \o \inlineimage qt-embedded-virtualframebuffer.png
+    \endtable
+*/
diff --git a/doc/src/eventsandfilters.qdoc b/doc/src/eventsandfilters.qdoc
new file mode 100644
index 0000000000..06ca08c6f7
--- /dev/null
+++ b/doc/src/eventsandfilters.qdoc
@@ -0,0 +1,221 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page eventsandfilters.html
+    \title Events and Event Filters
+    \ingroup architecture
+    \brief A guide to event handling in Qt.
+
+    In Qt, events are objects, derived from the abstract QEvent class,
+    that represent things that have happened either within an application
+    or as a result of outside activity that the application needs to know
+    about. Events can be received and handled by any instance of a
+    QObject subclass, but they are especially relevant to widgets. This
+    document describes how events are delivered and handled in a typical
+    application.
+
+    \tableofcontents
+
+    \section1 How Events are Delivered
+
+    When an event occurs, Qt creates an event object to represent it by
+    constructing an instance of the appropriate QEvent subclass, and
+    delivers it to a particular instance of QObject (or one of its
+    subclasses) by calling its \l{QObject::}{event()} function.
+
+    This function does not handle the event itself; based on the type
+    of event delivered, it calls an event handler for that specific
+    type of event, and sends a response based on whether the event
+    was accepted or ignored.
+
+    \omit
+    Event delivery means that an
+    event has occurred, the QEvent indicates precisely what, and the
+    QObject needs to respond. Most events are specific to QWidget and its
+    subclasses, but there are important events that aren't related to
+    graphics (e.g., \l{QTimer}{timer events}).
+    \endomit
+
+    Some events, such as QMouseEvent and QKeyEvent, come from the
+    window system; some, such as QTimerEvent, come from other sources;
+    some come from the application itself.
+
+    \section1 Event Types
+
+    Most events types have special classes, notably QResizeEvent,
+    QPaintEvent, QMouseEvent, QKeyEvent, and QCloseEvent. Each class
+    subclasses QEvent and adds event-specific functions. For example,
+    QResizeEvent adds \l{QResizeEvent::}{size()} and
+    \l{QResizeEvent::}{oldSize()} to enable widgets to discover how
+    their dimensions have been changed.
+
+    Some classes support more than one actual event type. QMouseEvent
+    supports mouse button presses, double-clicks, moves, and other
+    related operations.
+
+    Each event has an associated type, defined in QEvent::Type, and this
+    can be used as a convenient source of run-time type information to
+    quickly determine which subclass a given event object was constructed
+    from.
+
+    Since programs need to react in varied and complex ways, Qt's
+    event delivery mechanisms are flexible. The documentation for
+    QCoreApplication::notify() concisely tells the whole story; the
+    \e{Qt Quarterly} article
+    \l{http://doc.trolltech.com/qq/qq11-events.html}{Another Look at Events}
+    rehashes it less concisely. Here we will explain enough for 95%
+    of applications.
+
+    \section1 Event Handlers
+
+    The normal way for an event to be delivered is by calling a virtual
+    function. For example, QPaintEvent is delivered by calling
+    QWidget::paintEvent(). This virtual function is responsible for
+    reacting appropriately, normally by repainting the widget. If you
+    do not perform all the necessary work in your implementation of the
+    virtual function, you may need to call the base class's implementation.
+
+    For example, the following code handles left mouse button clicks on
+    a custom checkbox widget while passing all other button clicks to the
+    base QCheckBox class:
+
+    \snippet doc/src/snippets/events/events.cpp 0
+
+    If you want to replace the base class's function, you must
+    implement everything yourself. However, if you only want to extend
+    the base class's functionality, then you implement what you want and
+    call the base class to obtain the default behavior for any cases you
+    do not want to handle.
+
+    Occasionally, there isn't such an event-specific function, or the
+    event-specific function isn't sufficient. The most common example
+    involves \key Tab key presses. Normally, QWidget intercepts these to
+    move the keyboard focus, but a few widgets need the \key{Tab} key for
+    themselves.
+
+    These objects can reimplement QObject::event(), the general event
+    handler, and either do their event handling before or after the usual
+    handling, or they can replace the function completely. A very unusual
+    widget that both interprets \key Tab and has an application-specific
+    custom event might contain the following \l{QObject::event()}{event()}
+    function:
+
+    \snippet doc/src/snippets/events/events.cpp 1
+
+    Note that QWidget::event() is still called for all of the cases not
+    handled, and that the return value indicates whether an event was
+    dealt with; a \c true value prevents the event from being sent on
+    to other objects.
+
+    \section1 Event Filters
+
+    Sometimes an object needs to look at, and possibly intercept, the
+    events that are delivered to another object. For example, dialogs
+    commonly want to filter key presses for some widgets; for example,
+    to modify \key{Return}-key handling.
+
+    The QObject::installEventFilter() function enables this by setting
+    up an \e{event filter}, causing a nominated filter object to receive
+    the events for a target object in its QObject::eventFilter()
+    function. An event filter gets to process events before the target
+    object does, allowing it to inspect and discard the events as
+    required. An existing event filter can be removed using the
+    QObject::removeEventFilter() function.
+
+    When the filter object's \l{QObject::}{eventFilter()} implementation
+    is called, it can accept or reject the event, and allow or deny
+    further processing of the event. If all the event filters allow
+    further processing of an event (by each returning \c false), the event
+    is sent to the target object itself. If one of them stops processing
+    (by returning \c true), the target and any later event filters do not
+    get to see the event at all.
+
+    \snippet doc/src/snippets/eventfilters/filterobject.cpp 0
+
+    The above code shows another way to intercept \key{Tab} key press
+    events sent to a particular target widget. In this case, the filter
+    handles the relevant events and returns \c true to stop them from
+    being processed any further. All other events are ignored, and the
+    filter returns \c false to allow them to be sent on to the target
+    widget, via any other event filters that are installed on it.
+
+    It is also possible to filter \e all events for the entire application,
+    by installing an event filter on the QApplication or QCoreApplication
+    object. Such global event filters are called before the object-specific
+    filters. This is very powerful, but it also slows down event delivery
+    of every single event in the entire application; the other techniques
+    discussed should generally be used instead.
+
+    \section1 Sending Events
+
+    Many applications want to create and send their own events. You can
+    send events in exactly the same ways as Qt's own event loop by
+    constructing suitable event objects and sending them with
+    QCoreApplication::sendEvent() and QCoreApplication::postEvent().
+
+    \l{QCoreApplication::}{sendEvent()} processes the event immediately.
+    When it returns, the event filters and/or the object itself have
+    already processed the event. For many event classes there is a function
+    called isAccepted() that tells you whether the event was accepted
+    or rejected by the last handler that was called.
+
+    \l{QCoreApplication::}{postEvent()} posts the event on a queue for
+    later dispatch. The next time Qt's main event loop runs, it dispatches
+    all posted events, with some optimization. For example, if there are
+    several resize events, they are are compressed into one. The same
+    applies to paint events: QWidget::update() calls
+    \l{QCoreApplication::}{postEvent()}, which eliminates flickering and
+    increases speed by avoiding multiple repaints.
+
+    \l{QCoreApplication::}{postEvent()} is also used during object
+    initialization, since the posted event will typically be dispatched
+    very soon after the initialization of the object is complete.
+    When implementing a widget, it is important to realise that events
+    can be delivered very early in its lifetime so, in its constructor,
+    be sure to initialize member variables early on, before there's any
+    chance that it might receive an event.
+
+    To create events of a custom type, you need to define an event
+    number, which must be greater than QEvent::User, and you may need to
+    subclass QEvent in order to pass specific information about your
+    custom event. See the QEvent documentation for further details.
+*/
diff --git a/doc/src/examples-overview.qdoc b/doc/src/examples-overview.qdoc
new file mode 100644
index 0000000000..549574dfc5
--- /dev/null
+++ b/doc/src/examples-overview.qdoc
@@ -0,0 +1,348 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \page examples-overview.html
+  \title An Overview of Qt's Examples
+  \brief A short guide to the different categories of examples included with Qt.
+  \ingroup howto
+
+  Qt is supplied with a variety of examples that cover almost every aspect
+  of development. These examples are ordered by functional area, but many
+  examples often use features from many parts of Qt to highlight one area
+  in particular.
+
+  This document provides a brief overview of each example category and
+  provides links to the more formal \l{Qt Examples}{list of examples}.
+
+  \section1 \l{Qt Examples#Widgets}{Widgets}
+
+  \l{Qt Examples#Widgets}{\inlineimage widget-examples.png
+  }
+
+  Qt comes with a large range of standard widgets that users of modern
+  applications have come to expect.
+
+  You can also develop your own custom widgets and controls, and use them
+  alongside standard widgets.
+
+  It is even possible to provide custom styles and themes for widgets that can
+  be used to change the appearance of standard widgets and appropriately
+  written custom widgets.
+
+  \section1 \l{Qt Examples#Dialogs}{Dialogs}
+
+  \l{Qt Examples#Dialogs}{\inlineimage dialog-examples.png
+  }
+
+  Qt includes standard dialogs for many common operations, such as file
+  selection, printing, and color selection.
+
+  Custom dialogs can also be created for specialized modal or modeless
+  interactions with users.
+
+  \section1 \l{Qt Examples#Main Windows}{Main Windows}
+
+  \l{Qt Examples#Main Windows}{\inlineimage mainwindow-examples.png
+  }
+
+  All the standard features of application main windows are provided by Qt.
+
+  Main windows can have pull down menus, tool bars, and dock windows. These
+  separate forms of user input are unified in an integrated action system that
+  also supports keyboard shortcuts and accelerator keys in menu items.
+
+  \section1 \l{Qt Examples#Layouts}{Layouts}
+
+  \l{Qt Examples#Layouts}{\inlineimage layout-examples.png
+  }
+
+  Qt uses a layout-based approach to widget management. Widgets are arranged in
+  the optimal positions in windows based on simple layout rules, leading to a
+  consistent look and feel.
+
+  Custom layouts can be used to provide more control over the positions and
+  sizes of child widgets.
+
+  \section1 \l{Qt Examples#Painting}{Painting}
+
+  \l{Qt Examples#Painting}{\inlineimage painting-examples.png
+  }
+
+  Qt's painting system is able to render vector graphics, images, and outline
+  font-based text with sub-pixel accuracy accuracy using anti-aliasing to
+  improve rendering quality.
+
+  These examples show the most common techniques that are used when painting
+  with Qt, from basic concepts such as drawing simple primitives to the use of
+  transformations.
+
+  \section1 \l{Qt Examples#Item Views}{Item Views}
+
+  \l{Qt Examples#Item Views}{\inlineimage itemview-examples.png
+  }
+
+  Item views are widgets that typically display data sets. Qt 4's model/view
+  framework lets you handle large data sets by separating the underlying data
+  from the way it is represented to the user, and provides support for
+  customized rendering through the use of delegates.
+
+  \section1 \l{Qt Examples#Graphics View}{Graphics View}
+
+  \l{Qt Examples#Graphics View}{\inlineimage graphicsview-examples.png
+  }
+
+  Qt is provided with a comprehensive canvas through the GraphicsView
+  classes.
+
+  These examples demonstrate the fundamental aspects of canvas programming
+  with Qt.
+
+  \section1 \l{Qt Examples#Rich Text}{Rich Text}
+
+  \l{Qt Examples#Rich Text}{\inlineimage richtext-examples.png
+  }
+
+  Qt provides powerful document-oriented rich text engine that supports Unicode
+  and right-to-left scripts. Documents can be manipulated using a cursor-based
+  API, and their contents can be imported and exported as both HTML and in a
+  custom XML format.
+
+  \section1 \l{Qt Examples#Tools}{Tools}
+
+  \l{Qt Examples#Tools}{\inlineimage tool-examples.png
+  }
+
+  Qt is equipped with a range of capable tool classes, from containers and
+  iterators to classes for string handling and manipulation.
+
+  Other classes provide application infrastructure support, handling plugin
+  loading and managing configuration files.
+
+  \section1 \l{Qt Examples#Desktop}{Desktop}
+
+  \l{Qt Examples#Desktop}{\inlineimage desktop-examples.png
+  }
+
+  Qt provides features to enable applications to integrate with the user's
+  preferred desktop environment.
+
+  Features such as system tray icons, access to the desktop widget, and
+  support for desktop services can be used to improve the appearance of
+  applications and take advantage of underlying desktop facilities.
+
+  \section1 \l{Qt Examples#Drag and Drop}{Drag and Drop}
+
+  \l{Qt Examples#Drag and Drop}{\inlineimage draganddrop-examples.png
+  }
+
+  Qt supports native drag and drop on all platforms via an extensible
+  MIME-based system that enables applications to send data to each other in the
+  most appropriate formats.
+
+  Drag and drop can also be implemented for internal use by applications.
+
+  \section1 \l{Qt Examples#Threads}{Threads}
+
+  \l{Qt Examples#Threads}{\inlineimage thread-examples.png
+  }
+
+  Qt 4 makes it easier than ever to write multithreaded applications. More
+  classes have been made usable from non-GUI threads, and the signals and slots
+  mechanism can now be used to communicate between threads.
+
+  Additionally, it is now possible to move objects between threads.
+
+  \section1 \l{Qt Examples#Concurrent Programming}{Concurrent Programming}
+
+  The QtConcurrent namespace includes a collection of classes and functions
+  for straightforward concurrent programming.
+
+  These examples show how to apply the basic techniques of concurrent
+  programming to simple problems.
+
+  \section1 \l{Qt Examples#Network}{Network}
+
+  \l{Qt Examples#Network}{\inlineimage network-examples.png
+  }
+
+  Qt is provided with an extensive set of network classes to support both
+  client-based and server side network programming.
+
+  These examples demonstrate the fundamental aspects of network programming
+  with Qt.
+
+  \section1 \l{Qt Examples#XML}{XML}
+
+  \l{Qt Examples#XML}{\inlineimage xml-examples.png
+  }
+
+  XML parsing and handling is supported through SAX and DOM compliant APIs.
+
+  Qt's SAX compliant classes allow you to parse XML incrementally; the DOM
+  classes enable more complex document-level operations to be performed on
+  XML files.
+
+  \section1 \l{Qt Examples#XQuery, XPath}{XQuery, XPath}
+
+  Qt provides an XQuery/XPath engine, QtXmlPatterns, for querying XML
+  files and custom data models, similar to the model/view framework.
+
+  \section1 \l{Qt Examples#OpenGL}{OpenGL}
+
+  \l{Qt Examples#OpenGL}{\inlineimage opengl-examples.png
+  }
+
+  Qt provides support for integration with OpenGL implementations on all
+  platforms, giving developers the opportunity to display hardware accelerated
+  3D graphics alongside a more conventional user interface.
+
+  These examples demonstrate the basic techniques used to take advantage of
+  OpenGL in Qt applications.
+
+  \section1 \l{Qt Examples#SQL}{SQL}
+
+  \l{Qt Examples#SQL}{\inlineimage sql-examples.png
+  }
+
+  Qt provides extensive database interoperability, with support for products
+  from both open source and proprietary vendors.
+
+  SQL support is integrated with Qt's model/view architecture, making it easier
+  to provide GUI integration for your database applications.
+
+  \section1 \l{Qt Examples#Help System}{Help System}
+
+  \l{Qt Examples#Help System}{\inlineimage assistant-examples.png
+  }
+
+  Support for interactive help is provided by the Qt Assistant application.
+  Developers can take advantages of the facilities it offers to display
+  specially-prepared documentation to users of their applications.
+
+  \section1 \l{Qt Examples#Qt Designer}{Qt Designer}
+
+  \l{Qt Examples#Qt Designer}{\inlineimage designer-examples.png
+  }
+
+  Qt Designer is a capable graphical user interface designer that lets you
+  create and configure forms without writing code. GUIs created with
+  Qt Designer can be compiled into an application or created at run-time.
+
+  \section1 \l{Qt Examples#UiTools}{UiTools}
+
+  \l{Qt Examples#UiTools}{\inlineimage uitools-examples.png
+  }
+
+  Qt is equipped with a range of capable tool classes, from containers and
+  iterators to classes for string handling and manipulation.
+
+  Other classes provide application infrastructure support, handling plugin
+  loading and managing configuration files.
+
+  \section1 \l{Qt Examples#Qt Linguist}{Qt Linguist}
+
+  \l{Qt Examples#Qt Linguist}{\inlineimage linguist-examples.png
+  }
+
+  Internationalization is a core feature of Qt. These examples show how to
+  access translation and localization facilities at run-time.
+
+  \section1 \l{Qt Examples#Qt Script}{Qt Script}
+
+  \l{Qt Examples#Qt Script}{\inlineimage qtscript-examples.png
+  }
+
+  Qt is provided with a powerful embedded scripting environment through the QtScript
+  classes.
+
+  These examples demonstrate the fundamental aspects of scripting applications
+  with Qt.
+
+  \section1 \l{Qt Examples#Phonon Multimedia Framework}{Phonon Multimedia Framework}
+
+  \l{Qt Examples#Phonon Multimedia Framework}{\inlineimage phonon-examples.png
+  }
+
+  The Phonon Multimedia Framework brings multimedia support to Qt applications.
+
+  The examples and demonstrations provided show how to play music and movies
+  using the Phonon API.
+
+  \section1 \l{Qt Examples#WebKit}{WebKit}
+
+  \l{Qt Examples#WebKit}{\inlineimage webkit-examples.png
+  }
+
+  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.
+
+  \section1 \l{Qt Examples#Qt for Embedded Linux}{Qt for Embedded Linux}
+
+  \l{Qt Examples#Qt for Embedded Linux}{\inlineimage qt-embedded-examples.png
+  }
+
+  These examples show how to take advantage of features specifically designed
+  for use on systems with limited resources, specialized hardware, and small
+  screens.
+
+  \section1 \l{Qt Examples#ActiveQt}{ActiveQt}
+
+  Qt is supplied with a number of example applications and demonstrations that
+  have been written to provide developers with examples of the Qt API in use,
+  highlight good programming practice, and showcase features found in each of
+  Qt's core technologies.
+
+  The example and demo launcher can be used to explore the different categories
+  available. It provides an overview of each example, lets you view the
+  documentation in Qt Assistant, and is able to launch examples and demos.
+
+  \section1 \l{http://doc.trolltech.com/qq}{Another Source of Examples}
+
+  One more valuable source for examples and explanations of Qt
+  features is the archive of the \l {http://doc.trolltech.com/qq} 
+  {Qt Quarterly}.
+
+*/
diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc
new file mode 100644
index 0000000000..c9cb049d88
--- /dev/null
+++ b/doc/src/examples.qdoc
@@ -0,0 +1,402 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page examples.html
+    \title Qt Examples
+    \brief Information about the example programs provided with Qt.
+    \ingroup howto
+
+    This is the list of examples in Qt's \c examples directory. The
+    examples demonstrate Qt features in small, self-contained
+    programs. They are not all designed to be impressive when you run
+    them, but their source code is carefully written to show good Qt
+    programming practices. You can launch any of these programs from the
+    \l{Examples and Demos Launcher} application.
+
+    If you are new to Qt, you should probably start by going through
+    the \l{Tutorials} before you have a look at the
+    \l{mainwindows/application}{Application} example.
+
+    In addition to the examples and the tutorial, Qt includes a
+    \l{Qt Demonstrations}{selection of demos} that deliberately show off
+    Qt's features. You might want to look at these as well.
+
+    One more valuable source for examples and explanations of Qt
+    features is the archive of the \l {Qt Quarterly}.
+
+    In the list below, examples marked with an asterisk (*) are fully
+    documented. Eventually, all the examples will be fully documented,
+    but sometimes we include an example before we have time to write
+    about it, because someone might need it right now.
+
+    Categories:
+
+    \tableofcontents
+
+    \section1 ActiveQt
+
+    \list
+    \o \l{activeqt/comapp}{COM App}\raisedaster
+    \o \l{Dot Net Example (ActiveQt)}{Dot Net}\raisedaster
+    \o \l{activeqt/hierarchy}{Hierarchy}\raisedaster
+    \o \l{activeqt/menus}{Menus}\raisedaster
+    \o \l{activeqt/multiple}{Multiple}\raisedaster
+    \o \l{activeqt/opengl}{OpenGL}\raisedaster
+    \o \l{activeqt/qutlook}{Qutlook}\raisedaster
+    \o \l{activeqt/simple}{Simple}\raisedaster
+    \o \l{activeqt/webbrowser}{Web Browser}\raisedaster
+    \o \l{activeqt/wrapper}{Wrapper}\raisedaster
+    \endlist
+
+    \section1 Concurrent Programming
+
+    \list
+    \o \l{qtconcurrent/imagescaling}{QtConcurrent Asynchronous Image Scaling}
+    \o \l{qtconcurrent/map}{QtConcurrent Map}
+    \o \l{qtconcurrent/progressdialog}{QtConcurrent Progress Dialog}
+    \o \l{qtconcurrent/runfunction}{QtConcurrent Run Function}
+    \o \l{qtconcurrent/wordcount}{QtConcurrent Word Count}
+    \endlist
+
+    \section1 D-Bus
+    \list
+    \o \l{dbus/dbus-chat}{Chat}
+    \o \l{dbus/complexpingpong}{Complex Ping Pong}
+    \o \l{dbus/listnames}{List Names}
+    \o \l{dbus/pingpong}{Ping Pong}
+    \o \l{dbus/remotecontrolledcar}{Remote Controlled Car} 
+    \endlist
+
+    \section1 Desktop
+
+    \list
+    \o \l{desktop/screenshot}{Screenshot}\raisedaster
+    \o \l{desktop/systray}{System Tray}\raisedaster
+    \endlist
+
+    \section1 Dialogs
+
+    \list
+    \o \l{dialogs/classwizard}{Class Wizard}\raisedaster
+    \o \l{dialogs/configdialog}{Config Dialog}
+    \o \l{dialogs/extension}{Extension}\raisedaster
+    \o \l{dialogs/findfiles}{Find Files}\raisedaster
+    \o \l{dialogs/licensewizard}{License Wizard}\raisedaster
+    \o \l{dialogs/standarddialogs}{Standard Dialogs}
+    \o \l{dialogs/tabdialog}{Tab Dialog}\raisedaster
+    \o \l{dialogs/trivialwizard}{Trivial Wizard}
+    \endlist
+
+    \section1 Drag and Drop
+
+    \list
+    \o \l{draganddrop/delayedencoding}{Delayed Encoding}\raisedaster
+    \o \l{draganddrop/draggableicons}{Draggable Icons}
+    \o \l{draganddrop/draggabletext}{Draggable Text}
+    \o \l{draganddrop/dropsite}{Drop Site}
+    \o \l{draganddrop/fridgemagnets}{Fridge Magnets}\raisedaster
+    \o \l{draganddrop/puzzle}{Drag and Drop Puzzle}
+    \endlist
+
+    \section1 Graphics View
+
+    \list
+    \o \l{graphicsview/collidingmice}{Colliding Mice}\raisedaster
+    \o \l{graphicsview/diagramscene}{Diagram Scene}\raisedaster
+    \o \l{graphicsview/dragdroprobot}{Drag and Drop Robot}
+    \o \l{graphicsview/elasticnodes}{Elastic Nodes}
+    \o \l{graphicsview/portedasteroids}{Ported Asteroids}
+    \o \l{graphicsview/portedcanvas}{Ported Canvas}
+    \endlist
+
+    \section1 Help System
+
+    \list
+    \o \l{help/simpletextviewer}{Simple Text Viewer}\raisedaster
+    \endlist
+
+    \section1 Item Views
+
+    \list
+    \o \l{itemviews/addressbook}{Address Book}\raisedaster
+    \o \l{itemviews/basicsortfiltermodel}{Basic Sort/Filter Model}
+    \o \l{itemviews/chart}{Chart}
+    \o \l{itemviews/coloreditorfactory}{Color Editor Factory}\raisedaster
+    \o \l{itemviews/combowidgetmapper}{Combo Widget Mapper}\raisedaster
+    \o \l{itemviews/customsortfiltermodel}{Custom Sort/Filter Model}\raisedaster
+    \o \l{itemviews/dirview}{Dir View}
+    \o \l{itemviews/editabletreemodel}{Editable Tree Model}\raisedaster
+    \o \l{itemviews/fetchmore}{Fetch More}\raisedaster
+    \o \l{itemviews/pixelator}{Pixelator}\raisedaster
+    \o \l{itemviews/puzzle}{Puzzle}
+    \o \l{itemviews/simpledommodel}{Simple DOM Model}\raisedaster
+    \o \l{itemviews/simpletreemodel}{Simple Tree Model}\raisedaster
+    \o \l{itemviews/simplewidgetmapper}{Simple Widget Mapper}\raisedaster
+    \o \l{itemviews/spinboxdelegate}{Spin Box Delegate}\raisedaster
+    \o \l{itemviews/stardelegate}{Star Delegate}\raisedaster
+    \endlist
+
+    \section1 Layouts
+
+    \list
+    \o \l{layouts/basiclayouts}{Basic Layouts}\raisedaster
+    \o \l{layouts/borderlayout}{Border Layout}
+    \o \l{layouts/dynamiclayouts}{Dynamic Layouts}
+    \o \l{layouts/flowlayout}{Flow Layout}
+    \endlist
+
+    \section1 Main Windows
+
+    \list
+    \o \l{mainwindows/application}{Application}\raisedaster
+    \o \l{mainwindows/dockwidgets}{Dock Widgets}\raisedaster
+    \o \l{mainwindows/mdi}{MDI}
+    \o \l{mainwindows/menus}{Menus}\raisedaster
+    \o \l{mainwindows/recentfiles}{Recent Files}
+    \o \l{mainwindows/sdi}{SDI}
+    \endlist
+
+    \section1 Network
+
+    \list
+    \o  \l{network/blockingfortuneclient}{Blocking Fortune Client}\raisedaster
+    \o  \l{network/broadcastreceiver}{Broadcast Receiver}
+    \o  \l{network/broadcastsender}{Broadcast Sender}
+    \o  \l{network/network-chat}{Network Chat}
+    \o  \l{network/fortuneclient}{Fortune Client}\raisedaster
+    \o  \l{network/fortuneserver}{Fortune Server}\raisedaster
+    \o  \l{network/ftp}{FTP}\raisedaster
+    \o  \l{network/http}{HTTP}
+    \o  \l{network/loopback}{Loopback}
+    \o  \l{network/threadedfortuneserver}{Threaded Fortune Server}\raisedaster
+    \o  \l{network/torrent}{Torrent}
+    \endlist
+
+    \section1 OpenGL
+
+    \list
+    \o \l{opengl/2dpainting}{2D Painting}\raisedaster
+    \o \l{opengl/framebufferobject}{Framebuffer Object}
+    \o \l{opengl/framebufferobject2}{Framebuffer Object 2}
+    \o \l{opengl/grabber}{Grabber}
+    \o \l{opengl/hellogl}{Hello GL}\raisedaster
+    \o \l{opengl/overpainting}{Overpainting}\raisedaster
+    \o \l{opengl/pbuffers}{Pixel Buffers}
+    \o \l{opengl/pbuffers2}{Pixel Buffers 2}
+    \o \l{opengl/samplebuffers}{Sample Buffers}
+    \o \l{opengl/textures}{Textures}
+    \endlist
+
+    \section1 Painting
+
+    \list
+    \o \l{painting/basicdrawing}{Basic Drawing}\raisedaster
+    \o \l{painting/concentriccircles}{Concentric Circles}\raisedaster
+    \o \l{painting/fontsampler}{Font Sampler}
+    \o \l{painting/imagecomposition}{Image Composition}\raisedaster
+    \o \l{painting/painterpaths}{Painter Paths}\raisedaster
+    \o \l{painting/svgviewer}{SVG Viewer}
+    \o \l{painting/transformations}{Transformations}\raisedaster
+    \endlist
+
+    \section1 Phonon Multimedia Framework
+
+    \list
+    \o \l{phonon/capabilities}{Capabilities}\raisedaster
+    \o \l{phonon/musicplayer}{Music Player}\raisedaster
+    \endlist
+
+    \section1 Qt Designer
+
+    \list
+    \o \l{designer/calculatorbuilder}{Calculator Builder}\raisedaster
+    \o \l{designer/calculatorform}{Calculator Form}\raisedaster
+    \o \l{designer/customwidgetplugin}{Custom Widget Plugin}\raisedaster
+    \o \l{designer/taskmenuextension}{Task Menu Extension}\raisedaster
+    \o \l{designer/containerextension}{Container Extension}\raisedaster
+    \o \l{designer/worldtimeclockbuilder}{World Time Clock Builder}\raisedaster
+    \o \l{designer/worldtimeclockplugin}{World Time Clock Plugin}\raisedaster
+    \endlist
+
+    \section1 Qt Linguist
+
+    \list
+    \o \l{linguist/hellotr}{Hello tr()}\raisedaster
+    \o \l{linguist/arrowpad}{Arrow Pad}\raisedaster
+    \o \l{linguist/trollprint}{Troll Print}\raisedaster
+    \endlist
+
+    \section1 Qt for Embedded Linux
+
+    \list
+    \o \l{qws/svgalib}{Accelerated Graphics Driver}\raisedaster
+    \o \l{qws/dbscreen}{Double Buffered Graphics Driver}\raisedaster
+    \o \l{qws/mousecalibration}{Mouse Calibration}\raisedaster
+    \o \l{qws/ahigl}{OpenGL for Embedded Systems}\raisedaster
+    \o \l{qws/simpledecoration}{Simple Decoration}\raisedaster
+    \endlist
+
+    \section1 Qt Script
+
+    \list
+    \o \l{script/calculator}{Calculator}\raisedaster
+    \o \l{script/context2d}{Context2D}\raisedaster
+    \o \l{script/defaultprototypes}{Default Prototypes}\raisedaster
+    \o \l{script/helloscript}{Hello Script}\raisedaster
+    \o \l{script/qstetrix}{Qt Script Tetrix}\raisedaster
+    \o \l{script/customclass}{Custom Script Class}\raisedaster
+    \endlist
+
+    \section1 Rich Text
+
+    \list
+    \o \l{richtext/calendar}{Calendar}\raisedaster
+    \o \l{richtext/orderform}{Order Form}\raisedaster
+    \o \l{richtext/syntaxhighlighter}{Syntax Highlighter}\raisedaster
+    \o \l{richtext/textobject}{Text Object}\raisedaster
+    \endlist
+
+    \section1 SQL
+
+    \list
+    \o \l{sql/cachedtable}{Cached Table}\raisedaster
+    \o \l{sql/drilldown}{Drill Down}\raisedaster
+    \o \l{sql/querymodel}{Query Model}
+    \o \l{sql/relationaltablemodel}{Relational Table Model}
+    \o \l{sql/tablemodel}{Table Model}
+    \o \l{sql/sqlwidgetmapper}{SQL Widget Mapper}\raisedaster
+    \endlist
+
+    \section1 Threads
+
+    \list
+    \o \l{threads/mandelbrot}{Mandelbrot}\raisedaster
+    \o \l{threads/semaphores}{Semaphores}\raisedaster
+    \o \l{threads/waitconditions}{Wait Conditions}\raisedaster
+    \endlist
+
+    \section1 Tools
+
+    \list
+    \o \l{tools/codecs}{Codecs}
+    \o \l{tools/completer}{Completer}\raisedaster
+    \o \l{tools/customcompleter}{Custom Completer}\raisedaster
+    \o \l{tools/echoplugin}{Echo Plugin}\raisedaster
+    \o \l{tools/i18n}{I18N}
+    \o \l{tools/plugandpaint}{Plug & Paint}\raisedaster
+    \o Plug & Paint Plugins: \l{tools/plugandpaintplugins/basictools}{Basic Tools}\raisedaster
+       and \l{tools/plugandpaintplugins/extrafilters}{Extra Filters}\raisedaster
+    \o \l{tools/regexp}{RegExp}
+    \o \l{tools/settingseditor}{Settings Editor}
+    \o \l{tools/styleplugin}{Style Plugin}\raisedaster
+    \o \l{tools/treemodelcompleter}{Tree Model Completer}\raisedaster
+    \o \l{tools/undoframework}{Undo Framework}\raisedaster
+    \endlist
+
+    \section1 UiTools
+
+    \list
+    \o \l{uitools/multipleinheritance}{Multiple Inheritance}\raisedaster
+    \o \l{uitools/textfinder}{Text Finder}\raisedaster
+    \endlist
+
+    \section1 WebKit
+
+    \list
+    \o \l{webkit/previewer}{Previewer}\raisedaster
+    \o \l{webkit/formextractor}{Form Extractor}
+    \endlist
+
+    \section1 Widgets
+
+    \list
+    \o \l{widgets/analogclock}{Analog Clock}\raisedaster
+    \o \l{widgets/calculator}{Calculator}\raisedaster
+    \o \l{widgets/calendarwidget}{Calendar Widget}\raisedaster
+    \o \l{widgets/charactermap}{Character Map}\raisedaster
+    \o \l{widgets/codeeditor}{Code Editor}\raisedaster
+    \o \l{widgets/digitalclock}{Digital Clock}\raisedaster
+    \o \l{widgets/groupbox}{Group Box}\raisedaster
+    \o \l{widgets/icons}{Icons}\raisedaster
+    \o \l{widgets/imageviewer}{Image Viewer}\raisedaster
+    \o \l{widgets/lineedits}{Line Edits}\raisedaster
+    \o \l{widgets/movie}{Movie}
+    \o \l{widgets/scribble}{Scribble}\raisedaster
+    \o \l{widgets/shapedclock}{Shaped Clock}\raisedaster
+    \o \l{widgets/sliders}{Sliders}\raisedaster
+    \o \l{widgets/spinboxes}{Spin Boxes}\raisedaster
+    \o \l{widgets/styles}{Styles}\raisedaster
+    \o \l{widgets/stylesheet}{Style Sheet}\raisedaster
+    \o \l{widgets/tablet}{Tablet}\raisedaster
+    \o \l{widgets/tetrix}{Tetrix}\raisedaster
+    \o \l{widgets/tooltips}{Tooltips}\raisedaster
+    \o \l{widgets/wiggly}{Wiggly}\raisedaster
+    \o \l{widgets/windowflags}{Window Flags}\raisedaster
+    \endlist
+
+    \section1 XML
+
+    \list
+    \o \l{xml/dombookmarks}{DOM Bookmarks}
+    \o \l{xml/saxbookmarks}{SAX Bookmarks}
+    \o \l{xml/streambookmarks}{QXmlStream Bookmarks}\raisedaster
+    \o \l{xml/rsslisting}{RSS-Listing}
+    \o \l{xml/xmlstreamlint}{XML Stream Lint Example}\raisedaster
+    \endlist
+
+    \section1 XQuery, XPath
+
+    \list
+    \o \l{xmlpatterns/recipes}{Recipes}
+    \o \l{xmlpatterns/filetree}{File System Example}
+    \o \l{xmlpatterns/qobjectxmlmodel}{QObject XML Model Example}
+    \o \l{xmlpatterns/xquery/globalVariables}{C++ Source Code Analyzer Example}
+    \o \l{xmlpatterns/trafficinfo}{Traffic Info}\raisedaster
+    \endlist
+
+    \section1 Inter-Process Communication
+    \list
+    \o \l{ipc/localfortuneclient}{Local Fortune Client}\raisedaster
+    \o \l{ipc/localfortuneserver}{Local Fortune Server}\raisedaster
+    \o \l{ipc/sharedmemory}{Shared Memory}\raisedaster
+    \endlist
+*/
diff --git a/doc/src/examples/2dpainting.qdoc b/doc/src/examples/2dpainting.qdoc
new file mode 100644
index 0000000000..31aea59698
--- /dev/null
+++ b/doc/src/examples/2dpainting.qdoc
@@ -0,0 +1,224 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example opengl/2dpainting
+    \title 2D Painting Example
+
+    The 2D Painting example shows how QPainter and QGLWidget can be used
+    together to display accelerated 2D graphics on supported hardware.
+
+    \image 2dpainting-example.png
+
+    The QPainter class is used to draw 2D graphics primitives onto
+    paint devices provided by QPaintDevice subclasses, such as QWidget
+    and QImage.
+
+    Since QGLWidget is a subclass of QWidget, it is possible
+    to reimplement its \l{QWidget::paintEvent()}{paintEvent()} and use
+    QPainter to draw on the device, just as you would with a QWidget.
+    The only difference is that the painting operations will be accelerated
+    in hardware if it is supported by your system's OpenGL drivers.
+
+    In this example, we perform the same painting operations on a
+    QWidget and a QGLWidget. The QWidget is shown with anti-aliasing
+    enabled, and the QGLWidget will also use anti-aliasing if the
+    required extensions are supported by your system's OpenGL driver.
+
+    \section1 Overview
+
+    To be able to compare the results of painting onto a QGLWidget subclass
+    with native drawing in a QWidget subclass, we want to show both kinds
+    of widget side by side. To do this, we derive subclasses of QWidget and
+    QGLWidget, using a separate \c Helper class to perform the same painting
+    operations for each, and lay them out in a top-level widget, itself
+    provided a the \c Window class.
+
+    \section1 Helper Class Definition
+
+    In this example, the painting operations are performed by a helper class.
+    We do this because we want the same painting operations to be performed
+    for both our QWidget subclass and the QGLWidget subclass.
+
+    The \c Helper class is minimal:
+
+    \snippet examples/opengl/2dpainting/helper.h 0
+
+    Apart from the constructor, it only provides a \c paint() function to paint
+    using a painter supplied by one of our widget subclasses.
+
+    \section1 Helper Class Implementation
+
+    The constructor of the class sets up the resources it needs to paint
+    content onto a widget:
+
+    \snippet examples/opengl/2dpainting/helper.cpp 0
+
+    The actual painting is performed in the \c paint() function. This takes
+    a QPainter that has already been set up to paint onto a paint device
+    (either a QWidget or a QGLWidget), a QPaintEvent that provides information
+    about the region to be painted, and a measure of the elapsed time (in
+    milliseconds) since the paint device was last updated.
+
+    \snippet examples/opengl/2dpainting/helper.cpp 1
+
+    We begin painting by filling in the region contained in the paint event
+    before translating the origin of the coordinate system so that the rest
+    of the painting operations will be displaced towards the center of the
+    paint device.
+
+    We draw a spiral pattern of circles, using the elapsed time specified to
+    animate them so that they appear to move outward and around the coordinate
+    system's origin:
+
+    \snippet examples/opengl/2dpainting/helper.cpp 2
+
+    Since the coordinate system is rotated many times during
+    this process, we \l{QPainter::save()}{save()} the QPainter's state
+    beforehand and \l{QPainter::restore()}{restore()} it afterwards.
+
+    \snippet examples/opengl/2dpainting/helper.cpp 3
+
+    We draw some text at the origin to complete the effect.
+
+    \section1 Widget Class Definition
+
+    The \c Widget class provides a basic custom widget that we use to
+    display the simple animation painted by the \c Helper class.
+
+    \snippet examples/opengl/2dpainting/widget.h 0
+
+    Apart from the constructor, it only contains a
+    \l{QWidget::paintEvent()}{paintEvent()} function, that lets us draw
+    customized content, and a slot that is used to animate its contents.
+    One member variable keeps track of the \c Helper that the widget uses
+    to paint its contents, and the other records the elapsed time since
+    it was last updated.
+
+    \section1 Widget Class Implementation
+
+    The constructor only initializes the member variables, storing the
+    \c Helper object supplied and calling the base class's constructor,
+    and enforces a fixed size for the widget:
+
+    \snippet examples/opengl/2dpainting/widget.cpp 0
+
+    The \c animate() slot is called whenever a timer, which we define later, times
+    out:
+
+    \snippet examples/opengl/2dpainting/widget.cpp 1
+
+    Here, we determine the interval that has elapsed since the timer last
+    timed out, and we add it to any existing value before repainting the
+    widget. Since the animation used in the \c Helper class loops every second,
+    we can use the modulo operator to ensure that the \c elapsed variable is
+    always less than 1000.
+
+    Since the \c Helper class does all of the actual painting, we only have
+    to implement a paint event that sets up a QPainter for the widget and calls
+    the helper's \c paint() function:
+
+    \snippet examples/opengl/2dpainting/widget.cpp 2
+
+    \section1 GLWidget Class Definition
+
+    The \c GLWidget class definition is basically the same as the \c Widget
+    class except that it is derived from QGLWidget.
+
+    \snippet examples/opengl/2dpainting/glwidget.h 0
+
+    Again, the member variables record the \c Helper used to paint the
+    widget and the elapsed time since the previous update.
+
+    \section1 GLWidget Class Implementation
+
+    The constructor differs a little from the \c Widget class's constructor:
+
+    \snippet examples/opengl/2dpainting/glwidget.cpp 0
+
+    As well as initializing the \c elapsed member variable and storing the
+    \c Helper object used to paint the widget, the base class's constructor
+    is called with the format that specifies the \l QGL::SampleBuffers flag.
+    This enables anti-aliasing if it is supported by your system's OpenGL
+    driver.
+
+    The \c animate() slot is exactly the same as that provided by the \c Widget
+    class:
+
+    \snippet examples/opengl/2dpainting/glwidget.cpp 1
+
+    The \c paintEvent() is almost the same as that found in the \c Widget class:
+
+    \snippet examples/opengl/2dpainting/glwidget.cpp 2
+
+    Since anti-aliasing will be enabled if available, we only need to set up
+    a QPainter on the widget and call the helper's \c paint() function to display
+    the widget's contents.
+
+    \section1 Window Class Definition
+
+    The \c Window class has a basic, minimal definition:
+
+    \snippet examples/opengl/2dpainting/window.h 0
+
+    It contains a single \c Helper object that will be shared between all
+    widgets.
+
+    \section1 Window Class Implementation
+
+    The constructor does all the work, creating a widget of each type and
+    inserting them with labels into a layout:
+
+    \snippet examples/opengl/2dpainting/window.cpp 0
+
+    A timer with a 50 millisecond time out is constructed for animation purposes,
+    and connected to the \c animate() slots of the \c Widget and \c GLWidget objects.
+    Once started, the widgets should be updated at around 20 frames per second.
+
+    \section1 Running the Example
+
+    The example shows the same painting operations performed at the same time
+    in a \c Widget and a \c GLWidget. The quality and speed of rendering in the
+    \c GLWidget depends on the level of support for multisampling and hardware
+    acceleration that your system's OpenGL driver provides. If support for either
+    of these is lacking, the driver may fall back on a software renderer that
+    may trade quality for speed.
+*/
diff --git a/doc/src/examples/activeqt/comapp.qdoc b/doc/src/examples/activeqt/comapp.qdoc
new file mode 100644
index 0000000000..05f3fb59b1
--- /dev/null
+++ b/doc/src/examples/activeqt/comapp.qdoc
@@ -0,0 +1,124 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example activeqt/comapp
+    \title COM App Example (ActiveQt)
+
+    The COM App example shows how to use ActiveQt to develop a Qt
+    application that can be automated via COM. Different QObject
+    based classes are exposed as COM objects that communicate with the
+    GUI of the running Qt application. The APIs of those COM objects
+    has been designed to resemble the APIs of standard COM
+    applications; i.e. those from Microsoft Office.
+
+    \snippet examples/activeqt/comapp/main.cpp 2
+    The first class \c Application represents the application object. It
+    exposes read-only properties \c documents and \c id to get access to the
+    list of documents, and an identifier. A read/write property \c visible
+    controls whether the QTabWidget-based user interface of the application 
+    should be visible, and a slot \c quit() terminates the application.
+
+    The \e RegisterObject attribute is set to make sure that instances of this
+    class are registered in COM's running object table (ROT) - this allows COM
+    clients to connect to an already instantiated COM object.
+
+    \snippet examples/activeqt/comapp/main.cpp 1
+    The \c DocumentList class stores a list of documents. It provides an API
+    to read the number of documents, to access each document by index and to 
+    create a new document. The \c application property returns the root object.
+
+    \snippet examples/activeqt/comapp/main.cpp 0
+
+    The \c Document class finally represents a document in the application.
+    Each document is represented by a page in the application's tab widget, and
+    has a title that is readable and writable through the document's API.
+    The \c application property again returns the root object.
+
+    \snippet examples/activeqt/comapp/main.cpp 3
+    The implementation of the \c Document class creates a new page for the tab
+    widget, and uses the title of that page for the title property. The page 
+    is deleted when the document is deleted.
+
+    \snippet examples/activeqt/comapp/main.cpp 4
+    The \c DocumentList implementation is straightforward.
+
+    \snippet examples/activeqt/comapp/main.cpp 5
+    The \c Application class initializes the user interface in the constructor,
+    and shows and hides it in the implementation of \c setVisible(). The object
+    name (accessible through the \c id property) is set to \c "From QAxFactory" 
+    to indicate that this COM object has been created by COM. Note that there is 
+    no destructor that would delete the QTabWidget - this is instead done in the 
+    \c quit() slot, before calling QApplication::quit() through a single-shot-timer, 
+    which is necessary ensure that the COM call to the slot is complete.
+
+    \snippet examples/activeqt/comapp/main.cpp 6
+    The classes are exported from the server using the QAxFactory macros. Only
+    \c Application objects can be instantiated from outside - the other APIs can
+    only be used after accessing the respective objects throught the \c Application
+    API.
+
+    \snippet examples/activeqt/comapp/main.cpp 7
+    The main() entry point function creates a QApplication, and just enters the
+    event loop if the application has been started by COM. If the application
+    has been started by the user, then the \c Application object is created and 
+    the object name is set to "From Application". Then the COM server is started,
+    and the application object is registered with COM. It is now accessible to
+    COM clients through the client-specific APIs.
+
+    Application exiting is controlled explicitly - if COM started the application, 
+    then the client code has to call quit(); if the user started the application,
+    then the application terminates when the last window has been closed.
+
+    Finally, the user interface is made visible, and the event loop is started.
+
+    A simple Visual Basic application could now access this Qt application. In VB,
+    start a new "Standard Exe" project and add a project reference to the comappLib
+    type library. Create a form with a listbox "DocumentList", a static label 
+    "DocumentsCount" and a command button "NewDocument". Finally, implement the code 
+    for the form like this:
+
+    \snippet doc/src/snippets/code/doc_src_examples_activeqt_comapp.qdoc 0
+
+    To build the example you must first build the QAxServer library.
+    Then run \c qmake and your make tool in
+    \c{examples\activeqt\comapp}.
+*/
diff --git a/doc/src/examples/activeqt/dotnet.qdoc b/doc/src/examples/activeqt/dotnet.qdoc
new file mode 100644
index 0000000000..afe70344d8
--- /dev/null
+++ b/doc/src/examples/activeqt/dotnet.qdoc
@@ -0,0 +1,355 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page activeqt-dotnet.html
+    \title Dot Net Example (ActiveQt)
+
+    The Dot Net example demonstrates how Qt objects can be used in a
+    .NET environment, and how .NET objects can be used in a Qt
+    environment.
+
+    If you need to combine Qt and Win Forms widgets in the same
+    application, you might want to use the higher-level
+    \l{QtWinForms Solution} instead.
+
+    Contents:
+
+    \tableofcontents
+
+    \section1 Qt vs. .NET
+
+    Qt is a C++ library and is compiled into traditional, native
+    binaries that make full use of the performance provided by the
+    runtime environment.
+
+    One of the key concepts of .NET is the idea of "intermediate language
+    code" - the source code is compiled into a bytecode format, and at
+    runtime, that bytecode is executed in a virtual machine - the \e
+    {Common Language Runtime} (CLR).
+
+    Another key concept is that of \e {managed code}. This is essentially
+    intermediate language code written in such a way that the CLR can take
+    care of the memory management, i.e. the CLR will do automatic garbage
+    collection, so the application code does not need to explicitly free
+    the memory for unused objects.
+
+    The MS compilers for C# and VB.NET will only produce managed
+    code. Such programs cannot directly call normal, native functions
+    or classes. \footnote The .NET framework provides Platform Invocation
+    Services - P/Invoke - that enable managed code to call native C (not
+    C++) functions located in DLLs directly. The resulting application
+    then becomes partially unmanaged.\endfootnote
+
+    The MS C++ compiler for .NET on the other hand, can produce both
+    normal and managed code. To write a C++ class that can be compiled
+    into managed code, the developer must flag the class as managed using
+    the \c __gc keyword, and restrict the code to only use the subset of
+    C++ known as "Managed Extensions for C++", or MC++ for short. The
+    advantage is that MC++ code can freely call and use normal C++
+    functions and classes. And it also works the other way around: normal
+    C++ code can call managed functions and use managed classes (e.g. the
+    entire .NET framework class library), including managed functions and
+    classes implemented in C# or VB.NET. This feature of mixing managed
+    and normal C++ code immensely eases the interoperability with .NET,
+    and is by Microsoft referred to as the "It Just Works" (IJW) feature.
+
+    This document demonstrates two different ways of integrating normal
+    C++ code (that uses Qt) with managed .NET code. First, the manual way
+    is presented, which includes using a thin MC++ wrapper class around
+    the normal Qt/C++ class. Then, the automated way is presented, which
+    utilizes the ActiveQt framework as a generic bridge. The advantage of
+    the first method is that it gives the application developer full
+    control, while the second method requires less coding and relieves the
+    developer of dealing with the conversion between managed and normal
+    data objects.
+
+    The impatient reader, who right away wants to see a QPushButton
+    and a custom Qt widget (\l{activeqt/multiple}{QAxWidget2}) run in
+    a .NET GUI application is referred to the example directory of
+    ActiveQt. It contains the result of this walkthrough using both
+    C# and VB.NET, created with Visual Studio .NET (not 2003).
+    Load \c {examples/dotnet/walkthrough/csharp.csproj},
+    \c {examples/dotnet/walkthrough/vb.vbproj}
+    or \c {examples/dotnet/wrapper/wrapper.sln} into the IDE and run
+    the solution.
+
+    \bold{Remark:} You will notice that in the generated code the following line is
+    commented out:
+
+    \snippet doc/src/snippets/code/doc_src_examples_activeqt_dotnet.qdoc 0
+
+    This line is regenerated without comment whenever you change the
+    dialog, in which case you have to comment it out again to be able
+    to run the project. This is a bug in the original version of
+    Visual Studio.NET, and is fixed in the 2003 edition.
+
+    \section1 Walkthrough: .NET interop with MC++ and IJW
+
+    Normal C++ classes and functions can be used from managed .NET code by
+    providing thin wrapper classes written in MC++. The wrapper class will
+    take care of forwarding the calls to the normal C++ functions or
+    methods, and converting parameter data as necessary. Since the wrapper
+    class is a managed class, it can be used without further ado in any
+    managed .NET application, whether written in C#, VB.NET, MC++ or other
+    managed programming language.
+
+    \snippet examples/activeqt/dotnet/wrapper/lib/worker.h 0
+
+    The Qt class has nothing unusual for Qt users, and as even the Qt
+    specialities like \c Q_PROPERTY, \c slots and \c signals are
+    implemented with straight C++ they don't cause any trouble when
+    compiling this class with any C++ compiler.
+
+    \snippet examples/activeqt/dotnet/wrapper/lib/networker.h 0
+
+    The .NET wrapper class uses keywords that are part of MC++ to indicate
+    that the class is managed/garbage collected (\c {__gc}), and that \c
+    StatusString should be accessible as a property in languages that
+    support this concept (\c {__property}).  We also declare an event
+    function \c statusStringChanged(String*) (\c {__event}), the
+    equivalent of the respective signal in the Qt class.
+
+    Before we can start implementing the wrapper class we need a way to
+    convert Qt's datatypes (and potentionally your own) into .NET
+    datatypes, e.g. \c QString objects need to be converted into objects
+    of type \c {String*}.
+
+    When operating on managed objects in normal C++ code, a little extra
+    care must be taken because of the CLR's garbage collection. A normal
+    pointer variable should not \footnote Indeed, the compiler will in
+    many cases disallow it. \endfootnote be used to refer to a managed
+    object. The reason is that the garbage collection can kick in at any
+    time and move the object to another place on the heap, leaving you
+    with an invalid pointer.
+
+    However, two methods are provided that solves this problem easily. The
+    first is to use a \e pinned pointer, i.e. declare the pointer variable
+    with the \c __pin keyword. This guarantees that the object pointed to
+    will not be moved by the garbage collector. It is recommended that
+    this method not be used to keep a references to managed objects for a
+    long time, since it will decrease the efficiency of the garbage
+    collector. The second way is to use the \c gcroot smartpointer
+    template type. This lets you create safe pointers to managed
+    objects. E.g. a variable of type \c gcroot<String> will always point
+    to the String object, even if it has been moved by the garbage
+    collector, and it can be used just like a normal pointer.
+
+    \snippet examples/activeqt/dotnet/wrapper/lib/tools.cpp 0
+    \codeline
+    \snippet examples/activeqt/dotnet/wrapper/lib/tools.cpp 1
+
+    The convertor functions can then be used in the wrapper class
+    implementation to call the functions in the native C++ class.
+
+    \snippet examples/activeqt/dotnet/wrapper/lib/networker.cpp 0
+    \codeline
+    \snippet examples/activeqt/dotnet/wrapper/lib/networker.cpp 1
+
+    The constructor and destructor simply create and destroy the Qt
+    object wrapped using the C++ operators \c new and \c delete.
+
+    \snippet examples/activeqt/dotnet/wrapper/lib/networker.cpp 2
+
+    The netWorker class delegates calls from the .NET code to the native
+    code. Although the transition between those two worlds implies a small
+    performance hit for each function call, and for the type conversion,
+    this should be negligible since we are anyway going to run within the
+    CLR.
+
+    \snippet examples/activeqt/dotnet/wrapper/lib/networker.cpp 3
+
+    The property setter calls the native Qt class before firing the
+    event using the \c __raise keyword.
+
+    This wrapper class can now be used in .NET code, e.g. using C++, C#,
+    Visual Basic or any other programming language available for .NET.
+
+    \snippet examples/activeqt/dotnet/wrapper/main.cs 0
+    \snippet examples/activeqt/dotnet/wrapper/main.cs 1
+    \snippet examples/activeqt/dotnet/wrapper/main.cs 2
+    \snippet examples/activeqt/dotnet/wrapper/main.cs 3
+
+    \section1 Walkthrough: .NET/COM Interop with ActiveQt
+
+    Fortunately .NET provides a generic wrapper for COM objects, the
+    \e {Runtime Callable Wrapper} (RCW). This RCW is a proxy for the
+    COM object and is generated by the CLR when a .NET Framework client
+    activates a COM object. This provides a generic way to reuse COM
+    objects in a .NET Framework project.
+
+    Making a QObject class into a COM object is easily achieved with
+    ActiveQt and demonstrated in the QAxServer examples (e.g., the
+    \l{activeqt/simple}{Simple} example). The walkthrough will use
+    the Qt classes implemented in those examples, so the first thing
+    to do is to make sure that those  examples have been built
+    correctly, e.g. by opening the
+    \l{qaxserver-demo-multiple.html}{demonstration pages} in Internet
+    Explorer to verify that the controls are functional.
+
+    \section2 Starting a Project
+
+    Start Visual Studio.NET, and create a new C# project for writing a
+    Windows application. This will present you with an empty form in
+    Visual Studio's dialog editor. You should see the toolbox, which
+    presents you with a number of available controls and objects in
+    different categories. If you right-click on the toolbox it allows
+    you to add new tabs. We will add the tab "Qt".
+
+    \section2 Importing Qt Widgets
+
+    The category only has a pointer tool by default, and we have to add
+    the Qt objects we want to use in our form. Right-click on the empty
+    space, and select "Customize". This opens a dialog that has two
+    tabs, "COM Components" and ".NET Framework Components". We used
+    ActiveQt to wrap QWidgets into COM objects, so we select the "COM
+    Components" page, and look for the classes we want to use, e.g.
+    "QPushButton" and "QAxWidget2".
+
+    When we select those widgets and close the dialog the two widgets
+    will now be available from the toolbox as grey squares with their
+    name next to it \footnote Icons could be added by modifying the
+    way the controls register themselves. \endfootnote.
+
+    \section2 Using Qt Widgets
+
+    We can now add an instance of QAxWidget2 and a QPushButton to
+    the form. Visual Studio will automatically generate the RCW for the
+    object servers. The QAxWidget2 instance takes most of the upper
+    part of the form, with the QPushButton in the lower right corner.
+
+    In the property editor of Visual Studio we can modify the properties
+    of our controls - QPushButton exposes the \c QWidget API and has many
+    properties, while QAxWidget2 has only the Visual Studio standard
+    properties in addition to its own property "lineWidth" in the
+    "Miscellaneous" category. The objects are named "axQPushButton1" and
+    "axQAxWidget21", and since especially the last name is a bit
+    confusing we rename the objects to "resetButton" and "circleWidget".
+
+    We can also change the Qt properties, e.g. set the "text" property
+    of the \c resetButton to "Reset", and the "lineWidth" property of the
+    \c circleWidget to 5. We can also put those objects into the layout
+    system that Visual Studio's dialog editor provides, e.g. by setting
+    the anchors of the \c circleWidget to "Left, Top, Right, Bottom", and
+    the anchors of the \c resetButton to "Bottom, Right".
+
+    Now we can compile and start the project, which will open a user
+    interface with our two Qt widgets. If we can resize the dialog,
+    the widgets will resize appropriately.
+
+    \section2 Handling Qt Signals
+
+    We will now implement event handlers for the widgets. Select the
+    \c circleWidget and select the "Events" page in the property
+    editor. The widget exposes events because the QAxWidget2 class has
+    the "StockEvents" attribute set in its class definition. We implement
+    the event handler \c circleClicked for the \c ClickEvent to increase
+    the line width by one for every click:
+
+    \snippet examples/activeqt/dotnet/walkthrough/Form1.cs 0
+
+    In general we can implement a default event handler by double
+    clicking on the widget in the form, but the default events for
+    our widgets are right now not defined.
+
+    We will also implement an event handler for the \c clicked signal
+    emitted by QPushButton. Add the event handler \c resetLineWidth to
+    the \c clicked event, and implement the generated function:
+
+    \snippet examples/activeqt/dotnet/walkthrough/Form1.cs 1
+
+    We reset the property to 1, and also call the \c setFocus() slot
+    to simulate the user style on Windows, where a button grabs focus
+    when you click it (so that you can click it again with the spacebar).
+
+    If we now compile and run the project we can click on the circle
+    widget to increase its line width, and press the reset button to
+    set the line width back to 1.
+
+    \section1 Summary
+
+    Using ActiveQt as a universal interoperability bridge between the
+    .NET world and the native world of Qt is very easy, and makes it
+    often  unnecessary to implement a lot of handwritten wrapper classes.
+    Instead, the QAxFactory implementation in the otherwise completely
+    cross-platform Qt project provides the glue that .NET needs to to
+    generate the RCW.
+
+    If this is not sufficient we can implement our own wrapper classes
+    thanks to the C++ extensions provided by Microsoft.
+
+    \section2 Limitations
+
+    All the limitations when using ActiveQt are implied when using this
+    technique to interoperate with .NET, e.g. the datatypes we can use
+    in the APIs can only be those supported by ActiveQt and COM. However,
+    since this includes subclasses of QObject and QWidget we can wrap
+    any of our datatypes into a QObject subclass to make its API
+    available to .NET. This has the positive side effect that the same
+    API is automatically available in
+    \l{http://qtsoftware.com/products/qsa/}{QSA}, the cross platform
+    scripting solution for Qt applications, and to COM clients in general.
+
+    When using the "IJW" method, in priciple the only limitation is the
+    time required to write the wrapper classes and data type conversion
+    functions.
+
+    \section2 Performance Considerations
+
+    Every call from CLR bytecode to native code implies a small
+    performance hit, and necessary type conversions introduce an
+    additional delay with every layer that exists between the two
+    frameworks. Consequently every approach to mix .NET and native
+    code should try to minimize the communication necessary between
+    the different worlds.
+
+    As ActiveQt introduces three layers at once - the RCW, COM and finally
+    ActiveQt itself - the performance penalty when using the generic
+    Qt/ActiveQt/COM/RCW/.NET bridge is larger than when using a
+    hand-crafted IJW-wrapper class. The execution speed however is still
+    sufficient for connecting to and modifying interactive elements in a
+    user interface, and as soon as the benefit of using Qt and C++ to
+    implement and compile performance critical algorithms into native code
+    kicks in, ActiveQt becomes a valid choice for making even non-visual
+    parts of your application accessible to .NET.
+
+    \sa {QtWinForms Solution}
+*/
diff --git a/doc/src/examples/activeqt/hierarchy-demo.qdocinc b/doc/src/examples/activeqt/hierarchy-demo.qdocinc
new file mode 100644
index 0000000000..9d0cb5ea4a
--- /dev/null
+++ b/doc/src/examples/activeqt/hierarchy-demo.qdocinc
@@ -0,0 +1,43 @@
+\raw HTML
+//! [0]
+<script language="javascript">
+function createSubWidget( form )
+{
+    ParentWidget.createSubWidget( form.nameEdit.value );
+}
+
+function renameSubWidget( form )
+{
+    var SubWidget = ParentWidget.subWidget( form.nameEdit.value );
+    if ( !SubWidget ) {
+        alert( "No such widget " + form.nameEdit.value + "!" );
+        return;
+    }
+    SubWidget.label = form.labelEdit.value;
+    form.nameEdit.value = SubWidget.label;
+}
+
+function setFont( form )
+{
+    ParentWidget.font = form.fontEdit.value;
+}
+</script>
+
+<p>
+This widget can have many children!
+</p>
+<object ID="ParentWidget" CLASSID="CLSID:d574a747-8016-46db-a07c-b2b4854ee75c"
+CODEBASE="http://qtsoftware.com/demos/hierarchy.cab">
+[Object not available! Did you forget to build and register the server?]
+</object><br />
+<form>
+<input type="edit" ID="nameEdit" value="&lt;enter object name&gt;" />
+<input type="button" value="Create" onClick="createSubWidget(this.form)" />
+<input type="edit" ID="labelEdit" />
+<input type="button" value="Rename" onClick="renameSubWidget(this.form)" />
+<br />
+<input type="edit" ID="fontEdit" value="MS Sans Serif" />
+<input type="button" value = "Set Font" onClick="setFont(this.form)" />
+</form>
+//! [0]
+\endraw
diff --git a/doc/src/examples/activeqt/hierarchy.qdoc b/doc/src/examples/activeqt/hierarchy.qdoc
new file mode 100644
index 0000000000..868d0ce6f0
--- /dev/null
+++ b/doc/src/examples/activeqt/hierarchy.qdoc
@@ -0,0 +1,102 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \page qaxserver-demo-hierarchy.html
+    \title Qt Widget Hierarchy
+
+    \input examples/activeqt/hierarchy-demo.qdocinc
+*/
+
+/*!
+    \example activeqt/hierarchy
+    \title Hierarchy Example (ActiveQt)
+
+    The Hierarchy example is shows how to write an in-process ActiveX
+    control. The control is a QWidget subclass with child widgets
+    that are accessible as sub-types.
+
+    \snippet examples/activeqt/hierarchy/objects.h 0
+    The \c QParentWidget class provides slots to create a widget
+    with a name, and to return a pointer to a named widget. The class
+    declaration uses \c Q_CLASSINFO() to provide the COM identifiers for
+    this class.
+
+    \snippet examples/activeqt/hierarchy/objects.cpp 0
+    The constructor of QParentWidget creates a vertical box layout.
+    New child widgets are automatically added to the layout.
+
+    \snippet examples/activeqt/hierarchy/objects.cpp 1
+    The \c createSubWidget slot creates a new \c QSubWidget with
+    the name provided in the parameter, and sets the label to that
+    name. The widget is also shown explicitly.
+
+    \snippet examples/activeqt/hierarchy/objects.cpp 2
+    The \c subWidget slot uses the \c QObject::child() function and
+    returns the first child of type \c QSubWidget that has the requested
+    name.
+
+     \snippet examples/activeqt/hierarchy/objects.h 1
+    The \c QSubWidget class has a single string-property \c label,
+    and implements the paintEvent to draw the label. The class uses
+    again \c Q_CLASSINFO to provide the COM identifiers, and also sets
+    the \e ToSuperClass attribute to \e QSubWidget, to ensure that only
+    no slots of any superclasses (i.e. QWidget) are exposed.
+
+    \snippet examples/activeqt/hierarchy/objects.cpp 3
+    \snippet examples/activeqt/hierarchy/objects.cpp 4
+    The implementation of the QSubWidget class is self-explanatory.
+
+    \snippet examples/activeqt/hierarchy/main.cpp 0
+    The classes are then exported using a QAxFactory. \c QParentWidget is
+    exported as a full class (which can be created ), while \c QSubWidget is
+    only exported as a type, which can only be created indirectly through
+    APIs of \c QParentWidget.
+
+    To build the example you must first build the QAxServer library.
+    Then run qmake and your make tool in \c examples/activeqt/hierarchy.
+
+    The \l{qaxserver-demo-hierarchy.html}{demonstration} requires
+    your WebBrowser to support ActiveX controls, and scripting to be
+    enabled.
+
+    \snippet examples/activeqt/hierarchy-demo.qdocinc 0
+*/
diff --git a/doc/src/examples/activeqt/menus.qdoc b/doc/src/examples/activeqt/menus.qdoc
new file mode 100644
index 0000000000..6ce162599c
--- /dev/null
+++ b/doc/src/examples/activeqt/menus.qdoc
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qaxserver-demo-menus.html
+    \preliminary
+
+    \title Menubar Merging
+
+    This example is not full functional at the moment.
+
+    \raw HTML
+    <object ID="QMenus" CLASSID="CLSID:4dc3f340-a6f7-44e4-a79b-3e9217695fbd"
+    CODEBASE="http://qtsoftware.com/demos/menusax.cab">
+    [Object not available! Did you forget to build and register the server?]
+    </object>
+    \endraw
+*/
+
+/*!
+    \example activeqt/menus
+    \title Menus Example (ActiveQt)
+
+    The Menus example demonstrates the use of QMenuBar and QStatusBar
+    in a QMainWindow to implement an in-place active control.
+
+    To build the example you must first build the QAxServer library.
+    Then run \c qmake and your make tool in \c
+    examples/activeqt/menus.
+
+    The \l{qaxserver-demo-menus.html}{demonstration} requires your
+    WebBrowser to support ActiveX controls, and scripting to be
+    enabled.
+
+    \snippet doc/src/snippets/code/doc_src_examples_activeqt_menus.qdoc 0
+*/
diff --git a/doc/src/examples/activeqt/multiple-demo.qdocinc b/doc/src/examples/activeqt/multiple-demo.qdocinc
new file mode 100644
index 0000000000..ee174bf5a7
--- /dev/null
+++ b/doc/src/examples/activeqt/multiple-demo.qdocinc
@@ -0,0 +1,39 @@
+\raw HTML
+//! [0]
+<script language="javascript">
+function setColor( form )
+{
+    Ax1.fillColor = form.colorEdit.value;
+}
+
+function setWidth( form )
+{
+    Ax2.lineWidth = form.widthEdit.value;
+}
+</script>
+
+<p />
+This is one QWidget subclass:<br />
+<object ID="Ax1" CLASSID="CLSID:1D9928BD-4453-4bdd-903D-E525ED17FDE5"
+CODEBASE="http://qtsoftware.com/demos/multipleax.cab">
+[Object not available! Did you forget to build and register the server?]
+</object><br />
+<form>
+Fill Color: <input type="edit" ID="colorEdit" value = "red" />
+<input type="button" value = "Set" onClick="setColor(this.form)" />
+<input type="button" value = "Hide" onClick="Ax1.hide()" />
+<input type="button" value = "Show" onClick="Ax1.show()" />
+</form>
+
+<p />
+This is another QWidget subclass:<br />
+<object ID="Ax2" CLASSID="CLSID:58139D56-6BE9-4b17-937D-1B1EDEDD5B71"
+CODEBASE="http://qtsoftware.com/demos/multipleax.cab">
+[Object not available! Did you forget to build and register the server?]
+</object><br />
+<form>
+Line width: <input type="edit" ID="widthEdit" value = "1" />
+<input type="button" value = "Set" onClick="setWidth(this.form)" />
+</form>
+//! [0]
+\endraw
diff --git a/doc/src/examples/activeqt/multiple.qdoc b/doc/src/examples/activeqt/multiple.qdoc
new file mode 100644
index 0000000000..d15371b31d
--- /dev/null
+++ b/doc/src/examples/activeqt/multiple.qdoc
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qaxserver-demo-multiple.html
+    \title Two Simple Qt Widgets
+
+    \input examples/activeqt/multiple-demo.qdocinc
+*/
+
+/*!
+    \example activeqt/multiple
+    \title Multiple Example (ActiveQt)
+
+    The Multiple example demonstrates the implementation of a
+    QAxFactory to provide multiple ActiveX controls in a single in
+    process ActiveX server using the \c QAXFACTORY_EXPORT() macro.
+    The ActiveX controls in this example are simple QWidget
+    subclasses that reimplement QWidget::paintEvent().
+
+    \snippet examples/activeqt/multiple/ax1.h 0
+
+    The first control draws a filled rectangle. The fill color is exposed
+    as a property. \c Q_CLASSINFO() is used to specify the COM identifiers.
+
+    \snippet examples/activeqt/multiple/ax2.h 0
+
+    The second control draws a circle. The linewith is exposed as a property.
+    \c Q_CLASSINFO() is used to specify the COM identifiers, and to set the
+    attributes \e ToSuperClass and \e StockEvents to expose only the API of
+    the class itself, and to add COM stock events to the ActiveX control.
+
+    \snippet examples/activeqt/multiple/main.cpp 0
+
+    The classes are exported from the server using the QAxFactory macros.
+
+    To build the example you must first build the QAxServer library.
+    Then run \c qmake and your make tool in  \c
+    examples/activeqt/multiple.
+
+    The \l{qaxserver-demo-multiple.html}{demonstration} requires your
+    WebBrowser to support ActiveX controls, and scripting to be
+    enabled.
+
+    \snippet examples/activeqt/multiple-demo.qdocinc 0
+*/
diff --git a/doc/src/examples/activeqt/opengl-demo.qdocinc b/doc/src/examples/activeqt/opengl-demo.qdocinc
new file mode 100644
index 0000000000..44df0c44a1
--- /dev/null
+++ b/doc/src/examples/activeqt/opengl-demo.qdocinc
@@ -0,0 +1,27 @@
+\raw HTML
+//! [0]
+<SCRIPT LANGUAGE="JavaScript">
+function setRot( form )
+{
+    GLBox.setXRotation( form.XEdit.value );
+    GLBox.setYRotation( form.YEdit.value );
+    GLBox.setZRotation( form.ZEdit.value );
+}
+</SCRIPT>
+
+<p />
+An OpenGL scene:<br />
+<object ID="GLBox" CLASSID="CLSID:5fd9c22e-ed45-43fa-ba13-1530bb6b03e0"
+CODEBASE="http://qtsoftware.com/demos/openglax.cab">
+[Object not available! Did you forget to build and register the server?]
+</object><br />
+
+<form>
+Rotate the scene:<br />
+X:<input type="edit" ID="XEdit" value="0" /><br />
+Y:<input type="edit" name="YEdit" value="0" /><br />
+Z:<input type="edit" name="ZEdit" value="0" /><br />
+<input type="button" value="Set" onClick="setRot(this.form)" />
+</form>
+//! [0]
+\endraw
diff --git a/doc/src/examples/activeqt/opengl.qdoc b/doc/src/examples/activeqt/opengl.qdoc
new file mode 100644
index 0000000000..05c9d0845a
--- /dev/null
+++ b/doc/src/examples/activeqt/opengl.qdoc
@@ -0,0 +1,145 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \page qaxserver-demo-opengl.html
+
+    \title OpenGL in an HTML page
+
+    \raw HTML
+    <SCRIPT LANGUAGE="JavaScript">
+    function setRot( form )
+    {
+        GLBox.setXRotation( form.XEdit.value );
+        GLBox.setYRotation( form.YEdit.value );
+        GLBox.setZRotation( form.ZEdit.value );
+    }
+    </SCRIPT>
+
+    <p />
+    An OpenGL scene:<br />
+    <object ID="GLBox" CLASSID="CLSID:5fd9c22e-ed45-43fa-ba13-1530bb6b03e0"
+    CODEBASE="http://qtsoftware.com/demos/openglax.cab">
+    [Object not available! Did you forget to build and register the server?]
+    </object><br />
+
+    <form>
+    Rotate the scene:<br />
+    X:<input type="edit" ID="XEdit" value="0" /><br />
+    Y:<input type="edit" name="YEdit" value="0" /><br />
+    Z:<input type="edit" name="ZEdit" value="0" /><br />
+    <input type="button" value="Set" onClick="setRot(this.form)" />
+    </form>
+    \endraw
+*/
+
+/*!
+    \example activeqt/opengl
+    \title OpenGL Example (ActiveQt)
+
+    The OpenGL example demonstrates the use of the default factory
+    and  QAxFactory::isServer(), and the implementation of an
+    additional COM interface using QAxBindable and QAxAggregated.
+    The server executable  can run both as an ActiveX server and as a
+    stand-alone application.
+
+    The ActiveX control in this example uses the QGlWidget class in
+    Qt to render an OpenGL scene in an ActiveX. The control exposes a few
+    methods to change the scene.
+
+    The application uses the default factory as provided by the 
+    QAXFACTORY_DEFAULT macro to expose the \c GLBox widget as an ActiveX 
+    control.
+    \snippet examples/activeqt/opengl/main.cpp 0
+    The implementation of \c main initializes the QApplication object,
+    and uses \c QAxFactory::isServer() to determine whether or not it is
+    appropriate to create and show the application interface.
+    \snippet examples/activeqt/opengl/main.cpp 1
+    \snippet examples/activeqt/opengl/main.cpp 2
+    \snippet examples/activeqt/opengl/main.cpp 3
+
+    The \c GLBox class inherits from both the \l QGLWidget class to be able
+    to render OpenGL, and from \l QAxBindable.
+    \snippet examples/activeqt/opengl/glbox.h 0
+    The class reimplements the \l QAxBindable::createAggregate() function from QAxBindable
+    to return the pointer to a \l QAxAggregated object.
+    \snippet examples/activeqt/opengl/glbox.h 1
+    The rest of the class declaration and the implementation of the OpenGL
+    rendering is identical to the original "box" example.
+
+    The implementation file of the \c GLBox class includes the \c objsafe.h
+    system header, in which the \c IObjectSafety COM interface is defined.
+    \snippet examples/activeqt/opengl/glbox.cpp 0
+    A class \c ObjectSafetyImpl is declared using multiple inheritance
+    to subclass the QAxAggregated class, and to implement the IObjectSafety
+    interface.
+    \snippet examples/activeqt/opengl/glbox.cpp 1
+    The class declares a default constructor, and implements the queryInterface
+    function to support the IObjectSafety interface.
+    \snippet examples/activeqt/opengl/glbox.cpp 2
+    Since every COM interface inherits \c IUnknown the \c QAXAGG_IUNKNOWN macro
+    is used to provide the default implementation of the \c IUnknown interface.
+    The macro is defined to delegate all calls to \c QueryInterface, \c AddRef
+    and \c Release to the interface returned by the controllingUnknown() function.
+    \snippet examples/activeqt/opengl/glbox.cpp 3
+    The implementation of the \c IObjectSafety interface provides the caller
+    with information about supported and enabled safety options, and returns 
+    \c S_OK for all calls to indicate that the ActiveX control is safe.
+    \snippet examples/activeqt/opengl/glbox.cpp 4
+    The implementation of the \c createAggregate() function just returns a new
+    \c ObjectSafetyImpl object.
+    \snippet examples/activeqt/opengl/glbox.cpp 5
+
+    To build the example you must first build the QAxServer library.
+    Then run \c qmake and your make tool in  \c
+    examples/activeqt/wrapper.
+
+    The \l{qaxserver-demo-opengl.html}{demonstration} requires your
+    WebBrowser to support ActiveX controls, and scripting to be
+    enabled.
+
+    In contrast to the other QAxServer examples Internet Explorer will not
+    open a dialog box to ask the user whether or not the scripting of the GLBox
+    control should be allowed (the exact browser behaviour depends on the security 
+    settings in the Internet Options dialog).
+
+    \snippet doc/src/examples/activeqt/opengl-demo.qdocinc 0
+*/
diff --git a/doc/src/examples/activeqt/qutlook.qdoc b/doc/src/examples/activeqt/qutlook.qdoc
new file mode 100644
index 0000000000..c29feeb6a1
--- /dev/null
+++ b/doc/src/examples/activeqt/qutlook.qdoc
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \example activeqt/qutlook
+    \title Qutlook Example (ActiveQt)
+
+    The Qutlook example demonstrates the use of ActiveQt to automate
+    Outlook. The example makes use of the \l dumpcpp tool to generate
+    a C++ namespace for the type library describing the Outlook
+    Object Model.
+
+    The project file for the example looks like this:
+
+    \snippet examples/activeqt/qutlook/qutlook.pro 1
+    \snippet examples/activeqt/qutlook/qutlook.pro 2
+
+    The project file uses the \c dumpcpp tool to add an MS Outlook type library to the project.
+    If this fails, then the generated makefile will just print an error message, otherwise
+    the build step will now run the \e dumpcpp tool on the type library, and 
+    generate a header and a cpp file (in this case, \c msoutl.h and \c msoutl.cpp) that 
+    declares and implement an easy to use API to the Outlook objects.
+
+    \snippet examples/activeqt/qutlook/addressview.h 0
+
+    The AddressView class is a QWidget subclass for the user interface. The QTreeView widget
+    will display the contents of Outlook's Contact folder as provided by the \c{model}.
+
+    \snippet examples/activeqt/qutlook/addressview.cpp 0
+    The AddressBookModel class is a QAbstractListModel subclass that communicates directly with 
+    Outlook, using a QHash for caching.
+
+    \snippet examples/activeqt/qutlook/addressview.cpp 1
+    The constructor initializes Outlook. The various signals Outlook provides to notify about 
+    contents changes are connected to the \c updateOutlook() slot.
+
+    \snippet examples/activeqt/qutlook/addressview.cpp 2
+    The destructor logs off from the session.
+
+    \snippet examples/activeqt/qutlook/addressview.cpp 3
+    The \c rowCount() implementation returns the number of entries as reported by Outlook. \c columnCount
+    and \c headerData are implemented to show four columns in the tree view.
+
+    \snippet examples/activeqt/qutlook/addressview.cpp 4
+    The \c headerData() implementation returns hardcoded strings.
+
+    \snippet examples/activeqt/qutlook/addressview.cpp 5
+    The \c data() implementation is the core of the model. If the requested data is in the cache the
+    cached value is used, otherwise the data is acquired from Outlook.
+
+    \snippet examples/activeqt/qutlook/addressview.cpp 6
+    The \c changeItem() slot is called when the user changes the current entry using the user interface.
+    The Outlook item is accessed using the Outlook API, and is modified using the property setters.
+    Finally, the item is saved to Outlook, and removed from the cache. Note that the model does not
+    signal the view of the data change, as Outlook will emit a signal on its own.
+
+    \snippet examples/activeqt/qutlook/addressview.cpp 7
+    The \c addItem() slot calls the CreateItem method of Outlook to create a new contact item,
+    sets the properties of the new item to the values entered by the user and saves the item.
+
+    \snippet examples/activeqt/qutlook/addressview.cpp 8
+    The \c update() slot clears the cache, and emits the reset() signal to notify the view about the
+    data change requiring a redraw of the contents.
+
+    \snippet examples/activeqt/qutlook/addressview.cpp 9
+    \snippet examples/activeqt/qutlook/addressview.cpp 10
+    The rest of the file implements the user interface using only Qt APIs, i.e. without communicating
+    with Outlook directly.
+
+    \snippet examples/activeqt/qutlook/main.cpp 0
+
+    The \c main() entry point function finally instantiates the user interface and enters the
+    event loop.
+
+    To build the example you must first build the QAxContainer
+    library. Then run your make tool in \c examples/activeqt/qutlook
+    and run the resulting \c qutlook.exe.
+*/
diff --git a/doc/src/examples/activeqt/simple-demo.qdocinc b/doc/src/examples/activeqt/simple-demo.qdocinc
new file mode 100644
index 0000000000..45a346cbb8
--- /dev/null
+++ b/doc/src/examples/activeqt/simple-demo.qdocinc
@@ -0,0 +1,45 @@
+\raw HTML
+//! [0]
+<object ID="QSimpleAX" CLASSID="CLSID:DF16845C-92CD-4AAB-A982-EB9840E74669"
+CODEBASE="http://qtsoftware.com/demos/simpleax.cab">
+    <PARAM NAME="text" VALUE="A simple control" />
+    <PARAM NAME="value" VALUE="1" />
+[Object not available! Did you forget to build and register the server?]
+</object>
+//! [0] //! [1]
+
+<FORM>
+    <INPUT TYPE="BUTTON" VALUE="About..." onClick="QSimpleAX.about()" />
+</FORM>
+//! [1]
+
+//! [2]
+<object ID="Calendar" CLASSID="CLSID:8E27C92B-1264-101C-8A2F-040224009C02">
+[Standard Calendar control not available!]
+    <PARAM NAME="day" VALUE="1" />
+</object>
+//! [2]
+
+<FORM>
+    <INPUT TYPE="BUTTON" VALUE="Today" onClick="Calendar.Today()" />
+</FORM>
+
+//! [3]
+<SCRIPT LANGUAGE="VBScript">
+Sub Calendar_Click()
+    MsgBox( "Calendar Clicked!" )
+End Sub
+
+Sub QSimpleAX_TextChanged( str )
+    document.title = str
+End Sub
+</SCRIPT>
+
+<SCRIPT LANGUAGE="JavaScript">
+function QSimpleAX::ValueChanged( Newvalue )
+{
+    Calendar.Day = Newvalue;
+}
+</SCRIPT>
+//! [3]
+\endraw
diff --git a/doc/src/examples/activeqt/simple.qdoc b/doc/src/examples/activeqt/simple.qdoc
new file mode 100644
index 0000000000..e79e542191
--- /dev/null
+++ b/doc/src/examples/activeqt/simple.qdoc
@@ -0,0 +1,130 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \page qaxserver-demo-simple.html
+
+    \title A standard ActiveX and the "simple" ActiveQt widget
+
+    \raw HTML
+    <object ID="QSimpleAX" CLASSID="CLSID:DF16845C-92CD-4AAB-A982-EB9840E74669"
+    CODEBASE="http://qtsoftware.com/demos/simpleax.cab">
+        <PARAM NAME="text" VALUE="A simple control" />
+        <PARAM NAME="value" VALUE="1" />
+    [Object not available! Did you forget to build and register the server?]
+    </object>
+
+    <FORM>
+        <INPUT TYPE="BUTTON" VALUE="About..." onClick="QSimpleAX.about()" />
+    </FORM>
+
+    <object ID="Calendar" CLASSID="CLSID:8E27C92B-1264-101C-8A2F-040224009C02">
+    [Standard Calendar control not available!]
+        <PARAM NAME="day" VALUE="1" />
+    </object>
+
+    <FORM>
+        <INPUT TYPE="BUTTON" VALUE="Today" onClick="Calendar.Today()" />
+    </FORM>
+
+    <SCRIPT LANGUAGE="VBScript">
+    Sub Calendar_Click()
+        MsgBox( "Calendar Clicked!" )
+    End Sub
+
+    Sub QSimpleAX_TextChanged( str )
+        document.title = str
+    End Sub
+    </SCRIPT>
+
+    <SCRIPT LANGUAGE="JavaScript">
+    function QSimpleAX::ValueChanged( Newvalue )
+    {
+        Calendar.Day = Newvalue;
+    }
+    </SCRIPT>
+    \endraw
+*/
+
+/*!
+    \example activeqt/simple
+    \title Simple Example (ActiveQt)
+
+    The Simple example demonstrates the use of
+    QAxBindable::requestPropertyChange() and
+    QAxBindable::propertyChanged(), and the use of the default
+    QAxFactory through the \c QAXFACTORY_DEFAULT() macro.
+    
+    The ActiveX control in this example is a laid out QWidget with a
+    QSlider, a QLCDNumber and a QLineEdit. It provides a
+    signal/slot/property interface to change the values of the slider
+    and the line edit, and to get notified of any property changes.
+
+
+    The Qt implementation of the ActiveX for this example is
+    \snippet examples/activeqt/simple/main.cpp 0
+
+    The control is exported using the default QAxFactory
+    \snippet examples/activeqt/simple/main.cpp 1
+
+    To build the example you must first build the QAxServer library.
+    Then run qmake and your make tool in \c examples/activeqt/simple.
+
+    The \l{qaxserver-demo-simple.html}{demonstration} requires your
+    WebBrowser to support ActiveX controls, and scripting to be enabled.
+
+    The simple ActiveX control is embedded using the \c <object> tag.
+
+    \snippet doc/src/examples/activeqt/simple-demo.qdocinc 0
+
+    A simple HTML button is connected to the ActiveQt's about() slot.
+
+    \snippet doc/src/examples/activeqt/simple-demo.qdocinc 1
+
+    A second ActiveX control - the standard Calendar Control - is instantiated
+
+    \snippet doc/src/examples/activeqt/simple-demo.qdocinc 2
+
+    Events from the ActiveX controls are handled using both Visual Basic Script
+    and JavaScript.
+
+    \snippet doc/src/examples/activeqt/simple-demo.qdocinc 3
+*/
diff --git a/doc/src/examples/activeqt/webbrowser.qdoc b/doc/src/examples/activeqt/webbrowser.qdoc
new file mode 100644
index 0000000000..46b83f9834
--- /dev/null
+++ b/doc/src/examples/activeqt/webbrowser.qdoc
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example activeqt/webbrowser
+    \title Web Browser Example (ActiveQt)
+
+    The Web Browser example uses the Microsoft Web Browser
+    ActiveX control to implement a fully functional Web Browser
+    application. The user interface has been developed using the Qt
+    Designer integration of the QAxWidget class.
+
+    The code demonstrates how the Qt application can communicate 
+    with the embedded ActiveX controls using signals, slots and the 
+    dynamicCall() function.
+
+    \snippet examples/activeqt/webbrowser/main.cpp 0
+
+    The \c MainWindow class declares a \c QMainWindow based user interface,
+    using the \c Ui::MainWindow class generated by Qt Designer. A number
+    of slots are implemented to handle events from the various user 
+    interface elements, including the \c WebBrowser object, which is a
+    QAxWidget hosting the Microsoft Web Browser control.
+
+    \snippet examples/activeqt/webbrowser/main.cpp 1
+
+    The constructor initializes the user interface, installs a
+    progress bar on the status bar, and uses QAxBase::dynamicCall()
+    to invoke the \c GoHome() method of Internet Explorer to
+    navigate  to the user's home page.
+
+    \snippet examples/activeqt/webbrowser/main.cpp 2
+    Different slots handle the signals emitted by the WebBrowser object.
+
+    Connections that don't require any coding, i.e. connecting the \c back 
+    action to the \c GoBack() slot, have already been made in Qt Designer.
+
+    \snippet examples/activeqt/webbrowser/main.cpp 3
+    \snippet examples/activeqt/webbrowser/main.cpp 4
+
+    The rest of the implementation is not related to ActiveQt - the actions
+    are handled by different slots, and the entry point function starts the
+    application using standard Qt APIs.
+
+    To build the example you must first build the QAxContainer
+    library. Then run your make tool in \c
+    examples/activeqt/webbrowser and run the resulting \c
+    webbrowser.exe.
+*/
diff --git a/doc/src/examples/activeqt/wrapper-demo.qdocinc b/doc/src/examples/activeqt/wrapper-demo.qdocinc
new file mode 100644
index 0000000000..14571196ca
--- /dev/null
+++ b/doc/src/examples/activeqt/wrapper-demo.qdocinc
@@ -0,0 +1,51 @@
+\raw HTML
+//! [0]
+<SCRIPT LANGUAGE="VBScript">
+Sub ToolButton_Clicked()
+    RadioButton.text = InputBox( "Enter something", "Wrapper Demo" )
+End Sub
+
+Sub PushButton_clicked()
+    MsgBox( "Thank you!" )
+End Sub
+
+Sub CheckBox_toggled( state )
+    if state = 0 then
+        CheckBox.text = "Check me!"
+    else
+        CheckBox.text = "Uncheck me!"
+    end if
+End Sub
+</SCRIPT>
+<p />
+A QPushButton:<br />
+<object ID="PushButton" CLASSID="CLSID:2B262458-A4B6-468B-B7D4-CF5FEE0A7092"
+CODEBASE="http://qtsoftware.com/demos/wrapperax.cab">
+    <PARAM NAME="text" VALUE="Click me!" />
+[Object not available! Did you forget to build and register the server?]
+</object><br />
+
+<p />
+A QCheckBox:<br />
+<object ID="CheckBox" CLASSID="CLSID:6E795de9-872d-43cf-a831-496ef9d86c68"
+CODEBASE="http://qtsoftware.com/demos/wrapperax.cab">
+    <PARAM NAME="text" VALUE="Check me!" />
+[Object not available! Did you forget to build and register the server?]
+</object><br />
+
+<p />
+A QToolButton:<br />
+<object ID="ToolButton" CLASSID="CLSID:7c0ffe7a-60c3-4666-bde2-5cf2b54390a1"
+CODEBASE="http://qtsoftware.com/demos/wrapperax.cab">
+[Object not available! Did you forget to build and register the server?]
+</object><br />
+
+<p />
+A QRadioButton:<br />
+<object ID="RadioButton" CLASSID="CLSID:afcf78c8-446c-409a-93b3-ba2959039189"
+CODEBASE="http://qtsoftware.com/demos/wrapperax.cab">
+    <PARAM NAME="text" VALUE="Tune me!" />
+[Object not available! Did you forget to build and register the server?]
+</object><br />
+//! [0]
+\endraw
diff --git a/doc/src/examples/activeqt/wrapper.qdoc b/doc/src/examples/activeqt/wrapper.qdoc
new file mode 100644
index 0000000000..017da308b0
--- /dev/null
+++ b/doc/src/examples/activeqt/wrapper.qdoc
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qaxserver-demo-wrapper.html
+
+    \title Standard Qt widgets in an HTML page
+
+    \input examples/activeqt/wrapper-demo.qdocinc
+*/
+
+/*!
+    \example activeqt/wrapper
+    \title Wrapper Example (ActiveQt)
+
+    The Wrapper example demonstrates how to export existing QWidget
+    classes as ActiveX controls, and the use of QAxFactory together
+    with the \c QAXFACTORY_EXPORT() macro. ActiveX controls in this
+    example are the standard button classes QPushButton, QCheckBox
+    and QRadioButton as provided by Qt.
+
+    \snippet examples/activeqt/wrapper/main.cpp 0
+    The factory implementation returns the list of supported controls,
+    creates controls on request and provides information about the unique
+    IDs of the COM classes and interfaces for each control.
+
+    \snippet examples/activeqt/wrapper/main.cpp 1
+    The factory is exported using the QAXFACTORY_EXPORT macro.
+
+    To build the example you must first build the QAxServer library.
+    Then run \c qmake and your make tool in \c
+    examples/activeqt/wrapper.
+
+    The \l{qaxserver-demo-wrapper.html}{demonstration} requires a
+    web browser that supports ActiveX controls, and scripting to be
+    enabled.
+
+    \snippet examples/activeqt/wrapper-demo.qdocinc 0
+*/
diff --git a/doc/src/examples/addressbook.qdoc b/doc/src/examples/addressbook.qdoc
new file mode 100644
index 0000000000..fb5c1ea6b6
--- /dev/null
+++ b/doc/src/examples/addressbook.qdoc
@@ -0,0 +1,456 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example itemviews/addressbook
+    \title Address Book Example
+
+    The address book example shows how to use proxy models to display
+    different views onto data from a single model.
+
+    \image addressbook-example.png Screenshot of the Address Book example
+
+    This example provides an address book that allows contacts to be
+    grouped alphabetically into 9 groups: ABC, DEF, GHI, ... , VW,
+    ..., XYZ. This is achieved by using multiple views on the same
+    model, each of which is filtered using an instance of the
+    QSortFilterProxyModel class.
+
+
+    \section1 Overview
+
+    The address book contains 5 classes: \c MainWindow,
+    \c AddressWidget, \c TableModel, \c NewAddressTab and
+    \c AddDialog. The \c MainWindow class uses \c AddressWidget as
+    its central widget and provides \gui File and \gui Tools menus.
+
+    \image addressbook-classes.png Diagram for Address Book Example
+
+    The \c AddressWidget class is a QTabWidget subclass that is used
+    to manipulate the 10 tabs displayed in the example: the 9
+    alphabet group tabs and an instance of \c NewAddressTab.
+    The \c NewAddressTab class is a subclass of QWidget that
+    is only used whenever the address book is empty, prompting the
+    user to add some contacts. \c AddressWidget also interacts with
+    an instance of \c TableModel to add, edit and remove entries to
+    the address book.
+
+    \c TableModel is a subclass of QAbstractTableModel that provides
+    the standard model/view API to access data. It also holds a
+    QList of \l{QPair}s corresponding to the contacts added.
+    However, this data is not all visible in a single tab. Instead,
+    QTableView is used to provide 9 different views of the same
+    data, according to the alphabet groups.
+
+    QSortFilterProxyModel is the class responsible for filtering
+    the contacts for each group of contacts. Each proxy model uses
+    a QRegExp to filter out contacts that do not belong in the
+    corresponding alphabetical group. The \c AddDialog class is
+    used to obtain information from the user for the address book.
+    This QDialog subclass is instantiated by \c NewAddressTab to
+    add contacts, and by \c AddressWidget to add and edit contacts.
+
+    We begin by looking at the \c TableModel implementation.
+
+
+    \section1 TableModel Class Definition
+
+    The \c TableModel class provides standard API to access data in
+    its QList of \l{QPair}s by subclassing QAbstractTableModel. The
+    basic functions that must be implemented in order to do so are:
+    \c rowCount(), \c columnCount(), \c data(), \c headerData().
+    For TableModel to be editable, it has to provide implementations
+    \c insertRows(), \c removeRows(), \c setData() and \c flags()
+    functions.
+
+    \snippet itemviews/addressbook/tablemodel.h 0
+
+    Two constructors are used, a default constructor which uses
+    \c TableModel's own \c {QList<QPair<QString, QString>>} and one
+    that takes \c {QList<QPair<QString, QString>} as an argument,
+    for convenience.
+
+
+    \section1 TableModel Class Implementation
+
+    We implement the two constructors as defined in the header file.
+    The second constructor initializes the list of pairs in the
+    model, with the parameter value.
+
+    \snippet itemviews/addressbook/tablemodel.cpp 0
+
+    The \c rowCount() and \c columnCount() functions return the
+    dimensions of the model. Whereas, \c rowCount()'s value will vary
+    depending on the number of contacts added to the address book,
+    \c columnCount()'s value is always 2 because we only need space
+    for the \bold Name and \bold Address columns.
+
+    \note The \c Q_UNUSED() macro prevents the compiler from
+    generating warnings regarding unused parameters.
+
+    \snippet itemviews/addressbook/tablemodel.cpp 1
+
+    The \c data() function returns either a \bold Name or
+    \bold {Address}, based on the contents of the model index
+    supplied. The row number stored in the model index is used to
+    reference an item in the list of pairs. Selection is handled
+    by the QItemSelectionModel, which will be explained with
+    \c AddressWidget.
+
+    \snippet itemviews/addressbook/tablemodel.cpp 2
+
+    The \c headerData() function displays the table's header,
+    \bold Name and \bold Address. If you require numbered entries
+    for your address book, you can use a vertical header which we
+    have hidden in this example (see the \c AddressWidget
+    implementation).
+
+    \snippet itemviews/addressbook/tablemodel.cpp 3
+
+    The \c insertRows() function is called before new data is added,
+    otherwise the data will not be displayed. The
+    \c beginInsertRows() and \c endInsertRows() functions are called
+    to ensure all connected views are aware of the changes.
+
+    \snippet itemviews/addressbook/tablemodel.cpp 4
+
+    The \c removeRows() function is called to remove data. Again,
+    \l{QAbstractItemModel::}{beginRemoveRows()} and
+    \l{QAbstractItemModel::}{endRemoveRows()} are called to ensure
+    all connected views are aware of the changes.
+
+    \snippet itemviews/addressbook/tablemodel.cpp 5
+
+    The \c setData() function is the function that inserts data into
+    the table, item by item and not row by row. This means that to
+    fill a row in the address book, \c setData() must be called
+    twice, as each row has 2 columns. It is important to emit the
+    \l{QAbstractItemModel::}{dataChanged()} signal as it tells all
+    connected views to update their displays.
+
+    \snippet itemviews/addressbook/tablemodel.cpp 6
+
+    The \c flags() function returns the item flags for the given
+    index.
+
+    \snippet itemviews/addressbook/tablemodel.cpp 7
+
+    We set the Qt::ItemIsEditable flag because we want to allow the
+    \c TableModel to be edited. Although for this example we don't
+    use the editing features of the QTableView object, we enable
+    them here so that we can reuse the model in other programs.
+
+    The last function in \c {TableModel}, \c getList() returns the
+    QList<QPair<QString, QString>> object that holds all the
+    contacts in the address book. We use this function later to
+    obtain the list of contacts to check for existing entries, write
+    the contacts to a file and read them back. Further explanation is
+    given with \c AddressWidget.
+
+    \snippet itemviews/addressbook/tablemodel.cpp 8
+
+
+    \section1 AddressWidget Class Definition
+
+    The \c AddressWidget class is technically the main class
+    involved in this example as it provides functions to add, edit
+    and remove contacts, to save the contacts to a file and to load
+    them from a file.
+
+    \snippet itemviews/addressbook/addresswidget.h 0
+
+    \c AddressWidget extends QTabWidget in order to hold 10 tabs
+    (\c NewAddressTab and the 9 alphabet group tabs) and also
+    manipulates \c table, the \c TableModel object, \c proxyModel,
+    the QSortFilterProxyModel object that we use to filter the
+    entries, and \c tableView, the QTableView object.
+
+
+    \section1 AddressWidget Class Implementation
+
+    The \c AddressWidget constructor accepts a parent widget and
+    instantiates \c NewAddressTab, \c TableModel and
+    QSortFilterProxyModel. The \c NewAddressTab object, which is
+    used to indicate that the address book is empty, is added
+    and the rest of the 9 tabs are set up with \c setupTabs().
+
+    \snippet itemviews/addressbook/addresswidget.cpp 0
+
+    The \c setupTabs() function is used to set up the 9 alphabet
+    group tabs, table views and proxy models in
+    \c AddressWidget. Each proxy model in turn is set to filter
+    contact names according to the relevant alphabet group using a
+    \l{Qt::CaseInsensitive}{case-insensitive} QRegExp object. The
+    table views are also sorted in ascending order using the
+    corresponding proxy model's \l{QSortFilterProxyModel::}{sort()}
+    function.
+
+    Each table view's \l{QTableView::}{selectionMode} is set to
+    QAbstractItemView::SingleSelection and
+    \l{QTableView::}{selectionBehavior} is set to
+    QAbstractItemView::SelectRows, allowing the user to select
+    all the items in one row at the same time. Each QTableView object
+    is automatically given a QItemSelectionModel that keeps track
+    of the selected indexes.
+
+    \snippet itemviews/addressbook/addresswidget.cpp 1
+
+    The QItemSelectionModel class provides a
+    \l{QItemSelectionModel::selectionChanged()}{selectionChanged}
+    signal that is connected to \c{AddressWidget}'s
+    \c selectionChanged() signal. This signal to signal connection
+    is necessary to enable the \gui{Edit Entry...} and
+    \gui{Remove Entry} actions in \c MainWindow's Tools menu. This
+    connection is further explained in \c MainWindow's
+    implementation.
+
+    Each table view in the address book is added as a tab to the
+    QTabWidget with the relevant label, obtained from the QStringList
+    of groups.
+
+    \image addressbook-signals.png Signals and Slots Connections
+
+    We provide 2 \c addEntry() functions: 1 which is intended to be
+    used to accept user input, and the other which performs the actual
+    task of adding new entries to the address book. We divide the
+    responsibility of adding entries into two parts to allow
+    \c newAddressTab to  insert data without having to popup a dialog.
+
+    The first \c addEntry() function is a slot connected to the
+    \c MainWindow's \gui{Add Entry...} action. This function creates an
+    \c AddDialog object and then calls the second \c addEntry()
+    function to actually add the contact to \c table.
+
+    \snippet itemviews/addressbook/addresswidget.cpp 2
+
+    Basic validation is done in the second \c addEntry() function to
+    prevent duplicate entries in the address book. As mentioned with
+    \c TableModel, this is part of the reason why we require the
+    getter method \c getList().
+
+    \snippet itemviews/addressbook/addresswidget.cpp 3
+
+    If the model does not already contain an entry with the same name,
+    we call \c setData() to insert the name and address into the
+    first and second columns. Otherwise, we display a QMessageBox
+    to inform the user.
+
+    \note The \c newAddressTab is removed once a contact is added
+    as the address book is no longer empty.
+
+    Editing an entry is a way to update the contact's address only,
+    as the example does not allow the user to change the name of an
+    existing contact.
+
+    Firstly, we obtain the active tab's QTableView object using
+    QTabWidget::currentWidget(). Then we extract the
+    \c selectionModel from the \c tableView to obtain the selected
+    indexes.
+
+    \snippet itemviews/addressbook/addresswidget.cpp 4a
+
+    Next we extract data from the row the user intends to 
+    edit. This data is displayed in an instance of \c AddDialog
+    with a different window title. The \c table is only
+    updated if changes have been made to data in \c aDialog.
+
+    \snippet itemviews/addressbook/addresswidget.cpp 4b
+
+    \image addressbook-editdialog.png Screenshot of Dialog to Edit a Contact
+
+    Entries are removed using the \c removeEntry() function.
+    The selected row is removed by accessing it through the
+    QItemSelectionModel object, \c selectionModel. The
+    \c newAddressTab is re-added to the \c AddressWidget only if
+    the user removes all the contacts in the address book.
+
+    \snippet itemviews/addressbook/addresswidget.cpp 5
+
+    The \c writeToFile() function is used to save a file containing
+    all the contacts in the address book. The file is saved in a
+    custom \c{.dat} format. The contents of the QList of \l{QPair}s
+    are written to \c file using QDataStream. If the file cannot be
+    opened, a QMessageBox is displayed with the related error message.
+
+    \snippet itemviews/addressbook/addresswidget.cpp 6
+
+    The \c readFromFile() function loads a file containing all the
+    contacts in the address book, previously saved using
+    \c writeToFile(). QDataStream is used to read the contents of a
+    \c{.dat} file into a list of pairs and each of these is added
+    using \c addEntry().
+
+    \snippet itemviews/addressbook/addresswidget.cpp 7
+
+
+    \section1 NewAddressTab Class Definition
+
+    The \c NewAddressTab class provides an informative tab telling
+    the user that the address book is empty. It appears and
+    disappears according to the contents of the address book, as
+    mentioned in \c{AddressWidget}'s implementation.
+
+    \image addressbook-newaddresstab.png Screenshot of NewAddressTab
+
+    The \c NewAddressTab class extends QWidget and contains a QLabel
+    and QPushButton.
+
+    \snippet itemviews/addressbook/newaddresstab.h 0
+
+
+    \section1 NewAddressTab Class Implementation
+
+    The constructor instantiates the \c addButton,
+    \c descriptionLabel and connects the \c{addButton}'s signal to
+    the \c{addEntry()} slot.
+
+    \snippet itemviews/addressbook/newaddresstab.cpp 0
+
+    The \c addEntry() function is similar to \c AddressWidget's
+    \c addEntry() in the sense that both functions instantiate an
+    \c AddDialog object. Data from the dialog is extracted and sent
+    to \c AddressWidget's \c addEntry() slot by emitting the
+    \c sendDetails() signal.
+
+    \snippet itemviews/addressbook/newaddresstab.cpp 1
+
+    \image signals-n-slots-aw-nat.png
+
+
+    \section1 AddDialog Class Definition
+
+    The \c AddDialog class extends QDialog and provides the user
+    with a QLineEdit and a QTextEdit to input data into the
+    address book.
+
+    \snippet itemviews/addressbook/adddialog.h 0
+
+    \image addressbook-adddialog.png
+
+
+    \section1 AddDialog Class Implementation
+
+    The \c AddDialog's constructor sets up the user interface,
+    creating the necessary widgets and placing them into layouts.
+
+    \snippet itemviews/addressbook/adddialog.cpp 0
+
+    To give the dialog the desired behavior, we connect the \gui OK
+    and \gui Cancel buttons to the dialog's \l{QDialog::}{accept()} and
+    \l{QDialog::}{reject()} slots. Since the dialog only acts as a
+    container for name and address information, we do not need to
+    implement any other functions for it.
+
+
+    \section1 MainWindow Class Definition
+
+    The \c MainWindow class extends QMainWindow and implements the
+    menus and actions necessary to manipulate the address book.
+
+    \table
+    \row \o \inlineimage addressbook-filemenu.png
+         \o \inlineimage addressbook-toolsmenu.png
+    \endtable
+
+    \snippet itemviews/addressbook/mainwindow.h 0
+
+    The \c MainWindow class uses an \c AddressWidget as its central
+    widget and provides the File menu with \gui Open, \gui Close and
+    \gui Exit actions, as well as the \gui Tools menu with
+    \gui{Add Entry...}, \gui{Edit Entry...} and \gui{Remove Entry}
+    actions.
+
+
+    \section1 MainWindow Class Implementation
+
+    The constructor for \c MainWindow instantiates AddressWidget,
+    sets it as its central widget and calls the \c createMenus()
+    function.
+
+    \snippet itemviews/addressbook/mainwindow.cpp 0
+
+    The \c createMenus() function sets up the \gui File and
+    \gui Tools menus, connecting the actions to their respective slots.
+    Both the \gui{Edit Entry...} and \gui{Remove Entry} actions are
+    disabled by default as such actions cannot be carried out on an empty
+    address book. They are only enabled when one or more contacts
+    are added.
+
+    \snippet itemviews/addressbook/mainwindow.cpp 1a
+    \dots
+    \codeline
+    \snippet itemviews/addressbook/mainwindow.cpp 1b
+
+    Apart from connecting all the actions' signals to their
+    respective slots, we also connect \c AddressWidget's
+    \c selectionChanged() signal to its \c updateActions() slot.
+
+    The \c openFile() function allows the user to choose a file with
+    the \l{QFileDialog::getOpenFileName()}{open file dialog}. The chosen
+    file has to be a custom \c{.dat} file that contains address book
+    contacts. This function is a slot connected to \c openAct in the
+    \gui File menu.
+
+    \snippet itemviews/addressbook/mainwindow.cpp 2
+
+    The \c saveFile() function allows the user to save a file with
+    the \l{QFileDialog::getSaveFileName()}{save file dialog}. This function
+    is a slot connected to \c saveAct in the \gui File menu.
+
+    \snippet itemviews/addressbook/mainwindow.cpp 3
+
+    The \c updateActions() function enables and disables
+    \gui{Edit Entry...} and \gui{Remove Entry} depending on the contents of
+    the address book. If the address book is empty, these actions
+    are disabled; otherwise, they are enabled. This function is a slot
+    is connected to the \c AddressWidget's \c selectionChanged()
+    signal.
+
+    \snippet itemviews/addressbook/mainwindow.cpp 4
+
+
+    \section1 main() Function
+
+    The main function for the address book instantiates QApplication
+    and opens a \c MainWindow before running the event loop.
+
+    \snippet itemviews/addressbook/main.cpp 0
+*/
diff --git a/doc/src/examples/ahigl.qdoc b/doc/src/examples/ahigl.qdoc
new file mode 100644
index 0000000000..d42df662b5
--- /dev/null
+++ b/doc/src/examples/ahigl.qdoc
@@ -0,0 +1,572 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example qws/ahigl
+    \title OpenGL for Embedded Systems Example
+
+    \section1 Introduction
+
+    This example demonstrates how you can use OpenGL for Embedded
+    Systems (ES) in your own screen driver and \l{add your graphics
+    driver to Qt for Embedded Linux}. In \l{Qt for Embedded Linux},
+    painting is done in software, normally performed in two steps:
+    First, each client renders its windows onto its window surface in
+    memory using a paint engine. Then the server uses the screen
+    driver to compose the window surface images and copy the
+    composition to the screen.  (See the \l{Qt for Embedded Linux
+    Architecture} documentation for details.)
+
+    This example is not for the novice. It assumes the reader is
+    familiar with both OpenGL and the screen driver framework
+    demonstrated in the \l {Accelerated Graphics Driver Example}.
+
+    An OpenGL screen driver for Qt for Embedded Linux can use OpenGL ES
+    in three ways. First, the \l{QWSServer}{Qt for Embedded Linux server}
+    can use the driver to compose multiple window images and then show the
+    composition on the screen. Second, clients can use the driver to
+    accelerate OpenGL painting operations using the QOpenGLPaintEngine
+    class. Finally, clients can use the driver to do OpenGL operations
+    with instances of the QGLWidget class. This example implements all
+    three cases.
+
+    The example uses an implementation of OpenGL ES from 
+    \l {http://ati.amd.com}{ATI} for the 
+    \l {http://ati.amd.com/products/imageon238x/}{Imageon 2380}. The
+    OpenGL include files gl.h and egl.h must be installed to compile
+    the example, and the OpenGL and EGL libraries must be installed
+    for linking. If your target device is different, you must install
+    the include files and libraries for that device, and you also
+    might need to modify the example source code, if any API signatures
+    in your EGL library differ from the ones used here.
+
+    After compiling and linking the example source, install the
+    screen driver plugin with the command \c {make install}. To
+    start an application that uses the plugin, you can either set the
+    environment variable \l QWS_DISPLAY and then start the
+    application, or just start the application with the \c -display
+    switch, as follows:
+
+    \snippet doc/src/snippets/code/doc_src_examples_ahigl.qdoc 0
+
+    The example driver also implements an animated transition effect
+    for use when showing new windows or reshowing windows that have
+    been minimized. To enable this transition effect, run the
+    application with \c {-display ahigl:effects}.
+
+    \section1 The Class Definitions
+
+    The example comprises three main classes plus some helper classes.
+    The three main classes are the plugin (QAhiGLScreenPlugin), which
+    is defined in qscreenahiglplugin.cpp, the screen driver
+    (QAhiGLScreen), which is defined in qscreenahigl_qws.h, and the
+    window surface (QAhiGLWindowSurface), which is defined in
+    qwindowsurface_ahigl_p.h. The "Ahi" prefix in these class names
+    stands for \e {ATI Handheld Interface}. The example was written
+    for the ATI Imageon 2380, but it can also be used as a template
+    for other ATI handheld devices.
+
+    \section2 The Plugin Class Definition
+
+    The screen driver plugin is class QAhiGLScreenPlugin.
+
+    \snippet examples/qws/ahigl/qscreenahiglplugin.cpp 0
+
+    QAhiGLScreenPlugin is derived from class QScreenDriverPlugin,
+    which in turn is derived from QObject.
+
+    \section2 The Screen Driver Class Definitions
+
+    The screen driver classes are the public class QAhiGLScreen and
+    its private implementation class QAhiGLScreenPrivate. QAhiGLScreen
+    is derived from QGLScreen, which is derived from QScreen. If your
+    screen driver will only do window compositions and display them,
+    then you can derive your screen driver class directly from
+    QScreen.  But if your screen driver will do accelerated graphics
+    rendering operations with the QOpenGLPaintEngine, or if it will
+    handle instances of class QGLWidget, then you must derive your
+    screen driver class from QGLScreen.
+
+    \snippet examples/qws/ahigl/qscreenahigl_qws.h 0
+
+    All functions in the public API of class QAhiGLScreen are virtual
+    functions declared in its base classes. hasOpenGL() is declared in
+    QGLScreen. It simply returns true indicating our example screen
+    driver does support OpenGL operations.  The other functions in the
+    public API are declared in QScreen.  They are called by the
+    \l{QWSServer}{Qt for Embedded Linux server} at the appropriate times.
+
+    Note that class QScreen is a documented class but class QGLScreen
+    is not. This is because the design of class QGLScreen is not yet
+    final.
+
+    The only data member in class QAhiGLScreen is a standard d_ptr,
+    which points to an instance of the driver's private implementation
+    class QAhiGLScreenPrivate. The driver's internal state is stored
+    in the private class. Using the so-called d-pointer pattern allows
+    you to make changes to the driver's internal design without
+    breaking binary compatibility.
+
+    \snippet examples/qws/ahigl/qscreenahigl_qws.cpp 0
+
+    Class QAhiGLScreenPrivate is derived from QObject so that it can
+    use the Qt signal/slot mechanism. QAhiGLScreen is not a QObject,
+    so it can't use the signal/slot mechanism. Signals meant for our
+    screen driver are received by slots in the private implementation
+    class, in this case, windowEvent() and redrawScreen().
+
+    \section2 The Window Surface Class Definitions
+
+    The window surface classes are QAhiGLWindowSurface and its private
+    implementation class QAhiGLWindowSurfacePrivate. We create class
+    QAhiGLWindowSurface so the screen driver can use the OpenGL paint
+    engine and the OpenGL widget, classes QOpenGLPaintEngine and
+    QGLWidget.  QAhiGLWindowSurface is derived from the more general
+    OpenGL window surface class, QWSGLWindowSurface, which is derived
+    from QWSWindowSurface.
+
+    \snippet examples/qws/ahigl/qwindowsurface_ahigl_p.h 0
+
+    In addition to implementing the standard functionality required by
+    any new subclass of QWSWindowSurface, QAhiGLWindowSurface also
+    contains the textureId() function used by QAhiGLScreen.
+
+    The same d-pointer pattern is used in this window surface class.
+    The private implementation class is QAhiGLWindowSurfacePrivate. It
+    allows making changes to the state variables of the window surface
+    without breaking binary compatibility.
+
+    \snippet examples/qws/ahigl/qwindowsurface_ahigl.cpp 0
+
+    In this case, our private implementation class has no member
+    functions except for its constructor. It contains only public data
+    members which hold state information for the window surface.
+
+    \section2 The Helper Classes
+
+    The example screen driver maintains a static \l {QMap} {map} of
+    all the \l {QWSWindow} {windows} it is showing on the screen.
+    Each window is mapped to an instance of struct WindowInfo.
+
+    \snippet examples/qws/ahigl/qscreenahigl_qws.cpp 2
+
+    As each new window is created, an instance of struct WindowInfo is
+    allocated and inserted into the window map. WindowInfo uses a
+    GLuint to identify the OpenGL texture it creates for the window.
+    Note that the example driver, in addition to drawing windows using
+    OpenGL, also supports drawing windows in the normal way without
+    OpenGL, but it uses an OpenGL texture for the rendering operations
+    in either case.  Top-level windows that are drawn without OpenGL
+    are first rendered in the normal way into a shared memory segment,
+    which is then converted to a OpenGL texture and drawn to the
+    screen.
+
+    To animate the window transition effect, WindowInfo uses an
+    instance of the helper class ShowAnimation.  The animation is
+    created by the windowEvent() slot in QAhiGLScreenPrivate, whenever
+    a \l {QWSServer::WindowEvent} {Show} window event is emitted by
+    the \l {QWSServer} {window server}. The server emits this signal
+    when a window is shown the first time and again later, when the
+    window is reshown after having been minimized.
+
+    \snippet examples/qws/ahigl/qscreenahigl_qws.cpp 1
+
+    Class ShowAnimation is derived from the QTimeLine class, which is
+    used for controlling animations. QTimeLine is a QObject, so
+    ShowAnimation can use the Qt signal/slot mechanism. We will see
+    how the timeline's \l {QTimeLine::valueChanged()} {valueChanged()}
+    and \l {QTimeLine::finished()} {finished()} signals are used to
+    control the animation and then destroy the instance of
+    ShowAnimation, when the animation ends. The ShowAnimation
+    constructor needs the pointer to the screen driver's private
+    implementation class so it can set up these signal/slot
+    connections.
+
+    \section1 The Class Implementations
+
+    \section2 The Plugin Class Implementation
+
+    QAhiGLScreenPlugin is a straightforward derivation of
+    QScreenDriverPlugin.  It reimplements \l{QScreenDriverPlugin::}{keys()}
+    and \l{QScreenDriverPlugin::}{create()}. They are
+    called as needed by the \l{QWSServer}{Qt for Embedded Linux server.}
+    Recall that the server detects that the ahigl screen driver has
+    been requested, either by including "ahigl" in the value for the
+    environment variable QWS_DISPLAY, or by running your application
+    with a command line like the following.
+
+    \snippet doc/src/snippets/code/doc_src_examples_ahigl.qdoc 1
+
+    The server calls \l {QScreenDriverPlugin::} {keys()}, which
+    returns a \l {QStringList} containing the singleton "ahigl"
+    matching the requested screen driver and telling the server that
+    it can use our example screen driver. The server then calls \l
+    {QScreenDriverPlugin::} {create()}, which creates the instance of
+    QAhiGLScreen.
+
+    \snippet examples/qws/ahigl/qscreenahiglplugin.cpp 1
+
+    In the code snippet above, the macro Q_EXPORT_PLUGIN2 is used to export
+    the plugin class, QAhiGLScreen, for the qahiglscreen plugin.
+    Further information regarding plugins and how to create them
+    can be found at \l{How to Create Qt Plugins}.
+
+    \section2 The Screen Driver Class Implementations
+
+    The plugin creates the singleton instance of QAhiGLScreen. The
+    constructor is passed a \c displayId, which is used in the base
+    class QGLScreen to identify the server that the screen driver is
+    connected to. The constructor also creates its instance of
+    QAhiGLScreenPrivate, which instantiates a QTimer. The timeout()
+    signal of this timer is connected to the redrawScreen() slot so
+    the timer can be used to limit the frequency of actual drawing
+    operations in the hardware.
+
+    The public API of class QAhiGLScreen consists of implementations
+    of virtual functions declared in its base classes. The function
+    hasOpenGL() is declared in base class QGLScreen. The others are
+    declared in base class QScreen.
+
+    The \l {QScreen::}{connect()} function is the first one called by
+    the server after the screen driver is constructed. It initializes
+    the QScreen data members to hardcoded values that describe the ATI
+    screen. A better implementation would query the hardware for the
+    corresponding values in its current state and use those. It asks
+    whether the screen driver was started with the \c effects option
+    and sets the \c doEffects flag accordingly.
+
+    \snippet examples/qws/ahigl/qscreenahigl_qws.cpp 7
+
+    The \l {QScreen::}{initDevice()} function is called by the server
+    after \l {QScreen::}{connect()}. It uses EGL library functions to
+    initialize the ATI hardware. Note that some data structures used
+    in this example are specific to the EGL implementation used, e.g.,
+    the DummyScreen structure.
+
+    \snippet examples/qws/ahigl/qscreenahigl_qws.cpp 8
+
+    Note the signal/slot connection at the bottom of initDevice(). We
+    connect the server's QWSServer::windowEvent() signal to the
+    windowEvent() slot in the screen driver's private implementation
+    class.  The windowEvent() slot handles three window events,
+    QWSServer::Create, QWSServer::Destroy, and QWSServer::Show.
+
+    \snippet examples/qws/ahigl/qscreenahigl_qws.cpp 5
+
+    The function manages instances of the helper classes associated
+    with each window.  When a QWSServer::Create event occurs, it means
+    a new top-level \l {QWSWindow} {window} has been created. In this
+    case, an instance of helper class WindowInfo is created and
+    inserted into the window map with the pointer to the new \l
+    {QWSWindow} {window} as its key. When a QWSServer::Destroy event
+    occurs, a window is being destroyed, and its mapping is removed
+    from the window map. These two events are straightforward. The
+    tricky bits happen when a QWSServer::Show event occurs. This case
+    occurs when a window is shown for the first time and when it is
+    reshown after having been minimized. If the window transition
+    effect has been enabled, a new instance of the helper class
+    ShowAnimation is created and stored in a QPointer in the window's
+    instance of WindowInfo. The constructor of ShowAnimation
+    automatically \l {QTimeLine::start()} {starts} the animation of
+    the transition effect.
+
+    \snippet examples/qws/ahigl/qscreenahigl_qws.cpp 3
+
+    To ensure that a ShowAnimation is not deleted until its animation
+    ends, the \l {QTimeLine::finished()} {finished()} signal is
+    connected to the \l {QObject::deleteLater()} {deleteLater()} slot.
+    When the animation ends, the finished() signal is emitted and the
+    deleteLater() slot deletes the ShowAnimation. The key here is that
+    the pointer to the ShowAnimation is stored in a QPointer in the
+    WindowInfo class. This QPointer will also be notified when the
+    ShowAnimation is deleted, so the QPointer in WindowInfo can null
+    itself out, if and only if it is still pointing to the instance
+    of ShowAnimation being deleted.
+
+    The \l {QTimeLine::valueForTime()} {valueForTime()} function in
+    QTimeLine is reimplemented in ShowAnimation to return time values
+    that represent a curved path for the window transition effect.
+
+    \snippet examples/qws/ahigl/qscreenahigl_qws.cpp 4
+
+    valueForTime() is called internally, when the time interval it
+    computed during the previous call has elapsed. If it computes a
+    next time value that is different from the one computed
+    previously, the \l {QTimeLine::valueChanged()} {valueChanged()}
+    signal is emitted.  The ShowAnimation constructor shown above
+    connects this signal to the redrawScreen() slot in the screen
+    driver's private implementation class. This is how the animation
+    actually happens.
+
+    The screen driver's implementation of \l {QScreen::}
+    {exposeRegion()} is where the main work of the screen driver is
+    meant to be done, i.e., updating the screen. It is called by the
+    \l {QWSServer} {window system} to update a particular window's
+    region of the screen. But note that it doesn't actually update the
+    screen, i.e., it doesn't actually call redrawScreen() directly,
+    but starts the updateTimer, which causes redrawScreen() to be
+    called once for each updateTimer interval. This means that all
+    calls to exposeRegion() during an updateTimer interval are handled
+    by a single call to redrawScreen(). Thus updateTimer can be used
+    to limit the frequency of screen updates.
+
+    \snippet examples/qws/ahigl/qscreenahigl_qws.cpp 13
+
+    The call to the private function invalidateTexture() destroys
+    the window's existing texture (image). This ensures that a new
+    texture will be created for the window, when redrawScreen() is
+    eventually called.
+
+    But there is a caveat to using updateTimer to limit the frequency
+    of screen updates. When the driver's animated transition effect
+    for new windows is enabled and a new window is being shown for the
+    first time or reshown after having been minimized, an instance of
+    ShowAnimation is created to run the animation. The valueChanged()
+    signal of this ShowAnimation is also connected to the
+    redrawScreen() slot, and QTimeLine, the base class of our
+    ShowAnimation, uses its own, internal timer to limit the speed of
+    the animation. This means that in the driver as currently written,
+    if the window transition effect is enabled (i.e. if the plugin is
+    started, with \c {-display ahigl:effects}), then redrawScreen()
+    can be called both when the update timer times out and when the
+    ShowAnimation timer times out, so the screen might get updated
+    more often than the frequency established by the update timer.
+    This may or may not be a bug, depending on your own hardware, if
+    you use this example as a template for your own OpenGL driver.
+
+    The screen driver's private function redrawScreen() constructs
+    the window compositions. It is called only by the function of the
+    same name in the screen driver's private implementation class.
+
+    \snippet examples/qws/ahigl/qscreenahigl_qws.cpp 6
+
+    Recall that this redrawScreen() in the private implementation
+    class is a slot function connected to two signals, the \c
+    timeout() signal of the updateTimer in the private implementation
+    class, and the valueChanged() signal of the helper class
+    ShowAnimation. Thus, the screen is only ever updated when a
+    timeout of one of the two timers occurs. This is important for two
+    reasons. First, the screen is meant to be updated no more than
+    once per updateTimer interval. Second, however, if the animated
+    window transition effect is requested, the screen might be updated
+    more often than that, and this might be a bug if the hardware
+    can't handle more frequent updates.
+
+    The redrawScreen() in QAhiGLScreen begins by using standard
+    OpenGL to fill the screen with the background color.
+
+    \snippet examples/qws/ahigl/qscreenahigl_qws.cpp 10
+
+    Next it iterates over the list of all \l {QWSWindow} {client
+    windows} obtained from the \l {QWSServer} {server}, extracting
+    from each window its instance of QWSWIndowSurface, then using that
+    window surface to create an OpenGL texture, and finally calling
+    the helper function drawWindow() to draw the texture on the
+    screen.
+
+    \snippet examples/qws/ahigl/qscreenahigl_qws.cpp 11
+
+    Note the call to glBindTexture() immediately before the call to
+    drawWindow(). This call binds the identifer \c GL_TEXTURE_2D to
+    the texture we have just created. This makes our texture
+    accessible to functions in the OpenGL libraries. If you miss that
+    point, digging into the internals of drawWindow() won't make much
+    sense.
+
+    Finally, the cursor is added to the window composition, and in the
+    last statement, the whole thing is displayed on the screen.
+
+    \snippet examples/qws/ahigl/qscreenahigl_qws.cpp 12
+
+    The call to \c drawWindow(win,progress), in addition to passing a
+    pointer to the window to be redrawn, also passes the \c progress
+    parameter obtained by calling \l {QTimeLine::currentValue()} on
+    the window's instance of ShowAnimation. Recall that the current
+    value of the timeline is updated internally by a timer local to
+    the timeline, and the redrawScreen() slot is called whenever the
+    current value changes. The progress value will only be used if
+    the animated transition effect has been enabled. These extra calls
+    of redrawScreen() may cause the screen to be updated more often
+    than the rate determined by updateTimer. This must be taken
+    into account, if you set your updateTimer to timeout at the
+    maximum screen update frequency your hardware can handle.
+
+    The drawWindow() function is not shown here and not explained
+    further, but the call to drawWindow() is the entry point to a
+    hierarchy of private helper functions that execute sequences of
+    OpenGL and EGL library calls. The reader is assumed to be familiar
+    enough with the OpenGL and EGL APIs to understand the code in
+    these helper functions on his own. Besides drawWindow(), the list
+    of these helper functions includes drawQuad(), drawQuadWavyFlag(),
+    the two overloadings of drawQuad_helper() (used by drawQuad() and
+    drawQuadWacyFlag()), and setRectCoords().
+
+    Note the two different ways the window's texture can be created in
+    redrawScreen(). If the window surface is an OpenGL window surface
+    (QAhiGLWindowSurface described below), the texture is obtained
+    from the window surface directly by calling its textureId()
+    function. But when the window surface is not an OpenGL one, the
+    static function createTexture() is called with the window
+    surface's \l {QImage} {image} to copy that image into an OpenGL
+    texture. This is done with the EGL functions glTexImage2D() and
+    glTexSubImage2D(). createTexture() is another function that
+    should be understandable for exsperienced OpenGL users, so it is
+    not shown or explained further here.
+
+    The two implementations of \l {QScreen::}{createSurface()} are for
+    instantiating new window surfaces. The overloading with the widget 
+    parameter is called in the client.
+
+    \snippet examples/qws/ahigl/qscreenahigl_qws.cpp 14
+
+    If the parameter is an \l {QGLWidget} {OpenGL widget}, or, when it
+    isn't an OpenGL widget but its size is no bigger than 256 x 256,
+    we instantiate our subclass QAhiGLWindowSurface.  Otherwise, we
+    instantiate a QWSWindowSurface. The size contraint is a
+    limitation of the OpenGL ES libraries we are using for our ATI
+    device.
+
+    Note the test at the top of the function asking if our application
+    process is the \l {QApplication::GuiServer} {server}.  We only
+    create instances of QAhiGLWindowSurface if our client is in the
+    server process. This is because of an implementation restriction
+    required by the OpenGL library used in the example. They only
+    support use of OpenGL in the server process. Hence a client can
+    use the QAhiGLWindowSurface if the client is in the server
+    process.
+
+    The other overloading of createSurface() is called by the
+    server to create a window surface that will hold a copy of a
+    client side window surface.
+
+    \snippet examples/qws/ahigl/qscreenahigl_qws.cpp 15
+
+    This overloading accepts a QString parameter identifying the type
+    of window surface to instantiate. QAhiGLWindowSurface is
+    instantiated if the parameter is \c ahigl. Otherwise, a normal
+    QWSWindowSurface is instantiated. The client's window surface
+    communicates its image data to the server's window surface through
+    shared memory.
+
+    The implementation of \l {QScreen::}{setMode()}, is a stub in this
+    example. It would normally reset the frame buffer's resolution.
+    Its parameters are the \e width, \e height, and the bit \e depth
+    for the frame buffer's new resolution. If you implement setMode()
+    in your screen driver, remember that it must emit a signal to warn
+    other applications to redraw their frame buffers with the new
+    resolution.  There is no significance to setMode() not being
+    implemented in this example. It simply wasn't implemented.
+    However, the stub had to be included because QScreen declares
+    setMode() to be pure virtual.
+
+    Before the application exits, the server will call \l {QScreen::}
+    {shutdownDevice()} to release the hardware resources. This is also
+    done using EGL library functions.
+
+    \snippet examples/qws/ahigl/qscreenahigl_qws.cpp 9
+
+    The server will also call \l {QScreen::}{disconnect()}, but this
+    function is only a stub in this example.
+
+    \section2 The window Surface Class Implementations    
+
+    QAhiGLScreen creates instances of QAhiGLWindowSurface in its two
+    createSurface() functions, and there are two constructors for
+    QAhiGLWindowSurface that correspond to these two versions of
+    createSurface(). The constructor accepting a \l {QWidget} {widget}
+    parameter is called by the client side version of createSurface(),
+    and the constructor without the \l {QWidget} {widget} parameter is
+    called by the server side version. There will be a window surface
+    constructed on the server side for each one constructed on the
+    client side.
+
+    \snippet examples/qws/ahigl/qwindowsurface_ahigl.cpp 1
+    \codeline
+    \snippet examples/qws/ahigl/qwindowsurface_ahigl.cpp 2
+
+    The constructors create an instance of QAhiGLWindowSurfacePrivate,
+    the private implementation class, which contains all the state
+    variables for QAhiGLWindowSurface. The client side constructor
+    also creates an instance of QWSGLPaintDevice, the OpenGL paint
+    device, for return by \l {QWSWindowSurface::} {paintDevice()}.
+    This ensures that all \l {QPainter}s used on this surface will use
+    an OpenGL enabled QPaintEngine. It is a bit of jiggery pokery,
+    which is required because \l {QWSWindowSurface::} {paintDevice()}
+    is declared pure virtual. Normally, the client side constructor
+    will be called with an \l {QGLWidget}{OpenGL widget}, which has
+    its own \l {QWidget::} {paintEngine()} function that returns the
+    global static OpenGL paint engine, but because the constructor
+    also accepts a normal \l {QWidget}{widget}, it must be able to
+    find the OpenGL paint engine in that case as well, so since \l
+    {QWSWindowSurface::} {paintDevice()} must be implemented anyway,
+    the constructor creates an instance of QWSGLPaintDevice, which can
+    always return the global static pointer to QOpenGLPaintEngine.
+
+    The OpenGL library implementation used for this example only
+    supports one OpenGL context. This context is therefore shared
+    among the single instance of QAhiGLScreen and all instances of
+    QAhiGLWindowSurface. It is passed to both constructors.
+
+    This example uses the OpenGL frame buffer object extension, which
+    allows for accelerating OpenGL painting operations. Using this
+    OpenGL extension, painting operations are performed in a frame
+    buffer object, which QAhiGLScreen later uses to construct window
+    compositions on the screen. Allocation of the frame buffer object
+    is performed in \l {QWindowSurface::} {setGeometry()}. A safer way
+    to use this extension would be to first test to see if the
+    extension is supported by your OpenGL library, and use a different
+    approach if it is not.
+
+    \snippet examples/qws/ahigl/qwindowsurface_ahigl.cpp 3
+
+    Since there can be several instances of the QAhiGLWindowSurface, we need
+    to make sure that the correct framebuffer object is active before painting.
+    This is done by reimplementing \l QWindowSurface::beginPaint():
+
+    \snippet examples/qws/ahigl/qwindowsurface_ahigl.cpp 4
+
+    Finally we need to make sure that whenever a widget grows beyond the size
+    supported by this driver (256 x 256), the surface is deleted and a new
+    standard surface is created instead. This is handled by reimplementing
+    \l QWSWindowSurface::isValid():    
+
+    \snippet examples/qws/ahigl/qwindowsurface_ahigl.cpp 5
+*/
diff --git a/doc/src/examples/analogclock.qdoc b/doc/src/examples/analogclock.qdoc
new file mode 100644
index 0000000000..d5f7273b6a
--- /dev/null
+++ b/doc/src/examples/analogclock.qdoc
@@ -0,0 +1,168 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example widgets/analogclock
+    \title Analog Clock Example
+
+    The Analog Clock example shows how to draw the contents of a custom
+    widget.
+
+    \image analogclock-example.png Screenshot of the Analog Clock example
+
+    This example also demonstrates how the transformation and scaling
+    features of QPainter can be used to make drawing custom widgets
+    easier.
+
+    \section1 AnalogClock Class Definition
+
+    The \c AnalogClock class provides a clock widget with hour and minute
+    hands that is automatically updated every few seconds.
+    We subclass \l QWidget and reimplement the standard
+    \l{QWidget::paintEvent()}{paintEvent()} function to draw the clock face:
+
+    \snippet examples/widgets/analogclock/analogclock.h 0
+
+    \section1 AnalogClock Class Implementation
+
+    \snippet examples/widgets/analogclock/analogclock.cpp 1
+
+    When the widget is constructed, we set up a one-second timer to
+    keep track of the current time, and we connect it to the standard
+    \l{QWidget::update()}{update()} slot so that the clock face is
+    updated when the timer emits the \l{QTimer::timeout()}{timeout()}
+    signal.
+
+    Finally, we resize the widget so that it is displayed at a
+    reasonable size.
+
+    \snippet examples/widgets/analogclock/analogclock.cpp 8
+    \snippet examples/widgets/analogclock/analogclock.cpp 10
+
+    The \c paintEvent() function is called whenever the widget's
+    contents need to be updated. This happens when the widget is
+    first shown, and when it is covered then exposed, but it is also
+    executed when the  widget's \l{QWidget::update()}{update()} slot
+    is called. Since we connected the timer's
+    \l{QTimer::timeout()}{timeout()} signal to this slot, it will be
+    called at least once every five seconds.
+
+    Before we set up the painter and draw the clock, we first define
+    two lists of \l {QPoint}s and two \l{QColor}s that will be used
+    for the hour and minute hands. The minute hand's color has an
+    alpha component of 191, meaning that it's 75% opaque.
+
+    We also determine the length of the widget's shortest side so that we
+    can fit the clock face inside the widget. It is also useful to determine
+    the current time before we start drawing.
+
+    \snippet examples/widgets/analogclock/analogclock.cpp 11
+    \snippet examples/widgets/analogclock/analogclock.cpp 12
+    \snippet examples/widgets/analogclock/analogclock.cpp 13
+    \snippet examples/widgets/analogclock/analogclock.cpp 14
+
+    The contents of custom widgets are drawn with a QPainter.
+    Painters can be used to draw on any QPaintDevice, but they are
+    usually used with widgets, so we pass the widget instance to the
+    painter's constructor.
+
+    We call QPainter::setRenderHint() with QPainter::Antialiasing to
+    turn on antialiasing. This makes drawing of diagonal lines much
+    smoother.
+
+    The translation moves the origin to the center of the widget, and
+    the scale operation ensures that the following drawing operations
+    are scaled to fit within the widget. We use a scale factor that
+    let's us use x and y coordinates between -100 and 100, and that
+    ensures that these lie within the length of the widget's shortest
+    side.
+
+    To make our code simpler, we will draw a fixed size clock face that will
+    be positioned and scaled so that it lies in the center of the widget.
+
+    The painter takes care of all the transformations made during the
+    paint event, and ensures that everything is drawn correctly. Letting
+    the painter handle transformations is often easier than performing
+    manual calculations just to draw the contents of a custom widget.
+
+    \img analogclock-viewport.png
+
+    We draw the hour hand first, using a formula that rotates the coordinate
+    system counterclockwise by a number of degrees determined by the current
+    hour and minute. This means that the hand will be shown rotated clockwise
+    by the required amount.
+
+    \snippet examples/widgets/analogclock/analogclock.cpp 15
+    \snippet examples/widgets/analogclock/analogclock.cpp 16
+
+    We set the pen to be Qt::NoPen because we don't want any outline,
+    and we use a solid brush with the color appropriate for
+    displaying hours. Brushes are used when filling in polygons and
+    other geometric shapes.
+
+    \snippet examples/widgets/analogclock/analogclock.cpp 17
+    \snippet examples/widgets/analogclock/analogclock.cpp 19
+
+    We save and restore the transformation matrix before and after the
+    rotation because we want to place the minute hand without having to
+    take into account any previous rotations.
+
+    \snippet examples/widgets/analogclock/analogclock.cpp 20
+    \codeline
+    \snippet examples/widgets/analogclock/analogclock.cpp 21
+
+    We draw markers around the edge of the clock for each hour. We
+    draw each marker then rotate the coordinate system so that the
+    painter is ready for the next one.
+
+    \snippet examples/widgets/analogclock/analogclock.cpp 22
+    \snippet examples/widgets/analogclock/analogclock.cpp 23
+
+    The minute hand is rotated in a similar way to the hour hand.
+
+    \snippet examples/widgets/analogclock/analogclock.cpp 25
+    \codeline
+    \snippet examples/widgets/analogclock/analogclock.cpp 26
+
+    Again, we draw markers around the edge of the clock, but this
+    time to indicate minutes. We skip multiples of 5 to avoid drawing
+    minute markers on top of hour markers.
+*/
diff --git a/doc/src/examples/application.qdoc b/doc/src/examples/application.qdoc
new file mode 100644
index 0000000000..32e8c10d2a
--- /dev/null
+++ b/doc/src/examples/application.qdoc
@@ -0,0 +1,410 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example mainwindows/application
+    \title Application Example
+
+    The Application example shows how to implement a standard GUI
+    application with menus, toolbars, and a status bar. The example
+    itself is a simple text editor program built around QTextEdit.
+
+    \image application.png Screenshot of the Application example
+
+    Nearly all of the code for the Application example is in the \c
+    MainWindow class, which inherits QMainWindow. QMainWindow
+    provides the framework for windows that have menus, toolbars,
+    dock windows, and a status bar. The application provides
+    \menu{File}, \menu{Edit}, and \menu{Help} entries in the menu
+    bar, with the following popup menus:
+
+    \image application-menus.png The Application example's menu system
+
+    The status bar at the bottom of the main window shows a
+    description of the menu item or toolbar button under the cursor.
+
+    To keep the example simple, recently opened files aren't shown in
+    the \menu{File} menu, even though this feature is desired in 90%
+    of applications. The \l{mainwindows/recentfiles}{Recent Files}
+    example shows how to implement this. Furthermore, this example
+    can only load one file at a time. The \l{mainwindows/sdi}{SDI}
+    and \l{mainwindows/mdi}{MDI} examples shows how to lift these
+    restrictions.
+
+    \section1 MainWindow Class Definition
+
+    Here's the class definition:
+
+    \snippet examples/mainwindows/application/mainwindow.h 0
+
+    The public API is restricted to the constructor. In the \c
+    protected section, we reimplement QWidget::closeEvent() to detect
+    when the user attempts to close the window, and warn the user
+    about unsaved changes. In the \c{private slots} section, we
+    declare slots that correspond to menu entries, as well as a
+    mysterious \c documentWasModified() slot. Finally, in the \c
+    private section of the class, we have various members that will
+    be explained in due time.
+
+    \section1 MainWindow Class Implementation
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 0
+
+    We start by including \c <QtGui>, a header file that contains the
+    definition of all classes in the \l QtCore and \l QtGui
+    libraries. This saves us from the trouble of having to include
+    every class individually. We also include \c mainwindow.h.
+
+    You might wonder why we don't include \c <QtGui> in \c
+    mainwindow.h and be done with it. The reason is that including
+    such a large header from another header file can rapidly degrade
+    performances. Here, it wouldn't do any harm, but it's still
+    generally a good idea to include only the header files that are
+    strictly necessary from another header file.
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 1
+    \snippet examples/mainwindows/application/mainwindow.cpp 2
+
+    In the constructor, we start by creating a QTextEdit widget as a
+    child of the main window (the \c this object). Then we call
+    QMainWindow::setCentralWidget() to tell that this is going to be
+    the widget that occupies the central area of the main window,
+    between the toolbars and the status bar.
+
+    Then we call \c createActions(), \c createMenus(), \c
+    createToolBars(), and \c createStatusBar(), four private
+    functions that set up the user interface. After that, we call \c
+    readSettings() to restore the user's preferences.
+
+    We establish a signal-slot connection between the QTextEdit's
+    document object and our \c documentWasModified() slot. Whenever
+    the user modifies the text in the QTextEdit, we want to update
+    the title bar to show that the file was modified.
+
+    At the end, we set the window title using the private
+    \c setCurrentFile() function. We'll come back to this later.
+
+    \target close event handler
+    \snippet examples/mainwindows/application/mainwindow.cpp 3
+    \snippet examples/mainwindows/application/mainwindow.cpp 4
+
+    When the user attempts to close the window, we call the private
+    function \c maybeSave() to give the user the possibility to save
+    pending changes. The function returns true if the user wants the
+    application to close; otherwise, it returns false. In the first
+    case, we save the user's preferences to disk and accept the close
+    event; in the second case, we ignore the close event, meaning
+    that the application will stay up and running as if nothing
+    happened.
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 5
+    \snippet examples/mainwindows/application/mainwindow.cpp 6
+
+    The \c newFile() slot is invoked when the user selects
+    \menu{File|New} from the menu. We call \c maybeSave() to save any
+    pending changes and if the user accepts to go on, we clear the
+    QTextEdit and call the private function \c setCurrentFile() to
+    update the window title and clear the
+    \l{QWidget::windowModified}{windowModified} flag.
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 7
+    \snippet examples/mainwindows/application/mainwindow.cpp 8
+
+    The \c open() slot is invoked when the user clicks
+    \menu{File|Open}. We pop up a QFileDialog asking the user to
+    choose a file. If the user chooses a file (i.e., \c fileName is
+    not an empty string), we call the private function \c loadFile()
+    to actually load the file.
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 9
+    \snippet examples/mainwindows/application/mainwindow.cpp 10
+
+    The \c save() slot is invoked when the user clicks
+    \menu{File|Save}. If the user hasn't provided a name for the file
+    yet, we call \c saveAs(); otherwise, we call the private function
+    \c saveFile() to actually save the file.
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 11
+    \snippet examples/mainwindows/application/mainwindow.cpp 12
+
+    In \c saveAs(), we start by popping up a QFileDialog asking the
+    user to provide a name. If the user clicks \gui{Cancel}, the
+    returned file name is empty, and we do nothing.
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 13
+    \snippet examples/mainwindows/application/mainwindow.cpp 14
+
+    The application's About box is done using one statement, using
+    the QMessageBox::about() static function and relying on its
+    support for an HTML subset.
+
+    The \l{QObject::tr()}{tr()} call around the literal string marks
+    the string for translation. It is a good habit to call
+    \l{QObject::tr()}{tr()} on all user-visible strings, in case you
+    later decide to translate your application to other languages.
+    The \l{Internationalization with Qt} overview convers
+    \l{QObject::tr()}{tr()} in more detail.
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 15
+    \snippet examples/mainwindows/application/mainwindow.cpp 16
+
+    The \c documentWasModified() slot is invoked each time the text
+    in the QTextEdit changes because of user edits. We call
+    QWidget::setWindowModified() to make the title bar show that the
+    file was modified. How this is done varies on each platform.
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 17
+    \snippet examples/mainwindows/application/mainwindow.cpp 18
+    \dots
+    \snippet examples/mainwindows/application/mainwindow.cpp 22
+
+    The \c createActions() private function, which is called from the
+    \c MainWindow constructor, creates \l{QAction}s. The code is very
+    repetitive, so we show only the actions corresponding to
+    \menu{File|New}, \menu{File|Open}, and \menu{Help|About Qt}.
+
+    A QAction is an object that represents one user action, such as
+    saving a file or invoking a dialog. An action can be put in a
+    QMenu or a QToolBar, or both, or in any other widget that
+    reimplements QWidget::actionEvent().
+
+    An action has a text that is shown in the menu, an icon, a
+    shortcut key, a tooltip, a status tip (shown in the status bar),
+    a "What's This?" text, and more. It emits a
+    \l{QAction::triggered()}{triggered()} signal whenever the user
+    invokes the action (e.g., by clicking the associated menu item or
+    toolbar button). We connect this signal to a slot that performs
+    the actual action.
+
+    The code above contains one more idiom that must be explained.
+    For some of the actions, we specify an icon as a QIcon to the
+    QAction constructor. The QIcon constructor takes the file name
+    of an image that it tries to load. Here, the file name starts
+    with \c{:}. Such file names aren't ordinary file names, but
+    rather path in the executable's stored resources. We'll come back
+    to this when we review the \c application.qrc file that's part of
+    the project.
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 23
+    \snippet examples/mainwindows/application/mainwindow.cpp 24
+
+    The \gui{Edit|Cut} and \gui{Edit|Copy} actions must be available
+    only when the QTextEdit contains selected text. We disable them
+    by default and connect the QTextEdit::copyAvailable() signal to
+    the QAction::setEnabled() slot, ensuring that the actions are
+    disabled when the text editor has no selection.
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 25
+    \snippet examples/mainwindows/application/mainwindow.cpp 27
+
+    Creating actions isn't sufficient to make them available to the
+    user; we must also add them to the menu system. This is what \c
+    createMenus() does. We create a \menu{File}, an \menu{Edit}, and
+    a \menu{Help} menu. QMainWindow::menuBar() lets us access the
+    window's menu bar widget. We don't have to worry about creating
+    the menu bar ourselves; the first time we call this function, the
+    QMenuBar is created.
+
+    Just before we create the \menu{Help} menu, we call
+    QMenuBar::addSeparator(). This has no effect for most widget
+    styles (e.g., Windows and Mac OS X styles), but for Motif-based
+    styles this makes sure that \menu{Help} is pushed to the right
+    side of the menu bar. Try running the application with various
+    styles and see the results:
+
+    \snippet doc/src/snippets/code/doc_src_examples_application.qdoc 0
+
+    Let's now review the toolbars:
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 30
+
+    Creating toolbars is very similar to creating menus. The same
+    actions that we put in the menus can be reused in the toolbars.
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 32
+    \snippet examples/mainwindows/application/mainwindow.cpp 33
+
+    QMainWindow::statusBar() returns a pointer to the main window's
+    QStatusBar widget. Like with \l{QMainWindow::menuBar()}, the
+    widget is automatically created the first time the function is
+    called.
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 34
+    \snippet examples/mainwindows/application/mainwindow.cpp 36
+
+    The \c readSettings() function is called from the constructor to
+    load the user's preferences and other application settings. The
+    QSettings class provides a high-level interface for storing
+    settings permanently on disk. On Windows, it uses the (in)famous
+    Windows registry; on Mac OS X, it uses the native XML-based
+    CFPreferences API; on Unix/X11, it uses text files.
+
+    The QSettings constructor takes arguments that identify your
+    company and the name of the product. This ensures that the
+    settings for different applications are kept separately.
+
+    We use QSettings::value() to extract the value of the "pos" and
+    "size" settings. The second argument to QSettings::value() is
+    optional and specifies a default value for the setting if there
+    exists none. This value is used the first time the application is
+    run.
+
+    When restoring the position and size of a window, it's important
+    to call QWidget::resize() before QWidget::move(). The reason why
+    is given in the \l{geometry.html}{Window Geometry} overview.
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 37
+    \snippet examples/mainwindows/application/mainwindow.cpp 39
+
+    The \c writeSettings() function is called from \c closeEvent().
+    Writing settings is similar to reading them, except simpler. The
+    arguments to the QSettings constructor must be the same as in \c
+    readSettings().
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 40
+    \snippet examples/mainwindows/application/mainwindow.cpp 41
+
+    The \c maybeSave() function is called to save pending changes. If
+    there are pending changes, it pops up a QMessageBox giving the
+    user to save the document. The options are QMessageBox::Yes,
+    QMessageBox::No, and QMessageBox::Cancel. The \gui{Yes} button is
+    made the default button (the button that is invoked when the user
+    presses \key{Return}) using the QMessageBox::Default flag; the
+    \gui{Cancel} button is made the escape button (the button that is
+    invoked when the user presses \key{Esc}) using the
+    QMessageBox::Escape flag.
+
+    The \c maybeSave() function returns \c true in all cases, except
+    when the user clicks \gui{Cancel}. The caller must check the
+    return value and stop whatever it was doing if the return value
+    is \c false.
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 42
+    \snippet examples/mainwindows/application/mainwindow.cpp 43
+
+    In \c loadFile(), we use QFile and QTextStream to read in the
+    data. The QFile object provides access to the bytes stored in a
+    file.
+
+    We start by opening the file in read-only mode. The QFile::Text
+    flag indicates that the file is a text file, not a binary file.
+    On Unix and Mac OS X, this makes no difference, but on Windows,
+    it ensures that the "\\r\\n" end-of-line sequence is converted to
+    "\\n" when reading.
+
+    If we successfully opened the file, we use a QTextStream object
+    to read in the data. QTextStream automatically converts the 8-bit
+    data into a Unicode QString and supports various encodings. If no
+    encoding is specified, QTextStream assumes the file is written
+    using the system's default 8-bit encoding (for example, Latin-1;
+    see QTextCodec::codecForLocale() for details).
+
+    Since the call to QTextStream::readAll() might take some time, we
+    set the cursor to be Qt::WaitCursor for the entire application
+    while it goes on.
+
+    At the end, we call the private \c setCurrentFile() function,
+    which we'll cover in a moment, and we display the string "File
+    loaded" in the status bar for 2 seconds (2000 milliseconds).
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 44
+    \snippet examples/mainwindows/application/mainwindow.cpp 45
+
+    Saving a file is very similar to loading one. Here, the
+    QFile::Text flag ensures that on Windows, "\\n" is converted into
+    "\\r\\n" to conform to the Windows convension.
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 46
+    \snippet examples/mainwindows/application/mainwindow.cpp 47
+
+    The \c setCurrentFile() function is called to reset the state of
+    a few variables when a file is loaded or saved, or when the user
+    starts editing a new file (in which case \c fileName is empty).
+    We update the \c curFile variable, clear the
+    QTextDocument::modified flag and the associated \c
+    QWidget:windowModified flag, and update the window title to
+    contain the new file name (or \c untitled.txt).
+
+    The \c strippedName() function call around \c curFile in the
+    QWidget::setWindowTitle() call shortens the file name to exclude
+    the path. Here's the function:
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 48
+    \snippet examples/mainwindows/application/mainwindow.cpp 49
+
+    \section1 The main() Function
+
+    The \c main() function for this application is typical of
+    applications that contain one main window:
+
+    \snippet examples/mainwindows/application/main.cpp 0
+
+    \section1 The Resource File
+
+    As you will probably recall, for some of the actions, we
+    specified icons with file names starting with \c{:} and mentioned
+    that such file names aren't ordinary file names, but path in the
+    executable's stored resources. These resources are compiled
+
+    The resources associated with an application are specified in a
+    \c .qrc file, an XML-based file format that lists files on the
+    disk. Here's the \c application.qrc file that's used by the
+    Application example:
+
+    \quotefile mainwindows/application/application.qrc
+
+    The \c .png files listed in the \c application.qrc file are files
+    that are part of the Application example's source tree. Paths are
+    relative to the directory where the \c application.qrc file is
+    located (the \c mainwindows/application directory).
+
+    The resource file must be mentioned in the \c application.pro
+    file  so that \c qmake knows about it:
+
+    \snippet examples/mainwindows/application/application.pro 0
+
+    \c qmake will produce make rules to generate a file called \c
+    qrc_application.cpp that is linked into the application. This
+    file contains all the data for the images and other resources as
+    static C++ arrays of compressed binary data. See
+    \l{resources.html}{The Qt Resource System} for more information
+    about resources.
+*/
diff --git a/doc/src/examples/arrowpad.qdoc b/doc/src/examples/arrowpad.qdoc
new file mode 100644
index 0000000000..76b753b960
--- /dev/null
+++ b/doc/src/examples/arrowpad.qdoc
@@ -0,0 +1,237 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example linguist/arrowpad
+    \title Arrow Pad Example
+
+    This example is a slightly more involved and introduces a key \e
+    {Qt Linguist} concept: "contexts". It also shows how to use two
+    or more languages.
+
+    \image linguist-arrowpad_en.png
+
+    We will use two translations, French and Dutch, although there is no
+    effective limit on the number of possible translations that can be used
+    with an application. The relevant lines of \c arrowpad.pro are
+
+    \snippet examples/linguist/arrowpad/arrowpad.pro 0
+    \codeline
+    \snippet examples/linguist/arrowpad/arrowpad.pro 1
+
+    Run \c lupdate; it should produce two identical message files
+    \c arrowpad_fr.ts and \c arrowpad_nl.ts. These files will contain all the source
+    texts marked for translation with \c tr() calls and their contexts.
+
+    See the \l{Qt Linguist manual} for more information about
+    translating Qt application.
+
+    \section1 Line by Line Walkthrough
+
+    In \c arrowpad.h we define the \c ArrowPad subclass which is a
+    subclass of QWidget. In the screenshot above, the central
+    widget with the four buttons is an \c ArrowPad.
+
+    \snippet examples/linguist/arrowpad/arrowpad.h 0
+    \snippet examples/linguist/arrowpad/arrowpad.h 1
+    \snippet examples/linguist/arrowpad/arrowpad.h 2
+
+    When \c lupdate is run it not only extracts the source texts but it
+    also groups them into contexts. A context is the name of the class in
+    which the source text appears. Thus, in this example, "ArrowPad" is a
+    context: it is the context of the texts in the \c ArrowPad class. 
+    The \c Q_OBJECT macro defines \c tr(x) in \c ArrowPad like this:
+
+    \snippet doc/src/snippets/code/doc_src_examples_arrowpad.qdoc 0
+
+    Knowing which class each source text appears in enables \e {Qt
+    Linguist} to group texts that are logically related together, e.g.
+    all the text in a dialog will have the context of the dialog's class
+    name and will be shown together. This provides useful information for
+    the translator since the context in which text appears may influence how
+    it should be translated. For some translations keyboard
+    accelerators may need to be changed and having all the source texts in a
+    particular context (class) grouped together makes it easier for the
+    translator to perform any accelerator changes without introducing
+    conflicts.
+
+    In \c arrowpad.cpp we implement the \c ArrowPad class.
+
+    \snippet examples/linguist/arrowpad/arrowpad.cpp 0
+    \snippet examples/linguist/arrowpad/arrowpad.cpp 1
+    \snippet examples/linguist/arrowpad/arrowpad.cpp 2
+    \snippet examples/linguist/arrowpad/arrowpad.cpp 3
+
+    We call \c ArrowPad::tr() for each button's label since the labels are
+    user-visible text.
+
+    \image linguist-arrowpad_en.png
+
+    \snippet examples/linguist/arrowpad/mainwindow.h 0
+    \snippet examples/linguist/arrowpad/mainwindow.h 1
+
+    In the screenshot above, the whole window is a \c MainWindow.
+    This is defined in the \c mainwindow.h header file. Here too, we
+    use \c Q_OBJECT, so that \c MainWindow will become a context in
+    \e {Qt Linguist}.
+
+    \snippet examples/linguist/arrowpad/mainwindow.cpp 0
+
+    In the implementation of \c MainWindow, \c mainwindow.cpp, we create
+    an instance of our \c ArrowPad class.
+
+    \snippet examples/linguist/arrowpad/mainwindow.cpp 1
+
+    We also call \c MainWindow::tr() twice, once for the action and
+    once for the shortcut.
+
+    Note the use of \c tr() to support different keys in other
+    languages. "Ctrl+Q" is a good choice for Quit in English, but a
+    Dutch translator might want to use "Ctrl+A" (for Afsluiten) and a
+    German translator "Strg+E" (for Beenden). When using \c tr() for
+    \key Ctrl key accelerators, the two argument form should be used
+    with the second argument describing the function that the
+    accelerator performs.
+
+    Our \c main() function is defined in \c main.cpp as usual.
+
+    \snippet examples/linguist/arrowpad/main.cpp 2
+    \snippet examples/linguist/arrowpad/main.cpp 3
+
+    We choose which translation to use according to the current locale.
+    QLocale::system() can be influenced by setting the \c LANG
+    environment variable, for example. Notice that the use of a naming
+    convention that incorporates the locale for \c .qm message files,
+    (and \c .ts files), makes it easy to implement choosing the
+    translation file according to locale.
+
+    If there is no \c .qm message file for the locale chosen the original
+    source text will be used and no error raised.
+
+    \section1 Translating to French and Dutch
+
+    We'll begin by translating the example application into French. Start
+    \e {Qt Linguist} with \c arrowpad_fr.ts. You should get the seven source
+    texts ("\&Up", "\&Left", etc.) grouped in two contexts ("ArrowPad"
+    and "MainWindow").
+
+    Now, enter the following translations:
+
+    \list
+    \o \c ArrowPad
+         \list
+         \o \&Up - \&Haut
+         \o \&Left - \&Gauche
+         \o \&Right - \&Droite
+         \o \&Down - \&Bas
+         \endlist
+    \o \c MainWindow
+         \list
+         \o E\&xit - \&Quitter
+         \o Ctrl+Q - Ctrl+Q
+         \o \&File - \&Fichier
+         \endlist
+    \endlist
+
+    It's quickest to press \key{Alt+D} (which clicks the \gui {Done \& Next}
+    button) after typing each translation, since this marks the
+    translation as done and moves on to the next source text.
+
+    Save the file and do the same for Dutch working with \c arrowpad_nl.ts:
+
+    \list
+    \o \c ArrowPad
+         \list
+         \o \&Up - \&Omhoog
+         \o \&Left - \&Links
+         \o \&Right - \&Rechts
+         \o \&Down - Omlaa\&g
+         \endlist
+    \o \c MainWindow
+         \list
+         \o E\&xit - \&Afsluiten
+         \o Ctrl+Q - Ctrl+A
+         \o File - \&Bestand
+         \endlist
+    \endlist
+
+    We have to convert the \c tt1_fr.ts and \c tt1_nl.ts translation source
+    files into \c .qm files. We could use \e {Qt Linguist} as we've done
+    before; however using the command line tool \c lrelease ensures that
+    \e all the \c .qm files for the application are created without us
+    having to remember to load and \gui File|Release each one
+    individually from \e {Qt Linguist}.
+
+    Type
+
+    \snippet doc/src/snippets/code/doc_src_examples_arrowpad.qdoc 1
+
+    This should create both \c arrowpad_fr.qm and \c arrowpad_nl.qm. Set the \c
+    LANG environment variable to \c fr. In Unix, one of the two following
+    commands should work
+
+    \snippet doc/src/snippets/code/doc_src_examples_arrowpad.qdoc 2
+
+    In Windows, either modify \c autoexec.bat or run
+
+    \snippet doc/src/snippets/code/doc_src_examples_arrowpad.qdoc 3
+
+    When you run the program, you should now see the French version:
+
+    \image linguist-arrowpad_fr.png
+
+    Try the same with Dutch, by setting \c LANG=nl. Now the Dutch
+    version should appear:
+
+    \image linguist-arrowpad_nl.png
+
+    \section1 Exercises
+
+    Mark one of the translations in \e {Qt Linguist} as not done, i.e.
+    by unchecking the "done" checkbox; run \c lupdate, then \c lrelease,
+    then the example. What effect did this change have?
+
+    Set \c LANG=fr_CA (French Canada) and run the example program again. 
+    Explain why the result is the same as with \c LANG=fr.
+
+    Change one of the accelerators in the Dutch translation to eliminate the
+    conflict between \e \&Bestand and \e \&Boven.
+*/
diff --git a/doc/src/examples/basicdrawing.qdoc b/doc/src/examples/basicdrawing.qdoc
new file mode 100644
index 0000000000..5297201e5e
--- /dev/null
+++ b/doc/src/examples/basicdrawing.qdoc
@@ -0,0 +1,468 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example painting/basicdrawing
+    \title Basic Drawing Example
+
+    The Basic Drawing example shows how to display basic graphics
+    primitives in a variety of styles using the QPainter class.
+
+    QPainter performs low-level painting on widgets and other paint
+    devices. The class can draw everything from simple lines to
+    complex shapes like pies and chords. It can also draw aligned text
+    and pixmaps. Normally, it draws in a "natural" coordinate system,
+    but it can in addition do view and world transformation.
+
+    \image basicdrawing-example.png
+
+    The example provides a render area, displaying the currently
+    active shape, and lets the user manipulate the rendered shape and
+    its appearance using the QPainter parameters: The user can change
+    the active shape (\gui Shape), and modify the QPainter's pen (\gui
+    {Pen Width}, \gui {Pen Style}, \gui {Pen Cap}, \gui {Pen Join}),
+    brush (\gui {Brush Style}) and render hints (\gui
+    Antialiasing). In addition the user can rotate a shape (\gui
+    Transformations); behind the scenes we use QPainter's ability to
+    manipulate the coordinate system to perform the rotation.
+
+    The Basic Drawing example consists of two classes:
+
+    \list
+    \o \c RenderArea is a custom widget that renders multiple
+       copies of the currently active shape.
+    \o \c Window is the application's main window displaying a
+       \c RenderArea widget in addition to several parameter widgets.
+    \endlist
+
+    First we will review the \c Window class, then we will take a
+    look at the \c RenderArea class.
+
+    \section1 Window Class Definition
+
+    The Window class inherits QWidget, and is the application's main
+    window displaying a \c RenderArea widget in addition to several
+    parameter widgets.
+
+    \snippet examples/painting/basicdrawing/window.h 0
+
+    We declare the various widgets, and three private slots updating
+    the \c RenderArea widget: The \c shapeChanged() slot updates the
+    \c RenderArea widget when the user changes the currently active
+    shape. We call the \c penChanged() slot when either of the
+    QPainter's pen parameters changes. And the \c brushChanged() slot
+    updates the \c RenderArea widget when the user changes the
+    painter's brush style.
+
+    \section1 Window Class Implementation
+
+    In the constructor we create and initialize the various widgets
+    appearing in the main application window.
+
+    \snippet examples/painting/basicdrawing/window.cpp 1
+
+    First we create the \c RenderArea widget that will render the
+    currently active shape. Then we create the \gui Shape combobox,
+    and add the associated items (i.e. the different shapes a QPainter
+    can draw).
+
+    \snippet examples/painting/basicdrawing/window.cpp 2
+
+    QPainter's pen is a QPen object; the QPen class defines how a
+    painter should draw lines and outlines of shapes. A pen has
+    several properties: Width, style, cap and join.
+
+    A pen's width can be \e zero or greater, but the most common width
+    is zero. Note that this doesn't mean 0 pixels, but implies that
+    the shape is drawn as smoothly as possible although perhaps not
+    mathematically correct.
+
+    We create a QSpinBox for the \gui {Pen Width} parameter.
+
+    \snippet examples/painting/basicdrawing/window.cpp 3
+
+    The pen style defines the line type. The default style is solid
+    (Qt::SolidLine). Setting the style to none (Qt::NoPen) tells the
+    painter to not draw lines or outlines.  The pen cap defines how
+    the end points of lines are drawn.  And the pen join defines how
+    two lines join when multiple connected lines are drawn. The cap
+    and join only apply to lines with a width of 1 pixel or greater.
+
+    We create \l {QComboBox}es for each of the \gui {Pen Style}, \gui
+    {Pen Cap} and \gui {Pen Join} parameters, and adds the associated
+    items (i.e the values of the Qt::PenStyle, Qt::PenCapStyle and
+    Qt::PenJoinStyle enums respectively).
+
+    \snippet examples/painting/basicdrawing/window.cpp 4
+
+    The QBrush class defines the fill pattern of shapes drawn by a
+    QPainter. The default brush style is Qt::NoBrush. This style tells
+    the painter to not fill shapes. The standard style for filling is
+    Qt::SolidPattern.
+
+    We create a QComboBox for the \gui {Brush Style} parameter, and add
+    the associated items (i.e. the values of the Qt::BrushStyle enum).
+
+    \snippet examples/painting/basicdrawing/window.cpp 5
+    \snippet examples/painting/basicdrawing/window.cpp 6
+
+    Antialiasing is a feature that "smoothes" the pixels to create
+    more even and less jagged lines, and can be applied using
+    QPainter's render hints. QPainter::RenderHints are used to specify
+    flags to QPainter that may or may not be respected by any given
+    engine.
+
+    We simply create a QCheckBox for the \gui Antialiasing option.
+
+    \snippet examples/painting/basicdrawing/window.cpp 7
+
+    The \gui Transformations option implies a manipulation of the
+    coordinate system that will appear as if the rendered shape is
+    rotated in three dimensions.
+
+    We use the QPainter::translate(), QPainter::rotate() and
+    QPainter::scale() functions to implement this feature represented
+    in the main application window by a simple QCheckBox.
+
+    \snippet examples/painting/basicdrawing/window.cpp 8
+
+    Then we connect the parameter widgets with their associated slots
+    using the static QObject::connect() function, ensuring that the \c
+    RenderArea widget is updated whenever the user changes the shape,
+    or any of the other parameters.
+
+    \snippet examples/painting/basicdrawing/window.cpp 9
+    \snippet examples/painting/basicdrawing/window.cpp 10
+
+    Finally, we add the various widgets to a layout, and call the \c
+    shapeChanged(), \c penChanged(), and \c brushChanged() slots to
+    initialize the application. We also turn on antialiasing.
+
+    \snippet examples/painting/basicdrawing/window.cpp 11
+
+    The \c shapeChanged() slot is called whenever the user changes the
+    currently active shape.
+
+    First we retrieve the shape the user has chosen using the
+    QComboBox::itemData() function. This function returns the data for
+    the given role in the given index in the combobox. We use
+    QComboBox::currentIndex() to retrieve the index of the shape, and
+    the role is defined by the Qt::ItemDataRole enum; \c IdRole is an
+    alias for Qt::UserRole.
+
+    Note that Qt::UserRole is only the first role that can be used for
+    application-specific purposes. If you need to store different data
+    in the same index, you can use different roles by simply
+    incrementing the value of Qt::UserRole, for example: 'Qt::UserRole
+    + 1' and 'Qt::UserRole + 2'. However, it is a good programming
+    practice to give each role their own name: 'myFirstRole =
+    Qt::UserRole + 1' and 'mySecondRole = Qt::UserRole + 2'. Even
+    though we only need a single role in this particular example, we
+    add the following line of code to the beginning of the \c
+    window.cpp file.
+
+    \snippet examples/painting/basicdrawing/window.cpp 0
+
+    The QComboBox::itemData() function returns the data as a QVariant,
+    so we need to cast the data to \c RenderArea::Shape. If there is
+    no data for the given role, the function returns
+    QVariant::Invalid.
+
+    In the end we call the \c RenderArea::setShape() slot to update
+    the \c RenderArea widget.
+
+    \snippet examples/painting/basicdrawing/window.cpp 12
+
+    We call the \c penChanged() slot whenever the user changes any of
+    the pen parameters. Again we use the QComboBox::itemData()
+    function to retrieve the parameters, and then we call the \c
+    RenderArea::setPen() slot to update the \c RenderArea widget.
+
+    \snippet examples/painting/basicdrawing/window.cpp 13
+
+    The brushChanged() slot is called whenever the user changes the
+    brush parameter which we retrieve using the QComboBox::itemData()
+    function as before.
+
+    \snippet examples/painting/basicdrawing/window.cpp 14
+
+    If the brush parameter is a gradient fill, special actions are
+    required.
+
+    The QGradient class is used in combination with QBrush to specify
+    gradient fills. Qt currently supports three types of gradient
+    fills: linear, radial and conical. Each of these is represented by
+    a subclass of QGradient: QLinearGradient, QRadialGradient and
+    QConicalGradient.
+
+    So if the brush style is Qt::LinearGradientPattern, we first
+    create a QLinearGradient object with interpolation area between
+    the coordinates passed as arguments to the constructor. The
+    positions are specified using logical coordinates. Then we set the
+    gradient's colors using the QGradient::setColorAt() function. The
+    colors is defined using stop points which are composed by a
+    position (between 0 and 1) and a QColor. The set of stop points
+    describes how the gradient area should be filled. A gradient can
+    have an arbitrary number of stop points.
+
+    In the end we call \c RenderArea::setBrush() slot to update the \c
+    RenderArea widget's brush with the QLinearGradient object.
+
+    \snippet examples/painting/basicdrawing/window.cpp 15
+
+    A similar pattern of actions, as the one used for QLinearGradient,
+    is used in the cases of Qt::RadialGradientPattern and
+    Qt::ConicalGradientPattern.
+
+    The only difference is the arguments passed to the constructor:
+    Regarding the QRadialGradient constructor the first argument is
+    the center, and the second the radial gradient's radius. The third
+    argument is optional, but can be used to define the focal point of
+    the gradient inside the circle (the default focal point is the
+    circle center).  Regarding the QConicalGradient constructor, the
+    first argument specifies the center of the conical, and the second
+    specifies the start angle of the interpolation.
+
+    \snippet examples/painting/basicdrawing/window.cpp 16
+
+    If the brush style is Qt::TexturePattern we create a QBrush from a
+    QPixmap. Then we call \c RenderArea::setBrush() slot to update the
+    \c RenderArea widget with the newly created brush.
+
+    \snippet examples/painting/basicdrawing/window.cpp 17
+
+    Otherwise we simply create a brush with the given style and a
+    green color, and then call \c RenderArea::setBrush() slot to
+    update the \c RenderArea widget with the newly created brush.
+
+    \section1 RenderArea Class Definition
+
+    The \c RenderArea class inherits QWidget, and renders multiple
+    copies of the currently active shape using a QPainter.
+
+    \snippet examples/painting/basicdrawing/renderarea.h 0
+
+    First we define a public \c Shape enum to hold the different
+    shapes that can be rendered by the widget (i.e the shapes that can
+    be rendered by a QPainter). Then we reimplement the constructor as
+    well as two of QWidget's public functions: \l
+    {QWidget::minimumSizeHint()}{minimumSizeHint()} and \l
+    {QWidget::sizeHint()}{sizeHint()}.
+
+    We also reimplement the QWidget::paintEvent() function to be able
+    to draw the currently active shape according to the specified
+    parameters.
+
+    We declare several private slots: The \c setShape() slot changes
+    the \c RenderArea's shape, the \c setPen() and \c setBrush() slots
+    modify the widget's pen and brush, and the \c setAntialiased() and
+    \c setTransformed() slots modify the widget's respective
+    properties.
+
+    \section1 RenderArea Class Implementation
+
+    In the constructor we initialize some of the widget's variables.
+
+    \snippet examples/painting/basicdrawing/renderarea.cpp 0
+
+    We set its shape to be a \gui Polygon, its antialiased property to
+    be false and we load an image into the widget's pixmap
+    variable. In the end we set the widget's background role, defining
+    the brush from the widget's \l {QWidget::palette}{palette} that
+    will be used to render the background. QPalette::Base is typically
+    white.
+
+    \snippet examples/painting/basicdrawing/renderarea.cpp 2
+
+    The \c RenderArea inherits QWidget's \l
+    {QWidget::sizeHint()}{sizeHint} property holding the recommended
+    size for the widget. If the value of this property is an invalid
+    size, no size is recommended.
+
+    The default implementation of the QWidget::sizeHint() function
+    returns an invalid size if there is no layout for the widget, and
+    returns the layout's preferred size otherwise.
+
+    Our reimplementation of the function returns a QSize with a 400
+    pixels width and a 200 pixels height.
+
+    \snippet examples/painting/basicdrawing/renderarea.cpp 1
+
+    \c RenderArea also inherits QWidget's
+    \l{QWidget::minimumSizeHint()}{minimumSizeHint} property holding
+    the recommended minimum size for the widget. Again, if the value
+    of this property is an invalid size, no size is recommended.
+
+    The default implementation of QWidget::minimumSizeHint() returns
+    an invalid size if there is no layout for the widget, and returns
+    the layout's minimum size otherwise.
+
+    Our reimplementation of the function returns a QSize with a 100
+    pixels width and a 100 pixels height.
+
+    \snippet examples/painting/basicdrawing/renderarea.cpp 3
+    \codeline
+    \snippet examples/painting/basicdrawing/renderarea.cpp 4
+    \codeline
+    \snippet examples/painting/basicdrawing/renderarea.cpp 5
+
+    The public \c setShape(), \c setPen() and \c setBrush() slots are
+    called whenever we want to modify a \c RenderArea widget's shape,
+    pen or brush. We set the shape, pen or brush according to the
+    slot parameter, and call QWidget::update() to make the changes
+    visible in the \c RenderArea widget.
+
+    The QWidget::update() slot does not cause an immediate
+    repaint; instead it schedules a paint event for processing when Qt
+    returns to the main event loop.
+
+    \snippet examples/painting/basicdrawing/renderarea.cpp 6
+    \codeline
+    \snippet examples/painting/basicdrawing/renderarea.cpp 7
+
+    With the \c setAntialiased() and \c setTransformed() slots we
+    change the state of the properties according to the slot
+    parameter, and call the QWidget::update() slot to make the changes
+    visible in the \c RenderArea widget.
+
+    \snippet examples/painting/basicdrawing/renderarea.cpp 8
+
+    Then we reimplement the QWidget::paintEvent() function. The first
+    thing we do is to create the graphical objects we will need to
+    draw the various shapes.
+
+    We create a vector of four \l {QPoint}s. We use this vector to
+    render the \gui Points, \gui Polyline and \gui Polygon
+    shapes. Then we create a QRect, defining a rectangle in the plane,
+    which we use as the bounding rectangle for all the shapes excluding
+    the \gui Path and the \gui Pixmap.
+
+    We also create a QPainterPath. The QPainterPath class provides a
+    container for painting operations, enabling graphical shapes to be
+    constructed and reused. A painter path is an object composed of a
+    number of graphical building blocks, such as rectangles, ellipses,
+    lines, and curves. For more information about the QPainterPath
+    class, see the \l {painting/painterpaths}{Painter Paths}
+    example. In this example, we create a painter path composed of one
+    straight line and a Bezier curve.
+
+    In addition we define a start angle and an arc length that we will
+    use when drawing the \gui Arc, \gui Chord and \gui Pie shapes.
+
+    \snippet examples/painting/basicdrawing/renderarea.cpp 9
+
+    We create a QPainter for the \c RenderArea widget, and set the
+    painters pen and brush according to the \c RenderArea's pen and
+    brush. If the \gui Antialiasing parameter option is checked, we
+    also set the painter's render hints. QPainter::Antialiasing
+    indicates that the engine should antialias edges of primitives if
+    possible.
+
+    \snippet examples/painting/basicdrawing/renderarea.cpp 10
+
+    Finally, we render the multiple copies of the \c RenderArea's
+    shape. The number of copies is depending on the size of the \c
+    RenderArea widget, and we calculate their positions using two \c
+    for loops and the widgets height and width.
+
+    For each copy we first save the current painter state (pushes the
+    state onto a stack). Then we translate the coordinate system,
+    using the QPainter::translate() function, to the position
+    determined by the variables of the \c for loops. If we omit this
+    translation of the coordinate system all the copies of the shape
+    will be rendered on top of each other in the top left cormer of
+    the \c RenderArea widget.
+
+    \snippet examples/painting/basicdrawing/renderarea.cpp 11
+
+    If the \gui Transformations parameter option is checked, we do an
+    additional translation of the coordinate system before we rotate
+    the coordinate system 60 degrees clockwise using the
+    QPainter::rotate() function and scale it down in size using the
+    QPainter::scale() function. In the end we translate the coordinate
+    system back to where it was before we rotated and scaled it.
+
+    Now, when rendering the shape, it will appear as if it was rotated
+    in three dimensions.
+
+    \snippet examples/painting/basicdrawing/renderarea.cpp 12
+
+    Next, we identify the \c RenderArea's shape, and render it using
+    the associated QPainter drawing function:
+
+    \list
+        \o QPainter::drawLine(),
+        \o QPainter::drawPoints(),
+        \o QPainter::drawPolyline(),
+        \o QPainter::drawPolygon(),
+        \o QPainter::drawRect(),
+        \o QPainter::drawRoundedRect(),
+        \o QPainter::drawEllipse(),
+        \o QPainter::drawArc(),
+        \o QPainter::drawChord(),
+        \o QPainter::drawPie(),
+        \o QPainter::drawPath(),
+        \o QPainter::drawText() or
+        \o QPainter::drawPixmap()
+    \endlist
+
+    Before we started rendering, we saved the current painter state
+    (pushes the state onto a stack). The rationale for this is that we
+    calculate each shape copy's position relative to the same point in
+    the coordinate system. When translating the coordinate system, we
+    lose the knowledge of this point unless we save the current
+    painter state \e before we start the translating process.
+
+    \snippet examples/painting/basicdrawing/renderarea.cpp 13
+
+    Then, when we are finished rendering a copy of the shape we can
+    restore the original painter state, with its associated coordinate
+    system, using the QPainter::restore() function. In this way we
+    ensure that the next shape copy will be rendered in the correct
+    position.
+
+    We could translate the coordinate system back using
+    QPainter::translate() instead of saving the painter state. But
+    since we in addition to translating the coordinate system (when
+    the \gui Transformation parameter option is checked) both rotate
+    and scale the coordinate system, the easiest solution is to save
+    the current painter state.
+*/
diff --git a/doc/src/examples/basicgraphicslayouts.qdoc b/doc/src/examples/basicgraphicslayouts.qdoc
new file mode 100644
index 0000000000..92571af13c
--- /dev/null
+++ b/doc/src/examples/basicgraphicslayouts.qdoc
@@ -0,0 +1,151 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example graphicsview/basicgraphicslayouts
+    \title Basic Graphics Layouts Example
+
+    The Basic Graphics Layouts example shows how to use the layout classes
+    in QGraphicsView: QGraphicsLinearLayout and QGraphicsGridLayout.
+
+    \image basicgraphicslayouts-example.png Screenshot of the Basic Layouts Example
+
+    \section1 Window Class Definition
+
+    The \c Window class is a subclass of QGraphicsWidget. It has a
+    constructor with a QGraphicsWidget \a parent as its parameter.
+
+    \snippet examples/graphicsview/basicgraphicslayouts/window.h 0
+
+    \section1 Window Class Implementation
+
+    The constructor of \c Window instantiates a QGraphicsLinearLayout object,
+    \c windowLayout, with vertical orientation. We instantiate another
+    QGraphicsLinearLayout object, \c linear, whose parent is \c windowLayout.
+    Next, we create a \c LayoutItem object, \c item and add it to \c linear
+    with the \l{QGraphicsLinearLayout::}{addItem()} function. We also provide
+    \c item with a \l{QGraphicsLinearLayout::setStretchFactor()}
+    {stretchFactor}.
+
+    \snippet examples/graphicsview/basicgraphicslayouts/window.cpp 0
+
+    We repeat the process:
+
+    \list
+        \o create a new \c LayoutItem,
+        \o add the item \c linear, and
+        \o provide a stretch factor.
+    \endlist
+
+    \snippet examples/graphicsview/basicgraphicslayouts/window.cpp 1
+
+    We then add \c linear to \c windowLayout, nesting two
+    QGraphicsLinearLayout objects. Apart from the QGraphicsLinearLayout, we
+    also use a QGraphicsGridLayout object, \c grid, which is a 4x3 grid with
+    some cells spanning to other rows.
+
+    We create seven \c LayoutItem objects and place them into \c grid with
+    the \l{QGraphicsGridLayout::}{addItem()} function as shown in the code
+    snippet below:
+
+    \snippet examples/graphicsview/basicgraphicslayouts/window.cpp 2
+
+    The first item we add to \c grid is placed in the top left cell,
+    spanning four rows. The next two items are placed in the second column,
+    and they span two rows. Each item's \l{QGraphicsWidget::}{maximumHeight()}
+    and \l{QGraphicsWidget::}{minimumHeight()} are set to be equal so that
+    they do not expand vertically. As a result, these items will not
+    fit vertically in their cells. So, we specify that they should be
+    vertically aligned in the center of the cell using Qt::AlignVCenter.
+
+    Finally, \c grid itself is added to \c windowLayout. Unlike
+    QGridLayout::addItem(), QGraphicsGridLayout::addItem() requires a row
+    and a column for its argument, specifying which cell the item should be
+    positioned in. Also, if the \c rowSpan and \c columnSpan arguments
+    are omitted, they will default to 1.
+
+    Note that we do not specify a parent for each \c LayoutItem that we
+    construct, as all these items will be added to \c windowLayout. When we
+    add an item to a layout, it will be automatically reparented to the widget
+    on which the layout is installed.
+
+    \snippet examples/graphicsview/basicgraphicslayouts/window.cpp 3
+
+    Now that we have set up \c grid and added it to \c windowLayout, we
+    install \c windowLayout onto the window object using
+    QGraphicsWidget::setLayout() and we set the window title.
+
+    \section1 LayoutItem Class Definition
+
+    The \c LayoutItem class is a subclass of QGraphicsWidget. It has a
+    constructor, a destructor, and a reimplementation of the
+    {QGraphicsItem::paint()}{paint()} function.
+
+    \snippet examples/graphicsview/basicgraphicslayouts/layoutitem.h 0
+
+    The \c LayoutItem class also has a private instance of QPixmap, \c pix.
+
+    \note We subclass QGraphicsWidget so that \c LayoutItem objects can
+    be automatically plugged into a layout, as QGraphicsWidget is a
+    specialization of QGraphicsLayoutItem.
+
+    \section1 LayoutItem Class Implementation
+
+    In \c{LayoutItem}'s constructor, \c pix is instantiated and the
+    \c{QT_original_R.png} image is loaded into it. We set the size of
+    \c LayoutItem to be slightly larger than the size of the pixmap as we
+    require some space around it for borders that we will paint later.
+    Alternatively, you could scale the pixmap to prevent the item from
+    becoming smaller than the pixmap.
+
+    \snippet examples/graphicsview/basicgraphicslayouts/layoutitem.cpp 0
+
+    We use the Q_UNUSED() macro to prevent the compiler from generating
+    warnings regarding unused parameters.
+
+    \snippet examples/graphicsview/basicgraphicslayouts/layoutitem.cpp 1
+
+    The idea behind the \c paint() function is to paint the
+    background rect then paint a rect around the pixmap.
+
+    \snippet examples/graphicsview/basicgraphicslayouts/layoutitem.cpp 2
+
+*/
\ No newline at end of file
diff --git a/doc/src/examples/basiclayouts.qdoc b/doc/src/examples/basiclayouts.qdoc
new file mode 100644
index 0000000000..0d64b1f7f7
--- /dev/null
+++ b/doc/src/examples/basiclayouts.qdoc
@@ -0,0 +1,204 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example layouts/basiclayouts
+    \title Basic Layouts Example
+
+    The Basic Layouts example shows how to use the standard layout
+    managers that are available in Qt: QBoxLayout, QGridLayout and
+    QFormLayout.
+
+    \image basiclayouts-example.png Screenshot of the Basic Layouts example
+
+    The QBoxLayout class lines up widgets horizontally or vertically.
+    QHBoxLayout and QVBoxLayout are convenience subclasses of QBoxLayout.
+    QGridLayout lays out widgets in cells by dividing the available space
+    into rows and columns. QFormLayout, on the other hand, lays out its
+    children in a two-column form with labels in the left column and
+    input fields in the right column.
+
+    \section1 Dialog Class Definition
+
+    \snippet examples/layouts/basiclayouts/dialog.h 0
+
+    The \c Dialog class inherits QDialog. It is a custom widget that
+    displays its child widgets using the geometry managers:
+    QHBoxLayout, QVBoxLayout, QGridLayout and QFormLayout.
+
+    We declare four private functions to simplify the class
+    constructor: The \c createMenu(), \c createHorizontalGroupBox(),
+    \c createGridGroupBox() and \c createFormGroupBox() functions create
+    several widgets that the example uses to demonstrate how the layout
+    affects their appearances.
+
+    \section1 Dialog Class Implementation
+
+    \snippet examples/layouts/basiclayouts/dialog.cpp 0
+
+    In the constructor, we first use the \c createMenu() function to
+    create and populate a menu bar and the \c createHorizontalGroupBox()
+    function to create a group box containing four buttons with a
+    horizontal layout. Next we use the \c createGridGroupBox() function
+    to create a group box containing several line edits and a small text
+    editor which are displayed in a grid layout. Finally, we use the
+    \c createFormGroupBox() function to createa a group box with
+    three labels and three input fields: a line edit, a combo box and
+    a spin box.
+
+    \snippet examples/layouts/basiclayouts/dialog.cpp 1
+
+    We also create a big text editor and a dialog button box. The
+    QDialogButtonBox class is a widget that presents buttons in a
+    layout that is appropriate to the current widget style. The
+    preferred buttons can be specified as arguments to the
+    constructor, using the QDialogButtonBox::StandardButtons enum.
+
+    Note that we don't have to specify a parent for the widgets when
+    we create them. The reason is that all the widgets we create here
+    will be added to a layout, and when we add a widget to a layout,
+    it is automatically reparented to the widget the layout is
+    installed on.
+
+    \snippet examples/layouts/basiclayouts/dialog.cpp 2
+
+    The main layout is a QVBoxLayout object. QVBoxLayout is a
+    convenience class for a box layout with vertical orientation.
+
+    In general, the QBoxLayout class takes the space it gets (from its
+    parent layout or from the parent widget), divides it up into a
+    series of boxes, and makes each managed widget fill one box.  If
+    the QBoxLayout's orientation is Qt::Horizontal the boxes are
+    placed in a row. If the orientation is Qt::Vertical, the boxes are
+    placed in a column.  The corresponding convenience classes are
+    QHBoxLayout and QVBoxLayout, respectively.
+
+    \snippet examples/layouts/basiclayouts/dialog.cpp 3
+
+    When we call the QLayout::setMenuBar() function, the layout places
+    the provided menu bar at the top of the parent widget, and outside
+    the widget's \l {QWidget::contentsRect()}{content margins}. All
+    child widgets are placed below the bottom edge of the menu bar.
+
+    \snippet examples/layouts/basiclayouts/dialog.cpp 4
+
+    We use the QBoxLayout::addWidget() function to add the widgets to
+    the end of layout. Each widget will get at least its minimum size
+    and at most its maximum size. It is possible to specify a stretch
+    factor in the \l {QBoxLayout::addWidget()}{addWidget()} function,
+    and any excess space is shared according to these stretch
+    factors. If not specified, a widget's stretch factor is 0.
+
+    \snippet examples/layouts/basiclayouts/dialog.cpp 5
+
+    We install the main layout on the \c Dialog widget using the
+    QWidget::setLayout() function, and all of the layout's widgets are
+    automatically reparented to be children of the \c Dialog widget.
+
+    \snippet examples/layouts/basiclayouts/dialog.cpp 6
+
+    In the private \c createMenu() function we create a menu bar, and
+    add a pull-down \gui File menu containing an \gui Exit option.
+
+    \snippet examples/layouts/basiclayouts/dialog.cpp 7
+
+    When we create the horizontal group box, we use a QHBoxLayout as
+    the internal layout. We create the buttons we want to put in the
+    group box, add them to the layout and install the layout on the
+    group box.
+
+    \snippet examples/layouts/basiclayouts/dialog.cpp 8
+
+    In the \c createGridGroupBox() function we use a QGridLayout which
+    lays out widgets in a grid. It takes the space made available to
+    it (by its parent layout or by the parent widget), divides it up
+    into rows and columns, and puts each widget it manages into the
+    correct cell.
+
+    \snippet examples/layouts/basiclayouts/dialog.cpp 9
+
+    For each row in the grid we create a label and an associated line
+    edit, and add them to the layout. The QGridLayout::addWidget()
+    function differ from the corresponding function in QBoxLayout: It
+    needs the row and column specifying the grid cell to put the
+    widget in.
+
+    \snippet examples/layouts/basiclayouts/dialog.cpp 10
+
+    QGridLayout::addWidget() can in addition take arguments
+    specifying the number of rows and columns the cell will be
+    spanning. In this example, we create a small editor which spans
+    three rows and one column.
+
+    For both the QBoxLayout::addWidget() and QGridLayout::addWidget()
+    functions it is also possible to add a last argument specifying
+    the widget's alignment. By default it fills the whole cell. But we
+    could, for example, align a widget with the right edge by
+    specifying the alignment to be Qt::AlignRight.
+
+    \snippet examples/layouts/basiclayouts/dialog.cpp 11
+
+    Each column in a grid layout has a stretch factor. The stretch
+    factor is set using QGridLayout::setColumnStretch() and determines
+    how much of the available space the column will get over and above
+    its necessary minimum.
+
+    In this example, we set the stretch factors for columns 1 and 2.
+    The stretch factor is relative to the other columns in this grid;
+    columns with a higher stretch factor take more of the available
+    space. So column 2 in our grid layout will get more of the
+    available space than column 1, and column 0 will not grow at all
+    since its stretch factor is 0 (the default).
+
+    Columns and rows behave identically; there is an equivalent
+    stretch factor for rows, as well as a QGridLayout::setRowStretch()
+    function.
+
+    \snippet examples/layouts/basiclayouts/dialog.cpp 12
+
+    In the \c createFormGroupBox() function, we use a QFormLayout
+    to neatly arrange objects into two columns - name and field.
+    There are three QLabel objects for names with three
+    corresponding input widgets as fields: a QLineEdit, a QComboBox
+    and a QSpinBox. Unlike QBoxLayout::addWidget() and
+    QGridLayout::addWidget(), we use QFormLayout::addRow() to add widgets
+    to the layout.
+*/
diff --git a/doc/src/examples/basicsortfiltermodel.qdoc b/doc/src/examples/basicsortfiltermodel.qdoc
new file mode 100644
index 0000000000..557729a041
--- /dev/null
+++ b/doc/src/examples/basicsortfiltermodel.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example itemviews/basicsortfiltermodel
+    \title Basic Sort/Filter Model Example
+
+    The Basic Sort/Filter Model example illustrates how to use
+    QSortFilterProxyModel to perform basic sorting and filtering.
+
+    \image basicsortfiltermodel-example.png Screenshot of the Basic Sort/Filter Model Example
+
+*/
diff --git a/doc/src/examples/blockingfortuneclient.qdoc b/doc/src/examples/blockingfortuneclient.qdoc
new file mode 100644
index 0000000000..5c9dbe1311
--- /dev/null
+++ b/doc/src/examples/blockingfortuneclient.qdoc
@@ -0,0 +1,230 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example network/blockingfortuneclient
+    \title Blocking Fortune Client Example
+
+    The Blocking Fortune Client example shows how to create a client for a
+    network service using QTcpSocket's synchronous API in a non-GUI thread.
+
+    \image blockingfortuneclient-example.png
+
+    QTcpSocket supports two general approaches to network programming:
+
+    \list
+
+    \o \e{The asynchronous (non-blocking) approach.} Operations are scheduled
+    and performed when control returns to Qt's event loop. When the operation
+    is finished, QTcpSocket emits a signal. For example,
+    QTcpSocket::connectToHost() returns immediately, and when the connection
+    has been established, QTcpSocket emits
+    \l{QTcpSocket::connected()}{connected()}.
+    
+    \o \e{The synchronous (blocking) approach.} In non-GUI and multithreaded
+    applications, you can call the \c waitFor...() functions (e.g.,
+    QTcpSocket::waitForConnected()) to suspend the calling thread until the
+    operation has completed, instead of connecting to signals.
+
+    \endlist
+
+    The implementation is very similar to the
+    \l{network/fortuneclient}{Fortune Client} example, but instead of having
+    QTcpSocket as a member of the main class, doing asynchronous networking in
+    the main thread, we will do all network operations in a separate thread
+    and use QTcpSocket's blocking API.
+
+    The purpose of this example is to demonstrate a pattern that you can use
+    to simplify your networking code, without losing responsiveness in your
+    user interface.  Use of Qt's blocking network API often leads to
+    simpler code, but because of its blocking behavior, it should only be used
+    in non-GUI threads to prevent the user interface from freezing. But
+    contrary to what many think, using threads with QThread does not
+    necessarily add unmanagable complexity to your application.
+
+    We will start with the FortuneThread class, which handles the network
+    code.
+
+    \snippet examples/network/blockingfortuneclient/fortunethread.h 0
+
+    FortuneThread is a QThread subclass that provides an API for scheduling
+    requests for fortunes, and it has signals for delivering fortunes and
+    reporting errors. You can call requestNewFortune() to request a new
+    fortune, and the result is delivered by the newFortune() signal. If any
+    error occurs, the error() signal is emitted.
+
+    It's important to notice that requestNewFortune() is called from the main,
+    GUI thread, but the host name and port values it stores will be accessed
+    from FortuneThread's thread. Because we will be reading and writing
+    FortuneThread's data members from different threads concurrently, we use
+    QMutex to synchronize access.
+
+    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 2
+
+    The requestNewFortune() function stores the host name and port of the
+    fortune server as member data, and we lock the mutex with QMutexLocker to
+    protect this data. We then start the thread, unless it is already
+    running. We will come back to the QWaitCondition::wakeOne() call later.
+
+    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 4
+    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 5
+
+    In the run() function, we start by acquiring the mutex lock, fetching the
+    host name and port from the member data, and then releasing the lock
+    again. The case that we are protecting ourselves against is that \c
+    requestNewFortune() could be called at the same time as we are fetching
+    this data. QString is \l reentrant but \e not \l{thread-safe}, and we must
+    also avoid the unlikely risk of reading the host name from one request,
+    and port of another. And as you might have guessed, FortuneThread can only
+    handle one request at a time.
+
+    The run() function now enters a loop:
+
+    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 6
+
+    The loop will continue requesting fortunes for as long as \e quit is
+    false. We start our first request by creating a QTcpSocket on the stack,
+    and then we call \l{QTcpSocket::connectToHost()}{connectToHost()}. This
+    starts an asynchronous operation which, after control returns to Qt's
+    event loop, will cause QTcpSocket to emit
+    \l{QTcpSocket::connected()}{connected()} or
+    \l{QTcpSocket::error()}{error()}.
+
+    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 8
+
+    But since we are running in a non-GUI thread, we do not have to worry
+    about blocking the user interface. So instead of entering an event loop,
+    we simply call QTcpSocket::waitForConnected(). This function will wait,
+    blocking the calling thread, until QTcpSocket emits connected() or an
+    error occurs. If connected() is emitted, the function returns true; if the
+    connection failed or timed out (which in this example happens after 5
+    seconds), false is returned. QTcpSocket::waitForConnected(), like the
+    other \c waitFor...() functions, is part of QTcpSocket's \e{blocking
+    API}.
+
+    After this statement, we have a connected socket to work with. Now it's
+    time to see what the fortune server has sent us.
+
+    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 9
+    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 10
+
+    This step is to read the size of the packet. Although we are only reading
+    two bytes here, and the \c while loop may seem to overdo it, we present this
+    code to demonstrate a good pattern for waiting for data using
+    QTcpSocket::waitForReadyRead(). It goes like this: For as long as we still
+    need more data, we call waitForReadyRead(). If it returns false,
+    we abort the operation. After this statement, we know that we have received
+    enough data.
+
+    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 11
+
+    Now we can create a QDataStream object, passing the socket to
+    QDataStream's constructor, and as in the other client examples we set
+    the stream protocol version to QDataStream::Qt_4_0, and read the size
+    of the packet.
+
+    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 12
+    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 13
+
+    Again, we'll use a loop that waits for more data by calling
+    QTcpSocket::waitForReadyRead(). In this loop, we're waiting until
+    QTcpSocket::bytesAvailable() returns the full packet size.
+
+    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 14
+
+    Now that we have all the data that we need, we can use QDataStream to
+    read the fortune string from the packet. The resulting fortune is
+    delivered by emitting newFortune().
+
+    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 15
+
+    The final part of our loop is that we acquire the mutex so that we can
+    safely read from our member data. We then let the thread go to sleep by
+    calling QWaitCondition::wait(). At this point, we can go back to
+    requestNewFortune() and look closed at the call to wakeOne():
+
+    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 1
+    \dots
+    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 3
+
+    What happened here was that because the thread falls asleep waiting for a
+    new request, we needed to wake it up again when a new request
+    arrives. QWaitCondition is often used in threads to signal a wakeup call
+    like this.
+
+    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 0
+
+    Finishing off the FortuneThread walkthrough, this is the destructor that
+    sets \e quit to true, wakes up the thread and waits for the thread to exit
+    before returning. This lets the \c while loop in run() will finish its current
+    iteration. When run() returns, the thread will terminate and be destroyed.
+
+    Now for the BlockingClient class:
+
+    \snippet examples/network/blockingfortuneclient/blockingclient.h 0
+
+    BlockingClient is very similar to the Client class in the
+    \l{network/fortuneclient}{Fortune Client} example, but in this class
+    we store a FortuneThread member instead of a pointer to a QTcpSocket.
+    When the user clicks the "Get Fortune" button, the same slot is called,
+    but its implementation is slightly different:
+
+    \snippet examples/network/blockingfortuneclient/blockingclient.cpp 0
+    \snippet examples/network/blockingfortuneclient/blockingclient.cpp 1
+
+    We connect our FortuneThread's two signals newFortune() and error() (which
+    are somewhat similar to QTcpSocket::readyRead() and QTcpSocket::error() in
+    the previous example) to requestNewFortune() and displayError().
+
+    \snippet examples/network/blockingfortuneclient/blockingclient.cpp 2
+
+    The requestNewFortune() slot calls FortuneThread::requestNewFortune(),
+    which \e shedules the request. When the thread has received a new fortune
+    and emits newFortune(), our showFortune() slot is called:
+
+    \snippet examples/network/blockingfortuneclient/blockingclient.cpp 3
+    \codeline
+    \snippet examples/network/blockingfortuneclient/blockingclient.cpp 4
+    
+    Here, we simply display the fortune we received as the argument.
+
+    \sa {Fortune Client Example}, {Fortune Server Example}
+*/
diff --git a/doc/src/examples/borderlayout.qdoc b/doc/src/examples/borderlayout.qdoc
new file mode 100644
index 0000000000..6275249fd6
--- /dev/null
+++ b/doc/src/examples/borderlayout.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example layouts/borderlayout
+    \title Border Layout Example
+
+    The Border Layout example shows how to create a custom layout that arranges
+    child widgets according to a simple set of rules.
+
+    \image borderlayout-example.png
+*/
diff --git a/doc/src/examples/broadcastreceiver.qdoc b/doc/src/examples/broadcastreceiver.qdoc
new file mode 100644
index 0000000000..253b68b01d
--- /dev/null
+++ b/doc/src/examples/broadcastreceiver.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example network/broadcastreceiver
+    \title Broadcast Receiver Example
+
+    The Broadcast Receiever example shows how to receive information that is broadcasted
+    over a local network.
+
+    \image broadcastreceiver-example.png
+*/
diff --git a/doc/src/examples/broadcastsender.qdoc b/doc/src/examples/broadcastsender.qdoc
new file mode 100644
index 0000000000..05975aa360
--- /dev/null
+++ b/doc/src/examples/broadcastsender.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example network/broadcastsender
+    \title Broadcast Sender Example
+
+    The Broadcast Sender example shows how to broadcast information to multiple clients
+    on a local network.
+
+    \image broadcastsender-example.png
+*/
diff --git a/doc/src/examples/cachedtable.qdoc b/doc/src/examples/cachedtable.qdoc
new file mode 100644
index 0000000000..b7f416bafb
--- /dev/null
+++ b/doc/src/examples/cachedtable.qdoc
@@ -0,0 +1,211 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example sql/cachedtable
+    \title Cached Table Example
+
+    The Cached Table example shows how a table view can be used to access a database,
+    caching any changes to the data until the user explicitly submits them using a
+    push button.
+
+    \image cachedtable-example.png
+
+    The example consists of a single class, \c TableEditor, which is a
+    custom dialog widget that allows the user to modify data stored in
+    a database. We will first review the class definiton and how to
+    use the class, then we will take a look at the implementation.
+
+    \section1 TableEditor Class Definition
+
+    The \c TableEditor class inherits QDialog making the table editor
+    widget a top-level dialog window.
+
+    \snippet examples/sql/cachedtable/tableeditor.h 0
+
+    The \c TableEditor constructor takes two arguments: The first is a
+    pointer to the parent widget and is passed on to the base class
+    constructor. The other is a reference to the database table the \c
+    TableEditor object will operate on.
+
+    Note the QSqlTableModel variable declaration: As we will see in
+    this example, the QSqlTableModel class can be used to provide data
+    to view classes such as QTableView. The QSqlTableModel class
+    provides an editable data model making it possible to read and
+    write database records from a single table. It is build on top of
+    the lower-level QSqlQuery class which provides means of executing
+    and manipulating SQL statements.
+
+    We are also going to show how a table view can be used to cache
+    any changes to the data until the user explicitly requests to
+    submit them. For that reason we need to declare a \c submit() slot
+    in additon to the model and the editor's buttons.
+
+    \table 100%
+    \header \o Connecting to a Database
+    \row
+    \o
+
+    Before we can use the \c TableEditor class, we must create a
+    connection to the database containing the table we want to edit:
+
+    \snippet examples/sql/cachedtable/main.cpp 0
+
+    The \c createConnection() function is a helper function provided
+    for convenience. It is defined in the \c connection.h file which
+    is located in the \c sql example directory (all the examples in
+    the \c sql directory use this function to connect to a database).
+
+    \snippet examples/sql/connection.h 0
+
+    The \c createConnection function opens a connection to an
+    in-memory SQLITE database and creates a test table.  If you want
+    to use another database, simply modify this function's code.
+    \endtable
+
+    \section1 TableEditor Class Implementation
+
+    The class implementation consists of only two functions, the
+    constructor and the \c submit() slot. In the constructor we create
+    and customize the data model and the various window elements:
+
+    \snippet examples/sql/cachedtable/tableeditor.cpp 0
+
+    First we create the data model and set the SQL database table we
+    want the model to operate on. Note that the
+    QSqlTableModel::setTable() function does not select data from the
+    table; it only fetches its field information. For that reason we
+    call the QSqlTableModel::select() function later on, populating
+    the model with data from the table. The selection can be
+    customized by specifying filters and sort conditions (see the
+    QSqlTableModel class documentation for more details).
+
+    We also set the model's edit strategy. The edit strategy dictates
+    when the changes done by the user in the view, are actually
+    applied to the database. Since we want to cache the changes in the
+    table view (i.e. in the model) until the user explicitly submits
+    them, we choose the QSqlTableModel::OnManualSubmit strategy. The
+    alternatives are QSqlTableModel::OnFieldChange and
+    QSqlTableModel::OnRowChange.
+
+    Finally, we set up the labels displayed in the view header using
+    the \l {QSqlQueryModel::setHeaderData()}{setHeaderData()} function
+    that the model inherits from the QSqlQueryModel class.
+
+    \snippet examples/sql/cachedtable/tableeditor.cpp 1
+
+    Then we create a table view. The QTableView class provides a
+    default model/view implementation of a table view, i.e. it
+    implements a table view that displays items from a model. It also
+    allows the user to edit the items, storing the changes in the
+    model. To create a read only view, set the proper flag using the
+    \l {QAbstractItemView::editTriggers}{editTriggers} property the
+    view inherits from the QAbstractItemView class.
+
+    To make the view present our data, we pass our model to the view
+    using the \l {QAbstractItemView::setModel()}{setModel()} function.
+
+    \snippet examples/sql/cachedtable/tableeditor.cpp 2
+
+    The \c {TableEditor}'s buttons are regular QPushButton objects. We
+    add them to a button box to ensure that the buttons are presented
+    in a layout that is appropriate to the current widget style. The
+    rationale for this is that dialogs and message boxes typically
+    present buttons in a layout that conforms to the interface
+    guidelines for that platform. Invariably, different platforms have
+    different layouts for their dialogs. QDialogButtonBox allows a
+    developer to add buttons to it and will automatically use the
+    appropriate layout for the user's desktop environment.
+
+    Most buttons for a dialog follow certain roles. When adding a
+    button to a button box using the \l
+    {QDialogButtonBox}{addButton()} function, the button's role must
+    be specified using the QDialogButtonBox::ButtonRole
+    enum. Alternatively, QDialogButtonBox provides several standard
+    buttons (e.g. \gui OK, \gui Cancel, \gui Save) that you can
+    use. They exist as flags so you can OR them together in the
+    constructor.
+
+    \snippet examples/sql/cachedtable/tableeditor.cpp 3
+
+    We connect the \gui Quit button to the table editor's \l
+    {QWidget::close()}{close()} slot, and the \gui Submit button to
+    our private \c submit() slot. The latter slot will take care of
+    the data transactions. Finally, we connect the \gui Revert button
+    to our model's \l {QSqlTableModel::revertAll()}{revertAll()} slot,
+    reverting all pending changes (i.e., restoring the original data).
+
+    \snippet examples/sql/cachedtable/tableeditor.cpp 4
+
+    In the end we add the button box and the table view to a layout,
+    install the layout on the table editor widget, and set the
+    editor's window title.
+
+    \snippet examples/sql/cachedtable/tableeditor.cpp 5
+
+    The \c submit() slot is called whenever the users hit the \gui
+    Submit button to save their changes.
+
+    First, we begin a transaction on the database using the
+    QSqlDatabase::transaction() function. A database transaction is a
+    unit of interaction with a database management system or similar
+    system that is treated in a coherent and reliable way independent
+    of other transactions. A pointer to the used database can be
+    obtained using the QSqlTableModel::database() function.
+
+    Then, we try to submit all the pending changes, i.e. the model's
+    modified items. If no error occurs, we commit the transaction to
+    the database using the QSqlDatabase::commit() function (note that
+    on some databases, this function will not work if there is an
+    active QSqlQuery on the database). Otherwise we perform a rollback
+    of the transaction using the QSqlDatabase::rollback() function and
+    post a warning to the user.
+
+    \table 100%
+    \row
+    \o
+    \bold {See also:}
+
+    A complete list of Qt's SQL \l {Database Classes}, and the \l
+    {Model/View Programming} documentation.
+
+    \endtable
+*/
diff --git a/doc/src/examples/calculator.qdoc b/doc/src/examples/calculator.qdoc
new file mode 100644
index 0000000000..2cae6ce8b5
--- /dev/null
+++ b/doc/src/examples/calculator.qdoc
@@ -0,0 +1,389 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example widgets/calculator
+    \title Calculator Example
+
+    The example shows how to use signals and slots to implement the
+    functionality of a calculator widget, and how to use QGridLayout
+    to place child widgets in a grid.
+
+    \image calculator-example.png Screenshot of the Calculator example
+
+    The example consists of two classes:
+
+    \list
+    \o \c Calculator is the calculator widget, with all the
+       calculator functionality.
+    \o \c Button is the widget used for each of the calculator
+       button. It derives from QToolButton.
+    \endlist
+
+    We will start by reviewing \c Calculator, then we will take a
+    look at \c Button.
+
+    \section1 Calculator Class Definition
+
+    \snippet examples/widgets/calculator/calculator.h 0
+
+    The \c Calculator class provides a simple calculator widget. It
+    inherits from QDialog and has several private slots associated
+    with the calculator's buttons. QObject::eventFilter() is
+    reimplemented to handle mouse events on the calculator's display.
+
+    Buttons are grouped in categories according to their behavior.
+    For example, all the digit buttons (labeled \gui 0 to \gui 9)
+    append a digit to the current operand. For these, we connect
+    multiple buttons to the same slot (e.g., \c digitClicked()). The
+    categories are digits, unary operators (\gui{Sqrt}, \gui{x\unicode{178}},
+    \gui{1/x}), additive operators (\gui{+}, \gui{-}), and
+    multiplicative operators (\gui{\unicode{215}}, \gui{\unicode{247}}). The other buttons
+    have their own slots.
+
+    \snippet examples/widgets/calculator/calculator.h 1
+    \snippet examples/widgets/calculator/calculator.h 2
+
+    The private \c createButton() function is used as part of the
+    widget construction. \c abortOperation() is called whenever a
+    division by zero occurs or when a square root operation is
+    applied to a negative number. \c calculate() applies a binary
+    operator (\gui{+}, \gui{-}, \gui{\unicode{215}}, or \gui{\unicode{247}}).
+
+    \snippet examples/widgets/calculator/calculator.h 3
+    \snippet examples/widgets/calculator/calculator.h 4
+    \snippet examples/widgets/calculator/calculator.h 5
+    \snippet examples/widgets/calculator/calculator.h 6
+    \snippet examples/widgets/calculator/calculator.h 7
+    \snippet examples/widgets/calculator/calculator.h 8
+
+    These variables, together with the contents of the calculator
+    display (a QLineEdit), encode the state of the calculator:
+
+    \list
+    \o \c sumInMemory contains the value stored in the calculator's memory
+       (using \gui{MS}, \gui{M+}, or \gui{MC}).
+    \o \c sumSoFar stores the value accumulated so far. When the user
+       clicks \gui{=}, \c sumSoFar is recomputed and shown on the
+       display. \gui{Clear All} resets \c sumSoFar to zero.
+    \o \c factorSoFar stores a temporary value when doing
+        multiplications and divisions.
+    \o \c pendingAdditiveOperator stores the last additive operator
+       clicked by the user.
+    \o \c pendingMultiplicativeOperator stores the last multiplicative operator
+       clicked by the user.
+    \o \c waitingForOperand is \c true when the calculator is
+       expecting the user to start typing an operand.
+    \endlist
+
+    Additive and multiplicative operators are treated differently
+    because they have different precedences. For example, \gui{1 + 2 \unicode{247}
+    3} is interpreted as \gui{1 + (2 \unicode{247} 3)} because \gui{\unicode{247}} has higher
+    precedence than \gui{+}.
+
+    The table below shows the evolution of the calculator state as
+    the user enters a mathematical expression.
+
+    \table
+    \header \o User Input            \o Display  \o Sum so Far \o Add. Op. \o Factor so Far \o Mult. Op. \o Waiting for Operand?
+    \row    \o                       \o 0        \o 0          \o          \o               \o           \o \c true
+    \row    \o \gui{1}               \o 1        \o 0          \o          \o               \o           \o \c false
+    \row    \o \gui{1 +}             \o 1        \o 1          \o \gui{+}  \o               \o           \o \c true
+    \row    \o \gui{1 + 2}           \o 2        \o 1          \o \gui{+}  \o               \o           \o \c false
+    \row    \o \gui{1 + 2 \unicode{247}}         \o 2        \o 1          \o \gui{+}  \o 2             \o \gui{\unicode{247}}   \o \c true
+    \row    \o \gui{1 + 2 \unicode{247} 3}       \o 3        \o 1          \o \gui{+}  \o 2             \o \gui{\unicode{247}}   \o \c false
+    \row    \o \gui{1 + 2 \unicode{247} 3 -}     \o 1.66667  \o 1.66667    \o \gui{-}  \o               \o           \o \c true
+    \row    \o \gui{1 + 2 \unicode{247} 3 - 4}   \o 4        \o 1.66667    \o \gui{-}  \o               \o           \o \c false
+    \row    \o \gui{1 + 2 \unicode{247} 3 - 4 =} \o -2.33333 \o 0          \o          \o               \o           \o \c true
+    \endtable
+
+    Unary operators, such as \gui Sqrt, require no special handling;
+    they can be applied immediately since the operand is already
+    known when the operator button is clicked.
+
+    \snippet examples/widgets/calculator/calculator.h 9
+    \codeline
+    \snippet examples/widgets/calculator/calculator.h 10
+
+    Finally, we declare the variables associated with the display and the
+    buttons used to display numerals.
+
+    \section1 Calculator Class Implementation
+
+    \snippet examples/widgets/calculator/calculator.cpp 0
+
+    In the constructor, we initialize the calculator's state. The \c
+    pendingAdditiveOperator and \c pendingMultiplicativeOperator
+    variables don't need to be initialized explicitly, because the
+    QString constructor initializes them to empty strings.
+
+    \snippet examples/widgets/calculator/calculator.cpp 1
+    \snippet examples/widgets/calculator/calculator.cpp 2
+
+    We create the QLineEdit representing the calculator's display and
+    set up some of its properties. In particular, we set it to be
+    read-only.
+
+    We also enlarge \c{display}'s font by 8 points.
+
+    \snippet examples/widgets/calculator/calculator.cpp 4
+
+    For each button, we call the private \c createButton() function with
+    the proper text label and a slot to connect to the button.
+
+    \snippet examples/widgets/calculator/calculator.cpp 5
+    \snippet examples/widgets/calculator/calculator.cpp 6
+
+    The layout is handled by a single QGridLayout. The
+    QLayout::setSizeConstraint() call ensures that the \c Calculator
+    widget is always shown as its optimal size (its
+    \l{QWidget::sizeHint()}{size hint}), preventing the user from
+    resizing the calculator. The size hint is determined by the size
+    and \l{QWidget::sizePolicy()}{size policy} of the child widgets.
+
+    Most child widgets occupy only one cell in the grid layout. For
+    these, we only need to pass a row and a column to
+    QGridLayout::addWidget(). The \c display, \c backspaceButton, \c
+    clearButton, and \c clearAllButton widgets occupy more than one
+    column; for these we must also pass a row span and a column
+    span.
+
+    \snippet examples/widgets/calculator/calculator.cpp 7
+
+    Pressing one of the calculator's digit buttons will emit the
+    button's \l{QToolButton::clicked()}{clicked()} signal, which will
+    trigger the \c digitClicked() slot.
+
+    First, we find out which button sent the signal using
+    QObject::sender(). This function returns the sender as a QObject
+    pointer. Since we know that the sender is a \c Button object, we
+    can safely cast the QObject. We could have used a C-style cast or
+    a C++ \c static_cast<>(), but as a defensive programming
+    technique we use a \l qobject_cast(). The advantage is that if
+    the object has the wrong type, a null pointer is returned.
+    Crashes due to null pointers are much easier to diagnose than
+    crashes due to unsafe casts. Once we have the button, we extract
+    the operator using QToolButton::text().
+
+    The slot needs to consider two situations in particular. If \c
+    display contains "0" and the user clicks the \gui{0} button, it
+    would be silly to show "00". And if the calculator is in
+    a state where it is waiting for a new operand,
+    the new digit is the first digit of that new operand; in that case,
+    any result of a previous calculation must be cleared first.
+
+    At the end, we append the new digit to the value in the display.
+
+    \snippet examples/widgets/calculator/calculator.cpp 8
+    \snippet examples/widgets/calculator/calculator.cpp 9
+
+    The \c unaryOperatorClicked() slot is called whenever one of the
+    unary operator buttons is clicked. Again a pointer to the clicked
+    button is retrieved using QObject::sender(). The operator is
+    extracted from the button's text and stored in \c
+    clickedOperator. The operand is obtained from \c display.
+
+    Then we perform the operation. If \gui Sqrt is applied to a
+    negative number or \gui{1/x} to zero, we call \c
+    abortOperation(). If everything goes well, we display the result
+    of the operation in the line edit and we set \c waitingForOperand
+    to \c true. This ensures that if the user types a new digit, the
+    digit will be considered as a new operand, instead of being
+    appended to the current value.
+
+    \snippet examples/widgets/calculator/calculator.cpp 10
+    \snippet examples/widgets/calculator/calculator.cpp 11
+
+    The \c additiveOperatorClicked() slot is called when the user
+    clicks the \gui{+} or \gui{-} button.
+
+    Before we can actually do something about the clicked operator,
+    we must handle any pending operations. We start with the
+    multiplicative operators, since these have higher precedence than
+    additive operators:
+
+    \snippet examples/widgets/calculator/calculator.cpp 12
+    \snippet examples/widgets/calculator/calculator.cpp 13
+
+    If \gui{\unicode{215}} or \gui{\unicode{247}} has been clicked earlier, without clicking
+    \gui{=} afterward, the current value in the display is the right
+    operand of the \gui{\unicode{215}} or \gui{\unicode{247}} operator and we can finally
+    perform the operation and update the display.
+
+    \snippet examples/widgets/calculator/calculator.cpp 14
+    \snippet examples/widgets/calculator/calculator.cpp 15
+
+    If \gui{+} or \gui{-} has been clicked earlier, \c sumSoFar is
+    the left operand and the current value in the display is the
+    right operand of the operator. If there is no pending additive
+    operator, \c sumSoFar is simply set to be the text in the
+    display.
+
+    \snippet examples/widgets/calculator/calculator.cpp 16
+    \snippet examples/widgets/calculator/calculator.cpp 17
+
+    Finally, we can take care of the operator that was just clicked.
+    Since we don't have the right-hand operand yet, we store the clicked
+    operator in the \c pendingAdditiveOperator variable. We will
+    apply the operation later, when we have a right operand, with \c
+    sumSoFar as the left operand.
+
+    \snippet examples/widgets/calculator/calculator.cpp 18
+
+    The \c multiplicativeOperatorClicked() slot is similar to \c
+    additiveOperatorClicked(). We don't need to worry about pending
+    additive operators here, because multiplicative operators have
+    precedence over additive operators.
+
+    \snippet examples/widgets/calculator/calculator.cpp 20
+
+    Like in \c additiveOperatorClicked(), we start by handing any
+    pending multiplicative and additive operators. Then we display \c
+    sumSoFar and reset the variable to zero. Resetting the variable
+    to zero is necessary to avoid counting the value twice.
+
+    \snippet examples/widgets/calculator/calculator.cpp 22
+
+    The \c pointClicked() slot adds a decimal point to the content in
+    \c display.
+
+    \snippet examples/widgets/calculator/calculator.cpp 24
+
+    The \c changeSignClicked() slot changes the sign of the value in
+    \c display. If the current value is positive, we prepend a minus
+    sign; if the current value is negative, we remove the first
+    character from the value (the minus sign).
+
+    \snippet examples/widgets/calculator/calculator.cpp 26
+
+    The \c backspaceClicked() removes the rightmost character in the
+    display. If we get an empty string, we show "0" and set \c
+    waitingForOperand to \c true.
+
+    \snippet examples/widgets/calculator/calculator.cpp 28
+
+    The \c clear() slot resets the current operand to zero. It is
+    equivalent to clicking \gui Backspace enough times to erase the
+    entire operand.
+
+    \snippet examples/widgets/calculator/calculator.cpp 30
+
+    The \c clearAll() slot resets the calculator to its initial state.
+
+    \snippet examples/widgets/calculator/calculator.cpp 32
+
+    The \c clearMemory() slot erases the sum kept in memory, \c
+    readMemory() displays the sum as an operand, \c setMemory()
+    replace the sum in memory with the current sum, and \c
+    addToMemory() adds the current value to the value in memory. For
+    \c setMemory() and \c addToMemory(), we start by calling \c
+    equalClicked() to update \c sumSoFar and the value in the
+    display.
+
+    \snippet examples/widgets/calculator/calculator.cpp 34
+
+    The private \c createButton() function is called from the
+    constructor to create calculator buttons.
+
+    \snippet examples/widgets/calculator/calculator.cpp 36
+
+    The private \c abortOperation() function is called whenever a
+    calculation fails. It resets the calculator state and displays
+    "####".
+
+    \snippet examples/widgets/calculator/calculator.cpp 38
+
+    The private \c calculate() function performs a binary operation.
+    The right operand is given by \c rightOperand. For additive
+    operators, the left operand is \c sumSoFar; for multiplicative
+    operators, the left operand is \c factorSoFar. The function
+    return \c false if a division by zero occurs.
+
+    \section1 Button Class Definition
+
+    Let's now take a look at the \c Button class:
+
+    \snippet examples/widgets/calculator/button.h 0
+
+    The \c Button class has a convenience constructor that takes a
+    text label and a parent widget, and it reimplements QWidget::sizeHint()
+    to provide more space around the text than the amount QToolButton
+    normally provides.
+
+    \section1 Button Class Implementation
+
+    \snippet examples/widgets/calculator/button.cpp 0
+
+    The buttons' appearance is determined by the layout of the
+    calculator widget through the size and
+    \l{QWidget::sizePolicy}{size policy} of the layout's child
+    widgets. The call to the
+    \l{QWidget::setSizePolicy()}{setSizePolicy()} function in the
+    constructor ensures that the button will expand horizontally to
+    fill all the available space; by default, \l{QToolButton}s don't
+    expand to fill available space. Without this call, the different
+    buttons in a same column would have different widths.
+
+    \snippet examples/widgets/calculator/button.cpp 1
+    \snippet examples/widgets/calculator/button.cpp 2
+
+    In \l{QWidget::sizeHint()}{sizeHint()}, we try to return a size
+    that looks good for most buttons. We reuse the size hint of the
+    base class (QToolButton) but modify it in the following ways:
+
+    \list
+    \o We add 20 to the \l{QSize::height()}{height} component of the size hint.
+    \o We make the \l{QSize::width()}{width} component of the size
+       hint at least as much as the \l{QSize::width()}{height}.
+    \endlist
+
+    This ensures that with most fonts, the digit and operator buttons
+    will be square, without truncating the text on the
+    \gui{Backspace}, \gui{Clear}, and \gui{Clear All} buttons.
+
+    The screenshot below shows how the \c Calculator widget would
+    look like if we \e didn't set the horizontal size policy to
+    QSizePolicy::Expanding in the constructor and if we didn't
+    reimplement QWidget::sizeHint().
+
+    \image calculator-ugly.png The Calculator example with default size policies and size hints
+
+*/
diff --git a/doc/src/examples/calculatorbuilder.qdoc b/doc/src/examples/calculatorbuilder.qdoc
new file mode 100644
index 0000000000..c63267e1e8
--- /dev/null
+++ b/doc/src/examples/calculatorbuilder.qdoc
@@ -0,0 +1,133 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example designer/calculatorbuilder
+    \title Calculator Builder Example
+
+    The Calculator Builder example shows how to create a user interface from
+    a \QD form at run-time, using the QUiLoader class.
+
+    \image calculatorbuilder-example.png
+
+    We use the form created in the \l{designer/calculatorform}{Calculator Form}
+    example to show that the same user interface can be generated when the
+    application is executed or defined when the application is built.
+
+    \section1 Preparation
+
+    The \l{designer/calculatorform}{Calculator Form} example defines a user
+    interface that we can use without modification. In this example, we use a
+    \l{The Qt Resource System}{resource file} to contain the \c{calculatorform.ui}
+    file created in the previous example, but it could be stored on disk instead.
+
+    To generate a form at run time, we need to link the example against the
+    \c QtUiTools module library. The project file we use contains all the
+    necessary information to do this:
+
+    \snippet examples/designer/calculatorbuilder/calculatorbuilder.pro 0
+
+    All the other necessary files are declared as usual.
+
+    \section1 CalculatorForm Class Definition
+
+    The \c CalculatorForm class defines the widget used to host the form's
+    user interface:
+
+    \snippet examples/designer/calculatorbuilder/calculatorform.h 0
+
+    Note that we do not need to include a header file to describe the user
+    interface. We only define two public slots, using the auto-connection
+    naming convention required by \c uic, and declare private variables
+    that we will use to access widgets provided by the form after they are
+    constructed.
+
+    \section1 CalculatorForm Class Implementation
+
+    We will need to use the QUiLoader class that is provided by the
+    \c libQtUiTools library, so we first ensure that we include the header
+    file for the module:
+
+    \snippet examples/designer/calculatorbuilder/calculatorform.cpp 0
+
+    The constructor uses a form loader object to construct the user
+    interface that we retrieve, via a QFile object, from the example's
+    resources:
+
+    \snippet examples/designer/calculatorbuilder/calculatorform.cpp 1
+
+    By including the user interface in the example's resources, we ensure
+    that it will be present when the example is run. The \c{loader.load()}
+    function takes the user interface description contained in the file
+    and constructs the form widget as a child widget of the \c{CalculatorForm}.
+
+    We are interested in three widgets in the generated user interface:
+    two spin boxes and a label. For convenience, we retrieve pointers to
+    these widgets from the widget that was constructed by the \c FormBuilder,
+    and we record them for later use. The \c qFindChild() template function
+    allows us to query widgets in order to find named child widgets.
+
+    \snippet examples/designer/calculatorbuilder/calculatorform.cpp 2
+
+    The widgets created by the form loader need to be connected to the
+    specially-named slots in the \c CalculatorForm object. We use Qt's
+    meta-object system to enable these connections:
+
+    \snippet examples/designer/calculatorbuilder/calculatorform.cpp 3
+
+    The form widget is added to a layout, and the window title is set:
+
+    \snippet examples/designer/calculatorbuilder/calculatorform.cpp 4
+
+    The two slots that modify widgets provided by the form are defined
+    in a similar way to those in the \l{designer/calculatorform}{Calculator
+    Form} example, except that we read the values from the spin boxes and
+    write the result to the output widget via the pointers we recorded in
+    the constructor:
+
+    \snippet examples/designer/calculatorbuilder/calculatorform.cpp 5
+    \codeline
+    \snippet examples/designer/calculatorbuilder/calculatorform.cpp 7
+
+    The advantage of this approach is that we can replace the form when the
+    application is run, but we can still manipulate the widgets it contains
+    as long as they are given appropriate names.
+*/
diff --git a/doc/src/examples/calculatorform.qdoc b/doc/src/examples/calculatorform.qdoc
new file mode 100644
index 0000000000..a8e891e3c3
--- /dev/null
+++ b/doc/src/examples/calculatorform.qdoc
@@ -0,0 +1,126 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example designer/calculatorform
+    \title Calculator Form Example
+
+    The Calculator Form Example shows how to use a form created with
+    \QD in an application by using the user interface information from
+    a QWidget subclass.  We use \l{Using a Designer .ui File in Your Application} 
+    {uic's auto-connection} feature to automatically connect signals 
+    from widgets on the form to slots in our code.
+
+    \image calculatorform-example.png Screenshot of the Calculator Form example
+
+    The example presents two spin boxes that are used to input integer values
+    and a label that shows their sum. Whenever either of the spin boxes are
+    updated, the signal-slot connections between the widgets and the form
+    ensure that the label is also updated.
+
+    \section1 Preparation
+
+    The user interface for this example is designed completely using \QD. The
+    result is a .ui file describing the form, the widgets used, any signal-slot
+    connections between them, and other standard user interface properties.
+
+    To ensure that the example can use this file, we need to include a \c FORMS
+    declaration in the example's project file:
+
+    \snippet examples/designer/calculatorform/calculatorform.pro 1
+
+    When the project is built, \c uic will create a header file that lets us
+    construct the form.
+
+    \section1 CalculatorForm Class Definition
+
+    The \c CalculatorForm class uses the user interface described in the
+    \c calculatorform.ui file. To access the form and its contents, we need
+    to include the \c ui_calculatorform.h header file created by \c uic
+    during the build process:
+
+    \snippet examples/designer/calculatorform/calculatorform.h 0
+
+    We define the \c CalculatorForm class by subclassing QWidget because the
+    form itself is based on QWidget:
+
+    \snippet examples/designer/calculatorform/calculatorform.h 1
+
+    Apart from the constructor, the class contains two private slots that
+    are named according to the auto-connection naming convention required
+    by \c uic.
+    The private \c ui member variable refers to the form, and is used to
+    access the contents of the user interface.
+
+    \section1 CalculatorForm Class Implementation
+
+    The constructor simply calls the base class's constructor and
+    sets up the form's user interface.
+
+    \snippet examples/designer/calculatorform/calculatorform.cpp 0
+
+    The user interface is set up with the \c setupUI() function. We pass
+    \c this as the argument to this function to use the \c CalculatorForm
+    widget itself as the container for the user interface.
+
+    To automatically connect signals from the spin boxes defined in the
+    user interface, we use the naming convention that indicates which
+    widgets and their signals in the user interface should be connected
+    to each slot. The first slot is called whenever the spin box called
+    "inputSpinBox1" in the user interface emits the
+    \l{QSpinBox::valueChanged()}{valueChanged()} signal:
+
+    \snippet examples/designer/calculatorform/calculatorform.cpp 1
+
+    When this occurs, we use the value supplied by the signal to update the
+    output label by setting its new text directly. We access the output label
+    and the other spin box via the class's private \c ui variable.
+
+    The second slot is called whenever the second spin box, called
+    "inputSpinBox2", emits the \l{QSpinBox::valueChanged()}{valueChanged()}
+    signal:
+
+    \snippet examples/designer/calculatorform/calculatorform.cpp 2
+
+    In this case, the value from the first spin box is read and combined
+    with the value supplied by the signal. Again, the output label is
+    updated directly via the \c ui variable.
+*/
diff --git a/doc/src/examples/calendar.qdoc b/doc/src/examples/calendar.qdoc
new file mode 100644
index 0000000000..e6beef4a0f
--- /dev/null
+++ b/doc/src/examples/calendar.qdoc
@@ -0,0 +1,237 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example richtext/calendar
+    \title Calendar Example
+
+    The Calendar example shows how to create rich text content and display it using
+    a rich text editor.
+
+    \image calendar-example.png
+
+    Specifically, the example demonstrates the following:
+
+    \list
+      \o Use of a text editor with a text document
+      \o Insertion of tables and frames into a document
+      \o Navigation within a table
+      \o Insert text in different styles
+    \endlist
+
+    The rich text editor used to display the document is used within a main window
+    application.
+
+    \section1 MainWindow Class Definition
+
+    The \c MainWindow class provides a text editor widget and some controls to
+    allow the user to change the month and year shown. The font size used for the
+    text can also be adjusted.
+
+    \snippet examples/richtext/calendar/mainwindow.h 0
+
+    The private \c insertCalendar() function performs most of the work, relying on
+    the \c fontSize and \c selectedDate variables to write useful information to
+    the \c editor.
+
+    \section1 MainWindow Class Implementation
+
+    The \c MainWindow constructor sets up the user interface and initializes
+    variables used to generate a calendar for each month.
+
+    \snippet examples/richtext/calendar/mainwindow.cpp 0
+
+    We begin by setting default values for the selected date that will be highlighted
+    in the calendar and the font size to be used. Since we are using a QMainWindow
+    for the user interface, we construct a widget for use as the central widget.
+
+    The user interface will include a line of controls above the generated calendar;
+    we construct a label and a combobox to allow the month to be selected, and a
+    spin box for the year. These widgets are configured to provide a reasonable range
+    of values for the user to try:
+
+    \snippet examples/richtext/calendar/mainwindow.cpp 1
+
+    We use the \c selectedDate object to obtain the current month and year, and we
+    set these in the combobox and spin box:
+
+    The font size is displayed in a spin box which we restrict to a sensible range
+    of values:
+
+    \snippet examples/richtext/calendar/mainwindow.cpp 2
+
+    We construct an editor and use the \c insertCalendar() function to create
+    a calendar for it. Each calendar is displayed in the same text editor; in
+    this example we use a QTextBrowser since we do not allow the calendar to be
+    edited.
+
+    The controls used to set the month, year, and font size will not have any
+    effect on the appearance of the calendar unless we make some signal-slot
+    connections:
+
+    \snippet examples/richtext/calendar/mainwindow.cpp 3
+
+    The signals are connected to some simple slots in the \c MainWindow class
+    which we will describe later.
+
+    We create layouts to manage the widgets we constructed:
+
+    \snippet examples/richtext/calendar/mainwindow.cpp 4
+
+    Finally, the central widget is set for the window.
+
+    Each calendar is created for the editor by the \c insertCalendar() function
+    which uses the date and font size, defined by the private \a selectedDate
+    and \c fontSize variables, to produce a suitable plan for the specified
+    month and year.
+
+    \snippet examples/richtext/calendar/mainwindow.cpp 5
+
+    We begin by clearing the editor's rich text document, and obtain a text
+    cursor from the editor that we will use to add content. We also create a
+    QDate object based on the currently selected date.
+
+    The calendar is made up of a table with a gray background color that contains
+    seven columns: one for each day of the week. It is placed in the center of the
+    page with equal space to the left and right of it. All of these properties are
+    set in a QTextTableFormat object:
+
+    \snippet examples/richtext/calendar/mainwindow.cpp 6
+
+    Each cell in the table will be padded and spaced to make the text easier to
+    read.
+
+    We want the columns to have equal widths, so we provide a vector containing
+    percentage widths for each of them and set the constraints in the
+    QTextTableFormat:
+
+    \snippet examples/richtext/calendar/mainwindow.cpp 7
+
+    The constraints used for the column widths are only useful if the table has
+    an appropriate number of columns. With the format for the table defined, we
+    construct a new table with one row and seven columns at the current cursor
+    position:
+
+    \snippet examples/richtext/calendar/mainwindow.cpp 8
+
+    We only need one row to start with; more can be added as we need them. Using
+    this approach means that we do not need to perform any date calculations
+    until we add cells to the table.
+
+    When inserting objects into a document with the cursor's insertion functions,
+    the cursor is automatically moved inside the newly inserted object. This means
+    that we can immediately start modifying the table from within:
+
+    \snippet examples/richtext/calendar/mainwindow.cpp 9
+
+    Since the table has an outer frame, we obtain the frame and its format so that
+    we can customize it. After making the changes we want, we set the frame's format
+    using the modified format object. We have given the table an outer border one
+    pixel wide.
+
+    \snippet examples/richtext/calendar/mainwindow.cpp 10
+
+    In a similar way, we obtain the cursor's current character format and
+    create customized formats based on it.
+
+    We do not set the format on the cursor because this would change the default
+    character format; instead, we use the customized formats explicitly when we
+    insert text. The following loop inserts the days of the week into the table
+    as bold text:
+
+    \snippet examples/richtext/calendar/mainwindow.cpp 11
+
+    For each day of the week, we obtain an existing table cell in the first row
+    (row 0) using the table's \l{QTextTable::cellAt()}{cellAt()} function. Since
+    we start counting the days of the week at day 1 (Monday), we subtract 1 from
+    \c weekDay to ensure that we obtain the cell for the correct column of the
+    table.
+
+    Before text can be inserted into a cell, we must obtain a cursor with the
+    correct position in the document. The cell provides a function for this
+    purpose, and we use this cursor to insert text using the \c boldFormat
+    character format that we created earlier:
+
+    \snippet examples/richtext/calendar/mainwindow.cpp 12
+
+    Inserting text into document objects usually follows the same pattern.
+    Each object can provide a new cursor that corresponds to the first valid
+    position within itself, and this can be used to insert new content. We
+    continue to use this pattern as we insert the days of the month into the
+    table.
+
+    Since every month has more than seven days, we insert a single row to begin
+    and add days until we reach the end of the month. If the current date is
+    encountered, it is inserted with a special format (created earlier) that
+    makes it stand out:
+
+    \snippet examples/richtext/calendar/mainwindow.cpp 13
+
+    We add a new row to the table at the end of each week only if the next week
+    falls within the currently selected month.
+
+    For each calendar that we create, we change the window title to reflect the
+    currently selected month and year:
+
+    \snippet examples/richtext/calendar/mainwindow.cpp 14
+
+    The \c insertCalendar() function relies on up-to-date values for the month,
+    year, and font size. These are set in the following slots:
+
+    \snippet examples/richtext/calendar/mainwindow.cpp 15
+
+    The \c setFontSize() function simply changes the private \c fontSize variable
+    before updating the calendar.
+
+    \snippet examples/richtext/calendar/mainwindow.cpp 16
+
+    The \c setMonth slot is called when the QComboBox used to select the month is
+    updated. The value supplied is the currently selected row in the combobox.
+    We add 1 to this value to obtain a valid month number, and create a new QDate
+    based on the existing one. The calendar is then updated to use this new date.
+
+    \snippet examples/richtext/calendar/mainwindow.cpp 17
+
+    The \c setYear() slot is called when the QDateTimeEdit used to select the
+    year is updated. The value supplied is a QDate object; this makes
+    the construction of a new value for \c selectedDate simple. We update the
+    calendar afterwards to use this new date.
+*/
diff --git a/doc/src/examples/calendarwidget.qdoc b/doc/src/examples/calendarwidget.qdoc
new file mode 100644
index 0000000000..f4417c2a3f
--- /dev/null
+++ b/doc/src/examples/calendarwidget.qdoc
@@ -0,0 +1,305 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \title Calendar Widget Example
+    \example widgets/calendarwidget
+
+    The Calendar Widget example shows use of \c QCalendarWidget.
+
+    \image calendarwidgetexample.png
+
+    QCalendarWidget displays one calendar month
+    at a time and lets the user select a date.
+    The calendar consists of four components: a navigation
+    bar that lets the user change the month that is
+    displayed, a grid where each cell represents one day
+    in the month, and two headers that display weekday names
+    and week numbers.
+
+    The Calendar Widget example displays a QCalendarWidget and lets the user
+    configure its appearance and behavior using
+    \l{QComboBox}es, \l{QCheckBox}es, and \l{QDateEdit}s. In
+    addition, the user can influence the formatting of individual dates
+    and headers.
+
+    The properties of the QCalendarWidget are summarized in the table
+    below.
+
+    \table
+    \header \o Property
+            \o Description
+    \row \o \l{QCalendarWidget::}{selectedDate}
+         \o The currently selected date.
+    \row \o \l{QCalendarWidget::}{minimumDate}
+         \o The earliest date that can be selected.
+    \row \o \l{QCalendarWidget::}{maximumDate}
+         \o The latest date that can be selected.
+    \row \o \l{QCalendarWidget::}{firstDayOfWeek}
+         \o The day that is displayed as the first day of the week
+            (usually Sunday or Monday).
+    \row \o \l{QCalendarWidget::}{gridVisible}
+         \o Whether the grid should be shown.
+    \row \o \l{QCalendarWidget::}{selectionMode}
+         \o Whether the user can select a date or not.
+    \row \o \l{QCalendarWidget::}{horizontalHeaderFormat}
+         \o The format of the day names in the horizontal header
+            (e.g., "M", "Mon", or "Monday").
+    \row \o \l{QCalendarWidget::}{verticalHeaderFormat}
+         \o The format of the vertical header.
+    \row \o \l{QCalendarWidget::}{navigationBarVisible}
+         \o Whether the navigation bar at the top of the calendar
+            widget is shown.
+    \endtable
+
+    The example consists of one class, \c Window, which creates and
+    lays out the QCalendarWidget and the other widgets that let the
+    user configure the QCalendarWidget.
+
+    \section1 Window Class Definition
+
+    Here is the definition of the \c Window class:
+
+    \snippet examples/widgets/calendarwidget/window.h 0
+    \dots
+    \snippet examples/widgets/calendarwidget/window.h 1
+
+    As is often the case with classes that represent self-contained
+    windows, most of the API is private. We will review the private
+    members as we stumble upon them in the implementation.
+
+    \section1 Window Class Implementation
+
+    Let's now review the class implementation, starting with the constructor:
+
+    \snippet examples/widgets/calendarwidget/window.cpp 0
+
+    We start by creating the four \l{QGroupBox}es and their child
+    widgets (including the QCalendarWidget) using four private \c
+    create...GroupBox() functions, described below. Then we arrange
+    the group boxes in a QGridLayout.
+
+    We set the grid layout's resize policy to QLayout::SetFixedSize to
+    prevent the user from resizing the window. In that mode, the
+    window's size is set automatically by QGridLayout based on the
+    size hints of its contents widgets.
+
+    To ensure that the window isn't automatically resized every time
+    we change a property of the QCalendarWidget (e.g., hiding the
+    navigation bar, trhe vertical header, or the grid), we set the
+    minimum height of row 0 and the minimum width of column 0 to the
+    initial size of the QCalendarWidget.
+
+    Let's move on to the \c createPreviewGroupBox() function:
+
+    \snippet examples/widgets/calendarwidget/window.cpp 9
+
+    The \gui Preview group box contains only one widget: the
+    QCalendarWidget. We set it up, connect its
+    \l{QCalendarWidget::}{currentPageChanged()} signal to our \c
+    reformatCalendarPage() slot to make sure that every new page gets
+    the formatting specified by the user.
+
+    The \c createGeneralOptionsGroupBox() function is somewhat large
+    and several widgets are set up the same way; we look at parts of
+    its implementation here and skip the rest:
+
+    \snippet examples/widgets/calendarwidget/window.cpp 10
+    \dots
+
+    We start with the setup of the \gui{Week starts on} combobox.
+    This combobox controls which day should be displayed as the first
+    day of the week.
+
+    The QComboBox class lets us attach user data as a QVariant to
+    each item. The data can later be retrieved with QComboBox's
+    \l{QComboBox::}{itemData()} function. QVariant doesn't directly
+    support the Qt::DayOfWeek data type, but it supports \c int, and
+    C++ will happily convert any enum value to \c int.
+
+    \dots
+    \snippet examples/widgets/calendarwidget/window.cpp 11
+    \dots
+
+    After creating the widgets, we connect the signals and slots. We
+    connect the comboboxes to private slots of \c Window or to
+    public slots provided by QComboBox.
+
+    \dots
+    \snippet examples/widgets/calendarwidget/window.cpp 12
+
+    At the end of the function, we call the slots that update the calendar to ensure
+    that the QCalendarWidget is synchronized with the other widgets on startup.
+
+    Let's now take a look at the \c createDatesGroupBox() private function:
+
+    \snippet examples/widgets/calendarwidget/window.cpp 13
+
+    In this function, we create the \gui {Minimum Date}, \gui {Maximum Date},
+    and \gui {Current Date} editor widgets,
+    which control the calendar's minimum, maximum, and selected dates.
+    The calendar's minimum and maximum dates have already been
+    set in \c createPrivewGroupBox(); we can then set the widgets
+    default values to the calendars values.
+
+    \snippet examples/widgets/calendarwidget/window.cpp 14
+    \dots
+    \snippet examples/widgets/calendarwidget/window.cpp 15
+
+    We connect the \c currentDateEdit's
+    \l{QDateEdit::}{dateChanged()} signal directly to the calendar's
+    \l{QCalendarWidget::}{setSelectedDate()} slot. When the calendar's
+    selected date changes, either as a result of a user action or
+    programmatically, our \c selectedDateChanged() slot updates
+    the \gui {Current Date} editor. We also need to react when the user
+    changes the \gui{Minimum Date} and \gui{Maximum Date} editors.
+
+    Here is the \c createTextFormatsGroup() function:
+
+    \snippet examples/widgets/calendarwidget/window.cpp 16
+
+    We set up the \gui {Weekday Color} and \gui {Weekend Color} comboboxes
+    using \c createColorCombo(), which instantiates a QComboBox and
+    populates it with colors ("Red", "Blue", etc.).
+
+    \snippet examples/widgets/calendarwidget/window.cpp 17
+
+    The \gui {Header Text Format} combobox lets the user change the
+    text format (bold, italic, or plain) used for horizontal and
+    vertical headers. The \gui {First Friday in blue} and \gui {May 1
+    in red} check box affect the rendering of specific dates.
+
+    \snippet examples/widgets/calendarwidget/window.cpp 18
+
+    We connect the check boxes and comboboxes to various private
+    slots. The \gui {First Friday in blue} and \gui {May 1 in red}
+    check boxes are both connected to \c reformatCalendarPage(),
+    which is also called when the calendar switches month.
+
+    \dots
+    \snippet examples/widgets/calendarwidget/window.cpp 19
+
+    At the end of \c createTextFormatsGroupBox(), we call private
+    slots to synchronize the QCalendarWidget with the other widgets.
+
+    We're now done reviewing the four \c create...GroupBox()
+    functions. Let's now take a look at the other private functions
+    and slots.
+
+    \snippet examples/widgets/calendarwidget/window.cpp 20
+
+    In \c createColorCombo(), we create a combobox and populate it with
+    standard colors. The second argument to QComboBox::addItem()
+    is a QVariant storing user data (in this case, QColor objects).
+
+    This function was used to set up the \gui {Weekday Color}
+    and \gui {Weekend Color} comboboxes.
+
+    \snippet examples/widgets/calendarwidget/window.cpp 1
+
+    When the user changes the \gui {Week starts on} combobox's
+    value, \c firstDayChanged() is invoked with the index of the
+    combobox's new value. We retrieve the custom data item
+    associated with the new current item using
+    \l{QComboBox::}{itemData()} and cast it to a Qt::DayOfWeek.
+
+    \c selectionModeChanged(), \c horizontalHeaderChanged(), and \c
+    verticalHeaderChanged() are very similar to \c firstDayChanged(),
+    so they are omitted.
+
+    \snippet examples/widgets/calendarwidget/window.cpp 2
+
+    The \c selectedDateChanged() updates the \gui{Current Date}
+    editor to reflect the current state of the QCalendarWidget.
+
+    \snippet examples/widgets/calendarwidget/window.cpp 3
+
+    When the user changes the minimum date, we tell the
+    QCalenderWidget. We also update the \gui {Maximum Date} editor,
+    because if the new minimum date is later than the current maximum
+    date, QCalendarWidget will automatically adapt its maximum date
+    to avoid a contradicting state.
+
+    \snippet examples/widgets/calendarwidget/window.cpp 4
+
+    \c maximumDateChanged() is implemented similarly to \c
+    minimumDateChanged().
+
+    \snippet examples/widgets/calendarwidget/window.cpp 5
+
+    Each combobox item has a QColor object as user data corresponding to the
+    item's text. After fetching the colors from the comboboxes, we
+    set the text format of each day of the week.
+
+    The text format of a column in the calendar is given as a
+    QTextCharFormat, which besides the foreground color lets us
+    specify various character formatting information. In this
+    example, we only show a subset of the possibilities.
+
+    \snippet examples/widgets/calendarwidget/window.cpp 6
+
+    \c weekendFormatChanged() is the same as \c
+    weekdayFormatChanged(), except that it affects Saturday and
+    Sunday instead of Monday to Friday.
+
+    \snippet examples/widgets/calendarwidget/window.cpp 7
+
+    The \c reformatHeaders() slot is called when the user
+    changes the text format of
+    the headers. We compare the current text of the \gui {Header Text Format}
+    combobox to determine which format to apply. (An alternative would
+    have been to store \l{QTextCharFormat} values alongside the combobox
+    items.)
+
+    \snippet examples/widgets/calendarwidget/window.cpp 8
+
+    In \c reformatCalendarPage(), we set the text format of the first
+    Friday in the month and May 1 in the current year. The text
+    formats that are actually used depend on which check boxes are
+    checked.
+
+    QCalendarWidget lets us set the text format of individual dates
+    with the \l{QCalendarWidget::}{setDateTextFormat()}. We chose to
+    set the dates when the calendar page changes, i.e., a new month is
+    displayed. We check which of the \c mayFirstCheckBox and \c
+    firstDayCheckBox, if any, are checked
+    and set the text formats accordingly.
+*/
diff --git a/doc/src/examples/capabilitiesexample.qdoc b/doc/src/examples/capabilitiesexample.qdoc
new file mode 100644
index 0000000000..9d62c71bef
--- /dev/null
+++ b/doc/src/examples/capabilitiesexample.qdoc
@@ -0,0 +1,171 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example phonon/capabilities
+    \title Capabilities Example
+
+    The Backend Capabilities example shows how to check which MIME
+    types, audio devices, and audio effects are available.
+
+    \image capabilitiesexample.png
+
+    Phonon does not implement the multimedia functionality itself, but
+    relies on a backend to manage this. The backends do not manage the
+    hardware directly, but use intermediate technologies: QuickTime on
+    Mac, GStreamer on Linux, and DirectShow (which requires DirectX)
+    on Windows. 
+
+    The user may add support for new MIME types and effects to these
+    systems, and the systems abilities may also be different. The
+    support for multimedia MIME types, and audio effects in Phonon
+    will therefore vary from system to system.
+
+    Backends informs the programmer about current capabilities through
+    an implementation of the Phonon::BackendCapabilities namespace.
+    The backend reports which MIME types can be played back, which
+    audio effects are available, and which sound devices are available
+    on the system. When the capabilities of a backend changes, it will
+    emit the
+    \l{Phonon::BackendCapabilities::Notifier::}{capabilitiesChanged()}
+    signal.
+
+    The example consists of one class, \c Window, which displays
+    capabilities information from the current backend used by Phonon.
+
+    See the \l{Phonon Overview} for a high-level introduction to
+    Phonon.
+
+    \section1 Window Class Definition
+
+    The \c Window class queries the Phonon backend for its
+    capabilities. The results are presented in a GUI consisting of
+    standard Qt widgets. We will now take a tour of the Phonon related
+    parts of both the definition and implementation of the \c Window
+    class.
+
+    \snippet examples/phonon/capabilities/window.h windowMembers
+
+    We need the slot to notice changes in the backends capabilities. 
+
+    \c mimeListWidget and \c devicesListView lists MIME types and
+    audio devices. The \c effectsTreeWidget lists audio effects, and
+    expands to show their parameters.
+
+    The \c setupUi() and \c setupBackendBox() private utility
+    functions create the widgets and lays them out. We skip these
+    functions while discussing the implementation because they do not
+    contain Phonon relevant code.
+
+    \section1 Window Class Implementation
+
+    Our examination starts with a look at the constructor:
+
+    \snippet examples/phonon/capabilities/window.cpp constructor
+
+    After creating the user interface, we call \c updateWidgets(),
+    which will fill the widgets with the information we get from the
+    backend. We then connect the slot to the
+    \l{Phonon::BackendCapabilities::Notifier::}{capabilitiesChanged()}
+    and
+    \l{Phonon::BackendCapabilities::Notifier::availableAudioOutputDevicesChanged()}{availableAudioOutputDevicesChanged()}
+    signals in case the backend's abilities changes while the example
+    is running. The signal is emitted by a
+    Phonon::BackendCapabilities::Notifier object, which listens for
+    changes in the backend.
+
+    In the \c updateWidgets() function, we query the backend for
+    information it has about its abilities and present it in the GUI
+    of \c Window. We dissect it here:
+
+    \snippet examples/phonon/capabilities/window.cpp outputDevices
+
+    The
+    \l{Phonon::BackendCapabilities::Notifier::}{availableAudioOutputDevicesChanged()}
+    function is a member of the Phonon::BackendCapabilities namespace.
+    It returns a list of \l{Phonon::}{AudioOutputDevice}s, which gives
+    us information about a particular device, e.g., a sound card or a
+    USB headset.
+
+    Note that \l{Phonon::}{AudioOutputDevice} and also
+    \l{Phonon::}{EffectDescription}, which is described shortly, are
+    typedefs of \l{Phonon::}{ObjectDescriptionType}.
+
+    \omit
+    ###
+    The \l{Phonon::}{ObjectDescriptionModel} is a convenience
+    model that displays the names of the devices. Their
+    descriptions are shown as tooltips and disabled devices are
+    shown in gray.
+    \endomit
+
+    \snippet examples/phonon/capabilities/window.cpp mimeTypes
+
+    The MIME types supported are given as strings in a QStringList. We
+    can therefore create a list widget item with the string, and
+    append it to the \c mimeListWidget, which displays the available
+    MIME types.
+
+    \snippet examples/phonon/capabilities/window.cpp effects
+
+    As before we add the description and name to our widget, which in
+    this case is a QTreeWidget. A particular effect may also have
+    parameters, which are inserted in the tree as child nodes of their
+    effect.
+
+    \snippet examples/phonon/capabilities/window.cpp effectsParameters
+
+    The parameters are only accessible through an instance of the
+    \l{Phonon::}{Effect} class. Notice that an effect is created
+    with the effect description.
+
+    The \l{Phonon::}{EffectParameter} contains information about one
+    of an effects parameters. We pick out some of the information to
+    describe the parameter in the tree widget.
+
+    \section1 The main() function
+
+    Because Phonon uses D-Bus on Linux, it is necessary to give the
+    application a name. You do this with
+    \l{QCoreApplication::}{setApplicationName()}.
+
+    \snippet examples/phonon/capabilities/main.cpp everything
+*/
diff --git a/doc/src/examples/charactermap.qdoc b/doc/src/examples/charactermap.qdoc
new file mode 100644
index 0000000000..64c00db8cc
--- /dev/null
+++ b/doc/src/examples/charactermap.qdoc
@@ -0,0 +1,288 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\example widgets/charactermap
+\title Character Map Example
+
+The Character Map example shows how to create a custom widget that can
+both display its own content and respond to user input.
+
+The example displays an array of characters which the user can click on
+to enter text in a line edit. The contents of the line edit can then be
+copied into the clipboard, and pasted into other applications. The
+purpose behind this sort of tool is to allow users to enter characters
+that may be unavailable or difficult to locate on their keyboards.
+
+\image charactermap-example.png Screenshot of the Character Map example
+
+The example consists of the following classes:
+
+\list
+\i \c CharacterWidget displays the available characters in the current
+   font and style.
+\i \c MainWindow provides a standard main window that contains font and
+   style information, a view onto the characters, a line edit, and a push
+   button for submitting text to the clipboard.
+\endlist
+
+\section1 CharacterWidget Class Definition
+
+The \c CharacterWidget class is used to display an array of characters in
+a user-specified font and style. For flexibility, we subclass QWidget and
+reimplement only the functions that we need to provide basic rendering
+and interaction features.
+
+The class definition looks like this:
+
+\snippet examples/widgets/charactermap/characterwidget.h 0
+
+The widget does not contain any other widgets, so it must provide its own
+size hint to allow its contents to be displayed correctly.
+We reimplement \l{QWidget::paintEvent()} to draw custom content. We also
+reimplement \l{QWidget::mousePressEvent()} to allow the user to interact
+with the widget.
+
+The updateFont() and updateStyle() slots are used to update the font and
+style of the characters in the widget whenever the user changes the
+settings in the application.
+The class defines the characterSelected() signal so that other parts
+of the application are informed whenever the user selects a character in
+the widget.
+As a courtesy, the widget provides a tooltip that shows the current
+character value. We reimplement the \l{QWidget::mouseMoveEvent()} event
+handler and define showToolTip() to enable this feature.
+
+The \c columns, \c displayFont and \c currentKey private data members
+are used to record the number of columns to be shown, the current font,
+and the currently highlighted character in the widget.
+
+\section1 CharacterWidget Class Implementation
+
+Since the widget is to be used as a simple canvas, the constructor just
+calls the base class constructor and defines some default values for
+private data members.
+
+\snippet examples/widgets/charactermap/characterwidget.cpp 0
+
+We initialize \c currentKey with a value of -1 to indicate
+that no character is initially selected. We enable mouse tracking to
+allow us to follow the movement of the cursor across the widget.
+
+The class provides two functions to allow the font and style to be set up.
+Each of these modify the widget's display font and call update():
+
+\snippet examples/widgets/charactermap/characterwidget.cpp 1
+\codeline
+\snippet examples/widgets/charactermap/characterwidget.cpp 2
+
+We use a fixed size font for the display. Similarly, a fixed size hint is
+provided by the sizeHint() function:
+
+\snippet examples/widgets/charactermap/characterwidget.cpp 3
+
+Three standard event functions are implemented so that the widget
+can respond to clicks, provide tooltips, and render the available
+characters. The paintEvent() shows how the contents of the widget are
+arranged and displayed:
+
+\snippet examples/widgets/charactermap/characterwidget.cpp 6
+
+A QPainter is created for the widget and, in all cases, we ensure that the
+widget's background is painted. The painter's font is set to the
+user-specified display font.
+
+The area of the widget that needs to be redrawn is used to determine which
+characters need to be displayed:
+
+\snippet examples/widgets/charactermap/characterwidget.cpp 7
+
+Using integer division, we obtain the row and column numbers of each
+characters that should be displayed, and we draw a square on the widget
+for each character displayed.
+
+\snippet examples/widgets/charactermap/characterwidget.cpp 8
+\snippet examples/widgets/charactermap/characterwidget.cpp 9
+
+The symbols for each character in the array are drawn within each square,
+with the symbol for the most recently selected character displayed in red:
+
+\snippet examples/widgets/charactermap/characterwidget.cpp 10
+
+We do not need to take into account the difference between the area
+displayed in the viewport and the area we are drawing on because
+everything outside the visible area will be clipped.
+
+The mousePressEvent() defines how the widget responds to mouse clicks.
+
+\snippet examples/widgets/charactermap/characterwidget.cpp 5
+
+We are only interested when the user clicks with the left mouse button
+over the widget. When this happens, we calculate which character was
+selected and emit the characterSelected() signal.
+The character's number is found by dividing the x and y-coordinates of
+the click by the size of each character's grid square. Since the number
+of columns in the widget is defined by the \c columns variable, we
+simply multiply the row index by that value and add the column number
+to obtain the character number.
+
+If any other mouse button is pressed, the event is passed on to the
+QWidget base class. This ensures that the event can be handled properly
+by any other interested widgets.
+
+The mouseMoveEvent() maps the mouse cursor's position in global
+coordinates to widget coordinates, and determines the character that
+was clicked by performing the calculation
+
+\snippet examples/widgets/charactermap/characterwidget.cpp 4
+
+The tooltip is given a position defined in global coordinates.
+
+\section1 MainWindow Class Definition
+
+The \c MainWindow class provides a minimal user interface for the example,
+with only a constructor, slots that respond to signals emitted by standard
+widgets, and some convenience functions that are used to set up the user
+interface.
+
+The class definition looks like this:
+
+\snippet examples/widgets/charactermap/mainwindow.h 0
+
+The main window contains various widgets that are used to control how
+the characters will be displayed, and defines the findFonts() function
+for clarity and convenience. The findStyles() slot is used by the widgets
+to determine the styles that are available, insertCharacter() inserts
+a user-selected character into the window's line edit, and
+updateClipboard() synchronizes the clipboard with the contents of the
+line edit.
+
+\section1 MainWindow Class Implementation
+
+In the constructor, we set up the window's central widget and fill it with
+some standard widgets (two comboboxes, a line edit, and a push button).
+We also construct a CharacterWidget custom widget, and add a QScrollArea
+so that we can view its contents:
+
+\snippet examples/widgets/charactermap/mainwindow.cpp 0
+
+QScrollArea provides a viewport onto the \c CharacterWidget when we set
+its widget and handles much of the work needed to provide a scrolling
+viewport.
+
+The font combo box is automatically popuplated with a list of available
+fonts. We list the available styles for the current font in the style
+combobox using the following function:
+
+\snippet examples/widgets/charactermap/mainwindow.cpp 1
+
+The line edit and push button are used to supply text to the clipboard:
+
+\snippet examples/widgets/charactermap/mainwindow.cpp 2
+
+We also obtain a clipboard object so that we can send text entered by the
+user to other applications.
+
+Most of the signals emitted in the example come from standard widgets.
+We connect these signals to slots in this class, and to the slots provided
+by other widgets.
+
+\snippet examples/widgets/charactermap/mainwindow.cpp 4
+
+The font combobox's
+\l{QFontComboBox::currentFontChanged()}{currentFontChanged()} signal is
+connected to the findStyles() function so that the list of available styles
+can be shown for each font that is used. Since both the font and the style
+can be changed by the user, the font combobox's currentFontChanged() signal
+and the style combobox's
+\l{QComboBox::currentIndexChanged()}{currentIndexChanged()} are connected
+directly to the character widget.
+
+The final two connections allow characters to be selected in the character
+widget, and text to be inserted into the clipboard:
+
+\snippet examples/widgets/charactermap/mainwindow.cpp 5
+
+The character widget emits the characterSelected() custom signal when
+the user clicks on a character, and this is handled by the insertCharacter()
+function in this class. The clipboard is changed when the push button emits
+the clicked() signal, and we handle this with the updateClipboard() function.
+
+The remaining code in the constructor sets up the layout of the central widget,
+and provides a window title:
+
+\snippet examples/widgets/charactermap/mainwindow.cpp 6
+
+The font combobox is automatically populated with a list of available font
+families. The styles that can be used with each font are found by the
+findStyles() function. This function is called whenever the user selects a
+different font in the font combobox.
+
+\snippet examples/widgets/charactermap/mainwindow.cpp 7
+
+We begin by recording the currently selected style, and we clear the
+style combobox so that we can insert the styles associated with the
+current font family.
+
+\snippet examples/widgets/charactermap/mainwindow.cpp 8
+
+We use the font database to collect the styles that are available for the
+current font, and insert them into the style combobox. The current item is
+reset if the original style is not available for this font.
+
+The last two functions are slots that respond to signals from the character
+widget and the main window's push button. The insertCharacter() function is
+used to insert characters from the character widget when the user clicks a
+character:
+
+\snippet examples/widgets/charactermap/mainwindow.cpp 9
+
+The character is inserted into the line edit at the current cursor position.
+
+The main window's "To clipboard" push button is connected to the
+updateClipboard() function so that, when it is clicked, the clipboard is
+updated to contain the contents of the line edit:
+
+\snippet examples/widgets/charactermap/mainwindow.cpp 10
+
+We copy all the text from the line edit to the clipboard, but we do not clear
+the line edit.
+*/
diff --git a/doc/src/examples/chart.qdoc b/doc/src/examples/chart.qdoc
new file mode 100644
index 0000000000..22f8a51dd8
--- /dev/null
+++ b/doc/src/examples/chart.qdoc
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example itemviews/chart
+    \title Chart Example
+
+    The Chart example shows how to create a custom view for the model/view framework.
+
+    \image chart-example.png
+
+    In this example, the items in a table model are represented as slices in a pie chart,
+    relying on the flexibility of the model/view architecture to handle custom editing
+    and selection features.
+
+    \bold{Note that you only need to create a new view class if your data requires a
+    specialized representation.} You should first consider using a standard QListView,
+    QTableView, or QTreeView with a custom QItemDelegate subclass if you need to
+    represent data in a special way.
+
+    \omit
+    \section1 PieView Class Definition
+
+    The \c PieView class is a subclass of QAbstractItemView. The base class provides
+    much of the functionality required by view classes, so we only need to provide
+    implementations for three public functions: visualRect(), scrollTo(), and
+    indexAt(). However, the view needs to maintain strict control over its look and
+    feel, so we also provide implementations for a number of other functions:
+
+    \snippet examples/itemviews/chart/pieview.h 0
+
+
+
+    \section1 PieView Class Implementation
+
+    The paint event renders the data from the standard item model as a pie chart.
+    We interpret the data in the following way:
+
+    \list
+    \o Column 0 contains data in two different roles:
+       The \l{Qt::ItemDataRole}{DisplayRole} contains a label, and the
+       \l{Qt::ItemDataRole}{DecorationRole} contains the color of the pie slice.
+    \o Column 1 contains a quantity which we will convert to the angular extent of
+       the slice.
+    \endlist
+
+    The figure is always drawn with the chart on the left and the key on
+    the right. This means that we must try and obtain an area that is wider
+    than it is tall. We do this by imposing a particular aspect ratio on
+    the chart and applying it to the available vertical space. This ensures
+    that we always obtain the maximum horizontal space for the aspect ratio
+    used.
+    We also apply fixed size margin around the figure.
+
+    We use logical coordinates to draw the chart and key, and position them
+    on the view using viewports.
+    \endomit
+*/
diff --git a/doc/src/examples/classwizard.qdoc b/doc/src/examples/classwizard.qdoc
new file mode 100644
index 0000000000..a36edf70a8
--- /dev/null
+++ b/doc/src/examples/classwizard.qdoc
@@ -0,0 +1,204 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example dialogs/classwizard
+    \title Class Wizard Example
+
+    The License Wizard example shows how to implement linear
+    wizards using QWizard.
+
+    \image classwizard.png Screenshot of the Class Wizard example
+
+    Most wizards have a linear structure, with page 1 followed by
+    page 2 and so on until the last page. Some wizards are more
+    complex in that they allow different traversal paths based on the
+    information provided by the user. The
+    \l{dialogs/licensewizard}{License Wizard} example shows how to
+    create such wizards.
+
+    The Class Wizard example consists of the following classes:
+
+    \list
+    \o \c ClassWizard inherits QWizard and provides a
+       three-step wizard that generates the skeleton of a C++ class
+       based on the user's input.
+    \o \c IntroPage, \c ClassInfoPage, \c CodeStylePage, \c
+       OutputFilesPage, and \c ConclusionPage are QWizardPage
+       subclasses that implement the wizard pages.
+    \endlist
+
+    \section1 ClassWizard Class Definition
+
+    \image classwizard-flow.png The Class Wizard pages
+
+    We will see how to subclass QWizard to implement our own wizard.
+    The concrete wizard class is called \c ClassWizard and provides
+    five pages:
+
+    \list
+    \o The first page is an introduction page, telling the user what
+       the wizard is going to do.
+    \o The second page asks for a class name and a base class, and
+       allows the user to specify whether the class should have a \c
+       Q_OBJECT macro and what constructors it should provide.
+    \o The third page allows the user to set some options related to the code
+       style, such as the macro used to protect the header file from
+       multiple inclusion (e.g., \c MYDIALOG_H).
+    \o The fourth page allows the user to specify the names of the
+       output files.
+    \o The fifth page is a conclusion page.
+    \endlist
+
+    Although the program is just an example, if you press \gui Finish
+    (\gui Done on Mac OS X), actual C++ source files will actually be
+    generated.
+
+    \section1 The ClassWizard Class
+
+    Here's the \c ClassWizard definition:
+
+    \snippet examples/dialogs/classwizard/classwizard.h 0
+
+    The class reimplements QDialog's \l{QDialog::}{accept()} slot.
+    This slot is called when the user clicks \gui{Finish}.
+
+    Here's the constructor:
+
+    \snippet examples/dialogs/classwizard/classwizard.cpp 1
+
+    We instantiate the five pages and insert them into the wizard
+    using QWizard::addPage(). The order in which they are inserted
+    is also the order in which they will be shown later on.
+
+    We call QWizard::setPixmap() to set the banner and the
+    background pixmaps for all pages. The banner is used as a
+    background for the page header when the wizard's style is
+    \l{QWizard::}{ModernStyle}; the background is used as the
+    dialog's background in \l{QWizard::}{MacStyle}. (See \l{Elements
+    of a Wizard Page} for more information.)
+
+    \snippet examples/dialogs/classwizard/classwizard.cpp 3
+    \snippet examples/dialogs/classwizard/classwizard.cpp 4
+    \dots
+    \snippet examples/dialogs/classwizard/classwizard.cpp 5
+    \snippet examples/dialogs/classwizard/classwizard.cpp 6
+
+    If the user clicks \gui Finish, we extract the information from
+    the various pages using QWizard::field() and generate the files.
+    The code is long and tedious (and has barely anything to do with
+    noble art of designing wizards), so most of it is skipped here.
+    See the actual example in the Qt distribution for the details if
+    you're curious.
+
+    \section1 The IntroPage Class
+
+    The pages are defined in \c classwizard.h and implemented in \c
+    classwizard.cpp, together with \c ClassWizard. We will start with
+    the easiest page:
+
+    \snippet examples/dialogs/classwizard/classwizard.h 1
+    \codeline
+    \snippet examples/dialogs/classwizard/classwizard.cpp 7
+
+    A page inherits from QWizardPage. We set a
+    \l{QWizardPage::}{title} and a
+    \l{QWizard::WatermarkPixmap}{watermark pixmap}. By not setting
+    any \l{QWizardPage::}{subTitle}, we ensure that no header is
+    displayed for this page. (On Windows, it is customary for wizards
+    to display a watermark pixmap on the first and last pages, and to
+    have a header on the other pages.)
+
+    Then we create a QLabel and add it to a layout.
+
+    \section1 The ClassInfoPage Class
+
+    The second page is defined and implemented as follows:
+
+    \snippet examples/dialogs/classwizard/classwizard.h 2
+    \codeline
+    \snippet examples/dialogs/classwizard/classwizard.cpp 9
+    \dots
+    \snippet examples/dialogs/classwizard/classwizard.cpp 12
+    \dots
+    \snippet examples/dialogs/classwizard/classwizard.cpp 13
+
+    First, we set the page's \l{QWizardPage::}{title},
+    \l{QWizardPage::}{subTitle}, and \l{QWizard::LogoPixmap}{logo
+    pixmap}. The logo pixmap is displayed in the page's header in
+    \l{QWizard::}{ClassicStyle} and \l{QWizard::}{ModernStyle}.
+
+    Then we create the child widgets, create \l{Registering and Using
+    Fields}{wizard fields} associated with them, and put them into
+    layouts. The \c className field is created with an asterisk (\c
+    *) next to its name. This makes it a \l{mandatory field}, that
+    is, a field that must be filled before the user can press the
+    \gui Next button (\gui Continue on Mac OS X). The fields' values
+    can be accessed from any other page using QWizardPage::field(),
+    or from the wizard code using QWizard::field().
+
+    \section1 The CodeStylePage Class
+
+    The third page is defined and implemented as follows:
+
+    \snippet examples/dialogs/classwizard/classwizard.h 3
+    \codeline
+    \snippet examples/dialogs/classwizard/classwizard.cpp 14
+    \dots
+    \snippet examples/dialogs/classwizard/classwizard.cpp 15
+    \codeline
+    \snippet examples/dialogs/classwizard/classwizard.cpp 16
+
+    The code in the constructor is very similar to what we did for \c
+    ClassInfoPage, so we skipped most of it.
+
+    The \c initializePage() function is what makes this class
+    interesting. It is reimplemented from QWizardPage and is used to
+    initialize some of the page's fields with values from the
+    previous page (namely, \c className and \c baseClass). For
+    example, if the class name on page 2 is \c SuperDuperWidget, the
+    default macro name on page 3 is \c SUPERDUPERWIDGET_H.
+
+    The \c OutputFilesPage and \c ConclusionPage classes are very
+    similar to \c CodeStylePage, so we won't review them here.
+
+    \sa QWizard, {License Wizard Example}, {Trivial Wizard Example}
+*/
diff --git a/doc/src/examples/codecs.qdoc b/doc/src/examples/codecs.qdoc
new file mode 100644
index 0000000000..cb38cbe3e3
--- /dev/null
+++ b/doc/src/examples/codecs.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example tools/codecs
+    \title Codecs Example
+
+    The Codecs example demonstrates the principles behind importing and exporting text
+    using codecs to ensure that characters are encoded properly, avoiding loss of data
+    and retaining the correct symbols used in various scripts.
+
+    \image codecs-example.png
+*/
diff --git a/doc/src/examples/codeeditor.qdoc b/doc/src/examples/codeeditor.qdoc
new file mode 100644
index 0000000000..669ab45b0e
--- /dev/null
+++ b/doc/src/examples/codeeditor.qdoc
@@ -0,0 +1,209 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example widgets/codeeditor
+    \title Code Editor Example
+
+    The Code Editor example shows how to create a simple editor that
+    has line numbers and that highlights the current line.
+
+    \image codeeditor-example.png
+
+    As can be seen from the image, the editor displays the line
+    numbers in an area to the left of the area for editing. The editor
+    will highlight the line containing the cursor.
+
+    We implement the editor in \c CodeEditor, which is a widget that
+    inherits QPlainTextEdit. We keep a separate widget in \c
+    CodeEditor (\c LineNumberArea) onto which we draw the line
+    numbers.
+
+    QPlainTextEdit inherits from QAbstractScrollArea, and editing
+    takes place within its \l{QAbstractScrollArea::}{viewport()}'s
+    margins. We make room for our line number area by setting the left
+    margin of the viewport to the size we need to draw the line
+    numbers.
+
+    When it comes to editing code, we prefer QPlainTextEdit over
+    QTextEdit because it is optimized for handling plain text. See
+    the QPlainTextEdit class description for details.
+
+    QPlainTextEdit lets us add selections in addition to the the
+    selection the user can make with the mouse or keyboard. We use
+    this functionality to highlight the current line. More on this
+    later.
+
+    We will now move on to the definitions and implementations of \c
+    CodeEditor and \c LineNumberArea. Let's start with the \c
+    LineNumberArea class. 
+
+    \section1 The LineNumberArea Class
+
+    We paint the line numbers on this widget, and place it over the \c
+    CodeEditor's \l{QAbstractScrollArea::}{viewport()}'s left margin
+    area.
+
+    We need to use protected functions in QPlainTextEdit while
+    painting the area. So to keep things simple, we  paint the area in
+    the \c CodeEditor class. The area also asks the editor to
+    calculate its size hint.
+
+    Note that we could simply paint the line numbers directly on the
+    code editor, and drop the LineNumberArea class. However, the
+    QWidget class helps us to \l{QWidget::}{scroll()} its contents.
+    Also, having a separate widget is the right choice if we wish to
+    extend the editor with breakpoints or other code editor features.
+    The widget would then help in the handling of mouse events.
+
+    \snippet widgets/codeeditor/codeeditor.h extraarea
+
+    \section1 CodeEditor Class Definition
+
+    Here is the code editor's class definition:
+
+    \snippet widgets/codeeditor/codeeditor.h codeeditordefinition
+
+    In the editor we resize and draw the line numbers on the \c
+    LineNumberArea. We need to do this when the number of lines in the
+    editor changes, and when the editor's viewport() is scrolled. Of
+    course, it is also done when the editor's size changes. We do
+    this in \c updateLineNumberWidth() and \c updateLineNumberArea().
+
+    Whenever, the cursor's position changes, we highlight the current
+    line in \c highlightCurrentLine().
+
+    \section1 CodeEditor Class Implementation
+
+    We will now go through the code editors implementation, starting
+    off with the constructor.
+
+    \snippet widgets/codeeditor/codeeditor.cpp constructor
+
+    In the constructor we connect our slots to signals in
+    QPlainTextEdit. It is necessary to calculate the line number area
+    width and highlight the first line when the editor is created.
+
+    \snippet widgets/codeeditor/codeeditor.cpp extraAreaWidth
+
+    The \c lineNumberAreaWidth() function calculates the width of the
+    \c LineNumberArea widget. We take the number of digits in the last
+    line of the editor and multiply that with the maximum width of a
+    digit.
+
+    \snippet widgets/codeeditor/codeeditor.cpp slotUpdateExtraAreaWidth
+
+    When we update the width of the line number area, we simply call
+    QAbstractScrollArea::setViewportMargins().
+
+    \snippet widgets/codeeditor/codeeditor.cpp slotUpdateRequest
+
+    This slot is invoked when the editors viewport has been scrolled.
+    The QRect given as argument is the part of the editing area that
+    is do be updated (redrawn). \c dy holds the number of pixels the
+    view has been scrolled vertically.
+
+    \snippet widgets/codeeditor/codeeditor.cpp resizeEvent
+
+    When the size of the editor changes, we also need to resize the
+    line number area. 
+
+    \snippet widgets/codeeditor/codeeditor.cpp cursorPositionChanged
+
+    When the cursor position changes, we highlight the current line,
+    i.e., the line containing the cursor.
+
+    QPlainTextEdit gives the possibility to have more than one
+    selection at the same time. we can set the character format
+    (QTextCharFormat) of these selections. We clear the cursors
+    selection before setting the new new
+    QPlainTextEdit::ExtraSelection, else several lines would get
+    highlighted when the user selects multiple lines with the mouse.
+    \omit ask someone how this works \endomit
+
+    One sets the selection with a text cursor. When using the
+    FullWidthSelection property, the current cursor text block (line)
+    will be selected. If you want to select just a portion of the text
+    block, the cursor should be moved with QTextCursor::movePosition()
+    from a position set with \l{QTextCursor::}{setPosition()}.
+
+    \snippet widgets/codeeditor/codeeditor.cpp extraAreaPaintEvent_0
+
+    The \c lineNumberAreaPaintEvent() is called from \c LineNumberArea
+    whenever it receives a paint event. We start off by painting the
+    widget's background. 
+
+    \snippet widgets/codeeditor/codeeditor.cpp extraAreaPaintEvent_1
+
+    We will now loop through all visible lines and paint the line
+    numbers in the extra area for each line. Notice that in a plain
+    text edit each line will consist of one QTextBlock; though, if
+    line wrapping is enabled, a line may span several rows in the text
+    edit's viewport. 
+
+    We get the top and bottom y-coordinate of the first text block,
+    and adjust these values by the height of the current text block in
+    each iteration in the loop. 
+
+    \snippet widgets/codeeditor/codeeditor.cpp extraAreaPaintEvent_2
+
+    Notice that we check if the block is visible in addition to check
+    if it is in the areas viewport - a block can, for example, be
+    hidden by a window placed over the text edit.
+
+    \section1 Suggestions for Extending the Code Editor
+
+    No self-respecting code editor is without a syntax
+    highligther; the \l{Syntax Highlighter Example} shows how to
+    create one.
+
+    In addition to line numbers, you can add more to the extra area,
+    for instance, break points.
+        
+    QSyntaxHighlighter gives the possibility to add user data to each
+    text block with
+    \l{QSyntaxHighlighter::}{setCurrentBlockUserData()}. This can be
+    used to implement parenthesis matching. In the \c
+    highlightCurrentLine(), the data of the currentBlock() can be
+    fetched with QTextBlock::userData(). Matching parentheses can be
+    highlighted with an extra selection.
+
+*/
diff --git a/doc/src/examples/collidingmice-example.qdoc b/doc/src/examples/collidingmice-example.qdoc
new file mode 100644
index 0000000000..7ea2ca233e
--- /dev/null
+++ b/doc/src/examples/collidingmice-example.qdoc
@@ -0,0 +1,279 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example graphicsview/collidingmice
+    \title Colliding Mice Example
+
+    The Colliding Mice example shows how to use the Graphics View
+    framework to implement animated items and detect collision between
+    items.
+
+    \image collidingmice-example.png
+
+    Graphics View provides the QGraphicsScene class for managing and
+    interacting with a large number of custom-made 2D graphical items
+    derived from the QGraphicsItem class, and a QGraphicsView widget
+    for visualizing the items, with support for zooming and rotation.
+
+    The example consists of an item class and a main function:
+    the \c Mouse class represents the individual mice extending
+    QGraphicsItem, and the \c main() function provides the main
+    application window.
+
+    We will first review the \c Mouse class to see how to animate
+    items and detect item collision, and then we will review the \c
+    main() function to see how to put the items into a scene and how to
+    implement the corresponding view.
+
+    \section1 Mouse Class Definition
+
+    The \c mouse class inherits both QObject and QGraphicsItem. The
+    QGraphicsItem class is the base class for all graphical items in
+    the Graphics View framework, and provides a light-weight
+    foundation for writing your own custom items.
+
+    \snippet examples/graphicsview/collidingmice/mouse.h 0
+
+    When writing a custom graphics item, you must implement
+    QGraphicsItem's two pure virtual public functions: \l
+    {QGraphicsItem::}{boundingRect()}, which returns an estimate of
+    the area painted by the item, and \l {QGraphicsItem::}{paint()},
+    which implements the actual painting. In addition, we reimplement
+    the \l {QGraphicsItem::}{shape()} function to return an accurate
+    shape of our mouse item; the default implementation simply returns
+    the item's bounding rectangle.
+
+    The rationale for deriving from QObject in addition to
+    QGraphicsItem is to be able to animate our items by reimplementing
+    QObject's \l {QObject::}{timerEvent()} function and use
+    QObject::startTimer() to generate timer events.
+
+    \section1 Mouse Class Definition
+
+    When constructing a mouse item, we first ensure that all the item's
+    private variables are properly initialized:
+
+    \snippet examples/graphicsview/collidingmice/mouse.cpp 0
+
+    To calculate the various components of the mouse's color, we use
+    the global qrand() function which is a thread-safe version of the
+    standard C++ rand() function.
+
+    Then we call the \l {QGraphicsItem::rotate()}{rotate()} function
+    inherited from QGraphicsItem. Items live in their own local
+    coordinate system. Their coordinates are usually centered around
+    (0, 0), and this is also the center for all transformations. By
+    calling the item's \l {QGraphicsItem::rotate()}{rotate()} function
+    we alter the direction in which the mouse will start moving.
+
+    In the end we call QObject's \l {QObject::}{startTimer()}
+    function, emitting a timer event every 1000/33 millisecond. This
+    enables us to animate our mouse item using our reimplementation of
+    the \l {QObject::}{timerEvent()} function; whenever a mouse
+    receives a timer event it will trigger \l
+    {QObject::}{timerEvent()}:
+
+    \snippet examples/graphicsview/collidingmice/mouse.cpp 4
+    \snippet examples/graphicsview/collidingmice/mouse.cpp 5
+    \snippet examples/graphicsview/collidingmice/mouse.cpp 6
+
+    First we ensure that the mice stays within a circle with a radius
+    of 150 pixels.
+
+    Note the \l {QGraphicsItem::mapFromScene()}{mapFromScene()}
+    function provided by QGraphicsItem. This function maps a position
+    given in \e scene coordinates, to the item's coordinate system.
+
+    \snippet examples/graphicsview/collidingmice/mouse.cpp 7
+    \snippet examples/graphicsview/collidingmice/mouse.cpp 8
+    \snippet examples/graphicsview/collidingmice/mouse.cpp 9
+    \codeline
+    \snippet examples/graphicsview/collidingmice/mouse.cpp 10
+
+    Then we try to avoid colliding with other mice.
+
+    \snippet examples/graphicsview/collidingmice/mouse.cpp 11
+
+    Finally, we calculate the mouse's speed and its eye direction (for
+    use when painting the mouse), and set its new position.
+
+    The position of an item describes its origin (local coordinate (0,
+    0)) in the parent coordinates. The \l {QGraphicsItem::setPos()}
+    function sets the position of the item to the given position in
+    the parent's coordinate system. For items with no parent, the
+    given position is interpreted as scene coordinates. QGraphicsItem
+    also provides a \l {QGraphicsItem::}{mapToParent()} function to
+    map a position given in item coordinates, to the parent's
+    coordinate system. If the item has no parent, the position will be
+    mapped to the scene's coordinate system instead.
+
+    Then it is time to provide an implementation for the pure virtual
+    functions inherited from QGraphicsItem. Let's first take a look at
+    the \l {QGraphicsItem::}{boundingRect()} function:
+
+    \snippet examples/graphicsview/collidingmice/mouse.cpp 1
+
+    The \l {QGraphicsItem::boundingRect()}{boundingRect()} function
+    defines the outer bounds of the item as a rectangle. Note that the
+    Graphics View framework uses the bounding rectangle to determine
+    whether the item requires redrawing, so all painting must be
+    restricted inside this rectangle.
+
+    \snippet examples/graphicsview/collidingmice/mouse.cpp 3
+
+    The Graphics View framework calls the \l
+    {QGraphicsItem::paint()}{paint()} function to paint the contents
+    of the item; the function paints the item in local coordinates.
+
+    Note the painting of the ears: Whenever a mouse item collides with
+    other mice items its ears are filled with red; otherwise they are
+    filled with dark yellow. We use the
+    QGraphicsScene::collidingItems() function to check if there are
+    any colliding mice.  The actual collision detection is handled by
+    the Graphics View framework using shape-shape intersection. All we
+    have to do is to ensure that the QGraphicsItem::shape() function
+    returns an accurate shape for our item:
+
+    \snippet examples/graphicsview/collidingmice/mouse.cpp 2
+
+    Because the complexity of arbitrary shape-shape intersection grows
+    with an order of magnitude when the shapes are complex, this
+    operation can be noticably time consuming. An alternative approach
+    is to reimplement the \l
+    {QGraphicsItem::collidesWithItem()}{collidesWithItem()} function
+    to provide your own custom item and shape collision algorithm.
+
+    This completes the \c Mouse class implementation, it is now ready
+    for use. Let's take a look at the \c main() function to see how to
+    implement a scene for the mice and a view for displaying the
+    contents of the scene.
+
+    \section1 The Main() Function
+
+    In this example we have chosen to let the \c main() function
+    provide the main application window, creating the items and the
+    scene, putting the items into the scene and creating a
+    corresponding view.
+
+    \snippet examples/graphicsview/collidingmice/main.cpp 0
+
+    First, we create an application object and call the global
+    qsrand() function to specify the seed used to generate a new
+    random number sequence of pseudo random integers with the
+    previously mentioned qrand() function.
+
+    Then it is time to create the scene:
+
+    \snippet examples/graphicsview/collidingmice/main.cpp 1
+
+    The QGraphicsScene class serves as a container for
+    QGraphicsItems. It also provides functionality that lets you
+    efficiently determine the location of items as well as determining
+    which items that are visible within an arbitrary area on the
+    scene.
+
+    When creating a scene it is recommended to set the scene's
+    rectangle, i.e., the rectangle that defines the extent of the
+    scene. It is primarily used by QGraphicsView to determine the
+    view's default scrollable area, and by QGraphicsScene to manage
+    item indexing. If not explicitly set, the scene's default
+    rectangle will be the largest bounding rectangle of all the items
+    on the scene since the scene was created (i.e., the rectangle will
+    grow when items are added or moved in the scene, but it will never
+    shrink).
+
+    \snippet examples/graphicsview/collidingmice/main.cpp 2
+
+    The item index function is used to speed up item discovery. \l
+    {QGraphicsScene::NoIndex}{NoIndex} implies that item location is
+    of linear complexity, as all items on the scene are
+    searched. Adding, moving and removing items, however, is done in
+    constant time. This approach is ideal for dynamic scenes, where
+    many items are added, moved or removed continuously.  The
+    alternative is \l {QGraphicsScene::BspTreeIndex}{BspTreeIndex}
+    which makes use of binary search resulting in item location
+    algorithms that are of an order closer to logarithmic complexity.
+
+    \snippet examples/graphicsview/collidingmice/main.cpp 3
+
+    Then we add the mice to the scene.
+
+    \snippet examples/graphicsview/collidingmice/main.cpp 4
+
+    To be able to view the scene we must also create a QGraphicsView
+    widget. The QGraphicsView class visualizes the contents of a scene
+    in a scrollable viewport. We also ensure that the contents is
+    rendered using antialiasing, and we create the cheese background
+    by setting the view's background brush.
+
+    The image used for the background is stored as a binary file in
+    the application's executable using Qt's \l {The Qt Resource
+    System}{resource system}. The QPixmap constructor accepts both
+    file names that refer to actual files on disk and file names that
+    refer to the application's embedded resources.
+
+    \snippet examples/graphicsview/collidingmice/main.cpp 5
+
+    Then we set the cache mode; QGraphicsView can cache pre-rendered
+    content in a pixmap, which is then drawn onto the viewport. The
+    purpose of such caching is to speed up the total rendering time
+    for areas that are slow to render, e.g., texture, gradient and
+    alpha blended backgrounds. The \l
+    {QGraphicsView::CacheMode}{CacheMode} property holds which parts
+    of the view that are cached, and the \l
+    {QGraphicsView::CacheBackground}{CacheBackground} flag enables
+    caching of the view's background.
+
+    By setting the \l {QGraphicsView::dragMode}{dragMode} property we
+    define what should happen when the user clicks on the scene
+    background and drags the mouse. The \l
+    {QGraphicsView::ScrollHandDrag}{ScrollHandDrag} flag makes the
+    cursor change into a pointing hand, and dragging the mouse around
+    will scroll the scrollbars.
+
+    \snippet examples/graphicsview/collidingmice/main.cpp 6
+
+    In the end, we set the application window's title and size before
+    we enter the main event loop using the QApplication::exec()
+    function.
+*/
+
diff --git a/doc/src/examples/coloreditorfactory.qdoc b/doc/src/examples/coloreditorfactory.qdoc
new file mode 100644
index 0000000000..768bb5164e
--- /dev/null
+++ b/doc/src/examples/coloreditorfactory.qdoc
@@ -0,0 +1,169 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example itemviews/coloreditorfactory
+    \title Color Editor Factory Example
+
+    This example shows how to create an editor that can be used by
+    a QItemDelegate.
+
+    \image coloreditorfactoryimage.png
+
+    When editing data in a QListView, QTableView, or QTreeView,
+    editors are created and displayed by a \l{Delegate
+    Classes}{delegate}. QItemDelegate, which is the default delegate
+    used by Qt's \l{View Classes}{item views}, uses a
+    QItemEditorFactory to create editors for it. A unique instance
+    provided by QItemEditorFactory is by default installed on all
+    item delegates.
+
+    An item editor factory contains a collection of
+    QItemEditorCreatorBase instances, which are specialized factories
+    that produce editors for one particular QVariant data type (all
+    models in Qt store their data in \l{QVariant}s). An editor can be any
+    Qt or custom widget.
+
+    In this example, we will create an editor (implemented in the \c
+    ColorListEditor class) that can edit the QColor data type and be
+    used by \l{QItemDelegate}s. We do this by creating a new
+    QItemEditorCreatorBase that produces \c ColorListEditors and
+    register it with a new factory, which we set as the default editor
+    item factory (the unique factory instance). To test our editor, we
+    have implemented the \c Window class, which displays a
+    QTableWidget in which \l{QColor}s can be edited.
+
+    \section1 Window Class Implementation
+
+    In the Window class, we create the item editor creator
+    base for our color editor and add it to the default factory.
+    We also create a QTableWidget in which our editor can be
+    tested. It is filled with some data and displayed in a window.
+
+    We take a closer look at the constructor:
+
+    \snippet examples/itemviews/coloreditorfactory/window.cpp 0
+
+    The QStandardItemEditorCreator is a convenience class that
+    inherits QItemEditorCreatorBase. Its constructor takes a template
+    class, of which instances are returned from
+    \l{QItemEditorCreatorBase::}{createWidget()}. The creator uses a
+    constructor that takes a QWidget as its only parameter; the
+    template class must provide this. This way, there is no need to
+    subclass QStandardItemEditorCreator.
+
+    After the new factory has been set, all standard item delegates
+    will use it (i.e, also delegates that were created before the new
+    default factory was set). 
+
+    The \c createGUI() function sets up the table and fills it
+    with data.
+
+    \section1 ColorListEditor Definition
+
+    The ColorListEditor inherits QComboBox and lets the user
+    select a QColor from its popup list.
+
+    \snippet examples/itemviews/coloreditorfactory/colorlisteditor.h 0
+
+    QItemDelegate manages the interaction between the editor and
+    the model, i.e., it retrieves data to edit from the model and
+    store data from the editor in the model. The data that is edited
+    by an editor is stored in the editor's user data property, and the
+    delegate uses Qt's \l{Qt's Property System}{property system} to
+    access it by name. We declare our user data property with the
+    Q_PROPERTY macro. The property is set to be the user type with the
+    USER keyword.
+
+    \section1 ColorListEditor Implementation
+
+    The constructor of \c ColorListEditor simply calls \c
+    populateList(), which we will look at later. We move on to the
+    \c color() function:
+
+    \snippet examples/itemviews/coloreditorfactory/colorlisteditor.cpp 0
+
+    We return the data that is selected in the combobox. The data
+    is stored in the Qt::DecorationRole as the color is then also
+    displayed in the popup list (as shown in the image above).
+
+    \snippet examples/itemviews/coloreditorfactory/colorlisteditor.cpp 1
+
+    The \c findData() function searches the items in the combobox
+    and returns the index of the item that has \c color in the
+    Qt::Decoration role.
+
+    \snippet examples/itemviews/coloreditorfactory/colorlisteditor.cpp 2
+
+    Qt knows some predefined colors by name. We simply loop
+    through these to fill our editor with items.
+
+    \section1 Further Customization of Item View Editors
+
+    You can customize Qt's \l{Model/View Programming}{model view
+    framework} in many ways. The procedure shown in this example is
+    usually sufficient to provide custom editors. Further
+    customization is achieved by subclassing QItemEditorFactory
+    and QItemEditorCreatorBase. It is also possible to subclass
+    QItemDelegate if you don't wish to use a factory at all.
+
+    Possible suggestions are:
+
+    \list
+	\o If the editor widget has no user property defined, the delegate
+	   asks the factory for the property name, which it in turn
+	   asks the item editor creator for. In this case, you can use 
+	   the QItemEditorCreator class, which takes the property 
+	   name to use for editing as a constructor argument.
+	\o If the editor requires other constructors or other
+	   initialization than provided by QItemEditorCreatorBase, you
+	   must reimplement
+	   QItemEditorCreatorBase::createWidget().
+	\o You could also subclass QItemEditorFactory if you only want
+	   to provide editors for certain kinds of data or use another
+	   method of creating the editors than using creator bases.
+    \endlist
+
+    In this example, we use a standard QVariant data type. You can
+    also use custom types. In the \l{Star Delegate Example}, we
+    show how to store a custom data type in a QVariant and paint
+    and edit it in a class that inherits QItemDelegate.
+*/
diff --git a/doc/src/examples/combowidgetmapper.qdoc b/doc/src/examples/combowidgetmapper.qdoc
new file mode 100644
index 0000000000..cf44bdb730
--- /dev/null
+++ b/doc/src/examples/combowidgetmapper.qdoc
@@ -0,0 +1,181 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example itemviews/combowidgetmapper
+    \title Combo Widget Mapper Example
+
+    The Delegate Widget Mapper example shows how to use a custom delegate to
+    map information from a model to specific widgets on a form.
+
+    \image combo-widget-mapper.png
+
+    In the \l{Simple Widget Mapper Example}, we showed the basic use of a
+    widget mapper to relate data exposed by a model to simple input widgets
+    in a user interface. However, sometimes we want to use input widgets that
+    expose data as choices to the user, such as QComboBox, and we need a way
+    to relate their input to the values stored in the model.
+
+    This example is very similar to the \l{Simple Widget Mapper Example}.
+    Again, we create a \c Window class with an almost identical user interface,
+    except that, instead of providing a spin box so that each person's age
+    can be entered, we provide a combo box to allow their addresses to be
+    classified as "Home", "Work" or "Other".
+
+    \section1 Window Class Definition
+
+    The class provides a constructor, a slot to keep the buttons up to date,
+    and a private function to set up the model:
+
+    \snippet examples/itemviews/combowidgetmapper/window.h Window definition
+
+    In addition to the QDataWidgetMapper object and the controls used to make
+    up the user interface, we use a QStandardItemModel to hold our data and
+    a QStringListModel to hold information about the types of address that
+    can be applied to each person's data.
+
+    \section1 Window Class Implementation
+
+    The constructor of the \c Window class can be explained in three parts.
+    In the first part, we set up the widgets used for the user interface:
+
+    \snippet examples/itemviews/combowidgetmapper/window.cpp Set up widgets
+
+    Note that we set up the mapping the combo box in the same way as for other
+    widgets, but that we apply its own model to it so that it will display
+    data from its own model, the \c typeModel, rather than from the model
+    containing data about each person.
+
+    Next, we set up the widget mapper, relating each input widget to a column
+    in the model specified by the call to \l{QDataWidgetMapper::}{setModel()}:
+
+    \snippet examples/itemviews/combowidgetmapper/window.cpp Set up the mapper
+
+    For the combo box, we pass an extra argument to tell the widget mapper
+    which property to relate to values from the model. As a result, the user
+    is able to select an item from the combo box, and the corresponding
+    value stored in the widget's \c currentIndex property will be stored in
+    the model.
+
+    \omit
+    However, we also set a delegate on the mapper. As with \l{Delegate Classes},
+    this changes the way that data is presented to the user. In this case, the
+    delegate acts as a proxy between the mapper and the input widgets,
+    translating the data into a suitable form for the combo box but not
+    interfering with the other input widgets. The implementation is shown later.
+    \endomit
+
+    The rest of the constructor is very similar to that of the
+    \l{Simple Widget Mapper Example}:
+
+    \snippet examples/itemviews/combowidgetmapper/window.cpp Set up connections and layouts
+
+    The model is initialized in the window's \c{setupModel()} function. Here,
+    we create a standard model with 5 rows and 3 columns. In each row, we
+    insert a name, address, and a value that indicates the type of address.
+    The address types are stored in a string list model.
+
+    \snippet examples/itemviews/combowidgetmapper/window.cpp Set up the model
+
+    As we insert each row into the model, like a record in a database, we
+    store values that correspond to items in \c typeModel for each person's
+    address type. When the widget mapper reads these values from the final
+    column of each row, it will need to use them as references to values in
+    \c typeModel, as shown in the following diagram. This is where the
+    delegate is used.
+
+    \image widgetmapper-combo-mapping.png
+
+    We show the implementation of the \c{updateButtons()} slot for
+    completeness:
+
+    \snippet examples/itemviews/combowidgetmapper/window.cpp Slot for updating the buttons
+
+    \omit
+    \section1 Delegate Class Definition and Implementation
+
+    The delegate we use to mediate interaction between the widget mapper and
+    the input widgets is a small QItemDelegate subclass:
+
+    \snippet examples/itemviews/combowidgetmapper/delegate.h Delegate class definition
+
+    This provides implementations of the two standard functions used to pass
+    data between editor widgets and the model (see the \l{Delegate Classes}
+    documentation for a more general description of these functions).
+
+    Since we only provide an empty implementation of the constructor, we
+    concentrate on the other two functions.
+
+    The \l{QItemDelegate::}{setEditorData()} implementation takes the data
+    referred to by the model index supplied and processes it according to
+    the presence of a \c currentIndex property in the editor widget:
+
+    \snippet examples/itemviews/combowidgetmapper/delegate.cpp setEditorData implementation
+
+    If, like QComboBox, the editor widget has this property, it is set using
+    the value from the model. Since we are passing around QVariant values,
+    the strings stored in the model are automatically converted to the integer
+    values needed for the \c currentIndex property.
+
+    As a result, instead of showing "0", "1" or "2" in the combo box, one of
+    its predefined set of items is shown. We call QItemDelegate::setEditorData()
+    for widgets without the \c currentIndex property.
+
+    The \l{QItemDelegate::}{setModelData()} implementation performs the reverse
+    process, taking the value stored in the widget's \c currentIndex property
+    and storing it back in the model:
+
+    \snippet examples/itemviews/combowidgetmapper/delegate.cpp setModelData implementation
+    \endomit
+
+    \section1 Summary and Further Reading
+
+    The use of a separate model for the combo box provides a menu of choices
+    that are separate from the data stored in the main model. Using a named
+    mapping that relates the combo box's \c currentIndex property to a column
+    in the model effectively allows us to store a look-up value in the model.
+
+    However, when reading the model outside the context of the widget mapper,
+    we need to know about the \c typeModel to make sense of these look-up
+    values. It would be useful to be able to store both the data and the
+    choices held by the \c typeModel in one place.
+    This is covered by the \l{SQL Widget Mapper Example}.
+*/
diff --git a/doc/src/examples/completer.qdoc b/doc/src/examples/completer.qdoc
new file mode 100644
index 0000000000..f47ba07c84
--- /dev/null
+++ b/doc/src/examples/completer.qdoc
@@ -0,0 +1,255 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example tools/completer
+    \title Completer Example
+
+    The Completer example shows how to provide string-completion facilities
+    for an input widget based on data provided by a model.
+
+    \image completer-example.png
+
+    This example uses a custom item model, \c DirModel, and a QCompleter object.
+    QCompleter is a class that provides completions based on an item model. The
+    type of model, the completion mode, and the case sensitivity can be
+    selected using combo boxes.
+
+    \section1 The Resource File
+
+    The Completer example requires a resource file in order to store the
+    \e{countries.txt} and \e{words.txt}. The resource file contains the
+    following code:
+
+    \quotefile examples/tools/completer/completer.qrc
+
+    \section1 DirModel Class Definition
+
+    The \c DirModel class is a subclass of QDirModel, which provides a data
+    model for the local filesystem.
+
+    \snippet examples/tools/completer/dirmodel.h 0
+
+    This class only has a constructor and a \c data() function as it is only
+    created to enable \c data() to return the entire file path for the
+    display role, unlike \l{QDirModel}'s \c data() function that only returns
+    the folder and not the drive label. This is further explained in
+    \c DirModel's implementation.
+
+    \section1 DirModel Class Implementation
+
+    The constructor for the \c DirModel class is used to pass \a parent to
+    QDirModel.
+
+    \snippet examples/tools/completer/dirmodel.cpp 0
+
+    As mentioned earlier, the \c data() function is reimplemented in order to
+    get it to return the entire file parth for the display role. For example,
+    with a QDirModel, you will see "Program Files" in the view. However, with
+    \c DirModel, you will see "C:\\Program Files".
+
+    \snippet examples/tools/completer/dirmodel.cpp 1
+
+    The screenshots below illustrate this difference:
+
+    \table
+    \row \o \inlineimage completer-example-qdirmodel.png
+         \o \inlineimage completer-example-dirmodel.png
+    \endtable
+
+    The Qt::EditRole, which QCompleter uses to look for matches, is left
+    unchanged.
+
+    \section1 MainWindow Class Definition
+
+    The \c MainWindow class is a subclass of QMainWindow and implements four
+    private slots - \c about(), \c changeCase(), \c changeMode(), and
+    \c changeModel().
+
+    \snippet examples/tools/completer/mainwindow.h 0
+
+    Within the \c MainWindow class, we have two private functions:
+    \c createMenu() and \c modelFromFile(). We also declare the private widgets
+    needed - three QComboBox objects, a QCheckBox, a QCompleter, a QLabel, and
+    a QLineEdit.
+
+    \snippet examples/tools/completer/mainwindow.h 1
+
+    \section1 MainWindow Class Implementation
+
+    The constructor of \c MainWindow constructs a \c MainWindow with a parent
+    widget and initializes the private members. The \c createMenu() function
+    is then invoked.
+
+    We set up three QComboBox objects, \c modelComb, \c modeCombo and
+    \c caseCombo. By default, the \c modelCombo is set to QDirModel,
+    the \c modeCombo is set to "Filtered Popup" and the \c caseCombo is set
+    to "Case Insensitive".
+
+    \snippet examples/tools/completer/mainwindow.cpp 0
+
+    The \c wrapCheckBox is then set up. This \c checkBox determines if the
+    \c{completer}'s \l{QCompleter::setWrapAround()}{setWrapAround()} property
+    is enabled or disabled.
+
+    \snippet examples/tools/completer/mainwindow.cpp 1
+
+    We instantiate \c contentsLabel and set its size policy to
+    \l{QSizePolicy::Fixed}{fixed}. The combo boxes' \l{QComboBox::activated()}
+    {activated()} signals are then connected to their respective slots.
+
+    \snippet examples/tools/completer/mainwindow.cpp 2
+
+    The \c lineEdit is set up and then we arrange all the widgets using a
+    QGridLayout. The \c changeModel() function is called, to initialize the
+    \c completer.
+
+    \snippet examples/tools/completer/mainwindow.cpp 3
+
+    The \c createMenu() function is used to instantiate the QAction objects
+    needed to fill the \c fileMenu and \c helpMenu. The actions'
+    \l{QAction::triggered()}{triggered()} signals are connected to their
+    respective slots.
+
+    \snippet examples/tools/completer/mainwindow.cpp 4
+
+    The \c modelFromFile() function accepts the \a fileName of a file and
+    processes it depending on its contents.
+
+    We first validate the \c file to ensure that it can be opened in
+    QFile::ReadOnly mode. If this is unsuccessful, the function returns an
+    empty QStringListModel.
+
+    \snippet examples/tools/completer/mainwindow.cpp 5
+
+    The mouse cursor is then overriden with Qt::WaitCursor before we fill
+    a QStringList object, \c words, with the contents of \c file. Once this
+    is done, we restore the mouse cursor.
+
+    \snippet examples/tools/completer/mainwindow.cpp 6
+
+    As mentioned earlier, the resources file contains two files -
+    \e{countries.txt} and \e{words.txt}. If the \c file read is \e{words.txt},
+    we return a QStringListModel with \c words as its QStringList and
+    \c completer as its parent.
+
+    \snippet examples/tools/completer/mainwindow.cpp 7
+
+    If the \c file read is \e{countries.txt}, then we require a
+    QStandardItemModel with \c words.count() rows, 2 columns, and \c completer
+    as its parent.
+
+    \snippet examples/tools/completer/mainwindow.cpp 8
+
+    A standard line in \e{countries.txt} is:
+    \quotation
+        Norway                          NO
+    \endquotation
+
+    Hence, to populate the QStandardItemModel object, \c m, we have to
+    split the country name and its symbol. Once this is done, we return
+    \c m.
+
+    \snippet examples/tools/completer/mainwindow.cpp 9
+
+    The \c changeMode() function sets the \c{completer}'s mode, depending on
+    the value of \c index.
+
+    \snippet examples/tools/completer/mainwindow.cpp 10
+
+    The \c changeModel() function changes the item model used based on the
+    model selected by the user.
+
+    A \c switch statement is used to change the item model based on the index
+    of \c modelCombo. If \c case is 0, we use an unsorted QDirModel, providing
+    us with a file path excluding the drive label.
+
+    \snippet examples/tools/completer/mainwindow.cpp 11
+
+    Note that we create the model with \c completer as the parent as this
+    allows us to replace the model with a new model. The \c completer will
+    ensure that the old one is deleted the moment a new model is assigned
+    to it.
+
+    If \c case is 1, we use the \c DirModel we defined earlier, resulting in
+    full paths for the files.
+
+    \snippet examples/tools/completer/mainwindow.cpp 12
+
+    When \c case is 2, we attempt to complete names of countries. This requires
+    a QTreeView object, \c treeView. The country names are extracted from
+    \e{countries.txt} and set the popup used to display completions to
+    \c treeView.
+
+    \snippet examples/tools/completer/mainwindow.cpp 13
+
+    The screenshot below shows the Completer with the country list model.
+
+    \image completer-example-country.png
+
+    If \c case is 3, we attempt to complete words. This is done using a
+    QStringListModel that contains data extracted from \e{words.txt}. The
+    model is sorted \l{QCompleter::CaseInsensitivelySortedModel}
+    {case insensitively}.
+
+    The screenshot below shows the Completer with the word list model.
+
+    \image completer-example-word.png
+
+    Once the model type is selected, we call the \c changeMode() function and
+    the \c changeCase() function and set the wrap option accordingly. The
+    \c{wrapCheckBox}'s \l{QCheckBox::clicked()}{clicked()} signal is connected
+    to the \c{completer}'s \l{QCompleter::setWrapAround()}{setWrapAround()}
+    slot.
+
+    \snippet examples/tools/completer/mainwindow.cpp 14
+
+    The \c about() function provides a brief description about the example.
+
+    \snippet examples/tools/completer/mainwindow.cpp 15
+
+    \section1 \c main() Function
+
+    The \c main() function instantiates QApplication and \c MainWindow and
+    invokes the \l{QWidget::show()}{show()} function.
+
+    \snippet examples/tools/completer/main.cpp 0
+    */
diff --git a/doc/src/examples/complexpingpong.qdoc b/doc/src/examples/complexpingpong.qdoc
new file mode 100644
index 0000000000..dd05a41811
--- /dev/null
+++ b/doc/src/examples/complexpingpong.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example dbus/complexpingpong
+    \title Complex Ping Pong Example
+
+    The Complex Ping Pong example improves on the \l{D-Bus Ping Pong Example} by providing
+    a more useful demonstration of D-Bus interfaces.
+
+    \quotefile doc/src/snippets/complexpingpong-example.qdoc
+*/
diff --git a/doc/src/examples/concentriccircles.qdoc b/doc/src/examples/concentriccircles.qdoc
new file mode 100644
index 0000000000..7c36b0d168
--- /dev/null
+++ b/doc/src/examples/concentriccircles.qdoc
@@ -0,0 +1,245 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example painting/concentriccircles
+    \title Concentric Circles Example
+
+    The Concentric Circles example shows the improved rendering
+    quality that can be obtained using floating point precision and
+    anti-aliasing when drawing custom widgets. The example also shows
+    how to do simple animations.
+
+    The application's main window displays several widgets which are
+    drawn using the various combinations of precision and
+    anti-aliasing.
+
+    \image concentriccircles-example.png
+
+    Anti-aliasing is one of QPainter's render hints. The
+    QPainter::RenderHints are used to specify flags to QPainter that
+    may, or may not, be respected by any given
+    engine. QPainter::Antialiasing indicates that the engine should
+    anti-alias the edges of primitives if possible, i.e. put
+    additional pixels around the original ones to smooth the edges.
+
+    The difference between floating point precision and integer
+    precision is a matter of accuracy, and is visible in the
+    application's main window: Even though the logic that is
+    calculating the circles' geometry is the same, floating points
+    ensure that the white spaces between each circle are of the same
+    size, while integers make two and two circles appear as if they
+    belong together. The reason is that the integer based precision
+    rely on rounding off non-integer calculations.
+
+    The example consists of two classes:
+
+    \list
+    \o \c CircleWidget is a custom widget which renders several animated
+       concentric circles.
+    \o \c Window is the application's main window displaying four \c
+       {CircleWidget}s drawn using different combinations of precision
+       and aliasing.
+    \endlist
+
+    First we will review the CircleWidget class, then we will take a
+    look at the Window class.
+
+    \section1 CircleWidget Class Definition
+
+    The CircleWidget class inherits QWidget, and is a custom widget
+    which renders several animated concentric circles.
+
+    \snippet examples/painting/concentriccircles/circlewidget.h 0
+
+    We declare the \c floatBased and \c antialiased variables to hold
+    whether an instance of the class should be rendered with integer
+    or float based precision, and whether the rendering should be
+    anti-aliased or not. We also declare functions setting each of
+    these variables.
+
+    In addition we reimplement the QWidget::paintEvent() function to
+    apply the various combinations of precision and anti-aliasing when
+    rendering, and to support the animation. We reimplement the
+    QWidget::minimumSizeHint() and QWidget::sizeHint() functions to
+    give the widget a reasonable size within our application.
+
+    We declare the private \c nextAnimationFrame() slot, and the
+    associated \c frameNo variable holding the number of "animation
+    frames" for the widget, to facilitate the animation.
+
+    \section1 CircleWidget Class Implementation
+
+    In the constructor we make the widget's rendering integer based
+    and aliased by default:
+
+    \snippet examples/painting/concentriccircles/circlewidget.cpp 0
+
+    We initialize the widget's \c frameNo variable, and set the
+    widget's background color using the QWidget::setBackgroundColor()
+    function which takes a \l {QPalette::ColorRole}{color role} as
+    argument; the QPalette::Base color role is typically white.
+
+    Then we set the widgets size policy using the
+    QWidget::setSizePolicy() function. QSizePolicy::Expanding means
+    that the widget's \l {QWidget::sizeHint()}{sizeHint()} is a
+    sensible size, but that the widget can be shrunk and still be
+    useful. The widget can also make use of extra space, so it should
+    get as much space as possible.
+
+    \snippet examples/painting/concentriccircles/circlewidget.cpp 1
+    \codeline
+    \snippet examples/painting/concentriccircles/circlewidget.cpp 2
+
+    The public \c setFloatBased() and \c setAntialiased() functions
+    update the widget's rendering preferences, i.e. whether the widget
+    should be rendered with integer or float based precision, and
+    whether the rendering should be anti-aliased or not.
+
+    The functions also generate a paint event by calling the
+    QWidget::update() function, forcing a repaint of the widget with
+    the new rendering preferences.
+
+    \snippet examples/painting/concentriccircles/circlewidget.cpp 3
+    \codeline
+    \snippet examples/painting/concentriccircles/circlewidget.cpp 4
+
+    The default implementations of the QWidget::minimumSizeHint() and
+    QWidget::sizeHint() functions return invalid sizes if there is no
+    layout for the widget, otherwise they return the layout's minimum and
+    preferred size, respectively.
+
+    We reimplement the functions to give the widget minimum and
+    preferred sizes which are reasonable within our application.
+
+    \snippet examples/painting/concentriccircles/circlewidget.cpp 5
+
+    The nextAnimationFrame() slot simply increments the \c frameNo
+    variable's value, and calls the QWidget::update() function which
+    schedules a paint event for processing when Qt returns to the main
+    event loop.
+
+    \snippet examples/painting/concentriccircles/circlewidget.cpp 6
+
+    A paint event is a request to repaint all or part of the
+    widget. The \c paintEvent() function is an event handler that can
+    be reimplemented to receive the widget's paint events. We
+    reimplement the event handler to apply the various combinations of
+    precision and anti-aliasing when rendering the widget, and to
+    support the animation.
+
+    First, we create a QPainter for the widget, and set its
+    antialiased flag to the widget's preferred aliasing. We also
+    translate the painters coordinate system, preparing to draw the
+    widget's cocentric circles. The translation ensures that the
+    center of the circles will be equivalent to the widget's center.
+
+    \snippet examples/painting/concentriccircles/circlewidget.cpp 7
+
+    When painting a circle, we use the number of "animation frames" to
+    determine the alpha channel of the circle's color. The alpha
+    channel specifies the color's transparency effect, 0 represents a
+    fully transparent color, while 255 represents a fully opaque
+    color.
+
+    \snippet examples/painting/concentriccircles/circlewidget.cpp 8
+
+    If the calculated alpha channel is fully transparent, we don't
+    draw anything since that would be equivalent to drawing a white
+    circle on a white background. Instead we skip to the next circle
+    still creating a white space. If the calculated alpha channel is
+    fully opaque, we set the pen (the QColor passed to the QPen
+    constructor is converted into the required QBrush by default) and
+    draw the circle. If the widget's preferred precision is float
+    based, we specify the circle's bounding rectangle using QRectF and
+    double values, otherwise we use QRect and integers.
+
+    The animation is controlled by the public \c nextAnimationFrame()
+    slot: Whenever the \c nextAnimationFrame() slot is called the
+    number of frames is incremented and a paint event is
+    scheduled. Then, when the widget is repainted, the alpha-blending
+    of the circles' colors change and the circles appear as animated.
+
+    \section1 Window Class Definition
+
+    The Window class inherits QWidget, and is the application's main
+    window rendering four \c {CircleWidget}s using different
+    combinations of precision and aliasing.
+
+    \snippet examples/painting/concentriccircles/window.h 0
+
+    We declare the various components of the main window, i.e the text
+    labels and a double array that will hold reference to the four \c
+    {CircleWidget}s. In addition we declare the private \c
+    createLabel() function to simplify the constructor.
+
+    \section1 Window Class Implementation
+
+    \snippet examples/painting/concentriccircles/window.cpp 0
+
+    In the constructor, we first create the various labels and put
+    them in a QGridLayout.
+
+    \snippet examples/painting/concentriccircles/window.cpp 1
+
+    Then we create a QTimer. The QTimer class is a high-level
+    programming interface for timers, and provides repetitive and
+    single-shot timers.
+
+    We create a timer to facilitate the animation of our concentric
+    circles; when we create the four CircleWidget instances (and add
+    them to the layout), we connect the QTimer::timeout() signal to
+    each of the widgets' \c nextAnimationFrame() slots.
+
+    \snippet examples/painting/concentriccircles/window.cpp 2
+
+    Before we set the layout and window title for our main window, we
+    make the timer start with a timeout interval of 100 milliseconds,
+    using the QTimer::start() function. That means that the
+    QTimer::timeout() signal will be emitted, forcing a repaint of the
+    four \c {CircleWidget}s, every 100 millisecond which is the reason
+    the circles appear as animated.
+
+    \snippet examples/painting/concentriccircles/window.cpp 3
+
+    The private \c createLabel() function is implemented to simlify
+    the constructor.
+*/
diff --git a/doc/src/examples/configdialog.qdoc b/doc/src/examples/configdialog.qdoc
new file mode 100644
index 0000000000..afb1c5fe70
--- /dev/null
+++ b/doc/src/examples/configdialog.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example dialogs/configdialog
+    \title Config Dialog Example
+
+    The Config Dialog examples shows how a configuration dialog can be created by
+    using an icon view with a stacked widget.
+
+    \image configdialog-example.png
+*/
diff --git a/doc/src/examples/containerextension.qdoc b/doc/src/examples/containerextension.qdoc
new file mode 100644
index 0000000000..a4fbceaace
--- /dev/null
+++ b/doc/src/examples/containerextension.qdoc
@@ -0,0 +1,518 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example designer/containerextension
+    \title Container Extension Example
+
+    The Container Extension example shows how to create a custom
+    multi-page plugin for Qt Designer using the
+    QDesignerContainerExtension class.
+
+    \image containerextension-example.png
+
+    To provide a custom widget that can be used with \QD, we need to
+    supply a self-contained implementation. In this example we use a
+    custom multi-page widget designed to show the container extension
+    feature.
+
+    An extension is an object which modifies the behavior of \QD. The
+    QDesignerContainerExtension enables \QD to manage and manipulate a
+    custom multi-page widget, i.e. adding and deleting pages to the
+    widget.
+
+    There are four available types of extensions in \QD:
+
+    \list
+        \o QDesignerMemberSheetExtension  provides an extension that allows
+           you to manipulate a widget's member functions which is displayed
+           when configuring connections using Qt Designer's mode for editing
+           signals and slots.
+        \o QDesignerPropertySheetExtension provides an extension that
+           allows you to manipulate a widget's properties which is displayed
+           in Qt Designer's property editor.
+        \o QDesignerTaskMenuExtension provides an extension that allows
+           you to add custom menu entries to \QD's task menu.
+        \o QDesignerContainerExtension provides an extension that allows
+           you to add (and delete) pages to a multi-page container plugin
+           in \QD.
+    \endlist
+
+    You can use all the extensions following the same pattern as in
+    this example, only replacing the respective extension base
+    class. For more information, see the \l {QtDesigner Module}.
+
+    The Container Extension example consists of four classes:
+
+    \list
+    \o \c MultiPageWidget is a custom container widget that lets the user
+       manipulate and populate its pages, and navigate among these
+       using a combobox.
+    \o \c MultiPageWidgetPlugin exposes the \c MultiPageWidget class
+       to \QD.
+    \o \c MultiPageWidgetExtensionFactory creates a
+       \c MultiPageWidgetContainerExtension object.
+    \o \c MultiPageWidgetContainerExtension provides the container
+       extension.
+    \endlist
+
+    The project file for custom widget plugins needs some additional
+    information to ensure that they will work within \QD. For example,
+    custom widget plugins rely on components supplied with \QD, and
+    this must be specified in the project file that we use. We will
+    first take a look at the plugin's project file.
+
+    Then we will continue by reviewing the \c MultiPageWidgetPlugin
+    class, and take a look at the \c MultiPageWidgetExtensionFactory
+    and \c MultiPageWidgetContainerExtension classes. Finally, we will
+    take a quick look at the \c MultiPageWidget class definition.
+
+    \section1 The Project File: containerextension.pro
+
+    The project file must contain some additional information to
+    ensure that the plugin will work as expected:
+
+    \snippet examples/designer/containerextension/containerextension.pro 0
+    \snippet examples/designer/containerextension/containerextension.pro 1
+
+    The \c TEMPLATE variable's value makes \c qmake create the custom
+    widget as a library. Later, we will ensure that the widget will be
+    recognized as a plugin by Qt by using the Q_EXPORT_PLUGIN2() macro
+    to export the relevant widget information.
+
+    The \c CONFIG variable contains two values, \c designer and \c
+    plugin:
+
+    \list
+        \o \c designer: Since custom widgets plugins rely on components
+           supplied with \QD, this value ensures that our plugin links against
+           \QD's library (\c libQtDesigner.so).
+
+        \o \c plugin: We also need to ensure that \c qmake considers the
+           custom widget a \e plugin library.
+    \endlist
+
+    When Qt is configured to build in both debug and release modes,
+    \QD will be built in release mode.  When this occurs, it is
+    necessary to ensure that plugins are also built in release
+    mode. For that reason we add a \c debug_and_release value to the
+    \c CONFIG variable. Otherwise, if a plugin is built in a mode that
+    is incompatible with \QD, it won't be loaded and installed.
+
+    The header and source files for the widget are declared in the
+    usual way:
+
+    \snippet examples/designer/containerextension/containerextension.pro 2
+
+    We provide an implementation of the plugin interface so that \QD
+    can use the custom widget. In this particular example we also
+    provide implementations of the container extension interface and
+    the extension factory.
+
+    It is important to ensure that the plugin is installed in a
+    location that is searched by \QD. We do this by specifying a
+    target path for the project and adding it to the list of items to
+    install:
+
+    \snippet doc/src/snippets/code/doc_src_examples_containerextension.qdoc 0
+
+    The container extension is created as a library, and will be
+    installed alongside the other \QD plugins when the project is
+    installed (using \c{make install} or an equivalent installation
+    procedure).
+
+    Note that if you want the plugins to appear in a Visual Studio
+    integration, the plugins must be built in release mode and their
+    libraries must be copied into the plugin directory in the install
+    path of the integration (for an example, see \c {C:/program
+    files/trolltech as/visual studio integration/plugins}).
+
+    For more information about plugins, see the \l {How to Create Qt
+    Plugins} documentation.
+
+    \section1 MultiPageWidgetPlugin Class Definition
+
+    The \c MultiPageWidgetPlugin class exposes the \c MultiPageWidget
+    class to \QD. Its definition is similar to the \l
+    {designer/customwidgetplugin}{Custom Widget Plugin} example's
+    plugin class which is explained in detail. The parts of the class
+    definition that is specific to this particular custom widget is
+    the class name and a couple of private slots:
+
+    \snippet examples/designer/containerextension/multipagewidgetplugin.h 0
+
+    The plugin class provides \QD with basic information about our
+    plugin, such as its class name and its include file. Furthermore
+    it knows how to create instances of the \c MultiPageWidget widget.
+    \c MultiPageWidgetPlugin also defines the \l
+    {QDesignerCustomWidgetInterface::initialize()}{initialize()}
+    function which is called after the plugin is loaded into \QD. The
+    function's QDesignerFormEditorInterface parameter provides the
+    plugin with a gateway to all of \QD's API's.
+
+    In the case of a multipage widget such as ours, we must also implement
+    two private slots, currentIndexChanged() and pageTitleChanged(),
+    to be able to update \QD's property editor whenever the user views
+    another page or changes one of the page titles. To be able to give
+    each page their own title, we have chosen to use the
+    QWidget::windowTitle property to store the page title (for more
+    information see the MultiPageWidget class \l
+    {designer/containerextension/multipagewidget.cpp}{implementation}). Note
+    that currently there is no way of adding a custom property (e.g.,
+    a page title) to the pages without using a predefined property as
+    placeholder.
+
+    The \c MultiPageWidgetPlugin class inherits from both QObject and
+    QDesignerCustomWidgetInterface. It is important to remember, when
+    using multiple inheritance, to ensure that all the interfaces
+    (i.e. the classes that doesn't inherit Q_OBJECT) are made known to
+    the meta object system using the Q_INTERFACES() macro. This
+    enables \QD to use \l qobject_cast() to query for supported
+    interfaces using nothing but a QObject pointer.
+
+    \section1 MultiPageWidgetPlugin Class Implementation
+
+    The MultiPageWidgetPlugin class implementation is in most parts
+    equivalent to the \l {designer/customwidgetplugin}{Custom Widget
+    Plugin} example's plugin class:
+
+    \snippet examples/designer/containerextension/multipagewidgetplugin.cpp 0
+    \codeline
+    \snippet examples/designer/containerextension/multipagewidgetplugin.cpp 3
+
+    One of the functions that differ is the isContainer() function
+    which returns true in this example since our custom widget is
+    intended to be used as a container.
+
+    \snippet examples/designer/containerextension/multipagewidgetplugin.cpp 1
+
+    Another function that differ is the function creating our custom widget:
+
+    \snippet examples/designer/containerextension/multipagewidgetplugin.cpp 2
+
+    In addition to create and return the widget, we connect our custom
+    container widget's currentIndexChanged() signal to the plugin's
+    currentIndexChanged() slot to ensure that \QD's property editor is
+    updated whenever the user views another page. We also connect the
+    widget's pageTitleChanged() signal to the plugin's
+    pageTitleChanged() slot.
+
+    The currentIndexChanged() slot is called whenever our custom
+    widget's currentIndexChanged() \e signal is emitted, i.e. whenever
+    the user views another page:
+
+    \snippet examples/designer/containerextension/multipagewidgetplugin.cpp 8
+
+    First, we retrieve the object emitting the signal using the
+    QObject::sender() and qobject_cast() functions. If it's called in
+    a slot activated by a signal, QObject::sender() returns a pointer
+    to the object that sent the signal; otherwise it returns 0.
+
+    \snippet examples/designer/containerextension/multipagewidgetplugin.cpp 9
+
+    Once we have the widget we can update the property editor. \QD
+    uses the QDesignerPropertySheetExtension class to feed its
+    property editor, and whenever a widget is selected in its
+    workspace, Qt Designer will query for the widget's property sheet
+    extension and update the property editor.
+
+    So what we want to achieve is to notify \QD that our widget's \e
+    internal selection has changed: First we use the static
+    QDesignerFormWindowInterface::findFormWindow() function to
+    retrieve the QDesignerFormWindowInterface object containing the
+    widget. The QDesignerFormWindowInterface class allows you to query
+    and manipulate form windows appearing in Qt Designer's
+    workspace. Then, all we have to do is to emit its \l
+    {QDesignerFormWindowInterface::emitSelectionChanged()}{emitSelectionChanged()}
+    signal, forcing an update of the property editor.
+
+    When changing a page title a generic refresh of the property
+    editor is not enough because it is actually the page's property
+    extension that needs to be updated. For that reason we need to
+    access the QDesignerPropertySheetExtension object for the page
+    which title we want to change. The QDesignerPropertySheetExtension
+    class also allows you to manipulate a widget's properties, but to
+    get hold of the extension we must first retrieve access to \QD's
+    extension manager:
+
+    \snippet examples/designer/containerextension/multipagewidgetplugin.cpp 10
+    \snippet examples/designer/containerextension/multipagewidgetplugin.cpp 11
+
+    Again we first retrieve the widget emitting the signal, using the
+    QObject::sender() and qobject_cast() functions. Then we retrieve
+    the current page from the widget that emitted the signal, and we
+    use the static QDesignerFormWindowInterface::findFormWindow()
+    function to retrieve the form containing our widget.
+
+    \snippet examples/designer/containerextension/multipagewidgetplugin.cpp 12
+
+    Now that we have the form window, the QDesignerFormWindowInterface
+    class provides the \l
+    {QDesignerFormWindowInterface::core()}{core()} function which
+    returns the current QDesignerFormEditorInterface object. The
+    QDesignerFormEditorInterface class allows you to access Qt
+    Designer's various components. In particular, the
+    QDesignerFormEditorInterface::extensionManager() function returns
+    a reference to the current extension manager.
+
+    \snippet examples/designer/containerextension/multipagewidgetplugin.cpp 13
+
+    Once we have the extension manager we can update the extension
+    sheet: First we retrieve the property extension for the page which
+    title we want to change, using the qt_extension() function.  Then
+    we retrieve the index for the page title using the
+    QDesignerPropertySheetExtension::indexOf() function. As previously
+    mentioned, we have chosen to use the QWidget::windowTitle property
+    to store the page title (for more information see the
+    MultiPageWidget class \l
+    {designer/containerextension/multipagewidget.cpp}{implementation}).
+    Finally, we implicitly force an update of the page's property
+    sheet by calling the the
+    QDesignerPropertySheetExtension::setChanged() function.
+
+    \snippet examples/designer/containerextension/multipagewidgetplugin.cpp 4
+
+    Note also the initialize() function: The \c initialize() function
+    takes a QDesignerFormEditorInterface object as argument.
+
+    \snippet examples/designer/containerextension/multipagewidgetplugin.cpp 5
+
+    When creating extensions associated with custom widget plugins, we
+    need to access \QD's current extension manager which we retrieve
+    from the QDesignerFormEditorInterface parameter.
+
+    In addition to allowing you to manipulate a widget's properties,
+    the QExtensionManager class provides extension management
+    facilities for \QD. Using \QD's current extension manager you can
+    retrieve the extension for a given object. You can also register
+    and unregister an extension for a given object. Remember that an
+    extension is an object which modifies the behavior of \QD.
+
+    When registrering an extension, it is actually the associated
+    extension factory that is registered. In \QD, extension factories
+    are used to look up and create named extensions as they are
+    required. So, in this example, the container extension itself is
+    not created until \QD must know whether the associated widget is a
+    container, or not.
+
+    \snippet examples/designer/containerextension/multipagewidgetplugin.cpp 6
+
+    We create a \c MultiPageWidgetExtensionFactory object that we
+    register using \QD's current \l {QExtensionManager}{extension
+    manager} retrieved from the QDesignerFormEditorInterface
+    parameter. The first argument is the newly created factory and the
+    second argument is an extension identifier which is a string. The
+    \c Q_TYPEID() macro simply convert the string into a
+    QLatin1String.
+
+    The \c MultiPageWidgetExtensionFactory class is a subclass of
+    QExtensionFactory. When \QD must know whether a widget is a
+    container, or not, \QD's extension manager will run through all
+    its registered factories invoking the first one which is able to
+    create a container extension for that widget. This factory will in
+    turn create a \c MultiPageWidgetExtension object.
+
+    \snippet examples/designer/containerextension/multipagewidgetplugin.cpp 7
+
+    Finally, take a look at the \c domXml() function. This function
+    includes default settings for the widget in the standard XML
+    format used by \QD. In this case, we specify the container's first
+    page; any inital pages of a multi-page widget must be specified
+    within this function.
+
+    \snippet examples/designer/containerextension/multipagewidgetplugin.cpp 14
+
+    Remember to use the Q_EXPORT_PLUGIN2() macro to export the
+    MultiPageWidgetPlugin class for use with Qt's plugin handling
+    classes: This macro ensures that \QD can access and construct the
+    custom widget. Without this macro, there is no way for \QD to use
+    the widget.
+
+    \section1 MultiPageWidgetExtensionFactory Class Definition
+
+    The \c MultiPageWidgetExtensionFactory class inherits QExtensionFactory
+    which provides a standard extension factory for \QD.
+
+    \snippet examples/designer/containerextension/multipagewidgetextensionfactory.h 0
+
+    The subclass's purpose is to reimplement the
+    QExtensionFactory::createExtension() function, making it able to
+    create a \c MultiPageWidget container extension.
+
+
+    \section1 MultiPageWidgetExtensionFactory Class Implementation
+
+    The class constructor simply calls the QExtensionFactory base
+    class constructor:
+
+    \snippet examples/designer/containerextension/multipagewidgetextensionfactory.cpp 0
+
+    As described above, the factory is invoked when \QD must know
+    whether the associated widget is a container, or not.
+
+    \snippet examples/designer/containerextension/multipagewidgetextensionfactory.cpp 1
+
+    \QD's behavior is the same whether the requested extension is
+    associated with a container, a member sheet, a property sheet or a
+    task menu: Its extension manager runs through all its registered
+    extension factories calling \c createExtension() for each until
+    one responds by creating the requested extension.
+
+    So the first thing we do in \c
+    MultiPageWidgetExtensionFactory::createExtension() is to check if
+    the QObject, for which the extension is requested, is in fact a \c
+    MultiPageWidget object. Then we check if the requested extension
+    is a container extension.
+
+    If the object is a MultiPageWidget requesting a container
+    extension, we create and return a \c MultiPageWidgetExtension
+    object. Otherwise, we simply return a null pointer, allowing \QD's
+    extension manager to continue its search through the registered
+    factories.
+
+
+    \section1 MultiPageWidgetContainerExtension Class Definition
+
+    The \c MultiPageWidgetContainerExtension class inherits
+    QDesignerContainerExtension which allows you to add (and delete)
+    pages to a multi-page container plugin in \QD.
+
+    \snippet examples/designer/containerextension/multipagewidgetcontainerextension.h 0
+
+    It is important to recognize that the QDesignerContainerExtension
+    class only is intended to provide \QD access to your custom
+    multi-page widget's functionality; your custom multi-page widget
+    must implement functionality corresponding to the extension's
+    functions.
+
+    Note also that we implement a constructor that takes \e two
+    arguments: the parent widget, and the \c MultiPageWidget object
+    for which the task menu is requested.
+
+    QDesignerContainerExtension provides a couple of menu entries in
+    \QD's task menu by default, enabling the user to add or delete
+    pages to the associated custom multi-page widget in \QD's
+    workspace.
+
+    \section1 MultiPageWidgetContainerExtension Class Implementation
+
+    In the constructor we save the reference to the \c MultiPageWidget
+    object sent as parameter, i.e the widget associated with the
+    extension. We will need this later to access the custom multi-page
+    widget performing the requested actions.
+
+    \snippet examples/designer/containerextension/multipagewidgetcontainerextension.cpp 0
+
+    To fully enable \QD to manage and manipulate your custom
+    multi-page widget, you must reimplement all the functions of
+    QDesignerContainerExtension:
+
+    \snippet examples/designer/containerextension/multipagewidgetcontainerextension.cpp 1
+    \codeline
+    \snippet examples/designer/containerextension/multipagewidgetcontainerextension.cpp 2
+    \codeline
+    \snippet examples/designer/containerextension/multipagewidgetcontainerextension.cpp 3
+
+    You must reimplement \l
+    {QDesignerContainerExtension::addWidget()}{addWidget()} adding a
+    given page to the container, \l
+    {QDesignerContainerExtension::count()}{count()} returning the
+    number of pages in the container, and \l
+    {QDesignerContainerExtension::currentIndex()}{currentIndex()}
+    returning the index of the currently selected page.
+
+    \snippet examples/designer/containerextension/multipagewidgetcontainerextension.cpp 4
+    \codeline
+    \snippet examples/designer/containerextension/multipagewidgetcontainerextension.cpp 5
+    \codeline
+    \snippet examples/designer/containerextension/multipagewidgetcontainerextension.cpp 6
+    \codeline
+    \snippet examples/designer/containerextension/multipagewidgetcontainerextension.cpp 7
+
+    You must reimplement \l
+    {QDesignerContainerExtension::insertWidget()}{insertWidget()}
+    adding a given page to the container at a given index, \l
+    {QDesignerContainerExtension::remove()}{remove()} deleting the
+    page at a given index, \l
+    {QDesignerContainerExtension::setCurrentIndex()}{setCurrentIndex()}
+    setting the index of the currently selected page, and finally \l
+    {QDesignerContainerExtension::widget()}{widget()} returning the
+    page at a given index.
+
+    \section1 MultiPageWidget Class Definition
+
+    The MultiPageWidget class is a custom container widget that lets
+    the user manipulate and populate its pages, and navigate among
+    these using a combobox.
+
+    \snippet examples/designer/containerextension/multipagewidget.h 0
+
+    The main detail to observe is that your custom multi-page widget
+    must implement functionality corresponding to the
+    QDesignerContainerExtension's member functions since the
+    QDesignerContainerExtension class only is intended to provide Qt
+    Designer access to your custom multi-page widget's functionality.
+
+    In addition, we declare the \c currentIndex and \c pageTitle
+    properties, and their associated set and get functions. By
+    declaring these attributes as properties, we allow \QD to manage
+    them in the same way it manages the properties the MultiPageWidget
+    widget inherits from QWidget and QObject, for example featuring
+    the property editor.
+
+    Note the \c STORED attribute in the declaration of the \c
+    pageTitle property: The \c STORED attribute indicates persistence,
+    i.e. it declares whether the property's value must be remembered
+    when storing an object's state. As mentioned above, we have chosen
+    to store the page title using the QWidget::windowTitle property to
+    be able to give each page their own title. For that reason the \c
+    pageTitle property is a "fake" property, provided for editing
+    purposes, and doesn't need to be stored.
+
+    We must also implement and emit the currentIndexChanged() and
+    pageTitleChanged() signals to ensure that \QD's property editor is
+    updated whenever the user views another page or changes one of the
+    page titles.
+
+    See the MultiPageWidget class \l
+    {designer/containerextension/multipagewidget.cpp}{implementation}
+    for more details.
+*/
diff --git a/doc/src/examples/context2d.qdoc b/doc/src/examples/context2d.qdoc
new file mode 100644
index 0000000000..a45b8bb33f
--- /dev/null
+++ b/doc/src/examples/context2d.qdoc
@@ -0,0 +1,353 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example script/context2d
+    \title Context2D Example
+
+    This Qt Script example is an implementation of the Context2D API.
+
+    \image context2d-example.png
+
+    Context2D is part of the specification for the HTML \c{<canvas>}
+    element. It can be used to draw graphics via scripting. A good
+    resource for learning more about the HTML \c{<canvas>} element is
+    the \l{http://developer.mozilla.org/en/docs/HTML:Canvas}{Mozilla Developer Center}.
+
+    \section1 Using The HTML Canvas Element in a Web Browser
+
+    First, let's look at how the \c{<canvas>} element is typically
+    used in a web browser. The following HTML snippet defines a
+    canvas of size 400x400 pixels with id \c{mycanvas}:
+
+    \code
+    <canvas width="400" height="400" id="mycanvas">Fallback content goes here.</canvas>
+    \endcode
+
+    To draw on the canvas, we must first obtain a reference to the
+    DOM element corresponding to the \c{<canvas>} tag and then call
+    the element's getContext() function. The resulting object
+    implements the Context2D API that we use to draw.
+
+    \code
+    <script>
+    var canvas = document.getElementById("mycanvas");
+    var ctx = canvas.getContext("2d");
+
+    // Draw a face
+    ctx.beginPath();
+    ctx.arc(75,75,50,0,Math.PI*2,true); // Outer circle
+    ctx.moveTo(110,75);
+    ctx.arc(75,75,35,0,Math.PI,false);   // Mouth
+    ctx.moveTo(65,65);
+    ctx.arc(60,65,5,0,Math.PI*2,true);  // Left eye
+    ctx.moveTo(95,65);
+    ctx.arc(90,65,5,0,Math.PI*2,true);  // Right eye
+    ctx.stroke();
+    </script>
+    \endcode
+
+    When the page is rendered by a browser that supports the
+    \c{<canvas>} tag, this would be the result:
+
+    \image context2d-example-smileysmile.png
+
+    \section1 Using Qt Script to script a Canvas
+
+    The goal of this example is to be able to evaluate scripts
+    that use the Context2D API, and render the results. Basic
+    interaction (mouse, keyboard) should also be supported.
+    In other words, we want to present scripts with an execution
+    environment that very much resembles that of a web browser. Of
+    course, our environment is only a small subset of what a browser
+    provides; i.e. we don't provide a full DOM API, only what is
+    needed to run "self-contained" Context2D scripts (i.e. scripts
+    that don't depend on other parts of the DOM document).
+
+    Our "Context2D-browser" is set up through the following steps:
+    \list
+    \o Create an Environment.
+    \o Create a Context2D, and a QContext2DCanvas widget to render it.
+    \o Add the canvas object to the environment; this will enable
+       scripts to obtain a reference to it.
+    \o Evaluate scripts in the environment.
+    \endlist
+
+    Once a script has been evaluated, the application handles any
+    timer events and input events that occur subsequently
+    (i.e. forwards events to their associated script targets).
+
+    \section1 The Context2D Class
+
+    The "heart" of this example is the Context2D C++ class that implements
+    the drawing API. Its interface is defined in terms of properties
+    and slots. Note that this class isn't tied to Qt Script in any
+    way.
+
+    \snippet examples/script/context2d/context2d.h 0
+
+    The properties define various aspects of the Context2D
+    configuration.
+    
+    \snippet examples/script/context2d/context2d.h 1
+
+    The slots define the operations that can be performed.
+    
+    \snippet examples/script/context2d/context2d.h 2
+
+    The changed() signal is emitted when the contents of the drawing
+    area has changed, so that clients associated with the Context2D
+    object (i.e. the canvas widget that renders it) are notified.
+
+    \section2 Implementation
+
+    Conveniently enough, the concepts, data structures and operations
+    of the Context2D API map more or less directly to Qt's painting
+    API. Conceptually, all we have to do is initialize a QPainter
+    according to the Context2D properties, and use functions like
+    QPainter::strokePath() to do the painting. Painting is done on a
+    QImage.
+
+    \snippet examples/script/context2d/context2d.cpp 0
+
+    The property accessors and most of the slots manipulate the
+    internal Context2D state in some way. For the \c{lineCap}
+    property, Context2D uses a string representation; we therefore
+    have to map it from/to a Qt::PenCapStyle. The \c{lineJoin}
+    property is handled in the same fashion. All the property setters
+    also set a \e{dirty flag} for the property; this is used to
+    decide which aspects of the QPainter that need to be updated
+    before doing the next painting operation.
+
+    \snippet examples/script/context2d/context2d.cpp 3
+
+    The implementation of the \c{fillStyle} property is interesting,
+    since the value can be either a string or a \c{CanvasGradient}.
+    We handle this by having the property be of type QVariant,
+    and check the actual type of the value to see how to handle the
+    write.
+
+    \snippet examples/script/context2d/context2d.cpp 1
+
+    Context2D does not have a concept of a paint event; painting
+    operations can happen at any time. We would like to be efficient,
+    and not have to call QPainter::begin() and QPainter::end() for
+    every painting operation, since typically many painting operations
+    will follow in quick succession. The implementations of the
+    painting operations use a helper function, beginPainting(), that
+    activates the QPainter if it isn't active already, and updates
+    the state of the QPainter (brush, pen, etc.) so that it reflects
+    the current Context2D state.
+
+    \snippet examples/script/context2d/context2d.cpp 2
+
+    The implementation of each painting operation ends by calling
+    scheduleChange(), which will post a zero-timer event if one is
+    not already pending. When the application returns to the event
+    loop later (presumably after all the drawing operations have
+    finished), the timer will trigger, QPainter::end() will be
+    called, and the changed() signal is emitted with the new
+    image as argument. The net effect is that there will typically
+    be only a single (QPainter::begin(), QPainter::end()) pair
+    executed for the full sequence of painting operations.
+
+    \section1 The Canvas Widget
+
+    \snippet examples/script/context2d/qcontext2dcanvas.h 0
+
+    The QContext2DCanvas class provides a widget that renders
+    the contents of a Context2D object. It also provides a
+    minimal scripting API, most notably the getContext() function.
+
+    \snippet examples/script/context2d/qcontext2dcanvas.cpp 3
+
+    The constructor connects to the changed() signal of the
+    Context2D object, so that the widget can update itself
+    when it needs to do so. Mouse tracking is enabled so that
+    mouse move events will be received even when no mouse
+    buttons are depressed.
+
+    \snippet examples/script/context2d/qcontext2dcanvas.cpp 0
+
+    The getContext() function asks the environment to wrap the
+    Context2D object; the resulting proxy object makes the
+    Context2D API available to scripts.
+
+    \snippet examples/script/context2d/qcontext2dcanvas.cpp 1
+
+    The paintEvent() function simply paints the contents that
+    was last received from the Context2D object.
+
+    \snippet examples/script/context2d/qcontext2dcanvas.cpp 2
+
+    The canvas widget reimplements mouse and key event handlers, and
+    forwards these events to the scripting environment. The
+    environment will take care of delivering the event to the proper
+    script target, if any.
+
+    \section1 The Environment
+
+    \snippet examples/script/context2d/environment.h 0
+
+    The Environment class provides a scripting environment where a
+    Canvas C++ object can be registered, looked up by ID (name),
+    and where scripts can be evaluated. The environment has a
+    \c{document} property, just like the scripting environment of a
+    web browser, so that scripts can call
+    \c{document.getElementById()} to obtain a reference to a canvas.
+
+    \snippet examples/script/context2d/environment.h 1
+
+    The Environment class provides the timer attributes of the DOM
+    Window Object interface. This enables us to support scripts that
+    do animation, for example.
+    
+    \snippet examples/script/context2d/environment.h 2
+
+    The scriptError() signal is emitted when evaluation of a script
+    causes a script exception. For example, if a mouse press handler
+    or timeout handler causes an exception, the environment's client(s)
+    will be notified of this and can report the error.
+
+    \snippet examples/script/context2d/environment.cpp 0
+
+    The constructor initializes the environment. First it creates
+    the QScriptEngine that will be used to evaluate scripts. It
+    creates the Document object that provides the getElementById()
+    function. Note that the QScriptEngine::ExcludeSuperClassContents
+    flag is specified to avoid the wrapper objects from exposing properties
+    and methods inherited from QObject. Next, the environment wraps
+    a pointer to \e{itself}; this is to prepare for setting this object
+    as the script engine's Global Object. The properties of the standard
+    Global Object are copied, so that these will also be available in
+    our custom Global Object. We also create two self-references to the
+    object; again, this is to provide a minimal level of compabilitity
+    with the scripting environment that web browsers provide.
+
+    \snippet examples/script/context2d/environment.cpp 5
+
+    The addCanvas() function adds the given canvas to the list of
+    registered canvas objects. The canvasByName() function looks up
+    a canvas by QObject::objectName(). This function is used to
+    implement the \c{document.getElementById()} script function.
+
+    \snippet examples/script/context2d/environment.cpp 1
+
+    The setInterval() and clearInterval() implementations use a QHash
+    to map from timer ID to the QScriptValue that holds the expression
+    to evaluate when the timer is triggered. A helper function,
+    maybeEmitScriptError(), is called after invoking the script handler;
+    it will emit the scriptError() signal if the script engine has an
+    uncaught exception.
+
+    \snippet examples/script/context2d/environment.cpp 2
+
+    The toWrapper() functions creates a QScriptValue that wraps the
+    given QObject. Note that the QScriptEngine::PreferExistingWrapperObject
+    flag is specified; this guarantees that a single, unique wrapper
+    object will be returned, even if toWrapper() is called several times
+    with the same argument. This is important, since it is possible that
+    a script can set new properties on the resulting wrapper object (e.g.
+    event handlers like \c{onmousedown}), and we want these to persist.
+
+    \snippet examples/script/context2d/environment.cpp 3
+
+    The handleEvent() function determines if there exists a handler
+    for the given event in the environment, and if so, invokes that
+    handler. Since the script expects a DOM event, the Qt C++ event
+    must be converted to a DOM event before it is passed to the
+    script. This mapping is relatively straightforward, but again,
+    we only implement a subset of the full DOM API; just enough to
+    get most scripts to work.
+
+    \snippet examples/script/context2d/environment.cpp 4
+
+    The newFakeDomEvent() function is a helper function that creates
+    a new script object and initializes it with default values for
+    the attributes defined in the DOM Event and DOM UIEvent
+    interfaces.
+
+    \snippet examples/script/context2d/environment.h 3
+
+    The Document class defines two slots that become available to
+    scripts: getElementById() and getElementsByTagName().
+    When the tag name is "canvas", getElementsByTagName() will
+    return a list of all canvas objects that are registered in
+    the environment.
+
+    \section1 The Application Window
+
+    \snippet examples/script/context2d/window.cpp 0
+
+    The Window constructor creates an Environment object and
+    connects to its scriptError() signal. It then creates a
+    Context2D object, and a QContext2DCanvas widget to hold it.
+    The canvas widget is given the name \c{tutorial}, and added to the
+    environment; scripts can access the canvas by e.g.
+    \c{document.getElementById('tutorial')}.
+
+    \snippet examples/script/context2d/window.cpp 1
+
+    The window contains a list widget that is populated with
+    available scripts (read from a \c{scripts/} folder).
+
+    \snippet examples/script/context2d/window.cpp 2
+
+    When an item is selected, the corresponding script is
+    evaluated in the environment.
+
+    \snippet examples/script/context2d/window.cpp 3
+
+    When the "Run in Debugger" button is clicked, the Qt Script debugger will
+    automatically be invoked when the first statement of the script is
+    reached. This enables the user to inspect the scripting environment and
+    control further execution of the script; e.g. he can single-step through
+    the script and/or set breakpoints. It is also possible to enter script
+    statements in the debugger's console widget, e.g. to perform custom
+    Context2D drawing operations, interactively.
+
+    \snippet examples/script/context2d/window.cpp 4
+
+    If the evaluation of a script causes an uncaught exception, the Qt Script
+    debugger will automatically be invoked; this enables the user to get an
+    idea of what went wrong.
+
+*/
diff --git a/doc/src/examples/customcompleter.qdoc b/doc/src/examples/customcompleter.qdoc
new file mode 100644
index 0000000000..8d0404a281
--- /dev/null
+++ b/doc/src/examples/customcompleter.qdoc
@@ -0,0 +1,201 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example tools/customcompleter
+    \title Custom Completer Example
+
+    The Custom Completer example shows how to provide string-completion
+    facilities for an input widget based on data provided by a model. The
+    completer pops up suggestions for possible words based on the first three
+    characters input by the user and the user's choice of word is inserted
+    into the \c TextEdit using QTextCursor.
+
+    \image customcompleter-example.png
+
+    \section1 Setting Up The Resource File
+
+    The Custom Completer example requires a resource file, \e wordlist.txt,
+    that has a list of words to help QCompleter complete words. This file
+    contains the following:
+
+    \quotefile examples/tools/customcompleter/customcompleter.qrc
+
+    \section1 TextEdit Class Definition
+
+    The \c TextEdit class is a subclass of QTextEdit with a custom
+    \c insertCompletion() slot and it reimplements the
+    \l{QAbstractScrollArea::keyPressEvent()}{keyPressEvent()} and the
+    \l{QWidget::focusInEvent()}{focusInEvent()} functions. \c TextEdit also
+    contains a private function \c textUnderCursor() and a private instance
+    of QCompleter, \c c.
+
+    \snippet examples/tools/customcompleter/textedit.h 0
+
+    \section1 TextEdit Class Implementation
+
+    The constructor for \c TextEdit constructs a \c TextEdit with a parent and
+    initializes \c c. The instructions to use the completer is displayed on
+    the \c TextEdit object, using the
+    \l{QTextEdit::setPlainText()}{setPlainText()} function.
+
+    \snippet examples/tools/customcompleter/textedit.cpp 0
+
+    In addition, \c TextEdit also includes a default destructor:
+
+    \snippet examples/tools/customcompleter/textedit.cpp 1
+
+    The \c setCompleter() function accepts a \a completer and sets it up.
+    We use \c{if (c)} to check if \c c has been initialized. If it has been
+    initialized, the QObject::disconnect() function is invoked to disconnect
+    the signal from the slot. This is to ensure that no previous completer
+    object is still connected to the slot.
+
+    \snippet examples/tools/customcompleter/textedit.cpp 2
+
+    We then instantiate \c c with \a completer and set it as \c{TextEdit}'s
+    widget. The completion mode and case sensitivity are also set and then
+    we connect the \l{QCompleter::activated()}{activated()} signal to the
+    \c insertCompletion() slot.
+
+    The \c completer() function is a getter function that returns \c c.
+
+    \snippet examples/tools/customcompleter/textedit.cpp 3
+
+    The completer pops up the options available, based on the contents of
+    \e wordlist.txt, but the text cursor is responsible for filling in the
+    missing characters, according to the user's choice of word.
+
+    Suppose the user inputs "ACT" and accepts the completer's suggestion of
+    "ACTUAL". The \c completion string is then sent to \c insertCompletion()
+    by the completer's \l{QCompleter::activated()}{activated()} signal.
+
+    The \c insertCompletion() function is responsible for completing the word
+    using a QTextCursor object, \c tc. It validates to ensure that the
+    completer's widget is \c TextEdit before using \c tc to insert the extra
+    characters to complete the word.
+
+    \snippet examples/tools/customcompleter/textedit.cpp 4
+
+    The figure below illustrates this process:
+
+    \image customcompleter-insertcompletion.png
+
+    \c{completion.length()} = 6
+
+    \c{c->completionPrefix().length()}=3
+
+    The difference between these two values is \c extra, which is 3. This
+    means that the last three characters from the right, "U", "A", and "L",
+    will be inserted by \c tc.
+
+    The \c textUnderCursor() function uses a QTextCursor, \c tc, to select a
+    word under the cursor and return it.
+
+    \snippet examples/tools/customcompleter/textedit.cpp 5
+
+    The \c TextEdit class reimplements \l{QWidget::focusInEvent()}
+    {focusInEvent()} function, which is an event handler used to receive
+    keyboard focus events for the widget.
+
+    \snippet examples/tools/customcompleter/textedit.cpp 6
+
+    The \l{QAbstractScrollArea::keyPressEvent()}{keyPressEvent()} is
+    reimplemented to ignore key events like Qt::Key_Enter, Qt::Key_Return,
+    Qt::Key_Escape, Qt::Key_Tab, and Qt::Key_Backtab so the completer can
+    handle them.
+
+    If there is an active completer, we cannot process the shortcut, Ctrl+E.
+
+    \snippet examples/tools/customcompleter/textedit.cpp 7
+
+    We also handle other modifiers and shortcuts for which we do not want the
+    completer to respond to.
+
+    \snippet examples/tools/customcompleter/textedit.cpp 8
+
+    Finally, we pop up the completer.
+
+    \section1 MainWindow Class Definition
+
+    The \c MainWindow class is a subclass of QMainWindow and implements a
+    private slot, \c about(). This class also has two private functions,
+    \c createMenu() and \c modelFromFile() as well as private instances of
+    QCompleter and \c TextEdit.
+
+    \snippet examples/tools/customcompleter/mainwindow.h 0
+
+    \section1 MainWindow Class Implementation
+
+    The constructor constructs a \c MainWindow with a parent and initializes
+    the \c completer. It also instantiates a \c TextEdit and sets its
+    completer. A QStringListModel, obtained from \c modelFromFile(), is used
+    to populate the \c completer. The \c{MainWindow}'s central widget is set
+    to \c TextEdit and its size is set to 500 x 300.
+
+    \snippet examples/tools/customcompleter/mainwindow.cpp 0
+
+    The \c createMenu() function creates the necessary QAction objects needed
+    for the "File" and "Help" menu and their \l{QAction::triggered()}
+    {triggered()} signals are connected to the \c quit(), \c about(), and
+    \c aboutQt() slots respectively.
+
+    \snippet examples/tools/customcompleter/mainwindow.cpp 1
+
+    The \c modelFromFile() function accepts a \a fileName and attempts to
+    extract the contents of this file into a QStringListModel. We display the
+    Qt::WaitCursor when we are populating the QStringList, \c words, and
+    restore the mouse cursor when we are done.
+
+    \snippet examples/tools/customcompleter/mainwindow.cpp 2
+
+    The \c about() function provides a brief description about the Custom
+    Completer example.
+
+    \snippet examples/tools/customcompleter/mainwindow.cpp 3
+
+    \section1 \c main() Function
+
+    The \c main() function instantiates \c MainWindow and invokes the
+    \l{QWidget::show()}{show()} function.
+
+    \snippet examples/tools/customcompleter/main.cpp 0
+*/
diff --git a/doc/src/examples/customsortfiltermodel.qdoc b/doc/src/examples/customsortfiltermodel.qdoc
new file mode 100644
index 0000000000..577858158d
--- /dev/null
+++ b/doc/src/examples/customsortfiltermodel.qdoc
@@ -0,0 +1,303 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example itemviews/customsortfiltermodel
+    \title Custom Sort/Filter Model Example
+
+    The Custom Sort/Filter Model example illustrates how to subclass
+    QSortFilterProxyModel to perform advanced sorting and filtering.
+
+    \image customsortfiltermodel-example.png Screenshot of the Custom Sort/Filter Model Example
+
+    The QSortFilterProxyModel class provides support for sorting and
+    filtering data passed between another model and a view.
+
+    The model transforms the structure of a source model by mapping
+    the model indexes it supplies to new indexes, corresponding to
+    different locations, for views to use. This approach allows a
+    given source model to be restructured as far as views are
+    concerned, without requiring any transformations on the underlying
+    data and without duplicating the data in memory.
+
+    The Custom Sort/Filter Model example consists of two classes:
+
+    \list
+
+        \o The \c MySortFilterProxyModel class provides a custom proxy
+        model.
+
+        \o The \c Window class provides the main application window,
+        using the custom proxy model to sort and filter a standard
+        item model.
+
+    \endlist
+
+    We will first take a look at the \c MySortFilterProxyModel class
+    to see how the custom proxy model is implemented, then we will
+    take a look at the \c Window class to see how the model is
+    used. Finally we will take a quick look at the \c main() function.
+
+    \section1 MySortFilterProxyModel Class Definition
+
+    The \c MySortFilterProxyModel class inherits the
+    QSortFilterProxyModel class.
+
+    Since QAbstractProxyModel and its subclasses are derived from
+    QAbstractItemModel, much of the same advice about subclassing
+    normal models also applies to proxy models.
+
+    On the other hand, it is worth noting that many of
+    QSortFilterProxyModel's default implementations of functions are
+    written so that they call the equivalent functions in the relevant
+    source model. This simple proxying mechanism may need to be
+    overridden for source models with more complex behavior; in this
+    example we derive from the QSortFilterProxyModel class to ensure
+    that our filter can recognize a valid range of dates, and to
+    control the sorting behavior.
+
+    \snippet examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.h 0
+
+    We want to be able to filter our data by specifying a given period
+    of time. For that reason, we implement the custom \c
+    setFilterMinimumDate() and \c setFilterMaximumDate() functions as
+    well as the corresponding \c filterMinimumDate() and \c
+    filterMaximumDate() functions. We reimplement
+    QSortFilterProxyModel's \l
+    {QSortFilterProxyModel::filterAcceptsRow()}{filterAcceptsRow()}
+    function to only accept rows with valid dates, and
+    QSortFilterProxyModel::lessThan() to be able to sort the senders
+    by their email adresses. Finally, we implement a \c dateInRange()
+    convenience function that we will use to determine if a date is
+    valid.
+
+    \section1 MySortFilterProxyModel Class Implementation
+
+    The \c MySortFilterProxyModel constructor is trivial, passing the
+    parent parameter on to the base class constructor:
+
+    \snippet examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 0
+
+    The most interesting parts of the \c MySortFilterProxyModel
+    implementation are the reimplementations of
+    QSortFilterProxyModel's \l
+    {QSortFilterProxyModel::filterAcceptsRow()}{filterAcceptsRow()}
+    and \l {QSortFilterProxyModel::lessThan()}{lessThan()}
+    functions. Let's first take a look at our customized \c lessThan()
+    function.
+
+    \snippet examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 4
+
+    We want to sort the senders by their email adresses. The \l
+    {QSortFilterProxyModel::}{lessThan()} function is used as the <
+    operator when sorting. The default implementation handles a
+    collection of types including QDateTime and String, but in order
+    to be able to sort the senders by their email adresses we must
+    first identify the adress within the given string:
+
+    \snippet examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 6
+
+    We use QRegExp to define a pattern for the adresses we are looking
+    for. The QRegExp::indexIn() function attempts to find a match in
+    the given string and returns the position of the first match, or
+    -1 if there was no match. If the given string contains the
+    pattern, we use QRegExp's \l {QRegExp::cap()}{cap()} function to
+    retrieve the actual adress. The \l {QRegExp::cap()}{cap()}
+    function returns the text captured by the \e nth
+    subexpression. The entire match has index 0 and the parenthesized
+    subexpressions have indexes starting from 1 (excluding
+    non-capturing parentheses).
+
+    \snippet examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 3
+
+    The \l
+    {QSortFilterProxyModel::filterAcceptsRow()}{filterAcceptsRow()}
+    function, on the other hand, is expected to return true if the
+    given row should be included in the model. In our example, a row
+    is accepted if either the subject or the sender contains the given
+    regular expression, and the date is valid.
+
+    \snippet examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 7
+
+    We use our custom \c dateInRange() function to determine if a date
+    is valid.
+
+    To be able to filter our data by specifying a given period of
+    time, we also implement functions for getting and setting the
+    minimum and maximum dates:
+
+    \snippet examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 1
+    \codeline
+    \snippet examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 2
+
+    The get functions, \c filterMinimumDate() and \c
+    filterMaximumDate(), are trivial and implemented as inline
+    function in the header file.
+
+    This completes our custom proxy model. Let's see how we can use it
+    in an application.
+
+    \section1 Window Class Definition
+
+    The \c CustomFilter class inherits QWidget, and provides this
+    example's main application window:
+
+    \snippet examples/itemviews/customsortfiltermodel/window.h 0
+
+    We implement two private slots, \c textFilterChanged() and \c
+    dateFilterChanged(), to respond to the user changing the filter
+    pattern, case sensitivity or any of the dates. In addition, we
+    implement a public \c setSourceModel() convenience function to set
+    up the model/ view relation.
+
+    \section1 Window Class Implementation
+
+    In this example, we have chosen to create and set the source model
+    in the \c main () function (which we will come back to later). So
+    when constructing the main application window, we assume that a
+    source model already exists and start by creating an instance of
+    our custom proxy model:
+
+    \snippet examples/itemviews/customsortfiltermodel/window.cpp 0
+
+    We set the \l
+    {QSortFilterProxyModel::dynamicSortFilter}{dynamicSortFilter}
+    property that holds whether the proxy model is dynamically sorted
+    and filtered. By setting this property to true, we ensure that the
+    model is sorted and filtered whenever the contents of the source
+    model change.
+
+    The main application window shows views of both the source model
+    and the proxy model. The source view is quite simple:
+
+    \snippet examples/itemviews/customsortfiltermodel/window.cpp 1
+
+    The QTreeView class provides a default model/view implementation
+    of a tree view; our view implements a tree representation of items
+    in the application's source model.
+
+    \snippet examples/itemviews/customsortfiltermodel/window.cpp 2
+
+    The QTreeView class provides a default model/view implementation
+    of a tree view; our view implements a tree representation of items
+    in the application's source model. We add our view widget to a
+    layout that we install on a corresponding group box.
+
+    The proxy model view, on the other hand, contains several widgets
+    controlling the various aspects of transforming the source model's
+    data structure:
+
+    \snippet examples/itemviews/customsortfiltermodel/window.cpp 3
+    \snippet examples/itemviews/customsortfiltermodel/window.cpp 4
+
+    Note that whenever the user changes one of the filtering options,
+    we must explicitly reapply the filter. This is done by connecting
+    the various editors to functions that update the proxy model.
+
+    \snippet examples/itemviews/customsortfiltermodel/window.cpp 5
+
+    The sorting will be handled by the view. All we have to do is to
+    enable sorting for our proxy view by setting the
+    QTreeView::sortingEnabled property (which is false by
+    default). Then we add all the filtering widgets and the proxy view
+    to a layout that we install on a corresponding group box.
+
+    \snippet examples/itemviews/customsortfiltermodel/window.cpp 6
+
+    Finally, after putting our two group boxes into another layout
+    that we install on our main application widget, we customize the
+    application window.
+
+    As mentioned above, we create the source model in the \c main ()
+    function, calling the \c Window::setSourceModel() function to make
+    the application use it:
+
+    \snippet examples/itemviews/customsortfiltermodel/window.cpp 7
+
+    The QSortFilterProxyModel::setSourceModel() function makes the
+    proxy model process the data in the given model, in this case out
+    mail model. The \l {QAbstractItemView::}{setModel()} that the
+    view widget inherits from the QAbstractItemModel class, sets the
+    model for the view to present. Note that the latter function will
+    also create and set a new selection model.
+
+    \snippet examples/itemviews/customsortfiltermodel/window.cpp 8
+
+    The \c textFilterChanged() function is called whenever the user
+    changes the filter pattern or the case sensitivity.
+
+    We first retrieve the preferred syntax (the QRegExp::PatternSyntax
+    enum is used to interpret the meaning of the given pattern), then
+    we determine the preferred case sensitivity. Based on these
+    preferences and the current filter pattern, we set the proxy
+    model's \l {QSortFilterProxyModel::}{filterRegExp} property. The
+    \l {QSortFilterProxyModel::}{filterRegExp} property holds the
+    regular expression used to filter the contents of the source
+    model. Note that calling QSortFilterProxyModel's \l
+    {QSortFilterProxyModel::}{setFilterRegExp()} function also updates
+    the model.
+
+    \snippet examples/itemviews/customsortfiltermodel/window.cpp 9
+
+    The \c dateFilterChanged() function is called whenever the user
+    modifies the range of valid dates. We retrieve the new dates from
+    the user interface, and call the corresponding functions (provided
+    by our custom proxy model) to set the proxy model's minimum and
+    maximum dates. As we explained above, calling these functions also
+    updates the model.
+
+    \section1 The Main() Function
+
+    In this example, we have separated the application from the source
+    model by creating the model in the \c main () function. First we
+    create the application, then we create the source model:
+
+    \snippet examples/itemviews/customsortfiltermodel/main.cpp 0
+
+    The \c createMailModel() function is a convenience function
+    provided to simplify the constructor. All it does is to create and
+    return a model describing a collection of emails. The model is an
+    instance of the QStandardItemModel class, i.e., a generic model
+    for storing custom data typically used as a repository for
+    standard Qt data types. Each mail description is added to the
+    model using \c addMail(), another convenience function. See \l
+    {itemviews/customsortfiltermodel/main.cpp}{main.cpp} for details.
+*/
diff --git a/doc/src/examples/customtype.qdoc b/doc/src/examples/customtype.qdoc
new file mode 100644
index 0000000000..ffeccc3111
--- /dev/null
+++ b/doc/src/examples/customtype.qdoc
@@ -0,0 +1,157 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example tools/customtype
+    \title Custom Type Example
+
+    The Custom Type example shows how to integrate a custom type into Qt's
+    meta-object system.
+
+    Contents:
+
+    \tableofcontents
+
+    \section1 Overview
+
+    Qt provides a range of standard value types that are used to provide
+    rich and meaningful APIs. These types are integrated with the meta-object
+    system, enabling them to be stored in QVariant objects, written out in
+    debugging information and sent between components in signal-slot
+    communication.
+
+    Custom types can also be integrated with the meta-object system as long as
+    they are written to conform to some simple guidelines. In this example, we
+    introduce a simple \c Message class, we describe how we make it work with
+    QVariant, and we show how it can be extended to generate a printable
+    representation of itself for use in debugging output.
+
+    \section1 The Message Class Definition
+
+    The \c Message class is a simple value class that contains two pieces
+    of information (a QString and a QStringList), each of which can be read
+    using trivial getter functions:
+
+    \snippet examples/tools/customtype/message.h custom type definition
+
+    The default constructor, copy constructor and destructor are
+    all required, and must be public, if the type is to be integrated into the
+    meta-object system. Other than this, we are free to implement whatever we
+    need to make the type do what we want, so we also include a constructor
+    that lets us set the type's data members.
+
+    To enable the type to be used with QVariant, we declare it using the
+    Q_DECLARE_METATYPE() macro:
+
+    \snippet examples/tools/customtype/message.h custom type meta-type declaration
+
+    We do not need to write any additional code to accompany this macro.
+
+    To allow us to see a readable description of each \c Message object when it
+    is sent to the debug output stream, we define a streaming operator:
+
+    \snippet examples/tools/customtype/message.h custom type streaming operator
+
+    This facility is useful if you need to insert tracing statements in your
+    code for debugging purposes.
+
+    \section1 The Message Class Implementation
+
+    The implementation of the default constructor, copy constructor and destructor
+    are straightforward for the \c Message class:
+
+    \snippet examples/tools/customtype/message.cpp Message class implementation
+
+    The streaming operator is implemented in the following way:
+
+    \snippet examples/tools/customtype/message.cpp custom type streaming operator
+
+    Here, we want to represent each value depending on how many lines are stored
+    in the message body. We stream text to the QDebug object passed to the
+    operator and return the QDebug object obtained from its maybeSpace() member
+    function; this is described in more detail in the
+    \l{Creating Custom Qt Types#Making the Type Printable}{Creating Custom Qt Types}
+    document.
+
+    We include the code for the getter functions for completeness:
+
+    \snippet examples/tools/customtype/message.cpp getter functions
+
+    With the type fully defined, implemented, and integrated with the
+    meta-object system, we can now use it.
+
+    \section1 Using the Message 
+
+    In the example's \c{main()} function, we show how a \c Message object can
+    be printed to the console by sending it to the debug stream:
+
+    \snippet examples/tools/customtype/main.cpp printing a custom type
+
+    You can use the type with QVariant in exactly the same way as you would
+    use standard Qt value types. Here's how to store a value using the
+    QVariant::setValue() function:
+
+    \snippet examples/tools/customtype/main.cpp storing a custom value
+
+    Alternatively, the qVariantFromValue() and qVariantSetValue() functions
+    can be used if you are using a compiler without support for member template
+    functions.
+
+    The value can be retrieved using the QVariant::value() member template
+    function:
+
+    \snippet examples/tools/customtype/main.cpp retrieving a custom value
+
+    Alternatively, the qVariantValue() template function can be used if
+    you are using a compiler without support for member template functions.
+
+    \section1 Further Reading
+
+    The custom \c Message type can also be used with direct signal-slot
+    connections; see the \l{Custom Type Sending Example} for a demonstration
+    of this.
+    To register a custom type for use with queued signals and slots, such as
+    those used in cross-thread communication, see the
+    \l{Queued Custom Type Example}.
+
+    More information on using custom types with Qt can be found in the
+    \l{Creating Custom Qt Types} document.
+*/
diff --git a/doc/src/examples/customtypesending.qdoc b/doc/src/examples/customtypesending.qdoc
new file mode 100644
index 0000000000..d335c2821d
--- /dev/null
+++ b/doc/src/examples/customtypesending.qdoc
@@ -0,0 +1,128 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example tools/customtypesending
+    \title Custom Type Sending Example
+
+    The Custom Type Sending example shows how to use a custom type with signals
+    and slots.
+
+    \image customtypesending-example.png
+
+    Contents:
+
+    \tableofcontents
+
+    \section1 Overview
+
+    In the \l{Custom Type Example}, we showed how to integrate custom types
+    with the meta-object system, enabling them to be stored in QVariant
+    objects, written out in debugging information and used in signal-slot
+    communication.
+
+    In this example, we demonstrate that the preparations made to the
+    \c Message class and its declaration with Q_DECLARE_METATYPE() enable it
+    to be used with direct signal-slot connections. We do this by creating
+    a \c Window class containing signals and slots whose signatures include
+    \c Message arguments.
+
+    \section1 The Window Class Definition
+
+    We define a simple \c Window class with a signal and public slot that
+    allow a \c Message object to be sent via a signal-slot connection:
+
+    \snippet examples/tools/customtypesending/window.h Window class definition
+
+    The window will contain a text editor to show the contents of a message
+    and a push button that the user can click to send a message. To facilitate
+    this, we also define the \c sendMessage() slot. We also keep a \c Message
+    instance in the \c thisMessage private variable which holds the actual
+    message to be sent.
+
+    \section1 The Window Class Implementation
+
+    The \c Window constructor sets up a user interface containing a text
+    editor and a push button.
+
+    \snippet examples/tools/customtypesending/window.cpp Window constructor
+
+    The button's \l{QPushButton::}{clicked()} signal is connected to the
+    window's \c{sendMessage()} slot, which emits the \c{messageSent(Message)}
+    signal with the \c Message held by the \c thisMessage variable:
+
+    \snippet examples/tools/customtypesending/window.cpp sending a message
+
+    We implement a slot to allow the message to be received, and this also
+    lets us set the message in the window programatically:
+
+    \snippet examples/tools/customtypesending/window.cpp receiving a message
+
+    In this function, we simply assign the new message to \c thisMessage
+    and update the text in the editor.
+
+    \section1 Making the Connection
+
+    In the example's \c{main()} function, we perform the connection between
+    two instances of the \c Window class:
+
+    \snippet examples/tools/customtypesending/main.cpp main function
+
+    We set the message for the first window and connect the
+    \c{messageSent(Message)} signal from each window to the other's
+    \c{setMessage(Message)} slot. Since the signals and slots mechanism is only
+    concerned with the type, we can simplify the signatures of both the
+    signal and slot when we make the connection.
+
+    When the user clicks on the \gui{Send message} button in either window,
+    the message shown will be emitted in a signal that the other window will
+    receive and display.
+
+    \section1 Further Reading
+
+    Although the custom \c Message type can be used with direct signals and
+    slots, an additional registration step needs to be performed if you want
+    to use it with queued signal-slot connections. See the
+    \l{Queued Custom Type Example} for details.
+
+    More information on using custom types with Qt can be found in the
+    \l{Creating Custom Qt Types} document.
+*/
diff --git a/doc/src/examples/customwidgetplugin.qdoc b/doc/src/examples/customwidgetplugin.qdoc
new file mode 100644
index 0000000000..31ad65b505
--- /dev/null
+++ b/doc/src/examples/customwidgetplugin.qdoc
@@ -0,0 +1,252 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example designer/customwidgetplugin
+    \title Custom Widget Plugin Example
+
+    The Custom Widget example shows how to create a custom widget plugin for \QD.
+
+    \image customwidgetplugin-example.png
+
+    In this example, the custom widget used is based on the
+    \l{widgets/analogclock}{Analog Clock example}, and does not provide any custom
+    signals or slots.
+
+    \section1 Preparation
+
+    To provide a custom widget that can be used with \QD, we need to supply a
+    self-contained implementation and provide a plugin interface. In this
+    example, we reuse the \l{widgets/analogclock}{Analog Clock example} for
+    convenience.
+
+    Since custom widgets plugins rely on components supplied with \QD, the
+    project file that we use needs to contain information about \QD's
+    library components:
+
+    \snippet examples/designer/customwidgetplugin/customwidgetplugin.pro 2
+    \snippet examples/designer/customwidgetplugin/customwidgetplugin.pro 0
+
+    The \c TEMPLATE variable's value makes \c qmake create the custom
+    widget as a library. Later, we will ensure that the widget will be
+    recognized as a plugin by Qt by using the Q_EXPORT_PLUGIN2() macro
+    to export the relevant widget information.
+
+    The \c CONFIG variable contains two values, \c designer and \c
+    plugin:
+
+    \list
+
+    \o \c designer: Since custom widgets plugins rely on components
+    supplied with \QD, this value ensures that our plugin links
+    against \QD's library (\c libQtDesigner.so).
+
+    \o \c plugin: We also need to ensure that \c qmake considers the
+    custom widget a plugin library.
+
+    \endlist
+
+    When Qt is configured to build in both debug and release modes,
+    \QD will be built in release mode. When this occurs, it is
+    necessary to ensure that plugins are also built in release
+    mode. For that reason we add the \c debug_and_release value to the
+    \c CONFIG variable. Otherwise, if a plugin is built in a mode that
+    is incompatible with \QD, it won't be loaded and
+    installed.
+
+    The header and source files for the widget are declared in the usual way,
+    and we provide an implementation of the plugin interface so that \QD can
+    use the custom widget:
+
+    \snippet examples/designer/customwidgetplugin/customwidgetplugin.pro 3
+
+    It is also important to ensure that the plugin is installed in a
+    location that is searched by \QD. We do this by specifying a
+    target path for the project and adding it to the list of items to
+    install:
+
+    \snippet doc/src/snippets/code/doc_src_examples_customwidgetplugin.qdoc 0
+
+    The custom widget is created as a library, and will be installed
+    alongside the other \QD plugins when the project is installed
+    (using \c{make install} or an equivalent installation procedure).
+    Later, we will ensure that it is recognized as a plugin by \QD by
+    using the Q_EXPORT_PLUGIN2() macro to export the relevant widget
+    information.
+
+    Note that if you want the plugins to appear in a Visual Studio
+    integration, the plugins must be built in release mode and their
+    libraries must be copied into the plugin directory in the install
+    path of the integration (for an example, see \c {C:/program
+    files/trolltech as/visual studio integration/plugins}).
+
+    For more information about plugins, see the \l {How to
+    Create Qt Plugins} documentation.
+
+    \section1 AnalogClock Class Definition and Implementation
+
+    The \c AnalogClock class is defined and implemented in exactly the same
+    way as described in the \l{widgets/analogclock}{Analog Clock example}.
+    Since the class is self-contained, and does not require any external
+    configuration, it can be used without modification as a custom widget in
+    \QD.
+
+    \section1 AnalogClockPlugin Class Definition
+
+    The \c AnalogClock class is exposed to \QD through the \c
+    AnalogClockPlugin class. This class inherits from both QObject and
+    the QDesignerCustomWidgetInterface class, and implements an
+    interface defined by QDesignerCustomWidgetInterface:
+
+    \snippet examples/designer/customwidgetplugin/customwidgetplugin.h 0
+
+    The functions provide information about the widget that \QD can use in
+    the \l{Getting to Know Qt Designer#WidgetBox}{widget box}.
+    The \c initialized private member variable is used to record whether
+    the plugin has been initialized by \QD.
+
+    Note that the only part of the class definition that is specific to
+    this particular custom widget is the class name.
+
+    \section1 AnalogClockPlugin Implementation
+
+    The class constructor simply calls the QObject base class constructor
+    and sets the \c initialized variable to \c false.
+
+    \snippet examples/designer/customwidgetplugin/customwidgetplugin.cpp 0
+
+    \QD will initialize the plugin when it is required by calling the
+    \c initialize() function:
+
+    \snippet examples/designer/customwidgetplugin/customwidgetplugin.cpp 1
+
+    In this example, the \c initialized private variable is tested, and only
+    set to \c true if the plugin is not already initialized. Although, this
+    plugin does not require any special code to be executed when it is
+    initialized, we could include such code after the test for initialization.
+
+    The \c isInitialized() function lets \QD know whether the plugin is
+    ready for use:
+
+    \snippet examples/designer/customwidgetplugin/customwidgetplugin.cpp 2
+
+    Instances of the custom widget are supplied by the \c createWidget()
+    function. The implementation for the analog clock is straightforward:
+
+    \snippet examples/designer/customwidgetplugin/customwidgetplugin.cpp 3
+
+    In this case, the custom widget only requires a \c parent to be specified.
+    If other arguments need to be supplied to the widget, they can be
+    introduced here.
+
+    The following functions provide information for \QD to use to represent
+    the widget in the widget box.
+    The \c name() function returns the name of class that provides the
+    custom widget:
+
+    \snippet examples/designer/customwidgetplugin/customwidgetplugin.cpp 4
+
+    The \c group() function is used to describe the type of widget that the
+    custom widget belongs to:
+
+    \snippet examples/designer/customwidgetplugin/customwidgetplugin.cpp 5
+
+    The widget plugin will be placed in a section identified by its
+    group name in \QD's widget box. The icon used to represent the
+    widget in the widget box is returned by the \c icon() function:
+
+    \snippet examples/designer/customwidgetplugin/customwidgetplugin.cpp 6
+
+    In this case, we return a null icon to indicate that we have no icon
+    that can be used to represent the widget.
+
+    A tool tip and "What's This?" help can be supplied for the custom widget's
+    entry in the widget box. The \c toolTip() function should return a short
+    message describing the widget:
+
+    \snippet examples/designer/customwidgetplugin/customwidgetplugin.cpp 7
+
+    The \c whatsThis() function can return a longer description:
+
+    \snippet examples/designer/customwidgetplugin/customwidgetplugin.cpp 8
+
+    The \c isContainer() function tells \QD whether the widget is supposed to
+    be used as a container for other widgets. If not, \QD will not allow the
+    user to place widgets inside it.
+
+    \snippet examples/designer/customwidgetplugin/customwidgetplugin.cpp 9
+
+    Most widgets in Qt can contain child widgets, but it only makes sense
+    to use dedicated container widgets for this purpose in \QD. By returning
+    \c false, we indicate that the custom widget cannot hold other widgets;
+    if we returned true, \QD would allow other widgets to be placed inside
+    the analog clock and a layout to be defined.
+
+    The \c domXml() function provides a way to include default settings for
+    the widget in the standard XML format used by \QD. In this case, we only
+    specify the widget's geometry:
+
+    \snippet examples/designer/customwidgetplugin/customwidgetplugin.cpp 10
+
+    If the widget provides a reasonable size hint, it is not necessary to
+    define it here. In addition, returning an empty string instead of a
+    \c{<widget>} element will tell \QD not to install the widget in the
+    widget box.
+
+    To make the analog clock widget usable by applications, we implement
+    the \c includeFile() function to return the name of the header file
+    containing the custom widget class definition:
+
+    \snippet examples/designer/customwidgetplugin/customwidgetplugin.cpp 12
+
+    Finally, we use the Q_EXPORT_PLUGIN2() macro to export the \c
+    AnalogClockPlugin class for use with \QD:
+
+    \snippet examples/designer/customwidgetplugin/customwidgetplugin.cpp 13
+
+    This macro ensures that \QD can access and construct the custom widget.
+    Without this macro, there is no way for \QD to use the widget.
+
+    It is important to note that you can only use the Q_EXPORT_PLUGIN2()
+    macro once in any implementation. If you have several custom widgets in
+    an implementation that you wish to make available to \QD, you will need
+    to implement \l{QDesignerCustomWidgetCollectionInterface}.
+*/
diff --git a/doc/src/examples/dbscreen.qdoc b/doc/src/examples/dbscreen.qdoc
new file mode 100644
index 0000000000..88f6d51329
--- /dev/null
+++ b/doc/src/examples/dbscreen.qdoc
@@ -0,0 +1,200 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example qws/dbscreen
+    \title Double Buffered Graphics Driver Example
+
+    The Double Buffered Graphics Driver example shows how to write your own
+    double buffered graphics driver and add it to Qt for Embedded Linux.
+
+    Similar to the \l{Accelerated Graphics Driver Example}, there are three steps
+    to writing and implementing this graphics driver:
+
+    \list 1
+        \o \l {Step 1: Creating a Custom Graphics Driver}
+        {Creating a Custom Graphics Driver}
+
+        \o \l {Step 2: Implementing the Back Buffer}
+        {Implementing the Back Buffer}
+
+        \o \l {Step 3: Creating the Driver Plugin}
+        {Creating the Driver Plugin}
+
+    \endlist
+
+    After compiling the example code, install the graphics driver plugin with
+    the command \c {make install}. To start an application using the graphics
+    driver, you can either set the environment variable \l QWS_DISPLAY and
+    then run the application, or you can just run the application using the
+    \c -display switch.
+
+    Note that this is a minimal example and this driver will not work well
+    with widgets painting themself directly to the screen (e.g. widgets with
+    the Qt::WA_PaintOnScreen window attribute set). Also, the example requires
+    the Linux framebuffer to be set up correctly and with the correct device
+    permissions. For further information, refer to
+    \l{Testing the Linux Framebuffer}.
+
+    \section1 Step 1: Creating a Custom Graphics Driver
+
+    Usually, a custom graphics driver is created by subclassing the QScreen
+    class, the base class for implementing screen or graphics drivers in
+    Qt for Embedded Linux. In this example, however, we subclass the QLinuxFbScreen
+    class instead, to ensure that our driver uses the Linux framebuffer.
+
+    For our graphics driver, the \c DBScreen class, we reimplement five
+    functions belonging to QScreen:
+
+    \list
+        \o \l{QScreen::initDevice()}{initDevice()},
+        \o \l{QScreen::shutdownDevice()}{shutdownDevice()},
+        \o \l{QScreen::blit()}{blit()},
+        \o \l{QScreen::solidFill()}{solidFill()}, and
+        \o \l{QScreen::exposeRegion()}{exposeRegion()}.
+    \endlist
+
+    \snippet examples/qws/dbscreen/dbscreen.h 0
+
+    In addition to the abovementioned functions, there is a private instance
+    of QPainter and QImage - \c painter, used for drawing operations on
+    the back buffer, and \c image, the back buffer itself.
+
+    \section1 Step 2: Implementing the Back Buffer
+
+    The graphics driver must carry out three main functions:
+
+    \list 1
+        \o Allocate the back buffer on startup and deallocate it on shutdown.
+        \o Draw to the back buffer instead of directly to the screen
+           (which is what QLinuxFbScreen does).
+        \o Copy the back buffer to the screen whenever a screen update is
+           done.
+    \endlist
+
+    \section2 Device initializing and shutdown 
+
+    We first reimplement \c initDevice() and \c shutdownDevice().
+
+    The \c initDevice() function initializes the framebuffer. We reimplement
+    this function to enable accelerated drivers to set up the graphic card.
+    For this example, we first call the super class' implementation to set up
+    the Linux framebuffer. If this call returns \c false, we return \c false.
+    Otherwise, we initialize the screen cursor with
+    QScreenCursor::initSoftwareCursor() as well as instantiate \c image and
+    \c painter. Then, we return \c true.
+
+    \snippet examples/qws/dbscreen/dbscreen.cpp 0
+
+    The \c shutdownDevice() function's default implementation only hides the
+    mouse cursor. Hence, we reimplement it to carry out the necessary cleanup
+    before the Qt for Embedded Linux server exits.
+
+    \snippet examples/qws/dbscreen/dbscreen.cpp 1
+
+    Again, we call the super class implementation to shutdown the Linux
+    framebuffer prior to deleting \c image and \c painter.
+
+    \section2 Drawing to the back buffer
+
+    We move on to the drawing functions - \c solidFill() and \c blit(). In
+    QLinuxFbScreen, these functions draw directly to the Linux framebuffer;
+    but in our driver we reimplement them to draw to the back buffer instead.
+
+    \snippet examples/qws/dbscreen/dbscreen.cpp 2
+
+    The \c solidFill() function is called from \c exposeRegion() to fill the
+    given \c region of the screen with the specified \c color. In this
+    example, we use \c painter to fill rectangles in \c image, the back
+    buffer, according to the given region.
+
+    \snippet examples/qws/dbscreen/dbscreen.cpp 3
+
+    The \c blit() function is also called from \c exposeRegion() to copy the
+    given QRegion object, \c region, in the given QImage object, \c image, to
+    the QPoint object specified by \c topLeft. Once again we use \c painter
+    to draw in the back buffer, \c image.
+
+    \section2 Displaying the buffer on the screen
+
+    The \c exposeRegion() function is called by the Qt for Embedded Linux server
+    whenever a screen update is required. The given \c region is the screen
+    region that needs to be updated and \c changing is is the index into
+    QWSServer::clientWindows() of the window that caused the update.
+
+    \snippet examples/qws/dbscreen/dbscreen.cpp 4
+
+    In our implementation, we first call the super class implementation to
+    ensure that \c solidFill() and \c blit() will be called correctly. This
+    causes the changed areas to be updated in the back buffer. We then call
+    the super class' implementation of \c blit() to copy the updated region
+    from the back buffer into the Linux framebuffer.
+
+    \section1 Step 3: Creating the Driver Plugin
+
+    Qt provides a high level API for writing Qt extentions. One of the plugin
+    base classes provided is QScreenDriverPlugin, which we use in this example
+    to create our screen driver plugin.
+
+    \snippet examples/qws/dbscreen/dbscreendriverplugin.cpp 0
+
+    There are only two functions to reimplement:
+
+    \list
+        \o \l{QScreenDriverPlugin::create()}{create()} - creates a driver
+           matching the given key
+        \o \l{QScreenDriverPlugin::create()}{keys()} - returns a list of
+           valid keys representing the drivers supported by the plugin
+    \endlist
+
+    \snippet examples/qws/dbscreen/dbscreendriverplugin.cpp 1
+    \codeline
+    \snippet examples/qws/dbscreen/dbscreendriverplugin.cpp 2
+
+    Our plugin will only support one driver, \c dbscreen.
+
+    Lastly, we export the plugin.
+
+    \snippet examples/qws/dbscreen/dbscreendriverplugin.cpp 3
+
+    For detailed information about the Qt plugin system see
+    \l{How to Create Qt Plugins.}
+*/
diff --git a/doc/src/examples/dbus-chat.qdoc b/doc/src/examples/dbus-chat.qdoc
new file mode 100644
index 0000000000..f062c236dd
--- /dev/null
+++ b/doc/src/examples/dbus-chat.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example dbus/dbus-chat
+    \title D-Bus Chat Example
+
+    The D-Bus Chat example shows how to use D-Bus to communicate between two
+    applications.
+
+    \image dbus-chat-example.png
+*/
diff --git a/doc/src/examples/dbus-listnames.qdoc b/doc/src/examples/dbus-listnames.qdoc
new file mode 100644
index 0000000000..5b13abe77a
--- /dev/null
+++ b/doc/src/examples/dbus-listnames.qdoc
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example dbus/listnames
+    \title D-Bus List Names Example
+
+    The D-Bus List Names examples shows how to query D-Bus for a list of service names.
+*/
diff --git a/doc/src/examples/dbus-pingpong.qdoc b/doc/src/examples/dbus-pingpong.qdoc
new file mode 100644
index 0000000000..6b15978842
--- /dev/null
+++ b/doc/src/examples/dbus-pingpong.qdoc
@@ -0,0 +1,9 @@
+/*!
+    \example dbus/pingpong
+    \title D-Bus Ping Pong Example
+
+    The D-Bus Ping Pong example provides a basic demonstration of D-Bus
+    interfaces.
+
+    \quotefile doc/src/snippets/dbus-pingpong-example.qdoc
+*/
diff --git a/doc/src/examples/dbus-remotecontrolledcar.qdoc b/doc/src/examples/dbus-remotecontrolledcar.qdoc
new file mode 100644
index 0000000000..ef31bd2592
--- /dev/null
+++ b/doc/src/examples/dbus-remotecontrolledcar.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example dbus/remotecontrolledcar
+    \title D-Bus Remote Controlled Car Example
+
+    The Remote Controlled Car example shows how to use D-Bus to control one
+    application using another.
+
+    \image remotecontrolledcar-car-example.png
+*/
diff --git a/doc/src/examples/defaultprototypes.qdoc b/doc/src/examples/defaultprototypes.qdoc
new file mode 100644
index 0000000000..dc65902dc3
--- /dev/null
+++ b/doc/src/examples/defaultprototypes.qdoc
@@ -0,0 +1,138 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example script/defaultprototypes
+    \title Default Prototypes Example
+
+    This Qt Script example shows how to use default prototypes
+    to make a non-QObject-based type scriptable.
+
+    \image defaultprototypes-example.png
+
+    With QScriptEngine::setDefaultPrototype() you can specify
+    a QtScript object that defines a scripting interface for
+    a C++ type; Qt Script operations on values of such types
+    will then be delegated to your prototype object. In this
+    example, a simple scripting interface for QListWidgetItem is
+    defined, so that the text of items can easily be accessed from
+    script code.
+
+    To define a scripting API for QListWidgetItem in terms of
+    Qt properties and slots, we subclass QObject and QScriptable.
+
+    \snippet examples/script/defaultprototypes/prototypes.h 0
+
+    A single property, \c{text}, is defined, along with a slot,
+    \c{toString}.
+
+    \snippet examples/script/defaultprototypes/prototypes.cpp 0
+
+    The implementation of the property accessors use
+    the qscriptvalue_cast() function to cast the script object
+    to a QListWidgetItem pointer. The normal C++ QListWidgetItem
+    API is then used to implement the desired functionality.
+
+    Although not shown here, it is possible to throw a script
+    exception from a prototype function; for example, you could throw
+    a TypeError exception if the qscriptvalue_cast() fails.
+
+    QListWidgetItems are usually added to a QListWidget. While
+    QListWidget is a QObject-based class, not all the functionality
+    needed for this example are present. We can solve this by creating
+    a default prototype for the QListWidget class as well. The
+    prototype will augment the functionality already provided by the
+    Qt Script QObject integration; i.e. if a property or slot is not
+    found in the QListWidget object itself, the prototype will be used
+    as a fallback.
+
+    \snippet examples/script/defaultprototypes/prototypes.h 1
+
+    The additional slots will make it possible to add items to
+    a QListWidget from script code, and to set the background
+    color of the widget from a string.
+
+    \snippet examples/script/defaultprototypes/prototypes.cpp 1
+
+    Again, we use qscriptvalue_cast() to cast the script object
+    to the relevant C++ type, in this case a QListWidget pointer.
+    The addItem() and addItems() functions simply forward their
+    arguments to the corresponding functions in the QListWidget
+    class. setBackgroundColor() gets the widget's palette, creates
+    a QColor from the given string argument and changes the palette
+    accordingly.
+
+    \snippet examples/script/defaultprototypes/main.cpp 0
+
+    The relevant C++ types must be made known to Qt's meta type
+    system.
+
+    \snippet examples/script/defaultprototypes/main.cpp 1
+
+    For each type that we want to associate a prototype object with,
+    we create an instance of the prototype class, pass it to
+    QScriptEngine::newQObject(), and then create the link between
+    the C++ type and the resulting script object by calling
+    QScriptEngine::setDefaultPrototype().
+
+    \snippet examples/script/defaultprototypes/main.cpp 2
+
+    In this example, a single QListWidget object is added as
+    a global script variable, called \c{listWidget}. Script code
+    can add items to this widget by calling addItem() or addItems().
+
+    \snippet examples/script/defaultprototypes/code.js 0
+
+    Script code can connect to signals of the QListWidget object;
+    signal handlers can use the interface defined in
+    the QListWidgetItem prototype to manipulate item arguments.
+
+    \snippet examples/script/defaultprototypes/code.js 1
+
+    Not shown in this example is how to make QListWidgetItem
+    constructible from Qt Script code, i.e. to be able to
+    write "new QListWidgetItem()" in a script. In order to do
+    this, you have to define your own script constructor for
+    the type. The constructor would just be a factory function
+    that constructs a new C++ QListWidgetItem and returns it
+    back to the script. See QScriptEngine::newFunction() for more
+    information.
+*/
diff --git a/doc/src/examples/delayedencoding.qdoc b/doc/src/examples/delayedencoding.qdoc
new file mode 100644
index 0000000000..cd1c4aeae6
--- /dev/null
+++ b/doc/src/examples/delayedencoding.qdoc
@@ -0,0 +1,125 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example draganddrop/delayedencoding
+    \title Delayed Encoding Example
+
+    The Delayed Encoding example shows how to delay preparing of data
+    for drag and drop operations until a drop target is found.
+
+    \image delayedecoding-example.png
+
+    The \gui Export push button is pressed down to start the drag.
+    The data for the drag and drop operation is not processed until
+    the user of the application has found a valid drop target. This
+    removes redundant processing if the operation is aborted. In our
+    case, we have an SVG image that we wish to send as the \c {
+    "image/png" } MIME type. It is the conversion from SVG to PNG we
+    wish to delay - it can be quite expensive.
+
+    The example is implemented in two classes: \c SourceWidget and \c
+    MimeData. The \c SourceWidget class sets up the GUI and starts the
+    drag operation on request. The \c MimeData class, which inherits
+    QMimeData, sends a signal when a drop target is found. This signal
+    is connected to a slot in \c SourceWidget, which does the
+    conversion from SVG to PNG. 
+
+    \section1 SourceWidget Class Definition
+
+    The \c SourceWidget class starts drag and drop operations and also
+    does the image conversion.
+    
+    \snippet examples/draganddrop/delayedencoding/sourcewidget.h 0
+    
+    The \gui Export push button is connected to the \c startDrag()
+    slot. The \c createData() slot will be invoked when data for the
+    drag and drop operation is to be created.
+
+    \section1 SourceWidget Class Implementation
+
+    Let's start our code tour with a look at the \c startDrag() slot.
+
+    \snippet examples/draganddrop/delayedencoding/sourcewidget.cpp 0
+
+    We emit \c dataRequested() from \c MimeData when the operation has
+    found a valid drop target.
+
+    We gallop along to \c createData():
+
+    \snippet examples/draganddrop/delayedencoding/sourcewidget.cpp 1
+
+    Fortunately, Qt provides QSvgRenderer, which can render the SVG
+    image to any QPaintDevice. Also, QImage has no problems saving to
+    the PNG format.
+
+    Finally, we can give the data to \c MimeData.
+
+    \section1 MimeData Class Definition
+
+    The \c MimeData class inherits QMimeData and makes it possible to
+    delay preparing of the data for a drag and drop operation.
+
+    \snippet examples/draganddrop/delayedencoding/mimedata.h 0
+
+    We will look closer at \c retrieveData() and \c formats() in the
+    next section.
+
+    \section1 MimeData Class Implementation
+
+    \snippet examples/draganddrop/delayedencoding/mimedata.cpp 0
+
+    In the \c formats() function, we return the format of the
+    data we provide. This is the \c { image/png } MIME type.
+
+    \snippet examples/draganddrop/delayedencoding/mimedata.cpp 1
+
+    \c retrieveData() is reimplemented from QMimeData and is
+    called when the data is requested by the drag and drop
+    operation. Fortunately for us, this happens when the operation
+    is finishing, i.e., when a drop target has been found.
+
+    We emit the \c dataRequested() signal, which is picked up by
+    \c SourceWidget. The \c SourceWidget (as already explained)
+    sets the data on \c MimeData with \l{QMimeData::}{setData()}.
+
+*/
+
diff --git a/doc/src/examples/diagramscene.qdoc b/doc/src/examples/diagramscene.qdoc
new file mode 100644
index 0000000000..ebf93e2ecb
--- /dev/null
+++ b/doc/src/examples/diagramscene.qdoc
@@ -0,0 +1,846 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example graphicsview/diagramscene
+    \title Diagram Scene Example
+    
+    This example shows use of Qt's graphics framework. 
+
+    \image diagramscene.png
+
+    The Diagram Scene example is an application in which you can
+    create a flowchart diagram. It is possible to add flowchart shapes
+    and text and connect the shapes by arrows as shown in the image
+    above.  The shapes, arrows, and text can be given different
+    colors, and it is possible to change the font, style, and
+    underline of the text.
+
+    The Qt graphics view framework is designed to manage and
+    display custom 2D graphics items. The main classes of the
+    framework are QGraphicsItem, QGraphicsScene and QGraphicsView. The
+    graphics scene manages the items and provides a surface for them.
+    QGraphicsView is a widget that is used to render a scene on the
+    screen. See the \l{The Graphics View Framework}{overview document}
+    for a more detailed description of the framework. 
+
+    In this example we show how to create such custom graphics
+    scenes and items by implementing classes that inherit
+    QGraphicsScene and QGraphicsItem. 
+
+    In particular we show how to:
+
+    \list
+	\o Create custom graphics items.
+	\o Handle mouse events and movement of items.
+	\o Implement a graphics scene that can manage our custom items.
+	\o Custom painting of items.
+	\o Create a movable and editable text item.
+    \endlist
+
+    The example consists of the following classes:
+    \list
+	\o \c MainWindow creates the widgets and display
+	   them in a QMainWindow. It also manages the interaction 
+	   between the widgets and the graphics scene, view and 
+	   items.
+	\o \c DiagramItem inherits QGraphicsPolygonItem and
+	   represents a flowchart shape. 
+	\o \c TextDiagramItem inherits QGraphicsTextItem and
+	   represents text items in the diagram. The class adds
+	   support for moving the item with the mouse, which is not
+	   supported by QGraphicsTextItem.
+	\o \c Arrow inherits QGraphicsLineItem and is an arrow
+	   that connect two DiagramItems. 
+	\o \c DiagramScene inherits QGraphicsDiagramScene and
+	   provides support for \c DiagramItem, \c Arrow and 
+	   \c DiagramTextItem (In addition to the support already
+	   handled by QGraphicsScene).
+    \endlist
+
+    \section1 MainWindow Class Definition
+
+    \snippet examples/graphicsview/diagramscene/mainwindow.h 0
+
+    The \c MainWindow class creates and lays out the widgets in a
+    QMainWindow. The class forwards input from the widgets to the
+    DiagramScene. It also updates its widgets when the diagram 
+    scene's text item changes, or a diagram item or a diagram text item
+    is inserted into the scene.
+
+    The class also deletes items from the scene and handles the
+    z-ordering, which decides the order in which items are drawn when
+    they overlap each other.
+
+    \section1 MainWindow Class Implementation
+
+
+    We start with a look at the constructor:
+
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 0
+
+    In the constructor we call methods to create the widgets and
+    layouts of the example before we create the diagram scene. 
+    The toolbars must be created after the scene as they connect 
+    to its signals. We then lay the widgets out in the window.
+
+    We connect to the \c itemInserted() and \c textInserted() slots of
+    the diagram scenes as we want to uncheck the buttons in the tool
+    box when an item is inserted. When an item is selected in
+    the scene we receive the \c itemSelected() signal. We use this to
+    update the widgets that display font properties if the item
+    selected is a \c DiagramTextItem.
+
+    The \c createToolBox() function creates and lays out the widgets 
+    of the \c toolBox QToolBox. We will not examine it with a
+    high level of detail as it does not deal with graphics framework 
+    specific functionality. Here is its implementation:
+
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 21
+    
+    This part of the function sets up the tabbed widget item that
+    contains the flowchart shapes. An exclusive QButtonGroup always 
+    keeps one button checked; we want the group to allow all buttons
+    to be unchecked.
+    We still use a button group since we can associate user
+    data, which we use to store the diagram type, with each button. 
+    The \c createCellWidget() function sets up the buttons in the 
+    tabbed widget item and is examined later.
+
+    The buttons of the background tabbed widget item is set up in the
+    same way, so we skip to the creation of the tool box:
+
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 22
+
+    We set the preferred size of the toolbox as its maximum. This
+    way, more space is given to the graphics view. 
+
+    Here is the \c createActions() function:
+
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 23
+
+    We show an example of the creation of an action. The
+    functionality the actions trigger is discussed in the slots we
+    connect the actions to. You can see the \l{Application
+    Example}{application example} if you need a high-level
+    introduction to actions.
+
+    The is the \c createMenus() function:
+
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 24
+
+    We create the three menus' of the example.
+
+    The \c createToolbars() function sets up the examples tool
+    bars.  The three \l{QToolButton}s in the \c colorToolBar, the \c
+    fontColorToolButton, \c fillColorToolButton, and \c
+    lineColorToolButton, are interesting as we create icons for them
+    by drawing on a QPixmap with a QPainter. We show how the \c
+    fillColorToolButton is created. This button lets the user select a
+    color for the diagram items.
+
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 25
+    \dots
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 26
+
+    We set the menu of the tool button with
+    \l{QToolButton::}{setMenu()}. We need the \c fillAction QAction
+    object to always be pointing to the selected action of the menu.
+    The menu is created with the \c createColorMenu() function and, as
+    we shall see later, contains one menu item for each color that the
+    items can have.  When the user presses the button, which trigger
+    the \l{QToolButton::}{clicked()} signal, we can set the color of
+    the selected item to the color of \c fillAction. It is with \c
+    createColorToolButtonIcon() we create the icon for the button.
+
+    \dots
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 27
+
+    Here is the \c createBackgroundCellWidget() function:
+
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 28
+
+    This function creates \l{QWidget}s containing a tool button
+    and a label. The widgets created with this function are used for
+    the background tabbed widget item in the tool box.
+
+    Here is the \c createCellWidget() function:
+
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 29
+
+    This function returns a QWidget containing a QToolButton with
+    an image of one of the \c DiagramItems, i.e., flowchart shapes.
+    The image is created by the \c DiagramItem through the \c image()
+    function.  The QButtonGroup class lets us attach a QVariant with
+    each button; we store the diagram's type, i.e., the
+    DiagramItem::DiagramType enum. We use the stored diagram type when
+    we create new diagram items for the scene.  The widgets created
+    with this function is used in the tool box.
+
+    Here is the \c createColorMenu() function:
+    
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 30
+
+    This function creates a color menu that is used as the
+    drop-down menu for the tool buttons in the \c colorToolBar. We
+    create an action for each color that we add to the menu. We fetch
+    the actions data when we set the color of items, lines, and text.
+
+    Here is the \c createColorToolButtonIcon() function:
+
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 31
+
+    This function is used to create the QIcon of the \c
+    fillColorToolButton, \c fontColorToolButton, and \c
+    lineColorToolButton. The \a imageFile string is either the text,
+    flood-fill, or line symbol that is used for the buttons. Beneath
+    the image we draw a filled rectangle using \a color.
+
+    Here is the \c createColorIcon() function:
+
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 32
+
+    This function creates an icon with a filled rectangle in the 
+    color of \a color. It is used for creating icons for the color
+    menus in the \c fillColorToolButton, \c fontColorToolButton, and
+    \c lineColorToolButton.
+
+    Here is the \c backgroundButtonGroupClicked() slot:
+
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 1
+
+    In this function we set the QBrush that is used to draw the
+    background of the diagramscene. The background can be a grid of
+    squares of blue, gray, or white tiles, or no grid at all. We have
+    \l{QPixmap}s of the tiles from png files that we create the brush
+    with.
+
+    When one of the buttons in the background tabbed widget item is
+    clicked we change the brush; we find out which button it is by 
+    checking its text. 
+
+    Here is the implementation of \c buttonGroupClicked():
+
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 2
+
+    This slot is called when a button in \c buttonGroup is checked.
+    When a button is checked the user can click on the graphics view
+    and a \c DiagramItem of the selected type will be inserted into
+    the \c DiagramScene. We must loop through the buttons in the group
+    to uncheck other buttons as only one button is allowed to be
+    checked at a time.
+
+    \c QButtonGroup assigns an id to each button. We have set the id
+    of each button to the diagram type, as given by DiagramItem::DiagramType 
+    that will be inserted into the scene when it is clicked. We can 
+    then use the button id when we set the diagram type with 
+    \c setItemType(). In the case of text we assigned an id that has a
+    value that is not in the DiagramType enum.
+    
+    Here is the implementation of \c deleteItem():
+    
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 3
+    
+    This slot deletes the selected item, if any, from the scene. If
+    the item to be deleted is a \c DiagramItem, we also need to delete
+    arrows connected to it; we don't want arrows in the scene that
+    aren't connected to items in both ends.
+    
+    This is the implementation of pointerGroupClicked():
+    
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 4
+    
+    The \c pointerTypeGroup decides whether the scene is in ItemMove
+    or InsertLine mode. This button group is exclusive, i.e., only 
+    one button is checked at any time. As with the \c buttonGroup above
+    we have assigned an id to the buttons that matches values of the
+    DiagramScene::Mode enum, so that we can use the id to set the
+    correct mode.
+    
+    Here is the \c bringToFront() slot:
+    
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 5
+    
+    Several items may collide, i.e., overlap, with each other in
+    the scene.  This slot is called when the user requests that an
+    item should be placed on top of the items it collides with.
+    \l{QGraphicsItem}{QGrapicsItems} have a z-value that decides the
+    order in which items are stacked in the scene; you can think of it
+    as the z-axis in a 3D coordinate system.  When items collide the
+    items with higher z-values will be drawn on top of items with
+    lower values. When we bring an item to the front we can loop
+    through the items it collides with and set a z-value that is
+    higher than all of them.
+    
+    Here is the \c sendToBack() slot:
+    
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 6
+    
+    This slot works in the same way as \c bringToFront() described
+    above, but sets a z-value that is lower than items the item that
+    should be send to the back collides with.
+    
+    This is the implementation of \c itemInserted():
+    
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 7
+    
+    This slot is called from the \c DiagramScene when an item has been
+    added to the scene. We set the mode of the scene back to the mode
+    before the item was inserted, which is ItemMove or InsertText
+    depending on which button is checked in the \c pointerTypeGroup. 
+    We must also uncheck the button in the in the \c buttonGroup.
+    
+    Here is the implementation of \c textInserted():
+    
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 8
+    
+    We simply set the mode of the scene back to the mode it had before
+    the text was inserted.
+    
+    Here is the \c currentFontChanged() slot:
+    
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 9
+    
+    When the user requests a font change, by using one of the
+    widgets in the \c fontToolBar, we create a new QFont object and
+    set its properties to match the state of the widgets. This is done
+    in \c handleFontChange(), so we simply call that slot.
+    
+    Here is the \c fontSizeChanged() slot:
+    
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 10
+    
+    When the user requests a font change, by using one of the
+    widgets in the \c fontToolBar, we create a new QFont object and
+    set its properties to match the state of the widgets. This is done
+    in \c handleFontChange(), so we simply call that slot.
+    
+    Here is the implementation of \c sceneScaleChanged():
+    
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 11
+    
+    The user can increase or decrease the scale, with the \c
+    sceneScaleCombo, the scene is drawn in.
+    It is not the scene itself that changes its scale, but only the
+    view.  
+    
+    Here is the \c textColorChanged() slot:
+    
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 12
+    
+    This slot is called when an item in the drop-down menu of the \c
+    fontColorToolButton is pressed. We need to change the icon on 
+    the button to the color of the selected QAction. We keep a pointer
+    to the selected action in \c textAction. It is in \c
+    textButtonTriggered() we change the text color to the color of \c
+    textAction, so we call that slot.
+    
+    Here is the \c itemColorChanged() implementation:
+    
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 13
+    
+    This slot handles requests for changing the color of \c
+    DiagramItems in the same manner as \c textColorChanged() does for
+    \c DiagramTextItems.
+    
+    Here is the implementation of \c lineColorChanged():
+    
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 14
+    
+    This slot handles requests for changing the color of \c Arrows in
+    the same manner that \c textColorChanged() does it for \c
+    DiagramTextItems.
+    
+    Here is the \c textButtonTriggered() slot:
+    
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 15
+    
+    \c textAction points to the  QAction of the currently selected menu item
+    in the \c fontColorToolButton's color drop-down menu. We have set
+    the data of the action to the QColor the action represents, so we
+    can simply fetch this when we set the color of text with \c
+    setTextColor().
+    
+    Here is the \c fillButtonTriggered() slot:
+    
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 16
+    
+    \c fillAction points to the selected menu item in the drop-down
+    menu of \c fillColorToolButton(). We can therefore use the data of
+    this action when we set the item color with \c setItemColor().
+    
+    Here is the \c lineButtonTriggered() slot:
+    
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 17
+    
+    \c lineAction point to the selected item in the drop-down menu of
+    \c lineColorToolButton. We use its data when we set the arrow 
+    color with \c setLineColor().
+    
+    Here is the \c handleFontChange() function:
+    
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 18
+    
+    \c handleFontChange() is called when any of the widgets that show
+    font properties changes. We create a new QFont object and set its
+    properties based on the widgets. We then call the \c setFont()
+    function of \c DiagramScene; it is the scene that set the font of
+    the \c DiagramTextItems it manages.
+    
+    Here is the \c itemSelected() slot:
+    
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 19
+    
+    This slot is called when an item in the \c DiagramScene is
+    selected. In the case of this example it is only text items that
+    emit signals when they are selected, so we do not need to check
+    what kind of graphics \a item is.
+    
+    We set the state of the widgets to match the properties of the
+    font of the selected text item.
+    
+    This is the \c about() slot:
+    
+    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 20
+    
+    This slot displays an about box for the example when the user
+    selects the about menu item from the help menu.
+    
+    \section1 DiagramScene Class Definition
+    
+    The \c DiagramScene class inherits QGraphicsScene and adds
+    functionality to handle \c DiagramItems, \c Arrows, and \c
+    DiagramTextItems in addition to the items handled by its super
+    class.
+    
+    
+    \snippet examples/graphicsview/diagramscene/diagramscene.h 0
+    
+    In the \c DiagramScene a mouse click can give three different
+    actions: the item under the mouse can be moved, an item may be
+    inserted, or an arrow may be connected between to diagram items.
+    Which action a mouse click has depends on the mode, given by the
+    Mode enum, the scene is in. The mode is set with the \c setMode()
+    function.
+    
+    The scene also sets the color of its items and the font of its
+    text items.  The colors and font used by the scene can be set with
+    the \c setLineColor(), \c setTextColor(), \c setItemColor() and \c
+    setFont() functions. The type of \c DiagramItem, given by the
+    DiagramItem::DiagramType function, to be created when an item is
+    inserted is set with the \c setItemType() slot.
+    
+    The \c MainWindow and \c DiagramScene share responsibility for
+    the examples functionality. \c MainWindow handles the following
+    tasks: the deletion of items, text, and arrows; moving diagram
+    items to the back and front; and setting the scale of the scene. 
+
+    \section1 DiagramScene Class Implementation
+
+
+    We start with the constructor:
+
+    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 0
+
+    The scene uses \c myItemMenu to set the context menu when it
+    creates \c DiagramItems. We set the default mode to \c
+    DiagramScene::MoveItem as this gives the default behavior of
+    QGraphicsScene.
+
+    Here is the \c setLineColor() function:
+
+    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 1
+
+    The \c isItemChange function returns true if an \c Arrow item is
+    selected in the scene in which case we want to change its color.
+    When the \c DiagramScene creates and adds new arrows to the scene
+    it will also use the new \a color.
+
+    Here is the \c setTextColor() function:
+
+    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 2
+
+    This function sets the color of \c DiagramTextItems equal to the
+    way \c setLineColor() sets the color of \c Arrows.
+
+    Here is the \c setItemColor() function:
+
+    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 3
+
+    This function sets the color the scene will use when creating 
+    \c DiagramItems. It also changes the color of a selected \c
+    DiagramItem.
+
+    This is the implementation of \c setFont():
+    
+    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 4
+
+    Set the font to use for new and selected, if a text item is
+    selected, \c DiagramTextItems.
+
+    This is the implementation of \c editorLostFocus() slot:
+
+    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 5
+
+    \c DiagramTextItems emit a signal when they loose focus, which is
+    connected to this slot. We remove the item if it has no text.
+    If not, we would leak memory and confuse the user as the items
+    will be edited when pressed on by the mouse.
+    
+    The \c mousePressEvent() function handles mouse press event's
+    different depending on which mode the \c DiagramScene is in. We
+    examine its implementation for each mode:
+    
+    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 6
+
+    We simply create a new \c DiagramItem and add it to the scene at
+    the position the mouse was pressed. Note that the origin of its 
+    local coordinate system will be under the mouse pointer position.
+
+    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 7
+
+    The user adds \c Arrows to the scene by stretching a line between
+    the items the arrow should connect. The start of the line is fixed
+    in the place the user clicked the mouse and the end follows the
+    mouse pointer as long as the button is held down. When the user
+    releases the mouse button an \c Arrow will be added to the scene
+    if there is a \c DiagramItem under the start and end of the line.
+    We will see how this is implemented later; here we simply add the
+    line.
+
+    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 8
+    
+    The \c DiagramTextItem is editable when the
+    Qt::TextEditorInteraction flag is set, else it is movable by the
+    mouse. We always want the text to be drawn on top of the other
+    items in the scene, so we set the value to a number higher
+    than other items in the scene.
+
+    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 9
+
+    We are in MoveItem mode if we get to the default switch; we
+    can then call the QGraphicsScene implementation, which
+    handles movement of items with the mouse. We make this call even
+    if we are in another mode making it possible to add an item and
+    then keep the mouse button pressed down and start moving 
+    the item. In the case of text items, this is not possible as they
+    do not propagate mouse events when they are editable.
+
+    This is the \c mouseMoveEvent() function:
+    
+    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 10
+
+    We must draw the line if we are in InsertMode and the mouse button
+    is pressed down (the line is not 0). As discussed in \c
+    mousePressEvent() the line is drawn from the position the mouse
+    was pressed to the current position of the mouse.
+
+    If we are in MoveItem mode, we call the QGraphicsScene
+    implementation, which handles movement of items.
+
+    In the \c mouseReleaseEvent() function we need to check if an arrow
+    should be added to the scene:
+
+    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 11
+    
+    First we need to get the items (if any) under the line's start
+    and end points. The line itself is the first item at these points,
+    so we remove it from the lists. As a precaution, we check if the
+    lists are empty, but this should never happen.
+
+    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 12
+
+    Now we check if there are two different \c DiagramItems under
+    the lines start and end points. If there are we can create an \c
+    Arrow with the two items. The arrow is then added to each item and
+    finally the scene. The arrow must be updated to adjust its start
+    and end points to the items. We set the z-value of the arrow to
+    -1000.0 because we always want it to be drawn under the items.
+
+    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 13
+
+    Here is the \c isItemChange() function:
+
+    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 14
+
+    The scene has single selection, i.e., only one item can be
+    selected at any given time. The foreach will then loop one time
+    with the selected item or none if no item is selected. \c
+    isItemChange() is used to check whether a selected item exists
+    and also is of the specified diagram \a type.
+
+    \section1 DiagramItem Class Definition
+
+
+    \snippet examples/graphicsview/diagramscene/diagramitem.h 0
+
+    The \c DiagramItem represents a flowchart shape in the \c
+    DiagramScene. It inherits QGraphicsPolygonItem and has a polygon
+    for each shape. The enum DiagramType has a value for each of the
+    flowchart shapes.
+    
+    The class has a list of the arrows that are connected to it.
+    This is necessary because only the item knows when it is being
+    moved (with the \c itemChanged() function) at which time the
+    arrows must be updated. The item can also draw itself onto a
+    QPixmap with the \c image() function. This is used for the tool
+    buttons in \c MainWindow, see \c createColorToolButtonIcon() in
+    \c MainWindow.
+
+    The Type enum is a unique identifier of the class. It is used by 
+    \c qgraphicsitem_cast(), which does dynamic casts of graphics
+    items. The UserType constant is the minimum value a custom
+    graphics item type can be.
+
+    \section1 DiagramItem Class Implementation
+
+
+    We start with a look at the constructor:
+
+    \snippet examples/graphicsview/diagramscene/diagramitem.cpp 0
+
+    In the constructor we create the items polygon according to
+    \a diagramType. \l{QGraphicsItem}s are not movable or selectable
+    by default, so we must set these properties.
+
+    Here is the \c removeArrow() function:
+
+    \snippet examples/graphicsview/diagramscene/diagramitem.cpp 1
+
+    \c removeArrow() is used to remove \c Arrow items when they
+    or \c DiagramItems they are connected to are removed from the
+    scene.
+
+    Here is the \c removeArrows() function:
+
+    \snippet examples/graphicsview/diagramscene/diagramitem.cpp 2
+
+    This function is called when the item is removed from the scene
+    and removes all arrows that are connected to this item. The arrow
+    must be removed from the \c arrows list of both its start and end
+    item.
+
+    Here is the \c addArrow() function:
+    
+    \snippet examples/graphicsview/diagramscene/diagramitem.cpp 3
+
+    This function simply adds the \a arrow to the items \c arrows list.
+
+    Here is the \c image() function:
+
+    \snippet examples/graphicsview/diagramscene/diagramitem.cpp 4
+
+    This function draws the polygon of the item onto a QPixmap. In
+    this example we use this to create icons for the tool buttons in
+    the tool box.
+
+    Here is the \c contextMenuEvent() function:
+
+    \snippet examples/graphicsview/diagramscene/diagramitem.cpp 5
+
+    We show the context menu. As right mouse clicks, which shows the
+    menu, don't select items by default we set the item selected with
+    \l{QGraphicsItem::}{setSelected()}. This is necessary since an
+    item must be selected to change its elevation with the
+    \c bringToFront and \c sendToBack actions.
+
+    This is the implementation of \c itemChange():
+
+    \snippet examples/graphicsview/diagramscene/diagramitem.cpp 6
+
+    If the item has moved, we need to update the positions of the
+    arrows connected to it. The implementation of QGraphicsItem does
+    nothing, so we just return \a value.
+
+    \section1 DiagramTextItem Class Definition
+
+    The \c TextDiagramItem class inherits QGraphicsTextItem and
+    adds the possibility to move editable text items. Editable
+    QGraphicsTextItems are designed to be fixed in place and editing
+    starts when the user single clicks on the item. With \c
+    DiagramTextItem the editing starts with a double click leaving
+    single click available to interact with and move it.
+
+    \snippet examples/graphicsview/diagramscene/diagramtextitem.h 0
+
+    We use \c itemChange() and \c focusOutEvent() to notify the
+    \c DiagramScene when the text item loses focus and gets selected.
+
+    Vi reimplement the functions that handle mouse events to make it
+    possible to alter the mouse behavior of QGraphicsTextItem.
+
+    \section1 DiagramTextItem Implementation
+    
+    We start with the constructor:
+
+    \snippet examples/graphicsview/diagramscene/diagramtextitem.cpp 0
+
+    We simply set the item movable and selectable, as these flags are
+    off by default.
+
+    Here is the \c itemChange() function:
+
+    \snippet examples/graphicsview/diagramscene/diagramtextitem.cpp 1
+
+    When the item is selected we emit the selectedChanged signal. The
+    \c MainWindow uses this signal to update the widgets that display
+    font properties to the font of the selected text item.
+
+    Here is the \c focusOutEvent() function:
+
+    \snippet examples/graphicsview/diagramscene/diagramtextitem.cpp 2
+
+    \c DiagramScene uses the signal emitted when the text item looses
+    remove the item if it is empty, i.e., it contains no text. 
+
+    This is the implementation of \c mouseDoubleClickEvent():
+
+    \snippet examples/graphicsview/diagramscene/diagramtextitem.cpp 5
+
+    When we receive a double click event, we make the item editable by calling
+    QGraphicsTextItem::setTextInteractionFlags(). We then forward the
+    double-click to the item itself.
+
+    \section1 Arrow Class Definition
+
+    The \c Arrow class is a graphics item that connects two \c
+    DiagramItems. It draws an arrow head to one of the items. To
+    achieve this the item needs to paint itself and also re implement
+    methods used by the graphics scene to check for collisions and
+    selections. The class inherits QGraphicsLine item, and draws the
+    arrowhead and moves with the items it connects.
+
+    \snippet examples/graphicsview/diagramscene/arrow.h 0
+
+    The item's color can be set with \c setColor().
+
+    \c boundingRect() and \c shape() are reimplemented 
+    from QGraphicsLineItem and are used by the scene
+    to check for collisions and selections.
+
+    Calling \c updatePosition() causes the arrow to recalculate its
+    position and arrow head angle. \c paint() is reimplemented so that
+    we can paint an arrow rather than just a line between items.
+
+    \c myStartItem and \c myEndItem are the diagram items that the
+    arrow connects. The arrow is drawn with its head to the end item.
+    \c arrowHead is a polygon with three vertices's we use to draw the
+    arrow head.
+
+    \section1 Arrow Class Implementation
+
+    The constructor of the \c Arrow class looks like this:
+
+    \snippet examples/graphicsview/diagramscene/arrow.cpp 0
+
+    We set the start and end diagram items of the arrow. The arrow
+    head will be drawn where the line intersects the end item.
+
+    Here is the \c boundingRect() function:
+
+    \snippet examples/graphicsview/diagramscene/arrow.cpp 1
+
+    We need to reimplement this function because the arrow is
+    larger than the bounding rectangle of the QGraphicsLineItem. The
+    graphics scene uses the bounding rectangle to know which regions
+    of the scene to update. 
+
+    Here is the \c shape() function:
+
+    \snippet examples/graphicsview/diagramscene/arrow.cpp 2
+
+    The shape function returns a QPainterPath that is the exact
+    shape of the item. The QGraphicsLineItem::shape() returns a path
+    with a line drawn with the current pen, so we only need to add
+    the arrow head. This function is used to check for collisions and
+    selections with the mouse. 
+
+    Here is the \c updatePosition() slot:
+
+    \snippet examples/graphicsview/diagramscene/arrow.cpp 3
+
+    This slot updates the arrow by setting the start and end
+    points of its line to the center of the items it connects. 
+
+    Here is the \c paint() function:
+
+    \snippet examples/graphicsview/diagramscene/arrow.cpp 4
+
+    If the start and end items collide we do not draw the arrow; the
+    algorithm we use to find the point the arrow should be drawn at
+    may fail if the items collide.
+
+    We first set the pen and brush we will use for drawing the arrow.
+
+    \snippet examples/graphicsview/diagramscene/arrow.cpp 5
+
+    We then need to find the position at which to draw the
+    arrowhead.  The head should be drawn where the line and the end
+    item intersects. This is done by taking the line between each
+    point in the polygon and check if it intersects with the line of
+    the arrow. Since the line start and end points are set to the
+    center of the items the arrow line should intersect one and only
+    one of the lines of the polygon. Note that the points in the
+    polygon are relative to the local coordinate system of the item.
+    We must therefore add the position of the end item to make the
+    coordinates relative to the scene. 
+
+    \snippet examples/graphicsview/diagramscene/arrow.cpp 6
+
+    We calculate the angle between the x-axis and the line of the
+    arrow. We need to turn the arrow head to this angle so that it
+    follows the direction of the arrow. If the angle is negative we
+    must turn the direction of the arrow.
+
+    We can then calculate the three points of the arrow head polygon.
+    One of the points is the end of the line, which now is the
+    intersection between the arrow line and the end polygon. Then we
+    clear the \c arrowHead polygon from the previous calculated arrow
+    head and set these new points.
+
+    \snippet examples/graphicsview/diagramscene/arrow.cpp 7
+
+    If the line is selected we draw to dotted lines that are
+    parallel with the line of the arrow. We do not use the default
+    implementation, which uses \l{QGraphicsItem::}{boundingRect()}
+    because the QRect bounding rectangle is considerably larger than
+    the line.
+*/
diff --git a/doc/src/examples/digitalclock.qdoc b/doc/src/examples/digitalclock.qdoc
new file mode 100644
index 0000000000..0ff46423e2
--- /dev/null
+++ b/doc/src/examples/digitalclock.qdoc
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example widgets/digitalclock
+    \title Digital Clock Example
+
+    The Digital Clock example shows how to use QLCDNumber to display a 
+    number with LCD-like digits.
+
+    \image digitalclock-example.png Screenshot of the Digital Clock example
+
+    This example also demonstrates how QTimer can be used to update a widget
+    at regular intervals.
+
+    \section1 DigitalClock Class Definition
+
+    The \c DigitalClock class provides a clock widget showing the time with
+    hours and minutes separated by a blinking colon. We subclass QLCDNumber
+    and implement a private slot called \c showTime() to update the clock
+    display:
+
+    \snippet examples/widgets/digitalclock/digitalclock.h 0
+
+    \section1 DigitalClock Class Implementation
+
+    \snippet examples/widgets/digitalclock/digitalclock.cpp 0
+
+    In the constructor, we first change the look of the LCD numbers. The
+    QLCDNumber::Filled style produces raised segments filled with the
+    foreground color (typically black). We also set up a one-second timer
+    to keep track of the current time, and we connect
+    its \l{QTimer::timeout()}{timeout()} signal to the private \c showTime() slot
+    so that the display is updated every second. Then, we
+    call the \c showTime() slot; without this call, there would be a one-second
+    delay at startup before the time is shown.
+
+    \snippet examples/widgets/digitalclock/digitalclock.cpp 1
+    \snippet examples/widgets/digitalclock/digitalclock.cpp 2
+
+    The \c showTime() slot is called whenever the clock display needs
+    to be updated.
+
+    The current time is converted into a string with the format "hh:mm".
+    When QTime::second() is a even number, the colon in the string is
+    replaced with a space. This makes the colon appear and vanish every
+    other second.
+
+    Finally, we call QLCDNumber::display() to update the widget.
+*/
diff --git a/doc/src/examples/dirview.qdoc b/doc/src/examples/dirview.qdoc
new file mode 100644
index 0000000000..2cbfcfee56
--- /dev/null
+++ b/doc/src/examples/dirview.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example itemviews/dirview
+    \title Dir View Example
+
+    The Dir View example shows a tree view onto the local filing system. It uses the
+    QDirModel class to provide supply file and directory information.
+
+    \image dirview-example.png
+*/
diff --git a/doc/src/examples/dockwidgets.qdoc b/doc/src/examples/dockwidgets.qdoc
new file mode 100644
index 0000000000..bc9f5f1a2f
--- /dev/null
+++ b/doc/src/examples/dockwidgets.qdoc
@@ -0,0 +1,177 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example mainwindows/dockwidgets
+    \title Dock Widgets Example
+
+    The Dock Widgets example shows how to add dock windows to an
+    application. It also shows how to use Qt's rich text engine.
+
+    \image dockwidgets-example.png Screenshot of the Dock Widgets example
+
+    The application presents a simple business letter template, and has
+    a list of customer names and addresses and a list of standard
+    phrases in two dock windows. The user can click a customer to have
+    their name and address inserted into the template, and click one or
+    more of the standard phrases. Errors can be corrected by clicking
+    the Undo button. Once the letter has been prepared it can be printed
+    or saved as HTML.
+
+    \section1 MainWindow Class Definition
+
+    Here's the class definition:
+
+    \snippet examples/mainwindows/dockwidgets/mainwindow.h 0
+
+    We will now review each function in turn.
+
+    \section1 MainWindow Class Implementation
+
+    \snippet examples/mainwindows/dockwidgets/mainwindow.cpp 0
+
+    We start by including \c <QtGui>, a header file that contains the
+    definition of all classes in the \l QtCore and \l QtGui
+    libraries. This saves us from having to include
+    every class individually and is especially convenient if we add new
+    widgets. We also include \c mainwindow.h.
+
+    \snippet examples/mainwindows/dockwidgets/mainwindow.cpp 1
+
+    In the constructor, we start by creating a QTextEdit widget. Then we call
+    QMainWindow::setCentralWidget(). This function passes ownership of
+    the QTextEdit to the \c MainWindow and tells the \c MainWindow that
+    the QTextEdit will occupy the \c MainWindow's central area.
+
+    Then we call \c createActions(), \c createMenus(), \c
+    createToolBars(), \c createStatusBar(), and \c createDockWindows()
+    to set up the user interface. Finally we call \c setWindowTitle() to
+    give the application a title, and \c newLetter() to create a new
+    letter template.
+
+    We won't quote the \c createActions(), \c createMenus(), \c
+    createToolBars(), and \c createStatusBar() functions since they
+    follow the same pattern as all the other Qt examples.
+
+    \snippet examples/mainwindows/dockwidgets/mainwindow.cpp 9
+
+    We create the customers dock window first, and in addition to a
+    window title, we also pass it a \c this pointer so that it becomes a
+    child of \c MainWindow. Normally we don't have to pass a parent
+    because widgets are parented automatically when they are laid out:
+    but dock windows aren't laid out using layouts.
+
+    We've chosen to restrict the customers dock window to the left and
+    right dock areas. (So the user cannot drag the dock window to the
+    top or bottom dock areas.) The user can drag the dock window out of
+    the dock areas entirely so that it becomes a free floating window.
+    We can change this (and whether the dock window is moveable or
+    closable) using QDockWidget::setFeatures().
+
+    Once we've created the dock window we create a list widget with the
+    dock window as parent, then we populate the list and make it the
+    dock window's widget. Finally we add the dock widget to the \c
+    MainWindow using \c addDockWidget(), choosing to put it in the right
+    dock area.
+
+    We undertake a similar process for the paragraphs dock window,
+    except that we don't restrict which dock areas it can be dragged to.
+
+    Finally we set up the signal-slot connections. If the user clicks a
+    customer or a paragraph their \c currentTextChanged() signal will be
+    emitted and we connect these to \c insertCustomer() and
+    addParagraph() passing the text that was clicked.
+
+    We briefly discuss the rest of the implementation, but have now
+    covered everything relating to dock windows.
+
+    \snippet examples/mainwindows/dockwidgets/mainwindow.cpp 2
+
+    In this function we clear the QTextEdit so that it is empty. Next we
+    create a QTextCursor on the QTextEdit. We move the cursor to the
+    start of the document and create and format a frame. We then create
+    some character formats and a table format. We insert a table into
+    the document and insert the company's name and address into a table
+    using the table and character formats we created earlier. Then we
+    insert the skeleton of the letter including two markers \c NAME and
+    \c ADDRESS. We will also use the \c{Yours sincerely,} text as a marker.
+
+    \snippet examples/mainwindows/dockwidgets/mainwindow.cpp 6
+
+    If the user clicks a customer we split the customer details into
+    pieces. We then look for the \c NAME marker using the \c find()
+    function. This function selects the text it finds, so when we call
+    \c insertText() with the customer's name the name replaces the marker.
+    We then look for the \c ADDRESS marker and replace it with each line
+    of the customer's address. Notice that we wrapped all the insertions
+    between a \c beginEditBlock() and \c endEditBlock() pair. This means
+    that the entire name and address insertion is treated as a single
+    operation by the QTextEdit, so a single undo will revert all the
+    insertions.
+    
+    \snippet examples/mainwindows/dockwidgets/mainwindow.cpp 7
+
+    This function works in a similar way to \c insertCustomer(). First
+    we look for the marker, in this case, \c {Yours sincerely,}, and then
+    replace it with the standard paragraph that the user clicked. Again
+    we use a \c beginEditBlock() ... \c endEditBlock() pair so that the
+    insertion can be undone as a single operation.
+    
+    \snippet examples/mainwindows/dockwidgets/mainwindow.cpp 3
+
+    Qt's QTextDocument class makes printing documents easy. We simply
+    take the QTextEdit's QTextDocument, set up the printer and print the
+    document.
+
+    \snippet examples/mainwindows/dockwidgets/mainwindow.cpp 4
+
+    QTextEdit can output its contents in HTML format, so we prompt the
+    user for the name of an HTML file and if they provide one we simply
+    write the QTextEdit's contents in HTML format to the file.
+
+    \snippet examples/mainwindows/dockwidgets/mainwindow.cpp 5
+
+    If the focus is in the QTextEdit, pressing \key Ctrl+Z undoes as
+    expected. But for the user's convenience we provide an
+    application-wide undo function that simply calls the QTextEdit's
+    undo: this means that the user can undo regardless of where the
+    focus is in the application.
+*/
diff --git a/doc/src/examples/dombookmarks.qdoc b/doc/src/examples/dombookmarks.qdoc
new file mode 100644
index 0000000000..f3944ef7f3
--- /dev/null
+++ b/doc/src/examples/dombookmarks.qdoc
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example xml/dombookmarks
+    \title DOM Bookmarks Example
+
+    The DOM Bookmarks example provides a reader for XML Bookmark Exchange Language (XBEL)
+    files that uses Qt's DOM-based XML API to read and parse the files. The SAX Bookmarks
+    example provides an alternative way to read this type of file.
+
+    \image dombookmarks-example.png
+
+    See the \l{http://pyxml.sourceforge.net/topics/xbel/}{XML Bookmark Exchange Language
+    Resource Page} for more information about XBEL files.
+*/
diff --git a/doc/src/examples/draganddroppuzzle.qdoc b/doc/src/examples/draganddroppuzzle.qdoc
new file mode 100644
index 0000000000..0e6ed09041
--- /dev/null
+++ b/doc/src/examples/draganddroppuzzle.qdoc
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example draganddrop/puzzle
+    \title Drag and Drop Puzzle Example
+
+    The Drag and Drop Puzzle example demonstrates a way of using the drag and drop system with
+    item view widgets.
+
+    \image draganddroppuzzle-example.png
+
+    This example is an implementation of a simple jigsaw puzzle game using Qt's
+    drag and drop API.
+    The \l{Item Views Puzzle Example}{Item View Puzzle} example shows
+    many of the same features, but takes an alternative approach that uses Qt's
+    model/view framework to manage drag and drop operations.
+*/
diff --git a/doc/src/examples/dragdroprobot.qdoc b/doc/src/examples/dragdroprobot.qdoc
new file mode 100644
index 0000000000..d3f97b00d5
--- /dev/null
+++ b/doc/src/examples/dragdroprobot.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example graphicsview/dragdroprobot
+    \title Drag and Drop Robot Example
+
+    This GraphicsView example shows how to implement drag and drop in
+    a QGraphicsItem subclass, as well as how to animate items using
+    QGraphicsItemAnimation and QTimeLine.
+
+    \image dragdroprobot-example.png
+*/
diff --git a/doc/src/examples/draggableicons.qdoc b/doc/src/examples/draggableicons.qdoc
new file mode 100644
index 0000000000..23150f9464
--- /dev/null
+++ b/doc/src/examples/draggableicons.qdoc
@@ -0,0 +1,104 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example draganddrop/draggableicons
+    \title Draggable Icons Example
+
+    The Draggable Icons example shows how to drag and drop image data between widgets
+    in the same application, and between different applications.
+
+    \image draggableicons-example.png
+
+    In many situations where drag and drop is used, the user starts dragging from
+    a particular widget and drops the payload onto another widget. In this example,
+    we subclass QLabel to create labels that we use as drag sources, and place them
+    inside \l{QWidget}s that serve as both containers and drop sites.
+
+    In addition, when a drag and drop operation occurs, we want to send more than
+    just an image. We also want to send information about where the user clicked in
+    the image so that the user can place it precisely on the drop target. This level
+    of detail means that we must create a custom MIME type for our data.
+
+    \section1 DragWidget Class Definition
+
+    The icon widgets that we use to display icons are subclassed from QLabel:
+
+    \snippet examples/draganddrop/draggableicons/dragwidget.h 0
+
+    Since the QLabel class provides most of what we require for the icon, we
+    only need to reimplement the \l QWidget::mousePressEvent() to provide
+    drag and drop facilities.
+
+    \section1 DragWidget Class Implementation
+
+    The \c DragWidget constructor sets an attribute on the widget that ensures
+    that it will be deleted when it is closed:
+
+    \snippet examples/draganddrop/draggableicons/dragwidget.cpp 0
+
+    To enable dragging from the icon, we need to act on a mouse press event.
+    We do this by reimplementing \l QWidget::mousePressEvent() and setting up
+    a QDrag object.
+
+    \snippet examples/draganddrop/draggableicons/dragwidget.cpp 1
+
+    Since we will be sending pixmap data for the icon and information about the
+    user's click in the icon widget, we construct a QByteArray and package up the
+    details using a QDataStream.
+
+    For interoperability, drag and drop operations describe the data they contain
+    using MIME types. In Qt, we describe this data using a QMimeData object:
+
+    \snippet examples/draganddrop/draggableicons/dragwidget.cpp 2
+
+    We choose an unofficial MIME type for this purpose, and supply the QByteArray
+    to the MIME data object.
+
+    The drag and drop operation itself is handled by a QDrag object:
+
+    \snippet examples/draganddrop/draggableicons/dragwidget.cpp 3
+
+    Here, we pass the data to the drag object, set a pixmap that will be shown
+    alongside the cursor during the operation, and define the position of a hot
+    spot that places the position of this pixmap under the cursor.
+
+*/
diff --git a/doc/src/examples/draggabletext.qdoc b/doc/src/examples/draggabletext.qdoc
new file mode 100644
index 0000000000..4d3d89d05c
--- /dev/null
+++ b/doc/src/examples/draggabletext.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example draganddrop/draggabletext
+    \title Draggable Text Example
+
+    The Draggable Text example shows how to drag and drop textual data between widgets
+    in the same application, and between different applications.
+
+    \image draggabletext-example.png
+*/
diff --git a/doc/src/examples/drilldown.qdoc b/doc/src/examples/drilldown.qdoc
new file mode 100644
index 0000000000..344b9e74d0
--- /dev/null
+++ b/doc/src/examples/drilldown.qdoc
@@ -0,0 +1,552 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example sql/drilldown
+    \title Drill Down Example
+
+    The Drill Down example shows how to read data from a database as
+    well as submit changes, using the QSqlRelationalTableModel and
+    QDataWidgetMapper classes.
+
+    \image drilldown-example.png Screenshot of the Drill Down Example
+
+    When running the example application, a user can retrieve
+    information about each of Nokia's Qt Software offices by clicking the
+    corresponding image. The application pops up an information window
+    displaying the data, and allows the users to alter the location
+    description as well as the image. The main view will be updated
+    when the users submit their changes.
+
+    The example consists of three classes:
+
+    \list
+        \o \c ImageItem is a custom graphics item class used to
+        display the office images.
+
+        \o \c View is the main application widget allowing the user to
+        browse through the various locations.
+
+        \o \c InformationWindow displays the requested information,
+        allowing the users to alter it and submit their changes to the
+        database.
+    \endlist
+
+    We will first take a look at the \c InformationWindow class to see
+    how you can read and modify data from a database. Then we will
+    review the main application widget, i.e., the \c View class, and
+    the associated \c ImageItem class.
+
+    \section1 InformationWindow Class Definition
+
+    The \c InformationWindow class is a custom widget inheriting
+    QWidget:
+
+    \snippet examples/sql/drilldown/informationwindow.h 0
+
+    When we create an information window, we pass the associated
+    location ID, a parent, and a pointer to the database, to the
+    constructor. We will use the database pointer to populate our
+    window with data, while passing the parent parameter on to the
+    base class. The ID is stored for future reference.
+
+    Once a window is created, we will use the public \c id() function
+    to locate it whenever information for the given location is
+    requested. We will also use the ID to update the main application
+    widget when the users submit their changes to the database, i.e.,
+    we will emit a signal carrying the ID and file name as parameters
+    whenever the users changes the associated image.
+
+    \snippet examples/sql/drilldown/informationwindow.h 1
+
+    Since we allow the users to alter some of the location data, we
+    must provide functionality for reverting and submitting their
+    changes. The \c enableButtons() slot is provided for convenience
+    to enable and disable the various buttons when required.
+
+    \snippet examples/sql/drilldown/informationwindow.h 2
+
+    The \c createButtons() function is also a convenience function,
+    provided to simplify the constructor. As mentioned above we store
+    the location ID for future reference. We also store the name of
+    the currently displayed image file to be able to determine when to
+    emit the \c imageChanged() signal.
+
+    The information window uses the QLabel class to display the office
+    location and the country. The associated image file is displayed
+    using a QComboBox instance while the description is displayed using
+    QTextEdit. In addition, the window has three buttons to control
+    the data flow and whether the window is shown or not.
+
+    Finally, we declare a \e mapper. The QDataWidgetMapper class
+    provides mapping between a section of a data model to widgets. We
+    will use the mapper to extract data from the given database,
+    updating the database whenever the user modifies the data.
+
+    \section1 InformationWindow Class Implementation
+
+    The constructor takes three arguments: a location ID, a database
+    pointer and a parent widget. The database pointer is actually a
+    pointer to a QSqlRelationalTableModel object providing an editable
+    data model (with foreign key support) for our database table.
+
+    \snippet examples/sql/drilldown/informationwindow.cpp 0
+    \snippet examples/sql/drilldown/informationwindow.cpp 1
+
+    First we create the various widgets required to display the data
+    contained in the database. Most of the widgets are created in a
+    straight forward manner. But note the combobox displaying the
+    name of the image file:
+
+    \snippet examples/sql/drilldown/informationwindow.cpp 2
+
+    In this example, the information about the offices are stored in a
+    database table called "offices". When creating the model,
+    we will use a foreign key to establish a relation between this
+    table and a second data base table, "images", containing the names
+    of the available image files. We will get back to how this is done
+    when reviewing the \c View class. The rationale for creating such
+    a relation though, is that we want to ensure that the user only
+    can choose between predefined image files.
+
+    The model corresponding to the "images" database table, is
+    available through the QSqlRelationalTableModel's \l
+    {QSqlRelationalTableModel::}{relationModel()} function, requiring
+    the foreign key (in this case the "imagefile" column number) as
+    argument. We use QComboBox's \l {QComboBox::}{setModel()} function
+    to make the combobox use the "images" model. And, since this model
+    has two columns ("locationid" and "file"), we also specify which
+    column we want to be visible using the QComboBox::setModelColumn()
+    function.
+
+    \snippet examples/sql/drilldown/informationwindow.cpp 3
+
+    Then we create the mapper. The QDataWidgetMapper class allows us
+    to create data-aware widgets by mapping them to sections of an
+    item model.
+
+    The \l {QDataWidgetMapper::}{addMapping()} function adds a mapping
+    between the given widget and the specified section of the
+    model. If the mapper's orientation is horizontal (the default) the
+    section is a column in the model, otherwise it is a row. We call
+    the \l {QDataWidgetMapper::}{setCurrentIndex()} function to
+    initialize the widgets with the data associated with the given
+    location ID. Every time the current index changes, all the widgets
+    are updated with the contents from the model.
+
+    We also set the mapper's submit policy to
+    QDataWidgetMapper::ManualSubmit. This means that no data is
+    submitted to the database until the user expliclity requests a
+    submit (the alternative is QDataWidgetMapper::AutoSubmit,
+    automatically submitting changes when the corresponding widget
+    looses focus). Finally, we specify the item delegate the mapper
+    view should use for its items. The QSqlRelationalDelegate class
+    represents a delegate that unlike the default delegate, enables
+    combobox functionality for fields that are foreign keys into other
+    tables (like "imagefile" in our "trolltechoffices" table).
+
+    \snippet examples/sql/drilldown/informationwindow.cpp 4
+
+    Finally, we connect the "something's changed" signals in the
+    editors to our custom \c enableButtons() slot, enabling the users
+    to either submit or revert their changes. We add all the widgets
+    into a layout, store the location ID and the name of the displayed
+    image file for future reference, and set the window title and
+    initial size.
+
+    Note that we also set the Qt::Window window flag to indicate that
+    our widget is in fact a window, with a window system frame and a
+    title bar.
+
+    \snippet examples/sql/drilldown/informationwindow.cpp 5
+
+    When a window is created, it is not deleted until the main
+    application exits (i.e., if the user closes the information
+    window, it is only hidden). For this reason we do not want to
+    create more than one \c InformationWindow object for each
+    location, and we provide the public \c id() function to be able to
+    determine whether a window already exists for a given location
+    when the user requests information about it.
+
+    \snippet examples/sql/drilldown/informationwindow.cpp 6
+
+    The \c revert() slot is triggered whenever the user hits the \gui
+    Revert button.
+
+    Since we set the QDataWidgetMapper::ManualSubmit submit policy,
+    none of the user's changes are written back to the model unless
+    the user expliclity choose to submit all of them. Nevertheless, we
+    can use the QDataWidgetMapper's \l {QDataWidgetMapper::}{revert()}
+    slot to reset the editor widgets, repopulating all widgets with
+    the current data of the model.
+
+    \snippet examples/sql/drilldown/informationwindow.cpp 7
+
+    Likewise, the \c submit() slot is triggered whenever the users
+    decide to submit their changes by pressing the \gui Submit button.
+
+    We use QDataWidgetMapper's \l {QDataWidgetMapper::}{submit()} slot
+    to submit all changes from the mapped widgets to the model,
+    i.e. to the database. For every mapped section, the item delegate
+    will then read the current value from the widget and set it in the
+    model. Finally, the \e model's \l {QAbstractItemModel::}{submit()}
+    function is invoked to let the model know that it should submit
+    whatever it has cached to the permanent storage.
+
+    Note that before any data is submitted, we check if the user has
+    chosen another image file using the previously stored \c
+    displayedImage variable as reference. If the current and stored
+    file names differ, we store the new file name and emit the \c
+    imageChanged() signal.
+
+    \snippet examples/sql/drilldown/informationwindow.cpp 8
+
+    The \c createButtons() function is provided for convenience, i.e.,
+    to simplify the constructor.
+
+    We make the \gui Close button the default button, i.e., the button
+    that is pressed when the user presses \gui Enter, and connect its
+    \l {QPushButton::}{clicked()} signal to the widget's \l
+    {QWidget::}{close()} slot. As mentioned above closing the window
+    only hides the widget; it is not deleted. We also connect the \gui
+    Submit and \gui Revert buttons to the corresponding \c submit()
+    and \c revert() slots.
+
+    \snippet examples/sql/drilldown/informationwindow.cpp 9
+
+    The QDialogButtonBox class is a widget that presents buttons in a
+    layout that is appropriate to the current widget style. Dialogs
+    like our information window, typically present buttons in a layout
+    that conforms to the interface guidelines for that
+    platform. Invariably, different platforms have different layouts
+    for their dialogs. QDialogButtonBox allows us to add buttons,
+    automatically using the appropriate layout for the user's desktop
+    environment.
+
+    Most buttons for a dialog follow certain roles. We give the \gui
+    Submit and \gui Revert buttons the \l
+    {QDialogButtonBox::ButtonRole}{reset} role, i.e., indicating that
+    pressing the button resets the fields to the default values (in
+    our case the information contained in the database). The \l
+    {QDialogButtonBox::ButtonRole}{reject} role indicates that
+    clicking the button causes the dialog to be rejected. On the other
+    hand, since we only hide the information window, any changes that
+    the user has made wil be preserved until the user expliclity
+    revert or submit them.
+
+    \snippet examples/sql/drilldown/informationwindow.cpp 10
+
+    The \c enableButtons() slot is called to enable the buttons
+    whenever the user changes the presented data. Likewise, when the
+    data the user choose to submit the changes, the buttons are
+    disabled to indicate that the current data is stored in the
+    database.
+
+    This completes the \c InformationWindow class. Let's take a look
+    at how we have used it in our example application.
+
+    \section1 View Class Definition
+
+    The \c View class represents the main application window and
+    inherits QGraphicsView:
+
+    \snippet examples/sql/drilldown/view.h 0
+    \codeline
+    \snippet examples/sql/drilldown/view.h 1
+
+    The QGraphicsView class is part of the \l {The Graphics View
+    Framework} which we will use to display the images of Nokia's
+    Qt Software offices. To be able to respond to user interaction;
+    i.e., showing the
+    appropriate information window whenever the user clicks one of the
+    office images, we reimplement QGraphicsView's \l
+    {QGraphicsView::}{mouseReleaseEvent()} function.
+
+    Note that the constructor expects the names of two database
+    tables: One containing the detailed information about the offices,
+    and another containing the names of the available image files.  We
+    also provide a private \c updateImage() slot to catch \c
+    {InformationWindow}'s \c imageChanged() signal that is emitted
+    whenever the user changes a location's image.
+
+    \snippet examples/sql/drilldown/view.h 2
+
+    The \c addItems() function is a convenience function provided to
+    simplify the constructor. It is called only once, creating the
+    various items and adding them to the view.
+
+    The \c findWindow() function, on the other hand, is frequently
+    used. It is called from the \c showInformation() function to
+    detemine whether a window is already created for the given
+    location (whenever we create an \c InformationWindow object, we
+    store a reference to it in the \c informationWindows list). The
+    latter function is in turn called from our custom \c
+    mouseReleaseEvent() implementation.
+
+    \snippet examples/sql/drilldown/view.h 3
+
+    Finally we declare a QSqlRelationalTableModel pointer. As
+    previously mentioned, the QSqlRelationalTableModel class provides
+    an editable data model with foreign key support. There are a
+    couple of things you should keep in mind when using the
+    QSqlRelationalTableModel class: The table must have a primary key
+    declared and this key cannot contain a relation to another table,
+    i.e., it cannot be a foreign key. Note also that if a relational
+    table contains keys that refer to non-existent rows in the
+    referenced table, the rows containing the invalid keys will not be
+    exposed through the model. It is the user's or the database's
+    responsibility to maintain referential integrity.
+
+    \section1 View Class Implementation
+
+    Although the constructor requests the names of both the table
+    containing office details as well as the table containing the
+    names of the available image files, we only have to create a
+    QSqlRelationalTableModel object for the office table:
+
+    \snippet examples/sql/drilldown/view.cpp 0
+
+    The reason is that once we have a model with the office details,
+    we can create a relation to the available image files using
+    QSqlRelationalTableModel's \l
+    {QSqlRelationalTableModel::}{setRelation()} function. This
+    function creates a foreign key for the given model column. The key
+    is specified by the provided QSqlRelation object constructed by
+    the name of the table the key refers to, the field the key is
+    mapping to and the field that should be presented to the user.
+
+    Note that setting the table only specifies which table the model
+    operates on, i.e., we must explicitly call the model's \l
+    {QSqlRelationalTableModel::}{select()} function to populate our
+    model.
+
+    \snippet examples/sql/drilldown/view.cpp 1
+
+    Then we create the contents of our view, i.e., the scene and its
+    items. The location labels are regular QGraphicsTextItem objects,
+    and the "Qt" logo is represented by a QGraphicsPixmapItem
+    object. The images, on the other hand, are instances of the \c
+    ImageItem class (derived from QGraphicsPixmapItem). We will get
+    back to this shortly when reviewing the \c addItems() function.
+
+    Finally, we set the main application widget's size constraints and
+    window title.
+
+    \snippet examples/sql/drilldown/view.cpp 3
+
+    The \c addItems() function is called only once, i.e., when
+    creating the main application window. For each row in the database
+    table, we first extract the corresponding record using the model's
+    \l {QSqlRelationalTableModel::}{record()} function. The QSqlRecord
+    class encapsulates both the functionality and characteristics of a
+    database record, and supports adding and removing fields as well
+    as setting and retrieving field values. The QSqlRecord::value()
+    function returns the value of the field with the given name or
+    index as a QVariant object.
+
+    For each record, we create a label item as well as an image item,
+    calculate their position and add them to the scene. The image
+    items are represented by instances of the \c ImageItem class. The
+    reason we must create a custom item class is that we want to catch
+    the item's hover events, animating the item when the mouse cursor
+    is hovering over the image (by default, no items accept hover
+    events). Please see the \l{The Graphics View Framework}
+    documentation and the
+    \l{Qt Examples#Graphics View}{Graphics View examples} for more
+    details.
+
+    \snippet examples/sql/drilldown/view.cpp 5
+
+    We reimplement QGraphicsView's \l
+    {QGraphicsView::}{mouseReleaseEvent()} event handler to respond to
+    user interaction. If the user clicks any of the image items, this
+    function calls the private \c showInformation() function to pop up
+    the associated information window.
+
+    \l {The Graphics View Framework} provides the qgraphicsitem_cast()
+    function to determine whether the given QGraphicsItem instance is
+    of a given type. Note that if the event is not related to any of
+    our image items, we pass it on to the base class implementation.
+
+    \snippet examples/sql/drilldown/view.cpp 6
+
+    The \c showInformation() function is given an \c ImageItem object
+    as argument, and starts off by extracting the item's location
+    ID. Then it determines if there already is created an information
+    window for this location. If it is, and the window is visible, it
+    ensures that the window is raised to the top of the widget stack
+    and activated. If the window exists but is hidden, calling its \l
+    {QWidget::}{show()} slot gives the same result.
+
+    If no window for the given location exists, we create one by
+    passing the location ID, a pointer to the model, and our view as a
+    parent, to the \c InformationWindow constructor. Note that we
+    connect the information window's \c imageChanged() signal to \e
+    this widget's \c updateImage() slot, before we give it a suitable
+    position and add it to the list of existing windows.
+
+    \snippet examples/sql/drilldown/view.cpp 7
+
+    The \c updateImage() slot takes a location ID and the name of an
+    image files as arguments. It filters out the image items, and
+    updates the one that correspond to the given location ID, with the
+    provided image file.
+
+    \snippet examples/sql/drilldown/view.cpp 8
+
+    The \c findWindow() function simply searches through the list of
+    existing windows, returning a pointer to the window that matches
+    the given location ID, or 0 if the window doesn't exists.
+
+    Finally, let's take a quick look at our custom \c ImageItem class:
+
+    \section1 ImageItem Class Definition
+
+    The \c ImageItem class is provided to facilitate animation of the
+    image items. It inherits QGraphicsPixmapItem and reimplements its
+    hover event handlers:
+
+    \snippet examples/sql/drilldown/imageitem.h 0
+
+    In addition, we implement a public \c id() function to be able to
+    identify the associated location and a public \c adjust() function
+    that can be called to ensure that the image item is given the
+    preferred size regardless of the original image file.
+
+    The animation is implemented using the QTimeLine class together
+    with the event handlers and the private \c setFrame() slot: The
+    image item will expand when the mouse cursor hovers over it,
+    returning back to its orignal size when the cursor leaves its
+    borders.
+
+    Finally, we store the location ID that this particular record is
+    associated with as well as a z-value. In the \l {The Graphics View
+    Framework}, an item's z-value determines its position in the item
+    stack. An item of high Z-value will be drawn on top of an item
+    with a lower z-value if they share the same parent item. We also
+    provide an \c updateItemPosition() function to refresh the view
+    when required.
+
+    \section1 ImageItem Class Implementation
+
+    The \c ImageItem class is really only a QGraphicsPixmapItem with
+    some additional features, i.e., we can pass most of the
+    constructor's arguments (the pixmap, parent and scene) on to the
+    base class constructor:
+
+    \snippet examples/sql/drilldown/imageitem.cpp 0
+
+    Then we store the ID for future reference, and ensure that our
+    item will accept hover events. Hover events are delivered when
+    there is no current mouse grabber item. They are sent when the
+    mouse cursor enters an item, when it moves around inside the item,
+    and when the cursor leaves an item. As we mentioned earlier, none
+    of the \l {The Graphics View Framework}'s items accept hover
+    event's by default.
+
+    The QTimeLine class provides a timeline for controlling
+    animations. Its \l {QTimeLine::}{duration} property holds the
+    total duration of the timeline in milliseconds. By default, the
+    time line runs once from the beginning and towards the end. The
+    QTimeLine::setFrameRange() function sets the timeline's frame
+    counter; when the timeline is running, the \l
+    {QTimeLine::}{frameChanged()} signal is emitted each time the
+    frame changes. We set the duration and frame range for our
+    animation, and connect the time line's \l
+    {QTimeLine::}{frameChanged()} and \l {QTimeLine::}{finished()}
+    signals to our private \c setFrame() and \c updateItemPosition()
+    slots.
+
+    Finally, we call \c adjust() to ensure that the item is given the
+    preferred size.
+
+    \snippet examples/sql/drilldown/imageitem.cpp 1
+    \codeline
+    \snippet examples/sql/drilldown/imageitem.cpp 2
+
+    Whenever the mouse cursor enters or leave the image item, the
+    corresponding event handlers are triggered: We first set the time
+    line's direction, making the item expand or shrink,
+    respectively. Then we alter the item's z-value if it is not already
+    set to the expected value.
+
+    In the case of hover \e enter events, we immediately update the
+    item's position since we want the item to appear on top of all
+    other items as soon as it starts expanding. In the case of hover
+    \e leave events, on the other hand, we postpone the actual update
+    to achieve the same result. But remember that when we constructed
+    our item, we connected the time line's \l
+    {QTimeLine::}{finished()} signal to the \c updateItemPosition()
+    slot. In this way the item is given the correct position in the
+    item stack once the animation is completed. Finally, if the time
+    line is not already running, we start it.
+
+    \snippet examples/sql/drilldown/imageitem.cpp 3
+
+    When the time line is running, it triggers the \c setFrame() slot
+    whenever the current frame changes due to the connection we
+    created in the item constructor. It is this slot that controls the
+    animation, expanding or shrinking the image item step by step.
+
+    We first call the \c adjust() function to ensure that we start off
+    with the item's original size. Then we scale the item with a
+    factor depending on the animation's progress (using the \c frame
+    parameter). Note that by default, the transformation will be
+    relative to the item's top-left corner. Since we want the item to
+    be transformed relative to its center, we must translate the
+    coordinate system before we scale the item.
+
+    In the end, only the following convenience functions remain:
+
+    \snippet examples/sql/drilldown/imageitem.cpp 4
+    \codeline
+    \snippet examples/sql/drilldown/imageitem.cpp 5
+    \codeline
+    \snippet examples/sql/drilldown/imageitem.cpp 6
+
+    The \c adjust() function defines and applies a transformation
+    matrix, ensuring that our image item appears with the preferred
+    size regardless of the size of the source image. The \c id()
+    function is trivial, and is simply provided to be able to identify
+    the item. In the \c updateItemPosition() slot we call the
+    QGraphicsItem::setZValue() function, setting the elevation (i.e.,
+    the position) of the item.
+*/
diff --git a/doc/src/examples/dropsite.qdoc b/doc/src/examples/dropsite.qdoc
new file mode 100644
index 0000000000..4780b82119
--- /dev/null
+++ b/doc/src/examples/dropsite.qdoc
@@ -0,0 +1,263 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example draganddrop/dropsite
+    \title Drop Site Example
+
+    The example shows how to distinguish the various MIME formats available
+    in a drag and drop operation.
+
+    \image dropsite-example.png Screenshot of the Drop Site example
+
+    The Drop Site example accepts drops from other applications, and displays
+    the MIME formats provided by the drag object.
+
+    There are two classes, \c DropArea and \c DropSiteWindow, and a \c main()
+    function in this example. A \c DropArea object is instantiated in
+    \c DropSiteWindow; a \c DropSiteWindow object is then invoked in the
+    \c main() function.
+
+    \section1 DropArea Class Definition
+
+    The \c DropArea class is a subclass of QLabel with a public slot,
+    \c clear(), and a \c changed() signal.
+
+    \snippet draganddrop/dropsite/droparea.h DropArea header part1
+
+    In addition, \c DropArea also contains a private instance of QLabel and
+    reimplementations of four \l{QWidget} event handlers:
+
+    \list 1
+        \o \l{QWidget::dragEnterEvent()}{dragEnterEvent()}
+        \o \l{QWidget::dragMoveEvent()}{dragMoveEvent()}
+        \o \l{QWidget::dragLeaveEvent()}{dragLeaveEvent()}
+        \o \l{QWidget::dropEvent()}{dropEvent()}
+    \endlist
+
+    These event handlers are further explained in the implementation of the
+    \c DropArea class.
+
+    \snippet draganddrop/dropsite/droparea.h DropArea header part2
+
+    \section1 DropArea Class Implementation
+
+    In the \c DropArea constructor, we set the \l{QWidget::setMinimumSize()}
+    {minimum size} to 200x200 pixels, the \l{QFrame::setFrameStyle()}
+    {frame style} to both QFrame::Sunken and QFrame::StyledPanel, and we align
+    its contents to the center.
+
+    \snippet draganddrop/dropsite/droparea.cpp DropArea constructor
+
+    Also, we enable drop events in \c DropArea by setting the
+    \l{QWidget::acceptDrops()}{acceptDrops} property to \c true. Then,
+    we enable the \l{QWidget::autoFillBackground()}{autoFillBackground}
+    property and invoke the \c clear() function.
+
+    The \l{QWidget::dragEnterEvent()}{dragEnterEvent()} event handler is
+    called when a drag is in progress and the mouse enters the \c DropArea
+    object. For the \c DropSite example, when the mouse enters \c DropArea,
+    we set its text to "<drop content>" and highlight its background.
+
+    \snippet draganddrop/dropsite/droparea.cpp dragEnterEvent() function
+
+    Then, we invoke \l{QDropEvent::acceptProposedAction()}
+    {acceptProposedAction()} on \a event, setting the drop action to the one
+    proposed. Lastly, we emit the \c changed() signal, with the data that was
+    dropped and its MIME type information as a parameter.
+
+    For \l{QWidget::dragMoveEvent()}{dragMoveEvent()}, we just accept the
+    proposed QDragMoveEvent object, \a event, with
+    \l{QDropEvent::acceptProposedAction()}{acceptProposedAction()}.
+
+    \snippet draganddrop/dropsite/droparea.cpp dragMoveEvent() function
+
+    The \c DropArea class's implementation of \l{QWidget::dropEvent()}
+    {dropEvent()} extracts the \a{event}'s mime data and displays it
+    accordingly.
+
+    \snippet draganddrop/dropsite/droparea.cpp dropEvent() function part1
+
+    The \c mimeData object can contain one of the following objects: an image,
+    HTML text, plain text, or a list of URLs.
+
+    \snippet draganddrop/dropsite/droparea.cpp dropEvent() function part2
+
+    \list
+        \o If \c mimeData contains an image, we display it in \c DropArea with
+           \l{QLabel::setPixmap()}{setPixmap()}.
+        \o If \c mimeData contains HTML, we display it with
+           \l{QLabel::setText()}{setText()} and set \c{DropArea}'s text format
+           as Qt::RichText.
+        \o If \c mimeData contains plain text, we display it with
+           \l{QLabel::setText()}{setText()} and set \c{DropArea}'s text format
+           as Qt::PlainText. In the event that \c mimeData contains URLs, we
+           iterate through the list of URLs to display them on individual
+           lines.
+        \o If \c mimeData contains other types of objects, we set
+           \c{DropArea}'s text, with \l{QLabel::setText()}{setText()} to
+           "Cannot display data" to inform the user.
+    \endlist
+
+    We then set \c{DropArea}'s \l{QWidget::backgroundRole()}{backgroundRole} to
+    QPalette::Dark and we accept \c{event}'s proposed action.
+
+    \snippet draganddrop/dropsite/droparea.cpp dropEvent() function part3
+
+    The \l{QWidget::dragLeaveEvent()}{dragLeaveEvent()} event handler is
+    called when a drag is in progress and the mouse leaves the widget.
+
+    \snippet draganddrop/dropsite/droparea.cpp dragLeaveEvent() function
+
+    For \c{DropArea}'s implementation, we clear invoke \c clear() and then
+    accept the proposed event.
+
+    The \c clear() function sets the text in \c DropArea to "<drop content>"
+    and sets the \l{QWidget::backgroundRole()}{backgroundRole} to
+    QPalette::Dark. Lastly, it emits the \c changed() signal.
+
+    \snippet draganddrop/dropsite/droparea.cpp clear() function
+
+    \section1 DropSiteWindow Class Definition
+
+    The \c DropSiteWindow class contains a constructor and a public slot,
+    \c updateFormatsTable().
+
+    \snippet draganddrop/dropsite/dropsitewindow.h DropSiteWindow header
+
+    The class also contains a private instance of \c DropArea, \c dropArea,
+    QLabel, \c abstractLabel, QTableWidget, \c formatsTable, QDialogButtonBox,
+    \c buttonBox, and two QPushButton objects, \c clearButton and
+    \c quitButton.
+
+    \section1 DropSiteWindow Class Implementation
+
+    In the constructor of \c DropSiteWindow, we instantiate \c abstractLabel
+    and set its \l{QLabel::setWordWrap()}{wordWrap} property to \c true. We
+    also call the \l{QLabel::adjustSize()}{adjustSize()} function to adjust
+    \c{abstractLabel}'s size according to its contents.
+
+    \snippet draganddrop/dropsite/dropsitewindow.cpp constructor part1
+
+    Then we instantiate \c dropArea and connect its \c changed() signal to
+    \c{DropSiteWindow}'s \c updateFormatsTable() slot.
+
+    \snippet draganddrop/dropsite/dropsitewindow.cpp constructor part2
+
+    We now set up the QTableWidget object, \c formatsTable. Its
+    horizontal header is set using a QStringList object, \c labels. The number
+    of columms are set to two and the table is not editable. Also, the
+    \c{formatTable}'s horizontal header is formatted to ensure that its second
+    column stretches to occupy additional space available.
+
+    \snippet draganddrop/dropsite/dropsitewindow.cpp constructor part3
+
+    Two QPushButton objects, \c clearButton and \c quitButton, are instantiated
+    and added to \c buttonBox - a QDialogButtonBox object. We use
+    QDialogButtonBox here to ensure that the push buttons are presented in a
+    layout that conforms to the platform's style.
+
+    \snippet draganddrop/dropsite/dropsitewindow.cpp constructor part4
+
+    The \l{QPushButton::clicked()}{clicked()} signals for \c quitButton and
+    \c clearButton are connected to \l{QWidget::close()}{close()} and
+    \c clear(), respectively.
+
+    For the layout, we use a QVBoxLayout, \c mainLayout, to arrange our widgets
+    vertically. We also set the window title to "Drop Site" and the minimum
+    size to 350x500 pixels.
+
+    \snippet draganddrop/dropsite/dropsitewindow.cpp constructor part5
+
+    We move on to the \c updateFormatsTable() function. This function updates
+    the \c formatsTable, displaying the MIME formats of the object dropped onto
+    the \c DropArea object. First, we set \l{QTableWidget}'s
+    \l{QTableWidget::setRowCount()}{rowCount} property to 0. Then, we validate
+    to ensure that the QMimeData object passed in is a valid object.
+
+    \snippet draganddrop/dropsite/dropsitewindow.cpp updateFormatsTable() part1
+
+    Once we are sure that \c mimeData is valid, we iterate through its
+    supported formats using the \l{The foreach Keyword}{foreach keyword}.
+    This keyword has the following format:
+
+    \snippet doc/src/snippets/code/doc_src_examples_dropsite.qdoc 0
+
+    In our example, \c format is the \a variable and the \a container is a
+    QStringList, obtained from \c mimeData->formats().
+
+    \note The \l{QMimeData::formats()}{formats()} function returns a
+    QStringList object, containing all the formats supported by the
+    \c mimeData.
+
+    \snippet draganddrop/dropsite/dropsitewindow.cpp updateFormatsTable() part2
+
+    Within each iteration, we create a QTableWidgetItem, \c formatItem and we
+    set its \l{QTableWidgetItem::setFlags()}{flags} to Qt::ItemIsEnabled, and
+    its \l{QTableWidgetItem::setTextAlignment()}{text alignment} to Qt::AlignTop
+    and Qt::AlignLeft.
+
+    A QString object, \c text, is customized to display data according to the
+    contents of \c format. We invoke {QString}'s \l{QString::simplified()}
+    {simplified()} function on \c text, to obtain a string that has no
+    additional space before, after or in between words.
+
+    \snippet draganddrop/dropsite/dropsitewindow.cpp updateFormatsTable() part3
+
+    If \c format contains a list of URLs, we iterate through them, using spaces
+    to separate them. On the other hand, if \c format contains an image, we
+    display the data by converting the text to hexadecimal.
+
+    \snippet draganddrop/dropsite/dropsitewindow.cpp updateFormatsTable() part4
+
+    Once \c text has been customized to contain the appropriate data, we insert
+    both \c format and \c text into \c formatsTable with
+    \l{QTableWidget::setItem()}{setItem()}. Lastly, we invoke
+    \l{QTableView::resizeColumnToContents()}{resizeColumnToContents()} on
+    \c{formatsTable}'s first column.
+
+    \section1 The main() Function
+
+    Within the \c main() function, we instantiate \c DropSiteWindow and invoke
+    its \l{QWidget::show()}{show()} function.
+
+    \snippet draganddrop/dropsite/main.cpp main() function
+*/
diff --git a/doc/src/examples/dynamiclayouts.qdoc b/doc/src/examples/dynamiclayouts.qdoc
new file mode 100644
index 0000000000..96b791bf0f
--- /dev/null
+++ b/doc/src/examples/dynamiclayouts.qdoc
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example layouts/dynamiclayouts
+    \title Dynamic Layouts Example
+
+    The Dynamic Layouts example shows how to move widgets around in
+    existing layouts.
+*/
diff --git a/doc/src/examples/echoplugin.qdoc b/doc/src/examples/echoplugin.qdoc
new file mode 100644
index 0000000000..32ad15b3ab
--- /dev/null
+++ b/doc/src/examples/echoplugin.qdoc
@@ -0,0 +1,222 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example tools/echoplugin
+    \title Echo Plugin Example
+
+    This example shows how to create a Qt plugin.
+
+    \image echopluginexample.png
+
+    There are two kinds of plugins in Qt: plugins that extend Qt
+    itself and plugins that extend applications written in Qt. In this
+    example, we show the procedure of implementing plugins that extend
+    applications. When you create a plugin you declare an interface,
+    which is a class with only pure virtual functions. This interface
+    is inherited by the class that implements the plugin. The class is
+    stored in a shared library and can therefore be loaded by
+    applications at run-time. When loaded, the plugin is dynamically
+    cast to the interface using Qt's \l{Meta-Object
+    System}{meta-object system}. The plugin \l{How to Create Qt
+    Plugins}{overview document} gives a high-level introduction to
+    plugins.
+    
+    We have implemented a plugin, the \c EchoPlugin, which implements
+    the \c EchoInterface. The interface consists of \c echo(), which
+    takes a QString as argument. The \c EchoPlugin returns the string
+    unaltered (i.e., it works as the familiar echo command found in
+    both Unix and Windows).
+
+    We test the plugin in \c EchoWindow: when you push the QPushButton
+    (as seen in the image above), the application sends the text in
+    the QLineEdit to the plugin, which echoes it back to the
+    application. The answer from the plugin is displayed in the
+    QLabel.
+
+
+    \section1 EchoWindow Class Definition
+
+    The \c EchoWindow class lets us test the \c EchoPlugin through a
+    GUI.
+
+    \snippet examples/tools/echoplugin/echowindow/echowindow.h 0
+
+    We load the plugin in \c loadPlugin() and cast it to \c
+    EchoInterface. When the user clicks the \c button we take the 
+    text in \c lineEdit and call the interface's \c echo() with it. 
+
+
+    \section1 EchoWindow Class Implementation
+
+    We start with a look at the constructor:
+
+    \snippet examples/tools/echoplugin/echowindow/echowindow.cpp 0
+
+    We create the widgets and set a title for the window. We then load
+    the plugin. \c loadPlugin() returns false if the plugin could not
+    be loaded, in which case we disable the widgets. If you wish a
+    more detailed error message, you can use
+    \l{QPluginLoader::}{errorString()}; we will look more closely at
+    QPluginLoader later.
+
+    Here is the implementation of \c sendEcho():
+
+    \snippet examples/tools/echoplugin/echowindow/echowindow.cpp 1
+
+    This slot is called when the user pushes \c button or presses
+    enter in \c lineEdit. We call \c echo() of the echo interface. In
+    our example this is the \c EchoPlugin, but it could be any plugin
+    that inherit the \c EchoInterface. We take the QString returned
+    from \c echo() and display it in the \c label.
+
+    Here is the implementation of \c createGUI():
+
+    \snippet examples/tools/echoplugin/echowindow/echowindow.cpp 2
+
+    We create the widgets and lay them out in a grid layout. We
+    connect the label and line edit to our \c sendEcho() slot.
+
+    Here is the \c loadPlugin() function:
+
+    \snippet examples/tools/echoplugin/echowindow/echowindow.cpp 3
+
+    Access to plugins at run-time is provided by QPluginLoader. You
+    supply it with the filename of the shared library the plugin is
+    stored in and call \l{QPluginLoader::}{instance()}, which loads
+    and returns the root component of the plugin (i.e., it resolves
+    the type of the plugin and creates a QObject instance of it). If
+    the plugin was not successfully loaded, it will be null, so we
+    return false. If it was loaded correctly, we can cast the plugin
+    to our \c EchoInterface and return true. In the case that the
+    plugin loaded does not implement the \c EchoInterface, \c
+    instance() will return null, but this cannot happen in our
+    example. Notice that the location of the plugin is not the same
+    for all platforms.
+
+
+    \section1 EchoInterface Class Definition
+
+    The \c EchoInterface defines the functions that the plugin will
+    provide. An interface is a class that only consists of pure
+    virtual functions. If non virtual functions were present in the
+    class you would get misleading compile errors in the moc files.
+
+    \snippet examples/tools/echoplugin/echowindow/echointerface.h 0
+
+    We declare \c echo(). In our \c EchoPlugin we use this method to
+    return, or echo, \a message.
+
+    We use the Q_DECLARE_INTERFACE macro to let \l{Meta-Object
+    System}{Qt's meta object system} aware of the interface. We do
+    this so that it will be possible to identify plugins that
+    implements the interface at run-time. The second argument is a
+    string that must identify the interface in a unique way. 
+
+
+    \section1 EchoPlugin Class Definition
+
+    We inherit both QObject and \c EchoInterface to make this class a
+    plugin. The Q_INTERFACES macro tells Qt which interfaces the class
+    implements. In our case we only implement the \c EchoInterface. 
+    If a class implements more than one interface, they are given as 
+    a comma separated list.
+
+    \snippet examples/tools/echoplugin/plugin/echoplugin.h 0
+
+
+    \section1 EchoPlugin Class Implementation
+
+    Here is the implementation of \c echo():
+
+    \snippet examples/tools/echoplugin/plugin/echoplugin.cpp 0
+
+    We simply return the functions parameter. 
+
+    \snippet examples/tools/echoplugin/plugin/echoplugin.cpp 1
+
+    We use the Q_EXPORT_PLUGIN2 macro to let Qt know that the \c
+    EchoPlugin class is a plugin. The first parameter is the name of
+    the plugin; it is usual to give the plugin and the library file it
+    is stored in the same name.
+
+    \section1 The \c main() function
+
+    \snippet examples/tools/echoplugin/echowindow/main.cpp 0
+
+    We create an \c EchoWindow and display it as a top-level window.
+
+    \section1 The Profiles
+
+    When creating plugins the profiles need to be adjusted.
+    We show here what changes need to be done. 
+
+    The profile in the echoplugin directory uses the \c subdirs
+    template and simply includes includes to directories in which
+    the echo window and echo plugin lives:
+
+    \snippet examples/tools/echoplugin/echoplugin.pro 0
+
+    The profile for the echo window does not need any plugin specific
+    settings. We move on to the plugin profile:
+
+    \snippet examples/tools/echoplugin/plugin/plugin.pro 0
+
+    We need to set the TEMPLATE as we now want to make a library
+    instead of an executable. We also need to tell qmake that we are
+    creating a plugin. The \c EchoInterface that the plugin implements
+    lives in the \c echowindow directory, so we need to add that
+    directory to the include path. We set the TARGET of the project,
+    which is the name of the library file in which the plugin will be
+    stored; qmake appends the appropriate file extension depending on
+    the platform. By convention the target should have the same name
+    as the plugin (set with Q_EXPORT_PLUGIN2)
+
+    \section1 Further reading and examples
+
+    You can find an overview of the macros needed to create plugins
+    \l{Macros for Defining Plugins}{here}.
+    
+    We give an example of a plugin that extend Qt in the \l{Style
+    Plugin Example}{style plugin} example. The \l{Plug & Paint
+    Example}{plug and paint} example shows how to create static
+    plugins.
+*/
diff --git a/doc/src/examples/editabletreemodel.qdoc b/doc/src/examples/editabletreemodel.qdoc
new file mode 100644
index 0000000000..da018308e8
--- /dev/null
+++ b/doc/src/examples/editabletreemodel.qdoc
@@ -0,0 +1,459 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example itemviews/editabletreemodel
+    \title Editable Tree Model Example
+
+    This example shows how to implement a simple item-based tree model that can
+    be used with other classes the model/view framework.
+
+    \image itemviews-editabletreemodel.png
+
+    The model supports editable items, custom headers, and the ability to
+    insert and remove rows and columns. With these features, it is also
+    possible to insert new child items, and this is shown in the supporting
+    example code.
+
+    \note The model only shows the basic principles used when creating an
+    editable, hierarchical model. You may wish to use the \l{ModelTest}
+    project to test production models.
+
+    \section1 Overview
+
+    As described in the \l{Model Subclassing Reference}, models must
+    provide implementations for the standard set of model functions:
+    \l{QAbstractItemModel::}{flags()}, \l{QAbstractItemModel::}{data()},
+    \l{QAbstractItemModel::}{headerData()}, and
+    \l{QAbstractItemModel::}{rowCount()}. In addition, hierarchical models,
+    such as this one, need to provide implementations of
+    \l{QAbstractItemModel::}{index()} and \l{QAbstractItemModel::}{parent()}.
+
+    An editable model needs to provide implementations of
+    \l{QAbstractItemModel::}{setData()} and
+    \l{QAbstractItemModel::}{headerData()}, and must return a suitable
+    combination of flags from its \l{QAbstractItemModel::}{flags()} function.
+
+    Since this example allows the dimensions of the model to be changed,
+    we must also implement \l{QAbstractItemModel::}{insertRows()},
+    \l{QAbstractItemModel::}{insertColumns()},
+    \l{QAbstractItemModel::}{removeRows()}, and
+    \l{QAbstractItemModel::}{removeColumns()}.
+
+    \section1 Design
+
+    As with the \l{itemviews/simpletreemodel}{Simple Tree Model} example,
+    the model simply acts as a wrapper around a collection
+    of instances of a \c TreeItem class. Each \c TreeItem is designed to
+    hold data for a row of items in a tree view, so it contains a list of
+    values corresponding to the data shown in each column.
+
+    Since QTreeView provides a row-oriented view onto a model, it is
+    natural to choose a row-oriented design for data structures that
+    will supply data via a model to this kind of view. Although this makes
+    the tree model less flexible, and possibly less useful for use with
+    more sophisticated views, it makes it less complex to design and easier
+    to implement.
+
+    \target Relations-between-internal-items
+    \table
+    \row \o \inlineimage itemviews-editabletreemodel-items.png
+    \o \bold{Relations between internal items}
+
+    When designing a data structure for use with a custom model, it is useful
+    to expose each item's parent via a function like
+    \l{TreeItem::parent}{TreeItem::parent()} because it will make
+    writing the model's own \l{QAbstractItemModel::}{parent()} function easier.
+    Similarly, a function like \l{TreeItem::child}{TreeItem::child()} is
+    helpful when implementing the model's \l{QAbstractItemModel::}{index()}
+    function. As a result, each \c TreeItem maintains information about
+    its parent and children, making it possible for us to traverse the tree
+    structure.
+
+    The diagram shows how \c TreeItem instances are connected via their
+    \l{TreeItem::parent}{parent()} and \l{TreeItem::child}{child()}
+    functions.
+
+    In the example shown, two top-level items, \bold{A} and
+    \bold{B}, can be obtained from the root item by calling its child()
+    function, and each of these items return the root node from their
+    parent() functions, though this is only shown for item \bold{A}.
+    \endtable
+
+    Each \c TreeItem stores data for each column in the row it represents
+    in its \c itemData private member (a list of QVariant objects).
+    Since there is a one-to-one mapping between each column in the view
+    and each entry in the list, we provide a simple
+    \l{TreeItem::data}{data()} function to read entries in the \c itemData
+    list and a \l{TreeItem::setData}{setData()} function to allow them to
+    be modified.
+    As with other functions in the item, this simplifies the implemention
+    of the model's \l{QAbstractItemModel::}{data()} and
+    \l{QAbstractItemModel::}{setData()} functions.
+
+    We place an item at the root of the tree of items. This root item
+    corresponds to the null model index, \l{QModelIndex::}{QModelIndex()},
+    that is used to represent the parent of a top-level item when handling
+    model indexes.
+    Although the root item does not have a visible representation in any of
+    the standard views, we use its internal list of QVariant objects to
+    store a list of strings that will be passed to views for use as
+    horizontal header titles.
+
+    \table
+    \row \o \inlineimage itemviews-editabletreemodel-model.png
+    \o \bold{Accessing data via the model}
+
+    In the case shown in the diagram, the piece of information represented
+    by \bold{a} can be obtained using the standard model/view API:
+
+    \snippet doc/src/snippets/code/doc_src_examples_editabletreemodel.qdoc 0
+
+    Since each items holds pieces of data for each column in a given row,
+    there can be many model indexes that map to the same \c TreeItem object.
+    For example, the information represented by \bold{b} can be obtained
+    using the following code:
+
+    \snippet doc/src/snippets/code/doc_src_examples_editabletreemodel.qdoc 1
+
+    The same underlying \c TreeItem would be accessed to obtain information
+    for the other model indexes in the same row as \bold{b}.
+    \endtable
+
+    In the model class, \c TreeModel, we relate \c TreeItem objects to
+    model indexes by passing a pointer for each item when we create its
+    corresponding model index with QAbstractItemModel::createIndex() in
+    our \l{TreeModel::index}{index()} and \l{TreeModel::parent}{parent()}
+    implementations.
+    We can retrieve pointers stored in this way by calling the
+    \l{QModelIndex::}{internalPointer()} function on the relevant model
+    index - we create our own \l{TreeModel::getItem}{getItem()} function to
+    do this work for us, and call it from our \l{TreeModel::data}{data()}
+    and \l{TreeModel::parent}{parent()} implementations.
+
+    Storing pointers to items is convenient when we control how they are
+    created and destroyed since we can assume that an address obtained from
+    \l{QModelIndex::}{internalPointer()} is a valid pointer.
+    However, some models need to handle items that are obtained from other
+    components in a system, and in many cases it is not possible to fully
+    control how items are created or destroyed. In such situations, a pure
+    pointer-based approach needs to be supplemented by safeguards to ensure
+    that the model does not attempt to access items that have been deleted.
+
+    \table
+    \row \o \bold{Storing information in the underlying data structure}
+
+    Several pieces of data are stored as QVariant objects in the \c itemData
+    member of each \c TreeItem instance
+
+    The diagram shows how pieces of information,
+    represented by the labels \bold{a}, \bold{b} and \bold{c} in the
+    previous two diagrams, are stored in items \bold{A}, \bold{B} and
+    \bold{C} in the underlying data structure. Note that pieces of
+    information from the same row in the model are all obtained from the
+    same item. Each element in a list corresponds to a piece of information
+    exposed by each column in a given row in the model.
+
+    \o \inlineimage itemviews-editabletreemodel-values.png
+    \endtable
+
+    Since the \c TreeModel implementation has been designed for use with
+    QTreeView, we have added a restriction on the way it uses \c TreeItem
+    instances: each item must expose the same number of columns of data.
+    This makes viewing the model consistent, allowing us to use the root
+    item to determine the number of columns for any given row, and only
+    adds the requirement that we create items containing enough data for
+    the total number of columns. As a result, inserting and removing
+    columns are time-consuming operations because we need to traverse the
+    entire tree to modify every item.
+
+    An alternative approach would be to design the \c TreeModel class so
+    that it truncates or expands the list of data in individual \c TreeItem
+    instances as items of data are modified. However, this "lazy" resizing
+    approach would only allow us to insert and remove columns at the end of
+    each row and would not allow columns to be inserted or removed at
+    arbitrary positions in each row.
+
+    \target Relating-items-using-model-indexes
+    \table
+    \row
+    \o \inlineimage itemviews-editabletreemodel-indexes.png
+    \o \bold{Relating items using model indexes}
+
+    As with the \l{itemviews/simpletreemodel}{Simple Tree Model} example,
+    the \c TreeModel needs to be able to take a model index, find the
+    corresponding \c TreeItem, and return model indexes that correspond to
+    its parents and children. 
+
+    In the diagram, we show how the model's \l{TreeModel::parent()}{parent()}
+    implementation obtains the model index corresponding to the parent of
+    an item supplied by the caller, using the items shown in a
+    \l{Relations-between-internal-items}{previous diagram}.
+
+    A pointer to item \bold{C} is obtained from the corresponding model index
+    using the \l{QModelIndex::internalPointer()} function. The pointer was
+    stored internally in the index when it was created. Since the child
+    contains a pointer to its parent, we use its \l{TreeItem::parent}{parent()}
+    function to obtain a pointer to item \bold{B}. The parent model index is
+    created using the QAbstractItemModel::createIndex() function, passing
+    the pointer to item \bold{B} as the internal pointer.
+    \endtable
+
+    \section1 TreeItem Class Definition
+
+    The \c TreeItem class provides simple items that contain several
+    pieces of data, and which can provide information about their parent
+    and child items:
+
+    \snippet examples/itemviews/editabletreemodel/treeitem.h 0
+
+    We have designed the API to be similar to that provided by
+    QAbstractItemModel by giving each item functions to return the number
+    of columns of information, read and write data, and insert and remove
+    columns. However, we make the relationship between items explicit by
+    providing functions to deal with "children" rather than "rows".
+
+    Each item contains a list of pointers to child items, a pointer to its
+    parent item, and a list of QVariant objects that correspond to
+    information held in columns in a given row in the model.
+
+    \section1 TreeItem Class Implementation
+
+    Each \c TreeItem is constructed with a list of data and an optional
+    parent item:
+
+    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 0
+
+    Initially, each item has no children. These are added to the item's
+    internal \c childItems member using the \c insertChildren() function
+    described later.
+
+    The destructor ensures that each child added to the item is deleted
+    when the item itself is deleted:
+
+    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 1
+
+    \target TreeItem::parent
+    Since each item stores a pointer to its parent, the \c parent() function
+    is trivial:
+
+    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 9
+
+    \target TreeItem::child
+    Three functions provide information about the children of an item.
+    \c child() returns a specific child from the internal list of children:
+
+    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 2
+
+    The \c childCount() function returns the total number of children:
+
+    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 3
+
+    The \c childNumber() function is used to determine the index of the child
+    in its parent's list of children. It accesses the parent's \c childItems
+    member directly to obtain this information:
+
+    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 4
+
+    The root item has no parent item; for this item, we return zero to be
+    consistent with the other items.
+
+    The \c columnCount() function simply returns the number of elements in
+    the internal \c itemData list of QVariant objects:
+
+    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 5
+
+    \target TreeItem::data
+    Data is retrieved using the \c data() function, which accesses the
+    appropriate element in the \c itemData list:
+
+    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 6
+
+    \target TreeItem::setData
+    Data is set using the \c setData() function, which only stores values
+    in the \c itemData list for valid list indexes, corresponding to column
+    values in the model:
+
+    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 11
+
+    To make implementation of the model easier, we return true to indicate
+    whether the data was set successfully, or false if an invalid column
+
+    Editable models often need to be resizable, enabling rows and columns to
+    be inserted and removed. The insertion of rows beneath a given model index
+    in the model leads to the insertion of new child items in the corresponding
+    item, handled by the \c insertChildren() function:
+
+    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 7
+
+    This ensures that new items are created with the required number of columns
+    and inserted at a valid position in the internal \c childItems list.
+    Items are removed with the \c removeChildren() function:
+
+    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 10
+
+    As discussed above, the functions for inserting and removing columns are
+    used differently to those for inserting and removing child items because
+    they are expected to be called on every item in the tree. We do this by
+    recursively calling this function on each child of the item:
+
+    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 8
+
+    \section1 TreeModel Class Definition
+
+    The \c TreeModel class provides an implementation of the QAbstractItemModel
+    class, exposing the necessary interface for a model that can be edited and
+    resized.
+
+    \snippet examples/itemviews/editabletreemodel/treemodel.h 0
+
+    The constructor and destructor are specific to this model.
+
+    \snippet examples/itemviews/editabletreemodel/treemodel.h 1
+
+    Read-only tree models only need to provide the above functions. The
+    following public functions provide support for editing and resizing:
+
+    \snippet examples/itemviews/editabletreemodel/treemodel.h 2
+
+    To simplify this example, the data exposed by the model is organized into
+    a data structure by the model's \l{TreeModel::setupModelData}{setupModelData()}
+    function. Many real world models will not process the raw data at all, but
+    simply work with an existing data structure or library API.
+
+    \section1 TreeModel Class Implementation
+
+    The constructor creates a root item and initializes it with the header
+    data supplied:
+
+    \snippet examples/itemviews/editabletreemodel/treemodel.cpp 0
+
+    We call the internal \l{TreeModel::setupModelData}{setupModelData()}
+    function to convert the textual data supplied to a data structure we can
+    use with the model. Other models may be initialized with a ready-made
+    data structure, or use an API to a library that maintains its own data.
+
+    The destructor only has to delete the root item; all child items will
+    be recursively deleted by the \c TreeItem destructor.
+
+    \snippet examples/itemviews/editabletreemodel/treemodel.cpp 1
+
+    \target TreeModel::getItem
+    Since the model's interface to the other model/view components is based
+    on model indexes, and the internal data structure is item-based, many of
+    the functions implemented by the model need to be able to convert any
+    given model index to its corresponding item. For convenience and
+    consistency, we have defined a \c getItem() function to perform this
+    repetitive task:
+
+    \snippet examples/itemviews/editabletreemodel/treemodel.cpp 4
+
+    This function assumes that each model index it is passed corresponds to
+    a valid item in memory. If the index is invalid, or its internal pointer
+    does not refer to a valid item, the root item is returned instead.
+
+    The model's \c rowCount() implementation is simple: it first uses the
+    \c getItem() function to obtain the relevant item, then returns the
+    number of children it contains:
+
+    \snippet examples/itemviews/editabletreemodel/treemodel.cpp 8
+
+    By contrast, the \c columnCount() implementation does not need to look
+    for a particular item because all items are defined to have the same
+    number of columns associated with them.
+
+    \snippet examples/itemviews/editabletreemodel/treemodel.cpp 2
+
+    As a result, the number of columns can be obtained directly from the root
+    item.
+
+    To enable items to be edited and selected, the \c flags() function needs
+    to be implemented so that it returns a combination of flags that includes
+    the Qt::ItemIsEditable and Qt::ItemIsSelectable flags as well as
+    Qt::ItemIsEnabled:
+
+    \snippet examples/itemviews/editabletreemodel/treemodel.cpp 3
+
+    \target TreeModel::index
+    The model needs to be able to generate model indexes to allow other
+    components to request data and information about its structure. This task
+    is performed by the \c index() function, which is used to obtain model
+    indexes corresponding to children of a given parent item:
+
+    \snippet examples/itemviews/editabletreemodel/treemodel.cpp 5
+
+    In this model, we only return model indexes for child items if the parent
+    index is invalid (corresponding to the root item) or if it has a zero
+    column number.
+
+    We use the custom \l{TreeModel::getItem}{getItem()} function to obtain
+    a \c TreeItem instance that corresponds to the model index supplied, and
+    request its child item that corresponds to the specified row.
+
+    \snippet examples/itemviews/editabletreemodel/treemodel.cpp 6
+
+    Since each item contains information for an entire row of data, we create
+    a model index to uniquely identify it by calling
+    \l{QAbstractItemModel::}{createIndex()} it with the row and column numbers
+    and a pointer to the item. In the \l{TreeModel::data}{data()} function,
+    we will use the item pointer and column number to access the data
+    associated with the model index; in this model, the row number is not
+    needed to identify data.
+
+    \target TreeModel::parent
+    The \c parent() function supplies model indexes for parents of items
+    by finding the corresponding item for a given model index, using its
+    \l{TreeItem::parent}{parent()} function to obtain its parent item,
+    then creating a model index to represent the parent. (See
+    \l{Relating-items-using-model-indexes}{the above diagram}).
+
+    \snippet examples/itemviews/editabletreemodel/treemodel.cpp 7
+
+    Items without parents, including the root item, are handled by returning
+    a null model index. Otherwise, a model index is created and returned as
+    in the \l{TreeModel::index}{index()} function, with a suitable row number,
+    but with a zero column number to be consistent with the scheme used in
+    the \l{TreeModel::index}{index()} implementation.
+
+    \target TreeModel::data
+    \target TreeModel::setupModelData
+
+*/
diff --git a/doc/src/examples/elasticnodes.qdoc b/doc/src/examples/elasticnodes.qdoc
new file mode 100644
index 0000000000..90f2f016fa
--- /dev/null
+++ b/doc/src/examples/elasticnodes.qdoc
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example graphicsview/elasticnodes
+    \title Elastic Nodes Example
+
+    This GraphicsView example shows how to implement edges between nodes in a graph.
+
+    \image elasticnodes-example.png
+*/
diff --git a/doc/src/examples/extension.qdoc b/doc/src/examples/extension.qdoc
new file mode 100644
index 0000000000..8a0ca3a20c
--- /dev/null
+++ b/doc/src/examples/extension.qdoc
@@ -0,0 +1,153 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example dialogs/extension
+    \title Extension Example
+
+    The Extension example shows how to add an extension to a QDialog
+    using the QAbstractButton::toggled() signal and the
+    QWidget::setVisible() slot.
+
+    \image extension-example.png Screenshot of the Extension example
+
+    The Extension application is a dialog that allows the user to
+    perform a simple search as well as a more advanced search.
+
+    The simple search has two options: \gui {Match case} and \gui
+    {Search from start}. The advanced search options include the
+    possibilities to search for \gui {Whole words}, \gui {Search
+    backward} and \gui {Search selection}. Only the simple search is
+    visible when the application starts. The advanced search options
+    are located in the application's extension part, and can be made
+    visible by pressing the \gui More button:
+
+    \image extension_more.png Screenshot of the Extension example
+
+    \section1 FindDialog Class Definition
+
+    The \c FindDialog class inherits QDialog. The QDialog class is the
+    base class of dialog windows. A dialog window is a top-level
+    window mostly used for short-term tasks and brief communications
+    with the user.
+
+    \snippet examples/dialogs/extension/finddialog.h 0
+
+    The \c FindDialog widget is the main application widget, and
+    displays the application's search options and controlling
+    buttons.
+
+    In addition to a constructor, we declare the several child
+    widgets: We need a QLineEdit with an associated QLabel to let the
+    user type a word to search for, we need several  \l
+    {QCheckBox}{QCheckBox}es to facilitate the search options, and we
+    need three \l {QPushButton}{QPushButton}s: the \gui Find button to
+    start a search, the \gui More button to enable an advanced search,
+    and the \gui Close button to exit the application. Finally, we
+    need a QWidget representing the application's extension part.
+
+    \section1 FindDialog Class Implementation
+
+    In the constructor we first create the standard child widgets for
+    the simple search: the QLineEdit with the associated QLabel, two
+    of the \l {QCheckBox}{QCheckBox}es and all the \l
+    {QPushButton}{QPushButton}s.
+
+    \snippet examples/dialogs/extension/finddialog.cpp 0
+
+    We give the options and buttons a shortcut key using the &
+    character. In the \gui {Find what} option's case, we also need to
+    use the QLabel::setBuddy() function to make the shortcut key work
+    as expected; then, when the user presses the shortcut key
+    indicated by the label, the keyboard focus is transferred to the
+    label's buddy widget, the QLineEdit.
+
+    We set the \gui Find button's default property to true, using the
+    QPushButton::setDefault() function. Then the push button will be
+    pressed if the user presses the Enter (or Return) key. Note that a
+    QDialog can only have one default button.
+
+    \snippet examples/dialogs/extension/finddialog.cpp 2
+
+    Then we create the extension widget, and the \l
+    {QCheckBox}{QCheckBox}es associated with the advanced search
+    options.
+
+    \snippet examples/dialogs/extension/finddialog.cpp 3
+
+    Now that the extension widget is created, we can connect the \gui
+    More button's \l{QAbstractButton::toggled()}{toggled()} signal to
+    the extension widget's \l{QWidget::setVisible()}{setVisible()} slot.
+
+    The QAbstractButton::toggled() signal is emitted whenever a
+    checkable button changes its state. The signal's argument is true
+    if the button is checked, or false if the button is unchecked. The
+    QWidget::setVisible() slot sets the widget's visible status. If
+    the status is true the widget is shown, otherwise the widget is
+    hidden.
+
+    Since we made the \gui More button checkable when we created it,
+    the connection makes sure that the extension widget is shown
+    depending on the state of \gui More button.
+
+    We also connect the \gui Close button to the QWidget::close()
+    slot, and we put the checkboxes associated with the advanced
+    search options into a layout we install on the extension widget.
+
+    \snippet examples/dialogs/extension/finddialog.cpp 4
+
+    Before we create the main layout, we create several child layouts
+    for the widgets: First we allign the QLabel ans its buddy, the
+    QLineEdit, using a QHBoxLayout. Then we vertically allign the
+    QLabel and QLineEdit with the checkboxes associated with the
+    simple search, using a QVBoxLayout. We also create a QVBoxLayout
+    for the buttons. In the end we lay out the two latter layouts and
+    the extension widget using a QGridLayout.
+
+    \snippet examples/dialogs/extension/finddialog.cpp 5
+
+    Finally, we hide the extension widget using the QWidget::hide()
+    function, making the application only show the simple search
+    options when it starts. When the user wants to access the advanced
+    search options, the dialog only needs to change the visibility of
+    the extension widget. Qt's layout management takes care of the
+    dialog's appearance.
+*/
diff --git a/doc/src/examples/fetchmore.qdoc b/doc/src/examples/fetchmore.qdoc
new file mode 100644
index 0000000000..5434098506
--- /dev/null
+++ b/doc/src/examples/fetchmore.qdoc
@@ -0,0 +1,84 @@
+/*!
+    \example itemviews/fetchmore
+    \title Fetch More Example
+
+    The Fetch More example shows how two add items to an item view
+    model on demand.
+
+    \image fetchmore-example.png
+
+    The user of the example can enter a directory in the \gui
+    Directory line edit. The contents of the directory will
+    be listed in the list view below.
+
+    When you have large - or perhaps even infinite - data sets, you
+    will need to add items to the model in batches, and preferably only
+    when the items are needed by the view (i.e., when they are visible
+    in the view).
+
+    In this example, we implement \c FileListModel - an item view
+    model containing the entries of a directory. We also have \c
+    Window, which sets up the GUI and feeds the model with
+    directories.
+
+    Let's take a tour of \c {FileListModel}'s code.
+
+    \section1 FileListModel Class Definition
+
+    The \c FileListModel inherits QAbstractListModel and contains the
+    contents of a directory. It will add items to itself only when
+    requested to do so by the view.
+
+    \snippet examples/itemviews/fetchmore/filelistmodel.h 0
+
+    The secret lies in the reimplementation of
+    \l{QAbstractItemModel::}{fetchMore()} and
+    \l{QAbstractItemModel::}{canFetchMore()} from QAbstractItemModel.
+    These functions are called by the item view when it needs more
+    items. 
+
+    The \c setDirPath() function sets the directory the model will
+    work on. We emit \c numberPopulated() each time we add a batch of
+    items to the model.
+
+    We keep all directory entries in \c fileList. \c fileCount is the
+    number of items that have been added to the model.
+
+    \section1 FileListModel Class Implementation
+
+    We start by checking out the \c setDirPath().
+
+    \snippet examples/itemviews/fetchmore/filelistmodel.cpp 0
+
+    We use a QDir to get the contents of the directory. We need to
+    inform QAbstractItemModel that we want to remove all items - if
+    any - from the model.
+
+    \snippet examples/itemviews/fetchmore/filelistmodel.cpp 1
+
+    The \c canFetchMore() function is called by the view when it needs
+    more items. We return true if there still are entries that we have
+    not added to the model; otherwise, we return false.
+
+    And now, the \c fetchMore() function itself:
+
+    \snippet examples/itemviews/fetchmore/filelistmodel.cpp 2
+
+    We first calculate the number of items to fetch.
+    \l{QAbstractItemModel::}{beginInsertRows()} and
+    \l{QAbstractItemModel::}{endInsertRows()} are mandatory for
+    QAbstractItemModel to keep up with the row insertions. Finally, we
+    emit \c numberPopulated(), which is picked up by \c Window.
+
+    To complete the tour, we also look at \c rowCount() and \c data().
+
+    \snippet examples/itemviews/fetchmore/filelistmodel.cpp 4
+
+    Notice that the row count is only the items we have added so far,
+    i.e., not the number of entries in the directory.
+
+    In \c data(), we return the appropriate entry from the \c
+    fileList. We also separate the batches with a different background
+    color.
+*/
+
diff --git a/doc/src/examples/filetree.qdoc b/doc/src/examples/filetree.qdoc
new file mode 100644
index 0000000000..e53769cc58
--- /dev/null
+++ b/doc/src/examples/filetree.qdoc
@@ -0,0 +1,421 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \example xmlpatterns/filetree
+  \title File System Example
+
+  This example shows how to use QtXmlPatterns for querying non-XML
+  data that is modeled to look like XML. 
+
+  \tableofcontents
+
+  \section1 Introduction
+
+  The example models your computer's file system to look like XML and
+  allows you to query the file system with XQuery. Suppose we want to
+  find all the \c{cpp} files in the subtree beginning at
+  \c{/filetree}:
+
+  \image filetree_1-example.png
+
+  \section2 The User Inteface
+
+  The example is shown below. First, we use \c{File->Open Directory}
+  (not shown) to select the \c{/filetree} directory. Then we use the
+  combobox on the right to select the XQuery that searches for \c{cpp}
+  files (\c{listCPPFiles.xq}).  Selecting an XQuery runs the query,
+  which in this case traverses the model looking for all the \c{cpp}
+  files. The XQuery text and the query results are shown on the right:
+
+  \image filetree_2-example.png
+
+  Don't be mislead by the XML representation of the \c{/filetree}
+  directory shown on the left. This is not the node model itself but
+  the XML obtained by traversing the node model and outputting it as
+  XML. Constructing and using the custom node model is explained in
+  the code walk-through.
+
+  \section2 Running your own XQueries
+
+  You can write your own XQuery files and run them in the example
+  program. The file \c{xmlpatterns/filetree/queries.qrc} is the \l{The
+  Qt Resource System} {resource file} for this example. It is used in
+  \c{main.cpp} (\c{Q_INIT_RESOURCE(queries);}). It lists the XQuery
+  files (\c{.xq}) that can be selected in the combobox.
+
+  \quotefromfile examples/xmlpatterns/filetree/queries.qrc
+  \printuntil
+
+  To add your own queries to the example's combobox, store your
+  \c{.xq} files in the \c{examples/xmlpatterns/filetree/queries}
+  directory and add them to \c{queries.qrc} as shown above.
+
+  \section1 Code Walk-Through
+
+  The strategy is to create a custom node model that represents the
+  directory tree of the computer's file system. That tree structure is
+  non-XML data. The custom node model must have the same callback
+  interface as the XML node models that the QtXmlPatterns query engine
+  uses to execute queries. The query engine can then traverse the
+  custom node model as if it were traversing the node model built from
+  an XML document.
+
+  The required callback interface is in QAbstractXmlNodeModel, so we
+  create a custom node model by subclassing QAbstractXmlNodeModel and
+  providing implementations for its pure virtual functions. For many
+  cases, the implementations of several of the virtual functions are
+  always the same, so QtXmlPatterns also provides QSimpleXmlNodeModel,
+  which subclasses QAbstractXmlNodeModel and provides implementations
+  for the callback functions that you can ignore. By subclassing
+  QSimpleXmlNodeModel instead of QAbstractXmlNodeModel, you can reduce
+  development time.
+
+  \section2 The Custom Node Model Class: FileTree
+
+  The custom node model for this example is class \c{FileTree}, which
+  is derived from QSimpleXmlNodeModel. \c{FileTree} implements all the
+  callback functions that don't have standard implementations in
+  QSimpleXmlNodeModel. When you implement your own custom node model,
+  you must provide implementations for these callback functions:
+
+  \snippet examples/xmlpatterns/filetree/filetree.h 0
+  \snippet examples/xmlpatterns/filetree/filetree.h 1
+
+  The \c{FileTree} class declares four data members:
+  
+  \snippet examples/xmlpatterns/filetree/filetree.h 2
+
+  The QVector \c{m_fileInfos} will contain the node model. Each
+  QFileInfo in the vector will represent a file or a directory in the
+  file system. At this point it is instructive to note that although
+  the node model class for this example (\c{FileTree}) actually builds
+  and contains the custom node model, building the custom node model
+  isn't always required. The node model class for the \l{QObject XML
+  Model Example} {QObject node model example} does not build its node
+  model but instead uses an already existing QObject tree as its node
+  model and just implements the callback interface for that already
+  existing data structure. In this file system example, however,
+  although we have an already existing data structure, i.e. the file
+  system, that data structure is not in memory and is not in a form we
+  can use. So we must build an analog of the file system in memory
+  from instances of QFileInfo, and we use that analog as the custom
+  node model.
+  
+  The two sets of flags, \c{m_filterAllowAll} and \c{m_sortFlags},
+  contain OR'ed flags from QDir::Filters and QDir::SortFlags
+  respectively. They are set by the \c{FileTree} constructor and used
+  in calls to QDir::entryInfoList() for getting the child list for a
+  directory node, i.e. a QFileInfoList containing the file and
+  directory nodes for all the immediate children of a directory.
+
+  The QVector \c{m_names} is an auxiliary component of the node
+  model. It holds the XML element and attribute names (QXmlName) for
+  all the node types that will be found in the node model. \c{m_names}
+  is indexed by the enum \c{FileTree::Type}, which specifies the node
+  types:
+
+  \target Node_Type
+  \snippet examples/xmlpatterns/filetree/filetree.h 4
+
+  \c{Directory} and \c{File} will represent the XML element nodes for
+  directories and files respectively, and the other enum values will
+  represent the XML attribute nodes for a file's path, name, suffix,
+  its size in bytes, and its mime type. The \c{FileTree} constructor
+  initializes \c{m_names} with an appropriate QXmlName for each
+  element and attribute type:
+
+  \snippet examples/xmlpatterns/filetree/filetree.cpp 2
+
+  Note that the constructor does \e{not} pre-build the entire node
+  model. Instead, the node model is built \e{incrementally} as the
+  query engine evaluates a query. To see how the query engine causes
+  the node model to be built incrementally, see \l{Building And
+  Traversing The Node Model}. To see how the query engine accesses the
+  node model, see \l{Accessing the node model}. See also: \l{Node
+  Model Building Strategy}.
+
+  \section3 Accessing The Node Model
+
+  Since the node model is stored outside the query engine in the
+  \c{FileTree} class, the query engine knows nothing about it and can
+  only access it by calling functions in the callback interface. When
+  the query engine calls any callback function to access data in the
+  node model, it passes a QXmlNodeModelIndex to identify the node in
+  the node model that it wants to access.  Hence all the virtual
+  functions in the callback interface use a QXmlNodeModelIndex to
+  uniquely identify a node in the model.
+
+  We use the index of a QFileInfo in \c{m_fileInfos} to uniquely
+  identify a node in the node model. To get the QXmlNodeModelIndex for
+  a QFileInfo, the class uses the private function \c{toNodeIndex()}:
+
+  \target main toNodeIndex
+  \snippet examples/xmlpatterns/filetree/filetree.cpp 1
+
+  It searches the \c{m_fileInfos} vector for a QFileInfo that matches
+  \c{fileInfo}. If a match is found, its array index is passed to
+  QAbstractXmlNodeModel::createIndex() as the \c data value for the
+  QXmlNodeIndex. If no match is found, the unmatched QFileInfo is
+  appended to the vector, so this function is also doing the actual
+  incremental model building (see \l{Building And Traversing The Node
+  Model}).
+
+  Note that \c{toNodeIndex()} gets a \l{Node_Type} {node type} as the
+  second parameter, which it just passes on to
+  \l{QAbstractXmlNodeModel::createIndex()} {createIndex()} as the
+  \c{additionalData} value. Logically, this second parameter
+  represents a second dimension in the node model, where the first
+  dimension represents the \e element nodes, and the second dimension
+  represents each element's attribute nodes. The meaning is that each
+  QFileInfo in the \c{m_fileInfos} vector can represent an \e{element}
+  node \e{and} one or more \e{attribute} nodes. In particular, the
+  QFileInfo for a file will contain the values for the attribute nodes
+  path, name, suffix, size, and mime type (see
+  \c{FileTree::attributes()}). Since the attributes are contained in
+  the QFileInfo of the file element, there aren't actually any
+  attribute nodes in the node model. Hence, we can use a QVector for
+  \c{m_fileInfos}.
+
+  A convenience overloading of \l{toNodeIndex of convenience}
+  {toNodeIndex()} is also called in several places, wherever it is
+  known that the QXmlNodeModelIndex being requested is for a directory
+  or a file and not for an attribute. The convenience function takes
+  only the QFileInfo parameter and calls the other \l{main toNodeIndex}
+  {toNodeIndex()}, after obtaining either the Directory or File node
+  type directly from the QFileInfo:
+
+  \target toNodeIndex of convenience
+  \snippet examples/xmlpatterns/filetree/filetree.cpp 0
+
+  Note that the auxiliary vector \c{m_names} is accessed using the
+  \l{Node_Type} {node type}, for example:
+
+  \snippet examples/xmlpatterns/filetree/filetree.cpp 3
+
+  Most of the virtual functions in the callback interface are as
+  simple as the ones described so far, but the callback function used
+  for traversing (and building) the node model is more complex.
+
+  \section3 Building And Traversing The Node Model 
+
+  The node model in \c{FileTree} is not fully built before the query
+  engine begins evaluating the query. In fact, when the query engine
+  begins evaluating its first query, the only node in the node model
+  is the one representing the root directory for the selected part of
+  the file system. See \l{The UI Class: MainWindow} below for details
+  about how the UI triggers creation of the model.
+
+  The query engine builds the node model incrementally each time it
+  calls the \l{next node on axis} {nextFromSimpleAxis()} callback
+  function, as it traverses the node model to evaluate a query. Thus
+  the query engine only builds the region of the node model that it
+  needs for evaluating the query.
+
+  \l{next node on axis} {nextFromSimpleAxis()} takes an
+  \l{QAbstractXmlNodeModel::SimpleAxis} {axis identifier} and a
+  \l{QXmlNodeModelIndex} {node identifier} as parameters. The
+  \l{QXmlNodeModelIndex} {node identifier} represents the \e{context
+  node} (i.e. the query engine's current location in the model), and
+  the \l{QAbstractXmlNodeModel::SimpleAxis} {axis identifier}
+  represents the direction we want to move from the context node. The
+  function finds the appropriate next node and returns its
+  QXmlNodeModelIndex.
+
+  \l{next node on axis} {nextFromSimpleAxis()} is where most of the
+  work of implementing a custom node model will be required. The
+  obvious way to do it is to use a switch statement with a case for
+  each \l{QAbstractXmlNodeModel::SimpleAxis} {axis}.
+
+  \target next node on axis
+  \snippet examples/xmlpatterns/filetree/filetree.cpp 4
+
+  The first thing this function does is call \l{to file info}
+  {toFileInfo()} to get the QFileInfo of the context node. The use of
+  QVector::at() here is guaranteed to succeed because the context node
+  must already be in the node model, and hence must have a QFileInfo
+  in \c{m_fileInfos}.
+
+  \target to file info
+  \snippet examples/xmlpatterns/filetree/filetree.cpp 6
+
+  The \l{QAbstractXmlNodeModel::Parent} {Parent} case looks up the
+  context node's parent by constructing a QFileInfo from the context
+  node's \l{QFileInfo::absoluteFilePath()} {path} and passing it to
+  \l{main toNodeIndex} {toNodeIndex()} to find the QFileInfo in
+  \c{m_fileInfos}.
+
+  The \l{QAbstractXmlNodeModel::FirstChild} {FirstChild} case requires
+  that the context node must be a directory, because a file doesn't
+  have children. If the context node is not a directory, a default
+  constructed QXmlNodeModelIndex is returned. Otherwise,
+  QDir::entryInfoList() constructs a QFileInfoList of the context
+  node's children. The first QFileInfo in the list is passed to
+  \l{toNodeIndex of convenience} {toNodeIndex()} to get its
+  QXmlNodeModelIndex. Note that this will add the child to the node
+  model, if it isn't in the model yet.
+
+  The \l{QAbstractXmlNodeModel::PreviousSibling} {PreviousSibling} and
+  \l{QAbstractXmlNodeModel::NextSibling} {NextSibling} cases call the
+  \l{nextSibling helper} {nextSibling() helper function}. It takes the
+  QXmlNodeModelIndex of the context node, the QFileInfo of the context
+  node, and an offest of +1 or -1. The context node is a child of some
+  parent, so the function gets the parent and then gets the child list
+  for the parent. The child list is searched to find the QFileInfo of
+  the context node. It must be there. Then the offset is applied, -1
+  for the previous sibling and +1 for the next sibling. The resulting
+  index is passed to \l{toNodeIndex of convenience} {toNodeIndex()} to
+  get its QXmlNodeModelIndex. Note again that this will add the
+  sibling to the node model, if it isn't in the model yet.
+
+  \target nextSibling helper
+  \snippet examples/xmlpatterns/filetree/filetree.cpp 5
+
+  \section2 The UI Class: MainWindow
+
+  The example's UI is a conventional Qt GUI application inheriting
+  QMainWindow and the Ui_MainWindow base class generated by 
+  \l{Qt Designer Manual} {Qt Designer}.
+
+  \snippet examples/xmlpatterns/filetree/mainwindow.h 0
+
+  It contains the custom node model (\c{m_fileTree}) and an instance
+  of QXmlNodeModelIndex (\c{m_fileNode}) used for holding the node
+  index for the root of the file system subtree. \c{m_fileNode} will
+  be bound to a $variable in the XQuery to be evaluated.
+
+  Two actions of interest are handled by slot functions: \l{Selecting
+  A Directory To Model} and \l{Selecting And Running An XQuery}.
+
+  \section3 Selecting A Directory To Model
+
+  The user selects \c{File->Open Directory} to choose a directory to
+  be loaded into the custom node model. Choosing a directory signals
+  the \c{on_actionOpenDirectory_triggered()} slot:
+
+  \snippet examples/xmlpatterns/filetree/mainwindow.cpp 1
+
+  The slot function simply calls the private function
+  \c{loadDirectory()} with the path of the chosen directory:
+
+  \target the standard code pattern
+  \snippet examples/xmlpatterns/filetree/mainwindow.cpp 4
+
+  \c{loadDirectory()} demonstrates a standard code pattern for using
+  QtXmlPatterns programatically. First it gets the node model index
+  for the root of the selected directory. Then it creates an instance
+  of QXmlQuery and calls QXmlQuery::bindVariable() to bind the node
+  index to the XQuery variable \c{$fileTree}. It then calls
+  QXmlQuery::setQuery() to load the XQuery text.
+
+  \note QXmlQuery::bindVariable() must be called \e before calling
+  QXmlQuery::setQuery(), which loads and parses the XQuery text and
+  must have access to the variable binding as the text is parsed.
+
+  The next lines create an output device for outputting the query
+  result, which is then used to create a QXmlFormatter to format the
+  query result as XML. QXmlQuery::evaluateTo() is called to run the
+  query, and the formatted XML output is displayed in the left panel
+  of the UI window.
+
+  Finally, the private function \l{Selecting And Running An XQuery}
+  {evaluateResult()} is called to run the currently selected XQuery
+  over the custom node model.
+
+  \note As described in \l{Building And Traversing The Node Model},
+  the \c FileTree class wants to build the custom node model
+  incrementally as it evaluates the XQuery. But, because the
+  \c{loadDirectory()} function runs the \c{wholeTree.xq} XQuery, it
+  actually builds the entire node model anyway. See \l{Node Model
+  Building Strategy} for a discussion about building your custom node
+  model.
+
+  \section3 Selecting And Running An XQuery
+
+  The user chooses an XQuery from the menu in the combobox on the
+  right. Choosing an XQuery signals the
+  \c{on_queryBox_currentIndexChanged()} slot:
+  
+  \snippet examples/xmlpatterns/filetree/mainwindow.cpp 2
+
+  The slot function opens and loads the query file and then calls the
+  private function \c{evaluateResult()} to run the query:
+  
+  \snippet examples/xmlpatterns/filetree/mainwindow.cpp 3
+
+  \c{evaluateResult()} is a second example of the same code pattern
+  shown in \l{the standard code pattern} {loadDirectory()}. In this
+  case, it runs the XQuery currently selected in the combobox instead
+  of \c{qrc:/queries/wholeTree.xq}, and it outputs the query result to
+  the panel on the lower right of the UI window.
+
+  \section2 Node Model Building Strategy
+
+  We saw that the \l{The Custom Node Model Class: FileTree} {FileTree}
+  tries to build its custom node model incrementally, but we also saw
+  that the \l{the standard code pattern} {MainWindow::loadDirectory()}
+  function in the UI class immediately subverts the incremental build
+  by running the \c{wholeTree.xq} XQuery, which traverses the entire
+  selected directory, thereby causing the entire node model to be
+  built.
+
+  If we want to preserve the incremental build capability of the
+  \c{FileTree} class, we can strip the running of \c{wholeTree.xq} out
+  of \l{the standard code pattern} {MainWindow::loadDirectory()}:
+
+  \snippet examples/xmlpatterns/filetree/mainwindow.cpp 5
+  \snippet examples/xmlpatterns/filetree/mainwindow.cpp 6
+
+  Note, however, that \c{FileTree} doesn't have the capability of
+  deleting all or part of the node model. The node model, once built,
+  is only deleted when the \c{FileTree} instance goes out of scope.
+
+  In this example, each element node in the node model represents a
+  directory or a file in the computer's file system, and each node is
+  represented by an instance of QFileInfo. An instance of QFileInfo is
+  not costly to produce, but you might imagine a node model where
+  building new nodes is very costly. In such cases, the capability to
+  build the node model incrementally is important, because it allows
+  us to only build the region of the model we need for evaluating the
+  query. In other cases, it will be simpler to just build the entire
+  node model. 
+
+*/
diff --git a/doc/src/examples/findfiles.qdoc b/doc/src/examples/findfiles.qdoc
new file mode 100644
index 0000000000..db41f43a33
--- /dev/null
+++ b/doc/src/examples/findfiles.qdoc
@@ -0,0 +1,263 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example dialogs/findfiles
+    \title Find Files Example
+
+    The Find Files example shows how to use QProgressDialog to provide
+    feedback on the progress of a slow operation. The example also
+    shows how to use QFileDialog to facilitate browsing, how to use
+    QTextStream's streaming operators to read a file, and how to use
+    QTableWidget to provide standard table display facilities for
+    applications. In addition, files can be opened using the
+    QDesktopServices class.
+
+    \image findfiles-example.png Screenshot of the Find Files example
+
+    With the Find Files application the user can search for files in a
+    specified directory, matching a specified file name (using wild
+    cards if appropiate) and containing a specified text.
+
+    The user is provided with a \gui Browse option, and the result of
+    the search is displayed in a table with the names of the files
+    found and their sizes. In addition the application provides a
+    total count of the files found.
+
+    \section1 Window Class Definition
+
+    The \c Window class inherits QWidget, and is the main application
+    widget. It shows the search options, and displays the search
+    results.
+
+    \snippet examples/dialogs/findfiles/window.h 0
+
+    We need two private slots: The \c browse() slot is called whenever
+    the user wants to browse for a directory to search in, and the \c
+    find() slot is called whenever the user requests a search to be
+    performed by pressing the \gui Find button.
+
+    In addition we declare several private functions: We use the \c
+    findFiles() function to search for files matching the user's
+    specifications, we call the \c showFiles() function to display the
+    results, and we use \c createButton(), \c createComboBox() and \c
+    createFilesTable() when we are constructing the widget.
+
+    \section1 Window Class Implementation
+
+    In the constructor we first create the application's widgets.
+
+    \snippet examples/dialogs/findfiles/window.cpp 0
+
+    We create the application's buttons using the private \c
+    createButton() function. Then we create the comboboxes associated
+    with the search specifications, using the private \c
+    createComboBox() function. We also create the application's labels
+    before we use the private \c createFilesTable() function to create
+    the table displaying the search results.
+
+    \snippet examples/dialogs/findfiles/window.cpp 1
+
+    Then we add all the widgets to a main layout using QGridLayout. We
+    have, however, put the \c Find and \c Quit buttons and a
+    stretchable space in a separate QHBoxLayout first, to make the
+    buttons appear in the \c Window widget's bottom right corner.
+
+    \snippet examples/dialogs/findfiles/window.cpp 2
+
+    The \c browse() slot presents a file dialog to the user, using the
+    QFileDialog class. QFileDialog enables a user to traverse the file
+    system in order to select one or many files or a directory. The
+    easiest way to create a QFileDialog is to use the convenience
+    static functions.
+
+    Here we use the static QFileDialog::getExistingDirectory()
+    function which returns an existing directory selected by the
+    user. Then we display the directory in the directory combobox
+    using the QComboBox::addItem() function, and updates the current
+    index.
+
+    QComboBox::addItem() adds an item to the combobox with the given
+    text (if it is not already present in the list), and containing
+    the specified userData. The item is appended to the list of
+    existing items.
+
+    \snippet examples/dialogs/findfiles/window.cpp 3
+
+    The \c find() slot is called whenever the user requests a new
+    search by pressing the \gui Find button.
+
+    First we eliminate any previous search results by setting the
+    table widgets row count to zero. Then we retrieve the
+    specified file name, text and directory path from the respective
+    comboboxes.
+
+    \snippet examples/dialogs/findfiles/window.cpp 4
+
+    We use the directory's path to create a QDir; the QDir class
+    provides access to directory structures and their contents. We
+    create a list of the files (contained in the newly created QDir)
+    that match the specified file name. If the file name is empty
+    the list will contain all the files in the directory.
+
+    Then we search through all the files in the list, using the private
+    \c findFiles() function, eliminating the ones that don't contain
+    the specified text. And finally, we display the results using the
+    private \c showFiles() function.
+
+    If the user didn't specify any text, there is no reason to search
+    through the files, and we display the results immediately.
+
+    \image findfiles_progress_dialog.png Screenshot of the Progress Dialog
+
+    \snippet examples/dialogs/findfiles/window.cpp 5
+
+    In the private \c findFiles() function we search through a list of
+    files, looking for the ones that contain a specified text. This
+    can be a very slow operation depending on the number of files as
+    well as their sizes. In case there are a large number of files, or
+    there exists some large files on the list, we provide a
+    QProgressDialog.
+
+    The QProgressDialog class provides feedback on the progress of a
+    slow operation. It is used to give the user an indication of how
+    long an operation is going to take, and to demonstrate that the
+    application has not frozen. It can also give the user an
+    opportunity to abort the operation.
+
+    \snippet examples/dialogs/findfiles/window.cpp 6
+
+    We run through the files, one at a time, and for each file we
+    update the QProgressDialog value. This property holds the current
+    amount of progress made. We also update the progress dialog's
+    label.
+
+    Then we call the QCoreApplication::processEvents() function using
+    the QApplication object. In this way we interleave the display of
+    the progress made with the process of searching through the files
+    so the application doesn't appear to be frozen.
+
+    The QApplication class manages the GUI application's control flow
+    and main settings. It contains the main event loop, where all
+    events from the window system and other sources are processed and
+    dispatched. QApplication inherits QCoreApplication.  The
+    QCoreApplication::processEvents() function processes all pending
+    events according to the specified QEventLoop::ProcessEventFlags
+    until there are no more events to process. The default flags are
+    QEventLoop::AllEvents.
+
+    \snippet examples/dialogs/findfiles/window.cpp 7
+
+    After updating the QProgressDialog, we create a QFile using the
+    QDir::absoluteFilePath() function which returns the absolute path
+    name of a file in the directory. We open the file in read-only
+    mode, and read one line at a time using QTextStream.
+
+    The QTextStream class provides a convenient interface for reading
+    and writing text. Using QTextStream's streaming operators, you can
+    conveniently read and write words, lines and numbers.
+
+    For each line we read we check if the QProgressDialog has been
+    canceled. If it has, we abort the operation, otherwise we check if
+    the line contains the specified text. When we find the text within
+    one of the files, we add the file's name to a list of found files
+    that contain the specified text, and start searching a new file.
+
+    Finally, we return the list of the files found.
+
+    \snippet examples/dialogs/findfiles/window.cpp 8
+
+    Both the \c findFiles() and \c showFiles() functions are called from
+    the \c find() slot. In the \c showFiles() function we run through
+    the provided list of file names, adding each file name to the
+    first column in the table widget and retrieving the file's size using
+    QFile and QFileInfo for the second column.
+
+    We also update the total number of files found.
+
+    \snippet examples/dialogs/findfiles/window.cpp 9
+
+    The private \c createButton() function is called from the
+    constructor. We create a QPushButton with the provided text,
+    connect it to the provided slot, and return a pointer to the
+    button.
+
+    \snippet examples/dialogs/findfiles/window.cpp 10
+
+    The private \c createComboBox() function is also called from the
+    contructor. We create a QComboBox with the given text, and make it
+    editable.
+
+    When the user enters a new string in an editable combobox, the
+    widget may or may not insert it, and it can insert it in several
+    locations, depending on the QComboBox::InsertPolicy. The default
+    policy is is QComboBox::InsertAtBottom.
+
+    Then we add the provided text to the combobox, and specify the
+    widget's size policies, before we return a pointer to the
+    combobox.
+
+    \snippet examples/dialogs/findfiles/window.cpp 11
+
+    The private \c createFilesTable() function is called from the
+    constructor. In this function we create the QTableWidget that
+    will display the search results. We set its horizontal headers and
+    their resize mode.
+
+    QTableWidget inherits QTableView which provides a default
+    model/view implementation of a table view. The
+    QTableView::horizontalHeader() function returns the table view's
+    horizontal header as a QHeaderView. The QHeaderView class provides
+    a header row or header column for item views, and the
+    QHeaderView::setResizeMode() function sets the constraints on how
+    the section in the header can be resized.
+
+    Finally, we hide the QTableWidget's vertical headers using the
+    QWidget::hide() function, and remove the default grid drawn for
+    the table using the QTableView::setShowGrid() function.
+
+    \snippet examples/dialogs/findfiles/window.cpp 12
+
+    The \c openFileOfItem() slot is invoked when the user double
+    clicks on a cell in the table. The QDesktopServices::openUrl()
+    knows how to open a file given the file name.
+*/
+
diff --git a/doc/src/examples/flowlayout.qdoc b/doc/src/examples/flowlayout.qdoc
new file mode 100644
index 0000000000..557ba39a0e
--- /dev/null
+++ b/doc/src/examples/flowlayout.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example layouts/flowlayout
+    \title Flow Layout Example
+
+    The Flow Layout example demonstrates a custom layout that arranges child widgets from
+    left to right and top to bottom in a top-level widget.
+
+    \image flowlayout-example.png
+*/
diff --git a/doc/src/examples/fontsampler.qdoc b/doc/src/examples/fontsampler.qdoc
new file mode 100644
index 0000000000..1fbb8794d6
--- /dev/null
+++ b/doc/src/examples/fontsampler.qdoc
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \example painting/fontsampler
+  \title Font Sampler Example
+
+  The Font Sampler example shows how to preview and print multi-page documents.
+
+  \image fontsampler-example.png
+*/
diff --git a/doc/src/examples/formextractor.qdoc b/doc/src/examples/formextractor.qdoc
new file mode 100644
index 0000000000..b98f5bd90a
--- /dev/null
+++ b/doc/src/examples/formextractor.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example webkit/formextractor
+    \title Form Extractor Example
+
+    The Form Extractor example shows how to use QWebFrame with JavaScript to
+    extract form data.
+
+    \image formextractor-example.png
+
+*/
diff --git a/doc/src/examples/fortuneclient.qdoc b/doc/src/examples/fortuneclient.qdoc
new file mode 100644
index 0000000000..cbdd16424b
--- /dev/null
+++ b/doc/src/examples/fortuneclient.qdoc
@@ -0,0 +1,174 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example network/fortuneclient
+    \title Fortune Client Example
+
+    The Fortune Client example shows how to create a client for a simple
+    network service using QTcpSocket. It is intended to be run alongside the
+    \l{network/fortuneserver}{Fortune Server} example or
+    the \l{network/threadedfortuneserver}{Threaded Fortune Server} example.
+
+    \image fortuneclient-example.png Screenshot of the Fortune Client example
+
+    This example uses a simple QDataStream-based data transfer protocol to
+    request a line of text from a fortune server (from the
+    \l{network/fortuneserver}{Fortune Server} example). The client requests a
+    fortune by simply connecting to the server. The server then responds with
+    a 16-bit (quint16) integer containing the length of the fortune text,
+    followed by a QString.
+
+    QTcpSocket supports two general approaches to network programming:
+
+    \list
+
+    \o \e{The asynchronous (non-blocking) approach.} Operations are scheduled
+    and performed when control returns to Qt's event loop. When the operation
+    is finished, QTcpSocket emits a signal. For example,
+    QTcpSocket::connectToHost() returns immediately, and when the connection
+    has been established, QTcpSocket emits
+    \l{QTcpSocket::connected()}{connected()}.
+
+    \o \e{The synchronous (blocking) approach.} In non-GUI and multithreaded
+    applications, you can call the \c waitFor...() functions (e.g.,
+    QTcpSocket::waitForConnected()) to suspend the calling thread until the
+    operation has completed, instead of connecting to signals.
+
+    \endlist
+
+    In this example, we will demonstrate the asynchronous approach. The
+    \l{network/blockingfortuneclient}{Blocking Fortune Client} example
+    illustrates the synchronous approach.
+
+    Our class contains some data and a few private slots:
+
+    \snippet examples/network/fortuneclient/client.h 0
+
+    Other than the widgets that make up the GUI, the data members include a
+    QTcpSocket pointer, a copy of the fortune text currently displayed, and
+    the size of the packet we are currently reading (more on this later).
+
+    The socket is initialized in the Client constructor. We'll pass the main
+    widget as parent, so that we won't have to worry about deleting the
+    socket:
+
+    \snippet examples/network/fortuneclient/client.cpp 0
+    \dots
+    \snippet examples/network/fortuneclient/client.cpp 1
+
+    The only QTcpSocket signals we need in this example are
+    QTcpSocket::readyRead(), signifying that data has been received, and
+    QTcpSocket::error(), which we will use to catch any connection errors:
+
+    \dots
+    \snippet examples/network/fortuneclient/client.cpp 3
+    \dots
+    \snippet examples/network/fortuneclient/client.cpp 5
+
+    Clicking the \gui{Get Fortune} button will invoke the \c
+    requestNewFortune() slot:
+
+    \snippet examples/network/fortuneclient/client.cpp 6
+
+    In this slot, we initialize \c blockSize to 0, preparing to read a new block
+    of data.  Because we allow the user to click \gui{Get Fortune} before the
+    previous connection finished closing, we start off by aborting the
+    previous connection by calling QTcpSocket::abort(). (On an unconnected
+    socket, this function does nothing.) We then proceed to connecting to the
+    fortune server by calling QTcpSocket::connectToHost(), passing the
+    hostname and port from the user interface as arguments.
+
+    As a result of calling \l{QTcpSocket::connectToHost()}{connectToHost()},
+    one of two things can happen:
+
+    \list
+    \o \e{The connection is established.} In this case, the server will send us a
+    fortune. QTcpSocket will emit \l{QTcpSocket::readyRead()}{readyRead()}
+    every time it receives a block of data.
+
+    \o \e{An error occurs.} We need to inform the user if the connection
+    failed or was broken. In this case, QTcpSocket will emit
+    \l{QTcpSocket::error()}{error()}, and \c Client::displayError() will be
+    called.
+    \endlist
+
+    Let's go through the \l{QTcpSocket::error()}{error()} case first:
+
+    \snippet examples/network/fortuneclient/client.cpp 13
+
+    We pop up all errors in a dialog using
+    QMessageBox::information(). QTcpSocket::RemoteHostClosedError is silently
+    ignored, because the fortune server protocol ends with the server closing
+    the connection.
+
+    Now for the \l{QTcpSocket::readyRead()}{readyRead()} alternative. This
+    signal is connected to \c Client::readFortune():
+
+    \snippet examples/network/fortuneclient/client.cpp 8
+    \codeline
+    \snippet examples/network/fortuneclient/client.cpp 10
+
+    The protocol is based on QDataStream, so we start by creating a stream
+    object, passing the socket to QDataStream's constructor. We then
+    explicitly set the protocol version of the stream to QDataStream::Qt_4_0
+    to ensure that we're using the same version as the fortune server, no
+    matter which version of Qt the client and server use.
+
+    Now, TCP is based on sending a stream of data, so we cannot expect to get
+    the entire fortune in one go. Especially on a slow network, the data can
+    be received in several small fragments. QTcpSocket buffers up all incoming
+    data and emits \l{QTcpSocket::readyRead()}{readyRead()} for every new
+    block that arrives, and it is our job to ensure that we have received all
+    the data we need before we start parsing. The server's response starts
+    with the size of the packet, so first we need to ensure that we can read
+    the size, then we will wait until QTcpSocket has received the full packet.
+
+    \snippet examples/network/fortuneclient/client.cpp 11
+    \codeline
+    \snippet examples/network/fortuneclient/client.cpp 12
+
+    We proceed by using QDataStream's streaming operator to read the fortune
+    from the socket into a QString. Once read, we can call QLabel::setText()
+    to display the fortune.
+
+    \sa {Fortune Server Example}, {Blocking Fortune Client Example}
+*/
diff --git a/doc/src/examples/fortuneserver.qdoc b/doc/src/examples/fortuneserver.qdoc
new file mode 100644
index 0000000000..e6a7f85cd8
--- /dev/null
+++ b/doc/src/examples/fortuneserver.qdoc
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example network/fortuneserver
+    \title Fortune Server Example
+
+    The Fortune Server example shows how to create a server for a simple
+    network service. It is intended to be run alongside the
+    \l{network/fortuneclient}{Fortune Client} example or the the
+    \l{network/blockingfortuneclient}{Blocking Fortune Client} example.
+
+    \image fortuneserver-example.png Screenshot of the Fortune Server example
+
+    This example uses QTcpServer to accept incoming TCP connections, and a
+    simple QDataStream based data transfer protocol to write a fortune to the
+    connecting client (from the \l{network/fortuneclient}{Fortune Client}
+    example), before closing the connection.
+
+    \snippet examples/network/fortuneserver/server.h 0
+
+    The server is implemented using a simple class with only one slot, for
+    handling incoming connections.
+
+    \snippet examples/network/fortuneserver/server.cpp 1
+
+    In its constructor, our Server object calls QTcpServer::listen() to set up
+    a QTcpServer to listen on all addresses, on an arbitrary port. In then
+    displays the port QTcpServer picked in a label, so that user knows which
+    port the fortune client should connect to.
+
+    \snippet examples/network/fortuneserver/server.cpp 2
+
+    Our server generates a list of random fortunes that is can send to
+    connecting clients.
+
+    \snippet examples/network/fortuneserver/server.cpp 3
+
+    When a client connects to our server, QTcpServer will emit
+    QTcpServer::newConnection(). In turn, this will invoke our
+    sendFortune() slot:
+
+    \snippet examples/network/fortuneserver/server.cpp 4
+
+    The purpose of this slot is to select a random line from our list of
+    fortunes, encode it into a QByteArray using QDataStream, and then write it
+    to the connecting socket. This is a common way to transfer binary data
+    using QTcpSocket. First we create a QByteArray and a QDataStream object,
+    passing the bytearray to QDataStream's constructor. We then explicitly set
+    the protocol version of QDataStream to QDataStream::Qt_4_0 to ensure that
+    we can communicate with clients from future versions of Qt. (See
+    QDataStream::setVersion().)
+
+    \snippet examples/network/fortuneserver/server.cpp 6
+
+    At the start of our QByteArray, we reserve space for a 16 bit integer that
+    will contain the total size of the data block we are sending. We continue
+    by streaming in a random fortune. Then we seek back to the beginning of
+    the QByteArray, and overwrite the reserved 16 bit integer value with the
+    total size of the array. By doing this, we provide a way for clients to
+    verify how much data they can expect before reading the whole packet.
+
+    \snippet examples/network/fortuneserver/server.cpp 7
+
+    We then call QTcpServer::newPendingConnection(), which returns the
+    QTcpSocket representing the server side of the connection. By connecting
+    QTcpSocket::disconnected() to QObject::deleteLater(), we ensure that the
+    socket will be deleted after disconnecting.
+
+    \snippet examples/network/fortuneserver/server.cpp 8
+
+    The encoded fortune is written using QTcpSocket::write(), and we finally
+    call QTcpSocket::disconnectFromHost(), which will close the connection
+    after QTcpSocket has finished writing the fortune to the network. Because
+    QTcpSocket works asynchronously, the data will be written after this
+    function returns, and control goes back to Qt's event loop. The socket
+    will then close, which in turn will cause QObject::deleteLater() to delete
+    it.
+
+    \sa {Fortune Client Example}, {Threaded Fortune Server Example}
+ */
diff --git a/doc/src/examples/framebufferobject.qdoc b/doc/src/examples/framebufferobject.qdoc
new file mode 100644
index 0000000000..3220641c96
--- /dev/null
+++ b/doc/src/examples/framebufferobject.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example opengl/framebufferobject
+    \title Framebuffer Object Example
+
+    The Framebuffer Object example demonstrates how to use the
+    QGLFramebufferObject class to render into an off-screen buffer and
+    use the contents as a texture in a QGLWidget.
+
+    \image framebufferobject-example.png
+*/
diff --git a/doc/src/examples/framebufferobject2.qdoc b/doc/src/examples/framebufferobject2.qdoc
new file mode 100644
index 0000000000..721706aecd
--- /dev/null
+++ b/doc/src/examples/framebufferobject2.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example opengl/framebufferobject2
+    \title Framebuffer Object 2 Example
+
+    The Framebuffer Object 2 example demonstrates how to use the
+    QGLFramebufferObject class to render into an off-screen buffer and
+    use the contents as a texture in a QGLWidget.
+
+    \image framebufferobject2-example.png
+*/
diff --git a/doc/src/examples/fridgemagnets.qdoc b/doc/src/examples/fridgemagnets.qdoc
new file mode 100644
index 0000000000..de95b52682
--- /dev/null
+++ b/doc/src/examples/fridgemagnets.qdoc
@@ -0,0 +1,374 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example draganddrop/fridgemagnets
+    \title Fridge Magnets Example
+
+    The Fridge Magnets example shows how to supply more than one type
+    of MIME-encoded data with a drag and drop operation.
+
+    \image fridgemagnets-example.png
+
+    With this application the user can play around with a collection
+    of fridge magnets, using drag and drop to form new sentences from
+    the words on the magnets. The example consists of two classes:
+
+    \list
+        \o \c DragLabel is a custom widget representing one
+           single fridge magnet.
+        \o \c DragWidget provides the main application window.
+    \endlist
+
+    We will first take a look at the \c DragLabel class, then we will
+    examine the \c DragWidget class.
+
+    \section1 DragLabel Class Definition
+
+    Each fridge magnet is represented by an instance of the \c
+    DragLabel class:
+
+    \snippet examples/draganddrop/fridgemagnets/draglabel.h 0
+
+    Each instance of this QLabel subclass will be used to display an
+    pixmap generated from a text string. Since we cannot store both
+    text and a pixmap in a standard label, we declare a private variable
+    to hold the original text, and we define an additional member
+    function to allow it to be accessed.
+
+    \section1 DragLabel Class Implementation
+
+    In the \c DragLabel constructor, we first create a QImage object
+    on which we will draw the fridge magnet's text and frame:
+
+    \snippet examples/draganddrop/fridgemagnets/draglabel.cpp 0
+
+    Its size depends on the current font size, and its format is
+    QImage::Format_ARGB32_Premultiplied; i.e., the image is stored
+    using a premultiplied 32-bit ARGB format (0xAARRGGBB).
+
+    We then construct a font object that uses the application's
+    default font, and set its style strategy. The style strategy tells
+    the font matching algorithm what type of fonts should be used to
+    find an appropriate default family. The QFont::ForceOutline forces
+    the use of outline fonts.
+
+    To draw the text and frame onto the image, we use the QPainter
+    class. QPainter provides highly optimized methods to do most of
+    the drawing GUI programs require. It can draw everything from
+    simple lines to complex shapes like pies and chords. It can also
+    draw aligned text and pixmaps.
+
+    \snippet examples/draganddrop/fridgemagnets/draglabel.cpp 1
+
+    A painter can be activated by passing a paint device to the
+    constructor, or by using the \l{QPainter::}{begin()} method as we
+    do in this example. The \l{QPainter::}{end()} method deactivates
+    it. Note that the latter function is called automatically upon
+    destruction when the painter is actived by its constructor. The
+    QPainter::Antialiasing render hint ensures that the paint engine
+    will antialias the edges of primitives if possible.
+
+    When the painting is done, we convert our image to a pixmap using
+    QPixmap's \l {QPixmap::}{fromImage()} method. This method also
+    takes an optional flags argument, and converts the given image to
+    a pixmap using the specified flags to control the conversion (the
+    flags argument is a bitwise-OR of the Qt::ImageConversionFlags;
+    passing 0 for flags sets all the default options).
+
+    \snippet examples/draganddrop/fridgemagnets/draglabel.cpp 2
+
+    Finally, we set the label's \l{QLabel::pixmap}{pixmap property}
+    and store the label's text for later use.
+
+    \e{Note that setting the pixmap clears any previous content, including
+    any text previously set using QLabel::setText(), and disables
+    the label widget's buddy shortcut, if any.}
+
+    \section1 DragWidget Class Definition
+
+    The \c DragWidget class inherits QWidget, providing support for
+    drag and drop operations:
+
+    \snippet examples/draganddrop/fridgemagnets/dragwidget.h 0
+
+    To make the widget responsive to drag and drop operations, we simply
+    reimplement the \l{QWidget::}{dragEnterEvent()},
+    \l{QWidget::}{dragMoveEvent()} and \l{QWidget::}{dropEvent()} event
+    handlers inherited from QWidget.
+
+    We also reimplement \l{QWidget::}{mousePressEvent()} to make the
+    widget responsive to mouse clicks. This is where we will write code
+    to start drag and drop operations.
+
+    \section1 DragWidget Class Implementation
+
+    In the constructor, we first open the file containing the words on
+    our fridge magnets:
+
+    \snippet examples/draganddrop/fridgemagnets/dragwidget.cpp 0
+
+    QFile is an I/O device for reading and writing text and binary
+    files and resources, and may be used by itself or in combination
+    with QTextStream or QDataStream. We have chosen to read the
+    contents of the file using the QTextStream class that provides a
+    convenient interface for reading and writing text.
+
+    We then create the fridge magnets. As long as there is data (the
+    QTextStream::atEnd() method returns true if there is no more data
+    to be read from the stream), we read one line at a time using
+    QTextStream's \l {QTextStream::}{readLine()} method.
+
+    \snippet examples/draganddrop/fridgemagnets/dragwidget.cpp 1
+
+    For each line, we create a \c DragLabel object using the read line
+    as text, we calculate its position and ensure that it is visible by
+    calling the QWidget::show() method. We set the Qt::WA_DeleteOnClose
+    attribute on each label to ensure that any unused labels will be
+    deleted; we will need to create new labels and delete old ones when
+    they are dragged around, and this ensures that the example does not
+    leak memory.
+
+    We also set the \c FridgeMagnets widget's palette, minimum size
+    and window title.
+
+    \snippet examples/draganddrop/fridgemagnets/dragwidget.cpp 2
+
+    Finally, to enable our user to move the fridge magnets around, we
+    must also set the \c FridgeMagnets widget's
+    \l{QWidget::acceptDrops}{acceptDrops} property.
+
+    \snippet examples/draganddrop/fridgemagnets/dragwidget.cpp 3
+
+    Setting this property to true announces to the system that this
+    widget \e may be able to accept drop events (events that are sent
+    when drag and drop actions are completed). Later, we will
+    implement the functions that ensure that the widget accepts the
+    drop events it is interested in.
+
+    \section2 Dragging
+
+    Let's take a look at the \l{QWidget::}{mousePressEvent()} event
+    handler, where drag and drop operations begin:
+
+    \snippet examples/draganddrop/fridgemagnets/dragwidget.cpp 13
+    \snippet examples/draganddrop/fridgemagnets/dragwidget.cpp 14
+
+    Mouse events occur when a mouse button is pressed or released
+    inside a widget, or when the mouse cursor is moved. By
+    reimplementing the \l{QWidget::}{mousePressEvent()} method we
+    ensure that we will receive mouse press events for the widget
+    containing the fridge magnets.
+
+    Whenever we receive such an event, we first check to see if the
+    position of the click coincides with one of the labels. If not,
+    we simply return.
+
+    If the user clicked a label, we determine the position of the
+    \e{hot spot} (the position of the click relative to the top-left
+    corner of the label). We create a byte array to store the label's
+    text and the hot spot, and we use a QDataStream object to stream
+    the data into the byte array.
+
+    With all the information in place, we create a new QMimeData object.
+    As mentioned above, QMimeData objects associate the data that they
+    hold with the corresponding MIME types to ensure that information
+    can be safely transferred between applications. The
+    \l{QMimeData::}{setData()} method sets the data associated with a
+    given MIME type. In our case, we associate our item data with the
+    custom \c application/x-fridgemagnet type.
+
+    \snippet examples/draganddrop/fridgemagnets/dragwidget.cpp 15
+
+    Note that we also associate the magnet's text with the
+    \c text/plain MIME type using QMimeData's \l{QMimeData::}{setText()}
+    method. Below, we will see how our widget detects both these MIME
+    types with its event handlers.
+
+    Finally, we create a QDrag object. It is the QDrag class that
+    handles most of the details of a drag and drop operation,
+    providing support for MIME-based drag and drop data transfer. The
+    data to be transferred by the drag and drop operation is contained
+    in a QMimeData object. When we call QDrag's
+    \l{QDrag::}{setMimeData()} method the ownership of our item data is
+    transferred to the QDrag object.
+
+    We call the \l{QDrag::}{setPixmap()} function to set the pixmap used
+    to represent the data during the drag and drop operation.
+    Typically, this pixmap shows an icon that represents the MIME type
+    of the data being transferred, but any pixmap can be used. In this
+    example, we simply use the pixmap used by the label itself to make
+    it look like the fridge magnet itself is being moved.
+
+    \snippet examples/draganddrop/fridgemagnets/dragwidget.cpp 16
+
+    We also specify the cursor's hot spot, its position relative to the
+    top-level corner of the drag pixmap, to be the point we calculated
+    above. This makes the process of dragging the label feel more natural
+    because the cursor always points to the same place on the label
+    during the drag operation. 
+
+    We start the drag operation using QDrag's \l{QDrag::}{exec()} function,
+    requesting that the magnet is copied when the drag is completed.
+
+    \snippet examples/draganddrop/fridgemagnets/dragwidget.cpp 17
+
+    The function returns the drop action actually performed by the user
+    (this can be either a copy or a move action in this case); if this
+    action is equal to Qt::MoveAction we will close the activated
+    fridge magnet widget because we will create a new one to replace it
+    (see the \l{drop}{dropEvent()} implementation). Otherwise, if
+    the drop is outside our main widget, we simply show the widget in
+    its original position.
+
+    \section2 Dropping
+
+    When a a drag and drop action enters our widget, we will receive a
+    drag enter \e event. QDragEnterEvent inherits most of its
+    functionality from QDragMoveEvent, which in turn inherits most of
+    its functionality from QDropEvent. Note that we must accept this
+    event in order to receive the drag move events that are sent while
+    the drag and drop action is in progress. The drag enter event is
+    always immediately followed by a drag move event.
+
+    In our \c dragEnterEvent() implementation, we first determine
+    whether we support the event's MIME type or not:
+
+    \snippet examples/draganddrop/fridgemagnets/dragwidget.cpp 4
+    \snippet examples/draganddrop/fridgemagnets/dragwidget.cpp 5
+    \snippet examples/draganddrop/fridgemagnets/dragwidget.cpp 6
+
+    If the type is \c application/x-fridgemagnet and the event
+    origins from any of this application's fridge magnet widgets, we
+    first set the event's drop action using the
+    QDropEvent::setDropAction() method. An event's drop action is the
+    action to be performed on the data by the target. Qt::MoveAction
+    indicates that the data is moved from the source to the target.
+
+    Then we call the event's \l {QDragMoveEvent::}{accept()} method to
+    indicate that we have handled the event. In general, unaccepted
+    events might be propagated to the parent widget. If the event
+    origins from any other widget, we simply accept the proposed
+    action.
+
+    \snippet examples/draganddrop/fridgemagnets/dragwidget.cpp 7
+
+    We also accept the proposed action if the event's MIME type is \c
+    text/plain, i.e., if QMimeData::hasText() returns true. If the
+    event has any other type, on the other hand, we call the event's
+    \l {QDragMoveEvent::}{ignore()} method allowing the event to be
+    propagated further.
+
+    \snippet examples/draganddrop/fridgemagnets/dragwidget.cpp 8
+
+    Drag move events occur when the cursor enters a widget, when it
+    moves within the widget, and when a modifier key is pressed on the
+    keyboard while the widget has focus. Our widget will receive drag
+    move events repeatedly while a drag is within its boundaries. We
+    reimplement the \l {QWidget::}{dragMoveEvent()} method, and
+    examine the event in the exact same way as we did with drag enter
+    events.
+
+    Note that the \l{QWidget::}{dropEvent()} event handler behaves
+    slightly differently: We first get hold of the event's MIME
+    data.
+
+    \target drop
+    \snippet examples/draganddrop/fridgemagnets/dragwidget.cpp 9
+
+    The QMimeData class provides a container for data that
+    records information about its MIME type. QMimeData objects
+    associate the data that they hold with the corresponding MIME
+    types to ensure that information can be safely transferred between
+    applications, and copied around within the same application.
+
+    We retrieve the data associated with the \c application/x-fridgemagnet
+    MIME type using a data stream in order to create a new \c DragLabel
+    object.
+
+    \snippet examples/draganddrop/fridgemagnets/dragwidget.cpp 10
+
+    The QDataStream class provides serialization of binary data to a
+    QIODevice (a data stream is a binary stream of encoded information
+    which is completely independent of the host computer's operating
+    system, CPU or byte order).
+
+    Finally, we create a label and move it to the event's position:
+
+    \snippet examples/draganddrop/fridgemagnets/dragwidget.cpp 11
+
+    If the source of the event is also the widget receiving the
+    drop event, we set the event's drop action to Qt::MoveAction and
+    call the event's \l{QDragMoveEvent::}{accept()}
+    method. Otherwise, we simply accept the proposed action. This
+    means that labels are moved rather than copied in the same
+    window. However, if we drag a label to a second instance of the
+    Fridge Magnets example, the default action is to copy it, leaving
+    the original in the first instance.
+
+    If the event's MIME type is \c text/plain (i.e., if
+    QMimeData::hasText() returns true) we retrieve its text and split
+    it into words. For each word we create a new \c DragLabel action,
+    and show it at the event's position plus an offset depending on
+    the number of words in the text. In the end we accept the proposed
+    action. This lets the user drop selected text from a text editor or
+    Web browser onto the widget to add more fridge magnets.
+
+    \snippet examples/draganddrop/fridgemagnets/dragwidget.cpp 12
+
+    If the event has any other type, we call the event's
+    \l{QDragMoveEvent::}{ignore()} method allowing the event to be
+    propagated further.
+
+    \section1 Summary
+
+    We set our main widget's \l{QWidget::}{acceptDrops} property
+    and reimplemented QWidget's \l{QWidget::}{dragEnterEvent()},
+    \l{QWidget::}{dragMoveEvent()} and \l{QWidget::}{dropEvent()} event
+    handlers to support content dropped on our widget.
+
+    In addition, we reimplemented the \l{QWidget::}{mousePressEvent()}
+    function to let the user pick up fridge magnets in the first place.
+
+    Because data is communicated using drag and drop operations and
+    encoded using MIME types, you can run more than one instance of this
+    example, and transfer magnets between them.
+*/
diff --git a/doc/src/examples/ftp.qdoc b/doc/src/examples/ftp.qdoc
new file mode 100644
index 0000000000..9cc9cd16d5
--- /dev/null
+++ b/doc/src/examples/ftp.qdoc
@@ -0,0 +1,211 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example network/ftp
+    \title FTP Example
+
+    The FTP example demonstrates a simple FTP client that can be used
+    to list the available files on an FTP server and download them.
+
+    \image ftp-example.png
+
+    The user of the example can enter the address or hostname of an
+    FTP server in the \gui {Ftp Server} line edit, and then push the
+    \gui Connect button to connect to it. A list of the server's
+    top-level directory is then presented in the \gui {File List} tree
+    view. If the selected item in the view is a file, the user can
+    download it by pushing the \gui Download button. An item
+    representing a directory can be double clicked with the mouse to
+    show the contents of that directory in the view.
+
+    The functionality required for the example is implemented in the
+    QFtp class, which provides an easy, high-level interface to the
+    file transfer protocol. FTP operations are requested through
+    \l{QFtp::Command}s. The operations are asynchronous. QFtp will
+    notify us through signals when commands are started and finished.
+
+    We have one class, \c FtpWindow, which sets up the GUI and handles
+    the FTP functionality. We will now go through its definition and
+    implementation - focusing on the code concerning FTP. The code for
+    managing the GUI is explained in other examples.
+
+    \section1 FtpWindow Class Definition
+
+    The \c FtpWindow class displays a window, in which the user can
+    connect to and browse the contents of an FTP server. The slots of
+    \c FtpWindow are connected to its widgets, and contain the
+    functionality for managing the FTP connection. We also connect to
+    signals in QFtp, which tells us when the
+    \l{QFtp::Command}{commands} we request are finished, the progress
+    of current commands, and information about files on the server.
+
+    \snippet examples/network/ftp/ftpwindow.h 0
+
+    We will look at each slot when we examine the \c FtpWindow
+    implementation in the next section. We also make use of a few
+    private variables:
+
+    \snippet examples/network/ftp/ftpwindow.h 1
+
+    The \c isDirectory hash keeps a history of all entries explored on
+    the FTP server, and registers whether an entry represents a
+    directory or a file. We use the QFile object to download files
+    from the FTP server. 
+ 
+    \section1 FtpWindow Class Implementation
+
+    We skip the \c FtpWindow constructor as it only contains code for
+    setting up the GUI, which is explained in other examples.
+    
+    We move on to the slots, starting with \c connectOrDisconnect().
+
+    \snippet examples/network/ftp/ftpwindow.cpp 0
+
+    If \c ftp is already pointing to a QFtp object, we QFtp::Close its
+    FTP connection and delete the object it points to. Note that we do
+    not delete the object using standard C++ \c delete as we need it
+    to finish its abort operation.
+
+    \dots
+    \snippet examples/network/ftp/ftpwindow.cpp 1
+
+    If we get here, \c connectOrDisconnect() was called to establish a
+    new FTP connection. We create a new QFtp for our new connection,
+    and connect its signals to slots in \c FtpWindow. The
+    \l{QFtp::}{listInfo()} signal is emitted whenever information
+    about a single file on the sever has been resolved. This signal is
+    sent when we ask QFtp to \l{QFtp::}{list()} the contents of a
+    directory. Finally, the \l{QFtp::}{dataTransferProgress()} signal
+    is emitted repeatedly during an FTP file transfer, giving us
+    progress reports.
+
+    \snippet examples/network/ftp/ftpwindow.cpp 2
+
+    The \gui {Ftp Server} line edit contains the IP address or
+    hostname of the server to which we want to connect. We first check
+    that the URL is a valid FTP sever address. If it isn't, we still
+    try to connect using the plain text in \c ftpServerLineEdit. In
+    either case, we assume that port \c 21 is used.
+
+    If the URL does not contain a user name and password, we use
+    QFtp::login(), which will attempt to log into the FTP sever as an
+    anonymous user. The QFtp object will now notify us when it has
+    connected to the FTP server; it will also send a signal if it
+    fails to connect or the username and password were rejected.
+
+    We move on to the \c downloadFile() slot:
+
+    \snippet examples/network/ftp/ftpwindow.cpp 3
+    \dots
+    \snippet examples/network/ftp/ftpwindow.cpp 4
+    
+    We first fetch the name of the file, which we find in the selected
+    item of \c fileList. We then start the download by using
+    QFtp::get(). QFtp will send progress signals during the download
+    and a signal when the download is completed.  
+
+    \snippet examples/network/ftp/ftpwindow.cpp 5
+
+    QFtp supports canceling the download of files.
+
+    \snippet examples/network/ftp/ftpwindow.cpp 6
+
+    The \c ftpCommandFinished() slot is called when QFtp has
+    finished a QFtp::Command. If an error occurred during the
+    command, QFtp will set \c error to one of the values in
+    the QFtp::Error enum; otherwise, \c error is zero.
+    
+    \snippet examples/network/ftp/ftpwindow.cpp 7
+
+    After login, the QFtp::list() function will list the top-level
+    directory on the server. addToList() is connected to
+    QFtp::listInfo(), and will be invoked for each entry in that
+    directory.
+
+    \snippet examples/network/ftp/ftpwindow.cpp 8
+
+    When a \l{QFtp::}{Get} command is finished, a file has finished
+    downloading (or an error occurred during the download).
+    
+    \snippet examples/network/ftp/ftpwindow.cpp 9
+
+    After a \l{QFtp::}{List} command is performed, we have to check if
+    no entries were found (in which case our \c addToList() function
+    would not have been called). 
+
+    Let's continue with the the \c addToList() slot:
+
+    \snippet examples/network/ftp/ftpwindow.cpp 10
+
+    When a new file has been resolved during a QFtp::List command,
+    this slot is invoked with a QUrlInfo describing the file. We
+    create a separate row for the file in \c fileList. If \c fileList
+    does not have a current item, we set the new item to be the
+    current item.
+
+    \snippet examples/network/ftp/ftpwindow.cpp 11
+
+    The \c processItem() slot is called when an item is double clicked
+    in the \gui {File List}. If the item represents a directory, we
+    want to load the contents of that directory with QFtp::list().
+
+    \snippet examples/network/ftp/ftpwindow.cpp 12
+
+    \c cdToParent() is invoked when the the user requests to go to the
+    parent directory of the one displayed in the file list. After
+    changing the directory, we QFtp::List its contents.
+
+    \snippet examples/network/ftp/ftpwindow.cpp 13
+
+    The \c updateDataTransferProgress() slot is called regularly by
+    QFtp::dataTransferProgress() when a file download is in progress.
+    We use a QProgressDialog to show the download progression to the
+    user.
+
+    \snippet examples/network/ftp/ftpwindow.cpp 14
+
+    The \c enableDownloadButton() is called whenever the current item
+    in \c fileList changes. If the item represents a file, the \gui
+    {Enable Download} Button should be enabled; otherwise, it is
+    disabled.
+*/
+
diff --git a/doc/src/examples/globalVariables.qdoc b/doc/src/examples/globalVariables.qdoc
new file mode 100644
index 0000000000..e1b83fedc9
--- /dev/null
+++ b/doc/src/examples/globalVariables.qdoc
@@ -0,0 +1,238 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example xmlpatterns/xquery/globalVariables
+    \title C++ Source Code Analyzer Example
+
+    This example uses XQuery and the \c xmlpatterns command line utility to
+    query C++ source code.
+
+    \tableofcontents
+
+    \section1 Introduction
+
+    Suppose we want to analyze C++ source code to find coding standard
+    violations and instances of bad or inefficient patterns. We can do
+    it using the common searching and pattern matching utilities to
+    process the C++ files (e.g., \c{grep}, \c{sed}, and \c{awk}). Now
+    we can also use XQuery with the QtXmlPatterns module.
+
+    An extension to the \c{g++} open source C++ compiler
+    (\l{http://public.kitware.com/GCC_XML/HTML/Index.html} {GCC-XML})
+    generates an XML description of C++ source code declarations. This
+    XML description can then be processed by QtXmlPatterns using
+    XQueries to navigate the XML description of the C++ source and
+    produce a report. Consider the problem of finding mutable global
+    variables:
+
+    \section2 Reporting Uses of Mutable Global Variables
+
+    Suppose we want to introduce threading to a C++ application that
+    was originally written without threading. In a threaded program,
+    mutable global variables can cause bugs, because one thread might
+    change a global variable that other threads are reading, or two
+    threads might try to set the same global variable. So when
+    converting our program to use threading, one of the things we must
+    do is protect the global variables to prevent the bugs described
+    above. How can we use XQuery and
+    \l{http://public.kitware.com/GCC_XML/HTML/Index.html} {GCC-XML} to
+    find the variables that need protecting? 
+
+    \section3 A C++ application
+
+    Consider the declarations in this hypothetical C++ application:
+
+    \snippet examples/xmlpatterns/xquery/globalVariables/globals.cpp 0
+
+    \section3 The XML description of the C++ application
+
+    Submitting this C++ source to  
+    \l{http://public.kitware.com/GCC_XML/HTML/Index.html} {GCC-XML}
+    produces this XML description:
+
+    \quotefromfile examples/xmlpatterns/xquery/globalVariables/globals.gccxml
+    \printuntil
+
+    \section3 The XQuery for finding global variables
+
+    We need an XQuery to find the global variables in the XML
+    description. Here is our XQuery source. We walk through it in
+    \l{XQuery Code Walk-Through}.
+
+    \quotefromfile examples/xmlpatterns/xquery/globalVariables/reportGlobals.xq
+    \printuntil
+
+    \section3 Running the XQuery
+
+    To run the XQuery using the \c xmlpatterns command line utility,
+    enter the following command:
+
+    \code
+    xmlpatterns reportGlobals.xq -param fileToOpen=globals.gccxml -output globals.html
+    \endcode
+
+    \section3 The XQuery output
+
+    The \c xmlpatterns command loads and parses \c globals.gccxml,
+    runs the XQuery \c reportGlobals.xq, and generates this report:
+
+    \raw HTML
+<html xmlns="http://www.w3.org/1999/xhtml/" xml:lang="en" lang="en">
+    <head>
+        <title>Global variables report for globals.gccxml</title>
+    </head>
+    <style type="text/css">
+        .details
+        {
+            text-align: left;
+            font-size: 80%;
+            color: blue
+        }
+        .variableName
+        {
+            font-family: courier;
+	    color: blue
+        }
+    </style>
+    <body>
+        <p class="details">Start report: 2008-12-16T13:43:49.65Z</p>
+        <p>Global variables with complex types:</p>
+        <ol>
+            <li>
+                <span class="variableName">mutableComplex1</span> in globals.cpp at line 14</li>
+            <li>
+                <span class="variableName">mutableComplex2</span> in globals.cpp at line 15</li>
+            <li>
+                <span class="variableName">constComplex1</span> in globals.cpp at line 16</li>
+            <li>
+                <span class="variableName">constComplex2</span> in globals.cpp at line 17</li>
+        </ol>
+        <p>Mutable global variables with primitives types:</p>
+        <ol>
+            <li>
+                <span class="variableName">mutablePrimitive1</span> in globals.cpp at line 1</li>
+            <li>
+                <span class="variableName">mutablePrimitive2</span> in globals.cpp at line 2</li>
+        </ol>
+        <p class="details">End report: 2008-12-16T13:43:49.65Z</p>
+    </body>
+</html>
+    \endraw
+
+    \section1 XQuery Code Walk-Through  
+
+    The XQuery source is in
+    \c{examples/xmlpatterns/xquery/globalVariables/reportGlobals.xq}
+    It begins with two variable declarations that begin the XQuery:
+
+    \quotefromfile examples/xmlpatterns/xquery/globalVariables/reportGlobals.xq
+    \skipto declare variable
+    \printto (:
+
+    The first variable, \c{$fileToOpen}, appears in the \c xmlpatterns
+    command shown earlier, as \c{-param fileToOpen=globals.gccxml}.
+    This binds the variable name to the file name. This variable is
+    then used in the declaration of the second variable, \c{$inDoc},
+    as the parameter to the
+    \l{http://www.w3.org/TR/xpath-functions/#func-doc} {doc()}
+    function. The \c{doc()} function returns the document node of
+    \c{globals.gccxml}, which is assigned to \c{$inDoc} to be used
+    later in the XQuery as the root node of our searches for global
+    variables.
+
+    Next skip to the end of the XQuery, where the \c{<html>} element
+    is constructed. The \c{<html>} will contain a \c{<head>} element
+    to specify a heading for the html page, followed by some style
+    instructions for displaying the text, and then the \c{<body>}
+    element.
+
+    \quotefromfile examples/xmlpatterns/xquery/globalVariables/reportGlobals.xq
+    \skipto <html xmlns
+    \printuntil
+
+    The \c{<body>} element contains a call to the \c{local:report()}
+    function, which is where the query does the "heavy lifting."  Note
+    the two \c{return} clauses separated by the \e {comma operator}
+    about halfway down:
+
+    \quotefromfile examples/xmlpatterns/xquery/globalVariables/reportGlobals.xq
+    \skipto declare function local:report()
+    \printuntil };
+
+    The \c{return} clauses are like two separate queries. The comma
+    operator separating them means that both \c{return} clauses are
+    executed and both return their results, or, rather, both output
+    their results. The first \c{return} clause searches for global
+    variables with complex types, and the second searches for mutable
+    global variables with primitive types.
+
+    Here is the html generated for the \c{<body>} element. Compare
+    it with the XQuery code above:
+
+    \quotefromfile examples/xmlpatterns/xquery/globalVariables/globals.html
+    \skipto <body>
+    \printuntil </body>
+     
+    The XQuery declares three more local functions that are called in
+    turn by the \c{local:report()} function. \c{isComplexType()}
+    returns true if the variable has a complex type. The variable can
+    be mutable or const.
+    
+    \quotefromfile examples/xmlpatterns/xquery/globalVariables/reportGlobals.xq
+    \skipto declare function local:isComplexType
+    \printuntil };
+
+    \c{isPrimitive()} returns true if the variable has a primitive
+    type. The variable must be mutable.
+
+    \quotefromfile examples/xmlpatterns/xquery/globalVariables/reportGlobals.xq
+    \skipto declare function local:isPrimitive
+    \printuntil };
+
+    \c{location()} returns a text constructed from the variable's file
+    and line number attributes.
+
+    \quotefromfile examples/xmlpatterns/xquery/globalVariables/reportGlobals.xq
+    \skipto declare function local:location
+    \printuntil };
+
+ */
diff --git a/doc/src/examples/grabber.qdoc b/doc/src/examples/grabber.qdoc
new file mode 100644
index 0000000000..efb5b6f6c7
--- /dev/null
+++ b/doc/src/examples/grabber.qdoc
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example opengl/grabber
+    \title Grabber Example
+
+    The Grabber examples shows how to retrieve the contents of an OpenGL framebuffer.
+
+    \image grabber-example.png
+*/
diff --git a/doc/src/examples/groupbox.qdoc b/doc/src/examples/groupbox.qdoc
new file mode 100644
index 0000000000..c5f6a62aaf
--- /dev/null
+++ b/doc/src/examples/groupbox.qdoc
@@ -0,0 +1,154 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example widgets/groupbox
+    \title Group Box Example
+
+    The Group Box example shows how to use the different kinds of group
+    boxes in Qt.
+
+    Group boxes are container widgets that organize buttons into groups,
+    both logically and on screen. They manage the interactions between
+    the user and the application so that you do not have to enforce
+    simple constraints.
+
+    Group boxes are usually used to organize check boxes and radio
+    buttons into exclusive groups.
+
+    \image groupbox-example.png
+
+    The Group Boxes example consists of a single \c Window class that
+    is used to show four group boxes: an exclusive radio button group,
+    a non-exclusive checkbox group, an exclusive radio button group
+    with an enabling checkbox, and a group box with normal push buttons.
+
+    \section1 Window Class Definition
+
+    The \c Window class is a subclass of \c QWidget that is used to
+    display a number of group boxes. The class definition contains
+    functions to construct each group box and populate it with different
+    selections of button widgets:
+
+    \snippet examples/widgets/groupbox/window.h 0
+
+    In the example, the widget will be used as a top-level window, so
+    the constructor is defined so that we do not have to specify a parent
+    widget.
+
+    \section1 Window Class Implementation
+
+    The constructor creates a grid layout and fills it with each of the
+    group boxes that are to be displayed:
+
+    \snippet examples/widgets/groupbox/window.cpp 0
+
+    The functions used to create each group box each return a
+    QGroupBox to be inserted into the grid layout.
+
+    \snippet examples/widgets/groupbox/window.cpp 1
+
+    The first group box contains and manages three radio buttons. Since
+    the group box contains only radio buttons, it is exclusive by
+    default, so only one radio button can be checked at any given time.
+    We check the first radio button to ensure that the button group
+    contains one checked button.
+
+    \snippet examples/widgets/groupbox/window.cpp 3
+
+    We use a vertical layout within the group box to present the
+    buttons in the form of a vertical list, and return the group
+    box to the constructor.
+
+    The second group box is itself checkable, providing a convenient
+    way to disable all the buttons inside it. Initially, it is
+    unchecked, so the group box itself must be checked before any of
+    the radio buttons inside can be checked.
+
+    \snippet examples/widgets/groupbox/window.cpp 4
+
+    The group box contains three exclusive radio buttons, and an
+    independent checkbox. For consistency, one radio button must be
+    checked at all times, so we ensure that the first one is initially
+    checked.
+
+    \snippet examples/widgets/groupbox/window.cpp 5
+
+    The buttons are arranged in the same way as those in the first
+    group box.
+
+    \snippet examples/widgets/groupbox/window.cpp 6
+
+    The third group box is constructed with a "flat" style that is
+    better suited to certain types of dialog.
+
+    \snippet examples/widgets/groupbox/window.cpp 7
+
+    This group box contains only checkboxes, so it is non-exclusive by
+    default. This means that each checkbox can be checked independently
+    of the others.
+
+    \snippet examples/widgets/groupbox/window.cpp 8
+
+    Again, we use a vertical layout within the group box to present
+    the buttons in the form of a vertical list.
+
+    \snippet examples/widgets/groupbox/window.cpp 9
+
+    The final group box contains only push buttons and, like the
+    second group box, it is checkable.
+
+    \snippet examples/widgets/groupbox/window.cpp 10
+
+    We create a normal button, a toggle button, and a flat push button:
+
+    \snippet examples/widgets/groupbox/window.cpp 11
+
+    Push buttons can be used to display popup menus. We create one, and
+    attach a simple menu to it:
+
+    \snippet examples/widgets/groupbox/window.cpp 12
+
+    Finally, we lay out the widgets vertically, and return the group box
+    that we created:
+
+    \snippet examples/widgets/groupbox/window.cpp 13
+*/
diff --git a/doc/src/examples/hellogl.qdoc b/doc/src/examples/hellogl.qdoc
new file mode 100644
index 0000000000..2fc51a3c53
--- /dev/null
+++ b/doc/src/examples/hellogl.qdoc
@@ -0,0 +1,272 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example opengl/hellogl
+    \title Hello GL Example
+
+    The Hello GL example demonstrates the basic use of the OpenGL-related classes
+    provided with Qt.
+
+    \image hellogl-example.png
+
+    Qt provides the QGLWidget class to enable OpenGL graphics to be rendered within
+    a standard application user interface. By subclassing this class, and providing
+    reimplementations of event handler functions, 3D scenes can be displayed on
+    widgets that can be placed in layouts, connected to other objects using signals
+    and slots, and manipulated like any other widget.
+
+    \tableofcontents
+
+    \section1 GLWidget Class Definition
+
+    The \c GLWidget class contains some standard public definitions for the
+    constructor, destructor, \l{QWidget::sizeHint()}{sizeHint()}, and
+    \l{QWidget::minimumSizeHint()}{minimumSizeHint()} functions:
+
+    \snippet examples/opengl/hellogl/glwidget.h 0
+
+    We use a destructor to ensure that any OpenGL-specific data structures
+    are deleted when the widget is no longer needed.
+
+    \snippet examples/opengl/hellogl/glwidget.h 1
+
+    The signals and slots are used to allow other objects to interact with the
+    3D scene.
+
+    \snippet examples/opengl/hellogl/glwidget.h 2
+
+    OpenGL initialization, viewport resizing, and painting are handled by
+    reimplementing the QGLWidget::initializeGL(), QGLWidget::resizeGL(), and
+    QGLWidget::paintGL() handler functions. To enable the user to interact
+    directly with the scene using the mouse, we reimplement
+    QWidget::mousePressEvent() and QWidget::mouseMoveEvent().
+
+    \snippet examples/opengl/hellogl/glwidget.h 3
+
+    The rest of the class contains utility functions and variables that are
+    used to construct and hold orientation information for the scene. The
+    \c object variable will be used to hold an identifier for an OpenGL
+    display list.
+
+    \section1 GLWidget Class Implementation
+
+    In this example, we split the class into groups of functions and describe
+    them separately. This helps to illustrate the differences between subclasses
+    of native widgets (such as QWidget and QFrame) and QGLWidget subclasses.
+
+    \section2 Widget Construction and Sizing
+
+    The constructor provides default rotation angles for the scene, initializes
+    the variable used for the display list, and sets up some colors for later use.
+
+    \snippet examples/opengl/hellogl/glwidget.cpp 0
+
+    We also implement a destructor to release OpenGL-related resources when the
+    widget is deleted:
+
+    \snippet examples/opengl/hellogl/glwidget.cpp 1
+
+    The destructor ensures that the display list is deleted properly.
+
+    We provide size hint functions to ensure that the widget is shown at a
+    reasonable size:
+
+    \snippet examples/opengl/hellogl/glwidget.cpp 2
+    \codeline
+    \snippet examples/opengl/hellogl/glwidget.cpp 3
+    \snippet examples/opengl/hellogl/glwidget.cpp 4
+
+    The widget provides three slots that enable other components in the
+    example to change the orientation of the scene:
+
+    \snippet examples/opengl/hellogl/glwidget.cpp 5
+
+    In the above slot, the \c xRot variable is updated only if the new angle
+    is different to the old one, the \c xRotationChanged() signal is emitted to
+    allow other components to be updated, and the widget's
+    \l{QGLWidget::updateGL()}{updateGL()} handler function is called.
+
+    The \c setYRotation() and \c setZRotation() slots perform the same task for
+    rotations measured by the \c yRot and \c zRot variables.
+
+    \section2 OpenGL Initialization
+
+    The \l{QGLWidget::initializeGL()}{initializeGL()} function is used to
+    perform useful initialization tasks that are needed to render the 3D scene.
+    These often involve defining colors and materials, enabling and disabling
+    certain rendering flags, and setting other properties used to customize the
+    rendering process.
+
+    \snippet examples/opengl/hellogl/glwidget.cpp 6
+
+    In this example, we reimplement the function to set the background color,
+    create a display list containing information about the object we want to
+    display, and set up the rendering process to use a particular shading model
+    and rendering flags:
+
+    \section2 Resizing the Viewport
+
+    The \l{QGLWidget::resizeGL()}{resizeGL()} function is used to ensure that
+    the OpenGL implementation renders the scene onto a viewport that matches the
+    size of the widget, using the correct transformation from 3D coordinates to
+    2D viewport coordinates.
+
+    The function is called whenever the widget's dimensions change, and is
+    supplied with the new width and height. Here, we define a square viewport
+    based on the length of the smallest side of the widget to ensure that
+    the scene is not distorted if the widget has sides of unequal length:
+
+    \snippet examples/opengl/hellogl/glwidget.cpp 8
+
+    A discussion of the projection transformation used is outside the scope of
+    this example. Please consult the OpenGL reference documentation for an
+    explanation of projection matrices.
+
+    \section2 Painting the Scene
+
+    The \l{QGLWidget::paintGL()}{paintGL()} function is used to paint the
+    contents of the scene onto the widget. For widgets that only need to be
+    decorated with pure OpenGL content, we reimplement QGLWidget::paintGL()
+    \e instead of reimplementing QWidget::paintEvent():
+
+    \snippet examples/opengl/hellogl/glwidget.cpp 7
+
+    In this example, we clear the widget using the background color that
+    we defined in the \l{QGLWidget::initializeGL()}{initializeGL()} function,
+    set up the frame of reference for the object we want to display, and call
+    the display list containing the rendering commands for the object.
+
+    \section2 Mouse Handling
+
+    Just as in subclasses of native widgets, mouse events are handled by
+    reimplementing functions such as QWidget::mousePressEvent() and
+    QWidget::mouseMoveEvent().
+
+    The \l{QWidget::mousePressEvent()}{mousePressEvent()} function simply
+    records the position of the mouse when a button is initially pressed:
+
+    \snippet examples/opengl/hellogl/glwidget.cpp 9
+
+    The \l{QWidget::mouseMoveEvent()}{mouseMoveEvent()} function uses the
+    previous location of the mouse cursor to determine how much the object
+    in the scene should be rotated, and in which direction:
+
+    \snippet examples/opengl/hellogl/glwidget.cpp 10
+
+    Since the user is expected to hold down the mouse button and drag the
+    cursor to rotate the object, the cursor's position is updated every time
+    a move event is received.
+
+    \section2 Utility Functions
+
+    We have omitted the utility functions, \c makeObject(), \c quad(),
+    \c extrude(), and \c normalizeAngle() from our discussion. These can be
+    viewed in the quoted source for \c glwidget.cpp via the link at the
+    start of this document.
+
+    \section1 Window Class Definition
+
+    The \c Window class is used as a container for the \c GLWidget used to
+    display the scene:
+
+    \snippet examples/opengl/hellogl/window.h 0
+
+    In addition, it contains sliders that are used to change the orientation
+    of the object in the scene.
+
+    \section1 Window Class Implementation
+
+    The constructor constructs an instance of the \c GLWidget class and some
+    sliders to manipulate its contents.
+
+    \snippet examples/opengl/hellogl/window.cpp 0
+
+    We connect the \l{QAbstractSlider::valueChanged()}{valueChanged()} signal
+    from each of the sliders to the appropriate slots in \c{glWidget}.
+    This allows the user to change the orientation of the object by dragging
+    the sliders.
+
+    We also connect the \c xRotationChanged(), \c yRotationChanged(), and
+    \c zRotationChanged() signals from \c glWidget to the
+    \l{QAbstractSlider::setValue()}{setValue()} slots in the
+    corresponding sliders.
+
+    \snippet examples/opengl/hellogl/window.cpp 1
+
+    The sliders are placed horizontally in a layout alongside the \c GLWidget,
+    and initialized with suitable default values.
+
+    The \c createSlider() utility function constructs a QSlider, and ensures
+    that it is set up with a suitable range, step value, tick interval, and
+    page step value before returning it to the calling function:
+
+    \snippet examples/opengl/hellogl/window.cpp 2
+
+    \section1 Summary
+
+    The \c GLWidget class implementation shows how to subclass QGLWidget for
+    the purposes of rendering a 3D scene using OpenGL calls. Since QGLWidget
+    is a subclass of QWidget, subclasses of QGLWidget can be placed in layouts
+    and provided with interactive features just like normal custom widgets.
+
+    We ensure that the widget is able to correctly render the scene using OpenGL
+    by reimplementing the following functions:
+
+    \list
+    \o QGLWidget::initializeGL() sets up resources needed by the OpenGL implementation
+       to render the scene.
+    \o QGLWidget::resizeGL() resizes the viewport so that the rendered scene fits onto
+       the widget, and sets up a projection matrix to map 3D coordinates to 2D viewport
+       coordinates.
+    \o QGLWidget::paintGL() performs painting operations using OpenGL calls.
+    \endlist
+
+    Since QGLWidget is a subclass of QWidget, it can also be used
+    as a normal paint device, allowing 2D graphics to be drawn with QPainter.
+    This use of QGLWidget is discussed in the \l{2D Painting Example}{2D Painting}
+    example.
+
+    More advanced users may want to paint over parts of a scene rendered using
+    OpenGL. QGLWidget allows pure OpenGL rendering to be mixed with QPainter
+    calls, but care must be taken to maintain the state of the OpenGL implementation.
+    See the \l{Overpainting Example}{Overpainting} example for more information.
+*/
diff --git a/doc/src/examples/hellogl_es.qdoc b/doc/src/examples/hellogl_es.qdoc
new file mode 100644
index 0000000000..0293584eec
--- /dev/null
+++ b/doc/src/examples/hellogl_es.qdoc
@@ -0,0 +1,124 @@
+/*!
+    \example opengl/hellogl_es
+    \title Hello GL ES Example
+
+    The Hello GL ES example is the \l{Hello GL Example} ported to OpenGL ES.
+    It also included some effects from the OpenGL \l{Overpainting Example}.
+
+    \image hellogl-es-example.png
+
+    A complete introduction to OpenGL ES and a description of all differences
+    between OpenGL and OpenGL ES is out of the scope of this document; but
+    we will describe some of the major issues and differences.
+
+    Since Hello GL ES is a direct port of standard OpenGL code, it is a fairly
+    good example for porting OpenGL code to OpenGL ES.
+
+    \tableofcontents
+
+    \section1 Using QGLWidget
+
+    QGLWidget can be used for OpenGL ES similar to the way it is used with
+    standard OpenGL; but there are some differences. We use EGL 1.0 to embedd
+    the OpenGL ES window within the native window manager. In
+    QGLWidget::initializeGL() we initialize OpenGL ES.
+
+    \section1 Using OpenGL ES rendering commands
+
+    To update the scene, we reimplment QGLWidget::paintGL(). We use OpenGL ES
+    rendering commands just like we do with standard OpenGL. Since the OpenGL
+    ES common light profile only supports fixed point functions, we need to
+    abstract it somehow. Hence, we define an abstraction layer in
+    \c{cl_helper.h}.
+
+    \snippet examples/opengl/hellogl_es/cl_helper.h 0
+
+    Instead of \c glFogxv() or \c glFogfv() we use \c q_glFogv() and to
+    convert the coordinates of a vertice we use the macro \c f2vt(). That way,
+    if QT_OPENGL_ES_CL is defined we use the fixed point functions and every
+    float is converted to fixed point.
+
+    If QT_OPENGL_ES_CL is not defined we use the floating point functions.
+
+    \snippet examples/opengl/hellogl_es/cl_helper.h 1
+
+    This way we support OpenGL ES Common and Common Light with the same code
+    and abstract the fact that we use either the floating point functions or
+    otherwise the fixed point functions.
+
+    \section1 Porting OpenGL to OpenGL ES
+
+    Since OpenGL ES is missing the immediate mode and does not support quads,
+    we have to create triangle arrays.
+
+    We create a quad by adding vertices to a QList of vertices. We create both
+    sides of the quad and hardcode a distance of 0.05f. We also compute the
+    correct normal for each face and store them in another QList.
+
+    \snippet examples/opengl/hellogl_es/glwidget.cpp 0
+
+    And then we convert the complete list of vertexes and the list of normals
+    into the native OpenGL ES format that we can use with the OpenGL ES API.
+
+    \snippet examples/opengl/hellogl_es/glwidget.cpp 1
+
+    In \c paintQtLogo() we draw the triangle array using OpenGL ES. We use
+    q_vertexTypeEnum to abstract the fact that our vertex and normal arrays
+    are either in float or in fixed point format.
+
+    \snippet examples/opengl/hellogl_es/glwidget.cpp 2
+
+    \section1 Using QGLPainter
+
+    Since the \c QGLPainter is slower for OpenGL ES we paint the bubbles with
+    the rasterizer and cache them in a QImage. This happends only once during
+    the initialiazation.
+
+    \snippet examples/opengl/hellogl_es/bubble.cpp 0
+
+    For each bubble this QImage is then drawn to the QGLWidget by using the
+    according QPainter with transparency enabled.
+
+    \snippet examples/opengl/hellogl_es/bubble.cpp 1
+
+    Another difference beetwen OpenGL and OpenGL ES is that OpenGL ES does not
+    support glPushAttrib(GL_ALL_ATTRIB_BITS). So we have to restore all the
+    OpenGL states ourselves, after we created the QPainter in
+    GLWidget::paintGL().
+
+    \snippet examples/opengl/hellogl_es/glwidget.cpp 3
+
+    Setting up up the model view matrix and setting the right OpenGL states is
+    done in the same way as for standard OpenGL.
+
+    \snippet examples/opengl/hellogl_es/glwidget.cpp 4
+
+    Now we have to restore the OpenGL state for the QPainter. This is not done
+    automatically for OpenGL ES.
+
+    \snippet examples/opengl/hellogl_es/glwidget.cpp 5
+
+    Now we use the QPainter to draw the transparent bubbles.
+
+    \snippet examples/opengl/hellogl_es/glwidget.cpp 6
+
+    In the end, we calculate the framerate and display it using the QPainter
+    again.
+
+    \snippet examples/opengl/hellogl_es/glwidget.cpp 7
+
+    After we finished all the drawing operations we swap the screen buffer.
+
+    \snippet examples/opengl/hellogl_es/glwidget.cpp 8
+
+    \section1 Summary
+
+    Similar to the \l{Hello GL Example}, we subclass QGLWidget to render
+    a 3D scene using OpenGL ES calls. QGLWidget is a subclass of QWidget.
+    Hence, its \l{QGLWidget}'s subclasses can be placed in layouts and
+    provided with interactive features just like normal custom widgets.
+
+    QGLWidget allows pure OpenGL ES rendering to be mixed with QPainter calls,
+    but care must be taken to maintain the state of the OpenGL ES
+    implementation.
+*/
diff --git a/doc/src/examples/helloscript.qdoc b/doc/src/examples/helloscript.qdoc
new file mode 100644
index 0000000000..5662680f64
--- /dev/null
+++ b/doc/src/examples/helloscript.qdoc
@@ -0,0 +1,142 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example script/helloscript
+    \title Hello Script Example
+
+    The Hello Script example shows the basic use of Qt Script: How to embed
+    a script engine into the application, how to evaluate a script, and how
+    to process the result of the evaluation. The example also shows how to
+    apply internationalization to scripts.
+
+    \snippet examples/script/helloscript/main.cpp 0
+
+    The application will load the script file to evaluate from a resource, so
+    we first make sure that the resource is initialized.
+
+    \snippet examples/script/helloscript/main.cpp 1
+
+    We attempt to load a translation, and install translation functions in the
+    script engine. How to produce a translation is explained later.
+
+    \snippet examples/script/helloscript/main.cpp 2
+
+    A push button is created and exported to the script environment as a
+    global variable, \c button. Scripts will be able to access properties,
+    signals and slots of the button as properties of the \c button script
+    object; the script object acts as a proxy to the C++ button object.
+
+    \snippet examples/script/helloscript/main.cpp 3
+
+    The contents of the script file are read.
+
+    \snippet examples/script/helloscript/helloscript.qs 0
+
+    The script sets the \c text (note that the qTr() function is used to allow
+    for translation) and \c styleSheet properties of the button, and calls the
+    button's \c show() slot.
+
+    \snippet examples/script/helloscript/main.cpp 4
+
+    The script is evaluated. Note that the file name is passed as the
+    (optional) second parameter; this makes it possible for the script engine
+    to produce a meaningful backtrace if something goes wrong, and makes the
+    qTr() function be able to resolve the translations that are associated
+    with this script.
+
+    \snippet examples/script/helloscript/main.cpp 5
+
+    If the result is an Error object (e.g. the script contained a syntax
+    error, or tried to call a function that doesn't exist), we obtain
+    the line number and string representation of the error and display
+    it in a message box.
+
+    \snippet examples/script/helloscript/main.cpp 6
+
+    If the evaluation went well, the application event loop is entered.
+
+    \section1 Translating the Application
+
+    The Qt Script internalization support builds on what Qt already provides
+    for C++; see the \l{Hello tr() Example} for an introduction.
+
+    Since we haven't made the translation file \c helloscript_la.qm, the
+    source text is shown when we run the application ("Hello world!").
+
+    To generate the translation file, run \c lupdate as follows:
+
+    \code
+    lupdate helloscript.qs -ts helloscript_la.ts
+    \endcode
+
+    You should now have a file \c helloscript_la.ts in the current
+    directory. Run \c linguist to edit the translation:
+
+    \code
+    linguist helloscript_la.ts
+    \endcode
+
+    You should now see the text "helloscript.qs" in the top left pane.
+    Double-click it, then click on "Hello world!" and enter "Orbis, te
+    saluto!" in the \gui Translation pane (the middle right of the
+    window). Don't forget the exclamation mark!
+
+    Click the \gui Done checkbox and choose \gui File|Save from the
+    menu bar. The \c .ts file will no longer contain
+
+    \snippet doc/src/snippets/code/doc_src_examples_hellotr.qdoc 3
+
+    but instead will have
+
+    \snippet doc/src/snippets/code/doc_src_examples_hellotr.qdoc 4
+
+    To see the application running in Latin, we have to generate a \c .qm
+    file from the \c .ts file. Generating a \c .qm file can be achieved
+    either from within \e {Qt Linguist} (for a single \c .ts file), or
+    by using the command line program \c lrelease which will produce one \c
+    .qm file for each of the \c .ts files listed in the project file.
+    Generate \c hellotr_la.qm from \c hellotr_la.ts by choosing
+    \gui File|Release from \e {Qt Linguist}'s menu bar and pressing
+    \gui Save in the file save dialog that pops up. Now run the \c helloscript
+    program again. This time the button will be labelled "Orbis, te
+    saluto!".
+*/
diff --git a/doc/src/examples/hellotr.qdoc b/doc/src/examples/hellotr.qdoc
new file mode 100644
index 0000000000..72efd11732
--- /dev/null
+++ b/doc/src/examples/hellotr.qdoc
@@ -0,0 +1,188 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example linguist/hellotr
+    \title Hello tr() Example
+
+    This example is a small Hello World program with a Latin translation. The
+    screenshot below shows the English version.
+
+    \image linguist-hellotr_en.png
+
+    See the \l{Qt Linguist manual} for more information about
+    translating Qt application.
+
+    \section1 Line by Line Walkthrough
+
+
+    \snippet examples/linguist/hellotr/main.cpp 0
+
+    This line includes the definition of the QTranslator class. 
+    Objects of this class provide translations for user-visible text.
+
+    \snippet examples/linguist/hellotr/main.cpp 5
+
+    Creates a QTranslator object without a parent.
+
+    \snippet examples/linguist/hellotr/main.cpp 6
+
+    Tries to load a file called \c hellotr_la.qm (the \c .qm file extension is
+    implicit) that contains Latin translations for the source texts used in
+    the program. No error will occur if the file is not found.
+
+    \snippet examples/linguist/hellotr/main.cpp 7
+
+    Adds the translations from \c hellotr_la.qm to the pool of translations used
+    by the program.
+
+    \snippet examples/linguist/hellotr/main.cpp 8
+
+    Creates a push button that displays "Hello world!". If \c hellotr_la.qm
+    was found and contains a translation for "Hello world!", the
+    translation appears; if not, the source text appears.
+
+    All classes that inherit QObject have a \c tr() function. Inside
+    a member function of a QObject class, we simply write \c tr("Hello
+    world!") instead of \c QPushButton::tr("Hello world!") or \c
+    QObject::tr("Hello world!").
+
+    \section1 Running the Application in English
+
+    Since we haven't made the translation file \c hellotr_la.qm, the source text
+    is shown when we run the application:
+
+    \image linguist-hellotr_en.png
+
+    \section1 Creating a Latin Message File
+
+    The first step is to create a project file, \c hellotr.pro, that lists
+    all the source files for the project. The project file can be a qmake
+    project file, or even an ordinary makefile. Any file that contains
+
+    \snippet examples/linguist/hellotr/hellotr.pro 0
+    \snippet examples/linguist/hellotr/hellotr.pro 1
+
+    will work. \c TRANSLATIONS specifies the message files we want to
+    maintain. In this example, we just maintain one set of translations,
+    namely Latin.
+
+    Note that the file extension is \c .ts, not \c .qm. The \c .ts
+    translation source format is designed for use during the
+    application's development. Programmers or release managers run
+    the \c lupdate program to generate and update \c .ts files with
+    the source text that is extracted from the source code.
+    Translators read and update the \c .ts files using \e {Qt
+    Linguist} adding and editing their translations.
+
+    The \c .ts format is human-readable XML that can be emailed directly
+    and is easy to put under version control. If you edit this file
+    manually, be aware that the default encoding for XML is UTF-8, not
+    Latin1 (ISO 8859-1). One way to type in a Latin1 character such as
+    '\oslash' (Norwegian o with slash) is to use an XML entity:
+    "\&#xf8;". This will work for any Unicode 4.0 character.
+
+    Once the translations are complete the \c lrelease program is used to
+    convert the \c .ts files into the \c .qm Qt message file format. The
+    \c .qm format is a compact binary format designed to deliver very
+    fast lookup performance. Both \c lupdate and \c lrelease read all the
+    project's source and header files (as specified in the HEADERS and
+    SOURCES lines of the project file) and extract the strings that
+    appear in \c tr() function calls.
+
+    \c lupdate is used to create and update the message files (\c hellotr_la.ts
+    in this case) to keep them in sync with the source code. It is safe to
+    run \c lupdate at any time, as \c lupdate does not remove any
+    information. For example, you can put it in the makefile, so the \c .ts
+    files are updated whenever the source changes.
+
+    Try running \c lupdate right now, like this:
+
+    \snippet doc/src/snippets/code/doc_src_examples_hellotr.qdoc 0
+
+    (The \c -verbose option instructs \c lupdate to display messages that
+    explain what it is doing.) You should now have a file \c hellotr_la.ts in
+    the current directory, containing this:
+
+    \snippet doc/src/snippets/code/doc_src_examples_hellotr.qdoc 1
+
+    You don't need to understand the file format since it is read and
+    updated using tools (\c lupdate, \e {Qt Linguist}, \c lrelease).
+
+    \section1 Translating to Latin with Qt Linguist
+
+    We will use \e {Qt Linguist} to provide the translation, although
+    you can use any XML or plain text editor to enter a translation into a
+    \c .ts file.
+
+    To start \e {Qt Linguist}, type
+
+    \snippet doc/src/snippets/code/doc_src_examples_hellotr.qdoc 2
+
+    You should now see the text "QPushButton" in the top left pane.
+    Double-click it, then click on "Hello world!" and enter "Orbis, te
+    saluto!" in the \gui Translation pane (the middle right of the
+    window). Don't forget the exclamation mark!
+
+    Click the \gui Done checkbox and choose \gui File|Save from the
+    menu bar. The \c .ts file will no longer contain
+
+    \snippet doc/src/snippets/code/doc_src_examples_hellotr.qdoc 3
+
+    but instead will have
+
+    \snippet doc/src/snippets/code/doc_src_examples_hellotr.qdoc 4
+
+    \section1 Running the Application in Latin
+
+    To see the application running in Latin, we have to generate a \c .qm
+    file from the \c .ts file. Generating a \c .qm file can be achieved
+    either from within \e {Qt Linguist} (for a single \c .ts file), or
+    by using the command line program \c lrelease which will produce one \c
+    .qm file for each of the \c .ts files listed in the project file.
+    Generate \c hellotr_la.qm from \c hellotr_la.ts by choosing
+    \gui File|Release from \e {Qt Linguist}'s menu bar and pressing
+    \gui Save in the file save dialog that pops up. Now run the \c hellotr
+    program again. This time the button will be labelled "Orbis, te
+    saluto!".
+
+    \image linguist-hellotr_la.png
+*/
diff --git a/doc/src/examples/http.qdoc b/doc/src/examples/http.qdoc
new file mode 100644
index 0000000000..17404a84e9
--- /dev/null
+++ b/doc/src/examples/http.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example network/http
+    \title HTTP Example
+
+    The HTTP example demonstrates a simple HTTP client that shows how to fetch files
+    specified by URLs from remote hosts.
+
+    \image http-example.png
+*/
diff --git a/doc/src/examples/i18n.qdoc b/doc/src/examples/i18n.qdoc
new file mode 100644
index 0000000000..68d9153316
--- /dev/null
+++ b/doc/src/examples/i18n.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example tools/i18n
+    \title I18N Example
+
+    The Internationalization (I18N) example demonstrates Qt's support for translated
+    text. Developers can write the initial application text in one language, and
+    translations can be provided later without any modifications to the code.
+
+    \image i18n-example.png
+*/
diff --git a/doc/src/examples/icons.qdoc b/doc/src/examples/icons.qdoc
new file mode 100644
index 0000000000..750ef2e92a
--- /dev/null
+++ b/doc/src/examples/icons.qdoc
@@ -0,0 +1,794 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example widgets/icons
+    \title Icons Example
+
+    The Icons example shows how QIcon can generate pixmaps reflecting
+    an icon's state, mode and size. These pixmaps are generated from
+    the set of pixmaps made available to the icon, and are used by Qt
+    widgets to show an icon representing a particular action.
+
+    \image icons-example.png Screenshot of the Icons example
+
+    Contents:
+
+    \tableofcontents
+
+    \section1 QIcon Overview
+
+    The QIcon class provides scalable icons in different modes and
+    states. An icon's state and mode are depending on the intended use
+    of the icon. Qt currently defines four modes:
+
+    \table
+    \header \o Mode \o Description
+    \row
+    \o QIcon::Normal
+    \o Display the pixmap when the user is not interacting with the
+       icon, but the functionality represented by the icon is
+       available.
+    \row
+    \o QIcon::Active
+    \o Display the pixmap when the functionality represented by the
+       icon is available and the user is interacting with the icon,
+       for example, moving the mouse over it or clicking it.
+    \row
+    \o QIcon::Disabled
+    \o Display the pixmap when the functionality represented by
+       the icon is not available.
+    \row
+    \o QIcon::Selected
+    \o Display the pixmap when the icon is selected.
+    \endtable
+
+    QIcon's states are QIcon::On and QIcon::Off, which will display
+    the pixmap when the widget is in the respective state. The most
+    common usage of QIcon's states are when displaying checkable tool
+    buttons or menu entries (see QAbstractButton::setCheckable() and
+    QAction::setCheckable()). When a tool button or menu entry is
+    checked, the QIcon's state is \l{QIcon::}{On}, otherwise it's
+    \l{QIcon::}{Off}. You can, for example, use the QIcon's states to
+    display differing pixmaps depending on whether the tool button or
+    menu entry is checked or not.
+
+    A QIcon can generate smaller, larger, active, disabled, and
+    selected pixmaps from the set of pixmaps it is given. Such
+    pixmaps are used by Qt widgets to show an icon representing a
+    particular action.
+
+    \section1 Overview of the Icons Application
+
+    With the Icons application you get a preview of an icon's
+    generated pixmaps reflecting its different states, modes and size.
+
+    When an image is loaded into the application, it is converted into
+    a pixmap and becomes a part of the set of pixmaps available to the
+    icon. An image can be excluded from this set by checking off the
+    related checkbox. The application provides a sub directory
+    containing sets of images explicitly designed to illustrate how Qt
+    renders an icon in different modes and states.
+
+    The application allows you to manipulate the icon size with some
+    predefined sizes and a spin box. The predefined sizes are style
+    dependent, but most of the styles have the same values: Only the
+    Macintosh style differ by using 32 pixels, instead of 16 pixels,
+    for toolbar buttons. You can navigate between the available styles
+    using the \gui View menu.
+
+    \image icons-view-menu.png Screenshot of the View menu
+
+    The \gui View menu also provide the option to make the application
+    guess the icon state and mode from an image's file name. The \gui
+    File menu provide the options of adding an image and removing all
+    images. These last options are also available through a context
+    menu that appears if you press the right mouse button within the
+    table of image files. In addition, the \gui File menu provide an
+    \gui Exit option, and the \gui Help menu provide information about
+    the example and about Qt.
+
+    \image icons_find_normal.png Screenshot of the Find Files
+
+    The screenshot above shows the application with one image file
+    loaded. The \gui {Guess Image Mode/State} is enabled and the
+    style is Plastique.
+
+    When QIcon is provided with only one available pixmap, that
+    pixmap is used for all the states and modes. In this case the
+    pixmap's icon mode is set to normal, and the generated pixmaps
+    for the normal and active modes will look the same. But in
+    disabled and selected mode, Qt will generate a slightly different
+    pixmap.
+
+    The next screenshot shows the application with an additional file
+    loaded, providing QIcon with two available pixmaps. Note that the
+    new image file's mode is set to disabled. When rendering the \gui
+    Disabled mode pixmaps, Qt will now use the new image. We can see
+    the difference: The generated disabled pixmap in the first
+    screenshot is slightly darker than the pixmap with the originally
+    set disabled mode in the second screenshot.
+
+    \image icons_find_normal_disabled.png Screenshot of the Find Files
+
+    When Qt renders the icon's pixmaps it searches through the set of
+    available pixmaps following a particular algorithm. The algorithm
+    is documented in QIcon, but we will describe some particular cases
+    below.
+
+    \image icons_monkey_active.png Screenshot of the Find Files
+
+    In the screenshot above, we have set \c monkey_on_32x32 to be an
+    Active/On pixmap and \c monkey_off_64x64 to be Normal/Off. To
+    render the other six mode/state combinations, QIcon uses the
+    search algorithm described in the table below:
+
+    \table
+    \header \o{2,1} Requested Pixmap \o{8,1} Preferred Alternatives (mode/state)
+    \header \o Mode \o State \o 1  \o 2 \o 3 \o 4 \o 5 \o 6 \o 7 \o 8
+    \row \o{1,2} Normal \o Off \o \bold N0 \o A0 \o N1 \o A1 \o D0 \o S0 \o D1 \o S1
+    \row \o On \o N1 \o \bold A1 \o N0 \o A0 \o D1 \o S1 \o D0 \o S0
+    \row \o{1,2} Active \o Off \o A0 \o \bold N0 \o A1 \o N1 \o D0 \o S0 \o D1 \o S1
+    \row \o On \o \bold A1 \o N1 \o A0 \o N0 \o D1 \o S1 \o D0 \o S0
+    \row \o{1,2} Disabled \o Off \o D0 \o \bold {N0'} \o A0' \o D1 \o N1' \o A1' \o S0' \o S1'
+    \row \o On \o D1 \o N1' \o \bold {A1'} \o D0 \o N0' \o A0' \o S1' \o S0'
+    \row \o{1,2} Selected \o Off \o S0 \o \bold {N0''} \o A0'' \o S1 \o N1'' \o A1'' \o D0'' \o D1''
+    \row \o On \o S1 \o N1'' \o \bold {A1''} \o S0 \o N0'' \o A0'' \o D1'' \o D0''
+    \endtable
+
+    In the table, "0" and "1" stand for Off" and "On", respectively.
+    Single quotes indicates that QIcon generates a disabled ("grayed
+    out") version of the pixmap; similarly, double quuote indicate
+    that QIcon generates a selected ("blued out") version of the
+    pixmap.
+
+    The alternatives used in the screenshot above are shown in bold.
+    For example, the Disabled/Off pixmap is derived by graying out
+    the Normal/Off pixmap (\c monkey_off_64x64).
+
+    In the next screenshots, we loaded the whole set of monkey
+    images. By checking or unchecking file names from the image list,
+    we get different results:
+
+    \table
+    \row
+    \o \inlineimage icons_monkey.png Screenshot of the Monkey Files
+    \o \inlineimage icons_monkey_mess.png Screenshot of the Monkey Files
+    \endtable
+
+    For any given mode/state combination, it is possible to specify
+    several images at different resolutions. When rendering an
+    icon, QIcon will automatically pick the most suitable image
+    and scale it down if necessary. (QIcon never scales up images,
+    because this rarely looks good.)
+
+    The screenshots below shows what happens when we provide QIcon
+    with three images (\c qt_extended_16x16.png, \c qt_extended_32x32.png, \c
+    qt_extended_48x48.png) and try to render the QIcon at various
+    resolutions:
+
+    \table
+    \row
+    \o
+    \o \inlineimage icons_qt_extended_8x8.png Qt Extended icon at 8 x 8
+    \o \inlineimage icons_qt_extended_16x16.png Qt Extended icon at 16 x 16
+    \o \inlineimage icons_qt_extended_17x17.png Qt Extended icon at 17 x 17
+    \row
+    \o
+    \o 8 x 8
+    \o \bold {16 x 16}
+    \o 17 x 17
+    \row
+    \o \inlineimage icons_qt_extended_32x32.png Qt Extended icon at 32 x 32
+    \o \inlineimage icons_qt_extended_33x33.png Qt Extended icon at 33 x 33
+    \o \inlineimage icons_qt_extended_48x48.png Qt Extended icon at 48 x 48
+    \o \inlineimage icons_qt_extended_64x64.png Qt Extended icon at 64 x 64
+    \row
+    \o \bold {32 x 32}
+    \o 33 x 33
+    \o \bold {48 x 48}
+    \o 64 x 64
+    \endtable
+
+    For sizes up to 16 x 16, QIcon uses \c qt_extended_16x16.png and
+    scales it down if necessary. For sizes between 17 x 17 and 32 x
+    32, it uses \c qt_extended_32x32.png. For sizes above 32 x 32, it uses
+    \c qt_extended_48x48.png.
+
+    \section1 Line-by-Line Walkthrough
+
+    The Icons example consists of four classes:
+
+    \list
+    \o \c MainWindow inherits QMainWindow and is the main application
+       window.
+    \o \c IconPreviewArea is a custom widget that displays all
+       combinations of states and modes for a given icon.
+    \o \c IconSizeSpinBox is a subclass of QSpinBox that lets the
+       user enter icon sizes (e.g., "48 x 48").
+    \o \c ImageDelegate is a subclass of QItemDelegate that provides
+       comboboxes for letting the user set the mode and state
+       associated with an image.
+    \endlist
+
+    We will start by reviewing the \c IconPreviewArea class before we
+    take a look at the \c MainWindow class. Finally, we will review the
+    \c IconSizeSpinBox and \c ImageDelegate classes.
+
+    \section2 IconPreviewArea Class Definition
+
+    An \c IconPreviewArea widget consists of a group box containing a grid of
+    QLabel widgets displaying headers and pixmaps.
+
+    \image icons_preview_area.png Screenshot of IconPreviewArea.
+
+    \snippet examples/widgets/icons/iconpreviewarea.h 0
+
+    The \c IconPreviewArea class inherits QWidget. It displays the
+    generated pixmaps corresponding to an icon's possible states and
+    modes at a given size.
+
+    We need two public functions to set the current icon and the
+    icon's size. In addition the class has three private functions: We
+    use the \c createHeaderLabel() and \c createPixmapLabel()
+    functions when constructing the preview area, and we need the \c
+    updatePixmapLabels() function to update the preview area when
+    the icon or the icon's size has changed.
+
+    The \c NumModes and \c NumStates constants reflect \l{QIcon}'s
+    number of currently defined modes and states.
+
+    \section2 IconPreviewArea Class Implementation
+
+    \snippet examples/widgets/icons/iconpreviewarea.cpp 0
+
+    In the constructor we create the labels displaying the headers and
+    the icon's generated pixmaps, and add them to a grid layout.
+
+    When creating the header labels, we make sure the enums \c
+    NumModes and \c NumStates defined in the \c .h file, correspond
+    with the number of labels that we create. Then if the enums at
+    some point are changed, the \c Q_ASSERT() macro will alert that this
+    part of the \c .cpp file needs to be updated as well.
+
+    If the application is built in debug mode, the \c Q_ASSERT()
+    macro will expand to
+
+    \snippet doc/src/snippets/code/doc_src_examples_icons.qdoc 0
+
+    In release mode, the macro simply disappear. The mode can be set
+    in the application's \c .pro file. One way to do so is to add an
+    option to \c qmake when building the application:
+
+    \snippet doc/src/snippets/code/doc_src_examples_icons.qdoc 1
+
+    or
+
+    \snippet doc/src/snippets/code/doc_src_examples_icons.qdoc 2
+
+    Another approach is to add this line directly to the \c .pro
+    file.
+
+    \snippet examples/widgets/icons/iconpreviewarea.cpp 1
+    \codeline
+    \snippet examples/widgets/icons/iconpreviewarea.cpp 2
+
+    The public \c setIcon() and \c setSize() functions change the icon
+    or the icon size, and make sure that the generated pixmaps are
+    updated.
+
+    \snippet examples/widgets/icons/iconpreviewarea.cpp 3
+    \codeline
+    \snippet examples/widgets/icons/iconpreviewarea.cpp 4
+
+    We use the \c createHeaderLabel() and \c createPixmapLabel()
+    functions to create the preview area's labels displaying the
+    headers and the icon's generated pixmaps. Both functions return
+    the QLabel that is created.
+
+    \snippet examples/widgets/icons/iconpreviewarea.cpp 5
+
+    We use the private \c updatePixmapLabel() function to update the
+    generated pixmaps displayed in the preview area.
+
+    For each mode, and for each state, we retrieve a pixmap using the
+    QIcon::pixmap() function, which generates a pixmap corresponding
+    to the given state, mode and size.
+
+    \section2 MainWindow Class Definition
+
+    The \c MainWindow widget consists of three main elements: an
+    images group box, an icon size group box and a preview area.
+
+    \image icons-example.png Screenshot of the Icons example
+
+    \snippet examples/widgets/icons/mainwindow.h 0
+
+    The MainWindow class inherits from QMainWindow. We reimplement the
+    constructor, and declare several private slots:
+
+    \list
+    \o The \c about() slot simply provides information about the example.
+    \o The \c changeStyle() slot changes the application's GUI style and
+       adjust the style dependent size options.
+    \o The \c changeSize() slot changes the size of the preview area's icon.
+    \o The \c changeIcon() slot updates the set of pixmaps available to the
+       icon displayed in the preview area.
+    \o The \c addImage() slot allows the user to load a new image into the
+       application.
+    \endlist
+
+    In addition we declare several private functions to simplify the
+    constructor.
+
+    \section2 MainWindow Class Implementation
+
+    \snippet examples/widgets/icons/mainwindow.cpp 0
+
+    In the constructor we first create the main window's central
+    widget and its child widgets, and put them in a grid layout. Then
+    we create the menus with their associated entries and actions.
+
+    Before we resize the application window to a suitable size, we set
+    the window title and determine the current style for the
+    application. We also enable the icon size spin box by clicking the
+    associated radio button, making the current value of the spin box
+    the icon's initial size.
+
+    \snippet examples/widgets/icons/mainwindow.cpp 1
+
+    The \c about() slot displays a message box using the static
+    QMessageBox::about() function. In this example it displays a
+    simple box with information about the example.
+
+    The \c about() function looks for a suitable icon in four
+    locations: It prefers its parent's icon if that exists. If it
+    doesn't, the function tries the top-level widget containing
+    parent, and if that fails, it tries the active window. As a last
+    resort it uses the QMessageBox's Information icon.
+
+    \snippet examples/widgets/icons/mainwindow.cpp 2
+
+    In the \c changeStyle() slot we first check the slot's
+    parameter. If it is false we immediately return, otherwise we find
+    out which style to change to, i.e. which action that triggered the
+    slot, using the QObject::sender() function.
+
+    This function returns the sender as a QObject pointer. Since we
+    know that the sender is a QAction object, we can safely cast the
+    QObject. We could have used a C-style cast or a C++ \c
+    static_cast(), but as a defensive programming technique we use a
+    \l qobject_cast(). The advantage is that if the object has the
+    wrong type, a null pointer is returned. Crashes due to null
+    pointers are much easier to diagnose than crashes due to unsafe
+    casts.
+
+    \snippet examples/widgets/icons/mainwindow.cpp 3
+    \snippet examples/widgets/icons/mainwindow.cpp 4
+
+    Once we have the action, we extract the style name using
+    QAction::data(). Then we create a QStyle object using the static
+    QStyleFactory::create() function.
+
+    Although we can assume that the style is supported by the
+    QStyleFactory: To be on the safe side, we use the \c Q_ASSERT()
+    macro to check if the created style is valid before we use the
+    QApplication::setStyle() function to set the application's GUI
+    style to the new style. QApplication will automatically delete
+    the style object when a new style is set or when the application
+    exits.
+
+    The predefined icon size options provided in the application are
+    style dependent, so we need to update the labels in the icon size
+    group box and in the end call the \c changeSize() slot to update
+    the icon's size.
+
+    \snippet examples/widgets/icons/mainwindow.cpp 5
+
+    The \c changeSize() slot sets the size for the preview area's
+    icon.
+
+    To determine the new size we first check if the spin box is
+    enabled. If it is, we extract the extent of the new size from the
+    box. If it's not, we search through the predefined size options,
+    extract the QStyle::PixelMetric and use the QStyle::pixelMetric()
+    function to determine the extent. Then we create a QSize object
+    based on the extent, and use that object to set the size of the
+    preview area's icon.
+
+    \snippet examples/widgets/icons/mainwindow.cpp 12
+
+    The first thing we do when the \c addImage() slot is called, is to
+    show a file dialog to the user. The easiest way to create a file
+    dialog is to use QFileDialog's static functions. Here we use the
+    \l {QFileDialog::getOpenFileNames()}{getOpenFileNames()} function
+    that will return one or more existing files selected by the user.
+
+    For each of the files the file dialog returns, we add a row to the
+    table widget. The table widget is listing the images the user has
+    loaded into the application.
+
+    \snippet examples/widgets/icons/mainwindow.cpp 13
+    \snippet examples/widgets/icons/mainwindow.cpp 14
+
+    We retrieve the image name using the QFileInfo::baseName()
+    function that returns the base name of the file without the path,
+    and create the first table widget item in the row. Then we add the
+    file's complete name to the item's data. Since an item can hold
+    several information pieces, we need to assign the file name a role
+    that will distinguish it from other data. This role can be Qt::UserRole
+    or any value above it.
+
+    We also make sure that the item is not editable by removing the
+    Qt::ItemIsEditable flag. Table items are editable by default.
+
+    \snippet examples/widgets/icons/mainwindow.cpp 15
+    \snippet examples/widgets/icons/mainwindow.cpp 16
+    \snippet examples/widgets/icons/mainwindow.cpp 17
+
+    Then we create the second and third items in the row making the
+    default mode Normal and the default state Off. But if the \gui
+    {Guess Image Mode/State} option is checked, and the file name
+    contains "_act", "_dis", or "_sel", the modes are changed to
+    Active, Disabled, or Selected. And if the file name contains
+    "_on", the state is changed to On. The sample files in the
+    example's \c images subdirectory respect this naming convension.
+
+    \snippet examples/widgets/icons/mainwindow.cpp 18
+    \snippet examples/widgets/icons/mainwindow.cpp 19
+
+    In the end we add the items to the associated row, and use the
+    QTableWidget::openPersistentEditor() function to create
+    comboboxes for the mode and state columns of the items.
+
+    Due to the the connection between the table widget's \l
+    {QTableWidget::itemChanged()}{itemChanged()} signal and the \c
+    changeIcon() slot, the new image is automatically converted into a
+    pixmap and made part of the set of pixmaps available to the icon
+    in the preview area. So, corresponding to this fact, we need to
+    make sure that the new image's check box is enabled.
+
+    \snippet examples/widgets/icons/mainwindow.cpp 6
+    \snippet examples/widgets/icons/mainwindow.cpp 7
+
+    The \c changeIcon() slot is called when the user alters the set
+    of images listed in the QTableWidget, to update the QIcon object
+    rendered by the \c IconPreviewArea.
+
+    We first create a QIcon object, and then we run through the
+    QTableWidget, which lists the images the user has loaded into the
+    application.
+
+    \snippet examples/widgets/icons/mainwindow.cpp 8
+    \snippet examples/widgets/icons/mainwindow.cpp 9
+    \snippet examples/widgets/icons/mainwindow.cpp 10
+
+    We also extract the image file's name using the
+    QTableWidgetItem::data() function. This function takes a
+    Qt::DataItemRole as an argument to retrieve the right data
+    (remember that an item can hold several pieces of information)
+    and returns it as a QVariant. Then we use the
+    QVariant::toString() function to get the file name as a QString.
+
+    To create a pixmap from the file, we need to first create an
+    image and then convert this image into a pixmap using
+    QPixmap::fromImage(). Once we have the final pixmap, we add it,
+    with its associated mode and state, to the QIcon's set of
+    available pixmaps.
+
+    \snippet examples/widgets/icons/mainwindow.cpp 11
+
+    After running through the entire list of images, we change the
+    icon of the preview area to the one we just created.
+
+    \snippet examples/widgets/icons/mainwindow.cpp 20
+
+    In the \c removeAllImages() slot, we simply set the table widget's
+    row count to zero, automatically removing all the images the user
+    has loaded into the application. Then we update the set of pixmaps
+    available to the preview area's icon using the \c changeIcon()
+    slot.
+
+    \image icons_images_groupbox.png Screenshot of the images group box
+
+    The \c createImagesGroupBox() function is implemented to simplify
+    the constructor. The main purpose of the function is to create a
+    QTableWidget that will keep track of the images the user has
+    loaded into the application.
+
+    \snippet examples/widgets/icons/mainwindow.cpp 21
+
+    First we create a group box that will contain the table widget.
+    Then we create a QTableWidget and customize it to suit our
+    purposes.
+
+    We call QAbstractItemView::setSelectionMode() to prevent the user
+    from selecting items.
+
+    The QAbstractItemView::setItemDelegate() call sets the item
+    delegate for the table widget. We create a \c ImageDelegate that
+    we make the item delegate for our view.
+
+    The QItemDelegate class can be used to provide an editor for an item view
+    class that is subclassed from QAbstractItemView. Using a delegate
+    for this purpose allows the editing mechanism to be customized and
+    developed independently from the model and view.
+
+    In this example we derive \c ImageDelegate from QItemDelegate.
+    QItemDelegate usually provides line editors, while our subclass
+    \c ImageDelegate, provides comboboxes for the mode and state
+    fields.
+
+    \snippet examples/widgets/icons/mainwindow.cpp 22
+    \snippet examples/widgets/icons/mainwindow.cpp 23
+
+    Then we customize the QTableWidget's horizontal header, and hide
+    the vertical header.
+
+    \snippet examples/widgets/icons/mainwindow.cpp 24
+    \snippet examples/widgets/icons/mainwindow.cpp 25
+
+    At the end, we connect the QTableWidget::itemChanged() signal to
+    the \c changeIcon() slot to ensuret that the preview area is in
+    sync with the image table.
+
+    \image icons_size_groupbox.png Screenshot of the icon size group box
+
+    The \c createIconSizeGroupBox() function is called from the
+    constructor. It creates the widgets controlling the size of the
+    preview area's icon.
+
+    \snippet examples/widgets/icons/mainwindow.cpp 26
+
+    First we create a group box that will contain all the widgets;
+    then we create the radio buttons and the spin box.
+
+    The spin box is not a regular QSpinBox but an \c IconSizeSpinBox.
+    The \c IconSizeSpinBox class inherits QSpinBox and reimplements
+    two functions: QSpinBox::textFromValue() and
+    QSpinBox::valueFromText(). The \c IconSizeSpinBox is designed to
+    handle icon sizes, e.g., "32 x 32", instead of plain integer
+    values.
+
+    \snippet examples/widgets/icons/mainwindow.cpp 27
+
+    Then we connect all of the radio buttons
+    \l{QRadioButton::toggled()}{toggled()} signals and the spin box's
+    \l {QSpinBox::valueChanged()}{valueChanged()} signal to the \c
+    changeSize() slot to make sure that the size of the preview
+    area's icon is updated whenever the user changes the icon size.
+    In the end we put the widgets in a layout that we install on the
+    group box.
+
+    \snippet examples/widgets/icons/mainwindow.cpp 28
+
+    In the \c createActions() function we create and customize all the
+    actions needed to implement the functionality associated with the
+    menu entries in the application.
+
+    In particular we create the \c styleActionGroup based on the
+    currently available GUI styles using
+    QStyleFactory. QStyleFactory::keys() returns a list of valid keys,
+    typically including "windows", "motif", "cde", and
+    "plastique". Depending on the platform, "windowsxp" and
+    "macintosh" may be available.
+
+    We create one action for each key, and adds the action to the
+    action group. Also, for each action, we call QAction::setData()
+    with the style name. We will retrieve it later using
+    QAction::data().
+
+    \snippet examples/widgets/icons/mainwindow.cpp 29
+
+    In the \c createMenu() function, we add the previously created
+    actions to the \gui File, \gui View and \gui Help menus.
+
+    The QMenu class provides a menu widget for use in menu bars,
+    context menus, and other popup menus. We put each menu in the
+    application's menu bar, which we retrieve using
+    QMainWindow::menuBar().
+
+    \snippet examples/widgets/icons/mainwindow.cpp 30
+
+    QWidgets have a \l{QWidget::contextMenuPolicy}{contextMenuPolicy}
+    property that controls how the widget should behave when the user
+    requests a context menu (e.g., by right-clicking). We set the
+    QTableWidget's context menu policy to Qt::ActionsContextMenu,
+    meaning that the \l{QAction}s associated with the widget should
+    appear in its context menu.
+
+    Then we add the \gui{Add Image} and \gui{Remove All Images}
+    actions to the table widget. They will then appear in the table
+    widget's context menu.
+
+    \snippet examples/widgets/icons/mainwindow.cpp 31
+
+    In the \c checkCurrentStyle() function we go through the group of
+    style actions, looking for the current GUI style.
+
+    For each action, we first extract the style name using
+    QAction::data(). Since this is only a QStyleFactory key (e.g.,
+    "macintosh"), we cannot compare it directly to the current
+    style's class name. We need to create a QStyle object using the
+    static QStyleFactory::create() function and compare the class
+    name of the created QStyle object with that of the current style.
+    As soon as we are done with a QStyle candidate, we delete it.
+
+    For all QObject subclasses that use the \c Q_OBJECT macro, the
+    class name of an object is available through its
+    \l{QObject::metaObject()}{meta-object}.
+
+    We can assume that the style is supported by
+    QStyleFactory, but to be on the safe side we use the \c
+    Q_ASSERT() macro to make sure that QStyleFactory::create()
+    returned a valid pointer.
+
+    \section2 IconSizeSpinBox Class Definition
+
+    \snippet examples/widgets/icons/iconsizespinbox.h 0
+
+    The \c IconSizeSpinBox class is a subclass of QSpinBox. A plain
+    QSpinBox can only handle integers. But since we want to display
+    the spin box's values in a more sophisticated way, we need to
+    subclass QSpinBox and reimplement the QSpinBox::textFromValue()
+    and QSpinBox::valueFromText() functions.
+
+    \image icons_size_spinbox.png Screenshot of the icon size spinbox
+
+    \section2 IconSizeSpinBox Class Implementation
+
+    \snippet examples/widgets/icons/iconsizespinbox.cpp 0
+
+    The constructor is trivial.
+
+    \snippet examples/widgets/icons/iconsizespinbox.cpp 2
+
+    QSpinBox::textFromValue() is used by the spin box whenever it
+    needs to display a value. The default implementation returns a
+    base 10 representation of the \c value parameter.
+
+    Our reimplementation returns a QString of the form "32 x 32".
+
+    \snippet examples/widgets/icons/iconsizespinbox.cpp 1
+
+    The QSpinBox::valueFromText() function is used by the spin box
+    whenever it needs to interpret text typed in by the user. Since
+    we reimplement the \c textFromValue() function we also need to
+    reimplement the \c valueFromText() function to interpret the
+    parameter text and return the associated int value.
+
+    We parse the text using a regular expression (a QRegExp). We
+    define an expression that matches one or several digits,
+    optionally followed by whitespace, an "x" or the times symbol,
+    whitespace and one or several digits again.
+
+    The first digits of the regular expression are captured using
+    parentheses. This enables us to use the QRegExp::cap() or
+    QRegExp::capturedTexts() functions to extract the matched
+    characters. If the first and second numbers of the spin box value
+    differ (e.g., "16 x 24"), we use the first number.
+
+    When the user presses \key Enter, QSpinBox first calls
+    QSpinBox::valueFromText() to interpret the text typed by the
+    user, then QSpinBox::textFromValue() to present it in a canonical
+    format (e.g., "16 x 16").
+
+    \section2 ImageDelegate Class Definition
+
+    \snippet examples/widgets/icons/imagedelegate.h 0
+
+    The \c ImageDelegate class is a subclass of QItemDelegate. The
+    QItemDelegate class provides display and editing facilities for
+    data items from a model. A single QItemDelegate object is
+    responsible for all items displayed in a item view (in our case,
+    a QTableWidget).
+
+    A QItemDelegate can be used to provide an editor for an item view
+    class that is subclassed from QAbstractItemView. Using a delegate
+    for this purpose allows the editing mechanism to be customized and
+    developed independently from the model and view.
+
+    \snippet examples/widgets/icons/imagedelegate.h 1
+
+    The default implementation of QItemDelegate creates a QLineEdit.
+    Since we want the editor to be a QComboBox, we need to subclass
+    QItemDelegate and reimplement the QItemDelegate::createEditor(),
+    QItemDelegate::setEditorData() and QItemDelegate::setModelData()
+    functions.
+
+    \snippet examples/widgets/icons/imagedelegate.h 2
+
+    The \c emitCommitData() slot is used to emit the
+    QImageDelegate::commitData() signal with the appropriate
+    argument.
+
+    \section2 ImageDelegate Class Implementation
+
+    \snippet examples/widgets/icons/imagedelegate.cpp 0
+
+    The constructor is trivial.
+
+    \snippet examples/widgets/icons/imagedelegate.cpp 1
+
+    The default QItemDelegate::createEditor() implementation returns
+    the widget used to edit the item specified by the model and item
+    index for editing. The parent widget and style option are used to
+    control the appearance of the editor widget.
+
+    Our reimplementation create and populate a combobox instead of
+    the default line edit. The contents of the combobox depends on
+    the column in the table for which the editor is requested. Column
+    1 contains the QIcon modes, whereas column 2 contains the QIcon
+    states.
+
+    In addition, we connect the combobox's \l
+    {QComboBox::activated()}{activated()} signal to the \c
+    emitCommitData() slot to emit the
+    QAbstractItemDelegate::commitData() signal whenever the user
+    chooses an item using the combobox. This ensures that the rest of
+    the application notices the change and updates itself.
+
+    \snippet examples/widgets/icons/imagedelegate.cpp 2
+
+    The QItemDelegate::setEditorData() function is used by
+    QTableWidget to transfer data from a QTableWidgetItem to the
+    editor. The data is stored as a string; we use
+    QComboBox::findText() to locate it in the combobox.
+
+    Delegates work in terms of models, not items. This makes it
+    possible to use them with any item view class (e.g., QListView,
+    QListWidget, QTreeView, etc.). The transition between model and
+    items is done implicitly by QTableWidget; we don't need to worry
+    about it.
+
+    \snippet examples/widgets/icons/imagedelegate.cpp 3
+
+    The QItemDelegate::setEditorData() function is used by QTableWidget
+    to transfer data back from the editor to the \l{QTableWidgetItem}.
+
+    \snippet examples/widgets/icons/imagedelegate.cpp 4
+
+    The \c emitCommitData() slot simply emit the
+    QAbstractItemDelegate::commitData() signal for the editor that
+    triggered the slot. This signal must be emitted when the editor
+    widget has completed editing the data, and wants to write it back
+    into the model.
+*/
diff --git a/doc/src/examples/imagecomposition.qdoc b/doc/src/examples/imagecomposition.qdoc
new file mode 100644
index 0000000000..8cba805f59
--- /dev/null
+++ b/doc/src/examples/imagecomposition.qdoc
@@ -0,0 +1,179 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example painting/imagecomposition
+    \title Image Composition Example
+
+    The Image Composition example lets the user combine images
+    together using any composition mode supported by QPainter, described
+    in detail in \l{QPainter#Composition Modes}{Composition Modes}.
+
+    \image imagecomposition-example.png
+
+    \section1 Setting Up The Resource File
+
+    The Image Composition example requires two source images,
+    \e butterfly.png and \e checker.png that are embedded within
+    \e imagecomposition.qrc. The file contains the following code:
+
+    \quotefile examples/painting/imagecomposition/imagecomposition.qrc
+
+    For more information on resource files, see \l{The Qt Resource System}.
+
+    \section1 ImageComposer Class Definition
+
+    The \c ImageComposer class is a subclass of QWidget that implements three
+    private slots, \c chooseSource(), \c chooseDestination(), and
+    \c recalculateResult().
+
+    \snippet examples/painting/imagecomposition/imagecomposer.h 0
+
+    In addition, \c ImageComposer consists of five private functions,
+    \c addOp(), \c chooseImage(), \c loadImage(), \c currentMode(), and
+    \c imagePos(), as well as private instances of QToolButton, QComboBox,
+    QLabel, and QImage.
+
+    \snippet examples/painting/imagecomposition/imagecomposer.h 1
+
+    \section1 ImageComposer Class Implementation
+
+    We declare a QSize object, \c resultSize, as a static constant with width
+    and height equal to 200.
+
+    \snippet examples/painting/imagecomposition/imagecomposer.cpp 0
+
+    Within the constructor, we instantiate a QToolButton object,
+    \c sourceButton and set its \l{QAbstractButton::setIconSize()}{iconSize}
+    property to \c resultSize. The \c operatorComboBox is instantiated and
+    then populated using the \c addOp() function. This function accepts a
+    QPainter::CompositionMode, \a mode, and a QString, \a name, representing
+    the name of the composition mode.
+
+    \snippet examples/painting/imagecomposition/imagecomposer.cpp 1
+
+    The \c destinationButton is instantiated and its
+    \l{QAbstractButton::setIconSize()}{iconSize} property is set to
+    \c resultSize as well. The \l{QLabel}s \c equalLabel and \c resultLabel
+    are created and \c{resultLabel}'s \l{QWidget::setMinimumWidth()}
+    {minimumWidth} is set.
+
+    \snippet examples/painting/imagecomposition/imagecomposer.cpp 2
+
+    We connect the following signals to their corresponding slots:
+    \list
+        \o \c{sourceButton}'s \l{QPushButton::clicked()}{clicked()} signal is
+            connected to \c chooseSource(),
+        \o \c{operatorComboBox}'s \l{QComboBox::activated()}{activated()}
+            signal is connected to \c recalculateResult(), and
+        \o \c{destinationButton}'s \l{QToolButton::clicked()}{clicked()} signal
+            is connected to \c chooseDestination().
+    \endlist
+
+    \snippet examples/painting/imagecomposition/imagecomposer.cpp 3
+
+    A QGridLayout, \c mainLayout, is used to place all the widgets. Note
+    that \c{mainLayout}'s \l{QLayout::setSizeConstraint()}{sizeConstraint}
+    property is set to QLayout::SetFixedSize, which means that
+    \c{ImageComposer}'s size cannot be resized at all.
+
+    \snippet examples/painting/imagecomposition/imagecomposer.cpp 4
+
+    We create a QImage, \c resultImage, and we invoke \c loadImage() twice
+    to load both the image files in our \e imagecomposition.qrc file. Then,
+    we set the \l{QWidget::setWindowTitle()}{windowTitle} property to
+    "Image Composition".
+
+    \snippet examples/painting/imagecomposition/imagecomposer.cpp 5
+
+    The \c chooseSource() and \c chooseDestination() functions are
+    convenience functions that invoke \c chooseImage() with specific
+    parameters.
+
+    \snippet examples/painting/imagecomposition/imagecomposer.cpp 6
+    \codeline
+    \snippet examples/painting/imagecomposition/imagecomposer.cpp 7
+
+    The \c chooseImage() function loads an image of the user's choice,
+    depending on the \a title, \a image, and \a button.
+
+    \snippet examples/painting/imagecomposition/imagecomposer.cpp 10
+
+    The \c recalculateResult() function is used to calculate amd display the
+    result of combining the two images together with the user's choice of
+    composition mode.
+
+    \snippet examples/painting/imagecomposition/imagecomposer.cpp 8
+
+    The \c addOp() function adds an item to the \c operatorComboBox using
+    \l{QComboBox}'s \l{QComboBox::addItem()}{addItem} function. This function
+    accepts a QPainter::CompositionMode, \a mode, and a QString, \a name. The
+    rectangle is filled with Qt::Transparent and both the \c sourceImage and
+    \c destinationImage are painted, before displaying it on \c resultLabel.
+
+    \snippet examples/painting/imagecomposition/imagecomposer.cpp 9
+
+    The \c loadImage() function paints a transparent background using
+    \l{QPainter::fillRect()}{fillRect()} and draws \c image in a
+    centralized position using \l{QPainter::drawImage()}{drawImage()}.
+    This \c image is then set as the \c{button}'s icon.
+
+    \snippet examples/painting/imagecomposition/imagecomposer.cpp 11
+
+    The \c currentMode() function returns the composition mode currently
+    selected in \c operatorComboBox.
+
+    \snippet examples/painting/imagecomposition/imagecomposer.cpp 12
+
+    We use the \c imagePos() function to ensure that images loaded onto the
+    QToolButton objects, \c sourceButton and \c destinationButton, are
+    centralized.
+
+    \snippet examples/painting/imagecomposition/imagecomposer.cpp 13
+
+    \section1 The \c main() Function
+
+    The \c main() function instantiates QApplication and \c ImageComposer
+    and invokes its \l{QWidget::show()}{show()} function.
+
+    \snippet examples/painting/imagecomposition/main.cpp 0
+
+    */
diff --git a/doc/src/examples/imageviewer.qdoc b/doc/src/examples/imageviewer.qdoc
new file mode 100644
index 0000000000..688167352b
--- /dev/null
+++ b/doc/src/examples/imageviewer.qdoc
@@ -0,0 +1,340 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example widgets/imageviewer
+    \title Image Viewer Example
+
+    The example shows how to combine QLabel and QScrollArea to
+    display an image. QLabel is typically used for displaying text,
+    but it can also display an image. QScrollArea provides a
+    scrolling view around another widget. If the child widget exceeds
+    the size of the frame, QScrollArea automatically provides scroll
+    bars.
+
+    The example demonstrates how QLabel's ability to scale its
+    contents (QLabel::scaledContents), and QScrollArea's ability to
+    automatically resize its contents (QScrollArea::widgetResizable),
+    can be used to implement zooming and scaling features. In
+    addition the example shows how to use QPainter to print an image.
+
+    \image imageviewer-example.png Screenshot of the Image Viewer example
+
+    With the Image Viewer application, the users can view an image of
+    their choice. The \gui File menu gives the user the possibility
+    to:
+
+    \list
+    \o \gui{Open...} - Open an image file
+    \o \gui{Print...} - Print an image
+    \o \gui{Exit} - Exit the application
+    \endlist
+
+    Once an image is loaded, the \gui View menu allows the users to:
+
+    \list
+    \o \gui{Zoom In} - Scale the image up by 25%
+    \o \gui{Zoom Out} - Scale the image down by 25%
+    \o \gui{Normal Size} - Show the image at its original size
+    \o \gui{Fit to Window} - Stretch the image to occupy the entire window
+    \endlist
+
+    In addition the \gui Help menu provides the users with information
+    about the Image Viewer example in particular, and about Qt in
+    general.
+
+    \section1 ImageViewer Class Definition
+
+    \snippet examples/widgets/imageviewer/imageviewer.h 0
+
+    The \c ImageViewer class inherits from QMainWindow. We reimplement
+    the constructor, and create several private slots to facilitate
+    the menu entries. In addition we create four private functions.
+
+    We use \c createActions() and \c createMenus() when constructing
+    the \c ImageViewer widget. We use the \c updateActions() function
+    to update the menu entries when a new image is loaded, or when
+    the \gui {Fit to Window} option is toggled. The zoom slots use \c
+    scaleImage() to perform the zooming. In turn, \c
+    scaleImage() uses \c adjustScrollBar() to preserve the focal point after
+    scaling an image.
+
+    \section1 ImageViewer Class Implementation
+
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 0
+
+    In the constructor we first create the label and the scroll area.
+
+    We set \c {imageLabel}'s size policy to \l
+    {QSizePolicy::Ignored}{ignored}, making the users able to scale
+    the image to whatever size they want when the \gui {Fit to Window}
+    option is turned on. Otherwise, the default size polizy (\l
+    {QSizePolicy::Preferred}{preferred}) will make scroll bars appear
+    when the scroll area becomes smaller than the label's minimum size
+    hint.
+
+    We ensure that the label will scale its contents to fill all
+    available space, to enable the image to scale properly when
+    zooming. If we omitted to set the \c {imageLabel}'s \l
+    {QLabel::scaledContents}{scaledContents} property, zooming in
+    would enlarge the QLabel, but leave the pixmap at
+    its original size, exposing the QLabel's background.
+
+    We make \c imageLabel the scroll area's child widget, and we make
+    \c scrollArea the central widget of the QMainWindow. At the end
+    we create the associated actions and menus, and customize the \c
+    {ImageViewer}'s appearance.
+
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 1
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 2
+
+    In the \c open() slot, we show a file dialog to the user. The
+    easiest way to create a QFileDialog is to use the static
+    convenience functions. QFileDialog::getOpenFileName() returns an
+    existing file selected by the user. If the user presses \gui
+    Cancel, QFileDialog returns an empty string.
+
+    Unless the file name is a empty string, we check if the file's
+    format is an image format by constructing a QImage which tries to
+    load the image from the file. If the constructor returns a null
+    image, we use a QMessageBox to alert the user.
+
+    The QMessageBox class provides a modal dialog with a short
+    message, an icon, and some buttons. As with QFileDialog the
+    easiest way to create a QMessageBox is to use its static
+    convenience functions. QMessageBox provides a range of different
+    messages arranged along two axes: severity (question,
+    information, warning and critical) and complexity (the number of
+    necessary response buttons). In this particular example an
+    information message with an \gui OK button (the default) is
+    sufficient, since the message is part of a normal operation.
+
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 3
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 4
+
+    If the format is supported, we display the image in \c imageLabel
+    by setting the label's \l {QLabel::pixmap}{pixmap}. Then we enable
+    the \gui Print and \gui {Fit to Window} menu entries and update
+    the rest of the view menu entries. The \gui Open and \gui Exit
+    entries are enabled by default.
+
+    If the \gui {Fit to Window} option is turned off, the
+    QScrollArea::widgetResizable property is \c false and it is
+    our responsibility (not QScrollArea's) to give the QLabel a
+    reasonable size based on its contents. We call
+    \{QWidget::adjustSize()}{adjustSize()} to achieve this, which is
+    essentially the same as
+
+    \snippet doc/src/snippets/code/doc_src_examples_imageviewer.qdoc 0
+
+    In the \c print() slot, we first make sure that an image has been
+    loaded into the application:
+
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 5
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 6
+
+    If the application is built in debug mode, the \c Q_ASSERT() macro
+    will expand to
+
+    \snippet doc/src/snippets/code/doc_src_examples_imageviewer.qdoc 1
+
+    In release mode, the macro simply disappear. The mode can be set
+    in the application's \c .pro file. One way to do so is to add an
+    option to \gui qmake when building the appliction:
+
+    \snippet doc/src/snippets/code/doc_src_examples_imageviewer.qdoc 2
+
+    or
+
+    \snippet doc/src/snippets/code/doc_src_examples_imageviewer.qdoc 3
+
+    Another approach is to add this line directly to the \c .pro
+    file.
+
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 7
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 8
+
+    Then we present a print dialog allowing the user to choose a
+    printer and to set a few options. We construct a painter with a
+    QPrinter as the paint device. We set the painter's window
+    and viewport in such a way that the image is as large as possible
+    on the paper, but without altering its
+    \l{Qt::KeepAspectRatio}{aspect ratio}.
+
+    In the end we draw the pixmap at position (0, 0).
+
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 9
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 10
+
+    We implement the zooming slots using the private \c scaleImage()
+    function. We set the scaling factors to 1.25 and 0.8,
+    respectively. These factor values ensure that a \gui {Zoom In}
+    action and a \gui {Zoom Out} action will cancel each other (since
+    1.25 * 0.8 == 1), and in that way the normal image size can be
+    restored using the zooming features.
+
+    The screenshots below show an image in its normal size, and the
+    same image after zooming in:
+
+    \table
+    \row
+    \o \inlineimage imageviewer-original_size.png
+    \o \inlineimage imageviewer-zoom_in_1.png
+    \o \inlineimage imageviewer-zoom_in_2.png
+    \endtable
+
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 11
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 12
+
+    When zooming, we use the QLabel's ability to scale its contents.
+    Such scaling doesn't change the actual size hint of the contents.
+    And since the \l {QLabel::adjustSize()}{adjustSize()} function
+    use those size hint, the only thing we need to do to restore the
+    normal size of the currently displayed image is to call \c
+    adjustSize() and reset the scale factor to 1.0.
+
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 13
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 14
+
+    The \c fitToWindow() slot is called each time the user toggled
+    the \gui {Fit to Window} option. If the slot is called to turn on
+    the option, we tell the scroll area to resize its child widget
+    with the QScrollArea::setWidgetResizable() function. Then we
+    disable the \gui {Zoom In}, \gui {Zoom Out} and \gui {Normal
+    Size} menu entries using the private \c updateActions() function.
+
+    If the \l {QScrollArea::widgetResizable} property is set to \c
+    false (the default), the scroll area honors the size of its child
+    widget. If this property is set to \c true, the scroll area will
+    automatically resize the widget in order to avoid scroll bars
+    where they can be avoided, or to take advantage of extra space.
+    But the scroll area will honor the minimum size hint of its child
+    widget independent of the widget resizable property. So in this
+    example we set \c {imageLabel}'s size policy to \l
+    {QSizePolicy::Ignored}{ignored} in the constructor, to avoid that
+    scroll bars appear when the scroll area becomes smaller than the
+    label's minimum size hint.
+
+    The screenshots below shows an image in its normal size, and the
+    same image with the \gui {Fit to window} option turned on.
+    Enlarging the window will stretch the image further, as shown in
+    the third screenshot.
+
+    \table
+    \row
+    \o \inlineimage imageviewer-original_size.png
+    \o \inlineimage imageviewer-fit_to_window_1.png
+    \o \inlineimage imageviewer-fit_to_window_2.png
+    \endtable
+
+    If the slot is called to turn off the option, the
+    {QScrollArea::setWidgetResizable} property is set to \c false. We
+    also restore the image pixmap to its normal size by adjusting the
+    label's size to its content. And in the end we update the view
+    menu entries.
+
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 15
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 16
+
+    We implement the \c about() slot to create a message box
+    describing what the example is designed to show.
+
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 17
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 18
+
+    In the private \c createAction() function, we create the
+    actions providing the application features.
+
+    We assign a short-cut key to each action and connect them to the
+    appropiate slots. We only enable the \c openAct and \c exitAxt at
+    the time of creation, the others are updated once an image has
+    been loaded into the application. In addition we make the \c
+    fitToWindowAct \l {QAction::checkable}{checkable}.
+
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 19
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 20
+
+    In the private \c createMenu() function, we add the previously
+    created actions to the \gui File, \gui View and \gui Help menus.
+
+    The QMenu class provides a menu widget for use in menu bars,
+    context menus, and other popup menus. The QMenuBar class provides
+    a horizontal menu bar that consists of a list of pull-down menu
+    items. So at the end we put the menus in the \c {ImageViewer}'s
+    menu bar which we retrieve with the QMainWindow::menuBar()
+    function.
+
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 21
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 22
+
+    The private \c updateActions() function enables or disables the
+    \gui {Zoom In}, \gui {Zoom Out} and \gui {Normal Size} menu
+    entries depending on whether the \gui {Fit to Window} option is
+    turned on or off.
+
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 23
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 24
+
+    In \c scaleImage(), we use the \c factor parameter to calculate
+    the new scaling factor for the displayed image, and resize \c
+    imageLabel. Since we set the
+    \l{QLabel::scaledContents}{scaledContents} property to \c true in
+    the constructor, the call to QWidget::resize() will scale the
+    image displayed in the label. We also adjust the scroll bars to
+    preserve the focal point of the image.
+
+    At the end, if the scale factor is less than 33.3% or greater
+    than 300%, we disable the respective menu entry to prevent the
+    image pixmap from becoming too large, consuming too much
+    resources in the window system.
+
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 25
+    \snippet examples/widgets/imageviewer/imageviewer.cpp 26
+
+    Whenever we zoom in or out, we need to adjust the scroll bars in
+    consequence. It would have been tempting to simply call
+
+    \snippet doc/src/snippets/code/doc_src_examples_imageviewer.qdoc 4
+
+    but this would make the top-left corner the focal point, not the
+    center. Therefore we need to take into account the scroll bar
+    handle's size (the \l{QScrollBar::pageStep}{page step}).
+*/
diff --git a/doc/src/examples/itemviewspuzzle.qdoc b/doc/src/examples/itemviewspuzzle.qdoc
new file mode 100644
index 0000000000..99ef7d4f32
--- /dev/null
+++ b/doc/src/examples/itemviewspuzzle.qdoc
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example itemviews/puzzle
+    \title Item Views Puzzle Example
+
+    The Puzzle example shows how to enable drag and drop with a custom model
+    to allow items to be transferred between a view and another widget.
+
+    \image itemviewspuzzle-example.png
+
+    This example is an implementation of a simple jigsaw puzzle game using the
+    built-in support for drag and drop provided by Qt's model/view framework.
+    The \l{Drag and Drop Puzzle Example}{Drag and Drop Puzzle} example shows
+    many of the same features, but takes an alternative approach that uses Qt's
+    drag and drop API at the application level to handle drag and drop
+    operations.
+*/
diff --git a/doc/src/examples/licensewizard.qdoc b/doc/src/examples/licensewizard.qdoc
new file mode 100644
index 0000000000..a702c06a8a
--- /dev/null
+++ b/doc/src/examples/licensewizard.qdoc
@@ -0,0 +1,232 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example dialogs/licensewizard
+    \title License Wizard Example
+
+    The License Wizard example shows how to implement complex wizards in
+    Qt.
+
+    \image licensewizard-example.png Screenshot of the License Wizard example
+
+    Most wizards have a linear structure, with page 1 followed by
+    page 2 and so on until the last page. The
+    \l{dialogs/classwizard}{Class Wizard} example shows how to create
+    such wizards.
+
+    Some wizards are more complex in that they allow different
+    traversal paths based on the information provided by the user.
+    The License Wizard example illustrates this. It provides five
+    wizard pages; depending on which options are selected, the user
+    can reach different pages.
+
+    \image licensewizard-flow.png The License Wizard pages
+
+    The example consists of the following classes:
+
+    \list
+    \o \c LicenseWizard inherits QWizard and implements a non-linear
+       five-page wizard that leads the user through the process of
+       choosing a license agreement.
+    \o \c IntroPage, \c EvaluatePage, \c RegisterPage, \c
+       DetailsPage, and \c ConclusionPage are QWizardPage subclasses
+       that implement the wizard pages.
+    \endlist
+
+    \section1 The LicenseWizard Class
+
+    The \c LicenseWizard class derives from QWizard and provides a
+    five-page wizard that guides the user through the process of
+    registering their copy of a fictitious software product. Here's
+    the class definition:
+
+    \snippet examples/dialogs/licensewizard/licensewizard.h 1
+
+    The class's public API is limited to a constructor and an enum.
+    The enum defines the IDs associated with the various pages:
+
+    \table
+    \header \o Class name \o Enum value \o Page ID
+    \row \o \c IntroPage \o \c Page_Intro \o 0
+    \row \o \c EvaluatePage \o \c Page_Evaluate \o 1
+    \row \o \c RegisterPage \o \c Page_Register \o 2
+    \row \o \c DetailsPage \o \c Page_Details \o 3
+    \row \o \c ConclusionPage \o \c Page_Conclusion \o 4
+    \endtable
+
+    For this example, the IDs are arbitrary. The only constraints are
+    that they must be unique and different from -1. IDs allow us to
+    refer to pages.
+
+    \snippet examples/dialogs/licensewizard/licensewizard.cpp 2
+
+    In the constructor, we create the five pages, insert them into
+    the wizard using QWizard::setPage(), and set \c Page_Intro to be
+    the first page.
+
+    \snippet examples/dialogs/licensewizard/licensewizard.cpp 3
+    \snippet examples/dialogs/licensewizard/licensewizard.cpp 4
+
+    We set the style to \l{QWizard::}{ModernStyle} on all platforms
+    except Mac OS X,
+
+    \snippet examples/dialogs/licensewizard/licensewizard.cpp 5
+    \snippet examples/dialogs/licensewizard/licensewizard.cpp 6
+
+    We configure the QWizard to show a \gui Help button, which is
+    connected to our \c showHelp() slot. We also set the
+    \l{QWizard::}{LogoPixmap} for all pages that have a header (i.e.,
+    \c EvaluatePage, \c RegisterPage, and \c DetailsPage).
+
+    \snippet examples/dialogs/licensewizard/licensewizard.cpp 9
+    \snippet examples/dialogs/licensewizard/licensewizard.cpp 11
+    \dots
+    \snippet examples/dialogs/licensewizard/licensewizard.cpp 13
+
+    In \c showHelp(), we display help texts that are appropiate for
+    the current page. If the user clicks \gui Help twice for the same
+    page, we say, "Sorry, I already gave what help I could. Maybe you
+    should try asking a human?"
+
+    \section1 The IntroPage Class
+
+    The pages are defined in \c licensewizard.h and implemented in \c
+    licensewizard.cpp, together with \c LicenseWizard.
+
+    Here's the definition and implementation of \c{IntroPage}:
+
+    \snippet examples/dialogs/licensewizard/licensewizard.h 4
+    \codeline
+    \snippet examples/dialogs/licensewizard/licensewizard.cpp 16
+
+    A page inherits from QWizardPage. We set a
+    \l{QWizardPage::}{title} and a
+    \l{QWizard::WatermarkPixmap}{watermark pixmap}. By not setting
+    any \l{QWizardPage::}{subTitle}, we ensure that no header is
+    displayed for this page. (On Windows, it is customary for wizards
+    to display a watermark pixmap on the first and last pages, and to
+    have a header on the other pages.)
+
+    \snippet examples/dialogs/licensewizard/licensewizard.cpp 17
+    \snippet examples/dialogs/licensewizard/licensewizard.cpp 19
+
+    The \c nextId() function returns the ID for \c EvaluatePage if
+    the \gui{Evaluate the product for 30 days} option is checked;
+    otherwise it returns the ID for \c RegisterPage.
+
+    \section1 The EvaluatePage Class
+
+    The \c EvaluatePage is slightly more involved:
+
+    \snippet examples/dialogs/licensewizard/licensewizard.h 5
+    \codeline
+    \snippet examples/dialogs/licensewizard/licensewizard.cpp 20
+    \dots
+    \snippet examples/dialogs/licensewizard/licensewizard.cpp 21
+    \dots
+    \snippet examples/dialogs/licensewizard/licensewizard.cpp 22
+
+    First, we set the page's \l{QWizardPage::}{title}
+    and \l{QWizardPage::}{subTitle}.
+
+    Then we create the child widgets, create \l{Registering and Using
+    Fields}{wizard fields} associated with them, and put them into
+    layouts. The fields are created with an asterisk (\c
+    *) next to their name. This makes them \l{mandatory fields}, that
+    is, fields that must be filled before the user can press the
+    \gui Next button (\gui Continue on Mac OS X). The fields' values
+    can be accessed from any other page using QWizardPage::field().
+
+    Resetting the page amounts to clearing the two text fields.
+
+    \snippet examples/dialogs/licensewizard/licensewizard.cpp 23
+
+    The next page is always the \c ConclusionPage.
+
+    \section1 The ConclusionPage Class
+
+    The \c RegisterPage and \c DetailsPage are very similar to \c
+    EvaluatePage. Let's go directly to the \c ConclusionPage:
+
+    \snippet examples/dialogs/licensewizard/licensewizard.h 6
+
+    This time, we reimplement QWizardPage::initializePage() and
+    QWidget::setVisible(), in addition to
+    \l{QWizardPage::}{nextId()}. We also declare a private slot:
+    \c printButtonClicked().
+
+    \snippet examples/dialogs/licensewizard/licensewizard.cpp 18
+
+    The default implementation of QWizardPage::nextId() returns
+    the page with the next ID, or -1 if the current page has the
+    highest ID. This behavior would work here, because \c
+    Page_Conclusion equals 5 and there is no page with a higher ID,
+    but to avoid relying on such subtle behavior, we reimplement
+    \l{QWizardPage::}{nextId()} to return -1.
+
+    \snippet examples/dialogs/licensewizard/licensewizard.cpp 27
+
+    We use QWizard::hasVisitedPage() to determine the type of
+    license agreement the user has chosen. If the user filled the \c
+    EvaluatePage, the license text refers to an Evaluation License
+    Agreement. If the user filled the \c DetailsPage, the license
+    text is a First-Time License Agreement. If the user provided an
+    upgrade key and skipped the \c DetailsPage, the license text is
+    an Update License Agreement.
+
+    \snippet examples/dialogs/licensewizard/licensewizard.cpp 28
+
+    We want to display a \gui Print button in the wizard when the \c
+    ConclusionPage is up. One way to accomplish this is to reimplement
+    QWidget::setVisible():
+
+    \list
+    \o If the page is shown, we set the \l{QWizard::}{CustomButton1} button's
+       text to \gui{\underline{P}rint}, we enable the \l{QWizard::}{HaveCustomButton1}
+       option, and we connect the QWizard's \l{QWizard::}{customButtonClicked()}
+       signal to our \c printButtonClicked() slot.
+    \o If the page is hidden, we disable the \l{QWizard::}{HaveCustomButton1}
+       option and disconnect the \c printButtonClicked() slot.
+    \endlist
+
+    \sa QWizard, {Class Wizard Example}, {Trivial Wizard Example}
+*/
diff --git a/doc/src/examples/lineedits.qdoc b/doc/src/examples/lineedits.qdoc
new file mode 100644
index 0000000000..ee702ae4f2
--- /dev/null
+++ b/doc/src/examples/lineedits.qdoc
@@ -0,0 +1,175 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example widgets/lineedits
+    \title Line Edits Example
+
+    The Line Edits example demonstrates the many ways that QLineEdit can be used, and
+    shows the effects of various properties and validators on the input and output
+    supplied by the user.
+
+    \image lineedits-example.png
+
+    The example consists of a single \c Window class, containing a selection of
+    line edits with different input constraints and display properties that can be
+    changed by selecting items from comboboxes. Presenting these together helps
+    developers choose suitable properties to use with line edits, and makes it easy
+    to compare the effects of each validator on user input.
+
+    \section1 Window Class Definition
+
+    The \c Window class inherits QWidget and contains a constructor and several
+    slots:
+
+    \snippet examples/widgets/lineedits/window.h 0
+
+    The slots are used to update the type of validator used for a given line edit when
+    a new validator has been selected in the associated combobox. The line edits
+    are stored in the window for use in these slots.
+
+    \section1 Window Class Implementation
+
+    The \c Window constructor is used to set up the line edits, validators,
+    and comboboxes, connect signals from the comboboxes to slots in the \c Window
+    class, and arrange the child widgets in layouts.
+
+    We begin by constructing a \l{QGroupBox}{group box} to hold a label, combobox,
+    and line edit so that we can demonstrate the QLineEdit::echoMode property:
+
+    \snippet examples/widgets/lineedits/window.cpp 0
+
+    At this point, none of these widgets have been arranged in layouts. Eventually,
+    the \c echoLabel, \c echoComboBox, and \c echoLineEdit will be placed in a
+    vertical layout inside the \c echoGroup group box.
+
+    Similarly, we construct group boxes and collections of widgets to show the
+    effects of QIntValidator and QDoubleValidator on a line edit's contents:
+
+    \snippet examples/widgets/lineedits/window.cpp 1
+
+    Text alignment is demonstrated by another group of widgets:
+
+    \snippet examples/widgets/lineedits/window.cpp 2
+
+    QLineEdit supports the use of \l{QLineEdit::inputMask}{input masks}.
+    These only allow the user to type characters into the line edit that
+    follow a simple specification. We construct a group of widgets to
+    demonstrate a selection of predefined masks:
+
+    \snippet examples/widgets/lineedits/window.cpp 3
+
+    Another useful feature of QLineEdit is its ability to make its contents
+    read-only. This property is used to control access to a line edit in the
+    following group of widgets:
+
+    \snippet examples/widgets/lineedits/window.cpp 4
+
+    Now that all the child widgets have been constructed, we connect signals
+    from the comboboxes to slots in the \c Window object:
+
+    \snippet examples/widgets/lineedits/window.cpp 5
+
+    Each of these connections use the QComboBox::activated() signal that
+    supplies an integer to the slot. This will be used to efficiently
+    make changes to the appropriate line edit in each slot.
+
+    We place each combobox, line edit, and label in a layout for each group
+    box, beginning with the layout for the \c echoGroup group box:
+
+    \snippet examples/widgets/lineedits/window.cpp 6
+
+    The other layouts are constructed in the same way:
+
+    \snippet examples/widgets/lineedits/window.cpp 7
+
+    Finally, we place each group box in a grid layout for the \c Window object
+    and set the window title:
+
+    \snippet examples/widgets/lineedits/window.cpp 8
+
+    The slots respond to signals emitted when the comboboxes are changed by the
+    user.
+
+    When the combobox for the \gui{Echo} group box is changed, the \c echoChanged()
+    slot is called:
+
+    \snippet examples/widgets/lineedits/window.cpp 9
+
+    The slot updates the line edit in the same group box to use an echo mode that
+    corresponds to the entry described in the combobox.
+
+    When the combobox for the \gui{Validator} group box is changed, the
+    \c validatorChanged() slot is called:
+
+    \snippet examples/widgets/lineedits/window.cpp 10
+
+    The slot either creates a new validator for the line edit to use, or it removes
+    the validator in use by calling QLineEdit::setValidator() with a zero pointer.
+    We clear the line edit in this case to ensure that the new validator is
+    initially given valid input to work with.
+
+    When the combobox for the \gui{Alignment} group box is changed, the
+    \c alignmentChanged() slot is called:
+
+    \snippet examples/widgets/lineedits/window.cpp 11
+
+    This changes the way that text is displayed in the line edit to correspond with
+    the description selected in the combobox.
+
+    The \c inputMaskChanged() slot handles changes to the combobox in the
+    \gui{Input Mask} group box:
+
+    \snippet examples/widgets/lineedits/window.cpp 12
+
+    Each entry in the relevant combobox is associated with an input mask. We set
+    a new mask by calling the QLineEdit::setMask() function with a suitable string;
+    the mask is disabled if an empty string is used.
+
+    The \c accessChanged() slot handles changes to the combobox in the
+    \gui{Access} group box:
+
+    \snippet examples/widgets/lineedits/window.cpp 13
+
+    Here, we simply associate the \gui{False} and \gui{True} entries in the combobox
+    with \c false and \c true values to be passed to QLineEdit::setReadOnly(). This
+    allows the user to enable and disable input to the line edit.
+*/
diff --git a/doc/src/examples/localfortuneclient.qdoc b/doc/src/examples/localfortuneclient.qdoc
new file mode 100644
index 0000000000..b4489b14f9
--- /dev/null
+++ b/doc/src/examples/localfortuneclient.qdoc
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example ipc/localfortuneclient
+    \title Local Fortune Client Example
+
+    The Local Fortune Client example shows how to create a client for a simple
+    local service using QLocalSocket. It is intended to be run alongside the
+    \l{ipc/localfortuneserver}{Local Fortune Server} example.
+
+    \image localfortuneclient-example.png Screenshot of the Local Fortune Client example
+
+*/
diff --git a/doc/src/examples/localfortuneserver.qdoc b/doc/src/examples/localfortuneserver.qdoc
new file mode 100644
index 0000000000..3b2395c3e0
--- /dev/null
+++ b/doc/src/examples/localfortuneserver.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example ipc/localfortuneserver
+    \title Local Fortune Server Example
+
+    The Local Fortune Server example shows how to create a server for a simple
+    local service. It is intended to be run alongside the
+    \l{ipc/localfortuneclient}{Local Fortune Client} example
+
+    \image localfortuneserver-example.png Screenshot of the Local Fortune Server example
+ */
diff --git a/doc/src/examples/loopback.qdoc b/doc/src/examples/loopback.qdoc
new file mode 100644
index 0000000000..b100f7190f
--- /dev/null
+++ b/doc/src/examples/loopback.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example network/loopback
+    \title Loopback Example
+
+    The Loopback example shows how to communicate between simple clients and servers on a local
+    host.
+
+    \image loopback-example.png
+*/
diff --git a/doc/src/examples/mandelbrot.qdoc b/doc/src/examples/mandelbrot.qdoc
new file mode 100644
index 0000000000..d2a3ee154e
--- /dev/null
+++ b/doc/src/examples/mandelbrot.qdoc
@@ -0,0 +1,382 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example threads/mandelbrot
+    \title Mandelbrot Example
+
+    The Mandelbrot example shows how to use a worker thread to
+    perform heavy computations without blocking the main thread's
+    event loop.
+
+    The heavy computation here is the Mandelbrot set, probably the
+    world's most famous fractal. These days, while sophisticated
+    programs such as \l{XaoS} that provide real-time zooming in the
+    Mandelbrot set, the standard Mandelbrot algorithm is just slow
+    enough for our purposes.
+
+    \image mandelbrot-example.png Screenshot of the Mandelbrot example
+
+    In real life, the approach described here is applicable to a
+    large set of problems, including synchronous network I/O and
+    database access, where the user interface must remain responsive
+    while some heavy operation is taking place. The \l
+    network/blockingfortuneclient example shows the same principle at
+    work in a TCP client.
+
+    The Mandelbrot application supports zooming and scrolling using
+    the mouse or the keyboard. To avoid freezing the main thread's
+    event loop (and, as a consequence, the application's user
+    interface), we put all the fractal computation in a separate
+    worker thread. The thread emits a signal when it is done
+    rendering the fractal.
+
+    During the time where the worker thread is recomputing the
+    fractal to reflect the new zoom factor position, the main thread
+    simply scales the previously rendered pixmap to provide immediate
+    feedback. The result doesn't look as good as what the worker
+    thread eventually ends up providing, but at least it makes the
+    application more responsive. The sequence of screenshots below
+    shows the original image, the scaled image, and the rerendered
+    image.
+
+    \table
+    \row
+    \o \inlineimage mandelbrot_zoom1.png
+    \o \inlineimage mandelbrot_zoom2.png
+    \o \inlineimage mandelbrot_zoom3.png
+    \endtable
+
+    Similarly, when the user scrolls, the previous pixmap is scrolled
+    immediately, revealing unpainted areas beyond the edge of the
+    pixmap, while the image is rendered by the worker thread.
+
+    \table
+    \row
+    \o \inlineimage mandelbrot_scroll1.png
+    \o \inlineimage mandelbrot_scroll2.png
+    \o \inlineimage mandelbrot_scroll3.png
+    \endtable
+
+    The application consists of two classes:
+
+    \list
+    \o \c RenderThread is a QThread subclass that renders
+       the Mandelbrot set.
+    \o \c MandelbrotWidget is a QWidget subclass that shows the
+       Mandelbrot set on screen and lets the user zoom and scroll.
+    \endlist
+
+    If you are not already familiar with Qt's thread support, we
+    recommend that you start by reading the \l{Thread Support in Qt}
+    overview.
+
+    \section1 RenderThread Class Definition
+
+    We'll start with the definition of the \c RenderThread class:
+
+    \snippet examples/threads/mandelbrot/renderthread.h 0
+
+    The class inherits QThread so that it gains the ability to run in
+    a separate thread. Apart from the constructor and destructor, \c
+    render() is the only public function. Whenever the thread is done
+    rendering an image, it emits the \c renderedImage() signal.
+
+    The protected \c run() function is reimplemented from QThread. It
+    is automatically called when the thread is started.
+
+    In the \c private section, we have a QMutex, a QWaitCondition,
+    and a few other data members. The mutex protects the other data
+    member.
+
+    \section1 RenderThread Class Implementation
+
+    \snippet examples/threads/mandelbrot/renderthread.cpp 0
+
+    In the constructor, we initialize the \c restart and \c abort
+    variables to \c false. These variables control the flow of the \c
+    run() function.
+
+    We also initialize the \c colormap array, which contains a series
+    of RGB colors.
+
+    \snippet examples/threads/mandelbrot/renderthread.cpp 1
+
+    The destructor can be called at any point while the thread is
+    active. We set \c abort to \c true to tell \c run() to stop
+    running as soon as possible. We also call
+    QWaitCondition::wakeOne() to wake up the thread if it's sleeping.
+    (As we will see when we review \c run(), the thread is put to
+    sleep when it has nothing to do.)
+
+    The important thing to notice here is that \c run() is executed
+    in its own thread (the worker thread), whereas the \c
+    RenderThread constructor and destructor (as well as the \c
+    render() function) are called by the thread that created the
+    worker thread. Therefore, we need a mutex to protect accesses to
+    the \c abort and \c condition variables, which might be accessed
+    at any time by \c run().
+
+    At the end of the destructor, we call QThread::wait() to wait
+    until \c run() has exited before the base class destructor is
+    invoked.
+
+    \snippet examples/threads/mandelbrot/renderthread.cpp 2
+
+    The \c render() function is called by the \c MandelbrotWidget
+    whenever it needs to generate a new image of the Mandelbrot set.
+    The \c centerX, \c centerY, and \c scaleFactor parameters specify
+    the portion of the fractal to render; \c resultSize specifies the
+    size of the resulting QImage.
+
+    The function stores the parameters in member variables. If the
+    thread isn't already running, it starts it; otherwise, it sets \c
+    restart to \c true (telling \c run() to stop any unfinished
+    computation and start again with the new parameters) and wakes up
+    the thread, which might be sleeping.
+
+    \snippet examples/threads/mandelbrot/renderthread.cpp 3
+
+    \c run() is quite a big function, so we'll break it down into
+    parts.
+
+    The function body is an infinite loop which starts by storing the
+    rendering parameters in local variables. As usual, we protect
+    accesses to the member variables using the class's mutex. Storing
+    the member variables in local variables allows us to minimize the
+    amout of code that needs to be protected by a mutex. This ensures
+    that the main thread will never have to block for too long when
+    it needs to access \c{RenderThread}'s member variables (e.g., in
+    \c render()).
+
+    The \c forever keyword is, like \c foreach, a Qt pseudo-keyword.
+
+    \snippet examples/threads/mandelbrot/renderthread.cpp 4
+    \snippet examples/threads/mandelbrot/renderthread.cpp 5
+    \snippet examples/threads/mandelbrot/renderthread.cpp 6
+    \snippet examples/threads/mandelbrot/renderthread.cpp 7
+
+    Then comes the core of the algorithm. Instead of trying to create
+    a perfect Mandelbrot set image, we do multiple passes and
+    generate more and more precise (and computationally expensive)
+    approximations of the fractal.
+
+    If we discover inside the loop that \c restart has been set to \c
+    true (by \c render()), we break out of the loop immediately, so
+    that the control quickly returns to the very top of the outer
+    loop (the \c forever loop) and we fetch the new rendering
+    parameters. Similarly, if we discover that \c abort has been set
+    to \c true (by the \c RenderThread destructor), we return from
+    the function immediately, terminating the thread.
+
+    The core algorithm is beyond the scope of this tutorial.
+
+    \snippet examples/threads/mandelbrot/renderthread.cpp 8
+    \snippet examples/threads/mandelbrot/renderthread.cpp 9
+
+    Once we're done with all the iterations, we call
+    QWaitCondition::wait() to put the thread to sleep by calling,
+    unless \c restart is \c true. There's no use in keeping a worker
+    thread looping indefinitely while there's nothing to do.
+
+    \snippet examples/threads/mandelbrot/renderthread.cpp 10
+
+    The \c rgbFromWaveLength() function is a helper function that
+    converts a wave length to a RGB value compatible with 32-bit
+    \l{QImage}s. It is called from the constructor to initialize the
+    \c colormap array with pleasing colors.
+
+    \section1 MandelbrotWidget Class Defintion
+
+    The \c MandelbrotWidget class uses \c RenderThread to draw the
+    Mandelbrot set on screen. Here's the class definition:
+
+    \snippet examples/threads/mandelbrot/mandelbrotwidget.h 0
+
+    The widget reimplements many event handlers from QWidget. In
+    addition, it has an \c updatePixmap() slot that we'll connect to
+    the worker thread's \c renderedImage() signal to update the
+    display whenever we receive new data from the thread.
+
+    Among the private variables, we have \c thread of type \c
+    RenderThread and \c pixmap, which contains the last rendered
+    image.
+
+    \section1 MandelbrotWidget Class Implementation
+
+    \snippet examples/threads/mandelbrot/mandelbrotwidget.cpp 0
+
+    The implementation starts with a few contants that we'll need
+    later on.
+
+    \snippet examples/threads/mandelbrot/mandelbrotwidget.cpp 1
+
+    The interesting part of the constructor is the
+    qRegisterMetaType() and QObject::connect() calls. Let's start
+    with the \l{QObject::connect()}{connect()} call.
+
+    Although it looks like a standard signal-slot connection between
+    two \l{QObject}s, because the signal is emitted in a different
+    thread than the receiver lives in, the connection is effectively a
+    \l{Qt::QueuedConnection}{queued connection}. These connections are
+    asynchronous (i.e., non-blocking), meaning that the slot will be
+    called at some point after the \c emit statement. What's more, the
+    slot will be invoked in the thread in which the receiver lives.
+    Here, the signal is emitted in the worker thread, and the slot is
+    executed in the GUI thread when control returns to the event loop.
+
+    With queued connections, Qt must store a copy of the arguments
+    that were passed to the signal so that it can pass them to the
+    slot later on. Qt knows how to take of copy of many C++ and Qt
+    types, but QImage isn't one of them. We must therefore call the
+    template function qRegisterMetaType() before we can use QImage
+    as parameter in queued connections.
+
+    \snippet examples/threads/mandelbrot/mandelbrotwidget.cpp 2
+    \snippet examples/threads/mandelbrot/mandelbrotwidget.cpp 3
+    \snippet examples/threads/mandelbrot/mandelbrotwidget.cpp 4
+
+    In \l{QWidget::paintEvent()}{paintEvent()}, we start by filling
+    the background with black. If we have nothing yet to paint (\c
+    pixmap is null), we print a message on the widget asking the user
+    to be patient and return from the function immediately.
+
+    \snippet examples/threads/mandelbrot/mandelbrotwidget.cpp 5
+    \snippet examples/threads/mandelbrot/mandelbrotwidget.cpp 6
+    \snippet examples/threads/mandelbrot/mandelbrotwidget.cpp 7
+    \snippet examples/threads/mandelbrot/mandelbrotwidget.cpp 8
+
+    If the pixmap has the right scale factor, we draw the pixmap directly onto
+    the widget. Otherwise, we scale and translate the \l{The Coordinate
+    System}{coordinate system} before we draw the pixmap. By reverse mapping
+    the widget's rectangle using the scaled painter matrix, we also make sure
+    that only the exposed areas of the pixmap are drawn. The calls to
+    QPainter::save() and QPainter::restore() make sure that any painting
+    performed afterwards uses the standard coordinate system.
+
+    \snippet examples/threads/mandelbrot/mandelbrotwidget.cpp 9
+
+    At the end of the paint event handler, we draw a text string and
+    a semi-transparent rectangle on top of the fractal.
+
+    \snippet examples/threads/mandelbrot/mandelbrotwidget.cpp 10
+
+    Whenever the user resizes the widget, we call \c render() to
+    start generating a new image, with the same \c centerX, \c
+    centerY, and \c curScale parameters but with the new widget size.
+
+    Notice that we rely on \c resizeEvent() being automatically
+    called by Qt when the widget is shown the first time to generate
+    the image the very first time.
+
+    \snippet examples/threads/mandelbrot/mandelbrotwidget.cpp 11
+
+    The key press event handler provides a few keyboard bindings for
+    the benefit of users who don't have a mouse. The \c zoom() and \c
+    scroll() functions will be covered later.
+
+    \snippet examples/threads/mandelbrot/mandelbrotwidget.cpp 12
+
+    The wheel event handler is reimplemented to make the mouse wheel
+    control the zoom level. QWheelEvent::delta() returns the angle of
+    the wheel mouse movement, in eights of a degree. For most mice,
+    one wheel step corresponds to 15 degrees. We find out how many
+    mouse steps we have and determine the zoom factor in consequence.
+    For example, if we have two wheel steps in the positive direction
+    (i.e., +30 degrees), the zoom factor becomes \c ZoomInFactor
+    to the second power, i.e. 0.8 * 0.8 = 0.64.
+
+    \snippet examples/threads/mandelbrot/mandelbrotwidget.cpp 13
+
+    When the user presses the left mouse button, we store the mouse
+    pointer position in \c lastDragPos.
+
+    \snippet examples/threads/mandelbrot/mandelbrotwidget.cpp 14
+
+    When the user moves the mouse pointer while the left mouse button
+    is pressed, we adjust \c pixmapOffset to paint the pixmap at a
+    shifted position and call QWidget::update() to force a repaint.
+
+    \snippet examples/threads/mandelbrot/mandelbrotwidget.cpp 15
+
+    When the left mouse button is released, we update \c pixmapOffset
+    just like we did on a mouse move and we reset \c lastDragPos to a
+    default value. Then, we call \c scroll() to render a new image
+    for the new position. (Adjusting \c pixmapOffset isn't sufficient
+    because areas revealed when dragging the pixmap are drawn in
+    black.)
+
+    \snippet examples/threads/mandelbrot/mandelbrotwidget.cpp 16
+
+    The \c updatePixmap() slot is invoked when the worker thread has
+    finished rendering an image. We start by checking whether a drag
+    is in effect and do nothing in that case. In the normal case, we
+    store the image in \c pixmap and reinitialize some of the other
+    members. At the end, we call QWidget::update() to refresh the
+    display.
+
+    At this point, you might wonder why we use a QImage for the
+    parameter and a QPixmap for the data member. Why not stick to one
+    type? The reason is that QImage is the only class that supports
+    direct pixel manipulation, which we need in the worker thread. On
+    the other hand, before an image can be drawn on screen, it must
+    be converted into a pixmap. It's better to do the conversion once
+    and for all here, rather than in \c paintEvent().
+
+    \snippet examples/threads/mandelbrot/mandelbrotwidget.cpp 17
+
+    In \c zoom(), we recompute \c curScale. Then we call
+    QWidget::update() to draw a scaled pixmap, and we ask the worker
+    thread to render a new image corresponding to the new \c curScale
+    value.
+
+    \snippet examples/threads/mandelbrot/mandelbrotwidget.cpp 18
+
+    \c scroll() is similar to \c zoom(), except that the affected
+    parameters are \c centerX and \c centerY.
+
+    \section1 The main() Function
+
+    The application's multithreaded nature has no impact on its \c
+    main() function, which is as simple as usual:
+
+    \snippet examples/threads/mandelbrot/main.cpp 0
+*/
diff --git a/doc/src/examples/masterdetail.qdoc b/doc/src/examples/masterdetail.qdoc
new file mode 100644
index 0000000000..d7dc0e25aa
--- /dev/null
+++ b/doc/src/examples/masterdetail.qdoc
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example sql/masterdetail
+    \title Master Detail Example
+
+    The Master Detail Example shows how to present data from different
+    data sources in the same application. The album titles, and the
+    corresponding artists and release dates, are kept in a
+    database, while each album's tracks are stored in an XML
+    file.
+
+    The example also shows how to add as well as remove data from both
+    the database and the associated XML file using the API provided by
+    the QtSql and QtXml modules, respectively.
+
+    \image masterdetail-example.png
+*/
diff --git a/doc/src/examples/mdi.qdoc b/doc/src/examples/mdi.qdoc
new file mode 100644
index 0000000000..f97db5ed30
--- /dev/null
+++ b/doc/src/examples/mdi.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \example mainwindows/mdi
+    \title MDI Example
+
+    The MDI example shows how to implement a Multiple Document Interface using Qt's
+    QMdiArea class.
+
+    \image mdi-example.png
+
+*/
diff --git a/doc/src/examples/menus.qdoc b/doc/src/examples/menus.qdoc
new file mode 100644
index 0000000000..0500101bbb
--- /dev/null
+++ b/doc/src/examples/menus.qdoc
@@ -0,0 +1,232 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example mainwindows/menus
+    \title Menus Example
+
+    The Menus example demonstrates how menus can be used in a main
+    window application.
+
+    A menu widget can be either a pull-down menu in a menu bar or a
+    standalone context menu. Pull-down menus are shown by the menu bar
+    when the user clicks on the respective item or presses the
+    specified shortcut key. Context menus are usually invoked by some
+    special keyboard key or by right-clicking.
+
+    \image menus-example.png
+
+    A menu consists of a list of \e action items. In applications,
+    many common commands can be invoked via menus, toolbar buttons as
+    well as keyboard shortcuts. Since the user expects the commands to
+    be performed in the same way, regardless of the user interface
+    used, it is useful to represent each command as an action.
+
+    The Menus example consists of one single class, \c MainWindow, derived
+    from the QMainWindow class. When choosing one of the
+    action items in our application, it will display the item's path
+    in its central widget.
+
+    \section1 MainWindow Class Definition
+
+    QMainWindow provides a main application window, with a menu bar,
+    tool bars, dock widgets and a status bar around a large central
+    widget.
+
+    \snippet examples/mainwindows/menus/mainwindow.h 0
+
+    In this example, we will see how to implement pull-down menus as
+    well as a context menu. In order to implement a custom context
+    menu we must reimplement QWidget's \l
+    {QWidget::}{contextMenuEvent()} function to receive the context
+    menu events for our main window.
+
+    \snippet examples/mainwindows/menus/mainwindow.h 1
+
+    We must also implement a collection of private slots to respond to
+    the user activating any of our menu entries.  Note that these
+    slots are left out of this documentation since they are trivial,
+    i.e., most of them are only displaying the action's path in the
+    main window's central widget.
+
+    \snippet examples/mainwindows/menus/mainwindow.h 2
+
+    We have chosen to simplify the constructor by implementing two
+    private convenience functions to create the various actions, to
+    add them to menus and to insert the menus into our main window's
+    menu bar.
+
+    \snippet examples/mainwindows/menus/mainwindow.h 3
+
+    Finally, we declare the various menus and actions as well as a
+    simple information label in the application wide scope.
+
+    The QMenu class provides a menu widget for use in menu bars,
+    context menus, and other popup menus while the QAction class
+    provides an abstract user interface action that can be inserted
+    into widgets.
+
+    In some situations it is useful to group actions together, e.g.,
+    we have a \gui {Left Align} action, a \gui {Right Align} action, a
+    \gui {Justify} action, and a \gui {Center} action, and we want
+    only one of these actions to be active at any one time. One simple
+    way of achieving this is to group the actions together in an
+    action group using the QActionGroup class.
+
+    \section1 MainWindow Class Implementation
+
+    In the constructor, we start off by creating a regular QWidget and
+    make it our main window's central widget. Note that the main
+    window takes ownership of the widget pointer and deletes it at the
+    appropriate time.
+
+    \snippet examples/mainwindows/menus/mainwindow.cpp 0
+    \codeline
+    \snippet examples/mainwindows/menus/mainwindow.cpp 1
+
+    Then we create the information label as well as a top and bottom
+    filler that we add to a layout which we install on the central
+    widget. QMainWindow objects come with their own customized layout
+    and setting a layout on a the actual main window, or creating a
+    layout with a main window as a parent, is considered an error. You
+    should always set your own layout on the central widget instead.
+
+    \snippet examples/mainwindows/menus/mainwindow.cpp 2
+
+    To create the actions and menus we call our two convenience
+    functions: \c createActions() and \c createMenus(). We will get
+    back to these shortly.
+
+    QMainWindow's \l {QMainWindow::statusBar()}{statusBar()} function
+    returns the status bar for the main window (if the status bar does
+    not exist, this function will create and return an empty status
+    bar). We initialize the status bar and window title, resize the
+    window to an appropriate size as well as ensure that the main
+    window cannot be resized to a smaller size than the given
+    one.
+
+    Now, let's take a closer look at the \c createActions() convenience
+    function that creates the various actions:
+
+    \snippet examples/mainwindows/menus/mainwindow.cpp 4
+    \dots
+
+    A QAction object may contain an icon, a text, a shortcut, a status
+    tip, a "What's This?" text, and a tooltip. Most of these can be
+    set in the constructor, but they can also be set independently
+    using the provided convenience functions.
+
+    In the \c createActions() function, we first create a \c newAct
+    action. We make \gui Ctrl+N its shortcut using the
+    QAction::setShortcut() function, and we set its status tip using the
+    QAction::setStatusTip() function (the status tip is displayed on all
+    status bars provided by the action's top-level parent widget). We
+    also connect its \l {QAction::}{triggered()} signal to the \c
+    newFile() slot.
+
+    The rest of the actions are created in a similar manner. Please
+    see the source code for details.
+
+    \snippet examples/mainwindows/menus/mainwindow.cpp 7
+
+
+    Once we have created the \gui {Left Align}, \gui {Right Align},
+    \gui {Justify}, and a \gui {Center} actions, we can also create
+    the previously mentioned action group.
+
+    Each action is added to the group using QActionGroup's \l
+    {QActionGroup::}{addAction()} function. Note that an action also
+    can be added to a group by creating it with the group as its
+    parent. Since an action group is exclusive by default, only one of
+    the actions in the group is checked at any one time (this can be
+    altered using the QActionGroup::setExclusive() function).
+
+    When all the actions are created, we use the \c createMenus()
+    function to add the actions to the menus and to insert the menus
+    into the menu bar:
+
+    \snippet examples/mainwindows/menus/mainwindow.cpp 8
+
+    QMenuBar's \l {QMenuBar::addMenu()}{addMenu()} function appends a
+    new QMenu with the given title, to the menu bar (note that the
+    menu bar takes ownership of the menu). We use QWidget's \l
+    {QWidget::addAction()}{addAction()} function to add each action to
+    the corresponding menu.
+
+    Alternatively, the QMenu class provides several \l
+    {QMenu::addAction()}{addAction()} convenience functions that create
+    and add new actions from given texts and/or icons. You can also
+    provide a member that will automatically connect to the new
+    action's \l {QAction::triggered()}{triggered()} signal, and a
+    shortcut represented by a QKeySequence instance.
+
+    The QMenu::addSeparator() function creates and returns a new
+    separator action, i.e. an action for which QAction::isSeparator()
+    returns true, and adds the new action to the menu's list of
+    actions.
+
+    \snippet examples/mainwindows/menus/mainwindow.cpp 12
+
+    Note the \gui Format menu. First of all, it is added as a submenu
+    to the \gui Edit Menu using QMenu's \l
+    {QMenu::addMenu()}{addMenu()} function. Secondly, take a look at the
+    alignment actions: In the \c createActions() function we added the
+    \c leftAlignAct, \c rightAlignAct, \c justifyAct and \c centerAct
+    actions to an action group. Nevertheless, we must add each action
+    to the menu separately while the action group does its magic
+    behind the scene.
+
+    \snippet examples/mainwindows/menus/mainwindow.cpp 3
+
+    To provide a custom context menu, we must reimplement QWidget's \l
+    {QWidget::}{contextMenuEvent()} function to receive the widget's
+    context menu events (note that the default implementation simply
+    ignores these events).
+
+    Whenever we receive such an event, we create a menu containing the
+    \gui Cut, \gui Copy and \gui Paste actions. Context menus can be
+    executed either asynchronously using the \l {QMenu::}{popup()}
+    function or synchronously using the \l {QMenu::}{exec()}
+    function. In this example, we have chosen to show the menu using
+    its \l {QMenu::}{exec()} function. By passing the event's position
+    as argument we ensure that the context menu appears at the
+    expected position.
+*/
diff --git a/doc/src/examples/mousecalibration.qdoc b/doc/src/examples/mousecalibration.qdoc
new file mode 100644
index 0000000000..e271265f2f
--- /dev/null
+++ b/doc/src/examples/mousecalibration.qdoc
@@ -0,0 +1,207 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example qws/mousecalibration
+    \title Mouse Calibration Example
+
+    The Mouse Calibration example demonstrates how to write a simple
+    program using the mechanisms provided by the QWSMouseHandler class
+    to calibrate the mouse handler in \l{Qt for Embedded Linux}. 
+
+    Calibration is the process of mapping between physical
+    (i.e. device) coordinates and logical coordinates.
+
+    The example consists of two classes in addition to the main program:
+
+    \list
+        \o \c Calibration is a dialog widget that retrieves the device coordinates.
+        \o \c ScribbleWidget is a minimal drawing program used to let the user
+            test the new mouse settings.
+    \endlist
+
+    First we will review the main program, then we will take a look at
+    the \c Calibration class. The \c ScribbleWidget class is only a
+    help tool in this context, and will not be covered here.
+
+    \section1 The Main Program
+
+    The program starts by presenting a message box informing the user
+    of what is going to happen:
+
+    \snippet examples/qws/mousecalibration/main.cpp 0
+
+    The QMessageBox class provides a modal dialog with a range of
+    different messages, roughly arranged along two axes: severity and
+    complexity. The message box has a different icon for each of the
+    severity levels, but the icon must be specified explicitly. In our
+    case we use the default QMessageBox::NoIcon value. In addition we
+    use the default complexity, i.e. a message box showing the given
+    text and an \gui OK button.
+
+    At this stage in the program, the mouse could be completely
+    uncalibrated, making the user unable to press the \gui OK button. For
+    that reason we use the static QTimer::singleShot() function to
+    make the message box disappear after 10 seconds. The QTimer class
+    provides repetitive and single-shot timers: The single shot
+    function calls the given slot after the specified interval.
+
+    \snippet examples/qws/mousecalibration/main.cpp 1
+
+    Next, we create an instance of the \c Calibration class which is a
+    dialog widget retrieving the required sample coordinates: The
+    dialog sequentially presents five marks for the user to press,
+    storing the device coordinates for the mouse press events.
+
+    \snippet examples/qws/mousecalibration/main.cpp 2
+
+    When the calibration dialog returns, we let the user test the new
+    mouse settings by drawing onto a \c ScribbleWidget object. Since
+    the mouse still can be uncalibrated, we continue to use the
+    QMessageBox and QTimer classes to inform the user about the
+    program's progress.
+
+    An improved calibration tool would let the user choose between
+    accepting the new calibration, reverting to the old one, and
+    restarting the calibration.
+
+    \section1 Calibration Class Definition
+
+    The \c Calibration class inherits from QDialog and is responsible
+    for retrieving the device coordinates from the user.
+
+    \snippet examples/qws/mousecalibration/calibration.h 0
+
+    We reimplement QDialog's \l {QDialog::exec()}{exec()} and \l
+    {QDialog::accept()}{accept()} slots, and QWidget's \l
+    {QWidget::paintEvent()}{paintEvent()} and \l
+    {QWidget::mouseReleaseEvent()}{mouseReleaseEvent()} functions.
+
+    In addition, we declare a couple of private variables, \c data and
+    \c pressCount, holding the \c Calibration object's number of mouse
+    press events and current calibration data. The \c pressCount
+    variable is a convenience variable, while the \c data is a
+    QWSPointerCalibrationData object (storing the physical and logical
+    coordinates) that is passed to the mouse handler. The
+    QWSPointerCalibrationData class is simply a container for
+    calibration data.
+
+    \section1 Calibration Class Implementation
+
+    In the constructor we first ensure that the \c Calibration dialog
+    fills up the entire screen, has focus and will receive mouse
+    events (the latter by making the dialog modal):
+
+    \snippet examples/qws/mousecalibration/calibration.cpp 0
+
+    Then we initialize the \l{QWSPointerCalibrationData::}{screenPoints}
+    array:
+
+    \snippet examples/qws/mousecalibration/calibration.cpp 1
+
+    In order to specify the calibration, the 
+    \l{QWSPointerCalibrationData::screenPoints}{screenPoints} array must
+    contain the screen coordinates for the logical positions
+    represented by the QWSPointerCalibrationData::Location enum
+    (e.g. QWSPointerCalibrationData::TopLeft).  Since non-linearity is
+    expected to increase on the edge of the screen, all points are
+    kept 10 percent within the screen. The \c qt_screen pointer is a
+    reference to the screen device. There can only be one screen
+    device per application.
+
+    \snippet examples/qws/mousecalibration/calibration.cpp 2
+
+    Finally, we initialize the variable which keeps track of the number of
+    mouse press events we have received.
+
+    \snippet examples/qws/mousecalibration/calibration.cpp 3
+
+    The destructor is trivial.
+
+    \snippet examples/qws/mousecalibration/calibration.cpp 4
+
+    The reimplementation of the QDialog::exec() slot is called from
+    the main program.
+
+    First we clear the current calibration making the following mouse
+    event delivered in raw device coordinates. Then we call the
+    QWidget::grabMouse() function to make sure no mouse events are
+    lost, and the QWidget::activateWindow() function to make the
+    top-level widget containing this dialog, the active window. When
+    the call to the QDialog::exec() base function returns, we call
+    QWidget::releaseMouse() to release the mouse grab before the
+    function returns.
+
+    \snippet examples/qws/mousecalibration/calibration.cpp 5
+
+    The QWidget::paintEvent() function is reimplemented to receive the
+    widget's paint events. A paint event is a request to repaint all
+    or parts of the widget. It can happen as a result of
+    QWidget::repaint() or QWidget::update(), or because the widget was
+    obscured and has now been uncovered, or for many other reasons.
+    In our reimplementation of the function we simply draw a cross at
+    the next point the user should press.
+
+    \snippet examples/qws/mousecalibration/calibration.cpp 6
+
+    We then reimplement the QWidget::mouseReleaseEvent() function to
+    receive the widget's move events, using the QMouseEvent object
+    passed as parameter to find the coordinates the user pressed, and
+    update the QWSPointerCalibrationData::devPoints array.
+
+    In order to complete the mapping between logical and physical
+    coordinates, the \l
+    {QWSPointerCalibrationData::devPoints}{devPoints} array must
+    contain the raw device coordinates for the logical positions
+    represented by the QWSPointerCalibrationData::Location enum
+    (e.g. QWSPointerCalibrationData::TopLeft)
+
+    We continue by drawing the next cross, or close the dialog by
+    calling the QDialog::accept() slot if we have collected all the
+    required coordinate samples.
+
+    \snippet examples/qws/mousecalibration/calibration.cpp 7
+
+    Our reimplementation of the QDialog::accept() slot simply activate
+    the new calibration data using the QWSMouseHandler::calibrate()
+    function. We also use the Q_ASSERT() macro to ensure that the number
+    of required samples are present.
+*/
diff --git a/doc/src/examples/movie.qdoc b/doc/src/examples/movie.qdoc
new file mode 100644
index 0000000000..00e42c6699
--- /dev/null
+++ b/doc/src/examples/movie.qdoc
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example widgets/movie
+    \title Movie Example
+
+    The Movie example demonstrates how to use QMovie and QLabel to
+    display animations. Now that Qt comes with \l{Phonon
+    Overview}{Phonon} (the multimedia framework), QMovie is mostly
+    useful if one wants to play a simple animation without the added
+    complexity of a multimedia framework to install and deploy.
+
+    \image movie-example.png
+*/
diff --git a/doc/src/examples/multipleinheritance.qdoc b/doc/src/examples/multipleinheritance.qdoc
new file mode 100644
index 0000000000..ff2f00f752
--- /dev/null
+++ b/doc/src/examples/multipleinheritance.qdoc
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example uitools/multipleinheritance
+    \title Multiple Inheritance Example
+
+    The Multiple Inheritance Example shows how to use a form created with \QD
+    in an application by subclassing both QWidget and the user interface
+    class, which is \c{Ui::CalculatorForm}.
+
+    \image multipleinheritance-example.png
+
+    To subclass the \c calculatorform.ui file and ensure that \c qmake
+    processes it with the \c uic, we have to include \c calculatorform.ui
+    in the \c .pro file, as shown below:
+
+    \snippet examples/uitools/multipleinheritance/multipleinheritance.pro 0
+
+    When the project is compiled, the \c uic will generate a corresponding
+    \c ui_calculatorform.h.
+
+    \section1 CalculatorForm Definition
+
+    In the \c CalculatorForm definition, we include the \c ui_calculatorform.h
+    that was generated earlier.
+
+    \snippet examples/uitools/multipleinheritance/calculatorform.h 0
+
+    As mentioned earlier, the class is a subclass of both QWidget and
+    \c{Ui::CalculatorForm}.
+
+    \snippet examples/uitools/multipleinheritance/calculatorform.h 1
+
+    Two slots are defined according to the \l{Automatic Connections}
+    {automatic connection} naming convention required by \c uic. This is
+    to ensure that \l{QMetaObject}'s auto-connection facilities connect
+    all the signals and slots involved automatically.
+
+    \section1 CalculatorForm Implementation
+
+    In the constructor, we call \c setupUi() to load the user interface file.
+    Note that we do not need the \c{ui} prefix as \c CalculatorForm is a
+    subclass of the user interface class.
+
+    \snippet examples/uitools/multipleinheritance/calculatorform.cpp 0
+
+    We include two slots, \c{on_inputSpinBox1_valueChanged()} and
+    \c{on_inputSpinBox2_valueChanged()}. These slots respond to the
+    \l{QSpinBox::valueChanged()}{valueChanged()} signal that both spin boxes
+    emit. Whenever there is a change in one spin box's value, we take that
+    value and add it to whatever value the other spin box has.
+
+    \snippet examples/uitools/multipleinheritance/calculatorform.cpp 1
+    \codeline
+    \snippet examples/uitools/multipleinheritance/calculatorform.cpp 2
+
+    \section1 \c main() Function
+
+    The \c main() function instantiates QApplication and \c CalculatorForm.
+    The \c calculator object is displayed by invoking the \l{QWidget::show()}
+    {show()} function.
+
+    \snippet examples/uitools/multipleinheritance/main.cpp 0
+
+    There are various approaches to include forms into applications. The
+    Multiple Inheritance approach is just one of them. See
+    \l{Using a Designer .ui File in Your Application} for more information on
+    the other approaches available.
+*/
diff --git a/doc/src/examples/musicplayerexample.qdoc b/doc/src/examples/musicplayerexample.qdoc
new file mode 100644
index 0000000000..d23c1f16ea
--- /dev/null
+++ b/doc/src/examples/musicplayerexample.qdoc
@@ -0,0 +1,248 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example phonon/musicplayer
+    \title Music Player Example
+
+    The Music Player Example shows how to use Phonon - the multimedia
+    framework that comes with Qt - to create a simple music player.
+    The player can play music files, and provides simple playback
+    control, such as pausing, stopping, and resuming the music.
+
+    \image musicplayer.png
+
+    The player has a button group with the play, pause, and stop
+    buttons familiar from most music players. The top-most slider
+    controls the position in the media stream, and the bottom slider
+    allows adjusting the sound volume. 
+
+    The user can use a file dialog to add music files to a table,
+    which displays meta information about the music - such as the
+    title, album, and artist. Each row contains information about a
+    single music file; to play it, the user selects that row and
+    presses the play button. Also, when a row is selected, the files
+    in the table are queued for playback.
+
+    Phonon offers playback of sound using an available audio device,
+    e.g., a sound card or an USB headset. For the implementation, we
+    use two objects: a \l{Phonon::}{MediaObject}, which controls the
+    playback, and an \l{Phonon::}{AudioOutput}, which can output the
+    audio to a sound device. We will explain how they cooperate when
+    we encounter them in the code. For a high-level introduction to
+    Phonon, see its \l{Phonon Overview}{overview}.
+
+    The API of Phonon is implemented through an intermediate
+    technology on each supported platform: DirectShow, QuickTime, and
+    GStreamer. The sound formats supported may therefore vary from
+    system to system. We do not in this example try to determine which
+    formats are supported, but let Phonon report an error if the user
+    tries to play an unsupported sound file.
+
+    Our player consists of one class, \c MainWindow, which both
+    constructs the GUI and handles the playback. We will now go
+    through the parts of its definition and implementation that
+    concerns Phonon.
+
+    \section1 MainWindow Class Definition
+
+    Most of the API in \c MainWindow is private, as is often the case
+    for classes that represent self-contained windows. We list Phonon
+    objects and slots we connect to their signals; we take a closer
+    look at them when we walk through the \c MainWindow
+    implementation.
+
+    \snippet examples/phonon/musicplayer/mainwindow.h 2
+
+    We use the \l{Phonon::}{SeekSlider} to move the current playback
+    position in the media stream, and the \l{Phonon::}{VolumeSlider}
+    controls the sound volume. Both of these widgets come ready made
+    with Phonon.  We use another \l{Phonon::}{MediaObject},
+    metaInformationProvider, to get the meta information from the
+    music files. More on this later.
+
+    \snippet examples/phonon/musicplayer/mainwindow.h 1
+
+    The \l{Phonon::}{MediaObject} informs us of the state of the playback and
+    properties of the media it is playing back through a series of
+    signals. We connect the signals we need to slots in \c MainWindow.
+    The \c tableClicked() slot is connected to the table, so that we
+    know when the user requests playback of a new music file, by
+    clicking on the table.
+
+    \section1 MainWindow Class Implementation
+
+    The \c MainWindow class handles both the user interface and
+    Phonon. We will now take a look at the code relevant for Phonon.
+    The code required for setting up the GUI is explained elsewhere.
+
+    We start with the constructor:
+
+    \snippet examples/phonon/musicplayer/mainwindow.cpp 0
+
+    We start by instantiating our media and audio output objects.
+    As mentioned, the media object knows how to playback
+    multimedia (in our case sound files) while the audio output
+    can send it to a sound device.
+
+    For the playback to work, the media and audio output objects need
+    to get in contact with each other, so that the media object can
+    send the sound to the audio output. Phonon is a graph based
+    framework, i.e., its objects are nodes that can be connected by
+    paths. Objects are connected using the \c createPath() function,
+    which is part of the Phonon namespace.
+
+    \snippet examples/phonon/musicplayer/mainwindow.cpp 1
+
+    We also connect signals of the media object to slots in our \c
+    MainWindow. We will examine them shortly.
+
+    \snippet examples/phonon/musicplayer/mainwindow.cpp 2
+
+    Finally, we call private helper functions to set up the GUI.
+    The \c setupUi() function contains code for setting up the seek
+    , and volume slider. We move on to \c setupUi():
+
+    \snippet examples/phonon/musicplayer/mainwindow.cpp 3
+    \dots
+    \snippet examples/phonon/musicplayer/mainwindow.cpp 4
+
+    After creating the widgets, they must be supplied with the
+    \l{Phonon::}{MediaObject} and \l{Phonon::}{AudioOutput} objects
+    they should control.  
+
+    In the \c setupActions(), we connect the actions for the play,
+    pause, and stop tool buttons, to slots of the media object.
+
+    \snippet examples/phonon/musicplayer/mainwindow.cpp 5
+
+    We move on to the the slots of \c MainWindow, starting with \c
+    addFiles(): 
+
+    \snippet examples/phonon/musicplayer/mainwindow.cpp 6
+
+    In the \c addFiles() slot, we add files selected by the user to
+    the \c sources list. We then set the first source selected on the
+    \c metaInformationProvider \l{Phonon::}{MediaObject}, which will
+    send a state changed signal when the meta information is resolved;
+    we have this signal connected to the \c metaStateChanged() slot.
+
+    The media object informs us of state changes by sending the \c
+    stateChanged() signal. The \c stateChanged() slot is connected
+    to this signal.
+
+    \snippet examples/phonon/musicplayer/mainwindow.cpp 9
+
+    The \l{Phonon::MediaObject::}{errorString()} function gives a
+    description of the error that is suitable for users of a Phonon
+    application. The two values of the \l{Phonon::}{ErrorState} enum
+    helps us determine whether it is possible to try to play the same
+    file again.
+
+    \snippet examples/phonon/musicplayer/mainwindow.cpp 10
+
+    We update the GUI when the playback state changes, i.e., when it
+    starts, pauses, stops, or resumes.
+
+    The media object will report other state changes, as defined by the
+    \l{Phonon::}{State} enum.
+
+    The \c tick() slot is connected to a \l{Phonon::}{MediaObject} signal which is
+    emitted when the playback position changes:
+
+    \snippet examples/phonon/musicplayer/mainwindow.cpp 11
+
+    The \c time is given in milliseconds.
+
+    When the table is clicked on with the mouse, \c tableClick()
+    is invoked:
+
+    \snippet examples/phonon/musicplayer/mainwindow.cpp 12
+
+    Since we stop the media object, we first check whether it is
+    currently playing. \c row contains the row in the table that was
+    clicked upon; the indices of \c sources follows the table, so we
+    can simply use \c row to find the new source.
+
+    \snippet examples/phonon/musicplayer/mainwindow.cpp 13
+
+    When the media source changes, we simply need to select the
+    corresponding row in the table.
+
+    \snippet examples/phonon/musicplayer/mainwindow.cpp 14
+
+    When \c metaStateChanged() is invoked, \c
+    metaInformationProvider has resolved the meta data for its current
+    source. A \l{Phonon::}{MediaObject} will do this before
+    entering \l{Phonon::}{StoppedState}. Note that we could also
+    have used the \l{Phonon::MediaObject::}{metaDataChanged()} signal for
+    this purpose.
+
+    Some of the meta data is then chosen to be displayed in the
+    music table. A file might not contain the meta data requested,
+    in which case an empty string is returned.
+
+    \snippet examples/phonon/musicplayer/mainwindow.cpp 15
+
+    If we have media sources in \c sources of which meta information
+    is not resolved, we set a new source on the \c
+    metaInformationProvider, which will invoke \c metaStateChanged()
+    again.
+
+    We move on to the \c aboutToFinish() slot:
+
+    \snippet examples/phonon/musicplayer/mainwindow.cpp 16
+
+    When a file is finished playing, the Music Player will move on and
+    play the next file in the table. This slot is connected to the
+    \l{Phonon::}{MediaObject}'s
+    \l{Phonon::MediaObject::}{aboutToFinish()} signal, which is
+    guaranteed to be emitted while there is still time to enqueue
+    another file for playback.
+
+    \section1 The main() function.
+
+    Phonon requires that the application has a name; it is set with
+    \l{QCoreApplication::}{setApplicationName()}. This is because
+    D-Bus, which is used by Phonon on Linux systems, demands this.
+
+    \snippet examples/phonon/musicplayer/main.cpp 1
+*/
diff --git a/doc/src/examples/network-chat.qdoc b/doc/src/examples/network-chat.qdoc
new file mode 100644
index 0000000000..3caeb9a5ea
--- /dev/null
+++ b/doc/src/examples/network-chat.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example network/network-chat
+    \title Network Chat Example
+
+    The Network Chat example demonstrates a stateful peer-to-peer Chat client
+    that uses broadcasting with QUdpSocket and QNetworkInterface to discover
+    its peers.
+
+    \image network-chat-example.png
+*/
diff --git a/doc/src/examples/orderform.qdoc b/doc/src/examples/orderform.qdoc
new file mode 100644
index 0000000000..f6f2607cfe
--- /dev/null
+++ b/doc/src/examples/orderform.qdoc
@@ -0,0 +1,378 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example richtext/orderform
+    \title Order Form Example
+
+    The Order Form example shows how to generate rich text documents by
+    combining a simple template with data input by the user in a dialog. Data
+    is extracted from a \c DetailsDialog object and displayed on a QTextEdit
+    with a QTextCursor, using various formats. Each form generated is added
+    to a QTabWidget for easy access.
+
+    \image orderform-example.png
+
+    \section1 DetailsDialog Definition
+
+    The \c DetailsDialog class is a subclass of QDialog, implementing a slot
+    \c verify() to allow contents of the \c DetailsDialog to be verified later.
+    This is further explained in \c DetailsDialog Implementation.
+
+    \snippet examples/richtext/orderform/detailsdialog.h 0
+
+    The constructor of \c DetailsDialog accepts parameters \a title and
+    \a parent. The class defines four \e{getter} functions: \c orderItems(),
+    \c senderName(), \c senderAddress(), and \c sendOffers() to allow data
+    to be accessed externally.
+
+    The class definition includes input widgets for the required
+    fields, \c nameEdit and \c addressEdit. Also, a QCheckBox and a
+    QDialogButtonBox are defined; the former to provide the user with the
+    option to receive information on products and offers, and the latter
+    to ensure that buttons used are arranged according to the user's native
+    platform. In addition, a QTableWidget, \c itemsTable, is used to hold
+    order details.
+
+    The screenshot below shows the \c DetailsDialog we intend to create.
+
+    \image orderform-example-detailsdialog.png
+
+    \section1 DetailsDialog Implementation
+
+    The constructor of \c DetailsDialog instantiates the earlier defined fields
+    and their respective labels. The label for \c offersCheckBox is set and the
+    \c setupItemsTable() function is invoked to setup and populate
+    \c itemsTable. The QDialogButtonBox object, \c buttonBox, is instantiated
+    with \gui OK and \gui Cancel buttons. This \c buttonBox's \c accepted() and
+    \c rejected() signals are connected to the \c verify() and \c reject()
+    slots in \c DetailsDialog.
+
+    \snippet examples/richtext/orderform/detailsdialog.cpp 0
+
+    A QGridLayout is used to place all the objects on the \c DetailsDialog.
+
+    \snippet examples/richtext/orderform/detailsdialog.cpp 1
+
+    The \c setupItemsTable() function instantiates the QTableWidget object,
+    \c itemsTable, and sets the number of rows based on the QStringList
+    object, \c items, which holds the type of items ordered. The number of
+    columns is set to 2, providing a "name" and "quantity" layout. A \c for
+    loop is used to populate the \c itemsTable and the \c name item's flag
+    is set to Qt::ItemIsEnabled or Qt::ItemIsSelectable. For demonstration
+    purposes, the \c quantity item is set to a 1 and all items in the
+    \c itemsTable have this value for quantity; but this can be modified by
+    editing the contents of the cells at run time.
+
+    \snippet examples/richtext/orderform/detailsdialog.cpp 2
+
+    The \c orderItems() function extracts data from the \c itemsTable and
+    returns it in the form of a QList<QPair<QString,int>> where each QPair
+    corresponds to an item and the quantity ordered.
+
+    \snippet examples/richtext/orderform/detailsdialog.cpp 3
+
+    The \c senderName() function is used to return the value of the QLineEdit
+    used to store the name field for the order form.
+
+    \snippet examples/richtext/orderform/detailsdialog.cpp 4
+
+    The \c senderAddress() function is used to return the value of the
+    QTextEdit containing the address for the order form.
+
+    \snippet examples/richtext/orderform/detailsdialog.cpp 5
+
+    The \c sendOffers() function is used to return a \c true or \c false
+    value that is used to determine if the customer in the order form
+    wishes to receive more information on the company's offers and promotions.
+
+    \snippet examples/richtext/orderform/detailsdialog.cpp 6
+
+    The \c verify() function is an additionally implemented slot used to
+    verify the details entered by the user into the \c DetailsDialog. If
+    the details entered are incomplete, a QMessageBox is displayed
+    providing the user the option to discard the \c DetailsDialog. Otherwise,
+    the details are accepted and the \c accept() function is invoked.
+
+    \snippet examples/richtext/orderform/detailsdialog.cpp 7
+
+    \section1 MainWindow Definition
+
+    The \c MainWindow class is a subclass of QMainWindow, implementing two
+    slots - \c openDialog() and \c printFile(). It also contains a private
+    instance of QTabWidget, \c letters.
+
+    \snippet examples/richtext/orderform/mainwindow.h 0
+
+    \section1 MainWindow Implementation
+
+    The \c MainWindow constructor sets up the \c fileMenu and the required
+    actions, \c newAction and \c printAction. These actions' \c triggered()
+    signals are connected to the additionally implemented openDialog() slot
+    and the default close() slot. The QTabWidget, \c letters, is
+    instantiated and set as the window's central widget.
+
+    \snippet examples/richtext/orderform/mainwindow.cpp 0
+
+    The \c createLetter() function creates a new QTabWidget with a QTextEdit,
+    \c editor, as the parent. This function accepts four parameters that
+    correspond to we obtained through \c DetailsDialog, in order to "fill"
+    the \c editor.
+
+    \snippet examples/richtext/orderform/mainwindow.cpp 1
+
+    We then obtain the cursor for the \c editor using QTextEdit::textCursor().
+    The \c cursor is then moved to the start of the document using
+    QTextCursor::Start.
+
+    \snippet examples/richtext/orderform/mainwindow.cpp 2
+
+    Recall the structure of a \l{Rich Text Document Structure}
+    {Rich Text Document}, where sequences of frames and
+    tables are always separated by text blocks, some of which may contain no
+    information.
+
+    In the case of the Order Form Example, the document structure for this portion
+    is described by the table below:
+
+    \table
+        \row
+            \o {1, 8} frame with \e{referenceFrameFormat}
+        \row
+            \o block \o \c{A company}
+        \row
+            \o block
+        \row
+            \o block \o \c{321 City Street}
+        \row
+            \o block
+        \row
+            \o block \o \c{Industry Park}
+        \row
+            \o block
+        \row
+            \o block \o \c{Another country}
+    \endtable
+
+    This is accomplished with the following code:
+
+    \snippet examples/richtext/orderform/mainwindow.cpp 3
+
+    Note that \c topFrame is the \c {editor}'s top-level frame and is not shown
+    in the document structure.
+
+    We then set the \c{cursor}'s position back to its last position in
+    \c topFrame and fill in the customer's name (provided by the constructor)
+    and address - using a \c foreach loop to traverse the QString, \c address.
+
+    \snippet examples/richtext/orderform/mainwindow.cpp 4
+
+    The \c cursor is now back in \c topFrame and the document structure for
+    the above portion of code is:
+
+    \table
+        \row
+            \o block \o \c{Donald}
+        \row
+            \o block \o \c{47338 Park Avenue}
+        \row
+            \o block \o \c{Big City}
+    \endtable
+
+    For spacing purposes, we invoke \l{QTextCursor::insertBlock()}
+    {insertBlock()} twice. The \l{QDate::currentDate()}{currentDate()} is
+    obtained and displayed. We use \l{QTextFrameFormat::setWidth()}
+    {setWidth()} to increase the width of \c bodyFrameFormat and we insert
+    a new frame with that width.
+
+    \snippet examples/richtext/orderform/mainwindow.cpp 5
+
+    The following code inserts standard text into the order form.
+
+    \snippet examples/richtext/orderform/mainwindow.cpp 6
+    \snippet examples/richtext/orderform/mainwindow.cpp 7
+
+    This part of the document structure now contains the date, a frame with
+    \c bodyFrameFormat, as well as the standard text.
+
+    \table
+        \row
+            \o block
+        \row
+            \o block
+        \row
+            \o block \o \c{Date: 25 May 2007}
+        \row
+            \o block
+        \row
+            \o {1, 4} frame with \e{bodyFrameFormat}
+        \row
+            \o block \o \c{I would like to place an order for the following items:}
+        \row
+            \o block
+        \row
+            \o block
+    \endtable
+
+    A QTextTableFormat object, \c orderTableFormat, is used to hold the type
+    of item and the quantity ordered.
+
+    \snippet examples/richtext/orderform/mainwindow.cpp 8
+
+    We use \l{QTextTable::cellAt()}{cellAt()} to set the headers for the
+    \c orderTable.
+
+    \snippet examples/richtext/orderform/mainwindow.cpp 9
+
+    Then, we iterate through the QList of QPair objects to populate
+    \c orderTable.
+
+    \snippet examples/richtext/orderform/mainwindow.cpp 10
+
+    The resulting document structure for this section is:
+
+    \table
+        \row
+            \o {1, 11} \c{orderTable} with \e{orderTableFormat}
+        \row
+            \o block \o \c{Product}
+        \row
+            \o block \o \c{Quantity}
+        \row
+            \o block \o \c{T-shirt}
+        \row
+            \o block \o \c{4}
+        \row
+            \o block \o \c{Badge}
+        \row
+            \o block \o \c{3}
+        \row
+            \o block \o \c{Reference book}
+        \row
+            \o block \o \c{2}
+        \row
+            \o block \o \c{Coffee cup}
+        \row
+            \o block \o \c{5}
+    \endtable
+
+    The \c cursor is then moved back to \c{topFrame}'s
+    \l{QTextFrame::lastPosition()}{lastPosition()} and more standard text
+    is inserted.
+
+    \snippet examples/richtext/orderform/mainwindow.cpp 11
+    \snippet examples/richtext/orderform/mainwindow.cpp 12
+
+    Another QTextTable is inserted, to display the customer's
+    preference regarding offers.
+
+    \snippet examples/richtext/orderform/mainwindow.cpp 13
+
+    The document structure for this portion is:
+
+    \table
+        \row
+            \o block
+        \row
+            \o block\o \c{Please update my...}
+        \row
+            \o {1, 5} block
+        \row
+            \o {1, 4} \c{offersTable}
+        \row
+            \o block \o \c{I want to receive...}
+        \row
+            \o block \o \c{I do not want to recieve...}
+        \row
+            \o block \o \c{X}
+    \endtable
+
+    The \c cursor is moved to insert "Sincerely" along with the customer's
+    name. More blocks are inserted for spacing purposes. The \c printAction
+    is enabled to indicate that an order form can now be printed.
+
+    \snippet examples/richtext/orderform/mainwindow.cpp 14
+
+    The bottom portion of the document structure is:
+
+    \table
+        \row
+            \o block
+        \row
+            \o {1, 5} block\o \c{Sincerely,}
+        \row
+            \o block
+        \row
+            \o block
+        \row
+            \o block
+        \row
+            \o block \o \c{Donald}
+    \endtable
+
+    The \c createSample() function is used for illustration purposes, to create
+    a sample order form.
+
+    \snippet examples/richtext/orderform/mainwindow.cpp 15
+
+    The \c openDialog() function opens a \c DetailsDialog object. If the
+    details in \c dialog are accepted, the \c createLetter() function is
+    invoked using the parameters extracted from \c dialog.
+
+    \snippet examples/richtext/orderform/mainwindow.cpp 16
+
+    In order to print out the order form, a \c printFile() function is
+    included, as shown below:
+
+    \snippet examples/richtext/orderform/mainwindow.cpp 17
+
+    This function also allows the user to print a selected area with
+    QTextCursor::hasSelection(), instead of printing the entire document.
+
+    \section1 \c main() Function
+
+    The \c main() function instantiates \c MainWindow and sets its size to
+    640x480 pixels before invoking the \c show() function and
+    \c createSample() function.
+
+    \snippet examples/richtext/orderform/main.cpp 0
+
+*/
diff --git a/doc/src/examples/overpainting.qdoc b/doc/src/examples/overpainting.qdoc
new file mode 100644
index 0000000000..e19f54bfd0
--- /dev/null
+++ b/doc/src/examples/overpainting.qdoc
@@ -0,0 +1,249 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example opengl/overpainting
+    \title Overpainting Example
+
+    The Overpainting example shows how QPainter can be used
+    to overpaint a scene rendered using OpenGL in a QGLWidget.
+
+    \image overpainting-example.png
+
+    QGLWidget provides a widget with integrated OpenGL graphics support
+    that enables 3D graphics to be displayed using normal OpenGL calls,
+    yet also behaves like any other standard Qt widget with support for
+    signals and slots, properties, and Qt's action system.
+
+    Usually, QGLWidget is subclassed to display a pure 3D scene; the
+    developer reimplements \l{QGLWidget::initializeGL()}{initializeGL()}
+    to initialize any required resources, \l{QGLWidget::resizeGL()}{resizeGL()}
+    to set up the projection and viewport, and
+    \l{QGLWidget::paintGL()}{paintGL()} to perform the OpenGL calls needed
+    to render the scene. However, it is possible to subclass QGLWidget
+    differently to allow 2D graphics, drawn using QPainter, to be
+    painted over a scene rendered using OpenGL.
+
+    In this example, we demonstrate how this is done by reusing the code
+    from the \l{Hello GL Example}{Hello GL} example to provide a 3D scene,
+    and painting over it with some translucent 2D graphics. Instead of
+    examining each class in detail, we only cover the parts of the
+    \c GLWidget class that enable overpainting, and provide more detailed
+    discussion in the final section of this document.
+
+    \section1 GLWidget Class Definition
+
+    The \c GLWidget class is a subclass of QGLWidget, based on the one used
+    in the \l{Hello GL Example}{Hello GL} example. Rather than describe the
+    class as a whole, we show the first few lines of the class and only
+    discuss the changes we have made to the rest of it:
+
+    \snippet examples/opengl/overpainting/glwidget.h 0
+    \dots
+    \snippet examples/opengl/overpainting/glwidget.h 1
+    \dots
+    \snippet examples/opengl/overpainting/glwidget.h 4
+
+    As usual, the widget uses \l{QGLWidget::initializeGL()}{initializeGL()}
+    to set up objects for our scene and perform other OpenGL initialization tasks.
+    The \l{QGLWidget::resizeGL()}{resizeGL()} function is used to ensure that
+    the 3D graphics in the scene are transformed correctly to the 2D viewport
+    displayed in the widget.
+
+    Instead of implementing \l{QGLWidget::paintGL()}{paintGL()} to handle updates
+    to the widget, we implement a normal QWidget::paintEvent(). This
+    allows us to mix OpenGL calls and QPainter operations in a controlled way.
+
+    In this example, we also implement QWidget::showEvent() to help with the
+    initialization of the 2D graphics used.
+
+    The new private member functions and variables relate exclusively to the
+    2D graphics and animation. The \c animate() slot is called periodically by the
+    \c animationTimer to update the widget; the \c createBubbles() function
+    initializes the \c bubbles list with instances of a helper class used to
+    draw the animation; the \c drawInstructions() function is responsible for
+    a semi-transparent messages that is also overpainted onto the OpenGL scene.
+
+    \section1 GLWidget Class Implementation
+
+    Again, we only show the parts of the \c GLWidget implementation that are
+    relevant to this example. In the constructor, we initialize a QTimer to
+    control the animation:
+
+    \snippet examples/opengl/overpainting/glwidget.cpp 0
+
+    We turn off the widget's \l{QWidget::autoFillBackground}{autoFillBackground} property to
+    instruct OpenGL not to paint a background for the widget when
+    \l{QPainter::begin()}{QPainter::begin()} is called.
+
+    As in the \l{Hello GL Example}{Hello GL} example, the destructor is responsible
+    for freeing any OpenGL-related resources:
+
+    \snippet examples/opengl/overpainting/glwidget.cpp 1
+
+    The \c initializeGL() function is fairly minimal, only setting up the display
+    list used in the scene.
+
+    \snippet examples/opengl/overpainting/glwidget.cpp 2
+
+    To cooperate fully with QPainter, we defer matrix stack operations and attribute
+    initialization until the widget needs to be updated.
+
+    In this example, we implement \l{QWidget::paintEvent()}{paintEvent()} rather
+    than \l{QGLWidget::paintGL()}{paintGL()} to render
+    our scene. When drawing on a QGLWidget, the paint engine used by QPainter
+    performs certain operations that change the states of the OpenGL
+    implementation's matrix and property stacks. Therefore, it is necessary to
+    make all the OpenGL calls to display the 3D graphics before we construct
+    a QPainter to draw the 2D overlay.
+
+    We render a 3D scene by setting up model and projection transformations
+    and other attributes. We use an OpenGL stack operation to preserve the
+    original matrix state, allowing us to recover it later:
+
+    \snippet examples/opengl/overpainting/glwidget.cpp 4
+
+    We define a color to use for the widget's background, and set up various
+    attributes that define how the scene will be rendered.
+
+    \snippet examples/opengl/overpainting/glwidget.cpp 6
+
+    We call the \c setupViewport() private function to set up the
+    projection used for the scene. This is unnecessary in OpenGL
+    examples that implement the \l{QGLWidget::paintGL()}{paintGL()}
+    function because the matrix stacks are usually unmodified between
+    calls to \l{QGLWidget::resizeGL()}{resizeGL()} and
+    \l{QGLWidget::paintGL()}{paintGL()}.
+
+    Since the widget's background is not drawn by the system or by Qt, we use
+    an OpenGL call to paint it before positioning the object defined earlier
+    in the scene:
+
+    \snippet examples/opengl/overpainting/glwidget.cpp 7
+
+    Once the list containing the object has been executed, the matrix stack
+    needs to be restored to its original state at the start of this function
+    before we can begin overpainting:
+
+    \snippet examples/opengl/overpainting/glwidget.cpp 8
+
+    With the 3D graphics done, we construct a QPainter for use on the widget
+    and simply overpaint the widget with 2D graphics; in this case, using a
+    helper class to draw a number of translucent bubbles onto the widget,
+    and calling \c drawInstructions() to overlay some instructions:
+
+    \snippet examples/opengl/overpainting/glwidget.cpp 10
+
+    When QPainter::end() is called, suitable OpenGL-specific calls are made to
+    write the scene, and its additional contents, onto the widget.
+
+    The implementation of the \l{QGLWidget::resizeGL()}{resizeGL()} function
+    sets up the dimensions of the viewport and defines a projection
+    transformation:
+
+    \snippet examples/opengl/overpainting/glwidget.cpp 11
+
+    Ideally, we want to arrange the 2D graphics to suit the widget's dimensions.
+    To achieve this, we implement the \l{QWidget::showEvent()}{showEvent()} handler,
+    creating new graphic elements (bubbles) if necessary at appropriate positions
+    in the widget.
+
+    \snippet examples/opengl/overpainting/glwidget.cpp 12
+
+    This function only has an effect if less than 20 bubbles have already been
+    created.
+
+    The \c animate() slot is called every time the widget's \c animationTimer emits
+    the \l{QTimer::timeout()}{timeout()} signal. This keeps the bubbles moving
+    around.
+
+    \snippet examples/opengl/overpainting/glwidget.cpp 13
+
+    We simply iterate over the bubbles in the \c bubbles list, updating the
+    widget before and after each of them is moved.
+
+    The \c setupViewport() function is called from \c paintEvent()
+    and \c resizeGL().
+
+    \snippet examples/opengl/overpainting/glwidget.cpp 14
+
+    The \c drawInstructions() function is used to prepare some basic
+    instructions that will be painted with the other 2D graphics over
+    the 3D scene.
+
+    \snippet examples/opengl/overpainting/glwidget.cpp 15
+
+    \section1 Summary
+
+    When overpainting 2D content onto 3D content, we need to use a QPainter
+    \e and make OpenGL calls to achieve the desired effect. Since QPainter
+    itself uses OpenGL calls when used on a QGLWidget subclass, we need to
+    preserve the state of various OpenGL stacks when we perform our own
+    calls, using the following approach:
+
+    \list
+    \o Reimplement QGLWidget::initializeGL(), but only perform minimal
+       initialization. QPainter will perform its own initialization
+       routines, modifying the matrix and property stacks, so it is better
+       to defer certain initialization tasks until just before you render
+       the 3D scene.
+    \o Reimplement QGLWidget::resizeGL() as in the pure 3D case.
+    \o Reimplement QWidget::paintEvent() to draw both 2D and 3D graphics.
+    \endlist
+
+    The \l{QWidget::paintEvent()}{paintEvent()} implementation performs the
+    following tasks:
+
+    \list
+    \o Push the current OpenGL modelview matrix onto a stack.
+    \o Perform initialization tasks usually done in the
+       \l{QGLWidget::initializeGL()}{initializeGL()} function.
+    \o Perform code that would normally be located in the widget's
+       \l{QGLWidget::resizeGL()}{resizeGL()} function to set the correct
+       perspective transformation and set up the viewport.
+    \o Render the scene using OpenGL calls.
+    \o Pop the OpenGL modelview matrix off the stack.
+    \o Construct a QPainter object.
+    \o Initialize it for use on the widget with the QPainter::begin() function.
+    \o Draw primitives using QPainter's member functions.
+    \o Call QPainter::end() to finish painting.
+    \endlist
+*/
diff --git a/doc/src/examples/padnavigator.qdoc b/doc/src/examples/padnavigator.qdoc
new file mode 100644
index 0000000000..f43725b828
--- /dev/null
+++ b/doc/src/examples/padnavigator.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example graphicsview/padnavigator
+    \title Pad Navigator Example
+
+    The Pad Navigator Example shows how you can use Graphics View
+    together with embedded widgets to create a simple but useful
+    dynamic user interface for embedded devices.
+
+    \image padnavigator-example.png
+*/
diff --git a/doc/src/examples/painterpaths.qdoc b/doc/src/examples/painterpaths.qdoc
new file mode 100644
index 0000000000..fd27566fb0
--- /dev/null
+++ b/doc/src/examples/painterpaths.qdoc
@@ -0,0 +1,432 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example painting/painterpaths
+    \title Painter Paths Example
+
+    The Painter Paths example shows how painter paths can be used to
+    build complex shapes for rendering.
+
+    \image painterpaths-example.png
+
+    The QPainterPath class provides a container for painting
+    operations, enabling graphical shapes to be constructed and
+    reused.
+
+    A painter path is an object composed of a number of graphical
+    building blocks (such as rectangles, ellipses, lines, and curves),
+    and can be used for filling, outlining, and clipping. The main
+    advantage of painter paths over normal drawing operations is that
+    complex shapes only need to be created once, but they can be drawn
+    many times using only calls to QPainter::drawPath().
+
+    The example consists of two classes:
+
+    \list
+        \o The \c RenderArea class which is a custom widget displaying
+           a single painter path.
+        \o The \c Window class which is the applications main window
+           displaying several \c RenderArea widgets, and allowing the user
+           to manipulate the painter paths' filling, pen, color
+           and rotation angle.
+    \endlist
+
+    First we will review the \c Window class, then we will take a look
+    at the \c RenderArea class.
+
+    \section1 Window Class Definition
+
+    The \c Window class inherits QWidget, and is the applications main
+    window displaying several \c RenderArea widgets, and allowing the
+    user to manipulate the painter paths' filling, pen, color and
+    rotation angle.
+
+    \snippet examples/painting/painterpaths/window.h 0
+
+    We declare three private slots to respond to user input regarding
+    filling and color: \c fillRuleChanged(), \c fillGradientChanged()
+    and \c penColorChanged().
+
+    When the user changes the pen width and the rotation angle, the
+    new value is passed directly on to the \c RenderArea widgets using
+    the QSpinBox::valueChanged() signal. The reason why we must
+    implement slots to update the filling and color, is that QComboBox
+    doesn't provide a similar signal passing the new value as
+    argument; so we need to retrieve the new value, or values, before
+    we can update the \c RenderArea widgets.
+
+    \snippet examples/painting/painterpaths/window.h 1
+
+    We also declare a couple of private convenience functions: \c
+    populateWithColors() populates a given QComboBox with items
+    corresponding to the color names Qt knows about, and \c
+    currentItemData() returns the current item for a given QComboBox.
+
+    \snippet examples/painting/painterpaths/window.h 2
+
+    Then we declare the various components of the main window
+    widget. We also declare a convenience constant specifying the
+    number of \c RenderArea widgets.
+
+    \section1 Window Class Implementation
+
+    In the implementation of the \c Window class we first declare the
+    constant \c Pi with six significant figures:
+
+    \snippet examples/painting/painterpaths/window.cpp 0
+
+    In the constructor, we then define the various painter paths and
+    create corresponding \c RenderArea widgets which will render the
+    graphical shapes:
+
+    \snippet examples/painting/painterpaths/window.cpp 1
+
+    We construct a rectangle with sharp corners using the
+    QPainterPath::moveTo() and QPainterPath::lineTo()
+    functions.
+
+    QPainterPath::moveTo() moves the current point to the point passed
+    as argument. A painter path is an object composed of a number of
+    graphical building blocks, i.e. subpaths. Moving the current point
+    will also start a new subpath (implicitly closing the previously
+    current path when the new one is started). The
+    QPainterPath::lineTo() function adds a straight line from the
+    current point to the given end point. After the line is drawn, the
+    current point is updated to be at the end point of the line.
+
+    We first move the current point starting a new subpath, and we
+    draw three of the rectangle's sides. Then we call the
+    QPainterPath::closeSubpath() function which draws a line to the
+    beginning of the current subpath. A new subpath is automatically
+    begun when the current subpath is closed. The current point of the
+    new path is (0, 0). We could also have called
+    QPainterPath::lineTo() to draw the last line as well, and then
+    explicitly start a new subpath using the QPainterPath::moveTo()
+    function.
+
+    QPainterPath also provide the QPainterPath::addRect() convenience
+    function, which adds a given rectangle to the path as a closed
+    subpath. The rectangle is added as a clockwise set of lines. The
+    painter path's current position after the rect has been added is
+    at the top-left corner of the rectangle.
+
+    \snippet examples/painting/painterpaths/window.cpp 2
+
+    Then we construct a rectangle with rounded corners. As before, we
+    use the QPainterPath::moveTo() and QPainterPath::lineTo()
+    functions to draw the rectangle's sides. To create the rounded
+    corners we use the QPainterPath::arcTo() function.
+
+    QPainterPath::arcTo() creates an arc that occupies the given
+    rectangle (specified by a QRect or the rectangle's coordinates),
+    beginning at the given start angle and extending the given degrees
+    counter-clockwise. Angles are specified in degrees. Clockwise arcs
+    can be specified using negative angles.  The function connects the
+    current point to the starting point of the arc if they are not
+    already connected.
+
+    \snippet examples/painting/painterpaths/window.cpp 3
+
+    We also use the QPainterPath::arcTo() function to construct the
+    ellipse path. First we move the current point starting a new
+    path. Then we call QPainterPath::arcTo() with starting angle 0.0
+    and 360.0 degrees as the last argument, creating an ellipse.
+
+    Again, QPainterPath provides a convenience function (
+    QPainterPath::addEllipse()) which creates an ellipse within a
+    given bounding rectangle and adds it to the painter path. If the
+    current subpath is closed, a new subpath is started. The ellipse
+    is composed of a clockwise curve, starting and finishing at zero
+    degrees (the 3 o'clock position).
+
+    \snippet examples/painting/painterpaths/window.cpp 4
+
+    When constructing the pie chart path we continue to use a
+    combination of the mentioned functions: First we move the current
+    point, starting a new subpath. Then we create a line from the
+    center of the chart to the arc, and the arc itself. When we close
+    the subpath, we implicitly construct the last line back to the
+    center of the chart.
+
+    \snippet examples/painting/painterpaths/window.cpp 5
+
+    Constructing a polygon is equivalent to constructing a rectangle.
+
+    QPainterPath also provide the QPainterPath::addPolygon()
+    convenience function which adds the given polygon to the path as a
+    new subpath. Current position after the polygon has been added is
+    the last point in polygon.
+
+    \snippet examples/painting/painterpaths/window.cpp 6
+
+    Then we create a path consisting of a group of subpaths: First we
+    move the current point, and create a circle using the
+    QPainterPath::arcTo() function with starting angle 0.0, and 360
+    degrees as the last argument, as we did when we created the
+    ellipse path. Then we move the current point again, starting a
+    new subpath, and construct three sides of a square using the
+    QPainterPath::lineTo() function.
+
+    Now, when we call the QPainterPath::closeSubpath() fucntion the
+    last side is created. Remember that the
+    QPainterPath::closeSubpath() function draws a line to the
+    beginning of the \e current subpath, i.e the square.
+
+    QPainterPath provide a convenience function,
+    QPainterPath::addPath() which adds a given path to the path that
+    calls the function.
+
+    \snippet examples/painting/painterpaths/window.cpp 7
+
+    When creating the text path, we first create the font. Then we set
+    the font's style strategy which tells the font matching algorithm
+    what type of fonts should be used to find an appropriate default
+    family. QFont::ForceOutline forces the use of outline fonts.
+
+    To construct the text, we use the QPainterPath::addText() function
+    which adds the given text to the path as a set of closed subpaths
+    created from the supplied font. The subpaths are positioned so
+    that the left end of the text's baseline lies at the specified
+    point.
+
+    \snippet examples/painting/painterpaths/window.cpp 8
+
+    To create the Bezier path, we use the QPainterPath::cubicTo()
+    function which adds a Bezier curve between the current point and
+    the given end point with the given control point.  After the curve
+    is added, the current point is updated to be at the end point of
+    the curve.
+
+    In this case we omit to close the subpath so that we only have a
+    simple curve. But there is still a logical line from the curve's
+    endpoint back to the beginning of the subpath; it becomes visible
+    when filling the path as can be seen in the applications main
+    window.
+
+    \snippet examples/painting/painterpaths/window.cpp 9
+
+    The final path that we construct shows that you can use
+    QPainterPath to construct rather complex shapes using only the
+    previous mentioned QPainterPath::moveTo(), QPainterPath::lineTo()
+    and QPainterPath::closeSubpath() functions.
+
+    \snippet examples/painting/painterpaths/window.cpp 10
+
+    Now that we have created all the painter paths that we need, we
+    create a corresponding \c RenderArea widget for each. In the end,
+    we make sure that the number of render areas is correct using the
+    Q_ASSERT() macro.
+
+    \snippet examples/painting/painterpaths/window.cpp 11
+
+    Then we create the widgets associated with the painter paths' fill
+    rule.
+
+    There are two available fill rules in Qt: The Qt::OddEvenFill rule
+    determine whether a point is inside the shape by drawing a
+    horizontal line from the point to a location outside the shape,
+    and count the number of intersections. If the number of
+    intersections is an odd number, the point is inside the
+    shape. This rule is the default.
+
+    The Qt::WindingFill rule determine whether a point is inside the
+    shape by drawing a horizontal line from the point to a location
+    outside the shape. Then it determines whether the direction of the
+    line at each intersection point is up or down. The winding number
+    is determined by summing the direction of each intersection. If
+    the number is non zero, the point is inside the shape.
+
+    The Qt::WindingFill rule can in most cases be considered as the
+    intersection of closed shapes.
+
+    \snippet examples/painting/painterpaths/window.cpp 12
+
+    We also create the other widgets associated with the filling, the
+    pen and the rotation angle.
+
+    \snippet examples/painting/painterpaths/window.cpp 16
+
+    We connect the comboboxes \l {QComboBox::activated()}{activated()}
+    signals to the associated slots in the \c Window class, while we
+    connect the spin boxes \l
+    {QSpinBox::valueChanged()}{valueChanged()} signal directly to the
+    \c RenderArea widget's respective slots.
+
+    \snippet examples/painting/painterpaths/window.cpp 17
+
+    We add the \c RenderArea widgets to a separate layout which we
+    then add to the main layout along with the rest of the widgets.
+
+    \snippet examples/painting/painterpaths/window.cpp 18
+
+    Finally, we initialize the \c RenderArea widgets by calling the \c
+    fillRuleChanged(), \c fillGradientChanged() and \c
+    penColorChanged() slots, and we set the inital pen width and
+    window title.
+
+    \snippet examples/painting/painterpaths/window.cpp 19
+    \codeline
+    \snippet examples/painting/painterpaths/window.cpp 20
+    \codeline
+    \snippet examples/painting/painterpaths/window.cpp 21
+
+    The private slots are implemented to retrieve the new value, or
+    values, from the associated comboboxes and update the RenderArea
+    widgets.
+
+    First we determine the new value, or values, using the private \c
+    currentItemData() function and the qvariant_cast() template
+    function. Then we call the associated slot for each of the \c
+    RenderArea widgets to update the painter paths.
+
+    \snippet examples/painting/painterpaths/window.cpp 22
+
+    The \c populateWithColors() function populates the given combobox
+    with items corresponding to the color names Qt knows about
+    provided by the static QColor::colorNames() function.
+
+    \snippet examples/painting/painterpaths/window.cpp 23
+
+    The \c currentItemData() function simply return the current item
+    of the given combobox.
+
+    \section1 RenderArea Class Definition
+
+    The \c RenderArea class inherits QWidget, and is a custom widget
+    displaying a single painter path.
+
+    \snippet examples/painting/painterpaths/renderarea.h 0
+
+    We declare several public slots updating the \c RenderArea
+    widget's associated painter path. In addition we reimplement the
+    QWidget::minimumSizeHint() and QWidget::sizeHint() functions to
+    give the \c RenderArea widget a reasonable size within our
+    application, and we reimplement the QWidget::paintEvent() event
+    handler to draw its painter path.
+
+    \snippet examples/painting/painterpaths/renderarea.h 1
+
+    Each instance of the \c RenderArea class has a QPainterPath, a
+    couple of fill colors, a pen width, a pen color and a rotation
+    angle.
+
+    \section1 RenderArea Class Implementation
+
+    The constructor takes a QPainterPath as argument (in addition to
+    the optional QWidget parent):
+
+    \snippet examples/painting/painterpaths/renderarea.cpp 0
+
+    In the constructor we initialize the \c RenderArea widget with the
+    QPainterPath parameter as well as initializing the pen width and
+    rotation angle. We also set the widgets \l
+    {QWidget::backgroundRole()}{background role}; QPalette::Base is
+    typically white.
+
+    \snippet examples/painting/painterpaths/renderarea.cpp 1
+    \codeline
+    \snippet examples/painting/painterpaths/renderarea.cpp 2
+
+    Then we reimplement the QWidget::minimumSizeHint() and
+    QWidget::sizeHint() functions to give the \c RenderArea widget a
+    reasonable size within our application.
+
+    \snippet examples/painting/painterpaths/renderarea.cpp 3
+    \codeline
+    \snippet examples/painting/painterpaths/renderarea.cpp 4
+    \codeline
+    \snippet examples/painting/painterpaths/renderarea.cpp 5
+    \codeline
+    \snippet examples/painting/painterpaths/renderarea.cpp 6
+    \codeline
+    \snippet examples/painting/painterpaths/renderarea.cpp 7
+
+    The various public slots updates the \c RenderArea widget's
+    painter path by setting the associated property and make a call to
+    the QWidget::update() function, forcing a repaint of the widget
+    with the new rendering preferences.
+
+    The QWidget::update() slot does not cause an immediate repaint;
+    instead it schedules a paint event for processing when Qt returns
+    to the main event loop.
+
+    \snippet examples/painting/painterpaths/renderarea.cpp 8
+
+    A paint event is a request to repaint all or parts of the
+    widget. The paintEvent() function is an event handler that can be
+    reimplemented to receive the widget's paint events. We reimplement
+    the event handler to render the \c RenderArea widget's painter
+    path.
+
+    First, we create a QPainter for the \c RenderArea instance, and
+    set the painter's render hints. The QPainter::RenderHints are used
+    to specify flags to QPainter that may, or may not, be respected by
+    any given engine. QPainter::Antialiasing indicates that the engine
+    should anti-alias the edges of primitives if possible, i.e. put
+    additional pixels around the original ones to smooth the edges.
+
+    \snippet examples/painting/painterpaths/renderarea.cpp 9
+
+    Then we scale the QPainter's coordinate system to ensure that the
+    painter path is rendered in the right size, i.e that it grows with
+    the \c RenderArea widget when the application is resized. When we
+    constructed the various painter paths, they were all rnedered
+    within a square with a 100 pixel width wich is equivalent to \c
+    RenderArea::sizeHint(). The QPainter::scale() function scales the
+    coordinate system by the \c RenderArea widget's \e current width
+    and height divided by 100.
+
+    Now, when we are sure that the painter path has the right size, we
+    can translate the coordinate system to make the painter path
+    rotate around the \c RenderArea widget's center. After we have
+    performed the rotation, we must remember to translate the
+    coordinate system back again.
+
+    \snippet examples/painting/painterpaths/renderarea.cpp 10
+
+    Then we set the QPainter's pen with the instance's rendering
+    preferences. We create a QLinearGradient and set its colors
+    corresponding to the \c RenderArea widget's fill colors. Finally,
+    we set the QPainter's brush (the gradient is automatically
+    converted into a QBrush), and draw the \c RenderArea widget's
+    painter path using the QPainter::drawPath() function.
+*/
diff --git a/doc/src/examples/pbuffers.qdoc b/doc/src/examples/pbuffers.qdoc
new file mode 100644
index 0000000000..347cf3d253
--- /dev/null
+++ b/doc/src/examples/pbuffers.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example opengl/pbuffers
+    \title Pixel Buffers Example
+
+    The Pixel Buffers example demonstrates how to use the
+    QGLPixelBuffer class to render into an off-screen buffer and use
+    the contents as a dynamic texture in a QGLWidget.
+
+    \image pbuffers-example.png
+*/
diff --git a/doc/src/examples/pbuffers2.qdoc b/doc/src/examples/pbuffers2.qdoc
new file mode 100644
index 0000000000..542685258d
--- /dev/null
+++ b/doc/src/examples/pbuffers2.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example opengl/pbuffers2
+    \title Pixel Buffers 2 Example
+
+    The Pixel Buffers 2 example demonstrates how to use the
+    QGLPixelBuffer class to render into an off-screen buffer and use
+    the contents as a dynamic texture in a QGLWidget.
+
+    \image pbuffers2-example.png
+*/
diff --git a/doc/src/examples/pixelator.qdoc b/doc/src/examples/pixelator.qdoc
new file mode 100644
index 0000000000..2a8b43d721
--- /dev/null
+++ b/doc/src/examples/pixelator.qdoc
@@ -0,0 +1,271 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example itemviews/pixelator
+    \title Pixelator Example
+
+    The Pixelator example shows how delegates can be used to customize the way that
+    items are rendered in standard item views.
+
+    \image pixelator-example.png
+
+    By default, QTreeView, QTableView, and QListView use a standard item delegate
+    to display and edit a set of common data types that are sufficient for many
+    applications. However, an application may need to represent items of data in a
+    particular way, or provide support for rendering more specialized data types,
+    and this often requires the use of a custom delegate.
+
+    In this example, we show how to use custom delegates to modify the appearance
+    of standard views. To do this, we implement the following components:
+
+    \list
+    \i A model which represents each pixel in an image as an item of data, where each
+       item contains a value for the brightness of the corresponding pixel.
+    \i A custom delegate that uses the information supplied by the model to represent
+       each pixel as a black circle on a white background, where the radius of the
+       circle corresponds to the darkness of the pixel.
+    \endlist
+
+    This example may be useful for developers who want to implement their own table
+    models or custom delegates. The process of creating custom delegates for editing
+    item data is covered in the \l{Spin Box Delegate Example}{Spin Box Delegate}
+    example.
+
+    \section1 ImageModel Class Definition
+
+    The \c ImageModel class is defined as follows:
+
+    \snippet examples/itemviews/pixelator/imagemodel.h 0
+
+    Since we only require a simple, read-only table model, we only need to implement
+    functions to indicate the dimensions of the image and supply data to other
+    components.
+
+    For convenience, the image to be used is passed in the constructor.
+
+    \section1 ImageModel Class Implementation
+
+    The constructor is trivial:
+
+    \snippet examples/itemviews/pixelator/imagemodel.cpp 0
+
+    The \c setImage() function sets the image that will be used by the model:
+   
+    \snippet examples/itemviews/pixelator/imagemodel.cpp 1
+
+    The QAbstractItemModel::reset() call tells the view(s) that the model
+    has changed.
+
+    The \c rowCount() and \c columnCount() functions return the height and width of
+    the image respectively:
+
+    \snippet examples/itemviews/pixelator/imagemodel.cpp 2
+    \snippet examples/itemviews/pixelator/imagemodel.cpp 3
+
+    Since the image is a simple two-dimensional structure, the \c parent arguments
+    to these functions are unused. They both simply return the relevant size from
+    the underlying image object.
+
+    The \c data() function returns data for the item that corresponds to a given
+    model index in a format that is suitable for a particular role:
+
+    \snippet examples/itemviews/pixelator/imagemodel.cpp 4
+
+    In this implementation, we only check that the model index is valid, and that
+    the role requested is the \l{Qt::ItemDataRole}{DisplayRole}. If so, the function
+    returns the grayscale value of the relevant pixel in the image; otherwise, a null
+    model index is returned.
+
+    This model can be used with QTableView to display the integer brightness values
+    for the pixels in the image. However, we will implement a custom delegate to
+    display this information in a more artistic way.
+
+    The \c headerData() function is also reimplemented:
+
+    \snippet examples/itemviews/pixelator/imagemodel.cpp 5
+
+    We return (1, 1) as the size hint for a header item. If we
+    didn't, the headers would default to a larger size, preventing
+    us from displaying really small items (which can be specified
+    using the \gui{Pixel size} combobox).
+
+    \section1 PixelDelegate Class Definition
+
+    The \c PixelDelegate class is defined as follows:
+
+    \snippet examples/itemviews/pixelator/pixeldelegate.h 0
+
+    This class provides only basic features for a delegate so, unlike the
+    \l{Spin Box Delegate Example}{Spin Box Delegate} example, we subclass
+    QAbstractItemDelegate instead of QItemDelegate.
+
+    We only need to reimplement \l{QAbstractItemDelegate::paint()}{paint()} and
+    \l{QAbstractItemDelegate::sizeHint()}{sizeHint()} in this class.
+    However, we also provide a delegate-specific \c setPixelSize() function so
+    that we can change the delegate's behavior via the signals and slots mechanism.
+
+    \section1 PixelDelegate Class Implementation
+
+    The \c PixelDelegate constructor is used to set up a default value for
+    the size of each "pixel" that it renders. The base class constructor is
+    also called to ensure that the delegate is set up with a parent object,
+    if one is supplied:
+
+    \snippet examples/itemviews/pixelator/pixeldelegate.cpp 0
+
+    Each item is rendered by the delegate's
+    \l{QAbstractItemDelegate::paint()}{paint()} function. The view calls this
+    function with a ready-to-use QPainter object, style information that the
+    delegate should use to correctly draw the item, and an index to the item in
+    the model:
+
+    \snippet examples/itemviews/pixelator/pixeldelegate.cpp 1
+
+    The first task the delegate has to perform is to draw the item's background
+    correctly. Usually, selected items appear differently to non-selected items,
+    so we begin by testing the state passed in the style option and filling the
+    background if necessary.
+
+    The radius of each circle is calculated in the following lines of code:
+
+    \snippet examples/itemviews/pixelator/pixeldelegate.cpp 3
+    \snippet examples/itemviews/pixelator/pixeldelegate.cpp 4
+
+    First, the largest possible radius of the circle is determined by taking the
+    smallest dimension of the style option's \c rect attribute.
+    Using the model index supplied, we obtain a value for the brightness of the
+    relevant pixel in the image. The radius of the circle is calculated by
+    scaling the brightness to fit within the item and subtracting it from the
+    largest possible radius.
+
+    \snippet examples/itemviews/pixelator/pixeldelegate.cpp 5
+    \snippet examples/itemviews/pixelator/pixeldelegate.cpp 6
+    \snippet examples/itemviews/pixelator/pixeldelegate.cpp 7
+
+    We save the painter's state, turn on antialiasing (to obtain smoother
+    curves), and turn off the pen.
+
+    \snippet examples/itemviews/pixelator/pixeldelegate.cpp 8
+    \snippet examples/itemviews/pixelator/pixeldelegate.cpp 9
+
+    The foreground of the item (the circle representing a pixel) must be
+    rendered using an appropriate brush. For unselected items, we will use a
+    solid black brush; selected items are drawn using a predefined brush from
+    the style option's palette.
+
+    \snippet examples/itemviews/pixelator/pixeldelegate.cpp 10
+
+    Finally, we paint the circle within the rectangle specified by the style
+    option and we call \l{QPainter::}{restore()} on the painter.
+
+    The \c paint() function does not have to be particularly complicated; it is
+    only necessary to ensure that the state of the painter when the function
+    returns is the same as it was when it was called. This usually
+    means that any transformations applied to the painter must be preceded by
+    a call to QPainter::save() and followed by a call to QPainter::restore().
+
+    The delegate's \l{QAbstractItemDelegate::}{sizeHint()} function
+    returns a size for the item based on the predefined pixel size, initially set
+    up in the constructor:
+
+    \snippet examples/itemviews/pixelator/pixeldelegate.cpp 11
+
+    The delegate's size is updated whenever the pixel size is changed.
+    We provide a custom slot to do this:
+
+    \snippet examples/itemviews/pixelator/pixeldelegate.cpp 12
+
+    \section1 Using The Custom Delegate
+
+    In this example, we use a main window to display a table of data, using the
+    custom delegate to render each cell in a particular way. Much of the
+    \c MainWindow class performs tasks that are not related to item views. Here,
+    we only quote the parts that are relevant. You can look at the rest of the
+    implementation by following the links to the code at the top of this
+    document.
+
+    In the constructor, we set up a table view, turn off its grid, and hide its
+    headers:
+
+    \snippet examples/itemviews/pixelator/mainwindow.cpp 0
+    \dots
+    \snippet examples/itemviews/pixelator/mainwindow.cpp 1
+
+    This enables the items to be drawn without any gaps between them. Removing
+    the headers also prevents the user from adjusting the sizes of individual
+    rows and columns. 
+    
+    We also set the minimum section size to 1 on the headers. If we
+    didn't, the headers would default to a larger size, preventing
+    us from displaying really small items (which can be specified
+    using the \gui{Pixel size} combobox).
+
+    The custom delegate is constructed with the main window as its parent, so
+    that it will be deleted correctly later, and we set it on the table view.
+
+    \snippet examples/itemviews/pixelator/mainwindow.cpp 2
+
+    Each item in the table view will be rendered by the \c PixelDelegate
+    instance.
+
+    We construct a spin box to allow the user to change the size of each "pixel"
+    drawn by the delegate:
+
+    \snippet examples/itemviews/pixelator/mainwindow.cpp 3
+
+    This spin box is connected to the custom slot we implemented in the
+    \c PixelDelegate class. This ensures that the delegate always draws each
+    pixel at the currently specified size:
+
+    \snippet examples/itemviews/pixelator/mainwindow.cpp 4
+    \dots
+    \snippet examples/itemviews/pixelator/mainwindow.cpp 5
+
+    We also connect the spin box to a slot in the \c MainWindow class. This
+    forces the view to take into account the new size hints for each item;
+    these are provided by the delegate in its \c sizeHint() function.
+
+    \snippet examples/itemviews/pixelator/mainwindow.cpp 6
+
+    We explicitly resize the columns and rows to match the
+    \gui{Pixel size} combobox.
+*/
diff --git a/doc/src/examples/plugandpaint.qdoc b/doc/src/examples/plugandpaint.qdoc
new file mode 100644
index 0000000000..3cdd8a4ac3
--- /dev/null
+++ b/doc/src/examples/plugandpaint.qdoc
@@ -0,0 +1,554 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example tools/plugandpaint
+    \title Plug & Paint Example
+
+    The Plug & Paint example demonstrates how to write Qt
+    applications that can be extended through plugins.
+
+    \image plugandpaint.png Screenshot of the Plug & Paint example
+
+    A plugin is a dynamic library that can be loaded at run-time to
+    extend an application. Qt makes it possible to create custom
+    plugins and to load them using QPluginLoader. To ensure that
+    plugins don't get lost, it is also possible to link them
+    statically to the executable. The Plug & Paint example uses
+    plugins to support custom brushes, shapes, and image filters. A
+    single plugin can provide multiple brushes, shapes, and/or
+    filters.
+
+    If you want to learn how to make your own application extensible
+    through plugins, we recommend that you start by reading this
+    overview, which explains how to make an application use plugins.
+    Afterward, you can read the
+    \l{tools/plugandpaintplugins/basictools}{Basic Tools} and
+    \l{tools/plugandpaintplugins/extrafilters}{Extra Filters}
+    overviews, which show how to implement static and dynamic
+    plugins, respectively.
+
+    Plug & Paint consists of the following classes:
+
+    \list
+    \o \c MainWindow is a QMainWindow subclass that provides the menu
+       system and that contains a \c PaintArea as the central widget.
+    \o \c PaintArea is a QWidget that allows the user to draw using a
+       brush and to insert shapes.
+    \o \c PluginDialog is a dialog that shows information about the
+       plugins detected by the application.
+    \o \c BrushInterface, \c ShapeInterface, and \c FilterInterface are
+       abstract base classes that can be implemented by plugins to
+       provide custom brushes, shapes, and image filters.
+    \endlist
+
+    \section1 The Plugin Interfaces
+
+    We will start by reviewing the interfaces defined in \c
+    interfaces.h. These interfaces are used by the Plug & Paint
+    application to access extra functionality. They are implemented
+    in the plugins.
+
+
+    \snippet examples/tools/plugandpaint/interfaces.h 0
+
+    The \c BrushInterface class declares four pure virtual functions.
+    The first pure virtual function, \c brushes(), returns a list of
+    strings that identify the brushes provided by the plugin. By
+    returning a QStringList instead of a QString, we make it possible
+    for a single plugin to provide multiple brushes. The other
+    functions have a \c brush parameter to identify which brush
+    (among those returned by \c brushes()) is used.
+
+    \c mousePress(), \c mouseMove(), and \c mouseRelease() take a
+    QPainter and one or two \l{QPoint}s, and return a QRect
+    identifying which portion of the image was altered by the brush.
+
+    The class also has a virtual destructor. Interface classes
+    usually don't need such a destructor (because it would make
+    little sense to \c delete the object that implements the
+    interface through a pointer to the interface), but some compilers
+    emit a warning for classes that declare virtual functions but no
+    virtual destructor. We provide the destructor to keep these
+    compilers happy.
+
+    \snippet examples/tools/plugandpaint/interfaces.h 1
+
+    The \c ShapeInterface class declares a \c shapes() function that
+    works the same as \c{BrushInterface}'s \c brushes() function, and
+    a \c generateShape() function that has a \c shape parameter.
+    Shapes are represented by a QPainterPath, a data type that can
+    represent arbitrary 2D shapes or combinations of shapes. The \c
+    parent parameter can be used by the plugin to pop up a dialog
+    asking the user to specify more information.
+
+    \snippet examples/tools/plugandpaint/interfaces.h 2
+
+    The \c FilterInterface class declares a \c filters() function
+    that returns a list of filter names, and a \c filterImage()
+    function that applies a filter to an image.
+
+    \snippet examples/tools/plugandpaint/interfaces.h 4
+
+    To make it possible to query at run-time whether a plugin
+    implements a given interface, we must use the \c
+    Q_DECLARE_INTERFACE() macro. The first argument is the name of
+    the interface. The second argument is a string identifying the
+    interface in a unique way. By convention, we use a "Java package
+    name" syntax to identify interfaces. If we later change the
+    interfaces, we must use a different string to identify the new
+    interface; otherwise, the application might crash. It is therefore
+    a good idea to include a version number in the string, as we did
+    above.
+
+    The \l{tools/plugandpaintplugins/basictools}{Basic Tools} plugin
+    and the \l{tools/plugandpaintplugins/extrafilters}{Extra Filters}
+    plugin shows how to derive from \c BrushInterface, \c
+    ShapeInterface, and \c FilterInterface.
+
+    A note on naming: It might have been tempting to give the \c
+    brushes(), \c shapes(), and \c filters() functions a more generic
+    name, such as \c keys() or \c features(). However, that would
+    have made multiple inheritance impractical. When creating
+    interfaces, we should always try to give unique names to the pure
+    virtual functions.
+
+    \section1 The MainWindow Class
+
+    The \c MainWindow class is a standard QMainWindow subclass, as
+    found in many of the other examples (e.g.,
+    \l{mainwindows/application}{Application}). Here, we'll
+    concentrate on the parts of the code that are related to plugins.
+
+    \snippet examples/tools/plugandpaint/mainwindow.cpp 4
+
+    The \c loadPlugins() function is called from the \c MainWindow
+    constructor to detect plugins and update the \gui{Brush},
+    \gui{Shapes}, and \gui{Filters} menus. We start by handling static
+    plugins (available through QPluginLoader::staticInstances())
+
+    To the application that uses the plugin, a Qt plugin is simply a
+    QObject. That QObject implements plugin interfaces using multiple
+    inheritance.
+
+    \snippet examples/tools/plugandpaint/mainwindow.cpp 5
+
+    The next step is to load dynamic plugins. We initialize the \c
+    pluginsDir member variable to refer to the \c plugins
+    subdirectory of the Plug & Paint example. On Unix, this is just a
+    matter of initializing the QDir variable with
+    QApplication::applicationDirPath(), the path of the executable
+    file, and to do a \l{QDir::cd()}{cd()}. On Windows and Mac OS X,
+    this file is usually located in a subdirectory, so we need to
+    take this into account.
+
+    \snippet examples/tools/plugandpaint/mainwindow.cpp 6
+    \snippet examples/tools/plugandpaint/mainwindow.cpp 7
+    \snippet examples/tools/plugandpaint/mainwindow.cpp 8
+
+    We use QDir::entryList() to get a list of all files in that
+    directory. Then we iterate over the result using \l foreach and
+    try to load the plugin using QPluginLoader.
+
+    The QObject provided by the plugin is accessible through
+    QPluginLoader::instance(). If the dynamic library isn't a Qt
+    plugin, or if it was compiled against an incompatible version of
+    the Qt library, QPluginLoader::instance() returns a null pointer.
+
+    If QPluginLoader::instance() is non-null, we add it to the menus.
+
+    \snippet examples/tools/plugandpaint/mainwindow.cpp 9
+
+    At the end, we enable or disable the \gui{Brush}, \gui{Shapes},
+    and \gui{Filters} menus based on whether they contain any items.
+
+    \snippet examples/tools/plugandpaint/mainwindow.cpp 10
+
+    For each plugin (static or dynamic), we check which interfaces it
+    implements using \l qobject_cast(). First, we try to cast the
+    plugin instance to a \c BrushInterface; if it works, we call the
+    private function \c addToMenu() with the list of brushes returned
+    by \c brushes(). Then we do the same with the \c ShapeInterface
+    and the \c FilterInterface.
+
+    \snippet examples/tools/plugandpaint/mainwindow.cpp 3
+
+    The \c aboutPlugins() slot is called on startup and can be
+    invoked at any time through the \gui{About Plugins} action. It
+    pops up a \c PluginDialog, providing information about the loaded
+    plugins.
+
+    \image plugandpaint-plugindialog.png Screenshot of the Plugin dialog
+
+
+    The \c addToMenu() function is called from \c loadPlugin() to
+    create \l{QAction}s for custom brushes, shapes, or filters and
+    add them to the relevant menu. The QAction is created with the
+    plugin from which it comes from as the parent; this makes it
+    convenient to get access to the plugin later.
+
+    \snippet examples/tools/plugandpaint/mainwindow.cpp 0
+
+    The \c changeBrush() slot is invoked when the user chooses one of
+    the brushes from the \gui{Brush} menu. We start by finding out
+    which action invoked the slot using QObject::sender(). Then we
+    get the \c BrushInterface out of the plugin (which we
+    conveniently passed as the QAction's parent) and we call \c
+    PaintArea::setBrush() with the \c BrushInterface and the string
+    identifying the brush. Next time the user draws on the paint
+    area, \c PaintArea will use this brush.
+
+    \snippet examples/tools/plugandpaint/mainwindow.cpp 1
+
+    The \c insertShape() is invoked when the use chooses one of the
+    shapes from the \gui{Shapes} menu. We retrieve the QAction that
+    invoked the slot, then the \c ShapeInterface associated with that
+    QAction, and finally we call \c ShapeInterface::generateShape()
+    to obtain a QPainterPath.
+
+    \snippet examples/tools/plugandpaint/mainwindow.cpp 2
+
+    The \c applyFilter() slot is similar: We retrieve the QAction
+    that invoked the slot, then the \c FilterInterface associated to
+    that QAction, and finally we call \c
+    FilterInterface::filterImage() to apply the filter onto the
+    current image.
+
+    \section1 The PaintArea Class
+
+    The \c PaintArea class contains some code that deals with \c
+    BrushInterface, so we'll review it briefly.
+
+    \snippet examples/tools/plugandpaint/paintarea.cpp 0
+
+    In \c setBrush(), we simply store the \c BrushInterface and the
+    brush that are given to us by \c MainWindow.
+
+    \snippet examples/tools/plugandpaint/paintarea.cpp 1
+
+    In the \l{QWidget::mouseMoveEvent()}{mouse move event handler},
+    we call the \c BrushInterface::mouseMove() function on the
+    current \c BrushInterface, with the current brush. The mouse
+    press and mouse release handlers are very similar.
+
+    \section1 The PluginDialog Class
+
+    The \c PluginDialog class provides information about the loaded
+    plugins to the user. Its constructor takes a path to the plugins
+    and a list of plugin file names. It calls \c findPlugins()
+    to fill the QTreeWdiget with information about the plugins:
+
+    \snippet examples/tools/plugandpaint/plugindialog.cpp 0
+
+    The \c findPlugins() is very similar to \c
+    MainWindow::loadPlugins(). It uses QPluginLoader to access the
+    static and dynamic plugins. Its helper function \c
+    populateTreeWidget() uses \l qobject_cast() to find out which
+    interfaces are implemented by the plugins:
+
+    \snippet examples/tools/plugandpaint/plugindialog.cpp 1
+
+    \section1 Importing Static Plugins
+
+    The \l{tools/plugandpaintplugins/basictools}{Basic Tools} plugin
+    is built as a static plugin, to ensure that it is always
+    available to the application. This requires using the
+    Q_IMPORT_PLUGIN() macro somewhere in the application (in a \c
+    .cpp file) and specifying the plugin in the \c .pro file.
+
+    For Plug & Paint, we have chosen to put Q_IMPORT_PLUGIN() in \c
+    main.cpp:
+
+    \snippet examples/tools/plugandpaint/main.cpp 0
+
+    The argument to Q_IMPORT_PLUGIN() is the plugin's name, as
+    specified with Q_EXPORT_PLUGIN2() in the \l{Exporting the
+    Plugin}{plugin}.
+
+    In the \c .pro file, we need to specify the static library.
+    Here's the project file for building Plug & Paint:
+
+    \snippet examples/tools/plugandpaint/plugandpaint.pro 0
+
+    The \c LIBS line variable specifies the library \c pnp_basictools
+    located in the \c ../plugandpaintplugins/basictools directory.
+    (Although the \c LIBS syntax has a distinct Unix flavor, \c qmake
+    supports it on all platforms.)
+
+    The \c CONFIG() code at the end is necessary for this example
+    because the example is part of the Qt distribution and Qt can be
+    configured to be built simultaneously in debug and in release
+    modes. You don't need to for your own plugin applications.
+
+    This completes our review of the Plug & Paint application. At
+    this point, you might want to take a look at the
+    \l{tools/plugandpaintplugins/basictools}{Basic Tools} example
+    plugin.
+*/
+
+/*!
+    \example tools/plugandpaintplugins/basictools
+    \title Plug & Paint Basic Tools Example
+
+    The Basic Tools example is a static plugin for the
+    \l{tools/plugandpaint}{Plug & Paint} example. It provides a set
+    of basic brushes, shapes, and filters. Through the Basic Tools
+    example, we will review the four steps involved in writing a Qt
+    plugin:
+
+    \list 1
+    \o Declare a plugin class.
+    \o Implement the interfaces provided by the plugin.
+    \o Export the plugin using the Q_EXPORT_PLUGIN2() macro.
+    \o Build the plugin using an adequate \c .pro file.
+    \endlist
+
+    \section1 Declaration of the Plugin Class
+
+    \snippet examples/tools/plugandpaintplugins/basictools/basictoolsplugin.h 0
+
+    We start by including \c interfaces.h, which defines the plugin
+    interfaces for the \l{tools/plugandpaint}{Plug & Paint}
+    application. For the \c #include to work, we need to add an \c
+    INCLUDEPATH entry to the \c .pro file with the path to Qt's \c
+    examples/tools directory.
+
+    The \c BasicToolsPlugin class is a QObject subclass that
+    implements the \c BrushInterface, the \c ShapeInterface, and the
+    \c FilterInterface. This is done through multiple inheritance.
+    The \c Q_INTERFACES() macro is necessary to tell \l{moc}, Qt's
+    meta-object compiler, that the base classes are plugin
+    interfaces. Without the \c Q_INTERFACES() macro, we couldn't use
+    \l qobject_cast() in the \l{tools/plugandpaint}{Plug & Paint}
+    application to detect interfaces.
+
+    \snippet examples/tools/plugandpaintplugins/basictools/basictoolsplugin.h 2
+
+    In the \c public section of the class, we declare all the
+    functions from the three interfaces.
+
+    \section1 Implementation of the Brush Interface
+
+    Let's now review the implementation of the \c BasicToolsPlugin
+    member functions inherited from \c BrushInterface.
+
+    \snippet examples/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp 0
+
+    The \c brushes() function returns a list of brushes provided by
+    this plugin. We provide three brushes: \gui{Pencil}, \gui{Air
+    Brush}, and \gui{Random Letters}.
+
+    \snippet examples/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp 1
+
+    On a mouse press event, we just call \c mouseMove() to draw the
+    spot where the event occurred.
+
+    \snippet examples/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp 2
+
+    In \c mouseMove(), we start by saving the state of the QPainter
+    and we compute a few variables that we'll need later.
+
+    \snippet examples/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp 3
+
+    Then comes the brush-dependent part of the code:
+
+    \list
+    \o If the brush is \gui{Pencil}, we just call
+       QPainter::drawLine() with the current QPen.
+
+    \o If the brush is \gui{Air Brush}, we start by setting the
+       painter's QBrush to Qt::Dense6Pattern to obtain a dotted
+       pattern. Then we draw a circle filled with that QBrush several
+       times, resulting in a thick line.
+
+    \o If the brush is \gui{Random Letters}, we draw a random letter
+       at the new cursor position. Most of the code is for setting
+       the font to be bold and larger than the default font and for
+       computing an appropriate bounding rect.
+    \endlist
+
+    At the end, we restore the painter state to what it was upon
+    entering the function and we return the bounding rectangle.
+
+    \snippet examples/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp 4
+
+    When the user releases the mouse, we do nothing and return an
+    empty QRect.
+
+    \section1 Implementation of the Shape Interface
+
+    \snippet examples/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp 5
+
+    The plugin provides three shapes: \gui{Circle}, \gui{Star}, and
+    \gui{Text...}. The three dots after \gui{Text} are there because
+    the shape pops up a dialog asking for more information. We know
+    that the shape names will end up in a menu, so we include the
+    three dots in the shape name.
+
+    A cleaner but more complicated design would have been to
+    distinguish between the internal shape name and the name used in
+    the user interface.
+
+    \snippet examples/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp 6
+
+    The \c generateShape() creates a QPainterPath for the specified
+    shape. If the shape is \gui{Text}, we pop up a QInputDialog to
+    let the user enter some text.
+
+    \section1 Implementation of the Filter Interface
+
+    \snippet examples/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp 7
+
+    The plugin provides three filters: \gui{Invert Pixels}, \gui{Swap
+    RGB}, and \gui{Grayscale}.
+
+    \snippet examples/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp 8
+
+    The \c filterImage() function takes a filter name and a QImage as
+    parameters and returns an altered QImage. The first thing we do
+    is to convert the image to a 32-bit RGB format, to ensure that
+    the algorithms will work as expected. For example,
+    QImage::invertPixels(), which is used to implement the
+    \gui{Invert Pixels} filter, gives counterintuitive results for
+    8-bit images, because they invert the indices into the color
+    table instead of inverting the color table's entries.
+
+    \section1 Exporting the Plugin
+
+    Whereas applications have a \c main() function as their entry
+    point, plugins need to contain exactly one occurrence of the
+    Q_EXPORT_PLUGIN2() macro to specify which class provides the
+    plugin:
+
+    \snippet examples/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp 9
+
+    This line may appear in any \c .cpp file that is part of the
+    plugin's source code.
+
+    \section1 The .pro File
+
+    Here's the project file for building the Basic Tools plugin:
+
+    \snippet examples/tools/plugandpaintplugins/basictools/basictools.pro 0
+
+    The \c .pro file differs from typical \c .pro files in many
+    respects. First, it starts with a \c TEMPLATE entry specifying \c
+    lib. (The default template is \c app.) It also adds \c plugin to
+    the \c CONFIG variable. This is necessary on some platforms to
+    avoid generating symbolic links with version numbers in the file
+    name, which is appropriate for most dynamic libraries but not for
+    plugins.
+
+    To make the plugin a static plugin, all that is required is to
+    specify \c static in addition to \c plugin. The
+    \l{tools/plugandpaintplugins/extrafilters}{Extra Filters} plugin,
+    which is compiled as a dynamic plugin, doesn't specify \c static
+    in its \c .pro file.
+
+    The \c INCLUDEPATH variable sets the search paths for global
+    headers (i.e., header files included using \c{#include <...>}).
+    We add Qt's \c examples/tools directory (strictly speaking,
+    \c{examples/tools/plugandpaintplugins/basictools/../..}) to the
+    list, so that we can include \c <plugandpaint/interfaces.h>.
+
+    The \c TARGET variable specifies which name we want to give the
+    target library. We use \c pnp_ as the prefix to show that the
+    plugin is designed to work with Plug & Paint. On Unix, \c lib is
+    also prepended to that name. On all platforms, a
+    platform-specific suffix is appended (e.g., \c .dll on Windows,
+    \c .a on Linux).
+
+    The \c CONFIG() code at the end is necessary for this example
+    because the example is part of the Qt distribution and Qt can be
+    configured to be built simultaneously in debug and in release
+    modes. You don't need to for your own plugins.
+*/
+
+/*!
+    \example tools/plugandpaintplugins/extrafilters
+    \title Plug & Paint Extra Filters Example
+
+    The Extra Filters example is a plugin for the
+    \l{tools/plugandpaint}{Plug & Paint} example. It provides a set
+    of filters in addition to those provided by the
+    \l{tools/plugandpaintplugins/basictools}{Basic Tools} plugin.
+
+    Since the approach is identical to
+    \l{tools/plugandpaintplugins/basictools}{Basic Tools}, we won't
+    review the code here. The only part of interes is the
+    \c .pro file, since Extra Filters is a dynamic plugin
+    (\l{tools/plugandpaintplugins/basictools}{Basic Tools} is
+    linked statically into the Plug & Paint executable).
+
+    Here's the project file for building the Extra Filters plugin:
+
+    \snippet examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro 0
+
+    The \c .pro file differs from typical \c .pro files in many
+    respects. First, it starts with a \c TEMPLATE entry specifying \c
+    lib. (The default template is \c app.) It also adds \c plugin to
+    the \c CONFIG variable. This is necessary on some platforms to
+    avoid generating symbolic links with version numbers in the file
+    name, which is appropriate for most dynamic libraries but not for
+    plugins.
+
+    The \c INCLUDEPATH variable sets the search paths for global
+    headers (i.e., header files included using \c{#include <...>}).
+    We add Qt's \c examples/tools directory (strictly speaking,
+    \c{examples/tools/plugandpaintplugins/basictools/../..}) to the
+    list, so that we can include \c <plugandpaint/interfaces.h>.
+
+    The \c TARGET variable specifies which name we want to give the
+    target library. We use \c pnp_ as the prefix to show that the
+    plugin is designed to work with Plug & Paint. On Unix, \c lib is
+    also prepended to that name. On all platforms, a
+    platform-specific suffix is appended (e.g., \c .dll on Windows,
+    \c .so on Linux).
+
+    The \c DESTDIR variable specifies where we want to install the
+    plugin. We put it in Plug & Paint's \c plugins subdirectory,
+    since that's where the application looks for dynamic plugins.
+
+    The \c CONFIG() code at the end is necessary for this example
+    because the example is part of the Qt distribution and Qt can be
+    configured to be built simultaneously in debug and in release
+    modes. You don't need to for your own plugins.
+*/
diff --git a/doc/src/examples/portedasteroids.qdoc b/doc/src/examples/portedasteroids.qdoc
new file mode 100644
index 0000000000..d32732f878
--- /dev/null
+++ b/doc/src/examples/portedasteroids.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example graphicsview/portedasteroids
+    \title Ported Asteroids Example
+
+    This GraphicsView example is a port of the
+    Asteroids game, which was based on QCanvas.
+ 
+    \image portedasteroids-example.png
+*/
diff --git a/doc/src/examples/portedcanvas.qdoc b/doc/src/examples/portedcanvas.qdoc
new file mode 100644
index 0000000000..76943df792
--- /dev/null
+++ b/doc/src/examples/portedcanvas.qdoc
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example graphicsview/portedcanvas
+    \title Ported Canvas Example
+
+    This GraphicsView example is a port of the old
+    QCanvas example from Qt 3.
+
+    \sa {Porting to Graphics View}
+
+    \image portedcanvas-example.png
+*/
diff --git a/doc/src/examples/previewer.qdoc b/doc/src/examples/previewer.qdoc
new file mode 100644
index 0000000000..9cbeec1c6c
--- /dev/null
+++ b/doc/src/examples/previewer.qdoc
@@ -0,0 +1,181 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example webkit/previewer
+    \title Previewer Example
+
+    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 \QD. 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 \QD 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 examples/webkit/previewer/previewer.h 0
+
+    \section1 Previewer Class Implementation
+
+    The \c{Previewer}'s constructor is only responsible for setting up the
+    user interface.
+
+    \snippet examples/webkit/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 examples/webkit/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 examples/webkit/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 examples/webkit/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 examples/webkit/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 examples/webkit/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 examples/webkit/previewer/mainwindow.cpp 2
+
+    The example also provides an \c about() slot to describe its purpose.
+
+    \snippet examples/webkit/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 examples/webkit/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 examples/webkit/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 examples/webkit/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 examples/webkit/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 examples/webkit/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 examples/webkit/previewer/main.cpp 0
+
+*/
\ No newline at end of file
diff --git a/doc/src/examples/qobjectxmlmodel.qdoc b/doc/src/examples/qobjectxmlmodel.qdoc
new file mode 100644
index 0000000000..ce1dab6a5e
--- /dev/null
+++ b/doc/src/examples/qobjectxmlmodel.qdoc
@@ -0,0 +1,353 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \example xmlpatterns/qobjectxmlmodel
+  \title QObject XML Model Example
+
+  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 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 examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h 0
+
+  The node model class declares three data members:
+
+  \target Three Data Members
+  \snippet examples/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 examples/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 examples/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 examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp 6
+  \snippet examples/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 examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp 2
+  \snippet examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp 4
+
+  The main switch uses \c toNodeType(), which obtains the node
+  type from \l{QXmlNodeModelIndex::additionalData()}:
+
+  \snippet examples/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 examples/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 examples/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 examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h 1
+  \snippet examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h 4
+
+  This vector gets populated by the QObjectXmlModel constructor by
+  calling the private allMetaObjects() function:
+
+  \snippet examples/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 examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp 2
+  \snippet examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp 3
+  \snippet examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp 4
+
+  But first, revisit the \c{PreviousSibling} case for the
+  \c{IsQObject} case:
+
+  \snippet examples/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 examples/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/doc/src/examples/qtconcurrent-imagescaling.qdoc b/doc/src/examples/qtconcurrent-imagescaling.qdoc
new file mode 100644
index 0000000000..74b4be0adf
--- /dev/null
+++ b/doc/src/examples/qtconcurrent-imagescaling.qdoc
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example qtconcurrent/imagescaling
+    \title QtConcurrent Image Scaling Example
+
+    The QtConcurrent Map example shows how to use the asynchronous
+    QtConcurrent API to load and scale a collection of images.
+*/
diff --git a/doc/src/examples/qtconcurrent-map.qdoc b/doc/src/examples/qtconcurrent-map.qdoc
new file mode 100644
index 0000000000..9f5295d48c
--- /dev/null
+++ b/doc/src/examples/qtconcurrent-map.qdoc
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example qtconcurrent/map
+    \title QtConcurrent Map Example
+
+    The QtConcurrent Map example shows how to use the synchronous (blocking)
+    QtConcurrent API to scale a collection of images.
+*/
diff --git a/doc/src/examples/qtconcurrent-progressdialog.qdoc b/doc/src/examples/qtconcurrent-progressdialog.qdoc
new file mode 100644
index 0000000000..41909fb5d4
--- /dev/null
+++ b/doc/src/examples/qtconcurrent-progressdialog.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example qtconcurrent/progressdialog
+    \title QtConcurrent Progress Dialog Example
+
+    The QtConcurrent Progress Dialog example shows how to use the
+    QFutureWatcher class to monitor the progress of a long-running operation.
+
+    \image qtconcurrent-progressdialog.png
+*/
diff --git a/doc/src/examples/qtconcurrent-runfunction.qdoc b/doc/src/examples/qtconcurrent-runfunction.qdoc
new file mode 100644
index 0000000000..5c40552775
--- /dev/null
+++ b/doc/src/examples/qtconcurrent-runfunction.qdoc
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example qtconcurrent/runfunction
+    \title QtConcurrent Run Function Example
+
+    The QtConcurrent Run Function example shows how to apply concurrency to
+    a standard function, using QFuture instances to retrieve return values
+    at a later time.
+*/
diff --git a/doc/src/examples/qtconcurrent-wordcount.qdoc b/doc/src/examples/qtconcurrent-wordcount.qdoc
new file mode 100644
index 0000000000..d7d32276d8
--- /dev/null
+++ b/doc/src/examples/qtconcurrent-wordcount.qdoc
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example qtconcurrent/wordcount
+    \title QtConcurrent Word Count Example
+
+    The QtConcurrent Word Count example demonstrates the use of the map-reduce
+    algorithm when applied to the problem of counting words in a collection
+    of files.
+*/
diff --git a/doc/src/examples/qtscriptcalculator.qdoc b/doc/src/examples/qtscriptcalculator.qdoc
new file mode 100644
index 0000000000..1d713f80f0
--- /dev/null
+++ b/doc/src/examples/qtscriptcalculator.qdoc
@@ -0,0 +1,105 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example script/calculator
+    \title QtScript Calculator Example
+    \ingroup scripting
+
+    In this simple QtScript example, we show how to implement the
+    functionality of a calculator widget.
+
+    \image qtscript-calculator-example.png
+
+    The program logic in this example is a fairly straight port of the logic in the C++ \l{Calculator Example}.
+    The graphical user interface is defined in a UI file.
+
+    The C++ part of the example consists of four steps:
+    \list
+    \o Evaluate the script code that defines the \c{Calculator} class.
+
+    \snippet examples/script/calculator/main.cpp 0a
+    \snippet examples/script/calculator/main.cpp 0b
+
+    \o Create a widget from the UI file using QUiLoader.
+
+    \snippet examples/script/calculator/main.cpp 1
+
+    \o Call the Calculator constructor function to create a new \c{Calculator} script object, passing the widget as argument.
+
+    \snippet examples/script/calculator/main.cpp 2
+
+    \o Show the widget and start the application event loop.
+
+    \snippet examples/script/calculator/main.cpp 3
+
+    \endlist
+
+    On the script side, the \c{Calculator} constructor function
+    initializes the instance variables of the new \c{Calculator}
+    object, and connects the clicked() signal of the form's buttons
+    to corresponding functions defined in the \c{Calculator} prototype
+    object; the effect is that when a button is clicked, the proper
+    script function will be invoked to carry out the operation.
+
+    \snippet examples/script/calculator/calculator.js 0
+
+    A \c{Calculator} object is just a plain script object; it is not
+    a widget. Instead, it stores a reference to the calculator form
+    (the widget) in an instance variable, \c{ui}. The calculator
+    script functions can access components of the form by referring
+    to the proper children of the \c{ui} member.
+
+    \snippet examples/script/calculator/calculator.js 1
+
+    The digitClicked() function uses the special local variable
+    __qt_sender__ to access the object that triggered the signal;
+    this gives us a simple way to retrieve the value of the digit
+    that was clicked.
+
+    \snippet examples/script/calculator/calculator.js 2
+
+    The changeSign() function shows how we retrieve the text property
+    of the calculator's display, change it appropriately, and write
+    back the new value.
+
+
+*/
diff --git a/doc/src/examples/qtscriptcustomclass.qdoc b/doc/src/examples/qtscriptcustomclass.qdoc
new file mode 100644
index 0000000000..f8d85a2e29
--- /dev/null
+++ b/doc/src/examples/qtscriptcustomclass.qdoc
@@ -0,0 +1,198 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example script/customclass
+    \title Custom Script Class Example
+
+    The Custom Script Class example shows how to use QScriptClass and QScriptClassPropertyIterator
+    to implement a custom script class.
+
+    The script class we are going to implement is called \c{ByteArray}. It provides a wrapper around
+    the QByteArray class in Qt, with a simplified API. Why do we need such a class? Well, neither the
+    ECMAScript \c{Array} class or \c{String} class is appropriate to use when working with arrays of
+    bytes. Our \c{ByteArray} class will have the right semantics; objects will use only the amount of
+    memory that is really needed (a byte is stored as a byte, not as a floating-point number or a
+    Unicode character) and can be passed directly to C++ slots taking QByteArray arguments (no costly
+    conversion necessary).
+
+    \section1 ByteArray Class In Use
+
+    When the \c{ByteArray} class has been made available to the
+    scripting environment, \c{ByteArray} objects can be constructed like
+    so:
+
+    \snippet doc/src/snippets/code/doc_src_examples_qtscriptcustomclass.qdoc 0
+
+    \c{ByteArray} objects behave similar to normal \c{Array} objects. Every \c{ByteArray} object has
+    a \c{length} property, that holds the length of the array. If a new value is assigned to the \c{length}
+    property, the array is resized. If the array is enlarged, the new bytes are initialized to 0.
+    (This is a difference from normal \c{Array} objects; \c{ByteArray} objects are always dense arrays.)
+    Use normal array operations to read or write bytes in the array. The following code sets all the
+    bytes of an array to a certain value:
+
+    \snippet doc/src/snippets/code/doc_src_examples_qtscriptcustomclass.qdoc 1
+
+    When assigning a value to an array element, the value is truncated to eight bits:
+
+    \snippet doc/src/snippets/code/doc_src_examples_qtscriptcustomclass.qdoc 2
+
+    Like normal \c{Array} objects, if the array index is greater than the current length
+    of the array, the array is resized accordingly:
+
+    \snippet doc/src/snippets/code/doc_src_examples_qtscriptcustomclass.qdoc 3
+
+    Property names that aren't valid array indexes are treated
+    like normal object properties (again, the same is the case for normal \c{Array} objects);
+    in other words, it's perfectly fine to do something like this:
+
+    \snippet doc/src/snippets/code/doc_src_examples_qtscriptcustomclass.qdoc 4
+
+    The above assignment won't affect the contents of the array, but will rather assign a value
+    to the object property named "foo".
+
+    \c{ByteArray} objects have a set of methods: chop(), equals(), left(), mid(), toBase64() and so on.
+    These map directly onto the corresponding methods in QByteArray.
+
+    \snippet doc/src/snippets/code/doc_src_examples_qtscriptcustomclass.qdoc 5
+
+    \section1 ByteArray Class Implementation
+
+    To implement the \c{ByteArray} script class in C++, we create a subclass of QScriptClass,
+    called ByteArrayClass, and reimplement the virtual functions from QScriptClass. We also provide
+    a Qt Script constructor function suitable for being added to a QScriptEngine's environment.
+
+    The ByteArrayClass constructor prepares the script class:
+
+    \snippet examples/script/customclass/bytearrayclass.cpp 0
+
+    First, the constructor registers a pair of conversion functions, so that C++ QByteArray objects
+    and Qt Script \c{ByteArray} objects can move seamlessly between the C++ side and the script side.
+    For example, if a \c{ByteArray} object is passed to a C++ slot that takes a QByteArray
+    argument, the actual QByteArray that the \c{ByteArray} object wraps will be passed correctly.
+
+    Second, we store a handle to the string "length", so that we can quickly compare a given property name
+    to "length" later on.
+
+    Third, we initialize the standard \c{ByteArray} prototype, to be returned by our prototype()
+    reimplementation later on. (The implementation of the prototype is discussed later.)
+
+    Fourth, we initialize a constructor function for \c{ByteArray}, to be returned by the
+    constructor() function. We set the internal data of the constructor to be a pointer to
+    this ByteArrayClass object, so that the constructor, when it is invoked, can extract the
+    pointer and use it to create a new \c{ByteArray} object.
+
+    \snippet examples/script/customclass/bytearrayclass.cpp 1
+
+    The newInstance() function isn't part of the QScriptClass API; its purpose is to offer
+    a convenient way to construct a \c{ByteArray} object from an existing QByteArray. We store the
+    QByteArray as the internal data of the new object, and return the new object.
+    QScriptEngine::newObject() will call the prototype() function of our class, ensuring that
+    the prototype of the new object will be the standard \c{ByteArray} prototype.
+
+    \snippet examples/script/customclass/bytearrayclass.cpp 2
+
+    construct() is the native function that will act as a constructor for \c{ByteArray}
+    in scripts. We extract the pointer to the class, then call a newInstance() overload
+    that takes an initial size as argument, and return the new script object.
+
+    \snippet examples/script/customclass/bytearrayclass.cpp 3
+
+    queryProperty() is the function that Qt Script will call whenever someone tries to access
+    a property of a \c{ByteArray} object. We first get a pointer to the underlying QByteArray.
+    We check if the property being accessed is the special \c{length} property; if so, we
+    return, indicating that we will handle every kind of access to this property (e.g. both
+    read and write). Otherwise, we attempt to convert the property name to an array index. If
+    this fails, we return, indicating that we don't want to handle this property. Otherwise, we
+    have a valid array index, and store it in the \c{id} argument, so that we don't have to
+    recompute it in e.g. property() or setProperty(). If the index is greater than or equal to
+    the QByteArray's size, we indicate that we don't want to handle read access (but we still want
+    to handle writes, if requested).
+
+    \snippet examples/script/customclass/bytearrayclass.cpp 4
+
+    In the property() reimplementation, we do similar checks as in queryProperty() to find out
+    which property is being requested, and then return the value of that property.
+
+    \snippet examples/script/customclass/bytearrayclass.cpp 5
+
+    The setProperty() reimplementation has a structure that is similar to property(). If the \c{length} property
+    is being set, we resize the underlying QByteArray to the given length. Otherwise, we grab the
+    array index that was calculated in the queryProperty() function, enlarge the array if necessary,
+    and write the given value to the array.
+
+    \snippet examples/script/customclass/bytearrayclass.cpp 6
+
+    The propertyFlags() reimplementation specifies that the \c{length} property can't be deleted,
+    and that it is not enumerable. Array elements can't be deleted.
+
+    \snippet examples/script/customclass/bytearrayclass.cpp 7
+
+    We want the array elements to show up when a \c{ByteArray} object is used in for-in
+    statements and together with QScriptValueIterator. Therefore, we reimplement the
+    newIterator() function and have it return a new iterator for a given \c{ByteArray}.
+
+    \section1 ByteArray Iterator Implementation
+
+    \snippet examples/script/customclass/bytearrayclass.cpp 8
+
+    The \c{ByteArrayClassPropertyIterator} class is simple. It maintains an index into the
+    underlying QByteArray, and checks and updates the index in hasNext(), next() and so on.
+
+    \section1 ByteArray Prototype Implementation
+
+    The prototype class, ByteArrayPrototype, implements the \c{ByteArray} functions as slots.
+
+    \snippet examples/script/customclass/bytearrayprototype.h 0
+
+    There is a small helper function, thisByteArray(), that returns a pointer to the QByteArray
+    being operated upon:
+
+    \snippet examples/script/customclass/bytearrayprototype.cpp 0
+
+    The slots simply forward the calls to the QByteArray. Examples:
+
+    \snippet examples/script/customclass/bytearrayprototype.cpp 1
+
+    The remove() function is noteworthy; if we look at QByteArray::remove(), we see that it
+    should return a reference to the QByteArray itself (i.e. not a copy). To get the same
+    behavior in scripts, we return the script object (thisObject()).
+*/
diff --git a/doc/src/examples/qtscripttetrix.qdoc b/doc/src/examples/qtscripttetrix.qdoc
new file mode 100644
index 0000000000..c96db6ae8c
--- /dev/null
+++ b/doc/src/examples/qtscripttetrix.qdoc
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example script/qstetrix
+    \title Qt Script Tetrix Example
+
+    The QSTetrix example is a Qt Script version of the classic Tetrix game.
+
+    \image tetrix-example.png
+
+    \section1 Overview
+
+    The program logic in this example is a fairly straight port of the
+    logic in the C++ \l{Tetrix Example}. You may find it useful to compare
+    the implementations of the \c TetrixBoard, \c TetrixPiece and
+    \c TetrixWindow classes to see how Qt Script is used to implement
+    methods, call Qt functions, and emit signals.
+
+    \section1 Setting up the GUI
+
+    The graphical user interface is defined in a \c{.ui} file, creating
+    using Qt Designer, and is set up in the example's C++ \c{main.cpp} file.
+
+    \snippet examples/script/qstetrix/main.cpp 0
+
+    We define a custom UI loader that handles our \c TetrixBoard widget; this
+    is the main component of the UI (where the pieces are drawn).
+
+    \snippet examples/script/qstetrix/main.cpp 1
+
+    We initialize the script engine to have the Qt namespace, so that
+    e.g., \l{Qt::Key_Left}{Qt.Key_Left} will be available to script code.
+    We also make the application object available (for the
+    \l{QApplication::}{quit()} slot).
+
+    \snippet examples/script/qstetrix/main.cpp 2
+
+    Several scripts are evaluated as part of the engine setup process.
+    The \c{tetrixpiece.js} file contains the definition of the \c TetrixPiece
+    class, which is used to populate the play field. The \c{tetrixboard.js}
+    file contains the definition of the \c TetrixBoard class, which contains
+    the main game logic. Finally, \c{tetrixwindow.js} contains the definition
+    of the \c TetrixWindow class, which wires up the top-level widget.
+
+    \snippet examples/script/qstetrix/main.cpp 3
+
+    A form is created from the UI file. A new \c TetrixWindow script object
+    is then constructed, passing the form as its argument.
+
+    \snippet examples/script/qstetrix/main.cpp 4
+
+    The form is shown, and the event loop is entered.
+*/
diff --git a/doc/src/examples/querymodel.qdoc b/doc/src/examples/querymodel.qdoc
new file mode 100644
index 0000000000..296f6097f2
--- /dev/null
+++ b/doc/src/examples/querymodel.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example sql/querymodel
+    \title Query Model Example
+
+    The Query Model example shows how to make customized versions of
+    data obtained from a SQL query, using a model that encapsulates
+    the query and table views to display the results. 
+
+    \image querymodel-example.png
+*/
diff --git a/doc/src/examples/queuedcustomtype.qdoc b/doc/src/examples/queuedcustomtype.qdoc
new file mode 100644
index 0000000000..bbd142785a
--- /dev/null
+++ b/doc/src/examples/queuedcustomtype.qdoc
@@ -0,0 +1,177 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example threads/queuedcustomtype
+    \title Queued Custom Type Example
+
+    The Queued Custom Type example shows how to send custom types between
+    threads with queued signals and slots.
+
+    \image queuedcustomtype-example.png
+
+    Contents:
+
+    \tableofcontents
+
+    \section1 Overview
+
+    In the \l{Custom Type Sending Example}, we showed how to use a custom type
+    with signal-slot communication within the same thread.
+
+    In this example, we create a new value class, \c Block, and register it
+    with the meta-object system to enable us to send instances of it between
+    threads using queued signals and slots.
+
+    \section1 The Block Class
+
+    The \c Block class is similar to the \c Message class described in the
+    \l{Custom Type Example}. It provides the default constructor, copy
+    constructor and destructor in the public section of the class that the
+    meta-object system requires. It describes a colored rectangle.
+
+    \snippet examples/threads/queuedcustomtype/block.h custom type definition and meta-type declaration
+
+    We will still need to register it with the meta-object system at
+    run-time by calling the qRegisterMetaType() template function before
+    we make any signal-slot connections that use this type.
+    Even though we do not intend to use the type with QVariant in this example,
+    it is good practice to also declare the new type with Q_DECLARE_METATYPE().
+
+    The implementation of the \c Block class is trivial, so we avoid quoting
+    it here.
+
+    \section1 The Window Class
+
+    We define a simple \c Window class with a public slot that accepts a
+    \c Block object. The rest of the class is concerned with managing the
+    user interface and handling images.
+
+    \snippet examples/threads/queuedcustomtype/window.h Window class definition
+
+    The \c Window class also contains a worker thread, provided by a
+    \c RenderThread object. This will emit signals to send \c Block objects
+    to the window's \c addBlock(Block) slot.
+
+    The parts of the \c Window class that are most relevant are the constructor
+    and the \c addBlock(Block) slot.
+
+    The constructor creates a thread for rendering images, sets up a user
+    interface containing a label and two push buttons that are connected to
+    slots in the same class.
+
+    \snippet examples/threads/queuedcustomtype/window.cpp Window constructor start
+    \snippet examples/threads/queuedcustomtype/window.cpp set up widgets and connections
+    \snippet examples/threads/queuedcustomtype/window.cpp connecting signal with custom type
+
+    In the last of these connections, we connect a signal in the
+    \c RenderThread object to the \c addBlock(Block) slot in the window.
+
+    \dots
+    \snippet examples/threads/queuedcustomtype/window.cpp Window constructor finish
+
+    The rest of the constructor simply sets up the layout of the window.
+
+    The \c addBlock(Block) slot receives blocks from the rendering thread via
+    the signal-slot connection set up in the constructor:
+
+    \snippet examples/threads/queuedcustomtype/window.cpp Adding blocks to the display
+
+    We simply paint these onto the label as they arrive.
+
+    \section1 The RenderThread Class
+
+    The \c RenderThread class processes an image, creating \c Block objects
+    and using the \c sendBlock(Block) signal to send them to other components
+    in the example.
+
+    \snippet examples/threads/queuedcustomtype/renderthread.h RenderThread class definition
+
+    The constructor and destructor are not quoted here. These take care of
+    setting up the thread's internal state and cleaning up when it is destroyed.
+
+    Processing is started with the \c processImage() function, which calls the
+    \c RenderThread class's reimplementation of the QThread::run() function:
+
+    \snippet examples/threads/queuedcustomtype/renderthread.cpp processing the image (start)
+
+    Ignoring the details of the way the image is processed, we see that the
+    signal containing a block is emitted in the usual way:
+
+    \dots
+    \snippet examples/threads/queuedcustomtype/renderthread.cpp processing the image (finish)
+
+    Each signal that is emitted will be queued and delivered later to the
+    window's \c addBlock(Block) slot.
+
+    \section1 Registering the Type
+
+    In the example's \c{main()} function, we perform the registration of the
+    \c Block class as a custom type with the meta-object system by calling the
+    qRegisterMetaType() template function:
+
+    \snippet examples/threads/queuedcustomtype/main.cpp main function
+
+    This call is placed here to ensure that the type is registered before any
+    signal-slot connections are made that use it.
+
+    The rest of the \c{main()} function is concerned with setting a seed for
+    the pseudo-random number generator, creating and showing the window, and
+    setting a default image. See the source code for the implementation of the
+    \c createImage() function.
+
+    \section1 Further Reading
+
+    This example showed how a custom type can be registered with the
+    meta-object system so that it can be used with signal-slot connections
+    between threads. For ordinary communication involving direct signals and
+    slots, it is enough to simply declare the type in the way described in the
+    \l{Custom Type Sending Example}.
+
+    In practice, both the Q_DECLARE_METATYPE() macro and the qRegisterMetaType()
+    template function can be used to register custom types, but
+    qRegisterMetaType() is only required if you need to perform signal-slot
+    communication or need to create and destroy objects of the custom type
+    at run-time.
+
+    More information on using custom types with Qt can be found in the
+    \l{Creating Custom Qt Types} document.
+*/
diff --git a/doc/src/examples/qxmlstreambookmarks.qdoc b/doc/src/examples/qxmlstreambookmarks.qdoc
new file mode 100644
index 0000000000..70590434d2
--- /dev/null
+++ b/doc/src/examples/qxmlstreambookmarks.qdoc
@@ -0,0 +1,200 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example xml/streambookmarks
+    \title QXmlStream Bookmarks Example
+
+    The QXmlStream Bookmarks example provides a reader for XML Bookmark
+    Exchange Language (XBEL) files using Qt's QXmlStreamReader class
+    for reading, and QXmlStreamWriter class for writing the files.
+
+    \image xmlstreamexample-screenshot.png
+
+    \section1 XbelWriter Class Definition
+
+    The \c XbelWriter class is a subclass of QXmlStreamReader, which provides
+    an XML parser with a streaming API. \c XbelWriter also contains a private
+    instance of QTreeWidget in order to display the bookmarks according to
+    hierarchies.
+
+    \snippet examples/xml/streambookmarks/xbelwriter.h 0
+
+    \section1 XbelWriter Class Implementation
+
+    The \c XbelWriter constructor accepts a \a treeWidget to initialize within
+    its definition. We enable \l{QXmlStreamWriter}'s auto-formatting property
+    to ensure line-breaks and indentations are added automatically to empty
+    sections between elements, increasing readability as the data is split into
+    several lines.
+
+    \snippet examples/xml/streambookmarks/xbelwriter.cpp 0
+
+    The \c writeFile() function accepts a QIODevice object and sets it using
+    \c setDevice(). This function then writes the document type
+    definition(DTD), the start element, the version, and \c{treeWidget}'s
+    top-level items.
+
+    \snippet examples/xml/streambookmarks/xbelwriter.cpp 1
+
+    The \c writeItem() function accepts a QTreeWidget object and writes it
+    to the stream, depending on its \c tagName, which can either be a "folder",
+    "bookmark", or "separator".
+
+    \snippet examples/xml/streambookmarks/xbelwriter.cpp 2
+
+    \section1 XbelReader Class Definition
+
+    The \c XbelReader class is a subclass of QXmlStreamReader, the pendent
+    class for QXmlStreamWriter. \c XbelReader contains a private instance
+    of QTreeWidget to group bookmarks according to their hierarchies.
+
+    \snippet examples/xml/streambookmarks/xbelreader.h 0
+
+    \section1 XbelReader Class Implementation
+
+    The \c XbelReader constructor accepts a QTreeWidget to initialize the
+    \c treeWidget within its definition. A QStyle object is used to set
+    \c{treeWidget}'s style property. The \c folderIcon is set to QIcon::Normal
+    mode where the pixmap is only displayed when the user is not interacting
+    with the icon. The QStyle::SP_DirClosedIcon, QStyle::SP_DirOpenIcon, and
+    QStyle::SP_FileIcon correspond to standard pixmaps that follow the style
+    of your GUI.
+
+    \snippet examples/xml/streambookmarks/xbelreader.cpp 0
+
+    The \c read() function accepts a QIODevice and sets it using
+    \l{QXmlStreamReader::setDevice()}{setDevice()}. The actual process
+    of reading only takes place in event the file is a valid XBEL 1.0
+    file. Otherwise, the \l{QXmlStreamReader::raiseError()}
+    {raiseError()} function is used to display an error message.
+
+    \snippet examples/xml/streambookmarks/xbelreader.cpp 1
+
+    The \c readUnknownElement() function reads an unknown element. The
+    Q_ASSERT() macro is used to provide a pre-condition for the function.
+
+    \snippet examples/xml/streambookmarks/xbelreader.cpp 2
+
+    The \c readXBEL() function reads the name of a startElement and calls
+    the appropriate function to read it, depending on whether if its a
+    "folder", "bookmark" or "separator". Otherwise, it calls
+    \c readUnknownElement().
+
+    \snippet examples/xml/streambookmarks/xbelreader.cpp 3
+
+    The \c readTitle() function reads the bookmark's title.
+
+    \snippet examples/xml/streambookmarks/xbelreader.cpp 4
+
+    The \c readSeparator() function creates a separator and sets its flags.
+    The text is set to 30 "0xB7", the HEX equivalent for period, and then
+    read using \c readElementText().
+
+    \snippet examples/xml/streambookmarks/xbelreader.cpp 5
+
+    \section1 MainWindow Class Definition
+
+    The \c MainWindow class is a subclass of QMainWindow, with a
+    \c File menu and a \c Help menu.
+
+    \snippet examples/xml/streambookmarks/mainwindow.h 0
+
+    \section1 MainWindow Class Implementation
+
+    The \c MainWindow constructor instantiates the QTreeWidget object, \c
+    treeWidget and sets its header with a QStringList object, \c labels.
+    The constructor also invokes \c createActions() and \c createMenus()
+    to set up the menus and their corresponding actions. The \c statusBar()
+    is used to display the message "Ready" and the window's size is fixed
+    to 480x320 pixels.
+
+    \snippet examples/xml/streambookmarks/mainwindow.cpp 0
+
+    The \c open() function enables the user to open an XBEL file using
+    QFileDialog::getOpenFileName(). A warning message is displayed along
+    with the \c fileName and \c errorString if the file cannot be read or
+    if there is a parse error.
+
+    \snippet examples/xml/streambookmarks/mainwindow.cpp 1
+
+    The \c saveAs() function displays a QFileDialog, prompting the user for
+    a \c fileName using QFileDialog::getSaveFileName(). Similar to the
+    \c open() function, this function also displays a warning message if
+    the file cannot be written to.
+
+    \snippet examples/xml/streambookmarks/mainwindow.cpp 2
+
+    The \c about() function displays a QMessageBox with a brief description
+    of the example.
+
+    \snippet examples/xml/streambookmarks/mainwindow.cpp 3
+
+    In order to implement the \c open(), \c saveAs(), \c exit(), \c about()
+    and \c aboutQt() functions, we connect them to QAction objects and
+    add them to the \c fileMenu and \c helpMenu. The connections are as shown
+    below:
+
+    \snippet examples/xml/streambookmarks/mainwindow.cpp 4
+
+    The \c createMenus() function creates the \c fileMenu and \c helpMenu
+    and adds the QAction objects to them in order to create the menu shown
+    in the screenshot below:
+
+    \table
+    \row
+         \o \inlineimage xmlstreamexample-filemenu.png
+         \o \inlineimage xmlstreamexample-helpmenu.png
+    \endtable
+
+    \snippet examples/xml/streambookmarks/mainwindow.cpp 5
+
+    \section1 \c{main()} Function
+
+    The \c main() function instantiates \c MainWindow and invokes the \c show()
+    function.
+
+    \snippet examples/xml/streambookmarks/main.cpp 0
+
+    See the \l{http://pyxml.sourceforge.net/topics/xbel/}
+    {XML Bookmark Exchange Language Resource Page} for more information
+    about XBEL files.
+*/
diff --git a/doc/src/examples/recentfiles.qdoc b/doc/src/examples/recentfiles.qdoc
new file mode 100644
index 0000000000..185cbf1fc0
--- /dev/null
+++ b/doc/src/examples/recentfiles.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \example mainwindows/recentfiles
+    \title Recent Files Example
+
+    The Recent Files example shows how a standard File menu can be extended to show
+    the most recent files loaded by a main window application.
+
+    \image recentfiles-example.png
+*/
diff --git a/doc/src/examples/recipes.qdoc b/doc/src/examples/recipes.qdoc
new file mode 100644
index 0000000000..ba06b7e4aa
--- /dev/null
+++ b/doc/src/examples/recipes.qdoc
@@ -0,0 +1,164 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \example xmlpatterns/recipes
+  \title Recipes Example
+
+  The recipes example shows how to use QtXmlPatterns to query XML data
+  loaded from a file. 
+
+  \tableofcontents
+
+  \section1 Introduction
+
+  In this case, the XML data represents a cookbook, \c{cookbook.xml},
+  which contains \c{<cookbook>} as its document element, which in turn
+  contains a sequence of \c{<recipe>} elements. This XML data is
+  searched using queries stored in XQuery files (\c{*.xq}). 
+
+  \section2 The User Interface
+
+  The UI for this example was created using \l{Qt Designer Manual} {Qt
+  Designer}:
+
+  \image recipes-example.png
+
+  The UI consists of three \l{QGroupBox} {group boxes} arranged
+  vertically. The top one contains a \l{QTextEdit} {text viewer} that
+  displays the XML text from the cookbook file. The middle group box
+  contains a \l{QComboBox} {combo box} for choosing the \l{A Short
+  Path to XQuery} {XQuery} to run and a \l{QTextEdit} {text viewer}
+  for displaying the text of the selected XQuery. The \c{.xq} files in
+  the file list above are shown in the combo box menu. Choosing an
+  XQuery loads, parses, and runs the selected XQuery. The query result
+  is shown in the bottom group box's \l{QTextEdit} {text viewer}.
+
+  \section2 Running your own XQueries
+
+  You can write your own XQuery files and run them in the example
+  program. The file \c{xmlpatterns/recipes/recipes.qrc} is the \l{The
+  Qt Resource System} {resource file} for this example. It is used in
+  \c{main.cpp} (\c{Q_INIT_RESOURCE(recipes);}). It lists the XQuery
+  files (\c{.xq}) that can be selected in the combobox.
+
+  \quotefromfile examples/xmlpatterns/recipes/recipes.qrc
+  \printuntil
+
+  To add your own queries to the example's combobox, store your
+  \c{.xq} files in the \c{examples/xmlpatterns/recipes/files}
+  directory and add them to \c{recipes.qrc} as shown above.
+
+  \section1 Code Walk-Through
+
+  The example's main() function creates the standard instance of
+  QApplication. Then it creates an instance of the UI class, shows it,
+  and starts the Qt event loop:
+
+  \snippet examples/xmlpatterns/recipes/main.cpp 0
+
+  \section2 The UI Class: QueryMainWindow
+
+  The example's UI is a conventional Qt GUI application inheriting
+  QMainWindow and the class generated by \l{Qt Designer Manual} {Qt
+  Designer}:
+
+  \snippet examples/xmlpatterns/recipes/querymainwindow.h 0
+
+  The constructor finds the window's \l{QComboBox} {combo box} child
+  widget and connects its \l{QComboBox::currentIndexChanged()}
+  {currentIndexChanged()} signal to the window's \c{displayQuery()}
+  slot. It then calls \c{loadInputFile()} to load \c{cookbook.xml} and
+  display its contents in the top group box's \l{QTextEdit} {text
+  viewer} . Finally, it finds the XQuery files (\c{.xq}) and adds each
+  one to the \l{QComboBox} {combo box} menu.
+  
+  \snippet examples/xmlpatterns/recipes/querymainwindow.cpp 0
+
+  The work is done in the \l{displayQuery() slot} {displayQuery()}
+  slot and the \l{evaluate() function} {evaluate()} function it
+  calls. \l{displayQuery() slot} {displayQuery()} loads and displays
+  the selected query file and passes the XQuery text to \l{evaluate()
+  function} {evaluate()}.
+
+  \target displayQuery() slot
+  \snippet examples/xmlpatterns/recipes/querymainwindow.cpp 1
+
+  \l{evaluate() function} {evaluate()} demonstrates the standard
+  QtXmlPatterns usage pattern. First, an instance of QXmlQuery is
+  created (\c{query}). The \c{query's} \l{QXmlQuery::bindVariable()}
+  {bindVariable()} function is then called to bind the \c cookbook.xml
+  file to the XQuery variable \c inputDocument. \e{After} the variable
+  is bound, \l{QXmlQuery::setQuery()} {setQuery()} is called to pass
+  the XQuery text to the \c query.
+
+  \note \l{QXmlQuery::setQuery()} {setQuery()} must be called
+  \e{after} \l{QXmlQuery::bindVariable()} {bindVariable()}.
+
+  Passing the XQuery to \l{QXmlQuery::setQuery()} {setQuery()} causes
+  QtXmlPatterns to parse the XQuery. \l{QXmlQuery::isValid()} is
+  called to ensure that the XQuery was correctly parsed.
+
+  \target evaluate() function
+  \snippet examples/xmlpatterns/recipes/querymainwindow.cpp 2
+
+  If the XQuery is valid, an instance of QXmlFormatter is created to
+  format the query result as XML into a QBuffer. To evaluate the
+  XQuery, an overload of \l{QXmlQuery::evaluateTo()} {evaluateTo()} is
+  called that takes a QAbstractXmlReceiver for its output
+  (QXmlFormatter inherits QAbstractXmlReceiver). Finally, the
+  formatted XML result is displayed in the UI's bottom text view.
+
+  \note Each XQuery \c{.xq} file must declare the \c{$inputDocument}
+  variable to represent the \c cookbook.xml document:
+
+  \code
+  (: All ingredients for Mushroom Soup. :)
+  declare variable $inputDocument external;
+
+  doc($inputDocument)/cookbook/recipe[@xml:id = "MushroomSoup"]/ingredient/
+  <p>{@name, @quantity}</p>
+  \endcode
+
+  \note If you add add your own query.xq files, you must declare the
+  \c{$inputDocument} and use it as shown above.
+
+*/
diff --git a/doc/src/examples/regexp.qdoc b/doc/src/examples/regexp.qdoc
new file mode 100644
index 0000000000..de6cbfcecb
--- /dev/null
+++ b/doc/src/examples/regexp.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \example tools/regexp
+    \title Regular Expressions Example
+
+    The Regular Expressions (RegExp) example shows how regular expressions in Qt are
+    applied to text by providing an environment in which new regular expressions can be
+    created and tested on custom text strings.
+
+    \image regexp-example.png
+*/
diff --git a/doc/src/examples/relationaltablemodel.qdoc b/doc/src/examples/relationaltablemodel.qdoc
new file mode 100644
index 0000000000..5e944c2961
--- /dev/null
+++ b/doc/src/examples/relationaltablemodel.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \example sql/relationaltablemodel
+    \title Relational Table Model Example
+
+    The Relational Table Model example shows how to use table views with a relational
+    model to visualize the relations between items in a database.
+
+    \image relationaltablemodel-example.png
+*/
diff --git a/doc/src/examples/remotecontrol.qdoc b/doc/src/examples/remotecontrol.qdoc
new file mode 100644
index 0000000000..698ad1fe45
--- /dev/null
+++ b/doc/src/examples/remotecontrol.qdoc
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example help/remotecontrol
+    \title Remote Control Example
+
+    This example shows how to use and control Qt Assistant
+    as a help viewer.
+*/
\ No newline at end of file
diff --git a/doc/src/examples/rsslisting.qdoc b/doc/src/examples/rsslisting.qdoc
new file mode 100644
index 0000000000..73ff68c3b3
--- /dev/null
+++ b/doc/src/examples/rsslisting.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example xml/rsslisting
+    \title RSS-Listing Example
+
+    This example shows how to create a widget that displays news items
+    from RDF news sources.
+
+    \image rsslistingexample.png
+*/
diff --git a/doc/src/examples/samplebuffers.qdoc b/doc/src/examples/samplebuffers.qdoc
new file mode 100644
index 0000000000..1c8202c544
--- /dev/null
+++ b/doc/src/examples/samplebuffers.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example opengl/samplebuffers
+    \title Sample Buffers Example
+
+    The Sample Buffers example demonstrates how to use and enable
+    sample buffers in a QGLWidget.
+
+    \image samplebuffers-example.png
+*/
diff --git a/doc/src/examples/saxbookmarks.qdoc b/doc/src/examples/saxbookmarks.qdoc
new file mode 100644
index 0000000000..3db87d61a3
--- /dev/null
+++ b/doc/src/examples/saxbookmarks.qdoc
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example xml/saxbookmarks
+    \title SAX Bookmarks Example
+
+    The SAX Bookmarks example provides a reader for XML Bookmark Exchange Language (XBEL)
+    files that uses Qt's SAX-based API to read and parse the files. The DOM Bookmarks
+    example provides an alternative way to read this type of file.
+
+    \image saxbookmarks-example.png
+
+    See the \l{XML Bookmark Exchange Language Resource Page} for more
+    information about XBEL files.  
+*/
diff --git a/doc/src/examples/screenshot.qdoc b/doc/src/examples/screenshot.qdoc
new file mode 100644
index 0000000000..b989a32f44
--- /dev/null
+++ b/doc/src/examples/screenshot.qdoc
@@ -0,0 +1,262 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example desktop/screenshot
+    \title Screenshot Example
+
+    The Screenshot example shows how to take a screenshot of the
+    desktop using QApplication and QDesktopWidget. It also shows how
+    to use QTimer to provide a single-shot timer, and how to
+    reimplement the QWidget::resizeEvent() event handler to make sure
+    that an application resizes smoothly and without data loss.
+
+    \image screenshot-example.png
+
+    With the application the users can take a screenshot of their
+    desktop. They are provided with a couple of options:
+
+    \list
+    \o Delaying the screenshot, giving them time to rearrange
+       their desktop.
+    \o Hiding the application's window while the screenshot is taken.
+    \endlist
+
+    In addition the application allows the users to save their
+    screenshot if they want to.
+
+    \section1 Screenshot Class Definition
+
+    \snippet examples/desktop/screenshot/screenshot.h 0
+
+    The \c Screenshot class inherits QWidget and is the application's
+    main widget. It displays the application options and a preview of
+    the screenshot.
+
+    We reimplement the QWidget::resizeEvent() function to make sure
+    that the preview of the screenshot scales properly when the user
+    resizes the application widget. We also need several private slots
+    to facilitate the options:
+
+    \list
+    \o The \c newScreenshot() slot prepares a new screenshot.
+    \o The \c saveScreenshot() slot saves the last screenshot.
+    \o The \c shootScreen() slot takes the screenshot.
+    \o The \c updateCheckBox() slot enables or disables the
+       \gui {Hide This Window} option.
+    \endlist
+
+    We also declare some private functions: We use the \c
+    createOptionsGroupBox(), \c createButtonsLayout() and \c
+    createButton() functions when we construct the widget. And we call
+    the private \c updateScreenshotLabel() function whenever a new
+    screenshot is taken or when a resize event changes the size of the
+    screenshot preview label.
+
+    In addition we need to store the screenshot's original pixmap. The
+    reason is that when we display the preview of the screenshot, we
+    need to scale its pixmap, storing the original we make sure that
+    no data are lost in that process.
+
+    \section1 Screenshot Class Implementation
+
+    \snippet examples/desktop/screenshot/screenshot.cpp 0
+
+    In the constructor we first create the QLabel displaying the
+    screenshot preview.
+
+    We set the QLabel's size policy to be QSizePolicy::Expanding both
+    horizontally and vertically. This means that the QLabel's size
+    hint is a sensible size, but the widget can be shrunk and still be
+    useful. Also, the widget can make use of extra space, so it should
+    get as much space as possible. Then we make sure the QLabel is
+    aligned in the center of the \c Screenshot widget, and set its
+    minimum size.
+
+    We create the applications's buttons and the group box containing
+    the application's options, and put it all into a main
+    layout. Finally we take the initial screenshot, and set the inital
+    delay and the window title, before we resize the widget to a
+    suitable size.
+
+    \snippet examples/desktop/screenshot/screenshot.cpp 1
+
+    The \c resizeEvent() function is reimplemented to receive the
+    resize events dispatched to the widget. The purpose is to scale
+    the preview screenshot pixmap without deformation of its content,
+    and also make sure that the application can be resized smoothly.
+
+    To achieve the first goal, we scale the screenshot pixmap using
+    Qt::KeepAspectRatio. We scale the pixmap to a rectangle as large
+    as possible inside the current size of the screenshot preview
+    label, preserving the aspect ratio. This means that if the user
+    resizes the application window in only one direction, the preview
+    screenshot keeps the same size.
+
+    To reach our second goal, we make sure that the preview screenshot
+    only is repainted (using the private \c updateScreenshotLabel()
+    function) when it actually changes its size.
+
+    \snippet examples/desktop/screenshot/screenshot.cpp 2
+
+    The private \c newScreenshot() slot is called when the user
+    requests a new screenshot; but the slot only prepares a new
+    screenshot.
+
+    First we see if the \gui {Hide This Window} option is checked, if
+    it is we hide the \c Screenshot widget. Then we disable the \gui
+    {New Screenshot} button, to make sure the user only can request
+    one screenshot at a time.
+
+    We create a timer using the QTimer class which provides repetitive
+    and single-shot timers. We set the timer to time out only once,
+    using the static QTimer::singleShot() function. This function
+    calls the private \c shootScreen() slot after the time interval
+    specified by the \gui {Screenshot Delay} option. It is \c
+    shootScreen() that actually performs the screenshot.
+
+    \snippet examples/desktop/screenshot/screenshot.cpp 3
+
+    The \c saveScreenshot() slot is called when the user push the \gui
+    Save button, and it presents a file dialog using the QFileDialog
+    class.
+
+    QFileDialog enables a user to traverse the file system in order to
+    select one or many files or a directory. The easiest way to create
+    a QFileDialog is to use the convenience static
+    functions.
+
+    We define the default file format to be png, and we make the file
+    dialog's initial path the path the application is run from. We
+    create the file dialog using the static
+    QFileDialog::getSaveFileName() function which returns a file name
+    selected by the user. The file does not have to exist. If the file
+    name is valid, we use the QPixmap::save() function to save the
+    screenshot's original pixmap in that file.
+
+    \snippet examples/desktop/screenshot/screenshot.cpp 4
+
+    The \c shootScreen() slot is called to take the screenshot. If the
+    user has chosen to delay the screenshot, we make the application
+    beep when the screenshot is taken using the static
+    QApplication::beep() function.
+
+    The QApplication class manages the GUI application's control flow
+    and main settings. It contains the main event loop, where all
+    events from the window system and other sources are processed and
+    dispatched.
+
+    \snippet examples/desktop/screenshot/screenshot.cpp 5
+
+    We take the screenshot using the static QPixmap::grabWindow()
+    function. The function grabs the contents of the window passed as
+    an argument, makes a pixmap out of it and returns that pixmap.
+
+    We identify the argument window using the QWidget::winID()
+    function which returns the window system identifier. Here it
+    returns the identifier of the current QDesktopWidget retrieved by
+    the QApplication::desktop() function. The QDesktopWidget class
+    provides access to screen information, and inherits
+    QWidget::winID().
+
+    We update the screenshot preview label using the private \c
+    updateScreenshotLabel() function. Then we enable the \gui {New
+    Screenshot} button, and finally we make the \c Screenshot widget
+    visible if it was hidden during the screenshot.
+
+    \snippet examples/desktop/screenshot/screenshot.cpp 6
+
+    The \gui {Hide This Window} option is enabled or disabled
+    depending on the delay of the screenshot. If there is no delay,
+    the application window cannot be hidden and the option's checkbox
+    is disabled.
+
+    The \c updateCheckBox() slot is called whenever the user changes
+    the delay using the \gui {Screenshot Delay} option.
+
+    \snippet examples/desktop/screenshot/screenshot.cpp 7
+
+    The private \c createOptionsGroupBox() function is called from the
+    constructor.
+
+    First we create a group box that will contain all of the options'
+    widgets. Then we create a QSpinBox and a QLabel for the \gui
+    {Screenshot Delay} option, and connect the spinbox to the \c
+    updateCheckBox() slot. Finally, we create a QCheckBox for the \gui
+    {Hide This Window} option, add all the options' widgets to a
+    QGridLayout and install the layout on the group box.
+
+    Note that we don't have to specify any parents for the widgets
+    when we create them. The reason is that when we add a widget to a
+    layout and install the layout on another widget, the layout's
+    widgets are automatically reparented to the widget the layout is
+    installed on.
+
+    \snippet examples/desktop/screenshot/screenshot.cpp 8
+
+    The private \c createButtonsLayout() function is called from the
+    constructor. We create the application's buttons using the private
+    \c createButton() function, and add them to a QHBoxLayout.
+
+    \snippet examples/desktop/screenshot/screenshot.cpp 9
+
+    The private \c createButton() function is called from the \c
+    createButtonsLayout() function. It simply creates a QPushButton
+    with the provided text, connects it to the provided receiver and
+    slot, and returns a pointer to the button.
+
+    \snippet examples/desktop/screenshot/screenshot.cpp 10
+
+    The private \c updateScreenshotLabel() function is called whenever
+    the screenshot changes, or when a resize event changes the size of
+    the screenshot preview label. It updates the screenshot preview's
+    label using the QLabel::setPixmap() and QPixmap::scaled()
+    functions.
+
+    QPixmap::scaled() returns a copy of the given pixmap scaled to a
+    rectangle of the given size according to the given
+    Qt::AspectRatioMode and Qt::TransformationMode.
+
+    We scale the original pixmap to fit the current screenshot label's
+    size, preserving the aspect ratio and giving the resulting pixmap
+    smoothed edges.
+*/
+
diff --git a/doc/src/examples/scribble.qdoc b/doc/src/examples/scribble.qdoc
new file mode 100644
index 0000000000..4dc17839d0
--- /dev/null
+++ b/doc/src/examples/scribble.qdoc
@@ -0,0 +1,432 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example widgets/scribble
+    \title Scribble Example
+
+    The Scribble example shows how to reimplement some of QWidget's
+    event handlers to receive the events generated for the
+    application's widgets.
+
+    We reimplement the mouse event handlers to implement drawing, the
+    paint event handler to update the application and the resize event
+    handler to optimize the application's appearance. In addition we
+    reimplement the close event handler to intercept the close events
+    before terminating the application.
+
+    The example also demonstrates how to use QPainter to draw an image
+    in real time, as well as to repaint widgets.
+
+    \image scribble-example.png Screenshot of the Scribble example
+
+    With the Scribble application the users can draw an image.  The
+    \gui File menu gives the users the possibility to open and edit an
+    existing image file, save an image and exit the application. While
+    drawing, the \gui Options menu allows the users to to choose the
+    pen color and pen width, as well as clear the screen. In addition
+    the \gui Help menu provides the users with information about the
+    Scribble example in particular, and about Qt in general.
+
+    The example consists of two classes:
+
+    \list
+    \o \c ScribbleArea is a custom widget that displays a QImage and
+       allows to the user to draw on it.
+    \o \c MainWindow provides a menu above the \c ScribbleArea.
+    \endlist
+
+    We will start by reviewing the \c ScribbleArea class, which
+    contains the interesting, then we will take a look at the \c
+    MainWindow class that uses it.
+
+    \section1 ScribbleArea Class Definition
+
+    \snippet examples/widgets/scribble/scribblearea.h 0
+
+    The \c ScribbleArea class inherits from QWidget. We reimplement
+    the \c mousePressEvent(), \c mouseMoveEvent() and \c
+    mouseReleaseEvent() functions to implement the drawing. We
+    reimplement the \c paintEvent() function to update the scribble
+    area, and the \c resizeEvent() function to ensure that the QImage
+    on which we draw is at least as large as the widget at any time.
+
+    We need several public functions: \c openImage() loads an image
+    from a file into the scribble area, allowing the user to edit the
+    image; \c save() writes the currently displayed image to file; \c
+    clearImage() slot clears the image displayed in the scribble
+    area. We need the private \c drawLineTo() function to actually do
+    the drawing, and \c resizeImage() to change the size of a
+    QImage. The \c print() slot handles printing.
+
+    We also need the following private variables:
+
+    \list
+    \o \c modified is \c true if there are unsaved
+       changes to the image displayed in the scribble area.
+    \o \c scribbling is \c true while the user is pressing
+       the left mouse button within the scribble area.
+    \o \c penWidth and \c penColor hold the currently
+       set width and color for the pen used in the application.
+    \o \c image stores the image drawn by the user.
+    \o \c lastPoint holds the position of the cursor at the last
+       mouse press or mouse move event.
+    \endlist
+
+    \section1 ScribbleArea Class Implementation
+
+    \snippet examples/widgets/scribble/scribblearea.cpp 0
+
+    In the constructor, we set the Qt::WA_StaticContents
+    attribute for the widget, indicating that the widget contents are
+    rooted to the top-left corner and don't change when the widget is
+    resized. Qt uses this attribute to optimize paint events on
+    resizes. This is purely an optimization and should only be used
+    for widgets whose contents are static and rooted to the top-left
+    corner.
+
+    \snippet examples/widgets/scribble/scribblearea.cpp 1
+    \snippet examples/widgets/scribble/scribblearea.cpp 2
+
+    In the \c openImage() function, we load the given image. Then we
+    resize the loaded QImage to be at least as large as the widget in
+    both directions using the private \c resizeImage() function and
+    we set the \c image member variable to be the loaded image. At
+    the end, we call QWidget::update() to schedule a repaint.
+
+    \snippet examples/widgets/scribble/scribblearea.cpp 3
+    \snippet examples/widgets/scribble/scribblearea.cpp 4
+
+    The \c saveImage() function creates a QImage object that covers
+    only the visible section of the actual \c image and saves it using
+    QImage::save(). If the image is successfully saved, we set the
+    scribble area's \c modified variable to \c false, because there is
+    no unsaved data.
+
+    \snippet examples/widgets/scribble/scribblearea.cpp 5
+    \snippet examples/widgets/scribble/scribblearea.cpp 6
+    \codeline
+    \snippet examples/widgets/scribble/scribblearea.cpp 7
+    \snippet examples/widgets/scribble/scribblearea.cpp 8
+
+    The \c setPenColor() and \c setPenWidth() functions set the
+    current pen color and width. These values will be used for future
+    drawing operations.
+
+    \snippet examples/widgets/scribble/scribblearea.cpp 9
+    \snippet examples/widgets/scribble/scribblearea.cpp 10
+
+    The public \c clearImage() slot clears the image displayed in the
+    scribble area. We simply fill the entire image with white, which
+    corresponds to RGB value (255, 255, 255). As usual when we modify
+    the image, we set \c modified to \c true and schedule a repaint.
+
+    \snippet examples/widgets/scribble/scribblearea.cpp 11
+    \snippet examples/widgets/scribble/scribblearea.cpp 12
+
+    For mouse press and mouse release events, we use the
+    QMouseEvent::button() function to find out which button caused
+    the event. For mose move events, we use QMouseEvent::buttons()
+    to find which buttons are currently held down (as an OR-combination).
+
+    If the users press the left mouse button, we store the position
+    of the mouse cursor in \c lastPoint. We also make a note that the
+    user is currently scribbling. (The \c scribbling variable is
+    necessary because we can't assume that a mouse move and mouse
+    release event is always preceded by a mouse press event on the
+    same widget.)
+
+    If the user moves the mouse with the left button pressed down or
+    releases the button, we call the private \c drawLineTo() function
+    to draw.
+
+    \snippet examples/widgets/scribble/scribblearea.cpp 13
+    \snippet examples/widgets/scribble/scribblearea.cpp 14
+
+    In the reimplementation of the \l
+    {QWidget::paintEvent()}{paintEvent()} function, we simply create
+    a QPainter for the scribble area, and draw the image.
+
+    At this point, you might wonder why we don't just draw directly
+    onto the widget instead of drawing in a QImage and copying the
+    QImage onto screen in \c paintEvent(). There are at least three
+    good reasons for this:
+
+    \list
+    \o The window system requires us to be able to redraw the widget
+       \e{at any time}. For example, if the window is minimized and
+       restored, the window system might have forgotten the contents
+       of the widget and send us a paint event. In other words, we
+       can't rely on the window system to remember our image.
+
+    \o Qt normally doesn't allow us to paint outside of \c
+       paintEvent(). In particular, we can't paint from the mouse
+       event handlers. (This behavior can be changed using the
+       Qt::WA_PaintOnScreen widget attribute, though.)
+
+    \o If initialized properly, a QImage is guaranteed to use 8-bit
+       for each color channel (red, green, blue, and alpha), whereas
+       a QWidget might have a lower color depth, depending on the
+       monitor configuration. This means that if we load a 24-bit or
+       32-bit image and paint it onto a QWidget, then copy the
+       QWidget into a QImage again, we might lose some information.
+    \endlist
+
+    \snippet examples/widgets/scribble/scribblearea.cpp 15
+    \snippet examples/widgets/scribble/scribblearea.cpp 16
+
+    When the user starts the Scribble application, a resize event is
+    generated and an image is created and displayed in the scribble
+    area. We make this initial image slightly larger than the
+    application's main window and scribble area, to avoid always
+    resizing the image when the user resizes the main window (which
+    would be very inefficient). But when the main window becomes
+    larger than this initial size, the image needs to be resized.
+
+    \snippet examples/widgets/scribble/scribblearea.cpp 17
+    \snippet examples/widgets/scribble/scribblearea.cpp 18
+
+    In \c drawLineTo(), we draw a line from the point where the mouse
+    was located when the last mouse press or mouse move occurred, we
+    set \c modified to true, we generate a repaint event, and we
+    update \c lastPoint so that next time \c drawLineTo() is called,
+    we continue drawing from where we left.
+
+    We could call the \c update() function with no parameter, but as
+    an easy optimization we pass a QRect that specifies the rectangle
+    inside the scribble are needs updating, to avoid a complete
+    repaint of the widget.
+
+    \snippet examples/widgets/scribble/scribblearea.cpp 19
+    \snippet examples/widgets/scribble/scribblearea.cpp 20
+
+    QImage has no nice API for resizing an image. There's a
+    QImage::copy() function that could do the trick, but when used to
+    expand an image, it fills the new areas with black, whereas we
+    want white.
+
+    So the trick is to create a brand new QImage with the right size,
+    to fill it with white, and to draw the old image onto it using
+    QPainter. The new image is given the QImage::Format_RGB32
+    format, which means that each pixel is stored as 0xffRRGGBB
+    (where RR, GG, and BB are the red, green and blue
+    color channels, ff is the hexadecimal value 255).
+
+    Printing is handled by the \c print() slot:
+
+    \snippet examples/widgets/scribble/scribblearea.cpp 21
+
+    We construct a high resolution QPrinter object for the required
+    output format, using a QPrintDialog to ask the user to specify a
+    page size and indicate how the output should be formatted on the page.
+
+    If the dialog is accepted, we perform the task of printing to the paint
+    device:
+
+    \snippet examples/widgets/scribble/scribblearea.cpp 22
+
+    Printing an image to a file in this way is simply a matter of
+    painting onto the QPrinter. We scale the image to fit within the
+    available space on the page before painting it onto the paint
+    device.
+
+    \section1 MainWindow Class Definition
+
+    \snippet examples/widgets/scribble/mainwindow.h 0
+
+    The \c MainWindow class inherits from QMainWindow. We reimplement
+    the \l{QWidget::closeEvent()}{closeEvent()} handler from QWidget.
+    The \c open(), \c save(), \c penColor() and \c penWidth()
+    slots correspond to menu entries. In addition we create four
+    private functions.
+
+    We use the boolean \c maybeSave() function to check if there are
+    any unsaved changes. If there are unsaved changes, we give the
+    user the opportunity to save these changes. The function returns
+    \c false if the user clicks \gui Cancel. We use the \c saveFile()
+    function to let the user save the image currently displayed in
+    the scribble area.
+
+    \section1 MainWindow Class Implementation
+
+    \snippet examples/widgets/scribble/mainwindow.cpp 0
+
+    In the constructor, we create a scribble area which we make the
+    central widget of the \c MainWindow widget. Then we create the
+    associated actions and menus.
+
+    \snippet examples/widgets/scribble/mainwindow.cpp 1
+    \snippet examples/widgets/scribble/mainwindow.cpp 2
+
+    Close events are sent to widgets that the users want to close,
+    usually by clicking \gui{File|Exit} or by clicking the \gui X
+    title bar button. By reimplementing the event handler, we can
+    intercept attempts to close the application.
+
+    In this example, we use the close event to ask the user to save
+    any unsaved changes. The logic for that is located in the \c
+    maybeSave() function. If \c maybeSave() returns true, there are
+    no modifications or the users successfully saved them, and we
+    accept the event. The application can then terminate normally. If
+    \c maybeSave() returns false, the user clicked \gui Cancel, so we
+    "ignore" the event, leaving the application unaffected by it.
+
+    \snippet examples/widgets/scribble/mainwindow.cpp 3
+    \snippet examples/widgets/scribble/mainwindow.cpp 4
+
+    In the \c open() slot we first give the user the opportunity to
+    save any modifications to the currently displayed image, before a
+    new image is loaded into the scribble area. Then we ask the user
+    to choose a file and we load the file in the \c ScribbleArea.
+
+    \snippet examples/widgets/scribble/mainwindow.cpp 5
+    \snippet examples/widgets/scribble/mainwindow.cpp 6
+
+    The \c save() slot is called when the users choose the \gui {Save
+    As} menu entry, and then choose an entry from the format menu. The
+    first thing we need to do is to find out which action sent the
+    signal using QObject::sender(). This function returns the sender
+    as a QObject pointer. Since we know that the sender is an action
+    object, we can safely cast the QObject. We could have used a
+    C-style cast or a C++ \c static_cast<>(), but as a defensive
+    programming technique we use a qobject_cast(). The advantage is
+    that if the object has the wrong type, a null pointer is
+    returned. Crashes due to null pointers are much easier to diagnose
+    than crashes due to unsafe casts.
+
+    Once we have the action, we extract the chosen format using
+    QAction::data(). (When the actions are created, we use
+    QAction::setData() to set our own custom data attached to the
+    action, as a QVariant. More on this when we review \c
+    createActions().)
+
+    Now that we know the format, we call the private \c saveFile()
+    function to save the currently displayed image.
+
+    \snippet examples/widgets/scribble/mainwindow.cpp 7
+    \snippet examples/widgets/scribble/mainwindow.cpp 8
+
+    We use the \c penColor() slot to retrieve a new color from the
+    user with a QColorDialog. If the user chooses a new color, we
+    make it the scribble area's color.
+
+    \snippet examples/widgets/scribble/mainwindow.cpp 9
+    \snippet examples/widgets/scribble/mainwindow.cpp 10
+
+    To retrieve a new pen width in the \c penWidth() slot, we use
+    QInputDialog. The QInputDialog class provides a simple
+    convenience dialog to get a single value from the user. We use
+    the static QInputDialog::getInteger() function, which combines a
+    QLabel and a QSpinBox. The QSpinBox is initialized with the
+    scribble area's pen width, allows a range from 1 to 50, a step of
+    1 (meaning that the up and down arrow increment or decrement the
+    value by 1).
+
+    The boolean \c ok variable will be set to \c true if the user
+    clicked \gui OK and to \c false if the user pressed \gui Cancel.
+
+    \snippet examples/widgets/scribble/mainwindow.cpp 11
+    \snippet examples/widgets/scribble/mainwindow.cpp 12
+
+    We implement the \c about() slot to create a message box
+    describing what the example is designed to show.
+
+    \snippet examples/widgets/scribble/mainwindow.cpp 13
+    \snippet examples/widgets/scribble/mainwindow.cpp 14
+
+    In the \c createAction() function we create the actions
+    representing the menu entries and connect them to the appropiate
+    slots. In particular we create the actions found in the \gui
+    {Save As} sub-menu. We use QImageWriter::supportedImageFormats()
+    to get a list of the supported formats (as a QList<QByteArray>).
+
+    Then we iterate through the list, creating an action for each
+    format. We call QAction::setData() with the file format, so we
+    can retrieve it later as QAction::data(). We could also have
+    deduced the file format from the action's text, by truncating the
+    "...", but that would have been inelegant.
+
+    \snippet examples/widgets/scribble/mainwindow.cpp 15
+    \snippet examples/widgets/scribble/mainwindow.cpp 16
+
+    In the \c createMenu() function, we add the previously created
+    format actions to the \c saveAsMenu. Then we add the rest of the
+    actions as well as the \c saveAsMenu sub-menu to the \gui File,
+    \gui Options and \gui Help menus.
+
+    The QMenu class provides a menu widget for use in menu bars,
+    context menus, and other popup menus. The QMenuBar class provides
+    a horizontal menu bar with a list of pull-down \l{QMenu}s. At the
+    end we put the \gui File and \gui Options menus in the \c
+    {MainWindow}'s menu bar, which we retrieve using the
+    QMainWindow::menuBar() function.
+
+    \snippet examples/widgets/scribble/mainwindow.cpp 17
+    \snippet examples/widgets/scribble/mainwindow.cpp 18
+
+    In \c mayBeSave(), we check if there are any unsaved changes. If
+    there are any, we use QMessageBox to give the user a warning that
+    the image has been modified and the opportunity to save the
+    modifications.
+
+    As with QColorDialog and QFileDialog, the easiest way to create a
+    QMessageBox is to use its static functions. QMessageBox provides
+    a range of different messages arranged along two axes: severity
+    (question, information, warning and critical) and complexity (the
+    number of necessary response buttons). Here we use the \c
+    warning() function sice the message is rather important.
+
+    If the user chooses to save, we call the private \c saveFile()
+    function. For simplicitly, we use PNG as the file format; the
+    user can always press \gui Cancel and save the file using another
+    format.
+
+    The \c maybeSave() function returns \c false if the user clicks
+    \gui Cancel; otherwise it returns \c true.
+
+    \snippet examples/widgets/scribble/mainwindow.cpp 19
+    \snippet examples/widgets/scribble/mainwindow.cpp 20
+
+    In \c saveFile(), we pop up a file dialog with a file name
+    suggestion. The static QFileDialog::getSaveFileName() function
+    returns a file name selected by the user. The file does not have
+    to exist.
+*/
diff --git a/doc/src/examples/sdi.qdoc b/doc/src/examples/sdi.qdoc
new file mode 100644
index 0000000000..cfe351ceca
--- /dev/null
+++ b/doc/src/examples/sdi.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \example mainwindows/sdi
+    \title SDI Example
+
+    The SDI example shows how to create a Single Document Interface. It uses a number of
+    top-level windows to display the contents of different text files.
+
+    \image sdi-example.png
+*/
diff --git a/doc/src/examples/securesocketclient.qdoc b/doc/src/examples/securesocketclient.qdoc
new file mode 100644
index 0000000000..e93bf205a6
--- /dev/null
+++ b/doc/src/examples/securesocketclient.qdoc
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example network/securesocketclient
+    \title Secure Socket Client Example
+
+    The Secure Socket Client example shows how to use QSslSocket to
+    communicate over an encrypted (SSL) connection. It also demonstrates how
+    to deal with authenticity problems, and how to display security and
+    certificate information.
+
+    \image securesocketclient.png
+    \image securesocketclient2.png
+*/
diff --git a/doc/src/examples/semaphores.qdoc b/doc/src/examples/semaphores.qdoc
new file mode 100644
index 0000000000..a3873503ca
--- /dev/null
+++ b/doc/src/examples/semaphores.qdoc
@@ -0,0 +1,159 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example threads/semaphores
+    \title Semaphores Example
+
+    The Semaphores example shows how to use QSemaphore to control
+    access to a circular buffer shared by a producer thread and a
+    consumer thread.
+
+    The producer writes data to the buffer until it reaches the end
+    of the buffer, at which point it restarts from the beginning,
+    overwriting existing data. The consumer thread reads the data as
+    it is produced and writes it to standard error.
+
+    Semaphores make it possible to have a higher level of concurrency
+    than mutexes. If accesses to the buffer were guarded by a QMutex,
+    the consumer thread couldn't access the buffer at the same time
+    as the producer thread. Yet, there is no harm in having both
+    threads working on \e{different parts} of the buffer at the same
+    time.
+
+    The example comprises two classes: \c Producer and \c Consumer.
+    Both inherit from QThread. The circular buffer used for
+    communicating between these two classes and the semaphores that
+    protect it are global variables.
+
+    An alternative to using QSemaphore to solve the producer-consumer
+    problem is to use QWaitCondition and QMutex. This is what the
+    \l{threads/waitconditions}{Wait Conditions} example does.
+
+    \section1 Global Variables
+
+    Let's start by reviewing the circular buffer and the associated
+    semaphores:
+
+    \snippet examples/threads/semaphores/semaphores.cpp 0
+
+    \c DataSize is the amout of data that the producer will generate.
+    To keep the example as simple as possible, we make it a constant.
+    \c BufferSize is the size of the circular buffer. It is less than
+    \c DataSize, meaning that at some point the producer will reach
+    the end of the buffer and restart from the beginning.
+
+    To synchronize the producer and the consumer, we need two
+    semaphores. The \c freeBytes semaphore controls the "free" area
+    of the buffer (the area that the producer hasn't filled with data
+    yet or that the consumer has already read). The \c usedBytes
+    semaphore controls the "used" area of the buffer (the area that
+    the producer has filled but that the consumer hasn't read yet).
+
+    Together, the semaphores ensure that the producer is never more
+    than \c BufferSize bytes ahead of the consumer, and that the
+    consumer never reads data that the producer hasn't generated yet.
+
+    The \c freeBytes semaphore is initialized with \c BufferSize,
+    because initially the entire buffer is empty. The \c usedBytes
+    semaphore is initialized to 0 (the default value if none is
+    specified).
+
+    \section1 Producer Class
+
+    Let's review the code for the \c Producer class:
+
+    \snippet examples/threads/semaphores/semaphores.cpp 1
+    \snippet examples/threads/semaphores/semaphores.cpp 2
+
+    The producer generates \c DataSize bytes of data. Before it
+    writes a byte to the circular buffer, it must acquire a "free"
+    byte using the \c freeBytes semaphore. The QSemaphore::acquire()
+    call might block if the consumer hasn't kept up the pace with the
+    producer.
+
+    At the end, the producer releases a byte using the \c usedBytes
+    semaphore. The "free" byte has successfully been transformed into
+    a "used" byte, ready to be read by the consumer.
+
+    \section1 Consumer Class
+
+    Let's now turn to the \c Consumer class:
+
+    \snippet examples/threads/semaphores/semaphores.cpp 3
+    \snippet examples/threads/semaphores/semaphores.cpp 4
+
+    The code is very similar to the producer, except that this time
+    we acquire a "used" byte and release a "free" byte, instead of
+    the opposite.
+
+    \section1 The main() Function
+
+    In \c main(), we create the two threads and call QThread::wait()
+    to ensure that both threads get time to finish before we exit:
+
+    \snippet examples/threads/semaphores/semaphores.cpp 5
+    \snippet examples/threads/semaphores/semaphores.cpp 6
+
+    So what happens when we run the program? Initially, the producer
+    thread is the only one that can do anything; the consumer is
+    blocked waiting for the \c usedBytes semaphore to be released (its
+    initial \l{QSemaphore::available()}{available()} count is 0).
+    Once the producer has put one byte in the buffer,
+    \c{freeBytes.available()} is \c BufferSize - 1 and
+    \c{usedBytes.available()} is 1. At that point, two things can
+    happen: Either the consumer thread takes over and reads that
+    byte, or the consumer gets to produce a second byte.
+
+    The producer-consumer model presented in this example makes it
+    possible to write highly concurrent multithreaded applications.
+    On a multiprocessor machine, the program is potentially up to
+    twice as fast as the equivalent mutex-based program, since the
+    two threads can be active at the same time on different parts of
+    the buffer.
+
+    Be aware though that these benefits aren't always realized.
+    Acquiring and releasing a QSemaphore has a cost. In practice, it
+    would probably be worthwhile to divide the buffer into chunks and
+    to operate on chunks instead of individual bytes. The buffer size
+    is also a parameter that must be selected carefully, based on
+    experimentation.
+*/
diff --git a/doc/src/examples/settingseditor.qdoc b/doc/src/examples/settingseditor.qdoc
new file mode 100644
index 0000000000..5ce1e493bd
--- /dev/null
+++ b/doc/src/examples/settingseditor.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \example tools/settingseditor
+    \title Settings Editor Example
+
+    The Settings Editor example shows how Qt's standard settings support is used in an
+    application by providing an editor that enables the user to view the settings for
+    installed applications, and modify those that can be edited.
+
+    \image settingseditor-example.png
+*/
diff --git a/doc/src/examples/shapedclock.qdoc b/doc/src/examples/shapedclock.qdoc
new file mode 100644
index 0000000000..369553b819
--- /dev/null
+++ b/doc/src/examples/shapedclock.qdoc
@@ -0,0 +1,145 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example widgets/shapedclock
+    \title Shaped Clock Example
+
+    The Shaped Clock example shows how to apply a widget mask to a top-level
+    widget to produce a shaped window.
+
+    \image shapedclock-example.png
+
+    Widget masks are used to customize the shapes of top-level widgets by restricting
+    the available area for painting. On some window systems, setting certain window flags
+    will cause the window decoration (title bar, window frame, buttons) to be disabled,
+    allowing specially-shaped windows to be created. In this example, we use this feature
+    to create a circular window containing an analog clock.
+
+    Since this example's window does not provide a \gui File menu or a close
+    button, we provide a context menu with an \gui Exit entry so that the example
+    can be closed. Click the right mouse button over the window to open this menu.
+
+    \section1 ShapedClock Class Definition
+
+    The \c ShapedClock class is based on the \c AnalogClock class defined in the
+    \l{Analog Clock Example}{Analog Clock} example. The whole class definition is
+    presented below:
+
+    \snippet examples/widgets/shapedclock/shapedclock.h 0
+
+    The \l{QWidget::paintEvent()}{paintEvent()} implementation is the same as that found
+    in the \c AnalogClock class. We implement \l{QWidget::sizeHint()}{sizeHint()}
+    so that we don't have to resize the widget explicitly. We also provide an event
+    handler for resize events. This allows us to update the mask if the clock is resized.
+
+    Since the window containing the clock widget will have no title bar, we provide
+    implementations for \l{QWidget::mouseMoveEvent()}{mouseMoveEvent()} and
+    \l{QWidget::mousePressEvent()}{mousePressEvent()} to allow the clock to be dragged
+    around the screen. The \c dragPosition variable lets us keep track of where the user
+    last clicked on the widget.
+
+    \section1 ShapedClock Class Implementation
+
+    The \c ShapedClock constructor performs many of the same tasks as the \c AnalogClock
+    constructor. We set up a timer and connect it to the widget's update() slot:
+
+    \snippet examples/widgets/shapedclock/shapedclock.cpp 0
+
+    We inform the window manager that the widget is not to be decorated with a window
+    frame by setting the Qt::FramelessWindowHint flag on the widget. As a result, we need
+    to provide a way for the user to move the clock around the screen.
+
+    Mouse button events are delivered to the \c mousePressEvent() handler:
+
+    \snippet examples/widgets/shapedclock/shapedclock.cpp 1
+
+    If the left mouse button is pressed over the widget, we record the displacement in
+    global (screen) coordinates between the top-left position of the widget's frame (even
+    when hidden) and the point where the mouse click occurred. This displacement will be
+    used if the user moves the mouse while holding down the left button. Since we acted
+    on the event, we accept it by calling its \l{QEvent::accept()}{accept()} function.
+
+    \image shapedclock-dragging.png
+
+    The \c mouseMoveEvent() handler is called if the mouse is moved over the widget.
+
+    \snippet examples/widgets/shapedclock/shapedclock.cpp 2
+
+    If the left button is held down while the mouse is moved, the top-left corner of the
+    widget is moved to the point given by subtracting the \c dragPosition from the current
+    cursor position in global coordinates. If we drag the widget, we also accept the event.
+
+    The \c paintEvent() function is given for completeness. See the
+    \l{Analog Clock Example}{Analog Clock} example for a description of the process used
+    to render the clock.
+
+    \snippet examples/widgets/shapedclock/shapedclock.cpp 3
+
+    In the \c resizeEvent() handler, we re-use some of the code from the \c paintEvent()
+    to determine the region of the widget that is visible to the user:
+
+    \snippet examples/widgets/shapedclock/shapedclock.cpp 4
+
+    Since the clock face is a circle drawn in the center of the widget, this is the region
+    we use as the mask.
+
+    Although the lack of a window frame may make it difficult for the user to resize the
+    widget on some platforms, it will not necessarily be impossible. The \c resizeEvent()
+    function ensures that the widget mask will always be updated if the widget's dimensions
+    change, and additionally ensures that it will be set up correctly when the widget is
+    first displayed.
+
+    Finally, we implement the \c sizeHint() for the widget so that it is given a reasonable
+    default size when it is first shown:
+
+    \snippet examples/widgets/shapedclock/shapedclock.cpp 5
+
+    \section1 Notes on Widget Masks
+
+    Since QRegion allows arbitrarily complex regions to be created, widget masks can be
+    made to suit the most unconventionally-shaped windows, and even allow widgets to be
+    displayed with holes in them.
+
+    Widget masks can also be constructed by using the contents of pixmap to define the
+    opaque part of the widget. For a pixmap with an alpha channel, a suitable mask can be
+    obtained with QPixmap::mask().
+*/
diff --git a/doc/src/examples/sharedmemory.qdoc b/doc/src/examples/sharedmemory.qdoc
new file mode 100644
index 0000000000..f323977874
--- /dev/null
+++ b/doc/src/examples/sharedmemory.qdoc
@@ -0,0 +1,142 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \example ipc/sharedmemory
+  \title Shared Memory Example
+
+  The Shared Memory example shows how to use the QSharedMemory class
+  to implement inter-process communication using shared memory. To
+  build the example, run make. To run the example, start two instances
+  of the executable. The main() function creates an \l {QApplication}
+  {application} and an instance of our example's Dialog class. The
+  dialog is displayed and then control is passed to the application in
+  the standard way.
+
+  \snippet examples/ipc/sharedmemory/main.cpp 0
+
+  Two instances of class Dialog appear.
+
+  \image sharedmemory-example_1.png Screenshot of the Shared Memory example
+
+  Class Dialog inherits QDialog. It encapsulates the user interface
+  and an instance of QSharedMemory. It also has two public slots,
+  loadFromFile() and loadFromMemory() that correspond to the two
+  buttons on the dialog.
+
+  \snippet examples/ipc/sharedmemory/dialog.h 0
+
+  The constructor builds the user interface widgets and connects the
+  clicked() signal of each button to the corresponding slot function.
+
+  \snippet examples/ipc/sharedmemory/dialog.cpp 0
+
+  Note that "QSharedMemoryExample" is passed to the \l {QSharedMemory}
+  {QSharedMemory()} constructor to be used as the key. This will be
+  used by the system as the identifier of the underlying shared memory
+  segment.
+
+  Click the \tt {Load Image From File...} button on one of the
+  dialogs. The loadFromFile() slot is invoked. First, it tests whether
+  a shared memory segment is already attached to the process. If so,
+  that segment is detached from the process, so we can be assured of
+  starting off the example correctly.
+
+  \snippet examples/ipc/sharedmemory/dialog.cpp 1
+
+  The user is then asked to select an image file using
+  QFileDialog::getOpenFileName(). The selected file is loaded into a
+  QImage. Using a QImage lets us ensure that the selected file is a
+  valid image, and it also allows us to immediately display the image
+  in the dialog using setPixmap().
+
+  Next the image is streamed into a QBuffer using a QDataStream. This
+  gives us the size, which we then use to \l {QSharedMemory::}
+  {create()} our shared memory segment. Creating a shared memory
+  segment automatically \l {QSharedMemory::attach()} {attaches} the
+  segment to the process. Using a QBuffer here lets us get a pointer
+  to the image data, which we then use to do a memcopy() from the
+  QBuffer into the shared memory segment.
+
+  \snippet examples/ipc/sharedmemory/dialog.cpp 2
+
+  Note that we \l {QSharedMemory::} {lock()} the shared memory segment
+  before we copy into it, and we \l {QSharedMemory::} {unlock()} it
+  again immediately after the copy. This ensures we have exclusive
+  access to the shared memory segment to do our memcopy(). If some
+  other process has the segment lock, then our process will block
+  until the lock becomes available.
+
+  Note also that the function does not \l {QSharedMemory::} {detach()}
+  from the shared memory segment after the memcopy() and
+  unlock(). Recall that when the last process detaches from a shared
+  memory segment, the segment is released by the operating
+  system. Since this process only one that is attached to the shared
+  memory segment at the moment, if loadFromFile() detached from the
+  shared memory segment, the segment would be destroyed before we get
+  to the next step.
+
+  When the function returns, if the file you selected was qt.png, your
+  first dialog looks like this.
+
+  \image sharedmemory-example_2.png Screenshot of the Shared Memory example
+
+  In the second dialog, click the \tt {Display Image From Shared
+  Memory} button. The loadFromMemory() slot is invoked. It first \l
+  {QSharedMemory::attach()} {attaches} the process to the same shared
+  memory segment created by the first process. Then it \l
+  {QSharedMemory::lock()} {locks} the segment for exclusive access and
+  links a QBuffer to the image data in the shared memory segment. It
+  then streams the data into a QImage and \l {QSharedMemory::unlock()}
+  {unlocks} the segment.
+
+  \snippet examples/ipc/sharedmemory/dialog.cpp 3
+
+  In this case, the function does \l {QSharedMemory::} {detach()} from
+  the segment, because now we are effectively finished using
+  it. Finally, the QImage is displayed. At this point, both dialogs
+  should be showing the same image. When you close the first dialog,
+  the Dialog destructor calls the QSharedMemory destructor, which
+  detaches from the shared memory segment. Since this is the last
+  process to be detached from the segment, the operating system will
+  now release the shared memory.
+
+ */
diff --git a/doc/src/examples/simpledecoration.qdoc b/doc/src/examples/simpledecoration.qdoc
new file mode 100644
index 0000000000..fe8700abea
--- /dev/null
+++ b/doc/src/examples/simpledecoration.qdoc
@@ -0,0 +1,266 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example qws/simpledecoration
+    \title Simple Decoration Example
+    \ingroup qt-embedded
+
+    The Simple Decoration example shows how to create a custom window decoration
+    for embedded applications.
+
+    \image embedded-simpledecoration-example.png
+
+    By default, Qt for Embedded Linux applications display windows with one of
+    the standard window decorations provided by Qt which are perfectly suitable
+    for many situations. Nonetheless, for certain applications and devices, it
+    is necessary to provide custom window decorations.
+
+    In this document, we examine the fundamental features of custom window
+    decorations, and create a simple decoration as an example.
+
+    \section1 Styles and Window Decorations
+
+    On many platforms, the style used for the contents of a window (including
+    scroll bars) and the style used for the window decorations (the title bar,
+    window borders, close, maximize and other buttons) are handled differently.
+    This is usually because each application is responsible for rendering the
+    contents of its own windows and the window manager renders the window
+    decorations.
+
+    Although the situation is not quite like this on Qt for Embedded Linux
+    because QApplication automatically handles window decorations as well,
+    there are still two style mechanisms at work: QStyle and its associated
+    classes are responsible for rendering widgets and subclasses of QDecoration
+    are responsible for rendering window decorations.
+
+    \image embedded-simpledecoration-example-styles.png
+
+    Three decorations are provided with Qt for Embedded Linux: \e default is
+    a basic style, \e windows resembles the classic Windows look and feel,
+    and \e styled uses the QStyle classes for QMdiSubWindow to draw window
+    decorations. Of these, \e styled is the most useful if you want to impose
+    a consistent look and feel, but the window decorations may be too large
+    for some use cases.
+
+    If none of these built-in decorations are suitable, a custom style can
+    easily be created and used. To do this, we simply need to create a
+    subclass of QDecorationDefault and apply it to a QApplication instance
+    in a running application.
+
+    \section1 MyDecoration Class Definition
+
+    The \c MyDecoration class is a subclass of QDecorationDefault, a subclass
+    of QDecoration that provides reasonable default behavior for a decoration:
+
+    \snippet examples/qws/simpledecoration/mydecoration.h decoration class definition
+
+    We only need to implement a constructor and reimplement the
+    \l{QDecorationDefault::}{region()} and \l{QDecorationDefault::}{paint()}
+    functions to provide our own custom appearance for window decorations.
+
+    To make things fairly general, we provide a number of private variables
+    to hold parameters which control certain aspects of the decoration's
+    appearance. We also define some data structures that we will use to
+    relate buttons in the window decorations to regions.
+
+    \section1 MyDecoration Class Implementation
+
+    In the constructor of the \c MyDecoration class, we set up some default
+    values for the decoration, specifying a thin window border, a title
+    bar that is just taller than the buttons it will hold, and we create a
+    list of buttons that we support:
+
+    \snippet examples/qws/simpledecoration/mydecoration.cpp constructor start
+
+    We map each of these Qt::WindowFlags to QDecoration::DecorationRegion
+    enum values to help with the implementation of the
+    \l{#Finding Regions}{region() function implementation}.
+
+    \snippet examples/qws/simpledecoration/mydecoration.cpp map window flags to decoration regions
+
+    In this decoration, we implement the buttons used in the decoration as
+    pixmaps. To help us relate regions of the window to these, we define
+    mappings between each \l{QDecoration::}{DecorationRegion} and its
+    corresponding pixmap for two situations: when a window is shown normally
+    and when it has been maximized. This is purely for cosmetic purposes.
+
+    \snippet examples/qws/simpledecoration/mydecoration.cpp map decoration regions to pixmaps
+
+    We finish the constructor by defining the regions for buttons that we
+    understand. This will be useful when we are asked to give regions for
+    window decoration buttons.
+
+    \snippet examples/qws/simpledecoration/mydecoration.cpp constructor end
+
+    \section2 Finding Regions
+
+    Each decoration needs to be able to describe the regions used for parts
+    of the window furniture, such as the close button, window borders and
+    title bar. We reimplement the \l{QDecorationDefault::}{region()} function
+    to do this for our decoration. This function returns a QRegion object
+    that describes an arbitrarily-shaped region of the screen that can itself
+    be made up of several distinct areas.
+
+    \snippet examples/qws/simpledecoration/mydecoration.cpp region start
+
+    The function is called for a given \e widget, occupying a region specified
+    by \e insideRect, and is expected to return a region for the collection of
+    \l{QDecoration::}{DecorationRegion} enum values supplied in the
+    \e decorationRegion parameter.
+
+    We begin by figuring out how much space in the decoration we will need to
+    allocate for buttons, and where to place them:
+
+    \snippet examples/qws/simpledecoration/mydecoration.cpp calculate the positions of buttons based on the window flags used
+
+    In a more sophisticated implementation, we might test the \e decorationRegion
+    supplied for regions related to buttons and the title bar, and only perform
+    this space allocation if asked for regions related to these.
+
+    We also use the information about the area occupied by buttons to determine
+    how large an area we can use for the window title:
+
+    \snippet examples/qws/simpledecoration/mydecoration.cpp calculate the extent of the title
+
+    With these basic calculations done, we can start to compose a region, first
+    checking whether we have been asked for all of the window, and we return
+    immediately if so.
+
+    \snippet examples/qws/simpledecoration/mydecoration.cpp check for all regions
+
+    We examine each decoration region in turn, adding the corresponding region
+    to the \c region object created earlier. We take care to avoid "off by one"
+    errors in the coordinate calculations.
+
+    \snippet examples/qws/simpledecoration/mydecoration.cpp compose a region based on the decorations specified
+
+    Unlike the window borders and title bar, the regions occupied by buttons
+    many of the window decorations do not occupy fixed places in the window.
+    Instead, their locations depend on which other buttons are present.
+    We only add regions for buttons we can handle (defined in the \c stateRegions)
+    member variable, and only for those that are present (defined in the
+    \c buttons hash).
+
+    \snippet examples/qws/simpledecoration/mydecoration.cpp add a region for each button only if it is present
+
+    The fully composed region can then be returned:
+
+    \snippet examples/qws/simpledecoration/mydecoration.cpp region end
+
+    The information returned by this function is used when the decoration is
+    painted. Ideally, this function should be implemented to perform all the
+    calculations necessary to place elements of the decoration; this makes
+    the implementation of the \c paint() function much easier.
+
+    \section2 Painting the Decoration
+
+    The \c paint() function is responsible for drawing each window element
+    for a given widget. Information about the decoration region, its state
+    and the widget itself is provided along with a QPainter object to use.
+
+    The first check we make is for a call with no regions:
+
+    \snippet examples/qws/simpledecoration/mydecoration.cpp paint start
+
+    We return false to indicate that we have not painted anything. If we paint
+    something, we must return true so that the window can be composed, if
+    necessary.
+
+    Just as with the \c region() function, we test the decoration region to
+    determine which elements need to be drawn. If we paint anything, we set
+    the \c handled variable to true so that we can return the correct value
+    when we have finished.
+
+    \snippet examples/qws/simpledecoration/mydecoration.cpp paint different regions
+
+    Note that we use our own \c region() implementation to determine where
+    to draw decorations.
+
+    Since the \c region() function performs calculations to place buttons, we
+    can simply test the window flags against the buttons we support (using the
+    \c buttonHintMap defined in the constructor), and draw each button in the
+    relevant region:
+
+    \snippet examples/qws/simpledecoration/mydecoration.cpp paint buttons
+
+    Finally, we return the value of \c handled to indicate whether any painting
+    was performed:
+
+    \snippet examples/qws/simpledecoration/mydecoration.cpp paint end
+
+    We now have a decoration class that we can use in an application.
+
+    \section1 Using the Decoration
+
+    In the \c main.cpp file, we set up the application as usual, but we also
+    create an instance of our decoration and set it as the standard decoration
+    for the application:
+
+    \snippet examples/qws/simpledecoration/main.cpp create application
+
+    This causes all windows opened by this application to use our decoration.
+    To demonstrate this, we show the analog clock widget from the
+    \l{Analog Clock Example}, which we build into the application:
+
+    \snippet examples/qws/simpledecoration/main.cpp start application
+
+    The application can be run either
+    \l{Running Qt for Embedded Linux Applications}{as a server or a client
+    application}. In both cases, it will use our decoration rather than the
+    default one provided with Qt.
+
+    \section1 Notes
+
+    This example does not cache any information about the state or buttons
+    used for each window. This means that the \c region() function calculates
+    the locations and regions of buttons in cases where it could re-use
+    existing information.
+
+    If you run the application as a window server, you may expect client
+    applications to use our decoration in preference to the default Qt
+    decoration. However, it is up to each application to draw its own
+    decoration, so this will not happen automatically. One way to achieve
+    this is to compile the decoration with each application that needs it;
+    another way is to build the decoration as a plugin, using the
+    QDecorationPlugin class, and load it into the server and client
+    applications.
+*/
diff --git a/doc/src/examples/simpledommodel.qdoc b/doc/src/examples/simpledommodel.qdoc
new file mode 100644
index 0000000000..8d2d102f95
--- /dev/null
+++ b/doc/src/examples/simpledommodel.qdoc
@@ -0,0 +1,294 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example itemviews/simpledommodel
+    \title Simple DOM Model Example
+
+    The Simple DOM Model example shows how an existing class can be adapted for use with
+    the model/view framework.
+
+    \image simpledommodel-example.png
+
+    Qt provides two complementary sets of classes for reading XML files: The classes based
+    around QXmlReader provide a SAX-style API for incremental reading of large files, and
+    the classes based around QDomDocument enable developers to access the contents of XML
+    files using a Document Object Model (DOM) API.
+
+    In this example, we create a model that uses the DOM API to expose the structure and
+    contents of XML documents to views via the standard QAbstractModel interface.
+
+    \section1 Design and Concepts
+
+    Reading an XML document with Qt's DOM classes is a straightforward process. Typically,
+    the contents of a file are supplied to QDomDocument, and nodes are accessed using the
+    functions provided by QDomNode and its subclasses.
+
+    \omit
+    For example, the following code
+    snippet reads the contents of a file into a QDomDocument object and traverses the
+    document, reading all the plain text that can be found:
+
+    \snippet doc/src/snippets/code/doc_src_examples_simpledommodel.qdoc 0
+
+    In principle, the functions provided by QDomNode can be used to navigate from any
+    given starting point in a document to the piece of data requested by another component.
+    Since QDomDocument maintains information about the structure of a document, we can
+    use this to implement the required virtual functions in a QAbstractItemModel subclass.
+    \endomit
+
+    The aim is to use the structure provided by QDomDocument by wrapping QDomNode objects
+    in item objects similar to the \c TreeItem objects used in the
+    \l{Simple Tree Model Example}{Simple Tree Model} example.
+
+    \section1 DomModel Class Definition
+
+    Let us begin by examining the \c DomModel class:
+
+    \snippet examples/itemviews/simpledommodel/dommodel.h 0
+
+    The class definition contains all the basic functions that are needed for a
+    read-only model. Only the constructor and \c document() function are specific to
+    this model. The private \c domDocument variable is used to hold the document
+    that is exposed by the model; the \c rootItem variable contains a pointer to
+    the root item in the model.
+
+    \section1 DomItem Class Definition
+
+    The \c DomItem class is used to hold information about a specific QDomNode in
+    the document:
+
+    \snippet examples/itemviews/simpledommodel/domitem.h 0
+
+    Each \c DomItem provides a wrapper for a QDomNode obtained from the underlying
+    document which contains a reference to the node, it's location in the parent node's
+    list of child nodes, and a pointer to a parent wrapper item.
+
+    The \c parent(), \c child(), and \c row() functions are convenience functions for
+    the \c DomModel to use that provide basic information about the item to be discovered
+    quickly. The node() function provides access to the underlying QDomNode object.
+
+    As well as the information supplied in the constructor, the class maintains a cache
+    of information about any child items. This is used to provide a collection of
+    persistent item objects that the model can identify consistently and improve the
+    performance of the model when accessing child items.
+
+    \section1 DomItem Class Implementation
+
+    Since the \c DomItem class is only a thin wrapper around QDomNode objects, with a
+    few additional features to help improve performance and memory usage, we can provide
+    a brief outline of the class before discussing the model itself.
+
+    The constructor simply records details of the QDomNode that needs to be wrapped:
+
+    \snippet examples/itemviews/simpledommodel/domitem.cpp 0
+    \snippet examples/itemviews/simpledommodel/domitem.cpp 1
+
+    As a result, functions to provide the parent wrapper, the row number occupied by
+    the item in its parent's list of children, and the underlying QDomNode for each item
+    are straightforward to write:
+
+    \snippet examples/itemviews/simpledommodel/domitem.cpp 4
+    \codeline
+    \snippet examples/itemviews/simpledommodel/domitem.cpp 6
+    \codeline
+    \snippet examples/itemviews/simpledommodel/domitem.cpp 3
+
+    It is necessary to maintain a collection of items which can be consistently identified
+    by the model. For that reason, we maintain a hash of child wrapper items that, to
+    minimize memory usage, is initially empty. The model uses the item's \c child()
+    function to help create model indexes, and this constructs wrappers for the children
+    of the item's QDomNode, relating the row number of each child to the newly-constructed
+    wrapper:
+
+    \snippet examples/itemviews/simpledommodel/domitem.cpp 5
+
+    If a QDomNode was previously wrapped, the cached wrapper is returned; otherwise, a
+    new wrapper is constructed and stored for valid children, and zero is returned for
+    invalid ones.
+
+    The class's destructor deletes all the child items of the wrapper:
+
+    \snippet examples/itemviews/simpledommodel/domitem.cpp 2
+
+    These, in turn, will delete their children and free any QDomNode objects in use.
+
+    \section1 DomModel Class Implementation
+
+    The structure provided by the \c DomItem class makes the implementation of \c DomModel
+    similar to the \c TreeModel shown in the
+    \l{Simple Tree Model Example}{Simple Tree Model} example.
+
+    The constructor accepts an existing document and a parent object for the model:
+
+    \snippet examples/itemviews/simpledommodel/dommodel.cpp 0
+
+    A shallow copy of the document is stored for future reference, and a root item is
+    created to provide a wrapper around the document. We assign the root item a row
+    number of zero only to be consistent since the root item will have no siblings.
+
+    Since the model only contains information about the root item, the destructor only
+    needs to delete this one item:
+
+    \snippet examples/itemviews/simpledommodel/dommodel.cpp 1
+
+    All of the child items in the tree will be deleted by the \c DomItem destructor as
+    their parent items are deleted.
+
+    \section2 Basic Properties of The Model
+
+    Some aspects of the model do not depend on the structure of the underlying document,
+    and these are simple to implement.
+
+    The number of columns exposed by the model is returned by the \c columnCount()
+    function:
+
+    \snippet examples/itemviews/simpledommodel/dommodel.cpp 2
+
+    This value is fixed, and does not depend on the location or type of the underlying
+    node in the document. We will use these three columns to display different kinds of
+    data from the underlying document.
+
+    Since we only implement a read-only model, the \c flags() function is straightforward
+    to write:
+
+    \snippet examples/itemviews/simpledommodel/dommodel.cpp 5
+
+    Since the model is intended for use in a tree view, the \c headerData() function only
+    provides a horizontal header:
+
+    \snippet examples/itemviews/simpledommodel/dommodel.cpp 6
+
+    The model presents the names of nodes in the first column, element attributes in the
+    second, and any node values in the third.
+
+    \section2 Navigating The Document
+
+    The index() function creates a model index for the item with the given row, column,
+    and parent in the model:
+
+    \snippet examples/itemviews/simpledommodel/dommodel.cpp 7
+
+    The function first has to relate the parent index to an item that contains a node
+    from the underlying document. If the parent index is invalid, it refers to the root
+    node in the document, so we retrieve the root item that wraps it; otherwise, we
+    obtain a pointer to the relevant item using the QModelIndex::internalPointer()
+    function. We are able to extract a pointer in this way because any valid model index
+    will have been created by this function, and we store pointers to item objects in
+    any new indexes that we create with QAbstractItemModel::createIndex():
+
+    \snippet examples/itemviews/simpledommodel/dommodel.cpp 8
+
+    A child item for the given row is provided by the parent item's \c child() function.
+    If a suitable child item was found then we call
+    \l{QAbstractItemModel::createIndex()}{createIndex()} to produce a model index for the
+    requested row and column, passing a pointer to the child item for it to store
+    internally. If no suitable child item is found, an invalid model index is returned.
+
+    Note that the items themselves maintain ownership of their child items. This means
+    that the model does not need to keep track of the child items that have been created,
+    and can let the items themselves tidy up when they are deleted.
+
+    The number of rows beneath a given item in the model is returned by the \c rowCount()
+    function, and is the number of child nodes contained by the node that corresponds to
+    the specified model index:
+
+    \snippet examples/itemviews/simpledommodel/dommodel.cpp 10
+
+    To obtain the relevant node in the underlying document, we access the item via the
+    internal pointer stored in the model index. If an invalid index is supplied, the
+    root item is used instead. We use the item's \c node() function to access the node
+    itself, and simply count the number of child nodes it contains.
+
+    Since the model is used to represent a hierarchical data structure, it needs to
+    provide an implementation for the \c parent() function. This returns a model index
+    that corresponds to the parent of a child model index supplied as its argument:
+
+    \snippet examples/itemviews/simpledommodel/dommodel.cpp 9
+
+    For valid indexes other than the index corresponding to the root item, we obtain
+    a pointer to the relevant item using the method described in the \c index() function,
+    and use the item's \c parent() function to obtain a pointer to the parent item.
+
+    If no valid parent item exists, or if the parent item is the root item, we can simply
+    follow convention and return an invalid model index. For all other parent items, we
+    create a model index containing the appropriate row and column numbers, and a pointer
+    to the parent item we just obtained.
+
+    Data is provided by the \c data() function. For simplicity, we only provide data for
+    the \l{Qt::DisplayRole}{display role}, returning an invalid variant for all other
+    requests:
+
+    \snippet examples/itemviews/simpledommodel/dommodel.cpp 3
+
+    As before, we obtain an item pointer for the index supplied, and use it to obtain
+    the underlying document node. Depending on the column specified, the data we return
+    is obtained in different ways:
+
+    \snippet examples/itemviews/simpledommodel/dommodel.cpp 4
+
+    For the first column, we return the node's name. For the second column, we read any
+    attributes that the node may have, and return a string that contains a space-separated
+    list of attribute-value assignments. For the third column, we return any value that
+    the node may have; this allows the contents of text nodes to be displayed in a view.
+
+    If data from any other column is requested, an invalid variant is returned.
+
+    \section1 Implementation Notes
+
+    Ideally, we would rely on the structure provided by QDomDocument to help us write
+    the \l{QAbstractItemModel::parent()}{parent()} and
+    \l{QAbstractItemModel::index()}{index()} functions that are required when subclassing
+    QAbstractItemModel. However, since Qt's DOM classes use their own system for
+    dynamically allocating memory for DOM nodes, we cannot guarantee that the QDomNode
+    objects returned for a given piece of information will be the same for subsequent
+    accesses to the document.
+
+    We use item wrappers for each QDomNode to provide consistent pointers that the model
+    can use to navigate the document structure.
+    \omit
+    Since these items contain value references to the QDomNode objects themselves, this
+    has the side effect that the DOM nodes themselves can be used to reliably navigate
+    the document [not sure about this - QDom* may return different QDomNode objects for
+    the same piece of information]. However, this advantage is redundant since we need to
+    use wrapper items to obtain it. [Possible use of QDomNode cache in the model itself.]
+    \endomit
+*/
diff --git a/doc/src/examples/simpletextviewer.qdoc b/doc/src/examples/simpletextviewer.qdoc
new file mode 100644
index 0000000000..2a5e45c059
--- /dev/null
+++ b/doc/src/examples/simpletextviewer.qdoc
@@ -0,0 +1,466 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example help/simpletextviewer
+    \title Simple Text Viewer Example
+
+    The Simple Text Viewer example shows how to use \QA as a customized
+    help viewer for your application.
+
+    This is done in two stages. Firstly, documentation is created and \QA
+    is customized; secondly, the functionality to launch and control
+    \QA is added to the application.
+
+    \image simpletextviewer-example.png
+
+    The Simple Text Viewer application lets the user select and view
+    existing files.
+
+    The application provides its own custom documentation that is
+    available from the \gui Help menu in the main window's menu bar
+    or by clicking the \gui Help button in the application's find file
+    dialog.
+
+    The example consists of four classes:
+
+    \list
+        \o \c Assistant provides functionality to launch \QA.
+        \o \c MainWindow is the main application window.
+        \o \c FindFileDialog allows the user to search for
+           files using wildcard matching.
+        \o \c TextEdit provides a rich text browser that makes
+           sure that images referenced in HTML documents are
+           displayed properly.
+    \endlist
+
+    Note that we will only comment on the parts of the implementation
+    that are relevant to the main issue, that is making Qt Assistant
+    act as a customized help viewer for our Simple Text Viewer
+    application.
+
+    \section1 Creating Documentation and Customizing \QA
+
+    How to create the actual documentation in the form of HTML pages is
+    not in the scope of this example. In general, HTML pages can either
+    be written by hand or generated with the help of documentation tools
+    like qdoc or Doxygen. For the purposes of this example we assume that
+    the HTML files have already been created. So, the only thing that
+    remains to be done is to tell \QA how to structure and display the
+    help information.
+
+    \section2 Organizing Documentation for \QA
+
+    Plain HTML files only contain text or documentation about specific topics,
+    but they usually include no information about how several HTML documents
+    relate to each other or in which order they are supposed to be read.
+    What is missing is a table of contents along with an index to access
+    certain help contents quickly, without having to browse through a lot
+    of documents in order to find a piece of information.
+
+    To organize the documentation and make it available for \QA, we have
+    to create a Qt help project (.qhp) file. The first and most important
+    part of the project file is the definition of the namespace. The namespace
+    has to be unique and will be the first part of the page URL in \QA.
+    In addition, we have to set a virtual folder which acts as a common
+    folder for documentation sets. This means, that two documentation sets
+    identified by two different namespaces can cross reference HTML files
+    since those files are in one big virtual folder. However, for this
+    example, we'll only have one documentation set available, so the
+    virtual folder name and functionality are not important.
+
+    \code
+    <?xml version="1.0" encoding="UTF-8"?>
+    <QtHelpProject version="1.0">
+      <namespace>com.trolltech.examples.simpletextviewer</namespace>
+      <virtualFolder>doc</virtualFolder>
+    \endcode
+
+    The next step is to define the filter section. A filter section
+    contains the table of contents, indices and a complete list of
+    all documentation files, and can have any number of filter attributes
+    assigned to it. A filter attribute is an ordinary string which can
+    be freely chosen. Later in \QA, users can then define a custom
+    filter referencing those attributes. If the attributes of a filter
+    section match the attributes of the custom filter the documentation
+    will be shown, otherwise \QA will hide the documentation.
+
+    Again, since we'll only have one documentation set, we do not need
+    the filtering functionality of \QA and can therefore skip the
+    filter attributes.
+
+    Now, we build up the table of contents. An item in the table is
+    defined by the \c section tag which contains the attributes for the
+    item title as well as link to the actual page. Section tags can be
+    nested infinitely, but for practical reasons it is not recommended
+    to nest them deeper than three or four levels. For our example we
+    want to use the following outline for the table of contents:
+
+    \list
+    \o Simple Text Viewer
+      \list
+      \o Find File
+        \list
+        \o File Dialog
+        \o Wildcard Matching
+        \o Browse
+        \endlist
+      \o Open File      
+      \endlist
+    \endlist
+
+    In the help project file, the outline is represented by:
+
+    \code
+     <filterSection>
+       <toc>
+         <section title="Simple Text Viewer" ref="index.html">
+           <section title="Find File" ref="./findfile.html">
+             <section title="File Dialog" ref="./filedialog.html"></section>
+             <section title="Wildcard Matching" ref="./wildcardmatching.html"></section>
+             <section title="Browse" ref="./browse.html"></section>
+           </section>
+           <section title="Open File" ref="./openfile.html"></section>
+         </section>
+       </toc>
+    \endcode
+
+    After the table of contents is defined, we will list all index keywords:      
+
+    \code
+        <keywords>
+          <keyword name="Display" ref="./index.html"/>
+          <keyword name="Rich text" ref="./index.html"/>
+          <keyword name="Plain text" ref="./index.html"/>
+          <keyword name="Find" ref="./findfile.html"/>
+          <keyword name="File menu" ref="./findfile.html"/>
+          <keyword name="File name" ref="./filedialog.html"/>
+          <keyword name="File dialog" ref="./filedialog.html"/>
+          <keyword name="File globbing" ref="./wildcardmatching.html"/>
+          <keyword name="Wildcard matching" ref="./wildcardmatching.html"/>
+          <keyword name="Wildcard syntax" ref="./wildcardmatching.html"/>
+          <keyword name="Browse" ref="./browse.html"/>
+          <keyword name="Directory" ref="./browse.html"/>
+          <keyword name="Open" ref="./openfile.html"/>
+          <keyword name="Select" ref="./openfile.html"/>
+        </keywords>
+    \endcode
+
+    As the last step, we have to list all files making up the documentation.
+    An important point to note here is that all files have to listed, including
+    image files, and even stylesheets if they are used.
+
+    \code
+        <files>
+          <file>browse.html</file>
+          <file>filedialog.html</file>
+          <file>findfile.html</file>
+          <file>index.html</file>
+          <file>intro.html</file>
+          <file>openfile.html</file>
+          <file>wildcardmatching.html</file>
+          <file>images/browse.png</file>
+          <file>images/fadedfilemenu.png</file>
+          <file>images/filedialog.png</file>
+          <file>images/handbook.png</file>
+          <file>images/mainwindow.png</file>
+          <file>images/open.png</file>
+          <file>images/wildcard.png</file>
+        </files>
+      </filterSection>
+    </QtHelpProject>
+    \endcode
+
+    The help project file is now finished. If you want to see the resulting
+    documentation in \QA, you have to generate a Qt compressed help file
+    out of it and register it with the default help collection of \QA.
+
+    \code
+    qhelpgenerator simpletextviewer.qhp -o simpletextviewer.qch
+    assistant -register simpletextviewer.qch
+    \endcode
+
+    If you start \QA now, you'll see the Simple Text Viewer documentation
+    beside the Qt documentation. This is OK for testing purposes, but
+    for the final version we want to only have the Simple Text Viewer
+    documentation in \QA.
+
+    \section2 Customizing \QA
+
+    The easiest way to make \QA only display the Simple Text Viewer
+    documentation is to create our own help collection file. A collection
+    file is stored in a binary format, similar to the compressed help file,
+    and generated from a help collection project file (*.qhcp). With
+    the help of a collection file, we can customize the appearance and even
+    some functionality offered by \QA.
+
+    At first, we change the window title and icon. Instead of showing "\QA"
+    it will show "Simple Text Viewer", so it is much clearer for the user
+    that the help viewer actually belongs to our application.    
+
+    \code
+    <?xml version="1.0" encoding="UTF-8"?>
+    <QHelpCollectionProject version="1.0">
+    <assistant>
+        <title>Simple Text Viewer</title>
+        <applicationIcon>images/handbook.png</applicationIcon>        
+        <cacheDirectory>Trolltech/SimpleTextViewer</cacheDirectory>
+    \endcode
+
+    The \c cacheDirectory tag specifies a subdirectory of the users
+    data directory (see the
+    \l{Using Qt Assistant as a Custom Help Viewer#Qt Help Collection Files}{Qt Help Collection Files})
+    where the cache file for the full text search or the settings file will
+    be stored.
+
+    After this, we set the page displayed by \QA when launched for the very
+    first time in its new configuration. The URL consists of the namespace
+    and virtual folder defined in the Qt help project file, followed by the
+    actual page file name.
+
+    \code
+        <startPage>qthelp://com.trolltech.examples.simpletextviewer/doc/index.html</startPage>
+    \endcode
+
+    Next, we alter the name of the "About" menu item to "About Simple
+    Text Viewer". The contents of the \gui{About} dialog are also changed
+    by specifying a file where the about text or icon is taken from.
+
+    \code
+        <aboutMenuText>
+            <text>About Simple Text Viewer</text>
+        </aboutMenuText>
+        <aboutDialog>
+            <file>about.txt</file>
+            <icon>images/icon.png</icon>
+        </aboutDialog>
+    \endcode
+
+    \QA offers the possibility to add or remove documentation via its
+    preferences dialog. This functionality is helpful when using \QA
+    as the central help viewer for more applications, but in our case
+    we want to actually prevent the user from removing the documentation.
+    So, we disable the documentation manager.
+
+    Since the address bar is not really relevant in such a small
+    documentation set we switch it off as well. By having just one filter
+    section, without any filter attributes, we can also disable the filter
+    functionality of \QA, which means that the filter page and the filter
+    toolbar will not be available.
+
+    \code
+        <enableDocumentationManager>false</enableDocumentationManager>
+        <enableAddressBar>false</enableAddressBar>
+        <enableFilterFunctionality>false</enableFilterFunctionality>
+    </assistant>
+    \endcode
+
+    For testing purposes, we already generated the compressed help file
+    and registered it with \QA's default help collection. With the
+    following lines we achieve the same result. The only and important
+    difference is that we register the compressed help file, not in
+    the default collection, but in our own collection file.
+
+    \code
+      <docFiles>
+        <generate>
+            <file>
+                <input>simpletextviewer.qhp</input>
+                <output>simpletextviewer.qch</output>
+                </file>
+            </generate>
+        <register>
+            <file>simpletextviewer.qch</file>
+            </register>
+        </docFiles>
+    </QHelpCollectionProject>
+    \endcode
+
+    As the last step, we have to generate the binary collection file
+    out of the help collection project file. This is done by running the
+    \c qcollectiongenerator tool.
+
+    \code
+    qcollectiongenerator simpletextviewer.qhcp -o simpletextviewer.qhc
+    \endcode
+
+    To test all our customizations made to \QA, we add the collection
+    file name to the command line:
+
+    \code
+    assistant -collectionFile simpletextviewer.qhc
+    \endcode
+
+    \section1 Controlling \QA via the Assistant Class
+
+    We will first take a look at how to start and operate \QA from a
+    remote application. For that purpose, we create a class called
+    \c Assistant.
+
+    This class provides a public function that is used to show pages
+    of the documentation, and one private helper function to make sure
+    that \QA is up and running.
+
+    Launching \QA is done in the function \c startAssistant() by simply
+    creating and starting a QProcess. If the process is already running,
+    the function returns immediately. Otherwise, the process has
+    to be set up and started.
+
+    \snippet examples/help/simpletextviewer/assistant.cpp 2
+
+    To start the process we need the executable name of \QA as well as the
+    command line arguments for running \QA in a customized mode. The
+    executable name is a little bit tricky since it depends on the
+    platform, but fortunately it is only different on Mac OS X.
+
+    The displayed documentation can be altered using the \c -collectionFile
+    command line argument when launching \QA. When started without any options,
+    \QA displays a default set of documentation. When Qt is installed,
+    the default documentation set in \QA contains the Qt reference
+    documentation as well as the tools that come with Qt, such as Qt
+    Designer and \c qmake.
+
+    In our example, we replace the default documentation set with our
+    custom documentation by passing our application-specific collection
+    file to the process's command line options.
+
+    As the last argument, we add \c -enableRemoteControl, which makes \QA
+    listen to its \c stdin channel for commands, such as those to display
+    a certain page in the documentation.
+    Then we start the process and wait until it is actually running. If,
+    for some reason \QA cannot be started, \c startAssistant() will return
+    false.
+
+    The implementation for \c showDocumentation() is now straightforward.
+    Firstly, we ensure that \QA is running, then we send the request to
+    display the \a page via the \c stdin channel of the process. It is very
+    important here that the command is terminated by the '\\0' character
+    followed by an end of line token to flush the channel.
+
+    \snippet examples/help/simpletextviewer/assistant.cpp 1
+
+    Finally, we make sure that \QA is terminated properly in the case that
+    the application is shut down. The destructor of QProcess kills the
+    process, meaning that the application has no possibility to do things
+    like save user settings, which would result in corrupted settings files.
+    To avoid this, we ask \QA to terminate in the destructor of the
+    \c Assistant class.
+
+    \snippet examples/help/simpletextviewer/assistant.cpp 0
+
+    \section1 MainWindow Class 
+
+    \image simpletextviewer-mainwindow.png
+
+    The \c MainWindow class provides the main application window with
+    two menus: the \gui File menu lets the user open and view an
+    existing file, while the \gui Help menu provides information about
+    the application and about Qt, and lets the user open \QA to
+    display the application's documentation.
+
+    To be able to access the help functionality, we initialize the
+    \c Assistant object in the \c MainWindow's constructor.
+
+    \snippet examples/help/simpletextviewer/mainwindow.cpp 0
+    \dots
+    \snippet examples/help/simpletextviewer/mainwindow.cpp 1
+
+    Then we create all the actions for the Simple Text Viewer application.
+    Of special interest is the \c assistantAct action accessible
+    via the \key{F1} shortcut or the \menu{Help|Help Contents} menu item.
+    This action is connected to the \c showDocumentation() slot of
+    the \c MainWindow class.
+
+    \snippet examples/help/simpletextviewer/mainwindow.cpp 4
+    \dots
+    \snippet examples/help/simpletextviewer/mainwindow.cpp 5
+
+    In the \c showDocumentation() slot, we call the \c showDocumentation()
+    function of the \c Assistant class with the URL of home page of the
+    documentation.
+
+    \snippet examples/help/simpletextviewer/mainwindow.cpp 3
+
+    Finally, we must reimplement the protected QWidget::closeEvent()
+    event handler to ensure that the application's \QA instance is
+    properly closed before we terminate the application.
+
+    \snippet examples/help/simpletextviewer/mainwindow.cpp 2
+
+    \section1 FindFileDialog Class
+
+    \image simpletextviewer-findfiledialog.png
+
+    The Simple Text Viewer application provides a find file dialog
+    allowing the user to search for files using wildcard matching. The
+    search is performed within the specified directory, and the user
+    is given an option to browse the existing file system to find the
+    relevant directory.
+
+    In the constructor we save the references to the \c Assistant
+    and \c QTextEdit objects passed as arguments. The \c Assistant
+    object will be used in the \c FindFileDialog's \c help() slot,
+    as we will see shortly, while the QTextEdit will be used in the
+    dialog's \c openFile() slot to display the chosen file.
+
+    \snippet examples/help/simpletextviewer/findfiledialog.cpp 0
+    \dots
+    \snippet examples/help/simpletextviewer/findfiledialog.cpp 1
+
+    The most relevant member to observe in the \c FindFileDialog
+    class is the private \c help() slot. The slot is connected to the
+    dialog's \gui Help button, and brings the current \QA instance
+    to the foreground with the documentation for the dialog by
+    calling \c Assistant's \c showDocumentation() function.
+
+    \snippet examples/help/simpletextviewer/findfiledialog.cpp 2
+
+    \section1 Summary
+
+    In order to make \QA act as a customized help tool for
+    your application, you must provide your application with a
+    process that controls \QA in addition to a custom help collection
+    file including Qt compressed help files.
+
+    The \l{Using Qt Assistant as a Custom Help Viewer} document contains
+    more information about the options and settings available to
+    applications that use \QA as a custom help viewer.
+*/
diff --git a/doc/src/examples/simpletreemodel.qdoc b/doc/src/examples/simpletreemodel.qdoc
new file mode 100644
index 0000000000..5ddeb46c0d
--- /dev/null
+++ b/doc/src/examples/simpletreemodel.qdoc
@@ -0,0 +1,346 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example itemviews/simpletreemodel
+    \title Simple Tree Model Example
+
+    The Simple Tree Model example shows how to create a basic, read-only
+    hierarchical model to use with Qt's standard view classes. For a
+    description of simple non-hierarchical list and table models, see the
+    \l{model-view-programming.html}{Model/View Programming} overview.
+
+    \image simpletreemodel-example.png
+
+    Qt's model/view architecture provides a standard way for views to manipulate
+    information in a data source, using an abstract model of the data to
+    simplify and standardize the way it is accessed. Simple models represent
+    data as a table of items, and allow views to access this data via an
+    \l{model-view-model.html}{index-based} system. More generally, models can
+    be used to represent data in the form of a tree structure by allowing each
+    item to act as a parent to a table of child items.
+
+    Before attempting to implement a tree model, it is worth considering whether
+    the data is supplied by an external source, or whether it is going to be
+    maintained within the model itself. In this example, we will implement an
+    internal structure to hold data rather than discuss how to package data from
+    an external source.
+
+    \section1 Design and Concepts
+
+    The data structure that we use to represent the structure of the data takes
+    the form of a tree built from \c TreeItem objects. Each \c TreeItem
+    represents an item in a tree view, and contains several columns of data.
+
+    \target SimpleTreeModelStructure
+    \table
+    \row \i \inlineimage treemodel-structure.png
+    \i \bold{Simple Tree Model Structure}
+
+    The data is stored internally in the model using \c TreeItem objects that
+    are linked together in a pointer-based tree structure. Generally, each
+    \c TreeItem has a parent item, and can have a number of child items.
+    However, the root item in the tree structure has no parent item and it
+    is never referenced outside the model.
+
+    Each \c TreeItem contains information about its place in the tree
+    structure; it can return its parent item and its row number. Having
+    this information readily available makes implementing the model easier.
+
+    Since each item in a tree view usually contains several columns of data
+    (a title and a summary in this example), it is natural to store this
+    information in each item. For simplicity, we will use a list of QVariant
+    objects to store the data for each column in the item.
+    \endtable
+
+    The use of a pointer-based tree structure means that, when passing a
+    model index to a view, we can record the address of the corresponding
+    item in the index (see QAbstractItemModel::createIndex()) and retrieve
+    it later with QModelIndex::internalPointer(). This makes writing the
+    model easier and ensures that all model indexes that refer to the same
+    item have the same internal data pointer.
+
+    With the appropriate data structure in place, we can create a tree model
+    with a minimal amount of extra code to supply model indexes and data to
+    other components.
+
+    \section1 TreeItem Class Definition
+
+    The \c TreeItem class is defined as follows:
+
+    \snippet examples/itemviews/simpletreemodel/treeitem.h 0
+
+    The class is a basic C++ class. It does not inherit from QObject or
+    provide signals and slots. It is used to hold a list of QVariants,
+    containing column data, and information about its position in the tree
+    structure. The functions provide the following features:
+
+    \list
+    \o The \c appendChildItem() is used to add data when the model is first
+       constructed and is not used during normal use.
+    \o The \c child() and \c childCount() functions allow the model to obtain
+       information about any child items.
+    \o Information about the number of columns associated with the item is
+       provided by \c columnCount(), and the data in each column can be
+       obtained with the data() function.
+    \o The \c row() and \c parent() functions are used to obtain the item's
+       row number and parent item.
+    \endlist
+
+    The parent item and column data are stored in the \c parentItem and
+    \c itemData private member variables. The \c childItems variable contains
+    a list of pointers to the item's own child items.
+
+    \section1 TreeItem Class Implementation
+
+    The constructor is only used to record the item's parent and the data
+    associated with each column.
+
+    \snippet examples/itemviews/simpletreemodel/treeitem.cpp 0
+
+    A pointer to each of the child items belonging to this item will be
+    stored in the \c childItems private member variable. When the class's
+    destructor is called, it must delete each of these to ensure that
+    their memory is reused:
+
+    \snippet examples/itemviews/simpletreemodel/treeitem.cpp 1
+
+    Since each of the child items are constructed when the model is initially
+    populated with data, the function to add child items is straightforward:
+
+    \snippet examples/itemviews/simpletreemodel/treeitem.cpp 2
+
+    Each item is able to return any of its child items when given a suitable
+    row number. For example, in the \l{#SimpleTreeModelStructure}{above diagram},
+    the item marked with the letter "A" corresponds to the child of the root item
+    with \c{row = 0}, the "B" item is a child of the "A" item with \c{row = 1},
+    and the "C" item is a child of the root item with \c{row = 1}.
+
+    The \c child() function returns the child that corresponds to
+    the specified row number in the item's list of child items:
+
+    \snippet examples/itemviews/simpletreemodel/treeitem.cpp 3
+
+    The number of child items held can be found with \c childCount():
+
+    \snippet examples/itemviews/simpletreemodel/treeitem.cpp 4
+
+    The \c TreeModel uses this function to determine the number of rows that
+    exist for a given parent item.
+
+    The \c row() function reports the item's location within its parent's
+    list of items:
+
+    \snippet examples/itemviews/simpletreemodel/treeitem.cpp 8
+
+    Note that, although the root item (with no parent item) is automatically
+    assigned a row number of 0, this information is never used by the model.
+
+    The number of columns of data in the item is trivially returned by the
+    \c columnCount() function.
+
+    \snippet examples/itemviews/simpletreemodel/treeitem.cpp 5
+
+    Column data is returned by the \c data() function, taking advantage of
+    QList's ability to provide sensible default values if the column number
+    is out of range:
+
+    \snippet examples/itemviews/simpletreemodel/treeitem.cpp 6
+
+    The item's parent is found with \c parent():
+
+    \snippet examples/itemviews/simpletreemodel/treeitem.cpp 7
+
+    Note that, since the root item in the model will not have a parent, this
+    function will return zero in that case. We need to ensure that the model
+    handles this case correctly when we implement the \c TreeModel::parent()
+    function.
+
+    \section1 TreeModel Class Definition
+
+    The \c TreeModel class is defined as follows:
+
+    \snippet examples/itemviews/simpletreemodel/treemodel.h 0
+
+    This class is similar to most other subclasses of QAbstractItemModel that
+    provide read-only models. Only the form of the constructor and the
+    \c setupModelData() function are specific to this model. In addition, we
+    provide a destructor to clean up when the model is destroyed.
+
+    \section1 TreeModel Class Implementation
+
+    For simplicity, the model does not allow its data to be edited. As a
+    result, the constructor takes an argument containing the data that the
+    model will share with views and delegates:
+
+    \snippet examples/itemviews/simpletreemodel/treemodel.cpp 0
+
+    It is up to the constructor to create a root item for the model. This
+    item only contains vertical header data for convenience. We also use it
+    to reference the internal data structure that contains the model data,
+    and it is used to represent an imaginary parent of top-level items in
+    the model.
+
+    The model's internal data structure is populated with items by the
+    \c setupModelData() function. We will examine this function separately
+    at the end of this document.
+
+    The destructor ensures that the root item and all of its descendants
+    are deleted when the model is destroyed:
+
+    \snippet examples/itemviews/simpletreemodel/treemodel.cpp 1
+
+    Since we cannot add data to the model after it is constructed and set
+    up, this simplifies the way that the internal tree of items is managed.
+
+    Models must implement an \c index() function to provide indexes for
+    views and delegates to use when accessing data. Indexes are created
+    for other components when they are referenced by their row and column
+    numbers, and their parent model index. If an invalid model
+    index is specified as the parent, it is up to the model to return an
+    index that corresponds to a top-level item in the model.
+
+    When supplied with a model index, we first check whether it is valid.
+    If it is not, we assume that a top-level item is being referred to;
+    otherwise, we obtain the data pointer from the model index with its
+    \l{QModelIndex::internalPointer()}{internalPointer()} function and use
+    it to reference a \c TreeItem object. Note that all the model indexes
+    that we construct will contain a pointer to an existing \c TreeItem,
+    so we can guarantee that any valid model indexes that we receive will
+    contain a valid data pointer.
+
+    \snippet examples/itemviews/simpletreemodel/treemodel.cpp 6
+
+    Since the row and column arguments to this function refer to a
+    child item of the corresponding parent item, we obtain the item using
+    the \c TreeItem::child() function. The
+    \l{QAbstractItemModel::createIndex()}{createIndex()} function is used
+    to create a model index to be returned. We specify the row and column
+    numbers, and a pointer to the item itself. The model index can be used
+    later to obtain the item's data.
+
+    The way that the \c TreeItem objects are defined makes writing the
+    \c parent() function easy:
+
+    \snippet examples/itemviews/simpletreemodel/treemodel.cpp 7
+
+    We only need to ensure that we never return a model index corresponding
+    to the root item. To be consistent with the way that the \c index()
+    function is implemented, we return an invalid model index for the
+    parent of any top-level items in the model.
+
+    When creating a model index to return, we must specify the row and
+    column numbers of the parent item within its own parent. We can
+    easily discover the row number with the \c TreeItem::row() function,
+    but we follow a convention of specifying 0 as the column number of
+    the parent. The model index is created with
+    \l{QAbstractItemModel::createIndex()}{createIndex()} in the same way
+    as in the \c index() function.
+
+    The \c rowCount() function simply returns the number of child items
+    for the \c TreeItem that corresponds to a given model index, or the
+    number of top-level items if an invalid index is specified:
+
+    \snippet examples/itemviews/simpletreemodel/treemodel.cpp 8
+
+    Since each item manages its own column data, the \c columnCount()
+    function has to call the item's own \c columnCount() function to
+    determine how many columns are present for a given model index.
+    As with the \c rowCount() function, if an invalid model index is
+    specified, the number of columns returned is determined from the
+    root item:
+
+    \snippet examples/itemviews/simpletreemodel/treemodel.cpp 2
+
+    Data is obtained from the model via \c data(). Since the item manages
+    its own columns, we need to use the column number to retrieve the data
+    with the \c TreeItem::data() function:
+
+    \snippet examples/itemviews/simpletreemodel/treemodel.cpp 3
+
+    Note that we only support the \l{Qt::ItemDataRole}{DisplayRole}
+    in this implementation, and we also return invalid QVariant objects for
+    invalid model indexes.
+
+    We use the \c flags() function to ensure that views know that the
+    model is read-only:
+
+    \snippet examples/itemviews/simpletreemodel/treemodel.cpp 4
+
+    The \c headerData() function returns data that we conveniently stored
+    in the root item:
+
+    \snippet examples/itemviews/simpletreemodel/treemodel.cpp 5
+
+    This information could have been supplied in a different way: either
+    specified in the constructor, or hard coded into the \c headerData()
+    function.
+
+    \section1 Setting Up the Data in the Model
+
+    We use the \c setupModelData() function to set up the initial data in
+    the model. This function parses a text file, extracting strings of
+    text to use in the model, and creates item objects that record both
+    the data and the overall model structure.
+    Naturally, this function works in a way that is very specific to
+    this model. We provide the following description of its behavior,
+    and refer the reader to the example code itself for more information.
+
+    We begin with a text file in the following format:
+
+    \snippet doc/src/snippets/code/doc_src_examples_simpletreemodel.qdoc 0
+    \dots
+    \snippet doc/src/snippets/code/doc_src_examples_simpletreemodel.qdoc 1
+
+    We process the text file with the following two rules:
+
+    \list
+    \o For each pair of strings on each line, create an item (or node)
+       in a tree structure, and place each string in a column of data
+       in the item.
+    \o When the first string on a line is indented with respect to the
+       first string on the previous line, make the item a child of the
+       previous item created.
+    \endlist
+
+    To ensure that the model works correctly, it is only necessary to
+    create instances of \c TreeItem with the correct data and parent item.
+*/
diff --git a/doc/src/examples/simplewidgetmapper.qdoc b/doc/src/examples/simplewidgetmapper.qdoc
new file mode 100644
index 0000000000..2fdbf25799
--- /dev/null
+++ b/doc/src/examples/simplewidgetmapper.qdoc
@@ -0,0 +1,139 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example itemviews/simplewidgetmapper
+    \title Simple Widget Mapper Example
+
+    The Simple Widget Mapper example shows how to use a widget mapper to display
+    data from a model in a collection of widgets.
+
+    \image simplewidgetmapper-example.png
+
+    The QDataWidgetMapper class allows information obtained from a
+    \l{Model Classes}{model} to be viewed and edited in a collection of
+    widgets instead of in an \l{View Classes}{item view}.
+    Any model derived from QAbstractItemModel can be used as the source of
+    data and almost any input widget can be used to display it.
+
+    The example itself is very simple: we create \c Window, a QWidget subclass
+    that we use to hold the widgets used to present the data, and show it. The
+    \c Window class will provide buttons that the user can click to show
+    different records from the model.
+
+    \section1 Window Class Definition
+
+    The class provides a constructor, a slot to keep the buttons up to date,
+    and a private function to set up the model:
+
+    \snippet examples/itemviews/simplewidgetmapper/window.h Window definition
+
+    In addition to the QDataWidgetMapper object and the controls used to make
+    up the user interface, we use a QStandardItemModel to hold our data.
+    We could use a custom model, but this standard implementation is sufficient
+    for our purposes.
+
+    \section1 Window Class Implementation
+
+    The constructor of the \c Window class can be explained in three parts.
+    In the first part, we set up the widgets used for the user interface:
+    
+    \snippet examples/itemviews/simplewidgetmapper/window.cpp Set up widgets
+
+    We also set up the buddy relationships between various labels and the
+    corresponding input widgets.
+
+    Next, we set up the widget mapper, relating each input widget to a column
+    in the model specified by the call to \l{QDataWidgetMapper::}{setModel()}:
+
+    \snippet examples/itemviews/simplewidgetmapper/window.cpp Set up the mapper
+
+    We also connect the mapper to the \gui{Next} and \gui{Previous} buttons
+    via its \l{QDataWidgetMapper::}{toNext()} and
+    \l{QDataWidgetMapper::}{toPrevious()} slots. The mapper's
+    \l{QDataWidgetMapper::}{currentIndexChanged()} signal is connected to the
+    \c{updateButtons()} slot in the window which we'll show later.
+
+    In the final part of the constructor, we set up the layout, placing each
+    of the widgets in a grid (we could also use a QFormLayout for this):
+
+    \snippet examples/itemviews/simplewidgetmapper/window.cpp Set up the layout
+
+    Lastly, we set the window title and initialize the mapper by setting it to
+    refer to the first row in the model.
+
+    The model is initialized in the window's \c{setupModel()} function. Here,
+    we create a standard model with 5 rows and 3 columns, and we insert some
+    sample names, addresses and ages into each row:
+
+    \snippet examples/itemviews/simplewidgetmapper/window.cpp Set up the model
+
+    As a result, each row can be treated like a record in a database, and the
+    widget mapper will read the data from each row, using the column numbers
+    specified earlier to access the correct data for each widget. This is
+    shown in the following diagram:
+
+    \image widgetmapper-simple-mapping.png
+
+    Since the user can navigate using the buttons in the user interface, the
+    example is fully-functional at this point, but to make it a bit more
+    user-friendly, we implement the \c{updateButtons()} slot to show when the
+    user is viewing the first or last records:
+
+    \snippet examples/itemviews/simplewidgetmapper/window.cpp Slot for updating the buttons
+
+    If the mapper is referring to the first row in the model, the \gui{Previous}
+    button is disabled. Similarly, the \gui{Next} button is disabled if the
+    mapper reaches the last row in the model.
+
+    \section1 More Complex Mappings
+
+    The QDataWidgetMapper class makes it easy to relate information from a
+    model to widgets in a user interface. However, it is sometimes necessary
+    to use input widgets which offer choices to the user, such as QComboBox,
+    in conjunction with a widget mapper.
+
+    In these situations, although the mapping to input widgets remains simple,
+    more work needs to be done to expose additional data to the widget mapper.
+    This is covered by the \l{Combo Widget Mapper Example}{Combo Widget Mapper}
+    and \l{SQL Widget Mapper Example}{SQL Widget Mapper}
+    examples.
+*/
diff --git a/doc/src/examples/sipdialog.qdoc b/doc/src/examples/sipdialog.qdoc
new file mode 100644
index 0000000000..817f5e20d5
--- /dev/null
+++ b/doc/src/examples/sipdialog.qdoc
@@ -0,0 +1,141 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example dialogs/sipdialog
+    \title SIP Dialog Example
+    \ingroup qtce
+
+    The SIP Dialog example shows how to create a dialog that is aware of 
+    the Windows Mobile SIP (Software Input Panel) and reacts to it.
+
+    \table
+    \row \o \inlineimage sipdialog-closed.png
+         \o \inlineimage sipdialog-opened.png
+    \endtable
+
+    Sometimes it is necessary for a dialog to take the SIP into account,
+    as the SIP may hide important input widgets. The SIP Dialog Example
+    shows how a \c Dialog object, \c dialog, can be resized accordingly
+    if the SIP is opened, by embedding the contents of \c dialog in a
+    QScrollArea.
+
+    \section1 Dialog Class Definition
+
+    The \c Dialog class is a subclass of QDialog that implements a public
+    slot, \c desktopResized(), and a public function, \c reactToSIP(). Also,
+    it holds a private instance of QRect, \c desktopGeometry.
+
+    \snippet dialogs/sipdialog/dialog.h Dialog header
+
+    \section1 Dialog Class Implementation
+
+    In the constructor of \c Dialog, we start by obtaining the
+    available geometry of the screen with
+    \l{QDesktopWidget::availableGeometry()}{availableGeometry()}. The
+    parameter used is \c 0 to indicate that we require the primary screen.
+
+    \snippet dialogs/sipdialog/dialog.cpp Dialog constructor part1
+
+    We set the window's title to "SIP Dialog Example" and declare a QScrollArea
+    object, \c scrollArea. Next we instantiate a QGroupBox, \c groupBox, with
+    \c scrollArea as its parent. The title of \c groupBox is also set to
+    "SIP Dialog Example". A QGridLayout object, \c gridLayout, is then used
+    as \c{groupBox}'s layout.
+
+    We create a QLineEdit, a QLabel and a QPushButton and we set the
+    \l{QWidget::setMinimumWidth()}{minimumWidth} property to 220 pixels,
+    respectively.
+
+    \snippet dialogs/sipdialog/dialog.cpp Dialog constructor part2
+
+    Also, all three widgets' text are set accordingly. The
+    \l{QGridLayout::setVerticalSpacing()}{verticalSpacing} property of
+    \c gridLayout is set based on the height of \c desktopGeometry. This
+    is to adapt to the different form factors of Windows Mobile. Then, we
+    add our widgets to the layout.
+
+    \snippet dialogs/sipdialog/dialog.cpp Dialog constructor part3
+
+    The \c{scrollArea}'s widget is set to \c groupBox. We use a QHBoxLayout
+    object, \c layout, to contain \c scrollArea. The \c{Dialog}'s layout
+    is set to \c layout and the scroll area's horizontal scroll bar is turned
+    off.
+
+    \snippet dialogs/sipdialog/dialog.cpp Dialog constructor part4
+
+    The following signals are connected to their respective slots:
+    \list
+        \o \c{button}'s \l{QPushButton::pressed()}{pressed()} signal to
+        \l{QApplication}'s \l{QApplication::closeAllWindows()}
+        {closeAllWindows()} slot,
+        \o \l{QDesktopWidget}'s \l{QDesktopWidget::workAreaResized()}
+        {workAreaResized()} signal to \c{dialog}'s \c desktopResized() slot.
+    \endlist
+
+    \snippet dialogs/sipdialog/dialog.cpp Dialog constructor part5
+
+    The \c desktopResized() function accepts an integer, \a screen,
+    corresponding to the screen's index. We only invoke \c reactToSIP()
+    if \a screen is the primary screen (e.g. index = 0).
+
+    \snippet dialogs/sipdialog/dialog.cpp desktopResized() function
+
+    The \c reactToSIP() function resizes \c dialog accordingly if the
+    desktop's available geometry changed vertically, as this change signifies
+    that the SIP may have been opened or closed.
+
+    \snippet dialogs/sipdialog/dialog.cpp reactToSIP() function
+
+    If the height has decreased, we unset the maximized window state.
+    Otherwise, we set the maximized window state. Lastly, we update
+    \c desktopGeometry to the desktop's available geometry.
+
+    \section1 The \c main() function
+
+    The \c main() function for the SIP Dialog example instantiates \c Dialog
+    and invokes its \l{QDialog::exec()}{exec()} function.
+
+    \snippet dialogs/sipdialog/main.cpp main() function
+
+    \note Although this example uses a dialog, the techniques used here apply to
+    all top-level widgets respectively.
+*/
diff --git a/doc/src/examples/sliders.qdoc b/doc/src/examples/sliders.qdoc
new file mode 100644
index 0000000000..650fdcb8ed
--- /dev/null
+++ b/doc/src/examples/sliders.qdoc
@@ -0,0 +1,269 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example widgets/sliders
+    \title Sliders Example
+
+    Qt provides three types of slider-like widgets: QSlider,
+    QScrollBar and QDial. They all inherit most of their
+    functionality from QAbstractSlider, and can in theory replace
+    each other in an application since the differences only concern
+    their look and feel. This example shows what they look like, how
+    they work and how their behavior and appearance can be
+    manipulated through their properties.
+
+    The example also demonstrates how signals and slots can be used to
+    synchronize the behavior of two or more widgets.
+
+    \image sliders-example.png Screenshot of the Sliders example
+
+    The Sliders example consists of two classes:
+
+    \list
+
+    \o \c SlidersGroup is a custom widget. It combines a QSlider, a
+    QScrollBar and a QDial.
+
+    \o \c Window is the main widget combining a QGroupBox and a
+    QStackedWidget. In this example, the QStackedWidget provides a
+    stack of two \c SlidersGroup widgets. The QGroupBox contain
+    several widgets that control the behavior of the slider-like
+    widgets.
+
+    \endlist
+
+    First we will review the \c Window class, then we
+    will take a look at the \c SlidersGroup class.
+
+    \section1 Window Class Definition
+
+    \snippet examples/widgets/sliders/window.h 0
+
+    The \c Window class inherits from QWidget. It displays the slider
+    widgets and allows the user to set their minimum, maximum and
+    current values and to customize their appearance, key bindings
+    and orientation. We use a private \c createControls() function to
+    create the widgets that provide these controlling mechanisms and
+    to connect them to the slider widgets.
+
+    \section1 Window Class Implementation
+
+    \snippet examples/widgets/sliders/window.cpp 0
+
+    In the constructor we first create the two \c SlidersGroup
+    widgets that display the slider widgets horizontally and
+    vertically, and add them to the QStackedWidget. QStackedWidget
+    provides a stack of widgets where only the top widget is visible.
+    With \c createControls() we create a connection from a
+    controlling widget to the QStackedWidget, making the user able to
+    choose between horizontal and vertical orientation of the slider
+    widgets. The rest of the controlling mechanisms is implemented by
+    the same function call.
+
+    \snippet examples/widgets/sliders/window.cpp 1
+    \snippet examples/widgets/sliders/window.cpp 2
+
+    Then we connect the \c horizontalSliders, \c verticalSliders and
+    \c valueSpinBox to each other, so that the slider widgets and the
+    control widget will behave synchronized when the current value of
+    one of them changes. The \c valueChanged() signal is emitted with
+    the new value as argument. The \c setValue() slot sets the
+    current value of the widget to the new value, and emits \c
+    valueChanged() if the new value is different from the old one.
+
+    We put the group of control widgets and the stacked widget in a
+    horizontal layout before we initialize the minimum, maximum and
+    current values. The initialization of the current value will
+    propagate to the slider widgets through the connection we made
+    between \c valueSpinBox and the \c SlidersGroup widgets. The
+    minimum and maximum values propagate through the connections we
+    created with \c createControls().
+
+    \snippet examples/widgets/sliders/window.cpp 3
+    \snippet examples/widgets/sliders/window.cpp 4
+
+    In the private \c createControls() function, we let a QGroupBox
+    (\c controlsGroup) display the control widgets. A group box can
+    provide a frame, a title and a keyboard shortcut, and displays
+    various other widgets inside itself. The group of control widgets
+    is composed by two checkboxes, three spin boxes (with labels) and
+    one combobox.
+
+    After creating the labels, we create the two checkboxes.
+    Checkboxes are typically used to represent features in an
+    application that can be enabled or disabled. When \c
+    invertedAppearance is enabled, the slider values are inverted.
+    The table below shows the appearance for the different
+    slider-like widgets:
+
+    \table
+    \header \o                \o{2,1} QSlider                   \o{2,1} QScrollBar                \o{2,1} QDial
+    \header \o                \o Normal        \o Inverted      \o Normal        \o Inverted      \o Normal         \o Inverted
+    \row    \o Qt::Horizontal \o Left to right \o Right to left \o Left to right \o Right to left \o Clockwise \o Counterclockwise
+    \row    \o Qt::Vertical   \o Bottom to top \o Top to bottom \o Top to bottom \o Bottom to top \o Clockwise \o Counterclockwise
+    \endtable
+
+    It is common to invert the appearance of a vertical QSlider. A
+    vertical slider that controls volume, for example, will typically
+    go from bottom to top (the non-inverted appearance), whereas a
+    vertical slider that controls the position of an object on screen
+    might go from top to bottom, because screen coordinates go from
+    top to bottom.
+
+    When the \c invertedKeyBindings option is enabled (corresponding
+    to the QAbstractSlider::invertedControls property), the slider's
+    wheel and key events are inverted. The normal key bindings mean
+    that scrolling the mouse wheel "up" or using keys like page up
+    will increase the slider's current value towards its maximum.
+    Inverted, the same wheel and key events will move the value
+    toward the slider's minimum. This can be useful if the \e
+    appearance of a slider is inverted: Some users might expect the
+    keys to still work the same way on the value, whereas others
+    might expect \key PageUp to mean "up" on the screen.
+
+    Note that for horizontal and vertical scroll bars, the key
+    bindings are inverted by default: \key PageDown increases the
+    current value, and \key PageUp decreases it.
+
+    \snippet examples/widgets/sliders/window.cpp 5
+    \snippet examples/widgets/sliders/window.cpp 6
+
+    Then we create the spin boxes. QSpinBox allows the user to choose
+    a value by clicking the up and down buttons or pressing the \key
+    Up and \key Down keys on the keyboard to modify the value
+    currently displayed. The user can also type in the value
+    manually. The spin boxes control the minimum, maximum and current
+    values for the QSlider, QScrollBar, and QDial widgets.
+
+    We create a QComboBox that allows the user to choose the
+    orientation of the slider widgets. The QComboBox widget is a
+    combined button and popup list. It provides a means of presenting
+    a list of options to the user in a way that takes up the minimum
+    amount of screen space.
+
+    \snippet examples/widgets/sliders/window.cpp 7
+    \snippet examples/widgets/sliders/window.cpp 8
+
+    We synchronize the behavior of the control widgets and the slider
+    widgets through their signals and slots. We connect each control
+    widget to both the horizontal and vertical group of slider
+    widgets. We also connect \c orientationCombo to the
+    QStackedWidget, so that the correct "page" is shown. Finally, we
+    lay out the control widgets in a QGridLayout within the \c
+    controlsGroup group box.
+
+    \section1 SlidersGroup Class Definition
+
+    \snippet examples/widgets/sliders/slidersgroup.h 0
+
+    The \c SlidersGroup class inherits from QGroupBox. It provides a
+    frame and a title, and contains a QSlider, a QScrollBar and a
+    QDial.
+
+    We provide a \c valueChanged() signal and a public \c setValue()
+    slot with equivalent functionality to the ones in QAbstractSlider
+    and QSpinBox. In addition, we implement several other public
+    slots to set the minimum and maximum value, and invert the slider
+    widgets' appearance as well as key bindings.
+
+    \section1 SlidersGroup Class Implementation
+
+    \snippet examples/widgets/sliders/slidersgroup.cpp 0
+
+    First we create the slider-like widgets with the appropiate
+    properties. In particular we set the focus policy for each
+    widget. Qt::FocusPolicy is an enum type that defines the various
+    policies a widget can have with respect to acquiring keyboard
+    focus. The Qt::StrongFocus policy means that the widget accepts
+    focus by both tabbing and clicking.
+
+    Then we connect the widgets with each other, so that they will
+    stay synchronized when the current value of one of them changes.
+
+    \snippet examples/widgets/sliders/slidersgroup.cpp 1
+    \snippet examples/widgets/sliders/slidersgroup.cpp 2
+
+    We connect \c {dial}'s \c valueChanged() signal to the
+    \c{SlidersGroup}'s \c valueChanged() signal, to notify the other
+    widgets in the application (i.e., the control widgets) of the
+    changed value.
+
+    \snippet examples/widgets/sliders/slidersgroup.cpp 3
+    \codeline
+    \snippet examples/widgets/sliders/slidersgroup.cpp 4
+
+    Finally, depending on the \l {Qt::Orientation}{orientation} given
+    at the time of construction, we choose and create the layout for
+    the slider widgets within the group box.
+
+    \snippet examples/widgets/sliders/slidersgroup.cpp 5
+    \snippet examples/widgets/sliders/slidersgroup.cpp 6
+
+    The \c setValue() slot sets the value of the QSlider. We don't
+    need to explicitly call
+    \l{QAbstractSlider::setValue()}{setValue()} on the QScrollBar and
+    QDial widgets, since QSlider will emit the
+    \l{QAbstractSlider::valueChanged()}{valueChanged()} signal when
+    its value changes, triggering a domino effect.
+
+    \snippet examples/widgets/sliders/slidersgroup.cpp 7
+    \snippet examples/widgets/sliders/slidersgroup.cpp 8
+    \codeline
+    \snippet examples/widgets/sliders/slidersgroup.cpp 9
+    \snippet examples/widgets/sliders/slidersgroup.cpp 10
+
+    The \c setMinimum() and \c setMaximum() slots are used by the \c
+    Window class to set the range of the QSlider, QScrollBar, and
+    QDial widgets.
+
+    \snippet examples/widgets/sliders/slidersgroup.cpp 11
+    \snippet examples/widgets/sliders/slidersgroup.cpp 12
+    \codeline
+    \snippet examples/widgets/sliders/slidersgroup.cpp 13
+    \snippet examples/widgets/sliders/slidersgroup.cpp 14
+
+    The \c invertAppearance() and \c invertKeyBindings() slots
+    control the child widgets'
+    \l{QAbstractSlider::invertedAppearance}{invertedAppearance} and
+    \l{QAbstractSlider::invertedControls}{invertedControls}
+    properties.
+*/
diff --git a/doc/src/examples/spinboxdelegate.qdoc b/doc/src/examples/spinboxdelegate.qdoc
new file mode 100644
index 0000000000..542eebd29c
--- /dev/null
+++ b/doc/src/examples/spinboxdelegate.qdoc
@@ -0,0 +1,151 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example itemviews/spinboxdelegate
+    \title Spin Box Delegate Example
+
+    The Spin Box Delegate example shows how to create an editor for a custom delegate in
+    the model/view framework by reusing a standard Qt editor widget.
+
+    The model/view framework provides a standard delegate that is used by default
+    with the standard view classes. For most purposes, the selection of editor
+    widgets available through this delegate is sufficient for editing text, boolean
+    values, and other simple data types. However, for specific data types, it is
+    sometimes necessary to use a custom delegate to either display the data in a
+    specific way, or allow the user to edit it with a custom control.
+
+    \image spinboxdelegate-example.png
+
+    This concepts behind this example are covered in the
+    \l{model-view-delegate.html}{Delegate Classes} chapter of the
+    \l{model-view-programming.html}{Model/View Programming} overview.
+
+    \section1 SpinBoxDelegate Class Definition
+
+    The definition of the delegate is as follows:
+
+    \snippet examples/itemviews/spinboxdelegate/delegate.h 0
+
+    The delegate class declares only those functions that are needed to
+    create an editor widget, display it at the correct location in a view,
+    and communicate with a model. Custom delegates can also provide their
+    own painting code by reimplementing the \c paintEvent() function.
+
+    \section1 SpinBoxDelegate Class Implementation
+
+    Since the delegate is stateless, the constructor only needs to
+    call the base class's constructor with the parent QObject as its
+    argument:
+
+    \snippet examples/itemviews/spinboxdelegate/delegate.cpp 0
+
+    Since the delegate is a subclass of QItemDelegate, the data it retrieves
+    from the model is displayed in a default style, and we do not need to
+    provide a custom \c paintEvent().
+
+    The \c createEditor() function returns an editor widget, in this case a
+    spin box that restricts values from the model to integers from 0 to 100
+    inclusive.
+
+    \snippet examples/itemviews/spinboxdelegate/delegate.cpp 1
+
+    We install an event filter on the spin box to ensure that it behaves in
+    a way that is consistent with other delegates. The implementation for
+    the event filter is provided by the base class.
+
+    The \c setEditorData() function reads data from the model, converts it
+    to an integer value, and writes it to the editor widget.
+
+    \snippet examples/itemviews/spinboxdelegate/delegate.cpp 2
+
+    Since the view treats delegates as ordinary QWidget instances, we have
+    to use a static cast before we can set the value in the spin box.
+
+    The \c setModelData() function reads the contents of the spin box, and
+    writes it to the model.
+
+    \snippet examples/itemviews/spinboxdelegate/delegate.cpp 3
+
+    We call \l{QSpinBox::interpretText()}{interpretText()} to make sure that
+    we obtain the most up-to-date value in the spin box.
+
+    The \c updateEditorGeometry() function updates the editor widget's
+    geometry using the information supplied in the style option. This is the
+    minimum that the delegate must do in this case.
+
+    \snippet examples/itemviews/spinboxdelegate/delegate.cpp 4
+
+    More complex editor widgets may divide the rectangle available in
+    \c{option.rect} between different child widgets if required.
+
+    \section1 The Main Function
+
+    This example is written in a slightly different way to many of the
+    other examples supplied with Qt. To demonstrate the use of a custom
+    editor widget in a standard view, it is necessary to set up a model
+    containing some arbitrary data and a view to display it.
+
+    We set up the application in the normal way, construct a standard item
+    model to hold some data, set up a table view to use the data in the
+    model, and construct a custom delegate to use for editing:
+
+    \snippet examples/itemviews/spinboxdelegate/main.cpp 0
+
+    The table view is informed about the delegate, and will use it to
+    display each of the items. Since the delegate is a subclass of
+    QItemDelegate, each cell in the table will be rendered using standard
+    painting operations.
+
+    We insert some arbitrary data into the model for demonstration purposes:
+
+    \snippet examples/itemviews/spinboxdelegate/main.cpp 1
+    \snippet examples/itemviews/spinboxdelegate/main.cpp 2
+
+    Finally, the table view is displayed with a window title, and we start
+    the application's event loop:
+
+    \snippet examples/itemviews/spinboxdelegate/main.cpp 3
+
+    Each of the cells in the table can now be edited in the usual way, but
+    the spin box ensures that the data returned to the model is always
+    constrained by the values allowed by the spin box delegate.
+*/
diff --git a/doc/src/examples/spinboxes.qdoc b/doc/src/examples/spinboxes.qdoc
new file mode 100644
index 0000000000..d8b0daa358
--- /dev/null
+++ b/doc/src/examples/spinboxes.qdoc
@@ -0,0 +1,205 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \example widgets/spinboxes
+    \title Spin Boxes Example
+
+    The Spin Boxes example shows how to use the many different types of spin boxes
+    available in Qt, from a simple QSpinBox widget to more complex editors like
+    the QDateTimeEdit widget.
+
+    \image spinboxes-example.png
+
+    The example consists of a single \c Window class that is used to display the
+    different spin box-based widgets available with Qt.
+
+    \section1 Window Class Definition
+
+    The \c Window class inherits QWidget and contains two slots that are used
+    to provide interactive features:
+
+    \snippet examples/widgets/spinboxes/window.h 0
+
+    The private functions are used to set up each type of spin box in the window.
+    We use member variables to keep track of various widgets so that they can
+    be reconfigured when required.
+
+    \section1 Window Class Implementation
+
+    The constructor simply calls private functions to set up the different types
+    of spin box used in the example, and places each group in a layout:
+
+    \snippet examples/widgets/spinboxes/window.cpp 0
+
+    We use the layout to manage the arrangement of the window's child widgets,
+    and change the window title.
+
+    The \c createSpinBoxes() function constructs a QGroupBox and places three
+    QSpinBox widgets inside it with descriptive labels to indicate the types of
+    input they expect.
+
+    \snippet examples/widgets/spinboxes/window.cpp 1
+
+    The first spin box shows the simplest way to use QSpinBox. It accepts values
+    from -20 to 20, the current value can be increased or decreased by 1 with
+    either the arrow buttons or \key{Up} and \key{Down} keys, and the default
+    value is 0.
+
+    The second spin box uses a larger step size and displays a suffix to
+    provide more information about the type of data the number represents:
+
+    \snippet examples/widgets/spinboxes/window.cpp 2
+
+    This spin box also displays a
+    \l{QAbstractSpinBox::specialValueText}{special value} instead of the minimum
+    value defined for it. This means that it will never show \gui{0%}, but will
+    display \gui{Automatic} when the minimum value is selected.
+
+    The third spin box shows how a prefix can be used:
+
+    \snippet examples/widgets/spinboxes/window.cpp 4
+
+    For simplicity, we show a spin box with a prefix and no suffix. It is also
+    possible to use both at the same time.
+
+    \snippet examples/widgets/spinboxes/window.cpp 5
+
+    The rest of the function sets up a layout for the group box and places each
+    of the widgets inside it.
+
+    The \c createDateTimeEdits() function constructs another group box with a
+    selection of spin boxes used for editing dates and times.
+
+    \snippet examples/widgets/spinboxes/window.cpp 6
+
+    The first spin box is a QDateEdit widget that is able to accept dates
+    within a given range specified using QDate values. The arrow buttons and
+    \key{Up} and \key{Down} keys can be used to increase and decrease the
+    values for year, month, and day when the cursor is in the relevant section.
+
+    The second spin box is a QTimeEdit widget:
+
+    \snippet examples/widgets/spinboxes/window.cpp 7
+
+    Acceptable values for the time are defined using QTime values.
+
+    The third spin box is a QDateTimeEdit widget that can display both date and
+    time values, and we place a label above it to indicate the range of allowed
+    times for a meeting. These widgets will be updated when the user changes a
+    format string.
+
+    \snippet examples/widgets/spinboxes/window.cpp 8
+
+    The format string used for the date time editor, which is also shown in the
+    string displayed by the label, is chosen from a set of strings in a combobox:
+
+    \snippet examples/widgets/spinboxes/window.cpp 9
+    \codeline
+    \snippet examples/widgets/spinboxes/window.cpp 10
+
+    A signal from this combobox is connected to a slot in the \c Window class
+    (shown later).
+
+    \snippet examples/widgets/spinboxes/window.cpp 11
+
+    Each child widget of the group box in placed in a layout.
+
+    The \c setFormatString() slot is called whenever the user selects a new
+    format string in the combobox. The display format for the QDateTimeEdit
+    widget is set using the raw string passed by the signal:
+
+    \snippet examples/widgets/spinboxes/window.cpp 12
+
+    Depending on the visible sections in the widget, we set a new date or time
+    range, and update the associated label to provide relevant information for
+    the user:
+
+    \snippet examples/widgets/spinboxes/window.cpp 13
+
+    When the format string is changed, there will be an appropriate label and
+    entry widget for dates, times, or both types of input.
+
+    The \c createDoubleSpinBoxes() function constructs three spin boxes that are
+    used to input double-precision floating point numbers:
+
+    \snippet examples/widgets/spinboxes/window.cpp 14
+
+    Before the QDoubleSpinBox widgets are constructed, we create a spin box to
+    control how many decimal places they show. By default, only two decimal places
+    are shown in the following spin boxes, each of which is the equivalent of a
+    spin box in the group created by the \c createSpinBoxes() function.
+
+    The first double spin box shows a basic double-precision spin box with the
+    same range, step size, and default value as the first spin box in the
+    \c createSpinBoxes() function:
+
+    \snippet examples/widgets/spinboxes/window.cpp 15
+
+    However, this spin box also allows non-integer values to be entered.
+
+    The second spin box displays a suffix and shows a special value instead
+    of the minimum value:
+
+    \snippet examples/widgets/spinboxes/window.cpp 16
+
+    The third spin box displays a prefix instead of a suffix:
+
+    \snippet examples/widgets/spinboxes/window.cpp 17
+
+    We connect the QSpinBox widget that specifies the precision to a slot in
+    the \c Window class.
+
+    \snippet examples/widgets/spinboxes/window.cpp 18
+
+    The rest of the function places each of the widgets into a layout for the
+    group box.
+
+    The \c changePrecision() slot is called when the user changes the value in
+    the precision spin box:
+
+    \snippet examples/widgets/spinboxes/window.cpp 19
+
+    This function simply uses the integer supplied by the signal to specify the
+    number of decimal places in each of the QDoubleSpinBox widgets. Each one
+    of these will be updated automatically when their
+    \l{QDoubleSpinBox::decimals}{decimals} property is changed.
+*/
diff --git a/doc/src/examples/sqlwidgetmapper.qdoc b/doc/src/examples/sqlwidgetmapper.qdoc
new file mode 100644
index 0000000000..173aea4217
--- /dev/null
+++ b/doc/src/examples/sqlwidgetmapper.qdoc
@@ -0,0 +1,199 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example sql/sqlwidgetmapper
+    \title SQL Widget Mapper Example
+
+    The SQL Widget Mapper example shows how to use a map information from a
+    database to widgets on a form.
+
+    \image sql-widget-mapper.png
+
+    In the \l{Combo Widget Mapper Example}, we showed how to use a named
+    mapping between a widget mapper and a QComboBox widget with a special
+    purpose model to relate values in the model to a list of choices.
+
+    Again, we create a \c Window class with an almost identical user interface,
+    providing a combo box to allow their addresses to be classified as "Home",
+    "Work" or "Other". However, instead of using a separate model to hold these
+    address types, we use one database table to hold the example data and
+    another to hold the address types. In this way, we store all the
+    information in the same place.
+
+    \section1 Window Class Definition
+
+    The class provides a constructor, a slot to keep the buttons up to date,
+    and a private function to set up the model:
+
+    \snippet examples/sql/sqlwidgetmapper/window.h Window definition
+
+    In addition to the QDataWidgetMapper object and the controls used to make
+    up the user interface, we use a QStandardItemModel to hold our data and
+    a QStringListModel to hold information about the types of address that
+    can be applied to each person's data.
+
+    \section1 Window Class Implementation
+
+    The first act performed by the \c Window class constructor is to set up
+    the model used to hold the example data. Since this is a key part of the
+    example, we will look at this first.
+
+    The model is initialized in the window's \c{setupModel()} function. Here,
+    we create a SQLite database containing a "person" table with primary key,
+    name, address and type fields.
+
+    \snippet examples/sql/sqlwidgetmapper/window.cpp Set up the main table
+
+    On each row of the table, we insert default values for these fields,
+    including values for the address types that correspond to the address
+    types are stored in a separate table.
+
+    \image widgetmapper-sql-mapping-table.png
+
+    We create an "addresstype" table containing the identifiers used in the
+    "person" table and the corresponding strings:
+
+    \snippet examples/sql/sqlwidgetmapper/window.cpp Set up the address type table
+
+    The "typeid" field in the "person" table is related to the contents of
+    the "addresstype" table via a relation in a QSqlRelationalTableModel.
+    This kind of model performs all the necessary work to store the data in
+    a database and also allows any relations to be used as models in their
+    own right.
+
+    In this case, we have defined a relation for the "typeid" field in the
+    "person" table that relates it to the "id" field in the "addresstype"
+    table and which causes the contents of the "description" field to be
+    used wherever the "typeid" is presented to the user. (See the
+    QSqlRelationalTableModel::setRelation() documentation for details.)
+
+    \image widgetmapper-sql-mapping.png
+
+    The constructor of the \c Window class can be explained in three parts.
+    In the first part, we set up the model used to hold the data, then we set
+    up the widgets used for the user interface:
+
+    \snippet examples/sql/sqlwidgetmapper/window.cpp Set up widgets
+
+    We obtain a model for the combo box from the main model, based on the
+    relation we set up for the "typeid" field. The call to the combo box's
+    \l{QComboBox::}{setModelColumn()} selects the field in the field in the
+    model to display.
+
+    Note that this approach is similar to the one used in the
+    \l{Combo Widget Mapper Example} in that we set up a model for the
+    combo box. However, in this case, we obtain a model based on a relation
+    in the QSqlRelationalTableModel rather than create a separate one.
+
+    Next, we set up the widget mapper, relating each input widget to a field
+    in the model:
+
+    \snippet examples/sql/sqlwidgetmapper/window.cpp Set up the mapper
+
+    For the combo box, we already know the index of the field in the model
+    from the \c{setupModel()} function. We use a QSqlRelationalDelegate as
+    a proxy between the mapper and the input widgets to match up the "typeid"
+    values in the model with those in the combo box's model and populate the
+    combo box with descriptions rather than integer values.
+
+    As a result, the user is able to select an item from the combo box,
+    and the associated value is written back to the model.
+
+    The rest of the constructor is very similar to that of the
+    \l{Simple Widget Mapper Example}:
+
+    \snippet examples/sql/sqlwidgetmapper/window.cpp Set up connections and layouts
+
+    We show the implementation of the \c{updateButtons()} slot for
+    completeness:
+
+    \snippet examples/sql/sqlwidgetmapper/window.cpp Slot for updating the buttons
+
+    \omit
+    \section1 Delegate Class Definition and Implementation
+
+    The delegate we use to mediate interaction between the widget mapper and
+    the input widgets is a small QItemDelegate subclass:
+
+    \snippet examples/sql/sqlwidgetmapper/delegate.h Delegate class definition
+
+    This provides implementations of the two standard functions used to pass
+    data between editor widgets and the model (see the \l{Delegate Classes}
+    documentation for a more general description of these functions).
+
+    Since we only provide an empty implementation of the constructor, we
+    concentrate on the other two functions.
+
+    The \l{QItemDelegate::}{setEditorData()} implementation takes the data
+    referred to by the model index supplied and processes it according to
+    the presence of a \c currentIndex property in the editor widget:
+
+    \snippet examples/sql/sqlwidgetmapper/delegate.cpp setEditorData implementation
+
+    If, like QComboBox, the editor widget has this property, it is set using
+    the value from the model. Since we are passing around QVariant values,
+    the strings stored in the model are automatically converted to the integer
+    values needed for the \c currentIndex property.
+
+    As a result, instead of showing "0", "1" or "2" in the combo box, one of
+    its predefined set of items is shown. We call QItemDelegate::setEditorData()
+    for widgets without the \c currentIndex property.
+
+    The \l{QItemDelegate::}{setModelData()} implementation performs the reverse
+    process, taking the value stored in the widget's \c currentIndex property
+    and storing it back in the model:
+
+    \snippet examples/sql/sqlwidgetmapper/delegate.cpp setModelData implementation
+    \endomit
+
+    \section1 Summary and Further Reading
+
+    The use of a separate model for the combo box and a special delegate for the
+    widget mapper allows us to present a menu of choices to the user. Although
+    the choices are stored in the same database as the user's data, they are held
+    in a separate table. Using this approach, we can reconstructed complete records
+    at a later time while using database features appropriately.
+
+    If SQL models are not being used, it is still possible to use more than
+    one model to present choices to the user. This is covered by the
+    \l{Combo Widget Mapper Example}.
+*/
diff --git a/doc/src/examples/standarddialogs.qdoc b/doc/src/examples/standarddialogs.qdoc
new file mode 100644
index 0000000000..db533ed5f7
--- /dev/null
+++ b/doc/src/examples/standarddialogs.qdoc
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \example dialogs/standarddialogs
+    \title Standard Dialogs Example
+
+    The Standard Dialogs example shows the standard dialogs that are provided by Qt.
+
+    \image standarddialogs-example.png
+*/
diff --git a/doc/src/examples/stardelegate.qdoc b/doc/src/examples/stardelegate.qdoc
new file mode 100644
index 0000000000..fde33168d9
--- /dev/null
+++ b/doc/src/examples/stardelegate.qdoc
@@ -0,0 +1,310 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example itemviews/stardelegate
+    \title Star Delegate Example
+
+    The Star Delegate example shows how to create a delegate that
+    can paint itself and that supports editing.
+
+    \image stardelegate.png The Star Delegate Example
+
+    When displaying data in a QListView, QTableView, or QTreeView,
+    the individual items are drawn by a
+    \l{Delegate Classes}{delegate}. Also, when the user starts
+    editing an item (e.g., by double-clicking the item), the delegate
+    provides an editor widget that is placed on top of the item while
+    editing takes place.
+
+    Delegates are subclasses of QAbstractItemDelegate. Qt provides
+    QItemDelegate, which inherits QAbstractItemDelegate and handles
+    the most common data types (notably \c int and QString). If we
+    need to support custom data types, or want to customize the
+    rendering or the editing for existing data types, we can subclass
+    QAbstractItemDelegate or QItemDelegate. See \l{Delegate Classes}
+    for more information about delegates, and \l{Model/View
+    Programming} if you need a high-level introduction to Qt's
+    model/view architecture (including delegates).
+
+    In this example, we will see how to implement a custom delegate
+    to render and edit a "star rating" data type, which can store
+    values such as "1 out of 5 stars".
+
+    The example consists of the following classes:
+
+    \list
+    \o \c StarRating is the custom data type. It stores a rating
+       expressed as stars, such as "2 out of 5 stars" or "5 out of
+       6 stars".
+
+    \o \c StarDelegate inherits QItemDelegate and provides support
+       for \c StarRating (in addition to the data types already
+       handled by QItemDelegate).
+
+    \o \c StarEditor inherits QWidget and is used by \c StarDelegate
+       to let the user edit a star rating using the mouse.
+    \endlist
+
+    To show the \c StarDelegate in action, we will fill a
+    QTableWidget with some data and install the delegate on it.
+
+    \section1 StarDelegate Class Definition
+
+    Here's the definition of the \c StarDelegate class:
+
+    \snippet examples/itemviews/stardelegate/stardelegate.h 0
+
+    All public functions are reimplemented virtual functions from
+    QItemDelegate to provide custom rendering and editing.
+
+    \section1 StarDelegate Class Implementation
+
+    The \l{QAbstractItemDelegate::}{paint()} function is
+    reimplemented from QItemDelegate and is called whenever the view
+    needs to repaint an item:
+
+    \snippet examples/itemviews/stardelegate/stardelegate.cpp 0
+
+    The function is invoked once for each item, represented by a
+    QModelIndex object from the model. If the data stored in the item
+    is a \c StarRating, we paint it ourselves; otherwise, we let
+    QItemDelegate paint it for us. This ensures that the \c
+    StarDelegate can handle the most common data types.
+
+    In the case where the item is a \c StarRating, we draw the
+    background if the item is selected, and we draw the item using \c
+    StarRating::paint(), which we will review later.
+
+    \c{StartRating}s can be stored in a QVariant thanks to the
+    Q_DECLARE_METATYPE() macro appearing in \c starrating.h. More on
+    this later.
+
+    The \l{QAbstractItemDelegate::}{createEditor()} function is
+    called when the user starts editing an item:
+
+    \snippet examples/itemviews/stardelegate/stardelegate.cpp 2
+
+    If the item is a \c StarRating, we create a \c StarEditor and
+    connect its \c editingFinished() signal to our \c
+    commitAndCloseEditor() slot, so we can update the model when the
+    editor closes.
+
+    Here's the implementation of \c commitAndCloseEditor():
+
+    \snippet examples/itemviews/stardelegate/stardelegate.cpp 5
+
+    When the user is done editing, we emit
+    \l{QAbstractItemDelegate::}{commitData()} and
+    \l{QAbstractItemDelegate::}{closeEditor()} (both declared in
+    QAbstractItemDelegate), to tell the model that there is edited
+    data and to inform the view that the editor is no longer needed.
+
+    The \l{QAbstractItemDelegate::}{setEditorData()} function is
+    called when an editor is created to initialize it with data
+    from the model:
+
+    \snippet examples/itemviews/stardelegate/stardelegate.cpp 3
+
+    We simply call \c setStarRating() on the editor.
+
+    The \l{QAbstractItemDelegate::}{setModelData()} function is
+    called when editing is finished, to commit data from the editor
+    to the model:
+
+    \snippet examples/itemviews/stardelegate/stardelegate.cpp 4
+
+    The \c sizeHint() function returns an item's preferred size:
+
+    \snippet examples/itemviews/stardelegate/stardelegate.cpp 1
+
+    We simply forward the call to \c StarRating.
+
+    \section1 StarEditor Class Definition
+
+    The \c StarEditor class was used when implementing \c
+    StarDelegate. Here's the class definition:
+
+    \snippet examples/itemviews/stardelegate/stareditor.h 0
+
+    The class lets the user edit a \c StarRating by moving the mouse
+    over the editor. It emits the \c editingFinished() signal when
+    the user clicks on the editor.
+
+    The protected functions are reimplemented from QWidget to handle
+    mouse and paint events. The private function \c starAtPosition()
+    is a helper function that returns the number of the star under
+    the mouse pointer.
+
+    \section1 StarEditor Class Implementation
+
+    Let's start with the constructor:
+
+    \snippet examples/itemviews/stardelegate/stareditor.cpp 0
+
+    We enable \l{QWidget::setMouseTracking()}{mouse tracking} on the
+    widget so we can follow the cursor even when the user doesn't
+    hold down any mouse button. We also turn on QWidget's
+    \l{QWidget::autoFillBackground}{auto-fill background} feature to
+    obtain an opaque background. (Without the call, the view's
+    background would shine through the editor.)
+
+    The \l{QWidget::}{paintEvent()} function is reimplemented from
+    QWidget:
+
+    \snippet examples/itemviews/stardelegate/stareditor.cpp 1
+
+    We simply call \c StarRating::paint() to draw the stars, just
+    like we did when implementing \c StarDelegate.
+
+    \snippet examples/itemviews/stardelegate/stareditor.cpp 2
+
+    In the mouse event handler, we call \c setStarCount() on the
+    private data member \c myStarRating to reflect the current cursor
+    position, and we call QWidget::update() to force a repaint.
+
+    \snippet examples/itemviews/stardelegate/stareditor.cpp 3
+
+    When the user releases a mouse button, we simply emit the \c
+    editingFinished() signal.
+
+    \snippet examples/itemviews/stardelegate/stareditor.cpp 4
+
+    The \c starAtPosition() function uses basic linear algebra to
+    find out which star is under the cursor.
+
+    \section1 StarRating Class Definition
+
+    \snippet examples/itemviews/stardelegate/starrating.h 0
+    \codeline
+    \snippet examples/itemviews/stardelegate/starrating.h 1
+
+    The \c StarRating class represents a rating as a number of stars.
+    In addition to holding the data, it is also capable of painting
+    the stars on a QPaintDevice, which in this example is either a
+    view or an editor. The \c myStarCount member variable stores the
+    current rating, and \c myMaxStarCount stores the highest possible
+    rating (typically 5).
+
+    The Q_DECLARE_METATYPE() macro makes the type \c StarRating known
+    to QVariant, making it possible to store \c StarRating values in
+    QVariant.
+
+    \section1 StarRating Class Implementation
+
+    The constructor initializes \c myStarCount and \c myMaxStarCount,
+    and sets up the polygons used to draw stars and diamonds:
+
+    \snippet examples/itemviews/stardelegate/starrating.cpp 0
+
+    The \c paint() function paints the stars in this \c StarRating
+    object on a paint device:
+
+    \snippet examples/itemviews/stardelegate/starrating.cpp 2
+
+    We first set the pen and brush we will use for painting. The \c
+    mode parameter can be either \c Editable or \c ReadOnly. If \c
+    mode is editable, we use the \l{QPalette::}{Highlight} color
+    instead of the \l{QPalette::}{Foreground} color to draw the
+    stars.
+
+    Then we draw the stars. If we are in \c Edit mode, we paint
+    diamonds in place of stars if the rating is less than the highest
+    rating.
+
+    The \c sizeHint() function returns the preferred size for an area
+    to paint the stars on:
+
+    \snippet examples/itemviews/stardelegate/starrating.cpp 1
+
+    The preferred size is just enough to paint the maximum number of
+    stars. The function is called by both \c StarDelegate::sizeHint()
+    and \c StarEditor::sizeHint().
+
+    \section1 The \c main() Function
+
+    Here's the program's \c main() function:
+
+    \snippet examples/itemviews/stardelegate/main.cpp 5
+
+    The \c main() function creates a QTableWidget and sets a \c
+    StarDelegate on it. \l{QAbstractItemView::}{DoubleClicked} and
+    \l{QAbstractItemView::}{SelectedClicked} are set as
+    \l{QAbstractItemView::editTriggers()}{edit triggers}, so that the
+    editor is opened with a single click when the star rating item is
+    selected.
+    
+    The \c populateTableWidget() function fills the QTableWidget with
+    data:
+
+    \snippet examples/itemviews/stardelegate/main.cpp 0
+    \snippet examples/itemviews/stardelegate/main.cpp 1
+    \dots
+    \snippet examples/itemviews/stardelegate/main.cpp 2
+    \snippet examples/itemviews/stardelegate/main.cpp 3
+    \codeline
+    \snippet examples/itemviews/stardelegate/main.cpp 4
+
+    Notice the call to qVariantFromValue to convert a \c
+    StarRating to a QVariant.
+
+    \section1 Possible Extensions and Suggestions
+
+    There are many ways to customize Qt's \l{Model/View
+    Programming}{model/view framework}. The approach used in this
+    example is appropriate for most custom delegates and editors.
+    Examples of possibilities not used by the star delegate and star
+    editor are:
+
+    \list
+    \o It is possible to open editors programmatically by calling
+       QAbstractItemView::edit(), instead of relying on edit
+       triggers. This could be use to support other edit triggers
+       than those offered by the QAbstractItemView::EditTrigger enum.
+       For example, in the Star Delegate example, hovering over an
+       item with the mouse might make sense as a way to pop up an
+       editor.
+
+    \o By reimplementing QAbstractItemDelegate::editorEvent(), it is
+       possible to implement the editor directly in the delegate,
+       instead of creating a separate QWidget subclass.
+    \endlist
+*/
diff --git a/doc/src/examples/styleplugin.qdoc b/doc/src/examples/styleplugin.qdoc
new file mode 100644
index 0000000000..0dea7bfdd1
--- /dev/null
+++ b/doc/src/examples/styleplugin.qdoc
@@ -0,0 +1,147 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example tools/styleplugin
+    \title Style Plugin Example
+
+    This example shows how to create a plugin that extends Qt with a new 
+    GUI look and feel. 
+
+    \image stylepluginexample.png
+
+    On some platforms, the native style will prevent the button
+    from having a red background. In this case, try to run the example
+    in another style (e.g., plastique).
+
+    A plugin in Qt is a class stored in a shared library that can be
+    loaded by a QPluginLoader at run-time. When you create plugins in
+    Qt, they either extend a Qt application or Qt itself. Writing a
+    plugin that extends Qt itself is achieved by inheriting one of the
+    plugin \l{Plugin Classes}{base classes}, reimplementing functions
+    from that class, and adding a macro. In this example we extend Qt
+    by adding a new GUI look and feel (i.e., making a new QStyle
+    available). A high-level introduction to plugins is given in the
+    plugin \l{How to Create Qt Plugins}{overview document}. 
+
+    Plugins that provide new styles inherit the QStylePlugin base
+    class. Style plugins are loaded by Qt and made available through
+    QStyleFactory; we will look at this later. We have implemented \c
+    SimpleStylePlugin, which provides \c SimpleStyle. The new style
+    inherits QWindowsStyle and contributes to widget styling by
+    drawing button backgrounds in red - not a major contribution, but
+    it still makes a new style. We test the plugin with \c
+    StyleWindow, in which we display a QPushButton.
+
+    The \c SimpleStyle and \c StyleWindow classes do not contain any
+    plugin specific functionality and their implementations are
+    trivial; we will therefore leap past them and head on to the \c
+    SimpleStylePlugin and the \c main() function. After we have looked
+    at that, we examine the plugin's profile.
+
+
+    \section1 SimpleStylePlugin Class Definition
+
+    \c SimpleStylePlugin inherits QStylePlugin and is the plugin
+    class. 
+
+    \snippet examples/tools/styleplugin/plugin/simplestyleplugin.h 0
+
+    \c keys() returns a list of style names that this plugin can
+    create, while \c create() takes such a string and returns the
+    QStyle corresponding to the key. Both functions are pure virtual
+    functions reimplemented from QStylePlugin. When an application
+    requests an instance of the \c SimpleStyle style, which this
+    plugin creates, Qt will create it with this plugin.
+
+
+    \section1 SimpleStylePlugin Class Implementation
+
+    Here is the implementation of \c keys():
+
+    \snippet examples/tools/styleplugin/plugin/simplestyleplugin.cpp 0
+
+    Since this plugin only supports one style, we return a QStringList
+    with the class name of that style.
+
+    Here is the \c create() function:
+
+    \snippet examples/tools/styleplugin/plugin/simplestyleplugin.cpp 1
+
+    Note that the key for style plugins are case insensitive.
+    The case sensitivity varies from plugin to plugin, so you need to
+    check this when implementing new plugins.
+
+    \section1 The \c main() function
+
+    \snippet examples/tools/styleplugin/stylewindow/main.cpp 0
+
+    Qt loads the available style plugins when the QApplication object
+    is initialized. The QStyleFactory class knows about all styles and
+    produces them with \l{QStyleFactory::}{create()} (it is a
+    wrapper around all the style plugins).
+
+    \section1 The Simple Style Plugin Profile
+
+    The \c SimpleStylePlugin lives in its own directory and have
+    its own profile:
+
+    \snippet examples/tools/styleplugin/plugin/plugin.pro 0
+
+    In the plugin profile we need to set the lib template as we are
+    building a shared library instead of an executable. We must also
+    set the config to plugin. We set the library to be stored in the
+    styles folder under stylewindow because this is a path in which Qt
+    will search for style plugins.
+
+    \section1 Related articles and examples
+
+    In addition to the plugin \l{How to Create Qt Plugins}{overview
+    document}, we have other examples and articles that concern
+    plugins.
+
+    In the \l{Echo Plugin Example}{echo plugin example} we show how to
+    implement plugins that extends Qt applications rather than Qt
+    itself, which is the case with the style plugin of this example.
+    The \l{Plug & Paint Example}{plug & paint} example shows how to
+    implement a static plugin as well as being a more involved example
+    on plugins that extend applications.
+*/
diff --git a/doc/src/examples/styles.qdoc b/doc/src/examples/styles.qdoc
new file mode 100644
index 0000000000..b68a310137
--- /dev/null
+++ b/doc/src/examples/styles.qdoc
@@ -0,0 +1,486 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example widgets/styles
+    \title Styles Example
+
+    The Styles example illustrates how to create custom widget
+    drawing styles using Qt, and demonstrates Qt's predefined styles.
+
+    \image styles-enabledwood.png Screenshot of the Styles example
+
+    A style in Qt is a subclass of QStyle or of one of its
+    subclasses. Styles perform drawing on behalf of widgets. Qt
+    provides a whole range of predefined styles, either built into
+    the \l QtGui library or found in plugins. Custom styles are
+    usually created by subclassing one of Qt's existing style and
+    reimplementing a few virtual functions.
+
+    In this example, the custom style is called \c NorwegianWoodStyle
+    and derives from QMotifStyle. Its main features are the wooden
+    textures used for filling most of the widgets and its round
+    buttons and comboboxes.
+
+    To implement the style, we use some advanced features provided by
+    QPainter, such as \l{QPainter::Antialiasing}{antialiasing} (to
+    obtain smoother button edges), \l{QColor::alpha()}{alpha blending}
+    (to make the buttons appeared raised or sunken), and
+    \l{QPainterPath}{painter paths} (to fill the buttons and draw the
+    outline). We also use many features of QBrush and QPalette.
+
+    The example consists of the following classes:
+
+    \list
+    \o \c NorwegianWoodStyle inherits from QMotifStyle and implements
+        the Norwegian Wood style.
+    \o \c WidgetGallery is a \c QDialog subclass that shows the most
+       common widgets and allows the user to switch style
+       dynamically.
+    \endlist
+
+    \section1 NorwegianWoodStyle Class Definition
+
+    Here's the definition of the \c NorwegianWoodStyle class:
+
+    \snippet examples/widgets/styles/norwegianwoodstyle.h 0
+
+    The public functions are all declared in QStyle (QMotifStyle's
+    grandparent class) and reimplemented here to override the Motif
+    look and feel. The private functions are helper functions.
+
+    \section1 NorwegianWoodStyle Class Implementation
+
+    We will now review the implementation of the \c
+    NorwegianWoodStyle class.
+
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 0
+
+    The \c polish() function is reimplemented from QStyle. It takes a
+    QPalette as a reference and adapts the palette to fit the style.
+    Most styles don't need to reimplement that function. The
+    Norwegian Wood style reimplements it to set a "wooden" palette.
+
+    We start by defining a few \l{QColor}s that we'll need. Then we
+    load two PNG images. The \c : prefix in the file path indicates
+    that the PNG files are \l{The Qt Resource System}{embedded
+    resources}.
+
+    \table
+    \row \o \inlineimage widgets/styles/images/woodbackground.png
+
+         \o \bold{woodbackground.png}
+
+            This texture is used as the background of most widgets.
+            The wood pattern is horizontal.
+
+    \row \o \inlineimage widgets/styles/images/woodbutton.png
+
+         \o \bold{woodbutton.png}
+
+            This texture is used for filling push buttons and
+            comboboxes. The wood pattern is vertical and more reddish
+            than the texture used for the background.
+    \endtable
+
+    The \c midImage variable is initialized to be the same as \c
+    buttonImage, but then we use a QPainter and fill it with a 25%
+    opaque black color (a black with an \l{QColor::alpha()}{alpha
+    channel} of 63). The result is a somewhat darker image than \c
+    buttonImage. This image will be used for filling buttons that the
+    user is holding down.
+
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 1
+
+    We initialize the palette. Palettes have various
+    \l{QPalette::ColorRole}{color roles}, such as QPalette::Base
+    (used for filling text editors, item views, etc.), QPalette::Text
+    (used for foreground text), and QPalette::Background (used for
+    the background of most widgets). Each role has its own QBrush,
+    which usually is a plain color but can also be a brush pattern or
+    even a texture (a QPixmap).
+
+    In addition to the roles, palettes have several
+    \l{QPalette::ColorGroup}{color groups}: active, disabled, and
+    inactive. The active color group is used for painting widgets in
+    the active window. The disabled group is used for disabled
+    widgets. The inactive group is used for all other widgets. Most
+    palettes have identical active and inactive groups, while the
+    disabled group uses darker shades.
+
+    We initialize the QPalette object with a brown color. Qt
+    automatically derivates all color roles for all color groups from
+    that single color. We then override some of the default values. For
+    example, we use Qt::darkGreen instead of the default
+    (Qt::darkBlue) for the QPalette::Highlight role. The
+    QPalette::setBrush() overload that we use here sets the same
+    color or brush for all three color groups.
+
+    The \c setTexture() function is a private function that sets the
+    texture for a certain color role, while preserving the existing
+    color in the QBrush. A QBrush can hold both a solid color and a
+    texture at the same time. The solid color is used for drawing
+    text and other graphical elements where textures don't look good.
+
+    At the end, we set the brush for the disabled color group of the
+    palette. We use \c woodbackground.png as the texture for all
+    disabled widgets, including buttons, and use a darker color to
+    accompany the texture.
+
+    \image styles-disabledwood.png The Norwegian Wood style with disabled widgets
+
+    Let's move on to the other functions reimplemented from
+    QMotifStyle:
+
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 3
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 4
+
+    This QStyle::polish() overload is called once on every widget
+    drawn using the style. We reimplement it to set the Qt::WA_Hover
+    attribute on \l{QPushButton}s and \l{QComboBox}es. When this
+    attribute is set, Qt generates paint events when the mouse
+    pointer enters or leaves the widget. This makes it possible to
+    render push buttons and comboboxes differently when the mouse
+    pointer is over them.
+
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 5
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 6
+
+    This QStyle::unpolish() overload is called to undo any
+    modification done to the widget in \c polish(). For simplicity,
+    we assume that the flag wasn't set before \c polish() was called.
+    In an ideal world, we would remember the original state for each
+    widgets (e.g., using a QMap<QWidget *, bool>) and restore it in
+    \c unpolish().
+
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 7
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 8
+
+    The \l{QStyle::pixelMetric()}{pixelMetric()} function returns the
+    size in pixels for a certain user interface element. By
+    reimplementing this function, we can affect the way certain
+    widgets are drawn and their size hint. Here, we return 8 as the
+    width around a shown in a QComboBox, ensuring that there is
+    enough place around the text and the arrow for the Norwegian Wood
+    round corners. The default value for this setting in the Motif
+    style is 2.
+
+    We also change the extent of \l{QScrollBar}s, i.e., the height
+    for a horizontal scroll bar and the width for a vertical scroll
+    bar, to be 4 pixels more than in the Motif style. This makes the
+    style a bit more distinctive.
+
+    For all other QStyle::PixelMetric elements, we use the Motif
+    settings.
+
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 9
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 10
+
+    The \l{QStyle::styleHint()}{styleHint()} function returns some
+    hints to widgets or to the base style (in our case QMotifStyle)
+    about how to draw the widgets. The Motif style returns \c true
+    for the QStyle::SH_DitherDisabledText hint, resulting in a most
+    unpleasing visual effect. We override this behavior and return \c
+    false instead. We also return \c true for the
+    QStyle::SH_EtchDisabledText hint, meaning that disabled text is
+    rendered with an embossed look (as QWindowsStyle does).
+
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 11
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 12
+
+    The \l{QStyle::drawPrimitive()}{drawPrimitive()} function is
+    called by Qt widgets to draw various fundamental graphical
+    elements. Here we reimplement it to draw QPushButton and
+    QComboBox with round corners. The button part of these widgets is
+    drawn using the QStyle::PE_PanelButtonCommand primitive element.
+
+    The \c option parameter, of type QStyleOption, contains
+    everything we need to know about the widget we want to draw on.
+    In particular, \c option->rect gives the rectangle within which
+    to draw the primitive element. The \c painter parameter is a
+    QPainter object that we can use to draw on the widget.
+
+    The \c widget parameter is the widget itself. Normally, all the
+    information we need is available in \c option and \c painter, so
+    we don't need \c widget. We can use it to perform special
+    effects; for example, QMacStyle uses it to animate default
+    buttons. If you use it, be aware that the caller is allowed to
+    pass a null pointer.
+
+    We start by defining three \l{QColor}s that we'll need later on.
+    We also put the x, y, width, and height components of the
+    widget's rectangle in local variables. The value used for the \c
+    semiTransparentWhite and for the \c semiTransparentBlack color's
+    alpha channel depends on whether the mouse cursor is over the
+    widget or not. Since we set the Qt::WA_Hover attribute on
+    \l{QPushButton}s and \l{QComboBox}es, we can rely on the
+    QStyle::State_MouseOver flag to be set when the mouse is over the
+    widget.
+
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 13
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 14
+
+    The \c roundRect variable is a QPainterPath. A QPainterPath is is
+    a vectorial specification of a shape. Any shape (rectangle,
+    ellipse, spline, etc.) or combination of shapes can be expressed
+    as a path. We will use \c roundRect both for filling the button
+    background with a wooden texture and for drawing the outline. The
+    \c roundRectPath() function is a private function; we will come
+    back to it later.
+
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 15
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 16
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 17
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 18
+
+    We define two variables, \c brush and \c darker, and initialize
+    them based on the state of the button:
+
+    \list
+    \o If the button is a \l{QPushButton::flat}{flat button}, we use
+       the \l{QPalette::Background}{Background} brush. We set \c
+       darker to \c true if the button is
+       \l{QAbstractButton::down}{down} or
+       \l{QAbstractButton::checked}{checked}.
+    \o If the button is currently held down by the user or in the
+       \l{QAbstractButton::checked}{checked} state, we use the
+       \l{QPalette::Mid}{Mid} component of the palette. We set
+       \c darker to \c true if the button is
+       \l{QAbstractButton::checked}{checked}.
+    \o Otherwise, we use the \l{QPalette::Button}{Button} component
+       of the palette.
+    \endlist
+
+    The screenshot below illustrates how \l{QPushButton}s are
+    rendered based on their state:
+
+    \image styles-woodbuttons.png Norwegian Wood buttons in different states
+
+    To discover whether the button is flat or not, we need to cast
+    the \c option parameter to QStyleOptionButton and check if the
+    \l{QStyleOptionButton::features}{features} member specifies the
+    QStyleOptionButton::Flat flag. The qstyleoption_cast() function
+    performs a dynamic cast; if \c option is not a
+    QStyleOptionButton, qstyleoption_cast() returns a null pointer.
+
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 19
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 20
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 21
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 22
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 23
+
+    We turn on antialiasing on QPainter. Antialiasing is a technique
+    that reduces the visual distortion that occurs when the edges of
+    a shape are converted into pixels. For the Norwegian Wood style,
+    we use it to obtain smoother edges for the round buttons.
+
+    \image styles-aliasing.png Norwegian wood buttons with and without antialiasing
+
+    The first call to QPainter::fillPath() draws the background of
+    the button with a wooden texture. The second call to
+    \l{QPainter::fillPath()}{fillPath()} paints the same area with a
+    semi-transparent black color (a black color with an alpha channel
+    of 63) to make the area darker if \c darker is true.
+
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 24
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 25
+
+    Next, we draw the outline. The top-left half of the outline and
+    the bottom-right half of the outline are drawn using different
+    \l{QPen}s to produce a 3D effect. Normally, the top-left half of
+    the outline is drawn lighter whereas the bottom-right half is
+    drawn darker, but if the button is
+    \l{QAbstractButton::down}{down} or
+    \l{QAbstractButton::checked}{checked}, we invert the two
+    \l{QPen}s to give a sunken look to the button.
+
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 26
+
+    We draw the top-left part of the outline by calling
+    QPainter::drawPath() with an appropriate
+    \l{QPainter::setClipRegion()}{clip region}. If the
+    \l{QStyleOption::direction}{layout direction} is right-to-left
+    instead of left-to-right, we swap the \c x1, \c x2, \c x3, and \c
+    x4 variables to obtain correct results. On right-to-left desktop,
+    the "light" comes from the top-right corner of the screen instead
+    of the top-left corner; raised and sunken widgets must be drawn
+    accordingly.
+
+    The diagram below illustrates how 3D effects are drawn according
+    to the layout direction. The area in red on the diagram
+    corresponds to the \c topHalf polygon:
+
+    \image styles-3d.png
+
+    An easy way to test how a style looks in right-to-left mode is to
+    pass the \c -reverse command-line option to the application. This
+    option is recognized by the QApplication constructor.
+
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 32
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 33
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 34
+
+    The bottom-right part of the outline is drawn in a similar
+    fashion. Then we draw a one-pixel wide outline around the entire
+    button, using the \l{QPalette::Foreground}{Foreground} component
+    of the QPalette.
+
+    This completes the QStyle::PE_PanelButtonCommand case of the \c
+    switch statement. Other primitive elements are handled by the
+    base style. Let's now turn to the other \c NorwegianWoodStyle
+    member functions:
+
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 35
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 36
+
+    We reimplement QStyle::drawControl() to draw the text on a
+    QPushButton in a bright color when the button is
+    \l{QAbstractButton::down}{down} or
+    \l{QAbstractButton::checked}{checked}.
+
+    If the \c option parameter points to a QStyleOptionButton object
+    (it normally should), we take a copy of the object and modify its
+    \l{QStyleOption::palette}{palette} member to make the
+    QPalette::ButtonText be the same as the QPalette::BrightText
+    component (unless the widget is disabled).
+
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 37
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 38
+
+    The \c setTexture() function is a private function that sets the
+    \l{QBrush::texture()}{texture} component of the \l{QBrush}es for
+    a certain \l{QPalette::ColorRole}{color role}, for all three
+    \l{QPalette::ColorGroup}{color groups} (active, disabled,
+    inactive). We used it to initialize the Norwegian Wood palette in
+    \c polish(QPalette &).
+
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 39
+    \snippet examples/widgets/styles/norwegianwoodstyle.cpp 40
+
+    The \c roundRectPath() function is a private function that
+    constructs a QPainterPath object for round buttons. The path
+    consists of eight segments: four arc segments for the corners and
+    four lines for the sides.
+
+    With around 250 lines of code, we have a fully functional custom
+    style based on one of the predefined styles. Custom styles can be
+    used to provide a distinct look to an application or family of
+    applications.
+
+    \section1 WidgetGallery Class
+
+    For completeness, we will quickly review the \c WidgetGallery
+    class, which contains the most common Qt widgets and allows the
+    user to change style dynamically. Here's the class definition:
+
+    \snippet examples/widgets/styles/widgetgallery.h 0
+    \dots
+    \snippet examples/widgets/styles/widgetgallery.h 1
+
+    Here's the \c WidgetGallery constructor:
+
+    \snippet examples/widgets/styles/widgetgallery.cpp 0
+
+    We start by creating child widgets. The \gui Style combobox is
+    initialized with all the styles known to QStyleFactory, in
+    addition to \c NorwegianWood. The \c create...() functions are
+    private functions that set up the various parts of the \c
+    WidgetGallery.
+
+    \snippet examples/widgets/styles/widgetgallery.cpp 1
+    \snippet examples/widgets/styles/widgetgallery.cpp 2
+
+    We connect the \gui Style combobox to the \c changeStyle()
+    private slot, the \gui{Use style's standard palette} check box to
+    the \c changePalette() slot, and the \gui{Disable widgets} check
+    box to the child widgets'
+    \l{QWidget::setDisabled()}{setDisabled()} slot.
+
+    \snippet examples/widgets/styles/widgetgallery.cpp 3
+    \snippet examples/widgets/styles/widgetgallery.cpp 4
+
+    Finally, we put the child widgets in layouts.
+
+    \snippet examples/widgets/styles/widgetgallery.cpp 5
+    \snippet examples/widgets/styles/widgetgallery.cpp 6
+
+    When the user changes the style in the combobox, we call
+    QApplication::setStyle() to dynamically change the style of the
+    application.
+
+    \snippet examples/widgets/styles/widgetgallery.cpp 7
+    \snippet examples/widgets/styles/widgetgallery.cpp 8
+
+    If the user turns the \gui{Use style's standard palette} on, the
+    current style's \l{QStyle::standardPalette()}{standard palette}
+    is used; otherwise, the system's default palette is honored.
+
+    For the Norwegian Wood style, this makes no difference because we
+    always override the palette with our own palette in \c
+    NorwegianWoodStyle::polish().
+
+    \snippet examples/widgets/styles/widgetgallery.cpp 9
+    \snippet examples/widgets/styles/widgetgallery.cpp 10
+
+    The \c advanceProgressBar() slot is called at regular intervals
+    to advance the progress bar. Since we don't know how long the
+    user will keep the Styles application running, we use a
+    logarithmic formula: The closer the progress bar gets to 100%,
+    the slower it advances.
+
+    We will review \c createProgressBar() in a moment.
+
+    \snippet examples/widgets/styles/widgetgallery.cpp 11
+    \snippet examples/widgets/styles/widgetgallery.cpp 12
+
+    The \c createTopLeftGroupBox() function creates the QGroupBox
+    that occupies the top-left corner of the \c WidgetGallery. We
+    skip the \c createTopRightGroupBox(), \c
+    createBottomLeftTabWidget(), and \c createBottomRightGroupBox()
+    functions, which are very similar.
+
+    \snippet examples/widgets/styles/widgetgallery.cpp 13
+
+    In \c createProgressBar(), we create a QProgressBar at the bottom
+    of the \c WidgetGallery and connect its
+    \l{QTimer::timeout()}{timeout()} signal to the \c
+    advanceProgressBar() slot.
+*/
diff --git a/doc/src/examples/stylesheet.qdoc b/doc/src/examples/stylesheet.qdoc
new file mode 100644
index 0000000000..811d65cb69
--- /dev/null
+++ b/doc/src/examples/stylesheet.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example widgets/stylesheet
+    \title Style Sheet Example
+
+    The Style Sheet Example shows how to use style sheets.
+    
+    \image stylesheet-pagefold.png Screen Shot of the Pagefold style sheet
+*/
+
diff --git a/doc/src/examples/svgalib.qdoc b/doc/src/examples/svgalib.qdoc
new file mode 100644
index 0000000000..c94d408eb0
--- /dev/null
+++ b/doc/src/examples/svgalib.qdoc
@@ -0,0 +1,360 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example qws/svgalib
+    \title Accelerated Graphics Driver Example
+
+    The Accelerated Graphics Driver example shows how you can write
+    your own accelerated graphics driver and \l {add your graphics
+    driver to Qt for Embedded Linux}.  In \l{Qt for Embedded Linux},
+    painting is a pure software implementation and is normally performed
+    in two steps:
+    The clients render each window onto a corresponding surface
+    (stored in memory) using a paint engine, and then the server uses
+    the graphics driver to compose the surface images and copy them to
+    the screen. (See the \l{Qt for Embedded Linux Architecture} documentation
+    for details.)
+
+    The rendering can be accelerated in two ways: Either by
+    accelerating the copying of pixels to the screen, or by
+    accelerating the explicit painting operations. The first is done
+    in the graphics driver implementation, the latter is performed by
+    the paint engine implementation. Typically, both the pixel copying
+    and the painting operations are accelerated using the following
+    approach:
+
+    \list 1
+        \o \l {Step 1: Creating a Custom Graphics Driver}
+        {Creating a Custom Graphics Driver}
+
+        \o \l {Step 2: Implementing a Custom Raster Paint Engine}
+        {Implementing a Custom Paint Engine}
+
+        \o \l {Step 3: Making the Widgets Aware of the Custom Paint
+        Engine}{Making the Widgets Aware of the Custom Paint Engine}
+
+    \endlist
+
+    After compiling the example code, install the graphics driver
+    plugin with the command \c {make install}. To start an application
+    using the graphics driver, you can either set the environment
+    variable \l QWS_DISPLAY and then run the application, or you can
+    just run the application using the \c -display switch:
+
+    \snippet doc/src/snippets/code/doc_src_examples_svgalib.qdoc 0
+
+    \table
+    \header \o SVGAlib
+    \row \o
+
+    Instead of interfacing the graphics hardware directly, this
+    example relies on \l {http://www.svgalib.org}{SVGAlib} being
+    installed on your system.  \l {http://www.svgalib.org}{SVGAlib} is
+    a small graphics library which provides acceleration for many
+    common graphics cards used on desktop computers. It should work on
+    most workstations and has a small and simple API.
+
+    \endtable
+
+    \section1 Step 1: Creating a Custom Graphics Driver
+
+    The custom graphics driver is created by deriving from the QScreen
+    class. QScreen is the base class for implementing screen/graphics
+    drivers in Qt for Embedded Linux.
+
+    \snippet examples/qws/svgalib/svgalibscreen.h 0
+    \codeline
+    \snippet examples/qws/svgalib/svgalibscreen.h 1
+
+    The \l {QScreen::}{connect()}, \l {QScreen::}{disconnect()}, \l
+    {QScreen::}{initDevice()} and \l {QScreen::}{shutdownDevice()}
+    functions are declared as pure virtual functions in QScreen and
+    must be implemented. They are used to configure the hardware, or
+    query its configuration: \l {QScreen::}{connect()} and \l
+    {QScreen::}{disconnect()} are called by both the server and client
+    processes, while the \l {QScreen::}{initDevice()} and \l
+    {QScreen::}{shutdownDevice()} functions are only called by the
+    server process.
+
+    QScreen's \l {QScreen::}{setMode()} and \l {QScreen::}{blank()}
+    functions are also pure virtual, but our driver's implementations
+    are trivial. The last two functions (\l {QScreen::}{blit()} and \l
+    {QScreen::}{solidFill()}) are the ones involved in putting pixels
+    on the screen, i.e., we reimplement these functions to perform the
+    pixel copying acceleration.
+
+    Finally, the \c context variable is a pointer to a \l
+    {http://www.svgalib.org}{SVGAlib} specific type. Note that the
+    details of using the \l {http://www.svgalib.org}{SVGAlib} library
+    is beyond the scope of this example.
+
+    \section2 SvgalibScreen Class Implementation
+
+    The \l {QScreen::}{connect()} function is the first function that
+    is called after the constructor returns. It queries \l
+    {http://www.svgalib.org}{SVGAlib} about the graphics mode and
+    initializes the variables.
+
+    \snippet examples/qws/svgalib/svgalibscreen.cpp 0
+
+    It is important that the \l {QScreen::}{connect()} function
+    initializes the \c data, \c lstep, \c w, \c h, \c dw, \c dh, \c d,
+    \c physWidth and \c physHeight variables (inherited from QScreen)
+    to ensure that the driver is in a state consistent with the driver
+    configuration.
+
+    In this particular example we do not have any information of the
+    real physical size of the screen, so we set these values with the
+    assumption of a screen with 72 DPI.
+
+    \snippet examples/qws/svgalib/svgalibscreen.cpp 1
+
+    When the \l {QScreen::}{connect()} function returns, the server
+    process calls the \l {QScreen::}{initDevice()} function which is
+    expected to do the necessary hardware initialization, leaving the
+    hardware in a state consistent with the driver configuration.
+
+    Note that we have chosen to use the software cursor. If you want
+    to use a hardware cursor, you should create a subclass of
+    QScreenCursor, create an instance of it, and make the global
+    variable \c qt_screencursor point to this instance.
+
+    \snippet examples/qws/svgalib/svgalibscreen.cpp 2
+    \codeline
+    \snippet examples/qws/svgalib/svgalibscreen.cpp 3
+
+    Before exiting, the server process will call the \l
+    {QScreen::}{shutdownDevice()} function to do the necessary
+    hardware cleanup. Again, it is important that the function leaves
+    the hardware in a state consistent with the driver
+    configuration. When \l {QScreen::}{shutdownDevice()} returns, the
+    \l {QScreen::}{disconnect()} function is called. Our
+    implementation of the latter function is trivial.
+
+    Note that, provided that the \c QScreen::data variable points to a
+    valid linear framebuffer, the graphics driver is fully functional
+    as a simple screen driver at this point. The rest of this example
+    will show where to take advantage of the accelerated capabilities
+    available on the hardware.
+
+    Whenever an area on the screen needs to be updated, the server will
+    call the \l {QScreen::}{exposeRegion()} function that paints the 
+    given region on screen. The default implementation will do the 
+    necessary composing of the top-level windows and call \l 
+    {QScreen::}{solidFill()} and \l {QScreen::}{blit()} whenever it is 
+    required. We do not want to change this behavior in the driver so
+    we do not reimplement \l {QScreen::}{exposeRegion()}. 
+
+    To control how the pixels are put onto the screen we need to
+    reimplement the \l {QScreen::}{solidFill()} and \l 
+    {QScreen::}{blit()} functions.
+
+    \snippet examples/qws/svgalib/svgalibscreen.cpp 4
+    \codeline
+    \snippet examples/qws/svgalib/svgalibscreen.cpp 5
+
+    \section1 Step 2: Implementing a Custom Raster Paint Engine
+
+    \l{Qt for Embedded Linux} uses QRasterPaintEngine (a raster-based
+    implementation of QPaintEngine) to implement the painting
+    operations.
+
+    Acceleration of the painting operations is done by deriving from
+    QRasterPaintEngine class. This is a powerful mechanism for
+    accelerating graphic primitives while getting software fallbacks
+    for all the primitives you do not accelerate.
+
+    \snippet examples/qws/svgalib/svgalibpaintengine.h 0
+
+    In this example, we will only accelerate one of the \l
+    {QRasterPaintEngine::}{drawRects()} functions, i.e., only
+    non-rotated, aliased and opaque rectangles will be rendered using
+    accelerated painting. All other primitives are rendered using the
+    base class's unaccelerated implementation.
+
+    The paint engine's state is stored in the private member
+    variables, and we reimplement the \l
+    {QPaintEngine::}{updateState()} function to ensure that our
+    custom paint engine's state is updated properly whenever it is
+    required. The private \c setClip() and \c updateClip() functions
+    are only helper function used to simplify the \l
+    {QPaintEngine::}{updateState()} implementation.
+
+    We also reimplement QRasterPaintEngine's \l
+    {QRasterPaintEngine::}{begin()} and \l
+    {QRasterPaintEngine::}{end()} functions to initialize the paint
+    engine and to do the cleanup when we are done rendering,
+    respectively.
+
+    \table
+    \header \o Private Header Files
+    \row
+    \o
+
+    Note the \c include statement used by this class. The files
+    prefixed with \c private/ are private headers file within
+    \l{Qt for Embedded Linux}. Private header files are not part of
+    the standard installation and are only present while
+    compiling Qt. To be able to compile using
+    private header files you need to use a \c qmake binary within a
+    compiled \l{Qt for Embedded Linux} package.
+
+    \warning Private header files may change without notice between
+    releases.
+
+    \endtable
+
+    The \l {QRasterPaintEngine::}{begin()} function initializes the
+    internal state of the paint engine. Note that it also calls the
+    base class implementation to initialize the parts inherited from
+    QRasterPaintEngine:
+
+    \snippet examples/qws/svgalib/svgalibpaintengine.cpp 0
+    \codeline
+    \snippet examples/qws/svgalib/svgalibpaintengine.cpp 1
+
+    The implementation of the \l {QRasterPaintEngine::}{end()}
+    function removes the clipping constraints that might have been set
+    in \l {http://www.svgalib.org}{SVGAlib}, before calling the
+    corresponding base class implementation.
+
+    \snippet examples/qws/svgalib/svgalibpaintengine.cpp 2
+
+    The \l {QPaintEngine::}{updateState()} function updates our
+    custom paint engine's state. The QPaintEngineState class provides
+    information about the active paint engine's current state.
+
+    Note that we only accept and save the current matrix if it doesn't
+    do any shearing. The pen is accepted if it is opaque and only one
+    pixel wide. The rest of the engine's properties are updated
+    following the same pattern. Again it is important that the
+    QPaintEngine::updateState() function is called to update the
+    parts inherited from the base class.
+
+    \snippet examples/qws/svgalib/svgalibpaintengine.cpp 3
+    \codeline
+    \snippet examples/qws/svgalib/svgalibpaintengine.cpp 4
+
+    The \c setClip() helper function is called from our custom
+    implementation of \l {QPaintEngine::}{updateState()}, and
+    enables clipping to the given region. An empty region means that
+    clipping is disabled.
+
+    Our custom update function also makes use of the \c updateClip()
+    helper function that checks if the clip is "simple", i.e., that it
+    can be represented by only one rectangle, and updates the clip
+    region in \l {http://www.svgalib.org}{SVGAlib}.
+
+    \snippet examples/qws/svgalib/svgalibpaintengine.cpp 5
+
+    Finally, we accelerated that drawing of non-rotated, aliased and
+    opaque rectangles in our reimplementation of the \l
+    {QRasterPaintEngine::}{drawRects()} function. The
+    QRasterPaintEngine fallback is used whenever the rectangle is not
+    simple enough.
+
+    \section1 Step 3: Making the Widgets Aware of the Custom Paint Engine
+
+    To activate the custom paint engine, we also need to implement a
+    corresponding paint device and window surface and make some minor
+    adjustments of the graphics driver.
+
+    \list
+        \o \l {Implementing a Custom Paint Device}
+        \o \l {Implementing a Custom Window Surface}
+        \o \l {Adjusting the Graphics Driver}
+    \endlist
+
+    \section2 Implementing a Custom Paint Device
+
+    The custom paint device can be derived from the
+    QCustomRasterPaintDevice class. Reimplement its \l
+    {QCustomRasterPaintDevice::}{paintEngine()} and \l
+    {QCustomRasterPaintDevice::}{memory()} functions to activate the
+    accelerated paint engine:
+
+    \snippet examples/qws/svgalib/svgalibpaintdevice.h 0
+
+    The \l {QCustomRasterPaintDevice::}{paintEngine()} function should
+    return an instance of the \c SvgalibPaintEngine class. The \l
+    {QCustomRasterPaintDevice::}{memory()} function should return a
+    pointer to the buffer which should be used when drawing the
+    widget.
+
+    Our example driver is rendering directly to the screen without any
+    buffering, i.e., our custom pain device's \l
+    {QCustomRasterPaintDevice::}{memory()} function returns a pointer
+    to the framebuffer. For this reason, we must also reimplement the
+    \l {QPaintDevice::}{metric()} function to reflect the metrics of
+    framebuffer.
+
+    \section2 Implementing a Custom Window Surface
+
+    The custom window surface can be derived from the QWSWindowSurface
+    class. QWSWindowSurface manages the memory used when drawing a
+    window.
+
+    \snippet examples/qws/svgalib/svgalibsurface.h 0
+
+    We can implement most of the pure virtual functions inherited from
+    QWSWindowSurface as trivial inline functions, except the 
+    \l {QWindowSurface::}{scroll()} function that actually makes use
+    of some hardware acceleration:
+
+    \snippet examples/qws/svgalib/svgalibsurface.cpp 0
+
+    \section2 Adjusting the Graphics Driver
+
+    Finally, we enable the graphics driver to recognize an instance of
+    our custom window surface:
+
+    \snippet examples/qws/svgalib/svgalibscreen.cpp 7
+    \codeline
+    \snippet examples/qws/svgalib/svgalibscreen.cpp 8
+
+    The \l {QScreen::}{createSurface()} functions are factory
+    functions that determines what kind of surface a top-level window
+    is using. In our example we only use the custom surface if the
+    given window has the Qt::WA_PaintOnScreen attribute or the
+    QT_ONSCREEN_PAINT environment variable is set.
+*/
+
diff --git a/doc/src/examples/svgviewer.qdoc b/doc/src/examples/svgviewer.qdoc
new file mode 100644
index 0000000000..affc85f5d0
--- /dev/null
+++ b/doc/src/examples/svgviewer.qdoc
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example painting/svgviewer
+    \title SVG Viewer Example
+
+    The SVG Viewer example shows how to add SVG viewing support to applications.
+
+    \image svgviewer-example.png
+
+    Scalable Vector Graphics (SVG) is an XML-based language for describing two-dimensional
+    vector graphics. Qt provides classes for rendering and displaying SVG drawings in
+    widgets and on other paint devices. This example allows the user to load SVG files
+    and view them in a QGraphicsView using a QGraphicsSvgItem. Based on the selected
+    renderer the QGraphicsView uses either a QWidget or QGLWidget as its viewport. A
+    third render mode is also provided, where the QGraphicsView draws indirectly though
+    a QImage. This allows testing of drawing accuracy and performance for both the 
+    native, raster, and OpenGL paint engines.
+
+    See the QtSvg module documentation for more information about SVG and Qt's SVG classes.
+*/
diff --git a/doc/src/examples/syntaxhighlighter.qdoc b/doc/src/examples/syntaxhighlighter.qdoc
new file mode 100644
index 0000000000..7cc9e61f53
--- /dev/null
+++ b/doc/src/examples/syntaxhighlighter.qdoc
@@ -0,0 +1,256 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example richtext/syntaxhighlighter
+    \title Syntax Highlighter Example
+
+    The Syntax Highlighter example shows how to perform simple syntax
+    highlighting by subclassing the QSyntaxHighlighter class.
+
+    \image syntaxhighlighter-example.png
+
+    The Syntax Highlighter application displays C++ files with custom
+    syntax highlighting.
+
+    The example consists of two classes:
+
+    \list
+        \o The \c Highlighter class defines and applies the
+           highlighting rules.
+        \o The \c MainWindow widget is the application's main window.
+    \endlist
+
+    We will first review the \c Highlighter class to see how you can
+    customize the QSyntaxHighlighter class to fit your preferences,
+    then we will take a look at the relevant parts of the \c
+    MainWindow class to see how you can use your custom highlighter
+    class in an application.
+
+    \section1 Highlighter Class Definition
+
+    \snippet examples/richtext/syntaxhighlighter/highlighter.h 0
+
+    To provide your own syntax highlighting, you must subclass
+    QSyntaxHighlighter, reimplement the \l
+    {QSyntaxHighlighter::highlightBlock()}{highlightBlock()} function,
+    and define your own highlighting rules.
+
+    We have chosen to store our highlighting rules using a private
+    struct: A rule consists of a QRegExp pattern and a QTextCharFormat
+    instance. The various rules are then stored using a QVector.
+
+    The QTextCharFormat class provides formatting information for
+    characters in a QTextDocument specifying the visual properties of
+    the text, as well as information about its role in a hypertext
+    document. In this example, we will only define the font weight and
+    color using the QTextCharFormat::setFontWeight() and
+    QTextCharFormat::setForeground() functions.
+
+    \section1 Highlighter Class Implementation
+
+    When subclassing the QSyntaxHighlighter class you must pass the
+    parent parameter to the base class constructor. The parent is the
+    text document upon which the syntax highligning will be
+    applied. In this example, we have also chosen to define our
+    highlighting rules in the constructor:
+
+    \snippet examples/richtext/syntaxhighlighter/highlighter.cpp 0
+    \snippet examples/richtext/syntaxhighlighter/highlighter.cpp 1
+
+    First we define a keyword rule which recognizes the most common
+    C++ keywords. We give the \c keywordFormat a bold, dark blue
+    font. For each keyword, we assign the keyword and the specified
+    format to a HighlightingRule object and append the object to our
+    list of rules.
+
+    \snippet examples/richtext/syntaxhighlighter/highlighter.cpp 2
+    \codeline
+    \snippet examples/richtext/syntaxhighlighter/highlighter.cpp 4
+    \codeline
+    \snippet examples/richtext/syntaxhighlighter/highlighter.cpp 5
+
+    Then we create a format that we will apply to Qt class names. The
+    class names will be rendered with a dark magenta color and a bold
+    style. We specify a string pattern that is actually a regular
+    expression capturing all Qt class names. Then we assign the
+    regular expression and the specified format to a HighlightingRule
+    object and append the object to our list of rules.
+
+    We also define highlighting rules for quotations and functions
+    using the same approach: The patterns have the form of regular
+    expressions and are stored in HighlightingRule objects with the
+    associated format.
+
+    \snippet examples/richtext/syntaxhighlighter/highlighter.cpp 3
+    \codeline
+    \snippet examples/richtext/syntaxhighlighter/highlighter.cpp 6
+
+    The C++ language has two variations of comments: The single line
+    comment (\c //) and the multiline comment (\c{/*...}\starslash). The single
+    line comment can easily be defined through a highlighting rule
+    similar to the previous ones. But the multiline comment needs
+    special care due to the design of the QSyntaxHighlighter class.
+
+    After a QSyntaxHighlighter object is created, its \l
+    {QSyntaxHighlighter::highlightBlock()}{highlightBlock()} function
+    will be called automatically whenever it is necessary by the rich
+    text engine, highlighting the given text block. The problem
+    appears when a comment spans several text blocks. We will take a
+    closer look at how this problem can be solved when reviewing the
+    implementation of the \c Highlighter::highlightBlock()
+    function. At this point we only specify the multiline comment's
+    color.
+
+    \snippet examples/richtext/syntaxhighlighter/highlighter.cpp 7
+
+    The highlightBlock() function is called automatically whenever it
+    is necessary by the rich text engine, i.e. when there are text
+    blocks that have changed.
+
+    First we apply the syntax highlighting rules that we stored in the
+    \c highlightingRules vector. For each rule (i.e. for each
+    HighlightingRule object) we search for the pattern in the given
+    textblock using the QString::indexOf() function. When the first
+    occurrence of the pattern is found, we use the
+    QRegExp::matchedLength() function to determine the string that
+    will be formatted. QRegExp::matchedLength() returns the length of
+    the last matched string, or -1 if there was no match.
+
+    To perform the actual formatting the QSyntaxHighlighter class
+    provides the \l {QSyntaxHighlighter::setFormat()}{setFormat()}
+    function. This function operates on the text block that is passed
+    as argument to the \c highlightBlock() function. The specified
+    format is applied to the text from the given start position for
+    the given length. The formatting properties set in the given
+    format are merged at display time with the formatting information
+    stored directly in the document. Note that the document itself
+    remains unmodified by the format set through this function.
+
+    This process is repeated until the last occurrence of the pattern
+    in the current text block is found.
+
+    \snippet examples/richtext/syntaxhighlighter/highlighter.cpp 8
+
+    To deal with constructs that can span several text blocks (like
+    the C++ multiline comment), it is necessary to know the end state
+    of the previous text block (e.g. "in comment"). Inside your \c
+    highlightBlock() implementation you can query the end state of the
+    previous text block using the
+    QSyntaxHighlighter::previousBlockState() function. After parsing
+    the block you can save the last state using
+    QSyntaxHighlighter::setCurrentBlockState().
+
+    The \l
+    {QSyntaxHighlighter::previousBlockState()}{previousBlockState()}
+    function return an int value. If no state is set, the returned
+    value is -1. You can designate any other value to identify any
+    given state using the \l
+    {QSyntaxHighlighter::setCurrentBlockState()}{setCurrentBlockState()}
+    function. Once the state is set, the QTextBlock keeps that value
+    until it is set again or until the corresponding paragraph of text
+    is deleted.
+
+    In this example we have chosen to use 0 to represent the "not in
+    comment" state, and 1 for the "in comment" state. When the stored
+    syntax highlighting rules are applied we initialize the current
+    block state to 0.
+
+    \snippet examples/richtext/syntaxhighlighter/highlighter.cpp 9
+
+    If the previous block state was "in comment" (\c
+    {previousBlockState() == 1}), we start the search for an end
+    expression at the beginning of the text block. If the
+    previousBlockState() returns 0, we start the search at the
+    location of the first occurrence of a start expression.
+
+    \snippet examples/richtext/syntaxhighlighter/highlighter.cpp 10
+    \snippet examples/richtext/syntaxhighlighter/highlighter.cpp 11
+
+    When an end expression is found, we calculate the length of the
+    comment and apply the multiline comment format. Then we search for
+    the next occurrence of the start expression and repeat the
+    process.  If no end expression can be found in the current text
+    block we set the current block state to 1, i.e. "in comment".
+
+    This completes the \c Highlighter class implementation; it is now
+    ready for use.
+
+    \section1 MainWindow Class Definition
+
+    Using a QSyntaxHighlighter subclass is simple; just provide your
+    application with an instance of the class and pass it the document
+    upon which you want the highlighting to be applied.
+
+    \snippet examples/richtext/syntaxhighlighter/mainwindow.h 0
+
+    In this example we declare a pointer to a \c Highlighter instance
+    which we later will initialize in the private \c setupEditor()
+    function.
+
+    \section1 MainWindow Class Implementation
+
+    The constructor of the main window is straight forward. We first
+    set up the menus, then we initialize the editor and make it the
+    central widget of the application. Finally we set the main
+    window's title.
+
+    \snippet examples/richtext/syntaxhighlighter/mainwindow.cpp 0
+
+    We initialize and install the \c Highlighter object in the private
+    setupEditor() convenience function:
+
+    \snippet examples/richtext/syntaxhighlighter/mainwindow.cpp 1
+
+    First we create the font we want to use in the editor, then we
+    create the editor itself which is an instance of the QTextEdit
+    class. Before we initialize the editor with the \c MainWindow
+    class definition file, we create a \c Highlighter instance passing
+    the editor's document as argument. This is the document that the
+    highlighting will be applied to. Then we are done.
+
+    A QSyntaxHighlighter object can only be installed on one document
+    at the time, but you can easily reinstall the highlighter on
+    another document using the QSyntaxHighlighter::setDocument()
+    function. The QSyntaxHighlighter class also provides the \l
+    {QSyntaxHighlighter::document()}{document()} function which
+    returns the currently set document.
+*/
diff --git a/doc/src/examples/systray.qdoc b/doc/src/examples/systray.qdoc
new file mode 100644
index 0000000000..62bc05c461
--- /dev/null
+++ b/doc/src/examples/systray.qdoc
@@ -0,0 +1,197 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example desktop/systray
+    \title System Tray Icon Example
+
+
+    The System Tray Icon example shows how to add an icon with a menu
+    and popup messages to a desktop environment's system tray.
+
+    \image systemtray-example.png Screenshot of the System Tray Icon.
+
+    Modern operating systems usually provide a special area on the
+    desktop, called the system tray or notification area, where
+    long-running applications can display icons and short messages.
+
+    This example consists of one single class, \c Window, providing
+    the main application window (i.e., an editor for the system tray
+    icon) and the associated icon.
+
+    \image systemtray-editor.png
+
+    The editor allows the user to choose the preferred icon as well as
+    set the balloon message's type and duration. The user can also
+    edit the message's title and body. Finally, the editor provide a
+    checkbox controlling whether the icon is actually shown in the
+    system tray, or not.
+
+    \section1 Window Class Definition
+
+    The \c Window class inherits QWidget:
+
+    \snippet examples/desktop/systray/window.h 0
+
+    We implement several private slots to respond to user
+    interaction. The other private functions are only convenience
+    functions provided to simplify the constructor.
+
+    The tray icon is an instance of the QSystemTrayIcon class. To
+    check whether a system tray is present on the user's desktop, call
+    the static QSystemTrayIcon::isSystemTrayAvailable()
+    function. Associated with the icon, we provide a menu containing
+    the typical \gui minimize, \gui maximize, \gui restore and \gui
+    quit actions. We reimplement the QWidget::setVisible() function to
+    update the tray icon's menu whenever the editor's appearance
+    changes, e.g., when maximizing or minimizing the main application
+    window.
+
+    Finally, we reimplement QWidget's \l {QWidget::}{closeEvent()}
+    function to be able to inform the user (when closing the editor
+    window) that the program will keep running in the system tray
+    until the user chooses the \gui Quit entry in the icon's context
+    menu.
+
+    \section1 Window Class Implementation
+
+    When constructing the editor widget, we first create the various
+    editor elements before we create the actual system tray icon:
+
+    \snippet examples/desktop/systray/window.cpp 0
+
+    We ensure that the application responds to user input by
+    connecting most of the editor's input widgets (including the
+    system tray icon) to the application's private slots. But note the
+    visibility checkbox; its \l {QCheckBox::}{toggled()} signal is
+    connected to the \e {icon}'s \l {QSystemTrayIcon::}{setVisible()}
+    function instead.
+
+    \snippet examples/desktop/systray/window.cpp 3
+
+    The \c setIcon() slot is triggered whenever the current index in
+    the icon combobox changes, i.e., whenever the user chooses another
+    icon in the editor. Note that it is also called when the user
+    activates the tray icon with the left mouse button, triggering the
+    icon's \l {QSystemTrayIcon::}{activated()} signal. We will come
+    back to this signal shortly.
+
+    The QSystemTrayIcon::setIcon() function sets the \l
+    {QSystemTrayIcon::}{icon} property that holds the actual system
+    tray icon. On Windows, the system tray icon size is 16x16; on X11,
+    the preferred size is 22x22. The icon will be scaled to the
+    appropriate size as necessary.
+
+    Note that on X11, due to a limitation in the system tray
+    specification, mouse clicks on transparent areas in the icon are
+    propagated to the system tray. If this behavior is unacceptable,
+    we suggest using an icon with no transparency.
+
+    \snippet examples/desktop/systray/window.cpp 4
+
+    Whenever the user activates the system tray icon, it emits its \l
+    {QSystemTrayIcon::}{activated()} signal passing the triggering
+    reason as parameter. QSystemTrayIcon provides the \l
+    {QSystemTrayIcon::}{ActivationReason} enum to describe how the
+    icon was activated.
+
+    In the constructor, we connected our icon's \l
+    {QSystemTrayIcon::}{activated()} signal to our custom \c
+    iconActivated() slot: If the user has clicked the icon using the
+    left mouse button, this function changes the icon image by
+    incrementing the icon combobox's current index, triggering the \c
+    setIcon() slot as mentioned above. If the user activates the icon
+    using the middle mouse button, it calls the custom \c
+    showMessage() slot:
+
+    \snippet examples/desktop/systray/window.cpp 5
+
+    When the \e showMessage() slot is triggered, we first retrieve the
+    message icon depending on the currently chosen message type. The
+    QSystemTrayIcon::MessageIcon enum describes the icon that is shown
+    when a balloon message is displayed. Then we call
+    QSystemTrayIcon's \l {QSystemTrayIcon::}{showMessage()} function
+    to show the message with the title, body, and icon for the time
+    specified in milliseconds.
+    
+    Mac OS X users note: The Growl notification system must be
+    installed for QSystemTrayIcon::showMessage() to display messages.
+
+    QSystemTrayIcon also has the corresponding, \l {QSystemTrayIcon::}
+    {messageClicked()} signal, which is emitted when the user clicks a
+    message displayed by \l {QSystemTrayIcon::}{showMessage()}.
+
+    \snippet examples/desktop/systray/window.cpp 6
+
+    In the constructor, we connected the \l
+    {QSystemTrayIcon::}{messageClicked()} signal to our custom \c
+    messageClicked() slot that simply displays a message using the
+    QMessageBox class.
+
+    QMessageBox provides a modal dialog with a short message, an icon,
+    and buttons laid out depending on the current style. It supports
+    four severity levels: "Question", "Information", "Warning" and
+    "Critical". The easiest way to pop up a message box in Qt is to
+    call one of the associated static functions, e.g.,
+    QMessageBox::information().
+
+    As we mentioned earlier, we reimplement a couple of QWidget's
+    virtual functions:
+
+    \snippet examples/desktop/systray/window.cpp 1
+
+    Our reimplementation of the QWidget::setVisible() function updates
+    the tray icon's menu whenever the editor's appearance changes,
+    e.g., when maximizing or minimizing the main application window,
+    before calling the base class implementation.
+
+    \snippet examples/desktop/systray/window.cpp 2
+
+    We have reimplemented the QWidget::closeEvent() event handler to
+    receive widget close events, showing the above message to the
+    users when they are closing the editor window.
+
+    In addition to the functions and slots discussed above, we have
+    also implemented several convenience functions to simplify the
+    constructor: \c createIconGroupBox(), \c createMessageGroupBox(),
+    \c createActions() and \c createTrayIcon(). See the \l
+    {desktop/systray/window.cpp}{window.cpp} file for details.
+*/
diff --git a/doc/src/examples/tabdialog.qdoc b/doc/src/examples/tabdialog.qdoc
new file mode 100644
index 0000000000..c9500afe7f
--- /dev/null
+++ b/doc/src/examples/tabdialog.qdoc
@@ -0,0 +1,148 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example dialogs/tabdialog
+    \title Tab Dialog Example
+
+    The Tab Dialog example shows how to construct a tab dialog using the
+    QTabWidget class.
+
+    Dialogs provide an efficient way for the application to communicate
+    with the user, but complex dialogs suffer from the problem that they
+    often take up too much screen area. By using a number of tabs in a
+    dialog, information can be split into different categories, while
+    remaining accessible.
+
+    \image tabdialog-example.png
+
+    The Tab Dialog example consists of a single \c TabDialog class that
+    provides three tabs, each containing information about a particular
+    file, and two standard push buttons that are used to accept or reject
+    the contents of the dialog.
+
+    \section1 TabDialog Class Definition
+
+    The \c TabDialog class is a subclass of QDialog that displays a
+    QTabWidget and two standard dialog buttons. The class definition
+    only contain the class constructor and a private data member for
+    the QTabWidget:
+
+    \snippet examples/dialogs/tabdialog/tabdialog.h 3
+
+    In the example, the widget will be used as a top-level window, but
+    we define the constructor so that it can take a parent widget. This
+    allows the dialog to be centered on top of an application's main
+    window.
+
+    \section1 TabDialog Class Implementation
+
+    The constructor calls the QDialog constructor and creates a QFileInfo
+    object for the specified filename.
+
+    \snippet examples/dialogs/tabdialog/tabdialog.cpp 0
+
+    The tab widget is populated with three custom widgets that each
+    contain information about the file. We construct each of these
+    without a parent widget because the tab widget will reparent
+    them as they are added to it.
+
+    We create two standard push buttons, and connect each of them to
+    the appropriate slots in the dialog:
+
+    \snippet examples/dialogs/tabdialog/tabdialog.cpp 1
+    \snippet examples/dialogs/tabdialog/tabdialog.cpp 3
+
+    We arrange the the tab widget above the buttons in the dialog:
+
+    \snippet examples/dialogs/tabdialog/tabdialog.cpp 4
+
+    Finally, we set the dialog's title:
+
+    \snippet examples/dialogs/tabdialog/tabdialog.cpp 5
+
+    Each of the tabs are subclassed from QWidget, and only provide
+    constructors.
+
+    \section1 GeneralTab Class Definition
+
+    The GeneralTab widget definition is simple because we are only interested
+    in displaying the contents of a widget within a tab:
+
+    \snippet examples/dialogs/tabdialog/tabdialog.h 0
+
+    \section1 GeneralTab Class Implementation
+
+    The GeneralTab widget simply displays some information about the file
+    passed by the TabDialog. Various widgets for this purpose, and these
+    are arranged within a vertical layout:
+
+    \snippet examples/dialogs/tabdialog/tabdialog.cpp 6
+
+    \section1 PermissionsTab Class Definition
+
+    Like the GeneralTab, the PermissionsTab is just used as a placeholder
+    widget for its children:
+
+    \snippet examples/dialogs/tabdialog/tabdialog.h 1
+
+    \section1 PermissionsTab Class Implementation
+
+    The PermissionsTab shows information about the file's access information,
+    displaying details of the file permissions and owner in widgets that are
+    arranged in nested layouts:
+
+    \snippet examples/dialogs/tabdialog/tabdialog.cpp 7
+
+    \section1 ApplicationsTab Class Definition
+
+    The ApplicationsTab is another placeholder widget that is mostly
+    cosmetic:
+
+    \snippet examples/dialogs/tabdialog/tabdialog.h 2
+
+    \section1 ApplicationsTab Class Implementation
+
+    The ApplicationsTab does not show any useful information, but could be
+    used as a template for a more complicated example:
+
+    \snippet examples/dialogs/tabdialog/tabdialog.cpp 8
+*/
diff --git a/doc/src/examples/tablemodel.qdoc b/doc/src/examples/tablemodel.qdoc
new file mode 100644
index 0000000000..e3d4a225f1
--- /dev/null
+++ b/doc/src/examples/tablemodel.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \example sql/tablemodel
+    \title Table Model Example
+
+    The Table Model example shows how to use a specialized SQL table model with table
+    views to edit information in a database.
+
+    \image tablemodel-example.png
+*/
diff --git a/doc/src/examples/tablet.qdoc b/doc/src/examples/tablet.qdoc
new file mode 100644
index 0000000000..476bba1d53
--- /dev/null
+++ b/doc/src/examples/tablet.qdoc
@@ -0,0 +1,380 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example widgets/tablet
+    \title Tablet Example
+
+    This example shows how to use a Wacom tablet in Qt applications.
+
+    \image tabletexample.png
+
+    When you use a tablet with Qt applications, \l{QTabletEvent}s are
+    genarated. You need to reimplement the
+    \l{QWidget::}{tabletEvent()} event handler if you want to handle
+    tablet events. Events are generated when the device used for
+    drawing enters and leaves the proximity of the tablet (i.e., when
+    it is close but not pressed down on it), when a device is pushed
+    down and released from it, and when a device is moved on the
+    tablet.
+  
+    The information available in QTabletEvent depends on the device
+    used. The tablet in this example has two different devices for
+    drawing: a stylus and an airbrush. For both devices the event
+    contains the position of the device, pressure on the tablet,
+    vertical tilt, and horizontal tilt (i.e, the angle between the
+    device and the perpendicular of the tablet). The airbrush has a
+    finger wheel; the position of this is also available in the tablet
+    event.
+
+    In this example we implement a drawing program. You can use the
+    stylus to draw on the tablet as you use a pencil on paper. When
+    you draw with the airbrush you get a spray of paint; the finger
+    wheel is used to change the density of the spray. The pressure and
+    tilt can change the alpha and saturation values of the QColor and the
+    width of the QPen used for drawing.
+
+    The example consists of the following:
+
+    \list
+        \o The \c MainWindow class inherits QMainWindow and creates
+           the examples menus and connect their slots and signals.
+	\o The \c TabletCanvas class inherits QWidget and 
+	   receives tablet events. It uses the events to paint on a
+	   QImage, which it draws onto itself.
+	\o The \c TabletApplication class inherits QApplication. This
+	   class handles tablet events that are not sent to \c tabletEvent(). 
+	   We will look at this later.
+	\o The \c main() function creates a \c MainWindow and shows it
+	   as a top level window.
+    \endlist
+
+
+    \section1 MainWindow Class Definition
+
+    The \c MainWindow creates a \c TabletCanvas and sets it as its 
+    center widget. 
+
+    \snippet examples/widgets/tablet/mainwindow.h 0
+
+    The QActions let the user select if the tablets pressure and
+    tilt should change the pen width, color alpha component and color
+    saturation. \c createActions() creates all actions, and \c
+    createMenus() sets up the menus with the actions. We have one
+    QActionGroup for the actions that alter the alpha channel, color
+    saturation and line width respectively. The action groups are
+    connected to the \c alphaActionTriggered(), \c
+    colorSaturationActiontriggered(), and \c
+    lineWidthActionTriggered() slots, which calls functions in \c
+    myCanvas.
+
+
+    \section1 MainWindow Class Implementation
+
+    We start width a look at the constructor \c MainWindow():
+
+    \snippet examples/widgets/tablet/mainwindow.cpp 0
+
+    In the constructor we create the canvas, actions, and menus.
+    We set the canvas as the center widget. We also initialize the
+    canvas to match the state of our menus and start drawing with a
+    red color.
+
+    Here is the implementation of \c brushColorAct():
+
+    \snippet examples/widgets/tablet/mainwindow.cpp 1
+
+    We let the user pick a color with a QColorDialog. If it is valid,
+    we set a new drawing color with \c setColor().
+
+    Here is the implementation of \c alphaActionTriggered():
+
+    \snippet examples/widgets/tablet/mainwindow.cpp 2
+
+    The \c TabletCanvas class supports two ways by which the alpha 
+    channel of the drawing color can be changed: tablet pressure and
+    tilt. We have one action for each and an action if the alpha
+    channel should not be changed. 
+
+    Here is the implementation of \c lineWidthActionTriggered():
+
+    \snippet examples/widgets/tablet/mainwindow.cpp 3
+
+    We check which action is selected in \c lineWidthGroup, and set
+    how the canvas should change the drawing line width.
+
+    Here is the implementation of \c saturationActionTriggered():
+
+    \snippet examples/widgets/tablet/mainwindow.cpp 4
+
+    We check which action is selected in \c colorSaturationGroup, and
+    set how the canvas should change the color saturation of the
+    drawing color.
+
+    Here is the implementation of \c saveAct():
+
+    \snippet examples/widgets/tablet/mainwindow.cpp 5
+
+    We use the QFileDialog to let the user select a file to save the
+    drawing in. It is the \c TabletCanvas that save the drawing, so we
+    call its \c saveImage() function.
+
+    Here is the implementation of \c loadAct():
+
+    \snippet examples/widgets/tablet/mainwindow.cpp 6
+
+    We let the user select the image file to be opened with
+    a QFileDialog; we then ask the canvas to load the image with \c
+    loadImage().
+
+    Here is the implementation of \c aboutAct():
+
+    \snippet examples/widgets/tablet/mainwindow.cpp 7
+
+    We show a message box with a short description of the example. 
+
+    \c createActions() creates all actions and action groups of
+    the example. We look at the creation of one action group and its
+    actions. See the \l{Application Example}{application example} if
+    you want a high-level introduction to QActions. 
+
+    Here is the implementation of \c createActions:
+
+    \snippet examples/widgets/tablet/mainwindow.cpp 8
+    \dots
+    \snippet examples/widgets/tablet/mainwindow.cpp 9
+
+    We want the user to be able to choose if the drawing color's
+    alpha component should be changed by the tablet pressure or tilt.
+    We have one action for each choice and an action if the alpha
+    channel is not to be changed, i.e, the color is opaque. We make
+    the actions checkable; the \c alphaChannelGroup will then ensure
+    that only one of the actions are checked at any time. The \c
+    triggered() signal is emitted when an action is checked.
+
+    \dots
+    \snippet examples/widgets/tablet/mainwindow.cpp 10
+
+    Here is the implementation of \c createMenus():
+
+    \snippet examples/widgets/tablet/mainwindow.cpp 11
+
+    We create the menus of the example and add the actions to them.
+
+
+    \section1 TabletCanvas Class Definition
+
+    The \c TabletCanvas class provides a surface on which the
+    user can draw with a tablet. 
+
+    \snippet examples/widgets/tablet/tabletcanvas.h 0
+
+    The canvas can change the alpha channel, color saturation,
+    and line width of the drawing. We have one enum for each of
+    these; their values decide if it is the tablet pressure or tilt
+    that will alter them. We keep a private variable for each, the \c
+    alphaChannelType, \c colorSturationType, and \c penWidthType,
+    which we provide access functions for. 
+
+    We draw on a QImage with \c myPen and \c myBrush using \c
+    myColor. The \c saveImage() and \c loadImage() saves and loads
+    the QImage to disk. The image is drawn on the widget in \c
+    paintEvent(). The \c pointerType and \c deviceType keeps the type
+    of pointer, which is either a pen or an eraser, and device
+    currently used on the tablet, which is either a stylus or an
+    airbrush.
+
+    The interpretation of events from the tablet is done in \c
+    tabletEvent(); \c paintImage(), \c updateBrush(), and \c
+    brushPattern() are helper functions used by \c tabletEvent().
+
+
+    \section1 TabletCanvas Class Implementation
+
+    We start with a look at the constructor:
+
+    \snippet examples/widgets/tablet/tabletcanvas.cpp 0
+
+    In the constructor we initialize our class variables. We need
+    to draw the background of our image, as the default is gray.
+
+    Here is the implementation of \c saveImage():
+
+    \snippet examples/widgets/tablet/tabletcanvas.cpp 1
+
+    QImage implements functionality to save itself to disk, so we
+    simply call \l{QImage::}{save()}.
+
+    Here is the implementation of \c loadImage():
+
+    \snippet examples/widgets/tablet/tabletcanvas.cpp 2
+
+    We simply call \l{QImage::}{load()}, which loads the image in \a
+    file.
+
+    Here is the implementation of \c tabletEvent():
+
+    \snippet examples/widgets/tablet/tabletcanvas.cpp 3
+
+    We get three kind of events to this function: TabletPress,
+    TabletRelease, and TabletMove, which is generated when a device
+    is pressed down on, leaves, or moves on the tablet. We set the \c
+    deviceDown to true when a device is pressed down on the tablet;
+    we then know when we should draw when we receive move events. We
+    have implemented the \c updateBrush() and \c paintImage() helper
+    functions to update \c myBrush and \c myPen after the state of \c
+    alphaChannelType, \c colorSaturationType, and \c lineWidthType.
+
+    Here is the implementation of \c paintEvent():
+
+    \snippet examples/widgets/tablet/tabletcanvas.cpp 4
+
+    We simply draw the image to the top left of the widget.
+
+    Here is the implementation of \c paintImage():
+
+    \snippet examples/widgets/tablet/tabletcanvas.cpp 5
+
+    In this function we draw on the image based on the movement of the
+    device. If the device used on the tablet is a stylus we want to draw a
+    line between the positions of the stylus recorded in \c polyLine.
+    If it is an airbrush we want to draw a circle of points with a
+    point density based on the tangential pressure, which is the position
+    of the finger wheel on the airbrush. We use the Qt::BrushStyle to
+    draw the points as it has styles that draw points with different
+    density; we select the style based on the tangential pressure in
+    \c brushPattern().
+
+    \snippet examples/widgets/tablet/tabletcanvas.cpp 6
+
+    We return a brush style with a point density that increases with
+    the tangential pressure.
+
+    In \c updateBrush() we set the pen and brush used for drawing
+    to match \c alphaChannelType, \c lineWidthType, \c
+    colorSaturationType, and \c myColor. We will examine the code to
+    set up \c myBrush and \c myPen for each of these variables:
+
+    \snippet examples/widgets/tablet/tabletcanvas.cpp 7
+
+    We fetch the current drawingcolor's hue, saturation, value,
+    and alpha values. \c hValue and \c vValue are set to the
+    horizontal and vertical tilt as a number from 0 to 255. The
+    original values are in degrees from -60 to 60, i.e., 0 equals
+    -60, 127 equals 0, and 255 equals 60 degrees. The angle measured
+    is between the device and the perpendicular of the tablet (see
+    QTabletEvent for an illustration).
+         
+    \snippet examples/widgets/tablet/tabletcanvas.cpp 8
+
+    The alpha channel of QColor is given as a number between 0
+    and 255 where 0 is transparent and 255 is opaque.
+    \l{QTabletEvent::}{pressure()} returns the pressure as a qreal
+    between 0.0 and 1.0. By subtracting 127 from the tilt values and
+    taking the absolute value we get the smallest alpha values (i.e.,
+    the color is most transparent) when the pen is perpendicular to
+    the tablet. We select the largest of the vertical and horizontal
+    tilt value. 
+ 
+    \snippet examples/widgets/tablet/tabletcanvas.cpp 9
+
+    The colorsaturation is given as a number between 0 and 255. It is
+    set with \l{QColor::}{setHsv()}. We can set the tilt values
+    directly, but must multiply the pressure to a number between 0 and
+    255.
+
+    \snippet examples/widgets/tablet/tabletcanvas.cpp 10
+
+    The width of the pen increases with the pressure. When the pen
+    width is controlled with the tilt we let the width increse with
+    the angle between the device and the perpendicular of the tablet.
+
+    \snippet examples/widgets/tablet/tabletcanvas.cpp 11
+   
+    We finally check wether the pointer is the stylus or the eraser.
+    If it is the eraser, we set the color to the background color of
+    the image an let the pressure decide the pen width, else we set
+    the colors we have set up previously in the function.
+
+
+    \section1 TabletApplication Class Definition
+
+    We inherit QApplication in this class because we want to
+    reimplement the \l{QApplication::}{event()} function. 
+
+    \snippet examples/widgets/tablet/tabletapplication.h 0
+
+    We keep a \c TabletCanvas we send the device type of the events we
+    handle in the \c event() function to. The TabletEnterProximity
+    and TabletLeaveProximity events are not sendt to the QApplication
+    object, while other tablet events are sendt to the QWidget's
+    \c event(), which sends them on to \l{QWidget::}{tabletEvent()}.
+    Since we want to handle these events we have implemented \c 
+    TabletApplication.
+
+
+    \section1 TabletApplication Class Implementation
+
+    Here is the implementation of \c event():
+
+    \snippet examples/widgets/tablet/tabletapplication.cpp 0
+
+    We use this function to handle the TabletEnterProximity and
+    TabletLeaveProximity events, which is generated when a device
+    enters and leaves the proximity of the tablet. The intended use of these
+    events is to do work that is dependent on what kind of device is
+    used on the tablet. This way, you don't have to do this work
+    when other events are generated, which is more frequently than the
+    leave and enter proximity events. We call \c setTabletDevice() in 
+    \c TabletCanvas.
+
+    \section1 The \c main() function
+
+    Here is the examples \c main() function:
+
+    \snippet examples/widgets/tablet/main.cpp 0
+
+    In the \c main() function we create a \c MainWinow and display it
+    as a top level window. We use the \c TabletApplication class. We
+    need to set the canvas after the application is created. We cannot
+    use classes that implement event handling before an QApplication
+    object is instantiated.
+*/
diff --git a/doc/src/examples/taskmenuextension.qdoc b/doc/src/examples/taskmenuextension.qdoc
new file mode 100644
index 0000000000..b02da6c7c2
--- /dev/null
+++ b/doc/src/examples/taskmenuextension.qdoc
@@ -0,0 +1,457 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example designer/taskmenuextension
+    \title Task Menu Extension Example
+
+    The Task Menu Extension example shows how to create a custom
+    widget plugin for \l {Qt Designer Manual}{\QD}, and how to to use
+    the QDesignerTaskMenuExtension class to provide custom task menu
+    entries associated with the plugin.
+
+    \image taskmenuextension-example-faded.png
+
+    To provide a custom widget that can be used with \QD, we need to
+    supply a self-contained implementation. In this example we use a
+    custom widget designed to show the task menu extension feature:
+    The TicTacToe widget.
+
+    An extension is an object which modifies the behavior of \QD. The
+    QDesignerTaskMenuExtension can provide custom task menu entries
+    when a widget with this extension is selected.
+
+    There are four available types of extensions in \QD:
+
+    \list
+        \o QDesignerContainerExtension provides an extension that allows
+           you to add (and delete) pages to a multi-page container plugin
+           in \QD.
+        \o QDesignerMemberSheetExtension provides an extension that allows
+           you to manipulate a widget's member functions which is displayed
+           when configuring connections using Qt Designer's mode for editing
+           signals and slots.
+        \o QDesignerPropertySheetExtension provides an extension that
+           allows you to manipulate a widget's properties which is displayed
+           in Qt Designer's property editor.
+        \o QDesignerTaskMenuExtension provides an extension that allows
+           you to add custom menu entries to \QD's task menu.
+    \endlist
+
+    You can use all the extensions following the same pattern as in
+    this example, only replacing the respective extension base
+    class. For more information, see the \l {QtDesigner Module}.
+
+    The Task Menu Extension example consists of five classes:
+
+    \list
+    \o \c TicTacToe is a custom widget that lets the user play
+       the Tic-Tac-Toe game.
+    \o \c TicTacToePlugin exposes the \c TicTacToe class to \QD.
+    \o \c TicTacToeTaskMenuFactory creates a \c TicTacToeTaskMenu object.
+    \o \c TicTacToeTaskMenu provides the task menu extension, i.e the
+       plugin's associated task menu entries.
+    \o \c TicTacToeDialog lets the user modify the state of a
+       Tic-Tac-Toe plugin loaded into \QD.
+    \endlist
+
+    The project file for custom widget plugins needs some additional
+    information to ensure that they will work within \QD. For example,
+    custom widget plugins rely on components supplied with \QD, and
+    this must be specified in the project file that we use. We will
+    first take a look at the plugin's project file.
+
+    Then we will continue by reviewing the \c TicTacToePlugin class,
+    and take a look at the \c TicTacToeTaskMenuFactory and \c
+    TicTacToeTaskMenu classes. Finally, we will review the \c
+    TicTacToeDialog class before we take a quick look at the \c
+    TicTacToe widget's class definition.
+
+    \section1 The Project File: taskmenuextension.pro
+
+    The project file must contain some additional information to
+    ensure that the plugin will work as expected:
+
+    \snippet examples/designer/taskmenuextension/taskmenuextension.pro 0
+    \snippet examples/designer/taskmenuextension/taskmenuextension.pro 1
+
+    The \c TEMPLATE variable's value makes \c qmake create the custom
+    widget as a library. Later, we will ensure that the widget will be
+    recognized as a plugin by Qt by using the Q_EXPORT_PLUGIN2() macro to
+    export the relevant widget information.
+
+    The \c CONFIG variable contains two values, \c designer and \c
+    plugin:
+
+    \list
+        \o \c designer: Since custom widgets plugins rely on components
+           supplied with \QD, this value ensures that our plugin links against
+           \QD's library (\c libQtDesigner.so).
+
+        \o \c plugin: We also need to ensure that \c qmake considers the
+           custom widget a \e plugin library.
+    \endlist
+
+    When Qt is configured to build in both debug and release modes,
+    \QD will be built in release mode.  When this occurs, it is
+    necessary to ensure that plugins are also built in release
+    mode. For that reason we add the \c debug_and_release value to
+    the \c CONFIG variable. Otherwise, if a plugin is built in a mode
+    that is incompatible with \QD, it won't be loaded and
+    installed.
+
+    The header and source files for the widget are declared in the
+    usual way:
+
+    \snippet examples/designer/taskmenuextension/taskmenuextension.pro 2
+
+    We provide an implementation of the plugin interface so that \QD
+    can use the custom widget.  In this particular example we also
+    provide implementations of the task menu extension and the
+    extension factory as well as a dialog implementation.
+
+    It is important to ensure that the plugin is installed in a
+    location that is searched by \QD. We do this by specifying a
+    target path for the project and adding it to the list of items to
+    install:
+
+    \snippet doc/src/snippets/code/doc_src_examples_taskmenuextension.qdoc 0
+
+    The task menu extension is created as a library, and will be
+    installed alongside the other \QD plugins when the project is
+    installed (using \c{make install} or an equivalent installation
+    procedure).
+
+    Note that if you want the plugins to appear in a Visual Studio
+    integration, the plugins must be built in release mode and their
+    libraries must be copied into the plugin directory in the install
+    path of the integration (for an example, see \c {C:/program
+    files/trolltech as/visual studio integration/plugins}).
+
+    For more information about plugins, see the \l {How to Create Qt
+    Plugins} documentation.
+
+    \section1 TicTacToePlugin Class Definition
+
+    The \c TicTacToePlugin class exposes \c the TicTacToe class to
+    \QD. Its definition is equivalent to the \l
+    {designer/customwidgetplugin}{Custom Widget Plugin} example's
+    plugin class which is explained in detail. The only part of the
+    class definition that is specific to this particular custom widget
+    is the class name:
+
+    \snippet examples/designer/taskmenuextension/tictactoeplugin.h 0
+
+    The plugin class provides \QD with basic information about our
+    plugin, such as its class name and its include file. Furthermore
+    it knows how to create instances of the \c TicTacToe widget.
+    TicTacToePlugin also defines the \l
+    {QDesignerCustomWidgetInterface::initialize()}{initialize()}
+    function which is called after the plugin is loaded into \QD. The
+    function's QDesignerFormEditorInterface parameter provides the
+    plugin with a gateway to all of \QD's API's.
+
+    The \c TicTacToePlugin class inherits from both QObject and
+    QDesignerCustomWidgetInterface. It is important to remember, when
+    using multiple inheritance, to ensure that all the interfaces
+    (i.e. the classes that doesn't inherit Q_OBJECT) are made known to
+    the meta object system using the Q_INTERFACES() macro. This
+    enables \QD to use \l qobject_cast() to query for supported
+    interfaces using nothing but a QObject pointer.
+
+    \section1 TicTacToePlugin Class Implementation
+
+    The TicTacToePlugin class implementation is in most parts
+    equivalent to the \l {designer/customwidgetplugin}{Custom Widget
+    Plugin} example's plugin class:
+
+    \snippet examples/designer/taskmenuextension/tictactoeplugin.cpp 0
+
+    The only function that differs significantly is the initialize()
+    function:
+
+    \snippet examples/designer/taskmenuextension/tictactoeplugin.cpp 1
+
+    The \c initialize() function takes a QDesignerFormEditorInterface
+    object as argument.  The QDesignerFormEditorInterface class
+    provides access to Qt Designer's components.
+
+    In \QD you can create two kinds of plugins: custom widget plugins
+    and tool plugins. QDesignerFormEditorInterface provides access to
+    all the \QD components that you normally need to create a tool
+    plugin: the extension manager, the object inspector, the property
+    editor and the widget box. Custom widget plugins have access to
+    the same components.
+
+    \snippet examples/designer/taskmenuextension/tictactoeplugin.cpp 2
+
+    When creating extensions associated with custom widget plugins, we
+    need to access \QD's current extension manager which we retrieve
+    from the QDesignerFormEditorInterface parameter.
+
+    \QD's QDesignerFormEditorInterface holds information about all Qt
+    Designer's components: The action editor, the object inspector,
+    the property editor, the widget box, and the extension and form
+    window managers.
+
+    The QExtensionManager class provides extension management
+    facilities for \QD. Using \QD's current extension manager you can
+    retrieve the extension for a given object. You can also register
+    and unregister an extension for a given object. Remember that an
+    extension is an object which modifies the behavior of \QD.
+
+    When registrering an extension, it is actually the associated
+    extension factory that is registered. In \QD, extension factories
+    are used to look up and create named extensions as they are
+    required. So, in this example, the task menu extension itself is
+    not created until a task menu is requested by the user.
+
+    \snippet examples/designer/taskmenuextension/tictactoeplugin.cpp 3
+
+    We create a \c TicTacToeTaskMenuFactory object that we register
+    using \QD's current \l {QExtensionManager}{extension manager}
+    retrieved from the QDesignerFormEditorInterface parameter. The
+    first argument is the newly created factory and the second
+    argument is an extension identifier which is a string. The \c
+    Q_TYPEID() macro simply converts the string into a QLatin1String.
+
+    The \c TicTacToeTaskMenuFactory class is a subclass of
+    QExtensionFactory. When the user request a task menu by clicking
+    the right mouse button over a widget with the specified task menu
+    extension, \QD's extension manager will run through all its
+    registered factories invoking the first one that is able to create
+    a task menu extension for the selected widget. This factory will
+    in turn create a \c TicTacToeTaskMenu object (the extension).
+
+    We omit to reimplement the
+    QDesignerCustomWidgetInterface::domXml() function (which include
+    default settings for the widget in the standard XML format used by
+    Qt Designer), since no default values are necessary.
+
+    \snippet examples/designer/taskmenuextension/tictactoeplugin.cpp 4
+
+    Finally, we use the Q_EXPORT_PLUGIN2() macro to export the
+    TicTacToePlugin class for use with Qt's plugin handling classes:
+    This macro ensures that \QD can access and construct the custom
+    widget. Without this macro, there is no way for \QD to use the
+    widget.
+
+    \section1 TicTacToeTaskMenuFactory Class Definition
+
+    The \c TicTacToeTaskMenuFactory class inherits QExtensionFactory
+    which provides a standard extension factory for \QD.
+
+    \snippet examples/designer/taskmenuextension/tictactoetaskmenu.h 1
+
+    The subclass's purpose is to reimplement the
+    QExtensionFactory::createExtension() function, making it able to
+    create a \c TicTacToe task menu extension.
+
+    \section1 TicTacToeTaskMenuFactory Class Implementation
+
+    The class constructor simply calls the QExtensionFactory base
+    class constructor:
+
+    \snippet examples/designer/taskmenuextension/tictactoetaskmenu.cpp 4
+
+    As described above, the factory is invoked when the user request a
+    task menu by clicking the right mouse button over a widget with
+    the specified task menu extension in \QD.
+
+    \QD's behavior is the same whether the requested extension is
+    associated with a container, a member sheet, a property sheet or a
+    task menu: Its extension manager runs through all its registered
+    extension factories calling \c createExtension() for each until
+    one responds by creating the requested extension.
+
+    \snippet examples/designer/taskmenuextension/tictactoetaskmenu.cpp 5
+
+    So the first thing we do in \c
+    TicTacToeTaskMenuFactory::createExtension() is to check if the
+    requested extension is a task menu extension. If it is, and the
+    widget requesting it is a \c TicTacToe widget, we create and
+    return a \c TicTacToeTaskMenu object. Otherwise, we simply return
+    a null pointer, allowing \QD's extension manager to continue its
+    search through the registered factories.
+
+
+    \section1 TicTacToeTaskMenu Class Definition
+
+    \image taskmenuextension-menu.png
+
+    The \c TicTacToeTaskMenu class inherits QDesignerTaskMenuExtension
+    which allows you to add custom entries (in the form of QActions)
+    to the task menu in \QD.
+
+    \snippet examples/designer/taskmenuextension/tictactoetaskmenu.h 0
+
+    We reimplement the \c preferredEditAction() and \c taskActions()
+    functions. Note that we implement a constructor that takes \e two
+    arguments: the parent widget, and the \c TicTacToe widget for
+    which the task menu is requested.
+
+    In addition we declare the private \c editState() slot, our custom
+    \c editStateAction and a private pointer to the \c TicTacToe
+    widget which state we want to modify.
+
+    \section1 TicTacToeTaskMenu Class Implementation
+
+    \snippet examples/designer/taskmenuextension/tictactoetaskmenu.cpp 0
+
+    In the constructor we first save the reference to the \c TicTacToe
+    widget sent as parameter, i.e the widget which state we want to
+    modify. We will need this later when our custom action is
+    invoked. We also create our custom \c editStateAction and connect
+    it to the \c editState() slot.
+
+    \snippet examples/designer/taskmenuextension/tictactoetaskmenu.cpp 1
+
+    The \c editState() slot is called whenever the user chooses the
+    \gui {Edit State...} option in a \c TicTacToe widget's task menu. The
+    slot creates a \c TicTacToeDialog presenting the current state of
+    the widget, and allowing the user to edit its state by playing the
+    game.
+
+    \snippet examples/designer/taskmenuextension/tictactoetaskmenu.cpp 2
+
+    We reimplement the \c preferredEditAction() function to return our
+    custom \c editStateAction as the action that should be invoked
+    when selecting a \c TicTacToe widget and pressing \key F2 .
+
+    \snippet examples/designer/taskmenuextension/tictactoetaskmenu.cpp 3
+
+    We reimplement the \c taskActions() function to return a list of
+    our custom actions making these appear on top of the default menu
+    entries in a \c TicTacToe widget's task menu.
+
+    \section1 TicTacToeDialog Class Definition
+
+    \image taskmenuextension-dialog.png
+
+    The \c TicTacToeDialog class inherits QDialog. The dialog lets the
+    user modify the state of the currently selected Tic-Tac-Toe
+    plugin.
+
+    \snippet examples/designer/taskmenuextension/tictactoedialog.h 0
+
+    We reimplement the \c sizeHint() function. We also declare two
+    private slots: \c resetState() and \c saveState(). In addition to
+    the dialog's buttons and layouts we declare two \c TicTacToe
+    pointers, one to the widget the user can interact with and the
+    other to the original custom widget plugin which state the user
+    wants to edit.
+
+    \section1 TicTacToeDialog Class Implementation
+
+    \snippet examples/designer/taskmenuextension/tictactoedialog.cpp 0
+
+    In the constructor we first save the reference to the TicTacToe
+    widget sent as parameter, i.e the widget which state the user want
+    to modify. Then we create a new \c TicTacToe widget, and set its
+    state to be equivalent to the parameter widget's state.
+
+    Finally, we create the dialog's buttons and layout.
+
+    \snippet examples/designer/taskmenuextension/tictactoedialog.cpp 1
+
+    We reimplement the \c sizeHint() function to ensure that the
+    dialog is given a reasonable size.
+
+    \snippet examples/designer/taskmenuextension/tictactoedialog.cpp 2
+
+    The \c resetState() slot is called whenever the user press the
+    \gui Reset button. The only thing we do is to call the \c
+    clearBoard() function for the editor widget, i.e. the \c TicTacToe
+    widget we created in the dialog's constructor.
+
+    \snippet examples/designer/taskmenuextension/tictactoedialog.cpp 3
+
+    The \c saveState() slot is called whenever the user press the \gui
+    OK button, and transfers the state of the editor widget to the
+    widget which state we want to modify. In order to make the change
+    of state visible to \QD we need to set the latter widget's state
+    property using the QDesignerFormWindowInterface class.
+
+    QDesignerFormWindowInterface provides you with information about
+    the associated form window as well as allowing you to alter its
+    properties. The interface is not intended to be instantiated
+    directly, but to provide access to Qt Designer's current form
+    windows controlled by Qt Designer's form window manager.
+
+    If you are looking for the form window containing a specific
+    widget, you can use the static
+    QDesignerFormWindowInterface::findFormWindow() function:
+
+    \snippet examples/designer/taskmenuextension/tictactoedialog.cpp 4
+
+    After retrieving the form window of the widget (which state we
+    want to modify), we use the QDesignerFormWindowInterface::cursor()
+    function to retrieve the form window's cursor.
+
+    The QDesignerFormWindowCursorInterface class provides an interface
+    to the form window's text cursor. Once we have cursor, we can
+    finally set the state property using the
+    QDesignerFormWindowCursorInterface::setProperty() function.
+
+    \snippet examples/designer/taskmenuextension/tictactoedialog.cpp 5
+
+    In the end we call the QEvent::accept() function which sets the
+    accept flag of the event object. Setting the \c accept parameter
+    indicates that the event receiver wants the event. Unwanted events
+    might be propagated to the parent widget.
+
+    \section1 TicTacToe Class Definition
+
+    The \c TicTacToe class is a custom widget that lets the user play
+    the Tic-Tac-Toe game.
+
+    \snippet examples/designer/taskmenuextension/tictactoe.h 0
+
+    The main details to observe in the \c TicTacToe class defintion is
+    the declaration of the \c state property and its \c state() and \c
+    setState() functions.
+
+    We need to declare the \c TicTacToe widget's state as a property
+    to make it visible to \QD; allowing \QD to manage it in the same
+    way it manages the properties the \c TicTacToe widget inherits
+    from QWidget and QObject, for example featuring the property
+    editor.
+*/
diff --git a/doc/src/examples/tetrix.qdoc b/doc/src/examples/tetrix.qdoc
new file mode 100644
index 0000000000..b9adb9804f
--- /dev/null
+++ b/doc/src/examples/tetrix.qdoc
@@ -0,0 +1,445 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \example widgets/tetrix
+    \title Tetrix Example
+
+    The Tetrix example is a Qt version of the classic Tetrix game.
+
+    \image tetrix-example.png
+
+    The object of the game is to stack pieces dropped from the top of the
+    playing area so that they fill entire rows at the bottom of the playing area.
+
+    When a row is filled, all the blocks on that row are removed, the player earns
+    a number of points, and the pieces above are moved down to occupy that row.
+    If more than one row is filled, the blocks on each row are removed, and the
+    player earns extra points.
+
+    The \gui{Left} cursor key moves the current piece one space to the left, the
+    \gui{Right} cursor key moves it one space to the right, the \gui{Up} cursor
+    key rotates the piece counter-clockwise by 90 degrees, and the \gui{Down}
+    cursor key rotates the piece clockwise by 90 degrees.
+
+    To avoid waiting for a piece to fall to the bottom of the board, press \gui{D}
+    to immediately move the piece down by one row, or press the \gui{Space} key to
+    drop it as close to the bottom of the board as possible.
+
+    This example shows how a simple game can be created using only three classes:
+
+    \list
+    \o The \c TetrixWindow class is used to display the player's score, number of
+       lives, and information about the next piece to appear.
+    \o The \c TetrixBoard class contains the game logic, handles keyboard input, and
+       displays the pieces on the playing area.
+    \o The \c TetrixPiece class contains information about each piece.
+    \endlist
+
+    In this approach, the \c TetrixBoard class is the most complex class, since it
+    handles the game logic and rendering. One benefit of this is that the
+    \c TetrixWindow and \c TetrixPiece classes are very simple and contain only a
+    minimum of code.
+
+    \section1 TetrixWindow Class Definition
+
+    The \c TetrixWindow class is used to display the game information and contains
+    the playing area:
+
+    \snippet examples/widgets/tetrix/tetrixwindow.h 0
+
+    We use private member variables for the board, various display widgets, and
+    buttons to allow the user to start a new game, pause the current game, and quit.
+
+    Although the window inherits QWidget, the constructor does not provide an
+    argument to allow a parent widget to be specified. This is because the window
+    will always be used as a top-level widget.
+
+    \section1 TetrixWindow Class Implementation
+
+    The constructor sets up the user interface elements for the game:
+
+    \snippet examples/widgets/tetrix/tetrixwindow.cpp 0
+
+    We begin by constructing a \c TetrixBoard instance for the playing area and a
+    label that shows the next piece to be dropped into the playing area; the label
+    is initially empty.
+
+    Three QLCDNumber objects are used to display the score, number of lives, and
+    lines removed. These initially show default values, and will be filled in
+    when a game begins:
+
+    \snippet examples/widgets/tetrix/tetrixwindow.cpp 1
+
+    Three buttons with shortcuts are constructed so that the user can start a
+    new game, pause the current game, and quit the application:
+
+    \snippet examples/widgets/tetrix/tetrixwindow.cpp 2
+    \snippet examples/widgets/tetrix/tetrixwindow.cpp 3
+
+    These buttons are configured so that they never receive the keyboard focus;
+    we want the keyboard focus to remain with the \c TetrixBoard instance so that
+    it receives all the keyboard events. Nonetheless, the buttons will still respond
+    to \key{Alt} key shortcuts.
+
+    We connect \l{QAbstractButton::}{clicked()} signals from the \gui{Start}
+    and \gui{Pause} buttons to the board, and from the \gui{Quit} button to the
+    application's \l{QApplication::}{quit()} slot.
+
+    \snippet examples/widgets/tetrix/tetrixwindow.cpp 4
+    \snippet examples/widgets/tetrix/tetrixwindow.cpp 5
+
+    Signals from the board are also connected to the LCD widgets for the purpose of
+    updating the score, number of lives, and lines removed from the playing area.
+
+    We place the label, LCD widgets, and the board into a QGridLayout
+    along with some labels that we create with the \c createLabel() convenience
+    function:
+
+    \snippet examples/widgets/tetrix/tetrixwindow.cpp 6
+
+    Finally, we set the grid layout on the widget, give the window a title, and
+    resize it to an appropriate size.
+
+    The \c createLabel() convenience function simply creates a new label on the
+    heap, gives it an appropriate alignment, and returns it to the caller:
+
+    \snippet examples/widgets/tetrix/tetrixwindow.cpp 7
+
+    Since each label will be used in the widget's layout, it will become a child
+    of the \c TetrixWindow widget and, as a result, it will be deleted when the
+    window is deleted.
+
+    \section1 TetrixPiece Class Definition
+
+    The \c TetrixPiece class holds information about a piece in the game's
+    playing area, including its shape, position, and the range of positions it can
+    occupy on the board:
+
+    \snippet examples/widgets/tetrix/tetrixpiece.h 0
+
+    Each shape contains four blocks, and these are defined by the \c coords private
+    member variable. Additionally, each piece has a high-level description that is
+    stored internally in the \c pieceShape variable.
+
+    The constructor is written inline in the definition, and simply ensures that
+    each piece is initially created with no shape. The \c shape() function simply
+    returns the contents of the \c pieceShape variable, and the \c x() and \c y()
+    functions return the x and y-coordinates of any given block in the shape.
+
+    \section1 TetrixPiece Class Implementation
+
+    The \c setRandomShape() function is used to select a random shape for a piece:
+
+    \snippet examples/widgets/tetrix/tetrixpiece.cpp 0
+
+    For convenience, it simply chooses a random shape from the \c TetrixShape enum
+    and calls the \c setShape() function to perform the task of positioning the
+    blocks.
+
+    The \c setShape() function uses a look-up table of pieces to associate each
+    shape with an array of block positions:
+
+    \snippet examples/widgets/tetrix/tetrixpiece.cpp 1
+    \snippet examples/widgets/tetrix/tetrixpiece.cpp 2
+
+    These positions are read from the table into the piece's own array of positions,
+    and the piece's internal shape information is updated to use the new shape.
+
+    The \c x() and \c y() functions are implemented inline in the class definition,
+    returning positions defined on a grid that extends horizontally and vertically
+    with coordinates from -2 to 2. Although the predefined coordinates for each
+    piece only vary horizontally from -1 to 1 and vertically from -1 to 2, each
+    piece can be rotated by 90, 180, and 270 degrees.
+
+    The \c minX() and \c maxX() functions return the minimum and maximum horizontal
+    coordinates occupied by the blocks that make up the piece:
+
+    \snippet examples/widgets/tetrix/tetrixpiece.cpp 3
+    \snippet examples/widgets/tetrix/tetrixpiece.cpp 4
+
+    Similarly, the \c minY() and \c maxY() functions return the minimum and maximum
+    vertical coordinates occupied by the blocks:
+
+    \snippet examples/widgets/tetrix/tetrixpiece.cpp 5
+    \snippet examples/widgets/tetrix/tetrixpiece.cpp 6
+
+    The \c rotatedLeft() function returns a new piece with the same shape as an
+    existing piece, but rotated counter-clockwise by 90 degrees:
+
+    \snippet examples/widgets/tetrix/tetrixpiece.cpp 7
+
+    Similarly, the \c rotatedRight() function returns a new piece with the same
+    shape as an existing piece, but rotated clockwise by 90 degrees:
+
+    \snippet examples/widgets/tetrix/tetrixpiece.cpp 9
+
+    These last two functions enable each piece to create rotated copies of itself.
+
+    \section1 TetrixBoard Class Definition
+
+    The \c TetrixBoard class inherits from QFrame and contains the game logic and display features:
+
+    \snippet examples/widgets/tetrix/tetrixboard.h 0
+
+    Apart from the \c setNextPieceLabel() function and the \c start() and \c pause()
+    public slots, we only provide public functions to reimplement QWidget::sizeHint()
+    and QWidget::minimumSizeHint(). The signals are used to communicate changes to
+    the player's information to the \c TetrixWindow instance.
+
+    The rest of the functionality is provided by reimplementations of protected event
+    handlers and private functions:
+
+    \snippet examples/widgets/tetrix/tetrixboard.h 1
+
+    The board is composed of a fixed-size array whose elements correspond to
+    spaces for individual blocks. Each element in the array contains a \c TetrixShape
+    value corresponding to the type of shape that occupies that element.
+
+    Each shape on the board will occupy four elements in the array, and these will
+    all contain the enum value that corresponds to the type of the shape.
+
+    We use a QBasicTimer to control the rate at which pieces fall toward the bottom
+    of the playing area. This allows us to provide an implementation of
+    \l{QObject::}{timerEvent()} that we can use to update the widget.
+
+    \section1 TetrixBoard Class Implementation
+
+    In the constructor, we customize the frame style of the widget, ensure that
+    keyboard input will be received by the widget by using Qt::StrongFocus for the
+    focus policy, and initialize the game state:
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 0
+
+    The first (next) piece is also set up with a random shape.
+
+    The \c setNextPieceLabel() function is used to pass in an externally-constructed
+    label to the board, so that it can be shown alongside the playing area:
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 1
+
+    We provide a reasonable size hint and minimum size hint for the board, based on
+    the size of the space for each block in the playing area:
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 2
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 3
+
+    By using a minimum size hint, we indicate to the layout in the parent widget
+    that the board should not shrink below a minimum size.
+
+    A new game is started when the \c start() slot is called. This resets the
+    game's state, the player's score and level, and the contents of the board:
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 4
+
+    We also emit signals to inform other components of these changes before creating
+    a new piece that is ready to be dropped into the playing area. We start the
+    timer that determines how often the piece drops down one row on the board.
+
+    The \c pause() slot is used to temporarily stop the current game by stopping the
+    internal timer:
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 5
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 6
+
+    We perform checks to ensure that the game can only be paused if it is already
+    running and not already paused.
+
+    The \c paintEvent() function is straightforward to implement. We begin by
+    calling the base class's implementation of \l{QWidget::}{paintEvent()} before
+    constructing a QPainter for use on the board:
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 7
+
+    Since the board is a subclass of QFrame, we obtain a QRect that covers the area
+    \e inside the frame decoration before drawing our own content.
+
+    If the game is paused, we want to hide the existing state of the board and
+    show some text. We achieve this by painting text onto the widget and returning
+    early from the function. The rest of the painting is performed after this point.
+
+    The position of the top of the board is found by subtracting the total height
+    of each space on the board from the bottom of the frame's internal rectangle.
+    For each space on the board that is occupied by a piece, we call the
+    \c drawSquare() function to draw a block at that position.
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 8
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 9
+
+    Spaces that are not occupied by blocks are left blank.
+
+    Unlike the existing pieces on the board, the current piece is drawn
+    block-by-block at its current position:
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 10
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 11
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 12
+
+    The \c keyPressEvent() handler is called whenever the player presses a key while
+    the \c TetrixBoard widget has the keyboard focus.
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 13
+
+    If there is no current game, the game is running but paused, or if there is no
+    current shape to control, we simply pass on the event to the base class.
+
+    We check whether the event is about any of the keys that the player uses to
+    control the current piece and, if so, we call the relevant function to handle
+    the input:
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 14
+
+    In the case where the player presses a key that we are not interested in, we
+    again pass on the event to the base class's implementation of
+    \l{QWidget::}{keyPressEvent()}.
+
+    The \c timerEvent() handler is called every time the class's QBasicTimer
+    instance times out. We need to check that the event we receive corresponds to
+    our timer. If it does, we can update the board:
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 15
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 16
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 17
+
+    If a row (or line) has just been filled, we create a new piece and reset the
+    timer; otherwise we move the current piece down by one row. We let the base
+    class handle other timer events that we receive.
+
+    The \c clearBoard() function simply fills the board with the
+    \c TetrixShape::NoShape value:
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 18
+
+    The \c dropDown() function moves the current piece down as far as possible on
+    the board, either until it is touching the bottom of the playing area or it is
+    stacked on top of another piece:
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 19
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 20
+
+    The number of rows the piece has dropped is recorded and passed to the
+    \c pieceDropped() function so that the player's score can be updated.
+
+    The \c oneLineDown() function is used to move the current piece down by one row
+    (line), either when the user presses the \gui{D} key or when the piece is
+    scheduled to move:
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 21
+
+    If the piece cannot drop down by one line, we call the \c pieceDropped() function
+    with zero as the argument to indicate that it cannot fall any further, and that
+    the player should receive no extra points for the fall.
+
+    The \c pieceDropped() function itself is responsible for awarding points to the
+    player for positioning the current piece, checking for full rows on the board
+    and, if no lines have been removed, creating a new piece to replace the current
+    one:
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 22
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 23
+
+    We call \c removeFullLines() each time a piece has been dropped. This scans
+    the board from bottom to top, looking for blank spaces on each row.
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 24
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 25
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 26
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 27
+
+    If a row contains no blank spaces, the rows above it are copied down by one row
+    to compress the stack of pieces, the top row on the board is cleared, and the
+    number of full lines found is incremented.
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 28
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 29
+
+    If some lines have been removed, the player's score and the total number of lines
+    removed are updated. The \c linesRemoved() and \c scoreChanged() signals are
+    emitted to send these new values to other widgets in the window.
+
+    Additionally, we set the timer to elapse after half a second, set the
+    \c isWaitingAfterLine flag to indicate that lines have been removed, unset
+    the piece's shape to ensure that it is not drawn, and update the widget.
+    The next time that the \c timerEvent() handler is called, a new piece will be
+    created and the game will continue.
+
+    The \c newPiece() function places the next available piece at the top of the
+    board, and creates a new piece with a random shape:
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 30
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 31
+
+    We place a new piece in the middle of the board at the top. The game is over if
+    the piece can't move, so we unset its shape to prevent it from being drawn, stop
+    the timer, and unset the \c isStarted flag.
+
+    The \c showNextPiece() function updates the label that shows the next piece to
+    be dropped:
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 32
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 33
+
+    We draw the piece's component blocks onto a pixmap that is then set on the label.
+
+    The \c tryMove() function is used to determine whether a piece can be positioned
+    at the specified coordinates:
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 34
+
+    We examine the spaces on the board that the piece needs to occupy and, if they
+    are already occupied by other pieces, we return \c false to indicate that the
+    move has failed.
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 35
+
+    If the piece could be placed on the board at the desired location, we update the
+    current piece and its position, update the widget, and return \c true to indicate
+    success.
+
+    The \c drawSquare() function draws the blocks (normally squares) that make up
+    each piece using different colors for pieces with different shapes:
+
+    \snippet examples/widgets/tetrix/tetrixboard.cpp 36
+
+    We obtain the color to use from a look-up table that relates each shape to an
+    RGB value, and use the painter provided to draw the block at the specified
+    coordinates.
+*/
diff --git a/doc/src/examples/textfinder.qdoc b/doc/src/examples/textfinder.qdoc
new file mode 100644
index 0000000000..2eea15dda8
--- /dev/null
+++ b/doc/src/examples/textfinder.qdoc
@@ -0,0 +1,173 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example uitools/textfinder
+    \title Text Finder Example
+
+    The Text Finder example demonstrates how to dynamically process forms
+    using the QtUiTools module. Dynamic form processing enables a form to
+    be processed at run-time only by changing the .ui file for the project.
+    The program allows the user to look up a particular word within the
+    contents of a text file. This text file is included in the project's
+    resource and is loaded into the display at startup.
+
+    \table
+    \row \o \inlineimage textfinder-example-find.png
+         \o \inlineimage textfinder-example-find2.png
+    \endtable
+
+    \section1 Setting Up The Resource File
+
+    The resources required for Text Finder are:
+    \list
+        \o \e{textfinder.ui} - the user interface file created in QtDesigner
+        \o \e{input.txt} - a text file containing some text to be displayed
+                           in the QTextEdit
+    \endlist
+
+    \e{textfinder.ui} contains all the necessary QWidget objects for the
+    Text Finder. A QLineEdit is used for the user input, a QTextEdit is
+    used to display the contents of \e{input.txt}, a QLabel is used to
+    display the text "Keyword", and a QPushButton is used for the "Find"
+    button. The screenshot below shows the preview obtained in QtDesigner.
+
+    \image textfinder-example-userinterface.png
+
+    A \e{textfinder.qrc} file is used to store both the \e{textfinder.ui}
+    and \e{input.txt} in the application's executable. The file contains 
+    the following code:
+
+    \quotefile examples/uitools/textfinder/textfinder.qrc
+
+    For more information on resource files, see \l{The Qt Resource System}.
+
+    To generate a form at run-time, the example is linked against the
+    QtUiTools module library. This is done in the \c{textfinder.pro} file
+    that contains the following lines:
+
+    \snippet doc/src/snippets/code/doc_src_examples_textfinder.qdoc 0
+
+    \section1 TextFinder Class Definition
+
+    The \c TextFinder class is a subclass of QWidget and it hosts the
+    \l{QWidget}s we need to access in the user interface. The QLabel in the
+    user interface is not declared here as we do not need to access it.
+
+    \snippet examples/uitools/textfinder/textfinder.h 0
+
+    The slot \c{on_find_Button_clicked()} is a slot named according to the
+    \l{Using a Designer .ui File in Your Application#Automatic Connections}
+    {Automatic Connection} naming convention required
+    by \c uic.
+
+    \section1 TextFinder Class Implementation
+
+    The \c TextFinder class's constructor calls the \c loadUiFile() function
+    and then uses \c qFindChild() to access the user interface's
+    \l{QWidget}s.
+
+    \snippet examples/uitools/textfinder/textfinder.cpp 0
+
+    We then use QMetaObject's system to enable signal and slot connections.
+
+    \snippet examples/uitools/textfinder/textfinder.cpp 2
+
+    The loadTextFile() function is called to load \c{input.txt} into
+    QTextEdit to displays its contents.
+
+    \snippet examples/uitools/textfinder/textfinder.cpp 3a
+
+    The \c{TextFinder}'s layout is set with \l{QWidget::}{setLayout()}.
+
+    \snippet examples/uitools/textfinder/textfinder.cpp 3b
+
+    Finally, the window title is set to \e {Text Finder} and \c isFirstTime is
+    set to true.
+
+    \c isFirstTime is used as a flag to indicate whether the search operation
+    has been performed more than once. This is further explained with the
+    \c{on_findButton_clicked()} function.
+
+    The \c{loadUiFile()} function is used to load the user interface file
+    previously created in QtDesigner. The QUiLoader class is instantiated
+    and its \c load() function is used to load the form into \c{formWidget}
+    that acts as a place holder for the user interface. The function then
+    returns \c{formWidget} to its caller.
+
+    \snippet examples/uitools/textfinder/textfinder.cpp 4
+
+    As mentioned earlier, the loadTextFile() function loads \e{input.txt}
+    into QTextEdit to display its contents. Data is read using QTextStream
+    into a QString object, \c line with the QTextStream::readAll() function.
+    The contents of \c line are then appended to \c{ui_textEdit}.
+
+    \snippet examples/uitools/textfinder/textfinder.cpp 5
+
+    The \c{on_findButton_clicked()} function is a slot that is connected to
+    \c{ui_findButton}'s \c clicked() signal. The \c searchString is extracted
+    from the \c ui_lineEdit and the \c document is extracted from \c textEdit.
+    In event there is an empty \c searchString, a QMessageBox is used,
+    requesting the user to enter a word. Otherwise, we traverse through the
+    words in \c ui_textEdit, and highlight all ocurrences of the
+    \c searchString . Two QTextCursor objects are used: One to traverse through
+    the words in \c line and another to keep track of the edit blocks.
+
+    \snippet examples/uitools/textfinder/textfinder.cpp 7
+
+    The \c isFirstTime flag is set to false the moment \c findButton is
+    clicked. This is necessary to undo the previous text highlight before
+    highlighting the user's next search string. Also, the \c found flag
+    is used to indicate if the \c searchString was found within the contents
+    of \c ui_textEdit. If it was not found, a QMessageBox is used
+    to inform the user.
+
+    \snippet examples/uitools/textfinder/textfinder.cpp 9
+
+    \section1 \c main() Function
+
+    \snippet examples/uitools/textfinder/main.cpp 0
+
+    The \c main() function initialises the \e{textfinder.qrc} resource file
+    and instantiates as well as displays \c TextFinder.
+
+    \sa{Calculator Builder Example}, {World Time Clock Builder Example}
+    */
diff --git a/doc/src/examples/textobject.qdoc b/doc/src/examples/textobject.qdoc
new file mode 100644
index 0000000000..cc5a6b610a
--- /dev/null
+++ b/doc/src/examples/textobject.qdoc
@@ -0,0 +1,170 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example richtext/textobject
+    \title Text Object Example
+    
+    The Text Object example shows how to insert an SVG file into a
+    QTextDocument.
+
+    \image textobject-example.png
+
+    A QTextDocument consists of a hierarchy of elements, such as text blocks and
+    frames. A text object describes the structure or format of one or more of these
+    elements. For instance, images imported from HTML are implemented using text
+    objects. Text objects are used by the document's
+    \l{QAbstractTextDocumentLayout}{layout} to lay out and render (paint) the
+    document. Each object knows how to paint the elements they govern, and
+    calculates their size. 
+
+    To be able to insert an SVG image into a text document, we create
+    a text object, and implement painting for that object. This object
+    can then be \l{QTextCharFormat::setObjectType()}{set} on a
+    QTextCharFormat. We also register the text object with the layout
+    of the document, enabling it to draw \l{QTextCharFormat}s governed
+    by our text object. We can summarize the procedure with the
+    following steps:
+
+    \list
+        \o Implement the text object.
+        \o Register the text object with the layout of the text
+           document.
+        \o Set the text object on a QTextCharFormat.
+        \o Insert a QChar::ObjectReplacementCharacter with that
+           text char format into the document.
+    \endlist
+
+    The example consists of the following classes:
+
+    \list
+        \o \c{SvgTextObject} implements the text object.
+        \o \c{Window} shows a QTextEdit into which SVG images can be
+           inserted.
+    \endlist
+
+    \section1 SvgTextObject Class Definition
+
+    Let's take a look at the header file of \c {SvgTextObject}:
+
+    \snippet examples/richtext/textobject/svgtextobject.h 0
+
+    A text object is a QObject that implements QTextObjectInterface.
+    Note that the first class inherited must be QObject, and that
+    you must use Q_INTERFACES to let Qt know that your class
+    implements QTextObjectInterface.
+
+    The document layout keeps a collection of text objects stored as
+    \l{QObject}s, each of which has an associated object type. The
+    layout casts the QObject for the associated object type into the
+    QTextObjectInterface.
+
+    The \l{QTextObjectInterface::}{intrinsicSize()} and
+    \l{QTextObjectInterface::}{drawObject()} functions are then used
+    to calculate the size of the text object and draw it.
+
+    \section1 SvgTextObject Class Implementation
+
+    We start of by taking a look at the
+    \l{QTextObjectInterface::}{intrinsicSize()} function:
+
+    \snippet examples/richtext/textobject/svgtextobject.cpp 0
+
+    \c intrinsicSize() is called by the layout to calculate the size
+    of the text object. Notice that we have drawn the SVG image on a
+    QImage. This is because SVG rendering is quite expensive. The
+    example would lag seriously for large images if we drew them
+    with a QSvgRenderer each time.
+
+    \snippet examples/richtext/textobject/svgtextobject.cpp 1
+
+    In \c drawObject(), we paint the SVG image using the QPainter
+    provided by the layout.
+
+    \section1 Window Class Definition
+
+    The \c Window class is a self-contained window that has a
+    QTextEdit in which SVG images can be inserted.
+
+    \snippet examples/richtext/textobject/window.h 0
+
+    The \c insertTextObject() slot inserts an SVG image at the current
+    cursor position, while \c setupTextObject() creates and registers
+    the SvgTextObject with the layout of the text edit's document.
+
+    The constructor simply calls \c setupTextObject() and \c
+    setupGui(), which creates and lays out the widgets of the \c
+    Window.
+
+    \section1 Window Class Implementation
+
+    We will now take a closer look at the functions that are relevant
+    to our text object, starting with the \c setupTextObject()
+    function.
+    
+    \snippet examples/richtext/textobject/window.cpp 3
+
+    \c {SvgTextFormat}'s value is the number of our object type. It is
+    used to identify object types by the document layout. 
+
+    Note that we only create one SvgTextObject instance; it will be
+    used for all QTextCharFormat's with the \c SvgTextFormat object
+    type.
+
+    Let's move on to the \c insertTextObject() function:
+
+    \snippet examples/richtext/textobject/window.cpp 1
+
+    First, the \c .svg file is opened and its contents are read
+    into the \c svgData array. 
+
+    \snippet examples/richtext/textobject/window.cpp 2
+
+    To speed things up, we buffer the SVG image in a QImage.  We use
+    \l{QTextFormat::}{setProperty()} to store the QImage in the in the
+    QTextCharFormat. We can retrieve it later with
+    \l{QTextCharFormat::}{property()}.
+
+    We insert the char format in the standard way - using a
+    QTextCursor. Notice that we use the special QChar
+    \l{QChar::}{ObjectReplacementCharacter}.
+*/
+
diff --git a/doc/src/examples/textures.qdoc b/doc/src/examples/textures.qdoc
new file mode 100644
index 0000000000..2f0389c3a1
--- /dev/null
+++ b/doc/src/examples/textures.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example opengl/textures
+    \title Textures Example
+
+    The Textures example demonstrates the use of Qt's image classes as textures in
+    applications that use both OpenGL and Qt to display graphics.
+
+    \image textures-example.png
+*/
diff --git a/doc/src/examples/threadedfortuneserver.qdoc b/doc/src/examples/threadedfortuneserver.qdoc
new file mode 100644
index 0000000000..d5f2571899
--- /dev/null
+++ b/doc/src/examples/threadedfortuneserver.qdoc
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example network/threadedfortuneserver
+    \title Threaded Fortune Server Example
+
+    The Threaded Fortune Server example shows how to create a server for a
+    simple network service that uses threads to handle requests from different
+    clients. It is intended to be run alongside the Fortune Client example.
+
+    \image threadedfortuneserver-example.png
+
+    The implementation of this example is similar to that of the
+    \l{network/fortuneserver}{Fortune Server} example, but here we will
+    implement a subclass of QTcpServer that starts each connection in a
+    different thread.
+
+    For this we need two classes: FortuneServer, a QTcpServer subclass, and
+    FortuneThread, which inherits QThread.
+
+    \snippet examples/network/threadedfortuneserver/fortuneserver.h 0
+
+    FortuneServer inherits QTcpServer and reimplements
+    QTcpServer::incomingConnection(). We also use it for storing the list of
+    random fortunes. 
+    
+    \snippet examples/network/threadedfortuneserver/fortuneserver.cpp 0
+
+    We use FortuneServer's constructor to simply generate the list of
+    fortunes.
+
+    \snippet examples/network/threadedfortuneserver/fortuneserver.cpp 1
+
+    Our implementation of QTcpServer::incomingConnection() creates a
+    FortuneThread object, passing the incoming socket descriptor and a random
+    fortune to FortuneThread's constructor. By connecting FortuneThread's
+    finished() signal to QObject::deleteLater(), we ensure that the thread
+    gets deleted once it has finished. We can then call QThread::start(),
+    which starts the thread.
+
+    \snippet examples/network/threadedfortuneserver/fortunethread.h 0
+
+    Moving on to the FortuneThread class, this is a QThread subclass whose job
+    is to write the fortune to the connected socket. The class reimplements
+    QThread::run(), and it has a signal for reporting errors.
+
+    \snippet examples/network/threadedfortuneserver/fortunethread.cpp 0
+    
+    FortuneThread's constructor simply stores the socket descriptor and
+    fortune text, so that they are available for run() later on.
+
+    \snippet examples/network/threadedfortuneserver/fortunethread.cpp 1
+
+    The first thing our run() function does is to create a QTcpSocket object
+    on the stack. What's worth noticing is that we are creating this object
+    inside the thread, which automatically associates the socket to the
+    thread's event loop. This ensures that Qt will not try to deliver events
+    to our socket from the main thread while we are accessing it from
+    FortuneThread::run().
+
+    \snippet examples/network/threadedfortuneserver/fortunethread.cpp 2
+
+    The socket is initialized by calling QTcpSocket::setSocketDescriptor(),
+    passing our socket descriptor as an argument. We expect this to succeed,
+    but just to be sure, (although unlikely, the system may run out of
+    resources,) we catch the return value and report any error.
+
+    \snippet examples/network/threadedfortuneserver/fortunethread.cpp 3
+
+    As with the \l{network/fortuneserver}{Fortune Server} example, we encode
+    the fortune into a QByteArray using QDataStream.
+
+    \snippet examples/network/threadedfortuneserver/fortunethread.cpp 4
+
+    But unlike the previous example, we finish off by calling
+    QTcpSocket::waitForDisconnected(), which blocks the calling thread until
+    the socket has disconnected. Because we are running in a separate thread,
+    the GUI will remain responsive.  
+
+    \sa {Fortune Server Example}, {Fortune Client Example}, {Blocking Fortune
+    Client Example}
+*/
diff --git a/doc/src/examples/tooltips.qdoc b/doc/src/examples/tooltips.qdoc
new file mode 100644
index 0000000000..5daa2b2558
--- /dev/null
+++ b/doc/src/examples/tooltips.qdoc
@@ -0,0 +1,408 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example widgets/tooltips
+    \title Tool Tips Example
+
+    The Tool Tips example shows how to provide static and dynamic tool
+    tips for an application's widgets.
+
+    The simplest and most common way to set a widget's tool tip is by
+    calling its QWidget::setToolTip() function (static tool
+    tips). Then the tool tip is shown whenever the cursor points at
+    the widget. We show how to do this with our application's tool
+    buttons. But it is also possible to show different tool tips
+    depending on the cursor's position (dynamic tooltips). This
+    approach uses mouse tracking and event handling to determine what
+    widgets are located under the cursor at any point in time, and
+    displays their tool tips. The tool tips for the shape items in our
+    application are implemented using the latter approach.
+
+    \image tooltips-example.png
+
+    With the \c Tooltips application the user can create new shape
+    items with the provided tool buttons, and move the items around
+    using the mouse. Tooltips are provided whenever the cursor is
+    pointing to a shape item or one of the buttons.
+
+    The Tooltips example consists of two classes:
+
+    \list
+    \o \c ShapeItem is a custom widget representing one single shape item.
+    \o \c SortingBox inherits from QWidget and is the application's main
+        widget.
+    \endlist
+
+    First we will review the \c SortingBox class, then we will take a
+    look at the \c ShapeItem class.
+
+    \section1  SortingBox Class Definition
+
+    \snippet examples/widgets/tooltips/sortingbox.h 0
+
+    The \c SortingBox class inherits QWidget, and it is the Tooltips
+    application's main widget. We reimplement several of the event
+    handlers.
+
+    The \c event() function provides tooltips, the \c resize()
+    function makes sure the application appears consistently when the
+    user resizes the main widget, and the \c paintEvent() function
+    displays the shape items within the \c SortingBox widget. The
+    mouse event handlers are reimplemented to make the user able to
+    move the items around.
+
+    In addition we need three private slots to make the user able to
+    create new shape items.
+
+    \snippet examples/widgets/tooltips/sortingbox.h 1
+
+    We also create several private functions: We use the \c
+    initialItemPosition(), \c initialItemColor() and \c
+    createToolButton() functions when we are constructing the widget,
+    and we use the \c updateButtonGeometry() function whenever the
+    user is resizing the application's main widget.
+
+    The \c itemAt() function determines if there is a shape item at a
+    particular position, and the \c moveItemTo() function moves an
+    item to a new position. We use the \c createShapeItem(), \c
+    randomItemPosition() and \c randomItemColor() functions to create
+    new shape items.
+
+    \snippet examples/widgets/tooltips/sortingbox.h 2
+
+    We keep all the shape items in a QList, and we keep three
+    QPainterPath objects holding the shapes of a circle, a square and
+    a triangle. We also need to have a pointer to an item when it is
+    moving, and we need to know its previous position.
+
+    \section1 SortingBox Class Implementation
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 0
+
+    In the constructor, we first set the Qt::WA_StaticContents
+    attribute on the widget. This attribute indicates that the widget
+    contents are north-west aligned and static. On resize, such a
+    widget will receive paint events only for the newly visible part
+    of itself.
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 1
+
+    To be able to show the appropiate tooltips while the user is
+    moving the cursor around, we need to enable mouse tracking for the
+    widget.
+
+    If mouse tracking is disabled (the default), the widget only
+    receives mouse move events when at least one mouse button is
+    pressed while the mouse is being moved. If mouse tracking is
+    enabled, the widget receives mouse move events even if no buttons
+    are pressed.
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 2
+
+    A widget's background role defines the brush from the widget's
+    palette that is used to render the background, and QPalette::Base
+    is typically white.
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 3
+
+    After creating the application's tool buttons using the private \c
+    createToolButton() function, we construct the shapes of a circle,
+    a square and a triangle using QPainterPath.
+
+    The QPainterPath class provides a container for painting
+    operations, enabling graphical shapes to be constructed and
+    reused. The main advantage of painter paths over normal drawing
+    operations is that complex shapes only need to be created once,
+    but they can be drawn many times using only calls to
+    QPainter::drawPath().
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 4
+
+    Then we set the window title, resize the widget to a suitable
+    size, and finally create three initial shape items using the
+    private \c createShapeItem(), \c initialItemPosition() and \c
+    initialItemColor() functions.
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 5
+
+    QWidget::event() is the main event handler and receives all the
+    widget's events. Normally, we recommend reimplementing one of the
+    specialized event handlers instead of this function. But here we
+    want to catch the QEvent::ToolTip events, and since these are
+    rather rare, there exists no specific event handler. For that
+    reason we reimplement the main event handler, and the first thing
+    we need to do is to determine the event's type:
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 6
+
+    If the type is QEvent::ToolTip, we cast the event to a QHelpEvent,
+    otherwise we propagate the event using the QWidget::event()
+    function.
+
+    The QHelpEvent class provides an event that is used to request
+    helpful information about a particular point in a widget.
+
+    For example, the QHelpEvent::pos() function returns the event's
+    position relative to the widget to which the event is dispatched.
+    Here we use this information to determine if the position of the
+    event is contained within the area of any of the shape items. If
+    it is, we display the shape item's tooltip at the position of the
+    event. If not, we hide the tooltip and explicitly ignore the event.
+    This makes sure that the calling code does not start any tooltip
+    specific modes as a result of the event. Note that the
+    QToolTip::showText() function needs the event's position in global
+    coordinates provided by QHelpEvent::globalPos().
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 7
+
+    The \c resizeEvent() function is reimplemented to receive the
+    resize events dispatched to the widget. It makes sure that the
+    tool buttons keep their position relative to the main widget when
+    the widget is resized. We want the buttons to always be vertically
+    aligned in the application's bottom right corner, so each time the
+    main widget is resized we update the buttons geometry.
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 8
+
+    The \c paintEvent() function is reimplemented to receive paint
+    events for the widget. We create a QPainter for the \c SortingBox
+    widget, and run through the list of created shape items, drawing
+    each item at its defined position.
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 9
+
+    The painter will by default draw all the shape items at position
+    (0,0) in the \c SortingBox widget. The QPainter::translate()
+    function translates the coordinate system by the given offset,
+    making each shape item appear at its defined position. But
+    remember to translate the coordinate system back when the item is
+    drawn, otherwise the next shape item will appear at a position
+    relative to the item we drawed last.
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 10
+
+    The QPainter::setBrush() function sets the current brush used by
+    the painter. When the provided argument is a QColor, the function
+    calls the appropiate QBrush constructor which creates a brush with
+    the specified color and Qt::SolidPattern style. The
+    QPainter::drawPath() function draws the given path using the
+    current pen for outline and the current brush for filling.
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 11
+
+    The \c mousePressEvent() function is reimplemented to receive the
+    mouse press events dispatched to the widget. It determines if an
+    event's position is contained within the area of any of the shape
+    items, using the private \c itemAt() function.
+
+    If an item covers the position, we store a pointer to that item
+    and the event's position. If several of the shape items cover the
+    position, we store the pointer to the uppermost item. Finally, we
+    move the shape item to the end of the list, and make a call to the
+    QWidget::update() function to make the item appear on top.
+
+    The QWidget::update() function does not cause an immediate
+    repaint; instead it schedules a paint event for processing when Qt
+    returns to the main event loop.
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 12
+
+    The \c mouseMoveEvent() function is reimplemented to receive mouse
+    move events for the widget. If the left mouse button is pressed
+    and there exists a shape item in motion, we use the private \c
+    moveItemTo() function to move the item with an offset
+    corresponding to the offset between the positions of the current
+    mouse event and the previous one.
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 13
+
+    The \c mouseReleaseEvent() function is reimplemented to receive
+    the mouse release events dispatched to the widget. If the left
+    mouse button is pressed and there exists a shape item in motion,
+    we use the private \c moveItemTo() function to move the item like
+    we did in \c mouseMoveEvent(). But then we remove the pointer to
+    the item in motion, making the shape item's position final for
+    now. To move the item further, the user will need to press the
+    left mouse button again.
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 14
+    \codeline
+    \snippet examples/widgets/tooltips/sortingbox.cpp 15
+    \codeline
+    \snippet examples/widgets/tooltips/sortingbox.cpp 16
+
+    The \c createNewCircle(), \c createNewSquare() and \c
+    createNewTriangle() slots simply create new shape items, using the
+    private \c createShapeItem(), \c randomItemPosition() and \c
+    randomItemColor() functions.
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 17
+
+    In the \c itemAt() function, we run through the list of created
+    shape items to check if the given position is contained within the
+    area of any of the shape items.
+
+    For each shape item we use the QPainterPath::contains() function
+    to find out if the item's painter path contains the position. If
+    it does we return the index of the item, otherwise we return
+    -1. We run through the list backwards to get the index of the
+    uppermost shape item in case several items cover the position.
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 18
+
+    The \c moveItemTo() function moves the shape item in motion, and
+    the parameter \c pos is the position of a mouse event. First we
+    calculate the offset between the parameter \c pos and the previous
+    mouse event position. Then we add the offset to the current
+    position of the item in motion.
+
+    It is tempting to simply set the position of the item to be the
+    parameter \c pos. But an item's position defines the top left
+    corner of the item's bounding rectangle, and the parameter \c pos
+    can be any point; The suggested shortcut would cause the item to
+    jump to a position where the cursor is pointing to the bounding
+    rectangle's top left corner, regardless of the item's previous
+    position.
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 19
+
+    Finally, we update the previous mouse event position, and make a
+    call to the QWidget::update() function to make the item appear at
+    its new position.
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 20
+
+    In the \c updateButtonGeometry() function we set the geometry for
+    the given button. The parameter coordinates define the bottom
+    right corner of the button. We use these coordinates and the
+    button's size hint to determine the position of the upper left
+    corner. This position, and the button's width and height, are the
+    arguments required by the QWidget::setGeometry() function.
+
+    In the end, we calculate and return the y-coordinate of the bottom
+    right corner of the next button. We use the QWidget::style()
+    function to retrieve the widget's GUI style, and then
+    QStyle::pixelMetric() to determine the widget's preferred default
+    spacing between its child widgets.
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 21
+
+    The \c createShapeItem() function creates a single shape item. It
+    sets the path, tooltip, position and color, using the item's own
+    functions. In the end, the function appends the new item to the
+    list of shape items, and calls the QWidget::update() function to
+    make it appear with the other items within the \c SortingBox
+    widget.
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 22
+
+    The \c createToolButton() function is called from the \c
+    SortingBox constructor. We create a tool button with the given
+    tooltip and icon. The button's parent is the \c SortingBox widget,
+    and its size is 32 x 32 pixels. Before we return the button, we
+    connect it to the given slot.
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 23
+
+    The \c initialItemPosition() function is also called from the
+    constructor. We want the three first items to initially be
+    centered in the middle of the \c SortingBox widget, and we use
+    this function to calculate their positions.
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 24
+
+    Whenever the user creates a new shape item, we want the new item
+    to appear at a random position, and we use the \c
+    randomItemPosition() function to calculate such a position. We
+    make sure that the item appears within the the visible area of the
+    \c SortingBox widget, using the widget's current width and heigth
+    when calculating the random coordinates.
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 25
+
+    As with \c initialItemPosition(), the \c initialItemColor()
+    function is called from the constructor. The purposes of both
+    functions are purely cosmetic: We want to control the inital
+    position and color of the three first items.
+
+    \snippet examples/widgets/tooltips/sortingbox.cpp 26
+
+    Finally the \c randomItemColor() function is implemented to give
+    the shape items the user creates, a random color.
+
+    \section1 ShapeItem Class Definition
+
+    \snippet examples/widgets/tooltips/shapeitem.h 0
+
+    The \c ShapeItem class is a custom widget representing one single
+    shape item. The widget has a path, a position, a color and a
+    tooltip. We need functions to set or modify these objects, as well
+    as functions that return them. We make the latter functions \c
+    const to prohibit any modifications of the objects,
+    i.e. prohibiting unauthorized manipulation of the shape items
+    appearance.
+
+    \section1 ShapeItem Class Implementation
+
+    \snippet examples/widgets/tooltips/shapeitem.cpp 0
+    \codeline
+    \snippet examples/widgets/tooltips/shapeitem.cpp 1
+    \codeline
+    \snippet examples/widgets/tooltips/shapeitem.cpp 2
+    \codeline
+    \snippet examples/widgets/tooltips/shapeitem.cpp 3
+
+    This first group of functions simply return the objects that are
+    requested. The objects are returned as constants, i.e. they cannot
+    be modified.
+
+    \snippet examples/widgets/tooltips/shapeitem.cpp 4
+    \codeline
+    \snippet examples/widgets/tooltips/shapeitem.cpp 5
+    \codeline
+    \snippet examples/widgets/tooltips/shapeitem.cpp 6
+    \codeline
+    \snippet examples/widgets/tooltips/shapeitem.cpp 7
+
+    The last group of functions set or modify the shape item's path,
+    position, color and tooltip, respectively.
+*/
diff --git a/doc/src/examples/torrent.qdoc b/doc/src/examples/torrent.qdoc
new file mode 100644
index 0000000000..8805dadc03
--- /dev/null
+++ b/doc/src/examples/torrent.qdoc
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example network/torrent
+    \title Torrent Example
+
+    The Torrent example is a functional BitTorrent client that
+    illustrates how to write a complex TCP/IP application using Qt.
+
+    \image torrent-example.png
+
+    \section1 License Information
+
+    The implementation of the US Secure Hash Algorithm 1 (SHA1) in this example is
+    derived from the original description in \l{RFC 3174}.
+
+    \legalese
+    Copyright (C) The Internet Society (2001).  All Rights Reserved.
+
+    This document and translations of it may be copied and furnished to
+    others, and derivative works that comment on or otherwise explain it
+    or assist in its implementation may be prepared, copied, published
+    and distributed, in whole or in part, without restriction of any
+    kind, provided that the above copyright notice and this paragraph are
+    included on all such copies and derivative works.  However, this
+    document itself may not be modified in any way, such as by removing
+    the copyright notice or references to the Internet Society or other
+    Internet organizations, except as needed for the purpose of
+    developing Internet standards in which case the procedures for
+    copyrights defined in the Internet Standards process must be
+    followed, or as required to translate it into languages other than
+    English.
+
+    The limited permissions granted above are perpetual and will not be
+    revoked by the Internet Society or its successors or assigns.
+
+    This document and the information contained herein is provided on an
+    "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+    TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+    BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+    HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+    MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+    \endlegalese
+*/
diff --git a/doc/src/examples/trafficinfo.qdoc b/doc/src/examples/trafficinfo.qdoc
new file mode 100644
index 0000000000..c9b6890651
--- /dev/null
+++ b/doc/src/examples/trafficinfo.qdoc
@@ -0,0 +1,163 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example xmlpatterns/trafficinfo
+    \title TrafficInfo Example
+
+    Shows how XQuery can be used extract information from WML documents provided by a WAP service.
+
+    \section1 Overview
+
+    The WAP service used in this example is \l{Trafikanten}{wap.trafikanten.no}
+    that is run by the Norwegian governmental agency for public transport in
+    Oslo. The service provides real time information about the departure of
+    busses, trams and undergrounds for every station in the city area.
+
+    This example application displays the departure information for a specific
+    station and provides the feature to filter for a special bus or tram line.
+
+    \image trafficinfo-example.png
+
+    \section1 Retrieving the Data
+
+    Without the knowledge of XQuery, one would use QNetworkAccessManager to
+    query the WML document from the WAP service and then using the QDom
+    classes or QXmlStreamReader classes to iterate over the document and
+    extract the needed information.
+    However this approach results in a lot of glue code and consumes valuable
+    developer time, so we are looking for something that can access XML
+    documents locally or over the network and extract data according to given
+    filter rules. That's the point where XQuery enters the stage!
+
+    If we want to know when the underground number 6 in direction
+    \Aring\c{}sjordet is passing the underground station in Nydalen on November
+    14th 2008 after 1pm, we use the following URL:
+
+    \c{http://wap.trafikanten.no/F.asp?f=03012130&t=13&m=00&d=14.11.2008&start=1}
+
+    The parameters have the following meanings:
+    \list
+        \o \e{f} The unique station ID of Nydalen.
+        \o \e{t} The hour in 0-23 format.
+        \o \e{m} The minute in 0-59 format.
+        \o \e{d} The date in dd.mm.yyyy format.
+        \o \e{start} Not interesting for our use but should be passed.
+    \endlist
+
+    As a result we get the following document:
+
+    \quotefile examples/xmlpatterns/trafficinfo/time_example.wml
+
+    So for every departure we have a \c <a> tag that contains the time as a
+    text element, and the following text element contains the line number
+    and direction.
+
+    To encapsulate the XQuery code in the example application, we create a
+    custom \c TimeQuery class. This provides the \c queryInternal() function
+    that takes a station ID and date/time as input and returns the list of
+    times and directions:
+
+    \snippet examples/xmlpatterns/trafficinfo/timequery.cpp 1
+
+    The first lines of this function synthesize the XQuery strings that fetch
+    the document and extract the data.
+    For better readability, two separated queries are used here: the first one
+    fetches the times and the second fetches the line numbers and directions.
+
+    The \c doc() XQuery method opens a local or remote XML document and returns
+    it, so the \c{/wml/card/p/small/} statement behind it selects all XML nodes
+    that can be reached by the path, \c wml \rarrow \c card \rarrow \c p \rarrow
+    \c small.
+    Now we are on the node that contains all the XML nodes we are interested in.
+
+    In the first query we select all \c a nodes that have a \c href attribute
+    starting with the string "Rute" and return the text of these nodes.
+
+    In the second query we select all text nodes that are children of the
+    \c small node which start with a number.
+    These two queries are passed to the QXmlQuery instance and are evaluated
+    to string lists. After some sanity checking, we have collected all the
+    information we need.
+
+    In the section above we have seen that an unique station ID must be passed
+    as an argument to the URL for retrieving the time, so how to find out which
+    is the right station ID to use? The WAP service provides a page for that
+    as well, so the URL
+
+    \c{http://wap.trafikanten.no/FromLink1.asp?fra=Nydalen}
+
+    will return the following document:
+
+    \snippet examples/xmlpatterns/trafficinfo/station_example.wml 0
+
+    The names of the available stations are listed as separate text elements
+    and the station ID is part of the \c href attribute of the parent \c a
+    (anchor) element. In our example, the \c StationQuery class encapsulates
+    the action of querying the stations that match the given name pattern with
+    the following code:
+
+    \snippet examples/xmlpatterns/trafficinfo/stationquery.cpp 0
+
+    Just as in the \c TimeQuery implementation, the first step is to
+    synthesize the XQuery strings for selecting the station names and the
+    station IDs. As the station name that we pass in the URL will be input
+    from the user, we should protect the XQuery from code injection by using
+    the QXmlQuery::bindVariable() method to do proper quoting of the variable
+    content for us instead of concatenating the two strings manually.
+
+    So, we define a XQuery \c $station variable that is bound to the user
+    input. This variable is concatenated inside the XQuery code with the
+    \c concat method. To extract the station IDs, we select all \c a elements
+    that have an \c title attribute with the content "Velg", and from these
+    elements we take the substring of the \c href attribute that starts at the
+    18th character.
+
+    The station name can be extracted a bit more easily by just taking the
+    text elements of the selected \a elements.
+
+    After some sanity checks we have all the station IDs and the corresponding
+    names available.
+
+    The rest of the code in this example is just for representing the time and
+    station information to the user, and uses techniques described in the
+    \l{Qt Examples#Widgets}{Widgets examples}.
+*/
diff --git a/doc/src/examples/transformations.qdoc b/doc/src/examples/transformations.qdoc
new file mode 100644
index 0000000000..eabb8033d2
--- /dev/null
+++ b/doc/src/examples/transformations.qdoc
@@ -0,0 +1,385 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example painting/transformations
+    \title Transformations Example
+
+    The Transformations example shows how transformations influence
+    the way that QPainter renders graphics primitives. In particular
+    it shows how the order of transformations affect the result.
+
+    \image transformations-example.png
+
+    The application allows the user to manipulate the rendering of a
+    shape by changing the translation, rotation and scale of
+    QPainter's coordinate system.
+
+    The example consists of two classes and a global enum:
+
+    \list
+    \o The \c RenderArea class controls the rendering of a given shape.
+    \o The \c Window class is the application's main window.
+    \o The \c Operation enum describes the various transformation
+       operations available in the application.
+    \endlist
+
+    First we will take a quick look at the \c Operation enum, then we
+    will review the \c RenderArea class to see how a shape is
+    rendered. Finally, we will take a look at the Transformations
+    application's features implemented in the \c Window class.
+
+    \section1 Transformation Operations
+
+    Normally, the QPainter operates on the associated device's own
+    coordinate system, but it also has good support for coordinate
+    transformations.
+
+    The default coordinate system of a paint device has its origin at
+    the top-left corner. The x values increase to the right and the y
+    values increase downwards. You can scale the coordinate system by
+    a given offset using the QPainter::scale() function, you can
+    rotate it clockwise using the QPainter::rotate() function and you
+    can translate it (i.e. adding a given offset to the points) using
+    the QPainter::translate() function. You can also twist the
+    coordinate system around the origin (called shearing) using the
+    QPainter::shear() function.
+
+    All the tranformation operations operate on QPainter's
+    tranformation matrix that you can retrieve using the
+    QPainter::matrix() function. A matrix transforms a point in the
+    plane to another point. For more information about the
+    transformation matrix, see the \l {The Coordinate System} and
+    QMatrix documentation.
+
+    \snippet examples/painting/transformations/renderarea.h 0
+
+    The global \c Operation enum is declared in the \c renderarea.h
+    file and describes the various transformation operations available
+    in the Transformations application.
+
+    \section1 RenderArea Class Definition
+
+    The \c RenderArea class inherits QWidget, and controls the
+    rendering of a given shape.
+
+    \snippet examples/painting/transformations/renderarea.h 1
+
+    We declare two public functions, \c setOperations() and
+    \c setShape(), to be able to specify the \c RenderArea widget's shape
+    and to transform the coordinate system the shape is rendered
+    within.
+
+    We reimplement the QWidget's \l
+    {QWidget::minimumSizeHint()}{minimumSizeHint()} and \l
+    {QWidget::sizeHint()}{sizeHint()} functions to give the \c
+    RenderArea widget a reasonable size within our application, and we
+    reimplement the QWidget::paintEvent() event handler to draw the
+    render area's shape applying the user's transformation choices.
+
+    \snippet examples/painting/transformations/renderarea.h 2
+
+    We also declare several convenience functions to draw the shape,
+    the coordinate system's outline and the coordinates, and to
+    transform the painter according to the chosen transformations.
+
+    In addition, the \c RenderArea widget keeps a list of the
+    currently applied transformation operations, a reference to its
+    shape, and a couple of convenience variables that we will use when
+    rendering the coordinates.
+
+    \section1 RenderArea Class Implementation
+
+    The \c RenderArea widget controls the rendering of a given shape,
+    including the transformations of the coordinate system, by
+    reimplementing the QWidget::paintEvent() event handler. But first
+    we will take a quick look at the constructor and at the functions
+    that provides access to the \c RenderArea widget:
+
+    \snippet examples/painting/transformations/renderarea.cpp 0
+
+    In the constructor we pass the parent parameter on to the base
+    class, and customize the font that we will use to render the
+    coordinates. The QWidget::font() funtion returns the font
+    currently set for the widget. As long as no special font has been
+    set, or after QWidget::setFont() is called, this is either a
+    special font for the widget class, the parent's font or (if this
+    widget is a top level widget) the default application font.
+
+    After ensuring that the font's size is 12 points, we extract the
+    rectangles enclosing the coordinate letters, 'x' and 'y',  using the
+    QFontMetrics class.
+
+    QFontMetrics provides functions to access the individual metrics
+    of the font, its characters, and for strings rendered in the
+    font. The QFontMetrics::boundingRect() function returns the
+    bounding rectangle of the given character relative to the
+    left-most point on the base line.
+
+    \snippet examples/painting/transformations/renderarea.cpp 1
+    \codeline
+    \snippet examples/painting/transformations/renderarea.cpp 2
+
+    In the \c setShape() and \c setOperations() functions we update
+    the \c RenderArea widget by storing the new value or values
+    followed by a call to the QWidget::update() slot which schedules a
+    paint event for processing when Qt returns to the main event loop.
+
+    \snippet examples/painting/transformations/renderarea.cpp 3
+    \codeline
+    \snippet examples/painting/transformations/renderarea.cpp 4
+
+    We reimplement the QWidget's \l
+    {QWidget::minimumSizeHint()}{minimumSizeHint()} and \l
+    {QWidget::sizeHint()}{sizeHint()} functions to give the \c
+    RenderArea widget a reasonable size within our application. The
+    default implementations of these functions returns an invalid size
+    if there is no layout for this widget, and returns the layout's
+    minimum size or preferred size, respectively, otherwise.
+
+    \snippet examples/painting/transformations/renderarea.cpp 5
+
+    The \c paintEvent() event handler recieves the \c RenderArea
+    widget's paint events. A paint event is a request to repaint all
+    or part of the widget. It can happen as a result of
+    QWidget::repaint() or QWidget::update(), or because the widget was
+    obscured and has now been uncovered, or for many other reasons.
+
+    First we create a QPainter for the \c RenderArea widget. The \l
+    {QPainter::RenderHint}{QPainter::Antialiasing} render hint
+    indicates that the engine should antialias edges of primitives if
+    possible. Then we erase the area that needs to be repainted using
+    the QPainter::fillRect() function.
+
+    We also translate the coordinate system with an constant offset to
+    ensure that the original shape is renderend with a suitable
+    margin.
+
+    \snippet examples/painting/transformations/renderarea.cpp 6
+
+    Before we start to render the shape, we call the QPainter::save()
+    function.
+
+    QPainter::save() saves the current painter state (i.e. pushes the
+    state onto a stack) including the current coordinate system. The
+    rationale for saving the painter state is that the following call
+    to the \c transformPainter() function will transform the
+    coordinate system depending on the currently chosen transformation
+    operations, and we need a way to get back to the original state to
+    draw the outline.
+
+    After transforming the coordinate system, we draw the \c
+    RenderArea's shape, and then we restore the painter state using
+    the the QPainter::restore() function (i.e. popping the saved state off
+    the stack).
+
+    \snippet examples/painting/transformations/renderarea.cpp 7
+
+    Then we draw the square outline.
+
+    \snippet examples/painting/transformations/renderarea.cpp 8
+
+    Since we want the coordinates to correspond with the coordinate
+    system the shape is rendered within, we must make another call to
+    the \c transformPainter() function.
+
+    The order of the painting operations is essential with respect to
+    the shared pixels. The reason why we don't render the coordinates
+    when the coordinate system already is transformed to render the
+    shape, but instead defer their rendering to the end, is that we
+    want the coordinates to appear on top of the shape and its
+    outline.
+
+    There is no need to save the QPainter state this time since
+    drawing the coordinates is the last painting operation.
+
+    \snippet examples/painting/transformations/renderarea.cpp 9
+    \codeline
+    \snippet examples/painting/transformations/renderarea.cpp 10
+    \codeline
+    \snippet examples/painting/transformations/renderarea.cpp 11
+
+    The \c drawCoordinates(), \c drawOutline() and \c drawShape() are
+    convenience functions called from the \c paintEvent() event
+    handler. For more information about QPainter's basic drawing
+    operations and how to display basic graphics primitives, see the
+    \l {painting/basicdrawing}{Basic Drawing} example.
+
+    \snippet examples/painting/transformations/renderarea.cpp 12
+
+    The \c transformPainter() convenience function is also called from
+    the \c paintEvent() event handler, and transforms the given
+    QPainter's coordinate system according to the user's
+    transformation choices.
+
+    \section1 Window Class Definition
+
+    The \c Window class is the Transformations application's main
+    window.
+
+    The application displays four \c RenderArea widgets. The left-most
+    widget renders the shape in QPainter's default coordinate system,
+    the others render the shape with the chosen transformation in
+    addition to all the transformations applied to the \c RenderArea
+    widgets to their left.
+
+    \snippet examples/painting/transformations/window.h 0
+
+    We declare two public slots to make the application able to
+    respond to user interaction, updating the displayed \c RenderArea
+    widgets according to the user's transformation choices.
+
+    The \c operationChanged() slot updates each of the \c RenderArea
+    widgets applying the currently chosen transformation operations, and
+    is called whenever the user changes the selected operations. The
+    \c shapeSelected() slot updates the \c RenderArea widgets' shapes
+    whenever the user changes the preferred shape.
+
+    \snippet examples/painting/transformations/window.h 1
+
+    We also declare a private convenience function, \c setupShapes(),
+    that is used when constructing the \c Window widget, and we
+    declare pointers to the various components of the widget. We
+    choose to keep the available shapes in a QList of \l
+    {QPainterPath}s. In addition we declare a private enum counting
+    the number of displayed \c RenderArea widgets except the widget
+    that renders the shape in QPainter's default coordinate system.
+
+    \section1 Window Class Implementation
+
+    In the constructor we create and initialize the application's
+    components:
+
+    \snippet examples/painting/transformations/window.cpp 0
+
+    First we create the \c RenderArea widget that will render the
+    shape in the default coordinate system. We also create the
+    associated QComboBox that allows the user to choose among four
+    different shapes: A clock, a house, a text and a truck. The shapes
+    themselves are created at the end of the constructor, using the
+    \c setupShapes() convenience function.
+
+    \snippet examples/painting/transformations/window.cpp 1
+
+    Then we create the \c RenderArea widgets that will render their
+    shapes with coordinate tranformations. By default the applied
+    operation is \gui {No Transformation}, i.e. the shapes are
+    rendered within the default coordinate system. We create and
+    initialize the associated \l {QComboBox}es with items
+    corresponding to the various transformation operations decribed by
+    the global \c Operation enum.
+
+    We also connect the \l {QComboBox}es' \l
+    {QComboBox::activated()}{activated()} signal to the \c
+    operationChanged() slot to update the application whenever the
+    user changes the selected transformation operations.
+
+    \snippet examples/painting/transformations/window.cpp 2
+
+    Finally, we set the layout for the application window using the
+    QWidget::setLayout() function, construct the available shapes
+    using the private \c setupShapes() convenience function, and make
+    the application show the clock shape on startup using the public
+    \c shapeSelected() slot before we set the window title.
+
+
+    \snippet examples/painting/transformations/window.cpp 3
+    \snippet examples/painting/transformations/window.cpp 4
+    \snippet examples/painting/transformations/window.cpp 5
+    \snippet examples/painting/transformations/window.cpp 6
+    \dots
+
+    \snippet examples/painting/transformations/window.cpp 7
+
+    The \c setupShapes() function is called from the constructor and
+    create the QPainterPath objects representing the shapes that are
+    used in the application. For construction details, see the \l
+    {painting/transformations/window.cpp}{window.cpp} example
+    file. The shapes are stored in a QList. The QList::append()
+    function inserts the given shape at the end of the list.
+
+    We also connect the associated QComboBox's \l
+    {QComboBox::activated()}{activated()} signal to the \c
+    shapeSelected() slot to update the application when the user
+    changes the preferred shape.
+
+    \snippet examples/painting/transformations/window.cpp 8
+
+    The public \c operationChanged() slot is called whenever the user
+    changes the selected operations.
+
+    We retrieve the chosen transformation operation for each of the
+    transformed \c RenderArea widgets by querying the associated \l
+    {QComboBox}{QComboBoxes}. The transformed \c RenderArea widgets
+    are supposed to render the shape with the transformation specified
+    by its associated combobox \e {in addition to} all the
+    transformations applied to the \c RenderArea widgets to its
+    left. For that reason, for each widget we query, we append the
+    associated operation to a QList of transformations which we apply
+    to the widget before proceeding to the next.
+
+    \snippet examples/painting/transformations/window.cpp 9
+
+    The \c shapeSelected() slot is called whenever the user changes
+    the preferred shape, updating the \c RenderArea widgets using
+    their public \c setShape() function.
+
+    \section1 Summary
+
+    The Transformations example shows how transformations influence
+    the way that QPainter renders graphics primitives. Normally, the
+    QPainter operates on the device's own coordinate system, but it
+    also has good support for coordinate transformations. With the
+    Transformations application you can scale, rotate and translate
+    QPainter's coordinate system.  The order in which these
+    tranformations are applied is essential for the result.
+
+    All the tranformation operations operate on QPainter's
+    tranformation matrix. For more information about the
+    transformation matrix, see the \l {The Coordinate System} and
+    QMatrix documentation.
+
+    The Qt reference documentation provides several painting
+    demos. Among these is the \l {demos/affine}{Affine
+    Transformations} demo that shows Qt's ability to perform
+    transformations on painting operations. The demo also allows the
+    user to experiment with the various transformation operations.
+*/
diff --git a/doc/src/examples/treemodelcompleter.qdoc b/doc/src/examples/treemodelcompleter.qdoc
new file mode 100644
index 0000000000..82e9c24ead
--- /dev/null
+++ b/doc/src/examples/treemodelcompleter.qdoc
@@ -0,0 +1,185 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example tools/treemodelcompleter
+    \title Tree Model Completer Example
+
+    The Tree Model Completer example shows how to provide completion
+    facilities for a hierarchical model, using a period as the separator
+    to access Child, GrandChild and GrandGrandChild level objects.
+
+    \image treemodelcompleter-example.png
+
+    Similar to the \l{Completer Example}, we provide QComboBox objects to
+    enable selection for completion mode and case sensitivity, as well as
+    a QCheckBox for wrap completions.
+
+    \section1 The Resource File
+
+    The contents of the TreeModelCompleter is read from \e treemodel.txt.
+    This file is embedded within the \e treemodelcompleter.qrc resource file,
+    which contains the following:
+
+    \quotefile examples/tools/treemodelcompleter/treemodelcompleter.qrc
+
+    \section1 TreeModelCompleter Class Definition
+
+    The \c TreeModelCompleter is a subclass of QCompleter with two
+    constructors - one with \a parent as an argument and another with
+    \a parent and \a model as arguments.
+
+    \snippet examples/tools/treemodelcompleter/treemodelcompleter.h 0
+
+    The class reimplements the protected functions
+    \l{QCompleter::splitPath()}{splitPath()}  and
+    \l{QCompleter::pathFromIndex()}{pathFromIndex()} to suit a tree model.
+    For more information on customizing QCompleter to suit tree models, refer
+    to \l{QCompleter#Handling Tree Models}{Handling Tree Models}.
+
+    \c TreeModelCompleter also has a separator property which is declared
+    using the Q_PROPERTY() macro. The separator has READ and WRITE attributes
+    and the corresponding functions \c separator() and \c setSeparator(). For
+    more information on Q_PROPERTY(), refer to \l{Qt's Property System}.
+
+    \section1 TreeModelCompleter Class Implementation
+
+    The first constructor constructs a \c TreeModelCompleter object with a
+    parent while the second constructor constructs an object with a parent
+    and a QAbstractItemModel, \a model.
+
+    \snippet examples/tools/treemodelcompleter/treemodelcompleter.cpp 0
+    \codeline
+    \snippet examples/tools/treemodelcompleter/treemodelcompleter.cpp 1
+
+    The \c separator() function is a getter function that returns the
+    separator string.
+
+    \snippet examples/tools/treemodelcompleter/treemodelcompleter.cpp 2
+
+    As mentioned earlier, the \c splitPath() function is reimplemented because
+    the default implementation is more suited to QDirModel or list models. In
+    order for QCompleter to split the path into a list of strings that are
+    matched at each level, we split it using QString::split() with \c sep as its
+    separator.
+
+    \snippet examples/tools/treemodelcompleter/treemodelcompleter.cpp 3
+
+    The \c pathFromIndex() function returns data for the completionRole() for a
+    tree model. This function is reimplemented as its default implementation is
+    more suitable for list models. If there is no separator, we use
+    \l{QCompleter}'s default implementation, otherwise we use the
+    \l{QStringList::prepend()}{prepend()} function to navigate upwards and
+    accumulate the data. The function then returns a QStringList, \c dataList,
+    using a separator to join objects of different levels.
+
+    \snippet examples/tools/treemodelcompleter/treemodelcompleter.cpp 4
+
+    \section1 MainWindow Class Definition
+
+    The \c MainWindow class is a subclass of QMainWindow and implements five
+    custom slots: \c about(), \c changeCase(), \c changeMode(),
+    \c highlight(), and \c updateContentsLabel().
+
+    \snippet examples/tools/treemodelcompleter/mainwindow.h 0
+
+    In addition, the class has two private functions, \c createMenu() and
+    \c modelFromFile(), as well as private instances of QTreeView, QComboBox,
+    QLabel, \c TreeModelCompleter and QLineEdit.
+
+    \snippet examples/tools/treemodelcompleter/mainwindow.h 1
+
+    \section1 MainWindow Class Implementation
+
+    The \c{MainWindow}'s constructor creates a \c MainWindow object with a
+    parent and initializes the \c completer and \c lineEdit. The
+    \c createMenu() function is invoked to set up the "File" menu and "Help"
+    menu. The \c{completer}'s model is set to the QAbstractItemModel obtained
+    from \c modelFromFile(), and the \l{QCompleter::highlighted()}
+    {highlighted()} signal is connected to \c{MainWindow}'s \c highlight()
+    slot.
+
+    \snippet examples/tools/treemodelcompleter/mainwindow.cpp 0
+
+    The QLabel objects \c modelLabel, \c modeLabel and \c caseLabel are
+    instantiated. Also, the QComboBox objects, \c modeCombo and \c caseCombo,
+    are instantiated and populated. By default, the \c{completer}'s mode is
+    "Filtered Popup" and the case is insensitive.
+
+    \snippet examples/tools/treemodelcompleter/mainwindow.cpp 1
+    \codeline
+    \snippet examples/tools/treemodelcompleter/mainwindow.cpp 2
+
+    We use a QGridLayout to place all the objects in the \c MainWindow.
+
+    \snippet examples/tools/treemodelcompleter/mainwindow.cpp 3
+
+    The \c createMenu() function sets up the QAction objects required and
+    adds them to the "File" menu and "Help" menu. The
+    \l{QAction::triggered()}{triggered()} signals from these actions are
+    connected to their respective slots.
+
+    \snippet examples/tools/treemodelcompleter/mainwindow.cpp 4
+
+    The \c changeMode() function accepts an \a index corresponding to the
+    user's choice of completion mode and changes the \c{completer}'s mode
+    accordingly.
+
+    \snippet examples/tools/treemodelcompleter/mainwindow.cpp 5
+
+    The \c about() function provides a brief description on the Tree Model
+    Completer example.
+
+    \snippet examples/tools/treemodelcompleter/mainwindow.cpp 6
+
+    The \c changeCase() function alternates between \l{Qt::CaseSensitive}
+    {Case Sensitive} and \l{Qt::CaseInsensitive}{Case Insensitive} modes,
+    depending on the value of \a cs.
+
+    \snippet examples/tools/treemodelcompleter/mainwindow.cpp 7
+
+    \section1 \c main() Function
+
+    The \c main() function instantiates \c MainWindow and invokes the
+    \l{QWidget::show()}{show()} function to display it.
+
+    \snippet examples/tools/treemodelcompleter/main.cpp 0
+*/
diff --git a/doc/src/examples/trivialwizard.qdoc b/doc/src/examples/trivialwizard.qdoc
new file mode 100644
index 0000000000..360ea00c25
--- /dev/null
+++ b/doc/src/examples/trivialwizard.qdoc
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example dialogs/trivialwizard
+    \title Trivial Wizard Example
+
+    The Trivial Wizard example illustrates how to create a linear three-page
+    registration wizard using three instances of QWizardPage and one instance
+    of QWizard.
+
+    \image trivialwizard-example-flow.png
+
+    \section1 Introduction Page
+
+    \image trivialwizard-example-introduction.png
+
+    The introduction page is created with the \c createIntroPage()
+    function where a QWizardPage is created and its title is set to
+    "Introduction". A QLabel is used to hold the description of \c page.
+    A QVBoxLayout is used to hold the \c label. This \c page is returned
+    when the \c createIntroPage() function is called.
+
+    \snippet examples/dialogs/trivialwizard/trivialwizard.cpp 0
+
+    \section1 Registration Page
+
+    \image trivialwizard-example-registration.png
+
+    The registration page is created with the \c createRegistrationPage()
+    function. QLineEdit objects are used to allow the user to input a name
+    and an e-mail address. A QGridLayout is used to hold the QLabel and
+    QLineEdit objects.
+
+    \snippet examples/dialogs/trivialwizard/trivialwizard.cpp 2
+
+    \section1 Conclusion Page
+
+    \image trivialwizard-example-conclusion.png
+
+    The conclusion page is created in the \c createConclusionPage()
+    function. This function's content is similar to \c createIntroPage(). A
+    QLabel is used to inform the user that the registration process has
+    completed successfully.
+
+    \snippet examples/dialogs/trivialwizard/trivialwizard.cpp 6
+
+    \section1 \c main() Function
+
+    The \c main() function instantiates a QWizard object, \c wizard, and
+    adds all three QWizardPage objects to it. The \c wizard window title is
+    set to "Trivial Wizard" and its \c show() function is invoked to display
+    it.
+
+    \snippet examples/dialogs/trivialwizard/trivialwizard.cpp 10
+
+    \sa QWizard, {Class Wizard Example}, {License Wizard Example}
+*/
diff --git a/doc/src/examples/trollprint.qdoc b/doc/src/examples/trollprint.qdoc
new file mode 100644
index 0000000000..38251ee294
--- /dev/null
+++ b/doc/src/examples/trollprint.qdoc
@@ -0,0 +1,275 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example linguist/trollprint
+    \title Troll Print Example
+
+    Troll Print is an example application that lets the user choose
+    printer settings. It comes in two versions: English and
+    Portuguese.
+
+    \image linguist-trollprint_10_en.png
+
+    We've included a translation file, \c trollprint_pt.ts, which contains some
+    Portuguese translations for this example.
+
+    We will consider two releases of the same application: Troll Print
+    1.0 and 1.1. We will learn to reuse the translations created for one
+    release in a subsequent release. (In this tutorial, you need to edit
+    some source files. It's probably best to copy all the files to a new
+    temporary directory and work from there.)
+
+    See the \l{Qt Linguist manual} for more information about
+    translating Qt application.
+
+    \section1 Line by Line Walkthrough
+
+    The \c PrintPanel class is defined in \c printpanel.h.
+
+    \snippet examples/linguist/trollprint/printpanel.h 0
+
+    \c PrintPanel is a QWidget. It needs the \c Q_OBJECT macro for \c
+    tr() to work properly.
+
+    The implementation file is \c printpanel.cpp.
+
+    \snippet examples/linguist/trollprint/printpanel.cpp 0
+
+    Some of the code is commented out in Troll Print 1.0; you will
+    uncomment it later, for Troll Print 1.1.
+
+    \snippet examples/linguist/trollprint/printpanel.cpp 1
+    \snippet examples/linguist/trollprint/printpanel.cpp 2
+
+    Notice the two occurrences of \c tr("Enabled") and of \c
+    tr("Disabled") in PrintPanel. Since both "Enabled"s and "Disabled"s
+    appear in the same context \e {Qt Linguist} will only display one
+    occurrence of each and will use the same translations for the
+    duplicates that it doesn't display. Whilst this is a useful
+    timesaver, in some languages, such as Portuguese, the second
+    occurrence requires a separate translation. We will see how \e {Qt
+    Linguist} can be made to display all the occurrences for separate
+    translation shortly.
+
+    The header file for \c MainWindow, \c mainwindow.h, contains no
+    surprises. In the implementation, \c mainwindow.cpp, we have some
+    user-visible source texts that must be marked for translation.
+
+    \snippet examples/linguist/trollprint/mainwindow.cpp 0
+
+    We must translate the window title.
+
+    \snippet examples/linguist/trollprint/mainwindow.cpp 1
+    \snippet examples/linguist/trollprint/mainwindow.cpp 3
+
+    We also need to translate the actions and menus. Note that the
+    two argument form of \c tr() is used for the keyboard
+    accelerator, "Ctrl+Q", since the second argument is the only clue
+    the translator has to indicate what function that accelerator
+    will perform.
+
+    \snippet examples/linguist/trollprint/main.cpp 0
+
+    The \c main() function in \c main.cpp is the same as the one in
+    the \l{linguist/arrowpad}{Arrow Pad} example. In particular, it
+    chooses a translation file based on the current locale.
+
+    \section1 Running Troll Print 1.0 in English and in Portuguese
+
+    We will use the translations in the \c trollprint_pt.ts file that is provided.
+
+    Set the \c LANG environment variable to \c pt, and then run \c
+    trollprint. You should still see the English version. Now run \c
+    lrelease, e.g. \c {lrelease trollprint.pro}, and then run the
+    example again. Now you should see the Portuguese edition (Troll
+    Imprimir 1.0):
+
+    \image linguist-trollprint_10_pt_bad.png
+
+    Whilst the translation has appeared correctly, it is in fact wrong. In
+    good Portuguese, the second occurrence of "Enabled" should be
+    "Ativadas", not "Ativado" and the ending for the second translation of
+    "Disabled" must change similarly too.
+
+    If you open \c trollprint_pt.ts using \e {Qt Linguist}, you will see that
+    there is just one occurrence of "Enabled" and of "Disabled" in the
+    translation source file, even though there are two of each in the
+    source code. This is because \e {Qt Linguist} tries to minimize the
+    translator's work by using the same translation for duplicate source
+    texts. In cases such as this where an identical translation is wrong,
+    the programmer must disambiguate the duplicate occurrences. This is
+    easily achieved by using the two argument form of \c tr().
+
+    We can easily determine which file must be changed because the
+    translator's "context" is in fact the class name for the class where
+    the texts that must be changed appears. In this case the file is \c
+    printpanel.cpp, where the there are four lines to change. Add the
+    second argument "two-sided" in the appropriate \c tr() calls to the
+    first pair of radio buttons:
+
+    \snippet doc/src/snippets/code/doc_src_examples_trollprint.qdoc 0
+
+    and add the second argument "colors" in the appropriate \c tr() calls
+    for the second pair of radio buttons:
+
+    \snippet doc/src/snippets/code/doc_src_examples_trollprint.qdoc 1
+
+    Now run \c lupdate and open \c trollprint_pt.ts with \e {Qt Linguist}. You
+    should now see two changes.
+
+    First, the translation source file now contains \e three "Enabled",
+    "Disabled" pairs. The first pair is marked "(obs.)" signifying that they
+    are obsolete. This is because these texts appeared in \c tr() calls that
+    have been replaced by new calls with two arguments. The second pair has
+    "two-sided" as their comment, and the third pair has "colors" as their
+    comment. The comments are shown in the \gui {Source text and comments}
+    area in \e {Qt Linguist}.
+
+    Second, the translation text "Ativado" and "Desativado" have been
+    automatically used as translations for the new "Enabled" and "Disabled"
+    texts, again to minimize the translator's work. Of course in this case
+    these are not correct for the second occurrence of each word, but they
+    provide a good starting point.
+
+    Change the second "Ativado" into "Ativadas" and the second
+    "Desativado" into "Desativadas", then save and quit. Run \c lrelease
+    to obtain an up-to-date binary \c trollprint_pt.qm file, and run Troll Print
+    (or rather Troll Imprimir).
+
+    \image linguist-trollprint_10_pt_good.png
+
+    The second argument to \c tr() calls, called "comments" in \e {Qt
+    Linguist}, distinguish between identical source texts that occur in
+    the same context (class). They are also useful in other cases to give
+    clues to the translator, and in the case of Ctrl key accelerators are
+    the only means of conveying the function performed by the accelerator to
+    the translator.
+
+    An additional way of helping the translator is to provide information on
+    how to navigate to the particular part of the application that contains
+    the source texts they must translate. This helps them see the context
+    in which the translation appears and also helps them to find and test
+    the translations. This can be achieved by using a \c TRANSLATOR comment
+    in the source code:
+
+    \snippet doc/src/snippets/code/doc_src_examples_trollprint.qdoc 2
+
+    Try adding these comments to some source files, particularly to
+    dialog classes, describing the navigation necessary to reach the
+    dialogs. You could also add them to the example files, e.g. \c
+    mainwindow.cpp and \c printpanel.cpp are appropriate files. Run \c
+    lupdate and then start \e {Qt Linguist} and load in \c trollprint_pt.ts.
+    You should see the comments in the \gui {Source text and comments} area
+    as you browse through the list of source texts.
+
+    Sometimes, particularly with large programs, it can be difficult for
+    the translator to find their translations and check that they're
+    correct. Comments that provide good navigation information can save
+    them time:
+
+    \snippet doc/src/snippets/code/doc_src_examples_trollprint.qdoc 3
+
+    \section1 Troll Print 1.1
+
+    We'll now prepare release 1.1 of Troll Print. Start your favorite text
+    editor and follow these steps:
+
+    \list
+    \o Uncomment the two lines that create a QLabel with the text
+         "\<b\>TROLL PRINT\</b\>" in \c printpanel.cpp.
+    \o Word-tidying: Replace "2-sided" by "Two-sided" in \c printpanel.cpp.
+    \o Replace "1.0" with "1.1" everywhere it occurs in \c mainwindow.cpp.
+    \o Update the copyright year to 1999-2000 in \c mainwindow.cpp.
+    \endlist
+
+    (Of course the version number and copyright year would be consts or
+    #defines in a real application.)
+
+    Once finished, run \c lupdate, then open \c trollprint_pt.ts in \e {Qt
+    Linguist}. The following items are of special interest:
+
+    \list
+    \o \c MainWindow
+         \list
+         \o Troll Print 1.0 - marked "(obs.)", obsolete
+         \o About Troll Print 1.0 - marked "(obs.)", obsolete
+         \o Troll Print 1.0. Copyright 1999 Software, Inc. -
+       marked obsolete
+         \o Troll Print 1.1 - automatically translated as
+       "Troll Imprimir 1.1"
+         \o About Troll Print 1.1 - automatically translated as
+       "Troll Imprimir 1.1"
+         \o Troll Print 1.1. Copyright 1999-2000 Software,
+       Inc. - automatically translated as "Troll Imprimir 1.1.
+       Copyright 1999-2000 Software, Inc."
+         \endlist
+    \o \c PrintPanel
+         \list
+         \o 2-sided - marked "(obs.)", obsolete
+         \o \<b\>TROLL PRINT\</b\> - unmarked, i.e. untranslated
+         \o Two-sided - unmarked, i.e. untranslated.
+         \endlist
+    \endlist
+
+    Notice that \c lupdate works hard behind the scenes to make revisions
+    easier, and it's pretty smart with numbers.
+
+    Go over the translations in \c MainWindow and mark these as "done".
+    Translate "\<b\>TROLL PRINT\</b\>" as "\<b\>TROLL IMPRIMIR\</b\>".
+    When you're translating "Two-sided", press the \gui {Guess Again}
+    button to translate "Two-sided", but change the "2" into "Dois".
+
+    Save and quit, then run \c lrelease. The Portuguese version
+    should look like this:
+
+    \image linguist-trollprint_11_pt.png
+
+    Choose \gui{Ajuda|Sobre} (\gui{Help|About}) to see the about box.
+
+    If you choose \gui {Ajuda|Sobre Qt} (\gui {Help|About Qt}), you'll get
+    an English dialog. Oops! Qt itself needs to be translated. See
+    \l{Internationalization with Qt} for details.
+
+    Now set \c LANG=en to get the original English version:
+
+    \image linguist-trollprint_11_en.png
+*/
diff --git a/doc/src/examples/undoframework.qdoc b/doc/src/examples/undoframework.qdoc
new file mode 100644
index 0000000000..3d0965f449
--- /dev/null
+++ b/doc/src/examples/undoframework.qdoc
@@ -0,0 +1,306 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example tools/undoframework 
+    \title Undo Framework Example
+
+    This example shows how to implement undo/redo functionality 
+    with the Qt undo framework.
+
+    \image undoframeworkexample.png The Undo Diagram Example
+
+    In the Qt undo framework, all actions that the user performs are
+    implemented in classes that inherit QUndoCommand. An undo command
+    class knows how to both \l{QUndoCommand::}{redo()} - or just do
+    the first time - and \l{QUndoCommand::}{undo()} an action. For
+    each action the user performs, a command is placed on a
+    QUndoStack.  Since the stack contains all commands executed
+    (stacked in chronological order) on the document, it can roll the
+    state of the document backwards and forwards by undoing and redoing
+    its commands. See the \l{Overview of Qt's Undo Framework}{overview
+    document} for a high-level introduction to the undo framework.
+
+    The undo example implements a simple diagram application. It is
+    possible to add and delete items, which are either box or
+    rectangular shaped, and move the items by dragging them with the
+    mouse. The undo stack is shown in a QUndoView, which is a list in
+    which the commands are shown as list items. Undo and redo are
+    available through the edit menu. The user can also select a command
+    from the undo view.
+
+    We use the \l{The Graphics View Framework}{graphics view
+    framework} to implement the diagram. We only treat the related
+    code briefly as the framework has examples of its own (e.g., the
+    \l{Diagram Scene Example}).
+
+    The example consists of the following classes:
+
+    \list 
+        \o \c MainWindow is the main window and arranges the
+              example's widgets. It creates the commands based 
+              on user input and keeps them on the command stack.
+        \o \c AddCommand adds an item to the scene.
+        \o \c DeleteCommand deletes an item from the scene.
+        \o \c MoveCommand when an item is moved the MoveCommand keeps record
+              of the start and stop positions of the move, and it
+              moves the item according to these when \c redo() and \c undo()
+              is called.
+        \o \c DiagramScene inherits QGraphicsScene and
+              emits signals for the \c MoveComands when an item is moved.
+        \o \c DiagramItem inherits QGraphicsPolygonItem and represents
+              an item in the diagram.
+    \endlist
+
+    \section1 MainWindow Class Definition
+
+    \snippet examples/tools/undoframework/mainwindow.h 0
+
+    The \c MainWindow class maintains the undo stack, i.e., it creates
+    \l{QUndoCommand}s and pushes and pops them from the stack when it
+    receives the \c triggered() signal from \c undoAction and \c
+    redoAction.
+    
+    \section1 MainWindow Class Implementation
+
+    We will start with a look at the constructor:    
+
+    \snippet examples/tools/undoframework/mainwindow.cpp 0
+
+    In the constructor, we set up the DiagramScene and QGraphicsView. 
+
+    Here is the \c createUndoView() function:    
+
+    \snippet examples/tools/undoframework/mainwindow.cpp 1
+
+    The QUndoView is a widget that display the text, which is set with
+    the \l{QUndoCommand::}{setText()} function, for each QUndoCommand
+    in the undo stack in a list.
+    
+    Here is the \c createActions() function:
+
+    \snippet examples/tools/undoframework/mainwindow.cpp 2
+    \codeline
+    \snippet examples/tools/undoframework/mainwindow.cpp 3
+    \dots
+    \snippet examples/tools/undoframework/mainwindow.cpp 5
+
+    The \c createActions() function sets up all the examples actions
+    in the manner shown above. The
+    \l{QUndoStack::}{createUndoAction()} and
+    \l{QUndoStack::}{createRedoAction()} helps us crate actions that
+    are disabled and enabled based on the state of the stack.  Also,
+    the text of the action will be updated automatically based on the
+    \l{QUndoCommand::}{text()} of the undo commands. For the other
+    actions we have implemented slots in the \c MainWindow class.
+
+    Here is the \c createMenus() function:
+
+    \snippet examples/tools/undoframework/mainwindow.cpp 6
+
+    \dots
+    \snippet examples/tools/undoframework/mainwindow.cpp 7
+    \dots
+    \snippet examples/tools/undoframework/mainwindow.cpp 8
+
+    We have to use the QMenu \c aboutToShow() and \c aboutToHide()
+    signals since we only want \c deleteAction to be enabled when we
+    have selected an item.     
+
+    Here is the \c itemMoved() slot:
+
+    \snippet examples/tools/undoframework/mainwindow.cpp 9
+
+    We simply push a MoveCommand on the stack, which calls \c redo()
+    on it.
+
+    Here is the \c deleteItem() slot:
+
+    \snippet examples/tools/undoframework/mainwindow.cpp 10
+
+    An item must be selected to be deleted.  We need to check if it is
+    selected as the \c deleteAction may be enabled even if an item is
+    not selected. This can happen as we do not catch a signal or event
+    when an item is selected.
+
+    Here is the \c itemMenuAboutToShow() and itemMenuAboutToHide() slots:
+
+    \snippet examples/tools/undoframework/mainwindow.cpp 11
+    \codeline
+    \snippet examples/tools/undoframework/mainwindow.cpp 12
+
+    We implement \c itemMenuAboutToShow() and \c itemMenuAboutToHide()
+    to get a dynamic item menu. These slots are connected to the 
+    \l{QMenu::}{aboutToShow()} and \l{QMenu::}{aboutToHide()} signals.
+    We need this to disable or enable the \c deleteAction. 
+
+    Here is the \c addBox() slot:
+
+    \snippet examples/tools/undoframework/mainwindow.cpp 13
+
+    The \c addBox() function creates an AddCommand and pushes it on
+    the undo stack.
+
+    Here is the \c addTriangle() sot:
+
+    \snippet examples/tools/undoframework/mainwindow.cpp 14
+
+    The \c addTriangle() function creates an AddCommand and pushes it
+    on the undo stack.    
+
+    Here is the implementation of \c about():
+
+    \snippet examples/tools/undoframework/mainwindow.cpp 15
+    
+    The about slot is triggered by the \c aboutAction and displays an
+    about box for the example.
+
+    \section1 AddCommand Class Definition
+    
+    \snippet examples/tools/undoframework/commands.h 2
+
+    The \c AddCommand class adds DiagramItem graphics items to the
+    DiagramScene.  
+
+    \section1 AddCommand Class Implementation
+
+    We start with the constructor:
+
+    \snippet examples/tools/undoframework/commands.cpp 7
+
+    We first create the DiagramItem to add to the DiagramScene.  The
+    \l{QUndoCommand::}{setText()} function let us set a QString that
+    describes the command. We use this to get custom messages in the
+    QUndoView and in the menu of the main window.
+
+    \snippet examples/tools/undoframework/commands.cpp 8
+
+    \c undo() removes the item from the scene. We need to update the
+    scene as ...(ask Andreas)
+
+    \snippet examples/tools/undoframework/commands.cpp 9
+
+    We set the position of the item as we do not do this in the
+    constructor.
+
+    \section1 DeleteCommand Class Definition
+    
+    \snippet examples/tools/undoframework/commands.h 1
+
+    The DeleteCommand class implements the functionality to remove an
+    item from the scene.
+    
+    \section1 DeleteCommand Class Implementation
+
+    \snippet examples/tools/undoframework/commands.cpp 4
+
+    We know that there must be one selected item as it is not possible
+    to create a DeleteCommand unless the item to be deleted is
+    selected and that only one item can be selected at any time. 
+    The item must be unselected if it is inserted back into the 
+    scene.
+
+    \snippet examples/tools/undoframework/commands.cpp 5
+
+    The item is simply reinserted into the scene.
+
+    \snippet examples/tools/undoframework/commands.cpp 6
+
+    The item is removed from the scene.
+
+    \section1 MoveCommand Class Definition
+
+    \snippet examples/tools/undoframework/commands.h 0
+
+    The \l{QUndoCommand::}{mergeWith()} is reimplemented to make
+    consecutive moves of an item one MoveCommand, i.e, the item will
+    be moved back to the start position of the first move.
+
+    \section1 MoveCommand Class Implementation
+
+    
+    The constructor of MoveCommand looks like this:
+
+    \snippet examples/tools/undoframework/commands.cpp 0
+
+    We save both the old and new positions for undo and redo
+    respectively.
+
+    \snippet examples/tools/undoframework/commands.cpp 2
+
+    We simply set the items old position and update the scene.    
+
+    \snippet examples/tools/undoframework/commands.cpp 3
+
+    We set the item to its new position.
+    
+    \snippet examples/tools/undoframework/commands.cpp 1
+
+    Whenever a MoveCommand is created, this function is called to
+    check if it should be merged with the previous command. It is the
+    previous command object that is kept on the stack. The function
+    returns true if the command is merged; otherwise false.
+
+    We first check whether it is the same item that has been moved
+    twice, in which case we merge the commands. We update the position
+    of the item so that it will take the last position in the move
+    sequence when undone. 
+
+    \section1 DiagramScene Class Definition
+
+    \snippet examples/tools/undoframework/diagramscene.h 0
+
+    The DiagramScene implements the functionality to move a
+    DiagramItem with the mouse. It emits a signal when a move is
+    completed. This is caught by the \c MainWindow, which makes
+    MoveCommands. We do not examine the implementation of DiagramScene
+    as it only deals with graphics framework issues.
+
+    \section1 The \c main() Function
+    
+    The \c main() function of the program looks like this:
+
+    \snippet examples/tools/undoframework/main.cpp 0
+
+    We draw a grid in the background of the DiagramScene, so we use a
+    resource file. The rest of the function creates the \c MainWindow and
+    shows it as a top level window.
+*/
diff --git a/doc/src/examples/waitconditions.qdoc b/doc/src/examples/waitconditions.qdoc
new file mode 100644
index 0000000000..dce04112a6
--- /dev/null
+++ b/doc/src/examples/waitconditions.qdoc
@@ -0,0 +1,166 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example threads/waitconditions
+    \title Wait Conditions Example
+
+    The Wait Conditions example shows how to use QWaitCondition and
+    QMutex to control access to a circular buffer shared by a
+    producer thread and a consumer thread.
+
+    The producer writes data to the buffer until it reaches the end
+    of the buffer, at which point it restarts from the beginning,
+    overwriting existing data. The consumer thread reads the data as
+    it is produced and writes it to standard error.
+
+    Wait conditions make it possible to have a higher level of
+    concurrency than what is possible with mutexes alone. If accesses
+    to the buffer were simply guarded by a QMutex, the consumer
+    thread couldn't access the buffer at the same time as the
+    producer thread. Yet, there is no harm in having both threads
+    working on \e{different parts} of the buffer at the same time.
+
+    The example comprises two classes: \c Producer and \c Consumer.
+    Both inherit from QThread. The circular buffer used for
+    communicating between these two classes and the synchronization
+    tools that protect it are global variables.
+
+    An alternative to using QWaitCondition and QMutex to solve the
+    producer-consumer problem is to use QSemaphore. This is what the
+    \l{threads/semaphores}{Semaphores} example does.
+
+    \section1 Global Variables
+
+    Let's start by reviewing the circular buffer and the associated
+    synchronization tools:
+
+    \snippet examples/threads/waitconditions/waitconditions.cpp 0
+
+    \c DataSize is the amount of data that the producer will generate.
+    To keep the example as simple as possible, we make it a constant.
+    \c BufferSize is the size of the circular buffer. It is less than
+    \c DataSize, meaning that at some point the producer will reach
+    the end of the buffer and restart from the beginning.
+
+    To synchronize the producer and the consumer, we need two wait
+    conditions and one mutex. The \c bufferNotEmpty condition is
+    signalled when the producer has generated some data, telling the
+    consumer that it can start reading it. The \c bufferNotFull
+    condition is signalled when the consumer has read some data,
+    telling the producer that it can generate more. The \c numUsedBytes
+    is the number of bytes in the buffer that contain data.
+
+    Together, the wait conditions, the mutex, and the \c numUsedBytes
+    counter ensure that the producer is never more than \c BufferSize
+    bytes ahead of the consumer, and that the consumer never reads
+    data that the consumer hasn't generated yet.
+
+    \section1 Producer Class
+
+    Let's review the code for the \c Producer class:
+
+    \snippet examples/threads/waitconditions/waitconditions.cpp 1
+    \snippet examples/threads/waitconditions/waitconditions.cpp 2
+
+    The producer generates \c DataSize bytes of data. Before it
+    writes a byte to the circular buffer, it must first check whether
+    the buffer is full (i.e., \c numUsedBytes equals \c BufferSize).
+    If the buffer is full, the thread waits on the \c bufferNotFull
+    condition.
+
+    At the end, the producer increments \c numUsedBytes and signalls
+    that the condition \c bufferNotEmpty is true, since \c
+    numUsedBytes is necessarily greater than 0.
+
+    We guard all accesses to the \c numUsedBytes variable with a
+    mutex. In addition, the QWaitCondition::wait() function accepts a
+    mutex as its argument. This mutex is unlocked before the thread
+    is put to sleep and locked when the thread wakes up. Furthermore,
+    the transition from the locked state to the wait state is atomic,
+    to prevent race conditions from occurring.
+
+    \section1 Consumer Class
+
+    Let's turn to the \c Consumer class:
+
+    \snippet examples/threads/waitconditions/waitconditions.cpp 3
+    \snippet examples/threads/waitconditions/waitconditions.cpp 4
+
+    The code is very similar to the producer. Before we read the
+    byte, we check whether the buffer is empty (\c numUsedBytes is 0)
+    instead of whether it's full and wait on the \c bufferNotEmpty
+    condition if it's empty. After we've read the byte, we decrement
+    \c numUsedBytes (instead of incrementing it), and we signal the
+    \c bufferNotFull condition (instead of the \c bufferNotEmpty
+    condition).
+
+    \section1 The main() Function
+
+    In \c main(), we create the two threads and call QThread::wait()
+    to ensure that both threads get time to finish before we exit:
+
+    \snippet examples/threads/waitconditions/waitconditions.cpp 5
+    \snippet examples/threads/waitconditions/waitconditions.cpp 6
+
+    So what happens when we run the program? Initially, the producer
+    thread is the only one that can do anything; the consumer is
+    blocked waiting for the \c bufferNotEmpty condition to be
+    signalled (\c numUsedBytes is 0). Once the producer has put one
+    byte in the buffer, \c numUsedBytes is \c BufferSize - 1 and the
+    \c bufferNotEmpty condition is signalled. At that point, two
+    things can happen: Either the consumer thread takes over and
+    reads that byte, or the consumer gets to produce a second byte.
+
+    The producer-consumer model presented in this example makes it
+    possible to write highly concurrent multithreaded applications.
+    On a multiprocessor machine, the program is potentially up to
+    twice as fast as the equivalent mutex-based program, since the
+    two threads can be active at the same time on different parts of
+    the buffer.
+
+    Be aware though that these benefits aren't always realized.
+    Locking and unlocking a QMutex has a cost. In practice, it would
+    probably be worthwhile to divide the buffer into chunks and to
+    operate on chunks instead of individual bytes. The buffer size is
+    also a parameter that must be selected carefully, based on
+    experimentation.
+*/
diff --git a/doc/src/examples/wiggly.qdoc b/doc/src/examples/wiggly.qdoc
new file mode 100644
index 0000000000..5406c7796e
--- /dev/null
+++ b/doc/src/examples/wiggly.qdoc
@@ -0,0 +1,181 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example widgets/wiggly
+    \title Wiggly Example
+
+    The Wiggly example shows how to animate a widget using
+    QBasicTimer and \l{QObject::timerEvent()}{timerEvent()}. In
+    addition, the example demonstrates how to use QFontMetrics to
+    determine the size of text on screen.
+
+    \image wiggly-example.png Screenshot of the Wiggly example
+
+    QBasicTimer is a low-level class for timers. Unlike QTimer,
+    QBasicTimer doesn't inherit from QObject; instead of emitting a
+    \l{QTimer::timeout()}{timeout()} signal when a certain amount of
+    time has passed, it sends a QTimerEvent to a QObject of our
+    choice. This makes QBasicTimer a more lightweight alternative to
+    QTimer. Qt's built-in widgets use it internally, and it is
+    provided in Qt's API for highly-optimized applications (e.g.,
+    \l{Qt for Embedded Linux} applications).
+
+    The example consists of two classes:
+
+    \list
+    \o \c WigglyWidget is the custom widget displaying the text
+        in a wiggly line.
+
+    \o \c Dialog is the dialog widget allowing the user to enter a
+        text. It combines a \c WigglyWidget and a \c QLineEdit.
+    \endlist
+
+    We will first take a quick look at the \c Dialog class, then we
+    will review the \c WigglyWidget class.
+
+    \section1 Dialog Class Definition
+
+    \snippet examples/widgets/wiggly/dialog.h 0
+
+    The \c Dialog class provides a dialog widget that allows the user
+    to enter a text. The text is then rendered by \c WigglyWidget.
+
+    \section1 Dialog Class Implementation
+
+    \snippet examples/widgets/wiggly/dialog.cpp 0
+
+    In the constructor we create a wiggly widget along with a
+    \l{QLineEdit}{line edit}, and we put the two widgets in a
+    vertical layout. We connect the line edit's \l
+    {QLineEdit::textChanged()}{textChanged()} signal to the wiggly
+    widget's \c setText() slot to obtain the real time interaction
+    with the wiggly widget. The widget's default text is "Hello
+    world!".
+
+    \section1 WigglyWidget Class Definition
+
+    \snippet examples/widgets/wiggly/wigglywidget.h 0
+
+    The \c WigglyWidget class provides the wiggly line displaying the
+    text. We subclass QWidget and reimplement the standard \l
+    {QWidget::paintEvent()}{paintEvent()} and \l
+    {QObject::timerEvent()}{timerEvent()} functions to draw and update
+    the widget. In addition we implement a public \c setText() slot
+    that sets the widget's text.
+
+    The \c timer variable, of type QBasicTimer, is used to update the
+    widget at regular intervals, making the widget move. The \c text
+    variable is used to store the currently displayed text, and \c
+    step to calculate position and color for each character on the
+    wiggly line.
+
+    \section1 WigglyWidget Class Implementation
+
+    \snippet examples/widgets/wiggly/wigglywidget.cpp 0
+
+    In the constructor, we make the widget's background slightly
+    lighter than the usual background using the QPalette::Midlight
+    color role. The background role defines the brush from the
+    widget's palette that Qt uses to paint the background. Then we
+    enlarge the widget's font with 20 points.
+
+    Finally we start the timer; the call to QBasicTimer::start()
+    makes sure that \e this particular wiggly widget will receive the
+    timer events generated when the timer times out (every 60
+    milliseconds).
+
+    \snippet examples/widgets/wiggly/wigglywidget.cpp 1
+    \snippet examples/widgets/wiggly/wigglywidget.cpp 2
+
+    The \c paintEvent() function is called whenever a QPaintEvent is
+    sent to the widget. Paint events are sent to widgets that need to
+    update themselves, for instance when part of a widget is exposed
+    because a covering widget was moved. For the wiggly widget, a
+    paint event will also be generated every 60 milliseconds from
+    the \c timerEvent() slot.
+
+    The \c sineTable represents y-values of the sine curve,
+    multiplied by 100. It is used to make the wiggly widget move
+    along the sine curve.
+
+    The QFontMetrics object provides information about the widget's
+    font. The \c x variable is the horizontal position where we start
+    drawing the text. The \c y variable is the vertical position of
+    the text's base line. Both variables are computed so that the
+    text is horizontally and vertically centered. To compute the base
+    line, we take into account the font's ascent (the height of the
+    font above the base line) and font's descent (the height of the
+    font below the base line). If the descent equals the ascent, they
+    cancel out each other and the base line is at \c height() / 2.
+
+    \snippet examples/widgets/wiggly/wigglywidget.cpp 3
+    \snippet examples/widgets/wiggly/wigglywidget.cpp 4
+
+    Each time the \c paintEvent() function is called, we create a
+    QPainter object \c painter to draw the contents of the widget.
+    For each character in \c text, we determine the color and the
+    position on the wiggly line based on \c step. In addition, \c x
+    is incremented by the character's width.
+
+    For simplicity, we assume that QFontMetrics::width(\c text)
+    returns the sum of the individual character widths
+    (QFontMetrics::width(\c text[i])). In practice, this is not
+    always the case because QFontMetrics::width(\c text) also takes
+    into account the kerning between certain letters (e.g., 'A' and
+    'V'). The result is that the text isn't perfectly centered. You
+    can verify this by typing "AVAVAVAVAVAV" in the line edit.
+
+    \snippet examples/widgets/wiggly/wigglywidget.cpp 5
+    \snippet examples/widgets/wiggly/wigglywidget.cpp 6
+
+    The \c timerEvent() function receives all the timer events that
+    are generated for this widget. If a timer event is sent from the
+    widget's QBasicTimer, we increment \c step to make the text move,
+    and call QWidget::update() to refresh the display. Any other
+    timer event is passed on to the base class's implementation of
+    the \l{QWidget::timerEvent()}{timerEvent()} function.
+
+    The QWidget::update() slot does not cause an immediate repaint;
+    instead the slot schedules a paint event for processing when Qt
+    returns to the main event loop. The paint events are then handled
+    by \c{WigglyWidget}'s \c paintEvent() function.
+*/
diff --git a/doc/src/examples/windowflags.qdoc b/doc/src/examples/windowflags.qdoc
new file mode 100644
index 0000000000..b25206ec8c
--- /dev/null
+++ b/doc/src/examples/windowflags.qdoc
@@ -0,0 +1,230 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example widgets/windowflags
+    \title Window Flags Example
+
+    The Window Flags example shows how to use the window flags
+    available in Qt.
+
+    A window flag is either a type or a hint. A type is used to
+    specify various window-system properties for the widget. A widget
+    can only have one type, and the default is Qt::Widget. However, a
+    widget can have zero or more hints. The hints are used to
+    customize the appearance of top-level windows.
+
+    A widget's flags are stored in a Qt::WindowFlags type which stores
+    an OR combination of the flags.
+
+    \image windowflags-example.png Screenshot of the Window Flags example
+
+    The example consists of two classes:
+
+    \list
+    \o \c ControllerWindow is the main application widget that allows
+       the user to choose among the available window flags, and displays
+       the effect on a separate preview window.
+    \o \c PreviewWindow is a custom widget displaying the name of
+       its currently set window flags in a read-only text editor.
+    \endlist
+
+    We will start by reviewing the \c ControllerWindow class, then we
+    will take a look at the \c PreviewWindow class.
+
+    \section1 ControllerWindow Class Definition
+
+    \snippet examples/widgets/windowflags/controllerwindow.h 0
+
+    The \c ControllerWindow class inherits QWidget. The widget allows
+    the user to choose among the available window flags, and displays
+    the effect on a separate preview window.
+
+    We declare a private \c updatePreview() slot to refresh the
+    preview window whenever the user changes the window flags.
+
+    We also declare several private functions to simplify the
+    constructor: We call the \c createTypeGroupBox() function to
+    create a radio button for each available window type, using the
+    private \c createButton() function, and gather them within a group
+    box. In a similar way we use the \c createHintsGroupBox() function
+    to create a check box for each available hint, using the private
+    \c createCheckBox() function.
+
+    In addition to the various radio buttons and checkboxes, we need
+    an associated \c PreviewWindow to show the effect of the currently
+    chosen window flags.
+
+    \image windowflags_controllerwindow.png Screenshot of the Controller Window
+
+    \section1 ControllerWindow Class Implementation
+
+    \snippet examples/widgets/windowflags/controllerwindow.cpp 0
+
+    In the constructor we first create the preview window. Then we
+    create the group boxes containing the available window flags using
+    the private \c createTypeGroupBox() and \c createHintsGroupBox()
+    functions. In addition we create a \gui Quit button. We put the
+    button and a stretchable space in a separate layout to make the
+    button appear in the \c WindowFlag widget's right bottom corner.
+
+    Finally, we add the button's layout and the two goup boxes to a
+    QVBoxLayout, set the window title and refresh the preview window
+    using the \c updatePreview() slot.
+
+    \snippet examples/widgets/windowflags/controllerwindow.cpp 1
+    \snippet examples/widgets/windowflags/controllerwindow.cpp 2
+
+    The \c updatePreview() slot is called whenever the user changes
+    any of the window flags. First we create an empty Qt::WindowFlags
+    \c flags, then we determine which one of the types that is checked
+    and add it to \c flags.
+
+    \snippet examples/widgets/windowflags/controllerwindow.cpp 3
+
+    We also determine which of the hints that are checked, and add
+    them to \c flags using an OR operator. We use \c flags to set the
+    window flags for the preview window.
+
+    \snippet examples/widgets/windowflags/controllerwindow.cpp 4
+
+    We adjust the position of the preview window. The reason we do
+    that, is that playing around with the window's frame may on some
+    platforms cause the window's position to be changed behind our
+    back. If a window is located in the upper left corner of the
+    screen, parts of the window may not be visible. So we adjust the
+    widget's position to make sure that, if this happens, the window
+    is moved within the screen's boundaries. Finally, we call
+    QWidget::show() to make sure the preview window is visible.
+
+    \omit
+    \skipto pos
+    \printuntil /^\}/
+    \endomit
+
+    \snippet examples/widgets/windowflags/controllerwindow.cpp 5
+
+    The private \c createTypeGroupBox() function is called from the
+    constructor.
+
+    First we create a group box, and then we create a radio button
+    (using the private \c createRadioButton() function) for each of
+    the available types among the window flags. We make Qt::Window the
+    initially applied type. We put the radio buttons into a
+    QGridLayout and install the layout on the group box.
+
+    We do not include the default Qt::Widget type. The reason is that
+    it behaves somewhat different than the other types. If the type is
+    not specified for a widget, and it has no parent, the widget is a
+    window. However, if it has a parent, it is a standard child
+    widget. The other types are all top-level windows, and since the
+    hints only affect top-level windows, we abandon the Qt::Widget
+    type.
+
+    \snippet examples/widgets/windowflags/controllerwindow.cpp 6
+
+    The private \c createHintsGroupBox() function is also called from
+    the constructor.
+
+    Again, the first thing we do is to create a group box. Then we
+    create a checkbox, using the private \c createCheckBox() function,
+    for each of the available hints among the window flags. We put the
+    checkboxes into a QGridLayout and install the layout on the group
+    box.
+
+    \snippet examples/widgets/windowflags/controllerwindow.cpp 7
+
+    The private \c createCheckBox() function is called from \c
+    createHintsGroupBox().
+
+    We simply create a QCheckBox with the provided text, connect it to
+    the private \c updatePreview() slot, and return a pointer to the
+    checkbox.
+
+    \snippet examples/widgets/windowflags/controllerwindow.cpp 8
+
+    In the private \c createRadioButton() function it is a
+    QRadioButton we create with the provided text, and connect to the
+    private \c updatePreview() slot. The function is called from \c
+    createTypeGroupBox(), and returns a pointer to the button.
+
+    \section1 PreviewWindow Class Definition
+
+    \snippet examples/widgets/windowflags/previewwindow.h 0
+
+    The \c PreviewWindow class inherits QWidget. It is a custom widget
+    that displays the names of its currently set window flags in a
+    read-only text editor. It is also provided with a QPushbutton that
+    closes the window.
+
+    We reimplement the constructor to create the \gui Close button and
+    the text editor, and the QWidget::setWindowFlags() function to
+    display the names of the window flags.
+
+    \image windowflags_previewwindow.png Screenshot of the Preview Window
+
+    \section1 PreviewWindow Class Implementation
+
+    \snippet examples/widgets/windowflags/previewwindow.cpp 0
+
+    In the constructor, we first create a QTextEdit and make sure that
+    it is read-only.
+
+    We also prohibit any line wrapping in the text editor using the
+    QTextEdit::setLineWrapMode() function. The result is that a
+    horizontal scrollbar appears when a window flag's name exceeds the
+    width of the editor. This is a reasonable solution since we
+    construct the displayed text with built-in line breaks. If no line
+    breaks were guaranteed, using another QTextEdit::LineWrapMode
+    would perhaps make more sense.
+
+    Then we create the \gui Close button, and put both the widgets
+    into a QVBoxLayout before we set the window title.
+
+    \snippet examples/widgets/windowflags/previewwindow.cpp 1
+
+    In our reimplementation of the \c setWindowFlags() function, we
+    first set the widgets flags using the QWidget::setWindowFlags()
+    function. Then we run through the available window flags, creating
+    a text that contains the names of the flags that matches the \c
+    flags parameter. Finally, we display the text in the widgets text
+    editor.
+*/
diff --git a/doc/src/examples/worldtimeclockbuilder.qdoc b/doc/src/examples/worldtimeclockbuilder.qdoc
new file mode 100644
index 0000000000..644ffdb0c9
--- /dev/null
+++ b/doc/src/examples/worldtimeclockbuilder.qdoc
@@ -0,0 +1,111 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \example designer/worldtimeclockbuilder
+  \title World Time Clock Builder Example
+
+  The World Time Clock Builder example shows how forms created with Qt
+  Designer that contain custom widgets can be dynamically generated at
+  run-time.
+
+  \image worldtimeclockbuilder-example.png
+
+  This example uses a form containing the custom widget plugin described in the
+  \l{designer/worldtimeclockplugin}{World Time Clock Plugin} example, and
+  dynamically generates a user interface using the QUiLoader class, part of
+  the QtUiTools module.
+
+  \section1 Preparation
+
+  As with the \l{designer/calculatorbuilder}{Calculator Builder} example, the
+  project file for this example needs to include the appropriate definitions
+  to ensure that it is built against the required Qt modules.
+
+  \snippet examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro 0
+
+  By appending \c form to the \c CONFIG declaration, we instruct \c qmake to
+  generate a dependency on the \c libQtUiTools library containing the QtUiTools
+  classes.
+
+  Note that we do not inform \c qmake about any .ui files, and so none will
+  be processed and built into the application. The resource file contains
+  an entry for the particular form that we wish to use:
+
+  \quotefile examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.qrc
+
+  Forms do not need to be included with the application in this way. We only
+  include a form in the application's resources for convenience, and to keep
+  the example short.
+
+  \section1 Loading and Building the Form
+
+  Since this example only loads and displays a pre-prepared form, all of the
+  work can be done in the main() function. We are using a class from the
+  QtUiTools library so, in addition to any other Qt classes that are normally
+  required to write an application, we must include the appropriate header
+  file:
+
+  \snippet examples/designer/worldtimeclockbuilder/main.cpp 0
+
+  The main function initializes the resource system with the Q_INIT_RESOURCE()
+  macro and constructs an QApplication instance in the usual way:
+
+  \snippet examples/designer/worldtimeclockbuilder/main.cpp 1
+
+  We construct a QUiLoader object to handle the form we want to use.
+
+  The form itself is obtained from the resource file system using the path
+  defined in the resource file. We use the form loader to load and construct
+  the form:
+
+  \snippet examples/designer/worldtimeclockbuilder/main.cpp 2
+
+  Once the form has been loaded, the resource file can be closed and the
+  widget is shown.
+
+  \snippet examples/designer/worldtimeclockbuilder/main.cpp 3
+
+  The form loader ensures that all the signal and slot connections between
+  objects in the form are set up correctly when the form is loaded. As a
+  result, the time is updated by the World Time Clock widget, and the time
+  zone spin box can be used to change the position of the hour hand.
+*/
diff --git a/doc/src/examples/worldtimeclockplugin.qdoc b/doc/src/examples/worldtimeclockplugin.qdoc
new file mode 100644
index 0000000000..072b1f008f
--- /dev/null
+++ b/doc/src/examples/worldtimeclockplugin.qdoc
@@ -0,0 +1,210 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example designer/worldtimeclockplugin
+    \title World Time Clock Plugin Example
+
+    The World Time Clock Plugin example shows how to create a custom
+    widget plugin for \QD that uses signals and slots.
+
+    \image worldtimeclockplugin-example.png
+
+    In this example, we simply extend the \l
+    {designer/customwidgetplugin}{Custom Widget Plugin} example and
+    its custom widget (based on the \l{widgets/analogclock}{Analog
+    Clock} example), by introducing the concept of signals and slots.
+
+    The World Time Clock Plugin example consists of two classes:
+
+    \list
+    \o \c WorldTimeClock is a custom clock widget with hour and
+       minute hands that is automatically updated every few seconds.
+    \o \c WorldTimeClockPlugin exposes the \c WorldTimeClock class to \QD.
+    \endlist
+
+    First we will take a look at the \c WorldTimeClock class which
+    extends the \l {designer/customwidgetplugin}{Custom Widget Plugin}
+    example's \c AnalogClock class by providing a signal and a
+    slot. Then we will take a quick look at the \c
+    WorldTimeClockPlugin class, but this class is in most parts
+    identical to the \l {designer/customwidgetplugin}{Custom Widget
+    Plugin} example's implementation.
+
+    Finally we take a look at the plugin's project file. The project
+    file for custom widget plugins needs some additional information
+    to ensure that they will work within \QD. This is also covered in
+    the \l {designer/customwidgetplugin}{Custom Widget Plugin} example,
+    but due to its importance (custom widget plugins rely on
+    components supplied with \QD which must be specified in the
+    project file that we use) we will repeat it here.
+
+    \section1 WorldTimeClock Class
+
+    The \c WorldTimeClock class inherits QWidget, and is a custom
+    clock widget with hour and minute hands that is automatically
+    updated every few seconds. What makes this example different from
+    the \l {designer/customwidgetplugin}{Custom Widget Plugin}
+    example, is the introduction of the signal and slot in the custom
+    widget class:
+
+    \snippet examples/designer/worldtimeclockplugin/worldtimeclock.h 1
+
+    Note the use of the QDESIGNER_WIDGET_EXPORT macro. This is needed
+    to ensure that \QD can create instances of the widget on some
+    platforms, but it is a good idea to use it on all platforms.
+
+    We declare the \c setTimeZone() slot with an associated \c
+    timeZoneOffset variable, and we declare an \c updated() signal
+    which takes the current time as argument and is emitted whenever
+    the widget is repainted.
+
+    \image worldtimeclock-connection.png
+
+    In \QD's workspace we can then, for example, connect the \c
+    WorldTimeClock widget's \c updated() signal to a QTimeEdit's \l
+    {QDateTimeEdit::setTime()}{setTime()} slot using \QD's mode
+    for editing signal and slots.
+
+    \image worldtimeclock-signalandslot.png
+
+    We can also connect a QSpinBox's \l
+    {QSpinBox::valueChanged()}{valueChanged()} signal to the \c
+    WorldTimeClock's \c setTimeZone() slot.
+
+    \section1 WorldTimeClockPlugin Class
+
+    The \c WorldTimeClockPlugin class exposes the \c WorldTimeClock
+    class to \QD. Its definition is equivalent to the \l
+    {designer/customwidgetplugin}{Custom Widget Plugin} example's
+    plugin class which is explained in detail. The only part of the
+    class definition that is specific to this particular custom widget
+    is the class name:
+
+    \snippet examples/designer/worldtimeclockplugin/worldtimeclockplugin.h 0
+
+    The plugin class provides \QD with basic information about our
+    plugin, such as its class name and its include file. Furthermore
+    it knows how to create instances of the \c WorldTimeClockPlugin
+    widget.  \c WorldTimeClockPlugin also defines the \l
+    {QDesignerCustomWidgetInterface::initialize()}{initialize()}
+    function which is called after the plugin is loaded into \QD. The
+    function's QDesignerFormEditorInterface parameter provides the
+    plugin with a gateway to all of \QD's API's.
+
+    The \c WorldTimeClockPlugin class inherits from both QObject and
+    QDesignerCustomWidgetInterface. It is important to remember, when
+    using multiple inheritance, to ensure that all the interfaces
+    (i.e. the classes that doesn't inherit Q_OBJECT) are made known to
+    the meta object system using the Q_INTERFACES() macro. This
+    enables \QD to use \l qobject_cast() to query for supported
+    interfaces using nothing but a QObject pointer.
+
+    The implementation of the \c WorldTimeClockPlugin is also
+    equivalent to the plugin interface implementation in the \l
+    {designer/customwidgetplugin}{Custom Widget Plugin} example (only
+    the class name and the implementation of
+    QDesignerCustomWidgetInterface::domXml() differ). The main thing
+    to remember is to use the Q_EXPORT_PLUGIN2() macro to export the \c
+    WorldTimeClockPlugin class for use with \QD:
+
+    \snippet examples/designer/worldtimeclockplugin/worldtimeclockplugin.cpp 0
+
+    Without this macro, there is no way for Qt Designer to use the
+    widget.
+
+    \section1 The Project File: worldtimeclockplugin.pro
+
+    The project file for custom widget plugins needs some additional
+    information to ensure that they will work as expected within \QD:
+
+    \snippet examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro 0
+    \snippet examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro 1
+
+    The \c TEMPLATE variable's value make \c qmake create the custom
+    widget as a library. The \c CONFIG variable contains two values,
+    \c designer and \c plugin:
+
+    \list
+        \o \c designer: Since custom widgets plugins rely on components
+           supplied with \QD, this value ensures that our plugin links against
+           \QD's library (\c libQtDesigner.so).
+
+        \o \c plugin: We also need to ensure that \c qmake considers the
+           custom widget a \e plugin library.
+    \endlist
+
+    When Qt is configured to build in both debug and release modes,
+    \QD will be built in release mode.  When this occurs, it is
+    necessary to ensure that plugins are also built in release
+    mode. For that reason you might have to add a \c release value to
+    your \c CONFIG variable. Otherwise, if a plugin is built in a mode
+    that is incompatible with \QD, it won't be loaded and
+    installed.
+
+    The header and source files for the widget are declared in the
+    usual way, and in addition we provide an implementation of the
+    plugin interface so that \QD can use the custom widget.
+
+    \snippet examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro 2
+
+    It is important to ensure that the plugin is installed in a location that
+    is searched by \QD. We do this by specifying a target path for the project
+    and adding it to the list of items to install:
+
+    \snippet doc/src/snippets/code/doc_src_examples_worldtimeclockplugin.qdoc 0
+
+    The custom widget is created as a library, and will be installed
+    alongside the other \QD plugins when the project is installed
+    (using \c{make install} or an equivalent installation procedure).
+    Later, we will ensure that it is recognized as a plugin by \QD by
+    using the Q_EXPORT_PLUGIN2() macro to export the relevant widget
+    information.
+
+    Note that if you want the plugins to appear in a Visual Studio
+    integration, the plugins must be built in release mode and their
+    libraries must be copied into the plugin directory in the install
+    path of the integration (for an example, see \c {C:/program
+    files/trolltech as/visual studio integration/plugins}).
+
+    For more information about plugins, see the \l {How to Create Qt
+    Plugins} document.
+*/
diff --git a/doc/src/examples/xmlstreamlint.qdoc b/doc/src/examples/xmlstreamlint.qdoc
new file mode 100644
index 0000000000..925a7a0e34
--- /dev/null
+++ b/doc/src/examples/xmlstreamlint.qdoc
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example xml/xmlstreamlint
+    \title XML Stream Lint Example
+
+    The XML Stream Lint example provides a simple command line utility that
+    accepts a file name as its single argument and writes it to the standard
+    output file.
+
+    The specified file is parsed using an QXmlStreamReader object and written
+    to the standard output file using an QXmlStreamWriter object. If the file
+    does not contain a well-formed XML document or the use of namespaces in
+    the document is incorrect, a description of the error is printed to
+    the standard error file and will appear in the console.
+
+    \section1 Basic Operation
+
+    The main function of the example opens the file specified by the user
+    for input (\c inputFile), and it uses QFile to access the standard output
+    file.
+
+    Reading XML is handled by an instance of the QXmlStreamReader class, which
+    operates on the input file object; writing is handled by an instance of
+    QXmlStreamWriter operating on the output file object:
+
+    \snippet examples/xml/xmlstreamlint/main.cpp 0
+
+    The work of parsing and rewriting the XML is done in a while loop, and is
+    driven by input from the reader:
+
+    \snippet examples/xml/xmlstreamlint/main.cpp 1
+
+    If more input is available, the next token from the input file is read
+    and parsed. If an error occurred, information is written to the standard
+    error file via a stream, and the example exits by returning a non-zero
+    value from the main function.
+
+    \snippet examples/xml/xmlstreamlint/main.cpp 2
+
+    For valid input, the writer is fed the current token from the reader,
+    and this is written to the output file that was specified when it was
+    constructed.
+
+    When there is no more input, the loop terminates, and the example can
+    exit successfully.
+*/
diff --git a/doc/src/exportedfunctions.qdoc b/doc/src/exportedfunctions.qdoc
new file mode 100644
index 0000000000..f67950c15a
--- /dev/null
+++ b/doc/src/exportedfunctions.qdoc
@@ -0,0 +1,136 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page exportedfunctions.html
+    \title Special-Purpose Global Functions Exported by Qt
+    \ingroup classlists
+
+    Qt provides a few low-level global functions for fine-tuning
+    applications. Most of these perform very specific tasks and are
+    platform-specific. In general, we recommend that you try using
+    Qt's public API before resorting to using any functions mentioned
+    here.
+
+    These functions are exported by \l QtCore and \l QtGui, but most
+    of them aren't declared in Qt's header files. To use them in your
+    application, you must declare them before calling them. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_exportedfunctions.qdoc 0
+
+    These functions will remain as part of Qt for the lifetime of Qt
+    4.
+
+    Functions:
+
+    \tableofcontents
+
+    \section1 void qt_set_library_config_file(const QString &\e{fileName})
+
+    Specifies the location of the Qt configuration file. You must
+    call this function before constructing a QApplication or
+    QCoreApplication object. If no location is specified, Qt
+    automatically finds an appropriate location.
+
+    \section1 void qt_set_sequence_auto_mnemonic(bool \e{enable})
+
+    Specifies whether mnemonics for menu items, labels, etc., should
+    be honored or not. On Windows and X11, this feature is
+    on by default; on Mac OS X, it is off. When this feature is off,
+    the QKeySequence::mnemonic() function always returns an empty
+    string. This feature is also enabled on embedded Linux.
+
+    \section1 void qt_x11_wait_for_window_manager(QWidget *\e{widget})
+
+    Blocks until the X11 window manager has shown the widget after a
+    call to QWidget::show().
+
+    \section1 void qt_mac_secure_keyboard(bool \e{enable})
+
+    Turns the Mac OS X secure keyboard feature on or off. QLineEdit
+    uses this when the echo mode is QLineEdit::Password or
+    QLineEdit::NoEcho to guard the editor against keyboard sniffing.
+    If you implement your own password editor, you might want to turn
+    on this feature in your editor's
+    \l{QWidget::focusInEvent()}{focusInEvent()} and turn it off in
+    \l{QWidget::focusOutEvent()}{focusOutEvent()}.
+
+    \section1 void qt_mac_set_dock_menu(QMenu *\e{menu})
+
+    Sets the menu to display in the Mac OS X Dock for the
+    application. This menu is shown when the user attempts a
+    press-and-hold operation on the application's dock icon or
+    \key{Ctrl}-clicks on it while the application is running.
+
+    The menu will be turned into a Mac menu and the items added to the default
+    Dock menu. There is no merging of the Qt menu items with the items that are
+    in the Dock menu (i.e., it is not recommended to include actions that
+    duplicate functionality of items already in the Dock menu).
+
+    \section1 void qt_mac_set_menubar_icons(bool \e{enable})
+
+    Specifies whether icons associated to menu items for the
+    application's menu bar should be shown on Mac OS X. By default,
+    icons are shown on Mac OS X just like on the other platforms.
+
+    In Qt 4.4, this is equivalent to
+    \c { QApplication::instance()->setAttribute(Qt::AA_DontShowIconsInMenus); }.
+
+    \section1 void qt_mac_set_menubar_merge(bool \e{enable})
+
+    Specifies whether Qt should attempt to relocate standard menu
+    items (such as \gui Quit, \gui Preferences, and \gui About) to
+    the application menu on Mac OS X. This feature is on by default.
+    See \l{Qt for Mac OS X - Specific Issues} for the list of menu items for
+    which this applies.
+
+    \section1 void qt_mac_set_native_menubar(bool \e{enable})
+
+    Specifies whether the application should use the native menu bar
+    on Mac OS X or be part of the main window. This feature is on by
+    default.
+
+    \section1 void qt_mac_set_press_and_hold_context(bool \e{enable})
+
+    Turns emulation of the right mouse button by clicking and holding
+    the left mouse button on or off. This feature is off by default.
+*/
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
new file mode 100644
index 0000000000..f48c3d7763
--- /dev/null
+++ b/doc/src/external-resources.qdoc
@@ -0,0 +1,349 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \externalpage http://www.freedesktop.org/
+    \title freedesktop.org
+*/
+
+/*!
+    \externalpage http://www.freedesktop.org/Standards/xembed-spec
+    \title XEmbed Specification
+*/
+
+/*!
+    \externalpage http://www.freedesktop.org/Standards/icon-theme-spec
+    \title Icon Themes Specification
+*/
+
+/*!
+    \externalpage http://www.cups.org/
+    \title Common Unix Printing System (CUPS)
+    \keyword CUPS
+*/
+
+/*!
+    \externalpage http://www.freedesktop.org/wiki/Standards_2fdesktop_2dentry_2dspec
+    \title Desktop Entry Specification
+*/
+
+/*!
+    \externalpage http://www.kde.org/
+    \title The K Desktop Environment
+    \keyword KDE
+*/
+
+/*!
+    \externalpage http://www.gnome.org/
+    \title GNOME
+*/
+
+/*!
+    \externalpage http://www.gnu.org/software/emacs/
+    \title GNU Emacs
+*/
+
+/*!
+    \externalpage http://www.amnesty.org/
+    \title Amnesty International
+*/
+
+/*!
+    \externalpage http://www.w3.org/Graphics/SVG/About.html
+    \title About SVG
+    \keyword Scalable Vector Graphics
+*/
+
+/*!
+    \externalpage http://www.w3.org/TR/SVG/types.html#ColorKeywords
+    \title SVG color keyword names
+*/
+
+/*!
+    \externalpage http://www.w3.org/Graphics/SVG/
+    \title SVG Working Group
+*/
+
+/*!
+    \externalpage http://www.w3.org/TR/SVGMobile/
+    \title Mobile SVG Profiles
+    \omit
+    Mobile SVG Profiles: SVG Tiny and SVG Basic
+    \endomit
+*/
+
+/*!
+    \externalpage http://www.w3.org/TR/SVGMobile12/
+    \title SVG 1.2 Tiny
+*/
+
+/*!
+    \externalpage http://www.w3.org/Graphics/SVG/feature/1.2/#SVG-static
+    \title SVG 1.2 Tiny Static Features
+*/
+
+/*!
+    \externalpage http://www.ietf.org/rfc/rfc1179.txt
+    \title RFC 1179
+    \keyword lpr
+*/
+
+/*!
+    \externalpage http://www.rfc-editor.org/rfc/rfc1738.txt
+    \title RFC 1738
+*/
+
+/*!
+    \externalpage http://www.rfc-editor.org/rfc/rfc1928.txt
+    \title RFC 1928
+*/
+
+/*!
+    \externalpage http://www.rfc-editor.org/rfc/rfc1929.txt
+    \title RFC 1929
+*/
+
+/*!
+    \externalpage http://www.rfc-editor.org/rfc/rfc2045.txt
+    \title RFC 2045
+*/
+
+/*!
+    \externalpage http://www.rfc-editor.org/rfc/rfc2109.txt
+    \title RFC 2109
+    HTTP State Management Mechanism
+*/
+
+/*!
+    \externalpage http://www.rfc-editor.org/rfc/rfc2965.txt
+    \title RFC 2965
+    HTTP State Management Mechanism
+*/
+
+/*!
+    \externalpage http://www.rfc-editor.org/rfc/rfc3174.txt
+    \title RFC 3174
+*/
+
+/*!
+    \externalpage http://www.rfc-editor.org/rfc/rfc3491.txt
+    \title RFC 3491
+*/
+
+/*!
+    \externalpage http://www.rfc-editor.org/rfc/rfc3986.txt
+    \title RFC 3986
+*/
+
+/*!
+    \externalpage http://www.dependencywalker.com/
+    \title Dependency Walker
+*/
+
+/*!
+    \externalpage http://www.ecma-international.org/publications/standards/Ecma-262.htm
+    \title ECMA-262
+*/
+
+/*!
+    \externalpage http://www.davidflanagan.com/javascript5/
+    \title JavaScript: The Definitive Guide
+*/
+
+/*!
+    \externalpage http://webkit.org/
+    \title WebKit Open Source Project
+*/
+
+/*!
+    \externalpage http://www.informit.com/store/product.aspx?isbn=0132354160
+    \title C++ GUI Programming with Qt 4, 2nd Edition
+*/
+
+/*!
+    \externalpage http://www.openssl.org/
+    \title OpenSSL Toolkit
+*/
+
+/*!
+    \externalpage http://arora-browser.org/
+    \title Arora Browser
+*/
+
+/*!
+    \externalpage http://www.activestate.com/Products/activeperl/index.mhtml
+    \title ActivePerl
+*/
+
+/*!
+    \externalpage http://www.w3.org/TR/html401/
+    \title HTML 4
+*/
+
+/*!
+    \externalpage http://www.w3.org/TR/html5/
+    \title HTML 5
+*/
+
+/*!
+    \externalpage http://pyxml.sourceforge.net/topics/xbel/
+    \title XML Bookmark Exchange Language Resource Page
+*/
+
+/*!
+    \externalpage http://www.w3.org/TR/xquery/#errors
+    \title error handling in the XQuery language
+*/
+
+/*!
+    \externalpage http://xaos.sourceforge.net/
+    \title XaoS
+*/
+
+/*!
+    \externalpage http://www.unixodbc.org
+    \title http://www.unixodbc.org
+*/
+
+/*!
+    \externalpage http://www.postgresql.org
+    \title http://www.postgresql.org
+*/
+
+/*!
+    \externalpage http://www.postgresql.org/docs/faqs.FAQ_MINGW.html
+    \title Compiling PostgreSQL On Native Win32 FAQ
+*/
+
+/*!
+    \externalpage http://www.freetds.org
+    \title http://www.freetds.org
+*/
+
+/*!
+    \externalpage http://www.sybase.com
+    \title http://www.sybase.com
+*/
+
+/*!
+    \externalpage http://linux.sybase.com
+    \title http://linux.sybase.com
+*/
+
+/*!
+    \externalpage http://www.sqlite.org
+    \title http://www.sqlite.org
+*/
+
+/*!
+    \externalpage http://www.amazon.com/exec/obidos/ASIN/0134436989/trolltech/t
+    \title Threads Primer: A Guide to Multithreaded Programming
+*/
+
+/*!
+    \externalpage http://www.amazon.com/exec/obidos/ASIN/0131900676/trolltech/t
+    \title Thread Time: The Multithreaded Programming Guide
+*/
+
+/*!
+    \externalpage http://www.amazon.com/exec/obidos/ASIN/1565921151/trolltech/t
+    \title Pthreads Programming: A POSIX Standard for Better Multiprocessing
+*/
+
+/*!
+    \externalpage http://www.amazon.com/exec/obidos/ASIN/1565922964/trolltech/t
+    \title Win32 Multithreaded Programming
+*/
+
+/*!
+    \externalpage http://www.iana.org/assignments/character-sets
+    \title IANA character-sets encoding file
+*/
+
+/*!
+    \externalpage http://www.phptr.com/content/images/0131872494/samplechapter/blanchette_ch10.pdf
+    \title "Item View Classes" Chapter of C++ GUI Programming with Qt 4
+*/
+
+/*!
+    \externalpage http://developer.apple.com/documentation/UserExperience/Conceptual/AppleHIGuidelines/XHIGIntro/chapter_1_section_1.html
+    \title Mac OS X Aqua
+*/
+
+/*!
+    \externalpage http://www.kdedevelopers.org/node/2345
+    \title KDE applications
+*/
+
+/*!
+    \externalpage http://cgi.netscape.com/newsref/std/cookie_spec.html
+    \title Netscape Cookie Specification
+*/
+
+/*!
+    \externalpage http://msdn.microsoft.com/en-us/library/ms533046(VS.85).aspx
+    \title Mitigating Cross-site Scripting With HTTP-only Cookies
+*/
+
+/*!
+    \externalpage http://en.tldp.org/HOWTO/Framebuffer-HOWTO.html
+    \title Framebuffer HOWTO
+*/
+
+/*!
+    \externalpage http://wap.trafikanten.no
+    \title Trafikanten
+*/
+
+/*!
+    \externalpage http://www.gnu.org/licenses/gpl.html
+    \title GNU General Public License
+*/
+
+/*!
+    \externalpage http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
+    \title GNU Lesser General Public License, version 2.1
+*/
+
+/*!
+    \externalpage http://developers.sun.com/sunstudio/downloads/patches/index.jsp
+    \title Sun Studio Patches
+*/
diff --git a/doc/src/focus.qdoc b/doc/src/focus.qdoc
new file mode 100644
index 0000000000..defb3e0db2
--- /dev/null
+++ b/doc/src/focus.qdoc
@@ -0,0 +1,213 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** Documentation of focus handling in Qt.
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Qt GUI Toolkit.
+** EDITIONS: FREE, PROFESSIONAL, ENTERPRISE
+**
+****************************************************************************/
+
+/*!
+    \page focus.html
+    \title Keyboard Focus
+    \ingroup architecture
+    \ingroup gui-programming
+    \brief An overview of the keyboard focus management and handling.
+
+    \keyword keyboard focus
+
+    Qt's widgets handle keyboard focus in the ways that have become
+    customary in GUIs. 
+
+    The basic issue is that the user's key strokes can be directed at any
+    of several windows on the screen, and any of several widgets inside
+    the intended window. When the user presses a key, they expect it to go
+    to the right place, and the software must try to meet this
+    expectation. The system must determine which application the key stroke
+    is directed at, which window within that application, and which widget
+    within that window.
+
+    \section1 Focus Motion
+
+    The customs which have evolved for directing keyboard focus to a
+    particular widget are these: 
+
+    \list 1
+
+    \o The user presses \key Tab (or \key Shift+Tab).
+    \o The user clicks a widget.
+    \o The user presses a keyboard shortcut.
+    \o The user uses the mouse wheel.
+    \o The user moves the focus to a window, and the application must
+       determine which widget within the window should get the focus.
+    \endlist
+
+    Each of these motion mechanisms is different, and different types of
+    widgets receive focus in only some of them. We'll cover each of them
+    in turn.
+
+    \section2 Tab or Shift+Tab
+
+    Pressing \key Tab is by far the most common way to move focus
+    using the keyboard. (Sometimes in data-entry applications Enter
+    does the same as \key{Tab}; this can easily be achieved in Qt by
+    implementing an \l{Events and Event Filters}{event filter}.)
+
+    Pressing \key Tab, in all window systems in common use today,
+    moves the keyboard focus to the next widget in a circular
+    per-window list. \key Tab moves focus along the circular list in
+    one direction, \key Shift+Tab in the other. The order in which
+    \key Tab presses move from widget to widget is called the tab order.
+
+    You can customize the tab order using QWidget::setTabOrder(). (If
+    you don't, \key Tab generally moves focus in the order of widget
+    construction.) \l{Qt Designer} provides a means of visually
+    changing the tab order.
+
+    Since pressing \key Tab is so common, most widgets that can have focus
+    should support tab focus. The major exception is widgets that are
+    rarely used, and where there is some keyboard accelerator or error
+    handler that moves the focus.
+
+    For example, in a data entry dialog, there might be a field that
+    is only necessary in one per cent of all cases. In such a dialog,
+    \key Tab could skip this field, and the dialog could use one of
+    these mechanisms: 
+
+    \list 1
+
+    \o If the program can determine whether the field is needed, it can
+    move focus there when the user finishes entry and presses \gui OK, or when
+    the user presses Enter after finishing the other fields. Alternately,
+    include the field in the tab order but disable it. Enable it if it
+    becomes appropriate in view of what the user has set in the other
+    fields.
+
+    \o The label for the field can include a keyboard shortcut that moves
+    focus to this field.
+
+    \endlist
+
+    Another exception to \key Tab support is text-entry widgets that
+    must support the insertion of tabs; almost all text editors fall
+    into this class. Qt treats \key Ctrl+Tab as \key Tab and \key
+    Ctrl+Shift+Tab as \key Shift+Tab, and such widgets can
+    reimplement QWidget::event() and handle Tab before calling
+    QWidget::event() to get normal processing of all other keys.
+    However, since some systems use \key Ctrl+Tab for other purposes,
+    and many users aren't aware of \key Ctrl+Tab anyway, this isn't a
+    complete solution.
+
+    \section2 The User Clicks a Widget
+
+    This is perhaps even more common than pressing \key Tab on
+    computers with a mouse or other pointing device.
+
+    Clicking to move the focus is slightly more powerful than \key
+    Tab. While it moves the focus \e to a widget, for editor widgets
+    it also moves the text cursor (the widget's internal focus) to
+    the spot where the mouse is clicked.
+
+    Since it is so common and people are used to it, it's a good idea to
+    support it for most widgets. However, there is also an important
+    reason to avoid it: you may not want to remove focus from the widget
+    where it was.
+
+    For example, in a word processor, when the user clicks the 'B' (bold)
+    tool button, what should happen to the keyboard focus? Should it
+    remain where it was, almost certainly in the editing widget, or should
+    it move to the 'B' button?
+
+    We advise supporting click-to-focus for widgets that support text
+    entry, and to avoid it for most widgets where a mouse click has a
+    different effect. (For buttons, we also recommend adding a keyboard
+    shortcut: QAbstractButton and its subclasses make this very easy.)
+
+    In Qt, only the QWidget::setFocusPolicy() function affects
+    click-to-focus.
+
+    \section2 The User Presses a Keyboard Shortcut
+
+    It's not unusual for keyboard shortcuts to move the focus. This
+    can happen implicitly by opening modal dialogs, but also
+    explicitly using focus accelerators such as those provided by
+    QLabel::setBuddy(), QGroupBox, and QTabBar.
+
+    We advise supporting shortcut focus for all widgets that the user
+    may want to jump to. For example, a tab dialog can have keyboard
+    shortcuts for each of its pages, so the user can press e.g. \key
+    Alt+P to step to the \underline{P}rinting page. It is easy to
+    overdo this: there are only a few keys, and it's also important
+    to provide keyboard shortcuts for commands. \key Alt+P is also
+    used for Paste, Play, Print, and Print Here in the \l{Standard
+    Accelerator Keys} list, for example.
+
+    \section2 The User Rotates the Mouse Wheel
+
+    On Microsoft Windows, mouse wheel usage is always handled by the
+    widget that has keyboard focus. On Mac OS X and X11, it's handled by
+    the widget that gets other mouse events.
+
+    The way Qt handles this platform difference is by letting widgets move
+    the keyboard focus when the wheel is used. With the right focus policy
+    on each widget, applications can work idiomatically correctly on
+    Windows, Mac OS X, and X11.
+
+    \section2 The User Moves the Focus to This Window
+
+    In this situation the application must determine which widget within
+    the window should receive the focus.
+
+    This can be simple: If the focus has been in this window before,
+    then the last widget to have focus should regain it. Qt does this
+    automatically.
+
+    If focus has never been in this window before and you know where
+    focus should start out, call QWidget::setFocus() on the widget
+    which should receive focus before you call QWidget::show() it. If
+    you don't, Qt will pick a suitable widget.
+*/
diff --git a/doc/src/functions.qdoc b/doc/src/functions.qdoc
new file mode 100644
index 0000000000..4aa085153b
--- /dev/null
+++ b/doc/src/functions.qdoc
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** Documentation for class overview.
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Qt GUI Toolkit.
+** EDITIONS: FREE, PROFESSIONAL, ENTERPRISE
+**
+****************************************************************************/
+
+/*!
+    \page functions.html
+    \title Member Function Index
+    \ingroup classlists
+
+    Here is the list of all the documented member functions in the Qt
+    API with links to the class documentation for each function.
+
+    \generatelist functionindex
+*/
diff --git a/doc/src/gallery-cde.qdoc b/doc/src/gallery-cde.qdoc
new file mode 100644
index 0000000000..36916a2209
--- /dev/null
+++ b/doc/src/gallery-cde.qdoc
@@ -0,0 +1,392 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \page gallery-cde.html
+
+  \title CDE Style Widget Gallery
+  \ingroup gallery
+
+  This page shows some of the widgets available in Qt
+  when configured to use the "cde" style.
+
+\raw HTML
+<h2 align="center">Buttons</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cde-pushbutton.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cde-toolbutton.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QPushButton widget provides a command button.
+\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cde-checkbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cde-radiobutton.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QCheckBox widget provides a checkbox with a text label.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QRadioButton widget provides a radio button with a text or pixmap label.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Containers</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cde-groupbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cde-tabwidget.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QGroupBox widget provides a group box frame with a title.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTabWidget class provides a stack of tabbed widgets.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cde-frame.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cde-toolbox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QFrame widget provides a simple decorated container for other widgets.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QToolBox class provides a column of tabbed widget items.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Item Views</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cde-listview.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cde-treeview.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QListView class provides a default model/view implementation of a list/icon view. The QListWidget class provides a classic item-based list/icon view.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTreeView class provides a default model/view implementation of a tree view. The QTreeWidget class provides a classic item-based tree view.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cde-tableview.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QTableView class provides a default model/view implementation of a table view. The QTableWidget class provides a classic item-based table view.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Display Widgets</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cde-progressbar.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cde-lcdnumber.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QProgressBar widget provides a horizontal progress bar.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QLCDNumber widget displays a number with LCD-like digits.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cde-label.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QLabel widget provides a text or image display.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Input Widgets</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cde-slider.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cde-lineedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QSlider widget provides a vertical or horizontal slider.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QLineEdit widget is a one-line text editor.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cde-combobox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cde-doublespinbox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QComboBox widget is a combined button and pop-up list.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QDoubleSpinBox class provides a spin box widget that allows double precision floating point numbers to be entered.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cde-spinbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cde-timeedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QSpinBox class provides a spin box widget.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTimeEdit class provides a widget for editing times.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cde-dateedit.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cde-datetimeedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QDateEdit class provides a widget for editing dates.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QDateTimeEdit class provides a widget for editing dates and times.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cde-textedit.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cde-horizontalscrollbar.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QTextEdit class provides a widget that is used to edit and
+     display both plain and rich text.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QScrollBar widget provides a vertical or horizontal scroll bar. Here, we show a scroll bar with horizontal orientation.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cde-dial.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cde-calendarwidget.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QDial class provides a rounded range control (like a
+       speedometer or potentiometer).\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QCalendarWidget class provides a monthly calendar widget that can be used to select dates.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cde-fontcombobox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QFontComboBox widget is a specialized combobox that enables fonts to be selected from a pop-up list containing previews of available fonts.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+*/
diff --git a/doc/src/gallery-cleanlooks.qdoc b/doc/src/gallery-cleanlooks.qdoc
new file mode 100644
index 0000000000..7ae5385a70
--- /dev/null
+++ b/doc/src/gallery-cleanlooks.qdoc
@@ -0,0 +1,392 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \page gallery-cleanlooks.html
+
+  \title Cleanlooks Style Widget Gallery
+  \ingroup gallery
+
+  This page shows some of the widgets available in Qt
+  when configured to use the "cleanlooks" style.
+
+\raw HTML
+<h2 align="center">Buttons</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-pushbutton.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-toolbutton.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QPushButton widget provides a command button.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QToolButton class provides a quick-access button to commands
+       or options, usually used inside a QToolBar.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-checkbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-radiobutton.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QCheckBox widget provides a checkbox with a text label.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QRadioButton widget provides a radio button with a text or pixmap label.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Containers</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-groupbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-tabwidget.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QGroupBox widget provides a group box frame with a title.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTabWidget class provides a stack of tabbed widgets.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-frame.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-toolbox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QFrame widget provides a simple decorated container for other widgets.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QToolBox class provides a column of tabbed widget items.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Item Views</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-listview.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-treeview.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QListView class provides a default model/view implementation of a list/icon view. The QListWidget class provides a classic item-based list/icon view.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTreeView class provides a default model/view implementation of a tree view. The QTreeWidget class provides a classic item-based tree view.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-tableview.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QTableView class provides a default model/view implementation of a table view. The QTableWidget class provides a classic item-based table view.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Display Widgets</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-progressbar.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-lcdnumber.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QProgressBar widget provides a horizontal progress bar.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QLCDNumber widget displays a number with LCD-like digits.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-label.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QLabel widget provides a text or image display.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Input Widgets</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-slider.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-lineedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QSlider widget provides a vertical or horizontal slider.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QLineEdit widget is a one-line text editor.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-combobox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-doublespinbox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QComboBox widget is a combined button and pop-up list.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QDoubleSpinBox class provides a spin box widget that allows double precision floating point numbers to be entered.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-spinbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-timeedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QSpinBox class provides a spin box widget.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTimeEdit class provides a widget for editing times.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-dateedit.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-datetimeedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QDateEdit class provides a widget for editing dates.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QDateTimeEdit class provides a widget for editing dates and times.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-textedit.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-horizontalscrollbar.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QTextEdit class provides a widget that is used to edit and
+     display both plain and rich text.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QScrollBar widget provides a vertical or horizontal scroll bar. Here, we show a scroll bar with horizontal orientation.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-dial.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-calendarwidget.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QDial class provides a rounded range control (like a
+       speedometer or potentiometer).\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QCalendarWidget class provides a monthly calendar widget that can be used to select dates.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-fontcombobox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QFontComboBox widget is a specialized combobox that enables fonts to be selected from a pop-up list containing previews of available fonts.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+*/
diff --git a/doc/src/gallery-gtk.qdoc b/doc/src/gallery-gtk.qdoc
new file mode 100644
index 0000000000..8251f04f9b
--- /dev/null
+++ b/doc/src/gallery-gtk.qdoc
@@ -0,0 +1,358 @@
+/*!
+  \page gallery-gtk.html
+
+  \title GTK Style Widget Gallery
+  \ingroup gallery
+
+  This page shows some of the widgets available in Qt
+  when configured to use the "gtk" style.
+
+  Take a look at the \l{Qt Widget Gallery} to see how Qt
+  applications appear in other styles.
+
+\raw HTML
+<h2 align="center">Buttons</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage gtk-pushbutton.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage gtk-toolbutton.png
+\raw HTML
+</td>
+</tr><tr>
+<td align="justify" valign="top">
+\endraw
+The QPushButton widget provides a command button.\raw HTML
+</td>
+<td align="justify" valign="top">
+\endraw
+The QToolButton class provides a quick-access button to commands
+       or options, usually used inside a QToolBar.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage gtk-checkbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage gtk-radiobutton.png
+\raw HTML
+</td>
+</tr><tr>
+<td align="justify" valign="top">
+\endraw
+The QCheckBox widget provides a checkbox with a text label.\raw HTML
+</td>
+<td align="justify" valign="top">
+\endraw
+The QRadioButton widget provides a radio button with a text or pixmap label.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Containers</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage gtk-groupbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage gtk-tabwidget.png
+\raw HTML
+</td>
+</tr><tr>
+<td align="justify" valign="top">
+\endraw
+The QGroupBox widget provides a group box frame with a title.\raw HTML
+</td>
+<td align="justify" valign="top">
+\endraw
+The QTabWidget class provides a stack of tabbed widgets.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage gtk-toolbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage gtk-frame.png
+\raw HTML
+</td>
+</tr><tr>
+<td align="justify" valign="top">
+\endraw
+The QToolBox class provides a column of tabbed widget items.\raw HTML
+</td>
+<td align="justify" valign="top">
+\endraw
+The QFrame widget provides a simple decorated container for other widgets.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Item Views</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage gtk-listview.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage gtk-treeview.png
+\raw HTML
+</td>
+</tr><tr>
+<td align="justify" valign="top">
+\endraw
+The QListView class provides a default model/view implementation of a list/icon view. The QListWidget class provides a classic item-based list/icon view.\raw HTML
+</td>
+<td align="justify" valign="top">
+\endraw
+The QTreeView class provides a default model/view implementation of a tree view. The QTreeWidget class provides a classic item-based tree view.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage gtk-tableview.png
+\raw HTML
+</td>
+</tr><tr>
+<td align="justify" valign="top">
+\endraw
+The QTableView class provides a default model/view implementation of a table view. The QTableWidget class provides a classic item-based table view.\raw HTML
+</td>
+<td align="justify" valign="top">
+\endraw
+\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Display Widgets</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage gtk-progressbar.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage gtk-lcdnumber.png
+\raw HTML
+</td>
+</tr><tr>
+<td align="justify" valign="top">
+\endraw
+The QProgressBar widget provides a horizontal progress bar.\raw HTML
+</td>
+<td align="justify" valign="top">
+\endraw
+The QLCDNumber widget displays a number with LCD-like digits.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage gtk-label.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QLabel widget provides a text or image display.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Input Widgets</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage gtk-slider.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage gtk-lineedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td align="justify" valign="top">
+\endraw
+The QSlider widget provides a vertical or horizontal slider.\raw HTML
+</td>
+<td align="justify" valign="top">
+\endraw
+The QLineEdit widget is a one-line text editor.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage gtk-combobox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage gtk-doublespinbox.png
+\raw HTML
+</td>
+</tr><tr>
+<td align="justify" valign="top">
+\endraw
+The QComboBox widget is a combined button and pop-up list.\raw HTML
+</td>
+<td align="justify" valign="top">
+\endraw
+The QDoubleSpinBox class provides a spin box widget that allows double precision floating point numbers to be entered.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage gtk-spinbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage gtk-timeedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td align="justify" valign="top">
+\endraw
+The QSpinBox class provides a spin box widget.\raw HTML
+</td>
+<td align="justify" valign="top">
+\endraw
+The QTimeEdit class provides a widget for editing times.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage gtk-dateedit.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage gtk-datetimeedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td align="justify" valign="top">
+\endraw
+The QDateEdit class provides a widget for editing dates.\raw HTML
+</td>
+<td align="justify" valign="top">
+\endraw
+The QDateTimeEdit class provides a widget for editing dates and times.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage gtk-textedit.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage gtk-horizontalscrollbar.png
+\raw HTML
+</td>
+</tr><tr>
+<td align="justify" valign="top">
+\endraw
+The QTextEdit class provides a widget that is used to edit and
+     display both plain and rich text.\raw HTML
+</td>
+<td align="justify" valign="top">
+\endraw
+The QScrollBar widget provides a vertical or horizontal scroll bar. Here, we show a scroll bar with horizontal orientation.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage gtk-dial.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage gtk-calendarwidget.png
+\raw HTML
+</td>
+</tr><tr>
+<td align="justify" valign="top">
+\endraw
+The QDial class provides a rounded range control (like a
+       speedometer or potentiometer).\raw HTML
+</td>
+<td align="justify" valign="top">
+\endraw
+The QCalendarWidget class provides a monthly calendar widget that can be used to select dates.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage gtk-fontcombobox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QFontComboBox widget is a specialized combobox that enables fonts to be selected from a pop-up list containing previews of available fonts.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+*/
diff --git a/doc/src/gallery-macintosh.qdoc b/doc/src/gallery-macintosh.qdoc
new file mode 100644
index 0000000000..608713dbbd
--- /dev/null
+++ b/doc/src/gallery-macintosh.qdoc
@@ -0,0 +1,392 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \page gallery-macintosh.html
+
+  \title Macintosh Style Widget Gallery
+  \ingroup gallery
+
+  This page shows some of the widgets available in Qt
+  when configured to use the "macintosh" style.
+
+\raw HTML
+<h2 align="center">Buttons</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage macintosh-pushbutton.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage macintosh-toolbutton.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QPushButton widget provides a command button.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QToolButton class provides a quick-access button to commands
+       or options, usually used inside a QToolBar.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage macintosh-checkbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage macintosh-radiobutton.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QCheckBox widget provides a checkbox with a text label.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QRadioButton widget provides a radio button with a text or pixmap label.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Containers</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage macintosh-groupbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage macintosh-tabwidget.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QGroupBox widget provides a group box frame with a title.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTabWidget class provides a stack of tabbed widgets.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage macintosh-frame.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage macintosh-toolbox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QFrame widget provides a simple decorated container for other widgets.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QToolBox class provides a column of tabbed widget items.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Item Views</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage macintosh-listview.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage macintosh-treeview.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QListView class provides a default model/view implementation of a list/icon view. The QListWidget class provides a classic item-based list/icon view.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTreeView class provides a default model/view implementation of a tree view. The QTreeWidget class provides a classic item-based tree view.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage macintosh-tableview.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QTableView class provides a default model/view implementation of a table view. The QTableWidget class provides a classic item-based table view.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Display Widgets</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage macintosh-progressbar.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage macintosh-lcdnumber.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QProgressBar widget provides a horizontal progress bar.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QLCDNumber widget displays a number with LCD-like digits.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage macintosh-label.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QLabel widget provides a text or image display.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Input Widgets</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage macintosh-slider.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage macintosh-lineedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QSlider widget provides a vertical or horizontal slider.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QLineEdit widget is a one-line text editor.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage macintosh-combobox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage macintosh-doublespinbox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QComboBox widget is a combined button and pop-up list.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QDoubleSpinBox class provides a spin box widget that allows double precision floating point numbers to be entered.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage macintosh-spinbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage macintosh-timeedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QSpinBox class provides a spin box widget.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTimeEdit class provides a widget for editing times.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage macintosh-dateedit.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage macintosh-datetimeedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QDateEdit class provides a widget for editing dates.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QDateTimeEdit class provides a widget for editing dates and times.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage macintosh-textedit.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage macintosh-horizontalscrollbar.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QTextEdit class provides a widget that is used to edit and
+     display both plain and rich text.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QScrollBar widget provides a vertical or horizontal scroll bar. Here, we show a scroll bar with horizontal orientation.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage macintosh-dial.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage macintosh-calendarwidget.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QDial class provides a rounded range control (like a
+       speedometer or potentiometer).\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QCalendarWidget class provides a monthly calendar widget that can be used to select dates.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage macintosh-fontcombobox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QFontComboBox widget is a specialized combobox that enables fonts to be selected from a pop-up list containing previews of available fonts.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+*/
diff --git a/doc/src/gallery-motif.qdoc b/doc/src/gallery-motif.qdoc
new file mode 100644
index 0000000000..79c44b1631
--- /dev/null
+++ b/doc/src/gallery-motif.qdoc
@@ -0,0 +1,392 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \page gallery-motif.html
+
+  \title Motif Style Widget Gallery
+  \ingroup gallery
+
+  This page shows some of the widgets available in Qt
+  when configured to use the "motif" style.
+
+\raw HTML
+<h2 align="center">Buttons</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage motif-pushbutton.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage motif-toolbutton.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QPushButton widget provides a command button.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QToolButton class provides a quick-access button to commands
+       or options, usually used inside a QToolBar.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage motif-checkbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage motif-radiobutton.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QCheckBox widget provides a checkbox with a text label.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QRadioButton widget provides a radio button with a text or pixmap label.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Containers</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage motif-groupbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage motif-tabwidget.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QGroupBox widget provides a group box frame with a title.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTabWidget class provides a stack of tabbed widgets.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage motif-frame.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage motif-toolbox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QFrame widget provides a simple decorated container for other widgets.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QToolBox class provides a column of tabbed widget items.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Item Views</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage motif-listview.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage motif-treeview.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QListView class provides a default model/view implementation of a list/icon view. The QListWidget class provides a classic item-based list/icon view.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTreeView class provides a default model/view implementation of a tree view. The QTreeWidget class provides a classic item-based tree view.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage motif-tableview.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QTableView class provides a default model/view implementation of a table view. The QTableWidget class provides a classic item-based table view.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Display Widgets</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage motif-progressbar.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage motif-lcdnumber.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QProgressBar widget provides a horizontal progress bar.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QLCDNumber widget displays a number with LCD-like digits.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage motif-label.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QLabel widget provides a text or image display.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Input Widgets</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage motif-slider.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage motif-lineedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QSlider widget provides a vertical or horizontal slider.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QLineEdit widget is a one-line text editor.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage motif-combobox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage motif-doublespinbox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QComboBox widget is a combined button and pop-up list.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QDoubleSpinBox class provides a spin box widget that allows double precision floating point numbers to be entered.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage motif-spinbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage motif-timeedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QSpinBox class provides a spin box widget.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTimeEdit class provides a widget for editing times.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage motif-dateedit.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage motif-datetimeedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QDateEdit class provides a widget for editing dates.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QDateTimeEdit class provides a widget for editing dates and times.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage motif-textedit.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage motif-horizontalscrollbar.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QTextEdit class provides a widget that is used to edit and
+     display both plain and rich text.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QScrollBar widget provides a vertical or horizontal scroll bar. Here, we show a scroll bar with horizontal orientation.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage motif-dial.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage motif-calendarwidget.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QDial class provides a rounded range control (like a
+       speedometer or potentiometer).\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QCalendarWidget class provides a monthly calendar widget that can be used to select dates.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage motif-fontcombobox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QFontComboBox widget is a specialized combobox that enables fonts to be selected from a pop-up list containing previews of available fonts.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+*/
diff --git a/doc/src/gallery-plastique.qdoc b/doc/src/gallery-plastique.qdoc
new file mode 100644
index 0000000000..b184ea8b4b
--- /dev/null
+++ b/doc/src/gallery-plastique.qdoc
@@ -0,0 +1,392 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \page gallery-plastique.html
+
+  \title Plastique Style Widget Gallery
+  \ingroup gallery
+
+  This page shows some of the widgets available in Qt
+  when configured to use the "plastique" style.
+
+\raw HTML
+<h2 align="center">Buttons</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage plastique-pushbutton.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage plastique-toolbutton.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QPushButton widget provides a command button.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QToolButton class provides a quick-access button to commands
+       or options, usually used inside a QToolBar.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage plastique-checkbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage plastique-radiobutton.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QCheckBox widget provides a checkbox with a text label.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QRadioButton widget provides a radio button with a text or pixmap label.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Containers</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage plastique-groupbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage plastique-tabwidget.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QGroupBox widget provides a group box frame with a title.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTabWidget class provides a stack of tabbed widgets.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage plastique-frame.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage plastique-toolbox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QFrame widget provides a simple decorated container for other widgets.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QToolBox class provides a column of tabbed widget items.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Item Views</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage plastique-listview.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage plastique-treeview.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QListView class provides a default model/view implementation of a list/icon view. The QListWidget class provides a classic item-based list/icon view.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTreeView class provides a default model/view implementation of a tree view. The QTreeWidget class provides a classic item-based tree view.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage plastique-tableview.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QTableView class provides a default model/view implementation of a table view. The QTableWidget class provides a classic item-based table view.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Display Widgets</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage plastique-progressbar.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage plastique-lcdnumber.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QProgressBar widget provides a horizontal progress bar.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QLCDNumber widget displays a number with LCD-like digits.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage plastique-label.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QLabel widget provides a text or image display.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Input Widgets</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage plastique-slider.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage plastique-lineedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QSlider widget provides a vertical or horizontal slider.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QLineEdit widget is a one-line text editor.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage plastique-combobox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage plastique-doublespinbox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QComboBox widget is a combined button and pop-up list.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QDoubleSpinBox class provides a spin box widget that allows double precision floating point numbers to be entered.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage plastique-spinbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage plastique-timeedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QSpinBox class provides a spin box widget.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTimeEdit class provides a widget for editing times.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage plastique-dateedit.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage plastique-datetimeedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QDateEdit class provides a widget for editing dates.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QDateTimeEdit class provides a widget for editing dates and times.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage plastique-textedit.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage plastique-horizontalscrollbar.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QTextEdit class provides a widget that is used to edit and
+     display both plain and rich text.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QScrollBar widget provides a vertical or horizontal scroll bar. Here, we show a scroll bar with horizontal orientation.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage plastique-dial.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage plastique-calendarwidget.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QDial class provides a rounded range control (like a
+       speedometer or potentiometer).\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QCalendarWidget class provides a monthly calendar widget that can be used to select dates.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage plastique-fontcombobox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QFontComboBox widget is a specialized combobox that enables fonts to be selected from a pop-up list containing previews of available fonts.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+*/
diff --git a/doc/src/gallery-windows.qdoc b/doc/src/gallery-windows.qdoc
new file mode 100644
index 0000000000..40ba7ce4a4
--- /dev/null
+++ b/doc/src/gallery-windows.qdoc
@@ -0,0 +1,392 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \page gallery-windows.html
+
+  \title Windows Style Widget Gallery
+  \ingroup gallery
+
+  This page shows some of the widgets available in Qt
+  when configured to use the "windows" style.
+
+\raw HTML
+<h2 align="center">Buttons</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windows-pushbutton.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windows-toolbutton.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QPushButton widget provides a command button.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QToolButton class provides a quick-access button to commands
+       or options, usually used inside a QToolBar.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windows-checkbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windows-radiobutton.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QCheckBox widget provides a checkbox with a text label.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QRadioButton widget provides a radio button with a text or pixmap label.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Containers</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windows-groupbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windows-tabwidget.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QGroupBox widget provides a group box frame with a title.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTabWidget class provides a stack of tabbed widgets.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windows-frame.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windows-toolbox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QFrame widget provides a simple decorated container for other widgets.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QToolBox class provides a column of tabbed widget items.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Item Views</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windows-listview.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windows-treeview.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QListView class provides a default model/view implementation of a list/icon view. The QListWidget class provides a classic item-based list/icon view.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTreeView class provides a default model/view implementation of a tree view. The QTreeWidget class provides a classic item-based tree view.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windows-tableview.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QTableView class provides a default model/view implementation of a table view. The QTableWidget class provides a classic item-based table view.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Display Widgets</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windows-progressbar.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windows-lcdnumber.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QProgressBar widget provides a horizontal progress bar.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QLCDNumber widget displays a number with LCD-like digits.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windows-label.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QLabel widget provides a text or image display.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Input Widgets</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windows-slider.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windows-lineedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QSlider widget provides a vertical or horizontal slider.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QLineEdit widget is a one-line text editor.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windows-combobox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windows-doublespinbox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QComboBox widget is a combined button and pop-up list.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QDoubleSpinBox class provides a spin box widget that allows double precision floating point numbers to be entered.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windows-spinbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windows-timeedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QSpinBox class provides a spin box widget.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTimeEdit class provides a widget for editing times.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windows-dateedit.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windows-datetimeedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QDateEdit class provides a widget for editing dates.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QDateTimeEdit class provides a widget for editing dates and times.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windows-textedit.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windows-horizontalscrollbar.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QTextEdit class provides a widget that is used to edit and
+     display both plain and rich text.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QScrollBar widget provides a vertical or horizontal scroll bar. Here, we show a scroll bar with horizontal orientation.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windows-dial.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windows-calendarwidget.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QDial class provides a rounded range control (like a
+       speedometer or potentiometer).\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QCalendarWidget class provides a monthly calendar widget that can be used to select dates.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windows-fontcombobox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QFontComboBox widget is a specialized combobox that enables fonts to be selected from a pop-up list containing previews of available fonts.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+*/
diff --git a/doc/src/gallery-windowsvista.qdoc b/doc/src/gallery-windowsvista.qdoc
new file mode 100644
index 0000000000..1ad8823a89
--- /dev/null
+++ b/doc/src/gallery-windowsvista.qdoc
@@ -0,0 +1,392 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \page gallery-windowsvista.html
+
+  \title Windows Vista Style Widget Gallery
+  \ingroup gallery
+
+  This page shows some of the widgets available in Qt
+  when configured to use the "windowsvista" style.
+
+\raw HTML
+<h2 align="center">Buttons</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsvista-pushbutton.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsvista-toolbutton.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QPushButton widget provides a command button.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QToolButton class provides a quick-access button to commands
+       or options, usually used inside a QToolBar.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsvista-checkbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsvista-radiobutton.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QCheckBox widget provides a checkbox with a text label.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QRadioButton widget provides a radio button with a text or pixmap label.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Containers</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsvista-groupbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsvista-tabwidget.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QGroupBox widget provides a group box frame with a title.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTabWidget class provides a stack of tabbed widgets.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsvista-frame.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsvista-toolbox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QFrame widget provides a simple decorated container for other widgets.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QToolBox class provides a column of tabbed widget items.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Item Views</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsvista-listview.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsvista-treeview.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QListView class provides a default model/view implementation of a list/icon view. The QListWidget class provides a classic item-based list/icon view.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTreeView class provides a default model/view implementation of a tree view. The QTreeWidget class provides a classic item-based tree view.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsvista-tableview.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QTableView class provides a default model/view implementation of a table view. The QTableWidget class provides a classic item-based table view.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Display Widgets</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsvista-progressbar.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsvista-lcdnumber.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QProgressBar widget provides a horizontal progress bar.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QLCDNumber widget displays a number with LCD-like digits.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsvista-label.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QLabel widget provides a text or image display.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Input Widgets</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsvista-slider.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsvista-lineedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QSlider widget provides a vertical or horizontal slider.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QLineEdit widget is a one-line text editor.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsvista-combobox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsvista-doublespinbox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QComboBox widget is a combined button and pop-up list.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QDoubleSpinBox class provides a spin box widget that allows double precision floating point numbers to be entered.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsvista-spinbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsvista-timeedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QSpinBox class provides a spin box widget.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTimeEdit class provides a widget for editing times.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsvista-dateedit.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsvista-datetimeedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QDateEdit class provides a widget for editing dates.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QDateTimeEdit class provides a widget for editing dates and times.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsvista-textedit.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsvista-horizontalscrollbar.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QTextEdit class provides a widget that is used to edit and
+     display both plain and rich text.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QScrollBar widget provides a vertical or horizontal scroll bar. Here, we show a scroll bar with horizontal orientation.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsvista-dial.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsvista-calendarwidget.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QDial class provides a rounded range control (like a
+       speedometer or potentiometer).\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QCalendarWidget class provides a monthly calendar widget that can be used to select dates.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsvista-fontcombobox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QFontComboBox widget is a specialized combobox that enables fonts to be selected from a pop-up list containing previews of available fonts.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+*/
diff --git a/doc/src/gallery-windowsxp.qdoc b/doc/src/gallery-windowsxp.qdoc
new file mode 100644
index 0000000000..dcb8e82eb0
--- /dev/null
+++ b/doc/src/gallery-windowsxp.qdoc
@@ -0,0 +1,392 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \page gallery-windowsxp.html
+
+  \title Windows XP Style Widget Gallery
+  \ingroup gallery
+
+  This page shows some of the widgets available in Qt
+  when configured to use the "windowsxp" style.
+
+\raw HTML
+<h2 align="center">Buttons</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsxp-pushbutton.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsxp-toolbutton.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QPushButton widget provides a command button.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QToolButton class provides a quick-access button to commands
+       or options, usually used inside a QToolBar.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsxp-checkbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsxp-radiobutton.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QCheckBox widget provides a checkbox with a text label.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QRadioButton widget provides a radio button with a text or pixmap label.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Containers</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsxp-groupbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsxp-tabwidget.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QGroupBox widget provides a group box frame with a title.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTabWidget class provides a stack of tabbed widgets.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsxp-frame.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsxp-toolbox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QFrame widget provides a simple decorated container for other widgets.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QToolBox class provides a column of tabbed widget items.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Item Views</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsxp-listview.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsxp-treeview.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QListView class provides a default model/view implementation of a list/icon view. The QListWidget class provides a classic item-based list/icon view.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTreeView class provides a default model/view implementation of a tree view. The QTreeWidget class provides a classic item-based tree view.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsxp-tableview.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QTableView class provides a default model/view implementation of a table view. The QTableWidget class provides a classic item-based table view.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Display Widgets</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsxp-progressbar.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsxp-lcdnumber.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QProgressBar widget provides a horizontal progress bar.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QLCDNumber widget displays a number with LCD-like digits.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsxp-label.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QLabel widget provides a text or image display.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Input Widgets</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsxp-slider.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsxp-lineedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QSlider widget provides a vertical or horizontal slider.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QLineEdit widget is a one-line text editor.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsxp-combobox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsxp-doublespinbox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QComboBox widget is a combined button and pop-up list.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QDoubleSpinBox class provides a spin box widget that allows double precision floating point numbers to be entered.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsxp-spinbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsxp-timeedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QSpinBox class provides a spin box widget.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTimeEdit class provides a widget for editing times.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsxp-dateedit.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsxp-datetimeedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QDateEdit class provides a widget for editing dates.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QDateTimeEdit class provides a widget for editing dates and times.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsxp-textedit.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsxp-horizontalscrollbar.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QTextEdit class provides a widget that is used to edit and
+     display both plain and rich text.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QScrollBar widget provides a vertical or horizontal scroll bar. Here, we show a scroll bar with horizontal orientation.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsxp-dial.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage windowsxp-calendarwidget.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QDial class provides a rounded range control (like a
+       speedometer or potentiometer).\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QCalendarWidget class provides a monthly calendar widget that can be used to select dates.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage windowsxp-fontcombobox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QFontComboBox widget is a specialized combobox that enables fonts to be selected from a pop-up list containing previews of available fonts.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+*/
diff --git a/doc/src/gallery.qdoc b/doc/src/gallery.qdoc
new file mode 100644
index 0000000000..dc9f7329da
--- /dev/null
+++ b/doc/src/gallery.qdoc
@@ -0,0 +1,151 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \group gallery
+  \title Qt Widget Gallery
+  \ingroup topics
+  \brief Qt widgets shown in different styles on various platforms.
+
+  Qt's support for widget styles and themes enables your application to fit in
+  with the native desktop enviroment. Below, you can find links to the various
+  widget styles that are supplied with Qt 4.
+
+  \raw HTML
+  <table align="center" cellspacing="20%" width="100%">
+  <colgroup span="2">
+    <col width="40%" />
+    <col width="40%" />
+  </colgroup>
+  <tr>
+  <td align="center">
+  \endraw
+  \image plastique-tabwidget.png Plastique Style Widget Gallery
+
+  \bold{\l{Plastique Style Widget Gallery}}
+
+  The Plastique style is provided by QPlastiqueStyle.
+  \raw HTML
+  </td>
+  <td align="center">
+  \endraw
+  \image windowsxp-tabwidget.png Windows XP Style Widget Gallery
+
+  \bold{\l{Windows XP Style Widget Gallery}}
+
+  The Windows XP style is provided by QWindowsXPStyle.
+  \raw HTML
+  </td>
+  </tr>
+  <tr>
+  <td align="center">
+  \endraw
+  \image gtk-tabwidget.png GTK Style Widget Gallery
+
+  \bold{\l{GTK Style Widget Gallery}}
+
+  The GTK style is provided by QGtkStyle.
+  \raw HTML
+  </td>
+  <td align="center">
+  \endraw
+  \image macintosh-tabwidget.png Macintosh Style Widget Gallery
+
+  \bold{\l{Macintosh Style Widget Gallery}}
+
+  The Macintosh style is provided by QMacStyle.
+  \raw HTML
+  </td>
+  </tr>
+  <tr>
+  <td align="center">
+  \endraw
+  \image cleanlooks-tabwidget.png Cleanlooks Style Widget Gallery
+
+  \bold{\l{Cleanlooks Style Widget Gallery}}
+
+  The Cleanlooks style is provided by QCleanlooksStyle.
+  \raw HTML
+  </td>
+  <td align="center">
+  \endraw
+  \image windowsvista-tabwidget.png Windows Vista Style Widget Gallery
+
+  \bold{\l{Windows Vista Style Widget Gallery}}
+
+  The Windows Vista style is provided by QWindowsVistaStyle.
+  \raw HTML
+  </td>
+  </tr>
+  <tr>
+  <td align="center">
+  \endraw
+  \image motif-tabwidget.png Motif Style Widget Gallery
+
+  \bold{\l{Motif Style Widget Gallery}}
+
+  The Motif style is provided by QMotifStyle.
+  \raw HTML
+  </td>
+  <td align="center">
+  \endraw
+  \image windows-tabwidget.png Windows Style Widget Gallery
+
+  \bold{\l{Windows Style Widget Gallery}}
+
+  The Windows style is provided by QWindowsStyle.
+  \raw HTML
+  </td>
+  </tr>
+  <tr>
+  <td align="center">
+  \endraw
+  \image cde-tabwidget.png CDE Style Widget Gallery
+
+  \bold{\l{CDE Style Widget Gallery}}
+
+  The Common Desktop Environment style is provided by QCDEStyle.
+  \raw HTML
+  </td>
+  </tr>
+  </table>
+  \endraw
+*/
diff --git a/doc/src/geometry.qdoc b/doc/src/geometry.qdoc
new file mode 100644
index 0000000000..b17aa39eaa
--- /dev/null
+++ b/doc/src/geometry.qdoc
@@ -0,0 +1,150 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page geometry.html
+    \title Window Geometry
+    \ingroup architecture
+    \brief An overview of window geometry handling and management.
+
+    QWidget provides several functions that deal with a widget's
+    geometry. Some of these functions operate on the pure client area
+    (i.e. the window excluding the window frame), others include the
+    window frame. The differentiation is done in a way that covers the
+    most common usage transparently.
+
+    \list
+    \o \bold{Including the window frame:}
+        \l{QWidget::x()}{x()},
+        \l{QWidget::y()}{y()},
+        \l{QWidget::frameGeometry()}{frameGeometry()},
+        \l{QWidget::pos()}{pos()}, and
+        \l{QWidget::move()}{move()}.
+    \o \bold{Excluding the window frame:}
+        \l{QWidget::geometry()}{geometry()},
+        \l{QWidget::width()}{width()},
+        \l{QWidget::height()}{height()},
+        \l{QWidget::rect()}{rect()}, and
+        \l{QWidget::size()}{size()}.
+    \endlist
+
+    Note that the distinction only matters for decorated top-level
+    widgets. For all child widgets, the frame geometry is equal to the
+    widget's client geometry.
+
+    This diagram shows most of the functions in use:
+    \img geometry.png Geometry diagram
+
+    Topics:
+
+    \tableofcontents
+
+    \section1 X11 Peculiarities
+
+    On X11, a window does not have a frame until the window manager
+    decorates it. This happens asynchronously at some point in time
+    after calling QWidget::show() and the first paint event the
+    window receives, or it does not happen at all. Bear in mind that
+    X11 is policy-free (others call it flexible). Thus you cannot
+    make any safe assumption about the decoration frame your window
+    will get. Basic rule: There's always one user who uses a window
+    manager that breaks your assumption, and who will complain to
+    you.
+
+    Furthermore, a toolkit cannot simply place windows on the screen. All
+    Qt can do is to send certain hints to the window manager. The window
+    manager, a separate process, may either obey, ignore or misunderstand
+    them. Due to the partially unclear Inter-Client Communication
+    Conventions Manual (ICCCM), window placement is handled quite
+    differently in existing window managers.
+
+    X11 provides no standard or easy way to get the frame geometry
+    once the window is decorated. Qt solves this problem with nifty
+    heuristics and clever code that works on a wide range of window
+    managers that exist today. Don't be surprised if you find one
+    where QWidget::frameGeometry() returns wrong results though.
+
+    Nor does X11 provide a way to maximize a window.
+    QWidget::showMaximized() has to emulate the feature. Its result
+    depends on the result of QWidget::frameGeometry() and the
+    capability of the window manager to do proper window placement,
+    neither of which can be guaranteed.
+
+    \section1 Restoring a Window's Geometry
+
+    Since version 4.2, Qt provides functions that saves and restores a
+    window's geometry and state for you. QWidget::saveGeometry()
+    saves the window geometry and maximized/fullscreen state, while
+    QWidget::restoreGeometry() restores it. The restore function also
+    checks if the restored geometry is outside the available screen
+    geometry, and modifies it as appropriate if it is.
+
+    The rest of this document describes how to save and restore the 
+    geometry using the geometry properties. On Windows, this is 
+    basically storing the result of QWidget::geometry() and calling
+    QWidget::setGeometry() in the next session before calling
+    \l{QWidget::show()}{show()}. On X11, this won't work because an
+    invisible window doesn't have a frame yet. The window manager
+    will decorate the window later. When this happens, the window
+    shifts towards the bottom/right corner of the screen depending on
+    the size of the decoration frame. Although X provides a way to
+    avoid this shift, most window managers fail to implement this
+    feature.
+
+    A workaround is to call \l{QWidget::setGeometry()}{setGeometry()}
+    after \l{QWidget::show()}{show()}. This has the two disadvantages
+    that the widget appears at a wrong place for a millisecond
+    (results in flashing) and that currently only every second window
+    manager gets it right. A safer solution is to store both
+    \l{QWidget::pos()}{pos()} and \l{QWidget::size()}{size()} and to
+    restore the geometry using \l{QWidget::resize()} and
+    \l{QWidget::move()}{move()} before calling
+    \l{QWidget::show()}{show()}, as demonstrated in the following
+    code snippets (from the \l{mainwindows/application}{Application}
+    example):
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 35
+    \codeline
+    \snippet examples/mainwindows/application/mainwindow.cpp 38
+
+    This method works on Windows, Mac OS X, and most X11 window
+    managers.
+*/
diff --git a/doc/src/gpl.qdoc b/doc/src/gpl.qdoc
new file mode 100644
index 0000000000..e423171c9e
--- /dev/null
+++ b/doc/src/gpl.qdoc
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! \page gpl.html
+\title GNU General Public License (GPL)
+\ingroup licensing
+\brief About the GPL license used for Qt.
+
+The Qt GUI Toolkit is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\br
+Contact: Qt Software Information (qt-info@nokia.com)
+
+Qt is available under the GPL.
+
+\section1 The GNU General Public License (Version 3)
+
+Reference: \l{GNU General Public License}
+
+\snippet doc/src/snippets/code/doc_src_gpl.qdoc GPL v3
+*/
+
+/*! \page lgpl.html
+\title GNU Lesser General Public License (LGPL)
+\ingroup licensing
+\brief About the LGPL license used for Qt.
+
+The Qt GUI Toolkit is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\br
+Contact: Qt Software Information (qt-info@nokia.com)
+
+Qt is available under the LGPL.
+
+\section1 The GNU Lesser General Public License (Version 2.1)
+
+Reference: \l{GNU Lesser General Public License, version 2.1}
+
+\snippet doc/src/snippets/code/doc_src_lgpl.qdoc LGPL v2.1
+
+\section1 Nokia Qt LGPL Exception version 1.0
+
+As a special exception to the GNU Lesser General Public License version 2.1,
+the object code form of a "work that uses the Library" may incorporate material
+from a header file that is part of the Library.  You may distribute such object
+code under terms of your choice, provided that the incorporated material
+(i) does not exceed more than 5% of the total size of the Library;  and
+(ii) is limited to numerical parameters, data structure layouts, accessors,
+macros, inline functions and templates.
+*/
diff --git a/doc/src/graphicsview.qdoc b/doc/src/graphicsview.qdoc
new file mode 100644
index 0000000000..049b0c3468
--- /dev/null
+++ b/doc/src/graphicsview.qdoc
@@ -0,0 +1,544 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page graphicsview.html
+    \title The Graphics View Framework
+    \ingroup architecture
+    \ingroup multimedia
+    \brief An overview of the Graphics View framework for interactive 2D
+    graphics.
+
+    \keyword Graphics View
+    \keyword GraphicsView
+    \keyword Graphics
+    \keyword Canvas
+    \since 4.2
+
+    Graphics View provides a surface for managing and interacting with a large
+    number of custom-made 2D graphical items, and a view widget for
+    visualizing the items, with support for zooming and rotation.
+
+    The framework includes an event propagation architecture that allows
+    precise double-precision interaction capabilities for the items on the
+    scene. Items can handle key events, mouse press, move, release and
+    double click events, and they can also track mouse movement.
+
+    Graphics View uses a BSP (Binary Space Partitioning) tree to provide very
+    fast item discovery, and as a result of this, it can visualize large
+    scenes in real-time, even with millions of items.
+
+    Graphics View was introduced in Qt 4.2, replacing its predecessor,
+    QCanvas. If you are porting from QCanvas, see \l{Porting to Graphics
+    View}.
+
+    Topics:
+
+    \tableofcontents
+
+    \section1 The Graphics View Architecture
+
+      Graphics View provides an item-based approach to model-view programming,
+      much like InterView's convenience classes QTableView, QTreeView and
+      QListView. Several views can observe a single scene, and the scene
+      contains items of varying geometric shapes.
+
+      \section2 The Scene
+
+        QGraphicsScene provides the Graphics View scene. The scene has the
+        following responsibilities:
+
+        \list
+        \o Providing a fast interface for managing a large number of items
+        \o Propagating events to each item
+        \o Managing item state, such as selection and focus handling
+        \o Providing untransformed rendering functionality; mainly for printing
+        \endlist
+
+        The scene serves as a container for QGraphicsItem objects. Items are
+        added to the scene by calling QGraphicsScene::addItem(), and then
+        retrieved by calling one of the many item discovery functions.
+        QGraphicsScene::items() and its overloads return all items contained
+        by or intersecting with a point, a rectangle, a polygon or a general
+        vector path. QGraphicsScene::itemAt() returns the topmost item at a
+        particular point. All item discovery functions return the items in
+        descending stacking order (i.e., the first returned item is topmost,
+        and the last item is bottom-most).
+
+        \snippet doc/src/snippets/code/doc_src_graphicsview.qdoc 0
+
+        QGraphicsScene's event propagation architecture schedules scene events
+        for delivery to items, and also manages propagation between items. If
+        the scene receives a mouse press event at a certain position, the
+        scene passes the event on to whichever item is at that position.
+
+        QGraphicsScene also manages certain item states, such as item
+        selection and focus. You can select items on the scene by calling
+        QGraphicsScene::setSelectionArea(), passing an arbitrary shape. This
+        functionality is also used as a basis for rubberband selection in
+        QGraphicsView. To get the list of all currently selected items, call
+        QGraphicsScene::selectedItems(). Another state handled by
+        QGraphicsScene is whether or not an item has keyboard input focus. You
+        can set focus on an item by calling QGraphicsScene::setFocusItem() or
+        QGraphicsItem::setFocus(), or get the current focus item by calling
+        QGraphicsScene::focusItem().
+
+        Finally, QGraphicsScene allows you to render parts of the scene into a
+        paint device through the QGraphicsScene::render() function. You can
+        read more about this in the Printing section later in this document.
+
+      \section2 The View
+
+        QGraphicsView provides the view widget, which visualizes the contents
+        of a scene. You can attach several views to the same scene, to provide
+        several viewports into the same data set. The view widget is a scroll
+        area, and provides scroll bars for navigating through large scenes. To
+        enable OpenGL support, you can set a QGLWidget as the viewport by
+        calling QGraphicsView::setViewport().
+
+        \snippet doc/src/snippets/code/doc_src_graphicsview.qdoc 1
+
+        The view receives input events from the keyboard and mouse, and
+        translates these to scene events (converting the coordinates used
+        to scene coordinates where appropriate), before sending the events
+        to the visualized scene.
+
+        Using its transformation matrix, QGraphicsView::matrix(), the view can
+        \e transform the scene's coordinate system. This allows advanced
+        navigation features such as zooming and rotation. For convenience,
+        QGraphicsView also provides functions for translating between view and
+        scene coordinates: QGraphicsView::mapToScene() and
+        QGraphicsView::mapFromScene().
+
+        \img graphicsview-view.png
+
+      \section2 The Item
+
+        QGraphicsItem is the base class for graphical items in a
+        scene. Graphics View provides several standard items for typical
+        shapes, such as rectangles (QGraphicsRectItem), ellipses
+        (QGraphicsEllipseItem) and text items (QGraphicsTextItem), but the
+        most powerful QGraphicsItem features are available when you write a
+        custom item. Among other things, QGraphicsItem supports the following
+        features:
+
+        \list
+        \o Mouse press, move, release and double click events, as well as mouse
+        hover events, wheel events, and context menu events.
+        \o Keyboard input focus, and key events
+        \o Drag and drop
+        \o Grouping, both through parent-child relationships, and with
+        QGraphicsItemGroup
+        \o Collision detection
+        \endlist
+
+        Items live in a local coordinate system, and like QGraphicsView, it
+        also provides many functions for mapping coordinates between the item
+        and the scene, and from item to item. Also, like QGraphicsView, it can
+        transform its coordinate system using a matrix:
+        QGraphicsItem::matrix(). This is useful for rotating and scaling
+        individual items.
+
+        Items can contain other items (children). Parent items'
+        transformations are inherited by all its children. Regardless of an
+        item's accumulated transformation, though, all its functions (e.g.,
+        QGraphicsItem::contains(), QGraphicsItem::boundingRect(),
+        QGraphicsItem::collidesWith()) still operate in local coordinates.
+
+        QGraphicsItem supports collision detection through the
+        QGraphicsItem::shape() function, and QGraphicsItem::collidesWith(),
+        which are both virtual functions. By returning your item's shape as a
+        local coordinate QPainterPath from QGraphicsItem::shape(),
+        QGraphicsItem will handle all collision detection for you. If you want
+        to provide your own collision detection, however, you can reimplement
+        QGraphicsItem::collidesWith().
+
+        \img graphicsview-items.png
+
+    \section1 The Graphics View Coordinate System
+
+      Graphics View is based on the Cartesian coordinate system; items'
+      position and geometry on the scene are represented by sets of two
+      numbers: the x-coordinate, and the y-coordinate. When observing a scene
+      using an untransformed view, one unit on the scene is represented by
+      one pixel on the screen.
+
+      There are three effective coordinate systems in play in Graphics View:
+      Item coordinates, scene coordinates, and view coordinates. To simplify
+      your implementation, Graphics View provides convenience functions that
+      allow you to map between the three coordinate systems.
+
+      When rendering, Graphics View's scene coordinates correspond to
+      QPainter's \e logical coordinates, and view coordinates are the same as
+      \e device coordinates.  In \l{The Coordinate System}, you can read about
+      the relationship between logical coordinates and device coordinates.
+
+      \img graphicsview-parentchild.png
+
+      \section2 Item Coordinates
+
+          Items live in their own local coordinate system. Their coordinates
+          are usually centered around its center point (0, 0), and this is
+          also the center for all transformations. Geometric primitives in the
+          item coordinate system are often referred to as item points, item
+          lines, or item rectangles.
+
+          When creating a custom item, item coordinates are all you need to
+          worry about; QGraphicsScene and QGraphicsView will perform all
+          transformations for you. This makes it very easy to implement custom
+          items. For example, if you receive a mouse press or a drag enter
+          event, the event position is given in item coordinates. The
+          QGraphicsItem::contains() virtual function, which returns true if a
+          certain point is inside your item, and false otherwise, takes a
+          point argument in item coordinates. Similarly, an item's bounding
+          rect and shape are in item coordinates.
+
+          At item's \e position is the coordinate of the item's center point
+          in its parent's coordinate system; sometimes referred to as \e
+          parent coordinates. The scene is in this sense regarded as all
+          parent-less items' "parent". Top level items' position are in scene
+          coordinates.
+
+          Child coordinates are relative to the parent's coordinates. If the
+          child is untransformed, the difference between a child coordinate
+          and a parent coordinate is the same as the distance between the
+          items in parent coordinates. For example: If an untransformed child
+          item is positioned precisely in its parent's center point, then the
+          two items' coordinate systems will be identical. If the child's
+          position is (10, 0), however, the child's (0, 10) point will
+          correspond to its parent's (10, 10) point.
+
+          Because items' position and transformation are relative to the
+          parent, child items' coordinates are unaffected by the parent's
+          transformation, although the parent's transformation implicitly
+          transforms the child. In the above example, even if the parent is
+          rotated and scaled, the child's (0, 10) point will still correspond
+          to the parent's (10, 10) point. Relative to the scene, however, the
+          child will follow the parent's transformation and position. If the
+          parent is scaled (2x, 2x), the child's position will be at scene
+          coordinate (20, 0), and its (10, 0) point will correspond to the
+          point (40, 0) on the scene.
+
+          With QGraphicsItem::pos() being one of the few exceptions,
+          QGraphicsItem's functions operate in item coordinates, regardless of
+          the item, or any of its parents' transformation. For example, an
+          item's bounding rect (i.e. QGraphicsItem::boundingRect()) is always
+          given in item coordinates.
+
+      \section2 Scene Coordinates
+
+          The scene represents the base coordinate system for all its items.
+          The scene coordinate system describes the position of each top-level
+          item, and also forms the basis for all scene events delivered to the
+          scene from the view.  Each item on the scene has a scene position
+          and bounding rectangle (QGraphicsItem::scenePos(),
+          QGraphicsItem::sceneBoundingRect()), in addition to its local item
+          pos and bounding rectangle. The scene position describes the item's
+          position in scene coordinates, and its scene bounding rect forms the
+          basis for how QGraphicsScene determines what areas of the scene have
+          changed. Changes in the scene are communicated through the
+          QGraphicsScene::changed() signal, and the argument is a list of
+          scene rectangles.
+
+      \section2 View Coordinates
+
+          View coordinates are the coordinates of the widget. Each unit in
+          view coordinates corresponds to one pixel. What's special about this
+          coordinate system is that it is relative to the widget, or viewport,
+          and unaffected by the observed scene. The top left corner of
+          QGraphicsView's viewport is always (0, 0), and the bottom right
+          corner is always (viewport width, viewport height). All mouse events
+          and drag and drop events are originally received as view
+          coordinates, and you need to map these coordinates to the scene in
+          order to interact with items.
+
+      \section2 Coordinate Mapping
+
+          Often when dealing with items in a scene, it can be useful to map
+          coordinates and arbitrary shapes from the scene to an item, from
+          item to item, or from the view to the scene. For example, when you
+          click your mouse in QGraphicsView's viewport, you can ask the scene
+          what item is under the cursor by calling
+          QGraphicsView::mapToScene(), followed by
+          QGraphicsScene::itemAt(). If you want to know where in the viewport
+          an item is located, you can call QGraphicsItem::mapToScene() on the
+          item, then QGraphicsView::mapFromScene() on the view. Finally, if
+          you use want to find what items are inside a view ellipse, you can
+          pass a QPainterPath to mapToScene(), and then pass the mapped path
+          to QGraphicsScene::items().
+
+          You can map coordinates and shapes to and from and item's scene by
+          calling QGraphicsItem::mapToScene() and
+          QGraphicsItem::mapFromScene(). You can also map to an item's parent
+          item by calling QGraphicsItem::mapToParent() and
+          QGraphicsItem::mapFromParent(), or between items by calling
+          QGraphicsItem::mapToItem() and QGraphicsItem::mapFromItem(). All
+          mapping functions can map both points, rectangles, polygons and
+          paths.
+
+          The same mapping functions are available in the view, for mapping to
+          and from the scene. QGraphicsView::mapFromScene() and
+          QGraphicsView::mapToScene(). To map from a view to an item, you
+          first map to the scene, and then map from the scene to the item.
+
+    \section1 Key Features
+
+      \section2 Zooming and rotating
+
+        QGraphicsView supports the same affine transformations as QPainter
+        does through QGraphicsView::setMatrix(). By applying a transformation
+        to the view, you can easily add support for common navigation features
+        such as zooming and rotating.
+
+        Here is an example of how to implement zoom and rotate slots in a
+        subclass of QGraphicsView:
+
+        \snippet doc/src/snippets/code/doc_src_graphicsview.qdoc 2
+
+        The slots could be connected to \l{QToolButton}{QToolButtons} with
+        \l{QAbstractButton::autoRepeat}{autoRepeat} enabled.
+
+        QGraphicsView keeps the center of the view aligned when you transform
+        the view.
+
+        See also the \l{Elastic Nodes Example}{Elastic Nodes} example for
+        code that shows how to implement basic zooming features.
+
+      \section2 Printing
+
+        Graphics View provides single-line printing through its rendering
+        functions, QGraphicsScene::render() and QGraphicsView::render().  The
+        functions provide the same API: You can have the scene or the view
+        render all or parts of their contents into any paint device by passing
+        a QPainter to either of the rendering functions. This example shows
+        how to print the whole scene into a full page, using QPrinter.
+
+        \snippet doc/src/snippets/code/doc_src_graphicsview.qdoc 3
+
+        The difference between the scene and view rendering functions is that
+        one operates in scene coordinates, and the other in view coordinates.
+        QGraphicsScene::render() is often preferred for printing whole
+        segments of a scene untransformed, such as for plotting geometrical
+        data, or for printing a text document. QGraphicsView::render(), on the
+        other hand, is suitable for taking screenshots; its default behavior
+        is to render the exact contents of the viewport using the provided
+        painter.
+
+        \snippet doc/src/snippets/code/doc_src_graphicsview.qdoc 4
+
+        When the source and target areas' sizes do not match, the source
+        contents are stretched to fit into the target area. By passing a
+        Qt::AspectRatioMode to the rendering function you are using, you can
+        choose to maintain or ignore the aspect ratio of the scene when the
+        contents are stretched.
+
+      \section2 Drag and Drop
+
+        Because QGraphicsView inherits QWidget indirectly, it already provides
+        the same drag and drop functionality that QWidget provides. In
+        addition, as a convenience, the Graphics View framework provides drag
+        and drop support for the scene, and for each and every item. As the
+        view receives a drag, it translates the drag and drop events into a
+        QGraphicsSceneDragDropEvent, which is then forwarded to the scene. The
+        scene takes over scheduling of this event, and sends it to the first
+        item under the mouse cursor that accepts drops.
+
+        To start a drag from an item, create a QDrag object, passing a pointer
+        to the widget that starts the drag. Items can be observed by many
+        views at the same time, but only one view can start the drag. Drags
+        are in most cases started as a result of pressing or moving the mouse,
+        so in mousePressEvent() or mouseMoveEvent(), you can get the
+        originating widget pointer from the event. For example:
+
+        \snippet doc/src/snippets/code/doc_src_graphicsview.qdoc 5
+
+        To intercept drag and drop events for the scene, you reimplement
+        QGraphicsScene::dragEnterEvent() and whichever event handlers your
+        particular scene needs, in a QGraphicsItem subclass. You can read more
+        about drag and drop in Graphics View in the documentation for each of
+        QGraphicsScene's event handlers.
+
+        Items can enable drag and drop support by calling
+        QGraphicsItem::setAcceptDrops(). To handle the incoming drag,
+        reimplement QGraphicsItem::dragEnterEvent(),
+        QGraphicsItem::dragMoveEvent(), QGraphicsItem::dragLeaveEvent(), and
+        QGraphicsItem::dropEvent().
+
+        See also the \l{Drag and Drop Robot Example}{Drag and Drop Robot} example
+        for a demonstration of Graphics View's support for drag and drop
+        operations.
+
+      \section2 Cursors and Tooltips
+
+        Like QWidget, QGraphicsItem also supports cursors
+        (QGraphicsItem::setCursor()), and tooltips
+        (QGraphicsItem::setToolTip()). The cursors and tooltips are activated
+        by QGraphicsView as the mouse cursor enters the item's area (detected
+        by calling QGraphicsItem::contains()).
+
+        You can also set a default cursor directly on the view by calling
+        QGraphicsView::setCursor().
+
+        See also the \l{Drag and Drop Robot Example}{Drag and Drop Robot}
+        example for code that implements tooltips and cursor shape handling.
+
+      \section2 Animation
+
+        Graphics View supports animation at several levels. You can easily
+        assemble animation paths by associating a QGraphicsItemAnimation with
+        your item. This allows timeline controlled animations that operate at
+        a steady speed on all platforms (although the frame rate may vary
+        depending on the platform's performance).  QGraphicsItemAnimation
+        allows you to create a path for an item's position, rotation, scale,
+        shear and translation. The animation can be controlled by a QSlider,
+        or more commonly by QTimeLine.
+
+        Another option is to create a custom item that inherits from QObject
+        and QGraphicsItem. The item can the set up its own timers, and control
+        animations with incremental steps in QObject::timerEvent().
+
+        A third option, which is mostly available for compatibility with
+        QCanvas in Qt 3, is to \e advance the scene by calling
+        QGraphicsScene::advance(), which in turn calls
+        QGraphicsItem::advance().
+
+        See also the \l{Drag and Drop Robot Example}{Drag and Drop Robot}
+        example for an illustration of timeline-based animation techniques.
+
+      \section2 OpenGL Rendering
+
+        To enable OpenGL rendering, you simply set a new QGLWidget as the
+        viewport of QGraphicsView by calling QGraphicsView::setViewport(). If
+        you want OpenGL with antialiasing, you need OpenGL sample buffer
+        support (see QGLFormat::sampleBuffers()).
+
+        Example:
+
+        \snippet doc/src/snippets/code/doc_src_graphicsview.qdoc 6
+
+      \section2 Item Groups
+
+        By making an item a child of another, you can achieve the most
+        essential feature of item grouping: the items will move together, and
+        all transformations are propagated from parent to child. QGraphicsItem
+        can also handle all events for its children (see
+        QGraphicsItem::setHandlesChildEvents()). This allows the parent item
+        to act on behalf of its children, effectively treating all items as
+        one.
+
+        In addition, QGraphicsItemGroup is a special item that combines child
+        event handling with a useful interface for adding and removing items
+        to and from a group. Adding an item to a QGraphicsItemGroup will keep
+        the item's original position and transformation, whereas reparenting
+        items in general will cause the child to reposition itself relative to
+        its new parent. For convenience, you can create
+        \l{QGraphicsItemGroup}s through the scene by calling
+        QGraphicsScene::createItemGroup().
+
+      \section2 Widgets and Layouts
+
+        Qt 4.4 introduced support for geometry and layout-aware items through
+        QGraphicsWidget. This special base item is similar to QWidget, but
+        unlike QWidget, it doesn't inherit from QPaintDevice; rather from
+        QGraphicsItem instead. This allows you to write complete widgets with
+        events, signals & slots, size hints and policies, and you can also
+        manage your widgets geometries in layouts through
+        QGraphicsLinearLayout and QGraphicsGridLayout.
+
+        \section3 QGraphicsWidget
+
+          Building on top of QGraphicsItem's capabilities and lean footprint,
+          QGraphicsWidget provides the best of both worlds: extra
+          functionality from QWidget, such as the style, font, palette, layout
+          direction, and its geometry, and resolution independence and
+          transformation support from QGraphicsItem.  Because Graphics View
+          uses real coordinates instead of integers, QGraphicsWidget's
+          geometry functions also operate on QRectF and QPointF. This also
+          applies to frame rects, margins and spacing. With QGraphicsWidget
+          it's not uncommon to specify contents margins of (0.5, 0.5, 0.5,
+          0.5), for example. You can create both subwidgets and "top-level"
+          windows; in some cases you can now use Graphics View for advanced
+          MDI applications.
+
+          Some of QWidget's properties are supported, including window flags
+          and attributes, but not all. You should refer to QGraphicsWidget's
+          class documentation for a complete overview of what is and what is
+          not supported. For example, you can create decorated windows by
+          passing the Qt::Window window flag to QGraphicsWidget's constructor,
+          but Graphics View currently doesn't support the Qt::Sheet and
+          Qt::Drawer flags that are common on Mac OS X.
+
+          The capabilities of QGraphicsWidget are expected to grow depending
+          on community feedback.
+
+        \section3 QGraphicsLayout
+
+          QGraphicsLayout is part of a second-generation layout framework
+          designed specifically for QGraphicsWidget. Its API is very similar
+          to that of QLayout. You can manage widgets and sublayouts inside
+          either QGraphicsLinearLayout and QGraphicsGridLayout. You can also
+          easily write your own layout by subclassing QGraphicsLayout
+          yourself, or add your own QGraphicsItem items to the layout by
+          writing an adaptor subclass of QGraphicsLayoutItem.
+
+      \section2 Embedded Widget Support
+
+          Graphics View provides seamless support for embedding any widget
+          into the scene. You can embed simple widgets, such as QLineEdit or
+          QPushButton, complex widgets such as QTabWidget, and even complete
+          main windows. To embed your widget to the scene, simply call
+          QGraphicsScene::addWidget(), or create an instance of
+          QGraphicsProxyWidget to embed your widget manually.
+
+          Through QGraphicsProxyWidget, Graphics View is able to deeply
+          integrate the client widget features including its cursors,
+          tooltips, mouse, tablet and keyboard events, child widgets,
+          animations, pop-ups (e.g., QComboBox or QCompleter), and the widget's
+          input focus and activation. QGraphicsProxyWidget even integrates the
+          embedded widget's tab order so that you can tab in and out of
+          embedded widgets. You can even embed a new QGraphicsView into your
+          scene to provide complex nested scenes.
+
+          When transforming an embedded widget, Graphics View makes sure that
+          the widget is transformed resolution independently, allowing the
+          fonts and style to stay crisp when zoomed in. (Note that the effect
+          of resolution independence depends on the style.) 
+*/
diff --git a/doc/src/groups.qdoc b/doc/src/groups.qdoc
new file mode 100644
index 0000000000..c9cedc4e45
--- /dev/null
+++ b/doc/src/groups.qdoc
@@ -0,0 +1,599 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \group groups
+    \title Grouped Classes
+    \ingroup classlists
+
+    This page provides a way of navigating Qt's classes by grouping
+    related classes together. Some classes may appear in more than one group.
+
+    \generatelist{related}
+
+    \omit
+    \row
+    \o \l{Component Model}
+    \o Interfaces and helper classes for the Qt Component Model.
+    \endomit
+
+*/
+
+/*!
+    \group advanced
+    \title Advanced Widgets
+    \ingroup groups
+
+    \brief Advanced GUI widgets such as tab widgets and progress bars.
+
+    These classes provide more complex user interface widgets (controls).
+
+*/
+
+/*!
+    \group abstractwidgets
+    \title Abstract Widget Classes
+    \ingroup groups
+
+    \brief Abstract widget classes usable through subclassing.
+
+    These classes are abstract widgets; they are generally not usable in
+    themselves, but provide functionality that can be used by inheriting
+    these classes.
+
+*/
+
+/*!
+    \group accessibility
+    \title Accessibility Classes
+    \ingroup groups
+    \ingroup topics
+
+    \brief Classes that provide support for accessibility.
+
+    Accessible applications are able to be used by users who cannot use
+    conventional means of interaction. These classes provide support for
+    accessible applications.
+
+*/
+
+/*!
+    \group appearance
+    \title Widget Appearance and Style
+    \ingroup groups
+
+    \brief Appearance customization with styles, fonts, colors etc.
+
+    These classes are used to customize an application's appearance and
+    style.
+
+*/
+
+/*!
+    \group application
+    \title Main Window and Related Classes
+    \ingroup groups
+
+    \brief Everything you need for a typical modern main application window,
+    including menus, toolbars, workspace, etc.
+
+    These classes provide everything you need for a typical modern main
+    application window, like the main window itself, menu and tool bars,
+    a status bar, etc.
+
+*/
+
+
+/*!
+    \group basicwidgets
+    \title Basic Widgets
+    \ingroup groups
+
+    \brief Basic GUI widgets such as buttons, comboboxes and scroll bars.
+
+    These basic widgets (controls) are designed for direct use.
+    There are also some \l{Abstract Widget Classes} that are designed for
+    subclassing, and some more complex \l{Advanced Widgets}.
+
+*/
+
+/* \group componentmodel
+   \title Component Model
+
+    These classes and interfaces form the basis of the \l{Qt Component Model}.
+
+*/
+
+/*!
+    \group database
+    \title Database Classes
+    \ingroup groups
+
+    \brief Database related classes, e.g. for SQL databases.
+
+    These classes provide access to SQL databases.
+*/
+
+
+/*!
+    \group dialogs
+    \title Standard Dialog Classes
+    \ingroup groups
+
+    \brief Ready-made dialogs for file, font, color selection and more.
+
+    These classes are complex widgets, composed of simpler widgets; dialog
+    boxes, generally.
+*/
+
+/*!
+    \group desktop
+    \title Desktop Environment Classes
+    \ingroup groups
+
+    \brief Classes for interacting with the user's desktop environment.
+
+    These classes provide ways to interact with the user's desktop environment and
+    take advantage of common services.
+*/
+
+/*!
+    \group draganddrop
+    \title Drag And Drop Classes
+    \ingroup groups
+
+    \brief Classes dealing with drag and drop and mime type encoding and decoding.
+
+    These classes deal with drag and drop and the necessary mime type
+    encoding and decoding. See also \link dnd.html Drag and Drop with
+    Qt. \endlink
+*/
+
+/*!
+    \group environment
+    \title Environment Classes
+    \ingroup groups
+
+    \brief Classes providing various global services such as event handling,
+    access to system settings and internationalization.
+
+    These classes providing various global services to your application such as
+    event handling, access to system settings, internationalization, etc.
+
+*/
+
+/*!
+    \group events
+    \title Event Classes
+    \ingroup groups
+
+    \brief Classes used to create and handle events.
+
+    These classes are used to create and handle events.
+
+    For more information see the \link object.html Object model\endlink
+    and \link signalsandslots.html Signals and Slots\endlink.
+*/
+
+/*!
+    \group explicitly-shared
+    \ingroup groups
+
+    \title Explicitly Shared Classes
+    \brief Classes that use explicit sharing to manage internal data.
+
+    \keyword explicit sharing
+    \keyword explicitly shared
+
+    Unlike many of Qt's data types, which use \l{implicit sharing}, these
+    classes use explicit sharing to manage internal data.
+*/
+
+/*!
+    \group geomanagement
+    \title Layout Management
+    \ingroup groups
+
+    \brief Classes handling automatic resizing and moving of widgets, for
+    composing complex dialogs.
+
+    These classes provide automatic geometry (layout) management of widgets.
+
+*/
+
+/*!
+    \group graphicsview-api
+    \title Graphics View Classes
+    \ingroup groups
+
+    \brief Classes in the Graphics View framework for interactive applications.
+
+    These classes are provided by \l{The Graphics View Framework} for interactive
+    applications and are part of a larger collection of classes related to
+    \l{Multimedia, Graphics and Printing}.
+
+    \note These classes are part of the \l{Open Source Versions of Qt} and
+    \l{Qt Commercial Editions}{Qt Full Framework Edition} for commercial users.
+*/
+
+/*!
+    \group helpsystem
+    \title Help System
+    \ingroup groups
+
+    \brief Classes used to provide online-help for applications.
+
+    \keyword help system
+
+    These classes provide for all forms of online-help in your application,
+    with three levels of detail:
+
+    \list 1
+        \o Tool Tips and Status Bar message - flyweight help, extremely brief,
+            entirely integrated in the user interface, requiring little
+            or no user interaction to invoke.
+        \o What's This? - lightweight, but can be
+            a three-paragraph explanation.
+        \o Online Help - can encompass any amount of information,
+            but is typically slower to call up, somewhat separated
+            from the user's work, and often users feel that using online
+            help is a digression from their real task.
+    \endlist
+
+*/
+
+
+/*!
+    \group io
+    \title Input/Output and Networking
+    \ingroup groups
+
+    \brief Classes providing file input and output along with directory and
+    network handling.
+
+    These classes are used to handle input and output to and from external
+    devices, processes, files etc. as well as manipulating files and directories.
+*/
+
+/*!
+    \group misc
+    \title Miscellaneous Classes
+    \ingroup groups
+
+    \brief Various other useful classes.
+
+    These classes are useful classes not fitting into any other category.
+
+*/
+
+
+/*!
+    \group model-view
+    \title Model/View Classes
+    \ingroup groups
+
+    \brief Classes that use the model/view design pattern.
+
+    These classes use the model/view design pattern in which the
+    underlying data (in the model) is kept separate from the way the data
+    is presented and manipulated by the user (in the view). See also
+    \link model-view-programming.html Model/View Programming\endlink.
+
+*/
+
+/*!
+    \group multimedia
+    \title Multimedia, Graphics and Printing
+    \ingroup groups
+
+    \brief Classes that provide support for graphics (2D, and with OpenGL, 3D),
+    image encoding, decoding, and manipulation, sound, animation,
+    printing, etc.
+
+    These classes provide support for graphics (2D, and with OpenGL, 3D),
+    image encoding, decoding, and manipulation, sound, animation, printing
+    etc.
+
+    See also this introduction to the \link coordsys.html Qt
+    coordinate system. \endlink
+
+*/
+
+/*!
+    \group objectmodel
+    \title Object Model
+    \ingroup groups
+
+    \brief The Qt GUI toolkit's underlying object model.
+
+    These classes form the basis of the \l{Qt Object Model}.
+
+*/
+
+/*!
+    \group organizers
+    \title Organizers
+    \ingroup groups
+
+    \brief User interface organizers such as splitters, tab bars, button groups, etc.
+
+    These classes are used to organize and group GUI primitives into more
+    complex applications or dialogs.
+
+*/
+
+
+/*!
+    \group plugins
+    \title Plugin Classes
+    \ingroup groups
+
+    \brief Plugin related classes.
+
+    These classes deal with shared libraries, (e.g. .so and DLL files),
+    and with Qt plugins.
+
+    See the \link plugins-howto.html plugins documentation\endlink.
+
+    See also the \l{ActiveQt framework} for Windows.
+
+*/
+
+/*!
+    \group qws
+    \title Qt for Embedded Linux Classes
+    \ingroup groups
+
+    \ingroup qt-embedded-linux
+    \brief Classes that are specific to Qt for Embedded Linux.
+
+    These classes are relevant to \l{Qt for Embedded Linux} users.
+*/
+
+/*!
+    \group shared
+    \title Implicitly Shared Classes
+    \ingroup architecture
+    \ingroup groups
+
+    \brief Classes that use reference counting for fast copying.
+
+    \keyword implicit data sharing
+    \keyword implicit sharing
+    \keyword implicitly shared
+    \keyword reference counting
+    \keyword shared implicitly
+    \keyword shared classes
+
+    Many C++ classes in Qt use implicit data sharing to maximize
+    resource usage and minimize copying. Implicitly shared classes are
+    both safe and efficient when passed as arguments, because only a
+    pointer to the data is passed around, and the data is copied only
+    if and when a function writes to it, i.e., \e {copy-on-write}.
+
+    \tableofcontents
+
+    \section1 Overview
+
+    A shared class consists of a pointer to a shared data block that
+    contains a reference count and the data.
+
+    When a shared object is created, it sets the reference count to 1. The
+    reference count is incremented whenever a new object references the
+    shared data, and decremented when the object dereferences the shared
+    data. The shared data is deleted when the reference count becomes
+    zero.
+
+    \keyword deep copy
+    \keyword shallow copy
+
+    When dealing with shared objects, there are two ways of copying an
+    object. We usually speak about \e deep and \e shallow copies. A deep
+    copy implies duplicating an object. A shallow copy is a reference
+    copy, i.e. just a pointer to a shared data block. Making a deep copy
+    can be expensive in terms of memory and CPU. Making a shallow copy is
+    very fast, because it only involves setting a pointer and incrementing
+    the reference count.
+
+    Object assignment (with operator=()) for implicitly shared objects is
+    implemented using shallow copies.
+
+    The benefit of sharing is that a program does not need to duplicate
+    data unnecessarily, which results in lower memory use and less copying
+    of data. Objects can easily be assigned, sent as function arguments,
+    and returned from functions.
+
+    Implicit sharing takes place behind the scenes; the programmer
+    does not need to worry about it. Even in multithreaded
+    applications, implicit sharing takes place, as explained in
+    \l{Threads and Implicit Sharing}.
+
+    \section1 Implicit Sharing in Detail
+
+    Implicit sharing automatically detaches the object from a shared
+    block if the object is about to change and the reference count is
+    greater than one. (This is often called \e {copy-on-write} or
+    \e {value semantics}.)
+
+    An implicitly shared class has total control of its internal data. In
+    any member functions that modify its data, it automatically detaches
+    before modifying the data.
+
+    The QPen class, which uses implicit sharing, detaches from the shared
+    data in all member functions that change the internal data.
+
+    Code fragment:
+    \snippet doc/src/snippets/code/doc_src_groups.qdoc 0
+
+    \section1 List of Classes
+
+    The classes listed below automatically detach from common data if
+    an object is about to be changed. The programmer will not even
+    notice that the objects are shared. Thus you should treat
+    separate instances of them as separate objects. They will always
+    behave as separate objects but with the added benefit of sharing
+    data whenever possible. For this reason, you can pass instances
+    of these classes as arguments to functions by value without
+    concern for the copying overhead.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_groups.qdoc 1
+
+    In this example, \c p1 and \c p2 share data until QPainter::begin()
+    is called for \c p2, because painting a pixmap will modify it.
+
+    \warning Do not copy an implicitly shared container (QMap,
+    QVector, etc.) while you are iterating over it using an non-const
+    \l{STL-style iterator}.
+*/
+
+/*!
+    \group ssl
+    \title Secure Sockets Layer (SSL) Classes
+    \ingroup groups
+
+    \brief Classes for secure communication over network sockets.
+    \keyword SSL
+
+    The classes below provide support for secure network communication using
+    the Secure Sockets Layer (SSL) protocol, using the \l{OpenSSL Toolkit} to
+    perform encryption and protocol handling.
+
+    See the \l{General Qt Requirements} page for information about the
+    versions of OpenSSL that are known to work with Qt.
+
+    \note Due to import and export restrictions in some parts of the world, we
+    are unable to supply the OpenSSL Toolkit with Qt packages. Developers wishing
+    to use SSL communication in their deployed applications should either ensure
+    that their users have the appropriate libraries installed, or they should
+    consult a suitably qualified legal professional to ensure that applications
+    using code from the OpenSSL project are correctly certified for import
+    and export in relevant regions of the world.
+
+    When the QtNetwork module is built with SSL support, the library is linked
+    against OpenSSL in a way that requires OpenSSL license compliance.
+*/
+
+/*!
+    \group text
+    \title Text Processing Classes
+    \ingroup groups
+    \ingroup text-processing
+
+    \brief Classes for text processing. (See also \l{XML Classes}.)
+
+    These classes are relevant to text processing. See also the
+    \l{Rich Text Processing} overview and the
+    \l{XML classes}.
+*/
+
+/*!
+    \group thread
+    \title Threading Classes
+    \ingroup groups
+
+    \brief Classes that provide threading support.
+
+    These classes are relevant to threaded applications. See
+    \l{Thread Support in Qt} for an overview of the features
+    Qt provides to help with multithreaded programming.
+*/
+
+
+/*!
+    \group time
+    \title Date and Time Classes
+    \ingroup groups
+
+    \brief Classes for handling date and time.
+
+    These classes provide system-independent date and time abstractions.
+
+*/
+
+/*!
+    \group tools
+    \title Non-GUI Classes
+    \ingroup groups
+
+    \brief Collection classes such as list, queue, stack and string, along
+    with other classes that can be used without needing QApplication.
+
+    The non-GUI classes are general-purpose collection and string classes
+    that may be used independently of the GUI classes.
+
+    In particular, these classes do not depend on QApplication at all,
+    and so can be used in non-GUI programs.
+
+*/
+
+/*!
+    \group xml-tools
+    \title XML Classes
+    \ingroup groups
+
+    \brief Classes that support XML, via, for example DOM and SAX.
+
+    These classes are relevant to XML users.
+*/
+
+/*!
+    \group script
+    \title Scripting Classes
+    \ingroup groups
+    \ingroup scripting
+
+    \brief Qt Script-related classes and overviews.
+
+    These classes are relevant to Qt Script users.
+*/
+
+/*!
+    \group scripttools
+    \title Script Tools
+    \ingroup groups
+    \ingroup scripting
+
+    \brief Classes for managing and debugging scripts.
+
+    These classes are relevant to developers who are working with Qt Script's
+    debugging features.
+*/
diff --git a/doc/src/guibooks.qdoc b/doc/src/guibooks.qdoc
new file mode 100644
index 0000000000..888368b05c
--- /dev/null
+++ b/doc/src/guibooks.qdoc
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \page guibooks.html
+
+    \title Books about GUI Design
+    \ingroup gui-programming
+
+    This is not a comprehensive list -- there are many other books worth
+    buying. Here we mention just a few user interface books that don't
+    gather dust on our shelves.
+
+    \bold{\l{http://www.amazon.com/gp/product/0132354160/ref=ase_trolltech/}{C++
+    GUI Programming with Qt 4, Second Edition}}
+    by Jasmin Blanchette and Mark
+    Summerfield, ISBN 0-13-235416-0. This is the official Qt book written
+    by two veteran Trolls. The first edition, which is based on Qt 4.1, is available
+    \l{http://www.qtrac.eu/C++-GUI-Programming-with-Qt-4-1st-ed.zip}{online}.
+
+    \bold{\l{http://www.amazon.com/exec/obidos/ASIN/0385267746/trolltech/t}{The Design of Everyday Things}}
+    by Donald Norman, ISBN 0-38526774-6, is one of the classics of human
+    interface design. Norman shows how badly something as simple as a
+    kitchen stove can be designed, and everyone should read it who will
+    design a dialog box, write an error message, or design just about
+    anything else humans are supposed to use.
+
+    \target fowler
+    \bold{\l{http://www.amazon.com/exec/obidos/ASIN/0070592748/trolltech/t}{GUI Design Handbook}}
+    by Susan Fowler, ISBN 0-07-059274-8, is an
+    alphabetical dictionary of widgets and other user interface elements,
+    with comprehensive coverage of each. Each chapter covers one widget
+    or other element, contains the most important recommendation from the
+    Macintosh, Windows and Motif style guides, notes about common
+    problems, comparison with other widgets that can serve some of the
+    same roles as this one, etc.
+
+    \target Design Patterns
+    \bold{\l{http://www.amazon.com/exec/obidos/ASIN/0201633612/103-8144203-3273444}
+    {Design Patterns - Elements of Reusable Object-Oriented Software}}
+    by Gamma, Helm, Johnson, and Vlissides, ISBN 0-201-63361-2, provides
+    more information on the Model-View-Controller (MVC) paradigm, explaining
+    MVC and its sub-patterns in detail.
+
+    \bold{\l{http://www.amazon.com/exec/obidos/ASIN/0201622165/trolltech/t}{Macintosh
+    Human Interface Guidelines}}, Second Edition, ISBN
+    0-201-62216-5, is worth buying for the \e {don't}s alone. Even
+    if you're not writing Macintosh software, avoiding most of what it
+    advises against will produce more easily comprehensible software.
+    Doing what it tells you to do may also help. This book is now available
+    \link http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-2.html 
+    online\endlink and there is a
+    \link http://developer.apple.com/techpubs/mac/HIGOS8Guide/thig-2.html Mac
+    OS 8 addendum.\endlink
+
+    \bold{\l{http://www.amazon.com/exec/obidos/ASIN/047159900X/trolltech/t}{The
+    Microsoft Windows User Experience}}, ISBN 1-55615-679-0,
+    is Microsoft's look and feel bible. Indispensable for everyone who
+    has customers that worship Microsoft, and it's quite good, too.
+    It is also available
+    \link http://msdn.microsoft.com/library/en-us/dnwue/html/welcome.asp online\endlink.
+
+    \bold{\l{http://www.amazon.com/exec/obidos/ASIN/047159900X/trolltech/t}{The Icon Book}}
+    by William Horton, ISBN 0-471-59900-X, is perhaps the only thorough
+    coverage of icons and icon use in software. In order for icons to be
+    successful, people must be able to do four things with them: decode,
+    recognize, find and activate them. This book explains these goals
+    from scratch and how to reach them, both with single icons and icon
+    families. Some 500 examples are scattered throughout the text.
+
+
+    \section1 Buying these Books from Amazon.com
+
+    These books are made available in association with Amazon.com, our
+    favorite online bookstore. Here is more information about
+    \link http://www.amazon.com/exec/obidos/subst/help/shipping-policy.html/t 
+    Amazon.com's shipping options\endlink and its
+    \link http://www.amazon.com/exec/obidos/subst/help/desk.html/t 
+    customer service.\endlink When you buy a book by following one of these
+    links, Amazon.com gives about 15% of the purchase price to
+    \link http://www.amnesty.org/ Amnesty International.\endlink
+
+*/
diff --git a/doc/src/hierarchy.qdoc b/doc/src/hierarchy.qdoc
new file mode 100644
index 0000000000..2b70964d95
--- /dev/null
+++ b/doc/src/hierarchy.qdoc
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page hierarchy.html
+
+    \title Class Inheritance Hierarchy
+    \ingroup classlists
+
+    This list shows the C++ class inheritance relations between the
+    classes in the Qt API.
+
+    \generatelist classhierarchy
+*/
diff --git a/doc/src/how-to-learn-qt.qdoc b/doc/src/how-to-learn-qt.qdoc
new file mode 100644
index 0000000000..4b16294a6c
--- /dev/null
+++ b/doc/src/how-to-learn-qt.qdoc
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page how-to-learn-qt.html
+    \brief Links to guides and resources for learning Qt.
+    \title How to Learn Qt
+    \ingroup howto
+
+    We assume that you already know C++ and will be using it for Qt
+    development. See the \l{Qt website} for more information about
+    using other programming languages with Qt.
+
+    The best way to learn Qt is to read the official Qt book,
+    \l{http://www.amazon.com/gp/product/0132354160/ref=ase_trolltech/}{C++
+    GUI Programming with Qt 4, Second Edition} (ISBN 0-13-235416-0). This book
+    provides comprehensive coverage of Qt programming all the way
+    from "Hello Qt" to advanced features such as multithreading, 2D and
+    3D graphics, networking, item view classes, and XML. (The first edition,
+    which is based on Qt 4.1, is available
+    \l{http://www.qtrac.eu/C++-GUI-Programming-with-Qt-4-1st-ed.zip}{online}.)
+
+    If you want to program purely in C++, designing your interfaces
+    in code without the aid of any design tools, take a look at the
+    \l{Tutorials}. These are designed to get you into Qt programming,
+    with an emphasis on working code rather than being a tour of features.
+
+    If you want to design your user interfaces using a design tool, then
+    read at least the first few chapters of the \l{Qt Designer manual}.
+
+    By now you'll have produced some small working applications and have a
+    broad feel for Qt programming. You could start work on your own
+    projects straight away, but we recommend reading a couple of key
+    overviews to deepen your understanding of Qt: \l{Qt Object Model}
+    and \l{Signals and Slots}.
+
+    At this point, we recommend looking at the
+    \l{All Overviews and HOWTOs}{overviews} and reading those that are
+    relevant to your projects. You may also find it useful to browse the
+    source code of the \l{Qt Examples}{examples} that have things in
+    common with your projects. You can also read Qt's source code since
+    this is supplied.
+
+    \table
+    \row \o \inlineimage qtdemo-small.png
+    \o \bold{Getting an Overview}
+
+    If you run the \l{Examples and Demos Launcher}, you'll see many of Qt's
+    widgets in action.
+
+    The \l{Qt Widget Gallery} also provides overviews of selected Qt
+    widgets in each of the styles used on various supported platforms.
+    \endtable
+
+    Qt comes with extensive documentation, with hypertext
+    cross-references throughout, so you can easily click your way to
+    whatever interests you. The part of the documentation that you'll
+    probably use the most is the \link index.html API
+    Reference\endlink. Each link provides a different way of
+    navigating the API Reference; try them all to see which work best
+    for you. You might also like to try \l{Qt Assistant}:
+    this tool is supplied with Qt and provides access to the entire
+    Qt API, and it provides a full text search facility.
+
+    There are also a growing number of books about Qt programming; see
+    \l{Books about Qt Programming} for a complete list of Qt books,
+    including translations to various languages.
+
+    Another valuable source of example code and explanations of Qt
+    features is the archive of articles from \l {http://doc.trolltech.com/qq}
+    {Qt Quarterly}, a quarterly newsletter for users of Qt.
+
+    For documentation on specific Qt modules and other guides, refer to
+    \l{All Overviews and HOWTOs}.
+
+    Good luck, and have fun!
+*/
diff --git a/doc/src/i18n.qdoc b/doc/src/i18n.qdoc
new file mode 100644
index 0000000000..5018b51f00
--- /dev/null
+++ b/doc/src/i18n.qdoc
@@ -0,0 +1,508 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \group i18n
+    \title Internationalization with Qt
+    \ingroup topics
+
+    \brief Information about Qt's support for internationalization and multiple languages.
+
+    \keyword internationalization
+    \keyword i18n
+
+    The internationalization of an application is the process of making
+    the application usable by people in countries other than one's own.
+
+    \tableofcontents
+
+    In some cases internationalization is simple, for example, making a US
+    application accessible to Australian or British users may require
+    little more than a few spelling corrections. But to make a US
+    application usable by Japanese users, or a Korean application usable
+    by German users, will require that the software operate not only in
+    different languages, but use different input techniques, character
+    encodings and presentation conventions.
+
+    Qt tries to make internationalization as painless as possible for
+    developers. All input widgets and text drawing methods in Qt offer
+    built-in support for all supported languages. The built-in font engine
+    is capable of correctly and attractively rendering text that contains
+    characters from a variety of different writing systems at the same
+    time.
+
+    Qt supports most languages in use today, in particular:
+    \list
+    \o All East Asian languages (Chinese, Japanese and Korean)
+    \o All Western languages (using Latin script)
+    \o Arabic
+    \o Cyrillic languages (Russian, Ukrainian, etc.)
+    \o Greek
+    \o Hebrew
+    \o Thai and Lao
+    \o All scripts in Unicode 4.0 that do not require special processing
+    \endlist
+
+    On Windows, Unix/X11 with FontConfig (client side font support)
+    and Qt for Embedded Linux the following languages are also supported:
+    \list
+    \o Bengali
+    \o Devanagari
+    \o Dhivehi (Thaana)
+    \o Gujarati
+    \o Gurmukhi
+    \o Kannada
+    \o Khmer
+    \o Malayalam
+    \o Myanmar
+    \o Syriac
+    \o Tamil
+    \o Telugu
+    \o Tibetan
+    \endlist
+
+    Many of these writing systems exhibit special features:
+
+    \list
+
+    \o \bold{Special line breaking behavior.} Some of the Asian languages are
+    written without spaces between words. Line breaking can occur either
+    after every character (with exceptions) as in Chinese, Japanese and
+    Korean, or after logical word boundaries as in Thai.
+
+    \o \bold{Bidirectional writing.} Arabic and Hebrew are written from right to
+    left, except for numbers and embedded English text which is written
+    left to right. The exact behavior is defined in the
+    \l{http://www.unicode.org/unicode/reports/tr9/}{Unicode Technical Annex #9}.
+
+    \o \bold{Non-spacing or diacritical marks (accents or umlauts in European
+    languages).} Some languages such as Vietnamese make extensive use of
+    these marks and some characters can have more than one mark at the
+    same time to clarify pronunciation.
+
+    \o \bold{Ligatures.} In special contexts, some pairs of characters get
+    replaced by a combined glyph forming a ligature. Common examples are
+    the fl and fi ligatures used in typesetting US and European books.
+
+    \endlist
+
+    Qt tries to take care of all the special features listed above. You
+    usually don't have to worry about these features so long as you use
+    Qt's input widgets (e.g. QLineEdit, QTextEdit, and derived classes)
+    and Qt's display widgets (e.g. QLabel).
+
+    Support for these writing systems is transparent to the
+    programmer and completely encapsulated in \l{rich text
+    processing}{Qt's text engine}. This means that you don't need to
+    have any knowledge about the writing system used in a particular
+    language, except for the following small points:
+
+    \list
+
+    \o QPainter::drawText(int x, int y, const QString &str) will always
+    draw the string with its left edge at the position specified with
+    the x, y parameters. This will usually give you left aligned strings.
+    Arabic and Hebrew application strings are usually right
+    aligned, so for these languages use the version of drawText() that
+    takes a QRect since this will align in accordance with the language.
+
+    \o When you write your own text input controls, use \l
+    QFontMetrics::charWidth() to determine the width of a character in a
+    string. In some languages (e.g. Arabic or languages from the Indian
+    subcontinent), the width and shape of a glyph changes depending on the
+    surrounding characters. Writing input controls usually requires a
+    certain knowledge of the scripts it is going to be used in. Usually
+    the easiest way is to subclass QLineEdit or QTextEdit.
+
+    \endlist
+
+    The following sections give some information on the status of the
+    internationalization (i18n) support in Qt. See also the \l{Qt
+    Linguist manual}.
+
+    \section1 Step by Step
+
+    Writing cross-platform international software with Qt is a gentle,
+    incremental process. Your software can become internationalized in
+    the following stages:
+
+    \section2 Use QString for All User-Visible Text
+
+    Since QString uses the Unicode 4.0 encoding internally, every
+    language in the world can be processed transparently using
+    familiar text processing operations. Also, since all Qt functions
+    that present text to the user take a QString as a parameter,
+    there is no \c{char *} to QString conversion overhead.
+
+    Strings that are in "programmer space" (such as QObject names
+    and file format texts) need not use QString; the traditional
+    \c{char *} or the QByteArray class will suffice.
+
+    You're unlikely to notice that you are using Unicode;
+    QString, and QChar are just like easier versions of the crude
+    \c{const char *} and char from traditional C.
+
+    \section2 Use tr() for All Literal Text
+
+    Wherever your program uses "quoted text" for text that will
+    be presented to the user, ensure that it is processed by the \l
+    QCoreApplication::translate() function. Essentially all that is necessary
+    to achieve this is to use QObject::tr(). For example, assuming the
+    \c LoginWidget is a subclass of QWidget:
+
+    \snippet doc/src/snippets/code/doc_src_i18n.qdoc 0
+
+    This accounts for 99% of the user-visible strings you're likely to
+    write.
+
+    If the quoted text is not in a member function of a
+    QObject subclass, use either the tr() function of an
+    appropriate class, or the QCoreApplication::translate() function
+    directly:
+
+    \snippet doc/src/snippets/code/doc_src_i18n.qdoc 1
+
+    If you need to have translatable text completely
+    outside a function, there are two macros to help: QT_TR_NOOP()
+    and QT_TRANSLATE_NOOP(). They merely mark the text for
+    extraction by the \c lupdate utility described below.
+    The macros expand to just the text (without the context).
+
+    Example of QT_TR_NOOP():
+
+    \snippet doc/src/snippets/code/doc_src_i18n.qdoc 2
+
+    Example of QT_TRANSLATE_NOOP():
+
+    \snippet doc/src/snippets/code/doc_src_i18n.qdoc 3
+
+    If you disable the \c{const char *} to QString automatic
+    conversion by compiling your software with the macro \c
+    QT_NO_CAST_FROM_ASCII defined, you'll be very likely to catch any
+    strings you are missing. See QString::fromLatin1() for more
+    information. Disabling the conversion can make programming a bit
+    cumbersome.
+
+    If your source language uses characters outside Latin1, you
+    might find QObject::trUtf8() more convenient than
+    QObject::tr(), as tr() depends on the
+    QTextCodec::codecForTr(), which makes it more fragile than
+    QObject::trUtf8().
+
+    \section2 Use QKeySequence() for Accelerator Values
+
+    Accelerator values such as Ctrl+Q or Alt+F need to be translated
+    too. If you hardcode Qt::CTRL + Qt::Key_Q for "quit" in your
+    application, translators won't be able to override it. The
+    correct idiom is
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 20
+
+    \section2 Use QString::arg() for Dynamic Text
+
+    The QString::arg() functions offer a simple means for substituting
+    arguments:
+    \snippet doc/src/snippets/code/doc_src_i18n.qdoc 4
+
+    In some languages the order of arguments may need to change, and this
+    can easily be achieved by changing the order of the % arguments. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_i18n.qdoc 5
+
+    produces the correct output in English and Norwegian:
+    \snippet doc/src/snippets/code/doc_src_i18n.qdoc 6
+
+    \section2 Produce Translations
+
+    Once you are using tr() throughout an application, you can start
+    producing translations of the user-visible text in your program.
+
+    The \l{Qt Linguist manual} provides further information about
+    Qt's translation tools, \e{Qt Linguist}, \c lupdate and \c
+    lrelease.
+
+    Translation of a Qt application is a three-step process:
+
+    \list 1
+
+    \o Run \c lupdate to extract translatable text from the C++
+    source code of the Qt application, resulting in a message file
+    for translators (a \c .ts file). The utility recognizes the tr()
+    construct and the \c{QT_TR*_NOOP()} macros described above and
+    produces \c .ts files (usually one per language).
+
+    \o Provide translations for the source texts in the \c .ts file, using
+    \e{Qt Linguist}. Since \c .ts files are in XML format, you can also
+    edit them by hand.
+
+    \o Run \c lrelease to obtain a light-weight message file (a \c .qm
+    file) from the \c .ts file, suitable only for end use. Think of the \c
+    .ts files as "source files", and \c .qm files as "object files". The
+    translator edits the \c .ts files, but the users of your application
+    only need the \c .qm files. Both kinds of files are platform and
+    locale independent.
+
+    \endlist
+
+    Typically, you will repeat these steps for every release of your
+    application. The \c lupdate utility does its best to reuse the
+    translations from previous releases.
+
+    Before you run \c lupdate, you should prepare a project file. Here's
+    an example project file (\c .pro file):
+
+    \snippet doc/src/snippets/code/doc_src_i18n.qdoc 7
+
+    When you run \c lupdate or \c lrelease, you must give the name of the
+    project file as a command-line argument.
+
+    In this example, four exotic languages are supported: Danish,
+    Finnish, Norwegian and Swedish. If you use \l{qmake}, you usually
+    don't need an extra project file for \c lupdate; your \c qmake
+    project file will work fine once you add the \c TRANSLATIONS
+    entry.
+
+    In your application, you must \l QTranslator::load() the translation
+    files appropriate for the user's language, and install them using \l
+    QCoreApplication::installTranslator().
+
+    \c linguist, \c lupdate and \c lrelease are installed in the \c bin
+    subdirectory of the base directory Qt is installed into. Click Help|Manual
+    in \e{Qt Linguist} to access the user's manual; it contains a tutorial
+    to get you started.
+
+    \target qt-itself
+    Qt itself contains over 400 strings that will also need to be
+    translated into the languages that you are targeting. You will find
+    translation files for French, German and Simplified Chinese in
+    \c{$QTDIR/translations}, as well as a template for translating to
+    other languages. (This directory also contains some additional
+    unsupported translations which may be useful.)
+
+    Typically, your application's \c main() function will look like
+    this:
+
+    \snippet doc/src/snippets/code/doc_src_i18n.qdoc 8
+
+    Note the use of QLibraryInfo::location() to locate the Qt translations.
+    Developers should request the path to the translations at run-time by
+    passing QLibraryInfo::TranslationsPath to this function instead of
+    using the \c QTDIR environment variable in their applications.
+
+    \section2 Support for Encodings
+
+    The QTextCodec class and the facilities in QTextStream make it easy to
+    support many input and output encodings for your users' data. When an
+    application starts, the locale of the machine will determine the 8-bit
+    encoding used when dealing with 8-bit data: such as for font
+    selection, text display, 8-bit text I/O, and character input.
+
+    The application may occasionally require encodings other than the
+    default local 8-bit encoding. For example, an application in a
+    Cyrillic KOI8-R locale (the de-facto standard locale in Russia) might
+    need to output Cyrillic in the ISO 8859-5 encoding. Code for this
+    would be:
+
+    \snippet doc/src/snippets/code/doc_src_i18n.qdoc 9
+
+    For converting Unicode to local 8-bit encodings, a shortcut is
+    available: the QString::toLocal8Bit() function returns such 8-bit
+    data. Another useful shortcut is QString::toUtf8(), which returns
+    text in the 8-bit UTF-8 encoding: this perfectly preserves
+    Unicode information while looking like plain ASCII if the text is
+    wholly ASCII.
+
+    For converting the other way, there are the QString::fromUtf8() and
+    QString::fromLocal8Bit() convenience functions, or the general code,
+    demonstrated by this conversion from ISO 8859-5 Cyrillic to Unicode
+    conversion:
+
+    \snippet doc/src/snippets/code/doc_src_i18n.qdoc 10
+
+    Ideally Unicode I/O should be used as this maximizes the portability
+    of documents between users around the world, but in reality it is
+    useful to support all the appropriate encodings that your users will
+    need to process existing documents. In general, Unicode (UTF-16 or
+    UTF-8) is best for information transferred between arbitrary people,
+    while within a language or national group, a local standard is often
+    more appropriate. The most important encoding to support is the one
+    returned by QTextCodec::codecForLocale(), as this is the one the user
+    is most likely to need for communicating with other people and
+    applications (this is the codec used by local8Bit()).
+
+    Qt supports most of the more frequently used encodings natively. For a
+    complete list of supported encodings see the \l QTextCodec
+    documentation.
+
+    In some cases and for less frequently used encodings it may be
+    necessary to write your own QTextCodec subclass. Depending on the
+    urgency, it may be useful to contact Qt's technical support team or
+    ask on the \c qt-interest mailing list to see if someone else is
+    already working on supporting the encoding.
+
+    \keyword localization
+
+    \section2 Localize
+
+    Localization is the process of adapting to local conventions, for
+    example presenting dates and times using the locally preferred
+    formats. Such localizations can be accomplished using appropriate tr()
+    strings.
+
+    \snippet doc/src/snippets/code/doc_src_i18n.qdoc 11
+
+    In the example, for the US we would leave the translation of
+    "AMPM" as it is and thereby use the 12-hour clock branch; but in
+    Europe we would translate it as something else and this will make
+    the code use the 24-hour clock branch.
+
+    For localized numbers use the QLocale class.
+
+    Localizing images is not recommended. Choose clear icons that are
+    appropriate for all localities, rather than relying on local puns or
+    stretched metaphors. The exception is for images of left and right
+    pointing arrows which may need to be reversed for Arabic and Hebrew
+    locales.
+
+    \section1 Dynamic Translation
+
+    Some applications, such as Qt Linguist, must be able to support changes
+    to the user's language settings while they are still running. To make
+    widgets aware of changes to the installed QTranslators, reimplement the 
+    widget's \l{QWidget::changeEvent()}{changeEvent()} function to check whether 
+    the event is a \l{QEvent::LanguageChange}{LanguageChange} event, and update
+    the text displayed by widgets using the \l{QObject::tr()}{tr()} function
+    in the usual way. For example:
+
+    \snippet doc/src/snippets/code/doc_src_i18n.qdoc 12
+
+    All other change events should be passed on by calling the default
+    implementation of the function.
+
+    The list of installed translators might change in reaction to a 
+    \l{QEvent::LocaleChange}{LocaleChange} event, or the application might
+    provide a user interface that allows the user to change the current
+    application language.
+
+    The default event handler for QWidget subclasses responds to the
+    QEvent::LanguageChange event, and will call this function when necessary;
+    other application components can also force widgets to update themselves
+    by posting the \l{QEvent::LanguageChange}{LanguageChange} event to them.
+
+    \section1 Translating Non-Qt Classes
+
+    It is sometimes necessary to provide internationalization support for
+    strings used in classes that do not inherit QObject or use the Q_OBJECT
+    macro to enable translation features. Since Qt translates strings at
+    run-time based on the class they are associated with and \c lupdate
+    looks for translatable strings in the source code, non-Qt classes must
+    use mechanisms that also provide this information.
+
+    One way to do this is to add translation support to a non-Qt class
+    using the Q_DECLARE_TR_FUNCTIONS() macro; for example:
+
+    \snippet doc/src/snippets/i18n-non-qt-class/myclass.h 0
+    \dots
+    \snippet doc/src/snippets/i18n-non-qt-class/myclass.h 1
+
+    This provides the class with \l{QObject::}{tr()} functions that can
+    be used to translate strings associated with the class, and makes it
+    possible for \c lupdate to find translatable strings in the source
+    code.
+
+    Alternatively, the QCoreApplication::translate() function can be called
+    with a specific context, and this will be recognized by \c lupdate and
+    Qt Linguist.
+
+    \section1 System Support
+
+    Some of the operating systems and windowing systems that Qt runs on
+    only have limited support for Unicode. The level of support available
+    in the underlying system has some influence on the support that Qt can
+    provide on those platforms, although in general Qt applications need
+    not be too concerned with platform-specific limitations.
+
+    \section2 Unix/X11
+
+    \list
+    \o  Locale-oriented fonts and input methods. Qt hides these and
+        provides Unicode input and output.
+    \o  Filesystem conventions such as
+        \l{http://www.ietf.org/rfc/rfc2279.txt}{UTF-8}
+        are under development in some Unix variants. All Qt file
+        functions allow Unicode, but convert filenames to the local
+        8-bit encoding, as this is the Unix convention (see
+        QFile::setEncodingFunction() to explore alternative
+        encodings).
+    \o  File I/O defaults to the local 8-bit encoding,
+        with Unicode options in QTextStream.
+    \o  Many Unix distributions contain only partial support for some locales.
+        For example, if you have a \c /usr/share/locale/ja_JP.EUC directory,
+        this does not necessarily mean you can display Japanese text; you also
+        need JIS encoded fonts (or Unicode fonts), and the
+        \c /usr/share/locale/ja_JP.EUC directory needs to be complete. For
+        best results, use complete locales from your system vendor.
+    \endlist
+
+    \section2 Windows
+
+    \list
+    \o  Qt provides full Unicode support, including input methods, fonts,
+        clipboard, drag-and-drop and file names.
+    \o  File I/O defaults to Latin1, with Unicode options in QTextStream.
+        Note that some Windows programs do not understand big-endian
+        Unicode text files even though that is the order prescribed by
+        the Unicode Standard in the absence of higher-level protocols.
+    \o  Unlike programs written with MFC or plain winlib, Qt programs
+        are portable between Windows 98 and Windows NT.
+        \e {You do not need different binaries to support Unicode.}
+    \endlist
+
+    \section2 Mac OS X
+
+    For details on Mac-specific translation, refer to the Qt/Mac Specific Issues
+    document \l{Qt for Mac OS X - Specific Issues#Translating the Application Menu and Native Dialogs}{here}.
+
+    \section1 Relevant Qt Classes
+
+    These classes are relevant to internationalizing Qt applications.
+*/
diff --git a/doc/src/images/2dpainting-example.png b/doc/src/images/2dpainting-example.png
new file mode 100644
index 0000000000..2a77e7d7d5
--- /dev/null
+++ b/doc/src/images/2dpainting-example.png
diff --git a/doc/src/images/abstract-connections.png b/doc/src/images/abstract-connections.png
new file mode 100644
index 0000000000..18d2f4e3b7
--- /dev/null
+++ b/doc/src/images/abstract-connections.png
diff --git a/doc/src/images/accessibilityarchitecture.png b/doc/src/images/accessibilityarchitecture.png
new file mode 100644
index 0000000000..40cd6dcb29
--- /dev/null
+++ b/doc/src/images/accessibilityarchitecture.png
diff --git a/doc/src/images/accessibleobjecttree.png b/doc/src/images/accessibleobjecttree.png
new file mode 100644
index 0000000000..8b82158322
--- /dev/null
+++ b/doc/src/images/accessibleobjecttree.png
diff --git a/doc/src/images/addressbook-adddialog.png b/doc/src/images/addressbook-adddialog.png
new file mode 100644
index 0000000000..e2bab80c53
--- /dev/null
+++ b/doc/src/images/addressbook-adddialog.png
diff --git a/doc/src/images/addressbook-classes.png b/doc/src/images/addressbook-classes.png
new file mode 100644
index 0000000000..2920f1636c
--- /dev/null
+++ b/doc/src/images/addressbook-classes.png
diff --git a/doc/src/images/addressbook-editdialog.png b/doc/src/images/addressbook-editdialog.png
new file mode 100644
index 0000000000..fd41ee63f7
--- /dev/null
+++ b/doc/src/images/addressbook-editdialog.png
diff --git a/doc/src/images/addressbook-example.png b/doc/src/images/addressbook-example.png
new file mode 100644
index 0000000000..b743c166da
--- /dev/null
+++ b/doc/src/images/addressbook-example.png
diff --git a/doc/src/images/addressbook-filemenu.png b/doc/src/images/addressbook-filemenu.png
new file mode 100644
index 0000000000..ebd14b62c4
--- /dev/null
+++ b/doc/src/images/addressbook-filemenu.png
diff --git a/doc/src/images/addressbook-newaddresstab.png b/doc/src/images/addressbook-newaddresstab.png
new file mode 100644
index 0000000000..ff215a4b20
--- /dev/null
+++ b/doc/src/images/addressbook-newaddresstab.png
diff --git a/doc/src/images/addressbook-signals.png b/doc/src/images/addressbook-signals.png
new file mode 100644
index 0000000000..cda426930b
--- /dev/null
+++ b/doc/src/images/addressbook-signals.png
diff --git a/doc/src/images/addressbook-toolsmenu.png b/doc/src/images/addressbook-toolsmenu.png
new file mode 100644
index 0000000000..092e9a2153
--- /dev/null
+++ b/doc/src/images/addressbook-toolsmenu.png
diff --git a/doc/src/images/addressbook-tutorial-part1-labeled-layout.png b/doc/src/images/addressbook-tutorial-part1-labeled-layout.png
new file mode 100644
index 0000000000..ef514c8d0c
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-part1-labeled-layout.png
diff --git a/doc/src/images/addressbook-tutorial-part1-labeled-screenshot.png b/doc/src/images/addressbook-tutorial-part1-labeled-screenshot.png
new file mode 100644
index 0000000000..43810794ec
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-part1-labeled-screenshot.png
diff --git a/doc/src/images/addressbook-tutorial-part1-screenshot.png b/doc/src/images/addressbook-tutorial-part1-screenshot.png
new file mode 100644
index 0000000000..cf15627974
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-part1-screenshot.png
diff --git a/doc/src/images/addressbook-tutorial-part2-add-contact.png b/doc/src/images/addressbook-tutorial-part2-add-contact.png
new file mode 100644
index 0000000000..330858ddf1
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-part2-add-contact.png
diff --git a/doc/src/images/addressbook-tutorial-part2-add-flowchart.png b/doc/src/images/addressbook-tutorial-part2-add-flowchart.png
new file mode 100644
index 0000000000..ca9af3720d
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-part2-add-flowchart.png
diff --git a/doc/src/images/addressbook-tutorial-part2-add-successful.png b/doc/src/images/addressbook-tutorial-part2-add-successful.png
new file mode 100644
index 0000000000..3b108fbbd1
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-part2-add-successful.png
diff --git a/doc/src/images/addressbook-tutorial-part2-labeled-layout.png b/doc/src/images/addressbook-tutorial-part2-labeled-layout.png
new file mode 100644
index 0000000000..73f6dfb1dc
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-part2-labeled-layout.png
diff --git a/doc/src/images/addressbook-tutorial-part2-signals-and-slots.png b/doc/src/images/addressbook-tutorial-part2-signals-and-slots.png
new file mode 100644
index 0000000000..e49f8dc262
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-part2-signals-and-slots.png
diff --git a/doc/src/images/addressbook-tutorial-part2-stretch-effects.png b/doc/src/images/addressbook-tutorial-part2-stretch-effects.png
new file mode 100644
index 0000000000..d9f7f31227
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-part2-stretch-effects.png
diff --git a/doc/src/images/addressbook-tutorial-part3-labeled-layout.png b/doc/src/images/addressbook-tutorial-part3-labeled-layout.png
new file mode 100644
index 0000000000..662fa7f0e6
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-part3-labeled-layout.png
diff --git a/doc/src/images/addressbook-tutorial-part3-linkedlist.png b/doc/src/images/addressbook-tutorial-part3-linkedlist.png
new file mode 100644
index 0000000000..e7f4725dce
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-part3-linkedlist.png
diff --git a/doc/src/images/addressbook-tutorial-part3-screenshot.png b/doc/src/images/addressbook-tutorial-part3-screenshot.png
new file mode 100644
index 0000000000..97d1357311
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-part3-screenshot.png
diff --git a/doc/src/images/addressbook-tutorial-part4-remove.png b/doc/src/images/addressbook-tutorial-part4-remove.png
new file mode 100644
index 0000000000..42b0f92b40
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-part4-remove.png
diff --git a/doc/src/images/addressbook-tutorial-part5-finddialog.png b/doc/src/images/addressbook-tutorial-part5-finddialog.png
new file mode 100644
index 0000000000..18e545113a
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-part5-finddialog.png
diff --git a/doc/src/images/addressbook-tutorial-part5-notfound.png b/doc/src/images/addressbook-tutorial-part5-notfound.png
new file mode 100644
index 0000000000..be7172e6f1
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-part5-notfound.png
diff --git a/doc/src/images/addressbook-tutorial-part5-screenshot.png b/doc/src/images/addressbook-tutorial-part5-screenshot.png
new file mode 100644
index 0000000000..ea4a66c7d0
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-part5-screenshot.png
diff --git a/doc/src/images/addressbook-tutorial-part5-signals-and-slots.png b/doc/src/images/addressbook-tutorial-part5-signals-and-slots.png
new file mode 100644
index 0000000000..1771e7bbbf
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-part5-signals-and-slots.png
diff --git a/doc/src/images/addressbook-tutorial-part6-load.png b/doc/src/images/addressbook-tutorial-part6-load.png
new file mode 100644
index 0000000000..95fdcaffca
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-part6-load.png
diff --git a/doc/src/images/addressbook-tutorial-part6-save.png b/doc/src/images/addressbook-tutorial-part6-save.png
new file mode 100644
index 0000000000..c0deb70b58
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-part6-save.png
diff --git a/doc/src/images/addressbook-tutorial-part6-screenshot.png b/doc/src/images/addressbook-tutorial-part6-screenshot.png
new file mode 100644
index 0000000000..f77bf0357d
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-part6-screenshot.png
diff --git a/doc/src/images/addressbook-tutorial-part7-screenshot.png b/doc/src/images/addressbook-tutorial-part7-screenshot.png
new file mode 100644
index 0000000000..d6b0a50c8b
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-part7-screenshot.png
diff --git a/doc/src/images/addressbook-tutorial-screenshot.png b/doc/src/images/addressbook-tutorial-screenshot.png
new file mode 100644
index 0000000000..d6727dcf4f
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial-screenshot.png
diff --git a/doc/src/images/addressbook-tutorial.png b/doc/src/images/addressbook-tutorial.png
new file mode 100644
index 0000000000..495edda411
--- /dev/null
+++ b/doc/src/images/addressbook-tutorial.png
diff --git a/doc/src/images/affine-demo.png b/doc/src/images/affine-demo.png
new file mode 100644
index 0000000000..534d6956ae
--- /dev/null
+++ b/doc/src/images/affine-demo.png
diff --git a/doc/src/images/alphachannelimage.png b/doc/src/images/alphachannelimage.png
new file mode 100644
index 0000000000..57b17c6aa0
--- /dev/null
+++ b/doc/src/images/alphachannelimage.png
diff --git a/doc/src/images/alphafill.png b/doc/src/images/alphafill.png
new file mode 100644
index 0000000000..3feff296df
--- /dev/null
+++ b/doc/src/images/alphafill.png
diff --git a/doc/src/images/analogclock-example.png b/doc/src/images/analogclock-example.png
new file mode 100644
index 0000000000..ffd7baa716
--- /dev/null
+++ b/doc/src/images/analogclock-example.png
diff --git a/doc/src/images/analogclock-viewport.png b/doc/src/images/analogclock-viewport.png
new file mode 100644
index 0000000000..31ce0c3c6e
--- /dev/null
+++ b/doc/src/images/analogclock-viewport.png
diff --git a/doc/src/images/antialiased.png b/doc/src/images/antialiased.png
new file mode 100644
index 0000000000..70619cc0d2
--- /dev/null
+++ b/doc/src/images/antialiased.png
diff --git a/doc/src/images/application-menus.png b/doc/src/images/application-menus.png
new file mode 100644
index 0000000000..1815a2a4e3
--- /dev/null
+++ b/doc/src/images/application-menus.png
diff --git a/doc/src/images/application.png b/doc/src/images/application.png
new file mode 100644
index 0000000000..2fb7f2f18e
--- /dev/null
+++ b/doc/src/images/application.png
diff --git a/doc/src/images/arthurplugin-demo.png b/doc/src/images/arthurplugin-demo.png
new file mode 100644
index 0000000000..6d372c2580
--- /dev/null
+++ b/doc/src/images/arthurplugin-demo.png
diff --git a/doc/src/images/assistant-address-toolbar.png b/doc/src/images/assistant-address-toolbar.png
new file mode 100644
index 0000000000..7f00942b71
--- /dev/null
+++ b/doc/src/images/assistant-address-toolbar.png
diff --git a/doc/src/images/assistant-assistant.png b/doc/src/images/assistant-assistant.png
new file mode 100644
index 0000000000..d728889e6f
--- /dev/null
+++ b/doc/src/images/assistant-assistant.png
diff --git a/doc/src/images/assistant-dockwidgets.png b/doc/src/images/assistant-dockwidgets.png
new file mode 100644
index 0000000000..17bc064c53
--- /dev/null
+++ b/doc/src/images/assistant-dockwidgets.png
diff --git a/doc/src/images/assistant-docwindow.png b/doc/src/images/assistant-docwindow.png
new file mode 100644
index 0000000000..c5bac581f6
--- /dev/null
+++ b/doc/src/images/assistant-docwindow.png
diff --git a/doc/src/images/assistant-examples.png b/doc/src/images/assistant-examples.png
new file mode 100644
index 0000000000..47c01bcda7
--- /dev/null
+++ b/doc/src/images/assistant-examples.png
diff --git a/doc/src/images/assistant-filter-toolbar.png b/doc/src/images/assistant-filter-toolbar.png
new file mode 100644
index 0000000000..e1411e4f51
--- /dev/null
+++ b/doc/src/images/assistant-filter-toolbar.png
diff --git a/doc/src/images/assistant-preferences-documentation.png b/doc/src/images/assistant-preferences-documentation.png
new file mode 100644
index 0000000000..42c1fd004b
--- /dev/null
+++ b/doc/src/images/assistant-preferences-documentation.png
diff --git a/doc/src/images/assistant-preferences-filters.png b/doc/src/images/assistant-preferences-filters.png
new file mode 100644
index 0000000000..6844d88a3c
--- /dev/null
+++ b/doc/src/images/assistant-preferences-filters.png
diff --git a/doc/src/images/assistant-preferences-fonts.png b/doc/src/images/assistant-preferences-fonts.png
new file mode 100644
index 0000000000..172fcced15
--- /dev/null
+++ b/doc/src/images/assistant-preferences-fonts.png
diff --git a/doc/src/images/assistant-preferences-options.png b/doc/src/images/assistant-preferences-options.png
new file mode 100644
index 0000000000..f04499f339
--- /dev/null
+++ b/doc/src/images/assistant-preferences-options.png
diff --git a/doc/src/images/assistant-search.png b/doc/src/images/assistant-search.png
new file mode 100644
index 0000000000..ef75c3329f
--- /dev/null
+++ b/doc/src/images/assistant-search.png
diff --git a/doc/src/images/assistant-toolbar.png b/doc/src/images/assistant-toolbar.png
new file mode 100644
index 0000000000..1b41825c64
--- /dev/null
+++ b/doc/src/images/assistant-toolbar.png
diff --git a/doc/src/images/basicdrawing-example.png b/doc/src/images/basicdrawing-example.png
new file mode 100644
index 0000000000..043acbe8d9
--- /dev/null
+++ b/doc/src/images/basicdrawing-example.png
diff --git a/doc/src/images/basicgraphicslayouts-example.png b/doc/src/images/basicgraphicslayouts-example.png
new file mode 100644
index 0000000000..5c8f4cbc5d
--- /dev/null
+++ b/doc/src/images/basicgraphicslayouts-example.png
diff --git a/doc/src/images/basiclayouts-example.png b/doc/src/images/basiclayouts-example.png
new file mode 100644
index 0000000000..f293423a8e
--- /dev/null
+++ b/doc/src/images/basiclayouts-example.png
diff --git a/doc/src/images/basicsortfiltermodel-example.png b/doc/src/images/basicsortfiltermodel-example.png
new file mode 100644
index 0000000000..7f3bfdf360
--- /dev/null
+++ b/doc/src/images/basicsortfiltermodel-example.png
diff --git a/doc/src/images/bearings.png b/doc/src/images/bearings.png
new file mode 100644
index 0000000000..00108923d0
--- /dev/null
+++ b/doc/src/images/bearings.png
diff --git a/doc/src/images/blockingfortuneclient-example.png b/doc/src/images/blockingfortuneclient-example.png
new file mode 100644
index 0000000000..cdb7cac0d3
--- /dev/null
+++ b/doc/src/images/blockingfortuneclient-example.png
diff --git a/doc/src/images/books-demo.png b/doc/src/images/books-demo.png
new file mode 100644
index 0000000000..5bcc20b478
--- /dev/null
+++ b/doc/src/images/books-demo.png
diff --git a/doc/src/images/borderlayout-example.png b/doc/src/images/borderlayout-example.png
new file mode 100644
index 0000000000..e856e06572
--- /dev/null
+++ b/doc/src/images/borderlayout-example.png
diff --git a/doc/src/images/boxes-demo.png b/doc/src/images/boxes-demo.png
new file mode 100644
index 0000000000..6ad253c113
--- /dev/null
+++ b/doc/src/images/boxes-demo.png
diff --git a/doc/src/images/broadcastreceiver-example.png b/doc/src/images/broadcastreceiver-example.png
new file mode 100644
index 0000000000..b83789523c
--- /dev/null
+++ b/doc/src/images/broadcastreceiver-example.png
diff --git a/doc/src/images/broadcastsender-example.png b/doc/src/images/broadcastsender-example.png
new file mode 100644
index 0000000000..bf7ccbeb9e
--- /dev/null
+++ b/doc/src/images/broadcastsender-example.png
diff --git a/doc/src/images/browser-demo.png b/doc/src/images/browser-demo.png
new file mode 100644
index 0000000000..466f218862
--- /dev/null
+++ b/doc/src/images/browser-demo.png
diff --git a/doc/src/images/brush-outline.png b/doc/src/images/brush-outline.png
new file mode 100644
index 0000000000..f560c9faf5
--- /dev/null
+++ b/doc/src/images/brush-outline.png
diff --git a/doc/src/images/brush-styles.png b/doc/src/images/brush-styles.png
new file mode 100644
index 0000000000..eecb006af1
--- /dev/null
+++ b/doc/src/images/brush-styles.png
diff --git a/doc/src/images/buttonbox-gnomelayout-horizontal.png b/doc/src/images/buttonbox-gnomelayout-horizontal.png
new file mode 100644
index 0000000000..b2f74bb6c6
--- /dev/null
+++ b/doc/src/images/buttonbox-gnomelayout-horizontal.png
diff --git a/doc/src/images/buttonbox-gnomelayout-vertical.png b/doc/src/images/buttonbox-gnomelayout-vertical.png
new file mode 100644
index 0000000000..e7843dc22d
--- /dev/null
+++ b/doc/src/images/buttonbox-gnomelayout-vertical.png
diff --git a/doc/src/images/buttonbox-kdelayout-horizontal.png b/doc/src/images/buttonbox-kdelayout-horizontal.png
new file mode 100644
index 0000000000..5da11f4d7a
--- /dev/null
+++ b/doc/src/images/buttonbox-kdelayout-horizontal.png
diff --git a/doc/src/images/buttonbox-kdelayout-vertical.png b/doc/src/images/buttonbox-kdelayout-vertical.png
new file mode 100644
index 0000000000..6f5dfc6b65
--- /dev/null
+++ b/doc/src/images/buttonbox-kdelayout-vertical.png
diff --git a/doc/src/images/buttonbox-mac-modeless-horizontal.png b/doc/src/images/buttonbox-mac-modeless-horizontal.png
new file mode 100644
index 0000000000..2e853d34fb
--- /dev/null
+++ b/doc/src/images/buttonbox-mac-modeless-horizontal.png
diff --git a/doc/src/images/buttonbox-mac-modeless-vertical.png b/doc/src/images/buttonbox-mac-modeless-vertical.png
new file mode 100644
index 0000000000..f59bd8ddaf
--- /dev/null
+++ b/doc/src/images/buttonbox-mac-modeless-vertical.png
diff --git a/doc/src/images/buttonbox-maclayout-horizontal.png b/doc/src/images/buttonbox-maclayout-horizontal.png
new file mode 100644
index 0000000000..89ae84dea0
--- /dev/null
+++ b/doc/src/images/buttonbox-maclayout-horizontal.png
diff --git a/doc/src/images/buttonbox-maclayout-vertical.png b/doc/src/images/buttonbox-maclayout-vertical.png
new file mode 100644
index 0000000000..728760029f
--- /dev/null
+++ b/doc/src/images/buttonbox-maclayout-vertical.png
diff --git a/doc/src/images/buttonbox-winlayout-horizontal.png b/doc/src/images/buttonbox-winlayout-horizontal.png
new file mode 100644
index 0000000000..dd4ce1c313
--- /dev/null
+++ b/doc/src/images/buttonbox-winlayout-horizontal.png
diff --git a/doc/src/images/buttonbox-winlayout-vertical.png b/doc/src/images/buttonbox-winlayout-vertical.png
new file mode 100644
index 0000000000..539de1aa1a
--- /dev/null
+++ b/doc/src/images/buttonbox-winlayout-vertical.png
diff --git a/doc/src/images/cachedtable-example.png b/doc/src/images/cachedtable-example.png
new file mode 100644
index 0000000000..db770dfdf2
--- /dev/null
+++ b/doc/src/images/cachedtable-example.png
diff --git a/doc/src/images/calculator-example.png b/doc/src/images/calculator-example.png
new file mode 100644
index 0000000000..6f1158d733
--- /dev/null
+++ b/doc/src/images/calculator-example.png
diff --git a/doc/src/images/calculator-ugly.png b/doc/src/images/calculator-ugly.png
new file mode 100644
index 0000000000..cdfa902c4c
--- /dev/null
+++ b/doc/src/images/calculator-ugly.png
diff --git a/doc/src/images/calculatorbuilder-example.png b/doc/src/images/calculatorbuilder-example.png
new file mode 100644
index 0000000000..561e500058
--- /dev/null
+++ b/doc/src/images/calculatorbuilder-example.png
diff --git a/doc/src/images/calculatorform-example.png b/doc/src/images/calculatorform-example.png
new file mode 100644
index 0000000000..91432ac8be
--- /dev/null
+++ b/doc/src/images/calculatorform-example.png
diff --git a/doc/src/images/calendar-example.png b/doc/src/images/calendar-example.png
new file mode 100644
index 0000000000..895ce76b09
--- /dev/null
+++ b/doc/src/images/calendar-example.png
diff --git a/doc/src/images/calendarwidgetexample.png b/doc/src/images/calendarwidgetexample.png
new file mode 100644
index 0000000000..464be90999
--- /dev/null
+++ b/doc/src/images/calendarwidgetexample.png
diff --git a/doc/src/images/cannon-tutorial.png b/doc/src/images/cannon-tutorial.png
new file mode 100644
index 0000000000..73471534f0
--- /dev/null
+++ b/doc/src/images/cannon-tutorial.png
diff --git a/doc/src/images/capabilitiesexample.png b/doc/src/images/capabilitiesexample.png
new file mode 100644
index 0000000000..d760592638
--- /dev/null
+++ b/doc/src/images/capabilitiesexample.png
diff --git a/doc/src/images/cde-calendarwidget.png b/doc/src/images/cde-calendarwidget.png
new file mode 100644
index 0000000000..9615eaeab8
--- /dev/null
+++ b/doc/src/images/cde-calendarwidget.png
diff --git a/doc/src/images/cde-checkbox.png b/doc/src/images/cde-checkbox.png
new file mode 100644
index 0000000000..b2528dc5de
--- /dev/null
+++ b/doc/src/images/cde-checkbox.png
diff --git a/doc/src/images/cde-combobox.png b/doc/src/images/cde-combobox.png
new file mode 100644
index 0000000000..74586433eb
--- /dev/null
+++ b/doc/src/images/cde-combobox.png
diff --git a/doc/src/images/cde-dateedit.png b/doc/src/images/cde-dateedit.png
new file mode 100644
index 0000000000..ebb24d59cf
--- /dev/null
+++ b/doc/src/images/cde-dateedit.png
diff --git a/doc/src/images/cde-datetimeedit.png b/doc/src/images/cde-datetimeedit.png
new file mode 100644
index 0000000000..9ac659a3f3
--- /dev/null
+++ b/doc/src/images/cde-datetimeedit.png
diff --git a/doc/src/images/cde-dial.png b/doc/src/images/cde-dial.png
new file mode 100644
index 0000000000..956d19cb6c
--- /dev/null
+++ b/doc/src/images/cde-dial.png
diff --git a/doc/src/images/cde-doublespinbox.png b/doc/src/images/cde-doublespinbox.png
new file mode 100644
index 0000000000..30a9af66fa
--- /dev/null
+++ b/doc/src/images/cde-doublespinbox.png
diff --git a/doc/src/images/cde-fontcombobox.png b/doc/src/images/cde-fontcombobox.png
new file mode 100644
index 0000000000..043ca1d20f
--- /dev/null
+++ b/doc/src/images/cde-fontcombobox.png
diff --git a/doc/src/images/cde-frame.png b/doc/src/images/cde-frame.png
new file mode 100644
index 0000000000..221576e849
--- /dev/null
+++ b/doc/src/images/cde-frame.png
diff --git a/doc/src/images/cde-groupbox.png b/doc/src/images/cde-groupbox.png
new file mode 100644
index 0000000000..8bad69be4e
--- /dev/null
+++ b/doc/src/images/cde-groupbox.png
diff --git a/doc/src/images/cde-horizontalscrollbar.png b/doc/src/images/cde-horizontalscrollbar.png
new file mode 100644
index 0000000000..6e7cde8da1
--- /dev/null
+++ b/doc/src/images/cde-horizontalscrollbar.png
diff --git a/doc/src/images/cde-label.png b/doc/src/images/cde-label.png
new file mode 100644
index 0000000000..4e906eaa00
--- /dev/null
+++ b/doc/src/images/cde-label.png
diff --git a/doc/src/images/cde-lcdnumber.png b/doc/src/images/cde-lcdnumber.png
new file mode 100644
index 0000000000..97324c1a6c
--- /dev/null
+++ b/doc/src/images/cde-lcdnumber.png
diff --git a/doc/src/images/cde-lineedit.png b/doc/src/images/cde-lineedit.png
new file mode 100644
index 0000000000..6c1527ba19
--- /dev/null
+++ b/doc/src/images/cde-lineedit.png
diff --git a/doc/src/images/cde-listview.png b/doc/src/images/cde-listview.png
new file mode 100644
index 0000000000..2e58140880
--- /dev/null
+++ b/doc/src/images/cde-listview.png
diff --git a/doc/src/images/cde-progressbar.png b/doc/src/images/cde-progressbar.png
new file mode 100644
index 0000000000..41715deb48
--- /dev/null
+++ b/doc/src/images/cde-progressbar.png
diff --git a/doc/src/images/cde-pushbutton.png b/doc/src/images/cde-pushbutton.png
new file mode 100644
index 0000000000..2d9bdd25a4
--- /dev/null
+++ b/doc/src/images/cde-pushbutton.png
diff --git a/doc/src/images/cde-radiobutton.png b/doc/src/images/cde-radiobutton.png
new file mode 100644
index 0000000000..e053665f5a
--- /dev/null
+++ b/doc/src/images/cde-radiobutton.png
diff --git a/doc/src/images/cde-slider.png b/doc/src/images/cde-slider.png
new file mode 100644
index 0000000000..bd84371898
--- /dev/null
+++ b/doc/src/images/cde-slider.png
diff --git a/doc/src/images/cde-spinbox.png b/doc/src/images/cde-spinbox.png
new file mode 100644
index 0000000000..5f53c8e902
--- /dev/null
+++ b/doc/src/images/cde-spinbox.png
diff --git a/doc/src/images/cde-tableview.png b/doc/src/images/cde-tableview.png
new file mode 100644
index 0000000000..7a99217560
--- /dev/null
+++ b/doc/src/images/cde-tableview.png
diff --git a/doc/src/images/cde-tabwidget.png b/doc/src/images/cde-tabwidget.png
new file mode 100644
index 0000000000..8cf5473fc2
--- /dev/null
+++ b/doc/src/images/cde-tabwidget.png
diff --git a/doc/src/images/cde-textedit.png b/doc/src/images/cde-textedit.png
new file mode 100644
index 0000000000..c65b8da8f4
--- /dev/null
+++ b/doc/src/images/cde-textedit.png
diff --git a/doc/src/images/cde-timeedit.png b/doc/src/images/cde-timeedit.png
new file mode 100644
index 0000000000..6a5a4b953f
--- /dev/null
+++ b/doc/src/images/cde-timeedit.png
diff --git a/doc/src/images/cde-toolbox.png b/doc/src/images/cde-toolbox.png
new file mode 100644
index 0000000000..c0dd4e9400
--- /dev/null
+++ b/doc/src/images/cde-toolbox.png
diff --git a/doc/src/images/cde-toolbutton.png b/doc/src/images/cde-toolbutton.png
new file mode 100644
index 0000000000..baff25c25b
--- /dev/null
+++ b/doc/src/images/cde-toolbutton.png
diff --git a/doc/src/images/cde-treeview.png b/doc/src/images/cde-treeview.png
new file mode 100644
index 0000000000..df3184b31b
--- /dev/null
+++ b/doc/src/images/cde-treeview.png
diff --git a/doc/src/images/charactermap-example.png b/doc/src/images/charactermap-example.png
new file mode 100644
index 0000000000..c1f25a5b83
--- /dev/null
+++ b/doc/src/images/charactermap-example.png
diff --git a/doc/src/images/chart-example.png b/doc/src/images/chart-example.png
new file mode 100644
index 0000000000..98236663e5
--- /dev/null
+++ b/doc/src/images/chart-example.png
diff --git a/doc/src/images/chip-demo.png b/doc/src/images/chip-demo.png
new file mode 100644
index 0000000000..8889424023
--- /dev/null
+++ b/doc/src/images/chip-demo.png
diff --git a/doc/src/images/classwizard-flow.png b/doc/src/images/classwizard-flow.png
new file mode 100644
index 0000000000..ad9446c430
--- /dev/null
+++ b/doc/src/images/classwizard-flow.png
diff --git a/doc/src/images/classwizard.png b/doc/src/images/classwizard.png
new file mode 100644
index 0000000000..ea740bd213
--- /dev/null
+++ b/doc/src/images/classwizard.png
diff --git a/doc/src/images/cleanlooks-calendarwidget.png b/doc/src/images/cleanlooks-calendarwidget.png
new file mode 100644
index 0000000000..99c57b61ee
--- /dev/null
+++ b/doc/src/images/cleanlooks-calendarwidget.png
diff --git a/doc/src/images/cleanlooks-checkbox.png b/doc/src/images/cleanlooks-checkbox.png
new file mode 100644
index 0000000000..aaf2daae4e
--- /dev/null
+++ b/doc/src/images/cleanlooks-checkbox.png
diff --git a/doc/src/images/cleanlooks-combobox.png b/doc/src/images/cleanlooks-combobox.png
new file mode 100644
index 0000000000..5fff4c87f6
--- /dev/null
+++ b/doc/src/images/cleanlooks-combobox.png
diff --git a/doc/src/images/cleanlooks-dateedit.png b/doc/src/images/cleanlooks-dateedit.png
new file mode 100644
index 0000000000..384136a162
--- /dev/null
+++ b/doc/src/images/cleanlooks-dateedit.png
diff --git a/doc/src/images/cleanlooks-datetimeedit.png b/doc/src/images/cleanlooks-datetimeedit.png
new file mode 100644
index 0000000000..7a62cebfb4
--- /dev/null
+++ b/doc/src/images/cleanlooks-datetimeedit.png
diff --git a/doc/src/images/cleanlooks-dial.png b/doc/src/images/cleanlooks-dial.png
new file mode 100644
index 0000000000..259a0888b6
--- /dev/null
+++ b/doc/src/images/cleanlooks-dial.png
diff --git a/doc/src/images/cleanlooks-dialogbuttonbox.png b/doc/src/images/cleanlooks-dialogbuttonbox.png
new file mode 100644
index 0000000000..907dfda969
--- /dev/null
+++ b/doc/src/images/cleanlooks-dialogbuttonbox.png
diff --git a/doc/src/images/cleanlooks-doublespinbox.png b/doc/src/images/cleanlooks-doublespinbox.png
new file mode 100644
index 0000000000..93b11f919a
--- /dev/null
+++ b/doc/src/images/cleanlooks-doublespinbox.png
diff --git a/doc/src/images/cleanlooks-fontcombobox.png b/doc/src/images/cleanlooks-fontcombobox.png
new file mode 100644
index 0000000000..47a5907f56
--- /dev/null
+++ b/doc/src/images/cleanlooks-fontcombobox.png
diff --git a/doc/src/images/cleanlooks-frame.png b/doc/src/images/cleanlooks-frame.png
new file mode 100644
index 0000000000..2427b08d8f
--- /dev/null
+++ b/doc/src/images/cleanlooks-frame.png
diff --git a/doc/src/images/cleanlooks-groupbox.png b/doc/src/images/cleanlooks-groupbox.png
new file mode 100644
index 0000000000..89c6eb2f39
--- /dev/null
+++ b/doc/src/images/cleanlooks-groupbox.png
diff --git a/doc/src/images/cleanlooks-horizontalscrollbar.png b/doc/src/images/cleanlooks-horizontalscrollbar.png
new file mode 100644
index 0000000000..ca1c806c91
--- /dev/null
+++ b/doc/src/images/cleanlooks-horizontalscrollbar.png
diff --git a/doc/src/images/cleanlooks-label.png b/doc/src/images/cleanlooks-label.png
new file mode 100644
index 0000000000..199758fd69
--- /dev/null
+++ b/doc/src/images/cleanlooks-label.png
diff --git a/doc/src/images/cleanlooks-lcdnumber.png b/doc/src/images/cleanlooks-lcdnumber.png
new file mode 100644
index 0000000000..c6e34127cf
--- /dev/null
+++ b/doc/src/images/cleanlooks-lcdnumber.png
diff --git a/doc/src/images/cleanlooks-lineedit.png b/doc/src/images/cleanlooks-lineedit.png
new file mode 100644
index 0000000000..3e9f1a4be3
--- /dev/null
+++ b/doc/src/images/cleanlooks-lineedit.png
diff --git a/doc/src/images/cleanlooks-listview.png b/doc/src/images/cleanlooks-listview.png
new file mode 100644
index 0000000000..95f836c66b
--- /dev/null
+++ b/doc/src/images/cleanlooks-listview.png
diff --git a/doc/src/images/cleanlooks-progressbar.png b/doc/src/images/cleanlooks-progressbar.png
new file mode 100644
index 0000000000..53fc6c1faa
--- /dev/null
+++ b/doc/src/images/cleanlooks-progressbar.png
diff --git a/doc/src/images/cleanlooks-pushbutton-menu.png b/doc/src/images/cleanlooks-pushbutton-menu.png
new file mode 100644
index 0000000000..0d5cb59ec0
--- /dev/null
+++ b/doc/src/images/cleanlooks-pushbutton-menu.png
diff --git a/doc/src/images/cleanlooks-pushbutton.png b/doc/src/images/cleanlooks-pushbutton.png
new file mode 100644
index 0000000000..7b3b3357c1
--- /dev/null
+++ b/doc/src/images/cleanlooks-pushbutton.png
diff --git a/doc/src/images/cleanlooks-radiobutton.png b/doc/src/images/cleanlooks-radiobutton.png
new file mode 100644
index 0000000000..4e077688c2
--- /dev/null
+++ b/doc/src/images/cleanlooks-radiobutton.png
diff --git a/doc/src/images/cleanlooks-slider.png b/doc/src/images/cleanlooks-slider.png
new file mode 100644
index 0000000000..8dfaa01092
--- /dev/null
+++ b/doc/src/images/cleanlooks-slider.png
diff --git a/doc/src/images/cleanlooks-spinbox.png b/doc/src/images/cleanlooks-spinbox.png
new file mode 100644
index 0000000000..ad5b5a01b6
--- /dev/null
+++ b/doc/src/images/cleanlooks-spinbox.png
diff --git a/doc/src/images/cleanlooks-tableview.png b/doc/src/images/cleanlooks-tableview.png
new file mode 100644
index 0000000000..d89fecc5ad
--- /dev/null
+++ b/doc/src/images/cleanlooks-tableview.png
diff --git a/doc/src/images/cleanlooks-tabwidget.png b/doc/src/images/cleanlooks-tabwidget.png
new file mode 100644
index 0000000000..bcff2967aa
--- /dev/null
+++ b/doc/src/images/cleanlooks-tabwidget.png
diff --git a/doc/src/images/cleanlooks-textedit.png b/doc/src/images/cleanlooks-textedit.png
new file mode 100644
index 0000000000..0c825a1e04
--- /dev/null
+++ b/doc/src/images/cleanlooks-textedit.png
diff --git a/doc/src/images/cleanlooks-timeedit.png b/doc/src/images/cleanlooks-timeedit.png
new file mode 100644
index 0000000000..00420a2f18
--- /dev/null
+++ b/doc/src/images/cleanlooks-timeedit.png
diff --git a/doc/src/images/cleanlooks-toolbox.png b/doc/src/images/cleanlooks-toolbox.png
new file mode 100644
index 0000000000..63366e5422
--- /dev/null
+++ b/doc/src/images/cleanlooks-toolbox.png
diff --git a/doc/src/images/cleanlooks-toolbutton.png b/doc/src/images/cleanlooks-toolbutton.png
new file mode 100644
index 0000000000..bcf86ea26f
--- /dev/null
+++ b/doc/src/images/cleanlooks-toolbutton.png
diff --git a/doc/src/images/cleanlooks-treeview.png b/doc/src/images/cleanlooks-treeview.png
new file mode 100644
index 0000000000..5bc4a06a3c
--- /dev/null
+++ b/doc/src/images/cleanlooks-treeview.png
diff --git a/doc/src/images/codecs-example.png b/doc/src/images/codecs-example.png
new file mode 100644
index 0000000000..8e7ae95317
--- /dev/null
+++ b/doc/src/images/codecs-example.png
diff --git a/doc/src/images/codeeditor-example.png b/doc/src/images/codeeditor-example.png
new file mode 100644
index 0000000000..b17640695d
--- /dev/null
+++ b/doc/src/images/codeeditor-example.png
diff --git a/doc/src/images/collidingmice-example.png b/doc/src/images/collidingmice-example.png
new file mode 100644
index 0000000000..41561de394
--- /dev/null
+++ b/doc/src/images/collidingmice-example.png
diff --git a/doc/src/images/coloreditorfactoryimage.png b/doc/src/images/coloreditorfactoryimage.png
new file mode 100644
index 0000000000..cd839a6db6
--- /dev/null
+++ b/doc/src/images/coloreditorfactoryimage.png
diff --git a/doc/src/images/combo-widget-mapper.png b/doc/src/images/combo-widget-mapper.png
new file mode 100644
index 0000000000..910d6ed6db
--- /dev/null
+++ b/doc/src/images/combo-widget-mapper.png
diff --git a/doc/src/images/completer-example-country.png b/doc/src/images/completer-example-country.png
new file mode 100644
index 0000000000..fa7c8a9938
--- /dev/null
+++ b/doc/src/images/completer-example-country.png
diff --git a/doc/src/images/completer-example-dirmodel.png b/doc/src/images/completer-example-dirmodel.png
new file mode 100644
index 0000000000..94b75b0795
--- /dev/null
+++ b/doc/src/images/completer-example-dirmodel.png
diff --git a/doc/src/images/completer-example-qdirmodel.png b/doc/src/images/completer-example-qdirmodel.png
new file mode 100644
index 0000000000..904c198792
--- /dev/null
+++ b/doc/src/images/completer-example-qdirmodel.png
diff --git a/doc/src/images/completer-example-word.png b/doc/src/images/completer-example-word.png
new file mode 100644
index 0000000000..aa3fb9c333
--- /dev/null
+++ b/doc/src/images/completer-example-word.png
diff --git a/doc/src/images/completer-example.png b/doc/src/images/completer-example.png
new file mode 100644
index 0000000000..dcaa253bd8
--- /dev/null
+++ b/doc/src/images/completer-example.png
diff --git a/doc/src/images/complexwizard-detailspage.png b/doc/src/images/complexwizard-detailspage.png
new file mode 100644
index 0000000000..58eeae4cea
--- /dev/null
+++ b/doc/src/images/complexwizard-detailspage.png
diff --git a/doc/src/images/complexwizard-evaluatepage.png b/doc/src/images/complexwizard-evaluatepage.png
new file mode 100644
index 0000000000..23f200efc0
--- /dev/null
+++ b/doc/src/images/complexwizard-evaluatepage.png
diff --git a/doc/src/images/complexwizard-finishpage.png b/doc/src/images/complexwizard-finishpage.png
new file mode 100644
index 0000000000..60703a0b75
--- /dev/null
+++ b/doc/src/images/complexwizard-finishpage.png
diff --git a/doc/src/images/complexwizard-flow.png b/doc/src/images/complexwizard-flow.png
new file mode 100644
index 0000000000..c74b0eed1e
--- /dev/null
+++ b/doc/src/images/complexwizard-flow.png
diff --git a/doc/src/images/complexwizard-registerpage.png b/doc/src/images/complexwizard-registerpage.png
new file mode 100644
index 0000000000..18a359c34f
--- /dev/null
+++ b/doc/src/images/complexwizard-registerpage.png
diff --git a/doc/src/images/complexwizard-titlepage.png b/doc/src/images/complexwizard-titlepage.png
new file mode 100644
index 0000000000..29acbbc396
--- /dev/null
+++ b/doc/src/images/complexwizard-titlepage.png
diff --git a/doc/src/images/complexwizard.png b/doc/src/images/complexwizard.png
new file mode 100644
index 0000000000..d08942ef15
--- /dev/null
+++ b/doc/src/images/complexwizard.png
diff --git a/doc/src/images/composition-demo.png b/doc/src/images/composition-demo.png
new file mode 100644
index 0000000000..942bc58c29
--- /dev/null
+++ b/doc/src/images/composition-demo.png
diff --git a/doc/src/images/concentriccircles-example.png b/doc/src/images/concentriccircles-example.png
new file mode 100644
index 0000000000..fd308b5642
--- /dev/null
+++ b/doc/src/images/concentriccircles-example.png
diff --git a/doc/src/images/conceptaudio.png b/doc/src/images/conceptaudio.png
new file mode 100644
index 0000000000..b4eabad29b
--- /dev/null
+++ b/doc/src/images/conceptaudio.png
diff --git a/doc/src/images/conceptprocessor.png b/doc/src/images/conceptprocessor.png
new file mode 100644
index 0000000000..2b76df3112
--- /dev/null
+++ b/doc/src/images/conceptprocessor.png
@@ -0,0 +1 @@
+This is a temporary placeholder.
diff --git a/doc/src/images/conceptvideo.png b/doc/src/images/conceptvideo.png
new file mode 100644
index 0000000000..1777b21551
--- /dev/null
+++ b/doc/src/images/conceptvideo.png
diff --git a/doc/src/images/configdialog-example.png b/doc/src/images/configdialog-example.png
new file mode 100644
index 0000000000..20d917b085
--- /dev/null
+++ b/doc/src/images/configdialog-example.png
diff --git a/doc/src/images/conicalGradient.png b/doc/src/images/conicalGradient.png
new file mode 100644
index 0000000000..013f6effef
--- /dev/null
+++ b/doc/src/images/conicalGradient.png
diff --git a/doc/src/images/containerextension-example.png b/doc/src/images/containerextension-example.png
new file mode 100644
index 0000000000..2427f91010
--- /dev/null
+++ b/doc/src/images/containerextension-example.png
diff --git a/doc/src/images/context2d-example-smileysmile.png b/doc/src/images/context2d-example-smileysmile.png
new file mode 100644
index 0000000000..369f32eaa1
--- /dev/null
+++ b/doc/src/images/context2d-example-smileysmile.png
diff --git a/doc/src/images/context2d-example.png b/doc/src/images/context2d-example.png
new file mode 100644
index 0000000000..0c12754563
--- /dev/null
+++ b/doc/src/images/context2d-example.png
diff --git a/doc/src/images/coordinatesystem-analogclock.png b/doc/src/images/coordinatesystem-analogclock.png
new file mode 100644
index 0000000000..16e3091b77
--- /dev/null
+++ b/doc/src/images/coordinatesystem-analogclock.png
diff --git a/doc/src/images/coordinatesystem-line-antialias.png b/doc/src/images/coordinatesystem-line-antialias.png
new file mode 100644
index 0000000000..90dfa8730e
--- /dev/null
+++ b/doc/src/images/coordinatesystem-line-antialias.png
diff --git a/doc/src/images/coordinatesystem-line-raster.png b/doc/src/images/coordinatesystem-line-raster.png
new file mode 100644
index 0000000000..65201bde9f
--- /dev/null
+++ b/doc/src/images/coordinatesystem-line-raster.png
diff --git a/doc/src/images/coordinatesystem-line.png b/doc/src/images/coordinatesystem-line.png
new file mode 100644
index 0000000000..fbf6873084
--- /dev/null
+++ b/doc/src/images/coordinatesystem-line.png
diff --git a/doc/src/images/coordinatesystem-rect-antialias.png b/doc/src/images/coordinatesystem-rect-antialias.png
new file mode 100644
index 0000000000..162e1df9cb
--- /dev/null
+++ b/doc/src/images/coordinatesystem-rect-antialias.png
diff --git a/doc/src/images/coordinatesystem-rect-raster.png b/doc/src/images/coordinatesystem-rect-raster.png
new file mode 100644
index 0000000000..be3690d6ad
--- /dev/null
+++ b/doc/src/images/coordinatesystem-rect-raster.png
diff --git a/doc/src/images/coordinatesystem-rect.png b/doc/src/images/coordinatesystem-rect.png
new file mode 100644
index 0000000000..76c06befd6
--- /dev/null
+++ b/doc/src/images/coordinatesystem-rect.png
diff --git a/doc/src/images/coordinatesystem-transformations.png b/doc/src/images/coordinatesystem-transformations.png
new file mode 100644
index 0000000000..2736213c07
--- /dev/null
+++ b/doc/src/images/coordinatesystem-transformations.png
diff --git a/doc/src/images/coordsys.png b/doc/src/images/coordsys.png
new file mode 100644
index 0000000000..181f2f625b
--- /dev/null
+++ b/doc/src/images/coordsys.png
diff --git a/doc/src/images/cursor-arrow.png b/doc/src/images/cursor-arrow.png
new file mode 100644
index 0000000000..a69ef4eb61
--- /dev/null
+++ b/doc/src/images/cursor-arrow.png
diff --git a/doc/src/images/cursor-busy.png b/doc/src/images/cursor-busy.png
new file mode 100644
index 0000000000..53717e4992
--- /dev/null
+++ b/doc/src/images/cursor-busy.png
diff --git a/doc/src/images/cursor-closedhand.png b/doc/src/images/cursor-closedhand.png
new file mode 100644
index 0000000000..b78dd1dac5
--- /dev/null
+++ b/doc/src/images/cursor-closedhand.png
diff --git a/doc/src/images/cursor-cross.png b/doc/src/images/cursor-cross.png
new file mode 100644
index 0000000000..fe38e74480
--- /dev/null
+++ b/doc/src/images/cursor-cross.png
diff --git a/doc/src/images/cursor-forbidden.png b/doc/src/images/cursor-forbidden.png
new file mode 100644
index 0000000000..2b08c4e2a3
--- /dev/null
+++ b/doc/src/images/cursor-forbidden.png
diff --git a/doc/src/images/cursor-hand.png b/doc/src/images/cursor-hand.png
new file mode 100644
index 0000000000..d2004aefa7
--- /dev/null
+++ b/doc/src/images/cursor-hand.png
diff --git a/doc/src/images/cursor-hsplit.png b/doc/src/images/cursor-hsplit.png
new file mode 100644
index 0000000000..1beda2570e
--- /dev/null
+++ b/doc/src/images/cursor-hsplit.png
diff --git a/doc/src/images/cursor-ibeam.png b/doc/src/images/cursor-ibeam.png
new file mode 100644
index 0000000000..097fc5fa72
--- /dev/null
+++ b/doc/src/images/cursor-ibeam.png
diff --git a/doc/src/images/cursor-openhand.png b/doc/src/images/cursor-openhand.png
new file mode 100644
index 0000000000..9181c859ed
--- /dev/null
+++ b/doc/src/images/cursor-openhand.png
diff --git a/doc/src/images/cursor-sizeall.png b/doc/src/images/cursor-sizeall.png
new file mode 100644
index 0000000000..69f13eb347
--- /dev/null
+++ b/doc/src/images/cursor-sizeall.png
diff --git a/doc/src/images/cursor-sizeb.png b/doc/src/images/cursor-sizeb.png
new file mode 100644
index 0000000000..f37d7b91e8
--- /dev/null
+++ b/doc/src/images/cursor-sizeb.png
diff --git a/doc/src/images/cursor-sizef.png b/doc/src/images/cursor-sizef.png
new file mode 100644
index 0000000000..3b127a05d3
--- /dev/null
+++ b/doc/src/images/cursor-sizef.png
diff --git a/doc/src/images/cursor-sizeh.png b/doc/src/images/cursor-sizeh.png
new file mode 100644
index 0000000000..a9f40cbc3d
--- /dev/null
+++ b/doc/src/images/cursor-sizeh.png
diff --git a/doc/src/images/cursor-sizev.png b/doc/src/images/cursor-sizev.png
new file mode 100644
index 0000000000..1edbab27a5
--- /dev/null
+++ b/doc/src/images/cursor-sizev.png
diff --git a/doc/src/images/cursor-uparrow.png b/doc/src/images/cursor-uparrow.png
new file mode 100644
index 0000000000..d3e70ef4c2
--- /dev/null
+++ b/doc/src/images/cursor-uparrow.png
diff --git a/doc/src/images/cursor-vsplit.png b/doc/src/images/cursor-vsplit.png
new file mode 100644
index 0000000000..a5667e3ffb
--- /dev/null
+++ b/doc/src/images/cursor-vsplit.png
diff --git a/doc/src/images/cursor-wait.png b/doc/src/images/cursor-wait.png
new file mode 100644
index 0000000000..69056c479e
--- /dev/null
+++ b/doc/src/images/cursor-wait.png
diff --git a/doc/src/images/cursor-whatsthis.png b/doc/src/images/cursor-whatsthis.png
new file mode 100644
index 0000000000..b47601c378
--- /dev/null
+++ b/doc/src/images/cursor-whatsthis.png
diff --git a/doc/src/images/customcompleter-example.png b/doc/src/images/customcompleter-example.png
new file mode 100644
index 0000000000..a525208118
--- /dev/null
+++ b/doc/src/images/customcompleter-example.png
diff --git a/doc/src/images/customcompleter-insertcompletion.png b/doc/src/images/customcompleter-insertcompletion.png
new file mode 100644
index 0000000000..0bb2c25c39
--- /dev/null
+++ b/doc/src/images/customcompleter-insertcompletion.png
diff --git a/doc/src/images/customsortfiltermodel-example.png b/doc/src/images/customsortfiltermodel-example.png
new file mode 100644
index 0000000000..d7ee8bd7e7
--- /dev/null
+++ b/doc/src/images/customsortfiltermodel-example.png
diff --git a/doc/src/images/customtypesending-example.png b/doc/src/images/customtypesending-example.png
new file mode 100644
index 0000000000..fbc395388e
--- /dev/null
+++ b/doc/src/images/customtypesending-example.png
diff --git a/doc/src/images/customwidgetplugin-example.png b/doc/src/images/customwidgetplugin-example.png
new file mode 100644
index 0000000000..87fde81a34
--- /dev/null
+++ b/doc/src/images/customwidgetplugin-example.png
diff --git a/doc/src/images/datetimewidgets.png b/doc/src/images/datetimewidgets.png
new file mode 100644
index 0000000000..c2d498c763
--- /dev/null
+++ b/doc/src/images/datetimewidgets.png
diff --git a/doc/src/images/dbus-chat-example.png b/doc/src/images/dbus-chat-example.png
new file mode 100644
index 0000000000..ad66d08950
--- /dev/null
+++ b/doc/src/images/dbus-chat-example.png
diff --git a/doc/src/images/defaultprototypes-example.png b/doc/src/images/defaultprototypes-example.png
new file mode 100644
index 0000000000..72fe3c4012
--- /dev/null
+++ b/doc/src/images/defaultprototypes-example.png
diff --git a/doc/src/images/deform-demo.png b/doc/src/images/deform-demo.png
new file mode 100644
index 0000000000..2f037f08a4
--- /dev/null
+++ b/doc/src/images/deform-demo.png
diff --git a/doc/src/images/delayedecoding-example.png b/doc/src/images/delayedecoding-example.png
new file mode 100644
index 0000000000..1cafba6959
--- /dev/null
+++ b/doc/src/images/delayedecoding-example.png
diff --git a/doc/src/images/deployment-mac-application.png b/doc/src/images/deployment-mac-application.png
new file mode 100644
index 0000000000..99ad23f60a
--- /dev/null
+++ b/doc/src/images/deployment-mac-application.png
diff --git a/doc/src/images/deployment-mac-bundlestructure.png b/doc/src/images/deployment-mac-bundlestructure.png
new file mode 100644
index 0000000000..db7a298aed
--- /dev/null
+++ b/doc/src/images/deployment-mac-bundlestructure.png
diff --git a/doc/src/images/deployment-windows-depends.png b/doc/src/images/deployment-windows-depends.png
new file mode 100644
index 0000000000..56c843932b
--- /dev/null
+++ b/doc/src/images/deployment-windows-depends.png
diff --git a/doc/src/images/designer-action-editor.png b/doc/src/images/designer-action-editor.png
new file mode 100644
index 0000000000..7d17573b5b
--- /dev/null
+++ b/doc/src/images/designer-action-editor.png
diff --git a/doc/src/images/designer-add-custom-toolbar.png b/doc/src/images/designer-add-custom-toolbar.png
new file mode 100644
index 0000000000..fe165869da
--- /dev/null
+++ b/doc/src/images/designer-add-custom-toolbar.png
diff --git a/doc/src/images/designer-add-files-button.png b/doc/src/images/designer-add-files-button.png
new file mode 100644
index 0000000000..45ff4a0400
--- /dev/null
+++ b/doc/src/images/designer-add-files-button.png
diff --git a/doc/src/images/designer-add-resource-entry-button.png b/doc/src/images/designer-add-resource-entry-button.png
new file mode 100644
index 0000000000..e29fcf8038
--- /dev/null
+++ b/doc/src/images/designer-add-resource-entry-button.png
diff --git a/doc/src/images/designer-adding-dockwidget.png b/doc/src/images/designer-adding-dockwidget.png
new file mode 100644
index 0000000000..87b0fb89dd
--- /dev/null
+++ b/doc/src/images/designer-adding-dockwidget.png
diff --git a/doc/src/images/designer-adding-dynamic-property.png b/doc/src/images/designer-adding-dynamic-property.png
new file mode 100644
index 0000000000..a92320e58b
--- /dev/null
+++ b/doc/src/images/designer-adding-dynamic-property.png
diff --git a/doc/src/images/designer-adding-menu-action.png b/doc/src/images/designer-adding-menu-action.png
new file mode 100644
index 0000000000..cf2a9c9081
--- /dev/null
+++ b/doc/src/images/designer-adding-menu-action.png
diff --git a/doc/src/images/designer-adding-toolbar-action.png b/doc/src/images/designer-adding-toolbar-action.png
new file mode 100644
index 0000000000..e2201cb265
--- /dev/null
+++ b/doc/src/images/designer-adding-toolbar-action.png
diff --git a/doc/src/images/designer-buddy-making.png b/doc/src/images/designer-buddy-making.png
new file mode 100644
index 0000000000..3d8e8a113d
--- /dev/null
+++ b/doc/src/images/designer-buddy-making.png
diff --git a/doc/src/images/designer-buddy-mode.png b/doc/src/images/designer-buddy-mode.png
new file mode 100644
index 0000000000..48197f698e
--- /dev/null
+++ b/doc/src/images/designer-buddy-mode.png
diff --git a/doc/src/images/designer-buddy-tool.png b/doc/src/images/designer-buddy-tool.png
new file mode 100644
index 0000000000..2a4287089b
--- /dev/null
+++ b/doc/src/images/designer-buddy-tool.png
diff --git a/doc/src/images/designer-choosing-form.png b/doc/src/images/designer-choosing-form.png
new file mode 100644
index 0000000000..fa6e470b23
--- /dev/null
+++ b/doc/src/images/designer-choosing-form.png
diff --git a/doc/src/images/designer-code-viewer.png b/doc/src/images/designer-code-viewer.png
new file mode 100644
index 0000000000..c9d852882d
--- /dev/null
+++ b/doc/src/images/designer-code-viewer.png
diff --git a/doc/src/images/designer-connection-dialog.png b/doc/src/images/designer-connection-dialog.png
new file mode 100644
index 0000000000..28dfeaecf9
--- /dev/null
+++ b/doc/src/images/designer-connection-dialog.png
diff --git a/doc/src/images/designer-connection-editing.png b/doc/src/images/designer-connection-editing.png
new file mode 100644
index 0000000000..90b6a3a3f8
--- /dev/null
+++ b/doc/src/images/designer-connection-editing.png
diff --git a/doc/src/images/designer-connection-editor.png b/doc/src/images/designer-connection-editor.png
new file mode 100644
index 0000000000..fd4d17de18
--- /dev/null
+++ b/doc/src/images/designer-connection-editor.png
diff --git a/doc/src/images/designer-connection-highlight.png b/doc/src/images/designer-connection-highlight.png
new file mode 100644
index 0000000000..089d1e422b
--- /dev/null
+++ b/doc/src/images/designer-connection-highlight.png
diff --git a/doc/src/images/designer-connection-making.png b/doc/src/images/designer-connection-making.png
new file mode 100644
index 0000000000..a7ce33fe2a
--- /dev/null
+++ b/doc/src/images/designer-connection-making.png
diff --git a/doc/src/images/designer-connection-mode.png b/doc/src/images/designer-connection-mode.png
new file mode 100644
index 0000000000..8b98f9f539
--- /dev/null
+++ b/doc/src/images/designer-connection-mode.png
diff --git a/doc/src/images/designer-connection-to-form.png b/doc/src/images/designer-connection-to-form.png
new file mode 100644
index 0000000000..320f70ff47
--- /dev/null
+++ b/doc/src/images/designer-connection-to-form.png
diff --git a/doc/src/images/designer-connection-tool.png b/doc/src/images/designer-connection-tool.png
new file mode 100644
index 0000000000..71c9b07a8d
--- /dev/null
+++ b/doc/src/images/designer-connection-tool.png
diff --git a/doc/src/images/designer-containers-dockwidget.png b/doc/src/images/designer-containers-dockwidget.png
new file mode 100644
index 0000000000..f4dcc0b7f0
--- /dev/null
+++ b/doc/src/images/designer-containers-dockwidget.png
diff --git a/doc/src/images/designer-containers-frame.png b/doc/src/images/designer-containers-frame.png
new file mode 100644
index 0000000000..d16823a4b5
--- /dev/null
+++ b/doc/src/images/designer-containers-frame.png
diff --git a/doc/src/images/designer-containers-groupbox.png b/doc/src/images/designer-containers-groupbox.png
new file mode 100644
index 0000000000..d347e2f47e
--- /dev/null
+++ b/doc/src/images/designer-containers-groupbox.png
diff --git a/doc/src/images/designer-containers-stackedwidget.png b/doc/src/images/designer-containers-stackedwidget.png
new file mode 100644
index 0000000000..3239e52916
--- /dev/null
+++ b/doc/src/images/designer-containers-stackedwidget.png
diff --git a/doc/src/images/designer-containers-tabwidget.png b/doc/src/images/designer-containers-tabwidget.png
new file mode 100644
index 0000000000..dab3dfdb63
--- /dev/null
+++ b/doc/src/images/designer-containers-tabwidget.png
diff --git a/doc/src/images/designer-containers-toolbox.png b/doc/src/images/designer-containers-toolbox.png
new file mode 100644
index 0000000000..e51fad6fb0
--- /dev/null
+++ b/doc/src/images/designer-containers-toolbox.png
diff --git a/doc/src/images/designer-creating-dynamic-property.png b/doc/src/images/designer-creating-dynamic-property.png
new file mode 100644
index 0000000000..0d4f838f05
--- /dev/null
+++ b/doc/src/images/designer-creating-dynamic-property.png
diff --git a/doc/src/images/designer-creating-menu-entry1.png b/doc/src/images/designer-creating-menu-entry1.png
new file mode 100644
index 0000000000..1fcac2213a
--- /dev/null
+++ b/doc/src/images/designer-creating-menu-entry1.png
diff --git a/doc/src/images/designer-creating-menu-entry2.png b/doc/src/images/designer-creating-menu-entry2.png
new file mode 100644
index 0000000000..e7a537cad6
--- /dev/null
+++ b/doc/src/images/designer-creating-menu-entry2.png
diff --git a/doc/src/images/designer-creating-menu-entry3.png b/doc/src/images/designer-creating-menu-entry3.png
new file mode 100644
index 0000000000..f50a4484aa
--- /dev/null
+++ b/doc/src/images/designer-creating-menu-entry3.png
diff --git a/doc/src/images/designer-creating-menu-entry4.png b/doc/src/images/designer-creating-menu-entry4.png
new file mode 100644
index 0000000000..aea6639d04
--- /dev/null
+++ b/doc/src/images/designer-creating-menu-entry4.png
diff --git a/doc/src/images/designer-creating-menu.png b/doc/src/images/designer-creating-menu.png
new file mode 100644
index 0000000000..5268aac6be
--- /dev/null
+++ b/doc/src/images/designer-creating-menu.png
diff --git a/doc/src/images/designer-creating-menu1.png b/doc/src/images/designer-creating-menu1.png
new file mode 100644
index 0000000000..ee2732a8ba
--- /dev/null
+++ b/doc/src/images/designer-creating-menu1.png
diff --git a/doc/src/images/designer-creating-menu2.png b/doc/src/images/designer-creating-menu2.png
new file mode 100644
index 0000000000..95808d55c5
--- /dev/null
+++ b/doc/src/images/designer-creating-menu2.png
diff --git a/doc/src/images/designer-creating-menu3.png b/doc/src/images/designer-creating-menu3.png
new file mode 100644
index 0000000000..b9d80c026b
--- /dev/null
+++ b/doc/src/images/designer-creating-menu3.png
diff --git a/doc/src/images/designer-creating-menu4.png b/doc/src/images/designer-creating-menu4.png
new file mode 100644
index 0000000000..e05c931d02
--- /dev/null
+++ b/doc/src/images/designer-creating-menu4.png
diff --git a/doc/src/images/designer-creating-menubar.png b/doc/src/images/designer-creating-menubar.png
new file mode 100644
index 0000000000..87606f73b1
--- /dev/null
+++ b/doc/src/images/designer-creating-menubar.png
diff --git a/doc/src/images/designer-custom-widget-box.png b/doc/src/images/designer-custom-widget-box.png
new file mode 100644
index 0000000000..f3b9c1a28d
--- /dev/null
+++ b/doc/src/images/designer-custom-widget-box.png
diff --git a/doc/src/images/designer-customize-toolbar.png b/doc/src/images/designer-customize-toolbar.png
new file mode 100644
index 0000000000..3fad02192b
--- /dev/null
+++ b/doc/src/images/designer-customize-toolbar.png
diff --git a/doc/src/images/designer-dialog-final.png b/doc/src/images/designer-dialog-final.png
new file mode 100644
index 0000000000..0a75670009
--- /dev/null
+++ b/doc/src/images/designer-dialog-final.png
diff --git a/doc/src/images/designer-dialog-initial.png b/doc/src/images/designer-dialog-initial.png
new file mode 100644
index 0000000000..a2ebbf0799
--- /dev/null
+++ b/doc/src/images/designer-dialog-initial.png
diff --git a/doc/src/images/designer-dialog-layout.png b/doc/src/images/designer-dialog-layout.png
new file mode 100644
index 0000000000..bae945d451
--- /dev/null
+++ b/doc/src/images/designer-dialog-layout.png
diff --git a/doc/src/images/designer-dialog-preview.png b/doc/src/images/designer-dialog-preview.png
new file mode 100644
index 0000000000..1059aeaad4
--- /dev/null
+++ b/doc/src/images/designer-dialog-preview.png
diff --git a/doc/src/images/designer-disambiguation.png b/doc/src/images/designer-disambiguation.png
new file mode 100644
index 0000000000..364e70de53
--- /dev/null
+++ b/doc/src/images/designer-disambiguation.png
diff --git a/doc/src/images/designer-dragging-onto-form.png b/doc/src/images/designer-dragging-onto-form.png
new file mode 100644
index 0000000000..07b4393a4f
--- /dev/null
+++ b/doc/src/images/designer-dragging-onto-form.png
diff --git a/doc/src/images/designer-edit-resource.png b/doc/src/images/designer-edit-resource.png
new file mode 100644
index 0000000000..390087c84e
--- /dev/null
+++ b/doc/src/images/designer-edit-resource.png
diff --git a/doc/src/images/designer-edit-resources-button.png b/doc/src/images/designer-edit-resources-button.png
new file mode 100644
index 0000000000..1697836ed0
--- /dev/null
+++ b/doc/src/images/designer-edit-resources-button.png
diff --git a/doc/src/images/designer-editing-mode.png b/doc/src/images/designer-editing-mode.png
new file mode 100644
index 0000000000..cd1c802c1c
--- /dev/null
+++ b/doc/src/images/designer-editing-mode.png
diff --git a/doc/src/images/designer-embedded-preview.png b/doc/src/images/designer-embedded-preview.png
new file mode 100644
index 0000000000..afa6fafc42
--- /dev/null
+++ b/doc/src/images/designer-embedded-preview.png
diff --git a/doc/src/images/designer-english-dialog.png b/doc/src/images/designer-english-dialog.png
new file mode 100644
index 0000000000..591d9711c0
--- /dev/null
+++ b/doc/src/images/designer-english-dialog.png
diff --git a/doc/src/images/designer-examples.png b/doc/src/images/designer-examples.png
new file mode 100644
index 0000000000..36e54f9e1a
--- /dev/null
+++ b/doc/src/images/designer-examples.png
diff --git a/doc/src/images/designer-file-menu.png b/doc/src/images/designer-file-menu.png
new file mode 100644
index 0000000000..ae65f04e62
--- /dev/null
+++ b/doc/src/images/designer-file-menu.png
diff --git a/doc/src/images/designer-find-icon.png b/doc/src/images/designer-find-icon.png
new file mode 100644
index 0000000000..aa84bada04
--- /dev/null
+++ b/doc/src/images/designer-find-icon.png
diff --git a/doc/src/images/designer-form-layout-cleanlooks.png b/doc/src/images/designer-form-layout-cleanlooks.png
new file mode 100644
index 0000000000..13d5674142
--- /dev/null
+++ b/doc/src/images/designer-form-layout-cleanlooks.png
diff --git a/doc/src/images/designer-form-layout-macintosh.png b/doc/src/images/designer-form-layout-macintosh.png
new file mode 100644
index 0000000000..ead3069894
--- /dev/null
+++ b/doc/src/images/designer-form-layout-macintosh.png
diff --git a/doc/src/images/designer-form-layout-windowsXP.png b/doc/src/images/designer-form-layout-windowsXP.png
new file mode 100644
index 0000000000..8389986b04
--- /dev/null
+++ b/doc/src/images/designer-form-layout-windowsXP.png
diff --git a/doc/src/images/designer-form-layout.png b/doc/src/images/designer-form-layout.png
new file mode 100644
index 0000000000..3fb5747cf1
--- /dev/null
+++ b/doc/src/images/designer-form-layout.png
diff --git a/doc/src/images/designer-form-layoutfunction.png b/doc/src/images/designer-form-layoutfunction.png
new file mode 100644
index 0000000000..0c25605149
--- /dev/null
+++ b/doc/src/images/designer-form-layoutfunction.png
diff --git a/doc/src/images/designer-form-settings.png b/doc/src/images/designer-form-settings.png
new file mode 100644
index 0000000000..522a978b28
--- /dev/null
+++ b/doc/src/images/designer-form-settings.png
diff --git a/doc/src/images/designer-form-viewcode.png b/doc/src/images/designer-form-viewcode.png
new file mode 100644
index 0000000000..d79feddcc7
--- /dev/null
+++ b/doc/src/images/designer-form-viewcode.png
diff --git a/doc/src/images/designer-french-dialog.png b/doc/src/images/designer-french-dialog.png
new file mode 100644
index 0000000000..f76a6e9603
--- /dev/null
+++ b/doc/src/images/designer-french-dialog.png
diff --git a/doc/src/images/designer-getting-started.png b/doc/src/images/designer-getting-started.png
new file mode 100644
index 0000000000..7daea6c52c
--- /dev/null
+++ b/doc/src/images/designer-getting-started.png
diff --git a/doc/src/images/designer-layout-inserting.png b/doc/src/images/designer-layout-inserting.png
new file mode 100644
index 0000000000..2c3a8ce1b6
--- /dev/null
+++ b/doc/src/images/designer-layout-inserting.png
diff --git a/doc/src/images/designer-main-window.png b/doc/src/images/designer-main-window.png
new file mode 100644
index 0000000000..99a6592008
--- /dev/null
+++ b/doc/src/images/designer-main-window.png
diff --git a/doc/src/images/designer-making-connection.png b/doc/src/images/designer-making-connection.png
new file mode 100644
index 0000000000..b31153665e
--- /dev/null
+++ b/doc/src/images/designer-making-connection.png
diff --git a/doc/src/images/designer-manual-containerextension.png b/doc/src/images/designer-manual-containerextension.png
new file mode 100644
index 0000000000..1a82251c70
--- /dev/null
+++ b/doc/src/images/designer-manual-containerextension.png
diff --git a/doc/src/images/designer-manual-membersheetextension.png b/doc/src/images/designer-manual-membersheetextension.png
new file mode 100644
index 0000000000..7634d63340
--- /dev/null
+++ b/doc/src/images/designer-manual-membersheetextension.png
diff --git a/doc/src/images/designer-manual-propertysheetextension.png b/doc/src/images/designer-manual-propertysheetextension.png
new file mode 100644
index 0000000000..a8d2d42a6a
--- /dev/null
+++ b/doc/src/images/designer-manual-propertysheetextension.png
diff --git a/doc/src/images/designer-manual-taskmenuextension.png b/doc/src/images/designer-manual-taskmenuextension.png
new file mode 100644
index 0000000000..cf949bcb00
--- /dev/null
+++ b/doc/src/images/designer-manual-taskmenuextension.png
diff --git a/doc/src/images/designer-multiple-screenshot.png b/doc/src/images/designer-multiple-screenshot.png
new file mode 100644
index 0000000000..1531903026
--- /dev/null
+++ b/doc/src/images/designer-multiple-screenshot.png
diff --git a/doc/src/images/designer-object-inspector.png b/doc/src/images/designer-object-inspector.png
new file mode 100644
index 0000000000..c7f3180074
--- /dev/null
+++ b/doc/src/images/designer-object-inspector.png
diff --git a/doc/src/images/designer-palette-brush-editor.png b/doc/src/images/designer-palette-brush-editor.png
new file mode 100644
index 0000000000..b4a9e0ff0c
--- /dev/null
+++ b/doc/src/images/designer-palette-brush-editor.png
diff --git a/doc/src/images/designer-palette-editor.png b/doc/src/images/designer-palette-editor.png
new file mode 100644
index 0000000000..7333abe609
--- /dev/null
+++ b/doc/src/images/designer-palette-editor.png
diff --git a/doc/src/images/designer-palette-gradient-editor.png b/doc/src/images/designer-palette-gradient-editor.png
new file mode 100644
index 0000000000..d4b4d66019
--- /dev/null
+++ b/doc/src/images/designer-palette-gradient-editor.png
diff --git a/doc/src/images/designer-palette-pattern-editor.png b/doc/src/images/designer-palette-pattern-editor.png
new file mode 100644
index 0000000000..8117e0ed50
--- /dev/null
+++ b/doc/src/images/designer-palette-pattern-editor.png
diff --git a/doc/src/images/designer-preview-device-skin.png b/doc/src/images/designer-preview-device-skin.png
new file mode 100644
index 0000000000..5fc7836478
--- /dev/null
+++ b/doc/src/images/designer-preview-device-skin.png
diff --git a/doc/src/images/designer-preview-deviceskin-selection.png b/doc/src/images/designer-preview-deviceskin-selection.png
new file mode 100644
index 0000000000..3b6aec43a8
--- /dev/null
+++ b/doc/src/images/designer-preview-deviceskin-selection.png
diff --git a/doc/src/images/designer-preview-style-selection.png b/doc/src/images/designer-preview-style-selection.png
new file mode 100644
index 0000000000..e64cf6ee1e
--- /dev/null
+++ b/doc/src/images/designer-preview-style-selection.png
diff --git a/doc/src/images/designer-preview-style.png b/doc/src/images/designer-preview-style.png
new file mode 100644
index 0000000000..54a243ad36
--- /dev/null
+++ b/doc/src/images/designer-preview-style.png
diff --git a/doc/src/images/designer-preview-stylesheet.png b/doc/src/images/designer-preview-stylesheet.png
new file mode 100644
index 0000000000..ef9ef4f2bd
--- /dev/null
+++ b/doc/src/images/designer-preview-stylesheet.png
diff --git a/doc/src/images/designer-promoting-widgets.png b/doc/src/images/designer-promoting-widgets.png
new file mode 100644
index 0000000000..237756015f
--- /dev/null
+++ b/doc/src/images/designer-promoting-widgets.png
diff --git a/doc/src/images/designer-property-editor-add-dynamic.png b/doc/src/images/designer-property-editor-add-dynamic.png
new file mode 100644
index 0000000000..c7f4cf1471
--- /dev/null
+++ b/doc/src/images/designer-property-editor-add-dynamic.png
diff --git a/doc/src/images/designer-property-editor-configure.png b/doc/src/images/designer-property-editor-configure.png
new file mode 100644
index 0000000000..2a96fe3968
--- /dev/null
+++ b/doc/src/images/designer-property-editor-configure.png
diff --git a/doc/src/images/designer-property-editor-link.png b/doc/src/images/designer-property-editor-link.png
new file mode 100644
index 0000000000..e43a530959
--- /dev/null
+++ b/doc/src/images/designer-property-editor-link.png
diff --git a/doc/src/images/designer-property-editor-remove-dynamic.png b/doc/src/images/designer-property-editor-remove-dynamic.png
new file mode 100644
index 0000000000..cb6ccaa976
--- /dev/null
+++ b/doc/src/images/designer-property-editor-remove-dynamic.png
diff --git a/doc/src/images/designer-property-editor-toolbar.png b/doc/src/images/designer-property-editor-toolbar.png
new file mode 100644
index 0000000000..ae6345e93c
--- /dev/null
+++ b/doc/src/images/designer-property-editor-toolbar.png
diff --git a/doc/src/images/designer-property-editor.png b/doc/src/images/designer-property-editor.png
new file mode 100644
index 0000000000..fad23099ae
--- /dev/null
+++ b/doc/src/images/designer-property-editor.png
diff --git a/doc/src/images/designer-reload-resources-button.png b/doc/src/images/designer-reload-resources-button.png
new file mode 100644
index 0000000000..c101e76ffe
--- /dev/null
+++ b/doc/src/images/designer-reload-resources-button.png
diff --git a/doc/src/images/designer-remove-custom-toolbar.png b/doc/src/images/designer-remove-custom-toolbar.png
new file mode 100644
index 0000000000..3fecfc278e
--- /dev/null
+++ b/doc/src/images/designer-remove-custom-toolbar.png
diff --git a/doc/src/images/designer-remove-resource-entry-button.png b/doc/src/images/designer-remove-resource-entry-button.png
new file mode 100644
index 0000000000..aa3b9d6ba5
--- /dev/null
+++ b/doc/src/images/designer-remove-resource-entry-button.png
diff --git a/doc/src/images/designer-resource-browser.png b/doc/src/images/designer-resource-browser.png
new file mode 100644
index 0000000000..213a58b060
--- /dev/null
+++ b/doc/src/images/designer-resource-browser.png
diff --git a/doc/src/images/designer-resource-selector.png b/doc/src/images/designer-resource-selector.png
new file mode 100644
index 0000000000..31a4cb18f8
--- /dev/null
+++ b/doc/src/images/designer-resource-selector.png
diff --git a/doc/src/images/designer-resource-tool.png b/doc/src/images/designer-resource-tool.png
new file mode 100644
index 0000000000..7ef511c2b1
--- /dev/null
+++ b/doc/src/images/designer-resource-tool.png
diff --git a/doc/src/images/designer-resources-adding.png b/doc/src/images/designer-resources-adding.png
new file mode 100644
index 0000000000..a417bbd8e2
--- /dev/null
+++ b/doc/src/images/designer-resources-adding.png
diff --git a/doc/src/images/designer-resources-editing.png b/doc/src/images/designer-resources-editing.png
new file mode 100644
index 0000000000..6b8aee7d85
--- /dev/null
+++ b/doc/src/images/designer-resources-editing.png
diff --git a/doc/src/images/designer-resources-empty.png b/doc/src/images/designer-resources-empty.png
new file mode 100644
index 0000000000..47a45d002c
--- /dev/null
+++ b/doc/src/images/designer-resources-empty.png
diff --git a/doc/src/images/designer-resources-using.png b/doc/src/images/designer-resources-using.png
new file mode 100644
index 0000000000..4ce9ca23d0
--- /dev/null
+++ b/doc/src/images/designer-resources-using.png
diff --git a/doc/src/images/designer-screenshot-small.png b/doc/src/images/designer-screenshot-small.png
new file mode 100644
index 0000000000..ad4096bb29
--- /dev/null
+++ b/doc/src/images/designer-screenshot-small.png
diff --git a/doc/src/images/designer-screenshot.png b/doc/src/images/designer-screenshot.png
new file mode 100644
index 0000000000..1700b06d4c
--- /dev/null
+++ b/doc/src/images/designer-screenshot.png
diff --git a/doc/src/images/designer-selecting-widget.png b/doc/src/images/designer-selecting-widget.png
new file mode 100644
index 0000000000..a358d30142
--- /dev/null
+++ b/doc/src/images/designer-selecting-widget.png
diff --git a/doc/src/images/designer-selecting-widgets.png b/doc/src/images/designer-selecting-widgets.png
new file mode 100644
index 0000000000..93d315f97a
--- /dev/null
+++ b/doc/src/images/designer-selecting-widgets.png
diff --git a/doc/src/images/designer-set-layout.png b/doc/src/images/designer-set-layout.png
new file mode 100644
index 0000000000..86b4ecc940
--- /dev/null
+++ b/doc/src/images/designer-set-layout.png
diff --git a/doc/src/images/designer-set-layout2.png b/doc/src/images/designer-set-layout2.png
new file mode 100644
index 0000000000..e93f4dcff2
--- /dev/null
+++ b/doc/src/images/designer-set-layout2.png
diff --git a/doc/src/images/designer-splitter-layout.png b/doc/src/images/designer-splitter-layout.png
new file mode 100644
index 0000000000..2646c28920
--- /dev/null
+++ b/doc/src/images/designer-splitter-layout.png
diff --git a/doc/src/images/designer-stylesheet-options.png b/doc/src/images/designer-stylesheet-options.png
new file mode 100644
index 0000000000..a6893e770b
--- /dev/null
+++ b/doc/src/images/designer-stylesheet-options.png
diff --git a/doc/src/images/designer-stylesheet-usage.png b/doc/src/images/designer-stylesheet-usage.png
new file mode 100644
index 0000000000..f6875900de
--- /dev/null
+++ b/doc/src/images/designer-stylesheet-usage.png
diff --git a/doc/src/images/designer-tab-order-mode.png b/doc/src/images/designer-tab-order-mode.png
new file mode 100644
index 0000000000..8135f3b3e8
--- /dev/null
+++ b/doc/src/images/designer-tab-order-mode.png
diff --git a/doc/src/images/designer-tab-order-tool.png b/doc/src/images/designer-tab-order-tool.png
new file mode 100644
index 0000000000..f54faf9abe
--- /dev/null
+++ b/doc/src/images/designer-tab-order-tool.png
diff --git a/doc/src/images/designer-validator-highlighter.png b/doc/src/images/designer-validator-highlighter.png
new file mode 100644
index 0000000000..a6661d5c95
--- /dev/null
+++ b/doc/src/images/designer-validator-highlighter.png
diff --git a/doc/src/images/designer-widget-box.png b/doc/src/images/designer-widget-box.png
new file mode 100644
index 0000000000..bfbc5b7c02
--- /dev/null
+++ b/doc/src/images/designer-widget-box.png
diff --git a/doc/src/images/designer-widget-filter.png b/doc/src/images/designer-widget-filter.png
new file mode 100644
index 0000000000..ac13a0adb2
--- /dev/null
+++ b/doc/src/images/designer-widget-filter.png
diff --git a/doc/src/images/designer-widget-final.png b/doc/src/images/designer-widget-final.png
new file mode 100644
index 0000000000..f8acd9f741
--- /dev/null
+++ b/doc/src/images/designer-widget-final.png
diff --git a/doc/src/images/designer-widget-initial.png b/doc/src/images/designer-widget-initial.png
new file mode 100644
index 0000000000..d564fbec28
--- /dev/null
+++ b/doc/src/images/designer-widget-initial.png
diff --git a/doc/src/images/designer-widget-layout.png b/doc/src/images/designer-widget-layout.png
new file mode 100644
index 0000000000..478817061e
--- /dev/null
+++ b/doc/src/images/designer-widget-layout.png
diff --git a/doc/src/images/designer-widget-morph.png b/doc/src/images/designer-widget-morph.png
new file mode 100644
index 0000000000..974bc0e7f9
--- /dev/null
+++ b/doc/src/images/designer-widget-morph.png
diff --git a/doc/src/images/designer-widget-preview.png b/doc/src/images/designer-widget-preview.png
new file mode 100644
index 0000000000..e4565642da
--- /dev/null
+++ b/doc/src/images/designer-widget-preview.png
diff --git a/doc/src/images/designer-widget-tool.png b/doc/src/images/designer-widget-tool.png
new file mode 100644
index 0000000000..e1aa353dbf
--- /dev/null
+++ b/doc/src/images/designer-widget-tool.png
diff --git a/doc/src/images/desktop-examples.png b/doc/src/images/desktop-examples.png
new file mode 100644
index 0000000000..86b16b478b
--- /dev/null
+++ b/doc/src/images/desktop-examples.png
diff --git a/doc/src/images/diagonalGradient.png b/doc/src/images/diagonalGradient.png
new file mode 100644
index 0000000000..623d36233d
--- /dev/null
+++ b/doc/src/images/diagonalGradient.png
diff --git a/doc/src/images/diagramscene.png b/doc/src/images/diagramscene.png
new file mode 100644
index 0000000000..c84fc811e4
--- /dev/null
+++ b/doc/src/images/diagramscene.png
diff --git a/doc/src/images/dialog-examples.png b/doc/src/images/dialog-examples.png
new file mode 100644
index 0000000000..26537b5de3
--- /dev/null
+++ b/doc/src/images/dialog-examples.png
diff --git a/doc/src/images/dialogbuttonboxexample.png b/doc/src/images/dialogbuttonboxexample.png
new file mode 100644
index 0000000000..baa62d3188
--- /dev/null
+++ b/doc/src/images/dialogbuttonboxexample.png
diff --git a/doc/src/images/dialogs-examples.png b/doc/src/images/dialogs-examples.png
new file mode 100644
index 0000000000..45bf0ab9b7
--- /dev/null
+++ b/doc/src/images/dialogs-examples.png
diff --git a/doc/src/images/digitalclock-example.png b/doc/src/images/digitalclock-example.png
new file mode 100644
index 0000000000..473986608c
--- /dev/null
+++ b/doc/src/images/digitalclock-example.png
diff --git a/doc/src/images/directapproach-calculatorform.png b/doc/src/images/directapproach-calculatorform.png
new file mode 100644
index 0000000000..2b87ed1ccb
--- /dev/null
+++ b/doc/src/images/directapproach-calculatorform.png
diff --git a/doc/src/images/dirview-example.png b/doc/src/images/dirview-example.png
new file mode 100644
index 0000000000..6412ead5b2
--- /dev/null
+++ b/doc/src/images/dirview-example.png
diff --git a/doc/src/images/dockwidget-cross.png b/doc/src/images/dockwidget-cross.png
new file mode 100644
index 0000000000..35db6a2980
--- /dev/null
+++ b/doc/src/images/dockwidget-cross.png
diff --git a/doc/src/images/dockwidget-neighbors.png b/doc/src/images/dockwidget-neighbors.png
new file mode 100644
index 0000000000..d299ce6f17
--- /dev/null
+++ b/doc/src/images/dockwidget-neighbors.png
diff --git a/doc/src/images/dockwidgets-example.png b/doc/src/images/dockwidgets-example.png
new file mode 100644
index 0000000000..2a2d6f8c0c
--- /dev/null
+++ b/doc/src/images/dockwidgets-example.png
diff --git a/doc/src/images/dombookmarks-example.png b/doc/src/images/dombookmarks-example.png
new file mode 100644
index 0000000000..abacacbbfc
--- /dev/null
+++ b/doc/src/images/dombookmarks-example.png
diff --git a/doc/src/images/draganddrop-examples.png b/doc/src/images/draganddrop-examples.png
new file mode 100644
index 0000000000..89d9e501a7
--- /dev/null
+++ b/doc/src/images/draganddrop-examples.png
diff --git a/doc/src/images/draganddroppuzzle-example.png b/doc/src/images/draganddroppuzzle-example.png
new file mode 100644
index 0000000000..812278210d
--- /dev/null
+++ b/doc/src/images/draganddroppuzzle-example.png
diff --git a/doc/src/images/dragdroprobot-example.png b/doc/src/images/dragdroprobot-example.png
new file mode 100644
index 0000000000..53aae777b7
--- /dev/null
+++ b/doc/src/images/dragdroprobot-example.png
diff --git a/doc/src/images/draggableicons-example.png b/doc/src/images/draggableicons-example.png
new file mode 100644
index 0000000000..003ce13d03
--- /dev/null
+++ b/doc/src/images/draggableicons-example.png
diff --git a/doc/src/images/draggabletext-example.png b/doc/src/images/draggabletext-example.png
new file mode 100644
index 0000000000..f9b22816e6
--- /dev/null
+++ b/doc/src/images/draggabletext-example.png
diff --git a/doc/src/images/draw_arc.png b/doc/src/images/draw_arc.png
new file mode 100644
index 0000000000..6e721082da
--- /dev/null
+++ b/doc/src/images/draw_arc.png
diff --git a/doc/src/images/draw_chord.png b/doc/src/images/draw_chord.png
new file mode 100644
index 0000000000..4d4ab50b2f
--- /dev/null
+++ b/doc/src/images/draw_chord.png
diff --git a/doc/src/images/drilldown-example.png b/doc/src/images/drilldown-example.png
new file mode 100644
index 0000000000..68353f704a
--- /dev/null
+++ b/doc/src/images/drilldown-example.png
diff --git a/doc/src/images/dropsite-example.png b/doc/src/images/dropsite-example.png
new file mode 100644
index 0000000000..42b988d733
--- /dev/null
+++ b/doc/src/images/dropsite-example.png
diff --git a/doc/src/images/dynamiclayouts-example.png b/doc/src/images/dynamiclayouts-example.png
new file mode 100644
index 0000000000..65d8150ed6
--- /dev/null
+++ b/doc/src/images/dynamiclayouts-example.png
diff --git a/doc/src/images/echopluginexample.png b/doc/src/images/echopluginexample.png
new file mode 100644
index 0000000000..7cb1e4d63b
--- /dev/null
+++ b/doc/src/images/echopluginexample.png
diff --git a/doc/src/images/effectwidget.png b/doc/src/images/effectwidget.png
new file mode 100644
index 0000000000..d4a0fc4f51
--- /dev/null
+++ b/doc/src/images/effectwidget.png
diff --git a/doc/src/images/elasticnodes-example.png b/doc/src/images/elasticnodes-example.png
new file mode 100644
index 0000000000..840f74fe1f
--- /dev/null
+++ b/doc/src/images/elasticnodes-example.png
diff --git a/doc/src/images/embedded-demo-launcher.png b/doc/src/images/embedded-demo-launcher.png
new file mode 100644
index 0000000000..deafc7b6ca
--- /dev/null
+++ b/doc/src/images/embedded-demo-launcher.png
diff --git a/doc/src/images/embedded-simpledecoration-example-styles.png b/doc/src/images/embedded-simpledecoration-example-styles.png
new file mode 100644
index 0000000000..b2ad83c6bd
--- /dev/null
+++ b/doc/src/images/embedded-simpledecoration-example-styles.png
diff --git a/doc/src/images/embedded-simpledecoration-example.png b/doc/src/images/embedded-simpledecoration-example.png
new file mode 100644
index 0000000000..bfd04500cb
--- /dev/null
+++ b/doc/src/images/embedded-simpledecoration-example.png
diff --git a/doc/src/images/embeddeddialogs-demo.png b/doc/src/images/embeddeddialogs-demo.png
new file mode 100644
index 0000000000..d0da4b6dd5
--- /dev/null
+++ b/doc/src/images/embeddeddialogs-demo.png
diff --git a/doc/src/images/extension-example.png b/doc/src/images/extension-example.png
new file mode 100644
index 0000000000..dfaacc071d
--- /dev/null
+++ b/doc/src/images/extension-example.png
diff --git a/doc/src/images/extension_more.png b/doc/src/images/extension_more.png
new file mode 100644
index 0000000000..2b06809787
--- /dev/null
+++ b/doc/src/images/extension_more.png
diff --git a/doc/src/images/fetchmore-example.png b/doc/src/images/fetchmore-example.png
new file mode 100644
index 0000000000..d2359dc8c5
--- /dev/null
+++ b/doc/src/images/fetchmore-example.png
diff --git a/doc/src/images/filedialogurls.png b/doc/src/images/filedialogurls.png
new file mode 100644
index 0000000000..7d22ef33ae
--- /dev/null
+++ b/doc/src/images/filedialogurls.png
diff --git a/doc/src/images/filetree_1-example.png b/doc/src/images/filetree_1-example.png
new file mode 100644
index 0000000000..7e191748f6
--- /dev/null
+++ b/doc/src/images/filetree_1-example.png
diff --git a/doc/src/images/filetree_2-example.png b/doc/src/images/filetree_2-example.png
new file mode 100644
index 0000000000..cb794c5599
--- /dev/null
+++ b/doc/src/images/filetree_2-example.png
diff --git a/doc/src/images/findfiles-example.png b/doc/src/images/findfiles-example.png
new file mode 100644
index 0000000000..acb5ea1abf
--- /dev/null
+++ b/doc/src/images/findfiles-example.png
diff --git a/doc/src/images/findfiles_progress_dialog.png b/doc/src/images/findfiles_progress_dialog.png
new file mode 100644
index 0000000000..05eda2c52f
--- /dev/null
+++ b/doc/src/images/findfiles_progress_dialog.png
diff --git a/doc/src/images/flowlayout-example.png b/doc/src/images/flowlayout-example.png
new file mode 100644
index 0000000000..27660d67ec
--- /dev/null
+++ b/doc/src/images/flowlayout-example.png
diff --git a/doc/src/images/fontsampler-example.png b/doc/src/images/fontsampler-example.png
new file mode 100644
index 0000000000..7df4a5084e
--- /dev/null
+++ b/doc/src/images/fontsampler-example.png
diff --git a/doc/src/images/foreignkeys.png b/doc/src/images/foreignkeys.png
new file mode 100644
index 0000000000..7a6a19bb43
--- /dev/null
+++ b/doc/src/images/foreignkeys.png
diff --git a/doc/src/images/formextractor-example.png b/doc/src/images/formextractor-example.png
new file mode 100644
index 0000000000..155cdaab91
--- /dev/null
+++ b/doc/src/images/formextractor-example.png
diff --git a/doc/src/images/fortuneclient-example.png b/doc/src/images/fortuneclient-example.png
new file mode 100644
index 0000000000..b34a98736d
--- /dev/null
+++ b/doc/src/images/fortuneclient-example.png
diff --git a/doc/src/images/fortuneserver-example.png b/doc/src/images/fortuneserver-example.png
new file mode 100644
index 0000000000..73f27d5653
--- /dev/null
+++ b/doc/src/images/fortuneserver-example.png
diff --git a/doc/src/images/framebufferobject-example.png b/doc/src/images/framebufferobject-example.png
new file mode 100644
index 0000000000..df9b6dbe46
--- /dev/null
+++ b/doc/src/images/framebufferobject-example.png
diff --git a/doc/src/images/framebufferobject2-example.png b/doc/src/images/framebufferobject2-example.png
new file mode 100644
index 0000000000..bafb05a08b
--- /dev/null
+++ b/doc/src/images/framebufferobject2-example.png
diff --git a/doc/src/images/frames.png b/doc/src/images/frames.png
new file mode 100644
index 0000000000..13c08508a2
--- /dev/null
+++ b/doc/src/images/frames.png
diff --git a/doc/src/images/fridgemagnets-example.png b/doc/src/images/fridgemagnets-example.png
new file mode 100644
index 0000000000..9adb572afc
--- /dev/null
+++ b/doc/src/images/fridgemagnets-example.png
diff --git a/doc/src/images/ftp-example.png b/doc/src/images/ftp-example.png
new file mode 100644
index 0000000000..504c6580b5
--- /dev/null
+++ b/doc/src/images/ftp-example.png
diff --git a/doc/src/images/geometry.png b/doc/src/images/geometry.png
new file mode 100644
index 0000000000..c69e11da8f
--- /dev/null
+++ b/doc/src/images/geometry.png
diff --git a/doc/src/images/grabber-example.png b/doc/src/images/grabber-example.png
new file mode 100644
index 0000000000..6a05b94bec
--- /dev/null
+++ b/doc/src/images/grabber-example.png
diff --git a/doc/src/images/gradientText.png b/doc/src/images/gradientText.png
new file mode 100644
index 0000000000..9ee71642ba
--- /dev/null
+++ b/doc/src/images/gradientText.png
diff --git a/doc/src/images/gradients-demo.png b/doc/src/images/gradients-demo.png
new file mode 100644
index 0000000000..d80708e048
--- /dev/null
+++ b/doc/src/images/gradients-demo.png
diff --git a/doc/src/images/graphicsview-ellipseitem-pie.png b/doc/src/images/graphicsview-ellipseitem-pie.png
new file mode 100644
index 0000000000..136175abc2
--- /dev/null
+++ b/doc/src/images/graphicsview-ellipseitem-pie.png
diff --git a/doc/src/images/graphicsview-ellipseitem.png b/doc/src/images/graphicsview-ellipseitem.png
new file mode 100644
index 0000000000..7c7a8e58d0
--- /dev/null
+++ b/doc/src/images/graphicsview-ellipseitem.png
diff --git a/doc/src/images/graphicsview-examples.png b/doc/src/images/graphicsview-examples.png
new file mode 100644
index 0000000000..b58bdc309c
--- /dev/null
+++ b/doc/src/images/graphicsview-examples.png
diff --git a/doc/src/images/graphicsview-items.png b/doc/src/images/graphicsview-items.png
new file mode 100644
index 0000000000..73be2ddaee
--- /dev/null
+++ b/doc/src/images/graphicsview-items.png
diff --git a/doc/src/images/graphicsview-lineitem.png b/doc/src/images/graphicsview-lineitem.png
new file mode 100644
index 0000000000..952a3c2df1
--- /dev/null
+++ b/doc/src/images/graphicsview-lineitem.png
diff --git a/doc/src/images/graphicsview-map.png b/doc/src/images/graphicsview-map.png
new file mode 100644
index 0000000000..e7f5ac6fca
--- /dev/null
+++ b/doc/src/images/graphicsview-map.png
diff --git a/doc/src/images/graphicsview-parentchild.png b/doc/src/images/graphicsview-parentchild.png
new file mode 100644
index 0000000000..0fc2dbf538
--- /dev/null
+++ b/doc/src/images/graphicsview-parentchild.png
diff --git a/doc/src/images/graphicsview-pathitem.png b/doc/src/images/graphicsview-pathitem.png
new file mode 100644
index 0000000000..c1ddd5620a
--- /dev/null
+++ b/doc/src/images/graphicsview-pathitem.png
diff --git a/doc/src/images/graphicsview-pixmapitem.png b/doc/src/images/graphicsview-pixmapitem.png
new file mode 100644
index 0000000000..d14fac55e0
--- /dev/null
+++ b/doc/src/images/graphicsview-pixmapitem.png
diff --git a/doc/src/images/graphicsview-polygonitem.png b/doc/src/images/graphicsview-polygonitem.png
new file mode 100644
index 0000000000..3cd2232574
--- /dev/null
+++ b/doc/src/images/graphicsview-polygonitem.png
diff --git a/doc/src/images/graphicsview-rectitem.png b/doc/src/images/graphicsview-rectitem.png
new file mode 100644
index 0000000000..a5917e55dd
--- /dev/null
+++ b/doc/src/images/graphicsview-rectitem.png
diff --git a/doc/src/images/graphicsview-shapes.png b/doc/src/images/graphicsview-shapes.png
new file mode 100644
index 0000000000..466eb33677
--- /dev/null
+++ b/doc/src/images/graphicsview-shapes.png
diff --git a/doc/src/images/graphicsview-simpletextitem.png b/doc/src/images/graphicsview-simpletextitem.png
new file mode 100644
index 0000000000..908d67fce9
--- /dev/null
+++ b/doc/src/images/graphicsview-simpletextitem.png
diff --git a/doc/src/images/graphicsview-text.png b/doc/src/images/graphicsview-text.png
new file mode 100644
index 0000000000..e7441df3f7
--- /dev/null
+++ b/doc/src/images/graphicsview-text.png
diff --git a/doc/src/images/graphicsview-textitem.png b/doc/src/images/graphicsview-textitem.png
new file mode 100644
index 0000000000..f1ae3c0b3b
--- /dev/null
+++ b/doc/src/images/graphicsview-textitem.png
diff --git a/doc/src/images/graphicsview-view.png b/doc/src/images/graphicsview-view.png
new file mode 100644
index 0000000000..212195f652
--- /dev/null
+++ b/doc/src/images/graphicsview-view.png
diff --git a/doc/src/images/graphicsview-zorder.png b/doc/src/images/graphicsview-zorder.png
new file mode 100644
index 0000000000..a1cc3d0168
--- /dev/null
+++ b/doc/src/images/graphicsview-zorder.png
diff --git a/doc/src/images/gridlayout.png b/doc/src/images/gridlayout.png
new file mode 100644
index 0000000000..ae76c0487b
--- /dev/null
+++ b/doc/src/images/gridlayout.png
diff --git a/doc/src/images/groupbox-example.png b/doc/src/images/groupbox-example.png
new file mode 100644
index 0000000000..443f812340
--- /dev/null
+++ b/doc/src/images/groupbox-example.png
diff --git a/doc/src/images/gtk-calendarwidget.png b/doc/src/images/gtk-calendarwidget.png
new file mode 100644
index 0000000000..568cd1a5da
--- /dev/null
+++ b/doc/src/images/gtk-calendarwidget.png
diff --git a/doc/src/images/gtk-checkbox.png b/doc/src/images/gtk-checkbox.png
new file mode 100644
index 0000000000..1fd5fc77bf
--- /dev/null
+++ b/doc/src/images/gtk-checkbox.png
diff --git a/doc/src/images/gtk-columnview.png b/doc/src/images/gtk-columnview.png
new file mode 100644
index 0000000000..548ce8b62a
--- /dev/null
+++ b/doc/src/images/gtk-columnview.png
diff --git a/doc/src/images/gtk-combobox.png b/doc/src/images/gtk-combobox.png
new file mode 100644
index 0000000000..3b4544df13
--- /dev/null
+++ b/doc/src/images/gtk-combobox.png
diff --git a/doc/src/images/gtk-dateedit.png b/doc/src/images/gtk-dateedit.png
new file mode 100644
index 0000000000..25229f0b3b
--- /dev/null
+++ b/doc/src/images/gtk-dateedit.png
diff --git a/doc/src/images/gtk-datetimeedit.png b/doc/src/images/gtk-datetimeedit.png
new file mode 100644
index 0000000000..0c934a4d0d
--- /dev/null
+++ b/doc/src/images/gtk-datetimeedit.png
diff --git a/doc/src/images/gtk-dial.png b/doc/src/images/gtk-dial.png
new file mode 100644
index 0000000000..18e14b3650
--- /dev/null
+++ b/doc/src/images/gtk-dial.png
diff --git a/doc/src/images/gtk-doublespinbox.png b/doc/src/images/gtk-doublespinbox.png
new file mode 100644
index 0000000000..3a69043c0b
--- /dev/null
+++ b/doc/src/images/gtk-doublespinbox.png
diff --git a/doc/src/images/gtk-fontcombobox.png b/doc/src/images/gtk-fontcombobox.png
new file mode 100644
index 0000000000..4cb1bc1343
--- /dev/null
+++ b/doc/src/images/gtk-fontcombobox.png
diff --git a/doc/src/images/gtk-frame.png b/doc/src/images/gtk-frame.png
new file mode 100644
index 0000000000..c1bf52f6a6
--- /dev/null
+++ b/doc/src/images/gtk-frame.png
diff --git a/doc/src/images/gtk-groupbox.png b/doc/src/images/gtk-groupbox.png
new file mode 100644
index 0000000000..6d217c89f9
--- /dev/null
+++ b/doc/src/images/gtk-groupbox.png
diff --git a/doc/src/images/gtk-horizontalscrollbar.png b/doc/src/images/gtk-horizontalscrollbar.png
new file mode 100644
index 0000000000..2887730c13
--- /dev/null
+++ b/doc/src/images/gtk-horizontalscrollbar.png
diff --git a/doc/src/images/gtk-label.png b/doc/src/images/gtk-label.png
new file mode 100644
index 0000000000..006d0133d8
--- /dev/null
+++ b/doc/src/images/gtk-label.png
diff --git a/doc/src/images/gtk-lcdnumber.png b/doc/src/images/gtk-lcdnumber.png
new file mode 100644
index 0000000000..142d298ffc
--- /dev/null
+++ b/doc/src/images/gtk-lcdnumber.png
diff --git a/doc/src/images/gtk-lineedit.png b/doc/src/images/gtk-lineedit.png
new file mode 100644
index 0000000000..8fb513c39f
--- /dev/null
+++ b/doc/src/images/gtk-lineedit.png
diff --git a/doc/src/images/gtk-listview.png b/doc/src/images/gtk-listview.png
new file mode 100644
index 0000000000..d32f8e8aee
--- /dev/null
+++ b/doc/src/images/gtk-listview.png
diff --git a/doc/src/images/gtk-progressbar.png b/doc/src/images/gtk-progressbar.png
new file mode 100644
index 0000000000..6162484bf3
--- /dev/null
+++ b/doc/src/images/gtk-progressbar.png
diff --git a/doc/src/images/gtk-pushbutton.png b/doc/src/images/gtk-pushbutton.png
new file mode 100644
index 0000000000..f4f4d7c1e4
--- /dev/null
+++ b/doc/src/images/gtk-pushbutton.png
diff --git a/doc/src/images/gtk-radiobutton.png b/doc/src/images/gtk-radiobutton.png
new file mode 100644
index 0000000000..b3620fa054
--- /dev/null
+++ b/doc/src/images/gtk-radiobutton.png
diff --git a/doc/src/images/gtk-slider.png b/doc/src/images/gtk-slider.png
new file mode 100644
index 0000000000..3d8e0ee89e
--- /dev/null
+++ b/doc/src/images/gtk-slider.png
diff --git a/doc/src/images/gtk-spinbox.png b/doc/src/images/gtk-spinbox.png
new file mode 100644
index 0000000000..a39eb3aa93
--- /dev/null
+++ b/doc/src/images/gtk-spinbox.png
diff --git a/doc/src/images/gtk-style-screenshot.png b/doc/src/images/gtk-style-screenshot.png
new file mode 100644
index 0000000000..2d493a0afa
--- /dev/null
+++ b/doc/src/images/gtk-style-screenshot.png
diff --git a/doc/src/images/gtk-tableview.png b/doc/src/images/gtk-tableview.png
new file mode 100644
index 0000000000..a025193188
--- /dev/null
+++ b/doc/src/images/gtk-tableview.png
diff --git a/doc/src/images/gtk-tabwidget.png b/doc/src/images/gtk-tabwidget.png
new file mode 100644
index 0000000000..089c76dad2
--- /dev/null
+++ b/doc/src/images/gtk-tabwidget.png
diff --git a/doc/src/images/gtk-textedit.png b/doc/src/images/gtk-textedit.png
new file mode 100644
index 0000000000..e4b91c01c9
--- /dev/null
+++ b/doc/src/images/gtk-textedit.png
diff --git a/doc/src/images/gtk-timeedit.png b/doc/src/images/gtk-timeedit.png
new file mode 100644
index 0000000000..acf6730a86
--- /dev/null
+++ b/doc/src/images/gtk-timeedit.png
diff --git a/doc/src/images/gtk-toolbox.png b/doc/src/images/gtk-toolbox.png
new file mode 100644
index 0000000000..25e6137699
--- /dev/null
+++ b/doc/src/images/gtk-toolbox.png
diff --git a/doc/src/images/gtk-toolbutton.png b/doc/src/images/gtk-toolbutton.png
new file mode 100644
index 0000000000..f0eb86efc5
--- /dev/null
+++ b/doc/src/images/gtk-toolbutton.png
diff --git a/doc/src/images/gtk-treeview.png b/doc/src/images/gtk-treeview.png
new file mode 100644
index 0000000000..7b4e3044be
--- /dev/null
+++ b/doc/src/images/gtk-treeview.png
diff --git a/doc/src/images/hellogl-es-example.png b/doc/src/images/hellogl-es-example.png
new file mode 100644
index 0000000000..7e55f09a7a
--- /dev/null
+++ b/doc/src/images/hellogl-es-example.png
diff --git a/doc/src/images/hellogl-example.png b/doc/src/images/hellogl-example.png
new file mode 100644
index 0000000000..ecb3a3a7b0
--- /dev/null
+++ b/doc/src/images/hellogl-example.png
diff --git a/doc/src/images/http-example.png b/doc/src/images/http-example.png
new file mode 100644
index 0000000000..16b0539b1b
--- /dev/null
+++ b/doc/src/images/http-example.png
diff --git a/doc/src/images/httpstack.png b/doc/src/images/httpstack.png
new file mode 100644
index 0000000000..658927bd81
--- /dev/null
+++ b/doc/src/images/httpstack.png
diff --git a/doc/src/images/i18n-example.png b/doc/src/images/i18n-example.png
new file mode 100644
index 0000000000..20c46c9e63
--- /dev/null
+++ b/doc/src/images/i18n-example.png
diff --git a/doc/src/images/icon.png b/doc/src/images/icon.png
new file mode 100644
index 0000000000..cc2b6ac93a
--- /dev/null
+++ b/doc/src/images/icon.png
diff --git a/doc/src/images/icons-example.png b/doc/src/images/icons-example.png
new file mode 100644
index 0000000000..ae4b1d3234
--- /dev/null
+++ b/doc/src/images/icons-example.png
diff --git a/doc/src/images/icons-view-menu.png b/doc/src/images/icons-view-menu.png
new file mode 100644
index 0000000000..7fc02a09a1
--- /dev/null
+++ b/doc/src/images/icons-view-menu.png
diff --git a/doc/src/images/icons_find_normal.png b/doc/src/images/icons_find_normal.png
new file mode 100644
index 0000000000..c92c7e1740
--- /dev/null
+++ b/doc/src/images/icons_find_normal.png
diff --git a/doc/src/images/icons_find_normal_disabled.png b/doc/src/images/icons_find_normal_disabled.png
new file mode 100644
index 0000000000..534d6de4cf
--- /dev/null
+++ b/doc/src/images/icons_find_normal_disabled.png
diff --git a/doc/src/images/icons_images_groupbox.png b/doc/src/images/icons_images_groupbox.png
new file mode 100644
index 0000000000..f4942f76fb
--- /dev/null
+++ b/doc/src/images/icons_images_groupbox.png
diff --git a/doc/src/images/icons_monkey.png b/doc/src/images/icons_monkey.png
new file mode 100644
index 0000000000..141a87cabc
--- /dev/null
+++ b/doc/src/images/icons_monkey.png
diff --git a/doc/src/images/icons_monkey_active.png b/doc/src/images/icons_monkey_active.png
new file mode 100644
index 0000000000..edb5132040
--- /dev/null
+++ b/doc/src/images/icons_monkey_active.png
diff --git a/doc/src/images/icons_monkey_mess.png b/doc/src/images/icons_monkey_mess.png
new file mode 100644
index 0000000000..c23eed60ff
--- /dev/null
+++ b/doc/src/images/icons_monkey_mess.png
diff --git a/doc/src/images/icons_preview_area.png b/doc/src/images/icons_preview_area.png
new file mode 100644
index 0000000000..098afae4bc
--- /dev/null
+++ b/doc/src/images/icons_preview_area.png
diff --git a/doc/src/images/icons_qt_extended_16x16.png b/doc/src/images/icons_qt_extended_16x16.png
new file mode 100644
index 0000000000..92743690e3
--- /dev/null
+++ b/doc/src/images/icons_qt_extended_16x16.png
diff --git a/doc/src/images/icons_qt_extended_17x17.png b/doc/src/images/icons_qt_extended_17x17.png
new file mode 100644
index 0000000000..e9bb24a282
--- /dev/null
+++ b/doc/src/images/icons_qt_extended_17x17.png
diff --git a/doc/src/images/icons_qt_extended_32x32.png b/doc/src/images/icons_qt_extended_32x32.png
new file mode 100644
index 0000000000..cd3d0f3255
--- /dev/null
+++ b/doc/src/images/icons_qt_extended_32x32.png
diff --git a/doc/src/images/icons_qt_extended_33x33.png b/doc/src/images/icons_qt_extended_33x33.png
new file mode 100644
index 0000000000..a67565cc2b
--- /dev/null
+++ b/doc/src/images/icons_qt_extended_33x33.png
diff --git a/doc/src/images/icons_qt_extended_48x48.png b/doc/src/images/icons_qt_extended_48x48.png
new file mode 100644
index 0000000000..5aa2d73f71
--- /dev/null
+++ b/doc/src/images/icons_qt_extended_48x48.png
diff --git a/doc/src/images/icons_qt_extended_64x64.png b/doc/src/images/icons_qt_extended_64x64.png
new file mode 100644
index 0000000000..5aa2d73f71
--- /dev/null
+++ b/doc/src/images/icons_qt_extended_64x64.png
diff --git a/doc/src/images/icons_qt_extended_8x8.png b/doc/src/images/icons_qt_extended_8x8.png
new file mode 100644
index 0000000000..8de7fce038
--- /dev/null
+++ b/doc/src/images/icons_qt_extended_8x8.png
diff --git a/doc/src/images/icons_size_groupbox.png b/doc/src/images/icons_size_groupbox.png
new file mode 100644
index 0000000000..1360280529
--- /dev/null
+++ b/doc/src/images/icons_size_groupbox.png
diff --git a/doc/src/images/icons_size_spinbox.png b/doc/src/images/icons_size_spinbox.png
new file mode 100644
index 0000000000..a23ee9f110
--- /dev/null
+++ b/doc/src/images/icons_size_spinbox.png
diff --git a/doc/src/images/imagecomposition-example.png b/doc/src/images/imagecomposition-example.png
new file mode 100644
index 0000000000..697c980d5a
--- /dev/null
+++ b/doc/src/images/imagecomposition-example.png
diff --git a/doc/src/images/imageviewer-example.png b/doc/src/images/imageviewer-example.png
new file mode 100644
index 0000000000..69b4f7ade7
--- /dev/null
+++ b/doc/src/images/imageviewer-example.png
diff --git a/doc/src/images/imageviewer-fit_to_window_1.png b/doc/src/images/imageviewer-fit_to_window_1.png
new file mode 100644
index 0000000000..0fe1ba1c62
--- /dev/null
+++ b/doc/src/images/imageviewer-fit_to_window_1.png
diff --git a/doc/src/images/imageviewer-fit_to_window_2.png b/doc/src/images/imageviewer-fit_to_window_2.png
new file mode 100644
index 0000000000..29e3a93bc1
--- /dev/null
+++ b/doc/src/images/imageviewer-fit_to_window_2.png
diff --git a/doc/src/images/imageviewer-original_size.png b/doc/src/images/imageviewer-original_size.png
new file mode 100644
index 0000000000..c0443eba25
--- /dev/null
+++ b/doc/src/images/imageviewer-original_size.png
diff --git a/doc/src/images/imageviewer-zoom_in_1.png b/doc/src/images/imageviewer-zoom_in_1.png
new file mode 100644
index 0000000000..05b0fffecb
--- /dev/null
+++ b/doc/src/images/imageviewer-zoom_in_1.png
diff --git a/doc/src/images/imageviewer-zoom_in_2.png b/doc/src/images/imageviewer-zoom_in_2.png
new file mode 100644
index 0000000000..0c36111c03
--- /dev/null
+++ b/doc/src/images/imageviewer-zoom_in_2.png
diff --git a/doc/src/images/inputdialogs.png b/doc/src/images/inputdialogs.png
new file mode 100644
index 0000000000..135c2f68f3
--- /dev/null
+++ b/doc/src/images/inputdialogs.png
diff --git a/doc/src/images/insertrowinmodelview.png b/doc/src/images/insertrowinmodelview.png
new file mode 100644
index 0000000000..bddc401ad2
--- /dev/null
+++ b/doc/src/images/insertrowinmodelview.png
diff --git a/doc/src/images/interview-demo.png b/doc/src/images/interview-demo.png
new file mode 100644
index 0000000000..d4a1956883
--- /dev/null
+++ b/doc/src/images/interview-demo.png
diff --git a/doc/src/images/interview-shareddirmodel.png b/doc/src/images/interview-shareddirmodel.png
new file mode 100644
index 0000000000..0213a8da05
--- /dev/null
+++ b/doc/src/images/interview-shareddirmodel.png
diff --git a/doc/src/images/itemview-examples.png b/doc/src/images/itemview-examples.png
new file mode 100644
index 0000000000..71d29fed01
--- /dev/null
+++ b/doc/src/images/itemview-examples.png
diff --git a/doc/src/images/itemviews-editabletreemodel-indexes.png b/doc/src/images/itemviews-editabletreemodel-indexes.png
new file mode 100644
index 0000000000..4c66e88ade
--- /dev/null
+++ b/doc/src/images/itemviews-editabletreemodel-indexes.png
diff --git a/doc/src/images/itemviews-editabletreemodel-items.png b/doc/src/images/itemviews-editabletreemodel-items.png
new file mode 100644
index 0000000000..35fcb75249
--- /dev/null
+++ b/doc/src/images/itemviews-editabletreemodel-items.png
diff --git a/doc/src/images/itemviews-editabletreemodel-model.png b/doc/src/images/itemviews-editabletreemodel-model.png
new file mode 100644
index 0000000000..592e0ffdd8
--- /dev/null
+++ b/doc/src/images/itemviews-editabletreemodel-model.png
diff --git a/doc/src/images/itemviews-editabletreemodel-values.png b/doc/src/images/itemviews-editabletreemodel-values.png
new file mode 100644
index 0000000000..0ace1cc09a
--- /dev/null
+++ b/doc/src/images/itemviews-editabletreemodel-values.png
diff --git a/doc/src/images/itemviews-editabletreemodel.png b/doc/src/images/itemviews-editabletreemodel.png
new file mode 100644
index 0000000000..a151ea857f
--- /dev/null
+++ b/doc/src/images/itemviews-editabletreemodel.png
diff --git a/doc/src/images/itemviews-examples.png b/doc/src/images/itemviews-examples.png
new file mode 100644
index 0000000000..7c026c2a80
--- /dev/null
+++ b/doc/src/images/itemviews-examples.png
diff --git a/doc/src/images/itemviewspuzzle-example.png b/doc/src/images/itemviewspuzzle-example.png
new file mode 100644
index 0000000000..05ae28be81
--- /dev/null
+++ b/doc/src/images/itemviewspuzzle-example.png
diff --git a/doc/src/images/javaiterators1.png b/doc/src/images/javaiterators1.png
new file mode 100644
index 0000000000..7dfcde0188
--- /dev/null
+++ b/doc/src/images/javaiterators1.png
diff --git a/doc/src/images/javaiterators2.png b/doc/src/images/javaiterators2.png
new file mode 100644
index 0000000000..c04e3ccf88
--- /dev/null
+++ b/doc/src/images/javaiterators2.png
diff --git a/doc/src/images/javastyle/branchindicatorimage.png b/doc/src/images/javastyle/branchindicatorimage.png
new file mode 100644
index 0000000000..f2cfc4b2e9
--- /dev/null
+++ b/doc/src/images/javastyle/branchindicatorimage.png
diff --git a/doc/src/images/javastyle/button.png b/doc/src/images/javastyle/button.png
new file mode 100644
index 0000000000..c3a97425b1
--- /dev/null
+++ b/doc/src/images/javastyle/button.png
diff --git a/doc/src/images/javastyle/checkbox.png b/doc/src/images/javastyle/checkbox.png
new file mode 100644
index 0000000000..bc841a6a6d
--- /dev/null
+++ b/doc/src/images/javastyle/checkbox.png
diff --git a/doc/src/images/javastyle/checkboxexample.png b/doc/src/images/javastyle/checkboxexample.png
new file mode 100644
index 0000000000..69217fb2e5
--- /dev/null
+++ b/doc/src/images/javastyle/checkboxexample.png
diff --git a/doc/src/images/javastyle/checkingsomestuff.png b/doc/src/images/javastyle/checkingsomestuff.png
new file mode 100644
index 0000000000..88e8cadb73
--- /dev/null
+++ b/doc/src/images/javastyle/checkingsomestuff.png
diff --git a/doc/src/images/javastyle/combobox.png b/doc/src/images/javastyle/combobox.png
new file mode 100644
index 0000000000..de9745a218
--- /dev/null
+++ b/doc/src/images/javastyle/combobox.png
diff --git a/doc/src/images/javastyle/comboboximage.png b/doc/src/images/javastyle/comboboximage.png
new file mode 100644
index 0000000000..1f05e5fe86
--- /dev/null
+++ b/doc/src/images/javastyle/comboboximage.png
diff --git a/doc/src/images/javastyle/conceptualpushbuttontree.png b/doc/src/images/javastyle/conceptualpushbuttontree.png
new file mode 100644
index 0000000000..910000a6e8
--- /dev/null
+++ b/doc/src/images/javastyle/conceptualpushbuttontree.png
diff --git a/doc/src/images/javastyle/dockwidget.png b/doc/src/images/javastyle/dockwidget.png
new file mode 100644
index 0000000000..4bfec142bf
--- /dev/null
+++ b/doc/src/images/javastyle/dockwidget.png
diff --git a/doc/src/images/javastyle/dockwidgetimage.png b/doc/src/images/javastyle/dockwidgetimage.png
new file mode 100644
index 0000000000..eefe171e3e
--- /dev/null
+++ b/doc/src/images/javastyle/dockwidgetimage.png
diff --git a/doc/src/images/javastyle/groupbox.png b/doc/src/images/javastyle/groupbox.png
new file mode 100644
index 0000000000..a39cd42c9f
--- /dev/null
+++ b/doc/src/images/javastyle/groupbox.png
diff --git a/doc/src/images/javastyle/groupboximage.png b/doc/src/images/javastyle/groupboximage.png
new file mode 100644
index 0000000000..5baf6092d4
--- /dev/null
+++ b/doc/src/images/javastyle/groupboximage.png
diff --git a/doc/src/images/javastyle/header.png b/doc/src/images/javastyle/header.png
new file mode 100644
index 0000000000..b4546d840e
--- /dev/null
+++ b/doc/src/images/javastyle/header.png
diff --git a/doc/src/images/javastyle/headerimage.png b/doc/src/images/javastyle/headerimage.png
new file mode 100644
index 0000000000..41171497d5
--- /dev/null
+++ b/doc/src/images/javastyle/headerimage.png
diff --git a/doc/src/images/javastyle/menu.png b/doc/src/images/javastyle/menu.png
new file mode 100644
index 0000000000..8d44da4054
--- /dev/null
+++ b/doc/src/images/javastyle/menu.png
diff --git a/doc/src/images/javastyle/menubar.png b/doc/src/images/javastyle/menubar.png
new file mode 100644
index 0000000000..e68e4a3a55
--- /dev/null
+++ b/doc/src/images/javastyle/menubar.png
diff --git a/doc/src/images/javastyle/menubarimage.png b/doc/src/images/javastyle/menubarimage.png
new file mode 100644
index 0000000000..b0cf28edcc
--- /dev/null
+++ b/doc/src/images/javastyle/menubarimage.png
diff --git a/doc/src/images/javastyle/menuimage.png b/doc/src/images/javastyle/menuimage.png
new file mode 100644
index 0000000000..282dde7159
--- /dev/null
+++ b/doc/src/images/javastyle/menuimage.png
diff --git a/doc/src/images/javastyle/plastiquetabimage.png b/doc/src/images/javastyle/plastiquetabimage.png
new file mode 100644
index 0000000000..56491ff9d6
--- /dev/null
+++ b/doc/src/images/javastyle/plastiquetabimage.png
diff --git a/doc/src/images/javastyle/plastiquetabtest.png b/doc/src/images/javastyle/plastiquetabtest.png
new file mode 100644
index 0000000000..e537773179
--- /dev/null
+++ b/doc/src/images/javastyle/plastiquetabtest.png
diff --git a/doc/src/images/javastyle/progressbar.png b/doc/src/images/javastyle/progressbar.png
new file mode 100644
index 0000000000..de3a838c38
--- /dev/null
+++ b/doc/src/images/javastyle/progressbar.png
diff --git a/doc/src/images/javastyle/progressbarimage.png b/doc/src/images/javastyle/progressbarimage.png
new file mode 100644
index 0000000000..433b900ab5
--- /dev/null
+++ b/doc/src/images/javastyle/progressbarimage.png
diff --git a/doc/src/images/javastyle/pushbutton.png b/doc/src/images/javastyle/pushbutton.png
new file mode 100644
index 0000000000..e5f92bea12
--- /dev/null
+++ b/doc/src/images/javastyle/pushbutton.png
diff --git a/doc/src/images/javastyle/rubberband.png b/doc/src/images/javastyle/rubberband.png
new file mode 100644
index 0000000000..087424a3f0
--- /dev/null
+++ b/doc/src/images/javastyle/rubberband.png
diff --git a/doc/src/images/javastyle/rubberbandimage.png b/doc/src/images/javastyle/rubberbandimage.png
new file mode 100644
index 0000000000..2794638dbc
--- /dev/null
+++ b/doc/src/images/javastyle/rubberbandimage.png
diff --git a/doc/src/images/javastyle/scrollbar.png b/doc/src/images/javastyle/scrollbar.png
new file mode 100644
index 0000000000..c1ecb5d655
--- /dev/null
+++ b/doc/src/images/javastyle/scrollbar.png
diff --git a/doc/src/images/javastyle/scrollbarimage.png b/doc/src/images/javastyle/scrollbarimage.png
new file mode 100644
index 0000000000..6d3e29d8dd
--- /dev/null
+++ b/doc/src/images/javastyle/scrollbarimage.png
diff --git a/doc/src/images/javastyle/sizegrip.png b/doc/src/images/javastyle/sizegrip.png
new file mode 100644
index 0000000000..667e6fb465
--- /dev/null
+++ b/doc/src/images/javastyle/sizegrip.png
diff --git a/doc/src/images/javastyle/sizegripimage.png b/doc/src/images/javastyle/sizegripimage.png
new file mode 100644
index 0000000000..ccbf5254d3
--- /dev/null
+++ b/doc/src/images/javastyle/sizegripimage.png
diff --git a/doc/src/images/javastyle/slider.png b/doc/src/images/javastyle/slider.png
new file mode 100644
index 0000000000..a382233f58
--- /dev/null
+++ b/doc/src/images/javastyle/slider.png
diff --git a/doc/src/images/javastyle/sliderhandle.png b/doc/src/images/javastyle/sliderhandle.png
new file mode 100644
index 0000000000..28b7544abe
--- /dev/null
+++ b/doc/src/images/javastyle/sliderhandle.png
diff --git a/doc/src/images/javastyle/sliderimage.png b/doc/src/images/javastyle/sliderimage.png
new file mode 100644
index 0000000000..df700dd712
--- /dev/null
+++ b/doc/src/images/javastyle/sliderimage.png
diff --git a/doc/src/images/javastyle/slidertroubble.png b/doc/src/images/javastyle/slidertroubble.png
new file mode 100644
index 0000000000..79eee812d8
--- /dev/null
+++ b/doc/src/images/javastyle/slidertroubble.png
diff --git a/doc/src/images/javastyle/spinbox.png b/doc/src/images/javastyle/spinbox.png
new file mode 100644
index 0000000000..ec9d6e0d75
--- /dev/null
+++ b/doc/src/images/javastyle/spinbox.png
diff --git a/doc/src/images/javastyle/spinboximage.png b/doc/src/images/javastyle/spinboximage.png
new file mode 100644
index 0000000000..d0d57c8ffb
--- /dev/null
+++ b/doc/src/images/javastyle/spinboximage.png
diff --git a/doc/src/images/javastyle/splitter.png b/doc/src/images/javastyle/splitter.png
new file mode 100644
index 0000000000..5983804fc0
--- /dev/null
+++ b/doc/src/images/javastyle/splitter.png
diff --git a/doc/src/images/javastyle/tab.png b/doc/src/images/javastyle/tab.png
new file mode 100644
index 0000000000..616580c839
--- /dev/null
+++ b/doc/src/images/javastyle/tab.png
diff --git a/doc/src/images/javastyle/tabwidget.png b/doc/src/images/javastyle/tabwidget.png
new file mode 100644
index 0000000000..737155ccb9
--- /dev/null
+++ b/doc/src/images/javastyle/tabwidget.png
diff --git a/doc/src/images/javastyle/titlebar.png b/doc/src/images/javastyle/titlebar.png
new file mode 100644
index 0000000000..5d7ecc481d
--- /dev/null
+++ b/doc/src/images/javastyle/titlebar.png
diff --git a/doc/src/images/javastyle/titlebarimage.png b/doc/src/images/javastyle/titlebarimage.png
new file mode 100644
index 0000000000..50287aeb1d
--- /dev/null
+++ b/doc/src/images/javastyle/titlebarimage.png
diff --git a/doc/src/images/javastyle/toolbar.png b/doc/src/images/javastyle/toolbar.png
new file mode 100644
index 0000000000..e69e8df4c8
--- /dev/null
+++ b/doc/src/images/javastyle/toolbar.png
diff --git a/doc/src/images/javastyle/toolbarimage.png b/doc/src/images/javastyle/toolbarimage.png
new file mode 100644
index 0000000000..b9025f582a
--- /dev/null
+++ b/doc/src/images/javastyle/toolbarimage.png
diff --git a/doc/src/images/javastyle/toolbox.png b/doc/src/images/javastyle/toolbox.png
new file mode 100644
index 0000000000..c5f61ecec8
--- /dev/null
+++ b/doc/src/images/javastyle/toolbox.png
diff --git a/doc/src/images/javastyle/toolboximage.png b/doc/src/images/javastyle/toolboximage.png
new file mode 100644
index 0000000000..7bcbd26432
--- /dev/null
+++ b/doc/src/images/javastyle/toolboximage.png
diff --git a/doc/src/images/javastyle/toolbutton.png b/doc/src/images/javastyle/toolbutton.png
new file mode 100644
index 0000000000..9167e83f75
--- /dev/null
+++ b/doc/src/images/javastyle/toolbutton.png
diff --git a/doc/src/images/javastyle/toolbuttonimage.png b/doc/src/images/javastyle/toolbuttonimage.png
new file mode 100644
index 0000000000..3217172fca
--- /dev/null
+++ b/doc/src/images/javastyle/toolbuttonimage.png
diff --git a/doc/src/images/javastyle/windowstabimage.png b/doc/src/images/javastyle/windowstabimage.png
new file mode 100644
index 0000000000..485e847844
--- /dev/null
+++ b/doc/src/images/javastyle/windowstabimage.png
diff --git a/doc/src/images/layout-examples.png b/doc/src/images/layout-examples.png
new file mode 100644
index 0000000000..eb281277a7
--- /dev/null
+++ b/doc/src/images/layout-examples.png
diff --git a/doc/src/images/layout1.png b/doc/src/images/layout1.png
new file mode 100644
index 0000000000..98cee45612
--- /dev/null
+++ b/doc/src/images/layout1.png
diff --git a/doc/src/images/layout2.png b/doc/src/images/layout2.png
new file mode 100644
index 0000000000..dfa28153f7
--- /dev/null
+++ b/doc/src/images/layout2.png
diff --git a/doc/src/images/layouts-examples.png b/doc/src/images/layouts-examples.png
new file mode 100644
index 0000000000..a7121a97bc
--- /dev/null
+++ b/doc/src/images/layouts-examples.png
diff --git a/doc/src/images/licensewizard-example.png b/doc/src/images/licensewizard-example.png
new file mode 100644
index 0000000000..97b3aaae4b
--- /dev/null
+++ b/doc/src/images/licensewizard-example.png
diff --git a/doc/src/images/licensewizard-flow.png b/doc/src/images/licensewizard-flow.png
new file mode 100644
index 0000000000..76df63a98f
--- /dev/null
+++ b/doc/src/images/licensewizard-flow.png
diff --git a/doc/src/images/licensewizard.png b/doc/src/images/licensewizard.png
new file mode 100644
index 0000000000..40925cc91a
--- /dev/null
+++ b/doc/src/images/licensewizard.png
diff --git a/doc/src/images/lineedits-example.png b/doc/src/images/lineedits-example.png
new file mode 100644
index 0000000000..ff5e3184ad
--- /dev/null
+++ b/doc/src/images/lineedits-example.png
diff --git a/doc/src/images/linguist-arrowpad_en.png b/doc/src/images/linguist-arrowpad_en.png
new file mode 100644
index 0000000000..9a95eb24ff
--- /dev/null
+++ b/doc/src/images/linguist-arrowpad_en.png
diff --git a/doc/src/images/linguist-arrowpad_fr.png b/doc/src/images/linguist-arrowpad_fr.png
new file mode 100644
index 0000000000..fc33f9fd73
--- /dev/null
+++ b/doc/src/images/linguist-arrowpad_fr.png
diff --git a/doc/src/images/linguist-arrowpad_nl.png b/doc/src/images/linguist-arrowpad_nl.png
new file mode 100644
index 0000000000..f2645a81b3
--- /dev/null
+++ b/doc/src/images/linguist-arrowpad_nl.png
diff --git a/doc/src/images/linguist-auxlanguages.png b/doc/src/images/linguist-auxlanguages.png
new file mode 100644
index 0000000000..634605ed8e
--- /dev/null
+++ b/doc/src/images/linguist-auxlanguages.png
diff --git a/doc/src/images/linguist-batchtranslation.png b/doc/src/images/linguist-batchtranslation.png
new file mode 100644
index 0000000000..2423e9e226
--- /dev/null
+++ b/doc/src/images/linguist-batchtranslation.png
diff --git a/doc/src/images/linguist-check-empty.png b/doc/src/images/linguist-check-empty.png
new file mode 100644
index 0000000000..759a41b6c1
--- /dev/null
+++ b/doc/src/images/linguist-check-empty.png
diff --git a/doc/src/images/linguist-check-obsolete.png b/doc/src/images/linguist-check-obsolete.png
new file mode 100644
index 0000000000..b852b639fe
--- /dev/null
+++ b/doc/src/images/linguist-check-obsolete.png
diff --git a/doc/src/images/linguist-check-off.png b/doc/src/images/linguist-check-off.png
new file mode 100644
index 0000000000..640b689729
--- /dev/null
+++ b/doc/src/images/linguist-check-off.png
diff --git a/doc/src/images/linguist-check-on.png b/doc/src/images/linguist-check-on.png
new file mode 100644
index 0000000000..afcaf634dd
--- /dev/null
+++ b/doc/src/images/linguist-check-on.png
diff --git a/doc/src/images/linguist-check-warning.png b/doc/src/images/linguist-check-warning.png
new file mode 100644
index 0000000000..f689c33031
--- /dev/null
+++ b/doc/src/images/linguist-check-warning.png
diff --git a/doc/src/images/linguist-danger.png b/doc/src/images/linguist-danger.png
new file mode 100644
index 0000000000..e10157768c
--- /dev/null
+++ b/doc/src/images/linguist-danger.png
diff --git a/doc/src/images/linguist-doneandnext.png b/doc/src/images/linguist-doneandnext.png
new file mode 100644
index 0000000000..18f2fb6537
--- /dev/null
+++ b/doc/src/images/linguist-doneandnext.png
diff --git a/doc/src/images/linguist-editcopy.png b/doc/src/images/linguist-editcopy.png
new file mode 100644
index 0000000000..d542c3b21f
--- /dev/null
+++ b/doc/src/images/linguist-editcopy.png
diff --git a/doc/src/images/linguist-editcut.png b/doc/src/images/linguist-editcut.png
new file mode 100644
index 0000000000..38e55f7420
--- /dev/null
+++ b/doc/src/images/linguist-editcut.png
diff --git a/doc/src/images/linguist-editfind.png b/doc/src/images/linguist-editfind.png
new file mode 100644
index 0000000000..6ea35e930d
--- /dev/null
+++ b/doc/src/images/linguist-editfind.png
diff --git a/doc/src/images/linguist-editpaste.png b/doc/src/images/linguist-editpaste.png
new file mode 100644
index 0000000000..717dd86755
--- /dev/null
+++ b/doc/src/images/linguist-editpaste.png
diff --git a/doc/src/images/linguist-editredo.png b/doc/src/images/linguist-editredo.png
new file mode 100644
index 0000000000..9d679fe6fc
--- /dev/null
+++ b/doc/src/images/linguist-editredo.png
diff --git a/doc/src/images/linguist-editundo.png b/doc/src/images/linguist-editundo.png
new file mode 100644
index 0000000000..eee23d24a3
--- /dev/null
+++ b/doc/src/images/linguist-editundo.png
diff --git a/doc/src/images/linguist-examples.png b/doc/src/images/linguist-examples.png
new file mode 100644
index 0000000000..c39ed5dfc0
--- /dev/null
+++ b/doc/src/images/linguist-examples.png
diff --git a/doc/src/images/linguist-fileopen.png b/doc/src/images/linguist-fileopen.png
new file mode 100644
index 0000000000..1b3e69f6aa
--- /dev/null
+++ b/doc/src/images/linguist-fileopen.png
diff --git a/doc/src/images/linguist-fileprint.png b/doc/src/images/linguist-fileprint.png
new file mode 100644
index 0000000000..2afb769ee2
--- /dev/null
+++ b/doc/src/images/linguist-fileprint.png
diff --git a/doc/src/images/linguist-filesave.png b/doc/src/images/linguist-filesave.png
new file mode 100644
index 0000000000..46eac82ad1
--- /dev/null
+++ b/doc/src/images/linguist-filesave.png
diff --git a/doc/src/images/linguist-finddialog.png b/doc/src/images/linguist-finddialog.png
new file mode 100644
index 0000000000..831a3934e8
--- /dev/null
+++ b/doc/src/images/linguist-finddialog.png
diff --git a/doc/src/images/linguist-hellotr_en.png b/doc/src/images/linguist-hellotr_en.png
new file mode 100644
index 0000000000..6b3d8072cd
--- /dev/null
+++ b/doc/src/images/linguist-hellotr_en.png
diff --git a/doc/src/images/linguist-hellotr_la.png b/doc/src/images/linguist-hellotr_la.png
new file mode 100644
index 0000000000..f1ecdb07ad
--- /dev/null
+++ b/doc/src/images/linguist-hellotr_la.png
diff --git a/doc/src/images/linguist-linguist.png b/doc/src/images/linguist-linguist.png
new file mode 100644
index 0000000000..303d20b7e1
--- /dev/null
+++ b/doc/src/images/linguist-linguist.png
diff --git a/doc/src/images/linguist-linguist_2.png b/doc/src/images/linguist-linguist_2.png
new file mode 100644
index 0000000000..9ef1c2c680
--- /dev/null
+++ b/doc/src/images/linguist-linguist_2.png
diff --git a/doc/src/images/linguist-menubar.png b/doc/src/images/linguist-menubar.png
new file mode 100644
index 0000000000..bc510be520
--- /dev/null
+++ b/doc/src/images/linguist-menubar.png
diff --git a/doc/src/images/linguist-next.png b/doc/src/images/linguist-next.png
new file mode 100644
index 0000000000..7700d6fce6
--- /dev/null
+++ b/doc/src/images/linguist-next.png
diff --git a/doc/src/images/linguist-nextunfinished.png b/doc/src/images/linguist-nextunfinished.png
new file mode 100644
index 0000000000..05c92bdf80
--- /dev/null
+++ b/doc/src/images/linguist-nextunfinished.png
diff --git a/doc/src/images/linguist-phrasebookdialog.png b/doc/src/images/linguist-phrasebookdialog.png
new file mode 100644
index 0000000000..eb5da708d0
--- /dev/null
+++ b/doc/src/images/linguist-phrasebookdialog.png
diff --git a/doc/src/images/linguist-phrasebookopen.png b/doc/src/images/linguist-phrasebookopen.png
new file mode 100644
index 0000000000..1b354555e7
--- /dev/null
+++ b/doc/src/images/linguist-phrasebookopen.png
diff --git a/doc/src/images/linguist-prev.png b/doc/src/images/linguist-prev.png
new file mode 100644
index 0000000000..99dc8733c7
--- /dev/null
+++ b/doc/src/images/linguist-prev.png
diff --git a/doc/src/images/linguist-previewtool.png b/doc/src/images/linguist-previewtool.png
new file mode 100644
index 0000000000..c4fca3cf51
--- /dev/null
+++ b/doc/src/images/linguist-previewtool.png
diff --git a/doc/src/images/linguist-prevunfinished.png b/doc/src/images/linguist-prevunfinished.png
new file mode 100644
index 0000000000..15c13eaf4d
--- /dev/null
+++ b/doc/src/images/linguist-prevunfinished.png
diff --git a/doc/src/images/linguist-toolbar.png b/doc/src/images/linguist-toolbar.png
new file mode 100644
index 0000000000..b45c31b0f6
--- /dev/null
+++ b/doc/src/images/linguist-toolbar.png
diff --git a/doc/src/images/linguist-translationfilesettings.png b/doc/src/images/linguist-translationfilesettings.png
new file mode 100644
index 0000000000..e524c05a9a
--- /dev/null
+++ b/doc/src/images/linguist-translationfilesettings.png
diff --git a/doc/src/images/linguist-trollprint_10_en.png b/doc/src/images/linguist-trollprint_10_en.png
new file mode 100644
index 0000000000..e460481f96
--- /dev/null
+++ b/doc/src/images/linguist-trollprint_10_en.png
diff --git a/doc/src/images/linguist-trollprint_10_pt_bad.png b/doc/src/images/linguist-trollprint_10_pt_bad.png
new file mode 100644
index 0000000000..b96d477240
--- /dev/null
+++ b/doc/src/images/linguist-trollprint_10_pt_bad.png
diff --git a/doc/src/images/linguist-trollprint_10_pt_good.png b/doc/src/images/linguist-trollprint_10_pt_good.png
new file mode 100644
index 0000000000..293c44a746
--- /dev/null
+++ b/doc/src/images/linguist-trollprint_10_pt_good.png
diff --git a/doc/src/images/linguist-trollprint_11_en.png b/doc/src/images/linguist-trollprint_11_en.png
new file mode 100644
index 0000000000..f718c995c0
--- /dev/null
+++ b/doc/src/images/linguist-trollprint_11_en.png
diff --git a/doc/src/images/linguist-trollprint_11_pt.png b/doc/src/images/linguist-trollprint_11_pt.png
new file mode 100644
index 0000000000..0ff8c399b3
--- /dev/null
+++ b/doc/src/images/linguist-trollprint_11_pt.png
diff --git a/doc/src/images/linguist-validateaccelerators.png b/doc/src/images/linguist-validateaccelerators.png
new file mode 100644
index 0000000000..4f726487f8
--- /dev/null
+++ b/doc/src/images/linguist-validateaccelerators.png
diff --git a/doc/src/images/linguist-validatephrases.png b/doc/src/images/linguist-validatephrases.png
new file mode 100644
index 0000000000..30c3ee61b6
--- /dev/null
+++ b/doc/src/images/linguist-validatephrases.png
diff --git a/doc/src/images/linguist-validateplacemarkers.png b/doc/src/images/linguist-validateplacemarkers.png
new file mode 100644
index 0000000000..cc127fde9f
--- /dev/null
+++ b/doc/src/images/linguist-validateplacemarkers.png
diff --git a/doc/src/images/linguist-validatepunctuation.png b/doc/src/images/linguist-validatepunctuation.png
new file mode 100644
index 0000000000..3492f95eb7
--- /dev/null
+++ b/doc/src/images/linguist-validatepunctuation.png
diff --git a/doc/src/images/linguist-whatsthis.png b/doc/src/images/linguist-whatsthis.png
new file mode 100644
index 0000000000..0b5d46aade
--- /dev/null
+++ b/doc/src/images/linguist-whatsthis.png
diff --git a/doc/src/images/localfortuneclient-example.png b/doc/src/images/localfortuneclient-example.png
new file mode 100644
index 0000000000..614784bf0f
--- /dev/null
+++ b/doc/src/images/localfortuneclient-example.png
diff --git a/doc/src/images/localfortuneserver-example.png b/doc/src/images/localfortuneserver-example.png
new file mode 100644
index 0000000000..2f04c7528e
--- /dev/null
+++ b/doc/src/images/localfortuneserver-example.png
diff --git a/doc/src/images/loopback-example.png b/doc/src/images/loopback-example.png
new file mode 100644
index 0000000000..2b1bd4a0f2
--- /dev/null
+++ b/doc/src/images/loopback-example.png
diff --git a/doc/src/images/mac-cocoa.png b/doc/src/images/mac-cocoa.png
new file mode 100644
index 0000000000..06c0ba0a74
--- /dev/null
+++ b/doc/src/images/mac-cocoa.png
diff --git a/doc/src/images/macintosh-calendarwidget.png b/doc/src/images/macintosh-calendarwidget.png
new file mode 100644
index 0000000000..2f743501a9
--- /dev/null
+++ b/doc/src/images/macintosh-calendarwidget.png
diff --git a/doc/src/images/macintosh-checkbox.png b/doc/src/images/macintosh-checkbox.png
new file mode 100644
index 0000000000..d0130e3f22
--- /dev/null
+++ b/doc/src/images/macintosh-checkbox.png
diff --git a/doc/src/images/macintosh-combobox.png b/doc/src/images/macintosh-combobox.png
new file mode 100644
index 0000000000..c1dc3c0c96
--- /dev/null
+++ b/doc/src/images/macintosh-combobox.png
diff --git a/doc/src/images/macintosh-dateedit.png b/doc/src/images/macintosh-dateedit.png
new file mode 100644
index 0000000000..45aee90a9b
--- /dev/null
+++ b/doc/src/images/macintosh-dateedit.png
diff --git a/doc/src/images/macintosh-datetimeedit.png b/doc/src/images/macintosh-datetimeedit.png
new file mode 100644
index 0000000000..62af02d64e
--- /dev/null
+++ b/doc/src/images/macintosh-datetimeedit.png
diff --git a/doc/src/images/macintosh-dial.png b/doc/src/images/macintosh-dial.png
new file mode 100644
index 0000000000..df0ffe23a1
--- /dev/null
+++ b/doc/src/images/macintosh-dial.png
diff --git a/doc/src/images/macintosh-doublespinbox.png b/doc/src/images/macintosh-doublespinbox.png
new file mode 100644
index 0000000000..a0695ff278
--- /dev/null
+++ b/doc/src/images/macintosh-doublespinbox.png
diff --git a/doc/src/images/macintosh-fontcombobox.png b/doc/src/images/macintosh-fontcombobox.png
new file mode 100644
index 0000000000..8a5a3c78a3
--- /dev/null
+++ b/doc/src/images/macintosh-fontcombobox.png
diff --git a/doc/src/images/macintosh-frame.png b/doc/src/images/macintosh-frame.png
new file mode 100644
index 0000000000..fee61a3643
--- /dev/null
+++ b/doc/src/images/macintosh-frame.png
diff --git a/doc/src/images/macintosh-groupbox.png b/doc/src/images/macintosh-groupbox.png
new file mode 100644
index 0000000000..f6c7bce580
--- /dev/null
+++ b/doc/src/images/macintosh-groupbox.png
diff --git a/doc/src/images/macintosh-horizontalscrollbar.png b/doc/src/images/macintosh-horizontalscrollbar.png
new file mode 100644
index 0000000000..8b63572a9e
--- /dev/null
+++ b/doc/src/images/macintosh-horizontalscrollbar.png
diff --git a/doc/src/images/macintosh-label.png b/doc/src/images/macintosh-label.png
new file mode 100644
index 0000000000..753aa4d138
--- /dev/null
+++ b/doc/src/images/macintosh-label.png
diff --git a/doc/src/images/macintosh-lcdnumber.png b/doc/src/images/macintosh-lcdnumber.png
new file mode 100644
index 0000000000..2ea9ea0713
--- /dev/null
+++ b/doc/src/images/macintosh-lcdnumber.png
diff --git a/doc/src/images/macintosh-lineedit.png b/doc/src/images/macintosh-lineedit.png
new file mode 100644
index 0000000000..0e992c7ffe
--- /dev/null
+++ b/doc/src/images/macintosh-lineedit.png
diff --git a/doc/src/images/macintosh-listview.png b/doc/src/images/macintosh-listview.png
new file mode 100644
index 0000000000..346e6427ff
--- /dev/null
+++ b/doc/src/images/macintosh-listview.png
diff --git a/doc/src/images/macintosh-menu.png b/doc/src/images/macintosh-menu.png
new file mode 100644
index 0000000000..59bdceaab6
--- /dev/null
+++ b/doc/src/images/macintosh-menu.png
diff --git a/doc/src/images/macintosh-progressbar.png b/doc/src/images/macintosh-progressbar.png
new file mode 100644
index 0000000000..2dfc8aba81
--- /dev/null
+++ b/doc/src/images/macintosh-progressbar.png
diff --git a/doc/src/images/macintosh-pushbutton.png b/doc/src/images/macintosh-pushbutton.png
new file mode 100644
index 0000000000..7ec14910d8
--- /dev/null
+++ b/doc/src/images/macintosh-pushbutton.png
diff --git a/doc/src/images/macintosh-radiobutton.png b/doc/src/images/macintosh-radiobutton.png
new file mode 100644
index 0000000000..8b02f509ff
--- /dev/null
+++ b/doc/src/images/macintosh-radiobutton.png
diff --git a/doc/src/images/macintosh-slider.png b/doc/src/images/macintosh-slider.png
new file mode 100644
index 0000000000..bf0c5464e9
--- /dev/null
+++ b/doc/src/images/macintosh-slider.png
diff --git a/doc/src/images/macintosh-spinbox.png b/doc/src/images/macintosh-spinbox.png
new file mode 100644
index 0000000000..4196c37246
--- /dev/null
+++ b/doc/src/images/macintosh-spinbox.png
diff --git a/doc/src/images/macintosh-tableview.png b/doc/src/images/macintosh-tableview.png
new file mode 100644
index 0000000000..e6512494de
--- /dev/null
+++ b/doc/src/images/macintosh-tableview.png
diff --git a/doc/src/images/macintosh-tabwidget.png b/doc/src/images/macintosh-tabwidget.png
new file mode 100644
index 0000000000..1d174a47e6
--- /dev/null
+++ b/doc/src/images/macintosh-tabwidget.png
diff --git a/doc/src/images/macintosh-textedit.png b/doc/src/images/macintosh-textedit.png
new file mode 100644
index 0000000000..4f0ce36baf
--- /dev/null
+++ b/doc/src/images/macintosh-textedit.png
diff --git a/doc/src/images/macintosh-timeedit.png b/doc/src/images/macintosh-timeedit.png
new file mode 100644
index 0000000000..4bcfce33f8
--- /dev/null
+++ b/doc/src/images/macintosh-timeedit.png
diff --git a/doc/src/images/macintosh-toolbox.png b/doc/src/images/macintosh-toolbox.png
new file mode 100644
index 0000000000..18d41ea595
--- /dev/null
+++ b/doc/src/images/macintosh-toolbox.png
diff --git a/doc/src/images/macintosh-toolbutton.png b/doc/src/images/macintosh-toolbutton.png
new file mode 100644
index 0000000000..f91331cc51
--- /dev/null
+++ b/doc/src/images/macintosh-toolbutton.png
diff --git a/doc/src/images/macintosh-treeview.png b/doc/src/images/macintosh-treeview.png
new file mode 100644
index 0000000000..afda6d8372
--- /dev/null
+++ b/doc/src/images/macintosh-treeview.png
diff --git a/doc/src/images/macintosh-unified-toolbar.png b/doc/src/images/macintosh-unified-toolbar.png
new file mode 100644
index 0000000000..dadd83634b
--- /dev/null
+++ b/doc/src/images/macintosh-unified-toolbar.png
diff --git a/doc/src/images/macmainwindow.png b/doc/src/images/macmainwindow.png
new file mode 100644
index 0000000000..84eb11ca5e
--- /dev/null
+++ b/doc/src/images/macmainwindow.png
diff --git a/doc/src/images/mainwindow-contextmenu.png b/doc/src/images/mainwindow-contextmenu.png
new file mode 100644
index 0000000000..439ab21f64
--- /dev/null
+++ b/doc/src/images/mainwindow-contextmenu.png
diff --git a/doc/src/images/mainwindow-custom-dock.png b/doc/src/images/mainwindow-custom-dock.png
new file mode 100644
index 0000000000..ca86471c43
--- /dev/null
+++ b/doc/src/images/mainwindow-custom-dock.png
diff --git a/doc/src/images/mainwindow-demo.png b/doc/src/images/mainwindow-demo.png
new file mode 100644
index 0000000000..5799dc0fa3
--- /dev/null
+++ b/doc/src/images/mainwindow-demo.png
diff --git a/doc/src/images/mainwindow-docks-example.png b/doc/src/images/mainwindow-docks-example.png
new file mode 100644
index 0000000000..a5641fd9cd
--- /dev/null
+++ b/doc/src/images/mainwindow-docks-example.png
diff --git a/doc/src/images/mainwindow-docks.png b/doc/src/images/mainwindow-docks.png
new file mode 100644
index 0000000000..24f42a28ea
--- /dev/null
+++ b/doc/src/images/mainwindow-docks.png
diff --git a/doc/src/images/mainwindow-examples.png b/doc/src/images/mainwindow-examples.png
new file mode 100644
index 0000000000..3e946a68bf
--- /dev/null
+++ b/doc/src/images/mainwindow-examples.png
diff --git a/doc/src/images/mainwindow-vertical-dock.png b/doc/src/images/mainwindow-vertical-dock.png
new file mode 100644
index 0000000000..b6996ecf0d
--- /dev/null
+++ b/doc/src/images/mainwindow-vertical-dock.png
diff --git a/doc/src/images/mainwindow-vertical-tabs.png b/doc/src/images/mainwindow-vertical-tabs.png
new file mode 100644
index 0000000000..fcb901a0b5
--- /dev/null
+++ b/doc/src/images/mainwindow-vertical-tabs.png
diff --git a/doc/src/images/mainwindowlayout.png b/doc/src/images/mainwindowlayout.png
new file mode 100644
index 0000000000..4776ce4f1b
--- /dev/null
+++ b/doc/src/images/mainwindowlayout.png
diff --git a/doc/src/images/mainwindows-examples.png b/doc/src/images/mainwindows-examples.png
new file mode 100644
index 0000000000..45bf0ab9b7
--- /dev/null
+++ b/doc/src/images/mainwindows-examples.png
diff --git a/doc/src/images/mandelbrot-example.png b/doc/src/images/mandelbrot-example.png
new file mode 100644
index 0000000000..f5817834e1
--- /dev/null
+++ b/doc/src/images/mandelbrot-example.png
diff --git a/doc/src/images/mandelbrot_scroll1.png b/doc/src/images/mandelbrot_scroll1.png
new file mode 100644
index 0000000000..b800455821
--- /dev/null
+++ b/doc/src/images/mandelbrot_scroll1.png
diff --git a/doc/src/images/mandelbrot_scroll2.png b/doc/src/images/mandelbrot_scroll2.png
new file mode 100644
index 0000000000..704ea0a7c1
--- /dev/null
+++ b/doc/src/images/mandelbrot_scroll2.png
diff --git a/doc/src/images/mandelbrot_scroll3.png b/doc/src/images/mandelbrot_scroll3.png
new file mode 100644
index 0000000000..8b48211444
--- /dev/null
+++ b/doc/src/images/mandelbrot_scroll3.png
diff --git a/doc/src/images/mandelbrot_zoom1.png b/doc/src/images/mandelbrot_zoom1.png
new file mode 100644
index 0000000000..30190e44eb
--- /dev/null
+++ b/doc/src/images/mandelbrot_zoom1.png
diff --git a/doc/src/images/mandelbrot_zoom2.png b/doc/src/images/mandelbrot_zoom2.png
new file mode 100644
index 0000000000..148ac777b8
--- /dev/null
+++ b/doc/src/images/mandelbrot_zoom2.png
diff --git a/doc/src/images/mandelbrot_zoom3.png b/doc/src/images/mandelbrot_zoom3.png
new file mode 100644
index 0000000000..a669f4b5fe
--- /dev/null
+++ b/doc/src/images/mandelbrot_zoom3.png
diff --git a/doc/src/images/masterdetail-example.png b/doc/src/images/masterdetail-example.png
new file mode 100644
index 0000000000..bc282b7a78
--- /dev/null
+++ b/doc/src/images/masterdetail-example.png
diff --git a/doc/src/images/mdi-cascade.png b/doc/src/images/mdi-cascade.png
new file mode 100644
index 0000000000..ca55a5b894
--- /dev/null
+++ b/doc/src/images/mdi-cascade.png
diff --git a/doc/src/images/mdi-example.png b/doc/src/images/mdi-example.png
new file mode 100644
index 0000000000..240f9e222c
--- /dev/null
+++ b/doc/src/images/mdi-example.png
diff --git a/doc/src/images/mdi-tile.png b/doc/src/images/mdi-tile.png
new file mode 100644
index 0000000000..1486d9654e
--- /dev/null
+++ b/doc/src/images/mdi-tile.png
diff --git a/doc/src/images/mediaplayer-demo.png b/doc/src/images/mediaplayer-demo.png
new file mode 100644
index 0000000000..2c1f9b4e6d
--- /dev/null
+++ b/doc/src/images/mediaplayer-demo.png
diff --git a/doc/src/images/menus-example.png b/doc/src/images/menus-example.png
new file mode 100644
index 0000000000..81e6e0d270
--- /dev/null
+++ b/doc/src/images/menus-example.png
diff --git a/doc/src/images/modelindex-no-parent.png b/doc/src/images/modelindex-no-parent.png
new file mode 100644
index 0000000000..9c6258e5d1
--- /dev/null
+++ b/doc/src/images/modelindex-no-parent.png
diff --git a/doc/src/images/modelindex-parent.png b/doc/src/images/modelindex-parent.png
new file mode 100644
index 0000000000..26d41583ce
--- /dev/null
+++ b/doc/src/images/modelindex-parent.png
diff --git a/doc/src/images/modelview-begin-append-columns.png b/doc/src/images/modelview-begin-append-columns.png
new file mode 100644
index 0000000000..8d13b178d8
--- /dev/null
+++ b/doc/src/images/modelview-begin-append-columns.png
diff --git a/doc/src/images/modelview-begin-append-rows.png b/doc/src/images/modelview-begin-append-rows.png
new file mode 100644
index 0000000000..50d04c3e67
--- /dev/null
+++ b/doc/src/images/modelview-begin-append-rows.png
diff --git a/doc/src/images/modelview-begin-insert-columns.png b/doc/src/images/modelview-begin-insert-columns.png
new file mode 100644
index 0000000000..30eeb8280e
--- /dev/null
+++ b/doc/src/images/modelview-begin-insert-columns.png
diff --git a/doc/src/images/modelview-begin-insert-rows.png b/doc/src/images/modelview-begin-insert-rows.png
new file mode 100644
index 0000000000..b4d6eda57d
--- /dev/null
+++ b/doc/src/images/modelview-begin-insert-rows.png
diff --git a/doc/src/images/modelview-begin-remove-columns.png b/doc/src/images/modelview-begin-remove-columns.png
new file mode 100644
index 0000000000..aee60e01ec
--- /dev/null
+++ b/doc/src/images/modelview-begin-remove-columns.png
diff --git a/doc/src/images/modelview-begin-remove-rows.png b/doc/src/images/modelview-begin-remove-rows.png
new file mode 100644
index 0000000000..8e9518718e
--- /dev/null
+++ b/doc/src/images/modelview-begin-remove-rows.png
diff --git a/doc/src/images/modelview-listmodel.png b/doc/src/images/modelview-listmodel.png
new file mode 100644
index 0000000000..6be5e15883
--- /dev/null
+++ b/doc/src/images/modelview-listmodel.png
diff --git a/doc/src/images/modelview-models.png b/doc/src/images/modelview-models.png
new file mode 100644
index 0000000000..183a7cffd5
--- /dev/null
+++ b/doc/src/images/modelview-models.png
diff --git a/doc/src/images/modelview-overview.png b/doc/src/images/modelview-overview.png
new file mode 100644
index 0000000000..41e3a6827f
--- /dev/null
+++ b/doc/src/images/modelview-overview.png
diff --git a/doc/src/images/modelview-roles.png b/doc/src/images/modelview-roles.png
new file mode 100644
index 0000000000..2a60ce7190
--- /dev/null
+++ b/doc/src/images/modelview-roles.png
diff --git a/doc/src/images/modelview-tablemodel.png b/doc/src/images/modelview-tablemodel.png
new file mode 100644
index 0000000000..9a9ea2f1b0
--- /dev/null
+++ b/doc/src/images/modelview-tablemodel.png
diff --git a/doc/src/images/modelview-treemodel.png b/doc/src/images/modelview-treemodel.png
new file mode 100644
index 0000000000..f7b02eb150
--- /dev/null
+++ b/doc/src/images/modelview-treemodel.png
diff --git a/doc/src/images/motif-calendarwidget.png b/doc/src/images/motif-calendarwidget.png
new file mode 100644
index 0000000000..4ce6aebc21
--- /dev/null
+++ b/doc/src/images/motif-calendarwidget.png
diff --git a/doc/src/images/motif-checkbox.png b/doc/src/images/motif-checkbox.png
new file mode 100644
index 0000000000..2a263273a6
--- /dev/null
+++ b/doc/src/images/motif-checkbox.png
diff --git a/doc/src/images/motif-combobox.png b/doc/src/images/motif-combobox.png
new file mode 100644
index 0000000000..2a288d9f40
--- /dev/null
+++ b/doc/src/images/motif-combobox.png
diff --git a/doc/src/images/motif-dateedit.png b/doc/src/images/motif-dateedit.png
new file mode 100644
index 0000000000..d00c45ff65
--- /dev/null
+++ b/doc/src/images/motif-dateedit.png
diff --git a/doc/src/images/motif-datetimeedit.png b/doc/src/images/motif-datetimeedit.png
new file mode 100644
index 0000000000..cc43ef888d
--- /dev/null
+++ b/doc/src/images/motif-datetimeedit.png
diff --git a/doc/src/images/motif-dial.png b/doc/src/images/motif-dial.png
new file mode 100644
index 0000000000..36b3ff7be0
--- /dev/null
+++ b/doc/src/images/motif-dial.png
diff --git a/doc/src/images/motif-doublespinbox.png b/doc/src/images/motif-doublespinbox.png
new file mode 100644
index 0000000000..6092913ab0
--- /dev/null
+++ b/doc/src/images/motif-doublespinbox.png
diff --git a/doc/src/images/motif-fontcombobox.png b/doc/src/images/motif-fontcombobox.png
new file mode 100644
index 0000000000..c07452d85e
--- /dev/null
+++ b/doc/src/images/motif-fontcombobox.png
diff --git a/doc/src/images/motif-frame.png b/doc/src/images/motif-frame.png
new file mode 100644
index 0000000000..55dcc32227
--- /dev/null
+++ b/doc/src/images/motif-frame.png
diff --git a/doc/src/images/motif-groupbox.png b/doc/src/images/motif-groupbox.png
new file mode 100644
index 0000000000..13742b116e
--- /dev/null
+++ b/doc/src/images/motif-groupbox.png
diff --git a/doc/src/images/motif-horizontalscrollbar.png b/doc/src/images/motif-horizontalscrollbar.png
new file mode 100644
index 0000000000..dab1d3f6f6
--- /dev/null
+++ b/doc/src/images/motif-horizontalscrollbar.png
diff --git a/doc/src/images/motif-label.png b/doc/src/images/motif-label.png
new file mode 100644
index 0000000000..7ae6674f50
--- /dev/null
+++ b/doc/src/images/motif-label.png
diff --git a/doc/src/images/motif-lcdnumber.png b/doc/src/images/motif-lcdnumber.png
new file mode 100644
index 0000000000..e2cc9a8058
--- /dev/null
+++ b/doc/src/images/motif-lcdnumber.png
diff --git a/doc/src/images/motif-lineedit.png b/doc/src/images/motif-lineedit.png
new file mode 100644
index 0000000000..a335c8c107
--- /dev/null
+++ b/doc/src/images/motif-lineedit.png
diff --git a/doc/src/images/motif-listview.png b/doc/src/images/motif-listview.png
new file mode 100644
index 0000000000..47bd3eae6d
--- /dev/null
+++ b/doc/src/images/motif-listview.png
diff --git a/doc/src/images/motif-menubar.png b/doc/src/images/motif-menubar.png
new file mode 100644
index 0000000000..f1d9f4bb3d
--- /dev/null
+++ b/doc/src/images/motif-menubar.png
diff --git a/doc/src/images/motif-progressbar.png b/doc/src/images/motif-progressbar.png
new file mode 100644
index 0000000000..f6d6979b86
--- /dev/null
+++ b/doc/src/images/motif-progressbar.png
diff --git a/doc/src/images/motif-pushbutton.png b/doc/src/images/motif-pushbutton.png
new file mode 100644
index 0000000000..9dc6a9db78
--- /dev/null
+++ b/doc/src/images/motif-pushbutton.png
diff --git a/doc/src/images/motif-radiobutton.png b/doc/src/images/motif-radiobutton.png
new file mode 100644
index 0000000000..468e54cfcf
--- /dev/null
+++ b/doc/src/images/motif-radiobutton.png
diff --git a/doc/src/images/motif-slider.png b/doc/src/images/motif-slider.png
new file mode 100644
index 0000000000..6301e2b26d
--- /dev/null
+++ b/doc/src/images/motif-slider.png
diff --git a/doc/src/images/motif-spinbox.png b/doc/src/images/motif-spinbox.png
new file mode 100644
index 0000000000..9acc2821c8
--- /dev/null
+++ b/doc/src/images/motif-spinbox.png
diff --git a/doc/src/images/motif-tableview.png b/doc/src/images/motif-tableview.png
new file mode 100644
index 0000000000..a1d205aaed
--- /dev/null
+++ b/doc/src/images/motif-tableview.png
diff --git a/doc/src/images/motif-tabwidget.png b/doc/src/images/motif-tabwidget.png
new file mode 100644
index 0000000000..19da66a76c
--- /dev/null
+++ b/doc/src/images/motif-tabwidget.png
diff --git a/doc/src/images/motif-textedit.png b/doc/src/images/motif-textedit.png
new file mode 100644
index 0000000000..205bc19cfa
--- /dev/null
+++ b/doc/src/images/motif-textedit.png
diff --git a/doc/src/images/motif-timeedit.png b/doc/src/images/motif-timeedit.png
new file mode 100644
index 0000000000..1ad459b886
--- /dev/null
+++ b/doc/src/images/motif-timeedit.png
diff --git a/doc/src/images/motif-todo.png b/doc/src/images/motif-todo.png
new file mode 100644
index 0000000000..be39c48bfb
--- /dev/null
+++ b/doc/src/images/motif-todo.png
diff --git a/doc/src/images/motif-toolbox.png b/doc/src/images/motif-toolbox.png
new file mode 100644
index 0000000000..4bc3c37bb2
--- /dev/null
+++ b/doc/src/images/motif-toolbox.png
diff --git a/doc/src/images/motif-toolbutton.png b/doc/src/images/motif-toolbutton.png
new file mode 100644
index 0000000000..8ef51ddd8d
--- /dev/null
+++ b/doc/src/images/motif-toolbutton.png
diff --git a/doc/src/images/motif-treeview.png b/doc/src/images/motif-treeview.png
new file mode 100644
index 0000000000..a7dd0f2466
--- /dev/null
+++ b/doc/src/images/motif-treeview.png
diff --git a/doc/src/images/movie-example.png b/doc/src/images/movie-example.png
new file mode 100644
index 0000000000..713f56347e
--- /dev/null
+++ b/doc/src/images/movie-example.png
diff --git a/doc/src/images/msgbox1.png b/doc/src/images/msgbox1.png
new file mode 100644
index 0000000000..1380e20a5f
--- /dev/null
+++ b/doc/src/images/msgbox1.png
diff --git a/doc/src/images/msgbox2.png b/doc/src/images/msgbox2.png
new file mode 100644
index 0000000000..e7946996e4
--- /dev/null
+++ b/doc/src/images/msgbox2.png
diff --git a/doc/src/images/msgbox3.png b/doc/src/images/msgbox3.png
new file mode 100644
index 0000000000..bd81f4d4da
--- /dev/null
+++ b/doc/src/images/msgbox3.png
diff --git a/doc/src/images/msgbox4.png b/doc/src/images/msgbox4.png
new file mode 100644
index 0000000000..dbe6701cdd
--- /dev/null
+++ b/doc/src/images/msgbox4.png
diff --git a/doc/src/images/multipleinheritance-example.png b/doc/src/images/multipleinheritance-example.png
new file mode 100644
index 0000000000..9e89292973
--- /dev/null
+++ b/doc/src/images/multipleinheritance-example.png
diff --git a/doc/src/images/musicplayer.png b/doc/src/images/musicplayer.png
new file mode 100644
index 0000000000..4f3ebf759e
--- /dev/null
+++ b/doc/src/images/musicplayer.png
diff --git a/doc/src/images/network-chat-example.png b/doc/src/images/network-chat-example.png
new file mode 100644
index 0000000000..949bb07d87
--- /dev/null
+++ b/doc/src/images/network-chat-example.png
diff --git a/doc/src/images/network-examples.png b/doc/src/images/network-examples.png
new file mode 100644
index 0000000000..15dfba850a
--- /dev/null
+++ b/doc/src/images/network-examples.png
diff --git a/doc/src/images/noforeignkeys.png b/doc/src/images/noforeignkeys.png
new file mode 100644
index 0000000000..62a4452277
--- /dev/null
+++ b/doc/src/images/noforeignkeys.png
diff --git a/doc/src/images/opengl-examples.png b/doc/src/images/opengl-examples.png
new file mode 100644
index 0000000000..8acdf8cabd
--- /dev/null
+++ b/doc/src/images/opengl-examples.png
diff --git a/doc/src/images/orderform-example-detailsdialog.png b/doc/src/images/orderform-example-detailsdialog.png
new file mode 100644
index 0000000000..88263692db
--- /dev/null
+++ b/doc/src/images/orderform-example-detailsdialog.png
diff --git a/doc/src/images/orderform-example.png b/doc/src/images/orderform-example.png
new file mode 100644
index 0000000000..c8545ad23a
--- /dev/null
+++ b/doc/src/images/orderform-example.png
diff --git a/doc/src/images/overpainting-example.png b/doc/src/images/overpainting-example.png
new file mode 100644
index 0000000000..0368dcabc8
--- /dev/null
+++ b/doc/src/images/overpainting-example.png
diff --git a/doc/src/images/padnavigator-example.png b/doc/src/images/padnavigator-example.png
new file mode 100644
index 0000000000..d766557cec
--- /dev/null
+++ b/doc/src/images/padnavigator-example.png
diff --git a/doc/src/images/painterpaths-example.png b/doc/src/images/painterpaths-example.png
new file mode 100644
index 0000000000..7e1220d1d5
--- /dev/null
+++ b/doc/src/images/painterpaths-example.png
diff --git a/doc/src/images/painting-examples.png b/doc/src/images/painting-examples.png
new file mode 100644
index 0000000000..214004ce39
--- /dev/null
+++ b/doc/src/images/painting-examples.png
diff --git a/doc/src/images/paintsystem-antialiasing.png b/doc/src/images/paintsystem-antialiasing.png
new file mode 100644
index 0000000000..1275841b93
--- /dev/null
+++ b/doc/src/images/paintsystem-antialiasing.png
diff --git a/doc/src/images/paintsystem-core.png b/doc/src/images/paintsystem-core.png
new file mode 100644
index 0000000000..7d6a8e591b
--- /dev/null
+++ b/doc/src/images/paintsystem-core.png
diff --git a/doc/src/images/paintsystem-devices.png b/doc/src/images/paintsystem-devices.png
new file mode 100644
index 0000000000..7b81b7cbb8
--- /dev/null
+++ b/doc/src/images/paintsystem-devices.png
diff --git a/doc/src/images/paintsystem-fancygradient.png b/doc/src/images/paintsystem-fancygradient.png
new file mode 100644
index 0000000000..701df29e42
--- /dev/null
+++ b/doc/src/images/paintsystem-fancygradient.png
diff --git a/doc/src/images/paintsystem-gradients.png b/doc/src/images/paintsystem-gradients.png
new file mode 100644
index 0000000000..50b2ed3671
--- /dev/null
+++ b/doc/src/images/paintsystem-gradients.png
diff --git a/doc/src/images/paintsystem-icon.png b/doc/src/images/paintsystem-icon.png
new file mode 100644
index 0000000000..4623db0761
--- /dev/null
+++ b/doc/src/images/paintsystem-icon.png
diff --git a/doc/src/images/paintsystem-movie.png b/doc/src/images/paintsystem-movie.png
new file mode 100644
index 0000000000..992ea9edd4
--- /dev/null
+++ b/doc/src/images/paintsystem-movie.png
diff --git a/doc/src/images/paintsystem-painterpath.png b/doc/src/images/paintsystem-painterpath.png
new file mode 100644
index 0000000000..f8154f2634
--- /dev/null
+++ b/doc/src/images/paintsystem-painterpath.png
diff --git a/doc/src/images/paintsystem-stylepainter.png b/doc/src/images/paintsystem-stylepainter.png
new file mode 100644
index 0000000000..a67c6c5afc
--- /dev/null
+++ b/doc/src/images/paintsystem-stylepainter.png
diff --git a/doc/src/images/paintsystem-svg.png b/doc/src/images/paintsystem-svg.png
new file mode 100644
index 0000000000..ecc8ef8f97
--- /dev/null
+++ b/doc/src/images/paintsystem-svg.png
diff --git a/doc/src/images/palette.png b/doc/src/images/palette.png
new file mode 100644
index 0000000000..832a5a59d9
--- /dev/null
+++ b/doc/src/images/palette.png
diff --git a/doc/src/images/parent-child-widgets.png b/doc/src/images/parent-child-widgets.png
new file mode 100644
index 0000000000..094e2e96b6
--- /dev/null
+++ b/doc/src/images/parent-child-widgets.png
diff --git a/doc/src/images/pathexample.png b/doc/src/images/pathexample.png
new file mode 100644
index 0000000000..7a07db3b9d
--- /dev/null
+++ b/doc/src/images/pathexample.png
diff --git a/doc/src/images/pathstroke-demo.png b/doc/src/images/pathstroke-demo.png
new file mode 100644
index 0000000000..2df765ff32
--- /dev/null
+++ b/doc/src/images/pathstroke-demo.png
diff --git a/doc/src/images/patternist-importFlow.png b/doc/src/images/patternist-importFlow.png
new file mode 100644
index 0000000000..cca5fa0444
--- /dev/null
+++ b/doc/src/images/patternist-importFlow.png
diff --git a/doc/src/images/patternist-wordProcessor.png b/doc/src/images/patternist-wordProcessor.png
new file mode 100644
index 0000000000..09013301a5
--- /dev/null
+++ b/doc/src/images/patternist-wordProcessor.png
diff --git a/doc/src/images/pbuffers-example.png b/doc/src/images/pbuffers-example.png
new file mode 100644
index 0000000000..bafb05a08b
--- /dev/null
+++ b/doc/src/images/pbuffers-example.png
diff --git a/doc/src/images/pbuffers2-example.png b/doc/src/images/pbuffers2-example.png
new file mode 100644
index 0000000000..4a9c7175a3
--- /dev/null
+++ b/doc/src/images/pbuffers2-example.png
diff --git a/doc/src/images/phonon-examples.png b/doc/src/images/phonon-examples.png
new file mode 100644
index 0000000000..56b51378d7
--- /dev/null
+++ b/doc/src/images/phonon-examples.png
diff --git a/doc/src/images/pixelator-example.png b/doc/src/images/pixelator-example.png
new file mode 100644
index 0000000000..b6273c78ec
--- /dev/null
+++ b/doc/src/images/pixelator-example.png
diff --git a/doc/src/images/pixmapfilter-example.png b/doc/src/images/pixmapfilter-example.png
new file mode 100644
index 0000000000..29a6ddcb5f
--- /dev/null
+++ b/doc/src/images/pixmapfilter-example.png
diff --git a/doc/src/images/pixmapfilterexample-colorize.png b/doc/src/images/pixmapfilterexample-colorize.png
new file mode 100644
index 0000000000..0e023a562c
--- /dev/null
+++ b/doc/src/images/pixmapfilterexample-colorize.png
diff --git a/doc/src/images/pixmapfilterexample-dropshadow.png b/doc/src/images/pixmapfilterexample-dropshadow.png
new file mode 100644
index 0000000000..be43659915
--- /dev/null
+++ b/doc/src/images/pixmapfilterexample-dropshadow.png
diff --git a/doc/src/images/plaintext-layout.png b/doc/src/images/plaintext-layout.png
new file mode 100644
index 0000000000..9172d7a044
--- /dev/null
+++ b/doc/src/images/plaintext-layout.png
diff --git a/doc/src/images/plastique-calendarwidget.png b/doc/src/images/plastique-calendarwidget.png
new file mode 100644
index 0000000000..5e65945c72
--- /dev/null
+++ b/doc/src/images/plastique-calendarwidget.png
diff --git a/doc/src/images/plastique-checkbox.png b/doc/src/images/plastique-checkbox.png
new file mode 100644
index 0000000000..91a5109d65
--- /dev/null
+++ b/doc/src/images/plastique-checkbox.png
diff --git a/doc/src/images/plastique-colordialog.png b/doc/src/images/plastique-colordialog.png
new file mode 100644
index 0000000000..68bf4d0b4b
--- /dev/null
+++ b/doc/src/images/plastique-colordialog.png
diff --git a/doc/src/images/plastique-combobox.png b/doc/src/images/plastique-combobox.png
new file mode 100644
index 0000000000..e3bf8a321f
--- /dev/null
+++ b/doc/src/images/plastique-combobox.png
diff --git a/doc/src/images/plastique-dateedit.png b/doc/src/images/plastique-dateedit.png
new file mode 100644
index 0000000000..2e28a40f01
--- /dev/null
+++ b/doc/src/images/plastique-dateedit.png
diff --git a/doc/src/images/plastique-datetimeedit.png b/doc/src/images/plastique-datetimeedit.png
new file mode 100644
index 0000000000..810bf1660a
--- /dev/null
+++ b/doc/src/images/plastique-datetimeedit.png
diff --git a/doc/src/images/plastique-dial.png b/doc/src/images/plastique-dial.png
new file mode 100644
index 0000000000..b65e7c78cd
--- /dev/null
+++ b/doc/src/images/plastique-dial.png
diff --git a/doc/src/images/plastique-dialogbuttonbox.png b/doc/src/images/plastique-dialogbuttonbox.png
new file mode 100644
index 0000000000..823b352998
--- /dev/null
+++ b/doc/src/images/plastique-dialogbuttonbox.png
diff --git a/doc/src/images/plastique-doublespinbox.png b/doc/src/images/plastique-doublespinbox.png
new file mode 100644
index 0000000000..627c4a20fe
--- /dev/null
+++ b/doc/src/images/plastique-doublespinbox.png
diff --git a/doc/src/images/plastique-filedialog.png b/doc/src/images/plastique-filedialog.png
new file mode 100644
index 0000000000..60f3c4bfcd
--- /dev/null
+++ b/doc/src/images/plastique-filedialog.png
diff --git a/doc/src/images/plastique-fontcombobox-open.png b/doc/src/images/plastique-fontcombobox-open.png
new file mode 100644
index 0000000000..37816c4866
--- /dev/null
+++ b/doc/src/images/plastique-fontcombobox-open.png
diff --git a/doc/src/images/plastique-fontcombobox.png b/doc/src/images/plastique-fontcombobox.png
new file mode 100644
index 0000000000..d3823081d8
--- /dev/null
+++ b/doc/src/images/plastique-fontcombobox.png
diff --git a/doc/src/images/plastique-fontdialog.png b/doc/src/images/plastique-fontdialog.png
new file mode 100644
index 0000000000..7e799a8815
--- /dev/null
+++ b/doc/src/images/plastique-fontdialog.png
diff --git a/doc/src/images/plastique-frame.png b/doc/src/images/plastique-frame.png
new file mode 100644
index 0000000000..9f81f6cba4
--- /dev/null
+++ b/doc/src/images/plastique-frame.png
diff --git a/doc/src/images/plastique-groupbox.png b/doc/src/images/plastique-groupbox.png
new file mode 100644
index 0000000000..d353c40071
--- /dev/null
+++ b/doc/src/images/plastique-groupbox.png
diff --git a/doc/src/images/plastique-horizontalscrollbar.png b/doc/src/images/plastique-horizontalscrollbar.png
new file mode 100644
index 0000000000..d20300c23f
--- /dev/null
+++ b/doc/src/images/plastique-horizontalscrollbar.png
diff --git a/doc/src/images/plastique-label.png b/doc/src/images/plastique-label.png
new file mode 100644
index 0000000000..d2a55a862c
--- /dev/null
+++ b/doc/src/images/plastique-label.png
diff --git a/doc/src/images/plastique-lcdnumber.png b/doc/src/images/plastique-lcdnumber.png
new file mode 100644
index 0000000000..74149ee158
--- /dev/null
+++ b/doc/src/images/plastique-lcdnumber.png
diff --git a/doc/src/images/plastique-lineedit.png b/doc/src/images/plastique-lineedit.png
new file mode 100644
index 0000000000..f455383520
--- /dev/null
+++ b/doc/src/images/plastique-lineedit.png
diff --git a/doc/src/images/plastique-listview.png b/doc/src/images/plastique-listview.png
new file mode 100644
index 0000000000..64bd00fe1f
--- /dev/null
+++ b/doc/src/images/plastique-listview.png
diff --git a/doc/src/images/plastique-menu.png b/doc/src/images/plastique-menu.png
new file mode 100644
index 0000000000..88df2493af
--- /dev/null
+++ b/doc/src/images/plastique-menu.png
diff --git a/doc/src/images/plastique-menubar.png b/doc/src/images/plastique-menubar.png
new file mode 100644
index 0000000000..642f95d6cf
--- /dev/null
+++ b/doc/src/images/plastique-menubar.png
diff --git a/doc/src/images/plastique-messagebox.png b/doc/src/images/plastique-messagebox.png
new file mode 100644
index 0000000000..89178fca7b
--- /dev/null
+++ b/doc/src/images/plastique-messagebox.png
diff --git a/doc/src/images/plastique-printdialog-properties.png b/doc/src/images/plastique-printdialog-properties.png
new file mode 100644
index 0000000000..38c1ae7038
--- /dev/null
+++ b/doc/src/images/plastique-printdialog-properties.png
diff --git a/doc/src/images/plastique-printdialog.png b/doc/src/images/plastique-printdialog.png
new file mode 100644
index 0000000000..3f8af01790
--- /dev/null
+++ b/doc/src/images/plastique-printdialog.png
diff --git a/doc/src/images/plastique-progressbar.png b/doc/src/images/plastique-progressbar.png
new file mode 100644
index 0000000000..fe8dd90274
--- /dev/null
+++ b/doc/src/images/plastique-progressbar.png
diff --git a/doc/src/images/plastique-progressdialog.png b/doc/src/images/plastique-progressdialog.png
new file mode 100644
index 0000000000..4373bcac16
--- /dev/null
+++ b/doc/src/images/plastique-progressdialog.png
diff --git a/doc/src/images/plastique-pushbutton-menu.png b/doc/src/images/plastique-pushbutton-menu.png
new file mode 100644
index 0000000000..d090033aa7
--- /dev/null
+++ b/doc/src/images/plastique-pushbutton-menu.png
diff --git a/doc/src/images/plastique-pushbutton.png b/doc/src/images/plastique-pushbutton.png
new file mode 100644
index 0000000000..83c44fd38d
--- /dev/null
+++ b/doc/src/images/plastique-pushbutton.png
diff --git a/doc/src/images/plastique-radiobutton.png b/doc/src/images/plastique-radiobutton.png
new file mode 100644
index 0000000000..a2c820d7d1
--- /dev/null
+++ b/doc/src/images/plastique-radiobutton.png
diff --git a/doc/src/images/plastique-sizegrip.png b/doc/src/images/plastique-sizegrip.png
new file mode 100644
index 0000000000..09a551efab
--- /dev/null
+++ b/doc/src/images/plastique-sizegrip.png
diff --git a/doc/src/images/plastique-slider.png b/doc/src/images/plastique-slider.png
new file mode 100644
index 0000000000..492f0fdfbd
--- /dev/null
+++ b/doc/src/images/plastique-slider.png
diff --git a/doc/src/images/plastique-spinbox.png b/doc/src/images/plastique-spinbox.png
new file mode 100644
index 0000000000..af15db3c23
--- /dev/null
+++ b/doc/src/images/plastique-spinbox.png
diff --git a/doc/src/images/plastique-statusbar.png b/doc/src/images/plastique-statusbar.png
new file mode 100644
index 0000000000..c8f9792ab9
--- /dev/null
+++ b/doc/src/images/plastique-statusbar.png
diff --git a/doc/src/images/plastique-tabbar-truncated.png b/doc/src/images/plastique-tabbar-truncated.png
new file mode 100644
index 0000000000..8e906d9928
--- /dev/null
+++ b/doc/src/images/plastique-tabbar-truncated.png
diff --git a/doc/src/images/plastique-tabbar.png b/doc/src/images/plastique-tabbar.png
new file mode 100644
index 0000000000..3371dda1b6
--- /dev/null
+++ b/doc/src/images/plastique-tabbar.png
diff --git a/doc/src/images/plastique-tableview.png b/doc/src/images/plastique-tableview.png
new file mode 100644
index 0000000000..b20c1cce7f
--- /dev/null
+++ b/doc/src/images/plastique-tableview.png
diff --git a/doc/src/images/plastique-tabwidget.png b/doc/src/images/plastique-tabwidget.png
new file mode 100644
index 0000000000..92ae398844
--- /dev/null
+++ b/doc/src/images/plastique-tabwidget.png
diff --git a/doc/src/images/plastique-textedit.png b/doc/src/images/plastique-textedit.png
new file mode 100644
index 0000000000..a802d75fcc
--- /dev/null
+++ b/doc/src/images/plastique-textedit.png
diff --git a/doc/src/images/plastique-timeedit.png b/doc/src/images/plastique-timeedit.png
new file mode 100644
index 0000000000..2d70b84c4c
--- /dev/null
+++ b/doc/src/images/plastique-timeedit.png
diff --git a/doc/src/images/plastique-toolbox.png b/doc/src/images/plastique-toolbox.png
new file mode 100644
index 0000000000..10bcd7af62
--- /dev/null
+++ b/doc/src/images/plastique-toolbox.png
diff --git a/doc/src/images/plastique-toolbutton.png b/doc/src/images/plastique-toolbutton.png
new file mode 100644
index 0000000000..4e51831408
--- /dev/null
+++ b/doc/src/images/plastique-toolbutton.png
diff --git a/doc/src/images/plastique-treeview.png b/doc/src/images/plastique-treeview.png
new file mode 100644
index 0000000000..db0bc01a25
--- /dev/null
+++ b/doc/src/images/plastique-treeview.png
diff --git a/doc/src/images/plugandpaint-plugindialog.png b/doc/src/images/plugandpaint-plugindialog.png
new file mode 100644
index 0000000000..4b601bd58b
--- /dev/null
+++ b/doc/src/images/plugandpaint-plugindialog.png
diff --git a/doc/src/images/plugandpaint.png b/doc/src/images/plugandpaint.png
new file mode 100644
index 0000000000..bd5d001f91
--- /dev/null
+++ b/doc/src/images/plugandpaint.png
diff --git a/doc/src/images/portedasteroids-example.png b/doc/src/images/portedasteroids-example.png
new file mode 100644
index 0000000000..8dbe673714
--- /dev/null
+++ b/doc/src/images/portedasteroids-example.png
diff --git a/doc/src/images/portedcanvas-example.png b/doc/src/images/portedcanvas-example.png
new file mode 100644
index 0000000000..b5fce51ecb
--- /dev/null
+++ b/doc/src/images/portedcanvas-example.png
diff --git a/doc/src/images/previewer-example.png b/doc/src/images/previewer-example.png
new file mode 100644
index 0000000000..d930250b2e
--- /dev/null
+++ b/doc/src/images/previewer-example.png
diff --git a/doc/src/images/previewer-ui.png b/doc/src/images/previewer-ui.png
new file mode 100644
index 0000000000..c92d136055
--- /dev/null
+++ b/doc/src/images/previewer-ui.png
diff --git a/doc/src/images/printer-rects.png b/doc/src/images/printer-rects.png
new file mode 100644
index 0000000000..8ebea60da8
--- /dev/null
+++ b/doc/src/images/printer-rects.png
diff --git a/doc/src/images/progressBar-stylesheet.png b/doc/src/images/progressBar-stylesheet.png
new file mode 100644
index 0000000000..b4bf755b6c
--- /dev/null
+++ b/doc/src/images/progressBar-stylesheet.png
diff --git a/doc/src/images/progressBar2-stylesheet.png b/doc/src/images/progressBar2-stylesheet.png
new file mode 100644
index 0000000000..8b5ecc0a66
--- /dev/null
+++ b/doc/src/images/progressBar2-stylesheet.png
diff --git a/doc/src/images/propagation-custom.png b/doc/src/images/propagation-custom.png
new file mode 100644
index 0000000000..866b44d677
--- /dev/null
+++ b/doc/src/images/propagation-custom.png
diff --git a/doc/src/images/propagation-standard.png b/doc/src/images/propagation-standard.png
new file mode 100644
index 0000000000..b010fccc95
--- /dev/null
+++ b/doc/src/images/propagation-standard.png
diff --git a/doc/src/images/q3painter_rationale.png b/doc/src/images/q3painter_rationale.png
new file mode 100644
index 0000000000..3c4835bed4
--- /dev/null
+++ b/doc/src/images/q3painter_rationale.png
diff --git a/doc/src/images/qactiongroup-align.png b/doc/src/images/qactiongroup-align.png
new file mode 100644
index 0000000000..65683e0ad9
--- /dev/null
+++ b/doc/src/images/qactiongroup-align.png
diff --git a/doc/src/images/qcalendarwidget-grid.png b/doc/src/images/qcalendarwidget-grid.png
new file mode 100644
index 0000000000..3df4dd99e2
--- /dev/null
+++ b/doc/src/images/qcalendarwidget-grid.png
diff --git a/doc/src/images/qcalendarwidget-maximum.png b/doc/src/images/qcalendarwidget-maximum.png
new file mode 100644
index 0000000000..1e78d20e85
--- /dev/null
+++ b/doc/src/images/qcalendarwidget-maximum.png
diff --git a/doc/src/images/qcalendarwidget-minimum.png b/doc/src/images/qcalendarwidget-minimum.png
new file mode 100644
index 0000000000..f860429309
--- /dev/null
+++ b/doc/src/images/qcalendarwidget-minimum.png
diff --git a/doc/src/images/qcalendarwidget.png b/doc/src/images/qcalendarwidget.png
new file mode 100644
index 0000000000..354a67a25c
--- /dev/null
+++ b/doc/src/images/qcalendarwidget.png
diff --git a/doc/src/images/qcanvasellipse.png b/doc/src/images/qcanvasellipse.png
new file mode 100644
index 0000000000..1fe82d0e7e
--- /dev/null
+++ b/doc/src/images/qcanvasellipse.png
diff --git a/doc/src/images/qcdestyle.png b/doc/src/images/qcdestyle.png
new file mode 100644
index 0000000000..74fb332edb
--- /dev/null
+++ b/doc/src/images/qcdestyle.png
diff --git a/doc/src/images/qcolor-cmyk.png b/doc/src/images/qcolor-cmyk.png
new file mode 100644
index 0000000000..dfe8f67a31
--- /dev/null
+++ b/doc/src/images/qcolor-cmyk.png
diff --git a/doc/src/images/qcolor-hsv.png b/doc/src/images/qcolor-hsv.png
new file mode 100644
index 0000000000..49fdf77222
--- /dev/null
+++ b/doc/src/images/qcolor-hsv.png
diff --git a/doc/src/images/qcolor-hue.png b/doc/src/images/qcolor-hue.png
new file mode 100644
index 0000000000..144b27c87a
--- /dev/null
+++ b/doc/src/images/qcolor-hue.png
diff --git a/doc/src/images/qcolor-rgb.png b/doc/src/images/qcolor-rgb.png
new file mode 100644
index 0000000000..fea4c63fd7
--- /dev/null
+++ b/doc/src/images/qcolor-rgb.png
diff --git a/doc/src/images/qcolor-saturation.png b/doc/src/images/qcolor-saturation.png
new file mode 100644
index 0000000000..f28776aff5
--- /dev/null
+++ b/doc/src/images/qcolor-saturation.png
diff --git a/doc/src/images/qcolor-value.png b/doc/src/images/qcolor-value.png
new file mode 100644
index 0000000000..0e069123a9
--- /dev/null
+++ b/doc/src/images/qcolor-value.png
diff --git a/doc/src/images/qcolumnview.png b/doc/src/images/qcolumnview.png
new file mode 100644
index 0000000000..1d312bf953
--- /dev/null
+++ b/doc/src/images/qcolumnview.png
diff --git a/doc/src/images/qconicalgradient.png b/doc/src/images/qconicalgradient.png
new file mode 100644
index 0000000000..82603066fb
--- /dev/null
+++ b/doc/src/images/qconicalgradient.png
diff --git a/doc/src/images/qdatawidgetmapper-simple.png b/doc/src/images/qdatawidgetmapper-simple.png
new file mode 100644
index 0000000000..784a433c0b
--- /dev/null
+++ b/doc/src/images/qdatawidgetmapper-simple.png
diff --git a/doc/src/images/qdesktopwidget.png b/doc/src/images/qdesktopwidget.png
new file mode 100644
index 0000000000..02f8e8b5ad
--- /dev/null
+++ b/doc/src/images/qdesktopwidget.png
diff --git a/doc/src/images/qdockwindow.png b/doc/src/images/qdockwindow.png
new file mode 100644
index 0000000000..98d250278b
--- /dev/null
+++ b/doc/src/images/qdockwindow.png
diff --git a/doc/src/images/qerrormessage.png b/doc/src/images/qerrormessage.png
new file mode 100644
index 0000000000..b905f8a24a
--- /dev/null
+++ b/doc/src/images/qerrormessage.png
diff --git a/doc/src/images/qfiledialog-expanded.png b/doc/src/images/qfiledialog-expanded.png
new file mode 100644
index 0000000000..07d2606399
--- /dev/null
+++ b/doc/src/images/qfiledialog-expanded.png
diff --git a/doc/src/images/qfiledialog-small.png b/doc/src/images/qfiledialog-small.png
new file mode 100644
index 0000000000..94d7aa5227
--- /dev/null
+++ b/doc/src/images/qfiledialog-small.png
diff --git a/doc/src/images/qformlayout-kde.png b/doc/src/images/qformlayout-kde.png
new file mode 100644
index 0000000000..c32bb12499
--- /dev/null
+++ b/doc/src/images/qformlayout-kde.png
diff --git a/doc/src/images/qformlayout-mac.png b/doc/src/images/qformlayout-mac.png
new file mode 100644
index 0000000000..0a0824efb6
--- /dev/null
+++ b/doc/src/images/qformlayout-mac.png
diff --git a/doc/src/images/qformlayout-qpe.png b/doc/src/images/qformlayout-qpe.png
new file mode 100644
index 0000000000..3abecc5716
--- /dev/null
+++ b/doc/src/images/qformlayout-qpe.png
diff --git a/doc/src/images/qformlayout-win.png b/doc/src/images/qformlayout-win.png
new file mode 100644
index 0000000000..1ed44bdd3b
--- /dev/null
+++ b/doc/src/images/qformlayout-win.png
diff --git a/doc/src/images/qformlayout-with-6-children.png b/doc/src/images/qformlayout-with-6-children.png
new file mode 100644
index 0000000000..f743599702
--- /dev/null
+++ b/doc/src/images/qformlayout-with-6-children.png
diff --git a/doc/src/images/qgradient-conical.png b/doc/src/images/qgradient-conical.png
new file mode 100644
index 0000000000..cf06b70db6
--- /dev/null
+++ b/doc/src/images/qgradient-conical.png
diff --git a/doc/src/images/qgradient-linear.png b/doc/src/images/qgradient-linear.png
new file mode 100644
index 0000000000..5a5e880de7
--- /dev/null
+++ b/doc/src/images/qgradient-linear.png
diff --git a/doc/src/images/qgradient-radial.png b/doc/src/images/qgradient-radial.png
new file mode 100644
index 0000000000..95b9e9c3c9
--- /dev/null
+++ b/doc/src/images/qgradient-radial.png
diff --git a/doc/src/images/qgraphicsproxywidget-embed.png b/doc/src/images/qgraphicsproxywidget-embed.png
new file mode 100644
index 0000000000..10d8f6fddd
--- /dev/null
+++ b/doc/src/images/qgraphicsproxywidget-embed.png
diff --git a/doc/src/images/qgridlayout-with-5-children.png b/doc/src/images/qgridlayout-with-5-children.png
new file mode 100644
index 0000000000..8d0c2962e4
--- /dev/null
+++ b/doc/src/images/qgridlayout-with-5-children.png
diff --git a/doc/src/images/qhbox-m.png b/doc/src/images/qhbox-m.png
new file mode 100644
index 0000000000..4f0bc57f98
--- /dev/null
+++ b/doc/src/images/qhbox-m.png
diff --git a/doc/src/images/qhboxlayout-with-5-children.png b/doc/src/images/qhboxlayout-with-5-children.png
new file mode 100644
index 0000000000..9b48dc5c47
--- /dev/null
+++ b/doc/src/images/qhboxlayout-with-5-children.png
diff --git a/doc/src/images/qimage-32bit.png b/doc/src/images/qimage-32bit.png
new file mode 100644
index 0000000000..2a76d40607
--- /dev/null
+++ b/doc/src/images/qimage-32bit.png
diff --git a/doc/src/images/qimage-32bit_scaled.png b/doc/src/images/qimage-32bit_scaled.png
new file mode 100644
index 0000000000..6932327456
--- /dev/null
+++ b/doc/src/images/qimage-32bit_scaled.png
diff --git a/doc/src/images/qimage-8bit.png b/doc/src/images/qimage-8bit.png
new file mode 100644
index 0000000000..454e501cc5
--- /dev/null
+++ b/doc/src/images/qimage-8bit.png
diff --git a/doc/src/images/qimage-8bit_scaled.png b/doc/src/images/qimage-8bit_scaled.png
new file mode 100644
index 0000000000..7cbf0f1e29
--- /dev/null
+++ b/doc/src/images/qimage-8bit_scaled.png
diff --git a/doc/src/images/qimage-scaling.png b/doc/src/images/qimage-scaling.png
new file mode 100644
index 0000000000..fcd71448f0
--- /dev/null
+++ b/doc/src/images/qimage-scaling.png
diff --git a/doc/src/images/qline-coordinates.png b/doc/src/images/qline-coordinates.png
new file mode 100644
index 0000000000..ac4fb980ac
--- /dev/null
+++ b/doc/src/images/qline-coordinates.png
diff --git a/doc/src/images/qline-point.png b/doc/src/images/qline-point.png
new file mode 100644
index 0000000000..3bc3664a20
--- /dev/null
+++ b/doc/src/images/qline-point.png
diff --git a/doc/src/images/qlineargradient-pad.png b/doc/src/images/qlineargradient-pad.png
new file mode 100644
index 0000000000..d77eb3dc3d
--- /dev/null
+++ b/doc/src/images/qlineargradient-pad.png
diff --git a/doc/src/images/qlineargradient-reflect.png b/doc/src/images/qlineargradient-reflect.png
new file mode 100644
index 0000000000..dd12665051
--- /dev/null
+++ b/doc/src/images/qlineargradient-reflect.png
diff --git a/doc/src/images/qlineargradient-repeat.png b/doc/src/images/qlineargradient-repeat.png
new file mode 100644
index 0000000000..e38203c438
--- /dev/null
+++ b/doc/src/images/qlineargradient-repeat.png
diff --git a/doc/src/images/qlinef-angle-identicaldirection.png b/doc/src/images/qlinef-angle-identicaldirection.png
new file mode 100644
index 0000000000..18d632321b
--- /dev/null
+++ b/doc/src/images/qlinef-angle-identicaldirection.png
diff --git a/doc/src/images/qlinef-angle-oppositedirection.png b/doc/src/images/qlinef-angle-oppositedirection.png
new file mode 100644
index 0000000000..bf52cfe011
--- /dev/null
+++ b/doc/src/images/qlinef-angle-oppositedirection.png
diff --git a/doc/src/images/qlinef-bounded.png b/doc/src/images/qlinef-bounded.png
new file mode 100644
index 0000000000..136dd50304
--- /dev/null
+++ b/doc/src/images/qlinef-bounded.png
diff --git a/doc/src/images/qlinef-normalvector.png b/doc/src/images/qlinef-normalvector.png
new file mode 100644
index 0000000000..b7d944f32f
--- /dev/null
+++ b/doc/src/images/qlinef-normalvector.png
diff --git a/doc/src/images/qlinef-unbounded.png b/doc/src/images/qlinef-unbounded.png
new file mode 100644
index 0000000000..75ead98ff2
--- /dev/null
+++ b/doc/src/images/qlinef-unbounded.png
diff --git a/doc/src/images/qlistbox-m.png b/doc/src/images/qlistbox-m.png
new file mode 100644
index 0000000000..5b956bc608
--- /dev/null
+++ b/doc/src/images/qlistbox-m.png
diff --git a/doc/src/images/qlistbox-w.png b/doc/src/images/qlistbox-w.png
new file mode 100644
index 0000000000..19798ea539
--- /dev/null
+++ b/doc/src/images/qlistbox-w.png
diff --git a/doc/src/images/qlistviewitems.png b/doc/src/images/qlistviewitems.png
new file mode 100644
index 0000000000..fe862c70cb
--- /dev/null
+++ b/doc/src/images/qlistviewitems.png
diff --git a/doc/src/images/qmacstyle.png b/doc/src/images/qmacstyle.png
new file mode 100644
index 0000000000..dda3c35768
--- /dev/null
+++ b/doc/src/images/qmacstyle.png
diff --git a/doc/src/images/qmainwindow-qdockareas.png b/doc/src/images/qmainwindow-qdockareas.png
new file mode 100644
index 0000000000..0eff42d4b8
--- /dev/null
+++ b/doc/src/images/qmainwindow-qdockareas.png
diff --git a/doc/src/images/qmatrix-combinedtransformation.png b/doc/src/images/qmatrix-combinedtransformation.png
new file mode 100644
index 0000000000..f791bfa917
--- /dev/null
+++ b/doc/src/images/qmatrix-combinedtransformation.png
diff --git a/doc/src/images/qmatrix-representation.png b/doc/src/images/qmatrix-representation.png
new file mode 100644
index 0000000000..2e3efd33fc
--- /dev/null
+++ b/doc/src/images/qmatrix-representation.png
diff --git a/doc/src/images/qmatrix-simpletransformation.png b/doc/src/images/qmatrix-simpletransformation.png
new file mode 100644
index 0000000000..dde8f4bc58
--- /dev/null
+++ b/doc/src/images/qmatrix-simpletransformation.png
diff --git a/doc/src/images/qmdiarea-arrange.png b/doc/src/images/qmdiarea-arrange.png
new file mode 100644
index 0000000000..14b0af5264
--- /dev/null
+++ b/doc/src/images/qmdiarea-arrange.png
diff --git a/doc/src/images/qmdisubwindowlayout.png b/doc/src/images/qmdisubwindowlayout.png
new file mode 100644
index 0000000000..ffe5cc3949
--- /dev/null
+++ b/doc/src/images/qmdisubwindowlayout.png
diff --git a/doc/src/images/qmessagebox-crit.png b/doc/src/images/qmessagebox-crit.png
new file mode 100644
index 0000000000..f30d3ee70b
--- /dev/null
+++ b/doc/src/images/qmessagebox-crit.png
diff --git a/doc/src/images/qmessagebox-info.png b/doc/src/images/qmessagebox-info.png
new file mode 100644
index 0000000000..139940691a
--- /dev/null
+++ b/doc/src/images/qmessagebox-info.png
diff --git a/doc/src/images/qmessagebox-quest.png b/doc/src/images/qmessagebox-quest.png
new file mode 100644
index 0000000000..5943fdd4b5
--- /dev/null
+++ b/doc/src/images/qmessagebox-quest.png
diff --git a/doc/src/images/qmessagebox-warn.png b/doc/src/images/qmessagebox-warn.png
new file mode 100644
index 0000000000..26a212e827
--- /dev/null
+++ b/doc/src/images/qmessagebox-warn.png
diff --git a/doc/src/images/qmotifstyle.png b/doc/src/images/qmotifstyle.png
new file mode 100644
index 0000000000..b0a6d867f5
--- /dev/null
+++ b/doc/src/images/qmotifstyle.png
diff --git a/doc/src/images/qobjectxmlmodel-example.png b/doc/src/images/qobjectxmlmodel-example.png
new file mode 100644
index 0000000000..e40ba15efb
--- /dev/null
+++ b/doc/src/images/qobjectxmlmodel-example.png
diff --git a/doc/src/images/qpainter-affinetransformations.png b/doc/src/images/qpainter-affinetransformations.png
new file mode 100644
index 0000000000..fe2f9a072b
--- /dev/null
+++ b/doc/src/images/qpainter-affinetransformations.png
diff --git a/doc/src/images/qpainter-angles.png b/doc/src/images/qpainter-angles.png
new file mode 100644
index 0000000000..00bd7d4d78
--- /dev/null
+++ b/doc/src/images/qpainter-angles.png
diff --git a/doc/src/images/qpainter-arc.png b/doc/src/images/qpainter-arc.png
new file mode 100644
index 0000000000..8cb9cec96b
--- /dev/null
+++ b/doc/src/images/qpainter-arc.png
diff --git a/doc/src/images/qpainter-basicdrawing.png b/doc/src/images/qpainter-basicdrawing.png
new file mode 100644
index 0000000000..3be48c8737
--- /dev/null
+++ b/doc/src/images/qpainter-basicdrawing.png
diff --git a/doc/src/images/qpainter-chord.png b/doc/src/images/qpainter-chord.png
new file mode 100644
index 0000000000..a8090861a0
--- /dev/null
+++ b/doc/src/images/qpainter-chord.png
diff --git a/doc/src/images/qpainter-clock.png b/doc/src/images/qpainter-clock.png
new file mode 100644
index 0000000000..3634754161
--- /dev/null
+++ b/doc/src/images/qpainter-clock.png
diff --git a/doc/src/images/qpainter-compositiondemo.png b/doc/src/images/qpainter-compositiondemo.png
new file mode 100644
index 0000000000..40f62c75be
--- /dev/null
+++ b/doc/src/images/qpainter-compositiondemo.png
diff --git a/doc/src/images/qpainter-compositionmode.png b/doc/src/images/qpainter-compositionmode.png
new file mode 100644
index 0000000000..1557720a02
--- /dev/null
+++ b/doc/src/images/qpainter-compositionmode.png
diff --git a/doc/src/images/qpainter-compositionmode1.png b/doc/src/images/qpainter-compositionmode1.png
new file mode 100644
index 0000000000..6753093521
--- /dev/null
+++ b/doc/src/images/qpainter-compositionmode1.png
diff --git a/doc/src/images/qpainter-compositionmode2.png b/doc/src/images/qpainter-compositionmode2.png
new file mode 100644
index 0000000000..fc05afbd8c
--- /dev/null
+++ b/doc/src/images/qpainter-compositionmode2.png
diff --git a/doc/src/images/qpainter-concentriccircles.png b/doc/src/images/qpainter-concentriccircles.png
new file mode 100644
index 0000000000..4889dcd76d
--- /dev/null
+++ b/doc/src/images/qpainter-concentriccircles.png
diff --git a/doc/src/images/qpainter-ellipse.png b/doc/src/images/qpainter-ellipse.png
new file mode 100644
index 0000000000..e7e78c3dac
--- /dev/null
+++ b/doc/src/images/qpainter-ellipse.png
diff --git a/doc/src/images/qpainter-gradients.png b/doc/src/images/qpainter-gradients.png
new file mode 100644
index 0000000000..b7bc6a3270
--- /dev/null
+++ b/doc/src/images/qpainter-gradients.png
diff --git a/doc/src/images/qpainter-line.png b/doc/src/images/qpainter-line.png
new file mode 100644
index 0000000000..5f1cd97eff
--- /dev/null
+++ b/doc/src/images/qpainter-line.png
diff --git a/doc/src/images/qpainter-painterpaths.png b/doc/src/images/qpainter-painterpaths.png
new file mode 100644
index 0000000000..0762ca93f3
--- /dev/null
+++ b/doc/src/images/qpainter-painterpaths.png
diff --git a/doc/src/images/qpainter-path.png b/doc/src/images/qpainter-path.png
new file mode 100644
index 0000000000..3570b16d7a
--- /dev/null
+++ b/doc/src/images/qpainter-path.png
diff --git a/doc/src/images/qpainter-pathstroking.png b/doc/src/images/qpainter-pathstroking.png
new file mode 100644
index 0000000000..ab73c6ae01
--- /dev/null
+++ b/doc/src/images/qpainter-pathstroking.png
diff --git a/doc/src/images/qpainter-pie.png b/doc/src/images/qpainter-pie.png
new file mode 100644
index 0000000000..78039013e0
--- /dev/null
+++ b/doc/src/images/qpainter-pie.png
diff --git a/doc/src/images/qpainter-polygon.png b/doc/src/images/qpainter-polygon.png
new file mode 100644
index 0000000000..3b6ea3c797
--- /dev/null
+++ b/doc/src/images/qpainter-polygon.png
diff --git a/doc/src/images/qpainter-rectangle.png b/doc/src/images/qpainter-rectangle.png
new file mode 100644
index 0000000000..05fdc88300
--- /dev/null
+++ b/doc/src/images/qpainter-rectangle.png
diff --git a/doc/src/images/qpainter-rotation.png b/doc/src/images/qpainter-rotation.png
new file mode 100644
index 0000000000..6e24a0e040
--- /dev/null
+++ b/doc/src/images/qpainter-rotation.png
diff --git a/doc/src/images/qpainter-roundrect.png b/doc/src/images/qpainter-roundrect.png
new file mode 100644
index 0000000000..876a277811
--- /dev/null
+++ b/doc/src/images/qpainter-roundrect.png
diff --git a/doc/src/images/qpainter-scale.png b/doc/src/images/qpainter-scale.png
new file mode 100644
index 0000000000..4fe582eb13
--- /dev/null
+++ b/doc/src/images/qpainter-scale.png
diff --git a/doc/src/images/qpainter-text.png b/doc/src/images/qpainter-text.png
new file mode 100644
index 0000000000..af7821c9d4
--- /dev/null
+++ b/doc/src/images/qpainter-text.png
diff --git a/doc/src/images/qpainter-translation.png b/doc/src/images/qpainter-translation.png
new file mode 100644
index 0000000000..b3716ca3f6
--- /dev/null
+++ b/doc/src/images/qpainter-translation.png
diff --git a/doc/src/images/qpainter-vectordeformation.png b/doc/src/images/qpainter-vectordeformation.png
new file mode 100644
index 0000000000..aff95f404c
--- /dev/null
+++ b/doc/src/images/qpainter-vectordeformation.png
diff --git a/doc/src/images/qpainterpath-addellipse.png b/doc/src/images/qpainterpath-addellipse.png
new file mode 100644
index 0000000000..98f85174ef
--- /dev/null
+++ b/doc/src/images/qpainterpath-addellipse.png
diff --git a/doc/src/images/qpainterpath-addpolygon.png b/doc/src/images/qpainterpath-addpolygon.png
new file mode 100644
index 0000000000..d36bde8ada
--- /dev/null
+++ b/doc/src/images/qpainterpath-addpolygon.png
diff --git a/doc/src/images/qpainterpath-addrectangle.png b/doc/src/images/qpainterpath-addrectangle.png
new file mode 100644
index 0000000000..be9283e46d
--- /dev/null
+++ b/doc/src/images/qpainterpath-addrectangle.png
diff --git a/doc/src/images/qpainterpath-addtext.png b/doc/src/images/qpainterpath-addtext.png
new file mode 100644
index 0000000000..803a9581ac
--- /dev/null
+++ b/doc/src/images/qpainterpath-addtext.png
diff --git a/doc/src/images/qpainterpath-arcto.png b/doc/src/images/qpainterpath-arcto.png
new file mode 100644
index 0000000000..fe60b08d31
--- /dev/null
+++ b/doc/src/images/qpainterpath-arcto.png
diff --git a/doc/src/images/qpainterpath-construction.png b/doc/src/images/qpainterpath-construction.png
new file mode 100644
index 0000000000..4beeba1dd8
--- /dev/null
+++ b/doc/src/images/qpainterpath-construction.png
diff --git a/doc/src/images/qpainterpath-cubicto.png b/doc/src/images/qpainterpath-cubicto.png
new file mode 100644
index 0000000000..465bfeca29
--- /dev/null
+++ b/doc/src/images/qpainterpath-cubicto.png
diff --git a/doc/src/images/qpainterpath-demo.png b/doc/src/images/qpainterpath-demo.png
new file mode 100644
index 0000000000..ceeed2f170
--- /dev/null
+++ b/doc/src/images/qpainterpath-demo.png
diff --git a/doc/src/images/qpainterpath-example.png b/doc/src/images/qpainterpath-example.png
new file mode 100644
index 0000000000..f2bd359aba
--- /dev/null
+++ b/doc/src/images/qpainterpath-example.png
diff --git a/doc/src/images/qpen-bevel.png b/doc/src/images/qpen-bevel.png
new file mode 100644
index 0000000000..8a30779e3b
--- /dev/null
+++ b/doc/src/images/qpen-bevel.png
diff --git a/doc/src/images/qpen-custom.png b/doc/src/images/qpen-custom.png
new file mode 100644
index 0000000000..a2a038abe0
--- /dev/null
+++ b/doc/src/images/qpen-custom.png
diff --git a/doc/src/images/qpen-dash.png b/doc/src/images/qpen-dash.png
new file mode 100644
index 0000000000..67082c3758
--- /dev/null
+++ b/doc/src/images/qpen-dash.png
diff --git a/doc/src/images/qpen-dashdot.png b/doc/src/images/qpen-dashdot.png
new file mode 100644
index 0000000000..64b384660f
--- /dev/null
+++ b/doc/src/images/qpen-dashdot.png
diff --git a/doc/src/images/qpen-dashdotdot.png b/doc/src/images/qpen-dashdotdot.png
new file mode 100644
index 0000000000..ff1b2e69cd
--- /dev/null
+++ b/doc/src/images/qpen-dashdotdot.png
diff --git a/doc/src/images/qpen-dashpattern.png b/doc/src/images/qpen-dashpattern.png
new file mode 100644
index 0000000000..e33cf58d49
--- /dev/null
+++ b/doc/src/images/qpen-dashpattern.png
diff --git a/doc/src/images/qpen-demo.png b/doc/src/images/qpen-demo.png
new file mode 100644
index 0000000000..3ea5108802
--- /dev/null
+++ b/doc/src/images/qpen-demo.png
diff --git a/doc/src/images/qpen-dot.png b/doc/src/images/qpen-dot.png
new file mode 100644
index 0000000000..54e81c9469
--- /dev/null
+++ b/doc/src/images/qpen-dot.png
diff --git a/doc/src/images/qpen-flat.png b/doc/src/images/qpen-flat.png
new file mode 100644
index 0000000000..06e2195f73
--- /dev/null
+++ b/doc/src/images/qpen-flat.png
diff --git a/doc/src/images/qpen-miter.png b/doc/src/images/qpen-miter.png
new file mode 100644
index 0000000000..025e003979
--- /dev/null
+++ b/doc/src/images/qpen-miter.png
diff --git a/doc/src/images/qpen-miterlimit.png b/doc/src/images/qpen-miterlimit.png
new file mode 100644
index 0000000000..17a90725fb
--- /dev/null
+++ b/doc/src/images/qpen-miterlimit.png
diff --git a/doc/src/images/qpen-roundcap.png b/doc/src/images/qpen-roundcap.png
new file mode 100644
index 0000000000..77b22b2bab
--- /dev/null
+++ b/doc/src/images/qpen-roundcap.png
diff --git a/doc/src/images/qpen-roundjoin.png b/doc/src/images/qpen-roundjoin.png
new file mode 100644
index 0000000000..155e2aa8cc
--- /dev/null
+++ b/doc/src/images/qpen-roundjoin.png
diff --git a/doc/src/images/qpen-solid.png b/doc/src/images/qpen-solid.png
new file mode 100644
index 0000000000..e042b18017
--- /dev/null
+++ b/doc/src/images/qpen-solid.png
diff --git a/doc/src/images/qpen-square.png b/doc/src/images/qpen-square.png
new file mode 100644
index 0000000000..ebc5d1e329
--- /dev/null
+++ b/doc/src/images/qpen-square.png
diff --git a/doc/src/images/qplastiquestyle.png b/doc/src/images/qplastiquestyle.png
new file mode 100644
index 0000000000..519f01d202
--- /dev/null
+++ b/doc/src/images/qplastiquestyle.png
diff --git a/doc/src/images/qprintpreviewdialog.png b/doc/src/images/qprintpreviewdialog.png
new file mode 100644
index 0000000000..a78a3f1f93
--- /dev/null
+++ b/doc/src/images/qprintpreviewdialog.png
diff --git a/doc/src/images/qprogbar-m.png b/doc/src/images/qprogbar-m.png
new file mode 100644
index 0000000000..dbe9b0ac46
--- /dev/null
+++ b/doc/src/images/qprogbar-m.png
diff --git a/doc/src/images/qprogbar-w.png b/doc/src/images/qprogbar-w.png
new file mode 100644
index 0000000000..3a85ffe596
--- /dev/null
+++ b/doc/src/images/qprogbar-w.png
diff --git a/doc/src/images/qprogdlg-m.png b/doc/src/images/qprogdlg-m.png
new file mode 100644
index 0000000000..bc83ece45f
--- /dev/null
+++ b/doc/src/images/qprogdlg-m.png
diff --git a/doc/src/images/qprogdlg-w.png b/doc/src/images/qprogdlg-w.png
new file mode 100644
index 0000000000..eda1f5c9fe
--- /dev/null
+++ b/doc/src/images/qprogdlg-w.png
diff --git a/doc/src/images/qradialgradient-pad.png b/doc/src/images/qradialgradient-pad.png
new file mode 100644
index 0000000000..6c1a6cb268
--- /dev/null
+++ b/doc/src/images/qradialgradient-pad.png
diff --git a/doc/src/images/qradialgradient-reflect.png b/doc/src/images/qradialgradient-reflect.png
new file mode 100644
index 0000000000..5122b180b1
--- /dev/null
+++ b/doc/src/images/qradialgradient-reflect.png
diff --git a/doc/src/images/qradialgradient-repeat.png b/doc/src/images/qradialgradient-repeat.png
new file mode 100644
index 0000000000..aa639b7779
--- /dev/null
+++ b/doc/src/images/qradialgradient-repeat.png
diff --git a/doc/src/images/qrect-coordinates.png b/doc/src/images/qrect-coordinates.png
new file mode 100644
index 0000000000..2a2dae2d6c
--- /dev/null
+++ b/doc/src/images/qrect-coordinates.png
diff --git a/doc/src/images/qrect-diagram-one.png b/doc/src/images/qrect-diagram-one.png
new file mode 100644
index 0000000000..a893be277a
--- /dev/null
+++ b/doc/src/images/qrect-diagram-one.png
diff --git a/doc/src/images/qrect-diagram-three.png b/doc/src/images/qrect-diagram-three.png
new file mode 100644
index 0000000000..84fb35be6c
--- /dev/null
+++ b/doc/src/images/qrect-diagram-three.png
diff --git a/doc/src/images/qrect-diagram-two.png b/doc/src/images/qrect-diagram-two.png
new file mode 100644
index 0000000000..e19caacc34
--- /dev/null
+++ b/doc/src/images/qrect-diagram-two.png
diff --git a/doc/src/images/qrect-diagram-zero.png b/doc/src/images/qrect-diagram-zero.png
new file mode 100644
index 0000000000..90e3db0c41
--- /dev/null
+++ b/doc/src/images/qrect-diagram-zero.png
diff --git a/doc/src/images/qrect-intersect.png b/doc/src/images/qrect-intersect.png
new file mode 100644
index 0000000000..db68cd53ad
--- /dev/null
+++ b/doc/src/images/qrect-intersect.png
diff --git a/doc/src/images/qrect-unite.png b/doc/src/images/qrect-unite.png
new file mode 100644
index 0000000000..3f6239f405
--- /dev/null
+++ b/doc/src/images/qrect-unite.png
diff --git a/doc/src/images/qrectf-coordinates.png b/doc/src/images/qrectf-coordinates.png
new file mode 100644
index 0000000000..ccc6d82063
--- /dev/null
+++ b/doc/src/images/qrectf-coordinates.png
diff --git a/doc/src/images/qrectf-diagram-one.png b/doc/src/images/qrectf-diagram-one.png
new file mode 100644
index 0000000000..842289ce07
--- /dev/null
+++ b/doc/src/images/qrectf-diagram-one.png
diff --git a/doc/src/images/qrectf-diagram-three.png b/doc/src/images/qrectf-diagram-three.png
new file mode 100644
index 0000000000..e05106a7e1
--- /dev/null
+++ b/doc/src/images/qrectf-diagram-three.png
diff --git a/doc/src/images/qrectf-diagram-two.png b/doc/src/images/qrectf-diagram-two.png
new file mode 100644
index 0000000000..192d00df79
--- /dev/null
+++ b/doc/src/images/qrectf-diagram-two.png
diff --git a/doc/src/images/qscrollarea-noscrollbars.png b/doc/src/images/qscrollarea-noscrollbars.png
new file mode 100644
index 0000000000..a1520f3e21
--- /dev/null
+++ b/doc/src/images/qscrollarea-noscrollbars.png
diff --git a/doc/src/images/qscrollarea-onescrollbar.png b/doc/src/images/qscrollarea-onescrollbar.png
new file mode 100644
index 0000000000..b4f7976bc4
--- /dev/null
+++ b/doc/src/images/qscrollarea-onescrollbar.png
diff --git a/doc/src/images/qscrollarea-twoscrollbars.png b/doc/src/images/qscrollarea-twoscrollbars.png
new file mode 100644
index 0000000000..bf720e498c
--- /dev/null
+++ b/doc/src/images/qscrollarea-twoscrollbars.png
diff --git a/doc/src/images/qscrollbar-picture.png b/doc/src/images/qscrollbar-picture.png
new file mode 100644
index 0000000000..898e014c40
--- /dev/null
+++ b/doc/src/images/qscrollbar-picture.png
diff --git a/doc/src/images/qscrollbar-values.png b/doc/src/images/qscrollbar-values.png
new file mode 100644
index 0000000000..cea744b3be
--- /dev/null
+++ b/doc/src/images/qscrollbar-values.png
diff --git a/doc/src/images/qscrollview-cl.png b/doc/src/images/qscrollview-cl.png
new file mode 100644
index 0000000000..a5cb0dbbc5
--- /dev/null
+++ b/doc/src/images/qscrollview-cl.png
diff --git a/doc/src/images/qscrollview-vp.png b/doc/src/images/qscrollview-vp.png
new file mode 100644
index 0000000000..fc8b0229b0
--- /dev/null
+++ b/doc/src/images/qscrollview-vp.png
diff --git a/doc/src/images/qscrollview-vp2.png b/doc/src/images/qscrollview-vp2.png
new file mode 100644
index 0000000000..8d1c3a3639
--- /dev/null
+++ b/doc/src/images/qscrollview-vp2.png
diff --git a/doc/src/images/qsortfilterproxymodel-sorting.png b/doc/src/images/qsortfilterproxymodel-sorting.png
new file mode 100644
index 0000000000..de99d41272
--- /dev/null
+++ b/doc/src/images/qsortfilterproxymodel-sorting.png
diff --git a/doc/src/images/qspinbox-plusminus.png b/doc/src/images/qspinbox-plusminus.png
new file mode 100644
index 0000000000..3b35a408a0
--- /dev/null
+++ b/doc/src/images/qspinbox-plusminus.png
diff --git a/doc/src/images/qspinbox-updown.png b/doc/src/images/qspinbox-updown.png
new file mode 100644
index 0000000000..a6caa4419b
--- /dev/null
+++ b/doc/src/images/qspinbox-updown.png
diff --git a/doc/src/images/qstatustipevent-action.png b/doc/src/images/qstatustipevent-action.png
new file mode 100644
index 0000000000..c5dcfd25f5
--- /dev/null
+++ b/doc/src/images/qstatustipevent-action.png
diff --git a/doc/src/images/qstatustipevent-widget.png b/doc/src/images/qstatustipevent-widget.png
new file mode 100644
index 0000000000..3cc0a1f01b
--- /dev/null
+++ b/doc/src/images/qstatustipevent-widget.png
diff --git a/doc/src/images/qstyle-comboboxes.png b/doc/src/images/qstyle-comboboxes.png
new file mode 100644
index 0000000000..aecec914a0
--- /dev/null
+++ b/doc/src/images/qstyle-comboboxes.png
diff --git a/doc/src/images/qstyleoptiontoolbar-position.png b/doc/src/images/qstyleoptiontoolbar-position.png
new file mode 100644
index 0000000000..5eaae7e4cd
--- /dev/null
+++ b/doc/src/images/qstyleoptiontoolbar-position.png
diff --git a/doc/src/images/qt-colors.png b/doc/src/images/qt-colors.png
new file mode 100644
index 0000000000..524123f705
--- /dev/null
+++ b/doc/src/images/qt-colors.png
diff --git a/doc/src/images/qt-embedded-accelerateddriver.png b/doc/src/images/qt-embedded-accelerateddriver.png
new file mode 100644
index 0000000000..c44d0b680a
--- /dev/null
+++ b/doc/src/images/qt-embedded-accelerateddriver.png
diff --git a/doc/src/images/qt-embedded-architecture.png b/doc/src/images/qt-embedded-architecture.png
new file mode 100644
index 0000000000..97a29d0004
--- /dev/null
+++ b/doc/src/images/qt-embedded-architecture.png
diff --git a/doc/src/images/qt-embedded-architecture2.png b/doc/src/images/qt-embedded-architecture2.png
new file mode 100644
index 0000000000..f8c7fb17f8
--- /dev/null
+++ b/doc/src/images/qt-embedded-architecture2.png
diff --git a/doc/src/images/qt-embedded-characterinputlayer.png b/doc/src/images/qt-embedded-characterinputlayer.png
new file mode 100644
index 0000000000..bedc2b8fa2
--- /dev/null
+++ b/doc/src/images/qt-embedded-characterinputlayer.png
diff --git a/doc/src/images/qt-embedded-clamshellphone-closed.png b/doc/src/images/qt-embedded-clamshellphone-closed.png
new file mode 100644
index 0000000000..2070f88dfc
--- /dev/null
+++ b/doc/src/images/qt-embedded-clamshellphone-closed.png
diff --git a/doc/src/images/qt-embedded-clamshellphone-pressed.png b/doc/src/images/qt-embedded-clamshellphone-pressed.png
new file mode 100644
index 0000000000..e728bea44a
--- /dev/null
+++ b/doc/src/images/qt-embedded-clamshellphone-pressed.png
diff --git a/doc/src/images/qt-embedded-clamshellphone.png b/doc/src/images/qt-embedded-clamshellphone.png
new file mode 100644
index 0000000000..dd3bd60fa0
--- /dev/null
+++ b/doc/src/images/qt-embedded-clamshellphone.png
diff --git a/doc/src/images/qt-embedded-client.png b/doc/src/images/qt-embedded-client.png
new file mode 100644
index 0000000000..da64203977
--- /dev/null
+++ b/doc/src/images/qt-embedded-client.png
diff --git a/doc/src/images/qt-embedded-clientrendering.png b/doc/src/images/qt-embedded-clientrendering.png
new file mode 100644
index 0000000000..49ae8f130a
--- /dev/null
+++ b/doc/src/images/qt-embedded-clientrendering.png
diff --git a/doc/src/images/qt-embedded-clientservercommunication.png b/doc/src/images/qt-embedded-clientservercommunication.png
new file mode 100644
index 0000000000..0bdcb60605
--- /dev/null
+++ b/doc/src/images/qt-embedded-clientservercommunication.png
diff --git a/doc/src/images/qt-embedded-drawingonscreen.png b/doc/src/images/qt-embedded-drawingonscreen.png
new file mode 100644
index 0000000000..fca1ebadec
--- /dev/null
+++ b/doc/src/images/qt-embedded-drawingonscreen.png
diff --git a/doc/src/images/qt-embedded-examples.png b/doc/src/images/qt-embedded-examples.png
new file mode 100644
index 0000000000..7fc696598f
--- /dev/null
+++ b/doc/src/images/qt-embedded-examples.png
diff --git a/doc/src/images/qt-embedded-fontfeatures.png b/doc/src/images/qt-embedded-fontfeatures.png
new file mode 100644
index 0000000000..c339171fe1
--- /dev/null
+++ b/doc/src/images/qt-embedded-fontfeatures.png
diff --git a/doc/src/images/qt-embedded-opengl1.png b/doc/src/images/qt-embedded-opengl1.png
new file mode 100644
index 0000000000..28e2a5fa93
--- /dev/null
+++ b/doc/src/images/qt-embedded-opengl1.png
diff --git a/doc/src/images/qt-embedded-opengl2.png b/doc/src/images/qt-embedded-opengl2.png
new file mode 100644
index 0000000000..3547cd7331
--- /dev/null
+++ b/doc/src/images/qt-embedded-opengl2.png
diff --git a/doc/src/images/qt-embedded-opengl3.png b/doc/src/images/qt-embedded-opengl3.png
new file mode 100644
index 0000000000..0316b714fb
--- /dev/null
+++ b/doc/src/images/qt-embedded-opengl3.png
diff --git a/doc/src/images/qt-embedded-pda.png b/doc/src/images/qt-embedded-pda.png
new file mode 100644
index 0000000000..2bd9881f41
--- /dev/null
+++ b/doc/src/images/qt-embedded-pda.png
diff --git a/doc/src/images/qt-embedded-phone.png b/doc/src/images/qt-embedded-phone.png
new file mode 100644
index 0000000000..29df579cde
--- /dev/null
+++ b/doc/src/images/qt-embedded-phone.png
diff --git a/doc/src/images/qt-embedded-pointerhandlinglayer.png b/doc/src/images/qt-embedded-pointerhandlinglayer.png
new file mode 100644
index 0000000000..b82fb3b686
--- /dev/null
+++ b/doc/src/images/qt-embedded-pointerhandlinglayer.png
diff --git a/doc/src/images/qt-embedded-qconfigtool.png b/doc/src/images/qt-embedded-qconfigtool.png
new file mode 100644
index 0000000000..fbab4d645d
--- /dev/null
+++ b/doc/src/images/qt-embedded-qconfigtool.png
diff --git a/doc/src/images/qt-embedded-qvfbfilemenu.png b/doc/src/images/qt-embedded-qvfbfilemenu.png
new file mode 100644
index 0000000000..e82287b861
--- /dev/null
+++ b/doc/src/images/qt-embedded-qvfbfilemenu.png
diff --git a/doc/src/images/qt-embedded-qvfbviewmenu.png b/doc/src/images/qt-embedded-qvfbviewmenu.png
new file mode 100644
index 0000000000..403bc669fa
--- /dev/null
+++ b/doc/src/images/qt-embedded-qvfbviewmenu.png
diff --git a/doc/src/images/qt-embedded-reserveregion.png b/doc/src/images/qt-embedded-reserveregion.png
new file mode 100644
index 0000000000..e20a748038
--- /dev/null
+++ b/doc/src/images/qt-embedded-reserveregion.png
diff --git a/doc/src/images/qt-embedded-runningapplication.png b/doc/src/images/qt-embedded-runningapplication.png
new file mode 100644
index 0000000000..d7f9a51bbe
--- /dev/null
+++ b/doc/src/images/qt-embedded-runningapplication.png
diff --git a/doc/src/images/qt-embedded-setwindowattribute.png b/doc/src/images/qt-embedded-setwindowattribute.png
new file mode 100644
index 0000000000..44daba96c3
--- /dev/null
+++ b/doc/src/images/qt-embedded-setwindowattribute.png
diff --git a/doc/src/images/qt-embedded-virtualframebuffer.png b/doc/src/images/qt-embedded-virtualframebuffer.png
new file mode 100644
index 0000000000..d5a5221887
--- /dev/null
+++ b/doc/src/images/qt-embedded-virtualframebuffer.png
diff --git a/doc/src/images/qt-embedded-vnc-screen.png b/doc/src/images/qt-embedded-vnc-screen.png
new file mode 100644
index 0000000000..da06387c21
--- /dev/null
+++ b/doc/src/images/qt-embedded-vnc-screen.png
diff --git a/doc/src/images/qt-fillrule-oddeven.png b/doc/src/images/qt-fillrule-oddeven.png
new file mode 100644
index 0000000000..f39d1056f5
--- /dev/null
+++ b/doc/src/images/qt-fillrule-oddeven.png
diff --git a/doc/src/images/qt-fillrule-winding.png b/doc/src/images/qt-fillrule-winding.png
new file mode 100644
index 0000000000..8018248331
--- /dev/null
+++ b/doc/src/images/qt-fillrule-winding.png
diff --git a/doc/src/images/qt-for-wince-landscape.png b/doc/src/images/qt-for-wince-landscape.png
new file mode 100644
index 0000000000..127f799ba9
--- /dev/null
+++ b/doc/src/images/qt-for-wince-landscape.png
diff --git a/doc/src/images/qt-logo.png b/doc/src/images/qt-logo.png
new file mode 100644
index 0000000000..14ddf2a028
--- /dev/null
+++ b/doc/src/images/qt-logo.png
diff --git a/doc/src/images/qt.png b/doc/src/images/qt.png
new file mode 100644
index 0000000000..cbed1a9019
--- /dev/null
+++ b/doc/src/images/qt.png
diff --git a/doc/src/images/qtableitems.png b/doc/src/images/qtableitems.png
new file mode 100644
index 0000000000..c62813a894
--- /dev/null
+++ b/doc/src/images/qtableitems.png
diff --git a/doc/src/images/qtabletevent-tilt.png b/doc/src/images/qtabletevent-tilt.png
new file mode 100644
index 0000000000..546d7daadb
--- /dev/null
+++ b/doc/src/images/qtabletevent-tilt.png
diff --git a/doc/src/images/qtableview-resized.png b/doc/src/images/qtableview-resized.png
new file mode 100644
index 0000000000..813256ee9e
--- /dev/null
+++ b/doc/src/images/qtableview-resized.png
diff --git a/doc/src/images/qtconcurrent-progressdialog.png b/doc/src/images/qtconcurrent-progressdialog.png
new file mode 100644
index 0000000000..2e8b7735ad
--- /dev/null
+++ b/doc/src/images/qtconcurrent-progressdialog.png
diff --git a/doc/src/images/qtconfig-appearance.png b/doc/src/images/qtconfig-appearance.png
new file mode 100644
index 0000000000..27f7f2f334
--- /dev/null
+++ b/doc/src/images/qtconfig-appearance.png
diff --git a/doc/src/images/qtdemo-small.png b/doc/src/images/qtdemo-small.png
new file mode 100644
index 0000000000..d987ffa0a1
--- /dev/null
+++ b/doc/src/images/qtdemo-small.png
diff --git a/doc/src/images/qtdemo.png b/doc/src/images/qtdemo.png
new file mode 100644
index 0000000000..e7267a91e2
--- /dev/null
+++ b/doc/src/images/qtdemo.png
diff --git a/doc/src/images/qtdesignerextensions.png b/doc/src/images/qtdesignerextensions.png
new file mode 100644
index 0000000000..d48701e85d
--- /dev/null
+++ b/doc/src/images/qtdesignerextensions.png
diff --git a/doc/src/images/qtdesignerscreenshot.png b/doc/src/images/qtdesignerscreenshot.png
new file mode 100644
index 0000000000..d71c986df9
--- /dev/null
+++ b/doc/src/images/qtdesignerscreenshot.png
diff --git a/doc/src/images/qtextblock-fragments.png b/doc/src/images/qtextblock-fragments.png
new file mode 100644
index 0000000000..777fba0062
--- /dev/null
+++ b/doc/src/images/qtextblock-fragments.png
diff --git a/doc/src/images/qtextblock-sequence.png b/doc/src/images/qtextblock-sequence.png
new file mode 100644
index 0000000000..85f208e1fb
--- /dev/null
+++ b/doc/src/images/qtextblock-sequence.png
diff --git a/doc/src/images/qtextdocument-frames.png b/doc/src/images/qtextdocument-frames.png
new file mode 100644
index 0000000000..96a2dbbd14
--- /dev/null
+++ b/doc/src/images/qtextdocument-frames.png
diff --git a/doc/src/images/qtextfragment-split.png b/doc/src/images/qtextfragment-split.png
new file mode 100644
index 0000000000..c232c408c9
--- /dev/null
+++ b/doc/src/images/qtextfragment-split.png
diff --git a/doc/src/images/qtextframe-style.png b/doc/src/images/qtextframe-style.png
new file mode 100644
index 0000000000..6151307803
--- /dev/null
+++ b/doc/src/images/qtextframe-style.png
diff --git a/doc/src/images/qtexttable-cells.png b/doc/src/images/qtexttable-cells.png
new file mode 100644
index 0000000000..8460e60d38
--- /dev/null
+++ b/doc/src/images/qtexttable-cells.png
diff --git a/doc/src/images/qtexttableformat-cell.png b/doc/src/images/qtexttableformat-cell.png
new file mode 100644
index 0000000000..bbf85ffe46
--- /dev/null
+++ b/doc/src/images/qtexttableformat-cell.png
diff --git a/doc/src/images/qtransform-combinedtransformation.png b/doc/src/images/qtransform-combinedtransformation.png
new file mode 100644
index 0000000000..df1e226746
--- /dev/null
+++ b/doc/src/images/qtransform-combinedtransformation.png
diff --git a/doc/src/images/qtransform-combinedtransformation2.png b/doc/src/images/qtransform-combinedtransformation2.png
new file mode 100644
index 0000000000..c037a0d565
--- /dev/null
+++ b/doc/src/images/qtransform-combinedtransformation2.png
diff --git a/doc/src/images/qtransform-representation.png b/doc/src/images/qtransform-representation.png
new file mode 100644
index 0000000000..2608872ad7
--- /dev/null
+++ b/doc/src/images/qtransform-representation.png
diff --git a/doc/src/images/qtransform-simpletransformation.png b/doc/src/images/qtransform-simpletransformation.png
new file mode 100644
index 0000000000..743e4e3e07
--- /dev/null
+++ b/doc/src/images/qtransform-simpletransformation.png
diff --git a/doc/src/images/qtscript-calculator-example.png b/doc/src/images/qtscript-calculator-example.png
new file mode 100644
index 0000000000..f2db9061b6
--- /dev/null
+++ b/doc/src/images/qtscript-calculator-example.png
diff --git a/doc/src/images/qtscript-calculator.png b/doc/src/images/qtscript-calculator.png
new file mode 100644
index 0000000000..113c46bbc8
--- /dev/null
+++ b/doc/src/images/qtscript-calculator.png
diff --git a/doc/src/images/qtscript-context2d.png b/doc/src/images/qtscript-context2d.png
new file mode 100644
index 0000000000..05eaf6e6fb
--- /dev/null
+++ b/doc/src/images/qtscript-context2d.png
diff --git a/doc/src/images/qtscript-debugger-small.png b/doc/src/images/qtscript-debugger-small.png
new file mode 100644
index 0000000000..ffa60f4c2c
--- /dev/null
+++ b/doc/src/images/qtscript-debugger-small.png
diff --git a/doc/src/images/qtscript-debugger.png b/doc/src/images/qtscript-debugger.png
new file mode 100644
index 0000000000..c417d0ba3b
--- /dev/null
+++ b/doc/src/images/qtscript-debugger.png
diff --git a/doc/src/images/qtscript-examples.png b/doc/src/images/qtscript-examples.png
new file mode 100644
index 0000000000..d2e9179e6a
--- /dev/null
+++ b/doc/src/images/qtscript-examples.png
diff --git a/doc/src/images/qtscripttools-examples.png b/doc/src/images/qtscripttools-examples.png
new file mode 100644
index 0000000000..369f32eaa1
--- /dev/null
+++ b/doc/src/images/qtscripttools-examples.png
diff --git a/doc/src/images/qtwizard-aero1.png b/doc/src/images/qtwizard-aero1.png
new file mode 100644
index 0000000000..fe9e9bc21c
--- /dev/null
+++ b/doc/src/images/qtwizard-aero1.png
diff --git a/doc/src/images/qtwizard-aero2.png b/doc/src/images/qtwizard-aero2.png
new file mode 100644
index 0000000000..261c0651fe
--- /dev/null
+++ b/doc/src/images/qtwizard-aero2.png
diff --git a/doc/src/images/qtwizard-classic1.png b/doc/src/images/qtwizard-classic1.png
new file mode 100644
index 0000000000..be3edbecaf
--- /dev/null
+++ b/doc/src/images/qtwizard-classic1.png
diff --git a/doc/src/images/qtwizard-classic2.png b/doc/src/images/qtwizard-classic2.png
new file mode 100644
index 0000000000..165f569d1d
--- /dev/null
+++ b/doc/src/images/qtwizard-classic2.png
diff --git a/doc/src/images/qtwizard-mac1.png b/doc/src/images/qtwizard-mac1.png
new file mode 100644
index 0000000000..bc8cd9b715
--- /dev/null
+++ b/doc/src/images/qtwizard-mac1.png
diff --git a/doc/src/images/qtwizard-mac2.png b/doc/src/images/qtwizard-mac2.png
new file mode 100644
index 0000000000..850f6b85a5
--- /dev/null
+++ b/doc/src/images/qtwizard-mac2.png
diff --git a/doc/src/images/qtwizard-macpage.png b/doc/src/images/qtwizard-macpage.png
new file mode 100644
index 0000000000..1ba3122f91
--- /dev/null
+++ b/doc/src/images/qtwizard-macpage.png
diff --git a/doc/src/images/qtwizard-modern1.png b/doc/src/images/qtwizard-modern1.png
new file mode 100644
index 0000000000..223e3ddec3
--- /dev/null
+++ b/doc/src/images/qtwizard-modern1.png
diff --git a/doc/src/images/qtwizard-modern2.png b/doc/src/images/qtwizard-modern2.png
new file mode 100644
index 0000000000..d66c374a4c
--- /dev/null
+++ b/doc/src/images/qtwizard-modern2.png
diff --git a/doc/src/images/qtwizard-nonmacpage.png b/doc/src/images/qtwizard-nonmacpage.png
new file mode 100644
index 0000000000..cbe464d57f
--- /dev/null
+++ b/doc/src/images/qtwizard-nonmacpage.png
diff --git a/doc/src/images/querymodel-example.png b/doc/src/images/querymodel-example.png
new file mode 100644
index 0000000000..908d500e1f
--- /dev/null
+++ b/doc/src/images/querymodel-example.png
diff --git a/doc/src/images/queuedcustomtype-example.png b/doc/src/images/queuedcustomtype-example.png
new file mode 100644
index 0000000000..4399b631d7
--- /dev/null
+++ b/doc/src/images/queuedcustomtype-example.png
diff --git a/doc/src/images/qundoview.png b/doc/src/images/qundoview.png
new file mode 100644
index 0000000000..3bdb1cf2ed
--- /dev/null
+++ b/doc/src/images/qundoview.png
diff --git a/doc/src/images/qurl-authority.png b/doc/src/images/qurl-authority.png
new file mode 100644
index 0000000000..54de2a792e
--- /dev/null
+++ b/doc/src/images/qurl-authority.png
diff --git a/doc/src/images/qurl-authority2.png b/doc/src/images/qurl-authority2.png
new file mode 100644
index 0000000000..fe8d4d87b2
--- /dev/null
+++ b/doc/src/images/qurl-authority2.png
diff --git a/doc/src/images/qurl-authority3.png b/doc/src/images/qurl-authority3.png
new file mode 100644
index 0000000000..242063e935
--- /dev/null
+++ b/doc/src/images/qurl-authority3.png
diff --git a/doc/src/images/qurl-fragment.png b/doc/src/images/qurl-fragment.png
new file mode 100644
index 0000000000..e93a252e7a
--- /dev/null
+++ b/doc/src/images/qurl-fragment.png
diff --git a/doc/src/images/qurl-ftppath.png b/doc/src/images/qurl-ftppath.png
new file mode 100644
index 0000000000..d88df4922b
--- /dev/null
+++ b/doc/src/images/qurl-ftppath.png
diff --git a/doc/src/images/qurl-mailtopath.png b/doc/src/images/qurl-mailtopath.png
new file mode 100644
index 0000000000..34ec153b74
--- /dev/null
+++ b/doc/src/images/qurl-mailtopath.png
diff --git a/doc/src/images/qurl-querystring.png b/doc/src/images/qurl-querystring.png
new file mode 100644
index 0000000000..7c3309a5ac
--- /dev/null
+++ b/doc/src/images/qurl-querystring.png
diff --git a/doc/src/images/qvbox-m.png b/doc/src/images/qvbox-m.png
new file mode 100644
index 0000000000..2a2a595f5e
--- /dev/null
+++ b/doc/src/images/qvbox-m.png
diff --git a/doc/src/images/qvboxlayout-with-5-children.png b/doc/src/images/qvboxlayout-with-5-children.png
new file mode 100644
index 0000000000..57c37d7247
--- /dev/null
+++ b/doc/src/images/qvboxlayout-with-5-children.png
diff --git a/doc/src/images/qwebview-diagram.png b/doc/src/images/qwebview-diagram.png
new file mode 100644
index 0000000000..ada865e2e4
--- /dev/null
+++ b/doc/src/images/qwebview-diagram.png
diff --git a/doc/src/images/qwebview-url.png b/doc/src/images/qwebview-url.png
new file mode 100644
index 0000000000..3c40080851
--- /dev/null
+++ b/doc/src/images/qwebview-url.png
diff --git a/doc/src/images/qwindowsstyle.png b/doc/src/images/qwindowsstyle.png
new file mode 100644
index 0000000000..6b387a7f49
--- /dev/null
+++ b/doc/src/images/qwindowsstyle.png
diff --git a/doc/src/images/qwindowsxpstyle.png b/doc/src/images/qwindowsxpstyle.png
new file mode 100644
index 0000000000..b24bdeb7f6
--- /dev/null
+++ b/doc/src/images/qwindowsxpstyle.png
diff --git a/doc/src/images/qwsserver_keyboardfilter.png b/doc/src/images/qwsserver_keyboardfilter.png
new file mode 100644
index 0000000000..9efc080b9d
--- /dev/null
+++ b/doc/src/images/qwsserver_keyboardfilter.png
diff --git a/doc/src/images/radialGradient.png b/doc/src/images/radialGradient.png
new file mode 100644
index 0000000000..b6ab6c8807
--- /dev/null
+++ b/doc/src/images/radialGradient.png
diff --git a/doc/src/images/recentfiles-example.png b/doc/src/images/recentfiles-example.png
new file mode 100644
index 0000000000..8a1f2e5509
--- /dev/null
+++ b/doc/src/images/recentfiles-example.png
diff --git a/doc/src/images/recipes-example.png b/doc/src/images/recipes-example.png
new file mode 100644
index 0000000000..21ebc9b332
--- /dev/null
+++ b/doc/src/images/recipes-example.png
diff --git a/doc/src/images/regexp-example.png b/doc/src/images/regexp-example.png
new file mode 100644
index 0000000000..0f31a2f93f
--- /dev/null
+++ b/doc/src/images/regexp-example.png
diff --git a/doc/src/images/relationaltable.png b/doc/src/images/relationaltable.png
new file mode 100644
index 0000000000..bdfd40f703
--- /dev/null
+++ b/doc/src/images/relationaltable.png
diff --git a/doc/src/images/relationaltablemodel-example.png b/doc/src/images/relationaltablemodel-example.png
new file mode 100644
index 0000000000..44fc858562
--- /dev/null
+++ b/doc/src/images/relationaltablemodel-example.png
diff --git a/doc/src/images/remotecontrolledcar-car-example.png b/doc/src/images/remotecontrolledcar-car-example.png
new file mode 100644
index 0000000000..7e08340c80
--- /dev/null
+++ b/doc/src/images/remotecontrolledcar-car-example.png
diff --git a/doc/src/images/remotecontrolledcar-controller-example.png b/doc/src/images/remotecontrolledcar-controller-example.png
new file mode 100644
index 0000000000..cae1ab81f9
--- /dev/null
+++ b/doc/src/images/remotecontrolledcar-controller-example.png
diff --git a/doc/src/images/resources.png b/doc/src/images/resources.png
new file mode 100644
index 0000000000..eb7af96d77
--- /dev/null
+++ b/doc/src/images/resources.png
diff --git a/doc/src/images/richtext-document.png b/doc/src/images/richtext-document.png
new file mode 100644
index 0000000000..4ae5d16b61
--- /dev/null
+++ b/doc/src/images/richtext-document.png
diff --git a/doc/src/images/richtext-examples.png b/doc/src/images/richtext-examples.png
new file mode 100644
index 0000000000..1091c20454
--- /dev/null
+++ b/doc/src/images/richtext-examples.png
diff --git a/doc/src/images/rintersect.png b/doc/src/images/rintersect.png
new file mode 100644
index 0000000000..025ea93e67
--- /dev/null
+++ b/doc/src/images/rintersect.png
diff --git a/doc/src/images/rsslistingexample.png b/doc/src/images/rsslistingexample.png
new file mode 100644
index 0000000000..6bac295b7d
--- /dev/null
+++ b/doc/src/images/rsslistingexample.png
diff --git a/doc/src/images/rsubtract.png b/doc/src/images/rsubtract.png
new file mode 100644
index 0000000000..add6405a2d
--- /dev/null
+++ b/doc/src/images/rsubtract.png
diff --git a/doc/src/images/runion.png b/doc/src/images/runion.png
new file mode 100644
index 0000000000..5b11e8c13e
--- /dev/null
+++ b/doc/src/images/runion.png
diff --git a/doc/src/images/rxor.png b/doc/src/images/rxor.png
new file mode 100644
index 0000000000..f86e6d628c
--- /dev/null
+++ b/doc/src/images/rxor.png
diff --git a/doc/src/images/samplebuffers-example.png b/doc/src/images/samplebuffers-example.png
new file mode 100644
index 0000000000..b751c143b3
--- /dev/null
+++ b/doc/src/images/samplebuffers-example.png
diff --git a/doc/src/images/saxbookmarks-example.png b/doc/src/images/saxbookmarks-example.png
new file mode 100644
index 0000000000..54d793be56
--- /dev/null
+++ b/doc/src/images/saxbookmarks-example.png
diff --git a/doc/src/images/screenshot-example.png b/doc/src/images/screenshot-example.png
new file mode 100644
index 0000000000..86894867c3
--- /dev/null
+++ b/doc/src/images/screenshot-example.png
diff --git a/doc/src/images/scribble-example.png b/doc/src/images/scribble-example.png
new file mode 100644
index 0000000000..a2cb1de3e8
--- /dev/null
+++ b/doc/src/images/scribble-example.png
diff --git a/doc/src/images/sdi-example.png b/doc/src/images/sdi-example.png
new file mode 100644
index 0000000000..8cd7aa0128
--- /dev/null
+++ b/doc/src/images/sdi-example.png
diff --git a/doc/src/images/securesocketclient.png b/doc/src/images/securesocketclient.png
new file mode 100644
index 0000000000..8736cbc264
--- /dev/null
+++ b/doc/src/images/securesocketclient.png
diff --git a/doc/src/images/securesocketclient2.png b/doc/src/images/securesocketclient2.png
new file mode 100644
index 0000000000..23db851e61
--- /dev/null
+++ b/doc/src/images/securesocketclient2.png
diff --git a/doc/src/images/selected-items1.png b/doc/src/images/selected-items1.png
new file mode 100644
index 0000000000..12b572d4d8
--- /dev/null
+++ b/doc/src/images/selected-items1.png
diff --git a/doc/src/images/selected-items2.png b/doc/src/images/selected-items2.png
new file mode 100644
index 0000000000..ad247d90a9
--- /dev/null
+++ b/doc/src/images/selected-items2.png
diff --git a/doc/src/images/selected-items3.png b/doc/src/images/selected-items3.png
new file mode 100644
index 0000000000..d7aa7be46b
--- /dev/null
+++ b/doc/src/images/selected-items3.png
diff --git a/doc/src/images/selection-extended.png b/doc/src/images/selection-extended.png
new file mode 100644
index 0000000000..8ca488d812
--- /dev/null
+++ b/doc/src/images/selection-extended.png
diff --git a/doc/src/images/selection-multi.png b/doc/src/images/selection-multi.png
new file mode 100644
index 0000000000..766e4a18bc
--- /dev/null
+++ b/doc/src/images/selection-multi.png
diff --git a/doc/src/images/selection-single.png b/doc/src/images/selection-single.png
new file mode 100644
index 0000000000..d9d0655864
--- /dev/null
+++ b/doc/src/images/selection-single.png
diff --git a/doc/src/images/session.png b/doc/src/images/session.png
new file mode 100644
index 0000000000..b9159aef59
--- /dev/null
+++ b/doc/src/images/session.png
diff --git a/doc/src/images/settingseditor-example.png b/doc/src/images/settingseditor-example.png
new file mode 100644
index 0000000000..7a5be05fd0
--- /dev/null
+++ b/doc/src/images/settingseditor-example.png
diff --git a/doc/src/images/shapedclock-dragging.png b/doc/src/images/shapedclock-dragging.png
new file mode 100644
index 0000000000..1b25afbcf0
--- /dev/null
+++ b/doc/src/images/shapedclock-dragging.png
diff --git a/doc/src/images/shapedclock-example.png b/doc/src/images/shapedclock-example.png
new file mode 100644
index 0000000000..31ceeca7f9
--- /dev/null
+++ b/doc/src/images/shapedclock-example.png
diff --git a/doc/src/images/shareddirmodel.png b/doc/src/images/shareddirmodel.png
new file mode 100644
index 0000000000..6daa9d3c96
--- /dev/null
+++ b/doc/src/images/shareddirmodel.png
diff --git a/doc/src/images/sharedmemory-example_1.png b/doc/src/images/sharedmemory-example_1.png
new file mode 100644
index 0000000000..53244d3f52
--- /dev/null
+++ b/doc/src/images/sharedmemory-example_1.png
diff --git a/doc/src/images/sharedmemory-example_2.png b/doc/src/images/sharedmemory-example_2.png
new file mode 100644
index 0000000000..fc71aed56e
--- /dev/null
+++ b/doc/src/images/sharedmemory-example_2.png
diff --git a/doc/src/images/sharedmodel-tableviews.png b/doc/src/images/sharedmodel-tableviews.png
new file mode 100644
index 0000000000..d241e4ca1a
--- /dev/null
+++ b/doc/src/images/sharedmodel-tableviews.png
diff --git a/doc/src/images/sharedselection-tableviews.png b/doc/src/images/sharedselection-tableviews.png
new file mode 100644
index 0000000000..ccbda2578f
--- /dev/null
+++ b/doc/src/images/sharedselection-tableviews.png
diff --git a/doc/src/images/signals-n-slots-aw-nat.png b/doc/src/images/signals-n-slots-aw-nat.png
new file mode 100644
index 0000000000..8ab545bbb3
--- /dev/null
+++ b/doc/src/images/signals-n-slots-aw-nat.png
diff --git a/doc/src/images/simpledommodel-example.png b/doc/src/images/simpledommodel-example.png
new file mode 100644
index 0000000000..b8e3f92e1c
--- /dev/null
+++ b/doc/src/images/simpledommodel-example.png
diff --git a/doc/src/images/simpletextviewer-example.png b/doc/src/images/simpletextviewer-example.png
new file mode 100644
index 0000000000..95d2905393
--- /dev/null
+++ b/doc/src/images/simpletextviewer-example.png
diff --git a/doc/src/images/simpletextviewer-findfiledialog.png b/doc/src/images/simpletextviewer-findfiledialog.png
new file mode 100644
index 0000000000..f6e55f0998
--- /dev/null
+++ b/doc/src/images/simpletextviewer-findfiledialog.png
diff --git a/doc/src/images/simpletextviewer-mainwindow.png b/doc/src/images/simpletextviewer-mainwindow.png
new file mode 100644
index 0000000000..98c1c61ccd
--- /dev/null
+++ b/doc/src/images/simpletextviewer-mainwindow.png
diff --git a/doc/src/images/simpletreemodel-example.png b/doc/src/images/simpletreemodel-example.png
new file mode 100644
index 0000000000..9655d107de
--- /dev/null
+++ b/doc/src/images/simpletreemodel-example.png
diff --git a/doc/src/images/simplewidgetmapper-example.png b/doc/src/images/simplewidgetmapper-example.png
new file mode 100644
index 0000000000..f85ad0e268
--- /dev/null
+++ b/doc/src/images/simplewidgetmapper-example.png
diff --git a/doc/src/images/simplewizard-page1.png b/doc/src/images/simplewizard-page1.png
new file mode 100644
index 0000000000..d6f701a6a8
--- /dev/null
+++ b/doc/src/images/simplewizard-page1.png
diff --git a/doc/src/images/simplewizard-page2.png b/doc/src/images/simplewizard-page2.png
new file mode 100644
index 0000000000..f065d85bd0
--- /dev/null
+++ b/doc/src/images/simplewizard-page2.png
diff --git a/doc/src/images/simplewizard-page3.png b/doc/src/images/simplewizard-page3.png
new file mode 100644
index 0000000000..e200808e4c
--- /dev/null
+++ b/doc/src/images/simplewizard-page3.png
diff --git a/doc/src/images/simplewizard.png b/doc/src/images/simplewizard.png
new file mode 100644
index 0000000000..5a7f0c7b2c
--- /dev/null
+++ b/doc/src/images/simplewizard.png
diff --git a/doc/src/images/sipdialog-closed.png b/doc/src/images/sipdialog-closed.png
new file mode 100644
index 0000000000..50408ed034
--- /dev/null
+++ b/doc/src/images/sipdialog-closed.png
diff --git a/doc/src/images/sipdialog-opened.png b/doc/src/images/sipdialog-opened.png
new file mode 100644
index 0000000000..981587d713
--- /dev/null
+++ b/doc/src/images/sipdialog-opened.png
diff --git a/doc/src/images/sliders-example.png b/doc/src/images/sliders-example.png
new file mode 100644
index 0000000000..a67ce1dbda
--- /dev/null
+++ b/doc/src/images/sliders-example.png
diff --git a/doc/src/images/smooth.png b/doc/src/images/smooth.png
new file mode 100644
index 0000000000..0d53e55ef2
--- /dev/null
+++ b/doc/src/images/smooth.png
diff --git a/doc/src/images/sortingmodel-example.png b/doc/src/images/sortingmodel-example.png
new file mode 100644
index 0000000000..a23febeaa5
--- /dev/null
+++ b/doc/src/images/sortingmodel-example.png
diff --git a/doc/src/images/spinboxdelegate-example.png b/doc/src/images/spinboxdelegate-example.png
new file mode 100644
index 0000000000..5e57a9c12b
--- /dev/null
+++ b/doc/src/images/spinboxdelegate-example.png
diff --git a/doc/src/images/spinboxes-example.png b/doc/src/images/spinboxes-example.png
new file mode 100644
index 0000000000..14c42d2404
--- /dev/null
+++ b/doc/src/images/spinboxes-example.png
diff --git a/doc/src/images/spreadsheet-demo.png b/doc/src/images/spreadsheet-demo.png
new file mode 100644
index 0000000000..ae7dde24b0
--- /dev/null
+++ b/doc/src/images/spreadsheet-demo.png
diff --git a/doc/src/images/sql-examples.png b/doc/src/images/sql-examples.png
new file mode 100644
index 0000000000..e8d2b351a0
--- /dev/null
+++ b/doc/src/images/sql-examples.png
diff --git a/doc/src/images/sql-widget-mapper.png b/doc/src/images/sql-widget-mapper.png
new file mode 100644
index 0000000000..dfa64aba9e
--- /dev/null
+++ b/doc/src/images/sql-widget-mapper.png
diff --git a/doc/src/images/sqlbrowser-demo.png b/doc/src/images/sqlbrowser-demo.png
new file mode 100644
index 0000000000..101ec5a0a3
--- /dev/null
+++ b/doc/src/images/sqlbrowser-demo.png
diff --git a/doc/src/images/standard-views.png b/doc/src/images/standard-views.png
new file mode 100644
index 0000000000..836ae36e14
--- /dev/null
+++ b/doc/src/images/standard-views.png
diff --git a/doc/src/images/standarddialogs-example.png b/doc/src/images/standarddialogs-example.png
new file mode 100644
index 0000000000..b6b8a076db
--- /dev/null
+++ b/doc/src/images/standarddialogs-example.png
diff --git a/doc/src/images/stardelegate.png b/doc/src/images/stardelegate.png
new file mode 100644
index 0000000000..24fa9fb0d7
--- /dev/null
+++ b/doc/src/images/stardelegate.png
diff --git a/doc/src/images/stliterators1.png b/doc/src/images/stliterators1.png
new file mode 100644
index 0000000000..6d71e4712f
--- /dev/null
+++ b/doc/src/images/stliterators1.png
diff --git a/doc/src/images/stringlistmodel.png b/doc/src/images/stringlistmodel.png
new file mode 100644
index 0000000000..eedbff3585
--- /dev/null
+++ b/doc/src/images/stringlistmodel.png
diff --git a/doc/src/images/stylepluginexample.png b/doc/src/images/stylepluginexample.png
new file mode 100644
index 0000000000..05d8c6b5cf
--- /dev/null
+++ b/doc/src/images/stylepluginexample.png
diff --git a/doc/src/images/styles-3d.png b/doc/src/images/styles-3d.png
new file mode 100644
index 0000000000..8344b4c05b
--- /dev/null
+++ b/doc/src/images/styles-3d.png
diff --git a/doc/src/images/styles-aliasing.png b/doc/src/images/styles-aliasing.png
new file mode 100644
index 0000000000..c3514460fb
--- /dev/null
+++ b/doc/src/images/styles-aliasing.png
diff --git a/doc/src/images/styles-disabledwood.png b/doc/src/images/styles-disabledwood.png
new file mode 100644
index 0000000000..261bbae0ef
--- /dev/null
+++ b/doc/src/images/styles-disabledwood.png
diff --git a/doc/src/images/styles-enabledwood.png b/doc/src/images/styles-enabledwood.png
new file mode 100644
index 0000000000..168c1d2d2c
--- /dev/null
+++ b/doc/src/images/styles-enabledwood.png
diff --git a/doc/src/images/styles-woodbuttons.png b/doc/src/images/styles-woodbuttons.png
new file mode 100644
index 0000000000..176d7dff38
--- /dev/null
+++ b/doc/src/images/styles-woodbuttons.png
diff --git a/doc/src/images/stylesheet-border-image-normal.png b/doc/src/images/stylesheet-border-image-normal.png
new file mode 100644
index 0000000000..8afe3c9a67
--- /dev/null
+++ b/doc/src/images/stylesheet-border-image-normal.png
diff --git a/doc/src/images/stylesheet-border-image-stretched.png b/doc/src/images/stylesheet-border-image-stretched.png
new file mode 100644
index 0000000000..3f9ca92dd3
--- /dev/null
+++ b/doc/src/images/stylesheet-border-image-stretched.png
diff --git a/doc/src/images/stylesheet-border-image-wrong.png b/doc/src/images/stylesheet-border-image-wrong.png
new file mode 100644
index 0000000000..19d6e449f4
--- /dev/null
+++ b/doc/src/images/stylesheet-border-image-wrong.png
diff --git a/doc/src/images/stylesheet-boxmodel.png b/doc/src/images/stylesheet-boxmodel.png
new file mode 100644
index 0000000000..a0249d77b7
--- /dev/null
+++ b/doc/src/images/stylesheet-boxmodel.png
diff --git a/doc/src/images/stylesheet-branch-closed.png b/doc/src/images/stylesheet-branch-closed.png
new file mode 100644
index 0000000000..213ffdd88f
--- /dev/null
+++ b/doc/src/images/stylesheet-branch-closed.png
diff --git a/doc/src/images/stylesheet-branch-end.png b/doc/src/images/stylesheet-branch-end.png
new file mode 100644
index 0000000000..54915b3b01
--- /dev/null
+++ b/doc/src/images/stylesheet-branch-end.png
diff --git a/doc/src/images/stylesheet-branch-more.png b/doc/src/images/stylesheet-branch-more.png
new file mode 100644
index 0000000000..664ad44740
--- /dev/null
+++ b/doc/src/images/stylesheet-branch-more.png
diff --git a/doc/src/images/stylesheet-branch-open.png b/doc/src/images/stylesheet-branch-open.png
new file mode 100644
index 0000000000..e8cad95ccf
--- /dev/null
+++ b/doc/src/images/stylesheet-branch-open.png
diff --git a/doc/src/images/stylesheet-coffee-cleanlooks.png b/doc/src/images/stylesheet-coffee-cleanlooks.png
new file mode 100644
index 0000000000..e75df0d80a
--- /dev/null
+++ b/doc/src/images/stylesheet-coffee-cleanlooks.png
diff --git a/doc/src/images/stylesheet-coffee-plastique.png b/doc/src/images/stylesheet-coffee-plastique.png
new file mode 100644
index 0000000000..d3bbe27235
--- /dev/null
+++ b/doc/src/images/stylesheet-coffee-plastique.png
diff --git a/doc/src/images/stylesheet-coffee-xp.png b/doc/src/images/stylesheet-coffee-xp.png
new file mode 100644
index 0000000000..8bedd80ee9
--- /dev/null
+++ b/doc/src/images/stylesheet-coffee-xp.png
diff --git a/doc/src/images/stylesheet-designer-options.png b/doc/src/images/stylesheet-designer-options.png
new file mode 100644
index 0000000000..446ce10b13
--- /dev/null
+++ b/doc/src/images/stylesheet-designer-options.png
diff --git a/doc/src/images/stylesheet-pagefold-mac.png b/doc/src/images/stylesheet-pagefold-mac.png
new file mode 100644
index 0000000000..5c061b9cfd
--- /dev/null
+++ b/doc/src/images/stylesheet-pagefold-mac.png
diff --git a/doc/src/images/stylesheet-pagefold.png b/doc/src/images/stylesheet-pagefold.png
new file mode 100644
index 0000000000..5ccb4edbc9
--- /dev/null
+++ b/doc/src/images/stylesheet-pagefold.png
diff --git a/doc/src/images/stylesheet-redbutton1.png b/doc/src/images/stylesheet-redbutton1.png
new file mode 100644
index 0000000000..cb03375e12
--- /dev/null
+++ b/doc/src/images/stylesheet-redbutton1.png
diff --git a/doc/src/images/stylesheet-redbutton2.png b/doc/src/images/stylesheet-redbutton2.png
new file mode 100644
index 0000000000..5325708942
--- /dev/null
+++ b/doc/src/images/stylesheet-redbutton2.png
diff --git a/doc/src/images/stylesheet-redbutton3.png b/doc/src/images/stylesheet-redbutton3.png
new file mode 100644
index 0000000000..dd976f0760
--- /dev/null
+++ b/doc/src/images/stylesheet-redbutton3.png
diff --git a/doc/src/images/stylesheet-scrollbar1.png b/doc/src/images/stylesheet-scrollbar1.png
new file mode 100644
index 0000000000..666ff1119a
--- /dev/null
+++ b/doc/src/images/stylesheet-scrollbar1.png
diff --git a/doc/src/images/stylesheet-scrollbar2.png b/doc/src/images/stylesheet-scrollbar2.png
new file mode 100644
index 0000000000..439cf8035d
--- /dev/null
+++ b/doc/src/images/stylesheet-scrollbar2.png
diff --git a/doc/src/images/stylesheet-treeview.png b/doc/src/images/stylesheet-treeview.png
new file mode 100644
index 0000000000..883d190f36
--- /dev/null
+++ b/doc/src/images/stylesheet-treeview.png
diff --git a/doc/src/images/stylesheet-vline.png b/doc/src/images/stylesheet-vline.png
new file mode 100644
index 0000000000..8f0c336fd8
--- /dev/null
+++ b/doc/src/images/stylesheet-vline.png
diff --git a/doc/src/images/svg-image.png b/doc/src/images/svg-image.png
new file mode 100644
index 0000000000..5a71ea7e8c
--- /dev/null
+++ b/doc/src/images/svg-image.png
diff --git a/doc/src/images/svgviewer-example.png b/doc/src/images/svgviewer-example.png
new file mode 100644
index 0000000000..14f1377cc1
--- /dev/null
+++ b/doc/src/images/svgviewer-example.png
diff --git a/doc/src/images/syntaxhighlighter-example.png b/doc/src/images/syntaxhighlighter-example.png
new file mode 100644
index 0000000000..d0e7f1249e
--- /dev/null
+++ b/doc/src/images/syntaxhighlighter-example.png
diff --git a/doc/src/images/system-tray.png b/doc/src/images/system-tray.png
new file mode 100644
index 0000000000..298b193cf7
--- /dev/null
+++ b/doc/src/images/system-tray.png
diff --git a/doc/src/images/systemtray-editor.png b/doc/src/images/systemtray-editor.png
new file mode 100644
index 0000000000..fb15dea8cb
--- /dev/null
+++ b/doc/src/images/systemtray-editor.png
diff --git a/doc/src/images/systemtray-example.png b/doc/src/images/systemtray-example.png
new file mode 100644
index 0000000000..98b5c8133e
--- /dev/null
+++ b/doc/src/images/systemtray-example.png
diff --git a/doc/src/images/t1.png b/doc/src/images/t1.png
new file mode 100644
index 0000000000..744721f601
--- /dev/null
+++ b/doc/src/images/t1.png
diff --git a/doc/src/images/t10.png b/doc/src/images/t10.png
new file mode 100644
index 0000000000..54aa587c63
--- /dev/null
+++ b/doc/src/images/t10.png
diff --git a/doc/src/images/t11.png b/doc/src/images/t11.png
new file mode 100644
index 0000000000..64b25faf9c
--- /dev/null
+++ b/doc/src/images/t11.png
diff --git a/doc/src/images/t12.png b/doc/src/images/t12.png
new file mode 100644
index 0000000000..7a23230630
--- /dev/null
+++ b/doc/src/images/t12.png
diff --git a/doc/src/images/t13.png b/doc/src/images/t13.png
new file mode 100644
index 0000000000..8734249cd7
--- /dev/null
+++ b/doc/src/images/t13.png
diff --git a/doc/src/images/t14.png b/doc/src/images/t14.png
new file mode 100644
index 0000000000..f947dbe9dd
--- /dev/null
+++ b/doc/src/images/t14.png
diff --git a/doc/src/images/t2.png b/doc/src/images/t2.png
new file mode 100644
index 0000000000..4b241194ca
--- /dev/null
+++ b/doc/src/images/t2.png
diff --git a/doc/src/images/t3.png b/doc/src/images/t3.png
new file mode 100644
index 0000000000..79c6413cf0
--- /dev/null
+++ b/doc/src/images/t3.png
diff --git a/doc/src/images/t4.png b/doc/src/images/t4.png
new file mode 100644
index 0000000000..34c6c75e61
--- /dev/null
+++ b/doc/src/images/t4.png
diff --git a/doc/src/images/t5.png b/doc/src/images/t5.png
new file mode 100644
index 0000000000..46b3d75b8e
--- /dev/null
+++ b/doc/src/images/t5.png
diff --git a/doc/src/images/t6.png b/doc/src/images/t6.png
new file mode 100644
index 0000000000..75c2c7e184
--- /dev/null
+++ b/doc/src/images/t6.png
diff --git a/doc/src/images/t7.png b/doc/src/images/t7.png
new file mode 100644
index 0000000000..b0518df747
--- /dev/null
+++ b/doc/src/images/t7.png
diff --git a/doc/src/images/t8.png b/doc/src/images/t8.png
new file mode 100644
index 0000000000..13b1b002ae
--- /dev/null
+++ b/doc/src/images/t8.png
diff --git a/doc/src/images/t9.png b/doc/src/images/t9.png
new file mode 100644
index 0000000000..54c3941845
--- /dev/null
+++ b/doc/src/images/t9.png
diff --git a/doc/src/images/t9_1.png b/doc/src/images/t9_1.png
new file mode 100644
index 0000000000..bdcc640934
--- /dev/null
+++ b/doc/src/images/t9_1.png
diff --git a/doc/src/images/t9_2.png b/doc/src/images/t9_2.png
new file mode 100644
index 0000000000..c1e23caa37
--- /dev/null
+++ b/doc/src/images/t9_2.png
diff --git a/doc/src/images/tabWidget-stylesheet1.png b/doc/src/images/tabWidget-stylesheet1.png
new file mode 100644
index 0000000000..fc8fc19e74
--- /dev/null
+++ b/doc/src/images/tabWidget-stylesheet1.png
diff --git a/doc/src/images/tabWidget-stylesheet2.png b/doc/src/images/tabWidget-stylesheet2.png
new file mode 100644
index 0000000000..2cbf2bf36d
--- /dev/null
+++ b/doc/src/images/tabWidget-stylesheet2.png
diff --git a/doc/src/images/tabWidget-stylesheet3.png b/doc/src/images/tabWidget-stylesheet3.png
new file mode 100644
index 0000000000..f57a9c9f9c
--- /dev/null
+++ b/doc/src/images/tabWidget-stylesheet3.png
diff --git a/doc/src/images/tabdialog-example.png b/doc/src/images/tabdialog-example.png
new file mode 100644
index 0000000000..219a85f86a
--- /dev/null
+++ b/doc/src/images/tabdialog-example.png
diff --git a/doc/src/images/tableWidget-stylesheet.png b/doc/src/images/tableWidget-stylesheet.png
new file mode 100644
index 0000000000..e99e7a97c8
--- /dev/null
+++ b/doc/src/images/tableWidget-stylesheet.png
diff --git a/doc/src/images/tablemodel-example.png b/doc/src/images/tablemodel-example.png
new file mode 100644
index 0000000000..3ae2a8c05c
--- /dev/null
+++ b/doc/src/images/tablemodel-example.png
diff --git a/doc/src/images/tabletexample.png b/doc/src/images/tabletexample.png
new file mode 100644
index 0000000000..a9b098d8d1
--- /dev/null
+++ b/doc/src/images/tabletexample.png
diff --git a/doc/src/images/taskmenuextension-dialog.png b/doc/src/images/taskmenuextension-dialog.png
new file mode 100644
index 0000000000..7ad6d40bd3
--- /dev/null
+++ b/doc/src/images/taskmenuextension-dialog.png
diff --git a/doc/src/images/taskmenuextension-example-faded.png b/doc/src/images/taskmenuextension-example-faded.png
new file mode 100644
index 0000000000..7e96f3ad88
--- /dev/null
+++ b/doc/src/images/taskmenuextension-example-faded.png
diff --git a/doc/src/images/taskmenuextension-example.png b/doc/src/images/taskmenuextension-example.png
new file mode 100644
index 0000000000..f1d46d2b40
--- /dev/null
+++ b/doc/src/images/taskmenuextension-example.png
diff --git a/doc/src/images/taskmenuextension-menu.png b/doc/src/images/taskmenuextension-menu.png
new file mode 100644
index 0000000000..d626c81dab
--- /dev/null
+++ b/doc/src/images/taskmenuextension-menu.png
diff --git a/doc/src/images/tcpstream.png b/doc/src/images/tcpstream.png
new file mode 100644
index 0000000000..7975376c8c
--- /dev/null
+++ b/doc/src/images/tcpstream.png
diff --git a/doc/src/images/tetrix-example.png b/doc/src/images/tetrix-example.png
new file mode 100644
index 0000000000..c9764dcccd
--- /dev/null
+++ b/doc/src/images/tetrix-example.png
diff --git a/doc/src/images/textedit-demo.png b/doc/src/images/textedit-demo.png
new file mode 100644
index 0000000000..3cf2883a12
--- /dev/null
+++ b/doc/src/images/textedit-demo.png
diff --git a/doc/src/images/textfinder-example-find.png b/doc/src/images/textfinder-example-find.png
new file mode 100644
index 0000000000..886bbc1104
--- /dev/null
+++ b/doc/src/images/textfinder-example-find.png
diff --git a/doc/src/images/textfinder-example-find2.png b/doc/src/images/textfinder-example-find2.png
new file mode 100644
index 0000000000..908f114095
--- /dev/null
+++ b/doc/src/images/textfinder-example-find2.png
diff --git a/doc/src/images/textfinder-example-userinterface.png b/doc/src/images/textfinder-example-userinterface.png
new file mode 100644
index 0000000000..2bebe2e9dd
--- /dev/null
+++ b/doc/src/images/textfinder-example-userinterface.png
diff --git a/doc/src/images/textfinder-example.png b/doc/src/images/textfinder-example.png
new file mode 100644
index 0000000000..87322df981
--- /dev/null
+++ b/doc/src/images/textfinder-example.png
diff --git a/doc/src/images/textobject-example.png b/doc/src/images/textobject-example.png
new file mode 100644
index 0000000000..626c102713
--- /dev/null
+++ b/doc/src/images/textobject-example.png
diff --git a/doc/src/images/texttable-merge.png b/doc/src/images/texttable-merge.png
new file mode 100644
index 0000000000..3b32239a42
--- /dev/null
+++ b/doc/src/images/texttable-merge.png
diff --git a/doc/src/images/texttable-split.png b/doc/src/images/texttable-split.png
new file mode 100644
index 0000000000..2fa17b85a3
--- /dev/null
+++ b/doc/src/images/texttable-split.png
diff --git a/doc/src/images/textures-example.png b/doc/src/images/textures-example.png
new file mode 100644
index 0000000000..b583ede063
--- /dev/null
+++ b/doc/src/images/textures-example.png
diff --git a/doc/src/images/thread-examples.png b/doc/src/images/thread-examples.png
new file mode 100644
index 0000000000..4f4dbacf67
--- /dev/null
+++ b/doc/src/images/thread-examples.png
diff --git a/doc/src/images/threadedfortuneserver-example.png b/doc/src/images/threadedfortuneserver-example.png
new file mode 100644
index 0000000000..57c66a5605
--- /dev/null
+++ b/doc/src/images/threadedfortuneserver-example.png
diff --git a/doc/src/images/threadsandobjects.png b/doc/src/images/threadsandobjects.png
new file mode 100644
index 0000000000..8357d2532a
--- /dev/null
+++ b/doc/src/images/threadsandobjects.png
diff --git a/doc/src/images/tool-examples.png b/doc/src/images/tool-examples.png
new file mode 100644
index 0000000000..592602af19
--- /dev/null
+++ b/doc/src/images/tool-examples.png
diff --git a/doc/src/images/tooltips-example.png b/doc/src/images/tooltips-example.png
new file mode 100644
index 0000000000..f2236b43de
--- /dev/null
+++ b/doc/src/images/tooltips-example.png
diff --git a/doc/src/images/torrent-example.png b/doc/src/images/torrent-example.png
new file mode 100644
index 0000000000..1032716e04
--- /dev/null
+++ b/doc/src/images/torrent-example.png
diff --git a/doc/src/images/trafficinfo-example.png b/doc/src/images/trafficinfo-example.png
new file mode 100644
index 0000000000..1717e402c4
--- /dev/null
+++ b/doc/src/images/trafficinfo-example.png
diff --git a/doc/src/images/transformations-example.png b/doc/src/images/transformations-example.png
new file mode 100644
index 0000000000..0fa185b0b8
--- /dev/null
+++ b/doc/src/images/transformations-example.png
diff --git a/doc/src/images/treemodel-structure.png b/doc/src/images/treemodel-structure.png
new file mode 100644
index 0000000000..778841b6fd
--- /dev/null
+++ b/doc/src/images/treemodel-structure.png
diff --git a/doc/src/images/treemodelcompleter-example.png b/doc/src/images/treemodelcompleter-example.png
new file mode 100644
index 0000000000..000405fe39
--- /dev/null
+++ b/doc/src/images/treemodelcompleter-example.png
diff --git a/doc/src/images/trivialwizard-example-conclusion.png b/doc/src/images/trivialwizard-example-conclusion.png
new file mode 100644
index 0000000000..c625ae4c75
--- /dev/null
+++ b/doc/src/images/trivialwizard-example-conclusion.png
diff --git a/doc/src/images/trivialwizard-example-flow.png b/doc/src/images/trivialwizard-example-flow.png
new file mode 100644
index 0000000000..79b6fce079
--- /dev/null
+++ b/doc/src/images/trivialwizard-example-flow.png
diff --git a/doc/src/images/trivialwizard-example-introduction.png b/doc/src/images/trivialwizard-example-introduction.png
new file mode 100644
index 0000000000..0bbceeda7f
--- /dev/null
+++ b/doc/src/images/trivialwizard-example-introduction.png
diff --git a/doc/src/images/trivialwizard-example-registration.png b/doc/src/images/trivialwizard-example-registration.png
new file mode 100644
index 0000000000..30b985e215
--- /dev/null
+++ b/doc/src/images/trivialwizard-example-registration.png
diff --git a/doc/src/images/trolltech-logo.png b/doc/src/images/trolltech-logo.png
new file mode 100644
index 0000000000..19e3789d50
--- /dev/null
+++ b/doc/src/images/trolltech-logo.png
diff --git a/doc/src/images/tutorial8-layout.png b/doc/src/images/tutorial8-layout.png
new file mode 100644
index 0000000000..190a9f82e2
--- /dev/null
+++ b/doc/src/images/tutorial8-layout.png
diff --git a/doc/src/images/tutorial8-reallayout.png b/doc/src/images/tutorial8-reallayout.png
new file mode 100644
index 0000000000..4f6eb600dc
--- /dev/null
+++ b/doc/src/images/tutorial8-reallayout.png
diff --git a/doc/src/images/udppackets.png b/doc/src/images/udppackets.png
new file mode 100644
index 0000000000..bd66c3f65e
--- /dev/null
+++ b/doc/src/images/udppackets.png
diff --git a/doc/src/images/uitools-examples.png b/doc/src/images/uitools-examples.png
new file mode 100644
index 0000000000..8c85cdb76b
--- /dev/null
+++ b/doc/src/images/uitools-examples.png
diff --git a/doc/src/images/undodemo.png b/doc/src/images/undodemo.png
new file mode 100644
index 0000000000..85c3622738
--- /dev/null
+++ b/doc/src/images/undodemo.png
diff --git a/doc/src/images/undoframeworkexample.png b/doc/src/images/undoframeworkexample.png
new file mode 100644
index 0000000000..7e0a1df260
--- /dev/null
+++ b/doc/src/images/undoframeworkexample.png
diff --git a/doc/src/images/unsmooth.png b/doc/src/images/unsmooth.png
new file mode 100644
index 0000000000..2e1bdbeba8
--- /dev/null
+++ b/doc/src/images/unsmooth.png
diff --git a/doc/src/images/wVista-Cert-border-small.png b/doc/src/images/wVista-Cert-border-small.png
new file mode 100644
index 0000000000..ea78525965
--- /dev/null
+++ b/doc/src/images/wVista-Cert-border-small.png
diff --git a/doc/src/images/webkit-examples.png b/doc/src/images/webkit-examples.png
new file mode 100644
index 0000000000..55bbd92a9c
--- /dev/null
+++ b/doc/src/images/webkit-examples.png
diff --git a/doc/src/images/webkit-netscape-plugin.png b/doc/src/images/webkit-netscape-plugin.png
new file mode 100644
index 0000000000..df15123fd9
--- /dev/null
+++ b/doc/src/images/webkit-netscape-plugin.png
diff --git a/doc/src/images/whatsthis.png b/doc/src/images/whatsthis.png
new file mode 100644
index 0000000000..2267c3d0b0
--- /dev/null
+++ b/doc/src/images/whatsthis.png
diff --git a/doc/src/images/widget-examples.png b/doc/src/images/widget-examples.png
new file mode 100644
index 0000000000..1e4e97c34f
--- /dev/null
+++ b/doc/src/images/widget-examples.png
diff --git a/doc/src/images/widgetdelegate.png b/doc/src/images/widgetdelegate.png
new file mode 100644
index 0000000000..3df4c4b6a5
--- /dev/null
+++ b/doc/src/images/widgetdelegate.png
diff --git a/doc/src/images/widgetmapper-combo-mapping.png b/doc/src/images/widgetmapper-combo-mapping.png
new file mode 100644
index 0000000000..f87cfaf346
--- /dev/null
+++ b/doc/src/images/widgetmapper-combo-mapping.png
diff --git a/doc/src/images/widgetmapper-simple-mapping.png b/doc/src/images/widgetmapper-simple-mapping.png
new file mode 100644
index 0000000000..3ef3f29f19
--- /dev/null
+++ b/doc/src/images/widgetmapper-simple-mapping.png
diff --git a/doc/src/images/widgetmapper-sql-mapping-table.png b/doc/src/images/widgetmapper-sql-mapping-table.png
new file mode 100644
index 0000000000..98734b34b6
--- /dev/null
+++ b/doc/src/images/widgetmapper-sql-mapping-table.png
diff --git a/doc/src/images/widgetmapper-sql-mapping.png b/doc/src/images/widgetmapper-sql-mapping.png
new file mode 100644
index 0000000000..88718c6a8b
--- /dev/null
+++ b/doc/src/images/widgetmapper-sql-mapping.png
diff --git a/doc/src/images/widgets-examples.png b/doc/src/images/widgets-examples.png
new file mode 100644
index 0000000000..2b314d1b31
--- /dev/null
+++ b/doc/src/images/widgets-examples.png
diff --git a/doc/src/images/widgets-tutorial-childwidget.png b/doc/src/images/widgets-tutorial-childwidget.png
new file mode 100644
index 0000000000..0d42d701fc
--- /dev/null
+++ b/doc/src/images/widgets-tutorial-childwidget.png
diff --git a/doc/src/images/widgets-tutorial-nestedlayouts.png b/doc/src/images/widgets-tutorial-nestedlayouts.png
new file mode 100644
index 0000000000..1e2a9f4a1d
--- /dev/null
+++ b/doc/src/images/widgets-tutorial-nestedlayouts.png
diff --git a/doc/src/images/widgets-tutorial-toplevel.png b/doc/src/images/widgets-tutorial-toplevel.png
new file mode 100644
index 0000000000..a80d13c50d
--- /dev/null
+++ b/doc/src/images/widgets-tutorial-toplevel.png
diff --git a/doc/src/images/widgets-tutorial-windowlayout.png b/doc/src/images/widgets-tutorial-windowlayout.png
new file mode 100644
index 0000000000..fce52cdcd9
--- /dev/null
+++ b/doc/src/images/widgets-tutorial-windowlayout.png
diff --git a/doc/src/images/wiggly-example.png b/doc/src/images/wiggly-example.png
new file mode 100644
index 0000000000..b20fbc445d
--- /dev/null
+++ b/doc/src/images/wiggly-example.png
diff --git a/doc/src/images/windowflags-example.png b/doc/src/images/windowflags-example.png
new file mode 100644
index 0000000000..9028b9b0d1
--- /dev/null
+++ b/doc/src/images/windowflags-example.png
diff --git a/doc/src/images/windowflags_controllerwindow.png b/doc/src/images/windowflags_controllerwindow.png
new file mode 100644
index 0000000000..d8ce239b03
--- /dev/null
+++ b/doc/src/images/windowflags_controllerwindow.png
diff --git a/doc/src/images/windowflags_previewwindow.png b/doc/src/images/windowflags_previewwindow.png
new file mode 100644
index 0000000000..cafcd37e02
--- /dev/null
+++ b/doc/src/images/windowflags_previewwindow.png
diff --git a/doc/src/images/windows-calendarwidget.png b/doc/src/images/windows-calendarwidget.png
new file mode 100644
index 0000000000..ad016238ad
--- /dev/null
+++ b/doc/src/images/windows-calendarwidget.png
diff --git a/doc/src/images/windows-checkbox.png b/doc/src/images/windows-checkbox.png
new file mode 100644
index 0000000000..eb1be4b736
--- /dev/null
+++ b/doc/src/images/windows-checkbox.png
diff --git a/doc/src/images/windows-combobox.png b/doc/src/images/windows-combobox.png
new file mode 100644
index 0000000000..d6bc483494
--- /dev/null
+++ b/doc/src/images/windows-combobox.png
diff --git a/doc/src/images/windows-dateedit.png b/doc/src/images/windows-dateedit.png
new file mode 100644
index 0000000000..95587ec62e
--- /dev/null
+++ b/doc/src/images/windows-dateedit.png
diff --git a/doc/src/images/windows-datetimeedit.png b/doc/src/images/windows-datetimeedit.png
new file mode 100644
index 0000000000..6aa1766146
--- /dev/null
+++ b/doc/src/images/windows-datetimeedit.png
diff --git a/doc/src/images/windows-dial.png b/doc/src/images/windows-dial.png
new file mode 100644
index 0000000000..0aa3a26159
--- /dev/null
+++ b/doc/src/images/windows-dial.png
diff --git a/doc/src/images/windows-doublespinbox.png b/doc/src/images/windows-doublespinbox.png
new file mode 100644
index 0000000000..244b5f66cd
--- /dev/null
+++ b/doc/src/images/windows-doublespinbox.png
diff --git a/doc/src/images/windows-fontcombobox.png b/doc/src/images/windows-fontcombobox.png
new file mode 100644
index 0000000000..bf98cad922
--- /dev/null
+++ b/doc/src/images/windows-fontcombobox.png
diff --git a/doc/src/images/windows-frame.png b/doc/src/images/windows-frame.png
new file mode 100644
index 0000000000..5979b31b25
--- /dev/null
+++ b/doc/src/images/windows-frame.png
diff --git a/doc/src/images/windows-groupbox.png b/doc/src/images/windows-groupbox.png
new file mode 100644
index 0000000000..88f46a3832
--- /dev/null
+++ b/doc/src/images/windows-groupbox.png
diff --git a/doc/src/images/windows-horizontalscrollbar.png b/doc/src/images/windows-horizontalscrollbar.png
new file mode 100644
index 0000000000..1f36b9a352
--- /dev/null
+++ b/doc/src/images/windows-horizontalscrollbar.png
diff --git a/doc/src/images/windows-label.png b/doc/src/images/windows-label.png
new file mode 100644
index 0000000000..a1c3a396a9
--- /dev/null
+++ b/doc/src/images/windows-label.png
diff --git a/doc/src/images/windows-lcdnumber.png b/doc/src/images/windows-lcdnumber.png
new file mode 100644
index 0000000000..b463511aab
--- /dev/null
+++ b/doc/src/images/windows-lcdnumber.png
diff --git a/doc/src/images/windows-lineedit.png b/doc/src/images/windows-lineedit.png
new file mode 100644
index 0000000000..270e4517ff
--- /dev/null
+++ b/doc/src/images/windows-lineedit.png
diff --git a/doc/src/images/windows-listview.png b/doc/src/images/windows-listview.png
new file mode 100644
index 0000000000..2884fae1b1
--- /dev/null
+++ b/doc/src/images/windows-listview.png
diff --git a/doc/src/images/windows-progressbar.png b/doc/src/images/windows-progressbar.png
new file mode 100644
index 0000000000..361799a70e
--- /dev/null
+++ b/doc/src/images/windows-progressbar.png
diff --git a/doc/src/images/windows-pushbutton.png b/doc/src/images/windows-pushbutton.png
new file mode 100644
index 0000000000..14528d6808
--- /dev/null
+++ b/doc/src/images/windows-pushbutton.png
diff --git a/doc/src/images/windows-radiobutton.png b/doc/src/images/windows-radiobutton.png
new file mode 100644
index 0000000000..db328cb563
--- /dev/null
+++ b/doc/src/images/windows-radiobutton.png
diff --git a/doc/src/images/windows-slider.png b/doc/src/images/windows-slider.png
new file mode 100644
index 0000000000..fde85024b6
--- /dev/null
+++ b/doc/src/images/windows-slider.png
diff --git a/doc/src/images/windows-spinbox.png b/doc/src/images/windows-spinbox.png
new file mode 100644
index 0000000000..d4e93c584a
--- /dev/null
+++ b/doc/src/images/windows-spinbox.png
diff --git a/doc/src/images/windows-tableview.png b/doc/src/images/windows-tableview.png
new file mode 100644
index 0000000000..89da89fb5f
--- /dev/null
+++ b/doc/src/images/windows-tableview.png
diff --git a/doc/src/images/windows-tabwidget.png b/doc/src/images/windows-tabwidget.png
new file mode 100644
index 0000000000..8622f7ec6a
--- /dev/null
+++ b/doc/src/images/windows-tabwidget.png
diff --git a/doc/src/images/windows-textedit.png b/doc/src/images/windows-textedit.png
new file mode 100644
index 0000000000..fd21ade02f
--- /dev/null
+++ b/doc/src/images/windows-textedit.png
diff --git a/doc/src/images/windows-timeedit.png b/doc/src/images/windows-timeedit.png
new file mode 100644
index 0000000000..6ae0e406bc
--- /dev/null
+++ b/doc/src/images/windows-timeedit.png
diff --git a/doc/src/images/windows-toolbox.png b/doc/src/images/windows-toolbox.png
new file mode 100644
index 0000000000..99b471e6df
--- /dev/null
+++ b/doc/src/images/windows-toolbox.png
diff --git a/doc/src/images/windows-toolbutton.png b/doc/src/images/windows-toolbutton.png
new file mode 100644
index 0000000000..9ceb846ed4
--- /dev/null
+++ b/doc/src/images/windows-toolbutton.png
diff --git a/doc/src/images/windows-treeview.png b/doc/src/images/windows-treeview.png
new file mode 100644
index 0000000000..f55cd69c79
--- /dev/null
+++ b/doc/src/images/windows-treeview.png
diff --git a/doc/src/images/windowsvista-calendarwidget.png b/doc/src/images/windowsvista-calendarwidget.png
new file mode 100644
index 0000000000..3cb1ab78dc
--- /dev/null
+++ b/doc/src/images/windowsvista-calendarwidget.png
diff --git a/doc/src/images/windowsvista-checkbox.png b/doc/src/images/windowsvista-checkbox.png
new file mode 100644
index 0000000000..b9bc909988
--- /dev/null
+++ b/doc/src/images/windowsvista-checkbox.png
diff --git a/doc/src/images/windowsvista-combobox.png b/doc/src/images/windowsvista-combobox.png
new file mode 100644
index 0000000000..f53192f45a
--- /dev/null
+++ b/doc/src/images/windowsvista-combobox.png
diff --git a/doc/src/images/windowsvista-dateedit.png b/doc/src/images/windowsvista-dateedit.png
new file mode 100644
index 0000000000..bb79482849
--- /dev/null
+++ b/doc/src/images/windowsvista-dateedit.png
diff --git a/doc/src/images/windowsvista-datetimeedit.png b/doc/src/images/windowsvista-datetimeedit.png
new file mode 100644
index 0000000000..0a104de084
--- /dev/null
+++ b/doc/src/images/windowsvista-datetimeedit.png
diff --git a/doc/src/images/windowsvista-dial.png b/doc/src/images/windowsvista-dial.png
new file mode 100644
index 0000000000..7081269c31
--- /dev/null
+++ b/doc/src/images/windowsvista-dial.png
diff --git a/doc/src/images/windowsvista-doublespinbox.png b/doc/src/images/windowsvista-doublespinbox.png
new file mode 100644
index 0000000000..6efa9379fd
--- /dev/null
+++ b/doc/src/images/windowsvista-doublespinbox.png
diff --git a/doc/src/images/windowsvista-fontcombobox.png b/doc/src/images/windowsvista-fontcombobox.png
new file mode 100644
index 0000000000..3771e84bd4
--- /dev/null
+++ b/doc/src/images/windowsvista-fontcombobox.png
diff --git a/doc/src/images/windowsvista-frame.png b/doc/src/images/windowsvista-frame.png
new file mode 100644
index 0000000000..63b8422d2b
--- /dev/null
+++ b/doc/src/images/windowsvista-frame.png
diff --git a/doc/src/images/windowsvista-groupbox.png b/doc/src/images/windowsvista-groupbox.png
new file mode 100644
index 0000000000..967d8878a7
--- /dev/null
+++ b/doc/src/images/windowsvista-groupbox.png
diff --git a/doc/src/images/windowsvista-horizontalscrollbar.png b/doc/src/images/windowsvista-horizontalscrollbar.png
new file mode 100644
index 0000000000..996865d66c
--- /dev/null
+++ b/doc/src/images/windowsvista-horizontalscrollbar.png
diff --git a/doc/src/images/windowsvista-label.png b/doc/src/images/windowsvista-label.png
new file mode 100644
index 0000000000..caef8d8361
--- /dev/null
+++ b/doc/src/images/windowsvista-label.png
diff --git a/doc/src/images/windowsvista-lcdnumber.png b/doc/src/images/windowsvista-lcdnumber.png
new file mode 100644
index 0000000000..911438e2b1
--- /dev/null
+++ b/doc/src/images/windowsvista-lcdnumber.png
diff --git a/doc/src/images/windowsvista-lineedit.png b/doc/src/images/windowsvista-lineedit.png
new file mode 100644
index 0000000000..9fcde3a851
--- /dev/null
+++ b/doc/src/images/windowsvista-lineedit.png
diff --git a/doc/src/images/windowsvista-listview.png b/doc/src/images/windowsvista-listview.png
new file mode 100644
index 0000000000..36a03438ab
--- /dev/null
+++ b/doc/src/images/windowsvista-listview.png
diff --git a/doc/src/images/windowsvista-progressbar.png b/doc/src/images/windowsvista-progressbar.png
new file mode 100644
index 0000000000..0bda010811
--- /dev/null
+++ b/doc/src/images/windowsvista-progressbar.png
diff --git a/doc/src/images/windowsvista-pushbutton.png b/doc/src/images/windowsvista-pushbutton.png
new file mode 100644
index 0000000000..3bc438dc10
--- /dev/null
+++ b/doc/src/images/windowsvista-pushbutton.png
diff --git a/doc/src/images/windowsvista-radiobutton.png b/doc/src/images/windowsvista-radiobutton.png
new file mode 100644
index 0000000000..fdfd2d66dd
--- /dev/null
+++ b/doc/src/images/windowsvista-radiobutton.png
diff --git a/doc/src/images/windowsvista-slider.png b/doc/src/images/windowsvista-slider.png
new file mode 100644
index 0000000000..be2fffb7b5
--- /dev/null
+++ b/doc/src/images/windowsvista-slider.png
diff --git a/doc/src/images/windowsvista-spinbox.png b/doc/src/images/windowsvista-spinbox.png
new file mode 100644
index 0000000000..4a2293e724
--- /dev/null
+++ b/doc/src/images/windowsvista-spinbox.png
diff --git a/doc/src/images/windowsvista-tableview.png b/doc/src/images/windowsvista-tableview.png
new file mode 100644
index 0000000000..96f4937bc1
--- /dev/null
+++ b/doc/src/images/windowsvista-tableview.png
diff --git a/doc/src/images/windowsvista-tabwidget.png b/doc/src/images/windowsvista-tabwidget.png
new file mode 100644
index 0000000000..259c4f1a89
--- /dev/null
+++ b/doc/src/images/windowsvista-tabwidget.png
diff --git a/doc/src/images/windowsvista-textedit.png b/doc/src/images/windowsvista-textedit.png
new file mode 100644
index 0000000000..5e5696623e
--- /dev/null
+++ b/doc/src/images/windowsvista-textedit.png
diff --git a/doc/src/images/windowsvista-timeedit.png b/doc/src/images/windowsvista-timeedit.png
new file mode 100644
index 0000000000..e24fdd268a
--- /dev/null
+++ b/doc/src/images/windowsvista-timeedit.png
diff --git a/doc/src/images/windowsvista-toolbox.png b/doc/src/images/windowsvista-toolbox.png
new file mode 100644
index 0000000000..8cfe5f9cab
--- /dev/null
+++ b/doc/src/images/windowsvista-toolbox.png
diff --git a/doc/src/images/windowsvista-toolbutton.png b/doc/src/images/windowsvista-toolbutton.png
new file mode 100644
index 0000000000..0baa9809c1
--- /dev/null
+++ b/doc/src/images/windowsvista-toolbutton.png
diff --git a/doc/src/images/windowsvista-treeview.png b/doc/src/images/windowsvista-treeview.png
new file mode 100644
index 0000000000..db211e4b5f
--- /dev/null
+++ b/doc/src/images/windowsvista-treeview.png
diff --git a/doc/src/images/windowsxp-calendarwidget.png b/doc/src/images/windowsxp-calendarwidget.png
new file mode 100644
index 0000000000..9a5fa6ebcd
--- /dev/null
+++ b/doc/src/images/windowsxp-calendarwidget.png
diff --git a/doc/src/images/windowsxp-checkbox.png b/doc/src/images/windowsxp-checkbox.png
new file mode 100644
index 0000000000..505d3a3641
--- /dev/null
+++ b/doc/src/images/windowsxp-checkbox.png
diff --git a/doc/src/images/windowsxp-combobox.png b/doc/src/images/windowsxp-combobox.png
new file mode 100644
index 0000000000..2363c8401c
--- /dev/null
+++ b/doc/src/images/windowsxp-combobox.png
diff --git a/doc/src/images/windowsxp-dateedit.png b/doc/src/images/windowsxp-dateedit.png
new file mode 100644
index 0000000000..060ba07b2c
--- /dev/null
+++ b/doc/src/images/windowsxp-dateedit.png
diff --git a/doc/src/images/windowsxp-datetimeedit.png b/doc/src/images/windowsxp-datetimeedit.png
new file mode 100644
index 0000000000..4e41f0fc14
--- /dev/null
+++ b/doc/src/images/windowsxp-datetimeedit.png
diff --git a/doc/src/images/windowsxp-dial.png b/doc/src/images/windowsxp-dial.png
new file mode 100644
index 0000000000..0aa3a26159
--- /dev/null
+++ b/doc/src/images/windowsxp-dial.png
diff --git a/doc/src/images/windowsxp-doublespinbox.png b/doc/src/images/windowsxp-doublespinbox.png
new file mode 100644
index 0000000000..3165a61b93
--- /dev/null
+++ b/doc/src/images/windowsxp-doublespinbox.png
diff --git a/doc/src/images/windowsxp-fontcombobox.png b/doc/src/images/windowsxp-fontcombobox.png
new file mode 100644
index 0000000000..96292b84ef
--- /dev/null
+++ b/doc/src/images/windowsxp-fontcombobox.png
diff --git a/doc/src/images/windowsxp-frame.png b/doc/src/images/windowsxp-frame.png
new file mode 100644
index 0000000000..5979b31b25
--- /dev/null
+++ b/doc/src/images/windowsxp-frame.png
diff --git a/doc/src/images/windowsxp-groupbox.png b/doc/src/images/windowsxp-groupbox.png
new file mode 100644
index 0000000000..0b6f7e21ad
--- /dev/null
+++ b/doc/src/images/windowsxp-groupbox.png
diff --git a/doc/src/images/windowsxp-horizontalscrollbar.png b/doc/src/images/windowsxp-horizontalscrollbar.png
new file mode 100644
index 0000000000..38812ec107
--- /dev/null
+++ b/doc/src/images/windowsxp-horizontalscrollbar.png
diff --git a/doc/src/images/windowsxp-label.png b/doc/src/images/windowsxp-label.png
new file mode 100644
index 0000000000..a1c3a396a9
--- /dev/null
+++ b/doc/src/images/windowsxp-label.png
diff --git a/doc/src/images/windowsxp-lcdnumber.png b/doc/src/images/windowsxp-lcdnumber.png
new file mode 100644
index 0000000000..102023c8ed
--- /dev/null
+++ b/doc/src/images/windowsxp-lcdnumber.png
diff --git a/doc/src/images/windowsxp-lineedit.png b/doc/src/images/windowsxp-lineedit.png
new file mode 100644
index 0000000000..9102b53ca4
--- /dev/null
+++ b/doc/src/images/windowsxp-lineedit.png
diff --git a/doc/src/images/windowsxp-listview.png b/doc/src/images/windowsxp-listview.png
new file mode 100644
index 0000000000..b0fc9bd3a7
--- /dev/null
+++ b/doc/src/images/windowsxp-listview.png
diff --git a/doc/src/images/windowsxp-menu.png b/doc/src/images/windowsxp-menu.png
new file mode 100644
index 0000000000..b8ca947e73
--- /dev/null
+++ b/doc/src/images/windowsxp-menu.png
diff --git a/doc/src/images/windowsxp-progressbar.png b/doc/src/images/windowsxp-progressbar.png
new file mode 100644
index 0000000000..c8a73d6754
--- /dev/null
+++ b/doc/src/images/windowsxp-progressbar.png
diff --git a/doc/src/images/windowsxp-pushbutton.png b/doc/src/images/windowsxp-pushbutton.png
new file mode 100644
index 0000000000..bf6b7bf15d
--- /dev/null
+++ b/doc/src/images/windowsxp-pushbutton.png
diff --git a/doc/src/images/windowsxp-radiobutton.png b/doc/src/images/windowsxp-radiobutton.png
new file mode 100644
index 0000000000..ad8a908fb2
--- /dev/null
+++ b/doc/src/images/windowsxp-radiobutton.png
diff --git a/doc/src/images/windowsxp-slider.png b/doc/src/images/windowsxp-slider.png
new file mode 100644
index 0000000000..9e2fca7c40
--- /dev/null
+++ b/doc/src/images/windowsxp-slider.png
diff --git a/doc/src/images/windowsxp-spinbox.png b/doc/src/images/windowsxp-spinbox.png
new file mode 100644
index 0000000000..e42073cd6b
--- /dev/null
+++ b/doc/src/images/windowsxp-spinbox.png
diff --git a/doc/src/images/windowsxp-tableview.png b/doc/src/images/windowsxp-tableview.png
new file mode 100644
index 0000000000..5d12137ad5
--- /dev/null
+++ b/doc/src/images/windowsxp-tableview.png
diff --git a/doc/src/images/windowsxp-tabwidget.png b/doc/src/images/windowsxp-tabwidget.png
new file mode 100644
index 0000000000..3c8e777a0b
--- /dev/null
+++ b/doc/src/images/windowsxp-tabwidget.png
diff --git a/doc/src/images/windowsxp-textedit.png b/doc/src/images/windowsxp-textedit.png
new file mode 100644
index 0000000000..d89c75c71b
--- /dev/null
+++ b/doc/src/images/windowsxp-textedit.png
diff --git a/doc/src/images/windowsxp-timeedit.png b/doc/src/images/windowsxp-timeedit.png
new file mode 100644
index 0000000000..751cca9e6a
--- /dev/null
+++ b/doc/src/images/windowsxp-timeedit.png
diff --git a/doc/src/images/windowsxp-toolbox.png b/doc/src/images/windowsxp-toolbox.png
new file mode 100644
index 0000000000..99b471e6df
--- /dev/null
+++ b/doc/src/images/windowsxp-toolbox.png
diff --git a/doc/src/images/windowsxp-toolbutton.png b/doc/src/images/windowsxp-toolbutton.png
new file mode 100644
index 0000000000..ea63e16aae
--- /dev/null
+++ b/doc/src/images/windowsxp-toolbutton.png
diff --git a/doc/src/images/windowsxp-treeview.png b/doc/src/images/windowsxp-treeview.png
new file mode 100644
index 0000000000..050cc2f4d6
--- /dev/null
+++ b/doc/src/images/windowsxp-treeview.png
diff --git a/doc/src/images/worldtimeclock-connection.png b/doc/src/images/worldtimeclock-connection.png
new file mode 100644
index 0000000000..42c2560030
--- /dev/null
+++ b/doc/src/images/worldtimeclock-connection.png
diff --git a/doc/src/images/worldtimeclock-signalandslot.png b/doc/src/images/worldtimeclock-signalandslot.png
new file mode 100644
index 0000000000..d9d3271f45
--- /dev/null
+++ b/doc/src/images/worldtimeclock-signalandslot.png
diff --git a/doc/src/images/worldtimeclockbuilder-example.png b/doc/src/images/worldtimeclockbuilder-example.png
new file mode 100644
index 0000000000..4b91af3ffc
--- /dev/null
+++ b/doc/src/images/worldtimeclockbuilder-example.png
diff --git a/doc/src/images/worldtimeclockplugin-example.png b/doc/src/images/worldtimeclockplugin-example.png
new file mode 100644
index 0000000000..89481ade8e
--- /dev/null
+++ b/doc/src/images/worldtimeclockplugin-example.png
diff --git a/doc/src/images/x11_dependencies.png b/doc/src/images/x11_dependencies.png
new file mode 100644
index 0000000000..02bce1a153
--- /dev/null
+++ b/doc/src/images/x11_dependencies.png
diff --git a/doc/src/images/xform.png b/doc/src/images/xform.png
new file mode 100644
index 0000000000..8221a00b4d
--- /dev/null
+++ b/doc/src/images/xform.png
diff --git a/doc/src/images/xml-examples.png b/doc/src/images/xml-examples.png
new file mode 100644
index 0000000000..617ffef1df
--- /dev/null
+++ b/doc/src/images/xml-examples.png
diff --git a/doc/src/images/xmlstreamexample-filemenu.png b/doc/src/images/xmlstreamexample-filemenu.png
new file mode 100644
index 0000000000..e074fb7c41
--- /dev/null
+++ b/doc/src/images/xmlstreamexample-filemenu.png
diff --git a/doc/src/images/xmlstreamexample-helpmenu.png b/doc/src/images/xmlstreamexample-helpmenu.png
new file mode 100644
index 0000000000..0dc4392b94
--- /dev/null
+++ b/doc/src/images/xmlstreamexample-helpmenu.png
diff --git a/doc/src/images/xmlstreamexample-screenshot.png b/doc/src/images/xmlstreamexample-screenshot.png
new file mode 100644
index 0000000000..bbaa423061
--- /dev/null
+++ b/doc/src/images/xmlstreamexample-screenshot.png
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
new file mode 100644
index 0000000000..49dfafd0a0
--- /dev/null
+++ b/doc/src/index.qdoc
@@ -0,0 +1,244 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page index.html
+
+    \keyword Qt Reference Documentation
+
+    \if defined(qtopiacore)
+        \if defined(opensourceedition)
+        \title Qt for Embedded Linux Reference Documentation (Open Source Edition)
+        \endif
+
+        \if defined(desktoplightedition)
+        \title Qt for Embedded Linux Reference Documentation (GUI Framework Edition)
+        \endif
+
+        \if defined(desktopedition)
+        \title Qt for Embedded Linux Reference Documentation (Full Framework Edition)
+        \endif
+
+        \if !defined(opensourceedition) \
+            && !defined(desktoplightedition) \
+            && !defined(desktopedition)
+        \title Qt for Embedded Linux Reference Documentation
+        \endif
+
+        \subtitle Qt for Embedded Linux
+    \endif
+    \if !defined(qtopiacore)
+        \if defined(opensourceedition)
+        \title Qt Reference Documentation (Open Source Edition)
+        \endif
+
+        \if defined(desktoplightedition)
+        \title Qt Reference Documentation (GUI Framework Edition)
+        \endif
+
+        \if defined(desktopedition)
+        \title Qt Reference Documentation (Full Framework Edition)
+        \endif
+
+        \if !defined(opensourceedition) \
+            && !defined(desktoplightedition) \
+            && !defined(desktopedition)
+        \title Qt Reference Documentation
+        \endif
+    \endif
+
+    \if defined(opensourceedition)
+    \bold{Note:} This edition is for the development of \l{Qt
+    Open Source Edition}{Free and Open Source} software only; see
+    \l{Qt Commercial Editions}.
+    \endif
+
+    \raw HTML
+        <table cellpadding="2" cellspacing="1" border="0" width="100%" bgcolor="#e5e5e5">
+        <tr>
+        <th bgcolor="#66b036" width="33%">
+        Getting Started
+        </th>
+        <th bgcolor="#66b036" width="33%">
+        General
+        </th>
+        <th bgcolor="#66b036" width="33%">
+        Developer Resources
+        </th>
+        </tr>
+        <tr>
+        <td valign="top">
+        <ul>
+        <li><strong><a href="qt4-5-intro.html">What's New in Qt 4.5</a></strong></li>
+        <li><a href="how-to-learn-qt.html">How to Learn Qt</a></li>
+        <li><a href="installation.html">Installation</a></li>
+        <li><a href="tutorials.html">Tutorials</a>, <a href="examples.html">Examples</a> and <a href="demos.html">Demonstrations</a></li>
+        <li><a href="porting4.html">Porting from Qt 3 to Qt 4</a></li>
+        </ul>
+        </td>
+        <td valign="top">
+        <ul>
+        <li><a href="http://www.qtsoftware.com/products">About Qt</a></li>
+        <li><a href="http://www.qtsoftware.com/about">About Us</a></li>
+        <li><a href="commercialeditions.html">Commercial Edition</a></li>
+        <li><a href="opensourceedition.html">Open Source Edition</a></li>
+        <li><a href="supported-platforms.html">Supported Platforms</a></li>
+        </ul>
+        </td>
+        <td valign="top">
+        <ul>
+        <li><a href="http://www.qtsoftware.com/developer/faqs/">Frequently Asked Questions</a></li>
+        <li><a href="http://www.qtsoftware.com/developer/community/">Qt Community Web Sites</a></li>
+        <li><a href="http://doc.trolltech.com/qq/">Qt Quarterly</a></li>
+        <li><a href="bughowto.html">How to Report a Bug</a></li>
+        <li><a href="http://www.qtsoftware.com/developer/">Other Online Resources</a></li>
+        </ul>
+        </td>
+        </tr>
+        <tr>
+        <th bgcolor="#66b036">
+        API Reference
+        </th>
+        <th bgcolor="#66b036">
+        Core Features
+        </th>
+        <th bgcolor="#66b036">
+        Key Technologies
+        </th>
+        </tr>
+        <tr>
+        <td valign="top">
+        <ul>
+        <li><a href="classes.html">All Classes</a></li>
+        <li><a href="mainclasses.html">Main Classes</a></li>
+        <li><a href="groups.html">Grouped Classes</a></li>
+        <li><a href="annotated.html">Annotated Classes</a></li>
+        <li><a href="modules.html">Qt Classes by Module</a></li>
+        <li><a href="namespaces.html">All Namespaces</a></li>
+        <li><a href="hierarchy.html">Inheritance Hierarchy</a></li>
+        <li><a href="functions.html">All Functions</a></li>
+        <li><a href="qt-embedded.html">Qt for Embedded Platforms</a></li>
+        <li><a href="overviews.html">All Overviews and HOWTOs</a></li>
+        <li><a href="gallery.html">Qt Widget Gallery</a></li>
+        <li><a href="http://doc.trolltech.com/extras/qt43-class-chart.pdf">Class Chart</a></li>
+        </ul>
+        </td>
+        <td valign="top">
+        <ul>
+        <li><a href="signalsandslots.html">Signals and Slots</a></li>
+        <li><a href="object.html">Object Model</a></li>
+        <li><a href="layout.html">Layout Management</a></li>
+        <li><a href="qt4-mainwindow.html">Main Window Architecture</a></li>
+        <li><a href="paintsystem.html">Paint System</a></li>
+        <li><a href="graphicsview.html">Graphics View</a></li>
+        <li><a href="accessible.html">Accessibility</a></li>
+        <li><a href="containers.html">Tool and Container Classes</a></li>
+        <li><a href="richtext.html">Rich Text Processing</a></li>
+        <li><a href="i18n.html">Internationalization</a></li>
+        <li><a href="plugins-howto.html">Plugin System</a></li>
+        <li><a href="threads.html">Multithreaded Programming</a></li>
+        <li><a href="ipc.html">Inter-Process Communication (IPC)</a></li>
+        <li><a href="qtestlib-manual.html">Unit Testing Framework</a></li>
+        </ul>
+        </td>
+        <td valign="top">
+        <ul>
+        <li><a href="model-view-programming.html">Model/View Programming</a></li>
+        <li><a href="stylesheet.html">Style Sheets</a></li>
+        <li><a href="qthelp.html">Help Module</a></li>
+        <li><a href="qtnetwork.html">Network Module</a></li>
+        <li><a href="qtopengl.html">OpenGL Module</a></li>
+        <li><a href="qtscript.html">Script Module</a></li>
+        <li><a href="qtsql.html">SQL Module</a></li>
+        <li><a href="qtsvg.html">SVG Module</a></li>
+        <li><a href="qtwebkit.html">WebKit Integration</a></li>
+        <li><a href="qtxml.html">XML Module</a></li>
+        <li><a href="qtxmlpatterns.html">XML Patterns: XQuery &amp; XPath</a></li>
+        <li><a href="phonon-module.html">Phonon Multimedia Framework</a></li>
+        <li><a href="qtscripttools.html">Script Tools Module</a></li>
+        <li><a href="activeqt.html">ActiveQt Framework</a></li>
+        </ul>
+        </td>
+        </tr>
+        <tr>
+        <th bgcolor="#66b036">
+        Add-ons &amp; Services
+        </th>
+        <th bgcolor="#66b036">
+        Tools
+        </th>
+        <th bgcolor="#66b036">
+        Licenses &amp; Credits
+        </th>
+        </tr>
+        <tr>
+        <td valign="top">
+        <ul>
+        <li><a href="http://www.qtsoftware.com/products/add-on-products">Qt Solutions</a></li>
+        <li><a href="http://www.qtsoftware.com/products/qt/3rdparty/">Partner Add-ons</a></li>
+        <li><a href="http://qt-apps.org">Third-Party Qt Components (qt-apps.org)</a></li>
+        <li><a href="http://www.qtsoftware.com/support/">Support</a></li>
+        <li><a href="http://www.qtsoftware.com/support/training/">Training</a></li>
+        </ul>
+        </td>
+        <td valign="top">
+        <ul>
+        <li><a href="designer-manual.html">Qt Designer</a></li>
+        <li><a href="assistant-manual.html">Qt Assistant</a></li>
+        <li><a href="linguist-manual.html">Qt Linguist</a></li>
+        <li><a href="qmake-manual.html">qmake</a></li>
+        <li><a href="qttools.html">All Tools</a></li>
+        </ul>
+        </td>
+        <td valign="top">
+        <ul>
+        <li><a href="gpl.html">GNU GPL</a>, <a href="lgpl.html">GNU LGPL</a></li>
+        <li><a href="3rdparty.html">Third-Party Licenses Used in Qt</a></li>
+        <li><a href="licenses.html">Other Licenses Used in Qt</a></li>
+        <li><a href="trademarks.html">Trademark Information</a></li>
+        <li><a href="credits.html">Credits</a></li>
+        </ul>
+        </td>
+        </tr>
+        </table>
+    \endraw
+
+*/
diff --git a/doc/src/installation.qdoc b/doc/src/installation.qdoc
new file mode 100644
index 0000000000..6d02801e11
--- /dev/null
+++ b/doc/src/installation.qdoc
@@ -0,0 +1,759 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+** Please remember to update the corresponding INSTALL files.
+****************************************************************************/
+
+/*!
+\group installation
+\title Installation
+\ingroup buildsystem
+\ingroup topics
+\brief Installing Qt on supported platforms.
+
+The installation procedure is different on each Qt platform.
+Please follow the instructions for your platform from the following list.
+
+\generatelist{related}
+*/
+
+/*! \page install-x11.html
+\title Installing Qt on X11 Platforms
+\ingroup installation
+\brief How to install Qt on platforms with X11.
+\previouspage Installation
+
+\note Qt for X11 has some requirements that are given in more detail
+in the \l{Qt for X11 Requirements} document.
+
+\list 1
+\o  If you have the commercial edition of Qt, install your license
+    file as \c{$HOME/.qt-license}.
+
+    For the open source version you do not need a license file.
+
+\o  Unpack the archive if you have not done so already. For example,
+    if you have the \c{qt-x11-opensource-desktop-%VERSION%.tar.gz}
+    package, type the following commands at a command line prompt:
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 0
+
+    This creates the directory \c{/tmp/qt-x11-opensource-desktop-%VERSION%}
+    containing the files from the archive. We only support the GNU version of
+    the tar archiving utility. Note that on some systems it is called gtar.
+
+\o  Building
+
+    To configure the Qt library for your machine type, run the
+    \c{./configure} script in the package directory.
+
+    By default, Qt is configured for installation in the
+    \c{/usr/local/Trolltech/Qt-%VERSION%} directory, but this can be
+    changed by using the \c{-prefix} option.
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 1
+
+    Type \c{./configure -help} to get a list of all available options.
+
+    To create the library and compile all the demos, examples, tools,
+    and tutorials, type:
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 2
+
+    If \c{-prefix} is outside the build directory, you need to install
+    the library, demos, examples, tools, and tutorials in the appropriate
+    place. To do this, type:
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 3
+
+    , as root if necessary.
+
+    Note that on some systems the make utility is named differently,
+    e.g. gmake. The configure script tells you which make utility to
+    use.
+
+    \bold{Note:} If you later need to reconfigure and rebuild Qt from the
+    same location, ensure that all traces of the previous configuration are
+    removed by entering the build directory and typing \c{make confclean}
+    before running \c configure again.
+
+\o  Environment variables
+
+    In order to use Qt, some environment variables needs to be
+    extended.
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 4
+
+    This is done like this:
+
+    In \c{.profile} (if your shell is bash, ksh, zsh or sh), add the
+    following lines:
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 5
+
+    In \c{.login} (in case your shell is csh or tcsh), add the following line:
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 6
+
+    If you use a different shell, please modify your environment
+    variables accordingly.
+
+    For compilers that do not support rpath you must also extended the
+    \c LD_LIBRARY_PATH environment variable to include
+    \c{/usr/local/Trolltech/Qt-%VERSION%/lib}. On Linux with GCC this step
+    is not needed.
+
+\o  That's all. Qt is now installed.
+
+    If you are new to Qt, we suggest that you take a look at the demos
+    and examples to see Qt in action. Run the Qt Examples and Demos
+    either by typing \c qtdemo on the command line or through the
+    desktop's Main menu.
+
+    You might also want to try the following links:
+
+    \list
+    \o \l{Configuring Qt}
+    \o \l{How to Learn Qt}
+    \o \l{Tutorials}
+    \o \l{Developer Zone}
+    \o \l{Deploying Qt Applications}
+    \endlist
+\endlist
+
+    We hope you will enjoy using Qt. Good luck!
+
+*/
+
+/*!
+\page install-win.html
+\title Installing Qt on Windows
+\ingroup installation
+\brief How to install Qt on Windows.
+\previouspage Installation
+
+\note Qt for Windows has some requirements that are given in more detail
+in the \l{Qt for Windows Requirements} document.
+
+\table
+\row \o \bold{Notes:}
+\list
+\o If you have obtained a binary package for this platform,
+consult the installation instructions provided instead of the ones in
+this document.
+\o \l{Open Source Versions of Qt} is not officially supported for use with
+any version of Visual Studio. Integration with Visual Studio is available
+as part of the \l{Qt Commercial Editions}.
+
+\endlist
+\endtable
+
+\list 1
+\o  If you have the commercial edition of Qt, copy the license file
+    from your account on dist.trolltech.com into your home directory
+    (this may be known as the \c userprofile environment variable) and
+    rename it to \c{.qt-license}. This renaming process must be done
+    using a \e{command prompt} on Windows, \bold{not} with Windows Explorer.
+    For example on Windows 2000, \c{%USERPROFILE%} should be something
+    like \c{C:\Documents and Settings\username}
+
+    For the open source version you do not need a license file.
+
+\o  Uncompress the files into the directory you want Qt installed;
+    e.g. \c{C:\Qt\%VERSION%}.
+
+    \note The install path must not contain any spaces or Windows specific
+    file system characters.
+
+\o Environment variables
+
+    In order to build and use Qt, the \c PATH environment variable needs to be
+    extended:
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 7
+
+    This is done by adding \c{c:\Qt\%VERSION%\bin} to the \c PATH variable.
+
+    For newer versions of Windows, \c PATH can be extended through
+    the \menu{Control Panel|System|Advanced|Environment variables} menu.
+
+    You may also need to ensure that the locations of your compiler and
+    other build tools are listed in the \c PATH variable. This will depend
+    on your choice of software development environment.
+
+    \bold{Note}: If you don't use the configured shells, which is
+    available in the application menu, in the \l{Open Source Versions of Qt},
+    \c configure requires that \c sh.exe is not in the path
+    or that it is run from \c msys. This also goes for mingw32-make.
+
+\o Building
+
+    To configure the Qt library for your machine, type the following command
+    in a \bold{Visual Studio} command prompt:
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 8
+
+    Type \c{configure -help} to get a list of all available options.
+
+    If you have multiple compilers installed, and want to build the Qt library
+    using a specific compiler, you must specify a \c qmake specification.
+    This is done by pasing \c{-platform <spec>} to configure; for example:
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 9
+
+    In some cases you need to set up the compilation environment before running
+    configure in order to use the right compiler. For instance, you need to do this
+    if you have Visual Studio 2005 installed and want to compile Qt using the x64
+    compiler because the 32-bit and 64-bit compiler both use the same
+    \c qmake specification file.
+    This is usually done by selecting
+    \menu{Microsoft Visual Studio 2005|Visual Studio Tools|<Command Prompt>}
+    from the \gui Start menu.
+
+    The actual commands needed to build Qt depends on your development
+    system. For Microsoft Visual Studio to create the library and
+    compile all the demos, examples, tools and tutorials type:
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 10
+
+    \note If you later need to reconfigure and rebuild Qt from the
+    same location, ensure that all traces of the previous configuration are
+    removed by entering the build directory and typing \c{nmake distclean}
+    before running \c configure again.
+
+\o  That's all. Qt is now installed.
+
+    If you are new to Qt, we suggest that you take a look at the demos
+    and examples to see Qt in action. Run the Qt Examples and Demos
+    either by typing \c qtdemo on the command line or through the
+    desktop's Start menu.
+
+    You might also want to try the following links:
+
+    \list
+    \o \l{How to Learn Qt}
+    \o \l{Tutorials}
+    \o \l{Developer Zone}
+    \o \l{Deploying Qt Applications}
+    \endlist
+
+\endlist
+
+    We hope you will enjoy using Qt. Good luck!
+
+*/
+
+/*! \page install-mac.html
+\title Installing Qt on Mac OS X
+\ingroup installation
+\brief How to install Qt on Mac OS X.
+\previouspage Installation
+
+\note Qt for Mac OS X has some requirements that are given in more detail
+in the \l{Qt for Mac OS X Requirements} document.
+
+\bold{Note for the binary package}: If you have the binary package, simply double-click on the Qt.mpkg
+and follow the instructions to install Qt. You can later run the \c{uninstall-qt.py}
+script to uninstall the binary package. The script is located in /Developer/Tools and
+must be run as root.
+
+The following instructions describe how to install Qt from the source package.
+
+\list 1
+\o  If you have the commercial edition of Qt, install your license
+    file as \c{$HOME/.qt-license}.
+
+    For the open source version you do not need a license file.
+
+\o  Unpack the archive if you have not done so already. For example,
+    if you have the \c{qt-mac-opensource-desktop-%VERSION%.tar.gz}
+    package, type the following commands at a command line prompt:
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 11
+
+    This creates the directory \c{/tmp/qt-mac-opensource-desktop-%VERSION%}
+    containing the files from the archive.
+
+\o  Building
+
+    To configure the Qt library for your machine type, run the
+    \c{./configure} script in the package directory.
+
+    By default, Qt is configured for installation in the
+    \c{/usr/local/Trolltech/Qt-%VERSION%} directory, but this can be
+    changed by using the \c{-prefix} option.
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 12
+
+    Type \c{./configure -help} to get a list of all available options.
+
+    Note that you will need to specify \c{-universal} if you want to
+    build universal binaries, and also supply a path to the \c{-sdk}
+    option if your development machine has a PowerPC CPU. By default,
+    Qt is built as a framework, but you can built it as a set of
+    dynamic libraries (dylibs) by specifying the \c{-no-framework}
+    option.
+
+    Qt can also be configured to be built with debugging symbols. This
+    process is described in detail in the \l{Debugging Techniques}
+    document.
+
+    To create the library and compile all the demos, examples, tools,
+    and tutorials, type:
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 13
+
+    If \c{-prefix} is outside the build directory, you need to install
+    the library, demos, examples, tools, and tutorials in the appropriate
+    place. To do this, type:
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 14
+
+    as root, if neccessary (note that this requires that you have administrator access
+    to your machine).
+
+    There is a potential race condition when running make install with multiple
+    jobs. It is best to only run one make job (-j1) for the install.
+
+    \bold{Note:} If you later need to reconfigure and rebuild Qt from the
+    same location, ensure that all traces of the previous configuration are
+    removed by entering the build directory and typing \c{make confclean}
+    before running \c configure again.
+
+\o  Environment variables
+
+    In order to use Qt, some environment variables need to be
+    extended.
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 15
+
+    This is done like this:
+
+    In \c{.profile} (if your shell is bash), add the following lines:
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 16
+
+    In \c{.login} (in case your shell is csh or tcsh), add the following line:
+
+\snippet doc/src/snippets/code/doc_src_installation.qdoc 17
+
+    If you use a different shell, please modify your environment
+    variables accordingly.
+
+\o  That's all. Qt is now installed.
+
+    If you are new to Qt, we suggest that you take a look at the demos
+    and examples to see Qt in action. Run the Qt Examples and Demos
+    either by typing \c qtdemo on the command line or through the
+    desktop's Start menu.
+
+    You might also want to try the following links:
+
+    \list
+    \o \l{How to Learn Qt}
+    \o \l{Tutorials}
+    \o \l{Developer Zone}
+    \o \l{Deploying Qt Applications}
+    \endlist
+\endlist
+
+    We hope you will enjoy using Qt. Good luck!
+
+*/
+
+/*! \page install-wince.html
+\title Installing Qt on Windows CE
+\ingroup installation
+\ingroup qtce
+\brief How to install Qt on Windows CE.
+\previouspage Installation
+
+\note Qt for Windows CE has some requirements that are given in more detail
+in the \l{Qt for Windows CE Requirements} document.
+
+\list 1
+    \o  Uncompress the files into the directory you want to install Qt into;
+        e.g., \c{C:\Qt\%VERSION%}.
+
+        \note The install path must not contain any spaces.
+
+    \o  Environment variables
+
+        In order to build and use Qt, the \c PATH environment variable needs
+        to be extended:
+
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 18
+
+        This is done by adding \c{c:\Qt\%VERSION%\bin} to the \c PATH variable.
+
+        For newer versions of Windows, \c PATH can be extended through
+        "Control Panel->System->Advanced->Environment variables" and for
+        older versions by editing \c{c:\autoexec.bat}.
+
+        Make sure the enviroment variables for your compiler are set. 
+        Visual Studio includes \c{vcvars32.bat} for that purpose - or simply
+        use the "Visual Studio Command Prompt" from the Start menu.
+
+    \o  Configuring Qt
+
+        To configure Qt for Windows Mobile 5.0 for Pocket PC, type the
+        following:
+
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 19
+
+        If you want to configure Qt for another platform or with other
+        options, type \c{configure -help} to get a list of all available
+        options. See the \c README file for the list of supported platforms.
+
+
+    \o Building Qt
+
+        Now, to build Qt you first have to update your \c PATH, \c INCLUDE
+        and \c LIB paths to point to the correct resources for your target
+        platforms. For a default installation of the Windows Mobile 5.0
+        Pocket PC SDK, this is done with the following commands:
+
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 20
+
+        We provide a convenience script for this purpose, called \c{setcepaths}.
+        Simply type:
+
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 21
+
+        Then to build Qt type:
+
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 22
+
+        \o  That's all. Qt is now installed.
+
+        To get started with Qt, you can check out the examples found in the
+        \c{examples} directory of your Qt installation. The documentation can
+        be found in \c{doc\html}.
+
+        \bold{Remember:} If you reconfigure Qt for a different platform,
+        make sure you start with a new clean console to get rid of the
+        platform dependent include directories.
+
+        The links below provide further information for using Qt:
+        \list
+        \o \l{How to Learn Qt}
+        \o \l{Tutorials}
+        \o \l{Developer Zone}
+        \o \l{Deploying Qt Applications}
+        \endlist
+
+        You might also want to try the following Windows CE specific links:
+        \list
+        \o \l{Windows CE - Introduction to using Qt}
+        \o \l{Windows CE - Working with Custom SDKs}
+        \o \l{Windows CE - Using shadow builds}
+        \endlist
+
+        Information on feature and performance tuning for embedded builds can
+        be found on the following pages:
+        \list
+        \o \l{Fine-Tuning Features in Qt}
+        \o \l{Qt Performance Tuning}
+        \endlist
+\endlist
+
+    We hope you will enjoy using Qt. Good luck!
+*/
+
+/*!
+    \page requirements.html
+    \title General Qt Requirements
+    \ingroup installation
+    \brief Outlines the general requirements and dependencies needed to install Qt.
+
+    This page describes the specific requirements of libraries and components on which
+    Qt depends. For information about installing Qt, see the \l{Installation} page.
+
+    \section1 OpenSSL (version 0.9.7 or later)
+
+    Support for \l{SSL}{Secure Sockets Layer (SSL)} communication is provided by the
+    \l{OpenSSL Toolkit}, which must be obtained separately.
+
+    \section1 Platform-Specific Requirements
+
+    Each platform has its own specific set of dependencies. Please see the relevant
+    page for more details about the components that are required to build and install
+    Qt on your platform.
+
+    \list
+    \o \l{Qt for Embedded Linux Requirements}
+    \o \l{Qt for Mac OS X Requirements}
+    \o \l{Qt for Windows CE Requirements}
+    \o \l{Qt for Windows Requirements}
+    \o \l{Qt for X11 Requirements}
+    \endlist
+*/
+
+/*!
+    \page requirements-win.html
+    \title Qt for Windows Requirements
+    \ingroup installation
+    \brief Setting up the Windows environment for Qt.
+    \previouspage General Qt Requirements
+
+    If you are using a binary version of Qt with Visual Studio 2005, you must
+    first install the Visual Studio Service Pack 1 available
+    \l{http://www.microsoft.com/downloads/details.aspx?FamilyId=BB4A75AB-E2D4-4C96-B39D-37BAF6B5B1DC&amp;displaylang=en}{here}
+    to avoid runtime conflicts.
+
+    To build Qt with Phonon on Windows, you require:
+
+    \list
+        \o Microsoft's DirectX Software Development Kit which can be
+        downloaded
+        \l{http://msdn2.microsoft.com/en-us/directx/aa937788.aspx}{here}, and
+        \o Microsoft's Windows Server 2003 R2 Platform SDK which is available
+        \l{http://www.microsoft.com/downloads/details.aspx?FamilyID=0baf2b35-c656-4969-ace8-e4c0c0716adb&amp;DisplayLang=en}{here}.
+    \endlist
+
+    \sa {Known Issues in %VERSION%}
+*/
+
+/*!
+    \page requirements-mac.html
+    \title Qt for Mac OS X Requirements
+    \ingroup installation
+    \brief Setting up the Mac OS X environment for Qt.
+    \previouspage General Qt Requirements
+
+    \sa {Known Issues in %VERSION%}
+*/
+
+/*!
+    \page requirements-x11.html
+    \title Qt for X11 Requirements
+    \ingroup installation
+    \brief Setting up the X11 environment for Qt.
+    \previouspage General Qt Requirements
+
+    \tableofcontents
+
+    \section1 QtGui Dependencies
+
+    \image x11_dependencies.png Qt for X11 Dependencies
+
+    \raw HTML
+    <style type="text/css" id="colorstyles">
+     #QtGuiColor { background-color: #98fd00; color: black }
+     #QtCoreColor { background-color: #9c9cff; color: black }
+     #DefaultColor { background-color: #f6f6dc; color: black }
+     #FreetypeColor { background-color: #e6e6fa; color: black }
+     #GLColor { background-color: #ffc0cb; color: black }
+     #PthreadColor { background-color: #bdb76b; color: black }
+     #OptionalColor { background-color: #cae1ff; color: black }
+     #SMColor { background-color: #c2fafa; color: black }
+     #MiscColor { background-color: #f0f9ff; color: black }
+     #GlibColor { background-color: #b3b3b3; color: black }
+    </style>
+    \endraw
+
+    The QtGui module and the QtCore module, which provides the non-GUI features required
+    by QtGui, depend on the libraries described in the following table.
+
+    \table 90%
+    \header \o Name \o Library \o Notes \o Configuration options \o Minimum working version
+    \raw HTML
+    <tr id="OptionalColor">
+    <td> XRender </td><td> libXrender </td><td> X Rendering Extension; used for anti-aliasing</td>
+    <td><tt>-xrender</tt> or auto-detected</td><td>0.9.0</td>
+    </tr><tr id="OptionalColor">
+    <td> Xrandr </td><td> libXrandr </td><td> X Resize and Rotate Extension</td>
+    <td><tt>-xrandr</tt> or auto-detected</td><td>1.0.2</td>
+    </tr><tr id="OptionalColor">
+    <td> Xcursor </td><td> libXcursor </td><td> X Cursor Extension</td>
+    <td><tt>-xcursor</tt> or auto-detected</td><td>1.1.4</td>
+    </tr><tr id="OptionalColor">
+    <td> Xfixes </td><td> libXfixes </td><td> X Fixes Extension</td>
+    <td><tt>-xfixes</tt> or auto-detected</td><td>3.0.0</td>
+    </tr><tr id="OptionalColor">
+    <td> Xinerama </td><td> libXinerama </td><td> Multi-head support</td>
+    <td><tt>-xinerama</tt> or auto-detected</td><td>1.1.0</td>
+    </tr><tr id="DefaultColor">
+    <td> Xi </td><td> libXi </td><td> X11 Input Extensions</td>
+    <td>auto-detected</td><td>1.3.0</td>
+    </tr><tr id="DefaultColor">
+    <td> Xt </td><td> libXt </td><td> Xt Intrinsics</td><td></td><td>0.99</td>
+    </tr><tr id="DefaultColor">
+    <td> Xext </td><td> libXext </td><td> X Extensions</td><td></td><td>6.4.3</td>
+    </tr><tr id="DefaultColor">
+    <td> X11 </td><td> libX11 </td><td> X11 Client-Side Library</td><td></td><td>6.2.1</td>
+    </tr><tr id="SMColor">
+    <td> SM </td><td> libSM </td><td> X Session Management</td>
+    <td><tt>-sm</tt> or auto-detected</td><td>6.0.4</td>
+    </tr><tr id="SMColor">
+    <td> ICE </td><td> libICE </td><td> Inter-Client Exchange</td>
+    <td><tt>-sm</tt> or auto-detected</td><td>6.3.5</td>
+    </tr><tr id="GlibColor">
+    <td> glib </td><td> libglib-2.0 </td><td> Common event loop handling</td>
+    <td><tt>-glib</tt> or auto-detected</td><td>2.8.3</td>
+    </tr><tr id="PthreadColor">
+    <td> pthread </td><td> libpthread </td><td> Multithreading</td>
+    <td></td><td>2.3.5</td>
+    </tr>
+    \endraw
+    \endtable
+
+    \note You must compile with XRender support to get alpha transparency
+    support for pixmaps and images.
+
+    \section1 Phonon Dependencies
+
+    As described in the \l{Phonon Overview}, Phonon uses the GStreamer multimedia
+    framework as the backend for audio and video playback on X11. The minimum required
+    version of GStreamer is 0.10.
+
+    To build Phonon, you need the GStreamer library, base plugins, and development
+    files for your system. The package names for GStreamer vary between Linux
+    distributions; try searching for \c gstreamer or \c libgstreamer in your
+    distribution's package repository to find suitable packages.
+
+    \sa {Known Issues in %VERSION%}
+*/
+
+/*!
+    \page requirements-wince.html
+    \title Qt for Windows CE Requirements
+    \ingroup installation
+    \brief Setting up the Windows CE environment for Qt.
+    \previouspage General Qt Requirements
+
+    Qt is known to work with Visual Studio 2005 and the following SDKs for
+    Windows CE development on Windows XP and Windows Vista:
+
+    \list
+        \o  Windows CE 5.0 Standard SDK for ARM, X86, and MIPS
+        \o  Windows CE 6.0 SDKs for ARM generated using the defaults found in
+            Platform Builder
+        \o  Windows Mobile 5.0 (\e{Pocket PC}, \e{Smartphone} and
+            \e{Pocket PC with Phone} editions)
+        \o  Windows Mobile 6.0 (\e{Standard}, \e{Classic} and
+            \e{Professional} editions)
+    \endlist
+
+    Below is a list of links to download the SDKs:
+
+    \list
+        \o \l{http://www.microsoft.com/downloads/details.aspx?familyid=fa1a3d66-3f61-4ddc-9510-ae450e2318c3&amp;displaylang=en}
+            {Windows CE 5 Standard SDK}
+        \o  \l{http://www.microsoft.com/downloads/details.aspx?familyid=83A52AF2-F524-4EC5-9155-717CBE5D25ED&amp;displaylang=en}
+            {Windows Mobile 5 Pocket PC}
+        \o  \l{http://www.microsoft.com/downloads/details.aspx?familyid=DC6C00CB-738A-4B97-8910-5CD29AB5F8D9&amp;displaylang=en}
+            {Windows Mobile 5 Smartphone}
+        \o  \l{http://www.microsoft.com/downloads/details.aspx?familyid=06111A3A-A651-4745-88EF-3D48091A390B&amp;displaylang=en }
+            {Windows Mobile 6 Professional/Standard}
+    \endlist
+
+    \table
+        \row \bold{Note:}
+            \o
+            \list 1
+                \o Currently, there is only compile support for Windows CE 5.0
+                   Standard SDK for SH-4.
+                \o There is currently no "out of the box" support for the
+                   Windows CE Automotive or Portable Media SDKs from Microsoft.
+            \endlist
+    \endtable
+
+
+    Device manufacturers may prefer to make their own customized version of
+    Windows CE using Platform Builder. In order for Qt for Windows CE to
+    support a custom SDK, a build specification needs to be created. More
+    information on Windows CE Customization can be found
+    \l{Windows CE - Working with Custom SDKs}{here}.
+
+    \sa {Known Issues in %VERSION%}
+*/
+
+/*!
+    \page requirements-embedded-linux.html
+    \title Qt for Embedded Linux Requirements
+    \ingroup installation
+    \brief Setting up the Embedded Linux environment for Qt.
+    \previouspage General Qt Requirements
+
+    \sa {Known Issues in %VERSION%}
+
+    \section1 Building Qt for Embedded Linux with uclibc
+
+    If you intend to include the QtWebKit module in your Qt build then you should
+    use version \bold{uClibc 0.9.29 or greater} as that is the earliest version
+    with sufficient pthread support.
+
+    \section1 Memory Requirements
+
+    The memory and storage requirements for Qt for Embedded Linux depend on a
+    an variety of different factors, including the target architecture and the
+    features enabled in the Qt build.
+
+    The following table shows typical library sizes for the most common Qt
+    libraries on different architectures, built in release mode with different
+    feature profiles.
+
+    \table
+    \header \o{1,2} Architecture \o{1,2} Compiler  \o{2,1} QtCore       \o{2,1} QtGui        \o{2,1} QtNetwork    \o{2,1} QtWebKit
+    \header                                        \o Minimal \o Normal \o Minimal \o Normal \o Minimal \o Normal \o Minimal \o Normal 
+    \row    \o linux-x86-g++ \o GCC 4.2.4          \o 1.7M    \o 2.7M   \o 3.3M    \o 9.9M   \o 653K    \o 1.1M   \o N/A     \o 17M
+    \row    \o linux-arm-g++ \o GCC 4.1.1          \o 1.9M    \o 3.2M   \o 4.1M    \o 11M    \o 507K    \o 1.0M   \o N/A     \o 17M
+    \row    \o linux-arm-g++ (thumb)
+                             \o GCC 4.1.1          \o 1.7M    \o 2.8M   \o 4.0M    \o 9.8M   \o 409K    \o 796K   \o N/A     \o 17M
+    \row    \o linux-mips-g++ (MIPS32)
+                             \o GCC 4.2.4          \o 2.0M    \o 3.2M   \o 4.5M    \o 12M    \o 505K    \o 1003K  \o N/A     \o 21M
+    \endtable
+
+    Library sizes are given in the following units: K = 1024 bytes; M = 1024K.
+    QtWebKit is excluded from the minimal configuration.
+
+    The \l{Fine-Tuning Features in Qt} document covers the process of configuring
+    Qt builds to avoid the inclusion of unnecessary features.
+
+    \section1 Additional X11 Libraries for QVFb
+
+    The Virtual Framebuffer (QVFb) application requires the \c libxtst library
+    in addition to the libraries used to build Qt for X11. This library
+    enables the use of the Record extension to the X protocol to be used in
+    applications.
+*/
diff --git a/doc/src/introtodbus.qdoc b/doc/src/introtodbus.qdoc
new file mode 100644
index 0000000000..71c65d5868
--- /dev/null
+++ b/doc/src/introtodbus.qdoc
@@ -0,0 +1,212 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page intro-to-dbus.html
+    \title Introduction to D-Bus
+
+    \keyword QtDBus
+    \ingroup architecture
+    \brief An introduction to Inter-Process Communication and Remote Procedure Calling with D-Bus.
+
+    \section1 Introduction
+
+    D-Bus is an Inter-Process Communication (IPC) and Remote Procedure
+    Calling (RPC) mechanism originally developed for Linux to replace
+    existing and competing IPC solutions with one unified protocol. It
+    has also been designed to allow communication between system-level
+    processes (such as printer and hardware driver services) and
+    normal user processes.
+
+    It uses a fast, binary message-passing protocol, which is suitable
+    for same-machine communication due to its low latency and low
+    overhead. Its specification is currently defined by the
+    \tt{freedesktop.org} project, and is available to all parties.
+
+    Communication in general happens through a central server
+    application, called the "bus" (hence the name), but direct
+    application-to-application communication is also possible. When
+    communicating on a bus, applications can query which other
+    applications and services are available, as well as activate one
+    on demand.
+
+    \section1 The Buses
+
+    D-Bus buses are used to when many-to-many communication is
+    desired. In order to achieve that, a central server is launched
+    before any applications can connect to the bus: this server is
+    responsible for keeping track of the applications that are
+    connected and for properly routing messages from their source to
+    their destination.
+
+    In addition, D-Bus defines two well-known buses, called the
+    system bus and the session bus. These buses are special in the
+    sense that they have well-defined semantics: some services are
+    defined to be found in one or both of these buses.
+
+    For example, an application wishing to query the list of hardware
+    devices attached to the computer will probably communicate to a
+    service available on the system bus, while the service providing
+    opening of the user's web browser will be probably found on the
+    session bus.
+
+    On the system bus, one can also expect to find restrictions on
+    what services each application is allowed to offer. Therefore, one
+    can be reasonably certain that, if a certain service is present,
+    it is being offered by a trusted application.
+
+    \section1 Concepts
+
+    \section2 Messages
+
+    On the low level, applications communicate over D-Bus by sending
+    messages to one another. Messages are used to relay the remote
+    procedure calls as well as the replies and errors associated
+    with them. When used over a bus, messages have a destination,
+    which means they are routed only to the interested parties,
+    avoiding congestion due to "swarming" or broadcasting.
+
+    A special kind of message called a "signal message"
+    (a concept based on Qt's \l {Signals and Slots} mechanism),
+    however, does not have a pre-defined destination. Since its
+    purpose is to be used in a one-to-many context, signal messages
+    are designed to work over an "opt-in" mechanism.
+
+    The QtDBus module fully encapsulates the low-level concept of
+    messages into a simpler, object-oriented approach familiar to Qt
+    developers. In most cases, the developer need not worry about
+    sending or receiving messages.
+
+    \section2 Service Names
+
+    When communicating over a bus, applications obtain what is
+    called a "service name": it is how that application chooses to be
+    known by other applications on the same bus. The service names
+    are brokered by the D-Bus bus daemon and are used to
+    route messages from one application to another. An analogous
+    concept to service names are IP addresses and hostnames: a
+    computer normally has one IP address and may have one or more
+    hostnames associated with it, according to the services that it
+    provides to the network.
+
+    On the other hand, if a bus is not used, service names are also
+    not used. If we compare this to a computer network again, this
+    would equate to a point-to-point network: since the peer is
+    known, there is no need to use hostnames to find it or its IP
+    address.
+
+    The format of a D-Bus service name is in fact very similar to a
+    host name: it is a dot-separated sequence of letters and
+    digits. The common practice is even to name one's service name
+    according to the domain name of the organization that defined
+    that service.
+
+    For example, the D-Bus service is defined by
+    \tt{freedesktop.org} and can be found on the bus under the
+    service name:
+
+    \snippet doc/src/snippets/code/doc_src_introtodbus.qdoc 0
+
+    \section2 Object Paths
+
+    Like network hosts, applications provide specific services to
+    other applications by exporting objects. Those objects are
+    hierarchically organised, much like the parent-child
+    relationship that classes derived from QObject possess. One
+    difference, however, is that there is the concept of "root
+    object", that all objects have as ultimate parent.
+
+    If we continue our analogy with Web services, object paths
+    equate to the path part of a URL:
+
+    \img qurl-ftppath.png
+
+    Like them, object paths in D-Bus are formed resembling path
+    names on the filesystem: they are slash-separated labels, each
+    consisting of letters, digits and the underscore character
+    ("_"). They must always start with a slash and must not end with
+    one.
+
+    \section2 Interfaces
+
+    Interfaces are similar to C++ abstract classes and Java's
+    \c interface keyword and declare the "contract" that is
+    established between caller and callee. That is, they establish
+    the names of the methods, signals and properties that are
+    available as well as the behavior that is expected from either
+    side when communication is established.
+
+    Qt uses a very similar mechanism in its \l {How to Create Qt
+    Plugins}{Plugin system}: Base classes in C++ are associated
+    with a unique identifier by way of the Q_DECLARE_INTERFACE()
+    macro.
+
+    D-Bus interface names are, in fact, named in a manner similar to
+    what is suggested by the Qt Plugin System: an identifier usually
+    constructed from the domain name of the entity that defined that
+    interface.
+
+    \section2 Cheat Sheet
+
+    To facilitate remembering of the naming formats and their
+    purposes, the following table can be used:
+
+    \table 90%
+    \header \o D-Bus Concept  \o Analogy            \o Name format
+    \row    \o Service name   \o Network hostnames  \o Dot-separated
+                                                       ("looks like a hostname")
+    \row    \o Object path    \o URL path component \o Slash-separated
+                                                       ("looks like a path")
+    \row    \o Interface      \o Plugin identifier  \o Dot-separated
+    \endtable
+
+    \section2 Further Reading
+
+    The following documents contain information about Qt's D-Bus integration
+    features, and provide details about the mechanisms used to send and receive
+    type information over the bus:
+
+    \list
+    \o \l{Using QtDBus Adaptors}
+    \o \l{The QtDBus Type System}
+    \o \l{QtDBus XML compiler (qdbusxml2cpp)}
+    \endlist
+*/
diff --git a/doc/src/ipc.qdoc b/doc/src/ipc.qdoc
new file mode 100644
index 0000000000..97ed22e5f0
--- /dev/null
+++ b/doc/src/ipc.qdoc
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \group ipc
+    \title Inter-Process Communication in Qt
+    \ingroup groups
+    \ingroup architecture
+    \brief Inter-Process communication in Qt applications.
+
+    Qt provides several ways to implement Inter-Process Communication
+    (IPC) in Qt applications.
+
+    \section1 D-Bus
+
+    The \l{QtDBus} module is a Unix-only library
+    you can use to implement IPC using the D-Bus protocol. It extends
+    Qt's \l{signalsandslots.html} {Signals and Slots} mechanism to the
+    IPC level, allowing a signal emitted by one process to be
+    connected to a slot in another process. This \l {Introduction to
+    D-Bus} page has detailed information on how to use the \l{QtDBus}
+    module.
+
+    \section1 TCP/IP
+
+    The cross-platform \l{QtNetwork} module
+    provides classes that make network programming portable and
+    easy. It offers high-level classes (e.g., QHttp, QFtp) that
+    communicate using specific application-level protocols, and
+    lower-level classes (e.g., QTcpSocket, QTcpServer, QSslSocket) for
+    implementing protocols.
+
+    \section1 Shared Memory
+
+    The cross-platform shared memory class, QSharedMemory, provides
+    access to the operating system's shared memory implementation.
+    It allows safe access to shared memory segments by multiple threads
+    and processes. Additionally, QSystemSemaphore can be used to control
+    access to resources shared by the system, as well as to communicate
+    between processes.
+
+    \section1 Qt COmmunications Protocol (QCOP)
+
+    The QCopChannel class implements a protocol for transferring messages
+    between client processes across named channels. QCopChannel is
+    only available in \l{Qt for Embedded Linux}. Like the \l{QtDBus}
+    module, QCOP extends Qt's \l{Signals and Slots} mechanism to the
+    IPC level, allowing a signal emitted by one process to be
+    connected to a slot in another process, but unlike QtDBus, QCOP
+    does not depend on a third party library.
+
+*/
+
diff --git a/doc/src/known-issues.qdoc b/doc/src/known-issues.qdoc
new file mode 100644
index 0000000000..60fd63d0fd
--- /dev/null
+++ b/doc/src/known-issues.qdoc
@@ -0,0 +1,151 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page known-issues.html
+    \title Known Issues in %VERSION%
+    \ingroup platform-notes
+    \brief A summary of known issues in Qt %VERSION% at the time of release.
+
+    An up-to-date list of known issues with Qt %VERSION% can be found via the
+    \l{Task Tracker} on the Qt website which provides additional information
+    about known issues and tasks related to Qt.
+
+    \section1 General Issues
+
+    When running Qt applications on Windows or with \c{-graphicssystem raster},
+    any process that triggers a QWidget::update() from within a destructor
+    might result in a crash.
+
+
+    \section1 Issues with Third Party Software
+
+    \section2 Intel Compiler Support
+
+    Although it is possible to build applications against Qt 4.5.0 using Intel
+    CC 10, these applications will crash when run. A fix for this issue is
+    scheduled for Qt 4.5.1. We recommend that developers who rely on this
+    compiler wait until the fix is applied before upgrading to the Qt 4.5.x
+    series of releases.
+
+    \section2 X11 Hardware Support
+
+    \list
+    \o  There is a bug in the 169.xx NVIDIA drivers on certain GeForce 8 series
+        cards that is triggered by the OpenGL paint engine when using QPainter
+        on a QGLWidget to draw paths and polygons. Some other painting
+        operations that end up in the path fallback are affected as well. The
+        bug causes the whole X server to repeatedly hang for several seconds at
+        a time.
+    \o  There is an issue with NVIDIA's 9xxx driver series on X11 that causes a
+        crash in cases where there are several \l{QGLContext}s and the extended
+        composition modes are used (the composition modes between and including
+        QPainter::CompositionMode_Multiply and
+        QPainter::CompositionMode_Exclusion). This affects the composition mode
+        demo in Qt 4.5, for example. The crash does not occur in newer versions
+        of the drivers.
+    \endlist
+
+    \section2 Windows Hardware Support
+
+    \list
+    \o  When using version 6.14.11.6921 of the NVIDIA drivers for the GeForce
+        6600 GT under Windows XP, Qt applications which use drag and drop will
+        display reduced size drag and drop icons when run alongside
+        applications that use OpenGL. This problem can be worked around by
+        reducing the level of graphics acceleration provided by the driver, or
+        by disabling hardware acceleration completely.
+    \endlist
+
+    \section2 Windows Software Issues
+
+    \list
+
+    \o  When building Qt 4.5.0 with Windows 7, the build fails with an error
+        message regarding failing to embed manifest. This a known issue with
+        Windows 7, explained in the Windows 7 SDK Beta
+        \l{http://download.microsoft.com/download/8/8/0/8808A472-6450-4723-9C87-977069714B27/ReleaseNotes.Htm}
+        {release notes}. A workaround for this issue is to patch the
+        \bold{embed_manifest_exe.prf} file with the following:
+
+        \code
+        diff --git a/mkspecs/features/win32/embed_manifest_exe.prf b/mkspecs/features/win32/embed_manifest_exe.prf
+        index e1747f1..05f116e 100644
+        --- a/mkspecs/features/win32/embed_manifest_exe.prf
+        +++ b/mkspecs/features/win32/embed_manifest_exe.prf
+        @@ -8,4 +8,9 @@ if(win32-msvc2005|win32-msvc2008):!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE
+             QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(OBJECTS_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.ma
+        nifest\" -outputresource:$(DESTDIR_TARGET);1$$escape_expand(\n\t))
+             QMAKE_POST_LINK += $$QMAKE_PREV_POST_LINK
+             QMAKE_CLEAN += \"$$replace(OBJECTS_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\"
+        +    isEmpty(RC_FILE) {
+        +        system("echo.>$$replace(OUT_PWD,/,\\)\\$$replace(OBJECTS_DIR,/,\\)\\Windows7WorkAround.rc")
+        +        RC_FILE = $$replace(OUT_PWD,/,\\)\\$$replace(OBJECTS_DIR,/,\\)\\Windows7WorkAround.rc
+        +       }
+        +
+         }
+        \endcode
+
+    \o  Under certain circumstances Visual Studio Integration v1.4.0 will not
+        be able to install the integration for Visual Studio 2005 on Windows
+        Vista. An error message states that .NET Framework v2.0 Service Pack 1
+        is not installed. This is due to a problem with the built-in
+        installation of this on Windows Vista. This issue can be fixed by
+        installing .NET Framework version 3.5.
+
+    \o  With NVIDIA GeForce 7950 GT (driver version 6.14.11.7824), a fullscreen
+        QGLWidget flickers when child widgets are shown/hidden. The workaround
+        for this is to use \l{QWidget::}{setGeometry()} with a width/height 1
+        pixel bigger than your geometry and call \l{QWidget::}{show()}.
+
+    \o  A bug in the Firebird database can cause an application to crash when
+        \c{fbembed.dll} is unloaded. The bug is fixed in version 2.5.
+
+    \endlist
+
+    \section2 Mac OS X Software Support
+
+    \list
+    \o  If a sheet is opened for a given window, clicking the title bar of that
+        window will cause it to flash. This behavior has been reported to Apple
+        (bug number 5827676).
+    \endlist
+*/
diff --git a/doc/src/layout.qdoc b/doc/src/layout.qdoc
new file mode 100644
index 0000000000..38163c8541
--- /dev/null
+++ b/doc/src/layout.qdoc
@@ -0,0 +1,381 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page layout.html
+
+    \title Layout Classes
+    \ingroup architecture
+    \ingroup classlists
+    \brief A tour of the standard layout managers and an introduction to custom
+    layouts.
+
+    The Qt layout system provides a simple and powerful way of automatically
+    arranging child widgets within a widget to ensure that they make good use
+    of the available space.
+
+    \tableofcontents
+
+    \section1 Introduction
+
+    Qt includes a set of layout management classes that are used to describe
+    how widgets are laid out in an application's user interface. These layouts
+    automatically position and resize widgets when the amount of space
+    available for them changes, ensuring that they are consistently arranged
+    and that the user interface as a whole remains usable.
+
+    All QWidget subclasses can use layouts to manage their children. The
+    QWidget::setLayout() function applies a layout to a widget. When a layout
+    is set on a widget in this way, it takes charge of the following tasks:
+
+    \list
+    \o Positioning of child widgets.
+    \o Sensible default sizes for windows.
+    \o Sensible minimum sizes for windows.
+    \o Resize handling.
+    \o Automatic updates when contents change:
+        \list
+        \o Font size, text or other contents of child widgets.
+        \o Hiding or showing a child widget.
+        \o Removal of child widgets.
+        \endlist
+    \endlist
+
+    Qt's layout classes were designed for hand-written C++ code, allowing
+    measurements to be specified in pixels for simplicity, so they are easy to
+    understand and use. The code generated for forms created using \QD also
+    uses the layout classes. \QD is useful to use when experimenting with the
+    design of a form since it avoids the compile, link and run cycle usually
+    involved in user interface development.
+
+
+    \section1 Horizontal, Vertical, Grid, and Form Layouts
+
+    The easiest way to give your widgets a good layout is to use the built-in
+    layout managers: QHBoxLayout, QVBoxLayout, QGridLayout, and QFormLayout.
+    These classes inherit from QLayout, which in turn derives from QObject (not
+    QWidget). They take care of geometry  management for a set of widgets. To
+    create more complex layouts, you can nest layout managers inside each other.
+
+    \list
+        \o  A QHBoxLayout lays out widgets in a horizontal row, from left to
+            right (or right to left for right-to-left languages).
+            \image qhboxlayout-with-5-children.png
+
+        \o  A QVBoxLayout lays out widgets in a vertical column, from top to
+            bottom.
+            \image qvboxlayout-with-5-children.png
+
+        \o  A QGridLayout lays out widgets in a two-dimensional grid. Widgets
+            can occupy multiple cells.
+            \image qgridlayout-with-5-children.png
+
+        \o  A QFormLayout lays out widgets in a 2-column descriptive label-
+            field style.
+            \image qformlayout-with-6-children.png
+    \endlist
+
+
+    \section2 Laying Out Widgets in Code
+
+    The following code creates a QHBoxLayout that manages the geometry of five
+    \l{QPushButton}s, as shown on the first screenshot above:
+
+    \snippet doc/src/snippets/layouts/layouts.cpp 0
+    \snippet doc/src/snippets/layouts/layouts.cpp 1
+    \snippet doc/src/snippets/layouts/layouts.cpp 2
+    \codeline
+    \snippet doc/src/snippets/layouts/layouts.cpp 3
+    \snippet doc/src/snippets/layouts/layouts.cpp 4
+    \snippet doc/src/snippets/layouts/layouts.cpp 5
+
+    The code for QVBoxLayout is identical, except the line where the layout is
+    created. The code for QGridLayout is a bit different, because we need to
+    specify the row and column position of the child widget:
+
+    \snippet doc/src/snippets/layouts/layouts.cpp 12
+    \snippet doc/src/snippets/layouts/layouts.cpp 13
+    \snippet doc/src/snippets/layouts/layouts.cpp 14
+    \codeline
+    \snippet doc/src/snippets/layouts/layouts.cpp 15
+    \snippet doc/src/snippets/layouts/layouts.cpp 16
+    \snippet doc/src/snippets/layouts/layouts.cpp 17
+
+    The third QPushButton spans 2 columns. This is possible by specifying 2 as
+    the fifth argument to QGridLayout::addWidget().
+
+    Finally, the code for QFormLayout is ..
+
+
+    \section2 Tips for Using Layouts
+
+    When you use a layout, you do not need to pass a parent when constructing
+    the child widgets. The layout will automatically reparent the widgets
+    (using QWidget::setParent()) so that they are children of the widget on
+    which the layout is installed.
+
+    \note Widgets in a layout are children of the widget on which the layout
+    is installed, \e not of the layout itself. Widgets can only have other
+    widgets as parent, not layouts.
+
+    You can nest layouts using \c addLayout() on a layout; the inner layout
+    then becomes a child of the layout it is inserted into.
+
+
+    \section1 Adding Widgets to a Layout
+
+    When you add widgets to a layout, the layout process works as follows:
+
+    \list 1
+        \o  All the widgets will initially be allocated an amount of space in
+            accordance with their QWidget::sizePolicy() and
+            QWidget::sizeHint().
+
+        \o  If any of the widgets have stretch factors set, with a value
+            greater than zero, then they are allocated space in proportion to
+            their stretch factor (explained below).
+
+        \o  If any of the widgets have stretch factors set to zero they will
+            only get more space if no other widgets want the space. Of these,
+            space is allocated to widgets with an
+            \l{QSizePolicy::Expanding}{Expanding} size policy first.
+
+        \o  Any widgets that are allocated less space than their minimum size
+            (or minimum size hint if no minimum size is specified) are
+            allocated this minimum size they require. (Widgets don't have to
+            have a minimum size or minimum size hint in which case the strech
+            factor is their determining factor.)
+
+        \o  Any widgets that are allocated more space than their maximum size
+            are allocated the maximum size space they require. (Widgets do not
+            have to have a maximum size in which case the strech factor is
+            their determining factor.)
+    \endlist
+
+
+    \section2 Stretch Factors
+    \keyword stretch factor
+
+    Widgets are normally created without any stretch factor set. When they are
+    laid out in a layout the widgets are given a share of space in accordance
+    with their QWidget::sizePolicy() or their minimum size hint whichever is
+    the greater. Stretch factors are used to change how much space widgets are
+    given in proportion to one another.
+
+    If we have three widgets laid out using a QHBoxLayout with no stretch
+    factors set we will get a layout like this:
+
+    \img layout1.png Three widgets in a row
+
+    If we apply stretch factors to each widget, they will be laid out in
+    proportion (but never less than their minimum size hint), e.g.
+
+    \img layout2.png Three widgets with different stretch factors in a row
+
+
+    \section1 Custom Widgets in Layouts
+
+    When you make your own widget class, you should also communicate its layout
+    properties. If the widget has a one of Qt's layouts, this is already taken
+    care of. If the widget does not have any child widgets, or uses manual
+    layout, you can change the behavior of the widget using any or all of the
+    following mechanisms:
+
+    \list
+        \o  Reimplement QWidget::sizeHint() to return the preferred size of the
+            widget.
+        \o  Reimplement QWidget::minimumSizeHint() to return the smallest size
+            the widget can have.
+        \o  Call QWidget::setSizePolicy() to specify the space requirements of
+            the widget.
+    \endlist
+
+    Call QWidget::updateGeometry() whenever the size hint, minimum size hint or
+    size policy changes. This will cause a layout recalculation. Multiple
+    consecutive calls to QWidget::updateGeometry() will only cause one layout
+    recalculation.
+
+    If the preferred height of your widget depends on its actual width (e.g.,
+    a label with automatic word-breaking), set the
+    \l{QSizePolicy::hasHeightForWidth()}{height-for-width} flag in the
+    widget's \l{QWidget::sizePolicy}{size policy} and reimplement
+    QWidget::heightForWidth().
+
+    Even if you implement QWidget::heightForWidth(), it is still a good idea to
+    provide a reasonable sizeHint().
+
+    For further guidance when implementing these functions, see the
+    \e{Qt Quarterly} article
+    \l{http://doc.trolltech.com/qq/qq04-height-for-width.html}
+    {Trading Height for Width}.
+
+
+    \section1 Layout Issues
+
+    The use of rich text in a label widget can introduce some problems to the
+    layout of its parent widget. Problems occur due to the way rich text is
+    handled by Qt's layout managers when the label is word wrapped.
+
+    In certain cases the parent layout is put into QLayout::FreeResize mode,
+    meaning that it will not adapt the layout of its contents to fit inside
+    small sized windows, or even prevent the user from making the window too
+    small to be usable. This can be overcome by subclassing the problematic
+    widgets, and implementing suitable \l{QWidget::}{sizeHint()} and
+    \l{QWidget::}{minimumSizeHint()} functions.
+
+    In some cases, it is relevant when a layout is added to a widget. When
+    you set the widget of a QDockWidget or a QScrollArea (with
+    QDockWidget::setWidget() and QScrollArea::setWidget()), the layout must
+    already have been set on the widget. If not, the widget will not be
+    visible.
+
+
+    \section1 Manual Layout
+
+    If you are making a one-of-a-kind special layout, you can also make a
+    custom widget as described above. Reimplement QWidget::resizeEvent() to
+    calculate the required distribution of sizes and call
+    \l{QWidget::}{setGeometry()} on each child.
+
+    The widget will get an event of type QEvent::LayoutRequest when the
+    layout needs to be recalculated. Reimplement QWidget::event() to handle
+    QEvent::LayoutRequest events.
+
+
+    \section1 How to Write A Custom Layout Manager
+
+    An alternative to manual layout is to write your own layout manager by
+    subclassing QLayout. The \l{layouts/borderlayout}{Border Layout} and
+    \l{layouts/flowlayout}{Flow Layout} examples show how to do this.
+
+    Here we present an example in detail. The \c CardLayout class is inspired
+    by the Java layout manager of the same name. It lays out the items (widgets
+    or nested layouts) on top of each other, each item offset by
+    QLayout::spacing().
+
+    To write your own layout class, you must define the following:
+    \list
+        \o  A data structure to store the items handled by the layout. Each
+            item is a \link QLayoutItem QLayoutItem\endlink. We will use a
+            QList in this example.
+        \o  \l{QLayout::}{addItem()}, how to add items to the layout.
+        \o  \l{QLayout::}{setGeometry()}, how to perform the layout.
+        \o  \l{QLayout::}{sizeHint()}, the preferred size of the layout.
+        \o  \l{QLayout::}{itemAt()}, how to iterate over the layout.
+        \o  \l{QLayout::}{takeAt()}, how to remove items from the layout.
+    \endlist
+
+    In most cases, you will also implement \l{QLayout::}{minimumSize()}.
+
+
+    \section2 The Header File (\c card.h)
+
+    \snippet doc/src/snippets/code/doc_src_layout.qdoc 0
+
+
+    \section2 The Implementation File (\c card.cpp)
+
+    \snippet doc/src/snippets/code/doc_src_layout.qdoc 1
+
+    First we define two functions that iterate over the layout: \c{itemAt()}
+    and \c{takeAt()}. These functions are used internally by the layout system
+    to handle deletion of widgets. They are also available for application
+    programmers. 
+
+    \c{itemAt()} returns the item at the given index. \c{takeAt()} removes the
+    item at the given index, and returns it. In this case we use the list index
+    as the layout index. In other cases where we have a more complex data
+    structure, we may have to spend more effort defining a linear order for the
+    items.
+
+    \snippet doc/src/snippets/code/doc_src_layout.qdoc 2
+
+    \c{addItem()} implements the default placement strategy for layout items.
+    This function must be implemented. It is used by QLayout::add(), by the
+    QLayout constructor that takes a layout as parent. If your layout has
+    advanced placement options that require parameters, you must provide extra
+    access functions such as the row and column spanning overloads of
+    QGridLayout::addItem(), QGridLayout::addWidget(), and
+    QGridLayout::addLayout().
+
+    \snippet doc/src/snippets/code/doc_src_layout.qdoc 3
+
+    The layout takes over responsibility of the items added. Since QLayoutItem
+    does not inherit QObject, we must delete the items manually. The function
+    QLayout::deleteAllItems() uses \c{takeAt()} defined above to delete all the
+    items in the layout.
+
+    \snippet doc/src/snippets/code/doc_src_layout.qdoc 4
+
+    The \c{setGeometry()} function actually performs the layout. The rectangle
+    supplied as an argument does not include \c{margin()}. If relevant, use
+    \c{spacing()} as the distance between items.
+
+    \snippet doc/src/snippets/code/doc_src_layout.qdoc 5
+
+    \c{sizeHint()} and \c{minimumSize()} are normally very similar in
+    implementation. The sizes returned by both functions should include
+    \c{spacing()}, but not \c{margin()}.
+
+    \snippet doc/src/snippets/code/doc_src_layout.qdoc 6
+
+
+    \section2 Further Notes
+
+    \list
+        \o  This custom layout does not handle height for width.
+        \o  We ignore QLayoutItem::isEmpty(); this means that the layout will
+            treat hidden widgets as visible.
+        \o  For complex layouts, speed can be greatly increased by caching
+            calculated values. In that case, implement
+            QLayoutItem::invalidate() to mark the cached data is dirty.
+        \o  Calling QLayoutItem::sizeHint(), etc. may be expensive. So, you
+            should store the value in a local variable if you need it again
+            later within in the same function.
+        \o  You should not call QLayoutItem::setGeometry() twice on the same
+            item in the smae function. This call can be very expensive if the
+            item has several child widgets, because the layout manager must do
+            a complete layout every time. Instead, calculate the geometry and
+            then set it. (This does not only apply to layouts, you should do
+            the same if you implement your own resizeEvent(), for example.)
+    \endlist
+*/
+
diff --git a/doc/src/licenses.qdoc b/doc/src/licenses.qdoc
new file mode 100644
index 0000000000..b42b882c62
--- /dev/null
+++ b/doc/src/licenses.qdoc
@@ -0,0 +1,465 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \page licenses.html
+    \title Other Licenses Used in Qt
+    \ingroup licensing
+    \brief Information about other licenses used for Qt components and third-party code.
+
+    Qt contains some code that is not provided under the the
+    \l{GNU General Public License (GPL)},
+    \l{GNU Lesser General Public License (LGPL)} or the
+    \l{Qt Commercial Editions}{Qt Commercial License Agreement}, but rather under
+    specific licenses from the original authors. Some pieces of code were developed
+    by Qt Software and others originated from third parties.
+    This page lists the licenses used, names the authors, and links
+    to the places where it is used.
+
+    Nokia gratefully acknowledges these and other contributions
+    to Qt. We recommend that programs that use Qt also acknowledge
+    these contributions, and quote these license statements in an
+    appendix to the documentation.
+
+    See also: \l{Licenses for Fonts Used in Qt for Embedded Linux}
+
+    \generatelist legalese
+
+    \hr
+
+    Copyright (C) 2000-2004, International Business Machines\br
+    Corporation and others. All Rights Reserved.\br
+    Copyright (C) 2007 Apple Inc. All rights reserved.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this
+    software and associated documentation files (the "Software"), to deal in the Software
+    without restriction, including without limitation the rights to use, copy, modify,
+    merge, publish, distribute, and/or sell copies of the Software, and to permit persons
+    to whom the Software is furnished to do so, provided that the above copyright notice(s)
+    and this permission notice appear in all copies of the Software and that both the above
+    copyright notice(s) and this permission notice appear in supporting documentation.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+    INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+    PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER
+    OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
+    CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+    PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+    OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+    Except as contained in this notice, the name of a copyright holder shall not be used in
+    advertising or otherwise to promote the sale, use or other dealings in this Software
+    without prior written authorization of the copyright holder.
+
+    \list
+    \o Parts of WebKit used by the QtWebKit module
+    \endlist
+
+    \hr
+
+    Copyright (c) 1998 by Bjorn Reese <breese@imada.ou.dk>
+
+    Permission to use, copy, modify, and distribute this software for any
+    purpose with or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+    WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+    MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
+    CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
+
+    \list
+    \o Parts of the QCrashHandler class
+    \endlist
+
+    \hr
+
+    Parts of the FreeType projects have been modified and put into Qt
+    for use in the painting subsystem. These files are ftraster.h,
+    ftraster.c, ftgrays.h and ftgrays.c. The following modifications
+    has been made to these files:
+
+    \list
+    \i Renamed FT_ and ft_ symbols to QT_FT_ and qt_ft_ to avoid name
+    conflicts in \c{qrasterdefs_p.h}.
+    \i Removed parts of code not relevant when compiled with
+    _STANDALONE_ defined.
+    \i Changed behavior in \c{ftraster.c} to follow X polygon filling
+    rules.
+    \i Implemented support in \c{ftraster.c} for winding / odd even
+    polygon fill rules.
+    \i Replaced bitmap generation with span generation in \c{ftraster.c}.
+    \i Renamed \c{ftraster.h} as \c{qblackraster_p.h}.
+    \i Renamed \c{ftraster.c} as \c{qblackraster.c}.
+    \i Renamed \c{ftgrays.h} as \c{qgrayraster_p.h}.
+    \i Renamed \c{ftgrays.c} as \c{qgrayraster.c}.
+    \endlist
+
+    See \c src/3rdparty/freetype/docs/FTL.txt and \c
+    src/3rdparty/freetype/docs/GPL.txt for license details.
+
+    \hr
+
+    Copyright (c) 1985, 1986, 1987  X Consortium
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+    OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+    ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+    OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the name of the X Consortium shall
+    not be used in advertising or otherwise to promote the sale, use or
+    other dealings in this Software without prior written authorization
+    from the X Consortium.
+
+    \list
+    \o Parts of the Q3PolygonScanner class used in Qt for Embedded Linux
+    \endlist
+
+    \hr
+
+    Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                            All Rights Reserved
+
+    Permission to use, copy, modify, and distribute this software and its
+    documentation for any purpose and without fee is hereby granted,
+    provided that the above copyright notice appear in all copies and that
+    both that copyright notice and this permission notice appear in
+    supporting documentation, and that the name of Digital not be
+    used in advertising or publicity pertaining to distribution of the
+    software without specific, written prior permission.
+
+    DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+    ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+    DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+    ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+    WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+    ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+    SOFTWARE.
+
+    \list
+    \o Parts of the Q3PolygonScanner class used in Qt for Embedded Linux
+    \endlist
+
+    \hr
+
+    Copyright 1985, 1987, 1998  The Open Group
+
+    Permission to use, copy, modify, distribute, and sell this software and its
+    documentation for any purpose is hereby granted without fee, provided that
+    the above copyright notice appear in all copies and that both that
+    copyright notice and this permission notice appear in supporting
+    documentation.
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+    OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+    AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the name of The Open Group shall not be
+    used in advertising or otherwise to promote the sale, use or other dealings
+    in this Software without prior written authorization from The Open Group.
+
+    \list
+    \o Parts of the internal QKeyMapper class on X11 platforms
+    \endlist
+
+    \hr
+
+    pnmscale.c - read a portable anymap and scale it
+
+    Copyright (C) 1989, 1991 by Jef Poskanzer.
+
+    Permission to use, copy, modify, and distribute this software and its
+    documentation for any purpose and without fee is hereby granted, provided
+    that the above copyright notice appear in all copies and that both that
+    copyright notice and this permission notice appear in supporting
+    documentation.  This software is provided "as is" without express or
+    implied warranty.
+
+    \list
+    \o Parts of the internal QImageSmoothScaler::scale() function use code
+    based on pnmscale.c by Jef Poskanzer.
+    \endlist
+*/
+
+/*!
+    \page licenses-fonts.html
+    \title Licenses for Fonts Used in Qt for Embedded Linux
+    \ingroup qt-embedded-linux
+    \ingroup licensing
+    \brief Information about the licenses of fonts supplied with Qt for Embedded Linux.
+
+    The fonts supplied with Qt for Embedded Linux have been obtained under a
+    variety of different licenses listed below.
+
+    \tableofcontents
+
+    See also: \l{Other Licenses Used in Qt}
+
+    \section1 Adobe Helvetica
+
+    Copyright 1984-1989, 1994 Adobe Systems Incorporated.
+    Copyright 1988, 1994 Digital Equipment Corporation.
+
+    Adobe is a trademark of Adobe Systems Incorporated which may be
+    registered in certain jurisdictions.
+    Permission to use these trademarks is hereby granted only in
+    association with the images described in this file.
+
+    Permission to use, copy, modify, distribute and sell this software
+    and its documentation for any purpose and without fee is hereby
+    granted, provided that the above copyright notices appear in all
+    copies and that both those copyright notices and this permission
+    notice appear in supporting documentation, and that the names of
+    Adobe Systems and Digital Equipment Corporation not be used in
+    advertising or publicity pertaining to distribution of the software
+    without specific, written prior permission.  Adobe Systems and
+    Digital Equipment Corporation make no representations about the
+    suitability of this software for any purpose.  It is provided "as
+    is" without express or implied warranty.
+
+    \section1 Adobe Utopia
+
+      Permission to use, reproduce, display and distribute the listed
+      typefaces is hereby granted, provided that the Adobe Copyright notice
+      appears in all whole and partial copies of the software and that the
+      following trademark symbol and attribution appear in all unmodified
+      copies of the software:
+
+            Copyright (c) 1989 Adobe Systems Incorporated
+            Utopia (R)
+            Utopia is a registered trademark of Adobe Systems Incorporated
+
+    The Utopia font
+    Copyright (c) 1989, 1991 Adobe Systems Incorporated.  All Rights
+    Reserved.Utopia is a registered trademark of Adobe Systems
+    Incorporated.
+
+    \section1 Babelfish
+
+    \snippet doc/src/snippets/code/doc_src_licenses.qdoc 1
+
+    \section1 Bigelow & Holmes Luxi
+
+    Luxi fonts copyright (c) 2001 by Bigelow & Holmes Inc. Luxi font 
+    instruction code copyright (c) 2001 by URW++ GmbH. All Rights 
+    Reserved. Luxi is a registered trademark of Bigelow & Holmes Inc.
+
+    Permission is hereby granted, free of charge, to any person obtaining 
+    a copy of these Fonts and associated documentation files (the "Font 
+    Software"), to deal in the Font Software, including without 
+    limitation the rights to use, copy, merge, publish, distribute, 
+    sublicense, and/or sell copies of the Font Software, and to permit 
+    persons to whom the Font Software is furnished to do so, subject to 
+    the following conditions:
+
+    The above copyright and trademark notices and this permission notice 
+    shall be included in all copies of one or more of the Font Software.
+
+    The Font Software may not be modified, altered, or added to, and in 
+    particular the designs of glyphs or characters in the Fonts may not 
+    be modified nor may additional glyphs or characters be added to the 
+    Fonts. This License becomes null and void when the Fonts or Font 
+    Software have been modified.
+
+    THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF 
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT 
+    OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT.  IN NO EVENT SHALL 
+    BIGELOW & HOLMES INC. OR URW++ GMBH. BE LIABLE FOR ANY CLAIM, DAMAGES 
+    OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, 
+    INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF 
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR 
+    INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT 
+    SOFTWARE.
+
+    Except as contained in this notice, the names of Bigelow & Holmes 
+    Inc. and URW++ GmbH. shall not be used in advertising or otherwise to 
+    promote the sale, use or other dealings in this Font Software without 
+    prior written authorization from Bigelow & Holmes Inc. and URW++ GmbH.
+
+    For further information, contact:
+
+    info@urwpp.de
+    or
+    design@bigelowandholmes.com
+
+    \section1 Bitstream Charter and Courier
+
+    (c) Copyright 1989-1992, Bitstream Inc., Cambridge, MA.
+
+    You are hereby granted permission under all Bitstream propriety rights
+    to use, copy, modify, sublicense, sell, and redistribute the 4 Bitstream
+    Charter (r) Type 1 outline fonts and the 4 Courier Type 1 outline fonts
+    for any purpose and without restriction; provided, that this notice is
+    left intact on all copies of such fonts and that Bitstream's trademark
+    is acknowledged as shown below on all unmodified copies of the 4 Charter
+    Type 1 fonts.
+
+    BITSTREAM CHARTER is a registered trademark of Bitstream Inc.
+
+    \section1 Bitstream Vera
+
+    Copyright (c) 2003 by Bitstream, Inc.
+
+    All Rights Reserved.
+
+    Bitstream Vera is a trademark of Bitstream, Inc.
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of the fonts accompanying this license ("Fonts") and associated
+    documentation files (the "Font Software"), to reproduce and distribute
+    the Font Software, including without limitation the rights to use,
+    copy, merge, publish, distribute, and/or sell copies of the Font
+    Software, and to permit persons to whom the Font Software is furnished
+    to do so, subject to the following conditions:
+
+    The above copyright and trademark notices and this permission notice
+    shall be included in all copies of one or more of the Font Software
+    typefaces.
+
+    The Font Software may be modified, altered, or added to, and in
+    particular the designs of glyphs or characters in the Fonts may be
+    modified and additional glyphs or characters may be added to the
+    Fonts, only if the fonts are renamed to names not containing either
+    the words "Bitstream" or the word "Vera".
+
+    This License becomes null and void to the extent applicable to Fonts
+    or Font Software that has been modified and is distributed under the
+    "Bitstream Vera" names.
+
+    The Font Software may be sold as part of a larger software package but
+    no copy of one or more of the Font Software typefaces may be sold by
+    itself.
+
+    THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+    OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+    BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
+    OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
+    OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+    OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
+    SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+
+    Except as contained in this notice, the names of Gnome, the Gnome
+    Foundation, and Bitstream Inc., shall not be used in advertising or
+    otherwise to promote the sale, use or other dealings in this Font
+    Software without prior written authorization from the Gnome Foundation
+    or Bitstream Inc., respectively. For further information, contact:
+    fonts at gnome dot org.
+
+    \omit
+    http://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts
+    \endomit
+
+    See also:
+    \l{http://www.bitstream.com/font_rendering/products/dev_fonts/vera.html}{Vera Open Source Fonts}
+
+    \section1 Cursor
+
+    The Cursor font is distributed with the following declaration:
+
+    \e{Copyright (c) 2000 XFree86, Inc.}
+
+    \section1 DejaVu Fonts
+
+    DejaVu fonts come with the following copyright statement:
+
+    Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. Glyphs imported from Arev fonts are (c) Tavmjung Bah (see below)
+
+    \snippet doc/src/snippets/code/doc_src_licenses.qdoc 2
+
+    \section1 Fixed Fonts
+
+    The 5x7 and 6x13 fonts each contain the following copyright notice:
+
+    \e{Public domain font.  Share and enjoy.}
+
+    \section1 IBM Courier
+
+    IBM Courier - Copyright (c) IBM Corporation 1990, 1991
+
+    You are hereby granted permission under the terms of the IBM/MIT X Consortium
+    Courier Typefont agreement to execute, reproduce, distribute, display, market,
+    sell and otherwise transfer copies of the IBM Courier font to third parties.
+
+    The font is provided "AS IS" without charge.  NO WARRANTIES OR INDEMNIFICATION
+    ARE GIVEN, WHETHER EXPRESS OR IMPLIED INCLUDING, BUT LIMITED TO THE IMPLIED
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+    \section1 Micro
+
+    The Micro font contains the following copyright notice:
+
+    \e{Public domain font.  Share and enjoy.}
+
+    \section1 Unifont
+
+    The Unifont font was originally obtained from
+    \l{http://www.czyborra.com/}{Roman Czyborra} under the following license:
+
+    \e{All of my works you find here are freeware. You may freely copy, use, quote,
+    modify or redistribute them as long as you properly attribute my contribution
+    and have given a quick thought about whether Roman might perhaps be interested
+    to read what you did with his stuff. Horizontal rules don't apply.}
+*/
diff --git a/doc/src/linguist-manual.qdoc b/doc/src/linguist-manual.qdoc
new file mode 100644
index 0000000000..92e3bed315
--- /dev/null
+++ b/doc/src/linguist-manual.qdoc
@@ -0,0 +1,1513 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page linguist-manual.html
+    \title Qt Linguist Manual
+    \ingroup qttools
+
+    \startpage {index.html}{Qt Reference Documentation}
+    \nextpage Qt Linguist Manual: Release Manager
+
+    \keyword Qt Linguist
+
+    Qt provides excellent support for translating applications into local
+    languages. This Guide explains how to use Qt's translation tools for
+    each of the roles involved in translating an application. The Guide
+    begins with a brief overview of the issues that must be considered,
+    followed by chapters devoted to each role and the supporting tools
+    provided.
+
+    The \l{linguist-manager.html}{Release Manager} chapter is aimed
+    at the person with overall responsibility for the release of the
+    application. They will typically coordinate the work of the
+    software engineers and the translator. The chapter describes the
+    use of two tools. The \l{lupdate} tool is used to synchronize
+    source code and translations. The \l{lrelease} tool is used to
+    create runtime translation files for use by the released
+    application.
+
+    The \l{linguist-translators.html}{Translators} chapter is for
+    translators. It describes the use of the \QL tool.
+    No computer knowledge beyond the ability to start a program and
+    use a text editor or word processor is required.
+
+    The \l{linguist-programmers.html}{Programmers} chapter is for Qt
+    programmers. It explains how to create Qt applications that are
+    able to use translated text. It also provides guidance on how to
+    help the translator identify the context in which phrases appear.
+    This chapter's three short tutorials cover everything the
+    programmer needs to do.
+
+    \section1 Overview of the Translation Process
+
+    Most of the text that must be translated in an application program
+    consists of either single words or short phrases. These typically
+    appear as window titles, menu items, pop-up help text (balloon help),
+    and labels to buttons, check boxes and radio buttons.
+
+    The phrases are entered into the source code by the programmer in
+    their native language using a simple but special syntax to identify
+    that the phrases require translation. The Qt tools provide context
+    information for each of the phrases to help the translator, and the
+    programmer is able to add additional context information to phrases
+    when necessary. The release manager generates a set of translation
+    files that are produced from the source files and passes these to the
+    translator. The translator opens the translation files using \QL, 
+    enters their translations and saves the results back into
+    the translation files, which they pass back to the release manager.
+    The release manager then generates fast compact versions of these
+    translation files ready for use by the application. The tools are
+    designed to be used in repeated cycles as applications change and
+    evolve, preserving existing translations and making it easy to
+    identify which new translations are required. \QL also
+    provides a phrase book facility to help ensure consistent
+    translations across multiple applications and projects.
+
+    Translators and programmers must address a number of issues because
+    of the subtleties and complexities of human language:
+
+    \list
+
+    \o A single phrase may need to be translated into several
+    different forms depending on context, e.g. \e open in English
+    might become \e{\ouml\c{}ffnen}, "open file", or \e aufbauen,
+    "open internet connection", in German.
+
+    \o Keyboard accelerators may need to be changed but without
+    introducing conflicts, e.g. "\&Quit" in English becomes "Avslutt"
+    in Norwegian which doesn't contain a "Q". We cannot use a letter
+    that is already in use - unless we change several accelerators.
+
+    \o Phrases that contain variables, for example, "The 25 files
+    selected will take 63 seconds to process", where the two numbers
+    are inserted programmatically at runtime may need to be reworded
+    because in a different language the word order and therefore the
+    placement of the variables may have to change.
+
+    \endlist
+
+    The Qt translation tools provide clear and simple solutions to these
+    issues.
+
+    Chapters:
+
+    \list
+    \o \l{Qt Linguist Manual: Release Manager}{Release Manager}
+    \o \l{Qt Linguist Manual: Translators}{Translators}
+    \o \l{Qt Linguist Manual: Programmers}{Programmers}
+    \o \l{Qt Linguist Manual: TS File Format}{TS File Format}
+    \endlist
+
+    \QL and \c lupdate are able to import and export XML Localization
+    Interchange File Format (XLIFF) files, making it possible to take
+    advantage of tools and translation services that work with this
+    format. See the \l{Qt Linguist Manual: Translators} {Translators}
+    section for more information on working with these files.
+
+    \table
+
+    \row \o{1,2} \inlineimage wVista-Cert-border-small.png
+    \o \e{Qt Linguist 4.3 is Certified for Windows Vista}
+    
+    \row \o Windows Vista and the Windows Vista Start button are
+    trademarks or registered trademarks of Microsoft Corporation in
+    the United States and/or other countries.
+
+    \endtable
+*/
+
+/*!
+    \page linguist-manager.html
+    \title Qt Linguist Manual: Release Manager
+
+    \contentspage {Qt Linguist Manual}{Contents}
+    \previouspage Qt Linguist Manual
+    \nextpage Qt Linguist Manual: Translators
+
+    \keyword lupdate
+    \keyword lrelease
+
+    Two tools are provided for the release manager, \l lupdate and \l
+    lrelease. These tools can process \l qmake project files, or operate
+    directly on the file system.
+
+    \section1 Qt Project Files
+
+    The easiest method to use \l{#lupdate} {lupdate} and \l{#lrelease}
+    {lrelease} is by specifing a \c .pro Qt project file. There must
+    be an entry in the \c TRANSLATIONS section of the project file for
+    each language that is additional to the native language. A typical
+    entry looks like this:
+
+    \snippet examples/linguist/arrowpad/arrowpad.pro 1
+
+    Using a locale within the translation file name is useful for
+    determining which language to load at runtime. This is explained
+    in the \l{linguist-programmers.html} {Programmers} chapter.
+
+    An example of a complete \c .pro file with four translation source
+    files:
+
+    \snippet doc/src/snippets/code/doc_src_linguist-manual.qdoc 0
+    \snippet doc/src/snippets/code/doc_src_linguist-manual.qdoc 1
+
+    QTextCodec::setCodecForTr() makes it possible to choose a 8-bit
+    encoding for literal strings that appear within \c tr() calls.
+    This is useful for applications whose source language is, for
+    example, Chinese or Japanese. If no encoding is set, \c tr() uses
+    Latin1.
+
+    If you do use the QTextCodec::codecForTr() mechanism in your
+    application, \QL needs you to set the \c CODECFORTR
+    entry in the \c .pro file as well. For example:
+
+    \snippet doc/src/snippets/code/doc_src_linguist-manual.qdoc 1
+
+    Also, if your compiler uses a different encoding for its runtime
+    system as for its source code and you want to use  non-ASCII
+    characters in string literals, you will need to set the \c
+    CODECFORSRC. For example:
+
+    \snippet doc/src/snippets/code/doc_src_linguist-manual.qdoc 2
+
+    Microsoft Visual Studio 2005 .NET appears to be the only compiler
+    for which this is necessary. However, if you want to write
+    portable code, we recommend that you avoid non-ASCII characters
+    in your source files. You can still specify non-ASCII characters
+    portably using escape sequences, for example:
+
+    \snippet doc/src/snippets/code/doc_src_linguist-manual.qdoc 3
+
+    \target lupdate manual
+    \section1 lupdate
+
+    Usage: \c {lupdate myproject.pro}
+
+    \l lupdate is a command line tool that finds the translatable
+    strings in the specified source, header and \e {Qt Designer}
+    interface files, and produces or updates \c .ts translation
+    files. The files to process and the files to update can be set at
+    the command line, or provided in a \c .pro file specified as an
+    command line argument. The produced translation files are given to
+    the translator who uses \QL to read the files and insert the
+    translations.
+
+    Companies that have their own translators in-house may find it
+    useful to run \l lupdate regularly, perhaps monthly, as the
+    application develops. This will lead to a fairly low volume of
+    translation work spread evenly over the life of the project and
+    will allow the translators to support a number of projects
+    simultaneously.
+
+    Companies that hire in translators as required may prefer to run
+    \l lupdate only a few times in the application's life cycle, the
+    first time might be just before the first test phase. This will
+    provide the translator with a substantial single block of work and
+    any bugs that the translator detects may easily be included with
+    those found during the initial test phase. The second and any
+    subsequent \l lupdate runs would probably take place during the
+    final beta phase.
+
+    The \c .ts file format is a simple human-readable XML format that
+    can be used with version control systems if required. \c lupdate
+    can also process Localization Interchange File Format (XLIFF)
+    format files; file in this format typically have file names that
+    end with the \c .xlf suffix.
+
+    Pass the \c -help option to \c lupdate to obtain the list of
+    supported options:
+
+    \snippet doc/src/snippets/code/doc_src_linguist-manual.qdoc 4
+
+    \QL is also able to import and export XLIFF files. See the
+    \l{Qt Linguist Manual: Translators}{Translators} section for more
+    information.
+
+    \section1 lrelease
+
+    Usage: \c {lrelease myproject.pro}
+
+    \l lrelease is a command line tool that produces \c .qm files out
+    of \c .ts files. The \c .qm file format is a compact binary format
+    that is used by the localized application. It provides extremely
+    fast lookups for translations. The \c .ts files \l lrelease
+    processes can be specified at the command line, or given
+    indirectly by a Qt \c .pro project file.
+
+    This tool is run whenever a release of the application is to be
+    made, from initial test version through to final release
+    version. If the \c .qm files are not created, e.g. because an
+    alpha release is required before any translation has been
+    undertaken, the application will run perfectly well using the text
+    the programmers placed in the source files. Once the \c .qm files
+    are available the application will detect them and use them
+    automatically.
+
+    Note that lrelease will only incorporate translations that are
+    marked as "finished". Otherwise the original text will be used
+    instead.
+
+    Pass the \c -help option to \c lrelease to obtain the list of
+    supported options:
+
+    \snippet doc/src/snippets/code/doc_src_linguist-manual.qdoc 5
+
+    \section1 Missing Translations
+
+    Both \l lupdate and \l lrelease may be used with \c .ts
+    translation source files which are incomplete. Missing
+    translations will be replaced with the native language phrases at
+    runtime.  
+*/
+
+/*!
+    \page linguist-translators.html
+    \title Qt Linguist Manual: Translators
+
+    \contentspage {Qt Linguist Manual}{Contents}
+    \previouspage Qt Linguist Manual: Release Manager
+    \nextpage Qt Linguist Manual: Programmers
+
+    Contents
+
+    \tableofcontents
+
+    \section1 The One Minute Guide to Using Qt Linguist
+
+    \QL is a tool for adding translations to Qt applications. Run \QL
+    from the taskbar menu, or by double clicking the desktop icon, or
+    by entering the command \c {linguist} at the command line. Once
+    \QL has started, choose \menu{File|Open} from the \l{menubar}
+    {menu bar} and select a translation source (\c{.ts} file) to
+    load. If you don't have a \c{.ts} file, see the \l {Qt Linguist
+    Manual: Release Manager} {release manager manual} to learn how to
+    generate one.
+
+    The \QL main window is divided into several, dockable subwindows
+    arranged around a central \l{The Translation Area} {translation
+    area}. The \l{Context Window} {context list} is normally shown
+    on the left, and the \l{Sources and Forms Window} {source code},
+    \l{Strings Window} {string list}, and either the \l{Phrases and 
+    Guesses Window} {prhrases and guesses}, or the \l{Warnings Window} 
+    {warnings} are shown above and below the \l{The Translation Area}
+    {translations area}.
+
+    With a translation file loaded, select a context from the
+    \l{Context Window} {context list} on the left. Selecting a context
+    loads the translatable strings found in that context into the
+    \l{Strings Window} {string list}. Selecting one of the strings
+    copies that string as the \key{Source text} in the \l{The
+    Translation Area} {translation area}. Click in the text entry
+    widget below the copied string and type your translation for that
+    string. To accept the translation, either press the green
+    \key{tick mark} button on the toolbar, or click the icon to the
+    left of the selected source string in the string list. Repeat this
+    process until all strings in the string list are marked with
+    \inlineimage linguist-check-on.png 
+    or
+    \inlineimage linguist-check-warning.png 
+    . Then select the next context and continue.
+
+    Translation options are shown in the \l{Phrases and Guesses
+    Window} {phrases and guesses window}. If the phrases and guesses
+    window is not visible, click the \key{Phrases and guesses} tab at
+    the bottom of the main window. The phrases and guesses window
+    shows possible translations for the current string. These
+    translation "guesses" have been read from phrase books
+    (\menu{Phrases|Open Phrase Book...}).  The current string's
+    current translation is also shown here. To select a guess, double
+    click it in the prases and guesses window or use the keyboard
+    shortcut shown to the right of the guess.
+
+    \QL can automatically check whether your translation strings pass
+    a list of \l{Validation Tests} {validation tests}. Validation test
+    failures are shown in the \l{Warnings Window} {warnings window}.
+    If the warnings window is not visible, click the \key{Warnings}
+    tab at the bottom of the main window.
+
+    Finally, if the source code for the contexts is accessible, the
+    \l{Sources and Forms Window} {source code window} shows the
+    context where the current string is used. If the source code
+    window is not visible, click the \key{Sources and Forms} tab at
+    the bottom of the main window.
+
+    At the end of the session choose \menu{File|Save} from the menu
+    bar and then \menu{File|Exit} to quit.
+
+    \section1 The Qt Linguist Window
+
+    \image linguist-linguist.png "Linguist UI Snapshot"
+
+    This \QL main window is divided into dockable subwindows arranged
+    around a central \l{The Translation Area} {translation area}. The
+    subwindows are: \l{Context Window} {Context}, \l{Sources and Forms
+    Window} {Sources and Forms}, \l{Strings Window} {Strings},
+    \l{Phrases and Guesses Window} {Phrases and guesses}, and
+    \l{Warnings Window} {Warnings} (hidden in the UI snapsot). The
+    translation area is always visible, but the dockable subwindows
+    can be activated or deactivated in the \menu{View|Views} menu, and
+    dragged around by their title bars and dropped in the translation
+    area or even outside the main window.
+
+    \section2 Context Window
+
+    The context window normally appears on the left side of the main
+    window. It lists the contexts in which strings to be translated
+    appear. The column labeled \e{Context} lists the context names in
+    alphabetical order. Each context is the name of a subclass of
+    QObject. There can also be a context for QObject itself, which
+    contains strings passed to the static function QObject::tr().
+    There can also be an \e{<unnamed context>}, which contains strings
+    that aren't in a subclass of QObject.
+
+    To the left of the \e{Context} column is a column labeled
+    \inlineimage linguist-check-obsolete.png  
+    . This column uses the following list of icons to summarize the
+    current translation state for each context:
+
+    \list
+
+    \o \inlineimage linguist-check-on.png 
+    All strings in the context have been translated, and all the
+    translations passed the \l{Validation Tests} {validation tests}.
+
+    \o \inlineimage linguist-check-warning.png 
+    All strings in the context have been translated or marked as
+    translated, but at least one translation failed the \l{Validation
+    Tests} {validation tests}.
+
+    \o \inlineimage linguist-check-off.png
+    At least one string in the context has not been translated or is
+    not marked as translated.
+
+    \o \inlineimage linguist-check-obsolete.png
+    None of the translated strings still appears in the context. This
+    usually means the context itself no longer exists in the
+    application.
+
+    \endlist
+
+    To the right of the \e{Context} column is the \e{Items} column.
+    Each entry in the \e{Items} column is a pair of numbers separated
+    by a slash ("/"). The number to the right of the slash is the
+    number of translatable strings in the context. The number to the
+    left of the slash is the number of those strings that currently
+    have translations. i.e., if the numbers are equal, all the
+    translatable strings in the context have translations.
+
+    In the UI snapshot above, the \bold{MessageEditor} context is
+    selected.  Its \e{Items} entry shows \bold{18/18}, which means it
+    has 18 translatable strings and all 18 strings currently have
+    translations. However, the context has been marked with the
+    \inlineimage linguist-check-warning.png 
+    icon, which means that at least one of the current translations 
+    failed a \l{Validation Tests} {validation test}. In the 
+    \l{Strings Window} {strings window} to the right, we see that one 
+    of the strings is indeed marked with the 
+    \inlineimage linguist-check-warning.png 
+    icon.
+
+    The context window is a dockable window. It can be dragged to
+    another position in the main window, or dragged out of the main
+    window to be a separate window. If you move the context window,
+    \QL remembers the new position and puts the context window there
+    whenever you start the program. If the context window has been 
+    closed, it can be restored by pressing \key{F6}.
+
+    \section2 Strings Window
+
+    The strings window normally appears on the right in the main
+    window, above the \l{The Translation Area} {translation area}. Its
+    \e{Source text} column lists all the translatable strings found in
+    the current context. Selecting a string makes that string the
+    current string in the \l{The Translation Area} {translation area}.
+
+    To the left of the \e{Source text} column is a column labeled
+    \inlineimage linguist-check-obsolete.png
+    . This column is similar to the one in the \l{Context Window}
+    {context window}, but here you can click on the icon to change the
+    translation acceptance state for each string in the list. A tick
+    mark, green or yellow, means the string has been translated and
+    the user has accepted the translation. A question mark means
+    either that the user has not accepted the string's translation or
+    that the string doesn't have a translation. The table below
+    explains the acceptance states and their icons:
+
+    \target String Translation States
+
+    \table
+    \header
+    \o State
+    \o Icon
+    \o Description
+
+    \row
+    \o Accepted/Correct
+    \o \inlineimage linguist-check-on.png
+    \o The source string has a translation (possibly empty); the user
+    has accepted the translation, and the translation passes all the
+    \l{Validation Tests} {validation tests}. If the translation is
+    empty, the user has chosen to leave it empty. Click the icon to 
+    revoke acceptance of the translation and decrement the number of 
+    accepted translations in the \e{Items} column of the \l{Context
+    Window} {context list} by 1. The state is reset to 
+    \inlineimage linguist-check-off.png 
+    if the string has a translation, or to
+    \inlineimage linguist-check-empty.png
+    if the string's translation is empty. If \c{lupdate} changes the 
+    contents of a string, its acceptance state is automatically reset 
+    to \inlineimage linguist-check-off.png 
+    .
+
+    \row
+    \o Accepted/Warnings
+    \o \inlineimage linguist-check-warning.png
+    \o The user has accepted the translation, but the translation does
+    not pass all the \l{Validation Tests} {validation tests}. The
+    validation test failures are shown in the \l{Warnings Window}
+    {warnings window}. Click the icon to revoke acceptance of the 
+    translation. The state is reset to \inlineimage linguist-danger.png 
+    , and the number of accepted translations in the \e{Items} column 
+    of the \l{Context Window} {context list} is decremented by 1. 
+    
+    \row
+    \o Not Accepted
+    \o \inlineimage linguist-check-off.png
+    \o The string has a non-empty translation that passes all the 
+    \l{Validation Tests} {validation tests}, but the user has not yet 
+    accepted the translation. Click the icon or press \key{Ctrl+Enter}
+    to accept the translation. The state is reset to  
+    \inlineimage linguist-check-on.png
+    , and the number of accepted translations in the \e{Items} column 
+    of the \l{Context Window} {context list} is incremented by 1.  
+
+    \row
+    \o No Translation
+    \o \inlineimage linguist-check-empty.png
+    \o The string does not have a translation. Click the icon to 
+    accpet the empty translation anyway. The state is reset to  
+    \inlineimage linguist-check-on.png
+    , and the number of accepted translations in the \e{Items} column 
+    of the \l{Context Window} {context list} is incremented by 1.
+
+    \row
+    \o Validation Failures
+    \o \inlineimage linguist-danger.png
+    \o The string has a translation, but the translation does not 
+    pass all the \l{Validation Tests} {validation tests}. Validation 
+    test failures are shown in the \l{Warnings Window} {warnings} 
+    window. Click on the icon or press \key{Ctrl+Return} to accept 
+    the translation even with validation failures. The state is 
+    reset to  \inlineimage linguist-check-warning.png
+    . We recommended editing the translation to fix the causes of 
+    the validation failures. The state will reset automatically to
+    \inlineimage linguist-check-off.png
+    , when all the failures have been fixed. 
+
+    \row
+    \o Obsolete
+    \o \inlineimage linguist-check-obsolete.png
+    \o The string is obsolete. It is no longer used in the context.
+    See the \l{Qt Linguist Manual: Release Manager} {Release Manager}
+    for instructions on how to remove obsolete messages from the file.
+
+    \endtable
+
+    The string list is a dockable subwindow. If it has been closed,
+    restored it by pressing \key{F7}.
+
+    \section2 The Translation Area
+
+    The translation area is in the middle of the main window, to the
+    right of the \l{Context Window} {context list}. It doesn't have a
+    title bar, so you can't drag it around. Instead, you drag and drop
+    the other subwindows to arrange them around the translation area.
+    The string currently selected in the \l{Strings Window} {string
+    list} appears at the top of the translation area, under the label
+    \menu{Source text}. Note that all blanks in the source text have
+    been replaced by "." so the translator can see the spacing
+    required within the text.
+
+    If the developer provides a \l{QObject::tr()} {disambiguating
+    comment}, it will appear below the source text area, under the
+    label \menu{Developer comments}. 
+
+    Below the source text and optional developer comments are two text
+    entry widgets for the translator, one for entering the translation
+    of the current string, and one for the translator to enter an
+    optional comment to be read by other translators. 
+
+    When \l{Translating Multiple Languages Simultaneously} {multiple
+    languages} are being translated, this sequence of fields is
+    repeated for each language. See aso \l {Changing the Target
+    Locale}.
+
+    \section2 Phrases and Guesses Window
+
+    If the current string in the \l{Strings Window} {string list}
+    appears in one or more of the \l{Phrase Books} {phrase books}
+    that have been loaded, the current string and its phrase book
+    translation(s) will be listed in this window. If the current
+    string is the same as, or similar to, another string that has
+    already been translated, that other string and its translation
+    will also be listed in this window. 
+
+    To use a translation from the Phrases and Guesses Window, you can
+    double click the translation, and it will be copied into the
+    translation area, or you can use the translation's \e{Guess}
+    hotkey on the right. You can also press \key{F10} to move the
+    focus to the Phrases and Guesses Window, then use the up and down
+    arrow keys to find the desired translation, and and then press
+    \key{Enter} to copy it to the translation area.  If you decide
+    that you don't want to copy a phrase after all, press \key{Esc} to
+    return the focus to the translation area.
+
+    The Phrases and Guesses Window is a dockable window. If it has
+    been closed, it can be made visible by pressing the \e{Phrases and
+    guesses} tab at the bottom of the window, or by pressing
+    \key{F10}.
+
+    \section2 Sources and Forms Window
+
+    If the source files containing the translatable strings are
+    available to \QL, this window shows the source context of the
+    current string in the \l{Strings Window} {string list}. The source
+    code line containing the current string should be shown and
+    highlighted. If the file containing the source string is not
+    found, the expected absolute file path is shown.
+
+    If the source context shows the wrong source line, it probably
+    means the translation file is out of sync with the source files.
+    To re-sync the translation file with the source files, see the
+    \l{lupdate manual} {lupdate manual}.
+
+    The Sources and Forms window is a dockable window. If it has been
+    closed, it can be made visible again by pressing the \e{Sources
+    and Forms} tab at the bottom of the window, or by pressing
+    \key{F9}.
+
+    \section2 Warnings Window
+
+    If the translation you enter for the current string fails any of
+    the active \l{Validation Tests} {validation tests}, the failures
+    are listed in the warnings window. The first of these failure
+    messages is also shown in the status bar at the bottom of the main
+    window. Note that only \e{active} validation tests are
+    reported. To see which validation tests are currently active, or
+    to activate or deactivate tests, use the \menu{Validation} menu
+    from the \l{menubar}{menu bar}.
+
+    The Warnings window is a dockable window. If it has been closed,
+    it can be made visible by pressing the \e{Warnings} tab at the
+    bottom of the window, or by pressing \key{F8}.
+
+    \target multiple languages
+    \section2 Translating Multiple Languages Simultaneously
+
+    Qt Linguist can now load and edit multiple translation files
+    simultaneously. One use for this is the case where you know two
+    languages better than you know English (Polish and Japanese, say),
+    and you are given an application's Polish translation file and
+    asked to update the application's Japanese translation file. You
+    are more comfortable translating Polish to Japanese than you are
+    translating English to Japanese. 
+
+    Below is the UI snapshot shown earlier, but this time with both
+    \e{Polish} and \e{Japanese} translation files loaded.
+
+    \image linguist-linguist_2.png 
+
+    The first thing to notice is that the \l{The Translation Area}
+    {translation area} has text editing areas for both Polish and
+    Japanese, and these are color-coded for easier separation.
+    Second, the \l{Context Window} and the \l{Strings Window} both
+    have two clomuns labeled \inlineimage linguist-check-obsolete.png
+    instead of one, and although it may be hard to tell, these columns
+    are also color-coded with the same colors. The left-most column in
+    either case applies to the top-most language area (Polish above)
+    in the \l{The Translation Area} {translation area}, and the
+    right-most column applies to the bottom language area.
+
+    The \e{Items} column in the \l{Context Window} combines the values
+    for both languages. The best way to see this is to look at the
+    value for the \bold{MessageEditor} context, which is the one
+    selected in the snapshot shown above. Recall that in the first UI
+    snapshot (Polish only), the numbers for this context were
+    \e{18/18}, meaning 18 translatable strings had been found in the
+    context, and all 18 strings had accepted translations.  In the UI 
+    snapshot above, the numbers for the \bold{MessageEditor} context
+    are now \e{1/18}, meaning that both languages have 18 translatable
+    strings for that context, but for Japanese, only 1 of the 18
+    strings has an accepted translation. The 
+    \inlineimage linguist-check-off.png 
+    icon in the Japanese column means that at least one string in the
+    context doesn't have an accepted Japanese translation yet. In fact, 
+    17 of the 18 strings don't have accepted Japanese translations yet. 
+    We will see \e{18/18} in the \e{Items} column when all 18 strings 
+    have accepted translations for all the loaded translation files, 
+    e.g., both Polish and Japanese in the snapshot. 
+
+    \section1 Common Tasks
+
+    \section2 Leaving a Translation for Later
+
+    If you wish to leave a translation press \key{Ctrl+L} (Next
+    Unfinished) to move to the next unfinished translation. To move to
+    the next translation (whether finished or unfinished) press
+    \key{Shift+Ctrl+L}. You can also navigate using the Translation
+    menu. If you want to go to a different context entirely, click the
+    context you want to work on in the Context list, then click the
+    source text in the \l{Strings Window} {string list}.
+
+    \section2 Phrases That Require Multiple Translations Depending on Context
+
+    The same phrase may occur in two or more contexts without conflict. Once
+    a phrase has been translated in one context, \QL notes
+    that the translation has been made and when the translator reaches a
+    later occurrence of the same phrase \QL will provide
+    the previous translation as a possible translation candidate in the
+    \l{Phrases and Guesses Window}.
+
+    If a phrase occurs more than once in a particular context it will
+    only be shown once in \QL's \l{Context Window} {context list} and
+    the translation will be applied to every occurrence within the
+    context.  If the same phrase needs to be translated differently
+    within the same context the programmer must provide a
+    distinguishing comment for each of the phrases concerned. If such
+    comments are used the duplicate phrases will appear in the
+    \l{Context Window} {context list}. The programmers comments will
+    appear in the \l{The Translation Area} {translation area} on a
+    light blue background.
+
+    \section2 Changing Keyboard Accelerators
+
+    A keyboard accelerator is a key combination that, when pressed,
+    causes an application to perform an action. There are two kinds of
+    keyboard accelerators: Alt key and Ctrl key accelerators.
+
+    \section3 Alt Key Accellerators
+
+    Alt key accelerators are used in menu selection and on buttons.
+    The underlined character in a menu item or button label signifies
+    that pressing the Alt key with the underlined character will
+    perform the same action as clicking the menu item or pressing the
+    button.  For example, most applications have a \e{File} menu with
+    the "F" in the word "File" underlined. In these applications the
+    \e{File} menu can be invoked either by clicking the word "File" on
+    the menu bar or by pressing \e{Alt+F}. To identify an accelerator
+    key in the translation text ("File") precede it with an ampersand,
+    e.g. \e{\&File}. If a string to be translated has an ampersand in
+    it, then the translation for that string should also have an
+    ampersand in it, preferably in front of the same character. 
+
+    The meaning of an Alt key accelerator can be determined from the
+    phrase in which the ampersand is embedded. The translator can
+    change the character part of the Alt key accelerator, if the
+    translated phrase does not contain the same character or if that
+    character has already been used in the translation of some other
+    Alt key accelerator. Conflicts with other Alt key accelerators
+    must be avoided within a context.  Note that some Alt key
+    accelerators, usually those on the menu bar, may apply in other
+    contexts.
+
+    \section3 Ctrl Key Accelerators
+
+    Ctrl key accelerators can exist independently of any visual
+    control. They are often used to invoke actions in menus that would
+    otherwise require multiple keystrokes or mouse clicks. They may
+    also be used to perform actions that do not appear in any menu or
+    on any button. For example, most applications that have a \e{File}
+    menu have a \e{New} submenu item in the \e{File} menu. The \e{New}
+    item might appear as "\underline{N}ew Ctrl+N" in the \e{File}
+    menu, meaning the \e{New} menu can be invoked by simply pressing
+    \key{Ctrl+N}, instead of either clicking \e{File} with the mouse
+    and then clicking \e{New} with the mouse, or by entering \e{Alt+F}
+    and \e{N}.
+
+    Each Ctrl key accelerator is shown in the \l{Strings Window}
+    {string list} as a separte string, e.g. \key{Ctrl+Enter}. Since
+    the string doesn't have a context to give it meaning, e.g. like
+    the context of the phrase in which an Alt key accelerator appears,
+    the translator must rely on the UI developer to include a
+    \l{QObject::tr()} {disambiguation comment} to explain the action
+    the Ctrl key accelerator is meant to perform. This disambiguating
+    comment (if provided by the developer) will appear under
+    \e{Developer comments} in the \l{The Translation Area}
+    {translation area} under the \e{Source text} area.
+
+    Ideally Ctrl key accelerators are translated simply by copying
+    them directly using \e {Copy from source text} in the
+    \menu{Translation} menu. However, in some cases the character will
+    not make sense in the target language, and it must be
+    changed. Whichever character (alpha or digit) is chosen, the
+    translation must be in the form "Ctrl+" followed by the upper case
+    character.  \e{Qt} will automatically display the correct name at
+    runtime. As with Alt key accelerators, if the translator changes
+    the character, the new character must not conflict with any other
+    Ctrl key accelerator.
+
+    \warning Do not translate the "Alt", "Ctrl" or "Shift" parts of
+    the accelerators. \e{Qt} relies on these strings being there. For
+    supported languages, \e {Qt} automatically translates these
+    strings.
+
+    \section2 Handling Numbered Arguments
+
+    Some phrases contain numbered arguments. A numbered argument is a
+    placeholder that will be replaced with text at runtime. A numbered
+    argument appears in a source string as a percent sign followed by
+    a digit. Consider an example: \c{After processing file %1, file %2
+    is next in line}. In this string to be translated, \c{%1} and
+    \c{%2} are numbered arguments. At runtime, \c{%1} and \c{%2} will
+    be replaced with the first and next file names respectively. The
+    same numbered arguments must appear in the translation, but not
+    necessarily in the same order. A German translation of the string
+    might reverse the phrases, e.g. \c{Datei %2 wird bearbeitet, wenn
+    Datei %1 fertig ist}. Both numbered arguments appear in the
+    translation, but in the reverse order. \c{%i} will always be
+    replaced by the same text in the translation stringss, regardless
+    of where argument \e{i} appears in the argument sequence in the
+    source string.
+
+    \section2 Reusing Translations
+
+    If the translated text is similar to the source text, choose the
+    \e {Copy from source text} entry in the \menu Translation menu (press
+    \key{Ctrl+B}) which will copy the source text into the 
+    \l{The Translation Area} {translation area}.
+
+    \QL automatically lists possible translations from any open
+    \l{Phrase Books} {phrase books} in the \l{Phrases and Guesses
+    Window}, as well as similar or identical phrases that have already
+    been translated.
+
+    \section2 Changing the Target Locale
+
+    \QL displays the target language in the \l{The Translation Area}
+    {translation area}, and adapts the number of input fields for
+    plural forms accordingly. If not explicitly set, \QL guesses the
+    target language and country by evaluating the translation source
+    file name: E.g. \c app_de.ts sets the target language to German,
+    and \c app_de_ch.ts sets the target language to German and the
+    target country to Switzerland (this also helps loading
+    translations for the current locale automatically; see
+    \l{linguist-programmers.html}{Programmers Manual} for details).
+    If your files do not follow this convention, you can also set the
+    locale information explicitly using \e {Translation File Settings}
+    in the \menu Edit menu.
+
+    \image linguist-translationfilesettings.png
+
+    \section1 Phrase Books
+
+    A \QL phrase book is a set of source phrases, target
+    (translated) phrases, and optional definitions. Typically one phrase book
+    will be created per language and family of applications. Phrase books 
+    are used to provide a common set of translations to help ensure consistency. 
+    They can also be used to avoid duplication of effort since the translations 
+    for a family of applications can be produced once in the phrase book.
+    If the translator reaches an untranslated phrase that is the same as a
+    source phrase in a phrase book, \QL will show the
+    phrase book entry in the \l {Phrases and Guesses Window}.
+
+    \section2 Creating and Editing Phrase Books
+
+    \image linguist-phrasebookdialog.png
+
+    Before a phrase book can be edited it must be created or, if it already
+    exists, opened. Create a new phrase book by selecting
+    \menu{Phrase|New Phrase Book} from the menu bar. You must enter a
+    filename and may change the location of the file if you wish. A newly
+    created phrase book is automatically opened. Open an existing phrase
+    book by choosing \menu{Phrase|Open Phrase Book} from the menu bar.
+
+    The phrase book contents can be displayed and changed by selecting
+    \menu{Phrase|Edit Phrase Book}, and then activating the phrase book you
+    want to work on. This will pop up the Phrase Book Dialog as shown
+    in the image above. To add a new phrase click the \gui{New Phrase} 
+    button (or press Alt+N) and type in a new source phrase. Press Tab and 
+    type in the translation. Optionally press Tab and enter a definition -- 
+    this is useful to distinguish different translations of the same source 
+    phrase. This process may be repeated as often as necessary. You can delete 
+    a phrase by selecting it in the phrases list and clicking
+    Remove Phrase. Click the \gui Close button (press Esc) once you've finished 
+    adding (and removing) phrases.
+
+    \section2 Shortcuts for Editing Phrase Books
+
+    You can also create a new phrase book entry directly out of the translation you
+    are working on: Clicking \menu{Phrases|Add to Phrase Book} or pressing
+    \key{Ctrl+T} will add the source text and the content of the first translation 
+    field to the current phrase book. If multiple phrase books are loaded,
+    you have to specify the phrase book to add the entry to in a dialogue.
+    If you detect an error in a phrase book entry that is shown in the 
+    \l{Phrases and Guesses Window}, you can also edit it in place by right 
+    clicking on the entry, and selecting \menu{Edit}. After fixing the error 
+    press \key{Return} to leave the editing mode.
+
+    \section2 Batch Translation
+
+    \image linguist-batchtranslation.png
+
+    Use the batch translation feature of \QL to automatically
+    translate source texts that are also in a phrase book. Selecting
+    \menu{Tools|Batch Translation} will show you the batch translation dialog,
+    which let you configure which phrase books to use in what order during the
+    batch translation process. Furthermore you can set whether only entries 
+    with no present translation should be considered, and whether batch translated
+    entries should be set to finished (see also \l {String Translation States}).
+
+    \section1 Validation Tests
+
+    \QL provides four kinds of validation tests for translations.
+
+    \list 1
+    \o \e {Accelerator validation} detects translated phrases
+    that do not have an ampersand when the source phrase does and vice
+    versa.
+    \o \e {Punctuation validation} detects differences in the
+    terminating punctuation between source and translated phrases when this
+    may be significant, e.g. warns if the source phrase ends with an
+    ellipsis, exclamation mark or question mark, and the translated phrase
+    doesn't and vice versa.
+    \o \e {Phrases validation} detects source phrases that are
+    also in the phrase book but whose translation differs from that given in
+    the phrase book.
+    \o \e {Place marker validation} detects whether the same variables
+    (like \c %1, \c %2) are used both in the source text and in the translation.
+    \endlist
+
+    Validation may be switched on or off from the menu bar's
+    Validation item or using the toolbar buttons. Unfinished phrases
+    that fail validation are marked with an exclamation mark in the
+    source text pane. Finished phrases will get a yellow tick
+    instead. If you switch validation off and then switch it on later,
+    \QL will recheck all phrases and mark any that fail
+    validation. See also \l{String Translation States}.
+
+    \section1 Form Preview
+
+    \image linguist-previewtool.png
+
+    Forms created by \e{Qt Designer} are stored in special \c .ui files. 
+    \QL can make use of these \c .ui files to show the translations
+    done so far on the form itself. This of course requires access to the \c .ui
+    files during the translation process. Activate 
+    \menu{Tools|Open/Refresh Form Preview} to open the window shown above.
+    The list of \c .ui files \QL has detected are displayed in the Forms
+    List on the left hand. If the path to the files has changed, you can load
+    the files manually via \menu{File|Open Form...}. Double-click on an entry
+    in the Forms List to display the Form File. Select \e{<No Translation>} from
+    the toolbar to display the untranslated form.
+
+    \section1 Qt Linguist Reference
+
+
+    \section2 File Types
+
+    \QL makes use of four kinds of files:
+
+    \list
+    \o \c .ts \e {translation source files} \BR are human-readable XML
+    files containing source phrases and their translations. These files are
+    usually created and updated by \l lupdate and are specific to an
+    application.
+    \o \c .xlf \e {XLIFF files} \BR are human-readable XML files that adhere
+    to the international XML Localization Interchange File Format. \QL
+    can be used to edit XLIFF files generated by other programs. For standard
+    Qt projects, however, only the \c .ts file format is used.
+    \o \c .qm \e {Qt message files} \BR are binary files that contain
+    translations used by an application at runtime. These files are
+    generated by \l lrelease, but can also be generated by \QL.
+    \o \c .qph \e {Qt phrase book files} \BR are human-readable XML
+    files containing standard phrases and their translations. These files
+    are created and updated by \QL and may be used by any
+    number of projects and applications.
+    \endlist
+
+    \target menubar
+    \section2 The Menu Bar
+
+    \image linguist-menubar.png
+
+    \list
+    \o \gui {File}
+        \list
+        \o \gui {Open... Ctrl+O} \BR pops up an open file dialog from which a
+        translation source \c .ts or \c .xlf file can be chosen.
+        \o \gui {Recently opened files} \BR shows the \c .ts files that
+        have been opened recently, click one to open it.
+        \o \gui {Save Ctrl+S} \BR saves the current translation source file.
+        \o \gui {Save As...} \BR pops up a save as file dialog so that the
+        current translation source file may be saved with a different
+        name, format and/or put in a different location.
+        \o \gui {Release} \BR create a Qt message \c .qm file with the same base 
+        name as the current translation source file. The release manager's
+        command line tool \l lrelease performs the same function on
+        \e all of an application's translation source files.
+        \o \gui {Release As...} \BR pops up a save as file dialog. The
+        filename entered will be a Qt message \c .qm file of the translation
+        based on the current translation source file. The release manager's
+        command line tool \l lrelease performs the same function on
+        \e all of an application's translation source files.
+        \o \gui {Print... Ctrl+P} \BR pops up a print dialog. If you click
+        OK the translation source and the translations will be printed.
+        \o \gui {Exit Ctrl+Q} \BR closes \QL.
+        \endlist
+
+    \o \gui {Edit}
+        \list
+        \o \gui {Undo Ctrl+Z} \BR undoes the last editing action in the
+        translation pane.
+        \o \gui {Redo Ctrl+Y} \BR redoes the last editing action in the
+        translation pane.
+        \o \gui {Cut Ctrl+X} \BR deletes any highlighted text in the
+        translation pane and saves a copy to the clipboard.
+        \o \gui {Copy Ctrl+C} \BR copies the highlighted text in the
+        translation pane to the clipboard.
+        \o \gui {Paste Ctrl+V} \BR pastes the clipboard text into the
+        translation pane.
+    \omit
+        \o \gui {Delete} \BR deletes the highlighted text in the
+        translation pane.
+    \endomit
+        \o \gui {Select All Ctrl+A} \BR selects all the text in the
+        translation pane ready for copying or deleting.
+        \o \gui {Find... Ctrl+F} \BR pops up the
+        Find dialog. When the dialog pops up
+        enter the text to be found and click the \gui {Find Next} button.
+        Source phrases, translations and comments may be searched.
+        \o \gui {Find Next F3} \BR finds the next occurrence of the text that
+        was last entered in the Find dialog.
+        \o \gui {Search and Translate...} \BR pops up the Search and 
+        Replace Dialog. Use this dialog to translate the same text in multiple items.
+        \o \gui {Translation File Settings...} \BR let you configure the target
+        language and the country/region of a translation source file. 
+        \endlist
+
+    \o \gui {Translation}
+        \list
+        \o \gui {Prev Unfinished Ctrl+K} \BR moves to the nearest previous
+        unfinished source phrase (unfinished means untranslated or
+        translated but failed validation).
+        \o \gui {Next Unfinished Ctrl+L} \BR moves to the next unfinished source
+        phrase.
+        \o \gui {Prev Shift+Ctrl+K} \BR moves to the previous source phrase.
+        \o \gui {Next Shift+Ctrl+L} \BR moves to the next source phrase.
+        \o \gui {Done \& Next Ctrl+Enter} \BR mark this phrase as 'done'
+        (translated) and move to the next unfinished source phrase.
+        \o \gui {Copy from source text Ctrl+B} \BR copies the source text into
+        the translation.
+        \endlist
+
+    \o \gui {Validation} (See \l{Validation Tests})
+        \list
+        \o \gui {Accelerators} \BR toggles validation on or off for Alt
+        accelerators.
+        \o \gui {Ending Punctuation} \BR switches validation on or off
+        for phrase ending punctuation, e.g. ellipsis, exclamation mark,
+        question mark, etc.
+        \o \gui {Phrase Matches} \BR sets validation on or off for
+        matching against translations that are in the current phrase book.
+        \o \gui {Place Marker Matches} \BR sets validation on or off for
+        the use of the same place markers in the source and translation.
+        \endlist
+
+    \o \gui {Phrases} (See the section \l {Phrase Books} for details.)
+        \list
+
+        \o \gui {New Phrase Book... Ctrl+N} \BR pops up a save as file
+        dialog.  You must enter a filename to be used for the phrase
+        book and save the file. Once saved you should open the phrase
+        book to begin using it.
+
+        \o \gui {Open Phrase Book... Ctrl+H} \BR pops up an open file
+        dialog.  Find and choose a phrase book to open.
+
+        \o \gui {Close Phrase Book} \BR displays the list of phrase
+        books currently opened. Clicking on one of the items will
+        close the phrase book. If the phrase book has been modified, a
+        dialog box asks whether \QL should save the changes.
+
+        \o \gui {Edit Phrase Book...} \BR displays the list of phrase
+        books currently opened. Clicking on one of the items will open
+        the \l{Creating and Editing Phrase Books}{Phrase Book Dialog}
+        where you can add, edit or delete phrases.
+
+        \o \gui {Print Phrase Book...} \BR displays the list of phrase
+        books currently opened. Clicking on one of the items pops up a
+        print dialog.  If you click OK the phrase book will be
+        printed.
+
+        \o \gui {Add to Phrase Book Ctrl+T} \BR Adds the source text
+        and translation currently shown in the \l{The Translation
+        Area} {translation area} to a phrase book.  If multiple phrase
+        books are loaded, a dialog box let you specify select one.
+
+        \endlist
+
+  \o \gui {Tools}
+        \list
+
+        \o \gui {Batch Translation...} \BR Opens a \l{Batch
+        Translation}{dialog} which let you automatically insert
+        translations for source texts which are in a phrase book.
+
+        \o \gui {Open/Refresh Form Preview F3} \BR Opens the \l{Form
+        Preview}.  This window let you instantly see translations for
+        forms created with \QD.  \endlist
+
+  \o \gui {View}
+        \list
+
+        \o \gui {Revert Sorting} \BR puts the items in the \l{Context
+        Window} {context list} and in the \l{Strings Window} {string
+        list} into their original order.
+
+        \o \gui {Display Guesses} \BR turns the display of phrases and
+        guesses on or off.
+
+        \o \gui {Statistics} \BR toggles the visibility of the
+        Statistics dialog.
+
+        \o \gui {Views} \BR toggles the visibility of the \l{Context
+        Window}, \l{Strings Window}, \l{Phrases and Guesses Window},
+        \l{Warnings Window}, or \l{Sources and Forms Window}.
+
+        \o \gui {Toolbars} \BR toggles the visibility of the different
+        toolbars.
+
+        \endlist
+
+  \o \gui {Help}
+        \list
+        \o \gui {Manual F1} \BR opens this manual.
+        \o \gui {About Qt Linguist} \BR Shows information about \QL.
+        \o \gui {About Qt} \BR Shows information about \e{Qt}.
+        \o \gui {What's This? Shift+F1} \BR Click on one item in the main window 
+        to get additional information about it.
+        \endlist
+
+    \endlist
+
+    \section2 The Toolbar
+
+    \image linguist-toolbar.png
+
+    \list
+    \o \inlineimage linguist-fileopen.png
+    \BR
+    Pops up the open file dialog to open a new translation source \c .ts
+    file.
+
+    \o \inlineimage linguist-filesave.png
+    \BR
+    Saves the current translation source \c .ts file.
+
+    \o \inlineimage linguist-fileprint.png
+    \BR
+    Prints the current translation source \c .ts file.
+
+    \o \inlineimage linguist-phrasebookopen.png
+    \BR
+    Pops up the file open dialog to open a new phrase book \c .qph file.
+
+    \o \inlineimage linguist-editundo.png
+    \BR
+    Undoes the last editing action in the translation pane.
+
+    \o \inlineimage linguist-editredo.png
+    \BR
+    Redoes the last editing action in the translation pane.
+
+    \o \inlineimage linguist-editcut.png
+    \BR
+    Deletes any highlighted text in the translation pane and save a copy to
+    the clipboard.
+
+    \o \inlineimage linguist-editcopy.png
+    \BR
+    Copies the highlighted text in the translation pane to the clipboard.
+
+    \o \inlineimage linguist-editpaste.png
+    \BR
+    Pastes the clipboard text into the translation pane.
+
+    \o \inlineimage linguist-editfind.png
+    \BR
+    Pops up the Find dialog .
+
+    \o \inlineimage linguist-prev.png
+    \BR
+    Moves to the previous source phrase.
+
+    \o \inlineimage linguist-next.png
+    \BR
+    Moves to the next source phrase.
+
+    \o \inlineimage linguist-prevunfinished.png
+    \BR
+    Moves to the previous unfinished source phrase.
+
+    \o \inlineimage linguist-nextunfinished.png
+    \BR
+    Moves to the next unfinished source phrase.
+
+    \o \inlineimage linguist-doneandnext.png
+    \BR
+    Marks the phrase as 'done' (translated) and move to the next
+    unfinished source phrase.
+
+    \o \inlineimage linguist-validateaccelerators.png
+    \BR
+    Toggles accelerator validation on and off.
+
+    \o \inlineimage linguist-validatepunctuation.png
+    \BR
+    Toggles phrase ending punctuation validation on and off.
+
+    \o \inlineimage linguist-validatephrases.png
+    \BR
+    Toggles phrase book validation on or off.
+
+    \o \inlineimage linguist-validateplacemarkers.png
+    \BR
+    Toggles place marker validation on or off.
+
+    \endlist
+
+*/
+
+/*!
+    \page linguist-programmers.html
+    \title Qt Linguist Manual: Programmers
+
+    \contentspage {Qt Linguist Manual}{Contents}
+    \previouspage Qt Linguist Manual: Translators
+    \nextpage Qt Linguist Manual: TS File Format
+
+    Support for multiple languages is extremely simple in Qt
+    applications, and adds little overhead to the programmer's workload.
+
+    Qt minimizes the performance cost of using translations by
+    translating the phrases for each window as they are created. In most
+    applications the main window is created just once. Dialogs are often
+    created once and then shown and hidden as required. Once the initial
+    translation has taken place there is no further runtime overhead for
+    the translated windows. Only those windows that are created,
+    destroyed and subsequently created will have a translation
+    performance cost.
+
+    Creating applications that can switch language at runtime is possible
+    with Qt, but requires a certain amount of programmer intervention and
+    will of course incur some runtime performance cost.
+
+    \section1 Making the Application Translation-Aware
+
+    Programmers should make their application look for and load the
+    appropriate translation file and mark user-visible text and Ctrl
+    keyboard accelerators as targets for translation.
+
+    Each piece of text that requires translating requires context to help
+    the translator identify where in the program the text occurs. In the
+    case of multiple identical texts that require different translations,
+    the translator also requires some information to disambiguate the
+    source texts. Marking text for translation will automatically cause
+    the class name to be used as basic context information. In some cases
+    the programmer may be required to add additional information to help
+    the translator.
+
+    \section2 Creating Translation Files
+
+    Translation files consist of all the user-visible text and Ctrl key
+    accelerators in an application and translations of that text.
+    Translation files are created as follows:
+
+    \list 1
+    \o Run \l lupdate initially to generate the first set of \c .ts
+    translation source files with all the user-visible text but no
+    translations.
+    \o The \c .ts files are given to the translator who adds translations
+    using \QL. \QL takes care of any changed
+    or deleted source text.
+    \o Run \l lupdate to incorporate any new text added to the
+    application. \l lupdate synchronizes the user-visible text from the
+    application with the translations; it does not destroy any data.
+    \o Steps 2 and 3 are repeated as often as necessary.
+    \o When a release of the application is needed \l lrelease is run to
+    read the \c .ts files and produce the \c .qm files used by the
+    application at runtime.
+    \endlist
+
+    For \l lupdate to work successfully, it must know which translation
+    files to produce. The files are simply listed in the application's \c
+    .pro Qt project file, for example:
+
+    \snippet examples/linguist/arrowpad/arrowpad.pro 1
+
+    If your sources contain genuine non-Latin1 strings, \l lupdate needs
+    to be told about it in the \c .pro file by using, for example,
+    the following line:
+
+    \code
+        CODECFORTR = UTF-8
+    \endcode
+    
+    See the \l lupdate and \l lrelease sections.
+
+    \section2 Loading Translations
+
+    \snippet examples/linguist/hellotr/main.cpp 1
+    \snippet examples/linguist/hellotr/main.cpp 3
+
+    This is how a simple \c main() function of a Qt application begins.
+
+    \snippet examples/linguist/hellotr/main.cpp 1
+    \snippet examples/linguist/hellotr/main.cpp 4
+
+    For a translation-aware application a translator object is created, a
+    translation is loaded and the translator object installed into the
+    application.
+
+    \snippet examples/linguist/arrowpad/main.cpp 0
+    \snippet examples/linguist/arrowpad/main.cpp 1
+
+    For non-Latin1 strings in the sources you will also need for example:
+
+    \code
+            QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
+    \endcode
+
+    In production applications a more flexible approach, for example,
+    loading translations according to locale, might be more appropriate. If
+    the \c .ts files are all named according to a convention such as
+    \e appname_locale, e.g. \c tt2_fr, \c tt2_de etc, then the
+    code above will load the current locale's translation at runtime.
+
+    If there is no translation file for the current locale the application
+    will fall back to using the original source text.
+
+    Note that if you need to programmatically add translations at
+    runtime, you can reimplement QTranslator::translate().
+
+    \section2 Making the Application Translate User-Visible Strings
+
+    User-visible strings are marked as translation targets by wrapping them
+    in a \c tr() call, for example:
+
+    \snippet doc/src/snippets/code/doc_src_linguist-manual.qdoc 6
+
+    would become
+
+    \snippet doc/src/snippets/code/doc_src_linguist-manual.qdoc 7
+
+    All QObject subclasses that use the \c Q_OBJECT macro implement
+    the \c tr() function.
+
+    Although the \c tr() call is normally made directly since it is
+    usually called as a member function of a QObject subclass, in
+    other cases an explicit class name can be supplied, for example:
+
+    \snippet doc/src/snippets/code/doc_src_linguist-manual.qdoc 8
+
+    or
+
+    \snippet doc/src/snippets/code/doc_src_linguist-manual.qdoc 9
+
+    \section2 Distinguishing Identical Strings That Require Different Translations
+
+    The \l lupdate program automatically provides a \e context for every
+    source text. This context is the class name of the class that contains
+    the \c tr() call. This is sufficient in the vast majority of cases.
+    Sometimes however, the translator will need further information to
+    uniquely identify a source text; for example, a dialog that contained
+    two separate frames, each of which contained an "Enabled" option would
+    need each identified because in some languages the translation would
+    differ between the two. This is easily achieved using the
+    two argument form of the \c tr() call, e.g.
+
+    \snippet doc/src/snippets/code/doc_src_linguist-manual.qdoc 10
+
+    and
+
+    \snippet doc/src/snippets/code/doc_src_linguist-manual.qdoc 11
+
+    Ctrl key accelerators are also translatable:
+
+    \snippet examples/linguist/trollprint/mainwindow.cpp 2
+
+    It is strongly recommended that the two argument form of \c tr() is used
+    for Ctrl key accelerators. The second argument is the only clue the
+    translator has as to the function performed by the accelerator.
+
+    \section2 Helping the Translator with Navigation Information
+
+    In large complex applications it may be difficult for the translator to
+    see where a particular source text comes from. This problem can be
+    solved by adding a comment using the keyword \e TRANSLATOR which
+    describes the navigation steps to reach the text in question; e.g.
+
+    \snippet doc/src/snippets/code/doc_src_linguist-manual.qdoc 12
+
+    These comments are particularly useful for widget classes.
+
+    \section2 Handling Plural Forms
+
+    Qt includes a \c tr() overload that will make it very easy to 
+    write "plural-aware" internationalized applications. This overload 
+    has the following signature:
+
+    \snippet doc/src/snippets/code/doc_src_linguist-manual.qdoc 17
+
+    Depending on the value of \c n, the \c tr() function will return a different 
+    translation, with the correct grammatical number for the target language. 
+    Also, any occurrence of \c %n is replaced with \c{n}'s value. For example:
+
+    \snippet doc/src/snippets/code/doc_src_linguist-manual.qdoc 18
+
+    If a French translation is loaded, this will expand to "0 item 
+    remplac\unicode{233}", "1 item remplac\unicode{233}", "2 items 
+    remplac\unicode{233}s", etc., depending on \c{n}'s value. 
+    And if no translation is loaded, the orignal string is used, with \c %n 
+    replaced with count's value (e.g., "6 item(s) replaced").
+
+    To handle plural forms in the native language, you need to load a 
+    translation file for this language, too. \l lupdate has the 
+    \c -pluralonly command line option, which allows the creation of
+    \c .ts files containing only entries with plural forms.
+
+    See the \l{http://doc.trolltech.com/qq/}{Qt Quarterly} Article 
+    \l{http://doc.trolltech.com/qq/qq19-plurals.html}{Plural Forms in Translations}
+    for further details on this issue.
+
+    \section2 Coping With C++ Namespaces
+
+    C++ namespaces and the \c {using namespace} statement can confuse
+    \l lupdate. It will interpret \c MyClass::tr() as meaning just
+    that, not as \c MyNamespace::MyClass::tr(), even if \c MyClass is
+    defined in the \c MyNamespace namespace. Runtime translation of
+    these strings will fail because of that.
+
+    You can work around this limitation by putting a \e TRANSLATOR
+    comment at the beginning of the source files that use \c
+    MyClass::tr():
+
+    \snippet doc/src/snippets/code/doc_src_linguist-manual.qdoc 13
+
+    After the comment, all references to \c MyClass::tr() will be
+    understood as meaning \c MyNamespace::MyClass::tr().
+
+    \section2 Translating Text That is Outside of a QObject Subclass
+
+    \section3 Using QCoreApplication::translate()
+
+    If the quoted text is not in a member function of a QObject subclass,
+    use either the tr() function of an appropriate class, or the
+    QCoreApplication::translate() function directly:
+
+    \snippet doc/src/snippets/code/doc_src_linguist-manual.qdoc 14
+
+    \section3 Using QT_TR_NOOP() and QT_TRANSLATE_NOOP()
+
+    If you need to have translatable text completely outside a function,
+    there are two macros to help: QT_TR_NOOP() and QT_TRANSLATE_NOOP().
+    These macros merely mark the text for extraction by \l{lupdate}.
+    The macros expand to just the text (without the context).
+
+    Example of QT_TR_NOOP():
+    \snippet doc/src/snippets/code/doc_src_linguist-manual.qdoc 15
+
+    Example of QT_TRANSLATE_NOOP():
+    \snippet doc/src/snippets/code/doc_src_linguist-manual.qdoc 16
+
+    \section1 Tutorials
+
+    Three tutorials are presented:
+
+    \list 1
+    \o \l{linguist/hellotr}{Hello tr()} demonstrates the creation of
+        a \l QTranslator object. It also shows the simplest use of
+        the \c tr() function to mark user-visible source text for
+        translation.
+
+    \o \l{linguist/arrowpad}{Arrow Pad} explains how to make the application load the
+       translation file applicable to the current locale. It also shows the
+       use of the two-argument form of \c tr() which provides additional
+       information to the translator.
+
+    \o \l{linguist/trollprint}{Troll Print} explains how
+        identical source texts can be distinguished even when they occur in
+        the same context. This tutorial also discusses how the translation
+        tools help minimize the translator's work when an application is
+        upgraded.
+    \endlist
+
+    These tutorials cover all that you need to know to prepare your Qt
+    applications for translation.
+
+    At the beginning of a project add the translation source files to be
+    used to the project file and add calls to \l lupdate and \l lrelease to
+    the makefile.
+
+    During the project all the programmer must do is wrap any user-visible
+    text in \c tr() calls. They should also use the two argument form for
+    Ctrl key accelerators, or when asked by the translator for the cases
+    where the same text translates into two different forms in the same
+    context. The programmer should also include \c TRANSLATION comments to
+    help the translator navigate the application.
+*/
+
+/*!
+    \page linguist-ts-file-format.html
+    \title Qt Linguist Manual: TS File Format
+
+    \contentspage {Qt Linguist Manual}{Contents}
+    \previouspage Qt Linguist Manual: Programmers
+
+    The \c .ts file format used by \QL is described by the
+    \l{http://www.w3.org/TR/1998/REC-xml-19980210}{DTD} presented below,
+    which we include for your convenience. Be aware that the format
+    may change in future Qt releases.
+
+    \quotefile tools/linguist/shared/ts.dtd
+    
+*/
diff --git a/doc/src/mac-differences.qdoc b/doc/src/mac-differences.qdoc
new file mode 100644
index 0000000000..573e62d394
--- /dev/null
+++ b/doc/src/mac-differences.qdoc
@@ -0,0 +1,339 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page mac-differences.html
+    \title Qt for Mac OS X - Specific Issues
+    \brief A description of issues with Qt that are specific to Mac OS X.
+    \ingroup platform-notes
+
+    This file outlines known issues and possible workarounds when
+    using Qt on Mac OS X. Contact Qt's technical support team if you find
+    additional issues which are not covered here. (See also the
+    document \l{qtmac-as-native.html} {Qt is Mac OS X Native}.)
+
+    \tableofcontents
+
+    \section1 GUI Applications
+
+    Mac OS X handles most applications as "bundles". A bundle is a
+    directory structure that groups related files together (e.g.,
+    widgets.app/). GUI applications in particular must be run from a
+    bundle or by using the open(1), because Mac OS X needs the bundle
+    to dispatch events correctly, as well as for accessing the menu
+    bar.
+
+    If you are using older versions of GDB you must run with the full
+    path to the executable.  Later versions allow you to pass the
+    bundle name on the command line.
+
+    \section1 Painting
+
+    Mac OS X always double buffers the screen so the
+    Qt::WA_PaintOnScreen attribute has no effect. Also it is
+    impossible to paint outside of a paint event so
+    Qt::WA_PaintOutsidePaintEvent has no effect either.
+
+    \section1 Library Support
+
+    \section2 Qt libraries as frameworks
+
+    By default, Qt is built as a set of frameworks. Frameworks is the
+    Mac OS X "preferred" way of distributing libraries. There are
+    definite advantages to using them. See
+    \l{http://developer.apple.com/documentation/MacOSX/Conceptual/BPFrameworks/index.html}
+    {Apple's Framework Programming Guide} for more information.
+
+    In general, this shouldn't be an issue because qmake takes care of
+    the specifics for you. The
+    \l{http://developer.apple.com/documentation/MacOSX/Conceptual/BPFrameworks/index.html}
+    {Framework Programming Guide} discusses issues to keep in mind
+    when choosing frameworks over the more typical, dynamic libraries.
+    However, one point to remember is: \bold {Frameworks always link
+    with "release" versions of libraries}.
+
+    If you actually want to use a \e{debug} version of a Qt framework,
+    you must ensure that your application actually loads that debug
+    version. This is often done by using the DYLD_IMAGE_SUFFIX
+    environment variables, but that way often doesn't work so well.
+    Instead, you can temporarily swap your debug and release versions,
+    which is documented in
+    \l{http://developer.apple.com/technotes/tn2004/tn2124.html#SECJUSTONELIB}
+    {Apple's "Debugging Magic" technical note}.
+
+    If you don't want to use frameworks, simply configure Qt with
+    \c{-no-framework}.
+
+    \section2 Bundle-Based Libraries
+
+    If you want to use some dynamic libraries in your Mac OS X
+    application bundle (the application directory), create a
+    subdirectory named "Frameworks" in the application bundle
+    directory and place your dynamic libraries there. The application
+    will find a dynamic library if it has the install name
+    \e{@executable_path/../Frameworks/libname.dylib}.
+
+    If you use \c qmake and Makefiles, use the \c QMAKE_LFLAGS_SONAME setting:
+
+    \snippet doc/src/snippets/code/doc_src_mac-differences.qdoc 0
+
+    Alternatively, you can modify the install name using the
+    install_name_tool(1) on the command line. See its manpage for more
+    information.
+
+    Note that the \c DYLD_LIBRARY_PATH environment variable will
+    override these settings, and any other default paths, such as a
+    lookup of dynamic libraries inside \c /usr/lib and similar default
+    locations.
+
+    \section2 Combining Libraries
+
+    If you want to build a new dynamic library combining the Qt 4
+    dynamic libraries, you need to introduce the \c{ld -r} flag. Then
+    relocation information is stored in the the output file, so that
+    this file could be the subject of another \c ld run. This is done
+    by setting the \c -r flag in the \c .pro file, and the \c LFLAGS
+    settings.
+
+    \section2 Initialization Order
+
+    dyld(1) calls global static initializers in the order they are
+    linked into your application. If a library links against Qt and
+    references globals in Qt (from global initializers in your own
+    library), be sure to link your application against Qt before
+    linking it against the library.  Otherwise the result will be
+    undefined because Qt's global initializers have not been called
+    yet.
+
+    \section1 Compile-Time Flags
+
+    The follewing flags are helpful when you want to define Mac OS X specific
+    code:
+
+    \list
+
+    \o Q_OS_DARWIN is defined when Qt detects you are on a
+    Darwin-based system (including the Open Source version)
+
+    \o Q_WS_MAC is defined when the Mac OS X GUI is present.
+
+    \o QT_MAC_USE_COCOA is defined when Qt is built to use the Cocoa framework.
+    If it is not present, then Qt is using Carbon.
+
+    \endlist
+
+    A additional flag, Q_OS_MAC, is defined as a convenience whenever
+    Q_OS_DARWIN is defined.
+
+    If you want to define code for specific versions of Mac OS X, use
+    the availability macros defined in /usr/include/AvailabilityMacros.h.
+
+    See QSysInfo for information on runtime version checking.
+
+    \section1 Mac OS X Native API Access
+
+    \section2 Accessing the Bundle Path
+
+    The Mac OS X application is actually a directory (ending with \c
+    .app).  This directory contains sub-directories and files. It may
+    be useful to place items (e.g. plugins, online-documentation,
+    etc.) inside this bundle. You might then want to find out where
+    the bundle resides on the disk. The following code returns the
+    path of the application bundle:
+
+    \snippet doc/src/snippets/code/doc_src_mac-differences.qdoc 1
+
+    Note: When OS X is set to use Japanese, a bug causes this sequence
+    to fail and return an empty string. Therefore, always test the
+    returned string.
+
+    For more information about using the CFBundle API, see
+    \l{http://developer.apple.com/documentation/CoreFoundation/Reference/CFBundleRef/index.html}
+    {Apple's Developer Website}.
+
+    \section2 Translating the Application Menu and Native Dialogs
+
+    The items in the Application Menu will be merged correctly for
+    your localized application, but they will not show up translated
+    until you 
+    \l{http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFBundles/Concepts/BundleAnatomy.html#//apple_ref/doc/uid/20001119-105003-BAJFDAAG}
+    {add a localized resource folder} to the application bundle.
+    The main thing you need to do is create a file called
+    locversion.plist.  Here is an example for Norwegian:
+
+    \snippet doc/src/snippets/code/doc_src_mac-differences.qdoc 2
+
+    Now when you run the application with your preferred language set
+    to Norwegian, you should see menu items like "Avslutt" instead of
+    "Quit".
+
+    \section1 User Interface
+
+    \section2 Right-Mouse Clicks
+
+    If you want to provide right-mouse click support for Mac OS X, use
+    the QContextMenuEvent class. This will map to a context menu
+    event, i.e., a menu that will display a pop-up selection. This is
+    the most common use of right-mouse clicks, and maps to a
+    control-click with the Mac OS X one-button mouse support.
+
+    \section2 Menu Bar
+
+    Qt will automatically detect your menu bars for you and turn
+    them into Mac native menu bars. Fitting this into your existing Qt
+    application will normally be automatic. However, if you have
+    special needs, the Qt implementation currently selects a menu
+    bar by starting at the active window
+    (i.e. QApplication::activeWindow()) and applying the following
+    tests:
+
+    \list 1
+
+    \i If the window has a QMenuBar, then it is used.
+
+    \i If the window is modal, then its menu bar is used. If no menu
+       bar is specified, then a default menu bar is used (as
+       documented below).
+
+    \i If the window has no parent, then the default menu bar is used
+       (as documented below).
+
+    \endlist
+
+    These tests are followed all the way up the parent window chain
+    until one of the above rules is satisifed. If all else fails, a
+    default menu bar will be created. Note the default menu bar on
+    Qt is an empty menu bar. However, you can create a different
+    default menu bar by creating a parentless QMenuBar. The first one
+    created will be designated the default menu bar and will be used
+    whenever a default menu bar is needed.
+
+    Note that using native menu bars introduces certain limitations on
+    Qt classes.  See the \l{#Limitations}{list of limitations} below
+    for more information about these.
+
+    \section2 Special Keys
+
+    To provide the expected behavior for Qt applications on Mac OS X,
+    the Qt::Meta, Qt::MetaModifier, and Qt::META enum values
+    correspond to the Control keys on the standard Macintosh keyboard,
+    and the Qt::Control, Qt::ControlModifier, and Qt::CTRL enum values
+    correspond to the Command keys.
+
+    \section1 Limitations
+
+    \section2 Menu Actions
+
+    \list
+
+    \o Actions in a QMenu with accelerators that have more than one
+       keystroke (QKeySequence) will not display correctly, when the
+       QMenu is translated into a Mac native menu bar. The first key
+       will be displayed. However, the shortcut will still be
+       activated as on all other platforms.
+
+    \o QMenu objects used in the native menu bar are not able to
+       handle Qt events via the normal event handlers.
+       For Carbon, you will have to install a Carbon event handler on
+       the menu bar in order to receive Carbon events that are similar
+       to \l{QMenu::}{showEvent()}, \l{QMenu::}{hideEvent()}, and
+       \l{QMenu::}{mouseMoveEvent()}. For Cocoa, you will have to
+       install a delegate on the menu itself to be notified of these
+       changes. Alternatively, consider using the QMenu::aboutToShow()
+       and QMenu::aboutToHide() signals to keep track of menu visibility;
+       these provide a solution that should work on all platforms
+       supported by Qt.
+
+    \endlist
+
+    \section2 Native Widgets
+
+    Qt has support for sheets and drawers, represented in the
+    window flags by Qt::Sheet and Qt::Drawer respectiviely. Brushed
+    metal windows can also be created by using the
+    Qt::WA_MacMetalStyle window attribute.
+
+*/
+
+/*!
+    \page qt-mac-cocoa-licensing.html
+
+    \title Contributions to the Following QtGui Files: qapplication_cocoa_p.h, qapplication_mac.mm, qdesktopwidget_mac.mm qeventdispatcher_mac.mm qeventdispatcher_mac_p.h qmacincludes_mac.h qt_cocoa_helpers.mm qt_cocoa_helpers_p.h qwidget_mac.mm qsystemtrayicon_mac.mm
+
+    \contentspage {Other Licenses Used in Qt}{Contents}
+
+    \ingroup licensing
+    \brief License information for contributions by Apple, Inc. to specific parts of the Qt/Mac Cocoa port.
+
+    \legalese
+
+    Copyright (C) 2007-2008, Apple, Inc.
+
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    \list
+    \o Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+    \o Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation
+       and/or other materials provided with the distribution.
+    \o Neither the name of Apple, Inc. nor the names of its contributors
+       may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+    \endlist
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+    \endlegalese
+*/
diff --git a/doc/src/mainclasses.qdoc b/doc/src/mainclasses.qdoc
new file mode 100644
index 0000000000..da041fa9c4
--- /dev/null
+++ b/doc/src/mainclasses.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page mainclasses.html
+    \title Qt's Main Classes
+    \ingroup classlists
+
+    These are the most frequently used Qt classes. For the complete
+    list see \link classes.html Qt's Classes \endlink.
+
+    \generatelist mainclasses
+*/
diff --git a/doc/src/metaobjects.qdoc b/doc/src/metaobjects.qdoc
new file mode 100644
index 0000000000..4c91a908cf
--- /dev/null
+++ b/doc/src/metaobjects.qdoc
@@ -0,0 +1,149 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page metaobjects.html
+    \title Meta-Object System
+    \brief An overview of Qt's meta-object system and introspection capabilities.
+    \ingroup architecture
+    \keyword meta-object
+
+    Qt's meta-object system provides the signals and slots mechanism for
+    inter-object communication, run-time type information, and the dynamic
+    property system.
+
+    The meta-object system is based on three things:
+
+    \list 1
+    \o The \l QObject class provides a base class for objects that can
+       take advantage of the meta-object system.
+    \o The Q_OBJECT macro inside the private section of the class
+       declaration is used to enable meta-object features, such as
+       dynamic properties, signals, and slots.
+    \o The \l{moc}{Meta-Object Compiler} (\c moc) supplies each
+       QObject subclass with the necessary code to implement
+       meta-object features.
+    \endlist
+
+    The \c moc tool reads a C++ source file. If it finds one or more
+    class declarations that contain the Q_OBJECT macro, it
+    produces another C++ source file which contains the meta-object
+    code for each of those classes. This generated source file is
+    either \c{#include}'d into the class's source file or, more
+    usually, compiled and linked with the class's implementation.
+
+    In addition to providing the \l{signals and slots} mechanism for
+    communication between objects (the main reason for introducing
+    the system), the meta-object code provides the following
+    additional features:
+
+    \list
+    \o QObject::metaObject() returns the associated
+       \l{QMetaObject}{meta-object} for the class.
+    \o QMetaObject::className() returns the class name as a
+       string at run-time, without requiring native run-time type information
+       (RTTI) support through the C++ compiler.
+    \o QObject::inherits() function returns whether an object is an
+       instance of a class that inherits a specified class within the
+       QObject inheritance tree.
+    \o QObject::tr() and QObject::trUtf8() translate strings for
+       \l{Internationalization with Qt}{internationalization}.
+    \o QObject::setProperty() and QObject::property()
+       dynamically set and get properties by name.
+    \o QMetaObject::newInstance() constructs a new instance of the class.
+    \endlist
+
+    \target qobjectcast
+    It is also possible to perform dynamic casts using qobject_cast()
+    on QObject classes. The qobject_cast() function behaves similarly
+    to the standard C++ \c dynamic_cast(), with the advantages
+    that it doesn't require RTTI support and it works across dynamic
+    library boundaries. It attempts to cast its argument to the pointer
+    type specified in angle-brackets, returning a non-zero pointer if the
+    object is of the correct type (determined at run-time), or 0
+    if the object's type is incompatible.
+
+    For example, let's assume \c MyWidget inherits from QWidget and
+    is declared with the Q_OBJECT macro:
+
+    \snippet doc/src/snippets/qtcast/qtcast.cpp 0
+
+    The \c obj variable, of type \c{QObject *}, actually refers to a
+    \c MyWidget object, so we can cast it appropriately:
+
+    \snippet doc/src/snippets/qtcast/qtcast.cpp 1
+
+    The cast from QObject to QWidget is successful, because the
+    object is actually a \c MyWidget, which is a subclass of QWidget.
+    Since we know that \c obj is a \c MyWidget, we can also cast it to
+    \c{MyWidget *}:
+
+    \snippet doc/src/snippets/qtcast/qtcast.cpp 2
+
+    The cast to \c MyWidget is successful because qobject_cast()
+    makes no distinction between built-in Qt types and custom types.
+
+    \snippet doc/src/snippets/qtcast/qtcast.cpp 3
+    \snippet doc/src/snippets/qtcast/qtcast.cpp 4
+
+    The cast to QLabel, on the other hand, fails. The pointer is then
+    set to 0. This makes it possible to handle objects of different
+    types differently at run-time, based on the type:
+
+    \snippet doc/src/snippets/qtcast/qtcast.cpp 5
+    \snippet doc/src/snippets/qtcast/qtcast.cpp 6
+
+    While it is possible to use QObject as a base class without the
+    Q_OBJECT macro and without meta-object code, neither signals
+    and slots nor the other features described here will be available
+    if the Q_OBJECT macro is not used. From the meta-object
+    system's point of view, a QObject subclass without meta code is
+    equivalent to its closest ancestor with meta-object code. This
+    means for example, that QMetaObject::className() will not return
+    the actual name of your class, but the class name of this
+    ancestor.
+
+    Therefore, we strongly recommend that all subclasses of QObject
+    use the Q_OBJECT macro regardless of whether or not they
+    actually use signals, slots, and properties.
+
+    \sa QMetaObject, {Qt's Property System}, {Signals and Slots}
+*/
diff --git a/doc/src/moc.qdoc b/doc/src/moc.qdoc
new file mode 100644
index 0000000000..b7283c4db9
--- /dev/null
+++ b/doc/src/moc.qdoc
@@ -0,0 +1,336 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page moc.html
+    \title Using the Meta-Object Compiler (moc)
+    \ingroup buildsystem
+    \ingroup qttools
+    \keyword moc
+
+    The Meta-Object Compiler, \c moc, is the program that handles
+    \l{Meta-Object System}{Qt's C++ extensions}.
+
+    The \c moc tool reads a C++ header file. If it finds one or more
+    class declarations that contain the Q_OBJECT macro, it
+    produces a C++ source file containing the meta-object code for
+    those classes. Among other things, meta-object code is required
+    for the signals and slots mechanism, the run-time type information,
+    and the dynamic property system.
+
+    The C++ source file generated by \c moc must be compiled and
+    linked with the implementation of the class.
+
+    If you use \l qmake to create your makefiles, build rules will be
+    included that call the moc when required, so you will not need to
+    use the moc directly. For more background information on \c moc,
+    see \l{Why Doesn't Qt Use Templates for Signals and Slots?}
+
+    \section1 Usage
+
+    \c moc is typically used with an input file containing class
+    declarations like this:
+
+    \snippet doc/src/snippets/moc/myclass1.h 0
+
+    In addition to the signals and slots shown above, \c moc also
+    implements object properties as in the next example. The
+    Q_PROPERTY() macro declares an object property, while
+    Q_ENUMS() declares a list of enumeration types within the class
+    to be usable inside the \l{Qt's Property System}{property
+    system}.
+
+    In the following example, we declare a property of the
+    enumeration type \c Priority that is also called \c priority and
+    has a get function \c priority() and a set function \c
+    setPriority().
+
+    \snippet doc/src/snippets/moc/myclass2.h 0
+
+    The Q_FLAGS() macro declares enums that are to be used
+    as flags, i.e. OR'd together. Another macro, Q_CLASSINFO(),
+    allows you to attach additional name/value pairs to the class's
+    meta-object:
+
+    \snippet doc/src/snippets/moc/myclass3.h 0
+
+    The output produced by \c moc must be compiled and linked, just
+    like the other C++ code in your program; otherwise, the build
+    will fail in the final link phase. If you use \c qmake, this is
+    done automatically. Whenever \c qmake is run, it parses the
+    project's header files and generates make rules to invoke \c moc
+    for those files that contain a Q_OBJECT macro.
+
+    If the class declaration is found in the file \c myclass.h, the
+    moc output should be put in a file called \c moc_myclass.cpp.
+    This file should then be compiled as usual, resulting in an
+    object file, e.g., \c moc_myclass.obj on Windows. This object
+    should then be included in the list of object files that are
+    linked together in the final building phase of the program.
+
+    \section1 Writing Make Rules for Invoking \c moc
+
+    For anything but the simplest test programs, it is recommended
+    that you automate running the \c{moc}. By adding some rules to
+    your program's makefile, \c make can take care of running moc
+    when necessary and handling the moc output.
+
+    We recommend using the \l qmake makefile generation tool for
+    building your makefiles. This tool generates a makefile that does
+    all the necessary \c moc handling.
+
+    If you want to create your makefiles yourself, here are some tips
+    on how to include moc handling.
+
+    For Q_OBJECT class declarations in header files, here is a
+    useful makefile rule if you only use GNU make:
+
+    \snippet doc/src/snippets/code/doc_src_moc.qdoc 0
+
+    If you want to write portably, you can use individual rules of
+    the following form:
+
+    \snippet doc/src/snippets/code/doc_src_moc.qdoc 1
+
+    You must also remember to add \c moc_foo.cpp to your \c SOURCES
+    (substitute your favorite name) variable and \c moc_foo.o or \c
+    moc_foo.obj to your \c OBJECTS variable.
+
+    Both examples assume that \c $(DEFINES) and \c $(INCPATH) expand
+    to the define and include path options that are passed to the C++
+    compiler. These are required by \c moc to preprocess the source
+    files.
+
+    While we prefer to name our C++ source files \c .cpp, you can use
+    any other extension, such as \c .C, \c .cc, \c .CC, \c .cxx, and
+    \c .c++, if you prefer.
+
+    For Q_OBJECT class declarations in implementation (\c .cpp)
+    files, we suggest a makefile rule like this:
+
+    \snippet doc/src/snippets/code/doc_src_moc.qdoc 2
+
+    This guarantees that make will run the moc before it compiles
+    \c foo.cpp. You can then put
+
+    \snippet doc/src/snippets/code/doc_src_moc.qdoc 3
+
+    at the end of \c foo.cpp, where all the classes declared in that
+    file are fully known.
+
+    \section1 Command-Line Options
+
+    Here are the command-line options supported by the moc:
+
+    \table
+    \header \o Option \o Description
+
+    \row
+    \o \c{-o<file>}
+    \o Write output to \c <file> rather than to standard output.
+
+    \row
+    \o \c{-f[<file>]}
+    \o Force the generation of an \c #include statement in the
+    output. This is the default for header files whose extension
+    starts with \c H or \c h. This option is useful if you have
+    header files that do not follow the standard naming conventions.
+    The \c <file> part is optional.
+
+    \row
+    \o \c -i
+    \o Do not generate an \c #include statement in the output.
+    This may be used to run the moc on on a C++ file containing one or
+    more class declarations. You should then \c #include the meta-object
+    code in the \c .cpp file.
+
+    \row
+    \o \c -nw
+    \o Do not generate any warnings. (Not recommended.)
+
+    \row
+    \o \c {-p<path>}
+    \o Makes the moc prepend \c {<path>/} to the file name in the
+    generated \c #include statement.
+
+    \row
+    \o \c {-I<dir>}
+    \o Add dir to the include path for header files.
+
+    \row
+    \o \c{-E}
+    \o Preprocess only; do not generate meta-object code.
+
+    \row
+    \o \c {-D<macro>[=<def>]}
+    \o Define macro, with optional definition.
+
+    \row
+    \o \c{-U<macro>}
+    \o Undefine macro.
+
+    \row
+    \o \c{@<file>}
+    \o Read additional command-line options from \c{<file>}.
+    Each line of the file is treated as a single option. Empty lines
+    are ignored. Note that this option is not supported within the
+    options file itself (i.e. an options file can't "include" another
+    file).
+
+    \row
+    \o \c{-h}
+    \o Display the usage and the list of options.
+
+    \row
+    \o \c {-v}
+    \o Display \c{moc}'s version number.
+
+    \row
+    \o \c{-Fdir}
+    
+    \o Mac OS X. Add the framework directory \c{dir} to the head of
+       the list of directories to be searched for header files. These
+       directories are interleaved with those specified by -I options
+       and are scanned in a left-to-right order (see the manpage for
+       gcc). Normally, use -F /Library/Frameworks/
+
+    \endtable
+
+    You can explicitly tell the moc not to parse parts of a header
+    file. \c moc defines the preprocessor symbol \c Q_MOC_RUN. Any
+    code surrounded by
+
+    \snippet doc/src/snippets/code/doc_src_moc.qdoc 4
+
+    is skipped by the \c moc.
+
+    \section1 Diagnostics
+
+    \c moc will warn you about a number of dangerous or illegal
+    constructs in the Q_OBJECT class declarations.
+
+    If you get linkage errors in the final building phase of your
+    program, saying that \c YourClass::className() is undefined or
+    that \c YourClass lacks a vtable, something has been done wrong.
+    Most often, you have forgotten to compile or \c #include the
+    moc-generated C++ code, or (in the former case) include that
+    object file in the link command. If you use \c qmake, try
+    rerunning it to update your makefile. This should do the trick.
+
+    \section1 Limitations
+
+    \c moc does not handle all of C++. The main problem is that class
+    templates cannot have signals or slots. Here is an example:
+
+    \snippet doc/src/snippets/code/doc_src_moc.qdoc 5
+
+    Another limitation is that moc does not expand macros, so you
+    for example cannot use a macro to declare a signal/slot
+    or use one to define a base class for a QObject.
+
+    Less importantly, the following constructs are illegal. All of
+    them have alternatives which we think are usually better, so
+    removing these limitations is not a high priority for us.
+
+    \section2 Multiple Inheritance Requires QObject to Be First
+
+    If you are using multiple inheritance, \c moc assumes that the
+    first inherited class is a subclass of QObject. Also, be sure
+    that only the first inherited class is a QObject.
+
+    \snippet doc/src/snippets/code/doc_src_moc.qdoc 6
+
+    Virtual inheritance with QObject is \e not supported.
+
+    \section2 Function Pointers Cannot Be Signal or Slot Parameters
+
+    In most cases where you would consider using function pointers as
+    signal or slot parameters, we think inheritance is a better
+    alternative. Here is an example of illegal syntax:
+
+    \snippet doc/src/snippets/code/doc_src_moc.qdoc 7
+
+    You can work around this restriction like this:
+
+    \snippet doc/src/snippets/code/doc_src_moc.qdoc 8
+
+    It may sometimes be even better to replace the function pointer
+    with inheritance and virtual functions.
+
+    \section2 Enums and Typedefs Must Be Fully Qualified for Signal and Slot Parameters
+
+    When checking the signatures of its arguments, QObject::connect()
+    compares the data types literally. Thus,
+    \l{Qt::Alignment}{Alignment} and \l{Qt::Alignment} are treated as
+    two distinct types. To work around this limitation, make sure to
+    fully qualify the data types when declaring signals and slots,
+    and when establishing connections. For example:
+
+    \snippet doc/src/snippets/code/doc_src_moc.qdoc 9
+
+    \section2 Type Macros Cannot Be Used for Signal and Slot Parameters
+
+    Since \c moc doesn't expand \c{#define}s, type macros that take
+    an argument will not work in signals and slots. Here is an
+    illegal example:
+
+    \snippet doc/src/snippets/code/doc_src_moc.qdoc 10
+
+    A macro without parameters will work.
+
+    \section2 Nested Classes Cannot Have Signals or Slots
+
+    Here's an example of the offending construct:
+
+    \snippet doc/src/snippets/code/doc_src_moc.qdoc 11
+
+    \section2 Signal/Slot return types cannot be references
+
+    Signals and slots can have return types, but signals or slots returning references
+    will be treated as returning void.
+
+    \section2 Only Signals and Slots May Appear in the \c signals and \c slots Sections of a Class
+
+    \c moc will complain if you try to put other constructs in the \c
+    signals or \c slots sections of a class than signals and slots.
+
+    \sa {Meta-Object System}, {Signals and Slots}, {Qt's Property System}
+*/
diff --git a/doc/src/model-view-programming.qdoc b/doc/src/model-view-programming.qdoc
new file mode 100644
index 0000000000..bf0c1c8685
--- /dev/null
+++ b/doc/src/model-view-programming.qdoc
@@ -0,0 +1,2447 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page model-view-programming.html
+    \nextpage An Introduction to Model/View Programming
+    \startpage index.html Qt Reference Documentation
+
+    \title Model/View Programming
+    \ingroup architecture
+    \brief A guide to the extensible model/view architecture used by Qt's
+    item view classes.
+
+    \list
+    \o \l{An Introduction to Model/View Programming}
+      \tableofcontents{1 An Introduction to Model/View Programming}
+    \o \l{Using Models and Views}
+      \tableofcontents{1 Using Models and Views}
+    \o \l{Model Classes}
+      \tableofcontents{1 Model Classes}
+    \o \l{Creating New Models}
+      \tableofcontents{1 Creating New Models}
+    \o \l{View Classes}
+      \tableofcontents{1 View Classes}
+    \o \l{Handling Selections in Item Views}
+      \tableofcontents{1 Handling Selections in Item Views}
+    \o \l{Delegate Classes}
+      \tableofcontents{1 Delegate Classes}
+    \o \l{Item View Convenience Classes}
+      \tableofcontents{1 Item View Convenience Classes}
+    \o \l{Using Drag and Drop with Item Views}
+      \tableofcontents{1 Using Drag and Drop with Item Views}
+    \o \l{Proxy Models}
+      \tableofcontents{1 Proxy Models}
+    \o \l{Model Subclassing Reference}
+      \tableofcontents{1 Model Subclassing Reference}
+    \endlist
+
+    See also the list of \l{Model/View Classes}.
+
+    \section1 Related Examples
+
+    \list
+    \o \l{itemviews/dirview}{Dir View}
+    \o \l{itemviews/spinboxdelegate}{Spin Box Delegate}
+    \o \l{itemviews/pixelator}{Pixelator}
+    \o \l{itemviews/simpletreemodel}{Simple Tree Model}
+    \o \l{itemviews/chart}{Chart}
+    \endlist
+*/
+
+/*!
+    \page model-view-introduction.html
+    \previouspage Model/View Programming
+    \nextpage Using Models and Views
+    \startpage index.html Qt Reference Documentation
+
+    \title An Introduction to Model/View Programming
+
+    \tableofcontents
+
+    Qt 4 introduces a new set of item view classes that use a model/view
+    architecture to manage the relationship between data and the way it
+    is presented to the user. The separation of functionality introduced by
+    this architecture gives developers greater flexibility to customize the
+    presentation of items, and provides a standard model interface to allow
+    a wide range of data sources to be used with existing item views.
+    In this document, we give a brief introduction to the model/view paradigm,
+    outline the concepts involved, and describe the architecture of the item
+    view system. Each of the components in the architecture is explained,
+    and examples are given that show how to use the classes provided.
+
+    \section1 The Model/View Architecture
+
+    Model-View-Controller (MVC) is a design pattern originating from
+    Smalltalk that is often used when building user interfaces.
+    In \l{Design Patterns}, Gamma et al. write:
+
+    \quotation
+    MVC consists of three kinds of objects. The Model is the application
+    object, the View is its screen presentation, and the Controller defines
+    the way the user interface reacts to user input. Before MVC, user
+    interface designs tended to lump these objects together. MVC decouples
+    them to increase flexibility and reuse.
+    \endquotation
+
+    If the view and the controller objects are combined, the result is
+    the model/view architecture. This still separates the way that data
+    is stored from the way that it is presented to the user, but provides
+    a simpler framework based on the same principles. This separation
+    makes it possible to display the same data in several different views,
+    and to implement new types of views, without changing the underlying
+    data structures.
+    To allow flexible handling of user input, we introduce the concept of
+    the \e delegate. The advantage of having a delegate in this framework
+    is that it allows the way items of data are rendered and edited to be
+    customized.
+
+    \table
+    \row \i \inlineimage modelview-overview.png
+    \i \bold{The model/view architecture}
+
+    The model communicates with a source of data, providing an \e interface
+    for the other components in the architecture. The nature of the
+    communication depends on the type of data source, and the way the model
+    is implemented.
+
+    The view obtains \e{model indexes} from the model; these are references
+    to items of data. By supplying model indexes to the model, the view can
+    retrieve items of data from the data source.
+
+    In standard views, a \e delegate renders the items of data. When an item
+    is edited, the delegate communicates with the model directly using
+    model indexes.
+    \endtable
+
+    Generally, the model/view classes can be separated into the three groups
+    described above: models, views, and delegates. Each of these components
+    is defined by \e abstract classes that provide common interfaces and,
+    in some cases, default implementations of features.
+    Abstract classes are meant to be subclassed in order to provide the full
+    set of functionality expected by other components; this also allows
+    specialized components to be written.
+
+    Models, views, and delegates communicate with each other using \e{signals
+    and slots}:
+
+    \list
+    \o Signals from the model inform the view about changes to the data
+       held by the data source.
+    \o Signals from the view provide information about the user's interaction
+       with the items being displayed.
+    \o Signals from the delegate are used during editing to tell the
+       model and view about the state of the editor.
+    \endlist
+
+    \section2 Models
+
+    All item models are based on the QAbstractItemModel class. This class
+    defines an interface that is used by views and delegates to access data.
+    The data itself does not have to be stored in the model; it can be held
+    in a data structure or repository provided by a separate class, a file,
+    a database, or some other application component.
+
+    The basic concepts surrounding models are presented in the section
+    on \l{Model Classes}.
+
+    QAbstractItemModel
+    provides an interface to data that is flexible enough to handle views
+    that represent data in the form of tables, lists, and trees. However,
+    when implementing new models for list and table-like data structures,
+    the QAbstractListModel and QAbstractTableModel classes are better
+    starting points because they provide appropriate default implementations
+    of common functions. Each of these classes can be subclassed to provide
+    models that support specialized kinds of lists and tables.
+
+    The process of subclassing models is discussed in the section on
+    \l{Creating New Models}.
+
+    Qt provides some ready-made models that can be used to handle items of
+    data:
+
+    \list
+    \o QStringListModel is used to store a simple list of QString items.
+    \o QStandardItemModel manages more complex tree structures of items, each
+       of which can contain arbitrary data.
+    \o QDirModel provides information about files and directories in the local
+       filing system.
+    \o QSqlQueryModel, QSqlTableModel, and QSqlRelationalTableModel are used
+       to access databases using model/view conventions.
+    \endlist
+
+    If these standard models do not meet your requirements, you can subclass
+    QAbstractItemModel, QAbstractListModel, or QAbstractTableModel to create
+    your own custom models.
+
+    \section2 Views
+
+    Complete implementations are provided for different kinds of
+    views: QListView displays a list of items, QTableView displays data
+    from a model in a table, and QTreeView shows model items of data in a
+    hierarchical list. Each of these classes is based on the
+    QAbstractItemView abstract base class. Although these classes are
+    ready-to-use implementations, they can also be subclassed to provide
+    customized views.
+
+    The available views are examined in the section on \l{View Classes}.
+
+    \section2 Delegates
+
+    QAbstractItemDelegate is the abstract base class for delegates in the
+    model/view framework. Since Qt 4.4, the default delegate implementation is
+    provided by QStyledItemDelegate, and this is used as the default delegate
+    by Qt's standard views. However, QStyledItemDelegate and QItemDelegate are
+    independent alternatives to painting and providing editors for items in
+    views. The difference between them is that QStyledItemDelegate uses the
+    current style to paint its items. We therefore recommend using
+    QStyledItemDelegate as the base class when implementing custom delegates or
+    when working with Qt style sheets.
+
+    Delegates are described in the section on \l{Delegate Classes}.
+
+    \section2 Sorting
+
+    There are two ways of approaching sorting in the model/view
+    architecture; which approach to choose depends on your underlying
+    model.
+
+    If your model is sortable, i.e, if it reimplements the
+    QAbstractItemModel::sort() function, both QTableView and QTreeView
+    provide an API that allows you to sort your model data
+    programmatically. In addition, you can enable interactive sorting
+    (i.e. allowing the users to sort the data by clicking the view's
+    headers), by connecting the QHeaderView::sectionClicked() signal
+    to the QTableView::sortByColumn() slot or the
+    QTreeView::sortByColumn() slot, respectively.
+
+    The alternative approach, if your model do not have the required
+    interface or if you want to use a list view to present your data,
+    is to use a proxy model to transform the structure of your model
+    before presenting the data in the view. This is covered in detail
+    in the section on \l {Proxy Models}.
+
+    \section2 Convenience Classes
+
+    A number of \e convenience classes are derived from the standard view
+    classes for the benefit of applications that rely on Qt's item-based
+    item view and table classes. They are not intended to be subclassed,
+    but simply exist to provide a familiar interface to the equivalent classes
+    in Qt 3.
+    Examples of such classes include \l QListWidget, \l QTreeWidget, and
+    \l QTableWidget; these provide similar behavior to the \c QListBox,
+    \c QListView, and \c QTable classes in Qt 3.
+
+    These classes are less flexible than the view classes, and cannot be
+    used with arbitrary models. We recommend that you use a model/view
+    approach to handling data in item views unless you strongly need an
+    item-based set of classes.
+
+    If you wish to take advantage of the features provided by the model/view
+    approach while still using an item-based interface, consider using view
+    classes, such as QListView, QTableView, and QTreeView with
+    QStandardItemModel.
+
+    \section1 The Model/View Components
+
+    The following sections describe the way in which the model/view pattern
+    is used in Qt. Each section provides an example of use, and is followed
+    by a section showing how you can create new components.
+*/
+
+/*!
+    \page model-view-using.html
+    \contentspage model-view-programming.html Contents
+    \previouspage An Introduction to Model/View Programming
+    \nextpage Model Classes
+
+    \title Using Models and Views
+
+    \tableofcontents
+
+    \section1 Introduction
+
+    Two of the standard models provided by Qt are QStandardItemModel and
+    QDirModel. QStandardItemModel is a multi-purpose model that can be used
+    to represent various different data structures needed by list, table,
+    and tree views. This model also holds the items of data.
+    QDirModel is a model that maintains information about the contents of a
+    directory. As a result, it does not hold any items of data itself, but
+    simply represents files and directories on the local filing system.
+
+    QDirModel provides a ready-to-use model to experiment with, and can be
+    easily configured to use existing data. Using this model, we can show how
+    to set up a model for use with ready-made views, and explore how to
+    manipulate data using model indexes.
+
+    \section1 Using Views with an Existing Model
+
+    The QListView and QTreeView classes are the most suitable views
+    to use with QDirModel. The example presented below displays the
+    contents of a directory in a tree view next to the same information in
+    a list view. The views share the user's selection so that the selected
+    items are highlighted in both views.
+
+    \img shareddirmodel.png
+
+    We set up a QDirModel so that it is ready for use, and create some
+    views to display the contents of a directory. This shows the simplest
+    way to use a model. The construction and use of the model is
+    performed from within a single \c main() function:
+
+    \snippet doc/src/snippets/shareddirmodel/main.cpp 0
+
+    The model is set up to use data from a default directory. We create two
+    views so that we can examine the items held in the model in two
+    different ways:
+
+    \snippet doc/src/snippets/shareddirmodel/main.cpp 5
+
+    The views are constructed in the same way as other widgets. Setting up
+    a view to display the items in the model is simply a matter of calling its
+    \l{QAbstractItemView::setModel()}{setModel()} function with the directory
+    model as the argument. The calls to
+    \l{QAbstractItemView::setRootIndex()}{setRootIndex()} tell the views which
+    directory to display by supplying a \e{model index} that we obtain from
+    the directory model.
+
+    The \c index() function used in this case is unique to QDirModel; we supply
+    it with a directory and it returns a model index. Model indexes are
+    discussed in the \l{Model Classes} chapter.
+
+    The rest of the function just displays the views within a splitter
+    widget, and runs the application's event loop:
+
+    \snippet doc/src/snippets/shareddirmodel/main.cpp 8
+
+    In the above example, we neglected to mention how to handle selections
+    of items. This subject is covered in more detail in the chapter on
+    \l{Handling Selections in Item Views}. Before examining how selections
+    are handled, you may find it useful to read the \l{Model Classes} chapter
+    which describes the concepts used in the model/view framework.
+*/
+
+/*!
+    \page model-view-model.html
+    \contentspage model-view-programming.html Contents
+    \previouspage Using Models and Views
+    \nextpage Creating New Models
+
+    \title Model Classes
+
+    \tableofcontents
+
+    \section1 Basic Concepts
+
+    In the model/view architecture, the model provides a standard interface
+    that views and delegates use to access data. In Qt, the standard
+    interface is defined by the QAbstractItemModel class. No matter how
+    the items of data are stored in any underlying data structure, all
+    subclasses of QAbstractItemModel represent the data as a hierarchical
+    structure containing tables of items.
+    Views use this \e convention to access items of data in the model, but
+    they are not restricted in the way that they present this information
+    to the user.
+
+    \image modelview-models.png
+
+    Models also notify any attached views about changes to data through the
+    signals and slots mechanism.
+
+    This chapter describes some basic concepts that are central to the way
+    item of data are accessed by other components via a model class. More
+    advanced concepts are discussed in later chapters.
+
+    \section2 Model Indexes
+
+    To ensure that the representation of the data is kept separate from the
+    way it is accessed, the concept of a \e{model index} is introduced.
+    Each piece of information that can be obtained via a model is
+    represented by a model index. Views and delegates use these indexes to
+    request items of data to display.
+
+    As a result, only the model needs to know how to obtain data, and the
+    type of data managed by the model can be defined fairly generally.
+    Model indexes contain a pointer to the model that created them, and
+    this prevents confusion when working with more than one model.
+
+    \snippet doc/src/snippets/code/doc_src_model-view-programming.qdoc 0
+
+    Model indexes provide \e temporary references to pieces of information,
+    and can be used to retrieve or modify data via the model. Since models
+    may reorganize their internal structures from time to time, model
+    indexes may become invalid, and \e{should not be stored}. If a
+    long-term reference to a piece of information is required, a
+    \e{persistent model index} must be created. This provides a reference
+    to the information that the model keeps up-to-date.
+    Temporary model indexes are provided by the QModelIndex class, and
+    persistent model indexes are provided by the QPersistentModelIndex
+    class.
+
+    To obtain a model index that corresponds to an item of data, three
+    properties must be specified to the model: a row number, a column number,
+    and the model index of a parent item. The following sections describe
+    and explain these properties in detail.
+
+    \section2 Rows and Columns
+
+    In its most basic form, a model can be accessed as a simple table
+    in which items are located by their row and column numbers. \e{This does
+    not mean that the underlying pieces of data are stored in an array
+    structure}; the use of row and column numbers is only a convention to
+    allow components to communicate with each other.
+    We can retrieve information about any given item by specifying its row
+    and column numbers to the model, and we receive an index that
+    represents the item:
+
+    \snippet doc/src/snippets/code/doc_src_model-view-programming.qdoc 1
+
+    Models that provide interfaces to simple, single level data structures
+    like lists and tables do not need any other information to be provided
+    but, as the above code indicates, we need to supply more information
+    when obtaining a model index.
+
+    \table
+    \row \i \inlineimage modelview-tablemodel.png
+    \i \bold{Rows and columns}
+
+    The diagram shows a representation of a basic table model in which each
+    item is located by a pair of row and column numbers.
+    By passing the relevant row and column numbers to the model we
+    obtain a model index that refers to an item of data.
+
+    \snippet doc/src/snippets/code/doc_src_model-view-programming.qdoc 2
+
+    Top level items in a model are always referenced by specifying
+    \c QModelIndex() as their parent item. This is discussed in the next
+    section.
+    \endtable
+
+    \section2 Parents of Items
+
+    The table-like interface to item data provided by models is ideal when
+    using data in a table or list view; the row and column number system
+    maps exactly to the way the views display items.
+    However, structures such as tree views require the model to expose a more
+    flexible interface to the items within. As a result, each item can also be
+    the parent of another table of items, in much the same way that a top-level
+    item in a tree view can contain another list of items.
+
+    When requesting an index for a model item, we must provide some
+    information about the item's parent. Outside the model, the only way to
+    refer to an item is through a model index, so a parent model index must
+    also be given:
+
+    \snippet doc/src/snippets/code/doc_src_model-view-programming.qdoc 3
+
+    \table
+    \row \i \inlineimage modelview-treemodel.png
+    \i \bold{Parents, rows, and columns}
+
+    The diagram shows a representation of a tree model in which each item
+    is referred to by a parent, a row number, and a column number.
+
+    Items "A" and "C" are represented as top-level siblings in the model:
+    \snippet doc/src/snippets/code/doc_src_model-view-programming.qdoc 4
+
+    Item "A" has a number of children. A model index for item "B" is
+    obtained with the following code:
+    \snippet doc/src/snippets/code/doc_src_model-view-programming.qdoc 5
+    \endtable
+
+    \section2 Item Roles
+
+    Items in a model can perform various \e roles for other components,
+    allowing different kinds of data to be supplied for different situations.
+    For example, Qt::DisplayRole is used to access a string that can be
+    displayed as text in a view.
+    Typically, items contain data for a number of different roles, and the
+    standard roles are defined by Qt::ItemDataRole.
+
+    We can ask the model for the item's data by passing it the model index
+    corresponding to the item, and by specifying a role to obtain the type
+    of data we want:
+
+    \snippet doc/src/snippets/code/doc_src_model-view-programming.qdoc 6
+
+    \table
+    \row \i \inlineimage modelview-roles.png
+    \i \bold{Item roles}
+
+    The role indicates to the model which type of data is being referred to.
+    Views can display the roles in different ways, so it is important to
+    supply appropriate information for each role.
+
+    The \l{Creating New Models} section covers some specific uses of roles
+    in more detail.
+    \endtable
+
+    Most common uses for item data are covered by the standard roles defined
+    in Qt::ItemDataRole. By supplying appropriate item data for each role,
+    models can provide hints to views and delegates about how items should be
+    presented to the user. Different kinds of views have the freedom to
+    interpret or ignore this information as required. It is also possible to
+    define additional roles for application-specific purposes.
+
+    \section2 Summary of Concepts
+
+    \list
+    \o Model indexes give views and delegates information about the location
+       of items provided by models in a way that is independent of any
+       underlying data structures.
+    \o Items are referred to by their row and column numbers, and by the model
+       index of their parent items.
+    \o Model indexes are constructed by models at the request of other
+       components, such as views and delegates.
+    \o If a valid model index is specified for the parent item when an index is
+       requested using \l{QAbstractItemModel::index()}{index()}, the index
+       returned will refer to an item beneath that parent item in the
+       model.
+       The index obtained refers to a child of that item.
+    \o If an invalid model index is specified for the parent item when an index
+       is requested using \l{QAbstractItemModel::index()}{index()}, the index
+       returned will refer to a top-level item in the model.
+    \o The \l{Qt::ItemDataRole}{role} distinguishes between the
+       different kinds of data associated with an item.
+    \endlist
+
+    \section2 Using Model Indexes
+
+    To demonstrate how data can be retrieved from a model, using model
+    indexes, we set up a QDirModel without a view and display the
+    names of files and directories in a widget.
+    Although this does not show a normal way of using a model, it demonstrates
+    the conventions used by models when dealing with model indexes.
+
+    We construct a directory model in the following way:
+
+    \snippet doc/src/snippets/simplemodel-use/main.cpp 0
+
+    In this case, we set up a default QDirModel, obtain a parent index using
+    a specific implementation of \l{QDirModel::index()}{index()} provided by
+    that model, and we count the number of rows in the model using the
+    \l{QDirModel::rowCount()}{rowCount()} function.
+
+    For simplicity, we are only interested in the items in the first column
+    of the model. We examine each row in turn, obtaining a model index for
+    the first item in each row, and read the data stored for that item
+    in the model.
+
+    \snippet doc/src/snippets/simplemodel-use/main.cpp 1
+
+    To obtain a model index, we specify the row number, column number (zero
+    for the first column), and the appropriate model index for the parent
+    of all the items that we want.
+    The text stored in each item is retrieved using the model's
+    \l{QDirModel::data()}{data()} function. We specify the model index and
+    the \l{Qt::ItemDataRole}{DisplayRole} to obtain data for the
+    item in the form of a string.
+
+    \snippet doc/src/snippets/simplemodel-use/main.cpp 2
+    \codeline
+    \snippet doc/src/snippets/simplemodel-use/main.cpp 3
+
+    The above example demonstrates the basic principles used to retrieve
+    data from a model:
+
+    \list
+    \i The dimensions of a model can be found using
+       \l{QAbstractItemModel::rowCount()}{rowCount()} and
+       \l{QAbstractItemModel::columnCount()}{columnCount()}.
+       These functions generally require a parent model index to be
+       specified.
+    \i Model indexes are used to access items in the model. The row, column,
+       and parent model index are needed to specify the item.
+    \i To access top-level items in a model, specify a null model index
+       as the parent index with \c QModelIndex().
+    \i Items contain data for different roles. To obtain the data for a
+       particular role, both the model index and the role must be supplied
+       to the model.
+    \endlist
+
+
+    \section1 Further Reading
+
+    New models can be created by implementing the standard interface provided
+    by QAbstractItemModel. In the \l{Creating New Models} chapter, we will
+    demonstrate this by creating a convenient ready-to-use model for holding
+    lists of strings.
+*/
+
+/*!
+    \page model-view-view.html
+    \contentspage model-view-programming.html Contents
+    \previouspage Creating New Models
+    \nextpage Handling Selections in Item Views
+
+    \title View Classes
+
+    \tableofcontents
+
+    \section1 Concepts
+
+    In the model/view architecture, the view obtains items of data from the
+    model and presents them to the user. The way that the data is
+    presented need not resemble the representation of the data provided by
+    the model, and may be \e{completely different} from the underlying data
+    structure used to store items of data.
+
+    The separation of content and presentation is achieved by the use of a
+    standard model interface provided by QAbstractItemModel, a standard view
+    interface provided by QAbstractItemView, and the use of model indexes
+    that represent items of data in a general way.
+    Views typically manage the overall layout of the data obtained from
+    models. They may render individual items of data themselves, or use
+    \l{Delegate Classes}{delegates} to handle both rendering and editing
+    features.
+
+    As well as presenting data, views handle navigation between items,
+    and some aspects of item selection. The views also implement basic
+    user interface features, such as context menus and drag and drop.
+    A view can provide default editing facilities for items, or it may
+    work with a \l{Delegate Classes}{delegate} to provide a custom
+    editor.
+
+    A view can be constructed without a model, but a model must be
+    provided before it can display useful information. Views keep track of
+    the items that the user has selected through the use of
+    \l{Handling Selections in Item Views}{selections} which can be maintained
+    separately for each view, or shared between multiple views.
+
+    Some views, such as QTableView and QTreeView, display headers as well
+    as items. These are also implemented by a view class, QHeaderView.
+    Headers usually access the same model as the view that contains them.
+    They retrieve data from the model using the
+    \l{QAbstractItemModel::headerData()} function, and usually display
+    header information in the form of a label. New headers can be
+    subclassed from the QHeaderView class to provide more specialized
+    labels for views.
+
+    \section1 Using an Existing View
+
+    Qt provides three ready-to-use view classes that present data from
+    models in ways that are familiar to most users.
+    QListView can display items from a model as a simple list, or in the
+    form of a classic icon view. QTreeView displays items from a
+    model as a hierarchy of lists, allowing deeply nested structures to be
+    represented in a compact way. QTableView presents items from a model
+    in the form of a table, much like the layout of a spreadsheet
+    application.
+
+    \img standard-views.png
+
+    The default behavior of the standard views shown above should be
+    sufficient for most applications. They provide basic editing
+    facilities, and can be customized to suit the needs of more specialized
+    user interfaces.
+
+    \section2 Using a Model
+
+    We take the string list model that \l{Creating New Models}{we created as
+    an example model}, set it up with some data, and construct a view to
+    display the contents of the model. This can all be performed within a
+    single function:
+
+    \snippet doc/src/snippets/stringlistmodel/main.cpp 0
+
+    Note that the \c StringListModel is declared as a \l QAbstractItemModel.
+    This allows us to use the abstract interface to the model, and
+    ensures that the code will still work even if we replace the string list
+    model with a different model in the future.
+
+    The list view provided by \l QListView is sufficient for presenting
+    the items in the string list model. We construct the view, and set up
+    the model using the following lines of code:
+
+    \snippet doc/src/snippets/stringlistmodel/main.cpp 2
+    \snippet doc/src/snippets/stringlistmodel/main.cpp 4
+
+    The view is shown in the normal way:
+
+    \snippet doc/src/snippets/stringlistmodel/main.cpp 5
+
+    The view renders the contents of a model, accessing data via the model's
+    interface. When the user tries to edit an item, the view uses a default
+    delegate to provide an editor widget.
+
+    \img stringlistmodel.png
+
+    The above image shows how a QListView represents the data in the string
+    list model. Since the model is editable, the view automatically allows
+    each item in the list to be edited using the default delegate.
+
+    \section2 Using Multiple Views onto the Same Model
+
+    Providing multiple views onto the same model is simply a matter of
+    setting the same model for each view. In the following code we create
+    two table views, each using the same simple table model which we have
+    created for this example:
+
+    \snippet doc/src/snippets/sharedtablemodel/main.cpp 0
+    \codeline
+    \snippet doc/src/snippets/sharedtablemodel/main.cpp 1
+
+    The use of signals and slots in the model/view architecture means that
+    changes to the model can be propagated to all the attached views,
+    ensuring that we can always access the same data regardless of the
+    view being used.
+
+    \img sharedmodel-tableviews.png
+
+    The above image shows two different views onto the same model, each
+    containing a number of selected items. Although the data from the model
+    is shown consistently across view, each view maintains its own internal
+    selection model. This can be useful in certain situations but, for
+    many applications, a shared selection model is desirable.
+
+    \section1 Handling Selections of Items
+
+    The mechanism for handling selections of items within views is provided
+    by the \l QItemSelectionModel class. All of the standard views construct
+    their own selection models by default, and interact with them in the
+    normal way. The selection model being used by a view can be obtained
+    through the \l{QAbstractItemView::selectionModel()}{selectionModel()}
+    function, and a replacement selection model can be specified with
+    \l{QAbstractItemView::setSelectionModel()}{setSelectionModel()}.
+    The ability to control the selection model used by a view is useful
+    when we want to provide multiple consistent views onto the same model
+    data.
+
+    Generally, unless you are subclassing a model or view, you will not
+    need to manipulate the contents of selections directly. However, the
+    interface to the selection model can be accessed, if required, and
+    this is explored in the chapter on
+    \l{Handling Selections in Item Views}.
+
+    \section2 Sharing Selections Between Views
+
+    Although it is convenient that the view classes provide their own
+    selection models by default, when we use more than one view onto the
+    same model it is often desirable that both the model's data and the
+    user's selection are shown consistently in all views.
+    Since the view classes allow their internal selection models to be
+    replaced, we can achieve a unified selection between views with the
+    following line:
+
+    \snippet doc/src/snippets/sharedtablemodel/main.cpp 2
+
+    The second view is given the selection model for the first view.
+    Both views now operate on the same selection model, keeping both
+    the data and the selected items synchronized.
+
+    \img sharedselection-tableviews.png
+
+    In the example shown above, two views of the same type were used to
+    display the same model's data. However, if two different types of view
+    were used, the selected items may be represented very differently in
+    each view; for example, a contiguous selection in a table view can be
+    represented as a fragmented set of highlighted items in a tree view.
+
+*/
+
+/*!
+    \page model-view-delegate.html
+    \contentspage model-view-programming.html Contents
+    \previouspage Handling Selections in Item Views
+    \nextpage Item View Convenience Classes
+
+    \title Delegate Classes
+
+    \tableofcontents
+
+    \section1 Concepts
+
+    Unlike the Model-View-Controller pattern, the model/view design does not
+    include a completely separate component for managing interaction with
+    the user. Generally, the view is responsible for the presentation of
+    model data to the user, and for processing user input. To allow some
+    flexibility in the way this input is obtained, the interaction is
+    performed by delegates. These components provide input capabilities
+    and are also responsible for rendering individual items in some views.
+    The standard interface for controlling delegates is defined in the
+    \l QAbstractItemDelegate class.
+
+    Delegates are expected to be able to render their contents themselves
+    by implementing the \l{QItemDelegate::paint()}{paint()}
+    and \l{QItemDelegate::sizeHint()}{sizeHint()} functions.
+    However, simple widget-based delegates can subclass \l QItemDelegate
+    instead of \l QAbstractItemDelegate, and take advantage of the default
+    implementations of these functions.
+
+    Editors for delegates can be implemented either by using widgets to manage
+    the editing process or by handling events directly.
+    The first approach is covered later in this chapter, and it is also
+    shown in the \l{Spin Box Delegate Example}{Spin Box Delegate} example.
+
+    The \l{Pixelator Example}{Pixelator} example shows how to create a
+    custom delegate that performs specialized rendering for a table view.
+
+    \section1 Using an Existing Delegate
+
+    The standard views provided with Qt use instances of \l QItemDelegate
+    to provide editing facilities. This default implementation of the
+    delegate interface renders items in the usual style for each of the
+    standard views: \l QListView, \l QTableView, and \l QTreeView.
+
+    All the standard roles are handled by the default delegate used by
+    the standard views. The way these are interpreted is described in the
+    QItemDelegate documentation.
+
+    The delegate used by a view is returned by the
+    \l{QAbstractItemView::itemDelegate()}{itemDelegate()} function.
+    The \l{QAbstractItemView::setItemDelegate()}{setItemDelegate()} function
+    allows you to install a custom delegate for a standard view, and it is
+    necessary to use this function when setting the delegate for a custom
+    view.
+
+    \section1 A Simple Delegate
+
+    The delegate implemented here uses a \l QSpinBox to provide editing
+    facilities, and is mainly intended for use with models that display
+    integers. Although we set up a custom integer-based table model for
+    this purpose, we could easily have used \l QStandardItemModel instead
+    since the custom delegate will control data entry. We construct a
+    table view to display the contents of the model, and this will use
+    the custom delegate for editing.
+
+    \img spinboxdelegate-example.png
+
+    We subclass the delegate from \l QItemDelegate because we do not want
+    to write custom display functions. However, we must still provide
+    functions to manage the editor widget:
+
+    \snippet examples/itemviews/spinboxdelegate/delegate.h 0
+
+    Note that no editor widgets are set up when the delegate is
+    constructed. We only construct an editor widget when it is needed.
+
+    \section2 Providing an Editor
+
+    In this example, when the table view needs to provide an editor, it
+    asks the delegate to provide an editor widget that is appropriate
+    for the item being modified. The
+    \l{QAbstractItemDelegate::createEditor()}{createEditor()} function is
+    supplied with everything that the delegate needs to be able to set up
+    a suitable widget:
+
+    \snippet examples/itemviews/spinboxdelegate/delegate.cpp 1
+
+    Note that we do not need to keep a pointer to the editor widget because
+    the view takes responsibility for destroying it when it is no longer
+    needed.
+
+    We install the delegate's default event filter on the editor to ensure
+    that it provides the standard editing shortcuts that users expect.
+    Additional shortcuts can be added to the editor to allow more
+    sophisticated behavior; these are discussed in the section on
+    \l{#EditingHints}{Editing Hints}.
+
+    The view ensures that the editor's data and geometry are set
+    correctly by calling functions that we define later for these purposes.
+    We can create different editors depending on the model index supplied
+    by the view. For example, if we have a column of integers and a column
+    of strings we could return either a \c QSpinBox or a \c QLineEdit,
+    depending on which column is being edited.
+
+    The delegate must provide a function to copy model data into the
+    editor. In this example, we read the data stored in the
+    \l{Qt::ItemDataRole}{display role}, and set the value in the
+    spin box accordingly.
+
+    \snippet examples/itemviews/spinboxdelegate/delegate.cpp 2
+
+    In this example, we know that the editor widget is a spin box, but we
+    could have provided different editors for different types of data in
+    the model, in which case we would need to cast the widget to the
+    appropriate type before accessing its member functions.
+
+    \section2 Submitting Data to the Model
+
+    When the user has finished editing the value in the spin box, the view
+    asks the delegate to store the edited value in the model by calling the
+    \l{QAbstractItemDelegate::setModelData()}{setModelData()} function.
+
+    \snippet examples/itemviews/spinboxdelegate/delegate.cpp 3
+
+    Since the view manages the editor widgets for the delegate, we only
+    need to update the model with the contents of the editor supplied.
+    In this case, we ensure that the spin box is up-to-date, and update
+    the model with the value it contains using the index specified.
+
+    The standard \l QItemDelegate class informs the view when it has
+    finished editing by emitting the
+    \l{QAbstractItemDelegate::closeEditor()}{closeEditor()} signal.
+    The view ensures that the editor widget is closed and destroyed. In
+    this example, we only provide simple editing facilities, so we need
+    never emit this signal.
+
+    All the operations on data are performed through the interface
+    provided by \l QAbstractItemModel. This makes the delegate mostly
+    independent from the type of data it manipulates, but some
+    assumptions must be made in order to use certain types of
+    editor widgets. In this example, we have assumed that the model
+    always contains integer values, but we can still use this
+    delegate with different kinds of models because \l{QVariant}
+    provides sensible default values for unexpected data.
+
+    \section2 Updating the Editor's Geometry
+
+    It is the responsibility of the delegate to manage the editor's
+    geometry. The geometry must be set when the editor is created, and
+    when the item's size or position in the view is changed. Fortunately,
+    the view provides all the necessary geometry information inside a
+    \l{QStyleOptionViewItem}{view option} object.
+
+    \snippet examples/itemviews/spinboxdelegate/delegate.cpp 4
+
+    In this case, we just use the geometry information provided by the
+    view option in the item rectangle. A delegate that renders items with
+    several elements would not use the item rectangle directly. It would
+    position the editor in relation to the other elements in the item.
+
+    \target EditingHints
+    \section2 Editing Hints
+
+    After editing, delegates should provide hints to the other components
+    about the result of the editing process, and provide hints that will
+    assist any subsequent editing operations. This is achieved by
+    emitting the \l{QAbstractItemDelegate::closeEditor()}{closeEditor()}
+    signal with a suitable hint. This is taken care of by the default
+    QItemDelegate event filter which we installed on the spin box when
+    it was constructed.
+
+    The behavior of the spin box could be adjusted to make it more user
+    friendly. In the default event filter supplied by QItemDelegate, if
+    the user hits \key Return to confirm their choice in the spin box,
+    the delegate commits the value to the model and closes the spin box.
+    We can change this behavior by installing our own event filter on the
+    spin box, and provide editing hints that suit our needs; for example,
+    we might emit \l{QAbstractItemDelegate::closeEditor()}{closeEditor()}
+    with the \l{QAbstractItemDelegate::EndEditHint}{EditNextItem} hint to
+    automatically start editing the next item in the view.
+
+    Another approach that does not require the use of an event
+    filter is to provide our own editor widget, perhaps subclassing
+    QSpinBox for convenience. This alternative approach would give us
+    more control over how the editor widget behaves at the cost of
+    writing additional code. It is usually easier to install an event
+    filter in the delegate if you need to customize the behavior of
+    a standard Qt editor widget.
+
+    Delegates do not have to emit these hints, but those that do not will
+    be less integrated into applications, and will be less usable than
+    those that emit hints to support common editing actions.
+*/
+
+/*!
+    \page model-view-selection.html
+    \contentspage model-view-programming.html Contents
+    \previouspage View Classes
+    \nextpage Delegate Classes
+
+    \title Handling Selections in Item Views
+
+    \tableofcontents
+
+    \section1 Concepts
+
+    The selection model used in the new item view classes offers many
+    improvements over the selection model used in Qt 3. It provides a
+    more general description of selections based on the facilities of
+    the model/view architecture. Although the standard classes for
+    manipulating selections are sufficient for the item views provided,
+    the selection model allows you to create specialized selection models
+    to suit the requirements for your own item models and views.
+
+    Information about the items selected in a view is stored in an instance
+    of the \l QItemSelectionModel class. This maintains model indexes for
+    items in a single model, and is independent of any views. Since there
+    can be many views onto a model, it is possible to share selections
+    between views, allowing applications to show multiple views in a
+    consistent way.
+
+    Selections are made up of \e{selection ranges}. These efficiently
+    maintain information about large selections of items by recording
+    only the starting and ending model indexes for each range of selected
+    items. Non-contiguous selections of items are constructed by using
+    more than one selection range to describe the selection.
+
+    Selections are applied to a collection of model indexes held by
+    a selection model. The most recent selection of items applied is
+    known as the \e{current selection}. The effects of this selection can
+    be modified even after its application through the use of certain
+    types of selection commands. These are discussed later in this
+    section.
+
+    When manipulating selections, it is often helpful to think of
+    \l QItemSelectionModel as a record of the selection state of all the
+    items in an item model. Once a selection model is set up, collections
+    of items can be selected, deselected, or their selection states can
+    be toggled without the need to know which items are already selected.
+    The indexes of all selected items can be retrieved at any time, and
+    other components can be informed of changes to the selection model
+    via the signals and slots mechanism.
+
+
+    \section1 Using a Selection Model
+
+    The standard view classes provide default selection models that can
+    be used in most applications. A selection model belonging to one view
+    can be obtained using the view's
+    \l{QAbstractItemView::selectionModel()}{selectionModel()} function,
+    and shared between many views with
+    \l{QAbstractItemView::setSelectionModel()}{setSelectionModel()},
+    so the construction of new selection models is generally not required.
+
+    A selection is created by specifying a model, and a pair of model
+    indexes to a \l QItemSelection. This uses the indexes to refer to items
+    in the given model, and interprets them as the top-left and bottom-right
+    items in a block of selected items.
+    To apply the selection to items in a model requires the selection to be
+    submitted to a selection model; this can be achieved in a number of ways,
+    each having a different effect on the selections already present in the
+    selection model.
+
+
+    \section2 Selecting Items
+
+    To demonstrate some of the principal features of selections, we construct
+    an instance of a custom table model with 32 items in total, and open a
+    table view onto its data:
+
+    \snippet doc/src/snippets/itemselection/main.cpp 0
+
+    The table view's default selection model is retrieved for later use.
+    We do not modify any items in the model, but instead select a few
+    items that the view will display at the top-left of the table. To do
+    this, we need to retrieve the model indexes corresponding to the
+    top-left and bottom-right items in the region to be selected:
+
+    \snippet doc/src/snippets/itemselection/main.cpp 1
+
+    To select these items in the model, and see the corresponding change
+    in the table view, we need to construct a selection object then apply
+    it to the selection model:
+
+    \snippet doc/src/snippets/itemselection/main.cpp 2
+
+    The selection is applied to the selection model using a command
+    defined by a combination of
+    \l{QItemSelectionModel::SelectionFlag}{selection flags}.
+    In this case, the flags used cause the items recorded in the
+    selection object to be included in the selection model, regardless
+    of their previous state. The resulting selection is shown by the view.
+
+    \img selected-items1.png
+
+    The selection of items can be modified using various operations that
+    are defined by the selection flags. The selection that results from
+    these operations may have a complex structure, but will be represented
+    efficiently by the selection model. The use of different selection
+    flags to manipulate the selected items is described when we examine
+    how to update a selection.
+
+    \section2 Reading the Selection State
+
+    The model indexes stored in the selection model can be read using
+    the \l{QItemSelectionModel::selectedIndexes()}{selectedIndexes()}
+    function. This returns an unsorted list of model indexes that we can
+    iterate over as long as we know which model they are for:
+
+    \snippet doc/src/snippets/reading-selections/window.cpp 0
+
+    The above code uses Qt's convenient \l{Generic Containers}{foreach
+    keyword} to iterate over, and modify, the items corresponding to the
+    indexes returned by the selection model.
+
+    The selection model emits signals to indicate changes in the
+    selection. These notify other components about changes to both the
+    selection as a whole and the currently focused item in the item
+    model. We can connect the
+    \l{QItemSelectionModel::selectionChanged()}{selectionChanged()}
+    signal to a slot, and examine the items in the model that are selected or
+    deselected when the selection changes. The slot is called with two
+    \l{QItemSelection} objects: one contains a list of indexes that
+    correspond to newly selected items; the other contains indexes that
+    correspond to newly deselected items.
+
+    In the following code, we provide a slot that receives the
+    \l{QItemSelectionModel::selectionChanged()}{selectionChanged()}
+    signal, fills in the selected items with
+    a string, and clears the contents of the deselected items.
+
+    \snippet doc/src/snippets/updating-selections/window.cpp 0
+    \snippet doc/src/snippets/updating-selections/window.cpp 1
+    \codeline
+    \snippet doc/src/snippets/updating-selections/window.cpp 2
+
+    We can keep track of the currently focused item by connecting the
+    \l{QItemSelectionModel::currentChanged()}{currentChanged()} signal
+    to a slot that is called with two model indexes. These correspond to
+    the previously focused item, and the currently focused item.
+
+    In the following code, we provide a slot that receives the
+    \l{QItemSelectionModel::currentChanged()}{currentChanged()} signal,
+    and uses the information provided to update the status bar of a
+    \l QMainWindow:
+
+    \snippet doc/src/snippets/updating-selections/window.cpp 3
+
+    Monitoring selections made by the user is straightforward with these
+    signals, but we can also update the selection model directly.
+
+    \section2 Updating a Selection
+
+    Selection commands are provided by a combination of selection flags,
+    defined by \l{QItemSelectionModel::SelectionFlag}.
+    Each selection flag tells the selection model how to update its
+    internal record of selected items when either of the
+    \l{QItemSelection::select()}{select()} functions are called.
+    The most commonly used flag is the
+    \l{QItemSelectionModel::SelectionFlag}{Select} flag
+    which instructs the selection model to record the specified items as
+    being selected. The
+    \l{QItemSelectionModel::SelectionFlag}{Toggle} flag causes the
+    selection model to invert the state of the specified items,
+    selecting any deselected items given, and deselecting any currently
+    selected items. The \l{QItemSelectionModel::SelectionFlag}{Deselect}
+    flag deselects all the specified items.
+
+    Individual items in the selection model are updated by creating a
+    selection of items, and applying them to the selection model. In the
+    following code, we apply a second selection of items to the table
+    model shown above, using the
+    \l{QItemSelectionModel::SelectionFlag}{Toggle} command to invert the
+    selection state of the items given.
+
+    \snippet doc/src/snippets/itemselection/main.cpp 3
+
+    The results of this operation are displayed in the table view,
+    providing a convenient way of visualizing what we have achieved:
+
+    \img selected-items2.png
+
+    By default, the selection commands only operate on the individual
+    items specified by the model indexes. However, the flag used to
+    describe the selection command can be combined with additional flags
+    to change entire rows and columns. For example if you call
+    \l{QItemSelectionModel::select()}{select()} with only one index, but
+    with a command that is a combination of
+    \l{QItemSelectionModel::SelectionFlag}{Select} and
+    \l{QItemSelectionModel::SelectionFlag}{Rows}, the
+    entire row containing the item referred to will be selected.
+    The following code demonstrates the use of the
+    \l{QItemSelectionModel::SelectionFlag}{Rows} and
+    \l{QItemSelectionModel::SelectionFlag}{Columns} flags:
+
+    \snippet doc/src/snippets/itemselection/main.cpp 4
+
+    Although only four indexes are supplied to the selection model, the
+    use of the
+    \l{QItemSelectionModel::SelectionFlag}{Columns} and
+    \l{QItemSelectionModel::SelectionFlag}{Rows} selection flags means
+    that two columns and two rows are selected. The following image shows
+    the result of these two selections:
+
+    \img selected-items3.png
+
+    The commands performed on the example model have all involved
+    accumulating a selection of items in the model. It is also possible
+    to clear the selection, or to replace the current selection with
+    a new one.
+
+    To replace the current selection with a new selection, combine
+    the other selection flags with the
+    \l{QItemSelectionModel::SelectionFlag}{Current} flag. A command using
+    this flag instructs the selection model to replace its current collection
+    of model indexes with those specified in a call to
+    \l{QItemSelectionModel::select()}{select()}.
+    To clear all selections before you start adding new ones,
+    combine the other selection flags with the
+    \l{QItemSelectionModel::SelectionFlag}{Clear} flag. This
+    has the effect of resetting the selection model's collection of model
+    indexes.
+
+    \section2 Selecting All Items in a Model
+
+    To select all items in a model, it is necessary to create a
+    selection for each level of the model that covers all items in that
+    level. We do this by retrieving the indexes corresponding to the
+    top-left and bottom-right items with a given parent index:
+
+    \snippet doc/src/snippets/reading-selections/window.cpp 2
+
+    A selection is constructed with these indexes and the model. The
+    corresponding items are then selected in the selection model:
+
+    \snippet doc/src/snippets/reading-selections/window.cpp 3
+
+    This needs to be performed for all levels in the model.
+    For top-level items, we would define the parent index in the usual way:
+
+    \snippet doc/src/snippets/reading-selections/window.cpp 1
+
+    For hierarchical models, the
+    \l{QAbstractItemModel::hasChildren()}{hasChildren()} function is used to
+    determine whether any given item is the parent of another level of
+    items.
+*/
+
+/*!
+    \page model-view-creating-models.html
+    \contentspage model-view-programming.html Contents
+    \previouspage Model Classes
+    \nextpage View Classes
+
+    \title Creating New Models
+
+    \tableofcontents
+
+    \section1 Introduction
+
+    The separation of functionality between the model/view components allows
+    models to be created that can take advantage of existing views. This
+    approach lets us present data from a variety of sources using standard
+    graphical user interface components, such as QListView, QTableView, and
+    QTreeView.
+
+    The QAbstractItemModel class provides an interface that is flexible
+    enough to support data sources that arrange information in hierarchical
+    structures, allowing for the possibility that data will be inserted,
+    removed, modified, or sorted in some way. It also provides support for
+    drag and drop operations.
+
+    The QAbstractListModel and QAbstractTableModel classes provide support
+    for interfaces to simpler non-hierarchical data structures, and are
+    easier to use as a starting point for simple list and table models.
+
+    In this chapter, we create a simple read-only model to explore
+    the basic principles of the model/view architecture. Later in this
+    chapter, we will adapt this simple model so that items can be modified
+    by the user.
+
+    For an example of a more complex model, see the
+    \l{itemviews/simpletreemodel}{Simple Tree Model} example.
+
+    The requirements of QAbstractItemModel subclasses is described in more
+    detail in the \l{Model Subclassing Reference} document.
+
+    \section1 Designing a Model
+
+    When creating a new model for an existing data structure, it is important
+    to consider which type of model should be used to provide an interface
+    onto the data. If the data structure can be represented as a
+    list or table of items, you can subclass QAbstractListModel or
+    QAbstractTableModel since these classes provide suitable default
+    implementations for many functions.
+
+    However, if the underlying data structure can only be represented by a
+    hierarchical tree structure, it is necessary to subclass
+    QAbstractItemModel. This approach is taken in the
+    \l{itemviews/simpletreemodel}{Simple Tree Model} example.
+
+    In this chapter, we will implement a simple model based on a list of
+    strings, so the QAbstractListModel provides an ideal base class on
+    which to build.
+
+    Whatever form the underlying data structure takes, it is
+    usually a good idea to supplement the standard QAbstractItemModel API
+    in specialized models with one that allows more natural access to the
+    underlying data structure. This makes it easier to populate the model
+    with data, yet still enables other general model/view components to
+    interact with it using the standard API. The model described below
+    provides a custom constructor for just this purpose.
+
+    \section1 A Read-Only Example Model
+
+    The model implemented here is a simple, non-hierarchical, read-only data
+    model based on the standard QStringListModel class. It has a \l QStringList
+    as its internal data source, and implements only what is needed to make a
+    functioning model. To make the implementation easier, we subclass
+    \l QAbstractListModel because it defines sensible default behavior for list
+    models, and it exposes a simpler interface than the \l QAbstractItemModel
+    class.
+
+    When implementing a model it is important to remember that
+    \l QAbstractItemModel does not store any data itself, it merely
+    presents an interface that the views use to access the data.
+    For a minimal read-only model it is only necessary to implement a few
+    functions as there are default implementations for most of the
+    interface. The class declaration is as follows:
+
+
+    \snippet doc/src/snippets/stringlistmodel/model.h 0
+    \snippet doc/src/snippets/stringlistmodel/model.h 1
+    \codeline
+    \snippet doc/src/snippets/stringlistmodel/model.h 5
+
+    Apart from the model's constructor, we only need to implement two
+    functions: \l{QAbstractItemModel::rowCount()}{rowCount()} returns the
+    number of rows in the model and \l{QAbstractItemModel::data()}{data()}
+    returns an item of data corresponding to a specified model index.
+
+    Well behaved models also implement
+    \l{QAbstractItemModel::headerData()}{headerData()} to give tree and
+    table views something to display in their headers.
+
+    Note that this is a non-hierarchical model, so we don't have to worry
+    about the parent-child relationships. If our model was hierarchical, we
+    would also have to implement the
+    \l{QAbstractItemModel::index()}{index()} and
+    \l{QAbstractItemModel::parent()}{parent()} functions.
+
+    The list of strings is stored internally in the \c stringList private
+    member variable.
+
+    \section2 Dimensions of The Model
+
+    We want the number of rows in the model to be the same as the number of
+    strings in the string list. We implement the
+    \l{QAbstractItemModel::rowCount()}{rowCount()} function with this in
+    mind:
+
+    \snippet doc/src/snippets/stringlistmodel/model.cpp 0
+
+    Since the model is non-hierarchical, we can safely ignore the model index
+    corresponding to the parent item. By default, models derived from
+    QAbstractListModel only contain one column, so we do not need to
+    reimplement the \l{QAbstractItemModel::columnCount()}{columnCount()}
+    function.
+
+    \section2 Model Headers and Data
+
+    For items in the view, we want to return the strings in the string list.
+    The \l{QAbstractItemModel::data()}{data()} function is responsible for
+    returning the item of data that corresponds to the index argument:
+
+    \snippet doc/src/snippets/stringlistmodel/model.cpp 1
+
+    We only return a valid QVariant if the model index supplied is valid,
+    the row number is within the range of items in the string list, and the
+    requested role is one that we support.
+
+    Some views, such as QTreeView and QTableView, are able to display headers
+    along with the item data. If our model is displayed in a view with headers,
+    we want the headers to show the row and column numbers. We can provide
+    information about the headers by subclassing the
+    \l{QAbstractItemModel::headerData()}{headerData()} function:
+
+    \snippet doc/src/snippets/stringlistmodel/model.cpp 2
+
+    Again, we return a valid QVariant only if the role is one that we support.
+    The orientation of the header is also taken into account when deciding the
+    exact data to return.
+
+    Not all views display headers with the item data, and those that do may
+    be configured to hide them. Nonetheless, it is recommended that you
+    implement the \l{QAbstractItemModel::headerData()}{headerData()} function
+    to provide relevant information about the data provided by the model.
+
+    An item can have several roles, giving out different data depending on the
+    role specified. The items in our model only have one role,
+    \l{Qt::ItemDataRole}{DisplayRole}, so we return the data
+    for items irrespective of the role specified.
+    However, we could reuse the data we provide for the
+    \l{Qt::ItemDataRole}{DisplayRole} in
+    other roles, such as the
+    \l{Qt::ItemDataRole}{ToolTipRole} that views can use to
+    display information about items in a tooltip.
+
+    \section1 An Editable Model
+
+    The read-only model shows how simple choices could be presented to the
+    user but, for many applications, an editable list model is much more
+    useful. We can modify the read-only model to make the items editable
+    by implementing two extra functions:
+    \l{QAbstractItemModel::flags()}{flags()} and
+    \l{QAbstractItemModel::setData()}{setData()}.
+    The following function declarations are added to the class definition:
+
+    \snippet doc/src/snippets/stringlistmodel/model.h 2
+    \snippet doc/src/snippets/stringlistmodel/model.h 3
+
+    \section2 Making the Model Editable
+
+    A delegate checks whether an item is editable before creating an
+    editor. The model must let the delegate know that its items are
+    editable. We do this by returning the correct flags for each item in
+    the model; in this case, we enable all items and make them both
+    selectable and editable:
+
+    \snippet doc/src/snippets/stringlistmodel/model.cpp 3
+
+    Note that we do not have to know how the delegate performs the actual
+    editing process. We only have to provide a way for the delegate to set the
+    data in the model. This is achieved through the
+    \l{QAbstractItemModel::setData()}{setData()} function:
+
+    \snippet doc/src/snippets/stringlistmodel/model.cpp 4
+    \snippet doc/src/snippets/stringlistmodel/model.cpp 5
+
+    In this model, the item in the string list that corresponds to the
+    model index is replaced by the value provided. However, before we
+    can modify the string list, we must make sure that the index is
+    valid, the item is of the correct type, and that the role is
+    supported. By convention, we insist that the role is the
+    \l{Qt::ItemDataRole}{EditRole} since this is the role used by the
+    standard item delegate. For boolean values, however, you can use
+    Qt::CheckStateRole and set the Qt::ItemIsUserCheckable flag; a
+    checkbox will then be used for editing the value. The underlying
+    data in this model is the same for all roles, so this detail just
+    makes it easier to integrate the model with standard components.
+
+    When the data has been set, the model must let the views know that some
+    data has changed. This is done by emitting the
+    \l{QAbstractItemModel::dataChanged()}{dataChanged()} signal. Since only
+    one item of data has changed, the range of items specified in the signal
+    is limited to just one model index.
+
+    \section2 Inserting and Removing Rows
+
+    It is possible to change the number of rows and columns in a model. In the
+    string list model it only makes sense to change the number of rows, so we
+    only reimplement the functions for inserting and removing rows. These are
+    declared in the class definition:
+
+    \snippet doc/src/snippets/stringlistmodel/model.h 4
+
+    Since rows in this model correspond to strings in a list, the
+    \c insertRows() function inserts a number of empty strings into the string
+    list before the specified position. The number of strings inserted is
+    equivalent to the number of rows specified.
+
+    The parent index is normally used to determine where in the model the
+    rows should be added. In this case, we only have a single top-level list
+    of strings, so we just insert empty strings into that list.
+
+    \snippet doc/src/snippets/stringlistmodel/model.cpp 6
+    \snippet doc/src/snippets/stringlistmodel/model.cpp 7
+
+    The model first calls the
+    \l{QAbstractItemModel::beginInsertRows()}{beginInsertRows()} function to
+    inform other components that the number of rows is about to change. The
+    function specifies the row numbers of the first and last new rows to be
+    inserted, and the model index for their parent item. After changing the
+    string list, it calls
+    \l{QAbstractItemModel::endInsertRows()}{endInsertRows()} to complete the
+    operation and inform other components that the dimensions of the model
+    have changed, returning true to indicate success.
+
+    The function to remove rows from the model is also simple to write.
+    The rows to be removed from the model are specified by the position and
+    the number of rows given.
+    We ignore the parent index to simplify our implementation, and just
+    remove the corresponding items from the string list.
+
+    \snippet doc/src/snippets/stringlistmodel/model.cpp 8
+    \snippet doc/src/snippets/stringlistmodel/model.cpp 9
+
+    The \l{QAbstractItemModel::beginRemoveRows()}{beginRemoveRows()} function
+    is always called before any underlying data is removed, and specifies the
+    first and last rows to be removed. This allows other components to access
+    the data before it becomes unavailable.
+    After the rows have been removed, the model emits
+    \l{QAbstractItemModel::endRemoveRows()}{endRemoveRows()} to finish the
+    operation and let other components know that the dimensions of the model
+    have changed.
+
+    \section1 Next Steps
+
+    We can display the data provided by this model, or any other model, using
+    the \l QListView class to present the model's items in the form of a vertical
+    list.
+    For the string list model, this view also provides a default editor so that
+    the items can be manipulated. We examine the possibilities made available by
+    the standard view classes in the chapter on \l{View Classes}.
+
+    The \l{Model Subclassing Reference} document discusses the requirements of
+    QAbstractItemModel subclasses in more detail, and provides a guide to the
+    virtual functions that must be implemented to enable various features in
+    different types of models.
+*/
+
+/*!
+    \page model-view-convenience.html
+    \contentspage model-view-programming.html Contents
+    \previouspage Delegate Classes
+    \nextpage Using Drag and Drop with Item Views
+
+    \title Item View Convenience Classes
+
+    \tableofcontents
+
+    \section1 Overview
+
+    Alongside the model/view classes, Qt 4 also includes standard widgets to
+    provide classic item-based container widgets. These behave in a similar
+    way to the item view classes in Qt 3, but have been rewritten to use the
+    underlying model/view framework for performance and maintainability. The
+    old item view classes are still available in the compatibility library
+    (see the \l{porting4.html}{Porting Guide} for more information).
+
+    The item-based widgets have been given names which reflect their uses:
+    \c QListWidget provides a list of items, \c QTreeWidget displays a
+    multi-level tree structure, and \c QTableWidget provides a table of cell
+    items. Each class inherits the behavior of the \c QAbstractItemView
+    class which implements common behavior for item selection and header
+    management.
+
+    \section1 List Widgets
+
+    Single level lists of items are typically displayed using a \c QListWidget
+    and a number of \c{QListWidgetItem}s. A list widget is constructed in the
+    same way as any other widget:
+
+    \snippet doc/src/snippets/qlistwidget-using/mainwindow.cpp 0
+
+    List items can be added directly to the list widget when they are
+    constructed:
+
+    \snippet doc/src/snippets/qlistwidget-using/mainwindow.cpp 3
+
+    They can also be constructed without a parent list widget and added to
+    a list at some later time:
+
+    \snippet doc/src/snippets/qlistwidget-using/mainwindow.cpp 6
+    \snippet doc/src/snippets/qlistwidget-using/mainwindow.cpp 7
+
+    Each item in a list can display a text label and an icon. The colors
+    and font used to render the text can be changed to provide a customized
+    appearance for items. Tooltips, status tips, and "What's
+    This?" help are all easily configured to ensure that the list is properly
+    integrated into the application.
+
+    \snippet doc/src/snippets/qlistwidget-using/mainwindow.cpp 8
+
+    By default, items in a list are presented in the order of their creation.
+    Lists of items can be sorted according to the criteria given in
+    \l{Qt::SortOrder} to produce a list of items that is sorted in forward or
+    reverse alphabetical order:
+
+    \snippet doc/src/snippets/qlistwidget-using/mainwindow.cpp 4
+    \snippet doc/src/snippets/qlistwidget-using/mainwindow.cpp 5
+
+
+    \section1 Tree Widgets
+
+    Trees or hierarchical lists of items are provided by the \c QTreeWidget
+    and \c QTreeWidgetItem classes. Each item in the tree widget can have
+    child items of its own, and can display a number of columns of
+    information. Tree widgets are created just like any other widget:
+
+    \snippet doc/src/snippets/qtreewidget-using/mainwindow.cpp 0
+
+    Before items can be added to the tree widget, the number of columns must
+    be set. For example, we could define two columns, and create a header
+    to provide labels at the top of each column:
+
+    \snippet doc/src/snippets/qtreewidget-using/mainwindow.cpp 1
+    \snippet doc/src/snippets/qtreewidget-using/mainwindow.cpp 2
+
+    The easiest way to set up the labels for each section is to supply a string
+    list. For more sophisticated headers, you can construct a tree item,
+    decorate it as you wish, and use that as the tree widget's header.
+
+    Top-level items in the tree widget are constructed with the tree widget as
+    their parent widget. They can be inserted in an arbitrary order, or you
+    can ensure that they are listed in a particular order by specifying the
+    previous item when constructing each item:
+
+    \snippet doc/src/snippets/qtreewidget-using/mainwindow.cpp 3
+    \codeline
+    \snippet doc/src/snippets/qtreewidget-using/mainwindow.cpp 4
+
+    Tree widgets deal with top-level items slightly differently to other
+    items from deeper within the tree. Items can be removed from the top
+    level of the tree by calling the tree widget's
+    \l{QTreeWidget::takeTopLevelItem()}{takeTopLevelItem()} function, but
+    items from lower levels are removed by calling their parent item's
+    \l{QTreeWidgetItem::takeChild()}{takeChild()} function.
+    Items are inserted in the top level of the tree with the
+    \l{QTreeWidget::insertTopLevelItem()}{insertTopLevelItem()} function.
+    At lower levels in the tree, the parent item's
+    \l{QTreeWidgetItem::insertChild()}{insertChild()} function is used.
+
+    It is easy to move items around between the top level and lower levels
+    in the tree. We just need to check whether the items are top-level items
+    or not, and this information is supplied by each item's \c parent()
+    function. For example, we can remove the current item in the tree widget
+    regardless of its location:
+
+    \snippet doc/src/snippets/qtreewidget-using/mainwindow.cpp 10
+    \snippet doc/src/snippets/qtreewidget-using/mainwindow.cpp 11
+
+    Inserting the item somewhere else in the tree widget follows the same
+    pattern:
+
+    \snippet doc/src/snippets/qtreewidget-using/mainwindow.cpp 8
+    \snippet doc/src/snippets/qtreewidget-using/mainwindow.cpp 9
+
+
+    \section1 Table Widgets
+
+    Tables of items similar to those found in spreadsheet applications
+    are constructed with the \c QTableWidget and \c QTableWidgetItem. These
+    provide a scrolling table widget with headers and items to use within it.
+
+    Tables can be created with a set number of rows and columns, or these
+    can be added to an unsized table as they are needed.
+
+    \snippet doc/src/snippets/qtablewidget-using/mainwindow.h 0
+    \snippet doc/src/snippets/qtablewidget-using/mainwindow.cpp 0
+
+    Items are constructed outside the table before being added to the table
+    at the required location:
+
+    \snippet doc/src/snippets/qtablewidget-using/mainwindow.cpp 3
+
+    Horizontal and vertical headers can be added to the table by constructing
+    items outside the table and using them as headers:
+
+    \snippet doc/src/snippets/qtablewidget-using/mainwindow.cpp 1
+
+    Note that the rows and columns in the table begin at zero.
+
+    \section1 Common Features
+
+    There are a number of item-based features common to each of the
+    convenience classes that are available through the same interfaces
+    in each class. We present these in the following sections with some
+    examples for different widgets.
+    Look at the list of \l{Model/View Classes} for each of the widgets
+    for more details about the use of each function used.
+
+    \section2 Hidden Items
+
+    It is sometimes useful to be able to hide items in an item view widget
+    rather than remove them. Items for all of the above widgets can be
+    hidden and later shown again. You can determine whether an item is hidden
+    by calling the isItemHidden() function, and items can be hidden with
+    \c setItemHidden().
+
+    Since this operation is item-based, the same function is available for
+    all three convenience classes.
+
+    \section2 Selections
+
+    The way items are selected is controlled by the widget's selection mode
+    (\l{QAbstractItemView::SelectionMode}).
+    This property controls whether the user can select one or many items and,
+    in many-item selections, whether the selection must be a continuous range
+    of items. The selection mode works in the same way for all of the
+    above widgets.
+
+    \table
+    \row
+    \i \img selection-single.png
+    \i \bold{Single item selections:}
+    Where the user needs to choose a single item from a widget, the
+    default \c SingleSelection mode is most suitable. In this mode, the
+    current item and the selected item are the same.
+
+    \row
+    \i \img selection-multi.png
+    \i \bold{Multi-item selections:}
+    In this mode, the user can toggle the selection state of any item in the
+    widget without changing the existing selection, much like the way
+    non-exclusive checkboxes can be toggled independently.
+
+    \row
+    \i \img selection-extended.png
+    \i \bold{Extended selections:}
+    Widgets that often require many adjacent items to be selected, such
+    as those found in spreadsheets, require the \c ExtendedSelection mode.
+    In this mode, continuous ranges of items in the widget can be selected
+    with both the mouse and the keyboard.
+    Complex selections, involving many items that are not adjacent to other
+    selected items in the widget, can also be created if modifier keys are
+    used.
+
+    If the user selects an item without using a modifier key, the existing
+    selection is cleared.
+    \endtable
+
+    The selected items in a widget are read using the \c selectedItems()
+    function, providing a list of relevant items that can be iterated over.
+    For example, we can find the sum of all the numeric values within a
+    list of selected items with the following code:
+
+    \snippet doc/src/snippets/qtablewidget-using/mainwindow.cpp 4
+
+    Note that for the single selection mode, the current item will be in
+    the selection. In the multi-selection and extended selection modes, the
+    current item may not lie within the selection, depending on the way the
+    user formed the selection.
+
+    \section2 Searching
+
+    It is often useful to be able to find items within an item view widget,
+    either as a developer or as a service to present to users. All three
+    item view convenience classes provide a common \c findItems() function
+    to make this as consistent and simple as possible.
+
+    Items are searched for by the text that they contain according to
+    criteria specified by a selection of values from Qt::MatchFlags.
+    We can obtain a list of matching items with the \c findItems()
+    function:
+
+    \snippet doc/src/snippets/qtreewidget-using/mainwindow.cpp 6
+    \snippet doc/src/snippets/qtreewidget-using/mainwindow.cpp 7
+
+    The above code causes items in a tree widget to be selected if they
+    contain the text given in the search string. This pattern can also be
+    used in the list and table widgets.
+*/
+
+/*!
+    \page model-view-dnd.html
+    \contentspage model-view-programming.html Contents
+    \previouspage Item View Convenience Classes
+    \nextpage Proxy Models
+
+    \title Using Drag and Drop with Item Views
+
+    \tableofcontents
+
+    \section1 Overview
+
+    Qt's drag and drop infrastructure is fully supported by the model/view framework.
+    Items in lists, tables, and trees can be dragged within the views, and data can be
+    imported and exported as MIME-encoded data.
+
+    The standard views automatically support internal drag and drop, where items are
+    moved around to change the order in which they are displayed. By default, drag and
+    drop is not enabled for these views because they are configured for the simplest,
+    most common uses. To allow items to be dragged around, certain properties of the
+    view need to be enabled, and the items themselves must also allow dragging to occur.
+
+    The requirements for a model that only allows items to be exported from a
+    view, and which does not allow data to be dropped into it, are fewer than
+    those for a fully-enabled drag and drop model.
+
+    See also the \l{Model Subclassing Reference} for more information about
+    enabling drag and drop support in new models.
+
+    \section1 Using Convenience Views
+
+    Each of the types of item used with QListWidget, QTableWidget, and QTreeWidget
+    is configured to use a different set of flags by default. For example, each
+    QListWidgetItem or QTreeWidgetItem is initially enabled, checkable, selectable,
+    and can be used as the source of a drag and drop operation; each QTableWidgetItem
+    can also be edited and used as the target of a drag and drop operation.
+
+    Although all of the standard items have one or both flags set for drag and drop,
+    you generally need to set various properties in the view itself to take advantage
+    of the built-in support for drag and drop:
+
+    \list
+    \o To enable item dragging, set the view's
+       \l{QAbstractItemView::dragEnabled}{dragEnabled} property to \c true.
+    \o To allow the user to drop either internal or external items within the view,
+       set the view's \l{QAbstractScrollArea::}{viewport()}'s
+       \l{QWidget::acceptDrops}{acceptDrops} property to \c true.
+    \o To show the user where the item currently being dragged will be placed if
+       dropped, set the view's \l{QAbstractItemView::showDropIndicator}{showDropIndicator}
+       property. This provides the user with continuously updating information about
+       item placement within the view.
+    \endlist
+
+    For example, we can enable drag and drop in a list widget with the following lines
+    of code:
+
+    \snippet doc/src/snippets/qlistwidget-dnd/mainwindow.cpp 0
+
+    The result is a list widget which allows the items to be copied
+    around within the view, and even lets the user drag items between
+    views containing the same type of data. In both situations, the
+    items are copied rather than moved.
+
+    To enable the user to move the items around within the view, we
+    must set the list widget's \l {QAbstractItemView::}{dragDropMode}:
+
+    \snippet doc/src/snippets/qlistwidget-dnd/mainwindow.cpp 1
+
+    \section1 Using Model/View Classes
+
+    Setting up a view for drag and drop follows the same pattern used with the
+    convenience views. For example, a QListView can be set up in the same way as a
+    QListWidget:
+
+    \snippet doc/src/snippets/qlistview-dnd/mainwindow.cpp 0
+
+    Since access to the data displayed by the view is controlled by a model, the
+    model used also has to provide support for drag and drop operations. The
+    actions supported by a model can be specified by reimplementing the
+    QAbstractItemModel::supportedDropActions() function. For example, copy and
+    move operations are enabled with the following code:
+
+    \snippet doc/src/snippets/qlistview-dnd/model.cpp 10
+
+    Although any combination of values from Qt::DropActions can be given, the
+    model needs to be written to support them. For example, to allow Qt::MoveAction
+    to be used properly with a list model, the model must provide an implementation
+    of QAbstractItemModel::removeRows(), either directly or by inheriting the
+    implementation from its base class.
+
+    \section2 Enabling Drag and Drop for Items
+
+    Models indicate to views which items can be dragged, and which will accept drops,
+    by reimplementing the QAbstractItemModel::flags() function to provide suitable
+    flags.
+
+    For example, a model which provides a simple list based on QAbstractListModel
+    can enable drag and drop for each of the items by ensuring that the flags
+    returned contain the \l Qt::ItemIsDragEnabled and \l Qt::ItemIsDropEnabled
+    values:
+
+    \snippet doc/src/snippets/qlistview-dnd/model.cpp 7
+
+    Note that items can be dropped into the top level of the model, but dragging is
+    only enabled for valid items.
+
+    In the above code, since the model is derived from QStringListModel, we
+    obtain a default set of flags by calling its implementation of the flags()
+    function.
+
+    \section2 Encoding Exported Data
+
+    When items of data are exported from a model in a drag and drop operation, they
+    are encoded into an appropriate format corresponding to one or more MIME types.
+    Models declare the MIME types that they can use to supply items by reimplementing
+    the QAbstractItemModel::mimeTypes() function, returning a list of standard MIME
+    types.
+
+    For example, a model that only provides plain text would provide the following
+    implementation:
+
+    \snippet doc/src/snippets/qlistview-dnd/model.cpp 9
+
+    The model must also provide code to encode data in the advertised format. This
+    is achieved by reimplementing the QAbstractItemModel::mimeData() function to
+    provide a QMimeData object, just as in any other drag and drop operation.
+
+    The following code shows how each item of data, corresponding to a given list of
+    indexes, is encoded as plain text and stored in a QMimeData object.
+
+    \snippet doc/src/snippets/qlistview-dnd/model.cpp 8
+
+    Since a list of model indexes is supplied to the function, this approach is general
+    enough to be used in both hierarchical and non-heirarchical models.
+
+    Note that custom datatypes must be declared as \l{QMetaObject}{meta objects}
+    and that stream operators must be implemented for them. See the QMetaObject
+    class description for details.
+
+    \section2 Inserting Dropped Data into a Model
+
+    The way that any given model handles dropped data depends on both its type
+    (list, table, or tree) and the way its contents is likely to be presented to
+    the user. Generally, the approach taken to accommodate dropped data should
+    be the one that most suits the model's underlying data store.
+
+    Different types of model tend to handle dropped data in different ways. List
+    and table models only provide a flat structure in which items of data are
+    stored. As a result, they may insert new rows (and columns) when data is
+    dropped on an existing item in a view, or they may overwrite the item's
+    contents in the model using some of the data supplied. Tree models are
+    often able to add child items containing new data to their underlying data
+    stores, and will therefore behave more predictably as far as the user
+    is concerned.
+
+    Dropped data is handled by a model's reimplementation of
+    QAbstractItemModel::dropMimeData(). For example, a model that handles a
+    simple list of strings can provide an implementation that handles data
+    dropped onto existing items separately to data dropped into the top level
+    of the model (i.e., onto an invalid item).
+
+    The model first has to make sure that the operation should be acted on,
+    the data supplied is in a format that can be used, and that its destination
+    within the model is valid:
+
+    \snippet doc/src/snippets/qlistview-dnd/model.cpp 0
+    \snippet doc/src/snippets/qlistview-dnd/model.cpp 1
+
+    A simple one column string list model can indicate failure if the data
+    supplied is not plain text, or if the column number given for the drop
+    is invalid.
+
+    The data to be inserted into the model is treated differently depending on
+    whether it is dropped onto an existing item or not. In this simple example,
+    we want to allow drops between existing items, before the first item in the
+    list, and after the last item.
+
+    When a drop occurs, the model index corresponding to the parent item will
+    either be valid, indicating that the drop occurred on an item, or it will
+    be invalid, indicating that the drop occurred somewhere in the view that
+    corresponds to top level of the model.
+
+    \snippet doc/src/snippets/qlistview-dnd/model.cpp 2
+
+    We initially examine the row number supplied to see if we can use it
+    to insert items into the model, regardless of whether the parent index is
+    valid or not.
+
+    \snippet doc/src/snippets/qlistview-dnd/model.cpp 3
+
+    If the parent model index is valid, the drop occurred on an item. In this
+    simple list model, we find out the row number of the item and use that
+    value to insert dropped items into the top level of the model.
+
+    \snippet doc/src/snippets/qlistview-dnd/model.cpp 4
+
+    When a drop occurs elsewhere in the view, and the row number is unusable,
+    we append items to the top level of the model.
+
+    In hierarchical models, when a drop occurs on an item, it would be better to
+    insert new items into the model as children of that item. In the simple
+    example shown here, the model only has one level, so this approach is not
+    appropriate.
+
+    \section2 Decoding Imported Data
+
+    Each implementation of \l{QAbstractItemModel::dropMimeData()}{dropMimeData()} must
+    also decode the data and insert it into the model's underlying data structure.
+
+    For a simple string list model, the encoded items can be decoded and streamed
+    into a QStringList:
+
+    \snippet doc/src/snippets/qlistview-dnd/model.cpp 5
+
+    The strings can then be inserted into the underlying data store. For consistency,
+    this can be done through the model's own interface:
+
+    \snippet doc/src/snippets/qlistview-dnd/model.cpp 6
+
+    Note that the model will typically need to provide implementations of the
+    QAbstractItemModel::insertRows() and QAbstractItemModel::setData() functions.
+
+    \sa {Item Views Puzzle Example}
+*/
+
+/*!
+    \page model-view-proxy-models.html
+    \contentspage model-view-programming.html Contents
+    \previouspage Using Drag and Drop with Item Views
+    \nextpage Model Subclassing Reference
+
+    \title Proxy Models
+
+    \tableofcontents
+
+    \section1 Overview
+
+    In the model/view framework, items of data supplied by a single model can be shared
+    by any number of views, and each of these can possibly represent the same information
+    in completely different ways.
+    Custom views and delegates are effective ways to provide radically different
+    representations of the same data. However, applications often need to provide
+    conventional views onto processed versions of the same data, such as differently-sorted
+    views onto a list of items.
+
+    Although it seems appropriate to perform sorting and filtering operations as internal
+    functions of views, this approach does not allow multiple views to share the results
+    of such potentially costly operations. The alternative approach, involving sorting
+    within the model itself, leads to the similar problem where each view has to display
+    items of data that are organized according to the most recent processing operation.
+
+    To solve this problem, the model/view framework uses proxy models to manage the
+    information supplied between individual models and views. Proxy models are components
+    that behave like ordinary models from the perspective of a view, and access data from
+    source models on behalf of that view. The signals and slots used by the model/view
+    framework ensure that each view is updated appropriately no matter how many proxy models
+    are placed between itself and the source model.
+
+    \section1 Using Proxy Models
+
+    Proxy models can be inserted between an existing model and any number of views.
+    Qt is supplied with a standard proxy model, QSortFilterProxyModel, that is usually
+    instantiated and used directly, but can also be subclassed to provide custom filtering
+    and sorting behavior. The QSortFilterProxyModel class can be used in the following way:
+
+    \snippet doc/src/snippets/qsortfilterproxymodel/main.cpp 0
+    \codeline
+    \snippet doc/src/snippets/qsortfilterproxymodel/main.cpp 1
+
+    Since proxy models are inherit from QAbstractItemModel, they can be connected to
+    any kind of view, and can be shared between views. They can also be used to
+    process the information obtained from other proxy models in a pipeline arrangement.
+
+    The QSortFilterProxyModel class is designed to be instantiated and used directly
+    in applications. More specialized proxy models can be created by subclassing this
+    classes and implementing the required comparison operations.
+
+    \section1 Customizing Proxy Models
+
+    Generally, the type of processing used in a proxy model involves mapping each item of
+    data from its original location in the source model to either a different location in
+    the proxy model. In some models, some items may have no corresponding location in the
+    proxy model; these models are \e filtering proxy models. Views access items using
+    model indexes provided by the proxy model, and these contain no information about the
+    source model or the locations of the original items in that model.
+
+    QSortFilterProxyModel enables data from a source model to be filtered before
+    being supplied to views, and also allows the contents of a source model to
+    be supplied to views as pre-sorted data.
+
+    \section2 Custom Filtering Models
+
+    The QSortFilterProxyModel class provides a filtering model that is fairly versatile,
+    and which can be used in a variety of common situations. For advanced users,
+    QSortFilterProxyModel can be subclassed, providing a mechanism that enables custom
+    filters to be implemented.
+
+    Subclasses of QSortFilterProxyModel can reimplement two virtual functions that are
+    called whenever a model index from the proxy model is requested or used:
+
+    \list
+    \o \l{QSortFilterProxyModel::filterAcceptsColumn()}{filterAcceptsColumn()} is used to
+       filter specific columns from part of the source model.
+    \o \l{QSortFilterProxyModel::filterAcceptsRow()}{filterAcceptsRow()} is used to filter
+       specific rows from part of the source model.
+    \endlist
+
+    The default implementations of the above functions in QSortFilterProxyModel
+    return true to ensure that all items are passed through to views; reimplementations
+    of these functions should return false to filter out individual rows and columns.
+
+    \section2 Custom Sorting Models
+
+    QSortFilterProxyModel instances use Qt's built-in qStableSort() function to set up
+    mappings between items in the source model and those in the proxy model, allowing a
+    sorted hierarchy of items to be exposed to views without modifying the structure of the
+    source model. To provide custom sorting behavior, reimplement the
+    \l{QSortFilterProxyModel::lessThan()}{lessThan()} function to perform custom
+    comparisons.
+*/
+
+/*!
+    \page model-view-model-subclassing.html
+    \contentspage model-view-programming.html Contents
+    \previouspage Proxy Models
+
+    \title Model Subclassing Reference
+
+    \tableofcontents
+
+    \section1 Introduction
+
+    Model subclasses need to provide implementations of many of the virtual functions
+    defined in the QAbstractItemModel base class. The number of these functions that need
+    to be implemented depends on the type of model - whether it supplies views with
+    a simple list, a table, or a complex hierarchy of items. Models that inherit from
+    QAbstractListModel and QAbstractTableModel can take advantage of the default
+    implementations of functions provided by those classes. Models that expose items
+    of data in tree-like structures must provide implementations for many of the
+    virtual functions in QAbstractItemModel.
+
+    The functions that need to be implemented in a model subclass can be divided into three
+    groups:
+
+    \list
+    \o \bold{Item data handling:} All models need to implement functions to enable views and
+       delegates to query the dimensions of the model, examine items, and retrieve data.
+    \o \bold{Navigation and index creation:} Hierarchical models need to provide functions
+       that views can call to navigate the tree-like structures they expose, and obtain
+       model indexes for items.
+    \o \bold{Drag and drop support and MIME type handling:} Models inherit functions that
+       control the way that internal and external drag and drop operations are performed.
+       These functions allow items of data to be described in terms of MIME types that
+       other components and applications can understand.
+    \endlist
+
+    For more information, see the \l
+    {"Item View Classes" Chapter of C++ GUI Programming with Qt 4}.
+
+    \section1 Item Data Handling
+
+    Models can provide varying levels of access to the data they provide: They can be
+    simple read-only components, some models may support resizing operations, and
+    others may allow items to be edited.
+
+    \section2 Read-Only Access
+
+    To provide read-only access to data provided by a model, the following functions
+    \e{must} be implemented in the model's subclass:
+
+    \table 90%
+    \row \o \l{QAbstractItemModel::flags()}{flags()}
+         \o Used by other components to obtain information about each item provided by
+            the model. In many models, the combination of flags should include
+            Qt::ItemIsEnabled and Qt::ItemIsSelectable.
+    \row \o \l{QAbstractItemModel::data()}{data()}
+         \o Used to supply item data to views and delegates. Generally, models only
+            need to supply data for Qt::DisplayRole and any application-specific user
+            roles, but it is also good practice to provide data for Qt::ToolTipRole,
+            Qt::AccessibleTextRole, and Qt::AccessibleDescriptionRole.
+    \row \o \l{QAbstractItemModel::headerData()}{headerData()}
+         \o Provides views with information to show in their headers. The information is
+            only retrieved by views that can display header information.
+    \row \o \l{QAbstractItemModel::rowCount()}{rowCount()}
+         \o Provides the number of rows of data exposed by the model.
+    \endtable
+
+    These four functions must be implemented in all types of model, including list models
+    (QAbstractListModel subclasses) and table models (QAbstractTableModel subclasses).
+
+    Additionally, the following functions \e{must} be implemented in direct subclasses
+    of QAbstractTableModel and QAbstractItemModel:
+
+    \table 90%
+    \row \o \l{QAbstractItemModel::columnCount()}{columnCount()}
+         \o Provides the number of columns of data exposed by the model. List models do not
+            provide this function because it is already implemented in QAbstractListModel.
+    \endtable
+
+    \section2 Editable Items
+
+    Editable models allow items of data to be modified, and may also provide
+    functions to allow rows and columns to be inserted and removed. To enable
+    editing, the following functions must be implemented correctly:
+
+    \table 90%
+    \row \o \l{QAbstractItemModel::flags()}{flags()}
+         \o Must return an appropriate combination of flags for each item. In particular,
+            the value returned by this function must include \l{Qt::ItemIsEditable} in
+            addition to the values applied to items in a read-only model.
+    \row \o \l{QAbstractItemModel::setData()}{setData()}
+         \o Used to modify the item of data associated with a specified model index.
+            To be able to accept user input, provided by user interface elements, this
+            function must handle data associated with Qt::EditRole.
+            The implementation may also accept data associated with many different kinds
+            of roles specified by Qt::ItemDataRole. After changing the item of data,
+            models must emit the \l{QAbstractItemModel::dataChanged()}{dataChanged()}
+            signal to inform other components of the change.
+    \row \o \l{QAbstractItemModel::setHeaderData()}{setHeaderData()}
+         \o Used to modify horizontal and vertical header information. After changing
+            the item of data, models must emit the
+            \l{QAbstractItemModel::headerDataChanged()}{headerDataChanged()}
+            signal to inform other components of the change.
+    \endtable
+
+    \section2 Resizable Models
+
+    All types of model can support the insertion and removal of rows. Table models
+    and hierarchical models can also support the insertion and removal of columns.
+    It is important to notify other components about changes to the model's dimensions
+    both \e before and \e after they occur. As a result, the following functions
+    can be implemented to allow the model to be resized, but implementations must
+    ensure that the appropriate functions are called to notify attached views and
+    delegates:
+
+    \table 90%
+    \row \o \l{QAbstractItemModel::insertRows()}{insertRows()}
+         \o Used to add new rows and items of data to all types of model.
+            Implementations must call
+            \l{QAbstractItemModel::beginInsertRows()}{beginInsertRows()} \e before
+            inserting new rows into any underlying data structures, and call
+            \l{QAbstractItemModel::endInsertRows()}{endInsertRows()}
+            \e{immediately afterwards}.
+    \row \o \l{QAbstractItemModel::removeRows()}{removeRows()}
+         \o Used to remove rows and the items of data they contain from all types of model.
+            Implementations must call
+            \l{QAbstractItemModel::beginRemoveRows()}{beginRemoveRows()}
+            \e before inserting new columns into any underlying data structures, and call
+            \l{QAbstractItemModel::endRemoveRows()}{endRemoveRows()}
+            \e{immediately afterwards}.
+    \row \o \l{QAbstractItemModel::insertColumns()}{insertColumns()}
+         \o Used to add new columns and items of data to table models and hierarchical models.
+            Implementations must call
+            \l{QAbstractItemModel::beginInsertColumns()}{beginInsertColumns()} \e before
+            rows are removed from any underlying data structures, and call
+            \l{QAbstractItemModel::endInsertColumns()}{endInsertColumns()}
+            \e{immediately afterwards}.
+    \row \o \l{QAbstractItemModel::removeColumns()}{removeColumns()}
+         \o Used to remove columns and the items of data they contain from table models and
+            hierarchical models.
+            Implementations must call
+            \l{QAbstractItemModel::beginRemoveColumns()}{beginRemoveColumns()}
+            \e before columns are removed from any underlying data structures, and call
+            \l{QAbstractItemModel::endRemoveColumns()}{endRemoveColumns()}
+            \e{immediately afterwards}.
+    \endtable
+
+    Generally, these functions should return true if the operation was successful.
+    However, there may be cases where the operation only partly succeeded; for example,
+    if less than the specified number of rows could be inserted. In such cases, the
+    model should return false to indicate failure to enable any attached components to
+    handle the situation.
+
+    The signals emitted by the functions called in implementations of the resizing
+    API give attached components the chance to take action before any data becomes
+    unavailable. The encapsulation of insert and remove operations with begin and end
+    functions also enable the model to manage
+    \l{QPersistentModelIndex}{persistent model indexes} correctly.
+
+    Normally, the begin and end functions are capable of informing other components
+    about changes to the model's underlying structure. For more complex changes to the
+    model's structure, perhaps involving internal reorganization or sorting of data,
+    it is necessary to emit the \l{QAbstractItemModel::layoutChanged()}{layoutChanged()}
+    signal to cause any attached views to be updated.
+
+    \section2 Lazy Population of Model Data
+
+    Lazy population of model data effectively allows requests for information
+    about the model to be deferred until it is actually needed by views.
+
+    Some models need to obtain data from remote sources, or must perform
+    time-consuming operations to obtain information about the way the
+    data is organized. Since views generally request as much information
+    as possible in order to accurately display model data, it can be useful
+    to restrict the amount of information returned to them to reduce
+    unnecessary follow-up requests for data.
+
+    In hierarchical models where finding the number of children of a given
+    item is an expensive operation, it is useful to ensure that the model's
+    \l{QAbstractItemModel::}{rowCount()} implementation is only called when
+    necessary. In such cases, the \l{QAbstractItemModel::}{hasChildren()}
+    function can be reimplemented to provide an inexpensive way for views to
+    check for the presence of children and, in the case of QTreeView, draw
+    the appropriate decoration for their parent item.
+
+    Whether the reimplementation of \l{QAbstractItemModel::}{hasChildren()}
+    returns \c true or \c false, it may not be necessary for the view to call
+    \l{QAbstractItemModel::}{rowCount()} to find out how many children are
+    present. For example, QTreeView does not need to know how many children
+    there are if the parent item has not been expanded to show them.
+
+    If it is known that many items will have children, reimplementing
+    \l{QAbstractItemModel::}{hasChildren()} to unconditionally return \c true
+    is sometimes a useful approach to take. This ensures that each item can
+    be later examined for children while making initial population of model
+    data as fast as possible. The only disadvantage is that items without
+    children may be displayed incorrectly in some views until the user
+    attempts to view the non-existent child items.
+
+
+    \section1 Navigation and Model Index Creation
+
+    Hierarchical models need to provide functions that views can call to navigate the
+    tree-like structures they expose, and obtain model indexes for items.
+
+    \section2 Parents and Children
+
+    Since the structure exposed to views is determined by the underlying data
+    structure, it is up to each model subclass to create its own model indexes
+    by providing implementations of the following functions:
+
+    \table 90%
+    \row \o \l{QAbstractItemModel::index()}{index()}
+         \o Given a model index for a parent item, this function allows views and delegates
+            to access children of that item. If no valid child item - corresponding to the
+            specified row, column, and parent model index, can be found, the function
+            must return QModelIndex(), which is an invalid model index.
+    \row \o \l{QAbstractItemModel::parent()}{parent()}
+         \o Provides a model index corresponding to the parent of any given child item.
+            If the model index specified corresponds to a top-level item in the model, or if
+            there is no valid parent item in the model, the function must return
+            an invalid model index, created with the empty QModelIndex() constructor.
+    \endtable
+
+    Both functions above use the \l{QAbstractItemModel::createIndex()}{createIndex()}
+    factory function to generate indexes for other components to use. It is normal for
+    models to supply some unique identifier to this function to ensure that
+    the model index can be re-associated with its corresponding item later on.
+
+    \section1 Drag and Drop Support and MIME Type Handling
+
+    The model/view classes support drag and drop operations, providing default behavior
+    that is sufficient for many applications. However, it is also possible to customize
+    the way items are encoded during drag and drop operations, whether they are copied
+    or moved by default, and how they are inserted into existing models.
+
+    Additionally, the convenience view classes implement specialized behavior that
+    should closely follow that expected by existing developers.
+    The \l{#Convenience Views}{Convenience Views} section provides an overview of this
+    behavior.
+
+    \section2 MIME Data
+
+    By default, the built-in models and views use an internal MIME type
+    (\c{application/x-qabstractitemmodeldatalist}) to pass around information about
+    model indexes. This specifies data for a list of items, containing the row and
+    column numbers of each item, and information about the roles that each item
+    supports.
+
+    Data encoded using this MIME type can be obtained by calling
+    QAbstractItemModel::mimeData() with a QModelIndexList containing the items to
+    be serialized.
+    \omit
+    The following types are used to store information about
+    each item as it is streamed into a QByteArray and stored in a QMimeData object:
+
+    \table 90%
+    \header \o Description \o Type
+    \row \o Row \o int
+    \row \o Column \o int
+    \row \o Data for each role \o QMap<int, QVariant>
+    \endtable
+
+    This information can be retrieved for use in non-model classes by calling
+    QMimeData::data() with the \c{application/x-qabstractitemmodeldatalist} MIME
+    type and streaming out the items one by one.
+    \endomit
+
+    When implementing drag and drop support in a custom model, it is possible to
+    export items of data in specialized formats by reimplementing the following
+    function:
+
+    \table 90%
+    \row \o \l{QAbstractItemModel::mimeData()}{mimeData()}
+         \o This function can be reimplemented to return data in formats other
+            than the default \c{application/x-qabstractitemmodeldatalist} internal
+            MIME type.
+
+            Subclasses can obtain the default QMimeData object from the base class
+            and add data to it in additional formats.
+    \endtable
+
+    For many models, it is useful to provide the contents of items in common format
+    represented by MIME types such as \c{text/plain} and \c{image/png}. Note that
+    images, colors and HTML documents can easily be added to a QMimeData object with
+    the QMimeData::setImageData(), QMimeData::setColorData(), and
+    QMimeData::setHtml() functions.
+
+    \section2 Accepting Dropped Data
+
+    When a drag and drop operation is performed over a view, the underlying model is
+    queried to determine which types of operation it supports and the MIME types
+    it can accept. This information is provided by the
+    QAbstractItemModel::supportedDropActions() and QAbstractItemModel::mimeTypes()
+    functions. Models that do not override the implementations provided by
+    QAbstractItemModel support copy operations and the default internal MIME type
+    for items.
+
+    When serialized item data is dropped onto a view, the data is inserted into
+    the current model using its implementation of QAbstractItemModel::dropMimeData().
+    The default implementation of this function will never overwrite any data in the
+    model; instead, it tries to insert the items of data either as siblings of an
+    item, or as children of that item.
+
+    To take advantage of QAbstractItemModel's default implementation for the built-in
+    MIME type, new models must provide reimplementations of the following functions:
+
+    \table 90%
+    \row \o \l{QAbstractItemModel::insertRows()}{insertRows()}
+         \o {1, 2} These functions enable the model to automatically insert new data using
+            the existing implementation provided by QAbstractItemModel::dropMimeData().
+    \row \o \l{QAbstractItemModel::insertColumns()}{insertColumns()}
+    \row \o \l{QAbstractItemModel::setData()}{setData()}
+         \o Allows the new rows and columns to be populated with items.
+    \row \o \l{QAbstractItemModel::setItemData()}{setItemData()}
+         \o This function provides more efficient support for populating new items.
+    \endtable
+
+    To accept other forms of data, these functions must be reimplemented:
+
+    \table 90%
+    \row \o \l{QAbstractItemModel::supportedDropActions()}{supportedDropActions()}
+         \o Used to return a combination of \l{Qt::DropActions}{drop actions},
+            indicating the types of drag and drop operations that the model accepts.
+    \row \o \l{QAbstractItemModel::mimeTypes()}{mimeTypes()}
+         \o Used to return a list of MIME types that can be decoded and handled by
+            the model. Generally, the MIME types that are supported for input into
+            the model are the same as those that it can use when encoding data for
+            use by external components.
+    \row \o \l{QAbstractItemModel::dropMimeData()}{dropMimeData()}
+         \o Performs the actual decoding of the data transferred by drag and drop
+            operations, determines where in the model it will be set, and inserts
+            new rows and columns where necessary. How this function is implemented
+            in subclasses depends on the requirements of the data exposed by each
+            model.
+    \endtable
+
+    If the implementation of the \l{QAbstractItemModel::dropMimeData()}{dropMimeData()}
+    function changes the dimensions of a model by inserting or removing rows or
+    columns, or if items of data are modified, care must be taken to ensure that
+    all relevant signals are emitted. It can be useful to simply call
+    reimplementations of other functions in the subclass, such as
+    \l{QAbstractItemModel::setData()}{setData()},
+    \l{QAbstractItemModel::insertRows()}{insertRows()}, and
+    \l{QAbstractItemModel::insertColumns()}{insertColumns()}, to ensure that the
+    model behaves consistently.
+
+    In order to ensure drag operations work properly, it is important to
+    reimplement the following functions that remove data from the model:
+
+    \list
+        \o \l{QAbstractItemModel::}{removeRows()}
+        \o \l{QAbstractItemModel::}{removeRow()}
+        \o \l{QAbstractItemModel::}{removeColumns()}
+        \o \l{QAbstractItemModel::}{removeColumn()}
+    \endlist
+
+    For more information about drag and drop with item views, refer to
+    \l{Using Drag and Drop with Item Views}.
+
+    \section2 Convenience Views
+
+    The convenience views (QListWidget, QTableWidget, and QTreeWidget) override
+    the default drag and drop functionality to provide less flexible, but more
+    natural behavior that is appropriate for many applications. For example,
+    since it is more common to drop data into cells in a QTableWidget, replacing
+    the existing contents with the data being transferred, the underlying model
+    will set the data of the target items rather than insert new rows and columns
+    into the model. For more information on drag and drop in convenience views,
+    you can see \l{Using Drag and Drop with Item Views}.
+
+    \section1 Performance Optimization for Large Amounts of Data
+
+    The \l{QAbstractItemModel::}{canFetchMore()} function checks if the parent
+    has more data available and returns true or false accordingly. The
+    \l{QAbstractItemModel::}{fetchMore()} function fetches data based on the
+    parent specified. Both these functions can be combined, for example, in a
+    database query involving incremental data to populate a QAbstractItemModel.
+    We reimplement \l{QAbstractItemModel::}{canFetchMore()} to indicate if there
+    is more data to be fetched and \l{QAbstractItemModel::}{fetchMore()} to
+    populate the model as required.
+
+    Another example would be dynamically populated tree models, where we
+    reimplement \l{QAbstractItemModel::}{fetchMore()} when a branch in the tree
+    model is expanded.
+
+    If your reimplementation of \l{QAbstractItemModel::}{fetchMore()} adds rows
+    to the model, you need to call \l{QAbstractItemModel::}{beginInsertRows()}
+    and \l{QAbstractItemModel::}{endInsertRows()}. Also, both
+    \l{QAbstractItemModel::}{canFetchMore()} and  \l{QAbstractItemModel::}
+    {fetchMore()} must be reimplemented as their default implementation returns
+    false and does nothing.
+*/
+
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
new file mode 100644
index 0000000000..7372994edd
--- /dev/null
+++ b/doc/src/modules.qdoc
@@ -0,0 +1,105 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \group modules
+    \title Qt's Modules
+    \startpage index.html Qt Reference Documentation
+    \nextpage QtCore
+
+    Qt 4 consists of several modules, each of which lives in a
+    separate library.
+
+    Modules for general software development:
+
+    \table 80%
+    \row \o \l{QtCore} \o Core non-graphical classes used by other modules
+    \row \o \l{QtGui} \o Graphical user interface (GUI) components
+    \row \o \l{QtNetwork} \o Classes for network programming
+    \row \o \l{QtOpenGL} \o OpenGL support classes
+    \row \o \l{QtScript} \o Classes for evaluating Qt Scripts
+    \row \o \l{QtScriptTools} \o Additional Qt Script components
+    \row \o \l{QtSql} \o Classes for database integration using SQL
+    \row \o \l{QtSvg} \o Classes for displaying the contents of SVG files
+    \row \o \l{QtWebKit} \o Classes for displaying and editing Web content
+    \row \o \l{QtXml} \o Classes for handling XML
+    \row \o \l{QtXmlPatterns} \o An XQuery & XPath engine for XML and custom data models
+    \row \o \l{Phonon Module}{Phonon} \o Multimedia framework classes
+    \row \o \l{Qt3Support} \o Qt 3 compatibility classes
+    \endtable
+
+    Modules for working with Qt's tools:
+
+    \table 80%
+    \row \o \l{QtDesigner} \o Classes for extending \QD
+    \row \o \l{QtUiTools} \o Classes for handling \QD forms in applications
+    \row \o \l{QtHelp} \o Classes for online help    
+    \row \o \l{QtAssistant} \o Support for online help
+    \row \o \l{QtTest} \o Tool classes for unit testing
+    \endtable
+
+    The following extension modules are available in the \l{Qt
+    Commercial Editions} on Windows:
+
+    \table 80%
+    \row \o \l{QAxContainer} \o Extension for accessing ActiveX controls
+    \row \o \l{QAxServer} \o Extension for writing ActiveX servers
+    \endtable
+
+    The following extension module is available in all \l {Qt Editions}
+    on Unix platforms:
+
+    \table 80%
+    \row \o \l{QtDBus} \o Classes for Inter-Process Communication using the D-Bus
+    \endtable
+
+    If you use \l qmake to build your projects, the QtCore and QtGui
+    modules are included by default. To link only against QtCore, add
+    the following line to your \c .pro file:
+
+    \snippet doc/src/snippets/code/doc_src_modules.qdoc 0
+
+    On Windows, if you do not use \l qmake, the \l{Visual Studio Integration}
+    available to \l{Qt Commercial Editions}{commercial licensees}, or other
+    build tools such as CMake, you also need to link against the \c qtmain library.
+
+    \sa {Qt's Classes}
+*/
diff --git a/doc/src/object.qdoc b/doc/src/object.qdoc
new file mode 100644
index 0000000000..3bd563a3e6
--- /dev/null
+++ b/doc/src/object.qdoc
@@ -0,0 +1,132 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page object.html
+    \title Qt Object Model
+    \ingroup architecture
+    \brief A description of the powerful features made possible by Qt's dynamic object model.
+
+    The standard C++ object model provides very efficient runtime
+    support for the object paradigm. But its static nature is
+    inflexibile in certain problem domains. Graphical user interface
+    programming is a domain that requires both runtime efficiency and
+    a high level of flexibility. Qt provides this, by combining the
+    speed of C++ with the flexibility of the Qt Object Model.
+
+    Qt adds these features to C++:
+
+    \list
+    \o a very powerful mechanism for seamless object
+       communication called \l{signals and slots}
+    \o queryable and designable \l{Qt's Property System}{object
+       properties}
+    \o powerful \l{events and event filters}
+    \o contextual \l{i18n}{string translation for internationalization}
+    \o sophisticated interval driven \l timers that make it possible
+       to elegantly integrate many tasks in an event-driven GUI
+    \o hierarchical and queryable \l{Object Trees and Object Ownership}{object
+       trees} that organize object ownership in a natural way
+    \o guarded pointers (QPointer) that are automatically
+       set to 0 when the referenced object is destroyed, unlike normal C++
+       pointers which become dangling pointers when their objects are destroyed
+    \o a \l{metaobjects.html#qobjectcast}{dynamic cast} that works across
+       library boundaries.
+    \endlist
+
+    Many of these Qt features are implemented with standard C++
+    techniques, based on inheritance from QObject. Others, like the
+    object communication mechanism and the dynamic property system,
+    require the \l{Meta-Object System} provided
+    by Qt's own \l{moc}{Meta-Object Compiler (moc)}.
+
+    The meta-object system is a C++ extension that makes the language
+    better suited to true component GUI programming. Although
+    templates can be used to extend C++, the meta-object system
+    provides benefits using standard C++ that cannot be achieved with
+    templates; see \l{Why Doesn't Qt Use Templates for Signals and
+    Slots?}
+
+    \target Identity vs Value
+    \section1 Qt Objects: Identity vs Value
+
+    Some of the added features listed above for the Qt Object Model,
+    require that we think of Qt Objects as identities, not values.
+    Values are copied or assigned; identities are cloned. Cloning
+    means to create a new identity, not an exact copy of the old
+    one. For example, twins have different identities. They may look
+    identical, but they have different names, different locations, and
+    may have completely different social networks.
+
+    Then cloning an identity is a more complex operation than copying
+    or assigning a value. We can see what this means in the Qt Object
+    Model.
+
+    \bold{A Qt Object...}
+
+    \list
+
+    \o might have a unique \l{QObject::objectName()}.  If we copy a Qt
+    Object, what name should we give the copy?
+
+    \o has a location in an \l{Object Trees and Object Ownership}
+    {object hierarchy}. If we copy a Qt Object, where should the copy
+    be located?
+
+    \o can be connected to other Qt Objects to emit signals to them or
+    to receive signals emitted by them. If we copy a Qt Object, how
+    should we transfer these connections to the copy?
+
+    \o can have \l{Qt's Property System} {new properties} added to it
+    at runtime that are not declared in the C++ class. If we copy a Qt
+    Object, should the copy include the properties that were added to
+    the original?
+    
+    \endlist
+
+    For these reasons, Qt Objects should be treated as identities, not
+    as values. Identities are cloned, not copied or assigned, and
+    cloning an identity is a more complex operation than copying or
+    assigning a value. Therefore, QObject and all subclasses of
+    QObject (direct or indirect) have their \l{No copy constructor}
+    {copy constructor and assignment operator} disabled.
+
+  */
diff --git a/doc/src/objecttrees.qdoc b/doc/src/objecttrees.qdoc
new file mode 100644
index 0000000000..4b868c0897
--- /dev/null
+++ b/doc/src/objecttrees.qdoc
@@ -0,0 +1,117 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\page objecttrees.html
+\title Object Trees and Object Ownership
+\ingroup architecture
+\brief Information about the parent-child pattern used to describe
+object ownership in Qt.
+
+\section1 Overview
+
+\link QObject QObjects\endlink organize themselves in object trees.
+When you create a QObject with another object as parent, it's added to
+the parent's \link QObject::children() children() \endlink list, and
+is deleted when the parent is. It turns out that this approach fits
+the needs of GUI objects very well. For example, a \l QShortcut
+(keyboard shortcut) is a child of the relevant window, so when the
+user closes that window, the shorcut is deleted too.
+
+\l QWidget, the base class of everything that appears on the screen,
+extends the parent-child relationship. A child normally also becomes a
+child widget, i.e. it is displayed in its parent's coordinate system
+and is graphically clipped by its parent's boundaries. For example,
+when the application deletes a message box after it has been
+closed, the message box's buttons and label are also deleted, just as
+we'd want, because the buttons and label are children of the message
+box.
+
+You can also delete child objects yourself, and they will remove
+themselves from their parents. For example, when the user removes a
+toolbar it may lead to the application deleting one of its \l QToolBar
+objects, in which case the tool bar's \l QMainWindow parent would
+detect the change and reconfigure its screen space accordingly.
+
+The debugging functions \l QObject::dumpObjectTree() and \l
+QObject::dumpObjectInfo() are often useful when an application looks or
+acts strangely.
+
+\target note on the order of construction/destruction of QObjects
+\section1 Construction/Destruction Order of QObjects
+
+When \l {QObject} {QObjects} are created on the heap (i.e., created
+with \e new), a tree can be constructed from them in any order, and
+later, the objects in the tree can be destroyed in any order. When any
+QObject in the tree is deleted, if the object has a parent, the
+destructor automatically removes the object from its parent. If the
+object has children, the destructor automatically deletes each
+child. No QObject is deleted twice, regardless of the order of
+destruction.
+
+When \l {QObject} {QObjects} are created on the stack, the same
+behavior applies. Normally, the order of destruction still doesn't
+present a problem. Consider the following snippet:
+
+\snippet doc/src/snippets/code/doc_src_objecttrees.qdoc 0
+
+The parent, \c window, and the child, \c quit, are both \l {QObject}
+{QObjects} because QPushButton inherits QWidget, and QWidget inherits
+QObject. This code is correct: the destructor of \c quit is \e not
+called twice because the C++ language standard \e {(ISO/IEC 14882:2003)}
+specifies that destructors of local objects are called in the reverse
+order of their constructors. Therefore, the destructor of
+the child, \c quit, is called first, and it removes itself from its
+parent, \c window, before the destructor of \c window is called.
+
+But now consider what happens if we swap the order of construction, as
+shown in this second snippet:
+
+\snippet doc/src/snippets/code/doc_src_objecttrees.qdoc 1
+
+In this case, the order of destruction causes a problem. The parent's
+destructor is called first because it was created last. It then calls
+the destructor of its child, \c quit, which is incorrect because \c
+quit is a local variable. When \c quit subsequently goes out of scope,
+its destructor is called again, this time correctly, but the damage has
+already been done.
+
+*/
diff --git a/doc/src/opensourceedition.qdoc b/doc/src/opensourceedition.qdoc
new file mode 100644
index 0000000000..d8253d333d
--- /dev/null
+++ b/doc/src/opensourceedition.qdoc
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \page opensourceedition.html
+
+    \title Open Source Versions of Qt
+    \ingroup licensing
+    \brief Information about the license and features of the Open Source Edition.
+
+    Free (or open source) software is software that comes with a license
+    that gives users certain rights. In particular the right to use the
+    software, to modify it, to obtain its source, and to pass it on (under
+    the same terms). Notice that the term "free" is about rights, not
+    money. The Free Software Foundation (creators of the GNU GPL) speaks
+    of free in this context as in "free speech", not as in "no cost".
+
+    Qt Software supports the free software concept by providing the Qt Open Source
+    Edition, which is licensed under the \l{GNU General Public License (GPL)}
+    (version 3) and the \l{GNU Lesser General Public License (LGPL)} (version 2.1).
+    You can use this edition of Qt to create and distribute software with licenses
+    that are compatible to these free software licenses.
+
+    The support of open source with the Open Source Versions of Qt has enabled large
+    successful software projects like KDE to thrive, with thousands of developers
+    around the world using open source versions of Qt at no cost to themselves. With
+    the release of Qt 4, open source versions of Qt became available for Unix/X11,
+    Mac OS X, and Windows platforms.
+
+    The Open Source Edition can be downloaded from the \l{Downloads}{Qt website}.
+
+    Please refer to the online \l{License FAQ} for answers to frequently asked
+    questions on open source licensing and its implications.
+
+    More information on Free and Open Source software is available online:
+
+    \list
+    \o GNU GPL: \l http://www.gnu.org/.
+    \o Open Source licensing: \l http://www.opensource.org/.
+    \endlist
+
+    See \l{Licensing Information} for a collection of documents about licenses
+    used in Qt.
+
+    Information about Qt Commercial License Agreements is available
+    in the \l{Qt Licensing Overview} on the Qt website or by email
+    from \l{mailto:qt-sales@nokia.com}{qt-sales@nokia.com}.
+
+    If you are in doubt what edition of Qt is right for your project,
+    please contact
+    \l{mailto:qt-info@nokia.com}{qt-info@nokia.com}.
+
+*/
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
new file mode 100644
index 0000000000..8eb4e35fcf
--- /dev/null
+++ b/doc/src/overviews.qdoc
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page overviews.html
+
+    \title All Overviews and HOWTOs
+
+    \generatelist overviews
+*/
diff --git a/doc/src/paintsystem.qdoc b/doc/src/paintsystem.qdoc
new file mode 100644
index 0000000000..11b9a5b577
--- /dev/null
+++ b/doc/src/paintsystem.qdoc
@@ -0,0 +1,485 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page paintsystem.html
+
+    \title The Paint System
+
+    Qt's paint system enables painting on screen and print devices
+    using the same API, and is primarily based on the QPainter,
+    QPaintDevice, and QPaintEngine classes.
+
+    QPainter is used to perform drawing operations, QPaintDevice is an
+    abstraction of a two-dimensional space that can be painted on
+    using a QPainter, and QPaintEngine provides the interface that the
+    painter uses to draw onto different types of devices. The
+    QPaintEngine class is used internally by QPainter and
+    QPaintDevice, and is hidden from application programmers unless
+    they create their own device type.
+
+    \image paintsystem-core.png
+
+    The main benefit of this approach is that all painting follows the
+    same painting pipeline making it easy to add support for new
+    features and providing default implementations for unsupported
+    ones.
+
+    Alternatively, Qt provides the QtOpenGL module, offering classes
+    that makes it easy to use OpenGL in Qt applications. Among others,
+    the module provides an OpenGL widget class that can be used just
+    like any other Qt widget, except that it opens an OpenGL display
+    buffer where the OpenGL API can be used to render the contents.
+
+    \tableofcontents section1
+
+    \section1 Drawing
+
+    QPainter provides highly optimized functions to do most of the
+    drawing GUI programs require. It can draw everything from simple
+    graphical primitives (represented by the QPoint, QLine, QRect,
+    QRegion and QPolygon classes) to complex shapes like vector
+    paths. In Qt vector paths are represented by the QPainterPath
+    class. QPainterPath provides a container for painting operations,
+    enabling graphical shapes to be constructed and reused.
+
+    \table 100%
+    \row
+    \o \image paintsystem-painterpath.png
+    \o \bold QPainterPath
+
+    A painter path is an object composed of lines and curves. For
+    example, a rectangle is composed by lines and an ellipse is
+    composed by curves.
+
+    The main advantage of painter paths over normal drawing operations
+    is that complex shapes only need to be created once; then they can
+    be drawn many times using only calls to the QPainter::drawPath()
+    function.
+
+    A QPainterPath object can be used for filling, outlining, and
+    clipping. To generate fillable outlines for a given painter path,
+    use the QPainterPathStroker class.
+
+    \endtable
+
+    Lines and outlines are drawn using the QPen class. A pen is
+    defined by its style (i.e. its line-type), width, brush, how the
+    endpoints are drawn (cap-style) and how joins between two
+    connected lines are drawn (join-style). The pen's brush is a
+    QBrush object used to fill strokes generated with the pen,
+    i.e. the QBrush class defines the fill pattern.
+
+    QPainter can also draw aligned text and pixmaps.
+
+    When drawing text, the font is specified using the QFont class. Qt
+    will use the font with the specified attributes, or if no matching
+    font exists, Qt will use the closest matching installed font. The
+    attributes of the font that is actually used can be retrieved
+    using the QFontInfo class. In addition, the QFontMetrics class
+    provides the font measurements, and the QFontDatabase class
+    provides information about the fonts available in the underlying
+    window system.
+
+    Normally, QPainter draws in a "natural" coordinate system, but it
+    is able to perform view and world transformations using the
+    QMatrix class. For more information, see \l {The Coordinate
+    System} documentation which also describes the rendering process,
+    i.e. the relation between the logical representation and the
+    rendered pixels, and the benefits of anti-aliased painting.
+
+    \table 100%
+    \row \o
+    \bold {Anti-Aliased Painting}
+
+    When drawing, the pixel rendering is controlled by the
+    QPainter::Antialiasing render hint. The QPainter::RenderHint enum
+    is used to specify flags to QPainter that may or may not be
+    respected by any given engine.
+
+    The QPainter::Antialiasing value indicates that the engine should
+    antialias edges of primitives if possible, i.e. smoothing the
+    edges by using different color intensities.
+
+    \o \image paintsystem-antialiasing.png
+
+    \endtable
+
+    \section1 Filling
+
+    Shapes are filled using the QBrush class. A brush is defined
+    by its color and its style (i.e. its fill pattern).
+
+    Any color in Qt is represented by the QColor class which supports
+    the RGB, HSV and CMYK color models. QColor also support
+    alpha-blended outlining and filling (specifying the transparency
+    effect), and the class is platform and device independent (the
+    colors are mapped to hardware using the QColormap class). For more
+    information, see the QColor class documentation.
+
+    When creating a new widget, it is recommend to use the colors in
+    the widget's palette rather than hard-coding specific colors. All
+    widgets in Qt contain a palette and use their palette to draw
+    themselves. A widget's palette is represented by the QPalette
+    class which contains color groups for each widget state.
+
+    The available fill patterns are described by the Qt::BrushStyle
+    enum. These include basic patterns spanning from uniform color to
+    very sparse pattern, various line combinations, gradient fills and
+    textures. Qt provides the QGradient class to define custom
+    gradient fills, while texture patterns are specified using the
+    QPixmap class.
+
+    \table 100%
+    \row
+    \o \image paintsystem-fancygradient.png
+    \o \bold QGradient
+
+    The QGradient class is used in combination with QBrush to specify
+    gradient fills.
+
+    \image paintsystem-gradients.png
+
+    Qt currently supports three types of gradient fills: Linear
+    gradients interpolate colors between start and end points, radial
+    gradients interpolate colors between a focal point and end points
+    on a circle surrounding it, and conical gradients interpolate
+    colors around a center point.
+
+    \endtable
+
+    \section1 Creating a Paint Device
+
+    The QPaintDevice class is the base class of objects that can be
+    painted, i.e. QPainter can draw on any QPaintDevice
+    subclass. QPaintDevice's drawing capabilities are currently
+    implemented by the QWidget, QImage, QPixmap, QGLWidget,
+    QGLPixelBuffer, QPicture and QPrinter subclasses.
+
+    \image paintsystem-devices.png
+
+    \table 100%
+    \row \o \bold {Custom Backends}
+
+    Support for a new backend can be implemented by deriving from the
+    QPaintDevice class and reimplementing the virtual
+    QPaintDevice::paintEngine() function to tell QPainter which paint
+    engine should be used to draw on this particular device. To
+    actually be able to draw on the device, this paint engine must be
+    a custom paint engine created by deriving from the QPaintEngine
+    class.
+
+    \endtable
+
+    \section2 Widget
+
+    The QWidget class is the base class of all user interface
+    objects. The widget is the atom of the user interface: it receives
+    mouse, keyboard and other events from the window system, and
+    paints a representation of itself on the screen.
+
+    \section2 Image
+
+    The QImage class provides a hardware-independent image
+    representation which is designed and optimized for I/O, and for
+    direct pixel access and manipulation. QImage supports several
+    image formats including monochrome, 8-bit, 32-bit and
+    alpha-blended images.
+
+    One advantage of using QImage as a paint device is that it is
+    possible to guarantee the pixel exactness of any drawing operation
+    in a platform-independent way. Another benefit is that the
+    painting can be performed in another thread than the current GUI
+    thread.
+
+    \section2 Pixmap
+
+    The QPixmap class is an off-screen image representation which is
+    designed and optimized for showing images on screen. Unlike
+    QImage, the pixel data in a pixmap is internal and is managed by
+    the underlying window system, i.e. pixels can only be accessed
+    through QPainter functions or by converting the QPixmap to a
+    QImage.
+
+    To optimize drawing with QPixmap, Qt provides the QPixmapCache
+    class which can be used to store temporary pixmaps that are
+    expensive to generate without using more storage space than the
+    cache limit.
+
+    Qt also provides the QBitmap convenience class, inheriting
+    QPixmap. QBitmap guarantees monochrome (1-bit depth) pixmaps, and
+    is mainly used for creating custom QCursor and QBrush objects,
+    constructing QRegion objects, and for setting masks for pixmaps
+    and widgets.
+
+    \section2 OpenGL Widget
+
+    As mentioned above, Qt provides the QtOpenGL module offering
+    classes that makes it easy to use OpenGL in Qt applications. For
+    example, the QGLWidget enables the OpenGL API for
+    rendering.
+
+    But QGLWidget is also a QWidget subclass, and can be used by
+    QPainter as any other paint device. One huge benefit from this is
+    that it enables Qt to utilize the high performance of OpenGL for
+    most drawing operations, such as transformations and pixmap
+    drawing.
+
+    \section2 Pixel Buffer
+
+    The QtOpenGL module also provides the QGLPixelBuffer class which
+    inherits QPaintDevice directly.
+
+    QGLPixelBuffer encapsulates an OpenGL pbuffer. Rendering into a
+    pbuffer is normally done using full hardware acceleration which
+    can be significantly faster than rendering into a QPixmap.
+
+    \section2 Framebuffer Object
+
+    The QtOpenGL module also provides the QGLFramebufferObject class
+    which inherits QPaintDevice directly.
+
+    QGLFramebufferObject encapsulates an OpenGL framebuffer object.
+    Framebuffer objects can also be used for off-screen rendering, and
+    offer several advantages over pixel buffers for this purpose.
+    These are described in the QGLFramebufferObject class documentation.
+
+    \section2 Picture
+
+    The QPicture class is a paint device that records and replays
+    QPainter commands. A picture serializes painter commands to an IO
+    device in a platform-independent format. QPicture is also
+    resolution independent, i.e. a QPicture can be displayed on
+    different devices (for example svg, pdf, ps, printer and screen)
+    looking the same.
+
+    Qt provides the QPicture::load() and QPicture::save() functions
+    for loading and saving pictures. But in addition the QPictureIO
+    class is provided to enable the programmer to install new picture
+    file formats in addition to those that Qt provides.
+
+    \section2 Printer
+
+    The QPrinter class is a paint device that paints on a printer. On
+    Windows or Mac OS X, QPrinter uses the built-in printer
+    drivers. On X11, QPrinter generates postscript and sends that to
+    lpr, lp, or another print program. QPrinter can also print to any
+    other QPrintEngine object.
+
+    The QPrintEngine class defines an interface for how QPrinter
+    interacts with a given printing subsystem. The common case when
+    creating your own print engine, is to derive from both
+    QPaintEngine and QPrintEngine.
+
+    The output format is by default determined by the platform the
+    printer is running on, but by explicitly setting the output format
+    to QPrinter::PdfFormat, QPrinter will generate its output as a PDF
+    file.
+
+    \section1 Reading and Writing Image Files
+
+    The most common way to read images is through QImage and QPixmap's
+    constructors, or by calling the QImage::load() and QPixmap::load()
+    functions. In addition, Qt provides the QImageReader class which
+    gives more control over the process. Depending on the underlying
+    support in the image format, the functions provided by the class
+    can save memory and speed up loading of images.
+
+    Likewise, Qt provides the QImageWriter class which supports
+    setting format specific options, such as the gamma level,
+    compression level and quality, prior to storing the image. If you
+    do not need such options, you can use QImage::save() or
+    QPixmap::save() instead.
+
+    \table 100%
+    \row
+    \o \bold QMovie
+
+    QMovie is a convenience class for displaying animations, using the
+    QImageReader class internally.  Once created, the QMovie class
+    provides various functions for both running and controlling the
+    given animation.
+
+    \o \image paintsystem-movie.png
+    \endtable
+
+    The QImageReader and QImageWriter classes rely on the
+    QImageIOHandler class which is the common image I/O interface for
+    all image formats in Qt. QImageIOHandler objects are used
+    internally by QImageReader and QImageWriter to add support for
+    different image formats to Qt.
+
+    A list of the supported file formats are available through the
+    QImageReader::supportedImageFormats() and
+    QImageWriter::supportedImageFormats() functions. Qt supports
+    several file formats by default, and in addition new formats can
+    be added as plugins. The currently supported formats are listed in
+    the QImageReader and QImageWriter class documentation.
+
+    Qt's plugin mechanism can also be used to write a custom image
+    format handler. This is done by deriving from the QImageIOHandler
+    class, and creating a QImageIOPlugin object which is a factory for
+    creating QImageIOHandler objects. When the plugin is installed,
+    QImageReader and QImageWriter will automatically load the plugin
+    and start using it.
+
+    \table 100%
+    \row
+    \o \image paintsystem-svg.png
+    \o \bold {SVG Rendering}
+
+    Scalable Vector Graphics (SVG) is an language for describing both
+    static and animated two-dimensional vector graphics. Qt includes
+    support for the static features of SVG 1.2 Tiny.
+
+    SVG drawings can be rendered onto any QPaintDevice subclass.  This
+    approach gives developers the flexibility to experiment, in order
+    to find the best solution for each application.
+
+    The easiest way to render SVG files is to construct a QSvgWidget
+    and load an SVG file using one of the QSvgWidget::load()
+    functions. The rendering is performed by the QSvgRenderer class
+    which also can be used directly to provide SVG support for custom
+    widgets.
+
+    For more information, see the QtSvg module documentation.
+
+    \endtable
+
+    \section1 Styling
+
+    Qt's built-in widgets use the QStyle class to perform nearly all
+    of their drawing.  QStyle is an abstract base class that
+    encapsulates the look and feel of a GUI, and can be used to make
+    the widgets look exactly like the equivalent native widgets or to
+    give the widgets a custom look.
+
+    Qt provides a set of QStyle subclasses that emulate the native
+    look of the different platforms supported by Qt (QWindowsStyle,
+    QMacStyle, QMotifStyle, etc.). These styles are built into the
+    QtGui library, other styles can be made available using Qt's
+    plugin mechansim.
+
+    Most functions for drawing style elements take four arguments:
+
+    \list
+    \o an enum value specifying which graphical element to draw
+    \o a QStyleOption object specifying how and where to render that element
+    \o a QPainter object that should be used to draw the element
+    \o a QWidget object on which the drawing is performed (optional)
+    \endlist
+
+    The style gets all the information it needs to render the
+    graphical element from the QStyleOption class. The widget is
+    passed as the last argument in case the style needs it to perform
+    special effects (such as animated default buttons on Mac OS X),
+    but it isn't mandatory. In fact, QStyle can be used to draw on any
+    paint device (not just widgets), in which case the widget argument
+    is a zero pointer.
+
+    \image paintsystem-stylepainter.png
+
+    The paint system also provides the QStylePainter class inheriting
+    from QPainter.  QStylePainter is a convenience class for drawing
+    QStyle elements inside a widget, and extends QPainter with a set
+    of high-level drawing functions implemented on top of QStyle's
+    API. The advantage of using QStylePainter is that the parameter
+    lists get considerably shorter.
+
+    \table 100%
+    \row
+    \o \inlineimage paintsystem-icon.png
+    \o \bold QIcon
+
+    The QIcon class provides scalable icons in different modes and states.
+
+    QIcon can generate pixmaps reflecting an icon's state, mode and
+    size. These pixmaps are generated from the set of pixmaps
+    made available to the icon, and are used by Qt widgets to show an
+    icon representing a particular action.
+
+    The rendering of a QIcon object is handled by the QIconEngine
+    class. Each icon has a corresponding icon engine that is
+    responsible for drawing the icon with a requested size, mode and
+    state.
+
+    \endtable
+
+    \section1 Selecting the Painting Backend
+
+    Since Qt 4.5, it is possible to replace the paint engines and paint
+    devices used for widgets, pixmaps and the offscreen double buffer. By
+    default the backends are:
+
+    \table
+        \row
+            \o Windows
+            \o Software Rasterizer
+        \row
+            \o X11
+            \o X11
+        \row
+            \o Mac OS X
+            \o CoreGraphics
+        \row
+            \o Embedded
+            \o Software Rasterizer
+    \endtable
+
+    Passing a command line parameter to the application, such as,
+    \c{-graphicssystem raster}, specifies that Qt should use the software
+    rasterizer for this application. The Software rasterizer is fully
+    supported on all platforms.
+
+    \code
+      > analogclock -graphicssystem raster
+    \endcode
+
+    There is also a \c{-graphicssystem opengl} mode that uses OpenGL for
+    all drawing. Currently, this engine is experimental as it does not draw
+    everything correctly.
+
+    Qt also supports being configured using \c {-graphicssystem
+    raster|opengl} in which case all applications will use the
+    specified graphics system for its graphics.
+
+ */
+
diff --git a/doc/src/phonon-api.qdoc b/doc/src/phonon-api.qdoc
new file mode 100644
index 0000000000..01f7c8a4b3
--- /dev/null
+++ b/doc/src/phonon-api.qdoc
@@ -0,0 +1,4993 @@
+/*
+    This file is part of the KDE project
+    Copyright (C) 2005-2007 Matthias Kretz <kretz@kde.org>
+    Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+   Contact: Qt Software Information (qt-info@nokia.com)
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License version 2 as published by the Free Software Foundation.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+
+/*!
+    \enum Phonon::DiscType
+    Enum to identify the media discs supported by MediaObject.
+
+    \value NoDisc
+    No disc was selected. This is only useful as a return value from
+    MediaSource::diskType().
+    \value Cd Identifies Audio CDs.
+    \value Dvd Identifies DVDs (not arbitrary data DVDs, only movie DVDs).
+    \value Vcd Identifies Video CDs.
+
+    \sa MediaSource, MediaObject
+*/
+
+/*!
+    \enum Phonon::MetaData
+
+    Provided as keys for Phonon::MediaObject::metaData(). The enum
+    values matches strings defined in the Ogg Vorbis specification
+
+    \value ArtistMetaData
+    \value AlbumMetaData
+    \value TitleMetaData
+    \value DateMetaData
+    \value GenreMetaData
+    \value TracknumberMetaData
+    \value DescriptionMetaData
+    \value MusicBrainzDiscIdMetaData
+*/
+
+/*!
+    \enum Phonon::State
+    \since 4.4
+
+    The state enum describes the different states a media object can
+    take. Several functions of \l{Phonon::}{MediaObject} are
+    asynchronous, so even if a you have requested a state change
+    through a function call, e.g., through
+    \l{Phonon::MediaObject::}{play()}, you cannot be sure that the
+    change has taken place before you receive the
+    \l{Phonon::MediaObject::}{stateChanged()} signal. 
+
+    A media object can at any time change into any state, regardless
+    of the state it previously had. \omit In the
+    \l{Phonon::}{MediaObject} class description explains the typical
+    state changes in the life of a media object. \endomit
+
+    \value LoadingState
+    After construction it might take a while before the media object
+    is ready to \l{Phonon::MediaObject::}{play()}. This state is
+    commonly used by backends to initialize the \l{Phonon
+    Overview}{media graph} and loading the source. When
+    the object leaves the loading state, it will enter the
+    StoppedState unless an error occurred or another state is
+    requested through a function call, e.g.,
+    \l{Phonon::}{MediaObject::play()}.
+
+    \value StoppedState
+    In the stopped state, the media object is ready to play its
+    current media source. The current
+    \l{MediaObject::seek()}{position} in the media stream is then 0.
+
+    \value PlayingState
+    The media object is playing back its media source.
+
+    \value BufferingState
+    The Player is waiting for data to be able to start or continue
+    playing. This state is commonly used to wait for media data over a
+    network connection.
+
+    \value PausedState
+    The media player has currently paused its playback, i.e., it
+    stops playing but keeps the current playback position in the
+    stream.
+
+    \value ErrorState
+    When a media object enters the error state a problem with the
+    playback has occurred. The possible errors are grouped into
+    two categories by Phonon::ErrorType, and the type can be
+    queried through \l{Phonon::MediaObject::}{errorType()}. A
+    \l{Phonon::}{FatalError} implies that the playback
+    cannot continue, but one can still try with a new media
+    source. With a \l{Phonon::}{NormalError} it might
+    be possible to continue playback, and a media object may
+    therefore change state from the ErrorState.
+
+    \sa MediaObject
+*/
+
+/*!
+    \enum Phonon::Category
+
+    Sets the category your program should be listed in in the mixer.
+
+    \value NoCategory
+    Will make use of the default device.
+    \value NotificationCategory
+    If the sounds produced are notifications (ping, beep and such) you
+    should use this category.
+    \value MusicCategory
+    If your application is a music player (like a jukebox or media player
+    playing an audio file).
+    \value VideoCategory
+    If the sound is the audio channel of a video.
+    \value CommunicationCategory
+    If your applications produces sounds from communication with somebody
+    else (VoIP, voice chat).
+    \value GameCategory
+    Sound produced by a computer game should go into this category.
+    \value AccessibilityCategory
+    Sounds produced for accessibility (e.g., Text-To-Speech)
+    \omitvalue LastCategory
+    Holds the largest value of categories.
+    \omitvalue AccessibilityCategory
+
+    A Jukebox will set this to Music, a VoIP program to Communication, a
+    DVD player to video, and so on.
+
+    \note These categories can also become useful for an application that
+    controls the volumes automatically, like turning down the music when a call
+    comes in, or turning down the notifications when the media player knows
+    it's playing classical music.
+*/
+
+/*!
+    \enum Phonon::ErrorType
+
+    This enum describes the severity when an error has occurred during
+    playback.
+
+    After a media object has entered the \l{Phonon::}{ErrorState}, one
+    can query the type of error from
+    \l{Phonon::}{MediaObject::errorType()}. Note that you should query
+    the error when receiving the
+    \l{Phonon::}{MediaObject::stateChanged()} signal, because the
+    error type will be lost if the media object leaves the error
+    state.    
+
+    \value NoError No error. MediaObject::errorType() returns this if
+    MediaObject::state() != Phonon::ErrorState.
+
+    \value NormalError An error has occurred with the playback of the current
+    source. It might be possible to continue playback, for instance, if only the
+    audio stream in a video cannot be played back. The media object will then
+    leave the error state again.
+
+    \value FatalError. Something important does not work. Your program cannot continue
+    the playback of the current source, but it might be possible to try another.
+
+    \sa MediaObject::errorType()
+*/
+
+/*!
+    \fn QString Phonon::categoryToString(Category c)
+
+    Returns a (translated) string to show to the user identifying the given
+    Category (\a c).
+*/
+
+/*!
+    \enum Phonon::ObjectDescriptionType
+    \relates Phonon::ObjectDescription
+
+    This enum defines the type of information that is contained in a
+    \l{Phonon::}{ObjectDescription} object.
+
+    \value AudioOutputDeviceType An audio output device (\l{Phonon::}{AudioOutputDevice}).
+    This can be soundcards (with different drivers),
+    sound servers, or other virtual outputs like playback on a different
+    computer on the network.
+
+    \value EffectType An audio effect (\l{Phonon::}{EffectDescription}).
+    \omitvalue SubtitleType 
+    \omitvalue AudioCaptureDeviceType 
+    \omitvalue AudioChannelType 
+*/
+
+/*!
+    \typedef Phonon::AudioOutputDevice
+    \relates Phonon::ObjectDescription    
+
+    This typedef of \l{Phonon::}{ObjectDescription} describes an audio output
+    device, such as soundcards (with different drivers), sound servers, or other
+    virtual outputs like playback on a different computer on the network.
+
+    \omit
+    For Hardware devices the backend should use libkaudiodevicelist
+    (AudioDevice and AudioDeviceEnumerator) which will list removable
+    devices even when they are unplugged and provide a unique identifier
+    that can make backends use the same identifiers.
+    \endomit
+
+    A list of available devices is given by the backend with
+    Backendcapabilities::availableAudioOutputDevices()
+
+    \snippet doc/src/snippets/phononobjectdescription.cpp 1
+
+*/
+
+/*!
+    \fn Phonon::phononVersion()
+    \inmodule Phonon
+    \since 4.5
+    
+    Returns the Phonon version.
+*/
+
+/*!
+    \class Phonon::ObjectDescription
+    \inmodule Phonon
+    \inheaderfile Phonon/ObjectDescription
+    \since 4.4
+    \brief The ObjectDescription class provides information about Phonon objects.
+
+    Phonon currently uses this class to describe audio effects and
+    audio output devices - using the typedefs AudioOutputDevice and
+    EffectDescription. The type of an ObjectDescription is also
+    described through the \l{Phonon::}{ObjectDescriptionType} enum.
+    Objects of the same \l{Phonon::ObjectDescriptionType}{type} are
+    uniquely identified by an index().
+
+    The class gives a description() and a name() of the object, both
+    of which are strings appropriate for end users of a Phonon
+    application. You can also check whether the device or effect
+    described is \l{isValid()}{valid}. This does not guarantee that
+    the device or effect functions as expected, but that the
+    ObjectDescription describes an existing device or effect.
+
+    Audio output devices and effect descriptions are used to select
+    the audio output device to be used for playback and to create
+    effects; we show examples of this in the snippet below. The
+    available descriptions can be fetched with
+    \l{Phonon::BackendCapabilities::}{availableAudioOutputDevices()}
+    and \l{Phonon::BackendCapabilities::}{availableAudioEffects()}
+    static functions in the Phonon::BackendCapabilities namespace
+
+    \snippet doc/src/snippets/phononobjectdescription.cpp 0
+
+    Other types of ObjectDescriptions might be possible in the future,
+    e.g., descriptions of audio capture devices, such as microphones.
+
+    \omit Not implemented yet.
+    Need a new paragraph on that some descriptions 'belong
+    together', such as chained audio effects.
+
+    Some parts give the end user choices, e.g. what source to capture
+    audio from. These choices are described by the name and
+    description methods of this class and identified with the id
+    method. Subclasses then define additional information like which
+    audio and video choices belong together.  \endomit
+
+    \sa Phonon::AudioOutputDevice, Phonon::EffectDescription, {Capabilities Example}, {Phonon Module}
+*/
+
+/*!
+    \fn Phonon::ObjectDescription::ObjectDescription()
+    \brief constructs a new object description.
+    \internal
+*/
+
+/*!
+    \fn Phonon::ObjectDescription::ObjectDescription (int index, const QHash<QByteArray, QVariant> & properties)
+    \internal
+*/
+
+/*!
+    \fn Phonon::ObjectDescription::ObjectDescription(const QExplicitlySharedDataPointer<ObjectDescriptionData> &dd)
+    \internal
+*/
+
+/*!
+    \fn static inline ObjectDescription<T> Phonon::ObjectDescription::fromIndex(int index)
+    \internal
+
+    \omit Currently indices are not unique for all ObjectDescription types, making
+    the behavior of this function undefined. \endomit
+
+    Returns a new description object that describes the
+    device/effect/codec/...  with the given \a index.
+*/
+
+/*!
+    \fn inline bool Phonon::ObjectDescription::operator==(const ObjectDescription &otherDescription) const
+
+    Returns \c true if this ObjectDescription describes the same
+    object as \a otherDescription; otherwise, returns \c false.
+*/
+
+/*!
+    \fn inline bool Phonon::ObjectDescription::operator!=(const ObjectDescription &otherDescription) const
+    Returns \c false if this ObjectDescription describes the same
+    as \a otherDescription; otherwise, returns \c true.
+*/
+
+/*!
+    \fn inline QString Phonon::ObjectDescription::name() const
+
+    Returns a string appropriate for a user to select between
+    object descriptions, e.g., from a QComboBox.
+
+    \sa description()
+*/
+
+/*!
+    \fn inline QString Phonon::ObjectDescription::description() const
+
+    Returns a more extensive description than the name() function.
+
+    For example, in the case of \l{Phonon::}{AudioOutputDevice}s, this
+    text should make clear which sound source is described; this is
+    sometimes hard to describe or understand from just the name.
+
+    The text is appropriate to present to an end user in for example
+    tool tips of items, with the name()'s as text, in a QComboBox.
+
+*/
+
+/*!
+    \fn inline QVariant Phonon::ObjectDescription::property(const char *name) const
+
+    Returns the property named \a name. A property can be used for
+    extended information, such as the manufacturer of a sound card. The
+    information will usually be given as text.
+
+    If the property is not set an invalid QVariant is returned.
+
+    Qt's backends do not use properties at the time of this writing.
+
+    \sa propertyNames()
+*/
+
+/*!
+    \fn inline QList<QByteArray> Phonon::ObjectDescription::propertyNames() const
+
+    Properties can be used for extended information about a
+    ObjectDescription, e.g., a manufacturer of a sound card. The
+    information will usually be given text.
+
+    This function returns all names that return valid data when
+    property() is called.
+
+    Currently, Qt backends do not use properties for their object
+    descriptions. 
+
+    \sa property()
+*/
+
+/*!
+    \fn inline bool Phonon::ObjectDescription::isValid() const
+
+    Returns true if the device or effect described exists. 
+
+    An ObjectDescription that is invalid, will also have an
+    index() of -1.
+
+    \sa index()
+*/
+
+/*!
+    \fn inline int Phonon::ObjectDescription::index() const
+
+    Returns a unique identifier for this ObjectDescription. Used
+    internally to distinguish between the descriptions.
+
+    Notice that the identifiers are only unique to the type of
+    description, e.g., \l{Phonon::}{AudioOutputDevice} or
+    \l{Phonon::}{EffectDescription}.
+*/
+
+/*!
+    \class Phonon::ObjectDescriptionPrivate
+    \inmodule Phonon
+    \since 4.4
+    \internal
+
+*/
+
+/*!
+    \class Phonon::StreamInterface
+    \inmodule Phonon
+    \since 4.4
+    \brief Backend interface to handle media streams (AbstractMediaStream).
+    \internal
+*/
+
+/*!
+    \fn virtual Phonon::StreamInterface::~StreamInterface()
+*/
+
+/*!
+    \fn virtual void Phonon::StreamInterface::writeData(const QByteArray &data) = 0
+    \internal
+*/
+
+/*!
+    \fn virtual void Phonon::StreamInterface::endOfData() = 0
+    \internal
+*/
+
+/*!
+    \fn virtual void Phonon::StreamInterface::setStreamSize(qint64 newSize) = 0
+    \internal
+*/
+
+/*!
+    \fn virtual void Phonon::StreamInterface::setStreamSeekable(bool s) = 0
+    \internal
+*/
+
+/*!
+    \fn void Phonon::StreamInterface::connectToSource(const MediaSource &mediaSource)
+    \internal
+*/
+
+/*!
+    \fn void Phonon::StreamInterface::needData()
+    \internal
+*/
+
+/*!
+    \fn void Phonon::StreamInterface::enoughData()
+    \internal
+*/
+
+/*!
+    \fn void Phonon::StreamInterface::seekStream(qint64)
+    \internal
+*/
+
+/*!
+    \fn void Phonon::StreamInterface::reset()
+    \internal
+*/
+
+/*!
+    \fn Phonon::StreamInterface::StreamInterface()
+    \internal
+    \omit
+    For subclasses.
+    \endomit
+*/
+
+/*!
+    \class StreamInterfacePrivate
+    \inmodule Phonon
+    \internal
+*/
+
+/*!
+    \class Phonon::AbstractVideoOutput
+    \inmodule Phonon
+    \internal
+    \since 4.4
+    \brief The AbstractVideoOutput class is the common base class for all video output classes.
+
+    \sa VideoWidget
+*/
+
+/*!
+    \namespace Phonon::Experimental
+    \internal
+*/
+
+/*!
+    \fn Phonon::AbstractVideoOutput::AbstractVideoOutput(AbstractVideoOutputPrivate &d)
+    \internal
+
+    Constructor that is called from derived classes.
+
+    \param parent Standard QObject parent.
+*/
+
+/*!
+    \class Phonon::AbstractVideoOutputPrivate
+    \inmodule Phonon
+    \internal
+    \since 4.4
+*/
+
+/*!
+    \class Phonon::VolumeFaderEffect
+    \inmodule Phonon
+    \internal
+    \since 4.4
+
+    This effect differs from gradually changing the output volume in that
+    a dedicated effect can change the volume in the smallest possible
+    steps while every other volume control will make more or less
+    noticeable steps.
+
+    \sa AudioOutput::volume()
+*/
+
+/*!
+    \property Phonon::VolumeFaderEffect::volume
+
+    This is the current volume of the output as voltage factor.
+    Setting this property changes the volume immediately.
+
+    1.0 means 100%, 0.5 means 50% voltage/25% power, 0.0 means 0%
+
+    \sa volumeDecibel
+*/
+
+/*!
+    \property Phonon::VolumeFaderEffect::volumeDecibel
+
+    This is the current volume of the output in decibel.
+    Setting this property changes the volume immediately.
+
+    0 dB means no change in volume, -6dB means an attenuation of the
+    voltage to 50% and an attenuation of the power to 25%, -inf dB means
+    silence.
+
+    \sa volume
+*/
+
+/*!
+    \property Phonon::VolumeFaderEffect::fadeCurve
+
+    This property holds the fade curve to be used for the fadeIn(), fadeOut()
+    and fadeTo() slots.
+
+    Defaults to Fade3Decibel.
+
+    \sa FadeCurve
+*/
+
+/*!
+    \enum Phonon::VolumeFaderEffect::FadeCurve
+    Determines the curve of the volume change.
+
+    \value Fade3Decibel Crossfade curve/fast fade out.
+    This is the default fade curve.
+    \value Fade6Decibel Linear fade out.
+    \value Fade9Decibel Slow fade out.
+    \value Fade12Decibel A more extreme version of the -9dB fade.
+
+    \bold{Notes:}
+
+    \c Fade3Decibel is often the best fade for a crossfade, as after half
+    of the time the volume reached -3dB. This means that half the
+    possible power (which is proportional to the square of the
+    voltage) is reached. Summed, the maximum power of two audio
+    signals fading with a -3dB curve will always be equal.
+
+    For fading in or out the -3dB curve is too abrupt in the end.
+
+    With a -6dB fade curve, a volume of -6dB is reached after half of
+    the fading time. -6dB is equal to half of the voltage meaning
+    that the voltage multiplier changes linearly from the start
+    of the fade to the end.
+
+    With the \c Fade9Decibel fade, a volume of -9dB is reached after
+    half of the fade time, so the fade is fast in the beginning and
+    slow at the end. This is a good fade for ending music.
+*/
+
+/*!
+    \fn void Phonon::VolumeFaderEffect::fadeIn(int fadeTime)
+
+    Tells the Fader to change the volume from the current volume to 100%
+    in \a fadeTime milliseconds.
+
+    Short for \c fadeTo(1.0, fadeTime).
+
+    \param fadeTime the fade duration in milliseconds
+
+    \sa fadeTo(), volume
+*/
+
+/*!
+    \fn void Phonon::VolumeFaderEffect::fadeOut(int fadeTime)
+
+    Tells the Fader to change the volume from the current volume to 0%
+    in \a fadeTime milliseconds.
+    Short for \c fadeTo(0.0, fadeTime).
+
+    \param fadeTime the fade duration in milliseconds
+
+    \sa fadeTo
+*/
+
+/*!
+    \fn void Phonon::VolumeFaderEffect::fadeTo(float volume, int fadeTime)
+
+    Tells the Fader to change the volume from the current value to
+    \a volume in \a fadeTime milliseconds.
+
+    \sa fadeIn(), fadeOut()
+*/
+
+/*!
+    \class Phonon::VolumeFaderEffectPrivate
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \class Phonon::VolumeFaderInterface
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \fn virtual Phonon::VolumeFaderInterface::~VolumeFaderInterface()
+    \internal
+*/
+
+/*!
+    \fn virtual float Phonon::VolumeFaderInterface::volume() const
+    \internal
+*/
+
+/*!
+    \fn virtual void Phonon::VolumeFaderInterface::setVolume(float)
+    \internal
+*/
+
+/*!
+    \fn virtual Phonon::VolumeFaderEffect::FadeCurve Phonon::VolumeFaderInterface::fadeCurve() const
+    \internal
+*/
+
+/*!
+    \fn virtual void Phonon::VolumeFaderInterface::setFadeCurve(Phonon::VolumeFaderEffect::FadeCurve)
+    \internal
+*/
+
+/*!
+    \fn virtual void Phonon::VolumeFaderInterface::fadeTo(float, int)
+    \internal
+*/
+
+/*!
+    \class Phonon::AbstractMediaStream
+    \inmodule Phonon
+    \internal
+    \since 4.4
+    \brief The AbstractMediaStream class is the base class for custom media data streams.
+    \inheaderfile Phonon/AbstractMediaStream
+
+    This class is subclassed to provide custom data streams for
+    \l{Phonon::}{MediaSource}s.
+
+    The \l{Phonon::}{MediaSource} knows how to handle the most common
+    media sources, such as files and CD. If you need to fetch
+    multimedia from other sources, you can reimplement this class,
+    which can be used by a \l{Phonon::}{MediaSource}.
+
+    When a backend needs more data from the stream, needData() will be
+    called. You must then use writeData() to write the data to the
+    backend. You can either write one time and wait for a new
+    needData() call, or continue to write data until you receive an
+    enoughData() call. When the stream is at its end, call endOfData()
+    instead of writeData().
+
+    Before the custom stream is passed to a \l{Phonon::}{MediaSource},
+    setStreamSize() needs to be called, and also setStreamSeekable()
+    (if the stream is seekable). A good place to do this work is in
+    the constructor. A seekable stream must also reimplement
+    seekStream().
+
+    We show two examples. The first writes data repeatedly until it
+    receives the enoughData() call, while the second only writes once
+    and waits for a new needData() call.
+
+    Example where data is written repeatedly.
+
+    \snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 0
+
+    Example where data is written once:
+
+    \snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 1
+
+    \sa Phonon::MediaSource, Phonon::MediaObject 
+
+*/
+
+/*!
+    \fn Phonon::AbstractMediaStream::AbstractMediaStream(QObject *parent = 0)
+    \internal
+
+    Constructs an AbstractMediaStream object with the given \a parent.
+
+*/
+
+/*!
+    \fn qint64 Phonon::AbstractMediaStream::streamSize() const
+
+    Returns the stream size that was set with setStreamSize().
+
+    A negative value means that the length of the stream cannot be known.
+
+    Defaults to 0.
+
+    \sa setStreamSize()
+*/
+
+/*!
+    \fn void Phonon::AbstractMediaStream::setStreamSize(qint64 size)
+
+    Sets the \a size of the stream in number of bytes.
+
+    A negative value means that the length of the stream cannot be known.
+
+    Defaults to 0.
+
+    This function has to be called. A backend will not call needData()
+    until the stream size is set.
+
+    \sa streamSize()
+
+*/
+
+/*!
+    \fn bool Phonon::AbstractMediaStream::streamSeekable() const
+
+    Returns whether your data stream is set as seekable.
+
+    Defaults to \c false.
+
+    \sa setStreamSeekable()
+
+*/
+
+/*!
+    \fn void Phonon::AbstractMediaStream::setStreamSeekable(bool s)
+
+    Sets whether your data stream is seekable. \a s should be true if
+    the stream is seekable; otherwise false.
+
+    Defaults to \c false.
+
+    If you set this to \c true you have to implement the seekStream()
+    function.
+
+    \sa streamSeekable()
+*/
+
+/*!
+    \fn void Phonon::AbstractMediaStream::writeData(const QByteArray &data)
+
+    Sends the media \a data to the backend for decoding.
+
+    Use this function to send data to the backend after needData() has
+    been called.
+
+    If your stream is a push stream, data should be written until the
+    enoughData() function is called. For a pull stream, write data
+    once before the call to needData() function returns.
+
+    If the data is depleted, call endOfData() instead of writeData().
+
+    \warning Don't call this function before the first needData() is emitted.
+
+    \sa needData(), endOfData()
+
+*/
+
+/*!
+    \fn void Phonon::AbstractMediaStream::endOfData()
+
+    Tells the backend that the media data stream is at its end.
+
+    \warning Don't call this function before the first needData() is emitted.
+
+    \sa writeData(), needData()
+*/
+
+/*!
+    \fn void Phonon::AbstractMediaStream::error(Phonon::ErrorType errorType, const QString &errorString)
+
+    If an I/O error occurs you should call this function to make
+    MediaObject go into ErrorState. \c errorType classifies the error,
+    while \a errorString is a textual description of the error suitable
+    for users of Phonon applications.
+
+    \sa MediaObject::errorType(), MediaObject::errorString()
+*/
+
+/*!
+    \fn virtual void Phonon::AbstractMediaStream::reset() = 0
+
+    Reimplement this function to reset the stream. Subsequent calls to writeData should start
+    from the first position of the data unless a seek is requested.
+
+    The function is necessary for the case where a non-seekable MediaStream is
+    played more than once. For a seekable stream the implementation can simply call
+    \snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 2
+
+    \sa writeData(), needData()
+*/
+
+/*!
+    \fn virtual void Phonon::AbstractMediaStream::needData() = 0
+
+    Reimplement this function to be notified when the backend needs data.
+
+    When this function is called you should write data to the backend
+    (See writeData()).
+
+    \sa writeData(), endOfData(), enoughData()
+*/
+
+/*!
+    \fn virtual void Phonon::AbstractMediaStream::enoughData()
+
+    If your stream is a push stream, reimplement this function to be
+    notified when the backend has enough data and your stream object
+    may take a break.
+
+    This method is important for pushing data to the backend in order
+    to not fill the backend buffer unnecessarily.
+
+    \sa needData()
+*/
+
+/*!
+    \fn virtual void Phonon::AbstractMediaStream::seekStream(qint64 offset)
+
+    Reimplement this function if your stream is seekable.
+
+    When this function is called the next call to writeData has to be at the
+    requested \a offset.
+
+    \warning Do not call the parent implementation.
+
+    \sa setStreamSeekable(), streamSeekable(), needData()
+*/
+
+/*!
+    \class Phonon::BackendInterface
+    \inmodule Phonon
+    \since 4.4
+    \brief Main Backend class interface
+    \internal
+
+    This interface defines the main factory of the backend. The createObject() function creates all the
+    objects needed by the frontend.
+
+    The objectDescriptionIndexes and objectDescriptionProperties functions return information about
+    available devices, effects and codecs.
+
+    An implementation could look like this:
+    \snippet snippets/phonon/samplebackend/main.cpp snippet
+
+*/
+
+/*!
+    \fn virtual Phonon::BackendInterface::~BackendInterface()
+    \internal
+
+    Silence gcc's warning.
+*/
+
+/*!
+    \enum Phonon::BackendInterface::Class
+    \internal
+
+    Classes that the createObject() function has to handle.
+
+    \value MediaObjectClass Request to return a \c MediaObject object.
+    \value VolumeFaderEffectClass Request to return a \c VolumeFaderEffect
+    object.
+    \value AudioOutputClass Request to return an \c AudioOutput object.
+    \value AudioDataOutputClass Request to return an \c AudioDataOutput object.
+    \value VisualizationClass Request to return a \c Visualization object.
+    \value VideoDataOutputClass Request to return a \c VideoDataOutput object.
+    \value EffectClass Request to return a \c Effect object.
+    Takes an additional int that specifies the effect ID.
+    \value VideoWidgetClass Request to return a \c VideoWidget object.
+*/
+
+/*!
+    \fn virtual QObject *Phonon::BackendInterface::createObject(Class c, QObject *parent, const QList<QVariant> &args = QList<QVariant>()) = 0
+    \internal
+
+    Returns a new instance of the requested class.
+
+    \param c The requested class.
+    \param parent The parent object.
+    \param args Additional arguments (documented in Class).
+*/
+
+
+/*!
+    \fn virtual QList<int> Phonon::BackendInterface::objectDescriptionIndexes(ObjectDescriptionType type) const = 0
+    \internal
+
+    Returns the unique identifiers for the devices/effects/codecs of the given \a type.
+
+    \param type see ObjectDescriptionType
+*/
+
+/*!
+    \fn virtual QHash<QByteArray, QVariant> Phonon::BackendInterface::objectDescriptionProperties(ObjectDescriptionType type, int index) const = 0
+    \internal
+
+    Given a unique identifier that was returned from objectDescriptionIndexes this function
+    returns a hash mapping property names to values.
+
+    The property "name" must always be present. All other properties are optional.
+
+    \table
+    \header \o Property \o Description
+    \row \o name \o The name of the device/effect/codec/...
+    \row \o description \o A text explaining what this device/effect/codec/... is/can do
+    \row \o icon \o An icon name (using the freedesktop naming scheme) or a QIcon for this
+    device/effect/codec/...
+    \row \o available \o A bool telling whether the device is present or unplugged.
+    \endtable
+
+    \param type see ObjectDescriptionType
+    \param index The unique identifier that is returned from objectDescriptionIndexes
+*/
+
+/*!
+    \fn virtual bool Phonon::BackendInterface::startConnectionChange(QSet<QObject *>) = 0;
+    \internal
+
+    When this function is called the nodes given in the parameter list should
+    not lose any signal data when connections are changed.
+*/
+
+/*!
+    \fn virtual bool Phonon::BackendInterface::connectNodes(QObject *, QObject *) = 0
+    \internal
+
+    Defines a signal connection between the two given nodes.
+*/
+
+/*!
+    \fn virtual bool Phonon::BackendInterface::disconnectNodes(QObject *, QObject *) = 0
+    \internal
+
+    Cuts a signal connection between the two given nodes.
+*/
+
+/*!
+    \fn virtual bool Phonon::BackendInterface::endConnectionChange(QSet<QObject *>) = 0
+    \internal
+
+    When this function is called the nodes given in the parameter list may lose
+    signal data when a port is not connected.
+*/
+
+/*!
+    \fn virtual QStringList Phonon::BackendInterface::availableMimeTypes() const = 0
+    \internal
+
+    Returns all available MIME types.
+*/
+
+/*!
+    \class Phonon::MediaSource
+    \inmodule Phonon
+    \inheaderfile Phonon/MediaSource
+    \since 4.4
+    \brief The MediaSource class provides multimedia data for media objects.
+
+    The MediaSource class manages a source of multimedia content, such
+    as a music or video file, of which data is given to a
+    \l{Phonon::}{MediaObject}.
+
+    The media source knows how fetch its data from several sources,
+    e.g., from files, a QIODevice, or a CD. The possible source types
+    are described by the \l{MediaSource::}{Type} enum. The type of the
+    source is set by the media source itself, and is dependent on the
+    constructor used to create it. Note that it is possible to provide
+    data from any source by implementing a QIODevice.
+
+    The class has several functions to acquire information about the
+    source it manages, e.g., fileName() and url(). The return from
+    these functions are dependent on the type() of the media source.
+
+    Normally, a programmer does not need to be concerned with media
+    sources. It's constructors are implicit, so one can, for instance,
+    send an URL or filename directly to the constructors of the
+    \l{Phonon::}{MediaObject}.
+
+    \snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 3
+
+    A MediaSource object cannot be reused for another multimedia
+    source. It is possible to play the same source again, and also
+    stop and start a non-seekable media source, such as a radio
+    stream, with the same MediaSource object.
+
+    \section1 Qt Backends
+
+    Currently, Qt's backends support files in local and remote
+    locations. Support for other sources, such as CD/DVD, are planned
+    for the future.
+
+    \sa MediaObject, {Phonon Module}
+*/
+
+/*!
+    \enum Phonon::MediaSource::Type
+
+    Identifies the type of media described by the MediaSource object.
+
+    \value Invalid The MediaSource object does not describe any valid source.
+    \value LocalFile The MediaSource object describes a local file.
+    \value Url The MediaSource object describes an URL, which can be either a
+    local file or a file on the network.
+    \value Disc The MediaSource object describes a disc, e.g., a CD.
+    \value Stream The MediaSource object describes a data stream.
+                  This is the type used for \l{QIODevice}s. Note
+                  that a stream opened with a QUrl, will still be of the Url type.
+
+    \sa MediaSource::type()
+*/
+
+/*!
+    \fn Phonon::MediaSource::MediaSource()
+    \internal
+
+    Creates an invalid MediaSource object.
+
+    \sa Invalid
+*/
+
+/*!
+    \fn Phonon::MediaSource::MediaSource(const QString &fileName)
+
+    Creates a MediaSource object for the file specified by \a
+    fileName.  You can also use this constructor with \l{The Qt
+    Resource System}{Qt resources}
+
+    \omit
+    \param fileName file name of a local media file or a Qt resource that was compiled in.
+    \endomit
+*/
+
+/*!
+    \fn Phonon::MediaSource::MediaSource(const QUrl &url)
+
+    Creates a MediaSource object for a the URL specified by \a url.
+    
+    If the multimedia content you would like to play back is on a
+    remote network location, you should use this constructor; though,
+    it also possible to specify an URL to a local file.
+
+    \sa QUrl
+*/
+
+
+/*!
+    \fn Phonon::MediaSource::MediaSource(Phonon::DiscType discType, const QString &deviceName = QString())
+
+    Creates a MediaSource object for the type of disc specified by \a discType in the named
+    device referred to by \a deviceName.
+
+    \note \a deviceName is a platform dependent device name. It can be useful to specify this
+    if the computer has more than one CD drive. On KDE, it is recommended to use the Solid
+    hardware discovery framework to retrieve the device name in a portable way.
+*/
+
+/*!
+    \fn Phonon::MediaSource::MediaSource(AbstractMediaStream *stream)
+    \internal
+    Creates a MediaSource object for a data stream.
+
+    Your application can provide the media data by subclassing AbstractMediaStream and
+    passing a pointer to that object. Phonon will never delete the \a stream.
+
+    \param stream The AbstractMediaStream subclass to provide the media data.
+
+    \sa setAutoDelete
+*/
+
+/*!
+    \fn Phonon::MediaSource::MediaSource(QIODevice *ioDevice)
+
+    Creates a MediaSource object for the QIODevice specified by \a ioDevice.
+
+    This constructor can be very handy in the combination of
+    QByteArray and QBuffer.
+
+    If you need to fetch multimedia data from a source that is not
+    supported by MediaSource, you should subclass QIODevice and use
+    this MediaSource constructor. It is important that you reimplement
+    QIODevice::isSequential(), as it is used by MediaSource to
+    determine if the media source is seekable.
+
+    \a ioDevice is an arbitrary readable QIODevice subclass. If the device is not opened
+    MediaSource will open it as QIODevice::ReadOnly.
+
+    \note Sequential devices can also be used, but MediaObject::isSeekable() will
+    return false as a result.
+
+    \sa setAutoDelete()
+*/
+
+/*!
+    \fn Phonon::MediaSource::MediaSource(MediaSourcePrivate &)
+    \internal
+*/
+
+/*!
+    \fn Phonon::MediaSource::~MediaSource()
+
+    Destroys the MediaSource object. You should never delete a
+    MediaSource yourself, the MediaObject will handle this.
+
+*/
+
+/*!
+    \fn Phonon::MediaSource::MediaSource(const MediaSource &other)
+
+    Constructs a copy of the \a other media source.
+
+    This constructor is fast thanks to explicit sharing.
+*/
+
+/*!
+    \fn MediaSource &Phonon::MediaSource::operator=(const MediaSource &other)
+
+    Assigns the \a other media source to this media source and returns a
+    reference to it.
+
+    This operation is fast thanks to explicit sharing.
+*/
+
+/*!
+    \fn bool Phonon::MediaSource::operator==(const MediaSource &other) const
+
+    Returns true if this media source is equal to the \a other media source;
+    otherwise returns false.
+*/
+
+/*!
+    \fn void Phonon::MediaSource::setAutoDelete(bool enable)
+
+    If \a enable is true, the media source will take ownership of the
+    object passed in the \l{Phonon::}{MediaSource}'s constructor
+    object that was passed in the constructor; otherwise, the
+    programmer is responsible for deletion of this object.
+
+    This setting is false by default. If you enable it, you should
+    only access the stream or device as long as you keep the media
+    source object around. As long as you keep the media source
+    wrapping the stream or device, the object will not get deleted.
+
+    \sa autoDelete()
+*/
+
+/*!
+    \fn bool Phonon::MediaSource::autoDelete() const
+
+    Returns the setting of the auto-delete option. The default is
+    false.
+
+    \sa setAutoDelete()
+*/
+
+/*!
+    \fn Type Phonon::MediaSource::type() const
+
+    Returns the type of the MediaSource (depends on the constructor
+    that was used).
+
+    \sa Type
+*/
+
+/*!
+    \fn QString Phonon::MediaSource::fileName() const
+
+    Returns the file name of the MediaSource if type() ==
+    LocalFile; otherwise, returns QString().
+
+    \sa type()
+*/
+
+/*!
+    \fn QUrl Phonon::MediaSource::url() const
+    Returns the URL of the MediaSource if type() == URL or type() == LocalFile;
+    otherwise returns QUrl().
+
+    \sa type()
+*/
+
+/*!
+    \fn Phonon::DiscType Phonon::MediaSource::discType() const
+    Returns the disc type of the MediaSource if type() == Disc; otherwise
+    returns NoDisc.
+
+    \sa type()
+*/
+
+/*!
+    \fn QString Phonon::MediaSource::deviceName() const
+
+    Returns the device name of the MediaSource if type() == Disc; otherwise
+    returns QString().
+
+    \sa type()
+*/
+
+/*!
+    \fn AbstractMediaStream *Phonon::MediaSource::stream() const
+    \internal
+    Returns the media stream of the MediaSource if type() == Stream; otherwise
+    returns 0.
+    QIODevices are handled as streams, too.
+*/
+
+/*!
+    \class Phonon::MediaSourcePrivate
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \class Phonon::SeekSlider
+    \inmodule Phonon
+    \inheaderfile Phonon/SeekSlider
+    \since 4.4
+    \brief The SeekSlider class provides a slider for seeking to positions in media streams.
+
+    The SeekSlider connects to a \l{Phonon::}{MediaObject}, and
+    controls the seek position in the object's media stream.
+
+    The slider will connect to the necessary signals to keep track of
+    the sliders maximum, minimum, and current values. It will also
+    disable itself for non-seekable streams, and update the media
+    object when the current value of the slider changes.
+
+    Here follows a typical example of SeekSlider usage:
+
+    \snippet doc/src/snippets/seekslider.cpp 0
+
+    \sa Phonon::VolumeSlider, Phonon::VideoWidget, {Music Player Example}, {Phonon Module}
+
+*/
+
+/*!
+    \property Phonon::SeekSlider::iconVisible
+    \brief whether the icon next to the slider is visible
+
+    By default the icon is visible if the platform provides an icon; else
+    it's hidden.
+
+*/
+
+/*!
+    \property Phonon::SeekSlider::tracking
+    \brief whether slider tracking is enabled
+
+    If tracking is enabled (the default), the media seeks
+    while the slider is being dragged. If tracking is
+    disabled, the media seeks only when the user
+    releases the slider.
+*/
+
+/*!
+    \property Phonon::SeekSlider::pageStep
+    \brief the page step interval
+
+    The larger of two natural steps that a slider provides and
+    typically corresponds to the user pressing PageUp or PageDown.
+
+    Defaults to 5 seconds.
+*/
+
+/*!
+    \property Phonon::SeekSlider::singleStep
+    \brief the single step interval
+
+    The smaller of two natural steps that a slider provides and
+    typically corresponds to the user pressing an arrow key.
+
+    Defaults to 0.5 seconds.
+*/
+
+/*!
+    \property Phonon::SeekSlider::orientation
+    \brief the orientation of the slider
+
+    The orientation must be Qt::Vertical or Qt::Horizontal (the default).
+*/
+
+/*!
+    \property Phonon::SeekSlider::iconSize
+    \brief the icon size used for the mute button/icon.
+
+    The default size is defined by the GUI style.
+*/
+
+/*!
+    \fn explicit Phonon::SeekSlider::SeekSlider(QWidget *parent = 0)
+
+    Constructs a seek slider widget with the given \a parent.
+*/
+
+/*!
+    \fn explicit Phonon::SeekSlider::SeekSlider(MediaObject *media, QWidget *parent = 0)
+
+    Constructs a seek slider widget for the specified \a media with the
+    given \a parent.
+*/
+
+/*!
+    \fn Phonon::SeekSlider::~SeekSlider()
+    Destroys the seek slider.
+*/
+
+/*!
+    \fn Phonon::MediaObject *Phonon::SeekSlider::mediaObject() const
+
+    Return the media object this SeekSlider controls.
+*/
+
+/*!
+    \class Phonon::SeekSliderPrivate
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \fn void Phonon::SeekSlider::setMediaObject(MediaObject *media)
+
+    Sets the media object to be controlled by this slider to the \a media specified.
+*/
+
+/*!
+    \class Phonon::VideoPlayer
+    \inmodule Phonon
+    \inheaderfile Phonon/VideoPlayer
+    \since 4.4
+    \brief The VideoPlayer widget is used to perform playback of video.
+
+    With VideoPlayer you can get results quickly and easily. You can
+    do the standard playback tasks like play(), pause(), and stop(),
+    but also set a playback volume and seek - if the media and backend
+    supports seeking.
+
+    VideoPlayer is provided for convenience and removes the need to
+    create a media graph with a \l{Phonon::}{MediaObject},
+    \l{Phonon::}{AudioOutput}, and \l{Phonon::}{VideoWidget}. If
+    you need functionality not supported by the player, you can build
+    this \l{Building Graphs}{graph} yourself.
+
+    Keep in mind that when the VideoPlayer instance is deleted the
+    playback will stop.
+
+    Note also that most of the functions in this class are
+    asynchronous. For instance, a media source may not play
+    immediately after you call the play() function.
+
+    A play and forget code example:
+    \snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 4
+
+    \sa {Phonon Module}, MediaObject
+*/
+
+/*!
+    \fn Phonon::VideoPlayer::VideoPlayer(QWidget *parent = 0)
+    
+    Constructs a new video widget with a \a parent using
+    Phonon::VideoCategory as its category.
+
+    \param parent The QObject parent.
+*/
+
+/*!
+    \fn Phonon::VideoPlayer::VideoPlayer(Phonon::Category category, QWidget *parent = 0)
+
+    Constructs a new VideoPlayer instance with the specified \a
+    parent.
+
+    \a category is the category used for the audio output device.
+*/
+
+/*!
+    \fn Phonon::VideoPlayer::~VideoPlayer()
+
+    On destruction the playback is stopped, also the audio output is
+    removed so that the desktop mixer will not show the application
+    anymore. If you need a persistent audio output don't use
+    VideoPlayer but MediaObject, VideoPath and VideoOutput.
+*/
+
+/*!
+    \fn qint64 Phonon::VideoPlayer::totalTime() const
+
+    Get the total time (in milliseconds) of the file currently being played.
+*/
+
+/*!
+    \fn qint64 Phonon::VideoPlayer::currentTime() const
+
+    Get the current time (in milliseconds) of the file currently being played.
+*/
+
+/*!
+    \fn float Phonon::VideoPlayer::volume() const
+
+    This is the current volume of the output as voltage factor.
+
+    1.0 means 100%, 0.5 means 50% voltage/25% power, 0.0 means 0%
+*/
+
+/*!
+    \fn bool Phonon::VideoPlayer::isPlaying() const
+
+    Returns true if it is currently playing; otherwise returns false if it
+    is currently stopped or paused
+*/
+
+/*!
+    \fn bool Phonon::VideoPlayer::isPaused() const
+
+    Returns true if it is currently paused; otherwise returns false if it
+    is currently playing or stopped.
+*/
+
+/*!
+    \fn void Phonon::VideoPlayer::load(const Phonon::MediaSource &source)
+
+    Starts pre-loading the media data from the specified \a source and
+    filling audio buffers in the backend.
+
+    When there's already a media playing (or paused) it will be stopped
+    (the finished signal will not be emitted).
+
+    \sa MediaObject::setCurrentSource()
+*/
+
+/*!
+    \fn void Phonon::VideoPlayer::play(const Phonon::MediaSource &source)
+
+    Plays the media from the given \a source. Starts playback as fast as
+    possible.
+    This can take a considerable time depending on the URL and the
+    backend.
+
+    If you need low latency between calling play() and the sound actually
+    starting to play on your output device you need to use MediaObject
+    and be able to set the URL before calling play(). Note that
+    \snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 5
+    doesn't make a difference: the application should be idle between the
+    load and play calls so that the backend can start preloading the
+    media and fill audio buffers.
+*/
+
+/*!
+    \fn void Phonon::VideoPlayer::play()
+
+    Continues playback of paused media. Restarts playback of a stopped
+    (or newly loaded) media.
+
+    \sa MediaObject::play(), play()
+*/
+
+/*!
+    \fn void Phonon::VideoPlayer::pause()
+
+    Pauses the playback.
+
+    \sa MediaObject::pause()
+*/
+
+/*!
+    \fn void Phonon::VideoPlayer::stop()
+
+    Stops the playback.
+
+    \sa MediaObject::stop()
+*/
+
+/*!
+    \fn void Phonon::VideoPlayer::seek(qint64 ms)
+
+    Seeks to the requested time. Note that the backend is free to
+    ignore the seek request if the media source isn't seekable; you
+    can check this by asking the media object of the VideoPlayer.
+
+    \snippet doc/src/snippets/videomedia.cpp 0
+
+    The \a ms parameter is the time in milliseconds from the start of
+    the media.
+
+    The call is asynchronous, so currentTime() can still be the old
+    value right after this method was called. If all you need is a
+    slider that shows the current position and allows the user to
+    seek, use the class SeekSlider.
+
+    \sa MediaObject::seek(), MediaObject::isSeekable(), mediaObject()
+*/
+
+/*!
+    \fn void Phonon::VideoPlayer::setVolume(float volume)
+
+    Sets the \a volume of the output as voltage factor.
+
+    1.0 means 100%, 0.5 means 50% voltage/25% power, 0.0 means 0%
+*/
+
+/*!
+    \fn MediaObject *Phonon::VideoPlayer::mediaObject() const
+
+    Returns the media object being used by the player.
+
+    The media object can be accessed directly instead of using the
+    \l{VideoPlayer}s convenience functions, e.g., play() and stop().
+    It is also possible to give the object to other Phonon widgets,
+    e.g., a \l{Phonon::}{SeekSlider} or a \l{Phonon::}{VolumeSlider}.
+
+    \sa Phonon::SeekSlider, Phonon::MediaObject
+*/
+
+/*!
+    \fn AudioOutput *Phonon::VideoPlayer::audioOutput() const
+
+    Returns the audio output object being used by the player.
+
+*/
+
+/*!
+    \fn VideoWidget *Phonon::VideoPlayer::videoWidget() const
+
+    Returns the video widget being used by the player.
+*/
+
+/*!
+    \fn void Phonon::VideoPlayer::finished()
+
+    This signal is emitted when the playback finished.
+
+*/
+
+/*!
+    \class Phonon::VideoWidgetPrivate
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \class Phonon::MediaObject
+    \inmodule Phonon
+    \inheaderfile Phonon/MediaObject
+    \since 4.4
+    \brief The MediaObject class provides an interface for media playback.
+
+
+    The media object manages a \l{Phonon::}{MediaSource}, which
+    supplies the media object with multimedia content, e.g., from a
+    file. A playback in Phonon is always started by calling the
+    \l{Phonon::MediaObject::}{play()} function.
+
+    The state of play (play, pause, stop, seek) is controlled by the
+    media object, and you can also query the current
+    \l{Phonon::MediaObject::}{state()}. It keeps track of the playback
+    position in the media stream, and emits the
+    \l{Phonon::MediaObject::}{tick()} signal when the current position
+    in the stream changes.
+
+    Notice that most functions of this class are asynchronous, so you
+    cannot rely on that a state is entered after a function call
+    before you receive the \l{Phonon::MediaObject::}{stateChanged()}
+    signal. The description of the \l{Phonon::}{State} enum gives a
+    description of the different states.
+
+    Before play() is called, the media object should be connected to
+    \l{Sinks}{output nodes}, which outputs the media to the
+    underlying hardware. The output nodes required are dependent on
+    the contents of the multimedia file that is played back. Phonon
+    has currently two output nodes: the \l{Phonon::}{AudioOutput} for
+    audio content and \l{Phonon::}{VideoWidget} for video content.  If
+    a \l{Phonon::}{MediaSource} contains both audio and video, both
+    nodes need to be connected to the media object.
+
+    \snippet snippets/phonon.cpp 4
+    \snippet snippets/phonon.cpp 5 
+
+    The media object can queue sources for playback. When it has
+    finished to play one source, it will start playing the next in the
+    queue; the new source is then removed from the queue. The
+    queue can be altered at any time. 
+
+    \snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 7
+
+    You can also make use of the
+    \l{Phonon::MediaObject::}{aboutToFinish()} signal, which is
+    guaranteed to be emitted in time for altering the queue.
+
+    \snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 8
+
+    When playback is finishing, i.e., when a media source has been
+    played to the end and the queue is empty, several signals are
+    emitted. First, the media object will emit aboutToFinish() -
+    shortly before the playback has finished - and then finished().
+    The stateChanged() signal will also be emitted with
+    \l{Phonon::}{PausedState}, which is the state the media object
+    takes when the playback is finished. If you wish to enter another
+    state, you can connect a slot to finished() and set a new state
+    there.
+
+    The media object resolves the meta information, such as title,
+    artist, and album. The meta data is not resolved immediately after
+    a new source is provided, but will be resolved before the object
+    leaves the \l{Phonon::}{LoadingState}. The data is queried by
+    string keys - which should follow the Ogg Vorbis specification
+    \l http://xiph.org/vorbis/doc/v-comment.html - or by using the
+    \l{Phonon::}{MetaData} enum. The data available will depend on the
+    type and content of the individual media files.  metaDataChanged()
+    will be emitted when the media object has resolved new meta data.
+
+    Errors encountered during playback and loading of media sources
+    are reported by emitting a state changed signal with
+    \l{Phonon::}{ErrorState}. The severity of the error can be queried
+    by the \l{Phonon::}{ErrorType}. With a \l{Phonon::}{NormalError},
+    it might be possible to continue the playback, for instance, if
+    only audio playback fails for a media source which also has video.
+    A \l{Phonon::}{FatalError} indicates that Phonon cannot continue
+    playback of the current source, but it is possible to try with a
+    different one. A user readable error message is given by
+    errorString().
+
+    \sa Phonon::MediaSource, Phonon::AudioOutput, VideoWidget,
+    {Music Player Example}, {Phonon Overview}, Phonon::VideoPlayer,
+    Phonon::createPlayer(), {Phonon Module}
+
+*/
+
+/*!
+    \property Phonon::MediaObject::transitionTime
+    \brief Defines the time between playback of two media sources
+    in the media queue.
+
+    A positive transition time defines a gap of silence between queued
+    media sources.
+
+    A transition time of 0 ms requests gapless playback (i.e., the
+    next source in the media queue starts immediately after the
+    playback of the current source finishes).
+
+    A negative transition time defines a crossfade between the queued
+    media sources.
+
+    Defaults to 0 (gapless playback).
+
+    \warning This feature might not work reliably with every
+             backend.
+*/
+
+/*!
+    \property Phonon::MediaObject::prefinishMark
+    \brief the time when the prefinishMarkReached signal is emitted before playback ends.
+
+    This property specifies the time in milliseconds the
+    prefinishMarkReached() signal is emitted before the playback
+    finishes. A value of \c 0 disables the signal. The signal is only
+    emitted for the last source in the \l{queue()}{media queue}.
+
+    Defaults to \c 0 (disabled).
+
+    \warning For some media data the total time cannot be determined
+    accurately, therefore the accuracy of the prefinishMarkReached signal
+    can be bad sometimes. Still, it is better to use this method than to
+    look at totalTime() and currentTime() to emulate the behavior
+    because the backend might have more information available than your
+    application does through totalTime() and currentTime().
+
+    \sa prefinishMarkReached()
+*/
+
+/*!
+    \property Phonon::MediaObject::tickInterval
+    \brief The time interval in milliseconds between two ticks.
+
+    The tick() signal is emitted continuously during playback.
+    The tick interval is the time that elapses between the emission of two tick signals.
+    If you set the interval to \c 0 the tick signal gets disabled.
+
+    The tick() signal can, for instance, be used to update widgets
+    that show the current position in the playback of a media source.
+
+    Defaults to \c 0 (disabled).
+
+    \warning The back-end is free to choose a different tick interval close
+    to what you asked for. This means that the following code \c may fail:
+    \snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 9
+    On the other hand the following is guaranteed:
+    \snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 10
+
+    \sa tick()
+*/
+
+/*!
+    \fn Phonon::MediaObject::~MediaObject()
+
+    Destroys the MediaObject.
+*/
+
+/*!
+    \fn State Phonon::MediaObject::state() const
+
+    Returns the current Phonon::State of the object.
+
+    \sa Phonon::State, stateChanged()
+*/
+
+/*!
+    \fn bool Phonon::MediaObject::hasVideo() const
+
+    Check whether the current media source includes a video stream.
+
+    \warning This information is not resolved immediately after a
+    media object gets a new source. Listen to the hasVideoChanged()
+    signal instead.
+
+    \snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 11
+
+    Returns \c true if the media contains video data; otherwise,
+    returns  \c false.
+
+    \sa hasVideoChanged()
+*/
+
+/*!
+    \fn bool Phonon::MediaObject::isSeekable() const
+
+    Check whether it is possible to seek, i.e., change the
+    playback position in the media stream.
+
+    \warning This information is not solved immediately after the
+    media object gets a new media source. The hasVideoChanged() signal
+    is emitted after this information is available.
+
+    \snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 12
+
+    Returns \c true if the current media may be seeked; otherwise,
+    returns \c false.
+
+    \sa seekableChanged()
+*/
+
+/*!
+    \fn QStringList Phonon::MediaObject::metaData(const QString &key) const
+
+    Returns the strings associated with the given \a key.
+
+    Backends should use the keys specified in the Ogg Vorbis
+    documentation: \l http://xiph.org/vorbis/doc/v-comment.html
+
+    Therefore the following should work with every backend:
+
+    Note that meta data is not resolved before the \c
+    metaDataChanged() signal is emitted.
+
+    A typical usage looks like this:
+
+    \snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 13
+*/
+
+/*!
+    \fn QStringList Phonon::MediaObject::metaData(Phonon::MetaData key) const
+
+    Returns the strings associated with the given \a key.
+
+    Same as above except that the keys are defined in the
+    Phonon::MetaData enum.
+
+    \sa metaDataChanged()
+*/
+
+/*!
+    \fn QMultiMap<QString, QString> Phonon::MediaObject::metaData() const
+
+    Returns all meta data in a multi map. 
+
+    \sa metaDataChanged()
+*/
+
+/*!
+    \fn QString Phonon::MediaObject::errorString() const
+
+    Returns a human-readable description of the last error that occurred.
+    The strings given may vary between backends.
+
+    The error description can be used to give a message to the user -
+    and the developer - when the stateChanged() signal is emitted with
+    \l{Phonon::}{ErrorState}.
+
+    \section1 Qt Backends
+
+    On Windows, Qt fetches its error messages from the DirectShow
+    backend.  This usually includes an error number, which can be
+    looked up in the DirectShow documentation:
+    \l{http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/dx81_c/directx_cpp/htm/errorandsuccesscodes.asp}.
+
+    On Linux and Mac, the error strings are not fetched directly from
+    the backend, but are created in the backend.
+
+    \sa Phonon::ErrorState, stateChanged()
+*/
+
+/*!
+    \fn ErrorType Phonon::MediaObject::errorType() const
+
+    Tells your program what to do about the last error that occurred.
+    Use this function after receiving a stateChanged() signal with
+    \l{Phonon::}{ErrorState}.
+
+    \sa Phonon::ErrorType, Phonon::ErrorState, stateChanged()
+*/
+
+/*!
+    \fn MediaSource Phonon::MediaObject::currentSource() const
+
+    Returns the current media source, i.e., the media source that is
+    being played back. The current source is either set with
+    setCurrentSource() or taken from the media queue() when a media
+    source has finished playing.
+
+    \sa setCurrentSource()
+*/
+
+/*!
+    \fn void Phonon::MediaObject::setCurrentSource(const MediaSource &source)
+
+    Set the media source the MediaObject should use.
+
+    After the media object receives a new source, it will enter the
+    \l{Phonon::}{LoadingState}. When it is ready to play, it
+    enters the \l{Phonon::}{StoppedState} unless another state
+    has been requested, e.g., by calling play().
+
+    \a source is the MediaSource object to the media data. You can
+    just as well use a QUrl or QString (for a local file) here.
+
+    We show an example:
+
+    \snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 14
+
+    \sa currentSource()
+*/
+
+/*!
+    \fn QList<MediaSource> Phonon::MediaObject::queue() const
+
+    Returns the queued media sources.
+
+    This does list does not include the current source,
+    returned by currentSource().
+
+    \sa enqueue()
+*/
+
+/*!
+    \fn void Phonon::MediaObject::setQueue(const QList<MediaSource> &sources)
+
+    Set the \a sources to play when the current source has finished.
+
+    This function will overwrite the current queue.
+
+    \sa clearQueue(), enqueue()
+*/
+
+/*!
+    \fn void Phonon::MediaObject::setQueue(const QList<QUrl> &urls)
+
+    Set the \a urls to play when the current media has finished.
+
+    This function overwrites the current queue.
+
+    \sa clearQueue(), enqueue()
+*/
+
+/*!
+    \fn void Phonon::MediaObject::enqueue(const MediaSource &source)
+
+    Appends \a source to the queue.
+
+    You can use this function to provide the next source after the
+    aboutToFinish() signal has been emitted.
+
+    \sa aboutToFinish(), setQueue(), clearQueue()
+*/
+
+/*!
+    \fn void Phonon::MediaObject::enqueue(const QList<MediaSource> &sources)
+
+    Appends multiple \a sources to the queue.
+
+    \sa setQueue(), clearQueue()
+*/
+
+/*!
+    \fn void Phonon::MediaObject::enqueue(const QList<QUrl> &urls)
+
+    Appends the URLs in \a urls to the media source queue. 
+
+    The function will create \l{MediaSource}s from the \l{QUrl}s, and
+    append these to the queue.
+
+    \sa setQueue(), clearQueue()
+*/
+
+/*!
+    \fn void Phonon::MediaObject::clearQueue()
+
+    Clears the queue of media sources.
+    
+    \sa queue(), enqueue()
+*/
+
+/*!
+    \fn qint64 Phonon::MediaObject::currentTime() const
+
+    Returns the current time (in milliseconds), i.e., position in the
+    media stream, of the file currently being played.
+
+    \sa tick(), totalTime(), remainingTime()
+*/
+
+/*!
+    \fn qint64 Phonon::MediaObject::totalTime() const
+
+    Get the total time (in milliseconds) of the file currently being played.
+
+    Returns the total time in milliseconds.
+
+    \warning The total time is not defined before the media object
+             enters the \l{Phonon::}{LoadingState}.
+
+    \sa totalTimeChanged()
+*/
+
+/*!
+    \fn qint64 Phonon::MediaObject::remainingTime() const
+
+    Get the remaining time (in milliseconds) of the file currently being played.
+
+    Returns the remaining time in milliseconds.
+
+    \sa totalTime(), currentTime(), totalTimeChanged()
+*/
+
+/*!
+    \fn void Phonon::MediaObject::play()
+
+    Requests playback of the media data to start.
+
+    Playback starts when the stateChanged() signal is emitted with
+    \l{Phonon::}{PlayingState}.
+
+    If the media object is already in a
+    \l{Phonon::}{PlayingState}, nothing happens.
+
+    \sa stop(), pause(), stateChanged()
+*/
+
+/*!
+    \fn void Phonon::MediaObject::pause()
+
+    Requests playback to pause, and the media object to enter the
+    \l{Phonon::}{PausedState}. If it was paused already, nothing
+    changes.
+
+    This function is asynchronous and the media might not be paused
+    immediately.
+
+    \sa play(), stop(), stateChanged()
+*/
+
+/*!
+    \fn void Phonon::MediaObject::stop()
+
+    Requests playback to stop, and the media object to enter the
+    \l{Phonon::}{StoppedState}. If it was stopped before
+    nothing changes.
+
+    This function is asynchronous and the media might not be
+    stopped immediately.
+
+    \sa play(), pause(), stateChanged()
+*/
+
+/*!
+    \fn void Phonon::MediaObject::seek(qint64 time)
+
+    Requests a seek to the \a time indicated, specified in milliseconds.
+
+    You can only seek if state() is PlayingState, BufferingState or PausedState.
+
+    The call is asynchronous, so currentTime can still be the old
+    value right after this method was called. If all you need is a
+    slider that shows the current position and allows the user to
+    seek, use the class SeekSlider.
+
+    If the current source of the media object is not seekable, calls
+    to this functions do nothing.
+
+    \sa SeekSlider, tick()
+*/
+
+/*!
+    \fn void Phonon::MediaObject::stateChanged(Phonon::State newstate, Phonon::State oldstate)
+
+    This signal is emitted when the state of the MediaObject has changed.
+    The \a oldstate and \a newstate parameters indicate the previous
+    state and current state of the media object.
+
+    If you are only interested in the new state of the media object, you can
+    connect this signal to a slot that accepts only one State argument.
+*/
+
+/*!
+    \fn void Phonon::MediaObject::tick(qint64 time)
+
+    This signal is emitted in intervals defined by the
+    \l{tickInterval} property. The current position of the media
+    object in the stream is given by the \a time parameter. The \a
+    time is specified in milliseconds.
+
+    \sa tickInterval
+*/
+
+/*!
+    \fn void Phonon::MediaObject::metaDataChanged()
+
+    This signal is emitted when the media object has resolved new meta
+    data. This will happen before the media object leaves the
+    \l{Phonon::}{LoadingState} after a new source has been set.
+
+    This signal is not emitted when the media object removes the
+    current data, i.e., when a new source is set or an error has
+    occurred. If you need to know this, you can listen for the
+    \l{Phonon::}{ErrorState}, and connect to the
+    \l{Phonon::MediaObject::}{currentSourceChanged()} signal.
+
+    You can get the new meta data with the metaData methods.
+    
+    \sa metaData(), currentSourceChanged(), stateChanged(), Phonon::State
+*/
+
+/*!
+    \fn void Phonon::MediaObject::seekableChanged(bool isSeekable)
+
+    This signal is emitted when the media object's ability to seek in
+    the media stream changes. \a isSeekable is true if it is possible
+    to seek(); otherwise, it is false.
+
+    Change in the ability to seek in the stream usually happens when
+    the current source changes or when an error occurs.
+
+    \omit Emitted whenever the return value of isSeekable()
+    changes. \endomit
+
+    Normally you'll check isSeekable() after setting a new media
+    source, and then let this signal tell you when seeking is
+    possible. That way you don't have to poll isSeekable().
+*/
+
+/*!
+    \fn void Phonon::MediaObject::hasVideoChanged(bool hasVideo)
+
+    Emitted whenever the return value of hasVideo() changes, i.e., 
+    the media source being played back contains video.
+
+    Normally you'll check hasVideo() first and then let this signal
+    tell you whether video is available now or not. That way you
+    don't have to poll hasVideo().
+
+    \a hasVideo is true  when the stream contains video and adding a
+    VideoWidget will show a video, and false if there is no video data
+    in the stream and adding a VideoWidget will show an empty (black)
+    VideoWidget.
+*/
+
+/*!
+    \fn void Phonon::MediaObject::bufferStatus(int percentFilled)
+
+    Provides information about the status of the buffer.
+
+    When a MediaObject is in the \l{Phonon::}{BufferingState}, it will
+    send this signal regularly. \a percentFilled is a number between 0
+    and 100 telling you how much the buffer is filled.
+
+    You can use this signal to show a progress bar to the user when
+    in BufferingState:
+
+    \snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 15
+
+    Note that the \l{Phonon::}{BufferingState} is commonly used when
+    waiting for data over a network connection, but this might not be
+    true for all backends.
+*/
+
+/*!
+    \fn void Phonon::MediaObject::finished()
+
+    Emitted when the object has finished playback.  It is not emitted
+    if you call stop(), pause() or load(). It is emitted only when the
+    current media source has finished playing and the media queue() is
+    empty, or when a \l{Phonon::FatalError}{fatal error} occurs.
+
+    \warning This signal is not emitted when the current source has
+    finished and there's another source in the queue. It is only
+    emitted when the queue is empty.
+
+    \sa currentSourceChanged(), aboutToFinish(), prefinishMarkReached()
+*/
+
+/*!
+    \fn void Phonon::MediaObject::currentSourceChanged(const Phonon::MediaSource &newSource)
+
+    Emitted when the MediaObject fetches a new MediaSource from the
+    queue() and before it enters the \l{Phonon::}{LoadingState} for
+    the new source. The media object will take a new source from the
+    queue() when it has finished the playback of the
+    \l{currentSource()}{current source}.
+
+    \a newSource is the source that starts to play at the time the
+    signal is emitted.
+*/
+
+/*!
+    \fn void Phonon::MediaObject::aboutToFinish()
+
+    Emitted before the playback of the whole queue ends. When this
+    signal is emitted you still have time to enqueue() a new
+    MediaSource, so that playback continues.
+
+    If you need a signal to be emitted at a specific time before
+    playback is finished, you should use the prefinishMarkReached()
+    signal instead.
+
+    \sa enqueue(), prefinishMark, prefinishMarkReached()
+*/
+
+/*!
+    \fn void Phonon::MediaObject::prefinishMarkReached(qint32 msecToEnd)
+
+    Emitted when there are only \a msecToEnd milliseconds left
+    of playback.
+
+    \warning This signal is not emitted when there is another source
+    in the queue.  It is only emitted when the queue is empty.
+
+    \sa setPrefinishMark(), prefinishMark(), aboutToFinish(), finished()
+*/
+
+/*!
+    \fn void Phonon::MediaObject::totalTimeChanged(qint64 newTotalTime)
+
+    This signal is emitted as soon as the total time of the media file is
+    known or has changed. For most non-local media data the total
+    time of the media can only be known after some time. At that time the
+    totalTime function can not return useful information. You have
+    to wait for this signal to know the real total time.
+
+    \a newTotalTime is the length of the media file in milliseconds.
+
+    \sa totalTime()
+*/
+
+/*!
+    \fn MediaObject *Phonon::createPlayer(Phonon::Category category, const MediaSource &source = MediaSource())
+
+    Convenience function to create a MediaObject and AudioOutput
+    connected by a path. The \l{Phonon::}{MediaObject} return will
+    have \a source set as its current source and the specified \a
+    category.
+
+*/
+
+/*!
+    \class Phonon::MediaObjectPrivate
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \namespace Phonon::BackendCapabilities
+    \inmodule Phonon
+    \since 4.4
+    \brief The BackendCapabilities namespace contains functions to describe the capabilities of the multimedia backend.
+
+*/
+
+/*!
+    \class Phonon::BackendCapabilitiesPrivate
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \class Phonon::BackendCapabilities::Notifier
+    \since 4.4
+    \inmodule Phonon
+    \inheaderfile Phonon/BackendCapabilities
+
+    Notifications about backend capabilities.
+*/
+
+/*!
+    \fn void Phonon::BackendCapabilities::Notifier::capabilitiesChanged()
+
+    This signal is emitted if the capabilities have changed. This can
+    happen if the user has requested a backend change.
+*/
+
+/*!
+    \fn void Phonon::BackendCapabilities::Notifier::availableAudioOutputDevicesChanged()
+
+    This signal is emitted when audio output devices were plugged or
+    unplugged.
+
+    Check BackendCapabilities::availableAudioOutputDevices to get the
+    current list of available devices.
+*/
+
+/*!
+    \fn Notifier *Phonon::BackendCapabilities::notifier()
+
+    Use this function to get a QObject pointer to connect to the capabilitiesChanged signal.
+
+    \return a pointer to a QObject.
+
+    The capabilitiesChanged signal is emitted if the capabilities have changed. This can
+    happen if the user has requested a backend change.
+
+    To connect to this signal do the following:
+    \snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 16
+
+    \sa Notifier::capabilitiesChanged()
+*/
+
+/*!
+    \fn QStringList Phonon::BackendCapabilities::availableMimeTypes()
+
+    Returns a list of mime types that the Backend can decode.
+
+    \sa isMimeTypeAvailable()
+*/
+
+/*!
+    \fn bool Phonon::BackendCapabilities::isMimeTypeAvailable(const QString &mimeType)
+
+    Often all you want to know is whether one given MIME type can be
+    decoded by the backend. Use this method in favor of
+    availableMimeTypes() as it can give you a negative answer without
+    having a backend loaded.
+
+    Returns true if the given \a mimeType is supported by the backend;
+    otherwise, returns false.
+
+    \sa availableMimeTypes()
+*/
+
+/*!
+    \fn QList<AudioOutputDevice> Phonon::BackendCapabilities::availableAudioOutputDevices()
+
+    Returns the audio output devices the backend supports.
+
+    \return A list of AudioOutputDevice objects that give a name and
+            description for every supported audio output device.
+*/
+
+/*!
+    \fn QList<EffectDescription> Phonon::BackendCapabilities::availableAudioEffects()
+
+    Returns descriptions for the audio effects the backend supports.
+
+    \return A list of AudioEffectDescription objects that give a name and
+    description for every supported audio effect.
+*/
+
+/*!
+    \internal
+    \class ObjectDescriptionModelData
+    \internal
+    \inmodule Phonon
+    \brief Data class for models for ObjectDescription objects.
+*/
+
+/*!
+    \typedef Phonon::EffectDescription
+    \relates Phonon::ObjectDescription
+
+    EffectDescription gives a description of an \l{Processors}{audio
+    effect}. It is a typedef of the \l{Phonon::}{ObjectDescription}
+    class. Please see its class description for details.
+
+    EffectDescription is used to create audio \l{Phonon::}{Effect}s,
+    which can be inserted into a media graph, altering an audio
+    stream.
+
+    \sa Phonon::ObjectDescription, {Capabilities Example}, {Media
+    Player}
+
+*/
+
+/*!
+    \class Phonon::ObjectDescriptionModel
+    \inmodule Phonon
+    \internal
+    \since 4.4
+    \brief The ObjectDescriptionModel class provides a model from
+    a list of ObjectDescription objects.
+
+    ObjectDescriptionModel is a read only model that supplies a list
+    using ObjectDescription::name() for the text and
+    ObjectDescription::description() for the tooltip. If set the properties
+    "icon" and "available" are used to set the decoration and disable the
+    item (disabled only visually, you can still select and drag it).
+
+    It also provides the methods moveUp() and moveDown() to order the list.
+    Additionally drag and drop is possible so that
+    QAbstractItemView::InternalMove can be used.
+    The resulting order of the ObjectDescription::index() values can then be
+    retrieved using tupleIndexOrder().
+
+    An example use case would be to give the user a QComboBox to select
+    the output device:
+    \snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 17
+
+    And to retrieve the selected AudioOutputDevice:
+    \snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 18
+
+*/
+
+/*!
+    \fn inline int Phonon::ObjectDescriptionModel::rowCount(const QModelIndex &parent = QModelIndex()) const
+
+    Returns the number of rows in the model. This value corresponds
+    to the size of the list passed through setModelData.
+
+    \param parent The optional \a parent argument is used in most models to specify
+    the parent of the rows to be counted. Because this is a list if a
+    valid parent is specified the result will always be 0.
+
+    Reimplemented from QAbstractItemModel.
+
+    \sa QAbstractItemModel::rowCount()
+*/
+
+/*!
+    \fn inline QVariant Phonon::ObjectDescriptionModel::data(const QModelIndex &index, int role = Qt::DisplayRole) const
+
+    Returns data from the item with the given \a index for the specified
+    \a role.
+    If the view requests an invalid index, an invalid variant is
+    returned.
+
+    Reimplemented from QAbstractItemModel.
+
+    \sa QAbstractItemModel::data(), Qt::ItemDataRole
+*/
+
+/*!
+    \fn inline Qt::ItemFlags Phonon::ObjectDescriptionModel::flags(const QModelIndex &index) const
+    \internal
+
+    Reimplemented to show unavailable devices as disabled (but still
+    selectable). The \a index of the model index for which to return
+    flags.
+
+*/
+
+/*!
+    \fn inline QList<int> Phonon::ObjectDescriptionModel::tupleIndexOrder() const
+
+    Returns a list of indexes in the same order as they are in the
+    model. The indexes come from the ObjectDescription::index
+    method.
+
+    This is useful to let the user define a list of preference.
+*/
+
+/*!
+    \fn inline int Phonon::ObjectDescriptionModel::tupleIndexAtPositionIndex(int positionIndex) const
+
+    Returns the ObjectDescription::index for the tuple
+    at the given position \a positionIndex. For example a
+    QComboBox will give you the currentIndex as the
+    position in the list. But to select the according
+    AudioOutputDevice using AudioOutputDevice::fromIndex
+    you can use this method.
+
+    \param positionIndex The position in the list.
+*/
+
+/*!
+    \class Phonon::ObjectDescriptionModelDataPrivate
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \fn inline QMimeData *Phonon::ObjectDescriptionModel::mimeData(const QModelIndexList &indexes) const
+    \internal
+    
+    Returns the MIME data that dropMimeData() can use to create new
+    items.
+*/
+
+/*!
+    \fn inline void Phonon::ObjectDescriptionModel::moveUp(const QModelIndex &index)
+
+    Moves the item at the given \a index up. In the resulting list
+    the items at index.row() and index.row() - 1 are swapped.
+
+    Connected views are updated automatically.
+*/
+
+/*!
+    \fn inline void Phonon::ObjectDescriptionModel::moveDown(const QModelIndex &index)
+
+    Moves the item at the given \a index down. In the resulting list
+    the items at index.row() and index.row() + 1 are swapped.
+
+    Connected views are updated automatically.
+*/
+
+/*!
+    \fn explicit inline Phonon::ObjectDescriptionModel::ObjectDescriptionModel(QObject *parent = 0)
+
+    Constructs a ObjectDescription model with the
+    given \a parent.
+*/
+
+/*!
+    \fn explicit inline Phonon::ObjectDescriptionModel::ObjectDescriptionModel(const QList<ObjectDescription<type> > &data, QObject *parent = 0)
+
+    Constructs a ObjectDescription model with the
+    given \a parent and the given \a data.
+*/
+
+/*!
+    \fn inline void Phonon::ObjectDescriptionModel::setModelData(const QList<ObjectDescription<type> > &data)
+
+    Sets the model data using the list provided by \a data.
+
+    All previous model data is cleared.
+*/
+
+/*!
+    \fn inline QList<ObjectDescription<type> > Phonon::ObjectDescriptionModel::modelData() const
+
+    Returns the model data.
+
+    As the order of the list might have changed this can be different
+    to what was set using setModelData().
+*/
+
+/*!
+    \fn inline ObjectDescription<type> Phonon::ObjectDescriptionModel::modelData(const QModelIndex &index) const
+
+    Returns one ObjectDescription of the model data for the given \a index.
+*/
+
+/*!
+    \fn inline Qt::DropActions Phonon::ObjectDescriptionModel::supportedDropActions() const
+
+    This model supports drag and drop to copy or move
+    items.
+*/
+
+/*!
+    \fn inline bool Phonon::ObjectDescriptionModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent)
+
+    Accept drops from other models of the same ObjectDescriptionType.
+
+    The \a data is dropped at the given \a row and \a column; you
+    also receive the \a parent model index.
+
+    If a valid \a parent is given the dropped items will be inserted
+    above that item.
+*/
+
+/*!
+    \fn inline bool Phonon::ObjectDescriptionModel::removeRows(int row, int count, const QModelIndex &parent = QModelIndex())
+
+    Removes count rows starting with the given row.
+
+    If a valid \a parent is given no rows are removed since this is a
+    list model.
+
+    Returns true if the rows were successfully removed; otherwise returns false.
+*/
+
+/*!
+    \fn inline QStringList Phonon::ObjectDescriptionModel::mimeTypes() const
+
+    Returns a list of supported drag and drop MIME types. Currently
+    it only supports one type used internally.
+*/
+
+/*!
+    \class Phonon::EffectInterface
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \class Phonon::Effect
+    \inmodule Phonon
+    \inheaderfile Phonon/Effect
+    \since 4.4
+    \brief The Effect class is used to transform audio streams.
+
+    An effect is a media node which is inserted into a path between a
+    \l{Phonon::}{MediaObject} and an audio output node, for instance,
+    an \l{Phonon::}{AudioOutput}. The Effect transforms the media
+    stream on that path.
+
+    Examples may include simple modifiers, such as fading or pitch
+    shifting, and more complex mathematical transformations. You can
+    query the backend for available effects with
+    BackendCapabilities::availableAudioEffects(). Note that the
+    effects available is dependent on the underlying system
+    (DirectDraw, GStreamer, or QuickTime).
+
+    In order to use an effect, insert it into the path as follows:
+
+    \snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 19
+
+    The effect will immediately begin applying it's transformations on
+    the path. To stop it, remove the Effect from the path.
+
+    To create an effect, you use the \l{Phonon::}{EffectDescription}
+    class, which you get from
+    \l{BackendCapabilities::}{availableAudioEffects()}. We give a code
+    example below.
+
+    \snippet doc/src/snippets/audioeffects.cpp 0
+
+    An effect can have one or more parameters, which let you alter how
+    the effect works, for instance, by specifying the depth of a
+    reverb effect. See the EffectParameter class description for
+    details.
+
+    Phonon also provides EffectWidget, which lets the user modify the
+    parameters of an effect an the fly, e.g., with comboboxes.
+
+    \sa {Phonon Module}, EffectWidget
+*/
+
+/*!
+    \fn explicit Phonon::Effect::Effect(const EffectDescription &description, QObject *parent = 0)
+
+    Constructs a new effect object with the given \a description and \a parent object.
+
+    The EffectDescription object determines the type of the effect.
+
+    \sa {Phonon::BackendCapabilities::availableAudioEffects()}
+*/
+
+/*!
+    \fn Phonon::Effect::Effect(EffectPrivate &dd, QObject *parent)
+    \internal
+*/
+
+/*!
+    \fn Phonon::Effect::~Effect()
+    \internal
+*/
+
+/*!
+    \fn QVariant Phonon::Effect::parameterValue(const EffectParameter &parameter) const
+
+    Returns the value of the given effect \a parameter. You can fetch
+    the available parameters for an effect with parameters().
+
+    \sa setParameterValue(), EffectParameter
+*/
+
+/*!
+    \fn void Phonon::Effect::setParameterValue(const EffectParameter &parameter, const QVariant &value)
+
+    Sets the given effect \a parameter to the specified \a value.
+
+    Parameters for an effect are returned by parameters(). You can
+    check which QVariant::Type an EffectParameter takes with the
+    EffectParameter::type() function.
+
+    \sa parameterValue(), EffectParameter
+*/
+
+/*!
+    \fn EffectDescription Phonon::Effect::description() const;
+
+    Returns the description of this effect. This is the same
+    description that was passed to the constructor. 
+*/
+
+/*!
+    \fn QList<EffectParameter> Phonon::Effect::parameters() const;
+
+    Returns a list of parameters that this effect provides to control
+    its behavior.
+
+    \sa EffectParameter, EffectWidget
+*/
+
+/*!
+    \class Phonon::EffectPrivate
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \class Phonon::AudioOutput
+    \inmodule Phonon
+    \inheaderfile Phonon/AudioOutput
+    \since 4.4
+    \brief The AudioOutput class is used to send data to audio output devices.
+
+    The AudioOutput class plays sound over a sound device. The audio
+    output needs to be connected to a \l{Phonon::}{MediaObject} using
+    \l{Phonon::}{createPath()}. To start playback, you call
+    \l{Phonon::MediaObject::}{play()} on the media object.
+
+    \snippet snippets/phonon.cpp 2
+
+    The class supports changing the volume(). It is also possible to
+    mute the sound. 
+
+    To find out what \l{Phonon::}{AudioOutputDevice}s are available
+    for AudioOutput, you can call
+    BackendCapabilities::availableAudioDevices(). A default device is
+    selected by the backend, but it is possible to set the device to
+    be used with setOutputDevice(). The outputDeviceChanged() signal
+    will be emitted if the device changes.
+
+    If an error occurs with the playback, for instance, if no valid
+    output device is found, the media object will receive a
+    stateChanged() signal with the \l{Phonon::}{ErrorState}.
+
+    Note that the default values of properties are dependent on the
+    backend.
+
+    \sa Phonon::VolumeSlider, {Music Player Example}, BackendCapabilities, {Phonon Module}
+*/
+
+/*!
+    \property Phonon::AudioOutput::name
+
+    This is the name that appears in Mixer applications that control
+    the volume of this output.
+
+*/
+
+/*!
+    \property Phonon::AudioOutput::volume
+
+    This is the current loudness of the output.  \omit The volume is a
+    real value between 0.0 (minimum) and 1.0 (maximum). The volume
+    follows the sound device used, with 1.0 being the maximum volume
+    the device can produce. \endomit
+
+    (it is using Stevens' law
+    to calculate the change in voltage internally).
+
+    \sa volumeDecibel
+*/
+
+/*!
+    \property Phonon::AudioOutput::volumeDecibel
+
+    This is the current volume of the output in decibel.
+
+    0 dB means no change in volume, -6dB means an attenuation of the
+    voltage to 50% and an attenuation of the power to 25%, -inf dB means
+    silence.
+
+    \sa volume
+*/
+
+/*!
+    \property Phonon::AudioOutput::outputDevice
+    This property holds the (hardware) destination for the output.
+
+    The default device is determined by the \l{Phonon::}{Category} and the global
+    configuration for that category. Normally you don't need
+    to override this setting - letting the user change the global
+    configuration is the right choice. You can still override the
+    device though, if you have good reasons to do so.
+
+    \sa outputDeviceChanged()
+*/
+
+/*!
+    \property Phonon::AudioOutput::muted
+    This property tells whether the output is muted.
+
+    Muting the output has the same effect as calling setVolume(0.0).
+*/
+
+/*!
+    \fn explicit Phonon::AudioOutput::AudioOutput(Phonon::Category category, QObject *parent = 0)
+
+    Creates a new AudioOutput with the given \a parent that defines
+    output to a physical device.
+
+    The \a category can be used by mixer applications to group volume
+    controls of applications into categories. That makes it easier for
+    the user to identify the programs.
+    The category is also used for the default output device that is
+    configured centrally. As an example: often users want to have the
+    audio signal of a VoIP application go to their USB headset while
+    all other sounds should go to the internal soundcard.
+
+    \sa Phonon::categoryToString(), outputDevice
+*/
+
+/*!
+    \fn explicit Phonon::AudioOutput::AudioOutput(QObject *parent = 0)
+
+    Creates a new AudioOutput that defines output to the system
+    default device with the \{Phonon::Category::}{NoCategory} category
+
+    \sa Phonon::categoryToString(), outputDevice
+*/
+
+/*!
+    \fn Phonon::Category Phonon::AudioOutput::category() const
+
+    Returns the category of this output.
+
+    \sa Phonon::AudioOutput::AudioOutput()
+*/
+
+/*!
+    \fn void Phonon::AudioOutput::volumeChanged(qreal newVolume)
+
+    This signal is emitted whenever the volume has changed. As the
+    volume can change without a call to setVolume (calls over dbus)
+    this is important to keep a widget showing the current volume up
+    to date.
+
+    \a newVolume is the new volume level.
+
+    \sa setVolume(), volume()
+*/
+
+/*!
+    \fn void Phonon::AudioOutput::mutedChanged(bool muted)
+
+    This signal is emitted when the muted property has changed. The \a muted
+    value passed by the signal indicates the state of the muted property.
+    As this property can change by IPC (DBus) calls a UI element showing
+    the muted property should listen to this signal.
+*/
+
+/*!
+    \fn void Phonon::AudioOutput::outputDeviceChanged(const Phonon::AudioOutputDevice &newAudioOutputDevice)
+
+    This signal is emitted when the (hardware) device for the output
+    has changed. \a newAudioOutputDevice is the new device.
+
+    The change can happen either through setOutputDevice or if the
+    global configuration for the used category has changed.
+
+    \sa outputDevice
+*/
+
+/*!
+    \class Phonon::AudioOutputPrivate
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \class Phonon::EffectParameter
+    \inmodule Phonon
+    \inheaderfile Phonon/EffectParameter
+    \since 4.4
+    \brief The EffectParameter class describes one parameter of an effect.
+
+    You fetch the parameters of an \l{Phonon::}{Effect} with
+    \l{Phonon::}{Effect::parameters()}.
+
+    \snippet doc/src/snippets/phononeffectparameter.cpp 0
+
+    To describe itself, an effect parameter gives a name() and
+    possibly description() (depending on the backend used). These are
+    suited to present the effect parameter to the user of a Phonon
+    application.
+
+    Note that effects are created by the backend, and that
+    their name and descriptions may vary.
+
+    The value of an effect parameter is stored in a \l{QVariant},
+    of which type() is usually \c int or \c double. 
+
+    The value is retrieved with \l{Phonon::}{Effect::parameterValue()}
+    and set with \l{Phonon::Effect::}{setParameterValue()} - both of
+    which takes the EffectParameter as argument. Note that not all
+    effect parameters support setting of their value. 
+
+    You get the values a parameter can take with possibleValues(); an
+    empty list is returned if the values are continuous.
+
+    A parameter may also specify default(), minimum(), and maximum()
+    values. Values are returned as \l{QVariant}s. If the parameter
+    does not have the requested value, an \l{QVariant::Invalid}
+    invalid QVariant is returned from these functions.
+
+    The \l{Phonon::}{EffectWidget} provides a widget with which one
+    can control the parameters of an \l{Phonon::}{Effect}.
+
+    \snippet doc/src/snippets/phononeffectparameter.cpp 1
+
+    \sa Effect, EffectWidget, {Capabilities Example}, {Phonon Module}
+*/
+
+/*!
+    \fn Phonon::EffectParameter::EffectParameter()
+    \internal
+
+    Creates an invalid effect parameter.
+*/
+
+/*!
+    \fn Phonon::EffectParameter::~EffectParameter()
+
+    Destroys the effect parameter.
+*/
+
+/*!
+    \fn Phonon::EffectParameter::EffectParameter(const EffectParameter &other)
+
+    Constructs a copy of the \a other effect parameter.
+*/
+
+/*!
+    \fn const QString &Phonon::EffectParameter::name() const
+
+    The name of the parameter. Can be used as the label.
+
+    \return A label for the parameter.
+*/
+
+/*!
+    \fn const QString &Phonon::EffectParameter::description() const
+
+    The parameter may come with a description (LADSPA doesn't have a
+    field for this, so don't expect many effects to provide a
+    description).
+
+    The description can be used for a tooltip or WhatsThis help.
+
+    \return A text describing the parameter.
+*/
+
+/*!
+    \fn QVariant::Type Phonon::EffectParameter::type() const
+
+    Returns the parameter type.
+
+    Common types are QVariant::Int, QVariant::Double, QVariant::Bool and QVariant::String. When
+    QVariant::String is returned you get the possible values from possibleValues.
+*/
+
+/*!
+    \fn bool Phonon::EffectParameter::isLogarithmicControl() const
+
+    Returns whether the parameter should be
+    displayed using a logarithmic scale. This is particularly useful for
+    frequencies and gains.
+*/
+
+/*!
+    \fn QVariant Phonon::EffectParameter::minimumValue() const
+
+    The minimum value to be used for the control to edit the parameter.
+
+    If the returned QVariant is invalid the value is not bounded from
+    below.
+*/
+
+/*!
+    \fn QVariant Phonon::EffectParameter::maximumValue() const
+
+    The maximum value to be used for the control to edit the parameter.
+
+    If the returned QVariant is invalid the value is not bounded from
+    above.
+*/
+
+/*!
+    \fn QVariant Phonon::EffectParameter::defaultValue() const
+
+    The default value.
+*/
+
+/*!
+    \fn QVariantList Phonon::EffectParameter::possibleValues() const
+
+    The possible values to be used for the control to edit the parameter.
+
+    if the value of this parameter is to be picked from predefined values
+    this returns the list (otherwise it returns an empty QVariantList).
+*/
+
+/*!
+    \fn bool Phonon::EffectParameter::operator<(const EffectParameter &rhs) const
+
+    \internal
+    compares the ids of the parameters
+*/
+
+/*!
+    \fn bool Phonon::EffectParameter::operator>(const EffectParameter &rhs) const
+
+    \internal
+    compares the ids of the parameters
+*/
+
+/*!
+    \fn bool Phonon::EffectParameter::operator==(const EffectParameter &rhs) const
+
+    \internal
+    compares the ids of the parameters
+*/
+
+/*!
+    \fn Phonon::EffectParameter &Phonon::EffectParameter::operator=(const EffectParameter &other)
+
+    Assigns the \a other effect parameter to this parameter and returns
+    a reference to this parameter.
+*/
+
+/*!
+    \enum Phonon::EffectParameter::Hint
+
+    Only for backend developers:
+
+    Flags to set the return values of isToggleControl(),
+    isLogarithmicControl(), isIntegerControl(), isBoundedBelow() and
+    isBoundedAbove(). The values of the flags correspond to the values
+    used for LADSPA effects.
+
+    \value ToggledHint
+    If this hint is set it means that
+    the the control has only two states: zero and non-zero
+    (see isToggleControl()).
+
+    \value LogarithmicHint
+    LADSPA's SAMPLE_RATE hint needs to be translated by the backend
+    to normal bounds, as the backend knows the sample rate - and the
+    frontend doesn't (see isLogarithmicControl()).
+
+    \value IntegerHint See isIntegerControl().
+*/
+
+/*!
+    \fn Phonon::EffectParameter::EffectParameter(int parameterId,
+        const QString &name, EffectParameter::Hints hints,
+        const QVariant &defaultValue, const QVariant &min = QVariant(),
+        const QVariant &max = QVariant(), const QVariantList &values = QVariantList(),
+        const QString &description = QString())
+
+    Only to be used by backend implementations:
+
+    Creates a new effect parameter.
+
+    \a parameterId This is a number to uniquely identify the
+    parameter. The id is used for value() and setValue().
+
+    \a name is the name/label for this parameter.
+
+    \a hints sets the hints for the type of parameter.
+
+    \a defaultValue The value that should be used as a default.
+
+    \a min is the minimum value allowed for this parameter. You only
+    need to set this if the BoundedBelowHint is set.
+
+    \a max is the maximum value allowed for this parameter. You only
+    need to set this if the BoundedAboveHint is set.
+
+    The \a values parameter is the values that the effect parameter
+    can take (only applies if non-continuous) 
+
+    \a description is a descriptive text for the parameter
+    (explaining what it controls) to be used as a tooltip or
+    WhatsThis help.
+*/
+
+/*!
+    \fn int Phonon::EffectParameter::id() const
+
+    \internal
+
+    Returns the parameter's identifier.
+*/
+
+/*!
+    \class Phonon::AudioOutputInterface40
+    \inmodule Phonon
+    \since 4.4
+    \internal
+    \brief Interface for AudioOutput objects
+
+*/
+
+/*!
+    \fn virtual Phonon::AudioOutputInterface40::~AudioOutputInterface40()
+    \internal
+*/
+
+/*!
+    \fn virtual qreal Phonon::AudioOutputInterface40::volume() const = 0
+    \internal
+*/
+
+/*!
+    \fn virtual void Phonon::AudioOutputInterface40::setVolume(qreal) = 0
+    \internal
+*/
+
+/*!
+    \fn virtual int Phonon::AudioOutputInterface40::outputDevice() const = 0
+    \internal
+*/
+
+/*!
+    \fn virtual bool Phonon::AudioOutputInterface40::setOutputDevice(int) = 0
+    \internal
+*/
+
+/*!
+    \class Phonon::Path
+    \inmodule Phonon
+    \inheaderfile Phonon/Path
+    \since 4.4
+    \brief The Path class describes connections between media nodes.
+
+    In a \l{Building Graphs}{media graph}, \l{Phonon::}{MediaNode}s
+    are connected by Paths. The multimedia travels in streams over
+    these paths.
+
+    You create a path between two media nodes using the static
+    Phonon::createPath() function, which takes two nodes as arguments.
+    The first argument will send the media stream to the second.
+    Please refer to the class description of the individual media
+    nodes and the Phonon \l{Phonon Overview}{overview} to see which
+    nodes can be connected to each other.
+
+    Paths are also used to insert audio \l{Phonon::}{Effect}s between
+    two media nodes. The effect will then alter the stream on the
+    path. Notice that \l{Phonon::}{Effect}s also are media nodes, but
+    that insertEffect() - instead of Phonon::createPath() - is used to
+    insert them into the media graph.
+
+    The following code example shows how to create a path between two
+    media nodes and insert an effect on that path.
+
+    \snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 20
+
+    \sa Phonon::MediaNode, Phonon::MediaObject, Phonon::AudioOutput,
+        Phonon::VideoWidget, {Phonon Module}
+*/
+
+/*!
+    \fn Phonon::Path::~Path();
+
+    Destroys this reference to the Path. If the path was valid the connection is not broken
+    as both the source and the sink MediaNodes still keep a reference to the Path.
+
+    \sa disconnect()
+*/
+
+/*!
+    \fn Phonon::Path::Path();
+
+    Creates an invalid path.
+
+    You can still make it a valid path by calling reconnect. It is
+    recommended to use the Phonon::createPath() function to create
+    paths.
+
+    \sa Phonon::createPath(), isValid()
+*/
+
+/*!
+    \fn Phonon::Path::Path(const Path &path);
+
+    Constructs a copy of the other \a path specified.
+
+    This constructor is fast thanks to explicit sharing.
+*/
+
+/*!
+    \fn bool Phonon::Path::isValid() const;
+
+    A path is considered valid if it is connected to two media nodes,
+    in which case this function returns true. If it is connected to
+    one or no media nodes, it is consider invalid, and this function
+    will then return false.
+*/
+
+/*!
+    \fn Effect *Phonon::Path::insertEffect(const EffectDescription &desc, Effect *insertBefore = 0);
+
+    Creates and inserts an effect into the path.
+
+    You may insert effects of the same class as often as you like,
+    but if you insert the same object, the call will fail.
+
+    \a desc is the EffectDescription object for the effect to be inserted.
+
+    If you already inserted an effect you can
+    tell with \a insertBefore in which order the data gets
+    processed. If this is \c 0 the effect is appended at the end of
+    the processing list. If the effect has not been inserted before
+    the method will do nothing and return \c false.
+
+    Returns a pointer to the effect object if it could be inserted
+    at the specified position. If \c 0 is returned, the effect was not
+    inserted.
+
+    Below is a code example for inserting an effect into a path:
+
+    \snippet doc/src/snippets/audioeffects.cpp 0
+
+    \sa removeEffect(), effects()
+*/
+
+/*!
+    \fn bool Phonon::Path::insertEffect(Effect *effect, Effect *insertBefore = 0);
+
+    Inserts the given \a effect into the path before the effect specified by \a insertBefore
+    and returns true if successful; otherwise returns false.
+
+    If \a insertBefore is zero, the effect is appended to the processing list.
+
+    You may insert effects of the same class as often as you like, but if you insert
+    the same object, the call will fail.
+
+    \a effect will be inserted right before \a insertBefore. If
+    \a insertBefore is \c 0, the effect is appended at the end of the
+    processing list. If the effect has not been inserted before the
+    method will do nothing and return \c false.
+
+    Returns whether the effect could be inserted at the specified
+    position. If \c false is returned the effect was not inserted.
+
+    \sa removeEffect(), effects()
+*/
+
+/*!
+    \fn bool Phonon::Path::removeEffect(Effect *effect);
+
+    Removes the given \a effect from the path and returns true; otherwise returns false.
+
+    Removes an \a effect from the path.
+
+    If the effect is deleted while it is still connected, the effect will be removed
+    automatically.
+
+    \omit
+    \param effect The effect to be removed.
+
+    \return Returns whether the call was successful. If it returns
+    \c false the effect could not be found in the path, meaning it
+    has not been inserted before.
+    \endomit
+
+    \sa insertEffect(), effects()
+*/
+
+/*!
+    \fn QList<Effect *> Phonon::Path::effects() const;
+
+    Returns a list of Effect objects that are currently
+    used as effects. The order in the list determines the order the
+    signal is sent through the effects.
+
+    \return A list with all current effects.
+
+    \sa insertEffect(), removeEffect()
+*/
+
+/*!
+    \fn bool Phonon::Path::reconnect(MediaNode *source, MediaNode *sink);
+
+    Changes the media nodes the path is connected to by connecting the path
+    to the \a source and \a sink nodes specified. Returns true if successful;
+    otherwise returns false.
+
+    If unsuccessful, the path remains connected to the same nodes as before.
+
+    \sa Phonon::createPath(), {Phonon Overview}
+*/
+
+/*!
+    \fn bool Phonon::Path::disconnect();
+
+    Tries to disconnect the path from the MediaNodes it is connected to, returning
+    true if successful or false if unsuccessful.
+
+    If successful, the path is invalidated: isValid() will returns false.
+*/
+
+/*!
+    \fn Path &Phonon::Path::operator=(const Path &p);
+
+    Assigns \a p to this Path and returns a reference to this Path.
+
+    This operation is fast thanks to explicit sharing.
+*/
+
+/*!
+    \fn bool Phonon::Path::operator==(const Path &p) const;
+
+    Returns true if this Path is equal to \a p; otherwise returns false;
+*/
+
+/*!
+    \fn bool Phonon::Path::operator!=(const Path &p) const;
+
+    Returns true if this Path is not equal to \a p; otherwise returns false;
+*/
+
+/*!
+    \fn Path Phonon::createPath(MediaNode *source, MediaNode *sink);
+
+    \relates Phonon::Path
+    Creates a new Path connecting the two MediaNodes \a source and \a sink.
+
+    The implementation will automatically select the right format and media type. E.g. connecting a
+    MediaObject and AudioOutput will create a Path object connecting the audio. This might be
+    represented as PCM or perhaps even AC3 depending on the AudioOutput object.
+
+    \param source The MediaNode to connect an output from
+    \param sink The MediaNode to connect to.
+*/
+
+/*!
+    \class Phonon::PathPrivate
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \class Phonon::MediaObjectInterface
+    \inmodule Phonon
+    \since 4.4
+    \internal
+    \brief Backend interface for media sources.
+
+    The backend implementation has to provide two signals, that are not defined
+    in this interface:
+    \list
+    \o \target phonon_MediaObjectInterface_stateChanged
+    void stateChanged(Phonon::State newstate, Phonon::State oldstate)
+
+    Emitted when the state of the MediaObject has changed.
+    In case you're not interested in the old state you can also
+    connect to a slot that only has one State argument.
+
+    \param newstate The state the Player is in now.
+    \param oldstate The state the Player was in before.
+
+    \o \target phonon_MediaObjectInterface_tick
+    void tick(qint64 time)
+
+    This signal gets emitted every tickInterval milliseconds.
+
+    \param time The position of the media file in milliseconds.
+
+    \sa setTickInterval()
+    \sa tickInterval()
+    \endlist
+
+    \sa MediaObject
+*/
+
+/*!
+    \fn virtual Phonon::MediaObjectInterface::~MediaObjectInterface()
+    \internal
+*/
+
+/*!
+    \fn virtual qint64 Phonon::MediaObjectInterface::remainingTime() const
+    \internal
+*/
+
+/*!
+    \fn virtual qint32 Phonon::MediaObjectInterface::prefinishMark() const = 0
+    \internal
+*/
+
+/*!
+    \fn virtual void Phonon::MediaObjectInterface::setPrefinishMark(qint32) = 0
+    \internal
+*/
+
+/*!
+    \fn virtual qint32 Phonon::MediaObjectInterface::transitionTime() const = 0
+    \internal
+*/
+
+/*!
+    \fn virtual void Phonon::MediaObjectInterface::setTransitionTime(qint32) = 0
+    \internal
+*/
+
+/*!
+    \fn virtual void Phonon::MediaObjectInterface::play() = 0
+    \internal
+
+    Requests the playback to start.
+
+    This method is only called if the state transition to PlayingState is possible.
+
+    The backend should react immediately
+    by either going into PlayingState or BufferingState if the
+    former is not possible.
+*/
+
+/*!
+    \fn virtual void Phonon::MediaObjectInterface::pause() = 0
+    \internal
+
+    Requests the playback to pause.
+
+    This method is only called if the state transition to PausedState is possible.
+
+    The backend should react as fast as possible. Go to PausedState
+    as soon as playback is paused.
+*/
+
+/*!
+    \fn virtual void Phonon::MediaObjectInterface::stop() = 0
+    \internal
+
+    Requests the playback to be stopped.
+
+    This method is only called if the state transition to StoppedState is possible.
+
+    The backend should react as fast as possible. Go to StoppedState
+    as soon as playback is stopped.
+
+    A subsequent call to play() will start playback at the beginning of
+    the media.
+*/
+
+/*!
+    \fn virtual void Phonon::MediaObjectInterface::seek(qint64 milliseconds) = 0
+    \internal
+
+    Requests the playback to be seeked to the given time.
+
+    The backend does not have to finish seeking while in this function
+    (i.e. the backend does not need to block the thread until the seek is
+    finished; even worse it might lead to deadlocks when using a
+    ByteStream which gets its data from the thread this function would
+    block).
+
+    As soon as the seek is done the currentTime() function and
+    the tick() signal will report it.
+
+    \param milliseconds The time where playback should seek to in
+    milliseconds.
+*/
+
+/*!
+    \fn virtual qint32 Phonon::MediaObjectInterface::tickInterval() const = 0
+    \internal
+
+    Return the time interval in milliseconds between two ticks.
+
+    Returns the tick interval that it was set to (might not
+    be the same as you asked for).
+*/
+
+/*!
+    \fn virtual void Phonon::MediaObjectInterface::setTickInterval(qint32 interval) = 0
+    \internal
+
+    Change the interval the tick signal is emitted. Set \a interval to 0 to
+    disable the signal.
+
+    \a interval tick interval in milliseconds
+
+    Returns the tick interval that it was set to (might not be the same as you
+    asked for).
+
+*/
+
+/*!
+    \fn virtual bool Phonon::MediaObjectInterface::hasVideo() const = 0
+    \internal
+
+    Check whether the media data includes a video stream.
+
+    Returns true if the media contains video data.
+*/
+
+/*!
+    \fn virtual bool Phonon::MediaObjectInterface::isSeekable() const = 0
+    \internal
+
+    If the current media may be seeked this function returns true;
+    otherwise, false.
+
+    Returns whether the current media may be seeked.
+*/
+
+/*!
+    \fn virtual qint64 Phonon::MediaObjectInterface::currentTime() const = 0
+    \internal
+
+    Get the current time (in milliseconds) of the file currently being played.
+*/
+
+/*!
+    \fn virtual Phonon::State Phonon::MediaObjectInterface::state() const = 0
+    \internal
+
+    Get the current state.
+*/
+
+/*!
+    \fn virtual QString Phonon::MediaObjectInterface::errorString() const = 0
+    \internal
+
+    A translated string describing the error.
+*/
+
+/*!
+    \fn virtual Phonon::ErrorType Phonon::MediaObjectInterface::errorType() const = 0
+    \internal
+
+    Tells your program what to do about the error.
+
+    \sa Phonon::ErrorType
+*/
+
+/*!
+    \fn virtual qint64 Phonon::MediaObjectInterface::totalTime() const = 0
+    \internal
+
+    Returns the total time of the media in milliseconds.
+
+    If the total time is not know return -1. Do not block until it is
+    known, instead emit the totalTimeChanged signal as soon as the total
+    time is known or changes.
+*/
+
+/*!
+    \fn virtual MediaSource Phonon::MediaObjectInterface::source() const = 0
+    \internal
+
+    Returns the current source.
+*/
+
+/*!
+    \fn virtual void Phonon::MediaObjectInterface::setSource(const MediaSource &) = 0
+    \internal
+
+    Sets the current source. When this function is called the MediaObject is
+    expected to stop all current activity and start loading the new
+    source (i.e. go into LoadingState).
+
+    It is expected that the
+    backend now starts preloading the media data, filling the audio
+    and video buffers and making all media meta data available. It
+    will also trigger the totalTimeChanged signal.
+
+    If the backend does not know how to handle the source it needs to
+    change state to Phonon::ErrorState. Don't bother about handling KIO
+    URLs. It is enough to handle AbstractMediaStream sources correctly.
+
+    \warning Keep the MediaSource object around as long as the backend
+    uses the AbstractMediaStream returned by the MediaSource. In case
+    that no other reference to the MediaSource exists and it is set to
+    MediaSource::autoDelete, the AbstractMediaStream is deleted when the
+    last MediaSource ref is deleted.
+*/
+
+/*!
+    \fn virtual void Phonon::MediaObjectInterface::setNextSource(const MediaSource &source) = 0
+    \internal
+
+    Sets the next source to be used for transitions. When a next source
+    is set playback should continue with the new source. In that case
+    finished and prefinishMarkReached are not emitted.
+
+    \param source The source to transition to (crossfade/gapless/gap). If
+    \a source is an invalid MediaSource object then the queue is empty
+    and the playback should stop normally.
+
+    \warning Keep the MediaSource object around as long as the backend
+    uses the AbstractMediaStream returned by the MediaSource. In case
+    that no other reference to the MediaSource exists and it is set to
+    MediaSource::autoDelete, the AbstractMediaStream is deleted when the
+    last MediaSource ref is deleted.
+*/
+
+/*!
+    \class Phonon::EffectWidget effectwidget.h Phonon/EffectWidget
+    \inmodule Phonon
+    \inheaderfile Phonon/EffectWidget
+    \since 4.4
+    \brief The EffectWidget class provides a widget to control the parameters of an Effect.
+
+    The EffectWidget class provides a widget, with which an effects
+    parameters can be controlled. The widget does not have an API,
+    and is constructed with the \l{Phonon::}{Effect}, of which
+    parameters should be controlled.
+
+    \snippet doc/src/snippets/audioeffects.cpp 1
+
+    The following image shows an example of an effect widget.
+
+    \image effectwidget.png
+
+    Note that some audio effects do not have parameters, and the
+    widget will then not \l{QWidget::}{show()} at all.
+
+    \sa Effect, BackendCapabilities, EffectDescription, {Phonon Module}
+*/
+
+/*!
+    \class Phonon::AbstractAudioOutput
+    \inmodule Phonon
+    \internal
+    \brief Provides a common base class for all audio outputs.
+
+    \sa AudioOutput
+*/
+
+/*!
+    \fn Phonon::AbstractAudioOutput::~AbstractAudioOutput()
+    \internal
+*/
+
+/*!
+    \class Phonon::AbstractAudioOutputPrivate
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \class AudioOutputAdaptor
+    \inmodule Phonon
+    \brief Provides an adaptor class for interface org.kde.Phonon.AudioOutput
+    \internal
+*/
+
+/*!
+    \class Phonon::VolumeSlider
+    \inmodule Phonon
+    \inheaderfile Phonon/VolumeSlider
+    \since 4.4
+    \brief The VolumeSlider widget provides a slider that is used to control the volume of an audio output device.
+
+    The slider also displays an icon indicating if the volume of the
+    \l{Phonon::}{AudioOutput} it is connected to is muted. The icon
+    can be removed with setMuteVisible().
+
+    It is possible to set the \l{maximumVolume}{maximum} value of the
+    slider. By default, the minimum and maximum values of the slider
+    are 0.0 (no sound) to 1.0 (the maximum volume the audio output can
+    produce).
+
+    Here follows a code example:
+
+    \snippet doc/src/snippets/volumeslider.cpp 0
+
+    \omit mention how to change the style of the slider. \endomit
+
+    \sa {Phonon Module}
+*/
+
+/*!
+    \property Phonon::VolumeSlider::maximumVolume
+
+    This property holds the maximum volume that can be set with this slider.
+
+    By default the maximum value is 1.0 (100%).
+*/
+
+/*!
+    \property Phonon::VolumeSlider::orientation
+    This property holds the orientation of the slider.
+
+    The orientation must be Qt::Vertical (the default) or Qt::Horizontal.
+*/
+
+/*!
+    \property Phonon::VolumeSlider::tracking
+    This property holds whether slider tracking is enabled.
+
+    If tracking is enabled (the default), the volume changes
+    while the slider is being dragged. If tracking is
+    disabled, the volume changes only when the user
+    releases the slider.
+*/
+
+/*!
+    \property Phonon::VolumeSlider::pageStep
+    This property holds the page step.
+
+    The larger of two natural steps that a slider provides and
+    typically corresponds to the user pressing PageUp or PageDown.
+
+    Defaults to 5 (5% of the voltage).
+*/
+
+/*!
+    \property Phonon::VolumeSlider::singleStep
+    This property holds the single step.
+
+    The smaller of two natural steps that a slider provides and
+    typically corresponds to the user pressing an arrow key.
+
+    Defaults to 1 (1% of the voltage).
+*/
+
+/*!
+    \property Phonon::VolumeSlider::muteVisible
+    This property holds whether the mute button/icon next to the slider is visible.
+
+    By default the mute button/icon is visible.
+*/
+
+/*!
+    \property Phonon::VolumeSlider::iconSize
+    \brief the icon size used for the mute button/icon.
+
+    The default size is defined by the GUI style.
+*/
+
+/*!
+    \fn explicit Phonon::VolumeSlider::VolumeSlider(QWidget *parent = 0)
+    Constructs a new volume slider with the given \a parent.
+*/
+
+/*!
+    \fn explicit Phonon::VolumeSlider::VolumeSlider(AudioOutput *output, QWidget *parent = 0)
+    Constructs a new volume slider with the given \a output object and \a parent.
+*/
+
+/*!
+    \fn Phonon::VolumeSlider::~VolumeSlider()
+*/
+
+/*!
+    \fn AudioOutput *Phonon::VolumeSlider::audioOutput() const
+*/
+
+/*!
+    \fn void Phonon::VolumeSlider::setAudioOutput(Phonon::AudioOutput *output)
+
+    Sets the audio output object to be controlled by this slider to the specified
+    \a output object.
+*/
+
+/*!
+    \class Phonon::VolumeSliderPrivate
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \class Phonon::MediaController
+    \inmodule Phonon
+    \inheaderfile Phonon/MediaController
+    \since 4.4
+    \brief The MediaController class controls optional features of a media file/device.
+
+    Some media sources have content that the \l{Phonon::}{MediaObject}
+    does not provide control over, for instance, chapters in a DVD
+    file. The functionality the media controller offers is
+    dependent on the type of media source that is played back.
+    Commonly, the media controller allows you to:
+
+    \list
+        \o Navigate between \bold chapters.
+        \o Navigate between \bold titles.
+        \o Select between \bold angles.
+    \endlist 
+
+    The \l{Phonon::MediaController::}{Feature} enum explains these
+    terms in more detail, and their context in playback of CD and DVD. 
+
+    The media controller keeps a \l{Phonon::}{MediaObject}, of which
+    \l{Phonon::MediaObject::currentSource()}{media source} is played
+    back. You can still call the media object's functions, e.g.,
+    \l{Phonon::MediaObject::}{stop()}; this is all handled correctly
+    by the media controller. You have the option of letting the media
+    controller play all titles of a source in sequence by setting the
+    \l{autoplayTitles()}{autoplay titles} option.
+
+    To start a playback using a media object, you call
+    \l{Phonon::MediaObject::}{play()} on the media object. To play a
+    specific title, use setCurrentTitle() and then call
+    \l{Phonon::MediaObject::}{play()}.
+
+    \warning The Phonon::MediaController class is not yet supported by
+    Qt backends.
+
+    \sa {Phonon Module}
+*/
+
+/*!
+    \fn int Phonon::MediaController::availableAudioChannels() const
+    \internal
+*/
+
+/*!
+    \fn void Phonon::MediaController::availableAudioChannelsChanged()
+    \internal
+*/
+
+/*!
+    \fn QList<SubtitleDescription> Phonon::MediaController::availableSubtitles() const
+    \internal
+*/
+
+/*!
+    \fn void Phonon::MediaController::availableSubtitlesChanged()
+    \internal
+*/
+
+/*!
+    \fn AudioChannelDescription Phonon::MediaController::currentAudioChannel() const
+    \internal
+*/
+
+/*!
+    \fn SubtitleDescription Phonon::MediaController::currentSubtitle() const
+    \internal
+*/
+
+/*!
+    \fn void Phonon::MediaController::setCurrentAudioChannel(const Phonon::AudioChannelDescription &stream)
+    \internal
+*/
+
+/*!
+    \fn void Phonon::MediaController::setCurrentSubtitle(const Phonon::SubtitleDescription &stream)
+    \internal
+*/
+
+/*!
+    \fn Phonon::BackendCapabilities::availableAudioCaptureDevices()
+    \internal
+*/
+
+/*!
+    \fn Phonon::BackendCapabilities::Notifier::availableAudioCaptureDevicesChanged()
+    \internal
+*/
+
+/*!
+    \enum Phonon::MediaController::Feature
+
+    The values of this enum are interpreted differently depending on
+    the type of media source, e.g., DVD or CD. We give examples for
+    these sources.
+
+    \value Angles In the VOB (DVD) format, it is possible to to give
+    several video streams of the same scene, each of which displays
+    the scene from a different angle. The DVD viewer can then change
+    between these angles.
+
+    \value Chapters In the VOB format, chapters are points in a
+    single video stream that can be played and seeked to
+    separately. 
+
+    \value Titles On a CD, a title is a separate sound track. On DVD,
+    a title is a separate VOB file.
+
+*/
+
+/*!
+    \fn Phonon::MediaController::MediaController(MediaObject *parent)
+
+    Constructs a new MediaController with the media object (\a parent)
+    to be used by the media controller.
+
+    \sa MediaObject, Feature
+*/
+
+/*!
+    \fn Phonon::MediaController::~MediaController()
+*/
+
+/*!
+    \fn Features Phonon::MediaController::supportedFeatures() const
+*/
+
+/*!
+    \fn int Phonon::MediaController::availableAngles() const
+
+    Returns the available angles that is available for the current
+    media source.
+
+    \sa Feature
+*/
+
+/*!
+    \fn int Phonon::MediaController::currentAngle() const
+
+    Returns the angle that is currently used.
+
+    \sa Feature
+*/
+
+/*!
+    \fn int Phonon::MediaController::availableChapters() const
+
+    Returns the number of chapters the current media source
+    contains.
+
+    \sa Feature
+*/
+
+/*!
+    \fn int Phonon::MediaController::currentChapter() const
+
+    Returns the chapter that is currently being played back.
+
+    \sa Feature
+*/
+
+/*!
+    \fn int Phonon::MediaController::availableTitles() const
+
+    Returns the number of titles that the current media source
+    contains.
+
+    \sa Feature
+*/
+
+/*!
+    \fn int Phonon::MediaController::currentTitle() const
+
+    Returns the title that is currently played back.
+
+    The current title is 0 (the first) by default.
+
+    \sa Feature
+*/
+
+/*!
+    \fn bool Phonon::MediaController::autoplayTitles() const
+
+    Returns true if titles will automatically be played when the media
+    is played; otherwise returns false.
+
+    The media controller will play the titles of the media source in
+    sequence when the media object's \l{Phonon::MediaObject::}{play()}
+    function is called. If the autoplay option is disabled, the media
+    object will play the
+    \l{Phonon::}{MediaController::currentTitle()}{current title} and then
+    finish the playback.
+
+    \sa setAutoplayTitles(), currentTitle()
+*/
+
+/*!
+    \fn void Phonon::MediaController::setAutoplayTitles(bool enable)
+
+    Sets the titles to play automatically when the media is played if
+    \a enable is true; otherwise disables this option.
+
+    The media controller will play the titles of the media source in
+    sequence when the media object's \l{Phonon::MediaObject::}{play()}
+    function is called. If the autoplay option is disabled, the media
+    object will play the
+    \l{Phonon::}{MediaController::currentTitle()}{current title} and then
+    finish the playback.
+
+    \sa autoplayTitles(), currentTitle()
+*/
+
+/*!
+    \fn void Phonon::MediaController::setCurrentAngle(int angleNumber)
+
+    Sets the current angle to the given \a angleNumber if the media
+    file or device supports navigation by angle number.
+
+    \sa Feature
+*/
+
+/*!
+    \fn void Phonon::MediaController::setCurrentChapter(int chapterNumber)
+
+    Sets the current chapter to the given \a chapterNumber if the media
+    file or device supports navigation by chapter number.
+
+    \sa Feature
+*/
+
+/*!
+    \fn void Phonon::MediaController::setCurrentTitle(int titleNumber)
+
+    Skips to the given title \a titleNumber.
+
+    If it was playing before the title change it will start playback on the new title if
+    autoplayTitles is enabled.
+
+    \sa Feature
+*/
+
+/*!
+    \fn void Phonon::MediaController::nextTitle()
+
+    Skips to the next title.
+
+    If it was playing before the title change it will start playback on the next title if
+    autoplayTitles is enabled.
+
+    \sa Feature
+*/
+
+/*!
+    \fn void Phonon::MediaController::previousTitle()
+
+    Skips to the previous title.
+
+    If it was playing before the title change it will start playback on the previous title if
+    autoplayTitles is enabled.
+
+    \sa Feature
+*/
+
+/*!
+    \fn void Phonon::MediaController::availableAnglesChanged(int availableAngles)
+
+    This signal is emitted whenever the number of available angles changes.
+    The new number of available angles is given by \a availableAngles.
+
+    \sa Feature
+*/
+
+/*!
+    \fn void Phonon::MediaController::angleChanged(int angleNumber)
+
+    This signal is emitted whenever the current angle changes.
+    The new angle number is given by \a angleNumber.
+
+    \sa Feature
+*/
+
+/*!
+    \fn void Phonon::MediaController::availableChaptersChanged(int availableChapters)
+
+    This signal is emitted whenever the number of available chapters changes.
+    The new number of available chapters is given by \a availableChapters.
+
+    \sa Feature
+*/
+
+/*!
+    \fn void Phonon::MediaController::chapterChanged(int chapterNumber)
+
+    This signal is emitted whenever the current chapter changes.
+    The new chapter number is given by \a chapterNumber.
+
+    \sa Feature
+*/
+
+/*!
+    \fn void Phonon::MediaController::availableTitlesChanged(int availableTitles)
+
+    This signal is emitted whenever the number of available titles changes.
+    The new number of available titles is given by \a availableTitles.
+
+    \sa Feature
+*/
+
+/*!
+    \fn void Phonon::MediaController::titleChanged(int titleNumber)
+
+    This signal is emitted whenever the current title changes.
+    The new title number is given by \a titleNumber.
+
+    \sa Feature
+*/
+
+/*!
+    \class Phonon::VideoWidget
+    \inmodule Phonon
+    \inheaderfile Phonon/VideoWidget
+    \since 4.4
+    \ingroup advanced
+    \ingroup multimedia
+    \brief The VideoWidget class provides a widget that is used to display video.
+
+    The VideoWidget class renders the video of a media stream on a
+    QWidget. It is connected to the \l{Phonon::}{MediaObject}, of
+    which video stream it should render. You connect the two objects
+    using the Phonon::createPath() function.
+
+    The widget has some possibilities to manipulate the video
+    stream. You can change the brightness(), hue(), saturation(),
+    and contrast().
+
+    Resizing of the video is handled automatically, but you can affect
+    the way the video is resized with the aspectRatio and scaleMode
+    properties. By default, the widget will use the aspect ratio of
+    the video stream itself.
+
+    The video widget takes the size of the video when it receives a new video
+    stream (i.e., when a new MediaSource is set on the MediaObject to which it is
+    connected). If you need to know the size of the video, you can call
+    \l{QWidget::}{sizeHint()} after the video has been loaded (i.e., after the
+    MediaObject leaves the \l{Phonon::}{LoadingState}).
+
+    It is also possible to go to \l{fullScreen}{full screen} mode.
+
+    A typical example of usage follows below:
+
+    \snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 21
+
+    \sa {Phonon Module}
+*/
+
+/*!
+    \fn Phonon::VideoWidget::VideoWidget(QWidget *parent = 0)
+
+     Constructs a new video widget with the specified \a parent.
+*/
+
+/*!
+    \fn Phonon::VideoWidget::VideoWidget(VideoWidgetPrivate &d, QWidget *parent)
+    \internal
+
+     Constructs a new video widget with the specified \a parent.
+*/
+
+/*!
+    \fn bool Phonon::VideoWidget::event(QEvent *)
+    \reimp
+*/
+
+/*!
+    \fn void Phonon::VideoWidget::mouseMoveEvent(QMouseEvent *)
+    \reimp
+*/
+
+/*!
+    \enum Phonon::VideoWidget::ScaleMode
+    
+    The ScaleMode enum describes how to treat aspect ratio during
+    resizing of video. 
+
+    \value FitInView    The video will be fitted to fill the view
+                        keeping aspect ratio.
+    \value ScaleAndCrop The video is scaled 
+
+    
+*/
+
+/*!
+    \property Phonon::VideoWidget::fullScreen
+    This property holds whether the video is shown using the complete
+    screen.
+
+    The property differs from QWidget::fullScreen in that it is
+    writeable.
+
+    By default the widget is not shown in fullScreen.
+
+    \warning When switching to full screen mode using setFullScreen(),
+    the widget onto which the video is rendered is shown as a
+    top-level window. Key event forwarding is handled by VideoWidget,
+    but if you need to handle other events, e.g., mouse events, you
+    should handle fullscreen mode yourself.
+
+*/
+
+/*!
+    \property Phonon::VideoWidget::aspectRatio
+    Defaults to AspectRatioAuto.
+
+    \sa AspectRatio
+*/
+
+/*!
+    \property Phonon::VideoWidget::scaleMode
+
+    If the size of the widget and the size of the video are not equal.
+    The video will be zoomed to fit the widget. The smaller zoom
+    (AddBarsScaleMode) adds black bars at the left/right or top/bottom to
+    make all of the image visible (default). The bigger zoom (ExpandMode)
+    fills the widget completely, keeping all information in one direction
+    and leaving parts of the image outside of the widget in the other
+    direction.
+*/
+
+/*!
+    \property Phonon::VideoWidget::brightness
+
+    This property holds brightness of the video.
+
+    Default is 0. Acceptable values are in range of -1, 1.
+*/
+
+/*!
+    \property Phonon::VideoWidget::contrast
+
+    This property holds the contrast of the video.
+
+    Default is 0. Acceptable values are in range of -1, 1.
+*/
+
+/*!
+    \property Phonon::VideoWidget::hue
+
+    This property holds the hue of the video.
+
+    Default is 0. Acceptable values are in range of -1, 1.
+*/
+
+/*!
+    \property Phonon::VideoWidget::saturation
+
+    This property holds saturation of the video.
+
+    Default is 0. Acceptable values are in range of -1, 1.
+*/
+
+/*!
+    \enum Phonon::VideoWidget::AspectRatio
+
+    Defines the width:height to be used for the video.
+
+    \value AspectRatioAuto
+    Let the decoder find the aspect ratio automatically from the
+    media file (this is the default).
+
+    \value AspectRatioWidget
+    Fits the video into the widget making the aspect ratio depend
+    solely on the size of the widget. This way the aspect ratio
+    is freely resizeable by the user.
+
+    \value AspectRatio4_3
+    Make width/height == 4/3, which is the old TV size and
+    monitor size (1024/768 == 4/3). (4:3)
+
+    \value AspectRatio16_9
+    Make width/height == 16/9, which is the size of most current
+    media. (16:9)
+*/
+
+/*!
+    \fn void Phonon::VideoWidget::exitFullScreen()
+
+    Convenience slot, calling setFullScreen(false)
+*/
+
+
+/*!
+    \fn void Phonon::VideoWidget::enterFullScreen()
+
+    Convenience slot, calling setFullScreen(true)
+*/
+
+/*!
+    \class Phonon::VideoWidgetInterface
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \fn virtual Phonon::VideoWidgetInterface::~VideoWidgetInterface()
+*/
+
+/*!
+    \fn virtual Phonon::VideoWidget::AspectRatio Phonon::VideoWidgetInterface::aspectRatio() const = 0
+    \internal
+*/
+
+/*!
+    \fn virtual void Phonon::VideoWidgetInterface::setAspectRatio(Phonon::VideoWidget::AspectRatio ratio) = 0
+    \internal
+*/
+
+/*!
+    \fn virtual qreal Phonon::VideoWidgetInterface::brightness() const = 0
+    \internal
+*/
+
+/*!
+    \fn virtual void Phonon::VideoWidgetInterface::setBrightness(qreal) = 0
+    \internal
+*/
+
+/*!
+    \fn virtual Phonon::VideoWidget::ScaleMode Phonon::VideoWidgetInterface::scaleMode() const = 0
+    \internal
+*/
+
+/*!
+    \fn virtual void Phonon::VideoWidgetInterface::setScaleMode(Phonon::VideoWidget::ScaleMode mode) = 0
+    \internal
+*/
+
+/*!
+    \fn virtual qreal Phonon::VideoWidgetInterface::contrast() const = 0
+    \internal
+*/
+
+/*!
+    \fn virtual void Phonon::VideoWidgetInterface::setContrast(qreal) = 0
+    \internal
+*/
+
+/*!
+    \fn virtual qreal Phonon::VideoWidgetInterface::hue() const = 0
+    \internal
+*/
+
+/*!
+    \fn virtual void Phonon::VideoWidgetInterface::setHue(qreal) = 0
+    \internal
+*/
+
+/*!
+    \fn virtual qreal Phonon::VideoWidgetInterface::saturation() const = 0
+    \internal
+*/
+
+/*!
+    \fn virtual void Phonon::VideoWidgetInterface::setSaturation(qreal) = 0
+    \internal
+*/
+
+/*!
+    \fn virtual QWidget *Phonon::VideoWidgetInterface::widget() = 0
+    \internal
+*/
+
+/*!
+    \class Phonon::PlatformPlugin
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \fn virtual AbstractMediaStream *Phonon::PlatformPlugin::createMediaStream(const QUrl &url, QObject *parent) = 0
+
+    Creates a AbstractMediaStream object with the given \a parent that provides the data
+    for the given URL specified by \a url.
+    \omit
+    On KDE this uses KIO.
+    \endomit
+*/
+
+/*!
+    \fn virtual QIcon Phonon::PlatformPlugin::icon(const QString &name) const = 0
+
+    Returns the icon for the given icon name.
+*/
+
+/*!
+    \fn virtual void Phonon::PlatformPlugin::notification(const char *notificationName, const QString &text,
+        const QStringList &actions, QObject *receiver, const char *actionSlot) const = 0
+
+    Shows a notification pop-up with the given \a notificationName and \a text.
+    Each action in the associated list of \a actions is connected to the \a actionSlot
+    of the specified \a receiver object, which is expected to act on the actions as
+    they are triggered by the user.
+*/
+
+/*!
+    \fn virtual QString Phonon::PlatformPlugin::applicationName() const = 0
+
+    Returns the name of the application. For most Qt application this is
+    QCoreApplication::applicationName(), but for KDE this is overridden by KAboutData.
+*/
+
+
+/*!
+    \fn virtual QObject *Phonon::PlatformPlugin::createBackend() = 0
+
+    Creates a backend object. This way the platform can decide the backend preference.
+*/
+
+/*!
+    \fn virtual QObject *Phonon::PlatformPlugin::createBackend(const QString &library, const QString &version) = 0
+
+    Using the library loader of the platform, loads a given backend provided the
+    specified \a library and \a version.
+*/
+
+/*!
+    \fn virtual bool Phonon::PlatformPlugin::isMimeTypeAvailable(const QString &mimeType) const = 0
+
+    Tries to check whether the default backend supports the MIME type specified by \a mimeType
+    without loading the actual backend library.
+    \omit
+    On KDE this reads the MIME type list from the .desktop file of
+    the backend.
+    \endomit
+*/
+
+/*!
+    \fn virtual void Phonon::PlatformPlugin::saveVolume(const QString &outputName, qreal volume) = 0
+
+    Saves the volume for the given output.
+*/
+
+/*!
+    \fn virtual qreal Phonon::PlatformPlugin::loadVolume(const QString &outputName) const = 0
+
+    Loads the volume for the given output.
+*/
+
+/*!
+    \class Phonon::MediaNode
+    \inmodule Phonon
+    \inheaderfile Phonon/MediaNode
+    \since 4.4
+    \brief The MediaNode class is the base class for all nodes in a media graph.
+
+    In all phonon applications, one builds a media graph consisting of
+    MediaNodes. The graph will take multimedia content, e.g., from a
+    file, as input. After its nodes have processed the multimedia, the
+    graph will output the media again, e.g., to a sound card.
+
+    The multimedia content is streamed over \l{Phonon::}{Path}s
+    between the nodes in the graph. You can query the paths that are
+    connected to a media node with inputPaths() and outputPaths().
+
+    You can check whether the node is implemented by the current
+    backend by calling isValid(). This does not guarantee that an
+    instance of the class works as expected, but that the backend has
+    implemented functionality for the class.
+
+    Currently, Phonon has four media nodes: \l{Phonon::}{MediaObject},
+    \l{Phonon::}{AudioOutput}, \l{Phonon::}{VideoWidget}, and \l{Phonon::}{Effect}.
+    Please refer to their class descriptions for details about their usage, and to
+    find out which nodes can be connected to each other. See also \l{Building
+    Graphs} in Phonon's \l{Phonon Overview}{overview} document. 
+
+    Two nodes are connected to each other using the
+    Phonon::createPath() or \l{Phonon::}{Path::insertEffect()}
+    functions (only \l{Phonon::Effect}s use
+    \l{Phonon::Path::}{insertEffect()}). We show a code example below,
+    in which we build a media graph for video playback and then query
+    its media nodes for their \l{Phonon::}{Path}s:
+
+    \snippet doc/src/snippets/medianodesnippet.cpp 0 
+
+    When you create a Phonon application, you will likely build the
+    graph yourself. This makes isValid() the most useful function of
+    this class. The other two functions help navigate the graph, which
+    you do not need to do as you created the nodes yourself.
+
+    \sa {Phonon Overview}, Phonon::MediaObject,
+        Phonon::AudioOutput, Phonon::VideoWidget, {Phonon Module}
+*/
+
+/*!
+    \fn virtual Phonon::MediaNode::~MediaNode()
+
+    Destroys the media node and any paths connecting it to other
+    nodes. Any \l{Phonon::}{Effect}s connected to these paths will
+    also be deleted.
+*/
+
+/*!
+    \fn bool Phonon::MediaNode::isValid() const
+
+    Returns true if the backend provides an implementation of this
+    class; otherwise returns false.
+
+    This does not guarantee that instances of the class works as
+    expected, but that the backend has implemented the functionality
+    for this class. For instance, Qt's GStreamer backend will return
+    true for instances of the \l{Phonon::}{AudioOutput} class, even if
+    there is a problem with GStreamer and it could not play sound. 
+
+*/
+
+/*!
+    \fn QList<Path> Phonon::MediaNode::inputPaths() const
+
+    Returns the paths that inputs multimedia to this media node.
+    
+    \sa outputPaths()
+*/
+
+/*!
+    \fn QList<Path> Phonon::MediaNode::outputPaths() const
+
+    Returns the paths to which this media node outputs media.
+
+    \sa inputPaths()
+*/
+
+/*!
+    \fn Phonon::MediaNode::MediaNode(MediaNodePrivate &dd)
+    \internal
+*/
+
+/*!
+    \class Phonon::GlobalConfig
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \fn Phonon::GlobalConfig::GlobalConfig()
+    \internal
+*/
+
+/*!
+    \fn Phonon::GlobalConfig::~GlobalConfig()
+    \internal
+*/
+
+/*!
+    \fn QList<int> Phonon::GlobalConfig::audioOutputDeviceListFor(Phonon::Category category, HideAdvancedDevicesOverride override = FromSettings) const
+    \internal
+*/
+
+/*!
+    \fn int Phonon::GlobalConfig::audioOutputDeviceFor(Phonon::Category category) const
+    \internal
+*/
+
+/*!
+    \class Phonon::ObjectDescriptionData
+    \inmodule Phonon
+    \since 4.4
+    \internal
+    \brief Data class for objects describing devices or features of the backend.
+
+    \sa Phonon::BackendCapabilities
+*/
+
+/*!
+    \fn bool Phonon::ObjectDescriptionData::operator==(const ObjectDescriptionData &otherDescription) const
+
+    Returns \c true if this ObjectDescription describes the same
+    as \a otherDescription; otherwise returns \c false.
+*/
+
+/*!
+    \fn QString Phonon::ObjectDescriptionData::name() const
+
+    Returns the name of the capture source.
+
+    \return A string that should be presented to the user to
+    choose the capture source.
+*/
+
+/*!
+    \fn QString Phonon::ObjectDescriptionData::description() const
+
+    Returns a description of the capture source. This text should
+    make clear what sound source this is, which is sometimes hard
+    to describe or understand from just the name.
+
+    \return A string describing the capture source.
+*/
+
+/*!
+    \fn QVariant Phonon::ObjectDescriptionData::property(const char *name) const
+
+    Returns a named property.
+
+    If the property is not set an invalid value is returned.
+
+    \sa propertyNames()
+*/
+
+/*!
+    \fn QList<QByteArray> Phonon::ObjectDescriptionData::propertyNames() const
+
+    Returns all names that return valid data when property() is called.
+
+    \sa property()
+*/
+
+/*!
+    \fn bool Phonon::ObjectDescriptionData::isValid() const
+
+    Returns true if the Tuple is valid (index != -1); otherwise returns
+    false.
+*/
+
+/*!
+    \fn int Phonon::ObjectDescriptionData::index() const
+
+    A unique identifier for this device/. Used internally
+    to distinguish between the devices/.
+
+    \return An integer that uniquely identifies every device.
+*/
+
+/*!
+    \fn static ObjectDescriptionData *Phonon::ObjectDescriptionData::fromIndex(ObjectDescriptionType type, int index)
+    \internal
+*/
+
+/*!
+    \fn Phonon::ObjectDescriptionData::~ObjectDescriptionData()
+    \internal
+*/
+
+/*!
+    \fn Phonon::ObjectDescriptionData::ObjectDescriptionData(ObjectDescriptionPrivate * = 0)
+    \internal
+*/
+
+/*!
+    \class Phonon::AddonInterface
+    \inmodule Phonon
+    \since 4.4
+    \internal 
+    \brief Interface for Menu, Chapter, Angle and Title/Track control.
+*/
+
+/*!
+    \fn virtual Phonon::AddonInterface::~AddonInterface()
+    \internal
+*/
+
+/*!
+    \enum Phonon::AddonInterface::Interface
+
+    This enum describes the type of interface represented by an AddonInterface object.
+
+    \value NavigationInterface
+    \value ChapterInterface
+    \value AngleInterface
+    \value TitleInterface
+*/
+
+/*!
+    \enum Phonon::AddonInterface::NavigationCommand
+    \internal
+    \value Menu1Button
+*/
+
+/*!
+    \enum Phonon::AddonInterface::ChapterCommand
+    \internal
+    \value availableChapters
+    \value chapter
+    \value setChapter
+*/
+
+/*!
+    \enum Phonon::AddonInterface::AngleCommand
+    \internal
+    \value availableAngles
+    \value angle
+    \value setAngle
+*/
+
+/*!
+    \enum Phonon::AddonInterface::TitleCommand
+    \internal
+    \value availableTitles
+    \value title
+    \value setTitle
+    \value autoplayTitles
+    \value setAutoplayTitles
+*/
+
+/*!
+    \fn virtual bool Phonon::AddonInterface::hasInterface(Interface iface) const = 0
+    \internal
+*/
+
+/*!
+    \fn virtual QVariant Phonon::AddonInterface::interfaceCall(Interface iface, int command,
+            const QList<QVariant> &arguments) = 0
+    \internal
+*/
+
+/*!
+    \class Phonon::MediaNodePrivate
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \namespace Phonon::Factory
+    \inmodule Phonon
+    \internal
+*/
+
+/*!
+    \fn Sender *Phonon::Factory::sender()
+
+    Returns a pointer to the object emitting the signals.
+
+    \sa Sender::backendChanged()
+*/
+
+/*!
+    \fn QObject *Phonon::Factory::createMediaObject(QObject *parent = 0)
+
+    Create a new backend object for a MediaObject.
+
+    \return a pointer to the MediaObject the backend provides.
+*/
+
+/*!
+    \fn QObject *Phonon::Factory::createEffect(int effectId, QObject *parent = 0)
+
+    Create a new backend object for a Effect.
+
+    \return a pointer to the Effect the backend provides.
+*/
+
+/*!
+    \fn QObject *Phonon::Factory::createVolumeFaderEffect(QObject *parent = 0)
+
+    Create a new backend object for a VolumeFaderEffect.
+
+    \return a pointer to the VolumeFaderEffect the backend provides.
+*/
+
+/*!
+    \fn QObject *Phonon::Factory::createAudioOutput(QObject *parent = 0)
+
+    Create a new backend object for a AudioOutput.
+
+    \return a pointer to the AudioOutput the backend provides.
+*/
+
+/*!
+    \fn QObject *Phonon::Factory::createVideoWidget(QObject *parent = 0)
+
+    Create a new backend object for a VideoWidget.
+
+    \return a pointer to the VideoWidget the backend provides.
+*/
+
+/*!
+    \fn QObject *Phonon::Factory::backend(bool createWhenNull = true)
+
+    \return a pointer to the backend interface.
+*/
+
+/*!
+    \fn QString Phonon::Factory::identifier()
+
+    Unique identifier for the Backend. Can be used in configuration files
+    for example.
+*/
+
+
+/*!
+    \fn QString Phonon::Factory::backendName()
+
+    Get the name of the Backend.
+    \omit
+    It's the name from the .desktop file.
+    \endomit
+*/
+
+/*!
+    \fn QString Phonon::Factory::backendComment()
+
+    Get the comment of the Backend.
+    \omit
+    It's the comment from the .desktop file.
+    \endomit
+*/
+
+/*!
+    \fn QString Phonon::Factory::backendVersion()
+
+    Get the version of the Backend.
+    \omit
+    It's the version from the .desktop file.
+    \endomit
+
+    The version is especially interesting if there are several versions
+    available for binary incompatible versions of the backend's media
+    framework.
+*/
+
+/*!
+    \fn QString Phonon::Factory::backendIcon()
+
+    Get the icon (name) of the Backend.
+    \omit
+    It's the icon from the .desktop file.
+    \endomit
+*/
+
+/*!
+    \fn QString Phonon::Factory::backendWebsite()
+
+    Get the website of the Backend.
+    \omit
+    It's the website from the .desktop file.
+    \endomit
+*/
+
+/*!
+    \fn QObject *Phonon::Factory::registerQObject(QObject *object)
+
+    Registers the given backend \a object with the factory.
+*/
+
+/*!
+    \fn bool Phonon::Factory::isMimeTypeAvailable(const QString &mimeType)
+*/
+
+/*!
+    \fn void Phonon::Factory::registerFrontendObject(MediaNodePrivate *)
+    \internal
+*/
+
+/*!
+    \fn void Phonon::Factory::deregisterFrontendObject(MediaNodePrivate *)
+    \internal
+*/
+
+/*!
+    \fn void Phonon::Factory::setBackend(QObject *)
+*/
+
+/*!
+    \fn PlatformPlugin *Phonon::Factory::platformPlugin()
+*/
+
+/*!
+/*!
+    \class Phonon::AbstractMediaStreamPrivate
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \class Phonon::FrontendInterfacePrivate
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \class Phonon::EffectWidgetPrivate
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \class Phonon::IODeviceStream
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \fn explicit Phonon::IODeviceStream::IODeviceStream(QIODevice *ioDevice, QObject *parent = 0)
+    \internal
+
+    Creates a new IODeviceStream with the given \a ioDevice and \a
+    parent.
+
+*/
+
+/*!
+    \fn Phonon::IODeviceStream::~IODeviceStream()
+    \internal
+*/
+
+/*!
+    \fn void Phonon::IODeviceStream::reset()
+    \internal
+*/
+
+/*!
+    \fn void Phonon::IODeviceStream::needData()
+    \internal
+*/
+
+/*!
+    \fn void Phonon::IODeviceStream::seekStream(qint64)
+    \internal
+*/
+
+/*!
+    \namespace Phonon::Platform
+    \inmodule Phonon
+    \internal
+*/
+
+/*!
+    \typedef Phonon::EffectDescriptionModel
+    \inmodule Phonon
+    \brief provides a item view model containing available audio effects.
+
+*/
+
+/*!
+    \typedef Phonon::SubtitleDescription
+    \inmodule Phonon
+    \internal
+*/
+
+/*!
+    \typedef Phonon::SubtitleDescriptionModel
+    \inmodule Phonon
+    \internal
+*/
+
+/*!
+    \typedef Phonon::AudioChannelDescription
+    \inmodule Phonon
+    \internal
+*/
+
+/*!
+    \typedef Phonon::AudioChannelDescriptionModel
+    \inmodule Phonon
+    \internal
+*/
+
+/*!
+    \typedef Phonon::AudioCaptureDevice
+    \inmodule Phonon
+    \internal
+*/
+
+/*!
+    \typedef Phonon::AudioCaptureDeviceModel
+    \inmodule Phonon
+    \internal
+*/
+
+/*!
+    \typedef typedef void (*CleanUpFunction)()
+    \inmodule Phonon
+    \internal
+*/
+
+/*!
+    \typedef Phonon::QObjectPair
+    \inmodule Phonon
+    \since 4.4
+    \internal
+
+*/
+
+/*!
+    \typedef Phonon::AudioOutputDeviceModel
+    \inmodule Phonon
+    \brief provides an item view model containing available audio output devices.
+
+*/
+
+/*!
+    \fn uint Phonon::qHash(const Phonon::EffectParameter &param)
+    \internal
+
+*/
+
+/*!
+    \fn Phonon::CleanUpGlobalStatic::~CleanUpGlobalStatic()
+    \internal
+*/
+
+/*!
+    \class Phonon::ConstIface
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \class Phonon::CleanUpGlobalStatic
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \class Phonon::EffectParameterPrivate
+    \inmodule Phonon
+    \since 4.4
+    \internal
+
+*/
+
+/*!
+    \class Phonon::QSettingsGroup
+    \inmodule Phonon
+    \since 4.4
+    \internal
+
+*/
+
+/*!
+    \class Phonon::MediaNodeDestructionHandler
+    \inmodule Phonon
+    \since 4.4
+    \internal
+
+*/
+
+/*!
+    \fn Phonon::MediaNodeDestructionHandler::~MediaNodeDestructionHandler()
+    \internal
+    Called from Base::~Base if this object was registered
+    using BasePrivate::addDestructionHandler().
+*/
+
+/*!
+    \fn Phonon::MediaNodeDestructionHandler::phononObjectDestroyed(MediaNodePrivate *)
+    \internal
+*/
+
+/*!
+    \fn explicit Phonon::EffectWidget::EffectWidget(Effect *effect, QWidget *parent = 0)
+    \internal
+
+    Constructs a new EffectWidget for the specified \a effect and with
+    the specified \a parent.
+*/
+
+/*!
+    \fn Phonon::EffectWidget::~EffectWidget()
+    \internal
+*/
+
+/*!
+    \fn QDebug Phonon::operator<<(QDebug s, const ObjectDescription<T> &o)
+    \internal
+*/
+
+/*!
+    \class Phonon::ListModelHelper
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
+/*!
+    \class AudioOutputInterface42
+    \inmodule Phonon
+    \since 4.4
+    \internal
+*/
+
diff --git a/doc/src/phonon.qdoc b/doc/src/phonon.qdoc
new file mode 100644
index 0000000000..e86ccf68ef
--- /dev/null
+++ b/doc/src/phonon.qdoc
@@ -0,0 +1,642 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page phonon-overview.html
+    \title Phonon Overview
+    \ingroup multimedia
+
+    \tableofcontents
+
+    \section1 Introduction
+
+    Qt uses the Phonon multimedia framework to provide functionality
+    for playback of the most common multimedia formats.The media can
+    be read from files or streamed over a network, using a QURL to a
+    file.
+
+    In this overview, we take a look at the main concepts of Phonon.
+    We also explain the architecture, examine the
+    core API classes, and show examples on how to use the classes
+    provided.
+
+    \section1 Architecture
+
+    Phonon has three basic concepts: media objects, sinks, and paths.
+    A media object manages a media source, for instance, a music file;
+    it provides simple playback control, such as starting, stopping,
+    and pausing the playback. A sink outputs the media from Phonon,
+    e.g., by rendering video on a widget, or by sending audio to a
+    sound card. Paths are used to connect Phonon objects, i.e., a
+    media object and a sink, in a graph - called a media graph in
+    Phonon.
+
+    As an example, we show a media graph for an audio stream:
+
+    \image conceptaudio.png 
+
+    The playback is started and managed by the media object, which
+    send the media stream to any sinks connected to it by a path. The
+    sink then plays the stream back, usually though a sound card.
+
+    \omit Not sure if this goes here, or anywhere...
+    All nodes in the graph are synchronized by the framework,
+    meaning that if more than one sink is connected to the same
+    media object, the framework will handle the synchronization
+    between the sinks; this happens for instance when a media
+    source containing video with sound is played back. More on
+    this later.
+    \endomit
+
+    \section2 Media Objects
+
+    The media object, an instance of the \l{Phonon::}{MediaObject}
+    class, lets you start, pause, and stop the playback of a media
+    stream, i.e., it provided basic control over the playback. You may
+    think of the object as a simple media player.
+
+    The media data is provided by a media source, which is
+    kept by the media object. The media source is a separate
+    object - an instance of \l{Phonon::}{MediaSource} - in Phonon, and
+    not part of the graph itself. The source will supply the media
+    object with raw data. The data can be read from files and streamed
+    over a network. The contents of the source will be interpreted by
+    the media object.
+
+    A media object is always instantiated with the default constructor
+    and then supplied with a media source. Concrete code examples are
+    given later in this overview.
+
+    As a complement to the media object, Phonon also provides
+    \l{Phonon::}{MediaController}, which provides control over
+    features that are optional for a given media. For instance, for
+    chapters, menus, and titles of a VOB (DVD) file will be features
+    managed by a \l{Phonon::}{MediaController}.
+
+    \section2 Sinks
+
+    A sink is a node that can output media from the graph, i.e., it
+    does not send its output to other nodes. A sink is usually a
+    rendering device.
+
+    The input of sinks in a Phonon media graph comes from a
+    \l{Phonon::}{MediaObject}, though it might have been processed
+    through other nodes on the way. 
+
+    While the \l{Phonon::}{MediaObject} controls the playback, the
+    sink has basic controls for manipulation of the media. With an
+    audio sink, for instance, you can control the volume and mute the
+    sound, i.e., it represents a virtual audio device. Another example
+    is the \l{Phonon::}{VideoWidget}, which can render video on a
+    QWidget and alter the brightness, hue, and scaling of the video.
+
+    As an example we give an image of a graph used for playing back a
+    video file with sound.
+
+    \image conceptvideo.png
+
+    \section2 Processors
+
+    Phonon does not allow manipulation of media streams directly,
+    i.e., one cannot alter a media stream's bytes programmatically
+    after they have been given to a media object. We have other nodes
+    to help with this: processors, which are placed in the graph on
+    the path somewhere between the media object and its sinks. In
+    Phonon, processors are of the \l{Phonon::}{Effect} class.
+
+    When inserted into the rendering process, the  processor will
+    alter the media stream, and will be active as long as it is part
+    of the graph. To stop, it needs to be removed.
+
+    \omit \image conceptprocessor.png \endomit
+
+    The \c {Effect}s may also have controls that affect how the media
+    stream is manipulated. A processor applying a depth effect to
+    audio, for instance, can have a value controlling the amount of
+    depth. An \c Effect can be configured at any point in time.
+
+    \section1 Playback
+
+    In some common cases, it is not necessary to build a graph
+    yourself.
+
+    Phonon has convenience functions for building common graphs. For
+    playing an audio file, you can use the
+    \l{Phonon::}{createPlayer()} function. This will set up the
+    necessary graph and return the media object node; the sound can
+    then be started by calling its \l{Phonon::MediaObject::}{play()}
+    function.
+
+    \snippet snippets/phonon.cpp 0
+
+    We have a similar solution for playing video files, the
+    \l{Phonon::}{VideoPlayer}.
+
+    \snippet snippets/phonon.cpp 1
+
+    The VideoPlayer is a widget onto which the video will be drawn. 
+
+    The \c .pro file for a project needs the following line to be added:
+
+    \snippet doc/src/snippets/code/doc_src_phonon.qdoc 0
+
+    Phonon comes with several widgets that provide functionality
+    commonly associated with multimedia players - notably SeekSlider
+    for controlling the position of the stream, VolumeSlider for
+    controlling sound volume, and EffectWidget for controlling the
+    parameters of an effect. You can learn about them in the API
+    documentation.
+
+    \section1 Building Graphs
+
+    If you need more freedom than the convenience functions described
+    in the previous section offers you, you can build the graphs
+    yourself. We will now take a look at how some common graphs are
+    built. Starting a graph up is a matter of calling the
+    \l{Phonon::MediaObject::}{play()} function of the media object.
+
+    If the media source contains several types of media, for instance, a
+    stream with both video and audio, the graph will contain two
+    output nodes: one for the video and one for the audio. 
+
+    We will now look at the code required to build the graphs discussed
+    previously in the \l{Architecture} section. 
+
+    \section2 Audio
+
+    When playing back audio, you create the media object and connect
+    it to an audio output node - a node that inherits from
+    AbstractAudioOutput. Currently, AudioOutput, which outputs audio
+    to the sound card, is provided.
+
+    The code to create the graph is straight forward:
+
+    \snippet snippets/phonon.cpp 2
+
+    Notice that the type of media an input source has is resolved by
+    Phonon, so you need not be concerned with this. If a source
+    contains multiple media formats, this is also handled
+    automatically.
+
+    The media object is always created using the default constructor
+    since it handles all multimedia formats.
+
+    The setting of a Category, Phonon::MusicCategory in this case,
+    does not affect the actual playback; the category can be used by
+    KDE to control the playback through, for instance, the control
+    panel. 
+
+    \omit Not sure about this 
+    Users of KDE can often also choose to send sound with the
+    CommunicationCategory, e.g., given to VoIP, to their headset,
+    while sound with MusicCategory is sent to the sound card.
+    \endomit
+
+    The AudioOutput class outputs the audio media to a sound card,
+    that is, one of the audio devices of the operating system. An
+    audio device can be a sound card or a intermediate technology,
+    such as \c DirectShow on windows. A default device will be chosen
+    if one is not set with \l{Phonon::AudioOutput::}{setOutputDevice()}.
+
+    The AudioOutput node will work with all audio formats supported by
+    the back end, so you don't need to know what format a specific
+    media source has. 
+
+    For a an extensive example of audio playback, see the \l{Music
+    Player Example}{Phonon Music Player}.
+
+    \section3 Audio Effects
+
+    Since a media stream cannot be manipulated directly, the backend
+    can produce nodes that can process the media streams. These nodes
+    are inserted into the graph between a media object and an output
+    node.
+
+    Nodes that process media streams inherit from the Effect class.
+    The effects available depends on the underlying system. Most of
+    these effects will be supported by Phonon. See the \l{Querying
+    Backends for Support} section for information on how to resolve
+    the available effects on a particular system.
+
+    We will now continue the example from above using the Path
+    variable \c path to add an effect. The code is again trivial:
+
+    \snippet snippets/phonon.cpp 3
+
+    Here we simply take the first available effect on the system.
+
+    The effect will start immediately after being inserted into the
+    graph if the media object is playing. To stop it, you have to
+    detach it again using \l{Phonon::Path::}{removeEffect()} of the Path.
+
+    \section2 Video
+
+    For playing video, VideoWidget is provided. This class functions
+    both as a node in the graph and as a widget upon which it draws
+    the video stream. The widget will automatically choose an available
+    device for playing the video, which is usually a technology
+    between the Qt application and the graphics card, such as \c
+    DirectShow on Windows.
+
+    The video widget does not play the audio (if any) in the media
+    stream. If you want to play the audio as well, you will need
+    an AudioOutput node. You create and connect it to the graph as
+    shown in the previous section.
+
+    The code for creating this graph is given below, after which
+    one can play the video with \l{Phonon::MediaObject::}{play()}.
+
+    \snippet snippets/phonon.cpp 4
+
+    The VideoWidget does not need to be set to a Category, it is
+    automatically classified to \l{Phonon::}{VideoCategory}, we only
+    need to assure that the audio is also classified in the same
+    category.
+
+    The media object will split files with different media content
+    into separate streams before sending them off to other nodes in
+    the graph. It is the media object that determines the type of
+    content appropriate for nodes that connect to it.
+
+    \omit This section is from the future
+
+    \section2 Multiple Audio Sources and Graph Outputs
+
+    In this section, we take a look at a graph that contains multiple
+    audio sources in addition to video. We have a video camera with
+    some embarrassing home footage from last weekend's party, a
+    microphone with which we intend to add commentary, and an audio
+    music file to set the correct mood. It would be an advantage to
+    write the graph output to a file for later viewing, but since this
+    is not yet supported by Qt backends, we will play it back
+    directly.
+
+    <image of party graph>
+
+    <code>
+
+    <code walkthrough> 
+
+    \endomit
+
+    \section1 Backends
+
+    The multimedia functionality is not implemented by Phonon itself,
+    but by a back end - often also referred to as an engine. This
+    includes connecting to, managing, and driving the underlying
+    hardware or intermediate technology. For the programmer, this
+    implies that the media nodes, e.g., media objects, processors, and
+    sinks, are produced by the back end. Also, it is responsible for
+    building the graph, i.e., connecting the nodes. 
+
+    The backends of Qt use the media systems DirectShow (which
+    requires DirectX) on Windows, QuickTime on Mac, and GStreamer on
+    Linux. The functionality provided on the different platforms are
+    dependent on these underlying systems and may vary somewhat, e.g.,
+    in the media formats supported.
+
+    Backends expose information about the underlying system. It can
+    tell which media formats are supported, e.g., \c AVI, \c mp3, or
+    \c OGG. 
+
+    A user can often add support for new formats and filters to the
+    underlying system, by, for instance, installing the DivX codex. We
+    can therefore not give an exact overview of which formats are
+    available with the Qt backends.  
+
+    \omit Not sure I want a separate section for this
+    \section2 Communication with the Backends
+
+    We cooperate with backends through static functions in the
+    Phonon namespace. We have already seen some of these functions
+    in code examples. Their two main responsibilities are creating
+    graph nodes and supplying information about the capabilities
+    of the various nodes. The nodes uses the backend internally
+    when created, so it is only connecting them in the graph that
+    you need to use the backend directly.
+
+    The main functions for graph building are:
+
+    \list
+        \o createPath(): This function creates a path between to
+                         nodes, which it takes as arguments.
+        \o 
+    \endlist
+
+    For more detailed information, please consult the API
+    documentation.
+
+    \endomit
+
+    \section2 Querying Backends for Support    
+
+    As mentioned, Phonon depends on the backend to provide its
+    functionality. Depending on the individual backend, full support
+    of the API may not be in place. Applications therefore need to
+    check with the backend if functionality they require is
+    implemented. In this section, we take look at how this is done.
+
+    The backend provides the
+    \l{Phonon::BackendCapabilities::}{availableMimeTypes()} and
+    \l{Phonon::BackendCapabilities::}{isMimeTypeAvailable()} functions
+    to query which MIME types the backend can produce nodes for. The
+    types are listed as strings, which for any type is equal for any
+    backend or platform. 
+
+    The backend will emit a signal -
+    \l{Phonon::BackendCapabilities::}{Notifier::capabilitiesChanged()}
+    - if its abilities have changed. If the available audio devices
+    have changed, the
+    \l{Phonon::BackendCapabilities::}{Notifier::availableAudioOutputDevicesChanged()}
+    signal is emitted instead.
+
+    To query the actual audio devices possible, we have the
+    \l{Phonon::BackendCapabilities::}{availableAudioOutputDevices()} as
+    mentioned in the \l{#Sinks}{Sinks} section. To query information
+    about the individual devices, you can examine its \c name(); this
+    string is dependent on the operating system, and the Qt backends
+    does not analyze the devices further.
+
+    The sink for playback of video does not have a selection of
+    devices. For convenience, the \l{Phonon::}{VideoWidget} is both a
+    node in the graph and a widget on which the video output is
+    rendered. To query the various video formats available, use
+    \l{Phonon::BackendCapabilities::}{isMimeTypeAvailable()}.  To add
+    it to a path, you can use the Phonon::createPath() as usual. After
+    creating a media object, it is also possible to call its
+    \l{Phonon::MediaObject::}{hasVideo()} function.
+
+    See also the \l{Capabilities Example}.
+
+    \section1 Installing Phonon
+
+    When running the Qt configure script, you will be notified whether
+    Phonon support is available on your system. As mentioned
+    previously, to use develop and run Phonon applications, you also
+    need to link to a backend, which provides the multimedia
+    functionality.
+
+    Note that Phonon applications will compile and run without a
+    working backend, but will, of course, not work as expected.
+
+    The following sections explains requirements for each backend.
+
+    \section2 Windows
+
+    On Windows, building Phonon requires DirectX and DirectShow
+    version 9 or higher. You'll need additional SDKs you can download
+    from Microsoft.
+
+    \section3 Windows XP and later Windows versions
+
+    If you develop for Windows XP and up, you should download the Windows SDK
+    \l{http://www.microsoft.com/downloads/details.aspx?FamilyID=e6e1c3df-a74f-4207-8586-711ebe331cdc&amp;DisplayLang=en}{here}.
+    Before building Qt, just call the script: \c {C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\setenv.cmd}
+
+    \note Visual C++ 2008 already contains the Windows SDK and doesn't
+    need that package and has already the environment set up for a
+    smooth compilation of phonon.
+
+    \section3 Earlier Windows versions than Windows XP
+
+    If you want to support previous Windows versions, you should download and install the Platform SDK. You find it
+    \l{http://www.microsoft.com/downloads/details.aspx?FamilyId=0BAF2B35-C656-4969-ACE8-E4C0C0716ADB&amp;displaylang=en}{here}.
+
+    \note The platform SDK provided with Visual C++ is not
+    complete and
+    you'll need this one to have DirectShow 9.0 support. You can download the DirectX SDK
+    \l{http://www.microsoft.com/downloads/details.aspx?familyid=09F7578C-24AA-4E0A-BF91-5FEC24C8C7BF&amp;displaylang=en}{here}.
+
+    \section3 Setting up the environment
+
+    Once the SDKs are installed, please make sure to set your
+    environment variables LIB and INCLUDE correctly. The paths to the
+    include and lib directory of the SDKs should appear first.
+    Typically, to setup your environment, you would execute the
+    following script:
+
+    \code
+        Set DXSDK_DIR=C:\Program Files\Microsoft DirectX SDK (February 2007)
+        %DXSDK_DIR%\utilities\bin\dx_setenv.cmd
+        C:\program files\Microsoft Platform SDK\setenv.cmd
+    \endcode
+
+    If your environment is setup correctly, executing configure.exe on
+    your Qt installation should automatically activate Phonon.
+
+    \warning The MinGW version of Qt does not support building the
+             Qt backend.
+
+    \section2 Linux
+
+    The Qt backend on Linux uses GStreamer (minimum version is 0.10),
+    which must be installed on the system. At a minimum, you need the
+    GStreamer library and base plugins, which provides support for \c
+    .ogg files. The package names may vary between Linux
+    distributions; on Mandriva, they have the following names:
+
+    \table
+        \header
+            \o Package
+            \o Description
+        \row
+            \o libgstreamer0.10_0.10
+            \o The GStreamer base library.
+        \row
+            \o libgstreamer0.10_0.10-devel
+            \o Contains files for developing applications with
+               GStreamer.
+        \row
+            \o libgstreamer-plugins-base0.10
+            \o Contains the basic plugins for audio and video
+               playback, and will enable support for \c ogg files.
+        \row
+            \o libgstreamer-plugins-base0.10-devel
+            \o Makes it possible to develop applications using the
+               base plugins.
+    \endtable
+
+    \omit Should go in troubleshooting (in for example README)
+    alsasink backend for GStreamer
+    \table
+        \header
+            \o Variable
+            \o Description
+        \row
+            \o PHONON_GST_AUDIOSINK
+            \o Sets the audio sink to be used. Possible values are
+               ... alsasink.
+        \row
+            \o PHONON_GSTREAMER_DRIVER
+            \o Sets the driver for GStreamer. This driver will
+               usually be configured automatically when
+               installing.
+        \row
+            \o PHONON_GST_VIDEOWIDGET
+            \o This variable can be set to the name of a widget to
+               use as the video widget??
+        \row
+            \o PHONON_GST_DEBUG
+            \o Phonon will give debug information while running if
+               this variable is set to a number between 1 and 3.
+        \row
+            \o PHONON_TESTURL
+            \o ...
+    \endtable
+    \endomit
+
+    \section2 Mac OS X
+
+    On Mac OS X, Qt uses QuickTime for its backend. The minimum
+    supported version is 7.0.
+
+    \section1 Deploying Phonon Applications on Windows and Mac OS X
+
+    On Windows and Mac OS X, the Qt backend makes use of the
+    \l{QtOpenGL Module}{QtOpenGL} module. You therefore need to deploy
+    the QtOpenGL shared library. If this is not what you want, it is
+    possible to configure Qt without OpenGL support. In that case, you
+    need to run \c configure with the \c -no-opengl option.
+
+    \section1 Work in Progress
+
+    Phonon and its Qt backends, though fully functional for
+    multimedia playback, are still under development. Functionality to
+    come is the possibility to capture media and more processors for
+    both music and video files.
+
+    Another important consideration is to implement support for
+    storing media to files; i.e., not playing back media directly.
+
+    We also hope in the future to be able to support direct
+    manipulation of media streams. This will give the programmer more
+    freedom to manipulate streams than just through processors.
+
+    Currently, the multimedia framework supports one input source. It will be
+    possible to include several sources. This is useful in, for example, audio
+    mixer applications where several audio sources can be sent, processed and
+    output as a single audio stream.
+*/
+
+/*!
+    \namespace Phonon
+    \brief The Phonon namespace contains classes and functions for multimedia applications.
+    \since 4.4
+
+    This namespace contains classes to access multimedia functions for
+    audio and video playback. Those classes are not dependent on any specific
+    framework, but rather use exchangeable backends to do the work.
+
+    See the \l{Phonon Module} page for general information about the
+    framework.
+*/
+
+/*!
+    \page phonon-module.html
+    \module Phonon
+    \title Phonon Module
+    \contentspage Qt's Modules
+    \previouspage QtXmlPatterns
+    \nextpage Qt3Support
+    \ingroup modules
+
+    \brief The Phonon module contains namespaces and classes for multimedia functionality.
+
+    \generatelist{classesbymodule Phonon}
+
+    Phonon is a cross-platform multimedia framework that enables the use of
+    audio and video content in Qt applications. The \l{Phonon Overview}
+    document provides an introduction to the architecture and features included
+    in Phonon. The \l{Phonon} namespace contains a list of all classes, functions
+    and namespaces provided by the module.
+
+    Applications that use Phonon's classes need to
+    be configured to be built against the Phonon module.
+    The following declaration in a \c qmake project file ensures that
+    an application is compiled and linked appropriately:
+
+    \snippet doc/src/snippets/code/doc_src_phonon.qdoc 1
+
+    The Phonon module is part of the \l{Qt Full Framework Edition} and the
+    \l{Open Source Versions of Qt}.
+
+    \section1 Qt Backends
+
+    Qt Backends are currently developed for Phonon version 4.1. The Phonon
+    project has moved on and introduced new features that the Qt Backends do not
+    implement. We have chosen not to document the part of Phonon that we do not
+    support. Any class or function not appearing in our documentation can be
+    considered unsupported.
+
+    \section1 License Information
+
+    Qt Commercial Edition licensees that wish to distribute applications that
+    use the Phonon module need to be aware of their obligations under the
+    GNU Lesser General Public License (LGPL). 
+
+    Developers using the Open Source Edition can choose to redistribute
+    the module under the appropriate version of the GNU LGPL; version 2.1
+    for applications and libraries licensed under the GNU GPL version 2,
+    or version 3 for applications and libraries licensed under the GNU
+    GPL version 2.
+
+    \legalese
+    This file is part of the KDE project
+
+    Copyright (C) 2005-2007 Matthias Kretz <kretz@kde.org> \BR
+    Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: Qt Software Information (qt-info@nokia.com)
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License version 2 as published by the Free Software Foundation.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+    \endlegalese
+*/
diff --git a/doc/src/platform-notes.qdoc b/doc/src/platform-notes.qdoc
new file mode 100644
index 0000000000..d5eee27c0b
--- /dev/null
+++ b/doc/src/platform-notes.qdoc
@@ -0,0 +1,740 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page platform-notes-platforms.html
+    \ingroup platform-notes
+    \title Platform Notes
+    \brief Information about the platforms on which Qt can be used.
+
+    This page contains information about the platforms Qt is currently known
+    to run on, with links to platform-specific notes, including any known bugs
+    or incompatibilities.
+
+    \list
+    \o \l{Platform Notes - X11}
+    \tableofcontents{1 Platform Notes - X11}
+    \o \l{Platform Notes - Windows}
+    \tableofcontents{1 Platform Notes - Windows}
+    \o \l{Platform Notes - Mac OS X}
+    \tableofcontents{1 Platform Notes - Mac OS X}
+    \o \l{Platform Notes - Embedded Linux}
+    \tableofcontents{1 Platform Notes - Embedded Linux}
+    \o \l{Platform Notes - Windows CE}
+    \tableofcontents{1 Platform Notes - Windows CE}
+    \endlist
+
+    See also the \l{Compiler Notes} for information about compiler-specific
+    build issues. Information about the combinations of platforms and compilers
+    supported by Qt can be found on the \l{Supported Platforms} page.
+
+    If you have anything to add to this list or any of the platform or
+    compiler-specific pages, please submit it via the \l{Bug Report Form}.
+*/
+
+/*!
+    \page platform-notes-x11.html
+    \title Platform Notes - X11
+    \contentspage Platform Notes
+
+    This page contains information about the X11 platforms Qt is currently
+    known to run on, with links to platform-specific notes. More information
+    about the combinations of platforms and compilers supported by Qt can be
+    found on the \l{Supported Platforms} page.
+
+    \tableofcontents
+
+    \target AIX
+    \section1 AIX - 5.2
+
+    Qt has been tested on AIX 5.2, using the
+    \l{Compiler Notes#IBM xlC (AIX)}{xlC} compiler.
+
+    \table
+    \header \o Compiler \o Notes
+    \row    \o xlC
+    \o If Qt is built correctly but all symbols are reported to be missing
+    when you link an application, your makeC++SharedLib script might be out
+    of date. Make sure you have the latest version from the
+    \l{http://www-306.ibm.com/software/awdtools/vacpp/support/}{IBM website}.
+    \row    \o GCC
+    \o We have tested earlier versions of Qt 4 successfully with GCC version
+    3.3 and above. Some versions of GCC may fail to link Qt with a "TOC overflow"
+    message.
+    Fix this by upgrading to the latest maintenance release of the dynamic
+    linker. On AIX this is bos.rte.bind_cmds.4.1.5.3 or later.
+    Some versions of GCC may fail to build Qt with STL and large-file support
+    enabled, due to
+    \l{http://gcc.gnu.org/bugzilla/show_bug.cgi?id=9551}{a bug in GCC}.
+    Fix this by upgrading to the latest maintenance release of the compiler.
+    It is also possible to work around this problem by running configure with
+    either \c{-no-stl} or \c{-no-largefile}.
+    \endtable
+
+    \target FreeBSD
+    \section1 FreeBSD - 6.0-RELEASE
+
+    \note FreeBSD is a community supported platform. See the
+    \l{Supported Platforms} page for more information.
+
+    The system compiler on FreeBSD 4.x is gcc 2.95.4, which is not
+    officially supported by Qt 4. We develop using and recommend
+    ports/lang/gcc34. You will need to run configure with the
+    \c{-platform freebsd-g++34} arguments. Optionally, you may use
+    ports/lang/icc.
+
+    The system compiler on FreeBSD 5.x and 6.x is GCC 3.4.4, which should be
+    sufficient to build Qt. You do not need to add any special arguments when
+    running configure. Optionally, you may use ports/lang/icc.
+
+    Note that we do not actively test FreeBSD 4.x and 5.x. Our developers
+    migrated to 6.x after the Qt 4 launch. FreeBSD-CURRENT is not supported.
+
+    \target HP-UX
+    \section1 HP-UX
+
+    Qt supports HP-UX on both PA-RISC and the Itanium (IA64) architectures.
+
+    \section2 PA-RISC - B.11.11 or later
+
+    You can configure Qt for aCC in 32 and 64 bit mode (hpux-acc-64 or
+    hpux-acc-32), or gcc in 32 bit mode (hpux-g++).  The default platform is
+    hpux-acc-32. The minimum required version for aCC (HP ANSI C++) on PA-RISC
+    is A.03.57. The supported gcc compiler is gcc 3.4.3.
+
+    \section2 Itanium - B.11.23 or later
+
+    You can configure Qt for aCC in 32 and 64 bit mode (hpuxi-acc-64 or
+    hpuxi-acc-32). gcc is currently unsupported.  The default platform is
+    hpuxi-acc-64. The minimum required version for aCC (HP ANSI C++) on
+    Itanium is A.06.12.
+
+    \section2 OpenGL Support
+
+    Qt's \l{QtOpenGL}{OpenGL} module requires GLX 1.3 or later to be installed.
+    This is available for HP-UX 11i - see the
+    \l{http://docs.hp.com/en/5992-2331/ch04s02.html}{Graphics and Technical Computing Software}
+    section of the release notes for more information.
+
+    \target IRIX
+    \section1 IRIX - 6.5.x
+
+    \bold{IRIX is an unsupported platform - please see Qt Software's online
+    \l{Platform Support Policy} for details.}
+
+    Unpackaging and IRIX tar:
+    Because of long filenames some files will be cut off incorrectly with IRIX
+    tar. Please use GNU tar to unpack Qt packages.
+
+    \section1 Linux
+
+    There are no known problems with using Qt on production versions of
+    Linux/x86, Linux/ppc, Linux/amd64 and Linux/ia64 (including Altix(R)).
+
+    For the gcc/g++ compiler, please also see the relevant
+    \l{Compiler Notes#GCC}{compiler page}.
+
+    \section2 Installation problems
+
+    See also the \l{Installation FAQ}.
+
+    If you experience problems when installing new open source versions of Qt
+    versions, try to use the open source Qt archives (e.g., RPM)
+    provided by your Linux distribution. If you need to install the source (.tgz)
+    archive, be aware that you will probably end up with two different
+    versions of the Qt library installed on your system, which will probably
+    lead to link errors, like this:
+    \snippet doc/src/snippets/code/doc_src_platform-notes.qdoc 0
+    Fix this by removing the old version of the library.
+
+    If you have problems installing open source versions of Qt
+    provided by your Linux distribution (e.g., RPM), please consult the
+    maintainers of the distribution, not us.
+
+    Some RPM versions have problems installing some of the Qt RPM archives
+    where installation stops with an error message warning about a
+    "Failed Dependency". Use the \c{--nodeps} option to \c rpm to workaround
+    this problem.
+
+    \target Solaris
+    \section1 Solaris - 9 or later
+
+    \section2 Unpackaging and Solaris tar
+
+    On some Solaris systems, both Solaris tar and GNU tar have been reported
+    to truncate long filenames. We recommend using star instead
+    (http://star.berlios.de).
+
+    \section2 CC on Solaris
+
+    Be sure to check our \l{Compiler Notes#Sun Studio}{Forte Developer / Sun Studio}
+    notes.
+
+    \section2 GCC on Solaris
+
+    Be sure to check the installation notes for \l{GCC on Solaris}.
+    Do not use GCC with Sun's assembler/linker, this will result in link-time
+    errors in shared libraries. Use GNU binutils instead. 
+
+    GCC 3.2.* is known to miscompile Qt due to an optimizer bug that will
+    cause the resulting binaries to hang. Please use GCC 3.4.2 or later.
+*/
+
+/*!
+    \page platform-notes-windows.html
+    \title Platform Notes - Windows
+    \contentspage Platform Notes
+
+    This page contains information about the Windows platforms Qt is currently
+    known to run on, with links to platform-specific notes. More information
+    about the combinations of platforms and compilers supported by Qt can be
+    found on the \l{Supported Platforms} page.
+
+    \tableofcontents
+
+    \section1 Windows Vista
+
+    Known issues for Qt on Vista will be listed here.
+
+    As of Qt 4.2.0 no Vista-specific issues are known.
+
+    \target Windows NT
+    \section1 Windows XP, Windows 2000 and Windows NT
+
+    \section2 Installation location
+
+    Installing Qt into a directory with spaces, e.g. C:\\Program Files, may
+    cause linker errors like the following:
+    \snippet doc/src/snippets/code/doc_src_platform-notes.qdoc 2
+
+    Install Qt into a subdirectory without spaces to avoid this problem.
+
+    \section2 AccelGALAXY graphic card
+
+    When you use a NT 4.0 machine with the driver number
+    4,00,1381,1000,021,4.0.0 there is a problem with drag an drop and icons.
+    The computer freezes, and you have to reset. The problem disappears with
+    the newest version of the driver, available at
+    \l{http://www.es.com/}{www.es.com}.
+
+    \section2 Possible GL conflict
+
+    There is a known issue with running Microsoft NetMeeting, Lotus SameTime
+    and other applications that require screen grabbing while direct
+    rendering is enabled. Other GL-applications may not work as expected,
+    unless direct rendering is disabled.
+*/
+
+/*!
+    \page platform-notes-mac.html
+    \title Platform Notes - Mac OS X
+    \contentspage Platform Notes
+
+    This page contains information about the Mac OS X versions Qt is currently
+    known to run on, with links to platform-specific notes. More information
+    about the combinations of platforms and compilers supported by Qt can be
+    found on the \l{Supported Platforms} page.
+
+    \tableofcontents
+
+    \section1 General Information
+
+    Qt 4.4 and Qt 4.5 development is only supported on Mac OS X 10.4 and up.
+    Applications built against these version of Qt can be deployed on Mac OS X
+    10.3, but cannot be developed on that version of the operating system due
+    to compiler issues.
+
+    Qt 4.3 has been tested to run on Mac OS X 10.3.9 and up. See notes on
+    the binary package for more information.
+
+    Qt 4.1 has been tested to run on Mac OS X 10.2.8 and up. Qt 4.1.4 is the
+    last release to work with Mac OS X 10.2.
+
+    \section2 Required GCC version
+
+    Apple's gcc 4 that is shipped with the Xcode Tools for both Mac OS X 10.4
+    and 10.5 will compile Qt. There is preliminary support for gcc 4.2 which
+    is included with Xcode Tools 3.1+ (configurable with
+    \c{-platform macx-g++42}).
+
+    \section2 Binary Package
+
+    The binary package requires that you have your .qt-license file in your
+    home directory. Installer.app cannot complete without a valid .qt-license
+    file. Evaluation users of Qt will have information about how to create
+    this file in the email they receive.
+
+    The binary package was built on Mac OS X 10.4 with Xcode Tools 2.1
+    (gcc 4.0.0) for Qt 4.1.0, Xcode Tools 2.2 (gcc 4.0.1) for Qt 4.1.1-4.1.4
+    and Xcode Tools 2.3 for 4.2.0. It will only link executables built
+    against 10.4 (or a 10.4 SDK). You should be able to run applications
+    linked against these frameworks on Mac OS X 10.3.9 and Mac OS X 10.4+.
+    If you require a different configuration, you will have to use the
+    source package and build with GCC 3.3.
+
+    \section2 Mac OS X on Intel hardware
+
+    Qt 4 fully supports both the Intel and PowerPC architectures on the Mac.
+    As of Qt 4.1 it is possible to support the Intel architecture by
+    creating Universal Binaries with qmake. As of Qt 4.1 it is possible to
+    build Qt as a set of universal binaries and frameworks from configure by
+    adding these extra flags:
+
+    \snippet doc/src/snippets/code/doc_src_platform-notes.qdoc 3
+
+    If you are building on Intel hardware you can omit the sdk parameter, but
+    PowerPC hardware requires it.
+
+    You can also generate universal binaries using qmake. Simply add these
+    lines to your .pro file:
+
+    \snippet doc/src/snippets/code/doc_src_platform-notes.qdoc 4
+
+    \section2 Build Issues
+
+    If Qt does not build upon executing make, and fails with an error message
+    such as
+
+    \snippet doc/src/snippets/code/doc_src_platform-notes.qdoc 5
+
+    this could be an indication you have upgraded your version of Mac OS X
+    (e.g. 10.3 to 10.4), without upgrading your Developer Tools (Xcode Tools).
+    These must match in order to successfully compile files.
+
+    Please be sure to upgrade both simultaneously. If problems still occur,
+    contact support.
+
+    \section2 Fink
+
+    If you have installed the Qt for X11 package from \l{Fink},
+    it will set the QMAKESPEC environment variable to darwin-g++. This will
+    cause problems when you build the Qt for Mac OS X package. To fix this, simply
+    unset your QMAKESPEC or set it to macx-g++ before you run configure.
+    You need to have a fresh Qt distribution (make confclean).
+
+    \section2 MySQL and Mac OS X
+
+    There seems to be a issue when both -prebind and -multi_module are
+    defined when linking static C libraries into dynamic library. If you
+    get the following error message when linking Qt:
+
+    \snippet doc/src/snippets/code/doc_src_platform-notes.qdoc 6
+
+    re-link Qt using -single_module. This is only a problem when building the
+    MySQL driver into Qt. It does not affect plugins or static builds.
+
+    \section2 Qt and Precompiled Headers (PCH)
+
+    Starting with Qt 3.3.0 it is possible to use precompiled headers. They
+    are not enabled by default as it appears that some versions of Apple's
+    GCC and make have problems with this feature. If you want to use
+    precompiled headers when building the Qt source package, specify the
+    -pch option to configure. If, while using precompiled headers, you
+    encounter an internal compile error, try removing the -include header
+    statement from the compile line and trying again. If this solves the
+    problem, it probably is a good idea to turn off precompiled headers.
+    Also, consider filing a bug report with Apple so that they can
+    improve support for this feature.
+*/
+
+/*!
+    \page supported-platforms.html
+    \title Supported Platforms
+    \brief The platforms supported by Nokia for Qt.
+    \ingroup platform-notes
+
+    Qt is supported on a variety of 32-bit and 64-bit platforms, and can
+    usually be built on each platform with GCC, a vendor-supplied compiler, or
+    a third party compiler. Although Qt may be built on a range of platform-compiler
+    combinations, only a subset of these are actively supported by Qt Software.
+
+    A more general overview of the platforms Qt runs on can be found on the
+    \l{Platform Notes} page. Information about the compilers used on each platform
+    can be found on the \l{Compiler Notes} page.
+
+    \tableofcontents
+
+    \section1 Most Common Actively Supported Platforms 
+
+    \table
+    \header \o Platform                \o Compilers
+    \row    \o Apple Mac OS X (32-bit) \o gcc 4.0.1
+    \row    \o Linux (32 and 64-bit)   \o gcc 4.1, 4.2, 4.3
+    \row    \o Microsoft Windows       \o gcc 3.4.2 (MinGW) (32-bit), MSVC 2003, 2005 (32 and 64-bit), 2008,
+                                          \l{Known Issues in %VERSION%}{Intel icc (see note)}
+    \endtable
+
+    Any platform-compiler combinations not listed here should be considered unsupported.
+
+    \section1 Actively Supported Platforms
+
+    \table
+    \header \o OS                \o Architecture        \o Makespec        \o Compiler version(s)
+    \row    \o AIX               \o PowerPC             \o aix-xlc         \o xlC 6
+    \row    \o AIX               \o PowerPC             \o aix-xlc-64      \o xlC 6
+    \row    \o HPUX              \o PA/RISC             \o hpux-acc*       \o A.03.57 (aCC 3.57)
+    \row    \o HPUX              \o PA/RISC             \o hpux-g++        \o GCC 3.4.4
+    \row    \o HPUX              \o PA/RISC             \o hpux-g++-64     \o GCC 3.4.4
+    \row    \o HPUX              \o Itanium             \o hpuxi-acc*      \o A.06.10 (aCC 6.10)
+    \row    \o Embedded Linux    \o ARM                 \o qws/linux-arm-g++ \o GCC 3.4, 4.1, 4.2, 4.3
+    \row    \o Embedded Linux    \o Intel 32-bit        \o qws/linux-x86-g++ \o GCC 3.4, 4.1, 4.2, 4.3
+    \row    \o Linux             \o Intel 32/64-bit     \o linux-g++       \o GCC 4.1, 4.2, 4.3
+    \row    \o Linux             \o Intel 32/64-bit     \o linux-icc       \o icc 10.1
+    \row    \o Linux             \o Intel 32-bit        \o linux-icc-32    \o icc 10.1
+    \row    \o Linux             \o Intel 64-bit        \o linux-icc-64    \o icc 10.1
+    \row    \o Mac OS X          \o Intel 32/64-bit, PowerPC \o macx-g++   \o GCC 4.0.1
+    \row    \o Mac OS X          \o Intel 32/64-bit, PowerPC \o macx-g++42 \o GCC 4.2
+    \row    \o Solaris           \o SPARC, Intel 32-bit \o solaris-cc*     \o Sun CC 5.5
+    \row    \o Solaris           \o SPARC, Intel 32-bit \o solaris-g++*    \o GCC 3.4.2
+    \row    \o Windows XP/Vista  \o Intel 32/64-bit     \o win32-g++       \o GCC 3.4.2 (MinGW 5.1.4)
+    \row    \o Windows XP/Vista  \o Intel 32/64-bit     \o win32-icc       \o icc 9.1
+    \row    \o Windows XP/Vista  \o Intel 32/64-bit     \o win32-msvc2003  \o Visual Studio 2003
+    \row    \o Windows XP/Vista  \o Intel 32/64-bit     \o win32-msvc2005  \o Visual Studio 2005
+    \row    \o Windows XP/Vista  \o Intel 32/64-bit     \o win32-msvc2008  \o Visual Studio 2008
+    \row    \o Windows CE        \o Intel 32-bit, ARMv4i, MIPS
+                                                        \o wince*-msvc2005 \o Visual Studio 2005
+    \row    \o Windows CE        \o Intel 32-bit, ARMv4i, MIPS
+                                                        \o wince*-msvc2008 \o Visual Studio 2008
+    \endtable
+
+    \section1 Community Supported Platforms
+
+    \table
+    \header \o OS                \o Architecture    \o Makespec            \o Compiler version(s)
+    \row    \o Mac OS X          \o Intel 32-bit, PowerPC \o darwin-g++    \o -
+    \row    \o FreeBSD           \o -               \o freebsd-g++         \o -
+    \row    \o FreeBSD           \o -               \o freebsd-g++34       \o -
+    \row    \o FreeBSD           \o -               \o freebsd-g++40       \o -
+    \row    \o FreeBSD           \o -               \o freebsd-icc         \o -
+    \row    \o HPUX              \o Itanium         \o hpuxi-g++*          \o GCC 4.1
+    \row    \o Linux             \o -               \o linux-cxx           \o -
+    \row    \o Linux             \o -               \o linux-ecc-64        \o -
+    \row    \o Linux             \o Itanium         \o linux-g++           \o GCC 3.4
+    \row    \o Linux             \o Intel 32/64-bit \o linux-g++           \o GCC 3.3, 3.4
+    \row    \o Linux             \o Intel 32/64-bit \o linux-g++           \o GCC 4.0
+    \row    \o Linux             \o -               \o linux-kcc           \o -
+    \row    \o Linux             \o -               \o linux-llvm          \o -
+    \row    \o Linux             \o -               \o linux-lsb-g++       \o -
+    \row    \o LynxOS            \o -               \o lynxos-g++          \o -
+    \row    \o Mac OS X          \o -               \o macx-llvm           \o -
+    \row    \o NetBSD            \o -               \o netbsd-g++          \o -
+    \row    \o OpenBSD           \o -               \o openbsd-g++         \o -
+    \row    \o Embedded Linux    \o MIPS, PowerPC   \o qws/linux-g++       \o GCC 3.4, 4.1, 4.2, 4.3
+    \endtable
+
+    \section1 Unsupported Platforms
+
+    The following platforms were supported in previous releases, either as actively supported
+    or community supported platforms, but are now unsupported.
+
+    \table
+    \header \o OS                \o Architecture    \o Makespec            \o Compiler version(s)
+    \row    \o IRIX              \o MIPS            \o irix-cc*            \o MIPS Pro
+    \row    \o IRIX              \o MIPS            \o irix-g++*           \o GCC 3.3
+    \row    \o Windows XP/Vista  \o Intel 32/64-bit \o win32-msvc      \o Visual C++ 6.0
+    \row    \o Windows XP/Vista  \o Intel 32/64-bit \o win32-msvc2002      \o Visual Studio 2002
+    \row    \o Windows XP/Vista  \o Intel 32/64-bit \o win32-msvc.net      \o Visual Studio 2002
+    \endtable
+
+    Qt Software's online \l{Platform Support Policy} for Qt describes the level of
+    support you should expect for these platforms.
+
+    \section1 Supported Features
+
+    Not all compilers used to build Qt are able to compile all modules. The following table
+    shows the compiler support for five modules that are not uniformly available for all
+    platforms and compilers.
+
+    \table
+    \header \o Compiler \o{5,1} Features
+    \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
+    \row    \o SunCC 5.5        \o            \o             \o          \o \bold{X} \o \bold{X}
+    \row
+    \row    \o aCC series 3     \o            \o             \o          \o \bold{X} \o \bold{X}
+    \row    \o aCC series 6     \o \bold{X}   \o \bold{X}    \o \bold{X} \o \bold{X} \o \bold{X}
+    \row    \o MIPSpro 7.4.2m   \o{5,1} \e{Unsupported - see the Unsupported Platforms table}
+    \row    \o xlC 6            \o            \o             \o          \o \bold{X} \o \bold{X}
+    \row    \o \l{Known Issues in %VERSION%}{Intel CC 10 (see note)}
+                                \o \bold{X}   \o \bold{X}    \o \bold{X} \o \bold{X} \o \bold{X}
+    \row
+    \row    \o MSVC 2003        \o \bold{X}   \o \bold{X}    \o          \o \bold{X} \o \bold{X}
+    \row    \o MSVC 2005 and up \o \bold{X}   \o \bold{X}    \o \bold{X} \o \bold{X} \o \bold{X}
+    \endtable
+*/
+
+/*!
+    \page platform-notes-windows-ce.html
+    \title Platform Notes - Windows CE
+    \contentspage Platform Notes
+
+    This page contains information about the Windows CE and Windows Mobile
+    platforms Qt is currently known to run on, with links to platform-specific
+    notes. More information about the combinations of platforms and compilers
+    supported by Qt can be found on the \l{Supported Platforms} page.
+*/
+
+/*!
+    \page platform-notes-embedded-linux.html
+    \title Platform Notes - Embedded Linux
+    \contentspage Platform Notes
+
+    This page contains information about the Embedded Linux platforms Qt is
+    currently known to run on, with links to platform-specific notes. More
+    information about the combinations of platforms and compilers supported
+    by Qt can be found on the \l{Supported Platforms} page.
+*/
+
+/*!
+    \page compiler-notes.html
+    \ingroup platform-notes
+    \title Compiler Notes
+    \brief Information about the C++ compilers and tools used to build Qt.
+
+    This page contains information about the C++ compilers and tools used
+    to build Qt on various platforms.
+
+    \tableofcontents
+
+    Please refer to the \l{Platform Notes} for information on the platforms
+    Qt is currently known to run on, and see the \l{Supported Platforms}
+    page for information about the status of each platform.
+
+    If you have anything to add to this list or any of the platform or
+    compiler-specific pages, please submit it via the
+    \l{Bug Report Form}.
+
+    \target GCC
+    \section1 GCC
+
+    \section2 GCC on Windows (MinGW)
+
+    We have tested Qt with this compiler on Windows XP.
+    The minimal version of MinGW supported is:
+
+    \list
+    \o GCC 3.4.2
+    \o MinGW runtime 3.7
+    \o win32api 3.2
+    \o binutils 2.15.91
+    \o mingw32-make 3.80.0-3
+    \endlist
+
+    \section2 GCC 4.0.0
+
+    The released package of the compiler has some bugs that lead to miscompilations.
+    We recommend using GCC 4.0.1 or later, or to use a recent CVS snapshot of the
+    GCC 4.0 branch. The version of GCC 4.0.0 that is shipped with Mac OS X 10.4
+    "Tiger" is known to work with Qt for Mac OS X.
+
+    \section2 HP-UX
+
+    The hpux-g++ platform is tested with GCC 3.4.4.
+
+    \section2 Solaris
+
+    Please use GCC 3.4.2 or later.
+
+    \section2 Mac OS X
+
+    Please use the latest GCC 3.3 from Apple or a later version of GCC 3.
+    The gcc 3.3 that is provided with Xcode 1.5 is known to generate bad code.
+    Use the November 2004 GCC 3.3 updater \l{http://connect.apple.com}{available from Apple}.
+
+    \section2 GCC 3.4.6 (Debian 3.4.6-5) on AMD64 (x86_64)
+
+    This compiler is known to miscompile some parts of Qt when doing a
+    release build. There are several workarounds:
+
+    \list 1
+    \o Use a debug build instead.
+    \o For each miscompilation encountered, recompile the file, removing the -O2 option.
+    \o Add -fno-gcse to the QMAKE_CXXFLAGS_RELEASE.
+    \endlist
+
+    \section1 HP ANSI C++ (aCC)
+
+    The hpux-acc-32 and hpux-acc-64 platforms are tested with aCC A.03.57. The
+    hpuxi-acc-32 and hpuxi-acc-64 platforms are tested with aCC A.06.10.
+
+    \section1 Intel C++ Compiler
+
+    \warning Please see the \l{Known Issues in %VERSION%} page for information
+    about an issue with this compiler.
+
+    \section2 Intel C++ Compiler for Linux
+
+    Qt Software currently tests the following compilers:
+
+    \list
+
+    \o Intel(R) C++ Compiler for applications running on IA-32,
+    Version 10.1 Build 20080602 Package ID: l_cc_p_10.1.017
+
+    \o Intel(R) C++ Compiler for applications running on Intel(R) 64,
+    Version 10.1 Build 20080602 Package ID: l_cc_p_10.1.017
+
+    \endlist
+
+    We do not currently test the IA-64 (Itanium) compiler.
+
+    \section2 Known Issues with Intel C++ Compiler for Linux
+
+    \list
+
+    \o Precompiled header support does not work in version 10.0.025
+       and older. For these compilers, you should configure Qt with
+       -no-pch. Precompiled header support works properly in version
+       10.0.026 and later.
+    \o Version 10.0.026 for Intel 64 is known to miscompile qmake when
+       building in release mode. For now, configure Qt with
+       -debug. Version 10.1.008 and later can compile qmake in release
+       mode.
+    \o Versions 10.1.008 to 10.1.015 for both IA-32 and Intel 64 are
+       known crash with "(0): internal error: 0_47021" when compiling
+       QtXmlPatterns, QtWebKit, and Designer in release mode. Version
+       10.1.017 compiles these modules correctly in release mode.
+    \endlist
+
+    \section2 Intel C++ Compiler (Windows, Altix)
+
+    Qt 4 has been tested successfully with:
+
+    \list
+    \o Windows - Intel(R) C++ Compiler for 32-bit applications,
+       Version 8.1 Build 20050309Z Package ID: W_CC_PC_8.1.026
+    \o Altix - Intel(R) C++ Itanium(R) Compiler for Itanium(R)-based
+       applications Version 8.1 Build 20050406 Package ID: l_cc_pc_8.1.030
+    \endlist
+
+    We currently only test the Intel compiler on 32-bit Windows versions.
+
+    \section1 MIPSpro (IRIX)
+
+    \bold{IRIX is an unsupported platform. See the \l{Supported Platforms} page
+    and Qt's Software's online \l{Platform Support Policy} page for details.}
+
+    Qt 4.4.x requires MIPSpro version 7.4.2m.
+
+    Note that MIPSpro version 7.4.4m is currently not supported, since it has
+    introduced a number of problems that have not yet been resolved.
+    We recommend using 7.4.2m for Qt development. However, please note the
+    unsupported status of this platform.
+
+    \target Sun Studio
+    \section1 Forte Developer / Sun Studio (Solaris)
+
+    \section2 Sun Studio
+
+    Qt is tested using Sun Studio 8 (Sun CC 5.5). Go to
+    \l{Sun Studio Patches} page on Sun's Web site to download
+    the latest patches for your Sun compiler.
+
+    \section2 Sun WorkShop 5.0
+
+    Sun WorkShop 5.0 is not supported with Qt 4.
+
+    \section1 Visual Studio (Windows)
+
+    We do most of our Windows development on Windows XP, using Microsoft
+    Visual Studio .NET 2005 and Visual Studio 2008 (both the 32- and 64-bit
+    versions).
+
+    Qt works with the Standard Edition, the Professional Edition and Team
+    System Edition of Visual Studio 2005.
+
+    We also test Qt 4 on Windows XP with Visual Studio .NET and Visual Studio 2003.
+
+    In order to use Qt with the Visual Studio 2005/2008 Express Edition you need
+    to download and install the platform SDK. Due to limitations in the
+    Express Edition it is not possible for us to install the Qt Visual
+    Studio Integration. You will need to use our command line tools to
+    build Qt applications with this edition.
+
+    The Visual C++ Linker doesn't understand filenames with spaces (as in
+    \c{C:\Program files\Qt\}) so you will have to move it to another place,
+    or explicitly set the path yourself; for example:
+
+    \snippet doc/src/snippets/code/doc_src_compiler-notes.qdoc 0
+
+    If you are experiencing strange problems with using special flags that
+    modify the alignment of structure and union members (such as \c{/Zp2})
+    then you will need to recompile Qt with the flags set for the
+    application as well.
+
+    If you're using Visual Studio .NET (2002) Standard Edition, you should be
+    using the Qt binary package provided, and not the source package.
+    As the Standard Edition does not optimize compiled code, your compiled
+    version of Qt would perform suboptimally with respect to speed.
+
+    With Visual Studio 2005 Service Pack 1 a bug was introduced which
+    causes Qt not to compile, this has been fixed with a hotfix available
+    from Microsoft. See this
+    \l{http://www.qtsoftware.com/developer/faqs/faq.2006-12-18.3281869860}{Knowledge Base entry}
+    for more information.
+
+    \section1 IBM xlC (AIX)
+
+    The makeC++SharedLib utility must be in your PATH and be up to date to
+    build shared libraries. From IBM's
+    \l{http://www.redbooks.ibm.com/abstracts/sg245674.html}{C and C++ Application Development on AIX}
+    Redbook:
+
+    \list
+    \o "The second step is to use the makeC++SharedLib command to create the
+       shared object. The command has many optional arguments, but in its
+       simplest form, can be used as follows:"
+       \snippet doc/src/snippets/code/doc_src_compiler-notes.qdoc 1
+    \o "The full path name to the command is not required; however, to avoid
+       this, you will have to add the directory in which it is located to
+       your PATH environment variable. The command is located in the
+       /usr/vacpp/bin directory with the VisualAge C++ Professional for AIX,
+       Version 5 compiler."
+    \endlist
+
+    \section2 VisualAge C++ for AIX, Version 6.0
+
+    Make sure you have the
+    \l{http://www-1.ibm.com/support/search.wss?rs=32&amp;tc=SSEP5D&amp;dc=D400}{latest upgrades}
+    installed.
+*/
diff --git a/doc/src/plugins-howto.qdoc b/doc/src/plugins-howto.qdoc
new file mode 100644
index 0000000000..2c2b03192f
--- /dev/null
+++ b/doc/src/plugins-howto.qdoc
@@ -0,0 +1,471 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page plugins-howto.html
+    \title How to Create Qt Plugins
+    \brief A guide to creating plugins to extend Qt applications and functionality provided by Qt.
+    \ingroup howto
+
+    \keyword QT_DEBUG_PLUGINS
+    \keyword QT_NO_PLUGIN_CHECK
+
+    Qt provides two APIs for creating plugins:
+
+    \list
+    \o A higher-level API for writing extensions to Qt itself: custom database
+       drivers, image formats, text codecs, custom styles, etc.
+    \o A lower-level API for extending Qt applications.
+    \endlist
+
+    For example, if you want to write a custom QStyle subclass and
+    have Qt applications load it dynamically, you would use the
+    higher-level API.
+
+    Since the higher-level API is built on top of the lower-level API,
+    some issues are common to both.
+
+    If you want to provide plugins for use with \QD, see the QtDesigner
+    module documentation.
+
+    Topics:
+
+    \tableofcontents
+
+    \section1 The Higher-Level API: Writing Qt Extensions
+
+    Writing a plugin that extends Qt itself is achieved by
+    subclassing the appropriate plugin base class, implementing a few
+    functions, and adding a macro.
+
+    There are several plugin base classes. Derived plugins are stored
+    by default in sub-directories of the standard plugin directory. Qt
+    will not find plugins if they are not stored in the right
+    directory.
+
+    \table
+    \header \o Base Class              \o Directory Name                \o Key Case Sensitivity
+    \row    \o QAccessibleBridgePlugin \o \c accessiblebridge \o Case Sensitive
+    \row    \o QAccessiblePlugin       \o \c accessible       \o Case Sensitive
+    \row    \o QDecorationPlugin       \o \c decorations      \o Case Insensitive
+    \row    \o QFontEnginePlugin       \o \c fontengines      \o Case Insensitive
+    \row    \o QIconEnginePlugin       \o \c iconengines      \o Case Insensitive
+    \row    \o QImageIOPlugin          \o \c imageformats     \o Case Sensitive
+    \row    \o QInputContextPlugin     \o \c inputmethods     \o Case Sensitive
+    \row    \o QKbdDriverPlugin        \o \c kbddrivers       \o Case Insensitive
+    \row    \o QMouseDriverPlugin      \o \c mousedrivers     \o Case Insensitive
+    \row    \o QPictureFormatPlugin    \o \c pictureformats   \o Case Sensitive
+    \row    \o QScreenDriverPlugin     \o \c gfxdrivers       \o Case Insensitive
+    \row    \o QScriptExtensionPlugin  \o \c script           \o Case Sensitive
+    \row    \o QSqlDriverPlugin        \o \c sqldrivers       \o Case Sensitive
+    \row    \o QStylePlugin            \o \c styles           \o Case Insensitive
+    \row    \o QTextCodecPlugin        \o \c codecs           \o Case Sensitive
+    \endtable
+
+    But where is the \c{plugins} directory? When the application
+    is run, Qt will first treat the application's executable directory
+    as the \c{pluginsbase}. For example if the application is in
+    \c{C:\Program Files\MyApp} and has a style plugin, Qt will look in
+    \c{C:\Program Files\MyApp\styles}. (See
+    QCoreApplication::applicationDirPath() for how to find out where
+    the application's executable is.) Qt will also look in the
+    directory specified by
+    QLibraryInfo::location(QLibraryInfo::PluginsPath), which typically
+    is located in \c QTDIR/plugins (where \c QTDIR is the directory
+    where Qt is installed). If you want Qt to look in additional
+    places you can add as many paths as you need with calls to
+    QCoreApplication::addLibraryPath(). And if you want to set your
+    own path or paths you can use QCoreApplication::setLibraryPaths().
+    You can also use a \c qt.conf file to override the hard-coded
+    paths that are compiled into the Qt library. For more information,
+    see the \l {Using qt.conf} documentation. Yet another possibility
+    is to set the \c QT_PLUGIN_PATH environment variable before running
+    the application. If set, Qt will look for plugins in the
+    paths (separated by the system path separator) specified in the variable.
+
+    Suppose that you have a new style class called \c MyStyle that you
+    want to make available as a plugin. The required code is
+    straightforward, here is the class definition (\c
+    mystyleplugin.h):
+
+    \snippet doc/src/snippets/code/doc_src_plugins-howto.qdoc 0
+
+    Ensure that the class implementation is located in a \c .cpp file
+    (including the class definition):
+
+    \snippet doc/src/snippets/code/doc_src_plugins-howto.qdoc 1
+
+    (Note that QStylePlugin is case insensitive, and the lower-case
+    version of the key is used in our
+    \l{QStylePlugin::create()}{create()} implementation; most other
+    plugins are case sensitive.)
+
+    For database drivers, image formats, text codecs, and most other
+    plugin types, no explicit object creation is required. Qt will
+    find and create them as required. Styles are an exception, since
+    you might want to set a style explicitly in code. To apply a
+    style, use code like this:
+
+    \snippet doc/src/snippets/code/doc_src_plugins-howto.qdoc 2
+
+    Some plugin classes require additional functions to be
+    implemented. See the class documentation for details of the
+    virtual functions that must be reimplemented for each type of
+    plugin.
+
+    Qt applications automatically know which plugins are available,
+    because plugins are stored in the standard plugin subdirectories.
+    Because of this applications don't require any code to find and load
+    plugins, since Qt handles them automatically.
+
+    The default directory for plugins is \c{QTDIR/plugins} (where \c
+    QTDIR is the directory where Qt is installed), with each type of
+    plugin in a subdirectory for that type, e.g. \c styles. If you
+    want your applications to use plugins and you don't want to use
+    the standard plugins path, have your installation process
+    determine the path you want to use for the plugins, and save the
+    path, e.g. using QSettings, for the application to read when it
+    runs. The application can then call
+    QCoreApplication::addLibraryPath() with this path and your
+    plugins will be available to the application. Note that the final
+    part of the path (e.g., \c styles) cannot be changed.
+
+    The normal way to include a plugin with an application is either
+    to \l{Static Plugins}{compile it in with the application} or to
+    compile it into a dynamic library and use it like any other
+    library.
+
+    If you want the plugin to be loadable then one approach is to
+    create a subdirectory under the application and place the plugin
+    in that directory. If you distribute any of the plugins that come
+    with Qt (the ones located in the \c plugins directory), you must
+    copy the sub-directory under \c plugins where the plugin is
+    located to your applications root folder (i.e., do not include the
+    \c plugins directory).
+
+    For more information about deployment,
+    see the \l {Deploying Qt Applications} documentation.
+
+    The \l{Style Plugin Example} shows how to implement a plugin
+    that extends the QStylePlugin base class.
+
+    \section1 The Lower-Level API: Extending Qt Applications
+
+    Not only Qt itself but also Qt application can be extended
+    through plugins. This requires the application to detect and load
+    plugins using QPluginLoader. In that context, plugins may provide
+    arbitrary functionality and are not limited to database drivers,
+    image formats, text codecs, styles, and the other types of plugin
+    that extend Qt's functionality.
+
+    Making an application extensible through plugins involves the
+    following steps:
+
+    \list 1
+    \o Define a set of interfaces (classes with only pure virtual
+       functions) used to talk to the plugins.
+    \o Use the Q_DECLARE_INTERFACE() macro to tell Qt's
+       \l{meta-object system} about the interface.
+    \o Use QPluginLoader in the application to load the plugins.
+    \o Use qobject_cast() to test whether a plugin implements a given
+       interface.
+    \endlist
+
+    Writing a plugin involves these steps:
+
+    \list 1
+    \o Declare a plugin class that inherits from QObject and from the
+       interfaces that the plugin wants to provide.
+    \o Use the Q_INTERFACES() macro to tell Qt's \l{meta-object
+       system} about the interfaces.
+    \o Export the plugin using the Q_EXPORT_PLUGIN2() macro.
+    \o Build the plugin using a suitable \c .pro file.
+    \endlist
+
+    For example, here's the definition of an interface class:
+
+    \snippet examples/tools/plugandpaint/interfaces.h 2
+
+    Here's the definition of a plugin class that implements that
+    interface:
+
+    \snippet examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h 0
+
+    The \l{tools/plugandpaint}{Plug & Paint} example documentation
+    explains this process in detail. See also \l{Creating Custom
+    Widgets for Qt Designer} for information about issues that are
+    specific to \QD. You can also take a look at the \l{Echo Plugin
+    Example} is a more trivial example on how to implement a plugin
+    that extends Qt applications. Please note that a QCoreApplication
+    must have been initialized before plugins can be loaded.
+
+    \section1 Loading and Verifying Plugins Dynamically
+
+    When loading plugins, the Qt library does some sanity checking to
+    determine whether or not the plugin can be loaded and used. This
+    provides the ability to have multiple versions and configurations of
+    the Qt library installed side by side.
+
+    \list
+    \o Plugins linked with a Qt library that has a higher version number
+       will not be loaded by a library with a lower version number.
+
+      \br
+      \bold{Example:} Qt 4.3.0 will \e{not} load a plugin built with Qt 4.3.1.
+
+    \o Plugins linked with a Qt library that has a lower major version
+       number will not be loaded by a library with a higher major version
+       number.
+
+      \br
+      \bold{Example:} Qt 4.3.1 will \e{not} load a plugin built with Qt 3.3.1.
+      \br
+      \bold{Example:} Qt 4.3.1 will load plugins built with Qt 4.3.0 and Qt 4.2.3.
+
+    \o The Qt library and all plugins are built using a \e {build
+       key}. The build key in the Qt library is examined against the build
+       key in the plugin, and if they match, the plugin is loaded. If the
+       build keys do not match, then the Qt library refuses to load the
+       plugin.
+
+      \br \bold{Rationale:} See the \l{#The Build Key}{The Build Key} section below.
+    \endlist
+
+    When building plugins to extend an application, it is important to ensure
+    that the plugin is configured in the same way as the application. This means
+    that if the application was built in release mode, plugins should be built
+    in release mode, too.
+
+    If you configure Qt to be built in both debug and release modes,
+    but only build applications in release mode, you need to ensure that your
+    plugins are also built in release mode. By default, if a debug build of Qt is
+    available, plugins will \e only be built in debug mode. To force the
+    plugins to be built in release mode, add the following line to the plugin's
+    project file:
+
+    \snippet doc/src/snippets/code/doc_src_plugins-howto.qdoc 3
+
+    This will ensure that the plugin is compatible with the version of the library
+    used in the application.
+
+    \section2 The Build Key
+
+    When loading plugins, Qt checks the build key of each plugin against its
+    own configuration to ensure that only compatible plugins are loaded; any
+    plugins that are configured differently are not loaded.
+
+    The build key contains the following information:
+    \list
+    \o Architecture, operating system and compiler.
+
+       \e {Rationale:}
+       In cases where different versions of the same compiler do not
+       produce binary compatible code, the version of the compiler is
+       also present in the build key.
+
+    \o Configuration of the Qt library. The configuration is a list
+       of the missing features that affect the available API in the
+       library.
+
+       \e {Rationale:}
+       Two different configurations of the same version of
+       the Qt library are not binary compatible. The Qt library that
+       loads the plugin uses the list of (missing) features to
+       determine if the plugin is binary compatible.
+
+       \e {Note:} There are cases where a plugin can use features that are
+       available in two different configurations. However, the
+       developer writing plugins would need to know which features are
+       in use, both in their plugin and internally by the utility
+       classes in Qt. The Qt library would require complex feature
+       and dependency queries and verification when loading plugins.
+       Requiring this would place an unnecessary burden on the developer, and
+       increase the overhead of loading a plugin. To reduce both
+       development time and application runtime costs, a simple string
+       comparision of the build keys is used.
+
+    \o Optionally, an extra string may be specified on the configure
+       script command line.
+
+       \e {Rationale:}
+       When distributing binaries of the Qt library with an
+       application, this provides a way for developers to write
+       plugins that can only be loaded by the library with which the
+       plugins were linked.
+    \endlist
+
+    For debugging purposes, it is possible to override the run-time build key
+    checks by configuring Qt with the \c QT_NO_PLUGIN_CHECK preprocessor macro
+    defined.
+
+    \section1 Static Plugins
+
+    Plugins can be linked statically against your application. If you
+    build the static version of Qt, this is the only option for
+    including Qt's predefined plugins.
+
+    When compiled as a static library, Qt provides the following
+    static plugins:
+
+    \table
+    \header \o Plugin name                  \o Type               \o Description
+    \row    \o \c qtaccessiblecompatwidgets \o Accessibility      \o Accessibility for Qt 3 support widgets
+    \row    \o \c qtaccessiblewidgets       \o Accessibility      \o Accessibility for Qt widgets
+    \row    \o \c qdecorationdefault        \o Decorations (Qt Extended) \o Default style
+    \row    \o \c qdecorationwindows        \o Decorations (Qt Extended) \o Windows style
+    \row    \o \c qgif                      \o Image formats      \o GIF
+    \row    \o \c qjpeg                     \o Image formats      \o JPEG
+    \row    \o \c qmng                      \o Image formats      \o MNG
+    \row    \o \c qico                      \o Image formats      \o ICO
+    \row    \o \c qsvg                      \o Image formats      \o SVG
+    \row    \o \c qtiff                     \o Image formats      \o TIFF
+    \row    \o \c qimsw_multi               \o Input methods (Qt Extended) \o Input Method Switcher
+    \row    \o \c qwstslibmousehandler      \o Mouse drivers (Qt Extended) \o \c tslib mouse
+    \row    \o \c qgfxtransformed           \o Graphic drivers (Qt Extended) \o Transformed screen
+    \row    \o \c qgfxvnc                   \o Graphic drivers (Qt Extended) \o VNC
+    \row    \o \c qscreenvfb                \o Graphic drivers (Qt Extended) \o Virtual frame buffer
+    \row    \o \c qsqldb2                   \o SQL driver         \o IBM DB2    \row    \o \c qsqlibase       \o SQL driver         \o Borland InterBase
+    \row    \o \c qsqlite                   \o SQL driver         \o SQLite version 3
+    \row    \o \c qsqlite2                  \o SQL driver         \o SQLite version 2
+    \row    \o \c qsqlmysql                 \o SQL driver         \o MySQL
+    \row    \o \c qsqloci                   \o SQL driver         \o Oracle (OCI)
+    \row    \o \c qsqlodbc                  \o SQL driver         \o Open Database Connectivity (ODBC)
+    \row    \o \c qsqlpsql                  \o SQL driver         \o PostgreSQL
+    \row    \o \c qsqltds                   \o SQL driver         \o Sybase Adaptive Server (TDS)
+    \row    \o \c qcncodecs                 \o Text codecs        \o Simplified Chinese (People's Republic of China)
+    \row    \o \c qjpcodecs                 \o Text codecs        \o Japanese
+    \row    \o \c qkrcodecs                 \o Text codecs        \o Korean
+    \row    \o \c qtwcodecs                 \o Text codecs        \o Traditional Chinese (Taiwan)
+    \endtable
+
+    To link statically against those plugins, you need to use the
+    Q_IMPORT_PLUGIN() macro in your application and you need to add
+    the required plugins to your build using \c QTPLUGIN.
+    For example, in your \c main.cpp:
+
+    \snippet doc/src/snippets/code/doc_src_plugins-howto.qdoc 4
+
+    In the \c .pro file for your application, you need the following
+    entry:
+
+    \snippet doc/src/snippets/code/doc_src_plugins-howto.qdoc 5
+
+    It is also possible to create your own static plugins, by
+    following these steps:
+
+    \list 1
+    \o Add \c{CONFIG += static} to your plugin's \c .pro file.
+    \o Use the Q_IMPORT_PLUGIN() macro in your application.
+    \o Link your application with your plugin library using \c LIBS
+       in the \c .pro file.
+    \endlist
+
+    See the \l{tools/plugandpaint}{Plug & Paint} example and the
+    associated \l{tools/plugandpaintplugins/basictools}{Basic Tools}
+    plugin for details on how to do this.
+
+    \note If you are not using qmake to build your application you need
+    to make sure that the \c{QT_STATICPLUGIN} preprocessor macro is
+    defined.
+
+    \sa QPluginLoader, QLibrary, {Plug & Paint Example}
+
+    \section1 The Plugin Cache
+
+    In order to speed up loading and validation of plugins, some of
+    the information that is collected when plugins are loaded is cached
+    through QSettings. This includes information about whether or not
+    a plugin was successfully loaded, so that subsequent load operations
+    don't try to load an invalid plugin. However, if the "last modified"
+    timestamp of a plugin has changed, the plugin's cache entry is
+    invalidated and the plugin is reloaded regardless of the values in
+    the cache entry, and the cache entry itself is updated with the new
+    result.
+
+    This also means that the timestamp must be updated each time the
+    plugin or any dependent resources (such as a shared library) is
+    updated, since the dependent resources might influence the result
+    of loading a plugin.
+
+    Sometimes, when developing plugins, it is necessary to remove entries
+    from the plugin cache. Since Qt uses QSettings to manage the plugin
+    cache, the locations of plugins are platform-dependent; see
+    \l{QSettings#Platform-Specific Notes}{the QSettings documentation}
+    for more information about each platform.
+
+    For example, on Windows the entries are stored in the registry, and the
+    paths for each plugin will typically begin with either of these two strings:
+
+    \snippet doc/src/snippets/code/doc_src_plugins-howto.qdoc 6
+
+    \section1 Debugging Plugins
+
+    There are a number of issues that may prevent correctly-written plugins from
+    working with the applications that are designed to use them. Many of these
+    are related to differences in the way that plugins and applications have been
+    built, often arising from separate build systems and processes.
+
+    The following table contains descriptions of the common causes of problems
+    developers experience when creating plugins:
+
+    \table
+    \header \o Problem \o Cause \o Solution
+    \row \o Plugins sliently fail to load even when opened directly by the
+            application. \QD shows the plugin libraries in its
+            \gui{Help|About Plugins} dialog, but no plugins are listed under each
+            of them.
+         \o The application and its plugins are built in different modes.
+         \o Either share the same build information or build the plugins in both
+            debug and release modes by appending the \c debug_and_release to
+            the \l{qmake Variable Reference#CONFIG}{CONFIG} variable in each of
+            their project files.
+    \row \o A valid plugin that replaces an invalid (or broken) plugin fails to load.
+         \o The entry for the plugin in the plugin cache indicates that the original
+            plugin could not be loaded, causing Qt to ignore the replacement.
+         \o Either ensure that the plugin's timestamp is updated, or delete the
+            entry in the \l{#The Plugin Cache}{plugin cache}.
+    \endtable
+
+    You can also use the \c QT_DEBUG_PLUGINS environment variable to obtain
+    diagnostic information from Qt about each plugin it tries to load. Set this
+    variable to a non-zero value in the environment from which your application is
+    launched.
+*/
diff --git a/doc/src/porting-qsa.qdoc b/doc/src/porting-qsa.qdoc
new file mode 100644
index 0000000000..0560060eed
--- /dev/null
+++ b/doc/src/porting-qsa.qdoc
@@ -0,0 +1,475 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \title Moving from QSA to Qt Script
+    \page porting-qsa.html
+    \ingroup porting
+
+    The purpose of this document is to map the differences between Qt
+    Script for Applications (QSA) and Qt Script, the ECMAScript compatible
+    engine supplied with Qt 4.3. This document is not supposed to be a
+    complete function by function porting guide, but will cover the most
+    obvious aspects.
+
+    First of all it is important to realize that Qt Script is only an
+    interpreter, it does not provide an editor, completion or script project
+    management, like QSA does. Qt Script however does provides almost full
+    compliance with the ECMAScript standard and performs significantly
+    better than the script engine provided by QSA. 
+
+    \tableofcontents
+
+    \section1 The Scripting Language
+
+    The scripting language used in QSA, from here on referred to as QSA,
+    was derived from ECMAScript 3.0 and 4.0 and is a hybrid of these
+    standards. Most of the run-time logic, such as classes and scoping
+    rules, is based on the ECMAScript 4.0 proposal, while the library
+    implementation is based on the ECMAScript 3.0 standard.
+    Qt Script on the other hand is solely based on the ECMAScript 3.0
+    standard. Though the languages look identical at first glance,
+    there are a few differences that we'll cover in the sections below.
+
+
+    \section2 Classes vs. Objects and Properties
+
+    QSA implements classes and inheritance much in a familiar way to users
+    of other object oriented languages, like C++ and Java. However, the
+    ECMAScript 3.0 standard defines that everything is an object, and objects
+    can have named properties. For instance to create an point object with
+    the properties x and y one would write the following Qt Script code:
+
+    \snippet doc/src/snippets/code/doc_src_porting-qsa.qdoc 0
+
+    The object \c point in this case is constructed as a plain object and
+    we assign two properties, \c x and \c y, to it with the values 12 and
+    35. The \c point object is assigned to the "Global Object" as the
+    named property \c{point}. The global object can be considered the
+    global namespace of the script engine. Similarly, global functions are
+    named properties of the global object; for example:
+
+    \snippet doc/src/snippets/code/doc_src_porting-qsa.qdoc 1
+
+    An equivalent construction that illustrates that the function is a
+    property of the global object is the following assignment:
+
+    \snippet doc/src/snippets/code/doc_src_porting-qsa.qdoc 2
+
+    Since functions are objects, they can be assigned to objects as
+    properties, becoming member functions:
+
+    \snippet doc/src/snippets/code/doc_src_porting-qsa.qdoc 3
+
+    In the code above, we see the first subtle difference between
+    QSA and Qt Script. In QSA one would write the point class like this:
+
+    \snippet doc/src/snippets/code/doc_src_porting-qsa.qdoc 4
+
+    where in the \c manhattanLength() function we access \c x and \c y
+    directly because, when the function is called, the \c this object is
+    implicitly part of the current scope, as in C++. In Qt Script,
+    however, this is not the case, and we need to explicitly access
+    the \c x and \c y values via \c{this}.
+
+    All the code above runs with QSA except the assignment of a function
+    to \c{point.manhattanLength}, which we repeat here for clarity:
+    
+    \snippet doc/src/snippets/code/doc_src_porting-qsa.qdoc 5
+
+    This is because, in QSA, the value of \c this is decided based on
+    the location of the declaration of the function it is used in. In the
+    code above, the function is assigned to an object, but it is declared
+    in the global scope, hence there will be no valid \c this value.
+    In Qt Script, the value of \c this is decided at run-time,
+    hence you could have assigned the \c manhattanLength() function to any
+    object that had \c x and \c y values.
+
+
+    \section2 Constructors
+
+    In the code above, we use a rather awkward method for constructing
+    the objects, by first instantiating them, then manually
+    assigning properties to them. In QSA, the proper way to solve this
+    is to implement a constructor in the class:
+
+    \snippet doc/src/snippets/code/doc_src_porting-qsa.qdoc 6
+
+    The equivalent in Qt Script is to create a constructor function:
+
+    \snippet doc/src/snippets/code/doc_src_porting-qsa.qdoc 7
+
+    As we can see, the constructor is just a normal function. What is
+    special with is how we call it, namely prefixed with the \c new
+    keyword. This will create a new object and call the \c Car()
+    function with the newly created object as the \c this pointer.
+    So, in a sense, it is equivalent to:
+
+    \snippet doc/src/snippets/code/doc_src_porting-qsa.qdoc 8
+
+    This is similar to the manhattenLength() example above. Again, the
+    main difference between QSA and Qt Script is that one has to
+    explicitly use the keyword \c this to access the members and that
+    instead of declaring the variable, \c regNumber, we just extend the
+    \c this object with the property.
+
+
+    \section2 Member Functions and Prototypes
+
+    As we saw above, one way of creating member functions of a Qt Script
+    object is to assign the member function to the object as a property
+    and use the \c this object inside the functions. So, if we add a
+    \c toString function to the \c Car class
+
+    \snippet doc/src/snippets/code/doc_src_porting-qsa.qdoc 9
+
+    one could write this in Qt Script as:
+
+    \snippet doc/src/snippets/code/doc_src_porting-qsa.qdoc 10
+
+    In QSA, the member functions were part of the class declaration,
+    and were therefore shared between all instances of a given class.
+    In Qt Script, each instance has a instance member for each function.
+    This means that more memory is used when multiple instances are used.
+    Qt Script uses prototypes to remedy this. 
+
+    The basic prototype-based inheritance mechanism works as follows.
+    Each Qt Script object has an internal link to another object, its
+    prototype. When a property is looked up in an object, and the object
+    itself does not have the property, the interpreter searches for the
+    property in the prototype object instead; if the prototype has the
+    property then that property is returned. If the prototype object does
+    not have the property, the interpreter searches for the property in
+    the prototype of the prototype object, and so on.
+
+    This chain of objects constitutes a prototype chain. The chain of
+    prototype objects is followed until the property is found or the end
+    of the chain is reached.
+
+    To make the \c toString() function part of the prototype, we write
+    code like this:
+
+    \snippet doc/src/snippets/code/doc_src_porting-qsa.qdoc 11
+
+    Here, we made the \c toString() function part of the prototype so
+    that, when we call \c{car.toString()} it will be resolved via the
+    internal prototype object of the car object. Note, however, that the
+    \c this object is still the original object that the function was
+    called on, namely \c{car}.
+
+
+    \section2 Inheritance
+
+    Now that we've seen how to use prototypes to create a "class" members
+    in Qt Script, let's see how we can use prototypes to create
+    polymorphism. In QSA you would write
+
+    \snippet doc/src/snippets/code/doc_src_porting-qsa.qdoc 12
+
+    With Qt Script, we acheive the same effect by creating a prototype
+    chain. The default prototype of an object is a plain \c Object
+    without any special members, but it is possible to replace this
+    object with another prototype object.
+
+    \snippet doc/src/snippets/code/doc_src_porting-qsa.qdoc 13
+
+    In the code above, we have a constructor, \c{GasolineCar}, which
+    calls the "base class" implementation of the constructor to
+    initialize the \c this object with the property \c{regNumber},
+    based on the values passed in the constructor. The interesting line
+    in this case is the line after the constructor where we change the
+    default prototype for \c GasolineCar to be an instance of type
+    \c{Car}. This means that all members available in a \c Car object
+    are now available in all \c GasolineCar objects. In the last line,
+    we replace the \c toString() function in the prototype with our own,
+    thus overriding the \c toString() for all instances of
+    \c{GasolineCar}.
+
+
+    \section2 Static Members
+
+    QSA allowed users to declare static members in classes, and these
+    could be accessed both through instances of the class and through
+    the class itself. For example, the following variable is accessed
+    through the \c Car class:
+
+    \snippet doc/src/snippets/code/doc_src_porting-qsa.qdoc 14
+
+    The equivalent in Qt Script is to assign variables that should appear
+    as static members as properties of the constructor function. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_porting-qsa.qdoc 15
+
+    Note that in QSA, static member variables were also accessible in
+    instances of the given class. In Qt Script, with the approach
+    illustrated above, the variable is a member of the constructor
+    object only, and thus only accessible through \c{Car.globalCount}.
+
+
+    \section1 The Built-in Functions and Library
+
+    The built-in functions in QSA are based on those defined in the
+    ECMAScript 3.0 standard, the same standard used for Qt Script, but
+    QSA adds some extensions to this, specifically for the \c String
+    and \c RegExp types. QSA also lacked some functions from the
+    standard, most notably the \c Date type. Below we list all the
+    differences. All changes made to Qt Script are to increase
+    compliance with ECMAScript 3.0.
+
+    \table
+    \header \o QSA Function \o Notes about Equivalent Qt Script Functions
+    \row \o eval()
+    \o The eval function in QSA opened a new scope for code being
+    executed in the eval function, so locally declared variables were not
+    accessible outside. In Qt Script, the eval() function shares the
+    current scope, making locally declared variables accessible outside
+    the eval() call.
+
+    \row \o debug()
+    \o This function is not available in Qt Script. Use print() instead.
+
+    \row \o connect()
+    \o QSA had closures, meaning that a member function
+    reference implicitly contained its \c this object. Qt Script does not
+    support this. See the Qt Script documentation for details on using the
+    connect function.
+
+    \row \o String.arg()
+    \o This function is not available in Qt Script. Use replace() or concat() instead.
+
+    \row \o String.argDec()
+    \o This function is not available in Qt Script. Use replace() or concat() instead.
+
+    \row \o String.argInt()
+    \o This function is not available in Qt Script. Use replace() or concat() instead.
+
+    \row \o String.argStr()
+    \o This function is not available in Qt Script. Use replace() or concat() instead.
+
+    \row \o String.endsWith()
+    \o This function is not available in Qt Script. Use lastIndexOf() instead.
+
+    \row \o String.find()
+    \o This function is not available in Qt Script. Use indexOf() instead.
+
+    \row \o String.findRev()
+    \o This function is not available in Qt Script. Use lastIndexOf() and length instead.
+
+    \row \o String.isEmpty()
+    \o This function is not available in Qt Script. Use length == 0 instead.
+
+    \row \o String.left()
+    \o This function is not available in Qt Script. Use substring() instead.
+
+    \row \o String.lower()
+    \o This function is not available in Qt Script. Use toLowerCase() instead.
+
+    \row \o String.mid()
+    \o This function is not available in Qt Script. Use substring() instead.
+
+    \row \o String.right()
+    \o This function is not available in Qt Script. Use substring() instead.
+
+    \row \o String.searchRev()
+    \o This function is not available in Qt Script. Use search() / match() instead.
+
+    \row \o String.startsWith()
+    \o This function is not available in Qt Script. Use indexOf() == 0 instead.
+
+    \row \o String.upper()
+    \o This function is not available in Qt Script. Use toUpperCase() instead.
+
+    \row \o RegExp.valid
+    \o This property is not available in Qt Script because it is not
+       required; a \c SyntaxError exception is thrown for bad \c RegExp objects.
+
+    \row \o RegExp.empty
+    \o This property is not available in Qt Script. Use \c{toString().length == 0} instead.
+
+    \row \o RegExp.matchedLength
+    \o This property is not available in Qt Script. RegExp.exec() returns an
+       array whose size is the matched length.
+
+    \row \o RegExp.capturedTexts
+    \o This property is not available in Qt Script. RegExp.exec() returns an
+       array of captured texts.
+
+    \row \o RegExp.search()
+    \o This function is not available in Qt Script. Use RegExp.exec() instead.
+
+    \row \o RegExp.searchRev()
+    \o This function is not available in Qt Script. Use RegExp.exec() or
+       String.search()/match() instead.
+
+    \row \o RegExp.exactMatch()
+    \o This function is not available in Qt Script. Use RegExp.exec() instead.
+
+    \row \o RegExp.pos()
+    \o This function is not available in Qt Script. Use String.match() instead.
+
+    \row \o RegExp.cap()
+    \o This function is not available in Qt Script. RegExp.exec() returns an
+       array of captured texts.
+    \endtable
+
+    QSA also defined some internal Qt API which is not present in Qt
+    Script. The types provided by QSA which are not provided by Qt Script are:
+
+    \list
+    \o Rect
+    \o Point
+    \o Size
+    \o Color
+    \o Palette
+    \o ColorGroup
+    \o Font
+    \o Pixmap
+    \o ByteArray
+    \endlist
+
+
+    \section1 The C++ API of QSA vs Qt Script
+
+    QSA is more than just a scripting engine. It provides project
+    management, an editor with completion and a minimalistic IDE to edit
+    scriptable projects. Qt Script on the other hand is just a scripting
+    engine. This means that equivalents to the classes \c QSEditor,
+    \c QSScript, \c QSProject and \c QSWorkbench do not exist in Qt Script.
+    QSA also provides some extension APIs through the \c QSUtilFactory and
+    \c QSInputDialogFactory. There is also no equivalent to these classes
+    in the Qt Script API.
+
+
+    \section2 Making QObjects Accessible from Scripts
+
+    There are two different ways of making \l{QObject}s accessible from
+    scripts in QSA. The first method is via the
+    \c QSInterpreter::addTransientObject() and \c QSProject::addObject()
+    functions. In this case objects are added to the global namespace of
+    the interpreter using their object names as the names of the
+    variables.
+
+    \snippet doc/src/snippets/code/doc_src_porting-qsa.qdoc 16
+
+    The code above adds the button to the global namespace under the name
+    "button". One obvious limitation here is that there is potential for
+    either unnamed \l{QObject}s or objects whose names conflict. Qt Script
+    provides a more flexible way of adding QObjects to the scripting
+    environment.
+
+    \snippet doc/src/snippets/code/doc_src_porting-qsa.qdoc 17
+
+    In the code above we create a QPushButton and wrap it in a script
+    value using the function, QScriptEngine::newQObject(). This gives us
+    a script value that we put into the global object using the name
+    "button". The concept of objects and properties discussed above is
+    quite visible here in the public C++ API as well. We have no
+    dependency on the object's name and we can also resolve name conflicts
+    more gracefully. Here, we operate directly on QScriptValue objects.
+    This is the actual object that is being passed around inside
+    the script engine, so we actually have low-level access to the
+    internal script data structures, far beyond that which is possible
+    in QSA. Properties, signals and slots of the QObject are accessible
+    to the scripter in Qt Script, just like in QSA.
+
+    The other way to expose \l{QObject}s in QSA was to create a
+    \c QSObjectFactory that made it possible to instantiate QObjects from
+    scripts.
+
+    Below is listed some code from the filter example in the QSA
+    package.
+
+    \snippet doc/src/snippets/code/doc_src_porting-qsa.qdoc 18
+
+    The equivalent in Qt Script is written in much the same way as
+    constructors are written in scripts. We register a callback C++
+    function under the name "ImageSource" in the global namespace and
+    return the QObject from this function:
+
+    \snippet doc/src/snippets/code/doc_src_porting-qsa.qdoc 19
+
+    In the Qt Script case we use the same approach that we use to expose
+    a QObject, namely via QScriptEngine::newQObject(). This function also
+    has the benefit that it is possible to specify if the QObject should
+    expose properties and slots of its base class. It is also possible to
+    specify custom ownership rules.
+
+    The reader might question why we don't add the constructor function
+    directly into the namespace, but create a meta-object script value for
+    it in addition. The plain function would certainly be good enough,
+    but by creating a QMetaObject based constructor we get the enums on
+    QPushButton for free in the QPushButton function object. Exposing
+    enums in QSA is rather painful in comparison.
+
+    If we want to add more "static" data to the QPushButton type in Qt
+    Script, we're free to add properties, similar to how we did for
+    the script. It is also possible to add custom functions to a Qt Script
+    QPushButton instance by setting more properties on it, such as making
+    the \l{QPushButton::}{setText()} C++ function available. It is also
+    possible to acheive this by installing a custom prototype, and be
+    memory efficient, as discussed in the script example above.
+
+
+    \section2 Accessing Non-QObjects
+
+    In QSA, it was possible to expose non-QObjects to QSA by wrapping them
+    in a QObject and using either \c QSWrapperFactory or \c QSObjectFactory
+    to expose them. Deciding when to use each of these classes could be
+    confusing, as one was used for script based construction and the other
+    for wrapping function parameters and return values, but in essence they
+    did exactly the same thing.
+
+    In Qt Script, providing access to QObjects and non-QObjects is done in
+    the same way as shown above, by creating a constructor function, and
+    by adding properties or a custom prototype to the constructed object.
+
+
+    \section2 Data Mapping
+
+    QSA supported a hardcoded set of type mappings which covered most
+    of the QVariant types, QObjects and primitives. For more complex type
+    signatures, such as the template-based tool classes, it had rather
+    limited support. Qt Script is significantly better at type mapping
+    and will convert lists of template types into arrays of the
+    appropriate types, given that all the types are declared to the
+    meta-type system.
+*/
diff --git a/doc/src/porting4-canvas.qdoc b/doc/src/porting4-canvas.qdoc
new file mode 100644
index 0000000000..dcd1a1e9c4
--- /dev/null
+++ b/doc/src/porting4-canvas.qdoc
@@ -0,0 +1,703 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page graphicsview-porting.html
+    \title Porting to Graphics View
+    \contentspage {Porting Guides}{Contents}
+    \previouspage Porting .ui Files to Qt 4
+    \nextpage qt3to4 - The Qt 3 to 4 Porting Tool
+    \ingroup porting
+    \ingroup multimedia
+    \brief Hints and tips to assist with porting canvas applications to the
+    Graphics View framework.
+
+    \keyword QGraphicsView GraphicsView Porting Graphics Canvas
+    \since 4.2
+
+    Graphics View provides a surface for managing and interacting with a large
+    number of custom-made 2D graphical items, and a view widget for
+    visualizing the items, with support for zooming and rotation. Graphics
+    View was introduced in Qt 4.2, replacing its predecessor, QCanvas. For
+    more on Graphics View, see \l{The Graphics View Framework}.
+
+    This document walks through the steps needed, class by class and function
+    by function, to port a QCanvas application to Graphics View.
+
+    \tableofcontents
+
+    Qt 4.2 provides two complete examples of Q3Canvas applications ported to
+    Graphics View:
+
+    \list
+    \o \l{Ported Canvas Example}, the canvas example from Qt 3.
+    \o \l{Ported Asteroids Example}, the Asteroids game from the Qt 3 demo.
+    \endlist
+
+    \section1 Introduction
+
+        Conceptually, the Graphics View classes from Qt 4 and the Canvas
+        classes from Qt 3 provide similar functionality using a similar
+        design. Instead of "canvas", we use the term "scene". Otherwise, the
+        class names and functions are almost the same as in Qt 3. The easiest
+        classes to port will be QCanvas and QCanvasView. Experience shows that
+        most time is spent porting the item classes, depending on the
+        complexity of the QCanvasItem classes you have been using before.
+
+        This porting guide will assume you have already ported your
+        application to Qt 4, by making use of Q3Canvas. If you have not done
+        so already, as a first step, run the \l qt3to4 tool on your
+        project. This tool will automate the most tedious part of the porting
+        effort.
+
+        Some additional steps are usually required before your application
+        will compile and run. You can read more about the porting process in
+        \l{Porting to Qt 4}.
+
+    \section1 Porting from Q3Canvas
+
+        QGraphicsScene is the closest equivalent to Q3Canvas. There
+        are some noticable differences in this new API: Whereas the
+        Q3Canvas classes use integer precision, QGraphicsScene is
+        entirely based on double coordinates, with graphical
+        primitives such as QPointF instead of QPoint, QRectF instead
+        of QRect, and QPolygonF and QPainterPath. The canvas area is
+        defined by a scene rectangle, allowing negative coordinates,
+        as opposed to Q3Canvas, which only defines a size (QSize), and
+        whose top-left corner is always (0, 0).
+
+        In addition, there is no explicit support for canvas tiles
+        anymore; see \l{Porting scenes with tiles} for more
+        information.  The chunks-based indexing system has been
+        replaced with an implicitly maintained internal BSP tree.
+
+        \section2 Porting table
+
+        \table
+        \header \o Q3Canvas \o QGraphicsScene
+
+        \row \o Q3Canvas::Q3Canvas() \o There is no QPixmap based
+           constructor, and the concept of tiles is gone. You can use
+           QGraphicsScene::backgroundBrush to set a brush pattern for
+           the background, or reimplement
+           QGraphicsScene::drawBackground() in a QGraphicsScene
+           subclass (see \l{Porting scenes with tiles}). In addition,
+           the QGraphicsScene geometry is provided as a full
+           QRectF. Instead of Q3Canvas(int width, int height), you can
+           use QGraphicsScene(int top, int left, int width, int
+           height).
+
+        \row \o Q3Canvas::allItems() \o QGraphicsScene::items()
+        returns a list of all items on the scene.
+
+        \row \o Q3Canvas::backgroundColor() \o You can assign a color for the
+        background through the QGraphicsScene::backgroundBrush
+        or QGraphicsView::backgroundBrush properties.
+
+        \row \o Q3Canvas::backgroundPixmap() \o You can set a tiled
+        pixmap for the background through
+        QGraphicsScene::backgroundBrush or
+        QGraphicsView::backgroundBrush. For more control on the pixmap
+        positioning, you can reimplement
+        QGraphicsScene::drawBackground() or
+        QGraphicsView::drawBackground().
+
+        \row \o Q3Canvas::chunkSize() \o The closest equivalent to the
+        chunks size in Q3Canvas is the depth of QGraphicsScene's BSP
+        tree. QGraphicsScene assigns a depth automatically, and the
+        size of each scene segment depends on this depth, and
+        QGraphicsScene::sceneRect(). See
+        QGraphicsScene::itemIndexMethod.
+
+        \row \o Q3Canvas::collisions() \o QGraphicsScene provides
+        several means to detect item collisions. The
+        QGraphicsScene::items() overloads return items that collide
+        with a point, a rectangle, a polygon, or an arbitrary vector
+        path (QPainterPath). You can also call
+        QGraphicsScene::collidingItems() to determine collision with
+        an item.
+
+        \row \o Q3Canvas::drawArea() \o The QGraphicsScene::render()
+        function provides the original behavior
+        Q3Canvas::drawArea(). In addition, you can pass a source
+        rectangle for rendering only parts of the scene, and a
+        destination rectangle for rendering onto designated area of
+        the destination device. QGraphicsScene::render() can
+        optionally transform the source rectangle to fit into the
+        destination rectangle. See \l{Printing}
+
+        \row \o Q3Canvas::onCanvas() \o The is no equivalent to this
+        function in Graphics View. However, you can combine
+        QGraphicsScene::sceneRect() and QRectF::intersects():
+        \snippet doc/src/snippets/code/doc_src_porting4-canvas.qdoc 0
+
+        \row \o Q3Canvas::rect() \o The equivalent,
+        QGraphicsScene::sceneRect(), returns a QRectF (double
+        precision coordinates). Its top-left corner can be an
+        arbitrary coordinate (Q3Canvas::rect().topLeft() is always (0,
+        0)).
+
+        \row \o Q3Canvas::resize() \o You can call
+        QGraphicsScene::setSceneRect(0, 0, width, height) instead.
+
+        \row \o Q3Canvas::retune() \o See
+        QGraphicsScene::itemIndexMethod. You can tune the indexing by
+        setting a suitable sceneRect(). The optimal depth of
+        QGraphicsScene's BSP tree is determined automatically.
+
+        \row \o Q3Canvas::setAdvancePeriod() \o There is no concept of
+        an advance period in the new API; instead, you can connect
+        QTimer::timeout() to the QGraphicsScene::advance() slot to
+        obtain similar functionality. This will cause all items'
+        QGraphicsItem::advance() function to be called. See also
+        QGraphicsItemAnimation.
+
+        \row \o Q3Canvas::setAllChanged() \o You can call
+        QGraphicsScene::update() with no arguments.
+
+        \row \o Q3Canvas::setChanged() \o QGraphicsScene::update()
+        will trigger a repaint of the whole scene, or parts of the
+        scene.
+
+        \row \o Q3Canvas::setDoubleBuffering() \o Q3Canvas' double
+        buffering enabled cacheing of the scene contents in device
+        (i.e., viewport) coordinates. This cache layer has been moved
+        to the view instead; you can cache QGraphicsScene's background
+        through
+        QGraphicsView::setCacheMode(). QGraphicsView::resetCachedContent()
+        will reset the areas of the cache that has changed.
+
+        \row \o Q3Canvas::tile() \o See \l{Porting scenes with tiles}.
+
+        \row \o Q3Canvas::setTiles() \o See \l{Porting scenes with tiles}.
+
+        \row \o Q3Canvas::setUnchanged() \o There is no equivalent in
+        Graphics View. This call can usually be removed with no side
+        effects.
+
+        \row \o Q3Canvas::setUpdatePeriod() \o There is no concept of an
+        update period in the new API; instead, you can connect
+        QTimer::timeout() to the QGraphicsScene::update() slot to obtain
+        similar functionality. See also QGraphicsItemAnimation.
+
+        \row \o Q3Canvas::size() \o
+        \tt{QGraphicsScene::sceneRect().size()} returns a QSizeF, with
+        double precision coordinates.
+
+        \row \o Q3Canvas::validChunk() \o To determine if an area is
+        inside the scene area or not, you can combine
+        QRectF::intersects() with QGraphicsScene::sceneRect().
+
+        \row \o Q3Canvas::resized() \o QGraphicsScene emits
+        \l{QGraphicsScene::sceneRectChanged()}{sceneRectChanged()}
+        whenever the scene rect changes.
+
+        \row \o Q3Canvas::drawBackground() \o You can reimplement
+        QGraphicsScene::drawBackground() to render the scene
+        background. You can also reimplement
+        QGraphicsView::drawBackground() to override this background if
+        you need different backgrounds for different views.
+
+        \row \o Q3Canvas::drawForeground() \o You can reimplement
+        QGraphicsScene::drawForeground() to render the scene
+        foreground. You can also reimplement
+        QGraphicsView::drawForeground() to override this foreground if
+        you need different foregrounds for different views.
+
+        \endtable
+
+        \section2 Porting scenes with tiles
+
+        QGraphicsScene does not provide an API for tiles. However, you
+        can achieve similar behavior by drawing pixmaps in a reimplementation of
+        QGraphicsScene::drawBackground().
+
+        Q3Canvas' tile support is based on providing one pixmap
+        containing tiles of a fixed width and height, and then
+        accessing them (reading and replacing tiles) by index. The
+        tiles in the pixmap are arranged from the left to right, top
+        to bottom.
+
+        \table
+        \row \i 0 \i 1 \i 2 \i 3
+        \row \i 4 \i 5 \i 6 \i 7
+        \endtable
+
+        With Graphics View, this pixmap can be stored as a member of a
+        subclass of QGraphicsScene. The three main functions that make
+        out the public tile API can then be declared as new members of
+        this class. Here is one example of how to implement tile support:
+
+        \snippet doc/src/snippets/code/doc_src_porting4-canvas.qdoc 1
+
+        Depending on how your scene uses tiles, you may be able to
+        simplify this approach. In this example, we will try to mimic the behavior
+        of the Q3Canvas functions.
+
+        We start by creating a subclass of QGraphicsScene ("TileScene").
+        In this class, we declare two of the tile
+        functions from Q3Canvas, and we then add two helper function that returns the
+        rectangle for a certain tile in our tile pixmap. We will use a
+        two-dimensional vector of ints to keep track of what tiles should
+        be used at what parts of the scene.
+
+        \snippet doc/src/snippets/code/doc_src_porting4-canvas.qdoc 2
+
+        In setTiles(), we store the pixmap and tile properties as
+        members of the class. Then we resize the tiles vector
+        to match the width and height of our tile grid.
+
+        \snippet doc/src/snippets/code/doc_src_porting4-canvas.qdoc 3
+
+        The setTile() function updates the tiles index, and then
+        updates the corresponding rect in the scene by calling
+        tileRect().
+
+        \snippet doc/src/snippets/code/doc_src_porting4-canvas.qdoc 4
+
+        The first tileRect() function returns a QRect for the tile at
+        position (x, y).
+
+        \snippet doc/src/snippets/code/doc_src_porting4-canvas.qdoc 5
+
+        The second tileRect() function returns a QRect for a tile number.
+        With these functions in place, we can implement the drawBackground()
+        function.
+
+        \snippet doc/src/snippets/code/doc_src_porting4-canvas.qdoc 6
+
+        In drawBackground(), we redraw all tiles that have been
+        exposed by intersecting each tile rect with the exposed background
+        area.
+
+     \section1 Porting from Q3CanvasView
+
+        The closest equivalent to Q3CanvasView in Graphics View is
+        called QGraphicsView.  In most cases, this is the easiest
+        class to port. In addition to providing all of Q3CanvasView's
+        functionality, QGraphicsView includes some useful new features. You
+        can read more about this in QGraphicsView's documentation.
+
+        \section2 Porting table
+
+        \table
+        \header \o Q3CanvasView \o QGraphicsView
+
+        \row \o Q3CanvasView::Q3CanvasView() \o QGraphicsView provides
+        the same constructors as Q3CanvasView, but without the name
+        and flags arguments. You can set the name by calling
+        \l{QWidget::setObjectName()}{setObjectName()}, and the flags by
+        calling \l{QWidget::setWindowFlags()}{setWindowFlags()}.
+
+        \row \o Q3CanvasView::canvas() \o QGraphicsView::scene()
+        returns the scene that is currently associated with the
+        view. QGraphicsScene also provides the opposite function,
+        QGraphicsScene::views(), which returns a list of views
+        observing the scene.
+
+        \row \o Q3CanvasView::inverseWorldMatrix() \o You can call
+        QGraphicsView::matrix() and QMatrix::inverted().
+        QGraphicsView::mapToScene() and QGraphicsView::mapFromScene()
+        allow transforming of viewport shapes to scene shapes, and
+        vice versa.
+
+        \row \o Q3CanvasView::setCanvas() \o QGraphicsView::setScene().
+
+        \row \o Q3CanvasView::setWorldMatrix() \o
+        QGraphicsView::setMatrix(), QGraphicsView::rotate(),
+        QGraphicsView::scale(), QGraphicsView::shear() and
+        QGraphicsView::translate().
+
+        \row \o Q3CanvasView::worldMatrix() \o QGraphicsView::matrix()
+
+        \row \o Q3CanvasView::drawContents() \o The
+        QGraphicsView::drawBackground() function draws the background,
+        QGraphicsView::drawItems() draws the items, and
+        QGraphicsView::drawForeground() draws the foreground of the
+        scene in scene coordinates. You can also reimplement these
+        functions in QGraphicsScene.
+
+        \endtable
+
+        \section2 Other differences
+
+        QGraphicsView can cache the visible contents of the scene,
+        similar to how Q3Canvas::setDoubleBuffering() could cache the
+        entire scene contents. You can call
+        QGraphicsView::setCacheMode() to configure cacheing, and
+        QGraphicsView::resetCachedContent() invalidates the cache.
+
+        For improved navigation support, you can set a resize or
+        transformation anchor through QGraphicsView::resizeAnchor and
+        QGraphicsView::transformationAnchor. This allows you to easily
+        rotate and zoom the view while keeping the center fixed, or
+        zooming towards the position under the mouse cursor. In
+        addition, if you set the QGraphicsView::dragMode of the view,
+        QGraphicsView will provide rubber band selection or
+        click-and-pull navigation using the
+        \l{Qt::OpenHandCursor}{OpenHandCursor} and
+        \l{Qt::ClosedHandCursor}{ClosedHandCursor} cursors.
+
+    \section1 Porting from Q3CanvasItem
+
+        The closest equivalent to Q3CanvasItem in Graphics View is
+        called QGraphicsItem. Deriving from this class is very common,
+        and because of that, porting from Q3CanvasItem often involves
+        more work than Q3Canvas and Q3CanvasView.
+
+        Q3CanvasItem has become easier to use, easier to subclass, and more
+        powerful with QGraphicsItem. The key difference from Q3CanvasItem lies
+        in event propagation and item groups, but you will also find several
+        convenient new features, such as support for tooltips, cursors, item
+        transformation and drag and drop. You can read all about QGraphicsItem
+        in its own class documentation.
+
+        This section starts with a table that shows how to port each function
+        from Q3CanvasItem to QGraphicsItem. Immediately after that, each of
+        Q3CanvasItem's standard subclasses have a section of their own.
+
+        \table
+        \header \o Q3CanvasItem \o QGraphicsItem
+
+        \row \o Q3CanvasItem::advance() \o QGraphicsItem::advance() is
+        provided for compatibility. QGraphicsScene::advance() calls
+        QGraphicsItem::advance() for all items. See also QTimeLine and
+        QGraphicsItemAnimation.
+
+        \row \o Q3CanvasItem::animated() \o No equivalent; all items
+        are advanced by QGraphicsScene::advance().
+
+        \row \o Q3CanvasItem::boundingRectAdvanced() \o No
+        equivalent. You can translate QGraphicsItem::boundingRect()
+        instead (see QRectF::translate()).
+
+        \row \o Q3CanvasItem::canvas() \o QGraphicsItem::scene()
+
+        \row \o Q3CanvasItem::collidesWith() \o
+        QGraphicsItem::collidesWithItem() and
+        QGraphicsItem::collidesWithPath().
+
+        \row \o Q3CanvasItem::collisions() \o
+        QGraphicsItem::collidingItems() returns a list of all items
+        that collide with an item. You can specify whether you want
+        fast, rough estimate collision between bounding rectangles, or
+        the slower, more accurate shapes.
+
+        \row \o Q3CanvasItem::draw() \o QGraphicsItem::paint(). See
+        also QStyleOptionGraphicsItem, QGraphicsScene::drawItems() and
+        QGraphicsView::drawItems().
+
+        \row \o Q3CanvasItem::hide() \o QGraphicsItem::hide() or
+        QGraphicsItem::setVisible(). \l{QGraphicsItem}s are \e visible by
+        default; \l{Q3CanvasItem}s, however, are not.
+
+        \row \o Q3CanvasItem::isActive() \o No equivalent. To achieve
+        similar behavior, you can add this property in a custom
+        subclass of QGraphicsItem.
+
+        \row \o Q3CanvasItem::isVisible() \o
+        QGraphicsItem::isVisible(). \l{QGraphicsItem}s are \e visible by
+        default; \l{Q3CanvasItem}s, however, are not.
+
+        \row \o Q3CanvasItem::move() \o You can call
+        QGraphicsItem::setPos() to change the position of the item.
+
+        \row \o Q3CanvasItem::rtti() \o QGraphicsItem::type() and qgraphicsitem_cast().
+
+        \row \o Q3CanvasItem::setActive() \o No equivalent.
+
+        \row \o Q3CanvasItem::setAnimated() \o No equivalent; all
+        items are by default "animated" (i.e.,
+        QGraphicsScene::advance() advances all items on the scene).
+
+        \row \o Q3CanvasItem::setCanvas() \o You can call
+        QGraphicsScene::addItem(), or pass a pointer to the canvas to
+        QGraphicsItem's constructor.
+
+        \row \o Q3CanvasItem::setVelocity() \o No equivalent. You can
+        add x and y velocity as member data of your class, and call
+        QGraphicsItem::moveBy(x, y) from inside
+        QGraphicsItem::advance(). See also QTimeLine and
+        QGraphicsItemAnimation.
+
+        \row \o Q3CanvasItem::setVisible() \o
+        QGraphicsItem::setVisible(). \l{QGraphicsItem}s are \e visible by
+        default; \l{Q3CanvasItem}s, however, are not.
+
+        \row \o Q3CanvasItem::setX() \o QGraphicsItem::setPos()
+        \row \o Q3CanvasItem::setY() \o QGraphicsItem::setPos()
+
+        \row \o Q3CanvasItem::setXVelocity() \o No equivalent.
+        \row \o Q3CanvasItem::setYVelocity() \o No equivalent.
+
+        \row \o Q3CanvasItem::setZ() \o QGraphicsItem::setZValue()
+
+        \row \o Q3CanvasItem::show() \o QGraphicsItem::show() or
+        QGraphicsItem::setVisible(). \l{QGraphicsItem}s are \e visible by
+        default; \l{Q3CanvasItem}s, however, are not.
+
+        \row \o Q3CanvasItem::xVelocity() \o No equivalent.
+        \row \o Q3CanvasItem::yVelocity() \o No equivalent.
+
+        \endtable
+
+        Note that some virtual functions that have passed on to
+        QGraphicsItem have lost their virtuality. An example is
+        Q3CanvasItem::moveBy(), which was often used to track movement of
+        items. In this case, the virtual QGraphicsItem::itemChange() has
+        taken over as a substitute.
+
+        \section2 Q3CanvasPolygonalItem
+
+            The closest equivalent to Q3CanvasPolygonalItem in
+            Graphics View is called QAbstractGraphicsShapeItem. Unlike
+            Q3CanvasPolygonalItem, it does not define area points
+            (Q3CanvasPolygonalItem::areaPoints()); instead, each
+            item's geometry is stored as a member of the subclasses.
+
+            The Q3CanvasPolygonalItem::drawShape() function is no longer
+            available; instead, you can set the brush and pen from inside
+            QGraphicsItem::paint().
+
+            \table
+            \header \o Q3CanvasPolygonalItem \o QAbstractGraphicsShapeItem
+
+            \row \o Q3CanvasPolygonalItem::areaPoints() \o No equivalent; each
+            item's geometry is stored in the respective subclass.
+
+            \row \o Q3CanvasPolygonalItem::areaPointsAdvanced() \o No
+            equivalent; you can use QPolygonF::translate() or
+            QPainterPath::translate() instead.
+
+            \row \o Q3CanvasPolygonalItem::drawShape() \o
+            QGraphicsItem::paint(). You can set the pen and brush from inside
+            this function.
+
+            \row \o Q3CanvasPolygonalItem::invalidate() \o Call
+            QGraphicsItem::prepareGeometryChange() before changing the
+            item's geometry.
+
+            \row \o Q3CanvasPolygonalItem::isValid() \o No equivalent;
+            items' geometry is always in a valid state.
+
+            \row \o Q3CanvasPolygonalItem::winding() \o This function is only
+            useful for polygon items and path items; see
+            QGraphicsPolygonItem::fillRule(), and QPainterPath::fillRule() for
+            QGraphicsPathItem.
+
+            \endtable
+
+        \section2 Q3CanvasEllipse
+
+            The closest equivalent to Q3CanvasEllipse in Graphics View
+            is called QGraphicsEllipseItem. The most noticable
+            difference to QGraphicsEllipseItem is that the ellipse is
+            not longer drawn centered around its position; rather, it
+            is drawn using a bounding QRectF, just like
+            QPainter::drawEllipse().
+
+            For compatibility, you may want to shift the ellipse up and to the
+            left to keep the ellipse centered. Example:
+
+            \snippet doc/src/snippets/code/doc_src_porting4-canvas.qdoc 7
+
+            Note: QGraphicsEllipseItem uses QAbstractGraphicsShapeItem::pen()
+            for outlines, whereas Q3CanvasEllipse did not use
+            Q3CanvasPolygonalItem::pen().
+
+            \table
+            \header \o Q3CanvasEllipse \o QGraphicsEllipseItem
+
+            \row \o Q3CanvasEllipse::angleLength() \o QGraphicsEllipseItem::spanAngle()
+
+            \row \o Q3CanvasEllipse::angleStart() \o QGraphicsEllipseItem::startAngle()
+
+            \row \o Q3CanvasEllipse::setAngles() \o
+            QGraphicsEllipseItem::setStartAngle() and
+            QGraphicsEllipseItem::setSpanAngle()
+
+            \row \o Q3CanvasEllipse::setSize() \o QGraphicsEllipseItem::setRect()
+
+            \endtable
+
+            \section2 Q3CanvasLine
+
+            The closest equivalent to Q3CanvasLine in Graphics View is
+            called QGraphicsLineItem.
+
+            \table
+            \header \o Q3CanvasLine \o QGraphicsLineItem
+
+            \row \o Q3CanvasLine::endPoint() \o QGraphicsLineItem::line() and QLineF::p2()
+
+            \row \o Q3CanvasLine::setPoints() \o QGraphicsLineItem::setLine()
+
+            \row \o Q3CanvasLine::startPoint() \o QGraphicsLineItem::line()
+            and QLineF::p1()
+
+            \endtable
+
+        \section2 Q3CanvasPolygon
+
+            The closest equivalent to Q3CanvasPolygon in Graphics View
+            is called QGraphicsPolygonItem.
+
+            \table
+            \header \o Q3CanvasPolygon \o QGraphicsPolygonItem
+
+            \row \o Q3CanvasPolygon::areaPoints() \o
+            QGraphicsPolygonItem::polygon() and QGraphicsItem::mapToParent()
+
+            \row \o Q3CanvasPolygon::points() \o QGraphicsPolygonItem::polygon()
+
+            \row \o Q3CanvasPolygon::setPoints() \o QGraphicsPolygonItem::setPolygon()
+
+            \endtable
+
+        \section2 Q3CanvasSpline
+
+            The closest equivalent to Q3CanvasSpline in Graphics View
+            is called QGraphicsPathItem. This item can be used to
+            describe any type of path supported by QPainter.
+
+            Q3CanvasSpline takes its control points as a Q3PointArray, but
+            QPainterPath operates on a sequence of calls to
+            QPainterPath::moveTo() and QPainterPath::cubicTo(). Here is how
+            you can convert a bezier curve Q3PointArray to a QPainterPath:
+
+            \snippet doc/src/snippets/code/doc_src_porting4-canvas.qdoc 8
+
+            Note: QGraphicsPathItem uses QAbstractGraphicsShapeItem::pen() for
+            outlines, whereas Q3CanvasSpline did not use
+            Q3CanvasPolygonalItem::pen().
+
+            \table
+            \header \o Q3CanvasSpline \o QGraphicsPathItem
+
+            \row \o Q3CanvasSpline::closed() \o No equivalent. You can call
+            QPainterPath::closeSubPath() to close a subpath explicitly.
+
+            \endtable
+
+        \section2 Q3CanvasRectangle
+
+            The closest equivalent to Q3CanvasRectangle in Graphics
+            View is called QGraphicsRectItem.
+
+            \table
+            \header \o Q3CanvasRectangle \o QGraphicsRectItem
+
+            \row \o Q3CanvasRectangle::height() \o QGraphicsRectItem::rect()
+            and QRectF::height()
+
+            \row \o Q3CanvasRectangle::setSize() \o QGraphicsRectItem::setRect()
+
+            \row \o Q3CanvasRectangle::size() \o QGraphicsRectItem::rect() and QRectF::size()
+
+            \row \o Q3CanvasRectangle::width() \o QGraphicsRectItem::rect() and QRectF::width()
+
+            \row \o Q3CanvasRectangle::chunks() \o No equivalent.
+
+            \endtable
+
+        \section2 Q3CanvasSprite
+
+            Q3CanvasSprite is the item class that differs the most from its
+            Q3Canvas predecessor. The closest resemblance of Q3CanvasSprite in
+            Graphics View is QGraphicsPixmapItem.
+
+            Q3CanvasSprite supports animated pixmaps; QGraphicsPixmapItem,
+            however, is a simple single-frame pixmap item. If all you need is
+            a pixmap item, porting is straight-forward. If you do need the
+            animation support, extra work is required; there is no direct
+            porting approach.
+
+            For the \l{Ported Asteroids Example}, a subclass of
+            QGraphicsPixmapItem is used to replace Q3CanvasSprite, storing a
+            list of pixmaps and a frame counter. The animation is advanced in
+            QGraphicsItem::advance().
+
+            \section3 Q3CanvasPixmap, Q3CanvasPixmapArray
+
+                These classes have been removed from the API. You can use
+                QPixmap instead of Q3CanvasPixmap, and QList instead of
+                Q3CanvasPixmapArray.
+
+                Q3CanvasPixmapArray included convenience for loading a
+                sequence of pixmaps or masks using a path with a wildcard (see
+                Q3CanvasPixmapArray::readPixmaps() and
+                Q3CanvasPixmapArray::readCollisionMasks()). To achieve similar
+                functionality using Graphics View, you can load the images by
+                using QDir:
+
+                \snippet doc/src/snippets/code/doc_src_porting4-canvas.qdoc 9
+
+        \section2 Q3CanvasText
+
+            Q3CanvasText has been split into two classes in Graphics View:
+            QGraphicsSimpleTextItem and QGraphicsTextItem. For porting,
+            QGraphicsSimpleTextItem should be adequate. QGraphicsTextItem
+            provides advanced document structuring features similar to that of
+            QTextEdit, and it also allows interaction (e.g., editing and
+            selection).
+
+            \table
+            \header \o Q3CanvasText \o QGraphicsSimpleTextItem
+
+            \row \o Q3CanvasText::color() \o QGraphicsSimpleTextItem::pen().
+
+            \row \o Q3CanvasText::setColor() \o QGraphicsSimpleTextItem::setPen().
+
+            \row \o Q3CanvasText::textFlags() \o Use QGraphicsTextItem instead.
+
+            \endtable
+
+
+        \section2 Q3CanvasItemList
+
+            Use QList instead.
+
+    \section1 Other Resources
+
+    The \l{Porting to Qt 4.2's Graphics View} article in Qt Quarterly 21 covered the
+    process of porting the Qt 3 canvas example to Qt 4.
+    The result of this is the \l{Ported Canvas Example}{Ported Canvas} example.
+*/
diff --git a/doc/src/porting4-designer.qdoc b/doc/src/porting4-designer.qdoc
new file mode 100644
index 0000000000..9ae3c52ca5
--- /dev/null
+++ b/doc/src/porting4-designer.qdoc
@@ -0,0 +1,349 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page porting4-designer.html
+    \title Porting .ui Files to Qt 4
+    \contentspage {Porting Guides}{Contents}
+    \previouspage Porting to Qt 4 - Drag and Drop
+    \nextpage Porting to Graphics View
+    \ingroup porting
+    \brief Information about changes to the .ui file format in Qt 4.
+
+    Qt Designer has changed significantly in the Qt 4 release. We
+    have moved away from viewing Qt Designer as an IDE and
+    concentrated on creating a robust form builder which can be
+    extended and embedded in existing IDEs. Our efforts are ongoing
+    and include the \l{Visual Studio Integration},
+    as well as integrating Designer with KDevelop and possibly other
+    IDEs.
+
+    The most important changes in Qt Designer 4 which affect porting
+    for \c .ui files are summarized below:
+
+    \list
+    \o  \bold{Removed project manager.}
+        Qt Designer now only reads and edits \c .ui
+        files. It has no notion of a project (\c .pro file).
+
+    \o  \bold{Removed code editor.}
+        Qt Designer can no longer be used to edit source files.
+
+    \o  \bold{Changed format of \c .ui files.}
+        Qt Designer 4 cannot read files created by Qt Designer 3 and
+        vice versa. However, we provide the tool \c uic3 to generate Qt
+        4 code out of Qt 3 \c .ui files, and to convert old \c .ui files
+        into a format readable by Qt Designer 4.
+
+    \o  \bold{Changed structure of the code generated by \c uic.}
+        The \c myform.ui file containing the form \c MyForm is now
+        converted into a single header file \c ui_myform.h, which
+        contains the declaration and inline definition of a POD class
+        \c Ui::MyForm.
+
+    \o  \bold{New resource file system.} Icon data is no longer
+        stored in the \c .ui file. Instead, icons are put into resource
+        files (\c .qrc).
+    \endlist
+
+    The rest of this document explains how to deal with the main
+    differences between Qt Designer 3 and Qt Designer 4:
+
+    \tableofcontents
+
+    See \l{Porting to Qt 4} and \l{qt3to4 - The Qt 3 to 4 Porting
+    Tool} for more information about porting from Qt 3 to Qt 4. See
+    also the \l{Qt Designer Manual}.
+
+    \section1 uic Output
+
+    In Qt 3, \c uic generated a header file and an implementation for
+    a class, which inherited from one of Qt's widgets. To use the
+    form, the programmer included the generated sources into the
+    application and created an instance of the class.
+
+    In Qt 4, \c uic creates a header file containing a POD class. The
+    name of this class is the object name of the main container,
+    qualified with the \c Ui namespace (e.g., \c Ui::MyForm). The
+    class is implemented using inline functions, removing the need of
+    a separate \c .cpp file. Just as in Qt 3, this class contains
+    pointers to all the widgets inside the form as public members. In
+    addition, the generated class provides the public method \c
+    setupUi().
+
+    The class generated by \c uic is not a QWidget; in fact, it's not
+    even a QObject. Instead, it is a class which knows how to
+    populate an instance of a main container with the contents of the
+    form. The programmer creates the main container himself, then
+    passes it to \c setupUi().
+
+    For example, here's the \c uic output for a simple \c
+    helloworld.ui form (some details were removed for simplicity):
+
+    \snippet doc/src/snippets/code/doc_src_porting4-designer.qdoc 0
+
+    In this case, the main container was specified to be a QWidget
+    (or any subclass of QWidget). Had we started with a QMainWindow
+    template in Qt Designer, \c setupUi()'s parameter would be of
+    type QMainWindow.
+
+    There are two ways to create an instance of our form. One
+    approach is to create an instance of the \c Ui::HelloWorld class,
+    an instance of the main container (a plain QWidget), and call \c
+    setupUi():
+
+    \snippet doc/src/snippets/code/doc_src_porting4-designer.qdoc 1
+
+    The second approach is to inherit from both the \c Ui::HelloWorld
+    class and the main container, and to call \c setupUi() in the
+    constructor of the subclass. In that case, QWidget (or one of
+    its subclasses, e.g. QDialog) must appear first in the base class
+    list so that \l{moc} picks it up correctly. For example:
+
+    \snippet doc/src/snippets/code/doc_src_porting4-designer.qdoc 2
+
+    This second method is useful when porting Qt 3 forms to Qt 4. \c
+    HelloWorldWidget is a class whose instance is the actual form
+    and which contains public pointers to all the widgets in it. It
+    therefore has an interface identical to that of a class generated
+    by \c uic in Qt 3.
+
+    Creating POD classes from \c .ui files is more flexible and
+    generic than the old approach of creating widgets. Qt Designer
+    doesn't need to know anything about the main container apart from
+    the base widget class it inherits. Indeed, \c Ui::HelloWorld can
+    be used to populate any container that inherits QWidget.
+    Conversely, all non-GUI aspects of the main container may be
+    implemented by the programmer in the application's sources
+    without reference to the form.
+
+    \section1 Working with uic3
+
+    Qt 4 comes with the tool \c uic3 for working with old \c .ui
+    files. It can be used in two ways:
+
+    \list 1
+    \o To generate headers and source code for a widget to implement any
+    custom signals and slots added using Qt Designer 3.
+    \o To generate a new \c .ui file that can be used with Qt Designer 4.
+    \endlist
+
+    You can use both these methods in combination to obtain \c{.ui}, header
+    and source files that you can use as a starting point when porting
+    your user interface to Qt 4.
+
+    The first method generates a Qt 3 style header and implementation
+    which uses Qt 4 widgets (this includes the Qt 3 compatibility classes
+    present in the Qt3Support library). This process should be familiar to
+    anyone used to working with Qt Designer 3:
+
+    \snippet doc/src/snippets/code/doc_src_porting4-designer.qdoc 3
+
+    The resulting files \c myform.h and \c myform.cpp implement the
+    form in Qt 4 using a QWidget that will include custom signals,
+    slots and connections specified in the \c .ui file. However,
+    see below for the \l{#Limitations of uic3}{limitations} of this
+    method.
+
+    The second method is to use \c uic3 to convert a Qt Designer 3 \c .ui
+    file to the Qt Designer 4 format:
+
+    \snippet doc/src/snippets/code/doc_src_porting4-designer.qdoc 4
+
+    The resulting file \c myform4.ui can be edited in Qt Designer 4. The
+    header file for the form is generated by Qt 4's \c uic. See the
+    \l{Using a Designer .ui File in Your Application} chapter of the
+    \l{Qt Designer Manual} for information about the preferred ways to
+    use forms created with Qt Designer 4.
+
+    \c uic3 tries very hard to map Qt 3 classes and their properties to
+    Qt 4. However, the behavior of some classes changed significantly
+    in Qt 4. To keep the form working, some Qt 3 classes are mapped
+    to classes in the Qt3Support library. Table 1 shows a list of
+    classes this applies to.
+
+    \table
+    \header \o Qt 3 class       \o Qt 4 class
+    \row    \o \c QButtonGroup  \o Q3ButtonGroup
+    \row    \o \c QDateEdit     \o Q3DateEdit
+    \row    \o \c QDateTimeEdit \o Q3DateTimeEdit
+    \row    \o \c QGroupBox     \o Q3GroupBox
+    \row    \o \c QListBox      \o Q3ListBox
+    \row    \o \c QListView     \o Q3ListView
+    \row    \o \c QMainWindow   \o Q3MainWindow
+    \row    \o \c QTextEdit     \o Q3TextEdit
+    \row    \o \c QTextView     \o Q3TextView
+    \row    \o \c QTimeEdit     \o Q3TimeEdit
+    \row    \o \c QWidgetStack  \o Q3WidgetStack
+    \row    \o \c QWizard       \o Q3Wizard
+    \endtable
+
+    \section1 Limitations of uic3
+
+    Converting Qt 3 \c .ui files to Qt 4 has some limitations. The
+    most noticeable limitation is the fact that since \c uic no
+    longer generates a QObject, it's not possible to define custom
+    signals or slots for the form. Instead, the programmer must
+    define these signals and slots in the main container and connect
+    them to the widgets in the form after calling \c setupUi(). For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_porting4-designer.qdoc 5
+
+    A quick and dirty way to port forms containing custom signals and
+    slots is to generate the code using \c uic3, rather than \c uic. Since
+    \c uic3 does generate a QWidget, it will populate it with custom
+    signals, slots and connections specified in the \c .ui file.
+    However, \c uic3 can only generate code from Qt 3 \c .ui files, which
+    implies that the \c .ui files never get translated and need to be
+    edited using Qt Designer 3.
+
+    Note also that it is possible to create implicit connections
+    between the widgets in a form and the main container. After \c
+    setupUi() populates the main container with child widgets it
+    scans the main container's list of slots for names with the form
+    \tt{on_\e{objectName}_\e{signalName}().}
+
+    If the form contains a widget whose object name is
+    \tt{\e{objectName}}, and if that widget has a signal called
+    \tt{\e{signalName}}, then this signal will be connected to the
+    main container's slot. For example:
+
+    \snippet doc/src/snippets/code/doc_src_porting4-designer.qdoc 6
+
+    Because of the naming convention, \c setupUi() automatically
+    connects \c pushButton's \c clicked() signal to \c
+    HelloWorldWidget's \c on_pushButton_clicked() slot.
+
+    \section1 Icons
+
+    In Qt 3, the binary data for the icons used by a form was stored
+    in the \c .ui file. In Qt 4 icons and any other external files
+    can be compiled into the application by listing them in a \l{The
+    Qt Resource System}{resource file} (\c .qrc). This file is
+    translated into a C++ source file using Qt's resource compiler
+    (\c rcc). The data in the files is then available to any Qt class
+    which takes a file name argument.
+
+    Imagine that we have two icons, \c yes.png and \c no.png. We
+    create a resource file called \c icons.qrc with the following
+    contents:
+
+    \snippet doc/src/snippets/code/doc_src_porting4-designer.qdoc 7
+
+    Next, we add the resource file to our \c .pro file:
+
+    \snippet doc/src/snippets/code/doc_src_porting4-designer.qdoc 8
+
+    When \c qmake is run, it will create the appropriate Makefile
+    rules to call \c rcc on the resource file, and compile and link
+    the result into the application. The icons may be accessed as
+    follows:
+
+    \snippet doc/src/snippets/code/doc_src_porting4-designer.qdoc 9
+
+    In each case, the leading colon tells Qt to look for the file in
+    the virtual file tree defined by the set of resource files
+    compiled into the application instead of the file system.
+
+    In the \c .qrc file, the \c qresource tag's \c prefix attribute
+    is used to arrange the files into categories and set a virtual
+    path where the files will be accessed.
+
+    Caveat: If the resource file was not linked directly into the
+    application, but instead into a dynamic or static library that
+    was later linked with the application, its virtual file tree will
+    not be available to QFile and friends until the Q_INIT_RESOURCE()
+    macro is called. This macro takes one argument, which is the name
+    of the \c .qrc file, without the path or the file extension. A
+    convenient place to initialize resources is at the top of the
+    application's \c main() function.
+
+    In Qt Designer 4, we can associate any number of resource files
+    with a form using the resource editor tool. The widgets in the
+    form can access all icons specified in its associated resource
+    files.
+
+    In short, porting of icons from a Qt 3 to a Qt 4 form involves
+    the following steps:
+
+    \list 1
+    \o Use \c{uic3 -convert} to obtain a \c .ui file understood by
+       Qt Designer 4.
+
+    \o Create a \c .qrc file with a list of all the icon files.
+
+    \o Add the resource file to the \c .pro file.
+
+    \o Open the form in Qt Designer 4 and add the resource file to the
+       form's resource editor.
+
+    \o Set the icon properties for the appropriate widgets.
+    \endlist
+
+    \section1 Custom Widgets
+
+    Qt Designer 3 supported defining custom widgets by specifying
+    their name, header file and methods. In Qt Designer 4, a custom
+    widget is always created by "promoting" an existing Qt widget to
+    a custom class. Qt Designer 4 assumes that the custom widget will
+    inherit from the widget that has been promoted. In the form
+    editor, the custom widget will retain the looks, behavior,
+    properties, signals and slots of the base widget. It is not
+    currently possible to tell Qt Designer 4 that the custom widget
+    will have additional signals or slots.
+
+    \c{uic3 -convert} handles the conversion of custom widgets to the
+    new \c .ui format, however all custom signals and slots are lost.
+    Furthermore, since Qt Designer 3 never knew the base widget class
+    of a custom widget, it is taken to be QWidget. This is often
+    sufficient. If not, the custom widgets have to be inserted
+    manually into the form.
+
+    Custom widget plugins, which contain custom widgets to be used in
+    Qt Designer, must themselves be ported before they can be used in
+    forms ported with \c{uic3}.
+    The \l{Porting to Qt 4} document contains information about general
+    porting issues that may apply to the custom widget code itself, and
+    the \l{Creating Custom Widgets for Qt Designer} chapter of the
+    \l{Qt Designer Manual} describes how the ported widget should be
+    built in order to work in Qt Designer 4.
+*/
diff --git a/doc/src/porting4-modifiedvirtual.qdocinc b/doc/src/porting4-modifiedvirtual.qdocinc
new file mode 100644
index 0000000000..1164238f59
--- /dev/null
+++ b/doc/src/porting4-modifiedvirtual.qdocinc
@@ -0,0 +1,63 @@
+\row \o int QAccessibleInterface::navigate(NavDirection, int) const \o int QAccessibleInterface::navigate(RelationFlag, int, QAccessibleInterface **) const
+\row \o bool QApplication::winEventFilter(MSG *) \o bool QApplication::winEventFilter(MSG *, long *)
+\row \o Function: Offset QIODevice::at() const \o Function: Q_LONGLONG QIODevice::pos() const
+\row \o bool QIODevice::at(Offset) \o bool QIODevice::seek(Q_LONGLONG)
+\row \o bool QIODevice::open(int) \o bool QIODevice::open(OpenMode)
+\row \o Q_LONG QIODevice::readBlock(char *, Q_ULONG) \o Q_LONGLONG QIODevice::readData(char *, Q_LONGLONG)
+\row \o Q_LONG QIODevice::writeBlock(const char *, Q_ULONG) \o Q_LONGLONG QIODevice::writeData(const char *, Q_LONGLONG)
+\row \o const char * QImageFormatType::formatName() const \o QByteArray QImageFormatType::formatName() const
+\row \o QPopupMenu * QLineEdit::createPopupMenu() \o QMenu * QLineEdit::createPopupMenu()
+\row \o bool QMacMime::canConvert(const char *, int) \o bool QMacMime::canConvert(const QString &, int)
+\row \o QValueList<QByteArray> QMacMime::convertFromMime(QByteArray, const char *, int) \o QList<QByteArray> QMacMime::convertFromMime(QByteArray, const QString &, int)
+\row \o QByteArray QMacMime::convertToMime(QValueList<QByteArray> data, const char *, int) \o QByteArray QMacMime::convertToMime(QList<QByteArray> data, const QString &, int)
+\row \o const char * QMacMime::convertorName() \o QString QMacMime::convertorName()
+\row \o int QMacMime::flavorFor(const char *) \o int QMacMime::flavorFor(const QString &)
+\row \o const char * QMacMime::mimeFor(int) \o QString QMacMime::mimeFor(int)
+\row \o QMetaObject * QObject::metaObject() const \o const QMetaObject * QObject::metaObject() const
+\row \o bool QScreen::onCard(unsigned char *) const \o bool QScreen::onCard(const unsigned char *) const
+\row \o bool QScreen::onCard(unsigned char *, ulong &) const \o bool QScreen::onCard(const unsigned char *, ulong &) const
+\row \o int QSpinBox::mapTextToValue(bool *) \o int QSpinBox::mapTextToValue(QString *, QValidator::State *) const
+\row \o QString QSpinBox::mapValueToText(int) \o QString QSpinBox::mapValueToText(int) const
+\row \o bool QSqlDriver::open(const QString &, const QString &, const QString &, const QString &, int) \o bool QSqlDriver::open(const QString &, const QString &, const QString &, const QString &, int, const QString &)
+\row \o QStringList QSqlDriver::tables(const QString &) const \o QStringList QSqlDriver::tables(QSql::TableType) const
+\row \o bool QSqlQuery::prev() \o bool QSqlQuery::previous()
+\row \o bool QSqlResult::fetchPrev() \o bool QSqlResult::fetchPrevious()
+\row \o void QStyle::drawComplexControl(ComplexControl, QPainter *, const QWidget *, const QRect &, const QColorGroup &, SFlags, SCFlags, SCFlags, const QStyleOption &) const \o void QStyle::drawComplexControl(ComplexControl, const QStyleOptionComplex *, QPainter *, const QWidget *) const
+\row \o void QStyle::drawComplexControlMask(ComplexControl, QPainter *, const QWidget *, const QRect &, const QStyleOption &) const \o void QStyle::drawComplexControlMask(ComplexControl, const QStyleOptionComplex *, QPainter *, const QWidget *) const
+\row \o void QStyle::drawControl(ControlElement, QPainter *, const QWidget *, const QRect &, const QColorGroup &, SFlags, const QStyleOption &) const \o void QStyle::drawControl(ControlElement, const QStyleOption *, QPainter *, const QWidget *) const
+\row \o void QStyle::drawControlMask(ControlElement, QPainter *, const QWidget *, const QRect &, const QStyleOption &) const \o void QStyle::drawControlMask(ControlElement, const QStyleOption *, QPainter *, const QWidget *) const
+\row \o void QStyle::drawItem(QPainter *, const QRect &, int, const QColorGroup &, bool, const QPixmap *, const QString &, int, const QColor *) const \o void QStyle::drawItem(QPainter *, const QRect &, int, const QPalette &, bool, const QString &, int, const QColor *) const
+\row \o void QStyle::drawPrimitive(PrimitiveElement, QPainter *, const QRect &, const QColorGroup &, SFlags, const QStyleOption &) const \o void QStyle::drawPrimitive(PrimitiveElement, const QStyleOption *, QPainter *, const QWidget *) const
+\row \o QRect QStyle::itemRect(QPainter *, const QRect &, int, bool, const QPixmap *, const QString &, int) const \o QRect QStyle::itemTextRect(const QFontMetrics &, const QRect &, int, bool, const QString &, int) const
+\row \o int QStyle::pixelMetric(PixelMetric, const QWidget *) const \o int QStyle::pixelMetric(PixelMetric, const QStyleOption *, const QWidget *) const
+\row \o SubControl QStyle::querySubControl(ComplexControl, const QWidget *, const QPoint &, const QStyleOption &) const \o SubControl QStyle::hitTestComplexControl(ComplexControl, const QStyleOptionComplex *, const QPoint &, const QWidget *) const
+\row \o QRect QStyle::querySubControlMetrics(ComplexControl, const QWidget *, SubControl, const QStyleOption &) const \o QRect QStyle::subControlRect(ComplexControl, const QStyleOptionComplex *, SubControl, const QWidget *) const
+\row \o QSize QStyle::sizeFromContents(ContentsType, const QWidget *, const QSize &, const QStyleOption &) const \o QSize QStyle::sizeFromContents(ContentsType, const QStyleOption *, const QSize &, const QFontMetrics &, const QWidget *) const
+\row \o int QStyle::styleHint(StyleHint, const QWidget *, const QStyleOption &, QStyleHintReturn *) const \o int QStyle::styleHint(StyleHint, const QStyleOption *, const QWidget *, QStyleHintReturn *) const
+\row \o QPixmap QStyle::stylePixmap(StylePixmap, const QWidget *, const QStyleOption &) const \o QPixmap QStyle::standardPixmap(StandardPixmap, const QStyleOption *, const QWidget *) const
+\row \o QRect QStyle::subRect(SubRect, const QWidget *) const \o QRect QStyle::subRect(SubRect, const QStyleOption *, const QFontMetrics &, const QWidget *) const
+\row \o void QStyle::unPolish(QApplication *) \o void QStyle::unpolish(QApplication *)
+\row \o void QStyle::unPolish(QWidget *) \o void QStyle::unpolish(QWidget *)
+\row \o QCString QTextCodec::fromUnicode(const QString &, int &) const \o QByteArray QTextCodec::fromUnicode(const QString &, int &) const
+\row \o QValueList<int> QTextCodecPlugin::mibEnums() const \o QList<int> QTextCodecPlugin::mibEnums() const
+\row \o void QTextDrag::setSubtype(const QCString &) \o void QTextDrag::setSubtype(const QString &)
+\row \o QCString QTextEncoder::fromUnicode(const QString &, int &) \o QByteArray QTextEncoder::fromUnicode(const QString &, int &)
+\row \o void QUriDrag::setUris(QStrList) \o void QUriDrag::setUris(const QList<QByteArray> & list)
+\row \o void QUrlInfo::setSize(uint) \o void QUrlInfo::setSize(Q_LONGLONG)
+\row \o bool QWindowsMime::canConvert(const char *, int) \o bool QWindowsMime::canConvert(const QString &, int)
+\row \o int QWindowsMime::cfFor(const char *) \o int QWindowsMime::cfFor(const QString &)
+\row \o QByteArray QWindowsMime::convertFromMime(QByteArray, const char *, int) \o QByteArray QWindowsMime::convertFromMime(const QByteArray &, const QString &, int)
+\row \o QByteArray QWindowsMime::convertToMime(QByteArray, const char *, int) \o QByteArray QWindowsMime::convertToMime(const QByteArray &, const QString &, int)
+\row \o const char * QWindowsMime::convertorName() \o QString QWindowsMime::convertorName()
+\row \o void QWSMouseHandler::calibrate(QWSPointerCalibrationData *) \o void QWSMouseHandler::calibrate(const QWSPointerCalibrationData *)
+\row \o bool QWidget::macEvent(MSG *) \o bool QWidget::macEvent(EventHandlerCallRef, EventRef)
+\row \o bool QWidget::winEvent(MSG *) \o bool QWidget::winEvent(MSG *, long *)
+\row \o QString QXmlContentHandler::errorString() \o QString QXmlContentHandler::errorString() const
+\row \o QString QXmlDTDHandler::errorString() \o QString QXmlDTDHandler::errorString() const
+\row \o QString QXmlDeclHandler::errorString() \o QString QXmlDeclHandler::errorString() const
+\row \o QString QXmlEntityResolver::errorString() \o QString QXmlEntityResolver::errorString() const
+\row \o QString QXmlErrorHandler::errorString() \o QString QXmlErrorHandler::errorString() const
+\row \o QString QXmlInputSource::data() \o QString QXmlInputSource::data() const
+\row \o QString QXmlLexicalHandler::errorString() \o QString QXmlLexicalHandler::errorString() const
+\row \o int QXmlLocator::columnNumber() \o int QXmlLocator::columnNumber() const
+\row \o int QXmlLocator::lineNumber() \o int QXmlLocator::lineNumber() const
diff --git a/doc/src/porting4-obsoletedmechanism.qdocinc b/doc/src/porting4-obsoletedmechanism.qdocinc
new file mode 100644
index 0000000000..1594570bab
--- /dev/null
+++ b/doc/src/porting4-obsoletedmechanism.qdocinc
@@ -0,0 +1,3 @@
+If you use this mechanism in your application, please submit a
+report to the \l{Task Tracker} on the Trolltech
+website and we will try to find a satisfactory substitute.
diff --git a/doc/src/porting4-overview.qdoc b/doc/src/porting4-overview.qdoc
new file mode 100644
index 0000000000..b0146a65f6
--- /dev/null
+++ b/doc/src/porting4-overview.qdoc
@@ -0,0 +1,367 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page porting4-overview.html
+    \title Moving from Qt 3 to Qt 4
+    \ingroup porting
+    \brief Porting advice for authors of new and existing Qt 3 applications.
+
+    This document describes which parts of Qt should be used when
+    writing an application with Qt 3, so that it can be upgraded to
+    use Qt 4 later with a minimum of effort. However, the advice may
+    also be useful to developers who are porting existing applications
+    from Qt 3 to Qt 4.
+
+    For a detailed overview
+    of the porting process for existing Qt 3 applications, see the
+    \l{Porting to Qt 4} document.
+
+    \tableofcontents
+
+    Since Qt 4 provides important new functionality at the cost of
+    some compatibility with Qt 3, it is useful for developers of
+    Qt 3-based applications to learn how to take advantage of
+    Qt 3's API now while preparing for future changes that will be
+    needed when upgrading to Qt 4.
+
+    Certain advanced Qt 3 features were moved to the Qt 3 support
+    library (\l{Qt3Support}) in Qt 4.0, and have been gradually
+    replaced in subsequent releases of Qt 4.
+
+    Making Qt 3 applications as portable to Qt 4 as possible
+    enables a smooth transition between versions of Qt in the
+    long term, and allows for a stable development process
+    throughout.
+
+    \section1 Qt 3 Features to Avoid
+
+    Although we are proud of the level of stability we have achieved
+    with Qt, it is important to realise that, for Qt 4 to be a
+    substantial improvement over Qt 3, certain features have
+    been revised to make the framework more maintainable for us
+    and more usable for developers. It is therefore useful to
+    know which features of Qt 3 should be avoided to help save
+    time during a later porting effort to Qt 4. Note that it is
+    still possible to use many of the following classes and
+    features through the use of the \l{Qt3Support} module.
+
+    \section2 Painting Outside Paint Events
+
+    In Qt 3, under certain circumstances, it was possible to use
+    QPainter to draw on a given custom widget outside its
+    \l{QWidget::}{paintEvent()} reimplementation. In Qt 4, in most
+    situations, painting must occur within a widget's paint event
+    handler.
+
+    On X11, it is possible to set the \l{Qt::WA_PaintOutsidePaintEvent}
+    attribute on widgets to keep existing code, but we recommend
+    restricting the use of painting code to within paint event handlers
+    where possible.
+
+    More information about this change can be found in the
+    \l{Porting to Qt 4#Painting and Redrawing Widgets}{Painting and Redrawing Widgets}
+    section of the \l{Porting to Qt 4} document.
+
+    \section2 Qt Designer
+
+    The version of Qt Designer supplied with Qt 3 provided
+    extensive code editing and project management features
+    (control over \c{.ui.h} and \c{.pro} files), and encouraged
+    users to design main window applications from within the
+    Qt Designer environment.
+
+    The version of Qt Designer supplied with Qt 4 is intended
+    to be integrated with other software development tools (such
+    as integrated development environments), and does not
+    support these project-level features.
+
+    We recommend using one of the
+    \l{Using a Designer .ui File in Your Application}{form subclassing approaches}
+    with forms created using Qt Designer. This avoids the need
+    to use \c{.ui.h} files and special purpose code editors.
+
+    Existing Qt 3 forms created using Qt Designer can be gradually
+    ported to Qt 4 by following the advice in the
+    \l{Porting .ui Files to Qt 4} guide. However, some extra effort
+    will be required to move application logic from \c{.ui.h} files
+    into the main body of a Qt 4 application.
+
+    \section2 Menu Items (QMenuItem)
+
+    The old-style construction of menus by creating individual
+    menu items has been superseded in Qt 4 by the use of
+    generic actions which can be used in menus, toolbars, and
+    as keyboard shortcuts.
+
+    Qt 3 also supports this action-based approach, so, by using
+    QAction throughout your application, less work will be
+    required to adapt your application to Qt 4.
+
+    \section2 Pointer-Based Classes (QPtr*)
+
+    Qt 3 provides a group of pointer-based classes (\c QPtrList,
+    \c QPtrDict, \c QPtrVector, etc.) that help manage collections
+    of pointers to objects (usually QObject subclasses) in an
+    application. In addition, the value-based collection classes
+    (\c QValueList, \c QValueDict, \c QValueVector, etc.) provide
+    a way to store standard value types which cannot be easily stored
+    in pointer-based collections.
+
+    Qt 4 introduces a single set of collection classes which
+    does not require developers to pay as much attention to
+    memory allocation and object ownership issues. As a result,
+    Qt 3's pointer-based classes have no direct equivalent
+    classes in Qt 4.
+
+    To ease migration, use Qt 3's value-based classes to store
+    most objects, including pointers; for example, use
+    \c QValueVector<QWidget *> rather than
+    \c QPtrVector<QWidget *>. These can be replaced by
+    Qt 4's QVector, QLinkedList, and QList later.
+
+    \section2 Other Collection Classes (QStrList, Q*Dict)
+
+    Some collection classes in Qt 3 have been deprecated in
+    favor of easier to use, higher level alternatives. These
+    include the dictionary classes (\c QAsciiDict, \c QDict,
+    \c QIntDict, \c QPtrDict) and \c QStrList.
+
+    \c QStrList can usually replaced by the higher level QStringList
+    class in Qt 3; this is also available in Qt 4. It is
+    recommended that you use the QMap class instead of the \c QDict
+    classes. In Qt 4, QMap is also complemented by the QHash
+    class.
+
+    \section2 Memory Arrays (QMemArray)
+
+    In Qt 3, the \c QMemArray class is used as a simple array
+    container for simple data types. This class is deprecated in
+    Qt 4 in favor of the QVector and QVarLengthVector classes
+    which provide more powerful and consistent array objects.
+
+    Qt 3's closest equivalent class to Qt 4's QVector is the
+    \c QValueVector class. For many purposes, this can be used
+    instead of \c QMemArray.
+
+    \section2 URL Operations (QUrlOperator)
+
+    The URL operator in Qt 3 provides an abstract way to
+    handle files via HTTP, FTP, and on the local file system.
+    However, Qt 4 only provides this functionality through the
+    use of the Q3UrlOperator.
+
+    From Qt 4.4, the Network Access API provides a subset of the features
+    provided by \c QUrlOperator that are mostly intended for use with
+    applications that use the HTTP and FTP protocols. See the
+    QNetworkRequest, QNetworkReply, and QNetworkAccessManager documentation
+    for further details.
+
+    It is also possible to perform operations on remote files
+    through the QHttp and QFtp classes, and on local files with
+    the QFile class.
+
+    \section2 SQL Cursors (QSqlCursor)
+
+    In Qt 3, one of the preferred methods of working with SQL
+    is to use a cursor to manipulate the contents of a database.
+    In Qt 4, the preferred method of working with SQL is to use
+    the model/view architecture (QSqlQueryModel and QSqlTableModel)
+    and, as a result, the cursor interface is only supplied in the
+    Q3SqlCursor class.
+
+    The easiest way to ensure continuity between Qt 3 and Qt 4
+    is to use QSqlQuery rather than \c QSqlCursor,
+    and migrate to QSqlQueryModel later.
+
+    \section2 Domain Name Service (QDns)
+
+    The QDns class in Qt 4 provides a much simpler interface
+    than the QDns class in Qt 3, and is mainly used for host
+    name resolution.
+    As a result, many of the more complex features of Qt 3's
+    QDns class are only available through Qt 4's Q3Dns
+    compatibility class.
+
+    To resolve host names with Qt 3, it is recommended that you
+    use the higher level interface of QSocket rather than QDns.
+    The equivalent functionality is available in Qt 4 in the
+    QAbstractSocket and QHostInfo classes.
+
+    \section2 Wizard Dialogs (QWizard)
+
+    Qt 3 provides support for "wizard" dialogs in the form of
+    the \c QWizard class. Prior to Qt 4.3, this class was made
+    available as Q3Wizard, and provides the same interface for
+    creating relatively complex wizards.
+
+    In Qt 4.3 and later, a revised QWizard class can be used to
+    create this kind of dialog, but existing Qt 3 wizard
+    implementations may need to be redesigned to work with the
+    new QWizard API.
+
+    \section2 Abstract Grid Views (QGridView)
+
+    Before the introduction of the Qt 3 \c QTable class,
+    \c QGridView was the recommended way to create tables of
+    custom items.
+    With the introduction of \c QTable, the \c QGridView class was
+    effectively obsoleted, and the \c QTable class should now be
+    used to display tabular information in your Qt 3 application.
+    This approach allows you to use QTableWidget as a replacement
+    when later porting your application to Qt 4.
+
+    \section2 Specialized Scrolling Views
+
+    In Qt 3, the \c QScrollView class provides a viewport that can
+    be used to display part of a larger widget, and will
+    optionally provide scroll bars for navigation purposes.
+    In Qt 4, this functionality is superseded by classes such as
+    QScrollArea, which provides a more intuitive interface for
+    developers to use.
+    \c QScrollView is available in Qt 4 as the Q3ScrollView class.
+
+    In Qt 3, it is recommended that \c QScrollView should be
+    used with child widgets rather than subclassed. However, it
+    should be noted that this approach may not be appropriate if
+    you need to use extremely large scrolling areas in your
+    application, since Qt 3 widgets cannot be wider or taller
+    than 32767 pixels.
+
+    \section1 Significantly Changed Features
+
+    Some Qt 3 features have changed significantly for Qt 4. 
+    and the recommended way of using them has therefore changed
+    significantly, too. This is most notably true for the drag 
+    and drop API. 
+
+    Additionally, some of the more specialized features in Qt 3 are
+    often used to help customize widgets and add extra polish to an
+    application.
+    Although these improvements make applications more presentable to
+    users, many of them are unnecessary with Qt 4, and may create
+    additional porting work.
+
+    \section2 Drag and Drop
+
+    Qt 4 introduces a simpler and more intuitive implementation
+    of drag and drop between widgets, and with other applications.
+    As a result, there is no simple approach that can be used to
+    make drag and drop in a Qt 3 application easier to port to
+    Qt 4.
+
+    \section2 Extensive Customization of Item Views
+
+    Each of the classes that are used to display list, tree,
+    and table items in Qt 3 can be subclassed for the purposes
+    of customizing their appearance. The item view framework
+    in Qt 4 is implemented according to a different paradigm
+    (model/view) which does not allow items to be customized
+    using this method.
+
+    Although Qt 4 provides compatibility classes (Q3ListBoxItem,
+    Q3ListViewItem, and Q3TableItem) that can be used in the same
+    way as their Qt 3 counterparts, these cannot be used within
+    the standard model/view framework. It is recommended that,
+    to minimize porting effort, extensive customization of item
+    classes should be avoided in Qt 3, if at all possible.
+
+    \section2 Double Buffering
+
+    Qt 3 applications often use double buffering for reducing
+    flicker when painting custom widgets. This approach is
+    unnecessary with Qt 4 because double buffering is
+    automatically performed by the paint engine.
+
+    It still makes sense to use double buffering in
+    Qt 4 in certain contexts. For example, in
+    Chapter 5 of \l{GUI Programming with Qt 3}, double buffering
+    was presented as a speed optimization and not just as a means
+    of reducing flicker.
+
+    \section2 Data-Aware Forms
+
+    The \c QDataTable, \c QDataBrowser, and \c QDataView classes
+    in Qt 3 allow integration between widgets and SQL-based
+    databases.
+
+    In Qt 4.1 and earlier, the preferred way to create a data-aware
+    widget is to connect an generic item view (such as a table view)
+    to a SQL model. In Qt 4.2 and later, the QDataWidgetMapper class
+    can be used to map data to widgets in a form-based user interface.
+
+    New applications written with Qt 3 should use QSqlQuery in
+    preference to an approach based on the old-style data-aware
+    widgets.
+    This offers a choice of porting strategies when later migrating
+    the application to Qt 4: You can either continue to use
+    QSqlQuery or take the opportunity to use the model/view
+    classes to handle database integration.
+
+    \section2 Dock Windows and Areas
+
+    In Qt 4, the way that dock windows are constructed and used
+    in main window applications differs significantly to the
+    pattern of use provided by Qt 3. As a result, the introduction
+    of a simpler and cleaner API means that Qt 3 applications that
+    make extensive use of dock window areas will require careful
+    examination when they are ported to Qt 4.
+
+    We recommend that the QMainWindow class be used in preference
+    to the Q3MainWindow compatibility class when an existing Qt 3
+    main window application is ported to Qt 4. Therefore, we
+    recommend that specialized use of dock window areas should
+    be avoided when writing a Qt 3 application with Qt 4 in mind.
+
+    \section2 Custom Styles
+
+    The style system used to provide consistent themes for Qt's
+    standard widgets has been revised for Qt 4. As a result,
+    custom styles for Qt 3 require some porting work to be done
+    before they can be used with Qt 4. To ease the porting process,
+    we recommend that you avoid implementing custom widget styles
+    for Qt 3 applications unless it is absolutely necessary for
+    your users.
+
+    In Qt 4.2 and later, \l{Qt Style Sheets} can be used to
+    implement many common modifications to existing styles, and
+    this may be sufficient for Qt 3 applications.
+*/
diff --git a/doc/src/porting4-removedenumvalues.qdocinc b/doc/src/porting4-removedenumvalues.qdocinc
new file mode 100644
index 0000000000..fe38d0ec1e
--- /dev/null
+++ b/doc/src/porting4-removedenumvalues.qdocinc
@@ -0,0 +1,6 @@
+\row \o QButton::SingleShot
+\row \o QButton::Toggle
+\row \o QButton::Tristate
+\row \o QEvent::AccelAvailable
+\row \o QEvent::ParentFontChange
+\row \o QEvent::ParentPaletteChange
diff --git a/doc/src/porting4-removedtypes.qdocinc b/doc/src/porting4-removedtypes.qdocinc
new file mode 100644
index 0000000000..9d7c5193d0
--- /dev/null
+++ b/doc/src/porting4-removedtypes.qdocinc
@@ -0,0 +1 @@
+\row \o QAbstractButton::ToggleType
diff --git a/doc/src/porting4-removedvariantfunctions.qdocinc b/doc/src/porting4-removedvariantfunctions.qdocinc
new file mode 100644
index 0000000000..dfaa8f35d2
--- /dev/null
+++ b/doc/src/porting4-removedvariantfunctions.qdocinc
@@ -0,0 +1,16 @@
+\row \o toBitmap ()         \o QVariant::value()
+\row \o toBrush ()          \o QVariant::value()
+\row \o toColorGroup ()     \o Use QVariant::value() with QPalette instead.
+\row \o toColor ()          \o QVariant::value()
+\row \o toCString ()        \o QVariant::toByteArray()
+\row \o toCursor ()         \o QVariant::value()
+\row \o toFont ()           \o QVariant::value()
+\row \o toIconSet ()        \o Use QVariant::value() with QIcon instead.
+\row \o toImage ()          \o QVariant::value()
+\row \o toKeySequence ()    \o QVariant::value()
+\row \o toPalette ()        \o QVariant::value()
+\row \o toPen ()            \o QVariant::value()
+\row \o toPixmap ()         \o QVariant::value()
+\row \o toPointArray ()     \o QVariant::value()
+\row \o toRegion ()         \o QVariant::value()
+\row \o toSizePolicy ()     \o QVariant::value()
diff --git a/doc/src/porting4-removedvirtual.qdocinc b/doc/src/porting4-removedvirtual.qdocinc
new file mode 100644
index 0000000000..3eedad2ddc
--- /dev/null
+++ b/doc/src/porting4-removedvirtual.qdocinc
@@ -0,0 +1,605 @@
+\row \o void QAccessibleInterface::clearSelection() \o Port to the new QAccessibleInterface API.
+\row \o int QAccessibleInterface::controlAt(int, int) const \o Port to the new QAccessibleInterface API.
+\row \o bool QAccessibleInterface::doDefaultAction(int) \o Port to the new QAccessibleInterface API.
+\row \o QMemArray<int> QAccessibleInterface::selection() const \o Port to the new QAccessibleInterface API.
+\row \o bool QAccessibleInterface::setFocus(int) \o Port to the new QAccessibleInterface API.
+\row \o bool QAccessibleInterface::setSelected(int, bool, bool) \o Port to the new QAccessibleInterface API.
+\row \o bool QAction::addTo(QWidget *) \o Use Q3Action instead or port to the new QAction API.
+\row \o void QAction::addedTo(QWidget *, QWidget *) \o Use Q3Action instead or port to the new QAction API.
+\row \o void QAction::addedTo(int, QPopupMenu *) \o Use Q3Action instead or port to the new QAction API.
+\row \o bool QAction::removeFrom(QWidget *) \o Use Q3Action instead or port to the new QAction API.
+\row \o void QAction::setAccel(const QKeySequence &) \o Use Q3Action instead or port to the new QAction API.
+\row \o void QAction::setEnabled(bool) \o Use Q3Action instead or port to the new QAction API.
+\row \o void QAction::setIconSet(const QIcon &) \o Use Q3Action instead or port to the new QAction API.
+\row \o void QAction::setMenuText(const QString &) \o Use Q3Action instead or port to the new QAction API.
+\row \o void QAction::setOn(bool) \o Use Q3Action instead or port to the new QAction API.
+\row \o void QAction::setStatusTip(const QString &) \o Use Q3Action instead or port to the new QAction API.
+\row \o void QAction::setText(const QString &) \o Use Q3Action instead or port to the new QAction API.
+\row \o void QAction::setToggleAction(bool) \o Use Q3Action instead or port to the new QAction API.
+\row \o void QAction::setToolTip(const QString &) \o Use Q3Action instead or port to the new QAction API.
+\row \o void QAction::setWhatsThis(const QString &) \o Use Q3Action instead or port to the new QAction API.
+\row \o void QButton::drawButton(QPainter *) \o Use Q3Button instead or reimplement QButton::paintEvent().
+\row \o void QButton::drawButtonLabel(QPainter *) \o Use Q3Button instead or reimplement QButton::paintEvent().
+\row \o void QButton::setAccel(const QKeySequence &) \o Setter.
+\row \o void QButton::setAutoRepeat(bool) \o Setter.
+\row \o void QButton::setDown(bool) \o Setter.
+\row \o void QButton::setPixmap(const QPixmap &) \o Setter.
+\row \o void QButton::setState(ToggleState) \o Setter.
+\row \o void QButton::setText(const QString &) \o Use the QAbstractButton::setText() setter function.
+\row \o void QButton::setToggleType(ToggleType) \o Setter.
+\row \o void QButtonGroup::moveFocus(int) \o Use the QWidget::setFocus() setter function.
+\row \o void QButtonGroup::setButton(int) \o Setter.
+\row \o void QButtonGroup::setExclusive(bool) \o Setter.
+\row \o void QButtonGroup::setRadioButtonExclusive(bool) \o Setter.
+\row \o void QComboBox::setAutoCompletion(bool) \o Setter.
+\row \o void QComboBox::setAutoResize(bool) \o Setter.
+\row \o void QComboBox::setCurrentItem(int) \o Setter.
+\row \o void QComboBox::setCurrentText(const QString &) \o Setter.
+\row \o void QComboBox::setFont(const QFont &) \o Setter.
+\row \o void QComboBox::setInsertionPolicy(Policy) \o Setter.
+\row \o void QComboBox::setLineEdit(QLineEdit *) \o Setter.
+\row \o void QComboBox::setListBox(QListBox *) \o Setter.
+\row \o void QComboBox::setMaxCount(int) \o Setter.
+\row \o void QComboBox::setPalette(const QPalette &) \o Setter.
+\row \o void QComboBox::setSizeLimit(int) \o Setter.
+\row \o void QComboBox::setValidator(const QValidator *) \o Setter.
+\row \o void QDateEdit::fix() \o Port to the new QDateTimeEdit API.
+\row \o QString QDateEdit::sectionFormattedText(int) \o Port to the new QDateTimeEdit API.
+\row \o void QDateEdit::setAutoAdvance(bool) \o Port to the new QDateTimeEdit API.
+\row \o void QDateEdit::setDate(const QDate &) \o Port to the new QDateTimeEdit API.
+\row \o void QDateEdit::setDay(int) \o Port to the new QDateTimeEdit API.
+\row \o void QDateEdit::setMaxValue(const QDate &) \o Port to the new QDateTimeEdit API.
+\row \o void QDateEdit::setMinValue(const QDate &) \o Port to the new QDateTimeEdit API.
+\row \o void QDateEdit::setMonth(int) \o Port to the new QDateTimeEdit API.
+\row \o void QDateEdit::setOrder(Order) \o Port to the new QDateTimeEdit API.
+\row \o void QDateEdit::setRange(const QDate &, const QDate &) \o Port to the new QDateTimeEdit API.
+\row \o void QDateEdit::setSeparator(const QString &) \o Port to the new QDateTimeEdit API.
+\row \o void QDateEdit::setYear(int) \o Port to the new QDateTimeEdit API.
+\row \o void QDateTimeEdit::setAutoAdvance(bool) \o Port to the new QDateTimeEdit API.
+\row \o void QDateTimeEdit::setDateTime(const QDateTime &) \o Port to the new QDateTimeEdit API.
+\row \o void QDial::rangeChange() \o Reimplement QDial::sliderChange() instead.
+\row \o void QDial::repaintScreen(const QRect *) \o Reimplement QDial::paintEvent() instead.
+\row \o void QDial::setNotchTarget(double) \o Setter.
+\row \o void QDial::setNotchesVisible(bool) \o Setter.
+\row \o void QDial::setTracking(bool) \o Setter.
+\row \o void QDial::setValue(int) \o Use QDial::sliderChange() instead.
+\row \o void QDial::setWrapping(bool) \o Setter.
+\row \o void QDial::valueChange() \o Use QDial::sliderChange() instead.
+\row \o QString QDir::absFilePath(const QString &, bool) const \o Value type.
+\row \o QString QDir::absPath() const \o Value type.
+\row \o QString QDir::canonicalPath() const \o Value type.
+\row \o bool QDir::cd(const QString &, bool) \o Value type.
+\row \o bool QDir::cdUp() \o Value type.
+\row \o void QDir::convertToAbs() \o Value type.
+\row \o QString QDir::dirName() const \o Value type.
+\row \o QStrList QDir::encodedEntryList(int, int) const \o Value type.
+\row \o QStrList QDir::encodedEntryList(const QString &, int, int) const \o Value type.
+\row \o const QFileInfoList * QDir::entryInfoList(int, int) const \o Value type.
+\row \o const QFileInfoList * QDir::entryInfoList(const QString &, int, int) const \o Value type.
+\row \o QStringList QDir::entryList(const QString &, int, int) const \o Value type.
+\row \o QStringList QDir::entryList(int, int) const \o Value type.
+\row \o bool QDir::exists() const \o Value type.
+\row \o bool QDir::exists(const QString &, bool) \o Value type.
+\row \o QString QDir::filePath(const QString &, bool) const \o Value type.
+\row \o bool QDir::isReadable() const \o Value type.
+\row \o bool QDir::isRelative() const \o Value type.
+\row \o bool QDir::isRoot() const \o Value type.
+\row \o bool QDir::mkdir(const QString &, bool) const \o Value type.
+\row \o bool QDir::operator!=() const \o Value type.
+\row \o bool QDir::operator==() const \o Value type.
+\row \o QString QDir::path() const \o Value type.
+\row \o bool QDir::remove(const QString &, bool) \o Value type.
+\row \o bool QDir::rename(const QString &, const QString &, bool) \o Value type.
+\row \o bool QDir::rmdir(const QString &, bool) const \o Value type.
+\row \o void QDir::setFilter(int) \o Value type.
+\row \o void QDir::setMatchAllDirs(bool) \o Value type.
+\row \o void QDir::setNameFilter(const QString &) \o Value type.
+\row \o void QDir::setPath(const QString &) \o Value type.
+\row \o void QDir::setSorting(int) \o Value type.
+\row \o void QDns::setLabel(const QString &) \o Use Q3Dns instead.
+\row \o void QDns::setLabel(const QHostAddress &) \o Use Q3Dns instead.
+\row \o void QDns::setRecordType(RecordType) \o Use Q3Dns instead.
+\row \o void QDockWindow::dock() \o Use Q3DockWindow instead or port to the new QDockWidget API.
+\row \o void QDockWindow::setCloseMode(int) \o Use Q3DockWindow instead or port to the new QDockWidget API.
+\row \o void QDockWindow::setFixedExtentHeight(int) \o Use Q3DockWindow instead or port to the new QDockWidget API.
+\row \o void QDockWindow::setFixedExtentWidth(int) \o Use Q3DockWindow instead or port to the new QDockWidget API.
+\row \o void QDockWindow::setHorizontallyStretchable(bool) \o Use Q3DockWindow instead or port to the new QDockWidget API.
+\row \o void QDockWindow::setMovingEnabled(bool) \o Use Q3DockWindow instead or port to the new QDockWidget API.
+\row \o void QDockWindow::setNewLine(bool) \o Use Q3DockWindow instead or port to the new QDockWidget API.
+\row \o void QDockWindow::setOffset(int) \o Use Q3DockWindow instead or port to the new QDockWidget API.
+\row \o void QDockWindow::setOpaqueMoving(bool) \o Use Q3DockWindow instead or port to the new QDockWidget API.
+\row \o void QDockWindow::setOrientation(Orientation) \o Use Q3DockWindow instead or port to the new QDockWidget API.
+\row \o void QDockWindow::setResizeEnabled(bool) \o Use Q3DockWindow instead or port to the new QDockWidget API.
+\row \o void QDockWindow::setVerticallyStretchable(bool) \o Use Q3DockWindow instead or port to the new QDockWidget API.
+\row \o void QDockWindow::setWidget(QWidget *) \o Use Q3DockWindow instead or port to the new QDockWidget API.
+\row \o void QDockWindow::undock() \o Use Q3DockWindow instead or port to the new QDockWidget API.
+\row \o QString QDomAttr::name() const \o Value type.
+\row \o QDomElement QDomAttr::ownerElement() const \o Value type.
+\row \o void QDomAttr::setValue(const QString &) \o Value type.
+\row \o bool QDomAttr::specified() const \o Value type.
+\row \o QString QDomAttr::value() const \o Value type.
+\row \o void QDomCharacterData::appendData(const QString &) \o Value type.
+\row \o QString QDomCharacterData::data() const \o Value type.
+\row \o void QDomCharacterData::deleteData(unsigned, unsigned) \o Value type.
+\row \o void QDomCharacterData::insertData(unsigned, const QString &) \o Value type.
+\row \o uint QDomCharacterData::length() const \o Value type.
+\row \o void QDomCharacterData::replaceData(unsigned, unsigned, const QString &) \o Value type.
+\row \o void QDomCharacterData::setData(const QString &) \o Value type.
+\row \o QString QDomCharacterData::substringData(unsigned, unsigned) \o Value type.
+\row \o QDomNamedNodeMap QDomDocumentType::entities() const \o Value type.
+\row \o QString QDomDocumentType::internalSubset() const \o Value type.
+\row \o QString QDomDocumentType::name() const \o Value type.
+\row \o QDomNamedNodeMap QDomDocumentType::notations() const \o Value type.
+\row \o QString QDomDocumentType::publicId() const \o Value type.
+\row \o QString QDomDocumentType::systemId() const \o Value type.
+\row \o QDomNamedNodeMap QDomElement::attributes() const \o Value type.
+\row \o QDomNodeList QDomElement::elementsByTagName(const QString &) const \o Value type.
+\row \o QDomNodeList QDomElement::elementsByTagNameNS(const QString &, const QString &) const \o Value type.
+\row \o QString QDomEntity::notationName() const \o Value type.
+\row \o QString QDomEntity::publicId() const \o Value type.
+\row \o QString QDomEntity::systemId() const \o Value type.
+\row \o QDomDocument QDomImplementation::createDocument(const QString &, const QString &, const QDomDocumentType &) \o Value type.
+\row \o QDomDocumentType QDomImplementation::createDocumentType(const QString &, const QString &, const QString &) \o Value type.
+\row \o bool QDomImplementation::hasFeature(const QString &, const QString &) \o Value type.
+\row \o QDomImplementation::~QDomImplementation() \o Value type.
+\row \o QDomNode QDomNode::appendChild(const QDomNode &) \o Value type.
+\row \o QDomNamedNodeMap QDomNode::attributes() const \o Value type.
+\row \o QDomNodeList QDomNode::childNodes() const \o Value type.
+\row \o QDomNode QDomNode::cloneNode(bool) const \o Value type.
+\row \o QDomNode QDomNode::firstChild() const \o Value type.
+\row \o bool QDomNode::hasAttributes() const \o Value type.
+\row \o bool QDomNode::hasChildNodes() const \o Value type.
+\row \o QDomNode QDomNode::insertAfter(const QDomNode &, const QDomNode &) \o Value type.
+\row \o QDomNode QDomNode::insertBefore(const QDomNode &, const QDomNode &) \o Value type.
+\row \o bool QDomNode::isAttr() const \o Value type.
+\row \o bool QDomNode::isCDATASection() const \o Value type.
+\row \o bool QDomNode::isCharacterData() const \o Value type.
+\row \o bool QDomNode::isComment() const \o Value type.
+\row \o bool QDomNode::isDocument() const \o Value type.
+\row \o bool QDomNode::isDocumentFragment() const \o Value type.
+\row \o bool QDomNode::isDocumentType() const \o Value type.
+\row \o bool QDomNode::isElement() const \o Value type.
+\row \o bool QDomNode::isEntity() const \o Value type.
+\row \o bool QDomNode::isEntityReference() const \o Value type.
+\row \o bool QDomNode::isNotation() const \o Value type.
+\row \o bool QDomNode::isProcessingInstruction() const \o Value type.
+\row \o bool QDomNode::isSupported(const QString &, const QString &) const \o Value type.
+\row \o bool QDomNode::isText() const \o Value type.
+\row \o QDomNode QDomNode::lastChild() const \o Value type.
+\row \o QString QDomNode::localName() const \o Value type.
+\row \o QString QDomNode::namespaceURI() const \o Value type.
+\row \o QDomNode QDomNode::nextSibling() const \o Value type.
+\row \o QString QDomNode::nodeName() const \o Value type.
+\row \o QDomNode::NodeType QDomNode::nodeType() const \o Value type.
+\row \o QString QDomNode::nodeValue() const \o Value type.
+\row \o void QDomNode::normalize() \o Value type.
+\row \o QDomDocument QDomNode::ownerDocument() const \o Value type.
+\row \o QDomNode QDomNode::parentNode() const \o Value type.
+\row \o QString QDomNode::prefix() const \o Value type.
+\row \o QDomNode QDomNode::previousSibling() const \o Value type.
+\row \o QDomNode QDomNode::removeChild(const QDomNode &) \o Value type.
+\row \o QDomNode QDomNode::replaceChild(const QDomNode &, const QDomNode &) \o Value type.
+\row \o void QDomNode::setNodeValue(const QString &) \o Value type.
+\row \o void QDomNode::setPrefix(const QString &) \o Value type.
+\row \o QDomNode::~QDomNode() \o Value type.
+\row \o QDomNode QDomNodeList::item(int) const \o Value type.
+\row \o uint QDomNodeList::length() const \o Value type.
+\row \o QDomNodeList::~QDomNodeList() \o Value type.
+\row \o QString QDomProcessingInstruction::data() const \o Value type.
+\row \o void QDomProcessingInstruction::setData(const QString &) \o Value type.
+\row \o QString QDomProcessingInstruction::target() const \o Value type.
+\row \o int QEventLoop::enterLoop() \o Port to the new QAbstractEventDispatcher API.
+\row \o int QEventLoop::exec() \o Port to the new QAbstractEventDispatcher API.
+\row \o void QEventLoop::exit(int) \o Port to the new QAbstractEventDispatcher API.
+\row \o void QEventLoop::exitLoop() \o Port to the new QAbstractEventDispatcher API.
+\row \o bool QEventLoop::hasPendingEvents() const \o Port to the new QAbstractEventDispatcher API.
+\row \o int QEventLoop::loopLevel() const \o Port to the new QAbstractEventDispatcher API.
+\row \o bool QEventLoop::processEvents(ProcessEventsFlags) \o Port to the new QAbstractEventDispatcher API.
+\row \o void QEventLoop::registerSocketNotifier(QSocketNotifier *) \o Port to the new QAbstractEventDispatcher API.
+\row \o void QEventLoop::unregisterSocketNotifier(QSocketNotifier *) \o Port to the new QAbstractEventDispatcher API.
+\row \o void QEventLoop::wakeUp() \o Port to the new QAbstractEventDispatcher API.
+\row \o void QFrame::drawContents(QPainter *) \o Use Q3Frame or reimplement QFrame::paintEvent() instead.
+\row \o void QFrame::drawFrame(QPainter *) \o Use Q3Frame or reimplement QFrame::paintEvent() instead.
+\row \o void QFrame::frameChanged() \o Use Q3Frame or reimplement QFrame::resizeEvent() instead.
+\row \o void QFrame::setFrameRect(const QRect &) \o Setter.
+\row \o void QFrame::setFrameStyle(int) \o Setter.
+\row \o void QFrame::setLineWidth(int) \o Setter.
+\row \o void QFrame::setMargin(int) \o Setter.
+\row \o void QFrame::setMidLineWidth(int) \o Setter.
+\row \o void QGridLayout::setColStretch(int, int) \o Setter.
+\row \o void QGridLayout::setRowStretch(int, int) \o Setter.
+\row \o void QGroupBox::setAlignment(int) \o Setter.
+\row \o void QGroupBox::setColumnLayout(int, Orientation) \o Setter.
+\row \o void QGroupBox::setTitle(const QString &) \o Setter.
+\row \o QHostAddress::~QHostAddress() \o Value type.
+\row \o int QIODevice::getch() \o Port to the new QIODevice API.
+\row \o int QIODevice::putch(int) \o Port to the new QIODevice API.
+\row \o QByteArray QIODevice::readAll() \o Port to the new QIODevice API.
+\row \o Q_LONG QIODevice::readLine(char *, Q_ULONG) \o Port to the new QIODevice API.
+\row \o int QIODevice::ungetch(int) \o Port to the new QIODevice API.
+\row \o void QIcon::setPixmap(const QString &, Size, Mode, State) \o Value type.
+\row \o void QIcon::setPixmap(const QPixmap &, Size, Mode, State) \o Value type.
+\row \o QIcon::~QIcon() \o Value type.
+\row \o void QLabel::setAlignment(int) \o Setter.
+\row \o void QLabel::setAutoResize(bool) \o Setter.
+\row \o void QLabel::setBuddy(QWidget *) \o Setter.
+\row \o void QLabel::setMovie(const QMovie &) \o Setter.
+\row \o void QLabel::setNum(int) \o Setter.
+\row \o void QLabel::setNum(double) \o Setter.
+\row \o void QLabel::setPicture(const QPicture &) \o Setter.
+\row \o void QLabel::setPixmap(const QPixmap &) \o Setter.
+\row \o void QLabel::setText(const QString &) \o Setter.
+\row \o QLayoutIterator QLayout::iterator() \o Port to the new QLayout API.
+\row \o void QLayout::setAutoAdd(bool) \o Setter.
+\row \o void QLayout::setMargin(int) \o Setter.
+\row \o void QLayout::setMenuBar(QMenuBar *) \o Setter.
+\row \o void QLayout::setSpacing(int) \o Setter.
+\row \o QLayoutIterator QLayoutItem::iterator() \o Port to the new QLayoutItem API.
+\row \o void QLayoutItem::setAlignment(int) \o Setter.
+\row \o bool QLibrary::unload() \o Never used polymorphically in Qt.
+\row \o void QLineEdit::clear() \o Connect to QLineEdit::textChanged() instead.
+\row \o void QLineEdit::clearValidator() \o Never used polymorphically in Qt.
+\row \o void QLineEdit::copy() const \o Never used polymorphically in Qt.
+\row \o void QLineEdit::cut() \o Never used polymorphically in Qt.
+\row \o void QLineEdit::deselect() \o Connect to QLineEdit::selectionChanged() instead.
+\row \o void QLineEdit::insert(const QString &) \o Connect to QLineEdit::textChanged() instead.
+\row \o void QLineEdit::paste() \o Connect to QLineEdit::textChanged() instead.
+\row \o void QLineEdit::redo() \o Never used polymorphically in Qt.
+\row \o void QLineEdit::selectAll() \o Connect to QLineEdit::selectionChanged() instead.
+\row \o void QLineEdit::setAlignment(int) \o Setter.
+\row \o void QLineEdit::setCursorPosition(int) \o Connect to QLineEdit::cursorPositionChanged() instead.
+\row \o void QLineEdit::setDragEnabled(bool) \o Setter.
+\row \o void QLineEdit::setEchoMode(EchoMode) \o Setter.
+\row \o void QLineEdit::setFrame(bool) \o Setter.
+\row \o void QLineEdit::setMaxLength(int) \o Setter.
+\row \o void QLineEdit::setReadOnly(bool) \o Setter.
+\row \o void QLineEdit::setSelection(int, int) \o Connect to QLineEdit::selectionChanged() instead.
+\row \o void QLineEdit::setText(const QString &) \o Connect to QLineEdit::textChanged() instead.
+\row \o void QLineEdit::setValidator(const QValidator *) \o Setter.
+\row \o void QLineEdit::undo() \o Never used in a polymorphic way by Qt.
+\row \o void QMainWindow::addDockWindow(QDockWindow *, Dock, bool) \o Port to the new QMainWindow API.
+\row \o void QMainWindow::addDockWindow(QDockWindow *, const QString &, Dock, bool) \o Port to the new QMainWindow API.
+\row \o void QMainWindow::customize() \o Port to the new QMainWindow API.
+\row \o bool QMainWindow::isCustomizable() const \o Port to the new QMainWindow API.
+\row \o void QMainWindow::moveDockWindow(QDockWindow *, Dock) \o Port to the new QMainWindow API.
+\row \o void QMainWindow::moveDockWindow(QDockWindow *, Dock, bool, int, int) \o Port to the new QMainWindow API.
+\row \o void QMainWindow::removeDockWindow(QDockWindow *) \o Port to the new QMainWindow API.
+\row \o void QMainWindow::setAppropriate(QDockWindow *, bool) \o Port to the new QMainWindow API.
+\row \o void QMainWindow::setCentralWidget(QWidget *) \o Setter.
+\row \o void QMainWindow::setDockEnabled(QDockWindow *, Dock, bool) \o Port to the new QMainWindow API.
+\row \o void QMainWindow::setDockEnabled(Dock, bool) \o Port to the new QMainWindow API.
+\row \o void QMainWindow::setDockMenuEnabled(bool) \o Port to the new QMainWindow API.
+\row \o void QMainWindow::setDockWindowsMovable(bool) \o Port to the new QMainWindow API.
+\row \o void QMainWindow::setOpaqueMoving(bool) \o Port to the new QMainWindow API.
+\row \o void QMainWindow::setRightJustification(bool) \o Port to the new QMainWindow API.
+\row \o void QMainWindow::setUpLayout() \o Port to the new QMainWindow API.
+\row \o void QMainWindow::setUsesBigPixmaps(bool) \o Port to the new QMainWindow API.
+\row \o void QMainWindow::setUsesTextLabel(bool) \o Port to the new QMainWindow API.
+\row \o bool QMainWindow::showDockMenu(const QPoint &) \o Port to the new QMainWindow API.
+\row \o void QMenuBar::activateItemAt(int) \o Port to the new QMenuBar API.
+\row \o void QMenuBar::menuContentsChanged() \o Port to the new QMenuBar API.
+\row \o void QMenuBar::menuDelPopup(QPopupMenu *) \o Port to the new QMenuBar API.
+\row \o void QMenuBar::menuInsPopup(QPopupMenu *) \o Port to the new QMenuBar API.
+\row \o void QMenuBar::menuStateChanged() \o Port to the new QMenuBar API.
+\row \o void QMenuBar::setId(int, int) \o Port to the new QMenuBar API.
+\row \o void QMenuBar::setSeparator(Separator) \o Port to the new QMenuBar API.
+\row \o void QMenuBar::updateItem(int) \o Port to the new QMenuBar API.
+\row \o QMutex::~QMutex() \o Value type.
+\row \o bool QObject::checkConnectArgs(const char *, const QObject *, const char *) \o Reimplementing this function is no longer possible.
+\row \o const char * QObject::className() const \o Reimplementing this function is no longer supported.
+\row \o void QObject::insertChild(QObject *) \o Reimplement QObject::childEvent() instead and handle QEvent::ChildAdded events.
+\row \o QVariant QObject::property(const char *) const \o Reimplementing this function is no longer supported.
+\row \o void QObject::removeChild(QObject *) \o  Reimplement QObject::childEvent() instead and handle QEvent::ChildRemoved events.
+\row \o void QObject::setName(const char *) \o Setter.
+\row \o bool QObject::setProperty(const char *, const QVariant &) \o Setter.
+\row \o bool QPaintDevice::cmd(int , QPainter * , QPDevCmdParam *) \o Port to the new QPaintEngine API.
+\row \o Qt::HANDLE QPaintDevice::handle() const \o Port to the new QPaintDevice API.
+\row \o HDC QPaintDevice::handle() const \o Port to the new QPaintDevice API.
+\row \o void QPopupMenu::activateItemAt(int) \o Port to the new QMenu API.
+\row \o void QPopupMenu::menuContentsChanged() \o Port to the new QMenu API.
+\row \o void QPopupMenu::menuDelPopup(QPopupMenu *) \o Port to the new QMenu API.
+\row \o void QPopupMenu::menuInsPopup(QPopupMenu *) \o Port to the new QMenu API.
+\row \o void QPopupMenu::menuStateChanged() \o Port to the new QMenu API.
+\row \o void QPopupMenu::setActiveItem(int) \o Port to the new QMenu API.
+\row \o void QPopupMenu::setCheckable(bool) \o Port to the new QMenu API.
+\row \o void QPopupMenu::setId(int, int) \o Port to the new QMenu API.
+\row \o void QPopupMenu::updateItem(int) \o Port to the new QMenu API.
+\row \o int QPrinter::resolution() const \o Call QPrinter::setResolution() to change the resolution.
+\row \o void QPrinter::setColorMode(ColorMode) \o Subclass QPrintEngine instead.
+\row \o void QPrinter::setCreator(const QString &) \o Subclass QPrintEngine instead.
+\row \o void QPrinter::setDocName(const QString &) \o Subclass QPrintEngine instead.
+\row \o void QPrinter::setFromTo(int, int) \o Subclass QPrintEngine instead.
+\row \o void QPrinter::setFullPage(bool) \o Subclass QPrintEngine instead.
+\row \o void QPrinter::setMinMax(int, int) \o Subclass QPrintEngine instead.
+\row \o void QPrinter::setNumCopies(int) \o Subclass QPrintEngine instead.
+\row \o void QPrinter::setOrientation(Orientation) \o Subclass QPrintEngine instead.
+\row \o void QPrinter::setOutputFileName(const QString &) \o Subclass QPrintEngine instead.
+\row \o void QPrinter::setOutputToFile(bool) \o Subclass QPrintEngine instead.
+\row \o void QPrinter::setPageOrder(PageOrder) \o Subclass QPrintEngine instead.
+\row \o void QPrinter::setPageSize(PageSize) \o Subclass QPrintEngine instead.
+\row \o void QPrinter::setPaperSource(PaperSource) \o Subclass QPrintEngine instead.
+\row \o void QPrinter::setPrintProgram(const QString &) \o Subclass QPrintEngine instead.
+\row \o void QPrinter::setPrinterName(const QString &) \o Subclass QPrintEngine instead.
+\row \o void QPrinter::setPrinterSelectionOption(const QString &) \o Subclass QPrintEngine instead.
+\row \o void QPrinter::setResolution(int) \o Subclass QPrintEngine instead.
+\row \o void QProcess::addArgument(const QString &) \o Not used polymorphically in Qt.
+\row \o void QProcess::closeStdin() \o Not used polymorphically in Qt.
+\row \o bool QProcess::launch(const QByteArray & buf, QStringList *) \o Not used polymorphically in Qt.
+\row \o bool QProcess::launch(const QString & buf, QStringList *) \o Not used polymorphically in Qt.
+\row \o QString QProcess::readLineStderr() \o Not used polymorphically in Qt.
+\row \o QString QProcess::readLineStdout() \o Not used polymorphically in Qt.
+\row \o QByteArray QProcess::readStderr() \o Not used polymorphically in Qt.
+\row \o QByteArray QProcess::readStdout() \o Not used polymorphically in Qt.
+\row \o void QProcess::setArguments(const QStringList &) \o Not used polymorphically in Qt.
+\row \o void QProcess::setWorkingDirectory(const QDir &) \o Not used polymorphically in Qt.
+\row \o bool QProcess::start(QStringList *) \o Not used polymorphically in Qt.
+\row \o void QProcess::writeToStdin(const QByteArray &) \o Not used polymorphically in Qt.
+\row \o bool QProgressBar::setIndicator(QString &, int, int) \o Not used polymorphically in Qt.
+\row \o void QProgressBar::setProgress(int) \o Not used polymorphically in Qt.
+\row \o void QProgressBar::setTotalSteps(int) \o Not used polymorphically in Qt.
+\row \o void QPushButton::setAutoDefault(bool) \o Not used polymorphically in Qt.
+\row \o void QPushButton::setDefault(bool) \o Not used polymorphically in Qt.
+\row \o void QPushButton::setIsMenuButton(bool) \o Not used polymorphically in Qt.
+\row \o void QPushButton::setOn(bool) \o Connect to QPushButton::toggled(bool) instead.
+\row \o void QRadioButton::setChecked(bool) \o Connect to QRadioButton::toggled(bool) instead.
+\row \o uchar * QScreen::cache(int , int) \o Port to the new QScreen API.
+\row \o void QScreen::set(unsigned int , unsigned int , unsigned int , unsigned) \o Port to the new QScreen API.
+\row \o void QScreen::uncache(uchar *) \o Port to the new QScreen API.
+\row \o void QScrollBar::setOrientation(Orientation) \o Setter.
+\row \o void QScrollBar::setTracking(bool) \o Setter.
+\row \o void QSignalMapper::setMapping(const QObject *, const QString &) \o Setter.
+\row \o void QSignalMapper::setMapping(const QObject *, int) \o Setter.
+\row \o void QSlider::rangeChange() \o Reimplement QSlider::sliderChange() instead.
+\row \o void QSlider::setOrientation(Orientation) \o Setter.
+\row \o void QSlider::setPalette(const QPalette &) \o Setter.
+\row \o void QSlider::setTickInterval(int) \o Setter.
+\row \o void QSlider::setTickmarks(TickSetting) \o Setter.
+\row \o void QSlider::setTracking(bool) \o Setter.
+\row \o void QSlider::setValue(int) \o Reimplement QSlider::sliderChange() instead.
+\row \o void QSlider::valueChange() \o Reimplement QSlider::sliderChange() instead.
+\row \o QString QSpinBox::cleanText() const \o Port to the new QSpinBox API.
+\row \o void QSpinBox::interpretText() \o Port to the new QSpinBox API.
+\row \o QString QSpinBox::prefix() const \o Port to the new QSpinBox API.
+\row \o void QSpinBox::rangeChange() \o Reimplement QSpinBox::sliderChange() instead.
+\row \o void QSpinBox::selectAll() \o Port to the new QSpinBox API.
+\row \o void QSpinBox::setButtonSymbols(ButtonSymbols) \o Setter.
+\row \o void QSpinBox::setPrefix(const QString &) \o Setter.
+\row \o void QSpinBox::setSpecialValueText(const QString &) \o Setter.
+\row \o void QSpinBox::setSuffix(const QString &) \o Setter.
+\row \o void QSpinBox::setValidator(const QValidator *) \o Setter.
+\row \o void QSpinBox::setValue(int) \o Connect to QSpinBox::valueChanged().
+\row \o void QSpinBox::setWrapping(bool) \o Setter.
+\row \o void QSpinBox::stepDown() \o Reimplement QSpinBox::stepBy() instead.
+\row \o void QSpinBox::stepUp() \o Reimplement QSpinBox::stepBy() instead.
+\row \o QString QSpinBox::suffix() const \o Port to the new QSpinBox API.
+\row \o void QSpinBox::updateDisplay() \o Port to the new QSpinBox API.
+\row \o void QSpinBox::valueChange() \o Reimplement QSpinBox::sliderChange() instead.
+\row \o void QSplitter::drawSplitter(QPainter *, QCOORD, QCOORD, QCOORD, QCOORD) \o Reimplement QStyle::drawPrimitive() instead and handle QStyle::PE_Splitter.
+\row \o void QSplitter::setOpaqueResize(bool) \o Setter.
+\row \o void QSplitter::setOrientation(Orientation) \o Setter.
+\row \o void QSplitter::setResizeMode(QWidget *, ResizeMode) \o Setter.
+\row \o void QSqlDatabase::setDatabaseName(const QString &) \o Setter.
+\row \o void QSqlDatabase::setHostName(const QString &) \o Setter.
+\row \o void QSqlDatabase::setPassword(const QString &) \o Setter.
+\row \o void QSqlDatabase::setPort(int) \o Setter.
+\row \o void QSqlDatabase::setUserName(const QString &) \o Setter.
+\row \o QSqlQuery QSqlDriver::createQuery() const \o Port to the new QSqlDriver API.
+\row \o QString QSqlDriver::nullText() const \o Port to the new QSqlDriver API.
+\row \o QSqlRecord QSqlDriver::record(const QSqlQuery &) const \o Port to the new QSqlDriver API.
+\row \o QSqlRecordInfo QSqlDriver::recordInfo(const QSqlQuery &) const \o Port to the new QSqlDriver API.
+\row \o QSqlRecordInfo QSqlDriver::recordInfo(const QString &) const \o Port to the new QSqlDriver API.
+\row \o void QSqlError::setDatabaseText(const QString &) \o Value type.
+\row \o void QSqlError::setDriverText(const QString &) \o Value type.
+\row \o void QSqlError::setNumber(int) \o Value type.
+\row \o void QSqlError::setType(int) \o Value type.
+\row \o QSqlError::~QSqlError() \o Value type.
+\row \o void QSqlField::setName(const QString &) \o Value type.
+\row \o void QSqlField::setNull() \o Value type.
+\row \o void QSqlField::setReadOnly(bool) \o Value type.
+\row \o void QSqlField::setValue(const QVariant &) \o Value type.
+\row \o QVariant QSqlField::value() const \o Value type.
+\row \o QSqlField::~QSqlField() \o Value type.
+\row \o void QSqlFieldInfo::setCalculated(bool) \o Value type.
+\row \o void QSqlFieldInfo::setGenerated(bool) \o Value type.
+\row \o void QSqlFieldInfo::setTrim(bool) \o Value type.
+\row \o QSqlFieldInfo::~QSqlFieldInfo() \o Value type.
+\row \o void QSqlIndex::append(const QSqlField &) \o Value type.
+\row \o void QSqlIndex::append(const QSqlField &, bool) \o Value type.
+\row \o void QSqlIndex::setCursorName(const QString &) \o Value type.
+\row \o void QSqlIndex::setDescending(int, bool) \o Value type.
+\row \o void QSqlIndex::setName(const QString &) \o Value type.
+\row \o QVariant QSqlQuery::value(int) const \o Exists as a non-virtual function.
+\row \o void QSqlRecord::append(const QSqlField &) \o Value type.
+\row \o void QSqlRecord::clear() \o Value type.
+\row \o void QSqlRecord::clearValues(bool) \o Value type.
+\row \o void QSqlRecord::insert(int, const QSqlField &) \o Value type.
+\row \o void QSqlRecord::remove(int) \o Value type.
+\row \o void QSqlRecord::setGenerated(const QString &, bool) \o Value type.
+\row \o void QSqlRecord::setGenerated(int, bool) \o Value type.
+\row \o void QSqlRecord::setNull(int) \o Value type.
+\row \o void QSqlRecord::setNull(const QString &) \o Value type.
+\row \o void QSqlRecord::setValue(const QString &, const QVariant &) \o Value type.
+\row \o void QSqlRecord::setValue(int, const QVariant &) \o Value type.
+\row \o QString QSqlRecord::toString(const QString &, const QString &) const \o Value type.
+\row \o QStringList QSqlRecord::toStringList(const QString &) const \o Value type.
+\row \o QVariant QSqlRecord::value(int) const \o Value type.
+\row \o QVariant QSqlRecord::value(const QString &) const \o Value type.
+\row \o QSqlRecord::~QSqlRecord() \o Value type.
+\row \o void QStyle::polishPopupMenu(QPopupMenu *) \o Reimplement QStyle::polish(QWidget *) instead.
+\row \o int QTabBar::addTab(QTab *) \o Reimplement QTabBar::tabInserted() instead.
+\row \o int QTabBar::insertTab(QTab *, int) \o Reimplement QTabBar::tabInserted() instead.
+\row \o void QTabBar::layoutTabs() \o Reimplement QTabBar::tabLayoutChange() instead.
+\row \o void QTabBar::paint(QPainter *, QTab *, bool) const \o Reimplement QTabBar::paintEvent() instead.
+\row \o void QTabBar::paintLabel(QPainter *, const QRect &, QTab *, bool) const \o Reimplement QTabBar::paintEvent() instead.
+\row \o void QTabBar::removeTab(QTab *) \o Reimplement QTabBar::tabRemoved() instead.
+\row \o QTab * QTabBar::selectTab(const QPoint &) const \o Reimplement QTabBar::mousePressEvent() instead.
+\row \o void QTabBar::setCurrentTab(int) \o Connect to the QTabBar::currentChanged() signal.
+\row \o void QTabBar::setCurrentTab(QTab *) \o Connect to the QTabBar::currentChanged() signal.
+\row \o void QTabBar::setShape(Shape) \o Setter.
+\row \o void QTabBar::setTabEnabled(int, bool) \o Setter.
+\row \o void QTabWidget::addTab(QWidget *, const QString &) \o Reimplement QTabWidget::tabInserted() instead.
+\row \o void QTabWidget::addTab(QWidget *, const QIcon &, const QString &) \o Reimplement QTabWidget::tabInserted() instead.
+\row \o void QTabWidget::addTab(QWidget *, QTab *) \o Reimplement QTabWidget::tabInserted() instead.
+\row \o void QTabWidget::insertTab(QWidget *, const QIcon &, const QString &, int) \o Reimplement QTabWidget::tabInserted() instead.
+\row \o void QTabWidget::insertTab(QWidget *, const QString &, int) \o Reimplement QTabWidget::tabInserted() instead.
+\row \o void QTabWidget::insertTab(QWidget *, QTab *, int) \o Reimplement QTabWidget::tabInserted() instead.
+\row \o void QTabWidget::removePage(QWidget *) \o Reimplement QTabWidget::tabRemoved() instead.
+\row \o void QTabWidget::showPage(QWidget *) \o Connect to QTabWidget::currentChanged() instead.
+\row \o void QTextEdit::append(const QString &) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::clear() \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::clearParagraphBackground(int) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::copy() \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o QPopupMenu * QTextEdit::createPopupMenu(const QPoint &) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o QPopupMenu * QTextEdit::createPopupMenu() \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::cut() \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::del() \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::doKeyboardAction(KeyboardAction) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::ensureCursorVisible() \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o bool QTextEdit::find(const QString &, bool, bool, bool, int *, int *) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o bool QTextEdit::focusNextPrevChild(bool) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o int QTextEdit::heightForWidth(int) const \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::insert(const QString &, bool, bool, bool) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::insertAt(const QString &, int, int) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::insertParagraph(const QString &, int) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::moveCursor(CursorAction, bool) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::paste() \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::pasteSubType(const QCString &) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::placeCursor(const QPoint &, QTextCursor *) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::redo() \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::removeParagraph(int) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::removeSelectedText(int) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::removeSelection(int) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::scrollToAnchor(const QString &) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::scrollToBottom() \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::selectAll(bool) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setAlignment(int) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setBold(bool) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setColor(const QColor &) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setCurrentFont(const QFont &) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setCursorPosition(int, int) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setFamily(const QString &) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setItalic(bool) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setLinkUnderline(bool) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setMimeSourceFactory(QMimeSourceFactory *) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setModified(bool) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setOverwriteMode(bool) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setPaper(const QBrush &) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setParagraphBackgroundColor(int, const QColor &) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setPointSize(int) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setReadOnly(bool) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setSelection(int, int, int, int, int) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setSelectionAttributes(int, const QColor &, bool) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setStyleSheet(QStyleSheet *) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setTabStopWidth(int) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setText(const QString &, const QString &) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setTextFormat(TextFormat) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setUnderline(bool) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setUndoDepth(int) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setUndoRedoEnabled(bool) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setVerticalAlignment(VerticalAlignment) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setWordWrap(WordWrap) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setWrapColumnOrWidth(int) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::setWrapPolicy(WrapPolicy) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::sync() \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::undo() \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::zoomIn() \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::zoomIn(int) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::zoomOut(int) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::zoomOut() \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o void QTextEdit::zoomTo(int) \o Use Q3TextEdit or port to the new QTextEdit API.
+\row \o QString QTimeEdit::sectionFormattedText(int) \o Port to the new QDateTimeEdit API.
+\row \o void QTimeEdit::setAutoAdvance(bool) \o Port to the new QDateTimeEdit API.
+\row \o void QTimeEdit::setHour(int) \o Port to the new QDateTimeEdit API.
+\row \o void QTimeEdit::setMaxValue(const QTime &) \o Port to the new QDateTimeEdit API.
+\row \o void QTimeEdit::setMinValue(const QTime &) \o Port to the new QDateTimeEdit API.
+\row \o void QTimeEdit::setMinute(int) \o Port to the new QDateTimeEdit API.
+\row \o void QTimeEdit::setRange(const QTime &, const QTime &) \o Port to the new QDateTimeEdit API.
+\row \o void QTimeEdit::setSecond(int) \o Port to the new QDateTimeEdit API.
+\row \o void QTimeEdit::setSeparator(const QString &) \o Port to the new QDateTimeEdit API.
+\row \o void QTimeEdit::setTime(const QTime &) \o Port to the new QDateTimeEdit API.
+\row \o void QToolBar::clear() \o Setter.
+\row \o void QToolBar::setLabel(const QString &) \o Setter.
+\row \o void QToolBar::setStretchableWidget(QWidget *) \o Setter.
+\row \o void QToolButton::setIconSet(const QIcon &) \o Setter.
+\row \o void QToolButton::setOn(bool) \o Connect to QToolButton::toggled(bool) instead.
+\row \o void QToolButton::setTextLabel(const QString &, bool) \o Setter.
+\row \o void QToolButton::setToggleButton(bool) \o Setter.
+\row \o void QToolButton::setUsesBigPixmap(bool) \o Setter.
+\row \o void QToolButton::setUsesTextLabel(bool) \o Setter.
+\row \o void QToolTip::maybeTip(const QPoint &) \o Port to the new QToolTip API.
+\row \o void QUrl::addPath(const QString &) \o Value type.
+\row \o bool QUrl::cdUp() \o Value type.
+\row \o bool QUrl::parse(const QString &) \o Value type.
+\row \o void QUrl::reset() \o Value type.
+\row \o void QUrl::setEncodedPathAndQuery(const QString &) \o Value type.
+\row \o void QUrl::setFileName(const QString &) \o Value type.
+\row \o void QUrl::setHost(const QString &) \o Value type.
+\row \o void QUrl::setPassword(const QString &) \o Value type.
+\row \o void QUrl::setPath(const QString &) \o Value type.
+\row \o void QUrl::setPort(int) \o Value type.
+\row \o void QUrl::setProtocol(const QString &) \o Value type.
+\row \o void QUrl::setQuery(const QString &) \o Value type.
+\row \o void QUrl::setRef(const QString &) \o Value type.
+\row \o void QUrl::setUser(const QString &) \o Value type.
+\row \o QString QUrl::toString(bool, bool) const \o Value type.
+\row \o QUrl::~QUrl() \o Value type.
+\row \o QWaitCondition::~QWaitCondition() \o Value type.
+\row \o bool QWhatsThis::clicked(const QString &) \o Port to the new QWhatsThis API.
+\row \o QString QWhatsThis::text(const QPoint &) \o Port to the new QWhatsThis API.
+\row \o QWhatsThis::~QWhatsThis() \o Port to the new QWhatsThis API.
+\row \o void QWidget::adjustSize() \o Reimplement QWidget::sizeHint() instead.
+\row \o bool QWidget::close(bool) \o Reimplement QWidget::closeEvent().
+\row \o void QWidget::create(WId, bool, bool) \o Not supported in Qt 4.
+\row \o bool QWidget::customWhatsThis() const \o Not supported in Qt 4.
+\row \o void QWidget::destroy(bool, bool) \o Not supported in Qt 4.
+\row \o void QWidget::enabledChange(bool) \o Reimplement QWidget::changeEvent() and handle QEvent::EnabledChange.
+\row \o void QWidget::fontChange(const QFont &) \o Reimplement QWidget::changeEvent() and handle QEvent::FontChange.
+\row \o void QWidget::imComposeEvent(QIMEvent *) \o Reimplement QWidget::inputMethodEvent() instead.
+\row \o void QWidget::imEndEvent(QIMEvent *) \o Reimplement QWidget::inputMethodEvent() instead.
+\row \o void QWidget::imStartEvent(QIMEvent *) \o Reimplement QWidget::inputMethodEvent() instead.
+\row \o void QWidget::move(int, int) \o Setter.
+\row \o void QWidget::paletteChange(const QPalette &) \o Reimplement QWidget::changeEvent() and handle QEvent::PaletteChange and/or QEvent::ApplicationPaletteChange.
+\row \o void QWidget::polish() \o Reimplement event() and handle the QEvent::Polish event type.
+\row \o void QWidget::reparent(QWidget *, WFlags, const QPoint &, bool) \o Reimplement QWidget::event() and handle QEvent::Reparent.
+\row \o void QWidget::resize(int, int) \o Reimplement QWidget::resizeEvent() instead.
+\row \o void QWidget::setAcceptDrops(bool) \o Setter.
+\row \o void QWidget::setActiveWindow() \o Reimplement QWidget::changeEvent() and handle QEvent::ActivationChange.
+\row \o void QWidget::setAutoMask(bool) \o Setter.
+\row \o void QWidget::setBackgroundColor(const QColor &) \o Setter.
+\row \o void QWidget::setBackgroundMode(BackgroundMode) \o Setter.
+\row \o void QWidget::setBackgroundOrigin(BackgroundOrigin) \o Setter.
+\row \o void QWidget::setBackgroundPixmap(const QPixmap &) \o Setter.
+\row \o void QWidget::setCaption(const QString &) \o Reimplement QWidget::changeEvent() and handle QEvent::WindowTitleChange.
+\row \o void QWidget::setCursor(const QCursor &) \o Setter.
+\row \o void QWidget::setEnabled(bool) \o Reimplement QWidget::changeEvent() and handle QEvent::EnabledChange.
+\row \o void QWidget::setEraseColor(const QColor &) \o Setter.
+\row \o void QWidget::setErasePixmap(const QPixmap &) \o Setter.
+\row \o void QWidget::setFocus() \o Reimplement QWidget::focusInEvent() or QWidget::focusOutEvent().
+\row \o void QWidget::setFocusPolicy(FocusPolicy) \o Setter.
+\row \o void QWidget::setFocusProxy(QWidget *) \o Setter.
+\row \o void QWidget::setFont(const QFont &) \o Reimplement QWidget::changeEvent() and handle QEvent::FontChange and/or QEvent::ApplicationFontChange.
+\row \o void QWidget::setGeometry(int, int, int, int) \o Setter.
+\row \o void QWidget::setGeometry(const QRect &) \o Setter.
+\row \o void QWidget::setIcon(const QPixmap &) \o Reimplement QWidget::changeEvent() and handle QEvent::WindowIconChange.
+\row \o void QWidget::setIconText(const QString &) \o Reimplement QWidget::changeEvent() and handle QEvent::IconTextChange.
+\row \o void QWidget::setKeyCompression(bool) \o Setter.
+\row \o void QWidget::setMask(const QRegion &) \o Setter.
+\row \o void QWidget::setMask(const QBitmap &) \o Setter.
+\row \o void QWidget::setMaximumSize(int, int) \o Setter.
+\row \o void QWidget::setMicroFocusHint(int, int, int, int, bool, QFont *) \o Setter.
+\row \o void QWidget::setMinimumSize(int, int) \o Setter.
+\row \o void QWidget::setMouseTracking(bool) \o Reimplement QWidget::changeEvent() and handle QEvent::MouseTrackingChange.
+\row \o void QWidget::setPalette(const QPalette &) \o Reimplement QWidget::changeEvent() and handle QEvent::PaletteChange and/or QEvent::ApplicationPaletteChange.
+\row \o void QWidget::setPaletteBackgroundColor(const QColor &) \o Setter.
+\row \o void QWidget::setPaletteBackgroundPixmap(const QPixmap &) \o Setter.
+\row \o void QWidget::setSizeIncrement(int, int) \o Setter.
+\row \o void QWidget::setSizePolicy(QSizePolicy) \o Setter.
+\row \o void QWidget::setUpdatesEnabled(bool) \o Setter.
+\row \o void QWidget::setWFlags(WFlags) \o Setter.
+\row \o void QWidget::show() \o Reimplement QWidget::showEvent().
+\row \o void QWidget::showMaximized() \o Reimplement QWidget::changeEvent() and handle QEvent::WindowStateChange.
+\row \o void QWidget::showMinimized() \o Reimplement QWidget::changeEvent() and handle QEvent::WindowStateChange.
+\row \o void QWidget::showNormal() \o Reimplement QWidget::changeEvent() and handle QEvent::WindowStateChange.
+\row \o void QWidget::styleChange(QStyle &) \o Reimplement QWidget::changeEvent() and handle QEvent::StyleChange.
+\row \o void QWidget::unsetCursor() \o Setter.
+\row \o void QWidget::windowActivationChange(bool) \o Reimplement QWidget::changeEvent() and handle QEvent::ActivationChange.
diff --git a/doc/src/porting4-renamedclasses.qdocinc b/doc/src/porting4-renamedclasses.qdocinc
new file mode 100644
index 0000000000..ef315a1567
--- /dev/null
+++ b/doc/src/porting4-renamedclasses.qdocinc
@@ -0,0 +1,3 @@
+\row \o QIconSet \o QIcon
+\row \o QWMatrix \o QMatrix
+\row \o QGuardedPtr \o QPointer
diff --git a/doc/src/porting4-renamedenumvalues.qdocinc b/doc/src/porting4-renamedenumvalues.qdocinc
new file mode 100644
index 0000000000..9519da1bfe
--- /dev/null
+++ b/doc/src/porting4-renamedenumvalues.qdocinc
@@ -0,0 +1,234 @@
+\row \o IO_Append \o QIODevice::Append
+\row \o IO_ReadOnly \o QIODevice::ReadOnly
+\row \o IO_ReadWrite \o QIODevice::ReadWrite
+\row \o IO_Translate \o QIODevice::Text
+\row \o IO_Truncate \o QIODevice::Truncate
+\row \o IO_WriteOnly \o QIODevice::WriteOnly
+\row \o IO_Raw \o QIODevice::Unbuffered
+\row \o QAccessible::Moveable \o QAccessible::Movable
+\row \o QApplication::CustomColors \o QApplication::CustomColor
+\row \o QApplication::NormalColors \o QApplication::NormalColor
+\row \o QButton::NoChange \o QCheckBox::NoChange
+\row \o QButton::Off \o QCheckBox::Off
+\row \o QButton::On \o QCheckBox::On
+\row \o QChar::Single \o QChar::NoDecomposition
+\row \o QChar::byteOrderMark \o QChar::ByteOrderMark
+\row \o QChar::byteOrderSwapped \o QChar::ByteOrderSwapped
+\row \o QChar::nbsp \o QChar::Nbsp
+\row \o QChar::null \o QChar::Null
+\row \o QChar::replacement \o QChar::ReplacementCharacter
+\row \o QComboBox::AfterCurrent \o QComboBox::InsertAfterCurrent
+\row \o QComboBox::AtBottom \o QComboBox::InsertAtBottom
+\row \o QComboBox::AtCurrent \o QComboBox::InsertAtCurrent
+\row \o QComboBox::AtTop \o QComboBox::InsertAtTop
+\row \o QComboBox::BeforeCurrent \o QComboBox::InsertBeforeCurrent
+\row \o QComboBox::NoInsertion \o QComboBox::NoInsert
+\row \o QDir::DefaultFilter \o QDir::NoFilter
+\row \o QDir::DefaultSort \o QDir::NoSort
+\row \o QEvent::Accel \o QEvent::Shortcut
+\row \o QEvent::AccelOverride \o QEvent::ShortcutOverride
+\row \o QEvent::CaptionChange \o QEvent::WindowTitleChange
+\row \o QEvent::ChildInserted \o QEvent::ChildAdded
+\row \o QEvent::IMCompose \o QEvent::InputMethodCompose
+\row \o QEvent::IMEnd \o QEvent::InputMethodEnd
+\row \o QEvent::IMStart \o QEvent::InputMethodStart
+\row \o QEvent::IconChange \o QEvent::WindowIconChange
+\row \o QEvent::LayoutHint \o QEvent::LayoutRequest
+\row \o QEvent::Reparent \o QEvent::ParentChange
+\row \o QFileInfo::ExeGroup \o QFile::ExeGroup
+\row \o QFileInfo::ExeOther \o QFile::ExeOther
+\row \o QFileInfo::ExeOwner \o QFile::ExeOwner
+\row \o QFileInfo::ExeUser \o QFile::ExeUser
+\row \o QFileInfo::ReadGroup \o QFile::ReadGroup
+\row \o QFileInfo::ReadOther \o QFile::ReadOther
+\row \o QFileInfo::ReadOwner \o QFile::ReadOwner
+\row \o QFileInfo::ReadUser \o QFile::ReadUser
+\row \o QFileInfo::WriteGroup \o QFile::WriteGroup
+\row \o QFileInfo::WriteOther \o QFile::WriteOther
+\row \o QFileInfo::WriteOwner \o QFile::WriteOwner
+\row \o QFileInfo::WriteUser \o QFile::WriteUser
+\row \o QFrame::GroupBoxPanel \o QFrame::StyledPanel
+\row \o QFrame::LineEditPanel \o QFrame::StyledPanel
+\row \o QFrame::MenuBarPanel \o QFrame::StyledPanel
+\row \o QFrame::PopupPanel \o QFrame::StyledPanel
+\row \o QFrame::TabWidgetPanel \o QFrame::StyledPanel
+\row \o QFrame::ToolBarPanel \o QFrame::StyledPanel
+\row \o QImage::ScaleFree \o Qt::IgnoreAspectRatio
+\row \o QImage::ScaleMax \o Qt::KeepAspectRatioByExpanding
+\row \o QImage::ScaleMin \o Qt::KeepAspectRatio
+\row \o Qt::Identical \o QKeySequence::ExactMatch
+\row \o Qt::NoMatch \o QKeySequence::NoMatch
+\row \o Qt::PartialMatch \o QKeySequence::PartialMatch
+\row \o QLayout::Auto \o QLayout::SetDefaultConstraint
+\row \o QLayout::Fixed \o QLayout::SetFixedSize
+\row \o QLayout::FreeResize \o QLayout::SetNoConstraint
+\row \o QLayout::Minimum \o QLayout::SetMinimumSize
+\row \o QMacStyle::SizeNone \o QMacStyle::SizeDefault
+\row \o QSettings::Global \o QSettings::SystemScope
+\row \o QSettings::User \o QSettings::UserScope
+\row \o QSize::ScaleFree \o Qt::IgnoreAspectRatio
+\row \o QSize::ScaleMax \o Qt::KeepAspectRatioByExpanding
+\row \o QSize::ScaleMin \o Qt::KeepAspectRatio
+\row \o QSizePolicy::Horizontal \o QSizePolicy::Horizontally
+\row \o QSizePolicy::Vertical \o QSizePolicy::Vertically
+\row \o QSlider::Above \o QSlider::TicksAbove
+\row \o QSlider::Below \o QSlider::TicksBelow
+\row \o QSlider::Both \o QSlider::TicksBothSides
+\row \o QSlider::Left \o QSlider::TicksLeft
+\row \o QSlider::NoMarks \o QSlider::NoTicks
+\row \o QSlider::Right \o QSlider::TicksRight
+\row \o QSocket::Closing \o Q3Socket::Closing
+\row \o QSocket::Connected \o Q3Socket::Connected
+\row \o QSocket::Connecting \o Q3Socket::Connecting
+\row \o QSocket::Connection \o Q3Socket::Connection
+\row \o QSocket::ErrConnectionRefused \o Q3Socket::ErrConnectionRefused
+\row \o QSocket::ErrHostNotFound \o Q3Socket::ErrHostNotFound
+\row \o QSocket::ErrSocketRead \o Q3Socket::ErrSocketRead
+\row \o QSocket::HostLookup \o QAbstractSocket::HostLookupState
+\row \o QSocket::Idle \o QAbstractSocket::UnconnectedState
+\row \o QSqlError::Connection \o QSqlError::ConnectionError
+\row \o QSqlError::None \o QSqlError::NoError
+\row \o QSqlError::Statement \o QSqlError::StatementError
+\row \o QSqlError::Transaction \o QSqlError::TransactionError
+\row \o QSqlError::Unknown \o QSqlError::UnknownError
+\row \o QStyle::CC_ListView \o QStyle::CC_Q3ListView
+\row \o QStyle::SH_UnderlineAccelerator \o QStyle::SH_UnderlineShortcut
+\row \o QStyle::Style_Active \o QStyle::State_Active 
+\row \o QStyle::Style_AutoRaise \o QStyle::State_AutoRaise 
+\row \o QStyle::Style_Bottom \o QStyle::State_Bottom 
+\row \o QStyle::Style_Children \o QStyle::State_Children 
+\row \o QStyle::Style_Default \o QStyle::State_None 
+\row \o QStyle::Style_Down \o QStyle::State_DownArrow 
+\row \o QStyle::Style_Editing \o QStyle::State_Editing 
+\row \o QStyle::Style_Enabled \o QStyle::State_Enabled 
+\row \o QStyle::Style_FocusAtBorder \o QStyle::State_FocusAtBorder 
+\row \o QStyle::Style_HasFocus \o QStyle::State_HasFocus 
+\row \o QStyle::Style_Horizontal \o QStyle::State_Horizontal 
+\row \o QStyle::Style_Item \o QStyle::State_Item 
+\row \o QStyle::Style_MouseOver \o QStyle::State_MouseOver 
+\row \o QStyle::Style_NoChange \o QStyle::State_NoChange 
+\row \o QStyle::Style_None    \o QStyle::State_None    
+\row \o QStyle::Style_Off \o QStyle::State_Off 
+\row \o QStyle::Style_On \o QStyle::State_On 
+\row \o QStyle::Style_Open \o QStyle::State_Open 
+\row \o QStyle::Style_Raised \o QStyle::State_Raised 
+\row \o QStyle::Style_Rectangle \o QStyle::State_Rectangle 
+\row \o QStyle::Style_Selected \o QStyle::State_Selected 
+\row \o QStyle::Style_Sibling \o QStyle::State_Sibling 
+\row \o QStyle::Style_Sunken \o QStyle::State_Sunken 
+\row \o QStyle::Style_Top \o QStyle::State_Top 
+\row \o QStyle::Style_Up \o QStyle::State_Up 
+\row \o QTabBar::RoundedAbove \o QTabBar::RoundedNorth
+\row \o QTabBar::RoundedBelow \o QTabBar:: RoundedSouth
+\row \o QTabBar::TriangularAbove \o QTabBar:: TriangularNorth
+\row \o QTabBar::TriangularBelow \o QTabBar:: TriangularSouth
+\row \o QTextEdit::MovePgDown \o QTextEdit::MovePageDown
+\row \o QTextEdit::MovePgUp \o QTextEdit::MovePageUp
+\row \o QToolButton::Right \o QToolButton::BesideIcon
+\row \o QToolButton::Under \o QToolButton::BelowIcon
+\row \o QValidator::Valid \o QValidator::Intermediate
+\row \o QVariant::IconSet \o QCoreVariant::Icon
+\row \o QWidget::ClickFocus \o Qt::ClickFocus
+\row \o QWidget::NoFocus \o Qt::NoFocus
+\row \o QWidget::StrongFocus \o Qt::StrongFocus
+\row \o QWidget::TabFocus \o Qt::TabFocus
+\row \o QWidget::WheelFocus \o Qt::WheelFocus
+\row \o Qt::AlignAuto \o Qt::AlignLeft
+\row \o Qt::AltButton \o Qt::AltModifier
+\row \o Qt::Ascending \o Qt::AscendingOrder
+\row \o Qt::Bottom \o Qt::DockBottom
+\row \o Qt::BottomLeft \o Qt::BottomLeftCorner
+\row \o Qt::BottomRight \o Qt::BottomRightCorner
+\row \o Qt::BreakAnywhere \o Qt::TextWrapAnywhere
+\row \o Qt::ControlButton \o Qt::ControlModifier
+\row \o Qt::CustomPattern \o Qt::TexturePattern
+\row \o Qt::Descending \o Qt::DescendingOrder
+\row \o Qt::DontClip \o Qt::TextDontClip
+\row \o Qt::DontPrint \o Qt::TextDontPrint
+\row \o Qt::ExpandTabs \o Qt::TextExpandTabs
+\row \o Qt::IncludeTrailingSpaces \o Qt::TextIncludeTrailingSpaces
+\row \o Qt::KeyButtonMask \o Qt::KeyboardModifierMask
+\row \o Qt::Key_BackSpace \o Qt::Key_Backspace
+\row \o Qt::Key_BackTab \o Qt::Key_Backtab
+\row \o Qt::Key_MediaPrev \o Qt::Key_MediaPrevious
+\row \o Qt::Key_Next \o Qt::Key_PageDown
+\row \o Qt::Key_Prior \o Qt::Key_PageUp
+\row \o Qt::Key_aacute \o Qt::Key_Aacute
+\row \o Qt::Key_acircumflex \o Qt::Key_Acircumflex
+\row \o Qt::Key_adiaeresis \o Qt::Key_Adiaeresis
+\row \o Qt::Key_ae \o Qt::Key_AE
+\row \o Qt::Key_agrave \o Qt::Key_Agrave
+\row \o Qt::Key_aring \o Qt::Key_Aring
+\row \o Qt::Key_atilde \o Qt::Key_Atilde
+\row \o Qt::Key_ccedilla \o Qt::Key_Ccedilla
+\row \o Qt::Key_eacute \o Qt::Key_Eacute
+\row \o Qt::Key_ecircumflex \o Qt::Key_Ecircumflex
+\row \o Qt::Key_ediaeresis \o Qt::Key_Ediaeresis
+\row \o Qt::Key_egrave \o Qt::Key_Egrave
+\row \o Qt::Key_eth \o Qt::Key_ETH
+\row \o Qt::Key_iacute \o Qt::Key_Iacute
+\row \o Qt::Key_icircumflex \o Qt::Key_Icircumflex
+\row \o Qt::Key_idiaeresis \o Qt::Key_Idiaeresis
+\row \o Qt::Key_igrave \o Qt::Key_Igrave
+\row \o Qt::Key_ntilde \o Qt::Key_Ntilde
+\row \o Qt::Key_oacute \o Qt::Key_Oacute
+\row \o Qt::Key_ocircumflex \o Qt::Key_Ocircumflex
+\row \o Qt::Key_odiaeresis \o Qt::Key_Odiaeresis
+\row \o Qt::Key_ograve \o Qt::Key_Ograve
+\row \o Qt::Key_oslash \o Qt::Key_Ooblique
+\row \o Qt::Key_otilde \o Qt::Key_Otilde
+\row \o Qt::Key_thorn \o Qt::Key_THORN
+\row \o Qt::Key_uacute \o Qt::Key_Uacute
+\row \o Qt::Key_ucircumflex \o Qt::Key_Ucircumflex
+\row \o Qt::Key_udiaeresis \o Qt::Key_Udiaeresis
+\row \o Qt::Key_ugrave \o Qt::Key_Ugrave
+\row \o Qt::Key_yacute \o Qt::Key_Yacute
+\row \o Qt::Keypad \o Qt::KeypadModifier
+\row \o Qt::Left \o Qt::DockLeft
+\row \o Qt::MV_10_DOT_0 \o QSysInfo::MV_10_0
+\row \o Qt::MV_10_DOT_1 \o QSysInfo::MV_10_1
+\row \o Qt::MV_10_DOT_2 \o QSysInfo::MV_10_2
+\row \o Qt::MV_10_DOT_3 \o QSysInfo::MV_10_3
+\row \o Qt::MV_10_DOT_4 \o QSysInfo::MV_10_4
+\row \o Qt::MV_9 \o QSysInfo::MV_9
+\row \o Qt::MV_CHEETAH \o QSysInfo::MV_10_0
+\row \o Qt::MV_JAGUAR \o QSysInfo::MV_10_2
+\row \o Qt::MV_PANTHER \o QSysInfo::MV_10_3
+\row \o Qt::MV_PUMA \o QSysInfo::MV_10_1
+\row \o Qt::MV_TIGER \o QSysInfo::MV_10_4
+\row \o Qt::MV_Unknown \o QSysInfo::MV_Unknown
+\row \o Qt::MetaButton \o Qt::MetaModifier
+\row \o Qt::Minimized \o Qt::DockMinimized
+\row \o Qt::NoAccel \o Qt::TextHideMnemonic
+\row \o Qt::Overline \o Qt::TextOverline
+\row \o Qt::Right \o Qt::DockRight
+\row \o Qt::ShiftButton \o Qt::ShiftModifier
+\row \o Qt::ShowPrefix \o Qt::TextShowMnemonic
+\row \o Qt::SingleLine \o Qt::TextSingleLine
+\row \o Qt::StrikeOut \o Qt::TextStrikeOut
+\row \o Qt::Top \o Qt::DockTop
+\row \o Qt::TopLeft \o Qt::TopLeftCorner
+\row \o Qt::TopRight \o Qt::TopRightCorner
+\row \o Qt::TornOff \o Qt::DockTornOff
+\row \o Qt::Underline \o Qt::TextUnderline
+\row \o Qt::Unmanaged \o Qt::DockUnmanaged
+\row \o Qt::WNorthWestGravity \o Qt::WStaticContents
+\row \o Qt::WRepaintNoErase \o Qt::WNoAutoErase
+\row \o Qt::WStyle_Dialog \o Qt::WType_Dialog
+\row \o Qt::WStyle_NoBorderEx \o Qt::WStyle_NoBorder
+\row \o Qt::WType_Modal \o (Qt::WType_Dialog | Qt::WShowModal)
+\row \o Qt::WV_2000 \o QSysInfo::WV_2000
+\row \o Qt::WV_2003 \o QSysInfo::WV_2003
+\row \o Qt::WV_32s \o QSysInfo::WV_32s
+\row \o Qt::WV_95 \o QSysInfo::WV_95
+\row \o Qt::WV_98 \o QSysInfo::WV_98
+\row \o Qt::WV_CE \o QSysInfo::WV_CE
+\row \o Qt::WV_CENET \o QSysInfo::WV_CENET
+\row \o Qt::WV_CE_based \o QSysInfo::WV_CE_based
+\row \o Qt::WV_DOS_based \o QSysInfo::WV_DOS_based
+\row \o Qt::WV_Me \o QSysInfo::WV_Me
+\row \o Qt::WV_NT \o QSysInfo::WV_NT
+\row \o Qt::WV_NT_based \o QSysInfo::WV_NT_based
+\row \o Qt::WV_XP \o QSysInfo::WV_XP
+\row \o Qt::WordBreak \o Qt::TextWordWrap
+\row \o Qt::IbeamCursor \o Qt::IBeamCursor
diff --git a/doc/src/porting4-renamedfunctions.qdocinc b/doc/src/porting4-renamedfunctions.qdocinc
new file mode 100644
index 0000000000..3e59a82c4b
--- /dev/null
+++ b/doc/src/porting4-renamedfunctions.qdocinc
@@ -0,0 +1,6 @@
+\row \o QRegExp::search() \o QRegExp::indexIn()
+\row \o QPixmap::convertFromImage \o QPixmap::fromImage() (static function)
+\row \o QStyle::querySubControl() \o QStyle::hitTestComplexControl()
+\row \o QStyle::querySubControlMetrics() \o QStyle::subControlRect()
+\row \o QStyle::unPolish() \o QStyle::unpolish()
+\row \o QThread::currentThread() \o QThread::currentThreadId()
diff --git a/doc/src/porting4-renamedstatic.qdocinc b/doc/src/porting4-renamedstatic.qdocinc
new file mode 100644
index 0000000000..156ab738e8
--- /dev/null
+++ b/doc/src/porting4-renamedstatic.qdocinc
@@ -0,0 +1,3 @@
+\row \o QPixmap::fromMimeSource \o qPixmapFromMimeSource
+\row \o QImage::inputFormats \o QImageReader::supportedImageFormats
+\row \o QImage::outputFormats \o QImageWriter::supportedImageFormats
diff --git a/doc/src/porting4-renamedtypes.qdocinc b/doc/src/porting4-renamedtypes.qdocinc
new file mode 100644
index 0000000000..fc8f604a70
--- /dev/null
+++ b/doc/src/porting4-renamedtypes.qdocinc
@@ -0,0 +1,26 @@
+\row \o QApplication::ColorMode \o QApplication::ColorSpec
+\row \o QButton::ToggleState \o QCheckBox::ToggleState
+\row \o QCursorShape \o Qt::CursorShape
+\row \o QFile::FilterSpec \o QFile::Filters
+\row \o QFile::PermissionSpec \o QFile::Permission
+\row \o QFile::SortSpec \o QFile::SortFlags
+\row \o QFile::Status \o QFile::Error
+\row \o QFileInfo::PermissionSpec \o QFile::Permission
+\row \o QGrid::Direction \o Qt::Orientation
+\row \o QGridWidget::Direction \o Qt::Orientation
+\row \o QIODevice::Offset \o qlonglong
+\row \o QImage::ScaleMode \o Qt::AspectRatioMode
+\row \o QSize::ScaleMode \o Qt::AspectRatioMode
+\row \o QSocket::Error \o Q3Socket::Error
+\row \o QSocket::State \o Q3Socket::State
+\row \o QStyle::SCFlags \o QStyle::SubControls
+\row \o QStyle::SFlags \o QStyle::State
+\row \o QTS \o QTextStream
+\row \o QUrlDrag \o QUriDrag
+\row \o QWidget::FocusPolicy \o Qt::FocusPolicy
+\row \o Q_LLONG \o qlonglong
+\row \o Q_ULLONG \o qulonglong
+\row \o Qt::Dock \o Qt::ToolBarDock
+\row \o Qt::MacintoshVersion \o QSysInfo::MacVersion
+\row \o Qt::TextFlags \o Qt::TextFlag
+\row \o Qt::WindowsVersion \o QSysInfo::WinVersion
diff --git a/doc/src/porting4.qdoc b/doc/src/porting4.qdoc
new file mode 100644
index 0000000000..c8a9e2beee
--- /dev/null
+++ b/doc/src/porting4.qdoc
@@ -0,0 +1,4215 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page porting4.html
+    \title Porting to Qt 4
+    \contentspage {Porting Guides}{Contents}
+    \previouspage Porting Guides
+    \nextpage Porting to Qt 4 - Virtual Functions
+    \ingroup porting
+    \brief An overview of issues and techniques to consider when porting from Qt 3 to Qt 4.
+
+\omit
+    ### QFileInfo::PermissionSpec -> QFile::Permission(s?)
+    ### refer to porting4-renamedfunctions.qdoc
+    ### QApplication library mutex is gone
+    ### no integral conversion for containers? strings?
+    ### QVector etc. are initialized to 0 by default?
+    ### How to port from Qt 2.3 to Qt 4.
+    ### missing sort() functions?
+    ### QToolTipGroup
+    ### QServerSocket -> Q3ServerSocket
+
+    ### remove these when the classes are re-ported
+
+    ### QApplication::eventLoop()
+
+    \row \o void QCheckListItem::paintCell(QPainter *, const QColorGroup &, int, int, int)\row \o void Q3CheckListItem::paintCell(QPainter *, const QPalette &, int, int, int)
+    \row \o void QCheckListItem::paintFocus(QPainter *, const QColorGroup &, const QRect &) \o void Q3CheckListItem::paintFocus(QPainter *, const QPalette &, const QRect &)
+    \row \o QDataTable: a whole bunch of virtual functions have a different signature
+
+    <     Function: void QIconViewItem::paintFocus(QPainter *, const QColorGroup &)
+    >     Function: void QIconViewItem::paintFocus(QPainter *, const QPalette &)
+
+    <     Function: void QIconViewItem::paintItem(QPainter *, const QColorGroup &)
+    >     Function: void QIconViewItem::paintItem(QPainter *, const QPalette &)
+
+    <     Function: bool QUrlOperator::checkValid()
+
+    <     Function: void QWSInputMethod::setFont(const QFont &)
+
+    ### OpenMode or OpenMode
+
+    ### QWSDecoration
+\endomit
+
+    This document describes the process of porting applications from
+    Qt 3 to Qt 4.
+    If you haven't yet made the decision about porting, or are unsure
+    about whether it is worth it, take a look at the \l{What's New in
+    Qt 4}{key features} offered by Qt 4. See also
+    \l{Moving from Qt 3 to Qt 4} for tips on how to write Qt 3 code
+    that is easy to port to Qt 4.
+
+    \bold{Other porting guides:}
+
+    \list
+    \o \l{Moving from Qt 3 to Qt 4} \mdash covers some high level topics relevant
+       to developers porting from Qt 3 to Qt 4.
+    \o \l{Porting to Qt 4 - Drag and Drop} \mdash covers differences in the
+       way drag and drop is handled between Qt 3 and Qt 4.
+    \o \l{Porting .ui Files to Qt 4} \mdash describes the new format used to
+       describe forms created with \QD.
+    \o \l{Porting to Graphics View} \mdash provides a class-by-class overview
+       of the differences between Qt 3's canvas API and Qt 4's Graphics
+       View framework.
+    \o \l{qt3to4 - The Qt 3 to 4 Porting Tool} \mdash provides an overview
+       of a tool aimed at helping developers start the process of porting an
+       application to Qt 4.
+    \endlist
+
+    The Qt 4 series is not binary compatible with the 3 series. This
+    means programs compiled for Qt 3 must be recompiled to work with
+    Qt 4. Qt 4 is also not completely \e source compatible with 3,
+    however nearly all points of incompatibility cause compiler
+    errors or run-time messages (rather than mysterious results). Qt
+    4 includes many additional features and discards obsolete
+    functionality. Porting from Qt 3 to Qt 4 requires some effort,
+    but once completed the considerable additional power and
+    flexibility of Qt 4 is available for use in your applications.
+
+    To port code from Qt 3 to Qt 4:
+
+    \list 1
+
+    \o Briefly read the porting notes below to get an idea of what to expect.
+
+    \o Be sure that your code compiles and runs well on all your target
+       platforms with Qt 3.
+
+    \o Add the line \c{QT += qt3support} to your \c .pro file if you use
+       \c qmake; otherwise, edit your makefile or project file to
+       link against the Qt3Support library and add \c -DQT3_SUPPORT to your
+       compiler flags. (You might also need to specify other
+       libraries. See \l{What's New in Qt 4} for details.)
+
+    \o Run the \l qt3to4 porting tool. The tool will go through your
+       source code and adapt it to Qt 4.
+
+    \o Follow the instructions in the \l{Porting .ui Files to Qt 4}
+       page to port Qt Designer files.
+
+    \o Recompile with Qt 4. For each error, search below for related
+       identifiers (e.g., function names, class names). This document
+       mentions all relevant identifiers to help you get the information
+       you need at the cost of being a little verbose.
+
+    \endlist
+
+    The \l qt3to4 porting tool replaces occurrences of Qt 3 classes
+    that don't exist anymore in Qt 4 with the corresponding Qt 3
+    support class; for example, \c QListBox is turned into \c
+    Q3ListBox.
+
+    At some point, you might want to stop linking against the Qt 3
+    support library (\l{Qt3Support}) and take advantage of Qt 4's
+    new features. The instructions below explain how to do that for
+    each compatibility class.
+
+    In addition to the Qt3Support classes (such as \c Q3Action, \c
+    Q3ListBox, and \c Q3ValueList), Qt 4 provides compatibility
+    functions when it's possible for an old API to cohabit with the
+    new one. For example, QString provides a
+    QString::simplifyWhiteSpace() compatibility function that's
+    implemented inline and that simply calls QString::simplified().
+    \bold{The compatibility functions are not documented here; instead,
+    they are documented for each class.}
+
+    If you have the line \c{QT += qt3support} in your \c .pro file, \c
+    qmake will automatically define the \c QT3_SUPPORT symbol, turning
+    on compatibility function support. You can also define the symbol
+    manually (e.g., if you don't want to link against the \c
+    Qt3Support library), or you can define \c QT3_SUPPORT_WARNINGS
+    instead, telling the compiler to emit a warning when a
+    compatibility function is called. (This works only with GCC 3.2+
+    and MSVC 7.)
+
+    If you get stuck, ask on the
+    \l{http://lists.trolltech.com/qt-interest/}{qt-interest}
+    mailing list. If you are a licensed customer, you can also contact
+    Qt's technical support team.
+
+\omit
+    ### what to do with slots that aren't slots anymore
+    ### what to do with virtual functions that aren't virtual anymore
+    ### what to do with virtual functions that changed signature
+\endomit
+
+\omit
+    ### <qtl.h> -- stuff that vanished?
+    ### implicit sharing
+    ### uint -> int indexes
+\endomit
+
+    Table of contents:
+
+    \tableofcontents{4}
+
+\omit
+    \section1 Header Files
+
+    ### New style of headers
+
+    \table
+    \header \o Old header \o New header
+    \row \o \c{<qtl.h>} \o \c{<qalgorithms.h>} or \c{<QtAlgorithms>}
+    \endtable
+
+    ### Some headers don't include each other anymore...
+\endomit
+
+    \section1 Casting and Object Types
+
+    In Qt 3, it was possible to use the \c qt_cast() function to determine
+    whether instances of QObject subclasses could be safely cast to derived
+    types of those subclasses. For example, if a QFrame instance is passed
+    to a function whose signature specifies a QWidget pointer as its argument,
+    \c qt_cast() could be used to obtain a QFrame pointer so that the
+    instance's functions can be accessed.
+
+    In Qt 4, much of this functionality is provided by the qobject_cast()
+    function, and additional functions also provide similar functionality for
+    certain non-QObject types:
+
+    \table
+    \header \o Qt 3 function \o Qt 4 function
+    \row    \o T *qt_cast<T *>(QObject *) \o \l{qobject_cast()}{T *qobject_cast<T *>(QObject *)}
+    \row    \o                            \o \l{qgraphicsitem_cast()}{T qgraphicsitem_cast<T>(QGraphicsItem *)}
+    \row    \o                            \o \l{qstyleoption_cast()}{T qstyleoption_cast<T>(QStyleOption *)}
+    \row    \o                            \o \l{qvariant_cast()}{T qvariant_cast<T>(const QVariant &)}
+    \row    \o                            \o \l{qdbus_cast()}{T qdbus_cast(const QDBusArgument &)}
+    \endtable
+
+\omit
+    \section1 Global Functions
+
+    \table
+    \header \o Qt 3 function \o Qt 4 function
+    \row \o cstrcmp() \o strcmp()
+    \row \o cstrcpy() \o strcpy()
+    \row \o cstrlen() \o strlen()
+    \row \o cstrncmp() \o strncmp()
+    \row \o qmemmove() \o memmove()
+    \endtable
+
+    qGLVersion() ###
+
+    copyBlt() ###
+    bitBlt()
+
+    #ifdef compat classes:
+        * QLayoutIterator
+        * QColorGroup
+        * QMenuItem
+
+    QWidget visibleRect property compat
+    QWidget::BackgroundOrigin compat
+\endomit
+
+    \section1 Type Names
+
+    The table below lists the classes that have been renamed in Qt 4.
+    If you compile your applications with \c QT3_SUPPORT defined, the
+    old names will be available.
+
+    Whenever you see an occurrence of the name on the left, you can
+    safely replace it with the Qt 4 equivalent in your program. The
+    \l qt3to4 tool performs the conversion automatically.
+
+    \table
+    \header \o Qt 3 class name \o Qt 4 class name
+    \input porting4-renamedclasses.qdocinc
+    \endtable
+
+    The table below lists the enums and typedefs that have been
+    renamed in Qt 4. If you compile your applications with \c
+    QT3_SUPPORT defined, the old names will be available.
+
+    Whenever you see an occurrence of the name on the left, you can
+    safely replace it with the Qt 4 equivalent in your program. The
+    \l qt3to4 tool performs the conversion
+    automatically.
+
+    \table
+    \header \o Qt 3 type name \o Qt 4 type name
+    \input porting4-renamedtypes.qdocinc
+    \endtable
+
+    \omit
+    ###
+    \row \o QButton::ToggleState \o Use QCheckBox::ToggleState instead.
+    \endomit
+
+    \section1 Enum Values
+
+    The table below lists the enum values that have been renamed in
+    Qt 4. If you compile your applications with \c QT3_SUPPORT defined,
+    the old names will be available.
+
+    Whenever you see an occurrence of the name on the left, you can
+    safely replace it with the Qt 4 equivalent in your program. The
+    \l qt3to4 tool performs the conversion automatically.
+
+    \table
+    \header \o Qt 3 enum value name \o Qt 4 enum value name
+    \input porting4-renamedenumvalues.qdocinc
+    \endtable
+
+    In addition, the following \l{Qt::WindowFlags}{window flags} have
+    been either replaced with \l{Qt::WidgetAttribute}{widget
+    attributes} or have been deprecated:
+
+    \table
+    \header \o Qt 3 type \o Qt 4 equivalent
+    \row \o Qt::WDestructiveClose \o Use QWidget::setAttribute(Qt::WA_DeleteOnClose) instead.
+    \row \o Qt::WStaticContents \o{1,2} Use QWidget::setAttribute(Qt::WA_StaticContents) instead.
+    \row \o Qt::WNorthWestGravity
+    \row \o Qt::WNoAutoErase \o{1,3} Use QWidget::setAttribute(Qt::WA_NoBackground) instead.
+    \row \o Qt::WResizeNoErase
+    \row \o Qt::WRepaintNoErase
+    \row \o Qt::WPaintClever \o Unnecessary in Qt 4.
+         \omit ### Check with Matthias \endomit
+    \row \o Qt::WMacNoSheet \o Unnecessary in Qt 4.
+         \omit ### Check with Sam \endomit
+    \endtable
+
+    In Qt 4.1, the widget flags used to determine window modality were
+    replaced by a single enum that can be used to specify the modal
+    behavior of top-level widgets:
+
+    \table
+    \header \o Qt 3 type \o Qt 4 equivalent
+    \row \o Qt::WShowModal \o Use QWidget::setWindowModality(Qt::ApplicationModal) instead.
+    \row \o Qt::WGroupLeader \o Use QWidget::setWindowModality(Qt::WindowModal)
+         for each child dialog of the group leader, but do not change the modality
+         of the group leader itself.
+    \endtable
+
+    \target properties
+    \section1 Properties
+
+    Some properties have been renamed in Qt 4, to make Qt's API more
+    consistent and more intuitive. For example, QWidget's \c caption
+    property has been renamed \c windowTitle to make it clear that it
+    refers to the title shown in the window's title bar.
+
+    In addition, the property system has been extended to allow
+    properties to be redefined in subclasses with the \l Q_PROPERTY()
+    macro, removing the need for a \c Q_OVERRIDE() macro.
+
+    The table below lists the Qt properties that have been renamed in
+    Qt 4. Occurrences of these in \e{Qt Designer} \c .ui files are
+    automatically converted to the new name by \c uic.
+
+    \table
+    \header \o Qt 3 name \o Qt 4 name
+    \row \o QButton::accel \o QButton::shortcut
+    \row \o QButton::on \o QButton::checked
+    \row \o QButton::toggleButton \o QAbstractButton::checkable
+    \row \o QDial::lineStep \o QDial::singleStep
+    \row \o QDial::maxValue \o QDial::maximum
+    \row \o QDial::minValue \o QDial::minimum
+    \row \o QDialog::modal \o QDialog::isModal
+    \row \o QLineEdit::edited \o QLineEdit::modified
+    \row \o QLineEdit::hasMarkedText \o QLineEdit::hasSelectedText
+    \row \o QLineEdit::markedText \o QLineEdit::selectedText
+    \row \o QObject::name \o QObject::objectName
+    \row \o QProgressDialog::progress \o QProgressDialog::value
+    \row \o QProgressDialog::totalSteps \o QProgressDialog::maximum
+    \row \o QProgressDialog::wasCancelled \o QProgressDialog::wasCanceled
+    \row \o QPushButton::iconSet \o QPushButton::icon
+    \row \o QScrollBar::draggingSlider \o QScrollBar::sliderDown
+    \row \o QScrollBar::lineStep \o QScrollBar::singleStep
+    \row \o QScrollBar::maxValue \o QScrollBar::maximum
+    \row \o QScrollBar::minValue \o QScrollBar::minimum
+    \row \o QSlider::lineStep \o QSlider::singleStep
+    \row \o QSlider::maxValue \o QSlider::maximum
+    \row \o QSlider::minValue \o QSlider::minimum
+    \row \o QSpinBox::lineStep \o QSpinBox::singleStep
+    \row \o QSpinBox::maxValue \o QSpinBox::maximum
+    \row \o QSpinBox::minValue \o QSpinBox::minimum
+    \row \o QTabBar::currentTab \o QTabBar::currentIndex
+    \row \o QTabWidget::currentPage \o QTabWidget::currentWidget
+    \row \o QToolButton::iconSet \o QToolButton::icon
+    \row \o QToolButton::textLabel \o QToolButton::text
+    \row \o QWidget::caption \o QWidget::windowTitle
+    \row \o QWidget::icon \o QWidget::windowIcon
+    \row \o QWidget::iconText \o QWidget::windowIconText
+    \endtable
+
+    A handful of properties in Qt 3 are no longer properties in Qt 4,
+    but the access functions still exist as part of the Qt 4 API.
+    These are not used by \e{Qt Designer}; the only case where you
+    need to worry about them is in highly dynamic applications that
+    use Qt's meta-object system to access properties. Here's the list
+    of these properties with the read and write functions that you
+    can use instead:
+
+    \table
+    \header \o Qt 3 property \o Qt 4 read function \o Qt 4 write function
+    \row \o QSqlDatabase::connectOptions \o QSqlDatabase::connectOptions() \o QSqlDatabase::setConnectOptions()
+    \row \o QSqlDatabase::databaseName \o QSqlDatabase::databaseName() \o QSqlDatabase::setDatabaseName()
+    \row \o QSqlDatabase::hostName \o QSqlDatabase::hostName() \o QSqlDatabase::setHostName()
+    \row \o QSqlDatabase::password \o QSqlDatabase::password() \o QSqlDatabase::setPassword()
+    \row \o QSqlDatabase::port \o QSqlDatabase::port() \o QSqlDatabase::setPort()
+    \row \o QSqlDatabase::userName \o QSqlDatabase::userName() \o QSqlDatabase::setUserName()
+    \endtable
+
+    Some properties have been removed from Qt 4, but the associated
+    access functions are provided if \c QT3_SUPPORT is defined to help
+    porting to Qt 4. When converting Qt 3 \c .ui files to Qt 4, \c uic
+    generates calls to the Qt 3 compatibility functions. Note that
+    this only applies to the properties of the Qt3Support library,
+    i.e. \c QT3_SUPPORT properties of the other libraries must be
+    ported manually when converting Qt 3 .ui files to Qt 4.
+
+    The table below lists these properties with the read and write
+    functions that you can use instead. The documentation for the
+    individual functions explains how to replace them with
+    non-compatibility Qt 4 functions.
+
+    \table
+    \header \o Qt 3 property \o Qt 4 read function (\c QT3_SUPPORT)\o Qt 4 write function (\c QT3_SUPPORT)
+    \row \o QMenuBar::separator \o QMenuBar::separator() \o QMenuBar::setSeparator()
+    \row \o QPushButton::menuButton \o QPushButton::isMenuButton() \o N/A
+    \row \o QTabWidget::margin \o QTabWidget::margin() \o QTabWidget::setMargin()
+    \row \o QTextEdit::textFormat \o QTextEdit::textFormat() \o QTextEdit::setTextFormat()
+    \row \o QWidget::backgroundBrush \o QWidget::backgroundBrush() \o N/A
+    \row \o QWidget::backgroundMode \o QWidget::backgroundMode() \o QWidget::setBackgroundMode()
+    \row \o QWidget::backgroundOrigin \o QWidget::backgroundOrigin() \o QWidget::setBackgroundOrigin()
+    \row \o QWidget::colorGroup \o QWidget::colorGroup() \o QWidget::setColorGroup()
+    \row \o QWidget::customWhatsThis \o QWidget::customWhatsThis() \o QWidget::setCustomWhatsThis()
+    \row \o QWidget::inputMethodEnabled \o QWidget::inputMethodEnabled() \o QWidget::setInputMethodEnabled()
+    \row \o QWidget::ownCursor \o QWidget::ownCursor() \o N/A
+    \row \o QWidget::ownFont \o QWidget::ownFont() \o N/A
+    \row \o QWidget::ownPalette \o QWidget::ownPalette() \o N/A
+    \row \o QWidget::paletteBackgroundColor \o QWidget::paletteBackgroundColor() \o QWidget::setPaletteBackgroundColor()
+    \row \o QWidget::paletteBackgroundPixmap \o QWidget::paletteBackgroundPixmap() \o QWidget::setPaletteBackgroundPixmap()
+    \row \o QWidget::paletteForegroundColor \o QWidget::paletteForegroundColor() \o QWidget::setPaletteForegroundColor()
+    \row \o QWidget::underMouse \o QWidget::underMouse() \o N/A
+    \endtable
+
+    The following Qt 3 properties and their access functions are no
+    longer available in Qt 4. In most cases, Qt 4 provides similar
+    functionality.
+
+    \table
+    \header \o Qt 3 property \o Qt 4 equivalent
+    \row \o QButton::autoRepeat \o N/A
+    \row \o QButton::autoResize \o Call QWidget:setFixedSize(QWidget::sizeHint()) whenever you change the contents.
+    \row \o QButton::exclusiveToggle \o See \l QAbstractButton::autoExclusive.
+    \row \o QButton::pixmap \o Use QAbstractButton::icon instead.
+    \row \o QButton::toggleState \o Use QCheckBox::setState() and QCheckBox::state() instead.
+    \row \o QButton::toggleType \o Use QCheckBox::setTristate() instead.
+    \row \o QComboBox::autoResize \o Call QWidget:setFixedSize(QWidget::sizeHint()) whenever you change the contents.
+    \row \o QFrame::contentsRect \o Use Q3Frame::contentsRect() instead.
+    \row \o QFrame::margin \o Use QWidget::setContentsMargins() instead.
+    \row \o QTabBar::keyboardFocusTab \o N/A
+    \row \o QToolButton::offIconSet \o Use the \l{QIcon::Off}{off component} of QAbstractButton::icon instead.
+    \row \o QToolButton::onIconSet \o Use the \l{QIcon::On}{on component} of QAbstractButton::icon instead.
+    \row \o QWidget::microFocusHint \o N/A
+    \endtable
+
+\omit
+    \section1 Inheritance Chain
+
+    ### QMenuBar, etc.
+
+    \section1 Null vs. Empty
+
+    ###
+\endomit
+
+    \section1 Explicit Sharing
+
+    Qt 4 is the first version of Qt that contains no \link
+    http://doc.trolltech.com/3.3/shclass.html explicitly shared
+    \endlink classes. All classes that were explicitly shared in Qt 3
+    are \e implicitly shared in Qt 4:
+
+    \list
+    \o QImage
+    \o QBitArray
+    \o QByteArray
+    \o Q3PointArray
+    \endlist
+
+    This means that if you took a copy of an instance of the class
+    (using operator=() or the class's copy constructor), any
+    modification to the copy would affect the original and vice
+    versa. Needless to say, this behavior is rarely desirable.
+
+    Fortunately, nearly all Qt 3 applications don't rely on explicit
+    sharing. When porting, you typically only need to remove calls to
+    detach() and/or copy(), which aren't necessary anymore.
+
+    If you deliberately rely on explicit sharing in your application,
+    you can use pointers or references to achieve the same result in
+    Qt 4.
+
+    \oldcode
+        void asciify(QByteArray array)
+        {
+            for (int i = 0; i < (int)array.size(); ++i) {
+                if ((uchar)array[i] >= 128)
+                    array[i] = '?';
+            }
+        }
+    \newcode
+        void asciify(QByteArray &array)
+        {
+            for (int i = 0; i < array.size(); ++i) {
+                if ((uchar)array[i] >= 128)
+                    array[i] = '?';
+            }
+        }
+    \endcode
+
+    (Notice the \c & in the parameter declaration.)
+
+\omit
+    \section1 Qt Designer .ui Files
+
+    ###
+\endomit
+
+    \section1 Painting and Redrawing Widgets
+
+    When implementing custom widgets in Qt 3, it was possible to use
+    QPainter to draw on a widget outside paint events. This made it
+    possible to integrate Qt applications with third party libraries
+    and tools that impose their own rendering models. For example,
+    a widget might be repainted in a slot using data obtained from
+    an external source.
+
+    In Qt 4, it is only possible to paint on a widget from within its
+    \l{QWidget::}{paintEvent()} handler function. This restriction simplifies
+    Qt's interaction with native window systems, improves the performance
+    of applications by reducing the number of redraw operations, and
+    also enables features to be implemented to improve the appearance of
+    widgets, such as a backing store.
+
+    Generally, we recommend redesigning applications to perform all
+    painting operations in \l{QWidget::}{paintEvent()} functions, deferring
+    actual painting until the next time this function is called.
+    Applications can post paint events to trigger repaints, and it may be
+    possible to examine your widget's internal state to determine which
+    part of the widget needs to be repainted.
+
+    If asynchronous repaints are used extensively by your application,
+    and it is not practical to redesign the rendering model to perform
+    all painting operations from within a widget's \l{QWidget::}{paintEvent()}
+    function, it may be necessary to consider using an intermediate painting
+    step. In this approach, one or more images can be updated asynchronously
+    and painted on the widget in the paint event. To avoid excessive
+    buffering, it may be worthwhile disabling the backing store by setting
+    the widget's Qt::WA_PaintOnScreen widget attribute.
+
+    On certain platforms, the Qt::WA_PaintOutsidePaintEvent widget attribute
+    can be set to allow a widget to be painted from outside paint events.
+
+    \note Setting widget attributes to disable key features of Qt's widget
+    rendering model may also cause other features to be disabled.
+
+    \section1 QAccel
+
+    The \c QAccel class has been renamed Q3Accel and moved to the
+    Qt3Support module. In new applications, you have three options:
+
+    \list 1
+    \o You can use QAction and set a key sequence using QAction::setShortcut().
+    \o You can use QShortcut, a class that provides similar
+       functionality to Q3Accel.
+    \o You can use QWidget::grabShortcut() and process "shortcut"
+       events by reimplementing QWidget::event().
+    \endlist
+
+    The Q3Accel class also supports multiple accelerators using the
+    same object, by calling Q3Accel::insertItem() multiple times. In
+    Qt 4, the solution is to create multiple QShortcut objects.
+
+    \section1 QAccessibleInterface
+
+    The QAccessibleInterface class has undergone some API changes in
+    Qt 4, to make it more consistent with the rest of the Qt API.
+
+    If you have classes that inherit QAccessibleInterface or one of
+    its subclasses (QAccessibleObject, QAccessibleWidget, etc.), you
+    must port them the new QAccessibleInterface API.
+
+    See \l{Porting to Qt 4 - Virtual Functions}{Virtual Functions}
+    for a list of QAccessibleInterface virtual member functions in
+    Qt 3 that are no longer virtual in Qt 4.
+
+    \section1 QAccessibleTitleBar
+
+    The \c QAccessibleTitleBar has been renamed Q3AccessibleTitleBar
+    and moved to the Qt3Support library.
+
+    \target qaction.section
+    \section1 QAction
+
+    The QAction class has been redesigned in Qt 4 to integrate better
+    with the rest of the menu system. It unifies the old \c QMenuItem
+    class and the old \c QAction class into one class, avoiding
+    unnecessary data duplication and the need to learn two different
+    APIs.
+
+    The old \c QAction and \c QActionGroup classes have been renamed
+    Q3Action and Q3ActionGroup and moved to Qt3Support. In addition,
+    the new QAction class has compatibility functions to ease
+    transition to Qt 4. Note that when using Q3ToolBar and
+    Q3PopupMenu, their actions must be \l {Q3Action}s.
+
+    See \l{Porting to Qt 4 - Virtual Functions}{Virtual Functions}
+    for a list of QAction virtual member functions in Qt 3 that are
+    no longer virtual in Qt 4.
+
+    \section1 QActionGroup
+
+    The QAction class has been completely redesigned in Qt 4 to
+    integrate better with the rest of the menu system. See the
+    \l{#qaction.section}{section on QAction} for details.
+
+    \section1 QApplication
+
+    The QApplication class has been split into two classes:
+    QCoreApplication and QApplication. The new QApplication class
+    inherits QCoreApplication and adds GUI-related functionality. In
+    practice, this has no consequences for existing Qt applications.
+
+    In addition, the following API changes were made:
+
+    \list 1
+    \o  QApplication::allWidgets() and QApplication::topLevelWidgets()
+        used to return a pointer to a QWidgetList. Now they return a
+        QWidgetList.
+
+        Also, QWidgetList has changed from being a typedef for
+        QPtrList<QWidget> to being a typedef for QList<QWidget *>.
+        See the \l{#qwidgetlist.section}{section on QWidgetList} below
+        for details.
+
+        \oldcode
+            QWidgetList *list = QApplication::topLevelWidgets();
+            QWidgetListIt it(*list);
+            QWidget *widget;
+            while ((widget = it.current())) {
+                if (widget->inherits("MainWindow"))
+                    ((MainWindow *)widget)->updateRecentFileItems();
+                ++it;
+            }
+            delete list;
+        \newcode
+            QWidgetList list = QApplication::topLevelWidgets();
+            for (int i = 0; i < list.size(); ++i) {
+                if (MainWindow *mainWin = qobject_cast<MainWindow *>(list.at(i)))
+                    mainWin->updateRecentFileItems();
+            }
+        \endcode
+    \o QApplication::setMainWidget() is no longer used. When all an application's
+       windows are closed, the application will exit normally.
+    \endlist
+
+    \section1 QAquaStyle
+
+    The \c QAquaStyle class first appeared in Qt 3.0, when the Qt for
+    Mac OS X port was first released. It emulated Apple's "Aqua" theme.
+    In Qt 3.1, QAquaStyle was obsoleted by QMacStyle, which uses Appearance
+    Manager to perform its drawing.
+
+    The \c QAquaStyle class is no longer provided in Qt 4. Use
+    QMacStyle instead.
+
+    \target qasciidict.section
+    \section1 QAsciiCache<T>
+
+    \c QAsciiCache<T> has been renamed Q3AsciiCache<T> and moved to
+    the Qt3Support library. It has been replaced by
+    QCache<QByteArray, T>.
+
+    For details, read the \l{#qcache.section}{section on QCache<T>},
+    mentally substituting QByteArray for QString.
+
+    \section1 QAsciiDict<T>
+
+    QAsciiDict<T> and QAsciiDictIterator<T> have been renamed
+    Q3AsciiDict<T> and Q3AsciiDictIterator<T> and moved to the
+    Qt3Support library. They have been replaced by the
+    more modern QHash<Key, T> and QMultiHash<Key, T> classes and
+    their associated iterator classes.
+
+    When porting old code that uses Q3AsciiDict<T> to Qt 4, there are
+    four classes that you can use:
+
+    \list
+    \o QMultiHash<QByteArray, T *>
+    \o QMultiHash<QByteArray, T>
+    \o QHash<QByteArray, T *>
+    \o QHash<QByteArray, T>
+    \endlist
+
+    For details, read the \l{#qdict.section}{section on QDict<T>},
+    mentally substituting QByteArray for QString.
+
+    \section1 QAsyncIO
+
+    The \c QAsyncIO class was used internally in Qt 2.x in
+    conjunction with QImageConsumer. It was obsoleted in Qt 3.0.
+
+    \input porting4-obsoletedmechanism.qdocinc
+
+    \section1 QBackInsertIterator
+
+    The undocumented \c QBackInsertIterator class has been removed
+    from the Qt library. If you need it in your application, feel
+    free to copy the source code from the Qt 3 \c <qtl.h> header
+    file.
+
+    \section1 QBitArray
+
+    In Qt 3, QBitArray inherited from QByteArray. In Qt 4, QBitArray
+    is a totally independent class. This makes very little difference
+    to the user, except that the new QBitArray doesn't provide any of
+    QByteArray's byte-based API anymore. These calls will result in a
+    compile-time error, except calls to QBitArray::truncate(), whose
+    parameter was a number of \e bytes in Qt 3 and a number of bits
+    in Qt 4.
+
+    QBitArray was an explicitly shared class in Qt 3. See \l{Explicit
+    Sharing} for more information.
+
+    The \c QBitVal class has been renamed QBitRef.
+
+    \section1 QButton
+
+    The \c QButton class has been replaced by QAbstractButton in Qt
+    4. Classes like QPushButton and QRadioButton inherit from
+    QAbstractButton. As a help when porting older Qt applications,
+    the Qt3Support library contains a Q3Button class
+    implemented in terms of the new QAbstractButton.
+
+    If you used the \c QButton class as a base class for your own
+    button type and want to port your code to the newer
+    QAbstractButton, you need to be aware that QAbstractButton has no
+    equivalent for the Q3Button::drawButton(QPainter *) virtual
+    function. The solution is to reimplement QWidget::paintEvent() in
+    your QAbstractButton subclass as follows:
+
+    \snippet doc/src/snippets/code/doc_src_porting4.qdoc 0
+
+    \table
+    \header \o Q3Button function \o QAbstractButton equivalent
+    \row \o Q3Button::autoResize() \o Call QWidget:setFixedSize(QWidget::sizeHint()) whenever you change the contents.
+    \row \o Q3Button::isExclusiveToggle() \o Use QAbstractButton::group() or QAbstractButton::autoExclusive() instead.
+    \row \o Q3Button::pixmap() const \o QAbstractButton::icon()
+    \row \o Q3Button::setAutoResize() \o N/A
+    \row \o Q3Button::setPixmap(const QPixmap &) \o QAbstractButton::setIcon(const QIcon &)
+    \row \o Q3Button::setState(ToggleState) \o See remark below
+    \row \o Q3Button::setToggleType(ToggleType) \o See remark below
+    \row \o Q3Button::state() \o See remark below
+    \row \o Q3Button::stateChanged(int) \o See remark below
+    \row \o Q3Button::toggleType() \o See remark below
+    \endtable
+
+    Remarks:
+
+    \list 1
+    \o In Qt 3, \c QButton had a "toggle type", which could be
+       QButton::SingleShot, QButton::Toggle, or QButton::Tristate.
+       The new QAbstractButton class doesn't support "tristate"
+       directly; this feature is implemented in QCheckBox instead.
+       The two other "toggle types" (\c QButton::SingleShot and \c
+       QButton::Toggle) are replaced by a QAbstractButton::checkable
+       property.
+    \o In Qt 3, QButton had a "toggle state", which could be \c
+       QButton::Off, \c QButton::NoChange, or \c QButton::On. In Qt
+       4, this mechanism has been moved to QCheckBox.
+    \endlist
+
+    See \l{Porting to Qt 4 - Virtual Functions}{Virtual Functions} for
+    a list of \c QButton virtual member functions in Qt 3 that aren't
+    virtual in Qt 4.
+
+    See \l{#properties}{Properties} for a list of \c QButton properties
+    in Qt 3 that have changed in Qt 4.
+
+    \section1 QButtonGroup
+
+    The \c QButtonGroup class has been completely redesigned in Qt 4.
+    For compatibility, the old \c QButtonGroup class has been renamed
+    Q3ButtonGroup and has been moved to Qt3Support.
+    Likewise, the \c QHButtonGroup and \c QVButtonGroup convenience
+    subclasses have been renamed \c Q3HButtonGroup and \c Q3VButtonGroup and
+    moved to the Qt3Support library.
+
+    The old \c QButtonGroup, as well as Q3ButtonGroup, can be used in two ways:
+
+    \list 1
+    \o  The button group is the parent widget of a number of buttons,
+        i.e. the button group is the parent argument in the button
+        constructor. The buttons are assigned identifiers 0, 1, 2, etc.,
+        in the order they are created. A Q3ButtonGroup can display a frame
+        and a title because it inherits Q3GroupBox.
+    \o  The button group is an invisible widget and the contained
+        buttons have some other parent widget. In this usage, each
+        button must be manually inserted, using
+        Q3ButtonGroup::insert(), into the button group and given an
+        ID number.
+    \endlist
+
+    Unlike Q3ButtonGroup, the new QButtonGroup doesn't inherit
+    QWidget. It is very similar to a "hidden Q3ButtonGroup".
+
+    If you use a Q3ButtonGroup, Q3HButtonGroup, or Q3VButtonGroup as
+    a widget and want to port to Qt 4, you can replace it with
+    QGroupBox. In Qt 4, radio buttons with the same parent are
+    automatically part of an exclusive group, so you normally don't
+    need to do anything else. See also the
+    \l{#qgroupbox.section}{section on QGroupBox} below.
+
+    See \l{Porting to Qt 4 - Virtual Functions}{Virtual Functions} for
+    a list of QButtonGroup virtual member functions in Qt 3 that are no
+    longer virtual in Qt 4.
+
+    \target qbytearray.section
+    \section1 QByteArray
+
+    In Qt 3, QByteArray was simply a typedef for QMemArray<char>. In
+    Qt 4, QByteArray is a class in its own right, with a higher-level
+    API in the style of QString.
+
+    Here are the main issues to be aware of when porting to Qt 4:
+
+    \list 1
+    \o  The QMemArray(int size) constructor has been replaced with
+        QByteArray(int size, char ch). The second argument specifies
+        which character should be used for initializing the array;
+        pass '\\0' if you have no specific needs.
+
+        \oldcode
+        QByteArray ba(64);
+        \newcode
+        QByteArray ba(64, '\0');
+        \endcode
+
+    \o  QMemArray::at() returned a non-const reference, whereas the
+        new QByteArray::at() returns a const value. Code like
+
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 1
+
+        will no longer compile. Instead, use QByteArray::operator[]:
+
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 2
+
+    \o  The QMemArray::contains(char) function has been renamed
+        QByteArray::count(char). In addition, there now exists a
+        QByteArray::contains(char) function that returns a boolean
+        value. Replace old calls to contains() with either count() or
+        contains(), depending on whether you care about the specific
+        number of occurrences of a character in the byte array or
+        only care about whether the array contains that character or
+        not.
+
+    \o  The new QByteArray has no assign() function. Calls to
+        QMemArray::assign(const QMemArray &) can be replaced by calls
+        to QByteArray::operator=(). Calls to QMemArray::assign(const
+        T *, uint) have no equivalent in Qt 4; if you use it, the
+        solution is either to use QByteArray::fromRawData() and to
+        call free() yourself to avoid a memory leak, or to use the
+        QByteArray(const char *, int) constructor, which will take a
+        deep copy of the data.
+
+    \o  QMemArray::bsearch() and QMemArray::sort() have no equivalent
+        in the new QByteArray class. Use \l qBinaryFind() and \l qSort()
+        if you need that functionality.
+    \endlist
+
+    QByteArray was an explicitly shared class in Qt 3. See
+    \l{Explicit Sharing} for more information.
+
+    \target qcache.section
+    \section1 QCache<T>
+
+    QCache<T> has been renamed Q3Cache<T> and moved to Qt3Support.
+    The new QCache class has a different API, and takes different
+    template parameters: QCache<Key, T>.
+
+    When porting to Qt 4, QCache<QString, T> is the obvious
+    substitute for Q3Cache<T>. The following table summarizes the API
+    differences.
+
+    \table
+    \header \o Q3Cache<T> function \o QCache<QString, T> equivalent
+    \row \o Q3Cache::Q3Cache(int maxCost, int size, bool caseSensitive) \o See remark below
+    \row \o Q3Cache::autoDelete() \o N/A
+    \row \o Q3Cache::count() \o QCache::count() or QCache::size() (equivalent)
+    \row \o Q3Cache::setAutoDelete() \o See remark below
+    \row \o Q3Cache::size() \o N/A
+    \row \o Q3Cache::statistics() \o N/A
+    \row \o Q3Cache::operator=() \o See remark below
+    \endtable
+
+    Remarks:
+
+    \list 1
+    \o  Q3Cache requires the user to allocate a specific number of
+        buckets by passing a prime number (17 by default) to the
+        constructor. In contrast, the new QCache's hash table
+        automatically grows and shrinks as needed, and the
+        constructor doesn't take a prime number.
+
+    \o  Q3Cache supportes case-insensitive lookups by passing false as
+        second argument to the constructor. This feature has no
+        equivalent in QMultiHash. Instead, call QString::toLower()
+        before you insert or lookup a key in the hash.
+
+    \o  The Q3Cache::insert() function returns a \c bool value that
+        indicates whether or not the item actually was inserted in
+        the cache. If the item wasn't inserted, it was the caller's
+        responsibility to delete the item. The new QCache::insert()
+        function returns \c void and either adds it to the cache or
+        deletes it right away. Old code like
+
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 3
+
+    becomes
+
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 4
+
+    \o  The new QCache class \e always takes ownership of the items
+        it stores (i.e. auto-delete is always on). If you use Q3Cache
+        with auto-delete turned off (the rarely useful default), you
+        cannot use QCache as a direct substitute. One unelegant trick
+        that works well in practice is to use QCache<QString, T *>
+        instead of QCache<QString, T>. In that case, QCache owns the
+        pointers, not the objects that the pointers refer to. For
+        example,
+
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 5
+
+        becomes
+
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 6
+
+        An alternative is to stick to using Q3Cache.
+    \endlist
+
+    QCacheIterator<T> has been renamed Q3CacheIterator<T> and moved
+    to the Qt3Support library. The new QCache class
+    doesn't offer any iterator types.
+
+    \section1 QCanvas
+
+    The canvas module classes have been
+    renamed and moved to the Qt3Support library.
+
+    \table
+    \header \o Qt 3 class name \o Compatibility class in Qt 4
+    \row \o \c QCanvas \o Q3Canvas
+    \row \o \c QCanvasEllipse \o Q3CanvasEllipse
+    \row \o \c QCanvasItem \o Q3CanvasItem
+    \row \o \c QCanvasItemList \o Q3CanvasItemList
+    \row \o \c QCanvasLine \o Q3CanvasLine
+    \row \o \c QCanvasPixmap \o Q3CanvasPixmap
+    \row \o \c QCanvasPixmapArray \o Q3CanvasPixmapArray
+    \row \o \c QCanvasPolygon \o Q3CanvasPolygon
+    \row \o \c QCanvasPolygonalItem \o Q3CanvasPolygonalItem
+    \row \o \c QCanvasRectangle \o Q3CanvasRectangle
+    \row \o \c QCanvasSpline \o Q3CanvasSpline
+    \row \o \c QCanvasSprite \o Q3CanvasSprite
+    \row \o \c QCanvasText \o Q3CanvasText
+    \row \o \c QCanvasView \o Q3CanvasView
+    \endtable
+
+    \l{The Graphics View Framework} replaces QCanvas. For more on porting to
+    Graphics View, see \l{Porting to Graphics View}.
+
+    \section1 QColor
+
+    In Qt 4, QColor is a value type like QPoint or QRect. Graphics
+    system-specific code has been implemented in QColormap.
+
+    The \c QColor::maxColors() function has been replaced
+    by QColormap::size().
+
+    The \c QColor::numBitPlanes() function has been replaced
+    by QColormap::depth().
+
+    The \c QColor::setNamedColor() function no longer supports
+    the named color in the same way as Qt 3. Qt 4's
+    \l{QColor::}{setNamedColor()} uses the new W3C convention
+    as stated 
+    \l{http://www.w3.org/TR/SVG/types.html#ColorKeywords}{here}.
+
+    \table
+    \header \o{4,1} Predefined Qt Colors
+    \row \o Qt::color0 \o Qt::color1 \o Qt::black \o Qt::white
+    \row \o Qt::darkGray \o Qt::gray \o Qt::lightGray \o Qt::red
+    \row \o Qt::green \o Qt::blue \o Qt::cyan \o Qt::magenta
+    \row \o Qt::yellow \o Qt::darkRed \o Qt::darkGreen \o Qt::darkBlue
+    \row \o Qt::darkCyan \o Qt::darkMagenta \o Qt::darkYellow \o Qt::transparent
+    \endtable
+
+    The predefined colors listed in the table above were static
+    QColor objects in Qt 3. In Qt 4, they are enum values of type
+    Qt::GlobalColor. Thanks to the implicit QColor(Qt::GlobalColor)
+    constructor, the enum values are automatically converted to
+    \l{QColor}s in most contexts. Occasionally, you might need a
+    cast.
+
+    \oldcode
+        QColor lightCyan = Qt::cyan.light(180);
+    \newcode
+        QColor lightCyan = QColor(Qt::cyan).light(180);
+    \endcode
+
+    \section1 QColorGroup
+
+    In Qt 3, a QPalette consisted of three QColorGroup objects. In Qt
+    4, the (rarely used) QColorGroup abstraction has been eliminated.
+    For source compatibility, a QColorGroup class is available when
+    \c QT3_SUPPORT is defined.
+
+    The new QPalette still works in terms of color groups, specified
+    through enum values (QPalette::Active, QPalette::Disabled, and
+    QPalette::Inactive). It also has the concept of a \e current
+    color group, which you can set using
+    QPalette::setCurrentColorGroup().
+
+    The QPalette object returned by QWidget::palette() returns a
+    QPalette initialized with the correct current color group for the
+    widget. This means that if you had code like
+
+    \badcode
+        painter.setBrush(colorGroup().brush(QColorGroup::Text));
+    \endcode
+
+    you can simply replace colorGroup() with palette():
+
+    \snippet doc/src/snippets/code/doc_src_porting4.qdoc 7
+
+    \section1 QColorDrag
+
+    The \c QColorDrag class has been renamed Q3ColorDrag and moved to
+    the Qt3Support library. In Qt 4, use QMimeData
+    instead and call QMimeData::setColor() to set the color.
+
+    \section1 QComboBox
+
+    In Qt 3, the list box used to display the contents of a \c QComboBox
+    widget could be accessed by using the \c listBox() function. In Qt 4,
+    the standard list box is provided by a QListView widget, and can be
+    accessed with the \l{QComboBox::view()}{view()} function.
+
+    \omit ### \endomit
+
+    See \l{Porting to Qt 4 - Virtual Functions}{Virtual Functions} for
+    a list of QComboBox virtual member functions in Qt 3 that are no longer
+    virtual in Qt 4.
+
+    \section1 QCString
+
+    In Qt 3, QCString inherited from QByteArray. The main drawback
+    of this approach is that the user had the responsibility of
+    ensuring that the string is '\\0'-terminated. Another important
+    issue was that conversions between \c QCString and QByteArray often
+    gave confusing results. (See the
+    \l{http://doc.trolltech.com/qq/qq05-achtung.html#qcstringisastringofchars}{Achtung!
+    Binary and Character Data} article in \e{Qt Quarterly} for an
+    overview of the pitfalls.)
+
+    Qt 4 solves that problem by merging the QByteArray and \c QCString
+    classes into one class called QByteArray. Most functions that
+    were in \c QCString previously have been moved to QByteArray. The
+    '\\0' issue is handled by having QByteArray allocate one extra
+    byte that it always sets to '\\0'. For example:
+
+    \snippet doc/src/snippets/code/doc_src_porting4.qdoc 8
+
+    The Qt3Support library contains a class called
+    Q3CString that inherits from the new QByteArray class and that
+    extends it to provide an API that is as close to the old \c QCString
+    class as possible. Note that the following functions aren't
+    provided by Q3CString:
+
+    \list
+    \o QCString::find(const QRegExp &, int)
+    \o QCString::findRev(const QRegExp &, int)
+    \o QCString::contains(const QRegExp &)
+    \o QCString::replace(const QRegExp &, const char *)
+    \endlist
+
+    The following functions have lost their last parameter, which
+    specified whether the search was case sensitive or not:
+
+    \list
+    \o QByteArray::find(char, int)
+    \o QByteArray::find(const char *, int)
+    \o QByteArray::findRev(char, int)
+    \o QByteArray::findRev(const char *, int)
+    \o QByteArray::contains(char)
+    \o QByteArray::contains(const char *)
+    \endlist
+
+    In both cases, the solution is to convert the \c QCString to a
+    QString and use the corresponding QString functions instead.
+
+    Also be aware that \c QCString::size() (inherited from
+    QByteArray) used to return the size of the character data \e
+    including the '\\0'-terminator, whereas the new
+    QByteArray::size() is just a synonym for QByteArray::length().
+    This brings QByteArray in line with QString.
+
+    When porting to Qt 4, occurrences of \c QCString should be
+    replaced with QByteArray or QString. The following table
+    summarizes the API differences between the Q3CString
+    class and the Qt 4 QByteArray and QString classes:
+
+    \table
+    \header \o Q3CString function \o Qt 4 equivalent
+    \row \o Q3CString::Q3CString(const char *, uint) \o See remark below
+    \row \o Q3CString::Q3CString(int) \o QByteArray::QByteArray(int, char)
+    \row \o Q3CString::leftJustify() \o QString::leftJustified()
+    \row \o Q3CString::length() \o QByteArray::length() or QByteArray::size() (equivalent)
+    \row \o Q3CString::lower() \o QByteArray::toLower()
+    \row \o Q3CString::rightJustify() \o QString::rightJustified()
+    \row \o Q3CString::setExpand() \o See remark below
+    \row \o Q3CString::simplifyWhiteSpace() \o QByteArray::simplified()
+    \row \o Q3CString::sprintf() \o QString::sprintf()
+    \row \o Q3CString::stripWhiteSpace() \o QByteArray::trimmed()
+    \row \o Q3CString::toDouble() \o QString::toDouble()
+    \row \o Q3CString::toFloat() \o QString::toFloat()
+    \row \o Q3CString::toInt() \o QString::toInt()
+    \row \o Q3CString::toLong() \o QString::toLong()
+    \row \o Q3CString::toShort() \o QString::toShort()
+    \row \o Q3CString::toUInt() \o QString::toUInt()
+    \row \o Q3CString::toULong() \o QString::toULong()
+    \row \o Q3CString::toUShort() \o QString::toUShort()
+    \row \o Q3CString::upper() \o QByteArray::toUpper()
+    \endtable
+
+    Remarks:
+
+    \list 1
+    \o  Q3CString(const char *str, uint max) constructs a string of
+        length strlen(str) or \e max - 1, whichever is shorter.
+        QByteArray(const char *data, int size) constructs a byte
+        array containing exactly \e size bytes.
+
+        \oldcode
+            QCString str1("Hello", 4);           // "Hel"
+            QCString str2("Hello world!", n);
+        \newcode
+            QByteArray str1("Hello", 3);
+            QByteArray str2("Hello world!");
+            str2.truncate(n - 1);
+        \endcode
+
+    \o  Q3CString::setExpand(uint index, char ch) has no equivalent in
+        Qt 4.
+
+        \oldcode
+            QCString str("Hello world");
+            str.setExpand(16, '\n');            // "Hello world     \n"
+        \newcode
+            QByteArray str("Hello world");
+            while (str.size() < 16)
+                str += ' ';
+            str += '\n';
+        \endcode
+    \endlist
+
+    Since the old \c QCString class inherited from QByteArray,
+    everything that is said in the \l{#qbytearray.section}{QByteArray
+    section} applies for \c QCString as well.
+
+    \section1 QCustomEvent
+
+    In Qt 3, developers could create a custom event by constructing
+    a new QCustomEvent, and send relevant data to other components in
+    the application by passing a void pointer, either on construction or
+    using the setData() function. Objects could receive custom events
+    by reimplementing the \l{QObject::customEvent()}{customEvent()}
+    function, and access the stored data using the event's data()
+    function.
+
+    In Qt 4, custom events are created by subclassing
+    QEvent. Event-specific data can be stored in a way that is
+    appropriate for your application. Custom events are still
+    delivered to each object's
+    \l{QObject::customEvent()}{customEvent()} handler function, but as
+    QEvent objects rather than as deprecated QCustomEvent objects.
+
+    \section1 QDataBrowser
+
+    The \c QDataBrowser class has been renamed Q3DataBrowser and
+    moved to the Qt3Support library. In Qt 4.2, you should use the
+    QDataWidgetMapper class to create data-aware forms.
+
+    See \l{QtSql Module} for an overview of the new SQL
+    classes.
+
+    \section1 QDataPump
+
+    The \c QDataPump class was used internally in Qt 2.x in
+    conjunction with QImageConsumer. It was obsoleted in Qt 3.0.
+
+    \input porting4-obsoletedmechanism.qdocinc
+
+    \section1 QDataSink
+
+    The \c QDataSink class was used internally in Qt 2.x in conjunction
+    with QImageConsumer. It was obsoleted in Qt 3.0.
+
+    \input porting4-obsoletedmechanism.qdocinc
+
+    \section1 QDataSource
+
+    The \c QDataSource class was used internally in Qt 2.x in
+    conjunction with QImageConsumer. It was obsoleted in Qt 3.0.
+    \input porting4-obsoletedmechanism.qdocinc
+
+    \section1 QDataTable
+
+    The \c QDataTable class has been renamed Q3DataTable and moved to
+    the Qt3Support library. In Qt 4.2, you should use the
+    QDataWidgetMapper class to create data-aware forms.
+
+    See \l{QtSql Module} for an overview of the new SQL classes.
+
+    \section1 QDataView
+
+    The \c QDataView class has been renamed Q3DataView and moved to
+    the Qt3Support library. In Qt 4.2, you should use the
+    QDataWidgetMapper class to create data-aware forms.
+
+    See \l{QtSql Module} for an overview of the new SQL classes.
+
+    \section1 QDateEdit
+
+    The QDateEdit class in Qt 4 is a convenience class based on
+    QDateTimeEdit. The old class has been renamed Q3DateEdit and moved
+    to the Qt3Support library.
+
+    See \l{Porting to Qt 4 - Virtual Functions}{Virtual Functions} for
+    a list of \c QDateEdit virtual member functions in Qt 3 that are
+    no longer virtual in Qt 4.
+
+    \section1 QDateTimeEditBase
+
+    The \c QDateTimeEditBase class has been renamed
+    Q3DateTimeEditBase and moved to Qt3Support. Use QDateTimeEdit or
+    QAbstractSpinBox instead.
+
+    \section1 QDateTimeEdit
+
+    The old \c QDateTimeEdit class has been renamed
+    Q3DateTimeEditBase and moved to Qt3Support. The new QDateTimeEdit
+    in Qt 4 has been rewritten from scratch to provide a more
+    flexible and powerful API.
+
+    See \l{Porting to Qt 4 - Virtual Functions}{Virtual Functions} for
+    a list of QDateTimeEdit virtual member functions in Qt 3 that are no
+    longer virtual in Qt 4.
+
+    \section1 QDeepCopy<T>
+
+    The \c QDeepCopy<T> class in Qt 3 provided a means of ensuring that
+    implicitly shared and explicitly shared classes referenced unique
+    data. This was necessary because the reference counting in Qt's
+    container classes was done in a thread-unsafe manner.
+
+    With Qt 4, \c QDeepCopy<T> has been renamed Q3DeepCopy<T> and
+    moved to the Qt3Support library. Removing it from
+    existing code is straightforward.
+
+    \oldcode
+        QString str1 = "I am a string";
+        QDeepCopy<QString> str2 = str1;
+        QString str3 = QDeepCopy<QString>(str2);
+    \newcode
+        QString str1 = "I am a string";
+        QString str2 = str1;
+        QString str3 = str2;
+    \endcode
+
+    \section1 QDial
+
+    See \l{Porting to Qt 4 - Virtual Functions}{Virtual Functions} for
+    a list of QDial virtual member functions in Qt 3 that are no longer
+    virtual in Qt 4.
+
+    See \l{#properties}{Properties} for a list of QDial properties in
+    Qt 3 that have changed in Qt 4.
+
+    \target qdict.section
+    \section1 QDict<T>
+
+    \c QDict<T> has been renamed Q3Dict<T> and moved to Qt3Support.
+    It has been replaced by the more modern QHash<Key, T> and
+    QMultiHash<Key, T> classes.
+
+    When porting old code that uses QDict<T> to Qt 4, there are four
+    classes that you can use:
+
+    \table
+    \header \o Qt 4 class \o When to use it
+    \row \o QMultiHash<QString, T *>
+
+         \o Since Q3Dict<T> is pointer-based and allows duplicate
+            keys, this is usually the most straightforward conversion.
+
+    \row \o QMultiHash<QString, T>
+
+         \o If type \c T is an \l{assignable data type}, you can use
+            \c T as the value type rather than \c{T *}. This often
+            leads to nicer code.
+
+    \row \o QHash<QString, T *>
+
+         \o{1,2} If you don't use duplicate keys, you can use QHash
+            instead of QMultiHash. QMultiHash inherits from QHash.
+
+    \row \o QHash<QString, T>
+    \endtable
+
+    The APIs of Q3Dict<T> and QMultiHash<QString, T *> are quite
+    similar. The main issue is that Q3Dict supports auto-delete
+    whereas QMultiHash doesn't.
+
+    \omit
+    (See \l{What's Wrong with
+    Auto-Delete} for an explanation of why the Qt 4 containers don't
+    offer that feature.)
+    \endomit
+
+    The following table summarizes the API differences between the
+    two classes:
+
+    \table
+    \header \o Q3Dict function \o QMultiHash equivalent
+    \row \o Q3Dict::Q3Dict(int size, bool caseSensitive) \o See remarks below
+    \row \o Q3Dict::autoDelete() \o N/A
+    \row \o Q3Dict::count() \o QMultiHash::count() or QMultiHash::size() (equivalent)
+    \row \o Q3Dict::find(const QString &) \o QMultiHash::value(const QString &)
+    \row \o Q3Dict::remove(const QString &) \o QMultiHash::take(const QString &)
+    \row \o Q3Dict::resize(uint) \o QMultiHash::reserve(int)
+    \row \o Q3Dict::setAutoDelete() \o See discussion below
+    \row \o Q3Dict::size() \o QMultiHash::capacity()
+    \row \o Q3Dict::statistics() \o N/A
+    \row \o Q3Dict::operator[](const QString &) \o See remark below
+    \endtable
+
+    Remarks:
+
+    \list 1
+    \o  Q3Dict requires the user to allocate a specific number of
+        buckets by passing a prime number (17 by default) to the
+        constructor and/or calling Q3Dict::resize() later on. In
+        contrast, QMultiHash's hash table automatically grows and
+        shrinks as needed, and the constructor doesn't take a prime
+        number.
+
+    \o  Q3Dict supportes case-insensitive lookups by passing false as
+        second argument to the constructor. This feature has no
+        equivalent in QMultiHash. Instead, call QString::toLower()
+        before you insert or lookup a key in the hash.
+
+    \o  Q3Dict::size() and QMultiHash::size() have different semantics.
+        The former returns the number of buckets in the container, whereas
+        the latter returns the number of \e items in the container.
+
+    \o  If there are multiple items with the same key,
+        Q3Dict::remove() removes only the most recently inserted item,
+        whereas QMultiHash::remove() removes all items that share a
+        particular key. To remove only the most recently inserted item,
+        call QMultiHash::take().
+
+    \o  Q3Dict has only one [] operator (Q3Dict::operator[]()),
+        providing const access to an item's value. QMultiHash also
+        has a non-const overload that can be used on the left side of
+        the assignment operator. If you use the [] operator on a
+        non-const QHash with an unexisting item, QHash will created
+        an element and initialize it to be a null pointer. For that
+        reason, Q3Dict::operator[] should be converted to
+        QMultiHash::value(), not QMultiHash::operator[].
+
+    \endlist
+
+    If you use Q3Dict's auto-delete feature (by calling
+    Q3Dict::setAutoDelete(true)), you need to do some more work. You
+    have two options: Either you call \c delete yourself whenever you
+    remove an item from the container, or you use
+    QMultiHash<QString, T> instead of QMultiHash<QString, T *> (i.e.
+    store values directly instead of pointers to values). Here, we'll
+    see when to call \c delete.
+
+    The following table summarizes the idioms that you need to watch
+    out for if you want to call \c delete yourself.
+
+    \table
+    \header \o Q3Dict idiom \o QMultiHash idiom
+    \row
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 9
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 10
+    \row
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 11
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 12
+    \row
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 13
+
+        (also called from Q3Dict's destructor)
+
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 14
+
+        In 99% of cases, the following idiom also works:
+
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 15
+
+        However, it may lead to crashes if \c hash is referenced from
+        the value type's destructor, because \c hash contains
+        dangling pointers until clear() is called.
+    \endtable
+
+    Be aware that Q3Dict's destructor automatically calls clear(). If
+    you have a Q3Dict data member in a custom class and use the
+    auto-delete feature, you will need to call \c delete on all the
+    items in the container from your class destructor to avoid a
+    memory leak.
+
+    Finally, \c QDictIterator<T> (renamed Q3DictIterator<T>) must
+    also be ported. There are no fewer than four iterator classes
+    that can be used as a replacement: QHash::const_iterator,
+    QHash::iterator, QHashIterator, and QMutableHashIterator. The
+    most straightforward class to use when porting is
+    QHashIterator<QString, T *>. The following table summarizes the
+    API differences:
+
+    \table
+    \header \o Q3DictIterator functions \o Qt 4 equivalent
+    \row \o Q3DictIterator::count() \o QHash::count() or QHash::size()
+    \row \o Q3DictIterator::current() \o QHashIterator::value()
+    \row \o Q3DictIterator::currentKey() \o QHashIterator::key()
+    \row \o Q3DictIterator::isEmpty() \o QHash::isEmpty()
+    \row \o Q3DictIterator::toFirst() \o QHashIterator::toFront()
+    \row \o Q3DictIterator::operator()() \o QHashIterator::value()
+    \row \o Q3DictIterator::operator*() \o QHashIterator::value()
+    \row \o Q3DictIterator::operator++() \o See remark below
+    \endtable
+
+    Be aware that QHashIterator has a different way of iterating than
+    Q3DictIterator. A typical loop with Q3DictIterator looks like this:
+
+    \snippet doc/src/snippets/code/doc_src_porting4.qdoc 16
+
+    Here's the equivalent QHashIterator loop:
+
+    \snippet doc/src/snippets/code/doc_src_porting4.qdoc 17
+
+    See \l{Java-style iterators} for details.
+
+    \section1 QDir
+
+    The following functions used to have a boolean \c{acceptAbsPath}
+    parameter that defaulted to true:
+
+    \list
+    \i QDir::filePath()
+    \i QDir::absFilePath()
+    \i QDir::cd()
+    \i QDir::mkdir()
+    \i QDir::rmdir()
+    \i QDir::remove()
+    \i QDir::rename()
+    \i QDir::exists()
+    \endlist
+
+    In Qt 3, if \c acceptAbsPath is true, a file name starting with
+    '/' is be returned without change; if \c acceptAbsPath is false,
+    an absolute path is prepended to the file name. For example:
+
+    \table
+    \header \i Current directory   \i File name        \i \c acceptAbsPath \i File path
+    \row    \i{1,2} /home/tsmith   \i{1,2} index.html  \i true             \i /home/tsmith/index.html
+    \row                                               \i false            \i /home/tsmith/index.html
+    \row    \i{1,2} /home/tsmith   \i{1,2} /index.html \i true             \i /index.html
+    \row                                               \i false            \i /home/tsmith/index.html
+    \endtable
+
+    In Qt 4, this parameter is no longer available. If you use it
+    in your code, you can check that QDir::isRelativePath() returns
+    false instead.
+
+    \oldcode
+        QDir dir("/home/tsmith");
+        QString path = dir.filePath(fileName, false);
+    \newcode
+        QDir dir("/home/tsmith");
+        QString path;
+        if (dir.isRelativePath(fileName))
+            path = dir.filePath(fileName);
+        else
+            path = fileName;
+    \endcode
+
+    QDir::encodedEntryList() has been removed.
+
+    fileInfoList(), entryInfoList(), and drives() now return a QList<QFileInfo>
+    and not a QPtrList<QFileInfo> *. Code using these methods will not work with
+    the Qt3Support library and must be adapted instead.
+
+    See \l{Porting to Qt 4 - Virtual Functions}{Virtual Functions} for
+    a list of QDir virtual member functions in Qt 3 that are no longer
+    virtual in Qt 4.
+
+    QDir::match() now always matches case insensitively.
+
+    QDir::homeDirPath() has been removed. Use QDir::home() instead, and
+    extract the path separately.
+
+    \section1 QDns
+
+    Qt 3 used its own implementation of the DNS protocol and provided
+    a low-level \c QDns class. Qt 4's QHostInfo class uses the system's \c
+    gethostbyname() function from a thread instead.
+
+    The old \c QDns class has been renamed Q3Dns and moved to the
+    Qt3Support library. The new QHostInfo class has a
+    radically different API: It consists mainly of two static
+    functions, one of which is blocking (QHostInfo::fromName()), the
+    other non-blocking (QHostInfo::lookupHost()). See the QHostInfo
+    class documentation for details.
+
+    \section1 QDockArea
+
+    The \c QDockArea class has been renamed Q3DockArea and moved to
+    the Qt3Support library. In Qt 4, QMainWindow handles
+    the dock and toolbar areas itself. See the QMainWindow
+    documentation for details.
+
+    \section1 QDockWindow
+
+    The old \c QDockWindow class has been renamed Q3DockWindow and
+    moved to the Qt3Support library. In Qt 4, there is a
+    new QDockWidget class with a different API. See the class
+    documentation for details.
+
+    See \l{Porting to Qt 4 - Virtual Functions}{Virtual Functions} for
+    a list of QDockWidget virtual member functions in Qt 3 that are no
+    longer virtual in Qt 4.
+
+    \note \l{Q3DockWindow}'s
+    \l{Q3DockWindow::setHorizontallyStretchable()}{horizontallyStretchable}
+    property can be achieved in QDockWidget with
+    \l{QWidget#Size Hints and Size Policies}{size policies}.
+
+    \section1 QDragObject
+
+    The \c QDragObject class has been renamed Q3DragObject and
+    moved to the Qt3Support library. In Qt 4, it has been
+    replaced by the QMimeData class. See the class documentation for
+    details.
+
+    Note that the Q3DragObject::DragCopyOrMove drag and drop mode is
+    interpreted differently to Qt 3's QDragObject::DragCopyOrMove mode.
+    In Qt 3, a move operation was performed by default, and the user had
+    to hold down the \key{Ctrl} key to perform a copy operation.
+    In Qt 4, a copy operation is performed by default; the user has to
+    hold down the \key{Shift} key to perform a move operation.
+
+    See \l{Porting to Qt 4 - Drag and Drop} for a comparison between
+    the drag and drop APIs in Qt 3 and Qt 4.
+
+    \section1 QDropSite
+
+    The \c QDropSite class has been renamed Q3DropSite and moved to
+    the Qt3Support library.
+
+    The QDropSite class has been obsolete ever since Qt 2.0. The only
+    thing it does is call QWidget::setAcceptDrops(true).
+
+    \oldcode
+    class MyWidget : public QWidget, public QDropSite
+    {
+    public:
+        MyWidget(const QWidget *parent)
+            : QWidget(parent), QDropSite(this)
+        {
+        }
+        ...
+    }
+    \newcode
+    class MyWidget : public QWidget
+    {
+    public:
+        MyWidget(const QWidget *parent)
+            : QWidget(parent)
+        {
+            setAcceptDrops(true);
+        }
+        ...
+    }
+    \endcode
+
+    See \l{Porting to Qt 4 - Drag and Drop} for a comparison between
+    the drag and drop APIs in Qt 3 and Qt 4.
+
+    \section1 QEditorFactory
+
+    The \c QEditorFactory class has been renamed Q3EditorFactory and
+    moved to the Qt3Support library.
+
+    See \l{QtSql Module} for an overview of the new SQL classes.
+
+    \section1 QEventLoop
+
+    In Qt 3, \c QEventLoop combined the Qt event loop and the event
+    dispatching. In Qt 4, these tasks are now assigned to two
+    distinct classes: QEventLoop and QAbstractEventDispatcher.
+
+    If you subclassed QEventLoop to integrate with another library's
+    event loop, you must subclass QAbstractEventDispatcher instead. See
+    the class documentation for details.
+
+    Developers using \c{QEventLoop::loopLevel()} in Qt 3 should use
+    QCoreApplication::loopLevel() instead. Note that this function is
+    marked as obsolete, but it is expected to be available for the
+    lifetime of Qt 4.
+    \omit ### mention virtual functions that aren't virtual anymore \endomit
+
+    \omit
+    \section1 QFile
+
+    The QFile::readLine(QString&, Q_ULONG) method from qt3 has been removed
+    in qt4, but this change in the QFile interface is not documented in the
+    porting documentation as of qt-4.0.0-b1.
+    \endomit
+
+    \section1 QFileDialog
+
+    The QFileDialog class in Qt 4 has been totally rewritten. It
+    provides most of the functionality of the old \c QFileDialog
+    class, but with a different API. Some functionality, such as the
+    ability to preview files, is expected to be added in a later Qt 4
+    release.
+
+    The old \c QFileDialog, \c QFileIconProvider, and \c QFilePreview
+    classes has been renamed Q3FileDialog, Q3FileIconProvider, and
+    Q3FilePreview and have been moved to Qt3Support. You can use them
+    if you need some functionality not provided yet by the new
+    QFileDialog class.
+
+    The following table lists which functions have been renamed or
+    removed in Qt 4.
+
+    \table
+    \header \o Old function \o Qt 4 equivalent
+    \row \o Q3FileDialog::addFilter(const QString &) \o See remark below
+    \row \o Q3FileDialog::addLeftWidget(QWidget *) \o N/A
+    \row \o Q3FileDialog::addRightWidget(QWidget *) \o N/A
+    \row \o Q3FileDialog::addToolButton(QAbstractButton *, bool separator) \o N/A
+    \row \o Q3FileDialog::addWidgets(QLabel *, QWidget *, QPushButton *) \o N/A
+    \row \o Q3FileDialog::dir() \o QFileDialog::directory()
+    \row \o Q3FileDialog::dirPath() \o QFileDialog::directory().path()
+    \row \o Q3FileDialog::iconProvider() \o N/A
+    \row \o Q3FileDialog::isContentsPreviewEnabled() \o N/A
+    \row \o Q3FileDialog::isInfoPreviewEnabled() \o N/A
+    \row \o Q3FileDialog::previewMode() \o N/A
+    \row \o Q3FileDialog::rereadDir() \o N/A
+    \row \o Q3FileDialog::resortDir() \o N/A
+    \row \o Q3FileDialog::selectAll(bool) \o N/A
+    \row \o Q3FileDialog::setContentsPreview(QWidget *, Q3FilePreview *) \o N/A
+    \row \o Q3FileDialog::setContentsPreviewEnabled(bool) \o N/A
+    \row \o Q3FileDialog::setDir(const QString &) \o QFileDialog::setDirectory(const QString &)
+    \row \o Q3FileDialog::setFilters(const char **) \o Q3FileDialog::setFilters(const QStringList &)
+    \row \o Q3FileDialog::setIconProvider(Q3FileIconProvider *) \o N/A
+    \row \o Q3FileDialog::setInfoPreview(QWidget *, Q3FilePreview *) \o N/A
+    \row \o Q3FileDialog::setInfoPreviewEnabled(bool) \o N/A
+    \row \o Q3FileDialog::setPreviewMode(PreviewMode) \o N/A
+    \row \o Q3FileDialog::setSelectedFilter(const QString &) \o QFileDialog::selectFilter(const QString &)
+    \row \o Q3FileDialog::setSelectedFilter(int) \o See remark below
+    \row \o Q3FileDialog::setSelection(const QString &) \o QFileDialog::selectFile(const QString &)
+    \row \o Q3FileDialog::setShowHiddenFiles(bool) \o showHidden()
+    \row \o Q3FileDialog::setUrl(const QUrlOperator &) \o N/A
+    \row \o Q3FileDialog::showHiddenFiles() \o N/A
+    \row \o Q3FileDialog::url() \o QUrl::fromLocalFile(QFileDialog::directory())
+    \header \o Old signals \o Qt 4 equivalent
+    \row \o Q3FileDialog::fileHighlighted(const QString &) \o N/A
+    \row \o Q3FileDialog::fileSelected(const QString &) \o QFileDialog::filesSelected(const QStringList &)
+    \row \o Q3FileDialog::dirEntered(const QString &) \o N/A
+    \row \o Q3FileDialog::filterSelected(const QString &) \o N/A
+    \endtable
+
+    Remarks:
+
+    \list 1
+    \o  The Q3FileDialog::addFilter(const QString &) function has no
+        direct equivalent in the new QFileDialog. Use
+        QFileDialog::setFilters() instead.
+
+        \oldcode
+        fileDialog->addFilter(tr("JPEG files (*.jpg *.jpeg)"));
+        \newcode
+        QStringList filters = fileDialog->filters();
+        filters << tr("JPEG files (*.jpg *.jpeg)");
+        fileDialog->setFilters(filters);
+        \endcode
+
+    \o  The Q3FileDialog::setSelectedFilter(int) overload has no direct
+        equivalent in the new QFileDialog. Use
+        QFileDialog::selectFilter(const QString &) instead.
+
+        \oldcode
+        fileDialog->setSelectedFilter(3);
+        \newcode
+        fileDialog->selectFilter(fileDialog->filters().at(3));
+        \endcode
+    \endlist
+
+    There are no equivalent virtual functions to the two
+    Q3FileDialog::setSelectedFilter() virtual functions in the QFileDialog
+    API. In addition, these functions have been renamed or removed, as
+    described above.
+
+    \section1 QFocusData
+
+    The QFocusData class is not available in Qt 4. Some of its
+    functionality is available via the QWidget::nextInFocusChain()
+    and QWidget::focusNextPrevChild() functions.
+
+    \section1 QFocusEvent
+
+    The setReason() function is no longer present in Qt 4. It is
+    necessary to define the reason when constructing a focus event.
+
+    \section1 QFont
+
+    \c QFont::Script has been moved to QFontDatabase::WritingSystem.
+
+    \section1 QFrame
+
+    The QFrame class has been made more lightweight in Qt 4, by
+    reducing the number of properties and virtual functions. The
+    reduction in the number of virtual functions is significant
+    because QFrame is the base class of many Qt classes.
+
+    Here's an overview of the changes:
+
+    \list
+    \o  QFrame no longer has a \c margin property (which wasn't
+        honored by Qt's layout managers anyway).
+
+    \o  QFrame no longer has a frameChanged() function, reimplement
+        QFrame::resizeEvent() instead.
+
+    \o  QFrame used to have drawFrame(QPainter *) and
+        drawContents(QPainter *) virtual functions. These are now
+        gone. In Qt 4, the frame is drawn by the QFrame::paintEvent()
+        function. If you want to change the way QFrame paints itself,
+        reimplement this function. To draw the contents of the frame,
+        reimplement QFrame:paintEvent() and call the base class
+        implementation of the function before you use the
+        \l {QWidget::}{contentsRect()} function inherited from QWidget,
+        to retrieve the rectangle to paint on.
+
+    \endlist
+
+    To help with porting, the Qt3Support library contains a Q3Frame
+    class that inherits QFrame and provides a similar API to the old
+    QFrame class. If you derived from QFrame in your application, you
+    might want to use Q3Frame as a base class as a first step in the
+    porting process, and later move on to the new QFrame class.
+
+    See \l{Porting to Qt 4 - Virtual Functions}{Virtual Functions} for
+    a list of QFrame virtual member functions in Qt 3 that are no longer
+    virtual in Qt 4.
+
+    \section1 QFtp
+
+    QFtp no longer inherits from QNetworkProtocol. See the
+    \l{#qnetworkprotocol.section}{section on QNetworkProtocol} for
+    details.
+
+    The old \c QFtp class has been renamed Q3Ftp and moved to the
+    Qt3Support library.
+
+    \target qglayoutiterator.section
+    \section1 QGLayoutIterator
+
+    The QGLayoutIterator class no longer exists in Qt 4. This makes
+    only a difference if you implemented custom layout managers
+    (i.e., QLayout subclasses).
+
+    The new approach is much simpler: It consists in reimplementing
+    QLayout::itemAt() and QLayout::takeAt(). These functions operate
+    on indexes, eliminating the need for a layout iterator class.
+
+    \section1 QGrid
+
+    The \c QGrid class is now only available as Q3Grid in Qt 4. You
+    can achieve the same result as \c QGrid by creating a QWidget
+    with a grid layout:
+
+    \oldcode
+    QGrid *grid = new QGrid(2, Qt::Horizontal);
+    QPushButton *child1 = new QPushButton(grid);
+    QPushButton *child2 = new QPushButton(grid);
+    QPushButton *child3 = new QPushButton(grid);
+    QPushButton *child4 = new QPushButton(grid);
+    \newcode
+    QWidget *grid = new QWidget;
+    QPushButton *child1 = new QPushButton(grid);
+    QPushButton *child2 = new QPushButton(grid);
+    QPushButton *child3 = new QPushButton(grid);
+    QPushButton *child4 = new QPushButton(grid);
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(child1, 0, 0);
+    layout->addWidget(child2, 0, 1);
+    layout->addWidget(child3, 1, 0);
+    layout->addWidget(child4, 1, 1);
+    grid->setLayout(layout);
+    \endcode
+
+    \section1 QGridLayout
+
+    See \l{Porting to Qt 4 - Virtual Functions}{Virtual Functions} for
+    a list of QGridLayout virtual member functions in Qt 3 that are no
+    longer virtual in Qt 4.
+
+    \section1 QGridView
+
+    The \c QGridView class has been renamed Q3GridView and moved to
+    the Qt3Support library. In Qt 4, we recommend that
+    you use QTableView or QAbstractItemView for presenting tabular
+    data.
+
+    See \l{Model/View Programming} for an overview of the new item
+    view classes.
+
+    \target qgroupbox.section
+    \section1 QGroupBox
+
+    The QGroupBox class has been redesigned in Qt 4. Many of the
+    features of the old \c QGroupBox class can be obtained by using
+    the Q3GroupBox class from the Qt3Support library.
+
+    The new QGroupBox is more lightweight. It doesn't attempt to
+    duplicate functionality already provided by QGridLayout, and it
+    does not inherit from QFrame. As a result, the following members
+    have been removed:
+
+    \list
+    \o Q3GroupBox::setColumns(), Q3GroupBox::columns()
+    \o Q3GroupBox::setOrientation(), Q3GroupBox::orientation()
+    \o Q3GroupBox::setInsideMargin(), Q3GroupBox::insideMargin()
+    \o Q3GroupBox::addSpace()
+    \endlist
+
+    Naturally, the \c columns and \c orientation properties have also
+    been removed.
+
+    If you rely on some of the missing functionality in your
+    application, you can use Q3GroupBox instead of QGroupBox as a
+    help to porting.
+
+    See \l{Porting to Qt 4 - Virtual Functions}{Virtual Functions} for
+    a list of QGroupBox virtual member functions in Qt 3 that are no
+    longer virtual in Qt 4.
+
+    \section1 QHBox
+
+    The \c QHBox class is now only available as Q3HBox in Qt 4. You
+    can achieve the same result as \c QHBox by creating a QWidget
+    with an horizontal layout:
+
+    \oldcode
+    QHBox *hbox = new QHBox;
+    QPushButton *child1 = new QPushButton(hbox);
+    QPushButton *child2 = new QPushButton(hbox);
+    \newcode
+    QWidget *hbox = new QWidget;
+    QPushButton *child1 = new QPushButton;
+    QPushButton *child2 = new QPushButton;
+
+    QHBoxLayout *layout = new QHBoxLayout;
+    layout->addWidget(child1);
+    layout->addWidget(child2);
+    hbox->setLayout(layout);
+    \endcode
+
+    Note that child widgets are not automatically placed into the widget's
+    layout; you will need to manually add each widget to the QHBoxLayout.
+
+    \section1 QHeader
+
+    The \c QHeader class has been renamed Q3Header and moved to
+    the Qt3Support library. In Qt 4, it is replaced
+    by the QHeaderView class.
+
+    See \l{Model/View Programming} for an overview of the new item
+    view classes.
+
+    \section1 QHGroupBox
+
+    The \c QHGroupBox class has been renamed Q3HGroupBox and moved to
+    the Qt3Support library.
+    Qt 4 does not provide a specific replacement class for \c QHGroupBox
+    since QGroupBox is designed to be a generic container widget. As a
+    result, you need to supply your own layout for any child widgets.
+
+    See \l{#QGroupBox} for more information about porting code that uses
+    group boxes.
+
+    \section1 QHttp
+
+    QHttp no longer inherits from QNetworkProtocol. See the See the
+    \l{#qnetworkprotocol.section}{section on QNetworkProtocol} for
+    details.
+
+    The old \c QHttp, \c QHttpHeader, \c QHttpRequestHeader, and \c
+    QHttpResponseHeader classes have been renamed Q3Http,
+    Q3HttpHeader, Q3HttpRequestHeader, and Q3HttpResponseHeader  and
+    have been moved to the Qt3Support library.
+
+    \section1 QIconFactory
+
+    The QIconFactory class is no longer part of Qt. It has been replaced by
+    the QIconEngine class.
+
+    \section1 QIconSet
+
+    The QIconSet class is no longer part of Qt. It has been replaced by
+    the QIcon class.
+
+    \section1 QIconView
+
+    The \c QIconView, \c QIconViewItem, \c QIconDrag, and \c
+    QIconDragItem classes has been renamed Q3IconView,
+    Q3IconViewItem, Q3IconDrag, and Q3IconDragItem and moved to the
+    Qt3Support library. New Qt applications should use
+    QListWidget or its base class QListView instead, and call
+    QListView::setViewMode(QListView::IconMode) to obtain an "icon
+    view" look.
+
+    See \l{Model/View Programming} for an overview of the new item
+    view classes.
+
+    \omit
+    ###
+
+    \section1 QImage
+
+    QImage::fromMimeSource(const QString &) -> qImageFromMimeSource(const QString &)
+    \endomit
+
+    \section1 QImageDrag
+
+    The \c QImageDrag class has been renamed Q3ImageDrag and moved to
+    the Qt3Support library. In Qt 4, use QMimeData
+    instead and call QMimeData::setImage() to set the image.
+
+    See \l{Porting to Qt 4 - Drag and Drop} for a comparison between
+    the drag and drop APIs in Qt 3 and Qt 4.
+
+    \section1 QImageIO
+
+    The \c QImageIO class has been split into two classes:
+    QImageReader and QImageWriter. The table below shows the
+    correspondance between the two APIs:
+
+    \table
+    \header \o Qt 3 function              \o Qt 4 equivalents
+    \row    \o QImageIO::description()    \o QImageWriter::description()
+    \row    \o QImageIO::fileName()       \o QImageReader::fileName() and QImageWriter::fileName()
+    \row    \o QImageIO::format()         \o QImageReader::format() and QImageWriter::format()
+    \row    \o QImageIO::gamma()          \o QImageWriter::gamma()
+    \row    \o QImageIO::image()          \o Return value of QImageReader::read()
+    \row    \o QImageIO::inputFormats()   \o QImageReader::supportedImageFormats()
+    \row    \o QImageIO::ioDevice()       \o QImageReader::device() and QImageWriter::device()
+    \row    \o QImageIO::outputFormats()  \o QImageWriter::supportedImageFormats()
+    \row    \o QImageIO::parameters()     \o N/A
+    \row    \o QImageIO::quality()        \o QImageWriter::quality()
+    \row    \o QImageIO::read()           \o QImageReader::read()
+    \row    \o QImageIO::setDescription() \o QImageWriter::setDescription()
+    \row    \o QImageIO::setFileName()    \o QImageReader::setFileName() and QImageWriter::setFileName()
+    \row    \o QImageIO::setFormat()      \o QImageReader::setFormat() and QImageWriter::setFormat()
+    \row    \o QImageIO::setGamma()       \o QImageWriter::setGamma()
+    \row    \o QImageIO::setIODevice()    \o QImageReader::setDevice() and QImageWriter::setDevice()
+    \row    \o QImageIO::setImage()       \o Argument to QImageWriter::write()
+    \row    \o QImageIO::setParameters()  \o N/A
+    \row    \o QImageIO::setQuality()     \o QImageWriter::setQuality()
+    \row    \o QImageIO::setStatus()      \o N/A
+    \row    \o QImageIO::status()         \o QImageReader::error() and QImageWriter::error()
+    \row    \o QImageIO::write()          \o QImageWriter::write()
+    \endtable
+
+    \section1 QIntCache<T>
+
+    QIntCache<T> has been moved to Qt3Support. It has been replaced
+    by QCache<int, T>.
+
+    For details, read the \l{#qcache.section}{section on QCache<T>},
+    mentally substituting \c int for QString.
+
+    \section1 QIntDict<T>
+
+    QIntDict<T> and QIntDictIterator<T> have been moved to
+    Qt3Support. They have been replaced by the more modern QHash<Key,
+    T> and QMultiHash<Key, T> classes and their associated iterator
+    classes.
+
+    When porting old code that uses QIntDict<T> to Qt 4, there are
+    four classes that you can use:
+
+    \list
+    \o QMultiHash<int, T *>
+    \o QMultiHash<int, T>
+    \o QHash<int, T *>
+    \o QHash<int, T>
+    \endlist
+
+    For details, read the \l{#qdict.section}{section on QDict<T>},
+    mentally substituting \c int for QString.
+
+    \target qiodevice.section
+    \section1 QIODevice
+
+    The QIODevice class's API has been simplified to make it easier
+    to subclass and to make it work more smoothly with asynchronous
+    devices such as QTcpSocket and QProcess.
+
+    The following virtual functions have changed name or signature:
+
+    \table
+    \header \o Qt 3 function \o Comment
+    \row \o QIODevice::at() const \o Renamed QIODevice::pos().
+    \row \o QIODevice::at(Offset) \o Renamed QIODevice::seek().
+    \row \o QIODevice::open(int) \o The parameter is now of type QIODevice::OpenMode.
+    \row \o QIODevice::readBlock(char *, Q_ULONG) \o QIODevice::read(char *, qint64)
+    \row \o QIODevice::writeBlock(const char *, Q_ULONG) \o QIODevice::write(const char *, qint64)
+    \endtable
+
+    \note QIODevice::open(QIODevice::OpenMode) is no longer pure virtual.
+
+    The following functions are no longer virtual or don't exist anymore:
+
+    \table
+    \row \o QIODevice::getch() \o Renamed QIODevice::getChar() and implemented in terms of QIODevice::readData().
+    \row \o QIODevice::putch(int) \o Renamed QIODevice::putChar() and implemented in terms of QIODevice::writeData().
+    \row \o QIODevice::readAll() \o Implemented in terms of QIODevice::readData().
+    \row \o QIODevice::readLine(char *, Q_ULONG) \o Implemented in terms of QIODevice::readData()
+    \row \o QIODevice::ungetch(int) \o Renamed QIODevice::ungetChar() and simulated using an internal unget buffer.
+    \endtable
+
+    The \c IO_xxx flags have been revised, and the protected setFlags()
+    function removed. Most of the flags have been
+    eliminated because errors are best handled by implementing certain
+    functions in QIODevice subclasses rather than through the base classes.
+    The file access flags, such as \c IO_ReadOnly and \c IO_WriteOnly, have
+    been moved to the QIODevice class to avoid polluting the global
+    namespace. The table below shows the correspondence between the
+    Qt 3 \c IO_xxx flags and the Qt 4 API:
+
+    \table
+    \header \o Qt 3 constant \o Qt 4 equivalent
+    \row \o IO_Direct \o Use !QIODevice::isSequential() instead (notice the \e not).
+    \row \o IO_Sequential \o Use QIODevice::isSequential() instead.
+    \row \o IO_Combined \o N/A
+    \row \o IO_TypeMask \o N/A
+    \row \o IO_Raw \o QIODevice::Unbuffered
+    \row \o IO_Async \o N/A
+    \row \o IO_ReadOnly \o QIODevice::ReadOnly
+    \row \o IO_WriteOnly \o QIODevice::WriteOnly
+    \row \o IO_ReadWrite \o QIODevice::ReadWrite
+    \row \o IO_Append \o QIODevice::Append
+    \row \o IO_Truncate \o QIODevice::Truncate
+    \row \o IO_Translate \o QIODevice::Text
+    \row \o IO_ModeMask \o N/A
+    \row \o IO_Open \o Use QIODevice::isOpen() instead.
+    \row \o IO_StateMask \o N/A
+    \row \o IO_Ok \o N/A
+    \row \o IO_ReadError \o N/A
+    \row \o IO_WriteError \o N/A
+    \row \o IO_FatalError \o N/A
+    \row \o IO_ResourceError \o N/A
+    \row \o IO_OpenError \o N/A
+    \row \o IO_ConnectError \o N/A
+    \row \o IO_AbortError \o N/A
+    \row \o IO_TimeOutError \o N/A
+    \row \o IO_UnspecifiedError \o N/A
+    \endtable
+
+    \section1 QIODeviceSource
+
+    The QIODeviceSource class was used internally in Qt 2.x in
+    conjunction with QImageConsumer. It was obsoleted in Qt 3.0.
+    \input porting4-obsoletedmechanism.qdocinc
+
+    \section1 QLabel
+
+    QLabel doesn't enable word-wrap automatically anymore when rich
+    text is used. You can enable it by calling
+    QLabel::setWordWrap() or by setting the
+    \l{QLabel::wordWrap}{wordWrap} property. The reason for this
+    change is that the old behavior was confusing to many users.
+
+    Also, QLabel no longer offers an \c autoResize property. Instead,
+    you can call QWidget::setFixedSize() on the label, with
+    QLabel::sizeHint() as the argument, whenever you change the
+    contents of the QLabel.
+
+    See also \l{Porting to Qt 4 - Virtual Functions}{Virtual Functions}
+    for a list of QLabel virtual member functions in Qt 3 that are no
+    longer virtual in Qt 4.
+
+    \section1 QLayout
+
+    In Qt 4, margins are always handled by layouts; there is no
+    QLayout::setSupportsMargin() function anymore.
+
+    The deleteAllItems() function is now only available if
+    \c QT3_SUPPORT is defined. If you maintain a QList of layout
+    items, you can use qDeleteAll() to remove all the items in one
+    go.
+
+    In Qt 3, it was possible to change the resizing behavior for layouts
+    in top-level widgets by adjusting the layout's \c resizeMode property.
+    In Qt 4, this property has been replaced by the QLayout::sizeConstraint
+    property which provides more control over how the layout behaves when
+    resized.
+
+    See also the \l{#qlayoutiterator.section}{section on
+    QLayoutIterator} and the \l{#qglayoutiterator.section}{section on
+    QGLayoutIterator}.
+
+    \target qlayoutiterator.section
+    \section1 QLayoutIterator
+
+    The QLayoutIterator class is obsoleted in Qt 4. It is available
+    only if \c QT3_SUPPORT is defined. It can be replaced by the
+    QLayout::itemAt() and QLayout::takeAt() functions, which operate
+    on indexes.
+
+    \oldcode
+        QLayoutIterator it = layout()->iterator();
+        QLayoutItem *child;
+        while ((child = it.current()) != 0) {
+            if (child->widget() == myWidget) {
+                it.takeCurrent();
+                return;
+            ++it;
+        }
+    \newcode
+        int i = 0;
+        QLayoutItem *child;
+        while ((child = layout()->itemAt(i)) != 0) {
+            if (child->widget() == myWidget) {
+                layout()->takeAt(i);
+                return;
+            }
+            ++i;
+        }
+    \endcode
+
+    \section1 QLineEdit
+
+    See \l{#properties}{Properties} for a list of QLineEdit
+    properties in Qt 3 that have changed in Qt 4.
+
+    The default value of QLineEdit's \l{QLineEdit::dragEnabled()}{dragEnabled}
+    property was \c true in Qt 3. In Qt 4, the default value is \c false.
+
+    Note that QLineEdit in Qt 4 is no longer a subclass of QFrame.
+    If you need to visually style a line edit with a frame, we recommend
+    either using a QFrame as a container for a QLineEdit or customizing
+    the line edit with a \l{Qt Style Sheets}{style sheet}.
+
+    \section1 QListBox
+
+    The \c QListBox, \c QListBoxItem, \c QListBoxText, and \c
+    QListBoxPixmap classes have been renamed Q3ListBox,
+    Q3ListBoxItem, Q3ListBoxText, and Q3ListBoxPixmap and have been
+    moved to the Qt3Support library. New Qt applications
+    should use QListWidget or its base class QListView instead.
+
+    See \l{Model/View Programming} for an overview of the new item
+    view classes.
+
+    \section1 QListView
+
+    The \c QListView, \c QListViewItem, \c QCheckListItem, and \c
+    QListViewItemIterator classes have been renamed Q3ListView,
+    Q3ListViewItem, Q3CheckListItem, and Q3ListViewItemIterator, and
+    have been moved to the Qt3Support library. New Qt
+    applications should use one of the following four classes
+    instead: QTreeView or QTreeWidget for tree-like structures;
+    QListWidget or the new QListView class for one-dimensional lists.
+
+    See \l{Model/View Programming} for an overview of the new item
+    view classes.
+
+    \section1 QLocalFs
+
+    The \c QLocalFs class is no longer part of the public Qt API. It
+    has been renamed Q3LocalFs and moved to Qt3Support. Use QDir,
+    QFileInfo, or QFile instead.
+
+    \section1 QMainWindow
+
+    The QMainWindow class has been redesigned in Qt 4 to provide a
+    more modern look and feel and more flexibility. The API has
+    changed to reflect that. The old \c QMainWindow class has been
+    renamed Q3MainWindow and moved to Qt3Support. See the QMainWindow
+    class documentation for details.
+
+    \omit ### More detail \endomit
+
+    \target qmemarray.section
+    \section1 QMemArray<T>
+
+    QMemArray<T> has been moved to Qt3Support. It has been replaced
+    by the QVector<T> class.
+
+    The following table summarizes the API differences between the
+    two classes.
+
+    \table
+    \row \o QMemArray::assign(const QMemArray<T> &) \o QVector::operator=()
+    \row \o QMemArray::assign(const T *, uint) \o See remark below
+    \row \o QMemArray::duplicate(const QMemArray &) \o QVector::operator=()
+    \row \o QMemArray::duplicate(const T *, uint) \o See remark below
+    \row \o QMemArray::setRawData(const T *, uint) \o N/A
+    \row \o QMemArray::resetRawData(const T *, uint) \o N/A
+    \row \o QMemArray::find(const T &, uint) \o QVector::indexOf(const T &, int)
+    \row \o QMemArray::contains(const T &) \o QVector::count(const T &)
+    \row \o QMemArray::sort() \o \l qSort()
+    \row \o QMemArray::bsearch(const T &d) \o \l qBinaryFind()
+    \row \o QMemArray::at(uint) \o QVector::operator[]()
+    \row \o QMemArray::operator const T *() \o QVector::constData()
+    \endtable
+
+    Remarks:
+
+    \list 1
+    \o  QMemArray::assign(const T *, uint) and QMemArray::duplicate(const T *, uint)
+        can be replaced by QVector::resize() and qCopy().
+
+        \oldcode
+        QMemArray<QSize> array;
+        ...
+        array.assign(data, size);
+        \newcode
+        QVector<QSize> vector;
+        ...
+        vector.resize(size);
+        qCopy(data, data + size, vector.begin());
+        \endcode
+
+    \o  QMemArray is an explicitly shared class, whereas QVector is
+        implicitly shared. See \l{Explicit Sharing} for more
+        information.
+    \endlist
+
+    \section1 QMenuBar
+
+    In Qt 3, QMenuBar inherited from QFrame and QMenuData; in Qt 4, it is
+    a direct subclass of QWidget. Applications that provided customized
+    menu bars will need to take advantage of the styling features described
+    in the \l{Qt Style Sheets} document.
+
+    It is not possible to add widgets to menu bars in Qt 4.
+
+    \section1 QMenuData
+
+    In Qt 4, the QMenu class provides a menu widget that can be used in all
+    the places where menus are used in an application. Unlike \c QMenuData,
+    QMenu is designed around the concept of actions, provided by the QAction
+    class, instead of the identifiers used in Qt 3.
+
+    In Qt 3, it was possible to insert widgets directly into menus by using
+    a specific \c QMenuData::insertItem() overload. In Qt 4.2 and later,
+    the QWidgetAction class can be used to wrap widgets for use in Qt 4's
+    action-based APIs.
+
+    \section1 QMessageBox
+
+    The QMessageBox::iconPixmap() function used to return a "const
+    QPixmap *". In Qt 4, it returns a QPixmap.
+
+    \section1 QMimeSourceFactory
+
+    The \c QMimeSourceFactory has been renamed Q3MimeSourceFactory
+    and moved to the Qt3Support library. New Qt applications should
+    use Qt 4's \l{Resource System} instead.
+
+    \section1 QMovie
+
+    The QMovie API has been revised in Qt 4 to make it more
+    consistent with the other Qt classes (notably QImageReader). The
+    table below summarizes the changes.
+
+    \table
+    \header \o Qt 3 function \o Qt 4 equivalent
+    \row \o QMovie::connectResize() \o Connect to QMovie::resized()
+    \row \o QMovie::connectStatus() \o Connect to QMovie::stateChanged()
+    \row \o QMovie::connectUpdate() \o Connect to QMovie::updated()
+    \row \o QMovie::disconnectResize() \o Disconnect from QMovie::resized()
+    \row \o QMovie::disconnectStatus() \o Disconnect from QMovie::stateChanged()
+    \row \o QMovie::disconnectUpdate() \o Disconnect from QMovie::updated()
+    \row \o QMovie::finished() \o Use QMovie::state() instead
+    \row \o QMovie::frameImage() \o Use QMovie::currentImage() instead
+    \row \o QMovie::frameNumber() \o Use QMovie::currentFrameNumber() instead
+    \row \o QMovie::framePixmap() \o Use QMovie::currentPixmap() instead
+    \row \o QMovie::getValidRect() \o Use frameRect() instead
+    \row \o QMovie::isNull() \o Use QMovie::isValid() instead
+    \row \o QMovie::pause() \o Use QMovie::setPaused(true) instead
+    \row \o QMovie::paused() \o Use QMovie::state() instead
+    \row \o QMovie::pushData() \o N/A
+    \row \o QMovie::pushSpace() \o N/A
+    \row \o QMovie::restart() \o Use QMovie::jumpToFrame(0) instead
+    \row \o QMovie::running() \o Use QMovie::state() instead
+    \row \o QMovie::step() \o Use QMovie::jumpToFrame() and QMovie::setPaused() instead
+    \row \o QMovie::step() \o Use QMovie::jumpToNextFrame() instead
+    \row \o QMovie::steps() \o Use QMovie::currentFrameNumber() and QMovie::frameCount() instead
+    \row \o QMovie::unpause() \o Use QMovie::setPaused(false) instead
+    \endtable
+
+    \section1 QMultiLineEdit
+
+    The \c QMultiLineEdit class in Qt 3 was a convenience QTextEdit
+    subclass that provided an interface compatible with Qt 2's
+    QMultiLineEdit class. In Qt 4, it is called Q3MultiLineEdit, it
+    inherits Q3TextEdit, and it is part of Qt3Support. Use QTextEdit
+    in new code.
+
+    \target qnetworkprotocol.section
+    \section1 QNetworkProtocol
+
+    The QNetworkProtocol, QNetworkProtocolFactoryBase,
+    QNetworkProtocolFactory<T>, and QNetworkOperation classes are no
+    longer part of the public Qt API. They have been renamed
+    Q3NetworkProtocol, Q3NetworkProtocolFactoryBase,
+    Q3NetworkProtocolFactory<T>, and Q3NetworkOperation and have been
+    moved to the Qt3Support library.
+
+    In Qt 4 applications, you can use classes like QFtp and QHttp
+    directly to perform file-related actions on a remote host.
+
+    \section1 QObject
+
+    QObject::children() now returns a QObjectList instead of a
+    pointer to a QObjectList. See also the comments on QObjectList
+    below.
+
+    Use QObject::findChildren() (or qFindChildren() if you need MSVC 6
+    compatibility) instead of QObject::queryList(). For example:
+
+    \snippet doc/src/snippets/code/doc_src_porting4.qdoc 18
+
+    QObject::killTimers() has been removed because it was unsafe to
+    use in subclass. (A subclass normally doesn't know whether the
+    base class uses timers or not.)
+
+    The \c QObject::name property has been renamed
+    QObject::objectName.
+
+    \c QObject::objectTrees() has been removed. If you are primarly
+    interested in widgets, use QApplication::allWidgets() or
+    QApplication::topLevelWidgets().
+
+    \section1 QObjectDictionary
+
+    The QObjectDictionary class is a synonym for
+    QAsciiDict<QMetaObject>. See the \l{#qasciidict.section}{section
+    on QAsciiDict<T>}.
+
+    \section1 QObjectList
+
+    In Qt 3, the QObjectList class was a typedef for
+    QPtrList<QObject>. In Qt 4, it is a typedef for QList<QObject *>.
+    See the \l{#qptrlist.section}{section on QPtrList<T>}.
+
+    \section1 QPaintDevice
+
+    To reimplement painter backends one previously needed to reimplement
+    the virtual function QPaintDevice::cmd(). This function is taken out
+    and should is replaced with the function QPaintDevice::paintEngine()
+    and the abstract class QPaintEngine. QPaintEngine provides virtual
+    functions for all drawing operations that can be performed on a
+    painter backend.
+
+    bitBlt() and copyBlt() are now only compatibility functions. Use
+    QPainter::drawPixmap() instead.
+
+    \section1 QPaintDeviceMetrics
+
+    All functions that used to be provided by the \c
+    QPaintDeviceMetrics class have now been moved to QPaintDevice.
+
+    \oldcode
+        QPaintDeviceMetrics metrics(widget);
+        int deviceDepth = metrics.depth();
+    \newcode
+        int deviceDepth = widget->depth();
+    \endcode
+
+    For compatibility, the old \c QPaintDeviceMetrics class has been
+    renamed Q3PaintDeviceMetrics and moved to Qt3Support.
+
+    \section1 QPainter
+
+    The QPainter class has undergone some changes in Qt 4 because of
+    the way rectangles are drawn. In Qt 4, the result of drawing a
+    QRect with a pen width of 1 pixel is 1 pixel wider and 1 pixel
+    taller than in Qt 3.
+
+    For compatibility, we provide a Q3Painter class in Qt3Support
+    that provides the old semantics. See the Q3Painter documentation
+    for details and for the reasons why we had to make this change.
+
+    The \l{http://doc.trolltech.com/3.3/qpainter.html#CoordinateMode-enum}{QPainter::CoordinateMode}
+    enum has been removed in Qt 4. All clipping
+    operations are now defined using logical coordinates and are subject
+    to transformation operations.
+
+    The
+    \l{http://doc.trolltech.com/3.3/qpainter.html#RasterOP-enum}{QPainter::RasterOP}
+    enum has been replaced with QPainter::CompositionMode.
+
+    \section1 QPicture
+
+    In Qt 3, a QPicture could be saved in the SVG file format. In Qt
+    4, the SVG support is provided by the QtSvg module, which
+    includes classes for \e displaying the contents of SVG files.
+
+    If you would like to generate SVG files, you can use the Q3Picture
+    compatibility class or the QSvgGenerator class introduced in Qt 4.3.
+
+    \section1 QPixmap
+
+    The mask() function has been changed to return a reference to a QBitmap
+    rather than a pointer. As a result, it is no longer possible simply to
+    test for a null pointer when determining whether a pixmap has a mask.
+    Instead, you need to explicitly test whether the mask bitmap is null or
+    not.
+
+    \oldcode
+        if (pixmap.mask())
+            widget->setMask(*pixmap.mask());
+    \newcode
+        if (!pixmap.mask().isNull())
+            widget->setMask(pixmap.mask());
+    \endcode
+
+    The \c QPixmap::setOptimization() and \c QPixmap::setDefaultOptimization()
+    mechanism is no longer available in Qt 4.
+
+\omit
+    QPixmap::fromMimeSource(const QString &) -> qPixmapFromMimeSource(const QString &)
+\endomit
+
+    \section1 QPointArray
+
+    The \c QPointArray class has been renamed QPolygon in Qt 4 and
+    has undergone significant changes. In Qt 3, \c QPointArray
+    inherited from QMemArray<QPoint>. In Qt 4, QPolygon inherits from
+    QVector<QPoint>. Everything mentioned in the
+    \l{#qmemarray.section}{section on QMemArray<T>} apply for
+    QPointArray as well.
+
+    The Qt3Support library contains a Q3PointArray class
+    that inherits from QPolygon and provides a few functions that
+    existed in \c QPointArray but no longer exist in QPolygon. These
+    functions include Q3PointArray::makeArc(),
+    Q3PointArray::makeEllipse(), and Q3PointArray::cubicBezier().
+    In Qt 4, we recommend that you use QPainterPath for representing
+    arcs, ellipses, and Bezier curves, rather than QPolygon.
+
+    The QPolygon::setPoints() and QPolygon::putPoints() functions
+    return \c void in Qt 4. The corresponding Qt 3 functions returned
+    a \c bool indicating whether the array was successfully resized
+    or not. This can now be checked by checking QPolygon::size()
+    after the call.
+
+\omit
+    X11 Specific:
+
+    ::appDisplay() -> QX11Info::display()
+    QPaintDevice::x11Display() -> QX11Info::display()
+    QPaintDevice::x11AppDisplay() -> QX11Info::display()
+    QPaintDevice::x11Screen() -> QX11Info::appScreen()
+    QPaintDevice::x11AppScreen() -> ???
+    QPaintDevice::x11Depth() -> QX11Info::appDepth()
+    QPaintDevice::x11ColorMap() -> QX11Info::appColorMap()
+    QPaintDevice::x11DefaultColorMap() -> ???
+    QPaintDevice::x11Visual() -> QX11Info::appVisual()
+    QPaintDevice::x11DefaultVisual() -> ???
+
+    QPaintDevice::x11AppDpiX() -> QX11Info::appDpiX()
+    QPaintDevice::x11AppDpiY() -> QX11Info::appDpiY()
+    QPaintDevice::x11SetAppDpiX() -> QX11Info::setAppDpiX()
+    QPaintDevice::x11SetAppDpiY() -> QX11Info::setAppDpiY()
+
+    QPaintDevice::x11AppDepth() -> ???
+    QPaintDevice::x11AppCells() -> ???
+    QPaintDevice::x11AppRootWindow() -> ???
+    QPaintDevice::x11AppColorMap() -> ???
+    QPaintDevice::x11AppDefaultColorMap() -> ???
+    QPaintDevice::x11AppVisual() -> ???
+    QPaintDevice::x11AppDefaultVisual() -> ???
+
+    End of X11 Specific
+\endomit
+
+    \section1 QPopupMenu
+
+    For most purposes, QPopupMenu has been replaced by QMenu in Qt
+    4. For compatibility with older applications, Q3PopupMenu provides
+    the old API and features that are specific to pop-up menus. Note
+    that, when using Q3PopupMenu, the menu's actions must be \l
+    {Q3Action}s.
+
+    In Qt 3, it was common practice to add entries to pop-up menus using the
+    insertItem() function, maintaining identifiers for future use; for
+    example, to dynamically change menu items.
+    In Qt 4, menu entries are completely represented
+    by actions for consistency with other user interface components, such as
+    toolbar buttons. Create new menus with the QMenu class, and use the
+    overloaded QMenu::addAction() functions to insert new entries.
+    If you need to manage a set of actions created for a particular menu,
+    we suggest that you construct a QActionGroup and add them to that.
+
+    The \l{Qt Examples#Main Windows}{Main Window examples} provided
+    show how to use Qt's action system to construct menus, toolbars, and other
+    common user interface elements.
+
+    \section1 QPrinter
+
+    The QPrinter class now expects printing to be set up from a
+    QPrintDialog.
+
+    \section1 QProcess
+
+    The QProcess class has undergone major improvements in Qt 4. It
+    now inherits QIODevice, which makes it possible to combine
+    QProcess with a QTextStream or a QDataStream.
+
+    The old \c QProcess class has been renamed Q3Process and moved to
+    the Qt3Support library.
+
+    \section1 QProgressBar
+
+    The QProgressBar API has been significantly improved in Qt 4. The
+    old \c QProgressBar API is available as Q3ProgressBar in the
+    Qt3Support library.
+
+    \section1 QProgressDialog
+
+    The QProgressDialog API has been significantly improved in Qt 4.
+    The old \c QProgressDialog API is available as Q3ProgressDialog
+    in the Qt3Support library.
+
+    See \l{#properties}{Properties} for a list of QProgressDialog
+    properties in Qt 3 that have changed in Qt 4.
+
+    \section1 QPtrCollection<T>
+
+    The \c QPtrCollection<T> abstract base class has been renamed
+    Q3PtrCollection<T> moved to the Qt3Support library.
+    There is no direct equivalent in Qt 4.
+
+    \omit
+    ###
+    The QPtrCollection entry is unsatisfactory. The xref is missing
+    its list and saying "no direct equivalent" with so suggestions
+    seems feeble.
+    \endomit
+
+    See \l{Generic Containers} for a list of Qt 4 containers.
+
+    \section1 QPtrDict<T>
+
+    \c QPtrDict<T> and \c QPtrDictIterator<T> have been renamed
+    Q3PtrDict<T> and Q3PtrDictIterator<T> and have been moved to the
+    Qt3Support library. They have been replaced by the
+    more modern QHash<Key, T> and QMultiHash<Key, T> classes and
+    their associated iterator classes.
+
+    When porting old code that uses Q3PtrDict<T> to Qt 4, there are
+    four classes that you can use:
+
+    \list
+    \o QMultiHash<void *, T *>
+    \o QMultiHash<void *, T>
+    \o QHash<void *, T *>
+    \o QHash<void *, T>
+    \endlist
+
+    (You can naturally use other types than \c{void *} for the key
+    type, e.g. \c{QWidget *}.)
+
+    To port Q3PtrDict<T> to Qt 4, read the \l{#qdict.section}{section
+    on QDict<T>}, mentally substituting \c{void *} for QString.
+
+    \target qptrlist.section
+    \section1 QPtrList<T>
+
+    QPtrList<T>, QPtrListIterator<T>, and QPtrListStdIterator<T> have
+    been moved to the Qt3Support library. They have been
+    replaced by the more modern QList and QLinkedList classes and
+    their associated iterator classes.
+
+    When porting to Qt 4, you have the choice of using QList<T> or
+    QLinkedList<T> as alternatives to QValueList<T>. QList<T> has an
+    index-based API and provides very fast random access
+    (QList::operator[]), whereas QLinkedList<T> has an iterator-based
+    API.
+
+    The following table summarizes the API differences between
+    QPtrList<T> and QList<T *>:
+
+    \table
+    \header \o QPtrList function \o QList equivalent
+    \row \o QPtrList::contains(const T *) \o QList::count(T *)
+    \row \o QPtrList::containsRef(const T *) \o QList::count(T *)
+    \row \o QPtrList::find(const T *) \o See remark below
+    \row \o QPtrList::findRef(const T *) \o See remark below
+    \row \o QPtrList::getFirst() \o QList::first()
+    \row \o QPtrList::getLast() \o QList::last()
+    \row \o QPtrList::inSort(const T *) \o N/A
+    \row \o QPtrList::remove(const T *) \o QList::removeAll(T *)
+    \row \o QPtrList::remove(uint) \o QList::removeAt(int)
+    \row \o QPtrList::removeNode(QLNode *) \o N/A
+    \row \o QPtrList::removeRef(const T *) \o QList::removeAll(T *)
+    \row \o QPtrList::sort() \o See remark below
+    \row \o QPtrList::takeNode(QLNode *) \o N/A
+    \row \o QPtrList::toVector(QGVector *) \o See remark below
+    \endtable
+
+    Remarks:
+
+    \list 1
+    \o  QPtrList::toVector(QGVector *) can be replaced by
+        QVector::resize() and qCopy().
+
+        \oldcode
+        QPtrList<QWidget> list;
+        ...
+        QPtrVector<QWidget> vector;
+        list.toVector(&vector);
+        \newcode
+        QList<QWidget *> list;
+        ...
+        QVector<QWidget *> vector;
+        vector.resize(list.size());
+        qCopy(list.begin(), list.end(), vector.begin());
+        \endcode
+
+    \o  QPtrList::sort() relied on the virtual compareItems() to
+        sort items. In Qt 4, you can use \l qSort() instead and pass
+        your "compare item" function as an argument.
+
+    \o  QPtrList::find(const T *) returns an iterator, whereas
+        QList::indexOf(T *) returns an index. To convert an index
+        into an iterator, add the index to QList::begin().
+
+    \o  QPtrList::removeFirst() and QPtrList::removeLast() return a \c
+        bool that indicates whether the element was removed or not.
+        The corresponding QList functions return \c void. You can
+        achieve the same result by calling QList::isEmpty() before
+        attempting to remove an item.
+    \endlist
+
+    If you use QPtrList's auto-delete feature (by calling
+    QPtrList::setAutoDelete(true)), you need to do some more work.
+    You have two options: Either you call \c delete yourself whenever
+    you remove an item from the container, or you can use QList<T>
+    instead of QList<T *> (i.e. store values directly instead of
+    pointers to values). Here, we'll see when to call \c delete.
+
+    \omit
+    (See \l{What's Wrong with Auto-Delete} for an explanation of why
+    the Qt 4 containers don't offer that feature.)
+    \endomit
+
+    The following table summarizes the idioms that you need to watch
+    out for if you want to call \c delete yourself.
+
+    \table
+    \header \o QPtrList idiom \o QList idiom
+    \row
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 19
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 20
+    \row
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 21
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 22
+    \row
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 23
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 24
+    \row
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 25
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 26
+    \row
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 27
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 28
+    \row
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 29
+        (removes the current item)
+
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 30
+    \row
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 31
+
+        (also called from QPtrList's destructor)
+
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 32
+
+        In 99% of cases, the following idiom also works:
+
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 33
+
+        However, it may lead to crashes if \c list is referenced from
+        the value type's destructor, because \c list contains
+        dangling pointers until clear() is called.
+    \endtable
+
+    Be aware that QPtrList's destructor automatically calls clear().
+    If you have a QPtrList data member in a custom class and use the
+    auto-delete feature, you will need to call \c delete on all the
+    items in the container from your class destructor to avoid a
+    memory leak.
+
+    QPtrList had the concept of a "current item", which could be used
+    for traversing the list without using an iterator. When porting
+    to Qt 4, you can use the Java-style QListIterator<T *> (or
+    QMutableListIterator<T *>) class instead. The following table
+    summarizes the API differences:
+
+    \table
+    \header \o QPtrList function \o QListIterator equivalent
+    \row \o QPtrList::at() \o N/A
+    \row \o QPtrList::current() \o QMutableListIterator::value()
+    \row \o QPtrList::currentNode() \o N/A
+    \row \o QPtrList::findNext(const T *) \o QListIterator::findNext(const T *)
+    \row \o QPtrList::findNextRef(const T *) \o QListIterator::findNext(const T *)
+    \row \o QPtrList::first() \o QPtrList::toFront()
+    \row \o QPtrList::last() \o QPtrList::toBack()
+    \row \o QPtrList::next() \o QPtrList::next()
+    \row \o QPtrList::prev() \o QPtrList::previous()
+    \row \o QPtrList::remove() \o QMutableListIterator::remove()
+    \row \o QPtrList::take() \o QMutableListIterator::remove()
+    \endtable
+
+    Be aware that QListIterator has a different way of iterating than
+    QPtrList. A typical loop with QPtrList looks like this:
+
+    \snippet doc/src/snippets/code/doc_src_porting4.qdoc 34
+
+    Here's the equivalent QListIterator loop:
+
+    \snippet doc/src/snippets/code/doc_src_porting4.qdoc 35
+
+    Finally, QPtrListIterator<T> must also be ported. There are no
+    fewer than four iterator classes that can be used as a
+    replacement: QList::const_iterator, QList::iterator,
+    QListIterator, and QMutableListIterator. The most straightforward
+    class to use when porting is QMutableListIterator<T *> (if you
+    modify the list through the iterator) or QListIterator<T *> (if
+    you don't). The following table summarizes the API differences:
+
+    \table
+    \header \o QPtrListIterator function \o Qt 4 equivalent
+    \row \o QPtrListIterator::atFirst() \o !QListIterator::hasPrevious() (notice the \c{!})
+    \row \o QPtrListIterator::atLast() \o !QListIterator::hasNext() (notice the \c{!})
+    \row \o QPtrListIterator::count() \o QList::count() or QList::size()
+    \row \o QPtrListIterator::current() \o QMutableListIterator::value()
+    \row \o QPtrListIterator::isEmpty() \o QList::isEmpty()
+    \row \o QPtrListIterator::toFirst() \o QListIterator::toFront()
+    \row \o QPtrListIterator::toLast() \o QListIterator::toBack()
+    \row \o QPtrListIterator::operator() \o QMutableListIterator::value()
+    \row \o QPtrListIterator::operator*() \o QMutableListIterator::value()
+    \endtable
+
+    Again, be aware that QListIterator has a different way of
+    iterating than QPtrList. A typical loop with QPtrList looks like
+    this:
+
+    \snippet doc/src/snippets/code/doc_src_porting4.qdoc 36
+
+    Here's the equivalent QListIterator loop:
+
+    \snippet doc/src/snippets/code/doc_src_porting4.qdoc 37
+
+    Finally, QPtrListStdIterator<T> must also be ported. This is
+    easy, because QList also provides STL-style iterators
+    (QList::iterator and QList::const_iterator).
+
+    \section1 QPtrQueue<T>
+
+    QPtrQueue has been moved to the Qt3Support library.
+    It has been replaced by the more modern QQueue class.
+
+    The following table summarizes the differences between
+    QPtrQueue<T> and QQueue<T *>:
+
+    \table
+    \header \o QPtrQueue function \o QQueue equivalent
+    \row \o QPtrQueue::autoDelete() \o See discussion below
+    \row \o QPtrQueue::count() \o QQueue::count() or QQueue::size() (equivalent)
+    \row \o QPtrQueue::current() \o QQueue::head()
+    \row \o QPtrQueue::remove() \o QQueue::dequeue()
+    \row \o QPtrQueue::setAutoDelete() \o See discussion below
+    \endtable
+
+    If you use QPtrQueue's auto-delete feature (by calling
+    QPtrQueue::setAutoDelete(true)), you need to do some more work.
+    You have two options: Either you call \c delete yourself whenever
+    you remove an item from the container, or you can use QQueue<T>
+    instead of QQueue<T *> (i.e. store values directly instead of
+    pointers to values). Here, we will show when to call \c delete.
+
+    \omit
+    (See \l{What's Wrong with Auto-Delete} for an explanation of why
+    the Qt 4 containers don't offer that feature.)
+    \endomit
+
+    \table
+    \header \o QPtrQueue idiom \o QQueue idiom
+    \row
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 38
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 39
+    \row
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 40
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 41
+    \row
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 42
+
+        (also called from QPtrQueue's destructor)
+
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 43
+
+        In 99% of cases, the following idiom also works:
+
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 44
+
+        However, it may lead to crashes if \c queue is referenced
+        from the value type's destructor, because \c queue contains
+        dangling pointers until clear() is called.
+    \endtable
+
+    \section1 QPtrStack<T>
+
+    QPtrStack has been moved to the Qt3Support library.
+    It has been replaced by the more modern QStack class.
+
+    The following table summarizes the differences between
+    QPtrStack<T> and QStack<T *>:
+
+    \table
+    \header \o QPtrStack function \o QStack equivalent
+    \row \o QPtrStack::autoDelete() \o See discussion below
+    \row \o QPtrStack::count() \o QStack::count() or QStack::size() (equivalent)
+    \row \o QPtrStack::current() \o QStack::top()
+    \row \o QPtrStack::remove() \o QStack::pop()
+    \row \o QPtrStack::setAutoDelete() \o See discussion below
+    \endtable
+
+    If you use QPtrStack's auto-delete feature (by calling
+    QPtrStack::setAutoDelete(true)), you need to do some more work.
+    You have two options: Either you call \c delete yourself whenever
+    you remove an item from the container, or you can use QStack<T>
+    instead of QStack<T *> (i.e. store values directly instead of
+    pointers to values). Here, we will show when to call \c delete.
+
+    \omit
+    (See \l{What's Wrong with Auto-Delete} for an explanation of why
+    the Qt 4 containers don't offer that feature.)
+    \endomit
+
+    \table
+    \header \o QPtrStack idiom \o QStack idiom
+    \row
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 45
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 46
+    \row
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 47
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 48
+    \row
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 49
+
+        (also called from QPtrStack's destructor)
+
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 50
+
+        In 99% of cases, the following idiom also works:
+
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 51
+
+        However, it may lead to crashes if \c stack is referenced
+        from the value type's destructor, because \c stack contains
+        dangling pointers until clear() is called.
+    \endtable
+
+    \section1 QPtrVector<T>
+
+    QPtrVector<T> has been moved to Qt3Support. It has been replaced
+    by the more modern QVector class.
+
+    When porting to Qt 4, you can use QVector<T *> as an alternative
+    to QPtrVector<T>. The APIs of QPtrVector<T> and QVector<T *> are
+    somewhat similar. The main issue is that QPtrVector supports
+    auto-delete whereas QVector doesn't.
+
+    \omit
+    (See \l{What's Wrong with Auto-Delete} for an explanation of why
+    the Qt 4 containers don't offer that feature.)
+    \endomit
+
+    The following table summarizes the API differences between the
+    two classes:
+
+    \table
+    \header \o QPtrVector function \o QVector equivalent
+    \row \o QPtrVector::autoDelete() \o See discussion below
+    \row \o QPtrVector::bsearch(const T *) \o \l qBinaryFind()
+    \row \o QPtrVector::contains(const T *) \o QVector::count(T *)
+    \row \o QPtrVector::containsRef(const T *) \o QVector::count(T *)
+    \row \o QPtrVector::count() \o See remark below
+    \row \o QPtrVector::insert(uint, T *) \o See remark below
+    \row \o QPtrVector::isNull() \o N/A
+    \row \o QPtrVector::remove(uint) \o See remark below
+    \row \o QPtrVector::setAutoDelete() \o See discussion below
+    \row \o QPtrVector::sort() \o \l qSort()
+    \row \o QPtrVector::take(uint) \o See remark below
+    \row \o QPtrVector::toList(QGList *) \o QList::QList(const QVector &)
+    \endtable
+
+    Remarks:
+
+    \list 1
+    \o  QPtrVector::insert(uint, T *) sets an item to store a certain
+        pointer value. This is \e not the same as QVector::insert(int, T *),
+        which creates space for the item by moving following items by
+        one position. Use \c{vect[i] = ptr} to set a QVector item to
+        a particular value.
+    \o  QPtrVector::remove(uint) sets an item to be 0. This is \e not
+        the same as QVector::removeAt(int), which entirely erases the
+        item, reducing the size of the vector. Use \c{vect[i] = 0} to
+        set a QVector item to 0.
+    \o  Likewise, QPtrVector::take(uint) sets an item to be 0 and
+        returns the previous value of the item. Again, this is easy to
+        achieve using QVector::operator[]().
+    \o  QPtrVector::count() returns the number of non-null items in
+        the vector, whereas QVector::count() (like QVector::size())
+        returns the number of items (null or non-null) in the vector.
+        Fortunately, it's not too hard to simulate QPtrVector::count().
+
+        \oldcode
+        int numValidItems = vect.count();
+        \newcode
+        int numValidItems = vect.size() - vect.count(0);
+        \endcode
+    \endlist
+
+    If you use QVector's auto-delete feature (by calling
+    QVector::setAutoDelete(true)), you need to do some more work. You
+    have two options: Either you call \c delete yourself whenever you
+    remove an item from the container, or you use QVector<T> instead
+    of QVector<T *> (i.e. store values directly instead of pointers
+    to values). Here, we'll see when to call \c delete.
+
+    The following table summarizes the idioms that you need to watch
+    out for if you want to call \c delete yourself.
+
+    \table
+    \header \o QPtrVector idiom \o QVector idiom
+    \row
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 52
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 53
+    \row
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 54
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 55
+    \row
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 56
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 57
+    \row
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 58
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 59
+    \row
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 60
+
+        (also called from QPtrVector's destructor)
+
+        \o
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 61
+
+        In 99% of cases, the following idiom also works:
+
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 62
+
+        However, it may lead to crashes if \c vect is referenced from
+        the value type's destructor, because \c vect contains
+        dangling pointers until clear() is called.
+    \endtable
+
+    Be aware that QPtrVector's destructor automatically calls
+    clear(). If you have a QPtrVector data member in a custom class
+    and use the auto-delete feature, you will need to call \c delete
+    on all the items in the container from your class destructor to
+    avoid a memory leak.
+
+    \section1 QPushButton
+
+    See \l{#properties}{Properties} for a list of QPushButton
+    properties in Qt 3 that have changed in Qt 4.
+
+    \section1 QRangeControl
+
+    In Qt 3, various "range control" widgets (QDial, QScrollBar,
+    QSlider, and QSpin) inherited from both QWidget and
+    \c QRangeControl.
+
+    In Qt 4, \c QRangeControl has been replaced with the new
+    QAbstractSlider and QAbstractSpinBox classes, which inherit from
+    QWidget and provides similar functionality. Apart from eliminating
+    unnecessary multiple inheritance, the new design allows
+    QAbstractSlider to provide signals, slots, and properties.
+
+    The old \c QRangeControl class has been renamed Q3RangeControl
+    and moved to the Qt3Support library, together with
+    the (undocumented) \c QSpinWidget class.
+
+    If you use \c QRangeControl as a base class in your application,
+    you can switch to use QAbstractSlider or QAbstractSpinBox instead.
+
+    \oldcode
+        class VolumeControl : public QWidget, public QRangeControl
+        {
+            ...
+        protected:
+            void valueChange() {
+                update();
+                emit valueChanged(value());
+            }
+            void rangeChange() {
+                update();
+            }
+            void stepChange() {
+                update();
+            }
+        };
+    \newcode
+        class VolumeControl : public QAbstractSlider
+        {
+            ...
+        protected:
+            void sliderChange(SliderChange change) {
+                update();
+                if (change == SliderValueChange)
+                    emit valueChanged(value());
+            }
+        };
+    \endcode
+
+    \section1 QRegExp
+
+    The search() and searchRev() functions have been renamed to indexIn()
+    and lastIndexIn() respectively.
+
+    \section1 QRegion
+
+    The following changes have been made to QRegion in Qt 4:
+
+    \list
+    \o  There is no longer any difference between a \e null region and
+        an \e empty region. Use isEmpty() in most places where you
+        would have used a null QRegion.
+    \o  QRegion::rects() used to return a QMemArray<QRect>. It now returns
+        a QVector<QRect>.
+    \endlist
+
+    \section1 QScrollBar
+
+    See \l{#properties}{Properties} for a list of QScrollBar
+    properties in Qt 3 that have changed in Qt 4.
+
+    \section1 QScrollView
+
+    The \c QScrollView class has been renamed Q3ScrollView and moved
+    to the Qt3Support library. It has been replaced by
+    the QAbstractScrollArea and QScrollArea classes.
+
+    Note that Qt 4 in general uses the QScrollArea::widget() function
+    where Qt 3 used QScrollView::viewport(). The rationale for this is
+    that it is no longer possible to draw directly on a scroll
+    area. The QScrollArea::widget() function returns the widget set on
+    the scroll area.
+
+    \c QScrollView was designed to work around the 16-bit limitation
+    on widget coordinates found on most window systems. In Qt 4, this
+    is done transparently for \e all widgets, so there is no longer a
+    need for such functionality in \c QScrollView. For that reason,
+    the new QAbstractScrollArea and QScrollArea classes are much more
+    lightweight, and concentrate on handling scroll bars.
+
+    \section1 QServerSocket
+
+    The \c QServerSocket class has been renamed Q3ServerSocket and
+    moved to the Qt3Support library. In Qt 4, it has been
+    replaced by QTcpServer.
+
+    With Q3ServerSocket, connections are accepted by reimplementing a
+    virtual function (Q3ServerSocket::newConnection()). With
+    QTcpServer, on the other hand, you don't need to subclass.
+    Instead, simply connect to the QTcpServer::newConnection()
+    signal.
+
+    \section1 QSettings
+
+    The QSettings class has been rewritten to be more robust and to
+    respect existing standards (e.g., the INI file format). The API
+    has also been extensively revised. The old API is still provided
+    when Qt 3 support is enabled.
+
+    Since the format and location of settings have changed between Qt
+    3 and Qt 4, the Qt 4 version of your application won't recognize
+    settings written using Qt 3.
+
+    \section1 QShared
+
+    The \c QShared class has been obsoleted by the more powerful
+    QSharedData and QSharedDataPointer as a means of creating custom
+    implicitly shared classes. It has been renamed Q3Shared moved to
+    the Qt3Support library.
+
+    An easy way of porting to Qt 4 is to include this class into your
+    project and to use it instead of \c QShared:
+
+    \snippet doc/src/snippets/code/doc_src_porting4.qdoc 63
+
+    If possible, we recommend that you use QSharedData and
+    QSharedDataPointer instead. They provide thread-safe reference
+    counting and handle all the reference counting behind the scenes,
+    eliminating the risks of forgetting to increment or decrement the
+    reference count.
+
+    \section1 QSignal
+
+    The QSignal class has been renamed to Q3Signal and moved to the
+    Qt3Support library. The preferred approach is to create your own
+    QObject subclass with a signal that has the desired signature.
+    Alternatively, you can call QMetaObject::invokeMethod() if you
+    want to invoke a slot.
+
+    \section1 QSimpleRichText
+
+    QSimpleRichText has been obsoleted by QTextDocument. It has
+    bene renamed Q3SimpleRichText and moved to the Qt3Support
+    library.
+
+    Previously, you would do the following with Q3SimpleRichText:
+
+    \snippet doc/src/snippets/code/doc_src_porting4.qdoc 63a
+
+    However, with QTextDocument, you use the following code instead:
+
+    \snippet doc/src/snippets/code/doc_src_porting4.qdoc 63b
+
+    See \l{Rich Text Processing} for an overview of the Qt 4 rich
+    text classes.
+
+    \section1 QSlider
+
+    The QSlider::sliderStart() and QSlider::sliderRect() functions
+    have been removed.
+
+    The slider's rect can now be retrieved using the code snippet below:
+
+    \snippet doc/src/snippets/code/doc_src_porting4.qdoc 63c
+
+    In addition, the direction of a vertical QSlider has changed,
+    i.e. the bottom is now the minimum, and the top the maximum. You
+    can use the QAbstractSlider::invertedAppearance property to
+    control this behavior.
+
+    See \l{#properties}{Properties} for a list of QSlider properties
+    in Qt 3 that have changed in Qt 4.
+
+    \section1 QSocket
+
+    The \c QSocket class has been renamed Q3Socket and moved to the
+    Qt3Support library. In Qt 4, it has been replaced by
+    the QTcpSocket class, which inherits most of its functionality
+    from QAbstractSocket.
+
+    \section1 QSocketDevice
+
+    The \c QSocketDevice class has been renamed Q3SocketDevice and
+    moved to the Qt3Support library. In Qt 4, there is no
+    direct equivalent to Q3SocketDevice:
+
+    \list
+    \o If you use Q3SocketDevice in a thread to perform blocking network
+    I/O (a technique encouraged by the \e{Qt Quarterly} article
+    \l{http://doc.trolltech.com/qq/qq09-networkthread.html}{Unblocking Networking}),
+    you can now use QTcpSocket, QFtp, or QHttp instead, which can now be used from
+    non-GUI threads.
+
+    \o If you use Q3SocketDevice for UDP, you can now use QUdpSocket instead.
+
+    \o If you use Q3SocketDevice for other uses, Qt 4 offers no
+    alternative right now. However, there is a \c QAbstractSocketEngine
+    internal class that offers a low-level socket API similar to
+    Q3SocketDevice. Should the need for such functionality arise in
+    Qt 4 applications, we will consider making this class public in a
+    future release.
+    \endlist
+
+    \section1 QSortedList
+
+    The QSortedList<T> class has been deprecated since Qt 3.0. In Qt
+    4, it has been moved to the Qt3Support library.
+
+    In new code, we recommend that you use QList<T> instead and use
+    \l qSort() to sort the items.
+
+    \section1 QSplitter
+
+    The function setResizeMode() has been moved into Qt3Support. Set
+    the stretch factor in the widget's size policy to get equivalent
+    functionality.
+
+    The obsolete function drawSplitter() has been removed. Use
+    QStyle::drawPrimitive() to acheive similar functionality.
+
+    \section1 QSpinBox
+
+    See \l{#properties}{Properties} for a list of QSpinBox properties
+    in Qt 3 that have changed in Qt 4.
+
+    \section1 QSqlCursor
+
+    The \c QSqlCursor class has been renamed Q3SqlCursor and moved to
+    the Qt3Support library. In Qt 4, you can use
+    QSqlQuery, QSqlQueryModel, or QSqlTableModel, depending on
+    whether you want a low-level or a high-level interface for
+    accessing databases.
+
+    See \l{QtSql Module} for an overview of the new SQL classes.
+
+    \section1 QSqlDatabase
+
+    QSqlDatabase is now a smart pointer that is passed around by
+    value. Simply replace all QSqlDatabase pointers by QSqlDatabase
+    objects.
+
+    \section1 QSqlEditorFactory
+
+    The \c QSqlEditorFactory class has been renamed
+    Q3SqlEditorFactory and moved to Qt3Support.
+
+    See \l{QtSql Module} for an overview of the new SQL classes.
+
+    \section1 QSqlError
+
+    The enum \c{Type} was renamed to \c{ErrorType}, The values were renamed as well:
+
+    \list
+    \o None - use NoError instead
+    \o Connection - use ConnectionError instead
+    \o Statement - use StatementError instead
+    \o Transaction - use TransactionError instead
+    \o Unknown - use UnknownError instead
+    \endlist
+
+    \section1 QSqlFieldInfo
+
+    The QSqlFieldInfo class has been moved to Qt3Support. Its
+    functionality is now provided by the QSqlField class.
+
+    See \l{QtSql Module} for an overview of the new SQL classes.
+
+    \section1 QSqlForm
+
+    The \c QSqlForm class has been renamed Q3SqlForm and moved to the
+    Qt3Support library.
+
+    See \l{QtSql Module} for an overview of the new SQL classes.
+
+    \section1 QSqlPropertyMap
+
+    The \c QSqlPropertyMap class has been renamed Q3SqlPropertyMap
+    moved to the Qt3Support library.
+
+    See \l{QtSql Module} for an overview of the new SQL classes.
+
+    \section1 QSqlQuery
+
+    QSqlQuery::prev() was renamed to QSqlQuery::previous().
+    QSqlQuery::prev() remains, but it just calls previous().
+    QSqlQuery no longer has any virtual methods, i.e., exec(),
+    value(), seek(), next(), prev(), first(), last(), and the
+    destructor are no longer virtual.
+
+    \section1 QSqlRecord
+
+    QSqlRecord behaves like a vector now, QSqlRecord::insert() will
+    actually insert a new field instead of replacing the existing
+    one.
+
+    \section1 QSqlRecordInfo
+
+    The QSqlRecordInfo class has been moved to Qt3Support. Its
+    functionality is now provided by the QSqlRecord class.
+
+    See \l{QtSql Module} for an overview of the new SQL classes.
+
+    \section1 QSqlSelectCursor
+
+    The \c QSqlSelectCursor class has been renamed Q3SqlSelectCursor
+    and moved to the Qt3Support library.
+
+    See \l{QtSql Module} for an overview of the new SQL classes.
+
+    \section1 QStoredDrag
+
+    The \c QStoredDrag class has been renamed Q3StoredDrag and moved
+    to the Qt3Support library. In Qt 4, use QMimeData
+    instead and call QMimeData::setData() to set the data.
+
+    See \l{Porting to Qt 4 - Drag and Drop} for a comparison between
+    the drag and drop APIs in Qt 3 and Qt 4.
+
+    \section1 QStr(I)List
+
+    The QStrList and QStrIList convenience classes have been
+    deprecated since Qt 2.0. In Qt 4, they have been moved to the
+    Qt3Support library. If you used any of these, we
+    recommend that you use QStringList or QList<QByteArray> instead.
+
+    \section1 QStr(I)Vec
+
+    The QStrVec and QStrIVec convenience classes have been deprecated
+    since Qt 2.0. In Qt 4, they have been moved to Qt3Support. If you
+    used any of these, we recommend that you use QStringList or
+    QList<QByteArray> instead.
+
+    \section1 QString
+
+    Here are the main issues to be aware of when porting QString to
+    Qt 4:
+
+    \list 1
+    \o  The QString::QString(QChar) constructor performed implicit
+        conversion in Qt 3. Now, you will need a cast to convert a
+        QChar to a QString.
+
+    \o  The QString::QString(const QByteArray &) constructor used to
+        stop at the first '\\0' it encountered, for compatibility
+        with Qt 1. This quirk has now been fixed; in Qt 4, the
+        resulting QString always has the same length as the
+        QByteArray that was passed to the constructor.
+
+    \o  The QString::null static constant has been deprecated in Qt
+        4. For compatibility, Qt 4 provides a QString::null symbol
+        that behaves more or less the same as the old constant. The
+        new idiom is to write QString() instead of QString::null, or
+        to call clear().
+
+        \oldcode
+            str1 = QString::null;
+            if (str2 == QString::null)
+                do_something(QString::null);
+        \newcode
+            str1.clear();
+            if (str2.isNull())
+                do_something(QString());
+        \endcode
+
+        In new code, we recommend that you don't rely on the
+        distinction between a null string and a (non-null) empty
+        string. See \l{Distinction Between Null and Empty Strings}
+        for details.
+
+    \o  QString::latin1() and QString::ascii() have been replaced
+        with QString::toLatin1() and QString::toAscii(), which return
+        a QByteArray instead of a (non-reentrant) \c{const char *}.
+        For consistency, QString::utf8() and QString::local8Bit(),
+        which already returned a QByteArray (actually a \c QCString),
+        have been renamed QString::toUtf8() and
+        QString::toLocal8Bit().
+
+        To obtain a \c{const char *} pointer to ASCII or Latin-1 data,
+        use QString::toAscii() or QString::toLatin1() to obtain a
+        QByteArray containing the data, then call QByteArray::constData()
+        to access the character data directly. Note that the pointer
+        returned by this function is only valid for the lifetime of the
+        byte array; you should avoid taking a pointer to the data
+        contained in temporary objects.
+
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 64
+
+        In the above example, the \c goodData pointer is valid for the lifetime
+        of the \c asciiData byte array. If you need to keep a copy of the data
+        in a non-Qt data structure, use standard C memory allocation and string
+        copying functions to do so \e before destroying the byte array.
+
+    \o  QString::at() returned a non-const reference, whereas the
+        new QString::at() returns a const value. Code like
+
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 65
+
+        will no longer compile. Instead, use QString::operator[]:
+
+        \snippet doc/src/snippets/code/doc_src_porting4.qdoc 66
+
+    \o  The QString::contains(\e x) function (where \e x is a
+        character or a string) has been renamed QString::count(\e x).
+        In addition, there now exists a set of QString::contains()
+        functions that returns a boolean value. Replace old calls to
+        contains() with either count() or contains(), depending on
+        whether you care about the specific number of occurrences of
+        a character in the string or only care about whether the
+        string contains that character or not.
+
+    \o  Many functions in QString had a \c bool parameter that
+        specified case sensitivity. In Qt 4, in the interest of code
+        readability and maintainability, the \c bool parameters have
+        been replaced by the Qt::CaseSensitivity enum, which can take
+        the values Qt::CaseSensitive and Qt::CaseInsensitive.
+
+        \oldcode
+            if (url.startsWith("http:", false))
+                ...
+        \newcode
+            if (url.startsWith("http:", Qt::CaseInsensitive))
+                ...
+        \endcode
+
+    \o  The QString::setExpand(uint, QChar) function, which already
+        was obsolete in Qt 3, is no longer available. Use
+        QString::operator[] instead.
+
+        \oldcode
+            str.setExpand(32, '$');
+        \newcode
+            str[32] = '$';
+        \endcode
+
+    \o  The \c QT_NO_ASCII_CAST and \c QT_NO_CAST_ASCII macros have
+        been renamed \c QT_NO_CAST_TO_ASCII and \c
+        QT_NO_CAST_FROM_ASCII, respectively.
+
+    \o  The QString::data() used to return the same as
+        QString::ascii(). It now returns a pointer to the Unicode
+        data stored in the QString object. Call QString::ascii() if
+        you want the old behavior.
+
+    \o  QString::arg() now converts two-digit place markers, allowing
+        up to 99 place markers to be used in any given string.
+
+    \o  Comparisons between QStrings and \c NULL in order to determine
+        whether strings are empty are no longer allowed.
+        Use \l{QString::}{isEmpty()} instead.
+
+    \endlist
+
+    \section1 QStringList
+
+    QStringList now inherits from QList<QString> and can no longer be
+    converted to a QValueList<QString>. Since QValueList inherits QList a
+    cast will work as expected.
+
+    This change implies some API incompatibilities for QStringList.
+    For example, at() returns the string, not an iterator. See the
+    \l{#qvaluelist.section}{section on QValueList} for details.
+
+    The static QStringList::split() function for splitting strings into
+    lists of smaller strings has been replaced by QString::split(),
+    which returns a QStringList.
+
+    \section1 QStyle
+
+    The QStyle API has been overhauled and improved. Most of the information on
+    why this change was done is described in \l{The Qt 4 Style API}{the QStyle overview}.
+
+    Since QStyle is mostly used internally by Qt's widgets and styles and since
+    it is not essential to the good functioning of an application, there is no
+    compatibility path. This means that we have changed many enums and
+    functions and the qt3to4 porting tool will not change much in your qstyle
+    code. To ease the pain, we list some of the major changes here.
+
+    QStyleOption has taken on a more central role and is no longer an optional
+    argument, please see the QStyleOption documentation for more information.
+
+    The QStyle::StyleFlags have been renamed QStyle::StateFlags and are now prefixed State_
+    instead of Style_, in addition the Style_ButtonDefault flag has moved to
+    QStyleOptionButton.
+
+    The QStyle::PrimitiveElement enumeration has undergone extensive change.
+    Some of the enums were moved to QStyle::ControlElement, some were removed
+    and all were renamed. This renaming is not done by the qt3to4 porting tool,
+    so you must do it yourself. The table below shows how things look
+    now.
+
+    \table
+    \header \o Old name \o New name \o Remark
+    \row \o \c PE_ButtonCommand             \o QStyle::PE_PanelButtonCommand
+    \row \o \c PE_ButtonDefault             \o QStyle::PE_FrameDefaultButton
+    \row \o \c PE_ButtonBevel               \o QStyle::PE_PanelButtonBevel
+    \row \o \c PE_ButtonTool                \o QStyle::PE_PanelButtonTool
+    \row \o \c PE_ButtonDropDown            \o QStyle::PE_IndicatorButtonDropDown
+    \row \o \c PE_FocusRect                 \o QStyle::PE_FrameFocusRect
+    \row \o \c PE_ArrowUp                   \o QStyle::PE_IndicatorArrowUp
+    \row \o \c PE_ArrowDown                 \o QStyle::PE_IndicatorArrowDown
+    \row \o \c PE_ArrowRight                \o QStyle::PE_IndicatorArrowRight
+    \row \o \c PE_ArrowLeft                 \o QStyle::PE_IndicatorArrowLeft
+    \row \o \c PE_SpinBoxUp                 \o QStyle::PE_IndicatorSpinUp
+    \row \o \c PE_SpinBoxDown               \o QStyle::PE_IndicatorSpinDown
+    \row \o \c PE_SpinBoxPlus               \o QStyle::PE_IndicatorSpinPlus
+    \row \o \c PE_SpinBoxMinus              \o QStyle::PE_IndicatorSpinMinus
+    \row \o \c PE_SpinBoxSlider             \o QStyle::CE_SpinBoxSlider \o uses QStyle::drawControl()
+    \row \o \c PE_Indicator                 \o QStyle::PE_IndicatorCheckBox
+    \row \o \c PE_IndicatorMask             \o N/A \o use QStyle::styleHint() to retrieve mask
+    \row \o \c PE_ExclusiveIndicator        \o QStyle::PE_IndicatorRadioButton
+    \row \o \c PE_ExclusiveIndicatorMask    \o N/A \o use QStyle::styleHint() to retrieve mask
+    \row \o \c PE_DockWindowHandle          \o QStyle::PE_IndicatorToolBarHandle
+    \row \o \c PE_DockWindowSeparator       \o QStyle::PE_Q3DockWindowSeparator
+    \row \o \c PE_DockWindowResizeHandle    \o QStyle::PE_IndicatorDockWindowResizeHandle
+    \row \o \c PE_DockWindowTitle           \o QStyle::CE_DockWindowTitle \o uses QStyle::drawControl()
+    \row \o \c PE_Splitter                  \o QStyle::CE_Splitter \o uses QStyle::drawControl()
+    \row \o \c PE_Panel                     \o QStyle::PE_Frame
+    \row \o \c PE_PanelMenu                 \o QStyle::PE_FrameMenu
+    \row \o \c PE_PanelMenuBar              \o QStyle::PE_PanelMenuBar
+    \row \o \c PE_PanelDockWindow           \o QStyle::PE_FrameDockWindow
+    \row \o \c PE_TabBarBase                \o QStyle::PE_FrameTabBarBase
+    \row \o \c PE_HeaderSection             \o QStyle::CE_HeaderSection \o uses QStyle::drawControl()
+    \row \o \c PE_HeaderArrow               \o QStyle::PE_IndicatorHeaderArrow
+    \row \o \c PE_StatusBarSection          \o QStyle::PE_FrameStatusBar
+    \row \o \c PE_Separator                 \o QStyle::PE_Q3Separator
+    \row \o \c PE_SizeGrip                  \o QStyle::CE_SizeGrip \o uses QStyle::drawControl()
+    \row \o \c PE_CheckMark                 \o QStyle::PE_IndicatorMenuCheckMark
+    \row \o \c PE_ScrollBarAddLine          \o QStyle::CE_ScrollBarAddLine \o uses QStyle::drawControl()
+    \row \o \c PE_ScrollBarSubLine          \o QStyle::CE_ScrollBarSubLine \o uses QStyle::drawControl()
+    \row \o \c PE_ScrollBarAddPage          \o QStyle::CE_ScrollBarAddPage \o uses QStyle::drawControl()
+    \row \o \c PE_ScrollBarSubPage          \o QStyle::CE_ScrollBarSubPage \o uses QStyle::drawControl()
+    \row \o \c PE_ScrollBarSlider           \o QStyle::CE_ScrollBarSlider  \o uses QStyle::drawControl()
+    \row \o \c PE_ScrollBarFirst            \o QStyle::CE_ScrollBarFirst   \o uses QStyle::drawControl()
+    \row \o \c PE_ScrollBarLast             \o QStyle::CE_ScrollBarLast    \o uses QStyle::drawControl()
+    \row \o \c PE_ProgressBarChunk          \o QStyle::PE_IndicatorProgressChunk
+    \row \o \c PE_PanelLineEdit             \o QStyle::PE_FrameLineEdit
+    \row \o \c PE_PanelTabWidget            \o QStyle::PE_FrameTabWidget
+    \row \o \c PE_WindowFrame               \o QStyle::PE_FrameWindow
+    \row \o \c PE_CheckListController       \o QStyle::PE_Q3CheckListController
+    \row \o \c PE_CheckListIndicator        \o QStyle::PE_Q3CheckListIndicator
+    \row \o \c PE_CheckListExclusiveIndicato\o QStyle::PE_Q3CheckListExclusiveIndicator
+    \row \o \c PE_PanelGroupBox             \o QStyle::PE_FrameGroupBox
+    \row \o \c PE_TreeBranch                \o QStyle::PE_IndicatorBranch
+    \row \o \c PE_RubberBand                \o QStyle::CE_RubberBand \o uses QStyle::drawControl()
+    \row \o \c PE_PanelToolBar              \o QStyle::PE_PanelToolBar
+    \row \o \c PE_ToolBarHandle             \o QStyle::PE_IndicatorToolBarHandle
+    \row \o \c PE_ToolBarSeparator          \o QStyle::PE_IndicatorToolBarSeparator
+    \endtable
+
+    The QStyle::drawControlMask() and QStyle::drawComplexControlMask()
+    functions have been removed. They are replaced with a style hint.
+
+    The QStyle::drawItem() overloads that took both a pixmap and a string have
+    been removed. Use QStyle::drawItemText() and QStyle::drawItemPixmap() directly.
+
+    The QStyle::itemRect() overload that took both a pixmap and a string is also removed, use
+    either QStyle::itemTextRect() or QStyle::itemPixmapRect() instead.
+
+    \section1 QStyleSheet
+
+    The QStyleSheet and QStyleSheetItem classes have been renamed
+    Q3StyleSheet and Q3StyleSheetItem, and have been moved to the
+    Qt3Support library.
+
+    See \l{Rich Text Processing} for an overview of the Qt 4 rich
+    text classes, and \l{Qt Style Sheets} for a description of
+    CSS-like style sheet support in Qt 4.2 and above.
+
+    \section1 QSyntaxHighlighter
+
+    The \c QSyntaxHighlighter class from Qt 3 has been renamed
+    Q3SyntaxHighlighter and moved to the Qt3Support library. Since Qt
+    4.1, it has been replaced by a new QSyntaxHighlighter class based
+    on Qt 4's new rich text engine.
+
+    \section1 QTabBar
+
+    See \l{#properties}{Properties} for a list of QTabBar properties
+    in Qt 3 that have changed in Qt 4.
+
+    \section1 QTabDialog
+
+    The \c QTabDialog class is no longer part of the public Qt API.
+    It has been renamed Q3TabDialog and moved to Qt3Support. In Qt 4
+    applications, you can easily obtain the same result by combining
+    a QTabWidget with a QDialog and provide \l{QPushButton}s
+    yourself.
+
+    See also the \l{dialogs/tabdialog} example, which shows how to
+    implement tab dialogs in Qt 4.
+
+    \section1 QTabWidget
+
+    See \l{#properties}{Properties} for a list of QTabWidget
+    properties in Qt 3 that have changed in Qt 4.
+
+    \section1 QTable
+
+    The \c QTable, \c QTableItem, \c QComboTableItem, \c
+    QCheckTableItem, and \c QTableSelection classes have been renamed
+    Q3Table, Q3TableItem, Q3ComboTableItem, Q3CheckTableItem, and
+    Q3TableSelection and moved to the Qt3Support library.
+    New Qt applications should use the new QTableWidget or QTableView
+    class instead.
+
+    Some of these classes behave differently with respect to the way
+    they handle \c NULL pointers. For example, Q3TableItem::setPixmap()
+    no longer accepts \c NULL or 0 to indicate that the item should
+    contain a null pixmap; in this case, a null pixmap should be
+    constructed and passed explicitly to the function.
+
+    See \l{Model/View Programming} for an overview of the new item
+    view classes.
+
+    \section1 QTextCodec
+
+    The loadCharmap() and loadCharmapFromFile() functions are no longer
+    available in Qt 4. You need to create your own codec if you want to
+    create a codec based on a POSIX2 charmap definition.
+
+    \section1 QTextDrag
+
+    The \c QTextDrag class has been renamed Q3TextDrag and moved to
+    the Qt3Support library. In Qt 4, use QMimeData
+    instead and call QMimeData::setText() to set the data.
+
+    See \l{Porting to Qt 4 - Drag and Drop} for a comparison between
+    the drag and drop APIs in Qt 3 and Qt 4.
+
+    \section1 QTextEdit
+
+    The old QTextEdit and QTextBrowser classes have been renamed
+    Q3TextEdit and Q3TextBrowser, and have been moved to Qt3Support.
+    The new QTextEdit and QTextBrowser have a somewhat different API.
+
+    The \c QTextEdit::setWrapPolicy() function has been renamed to \l{QTextEdit::setWordWrapMode()}{setWordWrapMode()} and the
+    \c QTextEdit::setWrapColumnOrWidth() function has been renamed to \l{QTextEdit::setLineWrapColumnOrWidth()}
+    {setLineWrapColumnOrWidth()}. The Q3TextEdit::setWrapPolicy() and Q3TextEdit::setWrapColumnOrWidth() still provide this
+    functionality in the Q3TextEdit class.
+
+
+    See \l{Rich Text Processing} for an overview of the Qt 4 rich
+    text classes.
+
+    \section1 QTextIStream
+
+    The QTextIStream convenience class is no longer provided in Qt 4. Use
+    QTextStream directly instead.
+
+    \section1 QTextOStream
+
+    The QTextOStream convenience class is no longer provided in Qt 4. Use
+    QTextStream directly instead.
+
+    \section1 QTextOStreamIterator
+
+    The undocumented \c QTextOStreamIterator class has been removed
+    from the Qt library. If you need it in your application, feel
+    free to copy the source code from the Qt 3 \c <qtl.h> header
+    file.
+
+    \section1 QTextStream
+
+    QTextStream has undergone a number of API and implementation enhancements,
+    and some of the changes affect QTextStream's behavior:
+
+    \list
+    \o QTextStream now uses buffered writing, which means that you need to
+       call QTextStream::flush(), or use the streaming manipulators \c endl or
+       \c flush if you need QTextStream to flush its write buffer. The stream is
+       flushed automatically if QTextStream is deleted or when the device is
+       closed.
+    \o QTextStream now uses buffered reading, so if you read a line from the
+       stream, QTextStream will read as much as it can from the device to
+       fill up its internal read buffer. This speeds up reading significantly,
+       but Qt 3 code that mixed QTextStream access and direct device access
+       may need to be updated.
+    \o While QTextStream in Qt 3 always translated end-of-line characters from
+       Windows style ("\\r\\n") to Unix style ("\\n") on Windows, QTextStream in
+       Qt 4 only does this on devices opened with the \c{QIODevice::Text} mode
+       (formerly \c{IO_Translate}).
+    \endlist
+
+    Note that when using a QTextStream on a QFile in Qt 4, calling
+    QIODevice::reset() on the QFile will not have the expected result
+    because QTextStream now buffers the file. Use the
+    QTextStream::seek() function instead.
+
+    \section1 QTextView
+
+    The \c QTextView class has been renamed Q3TextView and moved to the
+    Qt3Support library.
+
+    \section1 QTimeEdit
+
+    The QTimeEdit class in Qt 4 is a convenience class based on
+    QDateTimeEdit. The old class has been renamed Q3TimeEdit and moved
+    to the Qt3Support library.
+
+    See \l{Porting to Qt 4 - Virtual Functions}{Virtual Functions} for
+    a list of \c QTimeEdit virtual member functions in Qt 3 that are no
+    longer virtual in Qt 4.
+
+    \section1 QTimer
+
+    Windows restricts the granularity of timers, but starting with Qt 4,
+    we emulate a finer time resolution. On Windows XP we use the
+    multimedia timer API, which gives us 1 millisecond resolution for
+    QTimer.
+
+    Note that other versions of Windows have a lower timer resolution,
+    and that code relying on underlying system timer restrictions
+    encounters no such limitations using Qt 4 (e.g., setting an
+    interval of 0 millisecond results in Qt occupying all of the
+    processor time when no GUI events need processing).
+
+    \section1 QToolBar
+
+    The old \c QToolBar class, which worked with the old \c
+    QMainWindow and \c QDockArea classes and inherited from \c
+    QDockWindow, has been renamed Q3ToolBar and moved to
+    Qt3Support. Note that, when using Q3ToolBar, the toolbar's actions
+    must be \l {Q3Action}s.
+
+    Use the new QToolBar class in new applications.
+
+    \note \l{Q3ToolBar}'s
+    \l{Q3DockWindow::setHorizontallyStretchable()}{horizontallyStretchable}
+    property can be achieved in QToolBar with
+    \l{QWidget#Size Hints and Size Policies}{size policies}.
+
+    \section1 QToolButton
+
+    See \l{#properties}{Properties} for a list of QToolButton properties
+    in Qt 3 that have changed in Qt 4.
+
+    Note that many of the properties that could previously be set in
+    the constructor must now be set separately.
+
+    \section1 QToolTip
+
+    The QToolTip::setGloballyEnabled() function no longer exists.
+    Tooltips can be disabled by \l{QObject::installEventFilter()}{installing
+    an event filter} on qApp (the unique QApplication object) to block events
+    of type QEvent::ToolTip.
+
+    \section1 QUriDrag
+
+    The \c QUriDrag class has been renamed Q3UriDrag and moved to the
+    Qt3Support library. In Qt 4, use QMimeData instead
+    and call QMimeData::setUrl() to set the URL.
+
+    See \l{Porting to Qt 4 - Drag and Drop} for a comparison between
+    the drag and drop APIs in Qt 3 and Qt 4.
+
+    \section1 QUrl
+
+    The QUrl class has been rewritten from scratch in Qt 4 to be more
+    standard-compliant. The old QUrl class has been renamed Q3Url and
+    moved to the Qt3Support library.
+
+    The new QUrl class provides an extensive list of compatibility
+    functions to ease porting from Q3Url to QUrl. A few functions
+    require you to change your code:
+
+    \list
+    \o Q3Url::Q3Url(const Q3Url &, const QString &, bool) can be
+       simulated by combining the URLs manually (using
+       QString::operator+(), for example).
+    \o Q3Url::setEncodedPathAndQuery(const QString &) is replaced by
+       QUrl::setPath() and QUrl::setEncodedQuery().
+    \o Q3Url::encodedPathAndQuery() is replaced by QUrl::path() and
+       QUrl::encodedQuery().
+    \o Q3Url::isLocalFile() can be simulated by checking that
+       QUrl::protocol() is "file".
+    \o Q3Url::toString(bool, bool) is replaced by
+       QUrl::toString(int), where the \c int parameter specifies a
+       combination of \l{QUrl::FormattingOptions}{formatting
+       options}.
+    \endlist
+
+    \section1 QUrlOperator
+
+    The \c QUrlOperator class is no longer part of the public Qt API.
+    It has been renamed Q3UrlOperator and moved to Qt3Support.
+
+    From Qt 4.4, the Network Access API provides a subset of the features
+    provided by \c QUrlOperator that are mostly intended for use with
+    applications that use the HTTP and FTP protocols. See the
+    QNetworkRequest, QNetworkReply, and QNetworkAccessManager documentation
+    for further details.
+
+    \target qvaluelist.section
+    \section1 QValueList<T>
+
+    The QValueList<T> class has been replaced by QList<T> and
+    QLinkedList<T> in Qt 4. As a help when porting older Qt
+    applications, the Qt3Support library contains a
+    QValueList<T> class implemented in terms of the new
+    QLinkedList<T>. Similarly, it contains QValueListIterator<T> and
+    QValueListConstIterator<T> classes implemented in terms of
+    QLinkedList<T>::iterator and QLinkedList<T>::const_iterator.
+
+    When porting to Qt 4, you have the choice of using QList<T> or
+    QLinkedList<T> as alternatives to QValueList<T>. QList<T> has an
+    index-based API and provides very fast random access
+    (QList::operator[]), whereas QLinkedList<T> has an iterator-based
+    API.
+
+    Here's a list of problem functions:
+
+    \list
+    \o  QValueList(const std::list<T> &) doesn't exist in QList or
+        QLinkedList. You can simulate it by calling
+        \l{QLinkedList::append()}{append()} in a loop.
+
+    \o  QValueList::insert(iterator, size_type, const T& x) doesn't
+        exist in QList or QLinkedList. Call
+        \l{QLinkedList::insert()}{insert()} repeatedly instead.
+
+    \o  QValueList::fromLast() doesn't exist in QList or QLinkedList. Use
+        QValueList::end() instead.
+
+        \oldcode
+        for (QValueList<T>::iterator i = list.fromLast(); i != list.begin(); --i)
+            do_something(*i);
+        \newcode
+        QLinkedList<T>::iterator i = list.end();
+        while (i != list.begin()) {
+            --i; // decrement i before using it
+            do_something(*i);
+        }
+        \endcode
+
+    \o  QValueList::append() and QValueList::prepend() return an
+        iterator to the inserted item. QList's and QLinkedList's
+        corresponding functions don't, but it's not a problem because
+        QValueList::prepend() always returns begin() and append()
+        always returns QValueList::end() - 1.
+
+    \o  QValueList::at(\e i) return an iterator to the item at index
+        \e i. This corresponds to QList::begin() + \e i.
+
+    \o  QValueList::contains(const T &) corresponds to
+        QList::count(const T &) and QLinkedList::count(const T &).
+    \endlist
+
+    \section1 QValueVector<T>
+
+    The QValueVector<T> class has been replaced by QVector<T> in Qt
+    4. As a help when porting older Qt applications, the Qt3Support
+    library contains a Q3ValueVector<T> class implemented in terms of
+    the new QVector<T>.
+
+    When porting from QValueVector<T> to QVector<T>, you might run
+    into the following incompatibilities:
+
+    \list
+    \o QValueVector(const std::vector<T> &) doesn't exist in QVector.
+       You can simulate it by calling QVector::append()} in a loop.
+    \o QValueVector::resize(int, const T &) doesn't exist in QVector.
+       If you want the new items to be initialized with a particular
+       value, use QVector::insert() instead.
+    \o QValueVector::at() on a non-const vector returns a non-const
+       reference. This corresponds to QVector::operator[]().
+    \o Both QValueVector::at() functions have an \e ok parameter of
+       type \c{bool *} that is set to true if the index is within
+       bounds. This functionality doesn't exist in QVector; instead,
+       check the index against QVector::size() yourself.
+    \endlist
+
+    See \l{Generic Containers} for an overview of the Qt 4 container
+    classes.
+
+    \section1 QVariant
+
+    Some changes to the rest of the Qt library have
+    implications on QVariant:
+
+    \list 1
+    \o The \c QVariant::ColorGroup enum value is defined only
+       if \c QT3_SUPPORT is defined.
+    \o The \c QVariant::IconSet enum value has been renamed
+       QVariant::Icon.
+    \o The \c QVariant::CString enum value is now a synonym for
+       QVariant::ByteArray.
+    \endlist
+
+    Also, the QVariant(bool, int) constructor has been replaced by QVariant(bool).
+    Old code like QVariant(true, 0) should be replaced with QVariant(true); otherwise,
+    the QVariant(int, void *) overload might accidentally be triggered.
+
+    Many of QVariant's convenience functions in Qt 3, such as toColor() and
+    toKeySequence(), have been removed to enable QVariant to be part of the
+    QtCore module. QVariant is still able to hold values of these types.
+
+    Types which are not supported by any of the QVariant constructors can be
+    stored as variants with the QVariant::fromValue() function. Types with no
+    suitable convenience function for unpacking can be retrieved with the
+    QVariant::value() function or passed directly to classes that implement
+    the QVariant() operator.
+
+    \table
+    \header \o Qt 3 function \o Qt 4 function
+    \input porting4-removedvariantfunctions.qdocinc
+    \endtable
+
+    See the QVariant::Type enum for a list of types supported by QVariant.
+
+    \section1 QVBox
+
+    The \c QVBox class is now only available as Q3VBox in Qt 4. You
+    can achieve the same result as \c QVBox by creating a QWidget
+    with a vertical layout:
+
+    \oldcode
+    QVBox *vbox = new QVBox;
+    QPushButton *child1 = new QPushButton(vbox);
+    QPushButton *child2 = new QPushButton(vbox);
+    \newcode
+    QWidget *vbox = new QWidget;
+    QPushButton *child1 = new QPushButton;
+    QPushButton *child2 = new QPushButton;
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(child1);
+    layout->addWidget(child2);
+    vbox->setLayout(layout);
+    \endcode
+
+    Note that child widgets are not automatically placed into the widget's
+    layout; you will need to manually add each widget to the QVBoxLayout.
+
+    \section1 QVGroupBox
+
+    The \c QVGroupBox class has been renamed Q3VGroupBox and moved to
+    the Qt3Support library.
+    Qt 4 does not provide a specific replacement class for \c QVGroupBox
+    since QGroupBox is designed to be a generic container widget. As a
+    result, you need to supply your own layout for any child widgets.
+
+    See \l{#QGroupBox} for more information about porting code that uses
+    group boxes.
+
+    \section1 QWhatsThis
+
+    The QWhatsThis class has been redesigned in Qt 4. The old \c
+    QWhatsThis class is available as Q3WhatsThis in Qt3Support.
+
+    \section1 QWidget
+
+    Widget background painting has been greatly improved, supporting
+    flicker-free updates and making it possible to have
+    semi-transparent widgets. This renders the following background
+    handling functions obsolete:
+
+    \list
+    \o QWidget::repaint(bool noErase) - the \c noErase boolean parameter is gone
+    \o QWidget::setBackgroundMode(BackgroundMode m)
+    \o QWidget::backgroundBrush() const
+    \o QWidget::setBackgroundPixmap(const QPixmap &pm)
+    \o QWidget::backgroundPixmap() const
+    \o QWidget::setBackgroundColor(const QColor &c)
+    \o QWidget::backgroundColor() const
+    \o QWidget::foregroundColor() const
+    \o QWidget::eraseColor() const
+    \o QWidget::setEraseColor(const QColor &c)
+    \o QWidget::erasePixmap() const
+    \o QWidget::setErasePixmap(const QPixmap &p)
+    \o QWidget::paletteForegroundColor()
+    \o QWidget::setPaletteForegroundColor(const QColor &c)
+    \o QWidget::paletteBackgroundColor()
+    \o QWidget::setPaletteBackgroundColor(const QColor &c)
+    \o QWidget::paletteBackgroundPixmap() const
+    \o QWidget::setPaletteBackgroundPixmap(const QPixmap &p)
+    \o QWidget::erase()
+    \o QWidget::erase(const QRect &r)
+    \o QWidget::setBackgroundOrigin( BackgroundOrigin )
+    \o QWidget::BackgroundOrigin backgroundOrigin() const
+    \o QWidget::backgroundOffset()
+    \endlist
+
+    Sample code on how to do obtain similar behavior from Qt 4, previously
+    handled by some of the above functions can be found in the
+    \l{http://doc.trolltech.com/qwidget-qt3.html}{Qt 3 Support Members for QWidget}
+    page.
+
+    A widget now receives change events in its QWidget::changeEvent()
+    handler. This makes the following virtual change handlers obsolete:
+
+    \list
+    \o QWidget::styleChange - use QEvent::StyleChange
+    \o QWidget::enabledChange - use QEvent::EnabledChange
+    \o QWidget::paletteChange - use QEvent::PaletteChange
+    \o QWidget::fontChange - use QEvent::FontChange
+    \o QWidget::windowActivationChange - use QEvent::ActivationChange
+    \o QWidget::languageChange - use QEvent::LanguageChange
+    \endlist
+
+    The following functions were slots, but are no more:
+    \list
+    \o QWidget::clearFocus()
+    \o QWidget::setMouseTracking()
+    \o QWidget::stackUnder(QWidget*)
+    \o QWidget::move(int x, int y)
+    \o QWidget::move(const QPoint &)
+    \o QWidget::resize(int w, int h)
+    \o QWidget::resize(const QSize &)
+    \o QWidget::setGeometry(int x, int y, int w, int h)
+    \o QWidget::setGeometry(const QRect &)
+    \o QWidget::adjustSize()
+    \o QWidget::update(int x, int y, int w, int h)
+    \o QWidget::update(const QRect&)
+    \o QWidget::repaint(bool erase)
+    \o QWidget::repaint(int x, int y, int w, int h, bool erase)
+    \o QWidget::repaint(const QRect &, bool erase)
+    \o QWidget::repaint(const QRegion &, bool erase)
+    \o QWidget::setCaption(const QString &)
+    \o QWidget::setIcon(const QPixmap &)
+    \o QWidget::setIconText(const QString &)
+    \endlist
+
+    The following functions were incorrectly marked as virtual:
+
+    \list
+    \o QWidget::close(bool alsoDelete)
+    \o QWidget::create(WId, bool, bool)
+    \o QWidget::destroy(bool)
+    \o QWidget::move(int x, int y)
+    \o QWidget::reparent(QWidget *parent, WFlags, const QPoint &, bool)
+    \o QWidget::resize(int w, int h)
+    \o QWidget::setAcceptDrops(bool on)
+    \o QWidget::setActiveWindow()
+    \o QWidget::setAutoMask(bool)
+    \o QWidget::setBackgroundColor(const QColor &)
+    \o QWidget::setBackgroundMode(BackgroundMode)
+    \o QWidget::setBackgroundOrigin(BackgroundOrigin)
+    \o QWidget::setBackgroundPixmap(const QPixmap &)
+    \o QWidget::setCaption(const QString &)
+    \o QWidget::setCursor(const QCursor &)
+    \o QWidget::setEnabled(bool)
+    \o QWidget::setEraseColor(const QColor &)
+    \o QWidget::setErasePixmap(const QPixmap &)
+    \o QWidget::setFocus()
+    \o QWidget::setFocusPolicy(FocusPolicy)
+    \o QWidget::setFocusProxy(QWidget *)
+    \o QWidget::setFont(const QFont &)
+    \o QWidget::setGeometry(const QRect &)
+    \o QWidget::setGeometry(int x, int y, int w, int h)
+    \o QWidget::setIcon(const QPixmap &)
+    \o QWidget::setIconText(const QString &)
+    \o QWidget::setKeyCompression(bool)
+    \o QWidget::setMask(const QBitmap &)
+    \o QWidget::setMask(const QRegion &)
+    \o QWidget::setMaximumSize(int maxw, int maxh)
+    \o QWidget::setMicroFocusHint(int x, int y, int w, int h, bool, QFont *f)
+    \o QWidget::setMinimumSize(int minw, int minh)
+    \o QWidget::setMouseTracking(bool enable)
+    \o QWidget::setPalette(const QPalette &)
+    \o QWidget::setPaletteBackgroundColor(const QColor &)
+    \o QWidget::setPaletteBackgroundPixmap(const QPixmap &)
+    \o QWidget::setSizeIncrement(int w, int h)
+    \o QWidget::setSizePolicy(QSizePolicy)
+    \o QWidget::setUpdatesEnabled(bool enable)
+    \o QWidget::setWState(uint)
+    \o QWidget::show()
+    \o QWidget::showFullScreen()
+    \o QWidget::showMaximized()
+    \o QWidget::showMinimized()
+    \o QWidget::showNormal()
+    \o QWidget::sizePolicy()
+    \o QWidget::unsetCursor()
+    \endlist
+
+    The internal clearWState() function was removed. Use
+    QWidget::setAttribute() instead.
+
+    setWFlags() was renamed QWidget::setWindowFlags().
+
+    clearWFlags() has no direct replacement. You can use
+    QWidget::setAttribute() instead. For example,
+    \c{setAttribute(..., false)} to clear an attribute. More information
+    is available \l{http://doc.trolltech.com/qwidget.html#setAttribute}{here}.
+
+    testWFlags() was renamed to \l{QWidget::testAttribute()}{testAttribute()}.
+
+    See \l{#properties}{Properties} for a list of QWidget properties
+    in Qt 3 that have changed in Qt 4.
+
+    \section1 QWidgetFactory
+
+    The \c QWidgetFactory class has been replaced by QFormBuilder in Qt 4.
+
+    \section1 QWidgetIntDict
+
+    The QWidgetIntDict class was a synonym for QIntDict<QWidget>. It
+    is no longer available in Qt 4. If you link against Qt3Support,
+    you can use Q3IntDict<QWidget> instead; otherwise, see the
+    \l{#qdict.section}{section on QDict<T>}.
+
+    \target qwidgetlist.section
+    \section1 QWidgetList
+
+    In Qt 3, the QWidgetList class was a typedef for
+    QPtrList<QWidget>. In Qt 4, it is a typedef for QList<QWidget *>.
+    See the \l{#qptrlist.section}{section on QPtrList<T>}.
+
+    \section1 QWidgetPlugin
+
+    The QWidgetPlugin class is no longer available in Qt 4. To create
+    custom widget plugins, subclass QDesignerCustomWidgetInterface to
+    provide information about the custom widget, and build a plugin in
+    the way described in the \l{designer/customwidgetplugin}{Custom
+    Widget Plugin} example.
+
+    \section1 QWidgetStack
+
+    The QWidgetStack class is no longer part of the Qt public API. It
+    has been renamed Q3WidgetStack and moved to Qt3Support. In Qt 4
+    applications, you can use QStackedWidget instead to obtain the
+    same results.
+
+    \section1 QWizard
+
+    The \c QWizard class was reintroduced in Qt 4.3. See the
+    \l{Trivial Wizard Example}, \l{License Wizard Example} and
+    \l{Class Wizard Example} for more details.
+
+    \section1 QWorkspace
+
+    The \c QWorkspace in Qt 4 class requires explicit adding of MDI
+    windows with QWorkspace::addWindow().
+*/
+
+/*!
+    \page porting4-virtual-functions.html
+    \title Porting to Qt 4 - Virtual Functions
+    \contentspage {Porting Guides}{Contents}
+    \previouspage Porting to Qt 4
+    \nextpage Porting to Qt 4 - Drag and Drop
+    \ingroup porting
+    \brief An overview of changes to virtual functions in Qt 4.
+
+    \section1 Virtual Functions
+
+    Virtual functions that changed their signature in Qt 4:
+
+    \table
+    \header \o Qt 3 function signature \o Qt 4 function signature
+    \input porting4-modifiedvirtual.qdocinc
+    \endtable
+
+    Virtual functions that are not virtual in Qt 4:
+
+    \table
+    \header \o Qt 3 function \o Comment
+    \input porting4-removedvirtual.qdocinc
+    \endtable
+*/
diff --git a/doc/src/printing.qdoc b/doc/src/printing.qdoc
new file mode 100644
index 0000000000..e1c337a613
--- /dev/null
+++ b/doc/src/printing.qdoc
@@ -0,0 +1,175 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \page printing.html
+  \title Printing with Qt
+  \ingroup multimedia
+  \ingroup text-processing
+  \brief A guide to producing printed output with Qt's paint system and widgets.
+
+  Qt provides extensive cross-platform support for printing. Using the printing
+  systems on each platform, Qt applications can print to attached printers and
+  across networks to remote printers. Qt's printing system also enables PostScript
+  and PDF files to be generated, providing the foundation for basic report
+  generation facilities.
+
+  \tableofcontents
+
+  \section1 Paint Devices and Printing
+
+  In Qt, printers are represented by QPrinter, a paint device that provides
+  functionality specific to printing, such as support for multiple pages and
+  double-sided output. As a result, printing involves using a QPainter to paint
+  onto a series of pages in the same way that you would paint onto a custom
+  widget or image.
+
+  \section2 Creating a QPrinter
+
+  Although QPrinter objects can be constructed and set up without requiring user
+  input, printing is often performed as a result of a request by the user;
+  for example, when the user selects the \gui{File|Print...} menu item in a GUI
+  application. In such cases, a newly-constructed QPrinter object is supplied to
+  a QPrintDialog, allowing the user to specify the printer to use, paper size, and
+  other printing properties.
+
+  \snippet examples/richtext/orderform/mainwindow.cpp 18
+
+  It is also possible to set certain default properties by modifying the QPrinter
+  before it is supplied to the print dialog. For example, applications that
+  generate batches of reports for printing may set up the QPrinter to
+  \l{QPrinter::setOutputFileName()}{write to a local file} by default rather than
+  to a printer.
+
+  \section2 Painting onto a Page
+
+  Once a QPrinter object has been constructed and set up, a QPainter can be used
+  to perform painting operations on it. We can construct and set up a painter in
+  the following way:
+
+  \snippet doc/src/snippets/printing-qprinter/object.cpp 0
+
+  Since the QPrinter starts with a blank page, we only need to call the
+  \l{QPrinter::}{newPage()} function after drawing each page, except for the
+  last page.
+
+  The document is sent to the printer, or written to a local file, when we call
+  \l{QPainter::}{end()}.
+
+  \section2 Coordinate Systems
+
+  QPrinter provides functions that can be used to obtain information about the
+  dimensions of the paper (the paper rectangle) and the dimensions of the
+  printable area (the page rectangle). These are given in logical device
+  coordinates that may differ from the physical coordinates used by the device
+  itself, indicating that the printer is able to render text and graphics at a
+  (typically higher) resolution than the user's display.
+
+  Although we do not need to handle the conversion between logical and physical
+  coordinates ourselves, we still need to apply transformations to painting
+  operations because the pixel measurements used to draw on screen are often
+  too small for the higher resolutions of typical printers.
+
+  \table
+  \row \o \bold{Printer and Painter Coordinate Systems}
+
+  The \l{QPrinter::}{paperRect()} and \l{QPrinter::}{pageRect()} functions
+  provide information about the size of the paper used for printing and the
+  area on it that can be painted on.
+
+  The rectangle returned by \l{QPrinter::}{pageRect()} usually lies inside
+  the rectangle returned by \l{QPrinter::}{paperRect()}. You do not need to
+  take the positions and sizes of these area into account when using a QPainter
+  with a QPrinter as the underlying paint device; the origin of the painter's
+  coordinate system will coincide with the top-left corner of the page
+  rectangle, and painting operations will be clipped to the bounds of the
+  drawable part of the page.
+
+  \o \inlineimage printer-rects.png
+  \endtable
+
+  The paint system automatically uses the correct device metrics when painting
+  text but, if you need to position text using information obtained from
+  font metrics, you need to ensure that the print device is specified when
+  you construct QFontMetrics and QFontMetricsF objects, or ensure that each QFont
+  used is constructed using the form of the constructor that accepts a
+  QPaintDevice argument.
+
+  \section1 Printing from Complex Widgets
+
+  Certain widgets, such as QTextEdit and QGraphicsView, display rich content
+  that is typically managed by instances of other classes, such as QTextDocument
+  and QGraphicsScene. As a result, it is these content handling classes that
+  usually provide printing functionality, either via a function that can be used
+  to perform the complete task, or via a function that accepts an existing
+  QPainter object. Some widgets provide convenience functions to expose underlying
+  printing features, avoiding the need to obtain the content handler just to call
+  a single function.
+
+  The following table shows which class and function are responsible for
+  printing from a selection of different widgets. For widgets that do not expose
+  printing functionality directly, the content handling classes containing this
+  functionality can be obtained via a function in the corresponding widget's API.
+
+  \table
+  \header \o Widget         \o Printing function        \o Accepts
+  \row    \o QGraphicsView  \o QGraphicsView::render()  \o QPainter
+  \row    \o QSvgWidget     \o QSvgRenderer::render()   \o QPainter
+  \row    \o QTextEdit      \o QTextDocument::print()   \o QPrinter
+  \row    \o QTextLayout    \o QTextLayout::draw()      \o QPainter
+  \row    \o QTextLine      \o QTextLine::draw()        \o QPainter
+  \endtable
+
+  QTextEdit requires a QPrinter rather than a QPainter because it uses information
+  about the configured page dimensions in order to insert page breaks at the most
+  appropriate places in printed documents.
+*/
+
+/*!
+  \page pdf-licensing.html
+  \title Notes about PDF Licensing
+  \ingroup licensing
+  \brief Details of restrictions on the use of PDF-related trademarks.
+
+  Please note that Adobe\reg places restrictions on the use of its trademarks
+  (including logos) in conjunction with PDF; e.g. "Adobe PDF". Please refer
+  to \l{http://www.adobe.com}{www.adobe.com} for guidelines.
+*/
diff --git a/doc/src/properties.qdoc b/doc/src/properties.qdoc
new file mode 100644
index 0000000000..0775b1214b
--- /dev/null
+++ b/doc/src/properties.qdoc
@@ -0,0 +1,263 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page properties.html
+    \title Qt's Property System
+    \ingroup architecture
+    \brief An overview of Qt's property system.
+
+    Qt provides a sophisticated property system similar to the ones
+    supplied by some compiler vendors. However, as a compiler- and
+    platform-independent library, Qt does not rely on non-standard
+    compiler features like \c __property or \c [property]. The Qt
+    solution works with \e any standard C++ compiler on every platform
+    Qt supports. It is based on the \l {Meta-Object System} that also
+    provides inter-object communication via \l{signals and slots}.
+
+    \section1 Requirements for Declaring Properties
+
+    To declare a property, use the \l {Q_PROPERTY()} {Q_PROPERTY()}
+    macro in a class that inherits QObject. 
+
+    \snippet doc/src/snippets/code/doc_src_properties.qdoc 0
+
+    Here are some typical examples of property declarations taken from
+    class QWidget.
+
+    \snippet doc/src/snippets/code/doc_src_properties.qdoc 1
+
+    A property behaves like a class data member, but it has additional
+    features accessible through the \l {Meta-Object System}.
+
+    \list 
+
+    \o A \c READ accessor function is required. It is for reading the
+    property value. It must be const and must return either the
+    property's type or a pointer or reference to that type. e.g.,
+    QWidget::focus is a read-only property with \c READ function
+    QWidget::hasFocus().
+
+    \o A \c WRITE accessor function is optional. It is for setting the
+    property value. It must return void and must take exactly one
+    argument, either of the property's type or a pointer or reference
+    to that type. e.g., QWidget::enabled has the \c WRITE function
+    QWidget::setEnabled().  Read-only properties do not need \c WRITE
+    functions. e.g., QWidget::focus has no \c WRITE function.
+
+    \o A \c RESET function is optional. It is for setting the property
+    back to its context specific default value. e.g., QWidget::cursor
+    has the typical \c READ and \c WRITE functions, QWidget::cursor()
+    and QWidget::setCursor(), and it also has a \c RESET function,
+    QWidget::unsetCursor(), since no call to QWidget::setCursor() can
+    mean \e {reset to the context specific cursor}. The \c RESET
+    function musrt return void and take no parameters.
+
+    \o The \c DESIGNABLE attribute indicates whether the property
+    should be visible in the property editor of GUI design tool (e.g.,
+    \l {Qt Designer}). Most properties are \c DESIGNABLE (default
+    true). Instead of true or false, you can specify a boolean
+    member function.
+
+    \o The \c SCRIPTABLE attribute indicates whether this property
+    should be accessible by a scripting engine (default true).
+    Instead of true or false, you can specify a boolean member
+    function.
+
+    \o The \c STORED attribute indicates whether the property should
+    be thought of as existing on its own or as depending on other
+    values. It also indicates whether the property value must be saved
+    when storing the object's state. Most properties are \c STORED
+    (default true), but e.g., QWidget::minimumWidth() has \c STORED
+    false, because its value is just taken from the width component
+    of property QWidget::minimumSize(), which is a QSize.
+
+    \o The \c USER attribute indicates whether the property is
+    designated as the user-facing or user-editable property for the
+    class. Normally, there is only one \c USER property per class
+    (default false). e.g., QAbstractButton::checked is the user
+    editable property for (checkable) buttons. Note that QItemDelegate
+    gets and sets a widget's \c USER property.
+
+    \endlist
+
+    The \c READ, \c WRITE, and \c RESET functions can be inherited.
+    They can also be virtual. When they are inherited in classes where
+    multiple inheritance is used, they must come from the first
+    inherited class.
+
+    The property type can be any type supported by QVariant, or it can
+    be a user-defined type. In this example, class QDate is considered
+    to be a user-defined type.
+
+    \snippet doc/src/snippets/code/doc_src_properties.qdoc 2
+
+    Because QDate is user-defined, you must include the \c{<QDate>}
+    header file with the property declaration.
+
+    For QMap, QList, and QValueList properties, the property value is
+    a QVariant whose value is the entire list or map.  Note that the
+    Q_PROPERTY string cannot contain commas, because commas separate
+    macro arguments. Therefore, you must use \c QMap as the property
+    type instead of \c QMap<QString,QVariant>. For consistency, also
+    use \c QList and \c QValueList instead of \c QList<QVariant> and
+    \c QValueList<QVariant>.
+
+    \section1 Reading and Writing Properties with the Meta-Object System
+
+    A property can be read and written using the generic functions
+    QObject::property() and QObject::setProperty(), without knowing
+    anything about the owning class except the property's name.  In
+    the code snippet below, the call to QAbstractButton::setDown() and
+    the call to QObject::setProperty() both set property "down".
+
+    \snippet doc/src/snippets/code/doc_src_properties.qdoc 3
+
+    Accessing a property through its \c WRITE accessor is the better
+    of the two, because it is faster and gives better diagnostics at
+    compile time, but setting the property this way requires that you
+    know about the class at compile time. Accessing properties by name
+    lets you access classes you don't know about at compile time. You
+    can \e discover a class's properties at run time by querying its
+    QObject, QMetaObject, and \l {QMetaProperty} {QMetaProperties}.
+
+    \snippet doc/src/snippets/code/doc_src_properties.qdoc 4
+
+    In the above snippet, QMetaObject::property() is used to get \l
+    {QMetaProperty} {metadata} about each property defined in some
+    unknown class. The property name is fetched from the metadata and
+    passed to QObject::property() to get the \l {QVariant} {value} of
+    the property in the current \l {QObject}{object}.
+
+    \section1 A Simple Example
+
+    Suppose we have a class MyClass, which is derived from QObject and
+    which uses the Q_OBJECT macro in its private section. We want to
+    declare a property in MyClass to keep track of a priorty
+    value. The name of the property will be \e priority, and its type
+    will be an enumeration type named \e Priority, which is defined in
+    MyClass.
+
+    We declare the property with the Q_PROPERTY() macro in the private
+    section of the class. The required \c READ function is named \c
+    priority, and we include a \c WRITE function named \c setPriority.
+    The enumeration type must be registered with the \l {Meta-Object
+    System} using the Q_ENUMS() macro. Registering an enumeration type
+    makes the enumerator names available for use in calls to
+    QObject::setProperty(). We must also provide our own declarations
+    for the \c READ and \c WRITE functions. The declaration of MyClass
+    then might look like this:
+
+    \snippet doc/src/snippets/code/doc_src_properties.qdoc 5
+
+    The \c READ function is const and returns the property type. The
+    \c WRITE function returns void and has exactly one parameter of
+    the property type. The meta-object compiler enforces these
+    requirements.
+
+    Given a pointer to an instance of MyClass or a pointer to an
+    instance of QObject that happens to be an instance of MyClass, we
+    have two ways to set its priority property.
+
+    \snippet doc/src/snippets/code/doc_src_properties.qdoc 6
+
+    In the example, the enumeration type used for the property type
+    was locally declared in MyClass. Had it been declared in another
+    class, its fully qualified name (i.e., OtherClass::Priority) would
+    be required.  In addition, that other class must also inherit
+    QObject and register the enum type using Q_ENUMS().
+
+    A similar macro, Q_FLAGS(), is also available. Like Q_ENUMS(), it
+    registers an enumeration type, but it marks the type as being a
+    set of \e flags, i.e. values that can be OR'd together. An I/O
+    class might have enumeration values \c Read and \c Write and then
+    QObject::setProperty() could accept \c{Read | Write}. Q_FLAGS()
+    should be used to register this enumeration type.
+
+    \section1 Dynamic Properties
+
+    QObject::setProperty() can also be used to add \e new properties
+    to an instance of a class at runtime. When it is called with a
+    name and a value, if a property with the given name exists in the
+    QObject, and if the given value is compatible with the property's
+    type, the value is stored in the property, and true is returned.
+    If the value is \e not compatible with the property's type, the
+    property is \e not changed, and false is returned. But if the
+    property with the given name doesn't exist in the QObject (i.e.,
+    if it wasn't declared with Q_PROPERTY(), a new property with the
+    given name and value is automatically added to the QObject, but
+    false is still returned. This means that a return of false can't
+    be used to determine whether a particular property was actually
+    set, unless you know in advance that the property already exists
+    in the QObject.
+
+    Note that \e dynamic properties are added on a per instance basis,
+    i.e., they are added to QObject, not QMetaObject. A property can
+    be removed from an instance by passing the property name and an
+    invalid QVariant value to QObject::setProperty(). The default
+    constructor for QVariant constructs an invalid QVariant.
+
+    Dynamic properties can be queried with QObject::property(), just
+    like properties declared at compile time with Q_PROPERTY().
+
+    \sa {Meta-Object System}, {Signals and Slots}
+
+    \section1 Properties and Custom Types
+
+    Custom types used by properties need to be registered using the
+    Q_DECLARE_METATYPE() macro so that their values can be stored in
+    QVariant objects. This makes them suitable for use with both
+    static properties declared using the Q_PROPERTY() macro in class
+    definitions and dynamic properties created at run-time. 
+
+    \sa Q_DECLARE_METATYPE(), QMetaType, QVariant
+
+    \section1 Adding Additional Information to a Class
+
+    Connected to the property system is an additional macro,
+    Q_CLASSINFO(), that can be used to attach additional
+    \e{name}--\e{value} pairs to a class's meta-object, for example:
+
+    \snippet doc/src/snippets/code/doc_src_properties.qdoc 7
+
+    Like other meta-data, class information is accessible at run-time
+    through the meta-object; see QMetaObject::classInfo() for details.
+*/
diff --git a/doc/src/q3asciicache.qdoc b/doc/src/q3asciicache.qdoc
new file mode 100644
index 0000000000..fbbb21bad8
--- /dev/null
+++ b/doc/src/q3asciicache.qdoc
@@ -0,0 +1,465 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class Q3AsciiCache
+    \brief The Q3AsciiCache class is a template class that provides a cache based on char* keys.
+    \compat
+
+    Q3AsciiCache is implemented as a template class. Define a template
+    instance Q3AsciiCache\<X\> to create a cache that operates on
+    pointers to X (X*).
+
+    A cache is a least recently used (LRU) list of cache items. The
+    cache items are accessed via \c char* keys. For Unicode keys use
+    the Q3Cache template instead, which uses QString keys. A Q3Cache
+    has the same performace as a Q3AsciiCache.
+
+    Each cache item has a cost. The sum of item costs, totalCost(),
+    will not exceed the maximum cache cost, maxCost(). If inserting a
+    new item would cause the total cost to exceed the maximum cost,
+    the least recently used items in the cache are removed.
+
+    Apart from insert(), by far the most important function is find()
+    (which also exists as operator[]()). This function looks up an
+    item, returns it, and by default marks it as being the most
+    recently used item.
+
+    There are also methods to remove() or take() an object from the
+    cache. Calling \link Q3PtrCollection::setAutoDelete()
+    setAutoDelete(TRUE)\endlink tells the cache to delete items that
+    are removed. The default is to not delete items when then are
+    removed (i.e., remove() and take() are equivalent).
+
+    When inserting an item into the cache, only the pointer is copied,
+    not the item itself. This is called a shallow copy. It is possible
+    to make the cache copy all of the item's data (known as a deep
+    copy) when an item is inserted. insert() calls the virtual
+    function Q3PtrCollection::newItem() for the item to be inserted.
+    Inherit a cache and reimplement newItem() if you want deep copies.
+
+    When removing a cache item the virtual function
+    Q3PtrCollection::deleteItem() is called. Its default implementation
+    in Q3AsciiCache is to delete the item if \link
+    Q3PtrCollection::setAutoDelete() auto-deletion\endlink is enabled.
+
+    There is a Q3AsciiCacheIterator which may be used to traverse the
+    items in the cache in arbitrary order.
+
+    \sa Q3AsciiCacheIterator, Q3Cache, Q3IntCache
+*/
+
+/*!
+  \fn Q3AsciiCache::Q3AsciiCache( const Q3AsciiCache<type> &c )
+
+  \internal
+
+  Do not use. A Q3AsciiCache cannot be copied. Calls qFatal() in debug version.
+*/
+
+
+/*!
+    \fn Q3AsciiCache::Q3AsciiCache( int maxCost, int size, bool caseSensitive, bool copyKeys )
+
+    Constructs a cache whose contents will never have a total cost
+    greater than \a maxCost and which is expected to contain less than
+    \a size items.
+
+    \a size is actually the size of an internal hash array; it's
+    usually best to make it prime and at least 50% bigger than the
+    largest expected number of items in the cache.
+
+    Each inserted item has an associated cost. When inserting a new
+    item, if the total cost of all items in the cache will exceed \a
+    maxCost, the cache will start throwing out the older (least
+    recently used) items until there is enough room for the new item
+    to be inserted.
+
+    If \a caseSensitive is TRUE (the default), the cache keys are case
+    sensitive; if it is FALSE, they are case-insensitive.
+    Case-insensitive comparison only affects the 26 letters in
+    US-ASCII. If \a copyKeys is TRUE (the default), Q3AsciiCache makes
+    a copy of the cache keys, otherwise it copies just the const char
+    * pointer - slightly faster if you can guarantee that the keys
+    will never change, but very risky.
+*/
+
+/*!
+    \fn Q3AsciiCache::~Q3AsciiCache()
+
+    Removes all items from the cache and destroys it.
+    All iterators that access this cache will be reset.
+*/
+
+/*!
+  \fn Q3AsciiCache<type>& Q3AsciiCache::operator=( const Q3AsciiCache<type> &c )
+
+  \internal
+
+  Do not use. A Q3AsciiCache cannot be copied. Calls qFatal() in debug version.
+*/
+
+/*!
+    \fn int Q3AsciiCache::maxCost() const
+
+    Returns the maximum allowed total cost of the cache.
+
+    \sa setMaxCost() totalCost()
+*/
+
+/*!
+    \fn int Q3AsciiCache::totalCost() const
+
+    Returns the total cost of the items in the cache. This is an
+    integer in the range 0 to maxCost().
+
+    \sa setMaxCost()
+*/
+
+/*!
+    \fn void Q3AsciiCache::setMaxCost( int m )
+
+    Sets the maximum allowed total cost of the cache to \a m. If the
+    current total cost is greater than \a m, some items are removed
+    immediately.
+
+    \sa maxCost() totalCost()
+*/
+
+/*!
+    \fn uint Q3AsciiCache::count() const
+
+    Returns the number of items in the cache.
+
+    \sa totalCost() size()
+*/
+
+/*!
+    \fn uint Q3AsciiCache::size() const
+
+    Returns the size of the hash array used to implement the cache.
+    This should be a bit bigger than count() is likely to be.
+*/
+
+/*!
+    \fn bool Q3AsciiCache::isEmpty() const
+
+    Returns TRUE if the cache is empty; otherwise returns FALSE.
+*/
+
+/*!
+    \fn bool Q3AsciiCache::insert( const char *k, const type *d, int c, int p )
+
+    Inserts the item \a d into the cache using key \a k, and with an
+    associated cost of \a c. Returns TRUE if the item is successfully
+    inserted. Returns FALSE if the item is not inserted, for example,
+    if the cost of the item exceeds maxCost().
+
+    The cache's size is limited, and if the total cost is too high,
+    Q3AsciiCache will remove old, least recently used items until there
+    is room for this new item.
+
+    Items with duplicate keys can be inserted.
+
+    The parameter \a p is internal and should be left at the default
+    value (0).
+
+    \warning If this function returns FALSE, you must delete \a d
+    yourself. Additionally, be very careful about using \a d after
+    calling this function, because any other insertions into the
+    cache, from anywhere in the application or within Qt itself, could
+    cause the object to be discarded from the cache and the pointer to
+    become invalid.
+*/
+
+/*!
+    \fn bool Q3AsciiCache::remove( const char *k )
+
+    Removes the item with key \a k and returns TRUE if the item was
+    present in the cache; otherwise returns FALSE.
+
+    The item is deleted if auto-deletion has been enabled, i.e., if
+    you have called \link Q3PtrCollection::setAutoDelete()
+    setAutoDelete(TRUE)\endlink.
+
+    If there are two or more items with equal keys, the one that was
+    inserted last is removed.
+
+    All iterators that refer to the removed item are set to point to
+    the next item in the cache's traversal order.
+
+    \sa take(), clear()
+*/
+
+/*!
+    \fn type *Q3AsciiCache::take( const char *k )
+
+    Takes the item associated with \a k out of the cache without
+    deleting it and returns a pointer to the item taken out, or 0
+    if the key does not exist in the cache.
+
+    If there are two or more items with equal keys, the one that was
+    inserted last is taken.
+
+    All iterators that refer to the taken item are set to point to the
+    next item in the cache's traversal order.
+
+    \sa remove(), clear()
+*/
+
+/*!
+    \fn void Q3AsciiCache::clear()
+
+    Removes all items from the cache, and deletes them if \link
+    Q3PtrCollection::setAutoDelete() auto-deletion\endlink has been
+    enabled.
+
+    All cache iterators that operate on this cache are reset.
+
+    \sa remove() take()
+*/
+
+/*!
+    \fn type *Q3AsciiCache::find( const char *k, bool ref ) const
+
+    Returns the item with key \a k, or 0 if the key does not exist
+    in the cache. If \a ref is TRUE (the default), the item is moved
+    to the front of the least recently used list.
+
+    If there are two or more items with equal keys, the one that was
+    inserted last is returned.
+*/
+
+/*!
+    \fn type *Q3AsciiCache::operator[]( const char *k ) const
+
+    Returns the item with key \a k, or 0 if \a k does not exist in
+    the cache, and moves the item to the front of the least recently
+    used list.
+
+    If there are two or more items with equal keys, the one that was
+    inserted last is returned.
+
+    This is the same as find( k, TRUE ).
+
+    \sa find()
+*/
+
+/*!
+    \fn void Q3AsciiCache::statistics() const
+
+    A debug-only utility function. Prints out cache usage, hit/miss,
+    and distribution information using qDebug(). This function does
+    nothing in the release library.
+*/
+
+/*!
+    \class Q3AsciiCacheIterator
+    \brief The Q3AsciiCacheIterator class provides an iterator for Q3AsciiCache collections.
+    \compat
+
+    Note that the traversal order is arbitrary; you are not guaranteed
+    any particular order. If new objects are inserted into the cache
+    while the iterator is active, the iterator may or may not see
+    them.
+
+    Multiple iterators are completely independent, even when they
+    operate on the same Q3AsciiCache. Q3AsciiCache updates all iterators
+    that refer an item when that item is removed.
+
+    Q3AsciiCacheIterator provides an operator++() and an operator+=()
+    to traverse the cache; current() and currentKey() to access the
+    current cache item and its key. It also provides atFirst() and
+    atLast(), which return TRUE if the iterator points to the first or
+    last item in the cache respectively. The isEmpty() function
+    returns TRUE if the cache is empty; and count() returns the number
+    of items in the cache.
+
+    Note that atFirst() and atLast() refer to the iterator's arbitrary
+    ordering, not to the cache's internal least recently used list.
+
+    \sa Q3AsciiCache
+*/
+
+/*!
+    \fn Q3AsciiCacheIterator::Q3AsciiCacheIterator( const Q3AsciiCache<type> &cache )
+
+    Constructs an iterator for \a cache. The current iterator item is
+    set to point to the first item in the \a cache.
+*/
+
+/*!
+    \fn Q3AsciiCacheIterator::Q3AsciiCacheIterator (const Q3AsciiCacheIterator<type> & ci)
+
+    Constructs an iterator for the same cache as \a ci. The new
+    iterator starts at the same item as ci.current() but moves
+    independently from there on.
+*/
+
+/*!
+    \fn Q3AsciiCacheIterator<type>& Q3AsciiCacheIterator::operator=( const Q3AsciiCacheIterator<type> &ci )
+
+    Makes this an iterator for the same cache as \a ci. The new
+    iterator starts at the same item as ci.current(), but moves
+    independently thereafter.
+*/
+
+/*!
+    \fn uint Q3AsciiCacheIterator::count() const
+
+    Returns the number of items in the cache over which this iterator
+    operates.
+
+    \sa isEmpty()
+*/
+
+/*!
+    \fn bool Q3AsciiCacheIterator::isEmpty() const
+
+    Returns TRUE if the cache is empty, i.e. count() == 0; otherwise
+    returns FALSE.
+    
+    \sa count()
+*/
+
+/*!
+    \fn bool Q3AsciiCacheIterator::atFirst() const
+
+    Returns TRUE if the iterator points to the first item in the
+    cache; otherwise returns FALSE. Note that this refers to the
+    iterator's arbitrary ordering, not to the cache's internal least
+    recently used list.
+
+    \sa toFirst(), atLast()
+*/
+
+/*!
+    \fn bool Q3AsciiCacheIterator::atLast() const
+
+    Returns TRUE if the iterator points to the last item in the cache;
+    otherwise returns FALSE. Note that this refers to the iterator's
+    arbitrary ordering, not to the cache's internal least recently
+    used list.
+
+    \sa toLast(), atFirst()
+*/
+
+/*!
+    \fn type *Q3AsciiCacheIterator::toFirst()
+
+    Sets the iterator to point to the first item in the cache and
+    returns a pointer to the item.
+
+    Sets the iterator to 0 and returns 0 if the cache is empty.
+
+    \sa toLast() isEmpty()
+*/
+
+/*!
+    \fn type *Q3AsciiCacheIterator::toLast()
+
+    Sets the iterator to point to the last item in the cache and
+    returns a pointer to the item.
+
+    Sets the iterator to 0 and returns 0 if the cache is empty.
+
+    \sa toFirst() isEmpty()
+*/
+
+/*!
+    \fn Q3AsciiCacheIterator::operator type *() const
+
+    Cast operator. Returns a pointer to the current iterator item.
+    Same as current().
+*/
+
+/*!
+    \fn type *Q3AsciiCacheIterator::current() const
+
+    Returns a pointer to the current iterator item.
+*/
+
+/*!
+    \fn const char *Q3AsciiCacheIterator::currentKey() const
+
+    Returns the key for the current iterator item.
+*/
+
+/*!
+    \fn type *Q3AsciiCacheIterator::operator()()
+
+    Makes the succeeding item current and returns the original current
+    item.
+
+    If the current iterator item was the last item in the cache or if
+    it was 0, 0 is returned.
+*/
+
+/*!
+    \fn type *Q3AsciiCacheIterator::operator+=( uint jump )
+
+    Returns the item \a jump positions after the current item, or 0
+    if it is beyond the last item. Makes this the current item.
+*/
+
+/*!
+    \fn type *Q3AsciiCacheIterator::operator-=( uint jump )
+
+    Returns the item \a jump positions before the current item, or 0
+    if it is before the first item. Makes this the current item.
+*/
+
+/*!
+    \fn type *Q3AsciiCacheIterator::operator++()
+
+    Prefix ++ makes the iterator point to the item just after
+    current(), and makes that the new current item for the iterator. If
+    current() was the last item, operator++() returns 0.
+*/
+
+/*!
+    \fn type *Q3AsciiCacheIterator::operator--()
+
+    Prefix -- makes the iterator point to the item just before
+    current(), and makes that the new current item for the iterator. If
+    current() was the first item, operator--() returns 0.
+*/
+
diff --git a/doc/src/q3asciidict.qdoc b/doc/src/q3asciidict.qdoc
new file mode 100644
index 0000000000..0b5b790314
--- /dev/null
+++ b/doc/src/q3asciidict.qdoc
@@ -0,0 +1,416 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class Q3AsciiDict
+    \brief The Q3AsciiDict class is a template class that provides a dictionary based on char* keys.
+    \compat
+
+    Q3AsciiDict is implemented as a template class. Define a template
+    instance Q3AsciiDict\<X\> to create a dictionary that operates on
+    pointers to X (X*).
+
+    A dictionary is a collection of key-value pairs. The key is a
+    char* used for insertion, removal and lookup. The value is a
+    pointer. Dictionaries provide very fast insertion and lookup.
+
+    Q3AsciiDict cannot handle Unicode keys; use the Q3Dict template
+    instead, which uses QString keys. A Q3Dict has the same
+    performace as a Q3AsciiDict.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_q3asciidict.qdoc 0
+    In this example we use a dictionary to keep track of the line
+    edits we're using. We insert each line edit into the dictionary
+    with a unique name and then access the line edits via the
+    dictionary. See Q3PtrDict, Q3IntDict and Q3Dict.
+
+    See Q3Dict for full details, including the choice of dictionary
+    size, and how deletions are handled. 
+
+    \sa Q3AsciiDictIterator, Q3Dict, Q3IntDict, Q3PtrDict
+*/
+
+
+/*!
+    \fn Q3AsciiDict::Q3AsciiDict( int size, bool caseSensitive, bool copyKeys )
+
+    Constructs a dictionary optimized for less than \a size entries.
+
+    We recommend setting \a size to a suitably large prime number (a
+    bit larger than the expected number of entries). This makes the
+    hash distribution better and will improve lookup performance.
+
+    When \a caseSensitive is TRUE (the default) Q3AsciiDict treats
+    "abc" and "Abc" as different keys; when it is FALSE "abc" and
+    "Abc" are the same. Case-insensitive comparison only considers the
+    26 letters in US-ASCII.
+
+    If \a copyKeys is TRUE (the default), the dictionary copies keys
+    using strcpy(); if it is FALSE, the dictionary just copies the
+    pointers.
+*/
+
+/*!
+    \fn Q3AsciiDict::Q3AsciiDict( const Q3AsciiDict<type> &dict )
+
+    Constructs a copy of \a dict.
+
+    Each item in \a dict is inserted into this dictionary. Only the
+    pointers are copied (shallow copy).
+*/
+
+/*!
+    \fn Q3AsciiDict::~Q3AsciiDict()
+
+    Removes all items from the dictionary and destroys it.
+
+    The items are deleted if auto-delete is enabled.
+
+    All iterators that access this dictionary will be reset.
+
+    \sa setAutoDelete()
+*/
+
+/*!
+    \fn Q3AsciiDict<type> &Q3AsciiDict::operator=(const Q3AsciiDict<type> &dict)
+
+    Assigns \a dict to this dictionary and returns a reference to this
+    dictionary.
+
+    This dictionary is first cleared and then each item in \a dict is
+    inserted into this dictionary. Only the pointers are copied
+    (shallow copy) unless newItem() has been reimplemented().
+*/
+
+/*!
+    \fn uint Q3AsciiDict::count() const
+
+    Returns the number of items in the dictionary.
+
+    \sa isEmpty()
+*/
+
+/*!
+    \fn uint Q3AsciiDict::size() const
+
+    Returns the size of the internal hash array (as specified in the
+    constructor).
+
+    \sa count()
+*/
+
+/*!
+    \fn void Q3AsciiDict::resize( uint newsize )
+
+    Changes the size of the hashtable to \a newsize. The contents of
+    the dictionary are preserved but all iterators on the dictionary
+    become invalid.
+*/
+
+/*!
+    \fn bool Q3AsciiDict::isEmpty() const
+
+    Returns TRUE if the dictionary is empty, i.e. count() == 0;
+    otherwise it returns FALSE.
+
+    \sa count()
+*/
+
+/*!
+    \fn void Q3AsciiDict::insert( const char *key, const type *item )
+
+    Inserts the \a key with the \a item into the dictionary.
+
+    Multiple items can have the same key, in which case only the last
+    item will be accessible using \l operator[]().
+
+    \a item may not be 0.
+
+    \sa replace()
+*/
+
+/*!
+    \fn void Q3AsciiDict::replace( const char *key, const type *item )
+
+    Replaces an item that has a key equal to \a key with \a item.
+
+    If the item does not already exist, it will be inserted.
+
+    \a item may not be 0.
+
+    Equivalent to:
+    \snippet doc/src/snippets/code/doc_src_q3asciidict.qdoc 1
+
+    If there are two or more items with equal keys, then the most
+    recently inserted item will be replaced.
+
+    \sa insert()
+*/
+
+/*!
+    \fn bool Q3AsciiDict::remove( const char *key )
+
+    Removes the item associated with \a key from the dictionary.
+    Returns TRUE if successful, i.e. if the key existed in the
+    dictionary; otherwise returns FALSE.
+
+    If there are two or more items with equal keys, then the most
+    recently inserted item will be removed.
+
+    The removed item is deleted if \link
+    Q3PtrCollection::setAutoDelete() auto-deletion\endlink is enabled.
+
+    All dictionary iterators that refer to the removed item will be
+    set to point to the next item in the dictionary traversal order.
+
+    \sa take(), clear(), setAutoDelete()
+*/
+
+/*!
+    \fn type *Q3AsciiDict::take( const char *key )
+
+    Takes the item associated with \a key out of the dictionary
+    without deleting it (even if \link Q3PtrCollection::setAutoDelete()
+    auto-deletion\endlink is enabled).
+
+    If there are two or more items with equal keys, then the most
+    recently inserted item will be taken.
+
+    Returns a pointer to the item taken out, or 0 if the key does not
+    exist in the dictionary.
+
+    All dictionary iterators that refer to the taken item will be set
+    to point to the next item in the dictionary traversal order.
+
+    \sa remove(), clear(), setAutoDelete()
+*/
+
+/*!
+    \fn void Q3AsciiDict::clear()
+
+    Removes all items from the dictionary.
+
+    The removed items are deleted if \link
+    Q3PtrCollection::setAutoDelete() auto-deletion\endlink is enabled.
+
+    All dictionary iterators that operate on dictionary are reset.
+
+    \sa remove(), take(), setAutoDelete()
+*/
+
+/*!
+    \fn type *Q3AsciiDict::find( const char *key ) const
+
+    Returns the item associated with \a key, or 0 if the key does not
+    exist in the dictionary.
+
+    This function uses an internal hashing algorithm to optimize
+    lookup.
+
+    If there are two or more items with equal keys, then the item that
+    was most recently inserted will be found.
+
+    Equivalent to the [] operator.
+
+    \sa operator[]()
+*/
+
+/*!
+    \fn type *Q3AsciiDict::operator[]( const char *key ) const
+
+    Returns the item associated with \a key, or 0 if the key does
+    not exist in the dictionary.
+
+    This function uses an internal hashing algorithm to optimize
+    lookup.
+
+    If there are two or more items with equal keys, then the item that
+    was most recently inserted will be found.
+
+    Equivalent to the find() function.
+
+    \sa find()
+*/
+
+/*!
+    \fn void Q3AsciiDict::statistics() const
+
+    Debugging-only function that prints out the dictionary
+    distribution using qDebug().
+*/
+
+/*!
+    \fn QDataStream& Q3AsciiDict::read( QDataStream &s,
+					Q3PtrCollection::Item &item )
+
+    Reads a dictionary item from the stream \a s and returns a
+    reference to the stream.
+
+    The default implementation sets \a item to 0.
+
+    \sa write()
+*/
+
+/*!
+    \fn QDataStream& Q3AsciiDict::write(QDataStream &s, Q3PtrCollection::Item item) const
+
+    Writes a dictionary \a item to the stream \a s and returns a
+    reference to the stream.
+
+    \sa read()
+*/
+
+/*!
+    \class Q3AsciiDictIterator
+    \brief The Q3AsciiDictIterator class provides an iterator for Q3AsciiDict collections.
+    \compat
+
+    Q3AsciiDictIterator is implemented as a template class. Define a
+    template instance Q3AsciiDictIterator\<X\> to create a dictionary
+    iterator that operates on Q3AsciiDict\<X\> (dictionary of X*).
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_q3asciidict.qdoc 2
+    In the example we insert some line edits into a dictionary, then
+    iterate over the dictionary printing the strings associated with
+    those line edits.
+
+    Note that the traversal order is arbitrary; you are not guaranteed
+    any particular order.
+
+    Multiple iterators may independently traverse the same dictionary.
+    A Q3AsciiDict knows about all the iterators that are operating on
+    the dictionary. When an item is removed from the dictionary,
+    Q3AsciiDict updates all the iterators that are referring to the
+    removed item to point to the next item in the (arbitrary)
+    traversal order.
+
+    \sa Q3AsciiDict
+*/
+
+/*!
+    \fn Q3AsciiDictIterator::Q3AsciiDictIterator( const Q3AsciiDict<type> &dict )
+
+    Constructs an iterator for \a dict. The current iterator item is
+    set to point on the first item in the \a dict.
+*/
+
+/*!
+    \fn Q3AsciiDictIterator::~Q3AsciiDictIterator()
+
+    Destroys the iterator.
+*/
+
+/*!
+    \fn uint Q3AsciiDictIterator::count() const
+
+    Returns the number of items in the dictionary this iterator
+    operates over.
+
+    \sa isEmpty()
+*/
+
+/*!
+    \fn bool Q3AsciiDictIterator::isEmpty() const
+
+    Returns TRUE if the dictionary is empty, i.e. count() == 0,
+    otherwise returns FALSE.
+    
+    \sa count()
+*/
+
+/*!
+    \fn type *Q3AsciiDictIterator::toFirst()
+
+    Sets the current iterator item to point to the first item in the
+    dictionary and returns a pointer to the item. If the dictionary is
+    empty it sets the current item to 0 and returns 0.
+*/
+
+/*!
+    \fn Q3AsciiDictIterator::operator type *() const
+
+    Cast operator. Returns a pointer to the current iterator item.
+    Same as current().
+*/
+
+/*!
+    \fn type *Q3AsciiDictIterator::current() const
+
+    Returns a pointer to the current iterator item.
+*/
+
+/*!
+    \fn const char *Q3AsciiDictIterator::currentKey() const
+
+    Returns a pointer to the key for the current iterator item.
+*/
+
+/*!
+    \fn type *Q3AsciiDictIterator::operator()()
+
+    Makes the succeeding item current and returns the original current
+    item.
+
+    If the current iterator item was the last item in the dictionary
+    or if it was 0, 0 is returned.
+*/
+
+/*!
+    \fn type *Q3AsciiDictIterator::operator++()
+
+    Prefix ++ makes the succeeding item current and returns the new
+    current item.
+
+    If the current iterator item was the last item in the dictionary
+    or if it was 0, 0 is returned.
+*/
+
+/*!
+    \fn type *Q3AsciiDictIterator::operator+=( uint jump )
+
+    Sets the current item to the item \a jump positions after the
+    current item, and returns a pointer to that item.
+
+    If that item is beyond the last item or if the dictionary is
+    empty, it sets the current item to 0 and returns 0.
+*/
diff --git a/doc/src/q3cache.qdoc b/doc/src/q3cache.qdoc
new file mode 100644
index 0000000000..a54430f006
--- /dev/null
+++ b/doc/src/q3cache.qdoc
@@ -0,0 +1,461 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class Q3Cache
+    \brief The Q3Cache class is a template class that provides a cache based on QString keys.
+    \compat
+
+    A cache is a least recently used (LRU) list of cache items. Each
+    cache item has a key and a certain cost. The sum of item costs,
+    totalCost(), never exceeds the maximum cache cost, maxCost(). If
+    inserting a new item would cause the total cost to exceed the
+    maximum cost, the least recently used items in the cache are
+    removed.
+
+    Q3Cache is a template class. Q3Cache\<X\> defines a cache that
+    operates on pointers to X, or X*.
+
+    Apart from insert(), by far the most important function is find()
+    (which also exists as operator[]()). This function looks up an
+    item, returns it, and by default marks it as being the most
+    recently used item.
+
+    There are also methods to remove() or take() an object from the
+    cache. Calling setAutoDelete(TRUE) for a cache tells it to delete
+    items that are removed. The default is to not delete items when
+    they are removed (i.e., remove() and take() are equivalent).
+
+    When inserting an item into the cache, only the pointer is copied,
+    not the item itself. This is called a shallow copy. It is possible
+    to make the cache copy all of the item's data (known as a deep
+    copy) when an item is inserted. insert() calls the virtual
+    function Q3PtrCollection::newItem() for the item to be inserted.
+    Inherit a cache and reimplement newItem() if you want deep copies.
+
+    When removing a cache item, the virtual function
+    Q3PtrCollection::deleteItem() is called. The default
+    implementation deletes the item if auto-deletion is enabled, and
+    does nothing otherwise.
+
+    There is a Q3CacheIterator that can be used to traverse the items
+    in the cache in arbitrary order.
+
+    In Q3Cache, the cache items are accessed via QString keys, which
+    are Unicode strings. If you want to use non-Unicode, plain 8-bit
+    \c char* keys, use the Q3AsciiCache template. A Q3Cache has the
+    same performance as a Q3AsciiCache.
+
+    \sa Q3CacheIterator, Q3AsciiCache, Q3IntCache
+*/
+
+/*!
+  \fn Q3Cache::Q3Cache( const Q3Cache<type> &c )
+
+  \internal
+
+  Do not use. A Q3Cache cannot be copied. Calls qFatal() in debug version.
+*/
+
+
+/*!
+    \fn Q3Cache::Q3Cache( int maxCost, int size, bool caseSensitive )
+
+    Constructs a cache whose contents will never have a total cost
+    greater than \a maxCost and which is expected to contain less than
+    \a size items.
+
+    \a size is actually the size of an internal hash array; it's
+    usually best to make it a prime number and at least 50% bigger
+    than the largest expected number of items in the cache.
+
+    Each inserted item has an associated cost. When inserting a new
+    item, if the total cost of all items in the cache will exceed \a
+    maxCost, the cache will start throwing out the older (least
+    recently used) items until there is enough room for the new item
+    to be inserted.
+
+    If \a caseSensitive is TRUE (the default), the cache keys are case
+    sensitive; if it is FALSE, they are case-insensitive.
+    Case-insensitive comparison considers all Unicode letters.
+*/
+
+/*!
+    \fn Q3Cache::~Q3Cache()
+
+    Removes all items from the cache and destroys it. All iterators
+    that access this cache will be reset.
+*/
+
+/*!
+  \fn Q3Cache<type>& Q3Cache::operator=( const Q3Cache<type> &c )
+
+  \internal
+
+  Do not use. A Q3Cache cannot be copied. Calls qFatal() in debug version.
+*/
+
+/*!
+    \fn int Q3Cache::maxCost() const
+
+    Returns the maximum allowed total cost of the cache.
+
+    \sa setMaxCost() totalCost()
+*/
+
+/*!
+    \fn int Q3Cache::totalCost() const
+
+    Returns the total cost of the items in the cache. This is an
+    integer in the range 0 to maxCost().
+
+    \sa setMaxCost()
+*/
+
+/*!
+    \fn void Q3Cache::setMaxCost( int m )
+
+    Sets the maximum allowed total cost of the cache to \a m. If the
+    current total cost is greater than \a m, some items are deleted
+    immediately.
+
+    \sa maxCost() totalCost()
+*/
+
+/*!
+    \fn uint Q3Cache::count() const
+
+    Returns the number of items in the cache.
+
+    \sa totalCost()
+*/
+
+/*!
+    \fn uint Q3Cache::size() const
+
+    Returns the size of the hash array used to implement the cache.
+    This should be a bit bigger than count() is likely to be.
+*/
+
+/*!
+    \fn bool Q3Cache::isEmpty() const
+
+    Returns TRUE if the cache is empty; otherwise returns FALSE.
+*/
+
+/*!
+    \fn bool Q3Cache::insert( const QString &k, const type *d, int c, int p )
+
+    Inserts the item \a d into the cache with key \a k and associated
+    cost, \a c. Returns TRUE if it is successfully inserted; otherwise
+    returns FALSE.
+
+    The cache's size is limited, and if the total cost is too high,
+    Q3Cache will remove old, least recently used items until there is
+    room for this new item.
+
+    The parameter \a p is internal and should be left at the default
+    value (0).
+
+    \warning If this function returns FALSE (which could happen, e.g.
+    if the cost of this item alone exceeds maxCost()) you must delete
+    \a d yourself. Additionally, be very careful about using \a d
+    after calling this function because any other insertions into the
+    cache, from anywhere in the application or within Qt itself, could
+    cause the object to be discarded from the cache and the pointer to
+    become invalid.
+*/
+
+/*!
+    \fn bool Q3Cache::remove( const QString &k )
+
+    Removes the item associated with \a k, and returns TRUE if the
+    item was present in the cache; otherwise returns FALSE.
+
+    The item is deleted if auto-deletion has been enabled, i.e., if
+    you have called setAutoDelete(TRUE).
+
+    If there are two or more items with equal keys, the one that was
+    inserted last is removed.
+
+    All iterators that refer to the removed item are set to point to
+    the next item in the cache's traversal order.
+
+    \sa take(), clear()
+*/
+
+/*!
+    \fn type *Q3Cache::take( const QString &k )
+
+    Takes the item associated with \a k out of the cache without
+    deleting it, and returns a pointer to the item taken out, or 0
+    if the key does not exist in the cache.
+
+    If there are two or more items with equal keys, the one that was
+    inserted last is taken.
+
+    All iterators that refer to the taken item are set to point to the
+    next item in the cache's traversal order.
+
+    \sa remove(), clear()
+*/
+
+/*!
+    \fn void Q3Cache::clear()
+
+    Removes all items from the cache and deletes them if auto-deletion
+    has been enabled.
+
+    All cache iterators that operate this on cache are reset.
+
+    \sa remove() take()
+*/
+
+/*!
+    \fn type *Q3Cache::find( const QString &k, bool ref ) const
+
+    Returns the item associated with key \a k, or 0 if the key does
+    not exist in the cache. If \a ref is TRUE (the default), the item
+    is moved to the front of the least recently used list.
+
+    If there are two or more items with equal keys, the one that was
+    inserted last is returned.
+*/
+
+/*!
+    \fn type *Q3Cache::operator[]( const QString &k ) const
+
+    Returns the item associated with key \a k, or 0 if \a k does not
+    exist in the cache, and moves the item to the front of the least
+    recently used list.
+
+    If there are two or more items with equal keys, the one that was
+    inserted last is returned.
+
+    This is the same as find( k, TRUE ).
+
+    \sa find()
+*/
+
+/*!
+    \fn void Q3Cache::statistics() const
+
+    A debug-only utility function. Prints out cache usage, hit/miss,
+    and distribution information using qDebug(). This function does
+    nothing in the release library.
+*/
+
+/*****************************************************************************
+  Q3CacheIterator documentation
+ *****************************************************************************/
+
+/*!
+    \class Q3CacheIterator qcache.h
+    \brief The Q3CacheIterator class provides an iterator for Q3Cache collections.
+    \compat
+
+    Note that the traversal order is arbitrary; you are not guaranteed
+    any particular order. If new objects are inserted into the cache
+    while the iterator is active, the iterator may or may not see
+    them.
+
+    Multiple iterators are completely independent, even when they
+    operate on the same Q3Cache. Q3Cache updates all iterators that
+    refer an item when that item is removed.
+
+    Q3CacheIterator provides an operator++(), and an operator+=() to
+    traverse the cache. The current() and currentKey() functions are
+    used to access the current cache item and its key. The atFirst()
+    and atLast() return TRUE if the iterator points to the first or
+    last item in the cache respectively. The isEmpty() function
+    returns TRUE if the cache is empty, and count() returns the number
+    of items in the cache.
+
+    Note that atFirst() and atLast() refer to the iterator's arbitrary
+    ordering, not to the cache's internal least recently used list.
+
+    \sa Q3Cache
+*/
+
+/*!
+    \fn Q3CacheIterator::Q3CacheIterator( const Q3Cache<type> &cache )
+
+    Constructs an iterator for \a cache. The current iterator item is
+    set to point to the first item in the \a cache.
+*/
+
+/*!
+    \fn Q3CacheIterator::Q3CacheIterator (const Q3CacheIterator<type> & ci)
+
+    Constructs an iterator for the same cache as \a ci. The new
+    iterator starts at the same item as ci.current(), but moves
+    independently from there on.
+*/
+
+/*!
+    \fn Q3CacheIterator<type>& Q3CacheIterator::operator=( const Q3CacheIterator<type> &ci )
+
+    Makes this an iterator for the same cache as \a ci. The new
+    iterator starts at the same item as ci.current(), but moves
+    independently thereafter.
+*/
+
+/*!
+    \fn uint Q3CacheIterator::count() const
+
+    Returns the number of items in the cache on which this iterator
+    operates.
+
+    \sa isEmpty()
+*/
+
+/*!
+    \fn bool Q3CacheIterator::isEmpty() const
+
+    Returns TRUE if the cache is empty, i.e. count() == 0; otherwise
+    it returns FALSE.
+    
+    \sa count()
+*/
+
+/*!
+    \fn bool Q3CacheIterator::atFirst() const
+
+    Returns TRUE if the iterator points to the first item in the
+    cache; otherwise returns FALSE. Note that this refers to the
+    iterator's arbitrary ordering, not to the cache's internal least
+    recently used list.
+
+    \sa toFirst(), atLast()
+*/
+
+/*!
+    \fn bool Q3CacheIterator::atLast() const
+
+    Returns TRUE if the iterator points to the last item in the cache;
+    otherwise returns FALSE. Note that this refers to the iterator's
+    arbitrary ordering, not to the cache's internal least recently
+    used list.
+
+    \sa toLast(), atFirst()
+*/
+
+/*!
+    \fn type *Q3CacheIterator::toFirst()
+
+    Sets the iterator to point to the first item in the cache and
+    returns a pointer to the item.
+
+    Sets the iterator to 0 and returns 0 if the cache is empty.
+
+    \sa toLast() isEmpty()
+*/
+
+/*!
+    \fn type *Q3CacheIterator::toLast()
+
+    Sets the iterator to point to the last item in the cache and
+    returns a pointer to the item.
+
+    Sets the iterator to 0 and returns 0 if the cache is empty.
+
+    \sa toFirst() isEmpty()
+*/
+
+/*!
+    \fn Q3CacheIterator::operator type *() const
+
+    Cast operator. Returns a pointer to the current iterator item.
+    Same as current().
+*/
+
+/*!
+    \fn type *Q3CacheIterator::current() const
+
+    Returns a pointer to the current iterator item.
+*/
+
+/*!
+    \fn QString Q3CacheIterator::currentKey() const
+
+    Returns the key for the current iterator item.
+*/
+
+/*!
+    \fn type *Q3CacheIterator::operator()()
+
+    Makes the succeeding item current and returns the original current
+    item.
+
+    If the current iterator item was the last item in the cache or if
+    it was 0, 0 is returned.
+*/
+
+/*!
+    \fn type *Q3CacheIterator::operator+=( uint jump )
+
+    Returns the item \a jump positions after the current item, or 0 if
+    it is beyond the last item. Makes this the current item.
+*/
+
+/*!
+    \fn type *Q3CacheIterator::operator-=( uint jump )
+
+    Returns the item \a jump positions before the current item, or 0
+    if it is before the first item. Makes this the current item.
+*/
+
+/*!
+    \fn type *Q3CacheIterator::operator++()
+
+    Prefix++ makes the iterator point to the item just after current()
+    and makes that the new current item for the iterator. If current()
+    was the last item, operator++() returns 0.
+*/
+
+/*!
+    \fn type *Q3CacheIterator::operator--()
+
+    Prefix-- makes the iterator point to the item just before
+    current() and makes that the new current item for the iterator. If
+    current() was the first item, operator--() returns 0.
+*/
+
diff --git a/doc/src/q3dict.qdoc b/doc/src/q3dict.qdoc
new file mode 100644
index 0000000000..8a0c5b09fc
--- /dev/null
+++ b/doc/src/q3dict.qdoc
@@ -0,0 +1,446 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class Q3Dict
+    \brief The Q3Dict class is a template class that provides a
+    dictionary based on QString keys.
+    \compat
+
+    Q3Dict is implemented as a template class. Define a template
+    instance Q3Dict\<X\> to create a dictionary that operates on
+    pointers to X (X *).
+
+    A dictionary is a collection of key-value pairs. The key is a
+    QString used for insertion, removal and lookup. The value is a
+    pointer. Dictionaries provide very fast insertion and lookup.
+
+    If you want to use non-Unicode, plain 8-bit \c char* keys, use the
+    Q3AsciiDict template. A Q3Dict has the same performance as a
+    Q3AsciiDict. If you want to have a dictionary that maps QStrings to
+    QStrings use QMap.
+
+    The size() of the dictionary is very important. In order to get
+    good performance, you should use a suitably large prime number.
+    Suitable means equal to or larger than the maximum expected number
+    of dictionary items. Size is set in the constructor but may be
+    changed with resize().
+
+    Items are inserted with insert(); 0 pointers cannot be inserted.
+    Items are removed with remove(). All the items in a dictionary can
+    be removed with clear(). The number of items in the dictionary is
+    returned by count(). If the dictionary contains no items isEmpty()
+    returns TRUE. You can change an item's value with replace(). Items
+    are looked up with operator[](), or with find() which return a
+    pointer to the value or 0 if the given key does not exist. You can
+    take an item out of the dictionary with take().
+
+    Calling setAutoDelete(TRUE) for a dictionary tells it to delete
+    items that are removed. The default behavior is not to delete
+    items when they are removed.
+   
+    When an item is inserted, the key is converted (hashed) to an
+    integer index into an internal hash array. This makes lookup very
+    fast.
+
+    Items with equal keys are allowed. When inserting two items with
+    the same key, only the last inserted item will be accessible (last
+    in, first out) until it is removed.
+
+    The Q3DictIterator class can traverse the dictionary, but only in
+    an arbitrary order. Multiple iterators may independently traverse
+    the same dictionary.
+
+    When inserting an item into a dictionary, only the pointer is
+    copied, not the item itself, i.e. a shallow copy is made. It is
+    possible to make the dictionary copy all of the item's data (a
+    deep copy) when an item is inserted. insert() calls the virtual
+    function Q3PtrCollection::newItem() for the item to be inserted.
+    Inherit a dictionary and reimplement newItem() if you want deep
+    copies.
+
+    When removing a dictionary item, the virtual function
+    Q3PtrCollection::deleteItem() is called. Q3Dict's default
+    implementation is to delete the item if auto-deletion is enabled.
+
+    \sa Q3DictIterator, Q3AsciiDict, Q3IntDict, Q3PtrDict
+*/
+
+
+/*!
+    \fn Q3Dict::Q3Dict( int size, bool caseSensitive )
+
+    Constructs a dictionary optimized for less than \a size entries.
+
+    We recommend setting \a size to a suitably large prime number
+    (e.g. a prime that's slightly larger than the expected number of
+    entries). This makes the hash distribution better which will lead
+    to faster lookup.
+
+    If \a caseSensitive is TRUE (the default), keys which differ only
+    by case are considered different.
+*/
+
+/*!
+    \fn Q3Dict::Q3Dict( const Q3Dict<type> &dict )
+
+    Constructs a copy of \a dict.
+
+    Each item in \a dict is inserted into this dictionary. Only the
+    pointers are copied (shallow copy).
+*/
+
+/*!
+    \fn Q3Dict::~Q3Dict()
+
+    Removes all items from the dictionary and destroys it. If
+    setAutoDelete() is TRUE, each value is deleted. All iterators that
+    access this dictionary will be reset.
+
+    \sa setAutoDelete()
+*/
+
+/*!
+    \fn Q3Dict<type> &Q3Dict::operator=(const Q3Dict<type> &dict)
+
+    Assigns \a dict to this dictionary and returns a reference to this
+    dictionary.
+
+    This dictionary is first cleared, then each item in \a dict is
+    inserted into this dictionary. Only the pointers are copied
+    (shallow copy), unless newItem() has been reimplemented.
+*/
+
+/*!
+    \fn uint Q3Dict::count() const
+
+    Returns the number of items in the dictionary.
+
+    \sa isEmpty()
+*/
+
+/*!
+    \fn uint Q3Dict::size() const
+
+    Returns the size of the internal hash array (as specified in the
+    constructor).
+
+    \sa count()
+*/
+
+/*!
+    \fn void Q3Dict::resize( uint newsize )
+
+    Changes the size of the hash table to \a newsize. The contents of
+    the dictionary are preserved, but all iterators on the dictionary
+    become invalid.
+*/
+
+/*!
+    \fn bool Q3Dict::isEmpty() const
+
+    Returns TRUE if the dictionary is empty, i.e. count() == 0;
+    otherwise returns FALSE.
+
+    \sa count()
+*/
+
+/*!
+    \fn void Q3Dict::insert( const QString &key, const type *item )
+
+    Inserts the key \a key with value \a item into the dictionary.
+
+    Multiple items can have the same key, in which case only the last
+    item will be accessible using \l operator[]().
+
+    \a item may not be 0.
+
+    \sa replace()
+*/
+
+/*!
+    \fn void Q3Dict::replace( const QString &key, const type *item )
+
+    Replaces the value of the key, \a key with \a item.
+
+    If the item does not already exist, it will be inserted.
+
+    \a item may not be 0.
+
+    Equivalent to:
+    \snippet doc/src/snippets/code/doc_src_q3dict.qdoc 0
+
+    If there are two or more items with equal keys, then the last item
+    that was inserted will be replaced.
+
+    \sa insert()
+*/
+
+/*!
+    \fn bool Q3Dict::remove( const QString &key )
+
+    Removes the item with \a key from the dictionary. Returns TRUE if
+    successful, i.e. if the item is in the dictionary; otherwise
+    returns FALSE.
+
+    If there are two or more items with equal keys, then the last item
+    that was inserted will be removed.
+
+    The removed item is deleted if \link
+    Q3PtrCollection::setAutoDelete() auto-deletion\endlink is enabled.
+
+    All dictionary iterators that refer to the removed item will be
+    set to point to the next item in the dictionary's traversal order.
+
+    \sa take(), clear(), setAutoDelete()
+*/
+
+/*!
+    \fn type *Q3Dict::take( const QString &key )
+
+    Takes the item with \a key out of the dictionary without deleting
+    it (even if \link Q3PtrCollection::setAutoDelete()
+    auto-deletion\endlink is enabled).
+
+    If there are two or more items with equal keys, then the last item
+    that was inserted will be taken.
+
+    Returns a pointer to the item taken out, or 0 if the key does not
+    exist in the dictionary.
+
+    All dictionary iterators that refer to the taken item will be set
+    to point to the next item in the dictionary traversal order.
+
+    \sa remove(), clear(), setAutoDelete()
+*/
+
+/*!
+    \fn void Q3Dict::clear()
+
+    Removes all items from the dictionary.
+
+    The removed items are deleted if \link
+    Q3PtrCollection::setAutoDelete() auto-deletion\endlink is enabled.
+
+    All dictionary iterators that operate on the dictionary are reset.
+
+    \sa remove(), take(), setAutoDelete()
+*/
+
+/*!
+    \fn type *Q3Dict::find( const QString &key ) const
+
+    Returns the item with key \a key, or 0 if the key does not exist
+    in the dictionary.
+
+    If there are two or more items with equal keys, then the most
+    recently inserted item will be found.
+
+    Equivalent to the [] operator.
+
+    \sa operator[]()
+*/
+
+/*!
+    \fn type *Q3Dict::operator[]( const QString &key ) const
+
+    Returns the item with key \a key, or 0 if the key does not
+    exist in the dictionary.
+
+    If there are two or more items with equal keys, then the most
+    recently inserted item will be found.
+
+    Equivalent to the find() function.
+
+    \sa find()
+*/
+
+/*!
+    \fn void Q3Dict::statistics() const
+
+    Debugging-only function that prints out the dictionary
+    distribution using qDebug().
+*/
+
+/*!
+    \fn QDataStream& Q3Dict::read( QDataStream &s, Q3PtrCollection::Item &item )
+
+    Reads a dictionary item from the stream \a s and returns a
+    reference to the stream.
+
+    The default implementation sets \a item to 0.
+
+    \sa write()
+*/
+
+/*!
+    \fn QDataStream& Q3Dict::write( QDataStream &s, Q3PtrCollection::Item item ) const
+
+    Writes a dictionary \a item to the stream \a s and returns a
+    reference to the stream.
+
+    \sa read()
+*/
+
+/*!
+    \class Q3DictIterator
+    \brief The Q3DictIterator class provides an iterator for Q3Dict collections.
+    \compat
+
+    Q3DictIterator is implemented as a template class. Define a
+    template instance Q3DictIterator\<X\> to create a dictionary
+    iterator that operates on Q3Dict\<X\> (dictionary of X*).
+
+    The traversal order is arbitrary; when we speak of the "first",
+    "last" and "next" item we are talking in terms of this arbitrary
+    order.
+
+    Multiple iterators may independently traverse the same dictionary.
+    A Q3Dict knows about all the iterators that are operating on the
+    dictionary. When an item is removed from the dictionary, Q3Dict
+    updates all iterators that are referring to the removed item to
+    point to the next item in the (arbitrary) traversal order.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_q3dict.qdoc 1
+    In the example we insert some pointers to line edits into a
+    dictionary, then iterate over the dictionary printing the strings
+    associated with the line edits.
+
+    \sa Q3Dict
+*/
+
+/*!
+    \fn Q3DictIterator::Q3DictIterator( const Q3Dict<type> &dict )
+
+    Constructs an iterator for \a dict. The current iterator item is
+    set to point to the first item in the dictionary, \a dict. First
+    in this context means first in the arbitrary traversal order.
+*/
+
+/*!
+    \fn Q3DictIterator::~Q3DictIterator()
+
+    Destroys the iterator.
+*/
+
+/*!
+    \fn uint Q3DictIterator::count() const
+
+    Returns the number of items in the dictionary over which the
+    iterator is operating.
+
+    \sa isEmpty()
+*/
+
+/*!
+    \fn bool Q3DictIterator::isEmpty() const
+
+    Returns TRUE if the dictionary is empty, i.e. count() == 0;
+    otherwise returns FALSE.
+
+    \sa count()
+*/
+
+/*!
+    \fn type *Q3DictIterator::toFirst()
+
+    Resets the iterator, making the first item the first current item.
+    First in this context means first in the arbitrary traversal
+    order. Returns a pointer to this item.
+
+    If the dictionary is empty it sets the current item to 0 and
+    returns 0.
+*/
+
+/*!
+  \fn type *Q3DictIterator::operator*()
+  \internal
+*/
+
+/*!
+    \fn Q3DictIterator::operator type*() const
+
+    Cast operator. Returns a pointer to the current iterator item.
+    Same as current().
+*/
+
+
+/*!
+    \fn type *Q3DictIterator::current() const
+
+    Returns a pointer to the current iterator item's value.
+*/
+
+/*!
+    \fn QString Q3DictIterator::currentKey() const
+
+    Returns the current iterator item's key.
+*/
+
+/*!
+    \fn type *Q3DictIterator::operator()()
+
+    Makes the next item current and returns the original current item.
+
+    If the current iterator item was the last item in the dictionary
+    or if it was 0, 0 is returned.
+*/
+
+/*!
+    \fn type *Q3DictIterator::operator++()
+
+    Prefix ++ makes the next item current and returns the new current
+    item.
+
+    If the current iterator item was the last item in the dictionary
+    or if it was 0, 0 is returned.
+*/
+
+/*!
+  \fn type *Q3DictIterator::operator+=( uint jump )
+  \internal
+  Sets the current item to the item \a jump positions after the current item,
+  and returns a pointer to that item.
+
+  If that item is beyond the last item or if the dictionary is empty,
+  it sets the current item to 0 and returns 0.
+*/
diff --git a/doc/src/q3intcache.qdoc b/doc/src/q3intcache.qdoc
new file mode 100644
index 0000000000..bba79f14c9
--- /dev/null
+++ b/doc/src/q3intcache.qdoc
@@ -0,0 +1,446 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class Q3IntCache
+    \brief The Q3IntCache class is a template class that provides a cache based on long keys.
+    \compat
+
+    Q3IntCache is implemented as a template class. Define a template
+    instance Q3IntCache\<X\> to create a cache that operates on
+    pointers to X, or X*.
+
+    A cache is a least recently used (LRU) list of cache items,
+    accessed via \c long keys. Each cache item has a cost. The sum
+    of item costs, totalCost(), will not exceed the maximum cache
+    cost, maxCost(). If inserting a new item would cause the total
+    cost to exceed the maximum cost, the least recently used items in
+    the cache are removed.
+
+    Apart from insert(), by far the most important function is find()
+    (which also exists as operator[]). This function looks up an
+    item, returns it, and by default marks it as being the most
+    recently used item.
+
+    There are also methods to remove() or take() an object from the
+    cache. Calling setAutoDelete(TRUE) for a cache tells it to delete
+    items that are removed. The default is to not delete items when
+    they are removed (i.e. remove() and take() are equivalent).
+
+    When inserting an item into the cache, only the pointer is copied,
+    not the item itself. This is called a shallow copy. It is possible
+    to make the cache copy all of the item's data (known as a deep
+    copy) when an item is inserted. insert() calls the virtual
+    function Q3PtrCollection::newItem() for the item to be inserted.
+    Inherit a dictionary and reimplement newItem() if you want deep
+    copies.
+
+    When removing a cache item, the item will be automatically
+    deleted if auto-deletion is enabled.
+
+    There is a Q3IntCacheIterator which may be used to traverse the
+    items in the cache in arbitrary order.
+
+    \sa Q3IntCacheIterator, Q3Cache, Q3AsciiCache
+*/
+
+/*!
+  \fn Q3IntCache::Q3IntCache( const Q3IntCache<type> &c )
+
+  \internal
+
+  Do not use. A Q3IntCache cannot be copied. Calls qFatal() in debug version.
+*/
+
+/*!
+    \fn Q3IntCache::Q3IntCache( int maxCost, int size  )
+
+    Constructs a cache whose contents will never have a total cost
+    greater than \a maxCost and which is expected to contain less than
+    \a size items.
+
+    \a size is actually the size of an internal hash array; it's
+    usually best to make it prime and at least 50% bigger than the
+    largest expected number of items in the cache.
+
+    Each inserted item is associated with a cost. When inserting a new
+    item, if the total cost of all items in the cache will exceed \a
+    maxCost, the cache will start throwing out the older (least
+    recently used) items until there is enough room for the new item
+    to be inserted.
+*/
+
+/*!
+    \fn Q3IntCache::~Q3IntCache()
+
+    Removes all items from the cache and then destroys the int cache.
+    If auto-deletion is enabled the cache's items are deleted. All
+    iterators that access this cache will be reset.
+*/
+
+/*!
+  \fn Q3IntCache<type>& Q3IntCache::operator=( const Q3IntCache<type> &c )
+
+  \internal
+
+  Do not use. A Q3IntCache cannot be copied. Calls qFatal() in debug version.
+*/
+
+/*!
+    \fn int Q3IntCache::maxCost() const
+
+    Returns the maximum allowed total cost of the cache.
+
+    \sa setMaxCost() totalCost()
+*/
+
+/*!
+    \fn int Q3IntCache::totalCost() const
+
+    Returns the total cost of the items in the cache. This is an
+    integer in the range 0 to maxCost().
+
+    \sa setMaxCost()
+*/
+
+/*!
+    \fn void Q3IntCache::setMaxCost( int m )
+
+    Sets the maximum allowed total cost of the cache to \a m. If the
+    current total cost is greater than \a m, some items are removed
+    immediately.
+
+    \sa maxCost() totalCost()
+*/
+
+/*!
+    \fn uint Q3IntCache::count() const
+
+    Returns the number of items in the cache.
+
+    \sa totalCost()
+*/
+
+/*!
+    \fn uint Q3IntCache::size() const
+
+    Returns the size of the hash array used to implement the cache.
+    This should be a bit larger than count() is likely to be.
+*/
+
+/*!
+    \fn bool Q3IntCache::isEmpty() const
+
+    Returns TRUE if the cache is empty; otherwise returns FALSE.
+*/
+
+/*!
+    \fn bool Q3IntCache::insert( long k, const type *d, int c, int p )
+
+    Inserts the item \a d into the cache with key \a k and assigns it
+    a cost of \a c (default 1). Returns TRUE if it succeeds; otherwise
+    returns FALSE.
+
+    The cache's size is limited, and if the total cost is too high,
+    Q3IntCache will remove old, least-used items until there is room
+    for this new item.
+
+    The parameter \a p is internal and should be left at the default
+    value (0).
+
+    \warning If this function returns FALSE (for example, the cost \c,
+    exceeds maxCost()), you must delete \a d yourself. Additionally,
+    be very careful about using \a d after calling this function. Any
+    other insertions into the cache, from anywhere in the application
+    or within Qt itself, could cause the object to be discarded from
+    the cache and the pointer to become invalid.
+*/
+
+/*!
+    \fn bool Q3IntCache::remove( long k )
+
+    Removes the item associated with \a k, and returns TRUE if the
+    item was present in the cache; otherwise returns FALSE.
+
+    The item is deleted if auto-deletion has been enabled, i.e. if you
+    have called setAutoDelete(TRUE).
+
+    If there are two or more items with equal keys, the one that was
+    inserted most recently is removed.
+
+    All iterators that refer to the removed item are set to point to
+    the next item in the cache's traversal order.
+
+    \sa take(), clear()
+*/
+
+/*!
+    \fn type * Q3IntCache::take( long k )
+
+    Takes the item associated with \a k out of the cache without
+    deleting it, and returns a pointer to the item taken out or 0 if
+    the key does not exist in the cache.
+
+    If there are two or more items with equal keys, the one that was
+    inserted most recently is taken.
+
+    All iterators that refer to the taken item are set to point to the
+    next item in the cache's traversal order.
+
+    \sa remove(), clear()
+*/
+
+/*!
+    \fn void Q3IntCache::clear()
+
+    Removes all items from the cache, and deletes them if
+    auto-deletion has been enabled.
+
+    All cache iterators that operate this on cache are reset.
+
+    \sa remove() take()
+*/
+
+/*!
+    \fn type * Q3IntCache::find( long k, bool ref ) const
+
+    Returns the item associated with \a k, or 0 if the key does not
+    exist in the cache. If \a ref is TRUE (the default), the item is
+    moved to the front of the least recently used list.
+
+    If there are two or more items with equal keys, the one that was
+    inserted most recently is returned.
+*/
+
+/*!
+    \fn type * Q3IntCache::operator[]( long k ) const
+
+    Returns the item associated with \a k, or 0 if \a k does not exist
+    in the cache, and moves the item to the front of the least
+    recently used list.
+
+    If there are two or more items with equal keys, the one that was
+    inserted most recently is returned.
+
+    This is the same as find( k, TRUE ).
+
+    \sa find()
+*/
+
+/*!
+    \fn void Q3IntCache::statistics() const
+
+    A debug-only utility function. Prints out cache usage, hit/miss,
+    and distribution information using qDebug(). This function does
+    nothing in the release library.
+*/
+
+/*!
+    \class Q3IntCacheIterator
+    \brief The Q3IntCacheIterator class provides an iterator for Q3IntCache collections.
+    \compat
+
+    Note that the traversal order is arbitrary; you are not guaranteed
+    any particular order. If new objects are inserted into the cache
+    while the iterator is active, the iterator may or may not see
+    them.
+
+    Multiple iterators are completely independent, even when they
+    operate on the same Q3IntCache. Q3IntCache updates all iterators
+    that refer an item when that item is removed.
+
+    Q3IntCacheIterator provides an operator++(), and an operator+=() to
+    traverse the cache; current() and currentKey() to access the
+    current cache item and its key; atFirst() atLast(), which return
+    TRUE if the iterator points to the first/last item in the cache;
+    isEmpty(), which returns TRUE if the cache is empty; and count(),
+    which returns the number of items in the cache.
+
+    Note that atFirst() and atLast() refer to the iterator's arbitrary
+    ordering, not to the cache's internal least recently used list.
+
+    \sa Q3IntCache
+*/
+
+/*!
+    \fn Q3IntCacheIterator::Q3IntCacheIterator( const Q3IntCache<type> &cache )
+
+    Constructs an iterator for \a cache. The current iterator item is
+    set to point to the first item in the \a cache (or rather, the
+    first item is defined to be the item at which this constructor
+    sets the iterator to point).
+*/
+
+/*!
+    \fn Q3IntCacheIterator::Q3IntCacheIterator (const Q3IntCacheIterator<type> & ci)
+
+    Constructs an iterator for the same cache as \a ci. The new
+    iterator starts at the same item as ci.current(), but moves
+    independently from there on.
+*/
+
+/*!
+    \fn Q3IntCacheIterator<type>& Q3IntCacheIterator::operator=( const Q3IntCacheIterator<type> &ci )
+
+    Makes this an iterator for the same cache as \a ci. The new
+    iterator starts at the same item as ci.current(), but moves
+    independently thereafter.
+*/
+
+/*!
+    \fn uint Q3IntCacheIterator::count() const
+
+    Returns the number of items in the cache on which this iterator
+    operates.
+
+    \sa isEmpty()
+*/
+
+/*!
+    \fn bool Q3IntCacheIterator::isEmpty() const
+
+    Returns TRUE if the cache is empty; otherwise returns FALSE.
+
+    \sa count()
+*/
+
+/*!
+    \fn bool Q3IntCacheIterator::atFirst() const
+
+    Returns TRUE if the iterator points to the first item in the
+    cache; otherwise returns FALSE. Note that this refers to the
+    iterator's arbitrary ordering, not to the cache's internal least
+    recently used list.
+
+    \sa toFirst(), atLast()
+*/
+
+/*!
+    \fn bool Q3IntCacheIterator::atLast() const
+
+    Returns TRUE if the iterator points to the last item in the cache;
+    otherwise returns FALSE. Note that this refers to the iterator's
+    arbitrary ordering, not to the cache's internal least recently
+    used list.
+
+    \sa toLast(), atFirst()
+*/
+
+/*!
+    \fn type *Q3IntCacheIterator::toFirst()
+
+    Sets the iterator to point to the first item in the cache and
+    returns a pointer to the item.
+
+    Sets the iterator to 0, and returns 0, if the cache is empty.
+
+    \sa toLast() isEmpty()
+*/
+
+/*!
+    \fn type *Q3IntCacheIterator::toLast()
+
+    Sets the iterator to point to the last item in the cache and
+    returns a pointer to the item.
+
+    Sets the iterator to 0, and returns 0, if the cache is empty.
+
+    \sa toFirst() isEmpty()
+*/
+
+/*!
+    \fn Q3IntCacheIterator::operator type *() const
+
+    Cast operator. Returns a pointer to the current iterator item.
+    Same as current().
+*/
+
+/*!
+    \fn type *Q3IntCacheIterator::current() const
+
+    Returns a pointer to the current iterator item.
+*/
+
+/*!
+    \fn long Q3IntCacheIterator::currentKey() const
+
+    Returns the key for the current iterator item.
+*/
+
+/*!
+    \fn type *Q3IntCacheIterator::operator()()
+
+    Makes the succeeding item current and returns the original current
+    item.
+
+    If the current iterator item was the last item in the cache or if
+    it was 0, 0 is returned.
+*/
+
+/*!
+    \fn type *Q3IntCacheIterator::operator+=( uint jump )
+
+    Returns the item \a jump positions after the current item, or 0 if
+    it is beyond the last item. Makes this the current item.
+*/
+
+/*!
+    \fn type *Q3IntCacheIterator::operator-=( uint jump )
+
+    Returns the item \a jump positions before the current item, or 0
+    if it is beyond the first item. Makes this the current item.
+*/
+
+/*!
+    \fn type *Q3IntCacheIterator::operator++()
+
+    Prefix ++ makes the iterator point to the item just after
+    current(), and makes it the new current item for the iterator. If
+    current() was the last item, operator--() returns 0.
+*/
+
+/*!
+    \fn type *Q3IntCacheIterator::operator--()
+
+    Prefix -- makes the iterator point to the item just before
+    current(), and makes it the new current item for the iterator. If
+    current() was the first item, operator--() returns 0.
+*/
diff --git a/doc/src/q3intdict.qdoc b/doc/src/q3intdict.qdoc
new file mode 100644
index 0000000000..8f0aabf10e
--- /dev/null
+++ b/doc/src/q3intdict.qdoc
@@ -0,0 +1,390 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class Q3IntDict
+    \brief The Q3IntDict class is a template class that provides a dictionary based on long keys.\
+    \compat
+
+    Q3IntDict is implemented as a template class. Define a template
+    instance Q3IntDict\<X\> to create a dictionary that operates on
+    pointers to X (X*).
+
+    A dictionary is a collection of key-value pairs. The key is an \c
+    long used for insertion, removal and lookup. The value is a
+    pointer. Dictionaries provide very fast insertion and lookup.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_q3intdict.qdoc 0
+
+    See Q3Dict for full details, including the choice of dictionary
+    size, and how deletions are handled. 
+
+    \sa Q3IntDictIterator, Q3Dict, Q3AsciiDict, Q3PtrDict
+*/
+
+
+/*!
+    \fn Q3IntDict::Q3IntDict( int size )
+
+    Constructs a dictionary using an internal hash array of size \a
+    size.
+
+    Setting \a size to a suitably large prime number (equal to or
+    greater than the expected number of entries) makes the hash
+    distribution better which leads to faster lookup.
+*/
+
+/*!
+    \fn Q3IntDict::Q3IntDict( const Q3IntDict<type> &dict )
+
+    Constructs a copy of \a dict.
+
+    Each item in \a dict is inserted into this dictionary. Only the
+    pointers are copied (shallow copy).
+*/
+
+/*!
+    \fn Q3IntDict::~Q3IntDict()
+
+    Removes all items from the dictionary and destroys it.
+
+    All iterators that access this dictionary will be reset.
+
+    \sa setAutoDelete()
+*/
+
+/*!
+    \fn Q3IntDict<type> &Q3IntDict::operator=(const Q3IntDict<type> &dict)
+
+    Assigns \a dict to this dictionary and returns a reference to this
+    dictionary.
+
+    This dictionary is first cleared and then each item in \a dict is
+    inserted into this dictionary. Only the pointers are copied
+    (shallow copy), unless newItem() has been reimplemented.
+*/
+
+/*!
+    \fn uint Q3IntDict::count() const
+
+    Returns the number of items in the dictionary.
+
+    \sa isEmpty()
+*/
+
+/*!
+    \fn uint Q3IntDict::size() const
+
+    Returns the size of the internal hash array (as specified in the
+    constructor).
+
+    \sa count()
+*/
+
+/*!
+    \fn void Q3IntDict::resize( uint newsize )
+
+    Changes the size of the hashtable to \a newsize. The contents of
+    the dictionary are preserved, but all iterators on the dictionary
+    become invalid.
+*/
+
+/*!
+    \fn bool Q3IntDict::isEmpty() const
+
+    Returns TRUE if the dictionary is empty; otherwise returns FALSE.
+
+    \sa count()
+*/
+
+/*!
+    \fn void Q3IntDict::insert( long key, const type *item )
+
+    Insert item \a item into the dictionary using key \a key.
+
+    Multiple items can have the same key, in which case only the last
+    item will be accessible using \l operator[]().
+
+    \a item may not be 0.
+
+    \sa replace()
+*/
+
+/*!
+    \fn void Q3IntDict::replace( long key, const type *item )
+
+    If the dictionary has key \a key, this key's item is replaced with
+    \a item. If the dictionary doesn't contain key \a key, \a item is
+    inserted into the dictionary using key \a key. 
+
+    \a item may not be 0.
+
+    Equivalent to:
+    \snippet doc/src/snippets/code/doc_src_q3intdict.qdoc 1
+
+    If there are two or more items with equal keys, then the most
+    recently inserted item will be replaced.
+
+    \sa insert()
+*/
+
+/*!
+    \fn bool Q3IntDict::remove( long key )
+
+    Removes the item associated with \a key from the dictionary.
+    Returns TRUE if successful, i.e. if the \a key is in the
+    dictionary; otherwise returns FALSE.
+
+    If there are two or more items with equal keys, then the most
+    recently inserted item will be removed.
+
+    The removed item is deleted if \link
+    Q3PtrCollection::setAutoDelete() auto-deletion\endlink is enabled.
+
+    All dictionary iterators that refer to the removed item will be
+    set to point to the next item in the dictionary's traversal
+    order.
+
+    \sa take(), clear(), setAutoDelete()
+*/
+
+/*!
+    \fn type *Q3IntDict::take( long key )
+
+    Takes the item associated with \a key out of the dictionary
+    without deleting it (even if \link Q3PtrCollection::setAutoDelete()
+    auto-deletion\endlink is enabled).
+
+    If there are two or more items with equal keys, then the most
+    recently inserted item will be taken.
+
+    Returns a pointer to the item taken out, or 0 if the key does not
+    exist in the dictionary.
+
+    All dictionary iterators that refer to the taken item will be set
+    to point to the next item in the dictionary's traversing order.
+
+    \sa remove(), clear(), setAutoDelete()
+*/
+
+/*!
+    \fn void Q3IntDict::clear()
+
+    Removes all items from the dictionary.
+
+    The removed items are deleted if \link
+    Q3PtrCollection::setAutoDelete() auto-deletion\endlink is enabled.
+
+    All dictionary iterators that access this dictionary will be reset.
+
+    \sa remove(), take(), setAutoDelete()
+*/
+
+/*!
+    \fn type *Q3IntDict::find( long key ) const
+
+    Returns the item associated with \a key, or 0 if the key does not
+    exist in the dictionary.
+
+    If there are two or more items with equal keys, then the most
+    recently inserted item will be found.
+
+    Equivalent to operator[].
+
+    \sa operator[]()
+*/
+
+/*!
+    \fn type *Q3IntDict::operator[]( long key ) const
+
+    Returns the item associated with \a key, or 0 if the key does not
+    exist in the dictionary.
+
+    If there are two or more items with equal keys, then the most
+    recently inserted item will be found.
+
+    Equivalent to the find() function.
+
+    \sa find()
+*/
+
+/*!
+    \fn void Q3IntDict::statistics() const
+
+    Debugging-only function that prints out the dictionary
+    distribution using qDebug().
+*/
+
+/*!
+    \fn QDataStream& Q3IntDict::read( QDataStream &s, Q3PtrCollection::Item &item )
+
+    Reads a dictionary item from the stream \a s and returns a
+    reference to the stream.
+
+    The default implementation sets \a item to 0.
+
+    \sa write()
+*/
+
+/*!
+    \fn QDataStream& Q3IntDict::write( QDataStream &s, Q3PtrCollection::Item item ) const
+
+    Writes a dictionary \a item to the stream \a s and returns a
+    reference to the stream.
+
+    \sa read()
+*/
+
+/*!
+    \class Q3IntDictIterator
+    \brief The Q3IntDictIterator class provides an iterator for Q3IntDict collections.
+    \compat
+
+    Q3IntDictIterator is implemented as a template class. Define a
+    template instance Q3IntDictIterator\<X\> to create a dictionary
+    iterator that operates on Q3IntDict\<X\> (dictionary of X*).
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_q3intdict.qdoc 2
+
+    Note that the traversal order is arbitrary; you are not guaranteed the
+    order shown above.
+
+    Multiple iterators may independently traverse the same dictionary.
+    A Q3IntDict knows about all the iterators that are operating on the
+    dictionary. When an item is removed from the dictionary, Q3IntDict
+    updates all iterators that refer the removed item to point to the
+    next item in the traversal order.
+
+    \sa Q3IntDict
+*/
+
+/*!
+    \fn Q3IntDictIterator::Q3IntDictIterator( const Q3IntDict<type> &dict )
+
+    Constructs an iterator for \a dict. The current iterator item is
+    set to point to the 'first' item in the \a dict. The first item
+    refers to the first item in the dictionary's arbitrary internal
+    ordering.
+*/
+
+/*!
+    \fn Q3IntDictIterator::~Q3IntDictIterator()
+
+    Destroys the iterator.
+*/
+
+/*!
+    \fn uint Q3IntDictIterator::count() const
+
+    Returns the number of items in the dictionary this iterator
+    operates over.
+
+    \sa isEmpty()
+*/
+
+/*!
+    \fn bool Q3IntDictIterator::isEmpty() const
+
+    Returns TRUE if the dictionary is empty; otherwise eturns FALSE.
+
+    \sa count()
+*/
+
+/*!
+    \fn type *Q3IntDictIterator::toFirst()
+
+    Sets the current iterator item to point to the first item in the
+    dictionary and returns a pointer to the item. The first item
+    refers to the first item in the dictionary's arbitrary internal
+    ordering. If the dictionary is  empty it sets the current item to
+    0 and returns 0.
+*/
+
+/*!
+    \fn Q3IntDictIterator::operator type *() const
+
+    Cast operator. Returns a pointer to the current iterator item.
+    Same as current().
+*/
+
+/*!
+    \fn type *Q3IntDictIterator::current() const
+
+    Returns a pointer to the current iterator item.
+*/
+
+/*!
+    \fn long Q3IntDictIterator::currentKey() const
+
+    Returns the key for the current iterator item.
+*/
+
+/*!
+    \fn type *Q3IntDictIterator::operator()()
+
+    Makes the succeeding item current and returns the original current
+    item.
+
+    If the current iterator item was the last item in the dictionary
+    or if it was 0, 0 is returned.
+*/
+
+/*!
+  \fn type *Q3IntDictIterator::operator++()
+
+    Prefix ++ makes the succeeding item current and returns the new
+    current item.
+
+    If the current iterator item was the last item in the dictionary
+    or if it was 0, 0 is returned.
+*/
+
+/*!
+    \fn type *Q3IntDictIterator::operator+=( uint jump )
+
+    Sets the current item to the item \a jump positions after the
+    current item, and returns a pointer to that item.
+
+    If that item is beyond the last item or if the dictionary is
+    empty, it sets the current item to 0 and returns 0.
+*/
diff --git a/doc/src/q3memarray.qdoc b/doc/src/q3memarray.qdoc
new file mode 100644
index 0000000000..5ab7895a07
--- /dev/null
+++ b/doc/src/q3memarray.qdoc
@@ -0,0 +1,523 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class Q3MemArray
+    \brief The Q3MemArray class is a template class that provides arrays of simple types.
+    \compat
+
+    Q3MemArray is implemented as a template class. Define a template
+    instance Q3MemArray\<X\> to create an array that contains X items.
+
+    Q3MemArray stores the array elements directly in the array. It can
+    only deal with simple types (i.e. C++ types, structs, and classes
+    that have no constructors, destructors, or virtual functions).
+    Q3MemArray uses bitwise operations to copy and compare array
+    elements. 
+
+    The Q3PtrVector collection class is also a kind of array. Like most
+    old Qt collection classes, it uses pointers to the contained items.
+
+    Q3MemArray uses explicit sharing with a
+    reference count. If more than one array shares common data and one
+    of the arrays is modified, all the arrays are modified.
+
+    The benefit of sharing is that a program does not need to duplicate
+    data when it is not required, which results in lower memory use
+    and less copying of data.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_q3memarray.qdoc 0
+
+    Program output:
+    \snippet doc/src/snippets/code/doc_src_q3memarray.qdoc 1
+
+    Note concerning the use of Q3MemArray for manipulating structs or
+    classes: Compilers will often pad the size of structs of odd sizes
+    up to the nearest word boundary. This will then be the size
+    Q3MemArray will use for its bitwise element comparisons. Because
+    the remaining bytes will typically be uninitialized, this can
+    cause find() etc. to fail to find the element. Example:
+
+    \snippet doc/src/snippets/code/doc_src_q3memarray.qdoc 2
+
+    To work around this, make sure that you use a struct where
+    sizeof() returns the same as the sum of the sizes of the members
+    either by changing the types of the struct members or by adding
+    dummy members.
+
+    Q3MemArray data can be traversed by iterators (see begin() and
+    end()). The number of items is returned by count(). The array can
+    be resized with resize() and filled using fill().
+
+    You can make a shallow copy of the array with assign() (or
+    operator=()) and a deep copy with duplicate().
+
+    Search for values in the array with find() and contains(). For
+    sorted arrays (see sort()) you can search using bsearch().
+
+    You can set the data directly using setRawData() and
+    resetRawData(), although this requires care.
+*/
+
+/*! \fn Q3MemArray::operator QVector<type>() const
+
+    Automatically converts the Q3MemArray<type> into a QVector<type>.
+*/
+
+/*! \typedef Q3MemArray::Iterator
+    A Q3MemArray iterator.
+    \sa begin() end()
+*/
+/*! \typedef Q3MemArray::ConstIterator
+    A const Q3MemArray iterator.
+    \sa begin() end()
+*/
+/*! \typedef Q3MemArray::ValueType
+    \internal
+*/
+
+/*!
+    \fn Q3MemArray::Q3MemArray()
+
+    Constructs a null array.
+
+    \sa isNull()
+*/
+
+/*!
+    \fn Q3MemArray::Q3MemArray( int size )
+
+    Constructs an array with room for \a size elements. Makes a null
+    array if \a size == 0.
+
+    The elements are left uninitialized.
+
+    \sa resize(), isNull()
+*/
+
+/*!
+    \fn Q3MemArray::Q3MemArray( const Q3MemArray<type> &a )
+
+    Constructs a shallow copy of \a a.
+
+    \sa assign()
+*/
+
+/*!
+    \fn Q3MemArray::Q3MemArray(const QVector<type> &vector)
+
+    Constructs a copy of \a vector.
+*/
+
+/*!
+    \fn Q3MemArray::Q3MemArray(int arg1, int arg2)
+
+    Constructs an array \e{without allocating} array space. The
+    arguments \a arg1 and \a arg2 should be zero. Use at your own
+    risk.
+*/
+
+/*!
+    \fn Q3MemArray::~Q3MemArray()
+
+    Dereferences the array data and deletes it if this was the last
+    reference.
+*/
+
+/*!
+    \fn Q3MemArray<type> &Q3MemArray::operator=( const Q3MemArray<type> &a )
+
+    Assigns a shallow copy of \a a to this array and returns a
+    reference to this array.
+
+    Equivalent to assign( a ).
+*/
+
+/*!
+    \fn type *Q3MemArray::data() const
+
+    Returns a pointer to the actual array data.
+
+    The array is a null array if data() == 0 (null pointer).
+
+    \sa isNull()
+*/
+
+/*!
+    \fn uint Q3MemArray::nrefs() const
+
+    Returns the reference count for the shared array data. This
+    reference count is always greater than zero.
+*/
+
+/*!
+    \fn uint Q3MemArray::size() const
+
+    Returns the size of the array (maximum number of elements).
+
+    The array is a null array if size() == 0.
+
+    \sa isNull(), resize()
+*/
+
+/*!
+    \fn uint Q3MemArray::count() const
+
+    Returns the same as size().
+
+    \sa size()
+*/
+
+/*!
+    \fn bool Q3MemArray::isEmpty() const
+
+    Returns TRUE if the array is empty; otherwise returns FALSE.
+
+    isEmpty() is equivalent to isNull() for Q3MemArray (unlike
+    QString).
+*/
+
+/*!
+    \fn bool Q3MemArray::isNull() const
+
+    Returns TRUE if the array is null; otherwise returns FALSE.
+
+    A null array has size() == 0 and data() == 0.
+*/
+
+/*!
+    \fn bool Q3MemArray::resize( uint size, Optimization optim )
+
+    Resizes (expands or shrinks) the array to \a size elements. The
+    array becomes a null array if \a size == 0.
+
+    Returns TRUE if successful, or FALSE if the memory cannot be
+    allocated.
+
+    New elements are not initialized.
+
+    \a optim is either Q3GArray::MemOptim (the default) or
+    Q3GArray::SpeedOptim. When optimizing for speed rather than memory
+    consumption, the array uses a smart grow and shrink algorithm that
+    might allocate more memory than is actually needed for \a size
+    elements. This speeds up subsequent resize operations, for example
+    when appending many elements to an array, since the space has
+    already been allocated.
+
+    \sa size()
+*/
+
+/*!
+    \fn bool Q3MemArray::resize( uint size )
+
+    \overload
+
+    Resizes (expands or shrinks) the array to \a size elements. The
+    array becomes a null array if \a size == 0.
+
+    Returns TRUE if successful, i.e. if the memory can be allocated;
+    otherwise returns FALSE.
+
+    New elements are not initialized.
+
+    \sa size()
+*/
+
+/*!
+    \fn bool Q3MemArray::truncate( uint pos )
+
+    Truncates the array at position \a pos.
+
+    Returns TRUE if successful, i.e. if the memory can be allocated;
+    otherwise returns FALSE.
+
+    Equivalent to resize(\a pos).
+
+    \sa resize()
+*/
+
+/*!
+    \fn bool Q3MemArray::fill( const type &v, int size )
+
+    Fills the array with the value \a v. If \a size is specified as
+    different from -1, then the array will be resized before being
+    filled.
+
+    Returns TRUE if successful, i.e. if \a size is -1, or \a size is
+    != -1 and the memory can be allocated; otherwise returns FALSE.
+
+    \sa resize()
+*/
+
+/*!
+    \fn void Q3MemArray::detach()
+
+    Detaches this array from shared array data; i.e. it makes a
+    private, deep copy of the data.
+
+    Copying will be performed only if the \link nrefs() reference
+    count\endlink is greater than one.
+
+    \sa copy()
+*/
+
+/*!
+    \fn Q3MemArray<type> Q3MemArray::copy() const
+
+    Returns a deep copy of this array.
+
+    \sa detach(), duplicate()
+*/
+
+/*!
+    \fn Q3MemArray<type> &Q3MemArray::assign( const Q3MemArray<type> &a )
+
+    Shallow copy. Dereferences the current array and references the
+    data contained in \a a instead. Returns a reference to this array.
+
+    \sa operator=()
+*/
+
+/*!
+    \fn Q3MemArray<type> &Q3MemArray::assign( const type *data, uint size )
+
+    \overload
+
+    Shallow copy. Dereferences the current array and references the
+    array data \a data, which contains \a size elements. Returns a
+    reference to this array.
+
+    Do not delete \a data later; Q3MemArray will call free() on it
+    at the right time.
+*/
+
+/*!
+    \fn Q3MemArray<type> &Q3MemArray::duplicate( const Q3MemArray<type> &a )
+
+    Deep copy. Dereferences the current array and obtains a copy of
+    the data contained in \a a instead. Returns a reference to this
+    array.
+
+    \sa copy()
+*/
+
+/*!
+    \fn Q3MemArray<type> &Q3MemArray::duplicate( const type *data, uint size )
+
+    \overload
+
+    Deep copy. Dereferences the current array and obtains a copy of
+    the array data \a data instead. Returns a reference to this array.
+    The size of the array is given by \a size.
+
+    \sa copy()
+*/
+
+/*!
+    \fn Q3MemArray<type> &Q3MemArray::setRawData( const type *data, uint size )
+
+    Sets raw data and returns a reference to the array.
+
+    Dereferences the current array and sets the new array data to \a
+    data and the new array size to \a size. Do not attempt to resize
+    or re-assign the array data when raw data has been set. Call
+    resetRawData(\a data, \a size) to reset the array.
+
+    Setting raw data is useful because it sets Q3MemArray data without
+    allocating memory or copying data.
+
+    Example I (intended use):
+    \snippet doc/src/snippets/code/doc_src_q3memarray.qdoc 3
+
+    Example II (you don't want to do this):
+    \snippet doc/src/snippets/code/doc_src_q3memarray.qdoc 4
+
+    \warning If you do not call resetRawData(), Q3MemArray will attempt
+    to deallocate or reallocate the raw data, which might not be too
+    good. Be careful.
+
+    \sa resetRawData()
+*/
+
+/*!
+    \fn void Q3MemArray::resetRawData( const type *data, uint size )
+
+    Removes internal references to the raw data that was set using
+    setRawData(). This means that Q3MemArray no longer has access to
+    the \a data, so you are free to manipulate \a data as you wish.
+    You can now use the Q3MemArray without affecting the original \a
+    data, for example by calling setRawData() with a pointer to some
+    other data.
+
+    The arguments must be the \a data and length, \a size, that were
+    passed to setRawData(). This is for consistency checking.
+
+    \sa setRawData()
+*/
+
+/*!
+    \fn int Q3MemArray::find( const type &v, uint index ) const
+
+    Finds the first occurrence of \a v, starting at position \a index.
+
+    Returns the position of \a v, or -1 if \a v could not be found.
+
+    \sa contains()
+*/
+
+/*!
+    \fn int Q3MemArray::contains( const type &v ) const
+
+    Returns the number of times \a v occurs in the array.
+
+    \sa find()
+*/
+
+/*!
+    \fn void Q3MemArray::sort()
+
+    Sorts the array elements in ascending order, using bitwise
+    comparison (memcmp()).
+
+    \sa bsearch()
+*/
+
+/*!
+    \fn int Q3MemArray::bsearch( const type &v ) const
+
+    In a sorted array (as sorted by sort()), finds the first
+    occurrence of \a v by using a binary search. For a sorted
+    array this is generally much faster than find(), which does
+    a linear search.
+
+    Returns the position of \a v, or -1 if \a v could not be found.
+
+    \sa sort(), find()
+*/
+
+/*!
+    \fn type &Q3MemArray::operator[]( int index ) const
+
+    Returns a reference to the element at position \a index in the
+    array.
+
+    This can be used to both read and set an element. Equivalent to
+    at().
+
+    \sa at()
+*/
+
+/*!
+    \fn type &Q3MemArray::at( uint index ) const
+
+    Returns a reference to the element at position \a index in the array.
+
+    This can be used to both read and set an element.
+
+    \sa operator[]()
+*/
+
+/*!
+    \fn Q3MemArray::operator const type *() const
+
+    Cast operator. Returns a pointer to the array.
+
+    \sa data()
+*/
+
+/*!
+    \fn bool Q3MemArray::operator==( const Q3MemArray<type> &a ) const
+
+    Returns TRUE if this array is equal to \a a; otherwise returns
+    FALSE.
+
+    The two arrays are compared bitwise.
+
+    \sa operator!=()
+*/
+
+/*!
+    \fn bool Q3MemArray::operator!=( const Q3MemArray<type> &a ) const
+
+    Returns TRUE if this array is different from \a a; otherwise
+    returns FALSE.
+
+    The two arrays are compared bitwise.
+
+    \sa operator==()
+*/
+
+/*!
+    \fn Iterator Q3MemArray::begin()
+
+    Returns an iterator pointing at the beginning of this array. This
+    iterator can be used in the same way as the iterators of
+    Q3ValueList and QMap, for example.
+*/
+
+/*!
+    \fn Iterator Q3MemArray::end()
+
+    Returns an iterator pointing behind the last element of this
+    array. This iterator can be used in the same way as the iterators
+    of Q3ValueList and QMap, for example.
+*/
+
+/*!
+    \fn ConstIterator Q3MemArray::begin() const
+
+    \overload
+
+    Returns a const iterator pointing at the beginning of this array.
+    This iterator can be used in the same way as the iterators of
+    Q3ValueList and QMap, for example.
+*/
+
+/*!
+    \fn ConstIterator Q3MemArray::end() const
+
+    \overload
+
+    Returns a const iterator pointing behind the last element of this
+    array. This iterator can be used in the same way as the iterators
+    of Q3ValueList and QMap, for example. 
+*/
diff --git a/doc/src/q3popupmenu.qdoc b/doc/src/q3popupmenu.qdoc
new file mode 100644
index 0000000000..137115ec78
--- /dev/null
+++ b/doc/src/q3popupmenu.qdoc
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class Q3PopupMenu
+    \brief The Q3PopupMenu class is a thin compatibility wrapper around QMenu.
+    \compat
+
+    Use QMenu in new applications. Note that the menu's actions must
+    be \l {Q3Action}s.
+*/
+
+/*!
+    \fn Q3PopupMenu::Q3PopupMenu(QWidget *parent, const char *name)
+
+    Constructs a menu with the given \a parent and \a name.
+*/
+
+/*!
+    \fn int Q3PopupMenu::exec()
+
+    Pops up the menu and returns the ID of the action that was
+    selected.
+
+    \sa QMenu::exec()
+*/
+
+/*!
+    \fn int Q3PopupMenu::exec(const QPoint & pos, int indexAtPoint)
+
+    Pops up the menu at coordinate \a pos and returns the ID of the
+    action that was selected.
+
+    If \a indexAtPoint is specified, the menu will pop up with the
+    item at index \a indexAtPoint under the mouse cursor.
+
+    \sa QMenu::exec()
+*/
diff --git a/doc/src/q3ptrdict.qdoc b/doc/src/q3ptrdict.qdoc
new file mode 100644
index 0000000000..a7e35457fd
--- /dev/null
+++ b/doc/src/q3ptrdict.qdoc
@@ -0,0 +1,388 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class Q3PtrDict
+    \brief The Q3PtrDict class is a template class that provides a dictionary based on void* keys.
+    \compat
+
+    Q3PtrDict is implemented as a template class. Define a template
+    instance Q3PtrDict\<X\> to create a dictionary that operates on
+    pointers to X (X*).
+
+    A dictionary is a collection of key-value pairs. The key is a
+    void* used for insertion, removal and lookup. The value is a
+    pointer. Dictionaries provide very fast insertion and lookup.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_q3ptrdict.qdoc 0
+    In this example we use a dictionary to add an extra property (a
+    char*) to the line edits we're using. 
+
+    See Q3Dict for full details, including the choice of dictionary
+    size, and how deletions are handled. 
+
+    \sa Q3PtrDictIterator, Q3Dict, Q3AsciiDict, Q3IntDict
+*/
+
+
+/*!
+    \fn Q3PtrDict::Q3PtrDict( int size )
+
+    Constructs a dictionary using an internal hash array with the size
+    \a size.
+
+    Setting \a size to a suitably large prime number (equal to or
+    greater than the expected number of entries) makes the hash
+    distribution better and improves lookup performance.
+*/
+
+/*!
+    \fn Q3PtrDict::Q3PtrDict( const Q3PtrDict<type> &dict )
+
+    Constructs a copy of \a dict.
+
+    Each item in \a dict is inserted into this dictionary. Only the
+    pointers are copied (shallow copy).
+*/
+
+/*!
+    \fn Q3PtrDict::~Q3PtrDict()
+
+    Removes all items from the dictionary and destroys it.
+
+    All iterators that access this dictionary will be reset.
+
+    \sa setAutoDelete()
+*/
+
+/*!
+    \fn Q3PtrDict<type> &Q3PtrDict::operator=(const Q3PtrDict<type> &dict)
+
+    Assigns \a dict to this dictionary and returns a reference to this
+    dictionary.
+
+    This dictionary is first cleared and then each item in \a dict is
+    inserted into the dictionary. Only the pointers are copied
+    (shallow copy), unless newItem() has been reimplemented.
+*/
+
+/*!
+    \fn uint Q3PtrDict::count() const
+
+    Returns the number of items in the dictionary.
+
+    \sa isEmpty()
+*/
+
+/*!
+    \fn uint Q3PtrDict::size() const
+
+    Returns the size of the internal hash table (as specified in the
+    constructor).
+
+    \sa count()
+*/
+
+/*!
+    \fn void Q3PtrDict::resize( uint newsize )
+
+    Changes the size of the hash table to \a newsize. The contents of
+    the dictionary are preserved, but all iterators on the dictionary
+    become invalid.
+*/
+
+/*!
+    \fn bool Q3PtrDict::isEmpty() const
+
+    Returns TRUE if the dictionary is empty; otherwise returns FALSE.
+
+    \sa count()
+*/
+
+/*!
+    \fn void Q3PtrDict::insert( void *key, const type *item )
+
+    Inserts the \a key with the \a item into the dictionary.
+
+    Multiple items can have the same key, in which case only the last
+    item will be accessible using \l operator[]().
+
+    \a item may not be 0.
+
+    \sa replace()
+*/
+
+/*!
+    \fn void Q3PtrDict::replace( void *key, const type *item )
+
+    If the dictionary has key \a key, this key's item is replaced with
+    \a item. If the dictionary doesn't contain key \a key, \a item is
+    inserted into the dictionary using key \a key. 
+
+    \a item may not be 0.
+
+    Equivalent to
+    \snippet doc/src/snippets/code/doc_src_q3ptrdict.qdoc 1
+
+    If there are two or more items with equal keys, then the most
+    recently inserted item will be replaced.
+
+    \sa insert()
+*/
+
+/*!
+    \fn bool Q3PtrDict::remove( void *key ) 
+    
+    Removes the item associated with \a key from the dictionary.
+    Returns TRUE if successful, i.e. if \a key is in the dictionary;
+    otherwise returns FALSE.
+
+    If there are two or more items with equal keys, then the most
+    recently inserted item will be removed.
+
+    The removed item is deleted if \link
+    Q3PtrCollection::setAutoDelete() auto-deletion\endlink is enabled.
+
+    All dictionary iterators that refer to the removed item will be
+    set to point to the next item in the dictionary traversal order.
+
+    \sa take(), clear(), setAutoDelete()
+*/
+
+/*!
+    \fn type *Q3PtrDict::take( void *key )
+
+    Takes the item associated with \a key out of the dictionary
+    without deleting it (even if \link Q3PtrCollection::setAutoDelete()
+    auto-deletion\endlink is enabled).
+
+    If there are two or more items with equal keys, then the most
+    recently inserted item will be removed.
+
+    Returns a pointer to the item taken out, or 0 if the key does not
+    exist in the dictionary.
+
+    All dictionary iterators that refer to the taken item will be set
+    to point to the next item in the dictionary traversal order.
+
+    \sa remove(), clear(), setAutoDelete()
+*/
+
+/*!
+    \fn void Q3PtrDict::clear()
+
+    Removes all items from the dictionary.
+
+    The removed items are deleted if \link
+    Q3PtrCollection::setAutoDelete() auto-deletion\endlink is enabled.
+
+    All dictionary iterators that access this dictionary will be
+    reset.
+
+    \sa remove(), take(), setAutoDelete()
+*/
+
+/*!
+    \fn type *Q3PtrDict::find( void *key ) const
+
+    Returns the item associated with \a key, or 0 if the key does not
+    exist in the dictionary.
+
+    If there are two or more items with equal keys, then the most
+    recently inserted item will be found.
+
+    Equivalent to operator[].
+
+    \sa operator[]()
+*/
+
+/*!
+    \fn type *Q3PtrDict::operator[]( void *key ) const
+
+    Returns the item associated with \a key, or 0 if the key does not
+    exist in the dictionary.
+
+    If there are two or more items with equal keys, then the most
+    recently inserted item will be found.
+
+    Equivalent to the find() function.
+
+    \sa find()
+*/
+
+/*!
+    \fn void Q3PtrDict::statistics() const
+
+    Debugging-only function that prints out the dictionary
+    distribution using qDebug().
+*/
+
+/*!
+    \fn QDataStream& Q3PtrDict::read( QDataStream &s, Q3PtrCollection::Item &item )
+
+    Reads a dictionary item from the stream \a s and returns a
+    reference to the stream.
+
+    The default implementation sets \a item to 0.
+
+    \sa write()
+*/
+
+/*!
+    \fn QDataStream& Q3PtrDict::write( QDataStream &s, Q3PtrCollection::Item item) const
+
+    Writes a dictionary \a item to the stream \a s and returns a
+    reference to the stream.
+
+    \sa read()
+*/
+
+/*!
+    \class Q3PtrDictIterator
+    \brief The Q3PtrDictIterator class provides an iterator for Q3PtrDict collections.
+    \compat
+
+    Q3PtrDictIterator is implemented as a template class. Define a
+    template instance Q3PtrDictIterator\<X\> to create a dictionary
+    iterator that operates on Q3PtrDict\<X\> (dictionary of X*).
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_q3ptrdict.qdoc 2
+    In the example we insert some line edits into a dictionary,
+    associating a string with each. We then iterate over the
+    dictionary printing the associated strings.
+
+    Multiple iterators may independently traverse the same dictionary.
+    A Q3PtrDict knows about all the iterators that are operating on the
+    dictionary. When an item is removed from the dictionary, Q3PtrDict
+    updates all iterators that refer the removed item to point to the
+    next item in the traversing order.
+
+    \sa Q3PtrDict
+*/
+
+/*!
+    \fn Q3PtrDictIterator::Q3PtrDictIterator( const Q3PtrDict<type> &dict )
+
+    Constructs an iterator for \a dict. The current iterator item is
+    set to point on the first item in the \a dict.
+*/
+
+/*!
+    \fn Q3PtrDictIterator::~Q3PtrDictIterator()
+
+    Destroys the iterator.
+*/
+
+/*!
+    \fn uint Q3PtrDictIterator::count() const
+
+    Returns the number of items in the dictionary this iterator
+    operates on.
+
+    \sa isEmpty()
+*/
+
+/*!
+    \fn bool Q3PtrDictIterator::isEmpty() const
+
+    Returns TRUE if the dictionary is empty; otherwise returns FALSE.
+
+    \sa count()
+*/
+
+/*!
+    \fn type *Q3PtrDictIterator::toFirst()
+
+    Sets the current iterator item to point to the first item in the
+    dictionary and returns a pointer to the item. If the dictionary is
+    empty, it sets the current item to 0 and returns 0.
+*/
+
+/*!
+    \fn Q3PtrDictIterator::operator type *() const
+
+    Cast operator. Returns a pointer to the current iterator item.
+    Same as current().
+*/
+
+/*!
+    \fn type *Q3PtrDictIterator::current() const
+
+    Returns a pointer to the current iterator item's value.
+*/
+
+/*!
+    \fn void *Q3PtrDictIterator::currentKey() const
+
+    Returns the current iterator item's key.
+*/
+
+/*!
+    \fn type *Q3PtrDictIterator::operator()()
+
+    Makes the succeeding item current and returns the original current
+    item.
+
+    If the current iterator item was the last item in the dictionary
+    or if it was 0, 0 is returned.
+*/
+
+/*!
+    \fn type *Q3PtrDictIterator::operator++()
+
+    Prefix ++ makes the succeeding item current and returns the new
+    current item.
+
+    If the current iterator item was the last item in the dictionary
+    or if it was 0, 0 is returned.
+*/
+
+/*!
+    \fn type *Q3PtrDictIterator::operator+=( uint jump )
+
+    Sets the current item to the item \a jump positions after the
+    current item and returns a pointer to that item.
+
+    If that item is beyond the last item or if the dictionary is
+    empty, it sets the current item to 0 and returns 0.
+*/
diff --git a/doc/src/q3ptrlist.qdoc b/doc/src/q3ptrlist.qdoc
new file mode 100644
index 0000000000..7eb4265543
--- /dev/null
+++ b/doc/src/q3ptrlist.qdoc
@@ -0,0 +1,1157 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class Q3PtrList
+    \brief The Q3PtrList class is a template class that provides a list.
+    \compat
+
+    Q3ValueList is an STL-compatible alternative to this class.
+
+    Define a template instance Q3PtrList\<X\> to create a list that
+    operates on pointers to X (X*).
+
+    The list class is indexable and has a \link at() current
+    index\endlink and a \link current() current item\endlink. The
+    first item corresponds to index position 0. The current index is
+    -1 if the current item is 0.
+
+    Items are inserted with prepend(), insert() or append(). Items are
+    removed with remove(), removeRef(), removeFirst() and
+    removeLast(). You can search for an item using find(), findNext(),
+    findRef() or findNextRef(). The list can be sorted with sort().
+    You can count the number of occurrences of an item with contains()
+    or containsRef(). You can get a pointer to the current item with
+    current(), to an item at a particular index position in the list
+    with at() or to the first or last item with getFirst() and
+    getLast(). You can also iterate over the list with first(),
+    last(), next() and prev() (which all update current()). The list's
+    deletion property is set with setAutoDelete().
+
+    \target example
+    Example:
+    \snippet doc/src/snippets/code/doc_src_q3ptrlist.qdoc 0
+
+    The output is
+    \snippet doc/src/snippets/code/doc_src_q3ptrlist.qdoc 1
+
+    Q3PtrList has several member functions for traversing the list, but
+    using a Q3PtrListIterator can be more practical. Multiple list
+    iterators may traverse the same list, independently of each other
+    and of the current list item.
+
+    In the example above we make the call setAutoDelete(true).
+    Enabling auto-deletion tells the list to delete items that are
+    removed. The default is to not delete items when they are removed
+    but this would cause a memory leak in the example because there
+    are no other references to the list items.
+
+    When inserting an item into a list only the pointer is copied, not
+    the item itself, i.e. a shallow copy. It is possible to make the
+    list copy all of the item's data (deep copy) when an item is
+    inserted. insert(), inSort() and append() call the virtual
+    function Q3PtrCollection::newItem() for the item to be inserted.
+    Inherit a list and reimplement newItem() to have deep copies.
+
+    When removing an item from a list, the virtual function
+    Q3PtrCollection::deleteItem() is called. Q3PtrList's default
+    implementation is to delete the item if auto-deletion is enabled.
+
+    The virtual function compareItems() can be reimplemented to
+    compare two list items. This function is called from all list
+    functions that need to compare list items, for instance
+    remove(const type*). If you only want to deal with pointers, there
+    are functions that compare pointers instead, for instance
+    removeRef(const type*). These functions are somewhat faster than
+    those that call compareItems().
+
+    List items are stored as \c void* in an internal Q3LNode, which
+    also holds pointers to the next and previous list items. The
+    functions currentNode(), removeNode(), and takeNode() operate
+    directly on the Q3LNode, but they should be used with care. The
+    data component of the node is available through Q3LNode::getData().
+
+    The Q3StrList class is a list of \c char*.
+    It reimplements newItem(), deleteItem() and compareItems(). (But
+    see QStringList for a list of Unicode QStrings.)
+
+    \sa Q3PtrListIterator
+*/
+
+
+/*!
+    \fn Q3PtrList::Q3PtrList()
+
+    Constructs an empty list.
+*/
+
+/*!
+    \fn Q3PtrList::Q3PtrList( const Q3PtrList<type> &list )
+
+    Constructs a copy of \a list.
+
+    Each item in \a list is \link append() appended\endlink to this
+    list. Only the pointers are copied (shallow copy).
+*/
+
+/*!
+    \fn Q3PtrList::~Q3PtrList()
+
+    Removes all items from the list and destroys the list.
+
+    All list iterators that access this list will be reset.
+
+    \sa setAutoDelete()
+*/
+
+/*!
+    \fn Q3PtrList<type> &Q3PtrList::operator=(const Q3PtrList<type> &list)
+
+    Assigns \a list to this list and returns a reference to this list.
+
+    This list is first cleared and then each item in \a list is \link
+    append() appended\endlink to this list. Only the pointers are
+    copied (shallow copy) unless newItem() has been reimplemented.
+*/
+
+/*!
+    \fn bool Q3PtrList::operator==(const Q3PtrList<type> &list ) const
+
+    Compares this list with \a list. Returns TRUE if the lists contain
+    the same data; otherwise returns FALSE.
+*/
+
+/*!
+    \fn uint Q3PtrList::count() const
+
+    Returns the number of items in the list.
+
+    \sa isEmpty()
+*/
+
+/*!
+    \fn bool Q3PtrList::operator!=(const Q3PtrList<type> &list ) const
+
+    Compares this list with \a list. Returns TRUE if the lists contain
+    different data; otherwise returns FALSE.
+*/
+
+
+/*!
+    \fn void Q3PtrList::sort()
+
+    Sorts the list by the result of the virtual compareItems()
+    function.
+
+    The heap sort algorithm is used for sorting. It sorts n items with
+    O(n*log n) comparisons. This is the asymptotic optimal solution of
+    the sorting problem.
+
+    If the items in your list support operator<() and operator==(),
+    you might be better off with Q3SortedList because it implements the
+    compareItems() function for you using these two operators.
+
+    \sa inSort()
+*/
+
+/*!
+    \fn bool Q3PtrList::isEmpty() const
+
+    Returns TRUE if the list is empty; otherwise returns FALSE.
+
+    \sa count()
+*/
+
+/*!
+    \fn bool Q3PtrList::insert( uint index, const type *item )
+
+    Inserts the \a item at position \a index in the list.
+
+    Returns TRUE if successful, i.e. if \a index is in range;
+    otherwise returns FALSE. The valid range is 0 to count()
+    (inclusively). The item is appended if \a index == count().
+
+    The inserted item becomes the current list item.
+
+    \a item must not be 0.
+
+    \sa append(), current(), replace()
+*/
+
+/*!
+    \fn bool Q3PtrList::replace( uint index, const type *item )
+
+    Replaces the item at position \a index with the new \a item. 
+
+    Returns TRUE if successful, i.e. \a index is in the range 0 to
+    count()-1.
+
+    \sa append(), current(), insert()
+*/
+
+/*!
+    \fn void Q3PtrList::inSort( const type *item )
+
+    Inserts the \a item at its sorted position in the list.
+
+    The sort order depends on the virtual compareItems() function. All
+    items must be inserted with inSort() to maintain the sorting
+    order.
+
+    The inserted item becomes the current list item.
+
+    \a item must not be 0.
+
+    \warning Using inSort() is slow. An alternative, especially if you
+    have lots of items, is to simply append() or insert() them and
+    then use sort(). inSort() takes up to O(n) compares. That means
+    inserting n items in your list will need O(n^2) compares whereas
+    sort() only needs O(n*log n) for the same task. So use inSort()
+    only if you already have a presorted list and want to insert just
+    a few additional items.
+
+    \sa insert(), compareItems(), current(), sort()
+*/
+
+/*!
+    \fn void Q3PtrList::append( const type *item )
+
+    Inserts the \a item at the end of the list.
+
+    The inserted item becomes the current list item. This is
+    equivalent to \c{insert( count(), item )}.
+
+    \a item must not be 0.
+
+    \sa insert(), current(), prepend()
+*/
+
+/*!
+    \fn void Q3PtrList::prepend( const type *item )
+
+    Inserts the \a item at the start of the list.
+
+    The inserted item becomes the current list item. This is
+    equivalent to \c{insert( 0, item )}.
+
+    \a item must not be 0.
+
+    \sa append(), insert(), current()
+*/
+
+/*!
+    \fn bool Q3PtrList::remove( uint index )
+
+    Removes the item at position \a index in the list.
+
+    Returns TRUE if successful, i.e. if \a index is in range;
+    otherwise returns FALSE. The valid range is \c{0..(count() - 1)}
+    inclusive.
+
+    The removed item is deleted if \link setAutoDelete()
+    auto-deletion\endlink is enabled.
+
+    The item after the removed item becomes the new current list item
+    if the removed item is not the last item in the list. If the last
+    item is removed, the new last item becomes the current item.
+
+    All list iterators that refer to the removed item will be set to
+    point to the new current item.
+
+    \sa take(), clear(), setAutoDelete(), current() removeRef()
+*/
+
+/*!
+    \fn bool Q3PtrList::remove()
+
+    \overload
+
+    Removes the current list item.
+
+    Returns TRUE if successful, i.e. if the current item isn't 0;
+    otherwise returns FALSE.
+
+    The removed item is deleted if \link setAutoDelete()
+    auto-deletion\endlink is enabled.
+
+    The item after the removed item becomes the new current list item
+    if the removed item is not the last item in the list. If the last
+    item is removed, the new last item becomes the current item. The
+    current item is set to 0 if the list becomes empty.
+
+    All list iterators that refer to the removed item will be set to
+    point to the new current item.
+
+    \sa take(), clear(), setAutoDelete(), current() removeRef()
+*/
+
+/*!
+    \fn bool Q3PtrList::remove( const type *item )
+
+    \overload
+
+    Removes the first occurrence of \a item from the list.
+
+    Returns TRUE if successful, i.e. if \a item is in the list;
+    otherwise returns FALSE.
+
+    The removed item is deleted if \link setAutoDelete()
+    auto-deletion\endlink is enabled.
+
+    The compareItems() function is called when searching for the item
+    in the list. If compareItems() is not reimplemented, it is more
+    efficient to call removeRef().
+
+    If \a item is NULL then the current item is removed from the list.
+
+    The item after the removed item becomes the new current list item
+    if the removed item is not the last item in the list. If the last
+    item is removed, the new last item becomes the current item. The
+    current item is set to 0 if the list becomes empty.
+
+    All list iterators that refer to the removed item will be set to
+    point to the new current item.
+
+    \sa removeRef(), take(), clear(), setAutoDelete(), compareItems(),
+    current()
+*/
+
+/*!
+    \fn bool Q3PtrList::removeRef( const type *item )
+
+    Removes the first occurrence of \a item from the list.
+
+    Returns TRUE if successful, i.e. if \a item is in the list;
+    otherwise returns FALSE.
+
+    The removed item is deleted if \link setAutoDelete()
+    auto-deletion\endlink is enabled.
+
+    Equivalent to:
+    \snippet doc/src/snippets/code/doc_src_q3ptrlist.qdoc 2
+
+    The item after the removed item becomes the new current list item
+    if the removed item is not the last item in the list. If the last
+    item is removed, the new last item becomes the current item. The
+    current item is set to 0 if the list becomes empty.
+
+    All list iterators that refer to the removed item will be set to
+    point to the new current item.
+
+    \sa remove(), clear(), setAutoDelete(), current()
+*/
+
+/*!
+    \fn void Q3PtrList::removeNode( Q3LNode *node )
+
+    Removes the \a node from the list.
+
+    This node must exist in the list, otherwise the program may crash.
+
+    The removed item is deleted if \link setAutoDelete()
+    auto-deletion\endlink is enabled.
+
+    The first item in the list will become the new current list item.
+    The current item is set to 0 if the list becomes empty.
+
+    All list iterators that refer to the removed item will be set to
+    point to the item succeeding this item or to the preceding item if
+    the removed item was the last item.
+
+    \warning Do not call this function unless you are an expert.
+
+    \sa takeNode(), currentNode() remove() removeRef()
+*/
+
+/*!
+    \fn bool Q3PtrList::removeFirst()
+
+    Removes the first item from the list. Returns TRUE if successful,
+    i.e. if the list isn't empty; otherwise returns FALSE.
+
+    The removed item is deleted if \link setAutoDelete()
+    auto-deletion\endlink is enabled.
+
+    The first item in the list becomes the new current list item. The
+    current item is set to 0 if the list becomes empty.
+
+    All list iterators that refer to the removed item will be set to
+    point to the new current item.
+
+    \sa removeLast(), setAutoDelete(), current() remove()
+*/
+
+/*!
+    \fn bool Q3PtrList::removeLast()
+
+    Removes the last item from the list. Returns TRUE if successful,
+    i.e. if the list isn't empty; otherwise returns FALSE.
+
+    The removed item is deleted if \link setAutoDelete()
+    auto-deletion\endlink is enabled.
+
+    The last item in the list becomes the new current list item. The
+    current item is set to 0 if the list becomes empty.
+
+    All list iterators that refer to the removed item will be set to
+    point to the new current item.
+
+    \sa removeFirst(), setAutoDelete(), current()
+*/
+
+/*!
+    \fn type *Q3PtrList::take( uint index )
+
+    Takes the item at position \a index out of the list without
+    deleting it (even if \link setAutoDelete() auto-deletion\endlink
+    is enabled).
+
+    Returns a pointer to the item taken out of the list, or 0 if the
+    index is out of range. The valid range is \c{0..(count() - 1)}
+    inclusive.
+
+    The item after the removed item becomes the new current list item
+    if the removed item is not the last item in the list. If the last
+    item is removed, the new last item becomes the current item. The
+    current item is set to 0 if the list becomes empty.
+
+    All list iterators that refer to the taken item will be set to
+    point to the new current item.
+
+    \sa remove(), clear(), current()
+*/
+
+/*!
+    \fn type *Q3PtrList::take()
+
+    \overload
+
+    Takes the current item out of the list without deleting it (even
+    if \link setAutoDelete() auto-deletion\endlink is enabled).
+
+    Returns a pointer to the item taken out of the list, or 0 if
+    the current item is 0.
+
+    The item after the removed item becomes the new current list item
+    if the removed item is not the last item in the list. If the last
+    item is removed, the new last item becomes the current item. The
+    current item is set to 0 if the list becomes empty.
+
+    All list iterators that refer to the taken item will be set to
+    point to the new current item.
+
+    \sa remove(), clear(), current()
+*/
+
+/*!
+    \fn type *Q3PtrList::takeNode( Q3LNode *node )
+
+    Takes the \a node out of the list without deleting its item (even
+    if \link setAutoDelete() auto-deletion\endlink is enabled).
+    Returns a pointer to the item taken out of the list.
+
+    This node must exist in the list, otherwise the program may crash.
+
+    The first item in the list becomes the new current list item.
+
+    All list iterators that refer to the taken item will be set to
+    point to the item succeeding this item or to the preceding item if
+    the taken item was the last item.
+
+    \warning Do not call this function unless you are an expert.
+
+    \sa removeNode(), currentNode()
+*/
+
+/*!
+    \fn void Q3PtrList::clear()
+
+    Removes all items from the list.
+
+    The removed items are deleted if \link setAutoDelete()
+    auto-deletion\endlink is enabled.
+
+    All list iterators that access this list will be reset.
+
+    \sa remove(), take(), setAutoDelete()
+*/
+
+/*!
+    \fn int Q3PtrList::find( const type *item )
+
+    Finds the first occurrence of \a item in the list.
+
+    If the item is found, the list sets the current item to point to
+    the found item and returns the index of this item. If the item is
+    not found, the list sets the current item to 0, the current
+    index to -1, and returns -1.
+
+    The compareItems() function is called when searching for the item
+    in the list. If compareItems() is not reimplemented, it is more
+    efficient to call findRef().
+
+    \sa findNext(), findRef(), compareItems(), current()
+*/
+
+/*!
+    \fn int Q3PtrList::findNext( const type *item )
+
+    Finds the next occurrence of \a item in the list, starting from
+    the current list item.
+
+    If the item is found, the list sets the current item to point to
+    the found item and returns the index of this item. If the item is
+    not found, the list sets the current item to 0, the current
+    index to -1, and returns -1.
+
+    The compareItems() function is called when searching for the item
+    in the list. If compareItems() is not reimplemented, it is more
+    efficient to call findNextRef().
+
+    \sa find(), findNextRef(), compareItems(), current()
+*/
+
+/*!
+    \fn int Q3PtrList::findRef( const type *item )
+
+    Finds the first occurrence of \a item in the list.
+
+    If the item is found, the list sets the current item to point to
+    the found item and returns the index of this item. If the item is
+    not found, the list sets the current item to 0, the current
+    index to -1, and returns -1.
+
+    Calling this function is much faster than find() because find()
+    compares \a item with each list item using compareItems(), whereas
+    this function only compares the pointers.
+
+    \sa findNextRef(), find(), current()
+*/
+
+/*!
+    \fn int Q3PtrList::findNextRef( const type *item )
+
+    Finds the next occurrence of \a item in the list, starting from
+    the current list item.
+
+    If the item is found, the list sets the current item to point to
+    the found item and returns the index of this item. If the item is
+    not found, the list sets the current item to 0, the current
+    index to -1, and returns -1.
+
+    Calling this function is much faster than findNext() because
+    findNext() compares \a item with each list item using
+    compareItems(), whereas this function only compares the pointers.
+
+    \sa findRef(), findNext(), current()
+*/
+
+/*!
+    \fn uint Q3PtrList::contains( const type *item ) const
+
+    Returns the number of occurrences of \a item in the list.
+
+    The compareItems() function is called when looking for the \a item
+    in the list. If compareItems() is not reimplemented, it is more
+    efficient to call containsRef().
+
+    This function does not affect the current list item.
+
+    \sa containsRef(), compareItems()
+*/
+
+/*!
+    \fn uint Q3PtrList::containsRef( const type *item ) const
+
+    Returns the number of occurrences of \a item in the list.
+
+    Calling this function is much faster than contains() because
+    contains() compares \a item with each list item using
+    compareItems(), whereas his function only compares the pointers.
+
+    This function does not affect the current list item.
+
+    \sa contains()
+*/
+
+/*!
+    \fn type *Q3PtrList::at( uint index )
+
+    Returns a pointer to the item at position \a index in the list, or
+    0 if the index is out of range.
+
+    Sets the current list item to this item if \a index is valid. The
+    valid range is \c{0..(count() - 1)} inclusive.
+
+    This function is very efficient. It starts scanning from the first
+    item, last item, or current item, whichever is closest to \a
+    index.
+
+    \sa current()
+*/
+
+/*!
+    \fn int Q3PtrList::at() const
+
+    \overload
+
+    Returns the index of the current list item. The returned value is
+    -1 if the current item is 0.
+
+    \sa current()
+*/
+
+/*!
+    \fn type *Q3PtrList::current() const
+
+    Returns a pointer to the current list item. The current item may
+    be 0 (implies that the current index is -1). 
+
+    \sa at()
+*/
+
+/*!
+    \fn Q3LNode *Q3PtrList::currentNode() const
+
+    Returns a pointer to the current list node.
+
+    The node can be kept and removed later using removeNode(). The
+    advantage is that the item can be removed directly without
+    searching the list.
+
+    \warning Do not call this function unless you are an expert.
+
+    \sa removeNode(), takeNode(), current()
+*/
+
+/*!
+    \fn type *Q3PtrList::getFirst() const
+
+    Returns a pointer to the first item in the list, or 0 if the list
+    is empty.
+
+    This function does not affect the current list item.
+
+    \sa first(), getLast()
+*/
+
+/*!
+    \fn type *Q3PtrList::getLast() const
+
+    Returns a pointer to the last item in the list, or 0 if the list
+    is empty.
+
+    This function does not affect the current list item.
+
+    \sa last(), getFirst()
+*/
+
+/*!
+    \fn type *Q3PtrList::first()
+
+    Returns a pointer to the first item in the list and makes this the
+    current list item; returns 0 if the list is empty.
+
+    \sa getFirst(), last(), next(), prev(), current()
+*/
+
+/*!
+    \fn type *Q3PtrList::last()
+
+    Returns a pointer to the last item in the list and makes this the
+    current list item; returns 0 if the list is empty.
+
+    \sa getLast(), first(), next(), prev(), current()
+*/
+
+/*!
+    \fn type *Q3PtrList::next()
+
+    Returns a pointer to the item succeeding the current item. Returns
+    0 if the current item is 0 or equal to the last item.
+
+    Makes the succeeding item current. If the current item before this
+    function call was the last item, the current item will be set to
+    0. If the current item was 0, this function does nothing.
+
+    \sa first(), last(), prev(), current()
+*/
+
+/*!
+    \fn type *Q3PtrList::prev()
+
+    Returns a pointer to the item preceding the current item. Returns
+    0 if the current item is 0 or equal to the first item.
+
+    Makes the preceding item current. If the current item before this
+    function call was the first item, the current item will be set to
+    0. If the current item was 0, this function does nothing.
+
+    \sa first(), last(), next(), current()
+*/
+
+/*!
+    \fn void Q3PtrList::toVector( Q3GVector *vec ) const
+
+    Stores all list items in the vector \a vec.
+
+    The vector must be of the same item type, otherwise the result
+    will be undefined.
+*/
+
+/*!
+    \typedef Q3PtrList::iterator
+
+    \internal
+*/
+
+/*!
+    \typedef Q3PtrList::Iterator
+
+    \internal
+*/
+
+/*!
+    \typedef Q3PtrList::ConstIterator
+
+    \internal
+*/
+
+/*!
+    \typedef Q3PtrList::const_iterator
+
+    \internal
+*/
+
+/*!
+    \fn Q3PtrList::constBegin() const
+
+    \internal
+*/
+
+/*!
+    \fn Q3PtrList::constEnd() const
+
+    \internal
+*/
+
+/*!
+    \fn Q3PtrList::erase(Iterator)
+
+    \internal
+*/
+
+
+/*****************************************************************************
+  Q3PtrListIterator documentation
+ *****************************************************************************/
+
+/*!
+    \class Q3PtrListIterator
+    \brief The Q3PtrListIterator class provides an iterator for
+    Q3PtrList collections.
+    \compat
+
+    Define a template instance Q3PtrListIterator\<X\> to create a list
+    iterator that operates on Q3PtrList\<X\> (list of X*).
+
+    The following example is similar to the
+    example in the Q3PtrList class documentation,
+    but it uses Q3PtrListIterator. The class Employee is
+    defined there.
+
+    \snippet doc/src/snippets/code/doc_src_q3ptrlist.qdoc 3
+
+    The output is
+    \snippet doc/src/snippets/code/doc_src_q3ptrlist.qdoc 4
+
+    Using a list iterator is a more robust way of traversing the list
+    than using the Q3PtrList member functions \link Q3PtrList::first()
+    first\endlink(), \link Q3PtrList::next() next\endlink(), \link
+    Q3PtrList::current() current\endlink(), etc., as many iterators can
+    traverse the same list independently.
+
+    An iterator has its own current list item and can get the next and
+    previous list items. It doesn't modify the list in any way.
+
+    When an item is removed from the list, all iterators that point to
+    that item are updated to point to Q3PtrList::current() instead to
+    avoid dangling references.
+
+    \sa Q3PtrList
+*/
+
+/*!
+    \fn Q3PtrListIterator::Q3PtrListIterator( const Q3PtrList<type> &list )
+
+    Constructs an iterator for \a list. The current iterator item is
+    set to point on the first item in the \a list.
+*/
+
+/*!
+    \fn Q3PtrListIterator::~Q3PtrListIterator()
+
+    Destroys the iterator.
+*/
+
+/*!
+    \fn uint Q3PtrListIterator::count() const
+
+    Returns the number of items in the list this iterator operates on.
+
+    \sa isEmpty()
+*/
+
+/*!
+    \fn bool Q3PtrListIterator::isEmpty() const
+
+    Returns TRUE if the list is empty; otherwise returns FALSE.
+
+    \sa count()
+*/
+
+/*!
+    \fn bool Q3PtrListIterator::atFirst() const
+
+    Returns TRUE if the current iterator item is the first list item;
+    otherwise returns FALSE.
+
+    \sa toFirst(), atLast()
+*/
+
+/*!
+    \fn bool Q3PtrListIterator::atLast() const
+
+    Returns TRUE if the current iterator item is the last list item;
+    otherwise returns FALSE.
+
+    \sa toLast(), atFirst()
+*/
+
+/*!
+    \fn type *Q3PtrListIterator::toFirst()
+
+    Sets the current iterator item to point to the first list item and
+    returns a pointer to the item. Sets the current item to 0 and
+    returns 0 if the list is empty.
+
+    \sa toLast(), atFirst()
+*/
+
+/*!
+    \fn type *Q3PtrListIterator::toLast()
+
+    Sets the current iterator item to point to the last list item and
+    returns a pointer to the item. Sets the current item to 0 and
+    returns 0 if the list is empty.
+
+    \sa toFirst(), atLast()
+*/
+
+/*!
+    \fn Q3PtrListIterator::operator type *() const
+
+    Cast operator. Returns a pointer to the current iterator item.
+    Same as current().
+*/
+
+/*!
+    \fn type *Q3PtrListIterator::operator*()
+
+    Asterisk operator. Returns a pointer to the current iterator item.
+    Same as current().
+*/
+
+/*!
+    \fn type *Q3PtrListIterator::current() const
+
+    Returns a pointer to the current iterator item. If the iterator is
+    positioned before the first item in the list or after the last
+    item in the list, 0 is returned.
+*/
+
+/*!
+    \fn type *Q3PtrListIterator::operator()()
+
+    Makes the succeeding item current and returns the original current
+    item.
+
+    If the current iterator item was the last item in the list or if
+    it was 0, 0 is returned.
+*/
+
+/*!
+    \fn type *Q3PtrListIterator::operator++()
+
+    Prefix ++ makes the succeeding item current and returns the new
+    current item.
+
+    If the current iterator item was the last item in the list or if
+    it was 0, 0 is returned.
+*/
+
+/*!
+    \fn type *Q3PtrListIterator::operator+=( uint jump )
+
+    Sets the current item to the item \a jump positions after the
+    current item and returns a pointer to that item.
+
+    If that item is beyond the last item or if the list is empty, it
+    sets the current item to 0 and returns 0
+*/
+
+/*!
+    \fn type *Q3PtrListIterator::operator--()
+
+    Prefix - makes the preceding item current and returns the new
+    current item.
+
+    If the current iterator item was the first item in the list or if
+    it was 0, 0 is returned.
+*/
+
+/*!
+    \fn type *Q3PtrListIterator::operator-=( uint jump )
+
+    Returns the item \a jump positions before the current item or 0
+    if it is beyond the first item. Makes this the current item.
+*/
+
+/*!
+    \fn Q3PtrListIterator<type>& Q3PtrListIterator::operator=( const Q3PtrListIterator<type> &it )
+
+    Assignment. Makes a copy of the iterator \a it and returns a
+    reference to this iterator.
+*/
+
+/*!
+    \class Q3StrList
+    \brief The Q3StrList class provides a doubly-linked list of char*.
+    \compat
+
+    If you want a string list of \l{QString}s use QStringList.
+
+    This class is a Q3PtrList\<char\> instance (a list of char*).
+
+    Q3StrList can make deep or shallow copies of the strings that are
+    inserted.
+
+    A deep copy means that memory is allocated for the string and then
+    the string data is copied into that memory. A shallow copy is just
+    a copy of the pointer value and not of the string data itself.
+
+    The disadvantage of shallow copies is that because a pointer can
+    be deleted only once, the program must put all strings in a
+    central place and know when it is safe to delete them (i.e. when
+    the strings are no longer referenced by other parts of the
+    program). This can make the program more complex. The advantage of
+    shallow copies is that they consume far less memory than deep
+    copies. It is also much faster to copy a pointer (typically 4 or 8
+    bytes) than to copy string data.
+
+    A Q3StrList that operates on deep copies will, by default, turn on
+    auto-deletion (see setAutoDelete()). Thus, by default Q3StrList
+    will deallocate any string copies it allocates.
+
+    The virtual compareItems() function is reimplemented and does a
+    case-sensitive string comparison. The inSort() function will
+    insert strings in sorted order. In general it is fastest to insert
+    the strings as they come and sort() at the end; inSort() is useful
+    when you just have to add a few extra strings to an already sorted
+    list.
+
+    The Q3StrListIterator class is an iterator for Q3StrList.
+*/
+
+/*!
+    \fn Q3StrList::operator QList<QByteArray>() const
+
+    Automatically converts a Q3StrList into a QList<QByteArray>.
+*/
+
+/*!
+    \fn Q3StrList::Q3StrList( bool deepCopies )
+
+    Constructs an empty list of strings. Will make deep copies of all
+    inserted strings if \a deepCopies is TRUE, or use shallow copies
+    if \a deepCopies is FALSE.
+*/
+
+/*!
+    \fn Q3StrList::Q3StrList(const Q3StrList &list)
+    \fn Q3StrList::Q3StrList(const QList<QByteArray> &list)
+
+    Constructs a copy of \a list.
+*/
+
+/*!
+    \fn Q3StrList::~Q3StrList()
+
+    Destroys the list. All strings are removed.
+*/
+
+/*!
+    \fn Q3StrList& Q3StrList::operator=(const Q3StrList& list)
+    \fn Q3StrList &Q3StrList::operator=(const QList<QByteArray> &list)
+
+    Assigns \a list to this list and returns a reference to this list.
+*/
+
+/*!
+    \class Q3StrIList
+    \brief The Q3StrIList class provides a doubly-linked list of char*
+    with case-insensitive comparison.
+    \compat
+
+    This class is a Q3PtrList\<char\> instance (a list of char*).
+
+    Q3StrIList is identical to Q3StrList except that the virtual
+    compareItems() function is reimplemented to compare strings
+    case-insensitively. The inSort() function inserts strings in a
+    sorted order. In general it is fastest to insert the strings as
+    they come and sort() at the end; inSort() is useful when you just
+    have to add a few extra strings to an already sorted list.
+
+    The Q3StrListIterator class works for Q3StrIList.
+
+    \sa QStringList
+*/
+
+/*!
+    \fn Q3StrIList::Q3StrIList( bool deepCopies )
+
+    Constructs a list of strings. Will make deep copies of all
+    inserted strings if \a deepCopies is TRUE, or use shallow copies
+    if \a deepCopies is FALSE.
+*/
+
+/*!
+    \fn Q3StrIList::~Q3StrIList()
+
+    Destroys the list. All strings are removed.
+*/
+
+/*!
+    \fn int Q3PtrList::compareItems( Q3PtrCollection::Item item1,
+				    Q3PtrCollection::Item item2 )
+
+    This virtual function compares two list items.
+
+    Returns:
+    \list
+    \i zero if \a item1 == \a item2
+    \i nonzero if \a item1 != \a item2
+    \endlist
+
+    This function returns \e int rather than \e bool so that
+    reimplementations can return three values and use it to sort by:
+
+    \list
+    \i 0 if \a item1 == \a item2
+    \i \> 0 (positive integer) if \a item1 \> \a item2
+    \i \< 0 (negative integer) if \a item1 \< \a item2
+    \endlist
+
+    inSort() requires that compareItems() is implemented as described
+    here.
+
+    This function should not modify the list because some const
+    functions call compareItems().
+
+    The default implementation compares the pointers.
+*/
+
+/*!
+    \fn QDataStream& Q3PtrList::read( QDataStream& s,
+				    Q3PtrCollection::Item& item )
+
+    Reads a list item from the stream \a s and returns a reference to
+    the stream.
+
+    The default implementation sets \a item to 0.
+
+    \sa write()
+*/
+
+/*!
+    \fn QDataStream& Q3PtrList::write( QDataStream& s,
+					Q3PtrCollection::Item item ) const
+
+    Writes a list item, \a item to the stream \a s and returns a
+    reference to the stream.
+
+    The default implementation does nothing.
+
+    \sa read()
+*/
+
+/*! \fn iterator Q3PtrList::begin() 
+\internal
+*/
+/*! \fn const_iterator Q3PtrList::begin() const
+\internal
+*/
+/*! \fn iterator Q3PtrList::end() 
+\internal
+*/
+/*! \fn const_iterator Q3PtrList::end() const
+\internal
+*/
+
+/*!
+    \class Q3StrListIterator
+    \brief The Q3StrListIterator class is an iterator for the Q3StrList
+    and Q3StrIList classes.
+    \compat
+
+    This class is a Q3PtrListIterator\<char\> instance. It can traverse
+    the strings in the Q3StrList and Q3StrIList classes.
+*/
+
+
+/*
+    \class Q3PtrListAutoDelete
+    \brief The Q3PtrListAutoDelete class is a template class that provides a list that auto-deletes its data.
+    \compat
+
+    A Q3PtrListAutoDelete is identical to a Q3PtrList with
+    setAutoDelete(TRUE).
+*/
diff --git a/doc/src/q3ptrqueue.qdoc b/doc/src/q3ptrqueue.qdoc
new file mode 100644
index 0000000000..8a3ef2260b
--- /dev/null
+++ b/doc/src/q3ptrqueue.qdoc
@@ -0,0 +1,230 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class Q3PtrQueue
+    \brief The Q3PtrQueue class is a template class that provides a queue.
+    \compat
+
+    Q3ValueVector can be used as an STL-compatible alternative to this
+    class.
+
+    A template instance Q3PtrQueue\<X\> is a queue that operates on
+    pointers to X (X*).
+
+    A queue is a first in, first out structure. Items are added to the
+    tail of the queue with enqueue() and retrieved from the head with
+    dequeue(). You can peek at the head item without dequeing it using
+    head().
+
+    You can control the queue's deletion policy with setAutoDelete().
+
+    For compatibility with the Q3PtrCollection classes, current() and
+    remove() are provided; both operate on the head().
+
+    \sa Q3PtrList Q3PtrStack
+*/
+
+/*!
+    \fn Q3PtrQueue::Q3PtrQueue ()
+
+    Creates an empty queue with autoDelete() set to FALSE.
+*/
+
+/*!
+    \fn Q3PtrQueue::Q3PtrQueue( const Q3PtrQueue<type>& queue )
+
+    Creates a queue from \a queue.
+
+    Only the pointers are copied; the items are not. The autoDelete()
+    flag is set to FALSE.
+*/
+
+/*!
+    \fn Q3PtrQueue::~Q3PtrQueue()
+
+    Destroys the queue. Items in the queue are deleted if autoDelete()
+    is TRUE.
+*/
+
+/*!
+    \fn Q3PtrQueue<type>& Q3PtrQueue::operator= (const Q3PtrQueue<type>& queue)
+
+    Assigns \a queue to this queue and returns a reference to this
+    queue.
+
+    This queue is first cleared and then each item in \a queue is
+    enqueued to this queue. Only the pointers are copied.
+
+    \warning The autoDelete() flag is not modified. If it is TRUE for
+    both \a queue and this queue, deleting the two lists will cause \e
+    double-deletion of the items.
+*/
+
+/*!
+    \fn bool Q3PtrQueue::isEmpty() const
+
+    Returns TRUE if the queue is empty; otherwise returns FALSE.
+
+    \sa count() dequeue() head()
+*/
+
+/*!
+    \fn void Q3PtrQueue::enqueue (const type* d)
+
+    Adds item \a d to the tail of the queue.
+
+    \sa count() dequeue()
+*/
+
+/*!
+    \fn type* Q3PtrQueue::dequeue ()
+
+    Takes the head item from the queue and returns a pointer to it.
+    Returns 0 if the queue is empty.
+
+    \sa enqueue() count()
+*/
+
+/*!
+    \fn bool Q3PtrQueue::remove()
+
+    Removes the head item from the queue, and returns TRUE if there
+    was an item, i.e. the queue wasn't empty; otherwise returns FALSE.
+
+    The item is deleted if autoDelete() is TRUE.
+
+    \sa head() isEmpty() dequeue()
+*/
+
+/*!
+    \fn void Q3PtrQueue::clear()
+
+    Removes all items from the queue, and deletes them if autoDelete()
+    is TRUE.
+
+    \sa remove()
+*/
+
+/*!
+    \fn uint Q3PtrQueue::count() const
+
+    Returns the number of items in the queue.
+
+    \sa isEmpty()
+*/
+
+/*!
+    \fn type* Q3PtrQueue::head() const
+
+    Returns a pointer to the head item in the queue. The queue is not
+    changed. Returns 0 if the queue is empty.
+
+    \sa dequeue() isEmpty()
+*/
+
+/*!
+    \fn Q3PtrQueue::operator type*() const
+
+    Returns a pointer to the head item in the queue. The queue is not
+    changed. Returns 0 if the queue is empty.
+
+    \sa dequeue() isEmpty()
+*/
+
+/*!
+    \fn type* Q3PtrQueue::current() const
+
+    Returns a pointer to the head item in the queue. The queue is not
+    changed. Returns 0 if the queue is empty.
+
+    \sa dequeue() isEmpty()
+*/
+
+/*!
+    \fn bool Q3PtrQueue::autoDelete() const
+    
+    Returns the setting of the auto-delete option. The default is
+    FALSE.
+
+    \sa setAutoDelete()
+*/
+
+/*!
+    \fn void Q3PtrQueue::setAutoDelete( bool enable )
+
+    Sets the queue to auto-delete its contents if \a enable is TRUE
+    and not to delete them if \a enable is FALSE.
+
+    If auto-deleting is turned on, all the items in a queue are
+    deleted when the queue itself is deleted. This can be quite
+    convenient if the queue has the only pointer to the items.
+    
+    The default setting is FALSE, for safety. If you turn it on, be
+    careful about copying the queue: you might find yourself with two
+    queues deleting the same items.
+
+    \sa autoDelete()
+*/
+
+/*!
+    \fn QDataStream& Q3PtrQueue::read( QDataStream& s,
+					Q3PtrCollection::Item& item )
+
+    Reads a queue item, \a item, from the stream \a s and returns a
+    reference to the stream.
+
+    The default implementation sets \a item to 0.
+
+    \sa write()
+*/
+
+/*!
+    \fn QDataStream& Q3PtrQueue::write( QDataStream& s,
+					Q3PtrCollection::Item item ) const
+
+    Writes a queue item, \a item, to the stream \a s and returns a
+    reference to the stream.
+
+    The default implementation does nothing.
+
+    \sa read()
+*/
diff --git a/doc/src/q3ptrstack.qdoc b/doc/src/q3ptrstack.qdoc
new file mode 100644
index 0000000000..fcece9f8c6
--- /dev/null
+++ b/doc/src/q3ptrstack.qdoc
@@ -0,0 +1,217 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \class Q3PtrStack
+  \brief The Q3PtrStack class is a template class that provides a stack.
+  \compat
+
+  Q3ValueStack is an STL-compatible alternative to this class.
+
+  Define a template instance Q3PtrStack\<X\> to create a stack that
+  operates on pointers to X, (X*). 
+
+  A stack is a last in, first out (LIFO) structure. Items are added
+  to the top of the stack with push() and retrieved from the top
+  with pop(). Use top() to get a reference to the top element
+  without changing the stack.
+
+  You can control the stack's deletion policy with setAutoDelete().
+
+  For compatibility with the Q3PtrCollection classes current() and
+  remove() are provided; they both operate on the top().
+
+  \sa Q3PtrList Q3PtrQueue
+*/
+
+/*!
+  \fn Q3PtrStack::Q3PtrStack () 
+
+  Creates an empty stack.
+*/
+
+/*!
+  \fn Q3PtrStack::Q3PtrStack (const Q3PtrStack<type>& s) 
+
+  Creates a stack by making a shallow copy of another stack \a s.
+*/
+
+/*!
+  \fn Q3PtrStack::~Q3PtrStack () 
+
+  Destroys the stack. All items will be deleted if autoDelete() is
+  true.
+*/
+
+/*!
+  \fn Q3PtrStack<type>& Q3PtrStack::operator= (const Q3PtrStack<type>& s) 
+
+  Sets the contents of this stack by making a shallow copy of
+  another stack \a s. Elements currently in this stack will be
+  deleted if autoDelete() is true.
+*/
+
+/*!
+  \fn bool Q3PtrStack::isEmpty () const 
+
+  Returns true if the stack contains no elements; otherwise returns
+  false.
+*/
+
+/*!
+  \fn void Q3PtrStack::push (const type* d) 
+
+  Adds an element \a d to the top of the stack. Last in, first out.
+*/
+
+/*!
+  \fn type* Q3PtrStack::pop () 
+
+  Removes the top item from the stack and returns it. The stack must
+  not be empty.
+*/
+
+/*!
+  \fn bool Q3PtrStack::remove () 
+
+  Removes the top item from the stack and deletes it if autoDelete()
+  is true. Returns true if there was an item to pop; otherwise
+  returns false.
+
+  \sa clear()
+*/
+
+/*!
+  \fn void Q3PtrStack::clear()
+
+  Removes all items from the stack, deleting them if autoDelete() is
+  true.
+
+  \sa remove()
+*/
+
+/*!
+  \fn uint Q3PtrStack::count() const
+
+  Returns the number of items in the stack.
+
+  \sa isEmpty()
+*/
+
+/*!
+  \fn type* Q3PtrStack::top () const 
+
+  Returns a pointer to the top item on the stack (most recently
+  pushed). The stack is not changed. Returns 0 if the stack is
+  empty.
+*/
+
+/*!
+  \fn Q3PtrStack::operator type* ()const 
+
+  Returns a pointer to the top item on the stack (most recently
+  pushed). The stack is not changed. Returns 0 if the stack is
+  empty.
+*/
+
+/*!
+  \fn type* Q3PtrStack::current () const 
+
+  Returns a pointer to the top item on the stack (most recently
+  pushed). The stack is not changed. Returns 0 if the stack is
+  empty.
+*/
+
+/*!
+  \fn bool Q3PtrStack::autoDelete() const
+
+  The same as Q3PtrCollection::autoDelete(). Returns true if 
+  the auto-delete option is set. If the option is set, the 
+  stack auto-deletes its contents. 
+
+  \sa setAutoDelete()
+*/
+
+/*!
+  \fn void Q3PtrStack::setAutoDelete(bool enable) 
+
+  Defines whether this stack auto-deletes its contents. The same as
+  Q3PtrCollection::setAutoDelete(). If \a enable is true, auto-delete
+  is turned on.
+
+  If auto-deleting is turned on, all the items in the stack are
+  deleted when the stack itself is deleted. This is convenient if
+  the stack has the only pointers to the items.
+
+  The default setting is false, for safety. If you turn it on, be
+  careful about copying the stack, or you might find yourself with
+  two stacks deleting the same items.
+
+  Note that the auto-delete setting may also affect other functions in
+  subclasses. For example, a subclass that has a remove() function
+  will remove the item from its data structure, and if auto-delete is
+  enabled, will also delete the item.
+  
+  \sa autoDelete()
+*/
+
+/*!
+  \fn QDataStream& Q3PtrStack::read(QDataStream& s, Q3PtrCollection::Item& item)
+
+  Reads a stack item, \a item, from the stream \a s and returns a
+  reference to the stream.
+
+  The default implementation sets \a item to 0.
+
+  \sa write()
+*/
+
+/*!
+  \fn QDataStream& Q3PtrStack::write(QDataStream& s,
+				     Q3PtrCollection::Item item) const
+
+  Writes a stack item, \a item, to the stream \a s and returns a
+  reference to the stream.
+
+  The default implementation does nothing.
+
+  \sa read()
+*/
diff --git a/doc/src/q3ptrvector.qdoc b/doc/src/q3ptrvector.qdoc
new file mode 100644
index 0000000000..b53921972d
--- /dev/null
+++ b/doc/src/q3ptrvector.qdoc
@@ -0,0 +1,427 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \class Q3PtrVector
+  \brief The Q3PtrVector class is a template collection class that
+  provides a vector (array).
+  \compat
+
+  Q3ValueVector is an STL-compatible alternative to this class.
+
+  Q3PtrVector is implemented as a template class. Defines a template
+  instance Q3PtrVector\<X\> to create a vector that contains pointers
+  to X (X*).
+
+  A vector is the same as an array. The main difference between
+  Q3PtrVector and Q3MemArray is that Q3PtrVector stores pointers to the
+  elements, whereas Q3MemArray stores the elements themselves (i.e.
+  Q3MemArray is value-based and Q3PtrVector is pointer-based).
+
+  Items are added to the vector using insert() or fill(). Items are
+  removed with remove(). You can get a pointer to an item at a
+  particular index position using at().
+
+  Unless otherwise stated, all functions that remove items from the
+  vector will also delete the element pointed to if \link
+  setAutoDelete() auto-deletion\endlink is enabled. By default,
+  auto-deletion is disabled; see setAutoDelete(). This behavior can
+  be changed in a subclass by reimplementing the virtual function
+  deleteItem().
+
+  Functions that compare items (find() and sort() for example) will
+  do so using the virtual function compareItems(). The default
+  implementation of this function only compares the pointer values.
+  Reimplement compareItems() in a subclass to get searching and
+  sorting based on the item contents. You can perform a linear
+  search for a pointer in the vector using findRef(), or a binary
+  search (of a sorted vector) using bsearch(). You can count the
+  number of times an item appears in the vector with contains() or
+  containsRef().
+
+  \sa Q3MemArray
+*/
+
+/*!
+  \fn Q3PtrVector::Q3PtrVector()
+
+  Constructs a null vector.
+
+  \sa isNull()
+*/
+
+/*!
+  \fn Q3PtrVector::Q3PtrVector(uint size)
+
+  Constructs an vector with room for \a size items. Makes a null
+  vector if \a size == 0.
+
+  All \a size positions in the vector are initialized to 0.
+
+  \sa size(), resize(), isNull()
+*/
+
+/*!
+  \fn Q3PtrVector::Q3PtrVector(const Q3PtrVector<type> &v)
+
+  Constructs a copy of \a v. Only the pointers are copied (i.e.
+  shallow copy).
+*/
+
+/*!
+  \fn Q3PtrVector::~Q3PtrVector()
+
+  Removes all items from the vector, and destroys the vector itself.
+
+  \sa clear()
+*/
+
+/*!
+  \fn Q3PtrVector<type> &Q3PtrVector::operator=(const Q3PtrVector<type> &v)
+
+  Assigns \a v to this vector and returns a reference to this
+  vector.
+
+  This vector is first cleared and then all the items from \a v are
+  copied into the vector. Only the pointers are copied (i.e. shallow
+  copy).
+
+  \sa clear()
+*/
+
+/*!
+  \fn type **Q3PtrVector::data() const
+
+  Returns a pointer to the actual vector data, which is an array of
+  type*.
+
+  The vector is a null vector if data() == 0 (null pointer).
+
+  \sa isNull()
+*/
+
+/*!
+  \fn uint Q3PtrVector::size() const
+
+  Returns the size of the vector, i.e. the number of vector
+  positions. This is also the maximum number of items the vector can
+  hold.
+
+  The vector is a null vector if size() == 0.
+
+  \sa isNull(), resize(), count()
+*/
+
+/*!
+  \fn uint Q3PtrVector::count() const 
+
+  Returns the number of items in the vector. The vector is empty if
+  count() == 0.
+
+  \sa isEmpty(), size(), isNull()
+*/
+
+/*!
+  \fn bool Q3PtrVector::isEmpty() const
+
+  Returns true if the vector is empty; otherwise returns false.
+
+  \sa count()
+*/
+
+/*!
+  \fn bool Q3PtrVector::isNull() const
+
+  Returns true if the vector is null; otherwise returns false.
+
+  A null vector has size() == 0 and data() == 0.
+
+  \sa size()
+*/
+
+/*!
+  \fn bool Q3PtrVector::resize(uint size)
+
+  Resizes (expands or shrinks) the vector to \a size elements. The
+  vector becomes a null vector if \a size == 0.
+
+  Any items at position \a size or beyond in the vector are removed.
+  New positions are initialized to 0.
+
+  Returns true if successful, i.e. if the memory was successfully
+  allocated; otherwise returns false.
+
+  \sa size(), isNull()
+*/
+
+/*!
+  \fn bool Q3PtrVector::insert(uint i, const type *d)
+
+  Sets position \a i in the vector to contain the item \a d. \a i
+  must be less than size(). Any previous element in position \a i is
+  removed.
+
+  Returns true if \a i is within range; otherwise returns false.
+
+  \sa at()
+*/
+
+/*!
+  \fn bool Q3PtrVector::remove(uint i)
+
+  Removes the item at position \a i in the vector, if there is one.
+  \a i must be less than size().
+
+  Returns true if \a i is within range; otherwise returns false.
+
+  \sa take(), at()
+*/
+
+/*!
+  \fn type* Q3PtrVector::take(uint i)
+
+  Returns the item at position \a i in the vector, and removes that
+  item from the vector. \a i must be less than size(). If there is
+  no item at position \a i, 0 is returned.
+
+  Unlike remove(), this function does \e not call deleteItem() for
+  the removed item.
+
+  \sa remove(), at()
+*/
+
+/*!
+  \fn void Q3PtrVector::clear()
+
+  Removes all items from the vector, and destroys the vector itself.
+
+  The vector becomes a null vector.
+
+  \sa isNull()
+*/
+
+/*!
+  \fn bool Q3PtrVector::fill(const type *d, int size)
+
+  Inserts item \a d in all positions in the vector. Any existing
+  items are removed. If \a d is 0, the vector becomes empty.
+
+  If \a size >= 0, the vector is first resized to \a size. By
+  default, \a size is -1.
+
+  Returns true if successful, i.e. \a size is the same as the
+  current size, or \a size is larger and the memory has successfully
+  been allocated; otherwise returns false.
+
+  \sa resize(), insert(), isEmpty()
+*/
+
+/*!
+  \fn void Q3PtrVector::sort()
+
+  Sorts the items in ascending order. Any empty positions will be
+  put last.
+
+  Compares items using the virtual function compareItems().
+
+  \sa bsearch()
+*/
+
+/*!
+  \fn int Q3PtrVector::bsearch(const type* d) const
+
+  In a sorted array, finds the first occurrence of \a d using a
+  binary search. For a sorted array, this is generally much faster
+  than find(), which performs a linear search.
+
+  Returns the position of \a d, or -1 if \a d could not be found. \a
+  d must not be 0.
+
+  Compares items using the virtual function compareItems().
+
+  \sa sort(), find()
+*/
+
+
+/*!
+  \fn int Q3PtrVector::findRef(const type *d, uint i) const
+
+  Finds the first occurrence of the item pointer \a d in the vector
+  using a linear search. The search starts at position \a i, which
+  must be less than size(). \a i is by default 0; i.e. the search
+  starts at the start of the vector.
+
+  Returns the position of \a d, or -1 if \a d could not be found.
+
+  This function does \e not use compareItems() to compare items.
+
+  Use the much faster bsearch() to search a sorted vector.
+
+  \sa find(), bsearch()
+*/
+
+/*!
+  \fn int Q3PtrVector::find(const type *d, uint i) const
+
+  Finds the first occurrence of item \a d in the vector using a
+  linear search. The search starts at position \a i, which must be
+  less than size(). \a i is by default 0; i.e. the search starts at
+  the start of the vector.
+
+  Returns the position of \a d, or -1 if \a d could not be found.
+
+  Compares items using the virtual function compareItems().
+
+  Use the much faster bsearch() to search a sorted vector.
+
+  \sa findRef(), bsearch()
+*/
+
+
+/*!
+  \fn uint Q3PtrVector::containsRef(const type *d) const
+
+  Returns the number of occurrences of the item pointer \a d in the
+  vector.
+
+  This function does \e not use compareItems() to compare items.
+
+  \sa findRef()
+*/
+
+/*!
+  \fn uint Q3PtrVector::contains(const type *d) const
+
+  Returns the number of occurrences of item \a d in the vector.
+
+  Compares items using the virtual function compareItems().
+
+  \sa containsRef()
+*/
+
+/*!
+  \fn type *Q3PtrVector::operator[](int i) const
+
+  Returns the item at position \a i, or 0 if there is no item at
+  that position. \a i must be less than size().
+
+  Equivalent to at(\a i).
+
+  \sa at()
+*/
+
+/*!
+  \fn type *Q3PtrVector::at(uint i) const
+
+  Returns the item at position \a i, or 0 if there is no item at
+  that position. \a i must be less than size().
+*/
+
+
+/*!
+  \fn void Q3PtrVector::toList(Q3GList *list) const
+
+  \internal
+
+  Copies all items in this vector to the list \a list. \a list is
+  first cleared and then all items are appended to \a list.
+
+  \sa Q3PtrList, Q3PtrStack, Q3PtrQueue
+*/
+
+/*!
+  \fn int Q3PtrVector::compareItems(Q3PtrCollection::Item d1,
+				    Q3PtrCollection::Item d2)
+
+  This virtual function compares two list items.
+
+  Returns:
+  \list
+  \i zero if \a d1 == \a d2
+  \i nonzero if \a d1 != \a d2
+  \endlist
+
+  This function returns \e int rather than \e bool so that
+  reimplementations can return one of three values and use it to
+  sort by:
+  \list
+  \i 0 if \a d1 == \a d2
+  \i \> 0 (positive integer) if \a d1 \> \a d2
+  \i \< 0 (negative integer) if \a d1 \< \a d2
+  \endlist
+
+  The sort() and bsearch() functions require compareItems() to be
+  implemented as described here.
+
+  This function should not modify the vector because some const
+  functions call compareItems().
+*/
+
+/*!
+  \fn QDataStream& Q3PtrVector::read(QDataStream &s,
+				     Q3PtrCollection::Item &item)
+
+  Reads a vector item, \a item, from the stream \a s and returns a
+  reference to the stream.
+
+  The default implementation sets \a item to 0.
+
+  \sa write()
+*/
+
+/*!
+  \fn QDataStream& Q3PtrVector::write(QDataStream &s,
+			 	      Q3PtrCollection::Item item) const
+
+  Writes a vector item, \a item, to the stream \a s and returns a
+  reference to the stream.
+
+  The default implementation does nothing.
+
+  \sa read()
+*/
+  
+/*!
+  \fn bool Q3PtrVector::operator==(const Q3PtrVector<type> &v) const
+
+  Returns true if this vector and \a v are equal; otherwise returns
+  false.
+*/
diff --git a/doc/src/q3sqlfieldinfo.qdoc b/doc/src/q3sqlfieldinfo.qdoc
new file mode 100644
index 0000000000..1b152c0d8d
--- /dev/null
+++ b/doc/src/q3sqlfieldinfo.qdoc
@@ -0,0 +1,234 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class Q3SqlFieldInfo
+    \brief The Q3SqlFieldInfo class stores meta data associated with a SQL field.
+
+    \compat
+
+    Q3SqlFieldInfo objects only store meta data; field values are
+    stored in QSqlField objects.
+
+    All values must be set in the constructor, and may be retrieved
+    using isRequired(), type(), length(), precision(), defaultValue(),
+    name(), isGenerated() and typeID().
+
+    \sa Q3SqlRecordInfo
+*/
+
+/*!
+    \fn Q3SqlFieldInfo::Q3SqlFieldInfo(const QString& name,
+                                       QVariant::Type typ,
+                                       int required,
+                                       int len,
+                                       int prec,
+                                       const QVariant& defValue,
+                                       int typeID,
+                                       bool generated,
+                                       bool trim,
+                                       bool calculated)
+
+    Constructs a Q3SqlFieldInfo with the following parameters:
+    \table
+    \row \i \a name  \i the name of the field.
+    \row \i \a typ   \i the field's type in a QVariant.
+    \row \i \a required  \i greater than 0 if the field is required, 0
+    if its value can be NULL and less than 0 if it cannot be
+    determined whether the field is required or not.
+    \row \i \a len  \i the length of the field. Note that for
+    non-character types some databases return either the length in
+    bytes or the number of digits. -1 signifies that the length cannot
+    be determined.
+    \row \i \a prec  \i the precision of the field, or -1 if the field
+    has no precision or it cannot be determined.
+    \row \i \a defValue  \i the default value that is inserted into
+    the table if none is specified by the user. QVariant() if there is
+    no default value or it cannot be determined.
+    \row \i \a typeID  \i the internal typeID of the database system
+    (only useful for low-level programming). 0 if unknown.
+    \row \i \a generated  \i TRUE indicates that this field should be
+    included in auto-generated SQL statments, e.g. in Q3SqlCursor.
+    \row \i \a trim  \i TRUE indicates that widgets should remove
+    trailing whitespace from character fields. This does not affect
+    the field value but only its representation inside widgets.
+    \row \i \a calculated  \i TRUE indicates that the value of this
+    field is calculated. The value of calculated fields can by
+    modified by subclassing Q3SqlCursor and overriding
+    Q3SqlCursor::calculateField().
+    \endtable
+*/
+
+/*!
+    \fn Q3SqlFieldInfo::~Q3SqlFieldInfo()
+
+    Destroys the object and frees any allocated resources.
+*/
+
+/*!
+    \fn Q3SqlFieldInfo::Q3SqlFieldInfo(const QSqlField & other)
+
+    Creates a Q3SqlFieldInfo object with the type and the name of the
+    QSqlField \a other.
+*/
+
+/*!
+    \fn bool Q3SqlFieldInfo::operator==(const Q3SqlFieldInfo& other) const
+
+    Assigns \a other to this field info and returns a reference to it.
+*/
+
+/*!
+    \fn QSqlField Q3SqlFieldInfo::toField() const
+
+    Returns an empty QSqlField based on the information in this
+    Q3SqlFieldInfo.
+*/
+
+/*!
+    \fn int Q3SqlFieldInfo::isRequired() const
+
+    Returns a value greater than 0 if the field is required (NULL
+    values are not allowed), 0 if it isn't required (NULL values are
+    allowed) or less than 0 if it cannot be determined whether the
+    field is required or not.
+*/
+
+/*!
+    \fn QVariant::Type Q3SqlFieldInfo::type() const
+
+    Returns the field's type or QVariant::Invalid if the type is
+    unknown.
+*/
+
+/*!
+    \fn int Q3SqlFieldInfo::length() const
+
+    Returns the field's length. For fields storing text the return
+    value is the maximum number of characters the field can hold. For
+    non-character fields some database systems return the number of
+    bytes needed or the number of digits allowed. If the length cannot
+    be determined -1 is returned.
+*/
+
+/*!
+    \fn int Q3SqlFieldInfo::precision() const
+
+    Returns the field's precision or -1 if the field has no precision
+    or it cannot be determined.
+*/
+
+/*!
+    \fn QVariant Q3SqlFieldInfo::defaultValue() const
+
+    Returns the field's default value or an empty QVariant if the
+    field has no default value or the value couldn't be determined.
+    The default value is the value inserted in the database when it
+    is not explicitly specified by the user.
+*/
+
+/*!
+    \fn QString Q3SqlFieldInfo::name() const
+
+    Returns the name of the field in the SQL table.
+*/
+
+/*!
+    \fn int Q3SqlFieldInfo::typeID() const
+
+    Returns the internal type identifier as returned from the database
+    system. The return value is 0 if the type is unknown.
+*/
+
+/*!
+    \fn bool Q3SqlFieldInfo::isGenerated() const
+
+    Returns TRUE if the field should be included in auto-generated
+    SQL statments, e.g. in Q3SqlCursor; otherwise returns FALSE.
+
+    \sa setGenerated()
+*/
+
+/*!
+    \fn bool Q3SqlFieldInfo::isTrim() const
+
+    Returns TRUE if trailing whitespace should be removed from
+    character fields; otherwise returns FALSE.
+
+    \sa setTrim()
+*/
+
+/*!
+    \fn bool Q3SqlFieldInfo::isCalculated() const
+
+    Returns TRUE if the field is calculated; otherwise returns FALSE.
+
+    \sa setCalculated()
+*/
+
+/*!
+    \fn void Q3SqlFieldInfo::setTrim(bool trim)
+
+    If \a trim is TRUE widgets should remove trailing whitespace from
+    character fields. This does not affect the field value but only
+    its representation inside widgets.
+
+    \sa isTrim()
+*/
+
+/*!
+    \fn void Q3SqlFieldInfo::setGenerated(bool generated)
+
+    \a generated set to FALSE indicates that this field should not appear
+    in auto-generated SQL statements (for example in Q3SqlCursor).
+
+    \sa isGenerated()
+*/
+
+/*!
+    \fn void Q3SqlFieldInfo::setCalculated(bool calculated)
+
+    \a calculated set to TRUE indicates that this field is a calculated
+    field. The value of calculated fields can by modified by subclassing
+    Q3SqlCursor and overriding Q3SqlCursor::calculateField().
+
+    \sa isCalculated()
+*/
diff --git a/doc/src/q3sqlrecordinfo.qdoc b/doc/src/q3sqlrecordinfo.qdoc
new file mode 100644
index 0000000000..f8f6cd5fbe
--- /dev/null
+++ b/doc/src/q3sqlrecordinfo.qdoc
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class Q3SqlRecordInfo
+    \brief The Q3SqlRecordInfo class encapsulates a set of database field meta data.
+
+    \compat
+
+    This class is a list that holds a set of database field meta
+    data. Use contains() to see if a given field name exists in the
+    record, and use find() to get a QSqlFieldInfo record for a named
+    field.
+
+    \sa Q3SqlFieldInfo
+*/
+
+/*!
+    \fn Q3SqlRecordInfo::Q3SqlRecordInfo()
+
+    Constructs an empty record info object.
+*/
+
+/*!
+    \fn Q3SqlRecordInfo::Q3SqlRecordInfo(const Q3SqlFieldInfoList& other)
+    \fn Q3SqlRecordInfo::Q3SqlRecordInfo(const QSqlRecord& other)
+
+    Constructs a copy of \a other.
+*/
+
+/*!
+    \fn size_type Q3SqlRecordInfo::contains(const QString& fieldName) const
+
+    Returns the number of times a field called \a fieldName occurs in
+    the record. Returns 0 if no field by that name could be found.
+*/
+
+/*!
+    \fn Q3SqlFieldInfo Q3SqlRecordInfo::find(const QString& fieldName) const
+
+    Returns a QSqlFieldInfo object for the first field in the record
+    which has the field name \a fieldName. If no matching field is
+    found then an empty QSqlFieldInfo object is returned.
+*/
+
+/*!
+    \fn QSqlRecord Q3SqlRecordInfo::toRecord() const
+
+    Returns an empty QSqlRecord based on the field information
+    in this Q3SqlRecordInfo.
+*/
diff --git a/doc/src/q3valuelist.qdoc b/doc/src/q3valuelist.qdoc
new file mode 100644
index 0000000000..be315c24f6
--- /dev/null
+++ b/doc/src/q3valuelist.qdoc
@@ -0,0 +1,569 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class Q3ValueList
+    \brief The Q3ValueList class is a value-based template class that
+    provides lists.
+    \compat
+
+    Q3ValueList is a Qt implementation of an STL-like list container.
+    It can be used in your application if the standard \c list is not
+    available for your target platforms.
+
+    Q3ValueList\<T\> defines a template instance to create a list of
+    values that all have the class T. Note that Q3ValueList does not
+    store pointers to the members of the list; it holds a copy of
+    every member. This is why these kinds of classes are called "value
+    based"; Q3PtrList and Q3Dict are "pointer based".
+
+    Q3ValueList contains and manages a collection of objects of type T
+    and provides iterators that allow the contained objects to be
+    addressed. Q3ValueList owns the contained items. For more relaxed
+    ownership semantics, see Q3PtrCollection and friends which are
+    pointer-based containers.
+
+    Some classes cannot be used within a Q3ValueList, for example, all
+    classes derived from QObject and thus all classes that implement
+    widgets. Only values can be used in a Q3ValueList. To qualify as a
+    value the class must provide:
+    \list
+    \i a copy constructor;
+    \i an assignment operator;
+    \i a default constructor, i.e. a constructor that does not take any arguments.
+    \endlist
+
+    Note that C++ defaults to field-by-field assignment operators and
+    copy constructors if no explicit version is supplied. In many
+    cases this is sufficient.
+
+    In addition, some compilers (e.g. Sun CC) might require that the
+    class provides an equality operator (operator==()).
+
+    Q3ValueList's function naming is consistent with the other Qt
+    classes (e.g. count(), isEmpty()). Q3ValueList also provides extra
+    functions for compatibility with STL algorithms, such as size()
+    and empty(). Programmers already familiar with the STL \c list may
+    prefer to use the STL-compatible functions.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_q3valuelist.qdoc 0
+
+
+    Notice that the latest changes to Mary's salary did not affect the
+    value in the list because the list created a copy of Mary's entry.
+
+    There are several ways to find items in the list. The begin() and
+    end() functions return iterators to the beginning and end of the
+    list. The advantage of getting an iterator is that you can move
+    forward or backward from this position by
+    incrementing/decrementing the iterator. The iterator returned by
+    end() points to the item which is one \e past the last item in the
+    container. The past-the-end iterator is still associated with the
+    list it belongs to, however it is \e not dereferenceable;
+    operator*() will not return a well-defined value. If the list is
+    empty(), the iterator returned by begin() will equal the iterator
+    returned by end().
+
+    It is safe to have multiple iterators a the list at the same
+    time. If some member of the list is removed, only iterators
+    pointing to the removed member become invalid. Inserting into the
+    list does not invalidate any iterator. For convenience, the
+    function last() returns a reference to the last item in the list,
+    and first() returns a reference to the the first item. If the
+    list is empty(), both last() and first() have undefined behavior
+    (your application will crash or do unpredictable things). Use
+    last() and first() with caution, for example:
+
+    \snippet doc/src/snippets/code/doc_src_q3valuelist.qdoc 1
+
+    Because Q3ValueList is value-based there is no need to be careful
+    about deleting items in the list. The list holds its own copies
+    and will free them if the corresponding member or the list itself
+    is deleted. You can force the list to free all of its items with
+    clear().
+
+    Q3ValueList is shared implicitly, which means it can be copied in
+    constant time, i.e. O(1). If multiple Q3ValueList instances share
+    the same data and one needs to modify its contents, this modifying
+    instance makes a copy and modifies its private copy; therefore it
+    does not affect the other instances; this takes O(n) time. This is
+    often called "copy on write". If a Q3ValueList is being used in a
+    multi-threaded program, you must protect all access to the list.
+    See \l QMutex.
+
+    There are several ways to insert items into the list. The
+    prepend() and append() functions insert items at the beginning and
+    the end of the list respectively. The insert() function comes in
+    several flavors and can be used to add one or more items at
+    specific positions within the list.
+
+    Items can also be removed from the list in several ways. There
+    are several variants of the remove() function, which removes a
+    specific item from the list. The remove() function will find and
+    remove items according to a specific item value.
+
+    \sa Q3ValueListIterator
+*/
+
+/*! \typedef Q3ValueList::iterator
+	The list's iterator type, Q3ValueListIterator. */
+/*! \typedef Q3ValueList::const_iterator
+	The list's const iterator type, Q3ValueListConstIterator. */
+/*! \typedef Q3ValueList::value_type
+	The type of the object stored in the list, T. */
+/*! \typedef Q3ValueList::pointer
+	The pointer to T type. */
+/*! \typedef Q3ValueList::const_pointer
+	The const pointer to T type. */
+/*! \typedef Q3ValueList::reference
+	The reference to T type. */
+/*! \typedef Q3ValueList::const_reference
+	The const reference to T type. */
+/*! \typedef Q3ValueList::size_type
+	An unsigned integral type, used to represent various sizes. */
+/*! \typedef Q3ValueList::difference_type
+    \internal
+*/
+/*!
+    \fn Q3ValueList::Q3ValueList()
+
+    Constructs an empty list.
+*/
+
+/*!
+    \fn Q3ValueList::Q3ValueList( const Q3ValueList<T>& l )
+    \fn Q3ValueList::Q3ValueList( const QList<T>& l )
+    \fn Q3ValueList::Q3ValueList( const QLinkedList<T>& l )
+
+    Constructs a copy of \a l.
+*/
+
+/*!
+    \fn Q3ValueList::Q3ValueList( const std::list<T>& l )
+
+    Contructs a copy of \a l.
+
+    This constructor is provided for compatibility with STL
+    containers.
+*/
+
+/*!
+    \fn Q3ValueList::~Q3ValueList()
+
+    Destroys the list. References to the values in the list and all
+    iterators of this list become invalidated. Note that it is
+    impossible for an iterator to check whether or not it is valid:
+    Q3ValueList is highly tuned for performance, not for error
+    checking.
+*/
+
+/*!
+    \fn bool Q3ValueList::operator== ( const Q3ValueList<T>& l ) const
+
+    Compares both lists.
+
+    Returns TRUE if this list and \a l are equal; otherwise returns
+    FALSE.
+*/
+
+/*!
+    \fn bool Q3ValueList::operator== ( const std::list<T>& l ) const
+
+    \overload
+
+    Returns TRUE if this list and \a l are equal; otherwise returns
+    FALSE.
+
+    This operator is provided for compatibility with STL containers.
+*/
+
+/*!
+    \fn Q3ValueList<T>& Q3ValueList::operator= ( const Q3ValueList<T>& l )
+
+    Assigns \a l to this list and returns a reference to this list.
+
+    All iterators of the current list become invalidated by this
+    operation. The cost of such an assignment is O(1) since Q3ValueList
+    is implicitly shared.
+*/
+
+/*!
+    \fn Q3ValueList<T>& Q3ValueList::operator= ( const QList<T>& l )
+
+    Assigns \a l to this list and returns a reference to this list.
+
+    All iterators of the current list become invalidated by this
+    operation.
+*/
+
+/*!
+    \fn Q3ValueList<T>& Q3ValueList::operator= ( const std::list<T>& l )
+
+    \overload
+
+    Assigns the contents of \a l to the list.
+
+    All iterators of the current list become invalidated by this
+    operation.
+*/
+
+/*!
+    \fn bool Q3ValueList::operator!= ( const Q3ValueList<T>& l ) const
+
+    Compares both lists.
+
+    Returns TRUE if this list and \a l are unequal; otherwise returns
+    FALSE.
+*/
+
+/*!
+    \fn iterator Q3ValueList::insert( typename Q3ValueList<T>::Iterator it, const T& x )
+
+    Inserts the value \a x in front of the item pointed to by the
+    iterator, \a it.
+
+    Returns an iterator pointing at the inserted item.
+
+    \sa append(), prepend()
+*/
+
+/*!
+    \fn uint Q3ValueList::remove( const T& x )
+
+    \overload
+
+    Removes all items that have value \a x and returns the number of
+    removed items.
+*/
+
+/*!
+    \fn QDataStream& operator>>( QDataStream& s, Q3ValueList<T>& l )
+
+    \relates Q3ValueList
+
+    Reads a list, \a l, from the stream \a s. The type T stored in the
+    list must implement the streaming operator.
+*/
+
+/*!
+    \fn QDataStream& operator<<( QDataStream& s, const Q3ValueList<T>& l )
+
+    \overload
+    \relates Q3ValueList
+
+    Writes a list, \a l, to the stream \a s. The type T stored in the
+    list must implement the streaming operator.
+*/
+
+/*!
+    \fn void Q3ValueList::insert( typename Q3ValueList<T>::Iterator pos,
+                                  typename Q3ValueList<T>::size_type n, const T& x )
+
+    \overload
+
+    Inserts \a n copies of \a x before position \a pos.
+*/
+
+/*!
+    \fn Q3ValueList<T>& Q3ValueList::operator<< ( const T& x )
+
+    Adds the value \a x to the end of the list.
+
+    Returns a reference to the list.
+*/
+
+/*!
+    \fn const T& Q3ValueList::operator[] ( typename Q3ValueList<T>::size_type i ) const
+
+    Returns a const reference to the item with index \a i in the list.
+    It is up to you to check whether this item really exists. You can
+    do that easily with the count() function. However this operator
+    does not check whether \a i is in range and will deliver undefined
+    results if it does not exist.
+
+    \warning This function uses a linear search and can be extremely
+    slow for large lists. Q3ValueList is not optimized for random item
+    access. If you need random access use a different container, such
+    as Q3ValueVector.
+*/
+
+/*!
+    \fn T& Q3ValueList::operator[] ( typename Q3ValueList<T>::size_type i )
+
+    \overload
+
+    Returns a non-const reference to the item with index \a i.
+*/
+
+/*!
+    \fn const_iterator Q3ValueList::at( typename Q3ValueList<T>::size_type i ) const
+
+    Returns an iterator pointing to the item at position \a i in the
+    list, or an undefined value if the index is out of range.
+
+    \warning This function uses a linear search and can be extremely
+    slow for large lists. Q3ValueList is not optimized for random item
+    access. If you need random access use a different container, such
+    as Q3ValueVector.
+*/
+
+/*!
+    \fn iterator Q3ValueList::at( typename Q3ValueList<T>::size_type i )
+
+    \overload
+
+    Returns an iterator pointing to the item at position \a i in the
+    list, or an undefined value if the index is out of range.
+
+*/
+
+/*!
+    \fn iterator Q3ValueList::fromLast()
+
+    \overload
+
+    Returns an iterator to the last item in the list, or end() if
+    there is no last item.
+
+    Use the end() function instead. For example:
+
+    \snippet doc/src/snippets/code/doc_src_q3valuelist.qdoc 2
+
+*/
+
+/*!
+    \fn const_iterator Q3ValueList::fromLast() const
+
+    Returns an iterator to the last item in the list, or end() if
+    there is no last item.
+
+    Use the end() function instead. For example:
+
+    \snippet doc/src/snippets/code/doc_src_q3valuelist.qdoc 3
+
+*/
+
+/*!
+    \fn Q3ValueList<T> Q3ValueList::operator+( const Q3ValueList<T>& l ) const
+
+    Creates a new list and fills it with the items of this list. Then
+    the items of \a l are appended. Returns the new list.
+*/
+
+/*!
+    \fn Q3ValueList<T>& Q3ValueList::operator+= ( const Q3ValueList<T>& l )
+
+    Appends the items of \a l to this list. Returns a reference to
+    this list.
+*/
+
+/*!
+    \fn Q3ValueList<T>& Q3ValueList::operator+= ( const T& x )
+
+    \overload
+
+    Appends the value \a x to the list. Returns a reference to the
+    list.
+*/
+
+/*!
+    \fn iterator Q3ValueList::append( const T& x )
+
+    Inserts \a x at the end of the list.
+
+    \sa insert(), prepend()
+*/
+
+/*!
+    \fn iterator Q3ValueList::prepend( const T& x )
+
+    Inserts \a x at the beginning of the list.
+
+    \sa insert(), append()
+*/
+
+/*!
+    \fn iterator Q3ValueList::remove( typename Q3ValueList<T>::Iterator it )
+
+    Removes the item pointed to by \a it from the list. No iterators
+    other than \a it or other iterators pointing at the same item as
+    \a it are invalidated. Returns an iterator to the next item after
+    \a it, or end() if there is no such item.
+
+    \sa clear()
+*/
+
+/*!
+    \fn uint Q3ValueList::contains( const T& x ) const
+
+    Returns the number of occurrences of the value \a x in the list.
+*/
+
+/*!
+    \class Q3ValueListIterator
+    \brief The Q3ValueListIterator class provides an iterator for Q3ValueList.
+    \compat
+
+    An iterator is a class for accessing the items of a container
+    class: a generalization of the index in an array. A pointer
+    into a "const char *" and an index into an "int[]" are both
+    iterators, and the general idea is to provide that functionality
+    for any data structure.
+
+    The Q3ValueListIterator class is an iterator for Q3ValueList
+    instantiations. You can create the appropriate iterator type by
+    using the \c iterator typedef provided by Q3ValueList.
+
+    The only way to access the items in a Q3ValueList is to use an
+    iterator.
+
+    Example (see Q3ValueList for the complete code):
+    \snippet doc/src/snippets/code/doc_src_q3valuelist.qdoc 4
+
+    Q3ValueList is highly optimized for performance and memory usage.
+    This means that you must be careful: Q3ValueList does not know
+    about all its iterators and the iterators don't know to which list
+    they belong. This makes things very fast, but if you're not
+    careful, you can get spectacular bugs. Always make sure iterators
+    are valid before dereferencing them or using them as parameters to
+    generic algorithms in the STL.
+
+    Using an invalid iterator is undefined (your application will
+    probably crash). Many Qt functions return const value lists; to
+    iterate over these you should make a copy and iterate over the
+    copy.
+
+    For every Iterator there is a ConstIterator. When accessing a
+    Q3ValueList in a const environment or if the reference or pointer
+    to the list is itself const, then you must use the ConstIterator.
+    Its semantics are the same as the Iterator, but it only returns
+    const references.
+
+    \sa Q3ValueList, Q3ValueListConstIterator
+*/
+
+/*!
+    \fn Q3ValueListIterator::Q3ValueListIterator()
+
+    Constructs an unitialized iterator.
+*/
+
+/*!
+    \fn Q3ValueListIterator::Q3ValueListIterator(const Q3ValueListIterator &o)
+    \fn Q3ValueListIterator::Q3ValueListIterator(const typename QLinkedList<T>::iterator &o)
+
+    Constucts a copy of iterator \a o.
+*/
+
+/*!
+    \class Q3ValueListConstIterator
+    \brief The Q3ValueListConstIterator class provides a const iterator
+    for Q3ValueList.
+    \compat
+
+    In contrast to Q3ValueListIterator, this class is used to iterate
+    over a const list. It does not allow modification of the values of
+    the list since that would break const semantics.
+
+    You can create the appropriate const iterator type by using the \c
+    const_iterator typedef provided by Q3ValueList.
+
+    For more information on Q3ValueList iterators, see
+    Q3ValueListIterator.
+
+    \sa Q3ValueListIterator, Q3ValueList
+*/
+
+/*!
+    \fn Q3ValueListConstIterator::Q3ValueListConstIterator()
+
+    Constructs an unitialized iterator.
+*/
+
+/*!
+    \fn Q3ValueListConstIterator::Q3ValueListConstIterator(const Q3ValueListConstIterator &o)
+    \fn Q3ValueListConstIterator::Q3ValueListConstIterator(const typename QLinkedList<T>::const_iterator &o)
+    \fn Q3ValueListConstIterator::Q3ValueListConstIterator(const typename QLinkedList<T>::iterator &o)
+
+    Constructs a copy of iterator \a o.
+*/
+
+/*!
+    \typedef Q3ValueList::Iterator
+
+    This iterator is an instantiation of Q3ValueListIterator for the
+    same type as this Q3ValueList. In other words, if you instantiate
+    Q3ValueList<int>, Iterator is a Q3ValueListIterator<int>. Several
+    member function use it, such as Q3ValueList::begin(), which returns
+    an iterator pointing to the first item in the list.
+
+    Functionally, this is almost the same as ConstIterator. The only
+    difference is that you cannot use ConstIterator for non-const
+    operations, and that the compiler can often generate better code
+    if you use ConstIterator.
+
+    \sa Q3ValueListIterator ConstIterator
+*/
+
+/*!
+    \typedef Q3ValueList::ConstIterator
+
+    This iterator is an instantiation of Q3ValueListConstIterator for
+    the same type as this Q3ValueList. In other words, if you
+    instantiate Q3ValueList<int>, ConstIterator is a
+    Q3ValueListConstIterator<int>. Several member function use it, such
+    as Q3ValueList::begin(), which returns an iterator pointing to the
+    first item in the list.
+
+    Functionally, this is almost the same as Iterator. The only
+    difference is you cannot use ConstIterator for non-const
+    operations, and that the compiler can often generate better code
+    if you use ConstIterator.
+
+    \sa Q3ValueListIterator Iterator
+*/
+
+/*!
+    \fn Q3ValueList::operator QList<T>() const
+
+    Automatically converts a Q3ValueList<T> into a QList<T>.
+*/
diff --git a/doc/src/q3valuestack.qdoc b/doc/src/q3valuestack.qdoc
new file mode 100644
index 0000000000..40847ab136
--- /dev/null
+++ b/doc/src/q3valuestack.qdoc
@@ -0,0 +1,149 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class Q3ValueStack
+    \brief The Q3ValueStack class is a value-based template class that provides a stack.
+    \compat
+
+    Define a template instance Q3ValueStack\<X\> to create a stack of
+    values that all have the class X.
+
+    Note that Q3ValueStack does not store pointers to the members of
+    the stack; it holds a copy of every member. That is why these
+    kinds of classes are called "value based"; Q3PtrStack, Q3PtrList,
+    Q3Dict, etc., are "pointer based".
+
+    A stack is a last in, first out (LIFO) structure. Items are added
+    to the top of the stack with push() and retrieved from the top
+    with pop(). The top() function provides access to the topmost item
+    without removing it.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_q3valuestack.qdoc 0
+
+    Q3ValueStack is a specialized Q3ValueList provided for convenience.
+    All of Q3ValueList's functionality also applies to Q3PtrStack, for
+    example the facility to iterate over all elements using
+    Q3ValueStack<T>::Iterator. See Q3ValueListIterator for further
+    details.
+
+    Some classes cannot be used within a Q3ValueStack, for example
+    everything derived from QObject and thus all classes that
+    implement widgets. Only values can be used in a Q3ValueStack. To
+    qualify as a value, the class must provide
+    \list
+    \i a copy constructor;
+    \i an assignment operator;
+    \i a default constructor, i.e. a constructor that does not take any arguments.
+    \endlist
+
+    Note that C++ defaults to field-by-field assignment operators and
+    copy constructors if no explicit version is supplied. In many
+    cases this is sufficient.
+*/
+
+
+/*!
+    \fn Q3ValueStack::Q3ValueStack()
+
+    Constructs an empty stack.
+*/
+
+/*!
+    \fn Q3ValueStack::~Q3ValueStack()
+
+    Destroys the stack. References to the values in the stack and all
+    iterators of this stack become invalidated. Because Q3ValueStack is
+    highly tuned for performance, you won't see warnings if you use
+    invalid iterators because it is impossible for an iterator to
+    check whether or not it is valid.
+*/
+
+
+/*!
+    \fn void  Q3ValueStack::push( const T& d )
+
+    Adds element, \a d, to the top of the stack. Last in, first out.
+
+    This function is equivalent to append().
+
+    \sa pop(), top()
+*/
+
+/*!
+    \fn T& Q3ValueStack::top()
+
+    Returns a reference to the top item of the stack or the item
+    referenced by end() if no such item exists. Note that you must not
+    change the value the end() iterator points to.
+
+    This function is equivalent to last().
+
+    \sa pop(), push(), Q3ValueList::fromLast()
+*/
+
+
+/*!
+    \fn const T& Q3ValueStack::top() const
+
+    \overload
+
+    Returns a reference to the top item of the stack or the item
+    referenced by end() if no such item exists.
+
+    This function is equivalent to last().
+
+    \sa pop(), push(), Q3ValueList::fromLast()
+*/
+
+/*!
+    \fn T Q3ValueStack::pop()
+
+    Removes the top item from the stack and returns it.
+
+    \sa top() push()
+*/
+
+
+
+
+
diff --git a/doc/src/q3valuevector.qdoc b/doc/src/q3valuevector.qdoc
new file mode 100644
index 0000000000..1af2bf3c24
--- /dev/null
+++ b/doc/src/q3valuevector.qdoc
@@ -0,0 +1,274 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class Q3ValueVector
+    \brief The Q3ValueVector class is a value-based template class that provides a dynamic array.
+    \compat
+
+    Q3ValueVector is a Qt implementation of an STL-like vector
+    container. It can be used in your application if the standard \c
+    vector is not available for your target platforms.
+
+    Q3ValueVector\<T\> defines a template instance to create a vector
+    of values that all have the class T. Q3ValueVector does not store
+    pointers to the members of the vector; it holds a copy of every
+    member. Q3ValueVector is said to be value based; in contrast,
+    Q3PtrList and Q3Dict are pointer based.
+
+    Q3ValueVector contains and manages a collection of objects of type
+    T and provides random access iterators that allow the contained
+    objects to be addressed. Q3ValueVector owns the contained
+    elements. For more relaxed ownership semantics, see Q3PtrCollection
+    and friends, which are pointer-based containers.
+
+    Q3ValueVector provides good performance if you append or remove
+    elements from the end of the vector. If you insert or remove
+    elements from anywhere but the end, performance is very bad. The
+    reason for this is that elements must to be copied into new
+    positions.
+
+    Some classes cannot be used within a Q3ValueVector: for example,
+    all classes derived from QObject and thus all classes that
+    implement widgets. Only values can be used in a Q3ValueVector. To
+    qualify as a value the class must provide:
+    \list
+    \i a copy constructor;
+    \i an assignment operator;
+    \i a default constructor, i.e., a constructor that does not take any arguments.
+    \endlist
+
+    Note that C++ defaults to field-by-field assignment operators and
+    copy constructors if no explicit version is supplied. In many
+    cases this is sufficient.
+
+    Q3ValueVector uses an STL-like syntax to manipulate and address the
+    objects it contains.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_q3valuevector.qdoc 0
+
+    Program output:
+    \snippet doc/src/snippets/code/doc_src_q3valuevector.qdoc 1
+
+    As you can see, the most recent change to Joe's salary did not
+    affect the value in the vector because the vector created a copy
+    of Joe's entry.
+
+    Many Qt functions return const value vectors; to iterate over
+    these you should make a copy and iterate over the copy.
+
+    There are several ways to find items in the vector. The begin()
+    and end() functions return iterators to the beginning and end of
+    the vector. The advantage of getting an iterator is that you can
+    move forward or backward from this position by
+    incrementing/decrementing the iterator. The iterator returned by
+    end() points to the element which is one past the last element in
+    the container. The past-the-end iterator is still associated with
+    the vector it belongs to, however it is \e not dereferenceable;
+    operator*() will not return a well-defined value. If the vector is
+    empty(), the iterator returned by begin() will equal the iterator
+    returned by end().
+
+    The fastest way to access an element of a vector is by using
+    operator[]. This function provides random access and will return
+    a reference to the element located at the specified index. Thus,
+    you can access every element directly, in constant time, providing
+    you know the location of the element. It is undefined to access
+    an element that does not exist (your application will probably
+    crash). For example:
+
+    \snippet doc/src/snippets/code/doc_src_q3valuevector.qdoc 2
+
+    Whenever inserting, removing or referencing elements in a vector,
+    always make sure you are referring to valid positions. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_q3valuevector.qdoc 3
+
+    The iterators provided by vector are random access iterators,
+    therefore you can use them with many generic algorithms, for
+    example, algorithms provided by the STL.
+
+    It is safe to have multiple iterators on the vector at the same
+    time. Since Q3ValueVector manages memory dynamically, all iterators
+    can become invalid if a memory reallocation occurs. For example,
+    if some member of the vector is removed, iterators that point to
+    the removed element and to all following elements become
+    invalidated. Inserting into the middle of the vector will
+    invalidate all iterators. For convenience, the function back()
+    returns a reference to the last element in the vector, and front()
+    returns a reference to the first element. If the vector is
+    empty(), both back() and front() have undefined behavior (your
+    application will crash or do unpredictable things). Use back() and
+    front() with caution, for example:
+
+    \snippet doc/src/snippets/code/doc_src_q3valuevector.qdoc 4
+
+    Because Q3ValueVector manages memory dynamically, it is recommended
+    that you contruct a vector with an initial size. Inserting and
+    removing elements happens fastest when:
+    \list
+    \i Inserting or removing elements happens at the end() of the
+    vector;
+    \i The vector does not need to allocate additional memory.
+    \endlist
+
+    By creating a Q3ValueVector with a sufficiently large initial size,
+    there will be less memory allocations. Do not use an initial size
+    that is too big, since it will still take time to construct all
+    the empty entries, and the extra space will be wasted if it is
+    never used.
+
+    Because Q3ValueVector is value-based there is no need to be careful
+    about deleting elements in the vector. The vector holds its own
+    copies and will free them if the corresponding member or the
+    vector itself is deleted. You can force the vector to free all of
+    its items with clear().
+
+    Q3ValueVector is shared implicitly, which means it can be copied in
+    constant time. If multiple Q3ValueVector instances share the same
+    data and one needs to modify its contents, this modifying instance
+    makes a copy and modifies its private copy; it thus does not
+    affect the other instances. This is often called "copy on write".
+    If a Q3ValueVector is being used in a multi-threaded program, you
+    must protect all access to the vector. See QMutex.
+
+    There are several ways to insert elements into the vector. The
+    push_back() function insert elements into the end of the vector,
+    and is usually fastest. The insert() function can be used to add
+    elements at specific positions within the vector.
+
+    Items can be also be removed from the vector in several ways.
+    There are several variants of the erase() function which removes a
+    specific element, or range of elements, from the vector.
+
+    Q3ValueVector stores its elements in contiguous memory. This means
+    that you can use a Q3ValueVector in any situation that requires an
+    array. 
+*/
+
+/*!
+    \fn Q3ValueVector::Q3ValueVector()
+
+    Constructs an empty vector without any elements. To create a
+    vector which reserves an initial amount of space for elements, use
+    \c Q3ValueVector(size_type n). 
+*/
+
+/*!
+    \fn Q3ValueVector::Q3ValueVector( const Q3ValueVector<T>& v )
+
+    Constructs a copy of \a v.
+
+    This operation costs O(1) time because Q3ValueVector is implicitly
+    shared.
+
+    The first modification to the vector does takes O(n) time, because
+    the elements must be copied.
+*/
+
+/*!
+    \fn Q3ValueVector::Q3ValueVector( const std::vector<T>& v )
+
+    This operation costs O(n) time because \a v is copied.
+*/
+
+/*!
+    \fn Q3ValueVector::Q3ValueVector( QVector<T>::size_type n, const T& val )
+
+    Constructs a vector with an initial size of \a n elements. Each
+    element is initialized with the value of \a val.
+*/
+
+/*!
+    \fn Q3ValueVector<T>& Q3ValueVector::operator=( const Q3ValueVector<T>& v )
+
+    Assigns \a v to this vector and returns a reference to this vector.
+
+    All iterators of the current vector become invalidated by this
+    operation. The cost of such an assignment is O(1) since
+    Q3ValueVector is implicitly shared.
+*/
+
+/*!
+    \fn Q3ValueVector<T>& Q3ValueVector::operator=( const std::vector<T>& v )
+
+    \overload
+
+    Assigns \a v to this vector and returns a reference to this vector.
+
+    All iterators of the current vector become invalidated by this
+    operation. The cost of this assignment is O(n) since \a v is
+    copied.
+*/
+
+/*!
+    \fn T &Q3ValueVector::at( int i , bool* ok )
+
+    Returns a reference to the element with index \a i. If \a ok is
+    non-null, and the index \a i is out of range, *\a ok is set to
+    FALSE and the returned reference is undefined. If the index \a i
+    is within the range of the vector, and \a ok is non-null, *\a ok
+    is set to TRUE and the returned reference is well defined.
+*/
+
+/*!
+    \fn const T &Q3ValueVector::at( int i , bool* ok ) const
+
+    \overload
+
+    Returns a const reference to the element with index \a i. If \a ok
+    is non-null, and the index \a i is out of range, *\a ok is set to
+    FALSE and the returned reference is undefined. If the index \a i
+    is within the range of the vector, and \a ok is non-null, *\a ok
+    is set to TRUE and the returned reference is well defined.
+*/
+
+/*!
+    \fn void Q3ValueVector::resize( int n, const T& val = T() )
+
+    Changes the size of the vector to \a n. If \a n is greater than
+    the current size(), elements are added to the end and initialized
+    with the value of \a val. If \a n is less than size(), elements
+    are removed from the end. If \a n is equal to size() nothing
+    happens.
+*/
diff --git a/doc/src/qalgorithms.qdoc b/doc/src/qalgorithms.qdoc
new file mode 100644
index 0000000000..459fb81da5
--- /dev/null
+++ b/doc/src/qalgorithms.qdoc
@@ -0,0 +1,648 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \headerfile <QtAlgorithms>
+    \title Generic Algorithms
+    \ingroup architecture
+
+    \brief The <QtAlgorithms> header provides generic template-based algorithms.
+
+    Qt provides a number of global template functions in \c
+    <QtAlgorithms> that work on containers and perform well-know
+    algorithms. You can use these algorithms with any \l {container
+    class} that provides STL-style iterators, including Qt's QList,
+    QLinkedList, QVector, QMap, and QHash classes.
+
+    These functions have taken their inspiration from similar
+    functions available in the STL \c <algorithm> header. Most of them
+    have a direct STL equivalent; for example, qCopyBackward() is the
+    same as STL's copy_backward() algorithm.
+
+    If STL is available on all your target platforms, you can use the
+    STL algorithms instead of their Qt counterparts. One reason why
+    you might want to use the the STL algorithms is that STL provides
+    dozens and dozens of algorithms, whereas Qt only provides the most
+    important ones, making no attempt to duplicate functionality that
+    is already provided by the C++ standard.
+
+    Most algorithms take \l {STL-style iterators} as parameters. The
+    algorithms are generic in the sense that they aren't bound to a
+    specific iterator class; you can use them with any iterators that
+    meet a certain set of requirements.
+
+    Let's take the qFill() algorithm as an example. Unlike QVector,
+    QList has no fill() function that can be used to fill a list with
+    a particular value. If you need that functionality, you can use
+    qFill():
+
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 0
+
+    qFill() takes a begin iterator, an end iterator, and a value.
+    In the example above, we pass \c list.begin() and \c list.end()
+    as the begin and end iterators, but this doesn't have to be
+    the case:
+
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 1
+
+    Different algorithms can have different requirements for the
+    iterators they accept. For example, qFill() accepts two 
+    \l {forward iterators}. The iterator types required are specified
+    for each algorithm. If an iterator of the wrong type is passed (for
+    example, if QList::ConstIterator is passed as an \l {output
+    iterator}), you will always get a compiler error, although not
+    necessarily a very informative one.
+
+    Some algorithms have special requirements on the value type
+    stored in the containers. For example, qEqual() requires that the
+    value type supports operator==(), which it uses to compare items.
+    Similarly, qDeleteAll() requires that the value type is a
+    non-const pointer type (for example, QWidget *). The value type
+    requirements are specified for each algorithm, and the compiler
+    will produce an error if a requirement isn't met.
+
+    \target binaryFind example
+
+    The generic algorithms can be used on other container classes
+    than those provided by Qt and STL. The syntax of STL-style
+    iterators is modeled after C++ pointers, so it's possible to use
+    plain arrays as containers and plain pointers as iterators. A
+    common idiom is to use qBinaryFind() together with two static
+    arrays: one that contains a list of keys, and another that
+    contains a list of associated values. For example, the following
+    code will look up an HTML entity (e.g., \c &amp;) in the \c
+    name_table array and return the corresponding Unicode value from
+    the \c value_table if the entity is recognized:
+
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 2
+
+    This kind of code is for advanced users only; for most
+    applications, a QMap- or QHash-based approach would work just as
+    well:
+
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 3
+
+    \section1 Types of Iterators
+
+    The algorithms have certain requirements on the iterator types
+    they accept, and these are specified individually for each
+    function. The compiler will produce an error if a requirement
+    isn't met.
+
+    \section2 Input Iterators
+
+    An \e{input iterator} is an iterator that can be used for reading
+    data sequentially from a container. It must provide the following
+    operators: \c{==} and \c{!=} for comparing two iterators, unary
+    \c{*} for retrieving the value stored in the item, and prefix
+    \c{++} for advancing to the next item.
+
+    The Qt containers' iterator types (const and non-const) are all
+    input iterators.
+
+    \section2 Output Iterators
+
+    An \e{output iterator} is an iterator that can be used for
+    writing data sequentially to a container or to some output
+    stream. It must provide the following operators: unary \c{*} for
+    writing a value (i.e., \c{*it = val}) and prefix \c{++} for
+    advancing to the next item.
+
+    The Qt containers' non-const iterator types are all output
+    iterators.
+
+    \section2 Forward Iterators
+
+    A \e{forward iterator} is an iterator that meets the requirements
+    of both input iterators and output iterators.
+
+    The Qt containers' non-const iterator types are all forward
+    iterators.
+
+    \section2 Bidirectional Iterators
+
+    A \e{bidirectional iterator} is an iterator that meets the
+    requirements of forward iterators but that in addition supports
+    prefix \c{--} for iterating backward.
+
+    The Qt containers' non-const iterator types are all bidirectional
+    iterators.
+
+    \section2 Random Access Iterators
+
+    The last category, \e{random access iterators}, is the most
+    powerful type of iterator. It supports all the requirements of a
+    bidirectional iterator, and supports the following operations:
+
+    \table
+    \row \i \c{i += n} \i advances iterator \c i by \c n positions
+    \row \i \c{i -= n} \i moves iterator \c i back by \c n positions
+    \row \i \c{i + n} or \c{n + i} \i returns the iterator for the item \c
+       n positions ahead of iterator \c i
+    \row \i \c{i - n} \i returns the iterator for the item \c n positions behind of iterator \c i
+    \row \i \c{i - j} \i returns the number of items between iterators \c i and \c j
+    \row \i \c{i[n]} \i same as \c{*(i + n)}
+    \row \i \c{i < j} \i returns true if iterator \c j comes after iterator \c i
+    \endtable
+
+    QList and QVector's non-const iterator types are random access iterators.
+
+    \sa {container classes}, <QtGlobal>
+*/
+
+/*! \fn OutputIterator qCopy(InputIterator begin1, InputIterator end1, OutputIterator begin2)
+    \relates <QtAlgorithms>
+
+    Copies the items from range [\a begin1, \a end1) to range [\a
+    begin2, ...), in the order in which they appear.
+
+    The item at position \a begin1 is assigned to that at position \a
+    begin2; the item at position \a begin1 + 1 is assigned to that at
+    position \a begin2 + 1; and so on.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 4
+
+    \sa qCopyBackward(), {input iterators}, {output iterators}
+*/
+
+/*! \fn BiIterator2 qCopyBackward(BiIterator1 begin1, BiIterator1 end1, BiIterator2 end2)
+    \relates <QtAlgorithms>
+
+    Copies the items from range [\a begin1, \a end1) to range [...,
+    \a end2).
+
+    The item at position \a end1 - 1 is assigned to that at position
+    \a end2 - 1; the item at position \a end1 - 2 is assigned to that
+    at position \a end2 - 2; and so on.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 5
+
+    \sa qCopy(), {bidirectional iterators}
+*/
+
+/*! \fn bool qEqual(InputIterator1 begin1, InputIterator1 end1, InputIterator2 begin2)
+    \relates <QtAlgorithms>
+
+    Compares the items in the range [\a begin1, \a end1) with the
+    items in the range [\a begin2, ...). Returns true if all the
+    items compare equal; otherwise returns false.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 6
+
+    This function requires the item type (in the example above,
+    QString) to implement \c operator==().
+
+    \sa {input iterators}
+*/
+
+/*! \fn void qFill(ForwardIterator begin, ForwardIterator end, const T &value)
+    \relates <QtAlgorithms>
+
+    Fills the range [\a begin, \a end) with \a value.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 7
+
+    \sa qCopy(), {forward iterators}
+*/
+
+/*! \fn void qFill(Container &container, const T &value)
+    \relates <QtAlgorithms>
+
+    \overload
+
+    This is the same as qFill(\a{container}.begin(), \a{container}.end(), \a value);
+*/
+
+/*! \fn InputIterator qFind(InputIterator begin, InputIterator end, const T &value)
+    \relates <QtAlgorithms>
+
+    Returns an iterator to the first occurrence of \a value in a
+    container in the range [\a begin, \a end). Returns \a end if \a
+    value isn't found.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 8
+
+    This function requires the item type (in the example above,
+    QString) to implement \c operator==().
+
+    If the items in the range are in ascending order, you can get
+    faster results by using qLowerBound() or qBinaryFind() instead of
+    qFind().
+
+    \sa qBinaryFind(), {input iterators}
+*/
+
+/*! \fn void qFind(const Container &container, const T &value)
+    \relates <QtAlgorithms>
+
+    \overload
+
+    This is the same as qFind(\a{container}.begin(), \a{container}.end(), value);
+*/
+
+/*! \fn void qCount(InputIterator begin, InputIterator end, const T &value, Size &n)
+    \relates <QtAlgorithms>
+
+    Returns the number of occurrences of \a value in the range [\a begin, \a end),
+    which is returned in \a n. \a n is never initialized, the count is added to \a n.
+    It is the caller's responsibility to initialize \a n.
+
+    Example:
+
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 9
+
+    This function requires the item type (in the example above,
+    \c int) to implement \c operator==().
+
+    \sa {input iterators}
+*/
+
+/*! \fn void qCount(const Container &container, const T &value, Size &n)
+\relates <QtAlgorithms>
+
+\overload
+
+Instead of operating on iterators, as in the other overload, this function
+operates on the specified \a container to obtain the number of instances
+of \a value in the variable passed as a reference in argument \a n.
+*/
+
+/*! \fn void qSwap(T &var1, T &var2)
+    \relates <QtAlgorithms>
+
+    Exchanges the values of variables \a var1 and \a var2.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 10
+*/
+
+/*! \fn void qSort(RandomAccessIterator begin, RandomAccessIterator end)
+    \relates <QtAlgorithms>
+
+    Sorts the items in range [\a begin, \a end) in ascending order
+    using the quicksort algorithm.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 11
+
+    The sort algorithm is efficient on large data sets. It operates
+    in \l {linear-logarithmic time}, O(\e{n} log \e{n}).
+
+    This function requires the item type (in the example above,
+    \c{int}) to implement \c operator<().
+
+    If neither of the two items is "less than" the other, the items are
+    taken to be equal. It is then undefined which one of the two
+    items will appear before the other after the sort.
+
+    \sa qStableSort(), {random access iterators}
+*/
+
+/*! \fn void qSort(RandomAccessIterator begin, RandomAccessIterator end, LessThan lessThan)
+    \relates <QtAlgorithms>
+
+    \overload
+
+    Uses the \a lessThan function instead of \c operator<() to
+    compare the items.
+
+    For example, here's how to sort the strings in a QStringList
+    in case-insensitive alphabetical order:
+
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 12
+
+    To sort values in reverse order, pass
+    \l{qGreater()}{qGreater<T>()} as the \a lessThan parameter. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 13
+
+    If neither of the two items is "less than" the other, the items are
+    taken to be equal. It is then undefined which one of the two
+    items will appear before the other after the sort.
+
+    An alternative to using qSort() is to put the items to sort in a
+    QMap, using the sort key as the QMap key. This is often more
+    convenient than defining a \a lessThan function. For example, the
+    following code shows how to sort a list of strings case
+    insensitively using QMap:
+
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 14
+
+    \sa QMap
+*/
+
+/*! \fn void qSort(Container &container)
+    \relates <QtAlgorithms>
+
+    \overload
+
+    This is the same as qSort(\a{container}.begin(), \a{container}.end());
+*/
+
+/*! 
+    \fn void qStableSort(RandomAccessIterator begin, RandomAccessIterator end)
+    \relates <QtAlgorithms>
+
+    Sorts the items in range [\a begin, \a end) in ascending order
+    using a stable sorting algorithm.
+
+    If neither of the two items is "less than" the other, the items are
+    taken to be equal. The item that appeared before the other in the
+    original container will still appear first after the sort. This
+    property is often useful when sorting user-visible data.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 15
+
+    The sort algorithm is efficient on large data sets. It operates
+    in \l {linear-logarithmic time}, O(\e{n} log \e{n}).
+
+    This function requires the item type (in the example above,
+    \c{int}) to implement \c operator<().
+
+    \sa qSort(), {random access iterators}
+*/
+
+/*! 
+    \fn void qStableSort(RandomAccessIterator begin, RandomAccessIterator end, LessThan lessThan)
+    \relates <QtAlgorithms>
+
+    \overload
+
+    Uses the \a lessThan function instead of \c operator<() to
+    compare the items.
+
+    For example, here's how to sort the strings in a QStringList
+    in case-insensitive alphabetical order:
+
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 16
+    
+    Note that earlier versions of Qt allowed using a lessThan function that took its
+    arguments by non-const reference. From 4.3 and on this is no longer possible,
+    the arguments has to be passed by const reference or value.
+
+    To sort values in reverse order, pass
+    \l{qGreater()}{qGreater<T>()} as the \a lessThan parameter. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 17
+
+    If neither of the two items is "less than" the other, the items are
+    taken to be equal. The item that appeared before the other in the
+    original container will still appear first after the sort. This
+    property is often useful when sorting user-visible data.
+*/
+
+/*! 
+    \fn void qStableSort(Container &container)
+    \relates <QtAlgorithms>
+
+    \overload
+
+    This is the same as qStableSort(\a{container}.begin(), \a{container}.end());
+*/
+
+/*! \fn RandomAccessIterator qLowerBound(RandomAccessIterator begin, RandomAccessIterator end, const T &value)
+    \relates <QtAlgorithms>
+
+    Performs a binary search of the range [\a begin, \a end) and
+    returns the position of the first ocurrence of \a value. If no
+    such item is found, returns the position where it should be
+    inserted.
+
+    The items in the range [\a begin, \e end) must be sorted in
+    ascending order; see qSort().
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 18
+
+    This function requires the item type (in the example above,
+    \c{int}) to implement \c operator<().
+
+    qLowerBound() can be used in conjunction with qUpperBound() to
+    iterate over all occurrences of the same value:
+
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 19
+
+    \sa qUpperBound(), qBinaryFind()
+*/
+
+/*!
+    \fn RandomAccessIterator qLowerBound(RandomAccessIterator begin, RandomAccessIterator end, const T &value, LessThan lessThan)
+    \relates <QtAlgorithms>
+
+    \overload
+
+    Uses the \a lessThan function instead of \c operator<() to
+    compare the items.
+
+    Note that the items in the range must be sorted according to the order
+    specified by the \a lessThan object.
+*/
+
+/*! 
+    \fn void qLowerBound(const Container &container, const T &value)
+    \relates <QtAlgorithms>
+
+    \overload
+
+    This is the same as qLowerBound(\a{container}.begin(), \a{container}.end(), value);
+*/
+
+/*! \fn RandomAccessIterator qUpperBound(RandomAccessIterator begin, RandomAccessIterator end, const T &value)
+    \relates <QtAlgorithms>
+
+    Performs a binary search of the range [\a begin, \a end) and
+    returns the position of the one-past-the-last occurrence of \a
+    value. If no such item is found, returns the position where the
+    item should be inserted.
+
+    The items in the range [\a begin, \e end) must be sorted in
+    ascending order; see qSort().
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 20
+
+    This function requires the item type (in the example above,
+    \c{int}) to implement \c operator<().
+
+    qUpperBound() can be used in conjunction with qLowerBound() to
+    iterate over all occurrences of the same value:
+
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 21
+
+    \sa qLowerBound(), qBinaryFind()
+*/
+
+/*!
+    \fn RandomAccessIterator qUpperBound(RandomAccessIterator begin, RandomAccessIterator end, const T &value, LessThan lessThan)
+    \relates <QtAlgorithms>
+
+    \overload
+
+    Uses the \a lessThan function instead of \c operator<() to
+    compare the items.
+
+    Note that the items in the range must be sorted according to the order
+    specified by the \a lessThan object.
+*/
+
+/*! 
+    \fn void qUpperBound(const Container &container, const T &value)
+    \relates <QtAlgorithms>
+
+    \overload
+
+    This is the same as qUpperBound(\a{container}.begin(), \a{container}.end(), value);
+*/
+
+
+/*! \fn RandomAccessIterator qBinaryFind(RandomAccessIterator begin, RandomAccessIterator end, const T &value)
+    \relates <QtAlgorithms>
+
+    Performs a binary search of the range [\a begin, \a end) and
+    returns the position of an occurrence of \a value. If there are
+    no occurrences of \a value, returns \a end.
+
+    The items in the range [\a begin, \a end) must be sorted in
+    ascending order; see qSort().
+
+    If there are many occurrences of the same value, any one of them
+    could be returned. Use qLowerBound() or qUpperBound() if you need
+    finer control.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 22
+
+    This function requires the item type (in the example above,
+    QString) to implement \c operator<().
+
+    See the \l{<QtAlgorithms>#binaryFind example}{detailed
+    description} for an example usage.
+
+    \sa qLowerBound(), qUpperBound(), {random access iterators}
+*/
+
+/*! \fn RandomAccessIterator qBinaryFind(RandomAccessIterator begin, RandomAccessIterator end, const T &value, LessThan lessThan)
+    \relates <QtAlgorithms>
+
+    \overload
+
+    Uses the \a lessThan function instead of \c operator<() to
+    compare the items.
+
+    Note that the items in the range must be sorted according to the order
+    specified by the \a lessThan object.
+*/
+
+/*! 
+    \fn void qBinaryFind(const Container &container, const T &value)
+    \relates <QtAlgorithms>
+
+    \overload
+
+    This is the same as qBinaryFind(\a{container}.begin(), \a{container}.end(), value);
+*/
+
+
+/*! 
+    \fn void qDeleteAll(ForwardIterator begin, ForwardIterator end)
+    \relates <QtAlgorithms>
+
+    Deletes all the items in the range [\a begin, \a end) using the
+    C++ \c delete operator. The item type must be a pointer type (for
+    example, \c{QWidget *}).
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 23
+
+    Notice that qDeleteAll() doesn't remove the items from the
+    container; it merely calls \c delete on them. In the example
+    above, we call clear() on the container to remove the items.
+
+    This function can also be used to delete items stored in
+    associative containers, such as QMap and QHash. Only the objects
+    stored in each container will be deleted by this function; objects
+    used as keys will not be deleted.
+
+    \sa {forward iterators}
+*/
+
+/*! 
+    \fn void qDeleteAll(const Container &c)
+    \relates <QtAlgorithms>
+
+    \overload
+
+    This is the same as qDeleteAll(\a{c}.begin(), \a{c}.end()).
+*/
+
+/*! \fn LessThan qLess()
+    \relates <QtAlgorithms>
+
+    Returns a functional object, or functor, that can be passed to qSort()
+    or qStableSort().
+
+    Example:
+
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 24
+
+    \sa {qGreater()}{qGreater<T>()}
+*/
+
+/*! \fn LessThan qGreater()
+    \relates <QtAlgorithms>
+
+    Returns a functional object, or functor, that can be passed to qSort()
+    or qStableSort().
+
+    Example:
+
+    \snippet doc/src/snippets/code/doc_src_qalgorithms.qdoc 25
+
+    \sa {qLess()}{qLess<T>()}
+*/
diff --git a/doc/src/qaxcontainer.qdoc b/doc/src/qaxcontainer.qdoc
new file mode 100644
index 0000000000..48c76fc82d
--- /dev/null
+++ b/doc/src/qaxcontainer.qdoc
@@ -0,0 +1,260 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \module QAxContainer
+    \title QAxContainer Module
+    \contentspage Qt's Modules
+    \previouspage QtTest
+    \nextpage QAxServer
+    \ingroup modules
+
+    \brief The QAxContainer module is a Windows-only extension for
+    accessing ActiveX controls and COM objects.
+
+    The QAxContainer module is part of the \l ActiveQt framework. It
+    provides a library implementing a QWidget subclass, QAxWidget,
+    that acts as a container for ActiveX controls, and a QObject
+    subclass, QAxObject, that can be used to easily access non-visual
+    COM objects. Scripting COM objects embedded using these classes
+    is possible through the QAxScript, QAxScriptManager and
+    QAxScriptEngine classes, and a set of \l{Tools for ActiveQt}{tools}
+    makes it easy to access COM objects programmatically.
+
+    The module consists of six classes
+    \list 1
+    \o QAxBase is an abstract class that provides an API to initialize 
+       and access a COM object or ActiveX control.
+    \o QAxObject provides a QObject that wraps a COM object.
+    \o QAxWidget is a QWidget that wraps an ActiveX control.
+    \o QAxScriptManager, QAxScript and QAxScriptEngine provide an 
+       interface to the Windows Script Host.
+    \endlist
+
+    Some \l{Qt Examples#ActiveQt}{example applications} that use
+    standard ActiveX controls to provide high-level user interface
+    functionality are provided.
+
+    \sa {ActiveQt Framework}
+
+    Topics:
+
+    \tableofcontents
+
+    \section1 Using the Library
+
+    To build Qt applications that can host COM objects and ActiveX controls
+    link the application against the QAxContainer module by adding
+
+    \snippet doc/src/snippets/code/doc_src_qaxcontainer.qdoc 0
+
+    to your application's \c .pro file.
+
+    \section2 Distributing QAxContainer Applications
+
+    The QAxContainer library is static, so there is no need to redistribute
+    any additional files when using this module. Note however that the
+    ActiveX server binaries you are using might not be installed on the
+    target system, so you have to ship them with your package and register
+    them during the installation process of your application.
+
+    \section1 Instantiating COM Objects
+
+    To instantiate a COM object use the QAxBase::setControl() API, or pass
+    the name of the object directly into the constructor of the QAxBase 
+    subclass you are using.
+
+    The control can be specified in a variety of formats, but the fastest
+    and most powerful format is to use the class ID (CLSID) of the object
+    directly. The class ID can be prepended with information about a remote
+    machine that the object should run on, and can include a license key
+    for licensed controls.
+
+    \section2 Typical Error Messages
+
+    ActiveQt prints error messages to the debug output when it
+    encounters error situations at runtime. Usually you must run 
+    your program in the debugger to see these messages (e.g. in Visual
+    Studio's Debug output).
+
+    \section3 Requested control could not be instantiated
+
+    The control requested in QAxBase::setControl() is not installed
+    on this system, or is not accessible for the current user.
+
+    The control might require administrator rights, or a license key.
+    If the control is licensed, pass the license key to QAxBase::setControl
+    as documented.
+
+    \section1 Accessing the Object API
+
+    ActiveQt provides a Qt API to the COM object, and replaces COM
+    datatypes with Qt equivalents.
+
+    There are four ways to call APIs on the COM object:
+
+    \list
+    \o Generating a C++ namespace
+    \o Call-by-name
+    \o Through a script engine
+    \o Using the native COM interfaces
+    \endlist
+
+    \section2 Generating a C++ Namespace
+
+    To generate a C++ namespace for the type library you want to access,
+    use the \l dumpcpp tool. Run this tool manually on the type library you
+    want to use, or integrate it into the build system by adding the type
+    libraries to the \c TYPELIBS variable in your application's \c .pro file:
+
+    \snippet doc/src/snippets/code/doc_src_qaxcontainer.qdoc 1
+
+    Note that \l dumpcpp might not be able to expose all APIs in the type
+    library.
+
+    Include the resulting header file in your code to access the
+    object APIs through the generated C++ classes. See the
+    \l{activeqt/qutlook}{Qutlook} example for more information.
+
+    \section2 Call-by-Name
+
+    Use QAxBase::dynamicCall() and QAxBase::querySubObject() as well as
+    the QObject::setProperty() and QObject::property() APIs to call the
+    methods and properties of the COM object through their name. Use the 
+    \l dumpdoc tool to get the documentation of the Qt API for any COM 
+    object and its subobjects; note that not all of the COM object's APIs
+    might be available.
+
+    See the \l{activeqt/webbrowser}{Webbrowser} example for more information.
+
+    \section2 Calling Function Through a Script Engine
+
+    A Qt application can host any ActiveScript engine installed on the system.
+    The script engine can then run script code that accesses the COM objects.
+
+    To instantiate a script engine, use QAxScriptManager::addObject() to
+    register the COM objects you want to access from script, and 
+    QAxScriptManager::load() to load the script code into the engine. Then
+    call the script functions using QAxScriptManager::call() or 
+    QAxScript::call().
+
+    Which APIs of the COM object are available through scripting depends on 
+    the script language used.
+
+    The \l{testcon - An ActiveX Test Container (ActiveQt)}{ActiveX Test Container}
+    demonstrates loading of script files.
+
+    \section2 Calling a Function Using the Native COM Interfaces
+
+    To call functions of the COM object that can not be accessed via any
+    of the above methods it is possible to request the COM interface directly 
+    using QAxBase::queryInterface(). To get a C++ definition of the respective
+    interface classes use the \c #import directive with the type library
+    provided with the control; see your compiler manual for details.
+
+    \section2 Typical Error Messages
+
+    ActiveQt prints error messages to the debug output when it
+    encounters error situations at runtime. Usually you must run 
+    your program in the debugger to see these messages (e.g. in Visual
+    Studio's Debug output).
+
+    \section3 QAxBase::internalInvoke: No such method
+
+    A QAxBase::dynamicCall() failed - the function prototype did not
+    match any function available in the object's API.
+
+    \section3 Error calling IDispatch member: Non-optional parameter missing
+
+    A QAxBase::dynamicCall() failed - the function prototype was correct,
+    but too few parameters were provided.
+
+    \section3 Error calling IDispatch member: Type mismatch in parameter n
+
+    A QAxBase::dynamicCall() failed - the function prototype was correct,
+    but the paramter at index \c n was of the wrong type and could 
+    not be coerced to the correct type.
+
+    \section3 QAxScriptManager::call(): No script provides this function
+
+    You try to call a function that is provided through an engine
+    that doesn't provide introspection (ie. ActivePython or 
+    ActivePerl). You need to call the function directly on the
+    respective QAxScript object.
+
+    \section1 License Information
+
+    The QAxContainer module is not covered by the \l{GNU General Public License (GPL)},
+    the \l{GNU Lesser General Public License (LGPL)}, or the
+    \l{Qt Commercial Editions}{Qt Commercial License}. Instead, it is distributed under
+    the following license.
+
+    \legalese
+    Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).\br
+    All rights reserved.
+
+    Contact:  Qt Software Information (qt-info@nokia.com)\br
+
+    You may use this file under the terms of the BSD license as follows:\br
+
+    "Redistribution and use in source and binary forms, with or without modification,
+    are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this list
+    of conditions and the following disclaimer.\br
+    * Redistributions in binary form must reproduce the above copyright notice, this
+    list of conditions and the following disclaimer in the documentation and/or other
+    materials provided with the distribution.\br
+    * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor the names of
+    its contributors may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+    SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+    TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+    ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+    \endlegalese
+*/
diff --git a/doc/src/qaxserver.qdoc b/doc/src/qaxserver.qdoc
new file mode 100644
index 0000000000..f0c317b44c
--- /dev/null
+++ b/doc/src/qaxserver.qdoc
@@ -0,0 +1,898 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \module QAxServer
+    \title QAxServer Module
+    \contentspage Qt's Modules
+    \previouspage QAxContainer
+    \nextpage QtDBus module
+    \ingroup modules
+
+    \brief The QAxServer module is a Windows-only static library that
+    you can use to turn a standard Qt binary into a COM server. 
+
+    The QAxServer module is part of the \l ActiveQt framework. It
+    consists of three classes:
+
+    \list
+    \o QAxFactory defines a factory for the creation of COM objects.
+    \o QAxBindable provides an interface between the Qt widget and the 
+       COM object.
+    \o QAxAggregated can be subclassed to implement additional COM interfaces.
+    \endlist
+
+    Some \l{Qt Examples#ActiveQt}{example implementations} of ActiveX
+    controls and COM objects are provided.
+
+    \sa {ActiveQt Framework}
+
+    Topics:
+
+    \tableofcontents
+
+    \section1 Using the Library
+
+    To turn a standard Qt application into a COM server using the
+    QAxServer library you must add \c qaxserver as a CONFIG setting
+    in your \c .pro file.
+
+    An out-of-process executable server is generated from a \c .pro
+    file like this:
+
+    \snippet doc/src/snippets/code/doc_src_qaxserver.qdoc 0
+
+    To build an in-process server, use a \c .pro file like this:
+    \snippet doc/src/snippets/code/doc_src_qaxserver.qdoc 1
+
+    The files \c qaxserver.rc and \c qaxserver.def are part of the
+    framework and can be used from their usual location (specify a
+    path in the \c .pro file), or copied into the project directory.
+    You can modify these files as long as it includes any file as the
+    type library entry, ie. you can add version information or specify
+    a different toolbox icon.
+
+    The \c qaxserver configuration will cause the \c qmake tool to add the 
+    required build steps to the build system:
+
+    \list
+    \o Link the binary against \c qaxserver.lib instead of \c qtmain.lib
+    \o Call the \l idc tool to generate an IDL file for the COM server
+    \o Compile the IDL into a type library using the MIDL tool (part of the
+    compiler installation)
+    \o Attach the resulting type library as a binary resource to the server
+    binary (again using the \l idc tool)
+    \o Register the server
+    \endlist
+
+    Note that the QAxServer build system is not supported on Windows 98/ME
+    (attaching of resources to a binary is not possible there), but a server 
+    built on Windows NT/2000/XP will work on previous Windows versions as well.
+
+    To skip the post-processing step, also set the \c qaxserver_no_postlink
+    configuration.
+
+    Additionally you can specify a version number using the \c VERSION
+    variable, e.g.
+
+    \snippet doc/src/snippets/code/doc_src_qaxserver.qdoc 2
+
+    The version number specified will be used as the version of the type
+    library and of the server when registering.
+
+    \section2 Out-of-Process vs. In-Process
+
+    Whether your COM server should run as a stand-alone executable
+    or as a shared library in the client process depends mainly on the
+    type of COM objects you want to provide in the server. 
+
+    An executable server has the advantage of being able to run as a
+    stand-alone application, but adds considerable overhead to the
+    communication between the COM client and the COM object. If the
+    control has a programming error only the server process running
+    the control will crash, and the client application will probably
+    continue to run. Not all COM clients support executable servers.
+
+    An in-process server is usually smaller and has faster startup
+    time. The communication between client and server is done directly
+    through virtual function calls and does not introduce the overhead
+    required for remote procedure calls. However, if the server crashes the
+    client application is likely to crash as well, and not every 
+    functionality is available for in-process servers (i.e. register in
+    the COM's running-object-table).
+
+    Both server types can use Qt either as a shared library, or statically
+    linked into the server binary.
+
+    \section2 Typical Errors During the Post-Build Steps
+
+    For the ActiveQt specific post-processing steps to work the 
+    server has to meet some requirements:
+
+    \list
+    \o All controls exposed can be created with nothing but a QApplication
+    instance being present
+    \o The initial linking of the server includes a temporary type 
+    library resource
+    \o All dependencies required to run the server are in the system path 
+    (or in the path used by the calling environment; note that Visual 
+    Studio has its own set of environment variables listed in the
+    Tools|Options|Directories dialog).
+    \endlist
+
+    If those requirements are not met one ore more of the following 
+    errors are likely to occur:
+
+    \section3 The Server Executable Crashes
+
+    To generate the IDL the widgets exposed as ActiveX controls need to
+    be instantiated (the constructor is called). At this point, nothing 
+    else but a QApplication object exists. Your widget constructor must 
+    not rely on any other objects to be created, e.g. it should check for
+    null-pointers.
+
+    To debug your server run it with -dumpidl outputfile and check where
+    it crashes.
+
+    Note that no functions of the control are called.
+
+    \section3 The Server Executable Is Not a Valid Win32 Application
+
+    Attaching the type library corrupted the server binary. This is a
+    bug in Windows and happens only with release builds.
+
+    The first linking step has to link a dummy type library into the
+    executable that can later be replaced by idc. Add a resource file
+    with a type library to your project as demonstrated in the examples.
+
+    \section3 "Unable to locate DLL"
+
+    The build system needs to run the server executable to generate
+    the interface definition, and to register the server. If a dynamic
+    link library the server links against is not in the path this
+    might fail (e.g. Visual Studio calls the server using the
+    enivronment settings specified in the "Directories" option). Make
+    sure that all DLLs required by your server are located in a
+    directory that is listed in the path as printed in the error
+    message box.
+
+    \section3 "Cannot open file ..."
+
+    The ActiveX server could not shut down properly when the last
+    client stopped using it. It usually takes about two seconds for
+    the application to terminate, but you might have to use the task
+    manager to kill the process (e.g. when a client doesn't release
+    the controls properly).
+
+    \section1 Implementing Controls
+
+    To implement a COM object with Qt, create a subclass of QObject
+    or any existing QObject subclass. If the class is a subclass of QWidget,
+    the COM object will be an ActiveX control.
+
+    \snippet doc/src/snippets/code/doc_src_qaxserver.qdoc 3
+
+    The Q_OBJECT macro is required to provide the meta object information
+    about the widget to the ActiveQt framework.
+
+    \snippet doc/src/snippets/code/doc_src_qaxserver.qdoc 4
+
+    Use the Q_CLASSINFO() macro to specify the COM identifiers for the COM
+    object. \c ClassID and \c InterfaceID are required, while \c EventsID is
+    only necessary when your object has signals. To generate these identifiers,
+    use system tools like \c uuidgen or \c guidgen.
+
+    You can specify additional attributes for each of your classes; see 
+    \l{Class Information and Tuning} for details.
+
+    \snippet doc/src/snippets/code/doc_src_qaxserver.qdoc 5
+
+    Use the Q_PROPERTY() macro to declare properties for the ActiveX control.
+
+    Declare a standard constructor taking a parent object, and functions, 
+    signals and slots like for any QObject subclass.
+    \footnote
+    If a standard constructor is not present the compiler will issue
+    an error "no overloaded function takes 2 parameters" when using
+    the default factory through the QAXFACTORY_DEFAULT() macro. If you
+    cannot provide a standard constructor you must implement a
+    QAxFactory custom factory and call the constructor you have in
+    your implementation of QAxFactory::create.
+    \endfootnote
+
+    \snippet doc/src/snippets/code/doc_src_qaxserver.qdoc 6
+
+    The ActiveQt framework will expose properties and public slots as ActiveX 
+    properties and methods, and signals as ActiveX events, and convert between
+    the Qt data types and the equivalent COM data types.
+
+    \section2 Data Types
+
+    The Qt data types that are supported for properties are:
+
+    \table
+    \header
+    \o Qt data type
+    \o COM property
+    \row
+    \o bool
+    \o VARIANT_BOOL
+    \row
+    \o QString
+    \o BSTR
+    \row
+    \o int
+    \o int
+    \row
+    \o uint
+    \o unsigned int
+    \row
+    \o double
+    \o double
+    \row
+    \o \l qlonglong
+    \o CY
+    \row
+    \o \l qulonglong
+    \o CY
+    \row
+    \o QColor
+    \o OLE_COLOR
+    \row
+    \o QDate
+    \o DATE
+    \row
+    \o QDateTime
+    \o DATE
+    \row
+    \o QTime
+    \o DATE
+    \row
+    \o QFont
+    \o IFontDisp*
+    \row
+    \o QPixmap
+    \o IPictureDisp*
+    \footnote
+    COM cannot marshal IPictureDisp accross process boundaries,
+    so QPixmap properties cannot be called for out-of-process servers. You
+    can however marshal the image data via e.g. temporary files. See the
+    Microsoft 
+    \link http://support.microsoft.com/default.aspx?scid=kb;[LN];Q150034 KB article 
+    Q150034 \endlink for more information.
+    \endfootnote
+    \row
+    \o QVariant
+    \o VARIANT
+    \row
+    \o QVariantList (same as QList\<QVariant\>)
+    \o SAFEARRAY(VARIANT)
+    \row
+    \o QStringList
+    \o SAFEARRAY(BSTR)
+    \row
+    \o QByteArray
+    \o SAFEARRAY(BYTE)
+    \row
+    \o QRect
+    \o User defined type
+    \row
+    \o QSize
+    \o User defined type
+    \row
+    \o QPoint
+    \o User defined type
+    \endtable
+
+    The Qt data types that are supported for parameters in signals and
+    slots are:
+    \table
+    \header
+    \o Qt data type
+    \o COM parameter
+    \row
+    \o bool
+    \o [in] VARIANT_BOOL
+    \row
+    \o bool&
+    \o [in, out] VARIANT_BOOL*
+    \row
+    \o QString, const QString&
+    \o [in] BSTR
+    \row
+    \o QString&
+    \o [in, out] BSTR*
+    \row
+    \o QString&
+    \o [in, out] BSTR*
+    \row
+    \o int
+    \o [in] int
+    \row
+    \o int&
+    \o [in,out] int
+    \row
+    \o uint
+    \o [in] unsigned int
+    \row
+    \o uint&
+    \o [in, out] unsigned int*
+    \row
+    \o double
+    \o [in] double
+    \row
+    \o double&
+    \o [in, out] double*
+    \row
+    \o QColor, const QColor&
+    \o [in] OLE_COLOR
+    \row
+    \o QColor&
+    \o [in, out] OLE_COLOR*
+    \row
+    \o QDate, const QDate&
+    \o [in] DATE
+    \row
+    \o QDate&
+    \o [in, out] DATE*
+    \row
+    \o QDateTime, const QDateTime&
+    \o [in] DATE
+    \row
+    \o QDateTime&
+    \o [in, out] DATE*
+    \row
+    \o QFont, const QFont&
+    \o [in] IFontDisp*
+    \row
+    \o QFont&
+    \o [in, out] IFontDisp**
+    \row
+    \o QPixmap, const QPixmap&
+    \o [in] IPictureDisp*
+    \row
+    \o QPixmap&
+    \o [in, out] IPictureDisp**
+    \row
+    \o QList\<QVariant\>, const QList\<QVariant\>&
+    \o [in] SAFEARRAY(VARIANT)
+    \row
+    \o QList\<QVariant\>&
+    \o [in, out] SAFEARRAY(VARIANT)*
+    \row
+    \o QStringList, const QStringList&
+    \o [in] SAFEARRAY(BSTR)
+    \row
+    \o QStringList&
+    \o [in, out] SAFEARRAY(BSTR)*
+    \row
+    \o QByteArray, const QByteArray&
+    \o [in] SAFEARRAY(BYTE)
+    \row
+    \o QByteArray&
+    \o [in, out] SAFEARRAY(BYTE)*
+    \row
+    \o QObject*
+    \o [in] IDispatch*
+    \row
+    \o QRect&
+    \footnote
+    OLE needs to marshal user defined types by reference (ByRef), and cannot 
+    marshal them by value (ByVal). This is why const-references and object
+    parameters are not supported for QRect, QSize and QPoint. Also note that
+    servers with this datatype require Windows 98 or DCOM 1.2 to be installed.
+    \endfootnote
+    \o [in, out] struct QRect (user defined)
+    \row
+    \o QSize&
+    \o [in, out] struct QSize (user defined)
+    \row
+    \o QPoint&
+    \o [in, out] struct QPoint (user defined)
+    \endtable
+
+    Also supported are exported enums and flags (see Q_ENUMS() and
+    Q_FLAGS()). The in-parameter types are also supported as
+    return values.
+
+    Properties and signals/slots that have parameters using any other
+    data types are ignored by the ActiveQt framework.
+
+    \section2 Sub-Objects
+
+    COM objects can have multiple sub-objects that can represent a sub element
+    of the COM object. A COM object representing a multi-document spread sheet 
+    application can for example provide one sub-object for each spread sheet.
+
+    Any QObject subclass can be used as the type for a sub object in ActiveX, as
+    long as it is known to the QAxFactory. Then the type can be used in properties,
+    or as the return type or paramter of a slot.
+
+    \section2 Property Notification
+
+    To make the properties bindable for the ActiveX client, use multiple
+    inheritance from the QAxBindable class:
+
+    \snippet doc/src/snippets/code/doc_src_qaxserver.qdoc 7
+
+    When implementing the property write functions, use the
+    QAxBindable class's requestPropertyChange() and propertyChanged()
+    functions to allow ActiveX clients to bind to the control
+    properties. 
+    \footnote 
+    This is not required, but gives the client more control over 
+    the ActiveX control.
+    \endfootnote
+
+    \section1 Serving Controls
+
+    To make a COM server available to the COM system it must be registered 
+    in the system registry using five unique identifiers. 
+    These identifiers are provided by tools like \c guidgen or \c uuidgen. 
+    The registration information allows COM to localize the binary providing 
+    a requested ActiveX control, marshall remote procedure calls to the 
+    control and read type information about the methods and properties exposed 
+    by the control.
+
+    To create the COM object when the client asks for it the server must export 
+    an implementation of a QAxFactory. The easist way to do this is to use a set
+    of macros:
+
+    \snippet doc/src/snippets/code/doc_src_qaxserver.qdoc 8
+
+    This will export \c MyWidget and \c MyWidget2 as COM objects that can be
+    created by COM clients, and will register \c MySubType as a type that can
+    be used in properties and parameters of \c MyWidget and \c MyWidget2.
+
+    The \link QAxFactory QAxFactory class documentation \endlink explains 
+    how to use this macro, and how to implement and use custom factories.
+
+    For out-of-process executable servers you can implement a main()
+    function to instantiate a QApplication object and enter the event
+    loop just like any normal Qt application. By default the
+    application will start as a standard Qt application, but if you
+    pass \c -activex on the command line it will start as an ActiveX
+    server. Use QAxFactory::isServer() to create and run a standard
+    application interface, or to prevent a stand-alone execution:
+
+    \snippet doc/src/snippets/code/doc_src_qaxserver.qdoc 9
+
+    This is however not necessary as ActiveQt provides a default implementation
+    of a main function. The default implemenation calls QAxFactory::startServer(),
+    creates a QApplication instance and calls exec().
+
+    To build the ActiveX server executable run \c qmake
+    to generate the makefile, and use your compiler's
+    make tool as for any other Qt application. The make process will
+    also register the controls in the system registry by calling the
+    resulting executable with the \c -regserver command line option.
+
+    If the ActiveX server is an executable, the following command line
+    options are supported:
+    \table
+    \header \o Option \o Result
+    \row \o \c -regserver \o Registers the server in the system registry
+    \row \o \c -unregserver \o Unregisters the server from the system registry
+    \row \o \c -activex \o Starts the application as an ActiveX server
+    \row \o \c{-dumpidl <file> -version x.y} \o Writes the server's IDL to the
+    specified file. The type library will have version x.y
+    \endtable
+
+    In-process servers can be registered using the \c regsvr32 tool available
+    on all Windows systems.
+
+    \section2 Typical Compile-Time Problems
+
+    The compiler/linker errors listed are based on those issued by the 
+    Microsoft Visual C++ 6.0 compiler.
+
+    \section3 "No overloaded function takes 2 parameters"
+
+    When the error occurs in code that uses the QAXFACTORY_DEFAULT()
+    macro, the widget class had no constructor that can be used by the
+    default factory. Either add a standard widget constructor or
+    implement a custom factory that doesn't require one.
+
+    When the error occurs in code that uses the QAXFACTORY_EXPORT()
+    macro, the QAxFactory subclass had no appropriate constructor.
+    Provide a public class constructor like
+
+    \snippet doc/src/snippets/code/doc_src_qaxserver.qdoc 10
+
+    for your factory class.
+
+    \section3 "Syntax error: bad suffix on number"
+
+    The unique identifiers have not been passed as strings into the 
+    QAXFACTORY_EXPORT() or QAXFACTORY_DEFAULT() macro.
+
+    \section3 "Unresolved external symbol _ucm_instantiate"
+
+    The server does not export an implementation of a QAxFactory. Use
+    the QAXFACTORY_EXPORT() macro in one of the project's
+    implementation files to instantiate and export a factory, or use
+    the QAXFACTORY_DEFAULT() macro to use the default factory.
+
+    \section3 "_ucm_initialize already defined in ..."
+
+    The server exports more than one implementation of a QAxFactory,
+    or exports the same implementation twice. If you use the default
+    factory, the QAXFACTORY_DEFAULT() macro must only be used once in
+    the project. Use a custom QAxFactory implementation and the
+    QAXFACTORY_EXPORT() macro if the server provides multiple ActiveX
+    controls.
+
+    \section2 Distributing QAxServer Binaries
+
+    ActiveX servers written with Qt can use Qt either as a shared
+    library, or have Qt linked statically into the binary. Both ways
+    will produce rather large packages (either the server binary
+    itself becomes large, or you have to ship the Qt DLL).
+
+    \section3 Installing Stand-Alone Servers
+
+    When your ActiveX server can also run as a stand-alone application,
+    run the server executable with the \c -regserver command line
+    parameter after installing the executable on the target system.
+    After that the controls provided by the server will be available to
+    ActiveX clients.
+
+    \section3 Installing In-Process Servers
+
+    When your ActiveX server is part of an installation package, use the
+    \c regsvr32 tool provided by Microsoft to register the controls on
+    the target system. If this tool is not present, load the DLL into
+    your installer process, resolve the \c DllRegisterServer symbol and
+    call the function:
+
+    \snippet doc/src/snippets/code/doc_src_qaxserver.qdoc 11
+
+    \section3 Distributing Servers over the Internet
+
+    If you want to use controls in your server in web-pages you need to
+    make the server available to the browser used to view your page, and
+    you need to specify the location of the server package in your page.
+
+    To specify the location of a server, use the CODEBASE attribute in
+    the OBJECT tag of your web-site. The value can point to the server
+    file itself, to an INF file listing other files the server requires
+    (e.g. the Qt DLL), or a compressed CAB archive.
+
+    INF and CAB files are documented in almost every book available about
+    ActiveX and COM programming as well as in the MSDN library and various
+    other Online resources. The examples include INF files that can be used
+    to build CAB archives:
+
+    \snippet examples/activeqt/simple/simple.inf 0
+
+    The CABARC tool from Microsoft can easily generate CAB archives:
+
+    \snippet doc/src/snippets/code/doc_src_qaxserver.qdoc 12
+
+    The INF files assume a static build of Qt, so no dependencies to other DLLs
+    are listed in the INF files. To distribute an ActiveX server depending on
+    DLLs you must add the dependencies, and provide the library files
+    with the archive.
+
+    \section1 Using the Controls
+
+    To use the ActiveX controls, e.g. to embed them in a web page, use
+    the \c <object> HTML tag. 
+
+    \snippet doc/src/snippets/code/doc_src_qaxserver.qdoc 13
+
+    To initialize the control's properties, use
+
+    \snippet doc/src/snippets/code/doc_src_qaxserver.qdoc 14
+
+    If the web browser supports scripting use JavaScript, VBScript
+    and forms to script the control. The
+    \l{Qt Examples#ActiveQt}{ActiveQt examples} include demonstration
+    HTML pages for the example controls.
+
+    \section2 Supported and Unsupported ActiveX Clients
+
+    The following is largly based on our own experiements with ActiveX
+    controls and client applications, and is by no means complete.
+
+    \section3 Supported Clients
+
+    These standard applications work with ActiveX controls developed with 
+    ActiveQt. Note that some clients support only in-process controls.
+
+    \list
+    \o Internet Explorer
+    \o Microsoft ActiveX Control Test Container
+    \o Microsoft Visual Studio 6.0
+    \o Microsoft Visual Studio.NET/2003
+    \o Microsoft Visual Basic 6.0
+    \o MFC- and ATL-based containers
+    \o Sybase PowerBuilder
+    \o ActiveQt based containers
+    \endlist
+
+    Microsoft Office applications are supported, but you need to register
+    the controls as "Insertable" objects. Reimplement QAxFactory::registerClass
+    to add this attribute to the COM class, or set the "Insertable" class info
+    for your class to "yes" using the Q_CLASSINFO macro.
+
+    \section3 Unsupported Clients
+
+    We have not managed to make ActiveQt based COM objects work with the
+    following client applications.
+
+    \list
+    \o Borland C++ Builder (Versions 5 and 6)
+    \o Borland Delphi
+    \endlist
+
+    \section2 Typical Runtime Errors
+
+    \section3 The Server Does Not Respond
+
+    If the system is unable to start the server (check with the task
+    manager whether the server runs a process), make sure that no DLL
+    the server depends on is missing from the system path (e.g. the Qt 
+    DLL!). Use a dependency walker to view all dependencies of the server 
+    binary.
+
+    If the server runs (e.g. the task manager lists a process), see
+    the following section for information on debugging your server.
+
+    \section3 The Object Cannot Be Created
+
+    If the server could be built and registered correctly during the build
+    process, but the object cannot be initiliazed e.g. by the OLE/COM Object 
+    Viewer application, make sure that no DLL the server depends on is
+    missing from the system path (e.g. the Qt DLL). Use a dependency walker
+    to view all dependencies of the server binary.
+
+    If the server runs, see the following section for information on
+    debugging your server.
+
+    \section2 Debugging Runtime Errors
+
+    To debug an in-process server in Visual Studio, set the server project 
+    as the active project, and specify a client "executable for debug
+    session" in the project settings (e.g. use the ActiveX Test Container). 
+    You can set breakpoints in your code, and also step into ActiveQt and 
+    Qt code if you installed the debug version.
+
+    To debug an executable server, run the application in a debugger
+    and start with the command line parameter \c -activex. Then start
+    your client and create an instance of your ActiveX control. COM 
+    will use the existing process for the next client trying to create 
+    an ActiveX control.
+
+    \section1 Class Information and Tuning
+
+    To provide attributes for each COM class, use the Q_CLASSINFO macro, which is part of
+    Qt's meta object system.
+
+    \table
+    \header
+    \o Key
+    \o Meaning of value
+    \row
+    \o Version
+    \o The version of the class (1.0 is default)
+    \row
+    \o Description
+    \o A string describing the class.
+    \row
+    \o ClassID
+    \o The class ID.
+       You must reimplement QAxFactory::classID if not specified.
+    \row
+    \o InterfaceID
+    \o The interface ID. 
+       You must reimplement QAxFactory::interfaceID if not specified.
+    \row
+    \o EventsID
+    \o The event interface ID.
+       No signals are exposed as COM events if not specified.
+    \row
+    \o DefaultProperty
+    \o The property specified represents the default property of this class.
+       Ie. the default property of a push button would be "text".
+    \row
+    \o DefaultSignal
+    \o The signal specified respresents the default signal of this class.
+       Ie. the default signal of a push button would be "clicked".
+    \row
+    \o LicenseKey
+    \o Object creation requires the specified license key. The key can be
+       empty to require a licensed machine. By default classes are not
+       licensed. Also see the following section.
+    \row
+    \o StockEvents
+    \o Objects expose stock events if value is "yes".
+       See \l QAxFactory::hasStockEvents()
+    \row
+    \o ToSuperClass
+    \o Objects expose functionality of all super-classes up to and
+       including the class name in value.
+       See \l QAxFactory::exposeToSuperClass()
+    \row
+    \o Insertable
+    \o If the value is "yes" the class is registered to be "Insertable" 
+       and will be listed in OLE 2 containers (ie. Microsoft Office). This 
+       attribute is not be set by default.
+    \row
+    \o Aggregatable
+    \o If the value is "no" the class does not support aggregation. By 
+       default aggregation is supported.
+    \row
+    \o Creatable
+    \o If the value is "no" the class cannot be created by the client,
+       and is only available through the API of another class (ie. the
+       class is a sub-type).
+    \row
+    \o RegisterObject
+    \o If the value is "yes" objects of this class are registered with
+       OLE and accessible from the running object table (ie. clients
+       can connect to an already running instance of this class). This
+       attribute is only supported in out-of-process servers.
+    \row
+    \o MIME
+    \o The object can handle data and files of the format specified in the 
+       value. The value has the format mime:extension:description. Multiple 
+       formats are separated by a semicolon.
+    \row
+    \o CoClassAlias
+    \o The classname used in the generated IDL and in the registry. This is
+       esp. useful for C++ classes that live in a namespace - by default, 
+       ActiveQt just removes the "::" to make the IDL compile.
+    \endtable
+
+    Note that both keys and values are case sensitive.
+
+    The following declares version 2.0 of a class that exposes only its
+    own API, and is available in the "Insert Objects" dialog of Microsoft
+    Office applications.
+
+    \snippet doc/src/snippets/code/doc_src_qaxserver.qdoc 15
+
+    \section2 Developing Licensed Components
+
+    If you develop components you might want to control who is able to instantiate
+    those components. Since the server binary can be shipped to and registered on 
+    any client machine it is possible for anybody to use those components in his 
+    own software.
+
+    Licensing components can be done using a variety of techniques, e.g. the code
+    creating the control can provide a license key, or the machine on which the
+    control is supposed to run needs to be licensed.
+
+    To mark a Qt class as licensed specify a "LicenseKey" using the
+    Q_CLASSINFO() macro.
+
+    \snippet doc/src/snippets/code/doc_src_qaxserver.qdoc 16
+
+    The key is required to be able to create an instance of \c MyLicensedControl
+    on a machine that is not licensed itself. The licensed developer can now 
+    redistributes the server binary with his application, which creates the control 
+    using the value of "LicenseKey", while users of the application cannot create
+    the control without the license key.
+
+    If a single license key for the control is not sufficient (ie. you want 
+    differnet developers to receive different license keys) you can specify an 
+    empty key to indicate that the control requires a license, and reimplement 
+    \l QAxFactory::validateLicenseKey() to verify that a license exists on the 
+    system (ie. through a license file).
+
+    \section2 More Interfaces
+
+    ActiveX controls provided by ActiveQt servers support a minimal set of COM 
+    interfaces to implement the OLE specifications. When the ActiveX class inherits 
+    from the QAxBindable class it can also implement additional COM interfaces.
+
+    Create a new subclass of QAxAggregated and use multiple inheritance
+    to subclass additional COM interface classes. 
+
+    \snippet doc/src/snippets/code/doc_src_qaxserver.qdoc 17
+
+    Reimplement the QAxAggregated::queryInterface() function to
+    support the additional COM interfaces.
+
+    \snippet doc/src/snippets/code/doc_src_qaxserver.qdoc 18
+
+    Since \c ISomeCOMInterface is a subclass of \c IUnknown you will
+    have to implement the \c QueryInterface(), \c AddRef(), and \c
+    Release() functions.  Use the QAXAGG_IUNKNOWN macro in your
+    class definition to do that. If you implement the \c IUnknown
+    functions manually, delegate the calls to the interface pointer
+    returned by the QAxAggregated::controllingUnknown() function,
+    e.g.
+
+    \snippet doc/src/snippets/code/doc_src_qaxserver.qdoc 19
+
+    Do not support the \c IUnknown interface itself in your
+    \l{QAxAggregated::queryInterface()}{queryInterface()}
+    implementation.
+
+    Implement the methods of the COM interfaces, and use QAxAggregated::object()
+    if you need to make calls to the QObject subclass implementing the control.
+
+    In your QAxBindable subclass, implement
+    QAxBindable::createAggregate() to return a new object of the
+    QAxAggregated subclass.
+
+    \snippet doc/src/snippets/code/doc_src_qaxserver.qdoc 20
+
+    \section1 License Information
+
+    The QAxContainer module is not covered by the \l{GNU General Public License (GPL)},
+    the \l{GNU Lesser General Public License (LGPL)}, or the
+    \l{Qt Commercial Editions}{Qt Commercial License}. Instead, it is distributed under
+    the following license.
+
+    \legalese
+    Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).\br
+    All rights reserved.
+
+    Contact:  Qt Software Information (qt-info@nokia.com)\br
+
+    You may use this file under the terms of the BSD license as follows:\br
+
+    "Redistribution and use in source and binary forms, with or without modification,
+    are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this list
+    of conditions and the following disclaimer.\br
+    * Redistributions in binary form must reproduce the above copyright notice, this
+    list of conditions and the following disclaimer in the documentation and/or other
+    materials provided with the distribution.\br
+    * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor the names of
+    its contributors may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+    SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+    TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+    ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+    \endlegalese
+*/
diff --git a/doc/src/qcache.qdoc b/doc/src/qcache.qdoc
new file mode 100644
index 0000000000..2c68640c39
--- /dev/null
+++ b/doc/src/qcache.qdoc
@@ -0,0 +1,244 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class QCache
+    \brief The QCache class is a template class that provides a cache.
+
+    \ingroup tools
+    \ingroup shared
+    \mainclass
+    \reentrant
+
+    QCache\<Key, T\> defines a cache that stores objects of type T
+    associated with keys of type Key. For example, here's the
+    definition of a cache that stores objects of type Employee
+    associated with an integer key:
+
+    \snippet doc/src/snippets/code/doc_src_qcache.qdoc 0
+
+    Here's how to insert an object in the cache:
+
+    \snippet doc/src/snippets/code/doc_src_qcache.qdoc 1
+
+    The advantage of using QCache over some other key-based data
+    structure (such as QMap or QHash) is that QCache automatically
+    takes ownership of the objects that are inserted into the cache and
+    deletes them to make room for new objects, if necessary. When
+    inserting an object into the cache, you can specify a \e{cost},
+    which should bear some approximate relationship to the amount of
+    memory taken by the object. When the sum of all objects' costs
+    (totalCost()) exceeds the cache's limit (maxCost()), QCache starts
+    deleting objects in the cache to keep under the limit, starting with
+    less recently accessed objects.
+
+    By default, QCache's maxCost() is 100. You can specify a
+    different value in the QCache constructor:
+
+    \snippet doc/src/snippets/code/doc_src_qcache.qdoc 2
+
+    Each time you call insert(), you can specify a cost as third
+    argument (after the key and a pointer to the object to insert).
+    After the call, the inserted object is owned by the QCache, which
+    may delete it at any time to make room for other objects.
+
+    To look up objects in the cache, use object() or
+    operator[](). This function looks up an object by its key, and
+    returns either a pointer to the cached object (which is owned by
+    the cache) or 0.
+
+    If you want to remove an object from the cache for a particular key,
+    call remove(). This will also delete the object. If you want to
+    remove an object from the cache without the QCache deleting it, use
+    take().
+
+    \sa QPixmapCache, QHash, QMap
+*/
+
+/*! \fn QCache::QCache(int maxCost = 100)
+
+    Constructs a cache whose contents will never have a total cost
+    greater than \a maxCost.
+*/
+
+/*! \fn QCache::~QCache()
+
+    Destroys the cache. Deletes all the objects in the cache.
+*/
+
+/*! \fn int QCache::maxCost() const
+
+    Returns the maximum allowed total cost of the cache.
+
+    \sa setMaxCost(), totalCost()
+*/
+
+/*! \fn void QCache::setMaxCost(int cost)
+
+    Sets the maximum allowed total cost of the cache to \a cost. If
+    the current total cost is greater than \a cost, some objects are
+    deleted immediately.
+
+    \sa maxCost(), totalCost()
+*/
+
+/*! \fn int QCache::totalCost() const
+
+    Returns the total cost of the objects in the cache.
+
+    This value is normally below maxCost(), but QCache makes an
+    exception for Qt's \l{implicitly shared} classes. If a cached
+    object shares its internal data with another instance, QCache may
+    keep the object lying around, possibly contributing to making
+    totalCost() larger than maxCost().
+
+    \sa setMaxCost()
+*/
+
+/*! \fn int QCache::size() const
+
+    Returns the number of objects in the cache.
+
+    \sa isEmpty()
+*/
+
+/*! \fn int QCache::count() const
+
+    Same as size().
+*/
+
+/*! \fn bool QCache::isEmpty() const
+
+    Returns true if the cache contains no objects; otherwise
+    returns false.
+
+    \sa size()
+*/
+
+/*! \fn QList<Key> QCache::keys() const
+
+    Returns a list of the keys in the cache.
+*/
+
+/*! \fn void QCache::clear();
+
+    Deletes all the objects in the cache.
+
+    \sa remove(), take()
+*/
+
+
+/*! \fn bool QCache::insert(const Key &key, T *object, int cost = 1)
+
+    Inserts \a object into the cache with key \a key and
+    associated cost \a cost. Any object with the same key already in
+    the cache will be removed.
+
+    After this call, \a object is owned by the QCache and may be
+    deleted at any time. In particular, if \a cost is greater than
+    maxCost(), the object will be deleted immediately.
+
+    The function returns true if the object was inserted into the
+    cache; otherwise it returns false.
+
+    \sa take(), remove()
+*/
+
+/*! \fn T *QCache::object(const Key &key) const
+
+    Returns the object associated with key \a key, or 0 if the key does
+    not exist in the cache.
+
+    \warning The returned object is owned by QCache and may be
+    deleted at any time.
+
+    \sa take(), remove()
+*/
+
+/*! \fn bool QCache::contains(const Key &key) const
+
+    Returns true if the cache contains an object associated with key \a
+    key; otherwise returns false.
+
+    \sa take(), remove()
+*/
+
+/*! \fn T *QCache::operator[](const Key &key) const
+
+    Returns the object associated with key \a key, or 0 if the key does
+    not exist in the cache.
+
+    This is the same as object().
+
+    \warning The returned object is owned by QCache and may be
+    deleted at any time.
+*/
+
+/*! \fn bool QCache::remove(const Key &key)
+
+    Deletes the object associated with key \a key. Returns true if the
+    object was found in the cache; otherwise returns false.
+
+    \sa take(), clear()
+*/
+
+/*! \fn T *QCache::take(const Key &key)
+
+    Takes the object associated with key \a key out of the cache
+    without deleting it. Returns a pointer to the object taken out, or
+    0 if the key does not exist in the cache.
+
+    The ownership of the returned object is passed to the caller.
+
+    \sa remove()
+*/
+
+/*!
+    \fn QCache::QCache(int maxCost, int dummy)
+
+    Use QCache(int) instead.
+*/
+
+/*!
+    \fn T *QCache::find(const Key &key) const
+
+    Use object() instead.
+*/
diff --git a/doc/src/qcolormap.qdoc b/doc/src/qcolormap.qdoc
new file mode 100644
index 0000000000..dae4dc779e
--- /dev/null
+++ b/doc/src/qcolormap.qdoc
@@ -0,0 +1,152 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class QColormap
+    \ingroup multimedia
+
+    \brief The QColormap class maps device independent QColors to device
+    dependent pixel values.
+*/
+
+/*! \enum QColormap::Mode
+
+    This enum describes how QColormap maps device independent RGB
+    values to device dependent pixel values.
+
+    \value Direct Pixel values are derived directly from the RGB
+    values, also known as "True Color."
+
+    \value Indexed Pixel values represent indexes into a vector of
+    available colors, i.e. QColormap uses the index of the color that
+    most closely matches an RGB value.
+
+    \value Gray Similar to \c Indexed, pixel values represent a vector
+    of available gray tones.  QColormap uses the index of the gray
+    tone that most closely matches the computed gray tone of an RGB
+    value.
+*/
+
+/*!
+    \fn QColormap QColormap::instance(int screen)
+
+    Returns the colormap for the specified \a screen.  If \a screen is
+    -1, this function returns the colormap for the default screen.
+*/
+
+/*!
+    \fn QColormap::QColormap(const QColormap &colormap)
+
+    Constructs a copy of another \a colormap.
+*/
+
+/*!
+    \fn QColormap::~QColormap()
+    
+    Destroys the colormap.
+*/
+
+/*!
+    \fn int QColormap::size() const
+
+    Returns the size of the colormap for \c Indexed and \c Gray modes;
+    Returns -1 for \c Direct mode.
+
+    \sa colormap()
+*/
+
+/*!
+    \fn uint QColormap::pixel(const QColor &color) const
+
+    Returns a device dependent pixel value for the \a color.
+
+    \sa colorAt()
+*/
+
+/*!
+    \fn int QColormap::depth() const
+
+    Returns the depth of the device.
+
+    \sa size()
+*/
+
+/*!
+    \fn QColormap::Mode QColormap::mode() const
+
+    Returns the mode of this colormap.
+
+    \sa QColormap::Mode
+*/
+
+/*!
+    \fn const QColor QColormap::colorAt(uint pixel) const
+
+    Returns a QColor for the \a pixel.
+
+    \sa pixel()
+*/
+
+/*!
+    \fn const QVector<QColor> QColormap::colormap() const
+
+    Returns a vector of colors which represents the devices colormap
+    for \c Indexed and \c Gray modes.  This function returns an empty
+    vector for \c Direct mode.
+
+    \sa size()
+*/
+
+/*! \fn HPALETTE QColormap::hPal()
+
+    This function is only available on Windows.
+
+    Returns an handle to the HPALETTE used by this colormap.  If no
+    HPALETTE is being used, this function returns zero.
+*/
+
+/*! \since 4.2
+
+    \fn QColormap &QColormap::operator=(const QColormap &colormap)
+
+    Assigns the given \a colormap to \e this color map and returns
+    a reference to \e this color map.
+*/
diff --git a/doc/src/qdbusadaptors.qdoc b/doc/src/qdbusadaptors.qdoc
new file mode 100644
index 0000000000..fc487aa8fe
--- /dev/null
+++ b/doc/src/qdbusadaptors.qdoc
@@ -0,0 +1,518 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/** -*- mode: C++ -*-
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page usingadaptors.html
+    \title Using QtDBus Adaptors
+
+    Adaptors are special classes that are attached to any QObject-derived class
+    and provide the interface to the external world using D-Bus. Adaptors are
+    intended to be lightweight classes whose main purpose is to relay calls to
+    and from the real object, possibly validating or converting the input from
+    the external world and, thus, protecting the real object.
+
+    Unlike multiple inheritance, adaptors can be added at any time to any object
+    (but not removed), which allows for greater flexibility when exporting
+    existing classes. Another advantage of adaptors is to provide similar but not
+    identical functionality in methods of the same name in different interfaces,
+    a case which can be quite common when adding a new version of a standard
+    interface to an object.
+
+    In order to use an adaptor, one must create a class which inherits
+    QDBusAbstractAdaptor. Since that is a standard QObject-derived class, the
+    Q_OBJECT macro must appear in the declaration and the source file must be
+    processed with the \l {moc} tool. The class must also contain one
+    Q_CLASSINFO entry with the \c {"D-Bus Interface"} name, declaring which
+    interface it is exporting. Only one entry per class is supported.
+
+    Any public slot in the class will be accessible through the bus over messages
+    of the MethodCall type. (See \l {Declaring Slots in D-Bus Adaptors} for more
+    information). Signals in the class will be automatically relayed over D-Bus.
+    However, not all types are allowed signals or slots' parameter lists: see
+    \l {The QtDBus Type System} for more information.
+
+    Also, any property declared with Q_PROPERTY will be automatically exposed
+    over the Properties interface on D-Bus. Since the QObject property system
+    does not allow for non-readable properties, it is not possible to declare
+    write-only properties using adaptors.
+
+    More information:
+    \list
+      \o \l{Declaring Slots in D-Bus Adaptors}
+      \o \l{Declaring Signals in D-Bus Adaptors}
+      \o \l{The QtDBus Type System}
+      \o \l{D-Bus Adaptor Example}
+    \endlist
+
+    \sa QDBusAbstractAdaptor
+*/
+
+/*!
+    \page qdbusadaptorexample.html
+    \title D-Bus Adaptor Example
+
+    The following example code shows how a D-Bus interface can be implemented
+    using an adaptor.
+
+    A sample usage of QDBusAbstractAdaptor is as follows:
+    \snippet doc/src/snippets/code/doc_src_qdbusadaptors.qdoc 0
+
+    The code above would create an interface that could be represented more or less in the following
+    canonical representation:
+    \snippet doc/src/snippets/code/doc_src_qdbusadaptors.qdoc 1
+
+    This adaptor could be used in the application's main function as follows
+    \snippet doc/src/snippets/code/doc_src_qdbusadaptors.qdoc 2
+
+    Break-down analysis:
+    \tableofcontents
+
+    \section1 The header
+
+    The header of the example is:
+    \snippet doc/src/snippets/code/doc_src_qdbusadaptors.qdoc 3
+
+    The code does the following:
+    \list
+      \o it declares the adaptor MainApplicationAdaptor, which descends from QDBusAbstractAdaptor
+      \o it declares the Qt meta-object data using the Q_OBJECT macro
+      \o it declares the name of the D-Bus interface it implements.
+    \endlist
+
+    \section1 The properties
+
+    The properties are declared as follows:
+    \snippet doc/src/snippets/code/doc_src_qdbusadaptors.qdoc 4
+
+    And are implemented as follows:
+    \snippet doc/src/snippets/code/doc_src_qdbusadaptors.qdoc 5
+
+    The code declares three properties: one of them is a read-write property called "caption" of
+    string type. The other two are read-only, also of the string type.
+
+    The properties organizationName and organizationDomain are simple relays of the app object's
+    organizationName and organizationDomain properties. However, the caption property requires
+    verifying if the application has a main window associated with it: if there isn't any, the
+    caption property is empty. Note how it is possible to access data defined in other objects
+    through the getter/setter functions.
+
+    \section1 The constructor
+
+    The constructor:
+    \snippet doc/src/snippets/code/doc_src_qdbusadaptors.qdoc 6
+
+    The constructor does the following:
+    \list
+    \o it initialises its base class (QDBusAbstractAdaptor) with the parent object it is related to.
+    \o it stores the app pointer in a member variable. Note that it would be possible to access the
+       same object using the QDBusAbstractAdaptor::object() function, but it would be necessary to
+       use \a static_cast<> to properly access the methods in QApplication that are not part of
+       QObject.
+    \o it connects the application's signal \a aboutToQuit to its own signal \a aboutToQuit.
+    \o it connects the application's signal \a focusChanged to a private slot to do some further
+       processing before emitting a D-Bus signal.
+    \endlist
+
+    Note that there is no destructor in the example. An eventual destructor could be used to emit
+    one last signal before the object is destroyed, for instance.
+
+    \section1 Slots/methods
+
+    The public slots in the example (which will be exported as D-Bus methods) are the following:
+    \snippet doc/src/snippets/code/doc_src_qdbusadaptors.qdoc 7
+
+    This snippet of code defines 4 methods with different properties each:
+    \list 1
+    \o \c quit: this method takes no parameters and is defined to be asynchronous. That is, callers
+      are expected to use "fire-and-forget" mechanism when calling this method, since it provides no
+      useful reply. This is represented in D-Bus by the use of the
+      org.freedesktop.DBus.Method.NoReply annotation. See \l Q_NOREPLY for more information on
+      asynchronous methods
+
+    \o \c reparseConfiguration: this simple method, with no input or output arguments simply relays
+      the call to the application's reparseConfiguration member function.
+
+    \o \c mainWindowObject: this method takes no input parameter, but returns one string output
+      argument, containing the path to the main window object (if the application has a main
+      window), or an empty string if it has no main window. Note that this method could have also
+      been written: void mainWindowObject(QString &path).
+
+    \o \c setSessionManagement: this method takes one input argument (a boolean) and, depending on
+      its value, it calls one function or another in the application.
+    \endlist
+
+    See also: \l Q_NOREPLY.
+
+    \section1 Signals
+
+    The signals in this example are defined as follows:
+    \snippet doc/src/snippets/code/doc_src_qdbusadaptors.qdoc 8
+
+    However, signal definition isn't enough: signals have to be emitted. One simple way of emitting
+    signals is to connect another signal to them, so that Qt's signal handling system chains them
+    automatically. This is what is done for the \a aboutToQuit signal.
+
+    When this is the case, one can use the QDBusAbstractAdaptor::setAutoRelaySignals to
+    automatically connect every signal from the real object to the adaptor.
+
+    When simple signal-to-signal connection isn't enough, one can use a private slot do do some
+    work. This is what was done for the mainWindowHasFocus signal:
+    \snippet doc/src/snippets/code/doc_src_qdbusadaptors.qdoc 9
+
+    This private slot (which will not be exported as a method via D-Bus) was connected to the
+    \c focusChanged signal in the adaptor's constructor. It is therefore able to shape the
+    application's signal into what the interface expects it to be.
+*/
+
+/*!
+    \page qdbusdeclaringslots.html
+    \title Declaring Slots in D-Bus Adaptors
+
+    Slots in D-Bus adaptors are declared just like normal, public slots, but their
+    parameters must follow certain rules (see \l{The QtDBus Type System} for more
+    information). Slots whose parameters do not follow those rules or that are not
+    public will not be accessible via D-Bus.
+
+    Slots can have one parameter of type \c{const QDBusMessage &}, which must
+    appear at the end of the input parameter list, before any output parameters.
+    This parameter, if present, will be initialized with a copy of the
+    current message being processed, which allows the callee to obtain
+    information about the caller, such as its connection name.
+
+    Slots can be of three kinds:
+    \list 1
+      \o Asynchronous
+      \o Input-only
+      \o Input-and-output
+    \endlist
+
+    \section1 Asynchronous Slots
+    Asynchronous slots are those that do not normally return any reply to the
+    caller. For that reason, they cannot take any output parameters. In most
+    cases, by the time the first line of the slot is run, the caller function
+    has already resumed working.
+
+    However, slots must not rely on that behavior. Scheduling and message-dispatching
+    issues could change the order in which the slot is run. Code intending to
+    synchronize with the caller should provide its own method of synchronization.
+
+    Asynchronous slots are marked by the keyword \l Q_NOREPLY in the method
+    signature, before the \c void return type and the slot name. (See the
+    \c quit() slot in the \l{D-Bus Adaptor Example}).
+
+    \section1 Input-Only Slots
+
+    Input-only slots are normal slots that take parameters passed by value or
+    by constant reference. However, unlike asynchronous slots, the caller is
+    usually waiting for completion of the callee before resuming operation.
+    Therefore, non-asynchronous slots should not block or should state it its
+    documentation that they may do so.
+
+    Input-only slots have no special marking in their signature, except that
+    they take only parameters passed by value or by constant reference.
+    Optionally, slots can take a QDBusMessage parameter as a last parameter,
+    which can be used to perform additional analysis of the method call message.
+
+    \section1 Input and Output Slots
+
+    Like input-only slots, input-and-output slots are those that the caller is
+    waiting for a reply. Unlike input-only ones, though, this reply will contain
+    data. Slots that output data may contain non-constant references and may
+    return a value as well. However, the output parameters must all appear at
+    the end of the argument list and may not have input arguments interleaved.
+    Optionally, a QDBusMessage argument may appear between the input and the
+    output arguments.
+
+    \section1 Automatic Replies
+
+    Method replies are generated automatically with the contents of the output
+    parameters (if there were any) by the QtDBus implementation. Slots need not
+    worry about constructing proper QDBusMessage objects and sending them over
+    the connection.
+
+    However, the possibility of doing so remains there. Should the slot find out
+    it needs to send a special reply or even an error, it can do so by using
+    QDBusMessage::createReply() or QDBusMessage::createErrorReply() on the
+    QDBusMessage parameter and send it with QDBusConnection::send(). The
+    QtDBus implementation will not generate any reply if the slot did so.
+
+    \warning When a caller places a method call and waits for a reply, it will
+    only wait for a limited amount of time. Slots intending to take a long time
+    to complete should make that fact clear in documentation so that callers
+    properly set higher timeouts.
+
+    \section1 Delayed Replies
+
+    In some circumstances, the called slot may not be able to process
+    the request immediately. This is frequently the case when the
+    request involves an I/O or networking operation which may block.
+
+    If this is the case, the slot should return control to the
+    application's main loop to avoid freezing the user interface, and
+    resume the process later. To accomplish this, it should make use
+    of the extra \c QDBusMessage parameter at the end of the input
+    parameter list and request a delayed reply.
+
+    We do this by writing a slot that stores the request data in a
+    persistent structure, indicating to the caller using
+    \l{QDBusMessage::setDelayedReply()}{QDBusMessage::setDelayedReply(true)}
+    that the response will be sent later.
+
+    \snippet doc/src/snippets/code/doc_src_qdbusadaptors.qdoc 10
+
+    The use of
+    \l{QDBusConnection::send()}{QDBusConnection::sessionBus().send(data->reply)}
+    is needed to explicitly inform the caller that the response will be delayed.
+    In this case, the return value is unimportant; we return an arbitrary value
+    to satisfy the compiler.
+
+    When the request is processed and a reply is available, it should be sent
+    using the \c QDBusMessage object that was obtained. In our example, the
+    reply code could be something as follows:
+
+    \snippet doc/src/snippets/code/doc_src_qdbusadaptors.qdoc 11
+
+    As can be seen in the example, when a delayed reply is in place,
+    the return value(s) from the slot will be ignored by QtDBus. They
+    are used only to determine the slot's signature when communicating
+    the adaptor's description to remote applications, or in case the
+    code in the slot decides not to use a delayed reply.
+
+    The delayed reply itself is requested from QtDBus by calling
+    QDBusMessage::reply() on the original message. It then becomes the
+    resposibility of the called code to eventually send a reply to the
+    caller.
+
+    \warning When a caller places a method call and waits for a reply, it will
+    only wait for a limited amount of time. Slots intending to take a long time
+    to complete should make that fact clear in documentation so that callers
+    properly set higher timeouts.
+
+    \sa {Using QtDBus Adaptors}, {Declaring Signals in D-Bus Adaptors},
+        {The QtDBus Type System}, QDBusConnection, QDBusMessage
+*/
+
+/*!
+    \page qdbusdeclaringsignals.html
+    \title Declaring Signals in D-Bus Adaptors
+
+    Any signal in a class derived from QDBusAbstractAdaptor will be automatically
+    relayed into D-Bus, provided that the signal's parameters conform to certain
+    rules (see \l{The QtDBus Type System} for more information). No special code
+    is necessary to make this relay.
+
+    However, signals must still be emitted. The easiest way to emit an adaptor
+    signal is to connect another signal to it, so that Qt's signals and slots
+    mechanism automatically emits the adaptor signal, too. This can be done in
+    the adaptor's constructor, as has been done in the
+    \l{D-Bus Adaptor Example}{D-Bus Adaptor example}.
+
+    The QDBusAbstractAdaptor::setAutoRelaySignals() convenience function can also
+    be used to make and break connections between signals in the real object and
+    the corresponding signals in the adaptor. It will inspect the list of signals
+    in both classes and connect those whose parameters match exactly.
+
+    \sa {Using QtDBus Adaptors},
+        {Declaring Slots in D-Bus Adaptors},
+        {The QtDBus Type System}, QDBusAbstractAdaptor
+*/
+
+/*!
+    \page qdbustypesystem.html
+    \title The QtDBus Type System
+
+    D-Bus has an extensible type system based on a few primitives and
+    composition of the primitives in arrays and structures. QtDBus
+    implements the interface to that type system through the
+    QDBusArgument class, allowing user programs to send and receive
+    practically every C++ type over the bus.
+
+    \section1 Primitive Types
+
+    The primitive types are supported natively by QDBusArgument and
+    need no special customization to be sent or received. They are
+    listed below, along with the C++ class they relate to:
+
+    \table
+      \header
+        \o Qt type
+        \o D-Bus equivalent type
+      \row
+        \o uchar
+        \o BYTE
+      \row
+        \o bool
+        \o BOOLEAN
+      \row
+        \o short
+        \o INT16
+      \row
+        \o ushort
+        \o UINT16
+      \row
+        \o int
+        \o INT32
+      \row
+        \o uint
+        \o UINT32
+      \row
+        \o qlonglong
+        \o INT64
+      \row
+        \o qulonglong
+        \o UINT64
+      \row
+        \o double
+        \o DOUBLE
+      \row
+        \o QString
+        \o STRING
+      \row
+        \o QDBusVariant
+        \o VARIANT
+      \row
+        \o QDBusObjectPath
+        \o OBJECT_PATH
+      \row
+        \o QDBusSignature
+        \o SIGNATURE
+    \endtable
+
+    Aside from the primitive types, QDBusArgument also supports two
+    non-primitive types natively, due to their widespread use in Qt
+    applications: QStringList and QByteArray.
+
+    \section1 Compound Types
+
+    D-Bus specifies three types of aggregations of primitive types
+    that allow one to create compound types. They are \c ARRAY, \c
+    STRUCT and maps/dictionaries.
+
+    Arrays are sets of zero or more elements of the same type, while
+    structures are a set of a fixed number of elements, each of any
+    type. Maps or dictionaries are implemented as arrays of a pair of
+    elements, so there can be zero or more elements in one map.
+
+    \section1 Extending the Type System
+
+    In order to use one's own type with QtDBus, the type has to be
+    declared as a Qt meta-type with the Q_DECLARE_METATYPE() macro and
+    registered with the qDBusRegisterMetaType() function. The
+    streaming operators \c{operator>>} and \c{operator<<} will be
+    automatically found by the registration system.
+
+    QtDBus provides template specializations for arrays and maps for
+    use with Qt's \l{Container classes}{container classes}, such as
+    QMap and QList, so it is not necessary to write the streaming
+    operator functions for those. For other types, and specially for
+    types implementing structures, the operators have to be explicitly
+    implemented.
+
+    See the documentation for QDBusArgument for examples for
+    structures, arrays and maps.
+
+    \section1 The Type System in Use
+
+    All of the QtDBus types (primitives and user-defined alike) can be
+    used to send and receive messages of all types over the bus.
+
+    \warning You may not use any type that is not on the list above,
+    including \a typedefs to the types listed. This also includes
+    QList<QVariant> and QMap<QString,QVariant>.
+*/
+
+/*!
+    \macro Q_NOREPLY
+    \relates QDBusAbstractAdaptor
+    \since 4.2
+
+    The Q_NOREPLY macro can be used to mark a method to be called and not wait for it to finish
+    processing before returning from QDBusInterface::call(). The called method cannot return any
+    output arguments and, if it does, any such arguments will be discarded.
+
+    You can use this macro in your own adaptors by placing it before your method's return value
+    (which must be "void") in the class declaration, as shown in the example:
+    \snippet doc/src/snippets/code/doc_src_qdbusadaptors.qdoc 12
+
+    Its presence in the method implementation (outside the class declaration) is optional.
+
+    \sa {Using QtDBus Adaptors}
+*/
diff --git a/doc/src/qdesktopwidget.qdoc b/doc/src/qdesktopwidget.qdoc
new file mode 100644
index 0000000000..0361aaec4e
--- /dev/null
+++ b/doc/src/qdesktopwidget.qdoc
@@ -0,0 +1,240 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class QDesktopWidget
+    \brief The QDesktopWidget class provides access to screen information on multi-head systems.
+
+    \ingroup advanced
+    \ingroup desktop
+    \ingroup environment
+    \mainclass
+
+    Systems with more than one graphics card and monitor can manage the
+    physical screen space available either as multiple desktops, or as a
+    large virtual desktop, which usually has the size of the bounding
+    rectangle of all the screens (see isVirtualDesktop()). For an
+    application, one of the available screens is the primary screen, i.e.
+    the screen where the main widget resides (see primaryScreen()). All
+    windows opened in the context of the application should be
+    constrained to the boundaries of the primary screen; for example,
+    it would be inconvenient if a dialog box popped up on a different
+    screen, or split over two screens.
+
+    The QDesktopWidget provides information about the geometry of the
+    available screens with screenGeometry(). The number of screens
+    available is returned by numScreens(). The screen number that a
+    particular point or widget is located in is returned by
+    screenNumber().
+
+    Widgets provided by Qt use this class, for example, to place
+    tooltips, menus and dialog boxes according to the parent or
+    application widget.
+
+    Applications can use this class to save window positions, or to place
+    child widgets on one screen.
+
+    \img qdesktopwidget.png Managing Multiple Screens
+
+    In the illustration above, Application One's primary screen is
+    screen 0, and App Two's primary screen is screen 1.
+
+    \target multiple screens note
+    \note QDesktopWidget inherits the QWidget properties, width() and
+    height(), which specify the size of the desktop. However, for
+    desktops with multiple screens, the size of the desktop is the union
+    of all the screen sizes, so width() and height() should \e not be
+    used for computing the size of a widget to be placed on one of the
+    screens. The correct width and height values are obtained using
+    availableGeometry() or screenGeometry() for a particular screen.
+
+    \sa QApplication, QX11Info::appRootWindow()
+*/
+
+/*!
+    \fn QDesktopWidget::QDesktopWidget()
+
+    Creates the desktop widget.
+
+    If the system supports a virtual desktop, this widget will have
+    the size of the virtual desktop; otherwise this widget will have
+    the size of the primary screen.
+
+    Instead of using QDesktopWidget directly, use QApplication::desktop().
+*/
+
+/*!
+    \fn QDesktopWidget::~QDesktopWidget()
+
+    Destroys the desktop widget and frees any allocated resources.
+*/
+
+/*!
+    \fn bool QDesktopWidget::isVirtualDesktop() const
+
+    Returns true if the system manages the available screens in a
+    virtual desktop; otherwise returns false.
+
+    For virtual desktops, screen() will always return the same widget.
+    The size of the virtual desktop is the size of this desktop
+    widget.
+*/
+
+/*!
+    \fn int QDesktopWidget::primaryScreen() const
+
+    Returns the index of the primary screen.
+
+    \sa numScreens()
+*/
+
+/*!
+    \fn int QDesktopWidget::numScreens() const
+
+    Returns the number of available screens.
+
+    \sa primaryScreen()
+*/
+
+/*!
+    \fn QWidget *QDesktopWidget::screen(int screen)
+
+    Returns a widget that represents the screen with index \a screen
+    (a value of -1 means the default screen).
+    
+
+    If the system uses a virtual desktop, the returned widget will
+    have the geometry of the entire virtual desktop; i.e., bounding
+    every \a screen.
+
+    \sa primaryScreen(), numScreens(), isVirtualDesktop()
+*/
+
+/*!
+    \fn const QRect QDesktopWidget::availableGeometry(int screen) const
+
+     Returns the available geometry of the screen with index \a screen. What
+     is available will be subrect of screenGeometry() based on what the
+     platform decides is available (for example excludes the dock and menu bar
+     on Mac OS X, or the task bar on Windows). The default screen is used if
+     \a screen is -1.
+
+     \sa screenNumber(), screenGeometry()
+*/
+
+/*!
+    \fn const QRect QDesktopWidget::availableGeometry(const QWidget *widget) const
+    \overload
+
+    Returns the available geometry of the screen which contains \a widget.
+
+    \sa screenGeometry()
+*/
+
+/*!
+    \fn const QRect QDesktopWidget::availableGeometry(const QPoint &p) const
+    \overload
+
+    Returns the available geometry of the screen which contains \a p.
+
+    \sa screenGeometry()
+*/
+
+
+/*!
+    \fn const QRect QDesktopWidget::screenGeometry(int screen) const
+
+    Returns the geometry of the screen with index \a screen. The default
+    screen is used if \a screen is -1.
+
+    \sa screenNumber()
+*/
+
+/*!
+    \fn const QRect QDesktopWidget::screenGeometry(const QWidget *widget) const
+    \overload
+
+    Returns the geometry of the screen which contains \a widget.
+*/
+
+/*!
+    \fn const QRect QDesktopWidget::screenGeometry(const QPoint &p) const
+    \overload
+
+    Returns the geometry of the screen which contains \a p.
+*/
+
+
+/*!
+    \fn int QDesktopWidget::screenNumber(const QWidget *widget) const
+
+    Returns the index of the screen that contains the largest
+    part of \a widget, or -1 if the widget not on a screen.
+
+    \sa primaryScreen()
+*/
+
+/*!
+    \fn int QDesktopWidget::screenNumber(const QPoint &point) const
+
+    \overload
+    Returns the index of the screen that contains the \a point, or the
+    screen which is the shortest distance from the \a point.
+
+    \sa primaryScreen()
+*/
+
+/*!
+    \fn void QDesktopWidget::resizeEvent(QResizeEvent *event)
+    \reimp
+*/
+
+/*!
+    \fn void QDesktopWidget::resized(int screen)
+
+    This signal is emitted when the size of \a screen changes.
+*/
+
+/*!
+    \fn void QDesktopWidget::workAreaResized(int screen)
+
+    This signal is emitted when the work area available on \a screen changes.
+*/
diff --git a/doc/src/qiterator.qdoc b/doc/src/qiterator.qdoc
new file mode 100644
index 0000000000..b1e95c6e0d
--- /dev/null
+++ b/doc/src/qiterator.qdoc
@@ -0,0 +1,1431 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \class QListIterator
+    \inmodule QtCore
+
+    \brief The QListIterator class provides a Java-style const iterator for QList and QQueue.
+
+    QList has both \l{Java-style iterators} and \l{STL-style
+    iterators}. The Java-style iterators are more high-level and
+    easier to use than the STL-style iterators; on the other hand,
+    they are slightly less efficient.
+
+    An alternative to using iterators is to use index positions. Most
+    QList member functions take an index as their first parameter,
+    making it possible to access, modify, and remove items without
+    using iterators.
+
+    QListIterator\<T\> allows you to iterate over a QList\<T\> (or a
+    QQueue\<T\>). If you want to modify the list as you iterate over
+    it, use QMutableListIterator\<T\> instead.
+
+    The QListIterator constructor takes a QList as argument. After
+    construction, the iterator is located at the very beginning of
+    the list (before the first item). Here's how to iterate over all
+    the elements sequentially:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 0
+
+    The next() function returns the next item in the list and
+    advances the iterator. Unlike STL-style iterators, Java-style
+    iterators point \e between items rather than directly \e at
+    items. The first call to next() advances the iterator to the
+    position between the first and second item, and returns the first
+    item; the second call to next() advances the iterator to the
+    position between the second and third item, and returns the second
+    item; and so on.
+
+    \img javaiterators1.png
+
+    Here's how to iterate over the elements in reverse order:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 1
+
+    If you want to find all occurrences of a particular value, use
+    findNext() or findPrevious() in a loop.
+
+    Multiple iterators can be used on the same list. If the list is
+    modified while a QListIterator is active, the QListIterator will
+    continue iterating over the original list, ignoring the modified
+    copy.
+
+    \sa QMutableListIterator, QList::const_iterator
+*/
+
+/*! 
+    \class QLinkedListIterator
+    \inmodule QtCore
+
+    \brief The QLinkedListIterator class provides a Java-style const iterator for QLinkedList.
+
+    QLinkedList has both \l{Java-style iterators} and
+    \l{STL-style iterators}. The Java-style iterators are more
+    high-level and easier to use than the STL-style iterators; on the
+    other hand, they are slightly less efficient.
+
+    QLinkedListIterator\<T\> allows you to iterate over a
+    QLinkedList\<T\>. If you want to modify the list as you iterate
+    over it, use QMutableLinkedListIterator\<T\> instead.
+
+    The QLinkedListIterator constructor takes a QLinkedList as
+    argument. After construction, the iterator is located at the very
+    beginning of the list (before the first item). Here's how to
+    iterate over all the elements sequentially:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 2
+
+    The next() function returns the next item in the list and
+    advances the iterator. Unlike STL-style iterators, Java-style
+    iterators point \e between items rather than directly \e at
+    items. The first call to next() advances the iterator to the
+    position between the first and second item, and returns the first
+    item; the second call to next() advances the iterator to the
+    position between the second and third item, and returns the second
+    item; and so on.
+
+    \img javaiterators1.png
+
+    Here's how to iterate over the elements in reverse order:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 3
+
+    If you want to find all occurrences of a particular value, use
+    findNext() or findPrevious() in a loop.
+
+    Multiple iterators can be used on the same list. If the list is
+    modified while a QLinkedListIterator is active, the
+    QLinkedListIterator will continue iterating over the original
+    list, ignoring the modified copy.
+
+    \sa QMutableLinkedListIterator, QLinkedList::const_iterator
+*/
+
+/*! 
+    \class QVectorIterator
+    \inmodule QtCore
+    \brief The QVectorIterator class provides a Java-style const iterator for QVector and QStack.
+
+    QVector has both \l{Java-style iterators} and \l{STL-style
+    iterators}. The Java-style iterators are more high-level and
+    easier to use than the STL-style iterators; on the other hand,
+    they are slightly less efficient.
+
+    An alternative to using iterators is to use index positions. Most
+    QVector member functions take an index as their first parameter,
+    making it possible to access, insert, and remove items without
+    using iterators.
+
+    QVectorIterator\<T\> allows you to iterate over a QVector\<T\>
+    (or a QStack\<T\>). If you want to modify the vector as you
+    iterate over it, use QMutableVectorIterator\<T\> instead.
+
+    The QVectorIterator constructor takes a QVector as argument.
+    After construction, the iterator is located at the very beginning
+    of the vector (before the first item). Here's how to iterate over
+    all the elements sequentially:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 4
+
+    The next() function returns the next item in the vector and
+    advances the iterator. Unlike STL-style iterators, Java-style
+    iterators point \e between items rather than directly \e at
+    items. The first call to next() advances the iterator to the
+    position between the first and second item, and returns the first
+    item; the second call to next() advances the iterator to the
+    position between the second and third item, returning the second
+    item; and so on.
+
+    \img javaiterators1.png
+
+    Here's how to iterate over the elements in reverse order:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 5
+
+    If you want to find all occurrences of a particular value, use
+    findNext() or findPrevious() in a loop.
+
+    Multiple iterators can be used on the same vector. If the vector
+    is modified while a QVectorIterator is active, the QVectorIterator
+    will continue iterating over the original vector, ignoring the
+    modified copy.
+
+    \sa QMutableVectorIterator, QVector::const_iterator
+*/
+
+/*! 
+    \class QSetIterator
+    \inmodule QtCore
+    \brief The QSetIterator class provides a Java-style const iterator for QSet.
+
+    QSet supports both \l{Java-style iterators} and \l{STL-style
+    iterators}. The Java-style iterators are more high-level and
+    easier to use than the STL-style iterators; on the other hand,
+    they are slightly less efficient.
+
+    QSetIterator\<T\> allows you to iterate over a QSet\<T\>. If you
+    want to modify the set as you iterate over it, use
+    QMutableSetIterator\<T\> instead.
+
+    The constructor takes a QSet as argument. After construction, the
+    iterator is located at the very beginning of the set (before
+    the first item). Here's how to iterate over all the elements
+    sequentially:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 6
+
+    The next() function returns the next item in the set and
+    advances the iterator. Unlike STL-style iterators, Java-style
+    iterators point \e between items rather than directly \e at
+    items. The first call to next() advances the iterator to the
+    position between the first and second item, and returns the first
+    item; the second call to next() advances the iterator to the
+    position between the second and third item, returning the second
+    item; and so on.
+
+    \img javaiterators1.png
+
+    Here's how to iterate over the elements in reverse order:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 7
+
+    If you want to find all occurrences of a particular value, use
+    findNext() or findPrevious() in a loop.
+
+    Multiple iterators can be used on the same set. If the set
+    is modified while a QSetIterator is active, the QSetIterator
+    will continue iterating over the original set, ignoring the
+    modified copy.
+
+    \sa QMutableSetIterator, QSet::const_iterator
+*/
+
+/*! 
+    \class QMutableListIterator
+    \inmodule QtCore
+
+    \brief The QMutableListIterator class provides a Java-style non-const iterator for QList and QQueue.
+
+    QList has both \l{Java-style iterators} and \l{STL-style
+    iterators}. The Java-style iterators are more high-level and
+    easier to use than the STL-style iterators; on the other hand,
+    they are slightly less efficient.
+
+    An alternative to using iterators is to use index positions. Most
+    QList member functions take an index as their first parameter,
+    making it possible to access, insert, and remove items without
+    using iterators.
+
+    QMutableListIterator\<T\> allows you to iterate over a QList\<T\>
+    (or a QQueue\<T\>) and modify the list. If you don't want to
+    modify the list (or have a const QList), use the slightly faster
+    QListIterator\<T\> instead.
+
+    The QMutableListIterator constructor takes a QList as argument.
+    After construction, the iterator is located at the very beginning
+    of the list (before the first item). Here's how to iterate over
+    all the elements sequentially:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 8
+
+    The next() function returns the next item in the list and
+    advances the iterator. Unlike STL-style iterators, Java-style
+    iterators point \e between items rather than directly \e at
+    items. The first call to next() advances the iterator to the
+    position between the first and second item, and returns the first
+    item; the second call to next() advances the iterator to the
+    position between the second and third item, returning the second
+    item; and so on.
+
+    \img javaiterators1.png
+
+    Here's how to iterate over the elements in reverse order:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 9
+
+    If you want to find all occurrences of a particular value, use
+    findNext() or findPrevious() in a loop.
+
+    If you want to remove items as you iterate over the list, use
+    remove(). If you want to modify the value of an item, use
+    setValue(). If you want to insert a new item in the list, use
+    insert().
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 10
+
+    The example traverses a list, replacing negative numbers with
+    their absolute values, and eliminating zeroes.
+
+    Only one mutable iterator can be active on a given list at any
+    time. Furthermore, no changes should be done directly to the list
+    while the iterator is active (as opposed to through the
+    iterator), since this could invalidate the iterator and lead to
+    undefined behavior.
+
+    \sa QListIterator, QList::iterator
+*/
+
+/*! 
+    \class QMutableLinkedListIterator
+    \inmodule QtCore
+
+    \brief The QMutableLinkedListIterator class provides a Java-style non-const iterator for QLinkedList.
+
+    QLinkedList has both \l{Java-style iterators} and
+    \l{STL-style iterators}. The Java-style iterators are more
+    high-level and easier to use than the STL-style iterators; on the
+    other hand, they are slightly less efficient.
+
+    QMutableLinkedListIterator\<T\> allows you to iterate over a
+    QLinkedList\<T\> and modify the list. If you don't want to modify
+    the list (or have a const QLinkedList), use the slightly faster
+    QLinkedListIterator\<T\> instead.
+
+    The QMutableLinkedListIterator constructor takes a QLinkedList as
+    argument. After construction, the iterator is located at the very
+    beginning of the list (before the first item). Here's how to
+    iterate over all the elements sequentially:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 11
+
+    The next() function returns the next item in the list and
+    advances the iterator. Unlike STL-style iterators, Java-style
+    iterators point \e between items rather than directly \e at
+    items. The first call to next() advances the iterator to the
+    position between the first and second item, and returns the first
+    item; the second call to next() advances the iterator to the
+    position between the second and third item, returning the second
+    item; and so on.
+
+    \img javaiterators1.png
+
+    Here's how to iterate over the elements in reverse order:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 12
+
+    If you want to find all occurrences of a particular value, use
+    findNext() or findPrevious() in a loop.
+
+    If you want to remove items as you iterate over the list, use
+    remove(). If you want to modify the value of an item, use
+    setValue(). If you want to insert a new item in the list, use
+    insert().
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 13
+
+    The example traverses a list, replacing negative numbers with
+    their absolute values, and eliminating zeroes.
+
+    Only one mutable iterator can be active on a given list at any
+    time. Furthermore, no changes should be done directly to the list
+    while the iterator is active (as opposed to through the
+    iterator), since this could invalidate the iterator and lead to
+    undefined behavior.
+
+    \sa QLinkedListIterator, QLinkedList::iterator
+*/
+
+/*! 
+    \class QMutableVectorIterator
+    \inmodule QtCore
+
+    \brief The QMutableVectorIterator class provides a Java-style non-const iterator for QVector and QStack.
+
+    QVector has both \l{Java-style iterators} and \l{STL-style
+    iterators}. The Java-style iterators are more high-level and
+    easier to use than the STL-style iterators; on the other hand,
+    they are slightly less efficient.
+
+    An alternative to using iterators is to use index positions. Most
+    QVector member functions take an index as their first parameter,
+    making it possible to access, insert, and remove items without
+    using iterators.
+
+    QMutableVectorIterator\<T\> allows you to iterate over a
+    QVector\<T\> and modify the vector. If you don't want to modify
+    the vector (or have a const QVector), use the slightly faster
+    QVectorIterator\<T\> instead.
+
+    The QMutableVectorIterator constructor takes a QVector as
+    argument. After construction, the iterator is located at the very
+    beginning of the list (before the first item). Here's how to
+    iterate over all the elements sequentially:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 14
+
+    The next() function returns the next item in the vector and
+    advances the iterator. Unlike STL-style iterators, Java-style
+    iterators point \e between items rather than directly \e at
+    items. The first call to next() advances the iterator to the
+    position between the first and second item, and returns the first
+    item; the second call to next() advances the iterator to the
+    position between the second and third item, returning the second
+    item; and so on.
+
+    \img javaiterators1.png
+
+    Here's how to iterate over the elements in reverse order:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 15
+
+    If you want to find all occurrences of a particular value, use
+    findNext() or findPrevious() in a loop.
+
+    If you want to remove items as you iterate over the vector, use
+    remove(). If you want to modify the value of an item, use
+    setValue(). If you want to insert a new item in the vector, use
+    insert().
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 16
+
+    The example traverses a vector, replacing negative numbers with
+    their absolute values, and eliminating zeroes.
+
+    Only one mutable iterator can be active on a given vector at any
+    time. Furthermore, no changes should be done directly to the
+    vector while the iterator is active (as opposed to through the
+    iterator), since this could invalidate the iterator and lead to
+    undefined behavior.
+
+    \sa QVectorIterator, QVector::iterator
+*/
+
+/*! 
+    \class QMutableSetIterator
+    \inmodule QtCore
+    \since 4.2
+
+    \brief The QMutableSetIterator class provides a Java-style non-const iterator for QSet.
+
+    QSet has both \l{Java-style iterators} and \l{STL-style
+    iterators}. The Java-style iterators are more high-level and
+    easier to use than the STL-style iterators; on the other hand,
+    they are slightly less efficient.
+
+    QMutableSetIterator\<T\> allows you to iterate over a QSet\<T\>
+    and remove items from the set as you iterate. If you don't want
+    to modify the set (or have a const QSet), use the slightly faster
+    QSetIterator\<T\> instead.
+
+    The QMutableSetIterator constructor takes a QSet as argument.
+    After construction, the iterator is located at the very beginning
+    of the set (before the first item). Here's how to iterate over
+    all the elements sequentially:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 17
+
+    The next() function returns the next item in the set and
+    advances the iterator. Unlike STL-style iterators, Java-style
+    iterators point \e between items rather than directly \e at
+    items. The first call to next() advances the iterator to the
+    position between the first and second item, and returns the first
+    item; the second call to next() advances the iterator to the
+    position between the second and third item, returning the second
+    item; and so on.
+
+    \img javaiterators1.png
+
+    Here's how to iterate over the elements in reverse order:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 18
+
+    If you want to remove items as you iterate over the set, use
+    remove().
+
+    Only one mutable iterator can be active on a given set at any
+    time. Furthermore, no changes should be done directly to the set
+    while the iterator is active (as opposed to through the
+    iterator), since this could invalidate the iterator and lead to
+    undefined behavior.
+
+    \sa QSetIterator, QSet::iterator
+*/
+
+/*!
+    \fn QListIterator::QListIterator(const QList<T> &list)
+    \fn QLinkedListIterator::QLinkedListIterator(const QLinkedList<T> &list)
+    \fn QMutableListIterator::QMutableListIterator(QList<T> &list)
+    \fn QMutableLinkedListIterator::QMutableLinkedListIterator(QLinkedList<T> &list)
+
+    Constructs an iterator for traversing \a list. The iterator is
+    set to be at the front of the list (before the first item).
+
+    \sa operator=()
+*/
+
+/*!
+    \fn QVectorIterator::QVectorIterator(const QVector<T> &vector)
+    \fn QMutableVectorIterator::QMutableVectorIterator(QVector<T> &vector)
+
+    Constructs an iterator for traversing \a vector. The iterator is
+    set to be at the front of the vector (before the first item).
+
+    \sa operator=()
+*/
+
+/*!
+    \fn QSetIterator::QSetIterator(const QSet<T> &set)
+    \fn QMutableSetIterator::QMutableSetIterator(QSet<T> &set)
+
+    Constructs an iterator for traversing \a set. The iterator is
+    set to be at the front of the set (before the first item).
+
+    \sa operator=()
+*/
+
+/*!
+    \fn QMutableListIterator::~QMutableListIterator()
+    \fn QMutableLinkedListIterator::~QMutableLinkedListIterator()
+    \fn QMutableVectorIterator::~QMutableVectorIterator()
+    \fn QMutableSetIterator::~QMutableSetIterator()
+
+    Destroys the iterator.
+
+    \sa operator=()
+*/
+
+/*! \fn QMutableListIterator &QMutableListIterator::operator=(QList<T> &list)
+    \fn QMutableLinkedListIterator &QMutableLinkedListIterator::operator=(QLinkedList<T> &list)
+    \fn QListIterator &QListIterator::operator=(const QList<T> &list)
+    \fn QLinkedListIterator &QLinkedListIterator::operator=(const QLinkedList<T> &list)
+
+    Makes the iterator operate on \a list. The iterator is set to be
+    at the front of the list (before the first item).
+
+    \sa toFront(), toBack()
+*/
+
+/*! \fn QVectorIterator &QVectorIterator::operator=(const QVector<T> &vector)
+    \fn QMutableVectorIterator &QMutableVectorIterator::operator=(QVector<T> &vector)
+
+    Makes the iterator operate on \a vector. The iterator is set to be
+    at the front of the vector (before the first item).
+
+    \sa toFront(), toBack()
+*/
+
+/*! \fn QSetIterator &QSetIterator::operator=(const QSet<T> &set)
+    \fn QMutableSetIterator &QMutableSetIterator::operator=(QSet<T> &set)
+
+    Makes the iterator operate on \a set. The iterator is set to be
+    at the front of the set (before the first item).
+
+    \sa toFront(), toBack()
+*/
+
+/*! \fn void QListIterator::toFront()
+    \fn void QLinkedListIterator::toFront()
+    \fn void QVectorIterator::toFront()
+    \fn void QSetIterator::toFront()
+    \fn void QMutableListIterator::toFront()
+    \fn void QMutableLinkedListIterator::toFront()
+    \fn void QMutableVectorIterator::toFront()
+    \fn void QMutableSetIterator::toFront()
+
+    Moves the iterator to the front of the container (before the
+    first item).
+
+    \sa toBack(), next()
+*/
+
+/*! \fn void QListIterator::toBack()
+    \fn void QLinkedListIterator::toBack()
+    \fn void QVectorIterator::toBack()
+    \fn void QSetIterator::toBack()
+    \fn void QMutableListIterator::toBack()
+    \fn void QMutableLinkedListIterator::toBack()
+    \fn void QMutableVectorIterator::toBack()
+    \fn void QMutableSetIterator::toBack()
+
+    Moves the iterator to the back of the container (after the last
+    item).
+
+    \sa toFront(), previous()
+*/
+
+/*! \fn bool QListIterator::hasNext() const
+    \fn bool QLinkedListIterator::hasNext() const
+    \fn bool QVectorIterator::hasNext() const
+    \fn bool QSetIterator::hasNext() const
+    \fn bool QMutableListIterator::hasNext() const
+    \fn bool QMutableLinkedListIterator::hasNext() const
+    \fn bool QMutableVectorIterator::hasNext() const
+    \fn bool QMutableSetIterator::hasNext() const
+
+    Returns true if there is at least one item ahead of the iterator,
+    i.e. the iterator is \e not at the back of the container;
+    otherwise returns false.
+
+    \sa hasPrevious(), next()
+*/
+
+/*! \fn const T &QListIterator::next()
+    \fn const T &QLinkedListIterator::next()
+    \fn const T &QVectorIterator::next()
+    \fn const T &QSetIterator::next()
+    \fn const T &QMutableSetIterator::next()
+
+    Returns the next item and advances the iterator by one position.
+
+    Calling this function on an iterator located at the back of the
+    container leads to undefined results.
+
+    \sa hasNext(), peekNext(), previous()
+*/
+
+/*! \fn T &QMutableListIterator::next()
+    \fn T &QMutableLinkedListIterator::next()
+    \fn T &QMutableVectorIterator::next()
+
+    Returns a reference to the next item, and advances the iterator
+    by one position.
+
+    Calling this function on an iterator located at the back of the
+    container leads to undefined results.
+
+    \sa hasNext(), peekNext(), previous()
+*/
+
+/*! \fn const T &QListIterator::peekNext() const
+    \fn const T &QLinkedListIterator::peekNext() const
+    \fn const T &QVectorIterator::peekNext() const
+    \fn const T &QSetIterator::peekNext() const
+    \fn const T &QMutableSetIterator::peekNext() const
+
+    Returns the next item without moving the iterator.
+
+    Calling this function on an iterator located at the back of the
+    container leads to undefined results.
+
+    \sa hasNext(), next(), peekPrevious()
+*/
+
+/*! \fn T &QMutableListIterator::peekNext() const
+    \fn T &QMutableLinkedListIterator::peekNext() const
+    \fn T &QMutableVectorIterator::peekNext() const
+
+    Returns a reference to the next item, without moving the iterator.
+
+    Calling this function on an iterator located at the back of the
+    container leads to undefined results.
+
+    \sa hasNext(), next(), peekPrevious()
+*/
+
+/*! \fn bool QListIterator::hasPrevious() const
+    \fn bool QLinkedListIterator::hasPrevious() const
+    \fn bool QVectorIterator::hasPrevious() const
+    \fn bool QSetIterator::hasPrevious() const
+    \fn bool QMutableListIterator::hasPrevious() const
+    \fn bool QMutableLinkedListIterator::hasPrevious() const
+    \fn bool QMutableVectorIterator::hasPrevious() const
+    \fn bool QMutableSetIterator::hasPrevious() const
+
+    Returns true if there is at least one item behind the iterator,
+    i.e. the iterator is \e not at the front of the container;
+    otherwise returns false.
+
+    \sa hasNext(), previous()
+*/
+
+/*! \fn const T &QListIterator::previous()
+    \fn const T &QLinkedListIterator::previous()
+    \fn const T &QVectorIterator::previous()
+    \fn const T &QSetIterator::previous()
+    \fn const T &QMutableSetIterator::previous()
+
+    Returns the previous item and moves the iterator back by one
+    position.
+
+    Calling this function on an iterator located at the front of the
+    container leads to undefined results.
+
+    \sa hasPrevious(), peekPrevious(), next()
+*/
+
+/*! \fn T &QMutableListIterator::previous()
+    \fn T &QMutableLinkedListIterator::previous()
+    \fn T &QMutableVectorIterator::previous()
+
+    Returns a reference to the previous item and moves the iterator
+    back by one position.
+
+    Calling this function on an iterator located at the front of the
+    container leads to undefined results.
+
+    \sa hasPrevious(), peekPrevious(), next()
+*/
+
+/*! \fn const T &QListIterator::peekPrevious() const
+    \fn const T &QLinkedListIterator::peekPrevious() const
+    \fn const T &QVectorIterator::peekPrevious() const
+    \fn const T &QSetIterator::peekPrevious() const
+    \fn const T &QMutableSetIterator::peekPrevious() const
+
+    Returns the previous item without moving the iterator.
+
+    Calling this function on an iterator located at the front of the
+    container leads to undefined results.
+
+    \sa hasPrevious(), previous(), peekNext()
+*/
+
+/*! \fn T &QMutableListIterator::peekPrevious() const
+    \fn T &QMutableLinkedListIterator::peekPrevious() const
+    \fn T &QMutableVectorIterator::peekPrevious() const
+
+    Returns a reference to the previous item, without moving the iterator.
+
+    Calling this function on an iterator located at the front of the
+    container leads to undefined results.
+
+    \sa hasPrevious(), previous(), peekNext()
+*/
+
+/*! \fn bool QListIterator::findNext(const T &value)
+    \fn bool QLinkedListIterator::findNext(const T &value)
+    \fn bool QVectorIterator::findNext(const T &value)
+    \fn bool QSetIterator::findNext(const T &value)
+    \fn bool QMutableListIterator::findNext(const T &value)
+    \fn bool QMutableLinkedListIterator::findNext(const T &value)
+    \fn bool QMutableVectorIterator::findNext(const T &value)
+    \fn bool QMutableSetIterator::findNext(const T &value)
+
+    Searches for \a value starting from the current iterator position
+    forward. Returns true if \a value is found; otherwise returns false.
+
+    After the call, if \a value was found, the iterator is positioned
+    just after the matching item; otherwise, the iterator is
+    positioned at the back of the container.
+
+    \sa findPrevious()
+*/
+
+/*! \fn bool QListIterator::findPrevious(const T &value)
+    \fn bool QLinkedListIterator::findPrevious(const T &value)
+    \fn bool QVectorIterator::findPrevious(const T &value)
+    \fn bool QSetIterator::findPrevious(const T &value)
+    \fn bool QMutableListIterator::findPrevious(const T &value)
+    \fn bool QMutableLinkedListIterator::findPrevious(const T &value)
+    \fn bool QMutableVectorIterator::findPrevious(const T &value)
+    \fn bool QMutableSetIterator::findPrevious(const T &value)
+
+    Searches for \a value starting from the current iterator position
+    backward. Returns true if \a value is found; otherwise returns
+    false.
+
+    After the call, if \a value was found, the iterator is positioned
+    just before the matching item; otherwise, the iterator is
+    positioned at the front of the container.
+
+    \sa findNext()
+*/
+
+/*! \fn void QMutableListIterator::remove()
+
+    Removes the last item that was jumped over using one of the
+    traversal functions (next(), previous(), findNext(), findPrevious()).
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 19
+
+    \sa insert(), setValue()
+*/
+
+/*! \fn void QMutableLinkedListIterator::remove()
+
+    Removes the last item that was jumped over using one of the
+    traversal functions (next(), previous(), findNext(), findPrevious()).
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 20
+
+    \sa insert(), setValue()
+*/
+
+/*! \fn void QMutableVectorIterator::remove()
+
+    Removes the last item that was jumped over using one of the
+    traversal functions (next(), previous(), findNext(), findPrevious()).
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 21
+
+    \sa insert(), setValue()
+*/
+
+/*! \fn void QMutableSetIterator::remove()
+
+    Removes the last item that was jumped over using one of the
+    traversal functions (next(), previous(), findNext(), findPrevious()).
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 22
+
+    \sa value()
+*/
+
+/*! \fn void QMutableListIterator::setValue(const T &value) const
+
+    Replaces the value of the last item that was jumped over using
+    one of the traversal functions with \a value.
+
+    The traversal functions are next(), previous(), findNext(), and
+    findPrevious().
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 23
+
+    \sa value(), remove(), insert()
+*/
+
+/*! \fn void QMutableLinkedListIterator::setValue(const T &value) const
+
+    Replaces the value of the last item that was jumped over using
+    one of the traversal functions with \a value.
+
+    The traversal functions are next(), previous(), findNext(), and
+    findPrevious().
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 24
+
+    \sa value(), remove(), insert()
+*/
+
+/*! \fn void QMutableVectorIterator::setValue(const T &value) const
+
+    Replaces the value of the last item that was jumped over using
+    one of the traversal functions with \a value.
+
+    The traversal functions are next(), previous(), findNext(), and
+    findPrevious().
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 25
+
+    \sa value(), remove(), insert()
+*/
+
+/*! \fn const T &QMutableListIterator::value() const
+    \fn const T &QMutableLinkedListIterator::value() const
+    \fn const T &QMutableVectorIterator::value() const
+    \fn const T &QMutableSetIterator::value() const
+
+    Returns the value of the last item that was jumped over using one
+    of the traversal functions (next(), previous(), findNext(),
+    findPrevious()).
+
+    After a call to next() or findNext(), value() is equivalent to
+    peekPrevious(). After a call to previous() or findPrevious(), value() is
+    equivalent to peekNext().
+*/
+
+/*!
+    \fn T &QMutableListIterator::value()
+    \fn T &QMutableLinkedListIterator::value()
+    \fn T &QMutableVectorIterator::value()
+    \overload
+
+    Returns a non-const reference to the value of the last item that
+    was jumped over using one of the traversal functions.
+*/
+
+/*! \fn void QMutableListIterator::insert(const T &value)
+    \fn void QMutableLinkedListIterator::insert(const T &value)
+    \fn void QMutableVectorIterator::insert(const T &value)
+
+    Inserts \a value at the current iterator position. After the
+    call, the iterator is located just after the inserted item.
+
+    \sa remove(), setValue()
+*/
+
+/*! 
+    \class QMapIterator
+    \inmodule QtCore
+
+    \brief The QMapIterator class provides a Java-style const iterator for QMap and QMultiMap.
+
+    QMap has both \l{Java-style iterators} and \l{STL-style
+    iterators}. The Java-style iterators are more high-level and
+    easier to use than the STL-style iterators; on the other hand,
+    they are slightly less efficient.
+
+    QMapIterator\<Key, T\> allows you to iterate over a QMap (or a
+    QMultiMap). If you want to modify the map as you iterate over
+    it, use QMutableMapIterator instead.
+
+    The QMapIterator constructor takes a QMap as argument. After
+    construction, the iterator is located at the very beginning of
+    the map (before the first item). Here's how to iterate over all
+    the elements sequentially:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 26
+
+    The next() function returns the next item in the map and
+    advances the iterator. The key() and value() functions return the
+    key and value of the last item that was jumped over.
+
+    Unlike STL-style iterators, Java-style iterators point \e between
+    items rather than directly \e at items. The first call to next()
+    advances the iterator to the position between the first and
+    second item, and returns the first item; the second call to
+    next() advances the iterator to the position between the second
+    and third item; and so on.
+
+    \img javaiterators1.png
+
+    Here's how to iterate over the elements in reverse order:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 27
+
+    If you want to find all occurrences of a particular value, use
+    findNext() or findPrevious() in a loop. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 28
+
+    Multiple iterators can be used on the same map. If the map is
+    modified while a QMapIterator is active, the QMapIterator will
+    continue iterating over the original map, ignoring the modified
+    copy.
+
+    \sa QMutableMapIterator, QMap::const_iterator
+*/
+
+/*! 
+    \class QHashIterator
+    \inmodule QtCore
+
+    \brief The QHashIterator class provides a Java-style const iterator for QHash and QMultiHash.
+
+    QHash has both \l{Java-style iterators} and \l{STL-style
+    iterators}. The Java-style iterators are more high-level and
+    easier to use than the STL-style iterators; on the other hand,
+    they are slightly less efficient.
+
+    QHashIterator\<Key, T\> allows you to iterate over a QHash (or a
+    QMultiHash). If you want to modify the hash as you iterate over
+    it, use QMutableHashIterator instead.
+
+    The QHashIterator constructor takes a QHash as argument. After
+    construction, the iterator is located at the very beginning of
+    the hash (before the first item). Here's how to iterate over all
+    the elements sequentially:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 29
+
+    The next() function returns the next item in the hash and
+    advances the iterator. The key() and value() functions return the
+    key and value of the last item that was jumped over.
+
+    Unlike STL-style iterators, Java-style iterators point \e between
+    items rather than directly \e at items. The first call to next()
+    advances the iterator to the position between the first and
+    second item, and returns the first item; the second call to
+    next() advances the iterator to the position between the second
+    and third item; and so on.
+
+    \img javaiterators1.png
+
+    Here's how to iterate over the elements in reverse order:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 30
+
+    If you want to find all occurrences of a particular value, use
+    findNext() or findPrevious() in a loop. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 31
+
+    Multiple iterators can be used on the same hash. If the hash is
+    modified while a QHashIterator is active, the QHashIterator will
+    continue iterating over the original hash, ignoring the modified
+    copy.
+
+    \sa QMutableHashIterator, QHash::const_iterator
+*/
+
+/*! 
+    \class QMutableMapIterator
+    \inmodule QtCore
+
+    \brief The QMutableMapIterator class provides a Java-style non-const iterator for QMap and QMultiMap.
+
+    QMap has both \l{Java-style iterators} and \l{STL-style
+    iterators}. The Java-style iterators are more high-level and
+    easier to use than the STL-style iterators; on the other hand,
+    they are slightly less efficient.
+
+    QMutableMapIterator\<Key, T\> allows you to iterate over a QMap
+    (or a QMultiMap) and modify the map. If you don't want to modify
+    the map (or have a const QMap), use the slightly faster
+    QMapIterator instead.
+
+    The QMutableMapIterator constructor takes a QMap as argument.
+    After construction, the iterator is located at the very beginning
+    of the map (before the first item). Here's how to iterate over
+    all the elements sequentially:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 32
+
+    The next() function returns the next item in the map and
+    advances the iterator. The key() and value() functions return the
+    key and value of the last item that was jumped over.
+
+    Unlike STL-style iterators, Java-style iterators point \e between
+    items rather than directly \e at items. The first call to next()
+    advances the iterator to the position between the first and
+    second item, and returns the first item; the second call to
+    next() advances the iterator to the position between the second
+    and third item; and so on.
+
+    \img javaiterators1.png
+
+    Here's how to iterate over the elements in reverse order:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 33
+
+    If you want to find all occurrences of a particular value, use
+    findNext() or findPrevious() in a loop. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 34
+
+    If you want to remove items as you iterate over the map, use
+    remove(). If you want to modify the value of an item, use
+    setValue().
+
+    Example:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 35
+
+    The example removes all (key, value) pairs where the key and the
+    value are the same.
+
+    Only one mutable iterator can be active on a given map at any
+    time. Furthermore, no changes should be done directly to the map
+    while the iterator is active (as opposed to through the
+    iterator), since this could invalidate the iterator and lead to
+    undefined behavior.
+
+    \sa QMapIterator, QMap::iterator
+*/
+
+/*! 
+    \class QMutableHashIterator
+    \inmodule QtCore
+
+    \brief The QMutableHashIterator class provides a Java-style non-const iterator for QHash and QMultiHash.
+
+    QHash has both \l{Java-style iterators} and \l{STL-style
+    iterators}. The Java-style iterators are more high-level and
+    easier to use than the STL-style iterators; on the other hand,
+    they are slightly less efficient.
+
+    QMutableHashIterator\<Key, T\> allows you to iterate over a QHash
+    (or a QMultiHash) and modify the hash. If you don't want to modify
+    the hash (or have a const QHash), use the slightly faster
+    QHashIterator instead.
+
+    The QMutableHashIterator constructor takes a QHash as argument.
+    After construction, the iterator is located at the very beginning
+    of the hash (before the first item). Here's how to iterate over
+    all the elements sequentially:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 36
+
+    The next() function returns the next item in the hash and
+    advances the iterator. The key() and value() functions return the
+    key and value of the last item that was jumped over.
+
+    Unlike STL-style iterators, Java-style iterators point \e between
+    items rather than directly \e at items. The first call to next()
+    advances the iterator to the position between the first and
+    second item, and returns the first item; the second call to
+    next() advances the iterator to the position between the second
+    and third item; and so on.
+
+    \img javaiterators1.png
+
+    Here's how to iterate over the elements in reverse order:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 37
+
+    If you want to find all occurrences of a particular value, use
+    findNext() or findPrevious() in a loop. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 38
+
+    If you want to remove items as you iterate over the hash, use
+    remove(). If you want to modify the value of an item, use
+    setValue().
+
+    Example:
+
+    \snippet doc/src/snippets/code/doc_src_qiterator.qdoc 39
+
+    The example removes all (key, value) pairs where the key and the
+    value are the same.
+
+    Only one mutable iterator can be active on a given hash at any
+    time. Furthermore, no changes should be done directly to the hash
+    while the iterator is active (as opposed to through the
+    iterator), since this could invalidate the iterator and lead to
+    undefined behavior.
+
+    \sa QHashIterator, QHash::iterator
+*/
+
+/*! \fn QMapIterator::QMapIterator(const QMap<Key, T> &map)
+    \fn QMutableMapIterator::QMutableMapIterator(QMap<Key, T> &map)
+
+    Constructs an iterator for traversing \a map. The iterator is set
+    to be at the front of the map (before the first item).
+
+    \sa operator=()
+*/
+
+/*! \fn QHashIterator::QHashIterator(const QHash<Key, T> &hash)
+    \fn QMutableHashIterator::QMutableHashIterator(QHash<Key, T> &hash)
+
+    Constructs an iterator for traversing \a hash. The iterator is
+    set to be at the front of the hash (before the first item).
+
+    \sa operator=()
+*/
+
+/*!
+    \fn QMutableMapIterator::~QMutableMapIterator()
+    \fn QMutableHashIterator::~QMutableHashIterator()
+
+    Destroys the iterator.
+
+    \sa operator=()
+*/
+
+/*! \fn QMapIterator &QMapIterator::operator=(const QMap<Key, T> &map)
+    \fn QMutableMapIterator &QMutableMapIterator::operator=(QMap<Key, T> &map)
+
+    Makes the iterator operate on \a map. The iterator is set to be
+    at the front of the map (before the first item).
+
+    \sa toFront(), toBack()
+*/
+
+/*! \fn QHashIterator &QHashIterator::operator=(const QHash<Key, T> &hash)
+    \fn QMutableHashIterator &QMutableHashIterator::operator=(QHash<Key, T> &hash)
+
+    Makes the iterator operate on \a hash. The iterator is set to be
+    at the front of the hash (before the first item).
+
+    \sa toFront(), toBack()
+*/
+
+/*! \fn void QMapIterator::toFront()
+    \fn void QHashIterator::toFront()
+    \fn void QMutableMapIterator::toFront()
+    \fn void QMutableHashIterator::toFront()
+
+    Moves the iterator to the front of the container (before the
+    first item).
+
+    \sa toBack(), next()
+*/
+
+/*! \fn void QMapIterator::toBack()
+    \fn void QHashIterator::toBack()
+    \fn void QMutableMapIterator::toBack()
+    \fn void QMutableHashIterator::toBack()
+
+    Moves the iterator to the back of the container (after the last
+    item).
+
+    \sa toFront(), previous()
+*/
+
+/*! \fn bool QMapIterator::hasNext() const
+    \fn bool QHashIterator::hasNext() const
+    \fn bool QMutableMapIterator::hasNext() const
+    \fn bool QMutableHashIterator::hasNext() const
+
+    Returns true if there is at least one item ahead of the iterator,
+    i.e. the iterator is \e not at the back of the container;
+    otherwise returns false.
+
+    \sa hasPrevious(), next()
+*/
+
+/*! \fn QMapIterator::Item QMapIterator::next()
+    \fn QHashIterator::Item QHashIterator::next()
+
+    Returns the next item and advances the iterator by one position.
+
+    Call key() on the return value to obtain the item's key, and
+    value() to obtain the value.
+
+    Calling this function on an iterator located at the back of the
+    container leads to undefined results.
+
+    \sa hasNext(), peekNext(), previous()
+*/
+
+/*! \fn QMutableMapIterator::Item QMutableMapIterator::next()
+    \fn QMutableHashIterator::Item QMutableHashIterator::next()
+
+    Returns the next item and advances the iterator by one position.
+
+    Call key() on the return value to obtain the item's key, and
+    value() to obtain the value.
+
+    Calling this function on an iterator located at the back of the
+    container leads to undefined results.
+
+    \sa hasNext(), peekNext(), previous()
+*/
+
+/*! \fn QMapIterator::Item QMapIterator::peekNext() const
+    \fn QHashIterator::Item QHashIterator::peekNext() const
+
+    Returns the next item without moving the iterator.
+
+    Call key() on the return value to obtain the item's key, and
+    value() to obtain the value.
+
+    Calling this function on an iterator located at the back of the
+    container leads to undefined results.
+
+    \sa hasNext(), next(), peekPrevious()
+*/
+
+/*! \fn QMutableMapIterator::Item QMutableMapIterator::peekNext() const
+    \fn QMutableHashIterator::Item QMutableHashIterator::peekNext() const
+
+    Returns a reference to the next item without moving the iterator.
+
+    Call key() on the return value to obtain the item's key, and
+    value() to obtain the value.
+
+    Calling this function on an iterator located at the back of the
+    container leads to undefined results.
+
+    \sa hasNext(), next(), peekPrevious()
+*/
+
+/*! \fn bool QMapIterator::hasPrevious() const
+    \fn bool QHashIterator::hasPrevious() const
+    \fn bool QMutableMapIterator::hasPrevious() const
+    \fn bool QMutableHashIterator::hasPrevious() const
+
+    Returns true if there is at least one item behind the iterator,
+    i.e. the iterator is \e not at the front of the container;
+    otherwise returns false.
+
+    \sa hasNext(), previous()
+*/
+
+/*! \fn QMapIterator::Item QMapIterator::previous()
+    \fn QHashIterator::Item QHashIterator::previous()
+
+    Returns the previous item and moves the iterator back by one
+    position.
+
+    Call key() on the return value to obtain the item's key, and
+    value() to obtain the value.
+
+    Calling this function on an iterator located at the front of the
+    container leads to undefined results.
+
+    \sa hasPrevious(), peekPrevious(), next()
+*/
+
+/*! \fn QMutableMapIterator::Item QMutableMapIterator::previous()
+    \fn QMutableHashIterator::Item QMutableHashIterator::previous()
+
+    Returns the previous item and moves the iterator back by one
+    position.
+
+    Call key() on the return value to obtain the item's key, and
+    value() to obtain the value.
+
+    Calling this function on an iterator located at the front of the
+    container leads to undefined results.
+
+    \sa hasPrevious(), peekPrevious(), next()
+*/
+
+/*! \fn QMapIterator::Item QMapIterator::peekPrevious() const
+    \fn QHashIterator::Item QHashIterator::peekPrevious() const
+
+    Returns the previous item without moving the iterator.
+
+    Call key() on the return value to obtain the item's key, and
+    value() to obtain the value.
+
+    Calling this function on an iterator located at the front of the
+    container leads to undefined results.
+
+    \sa hasPrevious(), previous(), peekNext()
+*/
+
+/*! \fn QMutableMapIterator::Item QMutableMapIterator::peekPrevious() const
+    \fn QMutableHashIterator::Item QMutableHashIterator::peekPrevious() const
+
+    Returns the previous item without moving the iterator.
+
+    Call key() on the return value to obtain the item's key, and
+    value() to obtain the value.
+
+    Calling this function on an iterator located at the front of the
+    container leads to undefined results.
+
+    \sa hasPrevious(), previous(), peekNext()
+*/
+
+/*! \fn const T &QMapIterator::value() const
+    \fn const T &QHashIterator::value() const
+
+    Returns the value of the last item that was jumped over using one
+    of the traversal functions (next(), previous(), findNext(),
+    findPrevious()).
+
+    After a call to next() or findNext(), value() is
+    equivalent to peekPrevious().value(). After a call to previous()
+    or findPrevious(), value() is equivalent to peekNext().value().
+
+    \sa key()
+*/
+
+/*!
+    \fn const T &QMutableMapIterator::value() const
+    \fn const T &QMutableHashIterator::value() const
+
+    Returns the value of the last item that was jumped over using one
+    of the traversal functions (next(), previous(), findNext(),
+    findPrevious()).
+
+    After a call to next() or findNext(), value() is
+    equivalent to peekPrevious().value(). After a call to previous()
+    or findPrevious(), value() is equivalent to peekNext().value().
+
+    \sa key(), setValue()
+*/
+
+/*!
+    \fn T &QMutableMapIterator::value()
+    \fn T &QMutableHashIterator::value()
+    \overload
+
+    Returns a non-const reference to the value of
+    the last item that was jumped over using one
+    of the traversal functions.
+*/
+
+/*! \fn const Key &QMapIterator::key() const
+    \fn const Key &QHashIterator::key() const
+    \fn const Key &QMutableMapIterator::key() const
+    \fn const Key &QMutableHashIterator::key() const
+
+    Returns the key of the last item that was jumped over using one
+    of the traversal functions (next(), previous(), findNext(),
+    findPrevious()).
+
+    After a call to next() or findNext(), key() is
+    equivalent to peekPrevious().key(). After a call to previous() or
+    findPrevious(), key() is equivalent to peekNext().key().
+
+    \sa value()
+*/
+
+/*! \fn bool QMapIterator::findNext(const T &value)
+    \fn bool QHashIterator::findNext(const T &value)
+    \fn bool QMutableMapIterator::findNext(const T &value)
+    \fn bool QMutableHashIterator::findNext(const T &value)
+
+    Searches for \a value starting from the current iterator position
+    forward. Returns true if a (key, value) pair with value \a value
+    is found; otherwise returns false.
+
+    After the call, if \a value was found, the iterator is positioned
+    just after the matching item; otherwise, the iterator is
+    positioned at the back of the container.
+
+    \sa findPrevious()
+*/
+
+/*! \fn bool QMapIterator::findPrevious(const T &value)
+    \fn bool QHashIterator::findPrevious(const T &value)
+    \fn bool QMutableMapIterator::findPrevious(const T &value)
+    \fn bool QMutableHashIterator::findPrevious(const T &value)
+
+    Searches for \a value starting from the current iterator position
+    backward. Returns true if a (key, value) pair with value \a value
+    is found; otherwise returns false.
+
+    After the call, if \a value was found, the iterator is positioned
+    just before the matching item; otherwise, the iterator is
+    positioned at the front of the container.
+
+    \sa findNext()
+*/
+
+/*! \fn void QMutableMapIterator::remove()
+    \fn void QMutableHashIterator::remove()
+
+    Removes the last item that was jumped over using one of the
+    traversal functions (next(), previous(), findNext(), findPrevious()).
+
+    \sa setValue()
+*/
+
+/*! \fn void QMutableMapIterator::setValue(const T &value)
+    \fn void QMutableHashIterator::setValue(const T &value)
+
+    Replaces the value of the last item that was jumped over using
+    one of the traversal functions with \a value.
+
+    The traversal functions are next(), previous(), findNext(), and
+    findPrevious().
+
+    \sa key(), value(), remove()
+*/
diff --git a/doc/src/qmake-manual.qdoc b/doc/src/qmake-manual.qdoc
new file mode 100644
index 0000000000..30da8c615c
--- /dev/null
+++ b/doc/src/qmake-manual.qdoc
@@ -0,0 +1,4175 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qmake-manual.html
+    \title qmake Manual
+    \startpage {index.html}{Qt Reference Documentation}
+    \nextpage qmake Tutorial
+
+    \ingroup buildsystem
+    \ingroup qttools
+    \keyword qmake
+
+    \c qmake is a tool that helps simplify the build
+    process for development project across different platforms.  \c qmake
+    automates the generation of Makefiles so that only a few lines of
+    information are needed to create each Makefile. \c qmake can be used for
+    any software project, whether it is written in Qt or not.
+
+    \c qmake generates a Makefile based on the information in a project
+    file.  Project files are created by the developer, and are usually
+    simple, but more sophisticated project files can be created for
+    complex projects.
+    \c qmake contains additional features to support development with Qt,
+    automatically including build rules for \l{moc.html}{moc}
+    and \l{uic.html}{uic}.
+    \c qmake can also generate projects for Microsoft Visual studio
+    without requiring the developer to change the project file.
+
+    \section1 Getting Started
+
+    The \l{qmake Tutorial} and guide to \l{qmake Common Projects} provide overviews
+    that aim to help new users get started with \c qmake.
+
+    \list
+    \o \l{qmake Tutorial}
+      \tableofcontents{1 qmake Tutorial}
+    \endlist
+
+    \list
+    \o \l{qmake Common Projects}
+      \tableofcontents{1 qmake Common Projects}
+    \endlist
+
+    \section1 Table of Contents
+
+    \list
+    \o \l{Using qmake}
+      \tableofcontents{1 Using qmake}
+    \o \l{qmake Project Files}
+      \tableofcontents{1 qmake Project Files}
+    \o \l{Running qmake}
+      \tableofcontents{1 Running qmake}
+    \o \l{qmake Platform Notes}
+      \tableofcontents{1 qmake Platform Notes}
+    \o \l{qmake Advanced Usage}
+      \tableofcontents{1 qmake Advanced Usage}
+    \o \l{Using Precompiled Headers}
+      \tableofcontents{1 Using Precompiled Headers}
+    \o \l{qmake Reference}
+      \tableofcontents{1 qmake Reference}
+    \o \l{qmake Variable Reference}
+      \tableofcontents{1 qmake Variable Reference}
+    \o \l{qmake Function Reference}
+      \tableofcontents{1 qmake Function Reference}
+    \o \l{Configuring qmake's Environment}
+      \tableofcontents{1 Configuring qmake's Environment}
+    \endlist
+*/
+
+/*!
+    \page qmake-using.html
+    \title Using qmake
+    \contentspage {qmake Manual}{Contents}
+    \previouspage qmake Manual
+    \nextpage qmake Project Files
+
+    \c qmake provides a project-oriented system for managing the build
+    process for applications, libraries, and other components. This
+    approach gives developers control over the source files used, and
+    allows each of the steps in the process to be described concisely,
+    typically within a single file. \c qmake expands the information in
+    each project file to a Makefile that executes the necessary commands
+    for compiling and linking.
+
+    In this document, we provide a basic introduction to project files,
+    describe some of the main features of \c qmake, and show how to use
+    \c qmake on the command line.
+
+    \section1 Describing a Project
+
+    Projects are described by the contents of project (\c .pro) files.
+    The information within these is used by \c qmake to generate a Makefile
+    containing all the commands that are needed to build each project.
+    Project files typically contain a list of source and header files,
+    general configuration information, and any application-specific details,
+    such as a list of extra libraries to link against, or a list of extra
+    include paths to use.
+
+    Project files can contain a number of different elements, including
+    comments, variable declarations, built-in functions, and some simple
+    control structures. In most simple projects, it is only necessary
+    to declare the source and header files that are used to build the
+    project with some basic configuration options.
+
+    Complete examples of project files can be found in the
+    \l{qmake Tutorial}.
+    An introduction to project files can be found in the
+    \l{qmake Project Files} chapter, and a more detailed description is
+    available in the \l{qmake Reference}.
+
+    \section1 Building a Project
+
+    For simple projects, you only need to run \c qmake in the top
+    level directory of your project. By default, \c qmake generates a
+    Makefile that you then use to build the project, and you can then
+    run your platform's \c make tool to build the project.
+
+    \c qmake can also be used to generate project files. A full
+    description of \c{qmake}'s command line options can be found in the
+    \l{Running qmake} chapter of this manual.
+
+    \section1 Using Precompiled Headers
+
+    In large projects, it is possible to take advantage of precompiled
+    header files to speed up the build process. This feature is described
+    in detail in the \l{Using Precompiled Headers} chapter.
+*/
+
+/*!
+    \page qmake-project-files.html
+    \title qmake Project Files
+    \contentspage {qmake Manual}{Contents}
+    \previouspage Using qmake
+    \nextpage Running qmake
+
+    Project files contain all the information required by \c qmake to build
+    your application, library, or plugin. The resources used by your project
+    are generally specified using a series of declarations, but support for
+    simple programming constructs allow you to describe different build
+    processes for different platforms and environments.
+
+    \tableofcontents
+
+    \section1 Project File Elements
+
+    The project file format used by \c qmake can be used to support both
+    simple and fairly complex build systems. Simple project files will
+    use a straightforward declarative style, defining standard variables
+    to indicate the source and header files that are used in the project.
+    Complex projects may use the control flow structures to fine-tune the
+    build process.
+
+    The following sections describe the different types of elements used
+    in project files.
+
+    \section2 Variables
+
+    In a project file, variables are used to hold lists of strings.
+    In the simplest projects, these variables inform \c qmake about the
+    configuration options to use, or supply filenames and paths to use
+    in the build process.
+
+    \c qmake looks for certain variables in each project file, and it
+    uses the contents of these to determine what it should write to a
+    Makefile. For example, the list of values in the \c HEADERS and
+    \c SOURCES variables are used to tell \c qmake about header and
+    source files in the same directory as the project file.
+
+    Variables can also be used internally to store temporary lists of values,
+    and existing lists of values can be overwritten or extended with new
+    values.
+
+    The following lines show how lists of values are assigned to variables:
+
+    \snippet doc/src/snippets/qmake/variables.pro 0
+
+    Note that the first assignment only includes values that are specified on
+    the same line as the \c SOURCES variable. The second assignment splits
+    the items across lines by using the \c \\ character.
+
+    The list of values in a variable is extended in the following way:
+
+    \snippet doc/src/snippets/qmake/variables.pro 1
+
+    The \c CONFIG variable is another special variable that \c qmake
+    uses when generating a Makefile. It is discussed in the section on
+    \l{#GeneralConfiguration}{general configuration} later in this chapter.
+    In the above line, \c qt is added to the list of existing values
+    contained in \c CONFIG.
+
+    The following table lists the variables that \c qmake recognizes, and
+    describes what they should contain.
+
+    \table
+    \header \o Variable \o Contents
+    \row \o CONFIG    \o General project configuration options.
+    \row \o DESTDIR   \o The directory in which the executable or binary file will
+                      be placed.
+    \row \o FORMS     \o A list of .ui files to be processed by \c uic.
+    \row \o HEADERS   \o A list of filenames of header (.h) files used when
+                      building the project.
+    \row \o QT        \o Qt-specific configuration options.
+    \row \o RESOURCES \o A list of resource (.rc) files to be included in the
+                      final project. See the \l{The Qt Resource System} for
+                      more information about these files.
+    \row \o SOURCES   \o A list of source code files to be used when building
+                      the project.
+    \row \o TEMPLATE  \o The template to use for the project. This determines
+                      whether the output of the build process will be an
+                      application, a library, or a plugin.
+    \endtable
+
+    The contents of a variable can be read by prepending the variable name with
+    \c $$. This can be used to assign the contents of one variable to another:
+
+    \snippet doc/src/snippets/qmake/dereferencing.pro 0
+
+    The \c $$ operator is used extensively with built-in functions that operate
+    on strings and lists of values. These are described in the chapter on
+    \l{qmake Advanced Usage}.
+
+    Normally, variables are used to contain whitespace-separated lists
+    of values. However, it is sometimes necessary to specify values containing
+    spaces. These must be quoted in the following way:
+
+    \snippet doc/src/snippets/qmake/quoting.pro 0
+
+    The quoted text is treated as a single item in the list of values held by
+    the variable.
+
+    \section2 Comments
+
+    You can add comments to project files. Comments begin with the \c
+    # character and continue to the end of the same line. For example:
+
+    \snippet doc/src/snippets/qmake/comments.pro 0
+
+    To include the \c # character in variable assignments, it is necessary
+    to use the contents of the built-in \c LITERAL_HASH variable. See the
+    \l{qmake Variable Reference#LITERAL_HASH}{variable reference} for more
+    information.
+
+    \section2 Built-in Functions and Control Flow
+
+    \c qmake provides a number of built-in functions to allow the contents
+    of variables to be processed. The most commonly used function in simple
+    project files is the \c include function which takes a filename as an
+    argument. The contents of the given file are included in the project
+    file at the place where the \c include function is used.
+    The \c include function is most commonly used to include other project
+    files:
+
+    \snippet doc/src/snippets/qmake/include.pro 0
+
+    Support for conditional structures is made available via
+    \l{qmake Advanced Usage#scopes}{scopes} that behave like \c if
+    statements in programming languages:
+
+    \snippet doc/src/snippets/qmake/scopes.pro 0
+
+    The assignments inside the braces are only made if the condition is
+    true. In this case, the special \c win32 variable must be set; this
+    happens automatically on Windows, but this can also be specified on
+    other platforms by running \c qmake with the \c{-win32} command line
+    option (see \l{Running qmake} for more information). The opening
+    brace must stand on the same line as the condition.
+
+    Simple loops are constructed by iterating over lists of values using
+    the built-in \c for function. The following code adds directories
+    to the \l{qmake Variable Reference#SUBDIRS}{SUBDIRS} variable, but
+    only if they exist:
+
+    \snippet doc/src/snippets/qmake/functions.pro 0
+
+    More complex operations on variables that would usually require loops
+    are provided by built-in functions such as \c find, \c unique, and
+    \c count. These functions, and many others are provided to manipulate
+    strings and paths, support user input, and call external tools. A list
+    of the functions available can be found in the
+    \l{qmake Advanced Usage} chapter of this manual.
+
+    \section1 Project Templates
+
+    The \c TEMPLATE variable is used to define the type of project that will
+    be built. If this is not declared in the project file, \c qmake assumes
+    that an application should be built, and will generate an appropriate
+    Makefile (or equivalent file) for the purpose.
+
+    The types of project available are listed in the following table with
+    information about the files that \c qmake will generate for each of them:
+
+    \table
+    \header \o Template      \o Description of \c qmake output
+    \row    \o app (default) \o Creates a Makefile to build an application.
+    \row    \o lib           \o Creates a Makefile to build a library.
+    \row    \o subdirs       \o Creates a Makefile containing rules for the
+    subdirectories specified using the \l{qmake Variable Reference#SUBDIRS}{SUBDIRS}
+    variable. Each subdirectory must contain its own project file.
+    \row    \o vcapp         \o Creates a Visual Studio Project file to build
+                             an application.
+    \row    \o vclib         \o Creates a Visual Studio Project file to build a library.
+    \endtable
+
+    See the \l{qmake Tutorial} for advice on writing project files for
+    projects that use the \c app and \c lib templates.
+
+    When the \c subdirs template is used, \c qmake generates a Makefile
+    to examine each specified subdirectory, process any project file it finds
+    there, and run the platform's \c make tool on the newly-created Makefile.
+    The \l{qmake Variable Reference#SUBDIRS}{SUBDIRS} variable is used to
+    contain a list of all the subdirectories to be processed.
+
+    \target GeneralConfiguration
+    \section1 General Configuration
+
+    The \l{qmake Variable Reference#CONFIG}{CONFIG variable} specifies the
+    options and features that the compiler should use and the libraries that
+    should be linked against. Anything can be added to the \c CONFIG variable,
+    but the options covered below are recognized by \c qmake internally.
+
+    The following options control the compiler flags that are used to build the
+    project:
+
+    \table
+    \header \o Option   \o Description
+    \row    \o release  \o The project is to be built in release mode.
+            This is ignored if \c debug is also specified.
+    \row    \o debug    \o The project is to be built in debug mode.
+    \row    \o debug_and_release \o The project is built in \e both debug and
+            release modes.
+    \row    \o build_all \o If \c debug_and_release is specified, the project is
+            built in both debug and release modes by default.
+    \row    \o ordered  \o When using the \c subdirs template, this option
+            specifies that the directories listed should be processed in the
+            order in which they are given.
+    \row    \o warn_on  \o The compiler should output as many warnings as possible.
+            This is ignored if \c warn_off is specified.
+    \row    \o warn_off \o The compiler should output as few warnings as possible.
+    \endtable
+
+    The \c debug_and_release option is special in that it enables \e both debug and
+    release versions of a project to be built. In such a case, the Makefile that
+    \c qmake generates includes a rule that builds both versions, and this can be
+    invoked in the following way:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 0
+
+    Adding the \c build_all option to the \c CONFIG variable makes this rule
+    the default when building the project, and installation targets will be
+    created for both debug and release builds.
+
+    Note that each of the options specified in the \c CONFIG variable can also be
+    used as a scope condition.
+    You can test for the presence of certain configuration options by using the
+    built-in \l{qmake Function Reference#CONFIG(config)}{CONFIG()} function.
+    For example, the following lines show the function as the condition in a scope
+    to test whether only the \c opengl option is in use:
+
+    \snippet doc/src/snippets/qmake/configscopes.pro 4
+    \snippet doc/src/snippets/qmake/configscopes.pro 5
+
+    This enables different configurations to be defined for \c release and
+    \c debug builds, and is described in more detail in the
+    \l{qmake Advanced Usage#Scopes}{Scopes} section of the
+    \l{qmake Advanced Usage}{Advanced Usage} chapter of this manual.
+
+    The following options define the type of project to be built. Note that some
+    of these options only take effect when used on the relevant platform. On other
+    platforms, they have no effect.
+
+    \table
+    \header \o Option \o Description
+    \row    \o qt     \o The project is a Qt application and should link against the Qt
+                      library. You can use the \c QT variable to control any additional
+                      Qt modules that are required by your application.
+    \row    \o thread \o The project is a multi-threaded application.
+    \row    \o x11    \o The project is an X11 application or library.
+    \endtable
+
+    When using \l{qmake Variable Reference#TEMPLATE}{application or library project
+    templates}, more specialized configuration options can be used to fine tune the
+    build process. These are explained in details in the
+    \l{qmake-common-projects.html}{Common Projects} chapter of this manual.
+
+    For example, if your application uses the Qt library and you want to
+    build it as a multi-threaded application in \c debug mode, your project
+    file will contain the following line:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 1
+
+    Note, that you must use "+=", not "=", or \c qmake will not be able to
+    use Qt's configuration to determine the settings needed for your project.
+
+    \section1 Declaring Qt Libraries
+
+    If the \c CONFIG variable contains the \c qt value, qmake's support for Qt
+    applications is enabled. This makes it possible to fine-tune which of the
+    Qt modules are used by your application. This is achieved with the \c QT
+    variable which can be used to declare the required extension modules.
+    For example, we can enable the XML and network modules in the following way:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 2
+
+    Note that \c QT includes the \c core and \c gui modules by default, so the
+    above declaration \e adds the network and XML modules to this default list.
+    The following assignment \e omits the default modules, and will lead to
+    errors when the application's source code is being compiled:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 3
+
+    If you want to build a project \e without the \c gui module, you need to
+    exclude it with the "-=" operator. By default, \c QT contains both
+    \c core and \c gui, so the following line will result in a minimal
+    Qt project being built:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 4
+
+    The table below shows the options that can be used with the \c QT variable
+    and the features that are associated with each of them:
+
+    \table
+    \header \o Option                     \o Features
+    \row    \o core (included by default) \o QtCore module
+    \row    \o gui  (included by default) \o QtGui module
+    \row    \o network                    \o QtNetwork module
+    \row    \o opengl                     \o QtOpenGL module
+    \row    \o sql                        \o QtSql module
+    \row    \o svg                        \o QtSvg module
+    \row    \o xml                        \o QtXml module
+    \row    \o xmlpatterns                \o QtXmlPatterns module
+    \row    \o qt3support                 \o Qt3Support module
+    \endtable
+
+    Note that adding the \c opengl option to the \c QT variable automatically
+    causes the equivalent option to be added to the \c CONFIG variable.
+    Therefore, for Qt applications, it is not necessary to add the \c opengl
+    option to both \c CONFIG and \c{QT}.
+
+    \section1 Configuration Features
+
+    \c qmake can be set up with extra configuration features that are specified
+    in feature (.prf) files. These extra features often provide support for
+    custom tools that are used during the build process. To add a feature to
+    the build process, append the feature name (the stem of the feature filename)
+    to the \c CONFIG variable.
+
+    For example, \c qmake can configure the build process to take advantage
+    of external libraries that are supported by
+    \l{http://www.freedesktop.org/wiki/Software_2fpkgconfig}{pkg-config},
+    such as the D-Bus and ogg libraries, with the following lines:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 5
+
+    More information about features can be found in the
+    \l{qmake Advanced Usage#Adding New Configuration Features}
+    {Adding New Configuration Features} section of the \l{qmake Advanced Usage}
+    chapter.
+
+    \section1 Declaring Other Libraries
+
+    If you are using other libraries in your project in addition to those
+    supplied with Qt, you need to specify them in your project file.
+
+    The paths that \c qmake searches for libraries and the specific libraries
+    to link against can be added to the list of values in the
+    \l{qmake Variable Reference#LIBS}{LIBS} variable. The paths to the libraries
+    themselves can be given, or the familiar Unix-style notation for specifying
+    libraries and paths can be used if preferred.
+
+    For example, the following lines show how a library can be specified:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 6
+
+    The paths containing header files can also be specified in a similar way
+    using the \l{qmake Variable Reference#INCLUDEPATH}{INCLUDEPATH} variable.
+
+    For example, it is possible to add several paths to be searched for header
+    files:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 7
+*/
+
+/*!
+    \page qmake-running.html
+    \title Running qmake
+    \contentspage {qmake Manual}{Contents}
+    \previouspage qmake Project Files
+    \nextpage qmake Platform Notes
+
+    The behavior of \c qmake can be customized when it is run by
+    specifying various options on the command line. These allow the
+    build process to be fine-tuned, provide useful diagnostic
+    information, and can be used to specify the target platform for
+    your project.
+
+    \tableofcontents
+
+    \target Commands
+    \section1 Command-Line Options
+
+    \section2 Syntax
+
+    The syntax used to run \c qmake takes the following simple form:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 8
+
+    \c qmake supports two different modes of operation: In the default mode,
+    \c qmake will use the description in a project file to generate a Makefile,
+    but it is also possible to use \c qmake to generate project files.
+    If you want to explicitly set the mode, you must specify it before all
+    other options. The \c mode can be either of the following two values:
+
+    \list
+    \o \c -makefile \BR
+        \c qmake output will be a Makefile.
+    \o \c -project \BR
+        \c qmake output will be a project file.
+    \endlist
+
+    The following \c options are used to specify both general and mode-specific
+    settings. Options that only apply to the Makefile mode are described in the
+    \l{#MakefileMode}{Makefile Mode Options} section; options that influence the
+    creation of project files are described in the
+    \l{#ProjectMode}{Project File Options} section.
+
+    The \c files argument represents a list of one or more project files, separated
+    by spaces.
+
+    \section2 Options
+
+    A wide range of options can be specified on the command line to \c qmake in
+    order to customize the build process, and to override default settings for
+    your platform. The following basic options provide usage information, specify
+    where \c qmake writes the output file, and control the level of debugging
+    information that will be written to the console:
+
+    \list
+    \o \c -help \BR
+        \c qmake will go over these features and give some useful help.
+    \o \c -o file \BR
+        \c qmake output will be directed to \e file. If this option
+        is not specified, \c qmake will try to use a suitable file name for its
+        output, depending on the mode it is running in.\BR
+        If '-' is specified, output is directed to stdout.
+    \o \c -d \BR
+        \c qmake will output debugging information.
+    \endlist
+
+    For projects that need to be built differently on each target platform, with
+    many subdirectories, you can run \c qmake with each of the following
+    options to set the corresponding platform-specific variable in each
+    project file:
+
+    \list
+    \o \c -unix \BR
+        \c qmake will run in unix mode.  In this mode, Unix file
+        naming and path conventions will be used, additionally testing for \c unix
+        (as a scope) will succeed. This is the default mode on all Unices.
+    \o \c -macx \BR
+        \c qmake will run in Mac OS X mode.  In this mode, Unix file
+        naming and path conventions will be used, additionally testing for \c macx
+        (as a scope) will succeed. This is the default mode on Mac OS X.
+    \o \c -win32 \BR
+        \c qmake will run in win32 mode.  In this mode, Windows file naming and path
+        conventions will be used, additionally testing for \c win32 (as a scope)
+        will succeed. This is the default mode on Windows.
+    \endlist
+
+    The template used for the project is usually specified by the \c TEMPLATE
+    variable in the project file. We can override or modify this by using the
+    following options:
+
+    \list
+    \o \c -t tmpl \BR
+        \c qmake will override any set \c TEMPLATE variables with tmpl, but only
+        \e after the .pro file has been processed.
+    \o \c -tp prefix \BR
+        \c qmake will add the prefix to the \c TEMPLATE variable.
+    \endlist
+
+    The level of warning information can be fine-tuned to help you find problems in
+    your project file:
+
+    \list
+    \o \c -Wall \BR
+          \c qmake will report all known warnings.
+    \o \c -Wnone \BR
+          No warning information will be generated by \c qmake.
+    \o \c -Wparser \BR
+          \c qmake will only generate parser warnings. This will alert
+          you to common pitfalls and potential problems in the parsing of your
+          project files.
+    \o \c -Wlogic \BR
+          \c qmake will warn of common pitfalls and potential problems in your
+          project file. For example, \c qmake will report whether a file is placed
+          into a list of files multiple times, or if a file cannot be found.
+    \endlist
+
+    \target MakefileMode
+    \section2 Makefile Mode Options
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 9
+
+    In Makefile mode, \c qmake will generate a Makefile that is used to build the
+    project. Additionally, the following options may be used in this mode to
+    influence the way the project file is generated:
+
+    \list
+    \o \c -after \BR
+       \c qmake will process assignments given on the command line after
+       the specified files.
+    \o \c -nocache \BR
+       \c qmake will ignore the .qmake.cache file.
+    \o \c -nodepend \BR
+       \c qmake will not generate any dependency information.
+    \o \c -cache file \BR
+       \c qmake will use \e file as the cache file, ignoring any other
+       .qmake.cache files found.
+    \o \c -spec spec \BR
+       \c qmake will use \e spec as a path to platform and compiler information,
+       and the value of \c QMAKESPEC will be ignored.
+    \endlist
+
+    You may also pass \c qmake assignments on the command line;
+    they will be processed before all of the files specified. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 10
+
+    This will generate a Makefile, from test.pro with Unix pathnames.  However
+    many of the specified options aren't necessary as they are the default.
+    Therefore, the line can be simplified on Unix to:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 11
+
+    If you are certain you want your variables processed after the
+    files specified, then you may pass the \c -after option. When this
+    is specified, all assignments on the command line after the \c -after
+    option will be postponed until after the specified files are parsed.
+
+    \target ProjectMode
+    \section2 Project Mode Options
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 12
+
+    In project mode, \c qmake will generate a project file. Additionally, you
+    may supply the following options in this mode:
+
+    \list
+    \o \c -r \BR
+       \c qmake will look through supplied directories recursively
+    \o \c -nopwd \BR
+       \c qmake will not look in your current working directory for
+       source code and only use the specified \c files
+    \endlist
+
+    In this mode, the \c files argument can be a list of files or directories.
+    If a directory is specified, it will be included in the \c DEPENDPATH
+    variable, and relevant code from there will be included in the generated
+    project file. If a file is given, it will be appended to the correct
+    variable, depending on its extension; for example, .ui files are added
+    to \c FORMS, and .cpp files are added to \c SOURCES.
+
+    You may also pass assignments on the command line in this mode. When doing
+    so, these assignments will be placed last in the generated project file.
+*/
+
+/*!
+    \page qmake-platform-notes.html
+    \title qmake Platform Notes
+    \contentspage {qmake Manual}{Contents}
+    \previouspage Running qmake
+    \nextpage qmake Advanced Usage
+
+    Many cross-platform projects can be handled by the \c{qmake}'s basic
+    configuration features. On some platforms, it is sometimes useful, or even
+    necessary, to take advantage of platform-specific features. \c qmake knows
+    about many of these features, and these can be accessed via specific
+    variables that only have an effect on the platforms where they are relevant.
+
+    \tableofcontents
+
+    \section1 Mac OS X
+
+    Features specific to this platform include support for creating universal
+    binaries, frameworks and bundles.
+
+    \section2 Source and Binary Packages
+
+    The version of \c qmake supplied in source packages is configured slightly
+    differently to that supplied in binary packages in that it uses a different
+    feature specification. Where the source package typically uses the
+    \c macx-g++ specification, the binary package is typically configured to
+    use the \c macx-xcode specification.
+
+    Users of each package can override this configuration by invoking \c qmake
+    with the \c -spec option (see \l{Running qmake} for more information). This
+    makes it possible, for example, to use \c qmake from a binary package to
+    create a Makefile in a project directory with the following command line
+    invocation:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 13
+
+    \section2 Using Frameworks
+
+    \c qmake is able to automatically generate build rules for linking against
+    frameworks in the standard framework directory on Mac OS X, located at
+    \c{/Library/Frameworks/}.
+
+    Directories other than the standard framework directory need to be specified
+    to the build system, and this is achieved by appending linker options to the
+    \l{qmake Variable Reference#QMAKE_LFLAGS}{QMAKE_LFLAGS} variable, as shown
+    in the following example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 14
+
+    The framework itself is linked in by appending the \c{-framework} options and
+    the name of the framework to the \l{qmake Variable Reference#LIBS}{LIBS}
+    variable:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 15
+
+    \section2 Creating Frameworks
+
+    Any given library project can be configured so that the resulting library
+    file is placed in a
+    \l{http://developer.apple.com/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/WhatAreFrameworks.html}
+    {framework}, ready for deployment. To do this, set up the project to use the
+    \l{qmake Variable Reference#TEMPLATE}{\c lib template} and add the
+    \c lib_bundle option to the
+    \l{qmake Variable Reference#CONFIG}{CONFIG} variable:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 16
+
+    The data associated with the library is specified using the
+    \l{qmake Variable Reference#QMAKE_BUNDLE_DATA}{QMAKE_BUNDLE_DATA}
+    variable. This holds items that will be installed with a library
+    bundle, and is often used to specify a collection of header files,
+    as in the following example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 17
+
+    Here, the \c FRAMEWORK_HEADERS variable is a user-defined variable that
+    is used to define the headers required to use a particular framework.
+    Appending it to the \c QMAKE_BUNDLE_DATA variable ensures that the
+    information about these headers are added to the collection of
+    resources that will be installed with the library bundle. Also, the
+    framework's name and version are specified by
+    \l{qmake Variable Reference#QMAKE_FRAMEWORK_BUNDLE_NAME}
+    {QMAKE_FRAMEWORK_BUNDLE_NAME}
+    and \l{qmake Variable Reference#QMAKE_FRAMEWORK_VERSION}
+    {QMAKE_FRAMEWORK_VERSION} variables. By default, the values used for
+    these are obtained from the \l{qmake Variable Reference#TARGET}{TARGET}
+    and \l{qmake Variable Reference#VERSION}{VERSION} variables.
+
+    See \l{Deploying an Application on Mac OS X} for more information about
+    deploying applications and libraries.
+
+    \section2 Creating Universal Binaries
+
+    To create a universal binary for your application, you need to be using
+    a version of Qt that has been configured with the \c{-universal} option.
+
+    The architectures to be supported in the binary are specified with the
+    \l{qmake Variable Reference#CONFIG}{CONFIG} variable. For example, the
+    following assignment causes \c qmake to generate build rules to create
+    a universal binary for both PowerPC and x86 architectures:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 18
+
+    Additionally, developers using a PowerPC-based platform need to set the
+    \l{qmake Variable Reference#QMAKE_MAC_SDK}{QMAKE_MAC_SDK} variable.
+    This process is discussed in more detail in the
+    \l{Deploying an Application on Mac OS X#Architecture Dependencies}{deployment guide for Mac OS X}.
+
+    \section2 Creating and Moving Xcode Projects
+
+    Developers on Mac OS X can take advantage of \c{qmake}'s support for Xcode
+    project files, as described in
+    \l{Qt is Mac OS X Native#Development Tools}{Qt is Mac OS X Native},
+    by running \c qmake to generate an Xcode project from an existing \c qmake
+    project files. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 19
+
+    Note that, if a project is later moved on the disk, \c qmake must be run
+    again to process the project file and create a new Xcode project file.
+
+    \section1 Windows
+
+    Features specific to this platform include support for creating Visual
+    Studio project files and handling manifest files when deploying Qt
+    applications developed using Visual Studio 2005.
+
+    \section2 Creating Visual Studio Project Files
+
+    Developers using Visual Studio to write Qt applications can use the
+    Visual Studio integration facilities provided with the
+    \l{Qt Commercial Editions} and do not need to worry about how
+    project dependencies are managed.
+
+    However, some developers may need to import an existing \c qmake project
+    into Visual Studio. \c qmake is able to take a project file and create a
+    Visual Studio project that contains all the necessary information required
+    by the development environment. This is achieved by setting the \c qmake
+    \l{qmake Variable Reference#TEMPLATE}{project template} to either \c vcapp
+    (for application projects) or \c vclib (for library projects).
+
+    This can also be set using a command line option, for example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 20
+
+    It is possible to recursively generate \c{.vcproj} files in subdirectories
+    and a \c{.sln} file in the main directory, by typing:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 21
+
+
+    Each time you update the project file, you need to run \c qmake to generate
+    an updated Visual Studio project.
+
+    \section2 Visual Studio 2005 Manifest Files
+
+    When deploying Qt applications built using Visual Studio 2005, it is
+    necessary to ensure that the manifest file, created when the application
+    was linked, is handled correctly. This is handled automatically for
+    projects that generate DLLs.
+
+    Removing manifest embedding for application executables can be done with
+    the following assignment to the \l{qmake Variable Reference#CONFIG}
+    {CONFIG} variable:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 22
+
+    Also, the manifest embedding for DLLs can be removed with the following
+    assignment to the \l{qmake Variable Reference#CONFIG}{CONFIG} variable:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 23
+
+    This is discussed in more detail in the
+    \l{Deploying an Application on Windows#Visual Studio 2005 Onwards}
+    {deployment guide for Windows}.
+*/
+
+/*!
+    \page qmake-reference.html
+    \title qmake Reference
+    \contentspage {qmake Manual}{Contents}
+    \previouspage Using Precompiled Headers
+    \nextpage qmake Variable Reference
+
+    This reference is a detailed index of all the variables and function
+    that are available for use in \c qmake project files.
+
+    \section1 Variable Reference
+
+    The \l{qmake Variable Reference} describes the variables that are
+    recognized by \c qmake when configuring the build process for
+    projects.
+
+    \section1 Function Reference
+
+    The \l{qmake Function Reference} describes the function that can be
+    used to process the contents of variables defined in project files.
+
+    \target FrequentlyUsedVariables
+    \section1 Frequently Used Variables
+
+    The following variables are frequently used in project files to describe
+    common aspects of the build process. These are fully described in the
+    \l{qmake-variable-reference.html}{Variable Reference}.
+
+    \list
+    \o \l{qmake Variable Reference#CONFIG}{CONFIG}
+    \o \l{qmake Variable Reference#DEF_FILE}{DEF_FILE}
+    \o \l{qmake Variable Reference#DEFINES}{DEFINES}
+    \o \l{qmake Variable Reference#DESTDIR}{DESTDIR}
+    \o \l{qmake Variable Reference#DISTFILES}{DISTFILES}
+    \o \l{qmake Variable Reference#DLLDESTDIR}{DLLDESTDIR}
+    \o \l{qmake Variable Reference#FORMS}{FORMS}
+    \o \l{qmake Variable Reference#FORMS3}{FORMS3}
+    \o \l{qmake Variable Reference#GUID}{GUID}
+    \o \l{qmake Variable Reference#HEADERS}{HEADERS}
+    \o \l{qmake Variable Reference#INCLUDEPATH}{INCLUDEPATH}
+    \o \l{qmake Variable Reference#LEXSOURCES}{LEXSOURCES}
+    \o \l{qmake Variable Reference#LIBS}{LIBS}
+    \o \l{qmake Variable Reference#MOC_DIR}{MOC_DIR}
+    \o \l{qmake Variable Reference#OBJECTS_DIR}{OBJECTS_DIR}
+    \o \l{qmake Variable Reference#QT}{QT}
+    \o \l{qmake Variable Reference#RCC_DIR}{RCC_DIR}
+    \o \l{qmake Variable Reference#REQUIRES}{REQUIRES}
+    \o \l{qmake Variable Reference#SOURCES}{SOURCES}
+    \o \l{qmake Variable Reference#SUBDIRS}{SUBDIRS}
+    \o \l{qmake Variable Reference#TARGET}{TARGET}
+    \o \l{qmake Variable Reference#TEMPLATE}{TEMPLATE}
+    \o \l{qmake Variable Reference#TRANSLATIONS}{TRANSLATIONS}
+    \o \l{qmake Variable Reference#UI_DIR}{UI_DIR}
+    \o \l{qmake Variable Reference#UI_HEADERS_DIR}{UI_HEADERS_DIR}
+    \o \l{qmake Variable Reference#UI_SOURCES_DIR}{UI_SOURCES_DIR}
+    \o \l{qmake Variable Reference#VERSION}{VERSION}
+    \o \l{qmake Variable Reference#YACCSOURCES}{YACCSOURCES}
+    \endlist
+
+    \section1 Environment Variables and Configuration
+
+    The \l{Configuring qmake's Environment} chapter of this manual
+    describes the environment variables that \c qmake uses when
+    configuring the build process.
+*/
+
+/*!
+    \page qmake-variable-reference.html
+    \title qmake Variable Reference
+    \contentspage {qmake Manual}{Contents}
+    \previouspage qmake Reference
+    \nextpage qmake Function Reference
+
+    \c{qmake}'s fundamental behavior is influenced by variable declarations that
+    define the build process of each project. Some of these declare resources,
+    such as headers and source files, that are common to each platform; others
+    are used to customize the behavior of compilers and linkers on specific
+    platforms.
+
+    Platform-specific variables follow the naming pattern of the
+    variables which they extend or modify, but include the name of the relevant
+    platform in their name. For example, \c QMAKE_LIBS can be used to specify a list
+    of libraries that a project needs to link against, and \c QMAKE_LIBS_X11 can be
+    used to extend or override this list.
+
+    \tableofcontents{3}
+
+    \target CONFIG
+    \section1 CONFIG
+
+    The \c CONFIG variable specifies project configuration and
+    compiler options.  The values will be recognized internally by
+    \c qmake and have special meaning.  They are as follows.
+
+    These \c CONFIG values control compilation flags:
+
+    \table 95%
+    \header \o Option   \o Description
+    \row    \o release  \o The project is to be built in release mode.
+            This is ignored if \c debug is also specified.
+    \row    \o debug    \o The project is to be built in debug mode.
+    \row    \o debug_and_release \o The project is built in \e both debug and
+            release modes. This can have some unexpected side effects (see
+            below for more information).
+    \row    \o build_all \o If \c debug_and_release is specified, the project is
+            built in both debug and release modes by default.
+    \row    \o ordered  \o When using the \c subdirs template, this option
+            specifies that the directories listed should be processed in the
+            order in which they are given.
+    \row    \o precompile_header \o Enables support for the use of
+            \l{Using Precompiled Headers}{precompiled headers} in projects.
+    \row    \o warn_on  \o The compiler should output as many warnings as possible.
+            This is ignored if \c warn_off is specified.
+    \row    \o warn_off \o The compiler should output as few warnings as possible.
+    \omit
+    \row    \o qt_debug \o Specifies that the project should be built against
+            debug versions of the Qt libraries specified using the
+            \l{#QT}{QT} variable.
+    \row    \o qt_release \o Specifies that the project should be built against
+            release versions of the Qt libraries specified using the
+            \l{#QT}{QT} variable.
+    \endomit
+    \endtable
+
+    Since the \c debug option overrides the \c release option when both are
+    defined in the \c CONFIG variable, it is necessary to use the
+    \c debug_and_release option if you want to allow both debug and release
+    versions of a project to be built. In such a case, the Makefile that
+    \c qmake generates includes a rule that builds both versions, and this can
+    be invoked in the following way:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 24
+
+    On Windows (or if Qt is configured with \c{-debug_and_release}, adding the
+    \c build_all option to the \c CONFIG variable makes this rule the default
+    when building the project, and installation targets will be created for
+    both debug and release builds.
+
+    Additionally, adding \c debug_and_release to the \c CONFIG variable will
+    cause both \c debug and \c release to be defined in the contents of
+    \c CONFIG. When the project file is processed, the
+    \l{qmake Advanced Usage#Scopes}{scopes} that test for each value will be
+    processed for \e both debug and release modes. The \c{build_pass} variable
+    will be set for each of these mode, and you can test for this to perform
+    build-specific tasks. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 25
+
+    As a result, it may be useful to define mode-specific variables, such as
+    \l{#QMAKE_LFLAGS_RELEASE}{QMAKE_LFLAGS_RELEASE}, instead of general
+    variables, such as \l{#QMAKE_LFLAGS}{QMAKE_LFLAGS}, where possible.
+
+    The following options define the application/library type:
+
+    \table 95%
+    \header \o Option \o Description
+    \row \o qt \o The target is a Qt application/library and requires the Qt
+         library and header files. The proper include and library paths for the
+         Qt library will automatically be added to the project. This is defined
+         by default, and can be fine-tuned with the \c{\l{#qt}{QT}} variable.
+    \row \o thread \o The target is a multi-threaded application or library.  The
+        proper defines and compiler flags will automatically be added to
+        the project.
+    \row \o x11 \o The target is a X11 application or library. The proper
+        include paths and libraries will automatically be added to the
+        project.
+    \row \o windows \o The target is a Win32 window application (app only). The
+        proper include paths, compiler flags and libraries will
+        automatically be added to the project.
+    \row \o console \o The target is a Win32 console application (app only). The
+        proper include paths, compiler flags and libraries will
+        automatically be added to the
+        project.
+    \row \o shared \o{1,3} The target is a shared object/DLL. The proper
+        include paths, compiler flags and libraries will automatically be
+        added to the project.
+    \row \o dll \o
+    \row \o dylib \o
+    \row \o static \o{1,2} The target is a static library (lib only).  The proper
+        compiler flags will automatically be added to the project.
+    \row \o staticlib \o
+    \row \o plugin \o The target is a plugin (lib only). This enables dll as well.
+    \row \o designer \o The target is a plugin for \QD.
+    \row \o uic3 \o Configures qmake to run uic3 on the content of \c FORMS3 if
+         defined; otherwise the contents of \c FORMS will be processed instead.
+    \row \o no_lflags_merge \o Ensures that the list of libraries stored in the
+         \c LIBS variable is not reduced to a list of unique values before it is used.
+    \row \o resources \o Configures qmake to run rcc on the content of \c RESOURCES
+         if defined.
+    \endtable
+
+    These options are used to set the compiler flags:
+
+    \table 95%
+    \header \o Option \o Description
+    \row \o 3dnow \o AMD 3DNow! instruction support is enabled.
+    \row \o exceptions \o Exception support is enabled.
+    \row \o mmx \o Intel MMX instruction support is enabled.
+    \row \o rtti \o RTTI support is enabled.
+    \row \o stl \o STL support is enabled.
+    \row \o sse \o SSE support is enabled.
+    \row \o sse2 \o SSE2 support is enabled.
+    \endtable
+
+    These options define specific features on Windows only:
+
+    \table 95%
+    \header \o Option \o Description
+    \row \o flat \o When using the vcapp template this will put all the source
+         files into the source group and the header files into the header group
+         regardless of what directory they reside in.  Turning this
+         option off will group the files within the source/header group depending
+         on the directory they reside. This is turned on by default.
+    \row \o embed_manifest_dll \o Embeds a manifest file in the DLL created
+         as part of a library project.
+    \row \o embed_manifest_exe \o Embeds a manifest file in the DLL created
+         as part of an application project.
+    \row \o incremental \o Used to enable or disable incremental linking in Visual
+         C++, depending on whether this feature is enabled or disabled by default.
+    \endtable
+
+    See \l{qmake Platform Notes#Visual Studio 2005 Manifest Files}{qmake Platform Notes}
+    for more information on the options for embedding manifest files.
+
+    These options only have an effect on Mac OS X:
+
+    \table 95%
+    \header \o Option \o Description
+    \row \o ppc \o Builds a PowerPC binary.
+    \row \o x86 \o Builds an i386 compatible binary.
+    \row \o app_bundle \o Puts the executable into a bundle (this is the default).
+    \row \o lib_bundle \o Puts the library into a library bundle.
+    \endtable
+
+    The build process for bundles is also influenced by
+    the contents of the \l{#QMAKE_BUNDLE_DATA}{QMAKE_BUNDLE_DATA} variable.
+
+    These options have an effect on Linux/Unix platforms:
+
+    \table 95%
+    \header \o Option \o Description
+    \row \o largefile \o Includes support for large files.
+    \row \o separate_debug_info \o Puts debugging information for libraries in
+    separate files.
+    \endtable
+
+    The \c CONFIG variable will also be checked when resolving scopes. You may
+    assign anything to this variable.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 26
+
+    \target DEFINES
+    \section1 DEFINES
+
+    \c qmake adds the values of this variable as compiler C
+    preprocessor macros (-D option).
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 27
+
+    \target DEF_FILE
+    \section1 DEF_FILE
+
+    \e {This is only used on Windows when using the \c app template}.
+
+    Specifies a \c .def file to be included in the project.
+
+    \target DEPENDPATH
+    \section1 DEPENDPATH
+
+    This variable contains the list of all directories to look in to
+    resolve dependencies. This will be used when crawling through
+    \c included files.
+
+    \target DEPLOYMENT
+    \section1 DEPLOYMENT
+
+    \e {This is only used on Windows CE.}
+
+    Specifies which additional files will be deployed. Deployment means the
+    transfer of files from the development system to the target device or
+    emulator.
+
+    Files can be deployed by either creating a Visual Studio project or using
+    the \l {Using QTestLib remotely on Windows CE}{cetest} executable.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 28
+
+    This will upload all PNG images in \c path to the same directory your
+    build target will be deployed to.
+
+    The default deployment target path for Windows CE is
+    \c{%CSIDL_PROGRAM_FILES%\target}, which usually gets expanded to
+    \c{\Program Files\target}.
+
+    It is also possible to specify multiple \c sources to be deployed on
+    target \c paths. In addition, different variables can be used for
+    deployment to different directories.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 29
+
+    \note All linked Qt libraries will be deployed to the path specified
+    by \c{myFiles.path}.
+
+    \target DEPLOYMENT_PLUGIN
+    \section1 DEPLOYMENT_PLUGIN
+
+    \e {This is only used on Windows CE.}
+
+    This variable specifies the Qt plugins that will be deployed. All plugins
+    available in Qt can be explicitly deployed to the device. See
+    \l{Static Plugins}{Static Plugins} for a complete list.
+
+    \note No plugins will be deployed automatically. If the application
+    depends on plugins, these plugins have to be specified manually.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 128
+
+    This will upload the jpeg imageformat plugin to the plugins directory
+    on the Windows CE device.
+
+    \target DESTDIR
+    \section1 DESTDIR
+
+    Specifies where to put the \l{#TARGET}{target} file.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 30
+
+    \target DESTDIR_TARGET
+    \section1 DESTDIR_TARGET
+
+    This variable is set internally by \c qmake, which is basically the
+    \c DESTDIR variable with the \c TARGET variable appened at the end.
+    The value of this variable is typically handled by \c qmake or
+    \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \target DLLDESTDIR
+    \section1 DLLDESTDIR
+
+    Specifies where to copy the \l{#TARGET}{target} dll.
+
+    \target DISTFILES
+    \section1 DISTFILES
+
+    This variable contains a list of files to be included in the dist
+    target. This feature is supported by UnixMake specs only.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 31
+
+    \target DSP_TEMPLATE
+    \section1 DSP_TEMPLATE
+
+    This variable is set internally by \c qmake, which specifies where the
+    dsp template file for basing generated dsp files is stored. The value
+    of this variable is typically handled by \c qmake or
+    \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \target FORMS
+    \section1 FORMS
+
+    This variable specifies the .ui files (see \link
+    designer-manual.html Qt Designer \endlink) to be processed through \c uic
+    before compiling.  All dependencies, headers and source files required
+    to build these .ui files will automatically be added to the project.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 32
+
+    If FORMS3 is defined in your project, then this variable must contain
+    forms for uic, and not uic3. If CONFIG contains uic3, and FORMS3 is not
+    defined, the this variable must contain only uic3 type forms.
+
+    \target FORMS3
+    \section1 FORMS3
+
+    This variable specifies the old style .ui files to be processed
+    through \c uic3 before compiling, when \c CONFIG contains uic3.
+    All dependencies, headers and source files required to build these
+    .ui files will automatically be added to the project.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 33
+
+    \target GUID
+    \section1 GUID
+
+    Specifies the GUID that is set inside a \c{.vcproj} file. The GUID is
+    usually randomly determined. However, should you require a fixed GUID,
+    it can be set using this variable.
+
+    This variable is specific to \c{.vcproj} files only; it is ignored
+    otherwise.
+
+    \target HEADERS
+    \section1 HEADERS
+
+    Defines the header files for the project.
+
+    \c qmake will generate dependency information (unless \c -nodepend
+    is specified on the \l{Running qmake#Commands}{command line})
+    for the specified headers. \c qmake will also automatically detect if
+    \c moc is required by the classes in these headers, and add the
+    appropriate dependencies and files to the project for generating and
+    linking the moc files.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 34
+
+    See also \l{#SOURCES}{SOURCES}.
+
+    \target INCLUDEPATH
+    \section1 INCLUDEPATH
+
+    This variable specifies the #include directories which should be
+    searched when compiling the project. Use ';' or a space as the
+    directory separator.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 35
+
+    \target INSTALLS
+    \section1 INSTALLS
+
+    This variable contains a list of resources that will be installed when
+    \c{make install} or a similar installation procedure is executed. Each
+    item in the list is typically defined with attributes that provide
+    information about where it will be installed.
+
+    For example, the following \c{target.path} definition describes where the
+    build target will be installed, and the \c INSTALLS assignment adds the
+    build target to the list of existing resources to be installed:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 36
+
+    \target LEXIMPLS
+    \section1 LEXIMPLS
+
+    This variable contains a list of lex implementation files.  The value
+    of this variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely
+    needs to be modified.
+
+    \target LEXOBJECTS
+    \section1 LEXOBJECTS
+
+    This variable contains the names of intermediate lex object
+    files.The value of this variable is typically handled by
+    \c qmake and rarely needs to be modified.
+
+    \target LEXSOURCES
+    \section1 LEXSOURCES
+
+    This variable contains a list of lex source files.  All
+    dependencies, headers and source files will automatically be added to
+    the project for building these lex files.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 37
+
+    \target LIBS
+    \section1 LIBS
+
+    This variable contains a list of libraries to be linked into the project.
+    You can use the Unix \c -l (library) and -L (library path) flags and qmake
+    will do the correct thing with these libraries on Windows (namely this
+    means passing the full path of the library to the linker). The only
+    limitation to this is the library must exist, for qmake to find which
+    directory a \c -l lib lives in.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 38
+
+    \bold{Note:} On Windows, specifying libraries with the \c{-l} option,
+    as in the above example, will cause the library with the highest version
+    number to be used; for example, \c{libmath2.lib} could potentially be used
+    instead of \c{libmathlib}. To avoid this ambiguity, we recommend that you
+    explicitly specify the library to be used by including the \c{.lib}
+    file name suffix.
+
+    By default, the list of libraries stored in \c LIBS is reduced to a list of
+    unique names before it is used. To change this behavior, add the
+    \c no_lflags_merge option to the \c CONFIG variable:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 39
+
+    \target LITERAL_HASH
+    \section1 LITERAL_HASH
+
+    This variable is used whenever a literal hash character (\c{#}) is needed in
+    a variable declaration, perhaps as part of a file name or in a string passed
+    to some external application.
+
+    For example:
+
+    \snippet doc/src/snippets/qmake/comments.pro 1
+
+    By using \c LITERAL_HASH in this way, the \c # character can be used
+    to construct a URL for the \c message() function to print to the console.
+
+    \target MAKEFILE
+    \section1 MAKEFILE
+
+    This variable specifies the name of the Makefile which
+    \c qmake should use when outputting the dependency information
+    for building a project.  The value of this variable is typically
+    handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \target MAKEFILE_GENERATOR
+    \section1 MAKEFILE_GENERATOR
+
+    This variable contains the name of the Makefile generator to use
+    when generating a Makefile.  The value of this variable is typically
+    handled internally by \c qmake and rarely needs to be modified.
+
+    \target MOC_DIR
+    \section1 MOC_DIR
+
+    This variable specifies the directory where all intermediate moc
+    files should be placed.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 40
+
+    \target OBJECTS
+    \section1 OBJECTS
+
+    This variable is generated from the \link #SOURCES SOURCES
+    \endlink variable.  The extension of each source file will have been
+    replaced by .o (Unix) or .obj (Win32).  The value of this variable is
+    typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and
+    rarely needs to be modified.
+
+    \target OBJECTS_DIR
+    \section1 OBJECTS_DIR
+
+    This variable specifies the directory where all intermediate
+    objects should be placed.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 41
+
+    \target OBJMOC
+    \section1 OBJMOC
+
+    This variable is set by \c qmake if files can be found that
+    contain the Q_OBJECT macro.  \c OBJMOC contains the
+    name of all intermediate moc object files. The value of this variable
+    is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
+    modified.
+
+    \target POST_TARGETDEPS
+    \section1 POST_TARGETDEPS
+
+    All libraries that the \l{#TARGET}{target} depends on can be
+    listed in this variable. Some backends do not support this, these include
+    MSVC Dsp, and ProjectBuilder .pbproj files. Generally this is supported
+    internally by these build tools, this is useful for explicitly listing
+    dependant static libraries.
+
+    This list will go after all builtin (and \link #PRE_TARGETDEPS
+    $$PRE_TARGETDEPS \endlink) dependencies.
+
+    \target PRE_TARGETDEPS
+    \section1 PRE_TARGETDEPS
+
+    All libraries that the \l{#TARGET}{target} depends on can be
+    listed in this variable. Some backends do not support this, these include
+    MSVC Dsp, and ProjectBuilder .pbproj files. Generally this is supported
+    internally by these build tools, this is useful for explicitly listing
+    dependant static libraries.
+
+    This list will go before all builtin dependencies.
+
+    \target PRECOMPILED_HEADER
+    \section1 PRECOMPILED_HEADER
+
+    This variable indicates the header file for creating a precompiled
+    header file, to increase the compilation speed of a project.
+    Precompiled headers are currently only supported on some platforms
+    (Windows - all MSVC project types, Mac OS X - Xcode, Makefile,
+    Unix - gcc 3.3 and up).
+
+    On other platforms, this variable has different meaning, as noted
+    below.
+
+    This variable contains a list of header files that require some
+    sort of pre-compilation step (such as with moc). The value of this
+    variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
+    modified.
+
+    \target PWD
+    \section1 PWD
+
+    This variable contains the full path leading to the directory where
+    the \c qmake project file (project.pro) is located.
+
+    \target OUT_PWD
+    \section1 OUT_PWD
+
+    This variable contains the full path leading to the directory where
+    \c qmake places the generated Makefile.
+
+    \target QMAKE_systemvariable
+    \section1 QMAKE
+
+    This variable contains the name of the \c qmake program
+    itself and is placed in generated Makefiles.  The value of this
+    variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
+    modified.
+
+    \target QMAKESPEC_systemvariable
+    \section1 QMAKESPEC
+
+    This variable contains the name of the \c qmake
+    configuration to use when generating Makefiles.  The value of this
+    variable is typically handled by \c qmake and rarely needs to be modified.
+
+    Use the \c{QMAKESPEC} environment variable to override the \c qmake configuration.
+    Note that, due to the way \c qmake reads project files, setting the \c{QMAKESPEC}
+    environment variable from within a project file will have no effect.
+
+    \target QMAKE_APP_FLAG
+    \section1 QMAKE_APP_FLAG
+
+    This variable is empty unless the \c app
+    \l{#TEMPLATE}{TEMPLATE} is specified.  The value of this
+    variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
+    modified.  Use the following instead:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 42
+
+    \target QMAKE_APP_OR_DLL
+    \section1 QMAKE_APP_OR_DLL
+
+    This variable is empty unless the \c app or \c dll
+    \l{#TEMPLATE}{TEMPLATE} is specified.  The value of this
+    variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
+    modified.
+
+    \target QMAKE_AR_CMD
+    \section1 QMAKE_AR_CMD
+
+    \e {This is used on Unix platforms only.}
+
+    This variable contains the command for invoking the program which
+    creates, modifies and extracts archives. The value of this variable is
+    typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf}
+    and rarely needs to be modified.
+
+    \target QMAKE_BUNDLE_DATA
+    \section1 QMAKE_BUNDLE_DATA
+
+    This variable is used to hold the data that will be installed with a library
+    bundle, and is often used to specify a collection of header files.
+
+    For example, the following lines add \c path/to/header_one.h
+    and \c path/to/header_two.h to a group containing information about the
+    headers supplied with the framework:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 43
+
+    The last line adds the information about the headers to the collection of
+    resources that will be installed with the library bundle.
+
+    Library bundles are created when the \c lib_bundle option is added to the
+    \l{#CONFIG}{CONFIG} variable.
+
+    See \l{qmake Platform Notes#Creating Frameworks}{qmake Platform Notes} for
+    more information about creating library bundles.
+
+    \e{This is used on Mac OS X only.}
+
+    \section1 QMAKE_BUNDLE_EXTENSION
+
+    This variable defines the extension to be used for library bundles.
+    This allows frameworks to be created with custom extensions instead of the
+    standard \c{.framework} directory name extension.
+
+    For example, the following definition will result in a framework with the
+    \c{.myframework} extension:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 44
+
+    \e{This is used on Mac OS X only.}
+
+    \section1 QMAKE_CC
+
+    This variable specifies the C compiler that will be used when building
+    projects containing C source code. Only the file name of the compiler
+    executable needs to be specified as long as it is on a path contained
+    in the \c PATH variable when the Makefile is processed.
+
+    \target QMAKE_CFLAGS_DEBUG
+    \section1 QMAKE_CFLAGS_DEBUG
+
+    This variable contains the flags for the C compiler in debug mode.The value of this variable is
+    typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf}
+    and rarely needs to be modified.
+
+    \target QMAKE_CFLAGS_MT
+    \section1 QMAKE_CFLAGS_MT
+
+    This variable contains the compiler flags for creating a
+    multi-threaded application or when the version of Qt that you link
+    against is a multi-threaded statically linked library.  The value of
+    this variable is typically handled by \c qmake or
+    \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \target QMAKE_CFLAGS_MT_DBG
+    \section1 QMAKE_CFLAGS_MT_DBG
+
+    This variable contains the compiler flags for creating a debuggable
+    multi-threaded application or when the version of Qt that you link
+    against is a debuggable multi-threaded statically linked library.  The
+    value of this variable is typically handled by \c qmake or
+    \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \target QMAKE_CFLAGS_MT_DLL
+    \section1 QMAKE_CFLAGS_MT_DLL
+
+    \e {This is used on Windows only.}
+
+    This variable contains the compiler flags for creating a
+    multi-threaded dll or when the version of Qt that you link
+    against is a multi-threaded dll.  The value of this variable is typically
+    handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and
+    rarely needs to be modified.
+
+    \target QMAKE_CFLAGS_MT_DLLDBG
+    \section1 QMAKE_CFLAGS_MT_DLLDBG
+
+    \e {This is used on Windows only.}
+
+    This variable contains the compiler flags for creating a debuggable
+    multi-threaded dll or when the version of Qt that you link
+    against is a debuggable multi-threaded statically linked library.
+    The value of this variable is typically handled by \c qmake or
+    \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \target QMAKE_CFLAGS_RELEASE
+    \section1 QMAKE_CFLAGS_RELEASE
+
+    This variable contains the compiler flags for creating a non-debuggable
+    application.  The value of this variable is typically
+    handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and
+    rarely needs to be modified.
+
+    \target QMAKE_CFLAGS_SHLIB
+    \section1 QMAKE_CFLAGS_SHLIB
+
+    \e {This is used on Unix platforms only.}
+
+    This variable contains the compiler flags for creating a shared
+    library. The value of this variable is typically handled by
+    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    to be modified.
+
+    \target QMAKE_CFLAGS_THREAD
+    \section1 QMAKE_CFLAGS_THREAD
+
+    This variable contains the compiler flags for creating a multi-threaded
+    application. The value of this variable is typically handled by
+    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    to be modified.
+
+    \target QMAKE_CFLAGS_WARN_OFF
+    \section1 QMAKE_CFLAGS_WARN_OFF
+
+    This variable is not empty if the warn_off
+    \l{#TEMPLATE}{TEMPLATE} option is specified.  The value of this
+    variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf}
+    and rarely needs to be modified.
+
+    \target QMAKE_CFLAGS_WARN_ON
+    \section1 QMAKE_CFLAGS_WARN_ON
+
+    This variable is not empty if the warn_on
+    \l{#TEMPLATE}{TEMPLATE} option is specified.
+    The value of this variable is typically handled by
+    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    to be modified.
+
+    \target QMAKE_CLEAN
+    \section1 QMAKE_CLEAN
+
+    This variable contains any files which are not generated files (such as moc and uic
+    generated files) and object files that should be removed when using "make clean".
+
+    \section1 QMAKE_CXX
+
+    This variable specifies the C++ compiler that will be used when building
+    projects containing C++ source code. Only the file name of the compiler
+    executable needs to be specified as long as it is on a path contained
+    in the \c PATH variable when the Makefile is processed.
+
+    \section1 QMAKE_CXXFLAGS
+
+    This variable contains the C++ compiler flags that are used when building
+    a project. The value of this variable is typically handled by \c qmake or
+    \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified. The flags
+    specific to debug and release modes can be adjusted by modifying
+    the \c QMAKE_CXXFLAGS_DEBUG and \c QMAKE_CXXFLAGS_RELEASE variables,
+    respectively.
+
+    \target QMAKE_CXXFLAGS_DEBUG
+    \section1 QMAKE_CXXFLAGS_DEBUG
+
+    This variable contains the C++ compiler flags for creating a debuggable
+    application. The value of this variable is typically handled by
+    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    to be modified.
+
+    \target QMAKE_CXXFLAGS_MT
+    \section1 QMAKE_CXXFLAGS_MT
+
+    This variable contains the C++ compiler flags for creating a multi-threaded
+    application. The value of this variable is typically handled by
+    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    to be modified.
+
+    \target QMAKE_CXXFLAGS_MT_DBG
+    \section1 QMAKE_CXXFLAGS_MT_DBG
+
+    This variable contains the C++ compiler flags for creating a debuggable multi-threaded
+    application. The value of this variable is typically handled by
+    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    to be modified.
+
+    \target QMAKE_CXXFLAGS_MT_DLL
+    \section1 QMAKE_CXXFLAGS_MT_DLL
+
+    \c {This is used on Windows only.}
+
+    This variable contains the C++ compiler flags for creating a multi-threaded
+    dll. The value of this variable is typically handled by
+    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    to be modified.
+
+    \target QMAKE_CXXFLAGS_MT_DLLDBG
+    \section1 QMAKE_CXXFLAGS_MT_DLLDBG
+
+    \c {This is used on Windows only.}
+
+    This variable contains the C++ compiler flags for creating a multi-threaded debuggable
+    dll. The value of this variable is typically handled by
+    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    to be modified.
+
+    \target QMAKE_CXXFLAGS_RELEASE
+    \section1 QMAKE_CXXFLAGS_RELEASE
+
+    This variable contains the C++ compiler flags for creating an
+    application. The value of this variable is typically handled by
+    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    to be modified.
+
+    \target QMAKE_CXXFLAGS_SHLIB
+    \section1 QMAKE_CXXFLAGS_SHLIB
+
+    This variable contains the C++ compiler flags for creating a
+    shared library.  The value of this variable is typically handled by
+    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    to be modified.
+
+    \target QMAKE_CXXFLAGS_THREAD
+    \section1 QMAKE_CXXFLAGS_THREAD
+
+    This variable contains the C++ compiler flags for creating a
+    multi-threaded application.  The value of this variable is typically handled by
+    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    to be modified.
+
+    \target QMAKE_CXXFLAGS_WARN_OFF
+    \section1 QMAKE_CXXFLAGS_WARN_OFF
+
+    This variable contains the C++ compiler flags for suppressing compiler warnings.
+    The value of this variable is typically handled by \c qmake or
+    \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \target QMAKE_CXXFLAGS_WARN_ON
+    \section1 QMAKE_CXXFLAGS_WARN_ON
+
+    This variable contains C++ compiler flags for generating compiler warnings.
+    The value of this variable is typically handled by \c qmake or
+    \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \target QMAKE_DISTCLEAN
+    \section1 QMAKE_DISTCLEAN
+
+    This variable removes extra files upon the invocation of \c{make distclean}.
+
+    \target QMAKE_EXTENSION_SHLIB
+    \section1 QMAKE_EXTENSION_SHLIB
+
+    This variable contains the extention for shared libraries.  The value of this
+    variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf}
+    and rarely needs to be modified.
+
+    Note that platform-specific variables that change the extension will override
+    the contents of this variable.
+
+    \section1 QMAKE_EXT_MOC
+
+    This variable changes the extention used on included moc files.
+
+    See also \l{Configuring qmake's Environment#Extensions}{File Extensions}.
+
+    \section1 QMAKE_EXT_UI
+
+    This variable changes the extention used on /e Designer UI files.
+
+    See also \l{Configuring qmake's Environment#Extensions}{File Extensions}.
+
+    \section1 QMAKE_EXT_PRL
+
+    This variable changes the extention used on created PRL files.
+
+    See also \l{Configuring qmake's Environment#Extensions}{File Extensions},
+             \l{Configuring qmake's Environment#libdepend}{Library Dependencies}.
+
+    \section1 QMAKE_EXT_LEX
+
+    This variable changes the extention used on files given to lex.
+
+    See also \l{Configuring qmake's Environment#Extensions}{File Extensions},
+             \l{#LEXSOURCES}{LEXSOURCES}.
+
+    \section1 QMAKE_EXT_YACC
+    This variable changes the extention used on files given to yacc.
+
+    See also \l{Configuring qmake's Environment#Extensions}{File Extensions},
+             \l{#YACCSOURCES}{YACCSOURCES}.
+
+    \section1 QMAKE_EXT_OBJ
+
+    This variable changes the extention used on generated object files.
+
+    See also \l{Configuring qmake's Environment#Extensions}{File Extensions}.
+
+    \section1 QMAKE_EXT_CPP
+
+    This variable changes the interpretation of all suffixes in this
+    list of values as files of type C++ source code.
+
+    See also \l{Configuring qmake's Environment#Extensions}{File Extensions}.
+
+    \section1 QMAKE_EXT_H
+
+    This variable changes the interpretation of all suffixes in this
+    list of values as files of type C header files.
+
+    See also \l{Configuring qmake's Environment#Extensions}{File Extensions}.
+
+        \section1 QMAKE_EXTRA_COMPILERS
+
+        This variable contains the extra compilers/preprocessors that have been added
+
+        See also \l{Configuring qmake's Environment#Customizing}{Customizing Makefile Output}
+
+        \section1 QMAKE_EXTRA_TARGETS
+
+        This variable contains the extra targets that have been added
+
+        See also \l{Configuring qmake's Environment#Customizing}{Customizing Makefile Output}
+
+    \target QMAKE_FAILED_REQUIREMENTS
+    \section1 QMAKE_FAILED_REQUIREMENTS
+
+    This variable contains the list of requirements that were failed to be met when
+    \c qmake was used.  For example, the sql module is needed and wasn't compiled into Qt.  The
+    value of this variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf}
+    and rarely needs to be modified.
+
+    \target QMAKE_FILETAGS
+    \section1 QMAKE_FILETAGS
+
+    This variable contains the file tags needed to be entered into the Makefile, such as SOURCES
+    and HEADERS.  The value of this variable is typically handled by \c qmake or
+    \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_FRAMEWORK_BUNDLE_NAME
+
+    In a framework project, this variable contains the name to be used for the
+    framework that is built.
+
+    By default, this variable contains the same value as the \l{#TARGET}{TARGET}
+    variable.
+
+    See \l{qmake Platform Notes#Creating Frameworks}{qmake Platform Notes} for
+    more information about creating frameworks and library bundles.
+
+    \e{This is used on Mac OS X only.}
+
+    \target QMAKE_FRAMEWORK_VERSION
+    \section1 QMAKE_FRAMEWORK_VERSION
+
+    For projects where the build target is a Mac OS X framework, this variable
+    is used to specify the version number that will be applied to the framework
+    that is built.
+
+    By default, this variable contains the same value as the \l{#VERSION}{VERSION}
+    variable.
+
+    See \l{qmake Platform Notes#Creating Frameworks}{qmake Platform Notes} for
+    more information about creating frameworks.
+
+    \e{This is used on Mac OS X only.}
+
+    \target QMAKE_INCDIR
+    \section1 QMAKE_INCDIR
+
+    This variable contains the location of all known header files to be added to
+    INCLUDEPATH when building an application.  The value of this variable is
+    typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely
+    needs to be modified.
+
+    \target QMAKE_INCDIR_OPENGL
+    \section1 QMAKE_INCDIR_OPENGL
+
+    This variable contains the location of OpenGL header files to be added
+    to INCLUDEPATH when building an application with OpenGL support. The
+    value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \target QMAKE_INCDIR_QT
+    \section1 QMAKE_INCDIR_QT
+
+    This variable contains the location of all known header file
+    paths to be added to INCLUDEPATH when building a Qt application. The value
+    of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \target QMAKE_INCDIR_THREAD
+    \section1 QMAKE_INCDIR_THREAD
+
+    This variable contains the location of all known header file
+    paths to be added to INCLUDEPATH when building a multi-threaded application.
+    The value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \target QMAKE_INCDIR_X11
+    \section1 QMAKE_INCDIR_X11
+
+    \e {This is used on Unix platforms only.}
+
+    This variable contains the location of X11 header file paths to be
+    added to INCLUDEPATH when building a X11 application.  The
+    value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \target QMAKE_INFO_PLIST
+    \section1 QMAKE_INFO_PLIST
+
+    \e {This is used on Mac OS X platforms only.}
+
+    This variable contains the name of the property list file, \c{.plist}, you
+    would like to include in your Mac OS X application bundle.
+
+    In the \c{.plist} file, you can define some variables, e.g., @EXECUTABLE@,
+    which qmake will replace with the actual executable name. Other variables
+    include @ICON@, @TYPEINFO@, @LIBRARY@, and @SHORT_VERSION@.
+
+    \note Most of the time, the default \c{Info.plist} is good enough.
+
+    \section1 QMAKE_LFLAGS
+
+    This variable contains a general set of flags that are passed to
+    the linker. If you need to change the flags used for a particular
+    platform or type of project, use one of the specialized variables
+    for that purpose instead of this variable.
+
+    \target QMAKE_LFLAGS_CONSOLE
+    \section1 QMAKE_LFLAGS_CONSOLE
+
+    \e {This is used on Windows only.}
+
+    This variable contains link flags when building console
+    programs.  The value of this variable is typically handled by
+    \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LFLAGS_CONSOLE_DLL
+
+    \e {This is used on Windows only.}
+
+    This variable contains link flags when building console
+    dlls.  The value of this variable is typically handled by
+    \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LFLAGS_DEBUG
+
+    This variable contains link flags when building debuggable applications.  The
+    value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LFLAGS_PLUGIN
+
+    This variable contains link flags when building plugins. The value
+    of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LFLAGS_QT_DLL
+
+    This variable contains link flags when building programs that
+    use the Qt library built as a dll. The value of this variable is
+    typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LFLAGS_RELEASE
+
+    This variable contains link flags when building applications for
+    release. The value of this variable is typically handled by
+    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LFLAGS_SHAPP
+
+    This variable contains link flags when building applications which are using
+    the \c app template.  The value of this variable is typically handled by
+    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LFLAGS_SHLIB
+
+    This variable contains link flags when building shared libraries
+    The value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LFLAGS_SONAME
+
+    This variable specifies the link flags to set the name of shared objects,
+    such as .so or .dll.  The value of this variable is typically handled by \c
+    qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LFLAGS_THREAD
+
+    This variable contains link flags when building multi-threaded projects.
+    The value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LFLAGS_WINDOWS
+
+    \e {This is used on Windows only.}
+
+    This variable contains link flags when building Windows GUI projects
+    (i.e. non-console applications).
+    The value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LFLAGS_WINDOWS_DLL
+
+    \e {This is used on Windows only.}
+
+    This variable contains link flags when building Windows DLL projects.
+    The value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LIBDIR
+
+    This variable contains the location of all known library
+    directories.The value of this variable is typically handled by
+    \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LIBDIR_FLAGS
+
+    \e {This is used on Unix platforms only.}
+
+    This variable contains the location of all library
+    directory with -L prefixed.  The value of this variable is typically handled by
+    \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LIBDIR_OPENGL
+
+    This variable contains the location of the OpenGL library
+    directory.The value of this variable is typically handled by
+    \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LIBDIR_QT
+
+    This variable contains the location of the Qt library
+    directory.The value of this variable is typically handled by
+    \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LIBDIR_X11
+
+    \e {This is used on Unix platforms only.}
+
+    This variable contains the location of the X11 library
+    directory.The value of this variable is typically handled by
+    \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LIBS
+
+    This variable contains all project libraries.  The value of this
+    variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LIBS_CONSOLE
+
+    \e {This Windows-specific variable is no longer used.}
+
+    Prior to Qt 4.2, this variable was used to list the libraries
+    that should be linked against when building a console application
+    project on Windows. \l{#QMAKE_LIBS_WINDOW}{QMAKE_LIBS_WINDOW}
+    should now be used instead.
+
+    \section1 QMAKE_LIBS_OPENGL
+
+    This variable contains all OpenGL libraries.  The value of this
+    variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LIBS_OPENGL_QT
+
+    This variable contains all OpenGL Qt libraries.The value of this
+    variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LIBS_QT
+
+    This variable contains all Qt libraries.The value of this
+    variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LIBS_QT_DLL
+
+    \e {This is used on Windows only.}
+
+    This variable contains all Qt libraries when Qt is built as a dll.  The
+    value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LIBS_QT_OPENGL
+
+    This variable contains all the libraries needed to link against if
+    OpenGL support is turned on. The
+    value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LIBS_QT_THREAD
+
+    This variable contains all the libraries needed to link against if
+    thread support is turned on.  The
+    value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LIBS_RT
+
+    \e {This is used with Borland compilers only.}
+
+    This variable contains the runtime library needed to link against when
+    building an application.  The
+    value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LIBS_RTMT
+
+    \e {This is used with Borland compilers only.}
+
+    This variable contains the runtime library needed to link against when
+    building a multi-threaded application.  The
+    value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LIBS_THREAD
+
+    \e {This is used on Unix platforms only.}
+
+    This variable contains all libraries that need to be linked against
+    when building a multi-threaded application.  The
+    value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LIBS_WINDOWS
+
+    \e {This is used on Windows only.}
+
+    This variable contains all windows libraries.The value of this
+    variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LIBS_X11
+
+    \e {This is used on Unix platforms only.}
+
+    This variable contains all X11 libraries.The value of this
+    variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LIBS_X11SM
+
+    \e {This is used on Unix platforms only.}
+
+    This variable contains all X11 session management libraries.  The
+    value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LIB_FLAG
+
+    This variable is not empty if the \c lib template is specified.  The
+    value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_LINK_SHLIB_CMD
+
+    This variable contains the command to execute when creating a
+    shared library. The
+    value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_POST_LINK
+
+    This variable contains the command to execute after linking the TARGET
+    together. This variable is normally empty and therefore nothing is
+    executed, additionally some backends will not support this - mostly only
+    Makefile backends.
+
+    \section1 QMAKE_PRE_LINK
+
+    This variable contains the command to execute before linking the TARGET
+    together. This variable is normally empty and therefore nothing is
+    executed, additionally some backends will not support this - mostly only
+    Makefile backends.
+
+    \section1 QMAKE_LN_SHLIB
+
+    This variable contains the command to execute when creating a link
+    to a shared library. The
+    value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_MAC_SDK
+
+    This variable is used on Mac OS X when building universal binaries.
+    This process is described in more detail in the
+    \l{Deploying an Application on Mac OS X#Architecture Dependencies}{Deploying
+    an Application on Mac OS X} document.
+
+    \section1 QMAKE_MACOSX_DEPLOYMENT_TARGET
+    This variable only has an effect when building on Mac OS X. On that
+    platform, the variable will be forwarded to the MACOSX_DEPLOYMENT_TARGET
+    environment variable, which is interpreted by the compiler or linker.
+    For more information, see the
+    \l{Deploying an Application on Mac OS X#Mac OS X Version Dependencies}{Deploying
+    an Application on Mac OS X} document.
+
+    \section1 QMAKE_MAKEFILE
+
+    This variable contains the name of the Makefile to create. The
+    value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_MOC_SRC
+
+    This variable contains the names of all moc source files to
+    generate and include in the project. The value of this variable is
+    typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_QMAKE
+
+    This variable contains the location of qmake if it is not in the path.
+    The value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_QT_DLL
+
+    This variable is not empty if Qt was built as a dll.  The
+    value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_RESOURCE_FLAGS
+
+    This variable is used to customize the list of options passed to the
+    \l{rcc}{Resource Compiler} in each of the build rules where it is used.
+    For example, the following line ensures that the \c{-threshold} and
+    \c{-compress} options are used with particular values each time that
+    \c rcc is invoked:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 45
+
+    \section1 QMAKE_RUN_CC
+
+    This variable specifies the individual rule needed to build an object.
+    The value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_RUN_CC_IMP
+
+    This variable specifies the individual rule needed to build an object.
+    The value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_RUN_CXX
+
+    This variable specifies the individual rule needed to build an object.
+    The value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_RUN_CXX_IMP
+
+    This variable specifies the individual rule needed to build an object.
+    The value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_TARGET
+
+    This variable contains the name of the project target.  The value of
+    this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 QMAKE_UIC
+
+    This variable contains the location of uic if it is not in the path.
+    The value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    It can be used to specify arguments to uic as well, such as additional plugin
+    paths.  For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 46
+
+    \section1 QT
+
+    The values stored in the \c QT variable control which of the Qt modules are
+    used by your project.
+
+    The table below shows the options that can be used with the \c QT variable
+    and the features that are associated with each of them:
+
+    \table
+    \header \o Option                     \o Features
+    \row    \o core (included by default) \o QtCore module
+    \row    \o gui  (included by default) \o QtGui module
+    \row    \o network                    \o QtNetwork module
+    \row    \o opengl                     \o QtOpenGL module
+    \row    \o phonon                     \o Phonon Multimedia Framework
+    \row    \o sql                        \o QtSql module
+    \row    \o svg                        \o QtSvg module
+    \row    \o xml                        \o QtXml module
+    \row    \o webkit                     \o WebKit integration
+    \row    \o qt3support                 \o Qt3Support module
+    \endtable
+
+    By default, \c QT contains both \c core and \c gui, ensuring that standard
+    GUI applications can be built without further configuration.
+
+    If you want to build a project \e without the QtGui module, you need to
+    exclude the \c gui value with the "-=" operator; the following line will
+    result in a minimal Qt project being built:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 47
+
+    Note that adding the \c opengl option to the \c QT variable automatically
+    causes the equivalent option to be added to the \c CONFIG variable.
+    Therefore, for Qt applications, it is not necessary to add the \c opengl
+    option to both \c CONFIG and \c{QT}.
+
+    \section1 QTPLUGIN
+
+    This variable contains a list of names of static plugins that are to be
+    compiled with an application so that they are available as built-in
+    resources.
+
+    \target QT_VERSION
+    \section1 QT_VERSION
+
+    This variable contains the current version of Qt.
+
+    \target QT_MAJOR_VERSION
+    \section1 QT_MAJOR_VERSION
+
+    This variable contains the current major version of Qt.
+
+    \target QT_MINOR_VERSION
+    \section1 QT_MINOR_VERSION
+
+    This variable contains the current minor version of Qt.
+
+    \target QT_PATCH_VERSION
+    \section1 QT_PATCH_VERSION
+
+    This variable contains the current patch version of Qt.
+
+    \section1 RC_FILE
+
+    This variable contains the name of the resource file for the application.
+    The value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \target RCC_DIR
+    \section1 RCC_DIR
+
+    This variable specifies the directory where all intermediate
+    resource files should be placed.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 48
+
+    \target REQUIRES
+    \section1 REQUIRES
+
+    This is a special variable processed by \c qmake.  If the
+    contents of this variable do not appear in CONFIG by the time this
+    variable is assigned, then a minimal Makefile will be generated that
+    states what dependencies (the values assigned to REQUIRES) are
+    missing.
+
+    This is mainly used in Qt's build system for building the examples.
+
+    \section1 RES_FILE
+
+    This variable contains the name of the resource file for the application.
+    The value of this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \target SIGNATURE_FILE
+    \section1 SIGNATURE_FILE
+
+    \e {This is only used on Windows CE.}
+
+    Specifies which signature file should be used to sign the project target.
+
+    \note This variable will overwrite the setting you have specified in configure,
+    with the \c -signature option.
+
+    \target SOURCES
+    \section1 SOURCES
+
+    This variable contains the name of all source files in the project.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 49
+
+    See also \l{#HEADERS}{HEADERS}
+
+    \section1 SRCMOC
+
+    This variable is set by \c qmake if files can be found that
+    contain the Q_OBJECT macro.  \c SRCMOC contains the
+    name of all the generated moc files. The value of this variable
+    is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
+    modified.
+
+    \target SUBDIRS
+    \section1 SUBDIRS
+
+    This variable, when used with the \l{#TEMPLATE}{\c subdirs template}
+    contains the names of all subdirectories that contain parts of the project
+    that need be built. Each subdirectory must contain its own project file.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 50
+
+    It is essential that the project file in each subdirectory has the same
+    name as the subdirectory itself, so that \c qmake can find it.
+    For example, if the subdirectory is called \c myapp then the project file
+    in that directory should be called \c myapp.pro.
+
+    If you need to ensure that the subdirectories are built in the order in
+    which they are specified, update the \l{#CONFIG}{CONFIG} variable to
+    include the \c ordered option:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 51
+
+    \target TARGET
+    \section1 TARGET
+
+    This specifies the name of the target file.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 52
+
+    The project file above would produce an executable named \c myapp on
+    unix and 'myapp.exe' on windows.
+
+    \section1 TARGET_EXT
+
+    This variable specifies the target's extension.  The value of this variable
+    is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
+    modified.
+
+    \section1 TARGET_x
+
+    This variable specifies the target's extension with a major version number.  The value of this variable
+    is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
+    modified.
+
+    \section1 TARGET_x.y.z
+
+    This variable specifies the target's extension with version number.  The value of this variable
+    is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
+    modified.
+
+    \target TEMPLATE
+    \section1 TEMPLATE
+
+    This variable contains the name of the template to use when
+    generating the project.  The allowed values are:
+
+    \table
+    \header \o Option \o Description
+    \row    \o app    \o Creates a Makefile for building applications (the default). (See
+            \l{qmake Common Projects#Application}{qmake Common Projects} for more information.)
+    \row    \o lib    \o Creates a Makefile for building libraries. (See
+            \l{qmake Common Projects#Library}{qmake Common Projects} for more information.)
+    \row    \o subdirs \o Creates a Makefile for building targets in subdirectories.
+            The subdirectories are specified using the \l{#SUBDIRS}{SUBDIRS}
+            variable.
+    \row    \o vcapp  \o \e {Windows only} Creates an application project for Visual Studio.
+            (See \l{qmake Platform Notes#Creating Visual Studio Project Files}{qmake Platform Notes}
+            for more information.)
+    \row    \o vclib  \o \e {Windows only} Creates a library project for Visual Studio.
+            (See \l{qmake Platform Notes#Creating Visual Studio Project Files}{qmake Platform Notes}
+            for more information.)
+    \endtable
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 53
+
+    The template can be overridden by specifying a new template type with the
+    \c -t command line option. This overrides the template type \e after the .pro
+    file has been processed. With .pro files that use the template type to
+    determine how the project is built, it is necessary to declare TEMPLATE on
+    the command line rather than use the \c -t option.
+
+    \section1 TRANSLATIONS
+
+    This variable contains a list of translation (.ts) files that contain
+    translations of the user interface text into non-native languages.
+
+    See the \l{Qt Linguist Manual} for more information about
+    internationalization (i18n) and localization (l10n) with Qt.
+
+    \section1 UICIMPLS
+
+    This variable contains a list of the generated implementation files by UIC.
+    The value of this variable
+    is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
+    modified.
+
+    \section1 UICOBJECTS
+
+    This variable is generated from the UICIMPLS variable.  The extension of each
+    file will have been replaced by .o (Unix) or .obj (Win32).  The value of this variable is
+    typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and
+    rarely needs to be modified.
+
+    \target UI_DIR
+    \section1 UI_DIR
+
+    This variable specifies the directory where all intermediate files from uic
+    should be placed. This variable overrides both UI_SOURCES_DIR and
+    UI_HEADERS_DIR.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 54
+
+    \target UI_HEADERS_DIR
+    \section1 UI_HEADERS_DIR
+
+    This variable specifies the directory where all declaration files (as
+    generated by uic) should be placed.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 55
+
+    \target UI_SOURCES_DIR
+    \section1 UI_SOURCES_DIR
+
+    This variable specifies the directory where all implementation files (as generated
+    by uic) should be placed.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 56
+
+    \target VERSION
+    \section1 VERSION
+
+    This variable contains the version number of the application or library if
+    either the \c app \l{#TEMPLATE}{TEMPLATE} or the \c lib \l{#TEMPLATE}{TEMPLATE}
+    is specified.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 57
+
+    \section1 VER_MAJ
+
+    This variable contains the major version number of the library, if the
+    \c lib \l{#TEMPLATE}{template} is specified.
+
+    \section1 VER_MIN
+
+    This variable contains the minor version number of the library, if the
+    \c lib \l{#TEMPLATE}{template} is specified.
+
+    \section1 VER_PAT
+
+    This variable contains the patch version number of the library, if the
+    \c lib \l{#TEMPLATE}{template} is specified.
+
+    \section1 VPATH
+
+    This variable tells \c qmake where to search for files it cannot
+    open. With this you may tell \c qmake where it may look for things
+    like SOURCES, and if it finds an entry in SOURCES that cannot be
+    opened it will look through the entire VPATH list to see if it can
+    find the file on its own.
+
+    See also \l{#DEPENDPATH}{DEPENDPATH}.
+
+    \section1 YACCIMPLS
+
+    This variable contains a list of yacc source files. The value of
+    this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \section1 YACCOBJECTS
+
+    This variable contains a list of yacc object files. The value of
+    this variable is typically handled by \c qmake or
+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
+    \target YACCSOURCES
+    \section1 YACCSOURCES
+
+    This variable contains a list of yacc source files to be included
+    in the project.  All dependencies, headers and source files will
+    automatically be included in the project.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 58
+
+    \section1 _PRO_FILE_
+
+    This variable contains the path to the project file in use.
+
+    For example, the following line causes the location of the project
+    file to be written to the console:
+
+    \snippet doc/src/snippets/qmake/project_location.pro project file
+
+    \section1 _PRO_FILE_PWD_
+
+    This variable contains the path to the directory containing the project
+    file in use.
+
+    For example, the following line causes the location of the directory
+    containing the project file to be written to the console:
+
+    \snippet doc/src/snippets/qmake/project_location.pro project file directory
+*/
+
+/*!
+    \page qmake-function-reference.html
+    \title qmake Function Reference
+    \contentspage {qmake Manual}{Contents}
+    \previouspage qmake Variable Reference
+    \nextpage Configuring qmake's Environment
+
+    \c qmake provides built-in functions to allow the contents of
+    variables to be processed, and to enable tests to be performed
+    during the configuration process. Functions that process the
+    contents of variables typically return values that can be assigned
+    to other variables, and these values are obtained by prefixing
+    function with the \c $$ operator. Functions that perform tests
+    are usually used as the conditional parts of scopes; these are
+    indicated in the function descriptions below.
+
+    \tableofcontents{2}
+
+    \section1 basename(variablename)
+
+    Returns the basename of the file specified. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 59
+
+    \section1 CONFIG(config)
+    [Conditional]
+
+    This function can be used to test for variables placed into the
+    \c CONFIG variable. This is the same as regular old style (tmake) scopes,
+    but has the added advantage a second parameter can be passed to test for
+    the active config. As the order of values is important in \c CONFIG
+    variables (i.e. the last one set will be considered the active config for
+    mutually exclusive values) a second parameter can be used to specify a set
+    of values to consider. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 60
+
+    Because release is considered the active setting (for feature parsing)
+    it will be the CONFIG used to generate the build file. In the common
+    case a second parameter is not needed, but for specific mutual
+    exclusive tests it is invaluable.
+
+    \section1 contains(variablename, value)
+    [Conditional]
+
+    Succeeds if the variable \e variablename contains the value \e value;
+    otherwise fails. You can check the return value of this function using
+    a scope.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 61
+
+    The contents of the scope are only processed if the \c drivers
+    variable contains the value, \c network. If this is the case, the
+    appropriate files are added to the \c SOURCES and \c HEADERS
+    variables.
+
+    \section1 count(variablename, number)
+    [Conditional]
+
+    Succeeds if the variable \e variablename contains a list with the
+    specified \e number of value; otherwise fails.
+
+    This function is used to ensure that declarations inside a scope are
+    only processed if the variable contains the correct number of values;
+    for example:
+
+    \snippet doc/src/snippets/qmake/functions.pro 2
+
+    \section1 dirname(file)
+
+    Returns the directory name part of the specified file. For example:
+
+    \snippet doc/src/snippets/qmake/dirname.pro 0
+
+    \section1 error(string)
+
+    This function never returns a value. \c qmake displays the given
+    \e string to the user, and exits. This function should only be used
+    for unrecoverable errors.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 62
+
+    \section1 eval(string)
+    [Conditional]
+
+    Evaluates the contents of the string using \c qmake's syntax rules
+    and returns true.
+    Definitions and assignments can be used in the string to modify the
+    values of existing variables or create new definitions.
+
+    For example:
+    \snippet doc/src/snippets/qmake/functions.pro 4
+
+    Note that quotation marks can be used to delimit the string, and that
+    the return value can be discarded if it is not needed.
+
+    \section1 exists(filename)
+    [Conditional]
+
+    Tests whether a file with the given \e filename exists.
+    If the file exists, the function succeeds; otherwise it fails.
+    If a regular expression is specified for the filename, this function
+    succeeds if any file matches the regular expression specified.
+
+    For example:
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 63
+
+    Note that "/" can be used as a directory separator, regardless of the
+    platform in use.
+
+    \section1 find(variablename, substr)
+
+    Places all the values in \e variablename that match \e substr. \e
+    substr may be a regular expression, and will be matched accordingly.
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 64
+
+    MY_VAR2 will contain '-Lone -Ltwo -Lthree -Lfour -Lfive', and MY_VAR3 will
+    contains 'three two three'.
+
+    \section1 for(iterate, list)
+
+    This special test function will cause a loop to be started that
+    iterates over all values in \e list, setting \e iterate to each
+    value in turn. As a convenience, if \e list is 1..10 then iterate will
+    iterate over the values 1 through 10.
+
+    The use of an else scope afer a condition line with a for() loop is
+    disallowed.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 65
+
+    \section1 include(filename)
+    [Conditional]
+
+    Includes the contents of the file specified by \e filename into the
+    current project at the point where it is included. This function
+    succeeds if \e filename is included; otherwise it fails. The included
+    file is processed immediately.
+
+    You can check whether the file was included by using this function as
+    the condition for a scope; for example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 66
+
+    \section1 infile(filename, var, val)
+    [Conditional]
+
+    Succeeds if the file \e filename (when parsed by \c qmake itself)
+    contains the variable \e var with a value of \e val; otherwise fails.
+    If you do not specify a third argument (\e val), the function will
+    only test whether \e var has been declared in the file.
+
+    \section1 isEmpty(variablename)
+    [Conditional]
+
+    Succeeds if the variable \e variablename is empty; otherwise fails.
+    This is the equivalent of \c{count( variablename, 0 )}.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 67
+
+    \section1 join(variablename, glue, before, after)
+
+    Joins the value of \e variablename with \c glue. If this value is
+    non-empty it prefixes the value with \e before and suffix it with \e
+    after. \e variablename is the only required field, the others default
+    to empty strings. If you need to encode spaces in \e glue, \e before, or \e
+    after you must quote them.
+
+    \section1 member(variablename, position)
+
+    Returns the value at the given \e position in the list of items in
+    \e variablename.
+    If an item cannot be found at the position specified, an empty string is
+    returned. \e variablename is the only required field. If not specified,
+    \c position defaults to 0, causing the first value in the list to be
+    returned.
+
+    \section1 message(string)
+
+    This function simply writes a message to the console. Unlike the
+    \c error() function, this function allows processing to continue.
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 68
+
+    The above line causes "This is a message" to be written to the console.
+    The use of quotation marks is optional.
+
+    \note By default, messages are written out for each Makefile generated by
+    qmake for a given project. If you want to ensure that messages only appear
+    once for each project, test the \c build_pass variable
+    \l{qmake Advanced Usage}{in conjunction with a scope} to filter out
+    messages during builds; for example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 69
+
+    \section1 prompt(question)
+
+    Displays the specified \e question, and returns a value read from stdin.
+
+    \section1 quote(string)
+
+    Converts a whole \e string into a single entity and returns the result.
+    Newlines, carriage returns, and tabs can be specified in the string
+    with \\n \\r and \\t. The return value does not contain either single
+    or double quotation marks unless you explicitly include them yourself,
+    but will be placed into a single entry (for literal expansion).
+
+    \section1 replace(string, old_string, new_string)
+
+    Replaces each instance of \c old_string with \c new_string in the
+    contents of the variable supplied as \c string. For example, the
+    code
+
+    \snippet doc/src/snippets/qmake/replace.pro 0
+
+    prints the message:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 70
+
+    \section1 sprintf(string, arguments...)
+
+    Replaces %1-%9 with the arguments passed in the comma-separated list
+    of function \e arguments and returns the processed string.
+
+    \section1 system(command)
+    [Conditional]
+
+    Executes the given \c command in a secondary shell, and succeeds
+    if the command returns with a zero exit status; otherwise fails.
+    You can check the return value of this function using a scope:
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 71
+
+    Alternatively, you can use this function to obtain stdout and stderr
+    from the command, and assign it to a variable. For example, you can
+    use this to interrogate information about the platform:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 72
+
+    \target unique
+    \section1 unique(variablename)
+
+    This will return a list of values in variable that are unique (that is
+    with repetitive entries removed). For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 73
+
+    \section1 warning(string)
+
+    This function will always succeed, and will display the given
+    \e string to the user. message() is a synonym for warning().
+*/
+
+/*!
+    \page qmake-environment-reference.html
+    \contentspage {qmake Manual}{Contents}
+    \previouspage qmake Function Reference
+
+    \title Configuring qmake's Environment
+
+    \tableofcontents
+
+    \target Properties
+    \section1 Properties
+
+    \c qmake has a system of persistant information, this allows you to
+    \c set a variable in qmake once, and each time qmake is invoked this
+    value can be queried. Use the following to set a property in qmake:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 74
+
+    The appropriate variable and value should be substituted for
+    \c VARIABLE and \c VALUE.
+
+    To retrieve this information back from qmake you can do:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 75
+
+    \note \c{qmake -query} will only list variables that you have
+    previously set with \c{qmake -set VARIABLE VALUE}.
+
+    This information will be saved into a QSettings object (meaning it
+    will be stored in different places for different platforms). As
+    \c VARIABLE is versioned as well, you can set one value in an older
+    version of \c qmake, and newer versions will retrieve this value. However,
+    if you set \c VARIABLE for a newer version of \c qmake, the older version
+    will not use this value. You can however query a specific version of a
+    variable if you prefix that version of \c qmake to \c VARIABLE, as in
+    the following example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 76
+
+    \c qmake also has the notion of \c builtin properties, for example you can
+    query the installation of Qt for this version of \c qmake with the
+    \c QT_INSTALL_PREFIX property:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 77
+
+    These built-in properties cannot have a version prefixed to them as
+    they are not versioned, and each version of \c qmake will have its own
+    built-in set of these values. The list below outlines the built-in
+    properties:
+
+    \list
+    \o \c QT_INSTALL_PREFIX - Where the version of Qt this qmake is built for resides
+    \o \c QT_INSTALL_DATA - Where data for this version of Qt resides
+    \o \c QMAKE_VERSION - The current version of qmake
+    \endlist
+
+    Finally, these values can be queried in a project file with a special
+    notation such as:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 78
+
+    \target QMAKESPEC
+    \section1 QMAKESPEC
+
+    \c qmake requires a platform and compiler description file which
+    contains many default values used to generate appropriate Makefiles.
+    The standard Qt distribution comes with many of these files, located
+    in the \c mkspecs subdirectory of the Qt installation.
+
+    The \c QMAKESPEC environment variable can contain any of the following:
+
+    \list
+    \o A complete path to a directory containing a \c{qmake.conf} file.
+       In this case \c qmake will open the \c{qmake.conf} file from within that
+       directory.  If the file does not exist, \c qmake will exit with an
+       error.
+    \o The name of a platform-compiler combination. In this case, \c qmake
+       will search in the directory specified by the \c mkspecs subdirectory
+       of the data path specified when Qt was compiled (see
+       QLibraryInfo::DataPath).
+    \endlist
+
+    \bold{Note:} The \c QMAKESPEC path will automatically be added to the
+    \l{qmake Variable Reference#INCLUDEPATH}{INCLUDEPATH} system variable.
+
+    \target INSTALLS
+    \section1 INSTALLS
+
+    It is common on Unix to also use the build tool to install applications
+    and libraries; for example, by invoking \c{make install}. For this reason,
+    \c qmake has the concept of an install set, an object which contains
+    instructions about the way part of a project is to be installed.
+    For example, a collection of documentation files can be described in the
+    following way:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 79
+
+    The \c path member informs \c qmake that the files should be installed in
+    \c /usr/local/program/doc (the path member), and the \c files member
+    specifies the files that should be copied to the installation directory.
+    In this case, everything in the \c docs directory will be coped to
+    \c /usr/local/program/doc.
+
+    Once an install set has been fully described, you can append it to the
+    install list with a line like this:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 80
+
+    \c qmake will ensure that the specified files are copied to the installation
+    directory. If you require greater control over this process, you can also
+    provide a definition for the \c extra member of the object. For example,
+    the following line tells \c qmake to execute a series of commands for this
+    install set:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 81
+
+    The \c unix scope
+    (see \l{qmake Advanced Usage#Scopes and Conditions}{Scopes and Conditions})
+    ensures that these particular commands are only executed on Unix platforms.
+    Appropriate commands for other platforms can be defined using other scope
+    rules.
+
+    Commands specified in the \c extra member are executed before the instructions
+    in the other members of the object are performed.
+
+    If you append a built-in install set to the \c INSTALLS variable and do
+    not specify \c files or \c extra members, \c qmake will decide what needs to
+    be copied for you. Currently, the only supported built-in install set is
+    \c target:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 82
+
+    In the above lines, \c qmake knows what needs to be copied, and will handle
+    the installation process automatically.
+
+    \target cache
+    \section1 Cache File
+
+    The cache file is a special file \c qmake reads to find settings not specified
+    in the \c qmake.conf file, project files, or at the command line. If
+    \c -nocache is not specified when \c qmake is run, it will try to find a file
+    called \c{.qmake.cache} in parent directories of the current directory. If
+    it fails to find this file, it will silently ignore this step of processing.
+
+    \target LibDepend
+    \section1 Library Dependencies
+
+    Often when linking against a library, \c qmake relies on the underlying
+    platform to know what other libraries this library links against, and
+    lets the platform pull them in. In many cases, however, this is not
+    sufficent. For example, when statically linking a library, no other
+    libraries are linked to, and therefore no dependencies to those
+    libraries are created. However, an application that later links
+    against this library will need to know where to find the symbols that
+    the static library will require. To help with this situation, \c qmake
+    attempts to follow a library's dependencies where appropriate, but
+    this behavior must be explicitly enabled by following two steps.
+
+    The first step is to enable dependency tracking in the library itself.
+    To do this you must tell \c qmake to save information about the library:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 83
+
+    This is only relevant to the \c lib template, and will be ignored for
+    all others. When this option is enabled, \c qmake will create a file
+    ending in .prl which will save some meta-information about the
+    library. This metafile is just like an ordinary project file, but only
+    contains internal variable declarations. You are free to view this file
+    and, if it is deleted, \c qmake will know to recreate it when necessary,
+    either when the project file is later read, or if a dependent library
+    (described below) has changed. When installing this library, by
+    specifying it as a target in an \c INSTALLS declaration, \c qmake will
+    automatically copy the .prl file to the installation path.
+
+    The second step in this process is to enable reading of this meta
+    information in the applications that use the static library:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 84
+
+    When this is enabled, \c qmake will process all libraries linked to
+    by the application and find their meta-information. \c qmake will use
+    this to determine the relevant linking information, specifically adding
+    values to the application project file's list of \c DEFINES as well as
+    \c LIBS. Once \c qmake has processed this file, it will then look through
+    the newly introduced libraries in the \c LIBS variable, and find their
+    dependent .prl files, continuing until all libraries have been resolved.
+    At this point, the Makefile is created as usual, and the libraries are
+    linked explicitlyy against the application.
+
+    The internals of the .prl file are left closed so they can easily
+    change later. They are not designed to be changed by hand, should only
+    be created by \c qmake, and should not be transferred between operating
+    systems as they may contain platform-dependent information.
+
+    \target Extensions
+    \section1 File Extensions
+
+    Under normal circumstances \c qmake will try to use appropriate file extensions
+    for your platform. However, it is sometimes necessary to override the default
+    choices for each platform and explicitly define file extensions for \c qmake to use.
+    This is achieved by redefining certain built-in variables; for example the extension
+    used for \l moc files can be redefined with the following assignment in a project
+    file:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 85
+
+    The following variables can be used to redefine common file extensions recognized
+    by \c qmake:
+
+    \list
+    \o QMAKE_EXT_MOC - This modifies the extension placed on included moc files.
+    \o QMAKE_EXT_UI - This modifies the extension used for designer UI files (usually
+                      in \c FORMS).
+    \o QMAKE_EXT_PRL - This modifies the extension placed on
+                       \l{#LibDepend}{library dependency files}.
+    \o QMAKE_EXT_LEX - This changes the suffix used in files (usually in \c LEXSOURCES).
+    \o QMAKE_EXT_YACC - This changes the suffix used in files (usually in \c YACCSOURCES).
+    \o QMAKE_EXT_OBJ - This changes the suffix used on generated object files.
+    \endlist
+
+    All of the above accept just the first value, so you must assign to it just one
+    value that will be used throughout your project file. There are two variables that
+    accept a list of values:
+
+    \list
+    \o QMAKE_EXT_CPP - Causes \c qmake to interpret all files with these suffixes as
+                       C++ source files.
+    \o QMAKE_EXT_H - Causes \c qmake to interpret all files with these suffixes as
+                     C and C++ header files.
+    \endlist
+
+    \target Customizing
+    \section1 Customizing Makefile Output
+
+    \c qmake tries to do everything expected of a cross-platform build tool.
+    This is often less than ideal when you really need to run special
+    platform-dependent commands. This can be achieved with specific instructions
+    to the different \c qmake backends.
+
+    Customization of the Makefile output is performed through an object-style
+    API as found in other places in \c qmake. Objects are defined automatically
+    by specifying their members; for example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 86
+
+    The definitions above define a \c qmake target called \c mytarget, containing
+    a Makefile target called \c{.buildfile} which in turn is generated with
+    the \c touch command. Finally, the \c{.depends} member specifies that
+    \c mytarget depends on \c mytarget2, another target that is defined afterwards.
+    \c mytarget2 is a dummy target; it is only defined to echo some text to
+    the console.
+
+    The final step is to instruct \c qmake that this object is a target to be built:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 87
+
+    This is all you need to do to actually build custom targets. Of course, you may
+    want to tie one of these targets to the
+    \l{qmake Variable Reference#TARGET}{qmake build target}. To do this, you simply need to
+    include your Makefile target in the list of
+    \l{qmake Variable Reference#PRE_TARGETDEPS}{PRE_TARGETDEPS}.
+
+    The following tables are an overview of the options available to you with the QMAKE_EXTRA_TARGETS
+    variable.
+
+    \table
+    \header
+        \o Member
+        \o Description
+    \row
+        \o commands
+        \o The commands for generating the custom build target.
+    \row
+        \o CONFIG
+        \o Specific configuration options for the custom build target.  See the CONFIG table for details.
+    \row
+        \o depends
+        \o The existing build targets that the custom build target depends on.
+    \row
+        \o recurse
+        \o Specifies which sub-targets should used when creating the rules in the Makefile to call in
+           the sub-target specific Makefile.  This is only used when \c recursive is set in the CONFIG.
+    \row
+        \o recurse_target
+        \o Specifies the target that should be built via the sub-target Makefile for the rule in the Makefile.
+           This adds something like $(MAKE) -f Makefile.[subtarget] [recurse_target].  This is only used when
+           \c recursive is set in the CONFIG.
+    \row
+        \o target
+        \o The file being created by the custom build target.
+    \endtable
+
+    List of members specific to the CONFIG option:
+
+    \table
+    \header
+        \o Member
+        \o Description
+    \row
+        \o recursive
+        \o Indicates that rules should be created in the Makefile and thus call
+           the relevant target inside the sub-target specific Makefile.  This defaults to creating
+           an entry for each of the sub-targets.
+    \endtable
+
+    For convenience, there is also a method of customizing projects
+    for new compilers or preprocessors:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 88
+
+    With the above definitions, you can use a drop-in replacement for moc if one
+    is available. The commands is executed on all arguments given to the
+    \c NEW_HEADERS variable (from the \c input member), and the result is written
+    to the file defined by the \c output member; this file is added to the
+    other source files in the project.
+    Additionally, \c qmake will execute \c depend_command to generate dependency
+    information, and place this information in the project as well.
+
+    These commands can easily be placed into a cache file, allowing subsequent
+    project files to add arguments to \c NEW_HEADERS.
+
+    The following tables are an overview of the options available to you with the QMAKE_EXTRA_COMPILERS
+    variable.
+
+    \table
+    \header
+        \o Member
+        \o Description
+    \row
+        \o commands
+        \o The commands used for for generating the output from the input.
+    \row
+        \o CONFIG
+        \o Specific configuration options for the custom compiler.  See the CONFIG table for details.
+    \row
+        \o depend_command
+        \o Specifies a command used to generate the list of dependencies for the output.
+    \row
+        \o dependency_type
+        \o Specifies the type of file the output is, if it is a known type (such as TYPE_C,
+           TYPE_UI, TYPE_QRC) then it is handled as one of those type of files.
+    \row
+        \o depends
+        \o Specifies the dependencies of the output file.
+    \row
+        \o input
+        \o The variable that contains the files that should be processed with the custom compiler.
+    \row
+        \o name
+        \o A description of what the custom compiler is doing.  This is only used in some backends.
+    \row
+        \o output
+        \o The filename that is created from the custom compiler.
+    \row
+        \o output_function
+        \o Specifies a custom qmake function that is used to specify the filename to be created.
+    \row
+        \o variables
+        \o Indicates that the variables specified here are replaced with $(QMAKE_COMP_VARNAME) when refered to
+           in the pro file as $(VARNAME).
+    \row
+        \o variable_out
+        \o The variable that the files created from the output should be added to.
+    \endtable
+
+    List of members specific to the CONFIG option:
+
+    \table
+    \header
+        \o Member
+        \o Description
+    \row
+        \o combine
+        \o Indicates that all of the input files are combined into a single output file.
+    \row
+        \o target_predeps
+        \o Indicates that the output should be added to the list of PRE_TARGETDEPS.
+    \row
+        \o explicit_dependencies
+        \o The dependencies for the output only get generated from the depends member and from
+           nowhere else.
+    \row
+        \o no_link
+        \o Indicates that the output should not be added to the list of objects to be linked in
+    \endtable
+*/
+
+/*!
+    \page qmake-advanced-usage.html
+    \title qmake Advanced Usage
+    \contentspage {qmake Manual}{Contents}
+    \previouspage qmake Platform Notes
+    \nextpage Using Precompiled Headers
+
+    Many \c qmake project files simply describe the sources and header files used
+    by the project, using a list of \c{name = value} and \c{name += value}
+    definitions. \c qmake also provides other operators, functions, and scopes
+    that can be used to process the information supplied in variable declarations.
+    These advanced features allow Makefiles to be generated for multiple platforms
+    from a single project file.
+
+    \tableofcontents
+
+    \section1 Operators
+
+    In many project files, the assignment (\c{=}) and append (\c{+=}) operators can
+    be used to include all the information about a project. The typical pattern of
+    use is to assign a list of values to a variable, and append more values
+    depending on the result of various tests. Since \c qmake defines certain
+    variables using default values, it is sometimes necessary to use the removal
+    (\c{-=}) operator to filter out values that are not required. The following
+    operators can be used to manipulate the contents of variables.
+
+    The \c = operator assigns a value to a variable:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 89
+
+    The above line sets the \c TARGET variable to \c myapp. This will overwrite any
+    values previously set for \c TARGET with \c myapp.
+
+    The \c += operator appends a new value to the list of values in a variable:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 90
+
+    The above line appends \c QT_DLL to the list of pre-processor defines to be put
+    in the generated Makefile.
+
+    The \c -= operator removes a value from the list of values in a variable:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 91
+
+    The above line removes \c QT_DLL from the list of pre-processor defines to be
+    put in the generated Makefile.
+
+    The \c *= operator adds a value to the list of values in a variable, but only
+    if it is not already present. This prevents values from being included many
+    times in a variable. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 92
+
+    In the above line, \c QT_DLL will only be added to the list of pre-processor
+    defines if it is not already defined. Note that the
+    \l{qmake Function Reference#unique}{unique()}
+    function can also be used to ensure that a variables only contains one
+    instance of each value.
+
+    The \c ~= operator replaces any values that match a regular expression with
+    the specified value:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 93
+
+    In the above line, any values in the list that start with \c QT_D or \c QT_T are
+    replaced with \c QT.
+
+    The \c $$ operator is used to extract the contents of a variable, and can be
+    used to pass values between variables or supply them to functions:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 94
+
+    \target Scopes
+    \section1 Scopes
+
+    Scopes are similar to \c if statements in procedural programming languages.
+    If a certain condition is true, the declarations inside the scope are processed.
+
+    \section2 Syntax
+
+    Scopes consist of a condition followed by an opening brace on the same line,
+    a sequence of commands and definitions, and a closing brace on a new line:
+
+    \snippet doc/src/snippets/qmake/scopes.pro syntax
+
+    The opening brace \e{must be written on the same line as the condition}.
+    Scopes may be concatenated to include more than one condition; see below
+    for examples.
+
+    \section2 Scopes and Conditions
+
+    A scope is written as a condition followed by a series of declarations
+    contained within a pair of braces; for example:
+
+    \snippet doc/src/snippets/qmake/scopes.pro 0
+
+    The above code will add the \c paintwidget_win.cpp file to the sources listed
+    in the generated Makefile if \c qmake is used on a Windows platform.
+    If \c qmake is used on a platform other than Windows, the define will be
+    ignored.
+
+    The conditions used in a given scope can also be negated to provide an
+    alternative set of declarations that will be processed only if the
+    original condition is false. For example, suppose we want to process
+    something on all platforms \e except for Windows. We can achieve this by
+    negating the scope like this:
+
+    \snippet doc/src/snippets/qmake/scopes.pro 1
+
+    Scopes can be nested to combine more than one condition. For instance, if
+    you want to include a particular file for a certain platform only if
+    debugging is enabled then you write the following:
+
+    \snippet doc/src/snippets/qmake/scopes.pro 2
+
+    To save writing many nested scopes, you can nest scopes using the \c :
+    operator. The nested scopes in the above example can be rewritten in
+    the following way:
+
+    \snippet doc/src/snippets/qmake/scopes.pro 3
+
+    You may also use the \c : operator to perform single line conditional
+    assignments; for example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 95
+
+    The above line adds \c QT_DLL to the \c DEFINES variable only on the
+    Windows platform.
+    Generally, the \c : operator behaves like a logical AND operator, joining
+    together a number of conditions, and requiring all of them to be true.
+
+	There is also the \c | operator to act like a logical OR operator, joining 
+	together a number of conditions, and requiring only one of them to be true.
+
+	\snippet doc/src/snippets/qmake/scopes.pro 4
+
+    You can also provide alternative declarations to those within a scope by
+    using an \c else scope. Each \c else scope is processed if the conditions
+    for the preceding scopes are false.
+    This allows you to write complex tests when combined with other scopes
+    (separated by the \c : operator as above). For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 96
+
+    \section2 Configuration and Scopes
+
+    The values stored in the
+    \l{qmake-project-files.html#GeneralConfiguration}{\c CONFIG variable}
+    are treated specially by \c qmake. Each of the possible values can be
+    used as the condition for a scope. For example, the list of values
+    held by \c CONFIG can be extended with the \c opengl value:
+
+    \snippet doc/src/snippets/qmake/configscopes.pro 0
+
+    As a result of this operation, any scopes that test for \c opengl will
+    be processed. We can use this feature to give the final executable an
+    appropriate name:
+
+    \snippet doc/src/snippets/qmake/configscopes.pro 1
+    \snippet doc/src/snippets/qmake/configscopes.pro 2
+    \snippet doc/src/snippets/qmake/configscopes.pro 3
+
+    This feature makes it easy to change the configuration for a project
+    without losing all the custom settings that might be needed for a specific
+    configuration. In the above code, the declarations in the first scope are
+    processed, and the final executable will be called \c application-gl.
+    However, if \c opengl is not specified, the declarations in the second
+    scope are processed instead, and the final executable will be called
+    \c application.
+
+    Since it is possible to put your own values on the \c CONFIG
+    line, this provides you with a convenient way to customize project files
+    and fine-tune the generated Makefiles.
+
+    \section2 Platform Scope Values
+
+    In addition to the \c win32, \c macx, and \c unix values used in many
+    scope conditions, various other built-in platform and compiler-specific
+    values can be tested with scopes. These are based on platform
+    specifications provided in Qt's \c mkspecs directory. For example, the
+    following lines from a project file show the current specification in
+    use and test for the \c linux-g++ specification:
+
+    \snippet doc/src/snippets/qmake/specifications.pro 0
+
+    You can test for any other platform-compiler combination as long as a
+    specification exists for it in the \c mkspecs directory.
+
+    \section1 Variables
+
+    Many of the variables used in project files are special variables that
+    \c qmake uses when generating Makefiles, such as \c DEFINES, \c SOURCES,
+    and \c HEADERS. It is possible for you to create variables for your own
+    use; \c qmake creates new variables with a given name when it encounters
+    an assignment to that name. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 97
+
+    There are no restricitions on what you do to your own variables, as \c
+    qmake will ignore them unless it needs to evaluate them when processing
+    a scope.
+
+    You can also assign the value of a current variable to another
+    variable by prefixing $$ to the variable name. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 98
+
+    Now the MY_DEFINES variable contains what is in the DEFINES variable at
+    this point in the project file.  This is also equivalent to:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 99
+
+    The second notation allows you to append the contents of the variable to
+    another value without separating the two with a space. For example, the
+    following will ensure that the final executable will be given a name
+    that includes the project template being used:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 100
+
+    Variables can be used to store the contents of environment variables.
+    These can be evaluated at the time that \c qmake is run, or included
+    in the generated Makefile for evaluation when the project is built.
+
+    To obtain the contents of an environment value when \c qmake is run,
+    use the \c $$(...) operator:
+
+    \snippet doc/src/snippets/qmake/environment.pro 0
+
+    In the above assignment, the value of the \c PWD environment variable
+    is read when the project file is processed.
+
+    To obtain the contents of an environment value at the time when the
+    generated Makefile is processed, use the \c $(...) operator:
+
+    \snippet doc/src/snippets/qmake/environment.pro 1
+
+    In the above assignment, the value of \c PWD is read immediately
+    when the project file is processed, but \c $(PWD) is assigned to
+    \c DESTDIR in the generated Makefile. This makes the build process
+    more flexible as long as the environment variable is set correctly
+    when the Makefile is processed.
+
+    The special \c $$[...] operator can be used to access various
+    configuration options that were set when Qt was built:
+
+    \snippet doc/src/snippets/qmake/qtconfiguration.pro 0
+
+    The variables accessible with this operator are typically used to
+    enable third party plugins and components to be integrated with Qt.
+    For example, a \QD plugin can be installed alongside \QD's built-in
+    plugins if the following declaration is made in its project file:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 101
+
+    \target VariableProcessingFunctions
+    \section1 Variable Processing Functions
+
+    \c qmake provides a selection of built-in functions to allow the
+    contents of variables to be processed. These functions process the
+    arguments supplied to them and return a value, or list of values, as
+    a result. In order to assign a result to a variable, it is necessary
+    to use the \c $$ operator with this type of function in the same way
+    used to assign contents of one variable to another:
+
+    \snippet doc/src/snippets/qmake/functions.pro 1
+
+    This type of function should be used on the right-hand side of
+    assignments (i.e, as an operand).
+
+    It is possible to define your own functions for processing the
+    contents of variables. These functions can be defined in the following
+    way:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 102
+
+    The following example function takes a variable name as its only
+    argument, extracts a list of values from the variable with the
+    \l{qmake-function-reference.html}{eval()} built-in function,
+    and compiles a list of files:
+
+    \snippet doc/src/snippets/qmake/replacefunction.pro 0
+
+    \target ConditionalFunctions
+    \section1 Conditional Functions
+
+    \c qmake provides built-in functions that can be used as conditions
+    when writing scopes. These functions do not return a value, but
+    instead indicate "success" or "failure":
+
+    \snippet doc/src/snippets/qmake/functions.pro 3
+
+    This type of function should be used in conditional expressions
+    only.
+
+    It is possible to define your own functions to provide conditions
+    for scopes. The following example tests whether each file in a list
+    exists and returns true if they all exist, or false if not:
+
+    \snippet doc/src/snippets/qmake/testfunction.pro 0
+
+    \section1 Adding New Configuration Features
+
+    \c qmake lets you create your own \e features that can be included in
+    project files by adding their names to the list of values specified by
+    the \c CONFIG variable. Features are collections of custom functions and
+    definitions in \c{.prf} files that can reside in one of many standard
+    directories. The locations of these directories are defined in a number
+    of places, and \c qmake checks each of them in the following order when
+    it looks for \c{.prf} files:
+
+    \list 1
+    \o In a directory listed in the \c QMAKEFEATURES environment variable;
+       this contains a colon-separated list of directories.
+    \o In a directory listed in the \c QMAKEFEATURES property variable; this
+       contains a colon-spearated list of directories.
+    \omit
+    \o In a features directory beneath the project's root directory (where
+       the \c{.qmake.cache} file is generated).
+    \endomit
+    \o In a features directory residing within a \c mkspecs directory.
+       \c mkspecs directories can be located beneath any of the directories
+       listed in the \c QMAKEPATH environment variable (a colon-separated list
+       of directories). (\c{$QMAKEPATH/mkspecs/<features>})
+    \o In a features directory residing beneath the directory provided by the
+       \c QMAKESPEC environment variable. (\c{$QMAKESPEC/<features>})
+    \o In a features directory residing in the \c data_install/mkspecs directory.
+       (\c{data_install/mkspecs/<features>})
+    \o In a features directory that exists as a sibling of the directory
+       specified by the \c QMAKESPEC environment variable.
+       (\c{$QMAKESPEC/../<features>})
+    \endlist
+
+    The following features directories are searched for features files:
+
+    \list 1
+    \o \c{features/unix}, \c{features/win32}, or \c{features/macx}, depending on
+       the platform in use
+    \o \c features/
+    \endlist
+
+    For example, consider the following assignment in a project file:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 103
+
+    With this addition to the \c CONFIG variable, \c qmake will search the
+    locations listed above for the \c myfeatures.prf file after it has
+    finished parsing your project file. On Unix systems, it will look for
+    the following file:
+
+    \list 1
+    \o \c $QMAKEFEATURES/myfeatures.prf (for each directory listed in the
+       \c QMAKEFEATURES environment variable)
+    \o \c $$QMAKEFEATURES/myfeatures.prf (for each directory listed in the
+       \c QMAKEFEATURES property variable)
+    \o \c myfeatures.prf (in the project's root directory)
+    \o \c $QMAKEPATH/mkspecs/features/unix/myfeatures.prf and
+       \c $QMAKEPATH/mkspecs/features/myfeatures.prf (for each directory
+       listed in the \c QMAKEPATH environment variable)
+    \o \c $QMAKESPEC/features/unix/myfeatures.prf and
+       \c $QMAKESPEC/features/myfeatures.prf
+    \o \c data_install/mkspecs/features/unix/myfeatures.prf and
+       \c data_install/mkspecs/features/myfeatures.prf
+    \o \c $QMAKESPEC/../features/unix/myfeatures.prf and
+       \c $QMAKESPEC/../features/myfeatures.prf
+    \endlist
+
+    \note The \c{.prf} files must have names in lower case.
+
+
+*/
+
+/*!
+    \page qmake-precompiledheaders.html
+    \title Using Precompiled Headers
+    \contentspage {qmake Manual}{Contents}
+    \previouspage qmake Advanced Usage
+    \nextpage qmake Reference
+    \ingroup buildsystem
+
+    \target Introduction
+
+    Precompiled headers are a performance feature supported by some
+    compilers to compile a stable body of code, and store the compiled
+    state of the code in a binary file. During subsequent compilations,
+    the compiler will load the stored state, and continue compiling the
+    specified file. Each subsequent compilation is faster because the
+    stable code does not need to be recompiled.
+
+    \c qmake supports the use of precompiled headers (PCH) on some
+    platforms and build environments, including:
+    \list
+    \o Windows
+        \list
+        \o nmake
+        \o Dsp projects (VC 6.0)
+        \o Vcproj projects (VC 7.0 \& 7.1)
+        \endlist
+    \o Mac OS X
+        \list
+        \o Makefile
+        \o Xcode
+        \endlist
+    \o Unix
+        \list
+        \o GCC 3.4 and above
+        \endlist
+    \endlist
+
+    \target ADD_PCH
+    \section1 Adding Precompiled Headers to Your Project
+
+    \target PCH_CONTENTS
+    \section2 Contents of the Precompiled Header File
+
+    The precompiled header must contain code which is \e stable
+    and \e static throughout your project. A typical PCH might look
+    like this:
+
+    \section3 Example: \c stable.h
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 104
+
+    Note that a precompiled header file needs to separate C includes from
+    C++ includes, since the precompiled header file for C files may not
+    contain C++ code.
+
+    \target PROJECT_OPTIONS
+    \section2 Project Options
+
+    To make your project use PCH, you only need to define the
+    \c PRECOMPILED_HEADER variable in your project file:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 105
+
+    \c qmake will handle the rest, to ensure the creation and use of the
+    precompiled header file. You do not need to include the precompiled
+    header file in \c HEADERS, as \c qmake will do this if the configuration
+    supports PCH.
+
+    All platforms that support precompiled headers have the configuration
+    option \c precompile_header set. Using this option, you may trigger
+    conditional blocks in your project file to add settings when using PCH.
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 106
+
+    \section1 Notes on Possible Issues
+
+    On some platforms, the file name suffix for precompiled header files is
+    the same as that for other object files. For example, the following
+    declarations may cause two different object files with the same name to
+    be generated:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 107
+
+    To avoid potential conflicts like these, it is good practice to ensure
+    that header files that will be precompiled are given distinctive names.
+
+    \target EXAMPLE_PROJECT
+    \section1 Example Project
+
+    You can find the following source code in the
+    \c{examples/qmake/precompile} directory in the Qt distribution:
+
+    \section2 \c mydialog.ui
+
+    \quotefromfile examples/qmake/precompile/mydialog.ui
+    \printuntil
+
+    \section2 \c stable.h
+
+    \snippet examples/qmake/precompile/stable.h 0
+
+    \section2 \c myobject.h
+
+    \snippet examples/qmake/precompile/myobject.h 0
+
+    \section2 \c myobject.cpp
+
+    \snippet examples/qmake/precompile/myobject.cpp 0
+
+    \section2 \c util.cpp
+
+    \snippet examples/qmake/precompile/util.cpp 0
+
+    \section2 \c main.cpp
+
+    \snippet examples/qmake/precompile/main.cpp 0
+
+    \section2 \c precompile.pro
+
+    \snippet examples/qmake/precompile/precompile.pro 0
+*/
+
+/*!
+    \page qmake-tutorial.html
+    \title qmake Tutorial
+    \contentspage {qmake Manual}{Contents}
+    \previouspage qmake Manual
+    \nextpage qmake Common Projects
+
+    This tutorial teaches you how to use \c qmake.  We recommend that
+    you read the \c qmake user guide after completing this tutorial.
+
+    \section1 Starting off Simple
+
+    Let's assume that you have just finished a basic implementation of
+    your application, and you have created the following files:
+
+    \list
+    \o hello.cpp
+    \o hello.h
+    \o main.cpp
+    \endlist
+
+    You will find these files in the \c{examples/qmake/tutorial} directory
+    of the Qt distribution. The only other thing you know about the setup of
+    the application is that it's written in Qt.  First, using your favorite
+    plain text editor, create a file called \c hello.pro in
+    \c{examples/qmake/tutorial}. The first thing you need to do is add the
+    lines that tell \c qmake about the source and header files that are part
+    of your development project.
+
+    We'll add the source files to the project file first.  To do this you
+    need to use the \l{qmake Variable Reference#SOURCES}{SOURCES} variable.
+    Just start a new line with \c {SOURCES +=} and put hello.cpp after it.
+    You should have something like this:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 108
+
+    We repeat this for each source file in the project, until we end up
+    with the following:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 109
+
+    If you prefer to use a Make-like syntax, with all the files listed in
+    one go you can use the newline escaping like this:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 110
+
+    Now that the source files are listed in the project file, the header
+    files must be added. These are added in exactly the same way as source
+    files, except that the variable name we use is
+    \l{qmake Variable Reference#HEADERS}{HEADERS}.
+
+    Once you have done this, your project file should look something like
+    this:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 111
+
+    The target name is set automatically; it is the same as the project
+    file, but with the suffix appropriate to the platform. For example, if
+    the project file is called \c hello.pro, the target will be \c hello.exe
+    on Windows and \c hello on Unix. If you want to use a different name
+    you can set it in the project file:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 112
+
+    The final step is to set the \l{qmake Variable Reference#CONFIG}{CONFIG}
+    variable. Since this is a Qt application, we need to put \c qt on the
+    \c CONFIG line so that \c qmake will add the relevant libraries to be
+    linked against and ensure that build lines for \c moc and \c uic are
+    included in the generated Makefile.
+
+    The finished project file should look like this:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 113
+
+    You can now use \c qmake to generate a Makefile for your application.
+    On the command line, in your project's directory, type the following:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 114
+
+    Then type \c make or \c nmake depending on the compiler you use.
+
+    For Visual Studio users, \c qmake can also generate \c .dsp or
+    \c .vcproj files, for example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 115
+
+    \section1 Making an Application Debuggable
+
+    The release version of an application doesn't contain any debugging
+    symbols or other debugging information. During development it is useful
+    to produce a debugging version of the application that has the
+    relevant information. This is easily achieved by adding \c debug to the
+    \c CONFIG variable in the project file.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 116
+
+    Use \c qmake as before to generate a Makefile and you will be able to
+    obtain useful information about your application when running it in
+    a debugging environment.
+
+    \section1 Adding Platform-Specific Source Files
+
+    After a few hours of coding, you might have made a start on the
+    platform-specific part of your application, and decided to keep the
+    platform-dependent code separate.  So you now have two new files to
+    include into your project file: \c hellowin.cpp and \c
+    hellounix.cpp.  We can't just add these to the \c SOURCES
+    variable since this will put both files in the Makefile. So, what we
+    need to do here is to use a scope which will be processed depending on
+    which platform \c qmake is run on.
+
+    A simple scope that will add in the platform-dependent file for
+    Windows looks like this:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 117
+
+    So if \c qmake is run on Windows, it will add \c hellowin.cpp to the
+    list of source files.  If \c qmake is run on any other platform, it
+    will simply ignore it. Now all that is left to be done is to create a
+    scope for the Unix-specific file.
+
+    When you have done that, your project file should now look
+    something like this:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 118
+
+    Use \c qmake as before to generate a Makefile.
+
+    \section1 Stopping qmake If a File Doesn't Exist
+
+    You may not want to create a Makefile if a certain file doesn't exist.
+    We can check if a file exists by using the exists() function.  We can
+    stop \c qmake from processing by using the error() function.  This
+    works in the same way as scopes do.  Simply replace the scope condition
+    with the function. A check for a \c main.cpp file looks like this:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 119
+
+    The \c{!} symbol is used to negate the test; i.e. \c{exists( main.cpp )}
+    is true if the file exists, and \c{!exists( main.cpp )} is true if the
+    file doesn't exist.
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 120
+
+    Use \c qmake as before to generate a makefile.  If you rename \c
+    main.cpp temporarily, you will see the message and \c qmake will stop
+    processing.
+
+    \section1 Checking for More than One Condition
+
+    Suppose you use Windows and you want to be able to see statement
+    output with qDebug() when you run your application on the command line.
+    Unless you build your application with the appropriate console setting,
+    you won't see the output. We can easily put \c console on the \c CONFIG
+    line so that on Windows the makefile will have this setting. However,
+    let's say that we only want to add the \c CONFIG line if we are running
+    on Windows \e and when \c debug is already on the \c CONFIG line.
+    This requires using two nested scopes; just create one scope, then create
+    the other inside it. Put the settings to be processed inside the last
+    scope, like this:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 121
+
+    Nested scopes can be joined together using colons, so the final
+    project file looks like this:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 122
+
+    That's it! You have now completed the tutorial for \c qmake, and are
+    ready to write project files for your development projects.
+*/
+
+/*!
+    \page qmake-common-projects.html
+    \title qmake Common Projects
+    \contentspage {qmake Manual}{Contents}
+    \previouspage qmake Tutorial
+    \nextpage Using qmake
+
+    This chapter describes how to set up \c qmake project files for three
+    common project types that are based on Qt. Although all kinds of
+    projects use many of the same variables, each of them use project-specific
+    variables to customize output files.
+
+    Platform-specific variables are not described here; we refer the reader to
+    the \l{Deploying Qt Applications} document for information on issues such as
+    \l{Deploying an Application on Mac OS X#Architecture Dependencies}{building
+    universal binaries for Mac OS X} and
+    \l{Deploying an Application on Windows#Visual Studio 2005 Onwards}
+    {handling Visual Studio manifest files}.
+
+    \tableofcontents
+
+    \target Application
+    \section1 Building an Application
+
+    \section2 The app Template
+
+    The \c app template tells \c qmake to generate a Makefile that will build
+    an application. With this template, the type of application can be specified
+    by adding one of the following options to the \c CONFIG variable definition:
+
+    \table
+    \header \o Option  \o Description
+    \row    \o windows \o The application is a Windows GUI application.
+    \row    \o console \o \c app template only: the application is a Windows console
+                       application.
+    \endtable
+
+    When using this template the following \c qmake system variables are recognized.
+    You should use these in your .pro file to specify information about your
+    application.
+
+    \list
+    \o HEADERS - A list of all the header files for the application.
+    \o SOURCES - A list of all the source files for the application.
+    \o FORMS - A list of all the .ui files (created using \c{Qt Designer})
+    for the application.
+    \o LEXSOURCES - A list of all the lex source files for the application.
+    \o YACCSOURCES - A list of all the yacc source files for the application.
+    \o TARGET - Name of the executable for the application. This defaults
+    to the name of the project file. (The extension, if any, is added
+    automatically).
+    \o DESTDIR - The directory in which the target executable is placed.
+    \o DEFINES - A list of any additional pre-processor defines needed for the application.
+    \o INCLUDEPATH - A list of any additional include paths needed for the application.
+    \o DEPENDPATH - The dependency search path for the application.
+    \o VPATH - The search path to find supplied files.
+    \o DEF_FILE - Windows only: A .def file to be linked against for the application.
+    \o RC_FILE - Windows only: A resource file for the application.
+    \o RES_FILE - Windows only: A resource file to be linked against for the application.
+    \endlist
+
+    You only need to use the system variables that you have values for,
+    for instance, if you don't have any extra INCLUDEPATHs then you don't
+    need to specify any, \c qmake will add in the default ones needed.
+    For instance, an example project file might look like this:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 123
+
+    For items that are single valued, e.g. the template or the destination
+    directory, we use "="; but for multi-valued items we use "+=" to \e
+    add to the existing items of that type. Using "=" replaces the item's
+    value with the new value, for example if we wrote \c{DEFINES=QT_DLL},
+    all other definitions would be deleted.
+
+    \target Library
+    \section1 Building a Library
+
+    \section2 The lib Template
+
+    The \c lib template tells \c qmake to generate a Makefile that will
+    build a library.  When using this template, in addition to the system variables
+    mentioned above for the \c app template the \c VERSION variable is
+    supported.  You should use these in your .pro file to specify
+    information about the library.
+
+    When using the \c lib template, the following options can be added to the
+    \c CONFIG variable to determine the type of library that is built:
+
+    \table
+    \header \o Option    \o Description
+    \row    \o dll       \o The library is a shared library (dll).
+    \row    \o staticlib \o The library is a static library.
+    \row    \o plugin    \o The library is a plugin; this also enables the dll option.
+    \endtable
+
+    The following option can also be defined to provide additional information about
+    the library.
+
+    \list
+    \o VERSION - The version number of the target library, for example, 2.3.1.
+    \endlist
+
+    The target file name for the library is platform-dependent. For example, on
+    X11 and Mac OS X, the library name will be prefixed by \c lib; on Windows,
+    no prefix is added to the file name.
+
+    \target Plugin
+    \section1 Building a Plugin
+
+    Plugins are built using the \c lib template, as described in the previous
+    section. This tells \c qmake to generate a Makefile for the project that will
+    build a plugin in a suitable form for each platform, usually in the form of a
+    library. As with ordinary libraries, the \c VERSION variable is used to specify
+    information about the plugin.
+
+    \list
+    \o VERSION - The version number of the target library, for example, 2.3.1.
+    \endlist
+
+    \section2 Building a Qt Designer Plugin
+
+    \QD plugins are built using a specific set of configuration settings that
+    depend on the way Qt was configured for your system. For convenience, these
+    settings can be enabled by adding \c designer to the project's \c CONFIG
+    variable. For example:
+
+    \snippet examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro 0
+
+    See the \l{Qt Examples#Qt Designer}{Qt Designer examples} for more
+    examples of plugin-based projects.
+
+    \section1 Building and Installing in Debug and Release Modes
+
+    Sometimes, it is necessary to build a project in both debug and release
+    modes. Although the \c CONFIG variable can hold both \c debug and \c release
+    options, the \c debug option overrides the \c release option.
+
+    \section2 Building in Both Modes
+
+    To enable a project to be built in both modes, you must add the
+    \c debug_and_release option to your project's \c CONFIG definition:
+
+    \snippet doc/src/snippets/qmake/debug_and_release.pro 0
+    \snippet doc/src/snippets/qmake/debug_and_release.pro 1
+
+    The scope in the above snippet modifies the build target in each mode to
+    ensure that the resulting targets have different names. Providing different
+    names for targets ensures that one will not overwrite the other.
+
+    When \c qmake processes the project file, it will generate a Makefile rule
+    to allow the project to be built in both modes. This can be invoked in the
+    following way:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 124
+
+    The \c build_all option can be added to the \c CONFIG variable in the
+    project file to ensure that the project is built in both modes by default:
+
+    \snippet doc/src/snippets/qmake/debug_and_release.pro 2
+
+    This allows the Makefile to be processed using the default rule:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 125
+
+    \section2 Installing in Both Modes
+
+    The \c build_all option also ensures that both versions of the target
+    will be installed when the installation rule is invoked:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 126
+
+    It is possible to customize the names of the build targets depending on
+    the target platform. For example, a library or plugin may be named using a
+    different convention on Windows to the one used on Unix platforms:
+
+    \omit
+    Note: This was originally used in the customwidgetplugin.pro file, but is
+    no longer needed there.
+    \endomit
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 127
+
+    The default behavior in the above snippet is to modify the name used for
+    the build target when building in debug mode. An \c else clause could be
+    added to the scope to do the same for release mode; left as it is, the
+    target name remains unmodified.
+*/
+
diff --git a/doc/src/qmsdev.qdoc b/doc/src/qmsdev.qdoc
new file mode 100644
index 0000000000..8cbd1d308f
--- /dev/null
+++ b/doc/src/qmsdev.qdoc
@@ -0,0 +1,137 @@
+/****************************************************************************
+**
+** Documentation of Visual Studio Integration Plugin.
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Qt GUI Toolkit.
+** EDITIONS: FREE, PROFESSIONAL, ENTERPRISE
+**
+****************************************************************************/
+
+/* NOT DOCUMENTED ! 
+  \page qmsdev.html
+
+  \title The QMsDev Plugin
+
+  The Visual Studio Integration Plugin is currently available only to users of
+  Visual Studio 6. It offers simple ways of doing common tasks when writing a
+  Qt application. 
+
+  \tableofcontents
+
+  \section1 How to install the Visual Studio Integration Plugin
+   
+  When you install Qt, the integration plugin should be installed for you,
+  however, sometimes this does  not happen, so to install the integration
+  plugin manually just carry out the following steps.
+
+  \list
+  \i Start up Visual Studio.
+  \i Select Tools|Customize|Add-ins and Macro Files.
+  \i Ensure that there is a tick next to QMsDev Developer Studio Add-In.
+  \i Click Close.
+  \endlist
+
+  Now the integration plugin should be installed. If this doesn't
+  work, then contact Trolltech technical support giving details of
+  what went wrong.
+  
+  \section1 How to uninstall the Visual Studio Integration Plugin
+
+  When you want to uninstall the integration plugin, just carry out the
+  following steps.
+
+  \list
+  \i Close down any instances of Visual Studio.
+  \i Delete the file '%MSDevDir%\\addins\\qmsdev.dll'
+  \endlist
+
+  \section1 What can the Visual Studio Integration Plugin do?
+  
+  The integration plugin adds the following options to Visual Studio:
+
+  \list
+  \i New Qt Project
+  \i New Qt Dialog
+  \i Qt Designer
+  \i Open Qt Project
+  \i Write Qt Project
+  \i Use Qt In Current Project
+  \i Add MOC
+  \endlist
+
+  \section2 Using the 'New Qt Project' button
+  
+  The 'New Qt Project' button allows you to create a simple Qt project
+  ready for development. Simply fill in the form and if you select
+  'Dialog' or 'Main Window' without MDI support then it will
+  automatically start up \e{Qt Designer}. When you have finished with
+  the form in \e{Qt Designer} just save it and it will appear in a
+  ready made Qt project.
+
+  If you select 'Main Window' with 'MDI Support' then it will simply
+  give you a code skeleton in a project ready for you to populate with
+  your own code.
+
+  \section2 Using the 'New Qt Dialog' button
+
+  The 'New Qt Dialog' button works in two ways: You can use it to create a new
+  dialog for your project; or you can  use it to insert an existing
+  dialog into your project.
+
+  If you want to create a new dialog then all you need to do is specify where
+  the dialog file should be saved and give it a name. This will start up
+  \e{Qt Designer} to allow you to design your new dialog, and will add it to
+  the existing  project.
+
+  If you want to add an existing dialog to your project, then just select the
+  relevant \c .ui file. This will then add it to your existing project and add
+  the relevant steps to create the generated code.
+
+  \section2 Using the 'Qt Designer' button
+
+  The 'Qt Designer' button simply starts up \e{Qt Designer}, it has no ties to
+  your existing project so whatever you do with it will not affect your
+  existing projects. It can also be started up by using the Ctrl+Shift+D key
+  combination in Visual Studio.
+
+  \section2 Using the 'Open Qt Project' button
+
+  The 'Open Qt Project' button allows you to convert an existing \c
+  qmake project file into a \c .dsp file which you can insert into
+  your existing workspace. When you click the 'Open Qt Project'
+  button, just select an existing \c qmake project file (a \c .pro
+  file) and then click OK. You will get a message box at the end
+  which asks you to insert the newly created \c .dsp file into your
+  existing workspace.
+
+  \section2 Using the 'Write Qt Project' button
+
+  The 'Write Qt Project' button creates a \c qmake project (\c .pro)
+  file for your current project so that you can easily copy the files
+  onto another platform and be able to use \c qmake to create a Makefile
+  on that other platform. All you need to do is make the project you
+  want to create a \c .pro file for, and click on the button. Just
+  name your \c qmake project file and click Save.
+
+  \section2 Using the 'Use Qt In Current Project' button
+
+  The 'Use Qt In Current Project' button simply adds in the necessary
+  information for the current project so that it links against Qt and
+  sets any other settings needed to use Qt in that project.
+
+  \section2 Using the 'Add MOC' button
+
+  The 'Add MOC' button will add in the custom build step for the selected file
+  so that it creates any needed MOC files and it will add these generated
+  files to the project. All you need to do to use it is click on a file that
+  has Q_OBJECT and click the button. 
+
+  You only need to use this button if you added a file that has
+  Q_OBJECT in it by hand, you don't need to use this if you used any
+  of the previously mentioned buttons. It can also be invoked by using
+  the \key{Ctrl+Shift+M} key combination in Visual Studio.
+
+*/
diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc
new file mode 100644
index 0000000000..6220795f29
--- /dev/null
+++ b/doc/src/qnamespace.qdoc
@@ -0,0 +1,2660 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \namespace Qt
+
+    \brief The Qt namespace contains miscellaneous identifiers
+    used throughout the Qt library.
+
+    \ingroup misc
+*/
+
+/*!
+    \enum Qt::Orientation
+
+    This type is used to signify an object's orientation.
+
+    \value Horizontal
+    \value Vertical
+
+    Orientation is used with QScrollBar for example.
+*/
+
+/*!
+    \enum Qt::AlignmentFlag
+
+    This enum type is used to describe alignment. It contains
+    horizontal and vertical flags that can be combined to produce
+    the required effect.
+
+    The \l{TextElideMode} enum can also be used in many situations
+    to fine-tune the appearance of aligned text.
+
+    The horizontal flags are:
+
+    \value AlignLeft Aligns with the left edge.
+    \value AlignRight Aligns with the right edge.
+    \value AlignHCenter Centers horizontally in the available space.
+    \value AlignJustify Justifies the text in the available space.
+    \omitvalue AlignAuto
+
+    The vertical flags are:
+
+    \value AlignTop Aligns with the top.
+    \value AlignBottom Aligns with the bottom.
+    \value AlignVCenter Centers vertically in the available space.
+
+    You can use only one of the horizontal flags at a time. There is
+    one two-dimensional flag:
+
+    \value AlignCenter Centers in both dimensions.
+
+    You can use at most one horizontal and one vertical flag at a
+    time. Qt::AlignCenter counts as both horizontal and vertical.
+
+    Three enum values are useful in applications that can be run in
+    right-to-left mode:
+
+    \value AlignAbsolute  If the widget's layout direction is
+        Qt::RightToLeft (instead of Qt::LeftToRight, the default),
+        Qt::AlignLeft refers to the \e right edge and Qt::AlignRight
+        to the \e left edge. This is normally the desired behavior.
+        If you want Qt::AlignLeft to always mean "left" and
+        Qt::AlignRight to always mean "right", combine the flag with
+        Qt::AlignAbsolute.
+    \value AlignLeading  Synonym for Qt::AlignLeft.
+    \value AlignTrailing  Synonym for Qt::AlignRight.
+
+    Masks:
+
+    \value AlignHorizontal_Mask
+    \value AlignVertical_Mask
+
+    Conflicting combinations of flags have undefined meanings.
+*/
+
+/*!
+    \enum Qt::ApplicationAttribute
+
+    This enum describes attributes that change the behavior of
+    application-wide features. These are enabled and disabled using
+    QCoreApplication::setAttribute(), and can be tested for with
+    QCoreApplication::testAttribute().
+
+    \value AA_ImmediateWidgetCreation Ensures that widgets are created
+           as soon as they are constructed. By default, resources for
+           widgets are allocated on demand to improve efficiency and
+           minimize resource usage. Setting or clearing this attribute
+           affects widgets constructed after the change. Setting it
+           tells Qt to create toplevel windows immediately.
+           Therefore, if it is important to minimize resource
+           consumption, do not set this attribute.
+
+    \value AA_MSWindowsUseDirect3DByDefault Is a Windows specific
+           attribute, that will make the Direct3D paint engine the
+           default Qt widget paint engine.  Note that you can toggle
+           usage of the Direct3D engine on individual QWidgets by
+           setting/clearing the \c WA_MSWindowsUseDirect3D attribute
+           on a specific widget. \bold {This functionality is
+           experimental}.
+
+    \value AA_DontShowIconsInMenus Actions with the Icon property won't be
+           shown in any menus unless specifically set by the
+           QAction::iconVisibleInMenu property.
+
+           Menus that are currently open or menus already created in the native
+           Mac OS X menubar MAY NOT pick up a change in this attribute. Changes
+           in the QAction::iconVisibleInMenu property will always be picked up.
+
+    \value AA_NativeWindows Ensures that widgets have native windows.
+
+    \value AA_DontCreateNativeWidgetSiblings Ensures that siblings of native
+           widgets stay non-native unless specifically set by the
+           Qt::WA_NativeWindow attribute.
+
+    \value AA_MacPluginApplication Stops the a Qt mac application from doing
+           specific initializations that do not necessarily make sense when using Qt
+           to author a plugin. This includes avoiding loading our nib for the main
+           menu and not taking possession of the native menu bar.
+
+    \omitvalue AA_AttributeCount
+*/
+
+/*!
+    \enum Qt::MouseButton
+
+    This enum type describes the different mouse buttons.
+
+    \value NoButton        The button state does not refer to any
+    button (see QMouseEvent::button()).
+    \value LeftButton      The left button is pressed, or an event refers
+    to the left button. (The left button may be the right button on
+    left-handed mice.)
+    \value RightButton     The right button.
+    \value MidButton       The middle button.
+    \value XButton1        The first X button.
+    \value XButton2        The second X button.
+
+    \omitvalue MouseButtonMask
+
+    \sa KeyboardModifier Modifier
+*/
+
+/*!
+    \enum Qt::KeyboardModifier
+
+    This enum describes the modifier keys.
+
+    \value NoModifier       No modifier key is pressed.
+    \value ShiftModifier    A Shift key on the keyboard is pressed.
+    \value ControlModifier  A Ctrl key on the keyboard is pressed.
+    \value AltModifier      An Alt key on the keyboard is pressed.
+    \value MetaModifier     A Meta key on the keyboard is pressed.
+    \value KeypadModifier   A keypad button is pressed.
+    \value GroupSwitchModifier X11 only. A Mode_switch key on the keyboard is pressed.
+
+    \omitvalue KeyboardModifierMask
+
+    \note On Mac OS X, the \c ControlModifier value corresponds to
+    the Command keys on the Macintosh keyboard, and the \c MetaModifier value
+    corresponds to the Control keys. The \c KeypadModifier value will also be set
+    when an arrow key is pressed as the arrow keys are considered part of the
+    keypad.
+
+    \note On Windows Keyboards, Qt::MetaModifier and Qt::Key_Meta are mapped
+    to the Windows key.
+
+    \sa MouseButton Modifier
+*/
+
+/*!
+    \enum Qt::Modifier
+
+    This enum provides shorter names for the keyboard modifier keys
+    supported by Qt.
+
+    \bold{Note:} On Mac OS X, the \c CTRL value corresponds to
+    the Command keys on the Macintosh keyboard, and the \c META value
+    corresponds to the Control keys.
+
+    \value SHIFT The Shift keys provided on all standard keyboards.
+    \value META The Meta keys.
+    \value CTRL The Ctrl keys.
+    \value ALT The normal Alt keys, but not keys like AltGr.
+    \value UNICODE_ACCEL The shortcut is specified as a Unicode code
+    point, not as a Qt Key.
+    \omitvalue MODIFIER_MASK
+
+    \sa KeyboardModifier MouseButton
+*/
+
+/*!
+    \enum Qt::GlobalColor
+
+    \raw HTML
+    <style type="text/css" id="colorstyles">
+     #white { background-color: #ffffff; color: #000000 }
+     #black { background-color: #000000; color: #ffffff }
+     #red { background-color: #ff0000; color: #000000 }
+     #darkRed { background-color: #800000; color: #ffffff }
+     #green { background-color: #00ff00; color: #000000 }
+     #darkGreen { background-color: #008000; color: #ffffff }
+     #blue { background-color: #0000ff; color: #ffffff }
+     #darkBlue { background-color: #000080; color: #ffffff }
+     #cyan { background-color: #00ffff; color: #000000 }
+     #darkCyan { background-color: #008080; color: #ffffff }
+     #magenta { background-color: #ff00ff; color: #000000 }
+     #darkMagenta { background-color: #800080; color: #ffffff }
+     #yellow { background-color: #ffff00; color: #000000 }
+     #darkYellow { background-color: #808000; color: #ffffff }
+     #gray { background-color: #a0a0a4; color: #000000 }
+     #darkGray { background-color: #808080; color: #ffffff }
+     #lightGray { background-color: #c0c0c0; color: #000000 }
+    </style>
+    \endraw
+
+    Qt's predefined QColor objects:
+
+    \value white       \raw HTML
+    White <tt id="white">(#ffffff)</tt>
+    \endraw
+    \value black       \raw HTML
+    Black <tt id="black">(#000000)</tt>
+    \endraw
+    \value red         \raw HTML
+    Red <tt id="red">(#ff0000)</tt>
+    \endraw
+    \value darkRed     \raw HTML
+    Dark red <tt id="darkRed">(#800000)</tt>
+    \endraw
+    \value green       \raw HTML
+    Green <tt id="green">(#00ff00)</tt>
+    \endraw
+    \value darkGreen   \raw HTML
+    Dark green <tt id="darkGreen">(#008000)</tt>
+    \endraw
+    \value blue        \raw HTML
+    Blue <tt id="blue">(#0000ff)</tt>
+    \endraw
+    \value darkBlue    \raw HTML
+    Dark blue <tt id="darkBlue">(#000080)</tt>
+    \endraw
+    \value cyan        \raw HTML
+    Cyan <tt id="cyan">(#00ffff)</tt>
+    \endraw
+    \value darkCyan    \raw HTML
+    Dark cyan <tt id="darkCyan">(#008080)</tt>
+    \endraw
+    \value magenta     \raw HTML
+    Magenta <tt id="magenta">(#ff00ff)</tt>
+    \endraw
+    \value darkMagenta \raw HTML
+    Dark magenta <tt id="darkMagenta">(#800080)</tt>
+    \endraw
+    \value yellow      \raw HTML
+    Yellow <tt id="yellow">(#ffff00)</tt>
+    \endraw
+    \value darkYellow  \raw HTML
+    Dark yellow <tt id="darkYellow">(#808000)</tt>
+    \endraw
+    \value gray        \raw HTML
+    Gray <tt id="gray">(#a0a0a4)</tt>
+    \endraw
+    \value darkGray    \raw HTML
+    Dark gray <tt id="darkGray">(#808080)</tt>
+    \endraw
+    \value lightGray   \raw HTML
+    Light gray <tt id="lightGray">(#c0c0c0)</tt>
+    \endraw
+    \value transparent a transparent black value (i.e., QColor(0, 0, 0, 0))
+    \value color0 0 pixel value (for bitmaps)
+    \value color1 1 pixel value (for bitmaps)
+
+    \sa QColor
+
+*/
+
+/*!
+    \enum Qt::PenStyle
+
+    This enum type defines the pen styles that can be drawn using
+    QPainter. The styles are:
+
+    \table
+    \row
+    \o \inlineimage qpen-solid.png
+    \o \inlineimage qpen-dash.png
+    \o \inlineimage qpen-dot.png
+    \row
+    \o Qt::SolidLine
+    \o Qt::DashLine
+    \o Qt::DotLine
+    \row
+    \o \inlineimage qpen-dashdot.png
+    \o \inlineimage qpen-dashdotdot.png
+    \o \inlineimage qpen-custom.png
+    \row
+    \o Qt::DashDotLine
+    \o Qt::DashDotDotLine
+    \o Qt::CustomDashLine
+    \endtable
+
+    \value NoPen  no line at all. For example, QPainter::drawRect()
+    fills but does not draw any boundary line.
+
+    \value SolidLine  A plain line.
+    \value DashLine  Dashes separated by a few pixels.
+    \value DotLine  Dots separated by a few pixels.
+    \value DashDotLine  Alternate dots and dashes.
+    \value DashDotDotLine  One dash, two dots, one dash, two dots.
+    \value CustomDashLine  A custom pattern defined using
+                           QPainterPathStroker::setDashPattern().
+
+    \omitvalue MPenStyle
+
+    \sa QPen
+*/
+
+/*!
+    \enum Qt::PenCapStyle
+
+    This enum type defines the pen cap styles supported by Qt, i.e.
+    the line end caps that can be drawn using QPainter.
+
+    \table
+    \row
+    \o \inlineimage qpen-square.png
+    \o \inlineimage qpen-flat.png
+    \o \inlineimage qpen-roundcap.png
+    \row
+    \o Qt::SquareCap
+    \o Qt::FlatCap
+    \o Qt::RoundCap
+    \endtable
+
+    \value FlatCap  a square line end that does not cover the end
+        point of the line.
+    \value SquareCap  a square line end that covers the end point and
+        extends beyond it by half the line width.
+    \value RoundCap  a rounded line end.
+    \omitvalue MPenCapStyle
+
+    \sa QPen
+*/
+
+/*!
+    \enum Qt::PenJoinStyle
+
+    This enum type defines the pen join styles supported by Qt, i.e.
+    which joins between two connected lines can be drawn using
+    QPainter.
+
+    \table
+    \row
+    \o \inlineimage qpen-bevel.png
+    \o \inlineimage qpen-miter.png
+    \o \inlineimage qpen-roundjoin.png
+    \row
+    \o Qt::BevelJoin
+    \o Qt::MiterJoin
+    \o Qt::RoundJoin
+    \endtable
+
+    \value MiterJoin  The outer edges of the lines are extended to
+           meet at an angle, and this area is filled.
+    \value BevelJoin  The triangular notch between the two lines is filled.
+    \value RoundJoin  A circular arc between the two lines is filled.
+    \value SvgMiterJoin A miter join corresponding to the definition of
+           a miter join in the \l{SVG 1.2 Tiny} specification.
+    \omitvalue MPenJoinStyle
+
+    \sa QPen
+*/
+
+/*!
+    \enum Qt::BrushStyle
+
+    This enum type defines the brush styles supported by Qt, i.e. the
+    fill pattern of shapes drawn using QPainter.
+
+    \image brush-styles.png Brush Styles
+
+    \value NoBrush  No brush pattern.
+    \value SolidPattern  Uniform color.
+    \value Dense1Pattern  Extremely dense brush pattern.
+    \value Dense2Pattern  Very dense brush pattern.
+    \value Dense3Pattern  Somewhat dense brush pattern.
+    \value Dense4Pattern  Half dense brush pattern.
+    \value Dense5Pattern  Somewhat sparse brush pattern.
+    \value Dense6Pattern  Very sparse brush pattern.
+    \value Dense7Pattern  Extremely sparse brush pattern.
+    \value HorPattern  Horizontal lines.
+    \value VerPattern  Vertical lines.
+    \value CrossPattern  Crossing horizontal and vertical lines.
+    \value BDiagPattern  Backward diagonal lines.
+    \value FDiagPattern  Forward diagonal lines.
+    \value DiagCrossPattern  Crossing diagonal lines.
+    \value LinearGradientPattern  Linear gradient (set using a dedicated QBrush constructor).
+    \value ConicalGradientPattern  Conical gradient (set using a dedicated QBrush constructor).
+    \value RadialGradientPattern  Radial gradient (set using a dedicated QBrush constructor).
+    \value TexturePattern  Custom pattern (see QBrush::setTexture()).
+
+    \omitvalue CustomPattern
+
+    \sa QBrush
+*/
+
+/*!
+    \enum Qt::TextFlag
+
+    This enum type is used to define some modifier flags. Some of
+    these flags only make sense in the context of printing:
+
+    \value TextSingleLine Treats all whitespace as spaces and prints just
+           one line.
+    \value TextDontClip If it's impossible to stay within the given bounds,
+           it prints outside.
+    \value TextExpandTabs Makes the U+0009 (ASCII tab) character move to
+           the next tab stop.
+    \value TextShowMnemonic Displays the string "\&P" as \underline{P}
+           (see QButton for an example). For an ampersand, use "\&\&".
+    \value TextWordWrap Breaks lines at appropriate points, e.g. at word
+           boundaries.
+    \value TextWrapAnywhere Breaks lines anywhere, even within words.
+    \value TextHideMnemonic Same as Qt::TextShowMnemonic but doesn't draw the underlines.
+    \value TextDontPrint Treat this text as "hidden" and don't print
+    it.
+    \value IncludeTrailingSpaces When this option is set, QTextLine::naturalTextWidth() and naturalTextRect() will
+                                 return a value that includes the width of trailing spaces in the text; otherwise
+                                 this width is excluded.
+    \value TextIncludeTrailingSpaces Same as IncludeTrailingSpaces
+    \value TextJustificationForced Ensures that text lines are justified.
+
+    \omitvalue BreakAnywhere
+    \omitvalue DontClip
+    \omitvalue DontPrint
+    \omitvalue ExpandTabs
+    \omitvalue IncludeTrailingSpaces
+    \omitvalue NoAccel
+    \omitvalue ShowPrefix
+    \omitvalue SingleLine
+    \omitvalue WordBreak
+    \omitvalue TextForceLeftToRight
+    \omitvalue TextForceRightToLeft
+
+    You can use as many modifier flags as you want, except that
+    Qt::TextSingleLine and Qt::TextWordWrap cannot be combined.
+
+    Flags that are inappropriate for a given use are generally
+    ignored.
+*/
+
+/*!
+    \enum Qt::BGMode
+
+    Background mode:
+
+    \value TransparentMode
+    \value OpaqueMode
+*/
+
+/*!
+    \enum Qt::ConnectionType
+
+    This enum describes the types of connection that can be used between signals and
+    slots. In particular, it determines whether a particular signal is delivered to a
+    slot immediately or queued for delivery at a later time.
+
+    \omitvalue AutoCompatConnection
+    \value DirectConnection  When emitted, the signal is immediately delivered to the slot.
+    \value QueuedConnection  When emitted, the signal is queued until the event loop is
+                             able to deliver it to the slot.
+    \value
+    BlockingQueuedConnection Same as QueuedConnection, except that the current thread blocks
+                             until the slot has been delivered. This connection type should
+                             only be used for receivers in a different thread. Note that misuse
+                             of this type can lead to dead locks in your application.
+    \value AutoConnection    If the signal is emitted from the thread
+                             in which the receiving object lives, the
+                             slot is invoked directly, as with
+                             Qt::DirectConnection; otherwise the
+                             signal is queued, as with
+                             Qt::QueuedConnection.
+
+    With queued connections, the parameters must be of types that are known to
+    Qt's meta-object system, because Qt needs to copy the arguments to store them
+    in an event behind the scenes. If you try to use a queued connection and
+    get the error message
+
+    \snippet doc/src/snippets/code/doc_src_qnamespace.qdoc 0
+
+    call qRegisterMetaType() to register the data type before you
+    establish the connection.
+
+    \sa {Thread Support in Qt}, QObject::connect(), qRegisterMetaType()
+*/
+
+/*!
+    \enum Qt::DateFormat
+
+    \value TextDate The default Qt format, which includes the day and month name,
+    the day number in the month, and the year in full. The day and month names will
+    be short, localized names. This is basically equivalent to using the date format
+    string, "ddd MMM d yyyy". See QDate::toString() for more information.
+
+    \value ISODate ISO 8601 extended format: either \c{YYYY-MM-DD} for dates or
+    \c{YYYY-MM-DDTHH:MM:SS} for combined dates and times.
+
+    \value SystemLocaleShortDate The \l{QLocale::ShortFormat}{short format} used
+    by the \l{QLocale::system()}{operating system}.
+
+    \value SystemLocaleLongDate The \l{QLocale::LongFormat}{long format} used
+    by the \l{QLocale::system()}{operating system}.
+
+    \value DefaultLocaleShortDate The \l{QLocale::ShortFormat}{short format} specified
+    by the \l{QLocale::setDefault()}{application's locale}.
+
+    \value DefaultLocaleLongDate The \l{QLocale::LongFormat}{long format} used
+    by the \l{QLocale::setDefault()}{application's locale}.
+
+    \value SystemLocaleDate \e{This enum value is deprecated.} Use Qt::SystemLocaleShortDate
+    instead (or Qt::SystemLocaleLongDate if you want long dates).
+
+    \value LocaleDate \e{This enum value is deprecated.} Use Qt::DefaultLocaleShortDate
+    instead (or Qt::DefaultLocaleLongDate if you want long dates).
+
+    \value LocalDate \e{This enum value is deprecated.} Use Qt::SystemLocaleShortDate
+    instead (or Qt::SystemLocaleLongDate if you want long dates).
+
+    \note For \c ISODate formats, each \c Y, \c M and \c D represents a single digit
+    of the year, month and day used to specify the date. Each \c H, \c M and \c S
+    represents a single digit of the hour, minute and second used to specify the time.
+    The presence of a literal \c T character is used to separate the date and time when
+    both are specified.
+*/
+
+
+/*!
+    \enum Qt::TimeSpec
+
+    \value LocalTime Locale dependent time (Timezones and Daylight Savings Time).
+    \value UTC Coordinated Universal Time, replaces Greenwich Mean Time.
+    \value OffsetFromUTC An offset in seconds from Coordinated Universal Time.
+*/
+
+/*!
+    \enum Qt::DayOfWeek
+
+    \value Monday
+    \value Tuesday
+    \value Wednesday
+    \value Thursday
+    \value Friday
+    \value Saturday
+    \value Sunday
+*/
+
+/*!
+    \enum Qt::CaseSensitivity
+
+    \value CaseInsensitive
+    \value CaseSensitive
+*/
+
+/*!
+    \enum Qt::ToolBarArea
+
+    \value LeftToolBarArea
+    \value RightToolBarArea
+    \value TopToolBarArea
+    \value BottomToolBarArea
+    \value AllToolBarAreas
+    \value NoToolBarArea
+
+    \omitvalue ToolBarArea_Mask
+*/
+
+/*!
+    \enum Qt::DockWidgetArea
+
+    \value LeftDockWidgetArea
+    \value RightDockWidgetArea
+    \value TopDockWidgetArea
+    \value BottomDockWidgetArea
+    \value AllDockWidgetAreas
+    \value NoDockWidgetArea
+
+    \omitvalue DockWidgetArea_Mask
+*/
+
+/*!
+    \enum Qt::BackgroundMode
+
+    \compat
+
+    \value FixedColor
+    \value FixedPixmap
+    \value NoBackground
+    \value PaletteForeground
+    \value PaletteButton
+    \value PaletteLight
+    \value PaletteMidlight
+    \value PaletteDark
+    \value PaletteMid
+    \value PaletteText
+    \value PaletteBrightText
+    \value PaletteBase
+    \value PaletteBackground
+    \value PaletteShadow
+    \value PaletteHighlight
+    \value PaletteHighlightedText
+    \value PaletteButtonText
+    \value PaletteLink
+    \value PaletteLinkVisited
+    \value X11ParentRelative
+*/
+
+/*!
+    \enum Qt::ImageConversionFlag
+
+    The options marked "(default)" are set if no other values from
+    the list are included (since the defaults are zero):
+
+    Color/Mono preference (ignored for QBitmap):
+
+    \value AutoColor (default) - If the image has \link
+           QImage::depth() depth\endlink 1 and contains only
+           black and white pixels, the pixmap becomes monochrome.
+    \value ColorOnly The pixmap is dithered/converted to the
+           \link QPixmap::defaultDepth() native display depth\endlink.
+    \value MonoOnly The pixmap becomes monochrome. If necessary,
+           it is dithered using the chosen dithering algorithm.
+
+    Dithering mode preference for RGB channels:
+
+    \value DiffuseDither (default) - A high-quality dither.
+    \value OrderedDither A faster, more ordered dither.
+    \value ThresholdDither No dithering; closest color is used.
+
+    Dithering mode preference for alpha channel:
+
+    \value ThresholdAlphaDither (default) - No dithering.
+    \value OrderedAlphaDither A faster, more ordered dither.
+    \value DiffuseAlphaDither A high-quality dither.
+    \omitvalue NoAlpha
+
+    Color matching versus dithering preference:
+
+    \value PreferDither (default when converting to a pixmap) - Always dither
+           32-bit images when the image is converted to 8 bits.
+    \value AvoidDither (default when converting for the purpose of saving to
+           file) - Dither 32-bit images only if the image has more than 256
+           colors and it is being converted to 8 bits.
+    \omitvalue AutoDither
+
+    \omitvalue ColorMode_Mask
+    \omitvalue Dither_Mask
+    \omitvalue AlphaDither_Mask
+    \omitvalue DitherMode_Mask
+    \omitvalue NoOpaqueDetection
+*/
+
+/*! \enum Qt::GUIStyle
+
+    \compat
+
+    \value WindowsStyle
+    \value MotifStyle
+    \value MacStyle
+    \value Win3Style
+    \value PMStyle
+*/
+
+/*!
+    \enum Qt::UIEffect
+
+    This enum describes the available UI effects.
+
+    By default, Qt will try to use the platform specific desktop
+    settings for each effect. Use the
+    QApplication::setDesktopSettingsAware() function (passing \c false
+    as argument) to prevent this, and the
+    QApplication::setEffectEnabled() to enable or disable a particular
+    effect.
+
+    Note that all effects are disabled on screens running at less than
+    16-bit color depth.
+
+    \omitvalue UI_General
+
+    \value UI_AnimateMenu Show animated menus.
+    \value UI_FadeMenu Show faded menus.
+    \value UI_AnimateCombo Show animated comboboxes.
+    \value UI_AnimateTooltip Show tooltip animations.
+    \value UI_FadeTooltip Show tooltip fading effects.
+    \value UI_AnimateToolBox Reserved
+
+    \sa QApplication::setEffectEnabled(), QApplication::setDesktopSettingsAware()
+*/
+
+/*! \enum Qt::AspectRatioMode
+
+    This enum type defines what happens to the aspect ratio when
+    scaling an rectangle.
+
+    \image qimage-scaling.png
+
+    \value IgnoreAspectRatio  The size is scaled freely. The aspect
+                              ratio is not preserved.
+    \value KeepAspectRatio  The size is scaled to a rectangle as
+                            large as possible inside a given
+                            rectangle, preserving the aspect ratio.
+    \value KeepAspectRatioByExpanding  The size is scaled to a
+                                       rectangle as small as possible
+                                       outside a given rectangle,
+                                       preserving the aspect ratio.
+
+    \omitvalue ScaleFree
+    \omitvalue ScaleMin
+    \omitvalue ScaleMax
+
+    \sa QSize::scale(), QImage::scaled()
+*/
+
+/*! \typedef Qt::ScaleMode
+    \compat
+
+    Use Qt::AspectRatioMode instead.
+
+    The enum values have been renamed as follows:
+
+    \table
+    \row \i Old enum value \i New enum value
+    \row \i Qt::ScaleFree  \i Qt::IgnoreAspectRatio
+    \row \i Qt::ScaleMin   \i Qt::KeepAspectRatio
+    \row \i Qt::ScaleMax   \i Qt::KeepAspectRatioByExpanding
+    \endtable
+*/
+
+/*! \enum Qt::TransformationMode
+
+    This enum type defines whether image transformations (e.g.,
+    scaling) should be smooth or not.
+
+    \value FastTransformation  The transformation is performed
+                               quickly, with no smoothing.
+    \value SmoothTransformation  The resulting image is transformed
+                                 using bilinear filtering.
+
+    \sa QImage::scaled()
+*/
+
+/*! \enum Qt::Axis
+
+    This enum type defines three values to represent the three
+    axes in the cartesian coordinate system.
+
+    \value XAxis  The X axis.
+    \value YAxis  The Y axis.
+    \value ZAxis  The Z axis.
+
+    \sa QTransform::rotate(), QTransform::rotateRadians()
+ */
+
+/*!
+    \enum Qt::WidgetAttribute
+
+    \keyword widget attributes
+
+    This enum type is used to specify various widget attributes.
+    Attributes are set and cleared with QWidget::setAttribute(), and
+    queried with QWidget::testAttribute(), although some have special
+    convenience functions which are mentioned below.
+
+    \value WA_AcceptDrops Allows data from drag and drop operations
+    to be dropped onto the widget (see QWidget::setAcceptDrops()).
+
+    \value WA_AlwaysShowToolTips Enables tooltips for inactive windows.
+
+    \value WA_ContentsPropagated This flag is superfluous and
+    obsolete; it no longer has any effect. Since Qt 4.1, all widgets
+    that do not set WA_PaintOnScreen propagate their contents.
+
+    \value WA_CustomWhatsThis Indicates that the widget wants to
+    continue operating normally in "What's This?" mode. This is set by the
+    widget's author.
+
+    \value WA_DeleteOnClose Makes Qt delete this widget when the
+    widget has accepted the close event (see QWidget::closeEvent()).
+
+    \value WA_Disabled Indicates that the widget is disabled, i.e.
+    it does not receive any mouse or keyboard events. There is also a
+    getter functions QWidget::isEnabled().  This is set/cleared by the
+    Qt kernel.
+
+    \omitvalue WA_DropSiteRegistered
+    \omitvalue WA_ForceAcceptDrops
+
+    \value WA_ForceDisabled Indicates that the widget is
+    explicitly disabled, i.e. it will remain disabled even when all
+    its ancestors are set to the enabled state. This implies
+    WA_Disabled. This is set/cleared by QWidget::setEnabled() and
+    QWidget::setDisabled().
+
+    \value WA_ForceUpdatesDisabled Indicates that updates are
+    explicitly disabled for the widget; i.e. it will remain disabled
+    even when all its ancestors are set to the updates-enabled state.
+    This implies WA_UpdatesDisabled. This is set/cleared by
+    QWidget::setUpdatesEnabled().
+
+    \value WA_GroupLeader
+        \e{This attribute has been deprecated.} Use QWidget::windowModality
+        instead.
+
+    \value WA_Hover Forces Qt to generate paint events when the mouse
+    enters or leaves the widget. This feature is typically used when
+    implementing custom styles; see the \l{widgets/styles}{Styles}
+    example for details.
+
+    \value WA_InputMethodEnabled Enables input methods for Asian languages.
+    Must be set when creating custom text editing widgets.
+    On Windows CE this flag can be used in addition to
+    QApplication::autoSipEnabled to automatically display the SIP when
+    entering a widget.
+
+    \value WA_KeyboardFocusChange Set on a toplevel window when
+    the users changes focus with the keyboard (tab, backtab, or shortcut).
+
+    \value WA_KeyCompression Enables key event compression if set,
+    and disables it if not set. By default key compression is off, so
+    widgets receive one key press event for each key press (or more,
+    since autorepeat is usually on). If you turn it on and your
+    program doesn't keep up with key input, Qt may try to compress key
+    events so that more than one character can be processed in each
+    event.
+    For example, a word processor widget might receive 2, 3 or more
+    characters in each QKeyEvent::text(), if the layout recalculation
+    takes too long for the CPU.
+    If a widget supports multiple character unicode input, it is
+    always safe to turn the compression on.
+    Qt performs key event compression only for printable characters.
+    Qt::Modifier keys, cursor movement keys, function keys and
+    miscellaneous action keys (e.g. Escape, Enter, Backspace,
+    PrintScreen) will stop key event compression, even if there are
+    more compressible key events available.
+    Platforms other than Mac and X11 do not support this compression,
+    in which case turning it on will have no effect.
+    This is set/cleared by the widget's author.
+
+    \value WA_LayoutOnEntireRect Indicates that the widget
+    wants QLayout to operate on the entire QWidget::rect(), not only
+    on QWidget::contentsRect(). This is set by the widget's author.
+
+    \value WA_LayoutUsesWidgetRect Ignore the layout item rect from the style
+    when laying out this widget with QLayout. This makes a difference in
+    QMacStyle and QPlastiqueStyle for some widgets.
+
+    \value WA_MacNoClickThrough When a widget that has this attribute set
+    is clicked, and its window is inactive, the click will make the window
+    active but won't be seen by the widget. Typical use of this attribute
+    is on widgets with "destructive" actions, such as a "Delete" button.
+    WA_MacNoClickThrough also applies to all child widgets of the widget
+    that has it set.
+
+    \value WA_MacOpaqueSizeGrip Indicates that the native Carbon size grip
+    should be opaque instead of transparent (the default). This attribute
+    is only applicable to Mac OS X and is set by the widget's author.
+
+    \value WA_MacShowFocusRect Indicates that this widget should get a
+    QFocusFrame around it. Some widgets draw their own focus halo
+    regardless of this attribute. Not that the QWidget::focusPolicy
+    also plays the main role in whether something is given focus or
+    not, this only controls whether or not this gets the focus
+    frame. This attribute is only applicable to Mac OS X.
+
+    \value WA_MacNormalSize Indicates the widget should have the
+    normal size for widgets in Mac OS X. This attribute is only
+    applicable to Mac OS X.
+
+    \value WA_MacSmallSize Indicates the widget should have the small
+    size for widgets in Mac OS X. This attribute is only applicable to
+    Mac OS X.
+
+    \value WA_MacMiniSize Indicates the widget should have the mini
+    size for widgets in Mac OS X. This attribute is only applicable to
+    Mac OS X.
+
+    \value WA_MacVariableSize Indicates the widget can choose between
+    alternative sizes for widgets to avoid clipping.
+    This attribute is only applicable to Mac OS X.
+
+    \value WA_MacBrushedMetal Indicates the widget should be drawn in
+    the brushed metal style as supported by the windowing system. This
+    attribute is only applicable to Mac OS X.
+
+    \omitvalue WA_MacMetalStyle
+
+    \value WA_Mapped Indicates that the widget is mapped on screen.
+    This is set/cleared by the Qt kernel.
+
+    \value WA_MouseNoMask Makes the widget receive mouse events for
+    the entire widget regardless of the currently set mask,
+    overriding QWidget::setMask(). This is not applicable for
+    top-level windows.
+
+    \value WA_MouseTracking Indicates that the widget has mouse
+    tracking enabled. See QWidget::mouseTracking.
+
+    \value WA_Moved Indicates that the widget has an explicit
+    position. This is set/cleared by QWidget::move() and
+    by QWidget::setGeometry().
+
+    \value WA_MSWindowsUseDirect3D Makes drawing to a widget
+    with this attribute set use the Direct3D paint engine, if the
+    Direct3D paint engine is available. \bold {This functionality
+    is experimental.}
+
+    \value WA_NoBackground This value is obsolete. Use
+    WA_OpaquePaintEvent instead.
+
+    \value WA_NoChildEventsForParent Indicates that the widget does
+    not want ChildAdded or ChildRemoved events sent to its
+    parent. This is rarely necessary but can help to avoid automatic
+    insertion widgets like splitters and layouts. This is set by a
+    widget's author.
+
+    \value WA_NoChildEventsFromChildren Indicates that the widget does
+    not want to receive ChildAdded or ChildRemoved events sent from its
+    children. This is set by a widget's author.
+
+    \value WA_NoMouseReplay Used for pop-up widgets. Indicates that the most
+    recent mouse press event should not be replayed when the pop-up widget
+    closes. The flag is set by the widget's author and cleared by the Qt kernel
+    every time the widget receives a new mouse event.
+
+    \value WA_NoMousePropagation Prohibits mouse events from being propagated
+    to the widget's parent. This attribute is disabled by default.
+
+    \value WA_TransparentForMouseEvents When enabled, this attribute disables
+    the delivery of mouse events to the widget and its children. Mouse events
+    are delivered to other widgets as if the widget and its children were not
+    present in the widget hierarchy; mouse clicks and other events effectively
+    "pass through" them. This attribute is disabled by default.
+
+    \value WA_NoSystemBackground Indicates that the widget has no background,
+    i.e. when the widget receives paint events, the background is not
+    automatically repainted. \note Unlike WA_OpaquePaintEvent, newly exposed
+    areas are \bold never filled with the background (e.g., after showing a
+    window for the first time the user can see "through" it until the
+    application processes the paint events). This flag is set or cleared by the
+    widget's author.
+
+    \value WA_OpaquePaintEvent Indicates that the widget paints all its pixels
+    when it receives a paint event. Thus, it is not required for operations
+    like updating, resizing, scrolling and focus changes to erase the widget
+    before generating paint events. The use of WA_OpaquePaintEvent provides a
+    small optimization by helping to reduce flicker on systems that do not
+    support double buffering and avoiding computational cycles necessary to
+    erase the background prior to painting. \note Unlike
+    WA_NoSystemBackground, WA_OpaquePaintEvent makes an effort to avoid
+    transparent window backgrounds. This flag is set or cleared by the widget's
+    author.
+
+    \value WA_OutsideWSRange Indicates that the widget is outside
+    the valid range of the window system's coordinate system. A widget
+    outside the valid range cannot be mapped on screen. This is
+    set/cleared by the Qt kernel.
+
+    \value WA_PaintOnScreen Indicates that the widget wants to draw directly
+    onto the screen. Widgets with this attribute set do not participate in
+    composition management, i.e. they cannot be semi-transparent or shine
+    through semi-transparent overlapping widgets. \note This flag is only
+    supported on X11 and it disables double buffering. On Qt for Embedded
+    Linux, the flag only works when set on a top-level widget and it relies on
+    support from the active screen driver. This flag is set or cleared by the
+    widget's author. To render outside of Qt's paint system, e.g., if you
+    require native painting primitives, you need to reimplement
+    QWidget::paintEngine() to return 0 and set this flag.
+
+    \value WA_PaintOutsidePaintEvent Makes it possible to use QPainter to
+    paint on the widget outside \l{QWidget::paintEvent()}{paintEvent()}. This
+    flag is not supported on Windows, Mac OS X or Embedded Linux. We recommend
+    that you use it only when porting Qt 3 code to Qt 4.
+
+    \value WA_PaintUnclipped Makes all painters operating on this widget
+    unclipped. Children of this widget or other widgets in front of it do not
+    clip the area the painter can paint on. This flag is only supported for
+    widgets with the WA_PaintOnScreen flag set. The preferred way to do this in
+    a cross platform way is to create a transparent widget that lies in front
+    of the other widgets.
+
+    \value WA_PendingMoveEvent Indicates that a move event is pending, e.g.,
+    when a hidden widget was moved. This flag is set or cleared by the Qt
+    kernel.
+
+    \value WA_PendingResizeEvent Indicates that a resize event is pending,
+    e.g., when a hidden widget was resized. This flag is set or cleared by the
+    Qt kernel.
+
+    \value WA_QuitOnClose Makes Qt quit the application when the last widget
+    with the attribute set has accepted closeEvent(). This behavior can be
+    modified with the QApplication::quitOnLastWindowClosed property. By default
+    this attribute is set for all widgets of type Qt::Window.
+
+    \value WA_Resized Indicates that the widget has an explicit size. This flag
+    is set or cleared by QWidget::resize() and QWidget::setGeometry().
+
+    \value WA_RightToLeft Indicates that the layout direction for the widget
+    is right to left.
+
+    \value WA_SetCursor Indicates that the widget has a cursor of its own. This
+    flag is set or cleared by QWidget::setCursor() and QWidget::unsetCursor().
+
+    \value WA_SetFont Indicates that the widget has a font of its own. This
+    flag is set or cleared by QWidget::setFont().
+
+    \value WA_SetPalette Indicates that the widget has a palette of its own.
+    This flag is set or cleared by QWidget::setPalette().
+
+    \value WA_SetStyle Indicates that the widget has a style of its own. This
+    flag is set or cleared by QWidget::setStyle().
+
+    \value WA_ShowModal \e{This attribute has been deprecated.} Use
+    QWidget::windowModality instead.
+
+    \value WA_StaticContents Indicates that the widget contents are north-west
+    aligned and static. On resize, such a widget will receive paint events only
+    for parts of itself that are newly visible. This flag is set or cleared by
+    the widget's author.
+
+    \value WA_StyleSheet Indicates that the widget is styled using a
+    \l{Qt Style Sheets}{style sheet}.
+
+    \value WA_TranslucentBackground Indicates that the widget should have a
+    translucent background, i.e., any non-opaque regions of the widgets will be
+    translucent because the widget will have an alpha channel. Setting this
+    flag causes WA_NoSystemBackground to be set. On Windows the
+    widget also needs the Qt::FramelessWindowHint window flag to be set.
+    This flag is set or cleared by the widget's author.
+
+    \value WA_UnderMouse Indicates that the widget is under the mouse cursor.
+    The value is not updated correctly during drag and drop operations. There
+    is also a getter function, QWidget::underMouse(). This flag is set or
+    cleared by the Qt kernel.
+
+    \value WA_UpdatesDisabled Indicates that updates are blocked (including the
+    system background). This flag is set or cleared by the Qt kernel.
+    \warning This flag must \e never be set or cleared by the widget's author.
+
+    \value WA_WindowModified Indicates that the window is marked as modified.
+    On some platforms this flag will do nothing, on others (including Mac OS X
+    and Windows) the window will take a modified appearance. This flag is set
+    or cleared by QWidget::setWindowModified().
+
+    \value WA_WindowPropagation Makes a toplevel window inherit font and
+    palette from its parent.
+
+    \value WA_MacAlwaysShowToolWindow On Mac OS X, show the tool window even
+    when the application is not active.  By default, all tool windows are
+    hidden when the application is inactive.
+
+    \value WA_SetLocale Indicates the locale should be taken into consideration
+    in the widget.
+
+    \value WA_StyledBackground Indicates the widget should be drawn using a
+    styled background.
+
+    \value WA_ShowWithoutActivating Show the widget without making it active.
+
+    \value WA_NativeWindow Indicates that a native window is created for the
+    widget. Enabling this flag will also force a native window for the widget's
+    ancestors unless Qt::WA_DontCreateNativeAncestors is set.
+
+    \value WA_DontCreateNativeAncestors Indicates that the widget's ancestors
+    are kept non-native even though the widget itself is native.
+
+    \value WA_X11NetWmWindowTypeDesktop Adds _NET_WM_WINDOW_TYPE_DESKTOP to the
+    window's _NET_WM_WINDOW_TYPE X11 window property. See
+    http://standards.freedesktop.org/wm-spec/ for more details. This attribute
+    has no effect on non-X11 platforms.
+
+    \value WA_X11NetWmWindowTypeDock Adds _NET_WM_WINDOW_TYPE_DOCK to the
+    window's _NET_WM_WINDOW_TYPE X11 window property. See
+    http://standards.freedesktop.org/wm-spec/ for more details. This attribute
+    has no effect on non-X11 platforms.
+
+    \value WA_X11NetWmWindowTypeToolBar Adds _NET_WM_WINDOW_TYPE_TOOLBAR to the
+    window's _NET_WM_WINDOW_TYPE X11 window property. See
+    http://standards.freedesktop.org/wm-spec/ for more details. This attribute
+    has no effect on non-X11 platforms. \note Qt automaticaly sets this
+    attribute for QToolBar.
+
+    \value WA_X11NetWmWindowTypeMenu Adds _NET_WM_WINDOW_TYPE_MENU to the
+    window's _NET_WM_WINDOW_TYPE X11 window property. See
+    http://standards.freedesktop.org/wm-spec/ for more details. This attribute
+    has no effect on non-X11 platforms. \note Qt automatically sets this
+    attribute for QMenu when torn-off.
+
+    \value WA_X11NetWmWindowTypeUtility Adds _NET_WM_WINDOW_TYPE_UTILITY to the
+    window's _NET_WM_WINDOW_TYPE X11 window property. See
+    http://standards.freedesktop.org/wm-spec/ for more details. This attribute
+    has no effect on non-X11 platforms. \note Qt automatically sets this
+    attribute for the Qt::Tool window type.
+
+    \value WA_X11NetWmWindowTypeSplash Adds _NET_WM_WINDOW_TYPE_SPLASH to the
+    window's _NET_WM_WINDOW_TYPE X11 window property. See
+    http://standards.freedesktop.org/wm-spec/ for more details. This attribute
+    has no effect on non-X11 platforms. \note Qt automatically sets this
+    attribute for the Qt::SplashScreen window type.
+
+    \value WA_X11NetWmWindowTypeDialog Adds _NET_WM_WINDOW_TYPE_DIALOG
+    to the window's _NET_WM_WINDOW_TYPE X11 window property. See
+    http://standards.freedesktop.org/wm-spec/ for more details. This
+    attribute has no effect on non-X11 platforms. \note Qt automatically sets
+    this attribute for the Qt::Dialog and Qt::Sheet window types.
+
+    \value WA_X11NetWmWindowTypeDropDownMenu Adds
+    _NET_WM_WINDOW_TYPE_DROPDOWN_MENU to the window's
+    _NET_WM_WINDOW_TYPE X11 window property. See
+    http://standards.freedesktop.org/wm-spec/ for more details. This
+    attribute has no effect on non-X11 platforms. \note Qt
+    automatically sets this attribute for QMenus added to a QMenuBar.
+
+    \value WA_X11NetWmWindowTypePopupMenu Adds _NET_WM_WINDOW_TYPE_POPUP_MENU
+    to the window's _NET_WM_WINDOW_TYPE X11 window property. See
+    http://standards.freedesktop.org/wm-spec/ for more details. This attribute
+    has no effect on non-X11 platforms. \note Qt automatically sets this
+    attribute for QMenu.
+
+    \value WA_X11NetWmWindowTypeToolTip Adds _NET_WM_WINDOW_TYPE_TOOLTIP to the
+    window's _NET_WM_WINDOW_TYPE X11 window property. See
+    http://standards.freedesktop.org/wm-spec/ for more details. This attribute
+    has no effect on non-X11 platforms. \note Qt automatically sets this
+    attribute for the Qt::ToolTip window type.
+
+    \value WA_X11NetWmWindowTypeNotification Adds
+    _NET_WM_WINDOW_TYPE_NOTIFICATION to the window's _NET_WM_WINDOW_TYPE X11
+    window property. See http://standards.freedesktop.org/wm-spec/ for more
+    details. This attribute has no effect on non-X11 platforms.
+
+    \value WA_X11NetWmWindowTypeCombo Adds _NET_WM_WINDOW_TYPE_COMBO
+    to the window's _NET_WM_WINDOW_TYPE X11 window property. See
+    http://standards.freedesktop.org/wm-spec/ for more details. This attribute
+    has no effect on non-X11 platforms. \note Qt automatically sets this
+    attribute for the QComboBox pop-up.
+
+    \value WA_X11NetWmWindowTypeDND Adds _NET_WM_WINDOW_TYPE_DND to
+    the window's _NET_WM_WINDOW_TYPE X11 window property. See
+    http://standards.freedesktop.org/wm-spec/ for more details. This attribute
+    has no effect on non-X11 platforms. \note Qt automatically sets this
+    attribute on the feedback widget used during a drag.
+
+    \value WA_MacFrameworkScaled Enables resolution independence aware mode
+    on Mac when using Carbon. This attribute has no effect on Cocoa.
+    The attribute is off by default and can be enabled on a per-window basis.
+
+    \omitvalue WA_SetLayoutDirection
+    \omitvalue WA_InputMethodTransparent
+    \omitvalue WA_WState_CompressKeys
+    \omitvalue WA_WState_ConfigPending
+    \omitvalue WA_WState_Created
+    \omitvalue WA_WState_DND
+    \omitvalue WA_WState_ExplicitShowHide
+    \omitvalue WA_WState_Hidden
+    \omitvalue WA_WState_InPaintEvent
+    \omitvalue WA_WState_OwnSizePolicy
+    \omitvalue WA_WState_Polished
+    \omitvalue WA_WState_Reparented
+    \omitvalue WA_WState_Visible
+    \omitvalue WA_SetWindowIcon
+    \omitvalue WA_PendingUpdate
+    \omitvalue WA_LaidOut
+    \omitvalue WA_GrabbedShortcut
+    \omitvalue WA_DontShowOnScreen 
+    \omitvalue WA_InvalidSize
+    \omitvalue WA_ForceUpdatesDisabled
+    \omitvalue WA_NoX11EventCompression
+    \omitvalue WA_TintedBackground
+    \omitvalue WA_X11OpenGLOverlay
+    \omitvalue WA_CanHostQMdiSubWindowTitleBar
+    \omitvalue WA_AttributeCount
+    \omitvalue WA_StyleSheet
+    \omitvalue WA_X11BypassTransientForHint
+    \omitvalue WA_SetWindowModality
+    \omitvalue WA_WState_WindowOpacitySet
+*/
+
+/*! \typedef Qt::HANDLE
+
+    Platform-specific handle type for system objects. This is
+    equivalent to \c{void *} on Windows and Mac OS X, and embedded
+    Linux, and to \c{unsigned long} on X11.
+
+    \warning Using this type is not portable.
+*/
+
+/*!
+    \enum Qt::Key
+
+    The key names used by Qt.
+
+    \value Key_Escape
+    \value Key_Tab
+    \value Key_Backtab
+    \omitvalue Key_BackTab
+    \value Key_Backspace
+    \omitvalue Key_BackSpace
+    \value Key_Return
+    \value Key_Enter     Typically located on the keypad.
+    \value Key_Insert
+    \value Key_Delete
+    \value Key_Pause
+    \value Key_Print
+    \value Key_SysReq
+    \value Key_Clear
+    \value Key_Home
+    \value Key_End
+    \value Key_Left
+    \value Key_Up
+    \value Key_Right
+    \value Key_Down
+    \value Key_PageUp
+    \omitvalue Key_Prior
+    \value Key_PageDown
+    \omitvalue Key_Next
+    \value Key_Shift
+    \value Key_Control    On Mac OS X, this corresponds to the Command keys.
+    \value Key_Meta       On Mac OS X, this corresponds to the Control keys.
+                          On Windows keyboards, this key is mapped to the
+                          Windows key.
+    \value Key_Alt
+    \value Key_AltGr      On Windows, when the KeyDown event for this key is
+                          sent, the Ctrl+Alt modifiers are also set.
+    \value Key_CapsLock
+    \value Key_NumLock
+    \value Key_ScrollLock
+    \value Key_F1
+    \value Key_F2
+    \value Key_F3
+    \value Key_F4
+    \value Key_F5
+    \value Key_F6
+    \value Key_F7
+    \value Key_F8
+    \value Key_F9
+    \value Key_F10
+    \value Key_F11
+    \value Key_F12
+    \value Key_F13
+    \value Key_F14
+    \value Key_F15
+    \value Key_F16
+    \value Key_F17
+    \value Key_F18
+    \value Key_F19
+    \value Key_F20
+    \value Key_F21
+    \value Key_F22
+    \value Key_F23
+    \value Key_F24
+    \value Key_F25
+    \value Key_F26
+    \value Key_F27
+    \value Key_F28
+    \value Key_F29
+    \value Key_F30
+    \value Key_F31
+    \value Key_F32
+    \value Key_F33
+    \value Key_F34
+    \value Key_F35
+    \value Key_Super_L
+    \value Key_Super_R
+    \value Key_Menu
+    \value Key_Hyper_L
+    \value Key_Hyper_R
+    \value Key_Help
+    \value Key_Direction_L
+    \value Key_Direction_R
+    \value Key_Space
+    \value Key_Any
+    \value Key_Exclam
+    \value Key_QuoteDbl
+    \value Key_NumberSign
+    \value Key_Dollar
+    \value Key_Percent
+    \value Key_Ampersand
+    \value Key_Apostrophe
+    \value Key_ParenLeft
+    \value Key_ParenRight
+    \value Key_Asterisk
+    \value Key_Plus
+    \value Key_Comma
+    \value Key_Minus
+    \value Key_Period
+    \value Key_Slash
+    \value Key_0
+    \value Key_1
+    \value Key_2
+    \value Key_3
+    \value Key_4
+    \value Key_5
+    \value Key_6
+    \value Key_7
+    \value Key_8
+    \value Key_9
+    \value Key_Colon
+    \value Key_Semicolon
+    \value Key_Less
+    \value Key_Equal
+    \value Key_Greater
+    \value Key_Question
+    \value Key_At
+    \value Key_A
+    \value Key_B
+    \value Key_C
+    \value Key_D
+    \value Key_E
+    \value Key_F
+    \value Key_G
+    \value Key_H
+    \value Key_I
+    \value Key_J
+    \value Key_K
+    \value Key_L
+    \value Key_M
+    \value Key_N
+    \value Key_O
+    \value Key_P
+    \value Key_Q
+    \value Key_R
+    \value Key_S
+    \value Key_T
+    \value Key_U
+    \value Key_V
+    \value Key_W
+    \value Key_X
+    \value Key_Y
+    \value Key_Z
+    \value Key_BracketLeft
+    \value Key_Backslash
+    \value Key_BracketRight
+    \value Key_AsciiCircum
+    \value Key_Underscore
+    \value Key_QuoteLeft
+    \value Key_BraceLeft
+    \value Key_Bar
+    \value Key_BraceRight
+    \value Key_AsciiTilde
+    \value Key_nobreakspace
+    \value Key_exclamdown
+    \value Key_cent
+    \value Key_sterling
+    \value Key_currency
+    \value Key_yen
+    \value Key_brokenbar
+    \value Key_section
+    \value Key_diaeresis
+    \value Key_copyright
+    \value Key_ordfeminine
+    \value Key_guillemotleft
+    \value Key_notsign
+    \value Key_hyphen
+    \value Key_registered
+    \value Key_macron
+    \value Key_degree
+    \value Key_plusminus
+    \value Key_twosuperior
+    \value Key_threesuperior
+    \value Key_acute
+    \value Key_mu
+    \value Key_paragraph
+    \value Key_periodcentered
+    \value Key_cedilla
+    \value Key_onesuperior
+    \value Key_masculine
+    \value Key_guillemotright
+    \value Key_onequarter
+    \value Key_onehalf
+    \value Key_threequarters
+    \value Key_questiondown
+    \value Key_Agrave
+    \value Key_Aacute
+    \value Key_Acircumflex
+    \value Key_Atilde
+    \value Key_Adiaeresis
+    \value Key_Aring
+    \value Key_AE
+    \value Key_Ccedilla
+    \value Key_Egrave
+    \value Key_Eacute
+    \value Key_Ecircumflex
+    \value Key_Ediaeresis
+    \value Key_Igrave
+    \value Key_Iacute
+    \value Key_Icircumflex
+    \value Key_Idiaeresis
+    \value Key_ETH
+    \value Key_Ntilde
+    \value Key_Ograve
+    \value Key_Oacute
+    \value Key_Ocircumflex
+    \value Key_Otilde
+    \value Key_Odiaeresis
+    \value Key_multiply
+    \value Key_Ooblique
+    \value Key_Ugrave
+    \value Key_Uacute
+    \value Key_Ucircumflex
+    \value Key_Udiaeresis
+    \value Key_Yacute
+    \value Key_THORN
+    \value Key_ssharp
+    \omitvalue Key_agrave
+    \omitvalue Key_aacute
+    \omitvalue Key_acircumflex
+    \omitvalue Key_atilde
+    \omitvalue Key_adiaeresis
+    \omitvalue Key_aring
+    \omitvalue Key_ae
+    \omitvalue Key_ccedilla
+    \omitvalue Key_egrave
+    \omitvalue Key_eacute
+    \omitvalue Key_ecircumflex
+    \omitvalue Key_ediaeresis
+    \omitvalue Key_igrave
+    \omitvalue Key_iacute
+    \omitvalue Key_icircumflex
+    \omitvalue Key_idiaeresis
+    \omitvalue Key_eth
+    \omitvalue Key_ntilde
+    \omitvalue Key_ograve
+    \omitvalue Key_oacute
+    \omitvalue Key_ocircumflex
+    \omitvalue Key_otilde
+    \omitvalue Key_odiaeresis
+    \value Key_division
+    \omitvalue Key_oslash
+    \omitvalue Key_ugrave
+    \omitvalue Key_uacute
+    \omitvalue Key_ucircumflex
+    \omitvalue Key_udiaeresis
+    \omitvalue Key_yacute
+    \omitvalue Key_thorn
+    \value Key_ydiaeresis
+    \value Key_Multi_key
+    \value Key_Codeinput
+    \value Key_SingleCandidate
+    \value Key_MultipleCandidate
+    \value Key_PreviousCandidate
+    \value Key_Mode_switch
+    \value Key_Kanji
+    \value Key_Muhenkan
+    \value Key_Henkan
+    \value Key_Romaji
+    \value Key_Hiragana
+    \value Key_Katakana
+    \value Key_Hiragana_Katakana
+    \value Key_Zenkaku
+    \value Key_Hankaku
+    \value Key_Zenkaku_Hankaku
+    \value Key_Touroku
+    \value Key_Massyo
+    \value Key_Kana_Lock
+    \value Key_Kana_Shift
+    \value Key_Eisu_Shift
+    \value Key_Eisu_toggle
+    \value Key_Hangul
+    \value Key_Hangul_Start
+    \value Key_Hangul_End
+    \value Key_Hangul_Hanja
+    \value Key_Hangul_Jamo
+    \value Key_Hangul_Romaja
+    \value Key_Hangul_Jeonja
+    \value Key_Hangul_Banja
+    \value Key_Hangul_PreHanja
+    \value Key_Hangul_PostHanja
+    \value Key_Hangul_Special
+    \value Key_Dead_Grave
+    \value Key_Dead_Acute
+    \value Key_Dead_Circumflex
+    \value Key_Dead_Tilde
+    \value Key_Dead_Macron
+    \value Key_Dead_Breve
+    \value Key_Dead_Abovedot
+    \value Key_Dead_Diaeresis
+    \value Key_Dead_Abovering
+    \value Key_Dead_Doubleacute
+    \value Key_Dead_Caron
+    \value Key_Dead_Cedilla
+    \value Key_Dead_Ogonek
+    \value Key_Dead_Iota
+    \value Key_Dead_Voiced_Sound
+    \value Key_Dead_Semivoiced_Sound
+    \value Key_Dead_Belowdot
+    \value Key_Dead_Hook
+    \value Key_Dead_Horn
+    \value Key_Back
+    \value Key_Forward
+    \value Key_Stop
+    \value Key_Refresh
+    \value Key_VolumeDown
+    \value Key_VolumeMute
+    \value Key_VolumeUp
+    \value Key_BassBoost
+    \value Key_BassUp
+    \value Key_BassDown
+    \value Key_TrebleUp
+    \value Key_TrebleDown
+    \value Key_MediaPlay
+    \value Key_MediaStop
+    \value Key_MediaPrevious
+    \omitvalue Key_MediaPrev
+    \value Key_MediaNext
+    \value Key_MediaRecord
+    \value Key_HomePage
+    \value Key_Favorites
+    \value Key_Search
+    \value Key_Standby
+    \value Key_OpenUrl
+    \value Key_LaunchMail
+    \value Key_LaunchMedia
+    \value Key_Launch0
+    \value Key_Launch1
+    \value Key_Launch2
+    \value Key_Launch3
+    \value Key_Launch4
+    \value Key_Launch5
+    \value Key_Launch6
+    \value Key_Launch7
+    \value Key_Launch8
+    \value Key_Launch9
+    \value Key_LaunchA
+    \value Key_LaunchB
+    \value Key_LaunchC
+    \value Key_LaunchD
+    \value Key_LaunchE
+    \value Key_LaunchF
+    \value Key_MediaLast
+    \value Key_unknown
+
+    \value Key_Call
+    \value Key_Context1
+    \value Key_Context2
+    \value Key_Context3
+    \value Key_Context4
+    \value Key_Flip
+    \value Key_Hangup
+    \value Key_No
+    \value Key_Select
+    \value Key_Yes
+
+    \value Key_Execute
+    \value Key_Printer
+    \value Key_Play
+    \value Key_Sleep
+    \value Key_Zoom
+    \value Key_Cancel
+
+    \sa QKeyEvent::key()
+*/
+
+/*!
+    \enum Qt::HitTestAccuracy
+
+    This enum contains the types of accuracy that can be used by the
+    QTextDocument class when testing for mouse clicks on text documents.
+
+    \value ExactHit The point at which input occurred must coincide
+                    exactly with input-sensitive parts of the document.
+    \value FuzzyHit The point at which input occurred can lie close to
+                    input-sensitive parts of the document.
+
+    This enum is defined in the \c <QTextDocument> header file.
+*/
+
+/*!
+    \enum Qt::WhiteSpaceMode
+
+    This enum describes the types of whitespace mode that are used by
+    the QTextDocument class to meet the requirements of different kinds
+    of textual information.
+
+    \value WhiteSpaceNormal         The whitespace mode used to display
+                                    normal word wrapped text in paragraphs.
+    \value WhiteSpacePre            A preformatted text mode in which
+                                    whitespace is reproduced exactly.
+    \value WhiteSpaceNoWrap
+
+    \omitvalue WhiteSpaceModeUndefined
+
+    This enum is defined in the \c <QTextDocument> header file.
+*/
+
+/*!
+    \enum Qt::ButtonState_enum
+    \compat
+    \value ShiftButton
+    \value ControlButton
+    \value AltButton
+    \value MetaButton
+    \value Keypad
+    \value KeyButtonMask
+
+    Use Qt::KeyboardModifier instead.
+*/
+
+/*!
+    \typedef Qt::ButtonState
+    \compat
+
+    Use Qt::KeyboardModifier instead.
+*/
+
+/*!
+    \enum Qt::CheckState
+
+    This enum describes the state of checkable items, controls, and widgets.
+
+    \value Unchecked        The item is unchecked.
+    \value PartiallyChecked The item is partially checked. Items in hierarchical models
+                            may be partially checked if some, but not all, of their
+                            children are checked.
+    \value Checked          The item is checked.
+
+    \sa QCheckBox, Qt::ItemFlags, Qt::ItemDataRole
+*/
+
+
+/*!
+    \enum Qt::ToolButtonStyle
+
+    The style of the tool button, describing how the button's text and
+    icon should be displayed.
+
+    \value ToolButtonIconOnly Only display the icon.
+    \value ToolButtonTextOnly Only display the text.
+    \value ToolButtonTextBesideIcon The text appears beside the icon.
+    \value ToolButtonTextUnderIcon The text appears under the icon.
+*/
+
+/*!
+    \enum Qt::Corner
+
+    This enum type specifies a corner in a rectangle:
+
+    \value TopLeftCorner     The top-left corner of the rectangle.
+    \value TopRightCorner    The top-right corner of the rectangle.
+    \value BottomLeftCorner  The bottom-left corner of the rectangle.
+    \value BottomRightCorner The bottom-right corner of the rectangle.
+
+    \omitvalue TopLeft
+    \omitvalue TopRight
+    \omitvalue BottomLeft
+    \omitvalue BottomRight
+*/
+
+/*!
+    \enum Qt::ScrollBarPolicy
+
+    This enum type describes the various modes of QAbstractScrollArea's scroll
+    bars.
+
+    \value ScrollBarAsNeeded QAbstractScrollArea shows a scroll bar when the
+    content is too large to fit and not otherwise. This is the
+    default.
+
+    \value ScrollBarAlwaysOff QAbstractScrollArea never shows a scroll bar.
+
+    \value ScrollBarAlwaysOn  QAbstractScrollArea always shows a scroll bar.
+
+    (The modes for the horizontal and vertical scroll bars are
+    independent.)
+*/
+
+/*!
+    \enum Qt::ArrowType
+
+    \value NoArrow
+    \value UpArrow
+    \value DownArrow
+    \value LeftArrow
+    \value RightArrow
+*/
+
+/*!
+    \enum Qt::FocusReason
+
+    This enum specifies why the focus changed. It will be passed
+    through QWidget::setFocus and can be retrieved in the QFocusEvent
+    sent to the widget upon focus change.
+
+    \value MouseFocusReason        A mouse action occurred.
+    \value TabFocusReason          The Tab key was pressed.
+    \value BacktabFocusReason      A Backtab occurred. The input for this may
+                                   include the Shift or Control keys;
+                                   e.g. Shift+Tab.
+    \value ActiveWindowFocusReason The window system made this window either
+                                   active or inactive.
+    \value PopupFocusReason        The application opened/closed a pop-up that
+                                   grabbed/released the keyboard focus.
+    \value ShortcutFocusReason     The user typed a label's buddy shortcut
+    \value MenuBarFocusReason      The menu bar took focus.
+    \value OtherFocusReason        Another reason, usually application-specific.
+
+    \omitvalue NoFocusReason
+
+    \sa {Keyboard Focus}
+*/
+
+/*!
+    \enum Qt::WindowState
+
+    \keyword window state
+
+    This enum type is used to specify the current state of a top-level
+    window.
+
+    The states are
+
+    \value WindowNoState   The window has no state set (in normal state).
+    \value WindowMinimized The window is minimized (i.e. iconified).
+    \value WindowMaximized The window is maximized with a frame around it.
+    \value WindowFullScreen The window fills the entire screen without any frame around it.
+    \value WindowActive The window is the active window, i.e. it has keyboard focus.
+
+*/
+
+/*!
+    \enum Qt::ContextMenuPolicy
+
+    This enum type defines the various policies a widget can have with
+    respect to showing a context menu.
+
+    \value NoContextMenu the widget does not feature a context menu,
+    context menu handling is deferred to the widget's parent.
+    \value PreventContextMenu the widget does not feature a context
+    menu, and in contrast to \c NoContextMenu, the handling is \e not
+    deferred to the widget's parent. This means that all right mouse
+    button events are guaranteed to be delivered to the widget itself
+    through mousePressEvent(), and mouseReleaseEvent().
+    \value DefaultContextMenu  the widget's QWidget::contextMenuEvent() handler is called.
+    \value ActionsContextMenu  the widget displays its QWidget::actions() as context menu.
+    \value CustomContextMenu  the widget emits the QWidget::customContextMenuRequested() signal.
+*/
+
+/*!
+    \enum Qt::FocusPolicy
+
+    This enum type defines the various policies a widget can have with
+    respect to acquiring keyboard focus.
+
+    \value TabFocus  the widget accepts focus by tabbing.
+    \value ClickFocus  the widget accepts focus by clicking.
+    \value StrongFocus  the widget accepts focus by both tabbing
+                    and clicking. On Mac OS X this will also
+                    be indicate that the widget accepts tab focus
+                    when in 'Text/List focus mode'.
+    \value WheelFocus  like Qt::StrongFocus plus the widget accepts
+                    focus by using the mouse wheel.
+    \value NoFocus  the widget does not accept focus.
+
+*/
+
+/*!
+    \enum Qt::ShortcutContext
+
+    For a QEvent::Shortcut event to occur, the shortcut's key sequence
+    must be entered by the user in a context where the shortcut is
+    active. The possible contexts are these:
+
+    \value WidgetShortcut The shortcut is active when its
+    parent widget has focus.
+    \value WidgetWithChildrenShortcut The shortcut is active
+    when its parent widget, or any of its children has focus.
+    Children which are top-level widgets, except pop-ups, are
+    not affected by this shortcut context.
+    \value WindowShortcut The shortcut is active when its
+    parent widget is a logical subwidget of the
+    active top-level window.
+    \value ApplicationShortcut The shortcut is active when one of
+    the applications windows are active.
+*/
+
+/*!
+    \typedef Qt::WFlags
+
+    Synonym for Qt::WindowFlags.
+*/
+
+/*!
+    \enum Qt::WindowType
+
+    \keyword window flag
+
+    This enum type is used to specify various window-system properties
+    for the widget. They are fairly unusual but necessary in a few
+    cases. Some of these flags depend on whether the underlying window
+    manager supports them.
+
+    The main types are
+
+    \value Widget  This is the default type for QWidget. Widgets of
+                   this type are child widgets if they have a parent,
+                   and independent windows if they have no parent.
+                   See also Qt::Window and Qt::SubWindow.
+
+    \value Window  Indicates that the widget is a window, usually
+                   with a window system frame and a title bar,
+                   irrespective of whether the widget has a parent or
+                   not. Note that it is not possible to unset this
+                   flag if the widget does not have a parent.
+
+    \value Dialog  Indicates that the widget is a window that should
+                   be decorated as a dialog (i.e., typically no
+                   maximize or minimize buttons in the title bar).
+                   This is the default type for QDialog. If you want
+                   to use it as a modal dialog, it should be launched
+                   from another window, or have a parent and used
+                   with the QWidget::windowModality property. If you make
+                   it modal, the dialog will prevent other top-level
+                   windows in the application from getting any input.
+                   We refer to a top-level window that has a parent
+                   as a \e secondary window.
+
+    \value Sheet   Indicates that the widget is a Macintosh sheet.
+
+    \value Drawer  Indicates that the widget is a Macintosh drawer.
+
+    \value Popup   Indicates that the widget is a pop-up top-level
+                   window, i.e. that it is modal, but has a window
+                   system frame appropriate for pop-up menus.
+
+    \value Tool    Indicates that the widget is a tool window. A tool
+                   window is often a small window with a smaller than
+                   usual title bar and decoration, typically used for
+                   collections of tool buttons. It there is a parent,
+                   the tool window will always be kept on top of it.
+                   If there isn't a parent, you may consider using
+                   Qt::WindowStaysOnTopHint as well. If the window
+                   system supports it, a tool window can be decorated
+                   with a somewhat lighter frame. It can also be
+                   combined with Qt::FramelessWindowHint.
+                   \br
+                   \br
+                   On Mac OS X, tool windows correspond to the
+                   \l{http://developer.apple.com/documentation/Carbon/Conceptual/HandlingWindowsControls/hitb-wind_cont_concept/chapter_2_section_2.html}{Floating}
+                   class of windows. This means that the window lives on a
+                   level above normal windows; it impossible to put a normal
+                   window on top of it. By default, tool windows will disappear
+                   when the application is inactive.  This can be controlled by
+                   the Qt::WA_MacAlwaysShowToolWindow attribute.
+
+    \value ToolTip Indicates that the widget is a tooltip. This is
+                   used internally to implement
+                   \l{QWidget::toolTip}{tooltips}.
+
+    \value SplashScreen Indicates that the window is a splash screen.
+                        This is the default type for QSplashScreen.
+
+    \value Desktop  Indicates that this widget is the desktop. This
+                    is the type for QDesktopWidget.
+
+    \value SubWindow  Indicates that this widget is a sub-window, such
+                      as a QMdiSubWindow widget.
+
+    There are also a number of flags which you can use to customize
+    the appearance of top-level windows. These have no effect on other
+    windows:
+
+    \value MSWindowsFixedSizeDialogHint  Gives the window a thin dialog border on Windows.
+           This style is traditionally used for fixed-size dialogs.
+
+    \value MSWindowsOwnDC  Gives the window its own display
+           context on Windows.
+
+    \value X11BypassWindowManagerHint  Bypass the window
+           manager completely. This results in a borderless window
+           that is not managed at all (i.e., no keyboard input unless
+           you call QWidget::activateWindow() manually).
+
+    \value FramelessWindowHint  Produces a borderless window.
+           The user cannot move or resize a borderless window via the window
+           system. On X11, the result of the flag is dependent on the window manager and its
+           ability to understand Motif and/or NETWM hints. Most existing
+           modern window managers can handle this.
+
+    The \c CustomizeWindowHint flag is used to enable customization of
+    the window controls. This flag must be set to allow the \c
+    WindowTitleHint, \c WindowSystemMenuHint, \c
+    WindowMinimizeButtonHint, \c WindowMaximizeButtonHint and \c
+    WindowCloseButtonHint flags to be changed.
+
+    \value CustomizeWindowHint  Turns off the default window title hints.
+
+    \value WindowTitleHint  Gives the window a title bar.
+
+    \value WindowSystemMenuHint Adds a window system menu, and
+    possibly a close button (for example on Mac). If you need to hide
+    or show a close button, it is more portable to use \c
+    WindowCloseButtonHint.
+
+    \value WindowMinimizeButtonHint  Adds a minimize button. On
+           some platforms this implies Qt::WindowSystemMenuHint for it to work.
+
+    \value WindowMaximizeButtonHint  Adds a maximize button. On
+           some platforms this implies Qt::WindowSystemMenuHint for it to work.
+
+    \value WindowMinMaxButtonsHint  Adds a minimize and a maximize
+           button. On some platforms this implies Qt::WindowSystemMenuHint for it to work.
+
+    \value WindowCloseButtonHint  Adds a close button. On
+           some platforms this implies Qt::WindowSystemMenuHint for it
+           to work.
+
+    \value WindowContextHelpButtonHint  Adds a context help button to dialogs.
+           On some platforms this implies Qt::WindowSystemMenuHint for it to work.
+
+    \value MacWindowToolBarButtonHint On Mac OS X adds a tool bar button (i.e.,
+           the oblong button that is on the top right of windows that have toolbars.
+
+    \value BypassGraphicsProxyWidget Prevents the window and its children from
+           automatically embedding themselves into a QGraphicsProxyWidget if the
+           parent widget is already embedded. You can set this flag if you
+           want your widget to always be a toplevel widget on the desktop,
+           regardless of whether the parent widget is embedded in a scene or
+           not.
+
+    \value WindowShadeButtonHint
+
+    \value WindowStaysOnTopHint  Informs the window system that the
+           window should stay on top of all other windows. Note that
+           on some window managers on X11 you also have to pass
+           Qt::X11BypassWindowManagerHint for this flag to work
+           correctly.
+
+    \value WindowStaysOnBottomHint Informs the window system that the
+           window should stay on bottom of all other windows. Note
+           that on X11 this hint will work only in window managers
+           that support _NET_WM_STATE_BELOW atom. If a window always
+           on the bottom has a parent, the parent will also be left on
+           the bottom.  This window hint is currently not implemented
+           for Mac OS X.
+
+    \value WindowOkButtonHint Adds an OK button to the window decoration of a dialog.
+           Only supported for Windows CE.
+
+    \value WindowCancelButtonHint Adds a Cancel button to the window decoration of a dialog.
+           Only supported for Windows CE.
+
+    \value WindowType_Mask  A mask for extracting the window type
+                            part of the window flags.
+
+    Obsolete flags:
+
+    \value WMouseNoMask         Use Qt::WA_MouseNoMask instead.
+    \value WDestructiveClose    Use Qt::WA_DeleteOnClose instead.
+    \value WStaticContents      Use Qt::WA_StaticContents instead.
+    \value WGroupLeader         No longer needed.
+    \value WShowModal           Use QWidget::windowModality instead.
+    \value WNoMousePropagation  Use Qt::WA_NoMousePropagation instead.
+    \value WType_TopLevel       Use Qt::Window instead.
+    \value WType_Dialog         Use Qt::Dialog instead.
+    \value WType_Popup          Use Qt::Popup instead.
+    \value WType_Desktop        Use Qt::Desktop instead.
+    \value WType_Mask           Use Qt::WindowType_Mask instead.
+
+    \value WStyle_Customize     No longer needed.
+    \value WStyle_NormalBorder  No longer needed.
+    \value WStyle_DialogBorder  Use Qt::MSWindowsFixedSizeDialogHint instead.
+    \value WStyle_NoBorder      Use Qt::FramelessWindowHint instead.
+    \value WStyle_Title         Use Qt::WindowTitleHint instead.
+    \value WStyle_SysMenu       Use Qt::WindowSystemMenuHint instead.
+    \value WStyle_Minimize      Use Qt::WindowMinimizeButtonHint instead.
+    \value WStyle_Maximize      Use Qt::WindowMaximizeButtonHint instead.
+    \value WStyle_MinMax        Use Qt::WindowMinMaxButtonsHint instead.
+    \value WStyle_Tool          Use Qt::Tool instead.
+    \value WStyle_StaysOnTop    Use Qt::WindowStaysOnTopHint instead.
+    \value WStyle_ContextHelp   Use Qt::WindowContextHelpButtonHint instead.
+
+    \value WPaintDesktop        No longer needed.
+    \value WPaintClever         No longer needed.
+
+    \value WX11BypassWM         Use Qt::X11BypassWindowManagerHint instead.
+    \value WWinOwnDC            Use Qt::MSWindowsOwnDC instead.
+    \value WMacSheet            Use Qt::Sheet instead.
+    \value WMacDrawer           Use Qt::Drawer instead.
+
+    \value WStyle_Splash        Use Qt::SplashScreen instead.
+
+    \value WNoAutoErase         No longer needed.
+    \value WRepaintNoErase      No longer needed.
+    \value WNorthWestGravity    Use Qt::WA_StaticContents instead.
+    \value WType_Modal          Use Qt::Dialog and QWidget::windowModality instead.
+    \value WStyle_Dialog        Use Qt::Dialog instead.
+    \value WStyle_NoBorderEx    Use Qt::FramelessWindowHint instead.
+    \value WResizeNoErase       No longer needed.
+    \value WMacNoSheet          No longer needed.
+
+    \sa QWidget::windowFlags, {Window Flags Example}
+*/
+
+/*!
+    \enum Qt::DropAction
+
+    \value CopyAction       Copy the data to the target.
+    \value MoveAction       Move the data from the source to the target.
+    \value LinkAction       Create a link from the source to the target.
+    \value ActionMask
+    \value IgnoreAction     Ignore the action (do nothing with the data).
+    \value TargetMoveAction On Windows, this value is used when the ownership of the D&D data
+                            should be taken over by the target application,
+                            i.e., the source application should not delete
+                            the data.
+
+                            On X11 this value is used to do a move.
+
+                            TargetMoveAction is not used on the Mac.
+*/
+
+#if defined(Q_OS_WIN) && defined(QT3_SUPPORT)
+/*!
+    \enum Qt::WindowsVersion
+    \compat
+
+    \value WV_32s
+    \value WV_95
+    \value WV_98
+    \value WV_Me
+    \value WV_DOS_based
+    \value WV_NT
+    \value WV_2000
+    \value WV_XP
+    \value WV_2003
+    \value WV_NT_based
+    \value WV_CE
+    \value WV_CENET
+    \value WV_CE_based
+    \value WV_CE_5
+    \value WV_CE_6
+*/
+#endif
+
+#if defined(Q_OS_MAC) && defined(QT3_SUPPORT)
+/*!
+    \enum Qt::MacintoshVersion
+    \compat
+
+    \value MV_Unknown  Use QSysInfo::MV_Unknown instead.
+    \value MV_9        Use QSysInfo::MV_9 instead.
+    \value MV_10_DOT_0 Use QSysInfo::MV_10_0 instead.
+    \value MV_10_DOT_1 Use QSysInfo::MV_10_1 instead.
+    \value MV_10_DOT_2 Use QSysInfo::MV_10_2 instead.
+    \value MV_10_DOT_3 Use QSysInfo::MV_10_3 instead.
+    \value MV_10_DOT_4 Use QSysInfo::MV_10_4 instead.
+
+    \value MV_CHEETAH  Use QSysInfo::MV_10_0 instead.
+    \value MV_PUMA     Use QSysInfo::MV_10_1 instead.
+    \value MV_JAGUAR   Use QSysInfo::MV_10_2 instead.
+    \value MV_PANTHER  Use QSysInfo::MV_10_3 instead.
+    \value MV_TIGER    Use QSysInfo::MV_10_4 instead.
+
+    \sa QSysInfo::MacVersion
+*/
+#endif
+
+/*! \typedef Qt::ToolBarDock
+    \compat
+
+    Use Qt::Dock instead.
+*/
+
+/*!
+    \enum Qt::Dock
+    \compat
+
+    Each dock window can be in one of the following positions:
+
+    \value DockUnmanaged not managed by a Q3MainWindow.
+
+    \value DockTornOff the dock window floats as its own top level
+    window which always stays on top of the main window.
+
+    \value DockTop  above the central widget, below the menu bar.
+
+    \value DockBottom  below the central widget, above the status bar.
+
+    \value DockRight to the right of the central widget.
+
+    \value DockLeft  to the left of the central widget.
+
+    \value DockMinimized the dock window is not shown (this is
+    effectively a 'hidden' dock area); the handles of all minimized
+    dock windows are drawn in one row below the menu bar.
+
+    \omitvalue Bottom
+    \omitvalue Left
+    \omitvalue Minimized
+    \omitvalue Right
+    \omitvalue Top
+    \omitvalue TornOff
+    \omitvalue Unmanaged
+*/
+
+/*!
+  \enum Qt::AnchorAttribute
+
+  An anchor has one or more of the following attributes:
+
+  \value AnchorName the name attribute of the anchor. This attribute is
+  used when scrolling to an anchor in the document.
+
+  \value AnchorHref the href attribute of the anchor. This attribute is
+  used when a link is clicked to determine what content to load.
+*/
+
+/*!
+    \enum Qt::SortOrder
+
+    This enum describes how the items in a widget are sorted.
+
+    \value AscendingOrder The items are sorted ascending e.g. starts with
+    'AAA' ends with 'ZZZ' in Latin-1 locales
+
+    \value DescendingOrder The items are sorted descending e.g. starts with
+    'ZZZ' ends with 'AAA' in Latin-1 locales
+
+    \omitvalue Ascending
+    \omitvalue Descending
+*/
+
+/*!
+    \enum Qt::ClipOperation
+
+    \value NoClip This operation turns clipping off.
+
+    \value ReplaceClip Replaces the current clip path/rect/region with
+    the one supplied in the function call.
+
+    \value IntersectClip Intersects the current clip path/rect/region
+    with the one supplied in the function call.
+
+    \value UniteClip Unites the current clip path/rect/region with the
+    one supplied in the function call.
+*/
+
+/*!
+    \enum Qt::ItemSelectionMode
+
+    This enum is used in QGraphicsItem, QGraphicsScene and QGraphicsView to
+    specify how items are selected, or how to determine if a shapes and items
+    collide.
+
+    \value ContainsItemShape The output list contains only items whose
+           \l{QGraphicsItem::shape()}{shape} is fully contained inside the
+           selection area. Items that intersect with the area's outline are
+           not included.
+
+    \value IntersectsItemShape The output list contains both items whose
+           \l{QGraphicsItem::shape()}{shape} is fully contained inside the
+           selection area, and items that intersect with the area's
+           outline. This is a common mode for rubber band selection.
+
+    \value ContainsItemBoundingRect The output list contains only items whose
+           \l{QGraphicsItem::boundingRect()}{bounding rectangle} is fully
+           contained inside the selection area. Items that intersect with the
+           area's outline are not included.
+
+    \value IntersectsItemBoundingRect The output list contains both items
+           whose \l{QGraphicsItem::boundingRect()}{bounding rectangle} is
+           fully contained inside the selection area, and items that intersect
+           with the area's outline. This method is commonly used for
+           determining areas that need redrawing.
+
+    \sa QGraphicsScene::items(), QGraphicsScene::collidingItems(),
+        QGraphicsView::items(), QGraphicsItem::collidesWithItem(),
+        QGraphicsItem::collidesWithPath()
+*/
+
+/*!
+    \enum Qt::FillRule
+
+    Specifies which method should be used to fill the paths and polygons.
+
+    \value OddEvenFill Specifies that the region is filled using the
+    odd even fill rule. With this rule, we determine whether a point
+    is inside the shape by using the following method.
+    Draw a horizontal line from the point to a location outside the shape,
+    and count the number of intersections. If the number of intersections
+    is an odd number, the point is inside the shape. This mode is the
+    default.
+
+    \value WindingFill Specifies that the region is filled using the
+    non zero winding rule. With this rule, we determine whether a
+    point is inside the shape by using the following method.
+    Draw a horizontal line from the point to a location outside the shape.
+    Determine whether the direction of the line at each intersection point
+    is up or down. The winding number is determined by summing the
+    direction of each intersection. If the number is non zero, the point
+    is inside the shape. This fill mode can also in most cases be considered
+    as the intersection of closed shapes.
+*/
+
+/*!
+    \enum Qt::PaintUnit
+
+    \compat
+
+    \value PixelUnit
+    \value LoMetricUnit Obsolete
+    \value HiMetricUnit Obsolete
+    \value LoEnglishUnit Obsolete
+    \value HiEnglishUnit Obsolete
+    \value TwipsUnit Obsolete
+*/
+
+/*!
+    \enum Qt::TextFormat
+
+    This enum is used in widgets that can display both plain text and
+    rich text, e.g. QLabel. It is used for deciding whether a text
+    string should be interpreted as one or the other. This is normally
+    done by passing one of the enum values to a setTextFormat()
+    function.
+
+    \value PlainText  The text string is interpreted as a plain text
+        string.
+
+    \value RichText The text string is interpreted as a rich text
+        string.
+
+    \value AutoText The text string is interpreted as for
+        Qt::RichText if Qt::mightBeRichText() returns true, otherwise
+        as Qt::PlainText.
+
+    \value LogText A special, limited text format which is only used
+    by Q3TextEdit in an optimized mode.
+*/
+
+/*!
+    \enum Qt::CursorShape
+
+    This enum type defines the various cursors that can be used.
+
+    The standard arrow cursor is the default for widgets in a normal state.
+
+    \value ArrowCursor    \inlineimage cursor-arrow.png
+                          The standard arrow cursor.
+    \value UpArrowCursor  \inlineimage cursor-uparrow.png
+                          An arrow pointing upwards toward the top of the screen.
+    \value CrossCursor    \inlineimage cursor-cross.png
+                          A crosshair cursor, typically used to help the
+                          user accurately select a point on the screen.
+    \value WaitCursor     \inlineimage cursor-wait.png
+                          An hourglass or watch cursor, usually shown during
+                          operations that prevent the user from interacting with
+                          the application.
+    \value IBeamCursor    \inlineimage cursor-ibeam.png
+                          A caret or ibeam cursor, indicating that a widget can
+                          accept and display text input.
+    \value SizeVerCursor  \inlineimage cursor-sizev.png
+                          A cursor used for elements that are used to vertically
+                          resize top-level windows.
+    \value SizeHorCursor  \inlineimage cursor-sizeh.png
+                          A cursor used for elements that are used to horizontally
+                          resize top-level windows.
+    \value SizeBDiagCursor  \inlineimage cursor-sizeb.png
+                          A cursor used for elements that are used to diagonally
+                          resize top-level windows at their top-right and
+                          bottom-left corners.
+    \value SizeFDiagCursor  \inlineimage cursor-sizef.png
+                          A cursor used for elements that are used to diagonally
+                          resize top-level windows at their top-left and
+                          bottom-right corners.
+    \value SizeAllCursor  \inlineimage cursor-sizeall.png
+                          A cursor used for elements that are used to resize
+                          top-level windows in any direction.
+    \value BlankCursor    A blank/invisible cursor, typically used when the cursor
+                          shape needs to be hidden.
+    \value SplitVCursor   \inlineimage cursor-vsplit.png
+                          A cursor used for vertical splitters, indicating that
+                          a handle can be dragged horizontally to adjust the use
+                          of available space.
+    \value SplitHCursor   \inlineimage cursor-hsplit.png
+                          A cursor used for horizontal splitters, indicating that
+                          a handle can be dragged vertically to adjust the use
+                          of available space.
+    \value PointingHandCursor  \inlineimage cursor-hand.png
+                          A pointing hand cursor that is typically used for
+                          clickable elements such as hyperlinks.
+    \value ForbiddenCursor  \inlineimage cursor-forbidden.png
+                          A slashed circle cursor, typically used during drag
+                          and drop operations to indicate that dragged content
+                          cannot be dropped on particular widgets or inside
+                          certain regions.
+    \value OpenHandCursor \inlineimage cursor-openhand.png
+                          A cursor representing an open hand, typically used to
+                          indicate that the area under the cursor is the visible
+                          part of a canvas that the user can click and drag in
+                          order to scroll around.
+    \value ClosedHandCursor \inlineimage cursor-closedhand.png
+                          A cursor representing a closed hand, typically used to
+                          indicate that a dragging operation is in progress that
+                          involves scrolling.
+    \value WhatsThisCursor  \inlineimage cursor-whatsthis.png
+                          An arrow with a question mark, typically used to indicate
+                          the presence of What's This? help for a widget.
+    \value BusyCursor     \inlineimage cursor-wait.png
+                          An hourglass or watch cursor, usually shown during
+                          operations that allow the user to interact with
+                          the application while they are performed in the
+                          background.
+    \value BitmapCursor
+    \omitvalue LastCursor
+    \omitvalue CustomCursor
+
+    \omitvalue arrowCursor
+    \omitvalue upArrowCursor
+    \omitvalue crossCursor
+    \omitvalue waitCursor
+    \omitvalue ibeamCursor
+    \omitvalue sizeVerCursor
+    \omitvalue sizeHorCursor
+    \omitvalue sizeBDiagCursor
+    \omitvalue sizeFDiagCursor
+    \omitvalue sizeAllCursor
+    \omitvalue blankCursor
+    \omitvalue splitVCursor
+    \omitvalue splitHCursor
+    \omitvalue pointingHandCursor
+    \omitvalue forbiddenCursor
+    \omitvalue whatsThisCursor
+*/
+
+/*!
+    \typedef Qt::TextFlags
+    \compat
+
+    Use Qt::TextFlag instead.
+*/
+
+/*!
+    \enum Qt::LayoutDirection
+
+    Specifies the direction of Qt's layouts:
+
+    \value LeftToRight  Left-to-right layout.
+    \value RightToLeft  Right-to-left layout.
+
+    Right-to-left layouts are necessary for certain languages,
+    notably Arabic and Hebrew.
+
+    \sa QApplication::setLayoutDirection(), QWidget::setLayoutDirection()
+*/
+
+/*!
+    \enum Qt::InputMethodQuery
+
+    \value ImMicroFocus       The rectangle covering the area of the input cursor in widget coordinates.
+    \value ImFont             The currently used font for text input.
+    \value ImCursorPosition   The logical position of the cursor within the text surrounding the input area (see ImSurroundingText).
+                              If any text is selected, the position returned will be at the logical end of the
+                              selection, even if the real cursor is located at the logical start.
+    \value ImSurroundingText  The plain text around the input area, for example the current paragraph.
+    \value ImCurrentSelection The currently selected text.
+*/
+
+/*!
+    \enum Qt::ItemDataRole
+
+    Each item in the model has a set of data elements associated with
+    it, each with its own role. The roles are used by the view to indicate
+    to the model which type of data it needs.
+
+    The general purpose roles are:
+
+    \value DisplayRole    The key data to be rendered in the form of text.
+    \value DecorationRole The data to be rendered as a decoration in the form
+                          of an icon.
+    \value EditRole       The data in a form suitable for editing in an
+                          editor.
+    \value ToolTipRole    The data displayed in the item's tooltip.
+    \value StatusTipRole  The data displayed in the status bar.
+    \value WhatsThisRole  The data displayed for the item in "What's This?"
+                          mode.
+    \value SizeHintRole   The size hint for the item that will be supplied
+                          to views.
+
+    Roles describing appearance and meta data:
+
+    \value FontRole            The font used for items rendered with the default
+                               delegate.
+    \value TextAlignmentRole   The alignment of the text for items rendered with the
+                               default delegate.
+    \value BackgroundRole      The background brush used for items rendered with
+                               the default delegate.
+    \value BackgroundColorRole This role is obsolete. Use BackgroundRole instead.
+    \value ForegroundRole      The foreground brush (text color, typically)
+                               used for items rendered with the default delegate.
+    \value TextColorRole       This role is obsolete. Use ForegroundRole instead.
+    \value CheckStateRole      This role is used to obtain the checked state of
+                               an item (see \l Qt::CheckState).
+
+    Accessibility roles:
+
+    \value AccessibleTextRole        The text to be used by accessibility
+                                     extensions and plugins, such as screen
+                                     readers.
+    \value AccessibleDescriptionRole A description of the item for accessibility
+                                     purposes.
+
+    User roles:
+
+    \value UserRole       The first role that can be used for application-specific purposes.
+
+    \omitvalue DisplayPropertyRole
+    \omitvalue DecorationPropertyRole
+    \omitvalue ToolTipPropertyRole
+    \omitvalue StatusTipPropertyRole
+    \omitvalue WhatsThisPropertyRole
+*/
+
+/*!
+    \enum Qt::ItemFlag
+
+    This enum describes the properties of an item:
+
+    \value NoItemFlags It does not have any properties set.
+    \value ItemIsSelectable It can be selected.
+    \value ItemIsEditable It can be edited.
+    \value ItemIsDragEnabled It can be dragged.
+    \value ItemIsDropEnabled It can be used as a drop target.
+    \value ItemIsUserCheckable It can be checked or unchecked by the user.
+    \value ItemIsEnabled The user can interact with the item.
+    \value ItemIsTristate The item is checkable with three separate states.
+
+    Note that checkable items need to be given both a suitable set of flags
+    and an initial state, indicating whether the item is checked or not.
+    This is handled automatically for model/view components, but needs
+    to be explicitly set for instances of QListWidgetItem, QTableWidgetItem,
+    and QTreeWidgetItem.
+
+    \sa QAbstractItemModel
+*/
+
+/*!
+    \enum Qt::MatchFlag
+
+    This enum describes the type of matches that can be used when searching
+    for items in a model.
+
+    \value MatchExactly     Performs QVariant-based matching.
+    \value MatchFixedString Performs string-based matching.
+           String-based comparisons are case-insensitive unless the
+           \c MatchCaseSensitive flag is also specified.
+    \value MatchContains    The search term is contained in the item.
+    \value MatchStartsWith  The search term matches the start of the item.
+    \value MatchEndsWith    The search term matches the end of the item.
+    \value MatchCaseSensitive  The search is case sensitive.
+    \value MatchRegExp      Performs string-based matching using a regular
+           expression as the search term.
+    \value MatchWildcard    Performs string-based matching using a string with
+           wildcards as the search term.
+    \value MatchWrap        Perform a search that wraps around, so that when
+           the search reaches the last item in the model, it begins again at
+           the first item and continues until all items have been examined.
+    \value MatchRecursive   Searches the entire hierarchy.
+
+    \sa QString::compare(), QRegExp
+*/
+
+/*!
+    \enum Qt::TextElideMode
+
+    This enum specifies where the ellipsis should appear when
+    displaying texts that don't fit:
+
+    \value ElideLeft    The ellipsis should appear at the beginning of the text.
+    \value ElideRight   The ellipsis should appear at the end of the text.
+    \value ElideMiddle  The ellipsis should appear in the middle of the text.
+    \value ElideNone    Ellipsis should NOT appear in the text.
+
+    Qt::ElideMiddle is normally the most appropriate choice for URLs (e.g.,
+    "\l{http://www.qtsoftware.com/careers/movingto/beijing/}{http://www.qtsof...ovingto/beijing/}"),
+    whereas Qt::ElideRight is appropriate
+    for other strings (e.g.,
+    "\l{http://doc.trolltech.com/qq/qq09-mac-deployment.html}{Deploying Applications on Ma...}").
+
+    \sa QAbstractItemView::textElideMode, QFontMetrics::elidedText(), AlignmentFlag QTabBar::elideMode
+*/
+
+/*!
+    \enum Qt::WindowModality
+
+    \keyword modal
+
+    This enum specifies the behavior of a modal window. A modal window
+    is one that blocks input to other windows. Note that windows that
+    are children of a modal window are not blocked.
+
+    The values are:
+    \value NonModal         The window is not modal and does not block input to other windows.
+    \value WindowModal      The window is modal to a single window hierarchy and blocks input to its parent window, all grandparent windows, and all siblings of its parent and grandparent windows.
+    \value ApplicationModal The window is modal to the application and blocks input to all windows.
+
+    \sa QWidget::windowModality, QDialog
+*/
+
+/*!
+    \enum Qt::TextInteractionFlag
+
+    This enum specifies how a text displaying widget reacts to user input.
+
+    \value NoTextInteraction          No interaction with the text is possible.
+    \value TextSelectableByMouse      Text can be selected with the mouse and copied to the clipboard using
+                                      a context menu or standard keyboard shortcuts.
+    \value TextSelectableByKeyboard   Text can be selected with the cursor keys on the keyboard. A text cursor is shown.
+    \value LinksAccessibleByMouse     Links can be highlighted and activated with the mouse.
+    \value LinksAccessibleByKeyboard  Links can be focused using tab and activated with enter.
+    \value TextEditable               The text is fully editable.
+
+    \value TextEditorInteraction      The default for a text editor.
+    \value TextBrowserInteraction     The default for QTextBrowser.
+*/
+
+/*!
+    \enum Qt::MaskMode
+
+    This enum specifies the behavior of the
+    QPixmap::createMaskFromColor() and QImage::createMaskFromColor()
+    functions.
+
+    \value MaskInColor   Creates a mask where all pixels matching the given color are opaque.
+    \value MaskOutColor  Creates a mask where all pixels matching the given color are transparent.
+*/
+
+/*!
+    \enum Qt::DockWidgetAreaSizes
+    \internal
+*/
+
+/*!
+    \enum Qt::ToolBarAreaSizes
+    \internal
+*/
+
+/*!
+    \enum Qt::EventPriority
+
+    This enum can be used to specify event priorities.
+
+    \value HighEventPriority Events with this priority are sent before
+    events with NormalEventPriority or LowEventPriority.
+
+    \value NormalEventPriority Events with this priority are sent
+    after events with HighEventPriority, but before events with
+    LowEventPriority.
+
+    \value LowEventPriority Events with this priority are sent after
+    events with HighEventPriority or NormalEventPriority.
+
+    Note that these values are provided purely for convenience, since
+    event priorities can be any value between \c INT_MAX and \c
+    INT_MIN, inclusive. For example, you can define custom priorities
+    as being relative to each other:
+
+    \snippet doc/src/snippets/code/doc_src_qnamespace.qdoc 1
+
+    \sa QCoreApplication::postEvent()
+*/
+/*!
+    \enum Qt::SizeHint
+    \since 4.4
+
+    This enum is used by QGraphicsLayoutItem::sizeHint()
+
+    \value MinimumSize is used to specify the minimum size of a graphics layout item.
+    \value PreferredSize is used to specify the preferred size of a graphics layout item.
+    \value MaximumSize is used to specify the maximum size of a graphics layout item.
+    \value MinimumDescent is used to specify the minimum descent of a text string in a graphics layout item.
+    \omitvalue NSizeHints
+
+    \sa QGraphicsLayoutItem::sizeHint()
+*/
+
+/*!
+    \enum Qt::SizeMode
+    \since 4.4
+
+    This enum is used by QPainter::drawRoundedRect() and QPainterPath::addRoundedRect()
+    functions to specify the radii of rectangle corners with respect to the dimensions
+    of the bounding rectangles specified.
+
+    \value AbsoluteSize Specifies the size using absolute measurements.
+    \value RelativeSize Specifies the size relative to the bounding rectangle,
+                        typically using percentage measurements.
+*/
+
+/*!
+    \enum Qt::WindowFrameSection
+    \since 4.4
+
+    This enum is used to describe parts of a window frame. It is returned by
+    QGraphicsWidget::windowFrameSectionAt() to describe what section of the window
+    frame is under the mouse.
+
+    \value NoSection
+    \value LeftSection
+    \value TopLeftSection
+    \value TopSection
+    \value TopRightSection
+    \value RightSection
+    \value BottomRightSection
+    \value BottomSection
+    \value BottomLeftSection
+    \value TitleBarArea
+
+    \sa QGraphicsWidget::windowFrameEvent()
+    \sa QGraphicsWidget::paintWindowFrame()
+    \sa QGraphicsWidget::windowFrameSectionAt()
+
+*/
diff --git a/doc/src/qpagesetupdialog.qdoc b/doc/src/qpagesetupdialog.qdoc
new file mode 100644
index 0000000000..66e4b96343
--- /dev/null
+++ b/doc/src/qpagesetupdialog.qdoc
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class QPageSetupDialog
+
+    \brief The QPageSetupDialog class provides a configuration dialog
+    for the page-related options on a printer.
+
+    On Windows and Mac OS X the page setup dialog is implemented using
+    the native page setup dialogs.
+
+    Note that on Windows and Mac OS X custom paper sizes won't be
+    reflected in the native page setup dialogs. Additionally, custom
+    page margins set on a QPrinter won't show in the native Mac OS X
+    page setup dialog.
+
+    \sa QPrinter, QPrintDialog
+*/
+
+
+/*!
+    \fn QPageSetupDialog::QPageSetupDialog(QPrinter *printer, QWidget *parent)
+
+    Constructs a page setup dialog that configures \a printer with \a
+    parent as the parent widget.
+*/
+
+/*!
+    \since 4.5
+
+    \fn QPageSetupDialog::QPageSetupDialog(QWidget *parent)
+
+    Constructs a page setup dialog that configures a default-constructed
+    QPrinter with \a parent as the parent widget.
+
+    \sa printer()
+*/
+
+/*!
+    \fn QPrinter *QPageSetupDialog::printer()
+
+    Returns the printer that was passed to the QPageSetupDialog
+    constructor.
+*/
+
diff --git a/doc/src/qpaintdevice.qdoc b/doc/src/qpaintdevice.qdoc
new file mode 100644
index 0000000000..be2f4bb2f2
--- /dev/null
+++ b/doc/src/qpaintdevice.qdoc
@@ -0,0 +1,289 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class QPaintDevice
+    \brief The QPaintDevice class is the base class of objects that
+    can be painted.
+
+    \ingroup multimedia
+
+    A paint device is an abstraction of a two-dimensional space that
+    can be drawn using a QPainter.  Its default coordinate system has
+    its origin located at the top-left position. X increases to the
+    right and Y increases downwards. The unit is one pixel.
+
+    The drawing capabilities of QPaintDevice are currently implemented
+    by the QWidget, QImage, QPixmap, QGLPixelBuffer, QPicture, and
+    QPrinter subclasses.
+
+    To implement support for a new backend, you must derive from
+    QPaintDevice and reimplement the virtual paintEngine() function to
+    tell QPainter which paint engine should be used to draw on this
+    particular device. Note that you also must create a corresponding
+    paint engine to be able to draw on the device, i.e derive from
+    QPaintEngine and reimplement its virtual functions.
+
+    \warning Qt requires that a QApplication object exists before
+    any paint devices can be created. Paint devices access window
+    system resources, and these resources are not initialized before
+    an application object is created.
+
+    The QPaintDevice class provides several functions returning the
+    various device metrics: The depth() function returns its bit depth
+    (number of bit planes). The height() function returns its height
+    in default coordinate system units (e.g. pixels for QPixmap and
+    QWidget) while heightMM() returns the height of the device in
+    millimeters. Similiarily, the width() and widthMM() functions
+    return the width of the device in default coordinate system units
+    and in millimeters, respectively. Alternatively, the protected
+    metric() function can be used to retrieve the metric information
+    by specifying the desired PaintDeviceMetric as argument.
+
+    The logicalDpiX() and logicalDpiY() functions return the
+    horizontal and vertical resolution of the device in dots per
+    inch. The physicalDpiX() and physicalDpiY() functions also return
+    the resolution of the device in dots per inch, but note that if
+    the logical and vertical resolution differ, the corresponding
+    QPaintEngine must handle the mapping. Finally, the numColors()
+    function returns the number of different colors available for the
+    paint device.
+
+    \sa QPaintEngine, QPainter, {The Coordinate System}, {The Paint
+    System}
+*/
+
+/*!
+    \enum QPaintDevice::PaintDeviceMetric
+
+    Describes the various metrics of a paint device.
+
+    \value PdmWidth The width of the paint device in default
+    coordinate system units (e.g. pixels for QPixmap and QWidget). See
+    also width().
+
+    \value PdmHeight The height of the paint device in default
+    coordinate system units (e.g. pixels for QPixmap and QWidget). See
+    also height().
+
+    \value PdmWidthMM The width of the paint device in millimeters. See
+    also widthMM().
+
+    \value PdmHeightMM  The height of the paint device in millimeters. See
+    also heightMM().
+
+    \value PdmNumColors The number of different colors available for
+    the paint device. See also numColors().
+
+    \value PdmDepth The bit depth (number of bit planes) of the paint
+    device. See also depth().
+
+    \value PdmDpiX The horizontal resolution of the device in dots per
+    inch. See also logicalDpiX().
+
+    \value PdmDpiY  The vertical resolution of the device in dots per inch. See
+    also logicalDpiY().
+
+    \value PdmPhysicalDpiX The horizontal resolution of the device in
+    dots per inch. See also physicalDpiX().
+
+    \value PdmPhysicalDpiY The vertical resolution of the device in
+    dots per inch. See also physicalDpiY().
+
+    \sa metric()
+*/
+
+/*!
+    \fn QPaintDevice::QPaintDevice()
+
+    Constructs a paint device. This constructor can be invoked only from
+    subclasses of QPaintDevice.
+*/
+
+/*!
+    \fn QPaintDevice::~QPaintDevice()
+
+    Destroys the paint device and frees window system resources.
+*/
+
+/*!
+    \fn int QPaintDevice::devType() const
+
+    \internal
+
+    Returns the device type identifier, which is QInternal::Widget
+    if the device is a QWidget, QInternal::Pixmap if it's a
+    QPixmap, QInternal::Printer if it's a QPrinter,
+    QInternal::Picture if it's a QPicture, or
+    QInternal::UnknownDevice in other cases.
+*/
+
+/*!
+    \fn bool QPaintDevice::paintingActive() const
+
+    Returns true if the device is currently being painted on, i.e. someone has
+    called QPainter::begin() but not yet called QPainter::end() for
+    this device; otherwise returns false.
+
+    \sa QPainter::isActive()
+*/
+
+/*!
+    \fn QPaintEngine *QPaintDevice::paintEngine() const
+
+    Returns a pointer to the paint engine used for drawing on the
+    device.
+*/
+
+/*!
+    \fn int QPaintDevice::metric(PaintDeviceMetric metric) const
+
+    Returns the metric information for  the given paint device \a metric.
+
+    \sa PaintDeviceMetric
+*/
+
+/*!
+    \fn int QPaintDevice::width() const
+
+    Returns the width of the paint device in default coordinate system
+    units (e.g. pixels for QPixmap and QWidget).
+
+    \sa widthMM()
+*/
+
+/*!
+    \fn int QPaintDevice::height() const
+
+    Returns the height of the paint device in default coordinate
+    system units (e.g. pixels for QPixmap and QWidget).
+
+    \sa heightMM()
+*/
+
+/*!
+    \fn int QPaintDevice::widthMM() const
+
+    Returns the width of the paint device in millimeters. Due to platform
+    limitations it may not be possible to use this function to determine
+    the actual physical size of a widget on the screen.
+
+    \sa width()
+*/
+
+/*!
+    \fn int QPaintDevice::heightMM() const
+
+    Returns the height of the paint device in millimeters. Due to platform
+    limitations it may not be possible to use this function to determine
+    the actual physical size of a widget on the screen.
+
+    \sa height()
+*/
+
+/*!
+    \fn int QPaintDevice::numColors() const
+
+    Returns the number of different colors available for the paint
+    device. Since this value is an int, it will not be sufficient to represent
+    the number of colors on 32 bit displays, in this case INT_MAX is
+    returned instead.
+*/
+
+/*!
+    \fn int QPaintDevice::depth() const
+
+    Returns the bit depth (number of bit planes) of the paint device.
+*/
+
+/*!
+    \fn int QPaintDevice::logicalDpiX() const
+
+    Returns the horizontal resolution of the device in dots per inch,
+    which is used when computing font sizes. For X11, this is usually
+    the same as could be computed from widthMM().
+
+    Note that if the logicalDpiX() doesn't equal the physicalDpiX(),
+    the corresponding QPaintEngine must handle the resolution mapping.
+
+    \sa logicalDpiY(), physicalDpiX()
+*/
+
+/*!
+    \fn int QPaintDevice::logicalDpiY() const
+
+    Returns the vertical resolution of the device in dots per inch,
+    which is used when computing font sizes. For X11, this is usually
+    the same as could be computed from heightMM().
+
+    Note that if the logicalDpiY() doesn't equal the physicalDpiY(),
+    the corresponding QPaintEngine must handle the resolution mapping.
+
+    \sa  logicalDpiX(), physicalDpiY()
+*/
+
+/*!
+    \fn int QPaintDevice::physicalDpiX() const
+
+    Returns the horizontal resolution of the device in dots per inch.
+    For example, when printing, this resolution refers to the physical
+    printer's resolution. The logical DPI on the other hand, refers to
+    the resolution used by the actual paint engine.
+
+    Note that if the physicalDpiX() doesn't equal the logicalDpiX(),
+    the corresponding QPaintEngine must handle the resolution mapping.
+
+    \sa  physicalDpiY(),  logicalDpiX()
+*/
+
+/*!
+    \fn int QPaintDevice::physicalDpiY() const
+
+    Returns the horizontal resolution of the device in dots per inch.
+    For example, when printing, this resolution refers to the physical
+    printer's resolution. The logical DPI on the other hand, refers to
+    the resolution used by the actual paint engine.
+
+    Note that if the physicalDpiY() doesn't equal the logicalDpiY(),
+    the corresponding QPaintEngine must handle the resolution mapping.
+
+    \sa  physicalDpiX(),  logicalDpiY()
+*/
diff --git a/doc/src/qpair.qdoc b/doc/src/qpair.qdoc
new file mode 100644
index 0000000000..c31b7eb3d0
--- /dev/null
+++ b/doc/src/qpair.qdoc
@@ -0,0 +1,229 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class QPair
+    \brief The QPair class is a template class that stores a pair of items.
+
+    \ingroup tools
+    
+    QPair\<T1, T2\> can be used in your application if the STL \c
+    pair type is not available. It stores one value of type T1 and
+    one value of type T2. It can be used as a return value for a
+    function that needs to return two values, or as the value type of
+    a \l{generic container}.
+
+    Here's an example of a QPair that stores one QString and one \c
+    double value:
+
+    \snippet doc/src/snippets/code/doc_src_qpair.qdoc 0
+
+    The components are accessible as public data members called \l
+    first and \l second. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qpair.qdoc 1
+
+    QPair's template data types (T1 and T2) must be \l{assignable
+    data types}. You cannot, for example, store a QWidget as a value;
+    instead, store a QWidget *. A few functions have additional
+    requirements; these requirements are documented on a per-function
+    basis.
+
+    \sa {Generic Containers}
+*/
+
+/*! \typedef QPair::first_type
+
+    The type of the first element in the pair (T1).
+
+    \sa first
+*/
+
+/*! \typedef QPair::second_type
+
+    The type of the second element in the pair (T2).
+
+    \sa second
+*/
+
+/*! \variable QPair::first
+
+    The first element in the pair.
+*/
+
+/*! \variable QPair::second
+
+    The second element in the pair.
+*/
+
+/*! \fn QPair::QPair()
+
+    Constructs an empty pair. The \c first and \c second elements are
+    initialized with \l{default-constructed values}.
+*/
+
+/*!
+    \fn QPair::QPair(const T1 &value1, const T2 &value2)
+
+    Constructs a pair and initializes the \c first element with \a
+    value1 and the \c second element with \a value2.
+
+    \sa qMakePair()
+*/
+
+/*!
+    \fn QPair<T1, T2> &QPair::operator=(const QPair<T1, T2> &other)
+
+    Assigns \a other to this pair.
+*/
+
+/*! \fn bool operator==(const QPair<T1, T2> &p1, const QPair<T1, T2> &p2)
+
+    \relates QPair
+
+    Returns true if \a p1 is equal to \a p2; otherwise returns false.
+    Two pairs compare equal if their \c first data members compare
+    equal and if their \c second data members compare equal.
+
+    This function requires the T1 and T2 types to have an
+    implementation of \c operator==().
+*/
+
+/*! \fn bool operator!=(const QPair<T1, T2> &p1, const QPair<T1, T2> &p2)
+
+    \relates QPair
+
+    Returns true if \a p1 is not equal to \a p2; otherwise returns
+    false. Two pairs compare as not equal if their \c first data
+    members are not equal or if their \c second data members are not
+    equal.
+
+    This function requires the T1 and T2 types to have an
+    implementation of \c operator==().
+*/
+
+/*! \fn bool operator<(const QPair<T1, T2> &p1, const QPair<T1, T2> &p2)
+
+    \relates QPair
+
+    Returns true if \a p1 is less than \a p2; otherwise returns
+    false. The comparison is done on the \c first members of \a p1
+    and \a p2; if they compare equal, the \c second members are
+    compared to break the tie.
+
+    This function requires the T1 and T2 types to have an
+    implementation of \c operator<().
+*/
+
+/*! \fn bool operator>(const QPair<T1, T2> &p1, const QPair<T1, T2> &p2)
+
+    \relates QPair
+
+    Returns true if \a p1 is greater than \a p2; otherwise returns
+    false. The comparison is done on the \c first members of \a p1
+    and \a p2; if they compare equal, the \c second members are
+    compared to break the tie.
+
+    This function requires the T1 and T2 types to have an
+    implementation of \c operator<().
+*/
+
+/*! \fn bool operator<=(const QPair<T1, T2> &p1, const QPair<T1, T2> &p2)
+
+    \relates QPair
+
+    Returns true if \a p1 is less than or equal to \a p2; otherwise
+    returns false. The comparison is done on the \c first members of
+    \a p1 and \a p2; if they compare equal, the \c second members are
+    compared to break the tie.
+
+    This function requires the T1 and T2 types to have an
+    implementation of \c operator<().
+*/
+
+/*! \fn bool operator>=(const QPair<T1, T2> &p1, const QPair<T1, T2> &p2)
+
+    \relates QPair
+
+    Returns true if \a p1 is greater than or equal to \a p2;
+    otherwise returns false. The comparison is done on the \c first
+    members of \a p1 and \a p2; if they compare equal, the \c second
+    members are compared to break the tie.
+
+    This function requires the T1 and T2 types to have an
+    implementation of \c operator<().
+*/
+
+/*!
+    \fn QPair<T1, T2> qMakePair(const T1 &value1, const T2 &value2)
+
+    \relates QPair
+
+    Returns a QPair\<T1, T2\> that contains \a value1 and \a value2.
+    Example:
+
+    \snippet doc/src/snippets/code/doc_src_qpair.qdoc 2
+
+    This is equivalent to QPair<T1, T2>(\a value1, \a value2), but
+    usually requires less typing.
+*/
+
+/*! \fn QDataStream &operator>>(QDataStream &in, QPair<T1, T2> &pair)
+
+    \relates QPair
+
+    Reads a pair from stream \a in into \a pair.
+
+    This function requires the T1 and T2 types to implement \c operator>>().
+
+    \sa {Format of the QDataStream operators}
+*/
+
+/*! \fn QDataStream &operator<<(QDataStream &out, const QPair<T1, T2> &pair)
+
+    \relates QPair
+
+    Writes the pair \a pair to stream \a out.
+
+    This function requires the T1 and T2 types to implement \c operator<<().
+
+    \sa {Format of the QDataStream operators}
+*/
diff --git a/doc/src/qpatternistdummy.cpp b/doc/src/qpatternistdummy.cpp
new file mode 100644
index 0000000000..8bedecbd4e
--- /dev/null
+++ b/doc/src/qpatternistdummy.cpp
@@ -0,0 +1,1010 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+
+  This file exists only to make internal all the classes you see
+  below. they are all in the QPatternist namespace, but they don't
+  have qdoc documentation because they are all declared in xxx_p.h files. Without these \internal declarations, the class names
+  appear on the Inheritance Hierarchy page, which is bad because
+  clicking on them brings up the "File not found" page.
+ */
+
+#include "qitem_p.h"
+#include "qbuiltintypes_p.h"
+#include "qitem_p.h"
+#include "qschematypefactory_p.h"
+#include "qxmlname.h"
+#include "qatomictype_p.h"
+
+QT_BEGIN_NAMESPACE
+
+using namespace QPatternist;
+
+/*!
+  \class AtomicCaster
+  \internal
+ */
+
+/*!
+  \class AtomicComparator
+  \internal
+ */
+
+/*!
+  \class AtomicMathematician
+  \internal
+ */
+
+/*!
+  \class AtomicValue
+  \internal
+ */
+
+/*!
+  \class AbstractDateTime
+  \internal
+ */
+
+/*!
+  \class AbstractDuration
+  \internal
+ */
+
+/*!
+  \class AbstractFloatComparator
+  \internal
+ */
+
+/*!
+  \class AtomicString
+  \internal
+ */
+
+/*!
+  \class Base64Binary
+  \internal
+ */
+
+/*!
+  \class FunctionCall
+  \internal
+ */
+
+/*!
+  \class AddingAggregate
+  \internal
+ */
+
+/*!
+  \class AdjustTimezone
+  \internal
+ */
+
+/*!
+  \class Aggregator
+  \internal
+ */
+
+/*!
+  \class ComparesCaseAware
+  \internal
+ */
+
+/*!
+  \class EncodeString
+  \internal
+ */
+
+/*!
+  \class ExtractFromDateTimeFN
+  \internal
+ */
+
+/*!
+  \class ExtractFromDurationFN
+  \internal
+ */
+
+/*!
+  \class FunctionFactory
+  \internal
+ */
+
+/*!
+  \class Numeric
+  \internal
+ */
+
+/*!
+  \class ReportContext
+  \internal
+ */
+
+/*!
+  \class AbstractFunctionFactory
+  \internal
+ */
+
+/*!
+  \class DynamicContext
+  \internal
+ */
+
+/*!
+  \class IdFN
+  \internal
+ */
+
+/*!
+  \class IntegerType
+  \internal
+ */
+
+/*!
+  \class NamespaceResolver
+  \internal
+ */
+
+/*!
+  \class PatternPlatform
+  \internal
+ */
+
+/*! \class DocumentProjector
+  \internal */
+/*! \class NodeBuilder
+  \internal */
+/*! \class AccelTreeBuilder
+  \internal */
+/*! \class OutputValidator
+  \internal */
+/*! \class NetworkLoop
+  \internal */
+/*! \class QIODeviceDelegate
+  \internal */
+/*! \class URILoader
+  \internal */
+/*! \class AbsFN
+  \internal */
+/*! \class AbstractDateTimeComparator
+  \internal */
+/*! \class AbstractDateTimeMathematician
+  \internal */
+/*! \class AbstractDateTimeToDateCaster
+  \internal */
+/*! \class AbstractDateTimeToDateTimeCaster
+  \internal */
+/*! \class AbstractDateTimeToGDayCaster
+  \internal */
+/*! \class AbstractDateTimeToGMonthCaster
+  \internal */
+/*! \class AbstractDateTimeToGMonthDayCaster
+  \internal */
+/*! \class AbstractDateTimeToGYearCaster
+  \internal */
+/*! \class AbstractDateTimeToGYearMonthCaster
+  \internal */
+/*! \class AbstractDateTimeToTimeCaster
+  \internal */
+/*! \class AbstractDurationComparator
+  \internal */
+/*! \class AbstractDurationToDayTimeDurationCaster
+  \internal */
+/*! \class AbstractDurationToDurationCaster
+  \internal */
+/*! \class AbstractDurationToYearMonthDurationCaster
+  \internal */
+/*! \class AbstractFloat
+  \internal */
+/*! \class AbstractFloatMathematician
+  \internal */
+/*! \class AbstractFloatSortComparator
+  \internal */
+/*! \class ConstructorFunctionsFactory
+  \internal */
+/*! \class XPath10CoreFunctions
+  \internal */
+/*! \class XPath20CoreFunctions
+  \internal */
+/*! \class AdjustDateTimeToTimezoneFN
+  \internal */
+/*! \class AdjustDateToTimezoneFN
+  \internal */
+/*! \class AdjustTimeToTimezoneFN
+  \internal */
+/*! \class AnyToDerivedStringCaster
+  \internal */
+/*! \class AnyURI
+  \internal */
+/*! \class Atomizer
+  \internal */
+/*! \class AvgFN
+  \internal */
+/*! \class Base64BinaryComparatorLocator
+  \internal */
+/*! \class Base64BinaryToHexBinaryCaster
+  \internal */
+/*! \class Base64BinaryType
+  \internal */
+/*! \class BaseURIFN
+  \internal */
+/*! \class BinaryDataComparator
+  \internal */
+/*! \class Boolean
+  \internal */
+/*! \class BooleanComparator
+  \internal */
+/*! \class BooleanComparatorLocator
+  \internal */
+/*! \class BooleanFN
+  \internal */
+/*! \class BooleanToAbstractFloatCaster
+  \internal */
+/*! \class BooleanToDecimalCaster
+  \internal */
+/*! \class BooleanToDerivedIntegerCaster
+  \internal */
+/*! \class BooleanToIntegerCaster
+  \internal */
+/*! \class BooleanType
+  \internal */
+/*! \class BuiltinNodeType
+  \internal */
+/*! \class CardinalityVerifier
+  \internal */
+/*! \class CaseInsensitiveStringComparator
+  \internal */
+/*! \class CeilingFN
+  \internal */
+/*! \class CodepointEqualFN
+  \internal */
+/*! \class CodepointsToStringFN
+  \internal */
+/*! \class CollectionFN
+  \internal */
+/*! \class CompareFN
+  \internal */
+/*! \class ComparingAggregator
+  \internal */
+/*! \class ConcatFN
+  \internal */
+/*! \class ContainsFN
+  \internal */
+/*! \class CountFN
+  \internal */
+/*! \class CurrentDateFN
+  \internal */
+/*! \class CurrentDateTimeFN
+  \internal */
+/*! \class CurrentTimeFN
+  \internal */
+/*! \class Date
+  \internal */
+/*! \class DateComparatorLocator
+  \internal */
+/*! \class DateMathematicianLocator
+  \internal */
+/*! \class DateTime
+  \internal */
+/*! \class DateTimeComparatorLocator
+  \internal */
+/*! \class DateTimeDurationMathematician
+  \internal */
+/*! \class DateTimeFN
+  \internal */
+/*! \class DateTimeMathematicianLocator
+  \internal */
+/*! \class DateTimeType
+  \internal */
+/*! \class DateType
+  \internal */
+/*! \class DayFromAbstractDateTimeFN
+  \internal */
+/*! \class DayTimeDuration
+  \internal */
+/*! \class DayTimeDurationComparatorLocator
+  \internal */
+/*! \class DayTimeDurationMathematicianLocator
+  \internal */
+/*! \class DayTimeDurationType
+  \internal */
+/*! \class DaysFromDurationFN
+  \internal */
+/*! \class Decimal
+  \internal */
+/*! \class DecimalComparator
+  \internal */
+/*! \class DecimalComparatorLocator
+  \internal */
+/*! \class DecimalMathematician
+  \internal */
+/*! \class DecimalMathematicianLocator
+  \internal */
+/*! \class DecimalType
+  \internal */
+/*! \class DeduplicateIterator
+  \internal */
+/*! \class DeepEqualFN
+  \internal */
+/*! \class DefaultCollationFN
+  \internal */
+/*! \class DerivedInteger
+  \internal */
+/*! \class DerivedString
+  \internal */
+/*! \class DistinctValuesFN
+  \internal */
+/*! \class DocAvailableFN
+  \internal */
+/*! \class DocFN
+  \internal */
+/*! \class DocumentURIFN
+  \internal */
+/*! \class DoubleComparatorLocator
+  \internal */
+/*! \class DoubleMathematicianLocator
+  \internal */
+/*! \class DoubleType
+  \internal */
+/*! \class Duration
+  \internal */
+/*! \class DurationComparatorLocator
+  \internal */
+/*! \class DurationDurationDivisor
+  \internal */
+/*! \class DurationDurationMathematician
+  \internal */
+/*! \class DurationNumericMathematician
+  \internal */
+/*! \class DurationType
+  \internal */
+/*! \class DelegatingDynamicContext
+  \internal */
+/*! \class Focus
+  \internal */
+/*! \class ReceiverDynamicContext
+  \internal */
+/*! \class EmptyIterator
+  \internal */
+/*! \class EncodeForURIFN
+  \internal */
+/*! \class EndsWithFN
+  \internal */
+/*! \class ErrorFN
+  \internal */
+/*! \class EscapeHtmlURIFN
+  \internal */
+/*! \class EvaluationCache
+  \internal */
+/*! \class Existence
+  \internal */
+/*! \class ExpressionVisitor
+  \internal */
+/*! \class ExpressionVisitorResult
+  \internal */
+/*! \class FalseFN
+  \internal */
+/*! \class FloatComparatorLocator
+  \internal */
+/*! \class FloatMathematicianLocator
+  \internal */
+/*! \class FloatType
+  \internal */
+/*! \class FloorFN
+  \internal */
+/*! \class FunctionArgument
+  \internal */
+/*! \class FunctionAvailableFN
+  \internal */
+/*! \class FunctionFactoryCollection
+  \internal */
+/*! \class FunctionSignature
+  \internal */
+/*! \class GDay
+  \internal */
+/*! \class GDayComparatorLocator
+  \internal */
+/*! \class GDayType
+  \internal */
+/*! \class GMonth
+  \internal */
+/*! \class GMonthComparatorLocator
+  \internal */
+/*! \class GMonthDay
+  \internal */
+/*! \class GMonthDayComparatorLocator
+  \internal */
+/*! \class GMonthDayType
+  \internal */
+/*! \class GMonthType
+  \internal */
+/*! \class GYear
+  \internal */
+/*! \class GYearComparatorLocator
+  \internal */
+/*! \class GYearMonth
+  \internal */
+/*! \class GYearMonthComparatorLocator
+  \internal */
+/*! \class GYearMonthType
+  \internal */
+/*! \class GYearType
+  \internal */
+/*! \class HexBinary
+  \internal */
+/*! \class HexBinaryComparatorLocator
+  \internal */
+/*! \class HexBinaryToBase64BinaryCaster
+  \internal */
+/*! \class HexBinaryType
+  \internal */
+/*! \class HoursFromAbstractDateTimeFN
+  \internal */
+/*! \class HoursFromDurationFN
+  \internal */
+/*! \class IdrefFN
+  \internal */
+/*! \class ImplicitTimezoneFN
+  \internal */
+/*! \class InScopePrefixesFN
+  \internal */
+/*! \class IndexOfFN
+  \internal */
+/*! \class InsertBeforeFN
+  \internal */
+/*! \class Integer
+  \internal */
+/*! \class IntegerComparator
+  \internal */
+/*! \class IntegerComparatorLocator
+  \internal */
+/*! \class IntegerMathematician
+  \internal */
+/*! \class IntegerMathematicianLocator
+  \internal */
+/*! \class DerivedIntegerType
+  \internal */
+/*! \class IriToURIFN
+  \internal */
+/*! \class ItemMappingIterator
+  \internal */
+/*! \class ItemVerifier
+  \internal */
+/*! \class LangFN
+  \internal */
+/*! \class LastFN
+  \internal */
+/*! \class LocalNameFN
+  \internal */
+/*! \class LocalNameFromQNameFN
+  \internal */
+/*! \class LowerCaseFN
+  \internal */
+/*! \class MinutesFromAbstractDateTimeFN
+  \internal */
+/*! \class MinutesFromDurationFN
+  \internal */
+/*! \class MonthFromAbstractDateTimeFN
+  \internal */
+/*! \class MonthsFromDurationFN
+  \internal */
+/*! \class NOTATIONType
+  \internal */
+/*! \class NameFN
+  \internal */
+/*! \class NamePool
+  \internal */
+/*! \class DelegatingNamespaceResolver
+  \internal */
+/*! \class GenericNamespaceResolver
+  \internal */
+/*! \class NodeNamespaceResolver
+  \internal */
+/*! \class NamespaceURIFN
+  \internal */
+/*! \class NamespaceURIForPrefixFN
+  \internal */
+/*! \class NamespaceURIFromQNameFN
+  \internal */
+/*! \class NilledFN
+  \internal */
+/*! \class NodeNameFN
+  \internal */
+/*! \class NormalizeSpaceFN
+  \internal */
+/*! \class NormalizeUnicodeFN
+  \internal */
+/*! \class NotFN
+  \internal */
+/*! \class NumberFN
+  \internal */
+/*! \class NumericToAbstractFloatCaster
+  \internal */
+/*! \class NumericToBooleanCaster
+  \internal */
+/*! \class NumericToDecimalCaster
+  \internal */
+/*! \class NumericToDerivedIntegerCaster
+  \internal */
+/*! \class OperandSwitcherMathematician
+  \internal */
+/*! \class ParserContext
+  \internal */
+/*! \class MatchesFN
+  \internal */
+/*! \class ReplaceFN
+  \internal */
+/*! \class TokenizeFN
+  \internal */
+/*! \class PositionFN
+  \internal */
+/*! \class PrefixFromQNameFN
+  \internal */
+/*! \class AccelTree
+  \internal */
+/*! \class QNameComparator
+  \internal */
+/*! \class QNameComparatorLocator
+  \internal */
+/*! \class QNameFN
+  \internal */
+/*! \class QNameType
+  \internal */
+/*! \class QNameValue
+  \internal */
+/*! \class RemoveFN
+  \internal */
+/*! \class ResolveQNameFN
+  \internal */
+/*! \class ResolveURIFN
+  \internal */
+/*! \class ResourceLoader
+  \internal */
+/*! \class AccelTreeResourceLoader
+  \internal */
+/*! \class ReverseFN
+  \internal */
+/*! \class RootFN
+  \internal */
+/*! \class RoundFN
+  \internal */
+/*! \class RoundHalfToEvenFN
+  \internal */
+/*! \class SchemaTime
+  \internal */
+/*! \class SchemaTimeComparatorLocator
+  \internal */
+/*! \class SchemaTimeMathematicianLocator
+  \internal */
+/*! \class SchemaTimeType
+  \internal */
+/*! \class SecondsFromAbstractDateTimeFN
+  \internal */
+/*! \class SecondsFromDurationFN
+  \internal */
+/*! \class SelfToSelfCaster
+  \internal */
+/*! \class SequenceMappingIterator
+  \internal */
+/*! \class SingletonIterator
+  \internal */
+/*! \class SortTuple
+  \internal */
+/*! \class StartsWithFN
+  \internal */
+/*! \class StaticBaseURIFN
+  \internal */
+/*! \class StaticContext
+  \internal */
+/*! \class DelegatingStaticContext
+  \internal */
+/*! \class StaticFocusContext
+  \internal */
+/*! \class StaticNamespaceContext
+  \internal */
+/*! \class GenericStaticContext
+  \internal */
+/*! \class StringComparator
+  \internal */
+/*! \class StringComparatorLocator
+  \internal */
+/*! \class StringFN
+  \internal */
+/*! \class StringJoinFN
+  \internal */
+/*! \class StringLengthFN
+  \internal */
+/*! \class StringToAbstractFloatCaster
+  \internal */
+/*! \class StringToBase64BinaryCaster
+  \internal */
+/*! \class StringToBooleanCaster
+  \internal */
+/*! \class StringToCodepointsFN
+  \internal */
+/*! \class StringToDateCaster
+  \internal */
+/*! \class StringToDateTimeCaster
+  \internal */
+/*! \class StringToDayTimeDurationCaster
+  \internal */
+/*! \class StringToDecimalCaster
+  \internal */
+/*! \class StringToDerivedIntegerCaster
+  \internal */
+/*! \class StringToDurationCaster
+  \internal */
+/*! \class StringToGDayCaster
+  \internal */
+/*! \class StringToGMonthCaster
+  \internal */
+/*! \class StringToGMonthDayCaster
+  \internal */
+/*! \class StringToGYearCaster
+  \internal */
+/*! \class StringToGYearMonthCaster
+  \internal */
+/*! \class StringToHexBinaryCaster
+  \internal */
+/*! \class StringToIntegerCaster
+  \internal */
+/*! \class StringToTimeCaster
+  \internal */
+/*! \class StringToYearMonthDurationCaster
+  \internal */
+/*! \class StringType
+  \internal */
+/*! \class DerivedStringType
+  \internal */
+/*! \class SubsequenceFN
+  \internal */
+/*! \class SubstringAfterFN
+  \internal */
+/*! \class SubstringBeforeFN
+  \internal */
+/*! \class SubstringFN
+  \internal */
+/*! \class SumFN
+  \internal */
+/*! \class SystemPropertyFN
+  \internal */
+/*! \class TimezoneFromAbstractDateTimeFN
+  \internal */
+/*! \class ToAnyURICaster
+  \internal */
+/*! \class ToAnyURICasterLocator
+  \internal */
+/*! \class ToBase64BinaryCasterLocator
+  \internal */
+/*! \class ToBooleanCasterLocator
+  \internal */
+/*! \class ToDateCasterLocator
+  \internal */
+/*! \class ToDateTimeCasterLocator
+  \internal */
+/*! \class ToDayTimeDurationCasterLocator
+  \internal */
+/*! \class ToDecimalCasterLocator
+  \internal */
+/*! \class ToDoubleCasterLocator
+  \internal */
+/*! \class ToDurationCasterLocator
+  \internal */
+/*! \class ToFloatCasterLocator
+  \internal */
+/*! \class ToGDayCasterLocator
+  \internal */
+/*! \class ToGMonthCasterLocator
+  \internal */
+/*! \class ToGMonthDayCasterLocator
+  \internal */
+/*! \class ToGYearCasterLocator
+  \internal */
+/*! \class ToGYearMonthCasterLocator
+  \internal */
+/*! \class ToHexBinaryCasterLocator
+  \internal */
+/*! \class ToIntegerCasterLocator
+  \internal */
+/*! \class ToDerivedIntegerCasterLocator
+  \internal */
+/*! \class ToQNameCasterLocator
+  \internal */
+/*! \class ToSchemaTimeCasterLocator
+  \internal */
+/*! \class ToStringCaster
+  \internal */
+/*! \class ToStringCasterLocator
+  \internal */
+/*! \class ToDerivedStringCasterLocator
+  \internal */
+/*! \class ToUntypedAtomicCaster
+  \internal */
+/*! \class ToUntypedAtomicCasterLocator
+  \internal */
+/*! \class ToYearMonthDurationCasterLocator
+  \internal */
+/*! \class Tokenizer
+  \internal */
+/*! \class XQueryTokenizer
+  \internal */
+/*! \class TraceFN
+  \internal */
+/*! \class TranslateFN
+  \internal */
+/*! \class TrueFN
+  \internal */
+/*! \class UntypedAtomic
+  \internal */
+/*! \class UntypedAtomicConverter
+  \internal */
+/*! \class ArgumentConverter
+  \internal */
+/*! \class UntypedAtomicType
+  \internal */
+/*! \class UpperCaseFN
+  \internal */
+/*! \class ValidationError
+  \internal */
+/*! \class VariableDeclaration
+  \internal */
+/*! \class VariableLoader
+  \internal */
+/*! \class YearFromAbstractDateTimeFN
+  \internal */
+/*! \class YearMonthDuration
+  \internal */
+/*! \class YearMonthDurationComparatorLocator
+  \internal */
+/*! \class YearMonthDurationMathematicianLocator
+  \internal */
+/*! \class YearMonthDurationType
+  \internal */
+/*! \class YearsFromDurationFN
+  \internal
+ */
+/*! \class DocumentContentValidator
+  \internal */
+/*! \class AtomicTypeVisitor
+  \internal */
+/*! \class AtomicCasterLocator
+  \internal */
+/*! \class AtomicTypeVisitorResult
+  \internal */
+/*! \class Expression
+  \internal */
+/*! \class EmptyContainer
+  \internal */
+/*! \class AxisStep
+  \internal */
+/*! \class ContextItem
+  \internal */
+/*! \class EmptySequence
+  \internal */
+/*! \class ExternalVariableReference
+  \internal */
+/*! \class Literal
+  \internal */
+/*! \class LiteralSequence
+  \internal */
+/*! \class NamespaceConstructor
+  \internal */
+/*! \class ParentNodeAxis
+  \internal */
+/*! \class VariableReference
+  \internal */
+/*! \class ArgumentReference
+  \internal */
+/*! \class ExpressionVariableReference
+  \internal */
+/*! \class PositionalVariableReference
+  \internal */
+/*! \class RangeVariableReference
+  \internal */
+/*! \class PairContainer
+  \internal */
+/*! \class AndExpression
+  \internal */
+/*! \class OrExpression
+  \internal */
+/*! \class ArithmeticExpression
+  \internal */
+/*! \class UnaryExpression
+  \internal */
+/*! \class AttributeConstructor
+  \internal */
+/*! \class CombineNodes
+  \internal */
+/*! \class ElementConstructor
+  \internal */
+/*! \class ForClause
+  \internal */
+/*! \class GeneralComparison
+  \internal */
+/*! \class GenericPredicate
+  \internal */
+/*! \class TruthPredicate
+  \internal */
+/*! \class LetClause
+  \internal */
+/*! \class NodeComparison
+  \internal */
+/*! \class Path
+  \internal */
+/*! \class ProcessingInstructionConstructor
+  \internal */
+/*! \class QuantifiedExpression
+  \internal */
+/*! \class RangeExpression
+  \internal */
+/*! \class ValueComparison
+  \internal */
+/*! \class SingleContainer
+  \internal */
+/*! \class AttributeNameValidator
+  \internal */
+/*! \class CastAs
+  \internal */
+/*! \class CastableAs
+  \internal */
+/*! \class CollationChecker
+  \internal */
+/*! \class CommentConstructor
+  \internal */
+/*! \class CopyOf
+  \internal */
+/*! \class DocumentConstructor
+  \internal */
+/*! \class DynamicContextStore
+  \internal */
+/*! \class FirstItemPredicate
+  \internal */
+/*! \class InstanceOf
+  \internal */
+/*! \class NCNameConstructor
+  \internal */
+/*! \class NodeSortExpression
+  \internal */
+/*! \class OrderBy
+  \internal */
+/*! \class QNameConstructor
+  \internal */
+/*! \class SimpleContentConstructor
+  \internal */
+/*! \class TextNodeConstructor
+  \internal */
+/*! \class TreatAs
+  \internal */
+/*! \class TripleContainer
+  \internal */
+/*! \class IfThenClause
+  \internal */
+/*! \class UnlimitedContainer
+  \internal */
+/*! \class ExpressionSequence
+  \internal */
+/*! \class ReturnOrderBy
+  \internal */
+/*! \class UserFunctionCallsite
+  \internal */
+/*! \class ExpressionCreator
+  \internal */
+/*! \class ByIDCreator
+  \internal */
+/*! \class ExpressionFactory
+  \internal */
+/*! \class ExpressionIdentifier
+  \internal */
+/*! \class BooleanIdentifier
+  \internal */
+/*! \class ByIDIdentifier
+  \internal */
+/*! \class BySequenceTypeIdentifier
+  \internal */
+/*! \class ComparisonIdentifier
+  \internal */
+/*! \class IntegerIdentifier
+  \internal */
+/*! \class ExternalVariableLoader
+  \internal */
+/*! \class ItemType
+  \internal */
+/*! \class AnyItemType
+  \internal */
+/*! \class AnyNodeType
+  \internal */
+/*! \class AbstractNodeTest
+  \internal */
+/*! \class LocalNameTest
+  \internal */
+/*! \class NamespaceNameTest
+  \internal */
+/*! \class QNameTest
+  \internal */
+/*! \class AtomicType
+  \internal */
+/*! \class BuiltinAtomicType
+  \internal */
+/*! \class AnyAtomicType
+  \internal */
+/*! \class AnyURIType
+  \internal */
+/*! \class NumericType
+  \internal */
+/*! \class EBVType
+  \internal */
+/*! \class EmptySequenceType
+  \internal */
+/*! \class MultiItemType
+  \internal */
+/*! \class NoneType
+  \internal */
+/*! \class OptimizationPass
+  \internal */
+/*! \class ParameterizedAtomicTypeVisitor
+  \internal */
+/*! \class AtomicComparatorLocator
+  \internal */
+/*! \class AtomicMathematicianLocator
+  \internal */
+/*! \class SchemaComponent
+  \internal */
+/*! \class SchemaType
+  \internal */
+/*! \class AnyType
+  \internal */
+/*! \class AnySimpleType
+  \internal */
+/*! \class Untyped
+  \internal */
+/*! \class SchemaTypeFactory
+  \internal */
+/*! \class BasicTypesFactory
+  \internal */
+/*! \class SequenceType
+  \internal */
+/*! \class GenericSequenceType
+  \internal */
+/*! \class UserFunction
+  \internal
+*/
+QT_END_NAMESPACE
diff --git a/doc/src/qplugin.qdoc b/doc/src/qplugin.qdoc
new file mode 100644
index 0000000000..7a933947a1
--- /dev/null
+++ b/doc/src/qplugin.qdoc
@@ -0,0 +1,135 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \headerfile <QtPlugin>
+    \title Macros for Defining Plugins
+
+    \brief The <QtPlugin> header files defines macros for defining plugins.
+
+    \sa {How to Create Qt Plugins}
+*/
+
+/*!
+    \macro Q_DECLARE_INTERFACE(ClassName, Identifier)
+    \relates <QtPlugin>
+
+    This macro associates the given \a Identifier (a string literal)
+    to the interface class called \a ClassName. The \a Identifier must
+    be unique. For example:
+
+    \snippet examples/tools/plugandpaint/interfaces.h 3
+
+    This macro is normally used right after the class definition for
+    \a ClassName, in a header file. See the
+    \l{tools/plugandpaint}{Plug & Paint} example for details.
+
+    If you want to use Q_DECLARE_INTERFACE with interface classes
+    declared in a namespace then you have to make sure the Q_DECLARE_INTERFACE
+    is not inside a namespace though. For example:
+    \snippet doc/src/snippets/code/doc_src_qplugin.qdoc 0
+
+    \sa Q_INTERFACES(), Q_EXPORT_PLUGIN2(), {How to Create Qt Plugins}
+*/
+
+/*!
+    \macro Q_EXPORT_PLUGIN(ClassName)
+    \relates <QtPlugin>
+    \obsolete
+
+    Use Q_EXPORT_PLUGIN2() instead. This macro is equivalent to
+    Q_EXPORT_PLUGIN2(\a ClassName, \a ClassName).
+*/
+
+/*!
+    \macro Q_EXPORT_PLUGIN2(PluginName, ClassName)
+    \relates <QtPlugin>
+    \since 4.1
+    \keyword Q_EXPORT_PLUGIN2
+
+    This macro exports the plugin class \a ClassName for the plugin specified
+    by \a PluginName. The value of \a PluginName should correspond to the
+    \l{qmake Variable Reference#TARGET}{TARGET} specified in the plugin's
+    project file.
+
+    There should be exactly one occurrence of this macro in the source code
+    for a Qt plugin, and it should be used where the implementation is written
+    rather than in a header file.
+
+    Example:
+
+    \snippet doc/src/snippets/code/doc_src_qplugin.qdoc 1
+
+    See the \l{tools/plugandpaint}{Plug & Paint} example for details.
+
+    \sa Q_DECLARE_INTERFACE(), {How to Create Qt Plugins}
+*/
+
+/*!
+    \macro Q_IMPORT_PLUGIN(PluginName)
+    \relates <QtPlugin>
+
+    This macro imports the plugin named \a PluginName, corresponding
+    to the \l{qmake Variable Reference#TARGET}{TARGET} specified in the
+    plugin's project file.
+
+    Inserting this macro into your application's source code will allow
+    you to make use of a static plugin.
+
+    Example:
+
+    \snippet doc/src/snippets/code/doc_src_qplugin.qdoc 2
+
+    Static plugins must also be included by the linker when your
+    application is built. For Qt's predefined plugins,
+    you can use the \c QTPLUGIN to add
+    the required plugins to your build. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qplugin.qdoc 3
+
+    \sa {Static Plugins}, {How to Create Qt Plugins}, {Using qmake}
+*/
+
+/*!
+    \macro Q_EXPORT_STATIC_PLUGIN(ClassName)
+    \relates <QtPlugin>
+    \internal
+*/
diff --git a/doc/src/qprintdialog.qdoc b/doc/src/qprintdialog.qdoc
new file mode 100644
index 0000000000..6cac1c9d79
--- /dev/null
+++ b/doc/src/qprintdialog.qdoc
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \fn QPrinter *QPrintDialog::printer() const
+
+  Returns a pointer to the printer this dialog configures, or 0 if
+  this dialog does not operate on any printer.
+*/
+
+/*!
+  \fn void QPrintDialog::setPrinter(QPrinter *printer, bool pickupSettings)
+
+  Sets this dialog to configure printer \a printer, or no printer if \a printer
+  is null. If \a pickupSettings is true, the dialog reads most of
+  its settings from \a printer. If \a pickupSettings is false (the
+  default) the dialog keeps its old settings.
+*/
+
+/*!
+  \fn void QPrintDialog::addButton(QPushButton *button)
+
+  Adds the \a button to the layout of the print dialog. The added
+  buttons are arranged from the left to the right below the
+  last groupbox of the printdialog.
+*/
diff --git a/doc/src/qprinterinfo.qdoc b/doc/src/qprinterinfo.qdoc
new file mode 100644
index 0000000000..ae900e05fe
--- /dev/null
+++ b/doc/src/qprinterinfo.qdoc
@@ -0,0 +1,137 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class QPrinterInfo
+
+    \brief The QPrinterInfo class gives access to information about
+    existing printers.
+
+    Use the static functions to generate a list of QPrinterInfo
+    objects. Each QPrinterInfo object in the list represents a single
+    printer and can be queried for name, supported paper sizes, and
+    whether or not it is the default printer.
+
+    \since 4.4
+*/
+
+/*!
+    \fn QList<QPrinterInfo> QPrinterInfo::availablePrinters()
+
+    Returns a list of available printers on the system.
+*/
+
+/*!
+    \fn QPrinterInfo QPrinterInfo::defaultPrinter()
+
+    Returns the default printer on the system.
+
+    The return value should be checked using isNull() before being
+    used, in case there is no default printer.
+
+    \sa isNull()
+*/
+
+/*!
+    \fn QPrinterInfo::QPrinterInfo()
+
+    Constructs an empty QPrinterInfo object.
+
+    \sa isNull()
+*/
+
+/*!
+    \fn QPrinterInfo::QPrinterInfo(const QPrinterInfo& src)
+
+    Constructs a copy of \a src.
+*/
+
+/*!
+    \fn QPrinterInfo::QPrinterInfo(const QPrinter& printer)
+
+    Constructs a QPrinterInfo object from \a printer.
+*/
+
+/*!
+    \fn QPrinterInfo::~QPrinterInfo()
+
+    Destroys the QPrinterInfo object. References to the values in the
+    object become invalid.
+*/
+
+/*!
+    \fn QPrinterInfo& QPrinterInfo::operator=(const QPrinterInfo& src)
+
+    Sets the QPrinterInfo object to be equal to \a src.
+*/
+
+/*!
+    \fn QString QPrinterInfo::printerName() const
+
+    Returns the name of the printer.
+
+    \sa QPrinter::setPrinterName()
+*/
+
+/*!
+    \fn bool QPrinterInfo::isNull() const
+
+    Returns whether this QPrinterInfo object holds a printer definition.
+
+    An empty QPrinterInfo object could result for example from calling
+    defaultPrinter() when there are no printers on the system.
+*/
+
+/*!
+    \fn bool QPrinterInfo::isDefault() const
+
+    Returns whether this printer is the default printer.
+*/
+
+/*!
+    \fn QList< QPrinter::PaperSize> QPrinterInfo::supportedPaperSizes() const
+    \since 4.4
+
+    Returns a list of supported paper sizes by the printer.
+
+    Not all printer drivers support this query, so the list may be empty.
+    On Mac OS X 10.3, this function always returns an empty list.
+*/
diff --git a/doc/src/qset.qdoc b/doc/src/qset.qdoc
new file mode 100644
index 0000000000..9795123d9d
--- /dev/null
+++ b/doc/src/qset.qdoc
@@ -0,0 +1,952 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class QSet
+    \brief The QSet class is a template class that provides a hash-table-based set.
+
+    \ingroup tools
+    \ingroup shared
+    \reentrant
+    \mainclass
+
+    QSet<T> is one of Qt's generic \l{container classes}. It stores
+    values in an unspecified order and provides very fast lookup of
+    the values. Internally, QSet<T> is implemented as a QHash.
+
+    Here's an example QSet with QString values:
+
+    \snippet doc/src/snippets/code/doc_src_qset.qdoc 0
+
+    To insert a value into the set, use insert():
+
+    \snippet doc/src/snippets/code/doc_src_qset.qdoc 1
+
+    Another way to insert items into the set is to use operator<<():
+
+    \snippet doc/src/snippets/code/doc_src_qset.qdoc 2
+
+    To test whether an item belongs to the set or not, use contains():
+
+    \snippet doc/src/snippets/code/doc_src_qset.qdoc 3
+
+    If you want to navigate through all the values stored in a QSet,
+    you can use an iterator. QSet supports both \l{Java-style
+    iterators} (QSetIterator and QMutableSetIterator) and \l{STL-style
+    iterators} (QSet::iterator and QSet::const_iterator). Here's how
+    to iterate over a QSet<QWidget *> using a Java-style iterator:
+
+    \snippet doc/src/snippets/code/doc_src_qset.qdoc 4
+
+    Here's the same code, but using an STL-style iterator:
+
+    \snippet doc/src/snippets/code/doc_src_qset.qdoc 5
+
+    QSet is unordered, so an iterator's sequence cannot be assumed to
+    be predictable. If ordering by key is required, use a QMap.
+
+    To navigate through a QSet, you can also use \l{foreach}:
+
+    \snippet doc/src/snippets/code/doc_src_qset.qdoc 6
+
+    Items can be removed from the set using remove(). There is also a
+    clear() function that removes all items.
+
+    QSet's value data type must be an \l{assignable data type}. You
+    cannot, for example, store a QWidget as a value; instead, store a
+    QWidget *. In addition, the type must provide \c operator==(), and
+    there must also be a global qHash() function that returns a hash
+    value for an argument of the key's type. See the QHash
+    documentation for a list of types supported by qHash().
+
+    Internally, QSet uses a hash table to perform lookups. The hash
+    table automatically grows and shrinks to provide fast lookups
+    without wasting memory. You can still control the size of the hash
+    table by calling reserve(), if you already know approximately how
+    many elements the QSet will contain, but this isn't necessary to
+    obtain good performance. You can also call capacity() to retrieve
+    the hash table's size.
+
+    \sa QSetIterator, QMutableSetIterator, QHash, QMap
+*/
+
+/*!
+    \fn QSet::QSet()
+
+    Constructs an empty set.
+
+    \sa clear()
+*/
+
+/*!
+    \fn QSet::QSet(const QSet<T> &other)
+
+    Constructs a copy of \a other.
+
+    This operation occurs in \l{constant time}, because QSet is
+    \l{implicitly shared}. This makes returning a QSet from a
+    function very fast. If a shared instance is modified, it will be
+    copied (copy-on-write), and this takes \l{linear time}.
+
+    \sa operator=()
+*/
+
+/*!
+    \fn QSet<T> &QSet::operator=(const QSet<T> &other)
+
+    Assigns the \a other set to this set and returns a reference to
+    this set.  
+*/
+
+/*!
+    \fn bool QSet::operator==(const QSet<T> &other) const
+
+    Returns true if the \a other set is equal to this set; otherwise
+    returns false.
+
+    Two sets are considered equal if they contain the same elements.
+
+    This function requires the value type to implement \c operator==().
+
+    \sa operator!=()
+*/
+
+/*!
+    \fn bool QSet::operator!=(const QSet<T> &other) const
+
+    Returns true if the \a other set is not equal to this set; otherwise
+    returns false.
+
+    Two sets are considered equal if they contain the same elements.
+
+    This function requires the value type to implement \c operator==().
+
+    \sa operator==()
+*/
+
+/*!
+    \fn int QSet::size() const
+
+    Returns the number of items in the set.
+
+    \sa isEmpty(), count()
+*/
+
+/*!
+    \fn bool QSet::isEmpty() const
+
+    Returns true if the set contains no elements; otherwise returns
+    false.
+
+    \sa size()
+*/
+
+/*!
+    \fn int QSet::capacity() const
+
+    Returns the number of buckets in the set's internal hash
+    table.
+
+    The sole purpose of this function is to provide a means of fine
+    tuning QSet's memory usage. In general, you will rarely ever need
+    to call this function. If you want to know how many items are in
+    the set, call size().
+
+    \sa reserve(), squeeze()
+*/
+
+/*! \fn void QSet::reserve(int size)
+
+    Ensures that the set's internal hash table consists of at
+    least \a size buckets.
+
+    This function is useful for code that needs to build a huge set
+    and wants to avoid repeated reallocation. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qset.qdoc 7
+
+    Ideally, \a size should be slightly more than the maximum number
+    of elements expected in the set. \a size doesn't have to be prime,
+    because QSet will use a prime number internally anyway. If \a size
+    is an underestimate, the worst that will happen is that the QSet
+    will be a bit slower.
+
+    In general, you will rarely ever need to call this function.
+    QSet's internal hash table automatically shrinks or grows to
+    provide good performance without wasting too much memory.
+
+    \sa squeeze(), capacity()
+*/
+
+/*!
+    \fn void QSet::squeeze()
+
+    Reduces the size of the set's internal hash table to save
+    memory.
+
+    The sole purpose of this function is to provide a means of fine
+    tuning QSet's memory usage. In general, you will rarely ever
+    need to call this function.
+
+    \sa reserve(), capacity()
+*/
+
+/*!
+    \fn void QSet::detach()
+
+    \internal
+
+    Detaches this set from any other sets with which it may share
+    data.
+
+    \sa isDetached()
+*/
+
+/*! \fn bool QSet::isDetached() const
+
+    \internal
+
+    Returns true if the set's internal data isn't shared with any
+    other set object; otherwise returns false.
+
+    \sa detach()
+*/
+
+/*!
+    \fn void QSet::setSharable(bool sharable)
+    \internal
+*/
+
+/*!
+    \fn void QSet::clear()
+
+    Removes all elements from the set.
+
+    \sa remove()
+*/
+
+/*!
+    \fn bool QSet::remove(const T &value)
+
+    Removes any occurrence of item \a value from the set. Returns
+    true if an item was actually removed; otherwise returns false.
+
+    \sa contains(), insert()
+*/
+
+/*!
+    \fn QSet::iterator QSet::erase(iterator pos)
+    \since 4.2
+
+    Removes the item at the iterator position \a pos from the set, and
+    returns an iterator positioned at the next item in the set.
+
+    Unlike remove(), this function never causes QSet to rehash its
+    internal data structure. This means that it can safely be called
+    while iterating, and won't affect the order of items in the set.
+
+    \sa remove(), find()
+*/
+
+/*! \fn QSet::const_iterator QSet::find(const T &value) const
+    \since 4.2
+
+    Returns a const iterator positioned at the item \a value in the
+    set. If the set contains no item \a value, the function returns
+    constEnd().
+
+    \sa constFind(), contains()
+*/
+
+/*! \fn QSet::iterator QSet::find(const T &value)
+    \since 4.2
+    \overload
+
+    Returns a non-const iterator positioned at the item \a value in
+    the set. If the set contains no item \a value, the function
+    returns end(). 
+*/
+
+/*! \fn QSet::const_iterator QSet::constFind(const T &value) const
+    \since 4.2
+
+    Returns a const iterator positioned at the item \a value in the
+    set. If the set contains no item \a value, the function returns
+    constEnd().
+
+    \sa find(), contains()
+*/
+
+/*!
+    \fn bool QSet::contains(const T &value) const
+
+    Returns true if the set contains item \a value; otherwise returns
+    false.
+
+    \sa insert(), remove(), find()
+*/
+
+/*!
+    \fn bool QSet::contains(const QSet<T> &other) const
+    \since 4.6
+
+    Returns true if the set contains all items from the \a other set;
+    otherwise returns false.
+
+    \sa insert(), remove(), find()
+*/
+
+/*! \fn QSet::const_iterator QSet::begin() const
+
+    Returns a const \l{STL-style iterator} positioned at the first
+    item in the set.
+
+    \sa constBegin(), end()
+*/
+
+/*! \fn QSet::iterator QSet::begin()
+    \since 4.2
+    \overload
+
+    Returns a non-const \l{STL-style iterator} positioned at the first
+    item in the set.  
+*/
+
+/*! \fn QSet::const_iterator QSet::constBegin() const
+
+    Returns a const \l{STL-style iterator} positioned at the first
+    item in the set.
+
+    \sa begin(), constEnd()
+*/
+
+/*! \fn QSet::const_iterator QSet::end() const
+
+    Returns a const \l{STL-style iterator} positioned at the imaginary
+    item after the last item in the set.
+
+    \sa constEnd(), begin()
+*/
+
+/*! \fn QSet::iterator QSet::end()
+    \since 4.2
+    \overload
+
+    Returns a non-const \l{STL-style iterator} pointing to the
+    imaginary item after the last item in the set.
+*/
+
+/*! \fn QSet::const_iterator QSet::constEnd() const
+
+    Returns a const \l{STL-style iterator} pointing to the imaginary
+    item after the last item in the set.
+
+    \sa constBegin(), end()
+*/
+
+/*!
+    \typedef QSet::Iterator
+    \since 4.2
+
+    Qt-style synonym for QSet::iterator.
+*/
+
+/*!
+    \typedef QSet::ConstIterator
+
+    Qt-style synonym for QSet::const_iterator.
+*/
+
+/*!
+    \typedef QSet::const_pointer
+
+    Typedef for const T *. Provided for STL compatibility.
+*/
+
+/*!
+    \typedef QSet::const_reference
+
+    Typedef for const T &. Provided for STL compatibility.
+*/
+
+/*!
+    \typedef QSet::difference_type
+
+    Typedef for const ptrdiff_t. Provided for STL compatibility.
+*/
+
+/*!
+    \typedef QSet::key_type
+
+    Typedef for T. Provided for STL compatibility.
+*/
+
+/*!
+    \typedef QSet::pointer
+
+    Typedef for T *. Provided for STL compatibility.
+*/
+
+/*!
+    \typedef QSet::reference
+
+    Typedef for T &. Provided for STL compatibility.
+*/
+
+/*!
+    \typedef QSet::size_type
+
+    Typedef for int. Provided for STL compatibility.
+*/
+
+/*!
+    \typedef QSet::value_type
+
+    Typedef for T. Provided for STL compatibility.
+*/
+
+/*!
+    \fn QSet::const_iterator QSet::insert(const T &value)
+
+    Inserts item \a value into the set, if \a value isn't already
+    in the set, and returns an iterator positioned at the inserted
+    item.
+
+    \sa operator<<(), remove(), contains()
+*/
+
+/*!
+    \fn QSet<T> &QSet::unite(const QSet<T> &other)
+
+    Each item in the \a other set that isn't already in this set is
+    inserted into this set. A reference to this set is returned.
+
+    \sa operator|=(), intersect(), subtract()
+*/
+
+/*!
+    \fn QSet<T> &QSet::intersect(const QSet<T> &other)
+
+    Removes all items from this set that are not contained in the
+    \a other set. A reference to this set is returned.
+
+    \sa operator&=(), unite(), subtract()
+*/
+
+/*!
+    \fn QSet<T> &QSet::subtract(const QSet<T> &other)
+
+    Removes all items from  this set that are contained in the 
+    \a other set. Returns a reference to this set.
+
+    \sa operator-=(), unite(), intersect()
+*/
+
+/*!
+    \fn bool QSet::empty() const
+
+    Returns true if the set is empty. This function is provided
+    for STL compatibility. It is equivalent to isEmpty().  
+*/
+
+/*!
+    \fn bool QSet::count() const
+
+    Same as size().
+*/
+
+/*!
+    \fn QSet<T> &QSet::operator<<(const T &value)
+    \fn QSet<T> &QSet::operator+=(const T &value)
+    \fn QSet<T> &QSet::operator|=(const T &value)
+
+    Inserts a new item \a value and returns a reference to the set.
+    If \a value already exists in the set, the set is left unchanged.
+
+    \sa insert()
+*/
+
+/*!
+    \fn QSet<T> &QSet::operator-=(const T &value)
+
+    Removes the occurrence of item \a value from the set, if 
+    it is found, and returns a reference to the set. If the
+    \a value is not contained the set, nothing is removed.
+
+    \sa remove()
+*/
+
+/*!
+    \fn QSet<T> &QSet::operator|=(const QSet<T> &other)
+    \fn QSet<T> &QSet::operator+=(const QSet<T> &other)
+
+    Same as unite(\a other).
+
+    \sa operator|(), operator&=(), operator-=()
+*/
+
+/*!
+    \fn QSet<T> &QSet::operator&=(const QSet<T> &other)
+
+    Same as intersect(\a other).
+
+    \sa operator&(), operator|=(), operator-=()
+*/
+
+/*!
+    \fn QSet<T> &QSet::operator&=(const T &value)
+
+    \overload
+
+    Same as intersect(\e{other}), if we consider \e{other} to be a set
+    that contains the singleton \a value.  
+*/
+
+
+/*!
+    \fn QSet<T> &QSet::operator-=(const QSet<T> &other)
+
+    Same as subtract(\a{other}).
+
+    \sa operator-(), operator|=(), operator&=()
+*/
+
+/*!
+    \fn QSet<T> QSet::operator|(const QSet<T> &other) const
+    \fn QSet<T> QSet::operator+(const QSet<T> &other) const
+
+    Returns a new QSet that is the union of this set and the 
+    \a other set.
+
+    \sa unite(), operator|=(), operator&(), operator-()
+*/
+
+/*!
+    \fn QSet<T> QSet::operator&(const QSet<T> &other) const
+
+    Returns a new QSet that is the intersection of this set and the
+    \a other set.
+
+    \sa intersect(), operator&=(), operator|(), operator-()
+*/
+
+/*!
+    \fn QSet<T> QSet::operator-(const QSet<T> &other) const
+
+    Returns a new QSet that is the set difference of this set and
+    the \a other set, i.e., this set - \a other set.
+
+    \sa subtract(), operator-=(), operator|(), operator&()
+*/
+
+/*!
+    \fn QSet<T> QSet::operator-(const QSet<T> &other)
+    \fn QSet<T> QSet::operator|(const QSet<T> &other)
+    \fn QSet<T> QSet::operator+(const QSet<T> &other)
+    \fn QSet<T> QSet::operator&(const QSet<T> &other)
+    \internal
+
+    These will go away in Qt 5.
+*/
+
+/*!
+    \class QSet::iterator
+    \since 4.2
+    \brief The QSet::iterator class provides an STL-style non-const iterator for QSet.
+
+    QSet features both \l{STL-style iterators} and
+    \l{Java-style iterators}. The STL-style iterators are more
+    low-level and more cumbersome to use; on the other hand, they are
+    slightly faster and, for developers who already know STL, have
+    the advantage of familiarity.
+
+    QSet<T>::iterator allows you to iterate over a QSet and to remove
+    items (using QSet::erase()) while you iterate. (QSet doesn't let
+    you \e modify a value through an iterator, because that
+    would potentially require moving the value in the internal hash
+    table used by QSet.) If you want to iterate over a const QSet,
+    you should use QSet::const_iterator. It is generally good
+    practice to use QSet::const_iterator on a non-const QSet as well,
+    unless you need to change the QSet through the iterator. Const
+    iterators are slightly faster, and can improve code readability.
+
+    QSet\<T\>::iterator allows you to iterate over a QSet\<T\> and
+    modify it as you go (using QSet::erase()). However, 
+
+    The default QSet::iterator constructor creates an uninitialized
+    iterator. You must initialize it using a function like
+    QSet::begin(), QSet::end(), or QSet::insert() before you can
+    start iterating. Here's a typical loop that prints all the items
+    stored in a set:
+
+    \snippet doc/src/snippets/code/doc_src_qset.qdoc 8
+
+    Here's a loop that removes certain items (all those that start
+    with 'J') from a set while iterating:
+
+    \snippet doc/src/snippets/code/doc_src_qset.qdoc 9
+
+    STL-style iterators can be used as arguments to \l{generic
+    algorithms}. For example, here's how to find an item in the set
+    using the qFind() algorithm:
+
+    \snippet doc/src/snippets/code/doc_src_qset.qdoc 10
+
+    Multiple iterators can be used on the same set. However, you may
+    not attempt to modify the container while iterating on it.
+
+    \sa QSet::const_iterator, QMutableSetIterator
+*/
+
+/*!
+    \class QSet::const_iterator
+    \brief The QSet::const_iterator class provides an STL-style const iterator for QSet.
+    \since 4.2
+
+    QSet features both \l{STL-style iterators} and
+    \l{Java-style iterators}. The STL-style iterators are more
+    low-level and more cumbersome to use; on the other hand, they are
+    slightly faster and, for developers who already know STL, have
+    the advantage of familiarity.
+
+    QSet\<Key, T\>::const_iterator allows you to iterate over a QSet.
+    If you want to modify the QSet as you iterate over it, you must
+    use QSet::iterator instead. It is generally good practice to use
+    QSet::const_iterator on a non-const QSet as well, unless you need
+    to change the QSet through the iterator. Const iterators are
+    slightly faster, and can improve code readability.
+
+    The default QSet::const_iterator constructor creates an
+    uninitialized iterator. You must initialize it using a function
+    like QSet::begin(), QSet::end(), or QSet::insert() before you can
+    start iterating. Here's a typical loop that prints all the items
+    stored in a set:
+
+    \snippet doc/src/snippets/code/doc_src_qset.qdoc 11
+
+    STL-style iterators can be used as arguments to \l{generic
+    algorithms}. For example, here's how to find an item in the set
+    using the qFind() algorithm:
+
+    \snippet doc/src/snippets/code/doc_src_qset.qdoc 12
+
+    Multiple iterators can be used on the same set. However, you may
+    not attempt to modify the container while iterating on it.
+
+    \sa QSet::iterator, QSetIterator
+*/
+
+/*!
+    \fn QSet::iterator::iterator()
+    \fn QSet::const_iterator::const_iterator()
+
+    Constructs an uninitialized iterator.
+
+    Functions like operator*() and operator++() should not be called
+    on an uninitialized iterator. Use operator=() to assign a value
+    to it before using it.
+
+    \sa QSet::begin(), QSet::end()
+*/
+
+/*! 
+    \fn QSet::iterator::iterator(typename Hash::iterator i)
+    \fn QSet::const_iterator::const_iterator(typename Hash::const_iterator i)
+
+    \internal
+*/
+
+/*!
+    \typedef QSet::iterator::iterator_category
+    \typedef QSet::const_iterator::iterator_category
+
+    \internal
+*/
+
+/*!
+    \typedef QSet::iterator::difference_type
+    \typedef QSet::const_iterator::difference_type
+
+    \internal
+*/
+
+/*!
+    \typedef QSet::iterator::value_type
+    \typedef QSet::const_iterator::value_type
+
+    \internal
+*/
+
+/*!
+    \typedef QSet::iterator::pointer
+    \typedef QSet::const_iterator::pointer
+
+    \internal
+*/
+
+/*!
+    \typedef QSet::iterator::reference
+    \typedef QSet::const_iterator::reference
+
+    \internal
+*/
+
+/*!
+    \fn QSet::iterator::iterator(const iterator &other)
+    \fn QSet::const_iterator::const_iterator(const const_iterator &other)
+
+    Constructs a copy of \a other.
+*/
+
+/*!
+    \fn QSet::const_iterator::const_iterator(const iterator &other)
+    \since 4.2
+    \overload
+
+    Constructs a copy of \a other.
+*/
+
+/*!
+    \fn QSet::iterator &QSet::iterator::operator=(const iterator &other)
+    \fn QSet::const_iterator &QSet::const_iterator::operator=(const const_iterator &other)
+
+    Assigns \a other to this iterator.
+*/
+
+/*!
+    \fn const T &QSet::iterator::operator*() const
+    \fn const T &QSet::const_iterator::operator*() const
+
+    Returns a reference to the current item.
+
+    \sa operator->()
+*/
+
+/*!
+    \fn const T *QSet::iterator::operator->() const
+    \fn const T *QSet::const_iterator::operator->() const
+
+    Returns a pointer to the current item.
+
+    \sa operator*()
+*/
+
+/*!
+    \fn bool QSet::iterator::operator==(const iterator &other) const
+    \fn bool QSet::const_iterator::operator==(const const_iterator &other) const
+
+    Returns true if \a other points to the same item as this
+    iterator; otherwise returns false.
+
+    \sa operator!=()
+*/
+
+/*!
+    \fn bool QSet::iterator::operator==(const const_iterator &other) const
+    \fn bool QSet::iterator::operator!=(const const_iterator &other) const
+
+    \overload
+*/
+
+/*!
+    \fn bool QSet::iterator::operator!=(const iterator &other) const
+    \fn bool QSet::const_iterator::operator!=(const const_iterator &other) const
+
+    Returns true if \a other points to a different item than this
+    iterator; otherwise returns false.
+
+    \sa operator==()
+*/
+
+/*!
+    \fn QSet::iterator &QSet::iterator::operator++()
+    \fn QSet::const_iterator &QSet::const_iterator::operator++()
+
+    The prefix ++ operator (\c{++it}) advances the iterator to the
+    next item in the set and returns an iterator to the new current
+    item.
+
+    Calling this function on QSet::constEnd() leads to
+    undefined results.
+
+    \sa operator--()
+*/
+
+/*!
+    \fn QSet::iterator QSet::iterator::operator++(int)
+    \fn QSet::const_iterator QSet::const_iterator::operator++(int)
+
+    \overload
+
+    The postfix ++ operator (\c{it++}) advances the iterator to the
+    next item in the set and returns an iterator to the previously
+    current item.
+*/
+
+/*!
+    \fn QSet::iterator &QSet::iterator::operator--()
+    \fn QSet::const_iterator &QSet::const_iterator::operator--()
+
+    The prefix -- operator (\c{--it}) makes the preceding item
+    current and returns an iterator to the new current item.
+
+    Calling this function on QSet::begin() leads to undefined
+    results.
+
+    \sa operator++()
+*/
+
+/*!
+    \fn QSet::iterator QSet::iterator::operator--(int)
+    \fn QSet::const_iterator QSet::const_iterator::operator--(int)
+
+    \overload
+
+    The postfix -- operator (\c{it--}) makes the preceding item
+    current and returns an iterator to the previously current item.
+*/
+
+/*!
+    \fn QSet::iterator QSet::iterator::operator+(int j) const
+    \fn QSet::const_iterator QSet::const_iterator::operator+(int j) const
+
+    Returns an iterator to the item at \a j positions forward from
+    this iterator. (If \a j is negative, the iterator goes backward.)
+
+    This operation can be slow for large \a j values.
+
+    \sa operator-()
+*/
+
+/*!
+    \fn QSet::iterator QSet::iterator::operator-(int j) const
+    \fn QSet::const_iterator QSet::const_iterator::operator-(int j) const
+
+    Returns an iterator to the item at \a j positions backward from
+    this iterator. (If \a j is negative, the iterator goes forward.)
+
+    This operation can be slow for large \a j values.
+
+    \sa operator+()
+*/
+
+/*!
+    \fn QSet::iterator &QSet::iterator::operator+=(int j)
+    \fn QSet::const_iterator &QSet::const_iterator::operator+=(int j)
+
+    Advances the iterator by \a j items. (If \a j is negative, the
+    iterator goes backward.)
+
+    This operation can be slow for large \a j values.
+
+    \sa operator-=(), operator+()
+*/
+
+/*!
+    \fn QSet::iterator &QSet::iterator::operator-=(int j)
+    \fn QSet::const_iterator &QSet::const_iterator::operator-=(int j)
+
+    Makes the iterator go back by \a j items. (If \a j is negative,
+    the iterator goes forward.)
+
+    This operation can be slow for large \a j values.
+
+    \sa operator+=(), operator-()
+*/
+
+/*! \fn QList<T> QSet<T>::toList() const
+
+    Returns a new QList containing the elements in the set. The
+    order of the elements in the QList is undefined.
+
+    Example:
+
+    \snippet doc/src/snippets/code/doc_src_qset.qdoc 13
+
+    \sa fromList(), QList::fromSet(), qSort()
+*/
+
+/*! \fn QList<T> QSet<T>::values() const
+
+    Returns a new QList containing the elements in the set. The
+    order of the elements in the QList is undefined.
+
+    This is the same as toList().
+
+    \sa fromList(), QList::fromSet(), qSort()
+*/
+
+
+/*! \fn QSet<T> QSet<T>::fromList(const QList<T> &list)
+
+    Returns a new QSet object containing the data contained in \a
+    list. Since QSet doesn't allow duplicates, the resulting QSet
+    might be smaller than the \a list, because QList can contain
+    duplicates.
+
+    Example:
+
+    \snippet doc/src/snippets/code/doc_src_qset.qdoc 14
+
+    \sa toList(), QList::toSet()
+*/
+
+/*!
+    \fn QDataStream &operator<<(QDataStream &out, const QSet<T> &set)
+    \relates QSet
+
+    Writes the \a set to stream \a out.
+
+    This function requires the value type to implement \c operator<<().
+
+    \sa \link datastreamformat.html Format of the QDataStream operators \endlink
+*/
+
+/*!
+    \fn QDataStream &operator>>(QDataStream &in, QSet<T> &set)
+    \relates QSet
+
+    Reads a set from stream \a in into \a set.
+
+    This function requires the value type to implement \c operator>>().
+
+    \sa \link datastreamformat.html Format of the QDataStream operators \endlink
+*/
diff --git a/doc/src/qsignalspy.qdoc b/doc/src/qsignalspy.qdoc
new file mode 100644
index 0000000000..cf9021e3bf
--- /dev/null
+++ b/doc/src/qsignalspy.qdoc
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \class QSignalSpy
+    \inmodule QtTest
+
+    \brief The QSignalSpy class enables introspection of signal emission.
+
+    QSignalSpy can connect to any signal of any object and records its emission.
+    QSignalSpy itself is a list of QVariant lists. Each emission of the signal
+    will append one item to the list, containing the arguments of the signal.
+
+    The following example records all signal emissions for the \c clicked() signal
+    of a QCheckBox:
+
+    \snippet doc/src/snippets/code/doc_src_qsignalspy.qdoc 0
+
+    \c{spy.takeFirst()} returns the arguments for the first emitted signal, as a
+    list of QVariant objects. The \c clicked() signal has a single bool argument,
+    which is stored as the first entry in the list of arguments.
+
+    The example below catches a signal from a custom object:
+
+    \snippet doc/src/snippets/code/doc_src_qsignalspy.qdoc 1
+
+    \bold {Note:} Non-standard data types need to be registered, using
+    the qRegisterMetaType() function, before you can create a
+    QSignalSpy. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qsignalspy.qdoc 2
+
+    To retrieve the \c QModelIndex, you can use qvariant_cast:
+
+    \snippet doc/src/snippets/code/doc_src_qsignalspy.qdoc 3
+ */
+
+/*! \fn QSignalSpy::QSignalSpy(QObject *object, const char *signal)
+
+    Constructs a new QSignalSpy that listens for emissions of the \a signal
+    from the QObject \a object. Neither \a signal nor \a object can be null.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qsignalspy.qdoc 4
+*/
+
+/*! \fn QSignalSpy::isValid() const
+
+    Returns true if the signal spy listens to a valid signal, otherwise false.
+*/
+
+/*! \fn QSignalSpy::signal() const
+
+    Returns the normalized signal the spy is currently listening to.
+*/
+
+/*! \fn int QSignalSpy::qt_metacall(QMetaObject::Call call, int id, void **a)
+    \internal
+*/
+
diff --git a/doc/src/qsizepolicy.qdoc b/doc/src/qsizepolicy.qdoc
new file mode 100644
index 0000000000..d82bb16085
--- /dev/null
+++ b/doc/src/qsizepolicy.qdoc
@@ -0,0 +1,522 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class QSizePolicy
+    \brief The QSizePolicy class is a layout attribute describing horizontal
+    and vertical resizing policy.
+
+    \ingroup appearance
+    \ingroup geomanagement
+
+    The size policy of a widget is an expression of its willingness to
+    be resized in various ways, and affects how the widget is treated
+    by the \l{Layout Management}{layout engine}. Each widget returns a
+    QSizePolicy that describes the horizontal and vertical resizing
+    policy it prefers when being laid out. You can change this for
+    a specific widget by changing its QWidget::sizePolicy property.
+
+    QSizePolicy contains two independent QSizePolicy::Policy values
+    and two stretch factors; one describes the widgets's horizontal
+    size policy, and the other describes its vertical size policy. It
+    also contains a flag to indicate whether the height and width of
+    its preferred size are related.
+
+    The horizontal and vertical policies can be set in the
+    constructor, and altered using the setHorizontalPolicy() and
+    setVerticalPolicy() functions. The stretch factors can be set
+    using the setHorizontalStretch() and setVerticalStretch()
+    functions. The flag indicating whether the widget's
+    \l{QWidget::sizeHint()}{sizeHint()} is width-dependent (such as a
+    menu bar or a word-wrapping label) can be set using the
+    setHeightForWidth() function.
+
+    The current size policies and stretch factors be retrieved using
+    the horizontalPolicy(), verticalPolicy(), horizontalStretch() and
+    verticalStretch() functions. Alternatively, use the transpose()
+    function to swap the horizontal and vertical policies and
+    stretches. The hasHeightForWidth() function returns the current
+    status of the flag indicating the size hint dependencies.
+
+    Use the expandingDirections() function to determine whether the
+    associated widget can make use of more space than its
+    \l{QWidget::sizeHint()}{sizeHint()} function indicates, as well as
+    find out in which directions it can expand.
+
+    Finally, the QSizePolicy class provides operators comparing this
+    size policy to a given policy, as well as a QVariant operator
+    storing this QSizePolicy as a QVariant object.
+
+    \sa QSize, QWidget::sizeHint(), QWidget::sizePolicy,
+    QLayoutItem::sizeHint()
+*/
+
+/*!
+    \enum QSizePolicy::PolicyFlag
+
+    These flags are combined together to form the various \l{Policy}
+    values:
+
+    \value GrowFlag  The widget can grow beyond its size hint if necessary.
+    \value ExpandFlag  The widget should get as much space as possible.
+    \value ShrinkFlag  The widget can shrink below its size hint if necessary.
+    \value IgnoreFlag  The widget's size hint is ignored. The widget will get
+        as much space as possible.
+
+    \sa Policy
+*/
+
+/*!
+    \enum QSizePolicy::Policy
+
+    This enum describes the various per-dimension sizing types used
+    when constructing a QSizePolicy.
+
+    \value Fixed  The QWidget::sizeHint() is the only acceptable
+        alternative, so the widget can never grow or shrink (e.g. the
+        vertical direction of a push button).
+
+    \value Minimum  The sizeHint() is minimal, and sufficient. The
+        widget can be expanded, but there is no advantage to it being
+        larger (e.g. the horizontal direction of a push button).
+        It cannot be smaller than the size provided by sizeHint().
+
+    \value Maximum  The sizeHint() is a maximum. The widget can be
+        shrunk any amount without detriment if other widgets need the
+        space (e.g. a separator line).
+        It cannot be larger than the size provided by sizeHint().
+
+    \value Preferred  The sizeHint() is best, but the widget can be
+        shrunk and still be useful. The widget can be expanded, but there
+        is no advantage to it being larger than sizeHint() (the default
+        QWidget policy).
+
+    \value Expanding  The sizeHint() is a sensible size, but the
+        widget can be shrunk and still be useful. The widget can make use
+        of extra space, so it should get as much space as possible (e.g.
+        the horizontal direction of a horizontal slider).
+
+    \value MinimumExpanding  The sizeHint() is minimal, and sufficient.
+        The widget can make use of extra space, so it should get as much
+        space as possible (e.g. the horizontal direction of a horizontal
+        slider).
+
+    \value Ignored  The sizeHint() is ignored. The widget will get as
+        much space as possible.
+
+    \sa PolicyFlag, setHorizontalPolicy(), setVerticalPolicy()
+*/
+
+/*!
+    \fn QSizePolicy::QSizePolicy()
+
+    Constructs a QSizePolicy object with \l Fixed as its horizontal
+    and vertical policies.
+
+    The policies can be altered using the setHorizontalPolicy() and
+    setVerticalPolicy() functions. Use the setHeightForWidth()
+    function if the preferred height of the widget is dependent on the
+    width of the widget (for example, a QLabel with line wrapping).
+
+    \sa setHorizontalStretch(), setVerticalStretch()
+*/
+
+/*!
+    \fn QSizePolicy::QSizePolicy(Policy horizontal, Policy vertical)
+
+    Constructs a QSizePolicy object with the given \a horizontal and
+    \a vertical policies, and DefaultType as the control type.
+
+    Use setHeightForWidth() if the preferred height of the widget is
+    dependent on the width of the widget (for example, a QLabel with
+    line wrapping).
+
+    \sa setHorizontalStretch(), setVerticalStretch()
+*/
+
+/*!
+    \fn QSizePolicy::QSizePolicy(Policy horizontal, Policy vertical, ControlType type)
+    \since 4.3
+
+    Constructs a QSizePolicy object with the given \a horizontal and
+    \a vertical policies, and the specified control \a type.
+
+    Use setHeightForWidth() if the preferred height of the widget is
+    dependent on the width of the widget (for example, a QLabel with
+    line wrapping).
+
+    \sa setHorizontalStretch(), setVerticalStretch(), controlType()
+*/
+
+/*!
+    \fn QSizePolicy::Policy QSizePolicy::horizontalPolicy() const
+
+    Returns the horizontal component of the size policy.
+
+    \sa setHorizontalPolicy(), verticalPolicy(), horizontalStretch()
+*/
+
+/*!
+    \fn QSizePolicy::Policy QSizePolicy::verticalPolicy() const
+
+    Returns the vertical component of the size policy.
+
+    \sa setVerticalPolicy(), horizontalPolicy(), verticalStretch()
+*/
+
+/*!
+    \fn void QSizePolicy::setHorizontalPolicy(Policy policy)
+
+    Sets the horizontal component to the given \a policy.
+
+    \sa horizontalPolicy(), setVerticalPolicy(), setHorizontalStretch()
+*/
+
+/*!
+    \fn void QSizePolicy::setVerticalPolicy(Policy policy)
+
+    Sets the vertical component to the given \a policy.
+
+    \sa verticalPolicy(), setHorizontalPolicy(), setVerticalStretch()
+*/
+
+/*!
+    \fn Qt::Orientations QSizePolicy::expandingDirections() const
+
+    Returns whether a widget can make use of more space than the
+    QWidget::sizeHint() function indicates.
+
+    A value of Qt::Horizontal or Qt::Vertical means that the widget
+    can grow horizontally or vertically (i.e., the horizontal or
+    vertical policy is \l Expanding or \l MinimumExpanding), whereas
+    Qt::Horizontal | Qt::Vertical means that it can grow in both
+    dimensions.
+
+    \sa horizontalPolicy(), verticalPolicy()
+*/
+
+/*!
+    \fn ControlType QSizePolicy::controlType() const
+    \since 4.3
+
+    Returns the control type associated with the widget for which
+    this size policy applies.
+*/
+
+/*!
+    \fn void QSizePolicy::setControlType(ControlType type)
+    \since 4.3
+
+    Sets the control type associated with the widget for which this
+    size policy applies to \a type.
+
+    The control type specifies the type of the widget for which this
+    size policy applies. It is used by some styles, notably
+    QMacStyle, to insert proper spacing between widgets. For example,
+    the Mac OS X Aqua guidelines specify that push buttons should be
+    separated by 12 pixels, whereas vertically stacked radio buttons
+    only require 6 pixels.
+
+    \sa QStyle::layoutSpacing()
+*/
+
+/*!
+    \fn void QSizePolicy::setHeightForWidth(bool dependent)
+
+    Sets the flag determining whether the widget's preferred height
+    depends on its width, to \a dependent.
+
+    \sa hasHeightForWidth()
+*/
+
+/*!
+    \fn bool QSizePolicy::hasHeightForWidth() const
+
+    Returns true if the widget's preferred height depends on its
+    width; otherwise returns false.
+
+    \sa setHeightForWidth()
+*/
+
+/*!
+    \fn bool QSizePolicy::operator==(const QSizePolicy &other) const
+
+    Returns true if this policy is equal to \a other; otherwise
+    returns false.
+
+    \sa operator!=()
+*/
+
+/*!
+    \fn bool QSizePolicy::operator!=(const QSizePolicy &other) const
+
+    Returns true if this policy is different from \a other; otherwise
+    returns false.
+
+    \sa operator==()
+*/
+
+/*!
+    \fn int QSizePolicy::horizontalStretch() const
+
+    Returns the horizontal stretch factor of the size policy.
+
+    \sa setHorizontalStretch(), verticalStretch(), horizontalPolicy()
+*/
+
+/*!
+    \fn int QSizePolicy::verticalStretch() const
+
+    Returns the vertical stretch factor of the size policy.
+
+    \sa setVerticalStretch(), horizontalStretch(), verticalPolicy()
+*/
+
+/*!
+    \fn void QSizePolicy::setHorizontalStretch(uchar stretchFactor)
+
+    Sets the horizontal stretch factor of the size policy to the given \a
+    stretchFactor.
+
+    \sa horizontalStretch(), setVerticalStretch(), setHorizontalPolicy()
+*/
+
+/*!
+    \fn void QSizePolicy::setVerticalStretch(uchar stretchFactor)
+
+    Sets the vertical stretch factor of the size policy to the given
+    \a stretchFactor.
+
+    \sa verticalStretch(), setHorizontalStretch(), setVerticalPolicy()
+*/
+
+/*!
+    \fn void QSizePolicy::transpose()
+
+    Swaps the horizontal and vertical policies and stretches.
+*/
+
+/*!
+    \enum QSizePolicy::ControlType
+    \since 4.3
+
+    This enum specifies the different types of widgets in terms of
+    layout interaction:
+
+    \value DefaultType  The default type, when none is specified.
+    \value ButtonBox  A QDialogButtonBox instance.
+    \value CheckBox  A QCheckBox instance.
+    \value ComboBox  A QComboBox instance.
+    \value Frame  A QFrame instance.
+    \value GroupBox  A QGroupBox instance.
+    \value Label  A QLabel instance.
+    \value Line  A QFrame instance with QFrame::HLine or QFrame::VLine.
+    \value LineEdit  A QLineEdit instance.
+    \value PushButton  A QPushButton instance.
+    \value RadioButton  A QRadioButton instance.
+    \value Slider  A QAbstractSlider instance.
+    \value SpinBox  A QAbstractSpinBox instance.
+    \value TabWidget  A QTabWidget instance.
+    \value ToolButton  A QToolButton instance.
+
+    \sa setControlType(), controlType()
+*/
+
+#ifdef QT3_SUPPORT
+/*!
+    \typedef QSizePolicy::SizeType
+    \compat
+
+    Use the QSizePolicy::Policy enum instead.
+*/
+
+/*!
+    \enum QSizePolicy::ExpandData
+    \compat
+
+    Use the Qt::Orientations enum instead.
+
+    \value NoDirection  Use 0 instead.
+    \value Horizontally  Use Qt::Horizontal instead.
+    \value Vertically  Use Qt::Vertical instead.
+    \value BothDirections  Use Qt::Horizontal | Qt::Vertical instead.
+*/
+
+/*!
+    \fn bool QSizePolicy::mayShrinkHorizontally() const
+
+    Use the horizontalPolicy() function combined with the
+    QSizePolicy::PolicyFlag enum instead.
+
+    \oldcode
+        bool policy = mayShrinkHorizontally();
+    \newcode
+        bool policy = horizontalPolicy() & QSizePolicy::ShrinkFlag;
+    \endcode
+*/
+
+/*!
+    \fn bool QSizePolicy::mayShrinkVertically() const
+
+    Use the verticalPolicy() function combined with the
+    QSizePolicy::PolicyFlag enum instead.
+
+    \oldcode
+        bool policy = mayShrinkVertically();
+    \newcode
+        bool policy = verticalPolicy() & QSizePolicy::ShrinkFlag;
+    \endcode
+*/
+
+/*!
+    \fn bool QSizePolicy::mayGrowHorizontally() const
+
+    Use the horizontalPolicy() function combined with the
+    QSizePolicy::PolicyFlag enum instead.
+
+    \oldcode
+        bool policy = mayGrowHorizontally();
+    \newcode
+        bool policy = horizontalPolicy() & QSizePolicy::GrowFlag;
+    \endcode
+*/
+
+/*!
+    \fn bool QSizePolicy::mayGrowVertically() const
+
+    Use the verticalPolicy() function combined with the
+    QSizePolicy::PolicyFlag enum instead.
+
+    \oldcode
+        bool policy = mayGrowVertically();
+    \newcode
+        bool policy = verticalPolicy() & QSizePolicy::GrowFlag;
+    \endcode
+*/
+
+/*!
+    \fn Qt::QSizePolicy::Orientations QSizePolicy::expanding() const
+
+    Use expandingDirections() instead.
+*/
+
+/*!
+    \fn QSizePolicy::QSizePolicy(Policy horizontal, Policy vertical, bool dependent)
+
+    Use the QSizePolicy() constructor and the setHeightForWidth()
+    function instead.
+
+    \oldcode
+        QSizePolicy *policy = new QSizePolicy(horizontal, vertical, dependent);
+    \newcode
+        QSizePolicy *policy = new QSizePolicy(horizontal, vertical);
+        policy->setHeightForWidth(dependent);
+    \endcode
+*/
+
+/*!
+    \fn QSizePolicy::QSizePolicy(Policy horizontal, Policy vertical, uchar horizontalStretch,
+                                 uchar verticalStretch, bool dependent)
+
+    Use the QSizePolicy() constructor and call the
+    setHorizontalStretch(), setVerticalStretch(), and
+    setHeightForWidth() functions instead.
+
+    \oldcode
+        QSizePolicy *policy = new QSizePolicy(horizontal, vertical,
+                                                                 horizontalStretch, verticalStretch,
+                                                                 dependent);
+    \newcode
+        QSizePolicy *policy = new QSizePolicy(horizontal, vertical);
+        policy->setHorizontalStretch(horizontalStretch);
+        policy->setVerticalStretch(verticalStretch);
+        policy->setHeightForWidth(dependent);
+    \endcode
+*/
+
+/*!
+    \fn QSizePolicy::Policy QSizePolicy::horData() const
+
+    Use horizontalPolicy() instead.
+*/
+
+/*!
+    \fn QSizePolicy::Policy QSizePolicy::verData() const
+
+    Use verticalPolicy() instead.
+*/
+
+/*!
+    \fn void QSizePolicy::setHorData(Policy policy)
+
+    Use setHorizontalPolicy() instead.
+*/
+
+/*!
+    \fn void QSizePolicy::setVerData(Policy policy)
+
+    Use setVerticalPolicy() instead.
+*/
+
+/*!
+    \fn uint QSizePolicy::horStretch() const
+
+    Use horizontalStretch() instead.
+*/
+
+/*!
+    \fn uint QSizePolicy::verStretch() const
+
+    Use verticalStretch() instead.
+*/
+
+/*!
+    \fn void QSizePolicy::setHorStretch(uchar stretch)
+
+    Use setHorizontalStretch() instead.
+*/
+
+/*!
+    \fn void QSizePolicy::setVerStretch(uchar stretch)
+
+    Use setVerticalStretch() instead.
+*/
+#endif
diff --git a/doc/src/qsql.qdoc b/doc/src/qsql.qdoc
new file mode 100644
index 0000000000..e98d309bb9
--- /dev/null
+++ b/doc/src/qsql.qdoc
@@ -0,0 +1,138 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \namespace QSql
+    \brief The QSql namespace contains miscellaneous identifiers used throughout
+    the Qt SQL library.
+
+    \ingroup database
+    \mainclass
+    \omit ### \module sql \endomit
+
+    \sa {QtSql Module}
+*/
+
+/*!
+    \enum QSql::Confirm
+    \compat
+
+    This enum type describes edit confirmations.
+
+    \value Yes
+    \value No
+    \value Cancel
+*/
+
+/*!
+    \enum QSql::Op
+    \compat
+
+    This enum type describes edit operations.
+
+    \value None
+    \value Insert
+    \value Update
+    \value Delete
+*/
+
+
+/*!
+    \enum QSql::Location
+
+    This enum type describes special SQL navigation locations:
+
+    \value BeforeFirstRow Before the first record.
+    \value AfterLastRow After the last record.
+
+    \omitvalue BeforeFirst
+    \omitvalue AfterLast
+
+    \sa QSqlQuery::at()
+*/
+
+/*!
+    \enum QSql::ParamTypeFlag
+
+    This enum is used to specify the type of a bind parameter.
+
+    \value In  The bind parameter is used to put data into the database.
+    \value Out  The bind parameter is used to receive data from the database.
+    \value InOut  The bind parameter is used to put data into the
+        database; it will be overwritten with output data on executing
+        a query.
+    \value Binary This must be OR'd with one of the other flags if
+           you want to indicate that the data being transferred is
+           raw binary data.
+*/
+
+/*!
+    \enum QSql::TableType
+
+    This enum type describes types of SQL tables.
+
+    \value Tables  All the tables visible to the user.
+    \value SystemTables  Internal tables used by the database.
+    \value Views  All the views visible to the user.
+    \value AllTables  All of the above.
+*/
+
+/*!
+    \enum QSql::NumericalPrecisionPolicy
+
+    This enum type describes at which precision levels numercial values are read from
+    a database.
+
+    Some databases support numerical values with a precision that is not storable in a
+    C++ basic data type. The default behavior is to bind these values as a QString.
+    This enum can be used to override this behavior.
+
+    \value LowPrecisionInt32  Force 32bit integer values. In case of floating point numbers,
+                              the fractional part is silently discarded.
+    \value LowPrecisionInt64  Force 64bit integer values. In case of floating point numbers,
+                              the fractional part is silently discarded.
+    \value LowPrecisionDouble Force \c double values.
+    \value HighPrecision      The default behavior - try to preserve maximum precision.
+
+    Note: The actual behaviour if an overflow occurs is driver specific. The Oracle database
+    just returns an error in this case.
+*/
+
diff --git a/doc/src/qt-conf.qdoc b/doc/src/qt-conf.qdoc
new file mode 100644
index 0000000000..d8266004e4
--- /dev/null
+++ b/doc/src/qt-conf.qdoc
@@ -0,0 +1,136 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt-conf.html
+
+    \title Using qt.conf
+    \ingroup deployment
+
+    The \c qt.conf file overrides the hard-coded paths that are
+    compiled into the Qt library. These paths are accessible using the
+    QLibraryInfo class. Without \c qt.conf, the functions in
+    QLibraryInfo return these hard-coded paths; otherwise they return
+    the paths as specified in \c qt.conf.
+
+    Without \c qt.conf, the Qt libraries will use the hard-coded paths
+    to look for plugins, translations, and so on. These paths may not
+    exist on the target system, or they may not be
+    accesssible. Because of this, you need \c qt.conf to make the Qt
+    libraries look elsewhere.
+
+    QLibraryInfo will load \c qt.conf from one of the following locations:
+
+    \list 1
+
+    \o \c :/qt/etc/qt.conf using the resource system
+
+    \o on Mac OS X, in the Resource directory inside the appliction
+    bundle, for example \c assistant.app/Contents/Resources/qt.conf
+
+    \o in the directory containing the application executable, i.e.
+    QCoreApplication::applicationDirPath() + QDir::separator() + "qt.conf"
+
+    \endlist
+
+    The \c qt.conf file is an INI text file, as described in the \l
+    {QSettings::Format}{QSettings} documentation. The file should have
+    a \c Paths group which contains the entries that correspond to
+    each value of the QLibraryInfo::LibraryLocation enum. See the
+    QLibraryInfo documentation for details on the meaning of the
+    various locations.
+
+    \table
+
+    \header \o Entry            \o Default Value
+
+    \row \o Prefix              \o QCoreApplication::applicationDirPath()
+    \row \o Documentation       \o \c doc
+    \row \o Headers             \o \c include
+    \row \o Libraries           \o \c lib
+    \row \o Binaries            \o \c bin
+    \row \o Plugins             \o \c plugins
+    \row \o Data                \o \c .
+    \row \o Translations        \o \c translations
+    \row \o Settings            \o \c .
+    \row \o Examples            \o \c .
+    \row \o Demos               \o \c .
+
+    \endtable
+
+    Absolute paths are used as specified in the \c qt.conf file. All
+    paths are relative to the \c Prefix. On Windows and X11, the \c
+    Prefix is relative to the directory containing the application
+    executable (QCoreApplication::applicationDirPath()). On Mac OS X,
+    the \c Prefix is relative to the \c Contents in the application
+    bundle. For example, \c application.app/Contents/plugins/ is the
+    default location for loading Qt plugins. Note that the plugins
+    need to be placed in specific sub-directories under the
+    \c{plugins} directory (see \l{How to Create Qt Plugins} for
+    details).
+
+    For example, a \c qt.conf file could contain the following:
+
+    \snippet doc/src/snippets/code/doc_src_qt-conf.qdoc 0
+
+    Subgroups of the \c Paths group may be used to specify locations
+    for specific versions of the Qt libraries. Such subgroups are of
+    the form \c Paths/x.y.z, where x is the major version of the Qt
+    libraries, y the minor, and z the patch level. The subgroup that
+    most closely matches the current Qt version is used. If no
+    subgroup matches, the \c Paths group is used as the fallback. The
+    minor and patch level values may be omitted, in which case they
+    default to zero.
+
+    For example, given the following groups:
+
+    \snippet doc/src/snippets/code/doc_src_qt-conf.qdoc 1
+
+    The current version will be matched as shown:
+
+    \list
+    \o 4.0.1 matches \c Paths/4
+    \o 4.1.5 matches \c Paths/4.1
+    \o 4.6.3 matches \c Paths/4.2.5
+    \o 5.0.0 matches \c Paths
+    \o 6.0.2 matches \c Paths/6
+    \endlist
+*/
diff --git a/doc/src/qt-embedded.qdoc b/doc/src/qt-embedded.qdoc
new file mode 100644
index 0000000000..f0eb096a99
--- /dev/null
+++ b/doc/src/qt-embedded.qdoc
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \group qt-embedded
+    \ingroup topics
+    \title Qt for Embedded Platforms
+    \brief Documents related to Qt for Embedded Platforms.
+
+    Qt is available for embedded platforms and devices as well as for a number
+    of desktop platforms. The features provided for each platform depend on the
+    capabilities and architecture of the operating system.
+
+    Currently, two embedded platforms are supported by Qt:
+
+    \table 90%
+    \header
+    \raw HTML
+      <td style="width: 40%">Embedded Linux</td>
+      <td style="background: white; width: 5%"></td>
+      <td style="width: 40%">Windows CE</td>
+    \endraw
+    \row    \o \l{Qt for Embedded Linux} is designed to be used on Linux devices
+               without X11 or existing graphical environments. This flavor of
+               Qt includes a framework for creating both applications and an
+               environment for them. As a result, it includes features for
+               window management, inter-process communication and facilities
+               for handling input and display devices.
+    \raw HTML
+      <td style="background: white; width: 5%"></td>
+    \endraw
+    \o \l{Qt for Windows CE} is used to create applications running in
+               existing Windows CE and Windows Mobile environments.
+               Applications use the appropriate style for the embedded
+               environment and use native features, such as menus, to conform
+               to the native style guidelines.
+    \endtable
+*/
diff --git a/doc/src/qt3support.qdoc b/doc/src/qt3support.qdoc
new file mode 100644
index 0000000000..30bc5a3928
--- /dev/null
+++ b/doc/src/qt3support.qdoc
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \module Qt3Support
+    \title Qt3Support Module
+    \contentspage Qt's Modules
+    \previouspage Phonon Module
+    \nextpage QtDesigner
+    \ingroup modules
+
+    \keyword Qt3Support
+    \brief The Qt3Support module provides classes that ease porting
+    from Qt 3 to Qt 4.
+
+    \warning The classes in this module are intended to be used in
+    intermediate stages of a porting process and are not intended
+    to be used in production code.
+
+    To include the definitions of the module's classes, use the
+    following directive:
+
+    \snippet doc/src/snippets/code/doc_src_qt3support.qdoc 0
+
+    To link against the module, add this line to your \l qmake \c
+    .pro file:
+
+    \snippet doc/src/snippets/code/doc_src_qt3support.qdoc 1
+
+    \note Since this module provides compatibility classes for
+    diverse parts of the Qt 3 API, it has dependencies on the QtCore,
+    QtGui, QtNetwork, QtSql, and QtXml modules.
+
+    This module is part of the \l{Qt Full Framework Edition} and the
+    \l{Open Source Versions of Qt}. Most classes offered by this module are
+    also part of the \l{Qt GUI Framework Edition}.
+\if defined(opensourceedition) || defined(desktoplightedition)
+    Classes that are not available for \l{Qt GUI Framework Edition}
+    users are marked as such in the class documentation.
+\endif
+
+    \sa {Porting to Qt 4}
+*/
diff --git a/doc/src/qt3to4.qdoc b/doc/src/qt3to4.qdoc
new file mode 100644
index 0000000000..1297424030
--- /dev/null
+++ b/doc/src/qt3to4.qdoc
@@ -0,0 +1,179 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt3to4.html
+    \title qt3to4 - The Qt 3 to 4 Porting Tool
+
+    \ingroup porting
+    \keyword qt3to4
+
+    The \c qt3to4 tool provides help when moving a project from Qt 3
+    to Qt 4. It is designed to automate the most tedious part of the
+    porting effort.
+
+    See \l{Porting to Qt 4} and \l{Porting .ui Files to Qt 4} for
+    more information about porting Qt 3 applications to Qt 4.
+
+    \section1 Usage
+
+    \c qt3to4 can be run either on individual C++ source or header
+    files, or on an entire project specified by a \c qmake \c .pro
+    file:
+
+    \snippet doc/src/snippets/code/doc_src_qt3to4.qdoc 0
+
+    In project mode, \c qt3to4 reads the \c .pro file and converts
+    all files specified in it. The tool modifies the files in place.
+    You might want to make a copy of your project before you run the
+    tool.
+
+    \section1 Porting Rules
+
+    The Qt porting tool loads its porting rules from an XML file
+    called \c q3porting.xml located in Qt's \c tools/porting/src directory. 
+    By editing this file, you can add your own rules or remove some
+    rules.
+
+    The standard \c q3porting.xml file specifies the following
+    conversions:
+
+    \list
+    \o  Rename classes that are now part of the Qt 3 support
+        library (e.g., replace \c QFileDialog with \c{Q3FileDialog}).
+    \o  Prefix or rename enum values that have been moved or
+        renamed (e.g., replace \c QButton::On with \c{QCheckBox::On}) or
+        members of the Qt namespace (e.g., replace \c QWidget::red with
+        \c{Qt::red}).
+    \o  Add \c #include directives that might be needed in Qt 4.
+    \endlist
+
+    \section2 Location of the qt3porting.xml File
+
+    You can now specify the location of the \c qt3porting.xml file with the
+    \c{-f} command line option. This is useful if you want to use a modified
+    file with your own rules. 
+
+    If you you don't want to maintain a modified \c qt3porting.xml it is
+    possible to create a "patch" file that includes the original file and adds
+    or disables rules. The syntax for this file looks like this:
+
+    \snippet doc/src/snippets/code/doc_src_qt3to4.qdoc 1
+
+    \section1 Logging
+
+    The porting tool logs all changes to a file called \c
+    portinglog.txt in the current directory. This file lists all
+    changes made to the source files.
+
+    \section1 Advanced Usage
+
+    When porting, \c qt3to4 parses the source files and ports the
+    contents according to the C++ language rules. This C++ parsing
+    step can be disabled with the \c -disableCppParsing option.
+
+    If C++ parsing is enabled, \c qt3to4 must be able to locate the
+    headers included from the source files. Necessary headers include
+    the public Qt headers and  any headers that declares names that
+    may conflict with names in the public Qt headers. The standard
+    C++ headers and system headers are usually not needed.
+
+    You can tell \c qt3to4 where to look for headers by using the
+    \c{-I} command-line option. Qt 3.3 header information is built
+    in, so it is normaly not necessary to specify the location of the
+    Qt headers. If you are porting from a different version of Qt 3,
+    you may want to disable the built-in headers with
+    \c{-disableBuiltInQt3Headers}, and then add the path to the
+    actual headers with the \c{-I} option.
+
+    When porting a project, \c qt3to4 will read the \c INCLUDEPATH
+    and \c DEPENDPATH variables from the \c .pro file and add the
+    paths specified here to the list of include search directories.
+
+    To see which headers that are not found, use the \c{-missingFileWarnings}
+    option.
+
+    \section1 Limitations
+
+    In some cases, you might get compiler errors because of identifiers
+    in the global namespace (e.g., \c CTRL). Adding
+
+    \snippet doc/src/snippets/code/doc_src_qt3to4.qdoc 2
+
+    at the beginning of the source file that contains
+    the indentifier solves the problem.
+
+    \section1 Legal Notices
+
+    Some source code in \c qt3to4 is licensed under specific highly
+    permissive licenses from the original authors. Nokia gratefully
+    acknowledges these contributions to \c qt3to4 and all uses of
+    \c qt3to4 should also acknowledge these contributions and quote the
+    following license statements in an appendix to the documentation.
+
+    \list
+    \o \l{Contributions to the Following qt3to4 Files: treewalker.h,
+    treedump.cpp, treedump.h, treewalker.cpp}
+    \endlist
+*/
+
+/*!
+    \page qt3to4-treewalker.html
+    \title Contributions to the Following qt3to4 Files: treewalker.h, treedump.cpp, treedump.h, treewalker.cpp
+    \ingroup licensing
+    \brief License information for contributions to the qt3to4 source code.
+
+    \legalese
+    Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). \BR
+    Copyright (C) 2005 Roberto Raggi
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, modify, market, reproduce,
+    grant sublicenses and distribute subject to the following
+    conditions:  The above copyright notice and this permission notice
+    shall be included in all copies or substantial portions of the
+    Software.  These files are provided AS IS with NO WARRANTY OF ANY
+    KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTIBILITY AND FITNESS
+    FOR A PARTICULAR PURPOSE.
+    \endlegalese
+*/
diff --git a/doc/src/qt4-accessibility.qdoc b/doc/src/qt4-accessibility.qdoc
new file mode 100644
index 0000000000..05a25ee0fb
--- /dev/null
+++ b/doc/src/qt4-accessibility.qdoc
@@ -0,0 +1,163 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt4-accessibility.html
+    \title Cross-Platform Accessibility Support in Qt 4
+    \ingroup accessibility
+
+    \contentspage {What's New in Qt 4}{Home}
+    \previouspage The New Qt Designer
+    \nextpage The Qt 4 Database GUI Layer
+
+    Qt 4 allows developers to write cross-platform applications that
+    are usable by visually impaired users as well as by users with
+    other disabilities. Qt accessibility will make applications
+    accessible to more users and opens the governmental market, where
+    accessibility is often a requirement.
+
+    \section1 General Overview
+
+    The accessibility classes have been extended in
+    various ways since Qt 3. We added new functions and new enum
+    values, and revised the API to make it more consistent with the
+    rest of Qt. We also added two properties to QWidget,
+    \l{QWidget::accessibleName}{accessibleName} and
+    \l{QWidget::accessibleDescription}{accessibleDescription}, that
+    can be set in \e{Qt Designer} to provide basic help texts without
+    having to write any code.
+
+    Qt's accessibility architecture is as follows. Qt offers one
+    generic interface, QAccessibleInterface, that can be used to
+    wrap all widgets and objects (e.g., QPushButton). This single
+    interface provides all the metadata necessary for the assistive
+    technologies. Qt provides implementations of this interface for
+    its built-in widgets as plugins.
+
+    A more detailed overview of the accessibility support in Qt can
+    be found on the \l Accessibility page.
+
+    \section1 Enabling Accessibility Support
+
+    By default, Qt applications are run with accessibility support
+    enabled on Windows and Mac OS X. On Unix/X11 platforms, applications
+    must be launched in an environment with the \c QT_ACCESSIBILITY
+    variable set to 1. For example, this is set in the following way with
+    the bash shell:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-accessibility.qdoc environment
+
+    Accessibility features are built into Qt by default when the libraries
+    are configured and built.
+
+    \section1 Creating New Accessible Interfaces
+
+    When you develop custom widgets, you can create custom subclasses
+    of QAccessibleInterface and distribute them as plugins (using
+    QAccessiblePlugin) or compile them into the application.
+    Likewise, Qt's predefined accessibility support can be built as
+    plugin (the default) or directly into the Qt library. The main
+    advantage of using plugins is that the accessibility classes are
+    only loaded into memory if they are actually used; they don't
+    slow down the common case where no assistive technology is being
+    used.
+
+    In addition to QAccessibleInterface, Qt includes two convenience
+    classes, QAccessibleObject and QAccessibleWidget, that
+    provide the lowest common denominator of metadata (e.g., widget
+    geometry, window title, basic help text). You can use them as
+    base classes when wrapping your custom QObject or QWidget
+    subclasses.
+
+    Another new feature in Qt 4 is that Qt can now support other
+    backends in addition to the predefined ones. This is done by
+    subclassing QAccessibleBridge.
+
+    \omit
+    \section1 Software Layering
+
+        Qt Application
+            | links to
+        Qt Accessibility Module
+            | Plugin (in-process)
+        Qt ATK Bridge
+            | links to
+        ATK
+            | Plugin (in-process)
+        at-spi
+            | CORBA
+        assistive technologies
+
+    Windows:
+
+        Qt Application
+            | links to
+        Qt Accessibility Module
+            | COM (?)
+        MSAA
+            | ?
+        assistive technologies
+
+    Mac:
+
+        ?
+    \endomit
+
+    \section1 Example Code
+
+    The first example illustrates how to provide accessibility
+    information for a custom widget. We can use QAccessibleWidget as
+    a base class and reimplement various functions:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-accessibility.qdoc 0
+
+    Here's how we would implement the
+    \l{QAccessibleInterface::doAction()}{doAction()} function to call
+    a function named click() on the wrapped MyWidget object when the
+    user invokes the object's default action or "presses" it.
+
+    \snippet doc/src/snippets/code/doc_src_qt4-accessibility.qdoc 1
+
+    To export the widget interface as a plugin, we must subclass
+    QAccessibleFactory:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-accessibility.qdoc 2
+*/
diff --git a/doc/src/qt4-arthur.qdoc b/doc/src/qt4-arthur.qdoc
new file mode 100644
index 0000000000..8a29138280
--- /dev/null
+++ b/doc/src/qt4-arthur.qdoc
@@ -0,0 +1,336 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt4-arthur.html
+    \title The Arthur Paint System
+
+    \contentspage {What's New in Qt 4}{Home}
+    \previouspage The Interview Framework
+    \nextpage The Scribe Classes
+
+    This document describes Qt 4's painting system, providing a
+    comparison between the approaches used by Qt when rendering
+    graphics in Qt 3 and Qt 4.
+
+    \tableofcontents
+
+    \section1 Architecture
+
+    The Qt 4 Paint System is primarily based on the classes
+    QPainter, QPaintDevice, and QPaintEngine. QPainter is the
+    class used to perform drawing operations, such as drawLine()
+    and drawRect(). QPaintDevice represents a device that can be
+    painted on using a QPainter; both QWidget and QPixmap are
+    QPaintDevices. QPaintEngine provides the interface that the
+    painter uses to draw onto different types of devices.
+
+    \section2 A Look Back at Qt 3
+
+    In Qt 3, QPainter could be used to draw on widgets and pixmaps.
+    (It could also be used to draw to printers on Windows and Mac OS
+    X.) When other paint devices needed to be supported, such as
+    QPrinter on X11, this was done by deriving from QPaintDevice and
+    reimplementing the virtual function QPaintDevice::cmd(). A
+    reimplemented paint device was treated as an external device.
+
+    QPainter was capable of recognizing external devices and could
+    serialize each paint operation to the reimplemented cmd()
+    function. This allowed reimplementation of arbitrary devices, but
+    the approach has some disadvantages which we have addressed in
+    Qt 4. One of these is that an external device could not reuse any
+    functionality implemented in QPainter since QPainter was tied to
+    widget/pixmap painting on that platform. Supporting multiple
+    device backends, such as OpenGL, was therefore inconvenient and
+    not very efficient.
+
+    This has led us to devise a more convenient and intuitive API for
+    Qt 4.
+
+    \section2 How Painting is Done in Qt 4
+
+    In Qt 4 we have introduced the QPaintEngine abstract class.
+    Implementations of this class provide the concrete functionality
+    needed to draw to specific device types. The QPaintEngine class
+    is only used internally by QPainter and QPaintDevice, and it is
+    hidden from application programmers unless they reimplement their own
+    device types for their own QPaintEngine subclasses. Qt currently
+    provides paint engines for the following platforms and APIs:
+
+    \list
+    \o A pixel-based engine for the Windows platform that is
+       also used to draw onto QImages on all platforms
+    \o OpenGL on all platforms
+    \o PostScript on Linux, Unix, and Mac OS X
+    \o QuickDraw and CoreGraphics on Mac OS X
+    \o X11 and the X Render Extension on Linux and Unix systems
+    \omit
+    \o QVFb, VNC, and LinuxFb for Qt for Embedded Linux
+    \endomit
+    \endlist
+
+    To implement support for a new backend, you must derive from
+    QPaintEngine and reimplement its virtual functions. You also need
+    to derive from QPaintDevice and reimplement the virtual function
+    QPaintDevice::paintEngine() to tell QPainter which paint engine
+    should be used to draw on this particular device.
+
+    The main benefit of this approach is that all painting follows the
+    same painting pipeline. This means that adding support for new features
+    and providing default implementations for unsupported ones has
+    become much simpler.
+
+    \section1 New Features in the Qt 4 Paint System
+
+    \section2 Gradient Brushes
+
+    With Qt 4 it is possible to fill shapes using gradient
+    brushes. A gradient in this case is used to describe the transition
+    from one color at a given point to different color at another point. A
+    gradient can span from one color to another or over a
+    number of colors by specifying multiple colors at positions in the
+    gradient area. Qt 4 supports linear, radial, and conical gradients.
+
+    Linear gradients are specified using two control points.
+    Setting a linear gradient brush is done by creating a QLinearGradient
+    object and setting it as a brush.
+
+    \snippet doc/src/snippets/code/doc_src_qt4-arthur.qdoc 0
+
+    The code shown above produces a pattern as show in the following
+    pixmap:
+
+    \img diagonalGradient.png
+
+    Radial gradients are specified using a center, a radius, and a
+    focal point. Setting a radial brush is done by creating a QRadialGradient
+    object and setting it as a brush.
+
+    \snippet doc/src/snippets/code/doc_src_qt4-arthur.qdoc 1
+
+    The code shown above produces a pattern as shown in the following
+    pixmap:
+
+    \img radialGradient.png
+
+    Conical gradients are specified using a center and a start
+    angle. Setting a conical brush is done by creating a
+    QConicalGradient object and setting it as a brush.
+
+    \snippet doc/src/snippets/code/doc_src_qt4-arthur.qdoc 2
+
+    The code shown above produces a pattern as shown in the following
+    pixmap:
+
+    \img conicalGradient.png
+
+    \section2 Alpha-Blended Drawing
+
+    With Qt 4 we support alpha-blended outlining and filling. The
+    alpha channel of a color is defined through QColor. The alpha
+    channel specifies the transparency effect, 0 represents a fully
+    transparent color, while 255 represents a fully opaque color. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-arthur.qdoc 3
+
+    The code shown above produces the following output:
+
+    \img alphafill.png
+
+    Alpha-blended drawing is supported on Windows, Mac OS X, and on
+    X11 systems that have the X Render extension installed.
+
+
+    \section2 QPainter and QGLWidget
+
+    It is now possible to open a QPainter on a QGLWidget as if it
+    were a normal QWidget. One huge benefit from this is that we
+    utilize the high performance of OpenGL for most drawing
+    operations, such as transformations and pixmap drawing.
+
+
+    \section2 Anti-Aliased Edges
+
+    On platforms where this is supported by the native drawing API, we
+    provide the option of turning on anti-aliased edges when drawing
+    graphics primitives.
+
+    \snippet doc/src/snippets/code/doc_src_qt4-arthur.qdoc 4
+
+    This produces the following output:
+
+    \img antialiased.png
+
+    Anti-aliasing is supported when drawing to a QImage and on all
+    systems, except on X11 when XRender is not present.
+
+
+    \section2 Extensive Use of Native Graphics Operations
+
+    Where this makes sense, Qt uses native graphics
+    operations. The benefit we gain from this is that these operations
+    can potentially be performed in hardware, giving significant
+    speed improvements over many pure-software implementations.
+
+    Among these are native transformations (Mac OS X and OpenGL),
+    making painting with a world matrix much faster. Some pixmap
+    operations have also been moved closer to the underlying
+    hardware implementations.
+
+
+    \section2 Painter Paths
+
+    A painter path is an object composed of a number of graphical
+    building blocks, such as rectangles, ellipses, lines, and curves.
+    A painter path can be used for filling, outlining, and for clipping.
+    The main advantage of painter paths over normal drawing operations
+    is that it is possible to build up non-linear shapes which can be
+    drawn later in one go.
+
+    Building blocks can be joined in closed subpaths, such as a
+    rectangle or an ellipse, or they can exist independently as unclosed
+    subpaths, although an unclosed path will not be filled.
+
+    Below is a code example on how a path can be used. The
+    painter in this case has a pen width of 3 and a light blue brush. We
+    first add a rectangle, which becomes a closed subpath.  We then add
+    two bezier curves, and finally draw the entire path.
+
+    \snippet doc/src/snippets/code/doc_src_qt4-arthur.qdoc 5
+
+    The code above produces the following output:
+
+    \img pathexample.png
+
+
+    \section2 Widget Double-Buffering
+
+    In Qt 4, all widgets are double-buffered by default.
+
+    In previous versions of Qt double-buffering was achieved by
+    painting to an off-screen pixmap then copying the pixmap to the
+    screen. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-arthur.qdoc 6
+
+    Since the double-buffering is handled by QWidget internally this
+    now becomes:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-arthur.qdoc 7
+
+    Double-buffering is turned on by default, but can be turned off for
+    individual widgets by setting the widget attribute
+    Qt::WA_PaintOnScreen.
+
+    \snippet doc/src/snippets/code/doc_src_qt4-arthur.qdoc 8
+
+    \section2 Pen and Brush Transformation
+
+    In Qt 3, pens and brushes weren't affected by the painter's
+    transformation matrix. For example, if you drew a rectangle with a
+    pen width of 1 using a scaled painter, the resulting line width
+    would still be 1. This made it difficult to implement features
+    such as zooming and high-resolution printing.
+
+    In Qt 4, pens and brushes honor the painter's transformation
+    matrix.
+
+    Note that this feature is still in development and not yet
+    supported on all platforms.
+
+    \section2 Custom Filled Pens
+
+    In Qt 4, it is possible to specify how an outline should be
+    filled.  It can be a solid color or a QBrush, which makes it
+    possible to specify both texture and gradient fills for both
+    text and outlines.
+
+    \snippet doc/src/snippets/code/doc_src_qt4-arthur.qdoc 9
+
+    The code above produces the following output:
+
+    \img gradientText.png
+
+    \section2 QImage as a Paint Device
+
+    A great improvement of Qt 4 over previous versions it that it now
+    provides a pixel-based raster paint engine which allows users to
+    open a painter on a QImage. The QImage paint engine supports the
+    full feature set of QPainter (paths, antialiasing, alphablending,
+    etc.) and can be used on all platforms.
+
+    One advantage of this is that it is possible to guarantee the
+    pixel exactness of any drawing operation in a platform-independent
+    way.
+
+    Painting on an image is as simple as drawing on any other paint device.
+
+    \snippet doc/src/snippets/code/doc_src_qt4-arthur.qdoc 10
+
+    \section2 SVG Rendering Support
+
+    \l{Scalable Vector Graphics} (SVG) is an language for describing both static
+    and animated two-dimensional vector graphics. Qt includes support for the
+    \l{SVG 1.2 Tiny Static Features}{static features} of \l{SVG 1.2 Tiny}, taking
+    advantage of the improved paint system in Qt 4. SVG drawings can be rendered
+    onto any QPaintDevice subclass, such as QWidget, QImage, and QGLWidget, to
+    take advantage of specific advantages of each device. This approach gives
+    developers the flexibility to experiment, in order to find the best solution
+    for each application.
+
+    \image svg-image.png
+
+    Since SVG is an XML-based format, the QtXml module is required to read SVG
+    files. For this reason, classes for SVG handling are provided separately in
+    the QtSvg module.
+
+    Displaying an SVG drawing in an application is as simple as displaying a
+    bitmap image. QSvgWidget is a display widget that can be placed in an
+    appropriate place in a user interface, and new content can be loaded as
+    required. For example, a predetermined file can be loaded and displayed in
+    a widget with little effort:
+
+    \snippet doc/src/snippets/qsvgwidget/main.cpp 0
+
+    For applications with more specialized requirements, the QSvgRenderer class
+    provides more control over the way SVG drawings are rendered and animated.
+*/
diff --git a/doc/src/qt4-designer.qdoc b/doc/src/qt4-designer.qdoc
new file mode 100644
index 0000000000..3f903907bf
--- /dev/null
+++ b/doc/src/qt4-designer.qdoc
@@ -0,0 +1,298 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt4-designer.html
+
+    \title The New Qt Designer
+
+    \contentspage {What's New in Qt 4}{Home}
+    \previouspage The Qt 4 Main Window Classes
+    \nextpage Cross-Platform Accessibility Support in Qt 4
+
+    \QD has been completely re-written based on our experience with
+    the previous versions of the product for Qt 3. One of the main new
+    ideas behind this new version is to release the application as a
+    collection of interchangeable components that include the property
+    editor, the widget box, and other useful tools for creating
+    graphical user interfaces with Qt. These components can either be
+    used together in the \QD application, or independently integrated
+    into other systems.  As a result, certain features such as the
+    project editor and code editor have been removed from the version
+    included with this release.
+
+    The current version of \QD is near feature complete and can be used for
+    many tasks. However, it is still under continuous development. This
+    document will explain what is already in place.
+
+    See also the \l{Qt Designer Manual}.
+
+    \tableofcontents
+
+    \section1 The Current State of Qt Designer
+
+    When used as a standalone application, \QD includes a number of
+    components that work together to provide a flexible GUI design
+    tool. Widgets and dialog windows can be composed using a
+    form-based interface that fully supports drag and drop, clipboard
+    operations, and an undo/redo stack.
+
+    This version of \QD introduces a number of editing modes to make
+    different types of editing more natural. Each editing mode
+    displays the form in an appropriate way for that mode, and
+    provides a specialized user interface for manipulating its
+    contents. The current editing modes are Widget Editing, Signals
+    and Slots Editing, Buddy Editing, and Tab Order Editing.
+
+    \section2 User Interface Features
+
+    \table
+    \row \i \inlineimage designer-main-window.png
+    \i \bold{Widget Box}
+
+    The Widget Box displays a categorized list of widgets and other
+    objects that can be placed on a form using drag and drop.
+
+    When \QD is in multi-window mode, the window containing the Widget
+    Box also holds the main menu and the tool bar. When in workbench
+    mode, the Widget Box becomes an independent window within the \QD
+    workspace.
+
+    The contents of the Widget Box are defined in an XML file that
+    holds a collection of .ui documents for standard Qt widgets. This
+    file can be extended, making it possible to add custom widgets to
+    the Widget Box.
+    \endtable
+
+    \table
+    \row \i \bold{Property Editor}
+
+    The Property Editor allows designers to edit most properties of
+    widgets and layout objects. The property names and values are
+    presented in an editable tree view that shows the properties of
+    the currently selected object.
+
+    Certain resources, such as icons, can be configured in the
+    Property Editor.  Resources can be taken from any currently
+    installed resource files, making it easier to design
+    self-contained components.
+
+    \i \inlineimage designer-property-editor.png
+    \endtable
+
+    \section2 Editing Features
+
+    \QD allows form designers to work on different aspects of their forms by
+    switching between specialized editing modes. Tools for editing widget
+    properties, resources, and actions provide context-sensitive information
+    about the forms being edited.
+
+    \table
+    \row \i \inlineimage designer-choosing-form.png
+    \i \bold{Form Templates}
+
+    Form templates provide ready-to-use forms for various types of widgets,
+    such as QWidget, QDialog, and QMainWindow. Custom templates based on
+    these widgets can also be created.
+
+    Templates can contain child widgets and layouts. Designers can
+    save time by creating templates for the most common user interface
+    features for repeated use.
+    \endtable
+
+    \table
+    \row
+    \i \bold{Widget Editing Mode}
+
+    The new \QD allows widgets to be dropped into existing layouts on
+    the form. Previously, it was necessary to break layouts in order
+    to add new widgets to them.
+
+    \QD now supports more direct manipulation of widgets:
+    You can clone a widget by dragging it with the \key CTRL key held down, and
+    it is even possible to drag widgets between forms.
+
+    In-place widget editors provide specialized editing facilities for
+    the most-used widget properties.
+
+    \i \inlineimage designer-editing-mode.png
+    \endtable
+
+    \table
+    \row
+    \i \inlineimage designer-connection-mode.png
+    \i \bold{Signals and Slots Editing Mode}
+
+    \QD now employs a "wired" approach when representing and editing
+    connections between objects on a form. The Signal and Slots
+    Editing mode displays all the signal and slot connections on your
+    form as arrows. These arrows can be manipulated visually, and
+    provide the user with an overview of the form's connection logic.
+
+    Connections can be made between objects on a form and the form itself.
+    This is particularly useful when designing dialogs.
+    \endtable
+
+    \table
+    \row
+    \i \bold{Buddy Editing Mode}
+
+    Widgets that cannot accept keyboard input are often given buddy
+    widgets that will take the keyboard focus on their behalf.
+
+    In Buddy Editing mode, \QD provides a similar approach to that
+    used in the Signals and Slots Editing mode to show the
+    relationships between widgets and their buddies.
+
+    \i \inlineimage designer-buddy-mode.png
+    \endtable
+
+    \table
+    \row
+    \i \inlineimage designer-tab-order-mode.png
+    \i \bold{Tab Order Mode}
+
+    In this mode, users can specify the order in which input widgets accept
+    the keyboard focus.
+
+    The way that the tab order is defined follows the approach taken
+    in Qt 3's version of \QD; The default tab order is based on the
+    order in which widgets are constructed.
+
+    \endtable
+
+    \table
+    \row
+    \i \bold{The Resource Editor}
+
+    The new \QD fully supports The Qt Resource System, and provide the
+    Resource Editor to help designers and developers manage the
+    resources that are needed by their applications.
+
+    Using the Resource Editor, resources can be associated with a
+    given form, and also modified and extended throught the editor's
+    file browser style interface.
+
+    The Resource Editor uses files that are processed by various
+    components of the \l{The Qt Resource System}{Qt Resource System}
+    to ensure that all required resources are embedded in the
+    application.
+
+    \i \inlineimage designer-resources-editing.png
+    \endtable
+
+    \table
+    \row
+    \i \inlineimage designer-action-editor.png
+    \i \bold{The Action Editor}
+
+    With the release of Qt 4.1, \QD introduces the Action Editor
+    simplifying the management of actions when creating main window
+    applications.
+
+    When creating a main window, you can add a menu bar and toolbars
+    using \QD's context menu. Once you have the menu bar or a toolbar
+    in place, you can create and add actions using the Action Editor.
+
+    \endtable
+
+    \section2 Plugin Support
+
+    \table
+    \row
+    \i \inlineimage worldtimeclockplugin-example.png
+    \i \bold{Custom Widgets}
+
+    Plugins can be used to add new custom widgets, special editors, and
+    support for widgets from the Qt 3 support library.
+
+    Support for custom widget plugins allows user interface designers to
+    use application-specific widgets in their designs as early as possible
+    in the development process.
+
+    \QD handles custom widgets in the same way as standard Qt widgets,
+    and allows custom signals and slots to be connected to other objects
+    from within Signals and Slots Editing mode.
+    \endtable
+
+    \table
+    \row
+    \i \bold{The QtDesigner Module}
+
+    The new modular \QD is designed to be integrated into other environments
+    and extended with custom components.
+
+    The QtDesigner Module is a library that developers can use to
+    write extensions and plugins for \QD, and enables \QD components
+    to be embedded into Integrated Development Environments
+    (IDEs).
+
+    With the release of Qt 4.1 the QtDesigner Module is fully
+    documented. The release also provides several new examples using
+    the QtDesigner API to create task menu extensions and custom
+    multi-page widgets (i.e. container extensions).
+
+    \i \inlineimage designer-manual-taskmenuextension.png
+    \endtable
+
+    \section1 Run-Time Support for Forms
+
+    With the Qt 4.1 release, the new QtUiTools module is introduced to
+    provide classes handling forms created with \QD.
+
+    Currently the module only contains the QUiLoader class.
+
+    QUiLoader can be used by standalone applications to
+    dynamically create form-based user interfaces at run-time. This
+    library can be statically linked with applications and
+    redistributed under the same terms as Qt.
+
+    \table
+    \row
+    \i \inlineimage calculatorbuilder-example.png
+    \i \bold{Dynamic Form Creation}
+
+    The QtUiTools library lets developers dynamically construct user interfaces at
+    run-time using the same techniques as \QD. Since forms can contain custom
+    widget plugins, the loading mechanism can be customized to search for
+    third party or application-specific plugins.
+    \endtable
+*/
diff --git a/doc/src/qt4-interview.qdoc b/doc/src/qt4-interview.qdoc
new file mode 100644
index 0000000000..bceba85a8e
--- /dev/null
+++ b/doc/src/qt4-interview.qdoc
@@ -0,0 +1,293 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt4-interview.html
+    \title The Interview Framework
+
+    \contentspage {What's New in Qt 4}{Home}
+    \previouspage The Tulip Container Classes
+    \nextpage The Arthur Paint System
+
+    The Interview classes provide a model/view framework for Qt
+    applications based on the well known Model-View-Controller design
+    pattern. In this document, we will describe Qt's model/view
+    architecture, provide some examples, and show the improvements
+    offered over Qt 3's item view classes.
+
+    \tableofcontents
+
+    \section1 Overview of The Model/View Architecture
+
+    The model/view architecture is a variation of the Model-View-Controller
+    (MVC) design pattern, originating from Smalltalk, that is often used when
+    building user interfaces.
+
+    In the model/view architecture, the view and the controller objects are
+    combined. This still separates the way that data is stored from the way
+    that it is presented to the user, but provides a simpler framework based
+    on the same principles. This separation makes it possible to display the
+    same data in several different views, and to implement new types of views,
+    without changing the underlying data structures.
+
+    User input is handled by \e delegates. The advantage of this approach is
+    that it allows rendering and editing of individual items of data to be
+    customized to suit each data type in use.
+
+    \table
+    \row \i \inlineimage modelview-overview.png
+    \i \bold{The model/view architecture}
+
+    The model communicates with a source of data, providing an \e interface
+    for the other components in the architecture. The nature of the
+    communication depends on the type of data source, and the way the model
+    is implemented.
+
+    The view obtains \e{model indexes} from the model; these are references
+    to items of data. By supplying model indexes to the model, the view can
+    retrieve items of data from the data source.
+
+    In standard views, a \e delegate renders the items of data. When an item
+    is edited, the delegate communicates with the model directly using
+    model indexes.
+    \endtable
+
+    \section1 Model/View Classes
+
+    On a fundamental level, the Interview classes define the interfaces and
+    common functionality for models, views, and delegates. All implemented
+    components subclass QAbstractItemModel, QAbstractItemView, or
+    QAbstractItemDelegate. The use of a common API ensures a level of
+    interoperability between the components.
+
+    \image standard-views.png
+
+    Interview provides ready-to-use implementations of views for table,
+    tree, and list widgets: QTableView, QTreeView, and QListView.
+    These standard views are suitable for displaying the most common
+    types of data structures used in applications, and can be used with
+    the ready-made models supplied with Qt:
+
+    \list
+    \o QStandardItemModel is a minimal convenience model that developers
+       can use to manage items of data.
+    \o QDirModel provides directory information for use with QListView and
+       QTreeView.
+    \o QStringListModel is a convenience model that can be used to hold
+       strings for views such as QListView and QComboBox.
+    \endlist
+
+    Two specialized abstract models are provided that can be subclassed
+    and extended (see the
+    \l{model-view-programming.html#related-examples}{Model/View Programming}
+    examples):
+
+    \list
+    \o QAbstractTableModel is a useful starting point for providing a custom
+       model that can be used with QTableView.
+    \o QAbstractListModel can be subclassed to produce a list-based model
+       for use with QListView.
+    \endlist
+
+    Operations on items, such as filtering and sorting, are handled by \e{proxy
+    models} that allow views to display processed data without having to
+    copy or modify data obtained from a source model. Interview provides
+    the QSortFilterProxyModel class to allow items of data from a source model
+    to be sorted and filtered before they are supplied to views.
+
+    Developers who are familiar with the conventional list, tree, and table
+    widgets may find QListWidget, QTreeWidget, and QTableWidget useful.
+    These present a simplified interface to the views that does not require a
+    knowledge of the underlying model/view architecture.
+
+    For details about how to use the model/view classes, see the
+    \l{Model/View Programming} document.
+
+    See also the \l{The Qt 4 Database GUI Layer}{Database GUI Layer} document
+    for information about Qt 4's database models.
+
+    \section1 Example Code
+
+    To illustrate how the Interview classes are used, we present two
+    examples that show different aspects of the model/view architecture.
+
+    \section2 Sharing a Model Between Views
+
+    In this example, we display the contents of a model using two
+    different views, and share the user's selection between
+    them. We will use the QDirModel supplied with Qt because it
+    requires very little configuration, and provides existing data to
+    the views.
+
+    The main() function for this example demonstrates all the
+    principles involved in setting up a model and two views. We also
+    share the selection between the two views:
+
+    \snippet doc/src/snippets/shareddirmodel/main.cpp 1
+
+    In the above function, we construct a directory model to display
+    the contents of a default directory. The two views are constructed
+    and given the same model to work with. By default, each view will
+    maintain and display its own selection of items from the model,
+    so we explicitly create a new selection that is shared between the
+    tree view and the list view. As a result, changes to the selection
+    in either of these views will automatically cause the selection in
+    the other to change.
+
+    \image interview-shareddirmodel.png
+
+    The model/view architecture allows us to replace the QDirModel in
+    this example with a completely different model, one that will perhaps
+    obtain data from a remote server, or from a database.
+
+    \section2 Creating a Custom Model
+
+    In this example, we display items of data obtained from a custom list
+    model using a standard view. The custom model is a subclass of
+    QAbstractListModel and provides implementations of a core set of
+    functions.
+
+    The complete declaration of our model is as follows:
+
+    \snippet doc/src/snippets/stringlistmodel/model.h 0
+    \snippet doc/src/snippets/stringlistmodel/model.h 1
+    \codeline
+    \snippet doc/src/snippets/stringlistmodel/model.h 5
+
+    The model takes a list of strings when constructed, and supplies these
+    to views as required. Since this is only a simple read-only model, we
+    only need to implement a few functions.
+
+    The underlying data structure used to hold the strings is a QStringList.
+    Since the model maps each item in the list to a row in the model, the
+    rowCount() function is quite simple:
+
+    \snippet doc/src/snippets/stringlistmodel/model.cpp 0
+
+    The data() function returns an item of data for each model index
+    supplied by a view:
+
+    \snippet doc/src/snippets/stringlistmodel/model.cpp 1
+
+    The data() function returns a QVariant containing the information
+    referred to by the model index. Items of data are returned to the view,
+    but only if a number of checks are satisfied; for example, if the view
+    specifies an invalid model index, the model indicates this by returning
+    an invalid QVariant.
+
+    Vertical and horizontal headers are supplied by the headerData()
+    function. In this model, the value returned for these items is the row
+    or column number, depending on the header:
+
+    \snippet doc/src/snippets/stringlistmodel/model.cpp 2
+
+    We only include an excerpt from the main() function for this short
+    example:
+
+    \snippet doc/src/snippets/stringlistmodel/main.cpp 1
+    \dots
+    \snippet doc/src/snippets/stringlistmodel/main.cpp 3
+
+    We create a string list to use with the model, and we supply it to the
+    model when it is constructed. The information in the string list is
+    made available to the view via the model.
+
+    \image stringlistmodel.png
+
+    This example shows that it can be easy to populate views with data
+    from a simple model. The standard models and views planned for
+    Qt 4 will make the process even easier, and the convenience widgets
+    supplied provide support for the classic item-based approach.
+
+    \section1 What's Changed Since Qt 3?
+
+    The table and item view classes in Qt 3 implemented widgets that
+    both stored data and presented it to the user. These classes were
+    designed to be easy-to-use and consistent, but were sometimes
+    difficult to customize and extend.
+
+    The equivalent classes in Qt 4 are designed to be extensible while
+    remaining easy-to-use; the introduction of the model/view
+    architecture ensures that they will be more consistent than their
+    predecessors. The view classes provided can be summarized in the
+    following way:
+
+    \list
+    \i QListView class provides a view widget that looks similar to
+       Qt 3's QListBox widget, but displays data provided by a model.
+       It can also be used to display icons in a similar way to Qt 3's
+       QIconView.
+    \i The QTableView class is a view widget that displays tabular data
+       like Qt 3's QTable widget, but uses data provided by a model.
+    \i The QTreeView class provides a view widget that behaves like
+       Qt 3's QListView widget, except that it displays data provided
+       by a model.
+    \endlist
+
+    Since the model takes responsibility for supplying items of data,
+    and the view takes care of their presentation to the user, we do
+    not require item classes to represent individual items.
+    Delegates handle the painting and editing of data obtained from
+    the model.
+
+    Qt continues to provide a number of classic item view widgets with
+    familiar item-based interfaces that are not based on compatibility
+    classes:
+
+    \list
+    \i The QListWidget class provides a widget to display a
+       list of items, as found in Qt 3's QListBox class.
+    \i The QTreeWidget class implements the equivalent of Qt 3's
+       QListView class.
+    \i The QTableWidget class provides comparable functionality to
+       Qt 3's QTable class.
+    \endlist
+
+    Each of the convenience classes have a corresponding item class:
+    QListWidgetItem, QTreeWidgetItem, and QTableWidgetItem are the Qt 4
+    equivalents of Qt 3's QListBoxItem, QListViewItem, and QTableItem
+    respectively.
+
+    The move towards a model/view architecture presents both challenges
+    and opportunities for developers. Although the approach may appear to
+    be rather powerful for simple applications, it encourages greater
+    reuse of components within applications.
+*/
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
new file mode 100644
index 0000000000..cd66c1026b
--- /dev/null
+++ b/doc/src/qt4-intro.qdoc
@@ -0,0 +1,641 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt4-intro.html
+    \title What's New in Qt 4
+
+    \startpage index.html Qt Reference Documentation
+    \nextpage The Tulip Container Classes
+
+    This document covers the most important differences between Qt 3
+    and Qt 4. Although it is not intended to be a comprehensive
+    porting guide, it tells you about the most important portability
+    issues that you may encounter. It also explains how to turn on Qt
+    3 compatibility support.
+
+    \tableofcontents
+
+    \section1 New Technologies in Qt 4
+
+    Qt 4 introduces the following core technologies:
+
+    \list
+    \o \l{The Tulip Container Classes}{Tulip}, a new set of template container classes.
+
+    \o \l{The Interview Framework}{Interview}, a model/view architecture for item views.
+
+    \o \l{The Arthur Paint System}{Arthur}, the Qt 4 painting framework.
+
+    \o \l{The Scribe Classes}{Scribe}, the Unicode text renderer with a public API
+    for performing low-level text layout.
+
+    \o \l{The Qt 4 Main Window Classes}{Mainwindow}, a modern action-based
+    mainwindow, toolbar, menu, and docking architecture.
+
+    \o The new \l{The New Qt Designer}{\QD} user interface design tool.
+    \endlist
+
+    \section1 Recent Additions to Qt 4
+
+    The following features have been added to Qt since the first release of Qt 4:
+
+    In Qt 4.4:
+    \list
+    \o \l{QtWebkit Module}{Qt WebKit integration}, making it possible for developers
+    to use a fully-featured Web browser to display documents and access online
+    services.
+    \o A multimedia API provided by the \l{Phonon Overview}{Phonon Multimedia Framework}.
+    \o \l{QtXmlPatterns Module}{XQuery and XPath} support, providing facilities for
+    XML processing beyond that supported by the QtXml module.
+    \o Support for embedded widgets in \l{Graphics View} scenes.
+    \o The \l{Threading and Concurrent Programming}{QtConcurrent framework} for
+    concurrent programming using Qt paradigms and threading features.
+    \o An \l{QtHelp Module}{improved help system} that can be used in conjunction
+    with Qt Assistant or as an independent help resource manager.
+    \o Printing system improvements, including the QPrinterInfo, QPrintPreviewWidget
+    and QPrintPreviewDialog classes.
+    \o Support for \l{Windows CE - Introduction to using Qt}{Qt for Windows CE} as
+    a mainstream Qt platform.
+    \o Improvements in performance of Qt for Embedded Linux and extended support for
+    display hardware.
+    \endlist
+
+    In Qt 4.3:
+    \list
+    \o Support for different \l{The Qt 4 Main Window Classes}{main window paradigms and styles},
+       such as those found in Visual Studio or KDevelop.
+    \o The \l{QtScript} module, providing support for application scripting with ECMAScript.
+    \o Improved graphics features, including an experimental Direct3D paint engine
+       and improved provision for hardware accelerated rendering with OpenGL, and
+       support for OpenGL ES in Qt for Embedded Linux.
+    \o \l{QSvgGenerator}{Scalable Vector Graphics (SVG) export}, allowing SVG drawings to
+       be created using the standard QPainter API.
+    \o Support for arbitrary matrix transformations and set operations on painter paths.
+    \o Native look and feel on Windows Vista; improved look and feel on Mac OS X.
+    \o An improved \l{QMdiArea}{Multiple Document Interface (MDI)} implementation.
+    \o Continuous improvements to \QD, including support for
+       \l{Qt Designer's Widget Editing Mode#The Property Editor}{dynamic properties}.
+    \o Support for Secure Socket Layer (SSL) communications via the QSslSocket class.
+    \o Support for XML Localization Interchange File Format (XLIFF) files in \QL.
+    \o A new font subsystem for Qt for Embedded Linux.
+    \endlist
+
+    In Qt 4.2:
+    \list
+    \o The \l{Graphics View} framework for producing interactive graphics.
+    \o \l{Desktop Integration}{Desktop integration} facilities for applications.
+    \o \l{Qt Style Sheets} enable easy, yet powerful customization of
+       user interfaces.
+    \o Support for the \l{intro-to-dbus.html}{D-Bus} Inter-Process Communication (IPC) and Remote Procedure Calling (RPC) mechanism.
+    \o An \l{Undo Framework}{Undo framework} based on the
+       \l{Books about GUI Design#Design Patterns}{Command pattern}.
+    \o Support for model-based \l{QCompleter}{text completion} in standard and
+       custom widgets.
+    \o New widgets and GUI features, such as QCalendarWidget and
+       QGLFramebufferObject.
+    \o Classes to provide higher level application infrastructure, such as
+       QFileSystemWatcher and QDataWidgetMapper.
+    \endlist
+
+    In Qt 4.1:
+    \list
+    \o Integrated support for rendering
+    \l{The Arthur Paint System#SVG Rendering Support}{Scalable Vector Graphics}
+    (SVG) drawings and animations.
+    \o Support for
+       \l{QWidget#Transparency and Double Buffering}{child widget transparency}
+       on all platforms.
+    \o A Portable Document Format (PDF) backend for Qt's printing system.
+    \o A \l{QTestLib Manual}{unit testing framework} for Qt applications and
+       libraries.
+    \o Modules for \l{QtDesigner}{extending \QD} and
+       \l{QtUiTools}{dynamic user interface building}.
+    \o New \l{Proxy Models}{proxy models} to enable view-specific sorting and
+       filtering of data displayed using item views.
+    \o Support for \l{Installing Qt on Mac OS X}{universal binaries} on Mac OS X.
+    \o Additional features for developers using \l{QtOpenGL}{OpenGL}, such as
+    support for pixel and sample buffers.
+    \o A flexible \l{QSyntaxHighlighter}{syntax highlighting class} based on the
+       \l{Scribe} rich text framework.
+    \o Support for \l{QNetworkProxy}{network proxy} servers using the SOCKS5
+       protocol.
+    \o Support for OLE verbs and MIME data handling in \l{ActiveQt}.
+    \endlist
+
+    For more information about improvements in the current release, see
+    the \l{http://www.qtsoftware.com/developer/changes/changes-4.1.4/}
+    {detailed list of changes}.
+
+    \section1 Significant Improvements
+
+    The following modules have been significantly improved for Qt 4:
+
+    \list
+    \o A fully cross-platform \l{accessibility}
+    module, with support for the emerging SP-API Unix standard in
+    addition to Microsoft and Mac Accessibility.
+    \o The \l{qt4-sql.html}{SQL module}, which is now based on the
+    Interview model/view framework.
+    \o The \l{qt4-network.html}{network module}, with better support
+    for UDP and synchronous sockets.
+    \o The \l{qt4-styles.html}{style API}, which is now decoupled from
+    the widgets, meaning that you can draw any user interface element on
+    any device (widget, pixmap, etc.).
+    \o Enhanced \l{qt4-threads.html}{thread support}, with signal-slot
+    connections across threads and per-thread event loops.
+    \o A new \l{resource system} for embedding images
+    and other resource files into the application executable.
+    \endlist
+
+    \section1 Build System
+
+    Unlike previous Qt releases, Qt 4 is a collection of smaller
+    libraries:
+
+    \table
+    \header \o Library          \o Description
+    \row    \o \l{QtCore}       \o Core non-GUI functionality
+    \row    \o \l{QtGui}        \o Core GUI functionality
+    \row    \o \l{QtNetwork}    \o Network module
+    \row    \o \l{QtOpenGL}     \o OpenGL module
+    \row    \o \l{QtSql}        \o SQL module
+    \row    \o \l{QtSvg}        \o SVG rendering classes
+    \row    \o \l{QtXml}        \o XML module
+    \row    \o \l{Qt3Support}   \o Qt 3 support classes
+    \row    \o \l{QAxContainer} \o ActiveQt client extension
+    \row    \o \l{QAxServer}    \o ActiveQt server extension
+    \row    \o \l{QtAssistant}  \o Classes for launching Qt Assistant
+    \row    \o \l{QtDesigner}   \o Classes for extending and embedding Qt Designer
+    \row    \o \l{QtUiTools}       \o Classes for dynamic GUI generation
+    \row    \o \l{QtTest}       \o Tool classes for unit testing
+    \endtable
+
+    QtCore contains tool classes like QString, QList, and QFile, as
+    well as kernel classes like QObject and QTimer. The QApplication
+    class has been refactored so that it can be used in non-GUI
+    applications. It is split into QCoreApplication (in \l QtCore)
+    and QApplication (in \l QtGui).
+
+    This split makes it possible to develop server applications using Qt
+    without linking in any unnecessary GUI-related code and without
+    requiring GUI-related system libraries to be present on the target
+    machine (e.g. Xlib on X11, Carbon on Mac OS X).
+
+    If you use qmake to generate your makefiles, qmake will by default
+    link your application against QtCore and QtGui. To remove the
+    dependency upon QtGui, add the line
+
+    \snippet doc/src/snippets/code/doc_src_qt4-intro.qdoc 0
+
+    to your .pro file. To enable the other libraries, add the line
+
+    \snippet doc/src/snippets/code/doc_src_qt4-intro.qdoc 1
+
+    Another change to the build system is that moc now understands
+    preprocessor directives. qmake automatically passes the defines set
+    for your project (using "DEFINES +=") on to moc, which has its own
+    built-in C++ preprocessor.
+
+    To compile code that uses .ui files, you will also need this line in
+    the .pro file:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-intro.qdoc 2
+
+    \section1 Include Syntax
+
+    The syntax for including Qt class definitions has become
+
+    \snippet doc/src/snippets/code/doc_src_qt4-intro.qdoc 3
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-intro.qdoc 4
+
+    This is guaranteed to work for any public Qt class. The old syntax,
+
+    \snippet doc/src/snippets/code/doc_src_qt4-intro.qdoc 5
+
+    still works, but we encourage you to switch to the new syntax.
+
+    If you attempt to include a header file from a library that isn't
+    linked against the application, this will result in a
+    compile-time warning (e.g., "QSqlQuery: No such file or
+    directory"). You can remedy to this problem either by removing
+    the offending include or by specifying the missing library in the
+    QT entry of your \c .pro file (see \l{Build System} above).
+
+    To include the definitions for all the classes in a library, simply
+    specify the name of that library. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-intro.qdoc 6
+
+    \section1 Namespaces
+
+    Qt 2 introduced a class called Qt for global-like constants
+    (e.g., \c{Qt::yellow}). The C++ namespace construct was not used
+    because not all compilers understood it when it was released.
+
+    With Qt 4, the Qt class has become the Qt namespace. If you want
+    to access a constant that is part of the Qt namespace, prefix it
+    with \c Qt:: (e.g., \c{Qt::yellow}), or add the directive
+
+    \snippet doc/src/snippets/code/doc_src_qt4-intro.qdoc 7
+
+    at the top of your source files, after your \c #include
+    directives. If you use the \c{using namespace} syntax you don't
+    need the prefix (e.g., \c yellow is sufficient).
+
+    When porting Qt 3 applications, you may run into some source
+    compatibility problems with some of these symbols. For example,
+    in Qt 3, it was legal to write \c QWidget::yellow instead of \c
+    Qt::yellow, because QWidget inherited from Qt. This won't work in
+    Qt 4; you must write \c Qt::yellow or add the "using namespace"
+    directive and drop the \c Qt:: prefix.
+
+    The \l{qt3to4 - The Qt 3 to 4 Porting Tool}{qt3to4} porting tool
+    automates this conversion.
+
+    \section1 QObject/QWidget Constructors
+
+    In Qt 4 we have tried to simplify the constructors of QObject/QWidget
+    subclasses. This makes subclassing easier, at the same time as it
+    helps make the Qt library more efficient.
+
+    Constructors no longer take a "const char *name" parameter. If
+    you want to specify a name for a QObject, you must call
+    QObject::setObjectName() after construction. The object name is
+    now a QString. The reasons for this change are:
+
+    \list
+    \o  Code that used it looked confusing, for example:
+
+        \snippet doc/src/snippets/code/doc_src_qt4-intro.qdoc 8
+
+        \c label1 is a QLabel that displays the text "Hello"; \c
+        label2 is a QLabel with no text, with the object name
+        "Hello".
+
+    \o  From surveys we did, most users didn't use the name, although
+        they blindly followed Qt's convention and provided a "const
+        char *name" in their subclasses's constructors. For example:
+
+        \snippet doc/src/snippets/code/doc_src_qt4-intro.qdoc 9
+
+    \o  The name parameter was in Qt since version 1, and it always
+        was documented as: "It is not very useful in the current
+        version of Qt, but it will become increasingly important in
+        the future." Ten years later, it still hasn't fulfilled its
+        promise.
+    \endlist
+
+    QWidget's \c WFlags data type has been split in two:
+    Qt::WindowFlags specifies low-level window flags (the type of
+    window and the frame style), whereas Qt::WidgetAttribute
+    specifies various higher-level attributes about the widget (e.g.,
+    WA_StaticContents). Widget attributes can be set at any time
+    using QWidget::setAttribute(); low-level window flags can be
+    passed to the QWidget constructor or set later using
+    QWidget::setParent(). As a consequence, the constructors of most
+    QWidget subclasses don't need to provide a \c WFlags parameter.
+
+    The \e parent parameter of all QObject classes in Qt defaults to
+    a 0 pointer, as it used to do in Qt 1. This enables a style of
+    programming where widgets are created without parents and then
+    inserted in a layout, at which point the layout automatically
+    reparents them.
+
+    \section1 Dynamic Casts
+
+    Qt 4 provides a qobject_cast<>() function that performs a dynamic cast
+    based on the meta-information generated by moc for QObject
+    subclasses. Unlike the standard C++ dynamic_cast<>() construct,
+    qobject_cast<>() works even when RTTI is disabled, and it works correctly
+    across DLL boundaries.
+
+    Here's the Qt 3 idiom to cast a type to a subtype:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-intro.qdoc 10
+
+    The Qt 4 idiom is both cleaner and safer, because typos will always
+    result in compiler errors:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-intro.qdoc 11
+
+    \section1 QPointer<T>
+
+    The QPointer<T> class provides a pointer to type T (where T inherits
+    from QObject) that is automatically set to 0 when the referenced
+    object is destroyed. Guarded pointers are useful whenever you want to
+    store a pointer to an object you do not own.
+
+    Example:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-intro.qdoc 12
+
+    QPointer<T> is more or less the same as the old QGuardedPtr<T> class,
+    except that it is now implemented in a much more lightweight manner
+    than before. The cost of one QPointer<T> object is now approximately
+    the same as that of a signal--slot connection.
+
+    \section1 Paint Events
+
+    Qt 4 supports double buffering transparently on all platforms. This
+    feature can be turned off on a per-widget basis by calling
+    QWidget::setAttribute(Qt::WA_PaintOnScreen).
+
+    A consequence of this is that all painting must now be done from the
+    paintEvent() function. This is also required by the HIView API on Mac
+    OS X. In practice, this is seldom a problem, since you can call
+    update() from anywhere in your code to create a paint event, with the
+    region to update as the argument.
+
+    To help porting, QWidget supports a Qt::WA_PaintOutsidePaintEvent
+    attribute that can be set to make it possible to paint outside
+    \l{QWidget::paintEvent()}{paintEvent()} on Windows and X11.
+
+    \section1 Qt 3 Support Layer
+
+    Qt 4 provides an extension library that applications based on Qt 3,
+    called Qt3Support, that Qt applications can link against. This allows
+    for more compatibility than ever before, without bloating Qt.
+
+    \list
+    \o  Classes that have been replaced by a different class with the
+        same name, such as QListView, and classes that no longer exist in Qt 4
+        are available with a \c 3 in their name (e.g., Q3ListView, Q3Accel).
+
+    \o  Other classes provide compatibility functions. Most of these are
+        implemented inline, so that they don't bloat the Qt libraries.
+    \endlist
+
+    To enable the Qt 3 support classes and functions, add the line
+
+    \snippet doc/src/snippets/code/doc_src_qt4-intro.qdoc 13
+
+    to your \c .pro file.
+
+    On Visual C++ 7 and GCC 3.2+, using compatibility functions often results
+    in a compiler warning (e.g., "'find' is deprecated"). If you want to turn
+    off that warning, add the line
+
+    \snippet doc/src/snippets/code/doc_src_qt4-intro.qdoc 14
+
+    to your \c .pro file.
+
+    If you want to use compatibility functions but don't want to link
+    against the Qt3Support library, add the line
+
+    \snippet doc/src/snippets/code/doc_src_qt4-intro.qdoc 15
+
+    or
+
+    \snippet doc/src/snippets/code/doc_src_qt4-intro.qdoc 16
+
+    to your \c .pro file, depending on whether you want compatibility
+    function calls to generate compiler warnings or not.
+*/
+
+/*!
+    \page qt4-5-intro.html
+    \title What's New in Qt 4.5
+
+    Qt 4.5 provides many improvements and enhancements over the previous releases
+    in the Qt 4 series. This document covers the most important features in this
+    release, separated by category.
+
+    A comprehensive list of changes between Qt 4.4 and Qt 4.5 is included
+    in the \c changes-4.5.0 file
+    \l{http://www.qtsoftware.com/developer/changes/changes-4.5.0}{available online}.
+    A \l{Known Issues in %VERSION%}{list of known issues} for this release is also
+    available.
+    \omit
+    Changes between this release and the previous release are provided
+    in the \c{changes-%VERSION%} file (also
+    \l{http://www.qtsoftware.com/developer/changes/changes-%VERSION%}{available online}).
+    \endomit
+
+    A list of other Qt 4 features can be found on the
+    \bold{\l{What's New in Qt 4}} page.
+
+    \bold{Highlights}
+
+    \tableofcontents
+
+    \section1 Qt WebKit Integration
+
+    \image webkit-netscape-plugin.png
+
+    The WebKit browser engine included with Qt has been upgraded to the latest
+    upstream (trunk) version of WebKit, bringing the latest features and
+    improvements to Qt applications. These include:
+
+    \list
+    \o Support for full page zooming, with appropriate rescaling of images and fonts.
+    \o The CSS-based transformation and animation features provided by a WebKit
+    extension.
+    \o Performance improvements due to faster JavaScript engine and optimized
+    page loading.
+    \endlist
+
+    Standards compatibility improvements include provision for the Netscape plugin
+    API, allowing most Netscape plugins to be used in-process, support for HTML 5
+    audio and video elements using Qt's Phonon integration, and
+    \l{Web Application Support}{facilities for client-side storage of Web content}.
+
+    \section1 Performance Improvements
+
+    The introduction of the QtBenchLib performance benchmarking library enables
+    performance benchmarking and regression testing. Core parts of Qt itself have
+    undergone focused re-engineering for improved graphics performance, including
+    paint engine and text rendering improvements, Graphics View and style sheet
+    performance improvements.
+
+    The X11 paint engine now uses XSHM (the X shared memory extension), resulting
+    in reduced overhead for painting operations.
+
+    A new OpenGL ES 2.0-based paint engine complements the existing OpenGL paint
+    engine, but with a focus on embedded devices.
+
+    Qt now features a pluggable graphics system, making it possible for users
+    and developers to select raster, OpenGL or native graphics systems to take
+    into account the specific needs of their applications and get the best
+    performance out of them.
+
+    \section1 Mac OS X Cocoa Support
+
+    \image mac-cocoa.png
+
+    Qt for Mac OS X has been substantially rewritten to use Apple's Cocoa API,
+    enabling Qt applications to be deployed on 64-bit Macintosh hardware.
+    In addition, the new QMacCocoaViewContainer and QMacNativeWidget classes
+    provide integration with Cocoa's own features and controls.
+
+    For many applications, a simple recompilation is all that is required
+    to produce an executable for 64-bit systems. Applications that use
+    specific features may require a few changes first.
+
+    \section1 Windows CE Feature Parity
+
+    Qt for Windows CE has been updated to bring features of Qt 4.4 and Qt 4.5
+    to the Windows CE platform, including:
+
+    \list
+    \o Phonon Multimedia Framework, using a Direct-Show based backend for audio
+    and video playback and a Simple WaveOut backend for devices without DirectShow.
+    \o The inclusion of Qt WebKit integration features previously unavailable for
+    Qt 4.4 on Windows CE.
+    \endlist
+
+    Support on all Windows CE platforms; recommended for WinCE 6 and higher.
+
+    The inclusion of these features enables developers to easily integrate Web and
+    multimedia content into Qt applications on Windows CE Standard Edition while
+    retaining full cross-platform compatibility with other Qt platforms.
+
+    \section1 XML Transformations with XSLT
+
+    The QtXmlPatterns module has been extended to cover XSLT, a transformation language
+    for XML documents. A common application of this is the transformation of XML data
+    into human-readable formats for reporting purposes.
+
+    XSLT makes it simple to reformat XML content without changing data structures,
+    removes the need for an intermediate DOM layer for presentation, and enables
+    rapid solutions to be created; for example, creating reports as HTML or PDF.
+
+    \section1 Qt Script Debugger
+
+    \image qtscript-debugger-small.png
+
+    Developers using Qt Script in their applications can take advantage of
+    the new \l{Qt Script Debugger Manual}{Qt Script Debugger} to provide
+    error reporting for scripts, and to let users track down bugs in their
+    own scripts.
+
+    Many standard features of GUI debugging tools are present, allowing the
+    developer to step through running script code, inspect variables,
+    automatically catch exceptions, and set conditional breakpoints.
+
+    \section1 OpenDocument File Format Support
+
+    Qt 4.5 includes support for writing rich text documents as OpenDocument files via
+    the newly-introduced QTextDocumentWriter class. This provides an generic mechanism
+    for file export that can be used to introduce support for additional formats in
+    future releases.
+
+    \section1 Improved Network Proxy Support
+
+    Qt's networking classes have been updated with
+    \l{QtNetwork Module#Support for Network Proxies}{improved proxy support}.
+    This includes improved integration with system proxy settings and the added
+    ability to handle non-trivial proxy cases.
+
+    \section1 Qt Designer Improvements
+
+    \image designer-screenshot-small.png
+
+    Qt Designer 4.5 boasts some improvements on usability, for example:
+
+    \list
+    \o  \bold{Icon Mode} for the widget box which substantially reduces
+        scrolling.
+    \o  \bold{Morphing Widgets} which lets you morph similar widget types,
+        e.g., a QWidget to a QFrame, types via the context menu's
+        \e{Morph into} entry.
+    \o  \bold{Filters} for the \gui{Property Editor} that lets you find
+        properties or widgets quickly.
+    \o  \bold{Find option} for the \gui{Object Inspector} that performs an
+        incremental search on the form's widgets. Also, the objects' layout
+        state is displayed here with using an icon on the left. Broken
+        layouts are represented with the same icon used for the
+        \e{Break Layout} action.
+    \endlist
+
+    In addition, Qt Designer now features an \gui{Embedded Design} tab that can
+    be found in the \gui Preferences dialog. Within this tab, you can define
+    embedded device profiles. These profiles contains screen settings, e.g.,
+    display resolution, default font and default style. Qt Designer will use
+    these settings when you edit forms.
+
+    More information about these improvements can be found in the
+    \l{What's New in Qt Designer 4.5} overview.
+
+    \section1 Qt Linguist Improvements
+
+    Qt Linguist can now load and edit multiple translation files simultaneously.
+
+    Support for XML Localization Interchange File Format (XLIFF) files, previously added
+    to the \c lupdate tool in Qt 4.3, has been improved and extended to the rest of the
+    Qt Linguist toolchain. This enables files stored in Qt's TS translation format to
+    be exported for use with other tools.
+
+    The GNU Gettext PO format, which is commonly used in Open Source projects,
+    is now supported by Qt Linguist.
+
+    Support for a new way to annotate messages, using comments in the source code,
+    has been added to the toolchain. See the QObject::tr() documentation for a detailed
+    description and examples.
+
+    The new \c lconvert filter tool facilitates conversion between file formats and
+    can be used to perform other transformations on collections of translatable strings.
+
+    \section1 Graphics Enhancements
+
+    In addition to the performance improvements in this release, a number of graphics
+    enhancements extend support for existing features to more platforms and expand Qt's
+    core set of features with successful add-ons.
+
+    Widget style sheets can now be used on Mac OS X, making this approach to theming
+    and styling viable for truly cross-platform applications.
+
+    Support for ARGB top-level widgets, previously available as a separate solution,
+    is now provided as an integral part of Qt. This makes it possible to create windows
+    with translucent regions on systems with the appropriate support from the user's
+    window system. See the \l{QWidget#Creating Translucent Windows}{Creating Translucent
+    Windows} section of the QWidget documentation for details of this feature.
+
+
+    \image gtk-style-screenshot.png
+
+    Improved GTK+ integration provided by the QGtkStyle class improves the look and feel
+    of Qt applications in GNOME and other GTK-based environments. The screenshot above
+    illustrates this clearly.
+*/
diff --git a/doc/src/qt4-mainwindow.qdoc b/doc/src/qt4-mainwindow.qdoc
new file mode 100644
index 0000000000..ad5aec2cc5
--- /dev/null
+++ b/doc/src/qt4-mainwindow.qdoc
@@ -0,0 +1,250 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt4-mainwindow.html
+    \title The Qt 4 Main Window Classes
+
+    \contentspage {What's New in Qt 4}{Home}
+    \previouspage The Scribe Classes
+    \nextpage The New Qt Designer
+
+    Qt 4 introduces a new set of main window classes that supersede the
+    Qt 3 main window classes, providing a more efficient implementation
+    while remaining easy to use.
+
+    \tableofcontents
+
+    \section1 Overview of the Main Window Classes
+
+    The main window-related classes have been redesigned to satisfy a
+    number of requirements, addressing issues raised by our customers and
+    internal developers. The aim of this redesign is to provide a more
+    consistent and efficient framework for main window management.
+
+    \section1 The Main Window Classes
+
+    Qt 4 provides the following classes for managing main windows and
+    associated user interface components:
+
+    \list
+    \o QMainWindow remains the central class around which applications
+       can be built. The interface to this class has been simplified, and
+       much of the functionality previously included in this class is now
+       present in the companion QDockWidget and QToolBar classes.
+
+    \o QDockWidget provides a widget that can be used to create
+       detachable tool palettes or helper windows. Dock widgets keep track
+       of their own properties, and they can be moved, closed, and floated
+       as external windows.
+
+    \o QToolBar provides a generic toolbar widget that can hold a
+       number of different action-related widgets, such as buttons,
+       drop-down menus, comboboxes, and spin boxes. The emphasis on a
+       unified action model in Qt 4 means that toolbars cooperate well
+       with menus and keyboard shortcuts.
+    \endlist
+
+    \section1 Example Code
+
+    Using QMainWindow is straightforward. Generally, we subclass
+    QMainWindow and set up menus, toolbars, and dock widgets inside
+    the QMainWindow constructor.
+
+    To add a menu bar to the main window, we simply create the menus, and
+    add them to the main window's menu bar. Note that the
+    QMainWindow::menuBar() function will automatically create the menu bar
+    the first time it is called. You can also call
+    QMainWindow::setMenuBar() to use a custom menu bar in the main window.
+
+    \snippet doc/src/snippets/code/doc_src_qt4-mainwindow.qdoc 0
+    \dots
+    \snippet examples/mainwindows/menus/mainwindow.cpp 5
+    \dots
+
+    Once actions have been created, we can add them to the main window
+    components. To begin with, we add them to the pop-up menus:
+
+    \snippet examples/mainwindows/menus/mainwindow.cpp 10
+    \dots
+    \snippet examples/mainwindows/menus/mainwindow.cpp 11
+    \dots
+
+    The QToolBar and QMenu classes use Qt's action system to provide a
+    consistent API. In the above code, some existing actions were added to
+    the file menu with the QMenu::addAction() function. QToolBar also
+    provides this function, making it easy to reuse actions in different
+    parts of the main window. This avoids unnecessary duplication of work.
+
+    We create a toolbar as a child of the main window, and add the desired
+    actions to it:
+
+    \snippet examples/mainwindows/sdi/mainwindow.cpp 0
+    \dots
+    \snippet doc/src/snippets/code/doc_src_qt4-mainwindow.qdoc 1
+
+    In this example, the toolbar is restricted to the top and bottom
+    toolbar areas of the main window, and is initially placed in the
+    top tool bar area. We can see that the actions specified by \c
+    newAct and \c openAct will be displayed both on the toolbar and in
+    the file menu.
+
+    QDockWidget is used in a similar way to QToolBar. We create a
+    dock widget as a child of the main window, and add widgets as children
+    of the dock widget:
+
+    \snippet doc/src/snippets/dockwidgets/mainwindow.cpp 0
+
+    In this example, the dock widget can only be placed in the left and
+    right dock areas, and it is initially placed in the left dock area. 
+
+    The QMainWindow API allows the programmer to customize which dock
+    widget areas occupy the four corners of the dock widget area. If
+    required, the default can be changed with the
+    QMainWindow::setCorner() function:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-mainwindow.qdoc 2
+
+    The following diagram shows the configuration produced by the above code.
+    Note that the left and right dock widgets will occupy the top and bottom
+    corners of the main window in this layout.
+
+    \image mainwindow-docks-example.png
+
+    Once all of the main window components have been set up, the central widget
+    is created and installed by using code similar to the following:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-mainwindow.qdoc 3
+
+    The central widget can be any subclass of QWidget.
+
+    \section1 What's Changed since Qt 3?
+
+    The main window classes in Qt 4 adds new functionality, mainly to
+    the dock widgets and toolbars. We have also made changes to the
+    design of the framework.
+
+    Although the QMainWindow class in Qt 3 provided support for
+    toolbars, dock widgets, and other standard user interface
+    components, its design meant that these items were managed
+    through a large number of QMainWindow member functions. In Qt 4,
+    the QMainWindow class delegates many of the management tasks to
+    QDockWidget and QToolBar (allowing more consistent behavior to be
+    defined and implemented).
+
+    The dock widget and toolbar classes are now separated into
+    independent classes. (write some more here)
+
+    (It is intended that these changes allow more consistent behavior 
+    to be defined and implemented (which? example). In
+    response to feedback from customers, we hope to improve these classes 
+    even further.)
+
+    \section2 New Functionality
+
+    Dock widgets are animated when docking or
+    detaching from a dock area. The dock areas will also adjust their
+    size to show where the dock widget will dock when it hovers over
+    it. This animation can be turned off with \c setAnimated(). 
+
+    By default, dock widgets are added to the dock areas in a single
+    row. By setting nesting enabled with \c setDockNestingEnabled(),
+    the widgets can be added both vertically and horizontally.
+
+    Two dock widgets can occupy the same space in a dock area. The user
+    can then choose which widget that is visible with a tab bar that
+    is located below the widgets. The QMainWindow::tabifyDockWidget() 
+    joins two tab widgets in such a tabbed dock area. (revise the
+    entire paragraph)
+
+    \section2 Independent QDockWidget And QToolBar Classes
+
+    Toolbar and dock window functionality is provided by two independent
+    classes: QToolBar and QDockWidget. Toolbars and dock widgets
+    reside in separate areas, with toolbars outside the dock widget
+    area. This behavior differs from the Qt 3 behavior, where
+    QToolBar inherited functionality from QDockWidget, and both types of
+    component shared the same areas. The result is a more consistent
+    and predictable experience for users. Toolbars and dock widgets
+    provide feedback while being dragged into their new positions.
+
+    \image mainwindow-docks.png
+
+    The diagram above shows the layout of a main window that contains both
+    toolbars and dock widgets. Each corner area can be used by either
+    of the adjacent dock widget areas, allowing dock widget behavior and
+    main window layout to be specified precisely.
+
+    Toolbars and dock widgets are child widgets of the main window. They
+    are no longer reparented into a dock area widget by the main window.
+    Instead, layouts are used to manage the placement of toolbars and dock
+    widgets. One consequence is that the old QDockArea class is no
+    longer required in Qt 4.
+
+    \section2 Code Change Examples
+
+    QMainWindow retains the menuBar() function, but menus are always
+    constructed using QAction objects. All kinds of menus are
+    constructed using the general QMenu class.
+
+    Qt 3:
+    \snippet doc/src/snippets/code/doc_src_qt4-mainwindow.qdoc 4
+    Qt 4:
+    \snippet doc/src/snippets/code/doc_src_qt4-mainwindow.qdoc 5
+
+    Toolbars follow the same pattern as menus, with the new, more
+    consistent behavior:
+
+    Qt 3:
+    \snippet doc/src/snippets/code/doc_src_qt4-mainwindow.qdoc 6
+    Qt 4:
+    \snippet doc/src/snippets/code/doc_src_qt4-mainwindow.qdoc 7
+
+    The behavior of dock widgets is now configured through the member
+    functions of QDockWidget. For example, compare the old and new ways
+    of creating a dock widget in the dock area on the left hand side of the
+    main window.
+
+    In Qt 3:
+    \snippet doc/src/snippets/code/doc_src_qt4-mainwindow.qdoc 8
+    In Qt 4:
+    \snippet doc/src/snippets/code/doc_src_qt4-mainwindow.qdoc 9
+*/
diff --git a/doc/src/qt4-network.qdoc b/doc/src/qt4-network.qdoc
new file mode 100644
index 0000000000..35418cc524
--- /dev/null
+++ b/doc/src/qt4-network.qdoc
@@ -0,0 +1,243 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt4-network.html
+    \title The Network Module in Qt 4
+
+    \contentspage {What's New in Qt 4}{Home}
+    \previouspage The Qt 4 Database GUI Layer
+    \nextpage The Qt 4 Style API
+
+    The network module in Qt 4 provides some new features, such as
+    support for internationalized domain names, better IPv6 support,
+    and better performance. And since Qt 4 allows us to break binary
+    compatibility with previous releases, we took this opportunity to
+    improve the class names and API to make them more intuitive to
+    use.
+
+    \tableofcontents
+
+    \section1 General Overview
+
+    Compared to Qt 3, the network module in Qt 4 brings the following
+    benefits:
+
+    \list
+    \o  The Qt 4 network classes have more intuitive names and APIs.
+        For example, QServerSocket has been renamed QTcpServer.
+    \o  The entire network module is \l{reentrant}, making it
+        possible to use them simultaneously from multiple threads.
+    \o  It is now possible to send and receive UDP datagrams and to
+        use synchronous (i.e., blocking) sockets without having to
+        use a low-level API (QSocketDevice in Qt 3).
+    \o  QHostAddress and QHostInfo support internationalized domain names
+        (RFC 3492).
+    \o  QUrl is more lightweight and fully supports the latest URI
+        specification draft.
+    \o  UDP broadcasting is now supported.
+    \endlist
+
+    The Qt 4 network module provides fundamental classes for writing
+    TCP and UDP applications, as well as higher-level classes that
+    implement the client side of the HTTP and FTP protocols.
+
+    Here's an overview of the TCP and UDP classes:
+
+    \list
+    \o  QTcpSocket encapsulates a TCP socket. It inherits from
+        QIODevice, so you can use QTextStream and QDataStream to read
+        or write data. It is useful for writing both clients and
+        servers.
+    \o  QTcpServer allows you to listen on a certain port on a
+        server. It emits a
+        \l{QTcpServer::newConnection()}{newConnection()} signal every
+        time a client tries to connect to the server. Once the
+        connection is established, you can talk to the client using
+        QTcpSocket.
+    \o  QUdpSocket is an API for sending and receiving UDP datagrams.
+    \endlist
+
+    QTcpSocket and QUdpSocket inherit most of their functionality
+    from QAbstractSocket. You can also use QAbstractSocket directly
+    as a wrapper around a native socket descriptor.
+
+    By default, the socket classes work asynchronously (i.e., they
+    are non-blocking), emitting signals to notify when data has
+    arrived or when the peer has closed the connection. In
+    multithreaded applications and in non-GUI applications, you also
+    have the opportunity of using blocking (synchronous) functions on
+    the socket, which often results in a more straightforward style
+    of programming, with the networking logic concentrated in one or
+    two functions instead of spread across multiple slots.
+
+    QFtp and QHttp use QTcpSocket internally to implement the FTP and
+    HTTP protocols. Both classes work asynchronously and can schedule
+    (i.e., queue) requests.
+
+    The network module contains four helper classes: QHostAddress,
+    QHostInfo, QUrl, and QUrlInfo. QHostAddress stores an IPv4 or IPv6
+    address, QHostInfo resolves host names into addresses, QUrl stores a
+    URL, and QUrlInfo stores information about a resource pointed to
+    by a URL, such as the file size and modification date. (Because
+    QUrl is used by QTextBrowser, it is part of the QtCore library and
+    not of QtNetwork.)
+
+    See the \l QtNetwork module overview for more information.
+
+    \section1 Example Code
+
+    All the code snippets presented here are quoted from
+    self-contained, compilable examples located in Qt's \c
+    examples/network directory.
+
+    \section2 TCP Client
+
+    The first example illustrates how to write a TCP client using
+    QTcpSocket. The client talks to a fortune server that provides
+    fortune to the user. Here's how to set up the socket:
+
+    \snippet examples/network/fortuneclient/client.cpp 1
+    \codeline
+    \snippet examples/network/fortuneclient/client.cpp 2
+    \snippet examples/network/fortuneclient/client.cpp 4
+
+    When the user requests a new fortune, the client establishes a
+    connection to the server:
+
+    \snippet examples/network/fortuneclient/client.cpp 7
+
+    When the server answers, the following code is executed to read
+    the data from the socket:
+
+    \snippet examples/network/fortuneclient/client.cpp 9
+
+    The server's answer starts with a \e size field (which we store
+    in \c blockSize), followed by \e size bytes of data. If the
+    client hasn't received all the data yet, it waits for the server
+    to send more.
+
+    An alternative approach is to use a blocking socket. The code can
+    then be concentrated in one function:
+
+    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 7
+
+    \section2 TCP Server
+
+    The following code snippets illustrate how to write a TCP server
+    using QTcpServer and QTcpSocket. Here's how to set up a TCP
+    server:
+
+    \snippet examples/network/fortuneserver/server.cpp 0
+    \codeline
+    \snippet examples/network/fortuneserver/server.cpp 3
+
+    When a client tries to connect to the server, the following code
+    in the sendFortune() slot is executed:
+
+    \snippet examples/network/fortuneserver/server.cpp 5
+
+    \section2 UDP Senders and Receivers
+
+    Here's how to broadcast a UDP datagram:
+
+    \snippet examples/network/broadcastsender/sender.cpp 0
+    \snippet examples/network/broadcastsender/sender.cpp 1
+
+    Here's how to receive a UDP datagram:
+
+    \snippet examples/network/broadcastreceiver/receiver.cpp 0
+    \codeline
+    \snippet examples/network/broadcastreceiver/receiver.cpp 1
+
+    Then in the processPendingDatagrams() slot:
+
+    \snippet examples/network/broadcastreceiver/receiver.cpp 2
+
+    \section1 Comparison with Qt 3
+
+    The main difference between Qt 3 and Qt 4 is that the very high
+    level QNetworkProtocol and QUrlOperator abstraction has been
+    eliminated. These classes attempted the impossible (unify FTP and
+    HTTP under one roof), and unsurprisingly failed at that. Qt 4
+    still provides QFtp and QHttp classes, but only with the more
+    mature API that appeared in Qt 3.1.
+
+    The QSocket class in Qt 3 has been renamed QTcpSocket. The new
+    class is reentrant and supports blocking. It's also easier to
+    handle closing than with Qt 3, where you had to connect to both
+    the QSocket::connectionClosed() and the
+    QSocket::delayedCloseFinished() signals.
+
+    The QServerSocket class in Qt 3 has been renamed QTcpServer. The
+    API has changed quite a bit. While in Qt 3 it was necessary to
+    subclass QServerSocket and reimplement the newConnection() pure
+    virtual function, QTcpServer now emits a
+    \l{QTcpServer::newConnection()}{newConnection()} signal that you
+    can connect to a slot.
+
+    The QHostInfo class has been redesigned to use the operating system's
+    getaddrinfo() function instead of implementing the DNS protocol.
+    Internally, QHostInfo simply starts a thread and calls getaddrinfo()
+    in that thread. This wasn't possible in Qt 3 because
+    getaddrinfo() is a blocking call and Qt 3 could be configured
+    without multithreading support.
+
+    The QSocketDevice class in Qt 3 is no longer part of the public
+    Qt API. If you used QSocketDevice to send or receive UDP
+    datagrams, use QUdpSocket instead. If you used QSocketDevice
+    because it supported blocking sockets, use QTcpSocket or
+    QUdpSocket instead and use the blocking functions
+    (\l{QAbstractSocket::waitForConnected()}{waitForConnected()},
+    \l{QAbstractSocket::waitForConnected()}{waitForReadyRead()},
+    etc.). If you used QSocketDevice from a non-GUI thread because it
+    was the only reentrant networking class in Qt 3, use QTcpSocket,
+    QTcpServer, or QUdpSocket instead.
+
+    Internally, Qt 4 has a class called QSocketLayer that provides a
+    cross-platform low-level socket API. It resembles the old
+    QSocketDevice class. We might make it public in a later release
+    if users ask for it.
+
+    As an aid to porting to Qt 4, the \l{Qt3Support}
+    library includes Q3Dns, Q3ServerSocket, Q3Socket, and Q3SocketDevice
+    classes.
+*/
diff --git a/doc/src/qt4-scribe.qdoc b/doc/src/qt4-scribe.qdoc
new file mode 100644
index 0000000000..5061a824e5
--- /dev/null
+++ b/doc/src/qt4-scribe.qdoc
@@ -0,0 +1,257 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt4-scribe.html
+    \title The Scribe Classes
+
+    \contentspage {What's New in Qt 4}{Home}
+    \previouspage The Arthur Paint System
+    \nextpage The Qt 4 Main Window Classes
+
+    \keyword Scribe
+
+    Scribe introduces a set of text layout classes to Qt 4. These classes
+    replace the old rich text engine found in Qt 3, and provide new features
+    for processing and laying out both plain and rich text.
+
+    \tableofcontents
+
+    For more details about how to use the Scribe classes, see the
+    \l{richtext.html}{Rich Text Processing} document.
+
+    \section1 Overview of Scribe
+
+    Support for text rendering and layout in Qt 4 has been redesigned
+    around a system that allows textual content to be represented in a more
+    flexible way than was possible with Qt 3. Qt 4 also provides a more
+    convenient programming interface for editing documents. These
+    improvements are made available through a reimplementation of the
+    existing text rendering engine, and the introduction of several new
+    classes.
+
+    The following sections provide a brief overview of the main concepts
+    behind Scribe.
+
+    \section2 The Document Interface
+
+    Text documents are represented by the QTextDocument class, rather
+    than by QString objects. Each QTextDocument object contains
+    information about the document's internal representation, its
+    structure, and keeps track of modifications to provide undo/redo
+    facilities.
+    This approach allows features such as layout management to be
+    delegated to specialized classes, but also provides a focus for the
+    framework.
+
+    Documents are either converted from external sources or created from
+    scratch using Qt. The creation process can done by an editor widget,
+    such as QTextEdit, or by explicit calls to the Scribe API.
+
+    Text documents can be accessed in two complementary ways: as a linear
+    buffer for editors to use, and as an object hierarchy that is useful to
+    layout engines. 
+    In the hierarchical document model, objects generally correspond to
+    visual elements such as frames, tables, and lists. At a lower level,
+    these elements describe properties such as the text style and alignment.
+    The linear representation of the document is used for editing and
+    manipulation of the document's contents.
+
+    \section2 Document Structure
+
+    Each document contains a root frame into which all other structural
+    elements are placed. This frame contains other structural elements,
+    including tables, text blocks, and other frames; these can be nested to
+    an arbitrary depth.
+
+    Frames provide logical separation between parts of the document, but
+    also have properties that determine how they will appear when rendered.
+    A table is a specialized type of frame that consists of a number of
+    cells, arranged into rows and columns, each of which can contain
+    further structure and text. Tables provide management and layout
+    features that allow flexible configurations of cells to be created.
+
+    Text blocks contain text fragments, each of which specifies text and
+    character format information. Textual properties are defined both at
+    the character level and at the block level. At the character level,
+    properties such as font family, text color, and font weight can be
+    specified. The block level properties control the higher level
+    appearance and behavior of the text, such as the direction of text
+    flow, alignment, and background color.
+
+    The document structure is not manipulated directly. Editing is
+    performed through a cursor-based interface.
+
+    \section2 Editing and Content Creation
+
+    Documents can be edited via the interface provided by the QTextCursor
+    class; cursors are either created using a constructor or obtained from
+    an editor widget. The cursor is used to perform editing operations that
+    correspond exactly to those the user is able to make themselves in an
+    editor. As a result, information about the document structure is also
+    available through the cursor, and this allows the structure to be
+    modified. The use of a cursor-oriented interface for editing makes the
+    process of writing a custom editor simpler for developers, since the
+    editing operations can be easily visualized.
+
+    The QTextCursor class also maintains information about any text it
+    has selected in the document, again following a model that is
+    conceptually similar to the actions made by the user to select text
+    in an editor.
+
+    \section2 Document Layout
+
+    The layout of a document is only relevant when it is to be displayed on
+    a device, or when some information is requested that requires a visual
+    representation of the document. Until this occurs, the document does
+    not need to be formatted and prepared for a device.
+
+    Each document's layout is managed by a subclass of the
+    QAbstractTextDocumentLayout class. This class provides a common
+    interface for layout and rendering engines. The default rendering
+    behavior is currently implemented in a private class. This approach
+    makes it possible to create custom layouts, and provides the
+    mechanism used when preparing pages for printing or exporting to
+    Portable Document Format (PDF) files.
+
+    \section1 Example Code
+
+    Here we present two different ways in which the Scribe classes can be
+    used: for creating and manipulating rich text, and for laying out
+    plain text.
+
+
+    \section2 Manipulating Rich Text
+
+    Rich text is stored in text documents that can either be created by
+    importing HTML from an external source, or generated using a
+    QTextCursor. The easiest way to use a rich text document is through
+    the QTextEdit class, providing an editable view onto a document. The code
+    below imports HTML into a document, and displays the document using a
+    text edit widget.
+
+    \snippet doc/src/snippets/scribe-overview/main.cpp 1
+
+    You can retrieve the document from the text edit using the
+    document() function. The document can then be edited programmatically
+    using the QTextCursor class. This class is modeled after a screen
+    cursor, and editing operations follow the same semantics. The following
+    code changes the first line of the document to a bold font, leaving all
+    other font properties untouched. The editor will be automatically
+    updated to reflect the changes made to the underlying document data.
+
+    \snippet doc/src/snippets/scribe-overview/main.cpp 0
+
+    Note that the cursor was moved from the start of the first line to the
+    end, but that it retained an anchor at the start of the line. This
+    demonstrates the cursor-based selection facilities of the
+    QTextCursor class.
+
+    Rich text can be generated very quickly using the cursor-based
+    approach. The following example shows a simple calendar in a
+    QTextEdit widget with bold headers for the days of the week:
+
+    \snippet doc/src/snippets/textdocument-blocks/mainwindow.cpp 0
+    \codeline
+    \snippet doc/src/snippets/textdocument-blocks/mainwindow.cpp 1
+    \snippet doc/src/snippets/textdocument-blocks/mainwindow.cpp 2
+    \snippet doc/src/snippets/textdocument-blocks/mainwindow.cpp 3
+
+    The above example demonstrates how simple it is to quickly generate new
+    rich text documents using a minimum amount of code. Although we have
+    generated a crude fixed-pitch calendar to avoid quoting too much code,
+    Scribe provides much more sophisticated layout and formatting features.
+
+    \section2 Plain Text Layout
+
+    Sometimes it is important to be able to format plain text within an
+    irregularly-shaped region, perhaps when rendering a custom widget, for
+    example. Scribe provides generic features, such as those provided by
+    the QTextLayout class, to help developers perform word-wrapping and
+    layout tasks without the need to create a document first.
+
+    \img plaintext-layout.png
+
+    Formatting and drawing a paragraph of plain text is straightforward.
+    The example below will lay out a paragraph of text, using a single
+    font, around the right hand edge of a circle.
+
+    \snippet doc/src/snippets/plaintextlayout/window.cpp 0
+
+    We create a text layout, specifying the text string we want to display
+    and the font to use. We ensure that the text we supplied is formatted
+    correctly by obtaining text lines from the text format, and wrapping
+    the remaining text using the available space. The lines are positioned
+    as we move down the page.
+
+    The formatted text can be drawn onto a paint device; in the above code,
+    the text is drawn directly onto a widget.
+
+    \section2 Printing Features
+
+    The layout system used to display rich text documents also supports
+    paged layout of documents, and this is used by Qt to generate output for
+    printing. The printing process is performed by QPrinter and controlled by
+    the user via options displayed in a QPrintDialog:
+
+    \snippet doc/src/snippets/textdocument-printing/mainwindow.cpp 0
+
+    Rich text documents can also be exported as PDF files using QPrinter and
+    the appropriate print engine:
+
+    \snippet demos/textedit/textedit.cpp 0
+
+    \section1 Comparison with Qt 3
+
+    The cursor-based editing features, combined with the structural document
+    model, provide a powerful set of tools for manipulating and displaying
+    rich text documents. These provide features that were unavailable in
+    Qt 3's public API. The engine used is a complete rewrite and does not
+    use the rich text engine supplied with Qt 3.
+
+    The QTextEdit class in Qt 4 has also been completely rewritten with an
+    API that is quite different from its Qt 3 counterpart. Some compatibility
+    methods have been added to allow the widget to be used, for basic cases,
+    in a way that is familiar to users of Qt 3. This class is provided as a
+    working example of an editor widget that uses the new API, showing that
+    it is possible to completely implement a document editor based on the
+    QTextCursor editing interface.
+*/
diff --git a/doc/src/qt4-sql.qdoc b/doc/src/qt4-sql.qdoc
new file mode 100644
index 0000000000..cb94f54039
--- /dev/null
+++ b/doc/src/qt4-sql.qdoc
@@ -0,0 +1,175 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt4-sql.html
+    \title The Qt 4 Database GUI Layer
+
+    \contentspage {What's New in Qt 4}{Home}
+    \previouspage Cross-Platform Accessibility Support in Qt 4
+    \nextpage The Network Module in Qt 4
+
+    The GUI layer of the SQL module in Qt 4 has been entirely
+    redesigned to work with \l{qt4-interview.html}{Interview} (Qt's
+    new model/view classes). It consists of three model classes
+    (QSqlQueryModel, QSqlTableModel, and QSqlRelationalTableModel)
+    that can be used with Qt's view classes, notably QTableView.
+
+    \section1 General Overview
+
+    The Qt 4 SQL classes are divided into three layers:
+
+    \list
+    \o The database drivers
+    \o The core SQL classes
+    \o The GUI classes
+    \endlist
+
+    The database drivers and the core SQL classes are mostly the same
+    as in Qt 3. The database item models are new with Qt 4; they
+    inherit from QAbstractItemModel and make it easy to present data
+    from a database in a view class such as QListView, QTableView,
+    and QTreeView.
+
+    The philosophy behind the Qt 4 SQL module is that it should be
+    possible to use database models for rendering and editing data
+    just like any other item models. By changing the model at
+    run-time, you can decide whether you want to store your data in
+    an SQL database or in, say, an XML file. This generic approach
+    has the additional benefit that you don't need to know anything
+    about SQL to display and edit data.
+
+    The Qt 4 SQL module includes three item models:
+
+    \list
+    \o QSqlQueryModel is a read-only model based on an arbitrary
+       SQL query.
+    \o QSqlTableModel is a read-write model that works on a single
+       table.
+    \o QSqlRelationalTableModel is a QSqlTableModel subclass with
+       foreign key support.
+    \endlist
+
+    Combined with Qt's view classes and Qt's default delegate class
+    (QItemDelegate), the models offer a very powerful mechanism for
+    accessing databases. For finer control on the rendering of the
+    fields, you can subclass one of the predefined models, or even
+    QAbstractItemDelegate or QItemDelegate if you need finer control.
+
+    You can also perform some customizations without subclassing. For
+    example, you can sort a table using QSqlTableModel::sort(), and
+    you can initialize new rows by connecting to the
+    QSqlTableModel::primeInsert() signal.
+
+    One nice feature supported by the read-write models is the
+    possibility to perform changes to the item model without
+    affecting the database until QSqlTableModel::submitAll() is
+    called. Changes can be dropped using QSqlTableModel::revertAll().
+
+    The new classes perform advantageously compared to the SQL
+    module's GUI layer in Qt 3. Speed and memory improvements in the
+    tool classes (especially QVariant, QString, and QMap) and in the
+    SQL drivers contribute to making Qt 4 database applications more
+    snappy.
+
+    See the \l QtSql module overview for a more complete introduction
+    to Qt's SQL classes.
+
+    \section1 Example Code
+
+    The simplest way to present data from a database is to simply
+    combine a QSqlQueryModel with a QTableView:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-sql.qdoc 0
+
+    To present the contents of a single table, we can use
+    QSqlTableModel instead:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-sql.qdoc 1
+
+    In practice, it's common that we need to customize the rendering
+    of a field in the database. In that case, we can create our own
+    model based on QSqlQueryModel. The next code snippet shows a
+    custom model that prepends '#' to the value in field 0 and
+    converts the value in field 2 to uppercase:
+
+    \snippet examples/sql/querymodel/customsqlmodel.h 0
+    \codeline
+    \snippet examples/sql/querymodel/customsqlmodel.cpp 0
+
+    It is also possible to subclass QSqlQueryModel to add support for
+    editing. This is done by reimplementing
+    QAbstractItemModel::flags() to specify which database fields are
+    editable and QAbstractItemModel::setData() to modify the
+    database. Here's an example of a setData() reimplementation that
+    changes the first or last name of a person:
+
+    \snippet examples/sql/querymodel/editablesqlmodel.cpp 1
+
+    It relies on helper functions called \c setFirstName() and
+    \c setLastName(), which execute an \c{update}. Here's
+    \c setFirstName():
+
+    \snippet examples/sql/querymodel/editablesqlmodel.cpp 2
+
+    See Qt's \c examples/sql directory for more examples.
+
+    \section1 Comparison with Qt 3
+
+    The core SQL database classes haven't changed so much since Qt 3.
+    Here's a list of the main changes:
+
+    \list
+    \o QSqlDatabase is now value-based instead of pointer-based.
+    \o QSqlFieldInfo and QSqlRecordInfo has been merged into
+       QSqlField and QSqlRecord.
+    \o The SQL query generation has been moved into the drivers. This
+       makes it possible to use non-standard SQL extensions. It also
+       opens the door to non-SQL databases.
+    \endlist
+
+    The GUI-related database classes have been entirely redesigned.
+    The QSqlCursor abstraction has been replaced with QSqlQueryModel
+    and QSqlTableModel; QSqlEditorFactory is replaced by
+    QAbstractItemDelegate; QDataTable is replaced by QTableView. The
+    old classes are part of the \l{Qt3Support} library to aid
+    porting to Qt 4.
+*/
diff --git a/doc/src/qt4-styles.qdoc b/doc/src/qt4-styles.qdoc
new file mode 100644
index 0000000000..7e02eccf7a
--- /dev/null
+++ b/doc/src/qt4-styles.qdoc
@@ -0,0 +1,157 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt4-styles.html
+    \title The Qt 4 Style API
+
+    \contentspage {What's New in Qt 4}{Home}
+    \previouspage The Network Module in Qt 4
+    \nextpage Thread Support in Qt 4
+
+    Qt's style API is responsible for performing the widget drawing
+    for built-in widgets. The Qt 4 style API has been revised to make
+    it possible for a style to draw widgets without calling any
+    functions on the widget.
+
+    Because Qt 4 is split across multiple libraries, Qt needed this
+    update to be able to draw widgets from other libraries than
+    QtGui. For application developers, this has other benefits, such
+    as more managable parameter lists and the possibility of drawing
+    any graphical element without having a widget of a specific
+    type.
+
+    \section1 General Overview
+
+    The QStyle class is an abstract base class that encapsulates
+    the look and feel of a GUI. Qt's built-in widgets use it to
+    perform nearly all of their drawing, ensuring that they look
+    exactly like the equivalent native widgets.  
+
+    Most draw functions now take four arguments:
+
+    \list
+    \o an enum value specifying which graphical element to draw
+    \o a QStyleOption specifying how and where to render that element
+    \o a QPainter that should be used to draw the element
+    \o a QWidget on which the drawing is performed (optional)
+    \endlist
+
+    The style gets all the information it needs to render the
+    graphical element from QStyleOption. The widget is passed as the
+    last argument in case the style needs it to perform special
+    effects (such as animated default buttons on Mac OS X), but it
+    isn't mandatory. In fact, QStyle can be used to draw on any
+    paint device, not just widgets, by setting the QPainter properly.
+
+    Thanks to QStyleOption, it is now possible to make QStyle draw
+    widgets without linking in any code for the widget. This is how
+    Qt's built-in styles can draw Qt 3 widgets such as
+    Q3ListView without necessarily linking against the Qt3Support
+    library. Another significant benefit of the new approach is that
+    it's now possible to use \l{QStyle}'s draw functions on other
+    widgets than the built-in widgets; for example, you can draw a
+    combobox on any widget, not just on a QComboBox.
+
+    QStyleOption has various subclasses for the various types of
+    graphical elements that can be drawn, and it's possible to create
+    custom subclasses. For example, the QStyle::PE_FrameFocusRect
+    element expects a QStyleOptionFocusRect argument. This is
+    documented for each enum value.
+
+    When reimplementing QStyle functions that take a
+    QStyleOption parameter, you often need to cast the
+    QStyleOption to a subclass (e.g., QStyleOptionFocusRect). For
+    safety, you can use qstyleoption_cast() to ensure that the
+    pointer type is correct. If the object isn't of the right type,
+    qstyleoption_cast() returns 0. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-styles.qdoc 0
+
+    For performance reasons, there are few member functions and the
+    access to the variables is direct. This "low-level" feel makes
+    the structures use straightforward and emphasizes that these are
+    simply parameters used by the style functions. In addition, the
+    caller of a QStyle function usually creates QStyleOption
+    objects on the stack. This combined with Qt's extensive use of
+    \l{implicit sharing} for types such as QString, QPalette, and
+    QColor ensures that no memory allocation needlessly takes place.
+    (Dynamic memory allocation can be an expensive operation,
+    especially when drawing very often in a short time.)
+
+    \section1 Example Code
+
+    The following code snippet illustrates how to use QStyle to
+    draw the focus rectangle from a custom widget's paintEvent():
+
+    \snippet doc/src/snippets/code/doc_src_qt4-styles.qdoc 1
+
+    The next example shows how to derive from an existing style to
+    customize the look of a graphical element:
+
+    \snippet doc/src/snippets/customstyle/customstyle.h 0
+    \codeline
+    \snippet doc/src/snippets/customstyle/customstyle.cpp 2
+    \snippet doc/src/snippets/customstyle/customstyle.cpp 3
+    \snippet doc/src/snippets/customstyle/customstyle.cpp 4
+
+    See also the \l{Styles Example} for a more detailed description of
+    how custom styles can be created.
+
+    \section1 Comparison with Qt 3
+
+    The QStyle class has a similar API in Qt 4 as in Qt 3, with
+    more or less the same functions. What has changed is the
+    signature of the functions and the role played by QStyleOption.
+    For example, here's the signature of the QStyle::drawControl()
+    function in Qt 3:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-styles.qdoc 2
+
+    Here's the signature of the same function in Qt 4:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-styles.qdoc 3
+
+    In Qt 3, some of the information required to draw a graphical
+    element was stored in a QStyleOption parameter, while the rest
+    was deduced by querying the widget. In Qt 4, everything is stored
+    in the QStyleOption parameter.
+*/
diff --git a/doc/src/qt4-threads.qdoc b/doc/src/qt4-threads.qdoc
new file mode 100644
index 0000000000..5239bba800
--- /dev/null
+++ b/doc/src/qt4-threads.qdoc
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt4-threads.html
+    \title Thread Support in Qt 4
+
+    \contentspage {What's New in Qt 4}{Home}
+    \previouspage The Qt 4 Style API
+
+    Qt 4 makes it easier than ever to write multithreaded
+    applications. More classes have been made usable from non-GUI
+    threads, and the signals and slots mechanism can now be used to
+    communicate between threads.
+
+    \section1 General Overview
+
+    QThread now inherits QObject. It emits signals to indicate that
+    the thread started or finished executing, and provides a few
+    slots as well.
+
+    Each thread can now have its own event loop. The initial thread
+    starts its event loops using QCoreApplication::exec(); other
+    threads can start an event loop using QThread::exec(). Like
+    QCoreApplication, QThread also provides an
+    \l{QThread::exit()}{exit(int)} function and a
+    \l{QThread::quit()}{quit()} slot.
+
+    An event loop in a thread makes it possible for the thread to use
+    certain non-GUI Qt classes that require the presence of an event
+    loop (such as QTimer, QTcpSocket, and QProcess). It also makes it
+    possible to connect signals from any threads to slots of a
+    specific thread. When a signal is emitted, the slot isn't called
+    immediately; instead, it is invoked when control returns to the
+    event loop of the thread to which the object belongs. The slot is
+    executed in the thread where the receiver object lives. See
+    QObject::connect() for details.
+
+    Qt 4 also introduces a new synchronization class: QReadWriteLock.
+    It is similar to QMutex, except that it distinguishes between
+    "read" and "write" access to shared data and allows multiple
+    readers to access the data simultaneously. Using QReadWriteLock
+    instead of QMutex when it is possible can make multithreaded
+    programs more concurrent.
+
+    Since Qt 4, \l{implicitly shared} classes can safely be copied
+    across threads, like any other value classes. They are fully
+    reentrant. This is implemented using atomic reference counting
+    operations, which are implemented in assembly language for the
+    different platforms supported by Qt. Atomic reference counting is
+    very fast, much faster than using a mutex.
+
+    See \l{Thread Support in Qt} for more information.
+
+    \section1 Comparison with Qt 3
+
+    Earlier versions of Qt offered an option to build the library
+    without thread support. In Qt 4, threads are always enabled.
+
+    Qt 3 had a class called \c QDeepCopy that you could use to take a
+    deep copy of an implicitly shared object. In Qt 4, the atomic
+    reference counting makes this class superfluous.
+*/
diff --git a/doc/src/qt4-tulip.qdoc b/doc/src/qt4-tulip.qdoc
new file mode 100644
index 0000000000..d1f925e821
--- /dev/null
+++ b/doc/src/qt4-tulip.qdoc
@@ -0,0 +1,200 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt4-tulip.html
+    \title The Tulip Container Classes
+
+    \contentspage {What's New in Qt 4}{Home}
+    \previouspage What's New in Qt 4
+    \nextpage The Interview Framework
+
+    Qt 4 introduces a new set of containers that supersede both the old
+    QCollection pointer-based containers and the newer QTL value-based
+    containers.
+
+    \tableofcontents
+
+    \section1 General Overview
+
+    The Tulip containers are similar to Qt 3's QTL containers
+    (QValueList, QValueVector, QMap), but have the following
+    advantages:
+
+    \list
+    \o The containers provide new iterators with a nicer, less
+       error-prone syntax than STL, inspired by Java's iterators. (The
+       STL-style iterators are still available as a lightweight,
+       STL-compatible alternative.)
+
+    \o The containers have been optimized for minimal code expansion.
+
+    \o An empty container performs no memory allocation, and only
+       requires the same space as a pointer.
+
+    \o Even though they are implicitly shared, they can safely be copied
+       across different threads without formality. There's no need to use
+       \c QDeepCopy.
+    \endlist
+
+    Tulip provides the following sequential containers: QList,
+    QLinkedList, QVector, QStack, and QQueue. For most
+    applications, QList is the best type to use. Although it is
+    implemented as an array-list, it provides very fast prepends and
+    appends. If you really need a linked-list, use QLinkedList; if you
+    want your items to occupy consecutive memory locations, use QVector.
+    QStack and QQueue are convenience classes that provide LIFO and
+    FIFO semantics.
+
+    Tulip also provides these associative containers: QMap,
+    QMultiMap, QHash, QMultiHash, and QSet. The "Multi" containers
+    conveniently support multiple values associated with a single
+    key. The "Hash" containers provide faster lookup by using a hash
+    function instead of a binary search on a sorted set.
+
+    The Tulip containers support the \l foreach keyword, a Qt-specific
+    addition to the C++ language that is implemented using the standard
+    C++ preprocessor. The syntax is:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 0
+
+    Example:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 1
+
+    The iterator variable can also be defined outside the loop. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 2
+
+    Just like standard \c for loops, foreach supports braces, \c
+    break, \c continue, and nested loops. Qt makes a copy of the
+    container when it enters the loop. If you modify the container as
+    you are iterating, that won't affect the loop.
+
+    For details about the new containers, see the
+    \l{Generic Containers} and \l{Generic Algorithms} overview documents.
+
+    In addition to the new containers, considerable work has also gone into
+    QByteArray and QString. The Qt 3 QCString class has been
+    merged with QByteArray. The new QByteArray automatically provides
+    a '\0' terminator after the last character. For example, the byte array
+    of size 5 containing "abcde" has a null byte at position 5 (one past
+    the end). This solves all the typical problems that occurred in Qt 3
+    with conversions between QByteArray and QCString.
+
+    To avoid crashes, QByteArray::data() never returns a null
+    pointer. Furthermore, the distinction between null and empty
+    strings has been watered down so that \c{QByteArray() ==
+    QByteArray("")} and \c{QString() == QString("")}.
+
+    \section1 Examples
+
+    The first group of examples show how to use the new Java-style
+    iterators. The main difference between the Java-style iterators and the
+    STL-style iterators is that the Java-style ones point between items (or
+    before the first item, or after the last item), whereas the STL ones
+    point at an item (or past the last item). One advantage of the
+    Java-style iterators is that iterating forward and backward are
+    symmetric operations.
+
+    Traversing a container using a Java-style iterator:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 3
+
+    Modifying items using a Java-style iterator:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 4
+
+    Removing items using a Java-style iterator:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 5
+
+    Iterating over items with a particular value using STL-style vs.
+    Java-style iterators:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 6
+
+    Modifying and removing items using STL-style vs. Java-style
+    iterators:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 7
+
+    The next group of examples show the API of the container classes
+    themselves. The API is similar to the QTL classes of Qt 3, but is nicer
+    in many respects.
+
+    Iterating over a QList using an index (which is fast even for large
+    lists, because QList is implemented as an array-list):
+
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 8
+
+    Retrieving a value from a map, using a default value if the key
+    doesn't exist:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 9
+
+    Getting all the values for a particular key in a QMultiMap or QMultiHash:
+
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 10
+
+    \section1 Comparison with Qt 3
+
+    Tulip containers are value based. If you want to store a list where
+    each item is a QWidget *, use QList<QWidget *>.
+
+    The new containers do not support auto-delete. In practice, we
+    discovered that the only case where auto-delete proved worthwhile was
+    when the data really should be stored as a value rather than as a
+    pointer (e.g., QList<int> rather than QList<int *>). If you need
+    to delete all the items in a container, use qDeleteAll().
+
+    If you use QValueList in Qt 3, you can replace it with either
+    QList or QLinkedList in Qt 4. In most cases, QList is the best
+    choice: It is typically faster, results in less code in your
+    executable, and requires less memory. However, QLinkedList's
+    iterators provide stronger guarantees, and only QLinkedList provides
+    constant-time insertions in the middle, which can make a difference for
+    lists with thousands of items.
+
+    If you use QValueVector or QMap in Qt 3, the corresponding Qt 4
+    classes (QVector, QMap) are very similar to use.
+*/
diff --git a/doc/src/qtassistant.qdoc b/doc/src/qtassistant.qdoc
new file mode 100644
index 0000000000..6be92fac40
--- /dev/null
+++ b/doc/src/qtassistant.qdoc
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \module QtAssistant
+    \title QtAssistant Module
+    \contentspage Qt's Modules
+    \previouspage QtHelp
+    \nextpage QtTest
+    \ingroup modules
+
+    \brief The QtAssistant module provides a means of launching \QA
+    to provide online help.
+
+    \sa {Qt Assistant Manual}
+*/
diff --git a/doc/src/qtcocoa-known-issues.qdoc b/doc/src/qtcocoa-known-issues.qdoc
new file mode 100644
index 0000000000..eedbd687ed
--- /dev/null
+++ b/doc/src/qtcocoa-known-issues.qdoc
@@ -0,0 +1,168 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qtcocoa-known-issues.html
+    \title Known Issues with the Qt/Mac Cocoa Port
+
+    This document explains the current list of features in the Qt/Mac Cocoa port
+    that are currently not working. Most of the issues will be addressed in
+    upcoming snapshots and beta releases. We hope that all the issues should be
+    addressed by the time the of the final 4.5.0 release.
+
+    \tableofcontents
+
+    \section1 What Works
+    
+    Here are the things that we can say about the current state of the Qt/Mac Cocoa port.
+
+    \list
+    \i \e{64-bit Support}:
+    The Qt libraries currently do build and link as 64-bit frameworks and it is
+    possible to build and run many of the Qt examples as 64-bit.
+
+    \i \e{HIViews are now NSViews}:
+    Every QWidget is now backed by an NSView pointer instead of an HIViewRef.
+    QWidget::winId() will return an NSView pointer that can be used in other
+    Cocoa technologies (e.g., Core Animation).
+
+    \i \e{Some Native Dialogs Work}:
+    QFileDialog and QColorDialog have been ported to use NSOpen-/NSSavePanel and
+    NSColorPanel respectively. QPrintDialog and QPageSetupDialog are not in
+    this release, but are on their way. Currently, none of these dialogs show
+    up as sheets pending the creation of an asynchronous API.
+
+    \i \e{Painting, Printing, and Styles}:
+    Since printing and painting used Quartz 2D and styling used HITheme, these
+    sub-systems work without any changes.
+
+    \i \e {OpenGL}:
+    OpenGL is fully supported,including pixel buffers and framebuffer objects.
+
+    \i \e{Clipboard}:
+    Using QClipboard to copy and paste data works as expected.
+
+    \i \e{Mouse, Keyboard, and Wheel events}:
+    Mouse, keyboard, and wheel events are dispatched to the proper
+    widget. The Qt/Mac Cocoa port respects Cocoa's idea of a "First
+    Responder."
+
+    \endlist
+
+    \section1 Current Known Issues
+
+    The following are items that don't currently work, but that we plan to have
+    resolved before the final release of the Qt/Mac Cocoa port. Please do not
+    file bugs on these. 
+
+    \list
+    \i \e{Carbon Support}:
+    The current source tree for the Qt/Mac Cocoa port contains source for
+    building Qt/Mac with Cocoa. It contains some of the source code that is
+    used for the Carbon port, but it is currently not set up to build the
+    Carbon Qt/Mac libraries. Please use a normal release or snapshot if you
+    want to use Carbon.
+
+    \i \e{Drag and Drop Support}:
+    Drag and Drop is currently not implemented and needs to be ported to Cocoa,
+    but using the clipboard does work at this time.
+
+    \i \e {Accessibility}:
+    Accessibility support is not implemented and needs to be ported to Cocoa.
+
+    \i \e {Text}:
+    Most text rendering works fine for Latin-1 characters. However, rendering
+    non-Latin-1 characters has not been tested.
+
+    \i \e {Input Methods}:
+    Input methods also need to be ported to Cocoa.
+
+    \i \e {Shortcuts}:
+    Shortcuts that exist outside of the menu bar may not be dispatched.
+
+    \i \e {Tablet Support}:
+    The tablet support has not been ported from Carbon yet. However, it should
+    still be possible to use the tablet as a mouse.
+
+    \i \e {Phonon}:
+    Phonon uses the QuickTime backend that is only available on 32-bit. Using
+    Phonon in 64-bit requires a QTKit-based backend and has not been done.
+
+    \i \e {Unified Toolbar}:
+    The QMainWindow::setUnifiedTitleAndToolBarOnMac() method currently does nothing.
+
+    \i \e {Dialogs, Tool Windows, Sheets, and Drawers}:
+    At the moment, all windows are subclasses of NSWindow. This means that
+    window types like drawers and sheets do not work and tool windows do not
+    get the right decorations. Modal dialogs do show up at the correct window
+    level, but are not yet considered "panels." Many window flags are not
+    recognized.
+
+    \endlist
+
+    \section1 Things We Don't Expect to Support
+
+    The following items that we do not plan on spending any resources on unless
+    there is monumental outcry for their inclusion.
+
+    \list 
+    \i \e{Qt3Support}:
+    At this time we have no plans for making the Qt3Support module work with
+    the Qt/Mac Cocoa port in 64-bit mode. Following in footsteps of Apple, we
+    would like to encourage you to consider the time of going Cocoa and 64-bit
+    as a chance to jettison Qt 3 constructs and classes.
+
+    \i \e{Support for versions of Mac OS X below 10.5}:
+    We are using methods and classes that are only available in 10.5 and
+    higher. Most of these functions don't have any equivalent on earlier
+    versions. We recommend using the Carbon version for earlier versions of Mac
+    OS X. We anticipate keeping the Carbon port supported at least for the
+    lifetime of 4.5.
+
+    \i \e{Support for -no-framework or -static}:
+    Cocoa requires that we load a nib in order to properly access the global
+    menu bar. This nib has to reside on disk somewhere. The most logical place
+    for it to reside is inside the QtGui framework. For this reason, building
+    Qt as standard "dylibs" or statically is no longer supported.
+
+    \endlist
+
+*/
diff --git a/doc/src/qtconfig.qdoc b/doc/src/qtconfig.qdoc
new file mode 100644
index 0000000000..f515aa3de1
--- /dev/null
+++ b/doc/src/qtconfig.qdoc
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qtconfig.html
+    \title Configuring Qt
+    \ingroup qttools
+    \keyword qtconfig
+
+    The \c qtconfig tool allows users to customize the default settings for
+    Qt applications on a per-user basis, enabling features such as the widget
+    style to be changed without requiring applications to be recompiled.
+
+    \c qtconfig is available on X11 platforms and should be installed alongside
+    the \l{Qt's Tools}{other tools} supplied with Qt.
+
+    \image qtconfig-appearance.png
+*/
diff --git a/doc/src/qtcore.qdoc b/doc/src/qtcore.qdoc
new file mode 100644
index 0000000000..71a29b7227
--- /dev/null
+++ b/doc/src/qtcore.qdoc
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \module QtCore
+    \title QtCore Module
+    \contentspage Qt's Modules
+    \previouspage Qt's Modules
+    \nextpage QtGui
+    \ingroup modules
+
+    \keyword QtCore
+
+    \brief The QtCore module contains core non-GUI functionality.
+
+    All other Qt modules rely on this module. To include the
+    definitions of the module's classes, use the following directive:
+
+    \snippet doc/src/snippets/code/doc_src_qtcore.qdoc 0
+
+    The QtCore module is part of all \l{Qt editions}.
+*/
diff --git a/doc/src/qtdbus.qdoc b/doc/src/qtdbus.qdoc
new file mode 100644
index 0000000000..37217e924d
--- /dev/null
+++ b/doc/src/qtdbus.qdoc
@@ -0,0 +1,124 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/** -*- mode: C++ -*-
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \module QtDBus
+    \title QtDBus module
+    \contentspage Qt's Modules
+    \previouspage QAxServer
+    \ingroup modules
+
+    \keyword QtDBus
+    \target The QDBus compiler
+
+    \brief The QtDBus module is a Unix-only library that you can use
+    to make Inter-Process Communication using the \l {Introduction to
+    D-Bus} {D-Bus} protocol.
+
+    Applications using the QtDBus module can provide services to
+    other, remote applications by exporting objects, as well as use
+    services exported by those applications by placing calls and
+    accessing properties.
+
+    The QtDBus module provides an interface that extends the Qt \l
+    {signalsandslots.html}{Signals and Slots} mechanism, allowing one
+    to connect to a signal emitted remotely as well as to connect a
+    local signal to remote slot.
+
+    To use this module, use the following code in your application:
+
+    \snippet doc/src/snippets/code/doc_src_qtdbus.qdoc 0
+
+    If you're using qmake to build your application, you can add this
+    line to your .pro file to make it link against the QtDBus
+    libraries:
+
+    \snippet doc/src/snippets/code/doc_src_qtdbus.qdoc 1
+
+    \note The source code for this module is located in the \c{src/qdbus}
+    directory. When installing Qt from source, this module is built when Qt's
+    tools are built.
+
+    See the \l {Introduction to D-Bus} page for detailed information on
+    how to use this module.
+
+    This module is part of all \l{Qt editions}.
+*/
diff --git a/doc/src/qtdemo.qdoc b/doc/src/qtdemo.qdoc
new file mode 100644
index 0000000000..7e23f6dd09
--- /dev/null
+++ b/doc/src/qtdemo.qdoc
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \page qtdemo.html
+  \title Examples and Demos Launcher
+  \ingroup qttools
+  \keyword qtdemo
+
+  The Examples and Demos Launcher (\c qtdemo) allows the user to browse the
+  examples and demonstrations included with Qt, access the documentation
+  associated with each of them, and launch them as separate applications.
+
+  \image qtdemo.png
+
+  The \c qtdemo executable should be installed alongside the
+  \l{Qt's Tools}{other tools} supplied with Qt.
+
+  \list
+  \i On Windows, click the Start button, open the \e Programs submenu, open
+  the \e{Qt 4} submenu, and click \e{Examples and Demos}.
+  \i On Unix or Linux, you may find a \c qtdemo icon on the desktop background or
+  in the desktop start menu under the \e Programming or \e Development
+  submenus. You can launch this application from this icon. Alternatively, you can
+  enter \c qtdemo in a terminal window.
+  \i On Mac OS X, navigate to the \c /Developer/Applications/Qt directory in the
+  Finder and double click on the \c qtdemo.app icon.
+  \endlist
+*/
diff --git a/doc/src/qtdesigner.qdoc b/doc/src/qtdesigner.qdoc
new file mode 100644
index 0000000000..7e3b619031
--- /dev/null
+++ b/doc/src/qtdesigner.qdoc
@@ -0,0 +1,1541 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \module QtDesigner
+    \title QtDesigner Module
+    \contentspage Qt's Modules
+    \previouspage Qt3Support
+    \nextpage QtUiTools
+    \ingroup modules
+
+    \brief The QtDesigner module provides classes that allow you to
+    create your own custom widget plugins for Qt Designer, and classes
+    that enable you to access Qt Designer's components.
+
+    In addition, the QFormBuilder class provides the possibility of
+    constructing user interfaces from \c .ui files at run-time.
+
+    To include the definitions of the module's classes, use the
+    following directive:
+
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 0
+
+    To link against the module, add this line to your \c qmake .pro
+    file:
+
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 1
+
+    \note These classes are part of the \l{Open Source Versions of Qt} and
+    \l{Qt Commercial Editions}{Qt Full Framework Edition} for commercial
+    users.
+
+    \tableofcontents
+
+    \section1 Creating Custom Widget Plugins
+
+    When implementing a custom widget plugin for \QD, you must
+    subclass QDesignerCustomWidgetInterface to expose your custom
+    widget to \QD. A single custom widget plugin is built as a
+    separate library. If you want to include several custom widget
+    plugins in the same library, you must in addition subclass
+    QDesignerCustomWidgetCollectionInterface.
+
+    To provide your custom widget plugin with the expected behavior
+    and functionality within \QD's workspace you can subclass the
+    associated extension classes:
+
+    The QDesignerContainerExtension class allows you to add pages to a
+    custom multi-page container. The QDesignerTaskMenuExtension class
+    allows you to add custom menu entries to \QD's task menu. The
+    QDesignerMemberSheetExtension class allows you to manipulate a
+    widget's member functions which is displayed when configuring
+    connections using \QD's mode for editing signals and slots. And
+    finally, the QDesignerPropertySheetExtension class allows you to
+    manipulate a widget's properties which is displayed in \QD's
+    property editor.
+
+    \image qtdesignerextensions.png
+
+    In \QD the extensions are not created until they are required. For
+    that reason, when implementing extensions, you must also subclass
+    QExtensionFactory, i.e create a class that is able to make
+    instances of your extensions. In addition, you must make \QD's
+    extension manager register your factory; the extension manager
+    controls the construction of extensions as they are required, and
+    you can access it through QDesignerFormEditorInterface and
+    QExtensionManager.
+
+    For a complete example creating a custom widget plugin with an
+    extension, see the \l {designer/taskmenuextension}{Task Menu
+    Extension} or \l {designer/containerextension}{Container
+    Extension} examples.
+
+    \section1 Retrieving Access to \QD Components
+
+    The purpose of the classes mentioned in this section is to provide
+    access to \QD's components, managers and workspace, and they are
+    not intended to be instantiated directly.
+
+    \QD is composed by several components. It has an action editor, a
+    property editor, widget box and object inspector which you can
+    view in its workspace.
+
+    \image qtdesignerscreenshot.png
+
+    \QD also has an object that works behind the scene; it contains
+    the logic that integrates all of \QD's components into a coherent
+    application. You can access this object, using the
+    QDesignerFormEditorInterface, to retrieve interfaces to \QD's
+    components:
+
+    \list
+    \o QDesignerActionEditorInterface
+    \o QDesignerObjectInspectorInterface
+    \o QDesignerPropertyEditorInterface
+    \o QDesignerWidgetBoxInterface
+    \endlist
+
+    In addition, you can use QDesignerFormEditorInterface to retrieve
+    interfaces to \QD's extension manager (QExtensionManager) and form
+    window manager (QDesignerFormWindowManagerInterface). The
+    extension manager controls the construction of extensions as they
+    are required, while the form window manager controls the form
+    windows appearing in \QD's workspace.
+
+    Once you have an interface to \QD's form window manager
+    (QDesignerFormWindowManagerInterface), you also have access to all
+    the form windows currently appearing in \QD's workspace: The
+    QDesignerFormWindowInterface class allows you to query and
+    manipulate the form windows, and it provides an interface to the
+    form windows' cursors. QDesignerFormWindowCursorInterface is a
+    convenience class allowing you to query and modify a given form
+    window's widget selection, and in addition modify the properties
+    of all the form's widgets.
+
+    \section1 Creating User Interfaces at Run-Time
+
+    The \c QtDesigner module contains the QFormBuilder class that
+    provides a mechanism for dynamically creating user interfaces at
+    run-time, based on \c .ui files created with \QD. This class is
+    typically used by custom components and applications that embed
+    \QD. Standalone applications that need to dynamically generate
+    user interfaces at run-time use the QUiLoader class, found in
+    the QtUiTools module.
+
+    For a complete example using QUiLoader, see
+    the \l {designer/calculatorbuilder}{Calculator Builder example}.
+
+    \sa {Qt Designer Manual}, {QtUiTools Module}
+*/
+
+/*!
+    \class QDesignerMemberSheetExtension
+
+    \brief The QDesignerMemberSheetExtension class allows you to
+    manipulate a widget's member functions which is displayed when
+    configuring connections using Qt Designer's mode for editing
+    signals and slots.
+
+    \inmodule QtDesigner
+
+    QDesignerMemberSheetExtension is a collection of functions that is
+    typically used to query a widget's member functions, and to
+    manipulate the member functions' appearance in \QD's signals and
+    slots editing mode. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 2
+
+    When implementing a custom widget plugin, a pointer to \QD's
+    current QDesignerFormEditorInterface object (\c formEditor in the
+    example above) is provided by the
+    QDesignerCustomWidgetInterface::initialize() function's parameter.
+
+    The member sheet (and any other extension), can be retrieved by
+    querying \QD's extension manager using the qt_extension()
+    function. When you want to release the extension, you only need to
+    delete the pointer.
+
+    All widgets have a default member sheet used in \QD's signals and
+    slots editing mode with the widget's member functions. But
+    QDesignerMemberSheetExtension also provides an interface for
+    creating custom member sheet extensions.
+
+    \warning \QD uses the QDesignerMemberSheetExtension to facilitate
+    the signal and slot editing mode. Whenever a connection between
+    two widgets is requested, \QD will query for the widgets' member
+    sheet extensions. If a widget has an implemented member sheet
+    extension, this extension will override the default member sheet.
+
+    To create a member sheet extension, your extension class must
+    inherit from both QObject and QDesignerMemberSheetExtension. Then,
+    since we are implementing an interface, we must ensure that it's
+    made known to the meta object system using the Q_INTERFACES()
+    macro:
+
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 3
+
+    This enables \QD to use qobject_cast() to query for
+    supported interfaces using nothing but a QObject pointer.
+
+    In \QD the extensions are not created until they are
+    required. For that reason, when implementing a member sheet
+    extension, you must also create a QExtensionFactory, i.e a class
+    that is able to make an instance of your extension, and register
+    it using \QD's \l {QExtensionManager}{extension manager}.
+
+    When a widget's member sheet extension is required, \QD's \l
+    {QExtensionManager}{extension manager} will run through all its
+    registered factories calling QExtensionFactory::createExtension()
+    for each until the first one that is able to create a member sheet
+    extension for that widget, is found. This factory will then make
+    an instance of the extension. If no such factory is found, \QD
+    will use the default member sheet.
+
+    There are four available types of extensions in \QD:
+    QDesignerContainerExtension, QDesignerMemberSheetExtension,
+    QDesignerPropertySheetExtension and
+    QDesignerTaskMenuExtension. \QD's behavior is the same whether the
+    requested extension is associated with a multi page container, a
+    member sheet, a property sheet or a task menu.
+
+    The QExtensionFactory class provides a standard extension
+    factory, and can also be used as an interface for custom
+    extension factories. You can either create a new
+    QExtensionFactory and reimplement the
+    QExtensionFactory::createExtension() function. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 4
+
+    Or you can use an existing factory, expanding the
+    QExtensionFactory::createExtension() function to make the factory
+    able to create a member sheet extension as well. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 5
+
+    For a complete example using an extension class, see \l
+    {designer/taskmenuextension}{Task Menu Extension example}. The
+    example shows how to create a custom widget plugin for Qt
+    Designer, and how to to use the QDesignerTaskMenuExtension class
+    to add custom items to \QD's task menu.
+
+    \sa QExtensionFactory, QExtensionManager, {Creating Custom Widget
+    Extensions}
+*/
+
+/*!
+    \fn QDesignerMemberSheetExtension::~QDesignerMemberSheetExtension()
+
+    Destroys the member sheet extension.
+*/
+
+/*!
+    \fn int QDesignerMemberSheetExtension::count() const
+
+    Returns the extension's number of member functions.
+*/
+
+/*!
+    \fn int QDesignerMemberSheetExtension::indexOf(const QString &name) const
+
+    Returns the index of the member function specified by the given \a
+    name.
+
+    \sa memberName()
+*/
+
+/*!
+    \fn QString QDesignerMemberSheetExtension::memberName(int index) const
+
+    Returns the name of the member function with the given \a index.
+
+    \sa indexOf()
+*/
+
+/*!
+    \fn QString QDesignerMemberSheetExtension::memberGroup(int index) const
+
+    Returns the name of the member group specified for the function
+    with the given \a index.
+
+    \sa indexOf(), setMemberGroup()
+*/
+
+/*!
+    \fn void QDesignerMemberSheetExtension::setMemberGroup(int index, const QString &group)
+
+    Sets the member group of the member function with the given \a
+    index, to \a group.
+
+    \sa indexOf(), memberGroup()
+*/
+
+/*!
+    \fn bool QDesignerMemberSheetExtension::isVisible(int index) const
+
+    Returns true if the member function with the given \a index is
+    visible in \QD's signal and slot editor, otherwise false.
+
+    \sa indexOf(), setVisible()
+*/
+
+/*!
+    \fn void QDesignerMemberSheetExtension::setVisible(int index, bool visible)
+
+    If \a visible is true, the member function with the given \a index
+    is visible in \QD's signals and slots editing mode; otherwise the
+    member function is hidden.
+
+    \sa indexOf(), isVisible()
+*/
+
+/*!
+    \fn virtual bool QDesignerMemberSheetExtension::isSignal(int index) const
+
+    Returns true if the member function with the given \a index is a
+    signal, otherwise false.
+
+    \sa indexOf()
+*/
+
+/*!
+    \fn bool QDesignerMemberSheetExtension::isSlot(int index) const
+
+    Returns true if the member function with the given \a index is a
+    slot, otherwise false.
+
+    \sa indexOf()
+*/
+
+/*!
+    \fn bool QDesignerMemberSheetExtension::inheritedFromWidget(int index) const
+
+    Returns true if the member function with the given \a index is
+    inherited from QWidget, otherwise false.
+
+    \sa indexOf()
+*/
+
+/*!
+    \fn QString QDesignerMemberSheetExtension::declaredInClass(int index) const
+
+    Returns the name of the class in which the member function with
+    the given \a index is declared.
+
+    \sa indexOf()
+*/
+
+/*!
+    \fn QString QDesignerMemberSheetExtension::signature(int index) const
+
+    Returns the signature of the member function with the given \a
+    index.
+
+    \sa indexOf()
+*/
+
+/*!
+    \fn QList<QByteArray> QDesignerMemberSheetExtension::parameterTypes(int index) const
+
+    Returns the parameter types of the member function with the given
+    \a index, as a QByteArray list.
+
+    \sa indexOf(), parameterNames()
+*/
+
+/*!
+    \fn QList<QByteArray> QDesignerMemberSheetExtension::parameterNames(int index) const
+
+    Returns the parameter names of the member function with the given
+    \a index, as a QByteArray list.
+
+    \sa indexOf(), parameterTypes()
+*/
+
+
+// Doc: Interface only
+
+/*!
+    \class QDesignerLayoutDecorationExtension
+    \brief The QDesignerLayoutDecorationExtension class provides an extension to a layout in \QD.
+    \inmodule QtDesigner
+    \internal
+*/
+
+/*!
+    \enum QDesignerLayoutDecorationExtension::InsertMode
+
+    This enum describes the modes that are used to insert items into a layout.
+
+    \value InsertWidgetMode Widgets are inserted into empty cells in a layout.
+    \value InsertRowMode    Whole rows are inserted into a vertical or grid layout.
+    \value InsertColumnMode Whole columns are inserted into a horizontal or grid layout.
+*/
+
+/*!
+    \fn virtual QDesignerLayoutDecorationExtension::~QDesignerLayoutDecorationExtension()
+
+    Destroys the extension.
+*/
+
+/*!
+    \fn virtual QList<QWidget*> QDesignerLayoutDecorationExtension::widgets(QLayout *layout) const
+
+    Returns the widgets that are managed by the given \a layout.
+
+    \sa insertWidget(), removeWidget()
+*/
+
+/*!
+    \fn QRect QDesignerLayoutDecorationExtension::itemInfo(int index) const
+
+    Returns the rectangle covered by the item at the given \a index in the layout.
+*/
+
+/*!
+    \fn int QDesignerLayoutDecorationExtension::indexOf(QWidget *widget) const
+
+    Returns the index of the specified \a widget in the layout.
+*/
+
+/*!
+    \fn int QDesignerLayoutDecorationExtension::indexOf(QLayoutItem *item) const
+
+    Returns the index of the specified layout \a item.
+*/
+
+/*!
+    \fn QDesignerLayoutDecorationExtension::InsertMode QDesignerLayoutDecorationExtension::currentInsertMode() const
+
+    Returns the current insertion mode.
+*/
+
+/*!
+    \fn int QDesignerLayoutDecorationExtension::currentIndex() const
+
+    Returns the current index in the layout.
+*/
+
+/*!
+    \fn QPair<int, int> QDesignerLayoutDecorationExtension::currentCell() const
+
+    Returns a pair containing the row and column of the current cell in the layout.
+*/
+
+/*!
+    \fn void QDesignerLayoutDecorationExtension::insertWidget(QWidget *widget, const QPair<int, int> &cell)
+
+    Inserts the given \a widget into the specified \a cell in the layout.
+
+    \sa removeWidget()
+*/
+
+/*!
+    \fn void QDesignerLayoutDecorationExtension::removeWidget(QWidget *widget)
+
+    Removes the specified \a widget from the layout.
+
+    \sa insertWidget()
+*/
+
+/*!
+    \fn void QDesignerLayoutDecorationExtension::insertRow(int row)
+
+    Inserts a new row into the form at the position specified by \a row.
+*/
+
+/*!
+    \fn void QDesignerLayoutDecorationExtension::insertColumn(int column)
+
+    Inserts a new column into the form at the position specified by \a column.
+*/
+
+/*!
+    \fn void QDesignerLayoutDecorationExtension::simplify()
+
+    Simplifies the layout by removing unnecessary empty rows and columns, and by changing the
+    number of rows or columns spanned by widgets.
+*/
+
+/*!
+    \fn int QDesignerLayoutDecorationExtension::findItemAt(const QPoint &position) const
+
+    Returns the index of the item in the layout that covers the given \a position.
+*/
+
+/*!
+    \fn int QDesignerLayoutDecorationExtension::findItemAt(int row, int column) const
+
+    Returns the item in the layout that occupies the specified \a row and \a column in the layout.
+
+    Currently, this only applies to grid layouts.
+*/
+
+/*!
+    \fn void QDesignerLayoutDecorationExtension::adjustIndicator(const QPoint &position, int index)
+
+    Adjusts the indicator for the item specified by \a index so that
+    it lies at the given \a position on the form.
+*/
+
+
+// Doc: Interface only
+
+/*!
+    \class QDesignerContainerExtension
+    \brief The QDesignerContainerExtension class allows you to add pages to
+    a custom multi-page container in Qt Designer's workspace.
+    \inmodule QtDesigner
+
+    QDesignerContainerExtension provide an interface for creating
+    custom container extensions. A container extension consists of a
+    collection of functions that \QD needs to manage a multi-page
+    container plugin, and a list of the container's pages.
+
+    \image containerextension-example.png
+
+    \warning This is \e not an extension for container plugins in
+    general, only custom \e multi-page containers.
+
+    To create a container extension, your extension class must inherit
+    from both QObject and QDesignerContainerExtension. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 6
+
+    Since we are implementing an interface, we must ensure that it's
+    made known to the meta object system using the Q_INTERFACES()
+    macro. This enables \QD to use the qobject_cast() function to
+    query for supported interfaces using nothing but a QObject
+    pointer.
+
+    You must reimplement several functions to enable \QD to manage a
+    custom multi-page container widget: \QD uses count() to keep track
+    of the number pages in your container, widget() to return the page
+    at a given index in the list of the container's pages, and
+    currentIndex() to return the list index of the selected page. \QD
+    uses the addWidget() function to add a given page to the
+    container, expecting it to be appended to the list of pages, while
+    it expects the insertWidget() function to add a given page to the
+    container by inserting it at a given index.
+
+    In \QD the extensions are not created until they are
+    required. For that reason you must also create a
+    QExtensionFactory, i.e a class that is able to make an instance of
+    your extension, and register it using \QD's \l
+    {QExtensionManager}{extension manager}.
+
+    When a container extension is required, \QD's \l
+    {QExtensionManager}{extension manager} will run through all its
+    registered factories calling QExtensionFactory::createExtension()
+    for each until the first one that is able to create a container
+    extension, is found. This factory will then create the extension
+    for the plugin.
+
+    There are four available types of extensions in \QD:
+    QDesignerContainerExtension , QDesignerMemberSheetExtension,
+    QDesignerPropertySheetExtension and QDesignerTaskMenuExtension.
+    \QD's behavior is the same whether the requested extension is
+    associated with a multi page container, a member sheet, a property
+    sheet or a task menu.
+
+    The QExtensionFactory class provides a standard extension factory,
+    and can also be used as an interface for custom extension
+    factories. You can either create a new QExtensionFactory and
+    reimplement the QExtensionFactory::createExtension() function. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 7
+
+    Or you can use an existing factory, expanding the
+    QExtensionFactory::createExtension() function to make the factory
+    able to create a container extension as well. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 8
+
+    For a complete example using the QDesignerContainerExtension
+    class, see the \l {designer/containerextension}{Container
+    Extension example}. The example shows how to create a custom
+    multi-page plugin for \QD.
+
+    \sa QExtensionFactory, QExtensionManager, {Creating Custom Widget
+    Extensions}
+*/
+
+/*!
+    \fn QDesignerContainerExtension::~QDesignerContainerExtension()
+
+    Destroys the extension.
+*/
+
+/*!
+    \fn int QDesignerContainerExtension::count() const
+
+    Returns the number of pages in the container.
+*/
+
+/*!
+    \fn QWidget *QDesignerContainerExtension::widget(int index) const
+
+    Returns the page at the given \a index in the extension's list of
+    pages.
+
+    \sa addWidget(), insertWidget()
+*/
+
+/*!
+    \fn int QDesignerContainerExtension::currentIndex() const
+
+    Returns the index of the currently selected page in the
+    container.
+
+    \sa setCurrentIndex()
+*/
+
+/*!
+    \fn void QDesignerContainerExtension::setCurrentIndex(int index)
+
+    Sets the the currently selected page in the container to be the
+    page at the given \a index in the extension's list of pages.
+
+    \sa currentIndex()
+*/
+
+/*!
+    \fn void QDesignerContainerExtension::addWidget(QWidget *page)
+
+    Adds the given \a page to the container by appending it to the
+    extension's list of pages.
+
+    \sa insertWidget(), remove(), widget()
+*/
+
+/*!
+    \fn void QDesignerContainerExtension::insertWidget(int index, QWidget *page)
+
+    Adds the given \a page to the container by inserting it at the
+    given \a index in the extension's list of pages.
+
+    \sa addWidget(), remove(), widget()
+*/
+
+/*!
+    \fn void QDesignerContainerExtension::remove(int index)
+
+    Removes the page at the given \a index from the extension's list
+    of pages.
+
+    \sa addWidget(), insertWidget()
+*/
+
+
+// Doc: Interface only
+
+/*!
+    \class QDesignerTaskMenuExtension
+    \brief The QDesignerTaskMenuExtension class allows you to add custom
+    menu entries to Qt Designer's task menu.
+    \inmodule QtDesigner
+
+    QDesignerTaskMenuExtension provides an interface for creating
+    custom task menu extensions. It is typically used to create task
+    menu entries that are specific to a plugin in \QD.
+
+    \QD uses the QDesignerTaskMenuExtension to feed its task
+    menu. Whenever a task menu is requested, \QD will query
+    for the selected widget's task menu extension.
+
+    \image taskmenuextension-example-faded.png
+
+    A task menu extension is a collection of QActions. The actions
+    appear as entries in the task menu when the plugin with the
+    specified extension is selected. The image above shows the custom
+    \gui {Edit State...} action which appears in addition to \QD's
+    default task menu entries: \gui Cut, \gui Copy, \gui Paste etc.
+
+    To create a custom task menu extension, your extension class must
+    inherit from both QObject and QDesignerTaskMenuExtension. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 9
+
+    Since we are implementing an interface, we must ensure that it
+    is made known to the meta-object system using the Q_INTERFACES()
+    macro. This enables \QD to use the qobject_cast() function to
+    query for supported interfaces using nothing but a QObject
+    pointer.
+
+    You must reimplement the taskActions() function to return a list
+    of actions that will be included in \QD task menu. Optionally, you
+    can reimplement the preferredEditAction() function to set the
+    action that is invoked when selecting your plugin and pressing
+    \key F2. The preferred edit action must be one of the actions
+    returned by taskActions() and, if it's not defined, pressing the
+    \key F2 key will simply be ignored.
+
+    In \QD, extensions are not created until they are required. A
+    task menu extension, for example, is created when you click the
+    right mouse button over a widget in \QD's workspace. For that
+    reason you must also construct an extension factory, using either
+    QExtensionFactory or a subclass, and register it using \QD's
+    \l {QExtensionManager}{extension manager}.
+
+    When a task menu extension is required, \QD's \l
+    {QExtensionManager}{extension manager} will run through all its
+    registered factories calling QExtensionFactory::createExtension()
+    for each until it finds one that is able to create a task menu
+    extension for the selected widget. This factory will then make an
+    instance of the extension.
+
+    There are four available types of extensions in \QD:
+    QDesignerContainerExtension, QDesignerMemberSheetExtension,
+    QDesignerPropertySheetExtension, and QDesignerTaskMenuExtension.
+    \QD's behavior is the same whether the requested extension is
+    associated with a container, a member sheet, a property sheet or a
+    task menu.
+
+    The QExtensionFactory class provides a standard extension factory,
+    and can also be used as an interface for custom extension
+    factories. You can either create a new QExtensionFactory and
+    reimplement the QExtensionFactory::createExtension() function. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 10
+
+    Or you can use an existing factory, expanding the
+    QExtensionFactory::createExtension() function to make the factory
+    able to create a task menu extension as well. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 11
+
+    For a complete example using the QDesignerTaskMenuExtension class,
+    see the \l {designer/taskmenuextension}{Task Menu Extension
+    example}. The example shows how to create a custom widget plugin
+    for \QD, and how to to use the QDesignerTaskMenuExtension
+    class to add custom items to \QD's task menu.
+
+    \sa QExtensionFactory, QExtensionManager, {Creating Custom Widget
+    Extensions}
+*/
+
+/*!
+    \fn QDesignerTaskMenuExtension::~QDesignerTaskMenuExtension()
+
+    Destroys the task menu extension.
+*/
+
+/*!
+    \fn QAction *QDesignerTaskMenuExtension::preferredEditAction() const
+
+    Returns the action that is invoked when selecting a plugin with
+    the specified extension and pressing \key F2.
+
+    The action must be one of the actions returned by taskActions().
+*/
+
+/*!
+    \fn QList<QAction*> QDesignerTaskMenuExtension::taskActions() const
+
+    Returns the task menu extension as a list of actions which will be
+    included in \QD's task menu when a plugin with the specified
+    extension is selected.
+
+    The function must be reimplemented to add actions to the list.
+*/
+
+
+// Doc: Interface only
+
+/*!
+    \class QDesignerCustomWidgetCollectionInterface
+
+    \brief The QDesignerCustomWidgetCollectionInterface class allows
+    you to include several custom widgets in one single library.
+
+    \inmodule QtDesigner
+
+    When implementing a custom widget plugin, you build it as a
+    separate library. If you want to include several custom widget
+    plugins in the same library, you must in addition subclass
+    QDesignerCustomWidgetCollectionInterface.
+
+    QDesignerCustomWidgetCollectionInterface contains one single
+    function returning a list of the collection's
+    QDesignerCustomWidgetInterface objects. For example, if you have
+    several custom widgets \c CustomWidgetOne, \c CustomWidgetTwo and
+    \c CustomWidgetThree, the class definition may look like this:
+
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 12
+
+    In the class constructor you add the interfaces to your custom
+    widgets to the list which you return in the customWidgets()
+    function:
+
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 13
+
+    Note that instead of exporting each custom widget plugin using the
+    Q_EXPORT_PLUGIN2() macro, you export the entire collection. The
+    Q_EXPORT_PLUGIN2() macro ensures that \QD can access and construct
+    the custom widgets. Without this macro, there is no way for \QD to
+    use them.
+
+    \sa QDesignerCustomWidgetInterface, {Creating Custom Widgets for
+    Qt Designer}
+*/
+
+/*!
+    \fn QDesignerCustomWidgetCollectionInterface::~QDesignerCustomWidgetCollectionInterface() {
+
+    Destroys the custom widget collection interface.
+*/
+
+/*!
+    \fn QList<QDesignerCustomWidgetInterface*> QDesignerCustomWidgetCollectionInterface::customWidgets() const
+
+    Returns a list of interfaces to the collection's custom widgets.
+*/
+
+
+// Doc: Interface only
+
+/*!
+    \class QDesignerCustomWidgetInterface
+
+    \brief The QDesignerCustomWidgetInterface class enables Qt Designer
+    to access and construct custom widgets.
+
+    \inmodule QtDesigner
+
+    QDesignerCustomWidgetInterface provides a custom widget with an
+    interface. The class contains a set of functions that must be subclassed
+    to return basic information about the widget, such as its class name and
+    the name of its header file. Other functions must be implemented to
+    initialize the plugin when it is loaded, and to construct instances of
+    the custom widget for \QD to use.
+
+    When implementing a custom widget you must subclass
+    QDesignerCustomWidgetInterface to expose your widget to \QD. For
+    example, this is the declaration for the plugin used in the
+    \l{Custom Widget Plugin Example}{Custom Widget Plugin example} that
+    enables an analog clock custom widget to be used by \QD:
+
+    \snippet examples/designer/customwidgetplugin/customwidgetplugin.h 0
+
+    Note that the only part of the class definition that is specific
+    to this particular custom widget is the class name. In addition,
+    since we are implementing an interface, we must ensure that it's
+    made known to the meta object system using the Q_INTERFACES()
+    macro. This enables \QD to use the qobject_cast() function to
+    query for supported interfaces using nothing but a QObject
+    pointer.
+
+    After \QD loads a custom widget plugin, it calls the interface's
+    initialize() function to enable it to set up any resources that it
+    may need. This function is called with a QDesignerFormEditorInterface
+    parameter that provides the plugin with a gateway to all of \QD's API.
+
+    \QD constructs instances of the custom widget by calling the plugin's
+    createWidget() function with a suitable parent widget. Plugins must
+    construct and return an instance of a custom widget with the specified
+    parent widget. 
+
+    In the implementation of the class you must remember to export
+    your custom widget plugin to \QD using the Q_EXPORT_PLUGIN2()
+    macro. For example, if a library called \c libcustomwidgetplugin.so
+    (on Unix) or \c libcustomwidget.dll (on Windows) contains a widget
+    class called \c MyCustomWidget, we can export it by adding the
+    following line to the file containing the plugin implementation:
+
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 14
+
+    This macro ensures that \QD can access and construct the custom widget.
+    Without this macro, there is no way for \QD to use it.
+
+    When implementing a custom widget plugin, you build it as a
+    separate library. If you want to include several custom widget
+    plugins in the same library, you must in addition subclass
+    QDesignerCustomWidgetCollectionInterface.
+
+    \warning If your custom widget plugin contains QVariant
+    properties, be aware that only the following \l
+    {QVariant::Type}{types} are supported:
+
+    \list
+    \o QVariant::ByteArray
+    \o QVariant::Bool
+    \o QVariant::Color
+    \o QVariant::Cursor
+    \o QVariant::Date
+    \o QVariant::DateTime
+    \o QVariant::Double
+    \o QVariant::Int
+    \o QVariant::Point
+    \o QVariant::Rect
+    \o QVariant::Size
+    \o QVariant::SizePolicy
+    \o QVariant::String
+    \o QVariant::Time
+    \o QVariant::UInt
+    \endlist
+
+    For a complete example using the QDesignerCustomWidgetInterface
+    class, see the \l {designer/customwidgetplugin}{Custom Widget
+    Example}. The example shows how to create a custom widget plugin
+    for \QD.
+
+    \sa QDesignerCustomWidgetCollectionInterface {Creating Custom
+    Widgets for Qt Designer}
+*/
+
+/*!
+    \fn QDesignerCustomWidgetInterface::~QDesignerCustomWidgetInterface()
+
+    Destroys the custom widget interface.
+*/
+
+/*!
+    \fn QString QDesignerCustomWidgetInterface::name() const
+
+    Returns the class name of the custom widget supplied by the interface.
+
+    The name returned \e must be identical to the class name used for the
+    custom widget.
+*/
+
+/*!
+    \fn QString QDesignerCustomWidgetInterface::group() const
+
+    Returns the name of the group to which the custom widget belongs.
+*/
+
+/*!
+    \fn QString QDesignerCustomWidgetInterface::toolTip() const
+
+    Returns a short description of the widget that can be used by \QD
+    in a tool tip.
+*/
+
+/*!
+    \fn QString QDesignerCustomWidgetInterface::whatsThis() const
+
+    Returns a description of the widget that can be used by \QD in
+    "What's This?" help for the widget.
+*/
+
+/*!
+    \fn QString QDesignerCustomWidgetInterface::includeFile() const
+
+    Returns the path to the include file that \l uic uses when
+    creating code for the custom widget.
+*/
+
+/*!
+    \fn QIcon QDesignerCustomWidgetInterface::icon() const
+
+    Returns the icon used to represent the custom widget in \QD's
+    widget box.
+*/
+
+/*!
+    \fn bool QDesignerCustomWidgetInterface::isContainer() const
+
+    Returns true if the custom widget is intended to be used as a
+    container; otherwise returns false.
+
+    Most custom widgets are not used to hold other widgets, so their
+    implementations of this function will return false, but custom
+    containers will return true to ensure that they behave correctly
+    in \QD.
+*/
+
+/*!
+    \fn QWidget *QDesignerCustomWidgetInterface::createWidget(QWidget *parent)
+
+    Returns a new instance of the custom widget, with the given \a
+    parent.
+*/
+
+/*!
+    \fn bool QDesignerCustomWidgetInterface::isInitialized() const
+
+    Returns true if the widget has been initialized; otherwise returns
+    false.
+
+    \sa initialize()
+*/
+
+/*!
+    \fn void QDesignerCustomWidgetInterface::initialize(QDesignerFormEditorInterface *formEditor)
+
+    Initializes the widget for use with the specified \a formEditor
+    interface.
+
+    \sa isInitialized()
+*/
+
+/*!
+    \fn QString QDesignerCustomWidgetInterface::domXml() const
+
+    Returns the XML that is used to describe the custom widget's
+    properties to \QD.
+*/
+
+/*!
+    \fn QString QDesignerCustomWidgetInterface::codeTemplate() const
+
+    This function is reserved for future use by \QD.
+
+    \omit
+    Returns the code template that \QD includes in forms that contain
+    the custom widget when they are saved.
+    \endomit
+*/
+
+/*!
+    \macro QDESIGNER_WIDGET_EXPORT
+    \relates QDesignerCustomWidgetInterface
+    \since 4.1
+
+    This macro is used when defining custom widgets to ensure that they are
+    correctly exported from plugins for use with \QD.
+
+    On some platforms, the symbols required by \QD to create new widgets
+    are removed from plugins by the build system, making them unusable.
+    Using this macro ensures that the symbols are retained on those platforms,
+    and has no side effects on other platforms.
+
+    For example, the \l{designer/worldtimeclockplugin}{World Time Clock Plugin}
+    example exports a custom widget class with the following declaration:
+
+    \snippet examples/designer/worldtimeclockplugin/worldtimeclock.h 0
+    \dots
+    \snippet examples/designer/worldtimeclockplugin/worldtimeclock.h 2
+
+    \sa {Creating Custom Widgets for Qt Designer}
+*/
+
+
+// Doc: Abstract class
+
+/*!
+    \class QDesignerDnDItemInterface
+    \brief The QDesignerDnDItemInterface class provides an interface that is used to manage items
+    during a drag and drop operation.
+    \inmodule QtDesigner
+    \internal
+*/
+
+/*!
+    \enum QDesignerDnDItemInterface::DropType
+
+    This enum describes the result of a drag and drop operation.
+
+    \value MoveDrop The item was moved.
+    \value CopyDrop The item was copied.
+*/
+
+/*!
+    \fn QDesignerDnDItemInterface::QDesignerDnDItemInterface()
+
+    Constructs a new interface to a drag and drop item.
+*/
+
+/*!
+    \fn QDesignerDnDItemInterface::~QDesignerDnDItemInterface()
+
+    Destroys the interface to the item.
+*/
+
+/*!
+    \fn DomUI *QDesignerDnDItemInterface::domUi() const
+
+    Returns a user interface object for the item.
+*/
+
+/*!
+    \fn QWidget *QDesignerDnDItemInterface::widget() const
+
+    Returns the widget being copied or moved in the drag and drop operation.
+
+    \sa source()
+*/
+
+/*!
+    \fn QWidget *QDesignerDnDItemInterface::decoration() const
+
+    Returns the widget used to represent the item.
+*/
+
+/*!
+    \fn QPoint QDesignerDnDItemInterface::hotSpot() const
+
+    Returns the cursor's hotspot.
+
+    \sa QDrag::hotSpot()
+*/
+
+/*!
+    \fn DropType QDesignerDnDItemInterface::type() const
+
+    Returns the type of drag and drop operation in progress.
+*/
+
+/*!
+    \fn QWidget *QDesignerDnDItemInterface::source() const
+
+    Returns the widget that is the source of the drag and drop operation; i.e. the original
+    container of the widget being dragged.
+
+    \sa widget()
+*/
+
+
+// Doc: Abstract class
+
+/*!
+    \class QDesignerIconCacheInterface
+    \brief The QDesignerIconCacheInterface class provides an interface to \QD's icon cache.
+    \inmodule QtDesigner
+    \internal
+*/
+
+/*!
+    \fn QDesignerIconCacheInterface::QDesignerIconCacheInterface(QObject *parent)
+
+    Constructs a new interface with the given \a parent.
+*/
+
+/*!
+    \fn QIcon QDesignerIconCacheInterface::nameToIcon(const QString &filePath, const QString &qrcPath)
+
+    Returns the icon associated with the name specified by \a filePath in the resource
+    file specified by \a qrcPath.
+
+    If \a qrcPath refers to a valid resource file, the name used for the file path is a path
+    within those resources; otherwise the file path refers to a local file.
+
+    \sa {The Qt Resource System}, nameToPixmap()
+*/
+
+/*!
+    \fn QPixmap QDesignerIconCacheInterface::nameToPixmap(const QString &filePath, const QString &qrcPath)
+
+    Returns the pixmap associated with the name specified by \a filePath in the resource
+    file specified by \a qrcPath.
+
+    If \a qrcPath refers to a valid resource file, the name used for the file path is a path
+    within those resources; otherwise the file path refers to a local file.
+
+    \sa {The Qt Resource System}, nameToIcon()
+*/
+
+/*!
+    \fn QString QDesignerIconCacheInterface::iconToFilePath(const QIcon &icon) const
+
+    Returns the file path associated with the given \a icon. The file path is a path within
+    an application resources.
+*/
+
+/*!
+    \fn QString QDesignerIconCacheInterface::iconToQrcPath(const QIcon &icon) const
+
+    Returns the path to the resource file that refers to the specified \a icon. The resource
+    path refers to a local file.
+*/
+
+/*!
+    \fn QString QDesignerIconCacheInterface::pixmapToFilePath(const QPixmap &pixmap) const
+
+    Returns the file path associated with the given \a pixmap. The file path is a path within
+    an application resources.
+*/
+
+/*!
+    \fn QString QDesignerIconCacheInterface::pixmapToQrcPath(const QPixmap &pixmap) const
+
+    Returns the path to the resource file that refers to the specified \a pixmap. The resource
+    path refers to a local file.
+*/
+
+/*!
+    \fn QList<QPixmap> QDesignerIconCacheInterface::pixmapList() const
+
+    Returns a list of pixmaps for the icons provided by the icon cache.
+*/
+
+/*!
+    \fn QList<QIcon> QDesignerIconCacheInterface::iconList() const
+
+    Returns a list of icons provided by the icon cache.
+*/
+
+/*!
+    \fn QString QDesignerIconCacheInterface::resolveQrcPath(const QString &filePath, const QString &qrcPath, const QString &workingDirectory) const
+
+    Returns a path to a resource specified by the \a filePath within
+    the resource file located at \a qrcPath. If \a workingDirectory is
+    a valid path to a directory, the path returned will be relative to
+    that directory; otherwise an absolute path is returned.
+
+    \omit
+    ### Needs checking
+    \endomit
+*/
+
+
+// Doc: Interface only
+
+/*!
+    \class QDesignerPropertySheetExtension
+
+    \brief The QDesignerPropertySheetExtension class allows you to
+    manipulate a widget's properties which is displayed in Qt
+    Designer's property editor.
+
+    \sa QDesignerDynamicPropertySheetExtension
+
+    \inmodule QtDesigner
+
+    QDesignerPropertySheetExtension provides a collection of functions that
+    are typically used to query a widget's properties, and to
+    manipulate the properties' appearance in the property editor. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 15
+
+    Note that if you change the value of a property using the
+    QDesignerPropertySheetExtension::setProperty() function, the undo
+    stack is not updated. To ensure that a property's value can be
+    reverted using the undo stack, you must use the
+    QDesignerFormWindowCursorInterface::setProperty() function, or its
+    buddy \l
+    {QDesignerFormWindowCursorInterface::setWidgetProperty()}{setWidgetProperty()},
+    instead.
+
+    When implementing a custom widget plugin, a pointer to \QD's
+    current QDesignerFormEditorInterface object (\c formEditor in the
+    example above) is provided by the
+    QDesignerCustomWidgetInterface::initialize() function's parameter.
+
+    The property sheet, or any other extension, can be retrieved by
+    querying \QD's extension manager using the qt_extension()
+    function. When you want to release the extension, you only need to
+    delete the pointer.
+
+    All widgets have a default property sheet which populates \QD's
+    property editor with the widget's properties (i.e the ones defined
+    with the Q_PROPERTY() macro). But QDesignerPropertySheetExtension
+    also provides an interface for creating custom property sheet
+    extensions.
+
+    \warning \QD uses the QDesignerPropertySheetExtension to feed its
+    property editor. Whenever a widget is selected in its workspace,
+    \QD will query for the widget's property sheet extension. If the
+    selected widget has an implemented property sheet extension, this
+    extension will override the default property sheet.
+
+    To create a property sheet extension, your extension class must
+    inherit from both QObject and
+    QDesignerPropertySheetExtension. Then, since we are implementing
+    an interface, we must ensure that it's made known to the meta
+    object system using the Q_INTERFACES() macro:
+
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 16
+
+    This enables \QD to use qobject_cast() to query for supported
+    interfaces using nothing but a QObject pointer.
+
+    In \QD the extensions are not created until they are
+    required. For that reason, when implementing a property sheet
+    extension, you must also create a QExtensionFactory, i.e a class
+    that is able to make an instance of your extension, and register
+    it using \QD's \l {QExtensionManager}{extension manager}.
+
+    When a property sheet extension is required, \QD's \l
+    {QExtensionManager}{extension manager} will run through all its
+    registered factories calling QExtensionFactory::createExtension()
+    for each until the first one that is able to create a property
+    sheet extension for the selected widget, is found. This factory
+    will then make an instance of the extension. If no such factory
+    can be found, \QD will use the default property sheet.
+
+    There are four available types of extensions in \QD:
+    QDesignerContainerExtension, QDesignerMemberSheetExtension,
+    QDesignerPropertySheetExtension and QDesignerTaskMenuExtension. Qt
+    Designer's behavior is the same whether the requested extension is
+    associated with a multi page container, a member sheet, a property
+    sheet or a task menu.
+
+    The QExtensionFactory class provides a standard extension factory,
+    and can also be used as an interface for custom extension
+    factories. You can either create a new QExtensionFactory and
+    reimplement the QExtensionFactory::createExtension() function. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 17
+
+    Or you can use an existing factory, expanding the
+    QExtensionFactory::createExtension() function to make the factory
+    able to create a property sheet extension extension as well. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 18
+
+    For a complete example using an extension class, see the \l
+    {designer/taskmenuextension}{Task Menu Extension example}. The
+    example shows how to create a custom widget plugin for Qt
+    Designer, and how to to use the QDesignerTaskMenuExtension class
+    to add custom items to \QD's task menu.
+
+    \sa QExtensionFactory, QExtensionManager, {Creating Custom Widget
+    Extensions}
+*/
+
+/*!
+    \fn QDesignerPropertySheetExtension::~QDesignerPropertySheetExtension()
+
+    Destroys the property sheet extension.
+*/
+
+/*!
+    \fn int QDesignerPropertySheetExtension::count() const
+
+    Returns the selected widget's number of properties.
+*/
+
+/*!
+    \fn int QDesignerPropertySheetExtension::indexOf(const QString &name) const
+
+    Returns the index for a given property \a name.
+
+    \sa propertyName()
+*/
+
+/*!
+    \fn QString QDesignerPropertySheetExtension::propertyName(int index) const
+
+    Returns the name of the property at the given \a index.
+
+    \sa indexOf()
+*/
+
+/*!
+    \fn QString QDesignerPropertySheetExtension::propertyGroup(int index) const
+
+    Returns the property group for the property at the given \a index.
+
+    \QD's property editor supports property groups, i.e. sections of
+    related properties. A property can be related to a group using the
+    setPropertyGroup() function. The default group of any property is
+    the name of the class that defines it. For example, the
+    QObject::objectName property appears within the QObject property
+    group.
+
+    \sa indexOf(), setPropertyGroup()
+*/
+
+/*!
+    \fn void QDesignerPropertySheetExtension::setPropertyGroup(int index, const QString &group)
+
+    Sets the property group for the property at the given \a index to
+    \a group.
+
+    Relating a property to a group makes it appear within that group's
+    section in the property editor. The default property group of any
+    property is the name of the class that defines it. For example,
+    the QObject::objectName property appears within the QObject
+    property group.
+
+    \sa indexOf(), property(), propertyGroup()
+*/
+
+/*!
+    \fn bool QDesignerPropertySheetExtension::hasReset(int index) const
+
+    Returns true if the property at the given \a index has a reset
+    button in \QD's property editor, otherwise false.
+
+    \sa indexOf(), reset()
+*/
+
+/*!
+    \fn bool QDesignerPropertySheetExtension::reset(int index)
+
+    Resets the value of the property at the given \a index, to the
+    default value. Returns true if a default value could be found, otherwise false.
+
+    \sa indexOf(), hasReset(), isChanged()
+*/
+
+/*!
+    \fn bool QDesignerPropertySheetExtension::isVisible(int index) const
+
+    Returns true if the property at the given \a index is visible in
+    \QD's property editor, otherwise false.
+
+    \sa indexOf(), setVisible()
+*/
+
+/*!
+    \fn void QDesignerPropertySheetExtension::setVisible(int index, bool visible)
+
+    If \a visible is true, the property at the given \a index is
+    visible in \QD's property editor; otherwise the property is
+    hidden.
+
+    \sa indexOf(), isVisible()
+*/
+
+/*!
+    \fn bool QDesignerPropertySheetExtension::isAttribute(int index) const
+
+    Returns true if the property at the given \a index is an attribute,
+    which will be \e excluded from the .ui file, otherwise false.
+
+    \sa indexOf(), setAttribute()
+*/
+
+/*!
+    \fn void QDesignerPropertySheetExtension::setAttribute(int index, bool attribute)
+
+    If \a attribute is true, the property at the given \a index is
+    made an attribute which will be \e excluded from the .ui file;
+    otherwise it will be included.
+
+    \sa indexOf(), isAttribute()
+*/
+
+/*!
+    \fn QVariant QDesignerPropertySheetExtension::property(int index) const
+
+    Returns the value of the property at the given \a index.
+
+    \sa indexOf(), setProperty(), propertyGroup()
+*/
+
+/*!
+    \fn void QDesignerPropertySheetExtension::setProperty(int index, const QVariant &value)
+
+    Sets the \a value of the property at the given \a index.
+
+    \warning If you change the value of a property using this
+    function, the undo stack is not updated. To ensure that a
+    property's value can be reverted using the undo stack, you must
+    use the QDesignerFormWindowCursorInterface::setProperty()
+    function, or its buddy \l
+    {QDesignerFormWindowCursorInterface::setWidgetProperty()}{setWidgetProperty()},
+    instead.
+
+    \sa indexOf(), property(), propertyGroup()
+*/
+
+/*!
+    \fn bool QDesignerPropertySheetExtension::isChanged(int index) const
+
+    Returns true if the value of the property at the given \a index
+    differs from the property's default value, otherwise false.
+
+    \sa indexOf(), setChanged(), reset()
+*/
+
+/*!
+    \fn void QDesignerPropertySheetExtension::setChanged(int index, bool changed)
+
+    Sets whether the property at the given \a index is different from
+    its default value, or not, depending on the \a changed parameter.
+
+    \sa indexOf(), isChanged()
+*/
+
+// Doc: Interface only
+
+/*!
+    \class QDesignerDynamicPropertySheetExtension
+
+    \brief The QDesignerDynamicPropertySheetExtension class allows you to
+    manipulate a widget's dynamic properties in Qt Designer's property editor.
+
+    \sa QDesignerPropertySheetExtension, {QObject#Dynamic Properties}{Dynamic Properties}
+
+    \inmodule QtDesigner
+    \since 4.3
+*/
+
+/*!
+    \fn QDesignerDynamicPropertySheetExtension::~QDesignerDynamicPropertySheetExtension()
+
+    Destroys the dynamic property sheet extension.
+*/
+
+/*!
+    \fn bool QDesignerDynamicPropertySheetExtension::dynamicPropertiesAllowed() const
+
+    Returns true if the widget supports dynamic properties; otherwise returns false.
+*/
+
+/*!
+    \fn int QDesignerDynamicPropertySheetExtension::addDynamicProperty(const QString &propertyName, const QVariant &value)
+
+    Adds a dynamic property named \a propertyName and sets its value to \a value.
+    Returns the index of the property if it was added successfully; otherwise returns -1 to
+    indicate failure.
+*/
+
+/*!
+    \fn bool QDesignerDynamicPropertySheetExtension::removeDynamicProperty(int index)
+
+    Removes the dynamic property at the given \a index.
+    Returns true if the operation succeeds; otherwise returns false.
+*/
+
+/*!
+    \fn bool QDesignerDynamicPropertySheetExtension::isDynamicProperty(int index) const
+
+    Returns true if the property at the given \a index is a dynamic property; otherwise
+    returns false.
+*/
+
+/*!
+    \fn bool QDesignerDynamicPropertySheetExtension::canAddDynamicProperty(const QString &propertyName) const
+
+    Returns true if \a propertyName is a valid, unique name for a dynamic
+    property; otherwise returns false.
+
+*/
diff --git a/doc/src/qtendian.qdoc b/doc/src/qtendian.qdoc
new file mode 100644
index 0000000000..f4b5bb8478
--- /dev/null
+++ b/doc/src/qtendian.qdoc
@@ -0,0 +1,168 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \headerfile <QtEndian>
+    \title Endian Conversion Functions
+    \ingroup architecture
+    \brief The <QtEndian> header provides functions to convert between
+    little and big endian representations of numbers.
+*/
+
+/*!
+    \fn T qFromBigEndian(const uchar *src)
+    \since 4.3
+    \relates <QtEndian>
+
+    Reads a big-endian number from memory location \a src and returns the number in the
+    host byte order representation.
+    On CPU architectures where the host byte order is little-endian (such as x86) this
+    will swap the byte order; otherwise it will just read from \a src.
+
+    \note Template type \c{T} can either be a qint16, qint32 or qint64. Other types of
+    integers, e.g., qlong, are not applicable.
+
+    There are no data alignment constraints for \a src.
+
+    \sa qFromLittleEndian()
+    \sa qToBigEndian()
+    \sa qToLittleEndian()
+*/
+/*!
+    \fn T qFromBigEndian(T src)
+    \since 4.3
+    \relates <QtEndian>
+    \overload
+
+    Converts \a src from big-endian byte order and returns the number in host byte order
+    representation of that number.
+    On CPU architectures where the host byte order is little-endian (such as x86) this
+    will return \a src with the byte order swapped; otherwise it will return \a src
+    unmodified.
+*/
+/*!
+    \fn T qFromLittleEndian(const uchar *src)
+    \since 4.3
+    \relates <QtEndian>
+
+    Reads a little-endian number from memory location \a src and returns the number in
+    the host byte order representation.
+    On CPU architectures where the host byte order is big-endian (such as PowerPC) this
+    will swap the byte order; otherwise it will just read from \a src.
+
+    \note Template type \c{T} can either be a qint16, qint32 or qint64. Other types of
+    integers, e.g., qlong, are not applicable.
+
+    There are no data alignment constraints for \a src.
+
+    \sa qFromBigEndian()
+    \sa qToBigEndian()
+    \sa qToLittleEndian()
+*/
+/*!
+    \fn T qFromLittleEndian(T src)
+    \since 4.3
+    \relates <QtEndian>
+    \overload
+
+    Converts \a src from little-endian byte order and returns the number in host byte
+    order representation of that number.
+    On CPU architectures where the host byte order is big-endian (such as PowerPC) this
+    will return \a src with the byte order swapped; otherwise it will return \a src
+    unmodified.
+*/
+/*!
+    \fn void qToBigEndian(T src, uchar *dest)
+    \since 4.3
+    \relates <QtEndian>
+
+    Writes the number \a src with template type \c{T} to the memory location at \a dest
+    in big-endian byte order.
+
+    Note that template type \c{T} can only be an integer data type (signed or unsigned).
+
+    There are no data alignment constraints for \a dest.
+
+    \sa qFromBigEndian()
+    \sa qFromLittleEndian()
+    \sa qToLittleEndian()
+*/
+/*!
+    \fn T qToBigEndian(T src)
+    \since 4.3
+    \relates <QtEndian>
+    \overload
+
+    Converts \a src from host byte order and returns the number in big-endian byte order
+    representation of that number.
+    On CPU architectures where the host byte order is little-endian (such as x86) this
+    will return \a src with the byte order swapped; otherwise it will return \a src
+    unmodified.
+*/
+/*!
+    \fn void qToLittleEndian(T src, uchar *dest)
+    \since 4.3
+    \relates <QtEndian>
+
+    Writes the number \a src with template type \c{T} to the memory location at \a dest
+    in little-endian byte order.
+
+    Note that template type \c{T} can only be an integer data type (signed or unsigned).
+
+    There are no data alignment constraints for \a dest.
+
+    \sa qFromBigEndian()
+    \sa qFromLittleEndian()
+    \sa qToBigEndian()
+*/
+/*!
+    \fn T qToLittleEndian(T src)
+    \since 4.3
+    \relates <QtEndian>
+    \overload
+
+    Converts \a src from host byte order and returns the number in little-endian byte
+    order representation of that number.
+    On CPU architectures where the host byte order is big-endian (such as PowerPC) this
+    will return \a src with the byte order swapped; otherwise it will return \a src
+    unmodified.
+*/
+
diff --git a/doc/src/qtestevent.qdoc b/doc/src/qtestevent.qdoc
new file mode 100644
index 0000000000..f5edb19757
--- /dev/null
+++ b/doc/src/qtestevent.qdoc
@@ -0,0 +1,191 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \class QTestEventList
+    \inmodule QtTest
+
+    \brief The QTestEventList class provides a list of GUI events.
+
+    QTestEventList inherits from QList<QTestEvent *>, and provides
+    convenience functions for populating the list.
+
+    A QTestEventList can be populated with GUI events that can be
+    stored as test data for later usage, or be replayed on any
+    QWidget.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qtestevent.qdoc 0
+
+    The example above simulates the user entering the character \c a
+    followed by a backspace, waiting for 200 milliseconds and
+    repeating it.
+*/
+
+/*! \fn QTestEventList::QTestEventList()
+
+    Constructs an empty QTestEventList.
+*/
+
+/*! \fn QTestEventList::QTestEventList(const QTestEventList &other)
+
+    Constructs a new QTestEventList as a copy of \a other.
+*/
+
+/*! \fn QTestEventList::~QTestEventList()
+
+    Empties the list and destroys all stored events.
+*/
+
+/*! \fn void QTestEventList::clear()
+
+    Removes all events from the list.
+*/
+
+/*! \fn void QTestEventList::addKeyClick(Qt::Key qtKey, Qt::KeyboardModifiers modifiers = Qt::NoModifier, int msecs = -1)
+
+    Adds a new key click to the list. The event will simulate the key \a qtKey with the modifier \a modifiers and then wait for \a msecs milliseconds.
+
+    \sa QTest::keyClick()
+*/
+
+/*! \fn void QTestEventList::addKeyPress(Qt::Key qtKey, Qt::KeyboardModifiers modifiers = Qt::NoModifier, int msecs = -1)
+
+    Adds a new key press to the list. The event will press the key \a qtKey with the modifier \a modifiers and then wait for \a msecs milliseconds.
+
+    \sa QTest::keyPress()
+*/
+
+/*! \fn void QTestEventList::addKeyRelease(Qt::Key qtKey, Qt::KeyboardModifiers modifiers = Qt::NoModifier, int msecs = -1)
+
+    Adds a new key release to the list. The event will release the key \a qtKey with the modifier \a modifiers and then wait for \a msecs milliseconds.
+
+    \sa QTest::keyRelease()
+
+*/
+
+/*! \fn void QTestEventList::addKeyEvent(QTest::KeyAction action, Qt::Key qtKey, Qt::KeyboardModifiers modifiers = Qt::NoModifier, int msecs = -1)
+    \internal
+*/
+
+/*! \fn void QTestEventList::addKeyClick(char ascii, Qt::KeyboardModifiers modifiers = Qt::NoModifier, int msecs = -1)
+
+    \overload
+
+    Adds a new key click to the list. The event will simulate the key \a ascii with the modifier \a modifiers and then wait for \a msecs milliseconds.
+
+    \sa QTest::keyClick()
+
+*/
+
+/*! \fn void QTestEventList::addKeyPress(char ascii, Qt::KeyboardModifiers modifiers = Qt::NoModifier, int msecs = -1)
+
+    \overload
+
+    Adds a new key press to the list. The event will press the key \a ascii with the modifier \a modifiers and then wait for \a msecs milliseconds.
+
+    \sa QTest::keyPress()
+*/
+
+/*! \fn void QTestEventList::addKeyRelease(char ascii, Qt::KeyboardModifiers modifiers = Qt::NoModifier, int msecs = -1)
+
+    \overload
+
+    Adds a new key release to the list. The event will release the key \a ascii with the modifier \a modifiers and then wait for \a msecs milliseconds.
+
+    \sa QTest::keyRelease()
+*/
+
+/*! \fn void QTestEventList::addKeyClicks(const QString &keys, Qt::KeyboardModifiers modifiers = Qt::NoModifier, int msecs = -1)
+
+    Adds new keyboard entries to the list. The event will press the \a keys with the \a modifiers and wait \a msecs milliseconds between each key.
+
+    \sa QTest::keyClicks()
+*/
+
+/*! \fn void QTestEventList::addKeyEvent(QTest::KeyAction action, char ascii, Qt::KeyboardModifiers modifiers = Qt::NoModifier, int msecs = -1)
+    \internal
+*/
+
+/*! \fn void QTestEventList::addDelay(int msecs)
+
+    Adds a \a msecs milliseconds delay.
+
+    \sa QTest::qWait()
+*/
+
+/*! \fn void QTestEventList::simulate(QWidget *w)
+
+    Simulates the events from the list one by one on the widget \a w.
+    For an example, please read the \l QTestEventList class documentation.
+*/
+
+/*! \fn void QTestEventList::addMousePress(Qt::MouseButton button, Qt::KeyboardModifiers modifiers = 0, QPoint pos = QPoint(), int delay=-1)
+
+    Add a mouse press to the list. The event will press the \a button with optional \a modifiers at the position \a pos with an optional \a delay. The default position is the center of the widget.
+
+    \sa QTest::mousePress()
+*/
+/*! \fn void QTestEventList::addMouseRelease(Qt::MouseButton button, Qt::KeyboardModifiers modifiers = 0, QPoint pos = QPoint(), int delay=-1)
+
+    Add a mouse release to the list. The event will release the \a button with optional \a modifiers at the position \a pos with an optional \a delay. The default position is the center of the widget.
+
+    \sa QTest::mouseRelease()
+*/
+/*! \fn void QTestEventList::addMouseClick(Qt::MouseButton button, Qt::KeyboardModifiers modifiers = 0, QPoint pos = QPoint(), int delay=-1)
+
+    Add a mouse click to the list. The event will click the \a button with optional \a modifiers at the position \a pos with an optional \a delay. The default position is the center of the widget.
+
+    \sa QTest::mouseClick()
+*/
+/*! \fn void QTestEventList::addMouseDClick(Qt::MouseButton button, Qt::KeyboardModifiers modifiers = 0, QPoint pos = QPoint(), int delay=-1)
+
+    Add a double mouse click to the list. The event will double click the \a button with optional \a modifiers at the position \a pos with an optional \a delay. The default position is the center of the widget.
+
+    \sa QTest::mousePress()
+*/
+/*! \fn void QTestEventList::addMouseMove(QPoint pos = QPoint(), int delay=-1)
+
+    Adds a mouse move to the list. The event will move the mouse to the position \a pos. If a \a delay (in milliseconds) is set, the test will wait after moving the mouse. The default position is the center of the widget.
+
+    \sa QTest::mousePress()
+*/
+
diff --git a/doc/src/qtestlib.qdoc b/doc/src/qtestlib.qdoc
new file mode 100644
index 0000000000..4e931074e5
--- /dev/null
+++ b/doc/src/qtestlib.qdoc
@@ -0,0 +1,779 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qtestlib-manual.html
+    \title QTestLib Manual
+    \ingroup architecture
+    \brief An overview of Qt's unit testing framework.
+
+    \keyword qtestlib
+
+    The QTestLib framework, provided by Nokia, is a tool for unit
+    testing Qt based applications and libraries. QTestLib provides
+    all the functionality commonly found in unit testing frameworks as
+    well as extensions for testing graphical user interfaces.
+
+    Table of contents:
+
+    \tableofcontents
+
+    \section1 QTestLib Features
+
+    QTestLib is designed to ease the writing of unit tests for Qt
+    based applications and libraries:
+
+    \table
+    \header \o Feature \o Details
+    \row
+        \o \bold Lightweight
+        \o QTestLib consists of about 6000 lines of code and 60
+           exported symbols.
+    \row
+        \o \bold Self-contained
+        \o QTestLib requires only a few symbols from the Qt Core library
+           for non-gui testing.
+    \row
+        \o \bold {Rapid testing}
+        \o QTestLib needs no special test-runners; no special
+           registration for tests.
+    \row
+        \o \bold {Data-driven testing}
+        \o A test can be executed multiple times with different test data.
+    \row
+        \o \bold {Basic GUI testing}
+        \o QTestLib offers functionality for mouse and keyboard simulation.
+    \row
+        \o \bold {Benchmarking}
+        \o QTestLib supports benchmarking and provides several measurement back-ends.
+    \row
+         \o \bold {IDE friendly}
+         \o QTestLib outputs messages that can be interpreted by Visual
+            Studio and KDevelop.
+    \row
+         \o \bold Thread-safety
+         \o The error reporting is thread safe and atomic.
+    \row
+         \o \bold Type-safety
+         \o Extensive use of templates prevent errors introduced by
+            implicit type casting.
+    \row
+         \o \bold {Easily extendable}
+         \o Custom types can easily be added to the test data and test output.
+    \endtable
+
+    Note: For higher-level GUI and application testing needs, please
+    see the \l{Third-Party Tools}{Qt testing products provided by
+    Nokia partners}.
+
+
+    \section1 QTestLib API
+
+    All public methods are in the \l QTest namespace. In addition, the
+    \l QSignalSpy class provides easy introspection for Qt's signals and slots.
+
+
+    \section1 Using QTestLib
+
+    \section2 Creating a Test
+
+    To create a test, subclass QObject and add one or more private slots to it. Each
+    private slot is a testfunction in your test. QTest::qExec() can be used to execute
+    all testfunctions in the test object.
+
+    In addition, there are four private slots that are \e not treated as testfunctions.
+    They will be executed by the testing framework and can be used to initialize and
+    clean up either the entire test or the current test function.
+
+    \list
+    \o \c{initTestCase()} will be called before the first testfunction is executed.
+    \o \c{cleanupTestCase()} will be called after the last testfunction was executed.
+    \o \c{init()} will be called before each testfunction is executed.
+    \o \c{cleanup()} will be called after every testfunction.
+    \endlist
+
+    If \c{initTestCase()} fails, no testfunction will be executed. If \c{init()} fails,
+    the following testfunction will not be executed, the test will proceed to the next
+    testfunction.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qtestlib.qdoc 0
+
+    For more examples, refer to the \l{QTestLib Tutorial}.
+
+    \section2 Building a Test
+
+    If you are using \c qmake as your build tool, just add the
+    following to your project file:
+
+    \snippet doc/src/snippets/code/doc_src_qtestlib.qdoc 1
+
+    If you are using other buildtools, make sure that you add the location
+    of the QTestLib header files to your include path (usually \c{include/QtTest}
+    under your Qt installation directory). If you are using a release build
+    of Qt, link your test to the \c QtTest library. For debug builds, use
+    \c{QtTest_debug}.
+
+    See \l {Chapter 1: Writing a Unit Test}{Writing a Unit Test} for a step by
+    step explanation.
+
+    \section2 QTestLib Command Line Arguments
+
+    \section3 Syntax
+
+    The syntax to execute an autotest takes the following simple form:
+
+    \snippet doc/src/snippets/code/doc_src_qtestlib.qdoc 2
+
+    Substitute \c testname with the name of your executable. \c
+    testfunctions can contain names of test functions to be
+    executed. If no \c testfunctions are passed, all tests are run. If you
+    append the name of an entry in \c testdata, the test function will be
+    run only with that test data.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qtestlib.qdoc 3
+
+    Runs the test function called \c toUpper with all available test data.
+
+    \snippet doc/src/snippets/code/doc_src_qtestlib.qdoc 4
+
+    Runs the \c toUpper test function with all available test data,
+    and the \c toInt test function with the testdata called \c
+    zero (if the specified test data doesn't exist, the associated test
+    will fail).
+
+    \snippet doc/src/snippets/code/doc_src_qtestlib.qdoc 5
+
+    Runs the testMyWidget function test, outputs every signal
+    emission and waits 500 milliseconds after each simulated
+    mouse/keyboard event.
+
+    \section3 Options
+
+    The following command line arguments are understood:
+
+    \list
+    \o \c -help \BR
+    outputs the possible command line arguments and give some useful help.
+    \o \c -functions \BR
+    outputs all test functions available in the test.
+    \o \c -o \e filename \BR
+    write output to the specified file, rather than to standard output
+    \o \c -silent \BR
+    silent output, only shows warnings, failures and minimal status messages
+    \o \c -v1 \BR
+    verbose output; outputs information on entering and exiting test functions.
+    \o \c -v2 \BR
+    extended verbose output; also outputs each \l QCOMPARE() and \l QVERIFY()
+    \o \c -vs \BR
+    outputs every signal that gets emitted
+    \o \c -xml \BR
+    outputs XML formatted results instead of plain text
+    \o \c -lightxml \BR
+    outputs results as a stream of XML tags
+    \o \c -eventdelay \e ms \BR
+    if no delay is specified for keyboard or mouse simulation
+    (\l QTest::keyClick(),
+    \l QTest::mouseClick() etc.), the value from this parameter
+    (in milliseconds) is substituted.
+    \o \c -keydelay \e ms \BR
+    like -eventdelay, but only influences keyboard simulation and not mouse
+    simulation.
+    \o \c -mousedelay \e ms \BR
+    like -eventdelay, but only influences mouse simulation and not keyboard
+    simulation.
+    \o \c -keyevent-verbose \BR
+    output more verbose output for keyboard simulation
+    \o \c -maxwarnings \e number\BR
+    sets the maximum number of warnings to output. 0 for unlimited, defaults to 2000.
+    \endlist
+
+    \section2 Creating a Benchmark
+    
+    To create a benchmark, follow the instructions for crating a test and then add a
+    QBENCHMARK macro to the test function that you want to benchmark.
+    
+    \snippet doc/src/snippets/code/doc_src_qtestlib.qdoc 12
+    
+    The code insde the QBENCHMARK macro will be measured, and possibly also repeated
+    several times in order to get an accurate measurement. This depends on the selected
+    measurement back-end. Several back-ends are available an can be selected on the
+    command line:
+    
+    \target testlib-benchmarking-measurement
+
+    \table
+    \header \o Name
+         \o Commmand-line Arguemnt
+         \o Availability
+    \row \o Walltime
+         \o (default)
+         \o All platforms
+    \row \o CPU tick counter
+         \o -tickcounter
+         \o Windows, Mac OS X, Linux, many UNIX-like systems.
+    \row \o Valgrind/Callgrind
+         \o -callgrind
+         \o Linux (if installed)
+    \row \o Event Counter
+         \o -eventcounter
+         \o All platforms
+    \endtable
+    
+    In short, walltime is always available but requires many repetitions to
+    get a useful result. 
+    Tick counters are usually available and can provide 
+    results with fewer repetitions, but can be susceptible to CPU frequency 
+    scaling issues. 
+    Valgrind provides exact results, but does not take
+    I/O waits into account, and is only available on a limited number of
+    platforms.
+    Event counting is available on all platforms and it provides the number of events
+    that were received by the event loop before they are sent to their corresponding
+    targets (this might include non-Qt events).
+       
+    \note Depending on the device configuration, Tick counters on the
+     Windows CE platform may not be as fine-grained, compared to other platforms.
+     Devices that do not support high-resolution timers default to
+     one-millisecond granularity.
+
+    See the chapter 5 in the \l{QTestLib Tutorial} for more benchmarking examples.
+
+    \section1 Using QTestLib remotely on Windows CE
+    \c cetest is a convenience application which helps the user to launch an 
+    application remotely on a Windows CE device or emulator.
+
+    It needs to be executed after the unit test has been successfully compiled.
+
+    Prior to launching, the following files are copied to the device:
+
+    \list
+    \o all Qt libraries the project links to
+    \o \l {QtRemote}{QtRemote.dll}
+    \o the c runtime library specified during installation
+    \o all files specified in the \c .pro file following the \l DEPLOYMENT rules.
+    \endlist
+
+    \section2 Using \c cetest
+    \section3 Syntax
+    The syntax to execute an autotest takes the following simple form:
+
+    \snippet doc/src/snippets/code/doc_src_qtestlib.qdoc 6
+
+    \section3 Options
+    \c cetest provides the same options as those for unit-testing on non cross-compiled
+    platforms. See \l {QTestLib Command Line Arguments} {Command Line Arguments} for
+    more information.
+
+    The following commands are also included:
+
+    \list
+    \o \c -debug \BR
+    Test version compiled in debug mode.
+    \o \c -release \BR
+    Test version compiled in release mode.
+    \o \c -libpath \e path \BR
+    Target path to copy Qt libraries to.
+    \o \c -qt-delete \BR
+    Delete Qt libraries after execution.
+    \o \c -project-delete \BR
+    Delete project files after execution.
+    \o \c -delete \BR
+    Delete project and Qt libraries after execution.
+    \o \c -conf \BR
+    Specifies a qt.conf file to be deployed to remote directory.
+    \endlist
+
+    \note \c{debug} is the default build option.
+
+    \section2 QtRemote
+    \c QtRemote is a small library which is build after QTestLib. It allows the host
+    system to create a process on a remote device and waits until its execution has
+    been finished.
+
+    \section2 Requirements
+    \c cetest uses Microsoft ActiveSync to establish a remote connection between the
+    host computer and the device. Thus header files and libraries are needed to compile
+    cetest and QtRemote successfully.
+
+    Prior to \l{Installing Qt on Windows CE}{installation} of Qt, you need to set your
+    \c INCLUDE and \c LIB environment variables properly.
+
+    A default installation of Windows Mobile 5 for Pocket PC can be obtained by:
+
+    \snippet doc/src/snippets/code/doc_src_qtestlib.qdoc 7
+
+    Note that Qt will remember the path, so you do not need to set it again
+    after switching the environments for cross-compilation.
+
+    \section1 3rd Party Code
+
+    The CPU tick counters used for benchmarking is licensed under the following
+    license: (from src/testlib/3rdparty/cycle.h)
+                    
+    \legalese
+    Copyright (c) 2003, 2006 Matteo Frigo\br
+    Copyright (c) 2003, 2006 Massachusetts Institute of Technology
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+    \endlegalese
+*/
+
+/*!
+    \page qtestlib-tutorial.html
+    \brief A short introduction to testing with QTestLib.
+    \contentspage QTestLib Manual
+    \nextpage {Chapter 1: Writing a Unit Test}{Chapter 1}
+
+    \title QTestLib Tutorial
+    \ingroup howto
+
+    This tutorial gives a short introduction to how to use some of the
+    features of the QTestLib framework. It is divided into four
+    chapters:
+
+    \list 1
+    \o \l {Chapter 1: Writing a Unit Test}{Writing a Unit Test}
+    \o \l {Chapter 2: Data Driven Testing}{Data Driven Testing}
+    \o \l {Chapter 3: Simulating GUI Events}{Simulating GUI Events}
+    \o \l {Chapter 4: Replaying GUI Events}{Replaying GUI Events}
+    \o \l {Chapter 5: Writing a Benchmark}{Writing a Benchmark}
+    \endlist
+
+*/
+
+
+/*!
+    \example qtestlib/tutorial1
+
+    \contentspage {QTestLib Tutorial}{Contents}
+    \nextpage {Chapter 2: Data Driven Testing}{Chapter 2}
+
+    \title Chapter 1: Writing a Unit Test
+
+    In this first chapter we will see how to write a simple unit test
+    for a class, and how to execute it.
+
+    \section1 Writing a Test
+
+    Let's assume you want to test the behavior of our QString class.
+    First, you need a class that contains your test functions. This class
+    has to inherit from QObject:
+
+    \snippet examples/qtestlib/tutorial1/testqstring.cpp 0
+
+    Note that you need to include the QTest header, and that the
+    test functions have to be declared as private slots so the
+    test framework finds and executes it.
+
+    Then you need to implement the test function itself. The
+    implementation could look like this:
+
+    \snippet doc/src/snippets/code/doc_src_qtestlib.qdoc 8
+
+    The \l QVERIFY() macro evaluates the expression passed as its
+    argument. If the expression evaluates to true, the execution of
+    the test function continues. Otherwise, a message describing the
+    failure is appended to the test log, and the test function stops
+    executing.
+
+    But if you want a more verbose output to the test log, you should
+    use the \l QCOMPARE() macro instead:
+
+    \snippet examples/qtestlib/tutorial1/testqstring.cpp 1
+
+    If the strings are not equal, the contents of both strings is
+    appended to the test log, making it immediately visible why the
+    comparison failed.
+
+    Finally, to make our test case a stand-alone executable, the
+    following two lines are needed:
+
+    \snippet examples/qtestlib/tutorial1/testqstring.cpp 2
+
+    The \l QTEST_MAIN() macro expands to a simple \c main()
+    method that runs all the test functions. Note that if both the
+    declaration and the implementation of our test class are in a \c
+    .cpp file, we also need to include the generated moc file to make
+    Qt's introspection work.
+
+    \section1 Executing a Test
+
+    Now that we finished writing our test, we want to execute
+    it. Assuming that our test was saved as \c testqstring.cpp in an
+    empty directory: we build the test using qmake to create a project
+    and generate a makefile.
+
+    \snippet doc/src/snippets/code/doc_src_qtestlib.qdoc 9
+
+    \bold {Note:}If you're using windows, replace \c make with \c
+    nmake or whatever build tool you use.
+
+    Running the resulting executable should give you the following
+    output:
+
+    \snippet doc/src/snippets/code/doc_src_qtestlib.qdoc 10
+
+    Congratulations! You just wrote and executed your first unit test
+    using the QTestLib framework.
+*/
+
+/*!
+    \example qtestlib/tutorial2
+
+    \previouspage {Chapter 1: Writing a Unit Test}{Chapter 1}
+    \contentspage {QTestLib Tutorial}{Contents}
+    \nextpage {Chapter 3: Simulating Gui Events}{Chapter 3}
+
+    \title Chapter 2: Data Driven Testing
+
+    In this chapter we will demonstrate how to execute a test
+    multiple times with different test data.
+
+    So far, we have hard coded the data we wanted to test into our
+    test function. If we add more test data, the function might look like
+    this:
+
+    \snippet doc/src/snippets/code/doc_src_qtestlib.qdoc 11
+
+    To prevent that the function ends up being cluttered by repetitive
+    code, QTestLib supports adding test data to a test function. All
+    we need is to add another private slot to our test class:
+
+    \snippet examples/qtestlib/tutorial2/testqstring.cpp 0
+
+    \section1 Writing the Data Function
+
+    A test function's associated data function carries the same name,
+    appended by \c{_data}. Our data function looks like this:
+
+    \snippet examples/qtestlib/tutorial2/testqstring.cpp 1
+
+    First, we define the two elements of our test table using the \l
+    QTest::addColumn() function: A test string, and the
+    expected result of applying the QString::toUpper() function to
+    that string.
+
+    Then we add some data to the table using the \l
+    QTest::newRow() function. Each set of data will become a
+    separate row in the test table.
+
+    \l QTest::newRow() takes one argument: A name that will be
+    associated with the data set. If the test fails, the name will be
+    used in the test log, referencing the failed data. Then we
+    stream the data set into the new table row: First an arbitrary
+    string, and then the expected result of applying the
+    QString::toUpper() function to that string.
+
+    You can think of the test data as a two-dimensional table. In
+    our case, it has two columns called \c string and \c result and
+    three rows. In addition a name as well as an index is associated
+    with each row:
+
+    \table
+    \header
+        \o index
+        \o name
+        \o string
+        \o result
+    \row
+        \o 0
+        \o all lower
+        \o "hello"
+        \o HELLO
+    \row
+        \o 1
+        \o mixed
+        \o "Hello"
+        \o HELLO
+    \row
+        \o 2
+        \o all upper
+        \o "HELLO"
+        \o HELLO
+    \endtable
+
+    \section1 Rewriting the Test Function
+
+    Our test function can now be rewritten:
+
+    \snippet examples/qtestlib/tutorial2/testqstring.cpp 2
+
+    The TestQString::toUpper() function will be executed three times,
+    once for each entry in the test table that we created in the
+    associated TestQString::toUpper_data() function.
+
+    First, we fetch the two elements of the data set using the \l
+    QFETCH() macro. \l QFETCH() takes two arguments: The data type of
+    the element and the element name. Then we perform the test using
+    the \l QCOMPARE() macro.
+
+    This approach makes it very easy to add new data to the test
+    without modifying the test itself.
+
+    And again, to make our test case a stand-alone executable,
+    the following two lines are needed:
+
+    \snippet examples/qtestlib/tutorial2/testqstring.cpp 3
+
+    As before, the QTEST_MAIN() macro expands to a simple main()
+    method that runs all the test functions, and since both the
+    declaration and the implementation of our test class are in a .cpp
+    file, we also need to include the generated moc file to make Qt's
+    introspection work.
+*/
+
+/*!
+    \example qtestlib/tutorial3
+
+    \previouspage {Chapter 2 Data Driven Testing}{Chapter 2}
+    \contentspage {QTestLib Tutorial}{Contents}
+    \nextpage {Chapter 4: Replaying GUI Events}{Chapter 4}
+
+    \title Chapter 3: Simulating GUI Events
+
+    QTestLib features some mechanisms to test graphical user
+    interfaces. Instead of simulating native window system events,
+    QTestLib sends internal Qt events. That means there are no
+    side-effects on the machine the tests are running on.
+
+    In this chapter we will se how to write a simple GUI test.
+
+    \section1 Writing a GUI test
+
+    This time, let's assume you want to test the behavior of our
+    QLineEdit class. As before, you will need a class that contains
+    your test function:
+
+    \snippet examples/qtestlib/tutorial3/testgui.cpp 0
+
+    The only difference is that you need to include the QtGui class
+    definitions in addition to the QTest namespace.
+
+    \snippet examples/qtestlib/tutorial3/testgui.cpp 1
+
+    In the implementation of the test function we first create a
+    QLineEdit. Then we simulate writing "hello world" in the line edit
+    using the \l QTest::keyClicks() function.
+
+    \note The widget must also be shown in order to correctly test keyboard
+    shortcuts.
+
+    QTest::keyClicks() simulates clicking a sequence of keys on a
+    widget. Optionally, a keyboard modifier can be specified as well
+    as a delay (in milliseconds) of the test after each key click. In
+    a similar way, you can use the QTest::keyClick(),
+    QTest::keyPress(), QTest::keyRelease(), QTest::mouseClick(),
+    QTest::mouseDClick(), QTest::mouseMove(), QTest::mousePress()
+    and QTest::mouseRelease() functions to simulate the associated
+    GUI events.
+
+    Finally, we use the \l QCOMPARE() macro to check if the line edit's
+    text is as expected.
+
+    As before, to make our test case a stand-alone executable, the
+    following two lines are needed:
+
+    \snippet examples/qtestlib/tutorial3/testgui.cpp 2
+
+    The QTEST_MAIN() macro expands to a simple main() method that
+    runs all the test functions, and since both the declaration and
+    the implementation of our test class are in a .cpp file, we also
+    need to include the generated moc file to make Qt's introspection
+    work.
+*/
+
+/*!
+    \example qtestlib/tutorial4
+
+    \previouspage {Chapter 3: Simulating GUI Event}{Chapter 3}
+    \contentspage {QTestLib Tutorial}{Contents}
+    \nextpage {Chapter 5: Writing a Benchmark}{Chapter 5}
+
+    \title Chapter 4: Replaying GUI Events
+
+    In this chapter, we will show how to simulate a GUI event,
+    and how to store a series of GUI events as well as replay them on
+    a widget.
+
+    The approach to storing a series of events and replay them, is
+    quite similar to the approach explained in \l {Chapter 2:
+    Data Driven Testing}{chapter 2}; all you need is to add a data
+    function to your test class:
+
+    \snippet examples/qtestlib/tutorial4/testgui.cpp 0
+
+    \section1 Writing the Data Function
+
+    As before, a test function's associated data function carries the
+    same name, appended by \c{_data}.
+
+    \snippet examples/qtestlib/tutorial4/testgui.cpp 1
+
+    First, we define the elements of the table using the
+    QTest::addColumn() function: A list of GUI events, and the
+    expected result of applying the list of events on a QWidget. Note
+    that the type of the first element is \l QTestEventList.
+
+    A QTestEventList can be populated with GUI events that can be
+    stored as test data for later usage, or be replayed on any
+    QWidget.
+
+    In our current data function, we create two \l
+    {QTestEventList}s. The first list consists of a single click to
+    the 'a' key. We add the event to the list using the
+    QTestEventList::addKeyClick() function. Then we use the
+    QTest::newRow() function to give the data set a name, and
+    stream the event list and the expected result into the table.
+
+    The second list consists of two key clicks: an 'a' with a
+    following 'backspace'. Again we use the
+    QTestEventList::addKeyClick() to add the events to the list, and
+    QTest::newRow() to put the event list and the expected
+    result into the table with an associated name.
+
+    \section1 Rewriting the Test Function
+
+    Our test can now be rewritten:
+
+    \snippet examples/qtestlib/tutorial4/testgui.cpp 2
+
+    The TestGui::testGui() function will be executed two times,
+    once for each entry in the test data that we created in the
+    associated TestGui::testGui_data() function.
+
+    First, we fetch the two elements of the data set using the \l
+    QFETCH() macro. \l QFETCH() takes two arguments: The data type of
+    the element and the element name. Then we create a QLineEdit, and
+    apply the list of events on that widget using the
+    QTestEventList::simulate() function.
+
+    Finally, we use the QCOMPARE() macro to check if the line edit's
+    text is as expected.
+
+    As before, to make our test case a stand-alone executable,
+    the following two lines are needed:
+
+    \snippet examples/qtestlib/tutorial4/testgui.cpp 3
+
+    The QTEST_MAIN() macro expands to a simple main() method that
+    runs all the test functions, and since both the declaration and
+    the implementation of our test class are in a .cpp file, we also
+    need to include the generated moc file to make Qt's introspection
+    work.
+*/
+
+/*!
+    \example qtestlib/tutorial5
+
+    \previouspage {Chapter 4: Replaying GUI Events}{Chapter 4}
+    \contentspage {QTestLib Tutorial}{Contents}
+
+    \title Chapter 5: Writing a Benchmark
+
+    In this final chapter we will demonstrate how to write benchmarks
+    using QTestLib.
+
+    \section1 Writing a Benchmark
+    To create a benchmark we extend a test function with a QBENCHMARK macro.
+    A benchmark test function will then typically consist of setup code and 
+    a QBENCHMARK macro that contains the code to be measured. This test
+    function benchmarks QString::localeAwareCompare().
+
+    \snippet examples/qtestlib/tutorial5/benchmarking.cpp 0
+
+    Setup can be done at the beginning of the function, the clock is not 
+    running at this point. The code inside the QBENCHMARK macro will be
+    measured, and possibly repeated several times in order to  get an 
+    accurate measurement.
+
+    Several \l {testlib-benchmarking-measurement}{back-ends} are available
+    and can be selected on the command line.
+
+    \section1 Data Functions
+
+    Data functions are useful for creating benchmarks that compare 
+    multiple data inputs, for example locale aware compare against standard
+    compare.
+
+    \snippet examples/qtestlib/tutorial5/benchmarking.cpp 1
+
+    The test function then uses the data to determine what to benchmark.
+
+    \snippet examples/qtestlib/tutorial5/benchmarking.cpp 2
+
+    The "if(useLocaleCompare)" switch is placed outside the QBENCHMARK 
+    macro to avoid measuring its overhead. Each benchmark test function
+    can have one active QBENCHMARK macro. 
+
+    \section1 External Tools
+
+    Tools for handling and visualizing test data are available as part of
+    the \l{qtestlib-tools} project on the Qt Labs Web site. These include
+    a tool for comparing performance data obtained from test runs and a
+    utility to generate Web-based graphs of performance data.
+
+    See the \l{qtestlib-tools Announcement} for more information on these
+    tools and a simple graphing example.
+
+*/
+
+
+
diff --git a/doc/src/qtgui.qdoc b/doc/src/qtgui.qdoc
new file mode 100644
index 0000000000..08b492a174
--- /dev/null
+++ b/doc/src/qtgui.qdoc
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \module QtGui
+    \title QtGui Module
+    \contentspage Qt's Modules
+    \previouspage QtCore
+    \nextpage QtNetwork
+    \ingroup modules
+
+    \brief The QtGui module extends QtCore with GUI functionality.
+
+    To include the definitions of both modules' classes, use the
+    following directive:
+
+    \snippet doc/src/snippets/code/doc_src_qtgui.qdoc 0
+
+    The QtGui module is part of the \l{Qt GUI Framework Edition},
+    the \l{Qt Full Framework Edition}, and the \l{Open Source Versions of Qt}.
+*/
diff --git a/doc/src/qthelp.qdoc b/doc/src/qthelp.qdoc
new file mode 100644
index 0000000000..05bf3e3339
--- /dev/null
+++ b/doc/src/qthelp.qdoc
@@ -0,0 +1,403 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \module QtHelp
+    \title QtHelp Module
+    \contentspage Qt's Modules
+    \previouspage QtUiTools
+    \nextpage QtAssistant
+    \ingroup modules
+
+    \brief The QtHelp module provides classes for integrating
+    online documentation in applications.
+
+    To include the definitions of the module's classes, use the
+    following directive:
+
+    \snippet doc/src/snippets/code/doc_src_qthelp.qdoc 0
+
+    To link against the module, add this line to your \l qmake \c
+    .pro file:
+
+    \snippet doc/src/snippets/code/doc_src_qthelp.qdoc 1
+
+    \note These classes are part of the \l{Open Source Versions of Qt} and
+    \l{Qt Commercial Editions}{Qt Full Framework Edition} for commercial
+    users.
+
+    \section1 Topics
+
+    \tableofcontents
+
+    \section1 Overview
+    The Qt help system includes tools for generating and viewing
+    Qt help files. In addition it provides classes for accessing
+    help contents programatically to be able to integrate online
+    help into Qt applications.
+
+    The actual help data, meaning the table of contents, index
+    keywords or html documents, is contained in Qt compressed help
+    files. So, one such a help file represents usually one manual
+    or documentation set. Since most products are more comprehensive
+    and consist of a number of tools, one manual is rarely enough.
+    Instead, more manuals which should be accessible at the same
+    time, exist. Ideally, it should also be possible to reference
+    certain points of interest of one manual to another.
+    Therefore, the Qt help system operates on help collection files
+    which include any number of compressed help files.
+
+    However, having collection files to merge many documentation
+    sets may lead to some problems. For example, one index keyword
+    may be defined in different documentations. So, when only seeing
+    it in the index and activating it, you cannot be sure that
+    the expected documentation will be shown. Therefore, the Qt
+    help system offers the possibiltiy to filter the help contents
+    after certain attributes. This requires however, that the
+    attributes have been assigned to the help contents before the
+    generation of the compressed help file.
+
+    As already mentioned, the Qt compressed help file contains all
+    data, so there is no need any longer to ship all single html 
+    files. Instead, only the compressed help file and optionally the
+    collection file has to be distributed. The collection file is
+    optional since any existing collection file, e.g. from an older
+    release could be used.
+
+    So, in general, there are four files interacting with the help
+    system, two used for generating Qt help and two meant for
+    distribution:
+
+    \table
+        \header
+            \o Name
+            \o Extension
+            \o Brief Description
+        \row
+            \o \l {Qt Help Project}
+            \o .qhp
+            \o The input file for the help generator consisting of the table
+               of contents, indices and references to the actual documentation
+               files (*.html); it also defines a unique namespace for the
+               documentation.
+
+        \row
+            \o Qt Compressed Help
+            \o .qch
+            \o The output file of the help generator. This binary file contains
+               all information specified in the help project file along with all
+               compressed documentation files.
+
+        \row
+            \o \l {Qt Help Collection Project}
+            \o .qhcp
+            \o The input file for the help collection generator. It contains
+               references to compressed help files which should be included in
+               the collection; it also may contain other information for
+               customizing Qt Assistant.
+
+        \row
+            \o Qt Help Collection
+            \o .qhc
+            \o The output of the help collection generator. This is the file
+               QHelpEngine operates on. It contains references to any number of
+               compressed help files as well as additional information, such as
+               custom filters.
+    \endtable
+
+    \section1 Generating Qt Help
+
+    Building help files for the Qt help system assumes that the html
+    documentation files already exist, i.e. the Qt help system does
+    not offer the possibility to create html files like e.g. Doxygen.
+
+    Once the html documentents are in place, a \l {Qt Help Project} file
+    has to be created. After specifying all relevant information in
+    this file, it needs to be compiled by calling:
+
+    \snippet doc/src/snippets/code/doc_src_qthelp.qdoc 2
+
+    The file 'doc.qch' contains then all html files in compressed
+    form along with the table of contents and index keywords. To
+    test if the generated file is correct, open Qt Assistant and
+    install the file via the Settings|Documentation page.
+
+    \target Qt Help Collection Project
+    \section2 Creating a Qt Help Collection
+
+    The first step is to create a Qt Help Collection Project file.
+    Since a Qt help collection stores primarily references to
+    compressed help files, the project 'mycollection.qhcp' file
+    looks unsurprisingly simple:
+
+    \snippet doc/src/snippets/code/doc_src_qthelp.qdoc 3
+
+    For actually creating the collection file call:
+
+    \snippet doc/src/snippets/code/doc_src_qthelp.qdoc 4
+
+    Instead of running two tools, one for generating the compressed
+    help and one for generating the collection file, it is also
+    possible to just run the qcollectiongenerator tool with a
+    slightly modified project file instructing the generator to
+    create the compressed help first.
+
+    \snippet doc/src/snippets/code/doc_src_qthelp.qdoc 5
+
+    Of course, it is possible to specify more than one file in the
+    'generate' or 'register' section, so any number of compressed
+    help files can be generated and registered in one go.
+
+    \section1 Using Qt Help
+
+    Accessing the help contents can be done in two ways: Using Qt
+    Assistant as documentation browser or using the QHelpEngine
+    API for embedding the help contents directly in an application.
+
+    \section2 Using Qt Assistant
+
+    \QA operates on a collection file which can be specified
+    before start up. If no collection file is given, a default one
+    will be created and used. In either case, it is possible to
+    register any Qt compressed help file and access the help contents.
+
+    When using Assistant as the help browser for an application, it
+    would be desirable that it can be customized to fit better to the
+    application and doesn't look like an independent, standalone
+    help browser. To achieve this, several additional properties can
+    be set in an Qt help collection file, to change e.g. the title
+    or application icon of Qt Assistant. For more information on
+    this topic have a look at the \l{assistant-manual.html}
+    {Qt Assistant manual}.
+
+    \section2 Using QHelpEngine API
+
+    Instead of showing the help in an external application like the
+    Qt Assistant, it is also possible to embed the online help in 
+    the application. The contents can then be retrieved via the
+    QHelpEngine class and can be displayed in nearly any form.
+    Showing it in a QTextBrowser is probably the most common way, but
+    embedding it in What's This help is also perfectly possible.
+
+    Retrieving help data from the file engine does not involve a
+    lot of code. The first step is to create an instance of the
+    help engine. Then we ask the engine for the links assigned to
+    the identifier, in this case "MyDialog::ChangeButton". If a link
+    was found, meaning at least one help document exists to this topic,
+    we get the actual help contents by calling fileData() and display
+    the document to the user.
+
+    \snippet doc/src/snippets/code/doc_src_qthelp.qdoc 6
+
+    For further information on how to use the API, have a look at
+    the QHelpEngine class reference.
+
+    \section1 License Information
+
+    The QtHelp module uses the CLucene indexing library to provide full-text
+    searching capabilities for Qt Assistant and applications that use the
+    features of QtHelp.
+
+    Qt Commercial Edition licensees that wish to distribute applications that
+    use these features of the QtHelp module need to be aware of their
+    obligations under the GNU Lesser General Public License (LGPL). 
+
+    Developers using the Open Source Edition can choose to redistribute
+    the module under the appropriate version of the GNU LGPL; version 2.1
+    for applications and libraries licensed under the GNU GPL version 2,
+    or version 3 for applications and libraries licensed under the GNU
+    GPL version 3.
+
+    \legalese
+    Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team \BR
+    Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    \endlegalese
+*/
+
+/*!
+    \page qthelpproject.html
+    \title Qt Help Project
+    
+    A Qt help project collects all data necessary to generate a
+    compressed help file. Along with the actual help data, like
+    the table of contents, index keywords and help documents, it
+    contains some extra information like a namespace to identify
+    the help file. One help project stands for one documentation,
+    e.g. the Qt Assistant manual.
+    
+    \section1 Qt Help Project File Format
+    
+    The file format is XML based. For a better understanding of
+    the format we'll discuss the following example:
+    
+    \snippet doc/src/snippets/code/doc_src_qthelp.qdoc 7
+    
+    \section2 Namespace
+    
+    To enable the QHelpEngine to retrieve the proper documentation to
+    a given link, every documentation set has to have a unique
+    identifier. A unique identifier makes is also possible for the
+    help collection to keep track of a documentation set without relying
+    on its file name. The Qt help system uses a namespace as identifier
+    which is defined by the mandatory namespace tags. In the example
+    above, the namespace is "mycompany.com.myapplication.1_0".
+    
+    \target Virtual Folders
+    \section2 Virtual Folders
+    
+    Having a namespace for every documentation naturally means that
+    the documentation sets are quite separated. From the help engines
+    point of view this is beneficial, but from the documentors view
+    it is often desirable to cross reference certain topic from one
+    manual to another without having to specify absolute links. To
+    solve this problem, the help system introduced the concept of
+    virtual folders.
+          
+    A virtual folder will become the root directory of all files
+    referenced in a compressed help file. When two documentations
+    share the same virtual folder, they can use relative paths when
+    defining hyperlinks pointing to the other documentation. If a
+    file is contained in both documentations or manuals, the one
+    from the current manual has precedence over the other.
+    
+    \snippet doc/src/snippets/code/doc_src_qthelp.qdoc 8
+    
+    The above example specifies 'doc' as virtual folder. If another
+    manual, e.g. for a small helper tool for 'My Application'
+    specifies the same folder, it is sufficient to write
+    'doc.html#section1' to reference the first section in the
+    'My Application' manual.
+    
+    The virtual folder tag is mandatory and the folder must not
+    contain any '/'.
+   
+    \target Custom Filters
+    \section2 Custom Filters
+        
+    Next in the Qt help project file are the optional definitions of
+    custom filters. A custom filter contains a list of filter 
+    attributes which will be used later to display only the documentation
+    which has all those attributes assigned to. So, when setting the
+    current filter in the QHelpEngine to "My Application 1.0" only
+    the documentation which has "myapp" and "1.0" set as filter
+    attributes will be shown.
+    
+    \snippet doc/src/snippets/code/doc_src_qthelp.qdoc 9
+    
+    It is possible to define any number of custom filters in a help
+    project file. Important to know is, that the filter attributes have
+    not to be specified in the same project file; they can be defined
+    in any other help file. The definition of a filter attributes
+    takes place by specifying them in a filter section.
+    
+    \target Filter Section
+    \section2 Filter Section    
+    
+    A filter section contains the actual documentation. One Qt help project
+    file may contain more than one filter sections. Every filter section
+    consists of four parts, the filter attributes section, the table of
+    contents, the keywords and the files list. In theory all parts are
+    optional but not specifying anything there will result in an empty
+    documentation.
+    
+    \section3 Filter Attributes
+    
+    Every filter section should have filter attributes assigned to it, to
+    enable documentation filtering. If no filter attribute is defined, the
+    documentation will only be shown if no filtering occurs, meaning the
+    current custom filter in the QHelpEngine does not contain any filter
+    attributes.
+    
+    \snippet doc/src/snippets/code/doc_src_qthelp.qdoc 10
+    
+    In this case, the filter attributes 'myapp' and '1.0' are assigned
+    to the filter section, i.e. all contents specified in this section
+    will only be shown if the current custom filter has 'myapp' or '1.0'
+    or both as filter attributes.
+    
+    \section3 Table of contents
+    
+    \snippet doc/src/snippets/code/doc_src_qthelp.qdoc 11
+    
+    One section tag represents one item in the table of contents. The
+    sections can be nested to any degree, but from a users perspective
+    it shouldn't be more than four or five levels. A section is defined
+    by its title and reference. The reference, like all file references
+    in a Qt help project file are relative to the help project file
+    itself.
+    
+    \section3 Keywords
+    
+    \snippet doc/src/snippets/code/doc_src_qthelp.qdoc 12
+    
+    The keyword section lists all keywords of this filter section. A
+    keyword consists basically of a name and a file reference. If the
+    attribute 'name' is used then the keyword specified there will appear in
+    the visible index, i.e. it will be accessible through the QHelpIndexModel.
+    If 'id' is used, the keyword does not appear in the index and is
+    only accessible via the linksForIdentifier() function of the
+    QHelpEngineCore. 'name' and 'id' can be specified at the same time.
+    
+    \section3 Files
+    
+    \snippet doc/src/snippets/code/doc_src_qthelp.qdoc 13
+    
+    Finally, the actual documentation files have to be listed. Make sure
+    that all files neccessary to display the help are mentioned, i.e. 
+    stylesheets or similar files need to be there as well. All listed files
+    will be compressed and written to the Qt compressed help file. So, in the
+    end, one single Qt help file contains all documentation files along with
+    the contents and indices.
+*/
diff --git a/doc/src/qtmac-as-native.qdoc b/doc/src/qtmac-as-native.qdoc
new file mode 100644
index 0000000000..ecbc64c3ae
--- /dev/null
+++ b/doc/src/qtmac-as-native.qdoc
@@ -0,0 +1,202 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** Qt for Mac OS X documentation
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+**********************************************************************/
+
+/*!
+    \page qtmac-as-native.html
+    \title Qt is Mac OS X Native
+    \brief An explanation of Qt's native features on Mac OS X.
+    \ingroup platform-notes
+
+    This document explains what makes an application native on Mac OS X.
+    It shows the areas where Qt is compliant, and the grey areas where
+    compliance is more questionable. (See also the document 
+    \l{mac-differences.html}{Qt for Mac OS X - Specific Issues}.)
+
+    Normally when referring to a native Mac application, one really means an
+    application that talks directly to the underlying window system, rather
+    than one that uses some intermediary (for example Apple's X11 server, or a
+    web browser). Qt applications run as first class citizens, just like
+    Cocoa, and Carbon applications. In fact, we use Carbon and HIView
+    internally to communicate with OS X.
+
+    When an application is running as a first class citizen, it means that
+    it can interact with specific components of the Mac OS X experience:
+
+    \tableofcontents
+
+    \section1 The Global Menu Bar
+
+    Qt does this via the QMenuBar abstraction. Mac users expect to
+    have a menu bar at the top of the screen and Qt honors this.
+
+    Additionally, users expect certain conventions to be respected, for
+    example the application menu should contain About, Preferences,
+    Quit, etc. Qt handles this automatically, although it does not
+    provide a means of interacting directly with the application menu.
+    (By doing this automatically, Qt makes it easier to port Qt
+    applications to other platforms.)
+
+    \section1 Aqua
+
+    This is a critical piece of Mac OS X (documentation can be found at
+    \l{http://developer.apple.com/documentation/UserExperience/Conceptual/OSXHIGuidelines/index.html}).
+    It is a huge topic, but the most important guidelines for GUI
+    design are probably these:
+
+    \list
+    \i \e{Aqua look}
+
+      As with Cocoa/Carbon, Qt provides widgets that look like those
+      described in the Human Interface Descriptions. Qt's widgets use
+      Appearance Manager on Mac OS X 10.2 and the new HIThemes on Mac OS X 10.3
+      and higher to implement the look, in other words we use Apple's own API's
+      for doing the rendering.
+
+    \i \e{Aqua feel}
+
+      This is a bit more subjective, but certainly Qt strives to
+      provide the same feel as any Mac OS X application (and we
+      consider situations where it doesn't achieve this to be bugs).
+      Of course Qt has other concerns to bear in mind, especially
+      remaining cross-platform. Some "baggage" that Qt carries is in
+      an effort to provide a widget on a platform for which an
+      equivelant doesn't exist, or so that a single API can be used to
+      do something, even if the API doesn't make entire sense for a
+      specific widget.
+
+    \i \e{Aqua guides}
+
+      This is the most subjective, but there are many suggestions and
+      guidelines in the Aqua style guidelines. This is the area where Qt is
+      of least assistance. The decisions that must be made to conform (widget
+      sizes, widget layouts with respect to other widgets, window margins,
+      placement of OK and Cancel, etc) must be made based on the user
+      experience demanded by your application. If your user base is small or
+      mostly comes from the Windows or Unix worlds, these are minor issues much
+      less important than trying to make a mass market product. Qt for Mac OS X
+      is fully API compatible with Qt for Windows and X11, but Mac OS X is a
+      significantly different platform to Windows and some special
+      considerations must be made based on your audience.
+
+    \endlist
+
+    \section1 Dock
+
+    Interaction with the dock is possible. The icon can be set by calling
+    QWidget::setWindowIcon() on the main window in your application. The
+    setWindowIcon() call can be made as often as necessary, providing an
+    icon that can be easily updated.
+    \omit
+    It is also possible to set a QMenu as the dock menu through the use of the
+    qt_mac_set_dock_menu() function.
+    \endomit
+
+    \section1 Accessiblity
+
+    Although many users never use this, some users will only interact with your
+    applications via assistive devices. With Qt the aim is to make this
+    automatic in your application so that it conforms to accepted practice on
+    its platform. Qt uses Apple's accessibility framework to provide access
+    to users with diabilities.
+
+    \section1 Development Tools
+
+    Mac OS X developers expect a certain level of interopability
+    between their development toolkit and the platform's developer
+    tools (for example Visual Studio, gmake, etc). Qt supports both Unix
+    style Makefiles, and ProjectBuilder/Xcode project files by using
+    the \l qmake tool. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qtmac-as-native.qdoc 0
+
+    will generate an Xcode project file from project.pro. With \l qmake
+    you do not have to worry about rules for Qt's preprocessors (\l moc
+    and \l uic) since \l qmake automatically handles them and ensures that
+    everything necessary is linked into your application.
+
+    Qt does not entirely interact with the development environment (for
+    example plugins to set a file to "mocable" from within the Xcode
+    user interface). Nokia is actively working on improving Qt's
+    interoperability with various IDEs.
+*/
diff --git a/doc/src/qtmain.qdoc b/doc/src/qtmain.qdoc
new file mode 100644
index 0000000000..a6b234ab15
--- /dev/null
+++ b/doc/src/qtmain.qdoc
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qtmain.html
+    \title The qtmain Library
+    \ingroup licensing
+    \ingroup platform-notes
+    \brief Describes the use and license of the qtmain helper library.
+
+    qtmain is a helper library that enables the developer to write a
+    cross-platform main() function on Windows.
+
+    If you do not use \l qmake or the \l{Visual Studio Integration}
+    available to \l{Qt Commercial Editions}{commercial licensees}, you also
+    need to link against the \c qtmain library.
+
+    \section1 License Information
+
+    The QAxContainer module is not covered by the \l{GNU General Public License (GPL)},
+    the \l{GNU Lesser General Public License (LGPL)}, or the
+    \l{Qt Commercial Editions}{Qt Commercial License}. Instead, it is distributed under
+    the following license.
+    
+    \legalese
+    Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).\br
+    All rights reserved.
+
+    Contact:  Qt Software Information (qt-info@nokia.com)\br
+
+    You may use this file under the terms of the BSD license as follows:\br
+
+    "Redistribution and use in source and binary forms, with or without modification,
+    are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this list
+    of conditions and the following disclaimer.\br
+    * Redistributions in binary form must reproduce the above copyright notice, this
+    list of conditions and the following disclaimer in the documentation and/or other
+    materials provided with the distribution.\br
+    * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor the names of
+    its contributors may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+    SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+    TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+    ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+    \endlegalese
+*/
diff --git a/doc/src/qtnetwork.qdoc b/doc/src/qtnetwork.qdoc
new file mode 100644
index 0000000000..2be7457859
--- /dev/null
+++ b/doc/src/qtnetwork.qdoc
@@ -0,0 +1,358 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \module QtNetwork
+    \title QtNetwork Module
+    \contentspage Qt's Modules
+    \previouspage QtGui
+    \nextpage QtOpenGL
+    \ingroup modules
+
+    \brief The QtNetwork module offers classes that allow you to
+    write TCP/IP clients and servers.
+
+    The network module provides classes to make network programming
+    easier and portable. It offers classes such as QHttp and QFtp that
+    implement specific application-level protocols, lower-level classes
+    such as QTcpSocket, QTcpServer and QUdpSocket that represent low
+    level network concepts, and high level classes such as QNetworkRequest,
+    QNetworkReply and QNetworkAccessManager to perform network operations using common protocols.
+
+    The QtNetwork module is part of the \l{Qt Full Framework Edition} and the
+    \l{Open Source Versions of Qt}.
+
+    Topics:
+
+    \tableofcontents
+
+    \section1 Configuring the Build Process
+
+    Applications that use Qt's networking classes need to
+    be configured to be built against the QtNetwork module.
+    The following declaration in a \c qmake project file ensures that
+    an application is compiled and linked appropriately:
+
+    \snippet doc/src/snippets/code/doc_src_qtnetwork.qdoc 0
+
+    This line is necessary because only the QtCore and QtGui modules
+    are used in the default build process.
+
+    To include the definitions of the module's classes, use the
+    following directive:
+
+    \snippet doc/src/snippets/code/doc_src_qtnetwork.qdoc 1
+
+    \section1 High Level Network Operations
+
+    The Network Access API is a collection of classes for performing
+    common network operations. The API provides an abstraction layer
+    over the specific operations and protocols used (for example,
+    getting and posting data over HTTP), and only exposes classes,
+    functions, and signals for general or high level concepts.
+
+    Network requests are represented by the QNetworkRequest class,
+    which also acts as a general container for information associated
+    with a request, such as any header information and the encryption
+    used. The URL specified when a request object is constructed
+    determines the protocol used for a request.
+
+    The coordination of network operations is performed by the
+    QNetworkAccessManager class. Once a request has been created,
+    this class is used to dispatch it and emit signals to report on
+    its progress. The manager also coordinates the use of
+    \l{QNetworkCookieJar}{cookies} to store data on the client,
+    authentication requests, and the use of proxies.
+
+    Replies to network requests are represented by the QNetworkReply
+    class; these are created by QNetworkAccessManager when a request
+    is dispatched. The signals provided by QNetworkReply can be used
+    to monitor each reply individually, or developers may choose to
+    use the manager's signals for this purpose instead and discard
+    references to replies. Since QNetworkReply is a subclass of
+    QIODevice, replies can be handled synchronously or asynchronously;
+    i.e., as blocking or non-blocking operations.
+
+    Each application or library can create one or more instances of
+    QNetworkAccessManager to handle network communication.
+
+    \section1 Writing HTTP and FTP Clients with QHttp and QFtp
+
+    HTTP (Hypertext Transfer Protocol) is an application-level
+    network protocol used mainly for downloading HTML and XML files,
+    but it is also used as a high-level transport protocol for many
+    other types of data, from images and movies to purchase orders
+    and banking transactions. In contrast, FTP (File Transfer
+    Protocol) is a protocol used almost exclusively for browsing
+    remote directories and for transferring files.
+
+    \image httpstack.png HTTP Client and Server
+
+    HTTP is a simpler protocol than FTP in many ways. It uses only
+    one network connection, while FTP uses two (one for sending
+    commands, and one for transferring data). HTTP is a stateless
+    protocol; requests and responses are always self-contained. The
+    FTP protocol has a state and requires the client to send several
+    commands before a file transfer takes place.
+
+    In practice, HTTP clients often use separate connections for
+    separate requests, whereas FTP clients establish one connection
+    and keep it open throughout the session.
+
+    The QHttp and QFtp classes provide client-side support for HTTP
+    and FTP. Since the two protocols are used to solve the same
+    problems, the QHttp and QFtp classes have many features in
+    common:
+
+    \list
+
+    \o \e{Non-blocking behavior.} QHttp and QFtp are asynchronous.
+    You can schedule a series of commands (also called "requests" for
+    HTTP). The commands are executed later, when control returns to
+    Qt's event loop.
+
+    \o \e{Command IDs.} Each command has a unique ID number that you
+    can use to follow the execution of the command. For example, QFtp
+    emits the \l{QFtp::commandStarted()}{commandStarted()} and
+    \l{QFtp::commandFinished()}{commandFinished()} signal with the
+    command ID for each command that is executed. QHttp has a
+    \l{QHttp::requestStarted()}{requestStarted()} and a
+    \l{QHttp::requestFinished()}{requestFinished()} signal that work
+    the same way.
+
+    \o \e{Data transfer progress indicators.} QHttp and QFtp emit
+    signals whenever data is transferred
+    (QFtp::dataTransferProgress(), QHttp::dataReadProgress(), and
+    QHttp::dataSendProgress()). You could connect these signals to
+    QProgressBar::setProgress() or QProgressDialog::setProgress(),
+    for example.
+
+    \o \e{QIODevice support.} Both classes support convenient
+    uploading from and downloading to \l{QIODevice}s, in addition to a
+    QByteArray-based API.
+
+    \endlist
+
+    There are two main ways of using QHttp and QFtp. The most common
+    approach is to keep track of the command IDs and follow the
+    execution of every command by connecting to the appropriate
+    signals. The other approach is to schedule all commands at once
+    and only connect to the done() signal, which is emitted when all
+    scheduled commands have been executed. The first approach
+    requires more work, but it gives you more control over the
+    execution of individual commands and allows you to initiate new
+    commands based on the result of a previous command. It also
+    enables you to provide detailed feedback to the user.
+
+    The \l{network/http}{HTTP} and \l{network/ftp}{FTP} examples
+    illustrate how to write an HTTP and an FTP client.
+
+    Writing your own HTTP or FTP server is possible using the
+    lower-level classes QTcpSocket and QTcpServer.
+
+    \section1 Using TCP with QTcpSocket and QTcpServer
+
+    TCP (Transmission Control Protocol) is a low-level network
+    protocol used by most Internet protocols, including HTTP and FTP,
+    for data transfer. It is a reliable, stream-oriented,
+    connection-oriented transport protocol. It is particularly well
+    suited to the continuous transmission of data.
+
+    \image tcpstream.png A TCP Stream
+
+    The QTcpSocket class provides an interface for TCP. You can use
+    QTcpSocket to implement standard network protocols such as POP3,
+    SMTP, and NNTP, as well as custom protocols.
+
+    A TCP connection must be established to a remote host and port
+    before any data transfer can begin. Once the connection has been
+    established, the IP address and port of the peer are available
+    through QTcpSocket::peerAddress() and QTcpSocket::peerPort(). At
+    any time, the peer can close the connection, and data transfer
+    will then stop immediately.
+
+    QTcpSocket works asynchronously and emits signals to report status
+    changes and errors, just like QHttp and QFtp. It relies on the
+    event loop to detect incoming data and to automatically flush
+    outgoing data. You can write data to the socket using
+    QTcpSocket::write(), and read data using
+    QTcpSocket::read(). QTcpSocket represents two independent streams
+    of data: one for reading and one for writing.
+
+    Since QTcpSocket inherits QIODevice, you can use it with
+    QTextStream and QDataStream. When reading from a QTcpSocket, you
+    must make sure that enough data is available by calling
+    QTcpSocket::bytesAvailable() beforehand.
+
+    If you need to handle incoming TCP connections (e.g., in a server
+    application), use the QTcpServer class. Call QTcpServer::listen()
+    to set up the server, and connect to the
+    QTcpServer::newConnection() signal, which is emitted once for
+    every client that connects. In your slot, call
+    QTcpServer::nextPendingConnection() to accept the connection and
+    use the returned QTcpSocket to communicate with the client.
+
+    Although most of its functions work asynchronously, it's possible
+    to use QTcpSocket synchronously (i.e., blocking). To get blocking
+    behavior, call QTcpSocket's waitFor...() functions; these suspend
+    the calling thread until a signal has been emitted. For example,
+    after calling the non-blocking QTcpSocket::connectToHost()
+    function, call QTcpSocket::waitForConnected() to block the thread
+    until the \l{QTcpSocket::connected()}{connected()} signal has
+    been emitted.
+
+    Synchronous sockets often lead to code with a simpler flow of
+    control. The main disadvantage of the waitFor...() approach is
+    that events won't be processed while a waitFor...() function is
+    blocking. If used in the GUI thread, this might freeze the
+    application's user interface. For this reason, we recommend that
+    you use synchronous sockets only in non-GUI threads. When used
+    synchronously, QTcpSocket doesn't require an event loop.
+
+    The \l{network/fortuneclient}{Fortune Client} and
+    \l{network/fortuneserver}{Fortune Server} examples show how to use
+    QTcpSocket and QTcpServer to write TCP client-server
+    applications. See also \l{network/blockingfortuneclient}{Blocking
+    Fortune Client} for an example on how to use a synchronous
+    QTcpSocket in a separate thread (without using an event loop),
+    and \l{network/threadedfortuneserver}{Threaded Fortune Server}
+    for an example of a multithreaded TCP server with one thread per
+    active client.
+
+    \section1 Using UDP with QUdpSocket
+
+    UDP (User Datagram Protocol) is a lightweight, unreliable,
+    datagram-oriented, connectionless protocol. It can be used when
+    reliability isn't important. For example, a server that reports
+    the time of day could choose UDP. If a datagram with the time of
+    day is lost, the client can simply make another request.
+
+    \image udppackets.png UDP Packets
+
+    The QUdpSocket class allows you to send and receive UDP
+    datagrams. It inherits QAbstractSocket, and it therefore shares
+    most of QTcpSocket's interface. The main difference is that
+    QUdpSocket transfers data as datagrams instead of as a continuous
+    stream of data. In short, a datagram is a data packet of limited
+    size (normally smaller than 512 bytes), containing the IP address
+    and port of the datagram's sender and receiver in addition to the
+    data being transferred.
+
+    QUdpSocket supports IPv4 broadcasting. Broadcasting is often used
+    to implement network discovery protocols, such as finding which
+    host on the network has the most free hard disk space. One host
+    broadcasts a datagram to the network that all other hosts
+    receive. Each host that receives a request then sends a reply
+    back to the sender with its current amount of free disk space.
+    The originator waits until it has received replies from all
+    hosts, and can then choose the server with most free space to
+    store data. To broadcast a datagram, simply send it to the
+    special address QHostAddress::Broadcast (255.255.255.255), or
+    to your local network's broadcast address.
+
+    QUdpSocket::bind() prepares the socket for accepting incoming
+    datagrams, much like QTcpServer::listen() for TCP servers.
+    Whenever one or more datagrams arrive, QUdpSocket emits the
+    \l{QUdpSocket::readyRead()}{readyRead()} signal. Call
+    QUdpSocket::readDatagram() to read the datagram.
+
+    The \l{network/broadcastsender}{Broadcast Sender} and
+    \l{network/broadcastreceiver}{Broadcast Receiver} examples show
+    how to write a UDP sender and a UDP receiver using Qt.
+
+    \section1 Resolving Host Names using QHostInfo
+
+    Before establishing a network connection, QTcpSocket and
+    QUdpSocket perform a name lookup, translating the host name
+    you're connecting to into an IP address. This operation is
+    usually performed using the DNS (Domain Name Service) protocol.
+
+    QHostInfo provides a static function that lets you perform such a
+    lookup yourself. By calling QHostInfo::lookupHost() with a host
+    name, a QObject pointer, and a slot signature, QHostInfo will
+    perform the name lookup and invoke the given slot when the
+    results are ready. The actual lookup is done in a separate
+    thread, making use of the operating system's own methods for
+    performing name lookups.
+
+    QHostInfo also provides a static function called
+    QHostInfo::fromName() that takes the host name as argument and
+    returns the results. In this case, the name lookup is performed
+    in the same thread as the caller. This overload is useful for
+    non-GUI applications or for doing name lookups in a separate,
+    non-GUI thread. (Calling this function in a GUI thread may cause
+    your user interface to freeze while the function blocks as
+    it performs the lookup.)
+
+    \section1 Support for Network Proxies
+
+    Network communication with Qt can be performed through proxies,
+    which direct or filter network traffic between local and remote
+    connections.
+
+    Individual proxies are represented by the QNetworkProxy class,
+    which is used to describe and configure the connection to a proxy.
+    Proxy types which operate on different levels of network communication
+    are supported, with SOCKS 5 support allowing proxying of network
+    traffic at a low level, and HTTP and FTP proxying working at the
+    protocol level. See QNetworkProxy::ProxyType for more information.
+
+    Proxying can be enabled on a per-socket basis or for all network
+    communication in an application. A newly opened socket can be
+    made to use a proxy by calling its QAbstractSocket::setProxy()
+    function before it is connected. Application-wide proxying can
+    be enabled for all subsequent socket connections through the use
+    of the QNetworkProxy::setApplicationProxy() function.
+
+    Proxy factories are used to create policies for proxy use.
+    QNetworkProxyFactory supplies proxies based on queries for specific
+    proxy types. The queries themselves are encoded in QNetworkProxyQuery
+    objects which enable proxies to be selected based on key criteria,
+    such as the purpose of the proxy (TCP, UDP, TCP server, URL request),
+    local port, remote host and port, and the protocol in use (HTTP, FTP,
+    etc.).
+
+    QNetworkProxyFactory::proxyForQuery() is used to query the factory
+    directly. An application-wide policy for proxying can be implemented
+    by passing a factory to QNetworkProxyFactory::setApplicationProxyFactory()
+    and a custom proxying policy can be created by subclassing
+    QNetworkProxyFactory; see the class documentation for details.
+*/
diff --git a/doc/src/qtopengl.qdoc b/doc/src/qtopengl.qdoc
new file mode 100644
index 0000000000..1052f144db
--- /dev/null
+++ b/doc/src/qtopengl.qdoc
@@ -0,0 +1,163 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \module QtOpenGL
+    \title QtOpenGL Module
+    \contentspage Qt's Modules
+    \previouspage QtNetwork
+    \nextpage QtSql
+    \ingroup modules
+
+    \brief The QtOpenGL module offers classes that make it easy to
+    use OpenGL in Qt applications.
+
+    OpenGL is a standard API for rendering 3D graphics. OpenGL only
+    deals with 3D rendering and provides little or no support for GUI
+    programming issues. The user interface for an OpenGL application
+    must be created with another toolkit, such as Motif on the X
+    platform, Microsoft Foundation Classes (MFC) under Windows, or Qt
+    on both platforms.
+
+    \bold{Note:} OpenGL is a trademark of Silicon Graphics, Inc. in
+    the United States and other countries.
+
+    The Qt OpenGL module makes it easy to use OpenGL in Qt applications.
+    It provides an OpenGL widget class that can be used just like any
+    other Qt widget, except that it opens an OpenGL display buffer where
+    you can use the OpenGL API to render the contents.
+
+    To include the definitions of the module's classes, use the
+    following directive:
+
+    \snippet doc/src/snippets/code/doc_src_qtopengl.qdoc 0
+
+    To link against the module, add this line to your \l qmake \c
+    .pro file:
+
+    \snippet doc/src/snippets/code/doc_src_qtopengl.qdoc 1
+
+    The Qt OpenGL module is implemented as a platform-independent Qt/C++
+    wrapper around the platform-dependent GLX (version 1.3 or later),
+    WGL, or AGL C APIs. Although the basic functionality provided is very
+    similar to Mark Kilgard's GLUT library, applications using the Qt
+    OpenGL module can take advantage of the whole Qt API for
+    non-OpenGL-specific GUI functionality.
+
+    \warning The QtOpenGL module is part of the \l{Qt Full Framework Edition}
+    and the \l{Open Source Versions of Qt}. It is available on Windows,
+    X11, and Mac OS X. \l{Qt for Embedded Linux} supports OpenGL ES (OpenGL for
+    Embedded Systems). To be able to use the OpenGL API in \l{Qt for Embedded Linux},
+    it must be integrated with the Q Window System (QWS). See the
+    \l{Qt for Embedded Linux and OpenGL} documentation for details.
+
+    \section1 Installation
+
+    When you install Qt for X11, the configure script will autodetect if
+    OpenGL headers and libraries are installed on your system, and if so,
+    it will include the QtOpenGL module in the Qt library. (If your
+    OpenGL headers or libraries are placed in a non-standard directory,
+    you may need to change the \c QMAKE_INCDIR_OPENGL and/or
+    \c QMAKE_LIBDIR_OPENGL in the config file for your system).
+
+    When you install Qt for Windows and Mac OS X, the QtOpenGL
+    module is always included. X11 users might like to read the notes
+    on overlays below.
+
+    The QGL documentation assumes that you are familiar with OpenGL
+    programming. If you're new to the subject a good starting point is
+    \l{http://www.opengl.org/}.
+
+    \section1 How to Use X11 Overlays with Qt
+
+    X11 overlays are a powerful mechanism for drawing
+    annotations etc., on top of an image without destroying it, thus saving
+    a great deal of image rendering time. For more information, see the highly
+    recommended book \e{OpenGL Programming for the X Window System} (Mark
+    Kilgard, Addison Wesley Developers Press 1996).
+
+    \warning The Qt OpenGL Extension includes direct support for the
+    use of OpenGL overlays. For many uses of overlays, this makes the
+    technique described below redundant. The following is a discussion
+    on how to use non-QGL widgets in overlay planes.
+
+    In the typical case, X11 overlays can easily be used together with the
+    current version of Qt and the Qt OpenGL Extension. The following
+    requirements apply:
+
+    \list 1
+    \i Your X server and graphics card/hardware must support overlays.
+       For many X servers, overlay support can be turned on with
+       a configuration option; consult your X server installation
+       documentation.
+
+    \i Your X server must (be configured to) use an overlay visual as the
+       default visual. Most modern X servers do this, since this has the
+       added advantage that pop-up menus, overlapping windows etc., will
+       \e not affect underlying images in the main plane, thereby
+       avoiding expensive redraws.
+
+    \i The best (deepest) visual for OpenGL rendering is in the main
+       plane. This is the normal case. Typically, X servers that support
+       overlays provide a 24-bit \c TrueColor visual in the main plane,
+       and an 8-bit \c PseudoColor (default) visual in the overlay plane.
+    \endlist
+
+    Assuming that the requirements mentioned above are met, a
+    QGLWidget will default to using the main plane visual, while all
+    other widgets will use the overlay visual. Thus, we can place a
+    normal widget on top of the QGLWidget, and do drawing on it,
+    without affecting the image in the OpenGL window. In other words,
+    we can use all the drawing capabilities of QPainter to draw
+    annotations, rubberbands, etc. For the typical use of overlays,
+    this is much easier than using OpenGL for rendering annotations.
+
+    An overlay plane has a specific color called the transparent
+    color. Pixels drawn in this color will not be visible; instead
+    the underlying OpenGL image will show through.
+
+    To use this technique, you must not use the
+    QApplication::ManyColor or QApplication::TrueColor color
+    specification for QApplication, because this will force the
+    normal Qt widgets to use a \c TrueColor visual, which will
+    typically be in the main plane, not in the overlay plane as
+    desired.
+*/
diff --git a/doc/src/qtopiacore-architecture.qdoc b/doc/src/qtopiacore-architecture.qdoc
new file mode 100644
index 0000000000..8ec013676d
--- /dev/null
+++ b/doc/src/qtopiacore-architecture.qdoc
@@ -0,0 +1,338 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt-embedded-architecture.html
+
+    \title Qt for Embedded Linux Architecture
+    \ingroup qt-embedded-linux
+
+    A \l{Qt for Embedded Linux} application requires a server
+    application to be running, or to be the server application itself.
+    Any \l{Qt for Embedded Linux} application can act as the server.
+    When more than one application is running, the subsequent
+    applications connect to the existing server application as clients.
+
+    The server and client processes have different responsibilities:
+    The server process manages pointer handling, character input, and
+    screen output. In addition, the server controls the appearance of
+    the screen cursor and the screen saver. The client process
+    performs all application specific operations.
+
+    The server application is represented by an instance of the
+    QWSServer class, while the client applications are represented by
+    instances of the QWSClient class. On each side, there are several
+    classes performing the various operations.
+
+    \image qt-embedded-architecture2.png
+
+    All system generated events, including keyboard and mouse events,
+    are passed to the server application which then propagates the
+    event to the appropriate client.
+
+    When rendering, the default behavior is for each client to render
+    its widgets into memory while the server is responsible for
+    putting the contents of the memory onto the screen. But when the
+    hardware is known and well defined, as is often the case with
+    software for embedded devices, it may be useful for the clients to
+    manipulate and control the underlying hardware directly.
+    \l{Qt for Embedded Linux} provides two different approaches to
+    achieve this behavior, see the graphics rendering section below for
+    details.
+
+    \tableofcontents
+
+    \section1 Client/Server Communication
+
+    The running applications continuously alter the appearance of the
+    screen by adding and removing widgets. The server maintains
+    information about each top-level window in a corresponding
+    QWSWindow object.
+
+    Whenever the server receives an event, it queries its stack of
+    top-level windows to find the window containing the event's
+    position. Each window can identify the client application that
+    created it, and returns its ID to the server upon
+    request. Finally, the server forwards the event, encapsulated by
+    an instance of the QWSEvent class, to the appropriate client.
+
+    \image qt-embedded-clientservercommunication.png
+
+    If an input method is installed, it is used as a filter between
+    the server and the client application. Derive from the
+    QWSInputMethod class to implement custom input methods, and use
+    the server's \l {QWSServer::}{setCurrentInputMethod()} function to
+    install it. In addition, it is possible to implement global,
+    low-level filters on key events using the
+    QWSServer::KeyboardFilter class; this can be used to implement
+    things like advanced power management suspended from a button
+    without having to filter for it in all applications.
+
+    \table 100%
+    \header \o UNIX Domain Socket
+    \row
+    \o
+
+    \image qt-embedded-client.png
+
+    The server communicates with the client applications over the UNIX
+    domain socket. You can retrieve direct access to all the events a
+    client receives from the server, by reimplementing QApplication's
+    \l {QApplication::}{qwsEventFilter()} function.
+
+    \endtable
+
+    The clients (and the server) communicate with each other using the
+    QCopChannel class. QCOP is a many-to-many communication protocol
+    for transferring messages on various channels. A channel is
+    identified by a name, and anyone who wants to can listen to
+    it. The QCOP protocol allows clients to communicate both within
+    the same address space and between different processes.
+
+    \section1 Pointer Handling Layer
+
+    \list
+        \o QWSMouseHandler
+        \o QMouseDriverPlugin
+        \o QMouseDriverFactory
+    \endlist
+
+    The mouse driver (represented by an instance of the
+    QWSMouseHandler class) is loaded by the server application when it
+    starts running, using Qt's \l {How to Create Qt Plugins}{plugin
+    system}.
+
+    \image qt-embedded-pointerhandlinglayer.png
+
+    A mouse driver receives mouse events from the device and
+    encapsulates each event with an instance of the QWSEvent class
+    which it then passes to the server.
+
+    \l{Qt for Embedded Linux} provides ready-made drivers for several mouse
+    protocols, see the \l{Qt for Embedded Linux Pointer Handling}{pointer
+    handling} documentation for details. Custom mouse drivers can be
+    implemented by subclassing the QWSMouseHandler class and creating
+    a mouse driver plugin. The default implementation of the
+    QMouseDriverFactory class will automatically detect the plugin,
+    loading the driver into the server application at runtime.
+
+    In addition to the generic mouse handler, \l{Qt for Embedded Linux}
+    provides a calibrated mouse handler. Use the
+    QWSCalibratedMouseHandler class as the base class when the system
+    device does not have a fixed mapping between device and screen
+    coordinates and/or produces noisy events, e.g. a touchscreen.
+
+    See also: \l{Qt for Embedded Linux Pointer Handling} and
+    \l{How to Create Qt Plugins}.
+
+    \section1 Character Input Layer
+
+    \list
+        \o QWSKeyboardHandler
+        \o QKbdDriverPlugin
+        \o QKbdDriverFactory
+    \endlist
+
+    The keyboard driver (represented by an instance of the
+    QWSKeyboardHandler class) is loaded by the server application when
+    it starts running, using Qt's \l {How to Create Qt Plugins}{plugin
+    system}.
+
+    \image qt-embedded-characterinputlayer.png
+
+    A keyboard driver receives keyboard events from the device and
+    encapsulates each event with an instance of the QWSEvent class
+    which it then passes to the server.
+
+    \l{Qt for Embedded Linux} provides ready-made drivers for several keyboard
+    protocols, see the \l {Qt for Embedded Linux Character Input}{character
+    input} documentation for details. Custom keyboard drivers can be
+    implemented by subclassing the QWSKeyboardHandler class and
+    creating a keyboard driver plugin. The default implementation of the
+    QKbdDriverFactory class will automatically detect the plugin, loading the
+    driver into the server application at run-time.
+
+    See also: \l{Qt for Embedded Linux Character Input} and \l {How to Create
+    Qt Plugins}.
+
+    \section1  Graphics Rendering
+
+    \list
+        \o QApplication
+        \o QDecoration
+        \o QDecorationPlugin
+        \o QDecorationFactory
+    \endlist
+
+    The default behavior is for each client to render its widgets as well
+    as its decorations into memory, while the server copies the memory content
+    to the device's framebuffer.
+
+    Whenever a client receives an event that alters any of its
+    widgets, the application updates the relevant parts of its memory
+    buffer:
+
+    \image qt-embedded-clientrendering.png
+
+    The decoration is loaded by the client application when it starts
+    running (using Qt's \l {How to Create Qt Plugins}{plugin system}),
+    and can be customized by deriving from the QDecoration class and
+    creating a decoration plugin. The default implementation of
+    the QDecorationFactory class will automatically detect the plugin,
+    loading the decoration into the application at runtime. Call the
+    QApplication::qwsSetDecoration() function to actually apply the
+    given decoration to an application.
+
+    \table 100%
+    \header \o Direct Painting \target Direct Painting
+    \row
+    \o
+
+    It is possible for the clients to manipulate and control the
+    underlying hardware directly. There are two ways of achieving
+    this: The first approach is to set the Qt::WA_PaintOnScreen window
+    attribute for each widget, the other is to use the QDirectPainter
+    class to reserve a region of the framebuffer.
+
+    \image qt-embedded-setwindowattribute.png
+
+    By setting the Qt::WA_PaintOnScreen attribute, the application
+    renders the widget directly onto the screen and the affected
+    region will not be modified by the screen driver \e unless another
+    window with a higher focus requests (parts of) the same
+    region. Note that if you want to render all of an application's
+    widgets directly on screen, it might be easier to set the
+    QT_ONSCREEN_PAINT environment variable.
+
+    \image qt-embedded-reserveregion.png
+
+    Using QDirectPainter, on the other hand, provides a complete
+    control over the reserved region, i.e., the screen driver will
+    never modify the given region.
+
+    To draw on a region reserved by a QDirectPainter instance, the
+    application must get hold of a pointer to the framebuffer. In
+    general, a pointer to the framebuffer can be retrieved using the
+    QDirectPainter::frameBuffer() function. But note that if the
+    current screen has subscreens, you must query the screen driver
+    instead to identify the correct subscreen. A pointer to the
+    current screen driver can always be retrieved using the static
+    QScreen::instance() function. Then use QScreen's \l
+    {QScreen::}{subScreenIndexAt()} and \l {QScreen::}{subScreens()}
+    functions to access the correct subscreen, and the subscreen's \l
+    {QScreen::}{base()} function to retrieve a pointer to the
+    framebuffer.
+
+    Note that \l{Qt for Embedded Linux} also provides the QWSEmbedWidget class,
+    making it possible to embed the reserved region (i.e., the
+    QDirectPainter object) in a regular widget.
+
+    \endtable
+
+    \section1 Drawing on Screen
+
+    \list
+        \o QScreen
+        \o QScreenDriverPlugin
+        \o QScreenDriverFactory
+    \endlist
+
+    When a screen update is required, the server runs through all the
+    top-level windows that intersect with the region that is about to
+    be updated, and ensures that the associated clients have updated
+    their memory buffer. Then the server uses the screen driver
+    (represented by an instance of the QScreen class) to copy the
+    content of the memory to the screen.
+
+    The screen driver is loaded by the server application when it
+    starts running, using Qt's plugin system. \l{Qt for Embedded Linux}
+    provides ready-made drivers for several screen protocols, see the
+    \l{Qt for Embedded Linux Display Management}{display management}
+    documentation for details. Custom screen drivers can be
+    implemented by subclassing the QScreen class and creating a screen
+    driver plugin. The default implementation of the QScreenDriverFactory
+    class will automatically detect the plugin, loading the driver into
+    the server application at run-time.
+
+    \image qt-embedded-drawingonscreen.png
+
+    To locate the relevant parts of memory, the driver is provided
+    with the list of top-level windows that intersect with the given
+    region. Associated with each of the top-level windows there is an
+    instance of the QWSWindowSurface class representing the drawing
+    area of the window. The driver uses these objects to retrieve
+    pointers to the various memory blocks. Finally, the screen driver
+    composes the surface images before copying the updated region to
+    the framebuffer.
+
+    \table 100%
+    \header \o Accelerated Graphics
+    \row
+    \o
+
+    In \l{Qt for Embedded Linux}, painting is a pure software implementation,
+    but (starting with Qt 4.2) it is possible to add an accelerated
+    graphics driver to take advantage of available hardware resources.
+
+    \image qt-embedded-accelerateddriver.png
+
+    The clients render each window onto a corresponding window surface
+    object using Qt's paint system, and then store the surface in
+    memory. The screen driver accesses the memory and composes the
+    surface images before it copies them to the screen as explained
+    above.
+
+    To add an accelerated graphics driver you must create a custom
+    screen and implement a custom raster paint engine
+    (\l{Qt for Embedded Linux} uses a raster-based paint engine to
+    implement the painting operations). Then you must create a custom
+    paint device that is aware of your paint engine, a custom window
+    surface that knows about your paint device, and make your screen
+    able to recognize your window surface.
+
+    See the \l{Adding an Accelerated Graphics Driver to Qt for Embedded Linux}
+    {accelerated graphics driver} documentation for details.
+
+    \endtable
+
+    See also: \l{Qt for Embedded Linux Display Management} and
+    \l{How to Create Qt Plugins}.
+*/
diff --git a/doc/src/qtopiacore-displaymanagement.qdoc b/doc/src/qtopiacore-displaymanagement.qdoc
new file mode 100644
index 0000000000..7cfa91f5cd
--- /dev/null
+++ b/doc/src/qtopiacore-displaymanagement.qdoc
@@ -0,0 +1,205 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt-embedded-displaymanagement.html
+
+    \title Qt for Embedded Linux Display Management
+    \ingroup qt-embedded-linux
+
+    When rendering, the default behavior for each Qt for Embedded Linux
+    client is to render its widgets into memory, while the server is
+    responsible for putting the contents of the memory onto the
+    screen. The server uses the screen driver to copy the content of
+    the memory to the display.
+
+    The screen driver is loaded by the server application when it
+    starts running, using Qt's \l {How to Create Qt Plugins}{plugin
+    system}.
+
+    Contents:
+
+    \tableofcontents
+
+    \section1 Available Drivers
+
+    \l{Qt for Embedded Linux} provides drivers for the Linux framebuffer, the
+    virtual framebuffer, transformed screens, VNC servers and multi
+    screens. Run the \c configure script to list the available
+    drivers:
+
+    \if defined(QTOPIA_DOCS)
+    \snippet doc/src/snippets/code/doc_src_qt-embedded-displaymanagement.qdoc 0
+    \else
+    \snippet doc/src/snippets/code/doc_src_qt-embedded-displaymanagement.qdoc 1
+    \endif
+
+    \if defined(QTOPIA_DOCS)
+    In the default Qt Extended configuration, only an unaccelerated Linux
+    framebuffer driver (\c /dev/fb0) is enabled. The various drivers
+    can be enabled and disabled using the \c configure script. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_qt-embedded-displaymanagement.qdoc 2
+    \else
+    In the default Qt configuration, only an unaccelerated Linux
+    framebuffer driver (\c /dev/fb0) is enabled. The various drivers
+    can be enabled and disabled using the \c configure script. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_qt-embedded-displaymanagement.qdoc 3
+    \endif
+
+    Custom screen drivers can be implemented by subclassing the
+    QScreen class and creating a screen driver plugin (derived from
+    the QScreenDriverPlugin class). The default implementation
+    of the QScreenDriverFactory class will automatically detect the
+    plugin, loading the driver into the server application at run-time.
+
+    \section1 Specifying a Driver
+
+    To specify which driver to use, set the QWS_DISPLAY environment
+    variable. For example (if the current shell is bash, ksh, zsh or
+    sh):
+
+    \snippet doc/src/snippets/code/doc_src_qt-embedded-displaymanagement.qdoc 4
+
+    The valid values for the \c <driver> argument are \c LinuxFb, \c
+    QVFb, \c VNC, \c Transformed, \c Multi and \l
+    {QScreenDriverPlugin::keys()}{keys} identifying custom drivers,
+    and the \c {<display num>} argument is used to separate screens
+    that are using the same screen driver and to enable multiple
+    displays (see the \l {Running Qt for Embedded Linux Applications}
+    documentation for more details). The driver specific options are
+    described in the table below.
+
+    \table
+    \header
+        \o Driver Specific Option \o Available For  \o Description
+    \row
+        \o \c tty=<device>
+        \o LinuxFb
+        \o Passes the device file to the console the application is
+        running on.
+    \row
+        \o \c nographicsmodeswitch
+        \o LinuxFb
+        \o Ensures that the application is not in graphics mode.
+    \row
+        \o \c littleendian
+        \o LinuxFb
+        \o Tells the driver it must handle a little-endian frame 
+        buffer in a big-endian system.
+    \row
+        \o \c mmWidth=<value> \target mmWidth
+        \o LinuxFb, QVFb
+        \o The screen's physical width (used to calculate DPI).
+    \row
+        \o \c mmHeight=<value> \target mmHeight
+        \o LinuxFb, QVFb
+        \o The screen's physical height (used to calculate DPI).
+    \row
+        \o \c <device>
+        \o LinuxFb
+        \o
+    \row
+        \o \c <subdriver>
+        \o VNC, Transformed, Multi
+        \o Specifies a subdriver.
+    \row
+        \o \c <RotX>
+        \o Transformed
+        \o Specifies the rotation of the screen. The valid values of
+        \c X are 90, 180 and 270.
+    \row
+        \o \c offset=<x,y>
+        \o Multi
+        \o Specifies the coordinates of a subscreens top-left corner
+        (by default 0,0).
+
+    \endtable
+
+    The QWS_DISPLAY environment variable can also be set using the \c
+    -display option when running an application. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qt-embedded-displaymanagement.qdoc 5
+
+    \section1 Subdrivers and Multiple Drivers
+
+    The VNC, Transformed and Multi screen drivers depend on
+    subdrivers. The general syntax for specifying a driver is as
+    follows:
+
+    \snippet doc/src/snippets/code/doc_src_qt-embedded-displaymanagement.qdoc 6
+
+    In the case of subdrivers, it is important to add a space between
+    each subdriver and before the display number to separate the
+    various drivers and displays. Note that \c Multi screen drivers
+    can have several subdrivers. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qt-embedded-displaymanagement.qdoc 7
+
+    Note also that the VNC screen driver defaults to a virtual screen
+    driver if no subdriver is specified. In this case the VNC driver accepts a
+    few additional (optional) arguments specifying the size and depth
+    of the default virtual screen:
+
+    \list
+        \o \c {size=<width x height>}
+        \o \c {depth=<value>}
+        \o \c {mmHeight=<physical height in millimeters>}
+        \o \c {mmWidth=<physical width in millimeters>}
+    \endlist
+
+    Example running the VNC screen driver with a virtual screen of size 
+    720x480 with 32 bits per pixel:
+
+    \snippet doc/src/snippets/code/doc_src_qt-embedded-displaymanagement.qdoc 8
+
+    Example running the VNC screen driver on top of the Linux framebuffer
+    driver:
+
+    \snippet doc/src/snippets/code/doc_src_qt-embedded-displaymanagement.qdoc 9
+
+    In this last example, Qt is using two screen drivers simultaneously,
+    displaying output on both the device's screen and across a network on
+    VNC client displays.
+*/
diff --git a/doc/src/qtopiacore-opengl.qdoc b/doc/src/qtopiacore-opengl.qdoc
new file mode 100644
index 0000000000..ceaff22edb
--- /dev/null
+++ b/doc/src/qtopiacore-opengl.qdoc
@@ -0,0 +1,227 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\page qt-embedded-opengl.html
+
+\title Qt for Embedded Linux and OpenGL
+\ingroup qt-embedded-linux
+
+\section1 Introduction
+
+\l {http://www.opengl.org}{OpenGL} is an industry standard API for
+2D/3D graphics. It provides a powerful, low-level interface between
+software and acceleration hardware, and it is operating system and
+window system independent.
+
+\l {http://www.khronos.org/opengles}{OpenGL ES} is a subset
+of the \l {http://www.opengl.org}{OpenGL} standard.
+Because it is meant for use in embedded systems, it has a smaller,
+more constrained API. 
+
+For reference, Nokia provides a plugin which integrates \l
+{http://www.khronos.org/opengles}{OpenGL ES} with Qt for Embedded Linux,
+but Qt for Embedded Linux can be adapted to a wide range of OpenGL
+versions.
+
+There are three ways to use OpenGL with Qt for Embedded Linux:
+\list
+  \o Perform OpenGL 3D graphics operations in applications;
+  \o Accelerate normal 2D painting operations; 
+  \o Implement window compositing and special effects.
+\endlist
+
+Qt for Embedded Linux is shipped with a reference integration example
+that demonstrates all three uses.
+
+\section2 Using OpenGL 3D Graphics in Applications
+
+The \l {QtOpenGL module} offers classes that make it easy to draw 3D
+graphics in GUI applications. The module API is cross-platform, so it
+is also available on Windows, X11, and Mac OS X.
+
+To use OpenGL-enabled widgets in a Qt for Embedded Linux application,
+all that is required is to subclass the QGLWidget and draw into instances of
+the subclass with standard OpenGL functions. 
+
+\section2 Using OpenGL to Accelerate Normal 2D Painting
+
+Qt provides QOpenGLPaintEngine, a subclass of QPaintEngine that
+translates QPainter operations into OpenGL calls. This specialized
+paint engine can be used to improve 2D rendering performance on
+appropriate hardware. It can also overlay controls and decorations
+onto 3D scenes drawn using OpenGL.
+
+\section2 Using OpenGL to Implement Window Compositing and Effects
+
+Qt for Embedded Linux includes a complete windowing system, which implements
+real transparency. The windowing system can be accelerated using
+OpenGL to implement top level window compositing. This makes it easy
+to add 3D effects to applications, for instance when windows are
+minimized or maximized.
+
+\section1 Acceleration Architecture
+
+The diagram below shows the Qt for Embedded Linux painting architecture.
+
+\image qt-embedded-opengl3.png
+
+A client process widget uses a paint engine to draw into a window
+surface. The server then combines the window surfaces and displays the
+composition on the screen. This architecture lets you
+control the steps of the painting process by subclassing. 
+
+Subclassing QPaintEngine allows you to implement the QPainter API
+using accelerated hardware.  Subclassing QWindowSurface lets you
+decide the properties of the space your widgets will draw themselves
+into, as well as which paint engine they should use to draw themselves
+into that space.  Subclassing QScreen lets you control the creation of
+window surfaces and lets you decide how to implement window
+compositing.  Using subclassing, your implementation work is minimized
+since you can reuse base class functionality you don't need to change.
+
+The elements of an accelerated Qt for Embedded Linux system are shown in the
+diagram below.
+
+\image qt-embedded-opengl1.png
+
+The applications, using the Qt API, do not depend on the presence of
+the acceleration plugin. The plugin uses the graphics hardware to
+accelerate painting primitives. Any operations not accelerated by the
+plugin are done in software by the software paint engine.
+
+To integrate an OpenGL implementation into Qt for Embedded Linux for a
+particular platform, you use the same mechanisms you would use for
+writing any other accelerated driver. Base classes, e.g., QGLScreen
+and QWSGLWindowSurface, are provided to minimize the need for
+reimplementing common functionality.
+
+\section1 The Reference Integration
+
+The \l{OpenGL for Embedded Systems Example} is the reference implementation
+for integrating OpenGL ES and \l{http://www.khronos.org/egl/}{EGL} with
+the graphics acceleration architecture of Qt for Embedded Linux.
+(\l{http://www.khronos.org/egl/}{EGL} is a library that binds OpenGL ES to
+native windowing systems.)
+
+The diagram below shows how OpenGL ES is used within the acceleration architecture:
+
+\image qt-embedded-opengl2.png
+
+The example implements a screen driver plugin that demonstrates all
+three uses of OpenGL in Qt for Embedded Linux: 2D graphics acceleration, 3D
+graphics operations using the \l {QtOpenGL module}, and top-level
+window compositing and special effects. The applications still do
+not talk directly to the accelerated plugin. 
+
+For 2D graphics, applications use the normal Qt painting API. The example accelerates 2D
+painting by using the QOpenGLPaintEngine, which is included in the \l {QtOpenGL module}.
+
+For 3D graphics applications use the OpenGL API directly, together with the functionality
+in the Qt OpenGL support classes. The example supports this by creating a
+QWSGLWindowSurface whenever a QGLWidget is instantiated.
+
+All access to the display is done through OpenGL. The example subclasses
+QWSGLWindowSurface implementation and uses the \l
+{http://oss.sgi.com/projects/ogl-sample/registry/EXT/framebuffer_object.txt} 
+{OpenGL Framebuffer Object extension} to draw windows into an offscreen buffer. This
+lets the example use OpenGL to implement top level window compositing of opaque and
+semi-transparent windows, and to provide a 3D animated transition effect as each new
+window is shown.
+
+The specific OpenGL library being used by the example restricts all
+OpenGL operations to occur in a single process. Hence the example
+creates instances of QWSGLWindowSurface only in the server process.
+Other processes then perform 2D graphics by creating instances
+of the standard QWindowSurface classes for client processes.  The
+standard window surface performs software-based rendering into a
+shared memory segment. The server then transfers the contents of this
+shared memory into an OpenGL texture before they are drawn onto the
+screen during window compositing.
+
+\omit
+
+\section1 Future Directions
+
+\section2 API Improvements
+
+Nokia is now working on enhancing the API for integrating OpenGL
+with Qt for Embedded Linux. The current design plan includes the following
+features:
+
+\list
+
+  \o Provide convenience classes, e.g., QEGLScreen and
+  QWSEGLWindowSurface, which implement common uses of the EGL
+  API. These classes will simplify implementing an OpenGL ES 
+  integration.
+
+  \o Extend the screen driver API to provide more control over window
+  properties and animations, and provide a software-based integration
+  to enable testing on the desktop.
+
+  \o Improve performance as opportunities arise.
+
+\endlist
+
+\section2 OpenVG Support
+
+\l {http://www.khronos.org/openvg} {OpenVG} is a dedicated API for 2D
+graphics on mobile devices. It is therefore more likely to be a better
+alternative for 2D acceleration than OpenGL. Until recently, no
+OpenVG-capable hardware has been available, so Nokia has not yet
+included an OpenVG solution in Qt for Embedded Linux.
+
+However, Nokia has done a feasibility study, implementing an
+OpenVG paint engine on top of a software OpenVG implementation.
+Assuming availability of the appropriate hardware, this OpenVG paint
+engine can easily be completed and integrated using the existing
+acceleration architecture. Since OpenVG shares the same EGL layer as
+OpenGL ES, the work already done on the OpenGL integration can be
+reused.
+
+Related technologies included in the \l
+{http://www.khronos.org/openkode} {OpenKODE} API set will also be
+considered.
+
+\endomit
+
+*/
diff --git a/doc/src/qtopiacore.qdoc b/doc/src/qtopiacore.qdoc
new file mode 100644
index 0000000000..43e31eb3cc
--- /dev/null
+++ b/doc/src/qtopiacore.qdoc
@@ -0,0 +1,114 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \group qt-embedded-linux
+    \ingroup topics
+    \ingroup qt-embedded
+    \title Qt for Embedded Linux
+    \brief Documents specifically about Qt for Embedded Linux.
+
+    Qt for Embedded Linux is a C++ framework for GUI and application development
+    for embedded devices. It runs on a variety of processors, usually
+    with Embedded Linux.  Qt for Embedded Linux provides the standard Qt API for
+    embedded devices with a lightweight window system.
+
+    \image qt-embedded-architecture.png
+
+    Qt for Embedded Linux applications write directly to the framebuffer,
+    eliminating the need for the X Window System and saving memory.
+    The Linux framebuffer is enabled by default on all modern Linux
+    distributions. For information on older versions, please refer to
+    the \l{Framebuffer HOWTO} document. For development
+    and debugging purposes, Qt for Embedded Linux provides a \l {The
+    Virtual Framebuffer}{virtual framebuffer}. It is also possible to
+    run an application using the
+    \l{The VNC Protocol and Qt for Embedded Linux}{VNC protocol}.
+
+    \table 100%
+    \header \o Getting Started \o Reference \o Features
+    \row
+    \o
+     \list
+        \o \l {Qt for Embedded Linux Architecture}{Architecture Overview}
+        \o \l {Installing Qt for Embedded Linux}{Installation}
+        \o \l {Running Qt for Embedded Linux Applications}{Running Applications}
+        \o \l {Qt Examples#Qt for Embedded Linux}{Examples}
+    \endlist
+    \o
+    \list
+        \o \l {Qt for Embedded Linux Classes}{Classes}
+        \o \l {Qt for Embedded Linux Environment Variables}{Environment Variables}
+        \o \l {Licenses for Fonts Used in Qt for Embedded Linux}{Font Licenses}
+    \endlist
+    \o
+    \list
+        \o \l {Qt for Embedded Linux Pointer Handling}{Pointer Handling}
+        \o \l {Qt for Embedded Linux Character Input}{Character Input}
+        \o \l {Qt for Embedded Linux Display Management}{Display Management}
+        \o \l {Qt for Embedded Linux and OpenGL}{OpenGL}
+        \o \l {Qt for Embedded Linux Fonts}{Fonts}
+    \endlist
+
+    \header \o Development \o Porting \o Optimization
+    \row
+    \o
+     \list
+        \o \l {The Virtual Framebuffer}{Virtual Framebuffer}
+        \o \l {The VNC Protocol and Qt for Embedded Linux}{VNC Protocol}
+        \o \l {Testing the Linux Framebuffer}
+        \o \l {Cross Compiling Qt for Embedded Linux Applications}{Cross Compiling Applications}
+        \o \l {Deploying Qt for Embedded Linux Applications}{Deploying Applications}
+    \endlist
+    \o
+    \list
+        \o \l {Porting Qt Applications to Qt for Embedded Linux}
+        \o \l {Porting Qt for Embedded Linux to a New Architecture}
+        \o \l {Porting Qt for Embedded Linux to Another Operating System}
+    \endlist
+    \o
+    \list
+        \o \l {Qt Performance Tuning}
+        \o \l {Fine-Tuning Features in Qt}
+        \o \l {Adding an Accelerated Graphics Driver to Qt for Embedded Linux}{Adding an Accelerated Graphics Driver}
+    \endlist
+    \endtable
+*/
diff --git a/doc/src/qtscript.qdoc b/doc/src/qtscript.qdoc
new file mode 100644
index 0000000000..4a2bbf6a64
--- /dev/null
+++ b/doc/src/qtscript.qdoc
@@ -0,0 +1,1934 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \module QtScript
+  \title QtScript Module
+  \since 4.3
+  \contentspage Qt's Modules
+  \previouspage QtOpenGL
+  \nextpage QtScriptTools
+  \ingroup modules
+  \ingroup scripting
+
+  \brief The QtScript module provides classes for making Qt applications scriptable.
+
+  \tableofcontents
+
+  \section1 Configuring the Build Process
+
+  Applications that use Qt's Script classes need to
+  be configured to be built against the QtScript module.
+  To include the definitions of the module's classes, use the
+  following directive:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 0
+
+  To link against the module, add this line to your \l qmake \c .pro file:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 1
+
+  The QtScript module is part of the \l{Qt Full Framework Edition} and the
+  \l{Open Source Versions of Qt}.
+
+  The QtScript module only provides core scripting facilities; the
+  QtScriptTools module provides additional Qt Script-related
+  components that application developers may find useful.
+
+  \section1 Language Overview
+
+  Qt Script is based on the ECMAScript scripting language, as defined
+  in standard \l{ECMA-262}. Microsoft's JScript, and Netscape's
+  JavaScript are also based on the ECMAScript standard. For an
+  overview of ECMAScript, see the
+  \l{ECMAScript Reference}{ECMAScript reference}.
+  If you are not familiar with the ECMAScript language, there are
+  several existing tutorials and books that cover this subject, such
+  as \l{JavaScript: The Definitive Guide}.
+
+  Existing users of \l{Qt Script for Applications (QSA)} may find the
+  \l{Moving from QSA to Qt Script} document useful when porting
+  QSA scripts to Qt Script.
+
+  \section1 Basic Usage
+
+  To evaluate script code, you create a QScriptEngine and call its
+  evaluate() function, passing the script code (text) to evaluate
+  as argument.
+
+  \snippet doc/src/snippets/qtscript/evaluation/main.cpp 0
+
+  The return value will be the result of the evaluation (represented
+  as a QScriptValue object); this can be converted to standard C++
+  and Qt types.
+
+  Custom properties can be made available to scripts by registering
+  them with the script engine. This is most easily done by setting
+  properties of the script engine's \e{Global Object}:
+
+  \snippet doc/src/snippets/qtscript/registeringvalues/main.cpp 0
+
+  This places the properties in the script environment, thus making them
+  available to script code.
+
+  \section1 Making a QObject Available to the Script Engine
+
+  Any QObject-based instance can be made available for use with scripts.
+
+  When a QObject is passed to the QScriptEngine::newQObject() function,
+  a Qt Script wrapper object is created that can be used to make the
+  QObject's signals, slots, properties, and child objects available
+  to scripts.
+
+  Here's an example of making an instance of a QObject subclass
+  available to script code under the name \c{"myObject"}:
+
+  \snippet doc/src/snippets/qtscript/registeringobjects/main.cpp 0
+
+  This will create a global variable called \c{myObject} in the
+  script environment. The variable serves as a proxy to the
+  underlying C++ object. Note that the name of the script variable
+  can be anything; i.e., it is not dependent upon QObject::objectName().
+
+  The \l{QScriptEngine::}{newQObject()} function accepts two additional
+  optional arguments: one is the ownership mode, and the other is a
+  collection of options that allow you to control certain aspects of how
+  the QScriptValue that wraps the QObject should behave. We will come
+  back to the usage of these arguments later.
+
+  \section2 Using Signals and Slots
+
+  Qt Script adapts Qt's central \l{Signals and Slots} feature for
+  scripting. There are three principal ways to use signals and slots
+  with Qt Script:
+
+  \list
+  \i \bold{Hybrid C++/script}: C++ application code connects a
+  signal to a script function. The script function can, for example, be
+  a function that the user has typed in, or one that you have read from a
+  file. This approach is useful if you have a QObject but don't want
+  to expose the object itself to the scripting environment; you just
+  want a script to be able to define how a signal should be reacted
+  to, and leave it up to the C++ side of your application to establish
+  the connection.
+
+  \i \bold{Hybrid script/C++}: A script can connect signals and slots
+  to establish connections between pre-defined objects that the
+  application exposes to the scripting environment. In this scenario,
+  the slots themselves are still written in C++, but the definition of
+  the connections is fully dynamic (script-defined).
+
+  \i \bold{Purely script-defined}: A script can both define signal
+  handler functions (effectively "slots written in Qt Script"),
+  \e{and} set up the connections that utilize those handlers. For
+  example, a script can define a function that will handle the
+  QLineEdit::returnPressed() signal, and then connect that signal to the
+  script function.
+  \endlist
+
+  Use the qScriptConnect() function to connect a C++ signal to a
+  script function. In the following example a script signal handler is
+  defined that will handle the QLineEdit::textChanged() signal:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 47
+
+  The first two arguments to qScriptConnect() are the same
+  as you would pass to QObject::connect() to establish a normal C++
+  connection. The third argument is the script object that will act
+  as the \c this object when the signal handler is invoked; in the above
+  example we pass an invalid script value, so the \c this object will
+  be the Global Object. The fourth argument is the script function
+  ("slot") itself. The following example shows how the \c this argument
+  can be put to use:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 48
+
+  We create two QLineEdit objects and define a single signal handler
+  function. The connections use the same handler function, but the
+  function will be invoked with a different \c this object depending on
+  which object's signal was triggered, so the output of the print()
+  statement will be different for each.
+
+  In script code, Qt Script uses a different syntax for connecting to
+  and disconnecting from signals than the familiar C++ syntax; i.e.,
+  QObject::connect().
+  To connect to a signal, you reference the relevant signal as a property
+  of the sender object, and invoke its \c{connect()} function. There
+  are three overloads of \c{connect()}, each with a corresponding
+  \c{disconnect()} overload. The following subsections describe these
+  three forms.
+
+  \section3 Signal to Function Connections
+
+  \c{connect(function)}
+
+  In this form of connection, the argument to \c{connect()} is the
+  function to connect to the signal.
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 2
+
+  The argument can be a Qt Script function, as in the above
+  example, or it can be a QObject slot, as in
+  the following example:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 3
+
+  When the argument is a QObject slot, the argument types of the
+  signal and slot do not necessarily have to be compatible;
+  QtScript will, if necessary, perform conversion of the signal
+  arguments to match the argument types of the slot.
+
+  To disconnect from a signal, you invoke the signal's
+  \c{disconnect()} function, passing the function to disconnect
+  as argument:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 4
+
+  When a script function is invoked in response to a signal, the
+  \c this object will be the Global Object.
+
+  \section3 Signal to Member Function Connections
+
+  \c{connect(thisObject, function)}
+
+  In this form of the \c{connect()} function, the first argument
+  is the object that will be bound to the variable, \c this, when
+  the function specified using the second argument is invoked.
+
+  If you have a push button in a form, you typically want to do
+  something involving the form in response to the button's
+  \c{clicked} signal; passing the form as the \c this object
+  makes sense in such a case.
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 5
+
+  To disconnect from the signal, pass the same arguments to \c{disconnect()}:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 6
+
+  \section3 Signal to Named Member Function Connections
+
+  \c{connect(thisObject, functionName)}
+
+  In this form of the \c{connect()} function, the first argument is
+  the object that will be bound to the variable, \c this, when
+  a function is invoked in response to the signal. The second argument
+  specifies the name of a function that is connected to the signal,
+  and this refers to a member function of the object passed as the
+  first argument (\c thisObject in the above scheme).
+
+  Note that the function is resolved when the connection is made, not
+  when the signal is emitted.
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 7
+
+  To disconnect from the signal, pass the same arguments to \c{disconnect()}:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 8
+
+  \section3 Error Handling
+
+  When \c{connect()} or \c{disconnect()} succeeds, the function will
+  return \c{undefined}; otherwise, it will throw a script exception.
+  You can obtain an error message from the resulting \c{Error} object.
+  Example:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 9
+
+  \section3 Emitting Signals from Scripts
+
+  To emit a signal from script code, you simply invoke the signal
+  function, passing the relevant arguments:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 10
+
+  It is currently not possible to define a new signal in a script;
+  i.e., all signals must be defined by C++ classes.
+
+  \section3 Overloaded Signals and Slots
+
+  When a signal or slot is overloaded, QtScript will attempt to
+  pick the right overload based on the actual types of the QScriptValue arguments
+  involved in the function invocation. For example, if your class has slots \c{myOverloadedSlot(int)} and \c{myOverloadedSlot(QString)}, the following script code will behave reasonably:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 11
+
+  You can specify a particular overload by using array-style property access with the \l{QMetaObject::normalizedSignature()}{normalized signature} of the C++ function as the property name:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 12
+
+  If the overloads have different number of arguments, QtScript will
+  pick the overload with the argument count that best matches the
+  actual number of arguments passed to the slot.
+
+  For overloaded signals, Qt Script will throw an error if you try to connect
+  to the signal by name; you have to refer to the signal with the full
+  normalized signature of the particular overload you want to connect to.
+
+  \section2 Accessing Properties
+
+  The properties of the QObject are available as properties
+  of the corresponding QtScript object. When you manipulate
+  a property in script code, the C++ get/set method for that
+  property will automatically be invoked. For example, if your
+  C++ class has a property declared as follows:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 13
+
+  then script code can do things like the following:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 14
+
+  \section2 Accessing Child QObjects
+
+  Every named child of the QObject (that is, for which
+  QObject::objectName() is not an empty string) is by default available as
+  a property of the QtScript wrapper object. For example,
+  if you have a QDialog with a child widget whose \c{objectName} property is
+  \c{"okButton"}, you can access this object in script code through
+  the expression
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 15
+
+  Since \c{objectName} is itself a Q_PROPERTY, you can manipulate
+  the name in script code to, for example, rename an object:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 16
+
+  You can also use the functions \c{findChild()} and \c{findChildren()}
+  to find children. These two functions behave identically to
+  QObject::findChild() and QObject::findChildren(), respectively.
+
+  For example, we can use these functions to find objects using strings
+  and regular expressions:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 17
+
+  You typically want to use \c{findChild()} when manipulating a form
+  that uses nested layouts; that way the script is isolated from the
+  details about which particular layout a widget is located in.
+
+  \section2 Controlling QObject Ownership
+
+  Qt Script uses garbage collection to reclaim memory used by script
+  objects when they are no longer needed; an object's memory can be
+  automatically reclaimed when it is no longer referenced anywhere in
+  the scripting environment. Qt Script lets you control what happens
+  to the underlying C++ QObject when the wrapper object is reclaimed
+  (i.e., whether the QObject is deleted or not); you do this when you
+  create an object by passing an ownership mode as the second argument
+  to QScriptEngine::newQObject().
+
+  Knowing how Qt Script deals with ownership is important, since it can
+  help you avoid situations where a C++ object isn't deleted when it
+  should be (causing memory leaks), or where a C++ object \e{is}
+  deleted when it shouldn't be (typically causing a crash if C++ code
+  later tries to access that object).
+
+  \section3 Qt Ownership
+
+  By default, the script engine does not take ownership of the
+  QObject that is passed to QScriptEngine::newQObject(); the object
+  is managed according to Qt's object ownership (see
+  \l{Object Trees and Object Ownership}). This mode is appropriate
+  when, for example, you are wrapping C++ objects that are part of
+  your application's core; that is, they should persist regardless of
+  what happens in the scripting environment. Another way of stating
+  this is that the C++ objects should outlive the script engine.
+
+  \section3 Script Ownership
+
+  Specifying QScriptEngine::ScriptOwnership as the ownership mode
+  will cause the script engine to take full ownership of the QObject
+  and delete it when it determines that it is safe to do so
+  (i.e., when there are no more references to it in script code).
+  This ownership mode is appropriate if the QObject does not have a
+  parent object, and/or the QObject is created in the context of the
+  script engine and is not intended to outlive the script engine.
+
+  For example, a constructor function that constructs QObjects
+  only to be used in the script environment is a good candidate:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 18
+
+  \section3 Auto-Ownership
+
+  With QScriptEngine::AutoOwnership the ownership is based on whether
+  the QObject has a parent or not.
+  If the QtScript garbage collector finds that the QObject is no
+  longer referenced within the script environment, the QObject will
+  be deleted \e{only} if it does not have a parent.
+
+  \section3 What Happens When Someone Else Deletes the QObject?
+
+  It is possible that a wrapped QObject is deleted outside of
+  Qt Script's control; i.e., without regard to the ownership mode
+  specified. In this case, the wrapper object will still
+  be an object (unlike the C++ pointer it wraps, the script object
+  won't become null). Any attempt to access properties of the script
+  object will, however, result in a script exception being thrown.
+
+  Note that QScriptValue::isQObject() will still return true for a
+  deleted QObject, since it tests the type of the script object, not
+  whether the internal pointer is non-null. In other words, if
+  QScriptValue::isQObject() returns true but QScriptValue::toQObject()
+  returns a null pointer, this indicates that the QObject has been
+  deleted outside of Qt Script (perhaps accidentally).
+
+  \section2 Customizing Access to the QObject
+
+  QScriptEngine::newQObject() can take a third argument which allows
+  you to control various aspects of the access to the QObject through
+  the QtScript wrapper object it returns.
+
+  QScriptEngine::ExcludeChildObjects specifies that child objects of
+  the QObject should not appear as properties of the wrapper object.
+
+  QScriptEngine::ExcludeSuperClassProperties and
+  QScriptEngine::ExcludeSuperClassMethods can be used to avoid
+  exposing members that are inherited from the QObject's superclass.
+  This is useful for defining a "pure" interface where inherited members
+  don't make sense from a scripting perspective; e.g., you don't want
+  script authors to be able to change the \c{objectName} property of
+  the object or invoke the \c{deleteLater()} slot.
+
+  QScriptEngine::AutoCreateDynamicProperties specifies that properties
+  that don't already exist in the QObject should be created as dynamic
+  properties of the QObject, rather than as properties of the QtScript
+  wrapper object. If you want new properties to truly become persistent
+  properties of the QObject, rather than properties that are destroyed
+  along with the wrapper object (and that aren't shared if the QObject
+  is wrapped multiple times with QScriptEngine::newQObject()), you
+  should use this option.
+
+  QScriptEngine::SkipMethodsInEnumeration specifies that signals and
+  slots should be skipped when enumerating the properties of the QObject
+  wrapper in a for-in script statement. This is useful when defining
+  prototype objects, since by convention function properties of
+  prototypes should not be enumerable.
+
+  \section2 Making a QObject-based Class New-able from a Script
+
+  The QScriptEngine::newQObject() function is used to wrap an
+  existing QObject instance, so that it can be made available to
+  scripts. A different scenario is that you want scripts to be
+  able to construct new objects, not just access existing ones.
+
+  The Qt meta-type system currently does not provide dynamic
+  binding of constructors for QObject-based classes. If you want to
+  make such a class new-able from scripts, Qt Script can generate
+  a reasonable script constructor for you; see
+  QScriptEngine::scriptValueFromQMetaObject().
+
+  You can also use QScriptEngine::newFunction() to wrap your own
+  factory function, and add it to the script environment; see
+  QScriptEngine::newQMetaObject() for an example.
+
+  \section2 Enum Values
+
+  Values for enums declared with Q_ENUMS are not available as
+  properties of individual wrapper objects; rather, they are
+  properties of the QMetaObject wrapper object that can be created
+  with QScriptEngine::newQMetaObject().
+
+  \section1 Conversion Between QtScript and C++ Types
+
+  QtScript will perform type conversion when a value needs to be
+  converted from the script side to the C++ side or vice versa; for
+  instance, when a C++ signal triggers a script function, when
+  you access a QObject property in script code, or when
+  you call QScriptEngine::toScriptValue() or
+  QScriptEngine::fromScriptValue() in C++. QtScript provides default
+  conversion operations for many of the built-in Qt types. You can
+  change the conversion operation for a type (including your custom
+  C++ types) by registering your own conversion functions with
+  qScriptRegisterMetaType().
+
+  \section2 Default Conversion from Qt Script to C++
+
+  The following table describes the default conversion from a
+  QScriptValue to a C++ type.
+
+    \table 80%
+    \header \o C++ Type \o Default Conversion
+    \row    \o bool \o QScriptValue::toBool()
+    \row    \o int \o QScriptValue::toInt32()
+    \row    \o uint \o QScriptValue::toUInt32()
+    \row    \o float \o float(QScriptValue::toNumber())
+    \row    \o double \o QScriptValue::toNumber()
+    \row    \o short \o short(QScriptValue::toInt32())
+    \row    \o ushort \o QScriptValue::toUInt16()
+    \row    \o char \o char(QScriptValue::toInt32())
+    \row    \o uchar \o unsigned char(QScriptValue::toInt32())
+    \row    \o qlonglong \o qlonglong(QScriptValue::toInteger())
+    \row    \o qulonglong \o qulonglong(QScriptValue::toInteger())
+    \row    \o QString \o An empty string if the QScriptValue is null
+               or undefined; QScriptValue::toString() otherwise.
+    \row    \o QDateTime \o QScriptValue::toDateTime()
+    \row    \o QDate \o QScriptValue::toDateTime().date()
+    \row    \o QRegExp \o QScriptValue::toRegExp()
+    \row    \o QObject* \o QScriptValue::toQObject()
+    \row    \o QWidget* \o QScriptValue::toQObject()
+    \row    \o QVariant \o QScriptValue::toVariant()
+    \row    \o QChar \o If the QScriptValue is a string, the result
+               is the first character of the string, or a null QChar
+               if the string is empty; otherwise, the result is a QChar
+               constructed from the unicode obtained by converting the
+               QScriptValue to a \c{ushort}.
+    \row    \o QStringList \o If the QScriptValue is an array, the
+               result is a QStringList constructed from the result of
+               QScriptValue::toString() for each array element; otherwise,
+               the result is an empty QStringList.
+    \row    \o QVariantList \o If the QScriptValue is an array, the result
+               is a QVariantList constructed from the result of
+               QScriptValue::toVariant() for each array element; otherwise,
+               the result is an empty QVariantList.
+    \row    \o QVariantMap \o If the QScriptValue is an object, the result
+               is a QVariantMap with a (key, value) pair of the form
+               (propertyName, propertyValue.toVariant()) for each property,
+               using QScriptValueIterator to iterate over the object's
+               properties.
+    \row    \o QObjectList \o If the QScriptValue is an array, the result
+               is a QObjectList constructed from the result of
+               QScriptValue::toQObject() for each array element; otherwise,
+               the result is an empty QObjectList.
+    \row    \o QList<int> \o If the QScriptValue is an array, the result is
+               a QList<int> constructed from the result of
+               QScriptValue::toInt32() for each array element; otherwise,
+               the result is an empty QList<int>.
+    \endtable
+
+  Additionally, QtScript will handle the following cases:
+
+  \list
+  \i If the QScriptValue is a QObject and the target type name ends with
+     \c * (i.e., it is a pointer), the QObject pointer will be cast to the
+     target type with qobject_cast().
+  \i If the QScriptValue is a QVariant and the target type name ends with
+     \c * (i.e., it is a pointer), and the \l{QVariant::userType()}{userType()}
+     of the QVariant is the type that the target type points to, the result
+     is a pointer to the QVariant's data.
+  \i If the QScriptValue is a QVariant and it can be converted to the
+     target type (according to QVariant::canConvert()), the QVariant will
+     be cast to the target type with qvariant_cast().
+  \endlist
+
+  \section2 Default Conversion from C++ to Qt Script
+
+  The following table describes the default behavior when a QScriptValue is
+  constructed from a C++ type:
+
+    \table 80%
+    \header \o C++ Type \o Default Construction
+    \row    \o void \o QScriptEngine::undefinedValue()
+    \row    \o bool \o QScriptValue(engine, value)
+    \row    \o int \o QScriptValue(engine, value)
+    \row    \o uint \o QScriptValue(engine, value)
+    \row    \o float \o QScriptValue(engine, value)
+    \row    \o double \o QScriptValue(engine, value)
+    \row    \o short \o QScriptValue(engine, value)
+    \row    \o ushort \o QScriptValue(engine, value)
+    \row    \o char \o QScriptValue(engine, value)
+    \row    \o uchar \o QScriptValue(engine, value)
+    \row    \o QString \o QScriptValue(engine, value)
+    \row    \o qlonglong \o QScriptValue(engine, qsreal(value)). Note that
+               the conversion may lead to loss of precision, since not all
+               64-bit integers can be represented using the qsreal type.
+    \row    \o qulonglong \o QScriptValue(engine, qsreal(value)). Note that
+               the conversion may lead to loss of precision, since not all
+               64-bit unsigned integers can be represented using the qsreal
+               type.
+    \row    \o QChar \o QScriptValue(this, value.unicode())
+    \row    \o QDateTime \o \l{QScriptEngine::newDate()}{QScriptEngine::newDate}(value)
+    \row    \o QDate \o \l{QScriptEngine::newDate()}{QScriptEngine::newDate}(value)
+    \row    \o QRegExp \o \l{QScriptEngine::newRegExp()}{QScriptEngine::newRegExp}(value)
+    \row    \o QObject* \o \l{QScriptEngine::newQObject()}{QScriptEngine::newQObject}(value)
+    \row    \o QWidget* \o \l{QScriptEngine::newQObject()}{QScriptEngine::newQObject}(value)
+    \row    \o QVariant \o \l{QScriptEngine::newVariant()}{QScriptEngine::newVariant}(value)
+    \row    \o QStringList \o A new script array (created with
+               QScriptEngine::newArray()), whose elements are created using
+               the QScriptValue(QScriptEngine *, QString) constructor for
+               each element of the list.
+    \row    \o QVariantList \o A new script array (created with
+               QScriptEngine::newArray()), whose elements are created using
+               QScriptEngine::newVariant() for each element of the list.
+    \row    \o QVariantMap \o A new script object (created with
+               QScriptEngine::newObject()), whose properties are initialized
+               according to the (key, value) pairs of the map.
+    \row    \o QObjectList \o A new script array (created with
+               QScriptEngine::newArray()), whose elements are created using
+               QScriptEngine::newQObject() for each element of the list.
+    \row    \o QList<int> \o A new script array (created with
+               QScriptEngine::newArray()), whose elements are created using
+               the QScriptValue(QScriptEngine *, int) constructor for each
+               element of the list.
+    \endtable
+
+  Other types (including custom types) will be wrapped using
+  QScriptEngine::newVariant(). For null pointers of any type, the
+  result is QScriptEngine::nullValue().
+
+  \section1 How to Design and Implement Application Objects
+
+  This section explains how to implement application objects and
+  provides the necessary technical background material.
+
+  \section2 Making a C++ object available to Scripts Written in QtScript
+
+  Making C++ classes and objects available to a scripting language is
+  not trivial because scripting languages tend to be more dynamic than
+  C++, and it must be possible to introspect objects (query information
+  such as function names, function signatures, properties, etc., at
+  run-time). Standard C++ does not provide features for this.
+
+  We can achieve the functionality we want by extending C++, using
+  C++'s own facilities so our code is still standard C++. The Qt
+  meta-object system provides the necessary additional functionality.
+  It allows us to write using an extended C++ syntax, but converts this
+  into standard C++ using a small utility program called \l{moc}
+  (Meta-Object Compiler). Classes that wish to take advantage of the
+  meta-object facilities are either subclasses of QObject, or use the
+  \c{Q_OBJECT} macro. Qt has used this approach for many years and it has
+  proven to be solid and reliable. QtScript uses this meta-object
+  technology to provide scripters with dynamic access to C++ classes
+  and objects.
+
+  To completely understand how to make C++ objects available to Qt
+  Script, some basic knowledge of the Qt meta-object system is very
+  helpful. We recommend that you read the \l{Qt Object Model}. The
+  information in this document and the documents it links to are very
+  useful for understanding how to implement application objects.
+
+  However, this knowledge is not essential in the simplest cases.
+  To make an object available in QtScript, it must derive from
+  QObject. All classes which derive from QObject can be introspected
+  and can provide the information needed by the scripting engine at
+  run-time; e.g., class name, functions, signatures. Because we obtain
+  the information we need about classes dynamically at run-time, there
+  is no need to write wrappers for QObject derived classes.
+
+  \section2 Making C++ Class Member Functions Available in QtScript
+
+  The meta-object system also makes information about signals and slots
+  dynamically available at run-time. By default, for QObject subclasses,
+  only the signals and slots are automatically made available to scripts.
+  This is very convenient because, in practice, we normally only want to
+  make specially chosen functions available to scripters. When you create
+  a QObject subclass, make sure that the functions you want to expose to
+  QtScript are public slots.
+
+  For example, the following class definition enables scripting only for
+  certain functions:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 19
+
+  In the example above, aNonScriptableFunction() is not declared as a
+  slot, so it will not be available in QtScript. The other three
+  functions will automatically be made available in QtScript because
+  they are declared in the \c{public slots} section of the class
+  definition.
+
+  It is possible to make any function script-invokable by specifying
+  the \c{Q_INVOKABLE} modifier when declaring the function:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 20
+
+  Once declared with \c{Q_INVOKABLE}, the method can be invoked from
+  QtScript code just as if it were a slot. Although such a method is
+  not a slot, you can still specify it as the target function in a
+  call to \c{connect()} in script code; \c{connect()} accepts both
+  native and non-native functions as targets.
+
+  \section2 Making C++ Class Properties Available in QtScript
+
+  In the previous example, if we wanted to get or set a property using
+  QtScript we would have to write code like the following:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 21
+
+  Scripting languages often provide a property syntax to modify and
+  retrieve properties (in our case the enabled state) of an
+  object. Many script programmers would want to write the above code
+  like this:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 22
+
+  To make this possible, you must define properties in the C++ QObject
+  subclass. For example, the following \c MyObject class declaration
+  declares a boolean property called \c enabled, which uses the function
+  \c{setEnabled(bool)} as its setter function and \c{isEnabled()} as its
+  getter function:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 23
+
+  The only difference from the original code is the use of the macro
+  \c{Q_PROPERTY}, which takes the type and name of the property, and
+  the names of the setter and getter functions as arguments.
+
+  If you don't want a property of your class to be accessible in
+  QtScript, you set the \c{SCRIPTABLE} attribute to \c false when
+  declaring the property; by default, the \c{SCRIPTABLE} attribute is
+  \c true. For example:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 24
+
+  \section2 Reacting to C++ Objects Signals in Scripts
+
+  In the Qt object model, signals are used as a notification mechanism
+  between QObjects. This means one object can connect a signal to
+  another object's slot and, every time the signal is emitted, the slot
+  is called. This connection is established using the QObject::connect()
+  function.
+
+  The signals and slots mechanism is also available to QtScript
+  programmers. The code to declare a signal in C++ is the same,
+  regardless of whether the signal will be connected to a slot in C++
+  or in QtScript.
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 25
+
+  The only change we have made to the code in the previous section is
+  to declare a signals section with the relevant signal. Now, the
+  script writer can define a function and connect to the object like
+  this:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 26
+
+  \section2 Design of Application Objects
+
+  The previous section described how to implement C++ objects which
+  can be used in QtScript. Application objects are the same kind of
+  objects, and they make your application's functionality available to
+  QtScript scripters.  Since the C++ application is already written
+  in Qt, many objects are already QObjects. The easiest approach would
+  be to simply add all these QObjects as application objects to the
+  scripting engine. For small applications this might be sufficient,
+  but for larger applications this is probably not the right
+  approach. The problem is that this method reveals too much of the
+  internal API and gives script programmers access to application
+  internals which should not be exposed.
+
+  Generally, the best way of making application functionality available
+  to scripters is to code some QObjects which define the applications
+  public API using signals, slots, and properties. This gives you
+  complete control of the functionality made available by the
+  application. The implementations of these objects simply call the
+  functions in the application which do the real work. So, instead of
+  making all your QObjects available to the scripting engine, just add
+  the wrapper QObjects.
+
+  \section3 Returning QObject Pointers
+
+  If you have a slot that returns a QObject pointer, you should note
+  that, by default, Qt Script only handles conversion of the types
+  QObject* and QWidget*. This means that if your slot is declared
+  with a signature like "MyObject* getMyObject()", QtScript doesn't
+  automatically know that MyObject* should be handled in the same way
+  as QObject* and QWidget*. The simplest way to solve this is to only
+  use QObject* and QWidget* in the method signatures of your scripting
+  interface.
+
+  Alternatively, you can register conversion functions for your custom
+  type with the qScriptRegisterMetaType() function. In this way, you
+  can preserve the precise typing in your C++ declarations, while
+  still allowing pointers to your custom objects to flow seamlessly
+  between C++ and scripts. Example:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 43
+
+  \section1 Function Objects and Native Functions
+
+  In Qt Script, functions are first-class values; they are objects that
+  can have properties of their own, just like any other type of
+  object. They can be stored in variables and passed as arguments to
+  other functions. Knowing how function calls in Qt Script behave is
+  useful when you want to define and use your own script functions.
+  This section discusses this matter, and also explains how you can
+  implement native functions; that is, Qt Script functions written in
+  C++, as opposed to functions written in the scripting language
+  itself. Even if you will be relying mostly on the dynamic QObject
+  binding that Qt Script provides, knowing about these powerful
+  concepts and techniques is important to understand what's actually
+  going on when script functions are executed.
+
+  \section2 Calling a Qt Script Function from C++
+
+  Calling a Qt Script function from C++ is achieved with the
+  QScriptValue::call() function. A typical scenario is that you evaluate a
+  script that defines a function, and at some point you want to call that
+  function from C++, perhaps passing it some arguments, and then handle the
+  result. The following script defines a Qt Script object that has a
+  toKelvin() function:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 90
+
+  The toKelvin() function takes a temperature in Kelvin as argument, and
+  returns the temperature converted to Celsius. The following snippet shows
+  how the toKelvin() function might be obtained and called from C++:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 91
+
+  If a script defines a global function, you can access the function as a
+  property of QScriptEngine::globalObject(). For example, the following script
+  defines a global function add():
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 56
+
+  C++ code might call the add() function as follows:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 92
+
+  As already mentioned, functions are just values in Qt Script; a function by
+  itself is not "tied to" a particular object. This is why you have to specify
+  a \c{this} object (the first argument to QScriptValue::call()) that the
+  function should be applied to.
+
+ If the function is supposed to act as a method (i.e. it can only be applied
+  to a certain class of objects), it is up to the function itself to check
+  that it is being called with a compatible \c{this} object.
+
+ Passing an invalid QScriptValue as the \c{this} argument to
+  QScriptValue::call() indicates that the Global Object should be used as the
+  \c{this} object; in other words, that the function should be invoked as a
+  global function.
+
+  \section2 The \c this Object
+
+  When a Qt Script function is invoked from a script, the \e{way} in which it
+  is invoked determines the \c this object when the function body is executed,
+  as the following script example illustrates:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 49
+
+  An important thing to note is that in Qt Script, unlike C++ and Java, the
+  \c this object is not part of the execution scope. This means that
+  member functions (i.e., functions that operate on \c this) must always
+  use the \c this keyword to access the object's properties. For example,
+  the following script probably doesn't do what you want:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 50
+
+  You will get a reference error saying that 'a is not defined' or, worse,
+  two totally unrelated global variables \c a and \c b will be used to
+  perform the computation, if they exist. Instead, the script should look
+  like this:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 51
+
+  Accidentally omitting the \c this keyword is a typical source of
+  error for programmers who are used to the scoping rules of C++ and Java.
+
+  \section2 Wrapping a Native Function
+
+  Qt Script provides QScriptEngine::newFunction() as a way of wrapping a
+  C++ function pointer; this enables you to implement a function in
+  C++ and add it to the script environment, so that scripts can invoke
+  your function as if it were a "normal" script function. Here is how the
+  previous \c{getProperty()} function can be written in C++:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 52
+
+  Call QScriptEngine::newFunction() to wrap the function. This will
+  produce a special type of function object that carries a pointer to
+  the C++ function internally. Once the resulting wrapper has been
+  added to the scripting environment (e.g., by setting it as a property
+  of the Global Object), scripts can call the function without having
+  to know nor care that it is, in fact, a native function.
+
+  Note that the name of the C++ function doesn't matter in the
+  scripting sense; the name by which the function is invoked by
+  scripts depends only on what you call the script object property
+  in which you store the function wrapper.
+
+  It is currently not possible to wrap member functions; i.e., methods
+  of a C++ class that require a \c this object.
+
+  \section2 The QScriptContext Object
+
+  A QScriptContext holds all the state associated with a particular
+  invocation of your function. Through the QScriptContext, you can:
+  \list
+  \i Get the arguments that were passed to the function.
+  \i Get the \c this object.
+  \i Find out whether the function was called with the \c new operator
+     (the significance of this will be explained later).
+  \i Throw a script error.
+  \i Get the function object that's being invoked.
+  \i Get the activation object (the object used to hold local variables).
+  \endlist
+
+  The following sections explain how to make use of this
+  functionality.
+
+  \section2 Processing Function Arguments
+
+  Two things are worth noting about function arguments:
+
+  \list 1
+  \o Any script function \mdash including native functions \mdash can
+  be invoked with any number of arguments. This means that it is up to
+  the function itself to check the argument count if necessary, and act
+  accordingly (e.g., throw an error if the number of arguments is
+  too large, or prepare a default value if the number is too small).
+  \o A value of any type can be supplied as an argument to any
+  function. This means that it is up to you to check the type of the
+  arguments if necessary, and act accordingly (e.g., throw an error
+  if an argument is not an object of a certain type).
+  \endlist
+
+  In summary: Qt Script does not automatically enforce any constraints on the
+  number or type of arguments involved in a function call.
+
+  \section3 Formal Parameters and the Arguments Object
+
+  A native Qt Script function is analogous to a script function that defines no
+  formal parameters and only uses the built-in \c arguments variable to
+  process its arguments. To see this, let's first consider how a
+  script would normally define an \c{add()} function that takes two
+  arguments, adds them together and returns the result:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 56
+
+  When a script function is defined with formal parameters, their
+  names can be viewed as mere aliases of properties of the \c
+  arguments object; for example, in the \c{add(a, b)} definition's
+  function body, \c a and \c arguments[0] refer to the same
+  variable. This means that the \c{add()} function can equivalently be
+  written like this:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 57
+
+  This latter form closely matches what a native implementation
+  typically looks like:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 58
+
+  \section3 Checking the Number of Arguments
+
+  Again, remember that the presence (or lack) of formal parameter
+  names in a function definition does not affect how the function
+  may be invoked; \c{add(1, 2, 3)} is allowed by the engine, as is
+  \c{add(42)}. In the case of the \c {add()} function, the function
+  really needs two arguments in order to do something useful. This
+  can be expressed by the script definition as follows:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 59
+
+  This would result in an error being thrown if a script invokes
+  \c{add()} with anything other than two arguments. The native
+  function can be modified to perform the same check:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 62
+
+  \section3 Checking the Types of Arguments
+
+  In addition to expecting a certain number of arguments, a function might
+  expect that those arguments are of certain types (e.g., that the first
+  argument is a number and that the second is a string). Such a function
+  should explicitly check the type of arguments and/or perform a conversion,
+  or throw an error if the type of an argument is incompatible.
+
+  As it is, the native implementation of \c{add()} shown above doesn't
+  have the exact same semantics as the script counterpart; this is
+  because the behavior of the Qt Script \c{+} operator depends on the
+  types of its operands (for example, if one of the operands is a string,
+  string concatenation is performed). To give the script function
+  stricter semantics (namely, that it should only add numeric
+  operands), the argument types can be tested:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 60
+
+  Then an invocation like \c{add("foo", new Array())} will
+  cause an error to be thrown.
+
+  The C++ version can call QScriptValue::isNumber() to perform similar
+  tests:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 63
+
+  A less strict script implementation might settle for performing an
+  explicit to-number conversion before applying the \c{+} operator:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 61
+
+  In a native implementation, this is equivalent to calling
+  QScriptValue::toNumber() without performing any type test first,
+  since QScriptValue::toNumber() will automatically perform a type
+  conversion if necessary.
+
+  To check if an argument is of a certain object type (class),
+  scripts can use the \c instanceof operator (e.g., \c{"arguments[0]
+  instanceof Array"} evaluates to true if the first argument is an
+  Array object); native functions can call QScriptValue::instanceOf().
+
+  To check if an argument is of a custom C++ type, you typically use
+  qscriptvalue_cast() and check if the result is valid. For object types,
+  this means casting to a pointer and checking if it is non-zero; for
+  value types, the class should have an \c{isNull()}, \c{isValid()}
+  or similar method. Alternatively, since most custom types are
+  transported in \l{QVariant}s, you can check if the script value is a
+  QVariant using QScriptValue::isVariant(), and then check if the
+  QVariant can be converted to your type using QVariant::canConvert().
+
+  \section3 Functions with Variable Numbers of Arguments
+
+  Because of the presence of the built-in \c arguments object,
+  implementing functions that take a variable number of arguments
+  is simple. In fact, as we have seen, in the technical sense \e{all}
+  Qt Script functions can be seen as variable-argument functions).
+  As an example, consider a concat() function that takes an arbitrary
+  number of arguments, converts the arguments to their string
+  representation and concatenates the results; for example,
+  \c{concat("Qt", " ", "Script ", 101)} would return "Qt Script 101".
+  A script definition of \c{concat()} might look like this:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 64
+
+  Here is an equivalent native implementation:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 65
+
+  A second use case for a variable number of arguments is to implement
+  optional arguments. Here's how a script definition typically does
+  it:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 66
+
+  And here's the native equivalent:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 67
+
+  A third use case for a variable number of arguments is to simulate
+  C++ overloads. This involves checking the number of arguments and/or
+  their type at the beginning of the function body (as already shown),
+  and acting accordingly. It might be worth thinking twice before
+  doing this, and instead favor unique function names; e.g., having
+  separate \c{processNumber(number)} and \c{processString(string)}
+  functions rather than a generic \c{process(anything)} function.
+  On the caller side, this makes it harder for scripts to accidentally
+  call the wrong overload (since they don't know or don't comprehend
+  your custom sophisticated overloading resolution rules), and on the
+  callee side, you avoid the need for potentially complex (read:
+  error-prone) checks to resolve ambiguity.
+
+  \section3 Accessing the Arguments Object
+
+  Most native functions use the QScriptContext::argument() function to
+  access function arguments. However, it is also possible to access
+  the built-in \c arguments object itself (the one referred to by the
+  \c arguments variable in script code), by calling the
+  QScriptContext::argumentsObject() function. This has three principal
+  applications:
+
+  \list
+  \o The \c arguments object can be used to easily forward a function
+     call to another function. In script code, this is what it
+     typically looks like:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 68
+
+     For example, \c{foo(10, 20, 30)} would result in the \c{foo()} function
+     executing the equivalent of \c{bar(10, 20, 30)}. This is useful if
+     you want to perform some special pre- or post-processing when
+     calling a function (e.g., to log the call to \c{bar()} without having
+     to modify the \c{bar()} function itself, like the above example), or if
+     you want to call a "base implementation" from a prototype
+     function that has the exact same "signature". In C++, the forwarding
+     function might look like this:
+
+     \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 69
+
+  \o The arguments object can serve as input to a QScriptValueIterator,
+     providing a generic way to iterate over the arguments. A debugger
+     might use this to display the arguments object in a general purpose
+     "Qt Script Object Explorer", for example.
+
+  \o The arguments object can be serialized (e.g., with JSON) and transferred
+     to another entity (e.g., a script engine running in another thread),
+     where the object can be deserialized and passed as argument to
+     another script function.
+  \endlist
+
+  \section2 Constructor Functions
+
+  Some script functions are constructors; they are expected to initialize
+  new objects. The following snippet is a small example:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 75
+
+  There is nothing special about constructor functions. In fact, any
+  script function can act as a constructor function (i.e., any function
+  can serve as the operand to \c{new}). Some functions behave differently
+  depending on whether they are called as part of a \c{new} expression
+  or not; for example, the expression \c{new Number(1)} will create a
+  Number object, whereas \c{Number("123")} will perform a type
+  conversion. Other functions, like \c{Array()}, will always create
+  and initialize a new object (e.g., \c{new Array()} and \c{Array()} have
+  the same effect).
+
+  A native Qt Script function can call the
+  QScriptContext::isCalledAsConstructor() function to determine if it
+  is being called as a constructor or as a regular function. When a
+  function is called as a constructor (i.e., it is the operand in a
+  \c{new} expression), this has two important implications:
+
+  \list
+  \i The \c this object, QScriptContext::thisObject(), contains
+     the new object to be initialized; the engine creates this
+     new object automatically before invoking your function. This means
+     that your native constructor function normally doesn't have to (and
+     shouldn't) create a new object when it is called as a
+     constructor, since the engine has already prepared a new
+     object. Instead your function should operate on the supplied
+     \c this object.
+  \i The constructor function should return an undefined value,
+     QScriptEngine::undefinedValue(), to tell the engine that the
+     \c this object should be the final result of the \c new
+     operator. Alternatively, the function can return the \c this
+     object itself.
+  \endlist
+
+  When QScriptContext::isCalledAsConstructor() returns false, how your
+  constructor handles this case depends on what behavior you desire.
+  If, like the built-in \c{Number()} function, a plain function call should
+  perform a type conversion of its argument, then you perform the conversion
+  and return the result. If, on the other hand, you want your constructor
+  to behave \e{as if it was called as a constructor} (with
+  \c{new}), you have to explicitly create a new object (that is,
+  ignore the \c this object), initialize that object, and return it.
+
+  The following example implements a constructor function that always
+  creates and initializes a new object:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 76
+
+  Given this constructor, scripts would be able to use either the
+  expression \c{new Person("Bob")} or \c{Person("Bob")} to create a
+  new \c{Person} object; both behave in the same way.
+
+  There is no equivalent way for a function defined in script
+  code to determine whether or not it was invoked as a constructor.
+
+  Note that, even though it is not considered good practice, there is
+  nothing that stops you from choosing to ignore the default
+  constructed (\c this) object when your function is called as a
+  constructor and creating your own object anyway; simply have the
+  constructor return that object. The object will "override" the
+  default object that the engine constructed (i.e., the default
+  object will simply be discarded internally).
+
+  \section2 Associating Data with a Function
+
+  Even if a function is global \mdash i.e., not associated with any particular
+  (type of) object \mdash you might still want to associate some data with it,
+  so that it becomes self-contained; for example, the function could have
+  a pointer to some C++ resource that it needs to access. If your application
+  only uses a single script engine, or the same C++ resource can/should be
+  shared among all script engines, you can simply use a static C++ variable
+  and access it from within the native Qt Script function.
+
+  In the case where a static C++ variable or singleton class is
+  not appropriate, you can call QScriptValue::setProperty() on the
+  function object, but be aware that those properties will also be
+  accessible to script code. The alternative is to use QScriptValue::setData();
+  this data is not script-accessible. The implementation can access this
+  internal data through the QScriptContext::callee() function, which
+  returns the function object being invoked. The following example
+  shows how this might be used:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 55
+
+  \section2 Native Functions as Arguments to Functions
+
+  As previously mentioned, a function object can be passed as argument
+  to another function; this is also true for native functions,
+  naturally. As an example, here's a native comparison function
+  that compares its two arguments numerically:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 53
+
+  The above function can be passed as argument to the standard
+  \c{Array.prototype.sort} function to sort an array numerically,
+  as the following C++ code illustrates:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 54
+
+  Note that, in this case, we are truly treating the native function
+  object as a value \mdash i.e., we don't store it as a property of the
+  scripting environment \mdash we simply pass it on as an "anonymous"
+  argument to another script function and then forget about it.
+
+  \section2 The Activation Object
+
+  Every Qt Script function invocation has an \e{activation object}
+  associated with it; this object is accessible through the
+  QScriptContext::activationObject() function. The activation object
+  is a script object whose properties are the local variables
+  associated with the invocation (including the arguments for which
+  the script function has a corresponding formal parameter name).
+  Thus, getting, modifying, creating and deleting local variables
+  from C++ is done using the regular QScriptValue::property() and
+  QScriptValue::setProperty() functions. The activation object itself
+  is not directly accessible from script code (but it is implicitly
+  accessed whenever a local variable is read from or written to).
+
+  For C++ code, there are two principal applications of the
+  activation object:
+
+  \list
+  \i The activation object provides a standard way to traverse the
+  variables associated with a function call, by using it as the input
+  to QScriptValueIterator. This is useful for debugging purposes.
+
+  \i The activation object can be used to prepare local variables
+  that should be available when a script is evaluated inline; this
+  can be viewed as a way of passing arguments to the script
+  itself. This technique is typically used in conjunction with
+  QScriptEngine::pushContext(), as in the following example:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 77
+
+  We create a temporary execution context, create a local variable
+  for it, evaluate the script, and finally restore the old context.
+  \endlist
+
+  \section2 Nested Functions and the Scope Chain
+
+  This is an advanced topic; feel free to skip it.
+
+  A nested function can be used to "capture" the execution context in which a
+  nested function object is created; this is typically referred to as creating
+  a \e closure. When, at some later time, the nested function is invoked, it
+  can access the variables that were created when the enclosing function was
+  invoked. This can perhaps best be illustrated through a small example:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 70
+
+  The \c{counter()} function initializes a local variable to zero,
+  and returns a nested function. The nested function increments
+  the "outer" variable and returns its new value. The variable
+  persists over function calls, as shown in the following example:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 71
+
+  The \c{counter()} function can be implemented as a native function, too
+  \mdash or rather, as a pair of native functions: One for the outer and
+  one for the inner. The definition of the outer function is as follows:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 72
+
+  The function creates a local variable and initializes it to zero.
+  Then it wraps the inner native function, and sets the scope of
+  the resulting function object to be the activation object associated
+  with this (the outer) function call. The inner function accesses
+  the "outer" activation through the scope of the callee:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 73
+
+  It is also possible to have a hybrid approach, where the outer function
+  is a native function and the inner function is defined by a script:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 74
+
+  \section2 Property Getters and Setters
+
+  A script object property can be defined in terms of a getter/setter
+  function, similar to how a Qt C++ property has read and write
+  functions associated with it. This makes it possible for a script to
+  use expressions like \c{object.x} instead of \c{object.getX()}; the
+  getter/setter function for \c{x} will implicitly be invoked
+  whenever the property is accessed. To scripts, the property looks
+  and behaves just like a regular object property.
+
+  A single Qt Script function can act as both getter and setter for
+  a property. When it is called as a getter, the argument count is 0.
+  When it is called as a setter, the argument count is 1; the argument
+  is the new value of the property. In the following example, we
+  define a native combined getter/setter that transforms the value
+  slightly:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 78
+
+  The example uses the internal data of the object to store and
+  retrieve the transformed value. Alternatively, the property
+  could be stored in another, "hidden" property of the object itself
+  (e.g., \c{__x__}). A native function is free to implement whatever
+  storage scheme it wants, as long as the external behavior of the
+  property itself is consistent (e.g., that scripts should not be able
+  to distinguish it from a regular property).
+
+  The following C++ code shows how an object property can be defined
+  in terms of the native getter/setter:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 79
+
+  When the property is accessed, like in the following script, the
+  getter/setter does its job behind the scenes:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 80
+
+  \note It is important that the setter function, not just the getter,
+  returns the value of the property; i.e., the setter should \e{not}
+  return QScriptValue::UndefinedValue. This is because the result of
+  the property assignment is the value returned by the setter, and
+  not the right-hand side expression. Also note that you normally
+  should not attempt to read the same property that the getter modifies
+  within the getter itself, since this will cause the getter to be
+  called recursively.
+
+  You can remove a property getter/setter by calling
+  QScriptValue::setProperty(), passing an invalid QScriptValue
+  as the getter/setter. Remember to specify the
+  QScriptValue::PropertyGetter/QScriptValue::PropertySetter flag(s),
+  otherwise the only thing that will happen is that the setter will be
+  invoked with an invalid QScriptValue as its argument!
+
+  Property getters and setters can be defined and installed by script
+  code as well, as in the following example:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 81
+
+  Getters and setters can only be used to implement "a priori
+  properties"; i.e., the technique can't be used to react to an access
+  to a property that the object doesn't already have. To gain total
+  control of property access in this way, you need to subclass
+  QScriptClass.
+
+  \section1 Making Use of Prototype-Based Inheritance
+
+  In ECMAScript, inheritance is based on the concept of \e{shared
+  prototype objects}; this is quite different from the class-based
+  inheritance familiar to C++ programmers. With QtScript, you can
+  associate a custom prototype object with a C++ type using
+  QScriptEngine::setDefaultPrototype(); this is the key to providing
+  a script interface to that type. Since the QtScript module is built
+  on top of Qt's meta-type system, this can be done for any C++ type.
+
+  You might be wondering when exactly you would need to use this
+  functionality in your application; isn't the automatic binding
+  provided by QScriptEngine::newQObject() enough? No, not under all
+  circumstances.
+  Firstly, not every C++ type is derived from QObject; types that
+  are not QObjects cannot be introspected through Qt's meta-object
+  system (they do not have properties, signals and slots). Secondly,
+  even if a type is QObject-derived, the functionality you want to
+  expose to scripts might not all be available, since it is unusual to
+  define every function to be a slot (and it's not always
+  possible/desirable to change the C++ API to make it so).
+
+  It is perfectly possible to solve this problem by using "conventional"
+  C++ techniques. For instance, the QRect class could effectively be
+  made scriptable by creating a QObject-based C++ wrapper class with
+  \c{x}, \c{y}, \c{width} properties and so on, which forwarded property
+  access and function calls to the wrapped value. However, as we shall
+  see, by taking advantage of the ECMAScript object model and combining
+  it with Qt's meta-object system, we can arrive at a solution that is
+  more elegant, consistent and lightweight, supported by a small API.
+
+  This section explains the underlying concepts of prototype-based
+  inheritance. Once these concepts are understood, the associated
+  practices can be applied throughout the QtScript API in order to
+  create well-behaved, consistent bindings to C++ that will fit nicely
+  into the ECMAScript universe.
+
+  When experimenting with QtScript objects and inheritance, it can be
+  helpful to use the interactive interpreter included with the
+  \l{Qt Examples#Qt Script}{Qt Script examples}, located in
+  \c{examples/script/qscript}.
+
+  \section2 Prototype Objects and Shared Properties
+
+  The purpose of a QtScript \e{prototype object} is to define
+  behavior that should be shared by a set of other QtScript
+  objects. We say that objects which share the same prototype object
+  belong to the same \e{class} (again, on the technical side this
+  should not to be confused with the class constructs of languages
+  like C++ and Java; ECMAScript has no such construct).
+
+  The basic prototype-based inheritance mechanism works as follows: Each
+  QtScript object has an internal link to another object, its
+  \e{prototype}. When a property is looked up in an object, and the
+  object itself does not have the property, the property is looked up
+  in the prototype object instead; if the prototype has the property,
+  then that property is returned. Otherwise, the property is looked up
+  in the prototype of the prototype object, and so on; this chain of
+  objects constitutes a \e{prototype chain}. The chain of prototype
+  objects is followed until the property is found or the end of the
+  chain is reached.
+
+  For example, when you create a new object by the expression \c{new
+  Object()}, the resulting object will have as its prototype the
+  standard \c{Object} prototype, \c{Object.prototype}; through this
+  prototype relation, the new object inherits a set of properties,
+  including the \c{hasOwnProperty()} function and \c{toString()}
+  function:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 27
+
+  The \c{toString()} function itself is not defined in \c{o} (since we
+  did not assign anything to \c{o.toString}), so instead the
+  \c{toString()} function in the standard \c{Object} prototype is
+  called, which returns a highly generic string representation of
+  \c{o} ("[object Object]").
+
+  Note that the properties of the prototype object are not \e{copied} to
+  the new object; only a \e{link} from the new object to the prototype
+  object is maintained. This means that changes done to the prototype
+  object will immediately be reflected in the behavior of all objects
+  that have the modified object as their prototype.
+
+  \section2 Defining Classes in a Prototype-Based Universe
+
+  In QtScript, a class is not defined explicitly; there is no
+  \c{class} keyword. Instead, you define a new class in two steps:
+
+  \list 1
+  \i Define a \e{constructor function} that will initialize new objects.
+  \i Set up a \e{prototype object} that defines the class interface, and
+     assign this object to the public \c{prototype} property of the
+     constructor function.
+  \endlist
+
+  With this arrangement, the constructor's public \c{prototype}
+  property will automatically be set as the prototype of objects created
+  by applying the \c{new} operator to your constructor function;
+  e.g., the prototype of an object created by \c{new Foo()} will be the
+  value of \c{Foo.prototype}.
+
+  Functions that don't operate on the \c this object ("static" methods)
+  are typically stored as properties of the constructor function, not
+  as properties of the prototype object. The same is true for
+  constants, such as enum values.
+
+  The following code defines a simple constructor function for a class
+  called \c{Person}:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 28
+
+  Next, you want to set up \c{Person.prototype} as your prototype
+  object; i.e., define the interface that should be common to all
+  \c{Person} objects. QtScript automatically creates a default
+  prototype object (by the expression \c{new Object()}) for every
+  script function; you can add properties to this object, or you can
+  assign your own custom object. (Generally speaking, any QtScript
+  object can act as prototype for any other object.)
+
+  Here's an example of how you might want to override the
+  \c{toString()} function that \c{Person.prototype} inherits from
+  \c{Object.prototype}, to give your \c{Person} objects a more
+  appropriate string representation:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 29
+
+  This resembles the process of reimplementing a virtual function
+  in C++. Henceforth, when the property named \c{toString} is
+  looked up in a \c{Person} object, it will be resolved in
+  \c{Person.prototype}, not in \c{Object.prototype} as before:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 30
+
+  There are also some other interesting things we can learn about a
+  \c{Person} object:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 31
+
+  The \c{hasOwnProperty()} function is not inherited from
+  \c{Person.prototype}, but rather from \c{Object.prototype}, which is
+  the prototype of \c{Person.prototype} itself; i.e., the prototype
+  chain of \c{Person} objects is \c{Person.prototype} followed by
+  \c{Object.prototype}. This prototype chain establishes a \e{class
+  hierarchy}, as demonstrated by applying the \c{instanceof} operator;
+  \c{instanceof} checks if the value of the public \c{prototype}
+  property of the constructor function on the right-hand side is
+  reached by following the prototype chain of the object on the
+  left-hand side.
+
+  When defining subclasses, there's a general pattern you can use. The
+  following example shows how one can create a subclass of \c{Person}
+  called \c{Employee}:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 32
+
+  Again, you can use the \c{instanceof} to verify that the
+  class relationship between \c{Employee} and \c{Person} has been
+  correctly established:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 33
+
+  This shows that the prototype chain of \c{Employee} objects is the
+  same as that of \c{Person} objects, but with \c{Employee.prototype}
+  added to the front of the chain.
+
+  \section2 Prototype-Based Programming with the QtScript C++ API
+
+  You can use QScriptEngine::newFunction() to wrap
+  native functions. When implementing a constructor function,
+  you also pass the prototype object as an argument to
+  QScriptEngine::newFunction().
+  You can call QScriptValue::construct() to call a constructor
+  function, and you can use QScriptValue::call() from within a
+  native constructor function if you need to call a base class
+  constructor.
+
+  The QScriptable class provides a convenient way to implement a
+  prototype object in terms of C++ slots and properties. Take a look
+  at the \l{Default Prototypes Example} to see how this is done.
+  Alternatively, the prototype functionality can be implemented in
+  terms of standalone native functions that you wrap with
+  QScriptEngine::newFunction() and set as properties of your prototype
+  object by calling QScriptValue::setProperty().
+
+  In the implementation of your prototype functions, you use
+  QScriptable::thisObject() (or QScriptContext::thisObject()) to
+  obtain a reference to the QScriptValue being operated upon; then you
+  call qscriptvalue_cast() to cast it to your C++ type, and perform
+  the relevant operations using the usual C++ API for the type.
+
+  You associate a prototype object with a C++ type by calling
+  QScriptEngine::setDefaultPrototype(). Once this mapping is
+  established, QtScript will automatically assign the correct
+  prototype when a value of such a type is wrapped in a QScriptValue;
+  either when you explicitly call QScriptEngine::toScriptValue(), or
+  when a value of such a type is returned from a C++ slot and
+  internally passed back to script code by the engine. This means you
+  \e{don't} have to implement wrapper classes if you use this
+  approach.
+
+  As an example, let's consider how the \c{Person} class from the
+  preceding section can be implemented in terms of the Qt Script API.
+  We begin with the native constructor function:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 34
+
+  Here's the native equivalent of the \c{Person.prototype.toString}
+  function we saw before:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 35
+
+  The \c{Person} class can then be initialized as follows:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 36
+
+  The implementation of the \c{Employee} subclass is similar. We
+  use QScriptValue::call() to call the super-class (Person) constructor:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 37
+
+  The \c{Employee} class can then be initialized as follows:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 38
+
+  When implementing the prototype object of a class, you may want to use
+  the QScriptable class, as it enables you to define the API of your
+  script class in terms of Qt properties, signals and slots, and
+  automatically handles value conversion between the Qt Script and C++
+  side.
+
+  \section2 Implementing Prototype Objects for Value-based Types
+
+  When implementing a prototype object for a value-based type --
+  e.g. QPointF -- the same general technique applies; you populate
+  a prototype object with functionality that should be shared
+  among instances. You then associate the prototype object with
+  the type by calling QScriptEngine::setDefaultPrototype(). This
+  ensures that when e.g. a value of the relevant type is returned
+  from a slot back to the script, the prototype link of the script
+  value will be initialized correctly.
+
+  When values of the custom type are stored in QVariants -- which Qt
+  Script does by default --, qscriptvalue_cast() enables you to safely
+  cast the script value to a pointer to the C++ type. This makes it
+  easy to do type-checking, and, for prototype functions that should
+  modify the underlying C++ value, lets you modify the actual value
+  contained in the script value (and not a copy of it).
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 39
+
+  \section2 Implementing Constructors for Value-based Types
+
+  You can implement a constructor function for a value-based type
+  by wrapping a native factory function. For example, the following
+  function implements a simple constructor for QPoint:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 44
+
+  In the above code we simplified things a bit, e.g. we didn't check
+  the argument count to decide which QPoint C++ constructor to use.
+  In your own constructors you have to do this type of resolution
+  yourself, i.e. by checking the number of arguments passed to the
+  native function, and/or by checking the type of the arguments and
+  converting the arguments to the desired type. If you detect a problem
+  with the arguments you may want to signal this by throwing a script
+  exception; see QScriptContext::throwError().
+
+  \section2 Managing Non-QObject-based Objects
+
+  For value-based types (e.g. QPoint), the C++ object will be destroyed when
+  the Qt Script object is garbage-collected, so managing the memory of the C++
+  object is not an issue. For QObjects, Qt Script provides several
+  alternatives for managing the underlying C++ object's lifetime; see the
+  \l{Controlling QObject Ownership} section. However, for polymorphic types
+  that don't inherit from QObject, and when you can't (or won't) wrap the type
+  in a QObject, you have to manage the lifetime of the C++ object yourself.
+
+  A behavior that's often reasonable when a Qt Script object wraps a C++
+  object, is that the C++ object is deleted when the Qt Script object is
+  garbage-collected; this is typically the case when the objects can be
+  constructed by scripts, as opposed to the application providing the scripts
+  with pre-made "environment" objects. A way of making the lifetime of the C++
+  object follow the lifetime of the Qt Script object is by using a shared
+  pointer class, such as QSharedPointer, to hold a pointer to your object;
+  when the Qt Script object containing the QSharedPointer is
+  garbage-collected, the underlying C++ object will be deleted if there are no
+  other references to the object.
+
+  The following snippet shows a constructor function that constructs
+  QXmlStreamReader objects that are stored using QSharedPointer:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 93
+
+  Prototype functions can use qscriptvalue_cast() to cast the \c this object
+  to the proper type:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 94
+
+  The prototype and constructor objects are set up in the usual way:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 95
+
+  Scripts can now construct QXmlStreamReader objects by calling the \c
+  XmlStreamReader constructor, and when the Qt Script object is
+  garbage-collected (or the script engine is destroyed), the QXmlStreamReader
+  object is destroyed as well.
+
+  \section1 Defining Custom Script Classes with QScriptClass
+
+  There are cases where neither the dynamic QObject binding provided
+  by QScriptEngine::newQObject() or the manual binding provided by
+  QScriptEngine::newFunction() is sufficient. For example, you might
+  want to implement a dynamic script proxy to an underlying object;
+  or you might want to implement an array-like class (i.e. that gives
+  special treatment to properties that are valid array indexes, and
+  to the property "length"). In such cases, you can subclass
+  QScriptClass to achieve the desired behavior.
+
+  QScriptClass allows you to handle all property access for a
+  (class of) script object through virtual get/set property functions.
+  Iteration of custom properties is also supported through the
+  QScriptClassPropertyIterator class; this means you can advertise
+  properties to be reported by for-in script statements and
+  QScriptValueIterator.
+
+  \section1 Error Handling and Debugging Facilities
+
+  Syntax errors in scripts will be reported as soon as a script is
+  evaluated; QScriptEngine::evaluate() will return a SyntaxError object
+  that you can convert to a string to get a description of the error.
+
+  The QScriptEngine::uncaughtExceptionBacktrace() function gives you
+  a human-readable backtrace of the last uncaught exception. In order
+  to get useful filename information in backtraces, you should pass
+  proper filenames to QScriptEngine::evaluate() when evaluating your
+  scripts.
+
+  Often an exception doesn't happen at the time the script is evaluated,
+  but at a later time when a function defined by the script is actually
+  executed. For C++ signal handlers, this is tricky; consider the case
+  where the clicked() signal of a button is connected to a script function,
+  and that script function causes a script exception when it is handling
+  the signal. Where is that script exception propagated to?
+
+  The solution is to connect to the QScriptEngine::signalHandlerException()
+  signal; this will give you notification when a signal handler causes
+  an exception, so that you can find out what happened and/or recover
+  from it.
+
+  In Qt 4.4 the QScriptEngineAgent class was introduced. QScriptEngineAgent
+  provides an interface for reporting low-level "events" in a script engine,
+  such as when a function is entered or when a new script statement is
+  reached. By subclassing QScriptEngineAgent you can be notified of these
+  events and perform some action, if you want. QScriptEngineAgent itself
+  doesn't provide any debugging-specific functionality (e.g. setting
+  breakpoints), but it is the basis of tools that do.
+
+  The QScriptEngineDebugger class introduced in Qt 4.5 provides a Qt Script
+  debugger that can be embedded into your application.
+
+  \section2 Redefining print()
+
+  Qt Script provides a built-in print() function that can be useful for
+  simple debugging purposes. The built-in print() function writes to
+  standard output. You can redefine the print() function (or add your
+  own function, e.g. debug() or log()) that redirects the text to
+  somewhere else. The following code shows a custom print() that adds
+  text to a QPlainTextEdit.
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 45
+
+  The following code shows how the custom print() function may be
+  initialized and used.
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 46
+
+  A pointer to the QPlainTextEdit is stored as an internal property
+  of the script function itself, so that it can be retrieved when
+  the function is called.
+
+  \section1 Using QtScript Extensions
+
+  The QScriptEngine::importExtension() function can be used to load plugins
+  into a script engine. Plugins typically add some extra functionality to
+  the engine; for example, a plugin might add full bindings for the Qt
+  Arthur painting API, so that those classes may be used from Qt Script
+  scripts. There are currently no script plugins shipped with Qt.
+
+  If you are implementing some Qt Script functionality that you want other
+  Qt application developers to be able to use, developing an extension (e.g.
+  by subclassing QScriptExtensionPlugin) is worth looking into.
+
+  \section1 Internationalization
+
+  Since Qt 4.5, Qt Script supports internationalization of scripts by building
+  on the C++ internationalization functionality (see \l{Internationalization
+  with Qt}).
+
+  \section2 Use qsTr() for All Literal Text
+
+  Wherever your script uses "quoted text" for text that will be presented to
+  the user, ensure that it is processed by the QCoreApplication::translate()
+  function. Essentially all that is necessary to achieve this is to use
+  the qsTr() script function. Example:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 82
+
+  This accounts for 99% of the user-visible strings you're likely to write.
+
+  The qsTr() function uses the basename of the script's filename (see
+  QFileInfo::baseName()) as the translation context; if the filename is not
+  unique in your project, you should use the qsTranslate() function and pass a
+  suitable context as the first argument. Example:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 83
+
+  If you need to have translatable text completely outside a function, there
+  are two functions to help: QT_TR_NOOP() and QT_TRANSLATE_NOOP(). They merely
+  mark the text for extraction by the \c lupdate utility described below.  At
+  runtime, these functions simply return the text to translate unmodified.
+
+  Example of QT_TR_NOOP():
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 84
+
+  Example of QT_TRANSLATE_NOOP():
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 85
+
+  \section2 Use String.prototype.arg() for Dynamic Text
+
+  The String.prototype.arg() function (which is modeled after QString::arg())
+  offers a simple means for substituting arguments:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 86
+
+    \section2 Produce Translations
+
+    Once you are using qsTr() and/or qsTranslate() throughout your scripts, you
+    can start producing translations of the user-visible text in your program.
+
+    The \l{Qt Linguist manual} provides further information about
+    Qt's translation tools, \e{Qt Linguist}, \c lupdate and \c
+    lrelease.
+
+    Translation of Qt Script scripts is a three-step process:
+
+    \list 1
+
+    \o Run \c lupdate to extract translatable text from the script source code
+    of the Qt application, resulting in a message file for translators (a \c
+    .ts file). The utility recognizes qsTr(), qsTranslate() and the
+    \c{QT_TR*_NOOP()} functions described above and produces \c .ts files
+    (usually one per language).
+
+    \o Provide translations for the source texts in the \c .ts file, using
+    \e{Qt Linguist}. Since \c .ts files are in XML format, you can also
+    edit them by hand.
+
+    \o Run \c lrelease to obtain a light-weight message file (a \c .qm
+    file) from the \c .ts file, suitable only for end use. Think of the \c
+    .ts files as "source files", and \c .qm files as "object files". The
+    translator edits the \c .ts files, but the users of your application
+    only need the \c .qm files. Both kinds of files are platform and
+    locale independent.
+
+    \endlist
+
+    Typically, you will repeat these steps for every release of your
+    application. The \c lupdate utility does its best to reuse the
+    translations from previous releases.
+
+    When running \c lupdate, you must specify the location of the script(s),
+    and the name of the \c{.ts} file to produce. Examples:
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 87
+
+    will extract translatable text from \c myscript.qs and create the
+    translation file \c myscript_la.qs.
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 88
+
+    will extract translatable text from all files ending with \c{.qs} in the
+    \c scripts folder and create the translation file \c scripts_la.qs.
+
+    Alternatively, you can create a separate qmake project file that sets up
+    the \c SOURCES and \c TRANSLATIONS variables appropriately; then run
+    \c lupdate with the project file as input.
+
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 89
+
+    When running \c lrelease, you must specify the name of the \c{.ts} input
+    file; or, if you are using a qmake project file to manage script
+    translations, you specify the name of that file. \c lrelease will create
+    \c myscript_la.qm, the binary representation of the translation.
+
+    \section2 Apply Translations
+
+    In your application, you must use QTranslator::load() to load the
+    translation files appropriate for the user's language, and install them
+    using QCoreApplication::installTranslator(). Finally, you must call
+    QScriptEngine::installTranslatorFunctions() to make the script translation
+    functions (qsTr(), qsTranslate() and \c{QT_TR*_NOOP()}) available to scripts
+    that are subsequently evaluated by QScriptEngine::evaluate(). For scripts
+    that are using the qsTr() function, the proper filename must be passed as
+    second argument to QScriptEngine::evaluate().
+
+    \c linguist, \c lupdate and \c lrelease are installed in the \c bin
+    subdirectory of the base directory Qt is installed into. Click Help|Manual
+    in \e{Qt Linguist} to access the user's manual; it contains a tutorial
+    to get you started.
+
+    See also the \l{Hello Script Example}.
+
+  \section1 ECMAScript Compatibility
+
+  QtScript implements all the built-in classes and functions defined
+  in ECMA-262.
+
+  The Date parsing and string conversion functions are implemented using
+  QDateTime::fromString() and QDateTime::toString(), respectively.
+
+  The RegExp class is a wrapper around QRegExp. The QRegExp semantics
+  do not precisely match the semantics for regular expressions defined
+  in ECMA-262.
+
+  \section1 QtScript Extensions to ECMAScript
+
+  \list
+  \i \c{__proto__} \br
+    The prototype of an object (QScriptValue::prototype())
+    can be accessed through its \c{__proto__} property in script code.
+    This property has the QScriptValue::Undeletable flag set.
+    For example:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 40
+
+  \i \c{Object.prototype.__defineGetter__} \br
+    This function installs a
+    getter function for a property of an object. The first argument is
+    the property name, and the second is the function to call to get
+    the value of that property. When the function is invoked, the
+    \c this object will be the object whose property is accessed.
+    For example:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 41
+
+  \i \c{Object.prototype.__defineSetter__} \br
+    This function installs a
+    setter function for a property of an object. The first argument is
+    the property name, and the second is the function to call to set
+    the value of that property.  When the function is invoked, the
+    \c this object will be the object whose property is accessed.
+    For example:
+
+  \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 42
+
+  \i \c{Function.prototype.connect} \br
+    This function connects
+    a signal to a slot. Usage of this function is described in
+    the section \l{Using Signals and Slots}.
+
+  \i \c{Function.prototype.disconnect} \br
+    This function disconnects
+    a signal from a slot. Usage of this function is described in
+    the section \l{Using Signals and Slots}.
+
+  \i \c{QObject.prototype.findChild} \br
+    This function is semantically equivalent to QObject::findChild().
+
+  \i \c{QObject.prototype.findChildren} \br
+    This function is semantically equivalent to QObject::findChildren().
+
+  \i \c{QObject.prototype.toString} \br
+    This function returns a default string representation of a QObject.
+
+  \i \c{gc} \br
+    This function invokes the garbage collector.
+
+  \i \c{Error.prototype.backtrace} \br
+    This function returns a human-readable backtrace, in the form of
+    an array of strings.
+
+  \i Error objects have the following additional properties:
+    \list
+    \i \c{lineNumber}: The line number where the error occurred.
+    \i \c{fileName}: The file name where the error occurred (if a file name
+    was passed to QScriptEngine::evaluate()).
+    \i \c{stack}: An array of objects describing the stack. Each object has
+      the following properties:
+      \list
+      \i \c{functionName}: The function name, if available.
+      \i \c{fileName}: The file name, if available.
+      \i \c{lineNumber}: The line number, if available.
+      \endlist
+    \endlist
+
+  \endlist
+
+ */
diff --git a/doc/src/qtscriptdebugger-manual.qdoc b/doc/src/qtscriptdebugger-manual.qdoc
new file mode 100644
index 0000000000..3dfe87955a
--- /dev/null
+++ b/doc/src/qtscriptdebugger-manual.qdoc
@@ -0,0 +1,437 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qtscriptdebugger-manual.html
+    \title Qt Script Debugger Manual
+    \ingroup scripting
+    \brief A manual describing how to use the Qt Script debugger.
+
+  The Qt Script debugger is a tool for debugging script execution in
+  Qt applications that use Qt Script. Application developers can embed
+  the debugger into their application through the
+  QScriptEngineDebugger class. This manual describes how to use the
+  debugger. We assume that the reader is somewhat familiar with
+  general debugging concepts and existing debugging tools.
+
+  We assume that the debugger has been integrated into the application
+  through the QScriptEngineDebugger::standardWindow()
+  function, which provides the standard debugger configuration.
+
+  \tableofcontents
+
+  \section1 Getting Started
+
+  The following image shows the debugger as created with
+  \l{QScriptEngineDebugger::}{standardWindow()}:
+
+  \image qtscript-debugger.png Running a script under the Qt Script debugger.
+
+  The debugger will start, i.e., take control over the script's
+  execution when any of these conditions are met:
+
+  \list
+    \o The \c{debugger} statement is encountered in the script.
+    \o Clicking the \gui Interrupt menu item from the \gui Debug
+        menu in the main window.
+    \o A breakpoint is reached.
+    \o An uncaught script exception is thrown.
+  \endlist
+
+  Once the debugger is started, the execution state can be inspected,
+  e.g., the value of variables can be queried and the current program
+  stack shown. New breakpoints can be set.
+
+  The debugger will resume, i.e., give the control back to the script
+  engine, when the user clicks \gui Continue menu item from the \gui
+  Debug menu. It will be invoked again if one of the conditions
+  described in the list above is met.
+
+  \section1 Overview of Debugger Components
+
+  The debugger's functionality is divided into a series of components,
+  each being a widget that can be shown in the main window of the
+  debugger. The following table describes each component and how they
+  relate to each other.
+
+  \table
+    \header
+      \o Component
+      \o Description
+  \row
+  \o Console Widget 
+  \o The console widget provides a command-line interface to the
+  debugger's functionality, and also serves as an interactive script
+  interpreter. The set of commands and their syntax is inspired by
+  GDB, the GNU Debugger. Commands and script variables are
+  auto-completed through the TAB key.
+
+  Any console command that causes a change in the debugger or debugger
+  target's state will immediately be reflected in the other debugger
+  components (e.g. breakpoints or local variables changed).
+
+  The console provides a simple and powerful way of manipulating the
+  script environment. For example, typing "x" and hitting enter will
+  evaluate "x" in the current stack frame and display the result.
+  Typing "x = 123" will assign the value 123 to the variable \c{x} in
+  the current scope (or create a global variable \c{x} if there isn't
+  one -- scripts evaluated through the console can have arbitrary side
+  effects, so be careful).
+
+  \row
+  \o Stack Widget
+  \o The stack widget shows a backtrace of the script execution state.
+  Each row represents one frame in the stack. A row contains the
+  frame index (0 being the inner-most frame), the name of the script function,
+  and the location (file name and line number). To select a particular
+  stack frame to inspect, click on its row.
+
+  \row
+  \o Locals Widget
+  \o The locals widget shows the variables that are local to the
+  currently selected stack frame; that is, the properties of the
+  objects in the scope chain and the \c{this}-object. Objects can be
+  expanded, so that their properties can be examined, recursively.
+  Properties whose value has changed are shown in bold font.
+
+  Properties that are not read-only can be edited. Double-click on the
+  value and type in the new value; the value can be an arbitrary
+  expression. The expression will be evaluated in the associated stack
+  frame. While typing, you can press the TAB key to get possible
+  completions for the expression.
+
+  \row
+  \o Code Widget
+  \o The code widget shows the code of the currently selected script.
+    The widget displays an arrow in the left margin, marking the
+    code line that is being executed.
+    Clicking in the margin of a line will cause a breakpoint to be
+    toggled at that line. A breakpoint has to be set on a line that
+    contains an actual statement in order to be useful.When an uncaught script exception occurs, the
+    offending line will be shown with a red background.
+
+    The code widget is read-only; it cannot currently be used to edit
+    and (re)evaluate scripts. This is however possible from the
+    command-line interface, see \l{Console Command Reference}.
+
+  \row
+  \o Scripts Widget
+
+  \o The scripts widget shows the scripts that are currently loaded in
+  the script engine. Clicking on a script will cause its code to be
+  shown in the code widget. When a script is no longer referenced by
+  the debugger target it is removed from the scripts widget. Code
+  evaluated through QScriptEngine::evaluate() without a name specified, will be
+  displayed in the widget as Anonymous.
+
+  \row
+    \o Breakpoints Widget
+
+  \o The breakpoints widget shows all the breakpoints that are set.  A
+  breakpoint can be disabled or enabled by clicking the checkbox next
+  to the breakpoint's ID (the ID is provided so that the breakpoint
+  can be manipulated through the console widget as well).
+
+  A condition can be associated with the breakpoint; the condition can
+  be an arbitrary expression that should evaluate to true or
+  false. The breakpoint will only be triggered when its location is
+  reached \bold{and} the condition evaluates to true.
+
+  Similarly, if the breakpoint's ignore-count is set to N, the
+  breakpoint will be ignored the next N times it is hit.
+
+  A new breakpoint can be set by clicking the New Breakpoint button
+  and typing in a location of the form <filename>\bold{:}<linenumber>.
+  The breakpoint location can refer to an already loaded script, or
+  one that has not been loaded yet.
+
+  \row
+  \o Debug Output Widget
+  \o The debug output widget shows messages generated by the print()
+  script function. Scripts can use the special variables \c{__FILE__}
+  and \c{__LINE__} to include the current location information in the
+  messages.
+
+  \row
+  \o Error Log Widget
+  \o The error log widget shows error messages that have been generated.
+     All uncaught exceptions that occur in the engine will appear here.
+
+  \endtable
+
+  \section2 Resuming Script Evaluation
+
+  Script evaluation can be resumed in one of the following ways:
+
+  \list
+  \o \bold{Continue}: Evaluation will resume normally.
+  \o \bold{Step Into}: Evaluation will resume until the next statement is reached.
+  \o \bold{Step Over}: Evaluation will resume until the next statement is reached;
+                but if the current statement is a function call, the debugger
+                will treat it as a single statement.
+  \o \bold{Step Out}: Evaluation will resume until the current function exits and
+               the next statement is reached.
+  \o \bold{Run to Cursor}: Run until the statement at the cursor is reached.
+  \o \bold{Run to New Script}: Run until the first statement of a new script is reached.
+  \endlist
+
+  In any case, script evaluation can also be stopped due to either of the
+  following reasons:
+
+  \list
+  \o A \c{debugger} statement is encountered.
+  \o A breakpoint is hit.
+  \o An uncaught script exception occurs.
+  \endlist
+
+  \section2 Resuming After an Uncaught Exception
+
+  When an uncaught script exception occurs, it is not possible to
+  continue evaluating the current function normally. However, you can
+  use the console command \bold{return} to catch the exception and
+  return a value to the calling function.
+
+  \section1 Console Command Reference
+
+  Note that you can also get help on the available commands by typing
+  ".help" in the console.
+
+  \section2 Breakpoint-related Commands
+
+  Break points is set
+
+  \section3 break <location>
+
+  Sets a breakpoint at a given code line.
+
+  \code
+  .break foo.qs:123
+  \endcode
+
+  This command sets a breakpoint at \c{foo.qs}, line 123.
+
+  \code
+  .break 123
+  \endcode
+
+  This command sets a breakpoint at line 123 in the current script; the current script
+  is the script associated with the current stack frame.
+
+  Each breakpoint has a unique identifier (an integer) associated with it.
+  This identifier is needed by other breakpoint-related commands.
+
+  \section3 clear <location>
+
+  \code
+  .clear foo.qs:123
+  \endcode
+
+  clears (deletes) the breakpoint at \c{foo.qs}, line 123.
+
+  \code
+  clear 123
+  \endcode
+
+  clears (deletes) the breakpoint at line 123 in the current script;
+  the current script is the script associated with the current stack
+  frame.
+
+  \section3 condition <breakpoint-id> <expression>
+
+  Sets a condition for a breakpoint.
+
+  \code
+  .condition 1 i > 42
+  \endcode
+
+  specifies that breakpoint 1 should only be triggered if the variable \c{i}
+  is greater than 42.
+
+  The expression can be an arbitrary one, i.e. it can have
+  side-effects. It can be any valid QScript conditional
+  expression.
+
+  \section3 delete <breakpoint-id>
+
+  Deletes a breakpoint, i.e., removes it from the current debugging
+  session.
+
+  \section3 disable <breakpoint-id>
+
+  Disables a breakpoint. The breakpoint will continue to exist, but
+  will not stop program execution.
+
+  \section3 enable <breakpoint-id>
+
+  Enables a breakpoint. Breakpoints are enabled by default, so you
+  only need to use this command if you have disabled to breakpoint
+  previously.
+
+  \section3 ignore <breakpoint-id> <count>
+  
+  Sets the ignore-count of a breakpoint, i.e., the breakpoint will not
+  stop the program execution unless it have been reached \c count
+  times. This can, for instance, be useful in loops to stop at a
+  specific iteration.
+
+  \code
+  .ignore 1 5
+  \endcode
+
+  Specifies that breakpoint 1 should be ignored the next 5 times it is
+  hit.
+
+  \section3 info breakpoints
+
+  Lists the breakpoints that are set.
+
+  \code
+    .info breakpoints
+  \endcode
+
+  \section3 tbreak <location>
+
+  Sets a temporary breakpoint. This command is identical to the
+  \c{break} command, only the breakpoint will be automatically deleted
+  the first time it is hit.
+
+  \section2 File-related Commands
+
+  \section3 list <location>
+
+  Lists the contents of a script around a given location, where the
+  location is given as a line number and, optionally, the name of the
+  file from which you will print. If only a line number is given, \c
+  {.list} will use the file of the current stack frame.
+
+  \code
+    .list foo.qs:125
+  \endcode
+
+  When no arguments are given, \c{list} will incrementally list
+  sections of the current script.
+
+  \section3 info scripts
+
+  Lists the scripts that are currently loaded.
+
+  \section2 Execution-related Commands
+
+  \section3 advance <location>
+
+  Advances execution to a given location. The syntax of the location
+  is the same as for setting breakpoints. For example:
+
+  \code
+    .advance foo.qs:125
+  \endcode
+
+  \section3 continue
+
+  Continues execution normally, i.e, gives the execution control over
+  the script back the the QScriptEngine.
+
+  \section3 eval <program>
+
+  Evaluates a program. 
+
+  \section3 finish
+
+  Continues execution until the current function exits and the next
+  statement is reached (i.e., the statement after the call to the
+  function).
+
+  \section3 interrupt
+
+  Requests that execution should be interrupted. Interruption will
+  occur as soon as a new script statement is reached.
+
+  \section3 next <count = 1>
+
+  Continues execution until a new statement is reached; but if the
+  current statement is a function call, the function call will be
+  treated as a single statement. This will be done \c count times
+  before execution is stopped; the default is one.
+
+  \section3 return <expression>
+
+  Makes the current frame return to its caller. If \c expression is
+  given, it will sent as the result of the function (i.e., replacing
+  the functions return value). \c expression can be any valid QScript
+  expression.
+
+  \section3 step <count = 1>
+
+  Continues execution until a new statement is reached. If the number
+  \c count is given as argument, this will be done \c count times
+  before execution is stopped. As opposed to \l{next <count = 1>},  \c
+  step will enter functions when encountering a function call
+  statement.
+
+  \section2 Stack-related Commands
+
+  \section3 backtrace
+
+  Shows a backtrace of the current execution. The trace will list the
+  function name and its position in the script for each stack frame.
+
+  \section3 down
+
+  Selects the previous (inner) stack frame. The execution will not
+  return to this frame, but you will get access to its local
+  variables. 
+
+  \section3 frame <index>
+
+  This command moves to the stack frame with the given \c index. The
+  index of the frame on the top of the stack is 0. Previous frames are
+  numbered from 1 and upwards (the bottom frame in the stack has the
+  largest index).
+
+  \section3 info locals
+
+  Lists the variables that are in the scope of the current frame.
+
+  \section3 up
+
+  Selects the next (outer) stack frame.
+
+*/
diff --git a/doc/src/qtscriptextensions.qdoc b/doc/src/qtscriptextensions.qdoc
new file mode 100644
index 0000000000..2a7d569262
--- /dev/null
+++ b/doc/src/qtscriptextensions.qdoc
@@ -0,0 +1,126 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Qt GUI Toolkit.
+** EDITIONS: FREE, PROFESSIONAL, ENTERPRISE
+**
+****************************************************************************/
+
+/*!
+    \page qtscriptextensions.html
+    \title Creating QtScript Extensions
+    \ingroup scripting
+    \brief A guide to creating and using QtScript extensions.
+
+    QtScript extensions can make additional functionality available to scripts
+    evaluated by a QScriptEngine. Extensions are imported by calling
+    the QScriptEngine::importExtension() function.
+
+    There are three ways to create an extension:
+
+    \list
+    \o Subclass QScriptExtensionPlugin and implement the desired functionality.
+    \o Implement the functionality in a script file.
+    \o Use a hybrid approach, where part of the functionality is implemented in a
+       QScriptExtensionPlugin, and part is implemented in a script file.
+    \endlist
+
+    The (dot-qualified) extension name is used to determine the path (relative to
+    the application's plugin path) where QScriptEngine will look for the script
+    file that will initialize the extension; if a file called \c{__init__.js}
+    (usually located in \c{[application plugin path]/script/foo/}) is
+    found in the corresponding folder, its contents will be evaluated by the engine
+    when the extension is imported.
+    As an example, if the extension is called \c{"foo.bar.baz"}, the engine will look
+    for \c{__init__.js} in \c{foo/bar/baz}. Additionally, before importing
+    \c{"foo.bar.baz"}, the engine will ensure that the extensions \c{"foo"} and \c{"foo.bar"}
+    are imported, locating and evaluating the corresponding \c{__init__.js}
+    in the same manner (in folders \c{foo} and \c{foo/bar}, respectively).
+
+    The contents of \c{__init__.js} are evaluated in a new QScriptContext,
+    as if it were the body of a function. The engine's Global Object acts as
+    the \c{this} object. The following local variables are initially available
+    to the script:
+
+    \list
+    \o \bold{__extension__}: The name of the extension (e.g. \c{"foo.bar.baz"}).
+    \o \bold{__setupPackage__}: A convenience function for setting up a "namespace" in the script environment. A typical application is to call \c{__setupPackage__()} with \c{__extension__} as argument; e.g. \c{__setupPackage__("foo.bar.baz")} would ensure that the object chain represented by the expression \c{foo.bar.baz} exists in the script environment. (This function is semantically equivalent to QScriptExtensionPlugin::setupPackage().)
+    \o \bold{__postInit__}: By default, this variable is undefined. If you assign a function to it, that function will be called \bold{after} the C++ plugin's initialize() function has been called. You can use this to perform further initialization that depends on e.g. native functions that the C++ plugin registers.
+    \endlist
+
+    An example of a simple \c{__init__.js}:
+
+    \snippet doc/src/snippets/code/doc_src_qtscriptextensions.qdoc 0
+
+    QScriptEngine will look for a QScriptExtensionPlugin that provides
+    the relevant extension by querying each plugin for its keys()
+    until a match is found. The plugin's initialize() function will be
+    called \bold{after} the relevant \c{__init__.js} (if any) has been
+    evaluated.
+
+    Continuining with the example of our imaginary extension \c{"foo.bar.baz"},
+    the following steps will be performed by QScriptEngine::importExtension():
+
+    \list
+    \o If it exists, \c{foo/__init__.js} is evaluated.
+    \o If a plugin with \c{"foo"} in its list of keys is found, its initialize() function is called with \c{"foo"} as key.
+    \o If it exists, \c{foo/bar/__init__.js} is evaluated.
+    \o If a plugin with \c{"foo.bar"} in its list of keys is found, its initialize() function is called with \c{"foo.bar"} as key.
+    \o If it exists, \c{foo/bar/baz/__init__.js} is evaluated.
+    \o If a plugin with "foo.bar.baz" in its list of keys is found, its initialize() function is called with \c{"foo.bar.baz"} as key.
+    \endlist
+
+    \section1 Static Extensions
+
+    When an extension is compiled and linked into your application as a
+    static plugin, Qt Script will look for the optional \c{__init__.js}
+    script in a resource, prefixed by \c{:/qtscriptextension}. For example,
+    if the extension key is "foo.bar", Qt Script will evaluate the contents
+    of the file \c{:/qtscriptextension/foo/bar/__init__.js}, if it
+    exists. Note that if the resource is built into the plugin, you may
+    need to use the Q_INIT_RESOURCE() macro to initialize the resource
+    before importing the extension.
+*/
diff --git a/doc/src/qtscripttools.qdoc b/doc/src/qtscripttools.qdoc
new file mode 100644
index 0000000000..7d4bee14fb
--- /dev/null
+++ b/doc/src/qtscripttools.qdoc
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \module QtScriptTools
+  \title QtScriptTools Module
+  \since 4.5
+  \contentspage Qt's Modules
+  \previouspage QtScript
+  \nextpage QtSql
+  \ingroup modules
+  \ingroup scripting
+
+  \brief The QtScriptTools module provides additional components for applications that use Qt Script.
+
+  \tableofcontents
+
+  \section1 Configuring the Build Process
+
+  Applications that use the Qt Script Tools classes need to
+  be configured to be built against the QtScriptTools module.
+  To include the definitions of the module's classes, use the
+  following directive:
+
+  \snippet doc/src/snippets/code/doc.src.qtscripttools.qdoc 0
+
+  To link against the module, add this line to your \l qmake \c .pro file:
+
+  \snippet doc/src/snippets/code/doc.src.qtscripttools.qdoc 1
+
+  The QtScriptTools module is part of the \l{Qt Full Framework Edition} and
+  the \l{Open Source Versions of Qt}.
+
+ */
diff --git a/doc/src/qtsql.qdoc b/doc/src/qtsql.qdoc
new file mode 100644
index 0000000000..c00410b9d0
--- /dev/null
+++ b/doc/src/qtsql.qdoc
@@ -0,0 +1,568 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \module QtSql
+    \title QtSql Module
+    \contentspage Qt's Modules
+    \previouspage QtScript
+    \nextpage QtSvg
+    \ingroup modules
+
+    \brief The QtSql module helps you provide seamless database
+    integration to your Qt applications.
+
+    The SQL classes are divided into three layers:
+
+    \table
+    \header \o Layer     \o Description
+    \row    \o \bold{Driver Layer}
+            \o This comprises the classes QSqlDriver,
+               QSqlDriverCreator<T>, QSqlDriverCreatorBase,
+               QSqlDriverPlugin, and QSqlResult. This layer provides the
+               low-level bridge between the specific databases and the
+               SQL API layer. See \l{SQL Database Drivers} for more
+               information.
+    \row    \o \bold{SQL API Layer}
+            \o These classes provide access to databases. Connections
+               are made using the QSqlDatabase class. Database
+               interaction is achieved by using the QSqlQuery class.
+               In addition to QSqlDatabase and QSqlQuery, the SQL API
+               layer is supported by QSqlError, QSqlField, QSqlIndex,
+               and QSqlRecord.
+
+    \row    \o \bold{User Interface Layer}
+            \o These classes link the data from a database to
+               data-aware widgets. They include QSqlQueryModel,
+               QSqlTableModel, and QSqlRelationalTableModel. These
+               classes are designed to work with Qt's model/view
+               framework.
+    \endtable
+
+    Note that to use any of these classes, a QCoreApplication object
+    must have been instantiated first. To include the definitions of
+    the module's classes, use the following directive:
+
+    \snippet doc/src/snippets/code/doc_src_qtsql.qdoc 0
+
+    To link against the module, add this line to your \l qmake \c
+    .pro file:
+
+    \snippet doc/src/snippets/code/doc_src_qtsql.qdoc 1
+
+    The QtSql module is part of the \l{Qt Full Framework Edition} and the
+    \l{Open Source Versions of Qt}.
+
+    This overview assumes that you have at least a basic knowledge of
+    SQL. You should be able to understand simple \c SELECT, \c
+    INSERT, \c UPDATE, and \c DELETE statements. Although the \l
+    QSqlTableModel class provides an interface to database browsing
+    and editing that does not require a knowledge of SQL, a basic
+    understanding of SQL is highly recommended. A standard text
+    covering SQL databases is \e {An Introduction to Database Systems}
+    (7th Ed.) by C. J. Date, ISBN 0201385902.
+
+    Topics:
+
+    \tableofcontents
+
+    \section1 Connecting to Databases
+
+    To access a database with QSqlQuery or QSqlQueryModel, create and
+    open one or more database connections. Database connections are
+    normally identified by connection name, \e{not} by database name.
+    You can have multiple connections to the same database.
+    QSqlDatabase also supports the concept of a \e{default}
+    connection, which is an unnamed connection. When calling QSqlQuery
+    or QSqlQueryModel member functions that take a connection name
+    argument, if you don't pass a connection name, the default
+    connection will be used. Creating a default connection is
+    convenient when your application only requires one database
+    connection.
+
+    Note the difference between creating a connection and opening it.
+    Creating a connection involves creating an instance of class
+    QSqlDatabase. The connection is not usable until it is opened. The
+    following snippet shows how to create a \e{default} connection
+    and then open it:
+
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 26
+
+    The first line creates the connection object, and the last line
+    opens it for use. In between, we initialize some connection
+    information, including the \l{QSqlDatabase::setDatabaseName()}
+    {database name}, the \l{QSqlDatabase::setHostName()} {host name},
+    the \l{QSqlDatabase::setUserName()} {user name}, and the
+    \l{QSqlDatabase::setPassword()} {password}. In this case, we are
+    connecting to the MySQL database \c{flightdb} on the host
+    \c{bigblue}. The \c{"QMYSQL"} argument to
+    \l{QSqlDatabase::addDatabase()} {addDatabase()} specifies the type
+    of database driver to use for the connection. The set of database
+    drivers included with Qt are shown in the table of \l{SQL Database
+    Drivers#Supported Databases} {supported database drivers}. 
+
+    The connection in the snippet will be the \e{default} connection,
+    because we don't pass the second argument to
+    \l{QSqlDatabase::addDatabase()} {addDatabase()}, which is the
+    connection name. For example, here we establish two MySQL database
+    connections named \c{"first"} and \c{"second"}:
+
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 27
+
+    After these connections have been initialized, \l{QSqlDatabase::}
+    {open()} for each one to establish the live connections. If the
+    \l{QSqlDatabase::} {open()} fails, it returns false. In that case,
+    call QSqlDatabase::lastError() to get error information.
+
+    Once a connection is established, we can call the static function
+    QSqlDatabase::database() from anywhere with a connection name to
+    get a pointer to that database connection. If we don't pass a
+    connection name, it will return the default connection. For
+    example:
+
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 28
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 29
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 30
+
+    To remove a database connection, first close the database using
+    QSqlDatabase::close(), then remove it using the static method
+    QSqlDatabase::removeDatabase().
+
+    \section1 Executing SQL Statements
+
+    The QSqlQuery class provides an interface for executing SQL
+    statements and navigating through the result set of a query.
+
+    The QSqlQueryModel and QSqlTableModel classes described in the
+    next section provide a higher-level interface for accessing
+    databases. If you are unfamiliar with SQL, you might want to skip
+    directly to the next section (\l{Using the SQL Model Classes}).
+
+    \section2 Executing a Query
+
+    To execute an SQL statement, simply create a QSqlQuery object and
+    call QSqlQuery::exec() like this:
+
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 31
+
+    The QSqlQuery constructor accepts an optional QSqlDatabase object
+    that specifies which database connection to use. In the example
+    above, we don't specify any connection, so the default connection
+    is used.
+
+    If an error occurs, \l{QSqlQuery::exec()}{exec()} returns false.
+    The error is then available as QSqlQuery::lastError().
+
+    \section2 Navigating the Result Set
+
+    QSqlQuery provides access to the result set one record at a time.
+    After the call to \l{QSqlQuery::exec()}{exec()}, QSqlQuery's
+    internal pointer is located one position \e{before} the first
+    record. We must call QSqlQuery::next() once to advance to the
+    first record, then \l{QSqlQuery::next()}{next()} again repeatedly
+    to access the other records, until it returns false. Here's a
+    typical loop that iterates over all the records in order:
+
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 32
+
+    The QSqlQuery::value() function returns the value of a field in
+    the current record. Fields are specified as zero-based indexes.
+    QSqlQuery::value() returns a QVariant, a type that can hold
+    various C++ and core Qt data types such as \c int, QString, and
+    QByteArray. The different database types are automatically mapped
+    into the closest Qt equivalent. In the code snippet, we call
+    QVariant::toString() and QVariant::toInt() to convert
+    variants to QString and \c int.
+
+    You can iterate back and forth using QSqlQuery::next(),
+    QSqlQuery::previous(), QSqlQuery::first(), QSqlQuery::last(), and
+    QSqlQuery::seek(). The current row index is returned by
+    QSqlQuery::at(), and the total number of rows in the result set
+    is avaliable as QSqlQuery::size() for databases that support it.
+
+    To determine whether a database driver supports a given feature,
+    use QSqlDriver::hasFeature(). In the following example, we call
+    QSqlQuery::size() to determine the size of a result set of
+    the underlying database supports that feature; otherwise, we
+    navigate to the last record and use the query's position to tell
+    us how many records there are.
+
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 33
+
+    If you iterate through a result set only using next() and seek()
+    with positive values, you can call
+    QSqlQuery::setForwardOnly(true) before calling exec(). This is an
+    easy optimization that will speed up the query significantly when
+    operating on large result sets.
+
+    \section2 Inserting, Updating, and Deleting Records
+
+    QSqlQuery can execute arbitrary SQL statements, not just
+    \c{SELECT}s. The following example inserts a record into a table
+    using \c{INSERT}:
+
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 34
+
+    If you want to insert many records at the same time, it is often
+    more efficient to separate the query from the actual values being
+    inserted. This can be done using placeholders. Qt supports two
+    placeholder syntaxes: named binding and positional binding.
+    Here's an example of named binding:
+
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 35
+
+    Here's an example of positional binding:
+
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 36
+
+    Both syntaxes work with all database drivers provided by Qt. If
+    the database supports the syntax natively, Qt simply forwards the
+    query to the DBMS; otherwise, Qt simulates the placeholder syntax
+    by preprocessing the query. The actual query that ends up being
+    executed by the DBMS is available as QSqlQuery::executedQuery().
+
+    When inserting multiple records, you only need to call
+    QSqlQuery::prepare() once. Then you call
+    \l{QSqlQuery::bindValue()}{bindValue()} or
+    \l{QSqlQuery::addBindValue()}{addBindValue()} followed by
+    \l{QSqlQuery::exec()}{exec()} as many times as necessary.
+
+    Besides performance, one advantage of placeholders is that you
+    can easily specify arbitrary values without having to worry about
+    escaping special characters.
+
+    Updating a record is similar to inserting it into a table:
+
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 37
+
+    You can also use named or positional binding to associate
+    parameters to actual values.
+
+    Finally, here's an example of a \c DELETE statement:
+
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 38
+
+    \section2 Transactions
+
+    If the underlying database engine supports transactions,
+    QSqlDriver::hasFeature(QSqlDriver::Transactions) will return
+    true. You can use QSqlDatabase::transaction() to initiate a
+    transaction, followed by the SQL commands you want to execute
+    within the context of the transaction, and then either
+    QSqlDatabase::commit() or QSqlDatabase::rollback(). When
+    using transactions you must start the transaction before you
+    create your query.
+
+    Example:
+
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 39
+
+    Transactions can be used to ensure that a complex operation is
+    atomic (for example, looking up a foreign key and creating a
+    record), or to provide a means of canceling a complex change in
+    the middle.
+
+    \omit
+    It would be useful to mention transactions, and the fact that
+    some databases don't support them.
+    \endomit
+
+    \section1 Using the SQL Model Classes
+
+    In addition to QSqlQuery, Qt offers three higher-level classes
+    for accessing databases. These classes are QSqlQueryModel,
+    QSqlTableModel, and QSqlRelationalTableModel.
+
+    \table
+    \row \o QSqlQueryModel
+         \o A read-only model based on an arbitrary SQL query.
+    \row \o QSqlTableModel
+         \o A read-write model that works on a single table.
+    \row \o QSqlRelationalTableModel
+         \o A QSqlTableModel subclass with foreign key support.
+    \endtable
+
+    These classes derive from QAbstractTableModel (which in turn
+    inherits from QAbstractItemModel) and make it easy to present
+    data from a database in an item view class such as QListView and
+    QTableView. This is explained in detail in the \l{Presenting Data
+    in a Table View} section.
+
+    Another advantage of using these classes is that it can make your
+    code easier to adapt to other data sources. For example, if you
+    use QSqlTableModel and later decide to use XML files to store
+    data instead of a database, it is essentially just a matter of
+    replacing one data model with another.
+
+    \section2 The SQL Query Model
+
+    QSqlQueryModel offers a read-only model based on an SQL query.
+
+    Example:
+
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 40
+
+    After setting the query using QSqlQueryModel::setQuery(), you can
+    use QSqlQueryModel::record(int) to access the individual records.
+    You can also use QSqlQueryModel::data() and any of the other
+    functions inherited from QAbstractItemModel.
+
+    There's also a \l{QSqlQueryModel::setQuery()}{setQuery()}
+    overload that takes a QSqlQuery object and operates on its result
+    set. This enables you to use any features of QSqlQuery to set up
+    the query (e.g., prepared queries).
+
+    \section2 The SQL Table Model
+
+    QSqlTableModel offers a read-write model that works on a single
+    SQL table at a time.
+
+    Example:
+
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 41
+
+    QSqlTableModel is a high-level alternative to QSqlQuery for
+    navigating and modifying individual SQL tables. It typically
+    results in less code and requires no knowledge of SQL syntax.
+
+    Use QSqlTableModel::record() to retrieve a row in the table, and
+    QSqlTableModel::setRecord() to modify the row. For example, the
+    following code will increase every employee's salary by 10 per
+    cent:
+
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 42
+
+    You can also use QSqlTableModel::data() and
+    QSqlTableModel::setData(), which are inherited from
+    QAbstractItemModel, to access the data. For example, here's how
+    to update a record using
+    \l{QSqlTableModel::setData()}{setData()}:
+
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 43
+
+    Here's how to insert a row and populate it:
+
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 44
+
+    Here's how to delete five consecutive rows:
+
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 45
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 46
+
+    The first argument to QSqlTableModel::removeRows() is the index
+    of the first row to delete.
+
+    When you're finished changing a record, you should always call
+    QSqlTableModel::submitAll() to ensure that the changes are
+    written to the database.
+
+    When and whether you actually \e need to call submitAll() depends
+    on the table's \l{QSqlTableModel::editStrategy()}{edit strategy}.
+    The default strategy is QSqlTableModel::OnRowChange, which
+    specifies that pending changes are applied to the database when
+    the user selects a different row. Other strategies are
+    QSqlTableModel::OnManualSubmit (where all changes are cached in
+    the model until you call submitAll()) and
+    QSqlTableModel::OnFieldChange (where no changes are cached).
+    These are mostly useful when QSqlTableModel is used with a view.
+
+    QSqlTableModel::OnFieldChange seems to deliver the promise that
+    you never need to call submitAll() explicitly. There are two
+    pitfalls, though:
+
+    \list
+    \o Without any caching, performance may drop significantly.
+    \o If you modify a primary key, the record might slip through
+       your fingers while you are trying to populate it.
+    \endlist
+
+    \section2 The SQL Relational Table Model
+
+    QSqlRelationalTableModel extends QSqlTableModel to provide
+    support for foreign keys. A foreign key is a 1-to-1 mapping
+    between a field in one table and the primary key field of another
+    table. For example, if a \c book table has a field called \c
+    authorid that refers to the author table's \c id field, we say
+    that \c authorid is a foreign key.
+
+    \table
+    \row \o \inlineimage noforeignkeys.png
+         \o \inlineimage foreignkeys.png
+    \endtable
+
+    The screenshot on the left shows a plain QSqlTableModel in a
+    QTableView. Foreign keys (\c city and \c country) aren't resolved
+    to human-readable values. The screenshot on the right shows a
+    QSqlRelationalTableModel, with foreign keys resolved into
+    human-readable text strings.
+
+    The following code snippet shows how the QSqlRelationalTableModel
+    was set up:
+
+    \snippet examples/sql/relationaltablemodel/relationaltablemodel.cpp 0
+    \codeline
+    \snippet examples/sql/relationaltablemodel/relationaltablemodel.cpp 1
+    \snippet examples/sql/relationaltablemodel/relationaltablemodel.cpp 2
+
+    See the QSqlRelationalTableModel documentation for details.
+
+    \section1 Presenting Data in a Table View
+
+    The QSqlQueryModel, QSqlTableModel, and QSqlRelationalTableModel
+    classes can be used as a data source for Qt's view classes such
+    as QListView, QTableView, and QTreeView. In practice, QTableView
+    is by far the most common choice, because an SQL result set is
+    essentially a two-dimensional data structure.
+
+    \image relationaltable.png A table view displaying a QSqlTableModel
+
+    The following example creates a view based on an SQL data model:
+
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 17
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 18
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 19
+
+    If the model is a read-write model (e.g., QSqlTableModel), the
+    view lets the user edit the fields. You can disable this by
+    calling
+
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 20
+
+    You can use the same model as a data source for multiple views.
+    If the user edits the model through one of the views, the other
+    views will reflect the changes immediately. The
+    \l{sql/tablemodel}{Table Model} example shows how it works.
+
+    View classes display a header at the top to label the columns. To
+    change the header texts, call
+    \l{QAbstractItemModel::setHeaderData()}{setHeaderData()} on the
+    model. The header's labels default to the table's field names.
+    For example:
+
+    \snippet examples/sql/relationaltablemodel/relationaltablemodel.cpp 3
+
+    QTableView also has a vertical header on the left with numbers
+    identifying the rows. If you insert rows programmatically using
+    QSqlTableModel::insertRows(), the new rows will be marked with an
+    asterisk (*) until they are submitted using
+    \l{QSqlTableModel::submitAll()}{submitAll()} or automatically
+    when the user moves to another record (assuming the
+    \l{QSqlTableModel::EditStrategy}{edit strategy} is
+    QSqlTableModel::OnRowChange).
+
+    \image insertrowinmodelview.png Inserting a row in a model
+
+    Likewise, if you remove rows using
+    \l{QSqlTableModel::removeRows()}{removeRows()}, the rows will be
+    marked with an exclamation mark (!) until the change is
+    submitted.
+
+    The items in the view are rendered using a delegate. The default
+    delegate, QItemDelegate, handles the most common data types (\c
+    int, QString, QImage, etc.). The delegate is also responsible for
+    providing editor widgets (e.g., a combobox) when the user starts
+    editing an item in the view. You can create your own delegates by
+    subclassing QAbstractItemDelegate or QItemDelegate. See
+    \l{Model/View Programming} for more information.
+
+    QSqlTableModel is optimized to operate on a single table at a
+    time. If you need a read-write model that operates on an
+    arbitrary result set, you can subclass QSqlQueryModel and
+    reimplement \l{QAbstractItemModel::flags()}{flags()} and
+    \l{QAbstractItemModel::setData()}{setData()} to make it
+    read-write. The following two functions make fields 1 and 2 of a
+    query model editable:
+
+    \snippet examples/sql/querymodel/editablesqlmodel.cpp 0
+    \codeline
+    \snippet examples/sql/querymodel/editablesqlmodel.cpp 1
+
+    The setFirstName() helper function is defined as follows:
+
+    \snippet examples/sql/querymodel/editablesqlmodel.cpp 2
+
+    The setLastName() function is similar. See the
+    \l{sql/querymodel}{Query Model} example for the complete source code.
+
+    Subclassing a model makes it possible to customize it in many
+    ways: You can provide tooltips for the items, change the
+    background color, provide calculated values, provide different
+    values for viewing and editing, handle null values specially, and
+    more. See \l{Model/View Programming} as well as the \l
+    QAbstractItemView reference documentation for details.
+
+    If all you need is to resolve a foreign key to a more
+    human-friendly string, you can use QSqlRelationalTableModel. For
+    best results, you should also use QSqlRelationalDelegate, a
+    delegate that provides combobox editors for editing foreign keys.
+
+    \image relationaltable.png Editing a foreign key in a relational table
+
+    The \l{sql/relationaltablemodel}{Relational Table Model} example
+    illustrates how to use QSqlRelationalTableModel in conjunction with
+    QSqlRelationalDelegate to provide tables with foreign key
+    support.
+
+    \section1 Creating Data-Aware Forms
+
+    Using the SQL models described above, the contents of a database can
+    be presented to other model/view components. For some applications,
+    it is sufficient to present this data using a standard item view,
+    such as QTableView. However, users of record-based applications often
+    require a form-based user interface in which data from a specific
+    row or column in a database table is used to populate editor widgets
+    on a form.
+
+    Such data-aware forms can be created with the QDataWidgetMapper class,
+    a generic model/view component that is used to map data from a model
+    to specific widgets in a user interface.
+
+    QDataWidgetMapper operates on a specific database table, mapping items
+    in the table on a row-by-row or column-by-column basis. As a result,
+    using QDataWidgetMapper with a SQL model is as simple as using it with
+    any other table model.
+
+    \image qdatawidgetmapper-simple.png
+
+    The \l{demos/books}{Books} demonstration shows how information can
+    be presented for easy access by using QDataWidgetMapper and a set of
+    simple input widgets.
+*/
diff --git a/doc/src/qtsvg.qdoc b/doc/src/qtsvg.qdoc
new file mode 100644
index 0000000000..083c669236
--- /dev/null
+++ b/doc/src/qtsvg.qdoc
@@ -0,0 +1,135 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \module QtSvg
+  \title QtSvg Module
+  \since 4.1
+  \contentspage Qt's Modules
+  \previouspage QtSql
+  \nextpage QtWebKit
+  \ingroup modules
+
+  \brief The QtSvg module provides classes for displaying the contents of SVG
+  files.
+
+  Scalable Vector Graphics (SVG) is a language for describing two-dimensional
+  graphics and graphical applications in XML. SVG 1.1 is a W3C Recommendation
+  and forms the core of the current SVG developments in Qt. SVG 1.2 is the
+  specification currently being developed by the \l{SVG Working Group}, and it
+  is \l{http://www.w3.org/TR/SVG12/}{available in draft form}.
+  The \l{Mobile SVG Profiles} (SVG Basic and SVG Tiny) are aimed at
+  resource-limited devices and are part of the 3GPP platform for third generation
+  mobile phones. You can read more about SVG at \l{About SVG}.
+
+  \tableofcontents
+
+  \section1 SVG Support
+  Qt supports the \l{SVG 1.2 Tiny Static Features}{static features} of
+  \l{SVG 1.2 Tiny}. ECMA scripts and DOM manipulation are currently not
+  supported.
+
+  \section1 Configuring the Build Process
+
+  Applications that use Qt's SVG classes need to
+  be configured to be built against the QtSvg module.
+  To include the definitions of the module's classes, use the
+  following directive:
+
+  \snippet doc/src/snippets/code/doc_src_qtsvg.qdoc 0
+
+  To link against the module, add this line to your \l qmake \c
+  .pro file:
+
+  \snippet doc/src/snippets/code/doc_src_qtsvg.qdoc 1
+
+  The QtSvg module is part of the \l{Qt Full Framework Edition} and the
+  \l{Open Source Versions of Qt}.
+
+  \section1 Rendering SVG files
+
+  The easiest way to render SVG files is to construct a QSvgWidget and
+  load an SVG file using one of the QSvgWidget::load() functions.
+
+  QSvgRenderer is the class responsible for rendering SVG files for
+  QSvgWidget, and it can be used directly to provide SVG support for
+  custom widgets.
+  To load an SVG file, construct a QSvgRenderer with a file name or the
+  contents of a file, or call QSvgRenderer::load() on an existing
+  renderer. If the SVG file has been loaded successfully the
+  QSvgRenderer::isValid() will return true.
+
+  Once you have loaded the SVG file successfully, you can render it
+  with the QSvgRenderer::render() function. Note that this scheme allows
+  you to render SVG files on all paint devices supported by Qt, including
+  QWidget, QGLWidget, and QImage. See the \l{SVG Viewer Example}{SVG Viewer}
+  example for more details.
+
+  \section1 Additional Information
+
+  Some code for arc handling in this module is derived from code with
+  the following license:
+
+  \legalese
+  Copyright  2002 USC/Information Sciences Institute
+
+  Permission to use, copy, modify, distribute, and sell this software
+  and its documentation for any purpose is hereby granted without
+  fee, provided that the above copyright notice appear in all copies
+  and that both that copyright notice and this permission notice
+  appear in supporting documentation, and that the name of
+  Information Sciences Institute not be used in advertising or
+  publicity pertaining to distribution of the software without
+  specific, written prior permission.  Information Sciences Institute
+  makes no representations about the suitability of this software for
+  any purpose.  It is provided "as is" without express or implied
+  warranty.
+
+  INFORMATION SCIENCES INSTITUTE DISCLAIMS ALL WARRANTIES WITH REGARD
+  TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL INFORMATION SCIENCES
+  INSTITUTE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+  DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+  OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  PERFORMANCE OF THIS SOFTWARE.
+  \endlegalese
+*/
diff --git a/doc/src/qttest.qdoc b/doc/src/qttest.qdoc
new file mode 100644
index 0000000000..566ff5a64c
--- /dev/null
+++ b/doc/src/qttest.qdoc
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \module QtTest
+    \title QtTest Module
+    \contentspage Qt's Modules
+    \previouspage QtAssistant
+    \nextpage QAxContainer
+    \ingroup modules
+
+    \keyword QtTest
+
+    \brief The QtTest module provides classes for unit testing Qt applications and libraries.
+
+    Applications that use Qt's unit testing classes need to
+    be configured to be built against the QtTest module.
+    To include the definitions of the module's classes, use the
+    following directive:
+
+    \snippet doc/src/snippets/code/doc_src_qttest.qdoc 0
+
+    To link against the module, add this line to your \l qmake \c
+    .pro file:
+
+    \snippet doc/src/snippets/code/doc_src_qttest.qdoc 1
+
+    See the \l{QTestLib Manual} for a detailed introduction on how to use
+    Qt's unit testing features with your applications.
+
+    The QtTest module is part of all \l{Qt editions}.
+*/
diff --git a/doc/src/qtuiloader.qdoc b/doc/src/qtuiloader.qdoc
new file mode 100644
index 0000000000..746738b1db
--- /dev/null
+++ b/doc/src/qtuiloader.qdoc
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \module QtUiTools
+    \title QtUiTools Module
+    \since 4.1
+    \contentspage Qt's Modules
+    \previouspage QtDesigner
+    \nextpage QtHelp
+    \ingroup modules
+
+    \brief The QtUiTools module provides classes to handle forms created 
+    with Qt Designer.
+
+    These forms are processed at run-time to produce dynamically-generated
+    user interfaces. In order to generate a form at run-time, a resource
+    file containing a \c{.ui} file is needed. Applications that use the
+    form handling classes need to be configured to be built against the
+    QtUiTools module. This is done by including the following declaration
+    in a \c qmake project file to ensure that the application is compiled
+    and linked appropriately.
+
+    \snippet doc/src/snippets/code/doc_src_qtuiloader.qdoc 0
+
+    A form loader object, provided by the QUiLoader class, is used to
+    construct the user interface. This user interface can
+    be retrieved from any QIODevice; for example, a QFile object can be
+    used to obtain a form stored in a project's resources. The
+    QUiLoader::load() function takes the user interface description
+    contained in the file and constructs the form widget.
+
+    To include the definitions of the module's classes, use the following
+    directive:
+
+    \snippet doc/src/snippets/code/doc_src_qtuiloader.qdoc 1
+
+    \note These classes are part of the \l{Open Source Versions of Qt} and
+    \l{Qt Commercial Editions}{Qt Full Framework Edition} for commercial
+    users.
+
+    \sa{Calculator Builder Example}, {World Time Clock Builder Example}
+*/
+
diff --git a/doc/src/qtwebkit.qdoc b/doc/src/qtwebkit.qdoc
new file mode 100644
index 0000000000..009295071a
--- /dev/null
+++ b/doc/src/qtwebkit.qdoc
@@ -0,0 +1,189 @@
+/*!
+    \module QtWebKit
+    \title QtWebKit Module
+    \contentspage Qt's Modules
+    \previouspage QtSvg
+    \nextpage QtXml
+    \ingroup architecture
+    \ingroup modules
+    \brief An introduction to the QtWebKit module.
+
+    \keyword Browser
+    \keyword Web Browser
+
+    \since 4.4
+
+    QtWebKit provides a Web browser engine that makes it easy to embed content
+    from the World Wide Web into your Qt application. At the same time Web
+    content can be enhanced with native controls.
+
+    QtWebKit provides facilities for rendering of HyperText Markup Language
+    (HTML), Extensible HyperText Markup Language (XHTML) and Scalable Vector
+    Graphics (SVG) documents, styled using Cascading Style Sheets (CSS) and
+    scripted with JavaScript.
+
+    A bridge between the JavaScript execution environment and the Qt object
+    model makes it possible for custom QObjects to be scripted. Integration
+    with the Qt networking module enables Web pages to be transparently loaded
+    from Web servers, the local file system or even the Qt resource system.
+
+    In addition to providing pure rendering features, HTML documents can be
+    made fully editable to the user through the use of the \c{contenteditable}
+    attribute on HTML elements.
+
+    QtWebKit is based on the Open Source WebKit engine. More information about
+    WebKit itself can be found on the \l{WebKit Open Source Project} Web site.
+
+    The QtWebKit module is part of the \l{Qt Full Framework Edition}, and the
+    \l{Open Source Versions of Qt}.
+
+    \note Building the QtWebKit module with debugging symbols is problematic
+    on many platforms due to the size of the WebKit engine. We recommend
+    building the module in release mode only for embedded platforms.
+
+    \note Web site icons, also known as "FavIcons", are currently not supported
+    on Windows. We plan to address this in a future release.
+
+    \note WebKit has certain minimum requirements that must be met on
+    Embedded Linux systems. See the \l{Qt for Embedded Linux Requirements}
+    document for more information.
+
+    Topics:
+
+    \tableofcontents
+
+    \section1 Configuring the Build Process
+
+    Applications that use QtWebKit's classes need to be configured to be built
+    against the QtWebKit module. The following declaration in a \c qmake
+    project file ensures that an application is compiled and linked
+    appropriately:
+
+    \snippet doc/src/snippets/code/doc_src_qtwebkit.qdoc 0
+
+    This line is necessary because only the QtCore and QtGui modules are used
+    in the default build process.
+
+    To include the definitions of the module's classes, use the following
+    directive:
+
+    \snippet doc/src/snippets/code/doc_src_qtwebkit.qdoc 1
+
+    \section1 Architecture
+
+    The easiest way to render content is through the QWebView class. As a
+    widget it can be embedded into your forms or a graphics view, and it
+    provides convenience functions for downloading and rendering web sites.
+
+    \snippet snippets/webkit/simple/main.cpp Using QWebView
+
+    QWebView acts as a view onto Web pages, each of which is represented by an
+    instance of the QWebPage class. QWebPage provides access to the document
+    structure in a page, describing features such as frames, the navigation
+    history, and the undo/redo stack for editable content.
+
+    HTML documents can be nested using frames in a frameset. An individual
+    frame in HTML is represented using the QWebFrame class. It includes the
+    bridge to the JavaScript window object and can be painted using QPainter.
+    Each QWebPage has one QWebFrame object as its main frame.
+
+    Individual browser features, defaults and other settings can be configured
+    through the QWebSettings class. It is possible to provide defaults for all
+    QWebPage instances through the default settings. Individual attributes
+    can be overidden by the page specific settings object.
+
+    \section1 Netscape Plugin Support
+
+    Since WebKit supports the Netscape Plugin API, Qt applications can display
+    Web pages that embed common plugins, as long as the user has the appropriate
+    binary files for those plugins installed.
+
+    The following locations are searched for plugins:
+
+    \table
+    \header \o Linux/Unix  \o Windows
+    \row \o{1,3}
+    \list
+    \o \c{.mozilla/plugins} in the user's home directory
+    \o \c{.netscape/plugins} in the user's home directory
+    \o System locations, such as
+    \list
+    \o \c{/usr/lib/browser/plugins}
+    \o \c{/usr/local/lib/mozilla/plugins}
+    \o \c{/usr/lib/firefox/plugins}
+    \o \c{/usr/lib64/browser-plugins}
+    \o \c{/usr/lib/browser-plugins}
+    \o \c{/usr/lib/mozilla/plugins}
+    \o \c{/usr/local/netscape/plugins}
+    \o \c{/opt/mozilla/plugins}
+    \o \c{/opt/mozilla/lib/plugins}
+    \o \c{/opt/netscape/plugins}
+    \o \c{/opt/netscape/communicator/plugins}
+    \o \c{/usr/lib/netscape/plugins}
+    \o \c{/usr/lib/netscape/plugins-libc5}
+    \o \c{/usr/lib/netscape/plugins-libc6}
+    \o \c{/usr/lib64/netscape/plugins}
+    \o \c{/usr/lib64/mozilla/plugins}
+    \endlist
+    \o Locations specified by environment variables:
+    \list
+    \o \c{$MOZILLA_HOME/plugins}
+    \o \c{$MOZ_PLUGIN_PATH}
+    \o \c{$QTWEBKIT_PLUGIN_PATH}
+    \endlist
+    \endlist
+
+    \o
+    \list
+    \o The user's \c{Application Data\Mozilla\plugins} directory
+    \o Standard system locations of plugins for Quicktime, Flash, etc.
+    \endlist
+
+    \row
+    \raw HTML
+    <th class="qt-style">Mac OS X</th>
+    \endraw
+    \row
+    \o
+    \list
+    \o \c{Library/Internet Plug-Ins} in the user's home directory
+    \o The system \c{/Library/Internet Plug-Ins} directory
+    \endlist
+    \endtable
+
+    \section1 License Information
+
+    This is a snapshot of the Qt port of WebKit. The exact version information
+    can be found in the \c{src/3rdparty/webkit/VERSION} file supplied with Qt.
+
+    Qt Commercial Edition licensees that wish to distribute applications that
+    use the QtWebKit module need to be aware of their obligations under the
+    GNU Lesser General Public License (LGPL). 
+
+    Developers using the Open Source Edition can choose to redistribute
+    the module under the appropriate version of the GNU LGPL; version 2.1
+    for applications and libraries licensed under the GNU GPL version 2,
+    or version 3 for applications and libraries licensed under the GNU
+    GPL version 2.
+
+    \legalese
+    WebKit is licensed under the GNU Library General Public License.
+    Individual contributor names and copyright dates can be found
+    inline in the code.
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+    \endlegalese
+*/
diff --git a/doc/src/qtxml.qdoc b/doc/src/qtxml.qdoc
new file mode 100644
index 0000000000..e82640395b
--- /dev/null
+++ b/doc/src/qtxml.qdoc
@@ -0,0 +1,615 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \module QtXml
+    \title QtXml Module
+    \contentspage Qt's Modules
+    \previouspage QtSvg
+    \nextpage QtXmlPatterns
+    \ingroup modules
+
+    \brief The QtXml module provides a stream reader and writer for
+    XML documents, and C++ implementations of SAX and DOM.
+
+    SAX is an event-based standard interface for XML parsers.
+    The Qt interface follows the design of the SAX2 Java implementation.
+    Its naming scheme was adapted to fit the Qt naming conventions.
+    Details on SAX2 can be found at \l{http://www.saxproject.org}.
+
+    Support for SAX2 filters and the reader factory are under
+    development. The Qt implementation does not include the SAX1
+    compatibility classes present in the Java interface.
+    For an introduction to Qt's SAX2 classes, see \l{The Qt SAX2 Classes}.
+
+    DOM Level 2 is a W3C Recommendation for XML interfaces that maps the
+    constituents of an XML document to a tree structure. The specification
+    of DOM Level 2 can be found at \l{http://www.w3.org/DOM/}.
+    For more information about the DOM classes in Qt is provided, see
+    \l{The Qt DOM Classes}.
+
+    Since version 4.3, Qt provides two new classes for reading and
+    writing XML: QXmlStreamReader and QXmlStreamWriter.
+
+    In addition to core XML support, classes for higher level querying
+    and manipulation of XML data, are provided by the QtXmlPatterns
+    module. In the QtSvg module, the QSvgRenderer and QSvgGenerator
+    classes can read and write a subset of SVG, an XML-based file
+    format. Qt also provides helper functions that may be useful to
+    those working with XML and XHTML: see Qt::escape() and
+    Qt::convertFromPlainText().
+
+    Further XML support is provided by the \l{Qt Solutions} group who
+    provide, for example, classes that support SOAP and MML with the
+    Qt XML classes. 
+
+    This module is part of the \l{Qt Full Framework Edition} and the
+    \l{Open Source Versions of Qt}.
+
+    Topics:
+
+    \tableofcontents
+
+    \section1 Configuring the Build Process
+
+    Applications that use Qt's XML classes need to be configured to
+    be built against the QtXml module. The following declaration in a
+    \c qmake project file ensures that an application is compiled and
+    linked appropriately:
+
+    To include the definitions of the module's classes, use the
+    following directive:
+
+    \snippet doc/src/snippets/code/doc_src_qtxml.qdoc 0
+
+    To link against the module, add this line to your \l qmake \c
+    .pro file:
+
+    \snippet doc/src/snippets/code/doc_src_qtxml.qdoc 1
+
+    This line is necessary because only the QtCore and QtGui modules
+    are used in the default build process.
+
+    \section1 The QtXml Stream Classes
+
+    The QXmlStreamReader and QXmlStreamWriter are two new classes provided
+    in Qt 4.3 and later. A stream reader reports an XML document as a stream
+    of tokens. This differs from SAX as SAX applications provide handlers to
+    receive XML events from the parser whereas the QXmlStreamReader drives the
+    loop, pulling tokens from the reader when they are needed.
+    This pulling approach makes it possible to build recursive descent parsers,
+    allowing XML parsing code to be split into different methods or classes.
+
+    QXmlStreamReader is a well-formed XML 1.0 parser that excludes external
+    parsed entities. Hence, data provided by the stream reader adheres to the
+    W3C's criteria for well-formed XML, as long as no error occurs. Otherwise,
+    functions such as \l{QXmlStreamReader::atEnd()}{atEnd()},
+    \l{QXmlStreamReader::error()}{error()} and \l{QXmlStreamReader::hasError()}
+    {hasError()} can be used to check and view the errors.
+
+    An example of QXmlStreamReader implementation would be the \c XbelReader in
+    \l{QXmlStream Bookmarks Example}, which is a subclass of QXmlStreamReader.
+    The constructor takes \a treeWidget as a parameter and the class has Xbel
+    specific functions:
+
+    \snippet examples/xml/streambookmarks/xbelreader.h 1
+
+    \dots
+    \snippet examples/xml/streambookmarks/xbelreader.h 2
+    \dots
+
+    The \c read() function accepts a QIODevice and sets it with
+    \l{QXmlStreamReader::setDevice()}{setDevice()}. The
+    \l{QXmlStreamReader::raiseError()}{raiseError()} function is used to
+    display a custom error message, inidicating that the file's version
+    is incorrect.
+
+    \snippet examples/xml/streambookmarks/xbelreader.cpp 1
+
+    The pendent to QXmlStreamReader is QXmlStreamWriter, which provides an XML
+    writer with a simple streaming API. QXmlStreamWriter operates on a
+    QIODevice and has specialised functions for all XML tokens or events you
+    want to write, such as \l{QXmlStreamWriter::writeDTD()}{writeDTD()},
+    \l{QXmlStreamWriter::writeCharacters()}{writeCharacters()},
+    \l{QXmlStreamWriter::writeComment()}{writeComment()} and so on.
+
+    To write XML document with QXmlStreamWriter, you start a document with the
+    \l{QXmlStreamWriter::writeStartDocument()}{writeStartDocument()} function
+    and end it with \l{QXmlStreamWriter::writeEndDocument()}
+    {writeEndDocument()}, which implicitly closes all remaining open tags.
+    Element tags are opened with \l{QXmlStreamWriter::writeStartDocument()}
+    {writeStartDocument()} and followed by 
+    \l{QXmlStreamWriter::writeAttribute()}{writeAttribute()} or
+    \l{QXmlStreamWriter::writeAttributes()}{writeAttributes()},
+    element content, and then \l{QXmlStreamWriter::writeEndDocument()}
+    {writeEndDocument()}. Also, \l{QXmlStreamWriter::writeEmptyElement()}
+    {writeEmptyElement()} can be used to write empty elements.
+
+    Element content comprises characters, entity references or nested elements.
+    Content can be written with \l{QXmlStreamWriter::writeCharacters()}
+    {writeCharacters()}, a function that also takes care of escaping all
+    forbidden characters and character sequences,
+    \l{QXmlStreamWriter::writeEntityReference()}{writeEntityReference()},
+    or subsequent calls to \l{QXmlStreamWriter::writeStartElement()}
+    {writeStartElement()}.
+
+    The \c XbelWriter class from \l{QXmlStream Bookmarks Example} is a subclass
+    of QXmlStreamWriter. Its \c writeFile() function illustrates the core
+    functions of QXmlStreamWriter mentioned above:
+
+    \snippet examples/xml/streambookmarks/xbelwriter.cpp 1
+
+    \section1 The Qt SAX2 Classes
+
+    \section2 Introduction to SAX2
+
+    The SAX2 interface is an event-driven mechanism to provide the user with
+    document information. An "event" in this context means something
+    reported by the parser, for example, it has encountered a start tag,
+    or an end tag, etc.
+
+    To make it less abstract consider the following example:
+    \snippet doc/src/snippets/code/doc_src_qtxml.qdoc 3
+
+    Whilst reading (a SAX2 parser is usually referred to as "reader") 
+    the above document three events would be triggered:
+    \list 1
+    \o A start tag occurs (\c{<quote>}).
+    \o Character data (i.e. text) is found, "A quotation.".
+    \o An end tag is parsed (\c{</quote>}).
+    \endlist
+
+    Each time such an event occurs the parser reports it; you can set up
+    event handlers to respond to these events.
+
+    Whilst this is a fast and simple approach to read XML documents,
+    manipulation is difficult because data is not stored, simply handled
+    and discarded serially. The \link #dom DOM interface 
+    \endlink reads in and stores the whole document in a tree structure;
+    this takes more memory, but makes it easier to manipulate the
+    document's structure..
+
+    The Qt XML module provides an abstract class, \l QXmlReader, that
+    defines the interface for potential SAX2 readers. Qt includes a reader
+    implementation, \l QXmlSimpleReader, that is easy to adapt through
+    subclassing.
+
+    The reader reports parsing events through special handler classes:
+    \table
+    \header \o Handler class \o Description
+    \row \o \l QXmlContentHandler
+         \o Reports events related to the content of a document (e.g. the start tag
+            or characters).
+    \row \o \l QXmlDTDHandler
+         \o Reports events related to the DTD (e.g. notation declarations).
+    \row \o \l QXmlErrorHandler
+         \o Reports errors or warnings that occurred during parsing.
+    \row \o \l QXmlEntityResolver
+         \o Reports external entities during parsing and allows users to resolve
+            external entities themselves instead of leaving it to the reader.
+    \row \o \l QXmlDeclHandler
+         \o Reports further DTD related events (e.g. attribute declarations).
+    \row \o \l QXmlLexicalHandler
+         \o Reports events related to the lexical structure of the
+            document (the beginning of the DTD, comments etc.).
+    \endtable
+
+    These classes are abstract classes describing the interface. The \l
+    QXmlDefaultHandler class provides a "do nothing" default
+    implementation for all of them. Therefore users only need to overload
+    the QXmlDefaultHandler functions they are interested in. 
+
+    To read input XML data a special class \l QXmlInputSource is used.
+
+    Apart from those already mentioned, the following SAX2 support classes 
+    provide additional useful functionality:
+    \table
+    \header \o Class \o Description
+    \row \o \l QXmlAttributes
+         \o Used to pass attributes in a start element event.
+    \row \o \l QXmlLocator
+         \o Used to obtain the actual parsing position of an event.
+    \row \o \l QXmlNamespaceSupport
+         \o Used to implement namespace support for a reader. Note that
+            namespaces do not change the parsing behavior. They are only
+            reported through the handler.
+    \endtable
+
+    The \l{SAX Bookmarks example} illustrates how to subclass
+    QXmlDefaultHandler to read an XML bookmark file (XBEL) and
+    how to generate XML by hand.
+
+    \section2 SAX2 Features
+
+    The behavior of an XML reader depends on its support for certain
+    optional features. For example, a reader may have the feature "report
+    attributes used for namespace declarations and prefixes along with
+    the local name of a tag". Like every other feature this has a unique
+    name represented by a URI: it is called
+    \e http://xml.org/sax/features/namespace-prefixes.
+
+    The Qt SAX2 implementation can report whether the reader has
+    particular functionality using the QXmlReader::hasFeature()
+    function. Available features can be tested with QXmlReader::feature(),
+    and switched on or off using QXmlReader::setFeature(). 
+
+    Consider the example 
+    \snippet doc/src/snippets/code/doc_src_qtxml.qdoc 4
+    A reader that does not support the \e
+    http://xml.org/sax/features/namespace-prefixes feature would report
+    the element name \e document but not its attributes \e xmlns:book and
+    \e xmlns with their values. A reader with the feature \e
+    http://xml.org/sax/features/namespace-prefixes reports the namespace
+    attributes if the \link QXmlReader::feature() feature\endlink is
+    switched on.
+
+    Other features include \e http://xml.org/sax/features/namespace
+    (namespace processing, implies \e
+    http://xml.org/sax/features/namespace-prefixes) and \e
+    http://xml.org/sax/features/validation (the ability to report
+    validation errors). 
+
+    Whilst SAX2 leaves it to the user to define and implement whatever
+    features are required, support for \e
+    http://xml.org/sax/features/namespace (and thus \e
+    http://xml.org/sax/features/namespace-prefixes) is mandantory.
+    The \l QXmlSimpleReader implementation of \l QXmlReader,
+    supports them, and can do namespace processing.
+
+    \l QXmlSimpleReader is not validating, so it
+    does not support \e http://xml.org/sax/features/validation.
+
+    \section2 Namespace Support via Features
+
+    As we have seen in the previous section, we can configure the
+    behavior of the reader when it comes to namespace
+    processing. This is done by setting and unsetting the 
+    \e http://xml.org/sax/features/namespaces and
+    \e http://xml.org/sax/features/namespace-prefixes features.
+
+    They influence the reporting behavior in the following way:
+    \list 1
+    \o Namespace prefixes and local parts of elements and attributes can
+    be reported.
+    \o The qualified names of elements and attributes are reported.
+    \o \l QXmlContentHandler::startPrefixMapping() and \l
+    QXmlContentHandler::endPrefixMapping() are called by the reader.
+    \o Attributes that declare namespaces (i.e. the attribute \e xmlns and
+    attributes starting with \e{xmlns:}) are reported.
+    \endlist
+
+    Consider the following element:
+    \snippet doc/src/snippets/code/doc_src_qtxml.qdoc 5
+    With \e http://xml.org/sax/features/namespace-prefixes set to true 
+    the reader will report four attributes; but with the \e
+    namespace-prefixes feature set to false only three, with the \e
+    xmlns:fnord attribute defining a namespace being "invisible" to the
+    reader.
+
+    The \e http://xml.org/sax/features/namespaces feature is responsible
+    for reporting local names, namespace prefixes and URIs. With \e
+    http://xml.org/sax/features/namespaces set to true the parser will
+    report \e title as the local name of the \e fnord:title attribute, \e
+    fnord being the namespace prefix and \e http://www.qtsoftware.com/fnord/ as
+    the namespace URI. When \e http://xml.org/sax/features/namespaces is
+    false none of them are reported.
+
+    In the current implementation the Qt XML classes follow the definition
+    that the prefix \e xmlns itself isn't associated with any namespace at all
+    (see \link http://www.w3.org/TR/1999/REC-xml-names-19990114/#ns-using 
+    http://www.w3.org/TR/1999/REC-xml-names-19990114/#ns-using \endlink).
+    Therefore even with \e http://xml.org/sax/features/namespaces and
+    \e http://xml.org/sax/features/namespace-prefixes both set to true
+    the reader won't return either a local name, a namespace prefix or
+    a namespace URI for \e xmlns:fnord.
+
+    This might be changed in the future following the W3C suggestion
+    \link http://www.w3.org/2000/xmlns/ http://www.w3.org/2000/xmlns/ \endlink
+    to associate \e xmlns with the namespace \e http://www.w3.org/2000/xmlns. 
+
+    As the SAX2 standard suggests, \l QXmlSimpleReader defaults to having
+    \e http://xml.org/sax/features/namespaces set to true and
+    \e http://xml.org/sax/features/namespace-prefixes set to false.
+    When changing this behavior using \l QXmlSimpleReader::setFeature() 
+    note that the combination of both features set to
+    false is illegal.
+
+    \section3 Summary
+
+    \l QXmlSimpleReader implements the following behavior:
+
+    \table
+    \header \o (namespaces, namespace-prefixes)
+            \o Namespace prefix and local part
+            \o Qualified names
+            \o Prefix mapping
+            \o xmlns attributes
+    \row \o (true, false) \o Yes \o Yes* \o Yes \o No
+    \row \o (true, true) \o Yes \o Yes \o Yes \o Yes
+    \row \o (false, true) \o No* \o Yes \o No* \o Yes
+    \row \o (false, false) \i41 Illegal
+    \endtable
+
+    The behavior of the entries marked with an asterisk (*) is not specified by SAX.
+
+    \section2 Properties
+
+    Properties are a more general concept. They have a unique name,
+    represented as an URI, but their value is \c void*. Thus nearly
+    anything can be used as a property value. This concept involves some
+    danger, though: there is no means of ensuring type-safety; the user
+    must take care that they pass the right type. Properties are
+    useful if a reader supports special handler classes.
+
+    The URIs used for features and properties often look like URLs, e.g.
+    \c http://xml.org/sax/features/namespace. This does not mean that the
+    data required is at this address. It is simply a way of defining
+    unique names.
+
+    Anyone can define and use new SAX2 properties for their readers.
+    Property support is not mandatory.
+
+    To set or query properties the following functions are provided: \l
+    QXmlReader::setProperty(), \l QXmlReader::property() and \l
+    QXmlReader::hasProperty().                     
+
+
+    \target dom
+    \section1 The Qt DOM Classes
+
+    \target domIntro
+    \section2 Introduction to DOM
+
+    DOM provides an interface to access and change the content and
+    structure of an XML file. It makes a hierarchical view of the document
+    (a tree view). Thus -- in contrast to the SAX2 interface -- an object
+    model of the document is resident in memory after parsing which makes
+    manipulation easy. 
+
+    All DOM nodes in the document tree are subclasses of \l QDomNode. The
+    document itself is represented as a \l QDomDocument object.
+
+    Here are the available node classes and their potential child classes:
+
+    \list
+    \o \l QDomDocument: Possible children are
+            \list
+            \o \l QDomElement (at most one)
+            \o \l QDomProcessingInstruction
+            \o \l QDomComment
+            \o \l QDomDocumentType
+            \endlist
+    \o \l QDomDocumentFragment: Possible children are
+            \list
+            \o \l QDomElement
+            \o \l QDomProcessingInstruction
+            \o \l QDomComment
+            \o \l QDomText
+            \o \l QDomCDATASection
+            \o \l QDomEntityReference
+            \endlist
+    \o \l QDomDocumentType: No children
+    \o \l QDomEntityReference: Possible children are
+            \list
+            \o \l QDomElement
+            \o \l QDomProcessingInstruction
+            \o \l QDomComment
+            \o \l QDomText
+            \o \l QDomCDATASection
+            \o \l QDomEntityReference
+            \endlist
+    \o \l QDomElement: Possible children are
+            \list
+            \o \l QDomElement
+            \o \l QDomText
+            \o \l QDomComment
+            \o \l QDomProcessingInstruction
+            \o \l QDomCDATASection
+            \o \l QDomEntityReference
+            \endlist
+    \o \l QDomAttr: Possible children are
+            \list
+            \o \l QDomText
+            \o \l QDomEntityReference
+            \endlist
+    \o \l QDomProcessingInstruction: No children
+    \o \l QDomComment: No children
+    \o \l QDomText: No children
+    \o \l QDomCDATASection: No children
+    \o \l QDomEntity: Possible children are
+            \list
+            \o \l QDomElement
+            \o \l QDomProcessingInstruction
+            \o \l QDomComment
+            \o \l QDomText
+            \o \l QDomCDATASection
+            \o \l QDomEntityReference
+            \endlist
+    \o \l QDomNotation: No children
+    \endlist
+
+    With \l QDomNodeList and \l QDomNamedNodeMap two collection classes 
+    are provided: \l QDomNodeList is a list of nodes,
+    and \l QDomNamedNodeMap is used to handle unordered sets of nodes
+    (often used for attributes).
+
+    The \l QDomImplementation class allows the user to query features of the
+    DOM implementation.
+
+    To get started please refer to the \l QDomDocument documentation.
+    You might also want to take a look at the \l{DOM Bookmarks example},
+    which illustrates how to read and write an XML bookmark file (XBEL)
+    using DOM.
+
+    \target namespaces
+    \section1 An Introduction to Namespaces
+
+    Parts of the Qt XML module documentation assume that you are familiar
+    with XML namespaces. Here we present a brief introduction; skip to
+    \link #namespacesConventions Qt XML documentation conventions \endlink
+    if you already know this material.
+
+    Namespaces are a concept introduced into XML to allow a more modular
+    design. With their help data processing software can easily resolve
+    naming conflicts in XML documents.
+
+    Consider the following example:
+
+    \snippet doc/src/snippets/code/doc_src_qtxml.qdoc 6
+
+    Here we find three different uses of the name \e title. If you wish to
+    process this document you will encounter problems because each of the
+    \e titles should be displayed in a different manner -- even though
+    they have the same name.
+
+    The solution would be to have some means of identifying the first
+    occurrence of \e title as the title of a book, i.e. to use the \e
+    title element of a book namespace to distinguish it from, for example,
+    the chapter title, e.g.:
+    \snippet doc/src/snippets/code/doc_src_qtxml.qdoc 7
+
+    \e book in this case is a \e prefix denoting the namespace.
+
+    Before we can apply a namespace to element or attribute names we must
+    declare it.
+
+    Namespaces are URIs like \e http://www.qtsoftware.com/fnord/book/. This
+    does not mean that data must be available at this address; the URI is
+    simply used to provide a unique name.
+
+    We declare namespaces in the same way as attributes; strictly speaking
+    they \e are attributes. To make for example \e
+    http://www.qtsoftware.com/fnord/ the document's default XML namespace \e
+    xmlns we write
+
+    \snippet doc/src/snippets/code/doc_src_qtxml.qdoc 8
+
+    To distinguish the \e http://www.qtsoftware.com/fnord/book/ namespace from
+    the default, we must supply it with a prefix:
+
+    \snippet doc/src/snippets/code/doc_src_qtxml.qdoc 9
+
+    A namespace that is declared like this can be applied to element and
+    attribute names by prepending the appropriate prefix and a ":"
+    delimiter. We have already seen this with the \e book:title element.
+
+    Element names without a prefix belong to the default namespace. This
+    rule does not apply to attributes: an attribute without a prefix does
+    not belong to any of the declared XML namespaces at all. Attributes
+    always belong to the "traditional" namespace of the element in which
+    they appear. A "traditional" namespace is not an XML namespace, it
+    simply means that all attribute names belonging to one element must be
+    different. Later we will see how to assign an XML namespace to an
+    attribute.
+
+    Due to the fact that attributes without prefixes are not in any XML
+    namespace there is no collision between the attribute \e title (that
+    belongs to the \e author element) and for example the \e title element
+    within a \e chapter.
+
+    Let's clarify this with an example:
+    \snippet doc/src/snippets/code/doc_src_qtxml.qdoc 10
+
+    Within the \e document element we have two namespaces declared. The
+    default namespace \e http://www.qtsoftware.com/fnord/ applies to the \e
+    book element, the \e chapter element, the appropriate \e title element
+    and of course to \e document itself.
+
+    The \e book:author and \e book:title elements belong to the namespace
+    with the URI \e http://www.qtsoftware.com/fnord/book/.
+
+    The two \e book:author attributes \e title and \e name have no XML
+    namespace assigned. They are only members of the "traditional"
+    namespace of the element \e book:author, meaning that for example two
+    \e title attributes in \e book:author are forbidden.
+
+    In the above example we circumvent the last rule by adding a \e title
+    attribute from the \e http://www.qtsoftware.com/fnord/ namespace to \e
+    book:author: the \e fnord:title comes from the namespace with the
+    prefix \e fnord that is declared in the \e book:author element.
+
+    Clearly the \e fnord namespace has the same namespace URI as the
+    default namespace. So why didn't we simply use the default namespace
+    we'd already declared? The answer is quite complex:
+    \list
+    \o attributes without a prefix don't belong to any XML namespace at
+    all, not even to the default namespace;
+    \o additionally omitting the prefix would lead to a \e title-title clash;
+    \o writing it as \e xmlns:title would declare a new namespace with the
+    prefix \e title instead of applying the default \e xmlns namespace.
+    \endlist
+
+    With the Qt XML classes elements and attributes can be accessed in two
+    ways: either by refering to their qualified names consisting of the
+    namespace prefix and the "real" name (or \e local name) or by the
+    combination of local name and namespace URI.
+
+    More information on XML namespaces can be found at
+    \l http://www.w3.org/TR/REC-xml-names/.
+
+
+    \target namespacesConventions
+    \section2 Conventions Used in the Qt XML Documentation
+
+    The following terms are used to distinguish the parts of names within
+    the context of namespaces:
+    \list
+    \o  The \e {qualified name}
+        is the name as it appears in the document. (In the above example \e
+        book:title is a qualified name.)
+    \o  A \e {namespace prefix} in a qualified name
+        is the part to the left of the ":". (\e book is the namespace prefix in
+        \e book:title.)
+    \o  The \e {local part} of a name (also refered to as the \e {local
+        name}) appears to the right of the ":". (Thus \e title is the
+        local part of \e book:title.)
+    \o  The \e {namespace URI} ("Uniform Resource Identifier") is a unique
+        identifier for a namespace. It looks like a URL
+        (e.g. \e http://www.qtsoftware.com/fnord/ ) but does not require
+        data to be accessible by the given protocol at the named address.
+    \endlist
+
+    Elements without a ":" (like \e chapter in the example) do not have a
+    namespace prefix. In this case the local part and the qualified name
+    are identical (i.e. \e chapter).
+
+    \sa {DOM Bookmarks Example}, {SAX Bookmarks Example}
+*/
diff --git a/doc/src/qtxmlpatterns.qdoc b/doc/src/qtxmlpatterns.qdoc
new file mode 100644
index 0000000000..cb260fc544
--- /dev/null
+++ b/doc/src/qtxmlpatterns.qdoc
@@ -0,0 +1,893 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \module QtXmlPatterns
+    \title QtXmlPatterns Module
+    \since 4.4
+    \contentspage Qt's Modules
+    \previouspage QtXml
+    \nextpage Phonon Module
+    \ingroup modules
+    \ingroup scripting
+
+    \keyword Patternist
+
+    \brief An overview of Qt's support for using XQuery and XPath in
+    Qt programs.
+
+    \tableofcontents
+
+    \section1 Introduction
+
+    XQuery is a language for traversing XML documents to select and
+    aggregate items of interest and to transform them for output as
+    XML or some other format. XPath is the \e{element selection} part
+    of XQuery.
+
+    The QtXmlPatterns module supports using
+    \l{http://www.w3.org/TR/xquery} {XQuery 1.0} and
+    \l{http://www.w3.org/TR/xpath20} {XPath 2.0} in Qt applications,
+    for querying XML data \e{and} for querying
+    \l{QAbstractXmlNodeModel} {non-XML data that can be modeled to
+    look like XML}. The QtXmlPatterns module is included in the \l{Qt
+    Full Framework Edition}, and the \l{Open Source Versions of Qt}.
+    Readers who are not familiar with the XQuery/XPath language can read
+    \l {A Short Path to XQuery} for a brief introduction.
+
+    \section1 Advantages of using QtXmlPatterns and XQuery
+
+    The XQuery/XPath language simplifies data searching and
+    transformation tasks by eliminating the need for doing a lot of
+    C++ or Java procedural programming for each new query task. Here
+    is an XQuery that constructs a bibliography of the contents of a
+    library:
+
+    \target qtxmlpatterns_example_query
+    \quotefile snippets/patternist/introductionExample.xq
+
+    First, the query opens a \c{<bibliography>} element in the
+    output. The
+    \l{xquery-introduction.html#using-path-expressions-to-match-select-items}
+    {embedded path expression} then loads the XML document describing
+    the contents of the library (\c{library.xml}) and begins the
+    search. For each \c{<book>} element it finds, where the publisher
+    was Addison-Wesley and the publication year was after 1991, it
+    creates a new \c{<book>} element in the output as a child of the
+    open \c{<bibliography>} element. Each new \c{<book>} element gets
+    the book's title as its contents and the book's publication year
+    as an attribute. Finally, the \c{<bibliography>} element is
+    closed.
+
+    The advantages of using QtXmlPatterns and XQuery in your Qt
+    programs are summarized as follows:
+
+    \list
+
+    \o \bold{Ease of development}: All the C++ programming required to
+       perform data query tasks can be replaced by a simple XQuery
+       like the example above.
+
+    \o \bold{Comprehensive functionality}: The
+       \l{http://www.w3.org/TR/xquery/#id-expressions} {expression
+       syntax} and rich set of
+       \l{http://www.w3.org/TR/xpath-functions} {functions and
+       operators} provided by XQuery are sufficient for performing any
+       data searching, selecting, and sorting tasks.
+
+    \o \bold{Conformance to standards}: Conformance to all applicable
+       XML and XQuery standards ensures that QtXmlPatterns can always
+       process XML documents generated by other conformant
+       applications, and that XML documents created with QtXmlPatterns
+       can be processed by other conformant applications.
+
+    \o \bold{Maximal flexibility} The QtXmlPatterns module can be used
+       to query XML data \e{and} non-XML data that can be
+       \l{QAbstractXmlNodeModel} {modeled to look like XML}.
+
+    \endlist
+
+    \section1 Using the QtXmlPatterns module
+
+    There are two ways QtXmlPatterns can be used to evaluate queries.
+    You can run the query engine in your Qt application using the
+    QtXmlPatterns C++ API, or you can run the query engine from the
+    command line using Qt's \c{xmlpatterns} command line utility.
+
+    \section2 Running the query engine from your Qt application
+
+    To access the QtXmlPatterns C++ API from your Qt application,
+    include the QtXmlPatterns classes at compile time:
+
+    \snippet doc/src/snippets/code/doc_src_qtxmlpatterns.qdoc 0
+
+    Link the compiled application with the QtXmlPatterns module by
+    adding the following line to the
+    \l{qmake-project-files.html#declaring-qt-libraries} {QT line} in
+    your qmake \c{.pro} file:
+
+    \snippet doc/src/snippets/code/doc_src_qtxmlpatterns.qdoc 1
+
+    If we save the example XQuery shown above in a text file (e.g.
+    \c{myquery.xq}), we can run it from a Qt application using a
+    standard QtXmlPatterns code sequence:
+
+    \snippet doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp 3
+
+    First construct a QFile for the text file containing the XQuery
+    (\c{myquery.xq}). Then create an instance of QXmlQuery and call
+    its \l{QXmlQuery::}{setQuery()} function to load and parse the
+    XQuery file. Then create an \l{QXmlSerializer} {XML serializer} to
+    output the query's result set as unformatted XML. Finally, call
+    the \l{QXmlQuery::}{evaluateTo()} function to evaluate the query
+    and serialize the results as XML.
+
+    \note If you compile Qt yourself, the QtXmlPatterns module will
+    \e{not} be built if exceptions are disabled, or if you compile Qt
+    with a compiler that doesn't support member templates, e.g., MSVC
+    6.
+
+    See the QXmlQuery documentation for more information about the
+    QtXmlPatterns C++ API.
+
+    \section2 Running the query engine from the command line utility
+
+    \e xmlpatterns is a command line utility for running XQueries.  It
+    expects the name of a file containing the XQuery text.
+
+    \snippet doc/src/snippets/code/doc_src_qtxmlpatterns.qdoc 2
+
+    The XQuery in \c{myQuery.xq} will be evaluated and its output
+    written to \c stdout. Pass the \c -help switch to get the list of
+    input flags and their meanings.
+
+    xmlpatterns can be used in scripting. However, the descriptions
+    and messages it outputs were not meant to be parsed and may be
+    changed in future releases of Qt.
+
+    \target QtXDM
+    \section1 The XQuery Data Model
+
+    XQuery represents data items as \e{atomic values} or \e{nodes}. An
+    atomic value is a value in the domain of one of the
+    \l{http://www.w3.org/TR/xmlschema-2/#built-in-datatypes} {built-in
+    datatypes} defined in \l{http://www.w3.org/TR/xmlschema-2} {Part
+    2} of the W3C XML Schema. A node is normally an XML element or
+    attribute, but when non-XML data is \l{QAbstractXmlNodeModel}
+    {modeled to look like XML}, a node can also represent a non-XML
+    data items.
+
+    When you run an XQuery using the C++ API in a Qt application, you
+    will often want to bind program variables to $variables in the
+    XQuery. After the query is evaluated, you will want to interpret
+    the sequence of data items in the result set.
+
+    \section2 Binding program variables to XQuery variables
+
+    When you want to run a parameterized XQuery from your Qt
+    application, you will need to \l{QXmlQuery::bindVariable()} {bind
+    variables} in your program to $name variables in your XQuery.
+
+    Suppose you want to parameterize the bibliography XQuery in the
+    example above. You could define variables for the catalog that
+    contains the library (\c{$file}), the publisher name
+    (\c{$publisher}), and the year of publication (\c{$year}):
+
+    \target qtxmlpatterns_example_query2
+    \quotefile snippets/patternist/introExample2.xq
+
+    Modify the QtXmlPatterns code to use one of the \l{QXmlQuery::}
+    {bindVariable()} functions to bind a program variable to each
+    XQuery $variable:
+
+    \snippet doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp 4
+
+    Each program variable is passed to QtXmlPatterns as a QVariant of
+    the type of the C++ variable or constant from which it is
+    constructed. Note that QtXmlPatterns assumes that the type of the
+    QVariant in the bindVariable() call is the correct type, so the
+    $variable it is bound to must be used in the XQuery accordingly.
+    The following table shows how QVariant types are mapped to XQuery
+    $variable types:
+
+    \table
+
+    \header
+        \o QVariant type
+        \o XQuery $variable type
+
+    \row
+        \o QVariant::LongLong
+        \o \c xs:integer
+
+    \row
+        \o QVariant::Int
+        \o \c xs:integer
+
+    \row
+        \o QVariant::UInt
+        \o \c xs:nonNegativeInteger
+
+    \row
+        \o QVariant::ULongLong
+        \o \c xs:unsignedLong
+
+    \row
+        \o QVariant::String
+        \o \c xs:string
+
+    \row
+        \o QVariant::Double
+        \o \c xs:double
+
+    \row
+        \o QVariant::Bool
+        \o \c xs:boolean
+
+    \row
+        \o QVariant::Double
+        \o \c xs:decimal
+
+    \row
+        \o QVariant::ByteArray
+        \o \c xs:base64Binary
+
+    \row
+        \o QVariant::StringList
+        \o \c xs:string*
+
+    \row
+        \o QVariant::Url
+        \o \c xs:string
+
+    \row
+        \o QVariant::Date
+        \o \c xs:date.
+
+    \row
+        \o QVariant::DateTime
+        \o \c xs:dateTime
+
+    \row
+        \o QVariant::Time.
+        \o \c xs:time. (see \l{Binding To Time}{Binding To
+        QVariant::Time} below)
+
+    \row
+        \o QVariantList
+        \o (see \l{Binding To QVariantList}{Binding To QVariantList}
+           below)
+
+    \endtable
+
+    A type not shown in the table is not supported and will cause
+    undefined XQuery behavior or a $variable binding error, depending
+    on the context in the XQuery where the variable is used.
+
+    \target Binding To Time
+    \section3 Binding To QVariant::Time
+
+    Because the instance of QTime used in QVariant::Time does not
+    include a zone offset, an instance of QVariant::Time should not be
+    bound to an XQuery variable of type \c xs:time, unless the QTime is
+    UTC. When binding a non-UTC QTime to an XQuery variable, it should
+    first be passed as a string, or converted to a QDateTime with an arbitrary
+    date, and then bound to an XQuery variable of type \c xs:dateTime.
+
+    \target Binding To QVariantList
+    \section3 Binding To QVariantList
+
+    A QVariantList can be bound to an XQuery $variable. All the
+    \l{QVariant}s in the list must be of the same atomic type, and the
+    $variable the variant list is bound to must be of that same atomic
+    type. If the QVariants in the list are not all of the same atomic
+    type, the XQuery behavior is undefined.
+
+    \section2 Interpreting XQuery results
+
+    When the results of an XQuery are returned in a sequence of \l
+    {QXmlResultItems} {result items}, atomic values in the sequence
+    are treated as instances of QVariant. Suppose that instead of
+    serializing the results of the XQuery as XML, we process the
+    results programatically. Modify the standard QtXmlPatterns code
+    sequence to call the overload of QXmlQuery::evaluateTo() that
+    populates a sequence of \l {QXmlResultItems} {result items} with
+    the XQuery results:
+
+    \snippet doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp 5
+
+    Iterate through the \l {QXmlResultItems} {result items} and test
+    each QXmlItem to see if it is an atomic value or a node. If it is
+    an atomic value, convert it to a QVariant with \l {QXmlItem::}
+    {toAtomicValue()} and switch on its \l {QVariant::type()} {variant
+    type} to handle all the atomic values your XQuery might return.
+    The following table shows the QVariant type to expect for each
+    atomic value type (or QXmlName):
+
+    \table
+
+    \header
+        \o XQuery result item type
+        \o QVariant type returned
+
+    \row
+        \o \c xs:QName
+        \o QXmlName (see \l{Handling QXmlNames}{Handling QXmlNames}
+        below)
+
+    \row
+        \o \c xs:integer
+        \o QVariant::LongLong
+
+    \row
+        \o \c xs:string
+        \o QVariant::String
+
+    \row
+        \o \c xs:string*
+        \o QVariant::StringList
+
+    \row
+        \o \c xs:double
+        \o QVariant::Double
+
+    \row
+        \o \c xs:float
+        \o QVariant::Double
+
+    \row
+        \o \c xs:boolean
+        \o QVariant::Bool
+
+    \row
+        \o \c xs:decimal
+        \o QVariant::Double
+
+    \row
+        \o \c xs:hexBinary
+        \o QVariant::ByteArray
+
+    \row
+        \o \c xs:base64Binary
+        \o QVariant::ByteArray
+
+    \row
+        \o \c xs:gYear
+        \o QVariant::DateTime
+
+    \row
+        \o \c xs:gYearMonth
+        \o QVariant::DateTime
+
+    \row
+        \o \c xs:gMonthDay
+        \o QVariant::DateTime
+
+    \row
+        \o \c xs:gDay
+        \o QVariant::DateTime
+
+    \row
+        \o \c xs:gMonth
+        \o QVariant::DateTime
+
+    \row
+        \o \c xs:anyURI
+        \o QVariant::Url
+
+    \row
+        \o \c xs:untypedAtomic
+        \o QVariant::String
+
+    \row
+        \o \c xs:ENTITY
+        \o QVariant::String
+
+    \row
+        \o \c xs:date
+        \o QVariant::DateTime
+
+    \row
+        \o \c xs:dateTime
+        \o QVariant::DateTime
+
+    \row
+        \o \c xs:time
+        \o (see \l{xstime-not-mapped}{No mapping for xs:time} below)
+
+    \endtable
+
+    \target Handling QXmlNames
+    \section3 Handling QXmlNames
+
+    If your XQuery can return atomic value items of type \c{xs:QName},
+    they will appear in your QXmlResultItems as instances of QXmlName.
+    Since the QVariant class does not support the QXmlName class
+    directly, extracting them from QXmlResultItems requires a bit of
+    slight-of-hand using the \l{QMetaType} {Qt metatype system}. We
+    must modify our example to use a couple of template functions, a
+    friend of QMetaType (qMetaTypeId<T>()) and a friend of QVariant
+    (qVariantValue<T>()):
+
+    \snippet doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp 6
+
+    To access the strings in a QXmlName returned by an
+    \l{QXmlQuery::evaluateTo()} {XQuery evaluation}, the QXmlName must
+    be accessed with the \l{QXmlNamePool} {name pool} from the
+    instance of QXmlQuery that was used for the evaluation.
+
+    \target xstime-not-mapped
+    \section3 No mapping for xs:time
+
+    An instance of \c xs:time can't be represented correctly as an
+    instance of QVariant::Time, unless the \c xs:time is a UTC time.
+    This is because xs:time has a zone offset (0 for UTC) in addition
+    to the time value, which the QTime in QVariant::Time does not
+    have. This means that if an XQuery tries to return an atomic value
+    of type \c xs:time, an invalid QVariant will be returned. A query
+    can return an atomic value of type xs:time by either converting it
+    to an \c xs:dateTime with an arbitrary date, or to an \c xs:string.
+
+    \section1 Using XQuery with Non-XML Data
+
+    Although the XQuery language was designed for querying XML, with
+    QtXmlPatterns one can use XQuery for querying any data that can
+    be modeled to look like XML. Non-XML data is modeled to look like
+    XML by loading it into a custom subclass of QAbstractXmlNodeModel,
+    where it is then presented to the QtXmlPatterns XQuery engine via
+    the same API the XQuery engine uses for querying XML.
+
+    When QtXmlPatterns loads and queries XML files and produces XML
+    output, it can always load the XML data into its default XML node
+    model, where it can be traversed efficiently. The XQuery below
+    traverses the product orders found in the XML file \e myOrders.xml
+    to find all the skin care product orders and output them ordered
+    by shipping date.
+
+    \quotefile snippets/patternist/introAcneRemover.xq
+
+    QtXmlPatterns can be used out of the box to perform this
+    query, provided \e myOrders.xml actually contains well-formed XML. It
+    can be loaded directly into the default XML node model and
+    traversed. But suppose we want QtXmlPatterns to perform queries on
+    the hierarchical structure of the local file system. The default
+    XML node model in QtXmlPatterns is not suitable for navigating the
+    file system, because there is no XML file to load that contains a
+    description of it. Such an XML file, if it existed, might look
+    something like this:
+
+    \quotefile snippets/patternist/introFileHierarchy.xml
+
+    The \l{File System Example}{File System Example} does exactly this.
+
+    There is no such file to load into the default XML node model, but
+    one can write a subclass of QAbstractXmlNodeModel to represent the
+    file system. This custom XML node model, once populated with all
+    the directory and file descriptors obtained directly from the
+    system, presents the complete file system hierarchy to the query
+    engine via the same API used by the default XML node model to
+    present the contents of an XML file. In other words, once the
+    custom XML node model is populated, it presents the file system to
+    the query engine as if a description of it had been loaded into
+    the default XML node model from an XML file like the one shown
+    above.
+
+    Now we can write an XQuery to find all the XML files and parse
+    them to find the ones that don't contain well-formed XML.
+
+    \quotefromfile snippets/patternist/introNavigateFS.xq
+    \skipto <html>
+    \printuntil
+
+    Without QtXmlPatterns, there is no simple way to solve this kind
+    of problem. You might do it by writing a C++ program to traverse
+    the file system, sniff out all the XML files, and submit each one
+    to an XML parser to test that it contains valid XML. The C++ code
+    required to write that program will probably be more complex than
+    the C++ code required to subclass QAbstractXmlNodeModel, but even
+    if the two are comparable, your custom C++ program can be used
+    only for that one task, while your custom XML node model can be
+    used by any XQuery that must navigate the file system.
+
+    The general approach to using XQuery to perform queries on non-XML
+    data has been a three step process. In the first step, the data is
+    loaded into a non-XML data model. In the second step, the non-XML
+    data model is serialized as XML and output to XML (text) files. In
+    the final step, an XML tool loads the XML files into a second, XML
+    data model, where the XQueries can be performed.  The development
+    cost of implementing this process is often high, and the three
+    step system that results is inefficient because the two data
+    models must be built and maintained separately.
+
+    With QtXmlPatterns, subclassing QAbstractXmlNodeModel eliminates
+    the transformation required to convert the non-XML data model to
+    the XML data model, because there is only ever one data model
+    required. The non-XML data model presents the non-XML data to the
+    query engine via the XML data model API. Also, since the query
+    engine uses the API to access the QAbstractXmlNodeModel, the data
+    model subclass can construct the elements, attributes and other
+    data on demand, responding to the query's specific requests.  This
+    can greatly improve efficiency, because it means the entire model
+    might not have to be built. For example, in the file system model
+    above, it is not necessary to build an instance for a whole
+    XML file representing the whole file system. Instead nodes are
+    created on demand, which also likely is a small subset of the file
+    system.
+
+    Examples of other places where XQuery could be used in
+    QtXmlPatterns to query non-XML data:
+
+    \list
+
+        \o The internal representation for word processor documents
+
+        \o The set of dependencies for a software build system
+
+        \o The hierarchy (or graph) that links a set of HTML documents
+        from a web crawler
+
+        \o The images and meta-data in an image collection
+
+        \o The set of D-Bus interfaces available in a system
+
+        \o A QObject hierarchy, as seen in the \l{QObject XML Model
+        Example} {QObject XML Model example}.
+
+    \endlist
+
+    See the QAbstractXmlNodeModel documentation for information about
+    how to implement custom XML node models.
+
+    \section1 More on using QtXmlPatterns with non-XML Data
+
+    Subclassing QAbstractXmlNodeModel to let the query engine access
+    non-XML data by the same API it uses for XML is the feature that
+    enables QtXmlPatterns to query non-XML data with XQuery. It allows
+    XQuery to be used as a mapping layer between different non-XML
+    node models or between a non-XML node model and the built-in XML
+    node model. Once the subclass(es) of QAbstractXmlNodeModel have
+    been written, XQuery can be used to select a set of elements from
+    one node model, transform the selected elements, and then write
+    them out, either as XML using QXmlQuery::evaluateTo() and QXmlSerializer,
+    or as some other format using a subclass of QAbstractXmlReceiver.
+
+    Consider a word processor application that must import and export
+    data in several different formats. Rather than writing a lot of
+    C++ code to convert each input format to an intermediate form, and
+    more C++ code to convert the intermediate form back to each
+    output format, one can implement a solution based on QtXmlPatterns
+    that uses simple XQueries to transform each XML or non-XML format
+    (e.g. MathFormula.xml below) to the intermediate form (e.g. the
+    DocumentRepresentation node model class below), and more simple
+    XQueries to transform the intermediate form back to each XML or
+    non-XML format.
+
+    \image patternist-wordProcessor.png
+
+    Because CSV files are not XML, a subclass of QAbstractXmlNodeModel
+    is used to present the CSV data to the XQuery engine as if it were
+    XML. What are not shown are the subclasses of QAbstractXmlReceiver
+    that would then send the selected elements into the
+    DocumentRepresentation node model, and the subclasses of
+    QAbstractXmlNodeModel that would ultimately write the output files
+    in each format.
+
+    \section1 Security Considerations
+
+    \section2 Code Injection
+
+    XQuery is vulnerable to
+    \l{http://en.wikipedia.org/wiki/Code_injection} {code injection
+    attacks} in the same way as the SQL language. If an XQuery is
+    constructed by concatenating strings, and the strings come from
+    user input, the constructed XQuery could be malevolent. The best
+    way to prevent code injection attacks is to not construct XQueries
+    from user-written strings, but only accept user data input using
+    QVariant and variable bindings. See QXmlQuery::bindVariable().
+
+    The articles
+    \l{http://www.ibm.com/developerworks/xml/library/x-xpathinjection.html}
+    {Avoid the dangers of XPath injection}, by Robi Sen and
+    \l{http://www.packetstormsecurity.org/papers/bypass/Blind_XPath_Injection_20040518.pdf}
+    {Blind XPath Injection}, by Amit Klein, discuss the XQuery code
+    injection problem in more detail.
+
+    \section2 Denial of Service Attacks
+
+    Applications using QtXmlPatterns are subject to the same
+    limitations of software as other systems. Generally, these can not
+    be checked. This means QtXmlPatterns does not prevent rogue
+    queries from consuming too many resources. For example, a query
+    could take too much time to execute or try to transfer too much
+    data. A query could also do too much recursion, which could crash
+    the system.  XQueries can do these things accidentally, but they
+    can also be done as deliberate denial of service attacks.
+
+    \section1 Features and Conformance
+
+    \section2 XQuery 1.0
+
+    QtXmlPatterns aims at being a
+    \l{http://www.w3.org/TR/xquery/#id-xquery-conformance} {conformant
+    XQuery processor}. It adheres to
+    \l{http://www.w3.org/TR/xquery/#id-minimal-conformance} {Minimal
+    Conformance} and supports the
+    \l{http://www.w3.org/TR/xquery/#id-serialization-feature}
+    {Serialization Feature} and the
+    \l{http://www.w3.org/TR/xquery/#id-full-axis-feature} {Full Axis
+    Feature}. QtXmlPatterns currently passes 97% of the tests in the
+    \l{http://www.w3.org/XML/Query/test-suite} {XML Query Test Suite}.
+    Areas where conformance may be questionable and where behavior may
+    be changed in future releases include:
+
+    \list
+
+    \o Some corner cases involving namespaces and element constructors
+       are incorrect.
+
+    \o XPath is a subset of XQuery and the implementation of
+       QtXmlPatterns uses XPath 2.0 with XQuery 1.0.
+
+    \endlist
+
+    The specifications discusses conformance further:
+    \l{http://www.w3.org/TR/xquery/}{XQuery 1.0: An XML Query
+    Language}.  W3C's XQuery testing effort can be of interest as
+    well, \l{http://www.w3.org/XML/Query/test-suite/}{XML Query Test
+    Suite}.
+
+    Currently \c fn:collection() does not access any data set, and
+    there is no API for providing data through the collection. As a
+    result, evaluating \c fn:collection() returns the empty
+    sequence. We intend to provide functionality for this in a future
+    release of Qt.
+
+    Only queries encoded in UTF-8 are supported.
+
+    \section2 XSLT 2.0
+
+    Partial support for XSLT was introduced in Qt 4.5. Future
+    releases of QtXmlPatterns will aim to support these XSLT
+    features:
+
+    \list
+        \o Basic XSLT 2.0 processor
+        \o Serialization feature
+        \o Backwards Compatibility feature
+    \endlist
+
+    For details, see \l{http://www.w3.org/TR/xslt20/#conformance}{XSL
+    Transformations (XSLT) Version 2.0, 21 Conformance}.
+
+    \note In this release, XSLT support is considered experimental.
+
+    Unsupported or partially supported XSLT features are documented
+    in the following table. The implementation of XSLT in Qt 4.5 can
+    be seen as XSLT 1.0 but with the data model of XPath 2.0 and
+    XSLT 2.0, and using the using the functionality of XPath 2.0 and
+    its accompanying function library. When QtXmlPatterns encounters
+    an unsupported or partially support feature, it will either report
+    a syntax error or silently continue, unless otherwise noted in the
+    table.
+
+    The implementation currently passes 42% of W3C's XSLT test suite,
+    which focus on features introduced in XSLT 2.0.
+
+    \table
+    \header
+        \o XSL Feature
+        \o Support Status
+    \row
+        \o \c xsl:key and \c fn:key()
+        \o not supported
+    \row
+        \o \c xsl:include
+        \o not supported
+    \row
+        \o \c xsl:import
+        \o not supported
+    \row
+        \o \c xsl:copy
+
+        \o The \c copy-namespaces and \c inherit-namespaces attributes
+           have no effect. For copied comments, attributes and
+           processing instructions, the copy has the same node
+           identity as the original.
+
+    \row
+        \o \c xsl:copy-of
+        \o The \c copy-namespaces attribute has no effect.
+    \row
+        \o \c fn:format-number()
+        \o not supported
+    \row
+        \o \c xsl:message
+        \o not supported
+    \row
+        \o \c xsl:use-when
+        \o not supported
+    \row
+        \o \c Tunnel Parameters
+        \o not supported
+    \row
+        \o \c xsl:attribute-set
+        \o not supported
+    \row
+        \o \c xsl:decimal-format
+        \o not supported
+    \row
+        \o \c xsl:fallback
+        \o not supported
+    \row
+        \o \c xsl:apply-imports
+        \o not supported
+    \row
+        \o \c xsl:character-map
+        \o not supported
+    \row
+        \o \c xsl:number
+        \o not supported
+    \row
+        \o \c xsl:namespace-alias
+        \o not supported
+    \row
+        \o \c xsl:output
+        \o not supported
+    \row
+        \o \c xsl:output-character
+        \o not supported
+    \row
+        \o \c xsl:preserve-space
+        \o not supported
+    \row
+        \o \c xsl:result-document
+        \o not supported
+    \row
+        \o Patterns
+        \o Complex patterns or patterns with predicates have issues.
+    \row
+        \o \c 2.0 Compatibility Mode
+
+        \o Stylesheets are interpreted as XSLT 2.0 stylesheets, even
+           if the \c version attribute is in the XSLT source is
+           1.0. In other words, the version attribute is ignored.
+
+    \row
+        \o Grouping
+
+        \o \c fn:current-group(), \c fn:grouping-key() and \c
+           xsl:for-each-group.
+
+    \row
+        \o Regexp elements
+        \o \c xsl:analyze-string, \c xsl:matching-substring,
+           \c xsl:non-matching-substring, and \c fn:regex-group()
+    \row
+        \o Date & Time formatting
+        \o \c fn:format-dateTime(), \c fn:format-date() and fn:format-time().
+
+    \row
+        \o XPath Conformance
+        \o Since XPath is a subset of XSLT, its issues are in affect too.
+    \endtable
+
+    The QtXmlPatterns implementation of the XPath Data Model does not
+    include entities (due to QXmlStreamReader not reporting them).
+    This means that functions \c unparsed-entity-uri() and \c
+    unparsed-entity-public-id() always return negatively.
+
+    \section2 XPath 2.0
+
+    Since XPath 2.0 is a subset of XQuery 1.0, XPath 2.0 is
+    supported. Areas where conformance may be questionable and,
+    consequently, where behavior may be changed in future releases
+    include:
+
+    \list
+    \o Regular expression support is currently not conformant
+       but follows Qt's QRegExp standard syntax.
+
+    \o Operators for \c xs:time, \c xs:date, and \c xs:dateTime
+       are incomplete.
+
+    \o Formatting of very large or very small \c xs:double, \c
+       xs:float, and \c xs:decimal values may be incorrect.
+    \endlist
+
+    \section2 xml:id
+
+    Processing of XML files supports \c xml:id. This allows elements
+    that have an attribute named \c xml:id to be looked up efficiently
+    with the \c fn:id() function. See
+    \l{http://www.w3.org/TR/xml-id/}{xml:id Version 1.0} for details.
+
+    \section2 Resource Loading
+
+    When QtXmlPatterns loads an XML resource, e.g., using the
+    \c fn:doc() function, the following schemes are supported:
+
+    \table
+    \header
+        \o Scheme Name
+        \o Description
+    \row
+        \o \c file
+        \o Local files.
+    \row
+        \o \c data
+
+        \o The bytes are encoded in the URI itself. e.g., \c
+           data:application/xml,%3Ce%2F%3E is \c <e/>.
+
+    \row
+        \o \c ftp
+        \o Resources retrieved via FTP.
+    \row
+        \o \c http
+        \o Resources retrieved via HTTP.
+    \row
+        \o \c https
+        \o Resources retrieved via HTTPS. This will succeed if no SSL
+           errors are encountered.
+    \row
+        \o \c qrc
+        \o Qt Resource files. Expressing it as an empty scheme, :/...,
+           is not supported.
+
+    \endtable
+
+    \section2 XML
+
+    XML 1.0 and XML Namespaces 1.0 are supported, as opposed to the
+    1.1 versions. When a strings is passed to a query as a QString,
+    the characters must be XML 1.0 characters. Otherwise, the behavior
+    is undefined. This is not checked.
+
+    URIs are first passed to QAbstractUriResolver. Check
+    QXmlQuery::setUriResolver() for possible rewrites.
+
+*/
+
+/*!
+    \namespace QPatternist
+    \brief The QPatternist namespace contains classes and functions required by the QtXmlPatterns module.
+    \internal
+*/
diff --git a/doc/src/qundo.qdoc b/doc/src/qundo.qdoc
new file mode 100644
index 0000000000..5358c124fd
--- /dev/null
+++ b/doc/src/qundo.qdoc
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\page qundo.html
+\title Overview of Qt's Undo Framework
+\keyword Undo framework
+\ingroup architecture
+
+\section1 Introduction
+
+Qt's Undo Framework is an implementation of the Command pattern, for
+implementing undo/redo functionality in applications.
+
+The Command pattern is based on the idea that all editing in
+an application is done by creating instances of command objects.
+Command objects apply changes to the document and are stored
+on a command stack. Furthermore, each command knows how to undo its
+changes to bring the document back to its previous state. As long
+as the application only uses command objects to change the state of
+the document, it is possible to undo a sequence of commands by
+traversing the stack downwards and calling undo
+on each command in turn. It is also possible to redo a sequence of
+commands by traversing the stack upwards and calling
+redo on each command.
+
+\section1 Classes
+
+The framework consists of four classes:
+
+\list
+\i \l QUndoCommand is the base class of all commands stored on an
+        undo stack. It can apply (redo) or undo a single change in the document.
+\i \l QUndoStack is a list of QUndoCommand objects. It contains all the
+        commands executed on the document and can roll the document's state
+        backwards or forwards by undoing or redoing them.
+\i \l QUndoGroup is a group of undo stacks. It is useful when an application
+        contains more than one undo stack, typically one for each opened
+        document. QUndoGroup provides a single pair of undo/redo slots for all
+        the stacks in the group. It forwards undo and redo requests to
+        the active stack, which is the stack associated with the document that
+        is currently being edited by the user.
+\i \l QUndoView is a widget which shows the contents of an undo stack. Clicking
+        on a command in the view rolls the document's state backwards or
+        forwards to that command.
+\endlist
+
+\section1 Concepts
+
+The following concepts are supported by the framework:
+
+\list
+\i \bold{Clean state:} Used to signal when the document enters and leaves a
+    state that has been saved to disk. This is typically used to disable or
+    enable the save actions, and to update the document's title bar.
+\i \bold{Command compression:} Used to compress sequences of commands into a
+    single command.
+    For example: In a text editor, the commands that insert individual
+    characters into the document can be compressed into a single command that
+    inserts whole sections of text. These bigger changes are more convenient
+    for the user to undo and redo.
+\i \bold{Command macros:} A sequence of commands, all of which are undone or
+    redone in one step.
+    These simplify the task of writing an application, since a set of simpler
+    commands can be composed into more complex commands. For example, a command
+    that moves a set of selected objects in a document can be created by
+    combining a set of commands, each of which moves a single object.
+\endlist
+
+QUndoStack provides convenient undo and redo QAction objects that
+can be inserted into a menu or a toolbar. The text properties of these
+actions always reflect what command will be undone or redone when
+they are triggered. Similarly, QUndoGroup provides undo and redo actions
+that always behave like the undo and redo actions of the active stack.
+*/
diff --git a/doc/src/qvarlengtharray.qdoc b/doc/src/qvarlengtharray.qdoc
new file mode 100644
index 0000000000..6513b3e7c4
--- /dev/null
+++ b/doc/src/qvarlengtharray.qdoc
@@ -0,0 +1,274 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class QVarLengthArray
+    \brief The QVarLengthArray class provides a low-level variable-length array.
+
+    \ingroup tools
+    \reentrant
+
+    The C++ language doesn't support variable-length arrays on the stack.
+    For example, the following code won't compile:
+
+    \snippet doc/src/snippets/code/doc_src_qvarlengtharray.qdoc 0
+
+    The alternative is to allocate the array on the heap (with
+    \c{new}):
+
+    \snippet doc/src/snippets/code/doc_src_qvarlengtharray.qdoc 1
+
+    However, if myfunc() is called very frequently from the
+    application's inner loop, heap allocation can be a major source
+    of slowdown.
+
+    QVarLengthArray is an attempt to work around this gap in the C++
+    language. It allocates a certain number of elements on the stack,
+    and if you resize the array to a larger size, it automatically
+    uses the heap instead. Stack allocation has the advantage that
+    it is much faster than heap allocation.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qvarlengtharray.qdoc 2
+
+    In the example above, QVarLengthArray will preallocate 1024
+    elements on the stack and use them unless \c{n + 1} is greater
+    than 1024. If you omit the second template argument,
+    QVarLengthArray's default of 256 is used.
+
+    QVarLengthArray's value type must be an \l{assignable data type}.
+    This covers most data types that are commonly used, but the
+    compiler won't let you, for example, store a QWidget as a value;
+    instead, store a QWidget *.
+
+    QVarLengthArray, like QVector, provides a resizable array data
+    structure. The main differences between the two classes are:
+
+    \list
+    \o QVarLengthArray's API is much more low-level. It provides no
+       iterators and lacks much of QVector's functionality.
+
+    \o QVarLengthArray doesn't initialize the memory if the value is
+       a basic type. (QVector always does.)
+
+    \o QVector uses \l{implicit sharing} as a memory optimization.
+       QVarLengthArray doesn't provide that feature; however, it
+       usually produces slightly better performance due to reduced
+       overhead, especially in tight loops.
+    \endlist
+
+    In summary, QVarLengthArray is a low-level optimization class
+    that only makes sense in very specific cases. It is used a few
+    places inside Qt and was added to Qt's public API for the
+    convenience of advanced users.
+
+    \sa QVector, QList, QLinkedList
+*/
+
+/*! \fn QVarLengthArray::QVarLengthArray(int size)
+
+    Constructs an array with an initial size of \a size elements.
+
+    If the value type is a primitive type (e.g., char, int, float) or
+    a pointer type (e.g., QWidget *), the elements are not
+    initialized. For other types, the elements are initialized with a
+    \l{default-constructed value}.
+*/
+
+/*! \fn QVarLengthArray::~QVarLengthArray()
+
+    Destroys the array.
+*/
+
+/*! \fn int QVarLengthArray::size() const
+
+    Returns the number of elements in the array.
+
+    \sa isEmpty(), resize()
+*/
+
+/*! \fn int QVarLengthArray::count() const
+
+    Same as size().
+
+    \sa isEmpty(), resize()
+*/
+
+/*! \fn bool QVarLengthArray::isEmpty() const
+
+    Returns true if the array has size 0; otherwise returns false.
+
+    \sa size(), resize()
+*/
+
+/*! \fn void QVarLengthArray::clear()
+
+    Removes all the elements from the array.
+
+    Same as resize(0).
+*/
+
+/*! \fn void QVarLengthArray::resize(int size)
+
+    Sets the size of the array to \a size. If \a size is greater than
+    the current size, elements are added to the end. If \a size is
+    less than the current size, elements are removed from the end.
+
+    If the value type is a primitive type (e.g., char, int, float) or
+    a pointer type (e.g., QWidget *), new elements are not
+    initialized. For other types, the elements are initialized with a
+    \l{default-constructed value}.
+
+    \sa size()
+*/
+
+/*! \fn int QVarLengthArray::capacity() const
+
+    Returns the maximum number of elements that can be stored in the
+    array without forcing a reallocation.
+
+    The sole purpose of this function is to provide a means of fine
+    tuning QVarLengthArray's memory usage. In general, you will rarely ever
+    need to call this function. If you want to know how many items are
+    in the array, call size().
+
+    \sa reserve()
+*/
+
+/*! \fn void QVarLengthArray::reserve(int size)
+
+    Attempts to allocate memory for at least \a size elements. If you
+    know in advance how large the array can get, you can call this
+    function and if you call resize() often, you are likely to get
+    better performance. If \a size is an underestimate, the worst
+    that will happen is that the QVarLengthArray will be a bit
+    slower.
+
+    The sole purpose of this function is to provide a means of fine
+    tuning QVarLengthArray's memory usage. In general, you will
+    rarely ever need to call this function. If you want to change the
+    size of the array, call resize().
+
+    \sa capacity()
+*/
+
+/*! \fn T &QVarLengthArray::operator[](int i)
+
+    Returns a reference to the item at index position \a i.
+
+    \a i must be a valid index position in the array (i.e., 0 <= \a i
+    < size()).
+
+    \sa data()
+*/
+
+/*! \fn const T &QVarLengthArray::operator[](int i) const
+
+    \overload
+*/
+
+
+/*!
+    \fn void QVarLengthArray::append(const T &t)
+
+    Appends item \a t to the array, extending the array if necessary.
+
+    \sa removeLast()
+*/
+
+
+/*!
+    \fn inline void QVarLengthArray::removeLast()
+    \since 4.5
+
+    Decreases the size of the array by one.  The allocated size is not changed.
+
+    \sa append()
+*/
+
+/*!
+    \fn void QVarLengthArray::append(const T *buf, int size)
+
+    Appends \a size amount of items referenced by \a buf to this array.
+*/
+
+
+/*! \fn T *QVarLengthArray::data()
+
+    Returns a pointer to the data stored in the array. The pointer can
+    be used to access and modify the items in the array.
+
+    Example:
+    \snippet doc/src/snippets/code/doc_src_qvarlengtharray.qdoc 3
+
+    The pointer remains valid as long as the array isn't reallocated.
+
+    This function is mostly useful to pass an array to a function
+    that accepts a plain C++ array.
+
+    \sa constData(), operator[]()
+*/
+
+/*! \fn const T *QVarLengthArray::data() const
+
+    \overload
+*/
+
+/*! \fn const T *QVarLengthArray::constData() const
+
+    Returns a const pointer to the data stored in the array. The
+    pointer can be used to access the items in the array. The
+    pointer remains valid as long as the array isn't reallocated.
+
+    This function is mostly useful to pass an array to a function
+    that accepts a plain C++ array.
+
+    \sa data(), operator[]()
+*/
+
+/*! \fn QVarLengthArray<T, Prealloc> &QVarLengthArray::operator=(const QVarLengthArray<T, Prealloc> &other)
+    Assigns \a other to this array and returns a reference to this array.
+ */
+
+/*! \fn QVarLengthArray::QVarLengthArray(const QVarLengthArray<T, Prealloc> &other)
+    Constructs a copy of \a other.
+ */
+
diff --git a/doc/src/qwaitcondition.qdoc b/doc/src/qwaitcondition.qdoc
new file mode 100644
index 0000000000..4a64cfe822
--- /dev/null
+++ b/doc/src/qwaitcondition.qdoc
@@ -0,0 +1,188 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class QWaitCondition
+    \brief The QWaitCondition class provides a condition variable for
+    synchronizing threads.
+
+    \threadsafe
+
+    \ingroup thread
+    \ingroup environment
+
+    QWaitCondition allows a thread to tell other threads that some
+    sort of condition has been met. One or many threads can block
+    waiting for a QWaitCondition to set a condition with wakeOne() or
+    wakeAll(). Use wakeOne() to wake one randomly selected condition or
+    wakeAll() to wake them all.
+
+    For example, let's suppose that we have three tasks that should
+    be performed whenever the user presses a key. Each task could be
+    split into a thread, each of which would have a
+    \l{QThread::run()}{run()} body like this:
+
+    \snippet doc/src/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp 0
+
+    Here, the \c keyPressed variable is a global variable of type
+    QWaitCondition.
+
+    A fourth thread would read key presses and wake the other three
+    threads up every time it receives one, like this:
+
+    \snippet doc/src/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp 1
+
+    The order in which the three threads are woken up is undefined.
+    Also, if some of the threads are still in \c do_something() when
+    the key is pressed, they won't be woken up (since they're not
+    waiting on the condition variable) and so the task will not be
+    performed for that key press. This issue can be solved using a
+    counter and a QMutex to guard it. For example, here's the new
+    code for the worker threads:
+
+    \snippet doc/src/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp 2
+
+    Here's the code for the fourth thread:
+
+    \snippet doc/src/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp 3
+
+    The mutex is necessary because the results of two threads
+    attempting to change the value of the same variable
+    simultaneously are unpredictable.
+
+    Wait conditions are a powerful thread synchronization primitive.
+    The \l{threads/waitconditions}{Wait Conditions} example shows how
+    to use QWaitCondition as an alternative to QSemaphore for
+    controlling access to a circular buffer shared by a producer
+    thread and a consumer thread.
+
+    \sa QMutex, QSemaphore, QThread, {Wait Conditions Example}
+*/
+
+/*!
+    \fn QWaitCondition::QWaitCondition()
+
+    Constructs a new wait condition object.
+*/
+
+/*!
+    \fn QWaitCondition::~QWaitCondition()
+
+    Destroys the wait condition object.
+*/
+
+/*!
+    \fn void QWaitCondition::wakeOne()
+
+    Wakes one thread waiting on the wait condition. The thread that
+    is woken up depends on the operating system's scheduling
+    policies, and cannot be controlled or predicted.
+
+    If you want to wake up a specific thread, the solution is
+    typically to use different wait conditions and have different
+    threads wait on different conditions.
+
+    \sa wakeAll()
+*/
+
+/*!
+    \fn void QWaitCondition::wakeAll()
+
+    Wakes all threads waiting on the wait condition. The order in
+    which the threads are woken up depends on the operating system's
+    scheduling policies and cannot be controlled or predicted.
+
+    \sa wakeOne()
+*/
+
+/*!
+    \fn bool QWaitCondition::wait(QMutex *mutex, unsigned long time)
+
+    Releases the locked \a mutex and waits on the wait condition.  The
+    \a mutex must be initially locked by the calling thread. If \a
+    mutex is not in a locked state, this function returns
+    immediately. If \a mutex is a recursive mutex, this function
+    returns immediately. The \a mutex will be unlocked, and the
+    calling thread will block until either of these conditions is met:
+
+    \list
+    \o Another thread signals it using wakeOne() or wakeAll(). This
+       function will return true in this case.
+    \o \a time milliseconds has elapsed. If \a time is \c ULONG_MAX
+       (the default), then the wait will never timeout (the event
+       must be signalled). This function will return false if the
+       wait timed out.
+    \endlist
+
+    The mutex will be returned to the same locked state. This
+    function is provided to allow the atomic transition from the
+    locked state to the wait state.
+
+    \sa wakeOne(), wakeAll()
+*/
+
+/*!
+    \fn bool QWaitCondition::wait(QReadWriteLock *readWriteLock, unsigned long time)
+    \since 4.4
+
+    Releases the locked \a readWriteLock and waits on the wait
+    condition.  The \a readWriteLock must be initially locked by the
+    calling thread. If \a readWriteLock is not in a locked state, this
+    function returns immediately. The \a readWriteLock must not be
+    locked recursively, otherwise this function will not release the
+    lock properly. The \a readWriteLock will be unlocked, and the
+    calling thread will block until either of these conditions is met:
+
+    \list
+    \o Another thread signals it using wakeOne() or wakeAll(). This
+       function will return true in this case.
+    \o \a time milliseconds has elapsed. If \a time is \c ULONG_MAX
+       (the default), then the wait will never timeout (the event
+       must be signalled). This function will return false if the
+       wait timed out.
+    \endlist
+
+    The \a readWriteLock will be returned to the same locked
+    state. This function is provided to allow the atomic transition
+    from the locked state to the wait state.
+
+    \sa wakeOne(), wakeAll()
+*/
diff --git a/doc/src/rcc.qdoc b/doc/src/rcc.qdoc
new file mode 100644
index 0000000000..d67a3bf7dd
--- /dev/null
+++ b/doc/src/rcc.qdoc
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page rcc.html
+    \title Resource Compiler (rcc)
+    \ingroup buildsystem
+    \ingroup qttools
+    \keyword rcc
+
+    The \c rcc tool is used to embed resources into a Qt application during
+    the build process. It works by generating a C++ source file containing
+    data specified in a Qt resource (.qrc) file.
+
+    Usage:
+    \snippet doc/src/snippets/code/doc_src_rcc.qdoc 0
+
+    RCC accepts the following command line options:
+
+    \table
+    \header \o Option         \o Argument \o Description
+
+    \row    \o \c{-o}         \o          \o Writes output to file rather than
+                                             stdout.
+
+    \row    \o \c{-name}      \o \c name  \o Creates an external initialization
+                                             function with name.
+
+    \row    \o \c{-threshold} \o \c level \o Specifies a threshold (in bytes)
+                                             to use when compressing files. If
+                                             the file is smaller than the
+                                             threshold, it will not be
+                                             compressed, independent of what
+                                             the compression level is.
+                                             
+    \row    \o \c{-compress}  \o \c level \o Compresses input files with the
+                                             given level. Level is an integer
+                                             from 1 to 9 - 1 being the fastest,
+                                             producing the least compression;
+                                             9 being the slowest, producing
+                                             the most compression.
+
+    \row    \o \c{-root}      \o \c path  \o Prefixes the resource access path
+                                             with root path.
+
+    \row    \o \c{-no-compress} \o        \o Disables all compression.
+
+    \row    \o \c{-binary}    \o          \o Outputs a binary file for use as
+                                             a dynamic resource.
+
+    \row    \o \c{-version}   \o          \o Displays version information.
+
+    \row    \o \c{-help}      \o          \o Displays usage information.
+    \endtable
+
+    See also \l{The Qt Resource System} for more information about embedding
+    resources in Qt applications.
+*/
diff --git a/doc/src/resources.qdoc b/doc/src/resources.qdoc
new file mode 100644
index 0000000000..7997b9f928
--- /dev/null
+++ b/doc/src/resources.qdoc
@@ -0,0 +1,192 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page resources.html
+    \title The Qt Resource System
+    \ingroup buildsystem
+
+    \keyword resource system
+
+    The Qt resource system is a platform-independent mechanism for
+    storing binary files in the application's executable. This is
+    useful if your application always needs a certain set of files
+    (icons, translation files, etc.) and you don't want to run the
+    risk of losing the files.
+
+    The resource system is based on tight cooperation between \l qmake,
+    \l rcc (Qt's resource compiler), and QFile. It obsoletes Qt 3's
+    \c qembed tool and the
+    \l{http://doc.trolltech.com/qq/qq05-iconography.html#imagestorage}{image
+    collection} mechanism.
+
+    \section1 Resource Collection Files (\c{.qrc})
+
+    The resources associated with an application are specified in a
+    \c .qrc file, an XML-based file format that lists files on the
+    disk and optionally assigns them a resource name that the
+    application must use to access the resource.
+
+    Here's an example \c .qrc file:
+
+    \quotefile mainwindows/application/application.qrc
+
+    The resource files listed in the \c .qrc file are files that are
+    part of the application's source tree. The specified paths are
+    relative to the directory containing the \c .qrc file. Note that
+    the listed resource files must be located in the same directory as
+    the \c .qrc file, or one of its subdirectories.
+
+    Resource data can either be compiled into the binary and thus accessed
+    immediately in application code, or a binary resource can be created
+    and at a later point in application code registered with the resource
+    system.
+
+    By default, resources are accessible in the application under the
+    same name as they have in the source tree, with a \c :/ prefix.
+    For example, the path \c :/images/cut.png would give access to the
+    \c cut.png file, whose location in the application's source tree
+    is \c images/cut.png. This can be changed using the \c file tag's
+    \c alias attribute:
+
+    \snippet doc/src/snippets/code/doc_src_resources.qdoc 0
+
+    The file is then accessible as \c :/cut-img.png from the
+    application. It is also possible to specify a path prefix for all
+    files in the \c .qrc file using the \c qresource tag's \c prefix
+    attribute:
+
+    \snippet doc/src/snippets/code/doc_src_resources.qdoc 1
+
+    In this case, the file is accessible as \c
+    :/myresources/cut-img.png.
+
+    Some resources, such as translation files and icons, many need to
+    change based on the user's locale. This is done by adding a \c lang
+    attribute to the \c qresource tag, specifying a suitable locale
+    string. For example:
+
+    \snippet doc/src/snippets/code/doc_src_resources.qdoc 2
+
+    If the user's locale is French (i.e., QLocale::system().name() returns
+    "fr_FR"), \c :/cut.jpg becomes a reference to the \c cut_fr.jpg
+    image. For other locales, \c cut.jpg is used.
+
+    See the QLocale documentation for a description of the format to use
+    for locale strings.
+
+
+    \section2 External Binary Resources
+
+    For an external binary resource to be created you must create the resource
+    data (commonly given the \c .rcc extension) by passing the -binary switch to
+    \l rcc. Once the binary resource is created you can register the resource
+    with the QResource API.
+
+    For example, a set of resource data specified in a \c .qrc file can be
+    compiled in the following way:
+
+    \snippet doc/src/snippets/code/doc_src_resources.qdoc 3
+
+    In the application, this resource would be registered with code like this:
+
+    \snippet doc/src/snippets/code/doc_src_resources.qdoc 4
+
+    \section2 Compiled-In Resources
+
+    For a resource to be compiled into the binary the \c .qrc file must be
+    mentioned in the application's \c .pro file so that \c qmake knows
+    about it. For example:
+
+    \snippet examples/mainwindows/application/application.pro 0
+
+    \c qmake will produce make rules to generate a file called \c
+    qrc_application.cpp that is linked into the application. This
+    file contains all the data for the images and other resources as
+    static C++ arrays of compressed binary data. The \c
+    qrc_application.cpp file is automatically regenerated whenever
+    the \c .qrc file changes or one of the files that it refers to
+    changes. If you don't use \c .pro files, you can either invoke
+    \c rcc manually or add build rules to your build system.
+
+    \image resources.png Building resources into an application
+
+    Currently, Qt always stores the data directly in the executable,
+    even on Windows and Mac OS X, where the operating system provides
+    native support for resources. This might change in a future Qt
+    release.
+
+    \section1 Using Resources in the Application
+
+    In the application, resource paths can be used in most places
+    instead of ordinary file system paths. In particular, you can
+    pass a resource path instead of a file name to the QIcon, QImage,
+    or QPixmap constructor:
+
+    \snippet examples/mainwindows/application/mainwindow.cpp 21
+
+    See the \l{mainwindows/application}{Application} example for an
+    actual application that uses Qt's resource system to store its
+    icons.
+
+    In memory, resources are represented by a tree of resource
+    objects. The tree is automatically built at startup and used by
+    QFile for resolving paths to resources. You can use a QDir initialized
+    with ":/" to navigate through the resource tree from the root.
+
+    Qt's resources support the concept of a search path list. If you then
+    refer to a resource with \c : instead of \c :/ as the prefix, the
+    resource will be looked up using the search path list. The search
+    path list is empty at startup; call QDir::addResourceSearchPath() to
+    add paths to it.
+
+    If you have resources in a static library, you might need to
+    force initialization of your resources by calling \l
+    Q_INIT_RESOURCE() with the base name of the \c .qrc file. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_resources.qdoc 5
+
+    Similarly, if you must unload a set of resources explicitly
+    (because a plugin is being unloaded or the resources are not valid
+    any longer), you can force removal of your resources by calling
+    Q_CLEANUP_RESOURCE() with the same base name as above.
+*/
diff --git a/doc/src/richtext.qdoc b/doc/src/richtext.qdoc
new file mode 100644
index 0000000000..fbd8adbeb5
--- /dev/null
+++ b/doc/src/richtext.qdoc
@@ -0,0 +1,1073 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\page richtext.html
+\nextpage Rich Text Document Structure
+
+\title Rich Text Processing
+\ingroup architecture
+\ingroup text-processing
+\brief An overview of Qt's rich text processing, editing and display features.
+
+The Scribe framework provides a set of classes for reading and manipulating
+structured rich text documents. Unlike previous rich text support in Qt, the
+new classes are centered around the QTextDocument class rather than raw
+textual information. This enables the developer to create and modify
+structured rich text documents without having to prepare content in an
+intermediate markup format.
+
+The information within a document can be accessed via two complementary
+interfaces: A cursor-based interface is used for editing, and a read-only
+hierarchical interface provides a high level overview of the document
+structure. The main advantage of the cursor-based interface is that the
+text can be edited using operations that mimic a user's interaction with
+an editor, without losing the underlying structure of the document. The
+read-only hierarchical interface is most useful when performing operations
+such as searching and document export.
+
+This document is divided up into chapters for convenient reference:
+
+\list
+\i \l{Rich Text Document Structure} outlines
+   the different kinds of elements in a QTextDocument, and describes how
+   they are arranged in a document structure.
+\i \l{The QTextCursor Interface} explains how rich
+   text documents can be edited using the cursor-based interface.
+\i \l{Common Rich Text Editing Tasks} examines some
+   common tasks that involve reading or manipulating rich text documents.
+\i \l{Advanced Rich Text Processing} examines advanced rich text editing tasks.
+\i \l{Supported HTML Subset} lists the HTML tags supported by QTextDocument.
+\endlist
+
+See also the list of \l{Text Processing Classes}.
+
+*/
+
+/*!
+\page richtext-structure.html
+\contentspage richtext.html Contents
+\previouspage Rich Text Processing
+\nextpage The QTextCursor Interface
+
+\title Rich Text Document Structure
+
+\tableofcontents
+
+The structured representation of a text document presents its contents as
+a hierarchy of text blocks, frames, tables, and other objects. These provide
+a logical structure to the document and describe how their contents will be
+displayed. Generally, frames and tables are used to group other
+structures while text blocks contain the actual textual information.
+
+New elements are created and inserted into the document programmatically
+\l{richtext-cursor.html}{with a QTextCursor} or by using an editor
+widget, such as QTextEdit. Elements can be given a particular format when
+they are created; otherwise they take the cursor's current format for the
+element.
+
+\table
+\row
+\i \inlineimage richtext-document.png
+\i \bold{Basic structure}
+
+The "top level" of a document might be populated in the way shown.
+Each document always contains a root frame, and this always contains
+at least one text block.
+
+For documents with some textual content, the root
+frame usually contains a sequence of blocks and other elements.
+
+Sequences of frames and tables are always separated by text blocks in a
+document, even if the text blocks contain no information. This ensures that
+new elements can always be inserted between existing structures.
+\endtable
+
+In this chapter, we look at each of the structural elements
+used in a rich text document, outline their features and uses, and show
+how to examine their contents. Document editing is described in
+\l{richtext-cursor.html}{The QTextCursor Interface}.
+
+\section1 Rich Text Documents
+
+QTextDocument objects contain all the information required to construct
+rich text documents for use with a QTextEdit widget or in a custom editor.
+Although QTextEdit makes it easy to display and edit rich text, documents
+can also be used independently of any editor widget, for example:
+
+\snippet doc/src/snippets/code/doc_src_richtext.qdoc 0
+
+Alternatively, they can be extracted from an existing editor:
+
+\snippet doc/src/snippets/code/doc_src_richtext.qdoc 1
+
+This flexibility enables applications to handle multiple rich text
+documents without the overhead of multiple editor widgets, or requiring
+documents to be stored in some intermediate format.
+
+An empty document contains a root frame which itself contains a single
+empty text block. The \l{richtext-cursor.html}{text cursor interface}
+automatically inserts new document elements into the root frame, and
+ensures that it is padded with empty blocks where necessary.
+
+We obtain the root frame in the following manner:
+
+\snippet doc/src/snippets/textdocument-frames/xmlwriter.h 0
+\snippet doc/src/snippets/textdocument-frames/xmlwriter.cpp 0
+
+When navigating the document structure, it is useful to begin at the
+root frame because it provides access to the entire document structure.
+
+\section1 Document Elements
+
+Rich text documents usually consist of common elements such as paragraphs,
+frames, tables, and lists. These are represented in a QTextDocument
+by the QTextBlock, QTextFrame, QTextTable, and QTextList classes.
+Unlike the other elements in a document, images are represented by
+specially formatted text fragments. This enables them to be placed
+formatted inline with the surrounding text.
+
+The basic structural building blocks in documents are QTextBlock and
+QTextFrame. Blocks themselves contain fragments of rich text
+(QTextFragment), but these do not directly influence the high level
+structure of a document.
+
+Elements which can group together other document elements are typically
+subclasses of QTextObject, and fall into two categories: Elements that
+group together text blocks are subclasses of QTextBlockGroup, and those
+that group together frames and other elements are subclasses of QTextFrame.
+
+\section2 Text Blocks
+
+Text blocks are provided by the QTextBlock class.
+
+Text blocks group together fragments of text with different character formats,
+and are used to represent paragraphs in the document. Each block
+typically contains a number of text fragments with different styles.
+Fragments are created when text is inserted into the document, and more
+of them are added when the document is edited. The document splits, merges,
+and removes fragments to efficiently represent the different styles
+of text in the block.
+
+The fragments within a given block can be examined by using a
+QTextBlock::iterator to traverse the block's internal structure:
+
+\snippet doc/src/snippets/textblock-fragments/xmlwriter.cpp 3
+\snippet doc/src/snippets/textblock-fragments/xmlwriter.cpp 5
+\snippet doc/src/snippets/textblock-fragments/xmlwriter.cpp 6
+
+Blocks are also used to represent list items. As a result, blocks can
+define their own character formats which contain information about
+block-level decoration, such as the type of bullet points used for
+list items. The formatting for the block itself is described by the
+QTextBlockFormat class, and describes properties such as text alignment,
+indentation, and background color.
+
+Although a given document may contain complex structures, once we have a
+reference to a valid block in the document, we can navigate between each
+of the text blocks in the order in which they were written:
+
+\snippet doc/src/snippets/textblock-fragments/xmlwriter.cpp 0
+\snippet doc/src/snippets/textblock-fragments/xmlwriter.cpp 1
+\snippet doc/src/snippets/textblock-fragments/xmlwriter.cpp 2
+
+This method is useful for when you want to extract just the rich text from a
+document because it ignores frames, tables, and other types of structure.
+
+QTextBlock provides comparison operators that make it easier to manipulate
+blocks: \l{QTextBlock::operator==()}{operator==()} and
+\l{QTextBlock::operator!=()}{operator!=()} are used to test whether two
+blocks are the same, and \l{QTextBlock::operator<()}{operator<()} is used
+to determine which one occurs first in a document.
+
+\section2 Frames
+
+Frames are provided by the QTextFrame class.
+
+Text frames group together blocks of text and child frames, creating
+document structures that are larger than paragraphs. The format of a frame
+specifies how it is rendered and positioned on the page. Frames are
+either inserted into the text flow, or they float on the left or right
+hand side of the page.
+Each document contains a root frame that contains all the other document
+elements. As a result, all frames except the root frame have a parent
+frame.
+
+Since text blocks are used to separate other document elements, each
+frame will always contain at least one text block, and zero or more
+child frames. We can inspect the contents of a frame by using a
+QTextFrame::iterator to traverse the frame's child elements:
+
+\snippet doc/src/snippets/textdocument-frames/xmlwriter.cpp 1
+\snippet doc/src/snippets/textdocument-frames/xmlwriter.cpp 2
+
+Note that the iterator selects both frames and blocks, so it is necessary
+to check which it is referring to. This allows us to navigate the document
+structure on a frame-by-frame basis yet still access text blocks if
+required. Both the QTextBlock::iterator and QTextFrame::iterator classes
+can be used in complementary ways to extract the required structure from
+a document.
+
+\section2 Tables
+
+Tables are provided by the QTextTable class.
+
+Tables are collections of cells that are arranged in rows and columns.
+Each table cell is a document element with its own character format, but it
+can also contain other elements, such as frames and text blocks. Table cells
+are automatically created when the table is constructed, or when extra rows
+or columns are added. They can also be moved between tables.
+
+QTextTable is a subclass of QTextFrame, so tables are treated like frames
+in the document structure. For each frame that we encounter in the
+document, we can test whether it represents a table, and deal with it in a
+different way:
+
+\snippet doc/src/snippets/textdocument-tables/xmlwriter.cpp 0
+\snippet doc/src/snippets/textdocument-tables/xmlwriter.cpp 1
+
+The cells within an existing table can be examined by iterating through
+the rows and columns.
+
+\snippet doc/src/snippets/textdocument-tables/mainwindow.cpp 9
+\snippet doc/src/snippets/textdocument-tables/mainwindow.cpp 10
+\snippet doc/src/snippets/textdocument-tables/mainwindow.cpp 11
+\snippet doc/src/snippets/textdocument-tables/mainwindow.cpp 12
+
+
+\section2 Lists
+
+Lists are provided by the QTextList class.
+
+Lists are sequences of text blocks that are formatted in the usual way, but
+which also provide the standard list decorations such as bullet points and
+enumerated items. Lists can be nested, and will be indented if the list's
+format specifies a non-zero indentation.
+
+We can refer to each list item by its index in the list:
+
+\snippet doc/src/snippets/textdocument-listitems/mainwindow.cpp 0
+\snippet doc/src/snippets/textdocument-listitems/mainwindow.cpp 1
+\snippet doc/src/snippets/textdocument-listitems/mainwindow.cpp 2
+
+Since QTextList is a subclass of QTextBlockGroup, it does not group the
+list items as child elements, but instead provides various functions for
+managing them. This means that any text block we find when traversing a
+document may actually be a list item. We can ensure that list items are
+correctly identified by using the following code:
+
+\snippet doc/src/snippets/textdocument-listitems/mainwindow.cpp 3
+\snippet doc/src/snippets/textdocument-listitems/mainwindow.cpp 4
+\snippet doc/src/snippets/textdocument-listitems/mainwindow.cpp 5
+\snippet doc/src/snippets/textdocument-listitems/mainwindow.cpp 6
+\snippet doc/src/snippets/textdocument-listitems/mainwindow.cpp 7
+
+
+\section2 Images
+
+Images in QTextDocument are represented by text fragments that reference
+external images via the resource mechanism. Images are created using the
+cursor interface, and can be modified later by changing the character
+format of the image's text fragment:
+
+\snippet doc/src/snippets/textdocument-imageformat/main.cpp 0
+\snippet doc/src/snippets/textdocument-imageformat/main.cpp 1
+\snippet doc/src/snippets/textdocument-imageformat/main.cpp 2
+
+The fragment that represents the image can be found by iterating over
+the fragments in the text block that contains the image.
+*/
+
+/*!
+\page richtext-cursor.html
+\contentspage richtext.html Contents
+\previouspage Rich Text Document Structure
+\nextpage Common Rich Text Editing Tasks
+
+\title The QTextCursor Interface
+
+\tableofcontents
+
+The QTextCursor interface allows documents and their structure to be
+edited in a way that should be familiar to most users of text editors and
+document editing software. Rich text documents can have multiple cursors
+associated with them, and each of these contains information about their
+position in the document and any selections that they may hold. This
+cursor-based paradigm makes common operations, such as cutting and pasting
+text, simple to implement programmatically, yet it also allows more complex
+editing operations to be performed on the document.
+
+This chapter describes most of the common editing operations that you
+will need to perform using a cursor, from basic insertion of text and
+document elements to more complex manipulation of document structures.
+
+\section1 Cursor-Based Editing
+
+At the simplest level, text documents are made up of a string of characters,
+marked up in some way to represent the block structure of the text within the
+document. QTextCursor provides a cursor-based interface that allows the
+contents of a QTextDocument to be manipulated at the character level. Since
+the elements (blocks, frames, tables, etc.) are also encoded in the character
+stream, the document structure can itself be changed by the cursor.
+
+The cursor keeps track of its location within its parent document, and can
+report information about the surrounding structure, such as the enclosing
+text block, frame, table, or list. The formats of the enclosing structures
+can also be directly obtained through the cursor.
+
+\section2 Using a Cursor
+
+The main use of a cursor is to insert or modify text within a block.
+We can use a text editor's cursor to do this:
+
+\snippet doc/src/snippets/textblock-formats/main.cpp 0
+
+Alternatively, we can obtain a cursor directly from a document:
+
+\snippet doc/src/snippets/textdocument-images/main.cpp 0
+
+The cursor is positioned at the start of the document so that we can write
+into the first (empty) block in the document.
+
+\section2 Grouping Cursor Operations
+
+A series of editing operations can be packaged together so that they can
+be replayed, or undone together in a single action. This is achieved by
+using the \c beginEditBlock() and \c endEditBlock() functions in the
+following way, as in the following example where we select the word that
+contains the cursor:
+
+\snippet doc/src/snippets/textdocument-selections/mainwindow.cpp 0
+
+If editing operations are not grouped, the document automatically records
+the individual operations so that they can be undone later. Grouping
+operations into larger packages can make editing more efficient both for
+the user and for the application, but care has to be taken not to group too
+many operations together as the user may want find-grained control over the
+undo process.
+
+\section2 Multiple Cursors
+
+Multiple cursors can be used to simultaneously edit the same document,
+although only one will be visible to the user in a QTextEdit widget.
+The QTextDocument ensures that each cursor writes text correctly and
+does not interfere with any of the others.
+
+\omit
+\snippet doc/src/snippets/textdocument-cursors/main.cpp 0
+\snippet doc/src/snippets/textdocument-cursors/main.cpp 1
+\endomit
+
+\section1 Inserting Document Elements
+
+QTextCursor provides several functions that can be used to change the
+structure of a rich text document. Generally, these functions allow
+document elements to be created with relevant formatting information,
+and they are inserted into the document at the cursor's position.
+
+The first group of functions insert block-level elements, and update the
+cursor position, but they do not return the element that was inserted:
+
+\list
+\i \l{QTextCursor::insertBlock()}{insertBlock()} inserts a new text block
+   (paragraph) into a document at the cursor's position, and moves the
+   cursor to the start of the new block.
+\i \l{QTextCursor::insertFragment()}{insertFragment()} inserts an existing
+   text fragment into a document at the cursor's position.
+\i \l{QTextCursor::insertImage()}{insertImage()} inserts an image into a
+   document at the cursor's position.
+\i \l{QTextCursor::insertText()}{insertText()} inserts text into the
+   document at the cursor's position.
+\endlist
+
+You can examine the contents of the element that was inserted through the
+cursor interface.
+
+The second group of functions insert elements that provide structure to
+the document, and return the structure that was inserted:
+
+\list
+\i \l{QTextCursor::insertFrame()}{insertFrame()} inserts a frame into the
+   document \e after the cursor's current block, and moves the cursor to
+   the start of the empty block in the new frame.
+\i \l{QTextCursor::insertList()}{insertList()} inserts a list into the
+   document at the cursor's position, and moves the cursor to the start
+   of the first item in the list.
+\i \l{QTextCursor::insertTable()}{insertTable()} inserts a table into
+   the document \e after the cursor's current block, and moves the cursor
+   to the start of the block following the table.
+\endlist
+
+These elements either contain or group together other elements in the
+document.
+
+\section2 Text and Text Fragments
+
+Text can be inserted into the current block in the current character
+format, or in a custom format that is specified with the text:
+
+\snippet doc/src/snippets/textdocument-charformats/main.cpp 0
+
+Once the character format has been used with a cursor, that format becomes
+the default format for any text inserted with that cursor until another
+character format is specified.
+
+If a cursor is used to insert text without specifying a character format,
+the text will be given the character format used at that position in the
+document.
+
+\section2 Blocks
+
+Text blocks are inserted into the document with the
+\l{QTextCursor::insertBlock()}{insertBlock()} function.
+
+\snippet doc/src/snippets/textblock-formats/main.cpp 1
+
+The cursor is positioned at the start of the new block.
+
+\section2 Frames
+
+Frames are inserted into a document using the cursor, and will be placed
+within the cursor's current frame \e after the current block.
+The following code shows how a frame can be inserted between two text
+blocks in a document's root frame. We begin by finding the cursor's
+current frame:
+
+\snippet doc/src/snippets/textdocument-frames/mainwindow.cpp 0
+
+We insert some text in this frame then set up a frame format for the
+child frame:
+
+\snippet doc/src/snippets/textdocument-frames/mainwindow.cpp 1
+
+The frame format will give the frame an external margin of 32 pixels,
+internal padding of 8 pixels, and a border that is 4 pixels wide.
+See the QTextFrameFormat documentation for more information about
+frame formats.
+
+The frame is inserted into the document after the preceding text:
+
+\snippet doc/src/snippets/textdocument-frames/mainwindow.cpp 2
+
+We add some text to the document immediately after we insert the frame.
+Since the text cursor is positioned \e{inside the frame} when it is inserted
+into the document, this text will also be inserted inside the frame.
+
+Finally, we position the cursor outside the frame by taking the last
+available cursor position inside the frame we recorded earlier:
+
+\snippet doc/src/snippets/textdocument-frames/mainwindow.cpp 3
+
+The text that we add last is inserted after the child frame in the
+document. Since each frame is padded with text blocks, this ensures that
+more elements can always be inserted with a cursor.
+
+\section2 Tables
+
+Tables are inserted into the document using the cursor, and will be
+placed within the cursor's current frame \e after the current block:
+
+\snippet doc/src/snippets/textdocument-tables/mainwindow.cpp 0
+\snippet doc/src/snippets/textdocument-tables/mainwindow.cpp 3
+
+Tables can be created with a specific format that defines the overall
+properties of the table, such as its alignment, background color, and
+the cell spacing used. It can also determine the constraints on each
+column, allowing each of them to have a fixed width, or resize according
+to the available space.
+
+\snippet doc/src/snippets/textdocument-tables/mainwindow.cpp 2
+
+The columns in the table created above will each take up a certain
+percentage of the available width. Note that the table format is
+optional; if you insert a table without a format, some sensible
+default values will be used for the table's properties.
+
+Since cells can contain other document elements, they too can be
+formatted and styled as necessary.
+
+Text can be added to the table by navigating to each cell with the cursor
+and inserting text.
+
+\snippet doc/src/snippets/textdocument-tables/mainwindow.cpp 4
+
+We can create a simple timetable by following this approach:
+
+\snippet doc/src/snippets/textdocument-tables/mainwindow.cpp 5
+\snippet doc/src/snippets/textdocument-tables/mainwindow.cpp 6
+\snippet doc/src/snippets/textdocument-tables/mainwindow.cpp 7
+\snippet doc/src/snippets/textdocument-tables/mainwindow.cpp 8
+
+\section2 Lists
+
+Lists of block elements can be automatically created and inserted into the
+document at the current cursor position. Each list that is created in this
+way requires a list format to be specified:
+
+\snippet doc/src/snippets/textdocument-lists/mainwindow.cpp 0
+
+The above code first checks whether the cursor is within an existing list
+and, if so, gives the list format for the new list a suitable level of
+indentation. This allows nested lists to be created with increasing
+levels of indentation. A more sophisticated implementation would also use
+different kinds of symbol for the bullet points in each level of the list.
+
+\section2 Images
+
+Inline images are added to documents through the cursor in the usual manner.
+Unlike many other elements, all of the image properties are specified by the
+image's format. This means that a QTextImageFormat object has to be
+created before an image can be inserted:
+
+\snippet doc/src/snippets/textdocument-images/main.cpp 1
+
+The image name refers to an entry in the application's resource file.
+The method used to derive this name is described in
+\l{resources.html}{The Qt Resource System}.
+
+*/
+
+/*!
+\page richtext-common-tasks.html
+\contentspage richtext.html Contents
+\previouspage The QTextCursor Interface
+\nextpage Advanced Rich Text Processing
+
+\title Common Rich Text Editing Tasks
+
+\tableofcontents
+
+There are a number of tasks that are often performed by developers
+when editing and processing text documents using Qt. These include the use
+of display widgets such as QTextBrowser and QTextEdit, creation of
+documents with QTextDocument, editing using a QTextCursor, and
+exporting the document structure.
+This document outlines some of the more common ways of using the rich
+text classes to perform these tasks, showing convenient patterns that can
+be reused in your own applications.
+
+\section1 Using QTextEdit
+
+A text editor widget can be constructed and used to display HTML in the
+following way:
+
+\snippet doc/src/snippets/code/doc_src_richtext.qdoc 2
+
+By default, the text editor contains a document with a root frame, inside
+which is an empty text block. This document can be obtained so that it can
+be modified directly by the application:
+
+\snippet doc/src/snippets/code/doc_src_richtext.qdoc 3
+
+The text editor's cursor may also be used to edit a document:
+
+\snippet doc/src/snippets/code/doc_src_richtext.qdoc 4
+
+Although a document can be edited using many cursors at once, a QTextEdit
+only displays a single cursor at a time. Therefore, if we want to update the
+editor to display a particular cursor or its selection, we need to set the
+editor's cursor after we have modified the document:
+
+\snippet doc/src/snippets/code/doc_src_richtext.qdoc 5
+
+\section1 Selecting Text
+
+Text is selected by moving the cursor using operations that are similar to
+those performed by a user in a text editor. To select text between two
+points in the document, we need to position the cursor at the first point
+then move it using a special mode (\l{QTextCursor::MoveMode}) with a
+move operation (\l{QTextCursor::MoveOperation}).
+When we select the text, we leave the selection anchor at the old cursor
+position just as the user might do by holding down the Shift key when
+selecting text:
+
+\snippet doc/src/snippets/textdocument-selections/mainwindow.cpp 1
+
+In the above code, a whole word is selected using this method. QTextCursor
+provides a number of common move operations for selecting individual
+characters, words, lines, and whole blocks.
+
+\section1 Finding Text
+
+QTextDocument provides a cursor-based interface for searching, making
+it easy to find and modify text in the style of a text editor. The following
+code finds all the instances of a particular word in a document, and changes
+the color of each:
+
+\snippet doc/src/snippets/textdocument-find/main.cpp 0
+\snippet doc/src/snippets/textdocument-find/main.cpp 1
+
+Note that the cursor does not have to be moved after each search and replace
+operation; it is always positioned at the end of the word that was just
+replaced.
+
+\section1 Printing Documents
+
+QTextEdit is designed for the display of large rich text documents that are
+read on screen, rendering them in the same way as a web browser. As a result,
+it does not automatically break the contents of the document into page-sized
+pieces that are suitable for printing.
+
+QTextDocument provides a \l{QTextDocument::print()}{print()} function to
+allow documents to be printed using the QPrinter class. The following code
+shows how to prepare a document in a QTextEdit for printing with a QPrinter:
+
+\snippet doc/src/snippets/textdocument-printing/mainwindow.cpp 0
+
+The document is obtained from the text editor, and a QPrinter is constructed
+then configured using a QPrintDialog. If the user accepts the printer's
+configuration then the document is formatted and printed using the
+\l{QTextDocument::print()}{print()} function.
+
+*/
+
+/*!
+\page richtext-advanced-processing.html
+\contentspage richtext.html Contents
+\previouspage Common Rich Text Editing Tasks
+\nextpage Supported HTML Subset
+
+\title Advanced Rich Text Processing
+
+\section1 Handling Large Files
+
+Qt does not limit the size of files that are used for text
+processing.  In most cases, this will not present a problem. For
+especially large files, however, you might experience that your
+application will become unresponsive or that you will run out of
+memory. The size of the files you can load depends on your
+hardware and on Qt's and your own application's implementation.
+
+If you are faced with this problem, we recommend that you address the
+following issues:
+
+\list
+    \o You should consider breaking up large paragraphs into smaller 
+       ones as Qt handles small paragraphs better. You could also 
+       insert line breaks at regular intervals, which will look the
+       same as one large paragraph in a QTextEdit.
+    \o You can reduce the amount of blocks in a QTextDocument with 
+       \l{QTextDocument::}{maximumBlockCount()}. The document is only
+       as large as the number of blocks as far as QTextEdit is concerned.
+    \o When adding text to a text edit, it is an advantage to add it 
+       in an edit block (see example below). The result is that the
+       text edit does not need to build the entire document structure at once.
+\endlist
+
+We give an example of the latter technique from the list. We assume that
+the text edit is visible.
+
+\snippet doc/src/snippets/code/doc_src_richtext.qdoc 6
+
+\omit
+Ideas for other sections:
+
+ * Hiding QTextBlock elements.
+ * Changing the word wrapping mode in QTextEdit. Custom word wrapping?
+\endomit
+*/
+
+/*!
+    \page richtext-html-subset.html
+    \title Supported HTML Subset
+    \brief Describes the support for HTML markup in text widgets.
+
+    \contentspage richtext.html Contents
+    \previouspage Common Rich Text Editing Tasks
+
+    Qt's text widgets are able to display rich text, specified using a subset of \l{HTML 4}
+    markup. Widgets that use QTextDocument, such as QLabel, QTextEdit, QTreeWidgetItem and
+    the other item widgets, are able to display rich text specified in this way.
+
+    \tableofcontents
+
+    \section1 Using HTML Markup in Text Widgets
+
+    Widgets automatically detect HTML markup and display rich text accordingly. For example,
+    setting a label's \l{QLabel::}{text} property with the string \c{"<b>Hello</b> <i>Qt!</i>"}
+    will result in the label displaying text like this: \bold{Hello} \e{Qt!}
+
+    When HTML markup is used for text, Qt follows the rules defined by the \l{HTML 4}
+    specification. This includes default properties for text layout, such as the
+    direction of the text flow (left-to-right) which can be changed by applying the
+    \l{#Block Attributes}{\c dir} attribute to blocks of text.
+
+    \section1 Supported Tags
+
+    The following table lists the HTML tags supported by Qt's
+    \l{Rich Text Processing}{rich text} engine:
+
+    \table
+    \header \o Tag
+            \o Description
+            \o Comment
+    \row    \o \c a
+            \o Anchor or link
+            \o Supports the \c href and \c name attributes.
+    \row    \o \c address
+            \o Address
+            \o
+    \row    \o \c b
+            \o Bold
+            \o
+    \row    \o \c big
+            \o Larger font
+            \o
+    \row    \o \c blockquote
+            \o Indented paragraph
+            \o
+    \row    \o \c body
+            \o Document body
+            \o Supports the \c bgcolor attribute, which
+               can be a Qt \l{QColor::setNamedColor()}{color name}
+               or a \c #RRGGBB color specification.
+    \row    \o \c br
+            \o Line break
+            \o
+    \row    \o \c center
+            \o Centered paragraph
+            \o
+    \row    \o \c cite
+            \o Inline citation
+            \o Same as \c i.
+    \row    \o \c code
+            \o Code
+            \o Same as \c tt.
+    \row    \o \c dd
+            \o Definition data
+            \o
+    \row    \o \c dfn
+            \o Definition
+            \o Same as \c i.
+    \row    \o \c div
+            \o Document division
+            \o Supports the standard \l{block attributes}.
+    \row    \o \c dl
+            \o Definition list
+            \o Supports the standard \l{block attributes}.
+    \row    \o \c dt
+            \o Definition term
+            \o Supports the standard \l{block attributes}.
+    \row    \o \c em
+            \o Emphasized
+            \o Same as \c i.
+    \row    \o \c font
+            \o Font size, family, and/or color
+            \o Supports the following attributes:
+               \c size, \c face, and \c color (Qt
+               \l{QColor::setNamedColor()}{color names} or
+               \c #RRGGBB).
+    \row    \o \c h1
+            \o Level 1 heading
+            \o Supports the standard \l{block attributes}.
+    \row    \o \c h2
+            \o Level 2 heading
+            \o Supports the standard \l{block attributes}.
+    \row    \o \c h3
+            \o Level 3 heading
+            \o Supports the standard \l{block attributes}.
+    \row    \o \c h4
+            \o Level 4 heading
+            \o Supports the standard \l{block attributes}.
+    \row    \o \c h5
+            \o Level 5 heading
+            \o Supports the standard \l{block attributes}.
+    \row    \o \c h6
+            \o Level 6 heading
+            \o Supports the standard \l{block attributes}.
+    \row    \o \c head
+            \o Document header
+            \o
+    \row    \o \c hr
+            \o Horizontal line
+            \o Supports the \c width attribute, which can
+               be specified as an absolute or relative (\c %) value.
+    \row    \o \c html
+            \o HTML document
+            \o
+    \row    \o \c i
+            \o Italic
+            \o
+    \row    \o \c img
+            \o Image
+            \o Supports the \c src, \c source
+               (for Qt 3 compatibility), \c width, and \c height
+               attributes.
+    \row    \o \c kbd
+            \o User-entered text
+            \o
+    \row    \o \c meta
+            \o Meta-information
+            \o If a text encoding is specified using the \c{meta} tag,
+               it is picked up by Qt::codecForHtml().
+               Likewise, if an encoding is specified to
+               QTextDocument::toHtml(), the encoding is stored using
+               a \c meta tag, for example:
+
+    \snippet doc/src/snippets/code/doc_src_richtext.qdoc 7
+
+    \row    \o \c li
+            \o List item
+            \o
+    \row    \o \c nobr
+            \o Non-breakable text
+            \o
+    \row    \o \c ol
+            \o Ordered list
+            \o Supports the standard \l{list attributes}.
+    \row    \o \c p
+            \o Paragraph
+            \o Left-aligned by default. Supports the standard
+               \l{block attributes}.
+    \row    \o \c pre
+            \o Preformated text
+            \o
+    \row    \o \c qt
+            \o Qt rich-text document
+            \o Synonym for \c html. Provided for compatibility with
+               earlier versions of Qt.
+    \row    \o \c s
+            \o Strikethrough
+            \o
+    \row    \o \c samp
+            \o Sample code
+            \o Same as \c tt.
+    \row    \o \c small
+            \o Small font
+            \o
+    \row    \o \c span
+            \o Grouped elements
+            \o
+    \row    \o \c strong
+            \o Strong
+            \o Same as \c b.
+    \row    \o \c sub
+            \o Subscript
+            \o
+    \row    \o \c sup
+            \o Superscript
+            \o
+    \row    \o \c table
+            \o Table
+            \o Supports the following attributes: \c border,
+               \c bgcolor (Qt \l{QColor::setNamedColor()}{color names}
+               or \c #RRGGBB), \c cellspacing, \c cellpadding,
+               \c width (absolute or relative), and \c height.
+    \row    \o \c tbody
+            \o Table body
+            \o Does nothing.
+    \row    \o \c td
+            \o Table data cell
+            \o Supports the standard \l{table cell attributes}.
+    \row    \o \c tfoot
+            \o Table footer
+            \o Does nothing.
+    \row    \o \c th
+            \o Table header cell
+            \o Supports the standard \l{table cell attributes}.
+    \row    \o \c thead
+            \o Table header
+            \o If the \c thead tag is specified, it is used when printing tables
+               that span multiple pages.
+    \row    \o \c title
+            \o Document title
+            \o The value specified using the \c
+               title tag is available through
+               QTextDocument::metaInformation().
+    \row    \o \c tr
+            \o Table row
+            \o Supports the \c bgcolor attribute, which
+               can be a Qt \l{QColor::setNamedColor()}{color name}
+               or a \c #RRGGBB color specification.
+    \row    \o \c tt
+            \o Typewrite font
+            \o
+    \row    \o \c u
+            \o Underlined
+            \o
+    \row    \o \c ul
+            \o Unordered list
+            \o Supports the standard \l{list attributes}.
+    \row    \o \c var
+            \o Variable
+            \o Same as \c i.
+    \endtable
+
+    \section1 Block Attributes
+
+    The following attributes are supported by the \c div, \c dl, \c
+    dt, \c h1, \c h2, \c h3, \c h4, \c h5, \c h6, \c p tags:
+
+    \list
+    \o \c align (\c left, \c right, \c center, \c justify)
+    \o \c dir (\c ltr, \c rtl)
+    \endlist
+
+    \section1 List Attributes
+
+    The following attribute is supported by the \c ol and \c ul tags:
+
+    \list
+    \o \c type (\c 1, \c a, \c A, \c square, \c disc, \c circle)
+    \endlist
+
+    \section1 Table Cell Attributes
+
+    The following attributes are supported by the \c td and \c th
+    tags:
+
+    \list
+    \o \c width (absolute, relative, or no-value)
+    \o \c bgcolor (Qt \l{QColor::setNamedColor()}{color names} or \c #RRGGBB)
+    \o \c colspan
+    \o \c rowspan
+    \o \c align (\c left, \c right, \c center, \c justify)
+    \o \c valign (\c top, \c middle, \c bottom)
+    \endlist
+
+    \section1 CSS Properties
+    The following table lists the CSS properties supported by Qt's
+    \l{Rich Text Processing}{rich text} engine:
+
+    \table
+    \header \o Property
+            \o Values
+            \o Description
+    \row
+            \o \c background-color
+            \o <color>
+            \o Background color for elements
+    \row
+            \o \c background-image
+            \o <uri>
+            \o Background image for elements
+    \row    \o \c color
+            \o <color>
+            \o Text foreground color
+    \row    \o \c font-family
+            \o <family name>
+            \o Font family name
+    \row    \o \c font-size
+            \o [ small | medium | large | x-large | xx-large ] | <size>pt | <size>px
+            \o Font size relative to the document font, or specified in points or pixels
+    \row    \o \c font-style
+            \o [ normal | italic | oblique ]
+            \o
+    \row    \o \c font-weight
+            \o [ normal | bold | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 ]
+            \o Specifies the font weight used for text, where \c normal and \c bold
+               are mapped to the corresponding QFont weights. Numeric values are
+               8 times the equivalent QFont weight values.
+    \row    \o \c text-decoration
+            \o none | [ underline || overline || line-through ]
+            \o Additional text effects
+    \row    \o \c font
+            \o [ [ <'font-style'> || <'font-weight'> ]? <'font-size'> <'font-family'> ]
+            \o Font shorthand property
+    \row    \o \c text-indent
+            \o <length>px
+            \o First line text indentation in pixels
+    \row    \o \c white-space
+            \o normal | pre | nowrap | pre-wrap
+            \o Declares how whitespace in HTML is handled.
+    \row    \o \c margin-top
+            \o <length>px
+            \o Top paragraph margin in pixels
+    \row    \o \c margin-bottom
+            \o <length>px
+            \o Bottom paragraph margin in pixels
+    \row    \o \c margin-left
+            \o <length>px
+            \o Left paragraph margin in pixels
+    \row    \o \c margin-right
+            \o <length>px
+            \o Right paragraph margin in pixels
+    \row    \o \c padding-top
+            \o <length>px
+            \o Top table cell padding in pixels
+    \row    \o \c padding-bottom
+            \o <length>px
+            \o Bottom table cell padding in pixels
+    \row    \o \c padding-left
+            \o <length>px
+            \o Left table cell padding in pixels
+    \row    \o \c padding-right
+            \o <length>px
+            \o Right table cell padding in pixels
+    \row    \o \c padding
+            \o <length>px
+            \o Shorthand for setting all the padding properties at once.
+    \row    \o \c vertical-align
+            \o baseline | sub | super | middle | top | bottom
+            \o Vertical text alignment. For vertical alignment in text table cells only middle, top, and bottom apply.
+    \row    \o \c border-color
+            \o <color>
+            \o Border color for text tables.
+    \row    \o \c border-style
+            \o none | dotted | dashed | dot-dash | dot-dot-dash | solid | double | groove | ridge | inset | outset
+            \o Border style for text tables.
+    \row    \o \c background
+            \o [ <'background-color'> || <'background-image'> ]
+            \o Background shorthand property
+    \row    \o \c page-break-before
+            \o [ auto | always ]
+            \o Make it possible to enforce a page break before the paragraph/table
+    \row    \o \c page-break-after
+            \o [ auto | always ]
+            \o Make it possible to enforce a page break after the paragraph/table
+    \row    \o float
+            \o [ left | right | none ]
+            \o Specifies where an image or a text will be placed in another element. Note that the \c float property is
+               only supported for tables and images.
+    \row    \o \c text-transform
+            \o [ uppercase | lowercase | smallcaps ]
+            \o Select the transformation that will be performed on the text prior to displaying it.
+    \row    \o \c word-spacing
+            \o <width>px
+            \o Specifies an alternate spacing between each word.
+    \endtable
+
+    \section1 Supported CSS Selectors
+
+    All CSS 2.1 selector classes are supported except pseudo-class selectors such
+    as \c{:first-child}, \c{:visited} and \c{:hover}.
+
+*/
diff --git a/doc/src/session.qdoc b/doc/src/session.qdoc
new file mode 100644
index 0000000000..f47c245c96
--- /dev/null
+++ b/doc/src/session.qdoc
@@ -0,0 +1,177 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page session.html
+    \title Session Management
+    \ingroup gui-programming
+
+    A \e session is a group of running applications, each of which has a
+    particular state. The session is controlled by a service called the \e
+    session \e manager. The applications participating in the session are
+    called \e{session clients}.
+
+    The session manager issues commands to its clients on behalf of the
+    user. These commands may cause clients to commit unsaved changes (for
+    example by saving open files), to preserve their state for future
+    sessions, or to terminate gracefully. The set of these operations is
+    called \e session \e management.
+
+    In the common case, a session consists of all applications that a
+    user runs on their desktop at a time. Under Unix/X11, however, a
+    session may include applications running on different computers and
+    may span multiple displays.
+
+    \section1 Shutting a Session Down 
+
+    A session is shut down by the session manager, usually on behalf of
+    the user when they want to log out. A system might also perform an
+    automatic shutdown in an emergency situation, for example, if power is
+    about to be lost. Clearly there is a significant difference between
+    these types of shutdown. During the first, the user may want to
+    interact with the application, specifying exactly which files should
+    be saved and which should be discarded. In the latter case, there's no
+    time for interaction. There may not even be a user sitting in front of
+    the machine!
+
+
+    \section1 Protocols and Support on Different Platforms
+
+    On Mac OS X, and Microsoft Windows versions prior to Windows 2000,
+    there is nothing like complete session management for applications
+    yet, i.e. no restoring of previous sessions. (Windows 2000 and XP
+    provide "hibernation" where the entire memory is saved to disk and
+    restored when the machine is restarted.) They do support graceful
+    logouts where applications have the opportunity to cancel the process
+    after getting confirmation from the user. This is the functionality
+    that corresponds to the QApplication::commitData() method.
+
+    X11 has supported complete session management since X11R6.
+
+    \section1 Getting Session Management to Work with Qt 
+
+    Start by reimplementing QApplication::commitData() to
+    enable your application to take part in the graceful logout process. If
+    you are only targeting the Microsoft Windows platform, this is all you can
+    and must provide. Ideally, your application should provide a shutdown
+    dialog similar to the following:
+
+    \img session.png A typical dialog on shutdown
+
+    Example code for this dialog can be found in the documentation of
+    QSessionManager::allowsInteraction().
+
+    For complete session management (only supported on X11R6 at present),
+    you must also take care of saving the application's state, and
+    potentially of restoring the state in the next life cycle of the
+    session. This saving is done by reimplementing
+    QApplication::saveState(). All state data you are saving in this
+    function, should be marked with the session identifier
+    QApplication::sessionId(). This application specific identifier is
+    globally unique, so no clashes will occur. (See QSessionManager for
+    information on saving/restoring the state of a particular Qt
+    application.)
+
+    Restoration is usually done in the application's main()
+    function. Check if QApplication::isSessionRestored() is \c true. If
+    that's the case, use the session identifier
+    QApplication::sessionId() again to access your state data and restore
+    the state of the application.
+
+    \bold{Important:} In order to allow the window manager to
+    restore window attributes such as stacking order or geometry
+    information, you must identify your top level widgets with 
+    unique application-wide object names (see QObject::setObjectName()). When
+    restoring the application, you must ensure that all restored
+    top level widgets are given the same unique names they had before.
+
+    \section1 Testing and Debugging Session Management 
+
+    Session management support on Mac OS X and Windows is fairly limited
+    due to the lack of this functionality in the operating system
+    itself. Simply shut the session down and verify that your application
+    behaves as expected. It may be useful to launch another application,
+    usually the integrated development environment, before starting your
+    application. This other application will get the shutdown message
+    afterwards, thus permitting you to cancel the shutdown. Otherwise you
+    would have to log in again after each test run, which is not a problem
+    per se, but is time consuming.
+
+    On Unix you can either use a desktop environment that supports
+    standard X11R6 session management or, the recommended method, use the
+    session manager reference implementation provided by the X Consortium.
+    This sample manager is called \c xsm and is part of a standard X11R6
+    installation. As always with X11, a useful and informative manual page
+    is provided. Using \c xsm is straightforward (apart from the clumsy
+    Athena-based user interface). Here's a simple approach:
+
+    \list
+    \i Run X11R6.
+    \i Create a dot file \c .xsmstartup in your home directory which
+    contains the single line
+    \snippet doc/src/snippets/code/doc_src_session.qdoc 0
+    This tells \c xsm that the default/failsafe session is just an xterm
+    and nothing else. Otherwise \c xsm would try to invoke lots of
+    clients including the windowmanager \c twm, which isn't very helpful.
+    \i Now launch \c xsm from another terminal window. Both a session
+    manager window and the xterm will appear. The xterm has a nice
+    property that sets it apart from all the other shells you are
+    currently running: within its shell, the \c SESSION_MANAGER
+    environment variable points to the session manager you just started.
+    \i Launch your application from the new xterm window. It will connect
+    itself automatically to the session manager. You can check with the \e
+    ClientList push button whether the connect was successful.
+
+    \bold{Note:} Never keep the \e ClientList open when you
+    start or end session managed clients! Otherwise \c xsm is likely to
+    crash.
+    \i Use the session manager's \e Checkpoint and \e Shutdown buttons
+    with different settings and see how your application behaves. The save
+    type \e local means that the clients should save their state. It
+    corresponds to the QApplication::saveState() function. The \e
+    global save type asks applications to save their unsaved changes in
+    permanent, globally accessible storage. It invokes
+    QApplication::commitData().
+    \i Whenever something crashes, blame \c xsm and not Qt. \c xsm is far
+    from being a usable session manager on a user's desktop. It is,
+    however, stable and useful enough to serve as testing environment.
+    \endlist
+*/
diff --git a/doc/src/signalsandslots.qdoc b/doc/src/signalsandslots.qdoc
new file mode 100644
index 0000000000..5432bd453b
--- /dev/null
+++ b/doc/src/signalsandslots.qdoc
@@ -0,0 +1,418 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page signalsandslots.html
+    \title Signals and Slots
+    \ingroup architecture
+    \brief An overview of Qt's signals and slots inter-object
+    communication mechanism.
+
+    Signals and slots are used for communication between objects. The
+    signals and slots mechanism is a central feature of Qt and
+    probably the part that differs most from the features provided by
+    other frameworks.
+
+    \tableofcontents
+
+    \section1 Introduction
+
+    In GUI programming, when we change one widget, we often want
+    another widget to be notified. More generally, we want objects of
+    any kind to be able to communicate with one another. For example,
+    if a user clicks a \gui{Close} button, we probably want the
+    window's \l{QWidget::close()}{close()} function to be called.
+
+    Older toolkits achieve this kind of communication using
+    callbacks. A callback is a pointer to a function, so if you want
+    a processing function to notify you about some event you pass a
+    pointer to another function (the callback) to the processing
+    function. The processing function then calls the callback when
+    appropriate. Callbacks have two fundamental flaws: Firstly, they
+    are not type-safe. We can never be certain that the processing
+    function will call the callback with the correct arguments.
+    Secondly, the callback is strongly coupled to the processing
+    function since the processing function must know which callback
+    to call.
+
+    \section1 Signals and Slots
+
+    In Qt, we have an alternative to the callback technique: We use
+    signals and slots. A signal is emitted when a particular event
+    occurs. Qt's widgets have many predefined signals, but we can
+    always subclass widgets to add our own signals to them. A slot
+    is a function that is called in response to a particular signal.
+    Qt's widgets have many pre-defined slots, but it is common
+    practice to subclass widgets and add your own slots so that you
+    can handle the signals that you are interested in.
+
+    \img abstract-connections.png
+    \omit
+    \caption An abstract view of some signals and slots connections
+    \endomit
+
+    The signals and slots mechanism is type safe: The signature of a
+    signal must match the signature of the receiving slot. (In fact a
+    slot may have a shorter signature than the signal it receives
+    because it can ignore extra arguments.) Since the signatures are
+    compatible, the compiler can help us detect type mismatches.
+    Signals and slots are loosely coupled: A class which emits a
+    signal neither knows nor cares which slots receive the signal.
+    Qt's signals and slots mechanism ensures that if you connect a
+    signal to a slot, the slot will be called with the signal's
+    parameters at the right time. Signals and slots can take any
+    number of arguments of any type. They are completely type safe.
+
+    All classes that inherit from QObject or one of its subclasses
+    (e.g., QWidget) can contain signals and slots. Signals are emitted by
+    objects when they change their state in a way that may be interesting
+    to other objects. This is all the object does to communicate. It
+    does not know or care whether anything is receiving the signals it
+    emits. This is true information encapsulation, and ensures that the
+    object can be used as a software component.
+
+    Slots can be used for receiving signals, but they are also normal
+    member functions. Just as an object does not know if anything receives
+    its signals, a slot does not know if it has any signals connected to
+    it. This ensures that truly independent components can be created with
+    Qt.
+
+    You can connect as many signals as you want to a single slot, and a
+    signal can be connected to as many slots as you need. It is even
+    possible to connect a signal directly to another signal. (This will
+    emit the second signal immediately whenever the first is emitted.)
+
+    Together, signals and slots make up a powerful component programming
+    mechanism.
+
+    \section1 A Small Example
+
+    A minimal C++ class declaration might read:
+
+    \snippet doc/src/snippets/signalsandslots/signalsandslots.h 0
+
+    A small QObject-based class might read:
+
+    \snippet doc/src/snippets/signalsandslots/signalsandslots.h 1
+    \codeline
+    \snippet doc/src/snippets/signalsandslots/signalsandslots.h 2
+    \snippet doc/src/snippets/signalsandslots/signalsandslots.h 3
+
+    The QObject-based version has the same internal state, and provides
+    public methods to access the state, but in addition it has support
+    for component programming using signals and slots. This class can
+    tell the outside world that its state has changed by emitting a
+    signal, \c{valueChanged()}, and it has a slot which other objects
+    can send signals to.
+
+    All classes that contain signals or slots must mention
+    Q_OBJECT at the top of their declaration. They must also derive
+    (directly or indirectly) from QObject.
+
+    Slots are implemented by the application programmer.
+    Here is a possible implementation of the \c{Counter::setValue()}
+    slot:
+
+    \snippet doc/src/snippets/signalsandslots/signalsandslots.cpp 0
+
+    The \c{emit} line emits the signal \c valueChanged() from the
+    object, with the new value as argument.
+
+    In the following code snippet, we create two \c Counter objects
+    and connect the first object's \c valueChanged() signal to the
+    second object's \c setValue() slot using QObject::connect():
+
+    \snippet doc/src/snippets/signalsandslots/signalsandslots.cpp 1
+    \snippet doc/src/snippets/signalsandslots/signalsandslots.cpp 2
+    \codeline
+    \snippet doc/src/snippets/signalsandslots/signalsandslots.cpp 3
+    \snippet doc/src/snippets/signalsandslots/signalsandslots.cpp 4
+
+    Calling \c{a.setValue(12)} makes \c{a} emit a
+    \c{valueChanged(12)} signal, which \c{b} will receive in its
+    \c{setValue()} slot, i.e. \c{b.setValue(12)} is called. Then
+    \c{b} emits the same \c{valueChanged()} signal, but since no slot
+    has been connected to \c{b}'s \c{valueChanged()} signal, the
+    signal is ignored.
+
+    Note that the \c{setValue()} function sets the value and emits
+    the signal only if \c{value != m_value}. This prevents infinite
+    looping in the case of cyclic connections (e.g., if
+    \c{b.valueChanged()} were connected to \c{a.setValue()}).
+
+    A signal is emitted for every connection you make; if you
+    duplicate a connection, two signals will be emitted. You can
+    always break a connection using QObject::disconnect().
+
+    This example illustrates that objects can work together without needing to
+    know any information about each other. To enable this, the objects only
+    need to be connected together, and this can be achieved with some simple
+    QObject::connect() function calls, or with \c{uic}'s
+    \l{Using a Designer .ui File in Your Application#Automatic Connections}
+    {automatic connections} feature.
+
+    \section1 Building the Example
+
+    The C++ preprocessor changes or removes the \c{signals},
+    \c{slots}, and \c{emit} keywords so that the compiler is
+    presented with standard C++.
+
+    By running the \l moc on class definitions that contain signals
+    or slots, a C++ source file is produced which should be compiled
+    and linked with the other object files for the application. If
+    you use \l qmake, the makefile rules to automatically invoke \c
+    moc will be added to your project's makefile.
+
+    \section1 Signals
+
+    Signals are emitted by an object when its internal state has changed
+    in some way that might be interesting to the object's client or owner.
+    Only the class that defines a signal and its subclasses can emit the
+    signal.
+
+    When a signal is emitted, the slots connected to it are usually
+    executed immediately, just like a normal function call. When this
+    happens, the signals and slots mechanism is totally independent of
+    any GUI event loop. Execution of the code following the \c emit
+    statement will occur once all slots have returned. The situation is
+    slightly different when using \l{Qt::ConnectionType}{queued
+    connections}; in such a case, the code following the \c emit keyword
+    will continue immediately, and the slots will be executed later.
+
+    If several slots are connected to one signal, the slots will be
+    executed one after the other, in an arbitrary order, when the signal
+    is emitted.
+
+    Signals are automatically generated by the \l moc and must not be
+    implemented in the \c .cpp file. They can never have return types
+    (i.e. use \c void).
+
+    A note about arguments: Our experience shows that signals and slots
+    are more reusable if they do not use special types. If
+    QScrollBar::valueChanged() were to use a special type such as the
+    hypothetical QScrollBar::Range, it could only be connected to
+    slots designed specifically for QScrollBar. Connecting different
+    input widgets together would be impossible.
+
+    \section1 Slots
+
+    A slot is called when a signal connected to it is emitted. Slots are
+    normal C++ functions and can be called normally; their only special
+    feature is that signals can be connected to them.
+
+    Since slots are normal member functions, they follow the normal C++
+    rules when called directly. However, as slots, they can be invoked
+    by any component, regardless of its access level, via a signal-slot
+    connection. This means that a signal emitted from an instance of an
+    arbitrary class can cause a private slot to be invoked in an instance
+    of an unrelated class.
+
+    You can also define slots to be virtual, which we have found quite
+    useful in practice.
+
+    Compared to callbacks, signals and slots are slightly slower
+    because of the increased flexibility they provide, although the
+    difference for real applications is insignificant. In general,
+    emitting a signal that is connected to some slots, is
+    approximately ten times slower than calling the receivers
+    directly, with non-virtual function calls. This is the overhead
+    required to locate the connection object, to safely iterate over
+    all connections (i.e. checking that subsequent receivers have not
+    been destroyed during the emission), and to marshall any
+    parameters in a generic fashion. While ten non-virtual function
+    calls may sound like a lot, it's much less overhead than any \c
+    new or \c delete operation, for example. As soon as you perform a
+    string, vector or list operation that behind the scene requires
+    \c new or \c delete, the signals and slots overhead is only
+    responsible for a very small proportion of the complete function
+    call costs.
+
+    The same is true whenever you do a system call in a slot; or
+    indirectly call more than ten functions. On an i586-500, you can
+    emit around 2,000,000 signals per second connected to one
+    receiver, or around 1,200,000 per second connected to two
+    receivers. The simplicity and flexibility of the signals and
+    slots mechanism is well worth the overhead, which your users
+    won't even notice.
+
+    Note that other libraries that define variables called \c signals
+    or \c slots may cause compiler warnings and errors when compiled
+    alongside a Qt-based application. To solve this problem, \c
+    #undef the offending preprocessor symbol.
+
+    \section1 Meta-Object Information
+
+    The meta-object compiler (\l moc) parses the class declaration in
+    a C++ file and generates C++ code that initializes the
+    meta-object. The meta-object contains the names of all the signal
+    and slot members, as well as pointers to these functions.
+
+    The meta-object contains additional information such as the
+    object's \link QObject::className() class name\endlink. You can
+    also check if an object \link QObject::inherits()
+    inherits\endlink a specific class, for example:
+
+    \snippet doc/src/snippets/signalsandslots/signalsandslots.cpp 5
+    \snippet doc/src/snippets/signalsandslots/signalsandslots.cpp 6
+
+    The meta-object information is also used by qobject_cast<T>(), which
+    is similar to QObject::inherits() but is less error-prone:
+
+    \snippet doc/src/snippets/signalsandslots/signalsandslots.cpp 7
+
+    See \l{Meta-Object System} for more information.
+
+    \section1 A Real Example
+
+    Here is a simple commented example of a widget.
+
+    \snippet doc/src/snippets/signalsandslots/lcdnumber.h 0
+    \snippet doc/src/snippets/signalsandslots/lcdnumber.h 1
+    \codeline
+    \snippet doc/src/snippets/signalsandslots/lcdnumber.h 2
+    \codeline
+    \snippet doc/src/snippets/signalsandslots/lcdnumber.h 3
+    \snippet doc/src/snippets/signalsandslots/lcdnumber.h 4
+    \snippet doc/src/snippets/signalsandslots/lcdnumber.h 5
+
+    \c LcdNumber inherits QObject, which has most of the signal-slot
+    knowledge, via QFrame and QWidget. It is somewhat similar to the
+    built-in QLCDNumber widget.
+
+    The Q_OBJECT macro is expanded by the preprocessor to declare
+    several member functions that are implemented by the \c{moc}; if
+    you get compiler errors along the lines of "undefined reference
+    to vtable for \c{LcdNumber}", you have probably forgotten to
+    \l{moc}{run the moc} or to include the moc output in the link
+    command.
+
+    \snippet doc/src/snippets/signalsandslots/lcdnumber.h 6
+    \snippet doc/src/snippets/signalsandslots/lcdnumber.h 7
+
+    It's not obviously relevant to the moc, but if you inherit
+    QWidget you almost certainly want to have the \c parent argument
+    in your constructor and pass it to the base class's constructor.
+
+    Some destructors and member functions are omitted here; the \c
+    moc ignores member functions.
+
+    \snippet doc/src/snippets/signalsandslots/lcdnumber.h 8
+    \snippet doc/src/snippets/signalsandslots/lcdnumber.h 9
+
+    \c LcdNumber emits a signal when it is asked to show an impossible
+    value.
+
+    If you don't care about overflow, or you know that overflow
+    cannot occur, you can ignore the \c overflow() signal, i.e. don't
+    connect it to any slot.
+
+    If on the other hand you want to call two different error
+    functions when the number overflows, simply connect the signal to
+    two different slots. Qt will call both (in arbitrary order).
+
+    \snippet doc/src/snippets/signalsandslots/lcdnumber.h 10
+    \snippet doc/src/snippets/signalsandslots/lcdnumber.h 11
+    \snippet doc/src/snippets/signalsandslots/lcdnumber.h 12
+    \codeline
+    \snippet doc/src/snippets/signalsandslots/lcdnumber.h 13
+
+    A slot is a receiving function used to get information about
+    state changes in other widgets. \c LcdNumber uses it, as the code
+    above indicates, to set the displayed number. Since \c{display()}
+    is part of the class's interface with the rest of the program,
+    the slot is public.
+
+    Several of the example programs connect the
+    \l{QScrollBar::valueChanged()}{valueChanged()} signal of a
+    QScrollBar to the \c display() slot, so the LCD number
+    continuously shows the value of the scroll bar.
+
+    Note that \c display() is overloaded; Qt will select the
+    appropriate version when you connect a signal to the slot. With
+    callbacks, you'd have to find five different names and keep track
+    of the types yourself.
+
+    Some irrelevant member functions have been omitted from this
+    example.
+
+    \section1 Advanced Signals and Slots Usage
+
+    For cases where you may require information on the sender of the
+    signal, Qt provides the QObject::sender() function, which returns
+    a pointer to the object that sent the signal.
+
+    The QSignalMapper class is provided for situations where many
+    signals are connected to the same slot and the slot needs to
+    handle each signal differently.
+
+    Suppose you have three push buttons that determine which file you
+    will open: "Tax File", "Accounts File", or "Report File". 
+
+    In order to open the correct file, you use QSignalMapper::setMapping() to
+    map all the clicked() signals to a QSignalMapper object. Then you connect
+    the file's QPushButton::clicked() signal to the QSignalMapper::map() slot.
+
+    \snippet doc/src/snippets/signalmapper/filereader.cpp 0
+
+    Then, you connect the \l{QSignalMapper::}{mapped()} signal to
+    \c{readFile()} where a different file will be opened, depending on
+    which push button is pressed.
+
+    \snippet doc/src/snippets/signalmapper/filereader.cpp 1
+
+    \sa {Meta-Object System}, {Qt's Property System}
+
+    \target 3rd Party Signals and Slots
+    \section2 Using Qt with 3rd Party Signals and Slots
+
+    It is possible to use Qt with a 3rd party signal/slot mechanism.
+    You can even use both mechanisms in the same project. Just add the
+    following line to your qmake project (.pro) file.
+
+    \snippet doc/src/snippets/code/doc_src_containers.qdoc 22
+
+    It tells Qt not to define the moc keywords \c{signals}, \c{slots},
+    and \c{emit}, because these names will be used by a 3rd party
+    library, e.g. Boost. Then to continue using Qt signals and slots
+    with the \c{no_keywords} flag, simply replace all uses of the Qt
+    moc keywords in your sources with the corresponding Qt macros
+    Q_SIGNALS (or Q_SIGNAL), Q_SLOTS (or Q_SLOT), and Q_EMIT.
+*/
diff --git a/doc/src/snippets/accessibilityfactorysnippet.cpp b/doc/src/snippets/accessibilityfactorysnippet.cpp
new file mode 100644
index 0000000000..1dbc38a6d0
--- /dev/null
+++ b/doc/src/snippets/accessibilityfactorysnippet.cpp
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+//! [0]
+QAccessibleInterface *sliderFactory(const QString &classname, QObject *object)
+{
+    QAccessibleInterface *interface = 0;
+
+    if (classname == "QSlider" && object && object->isWidgetType())
+        interface = new SliderInterface(classname,
+                                        static_cast<QWidget *>(object));
+    
+    return interface;
+}
+
+int main(int argv, char **args)
+{
+    QApplication app(argv, args);
+    QAccessible::installFactory(sliderFactory);
+//! [0]
+
+    QMainWindow mainWindow;
+    mainWindow.show();
+
+    return app.exec();
+//! [1]
+}
+//! [1]
diff --git a/doc/src/snippets/accessibilitypluginsnippet.cpp b/doc/src/snippets/accessibilitypluginsnippet.cpp
new file mode 100644
index 0000000000..228f11c7b8
--- /dev/null
+++ b/doc/src/snippets/accessibilitypluginsnippet.cpp
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+class SliderPlugin : public QAccessiblePlugin
+{
+public:
+    SliderPlugin() {}
+
+    QStringList keys() const;
+    QAccessibleInterface *create(const QString &classname, QObject *object);
+};
+
+//! [0]
+QStringList SliderPlugin::keys() const
+{
+    return QStringList() << "QSlider";
+}
+//! [0]
+
+//! [1]
+QAccessibleInterface *SliderPlugin::create(const QString &classname, QObject *object)
+{
+    QAccessibleInterface *interface = 0;
+
+    if (classname == "QSlider" && object && object->isWidgetType())
+        interface = new AccessibleSlider(classname, static_cast<QWidget *>(object));
+
+    return interface;
+}
+//! [1]
+
+//! [2]
+Q_EXPORT_STATIC_PLUGIN(SliderPlugin)
+Q_EXPORT_PLUGIN2(acc_sliderplugin, SliderPlugin)
+//! [2]
diff --git a/doc/src/snippets/accessibilityslidersnippet.cpp b/doc/src/snippets/accessibilityslidersnippet.cpp
new file mode 100644
index 0000000000..5c4b7fb3c5
--- /dev/null
+++ b/doc/src/snippets/accessibilityslidersnippet.cpp
@@ -0,0 +1,262 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+//! [0]
+QAccessibleSlider::QAccessibleSlider(QWidget *w)
+: QAccessibleAbstractSlider(w)
+{
+    Q_ASSERT(slider());
+    addControllingSignal(QLatin1String("valueChanged(int)"));
+}
+//! [0]
+
+QSlider *QAccessibleSlider::slider() const
+{
+    return qobject_cast<QSlider*>(object());
+}
+
+//! [1]
+QRect QAccessibleSlider::rect(int child) const
+{
+//! [1]
+    QRect rect;
+    if (!slider()->isVisible())
+        return rect;
+    const QStyleOptionSlider option = qt_qsliderStyleOption(slider());
+    QRect srect = slider()->style()->subControlRect(QStyle::CC_Slider, &option,
+                                                    QStyle::SC_SliderHandle, slider());
+
+//! [2]
+    switch (child) {
+    case PageLeft:
+        if (slider()->orientation() == Qt::Vertical)
+            rect = QRect(0, 0, slider()->width(), srect.y());
+        else
+            rect = QRect(0, 0, srect.x(), slider()->height());
+        break;
+    case Position:
+        rect = srect;
+        break;
+    case PageRight:
+        if (slider()->orientation() == Qt::Vertical)
+            rect = QRect(0, srect.y() + srect.height(), slider()->width(), slider()->height()- srect.y() - srect.height());
+        else
+            rect = QRect(srect.x() + srect.width(), 0, slider()->width() - srect.x() - srect.width(), slider()->height());
+        break;
+    default:
+        return QAccessibleAbstractSlider::rect(child);
+    }
+//! [2] //! [3]
+
+    QPoint tp = slider()->mapToGlobal(QPoint(0,0));
+    return QRect(tp.x() + rect.x(), tp.y() + rect.y(), rect.width(), rect.height());
+}
+//! [3]
+
+int QAccessibleSlider::childCount() const
+{
+    if (!slider()->isVisible())
+        return 0;
+    return PageRight;
+}
+
+//! [4]
+QString QAccessibleSlider::text(Text t, int child) const
+{
+    if (!slider()->isVisible())
+        return QString();
+    switch (t) {
+    case Value:
+        if (!child || child == 2)
+            return QString::number(slider()->value());
+        return QString();
+    case Name:
+        switch (child) {
+        case PageLeft:
+            return slider()->orientation() == Qt::Horizontal ?
+                QSlider::tr("Page left") : QSlider::tr("Page up");
+        case Position:
+            return QSlider::tr("Position");
+        case PageRight:
+            return slider()->orientation() == Qt::Horizontal ?
+                QSlider::tr("Page right") : QSlider::tr("Page down");
+        }
+        break;
+    default:
+        break;
+    }
+    return QAccessibleAbstractSlider::text(t, child);
+}
+//! [4]
+
+//! [5]
+QAccessible::Role QAccessibleSlider::role(int child) const
+{
+    switch (child) {
+    case PageLeft:
+    case PageRight:
+        return PushButton;
+    case Position:
+        return Indicator;
+    default:
+        return Slider;
+    }
+}
+//! [5]
+
+//! [6]
+QAccessible::State QAccessibleSlider::state(int child) const
+{
+    const State parentState = QAccessibleAbstractSlider::state(0);
+//! [6]
+
+    if (child == 0)
+        return parentState;
+
+    // Inherit the Invisible state from parent.
+    State state = parentState & QAccessible::Invisible;
+
+    // Disable left/right if we are at the minimum/maximum.
+    const QSlider * const slider = QAccessibleSlider::slider();
+//! [7]
+    switch (child) {
+    case PageLeft:
+        if (slider->value() <= slider->minimum())
+            state |= Unavailable;
+        break;
+    case PageRight:
+        if (slider->value() >= slider->maximum())
+            state |= Unavailable;
+        break;
+    case Position:
+    default:
+        break;
+    }
+
+    return state;
+}
+//! [7]
+
+int QAccessibleSlider::defaultAction(int child) const
+{
+    switch (child) {
+        case SliderSelf:
+            return SetFocus;
+        case PageLeft:
+            return Press;
+        case PageRight:
+            return Press;
+    }
+
+    return 0;
+}
+
+// Name, Description, Value, Help, Accelerator
+static const char * const actionTexts[][5] =
+{
+    {"Press", "Decreases the value of the slider", "", "", "Ctrl+L"},
+    {"Press", "Increaces the value of the slider", "", "", "Ctrl+R"}
+};
+
+QString QAccessibleSlider::actionText(int action, Text text, int child) const
+{
+    if (action != Press || child < 1 || child > 2)
+        return QAccessibleAbstractSlider::actionText(action, text, child);        
+
+    return actionTexts[child - 1][t];
+}
+
+bool QAccessibleSlider::doAction(int action, int child)
+{
+    if (action != Press || child < 1 || child > 2)
+        return false;
+    
+    if (child == PageLeft)
+        slider()->setValue(slider()->value() - slider()->pageStep());
+    else
+        slider()->setValue(slider()->value() + slider()->pageStep());
+}
+
+QAccessibleAbstractSlider::QAccessibleAbstractSlider(QWidget *w, Role r)
+    : QAccessibleWidgetEx(w, r)
+{
+    Q_ASSERT(qobject_cast<QAbstractSlider *>(w));
+}
+
+QVariant QAccessibleAbstractSlider::invokeMethodEx(Method method, int child, const QVariantList &params)
+{
+    switch (method) {
+    case ListSupportedMethods: {
+        QSet<QAccessible::Method> set;
+        set << ListSupportedMethods;
+        return qVariantFromValue(set | qvariant_cast<QSet<QAccessible::Method> >(
+                    QAccessibleWidgetEx::invokeMethodEx(method, child, params)));
+    }
+    default:
+        return QAccessibleWidgetEx::invokeMethodEx(method, child, params);
+    }
+}
+
+QVariant QAccessibleAbstractSlider::currentValue()
+{
+    return abstractSlider()->value();
+}
+
+void QAccessibleAbstractSlider::setCurrentValue(const QVariant &value)
+{
+    abstractSlider()->setValue(value.toInt());
+}
+
+QVariant QAccessibleAbstractSlider::maximumValue()
+{
+    return abstractSlider()->maximum();
+}
+
+QVariant QAccessibleAbstractSlider::minimumValue()
+{
+    return abstractSlider()->minimum();
+}
+
+QAbstractSlider *QAccessibleAbstractSlider::abstractSlider() const
+{
+    return static_cast<QAbstractSlider *>(object());
+}
diff --git a/doc/src/snippets/alphachannel.cpp b/doc/src/snippets/alphachannel.cpp
new file mode 100644
index 0000000000..7783271abd
--- /dev/null
+++ b/doc/src/snippets/alphachannel.cpp
@@ -0,0 +1,114 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qapplication.h>
+#include <qlabel.h>
+#include <qpixmap.h>
+#include <qprinter.h>
+#include <qpainter.h>
+#include <qfile.h>
+#include <qdir.h>
+#include <qfileinfo.h>
+
+#if (QT_VERSION) >= 0x040000
+#include <QtGui>
+#include <QtCore>
+#endif
+
+class MyClass : public QWidget
+{
+public:
+     MyClass(QWidget *parent = 0) : QWidget(parent) { }
+
+protected:
+     void paintEvent(QPaintEvent *e)
+     {
+        /*QRadialGradient rg(50, 50, 50, 50, 50);
+         rg.setColorAt(0, QColor::fromRgbF(1, 0, 0, 1));
+         rg.setColorAt(1, QColor::fromRgbF(0, 0, 0, 0));
+         QPainter pmp(&pm);
+         pmp.fillRect(0, 0, 100, 100, rg);
+         pmp.end();*/
+
+	createImage();
+
+	QPainter p(this);
+	p.fillRect(rect(), Qt::white);
+
+	p.drawPixmap(0, 0, pixmap);
+
+	p.drawPixmap(100, 0, channelImage);
+     }
+
+    void createImage()
+    {
+//! [0]
+	pixmap = QPixmap(100, 100);
+	pixmap.fill(Qt::transparent);
+
+	QRadialGradient gradient(50, 50, 50, 50, 50);
+	gradient.setColorAt(0, QColor::fromRgbF(1, 0, 0, 1));
+	gradient.setColorAt(1, QColor::fromRgbF(0, 0, 0, 0));
+	QPainter painter(&pixmap);
+	painter.fillRect(0, 0, 100, 100, gradient);
+
+	channelImage = pixmap.alphaChannel();
+	update();
+//! [0]
+    }
+
+    QPixmap channelImage, pixmap; 
+    QSize sizeHint() const { return QSize(500, 500); }
+};
+
+    
+
+int main(int argc, char **argv)
+{
+     QApplication app(argc, argv);
+
+     MyClass cl;
+     cl.show();
+     QObject::connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit()));
+
+     int ret = app.exec();
+     return ret;
+}
diff --git a/doc/src/snippets/audioeffects.cpp b/doc/src/snippets/audioeffects.cpp
new file mode 100644
index 0000000000..febf34975f
--- /dev/null
+++ b/doc/src/snippets/audioeffects.cpp
@@ -0,0 +1,42 @@
+#include <QtGui>
+
+#include <phonon/audiooutput.h>
+#include <phonon/mediaobject.h>
+#include <phonon/backendcapabilities.h>
+#include <phonon/effect.h>
+#include <phonon/effectwidget.h>
+
+
+int main(int argv, char **args)
+{
+    QApplication app(argv, args);
+    app.setApplicationName("Audio effect tester");
+
+    Phonon::MediaObject *mediaObject = new Phonon::MediaObject;
+    mediaObject->setCurrentSource(QString("/home/gvatteka/Music/Lumme-Badloop.ogg"));
+
+    Phonon::AudioOutput *audioOutput =
+        new Phonon::AudioOutput(Phonon::MusicCategory);
+
+//! [0]
+    QList<Phonon::EffectDescription> effectDescriptions =
+            Phonon::BackendCapabilities::availableAudioEffects();
+    Phonon::EffectDescription effectDescription = effectDescriptions.at(4);
+    
+    Phonon::Path path = Phonon::createPath(mediaObject, audioOutput);
+
+//! [1]
+    Phonon::Effect *effect = new Phonon::Effect(effectDescription);
+    path.insertEffect(effect);
+//! [0]
+
+    Phonon::EffectWidget *effectWidget = new Phonon::EffectWidget(effect);
+    effectWidget->show();
+//! [1]
+
+    mediaObject->play();
+    
+    effectWidget->setWindowTitle("Effect Name: " + effectDescription.name());
+
+    app.exec();
+}
diff --git a/doc/src/snippets/brush/brush.cpp b/doc/src/snippets/brush/brush.cpp
new file mode 100644
index 0000000000..c4583c097d
--- /dev/null
+++ b/doc/src/snippets/brush/brush.cpp
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+int main()
+{
+    QWidget anyPaintDevice;
+    {
+        // PEN SNIPPET
+        QPainter painter;
+        QPen pen(Qt::red, 2);                 // red solid line, 2 pixels wide
+        painter.begin(&anyPaintDevice);   // paint something
+        painter.setPen(pen);              // set the red, wide pen
+        painter.drawRect(40,30, 200,100); // draw a rectangle
+        painter.setPen(Qt::blue);             // set blue pen, 0 pixel width
+        painter.drawLine(40,30, 240,130); // draw a diagonal in rectangle
+        painter.end();                    // painting done
+    }
+
+    {
+        // BRUSH SNIPPET
+        QPainter painter;
+        QBrush brush(Qt::yellow);           // yellow solid pattern
+        painter.begin(&anyPaintDevice);   // paint something
+        painter.setBrush(brush);          // set the yellow brush
+        painter.setPen(Qt::NoPen);        // do not draw outline
+        painter.drawRect(40,30, 200,100); // draw filled rectangle
+        painter.setBrush(Qt::NoBrush);    // do not fill
+        painter.setPen(Qt::black);            // set black pen, 0 pixel width
+        painter.drawRect(10,10, 30,20);   // draw rectangle outline
+        painter.end();                    // painting done
+    }
+
+    // LINEAR
+//! [0]
+    QLinearGradient linearGrad(QPointF(100, 100), QPointF(200, 200));
+    linearGrad.setColorAt(0, Qt::black);
+    linearGrad.setColorAt(1, Qt::white);
+//! [0]
+
+    // RADIAL
+//! [1]
+    QRadialGradient radialGrad(QPointF(100, 100), 100);
+    radialGrad.setColorAt(0, Qt::red);
+    radialGrad.setColorAt(0.5, Qt::blue);
+    radialGrad.setColorAt(1, Qt::green);
+//! [1]
+}
diff --git a/doc/src/snippets/brush/brush.pro b/doc/src/snippets/brush/brush.pro
new file mode 100644
index 0000000000..6a5f0dadb6
--- /dev/null
+++ b/doc/src/snippets/brush/brush.pro
@@ -0,0 +1 @@
+SOURCES += brush.cpp
diff --git a/doc/src/snippets/brush/gradientcreationsnippet.cpp b/doc/src/snippets/brush/gradientcreationsnippet.cpp
new file mode 100644
index 0000000000..a7a50efe22
--- /dev/null
+++ b/doc/src/snippets/brush/gradientcreationsnippet.cpp
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+int main(int argv, char **args)
+{
+    QApplication app(argv, args);
+
+//! [0]
+    QRadialGradient gradient(50, 50, 50, 50, 50);
+    gradient.setColorAt(0, QColor::fromRgbF(0, 1, 0, 1));
+    gradient.setColorAt(1, QColor::fromRgbF(0, 0, 0, 0));
+
+    QBrush brush(gradient);
+//! [0]
+
+    QWidget widget;
+    QPalette palette;
+    palette.setBrush(widget.backgroundRole(), brush);
+    widget.setPalette(palette);
+    widget.show();
+
+    return app.exec();
+}
diff --git a/doc/src/snippets/brushstyles/brushstyles.pro b/doc/src/snippets/brushstyles/brushstyles.pro
new file mode 100644
index 0000000000..80de531f01
--- /dev/null
+++ b/doc/src/snippets/brushstyles/brushstyles.pro
@@ -0,0 +1,12 @@
+######################################################################
+# Automatically generated by qmake (2.00a) Wed Dec 14 11:46:57 2005
+######################################################################
+
+TEMPLATE = app
+TARGET += 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+HEADERS += renderarea.h stylewidget.h
+SOURCES += main.cpp renderarea.cpp stylewidget.cpp
diff --git a/doc/src/snippets/brushstyles/main.cpp b/doc/src/snippets/brushstyles/main.cpp
new file mode 100644
index 0000000000..ed32fc319f
--- /dev/null
+++ b/doc/src/snippets/brushstyles/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "stylewidget.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    StyleWidget widget;
+    widget.show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/brushstyles/qt-logo.png b/doc/src/snippets/brushstyles/qt-logo.png
new file mode 100644
index 0000000000..2dc67161c1
--- /dev/null
+++ b/doc/src/snippets/brushstyles/qt-logo.png
diff --git a/doc/src/snippets/brushstyles/renderarea.cpp b/doc/src/snippets/brushstyles/renderarea.cpp
new file mode 100644
index 0000000000..0be6c711c1
--- /dev/null
+++ b/doc/src/snippets/brushstyles/renderarea.cpp
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "renderarea.h"
+
+RenderArea::RenderArea(QBrush *brush, QWidget *parent)
+        : QWidget(parent)
+{
+    currentBrush = brush;
+}
+
+QSize RenderArea::minimumSizeHint() const
+{
+    return QSize(120, 60);
+}
+
+void RenderArea::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+    painter.setPen(Qt::NoPen);
+    painter.setRenderHint(QPainter::Antialiasing);
+
+
+    if(currentBrush->style() == Qt::LinearGradientPattern) {
+        currentBrush = new QBrush(QLinearGradient(0, 0, width(), 60));
+    } else if(currentBrush->style() == Qt::RadialGradientPattern) {
+        QRadialGradient radial(width() / 2, 30, width() / 2, width() / 2, 30);
+        radial.setColorAt(0, Qt::white);
+        radial.setColorAt(1, Qt::black);
+        currentBrush = new QBrush(radial);
+    } else if(currentBrush->style() == Qt::ConicalGradientPattern) {
+        currentBrush = new QBrush(QConicalGradient(width() / 2, 30, 90));
+    }
+    painter.setBrush(*currentBrush);
+
+    QPainterPath path;
+    path.addRect(0, 0, parentWidget()->width(), 60);
+    painter.drawPath(path);
+}
diff --git a/doc/src/snippets/brushstyles/renderarea.h b/doc/src/snippets/brushstyles/renderarea.h
new file mode 100644
index 0000000000..5a1df6747c
--- /dev/null
+++ b/doc/src/snippets/brushstyles/renderarea.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef RENDERAREA_H
+#define RENDERAREA_H
+
+#include <QWidget>
+
+class RenderArea : public QWidget
+{
+   Q_OBJECT
+
+public:
+   RenderArea(QBrush *brush, QWidget *parent = 0);
+   QSize minimumSizeHint() const;
+
+protected:
+    void paintEvent(QPaintEvent *event);
+
+private:
+    QBrush *currentBrush;
+};
+
+#endif
diff --git a/doc/src/snippets/brushstyles/stylewidget.cpp b/doc/src/snippets/brushstyles/stylewidget.cpp
new file mode 100644
index 0000000000..21ff711add
--- /dev/null
+++ b/doc/src/snippets/brushstyles/stylewidget.cpp
@@ -0,0 +1,145 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "stylewidget.h"
+
+StyleWidget::StyleWidget(QWidget *parent)
+        : QWidget(parent)
+{
+    solid = new RenderArea(new QBrush(Qt::SolidPattern));
+    dense1 = new RenderArea(new QBrush(Qt::Dense1Pattern));
+    dense2 = new RenderArea(new QBrush(Qt::Dense2Pattern));
+    dense3 = new RenderArea(new QBrush(Qt::Dense3Pattern));
+    dense4 = new RenderArea(new QBrush(Qt::Dense4Pattern));
+    dense5 = new RenderArea(new QBrush(Qt::Dense5Pattern));
+    dense6 = new RenderArea(new QBrush(Qt::Dense6Pattern));
+    dense7 = new RenderArea(new QBrush(Qt::Dense7Pattern));
+    no = new RenderArea(new QBrush(Qt::NoBrush));
+    hor = new RenderArea(new QBrush(Qt::HorPattern));
+    ver = new RenderArea(new QBrush(Qt::VerPattern));
+    cross = new RenderArea(new QBrush(Qt::CrossPattern));
+    bdiag = new RenderArea(new QBrush(Qt::BDiagPattern));
+    fdiag = new RenderArea(new QBrush(Qt::FDiagPattern));
+    diagCross = new RenderArea(new QBrush(Qt::DiagCrossPattern));
+    linear = new RenderArea(new QBrush(QLinearGradient()));
+    radial = new RenderArea(new QBrush(QRadialGradient()));
+    conical = new RenderArea(new QBrush(QConicalGradient()));
+    texture = new RenderArea(new QBrush(QPixmap("qt-logo.png")));
+
+    solidLabel = new QLabel("Qt::SolidPattern");
+    dense1Label = new QLabel("Qt::Dense1Pattern");
+    dense2Label = new QLabel("Qt::Dense2Pattern");
+    dense3Label = new QLabel("Qt::Dense3Pattern");
+    dense4Label = new QLabel("Qt::Dense4Pattern");
+    dense5Label = new QLabel("Qt::Dense5Pattern");
+    dense6Label = new QLabel("Qt::Dense6Pattern");
+    dense7Label = new QLabel("Qt::Dense7Pattern");
+    noLabel = new QLabel("Qt::NoPattern");
+    horLabel = new QLabel("Qt::HorPattern");
+    verLabel = new QLabel("Qt::VerPattern");
+    crossLabel = new QLabel("Qt::CrossPattern");
+    bdiagLabel = new QLabel("Qt::BDiagPattern");
+    fdiagLabel = new QLabel("Qt::FDiagPattern");
+    diagCrossLabel = new QLabel("Qt::DiagCrossPattern");
+    linearLabel = new QLabel("Qt::LinearGradientPattern");
+    radialLabel = new QLabel("Qt::RadialGradientPattern");
+    conicalLabel = new QLabel("Qt::ConicalGradientPattern");
+    textureLabel = new QLabel("Qt::TexturePattern");
+
+    QGridLayout *layout = new QGridLayout;
+    layout->addWidget(solid, 0, 0);
+    layout->addWidget(dense1, 0, 1);
+    layout->addWidget(dense2, 0, 2);
+    layout->addWidget(solidLabel, 1, 0);
+    layout->addWidget(dense1Label, 1, 1);
+    layout->addWidget(dense2Label, 1, 2);
+
+    layout->addWidget(dense3, 2, 0 );
+    layout->addWidget(dense4, 2, 1);
+    layout->addWidget(dense5, 2, 2);
+    layout->addWidget(dense3Label, 3, 0);
+    layout->addWidget(dense4Label, 3, 1);
+    layout->addWidget(dense5Label, 3, 2);
+
+    layout->addWidget(dense6, 4, 0);
+    layout->addWidget(dense7, 4, 1);
+    layout->addWidget(no, 4, 2);
+    layout->addWidget(dense6Label, 5, 0);
+    layout->addWidget(dense7Label, 5, 1);
+    layout->addWidget(noLabel, 5, 2);
+
+    layout->addWidget(hor, 6, 0);
+    layout->addWidget(ver, 6, 1);
+    layout->addWidget(cross, 6, 2);
+    layout->addWidget(horLabel, 7, 0);
+    layout->addWidget(verLabel, 7, 1);
+    layout->addWidget(crossLabel, 7, 2);
+
+    layout->addWidget(bdiag, 8, 0);
+    layout->addWidget(fdiag, 8, 1);
+    layout->addWidget(diagCross, 8, 2);
+    layout->addWidget(bdiagLabel, 9, 0);
+    layout->addWidget(fdiagLabel, 9, 1);
+    layout->addWidget(diagCrossLabel, 9, 2);
+
+    layout->addWidget(linear, 10, 0);
+    layout->addWidget(radial, 10, 1);
+    layout->addWidget(conical, 10, 2);
+    layout->addWidget(linearLabel, 11, 0);
+    layout->addWidget(radialLabel, 11, 1);
+    layout->addWidget(conicalLabel, 11, 2);
+
+    layout->addWidget(texture, 12, 0, 1, 3);
+    layout->addWidget(textureLabel, 13, 0, 1, 3);
+
+    setLayout(layout);
+
+    QPalette newPalette = palette();
+    newPalette.setColor(QPalette::Window, Qt::white);
+    setPalette(newPalette);
+
+    setWindowTitle(tr("Brush Styles"));
+    resize(430, 605);
+}
+
+
diff --git a/doc/src/snippets/brushstyles/stylewidget.h b/doc/src/snippets/brushstyles/stylewidget.h
new file mode 100644
index 0000000000..c5c3f0278b
--- /dev/null
+++ b/doc/src/snippets/brushstyles/stylewidget.h
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef STYLEWIDGET_H
+#define STYLEWIDGET_H
+
+#include <QWidget>
+#include <QPainterPath>
+#include "renderarea.h"
+
+class QLabel;
+
+class StyleWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    StyleWidget(QWidget *parent = 0);
+
+private:
+    RenderArea *solid;
+    RenderArea *dense1;
+    RenderArea *dense2;
+    RenderArea *dense3;
+    RenderArea *dense4;
+    RenderArea *dense5;
+    RenderArea *dense6;
+    RenderArea *dense7;
+    RenderArea *no;
+    RenderArea *hor;
+    RenderArea *ver;
+    RenderArea *cross;
+    RenderArea *bdiag;
+    RenderArea *fdiag;
+    RenderArea *diagCross;
+    RenderArea *linear;
+    RenderArea *radial;
+    RenderArea *conical;
+    RenderArea *texture;
+
+    QLabel *solidLabel;
+    QLabel *dense1Label;
+    QLabel *dense2Label;
+    QLabel *dense3Label;
+    QLabel *dense4Label;
+    QLabel *dense5Label;
+    QLabel *dense6Label;
+    QLabel *dense7Label;
+    QLabel *noLabel;
+    QLabel *horLabel;
+    QLabel *verLabel;
+    QLabel *crossLabel;
+    QLabel *bdiagLabel;
+    QLabel *fdiagLabel;
+    QLabel *diagCrossLabel;
+    QLabel *linearLabel;
+    QLabel *radialLabel;
+    QLabel *conicalLabel;
+    QLabel *textureLabel;
+};
+#endif
diff --git a/doc/src/snippets/buffer/buffer.cpp b/doc/src/snippets/buffer/buffer.cpp
new file mode 100644
index 0000000000..3df2ed02fb
--- /dev/null
+++ b/doc/src/snippets/buffer/buffer.cpp
@@ -0,0 +1,125 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QBuffer>
+#include <QPalette>
+
+static void main_snippet()
+{
+//! [0]
+    QBuffer buffer;
+    char ch;
+
+    buffer.open(QBuffer::ReadWrite);
+    buffer.write("Qt rocks!");
+    buffer.seek(0);
+    buffer.getChar(&ch);  // ch == 'Q'
+    buffer.getChar(&ch);  // ch == 't'
+    buffer.getChar(&ch);  // ch == ' '
+    buffer.getChar(&ch);  // ch == 'r'
+//! [0]
+}
+
+static void write_datastream_snippets()
+{
+//! [1]
+    QByteArray byteArray;
+    QBuffer buffer(&byteArray);
+    buffer.open(QIODevice::WriteOnly);
+
+    QDataStream out(&buffer);
+    out << QApplication::palette();
+//! [1]
+}
+
+static void read_datastream_snippets()
+{
+    QByteArray byteArray;
+
+//! [2]
+    QPalette palette;
+    QBuffer buffer(&byteArray);
+    buffer.open(QIODevice::ReadOnly);
+
+    QDataStream in(&buffer);
+    in >> palette;
+//! [2]
+}
+
+static void bytearray_ptr_ctor_snippet()
+{
+//! [3]
+    QByteArray byteArray("abc");
+    QBuffer buffer(&byteArray);
+    buffer.open(QIODevice::WriteOnly);
+    buffer.seek(3);
+    buffer.write("def", 3);
+    buffer.close();
+    // byteArray == "abcdef"
+//! [3]
+}
+
+static void setBuffer_snippet()
+{
+//! [4]
+    QByteArray byteArray("abc");
+    QBuffer buffer;
+    buffer.setBuffer(&byteArray);
+    buffer.open(QIODevice::WriteOnly);
+    buffer.seek(3);
+    buffer.write("def", 3);
+    buffer.close();
+    // byteArray == "abcdef"
+//! [4]
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    main_snippet();
+    bytearray_ptr_ctor_snippet();
+    write_datastream_snippets();
+    read_datastream_snippets();
+    setBuffer_snippet();
+    return 0;
+}
diff --git a/doc/src/snippets/buffer/buffer.pro b/doc/src/snippets/buffer/buffer.pro
new file mode 100644
index 0000000000..87eab9fb03
--- /dev/null
+++ b/doc/src/snippets/buffer/buffer.pro
@@ -0,0 +1,14 @@
+######################################################################
+# Automatically generated by qmake (1.08a) Tue Jan 4 13:19:41 2005
+######################################################################
+
+TEMPLATE = app
+CONFIG -= moc
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += buffer.cpp
+CONFIG += qt warn_on debug  create_prl link_prl
+OBJECTS_DIR=.obj/debug-shared
+MOC_DIR=.moc/debug-shared
diff --git a/doc/src/snippets/clipboard/clipboard.pro b/doc/src/snippets/clipboard/clipboard.pro
new file mode 100644
index 0000000000..a26fea6b57
--- /dev/null
+++ b/doc/src/snippets/clipboard/clipboard.pro
@@ -0,0 +1,3 @@
+HEADERS     = clipwindow.h
+SOURCES     = clipwindow.cpp \
+              main.cpp
diff --git a/doc/src/snippets/clipboard/clipwindow.cpp b/doc/src/snippets/clipboard/clipwindow.cpp
new file mode 100644
index 0000000000..e0eb38387f
--- /dev/null
+++ b/doc/src/snippets/clipboard/clipwindow.cpp
@@ -0,0 +1,104 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "clipwindow.h"
+
+ClipWindow::ClipWindow(QWidget *parent)
+    : QMainWindow(parent)
+{
+    clipboard = QApplication::clipboard();
+
+    QWidget *centralWidget = new QWidget(this);
+    QWidget *currentItem = new QWidget(centralWidget);
+    QLabel *mimeTypeLabel = new QLabel(tr("MIME types:"), currentItem);
+    mimeTypeCombo = new QComboBox(currentItem);
+    QLabel *dataLabel = new QLabel(tr("Data:"), currentItem);
+    dataInfoLabel = new QLabel("", currentItem);
+
+    previousItems = new QListWidget(centralWidget);
+
+//! [0]
+    connect(clipboard, SIGNAL(dataChanged()), this, SLOT(updateClipboard()));
+//! [0]
+    connect(mimeTypeCombo, SIGNAL(activated(const QString &)),
+            this, SLOT(updateData(const QString &)));
+
+    QVBoxLayout *currentLayout = new QVBoxLayout(currentItem);
+    currentLayout->addWidget(mimeTypeLabel);
+    currentLayout->addWidget(mimeTypeCombo);
+    currentLayout->addWidget(dataLabel);
+    currentLayout->addWidget(dataInfoLabel);
+    currentLayout->addStretch(1);
+
+    QHBoxLayout *mainLayout = new QHBoxLayout(centralWidget);
+    mainLayout->addWidget(currentItem, 1);
+    mainLayout->addWidget(previousItems);
+
+    setCentralWidget(centralWidget);
+    setWindowTitle(tr("Clipboard"));
+}
+
+//! [1]
+void ClipWindow::updateClipboard()
+{
+    QStringList formats = clipboard->mimeData()->formats();
+    QByteArray data = clipboard->mimeData()->data(format);
+//! [1]
+
+    mimeTypeCombo->clear();
+    mimeTypeCombo->insertStringList(formats);
+
+    int size = clipboard->mimeData()->data(formats[0]).size();
+    QListWidgetItem *newItem = new QListWidgetItem(previousItems);
+    newItem->setText(tr("%1 (%2 bytes)").arg(formats[0]).arg(size));
+
+    updateData(formats[0]);
+//! [2]
+}
+//! [2]
+
+void ClipWindow::updateData(const QString &format)
+{
+    QByteArray data = clipboard->mimeData()->data(format);
+    dataInfoLabel->setText(tr("%1 bytes").arg(data.size()));
+}
diff --git a/doc/src/snippets/clipboard/clipwindow.h b/doc/src/snippets/clipboard/clipwindow.h
new file mode 100644
index 0000000000..ab3b6544ac
--- /dev/null
+++ b/doc/src/snippets/clipboard/clipwindow.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CLIPWINDOW_H
+#define CLIPWINDOW_H
+
+#include <QMainWindow>
+
+class QClipboard;
+class QComboBox;
+class QLabel;
+class QListWidget;
+class QMimeData;
+class QWidget;
+
+class ClipWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    ClipWindow(QWidget *parent = 0);
+
+public slots:
+    void updateClipboard();
+    void updateData(const QString &format);
+
+private:
+    int currentItem;
+    QClipboard *clipboard;
+    QComboBox *mimeTypeCombo;
+    QLabel *dataInfoLabel;
+    QListWidget *previousItems;
+};
+
+#endif
diff --git a/doc/src/snippets/clipboard/main.cpp b/doc/src/snippets/clipboard/main.cpp
new file mode 100644
index 0000000000..7947ff1aff
--- /dev/null
+++ b/doc/src/snippets/clipboard/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "clipwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    ClipWindow *window = new ClipWindow;
+    window->resize(640, 480);
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/code/doc.src.qtscripttools.qdoc b/doc/src/snippets/code/doc.src.qtscripttools.qdoc
new file mode 100644
index 0000000000..c691f177eb
--- /dev/null
+++ b/doc/src/snippets/code/doc.src.qtscripttools.qdoc
@@ -0,0 +1,8 @@
+//! [0]
+      #include <QtScriptTools>
+//! [0]
+
+
+//! [1]
+      QT += scripttools
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_activeqt-dumpcpp.qdoc b/doc/src/snippets/code/doc_src_activeqt-dumpcpp.qdoc
new file mode 100644
index 0000000000..df1d5425a5
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_activeqt-dumpcpp.qdoc
@@ -0,0 +1,25 @@
+//! [0]
+Outlook::Application *outlook = new Outlook::Application;
+//! [0]
+
+
+//! [1]
+Outlook::_NameSpace *session = outlook->Session();
+//! [1]
+
+
+//! [2]
+Outlook::NameSpace *session = outlook->Session();
+//! [2]
+
+
+//! [3]
+Outlook::_NameSpace *tmp = outlook->Session();
+Outlook::NameSpace *session = new Outlook::NameSpace(tmp);
+delete tmp; // or any other use of tmp: segfault
+//! [3]
+
+
+//! [4]
+Outlook::NameSpace *session = new Outlook::NameSpace(outlook->Session()); 
+//! [4]
diff --git a/doc/src/snippets/code/doc_src_appicon.qdoc b/doc/src/snippets/code/doc_src_appicon.qdoc
new file mode 100644
index 0000000000..c8883fe388
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_appicon.qdoc
@@ -0,0 +1,23 @@
+//! [0]
+IDI_ICON1               ICON    DISCARDABLE     "myappico.ico"
+//! [0]
+
+
+//! [1]
+RC_FILE = myapp.rc
+//! [1]
+
+
+//! [2]
+ICON = myapp.icns
+//! [2]
+
+
+//! [3]
+kde-config --path icon
+//! [3]
+
+
+//! [4]
+gnome-config --datadir
+//! [4]
diff --git a/doc/src/snippets/code/doc_src_assistant-manual.qdoc b/doc/src/snippets/code/doc_src_assistant-manual.qdoc
new file mode 100644
index 0000000000..383bd618ea
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_assistant-manual.qdoc
@@ -0,0 +1,110 @@
+//! [0]
+assistant -collectionFile file
+//! [0]
+
+
+//! [1]
+<?xml version="1.0" encoding="utf-8" ?>
+<QHelpCollectionProject version="1.0">
+    <assistant>
+        <title>My Application Help</title>
+        <startPage>qthelp://com.mycompany.1_0_0/doc/index.html</startPage>
+        <currentFilter>myfilter</currentFilter>
+        <applicationIcon>application.png</applicationIcon>
+        <enableFilterFunctionality>false</enableFilterFunctionality>
+        <enableDocumentationManager>false</enableDocumentationManager>
+        <enableAddressBar visible="true">true</enableAddressBar>
+        <cacheDirectory>mycompany/myapplication</cacheDirectory>
+        <aboutMenuText>
+            <text>About My Application</text>
+            <text language="de">Über meine Applikation...</text>
+        </aboutMenuText>
+        <aboutDialog>
+            <file>about.txt</file>
+            <file language="de">ueber.txt</file>
+            <icon>about.png</icon>
+        </aboutDialog>
+    </assistant>
+    <docFiles>
+        <generate>
+            <file>
+                <input>myapplication-manual.qhp</input>
+                <output>myapplication-manual.qch</output>
+            </file>
+        </generate>
+        <register>
+            <file>myapplication-manual.qch</file>
+        </register>
+    </docFiles>
+</QHelpCollectionProject>
+//! [1]
+
+
+//! [2]
+QProcess *process = new QProcess;
+QStringList args;
+args << QLatin1String("-collectionFile")
+    << QLatin1String("mycollection.qhc")
+    << QLatin1String("-enableRemoteControl");
+process->start(QLatin1String("assistant"), args);
+if (!process->waitForStarted())
+    return;
+//! [2]
+
+
+//! [3]
+QByteArray ba;
+ba.append("setSource qthelp://com.mycompany.1_0_0/doc/index.html");
+ba.append('\0');
+process->write(ba);
+//! [3]
+
+
+//! [4]
+QByteArray ba;
+ba.append("hide bookmarks;");
+ba.append("hide index;");
+ba.append("setSource qthelp://com.mycompany.1_0_0/doc/index.html");
+ba.append('\0');
+process->write(ba);
+//! [4]
+
+//! [5]
+<?xml version="1.0" encoding="utf-8" ?>
+<QHelpCollectionProject version="1.0">
+    ...
+    <docFiles>
+        <register>
+            <file>myapplication-manual.qch</file>
+            <file>another-manual.qch</file>
+        </register>
+    </docFiles>
+</QHelpCollectionProject>
+//! [5]
+
+//! [6]
+assistant -collectionFile mycollection.qhc -register myapplication-manual.qch
+//! [6]
+
+//! [7]
+<?xml version="1.0" encoding="utf-8" ?>
+<QHelpCollectionProject version="1.0">
+    <assistant>
+        <title>My Application Help</title>
+        <cacheDirectory>mycompany/myapplication</cacheDirectory>
+        ...
+    </assistant>
+</QHelpCollectionProject>
+//! [7]
+
+//! [8]
+assistant -collectionFile mycollection.qhc
+//! [8]
+
+//! [9]
+%QDesktopServices::DataLocation%/mycompany/myapplication/mycollection.qhc
+//! [9]
+
+//! [10]
+qcollectiongenerator mycollection.qhcp -o mycollection.qhc
+//! [10]
diff --git a/doc/src/snippets/code/doc_src_atomic-operations.qdoc b/doc/src/snippets/code/doc_src_atomic-operations.qdoc
new file mode 100644
index 0000000000..acda5e4135
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_atomic-operations.qdoc
@@ -0,0 +1,71 @@
+//! [0]
+if (*ptr == expected) {
+    *ptr = newval;
+    return !0;
+}
+return 0;
+//! [0]
+
+
+//! [1]
+if (*ptr == expected) {
+    *ptr = newval;
+    return !0;
+}
+return 0;
+//! [1]
+
+
+//! [2]
+++(*ptr);
+return *ptr ? !0 : 0;
+//! [2]
+
+
+//! [3]
+return ++(*ptr);
+//! [3]
+
+
+//! [4]
+++(*ptr);
+return !(ControlRegister & ZeroFlag);
+//! [4]
+
+
+//! [5]
+--(*ptr);
+return *ptr ?  : 0;
+//! [5]
+
+
+//! [6]
+return --(*ptr);
+//! [6]
+
+
+//! [7]
+--(*ptr);
+return !(ControlRegister & ZeroFlag);
+//! [7]
+
+
+//! [8]
+tmp = *ptr;
+*ptr = newval;
+return tmp;
+//! [8]
+
+
+//! [9]
+tmp = *ptr;
+*ptr = newval;
+return tmp;
+//! [9]
+
+
+//! [10]
+tmp = *ptr;
+*ptr += value;
+return tmp;
+//! [10]
diff --git a/doc/src/snippets/code/doc_src_compiler-notes.qdoc b/doc/src/snippets/code/doc_src_compiler-notes.qdoc
new file mode 100644
index 0000000000..12095d0c3c
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_compiler-notes.qdoc
@@ -0,0 +1,8 @@
+//! [0]
+QTDIR=C:\Progra~1\Qt
+//! [0]
+
+
+//! [1]
+/usr/vacpp/bin/makeC++SharedLib -o shr1.o cplussource1.o
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_containers.qdoc b/doc/src/snippets/code/doc_src_containers.qdoc
new file mode 100644
index 0000000000..9d6ba8dbb7
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_containers.qdoc
@@ -0,0 +1,235 @@
+//! [0]
+class Employee
+{
+public:
+    Employee() {}
+    Employee(const Employee &other);
+
+    Employee &operator=(const Employee &other);
+
+private:
+    QString myName;
+    QDate myDateOfBirth;
+};
+//! [0]
+
+
+//! [1]
+QList<QString> list;
+list << "A" << "B" << "C" << "D";
+
+QListIterator<QString> i(list);
+while (i.hasNext())
+    qDebug() << i.next();
+//! [1]
+
+
+//! [2]
+QListIterator<QString> i(list);
+i.toBack();
+while (i.hasPrevious())
+    qDebug() << i.previous();
+//! [2]
+
+
+//! [3]
+QMutableListIterator<int> i(list);
+while (i.hasNext()) {
+    if (i.next() % 2 != 0)
+        i.remove();
+}
+//! [3]
+
+
+//! [4]
+QMutableListIterator<int> i(list);
+i.toBack();
+while (i.hasPrevious()) {
+    if (i.previous() % 2 != 0)
+        i.remove();
+}
+//! [4]
+
+
+//! [5]
+QMutableListIterator<int> i(list);
+while (i.hasNext()) {
+    if (i.next() > 128)
+        i.setValue(128);
+}
+//! [5]
+
+
+//! [6]
+QMutableListIterator<int> i(list);
+while (i.hasNext())
+    i.next() *= 2;
+//! [6]
+
+
+//! [7]
+QMap<QString, QString> map;
+map.insert("Paris", "France");
+map.insert("Guatemala City", "Guatemala");
+map.insert("Mexico City", "Mexico");
+map.insert("Moscow", "Russia");
+...
+
+QMutableMapIterator<QString, QString> i(map);
+while (i.hasNext()) {
+    if (i.next().key().endsWith("City"))
+        i.remove();
+}
+//! [7]
+
+
+//! [8]
+QMap<int, QWidget *> map;
+QHash<int, QWidget *> hash;
+
+QMapIterator<int, QWidget *> i(map);
+while (i.hasNext()) {
+    i.next();
+    hash.insert(i.key(), i.value());
+}
+//! [8]
+
+
+//! [9]
+QMutableMapIterator<int, QWidget *> i(map);
+while (i.findNext(widget))
+    i.remove();
+//! [9]
+
+
+//! [10]
+QList<QString> list;
+list << "A" << "B" << "C" << "D";
+
+QList<QString>::iterator i;
+for (i = list.begin(); i != list.end(); ++i)
+    *i = (*i).toLower();
+//! [10]
+
+
+//! [11]
+QList<QString> list;
+list << "A" << "B" << "C" << "D";
+
+QList<QString>::iterator i = list.end();
+while (i != list.begin()) {
+    --i;
+    *i = (*i).toLower();
+}
+//! [11]
+
+
+//! [12]
+QList<QString>::const_iterator i;
+for (i = list.constBegin(); i != list.constEnd(); ++i)
+    qDebug() << *i;
+//! [12]
+
+
+//! [13]
+QMap<int, int> map;
+...
+QMap<int, int>::const_iterator i;
+for (i = map.constBegin(); i != map.constEnd(); ++i)
+    qDebug() << i.key() << ":" << i.value();
+//! [13]
+
+
+//! [14]
+// RIGHT
+const QList<int> sizes = splitter->sizes();
+QList<int>::const_iterator i;
+for (i = sizes.begin(); i != sizes.end(); ++i)
+    ...
+
+// WRONG
+QList<int>::const_iterator i;
+for (i = splitter->sizes().begin();
+        i != splitter->sizes().end(); ++i)
+    ...
+//! [14]
+
+
+//! [15]
+QLinkedList<QString> list;
+...
+QString str;
+foreach (str, list)
+    qDebug() << str;
+//! [15]
+
+
+//! [16]
+QLinkedList<QString> list;
+...
+QLinkedListIterator<QString> i(list);
+while (i.hasNext())
+    qDebug() << i.next();
+//! [16]
+
+
+//! [17]
+QLinkedList<QString> list;
+...
+foreach (QString str, list)
+    qDebug() << str;
+//! [17]
+
+
+//! [18]
+QLinkedList<QString> list;
+...
+foreach (QString str, list) {
+    if (str.isEmpty())
+        break;
+    qDebug() << str;
+}
+//! [18]
+
+
+//! [19]
+QMap<QString, int> map;
+...
+foreach (QString str, map.keys())
+    qDebug() << str << ":" << map.value(str);
+//! [19]
+
+
+//! [20]
+QMultiMap<QString, int> map;
+...
+foreach (QString str, map.uniqueKeys()) {
+    foreach (int i, map.values(str))
+        qDebug() << str << ":" << i;
+}
+//! [20]
+
+
+//! [21]
+forever {
+    ...
+}
+//! [21]
+
+
+//! [22]
+CONFIG += no_keywords
+//! [22]
+
+
+//! [23]
+QString onlyLetters(const QString &in)
+{
+    QString out;
+    for (int j = 0; j < in.size(); ++j) {
+        if (in[j].isLetter())
+            out += in[j];
+    }
+    return out;
+}
+//! [23]
diff --git a/doc/src/snippets/code/doc_src_coordsys.qdoc b/doc/src/snippets/code/doc_src_coordsys.qdoc
new file mode 100644
index 0000000000..4674e753b3
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_coordsys.qdoc
@@ -0,0 +1,47 @@
+//! [0]
+QPainter painter(this);
+
+painter.setPen(Qt::darkGreen);
+painter.drawRect(1, 2, 6, 4);
+//! [0]
+
+
+//! [1]
+QPainter painter(this);
+
+painter.setPen(Qt::darkGreen);
+painter.drawLine(2, 7, 6, 1);
+//! [1]
+
+
+//! [2]
+QPainter painter(this);
+painter.setRenderHint(
+    QPainter::Antialiasing);
+painter.setPen(Qt::darkGreen);
+painter.drawRect(1, 2, 6, 4);
+//! [2]
+
+
+//! [3]
+QPainter painter(this);
+painter.setRenderHint(
+    QPainter::Antialiasing);
+painter.setPen(Qt::darkGreen);
+painter.drawLine(2, 7, 6, 1);
+//! [3]
+
+
+//! [4]
+QPainter painter(this);
+painter.setWindow(QRect(-50, -50, 100, 100));
+//! [4]
+
+
+//! [5]
+int side = qMin(width(), height())
+int x = (width() - side / 2);
+int y = (height() - side / 2);
+
+painter.setViewport(x, y, side, side);
+//! [5]
diff --git a/doc/src/snippets/code/doc_src_debug.qdoc b/doc/src/snippets/code/doc_src_debug.qdoc
new file mode 100644
index 0000000000..0e8a1c52d1
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_debug.qdoc
@@ -0,0 +1,24 @@
+//! [0]
+qDebug() << "Widget" << widget << "at position" << widget->pos();
+//! [0]
+
+
+//! [1]
+char *alloc(int size)
+{
+    Q_ASSERT(size > 0);
+    char *ptr = new char[size];
+    Q_CHECK_PTR(ptr);
+    return ptr;
+}
+//! [1]
+
+
+//! [2]
+char *alloc(int size)
+{
+    char *ptr;
+    Q_CHECK_PTR(ptr = new char[size]);  // WRONG
+    return ptr;
+}
+//! [2]
diff --git a/doc/src/snippets/code/doc_src_deployment.qdoc b/doc/src/snippets/code/doc_src_deployment.qdoc
new file mode 100644
index 0000000000..b8bf57106d
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_deployment.qdoc
@@ -0,0 +1,414 @@
+//! [0]
+cd /path/to/Qt
+./configure -static -prefix /path/to/Qt <other parameters>
+make sub-src
+//! [0]
+
+
+//! [1]
+cd /path/to/Qt/examples/tools/plugandpaint
+//! [1]
+
+
+//! [2]
+make clean
+PATH=/path/to/Qt/bin:$PATH
+export PATH
+qmake -config release
+make
+//! [2]
+
+
+//! [3]
+ldd ./application
+//! [3]
+
+
+//! [4]
+cd /path/to/Qt/examples/tools/plugandpaint
+//! [4]
+
+
+//! [5]
+make clean
+qmake -config release
+make
+//! [5]
+
+
+//! [6]
+cd ../plugandpaintplugins
+make clean
+qmake -config release
+make
+//! [6]
+
+
+//! [7]
+#!/bin/sh
+appname=`basename $0 | sed s,\.sh$,,`
+
+dirname=`dirname $0`
+tmp="${dirname#?}"
+
+if [ "${dirname%$tmp}" != "/" ]; then
+dirname=$PWD/$dirname
+fi
+LD_LIBRARY_PATH=$dirname
+export LD_LIBRARY_PATH
+$dirname/$appname $*
+//! [7]
+
+
+//! [8]
+DESTDIR = /path/to/Qt/plugandpaint/plugins
+//! [8]
+
+
+//! [9]
+qApp->addLibraryPath("/some/other/path");
+//! [9]
+
+
+//! [10]
+ldd ./application
+//! [10]
+
+
+//! [11]
+cd C:\path\to\Qt
+configure -static <any other options you need>
+//! [11]
+
+
+//! [12]
+nmake sub-src
+//! [12]
+
+
+//! [13]
+cd examples\tools\plugandpaint
+//! [13]
+
+
+//! [14]
+nmake clean
+qmake -config release
+nmake
+//! [14]
+
+
+//! [15]
+cd examples\tools\plugandpaint
+//! [15]
+
+
+//! [16]
+nmake clean
+qmake -config release
+nmake
+//! [16]
+
+
+//! [17]
+cd ..\plugandpaintplugins
+nmake clean
+qmake -config release
+nmake
+//! [17]
+
+
+//! [18]
+plugins\pnp_basictools.dll
+plugins\pnp_extrafilters.dll
+//! [18]
+
+
+//! [19]
+qApp->addLibraryPath("C:\some\other\path");
+//! [19]
+
+
+//! [20]
+embed_manifest_dll
+embed_manifest_exe
+//! [20]
+
+
+//! [21]
+CONFIG += embed_manifest_exe
+//! [21]
+
+
+//! [22]
+<Visual Studio Install Path>\VC\redist\<Architecture>\Microsoft.VC80.CRT
+//! [22]
+
+
+//! [23]
+CONFIG-=embed_manifest_dll
+//! [23]
+
+
+//! [24]
+depends <application executable>
+//! [24]
+
+
+//! [25]
+C:<path to Qt>\plugins
+//! [25]
+
+
+//! [26]
+CONFIG-=app_bundle
+//! [26]
+
+
+//! [27]
+cd /path/to/Qt
+./configure -static <other parameters>
+make sub-src
+//! [27]
+
+
+//! [28]
+cd /path/to/Qt/examples/tools/plugandpaint
+//! [28]
+
+
+//! [29]
+make clean
+qmake -config release
+make
+//! [29]
+
+
+//! [30]
+otool -L plugandpaint.app/Contents/MacOs/plugandpaint
+//! [30]
+
+
+//! [31]
+plugandpaint.app/Contents/MacOS/plugandpaint:
+/System/Library/Frameworks/Carbon.framework/Versions/A/Carbon
+        (compatibility version 2.0.0, current version 128.0.0)
+/System/Library/Frameworks/QuickTime.framework/Versions/A/QuickTime
+        (compatibility version 1.0.0, current version 10.0.0)
+/usr/lib/libz.1.dylib
+        (compatibility version 1.0.0, current version 1.2.3)
+/System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices
+        (compatibility version 1.0.0, current version 22.0.0)
+/usr/lib/libstdc++.6.dylib
+        (compatibility version 7.0.0, current version 7.3.0)
+/usr/lib/libgcc_s.1.dylib
+        (compatibility version 1.0.0, current version 1.0.0)
+/usr/lib/libmx.A.dylib
+        (compatibility version 1.0.0, current version 92.0.0)
+/usr/lib/libSystem.B.dylib
+        (compatibility version 1.0.0, current version 88.0.0)
+//! [31]
+
+
+//! [32]
+-lQtGui
+//! [32]
+
+
+//! [33]
+/where/static/qt/lib/is/libQtGui.a
+//! [33]
+
+
+//! [34]
+cd /path/to/Qt/examples/tools/plugandpaint
+//! [34]
+
+
+//! [35]
+make clean
+qmake -config release
+make
+//! [35]
+
+
+//! [36]
+cd ../plugandpaintplugins
+make clean
+qmake -config release
+make
+//! [36]
+
+
+//! [37]
+otool -L QtGui.framework/QtGui
+//! [37]
+
+
+//! [38]
+QtGui.framework/QtGui:
+/path/to/Qt/lib/QtGui.framework/Versions/4.0/QtGui
+        (compatibility version 4.0.0, current version 4.0.1)
+/System/Library/Frameworks/Carbon.framework/Versions/A/Carbon
+        (compatibility version 2.0.0, current version 128.0.0)
+/System/Library/Frameworks/QuickTime.framework/Versions/A/QuickTime
+        (compatibility version 1.0.0, current version 10.0.0)
+/path/to/Qt/QtCore.framework/Versions/4.0/QtCore
+        (compatibility version 4.0.0, current version 4.0.1)
+/usr/lib/libz.1.dylib
+        (compatibility version 1.0.0, current version 1.2.3)
+/System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices
+        (compatibility version 1.0.0, current version 22.0.0)
+/usr/lib/libstdc++.6.dylib
+        (compatibility version 7.0.0, current version 7.3.0)
+/usr/lib/libgcc_s.1.dylib
+        (compatibility version 1.0.0, current version 1.0.0)
+/usr/lib/libmx.A.dylib
+        (compatibility version 1.0.0, current version 92.0.0)
+/usr/lib/libSystem.B.dylib
+        (compatibility version 1.0.0, current version 88.0.0)
+//! [38]
+
+
+//! [39]
+mkdir plugandpaint.app/Contents/Frameworks
+cp -R /path/to/Qt/lib/QtCore.framework
+        plugandpaint.app/Contents/Frameworks
+cp -R /path/to/Qt/lib/QtGui.framework
+       plugandpaint.app/Contents/Frameworks
+//! [39]
+
+
+//! [40]
+install_name_tool -id @executable_path/../Frameworks/QtCore.framework/Versions/4.0/QtCore
+       plugandpaint.app/Contents/Frameworks/QtCore.framework/Versions/4.0/QtCore
+install_name_tool -id @executable_path/../Frameworks/QtGui.framework/Versions/4.0/QtGui
+       plugandpaint.app/Contents/Frameworks/QtGui.framework/Versions/4.0/QtGui
+//! [40]
+
+
+//! [41]
+install_name_tool -change path/to/Qt/lib/QtCore.framework/Versions/4.0/QtCore
+        @executable_path/../Frameworks/QtCore.framework/Versions/4.0/QtCore
+        plugandpaint.app/Contents/MacOs/plugandpaint
+install_name_tool -change path/to/qt/lib/QtGui.framework/Versions/4.0/QtGui
+        @executable_path/../Frameworks/QtGui.framework/Versions/4.0/QtGui
+        plugandpaint.app/Contents/MacOs/plugandpaint
+//! [41]
+
+
+//! [42]
+install_name_tool -change path/to/Qt/lib/QtCore.framework/Versions/4.0/QtCore
+        @executable_path/../Frameworks/QtCore.framework/Versions/4.0/QtCore
+        plugandpaint.app/Contents/Frameworks/QtGui.framework/Versions/4.0/QtGui
+//! [42]
+
+
+//! [43]
+mv plugins plugandpaint.app/Contents
+//! [43]
+
+
+//! [44]
+libpnp_basictools.dylib:
+libpnp_basictools.dylib
+       (compatibility version 0.0.0, current version 0.0.0)
+/path/to/Qt/lib/QtGui.framework/Versions/4.0/QtGui
+       (compatibility version 4.0.0, current version 4.0.1)
+/System/Library/Frameworks/Carbon.framework/Versions/A/Carbon
+       (compatibility version 2.0.0, current version 128.0.0)
+/System/Library/Frameworks/QuickTime.framework/Versions/A/QuickTime
+       (compatibility version 1.0.0, current version 10.0.0)
+/path/to/Qt/lib/QtCore.framework/Versions/4.0/QtCore
+       (compatibility version 4.0.0, current version 4.0.1)
+/usr/lib/libz.1.dylib
+       (compatibility version 1.0.0, current version 1.2.3)
+/System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices
+       (compatibility version 1.0.0, current version 22.0.0)
+/usr/lib/libstdc++.6.dylib
+       (compatibility version 7.0.0, current version 7.3.0)
+/usr/lib/libgcc_s.1.dylib
+       (compatibility version 1.0.0, current version 1.0.0)
+/usr/lib/libmx.A.dylib
+       (compatibility version 1.0.0, current version 92.0.0)
+/usr/lib/libSystem.B.dylib
+       (compatibility version 1.0.0, current version 88.0.0)
+//! [44]
+
+
+//! [45]
+install_name_tool -change /path/to/Qt/lib/QtCore.framework/Versions/4.0/QtCore
+        @executable_path/../Frameworks/QtCore.framework/Versions/4.0/QtCore
+        plugandpaint.app/Contents/plugins/libpnp_basictools.dylib
+install_name_tool -change /path/to/Qt/lib/QtGui.framework/Versions/4.0/QtGui
+        @executable_path/../Frameworks/QtGui.framework/Versions/4.0/QtGui
+        plugandpaint.app/Contents/plugins/libpnp_basictools.dylib
+//! [45]
+
+
+//! [46]
+#elif defined(Q_OS_MAC)
+if (pluginsDir.dirName() == "MacOS") {
+    pluginsDir.cdUp();
+}
+#endif
+//! [46]
+
+
+//! [47]
+cp -R /path/to/Qt/plugins/imageformats
+        pluginandpaint.app/Contents/plugins
+//! [47]
+
+
+//! [48]
+install_name_tool -change /path/to/Qt/lib/QtGui.framework/Versions/4.0/QtGui
+        @executable_path/../Frameworks/QtGui.framework/Versions/4.0/QtGui
+        plugandpaint.app/Contents/plugins/imageformats/libqjpeg.dylib
+install_name_tool -change /path/to/Qt/lib/QtCore.framework/Versions/4.0/QtCore
+        @executable_path/../Frameworks/QtCore.framework/Versions/4.0/QtCore
+        plugandpaint.app/Contents/plugins/imageformats/libqjpeg.dylib
+//! [48]
+
+
+//! [49]
+QDir dir(QApplication::applicationDirPath());
+dir.cdUp();
+dir.cd("plugins");
+QApplication::setLibraryPaths(QStringList(dir.absolutePath()));
+//! [49]
+
+
+//! [50]
+otool -L MyApp.app/Contents/MacOS/MyApp
+//! [50]
+
+
+//! [51]
+QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3
+//! [51]
+
+//! [51a]
+install_name_tool -change /System/Library/Frameworks/CoreVideo.framework/
+Versions/A/CoreVideo /System/Library/Frameworks/QuartzCore.framework/
+Versions/A/QuartzCore libphonon_qt7.dylib 
+//! [51a]
+
+//! [51b]
+./CONFIGURE - SDK MacOSX10.4u.sdk
+//! [51b]
+
+//! [52]
+./configure (other arguments) -universal -sdk /Developer/SDKs/MacOSX10.4u.sdk
+//! [52]
+
+
+//! [53]
+QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk
+CONFIG+=x86 ppc
+//! [53]
+
+
+//! [54]
+qApp->addLibraryPath("C:/customPath/plugins");
+//! [54]
diff --git a/doc/src/snippets/code/doc_src_designer-manual.qdoc b/doc/src/snippets/code/doc_src_designer-manual.qdoc
new file mode 100644
index 0000000000..6730815345
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_designer-manual.qdoc
@@ -0,0 +1,98 @@
+//! [0]
+CONFIG += uitools
+//! [0]
+
+
+//! [1]
+#include <QtUiTools>
+//! [1]
+
+
+//! [2]
+void on_<object name>_<signal name>(<signal parameters>);
+//! [2]
+
+
+//! [3]
+CONFIG += release
+//! [3]
+
+
+//! [4]
+target.path = $$[QT_INSTALL_PLUGINS]/designer
+INSTALLS += target
+//! [4]
+
+
+//! [5]
+QT += script
+//! [5]
+
+
+//! [6]
+widget.text = 'Hi - I was built ' + new Date().toString();
+//! [6]
+
+
+//! [7]
+class MyExtension: public QObject,
+                   public QdesignerContainerExtension
+{
+    Q_OBJECT
+    Q_INTERFACE(QDesignerContainerExtension)
+
+    ...
+}
+//! [7]
+
+
+//! [8]
+QObject *ANewExtensionFactory::createExtension(QObject *object,
+        const QString &iid, QObject *parent) const
+{
+    if (iid != Q_TYPEID(QDesignerContainerExtension))
+        return 0;
+
+    if (MyCustomWidget *widget = qobject_cast<MyCustomWidget*>
+            (object))
+        return new MyContainerExtension(widget, parent);
+
+    return 0;
+}
+//! [8]
+
+
+//! [9]
+QObject *AGeneralExtensionFactory::createExtension(QObject *object,
+        const QString &iid, QObject *parent) const
+{
+    MyCustomWidget *widget = qobject_cast<MyCustomWidget*>(object);
+
+    if (widget && (iid == Q_TYPEID(QDesignerTaskMenuExtension))) {
+         return new MyTaskMenuExtension(widget, parent);
+
+    } else if (widget && (iid == Q_TYPEID(QDesignerContainerExtension))) {
+        return new MyContainerExtension(widget, parent);
+
+    } else {
+        return 0;
+    }
+}
+//! [9]
+
+
+//! [10]
+void MyPlugin::initialize(QDesignerFormEditorInterface *formEditor)
+{
+    if (initialized)
+        return;
+
+    QExtensionManager *manager = formEditor->extensionManager();
+    Q_ASSERT(manager != 0);
+
+    manager->registerExtensions(new MyExtensionFactory(manager),
+                                Q_TYPEID(QDesignerTaskMenuExtension));
+
+    initialized = true;
+}
+//! [10]
diff --git a/doc/src/snippets/code/doc_src_dnd.qdoc b/doc/src/snippets/code/doc_src_dnd.qdoc
new file mode 100644
index 0000000000..40df804a6b
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_dnd.qdoc
@@ -0,0 +1,34 @@
+//! [0]
+void MyQt3Widget::customStartDragFunction()
+{
+    QDragObject *d = new QTextDrag( myHighlightedText(), this );
+    d->dragCopy();
+    // do NOT delete d.
+}
+//! [0]
+
+
+//! [1]
+void MyQt3Widget::dragEnterEvent(QDragEnterEvent* event)
+{
+    event->accept(
+        QTextDrag::canDecode(event) ||
+        QImageDrag::canDecode(event)
+    );
+}
+//! [1]
+
+
+//! [2]
+void MyQt3Widget::dropEvent(QDropEvent* event)
+{
+    QImage image;
+    QString text;
+
+    if ( QImageDrag::decode(event, image) ) {
+        insertImageAt(image, event->pos());
+    } else if ( QTextDrag::decode(event, text) ) {
+        insertTextAt(text, event->pos());
+    }
+}
+//! [2]
diff --git a/doc/src/snippets/code/doc_src_emb-charinput.qdoc b/doc/src/snippets/code/doc_src_emb-charinput.qdoc
new file mode 100644
index 0000000000..2539e1367e
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_emb-charinput.qdoc
@@ -0,0 +1,20 @@
+//! [0]
+./configure -help
+//! [0]
+
+
+//! [1]
+configure -qt-kbd-s15000
+//! [1]
+
+
+//! [2]
+export QWS_KEYBOARD=<driver>[:<driver specific options>]
+//! [2]
+
+
+//! [3]
+export QWS_KEYBOARD="<driver>[:<driver specific options>]
+        <driver>[:<driver specific options>]
+        <driver>[:<driver specific options>]"
+//! [3]
diff --git a/doc/src/snippets/code/doc_src_emb-crosscompiling.qdoc b/doc/src/snippets/code/doc_src_emb-crosscompiling.qdoc
new file mode 100644
index 0000000000..3791bfc265
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_emb-crosscompiling.qdoc
@@ -0,0 +1,36 @@
+//! [0]
+export PATH=path/to/cross/compiler:$PATH
+//! [0]
+
+
+//! [1]
+./configure -embedded arm -xplatform qws/linux-arm-g++ <other options>
+//! [1]
+
+
+//! [2]
+cp path/to/QtEmbedded/mkspecs/qws/linux-mips-g++/...
+   path/to/QtEmbedded/mkspecs/qws/linux-myarchitecture-g++/...
+//! [2]
+
+
+//! [3]
+cd path/to/QtEmbedded
+./configure -embedded <architecture> -qt-kbd-<keyboarddriver>
+            -qt-mouse-<mousedriver> -qt-gfx-<screendriver>
+//! [3]
+
+
+//! [4]
+cd path/to/QtEmbedded
+./configure  <other options>
+             -L /path/to/libjpeg/libraries -I /path/to/libjpeg/headers
+//! [4]
+
+
+//! [5]
+cd path/to/myApplication
+qmake -project
+qmake
+make
+//! [5]
diff --git a/doc/src/snippets/code/doc_src_emb-envvars.qdoc b/doc/src/snippets/code/doc_src_emb-envvars.qdoc
new file mode 100644
index 0000000000..c242ff3cae
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_emb-envvars.qdoc
@@ -0,0 +1,38 @@
+//! [0]
+export QWS_DISPLAY=<driver>[:<driver specific options>]...
+        [:<display num>]
+//! [0]
+
+
+//! [1]
+export QWS_SIZE=<width>x<height>
+//! [1]
+
+
+//! [2]
+export QWS_MOUSE_PROTO=<driver>[:<driver specific options>]
+//! [2]
+
+
+//! [3]
+export QWS_MOUSE_PROTO="<driver>[:<driver specific options>]
+        <driver>[:<driver specific options>]
+        <driver>[:<driver specific options>]"
+//! [3]
+
+
+//! [4]
+export QWS_MOUSE_PROTO="Vr41xx:press=500:/dev/misc/ts"
+//! [4]
+
+
+//! [5]
+export QWS_KEYBOARD=<driver>[:<driver specific options>]
+//! [5]
+
+
+//! [6]
+export QWS_KEYBOARD="<driver>[:<driver specific options>]
+        <driver>[:<driver specific options>]
+        <driver>[:<driver specific options>]"
+//! [6]
diff --git a/doc/src/snippets/code/doc_src_emb-features.qdoc b/doc/src/snippets/code/doc_src_emb-features.qdoc
new file mode 100644
index 0000000000..e64a0ae42b
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_emb-features.qdoc
@@ -0,0 +1,18 @@
+//! [0]
+configure.exe -D QT_NO_THREAD
+//! [0]
+
+
+//! [1]
+./configure -no-feature-thread
+//! [1]
+
+
+//! [2]
+configure.exe -qconfig myfile
+//! [2]
+
+
+//! [3]
+./configure -qconfig myfile
+//! [3]
diff --git a/doc/src/snippets/code/doc_src_emb-fonts.qdoc b/doc/src/snippets/code/doc_src_emb-fonts.qdoc
new file mode 100644
index 0000000000..b39cb6f19c
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_emb-fonts.qdoc
@@ -0,0 +1,3 @@
+//! [0]
+name file renderer italic weight size flags
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_emb-install.qdoc b/doc/src/snippets/code/doc_src_emb-install.qdoc
new file mode 100644
index 0000000000..fe536149d7
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_emb-install.qdoc
@@ -0,0 +1,37 @@
+//! [0]
+cd <anywhere>
+gunzip qt-embedded-linux-commercial-src-%VERSION%.tar.gz
+tar xf qt-embedded-linux-commercial-src-%VERSION%.tar
+//! [0]
+
+
+//! [1]
+~/qt-embedded-linux-commercial-src-%VERSION%
+//! [1]
+
+
+//! [2]
+cd  ~/qt-embedded-linux-commercial-src-%VERSION%
+./configure -embedded [architecture]
+//! [2]
+
+
+//! [3]
+make
+//! [3]
+
+
+//! [4]
+su -c "make install"
+//! [4]
+
+
+//! [5]
+PATH=/usr/local/Trolltech/QtEmbedded-%VERSION%/bin:$PATH
+export PATH
+//! [5]
+
+
+//! [6]
+setenv PATH /usr/local/Trolltech/QtEmbedded-%VERSION%/bin:$PATH
+//! [6]
diff --git a/doc/src/snippets/code/doc_src_emb-performance.qdoc b/doc/src/snippets/code/doc_src_emb-performance.qdoc
new file mode 100644
index 0000000000..7dcba12aab
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_emb-performance.qdoc
@@ -0,0 +1,36 @@
+//! [0]
+./configure -static
+//! [0]
+
+
+//! [1]
+void *operator new[](size_t size)
+{
+    return malloc(size);
+}
+
+void *operator new(size_t size)
+{
+    return malloc(size);
+}
+
+void operator delete[](void *ptr)
+{
+    free(ptr);
+}
+
+void operator delete[](void *ptr, size_t)
+{
+    free(ptr);
+}
+
+void operator delete(void *ptr)
+{
+    free(ptr);
+}
+
+void operator delete(void *ptr, size_t)
+{
+    free(ptr);
+}
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_emb-pointer.qdoc b/doc/src/snippets/code/doc_src_emb-pointer.qdoc
new file mode 100644
index 0000000000..37eb9c68f1
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_emb-pointer.qdoc
@@ -0,0 +1,68 @@
+//! [0]
+   <qtopia-root-dir>/qtopiacore/qt/configure -embedded -help |grep -a1 mouse
+//! [0]
+
+
+//! [1]
+   ./configure -extra-qtopiacore-config -qt-mouse-tslib
+//! [1]
+
+
+//! [2]
+   ./configure -help
+//! [2]
+
+
+//! [3]
+   configure -qt-mouse-tslib
+//! [3]
+
+
+//! [4]
+export QWS_MOUSE_PROTO=<driver>[:<driver specific options>]
+//! [4]
+
+
+//! [5]
+export QWS_MOUSE_PROTO="<driver>[:<driver specific options>]
+        <driver>[:<driver specific options>]
+        <driver>[:<driver specific options>]"
+//! [5]
+
+
+//! [6]
+export QWS_MOUSE_PROTO="Vr41xx:press=500:/dev/misc/ts"
+//! [6]
+
+
+//! [7]
+./configure  -L <path to tslib library> -I <path to tslib headers>
+//! [7]
+
+
+//! [8]
+module_raw input
+module linear
+//! [8]
+
+
+//! [9]
+QWS_MOUSE_PROTO=IntelliMouse:/dev/input/mouse0
+//! [9]
+
+
+//! [10]
+cat /dev/input/mouse0 | hexdump
+//! [10]
+
+
+//! [11]
+QWS_MOUSE_PROTO=IntelliMouse:/dev/input/mouse0
+//! [11]
+
+
+//! [12]
+chmod a+rw /dev/input/mouse0
+//! [12]
+
+
diff --git a/doc/src/snippets/code/doc_src_emb-qvfb.qdoc b/doc/src/snippets/code/doc_src_emb-qvfb.qdoc
new file mode 100644
index 0000000000..827c84a52d
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_emb-qvfb.qdoc
@@ -0,0 +1,70 @@
+//! [0]
+cd path/to/QtEmbedded
+./configure -qvfb
+make
+//! [0]
+
+
+//! [1]
+cd path/to/Qt/tools/qvfb
+make
+./qvfb
+//! [1]
+
+
+//! [2]
+cd path/to/Qt/tools/qvfb/ClamshellPhone.skin/
+//! [2]
+
+
+//! [3]
+[SkinFile]
+Up=ClamshellPhone1-5.png
+Down=ClamshellPhone1-5-pressed.png
+Closed=ClamshellPhone1-5-closed.png
+Screen=72 84 176 208
+Areas=22
+
+"Power"     0x0100000a 205 563 249 586
+"1"         0x0031      62 414 119 438
+"2"         0x0032     130 414 189 438
+"3"         0x0033     198 413 257 438
+"4"         0x0034      54 444 117 470
+"5"         0x0035     128 444 189 471
+"6"         0x0036     202 444 264 471
+"7"         0x0037      47 477 113 507
+"8"         0x0038     126 477 190 507
+"9"         0x0039     205 478 270 509
+"*"         0x002a      39 515 110 552
+"0"         0x0030     122 515 195 553
+"#"         0x0023     207 516 280 553
+"Context1"  0x01100000 137 360 108 383 123 410 90 409  60 387  63 378
+                       100 362
+"Back"      0x01000061 184 361 206 376 213 387 197 410 226 410 256 392
+                       258 381 244 369
+"Backspace" 0x01000003  68 563 113 587
+"Select"    0x01010000 160 391 172 390 181 386 184 381 180 377 173
+                       373 165 372 155 372 145 375 138 378 136
+                       382 138 387 147 390
+"Left"      0x1000012  141 390 136 385 136 381 143 375 132 371 120
+                       380 121 393 129 401
+"Down"      0x1000015  143 389 130 402 162 412 191 404 175 390
+"Right"     0x1000014  186 370 176 375 184 382 182 387 175 390 190 404
+                       201 396 202 375
+"Up"        0x1000013  133 370 143 374 176 374 185 370 169 362 149 362
+"Flip"      0x01100006  98 325 225 353
+//! [3]
+
+
+//! [4]
+cd path/to/QtEmbedded/examples/widgets/analogclock
+make
+./analogclock -qws
+//! [4]
+
+
+//! [5]
+cd path/to/QtEmbedded/examples/widgets/analogclock
+make
+./analogclock -qws -display QVFb:0
+//! [5]
diff --git a/doc/src/snippets/code/doc_src_emb-running.qdoc b/doc/src/snippets/code/doc_src_emb-running.qdoc
new file mode 100644
index 0000000000..b15cfc1a15
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_emb-running.qdoc
@@ -0,0 +1,61 @@
+//! [0]
+cd path/to/QtEmbedded/demos/textedit
+./textedit -qws
+//! [0]
+
+
+//! [1]
+./myfirstserverapplication -qws -display "transformed:rot90:1"
+./mysecondserverapplication -qws -display "QVFb:2"
+//! [1]
+
+
+//! [2]
+./myclientapplication -display "QVFb:2"
+//! [2]
+
+
+//! [3]
+./myserverapplication -qws -display "Multi: QVFb:0
+        QVFb:1:offset=0,0 VNC:offset=640,0 :2"
+//! [3]
+
+
+//! [4]
+./myapplication -fn helvetica
+//! [4]
+
+
+//! [5]
+./myapplication -bg blue
+//! [5]
+
+
+//! [6]
+./myapplication -btn green
+//! [6]
+
+
+//! [7]
+./myapplication -fg 'dark blue'
+//! [7]
+
+
+//! [8]
+./myapplication -name texteditapplication
+//! [8]
+
+
+//! [9]
+./myapplication -title 'Text Edit'
+//! [9]
+
+
+//! [10]
+./myapplication -geometry 300x200+50+50
+//! [10]
+
+
+//! [11]
+./myapplication -decoration windows
+//! [11]
diff --git a/doc/src/snippets/code/doc_src_emb-vnc.qdoc b/doc/src/snippets/code/doc_src_emb-vnc.qdoc
new file mode 100644
index 0000000000..c35274f3f4
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_emb-vnc.qdoc
@@ -0,0 +1,25 @@
+//! [0]
+cd path/to/QtEmbedded
+./configure -qt-gfx-vnc
+make
+//! [0]
+
+
+//! [1]
+cd path/to/QtEmbedded/examples/widgets/analogclock
+./analogclock -qws -display VNC:0
+//! [1]
+
+
+//! [2]
+vncviewer localhost:0
+//! [2]
+
+//! [Starting server]
+analogclock -qws -display VNC:0
+//! [Starting server]
+//! [Starting clients]
+calculator -display VNC:0
+scribble -display VNC:0
+imageviewer -display VNC:0
+//! [Starting clients]
diff --git a/doc/src/snippets/code/doc_src_examples_activeqt_comapp.qdoc b/doc/src/snippets/code/doc_src_examples_activeqt_comapp.qdoc
new file mode 100644
index 0000000000..0414e5016e
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_activeqt_comapp.qdoc
@@ -0,0 +1,39 @@
+//! [0]
+Private Application As comappLib.Application
+Private MyApp As Boolean
+
+Private Sub UpdateList()
+    DocumentList.Clear
+    DocumentsCount.Caption = Application.documents.Count
+    For Index = 0 To Application.documents.Count - 1
+       DocumentList.AddItem (Application.documents.Item(Index).Title)
+    Next
+End Sub
+
+Private Sub Form_Load()
+    On Error GoTo CreateNew
+    Set Application = GetObject(, "comapp.Application")
+    MyApp = False
+    GoTo Initialized
+CreateNew:
+    On Error GoTo InitializeFailed
+    Set Application = New Application
+    Application.Visible = True
+    MyApp = True
+Initialized:
+    Caption = Application.id
+    UpdateList
+InitializeFailed:
+End Sub
+
+Private Sub Form_Unload(Cancel As Integer)
+    If MyApp Then
+        Application.quit
+    End If
+End Sub
+
+Private Sub NewDocument_Click()
+    Application.documents.addDocument
+    UpdateList
+End Sub
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_examples_activeqt_dotnet.qdoc b/doc/src/snippets/code/doc_src_examples_activeqt_dotnet.qdoc
new file mode 100644
index 0000000000..3bdf9fa5f3
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_activeqt_dotnet.qdoc
@@ -0,0 +1,4 @@
+//! [0]
+' VB is case insensitive, but our C++ controls are not.
+' Me.resetButton.enabled = True
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_examples_activeqt_menus.qdoc b/doc/src/snippets/code/doc_src_examples_activeqt_menus.qdoc
new file mode 100644
index 0000000000..18849dde06
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_activeqt_menus.qdoc
@@ -0,0 +1,6 @@
+//! [0]
+<object ID="QMenus" CLASSID="CLSID:4dc3f340-a6f7-44e4-a79b-3e9217695fbd"
+CODEBASE="http://qtsoftware.com/demos/menusax.cab">
+[Object not available! Did you forget to build and register the server?]
+</object>
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_examples_ahigl.qdoc b/doc/src/snippets/code/doc_src_examples_ahigl.qdoc
new file mode 100644
index 0000000000..bf29cdaab1
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_ahigl.qdoc
@@ -0,0 +1,8 @@
+//! [0]
+myApplication -qws -display ahigl
+//! [0]
+
+
+//! [1]
+myApplication -qws -display ahigl
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_examples_application.qdoc b/doc/src/snippets/code/doc_src_examples_application.qdoc
new file mode 100644
index 0000000000..85e04f71bd
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_application.qdoc
@@ -0,0 +1,5 @@
+//! [0]
+application -style=windows
+application -style=motif
+application -style=cde
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_examples_arrowpad.qdoc b/doc/src/snippets/code/doc_src_examples_arrowpad.qdoc
new file mode 100644
index 0000000000..ba7f8eb97a
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_arrowpad.qdoc
@@ -0,0 +1,19 @@
+//! [0]
+qApp->translate("ArrowPad", x)
+//! [0]
+
+
+//! [1]
+lrelease arrowpad.pro
+//! [1]
+
+
+//! [2]
+export LANG=fr
+setenv LANG fr
+//! [2]
+
+
+//! [3]
+set LANG=fr
+//! [3]
diff --git a/doc/src/snippets/code/doc_src_examples_containerextension.qdoc b/doc/src/snippets/code/doc_src_examples_containerextension.qdoc
new file mode 100644
index 0000000000..299c0dc740
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_containerextension.qdoc
@@ -0,0 +1,4 @@
+//! [0]
+target.path = $$[QT_INSTALL_PLUGINS]/designer
+INSTALLS += target
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_examples_customwidgetplugin.qdoc b/doc/src/snippets/code/doc_src_examples_customwidgetplugin.qdoc
new file mode 100644
index 0000000000..299c0dc740
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_customwidgetplugin.qdoc
@@ -0,0 +1,4 @@
+//! [0]
+target.path = $$[QT_INSTALL_PLUGINS]/designer
+INSTALLS += target
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_examples_dropsite.qdoc b/doc/src/snippets/code/doc_src_examples_dropsite.qdoc
new file mode 100644
index 0000000000..fd949ea158
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_dropsite.qdoc
@@ -0,0 +1,3 @@
+//! [0]
+foreach(variable, container)
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_examples_editabletreemodel.qdoc b/doc/src/snippets/code/doc_src_examples_editabletreemodel.qdoc
new file mode 100644
index 0000000000..2475842d5d
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_editabletreemodel.qdoc
@@ -0,0 +1,8 @@
+//! [0]
+QVariant a = model->index(0, 0, QModelIndex()).data();
+//! [0]
+
+
+//! [1]
+QVariant b = model->index(1, 0, QModelIndex()).data();
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_examples_hellotr.qdoc b/doc/src/snippets/code/doc_src_examples_hellotr.qdoc
new file mode 100644
index 0000000000..4f31bc0908
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_hellotr.qdoc
@@ -0,0 +1,31 @@
+//! [0]
+lupdate -verbose hellotr.pro
+//! [0]
+
+
+//! [1]
+<!DOCTYPE TS><TS>
+<context>
+    <name>QPushButton</name>
+    <message>
+        <source>Hello world!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
+//! [1]
+
+
+//! [2]
+linguist hellotr_la.ts
+//! [2]
+
+
+//! [3]
+<translation type='unfinished'></translation>
+//! [3]
+
+
+//! [4]
+<translation>Orbis, te saluto!</translation>
+//! [4]
diff --git a/doc/src/snippets/code/doc_src_examples_icons.qdoc b/doc/src/snippets/code/doc_src_examples_icons.qdoc
new file mode 100644
index 0000000000..3d33dff149
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_icons.qdoc
@@ -0,0 +1,14 @@
+//! [0]
+if (!condition)
+     qFatal("ASSERT: "condition" in file ...");
+//! [0]
+
+
+//! [1]
+qmake "CONFIG += debug" icons.pro
+//! [1]
+
+
+//! [2]
+qmake "CONFIG += release" icons.pro
+//! [2]
diff --git a/doc/src/snippets/code/doc_src_examples_imageviewer.qdoc b/doc/src/snippets/code/doc_src_examples_imageviewer.qdoc
new file mode 100644
index 0000000000..c1854ec008
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_imageviewer.qdoc
@@ -0,0 +1,24 @@
+//! [0]
+imageLabel->resize(imageLabel->pixmap()->size());
+//! [0]
+
+
+//! [1]
+if (!imageLabel->pixmap())
+     qFatal("ASSERT: "imageLabel->pixmap()" in file ...");
+//! [1]
+
+
+//! [2]
+qmake "CONFIG += debug" foo.pro
+//! [2]
+
+
+//! [3]
+qmake "CONFIG += release" foo.pro
+//! [3]
+
+
+//! [4]
+scrollBar->setValue(int(factor * scrollBar->value()));
+//! [4]
diff --git a/doc/src/snippets/code/doc_src_examples_qtscriptcustomclass.qdoc b/doc/src/snippets/code/doc_src_examples_qtscriptcustomclass.qdoc
new file mode 100644
index 0000000000..f958cc9f83
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_qtscriptcustomclass.qdoc
@@ -0,0 +1,35 @@
+//! [0]
+var ba = new ByteArray();    // constructs an empty ByteArray
+var ba2 = new ByteArray(10); // constructs a ByteArray of length 10 (all bytes initialized to 0)
+//! [0]
+
+
+//! [1]
+for (var i = 0; i < ba.length; ++i)
+    ba[i] = 123;
+//! [1]
+
+
+//! [2]
+ba[0] = 257;
+print(ba[0]);  // 1
+//! [2]
+
+
+//! [3]
+var ba3 = new ByteArray();
+print(ba3.length); // 0
+ba[0] = 64;
+print(ba3.length); // 1
+//! [3]
+
+
+//! [4]
+ba["foo"] = "Hello";
+//! [4]
+
+
+//! [5]
+var ba64 = ba.toBase64();
+print(ba64.toLatin1String());
+//! [5]
diff --git a/doc/src/snippets/code/doc_src_examples_simpledommodel.qdoc b/doc/src/snippets/code/doc_src_examples_simpledommodel.qdoc
new file mode 100644
index 0000000000..c74a176680
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_simpledommodel.qdoc
@@ -0,0 +1,20 @@
+//! [0]
+// file is an open QFile object.
+QDomDocument document;
+if (document.setContent(&file)) {
+
+    QDomElement documentElement = document.documentElement();
+    QString text;
+    QDomNode node = documentElement.firstChild();
+
+    while (!node.isNull()) {
+        if (node.isText())
+            text += node.nodeValue();
+        else if (node.hasChildNodes()) {
+            // Examine the node's children and read any text found.
+            ...
+        }
+        node = node.nextSibling();
+    }
+}
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_examples_simpletreemodel.qdoc b/doc/src/snippets/code/doc_src_examples_simpletreemodel.qdoc
new file mode 100644
index 0000000000..907f3db28d
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_simpletreemodel.qdoc
@@ -0,0 +1,12 @@
+//! [0]
+Getting Started                         How to familiarize yourself with Qt Designer
+    Launching Designer                  Running the Qt Designer application
+    The User Interface                  How to interact with Qt Designer
+//! [0]
+
+
+//! [1]
+Connection Editing Mode                 Connecting widgets together with signals and slots
+    Connecting Objects                  Making connections in Qt Designer
+    Editing Connections                 Changing existing connections
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_examples_svgalib.qdoc b/doc/src/snippets/code/doc_src_examples_svgalib.qdoc
new file mode 100644
index 0000000000..3b63146eb0
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_svgalib.qdoc
@@ -0,0 +1,3 @@
+//! [0]
+myApplication -qws -display svgalib
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_examples_taskmenuextension.qdoc b/doc/src/snippets/code/doc_src_examples_taskmenuextension.qdoc
new file mode 100644
index 0000000000..299c0dc740
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_taskmenuextension.qdoc
@@ -0,0 +1,4 @@
+//! [0]
+target.path = $$[QT_INSTALL_PLUGINS]/designer
+INSTALLS += target
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_examples_textfinder.qdoc b/doc/src/snippets/code/doc_src_examples_textfinder.qdoc
new file mode 100644
index 0000000000..349becf882
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_textfinder.qdoc
@@ -0,0 +1,6 @@
+//! [0]
+CONFIG      += uitools
+HEADERS     = textfinder.h
+RESOURCES   = textfinder.qrc
+SOURCES     = textfinder.cpp main.cpp
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_examples_trollprint.qdoc b/doc/src/snippets/code/doc_src_examples_trollprint.qdoc
new file mode 100644
index 0000000000..7f51a15577
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_trollprint.qdoc
@@ -0,0 +1,35 @@
+//! [0]
+twoSidedEnabledRadio = new QRadioButton(tr("Enabled", "two-sided"));
+twoSidedDisabledRadio = new QRadioButton(tr("Disabled", "two-sided"));
+//! [0]
+
+
+//! [1]
+colorsEnabledRadio = new QRadioButton(tr("Enabled", "colors"), colors);
+colorsDisabledRadio = new QRadioButton(tr("Disabled", "colors"), colors);
+//! [1]
+
+
+//! [2]
+/*
+   TRANSLATOR MainWindow
+
+   In this application the whole application is a MainWindow.
+   Choose Help|About from the menu bar to see some text
+   belonging to MainWindow.
+
+   ...
+//! [2]
+
+
+//! [3]
+/*
+   TRANSLATOR ZClientErrorDialog
+
+   Choose Client|Edit to reach the Client Edit dialog, then choose
+   Client Specification from the drop down list at the top and pick
+   client Bartel Leendert van der Waerden. Now check the Profile
+   checkbox and then click the Start Processing button. You should
+   now see a pop up window with the text "Error: Name too long!".
+   This window is a ZClientErrorDialog.
+//! [3]
diff --git a/doc/src/snippets/code/doc_src_examples_tutorial.qdoc b/doc/src/snippets/code/doc_src_examples_tutorial.qdoc
new file mode 100644
index 0000000000..0b79563eff
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_tutorial.qdoc
@@ -0,0 +1,10 @@
+//! [0]
+qmake -project
+qmake
+//! [0]
+
+
+//! [1]
+qmake -project
+qmake
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_examples_worldtimeclockplugin.qdoc b/doc/src/snippets/code/doc_src_examples_worldtimeclockplugin.qdoc
new file mode 100644
index 0000000000..299c0dc740
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_examples_worldtimeclockplugin.qdoc
@@ -0,0 +1,4 @@
+//! [0]
+target.path = $$[QT_INSTALL_PLUGINS]/designer
+INSTALLS += target
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_exportedfunctions.qdoc b/doc/src/snippets/code/doc_src_exportedfunctions.qdoc
new file mode 100644
index 0000000000..f0e5fb59f0
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_exportedfunctions.qdoc
@@ -0,0 +1,17 @@
+//! [0]
+#ifdef Q_WS_X11
+void qt_x11_wait_for_window_manager(QWidget *widget);
+#endif
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    ...
+    window.show();
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(&window);
+#endif
+    ...
+    return app.exec();
+}
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_gpl.qdoc b/doc/src/snippets/code/doc_src_gpl.qdoc
new file mode 100644
index 0000000000..b6ef9540da
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_gpl.qdoc
@@ -0,0 +1,679 @@
+//! [GPL v3]
+ You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ GNU General Public License version 3, which is displayed below.
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+//! [GPL v3]
diff --git a/doc/src/snippets/code/doc_src_graphicsview.qdoc b/doc/src/snippets/code/doc_src_graphicsview.qdoc
new file mode 100644
index 0000000000..4c1978488c
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_graphicsview.qdoc
@@ -0,0 +1,77 @@
+//! [0]
+QGraphicsScene scene;
+QGraphicsRectItem *rect = scene.addRect(QRectF(0, 0, 100, 100));
+
+QGraphicsItem *item = scene.itemAt(50, 50);
+// item == rect
+//! [0]
+
+
+//! [1]
+QGraphicsScene scene;
+myPopulateScene(&scene);
+
+QGraphicsView view(&scene);
+view.show();
+//! [1]
+
+
+//! [2]
+class View : public QGraphicsView
+{
+Q_OBJECT
+    ...
+public slots:
+    void zoomIn() { scale(1.2, 1.2); }
+    void zoomOut() { scale(1 / 1.2, 1 / 1.2); }
+    void rotateLeft() { rotate(-10); }
+    void rotateRight() { rotate(10); }
+    ...
+};
+//! [2]
+
+
+//! [3]
+QGraphicsScene scene;
+scene.addRect(QRectF(0, 0, 100, 200), QPen(Qt::black), QBrush(Qt::green));
+
+QPrinter printer;
+if (QPrintDialog(&printer).exec() == QDialog::Accepted) {
+    QPainter painter(&printer);
+    painter.setRenderHint(QPainter::Antialiasing);
+    scene.render(&painter);
+}
+//! [3]
+
+
+//! [4]
+QGraphicsScene scene;
+scene.addRect(QRectF(0, 0, 100, 200), QPen(Qt::black), QBrush(Qt::green));
+
+QPixmap pixmap;
+QPainter painter(&pixmap);
+painter.setRenderHint(QPainter::Antialiasing);
+scene.render(&painter);
+painter.end();
+
+pixmap.save("scene.png");
+//! [4]
+
+
+//! [5]
+void CustomItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    QMimeData *data = new QMimeData;
+    data->setColor(Qt::green);
+
+    QDrag *drag = new QDrag(event->widget());
+    drag->setMimeData(data);
+    drag->start();
+}
+//! [5]
+
+
+//! [6]
+QGraphicsView view(&scene);
+view.setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers)));
+//! [6]
diff --git a/doc/src/snippets/code/doc_src_groups.qdoc b/doc/src/snippets/code/doc_src_groups.qdoc
new file mode 100644
index 0000000000..51c2944649
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_groups.qdoc
@@ -0,0 +1,26 @@
+//! [0]
+void QPen::setStyle(Qt::PenStyle style)
+{
+    detach();           // detach from common data
+    d->style = style;   // set the style member
+}
+
+void QPen::detach()
+{
+    if (d->ref != 1) {
+        ...             // perform a deep copy
+    }
+}
+//! [0]
+
+
+//! [1]
+QPixmap p1, p2;
+p1.load("image.bmp");
+p2 = p1;                        // p1 and p2 share data
+
+QPainter paint;
+paint.begin(&p2);               // cuts p2 loose from p1
+paint.drawText(0,50, "Hi");
+paint.end();
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_i18n.qdoc b/doc/src/snippets/code/doc_src_i18n.qdoc
new file mode 100644
index 0000000000..857e70c8ec
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_i18n.qdoc
@@ -0,0 +1,155 @@
+//! [0]
+LoginWidget::LoginWidget()
+{
+    QLabel *label = new QLabel(tr("Password:"));
+    ...
+}
+//! [0]
+
+
+//! [1]
+void some_global_function(LoginWidget *logwid)
+{
+    QLabel *label = new QLabel(
+                LoginWidget::tr("Password:"), logwid);
+}
+
+void same_global_function(LoginWidget *logwid)
+{
+    QLabel *label = new QLabel(
+                qApp->translate("LoginWidget", "Password:"), logwid);
+}
+//! [1]
+
+
+//! [2]
+QString FriendlyConversation::greeting(int type)
+{
+    static const char *greeting_strings[] = {
+        QT_TR_NOOP("Hello"),
+        QT_TR_NOOP("Goodbye")
+    };
+    return tr(greeting_strings[type]);
+}
+//! [2]
+
+
+//! [3]
+static const char *greeting_strings[] = {
+    QT_TRANSLATE_NOOP("FriendlyConversation", "Hello"),
+    QT_TRANSLATE_NOOP("FriendlyConversation", "Goodbye")
+};
+
+QString FriendlyConversation::greeting(int type)
+{
+    return tr(greeting_strings[type]);
+}
+
+QString global_greeting(int type)
+{
+    return qApp->translate("FriendlyConversation",
+                           greeting_strings[type]);
+}
+//! [3]
+
+
+//! [4]
+void FileCopier::showProgress(int done, int total,
+                              const QString &currentFile)
+{
+    label.setText(tr("%1 of %2 files copied.\nCopying: %3")
+                  .arg(done)
+                  .arg(total)
+                  .arg(currentFile));
+}
+//! [4]
+
+
+//! [5]
+QString s1 = "%1 of %2 files copied. Copying: %3";
+QString s2 = "Kopierer nu %3. Av totalt %2 filer er %1 kopiert.";
+
+qDebug() << s1.arg(5).arg(10).arg("somefile.txt");
+qDebug() << s2.arg(5).arg(10).arg("somefile.txt");
+//! [5]
+
+
+//! [6]
+5 of 10 files copied. Copying: somefile.txt
+Kopierer nu somefile.txt. Av totalt 10 filer er 5 kopiert.
+//! [6]
+
+
+//! [7]
+HEADERS         = funnydialog.h \
+                  wackywidget.h
+SOURCES         = funnydialog.cpp \
+                  main.cpp \
+                  wackywidget.cpp
+FORMS           = fancybox.ui
+TRANSLATIONS    = superapp_dk.ts \
+                  superapp_fi.ts \
+                  superapp_no.ts \
+                  superapp_se.ts
+//! [7]
+
+
+//! [8]
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QTranslator qtTranslator;
+    qtTranslator.load("qt_" + QLocale::system().name(),
+            QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+    app.installTranslator(&qtTranslator);
+
+    QTranslator myappTranslator;
+    myappTranslator.load("myapp_" + QLocale::system().name());
+    app.installTranslator(&myappTranslator);
+
+    ...
+    return app.exec();
+}
+//! [8]
+
+
+//! [9]
+QString string = ...; // some Unicode text
+
+QTextCodec *codec = QTextCodec::codecForName("ISO 8859-5");
+QByteArray encodedString = codec->fromUnicode(string);
+//! [9]
+
+
+//! [10]
+QByteArray encodedString = ...; // some ISO 8859-5 encoded text
+
+QTextCodec *codec = QTextCodec::codecForName("ISO 8859-5");
+QString string = codec->toUnicode(encodedString);
+//! [10]
+
+
+//! [11]
+void Clock::setTime(const QTime &time)
+{
+    if (tr("AMPM") == "AMPM") {
+        // 12-hour clock
+    } else {
+        // 24-hour clock
+    }
+}
+//! [11]
+
+
+//! [12]
+void QWidget::changeEvent(QEvent *event)
+{
+    if (e->type() == QEvent::LanguageChange) {
+        titleLabel->setText(tr("Document Title"));
+        ...
+        okPushButton->setText(tr("&OK"));
+    } else
+        QWidget::changeEvent(event);
+}
+//! [12]
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc
new file mode 100644
index 0000000000..66bb9980f3
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_installation.qdoc
@@ -0,0 +1,127 @@
+//! [0]
+cd /tmp
+gunzip qt-x11-opensource-desktop-%VERSION%.tar.gz        # uncompress the archive
+tar xvf qt-x11-opensource-desktop-%VERSION%.tar          # unpack it
+//! [0]
+
+
+//! [1]
+cd /tmp/qt-x11-opensource-desktop-%VERSION%
+./configure
+//! [1]
+
+
+//! [2]
+make
+//! [2]
+
+
+//! [3]
+make install
+//! [3]
+
+
+//! [4]
+PATH               - to locate qmake, moc and other Qt tools
+//! [4]
+
+
+//! [5]
+PATH=/usr/local/Trolltech/Qt-%VERSION%/bin:$PATH
+export PATH
+//! [5]
+
+
+//! [6]
+setenv PATH /usr/local/Trolltech/Qt-%VERSION%/bin:$PATH
+//! [6]
+
+
+//! [7]
+PATH               - to locate qmake, moc and other Qt tools
+//! [7]
+
+
+//! [8]
+C:
+cd /D C:\Qt\4.4.0-rc1
+configure
+//! [8]
+
+
+//! [9]
+configure -platform win32-msvc
+//! [9]
+
+
+//! [10]
+nmake
+//! [10]
+
+
+//! [11]
+cd /tmp
+gunzip qt-mac-opensource-desktop-%VERSION%.tar.gz        # uncompress the archive
+tar xvf qt-mac-opensource-desktop-%VERSION%.tar          # unpack it
+//! [11]
+
+
+//! [12]
+cd /tmp/qt-mac-opensource-desktop-%VERSION%
+./configure
+//! [12]
+
+
+//! [13]
+make
+//! [13]
+
+
+//! [14]
+sudo make -j1 install
+//! [14]
+
+
+//! [15]
+PATH               - to locate qmake, moc and other Qt tools
+//! [15]
+
+
+//! [16]
+PATH=/usr/local/Trolltech/Qt-%VERSION%/bin:$PATH
+export PATH
+//! [16]
+
+
+//! [17]
+setenv PATH /usr/local/Trolltech/Qt-%VERSION%/bin:$PATH
+//! [17]
+
+
+//! [18]
+PATH               - to locate qmake, moc and other Qt tools
+//! [18]
+
+
+//! [19]
+C:
+cd \Qt\%VERSION%
+configure -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005
+//! [19]
+
+
+//! [20]
+set INCLUDE=C:\Program Files\Microsoft Visual Studio 8\VC\ce\include;C:\Program Files\Windows CE Tools\wce500\Windows Mobile 5.0 Pocket PC SDK\Include\Armv4i
+set LIB=C:\Program Files\Microsoft Visual Studio 8\VC\ce\lib\armv4i;C:\Program Files\Windows CE Tools\wce500\Windows Mobile 5.0 Pocket PC SDK\Lib\ARMV4I
+set PATH=C:\Program Files\Microsoft Visual Studio 8\VC\ce\bin\x86_arm;%PATH%
+//! [20]
+
+
+//! [21]
+setcepaths wincewm50pocket-msvc2005
+//! [21]
+
+
+//! [22]
+nmake
+//! [22]
diff --git a/doc/src/snippets/code/doc_src_introtodbus.qdoc b/doc/src/snippets/code/doc_src_introtodbus.qdoc
new file mode 100644
index 0000000000..bedfe7ff07
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_introtodbus.qdoc
@@ -0,0 +1,3 @@
+//! [0]
+org.freedesktop.DBus
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_layout.qdoc b/doc/src/snippets/code/doc_src_layout.qdoc
new file mode 100644
index 0000000000..48e10e9370
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_layout.qdoc
@@ -0,0 +1,119 @@
+//! [0]
+#ifndef CARD_H
+#define CARD_H
+
+#include <QLayout>
+#include <QList>
+
+class CardLayout : public QLayout
+{
+public:
+    CardLayout(QWidget *parent, int dist)
+        : QLayout(parent, 0, dist) {}
+    CardLayout(QLayout *parent, int dist)
+        : QLayout(parent, dist) {}
+    CardLayout(int dist)
+        : QLayout(dist) {}
+    ~CardLayout();
+
+    void addItem(QLayoutItem *item);
+    QSize sizeHint() const;
+    QSize minimumSize() const;
+    QLayoutItem *itemAt(int) const;
+    QLayoutItem *takeAt(int);
+    void setGeometry(const QRect &rect);
+
+private:
+    QList<QLayoutItem*> list;
+};
+#endif
+//! [0]
+
+
+//! [1]
+#include "card.h"
+//! [1]
+
+
+//! [2]
+QLayoutItem *CardLayout::itemAt(int idx) const
+{
+    // QList::value() performs index checking, and returns 0 if we are
+    // outside the valid range
+    return list.value(idx);
+}
+
+QLayoutItem *CardLayout::takeAt(int idx)
+{
+    // QList::take does not do index checking
+    return idx >= 0 && idx < list.size() ? list.takeAt(idx) : 0;
+}
+//! [2]
+
+
+//! [3]
+void CardLayout::addItem(QLayoutItem *item)
+{
+    list.append(item);
+}
+//! [3]
+
+
+//! [4]
+CardLayout::~CardLayout()
+{
+    deleteAllItems();
+}
+//! [4]
+
+
+//! [5]
+void CardLayout::setGeometry(const QRect &r)
+{
+    QLayout::setGeometry(r);
+
+    if (list.size() == 0)
+        return;
+
+    int w = r.width() - (list.count() - 1) * spacing();
+    int h = r.height() - (list.count() - 1) * spacing();
+    int i = 0;
+    while (i < list.size()) {
+        QLayoutItem *o = list.at(i);
+        QRect geom(r.x() + i * spacing(), r.y() + i * spacing(), w, h);
+        o->setGeometry(geom);
+        ++i;
+    }
+}
+//! [5]
+
+
+//! [6]
+QSize CardLayout::sizeHint() const
+{
+    QSize s(0,0);
+    int n = list.count();
+    if (n > 0)
+        s = QSize(100,70); //start with a nice default size
+    int i = 0;
+    while (i < n) {
+        QLayoutItem *o = list.at(i);
+        s = s.expandedTo(o->sizeHint());
+        ++i;
+    }
+    return s + n*QSize(spacing(), spacing());
+}
+
+QSize CardLayout::minimumSize() const
+{
+    QSize s(0,0);
+    int n = list.count();
+    int i = 0;
+    while (i < n) {
+        QLayoutItem *o = list.at(i);
+        s = s.expandedTo(o->minimumSize());
+        ++i;
+    }
+    return s + n*QSize(spacing(), spacing());
+}
+//! [6]
diff --git a/doc/src/snippets/code/doc_src_lgpl.qdoc b/doc/src/snippets/code/doc_src_lgpl.qdoc
new file mode 100644
index 0000000000..dc76d85f4e
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_lgpl.qdoc
@@ -0,0 +1,507 @@
+//! [LGPL v2.1]
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
+
+//! [LGPL v2.1]
diff --git a/doc/src/snippets/code/doc_src_licenses.qdoc b/doc/src/snippets/code/doc_src_licenses.qdoc
new file mode 100644
index 0000000000..4a95a5008a
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_licenses.qdoc
@@ -0,0 +1,108 @@
+//! [1]
+    [utopiafonts] 1999 free font
+    ----------------------------------------------------
+
+    this font is provided free for personal or commercial use,
+    it can be redistributed however it may not be sold.  
+    ----------------------------------------------------
+    (C) 1999 utopiafonts. dale_thorpe@bssc.edu.au
+//! [1]
+
+
+//! [2]
+    Bitstream Vera Fonts Copyright
+    ------------------------------
+
+    Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
+    a trademark of Bitstream, Inc.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of the fonts accompanying this license ("Fonts") and associated
+    documentation files (the "Font Software"), to reproduce and distribute the
+    Font Software, including without limitation the rights to use, copy, merge,
+    publish, distribute, and/or sell copies of the Font Software, and to permit
+    persons to whom the Font Software is furnished to do so, subject to the
+    following conditions:
+
+    The above copyright and trademark notices and this permission notice shall
+    be included in all copies of one or more of the Font Software typefaces.
+
+    The Font Software may be modified, altered, or added to, and in particular
+    the designs of glyphs or characters in the Fonts may be modified and
+    additional glyphs or characters may be added to the Fonts, only if the fonts
+    are renamed to names not containing either the words "Bitstream" or the word
+    "Vera".
+
+    This License becomes null and void to the extent applicable to Fonts or Font
+    Software that has been modified and is distributed under the "Bitstream
+    Vera" names.
+
+    The Font Software may be sold as part of a larger software package but no
+    copy of one or more of the Font Software typefaces may be sold by itself.
+
+    THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+    TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
+    FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
+    ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+    THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
+    FONT SOFTWARE.
+
+    Except as contained in this notice, the names of Gnome, the Gnome
+    Foundation, and Bitstream Inc., shall not be used in advertising or
+    otherwise to promote the sale, use or other dealings in this Font Software
+    without prior written authorization from the Gnome Foundation or Bitstream
+    Inc., respectively. For further information, contact: fonts at gnome dot
+    org. 
+
+    Arev Fonts Copyright
+    ------------------------------
+
+    Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of the fonts accompanying this license ("Fonts") and
+    associated documentation files (the "Font Software"), to reproduce
+    and distribute the modifications to the Bitstream Vera Font Software,
+    including without limitation the rights to use, copy, merge, publish,
+    distribute, and/or sell copies of the Font Software, and to permit
+    persons to whom the Font Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright and trademark notices and this permission notice
+    shall be included in all copies of one or more of the Font Software
+    typefaces.
+
+    The Font Software may be modified, altered, or added to, and in
+    particular the designs of glyphs or characters in the Fonts may be
+    modified and additional glyphs or characters may be added to the
+    Fonts, only if the fonts are renamed to names not containing either
+    the words "Tavmjong Bah" or the word "Arev".
+
+    This License becomes null and void to the extent applicable to Fonts
+    or Font Software that has been modified and is distributed under the 
+    "Tavmjong Bah Arev" names.
+
+    The Font Software may be sold as part of a larger software package but
+    no copy of one or more of the Font Software typefaces may be sold by
+    itself.
+
+    THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+    OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+    TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+    DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+    OTHER DEALINGS IN THE FONT SOFTWARE.
+
+    Except as contained in this notice, the name of Tavmjong Bah shall not
+    be used in advertising or otherwise to promote the sale, use or other
+    dealings in this Font Software without prior written authorization
+    from Tavmjong Bah. For further information, contact: tavmjong @ free
+    . fr.
+
+//! [2]
diff --git a/doc/src/snippets/code/doc_src_linguist-manual.qdoc b/doc/src/snippets/code/doc_src_linguist-manual.qdoc
new file mode 100644
index 0000000000..ce3b997688
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_linguist-manual.qdoc
@@ -0,0 +1,183 @@
+//! [0]
+HEADERS         = main-dlg.h \
+                  options-dlg.h
+SOURCES         = main-dlg.cpp \
+                  options-dlg.cpp \
+                  main.cpp
+FORMS           = search-dlg.ui
+TRANSLATIONS    = superapp_dk.ts \
+                  superapp_fi.ts \
+                  superapp_no.ts \
+                  superapp_se.ts
+//! [0]
+
+
+//! [1]
+CODECFORTR      = ISO-8859-5
+//! [1]
+
+
+//! [2]
+CODECFORSRC     = UTF-8
+//! [2]
+
+
+//! [3]
+label->setText(tr("F\374r \310lise"));
+//! [3]
+
+
+//! [4]
+Usage:
+    lupdate [options] [project-file]
+    lupdate [options] [source-file|path]... -ts ts-files
+Options:
+    -help  Display this information and exit.
+    -noobsolete
+           Drop all obsolete strings.
+    -extensions <ext>[,<ext>]...
+           Process files with the given extensions only.
+           The extension list must be separated with commas, not with whitespace.
+           Default: 'ui,c,c++,cc,cpp,cxx,ch,h,h++,hh,hpp,hxx'.
+    -pluralonly
+           Only include plural form messages.
+    -silent
+           Don't explain what is being done.
+    -version
+           Display the version of lupdate and exit.
+//! [4]
+
+
+//! [5]
+Usage:
+    lrelease [options] project-file
+    lrelease [options] ts-files [-qm qm-file]
+Options:
+    -help  Display this information and exit
+    -compress
+           Compress the .qm files
+    -nounfinished
+           Do not include unfinished translations
+    -removeidentical
+           If the translated text is the same as
+           the source text, do not include the message
+    -silent
+           Don't explain what is being done
+    -version
+           Display the version of lrelease and exit
+//! [5]
+
+
+void wrapInFunction()
+{
+//! [6]
+button = new QPushButton("&Quit", this);
+//! [6]
+
+
+//! [7]
+button = new QPushButton(tr("&Quit"), this);
+//! [7]
+
+
+//! [8]
+QPushButton::tr("&Quit")
+//! [8]
+
+
+//! [9]
+QObject::tr("&Quit")
+//! [9]
+
+
+//! [10]
+rbc = new QRadioButton(tr("Enabled", "Color frame"), this);
+//! [10]
+
+
+//! [11]
+rbh = new QRadioButton(tr("Enabled", "Hue frame"), this);
+//! [11]
+}
+
+
+//! [12]
+/*
+    TRANSLATOR FindDialog
+
+    Choose Edit|Find from the menu bar or press Ctrl+F to pop up the
+    Find dialog.
+
+    ...
+*/
+//! [12]
+
+//! [13]
+/*
+    TRANSLATOR MyNamespace::MyClass
+
+    Necessary for lupdate.
+
+    ...
+*/
+//! [13]
+
+//! [14]
+void some_global_function(LoginWidget *logwid)
+{
+    QLabel *label = new QLabel(
+            LoginWidget::tr("Password:"), logwid);
+}
+
+void same_global_function(LoginWidget *logwid)
+{
+    QLabel *label = new QLabel(
+            qApp->translate("LoginWidget", "Password:"),
+            logwid);
+}
+//! [14]
+
+
+//! [15]
+QString FriendlyConversation::greeting(int greet_type)
+{
+    static const char* greeting_strings[] = {
+        QT_TR_NOOP("Hello"),
+        QT_TR_NOOP("Goodbye")
+    };
+    return tr(greeting_strings[greet_type]);
+}
+//! [15]
+
+
+//! [16]
+static const char* greeting_strings[] = {
+    QT_TRANSLATE_NOOP("FriendlyConversation", "Hello"),
+    QT_TRANSLATE_NOOP("FriendlyConversation", "Goodbye")
+};
+
+QString FriendlyConversation::greeting(int greet_type)
+{
+    return tr(greeting_strings[greet_type]);
+}
+
+QString global_greeting(int greet_type)
+{
+    return qApp->translate("FriendlyConversation",
+                            greeting_strings[greet_type]);
+}
+//! [16]
+
+void wrapInFunction()
+{
+
+//! [17]
+QString tr(const char *text, const char *comment, int n);
+//! [17]
+
+//! [18]
+tr("%n item(s) replaced", "", count);
+//! [18]
+
+}
+
diff --git a/doc/src/snippets/code/doc_src_mac-differences.qdoc b/doc/src/snippets/code/doc_src_mac-differences.qdoc
new file mode 100644
index 0000000000..a4d95786a6
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_mac-differences.qdoc
@@ -0,0 +1,36 @@
+//! [0]
+QMAKE_LFLAGS_SONAME  = -Wl,-install_name,@executable_path/../Frameworks/
+//! [0]
+
+
+//! [1]
+#ifdef Q_WS_MAC
+    CFURLRef appUrlRef = CFBundleCopyBundleURL(CFBundleGetMainBundle());
+    CFStringRef macPath = CFURLCopyFileSystemPath(appUrlRef,
+                                           kCFURLPOSIXPathStyle);
+    const char *pathPtr = CFStringGetCStringPtr(macPath,
+                                           CFStringGetSystemEncoding());
+    qDebug("Path = %s", pathPtr);
+    CFRelease(appUrlRef);
+    CFRelease(macPath);
+#endif
+//! [1]
+
+
+//! [2]
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
+"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>LprojCompatibleVersion</key>
+    <string>123</string>
+    <key>LprojLocale</key>
+    <string>no</string>
+    <key>LprojRevisionLevel</key>
+    <string>1</string>
+    <key>LprojVersion</key>
+    <string>123</string>
+</dict>
+</plist>
+//! [2]
diff --git a/doc/src/snippets/code/doc_src_moc.qdoc b/doc/src/snippets/code/doc_src_moc.qdoc
new file mode 100644
index 0000000000..59739e1a35
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_moc.qdoc
@@ -0,0 +1,124 @@
+//! [0]
+moc_%.cpp: %.h
+        moc $(DEFINES) $(INCPATH) $< -o $@
+//! [0]
+
+
+//! [1]
+moc_foo.cpp: foo.h
+        moc $(DEFINES) $(INCPATH) $< -o $@
+//! [1]
+
+
+//! [2]
+foo.o: foo.moc
+
+foo.moc: foo.cpp
+        moc $(DEFINES) $(INCPATH) -i $< -o $@
+//! [2]
+
+
+//! [3]
+#include "foo.moc"
+//! [3]
+
+
+//! [4]
+#ifndef Q_MOC_RUN
+    ... 
+#endif
+//! [4]
+
+
+//! [5]
+class SomeTemplate<int> : public QFrame
+{
+    Q_OBJECT
+    ...
+
+signals:
+    void mySignal(int);
+};
+//! [5]
+
+
+//! [6]
+// correct
+class SomeClass : public QObject, public OtherClass
+{
+    ...
+};
+//! [6]
+
+
+//! [7]
+class SomeClass : public QObject
+{
+    Q_OBJECT
+
+public slots:
+    void apply(void (*apply)(List *, void *), char *); // WRONG
+};
+//! [7]
+
+
+//! [8]
+typedef void (*ApplyFunction)(List *, void *);
+
+class SomeClass : public QObject
+{
+    Q_OBJECT
+
+public slots:
+    void apply(ApplyFunction, char *);
+};
+//! [8]
+
+
+//! [9]
+class MyClass : public QObject
+{
+    Q_OBJECT
+
+    enum Error {
+        ConnectionRefused,
+        RemoteHostClosed,
+        UnknownError
+    };
+
+signals:
+    void stateChanged(MyClass::Error error);
+};
+//! [9]
+
+
+//! [10]
+#ifdef ultrix
+#define SIGNEDNESS(a) unsigned a
+#else
+#define SIGNEDNESS(a) a
+#endif
+
+class Whatever : public QObject
+{
+    Q_OBJECT
+
+signals:
+    void someSignal(SIGNEDNESS(int));
+};
+//! [10]
+
+
+//! [11]
+class A
+{
+public:
+    class B
+    {
+        Q_OBJECT
+
+    public slots:   // WRONG
+        void b();
+    };
+};
+//! [11]
diff --git a/doc/src/snippets/code/doc_src_model-view-programming.qdoc b/doc/src/snippets/code/doc_src_model-view-programming.qdoc
new file mode 100644
index 0000000000..3501ce0bd8
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_model-view-programming.qdoc
@@ -0,0 +1,36 @@
+//! [0]
+QAbstractItemModel *model = index.model();
+//! [0]
+
+
+//! [1]
+QModelIndex index = model->index(row, column, ...);
+//! [1]
+
+
+//! [2]
+QModelIndex indexA = model->index(0, 0, QModelIndex());
+QModelIndex indexB = model->index(1, 1, QModelIndex());
+QModelIndex indexC = model->index(2, 1, QModelIndex());
+//! [2]
+
+
+//! [3]
+QModelIndex index = model->index(row, column, parent);
+//! [3]
+
+
+//! [4]
+QModelIndex indexA = model->index(0, 0, QModelIndex());
+QModelIndex indexC = model->index(2, 1, QModelIndex());
+//! [4]
+
+
+//! [5]
+QModelIndex indexB = model->index(1, 0, indexA);
+//! [5]
+
+
+//! [6]
+QVariant value = model->data(index, role);
+//! [6]
diff --git a/doc/src/snippets/code/doc_src_modules.qdoc b/doc/src/snippets/code/doc_src_modules.qdoc
new file mode 100644
index 0000000000..e9006fd693
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_modules.qdoc
@@ -0,0 +1,3 @@
+//! [0]
+QT -= gui
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_objecttrees.qdoc b/doc/src/snippets/code/doc_src_objecttrees.qdoc
new file mode 100644
index 0000000000..216027f279
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_objecttrees.qdoc
@@ -0,0 +1,20 @@
+//![0]
+int main()
+{
+    QWidget window;
+    QPushButton quit("Quit", &window);
+    ...
+}
+//![0]
+
+
+//![1]
+int main()
+{
+    QPushButton quit("Quit");
+    QWidget window;
+
+    quit.setParent(&window);
+    ...
+}
+//![1]
diff --git a/doc/src/snippets/code/doc_src_phonon-api.qdoc b/doc/src/snippets/code/doc_src_phonon-api.qdoc
new file mode 100644
index 0000000000..e2307929c4
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_phonon-api.qdoc
@@ -0,0 +1,224 @@
+//! [0]
+PushStream::PushStream(QObject *parent)
+  : AbstractMediaStream(parent), m_timer(new QTimer(this))
+{
+  setStreamSize(getMediaStreamSize());
+
+  connect(m_timer, SIGNAL(timeout()), SLOT(moreData()));
+  m_timer->setInterval(0);
+}
+
+void PushStream::moreData()
+{
+  const QByteArray data = getMediaData();
+  if (data.isEmpty()) {
+    endOfData();
+  } else {
+    writeData(data);
+  }
+}
+
+void PushStream::needData()
+{
+  m_timer->start();
+  moreData();
+}
+
+void PushStream::enoughData()
+{
+  m_timer->stop();
+}
+//! [0]
+
+
+//! [1]
+PullStream::PullStream(QObject *parent)
+  : AbstractMediaStream(parent)
+{
+  setStreamSize(getMediaStreamSize());
+}
+
+void PullStream::needData()
+{
+  const QByteArray data = getMediaData();
+  if (data.isEmpty()) {
+    endOfData();
+  } else {
+    writeData(data);
+  }
+}
+//! [1]
+
+
+//! [2]
+seekStream(0);
+//! [2]
+
+
+//! [3]
+MediaObject m;
+QString fileName("/home/foo/bar.ogg");
+QUrl url("http://www.example.com/stream.mp3");
+QBuffer *someBuffer;
+m.setCurrentSource(fileName);
+m.setCurrentSource(url);
+m.setCurrentSource(someBuffer);
+m.setCurrentSource(Phonon::Cd);
+//! [3]
+
+
+//! [4]
+VideoPlayer *player = new VideoPlayer(Phonon::VideoCategory, parentWidget);
+connect(player, SIGNAL(finished()), player, SLOT(deleteLater()));
+player->play(url);
+//! [4]
+
+
+//! [5]
+audioPlayer->load(url);
+audioPlayer->play();
+//! [5]
+
+
+//! [6]
+media = new MediaObject(this);
+connect(media, SIGNAL(finished()), SLOT(slotFinished());
+media->setCurrentSource("/home/username/music/filename.ogg");
+
+...
+
+media->play();
+//! [6]
+
+
+//! [7]
+media->setCurrentSource(":/sounds/startsound.ogg");
+media->enqueue("/home/username/music/song.mp3");
+media->enqueue(":/sounds/endsound.ogg");
+//! [7]
+
+
+//! [8]
+  media->setCurrentSource(":/sounds/startsound.ogg");
+  connect(media, SIGNAL(aboutToFinish()), SLOT(enqueueNextSource()));
+}
+
+void enqueueNextSource()
+{
+  media->enqueue("/home/username/music/song.mp3");
+}
+//! [8]
+
+
+//! [9]
+int x = 200;
+media->setTickInterval(x);
+Q_ASSERT(x == producer->tickInterval());
+//! [9]
+
+
+//! [10]
+int x = 200;
+media->setTickInterval(x);
+Q_ASSERT(x >= producer->tickInterval() &&
+         x <= 2producer->tickInterval());
+//! [10]
+
+
+//! [11]
+  connect(media, SIGNAL(hasVideoChanged(bool)), hasVideoChanged(bool));
+  media->setCurrentSource("somevideo.avi");
+  media->hasVideo(); // returns false;
+}
+
+void hasVideoChanged(bool b)
+{
+  // b == true
+  media->hasVideo(); // returns true;
+}
+//! [11]
+
+
+//! [12]
+  connect(media, SIGNAL(hasVideoChanged(bool)), hasVideoChanged(bool));
+  media->setCurrentSource("somevideo.avi");
+  media->hasVideo(); // returns false;
+}
+
+void hasVideoChanged(bool b)
+{
+  // b == true
+  media->hasVideo(); // returns true;
+}
+//! [12]
+
+
+//! [13]
+setMetaArtist(media->metaData("ARTIST"));
+setMetaAlbum(media->metaData("ALBUM"));
+setMetaTitle(media->metaData("TITLE"));
+setMetaDate(media->metaData("DATE"));
+setMetaGenre(media->metaData("GENRE"));
+setMetaTrack(media->metaData("TRACKNUMBER"));
+setMetaComment(media->metaData("DESCRIPTION"));
+//! [13]
+
+
+//! [14]
+QUrl url("http://www.example.com/music.ogg");
+media->setCurrentSource(url);
+//! [14]
+
+
+//! [15]
+progressBar->setRange(0, 100); // this is the default
+connect(media, SIGNAL(bufferStatus(int)), progressBar, SLOT(setValue(int)));
+//! [15]
+
+
+//! [16]
+QObject::connect(BackendCapabilities::notifier(), SIGNAL(capabilitiesChanged()), ...
+//! [16]
+
+
+//! [17]
+QComboBox *cb = new QComboBox(parentWidget);
+ObjectDescriptionModel *model = new ObjectDescriptionModel(cb);
+model->setModelData(BackendCapabilities::availableAudioOutputDevices());
+cb->setModel(model);
+cb->setCurrentIndex(0); // select first entry
+//! [17]
+
+
+//! [18]
+int cbIndex = cb->currentIndex();
+AudioOutputDevice selectedDevice = model->modelData(cbIndex);
+//! [18]
+
+
+//! [19]
+Path path = Phonon::createPath(...);
+Effect *effect = new Effect(this);
+path.insertEffect(effect);
+//! [19]
+
+
+//! [20]
+MediaObject *media = new MediaObject;
+AudioOutput *output = new AudioOutput(Phonon::MusicCategory);
+Path path = Phonon::createPath(media, output);
+Q_ASSERT(path.isValid()); // for this simple case the path should always be
+                          //valid - there are unit tests to ensure it
+// insert an effect
+QList<EffectDescription> effectList = BackendCapabilities::availableAudioEffects();
+if (!effectList.isEmpty()) {
+    Effect *effect = path.insertEffect(effectList.first());
+}
+//! [20]
+
+
+//! [21]
+MediaObject *media = new MediaObject(parent);
+VideoWidget *vwidget = new VideoWidget(parent);
+Phonon::createPath(media, vwidget);
+//! [21]
diff --git a/doc/src/snippets/code/doc_src_phonon.qdoc b/doc/src/snippets/code/doc_src_phonon.qdoc
new file mode 100644
index 0000000000..3e4bce49fd
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_phonon.qdoc
@@ -0,0 +1,13 @@
+//! [0]
+QT += phonon
+//! [0]
+
+
+//! [1]
+QT += phonon
+//! [1]
+
+
+//! [2]
+#include <Phonon/MediaObject>
+//! [2]
diff --git a/doc/src/snippets/code/doc_src_platform-notes.qdoc b/doc/src/snippets/code/doc_src_platform-notes.qdoc
new file mode 100644
index 0000000000..ed56a08990
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_platform-notes.qdoc
@@ -0,0 +1,39 @@
+//! [0]
+undefined reference to `_vt.11QPushButton'
+//! [0]
+
+
+//! [1]
+ANSI C++ forbids declaration ... with no type
+//! [1]
+
+
+//! [2]
+c:\program.obj not found
+//! [2]
+
+
+//! [3]
+-universal -sdk /Developer/SDKs/MacOSX10.4u.sdk
+//! [3]
+
+
+//! [4]
+QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk 
+CONFIG+=x86 ppc
+//! [4]
+
+
+//! [5]
+/usr/bin/ld: /System/Library/Frameworks/Carbon.framework/Carbon
+load command 20 unknown cmd field
+/usr/bin/ld: /usr/lib/libSystem.dylib
+load command 6 unknown cmd field
+//! [5]
+
+
+//! [6]
+ld: common symbols not allowed with MH_DYLIB output format with the -multi_module option
+/usr/local/mysql/lib/libmysqlclient.a(my_error.o) definition of common _errbuff (size 512)
+/usr/bin/libtool: internal link edit command failed
+//! [6]
diff --git a/doc/src/snippets/code/doc_src_plugins-howto.qdoc b/doc/src/snippets/code/doc_src_plugins-howto.qdoc
new file mode 100644
index 0000000000..45c869087a
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_plugins-howto.qdoc
@@ -0,0 +1,67 @@
+//! [0]
+class MyStylePlugin : public QStylePlugin
+{
+public:
+    QStringList keys() const;
+    QStyle *create(const QString &key);
+};
+//! [0]
+
+
+//! [1]
+#include "mystyleplugin.h"
+
+QStringList MyStylePlugin::keys() const
+{
+    return QStringList() << "MyStyle";
+}
+
+QStyle *MyStylePlugin::create(const QString &key)
+{
+    if (key.toLower() == "mystyle")
+        return new MyStyle;
+    return 0;
+}
+
+Q_EXPORT_PLUGIN2(pnp_mystyleplugin, MyStylePlugin)
+//! [1]
+
+
+//! [2]
+QApplication::setStyle(QStyleFactory::create("MyStyle"));
+//! [2]
+
+
+//! [3]
+CONFIG += release
+//! [3]
+
+
+//! [4]
+#include <QApplication>
+#include <QtPlugin>
+
+Q_IMPORT_PLUGIN(qjpeg)
+Q_IMPORT_PLUGIN(qgif)
+Q_IMPORT_PLUGIN(qkrcodecs)
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    ...
+    return app.exec();
+}
+//! [4]
+
+
+//! [5]
+QTPLUGIN     += qjpeg \
+                qgif \
+                qkrcodecs
+//! [5]
+
+
+//! [6]
+HKEY_CURRENT_USER\Software\Trolltech\OrganizationDefaults\Qt Plugin Cache 4.2.debug
+HKEY_CURRENT_USER\Software\Trolltech\OrganizationDefaults\Qt Plugin Cache 4.2.false
+//! [6]
diff --git a/doc/src/snippets/code/doc_src_porting-qsa.qdoc b/doc/src/snippets/code/doc_src_porting-qsa.qdoc
new file mode 100644
index 0000000000..0dc572cd95
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_porting-qsa.qdoc
@@ -0,0 +1,187 @@
+//! [0]
+point = new Object();
+point.x = 12;
+point.y = 35;
+//! [0]
+
+
+//! [1]
+function manhattanLength(point) {  
+    return point.x + point.y;
+}
+//! [1]
+
+
+//! [2]
+manhattanLength = function(point) {
+   return point.x + point.y;
+}
+//! [2]
+
+
+//! [3]
+point.manhattanLength = function() {
+    return this.x + this.y;
+}
+print(point.manhattanLength()); // prints 47
+//! [3]
+
+
+//! [4]
+class Point() {
+    var x;
+    var y;
+    function manhattanLength() { return x + y; }
+}
+//! [4]
+
+
+//! [5]
+point.manhattanLength = function() {
+    return this.x + this.y;
+}
+print(point.manhattanLength()); // prints 47
+//! [5]
+
+
+//! [6]
+class Car {
+    var regNumber;
+    function Car(regnr) {
+        regNumber = regnr;
+    }
+}
+var car = new Car("ABC 123");
+//! [6]
+
+
+//! [7]
+function Car(regnr) {
+    this.regNumber = regnr;
+}
+var car = new Car("ABC 123");
+//! [7]
+
+
+//! [8]
+var car = new Object();
+car.constructor = function(regnr) { ... }
+car.constructor();
+//! [8]
+
+
+//! [9]
+class Car {
+    var regNumber;
+    function Car(regnr) {
+        regNumber = regnr;
+    }
+    function toString() {
+        return regNumber;
+    }
+}
+//! [9]
+
+
+//! [10]
+function Car(regnr) {
+    this.regNumber = regnr;
+    this.toString = function() { return this.regNumber; }
+}
+//! [10]
+
+
+//! [11]
+function Car(regnr) {
+    this.regNumber = regnr;
+}
+Car.prototype.toString = function() { return this.regNumber; }
+//! [11]
+
+
+//! [12]
+class GasolineCar extends Car {
+    function GasolineCar(regnr) {
+        Car(regnr);
+    }
+    function toString() {
+        return "GasolineCar(" + regNumber + ")";
+    }
+}
+//! [12]
+
+
+//! [13]
+function GasolineCar(regnr) {
+    Car(regnr); 
+}
+GasolineCar.prototype = new Car();
+GasolineCar.prototype.toString = function() { 
+    return "GasolineCar(" + this.regNumber + ")"; 
+}
+//! [13]
+
+
+//! [14]
+class Car {
+    static var globalCount = 0;
+}     
+print(Car.globalCount);
+//! [14]
+
+
+//! [15]
+Car.globalCount = 0;
+print(Car.globalCount);
+//! [15]
+
+
+//! [16]
+QPushButton *button = new QPushButton();
+button->setObjectName("button");
+interpreter->addTransientObject(button);
+//! [16]
+
+
+//! [17]
+QPushButton *button = new QPushButton();
+QScriptValue scriptButton = engine.newQObject(button);
+engine.globalObject().setProperty("button", scriptButton);
+//! [17]
+
+
+//! [18]
+ModuleFactory::ModuleFactory()
+{
+    registerClass( "ImageSource", &ImgSource::staticMetaObject);
+    ...
+}
+
+QObject *ModuleFactory::create( const QString &type,
+        			const QVariantList &,
+        			QObject * )
+{
+    if ( type == "ImageSource" )
+        return new ImgSource();
+    ...
+}
+
+...
+
+interpreter.addObjectFactory(new ModuleFactory());
+//! [18]
+
+
+//! [19]
+QScriptValue construct_QPushButton(QScriptContext *, QScriptEngine *engine) {
+    return engine->newQObject(new QPushButton());
+}
+
+...
+
+QScriptValue constructor = engine.newFunction(construct_QPushButton);
+QScriptValue value =
+    engine.newQMetaObject(&QPushButton::staticMetaObject,
+                          constructor);
+engine.globalObject().setProperty("QPushButton", value);
+//! [19]
diff --git a/doc/src/snippets/code/doc_src_porting4-canvas.qdoc b/doc/src/snippets/code/doc_src_porting4-canvas.qdoc
new file mode 100644
index 0000000000..e386607549
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_porting4-canvas.qdoc
@@ -0,0 +1,116 @@
+//! [0]
+item->scene().sceneRect().intersects(item->sceneBoundingRect());
+//! [0]
+
+
+//! [1]
+class TileScene : public QGraphicsScene
+{
+public:
+    ...
+
+    void setTiles(const QPixmap &pixmap, int h, int v,
+                  int tileHeight, int tileWidth);
+    void setTile(int x, int y, int tilenum);
+
+private:
+    QRect tileRect(int x, int y) const;
+    QRect tileRect(int tileNum) const;
+
+    QVector<QVector<int> > tiles;
+    QPixmap tilePixmap;
+    int tileW, tileH;
+    int hTiles, vTiles;
+};
+//! [1]
+
+
+//! [2]
+void TileScene::setTiles(const QPixmap &pixmap, int h, int v,
+                         int tileHeight, int tileWidth)
+{
+    tilePixmap = pixmap;
+    tileW = tileWidth;
+    tileH = tileHeight;
+    hTiles = h;
+    vTiles = v;
+
+    tiles.resize(v);
+    for (int y = 0; y < v; ++y)
+        tiles[y].resize(h);
+}
+//! [2]
+
+
+//! [3]
+void TileScene::setTile(int x, int y, int tilenum)
+{
+    tiles[y][x] = tilenum;
+    update(tileRect(x, y));
+}
+//! [3]
+
+
+//! [4]
+QRect TileScene::tileRect(int x, int y) const
+{
+    return QRect(x * tileW, y * tileH, tileW, tileH);
+}
+//! [4]
+
+
+//! [5]
+QRect TileScene::tileRect(int tileNum) const
+{
+    int numHTiles = tilePixmap.width() / tileW;
+    int numVTiles = tilePixmap.height() / tileH;
+    return tileRect(tileNum % numHTiles, tileNum / numHTiles);
+}
+//! [5]
+
+
+//! [6]
+void drawBackground(QPainter *painter, const QRectF &exposed)
+{
+    for (int y = 0; y < vTiles; ++y) {
+        for (int x = 0; x < hTiles; ++x) {
+            QRect destRect = tileRect(x, y);
+            if (exposed.intersects(destRect)) {
+                painter->drawPixmap(destRect, tilePixmap,
+                                    tileRect(tiles[y][x]));
+            }
+        }
+    }
+}
+//! [6]
+
+
+//! [7]
+    // Before
+    Q3CanvasEllipse ellipse(10, 10);
+
+    // After
+    QGraphicsEllipseItem ellipse(-5, -5, 10, 10);
+//! [7]
+
+
+//! [8]
+static QPainterPath fromControlPoints(const Q3PointArray &pa)
+{
+    QPainterPath path;
+    path.moveTo(pa[0]);
+    for (int i = 1; i < pa.size(); i += 3)
+        path.cubicTo(pa[i], pa[(i + 1) % pa.size()], pa[(i + 2) % pa.size()]);
+    return path;
+}
+//! [8]
+
+
+//! [9]
+wildcardPath.replace("%1", "*");
+QFileInfo fi(wildcardPath);
+
+QList<QPixmap> frames;
+foreach (QString entry, QDir(fi.path(), fi.fileName()).entryList())
+    frames << QPixmap(fi.path() + "/" + entry);
+//! [9]
diff --git a/doc/src/snippets/code/doc_src_porting4-designer.qdoc b/doc/src/snippets/code/doc_src_porting4-designer.qdoc
new file mode 100644
index 0000000000..d4abaa0497
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_porting4-designer.qdoc
@@ -0,0 +1,159 @@
+//! [0]
+namespace Ui {
+
+class HelloWorld
+{
+public:
+    QVBoxLayout *vboxLayout;
+    QPushButton *pushButton;
+
+    void setupUi(QWidget *HelloWorld)
+    {
+        HelloWorld->setObjectName(QString::fromUtf8("HelloWorld"));
+
+        vboxLayout = new QVBoxLayout(HelloWorld);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+
+        pushButton = new QPushButton(HelloWorld);
+        pushButton->setObjectName(QString::fromUtf8("pushButton"));
+
+        vboxLayout->addWidget(pushButton);
+
+        retranslateUi(HelloWorld);
+    }
+};
+
+}
+//! [0]
+
+
+//! [1]
+#include <QApplication>
+#include <QWidget>
+
+#include "ui_helloworld.h"   // defines Ui::HelloWorld
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QWidget w;
+    Ui::HelloWorld ui;
+    ui.setupUi(&w);
+
+    w.show();
+    return app.exec();
+}
+//! [1]
+
+
+//! [2]
+#include <QApplication>
+#include <QWidget>
+
+#include "ui_helloworld.h"   // defines Ui::HelloWorld
+
+class HelloWorldWidget : public QWidget, public Ui::HelloWorld
+{
+    Q_OBJECT
+
+public:
+    HelloWorldWidget(QWidget *parent = 0)
+        : QWidget(parent)
+    { setupUi(this); }
+};
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    HelloWorldWidget w;
+    w.show();
+    return app.exec();
+}
+//! [2]
+
+
+//! [3]
+uic3 myform.ui > myform.h
+uic3 -impl myform.h myform.ui > myform.cpp
+//! [3]
+
+
+//! [4]
+uic3 -convert myform3.ui > myform4.ui
+//! [4]
+
+
+//! [5]
+class HelloWorldWidget : public QWidget, public Ui::HelloWorld
+{
+    Q_OBJECT
+
+public:
+    HelloWorldWidget(QWidget *parent = 0);
+
+public slots:
+    void mySlot();
+};
+
+HelloWorldWidget::HelloWorldWidget(QWidget *parent)
+    : QWidget(parent)
+{
+    setupUi(this);
+
+    QObject::connect(pushButton, SIGNAL(clicked()),
+                     this, SLOT(mySlot()));
+}
+
+void HelloWorldWidget::mySlot()
+{
+    ...
+}
+//! [5]
+
+
+//! [6]
+class HelloWorldWidget : public QWidget, public Ui::HelloWorld
+{
+    Q_OBJECT
+
+public:
+    HelloWorldWidget(QWidget *parent = 0);
+
+public slots:
+    void on_pushButton_clicked();
+};
+
+HelloWorldWidget::HelloWorldWidget(QWidget *parent)
+    : QWidget(parent)
+{
+    setupUi(this);
+}
+
+void HelloWorldWidget::on_pushButton_clicked()
+{
+    ...
+}
+//! [6]
+
+
+//! [7]
+<RCC version="1.0">
+    <qresource prefix="/icons">
+        <file>yes.png</file>
+        <file>no.png</file>
+    </qresource>
+</RCC>
+//! [7]
+
+
+//! [8]
+RESOURCES += icons.qrc
+//! [8]
+
+
+//! [9]
+QFile file(":/icons/yes.png");
+QIcon icon(":/icons/no.png");
+QPixmap pixmap(":/icons/no.png");
+//! [9]
diff --git a/doc/src/snippets/code/doc_src_porting4.qdoc b/doc/src/snippets/code/doc_src_porting4.qdoc
new file mode 100644
index 0000000000..14fddf8e22
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_porting4.qdoc
@@ -0,0 +1,473 @@
+//! [0]
+void MyButton::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+    drawButton(&painter);
+}
+//! [0]
+
+
+//! [1]
+ba.at(0) = 'X';
+//! [1]
+
+
+//! [2]
+ba[0] = 'X';
+//! [2]
+
+
+//! [3]
+if (!cache.insert(key, object))
+    delete object;
+//! [3]
+
+
+//! [4]
+cache.insert(key, object);
+//! [4]
+
+
+//! [5]
+Q3Cache<QWidget> cache;
+cache.insert(widget->name(), widget);
+...
+QWidget *foo = cache.take("foo");
+if (foo)
+    foo->show();
+//! [5]
+
+
+//! [6]
+typedef QWidget *QWidgetPtr;
+QCache<QString, QWidgetPtr> cache;
+cache.insert(widget->name(), new QWidgetPtr(widget));
+...
+QWidgetPtr *ptr = cache.take("foo");
+if (ptr) {
+    QWidget *foo = *ptr;
+    delete ptr;
+    foo->show();
+}
+//! [6]
+
+
+//! [7]
+painter.setBrush(palette().brush(QPalette::Text));
+//! [7]
+
+
+//! [8]
+QByteArray ba("Hello");
+ba.size();             // returns 5 (the '\0' is not counted)
+ba.length();           // returns 5
+ba.data()[5];          // returns '\0'
+//! [8]
+
+
+//! [9]
+dict.replace(key, value);
+//! [9]
+
+
+//! [10]
+delete hash.take(key);
+hash.insert(key, value);
+//! [10]
+
+
+//! [11]
+dict.remove(key, value);
+//! [11]
+
+
+//! [12]
+delete hash.take(key);
+//! [12]
+
+
+//! [13]
+dict.clear();
+//! [13]
+
+
+//! [14]
+while (!hash.isEmpty()) {
+    T *value = *hash.begin();
+    hash.erase(hash.begin());
+    delete value;
+}
+//! [14]
+
+
+//! [15]
+qDeleteAll(hash);
+hash.clear();
+//! [15]
+
+
+//! [16]
+Q3DictIterator<QWidget> i(dict);
+while (i.current() != 0) {
+    do_something(i.currentKey(), i.current());
+    ++i;
+}
+//! [16]
+
+
+//! [17]
+QHashIterator<QString, QWidget *> i(hash);
+while (i.hasNext()) {
+    i.next();                   // must come first
+    do_something(i.key(), i.value());
+}
+//! [17]
+
+
+//! [18]
+QList<QWidget *> myWidgets = qFindChildren<QWidget *>(myParent);
+//! [18]
+
+
+//! [19]
+list.replace(index, value);
+//! [19]
+
+
+//! [20]
+delete list[index];
+list[index] = value;
+//! [20]
+
+
+//! [21]
+list.removeFirst();
+//! [21]
+
+
+//! [22]
+delete list.takeFirst();
+//! [22]
+
+
+//! [23]
+list.removeLast();
+//! [23]
+
+
+//! [24]
+delete list.takeLast();
+//! [24]
+
+
+//! [25]
+list.remove(index);
+//! [25]
+
+
+//! [26]
+delete list.takeAt(index);
+//! [26]
+
+
+//! [27]
+list.remove(value);
+//! [27]
+
+
+//! [28]
+int i = list.indexOf(value);
+if (i != -1)
+    delete list.takeAt(i);
+//! [28]
+
+
+//! [29]
+list.remove();
+//! [29]
+
+
+//! [30]
+QMutableListIterator<T *> i;
+...
+delete i.value();
+i.remove();
+//! [30]
+
+
+//! [31]
+list.clear();
+//! [31]
+
+
+//! [32]
+while (!list.isEmpty())
+    delete list.takeFirst();
+//! [32]
+
+
+//! [33]
+qDeleteAll(list);
+list.clear();
+//! [33]
+
+
+//! [34]
+QPtrList<QWidget> list;
+...
+while (list.current() != 0) {
+    do_something(list.current());
+    list.next();
+}
+//! [34]
+
+
+//! [35]
+QList<QWidget *> list;
+...
+QListIterator<QWidget *> i(list);
+while (i.hasNext())
+    do_something(i.next());
+//! [35]
+
+
+//! [36]
+QPtrList<QWidget> list;
+...
+QPtrListIterator<QWidget> i;
+while (i.current() != 0) {
+    do_something(i.current());
+    i.next();
+}
+//! [36]
+
+
+//! [37]
+QList<QWidget *> list;
+...
+QListIterator<QWidget *> i(list);
+while (i.hasNext())
+    do_something(i.next());
+//! [37]
+
+
+//! [38]
+queue.dequeue();
+//! [38]
+
+
+//! [39]
+delete queue.dequeue();
+//! [39]
+
+
+//! [40]
+queue.remove();
+//! [40]
+
+
+//! [41]
+delete queue.dequeue();
+//! [41]
+
+
+//! [42]
+queue.clear();
+//! [42]
+
+
+//! [43]
+while (!queue.isEmpty())
+    delete queue.dequeue();
+//! [43]
+
+
+//! [44]
+qDeleteAll(queue);
+queue.clear();
+//! [44]
+
+
+//! [45]
+stack.pop();
+//! [45]
+
+
+//! [46]
+delete stack.pop();
+//! [46]
+
+
+//! [47]
+stack.remove();
+//! [47]
+
+
+//! [48]
+delete stack.pop();
+//! [48]
+
+
+//! [49]
+stack.clear();
+//! [49]
+
+
+//! [50]
+while (!stack.isEmpty())
+    delete stack.pop();
+//! [50]
+
+
+//! [51]
+qDeleteAll(stack);
+stack.clear();
+//! [51]
+
+
+//! [52]
+vect.insert(i, ptr);
+//! [52]
+
+
+//! [53]
+delete vect[i];
+vect[i] = ptr;
+//! [53]
+
+
+//! [54]
+vect.remove(i);
+//! [54]
+
+
+//! [55]
+delete vect[i];
+vect[i] = 0;
+//! [55]
+
+
+//! [56]
+T *ptr = vect.take(i);
+//! [56]
+
+
+//! [57]
+T *ptr = vect[i];
+vect[i] = 0;
+//! [57]
+
+
+//! [58]
+vect.resize(n)
+//! [58]
+
+
+//! [59]
+while (n > vect.size())
+    vect.append(0);
+while (n < vect.size() {
+    T *ptr = vect.last();
+    vect.remove(vect.size() - 1);
+    delete ptr;
+}
+//! [59]
+
+
+//! [60]
+vect.clear();
+//! [60]
+
+
+//! [61]
+for (int i = 0; i < vect.size(); ++i)
+    T *ptr = vect[i];
+    vect[i] = 0;
+    delete ptr;
+}
+//! [61]
+
+
+//! [62]
+qDeleteAll(vect);
+vect.clear();
+//! [62]
+
+
+//! [63]
+struct Shared
+{
+    Shared() : count(1) {}
+    void ref() { ++count; }
+    bool deref() { return !--count; }
+    uint count;
+};
+//! [63]
+
+//! [63a]
+// Declare the object
+QSimpleRichText richText(text, font);
+
+// Set the width of the paragraph to w
+richText.setWidth(w);
+
+// Or set a resonable default size
+richText.adjustSize();
+
+// Query for its used size
+int width = richText.widthUsed();
+int height = richText.height();
+
+// Draw
+richText.draw(painter, x, y, clipRect, colorGroup);
+//! [63a]
+
+
+//! [63b]
+// Declare the object
+QTextDocument doc;
+
+// If text is rich text, use setHtml()
+doc.setHtml(text);
+
+// Otherwise, use setPlainText()
+doc.setPlainText(text);
+
+// Set the width of the paragraph of text to w
+doc.setTextWidth(w);
+
+// Query for the used size
+int width = doc.idealWidth();
+int height = doc.size().height();
+
+// Draw
+painter.translate(x, y);
+doc.drawContents(painter, clipRect);
+
+// If you have a palette/colorgroup you can draw using lower-level functions:
+QAbstractTextDocumentLayout::PaintContext context;
+context.palette = myPalette;
+doc.documentLayout()->draw(painter, context);
+//! [63b]
+
+//! [63c]
+QSlider *slider;
+slider->style()->subControlRect(CC_Slider, sliderOption, SC_SliderHandle, slider);
+//! [63c]
+
+//! [64]
+QString greeting = "Hello";
+const char *badData = greeting.toAscii().constData(); // data is invalid
+QByteArray asciiData = greeting.toAscii();
+const char *goodData = asciiData.constData();
+//! [64]
+
+
+//! [65]
+str.at(0) = 'X';
+//! [65]
+
+
+//! [66]
+str[0] = 'X';
+//! [66]
diff --git a/doc/src/snippets/code/doc_src_properties.qdoc b/doc/src/snippets/code/doc_src_properties.qdoc
new file mode 100644
index 0000000000..ba7f79be57
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_properties.qdoc
@@ -0,0 +1,77 @@
+//! [0]
+Q_PROPERTY(type name
+           READ getFunction
+           [WRITE setFunction]
+           [RESET resetFunction]
+           [DESIGNABLE bool]
+           [SCRIPTABLE bool]
+           [STORED bool]
+	   [USER bool])
+//! [0]
+
+
+//! [1]
+Q_PROPERTY(bool focus READ hasFocus)
+Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled)
+Q_PROPERTY(QCursor cursor READ cursor WRITE setCursor RESET unsetCursor)
+//! [1]
+
+
+//! [2]
+Q_PROPERTY(QDate date READ getDate WRITE setDate)
+//! [2]
+
+
+//! [3]
+QPushButton *button = new QPushButton;
+QObject *object = button;
+
+button->setDown(true);
+object->setProperty("down", true);
+//! [3]
+
+
+//! [4]
+QObject *object = ...
+const QMetaObject *metaobject = object->metaObject();
+int count = metaobject->propertyCount();
+for (int i=0; i<count; ++i) {
+    QMetaProperty metaproperty = metaobject->property(i);
+    const char *name = metaproperty.name();
+    QVariant value = object->property(name);
+    ...
+}
+//! [4]
+
+
+//! [5]
+class MyClass : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(Priority priority READ priority WRITE setPriority)
+    Q_ENUMS(Priority)
+
+public:
+    MyClass(QObject *parent = 0);
+    ~MyClass();
+
+    enum Priority { High, Low, VeryHigh, VeryLow };
+
+    void setPriority(Priority priority);
+    Priority priority() const;
+};
+//! [5]
+
+
+//! [6]
+MyClass *myinstance = new MyClass;
+QObject *object = myinstance;
+
+myinstance->setPriority(MyClass::VeryHigh);
+object->setProperty("priority", "VeryHigh");
+//! [6]
+
+
+//! [7]
+Q_CLASSINFO("Version", "3.0.0")
+//! [7]
diff --git a/doc/src/snippets/code/doc_src_q3asciidict.qdoc b/doc/src/snippets/code/doc_src_q3asciidict.qdoc
new file mode 100644
index 0000000000..e2c876afba
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_q3asciidict.qdoc
@@ -0,0 +1,52 @@
+//! [0]
+Q3AsciiDict<QLineEdit> fields; // char* keys, QLineEdit* values
+fields.insert( "forename", new QLineEdit( this ) );
+fields.insert( "surname", new QLineEdit( this ) );
+
+fields["forename"]->setText( "Homer" );
+fields["surname"]->setText( "Simpson" );
+
+Q3AsciiDictIterator<QLineEdit> it( fields ); // See Q3AsciiDictIterator
+for( ; it.current(); ++it )
+    cout << it.currentKey() << ": " << it.current()->text() << endl;
+cout << endl;
+
+if ( fields["forename"] && fields["surname"] )
+    cout << fields["forename"]->text() << " " 
+	<< fields["surname"]->text() << endl;  // Prints "Homer Simpson"
+
+fields.remove( "forename" ); // Does not delete the line edit
+if ( ! fields["forename"] )
+    cout << "forename is not in the dictionary" << endl;
+//! [0]
+
+
+//! [1]
+Q3AsciiDict<char> dict;
+    ...
+if ( dict.find(key) )
+    dict.remove( key );
+dict.insert( key, item );
+//! [1]
+
+
+//! [2]
+Q3AsciiDict<QLineEdit> fields;
+fields.insert( "forename", new QLineEdit( this ) );
+fields.insert( "surname", new QLineEdit( this ) );
+fields.insert( "age", new QLineEdit( this ) );
+
+fields["forename"]->setText( "Homer" );
+fields["surname"]->setText( "Simpson" );
+fields["age"]->setText( "45" );
+
+Q3AsciiDictIterator<QLineEdit> it( fields );
+for( ; it.current(); ++it )
+    cout << it.currentKey() << ": " << it.current()->text() << endl;
+cout << endl;
+
+// Output (random order):
+//	age: 45
+//	surname: Simpson
+//	forename: Homer
+//! [2]
diff --git a/doc/src/snippets/code/doc_src_q3dict.qdoc b/doc/src/snippets/code/doc_src_q3dict.qdoc
new file mode 100644
index 0000000000..f79d0f7396
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_q3dict.qdoc
@@ -0,0 +1,29 @@
+//! [0]
+Q3Dict<char> dict;
+    ...
+if ( dict.find( key ) )
+    dict.remove( key );
+dict.insert( key, item );
+//! [0]
+
+
+//! [1]
+Q3Dict<QLineEdit> fields;
+fields.insert( "forename", new QLineEdit( this ) );
+fields.insert( "surname", new QLineEdit( this ) );
+fields.insert( "age", new QLineEdit( this ) );
+
+fields["forename"]->setText( "Homer" );
+fields["surname"]->setText( "Simpson" );
+fields["age"]->setText( "45" );
+
+Q3DictIterator<QLineEdit> it( fields );
+for( ; it.current(); ++it )
+    cout << it.currentKey() << ": " << it.current()->text() << endl;
+cout << endl;
+
+// Output (random order):
+//	age: 45
+//	surname: Simpson
+//	forename: Homer
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_q3intdict.qdoc b/doc/src/snippets/code/doc_src_q3intdict.qdoc
new file mode 100644
index 0000000000..0fae2c8545
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_q3intdict.qdoc
@@ -0,0 +1,51 @@
+//! [0]
+Q3IntDict<QLineEdit> fields; // long int keys, QLineEdit* values
+for ( int i = 0; i < 3; i++ )
+    fields.insert( i, new QLineEdit( this ) );
+
+fields[0]->setText( "Homer" );
+fields[1]->setText( "Simpson" );
+fields[2]->setText( "45" );
+
+Q3IntDictIterator<QLineEdit> it( fields );
+for ( ; it.current(); ++it )
+    cout << it.currentKey() << ": " << it.current()->text() << endl;
+
+for ( int i = 0; i < 3; i++ )
+    cout << fields[i]->text() << " "; // Prints "Homer Simpson 45"
+cout << endl;
+
+fields.remove( 1 ); // Does not delete the line edit
+for ( int i = 0; i < 3; i++ )
+    if ( fields[i] )
+	cout << fields[i]->text() << " "; // Prints "Homer 45"
+//! [0]
+
+
+//! [1]
+Q3IntDict<char> dict;
+//	...
+if ( dict.find(key) )
+    dict.remove( key );
+dict.insert( key, item );
+//! [1]
+
+
+//! [2]
+Q3IntDict<QLineEdit> fields;
+for ( int i = 0; i < 3; i++ )
+    fields.insert( i, new QLineEdit( this ) );
+
+fields[0]->setText( "Homer" );
+fields[1]->setText( "Simpson" );
+fields[2]->setText( "45" );
+
+Q3IntDictIterator<QLineEdit> it( fields ); 
+for ( ; it.current(); ++it )
+    cout << it.currentKey() << ": " << it.current()->text() << endl;
+
+// Output (random order):
+//	0: Homer
+//	1: Simpson
+//	2: 45
+//! [2]
diff --git a/doc/src/snippets/code/doc_src_q3memarray.qdoc b/doc/src/snippets/code/doc_src_q3memarray.qdoc
new file mode 100644
index 0000000000..b56ef4e9b3
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_q3memarray.qdoc
@@ -0,0 +1,80 @@
+//! [0]
+#include <q3memarray.h>
+#include <stdio.h>
+
+Q3MemArray<int> fib( int num ) // returns fibonacci array
+{
+    Q_ASSERT( num > 2 );
+    Q3MemArray<int> f( num ); // array of ints
+
+    f[0] = f[1] = 1;
+    for ( int i = 2; i < num; i++ )
+	f[i] = f[i-1] + f[i-2];
+
+    return f;
+}
+
+int main()
+{
+    Q3MemArray<int> a = fib( 6 ); // get first 6 fibonaccis
+    for ( int i = 0; i < a.size(); i++ )
+	qDebug( "%d: %d", i, a[i] );
+
+    qDebug( "1 is found %d times", a.contains(1) );
+    qDebug( "5 is found at index %d", a.find(5) );
+
+    return 0;
+}
+//! [0]
+
+
+//! [1]
+0: 1
+1: 1
+2: 2
+3: 3
+4: 5
+5: 8
+1 is found 2 times
+5 is found at index 4
+//! [1]
+
+
+//! [2]
+// MyStruct may be padded to 4 or 8 bytes
+struct MyStruct
+{
+    short i; // 2 bytes
+    char c;  // 1 byte
+};
+
+Q3MemArray<MyStruct> a(1);
+a[0].i = 5;
+a[0].c = 't';
+
+MyStruct x;
+x.i = '5';
+x.c = 't';
+int i = a.find( x ); // may return -1 if the pad bytes differ
+//! [2]
+
+
+//! [3]
+static char bindata[] = { 231, 1, 44, ... };
+QByteArray	a;
+a.setRawData( bindata, sizeof(bindata) );	// a points to bindata
+QDataStream s( a, IO_ReadOnly );		// open on a's data
+s >> <something>;				// read raw bindata
+a.resetRawData( bindata, sizeof(bindata) ); // finished
+//! [3]
+
+
+//! [4]
+static char bindata[] = { 231, 1, 44, ... };
+QByteArray	a, b;
+a.setRawData( bindata, sizeof(bindata) );	// a points to bindata
+a.resize( 8 );				// will crash
+b = a;					// will crash
+a[2] = 123;					// might crash
+// forget to resetRawData: will crash
+//! [4]
diff --git a/doc/src/snippets/code/doc_src_q3ptrdict.qdoc b/doc/src/snippets/code/doc_src_q3ptrdict.qdoc
new file mode 100644
index 0000000000..d23824b19f
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_q3ptrdict.qdoc
@@ -0,0 +1,66 @@
+//! [0]
+Q3PtrDict<char> fields; // void* keys, char* values
+
+QLineEdit *le1 = new QLineEdit( this );
+le1->setText( "Simpson" );
+QLineEdit *le2 = new QLineEdit( this );
+le2->setText( "Homer" );
+QLineEdit *le3 = new QLineEdit( this );
+le3->setText( "45" );
+
+fields.insert( le1, "Surname" );
+fields.insert( le2, "Forename" );
+fields.insert( le3, "Age" );
+
+Q3PtrDictIterator<char> it( fields );
+for( ; it.current(); ++it )
+    cout << it.current() << endl;
+cout << endl;
+
+if ( fields[le1] ) // Prints "Surname: Simpson"
+    cout << fields[le1] << ": " << le1->text() << endl; 
+if ( fields[le2] ) // Prints "Forename: Homer"
+    cout << fields[le2] << ": " << le2->text() << endl; 
+
+fields.remove( le1 ); // Removes le1 from the dictionary
+cout << le1->text() << endl; // Prints "Simpson"
+//! [0]
+
+
+//! [1]
+Q3PtrDict<ItemType> dict;
+    ...
+if ( dict.find( key ) )
+    dict.remove( key );
+dict.insert( key, item );
+//! [1]
+
+
+//! [2]
+Q3PtrDict<char> fields;
+
+QLineEdit *le1 = new QLineEdit( this );
+le1->setText( "Simpson" );
+QLineEdit *le2 = new QLineEdit( this );
+le2->setText( "Homer" );
+QLineEdit *le3 = new QLineEdit( this );
+le3->setText( "45" );
+
+fields.insert( le1, "Surname" );
+fields.insert( le2, "Forename" );
+fields.insert( le3, "Age" );
+
+Q3PtrDictIterator<char> it( fields );
+for( ; it.current(); ++it ) {
+    QLineEdit *le = (QLineEdit)it.currentKey();
+    cout << it.current() << ": " << le->text() << endl;
+}
+cout << endl;
+
+// Output (random order):
+//  Forename: Homer
+//  Age: 45
+//  Surname: Simpson
+//! [2]
+
+
diff --git a/doc/src/snippets/code/doc_src_q3ptrlist.qdoc b/doc/src/snippets/code/doc_src_q3ptrlist.qdoc
new file mode 100644
index 0000000000..f416784f79
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_q3ptrlist.qdoc
@@ -0,0 +1,82 @@
+//! [0]
+class Employee
+{
+public:
+    Employee() : sn( 0 ) { }
+    Employee( const QString& forename, const QString& surname, int salary )
+	: fn( forename ), sn( surname ), sal( salary )
+    { }
+
+    void setSalary( int salary ) { sal = salary; }
+
+    QString forename() const { return fn; }
+    QString surname() const { return sn; }
+    int salary() const { return sal; }
+
+private:
+    QString fn;
+    QString sn;
+    int sal;
+};
+
+Q3PtrList<Employee> list;
+list.setAutoDelete( TRUE ); // the list owns the objects
+
+list.append( new Employee("John", "Doe", 50000) );
+list.append( new Employee("Jane", "Williams", 80000) );
+list.append( new Employee("Tom", "Jones", 60000) );
+
+Employee *employee;
+for ( employee = list.first(); employee; employee = list.next() )
+    cout << employee->surname().latin1() << ", " <<
+	    employee->forename().latin1() << " earns " <<
+	    employee->salary() << endl;
+cout << endl;
+
+// very inefficient for big lists
+for ( uint i = 0; i < list.count(); ++i )
+    if ( list.at(i) )
+	cout << list.at( i )->surname().latin1() << endl;
+//! [0]
+
+
+//! [1]
+Doe, John earns 50000
+Williams, Jane earns 80000
+Jones, Tom earns 60000
+
+Doe
+Williams
+Jones
+//! [1]
+
+
+//! [2]
+if ( list.findRef( item ) != -1 )
+    list.remove();
+//! [2]
+
+
+//! [3]
+Q3PtrList<Employee> list;
+
+list.append( new Employee("John", "Doe", 50000) );
+list.append( new Employee("Jane", "Williams", 80000) );
+list.append( new Employee("Tom", "Jones", 60000) );
+
+Q3PtrListIterator<Employee> it( list );
+Employee *employee;
+while ( (employee = it.current()) != 0 ) {
+    ++it;
+    cout << employee->surname().latin1() << ", " <<
+	    employee->forename().latin1() << " earns " <<
+	    employee->salary() << endl;
+}
+//! [3]
+
+
+//! [4]
+Doe, John earns 50000
+Williams, Jane earns 80000
+Jones, Tom earns 60000
+//! [4]
diff --git a/doc/src/snippets/code/doc_src_q3valuelist.qdoc b/doc/src/snippets/code/doc_src_q3valuelist.qdoc
new file mode 100644
index 0000000000..5a6d564ab8
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_q3valuelist.qdoc
@@ -0,0 +1,95 @@
+//! [0]
+class Employee
+{
+public:
+    Employee(): sn(0) {}
+    Employee( const QString& forename, const QString& surname, int salary )
+	: fn(forename), sn(surname), sal(salary)
+    {}
+
+    QString forename() const { return fn; }
+    QString surname() const { return sn; }
+    int salary() const { return sal; }
+    void setSalary( int salary ) { sal = salary; }
+
+private:
+    QString fn;
+    QString sn;
+    int sal;
+};
+
+typedef Q3ValueList<Employee> EmployeeList;
+EmployeeList list;
+
+list.append( Employee("John", "Doe", 50000) );
+list.append( Employee("Jane", "Williams", 80000) );
+list.append( Employee("Tom", "Jones", 60000) );
+
+Employee mary( "Mary", "Hawthorne", 90000 );
+list.append( mary );
+mary.setSalary( 100000 );
+
+EmployeeList::iterator it;
+for ( it = list.begin(); it != list.end(); ++it )
+    cout << (*it).surname().latin1() << ", " <<
+	    (*it).forename().latin1() << " earns " <<
+	    (*it).salary() << endl;
+
+// Output:
+// Doe, John earns 50000
+// Williams, Jane earns 80000
+// Hawthorne, Mary earns 90000
+// Jones, Tom earns 60000
+//! [0]
+
+
+//! [1]
+Q3ValueList<int> list;
+list.append( 1 );
+list.append( 2 );
+list.append( 3 );
+...
+if ( !list.empty() ) {
+    // OK, modify the first item
+    int& i = list.first();
+    i = 18;
+}
+...
+Q3ValueList<double> dlist;
+double d = dlist.last(); // undefined
+//! [1]
+
+
+//! [2]
+Q3ValueList<int> l;
+...
+Q3ValueList<int>::iterator it = l.end();
+--it;
+if ( it != end() )
+    // ...
+//! [2]
+
+
+//! [3]
+Q3ValueList<int> l;
+...
+Q3ValueList<int>::iterator it = l.end();
+--it;
+if ( it != end() )
+    // ...
+//! [3]
+
+
+//! [4]
+EmployeeList::iterator it;
+for ( it = list.begin(); it != list.end(); ++it )
+    cout << (*it).surname().latin1() << ", " <<
+	    (*it).forename().latin1() << " earns " <<
+	    (*it).salary() << endl;
+
+// Output:
+// Doe, John earns 50000
+// Williams, Jane earns 80000
+// Hawthorne, Mary earns 90000
+// Jones, Tom earns 60000
+//! [4]
diff --git a/doc/src/snippets/code/doc_src_q3valuestack.qdoc b/doc/src/snippets/code/doc_src_q3valuestack.qdoc
new file mode 100644
index 0000000000..61d564b34f
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_q3valuestack.qdoc
@@ -0,0 +1,13 @@
+//! [0]
+Q3ValueStack<int> stack;
+stack.push( 1 );
+stack.push( 2 );
+stack.push( 3 );
+while ( ! stack.isEmpty() )
+    cout << "Item: " << stack.pop() << endl;
+
+// Output:
+//	Item: 3
+//	Item: 2
+//	Item: 1
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_q3valuevector.qdoc b/doc/src/snippets/code/doc_src_q3valuevector.qdoc
new file mode 100644
index 0000000000..792bfacf2c
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_q3valuevector.qdoc
@@ -0,0 +1,85 @@
+//! [0]
+#include <qvaluevector.h>
+#include <qstring.h>
+#include <stdio.h>
+
+class Employee
+{
+public:
+    Employee(): s(0) {}
+    Employee( const QString& name, int salary )
+	: n( name ), s( salary )
+    { }
+
+    QString name()   const	 	{ return n; }
+    int	salary() const	 	{ return s; }
+    void	setSalary( int salary )	{ s = salary; }
+private:
+    QString n;
+    int     s;
+};
+
+int main()
+{
+    typedef Q3ValueVector<Employee> EmployeeVector;
+    EmployeeVector vec( 3 );  // vector of 3 Employees
+
+    vec[0] = Employee( "Bill", 50000 );
+    vec[1] = Employee( "Steve", 80000 );
+    vec[2] = Employee( "Ron", 60000 );
+
+    Employee joe( "Joe", 50000 );
+    vec.push_back( joe );  // vector expands to accommodate 4 Employees
+    joe.setSalary( 70000 );
+
+    EmployeeVector::iterator it;
+    for( it = vec.begin(); it != vec.end(); ++it )
+	printf( "%s earns %d\n", (*it).name().latin1(), (*it).salary() );
+
+    return 0;
+}
+//! [0]
+
+
+//! [1]
+Bill earns 50000
+Steve earns 80000
+Ron earns 60000
+Joe earns 50000
+//! [1]
+
+
+//! [2]
+Q3ValueVector<int> vec1;  // an empty vector
+vec1[10] = 4;  // WARNING: undefined, probably a crash
+
+Q3ValueVector<QString> vec2(25); // initialize with 25 elements
+vec2[10] = "Dave";  // OK
+//! [2]
+
+
+//! [3]
+void func( Q3ValueVector<int>& vec )
+{
+    if ( vec.size() > 10 ) {
+	vec[9] = 99; // OK
+    }
+};
+//! [3]
+
+
+//! [4]
+Q3ValueVector<int> vec( 3 );
+vec.push_back( 1 );
+vec.push_back( 2 );
+vec.push_back( 3 );
+...
+if ( !vec.empty() ) {
+    // OK: modify the first element
+    int& i = vec.front();
+    i = 18;
+}
+...
+Q3ValueVector<double> dvec;
+double d = dvec.back(); // undefined behavior
+//! [4]
diff --git a/doc/src/snippets/code/doc_src_qalgorithms.qdoc b/doc/src/snippets/code/doc_src_qalgorithms.qdoc
new file mode 100644
index 0000000000..69d943c89b
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qalgorithms.qdoc
@@ -0,0 +1,314 @@
+//! [0]
+QStringList list;
+list << "one" << "two" << "three";
+
+qFill(list.begin(), list.end(), "eleven");
+// list: [ "eleven", "eleven", "eleven" ]
+//! [0]
+
+
+//! [1]
+qFill(list.begin() + 1, list.end(), "six");
+// list: [ "eleven", "six", "six" ]
+//! [1]
+
+
+//! [2]
+QChar resolveEntity(const QString &entity)
+{
+    static const QLatin1String name_table[] = {
+        "AElig", "Aacute", ..., "zwnj"
+    };
+    static const ushort value_table[] = {
+        0x0061, 0x00c1, ..., 0x200c
+    };
+    int N = sizeof(name_table) / sizeof(name_table[0]);
+
+    const QLatin1String *name = qBinaryFind(name_table, name_table + N,
+                                            entity);
+    int index = name - name_table;
+    if (index == N)
+        return QChar();
+
+    return QChar(value_table[index]);
+}
+//! [2]
+
+
+//! [3]
+QChar resolveEntity(const QString &entity)
+{
+    static QMap<QString, int> entityMap;
+
+    if (!entityMap) {
+        entityMap.insert("AElig", 0x0061);
+        entityMap.insert("Aacute", 0x00c1);
+        ...
+        entityMap.insert("zwnj", 0x200c);
+    }
+    return QChar(entityMap.value(entity));
+}
+//! [3]
+
+
+//! [4]
+QStringList list;
+list << "one" << "two" << "three";
+
+QVector<QString> vect1(3);
+qCopy(list.begin(), list.end(), vect1.begin());
+// vect: [ "one", "two", "three" ]
+
+QVector<QString> vect2(8);
+qCopy(list.begin(), list.end(), vect2.begin() + 2);
+// vect: [ "", "", "one", "two", "three", "", "", "" ]
+//! [4]
+
+
+//! [5]
+QStringList list;
+list << "one" << "two" << "three";
+
+QVector<QString> vect(5);
+qCopyBackward(list.begin(), list.end(), vect.end());
+// vect: [ "", "", "one", "two", "three" ]
+//! [5]
+
+
+//! [6]
+QStringList list;
+list << "one" << "two" << "three";
+
+QVector<QString> vect(3);
+vect[0] = "one";
+vect[1] = "two";
+vect[2] = "three";
+
+bool ret1 = qEqual(list.begin(), list.end(), vect.begin());
+// ret1 == true
+
+vect[2] = "seven";
+bool ret2 = qEqual(list.begin(), list.end(), vect.begin());
+// ret2 == false
+//! [6]
+
+
+//! [7]
+QStringList list;
+list << "one" << "two" << "three";
+
+qFill(list.begin(), list.end(), "eleven");
+// list: [ "eleven", "eleven", "eleven" ]
+
+qFill(list.begin() + 1, list.end(), "six");
+// list: [ "eleven", "six", "six" ]
+//! [7]
+
+
+//! [8]
+QStringList list;
+list << "one" << "two" << "three";
+
+QStringList::iterator i1 = qFind(list.begin(), list.end(), "two");
+// i1 == list.begin() + 1
+
+QStringList::iterator i2 = qFind(list.begin(), list.end(), "seventy");
+// i2 == list.end()
+//! [8]
+
+
+//! [9]
+QList<int> list;
+list << 3 << 3 << 6 << 6 << 6 << 8;
+
+int countOf6 = 0;
+qCount(list.begin(), list.end(), 6, countOf6);
+// countOf6 == 3
+
+int countOf7 = 0;
+qCount(list.begin(), list.end(), 7, countOf7);
+// countOf7 == 0
+//! [9]
+
+
+//! [10]
+double pi = 3.14;
+double e = 2.71;
+
+qSwap(pi, e);
+// pi == 2.71, e == 3.14
+//! [10]
+
+
+//! [11]
+QList<int> list;
+list << 33 << 12 << 68 << 6 << 12;
+qSort(list.begin(), list.end());
+// list: [ 6, 12, 12, 33, 68 ]
+//! [11]
+
+
+//! [12]
+bool caseInsensitiveLessThan(const QString &s1, const QString &s2)
+{
+    return s1.toLower() < s2.toLower();
+}
+
+int doSomething()
+{
+    QStringList list;
+    list << "AlPha" << "beTA" << "gamma" << "DELTA";
+    qSort(list.begin(), list.end(), caseInsensitiveLessThan);
+    // list: [ "AlPha", "beTA", "DELTA", "gamma" ]
+}
+//! [12]
+
+
+//! [13]
+QList<int> list;
+list << 33 << 12 << 68 << 6 << 12;
+qSort(list.begin(), list.end(), qGreater<int>());
+// list: [ 68, 33, 12, 12, 6 ]
+//! [13]
+
+
+//! [14]
+QStringList list;
+list << "AlPha" << "beTA" << "gamma" << "DELTA";
+
+QMap<QString, QString> map;
+foreach (QString str, list)
+    map.insert(str.toLower(), str);
+
+list = map.values();
+//! [14]
+
+
+//! [15]
+QList<int> list;
+list << 33 << 12 << 68 << 6 << 12;
+qStableSort(list.begin(), list.end());
+// list: [ 6, 12, 12, 33, 68 ]
+//! [15]
+
+
+//! [16]
+bool caseInsensitiveLessThan(const QString &s1, const QString &s2)
+{
+    return s1.toLower() < s2.toLower();
+}
+
+int doSomething()
+{
+    QStringList list;
+    list << "AlPha" << "beTA" << "gamma" << "DELTA";
+    qStableSort(list.begin(), list.end(), caseInsensitiveLessThan);
+    // list: [ "AlPha", "beTA", "DELTA", "gamma" ]
+}
+//! [16]
+
+
+//! [17]
+QList<int> list;
+list << 33 << 12 << 68 << 6 << 12;
+qStableSort(list.begin(), list.end(), qGreater<int>());
+// list: [ 68, 33, 12, 12, 6 ]
+//! [17]
+
+
+//! [18]
+QList<int> list;
+list << 3 << 3 << 6 << 6 << 6 << 8;
+
+QList<int>::iterator i = qLowerBound(list.begin(), list.end(), 5);
+list.insert(i, 5);
+// list: [ 3, 3, 5, 6, 6, 6, 8 ]
+
+i = qLowerBound(list.begin(), list.end(), 12);
+list.insert(i, 12);
+// list: [ 3, 3, 5, 6, 6, 6, 8, 12 ]
+//! [18]
+
+
+//! [19]
+QVector<int> vect;
+vect << 3 << 3 << 6 << 6 << 6 << 8;
+QVector<int>::iterator begin6 =
+	qLowerBound(vect.begin(), vect.end(), 6);
+QVector<int>::iterator end6 =
+	qUpperBound(begin6, vect.end(), 6);
+
+QVector<int>::iterator i = begin6;
+while (i != end6) {
+    *i = 7;
+    ++i;
+}
+// vect: [ 3, 3, 7, 7, 7, 8 ]
+//! [19]
+
+
+//! [20]
+QList<int> list;
+list << 3 << 3 << 6 << 6 << 6 << 8;
+
+QList<int>::iterator i = qUpperBound(list.begin(), list.end(), 5);
+list.insert(i, 5);
+// list: [ 3, 3, 5, 6, 6, 6, 8 ]
+
+i = qUpperBound(list.begin(), list.end(), 12);
+list.insert(i, 12);
+// list: [ 3, 3, 5, 6, 6, 6, 8, 12 ]
+//! [20]
+
+
+//! [21]
+QVector<int> vect;
+vect << 3 << 3 << 6 << 6 << 6 << 8;
+QVector<int>::iterator begin6 =
+	qLowerBound(vect.begin(), vect.end(), 6);
+QVector<int>::iterator end6 =
+	qUpperBound(vect.begin(), vect.end(), 6);
+
+QVector<int>::iterator i = begin6;
+while (i != end6) {
+    *i = 7;
+    ++i;
+}
+// vect: [ 3, 3, 7, 7, 7, 8 ]
+//! [21]
+
+
+//! [22]
+QVector<int> vect;
+vect << 3 << 3 << 6 << 6 << 6 << 8;
+
+QVector<int>::iterator i =
+	qBinaryFind(vect.begin(), vect.end(), 6);
+// i == vect.begin() + 2 (or 3 or 4)
+//! [22]
+
+
+//! [23]
+QList<Employee *> list;
+list.append(new Employee("Blackpool", "Stephen"));
+list.append(new Employee("Twist", "Oliver"));
+
+qDeleteAll(list.begin(), list.end());
+list.clear();
+//! [23]
+
+
+//! [24]
+QList<int> list;
+list << 33 << 12 << 68 << 6 << 12;
+qSort(list.begin(), list.end(), qLess<int>());
+// list: [ 68, 33, 12, 12, 6 ]
+//! [24]
+
+
+//! [25]
+QList<int> list;
+list << 33 << 12 << 68 << 6 << 12;
+qSort(list.begin(), list.end(), qGreater<int>());
+// list: [ 68, 33, 12, 12, 6 ]
+//! [25]
diff --git a/doc/src/snippets/code/doc_src_qaxcontainer.qdoc b/doc/src/snippets/code/doc_src_qaxcontainer.qdoc
new file mode 100644
index 0000000000..9edd87f05f
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qaxcontainer.qdoc
@@ -0,0 +1,8 @@
+//! [0]
+CONFIG += qaxcontainer
+//! [0]
+
+
+//! [1]
+TYPELIBS = file.tlb
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_qaxserver.qdoc b/doc/src/snippets/code/doc_src_qaxserver.qdoc
new file mode 100644
index 0000000000..9b51e668a7
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qaxserver.qdoc
@@ -0,0 +1,223 @@
+//! [0]
+TEMPLATE = app
+CONFIG  += qaxserver
+
+RC_FILE  = qaxserver.rc
+...
+//! [0]
+
+
+//! [1]
+TEMPLATE = lib
+CONFIG  += qaxserver dll
+
+DEF_FILE = qaxserver.def
+RC_FILE  = qaxserver.rc
+...
+//! [1]
+
+
+//! [2]
+TEMPLATE = lib
+VERSION = 2.5
+...
+//! [2]
+
+
+//! [3]
+#include <QWidget>
+
+class MyActiveX : public QWidget
+{
+    Q_OBJECT
+//! [3]
+
+
+//! [4]
+Q_CLASSINFO("ClassID", "{1D9928BD-4453-4bdd-903D-E525ED17FDE5}")
+Q_CLASSINFO("InterfaceID", "{99F6860E-2C5A-42ec-87F2-43396F4BE389}")
+Q_CLASSINFO("EventsID", "{0A3E9F27-E4F1-45bb-9E47-63099BCCD0E3}")
+//! [4]
+
+
+//! [5]
+Q_PROPERTY(int value READ value WRITE setValue)
+//! [5]
+
+
+//! [6]
+public:
+    MyActiveX(QWidget *parent = 0)
+    ...
+
+    int value() const;
+
+public slots:
+    void setValue(int v);
+    ...
+
+signals:
+    void valueChange(int v);
+    ...
+
+};
+//! [6]
+
+
+//! [7]
+#include <QAxBindable>
+#include <QWidget>
+
+class MyActiveX : public QWidget, public QAxBindable
+{
+    Q_OBJECT
+//! [7]
+
+
+//! [8]
+QAXFACTORY_BEGIN("{ad90301a-849e-4e8b-9a91-0a6dc5f6461f}",
+                 "{a8f21901-7ff7-4f6a-b939-789620c03d83}")
+    QAXCLASS(MyWidget)
+    QAXCLASS(MyWidget2)
+    QAXTYPE(MySubType)
+QAXFACTORY_END()
+//! [8]
+
+
+//! [9]
+#include <QApplication>
+#include <QAxFactory>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    if (!QAxFactory::isServer()) {
+        // create and show main window
+    }
+    return app.exec();
+}
+//! [9]
+
+
+//! [10]
+MyFactory(const QUuid &, const QUuid &);
+//! [10]
+
+
+//! [11]
+HMODULE dll = LoadLibrary("myserver.dll");
+typedef HRESULT(__stdcall *DllRegisterServerProc)();
+DllRegisterServerProc DllRegisterServer = 
+    (DllRegisterServerProc)GetProcAddress(dll, "DllRegisterServer");
+
+HRESULT res = E_FAIL;
+if (DllRegisterServer)
+    res = DllRegisterServer();
+if (res != S_OK)
+    // error handling
+//! [11]
+
+
+//! [12]
+cabarc N simpleax.cab simpleax.exe simple.inf
+//! [12]
+
+
+//! [13]
+<object ID="MyActiveX1" CLASSID="CLSID:ad90301a-849e-4e8b-9a91-0a6dc5f6461f">
+   ...
+<\object>
+//! [13]
+
+
+//! [14]
+<object ID=...>
+    <param name="name" value="value">
+<\object>
+//! [14]
+
+
+//! [15]
+class MyActiveX : public QWidget
+{
+    Q_OBJECT
+    Q_CLASSINFO("Version", "2.0")
+    Q_CLASSINFO("ClassID", "{7a4cffd8-cbcd-4ae9-ae7e-343e1e5710df}")
+    Q_CLASSINFO("InterfaceID", "{6fb035bf-8019-48d8-be51-ef05427d8994}")
+    Q_CLASSINFO("EventsID", "{c42fffdf-6557-47c9-817a-2da2228bc29c}")
+    Q_CLASSINFO("Insertable", "yes")
+    Q_CLASSINFO("ToSuperClass", "MyActiveX")
+    Q_PROPERTY(...)
+
+public:
+    MyActiveX(QWidget *parent = 0);
+
+    ...
+};
+//! [15]
+
+
+//! [16]
+class MyLicensedControl : public QWidget
+{
+    Q_OBJECT
+    Q_CLASSINFO("LicenseKey", "<key string>")
+    ...
+};
+//! [16]
+
+
+//! [17]
+class AxImpl : public QAxAggregated, public ISomeCOMInterface
+{
+public:
+    AxImpl() {}
+
+    long queryInterface(const QUuid &iid, void **iface);
+
+    // IUnknown
+    QAXAGG_IUNKNOWN
+
+    // ISomeCOMInterface
+    ...
+}
+//! [17]
+
+
+//! [18]
+long AxImpl::queryInterface(const QUuid &iid, void **iface)
+{
+    *iface = 0;
+    if (iid == IID_ISomeCOMInterface)
+        *iface = (ISomeCOMInterface *)this;
+    else
+        return E_NOINTERFACE;
+
+    AddRef();
+    return S_OK;
+}
+//! [18]
+
+
+//! [19]
+HRESULT AxImpl::QueryInterface(REFIID iid, void **iface)
+{
+    return controllingUnknown()->QueryInterface(iid, iface);
+}
+//! [19]
+
+
+//! [20]
+class MyActiveX : public QWidget, public QAxBindable
+{
+    Q_OBJECT
+
+public:
+    MyActiveX(QWidget *parent);
+
+    QAxAggregated *createAggregate()
+    {
+        return new AxImpl();
+    }
+};
+//! [20]
diff --git a/doc/src/snippets/code/doc_src_qcache.qdoc b/doc/src/snippets/code/doc_src_qcache.qdoc
new file mode 100644
index 0000000000..66bda6af95
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qcache.qdoc
@@ -0,0 +1,17 @@
+//! [0]
+QCache<int, Employee> cache;
+//! [0]
+
+
+//! [1]
+Employee *employee = new Employee;
+employee->setId(37);
+employee->setName("Richard Schmit");
+...
+cache.insert(employee->id(), employee);
+//! [1]
+
+
+//! [2]
+QCache<int, MyDataStructure> cache(5000);
+//! [2]
diff --git a/doc/src/snippets/code/doc_src_qdbusadaptors.qdoc b/doc/src/snippets/code/doc_src_qdbusadaptors.qdoc
new file mode 100644
index 0000000000..7f69a907d1
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qdbusadaptors.qdoc
@@ -0,0 +1,253 @@
+//! [0]
+        class MainApplicationAdaptor: public QDBusAbstractAdaptor
+        {
+            Q_OBJECT
+            Q_CLASSINFO("D-Bus Interface", "org.kde.DBus.MainApplication")
+            Q_PROPERTY(QString caption READ caption WRITE setCaption)
+            Q_PROPERTY(QString organizationName READ organizationName)
+            Q_PROPERTY(QString organizationDomain READ organizationDomain)
+
+        private:
+            QApplication *app;
+
+        public:
+            MainApplicationAdaptor(QApplication *application)
+                : QDBusAbstractAdaptor(application), app(application)
+            {
+                connect(application, SIGNAL(aboutToQuit()), SIGNAL(aboutToQuit()));
+                connect(application, SIGNAL(focusChanged(QWidget*, QWidget*)),
+                        SLOT(focusChangedSlot(QWidget*, QWidget*)));
+            }
+
+            QString caption()
+            {
+                if (app->hasMainWindow())
+                    return app->mainWindow()->caption();
+                return QString(""); // must not return a null QString
+            }
+
+            void setCaption(const QString &newCaption)
+            {
+                if (app->hasMainWindow())
+                    app->mainWindow()->setCaption(newCaption);
+            }
+
+            QString organizationName()
+            {
+                return app->organizationName();
+            }
+
+            QString organizationDomain()
+            {
+                return app->organizationDomain();
+            }
+
+        public slots:
+            Q_NOREPLY void quit()
+            { app->quit(); }
+
+            void reparseConfiguration()
+            { app->reparseConfiguration(); }
+
+            QString mainWindowObject()
+            {
+                if (app->hasMainWindow())
+                    return QString("/%1/mainwindow").arg(app->applicationName());
+                return QString();
+            }
+
+            void setSessionManagement(bool enable)
+            {
+                if (enable)
+                   app->enableSessionManagement();
+                else
+                   app->disableSessionManagement();
+            }
+
+        private slots:
+            void focusChangedSlot(QWidget *, QWidget *now)
+            {
+                if (now == app->mainWindow())
+                    emit mainWindowHasFocus();
+            }
+
+        signals:
+            void aboutToQuit();
+            void mainWindowHasFocus();
+        };
+//! [0]
+
+
+//! [1]
+interface org.kde.DBus.MainApplication
+{
+    property readwrite STRING caption
+    property read STRING organizationName
+    property read STRING organizationDomain
+
+    method quit() annotation("org.freedesktop.DBus.Method.NoReply", "true")
+    method reparseConfiguration()
+    method mainWindowObject(out STRING)
+    method disableSessionManagement(in BOOLEAN enable)
+
+    signal aboutToQuit()
+    signal mainWindowHasFocus()
+}
+//! [1]
+
+
+//! [2]
+int main(int argc, char **argv)
+{
+    // create the QApplication object
+    QApplication app(argc, argv);
+
+    // create the MainApplication adaptor:
+    new MainApplicationAdaptor(app);
+
+    // connect to D-Bus and register as an object:
+    QDBusConnection::sessionBus().registerObject("/MainApplication", app);
+
+    // add main window, etc.
+    [...]
+
+    app.exec();
+}
+//! [2]
+
+
+//! [3]
+class MainApplicationAdaptor: public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.kde.DBus.MainApplication")
+//! [3]
+
+
+//! [4]
+    Q_PROPERTY(QString caption READ caption WRITE setCaption)
+    Q_PROPERTY(QString organizationName READ organizationName)
+    Q_PROPERTY(QString organizationDomain READ organizationDomain)
+//! [4]
+
+
+//! [5]
+QString caption()
+{
+    if (app->hasMainWindow())
+        return app->mainWindow()->caption();
+    return QString();
+}
+
+void setCaption(const QString &newCaption)
+{
+    if (app->hasMainWindow())
+        app->mainWindow()->setCaption(newCaption);
+}
+
+QString organizationName()
+{
+    return app->organizationName();
+}
+
+QString organizationDomain()
+{
+    return app->organizationDomain();
+}
+//! [5]
+
+
+//! [6]
+MyInterfaceAdaptor(QApplication *application)
+    : QDBusAbstractAdaptor(application), app(application)
+{
+    connect(application, SIGNAL(aboutToQuit()), SIGNAL(aboutToQuit());
+    connect(application, SIGNAL(focusChanged(QWidget*, QWidget*)),
+            SLOT(focusChangedSlot(QWidget*, QWidget*)));
+}
+//! [6]
+
+
+//! [7]
+public slots:
+    Q_NOREPLY void quit()
+    { app->quit(); }
+
+    void reparseConfiguration()
+    { app->reparseConfiguration(); }
+
+    QString mainWindowObject()
+    {
+        if (app->hasMainWindow())
+            return QString("/%1/mainwindow").arg(app->applicationName());
+        return QString();
+    }
+
+    void setSessionManagement(bool enable)
+    {
+        if (enable)
+           app->enableSessionManagement();
+        else
+           app->disableSessionManagement();
+    }
+//! [7]
+
+
+//! [8]
+signals:
+    void aboutToQuit();
+    void mainWindowHasFocus();
+//! [8]
+
+
+//! [9]
+private slots:
+    void focusChangedSlot(QWidget *, QWidget *now)
+    {
+        if (now == app->mainWindow())
+            emit mainWindowHasFocus();
+    }
+//! [9]
+
+
+//! [10]
+struct RequestData
+{
+    QString request;
+    QString processedData;
+    QDBusMessage reply;
+};
+
+QString processRequest(const QString &request, const QDBusMessage &message)
+{
+    RequestData *data = new RequestData;
+    data->request = request;
+    message.setDelayedReply(true);
+    data->reply = message.createReply();
+    QDBusConnection::sessionBus().send(data->reply);
+
+    appendRequest(data);
+    return QString();
+}
+//! [10]
+
+
+//! [11]
+void sendReply(RequestData *data)
+{
+    // data->processedData has been initialized with the request's reply
+    QDBusMessage &reply = &data->reply;
+
+    // send the reply over D-Bus:
+    reply << data->processedData;
+    QDBusConnection::sessionBus().send(reply);
+
+    // dispose of the transaction data
+    delete data;
+}
+//! [11]
+
+
+//! [12]
+Q_NOREPLY void myMethod();
+//! [12]
diff --git a/doc/src/snippets/code/doc_src_qiterator.qdoc b/doc/src/snippets/code/doc_src_qiterator.qdoc
new file mode 100644
index 0000000000..3dfa68a9c3
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qiterator.qdoc
@@ -0,0 +1,380 @@
+//! [0]
+QList<float> list;
+...
+QListIterator<float> i(list);
+while (i.hasNext())
+    qDebug() << i.next();
+//! [0]
+
+
+//! [1]
+QListIterator<float> i(list);
+i.toBack();
+while (i.hasPrevious())
+    qDebug() << i.previous();
+//! [1]
+
+
+//! [2]
+QLinkedList<float> list;
+...
+QLinkedListIterator<float> i(list);
+while (i.hasNext())
+    qDebug() << i.next();
+//! [2]
+
+
+//! [3]
+QLinkedListIterator<float> i(list);
+i.toBack();
+while (i.hasPrevious())
+    qDebug() << i.previous();
+//! [3]
+
+
+//! [4]
+QVector<float> vector;
+...
+QVectorIterator<float> i(vector);
+while (i.hasNext())
+    qDebug() << i.next();
+//! [4]
+
+
+//! [5]
+QVectorIterator<float> i(vector);
+i.toBack();
+while (i.hasPrevious())
+    qDebug() << i.previous();
+//! [5]
+
+
+//! [6]
+QSet<QString> set;
+...
+QSetIterator<QString> i(set);
+while (i.hasNext())
+    qDebug() << i.next();
+//! [6]
+
+
+//! [7]
+QSetIterator<QString> i(set);
+i.toBack();
+while (i.hasPrevious())
+    qDebug() << i.previous();
+//! [7]
+
+
+//! [8]
+QList<float> list;
+...
+QMutableListIterator<float> i(list);
+while (i.hasNext())
+    qDebug() << i.next();
+//! [8]
+
+
+//! [9]
+QMutableListIterator<float> i(list);
+i.toBack();
+while (i.hasPrevious())
+    qDebug() << i.previous();
+//! [9]
+
+
+//! [10]
+QMutableListIterator<int> i(list);
+while (i.hasNext()) {
+    int val = i.next();
+    if (val < 0) {
+        i.setValue(-val);
+    } else if (val == 0) {
+        i.remove();
+    }
+}
+//! [10]
+
+
+//! [11]
+QLinkedList<float> list;
+...
+QMutableLinkedListIterator<float> i(list);
+while (i.hasNext())
+    qDebug() << i.next();
+//! [11]
+
+
+//! [12]
+QMutableLinkedListIterator<float> i(list);
+i.toBack();
+while (i.hasPrevious())
+    qDebug() << i.previous();
+//! [12]
+
+
+//! [13]
+QMutableLinkedListIterator<int> i(list);
+while (i.hasNext()) {
+    int val = i.next();
+    if (val < 0) {
+        i.setValue(-val);
+    } else if (val == 0) {
+        i.remove();
+    }
+}
+//! [13]
+
+
+//! [14]
+QVector<float> vector;
+...
+QMutableVectorIterator<float> i(vector);
+while (i.hasNext())
+    qDebug() << i.next();
+//! [14]
+
+
+//! [15]
+QMutableVectorIterator<float> i(vector);
+i.toBack();
+while (i.hasPrevious())
+    qDebug() << i.previous();
+//! [15]
+
+
+//! [16]
+QMutableVectorIterator<int> i(vector);
+while (i.hasNext()) {
+    int val = i.next();
+    if (val < 0) {
+        i.setValue(-val);
+    } else if (val == 0) {
+        i.remove();
+    }
+}
+//! [16]
+
+
+//! [17]
+QSet<float> set;
+...
+QMutableSetIterator<float> i(set);
+while (i.hasNext())
+    qDebug() << i.next();
+//! [17]
+
+
+//! [18]
+QMutableSetIterator<float> i(set);
+i.toBack();
+while (i.hasPrevious())
+    qDebug() << i.previous();
+//! [18]
+
+
+//! [19]
+QMutableListIterator<int> i(list);
+while (i.hasNext()) {
+    int val = i.next();
+    if (val < -32768 || val > 32767)
+	i.remove();
+}
+//! [19]
+
+
+//! [20]
+QMutableLinkedListIterator<int> i(list);
+while (i.hasNext()) {
+    int val = i.next();
+    if (val < -32768 || val > 32767)
+	i.remove();
+}
+//! [20]
+
+
+//! [21]
+QMutableVectorIterator<int> i(vector);
+while (i.hasNext()) {
+    int val = i.next();
+    if (val < -32768 || val > 32767)
+	i.remove();
+}
+//! [21]
+
+
+//! [22]
+QMutableSetIterator<int> i(set);
+while (i.hasNext()) {
+    int val = i.next();
+    if (val < -32768 || val > 32767)
+	i.remove();
+}
+//! [22]
+
+
+//! [23]
+QMutableListIterator<double> i(list);
+while (i.hasNext()) {
+    double val = i.next();
+    i.setValue(sqrt(val));
+}
+//! [23]
+
+
+//! [24]
+QMutableLinkedListIterator<double> i(list);
+while (i.hasNext()) {
+    double val = i.next();
+    i.setValue(sqrt(val));
+}
+//! [24]
+
+
+//! [25]
+QMutableVectorIterator<double> i(list);
+while (i.hasNext()) {
+    double val = i.next();
+    i.setValue(sqrt(val));
+}
+//! [25]
+
+
+//! [26]
+QMap<int, QWidget *> map;
+...
+QMapIterator<int, QWidget *> i(map);
+while (i.hasNext()) {
+    i.next();
+    qDebug() << i.key() << ": " << i.value();
+}
+//! [26]
+
+
+//! [27]
+QMapIterator<int, QWidget *> i(map);
+i.toBack();
+while (i.hasPrevious()) {
+    i.previous();
+    qDebug() << i.key() << ": " << i.value();
+}
+//! [27]
+
+
+//! [28]
+QMapIterator<int, QWidget *> i(map);
+while (i.findNext(widget)) {
+    qDebug() << "Found widget " << widget << " under key "
+	     << i.key();
+}
+//! [28]
+
+
+//! [29]
+QHash<int, QWidget *> hash;
+...
+QHashIterator<int, QWidget *> i(hash);
+while (i.hasNext()) {
+    i.next();
+    qDebug() << i.key() << ": " << i.value();
+}
+//! [29]
+
+
+//! [30]
+QHashIterator<int, QWidget *> i(hash);
+i.toBack();
+while (i.hasPrevious()) {
+    i.previous();
+    qDebug() << i.key() << ": " << i.value();
+}
+//! [30]
+
+
+//! [31]
+QHashIterator<int, QWidget *> i(hash);
+while (i.findNext(widget)) {
+    qDebug() << "Found widget " << widget << " under key "
+	     << i.key();
+}
+//! [31]
+
+
+//! [32]
+QMap<int, QWidget *> map;
+...
+QMutableMapIterator<int, QWidget *> i(map);
+while (i.hasNext()) {
+    i.next();
+    qDebug() << i.key() << ": " << i.value();
+}
+//! [32]
+
+
+//! [33]
+QMutableMapIterator<int, QWidget *> i(map);
+i.toBack();
+while (i.hasPrevious()) {
+    i.previous();
+    qDebug() << i.key() << ": " << i.value();
+}
+//! [33]
+
+
+//! [34]
+QMutableMapIterator<int, QWidget *> i(map);
+while (i.findNext(widget)) {
+    qDebug() << "Found widget " << widget << " under key "
+	     << i.key();
+}
+//! [34]
+
+
+//! [35]
+QMutableMapIterator<QString, QString> i(map);
+while (i.hasNext()) {
+    i.next();
+    if (i.key() == i.value())
+        i.remove();
+}
+//! [35]
+
+
+//! [36]
+QHash<int, QWidget *> hash;
+...
+QMutableHashIterator<QString, QWidget *> i(hash);
+while (i.hasNext()) {
+    i.next();
+    qDebug() << i.key() << ": " << i.value();
+}
+//! [36]
+
+
+//! [37]
+QMutableHashIterator<int, QWidget *> i(hash);
+i.toBack();
+while (i.hasPrevious()) {
+    i.previous();
+    qDebug() << i.key() << ": " << i.value();
+}
+//! [37]
+
+
+//! [38]
+QMutableHashIterator<int, QWidget *> i(hash);
+while (i.findNext(widget)) {
+    qDebug() << "Found widget " << widget << " under key "
+	     << i.key();
+}
+//! [38]
+
+
+//! [39]
+QMutableHashIterator<QString, QString> i(hash);
+while (i.hasNext()) {
+    i.next();
+    if (i.key() == i.value())
+        i.remove();
+}
+//! [39]
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
new file mode 100644
index 0000000000..edb66bcdea
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
@@ -0,0 +1,813 @@
+//! [0]
+make all
+//! [0]
+
+
+//! [1]
+CONFIG += qt thread debug
+//! [1]
+
+
+//! [2]
+CONFIG += qt
+QT += network xml
+//! [2]
+
+
+//! [3]
+QT = network xml # This will omit the core and gui modules.
+//! [3]
+
+
+//! [4]
+QT -= gui # Only the core module is used.
+//! [4]
+
+
+//! [5]
+CONFIG += link_pkgconfig
+PKGCONFIG += ogg dbus-1
+//! [5]
+
+
+//! [6]
+LIBS += -L/usr/local/lib -lmath
+//! [6]
+
+
+//! [7]
+INCLUDEPATH = c:/msdev/include d:/stl/include
+//! [7]
+
+
+//! [8]
+qmake [mode] [options] files
+//! [8]
+
+
+//! [9]
+qmake -makefile [options] files
+//! [9]
+
+
+//! [10]
+qmake -makefile -unix -o Makefile "CONFIG+=test" test.pro
+//! [10]
+
+
+//! [11]
+qmake "CONFIG+=test" test.pro
+//! [11]
+
+
+//! [12]
+qmake -project [options] files
+//! [12]
+
+
+//! [13]
+qmake -spec macx-g++
+//! [13]
+
+
+//! [14]
+QMAKE_LFLAGS += -F/path/to/framework/directory/
+//! [14]
+
+
+//! [15]
+LIBS += -framework TheFramework
+//! [15]
+
+
+//! [16]
+TEMPLATE = lib
+CONFIG += lib_bundle
+//! [16]
+
+
+//! [17]
+FRAMEWORK_HEADERS.version = Versions
+FRAMEWORK_HEADERS.files = path/to/header_one.h path/to/header_two.h
+FRAMEWORK_HEADERS.path = Headers
+QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
+//! [17]
+
+
+//! [18]
+CONFIG += x86 ppc
+//! [18]
+
+
+//! [19]
+qmake -spec macx-xcode project.pro
+//! [19]
+
+
+//! [20]
+qmake -tp vc
+//! [20]
+
+
+//! [21]
+qmake -tp vc -r
+//! [21]
+
+
+//! [22]
+CONFIG -= embed_manifest_exe
+//! [22]
+
+
+//! [23]
+CONFIG -= embed_manifest_dll
+//! [23]
+
+
+//! [24]
+make all
+//! [24]
+
+
+//! [25]
+build_pass:CONFIG(debug, debug|release) {
+    unix: TARGET = $$join(TARGET,,,_debug)
+    else: TARGET = $$join(TARGET,,,d)
+}
+//! [25]
+
+
+//! [26]
+CONFIG += qt console newstuff
+...
+newstuff {
+    SOURCES += new.cpp
+    HEADERS += new.h
+}
+//! [26]
+
+
+//! [27]
+DEFINES += USE_MY_STUFF QT_DLL
+//! [27]
+
+
+//! [28]
+myFiles.sources = path\*.png
+DEPLOYMENT += myFiles
+//! [28]
+
+
+//! [29]
+myFiles.sources = path\file1.ext1 path2\file2.ext1 path3\*
+myFiles.path = \some\path\on\device
+someother.sources = C:\additional\files\*
+someother.path = \myFiles\path2
+DEPLOYMENT += myFiles someother
+//! [29]
+
+
+//! [30]
+DESTDIR = ../../lib
+//! [30]
+
+
+//! [31]
+DISTFILES += ../program.txt
+//! [31]
+
+
+//! [32]
+FORMS = mydialog.ui \
+    mywidget.ui \
+        myconfig.ui
+//! [32]
+
+
+//! [33]
+FORMS3 = my_uic3_dialog.ui \
+     my_uic3_widget.ui \
+         my_uic3_config.ui
+//! [33]
+
+
+//! [34]
+HEADERS = myclass.h \
+          login.h \
+          mainwindow.h
+//! [34]
+
+
+//! [35]
+INCLUDEPATH = c:/msdev/include d:/stl/include
+//! [35]
+
+
+//! [36]
+target.path += $$[QT_INSTALL_PLUGINS]/imageformats
+INSTALLS += target
+//! [36]
+
+
+//! [37]
+LEXSOURCES = lexer.l
+//! [37]
+
+
+//! [38]
+unix:LIBS += -L/usr/local/lib -lmath
+win32:LIBS += c:/mylibs/math.lib
+//! [38]
+
+
+//! [39]
+CONFIG += no_lflags_merge
+//! [39]
+
+
+//! [40]
+unix:MOC_DIR = ../myproject/tmp
+win32:MOC_DIR = c:/myproject/tmp
+//! [40]
+
+
+//! [41]
+unix:OBJECTS_DIR = ../myproject/tmp
+win32:OBJECTS_DIR = c:/myproject/tmp
+//! [41]
+
+
+//! [42]
+app {
+    # Conditional code for 'app' template here
+}
+//! [42]
+
+
+//! [43]
+FRAMEWORK_HEADERS.version = Versions
+FRAMEWORK_HEADERS.files = path/to/header_one.h path/to/header_two.h
+FRAMEWORK_HEADERS.path = Headers
+QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
+//! [43]
+
+
+//! [44]
+QMAKE_BUNDLE_EXTENSION = .myframework
+//! [44]
+
+
+//! [45]
+QMAKE_RESOURCE_FLAGS += -threshold 0 -compress 9
+//! [45]
+
+
+//! [46]
+QMAKE_UIC = uic -L /path/to/plugin
+//! [46]
+
+
+//! [47]
+QT -= gui # Only the core module is used.
+//! [47]
+
+
+//! [48]
+unix:RCC_DIR = ../myproject/resources
+win32:RCC_DIR = c:/myproject/resources
+//! [48]
+
+
+//! [49]
+SOURCES = myclass.cpp \
+      login.cpp \
+      mainwindow.cpp
+//! [49]
+
+
+//! [50]
+SUBDIRS = kernel \
+          tools
+//! [50]
+
+
+//! [51]
+CONFIG += ordered
+//! [51]
+
+
+//! [52]
+TEMPLATE = app
+TARGET = myapp
+SOURCES = main.cpp
+//! [52]
+
+
+//! [53]
+TEMPLATE = lib
+SOURCES = main.cpp
+TARGET = mylib
+//! [53]
+
+
+//! [54]
+unix:UI_DIR = ../myproject/ui
+win32:UI_DIR = c:/myproject/ui
+//! [54]
+
+
+//! [55]
+unix:UI_HEADERS_DIR = ../myproject/ui/include
+win32:UI_HEADERS_DIR = c:/myproject/ui/include
+//! [55]
+
+
+//! [56]
+unix:UI_SOURCES_DIR = ../myproject/ui/src
+win32:UI_SOURCES_DIR = c:/myproject/ui/src
+//! [56]
+
+
+//! [57]
+VERSION = 1.2.3
+//! [57]
+
+
+//! [58]
+YACCSOURCES = moc.y
+//! [58]
+
+
+//! [59]
+FILE = /etc/passwd
+FILENAME = $$basename(FILE) #passwd
+//! [59]
+
+
+//! [60]
+CONFIG = debug
+CONFIG += release
+CONFIG(release, debug|release):message(Release build!) #will print
+CONFIG(debug, debug|release):message(Debug build!) #no print
+//! [60]
+
+
+//! [61]
+contains( drivers, network ) {
+    # drivers contains 'network'
+    message( "Configuring for network build..." )
+    HEADERS += network.h
+    SOURCES += network.cpp
+}
+//! [61]
+
+
+//! [62]
+error(An error has occurred in the configuration process.)
+//! [62]
+
+
+//! [63]
+exists( $(QTDIR)/lib/libqt-mt* ) {
+      message( "Configuring for multi-threaded Qt..." )
+      CONFIG += thread
+}
+//! [63]
+
+
+//! [64]
+MY_VAR = one two three four
+MY_VAR2 = $$join(MY_VAR, " -L", -L) -Lfive
+MY_VAR3 = $$member(MY_VAR, 2) $$find(MY_VAR, t.*)
+//! [64]
+
+
+//! [65]
+LIST = 1 2 3
+for(a, LIST):exists(file.$${a}):message(I see a file.$${a}!)
+//! [65]
+
+
+//! [66]
+include( shared.pri )
+OPTIONS = standard custom
+!include( options.pri ) {
+    message( "No custom build options specified" )
+OPTIONS -= custom
+}
+//! [66]
+
+
+//! [67]
+isEmpty( CONFIG ) {
+CONFIG += qt warn_on debug
+}
+//! [67]
+
+
+//! [68]
+message( "This is a message" )
+//! [68]
+
+
+//! [69]
+!build_pass:message( "This is a message" )
+//! [69]
+
+
+//! [70]
+This is a test.
+//! [70]
+
+
+//! [71]
+system(ls /bin):HAS_BIN=FALSE
+//! [71]
+
+
+//! [72]
+UNAME = $$system(uname -s)
+contains( UNAME, [lL]inux ):message( This looks like Linux ($$UNAME) to me )
+//! [72]
+
+
+//! [73]
+ARGS = 1 2 3 2 5 1
+ARGS = $$unique(ARGS) #1 2 3 5
+//! [73]
+
+
+//! [74]
+qmake -set VARIABLE VALUE
+//! [74]
+
+
+//! [75]
+qmake -query VARIABLE
+qmake -query #queries all current VARIABLE/VALUE pairs..
+//! [75]
+
+
+//! [76]
+qmake -query "1.06a/VARIABLE"
+//! [76]
+
+
+//! [77]
+qmake -query "QT_INSTALL_PREFIX"
+//! [77]
+
+
+//! [78]
+QMAKE_VERS = $$[QMAKE_VERSION]
+//! [78]
+
+
+//! [79]
+documentation.path = /usr/local/program/doc
+documentation.files = docs/*
+//! [79]
+
+
+//! [80]
+INSTALLS += documentation
+//! [80]
+
+
+//! [81]
+unix:documentation.extra = create_docs; mv master.doc toc.doc
+//! [81]
+
+
+//! [82]
+target.path = /usr/local/myprogram
+INSTALLS += target
+//! [82]
+
+
+//! [83]
+CONFIG += create_prl
+//! [83]
+
+
+//! [84]
+CONFIG += link_prl
+//! [84]
+
+
+//! [85]
+QMAKE_EXT_MOC = .mymoc
+//! [85]
+
+
+//! [86]
+mytarget.target = .buildfile
+mytarget.commands = touch $$mytarget.target
+mytarget.depends = mytarget2
+
+mytarget2.commands = @echo Building $$mytarget.target
+//! [86]
+
+
+//! [87]
+QMAKE_EXTRA_TARGETS += mytarget mytarget2
+//! [87]
+
+
+//! [88]
+new_moc.output  = moc_${QMAKE_FILE_BASE}.cpp
+new_moc.commands = moc ${QMAKE_FILE_NAME} -o ${QMAKE_FILE_OUT}
+new_moc.depend_command = g++ -E -M ${QMAKE_FILE_NAME} | sed "s,^.*: ,,"
+new_moc.input = NEW_HEADERS
+QMAKE_EXTRA_COMPILERS += new_moc
+//! [88]
+
+
+//! [89]
+TARGET = myapp
+//! [89]
+
+
+//! [90]
+DEFINES += QT_DLL
+//! [90]
+
+
+//! [91]
+DEFINES -= QT_DLL
+//! [91]
+
+
+//! [92]
+DEFINES *= QT_DLL
+//! [92]
+
+
+//! [93]
+DEFINES ~= s/QT_[DT].+/QT
+//! [93]
+
+
+//! [94]
+EVERYTHING = $$SOURCES $$HEADERS
+message("The project contains the following files:")
+message($$EVERYTHING)
+//! [94]
+
+
+//! [95]
+win32:DEFINES += QT_DLL
+//! [95]
+
+
+//! [96]
+win32:xml {
+    message(Building for Windows)
+    SOURCES += xmlhandler_win.cpp
+} else:xml {
+    SOURCES += xmlhandler.cpp
+} else {
+    message("Unknown configuration")
+}
+//! [96]
+
+
+//! [97]
+MY_VARIABLE = value
+//! [97]
+
+
+//! [98]
+MY_DEFINES = $$DEFINES
+//! [98]
+
+
+//! [99]
+MY_DEFINES = $${DEFINES}
+//! [99]
+
+
+//! [100]
+TARGET = myproject_$${TEMPLATE}
+//! [100]
+
+
+//! [101]
+target.path = $$[QT_INSTALL_PLUGINS]/designer
+INSTALLS += target
+//! [101]
+
+
+//! [102]
+defineReplace(functionName){
+    #function code
+}
+//! [102]
+
+
+//! [103]
+CONFIG += myfeatures
+//! [103]
+
+
+//! [104]
+// Add C includes here
+
+#if defined __cplusplus
+// Add C++ includes here
+#include <stdlib>
+#include <iostream>
+#include <vector>
+#include <QApplication> // Qt includes
+#include <QPushButton>
+#include <QLabel>
+#include "thirdparty/include/libmain.h"
+#include "my_stable_class.h"
+...
+#endif
+//! [104]
+
+
+//! [105]
+PRECOMPILED_HEADER = stable.h
+//! [105]
+
+
+//! [106]
+precompile_header:!isEmpty(PRECOMPILED_HEADER) {
+DEFINES += USING_PCH
+}
+//! [106]
+
+
+//! [107]
+PRECOMPILED_HEADER = window.h
+SOURCES            = window.cpp
+//! [107]
+
+
+//! [108]
+SOURCES += hello.cpp
+//! [108]
+
+
+//! [109]
+SOURCES += hello.cpp
+SOURCES += main.cpp
+//! [109]
+
+
+//! [110]
+SOURCES = hello.cpp \
+          main.cpp
+//! [110]
+
+
+//! [111]
+HEADERS += hello.h
+SOURCES += hello.cpp
+SOURCES += main.cpp
+//! [111]
+
+
+//! [112]
+TARGET = helloworld
+//! [112]
+
+
+//! [113]
+CONFIG += qt
+HEADERS += hello.h
+SOURCES += hello.cpp
+SOURCES += main.cpp
+//! [113]
+
+
+//! [114]
+qmake -o Makefile hello.pro
+//! [114]
+
+
+//! [115]
+qmake -tp vc -o hello.dsp hello.pro
+//! [115]
+
+
+//! [116]
+CONFIG += qt debug
+HEADERS += hello.h
+SOURCES += hello.cpp
+SOURCES += main.cpp
+//! [116]
+
+
+//! [117]
+win32 {
+    SOURCES += hellowin.cpp
+}
+//! [117]
+
+
+//! [118]
+CONFIG += qt debug
+HEADERS += hello.h
+SOURCES += hello.cpp
+SOURCES += main.cpp
+win32 {
+    SOURCES += hellowin.cpp
+}
+unix {
+    SOURCES += hellounix.cpp
+}
+//! [118]
+
+
+//! [119]
+!exists( main.cpp ) {
+    error( "No main.cpp file found" )
+}
+//! [119]
+
+
+//! [120]
+CONFIG += qt debug
+HEADERS += hello.h
+SOURCES += hello.cpp
+SOURCES += main.cpp
+win32 {
+    SOURCES += hellowin.cpp
+}
+unix {
+    SOURCES += hellounix.cpp
+}
+!exists( main.cpp ) {
+    error( "No main.cpp file found" )
+}
+//! [120]
+
+
+//! [121]
+win32 {
+    debug {
+        CONFIG += console
+    }
+}
+//! [121]
+
+
+//! [122]
+CONFIG += qt debug
+HEADERS += hello.h
+SOURCES += hello.cpp
+SOURCES += main.cpp
+win32 {
+    SOURCES += hellowin.cpp
+}
+unix {
+    SOURCES += hellounix.cpp
+}
+!exists( main.cpp ) {
+    error( "No main.cpp file found" )
+}
+win32:debug {
+    CONFIG += console
+}
+//! [122]
+
+
+//! [123]
+TEMPLATE = app
+DESTDIR  = c:/helloapp
+HEADERS += hello.h
+SOURCES += hello.cpp
+SOURCES += main.cpp
+DEFINES += QT_DLL
+CONFIG  += qt warn_on release
+//! [123]
+
+
+//! [124]
+make all
+//! [124]
+
+
+//! [125]
+make
+//! [125]
+
+
+//! [126]
+make install
+//! [126]
+
+
+//! [127]
+CONFIG(debug, debug|release) {
+    mac: TARGET = $$join(TARGET,,,_debug)
+    win32: TARGET = $$join(TARGET,,d)
+}
+//! [127]
+
+//! [128]
+DEPLOYMENT_PLUGIN += qjpeg
+//! [128]
diff --git a/doc/src/snippets/code/doc_src_qnamespace.qdoc b/doc/src/snippets/code/doc_src_qnamespace.qdoc
new file mode 100644
index 0000000000..250d62d23d
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qnamespace.qdoc
@@ -0,0 +1,24 @@
+//! [0]
+QObject::connect: Cannot queue arguments of type 'MyType'
+//! [0]
+
+
+//! [1]
+enum CustomEventPriority
+{
+    // An important event
+    ImportantEventPriority = Qt::HighEventPriority,
+
+    // A more important event
+    MoreImportantEventPriority = ImportantEventPriority + 1,
+
+    // A critical event
+    CriticalEventPriority = 100 * MoreImportantEventPriority,
+
+    // Not that important
+    StatusEventPriority = Qt::LowEventPriority,
+
+    // These are less important than Status events
+    IdleProcessingDoneEventPriority = StatusEventPriority - 1
+};
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_qpair.qdoc b/doc/src/snippets/code/doc_src_qpair.qdoc
new file mode 100644
index 0000000000..74c7c83605
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qpair.qdoc
@@ -0,0 +1,15 @@
+//! [0]
+QPair<QString, double> pair;
+//! [0]
+
+
+//! [1]
+pair.first = "pi";
+pair.second = 3.14159265358979323846;
+//! [1]
+
+
+//! [2]
+QList<QPair<int, double> > list;
+list.append(qMakePair(66, 3.14159));
+//! [2]
diff --git a/doc/src/snippets/code/doc_src_qplugin.qdoc b/doc/src/snippets/code/doc_src_qplugin.qdoc
new file mode 100644
index 0000000000..d9b627e6bf
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qplugin.qdoc
@@ -0,0 +1,24 @@
+//! [0]
+namespace Foo
+{
+    struct MyInterface { ... };
+}
+
+Q_DECLARE_INTERFACE(Foo::MyInterface, "org.examples.MyInterface")
+//! [0]
+
+
+//! [1]
+Q_EXPORT_PLUGIN2(pnp_extrafilters, ExtraFiltersPlugin)
+//! [1]
+
+
+//! [2]
+Q_IMPORT_PLUGIN(qjpeg)
+//! [2]
+
+
+//! [3]
+TEMPLATE      = app
+QTPLUGIN     += qjpeg qgif qmng    # image formats
+//! [3]
diff --git a/doc/src/snippets/code/doc_src_qset.qdoc b/doc/src/snippets/code/doc_src_qset.qdoc
new file mode 100644
index 0000000000..7469d2ac5f
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qset.qdoc
@@ -0,0 +1,126 @@
+//! [0]
+QSet<QString> set;
+//! [0]
+
+
+//! [1]
+set.insert("one");
+set.insert("three");
+set.insert("seven");
+//! [1]
+
+
+//! [2]
+set << "twelve" << "fifteen" << "nineteen";
+//! [2]
+
+
+//! [3]
+if (!set.contains("ninety-nine"))
+    ...
+//! [3]
+
+
+//! [4]
+QSetIterator<QWidget *> i(set);
+while (i.hasNext())
+    qDebug() << i.next();
+//! [4]
+
+
+//! [5]
+QSet<QWidget *>::const_iterator i = set.constBegin();
+while (i != set.constEnd()) {
+    qDebug() << *i;
+    ++i;
+}
+//! [5]
+
+
+//! [6]
+QSet<QString> set;
+...
+foreach (QString value, set)
+    qDebug() << value;
+//! [6]
+
+
+//! [7]
+QSet<QString> set;
+set.reserve(20000);
+for (int i = 0; i < 20000; ++i)
+    set.insert(values[i]);
+//! [7]
+
+
+//! [8]
+QSet<QString> set;
+set << "January" << "February" << ... << "December";
+
+QSet<QString>::iterator i;
+for (i = set.begin(); i != set.end(); ++i)
+    qDebug() << *i;
+//! [8]
+
+
+//! [9]
+QSet<QString> set;
+set << "January" << "February" << ... << "December";
+
+QSet<QString>::iterator i = set.begin();
+while (i != set.end()) {
+    if ((*i).startsWith('J')) {
+        i = set.erase(i);
+    } else {
+        ++i;
+    }
+}
+//! [9]
+
+
+//! [10]
+QSet<QString> set;
+...
+QSet<QString>::iterator it = qFind(set.begin(), set.end(), "Jeanette");
+if (it != set.end())
+    cout << "Found Jeanette" << endl;
+//! [10]
+
+
+//! [11]
+QSet<QString> set;
+set << "January" << "February" << ... << "December";
+
+QSet<QString>::const_iterator i;
+for (i = set.begin(); i != set.end(); ++i)
+    qDebug() << *i;
+//! [11]
+
+
+//! [12]
+QSet<QString> set;
+...
+QSet<QString>::iterator it = qFind(set.begin(), set.end(), "Jeanette");
+if (it != set.constEnd())
+    cout << "Found Jeanette" << endl;
+//! [12]
+
+
+//! [13]
+QSet<QString> set;
+set << "red" << "green" << "blue" << ... << "black";
+
+QList<QString> list = set.toList();
+qSort(list);
+//! [13]
+
+
+//! [14]
+QStringList list;
+list << "Julia" << "Mike" << "Mike" << "Julia" << "Julia";
+
+QSet<QString> set = QSet<QString>::fromList(list);
+set.contains("Julia");  // returns true
+set.contains("Mike");   // returns true
+set.size();             // returns 2
+//! [14]
diff --git a/doc/src/snippets/code/doc_src_qsignalspy.qdoc b/doc/src/snippets/code/doc_src_qsignalspy.qdoc
new file mode 100644
index 0000000000..d6b65dcd6d
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qsignalspy.qdoc
@@ -0,0 +1,41 @@
+//! [0]
+QCheckBox *box = ...;
+QSignalSpy spy(box, SIGNAL(clicked(bool)));
+
+// do something that triggers the signal
+box->animateClick();
+
+QCOMPARE(spy.count(), 1); // make sure the signal was emitted exactly one time
+QList<QVariant> arguments = spy.takeFirst(); // take the first signal
+
+QVERIFY(arguments.at(0).toBool() == true); // verify the first argument
+//! [0]
+
+
+//! [1]
+QSignalSpy spy(myCustomObject, SIGNAL(mySignal(int, QString, double)));
+
+myCustomObject->doSomething(); // trigger emission of the signal
+
+QList<QVariant> arguments = spy.takeFirst();
+QVERIFY(arguments.at(0).type() == QVariant::Int);
+QVERIFY(arguments.at(1).type() == QVariant::QString);
+QVERIFY(arguments.at(2).type() == QVariant::double);
+//! [1]
+
+
+//! [2]
+qRegisterMetaType<QModelIndex>("QModelIndex");
+QSignalSpy spy(&model, SIGNAL(whatever(QModelIndex)));
+//! [2]
+
+
+//! [3]
+// get the first argument from the first received signal:
+QModelIndex result = qvariant_cast<QModelIndex>(spy.at(0).at(0));
+//! [3]
+
+
+//! [4]
+QSignalSpy spy(myPushButton, SIGNAL(clicked(bool)));
+//! [4]
diff --git a/doc/src/snippets/code/doc_src_qt-conf.qdoc b/doc/src/snippets/code/doc_src_qt-conf.qdoc
new file mode 100644
index 0000000000..d675795dde
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qt-conf.qdoc
@@ -0,0 +1,14 @@
+//! [0]
+[Paths]
+Prefix = /some/path
+Translations = i18n
+//! [0]
+
+
+//! [1]
+Paths
+Paths/4
+Paths/4.1
+Paths/4.2.5
+Paths/6
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_qt-embedded-displaymanagement.qdoc b/doc/src/snippets/code/doc_src_qt-embedded-displaymanagement.qdoc
new file mode 100644
index 0000000000..a3ab4dd04e
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qt-embedded-displaymanagement.qdoc
@@ -0,0 +1,51 @@
+//! [0]
+$QPEDIR/qtopiacore/qt/configure -help
+//! [0]
+
+
+//! [1]
+./configure -help
+//! [1]
+
+
+//! [2]
+./configure -extra-qt-embedded-config "-qt-gfx-transformed"
+//! [2]
+
+
+//! [3]
+./configure -qt-gfx-transformed
+//! [3]
+
+
+//! [4]
+export QWS_DISPLAY="<driver>[:<driver specific options>]...
+         [:<display num>]"
+//! [4]
+
+
+//! [5]
+myApplication -display "<driver>[:<driver specific options>]...
+         [:<display num>]"
+//! [5]
+
+
+//! [6]
+export QWS_DISPLAY="<driver>[:<subdriver>][:<subdriver options>]...
+        [ :<display num>]"
+//! [6]
+
+
+//! [7]
+export QWS_DISPLAY="Multi: QVFb:0 QVFb:offset=640,0:1 :2"
+//! [7]
+
+
+//! [8]
+export QWS_DISPLAY="VNC:size=720x480:depth=32"
+//! [8]
+
+
+//! [9]
+export QWS_DISPLAY="VNC:LinuxFb"
+//! [9]
diff --git a/doc/src/snippets/code/doc_src_qt3support.qdoc b/doc/src/snippets/code/doc_src_qt3support.qdoc
new file mode 100644
index 0000000000..e6f0272aca
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qt3support.qdoc
@@ -0,0 +1,8 @@
+//! [0]
+#include <Qt3Support>
+//! [0]
+
+
+//! [1]
+QT += qt3support
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_qt3to4.qdoc b/doc/src/snippets/code/doc_src_qt3to4.qdoc
new file mode 100644
index 0000000000..da0832d3f0
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qt3to4.qdoc
@@ -0,0 +1,26 @@
+//! [0]
+qt3to4 myfile.cpp
+qt3to4 myapp.pro
+//! [0]
+
+
+//! [1]
+<Rules>
+  <Include>/path/to/q3porting.xml</Include>
+
+  <item Type="RenamedHeader" Disable="True" >
+    <Qt4>q3sqlselectcursor.h</Qt4>
+    <Qt3>qsqlselectcursor.h</Qt3>
+  </item>
+
+  <item Type="RenamedHeader" >
+    <Qt4>newclass.h</Qt4>
+    <Qt3>oldclass.h</Qt3>
+  </item>
+</Rules>
+//! [1]
+
+
+//! [2]
+using namespace Qt;
+//! [2]
diff --git a/doc/src/snippets/code/doc_src_qt4-accessibility.qdoc b/doc/src/snippets/code/doc_src_qt4-accessibility.qdoc
new file mode 100644
index 0000000000..8bed0a9201
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qt4-accessibility.qdoc
@@ -0,0 +1,59 @@
+//! [environment]
+export QT_ACCESSIBILITY=1
+//! [environment]
+
+//! [0]
+class MyWidgetInterface : public QAccessibleWidget
+{
+public:
+    MyWidgetInterface(QWidget *widget, Role role);
+
+    QString text(Text text, int child) const;
+    State state(int child) const;
+    QString actionText(int action, Text text, int child) const;
+    bool doAction(int action, int child, const QVariantList &params);
+    ...
+};
+//! [0]
+
+
+//! [1]
+bool MyWidgetInterface::doAction(int action, int child,
+                                 const QVariantList &params)
+{
+    if (child || !widget()->isEnabled())
+        return false;
+
+    switch (action) {
+    case DefaultAction:
+    case Press:
+        {
+            MyWidget *widget = qobject_cast<MyWidget *>(object());
+            if (widget)
+                widget->click();
+        }
+        return true;
+    }
+    return QAccessibleWidget::doAction(action, child, params);
+}
+//! [1]
+
+
+//! [2]
+QStringList MyFactory::keys() const
+{
+    return QStringList() << "MyWidget" << "MyOtherWidget";
+}
+
+QAccessibleInterface *MyFactory::create(const QString &className,
+                                        QObject *object)
+{
+    if (classname == "MyWidget")
+        return new MyWidgetInterface(object);
+    if (classname == "MyOtherWidget")
+        return new MyOtherWidgetInterface(object);
+    return 0;
+}
+
+Q_EXPORT_PLUGIN2(myfactory, MyFactory)
+//! [2]
diff --git a/doc/src/snippets/code/doc_src_qt4-arthur.qdoc b/doc/src/snippets/code/doc_src_qt4-arthur.qdoc
new file mode 100644
index 0000000000..6ac30ae476
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qt4-arthur.qdoc
@@ -0,0 +1,104 @@
+//! [0]
+QLinearGradient gradient(0, 0, 100, 100);
+gradient.setColorAt(0, Qt::red);
+gradient.setColorAt(0.5, Qt::green);
+gradient.setColorAt(1, Qt::blue);
+painter.setBrush(gradient);
+painter.drawRect(0, 0, 100, 100);
+//! [0]
+
+
+//! [1]
+QRadialGradient gradient(50, 50, 50, 30, 30);
+gradient.setColorAt(0.2, Qt::white);
+gradient.setColorAt(0.8, Qt::green);
+gradient.setColorAt(1, Qt::black);
+painter.setBrush(gradient);
+painter.drawEllipse(0, 0, 100, 100);
+//! [1]
+
+
+//! [2]
+QConicalGradient gradient(60, 40, 0);
+gradient.setColorAt(0, Qt::black);
+gradient.setColorAt(0.4, Qt::green);
+gradient.setColorAt(0.6, Qt::white);
+gradient.setColorAt(1, Qt::black);
+painter.setBrush(gradient);
+painter.drawEllipse(0, 0, 100, 100);
+//! [2]
+
+
+//! [3]
+// Specfiy semi-transparent red
+painter.setBrush(QColor(255, 0, 0, 127));
+painter.drawRect(0, 0, width()/2, height());
+
+// Specify semi-transparend blue
+painter.setBrush(QColor(0, 0, 255, 127));
+painter.drawRect(0, 0, width(), height()/2);
+//! [3]
+
+
+//! [4]
+// One line without anti-aliasing
+painter.drawLine(0, 0, width()/2, height());
+
+// One line with anti-aliasing
+painter.setRenderHint(QPainter::Antialiasing);
+painter.drawLine(width()/2, 0, width()/2, height());
+//! [4]
+
+
+//! [5]
+QPainterPath path;
+path.addRect(20, 20, 60, 60);
+path.addBezier(0, 0,  99, 0,  50, 50,  99, 99);
+path.addBezier(99, 99,  0, 99,  50, 50,  0, 0);
+painter.drawPath(path);
+//! [5]
+
+
+//! [6]
+QPixmap buffer(size());
+QPainter painter(&buffer);
+
+// Paint code here
+
+painter.end();
+bitBlt(this, 0, 0, &buffer);
+//! [6]
+
+
+//! [7]
+QPainter painter(this);
+
+// Paint code here
+
+painter.end();
+//! [7]
+
+
+//! [8]
+unbufferedWidget->setAttribute(Qt::WA_PaintOnScreen);
+//! [8]
+
+
+//! [9]
+QLinearGradient gradient(0, 0, 100, 100);
+gradient.setColorAt(0, Qt::blue);
+gradient.setColorAt(1, Qt::red);
+painter.setPen(QPen(gradient, 0));
+for (int y=fontSize; y<100; y+=fontSize)
+    drawText(0, y, text);
+//! [9]
+
+
+//! [10]
+QImage image(100, 100, 32);
+QPainter painter(&image);
+
+// painter commands.
+
+painter.end();
+//! [10]
diff --git a/doc/src/snippets/code/doc_src_qt4-intro.qdoc b/doc/src/snippets/code/doc_src_qt4-intro.qdoc
new file mode 100644
index 0000000000..ced563e7da
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qt4-intro.qdoc
@@ -0,0 +1,101 @@
+//! [0]
+QT -= gui
+//! [0]
+
+
+//! [1]
+QT += network opengl sql qt3support
+//! [1]
+
+
+//! [2]
+CONFIG += uic3
+//! [2]
+
+
+//! [3]
+#include <QClassName>
+//! [3]
+
+
+//! [4]
+#include <QString>
+#include <QApplication>
+#include <QSqlTableModel>
+//! [4]
+
+
+//! [5]
+#include <qclassname.h>
+//! [5]
+
+
+//! [6]
+#include <QtCore>
+//! [6]
+
+
+//! [7]
+using namespace Qt;
+//! [7]
+
+
+//! [8]
+QLabel *label1 = new QLabel("Hello", this);
+QLabel *label2 = new QLabel(this, "Hello");
+//! [8]
+
+
+//! [9]
+MyWidget::MyWidget(QWidget *parent, const char *name)
+    : QWidget(parent, name)
+{
+    ...
+}
+//! [9]
+
+
+//! [10]
+// DEPRECATED
+if (obj->inherits("QPushButton")) {
+    QPushButton *pushButton = (QPushButton *)obj;
+    ...
+}
+//! [10]
+
+
+//! [11]
+QPushButton *pushButton = qobject_cast<QPushButton *>(obj);
+if (pushButton) {
+    ...
+}
+//! [11]
+
+
+//! [12]
+QLabel *label = new QLabel;
+QPointer<QLabel> safeLabel = label;
+safeLabel->setText("Hello world!");
+delete label;
+// safeLabel is now 0, whereas label is a dangling pointer
+//! [12]
+
+
+//! [13]
+QT += qt3support
+//! [13]
+
+
+//! [14]
+DEFINES += QT3_SUPPORT
+//! [14]
+
+
+//! [15]
+DEFINES += QT3_SUPPORT_WARNINGS
+//! [15]
+
+
+//! [16]
+DEFINES += QT3_SUPPORT
+//! [16]
diff --git a/doc/src/snippets/code/doc_src_qt4-mainwindow.qdoc b/doc/src/snippets/code/doc_src_qt4-mainwindow.qdoc
new file mode 100644
index 0000000000..9e81fd15c5
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qt4-mainwindow.qdoc
@@ -0,0 +1,70 @@
+//! [0]
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent)
+{
+//! [0]
+
+
+//! [1]
+fileToolbar->setAllowedAreas(Qt::TopToolBarArea | Qt::BottomToolBarArea);
+addToolBar(Qt::TopToolBarArea, fileToolbar);
+//! [1]
+
+
+//! [2]
+setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
+setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
+setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
+setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
+//! [2]
+
+
+//! [3]
+QWidget *centralWidget = new QWidget(this);
+setCentralWidget(centralWidget);
+//! [3]
+
+
+//! [4]
+QPopupMenu *fileMenu = new QPopupMenu(this);
+openAction->addTo(fileMenu);
+saveAction->addTo(fileMenu);
+...
+menuBar()->insertItem(tr("&File"), fileMenu);
+//! [4]
+
+
+//! [5]
+QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
+fileMenu->addAction(openAction);
+fileMenu->addAction(saveAction);
+...
+//! [5]
+
+
+//! [6]
+QToolBar *fileTools = new QToolBar(this, "file toolbar");
+openAction->addTo(fileTools);
+saveAction->addTo(fileTools);
+...
+//! [6]
+
+
+//! [7]
+QToolBar *fileTools = addToolBar(tr("File Tool Bar"));
+fileTools->addAction(openAction);
+fileTools->addAction(saveAction);
+...
+//! [7]
+
+
+//! [8]
+QDockWidget *dockWidget = new QDockWidget(this);
+mainWin->moveDockWidget(dockWidget, Qt::DockLeft);
+//! [8]
+
+
+//! [9]
+QDockWidget *dockWidget = new QDockWidget(mainWindow);
+mainWindow->addDockWidget(Qt::LeftDockWidgetArea, dockWidget);
+//! [9]
diff --git a/doc/src/snippets/code/doc_src_qt4-sql.qdoc b/doc/src/snippets/code/doc_src_qt4-sql.qdoc
new file mode 100644
index 0000000000..74b04eb959
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qt4-sql.qdoc
@@ -0,0 +1,19 @@
+//! [0]
+QSqlQueryModel model;
+model.setQuery("select * from person");
+
+QTableView view;
+view.setModel(&model);
+view.show();
+//! [0]
+
+
+//! [1]
+QSqlTableModel model;
+model.setTable("person");
+model.select();
+
+QTableView view;
+view.setModel(&model);
+view.show();
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_qt4-styles.qdoc b/doc/src/snippets/code/doc_src_qt4-styles.qdoc
new file mode 100644
index 0000000000..b75c135560
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qt4-styles.qdoc
@@ -0,0 +1,42 @@
+//! [0]
+const QStyleOptionFocusRect *focusRectOption =
+        qstyleoption_cast<const QStyleOptionFocusRect *>(option);
+if (focusRectOption) {
+    ...
+}
+//! [0]
+
+
+//! [1]
+void MyWidget::paintEvent(QPaintEvent *event)
+{
+    QPainter painter(this);
+    ...
+
+    QStyleOptionFocusRect option(1);
+    option.init(this);
+    option.backgroundColor = palette().color(QPalette::Window);
+
+    style().drawPrimitive(QStyle::PE_FrameFocusRect, &option, &painter,
+                          this);
+}
+//! [1]
+
+
+//! [2]
+void drawControl(ControlElement element,
+                 QPainter *painter,
+                 const QWidget *widget,
+                 const QRect &rect,
+                 const QColorGroup &colorGroup,
+                 SFlags how = Style_Default,
+                 const QStyleOption &option = QStyleOption::Default) const;
+//! [2]
+
+
+//! [3]
+void drawControl(ControlElement element,
+                 const QStyleOption *option,
+                 QPainter *painter,
+                 const QWidget *widget = 0) const;
+//! [3]
diff --git a/doc/src/snippets/code/doc_src_qt4-tulip.qdoc b/doc/src/snippets/code/doc_src_qt4-tulip.qdoc
new file mode 100644
index 0000000000..2bc5af1826
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qt4-tulip.qdoc
@@ -0,0 +1,100 @@
+//! [0]
+foreach (variable, container)
+    statement;
+//! [0]
+
+
+//! [1]
+QList<QString> list;
+...
+foreach (QString str, list)
+    cout << str.ascii() << endl;
+//! [1]
+
+
+//! [2]
+QString str;
+foreach (str, list)
+    cout << str.ascii() << endl;
+//! [2]
+
+
+//! [3]
+// forward                                  // backward
+QList<QString> list;                        QList<QString> list;
+...                                         ...
+QListIterator<QString> i(list);             QListIterator<QString> i(list);        
+while (i.hasNext())                         i.toBack();                            
+    cout << i.next().ascii() << endl;       while (i.hasPrev())                    
+                                                cout << i.prev().ascii() << endl;
+//! [3]
+
+
+//! [4]
+// forward                                  // backward
+QMutableListIterator<int> i(list);          QMutableListIterator<int> i(list);  
+while (i.hasNext())                         i.toBack();                         
+    if (i.next() > 128)                     while (i.hasPrev())                 
+        i.setValue(128);                        if (i.prev() > 128)             
+                                                    i.setValue(128);           
+//! [4]
+
+
+//! [5]
+// forward                                  // backward
+QMutableListIterator<int> i(list);          QMutableListIterator<int> i(list);                 
+while (i.hasNext())                         i.toBack();                         
+    if (i.next() % 2 != 0)                  while (i.hasPrev())                        
+        i.remove();                             if (i.prev() % 2 != 0)          
+                                                    i.remove();                 
+//! [5]
+
+
+//! [6]
+// STL-style                                // Java-style
+QMap<int, QWidget *>::const_iterator i;     QMapIterator<int, QWidget *> i(map);
+for (i = map.begin(); i != map.end(); ++i)  while (i.findNext(widget))
+    if (i.value() == widget)                    cout << "Found widget " << widget
+        cout << "Found widget " << widget            << " under key "
+             << " under key "                        << i.key() << endl;
+             << i.key() << endl;
+//! [6]
+
+
+//! [7]
+// STL-style                                // Java-style
+QList<int>::iterator i = list.begin();      QMutableListIterator<int> i(list);
+while (i != list.end()) {                   while (i.hasNext()) {
+    if (*i == 0) {                              int val = i.next();
+        i = list.erase(i);                      if (val < 0)
+    } else {                                        i.setValue(-val);
+        if (*i < 0)                             else if (val == 0)
+            *i = -*i;                               i.remove();
+        ++i;                                }
+    }
+}
+//! [7]
+
+
+//! [8]
+QList<double> list;
+...
+for (int i = 0; i < list.size(); ++i) {
+    if (list[i] < 0.0)
+        list[i] = 0.0;
+}
+//! [8]
+
+
+//! [9]
+QMap<QString, int> map;
+...
+map.value("TIMEOUT", 30);  // returns 30 if "TIMEOUT" isn't in the map
+//! [9]
+
+
+//! [10]
+QMultiMap<QString, int> map;
+...
+QList<int> values = map.values("TIMEOUT");
+//! [10]
diff --git a/doc/src/snippets/code/doc_src_qtcore.qdoc b/doc/src/snippets/code/doc_src_qtcore.qdoc
new file mode 100644
index 0000000000..efa155f33a
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qtcore.qdoc
@@ -0,0 +1,3 @@
+//! [0]
+#include <QtCore>
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_qtdbus.qdoc b/doc/src/snippets/code/doc_src_qtdbus.qdoc
new file mode 100644
index 0000000000..4c8c4b0c5a
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qtdbus.qdoc
@@ -0,0 +1,8 @@
+//! [0]
+#include <QtDBus>
+//! [0]
+
+
+//! [1]
+QT += dbus
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_qtdesigner.qdoc b/doc/src/snippets/code/doc_src_qtdesigner.qdoc
new file mode 100644
index 0000000000..b19a7472a9
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qtdesigner.qdoc
@@ -0,0 +1,293 @@
+//! [0]
+#include <QtDesigner>
+//! [0]
+
+
+//! [1]
+CONFIG += designer
+//! [1]
+
+
+//! [2]
+QDesignerMemberSheetExtension *memberSheet  = 0;
+QExtensionManager manager = formEditor->extensionManager();
+
+memberSheet = qt_extension<QDesignerMemberSheetExtension*>(manager, widget);
+int index = memberSheet->indexOf(setEchoMode);
+memberSheet->setVisible(index, false);
+
+delete memberSheet;
+//! [2]
+
+
+//! [3]
+class MyMemberSheetExtension : public QObject,
+        public QDesignerMemberSheetExtension
+{
+    Q_OBJECT
+    Q_INTERFACES(QDesignerMemberSheetExtension)
+
+public:
+    ...
+}
+//! [3]
+
+
+//! [4]
+QObject *ANewExtensionFactory::createExtension(QObject *object,
+        const QString &iid, QObject *parent) const
+{
+    if (iid != Q_TYPEID(QDesignerMemberSheetExtension))
+        return 0;
+
+    if (MyCustomWidget *widget = qobject_cast<MyCustomWidget*>
+           (object))
+        return new MyMemberSheetExtension(widget, parent);
+
+    return 0;
+}
+//! [4]
+
+
+//! [5]
+QObject *AGeneralExtensionFactory::createExtension(QObject *object,
+        const QString &iid, QObject *parent) const
+{
+    MyCustomWidget *widget = qobject_cast<MyCustomWidget*>(object);
+
+    if (widget && (iid == Q_TYPEID(QDesignerTaskMenuExtension))) {
+        return new MyTaskMenuExtension(widget, parent);
+
+    } else if (widget && (iid == Q_TYPEID(QDesignerMemberSheetExtension))) {
+        return new MyMemberSheetExtension(widget, parent);
+
+    } else {
+        return 0;
+    }
+}
+//! [5]
+
+
+//! [6]
+class MyContainerExtension : public QObject,
+       public QDesignerContainerExtension
+{
+    Q_OBJECT
+    Q_INTERFACES(QDesignerContainerExtension)
+
+public:
+    MyContainerExtension(MyCustomWidget *widget,
+                         QObject *parent = 0);
+    int count() const;
+    QWidget *widget(int index) const;
+    int currentIndex() const;
+    void setCurrentIndex(int index);
+    void addWidget(QWidget *widget);
+    void insertWidget(int index, QWidget *widget);
+    void remove(int index);
+
+private:
+    MyCustomWidget *myWidget;
+};
+//! [6]
+
+
+//! [7]
+QObject *ANewExtensionFactory::createExtension(QObject *object,
+        const QString &iid, QObject *parent) const
+{
+    if (iid != Q_TYPEID(QDesignerContainerExtension))
+        return 0;
+
+    if (MyCustomWidget *widget = qobject_cast<MyCustomWidget*>
+           (object))
+        return new MyContainerExtension(widget, parent);
+
+    return 0;
+}
+//! [7]
+
+
+//! [8]
+QObject *AGeneralExtensionFactory::createExtension(QObject *object,
+        const QString &iid, QObject *parent) const
+{
+    MyCustomWidget *widget = qobject_cast<MyCustomWidget*>(object);
+
+    if (widget && (iid == Q_TYPEID(QDesignerTaskMenuExtension))) {
+        return new MyTaskMenuExtension(widget, parent);
+
+    } else if (widget && (iid == Q_TYPEID(QDesignerContainerExtension))) {
+        return new MyContainerExtension(widget, parent);
+
+    } else {
+        return 0;
+    }
+}
+//! [8]
+
+
+//! [9]
+class MyTaskMenuExtension : public QObject,
+        public QDesignerTaskMenuExtension
+{
+    Q_OBJECT
+    Q_INTERFACES(QDesignerTaskMenuExtension)
+
+public:
+    MyTaskMenuExtension(MyCustomWidget *widget, QObject *parent);
+
+    QAction *preferredEditAction() const;
+    QList<QAction *> taskActions() const;
+
+private slots:
+    void mySlot();
+
+private:
+    MyCustomWidget *widget;
+    QAction *myAction;
+};
+//! [9]
+
+
+//! [10]
+QObject *ANewExtensionFactory::createExtension(QObject *object,
+        const QString &iid, QObject *parent) const
+{
+    if (iid != Q_TYPEID(QDesignerTaskMenuExtension))
+        return 0;
+
+    if (MyCustomWidget *widget = qobject_cast<MyCustomWidget*>(object))
+        return new MyTaskMenuExtension(widget, parent);
+
+    return 0;
+}
+//! [10]
+
+
+//! [11]
+QObject *AGeneralExtensionFactory::createExtension(QObject *object,
+        const QString &iid, QObject *parent) const
+{
+    MyCustomWidget *widget = qobject_cast<MyCustomWidget*>(object);
+
+    if (widget && (iid == Q_TYPEID(QDesignerContainerExtension))) {
+        return new MyContainerExtension(widget, parent);
+
+    } else if (widget && (iid == Q_TYPEID(QDesignerTaskMenuExtension))) {
+        return new MyTaskMenuExtension(widget, parent);
+
+    } else {
+        return 0;
+    }
+}
+//! [11]
+
+
+//! [12]
+#include customwidgetoneinterface.h
+#include customwidgettwointerface.h
+#include customwidgetthreeinterface.h
+
+#include <QtDesigner/QtDesigner>
+#include <QtCore/qplugin.h>
+
+class MyCustomWidgets: public QObject, public QDesignerCustomWidgetCollectionInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(QDesignerCustomWidgetCollectionInterface)
+
+public:
+    MyCustomWidgets(QObject *parent = 0);
+
+    virtual QList<QDesignerCustomWidgetInterface*> customWidgets() const;
+
+private:
+    QList<QDesignerCustomWidgetInterface*> widgets;
+};
+//! [12]
+
+
+//! [13]
+MyCustomWidgets::MyCustomWidgets(QObject *parent)
+        : QObject(parent)
+{
+    widgets.append(new CustomWidgetOneInterface(this));
+    widgets.append(new CustomWidgetTwoInterface(this));
+    widgets.append(new CustomWidgetThreeInterface(this));
+}
+
+QList<QDesignerCustomWidgetInterface*> MyCustomWidgets::customWidgets() const
+{
+    return widgets;
+}
+
+Q_EXPORT_PLUGIN2(customwidgetsplugin, MyCustomWidgets)
+//! [13]
+
+
+//! [14]
+Q_EXPORT_PLUGIN2(customwidgetplugin, MyCustomWidget)
+//! [14]
+
+
+//! [15]
+QDesignerPropertySheetExtension *propertySheet  = 0;
+QExtensionManager manager = formEditor->extensionManager();
+
+propertySheet = qt_extension<QDesignerPropertySheetExtension*>(manager, widget);
+int index = propertySheet->indexOf(QLatin1String("margin"));
+
+propertySheet->setProperty(index, 10);
+propertySheet->setChanged(index, true);
+
+delete propertySheet;
+//! [15]
+
+
+//! [16]
+class MyPropertySheetExtension : public QObject,
+        public QDesignerPropertySheetExtension
+{
+    Q_OBJECT
+    Q_INTERFACES(QDesignerPropertySheetExtension)
+
+public:
+    ...
+}
+//! [16]
+
+
+//! [17]
+QObject *ANewExtensionFactory::createExtension(QObject *object,
+        const QString &iid, QObject *parent) const
+{
+    if (iid != Q_TYPEID(QDesignerPropertySheetExtension))
+        return 0;
+
+    if (MyCustomWidget *widget = qobject_cast<MyCustomWidget*>
+           (object))
+        return new MyPropertySheetExtension(widget, parent);
+
+    return 0;
+}
+//! [17]
+
+
+//! [18]
+QObject *AGeneralExtensionFactory::createExtension(QObject *object,
+        const QString &iid, QObject *parent) const
+{
+    MyCustomWidget *widget = qobject_cast<MyCustomWidget*>(object);
+
+    if (widget && (iid == Q_TYPEID(QDesignerTaskMenuExtension))) {
+        return new MyTaskMenuExtension(widget, parent);
+
+    } else if (widget && (iid == Q_TYPEID(QDesignerPropertySheetExtension))) {
+        return new MyPropertySheetExtension(widget, parent);
+
+    } else {
+        return 0;
+    }
+}
+//! [18]
diff --git a/doc/src/snippets/code/doc_src_qtestevent.qdoc b/doc/src/snippets/code/doc_src_qtestevent.qdoc
new file mode 100644
index 0000000000..87591e0470
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qtestevent.qdoc
@@ -0,0 +1,11 @@
+//! [0]
+QTestEventList events;
+events.addKeyClick('a');
+events.addKeyClick(Qt::Key_Backspace);
+events.addDelay(200);
+
+QLineEdit *lineEdit = new QLineEdit(myParent);
+...
+events.simulate(lineEdit);
+events.simulate(lineEdit);
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_qtestlib.qdoc b/doc/src/snippets/code/doc_src_qtestlib.qdoc
new file mode 100644
index 0000000000..a4ef52ee45
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qtestlib.qdoc
@@ -0,0 +1,102 @@
+//! [0]
+class MyFirstTest: public QObject
+{
+    Q_OBJECT
+private slots:
+    void initTestCase()
+    { qDebug("called before everything else"); }
+    void myFirstTest()
+    { QVERIFY(1 == 1); }
+    void mySecondTest()
+    { QVERIFY(1 != 2); }
+    void cleanupTestCase()
+    { qDebug("called after myFirstTest and mySecondTest"); }
+};
+//! [0]
+
+
+//! [1]
+QT += testlib
+//! [1]
+
+
+//! [2]
+testname [options] [testfunctions[:testdata]]...
+//! [2]
+
+
+//! [3]
+/myTestDirectory$ testQString toUpper
+//! [3]
+
+
+//! [4]
+/myTestDirectory$ testQString toUpper toInt:zero
+//! [4]
+
+
+//! [5]
+/myTestDirectory$ testMyWidget -vs -eventdelay 500
+//! [5]
+
+
+//! [6]
+cetest [options] ...
+//! [6]
+
+
+//! [7]
+set INCLUDE=C:\Program Files\Windows CE Tools\wce500\Windows Mobile 5.0 Pocket PC SDK\Activesync\Inc;%INCLUDE%
+set LIB=C:\Program Files\Windows CE Tools\wce500\Windows Mobile 5.0 Pocket PC SDK\Activesync\Lib;%LIB%    
+//! [7]
+
+
+//! [8]
+void TestQString::toUpper()
+{
+    QString str = "Hello";
+    QVERIFY(str.toUpper() == "HELLO");
+}
+//! [8]
+
+
+//! [9]
+/myTestDirectory$ qmake -project "QT += testlib"
+/myTestDirectory$ qmake
+/myTestDirectory$ make
+//! [9]
+
+
+//! [10]
+********* Start testing of TestQString *********
+Config: Using QTest library 4.1.0, Qt 4.1.0
+PASS   : TestQString::initTestCase()
+PASS   : TestQString::toUpper()
+PASS   : TestQString::cleanupTestCase()
+Totals: 3 passed, 0 failed, 0 skipped
+********* Finished testing of TestQString *********
+//! [10]
+
+
+//! [11]
+QCOMPARE(QString("hello").toUpper(), QString("HELLO"));
+QCOMPARE(QString("Hello").toUpper(), QString("HELLO"));
+QCOMPARE(QString("HellO").toUpper(), QString("HELLO"));
+QCOMPARE(QString("HELLO").toUpper(), QString("HELLO"));
+//! [11]
+
+//! [12]
+class MyFirstBenchmark: public QObject
+{
+    Q_OBJECT
+private slots:
+    void myFirstBenchmark()
+    { 
+        QString string1;
+        QString string2;
+        QBENCHMARK {
+            string1.localeAwareCompare(string2);
+        }
+    }
+};
+//! [12]
\ No newline at end of file
diff --git a/doc/src/snippets/code/doc_src_qtgui.qdoc b/doc/src/snippets/code/doc_src_qtgui.qdoc
new file mode 100644
index 0000000000..ff3afcf64f
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qtgui.qdoc
@@ -0,0 +1,3 @@
+//! [0]
+#include <QtGui>
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_qthelp.qdoc b/doc/src/snippets/code/doc_src_qthelp.qdoc
new file mode 100644
index 0000000000..11d231f5c9
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qthelp.qdoc
@@ -0,0 +1,161 @@
+//! [0]
+#include <QtHelp>
+//! [0]
+
+
+//! [1]
+CONFIG += help
+//! [1]
+
+
+//! [2]
+qhelpgenerator doc.qhp -o doc.qch
+//! [2]
+
+
+//! [3]
+<?xml version="1.0" encoding="utf-8" ?> 
+<QHelpCollectionProject version="1.0">
+    <docFiles>
+        <register>
+            <file>doc.qch</file>
+        </register>
+    </docFiles>
+</QHelpCollectionProject>
+//! [3]
+
+
+//! [4]
+qcollectiongenerator mycollection.qhcp -o mycollection.qhc
+//! [4]
+
+
+//! [5]
+...
+<docFiles>
+    <generate>
+        <file>
+            <input>doc.qhp</input>
+            <output>doc.qch</output>
+        </file>
+    </generate>
+    <register>
+        <file>doc.qch</file>
+    </register>
+</docFiles>
+...
+//! [5]
+
+
+//! [6]
+QHelpEngineCore helpEngine("mycollection.qhc");
+...
+
+// get all file references for the identifier
+QMap<QString, QUrl> links = 
+    helpEngine.linksForIdentifier(QLatin1String("MyDialog::ChangeButton"));    
+
+// If help is available for this keyword, get the help data
+// of the first file reference.
+if (links.count()) {
+    QByteArray helpData = helpEngine->fileData(links.constBegin().value());        
+    // show the documentation to the user
+    if (!helpData.isEmpty())
+        displayHelp(helpData);
+}
+//! [6]
+
+
+//! [7]
+<?xml version="1.0" encoding="UTF-8"?>
+<QtHelpProject version="1.0">
+    <namespace>mycompany.com.myapplication.1_0</namespace>
+    <virtualFolder>doc</virtualFolder>	    
+    <customFilter name="My Application 1.0">
+        <filterAttribute>myapp</filterAttribute>
+        <filterAttribute>1.0</filterAttribute>
+    </customFilter>
+    <filterSection>
+        <filterAttribute>myapp</filterAttribute>
+        <filterAttribute>1.0</filterAttribute>
+        <toc>
+            <section title="My Application Manual" ref="index.html">
+                <section title="Chapter 1" ref="doc.html#chapter1"/>
+                <section title="Chapter 2" ref="doc.html#chapter2"/>
+                <section title="Chapter 3" ref="doc.html#chapter3"/>
+            </section>
+        </toc>
+        <keywords>
+            <keyword name="foo" id="MyApplication::foo" ref="doc.html#foo"/>
+            <keyword name="bar" ref="doc.html#bar"/>
+            <keyword id="MyApplication::foobar" ref="doc.html#foobar"/>
+        </keywords>
+        <files>
+            <file>classic.css</file>
+            <file>index.html</file>
+            <file>doc.html</file>
+        </files>
+    </filterSection>
+</QtHelpProject>
+//! [7]
+
+
+//! [8]
+...
+<virtualFolder>doc</virtualFolder>
+...
+//! [8]
+
+
+//! [9]
+...
+<customFilter name="My Application 1.0">
+    <filterAttribute>myapp</filterAttribute>
+    <filterAttribute>1.0</filterAttribute>
+</customFilter>
+...
+//! [9]
+
+
+//! [10]
+...
+<filterSection>
+    <filterAttribute>myapp</filterAttribute>
+    <filterAttribute>1.0</filterAttribute>
+...
+//! [10]
+
+
+//! [11]
+...
+<toc>
+    <section title="My Application Manual" ref="index.html">
+        <section title="Chapter 1" ref="doc.html#chapter1"/>
+        <section title="Chapter 2" ref="doc.html#chapter2"/>
+        <section title="Chapter 3" ref="doc.html#chapter3"/>
+    </section>
+</toc>
+...
+//! [11]
+
+
+//! [12]
+...
+<keywords>
+   <keyword name="foo" id="MyApplication::foo" ref="doc.html#foo"/>
+   <keyword name="bar" ref="doc.html#bar"/>
+   <keyword id="MyApplication::foobar" ref="doc.html#foobar"/>
+</keywords>
+...
+//! [12]
+
+
+//! [13]
+...
+<files>
+    <file>classic.css</file>
+    <file>index.html</file>
+    <file>doc.html</file>
+</files>
+...
+//! [13]
diff --git a/doc/src/snippets/code/doc_src_qtmac-as-native.qdoc b/doc/src/snippets/code/doc_src_qtmac-as-native.qdoc
new file mode 100644
index 0000000000..6ad42b9408
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qtmac-as-native.qdoc
@@ -0,0 +1,3 @@
+//! [0]
+qmake -spec macx-xcode project.pro
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_qtnetwork.qdoc b/doc/src/snippets/code/doc_src_qtnetwork.qdoc
new file mode 100644
index 0000000000..48566869f9
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qtnetwork.qdoc
@@ -0,0 +1,8 @@
+//! [0]
+QT += network
+//! [0]
+
+
+//! [1]
+#include <QtNetwork>
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_qtopengl.qdoc b/doc/src/snippets/code/doc_src_qtopengl.qdoc
new file mode 100644
index 0000000000..e13cdf0555
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qtopengl.qdoc
@@ -0,0 +1,8 @@
+//! [0]
+#include <QtOpenGL>
+//! [0]
+
+
+//! [1]
+QT += opengl
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_qtscript.qdoc b/doc/src/snippets/code/doc_src_qtscript.qdoc
new file mode 100644
index 0000000000..4031fef873
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qtscript.qdoc
@@ -0,0 +1,948 @@
+//! [0]
+#include <QtScript>
+//! [0]
+
+
+//! [1]
+QT += script
+//! [1]
+
+
+//! [2]
+function myInterestingScriptFunction() { ... }
+...
+myQObject.somethingChanged.connect(myInterestingScriptFunction);
+//! [2]
+
+
+//! [3]
+myQObject.somethingChanged.connect(myOtherQObject.doSomething);
+//! [3]
+
+
+//! [4]
+myQObject.somethingChanged.disconnect(myInterestingFunction);
+myQObject.somethingChanged.disconnect(myOtherQObject.doSomething);
+//! [4]
+
+
+//! [5]
+var obj = { x: 123 };
+var fun = function() { print(this.x); };
+myQObject.somethingChanged.connect(obj, fun);
+//! [5]
+
+
+//! [6]
+myQObject.somethingChanged.disconnect(obj, fun);
+//! [6]
+
+
+//! [7]
+var obj = { x: 123, fun: function() { print(this.x); } };
+myQObject.somethingChanged.connect(obj, "fun");
+//! [7]
+
+
+//! [8]
+myQObject.somethingChanged.disconnect(obj, "fun");
+//! [8]
+
+
+//! [9]
+try {
+    myQObject.somethingChanged.connect(myQObject, "slotThatDoesntExist");
+} catch (e) {
+    print(e);
+}
+//! [9]
+
+
+//! [10]
+myQObject.somethingChanged("hello");
+//! [10]
+
+
+//! [11]
+myQObject.myOverloadedSlot(10);   // will call the int overload
+myQObject.myOverloadedSlot("10"); // will call the QString overload
+//! [11]
+
+
+//! [12]
+myQObject['myOverloadedSlot(int)']("10");   // call int overload; the argument is converted to an int
+myQObject['myOverloadedSlot(QString)'](10); // call QString overload; the argument is converted to a string
+//! [12]
+
+
+//! [13]
+Q_PROPERTY(bool enabled READ enabled WRITE setEnabled)
+//! [13]
+
+
+//! [14]
+myQObject.enabled = true;
+
+...
+
+myQObject.enabled = !myQObject.enabled;
+//! [14]
+
+
+//! [15]
+myDialog.okButton
+//! [15]
+
+
+//! [16]
+myDialog.okButton.objectName = "cancelButton";
+// from now on, myDialog.cancelButton references the button
+//! [16]
+
+
+//! [17]
+var okButton = myDialog.findChild("okButton");
+if (okButton != null) {
+   // do something with the OK button
+}
+
+var buttons = myDialog.findChildren(RegExp("button[0-9]+"));
+for (var i = 0; i < buttons.length; ++i) {
+   // do something with buttons[i]
+}
+//! [17]
+
+
+//! [18]
+QScriptValue myQObjectConstructor(QScriptContext *context, QScriptEngine *engine)
+{
+  // let the engine manage the new object's lifetime.
+  return engine->newQObject(new MyQObject(), QScriptEngine::ScriptOwnership);
+}
+//! [18]
+
+
+//! [19]
+class MyObject : public QObject
+{
+    Q_OBJECT
+
+public:
+    MyObject( ... );
+
+    void aNonScriptableFunction();
+
+public slots: // these functions (slots) will be available in QtScript
+    void calculate( ... );
+    void setEnabled( bool enabled );
+    bool isEnabled() const;
+
+private:
+   ....
+
+};
+//! [19]
+
+
+//! [20]
+class MyObject : public QObject
+{
+    Q_OBJECT
+
+    public:
+    Q_INVOKABLE void thisMethodIsInvokableInQtScript();
+    void thisMethodIsNotInvokableInQtScript();
+
+    ...
+};
+//! [20]
+
+
+//! [21]
+var obj = new MyObject;
+obj.setEnabled( true );
+print( "obj is enabled: " + obj.isEnabled() );
+//! [21]
+
+
+//! [22]
+var obj = new MyObject;
+obj.enabled = true;
+print( "obj is enabled: " + obj.enabled );
+//! [22]
+
+
+//! [23]
+class MyObject : public QObject
+{
+    Q_OBJECT
+    // define the enabled property
+    Q_PROPERTY( bool enabled WRITE setEnabled READ isEnabled )
+
+public:
+    MyObject( ... );
+
+    void aNonScriptableFunction();
+
+public slots: // these functions (slots) will be available in QtScript
+    void calculate( ... );
+    void setEnabled( bool enabled );
+    bool isEnabled() const;
+
+private:
+   ....
+
+};
+//! [23]
+
+
+//! [24]
+Q_PROPERTY(int nonScriptableProperty READ foo WRITE bar SCRIPTABLE false)
+//! [24]
+
+
+//! [25]
+class MyObject : public QObject
+{
+    Q_OBJECT
+    // define the enabled property
+    Q_PROPERTY( bool enabled WRITE setEnabled READ isEnabled )
+
+public:
+    MyObject( ... );
+
+    void aNonScriptableFunction();
+
+public slots: // these functions (slots) will be available in QtScript
+    void calculate( ... );
+    void setEnabled( bool enabled );
+    bool isEnabled() const;
+
+signals: // the signals
+    void enabledChanged( bool newState );
+
+private:
+   ....
+
+};
+//! [25]
+
+
+//! [26]
+function enabledChangedHandler( b )
+{
+    print( "state changed to: " + b );
+}
+
+function init()
+{
+    var obj = new MyObject();
+    // connect a script function to the signal
+    obj["enabledChanged(bool)"].connect(enabledChangedHandler);
+    obj.enabled = true;
+    print( "obj is enabled: " + obj.enabled );
+}
+//! [26]
+
+
+//! [27]
+var o = new Object();
+o.foo = 123;
+print(o.hasOwnProperty('foo')); // true
+print(o.hasOwnProperty('bar')); // false
+print(o); // calls o.toString(), which returns "[object Object]"
+//! [27]
+
+
+//! [28]
+function Person(name)
+{
+  this.name = name;
+}
+//! [28]
+
+
+//! [29]
+Person.prototype.toString = function() { return "Person(name: " + this.name + ")"; }
+//! [29]
+
+
+//! [30]
+var p1 = new Person("John Doe");
+var p2 = new Person("G.I. Jane");
+print(p1); // "Person(name: John Doe)"
+print(p2); // "Person(name: G.I. Jane)"
+//! [30]
+
+
+//! [31]
+print(p1.hasOwnProperty('name')); // 'name' is an instance variable, so this returns true
+print(p1.hasOwnProperty('toString')); // returns false; inherited from prototype
+print(p1 instanceof Person); // true
+print(p1 instanceof Object); // true
+//! [31]
+
+
+//! [32]
+function Employee(name, salary)
+{
+  Person.call(this, name); // call base constructor
+
+  this.salary = salary;
+}
+
+// set the prototype to be an instance of the base class
+Employee.prototype = new Person();
+
+// initialize prototype
+Employee.prototype.toString = function() { ... }
+//! [32]
+
+
+//! [33]
+var e = new Employee("Johnny Bravo", 5000000);
+print(e instanceof Employee); // true
+print(e instanceof Person);   // true
+print(e instanceof Object);   // true
+print(e instanceof Array);    // false
+//! [33]
+
+
+//! [34]
+QScriptValue Person_ctor(QScriptContext *context, QScriptEngine *engine)
+{
+  QString name = context->argument(0).toString();
+  context->thisObject().setProperty("name", name);
+  return engine->undefinedValue();
+}
+//! [34]
+
+
+//! [35]
+QScriptValue Person_prototype_toString(QScriptContext *context, QScriptEngine *engine)
+{
+  QString name = context->thisObject().property("name").toString();
+  QString result = QString::fromLatin1("Person(name: %0)").arg(name);
+  return result;
+}
+//! [35]
+
+
+//! [36]
+QScriptEngine engine;
+QScriptValue ctor = engine.newFunction(Person_ctor);
+ctor.property("prototype").setProperty("toString", engine.newFunction(Person_prototype_toString));
+QScriptValue global = engine.globalObject();
+global.setProperty("Person", ctor);
+//! [36]
+
+
+//! [37]
+QScriptValue Employee_ctor(QScriptContext *context, QScriptEngine *engine)
+{
+  QScriptValue super = context->callee().property("prototype").property("constructor");
+  super.call(context->thisObject(), QScriptValueList() << context->argument(0));
+  context->thisObject().setProperty("salary", context->argument(1));
+  return engine->undefinedValue();
+}
+//! [37]
+
+
+//! [38]
+QScriptValue empCtor = engine.newFunction(Employee_ctor);
+empCtor.setProperty("prototype", global.property("Person").construct());
+global.setProperty("Employee", empCtor);
+//! [38]
+
+
+//! [39]
+Q_DECLARE_METATYPE(QPointF)
+Q_DECLARE_METATYPE(QPointF*)
+
+QScriptValue QPointF_prototype_x(QScriptContext *context, QScriptEngine *engine)
+{
+  // Since the point is not to be modified, it's OK to cast to a value here
+    QPointF point = qscriptvalue_cast<QPointF>(context->thisObject());
+    return point.x();
+}
+
+QScriptValue QPointF_prototype_setX(QScriptContext *context, QScriptEngine *engine)
+{
+    // Cast to a pointer to be able to modify the underlying C++ value
+    QPointF *point = qscriptvalue_cast<QPointF*>(context->thisObject());
+    if (!point)
+        return context->throwError(QScriptContext::TypeError, "QPointF.prototype.setX: this object is not a QPointF");
+    point->setX(context->argument(0).toNumber());
+    return engine->undefinedValue();
+}
+//! [39]
+
+
+//! [40]
+var o = new Object();
+(o.__proto__ === Object.prototype); // this evaluates to true
+//! [40]
+
+
+//! [41]
+var o = new Object();
+o.__defineGetter__("x", function() { return 123; });
+var y = o.x; // 123
+//! [41]
+
+
+//! [42]
+var o = new Object();
+o.__defineSetter__("x", function(v) { print("and the value is:", v); });
+o.x = 123; // will print "and the value is: 123"
+//! [42]
+
+
+//! [43]
+class MyObject : public QObject
+{
+    Q_OBJECT
+    ...
+};
+
+Q_DECLARE_METATYPE(MyObject*)
+
+QScriptValue myObjectToScriptValue(QScriptEngine *engine, MyObject* const &in)
+{ return engine->newQObject(in); }
+
+void myObjectFromScriptValue(const QScriptValue &object, MyObject* &out)
+{ out = qobject_cast<MyObject*>(object.toQObject()); }
+
+...
+
+qScriptRegisterMetaType(&engine, myObjectToScriptValue, myObjectFromScriptValue);
+//! [43]
+
+//! [44]
+QScriptValue QPoint_ctor(QScriptContext *context, QScriptEngine *engine)
+{
+    int x = context->argument(0).toInt32();
+    int y = context->argument(1).toInt32();
+    return engine->toScriptValue(QPoint(x, y));
+}
+
+...
+
+engine.globalObject().setProperty("QPoint", engine.newFunction(QPoint_ctor));
+//! [44]
+
+//! [45]
+QScriptValue myPrintFunction(QScriptContext *context, QScriptEngine *engine)
+{
+    QString result;
+    for (int i = 0; i < context->argumentCount(); ++i) {
+        if (i > 0)
+            result.append(" ");
+        result.append(context->argument(i).toString());
+    }
+
+    QScriptValue calleeData = context->callee().data();
+    QPlainTextEdit *edit = qobject_cast<QPlainTextEdit*>(calleeData.toQObject());
+    edit->appendPlainText(result);
+
+    return engine->undefinedValue();
+}
+//! [45]
+
+//! [46]
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    QScriptEngine eng;
+    QPlainTextEdit edit;
+
+    QScriptValue fun = eng.newFunction(myPrintFunction);
+    fun.setData(eng.newQObject(&edit));
+    eng.globalObject().setProperty("print", fun);
+
+    eng.evaluate("print('hello', 'world')");
+
+    edit.show();
+    return app.exec();
+}
+//! [46]
+
+
+//! [47]
+QScriptEngine eng;
+QLineEdit *edit = new QLineEdit(...);
+QScriptValue handler = eng.evaluate("function(text) { print('text was changed to', text); }");
+qScriptConnect(edit, SIGNAL(textChanged(const QString &)), QScriptValue(), handler);
+//! [47]
+
+//! [48]
+QLineEdit *edit1 = new QLineEdit(...);
+QLineEdit *edit2 = new QLineEdit(...);
+
+QScriptValue handler = eng.evaluate("function() { print('I am', this.name); }");
+QScriptValue obj1 = eng.newObject();
+obj1.setProperty("name", "the walrus");
+QScriptValue obj2 = eng.newObject();
+obj2.setProperty("name", "Sam");
+
+qScriptConnect(edit1, SIGNAL(returnPressed()), obj1, handler);
+qScriptConnect(edit2, SIGNAL(returnPressed()), obj2, handler);
+//! [48]
+
+//! [49]
+var getProperty = function(name) { return this[name]; };
+
+name = "Global Object"; // creates a global variable
+print(getProperty("name")); // "Global Object"
+
+var myObject = { name: 'My Object' };
+print(getProperty.call(myObject, "name")); // "My Object"
+
+myObject.getProperty = getProperty;
+print(myObject.getProperty("name")); // "My Object"
+
+getProperty.name = "The getProperty() function";
+getProperty.getProperty = getProperty;
+getProperty.getProperty("name"); // "The getProperty() function"
+//! [49]
+
+//! [50]
+var o = { a: 1, b: 2, sum: function() { return a + b; } };
+print(o.sum()); // reference error, or sum of global variables a and b!!
+//! [50]
+
+//! [51]
+var o = { a: 1, b: 2, sum: function() { return this.a + this.b; } };
+print(o.sum()); // 3
+//! [51]
+
+//! [52]
+QScriptValue getProperty(QScriptContext *ctx, QScriptEngine *eng)
+{
+    QString name = ctx->argument(0).toString();
+    return ctx->thisObject().property(name);
+}
+//! [52]
+
+//! [53]
+QScriptValue myCompare(QScriptContext *ctx, QScriptEngine *eng)
+{
+    double first = ctx->argument(0).toNumber();
+    double second = ctx->argument(1).toNumber();
+    int result;
+    if (first == second)
+        result = 0;
+    else if (first < second)
+        result = -1;
+    else
+        result = 1;
+    return result;
+}
+//! [53]
+
+//! [54]
+QScriptEngine eng;
+QScriptValue comparefn = eng.newFunction(myCompare);
+QScriptValue array = eng.evaluate("new Array(10, 5, 20, 15, 30)");
+array.property("sort").call(array, QScriptValueList() << comparefn);
+
+// prints "5,10,15,20,30"
+qDebug() << array.toString();
+//! [54]
+
+//! [55]
+QScriptValue rectifier(QScriptContext *ctx, QScriptEngine *eng)
+{
+    QRectF magicRect = qscriptvalue_cast<QRectF>(ctx->callee().data());
+    QRectF sourceRect = qscriptvalue_cast<QRectF>(ctx->argument(0));
+    return eng->toScriptValue(sourceRect.intersected(magicRect));
+}
+
+...
+
+QScriptValue fun = eng.newFunction(rectifier);
+QRectF magicRect = QRectF(10, 20, 30, 40);
+fun.setData(eng.toScriptValue(magicRect));
+eng.globalObject().setProperty("rectifier", fun);
+//! [55]
+
+//! [56]
+function add(a, b) {
+    return a + b;
+}
+//! [56]
+
+//! [57]
+function add() {
+    return arguments[0] + arguments[1];
+}
+//! [57]
+
+//! [58]
+QScriptValue add(QScriptContext *ctx, QScriptEngine *eng)
+{
+    double a = ctx->argument(0).toNumber();
+    double b = ctx->argument(1).toNumber();
+    return a + b;
+}
+//! [58]
+
+//! [59]
+function add() {
+    if (arguments.length != 2)
+        throw Error("add() takes exactly two arguments");
+    return arguments[0] + arguments[1];
+}
+//! [59]
+
+//! [60]
+function add() {
+    if (arguments.length != 2)
+        throw Error("add() takes exactly two arguments");
+    if (typeof arguments[0] != "number")
+        throw TypeError("add(): first argument is not a number");
+    if (typeof arguments[1] != "number")
+        throw TypeError("add(): second argument is not a number");
+    return arguments[0] + arguments[1];
+}
+//! [60]
+
+//! [61]
+function add() {
+    if (arguments.length != 2)
+        throw Error("add() takes exactly two arguments");
+    return Number(arguments[0]) + Number(arguments[1]);
+}
+//! [61]
+
+//! [62]
+QScriptValue add(QScriptContext *ctx, QScriptEngine *eng)
+{
+    if (ctx->argumentCount() != 2)
+        return ctx->throwError("add() takes exactly two arguments");
+    double a = ctx->argument(0).toNumber();
+    double b = ctx->argument(1).toNumber();
+    return a + b;
+}
+//! [62]
+
+//! [63]
+QScriptValue add(QScriptContext *ctx, QScriptEngine *eng)
+{
+    if (ctx->argumentCount() != 2)
+        return ctx->throwError("add() takes exactly two arguments");
+    if (!ctx->argument(0).isNumber())
+        return ctx->throwError(QScriptContext::TypeError, "add(): first argument is not a number");
+    if (!ctx->argument(1).isNumber())
+        return ctx->throwError(QScriptContext::TypeError, "add(): second argument is not a number");
+    double a = ctx->argument(0).toNumber();
+    double b = ctx->argument(1).toNumber();
+    return a + b;
+}
+//! [63]
+
+//! [64]
+function concat() {
+    var result = "";
+    for (var i = 0; i < arguments.length; ++i)
+        result += String(arguments[i]);
+    return result;
+}
+//! [64]
+
+//! [65]
+QScriptValue concat(QScriptContext *ctx, QScriptEngine *eng)
+{
+    QString result = "";
+    for (int i = 0; i < ctx->argumentCount(); ++i)
+        result += ctx->argument(i).toString();
+    return result;
+}
+//! [65]
+
+//! [66]
+function sort(comparefn) {
+    if (comparefn == undefined)
+        comparefn = /* the built-in comparison function */;
+    else if (typeof comparefn != "function")
+        throw TypeError("sort(): argument must be a function");
+    ...
+}
+//! [66]
+
+//! [67]
+QScriptValue sort(QScriptContext *ctx, QScriptEngine *eng)
+{
+    QScriptValue comparefn = ctx->argument(0);
+    if (comparefn.isUndefined())
+        comparefn = /* the built-in comparison function */;
+    else if (!comparefn.isFunction())
+        return ctx->throwError(QScriptContext::TypeError, "sort(): argument is not a function");
+    ...
+}
+//! [67]
+
+//! [68]
+function foo() {
+    // Let bar() take care of this.
+    print("calling bar() with " + arguments.length + "arguments");
+    var result = return bar.apply(this, arguments);
+    print("bar() returned" + result);
+    return result;
+}
+//! [68]
+
+//! [69]
+QScriptValue foo(QScriptContext *ctx, QScriptEngine *eng)
+{
+    QScriptValue bar = eng->globalObject().property("bar");
+    QScriptValue arguments = ctx->argumentsObject();
+    qDebug() << "calling bar() with" << arguments.property("length").toInt32() << "arguments";
+    QScriptValue result = bar.apply(ctx->thisObject(), arguments);
+    qDebug() << "bar() returned" << result.toString();
+    return result;
+}
+//! [69]
+
+//! [70]
+function counter() {
+    var count = 0;
+    return function() {
+        return count++;
+    }
+}
+//! [70]
+
+//! [71]
+var c1 = counter(); // create a new counter function
+var c2 = counter(); // create a new counter function
+print(c1()); // 0
+print(c1()); // 1
+print(c2()); // 0
+print(c2()); // 1
+//! [71]
+
+//! [72]
+QScriptValue counter(QScriptContext *ctx, QScriptEngine *eng)
+{
+    QScriptValue act = ctx->activationObject();
+    act.setProperty("count", 0);
+    QScriptValue result = eng->newFunction(counter_inner);
+    result.setScope(act);
+    return result;
+}
+//! [72]
+
+//! [73]
+QScriptValue counter_inner(QScriptContext *ctx, QScriptEngine *eng)
+{
+    QScriptValue outerAct = ctx->callee().scope();
+    double count = outerAct.property("count").toNumber();
+    outerAct.setProperty("count", count+1);
+    return count;
+}
+//! [73]
+
+//! [74]
+QScriptValue counter_hybrid(QScriptContext *ctx, QScriptEngine *eng)
+{
+    QScriptValue act = ctx->activationObject();
+    act.setProperty("count", 0);
+    return eng->evaluate("function() { return count++; }");
+}
+//! [74]
+
+//! [75]
+function Book(isbn) {
+    this.isbn = isbn;
+}
+
+var coolBook1 = new Book("978-0131872493");
+var coolBook2 = new Book("978-1593271473");
+//! [75]
+
+//! [76]
+QScriptValue Person_ctor(QScriptContext *ctx, QScriptEngine *eng)
+{
+    QScriptValue object;
+    if (ctx->isCalledAsConstructor()) {
+        object = ctx->thisObject();
+    } else {
+        object = eng->newObject();
+        object.setPrototype(ctx->callee().property("prototype"));
+    }
+    object.setProperty("name", ctx->argument(0));
+    return object;
+}
+//! [76]
+
+//! [77]
+QScriptContext *ctx = eng.pushContext();
+QScriptValue act = ctx->activationObject();
+act.setProperty("digit", 7);
+
+qDebug() << eng.evaluate("digit + 1").toNumber(); // 8
+
+eng.popContext();
+//! [77]
+
+//! [78]
+QScriptValue getSet(QScriptContext *ctx, QScriptEngine *eng)
+{
+    QScriptValue obj = ctx->thisObject();
+    QScriptValue data = obj.data();
+    if (!data.isValid()) {
+        data = eng->newObject();
+        obj.setData(data);
+    }
+    QScriptValue result;
+    if (ctx->argumentCount() == 1) {
+        QString str = ctx->argument(0).toString();
+        str.replace("Roberta", "Ken");
+        result = str;
+        data.setProperty("x", result);
+    } else {
+        result = data.property("x");
+    }
+    return result;
+}
+//! [78]
+
+//! [79]
+QScriptEngine eng;
+QScriptValue obj = eng.newObject();
+obj.setProperty("x", eng.newFunction(getSet),
+                QScriptValue::PropertyGetter|QScriptValue::PropertySetter);
+//! [79]
+
+//! [80]
+obj.x = "Roberta sent me";
+print(obj.x); // "Ken sent me"
+obj.x = "I sent the bill to Roberta";
+print(obj.x); // "I sent the bill to Ken"
+//! [80]
+
+//! [81]
+obj = {};
+obj.__defineGetter__("x", function() { return this._x; });
+obj.__defineSetter__("x", function(v) { print("setting x to", v); this._x = v; });
+obj.x = 123;
+//! [81]
+
+//! [82]
+myButton.text = qsTr("Hello world!");
+//! [82]
+
+//! [83]
+myButton.text = qsTranslate("MyAwesomeScript", "Hello world!");
+//! [83]
+
+//! [84]
+FriendlyConversation.prototype.greeting = function(type)
+{
+    if (FriendlyConversation['greeting_strings'] == undefined) {
+        FriendlyConversation['greeting_strings'] = [
+            QT_TR_NOOP("Hello"),
+            QT_TR_NOOP("Goodbye")
+        ];
+    }
+    return qsTr(FriendlyConversation.greeting_strings[type]);
+}
+//! [84]
+
+//! [85]
+FriendlyConversation.prototype.greeting = function(type)
+{
+    if (FriendlyConversation['greeting_strings'] == undefined) {
+        FriendlyConversation['greeting_strings'] = [
+            QT_TRANSLATE_NOOP("FriendlyConversation", "Hello"),
+            QT_TRANSLATE_NOOP("FriendlyConversation", "Goodbye")
+        ];
+    }
+    return qsTranslate("FriendlyConversation", FriendlyConversation.greeting_strings[type]);
+}
+//! [85]
+
+//! [86]
+FileCopier.prototype.showProgress = function(done, total, currentFileName)
+{
+    this.label.text = qsTr("%1 of %2 files copied.\nCopying: %3")
+                      .arg(done)
+                      .arg(total)
+                      .arg(currentFileName));
+}
+//! [86]
+
+//! [87]
+lupdate myscript.qs -ts myscript_la.ts
+//! [87]
+
+//! [88]
+lupdate -extensions qs scripts/ -ts scripts_la.ts
+//! [88]
+
+//! [89]
+lrelease myscript_la.ts
+//! [89]
+
+//! [90]
+({ unitName: "Celsius",
+   toKelvin: function(x) { return x + 273; }
+ })
+//! [90]
+
+//! [91]
+QScriptValue object = engine.evaluate("({ unitName: 'Celsius', toKelvin: function(x) { return x + 273; } })");
+QScriptValue toKelvin = object.property("toKelvin");
+QScriptValue result = toKelvin.call(object, QScriptValueList() << 100);
+qDebug() << result.toNumber(); // 373
+//! [91]
+
+//! [92]
+QScriptValue add = engine.globalObject().property("add");
+qDebug() << add.call(QScriptValue(), QScriptValueList() << 1 << 2).toNumber(); // 3
+//! [92]
+
+//! [93]
+typedef QSharedPointer<QXmlStreamReader> XmlStreamReaderPointer;
+
+Q_DECLARE_METATYPE(XmlStreamReaderPointer)
+
+QScriptValue constructXmlStreamReader(QScriptContext *context, QScriptEngine *engine)
+{
+    if (!context->isCalledAsConstructor())
+        return context->throwError(QScriptContext::SyntaxError, "please use the 'new' operator");
+
+    QIODevice *device = qobject_cast<QIODevice*>(context->argument(0).toQObject());
+    if (!device)
+        return context->throwError(QScriptContext::TypeError, "please supply a QIODevice as first argument");
+
+    // Create the C++ object
+    QXmlStreamReader *reader = new QXmlStreamReader(device);
+
+    XmlStreamReaderPointer pointer(reader);
+
+    // store the shared pointer in the script object that we are constructing
+    return engine->newVariant(context->thisObject(), qVariantFromValue(pointer));
+}
+//! [93]
+
+//! [94]
+QScriptValue xmlStreamReader_atEnd(QScriptContext *context, QScriptEngine *)
+{
+    XmlStreamReaderPointer reader = qscriptvalue_cast<XmlStreamReaderPointer>(context->thisObject());
+    if (!reader)
+        return context->throwError(QScriptContext::TypeError, "this object is not an XmlStreamReader");
+    return reader->atEnd();
+}
+//! [94]
+
+//! [95]
+    QScriptEngine engine;
+    QScriptValue xmlStreamReaderProto = engine.newObject();
+    xmlStreamReaderProto.setProperty("atEnd", engine.newFunction(xmlStreamReader_atEnd));
+
+    QScriptValue xmlStreamReaderCtor = engine.newFunction(constructXmlStreamReader, xmlStreamReaderProto);
+    engine.globalObject().setProperty("XmlStreamReader", xmlStreamReaderCtor);
+//! [95]
diff --git a/doc/src/snippets/code/doc_src_qtscriptextensions.qdoc b/doc/src/snippets/code/doc_src_qtscriptextensions.qdoc
new file mode 100644
index 0000000000..24fb254812
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qtscriptextensions.qdoc
@@ -0,0 +1,7 @@
+//! [0]
+print("importing " + __extension__);
+__setupPackage__("cool.stuff");
+
+cool.stuff.add = function(a, b) { return a + b; }
+cool.stuff.subtract = function(a, b) { return a - b; }
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_qtsql.qdoc b/doc/src/snippets/code/doc_src_qtsql.qdoc
new file mode 100644
index 0000000000..1a687dbf72
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qtsql.qdoc
@@ -0,0 +1,8 @@
+//! [0]
+#include <QtSql>
+//! [0]
+
+
+//! [1]
+QT += sql
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_qtsvg.qdoc b/doc/src/snippets/code/doc_src_qtsvg.qdoc
new file mode 100644
index 0000000000..c99ea41370
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qtsvg.qdoc
@@ -0,0 +1,8 @@
+//! [0]
+#include <QtSvg>
+//! [0]
+
+
+//! [1]
+QT += svg
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_qttest.qdoc b/doc/src/snippets/code/doc_src_qttest.qdoc
new file mode 100644
index 0000000000..c2aa27bf6a
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qttest.qdoc
@@ -0,0 +1,8 @@
+//! [0]
+#include <QtTest>
+//! [0]
+
+
+//! [1]
+CONFIG += qtestlib
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_qtuiloader.qdoc b/doc/src/snippets/code/doc_src_qtuiloader.qdoc
new file mode 100644
index 0000000000..64f3eac32e
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qtuiloader.qdoc
@@ -0,0 +1,8 @@
+//! [0]
+CONFIG += uitools
+//! [0]
+
+
+//! [1]
+#include <QtUiTools>
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_qtwebkit.qdoc b/doc/src/snippets/code/doc_src_qtwebkit.qdoc
new file mode 100644
index 0000000000..d4fc2bd85c
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qtwebkit.qdoc
@@ -0,0 +1,8 @@
+//! [0]
+QT += webkit
+//! [0]
+
+
+//! [1]
+#include <QtWebKit>
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_qtxml.qdoc b/doc/src/snippets/code/doc_src_qtxml.qdoc
new file mode 100644
index 0000000000..f5dc5a5338
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qtxml.qdoc
@@ -0,0 +1,77 @@
+//! [0]
+#include <QtXml>
+//! [0]
+
+
+//! [1]
+QT += xml
+//! [1]
+
+
+//! [2]
+QT += xml
+//! [2]
+
+
+//! [3]
+<quote>A quotation.</quote>
+//! [3]
+
+
+//! [4]
+<document xmlns:book = 'http://qtsoftware.com/fnord/book/'
+          xmlns      = 'http://qtsoftware.com/fnord/' >
+//! [4]
+
+
+//! [5]
+<author xmlns:fnord = 'http://qtsoftware.com/fnord/'
+             title="Ms" 
+             fnord:title="Goddess" 
+             name="Eris Kallisti"/>
+//! [5]
+
+
+//! [6]
+<document>
+<book>
+  <title>Practical XML</title>
+  <author title="Ms" name="Eris Kallisti"/>
+  <chapter>
+    <title>A Namespace Called fnord</title>
+  </chapter>
+</book>
+</document>
+//! [6]
+
+
+//! [7]
+<book:title>Practical XML</book:title>
+//! [7]
+
+
+//! [8]
+xmlns="http://qtsoftware.com/fnord/"
+//! [8]
+
+
+//! [9]
+xmlns:book="http://qtsoftware.com/fnord/book/"
+//! [9]
+
+
+//! [10]
+<document xmlns:book = 'http://qtsoftware.com/fnord/book/'
+          xmlns      = 'http://qtsoftware.com/fnord/' >
+<book>
+  <book:title>Practical XML</book:title>
+  <book:author xmlns:fnord = 'http://qtsoftware.com/fnord/'
+               title="Ms"
+               fnord:title="Goddess"
+               name="Eris Kallisti"/>
+  <chapter>
+    <title>A Namespace Called fnord</title>
+  </chapter>
+</book>
+</document>
+//! [10]
diff --git a/doc/src/snippets/code/doc_src_qtxmlpatterns.qdoc b/doc/src/snippets/code/doc_src_qtxmlpatterns.qdoc
new file mode 100644
index 0000000000..638bf93bfc
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qtxmlpatterns.qdoc
@@ -0,0 +1,349 @@
+
+void wrapInFunction()
+{
+
+//! [0]
+#include <QtXmlPatterns>
+//! [0]
+
+
+//! [1]
+QT += xmlpatterns
+//! [1]
+
+//! [2]
+xmlpatterns myQuery.xq
+//! [2]
+
+//! [3]
+declare namespace c = "http://cookbook/namespace";
+doc('cookbook.xml')//c:recipe/c:title
+//! [3]
+
+//! [4]
+declare default element namespace "http://cookbook/namespace";
+doc('cookbook.xml')//recipe/title
+//! [4]
+
+//! [5]
+<title xmlns="http://cookbook/namespace">Quick and Easy Mushroom Soup</title>
+<title xmlns="http://cookbook/namespace">Cheese on Toast</title>
+<title xmlns="http://cookbook/namespace">Hard-Boiled Eggs</title>
+//! [5]
+
+//! [6]
+xmlpatterns file.xq
+//! [6]
+
+//! [7]
+doc('cookbook.xml')//@xml:*
+//! [7]
+
+//! [8]
+doc('cookbook.xml')//@*:name
+//! [8]
+
+//! [9]
+declare default element namespace "http://cookbook/namespace";
+doc('cookbook.xml')/cookbook/@*
+//! [9]
+
+//! [10]
+declare default element namespace "http://cookbook/namespace";
+doc("cookbook.xml")/cookbook/recipe[title = "Hard-Boiled Eggs"]
+//! [10]
+
+//! [11]
+declare default element namespace "http://cookbook/namespace";
+doc('cookbook.xml')//method[string-length(.) = 0]
+//! [11]
+
+//! [12]
+declare default element namespace "http://cookbook/namespace";
+doc('cookbook.xml')//method[string-length() = 0]
+//! [12]
+
+//! [13]
+declare default element namespace "http://cookbook/namespace";
+doc('cookbook.xml')/cookbook/recipe[2]
+//! [13]
+
+//! [14]
+declare default element namespace "http://cookbook/namespace";
+doc('cookbook.xml')/cookbook/recipe[position() = 2]
+//! [14]
+
+//! [15]
+declare default element namespace "http://cookbook/namespace";
+doc('cookbook.xml')/cookbook/recipe[position() > 1]
+//! [15]
+
+//! [16]
+declare default element namespace "http://cookbook/namespace";
+doc('cookbook.xml')/cookbook/recipe[last()]
+//! [16]
+
+//! [17]
+declare default element namespace "http://cookbook/namespace";
+doc('cookbook.xml')/cookbook/recipe[last() - 1]
+//! [17]
+
+//! [18]
+doc('cookbook.xml')//recipe
+//! [18]
+
+//! [19]
+doc('cookbook.xml')//recipe/title
+//! [19]
+
+//! [20]
+<recipe/>
+//! [20]
+
+//! [21]
+ <html xmlns="http://www.w3.org/1999/xhtml/"
+       xml:id="{doc("other.html")/html/@xml:id}"/>
+//! [21]
+
+//! [22]
+doc('cookbook.xml')/descendant-or-self::element(recipe)/child::element(title)
+//! [22]
+
+//! [23]
+<cookbook>
+//! [23]
+
+//! [24]
+<cookbook xmlns="http://cookbook/namespace">
+//! [24]
+
+//! [25]
+for $i in doc("cookbook.xml")//@xml:*
+return <p>{$i}</p>
+//! [25]
+
+//! [26]
+for $i in doc("cookbook.xml")//@*:name
+return <p>{$i}</p>
+//! [26]
+
+//! [27]
+declare default element namespace "http://cookbook/namespace";
+for $i in doc("cookbook.xml")/cookbook/@*
+return <p>{$i}</p>
+//! [27]
+
+//! [28]
+<p xml:id="MushroomSoup"/>
+<p xml:id="CheeseOnToast"/>
+<p xml:id="HardBoiledEggs"/>
+//! [28]
+
+//! [29]
+<p name="Fresh mushrooms"/>
+<p name="Garlic"/>
+<p name="Olive oil"/>
+<p name="Milk"/>
+<p name="Water"/>
+<p name="Cream"/>
+<p name="Vegetable soup cube"/>
+<p name="Ground black pepper"/>
+<p name="Dried parsley"/>
+<p name="Bread"/>
+<p name="Cheese"/>
+<p name="Eggs"/>
+//! [29]
+
+//! [30]
+<p xmlns="http://cookbook/namespace" count="3"/>
+//! [30]
+
+//! [31]
+<method xmlns="http://cookbook/namespace"/>
+//! [31]
+
+//! [32]
+declare default element namespace "http://cookbook/namespace";
+doc('cookbook.xml')//recipe[string-length(method) = 0]
+//! [32]
+
+//! [33]
+<recipe xmlns="http://cookbook/namespace" xml:id="HardBoiledEggs">
+    <title>Hard-Boiled Eggs</title>
+    <ingredient name="Eggs" quantity="3" unit="eggs"/>
+    <time quantity="3" unit="minutes"/>
+    <method/>
+</recipe>
+//! [33]
+
+//! [34]
+declare default element namespace "http://cookbook/namespace";
+doc('cookbook.xml')/cookbook/recipe[method[empty(step)]]
+//! [34]
+
+//! [35]
+declare default element namespace "http://cookbook/namespace";
+doc('cookbook.xml')/cookbook/recipe[not(normalize-space(method))]
+//! [35]
+
+//! [36]
+<e>{sum((1, 2, 3))}</e>
+//! [36]
+
+//! [37]
+<e>6</e>
+//! [37]
+
+//![38]
+declare variable $insertion := "example";
+<p class="important {$insertion} obsolete"/>
+//![38]
+
+//! [39]
+<p class="important example obsolete"/>
+//! [39]
+
+//! [40]
+declare default element namespace "http://cookbook/namespace";
+let $docURI := 'cookbook.xml'
+return if(doc-available($docURI))
+       then doc($docURI)//recipe/<resept>{./node()}</resept>
+       else <resept>Failed to load {$docURI}</resept>
+//! [40]
+
+//! [41]
+<span>1</span>
+<span>3</span>
+<span>5</span>
+<span>7</span>
+<span>9</span>
+<span>b</span>
+<span>d</span>
+<span>f</span>
+//! [41]
+
+//! [42]
+<span>1</span>
+//! [42]
+
+//! [43]
+let $doc := doc('doc.txt')
+return $doc/doc/p[1]/span[1]
+//! [43]
+
+//! [44]
+for $a in doc('doc.txt')/doc/p/span[1]
+return $a
+//! [44]
+
+//! [45]
+doc('doc.txt')/doc/p/span[1]
+//! [45]
+
+//! [46]
+doc('doc.txt')//p/<p>{span/node()}</p>
+//! [46]
+
+//! [47]
+<p>78</p>
+<p>9a</p>
+<p>12</p>
+<p>bc</p>
+<p>de</p>
+<p>34</p>
+<p>56</p>
+<p>f0</p>
+//! [47]
+
+//! [48]
+for $a in doc('doc.txt')//p
+ return <p>{$a/span/node()}</p>
+//! [48]
+
+//! [49]
+<p>12</p>
+<p>34</p>
+<p>56</p>
+<p>78</p>
+<p>9a</p>
+<p>bc</p>
+<p>de</p>
+<p>f0</p>
+//! [49]
+
+//! [100]
+<?xml version="1.0" encoding="UTF-8"?>
+<cookbook>
+    <recipe xml:id="MushroomSoup">
+        <title>Quick and Easy Mushroom Soup</title>
+        <ingredient name="Fresh mushrooms"
+                    quantity="7"
+                    unit="pieces"/>
+        <ingredient name="Garlic"
+                    quantity="1"
+                    unit="cloves"/>
+        <ingredient name="Olive oil"
+                    quantity="2"
+                    unit="tablespoons"/>
+        <ingredient name="Milk"
+                    quantity="200"
+                    unit="milliliters"/>
+        <ingredient name="Water"
+                    quantity="200"
+                    unit="milliliters"/>
+        <ingredient name="Cream"
+                    quantity="100"
+                    unit="milliliters"/>
+        <ingredient name="Vegetable soup cube"
+                    quantity="1/2"
+                    unit="cubes"/>
+        <ingredient name="Ground black pepper"
+                    quantity="1/2"
+                    unit="teaspoons"/>
+        <ingredient name="Dried parsley"
+                    quantity="1"
+                    unit="teaspoons"/>
+        <time quantity="20"
+              unit="minutes"/>
+        <method>
+            <step>1. Slice mushrooms and garlic.</step>
+            <step>2. Fry mushroom slices and garlic with olive oil.</step>
+            <step>3. Once mushrooms are cooked, add milk, cream water. Stir.</step>
+            <step>4. Add vegetable soup cube.</step>
+            <step>5. Reduce heat, add pepper and parsley.</step>
+            <step>6. Turn off the stove before the mixture boils.</step>
+            <step>7. Blend the mixture.</step>
+        </method>
+    </recipe>
+    <recipe xml:id="CheeseOnToast">
+        <title>Cheese on Toast</title>
+        <ingredient name="Bread"
+                    quantity="2"
+                    unit="slices"/>
+        <ingredient name="Cheese"
+                    quantity="2"
+                    unit="slices"/>
+        <time quantity="3"
+              unit="minutes"/>
+        <method>
+            <step>1. Slice the bread and cheese.</step>
+            <step>2. Grill one side of each slice of bread.</step>
+            <step>3. Turn over the bread and place a slice of cheese on each piece.</step>
+            <step>4. Grill until the cheese has started to melt.</step>
+            <step>5. Serve and enjoy!</step>
+        </method>
+    </recipe>
+    <recipe xml:id="HardBoiledEggs">
+        <title>Hard-Boiled Eggs</title>
+        <ingredient name="Eggs"
+                    quantity="3"
+                    unit="eggs"/>
+        <time quantity="3"
+              unit="minutes"/>
+        <method/>
+    </recipe>
+</cookbook>
+//! [100]
+
+}
+
diff --git a/doc/src/snippets/code/doc_src_qvarlengtharray.qdoc b/doc/src/snippets/code/doc_src_qvarlengtharray.qdoc
new file mode 100644
index 0000000000..95db9d349c
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qvarlengtharray.qdoc
@@ -0,0 +1,38 @@
+//! [0]
+int myfunc(int n)
+{
+    int table[n + 1];  // WRONG
+    ...
+    return table[n];
+}
+//! [0]
+
+
+//! [1]
+int myfunc(int n)
+{
+    int *table = new int[n + 1];
+    ...
+    int ret = table[n];
+    delete[] table;
+    return ret;
+}
+//! [1]
+
+
+//! [2]
+int myfunc(int n)
+{
+    QVarLengthArray<int, 1024> array(n + 1);
+    ...
+    return array[n];
+}
+//! [2]
+
+
+//! [3]
+QVarLengthArray<int> array(10);
+int *data = array.data();
+for (int i = 0; i < 10; ++i)
+    data[i] = 2 * i;
+//! [3]
diff --git a/doc/src/snippets/code/doc_src_rcc.qdoc b/doc/src/snippets/code/doc_src_rcc.qdoc
new file mode 100644
index 0000000000..423f8e6225
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_rcc.qdoc
@@ -0,0 +1,3 @@
+//! [0]
+rcc [options] <inputs>
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_resources.qdoc b/doc/src/snippets/code/doc_src_resources.qdoc
new file mode 100644
index 0000000000..bc85341b1e
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_resources.qdoc
@@ -0,0 +1,41 @@
+//! [0]
+<file alias="cut-img.png">images/cut.png</file>
+//! [0]
+
+
+//! [1]
+<qresource prefix="/myresources">
+    <file alias="cut-img.png">images/cut.png</file>
+</qresource>
+//! [1]
+
+
+//! [2]
+<qresource>
+    <file>cut.jpg</file>
+</qresource>
+<qresource lang="fr">
+    <file alias="cut.jpg">cut_fr.jpg</file>
+</qresource>
+//! [2]
+
+
+//! [3]
+rcc -binary myresource.qrc -o myresource.rcc
+//! [3]
+
+
+//! [4]
+QResource::registerResource("/path/to/myresource.rcc");
+//! [4]
+
+
+//! [5]
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Q_INIT_RESOURCE(graphlib);
+    ...
+    return app.exec();
+}
+//! [5]
diff --git a/doc/src/snippets/code/doc_src_richtext.qdoc b/doc/src/snippets/code/doc_src_richtext.qdoc
new file mode 100644
index 0000000000..d6f54c29c3
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_richtext.qdoc
@@ -0,0 +1,50 @@
+//! [0]
+QTextDocument *newDocument = new QTextDocument;
+//! [0]
+
+
+//! [1]
+QTextEdit *editor = new QTextEdit;
+QTextDocument *editorDocument = editor->document();
+//! [1]
+
+
+//! [2]
+QTextEdit *editor = new QTextEdit(parent);
+editor->setHtml(aStringContainingHTMLtext);
+editor->show();
+//! [2]
+
+
+//! [3]
+QTextDocument *document = editor->document();
+//! [3]
+
+
+//! [4]
+QTextCursor cursor = editor->textCursor();
+//! [4]
+
+
+//! [5]
+editor->setTextCursor(cursor);
+//! [5]
+
+
+//! [6]
+textEdit.show();
+
+textCursor.beginEditBlock();
+
+for (int i = 0; i < 1000; ++i) {
+    textCursor.insertBlock();
+    textCursor.insertText(paragraphText.at(i));
+}
+
+textCursor.endEditBlock(); 
+//! [6]
+
+
+//! [7]
+<meta http-equiv="Content-Type" content="text/html; charset=EUC-JP" />
+//! [7]
diff --git a/doc/src/snippets/code/doc_src_session.qdoc b/doc/src/snippets/code/doc_src_session.qdoc
new file mode 100644
index 0000000000..6a32863139
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_session.qdoc
@@ -0,0 +1,3 @@
+//! [0]
+xterm
+//! [0]
diff --git a/doc/src/snippets/code/doc_src_sql-driver.qdoc b/doc/src/snippets/code/doc_src_sql-driver.qdoc
new file mode 100644
index 0000000000..74cd8dc456
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_sql-driver.qdoc
@@ -0,0 +1,239 @@
+//! [0]
+-no-sql-<driver> ... Disable SQL <driver> entirely.
+-qt-sql-<driver> ... Enable a SQL <driver> in the Qt Library, by default
+                     none are turned on.
+-plugin-sql-<driver> Enable SQL <driver> as a plugin to be linked to
+                     at run time.
+
+                     Possible values for <driver>:
+                     [ db2 ibase mysql oci odbc psql sqlite sqlite2 tds ]
+//! [0]
+
+
+//! [1]
+create procedure qtestproc (OUT param1 INT, OUT param2 INT)
+BEGIN
+    set param1 = 42;
+    set param2 = 43;
+END
+//! [1]
+
+
+//! [2]
+QSqlQuery q;
+q.exec("call qtestproc (@outval1, @outval2)");
+q.exec("select @outval1, @outval2");
+q.next();
+qDebug() << q.value(0) << q.value(1); // outputs "42" and "43"
+//! [2]
+
+
+//! [3]
+cd $QTDIR/src/plugins/sqldrivers/mysql
+qmake "INCLUDEPATH+=/usr/local/include" "LIBS+=-L/usr/local/lib -lmysqlclient_r" mysql.pro
+make
+//! [3]
+
+
+//! [4]
+cd $QTDIR/src/plugins/sqldrivers/mysql
+make install
+//! [4]
+
+
+//! [5]
+cd %QTDIR%\src\plugins\sqldrivers\mysql
+qmake "INCLUDEPATH+=C:\MySQL\include" "LIBS+=C:\MYSQL\MySQL Server <version>\lib\opt\libmysql.lib" mysql.pro
+nmake
+//! [5]
+
+
+//! [6]
+cd $QTDIR/src/plugins/sqldrivers/oci
+qmake "INCLUDEPATH+=$ORACLE_HOME/rdbms/public $ORACLE_HOME/rdbms/demo" "LIBS+=-L$ORACLE_HOME/lib -lclntsh -lwtc9" oci.pro
+make
+//! [6]
+
+
+//! [7]
+cd $QTDIR/src/plugins/sqldrivers/oci
+qmake "INCLUDEPATH+=/usr/include/oracle/10.1.0.3/client/" "LIBS+=-L/usr/lib/oracle/10.1.0.3/client/lib" oci.pro
+make
+//! [7]
+
+
+//! [8]
+set INCLUDE=%INCLUDE%;c:\oracle\oci\include
+set LIB=%LIB%;c:\oracle\oci\lib\msvc
+cd %QTDIR%\src\plugins\sqldrivers\oci
+qmake oci.pro
+nmake
+//! [8]
+
+
+//! [9]
+set PATH=%PATH%;c:\oracle\bin
+//! [9]
+
+
+//! [10]
+\\ STORED_PROC uses the return statement or returns multiple result sets
+QSqlQuery query;
+query.setForwardOnly(true);
+query.exec("{call STORED_PROC}");
+//! [10]
+
+
+//! [11]
+cd $QTDIR/src/plugins/sqldrivers/odbc
+qmake "INCLUDEPATH+=/usr/local/unixODBC/include" "LIBS+=-L/usr/local/unixODBC/lib -lodbc"
+make
+//! [11]
+
+
+//! [12]
+cd %QTDIR%\src\plugins\sqldrivers\odbc
+qmake odbc.pro
+nmake
+//! [12]
+
+
+//! [13]
+cd $QTDIR/src/plugins/sqldrivers/psql
+qmake "INCLUDEPATH+=/usr/include/pgsql" "LIBS+=-L/usr/lib -lpq" psql.pro
+make
+//! [13]
+
+
+//! [14]
+cd $QTDIR/src/plugins/sqldrivers/psql
+make install
+//! [14]
+
+
+//! [15]
+cd %QTDIR%\src\plugins\sqldrivers\psql
+qmake "INCLUDEPATH+=C:\psql\include" "LIBS+=C:\psql\lib\ms\libpq.lib" psql.pro
+nmake
+//! [15]
+
+
+//! [16]
+cd $QTDIR/src/plugins/sqldrivers/tds
+qmake "INCLUDEPATH=$SYBASE/include" "LIBS=-L$SYBASE/lib -lsybdb"
+make
+//! [16]
+
+
+//! [17]
+cd %QTDIR%\src\plugins\sqldrivers\tds
+qmake "LIBS+=NTWDBLIB.LIB" tds.pro
+nmake
+//! [17]
+
+
+//! [18]
+cd $QTDIR/src/plugins/sqldrivers/db2
+qmake "INCLUDEPATH+=$DB2DIR/include" "LIBS+=-L$DB2DIR/lib -ldb2"
+make
+//! [18]
+
+
+//! [19]
+cd $QTDIR/src/plugins/sqldrivers/db2
+make install
+//! [19]
+
+
+//! [20]
+cd %QTDIR%\src\plugins\sqldrivers\db2
+qmake "INCLUDEPATH+=<DB2 home>/sqllib/include" "LIBS+=<DB2 home>/sqllib/lib/db2cli.lib"
+nmake
+//! [20]
+
+
+//! [21]
+cd $QTDIR/src/plugins/sqldrivers/sqlite
+qmake "INCLUDEPATH+=$SQLITE/include" "LIBS+=-L$SQLITE/lib -lsqlite"
+make
+//! [21]
+
+
+//! [22]
+cd $QTDIR/src/plugins/sqldrivers/sqlite
+make install
+//! [22]
+
+
+//! [23]
+cd %QTDIR%\src\plugins\sqldrivers\sqlite
+qmake "INCLUDEPATH+=C:\SQLITE\INCLUDE" "LIBS+=C:\SQLITE\LIB\SQLITE3.LIB" sqlite.pro
+nmake
+//! [23]
+
+
+//! [24]
+db.setHostName("MyServer");
+db.setDatabaseName("C:\\test.gdb");
+//! [24]
+
+
+//! [25]
+// connect to database using the Latin-1 character set 
+db.setConnectOptions("ISC_DPB_LC_CTYPE=Latin1");
+db.open();
+//! [25]
+
+
+//! [26]
+QSqlQuery q;
+q.exec("execute procedure my_procedure");
+q.next();
+qDebug() << q.value(0); // outputs the first RETURN/OUT value
+//! [26]
+
+
+//! [27]
+cd $QTDIR/src/plugins/sqldrivers/ibase
+qmake "INCLUDEPATH+=/opt/interbase/include" "LIBS+=-L/opt/interbase/lib" ibase.pro
+make
+//! [27]
+
+
+//! [28]
+cd $QTDIR/src/plugins/sqldrivers/ibase
+qmake "INCLUDEPATH+=/opt/interbase/include" "LIBS+=-L/opt/interbase/lib -lfbclient" ibase.pro
+make
+//! [28]
+
+
+//! [29]
+cd %QTDIR%\src\plugins\sqldrivers\ibase
+qmake "INCLUDEPATH+=C:\interbase\include" ibase.pro
+nmake
+//! [29]
+
+
+//! [30]
+cd %QTDIR%\src\plugins\sqldrivers\ibase
+qmake "INCLUDEPATH+=C:\interbase\include" "LIBS+=-lfbclient" ibase.pro
+nmake
+//! [30]
+
+
+//! [31]
+QSqlDatabase: QMYSQL driver not loaded
+QSqlDatabase: available drivers: QMYSQL
+//! [31]
+
+//! [32]
+configure -I /usr/include/oracle/10.1.0.3/client -L /usr/lib/oracle/10.1.0.3/client/lib -R /usr/lib/oracle/10.1.0.3/client/lib -lclntsh -lnnz10
+make
+//! [32]
+
+//! [33]
+cd $QTDIR/src/plugins/sqldrivers/oci
+qmake "INCLUDEPATH+=/usr/include/oracle/10.1.0.3/client" "LIBS+=-L/usr/lib/oracle/10.1.0.3/client/lib -Wl,-rpath,/usr/lib/oracle/10.1.0.3/client/lib -lclntsh -lnnz10" oci.pro
+make
+//! [33]
+
diff --git a/doc/src/snippets/code/doc_src_styles.qdoc b/doc/src/snippets/code/doc_src_styles.qdoc
new file mode 100644
index 0000000000..e11dc05237
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_styles.qdoc
@@ -0,0 +1,94 @@
+//! [0]
+    opt.init(q);
+        if (down)
+        opt.state |= QStyle::State_Sunken;
+    if (tristate && noChange)
+        opt.state |= QStyle::State_NoChange;
+    else
+        opt.state |= checked ? QStyle::State_On :
+        QStyle::State_Off;
+    if (q->testAttribute(Qt::WA_Hover) &&  q->underMouse()) {
+        if (hovering)
+        opt.state |= QStyle::State_MouseOver;
+        else
+        opt.state &= ~QStyle::State_MouseOver;
+    }
+    opt.text = text;
+    opt.icon = icon;
+    opt.iconSize = q->iconSize();
+//! [0]
+
+
+//! [1]
+    state = QStyle::State_None;
+    if (widget->isEnabled())
+        state |= QStyle::State_Enabled;
+    if (widget->hasFocus())
+        state |= QStyle::State_HasFocus;
+    if (widget->window()->testAttribute(Qt::WA_KeyboardFocusChange))
+        state |= QStyle::State_KeyboardFocusChange;
+    if (widget->underMouse())
+        state |= QStyle::State_MouseOver;
+    if (widget->window()->isActiveWindow())
+        state |= QStyle::State_Active;
+#ifdef Q_WS_MAC
+    extern bool qt_mac_can_clickThrough(const QWidget *w); //qwidget_mac.cpp
+    if (!(state & QStyle::State_Active) && !qt_mac_can_clickThrough(widget))
+        state &= ~QStyle::State_Enabled;
+#endif
+#ifdef QT_KEYPAD_NAVIGATION
+    if (widget->hasEditFocus())
+        state |= QStyle::State_HasEditFocus;
+#endif
+
+    direction = widget->layoutDirection();
+    rect = widget->rect();
+    palette = widget->palette();
+    fontMetrics = widget->fontMetrics();
+//! [1]
+
+
+//! [2]
+    QStylePainter p(this);
+    QStyleOptionButton opt = d->getStyleOption();
+    p.drawControl(QStyle::CE_CheckBox, opt);
+//! [2]
+
+
+//! [3]
+    QStyleOptionButton subopt = *btn;
+    subopt.rect = subElementRect(SE_CheckBoxIndicator, btn, widget);
+    drawPrimitive(PE_IndicatorCheckBox, &subopt, p, widget);
+    subopt.rect = subElementRect(SE_CheckBoxContents, btn, widget);
+    drawControl(CE_CheckBoxLabel, &subopt, p, widget);
+
+    if (btn->state & State_HasFocus) {
+        QStyleOptionFocusRect fropt;
+        fropt.QStyleOption::operator=(*btn);
+        fropt.rect = subElementRect(SE_CheckBoxFocusRect, btn, widget);
+        drawPrimitive(PE_FrameFocusRect, &fropt, p, widget);
+    }
+//! [3]
+
+
+//! [4]
+    const QStyleOptionButton *btn = qstyleoption_cast<const QStyleOptionButton *>(opt);
+    uint alignment = visualAlignment(btn->direction, Qt::AlignLeft | Qt::AlignVCenter);
+
+    if (!styleHint(SH_UnderlineShortcut, btn, widget))
+        alignment |= Qt::TextHideMnemonic;
+    QPixmap pix;
+    QRect textRect = btn->rect;
+    if (!btn->icon.isNull()) {
+        pix = btn->icon.pixmap(btn->iconSize, btn->state & State_Enabled ? QIcon::Normal : QIcon::Disabled);
+        drawItemPixmap(p, btn->rect, alignment, pix);
+        if (btn->direction == Qt::RightToLeft)
+            textRect.setRight(textRect.right() - btn->iconSize.width() - 4);
+        else
+            textRect.setLeft(textRect.left() + btn->iconSize.width() + 4);
+    }
+    if (!btn->text.isEmpty()){
+        drawItemText(p, textRect, alignment | Qt::TextShowMnemonic,
+            btn->palette, btn->state & State_Enabled, btn->text, QPalette::WindowText);
+    }
+//! [4]
diff --git a/doc/src/snippets/code/doc_src_stylesheet.qdoc b/doc/src/snippets/code/doc_src_stylesheet.qdoc
new file mode 100644
index 0000000000..60622d322d
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_stylesheet.qdoc
@@ -0,0 +1,1911 @@
+//! [0]
+QLineEdit { background: yellow }
+QCheckBox { color: red }
+//! [0]
+
+
+//! [1]
+QPushButton { color: red }
+//! [1]
+
+
+//! [2]
+QPushButton, QLineEdit, QComboBox { color: red }
+//! [2]
+
+
+//! [3]
+QPushButton { color: red }
+QLineEdit { color: red }
+QComboBox { color: red }
+//! [3]
+
+
+//! [4]
+QPushButton { color: red; background-color: white }
+//! [4]
+
+
+//! [5]
+QComboBox::drop-down { image: url(dropdown.png) }
+//! [5]
+
+
+//! [6]
+QComboBox {
+    margin-right: 20px;
+}
+QComboBox::drop-down {
+    subcontrol-origin: margin;
+}
+//! [6]
+
+
+//! [7]
+QComboBox::down-arrow {
+    image: url(down_arrow.png);
+}
+QComboBox::down-arrow:pressed {
+    position: relative;
+    top: 1px; left: 1px;
+}
+//! [7]
+
+
+//! [8]
+QPushButton:hover { color: white }
+//! [8]
+
+
+//! [9]
+QRadioButton:!hover { color: red }
+//! [9]
+
+
+//! [10]
+QCheckBox:hover:checked { color: white }
+//! [10]
+
+
+//! [11]
+QPushButton:hover:!pressed { color: blue; }
+//! [11]
+
+
+//! [12]
+QCheckBox:hover, QCheckBox:checked { color: white }
+//! [12]
+
+
+//! [13]
+QComboBox::drop-down:hover { image: url(dropdown_bright.png) }
+//! [13]
+
+
+//! [14]
+QPushButton#okButton { color: gray }
+QPushButton { color: red }
+//! [14]
+
+
+//! [15]
+QPushButton:hover { color: white }
+QPushButton { color: red }
+//! [15]
+
+
+//! [16]
+QPushButton:hover { color: white }
+QPushButton:enabled { color: red }
+//! [16]
+
+
+//! [17]
+QPushButton:enabled { color: red }
+QPushButton:hover { color: white }
+//! [17]
+
+
+//! [18]
+QPushButton:hover:enabled { color: white }
+QPushButton:enabled { color: red }
+//! [18]
+
+
+//! [19]
+QPushButton { color: red }
+QAbstractButton { color: gray }
+//! [19]
+
+
+//! [20]
+*             {}  /* a=0 b=0 c=0 -> specificity =   0 */
+LI            {}  /* a=0 b=0 c=1 -> specificity =   1 */
+UL LI         {}  /* a=0 b=0 c=2 -> specificity =   2 */
+UL OL+LI      {}  /* a=0 b=0 c=3 -> specificity =   3 */
+H1 + *[REL=up]{}  /* a=0 b=1 c=1 -> specificity =  11 */
+UL OL LI.red  {}  /* a=0 b=1 c=3 -> specificity =  13 */ 
+LI.red.level  {}  /* a=0 b=2 c=1 -> specificity =  21 */
+#x34y         {}  /* a=1 b=0 c=0 -> specificity = 100 */
+//! [20]
+
+
+//! [21]
+qApp->setStyleSheet("QPushButton { color: white }");
+//! [21]
+
+
+//! [22]
+myPushButton->setStyleSheet("* { color: blue }");
+//! [22]
+
+
+//! [23]
+myPushButton->setStyleSheet("color: blue");
+//! [23]
+
+
+//! [24]
+qApp->setStyleSheet("QGroupBox { color: red; } ");
+//! [24]
+
+
+//! [25]
+qApp->setStyleSheet("QGroupBox, QGroupBox * { color: red; }");
+//! [25]
+
+
+//! [26]
+class MyPushButton : public QPushButton {
+    // ...
+}
+
+// ...
+qApp->setStyleSheet("MyPushButton { background: yellow; }");
+//! [26]
+
+
+//! [27]
+namespace ns {
+    class MyPushButton : public QPushButton {
+        // ...
+    }
+}
+
+// ...
+qApp->setSytleSheet("ns--MyPushButton { background: yellow; }");
+//! [27]
+
+
+//! [28]
+MyLabel { qproperty-pixmap: url(pixmap.png); }
+MyGroupBox { qproperty-titleColor: rgb(100, 200, 100); }
+QPushButton { qproperty-iconSize: 20px 20px; }
+//! [28]
+
+
+//! [30]
+QPushButton { background-color: red; border: none; }
+//! [30]
+
+
+//! [31]
+QToolButton { background-color: red; border: none; }
+//! [31]
+
+
+//! [32]
+void CustomWidget::paintEvent(QPaintEvent *)
+{
+    QStyleOption opt;
+    opt.init(this);
+    QPainter p(this);
+    style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
+}
+//! [32]
+
+
+//! [33]
+QTreeView {
+    alternate-background-color: blue;
+    background: yellow;
+}
+//! [33]
+
+
+//! [34]
+QTextEdit { background: yellow }
+//! [34]
+
+
+//! [35]
+QLabel { 
+    background-image: url(dense6pattern.png);
+    background-repeat: repeat-xy;
+}
+//! [35]
+
+
+//! [36]
+QLabel { background-color: yellow }
+QLineEdit { background-color: rgb(255, 0, 0) }
+//! [36]
+
+
+//! [37]
+QFrame { background-image: url(:/images/hydro.png) }
+//! [37]
+
+
+//! [38]
+QFrame {
+    background: white url(:/images/ring.png);
+    background-repeat: repeat-y;
+    background-position: left;
+}
+//! [38]
+
+
+//! [39]
+QFrame {
+    background: url(:/images/footer.png);
+    background-position: bottom left;
+}
+//! [39]
+
+
+//! [40]
+QTextEdit {
+    background-image: url("leaves.png");
+    background-attachment: fixed;
+}
+//! [40]
+
+
+//! [41]
+QFrame {
+    background-image: url(:/images/header.png);
+    background-position: top left;
+    background-origin: content;
+    background-clip: padding;
+}
+//! [41]
+
+
+//! [42]
+QFrame {
+    background-image: url(:/images/header.png);
+    background-position: top left;
+    background-origin: content;
+}
+//! [42]
+
+
+//! [43]
+QLineEdit { border: 1px solid white }
+//! [43]
+
+
+//! [44]
+QLineEdit {
+    border-width: 1px;
+    border-style: solid;
+    border-color: white;
+}
+//! [44]
+
+
+//! [45]
+QLineEdit {
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 4px;
+}
+//! [45]
+
+
+//! [46]
+QLineEdit {
+    border-width: 1px;
+    border-style: solid;
+    border-color: blue;
+}
+//! [46]
+
+
+//! [47]
+QLineEdit {
+    border-width: 2px;
+    border-style: solid;
+    border-color: darkblue;
+}
+//! [47]
+
+
+//! [48]
+QSpinBox::down-button { bottom: 2px }
+//! [48]
+
+
+//! [49]
+* { button-layout: 2 }
+//! [49]
+
+
+//! [50]
+QPushButton { color: red }
+//! [50]
+
+
+//! [51]
+QDialogButtonBox { dialogbuttonbox-buttons-have-icons: 1; }
+//! [51]
+
+
+//! [52]
+* { etch-disabled-text: 1 }
+//! [52]
+
+
+//! [53]
+QCheckBox { font: bold italic large "Times New Roman" }
+//! [53]
+
+
+//! [54]
+QCheckBox { font-family: "New Century Schoolbook" }
+//! [54]
+
+
+//! [55]
+QTextEdit { font-size: 12px }
+//! [55]
+
+
+//! [56]
+QTextEdit { font-style: italic }
+//! [56]
+
+
+//! [57]
+* { gridline-color: gray }
+//! [57]
+
+
+//! [58]
+QSpinBox::down-button { height: 10px }
+//! [58]
+
+
+//! [59]
+/* implicitly sets the size of down-button to the size of spindown.png */
+QSpinBox::down-button { image: url(:/images/spindown.png) }
+
+QTextEdit { image: url(x1.png) url(x2.png) }
+QTextEdit { image: url(pic1.svg) }
+//! [59]
+
+
+//! [60]
+QSpinBox::down-button { left: 2px }
+//! [60]
+
+
+//! [61]
+* { lineedit-password-character: 9679 }
+//! [61]
+
+
+//! [62]
+QLineEdit { margin: 2px }
+//! [62]
+
+
+//! [63]
+QSpinBox { max-height: 24px }
+//! [63]
+
+
+//! [64]
+QComboBox { max-width: 72px }
+//! [64]
+
+
+//! [65]
+QMessageBox { messagebox-text-interaction-flags: 5 }
+//! [65]
+
+
+//! [66]
+QComboBox { min-height: 24px }
+//! [66]
+
+
+//! [67]
+QComboBox { min-width: 72px }
+//! [67]
+
+
+//! [68]
+QToolTip { opacity: 223 }
+//! [68]
+
+
+//! [69]
+QLineEdit { padding: 3px }
+//! [69]
+
+
+//! [70]
+QSpinBox::down-button { right: 2px }
+//! [70]
+
+
+//! [71]
+QTextEdit { selection-background-color: darkblue }
+//! [71]
+
+
+//! [72]
+QTextEdit { selection-color: white }
+//! [72]
+
+
+//! [73]
+* { show-decoration-selected: 1 }
+//! [73]
+
+
+//! [74]
+QMenuBar { spacing: 10 }
+//! [74]
+
+
+//! [75]
+QSpinBox::up-button {
+    image: url(:/images/spinup.png);
+    subcontrol-origin: content;
+    subcontrol-position: right top;
+}
+//! [75]
+
+
+//! [76]
+QSpinBox::down-button {
+    image: url(:/images/spindown.png);
+    subcontrol-origin: padding;
+    subcontrol-position: right bottom;
+}
+//! [76]
+
+
+//! [77]
+QPushButton {
+    text-align: left;
+}
+//! [77]
+
+
+//! [78]
+QSpinBox::up-button { top: 2px }
+//! [78]
+
+
+//! [79]
+QSpinBox::up-button { width: 12px }
+//! [79]
+
+
+//! [80]
+QTextEdit { background-position: bottom center }
+//! [80]
+
+
+//! [81]
+QDialog { etch-disabled-text: 1 }
+//! [81]
+
+
+//! [82]
+QLabel { border-color: red }   /* red red red red */
+QLabel { border-color: red blue } /* red blue red blue */
+QLabel { border-color: red blue green } /* red blue green blue */
+QLabel { border-color: red blue green yellow }  /* red blue green yellow */
+//! [82]
+
+
+//! [83]
+QLabel { border-width: 1px }                    /* 1px 1px 1px 1px */
+QLabel { border-width: 1px 2px }                /* 1px 2px 1px 2px */
+QLabel { border-width: 1px 2px 3px }            /* 1px 2px 3px 2px */
+QLabel { border-width: 1px 2px 3px 4px }        /* 1px 2px 3px 4px */
+//! [83]
+
+
+//! [84]
+QLabel { border-color: red }                    /* opaque red */
+QLabel { border-color: #FF0000 }                /* opaque red */
+QLabel { border-color: rgba(255, 0, 0, 75%) }   /* 75% opaque red */
+QLabel { border-color: rgb(255, 0, 0) }         /* opaque red */
+QLabel { border-color: rgb(100%, 0%, 0%) }      /* opaque red */
+QLabel { border-color: hsv(60, 255, 255) }      /* opaque yellow */
+QLabel { border-color: hsva(240, 255, 255, 75%) }      /* 75% blue */
+//! [84]
+
+
+//! [85]
+/* linear gradient from white to green */
+QTextEdit {
+    background: qlineargradient(x1:0, y1:0, x2:1, y2:1,
+                stop:0 white, stop: 0.4 gray, stop:1 green)
+}
+
+/* linear gradient from white to green */
+QTextEdit {
+    background: qlineargradient(x1:0, y1:0, x2:1, y2:1,
+                stop:0 white, stop: 0.4 rgba(10, 20, 30, 40), stop:1 rgb(0, 200, 230, 200))
+}
+
+
+/* conical gradient from white to green */
+QTextEdit {
+    background: qconicalgradient(cx:0.5, cy:0.5, angle:30,
+                stop:0 white, stop:1 #00FF00)
+}
+
+/* radial gradient from white to green */
+QTextEdit {
+    background: qradialgradient(cx:0, cy:0, radius: 1, 
+                fx:0.5, fy:0.5, stop:0 white, stop:1 green)
+} 
+//! [85]
+
+
+//! [86]
+* {
+    file-icon: url(file.png),
+               url(file_selected.png) selected;
+  }
+
+QMessageBox {
+    dialogbuttonbox-buttons-have-icons: true;
+    dialog-ok-icon: url(ok.svg);
+    dialog-cancel-icon: url(cancel.png), url(grayed_cancel.png) disabled;
+}
+//! [86]
+
+
+//! [87]
+QPushButton { color: palette(dark); }
+//! [87]
+
+
+//! [88]
+qApp->setStyleSheet("QLineEdit { background-color: yellow }");
+//! [88]
+
+
+//! [89]
+myDialog->setStyleSheet("QLineEdit { background-color: yellow }");
+//! [89]
+
+
+//! [90]
+myDialog->setStyleSheet("QLineEdit#nameEdit { background-color: yellow }");
+//! [90]
+
+
+//! [91]
+nameEdit->setStyleSheet("background-color: yellow");
+//! [91]
+
+
+//! [92]
+nameEdit->setStyleSheet("color: blue; background-color: yellow");
+//! [92]
+
+
+//! [93]
+nameEdit->setStyleSheet("color: blue;"
+                        "background-color: yellow;"
+                        "selection-color: yellow;"
+                        "selection-background-color: blue;");
+//! [93]
+
+
+//! [94]
+*[mandatoryField="true"] { background-color: yellow }
+//! [94]
+
+
+//! [95]
+QLineEdit *nameEdit = new QLineEdit(this);
+nameEdit->setProperty("mandatoryField", true);
+
+QLineEdit *emailEdit = new QLineEdit(this);
+emailEdit->setProperty("mandatoryField", true);
+
+QSpinBox *ageSpinBox = new QSpinBox(this);
+ageSpinBox->setProperty("mandatoryField", true);
+//! [95]
+
+
+//! [96]
+QPushButton#evilButton { background-color: red }
+//! [96]
+
+
+//! [97]
+QPushButton#evilButton {
+    background-color: red;
+    border-style: outset;
+    border-width: 2px;
+    border-color: beige;
+}
+//! [97]
+
+
+//! [98]
+QPushButton#evilButton {
+    background-color: red;
+    border-style: outset;
+    border-width: 2px;
+    border-radius: 10px;
+    border-color: beige;
+    font: bold 14px;
+    min-width: 10em;
+    padding: 6px;
+}
+//! [98]
+
+
+//! [99]
+QPushButton#evilButton {
+    background-color: red;
+    border-style: outset;
+    border-width: 2px;
+    border-radius: 10px;
+    border-color: beige;
+    font: bold 14px;
+    min-width: 10em;
+    padding: 6px;
+}
+QPushButton#evilButton:pressed {
+    background-color: rgb(224, 0, 0);
+    border-style: inset;
+}
+//! [99]
+
+
+//! [100]
+QPushButton#evilButton::menu-indicator {
+    image: url(myindicator.png);
+}
+//! [100]
+
+
+//! [101]
+QPushButton::menu-indicator {
+    image: url(myindicator.png);
+    subcontrol-position: right center;
+    subcontrol-origin: padding;
+    left: -2px;
+}
+//! [101]
+
+
+//! [102]
+QLineEdit { color: red }
+//! [102]
+
+
+//! [103]
+QLineEdit { color: red }
+QLineEdit[readOnly="true"] { color: gray }
+//! [103]
+
+
+//! [104]
+QLineEdit { color: red }
+QLineEdit[readOnly="true"] { color: gray }
+#registrationDialog QLineEdit { color: brown }
+//! [104]
+
+
+//! [105]
+QLineEdit { color: red }
+QLineEdit[readOnly="true"] { color: gray }
+QDialog QLineEdit { color: brown }
+//! [105]
+
+
+//! [106]
+QTextEdit, QListView {
+    background-color: white;
+    background-image: url(draft.png);
+    background-attachment: scroll;
+}
+//! [106]
+
+
+//! [107]
+QTextEdit, QListView {
+    background-color: white;
+    background-image: url(draft.png);
+    background-attachment: fixed;
+}
+//! [107]
+
+
+//! [108]
+QCheckBox {
+    spacing: 5px;
+}
+
+QCheckBox::indicator {
+    width: 13px;
+    height: 13px;
+}
+
+QCheckBox::indicator:unchecked {
+    image: url(:/images/checkbox_unchecked.png);
+}
+
+QCheckBox::indicator:unchecked:hover {
+    image: url(:/images/checkbox_unchecked_hover.png);
+}
+
+QCheckBox::indicator:unchecked:pressed {
+    image: url(:/images/checkbox_unchecked_pressed.png);
+}
+
+QCheckBox::indicator:checked {
+    image: url(:/images/checkbox_checked.png);
+}
+
+QCheckBox::indicator:checked:hover {
+    image: url(:/images/checkbox_checked_hover.png);
+}
+
+QCheckBox::indicator:checked:pressed {
+    image: url(:/images/checkbox_checked_pressed.png);
+}
+
+QCheckBox::indicator:indeterminate:hover {
+    image: url(:/images/checkbox_indeterminate_hover.png);
+}
+
+QCheckBox::indicator:indeterminate:pressed {
+    image: url(:/images/checkbox_indeterminate_pressed.png);
+}
+//! [108]
+
+
+//! [109]
+QComboBox {
+    border: 1px solid gray;
+    border-radius: 3px;
+    padding: 1px 18px 1px 3px;
+    min-width: 6em;
+}
+
+QComboBox:editable {
+    background: white;
+}
+
+QComboBox:!editable, QComboBox::drop-down:editable {
+     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                                 stop: 0 #E1E1E1, stop: 0.4 #DDDDDD,
+                                 stop: 0.5 #D8D8D8, stop: 1.0 #D3D3D3);
+}
+
+/* QComboBox gets the "on" state when the popup is open */
+QComboBox:!editable:on, QComboBox::drop-down:editable:on {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                                stop: 0 #D3D3D3, stop: 0.4 #D8D8D8,
+                                stop: 0.5 #DDDDDD, stop: 1.0 #E1E1E1);
+}
+
+QComboBox:on { /* shift the text when the popup opens */
+    padding-top: 3px;
+    padding-left: 4px;
+}
+
+QComboBox::drop-down {
+    subcontrol-origin: padding;
+    subcontrol-position: top right;
+    width: 15px;
+
+    border-left-width: 1px;
+    border-left-color: darkgray;
+    border-left-style: solid; /* just a single line */
+    border-top-right-radius: 3px; /* same radius as the QComboBox */
+    border-bottom-right-radius: 3px;
+}
+
+QComboBox::down-arrow {
+    image: url(/usr/share/icons/crystalsvg/16x16/actions/1downarrow.png);
+}
+
+QComboBox::down-arrow:on { /* shift the arrow when popup is open */
+    top: 1px;
+    left: 1px;
+} 
+//! [109]
+
+
+//! [110]
+QComboBox QAbstractItemView {
+    border: 2px solid darkgray;
+    selection-background-color: lightgray;
+}
+//! [110]
+
+
+//! [111]
+QDockWidget {
+    border: 1px solid lightgray;
+    titlebar-close-icon: url(close.png);
+    titlebar-normal-icon: url(undock.png);
+}
+
+QDockWidget::title {
+    text-align: left; /* align the text to the left */
+    background: lightgray;
+    padding-left: 5px;
+}
+
+QDockWidget::close-button, QDockWidget::float-button {
+    border: 1px solid transparent;
+    background: darkgray;
+    padding: 0px;
+}
+
+QDockWidget::close-button:hover, QDockWidget::float-button:hover {
+    background: gray;
+}
+
+QDockWidget::close-button:pressed, QDockWidget::float-button:pressed {
+    padding: 1px -1px -1px 1px;
+}
+//! [111]
+
+
+//! [112]
+QDockWidget {
+    border: 1px solid lightgray;
+    titlebar-close-icon: url(close.png);
+    titlebar-normal-icon: url(float.png);
+}
+
+QDockWidget::title {
+    text-align: left;
+    background: lightgray;
+    padding-left: 35px;
+}
+
+QDockWidget::close-button, QDockWidget::float-button {
+    background: darkgray;
+    padding: 0px;
+    icon-size: 14px; /* maximum icon size */
+}
+
+QDockWidget::close-button:hover, QDockWidget::float-button:hover {
+    background: gray;
+}
+
+QDockWidget::close-button:pressed, QDockWidget::float-button:pressed {
+    padding: 1px -1px -1px 1px;
+}
+
+QDockWidget::close-button {
+    subcontrol-position: top left;
+    subcontrol-origin: margin;
+    position: absolute;
+    top: 0px; left: 0px; bottom: 0px;
+    width: 14px;
+}
+
+QDockWidget::float-button {
+    subcontrol-position: top left;
+    subcontrol-origin: margin;
+    position: absolute;
+    top: 0px; left: 16px; bottom: 0px;
+    width: 14px;
+}
+//! [112]
+
+
+//! [113]
+QFrame, QLabel, QToolTip {
+    border: 2px solid green;
+    border-radius: 4px;
+    padding: 2px;
+    background-image: url(images/welcome.png);
+}
+//! [113]
+
+
+//! [114]
+QGroupBox {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                                      stop: 0 #E0E0E0, stop: 1 #FFFFFF);
+    border: 2px solid gray;
+    border-radius: 5px;
+    margin-top: 1ex; /* leave space at the top for the title */
+}
+
+QGroupBox::title {
+    subcontrol-origin: margin;
+    subcontrol-position: top center; /* position at the top center */
+    padding: 0 3px;
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                                      stop: 0 #FFOECE, stop: 1 #FFFFFF);
+}
+//! [114]
+
+
+//! [115]
+QGroupBox::indicator {
+    width: 13px;
+    height: 13px;
+}
+
+QGroupBox::indicator:unchecked {
+    image: url(:/images/checkbox_unchecked.png);
+}
+
+/* proceed with styling just like QCheckBox */
+//! [115]
+
+
+//! [116]
+QHeaderView::section {
+    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, 
+                                      stop:0 #616161, stop: 0.5 #505050, 
+                                      stop: 0.6 #434343, stop:1 #656565);
+    color: white;
+    padding-left: 4px;
+    border: 1px solid #6c6c6c;
+}
+
+/* style the sort indicator */
+QHeaderView::down-arrow {
+    image: url(down_arrow.png);
+}
+
+QHeaderView::up-arrow {
+    image: url(up_arrow.png);
+}
+//! [116]
+
+
+//! [117]
+QLineEdit {
+    border: 2px solid gray;
+    border-radius: 10px;
+    padding: 0 8px;
+    background: yellow;
+    selection-background-color: darkgray;
+}
+//! [117]
+
+
+//! [118]
+QLineEdit[echoMode="2"] {
+    lineedit-password-character: 9679;
+}
+//! [118]
+
+
+//! [119]
+QLineEdit:read-only {
+    background: lightblue;
+//! [119]
+
+
+//! [120]
+QListView {
+    alternate-background-color: yellow;
+}
+//! [120]
+
+
+//! [121]
+QListView {
+    show-decoration-selected: 1; /* make the selection span the entire width of the view */
+}
+
+QListView::item:alternate {
+    background: #EEEEEE;
+}
+
+QListView::item:selected {
+    border: 1px solid #6a6ea9;
+}
+
+QListView::item:selected:!active {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
+                                stop: 0 #ABAFE5, stop: 1 #8588B2);
+}
+
+QListView::item:selected:active {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
+                                stop: 0 #6a6ea9, stop: 1 #888dd9);
+}
+
+QListView::item:hover {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
+                                stop: 0 #FAFBFE, stop: 1 #DCDEF1);
+}
+//! [121]
+
+
+//! [122]
+QMainWindow::separator {
+    background: yellow;
+    width: 10px; /* when vertical */
+    height: 10px; /* when horizontal */
+}
+
+QMainWindow::separator:hover {
+    background: red;
+}
+//! [122]
+
+
+//! [123]
+QMenu {
+    background-color: #ABABAB; /* sets background of the menu */
+    border: 1px solid black; 
+}
+
+QMenu::item {
+    /* sets background of menu item. set this to something non-transparent 
+        if you want menu color and menu item color to be different */
+    background-color: transparent; 
+}
+
+QMenu::item:selected { /* when user selects item using mouse or keyboard */
+    background-color: #654321;
+}
+//! [123]
+
+
+//! [124]
+QMenu {
+    background-color: white;
+    margin: 2px; /* some spacing around the menu */
+}
+
+QMenu::item {
+    padding: 2px 25px 2px 20px;
+    border: 1px solid transparent; /* reserve space for selection border */
+}
+
+QMenu::item:selected {
+    border-color: darkblue;
+    background: rgba(100, 100, 100, 150);
+}
+
+QMenu::icon:checked { /* appearance of a 'checked' icon */
+    background: gray;
+    border: 1px inset gray;
+    position: absolute;
+    top: 1px; 
+    right: 1px; 
+    bottom: 1px; 
+    left: 1px;
+}
+
+QMenu::separator {
+    height: 2px;
+    background: lightblue;
+    margin-left: 10px; 
+    margin-right: 5px;
+}
+
+QMenu::indicator {
+    width: 13px;
+    height: 13px;
+}
+
+/* non-exclusive indicator = check box style indicator (see QActionGroup::setExclusive) */
+QMenu::indicator:non-exclusive:unchecked {
+    image: url(:/images/checkbox_unchecked.png);
+}
+
+QMenu::indicator:non-exclusive:unchecked:selected {
+    image: url(:/images/checkbox_unchecked_hover.png);
+}
+
+QMenu::indicator:non-exclusive:checked {
+    image: url(:/images/checkbox_checked.png);
+}
+
+QMenu::indicator:non-exclusive:checked:selected {
+    image: url(:/images/checkbox_checked_hover.png);
+}
+
+/* exclusive indicator = radio button style indicator (see QActionGroup::setExclusive) */
+QMenu::indicator:exclusive:unchecked {
+    image: url(:/images/radiobutton_unchecked.png);
+}
+
+QMenu::indicator:exclusive:unchecked:selected {
+    image: url(:/images/radiobutton_unchecked_hover.png);
+}
+
+QMenu::indicator:exclusive:checked {
+    image: url(:/images/radiobutton_checked.png);
+}
+
+QMenu::indicator:exclusive:checked:selected {
+    image: url(:/images/radiobutton_checked_hover.png);
+}
+
+//! [124]
+
+
+//! [125]
+QMenuBar {
+    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+                                      stop:0 lightgray, stop:1 darkgray);
+}
+
+QMenuBar::item {
+    spacing: 3px; /* spacing between menu bar items */
+    padding: 1px 4px;
+    background: transparent;
+    border-radius: 4px;
+}
+
+QMenuBar::item:selected { /* when selected using mouse or keyboard */
+    background: #a8a8a8;
+}
+
+QMenuBar::item:pressed {
+    background: #888888;
+}
+//! [125]
+
+
+//! [126]
+QProgressBar {
+    border: 2px solid grey;
+    border-radius: 5px;
+}
+
+QProgressBar::chunk {
+    background-color: #05B8CC;
+    width: 20px;
+}
+//! [126]
+
+
+//! [127]
+QProgressBar {
+    border: 2px solid grey;
+    border-radius: 5px;
+    text-align: center;
+}
+//! [127]
+
+
+//! [128]
+QProgressBar::chunk {
+    background-color: #CD96CD;
+    width: 10px;
+    margin: 0.5px;
+}
+//! [128]
+
+
+//! [129]
+QPushButton {
+    border: 2px solid #8f8f91;
+    border-radius: 6px;
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
+                                      stop: 0 #f6f7fa, stop: 1 #dadbde);
+    min-width: 80px;
+}
+
+QPushButton:pressed {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
+                                      stop: 0 #dadbde, stop: 1 #f6f7fa);
+}
+
+QPushButton:flat {
+    border: none; /* no border for a flat push button */
+}
+
+QPushButton:default {
+    border-color: navy; /* make the default button prominent */
+}
+//! [129]
+
+
+//! [130]
+QPushButton:open { /* when the button has its menu open */
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
+                                      stop: 0 #dadbde, stop: 1 #f6f7fa);
+}
+
+QPushButton::menu-indicator { 
+    image: url(menu_indicator.png);
+    subcontrol-origin: padding; 
+    subcontrol-position: bottom right;
+}
+
+QPushButton::menu-indicator:pressed, QPushButton::menu-indicator:open {
+    position: relative; 
+    top: 2px; left: 2px; /* shift the arrow by 2 px */
+}
+//! [130]
+
+
+//! [131]
+QRadioButton::indicator {
+    width: 13px;
+    height: 13px;
+}
+
+QRadioButton::indicator::unchecked {
+    image: url(:/images/radiobutton_unchecked.png);
+}
+
+QRadioButton::indicator:unchecked:hover {
+    image: url(:/images/radiobutton_unchecked_hover.png);
+}
+
+QRadioButton::indicator:unchecked:pressed {
+    image: url(:/images/radiobutton_unchecked_pressed.png);
+}
+
+QRadioButton::indicator::checked {
+    image: url(:/images/radiobutton_checked.png);
+}
+
+QRadioButton::indicator:checked:hover {
+    image: url(:/images/radiobutton_checked_hover.png);
+}
+
+QRadioButton::indicator:checked:pressed {
+    image: url(:/images/radiobutton_checked_pressed.png);
+}
+//! [131]
+
+
+//! [132]
+QScrollBar:horizontal {
+    border: 2px solid grey;
+    background: #32CC99;
+    height: 15px;
+    margin: 0px 20px 0 20px;
+}
+//! [132]
+
+
+//! [133]
+QScrollBar::handle:horizontal {
+    background: white;
+    min-width: 20px;
+}
+//! [133]
+
+
+//! [134]
+QScrollBar::add-line:horizontal {
+    border: 2px solid grey;
+    background: #32CC99;
+    width: 20px;
+    subcontrol-position: right;
+    subcontrol-origin: margin;
+}
+
+QScrollBar::sub-line:horizontal {
+    border: 2px solid grey;
+    background: #32CC99;
+    width: 20px;
+    subcontrol-position: left;
+    subcontrol-origin: margin;
+}
+//! [134]
+
+
+//! [135]
+QScrollBar:left-arrow:horizontal, QScrollBar::right-arrow:horizontal {
+    border: 2px solid grey;
+    width: 3px;
+    height: 3px;
+    background: white;
+}
+
+QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
+    background: none;
+}
+//! [135]
+
+
+//! [136]
+QScrollBar:horizontal {
+    border: 2px solid green;
+    background: cyan;
+    height: 15px;
+    margin: 0px 40px 0 0px;
+}
+
+QScrollBar::handle:horizontal {
+    background: gray;
+    min-width: 20px;
+}
+
+QScrollBar::add-line:horizontal {
+    background: blue;
+    width: 16px;
+    subcontrol-position: right;
+    subcontrol-origin: margin;
+    border: 2px solid black;
+}
+
+QScrollBar::sub-line:horizontal {
+    background: magenta;
+    width: 16px;
+    subcontrol-position: top right;
+    subcontrol-origin: margin;
+    border: 2px solid black;
+    position: absolute;
+    right: 20px;
+}
+
+QScrollBar:left-arrow:horizontal, QScrollBar::right-arrow:horizontal {
+    width: 3px;
+    height: 3px;
+    background: pink;
+}
+
+QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
+    background: none;
+}
+
+//! [136]
+
+
+//! [137]
+ QScrollBar:vertical {
+     border: 2px solid grey;
+     background: #32CC99;
+     width: 15px;
+     margin: 22px 0 22px 0;
+ }
+ QScrollBar::handle:vertical {
+     background: white;
+     min-height: 20px;
+ }
+ QScrollBar::add-line:vertical {
+     border: 2px solid grey;
+     background: #32CC99;
+     height: 20px;
+     subcontrol-position: bottom;
+     subcontrol-origin: margin;
+ }
+
+ QScrollBar::sub-line:vertical {
+     border: 2px solid grey;
+     background: #32CC99;
+     height: 20px;
+     subcontrol-position: top;
+     subcontrol-origin: margin;
+ }
+ QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
+     border: 2px solid grey;
+     width: 3px;
+     height: 3px;
+     background: white;
+ }
+
+ QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
+     background: none;
+ }
+//! [137]
+
+
+//! [138]
+QSizeGrip {
+    image: url(:/images/sizegrip.png);
+    width: 16px;
+    height: 16px;
+}
+//! [138]
+
+
+//! [139]
+QSlider::groove:horizontal {
+    border: 1px solid #999999;
+    height: 8px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
+    background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #B1B1B1, stop:1 #c4c4c4);
+    margin: 2px 0;
+}
+
+QSlider::handle:horizontal {
+    background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #b4b4b4, stop:1 #8f8f8f);
+    border: 1px solid #5c5c5c;
+    width: 18px;
+    margin: -2px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
+    border-radius: 3px;
+}
+//! [139]
+
+
+//! [140]
+QSlider::groove:vertical {
+    background: red;
+    position: absolute; /* absolutely position 4px from the left and right of the widget. setting margins on the widget should work too... */
+    left: 4px; right: 4px;
+}
+
+QSlider::handle:vertical {
+    height: 10px;
+    background: green;
+    margin: 0 -4px; /* expand outside the groove */
+}
+
+QSlider::add-page:vertical {
+    background: white;
+}
+
+QSlider::sub-page:vertical {
+    background: pink;
+}
+//! [140]
+
+
+//! [141]
+QSpinBox {
+    padding-right: 15px; /* make room for the arrows */
+    border-image: url(:/images/frame.png) 4;
+    border-width: 3;
+}
+
+QSpinBox::up-button {
+    subcontrol-origin: border;
+    subcontrol-position: top right; /* position at the top right corner */
+
+    width: 16px; /* 16 + 2*1px border-width = 15px padding + 3px parent border */
+    border-image: url(:/images/spinup.png) 1;
+    border-width: 1px;
+}
+
+QSpinBox::up-button:hover {
+    border-image: url(:/images/spinup_hover.png) 1;
+}
+
+QSpinBox::up-button:pressed {
+    border-image: url(:/images/spinup_pressed.png) 1;
+}
+
+QSpinBox::up-arrow {
+    image: url(:/images/up_arrow.png);
+    width: 7px;
+    height: 7px;
+}
+
+QSpinBox::up-arrow:disabled, QSpinBox::up-arrow:off { /* off state when value is max */
+   image: url(:/images/up_arrow_disabled.png);
+}
+
+QSpinBox::down-button {
+    subcontrol-origin: border;
+    subcontrol-position: bottom right; /* position at bottom right corner */
+
+    width: 16px;
+    border-image: url(:/images/spindown.png) 1;
+    border-width: 1px;
+    border-top-width: 0;
+}
+
+QSpinBox::down-button:hover {
+    border-image: url(:/images/spindown_hover.png) 1;
+}
+
+QSpinBox::down-button:pressed {
+    border-image: url(:/images/spindown_pressed.png) 1;
+}
+
+QSpinBox::down-arrow {
+    image: url(:/images/down_arrow.png);
+    width: 7px;
+    height: 7px;
+}
+
+QSpinBox::down-arrow:disabled,
+QSpinBox::down-arrow:off { /* off state when value in min */
+   image: url(:/images/down_arrow_disabled.png);
+}
+
+//! [141]
+
+
+//! [142]
+QSplitter::handle {
+    image: url(images/splitter.png);
+}
+
+QSplitter::handle:horizontal {
+    width: 2px;
+}
+
+QSplitter::handle:vertical {
+    height: 2px;
+}
+//! [142]
+
+
+//! [143]
+QStatusBar {
+    background: brown;
+}
+
+QStatusBar::item {
+    border: 1px solid red;
+    border-radius: 3px;
+}
+//! [143]
+
+
+//! [144]
+QStatusBar QLabel {
+    border: 3px solid white;
+}
+//! [144]
+
+
+//! [145]
+QTabWidget::pane { /* The tab widget frame */
+    border-top: 2px solid #C2C7CB;
+}
+
+QTabWidget::tab-bar {
+    left: 5px; /* move to the right by 5px */
+}
+
+/* Style the tab using the tab sub-control. Note that 
+    it reads QTabBar _not_ QTabWidget */
+QTabBar::tab {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
+                                stop: 0 #E1E1E1, stop: 0.4 #DDDDDD, 
+                                stop: 0.5 #D8D8D8, stop: 1.0 #D3D3D3);
+    border: 2px solid #C4C4C3;
+    border-bottom-color: #C2C7CB; /* same as the pane color */
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    min-width: 8ex;
+    padding: 2px;
+}
+
+QTabBar::tab:selected, QTabBar::tab:hover {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
+                                stop: 0 #fafafa, stop: 0.4 #f4f4f4, 
+                                stop: 0.5 #e7e7e7, stop: 1.0 #fafafa);
+}
+
+QTabBar::tab:selected {
+    border-color: #9B9B9B;
+    border-bottom-color: #C2C7CB; /* same as pane color */
+}
+
+QTabBar::tab:!selected {
+    margin-top: 2px; /* make non-selected tabs look smaller */
+}
+//! [145]
+
+
+//! [146]
+QTabWidget::pane { /* The tab widget frame */
+    border-top: 2px solid #C2C7CB;
+}
+
+QTabWidget::tab-bar {
+    left: 5px; /* move to the right by 5px */
+}
+
+/* Style the tab using the tab sub-control. Note that 
+    it reads QTabBar _not_ QTabWidget */
+QTabBar::tab {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
+                                stop: 0 #E1E1E1, stop: 0.4 #DDDDDD, 
+                                stop: 0.5 #D8D8D8, stop: 1.0 #D3D3D3);
+    border: 2px solid #C4C4C3;
+    border-bottom-color: #C2C7CB; /* same as the pane color */
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    min-width: 8ex;
+    padding: 2px;
+}
+
+QTabBar::tab:selected, QTabBar::tab:hover {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
+                                stop: 0 #fafafa, stop: 0.4 #f4f4f4, 
+                                stop: 0.5 #e7e7e7, stop: 1.0 #fafafa);
+}
+
+QTabBar::tab:selected {
+    border-color: #9B9B9B;
+    border-bottom-color: #C2C7CB; /* same as pane color */
+}
+
+QTabBar::tab:!selected {
+    margin-top: 2px; /* make non-selected tabs look smaller */
+}
+
+/* make use of negative margins for overlapping tabs */
+QTabBar::tab:selected {
+    /* expand/overlap to the left and right by 4px */
+    margin-left: -4px;
+    margin-right: -4px;
+}
+
+QTabBar::tab:first:selected {
+    margin-left: 0; /* the first selected tab has nothing to overlap with on the left */
+}
+
+QTabBar::tab:last:selected {
+    margin-right: 0; /* the last selected tab has nothing to overlap with on the right */
+}
+
+QTabBar::tab:only-one {
+    margin: 0; /* if there is only one tab, we don't want overlapping margins */
+}
+//! [146]
+
+
+//! [147]
+QTabWidget::pane { /* The tab widget frame */
+    border-top: 2px solid #C2C7CB;
+    position: absolute; 
+    top: -0.5em; 
+}
+
+QTabWidget::tab-bar { 
+    alignment: center; 
+}
+
+/* Style the tab using the tab sub-control. Note that 
+    it reads QTabBar _not_ QTabWidget */
+QTabBar::tab {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
+                                stop: 0 #E1E1E1, stop: 0.4 #DDDDDD, 
+                                stop: 0.5 #D8D8D8, stop: 1.0 #D3D3D3);
+    border: 2px solid #C4C4C3;
+    border-bottom-color: #C2C7CB; /* same as the pane color */
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    min-width: 8ex;
+    padding: 2px;
+}
+
+QTabBar::tab:selected, QTabBar::tab:hover {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
+                                stop: 0 #fafafa, stop: 0.4 #f4f4f4, 
+                                stop: 0.5 #e7e7e7, stop: 1.0 #fafafa);
+}
+
+QTabBar::tab:selected {
+    border-color: #9B9B9B;
+    border-bottom-color: #C2C7CB; /* same as pane color */
+}
+//! [147]
+
+
+//! [148]
+QTabBar::tear {
+    image: url(tear_indicator.png);
+}
+
+QTabBar::scroller { /* the width of the scroll buttons */
+    width: 20px;
+}
+
+QTabBar QToolButton { /* the scroll buttons are tool buttons */
+    border-image: url(scrollbutton.png) 2;
+    border-width: 2px;
+}
+
+QTabBar QToolButton::right-arrow { /* the arrow mark in the tool buttons */
+    image: url(rightarrow.png);
+}
+
+QTabBar QToolButton::left-arrow {
+    image: url(leftarrow.png);
+}
+//! [148]
+
+
+//! [149]
+QTableView {
+    selection-background-color: qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0.5,
+                                stop: 0 #FF92BB, stop: 1 white);
+}
+//! [149]
+
+
+//! [150]
+QTableView QTableCornerButton::section {
+    background: red;
+    border: 2px outset red;
+}
+//! [150]
+
+
+//! [151]
+QToolBar {
+    background: red;
+    spacing: 3px; /* spacing between items in the tool bar */
+}
+
+QToolBar::handle {
+    image: url(handle.png);
+}
+//! [151]
+
+
+//! [152]
+QToolBox::tab {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                                stop: 0 #E1E1E1, stop: 0.4 #DDDDDD,
+                                stop: 0.5 #D8D8D8, stop: 1.0 #D3D3D3);
+    border-radius: 5px;
+    color: darkgray;
+}
+
+QToolBox::tab:selected { /* italicize selected tabs */
+    font: italic;
+    color: white;
+}
+//! [152]
+
+
+//! [153]
+QToolButton { /* all types of tool button */
+    border: 2px solid #8f8f91;
+    border-radius: 6px;
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                                      stop: 0 #f6f7fa, stop: 1 #dadbde);
+}
+
+QToolButton[popupMode="1"] { /* only for MenuButtonPopup */
+    padding-right: 20px; /* make way for the popup button */
+}
+
+QToolButton:pressed {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                                      stop: 0 #dadbde, stop: 1 #f6f7fa);
+}
+
+/* the subcontrols below are used only in the MenuButtonPopup mode */
+QToolButton::menu-button {
+    border: 2px solid gray;
+    border-top-right-radius: 6px;
+    border-bottom-right-radius: 6px;
+    /* 16px width + 4px for border = 20px allocated above */
+    width: 16px;
+}
+
+QToolButton::menu-arrow {
+    image: url(downarrow.png);
+}
+
+QToolButton::menu-arrow:open {
+    top: 1px; left: 1px; /* shift it a bit */
+}
+//! [153]
+
+
+//! [154]
+QToolTip {
+    border: 2px solid darkkhaki;
+    padding: 5px;
+    border-radius: 3px;
+    opacity: 200;
+}
+//! [154]
+
+
+//! [155]
+QTreeView {
+    alternate-background-color: yellow;
+}
+//! [155]
+
+
+//! [156]
+QTreeView {
+    show-decoration-selected: 1;
+}
+
+QTreeView::item {
+     border: 1px solid #d9d9d9;
+    border-top-color: transparent;
+    border-bottom-color: transparent;
+}
+
+QTreeView::item:hover {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e7effd, stop: 1 #cbdaf1);
+    border: 1px solid #bfcde4;
+}
+
+QTreeView::item:selected {
+    border: 1px solid #567dbc;
+}
+
+QTreeView::item:selected:active{
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6ea1f1, stop: 1 #567dbc);
+}
+
+QTreeView::item:selected:!active {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6b9be8, stop: 1 #577fbf);
+}
+//! [156]
+
+
+//! [157]
+QTreeView::branch {
+        background: palette(base);
+}
+
+QTreeView::branch:has-siblings:!adjoins-item {
+        background: cyan;
+}
+
+QTreeView::branch:has-siblings:adjoins-item {
+        background: red;
+}
+
+QTreeView::branch:!has-children:!has-siblings:adjoins-item {
+        background: blue;
+}
+
+QTreeView::branch:closed:has-children:has-siblings {
+        background: pink;
+}
+
+QTreeView::branch:has-children:!has-siblings:closed {
+        background: gray;
+}
+
+QTreeView::branch:open:has-children:has-siblings {
+        background: magenta;
+}
+
+QTreeView::branch:open:has-children:!has-siblings {
+        background: green;
+}
+
+//! [157]
+
+
+//! [158]
+QTreeView::branch:has-siblings:!adjoins-item {
+    border-image: url(vline.png) 0;
+}
+
+QTreeView::branch:has-siblings:adjoins-item {
+    border-image: url(branch-more.png) 0;
+}
+
+QTreeView::branch:!has-children:!has-siblings:adjoins-item {
+    border-image: url(branch-end.png) 0;
+}
+
+QTreeView::branch:has-children:!has-siblings:closed,
+QTreeView::branch:closed:has-children:has-siblings {
+        border-image: none;
+        image: url(branch-closed.png);
+}
+
+QTreeView::branch:open:has-children:!has-siblings,
+QTreeView::branch:open:has-children:has-siblings  {
+        border-image: none;
+        image: url(branch-open.png);
+}
+//! [158]
diff --git a/doc/src/snippets/code/doc_src_uic.qdoc b/doc/src/snippets/code/doc_src_uic.qdoc
new file mode 100644
index 0000000000..310e839c81
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_uic.qdoc
@@ -0,0 +1,15 @@
+//! [0]
+uic [options] <uifile>
+//! [0]
+
+
+//! [1]
+ui_%.h: %.ui
+        uic $< -o $@
+//! [1]
+
+
+//! [2]
+ui_foo.h: foo.ui
+        uic $< -o $@
+//! [2]
diff --git a/doc/src/snippets/code/doc_src_unicode.qdoc b/doc/src/snippets/code/doc_src_unicode.qdoc
new file mode 100644
index 0000000000..30a37108db
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_unicode.qdoc
@@ -0,0 +1,18 @@
+//! [0]
+label->setText("Password:");
+//! [0]
+
+
+//! [1]
+label->setText(tr("Password:"));
+//! [1]
+
+
+//! [2]
+QFile file(QString::fromLatin1("appicon.png"));
+//! [2]
+
+
+//! [3]
+QFile file(QLatin1String("appicon.png"));
+//! [3]
diff --git a/doc/src/snippets/code/doc_src_unix-signal-handlers.qdoc b/doc/src/snippets/code/doc_src_unix-signal-handlers.qdoc
new file mode 100644
index 0000000000..8abcba69aa
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_unix-signal-handlers.qdoc
@@ -0,0 +1,110 @@
+//! [0]
+class MyDaemon : public QObject
+{
+    Q_OBJECT
+
+  public:
+    MyDaemon(QObject *parent = 0, const char *name = 0);
+    ~MyDaemon();
+
+    // Unix signal handlers.
+    static void hupSignalHandler(int unused);
+    static void termSignalHandler(int unused);
+
+  public slots:
+    // Qt signal handlers.
+    void handleSigHup();
+    void handleSigTerm();
+
+  private:
+    static int sighupFd[2];
+    static int sigtermFd[2];
+
+    QSocketNotifier *snHup;
+    QSocketNotifier *snTerm;
+};
+//! [0]
+
+
+//! [1]
+MyDaemon::MyDaemon(QObject *parent, const char *name)
+    	 : QObject(parent,name)
+{
+    if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sighupFd))
+       qFatal("Couldn't create HUP socketpair");
+
+    if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sigtermFd))
+       qFatal("Couldn't create TERM socketpair");
+    snHup = new QSocketNotifier(sighupFd[1], QSocketNotifier::Read, this);
+    connect(snHup, SIGNAL(activated(int)), this, SLOT(handleSigHup()));
+    snTerm = new QSocketNotifier(sigtermFd[1], QSocketNotifier::Read, this);
+    connect(snTerm, SIGNAL(activated(int)), this, SLOT(handleSigTerm()));
+
+    ...
+}
+//! [1]
+
+
+//! [2]
+static int setup_unix_signal_handlers()
+{
+    struct sigaction hup, term;
+
+    hup.sa_handler = MyDaemon::hupSignalHandler;
+    sigemptyset(&hup.sa_mask);
+    hup.sa_flags = 0;
+    hup.sa_flags |= SA_RESTART;
+
+    if (sigaction(SIGHUP, &hup, 0) > 0)
+       return 1;
+
+    term.sa_handler = MyDaemon::termSignalHandler;
+    sigemptyset(&term.sa_mask);
+    term.sa_flags |= SA_RESTART;
+
+    if (sigaction(SIGTERM, &term, 0) > 0)
+       return 2;
+
+    return 0;
+}
+//! [2]
+
+
+//! [3]
+void MyDaemon::hupSignalHandler(int)
+{
+    char a = 1;
+    ::write(sighupFd[0], &a, sizeof(a));
+}
+
+void MyDaemon::termSignalHandler(int)
+{
+    char a = 1;
+    ::write(sigtermFd[0], &a, sizeof(a));
+}
+//! [3]
+
+
+//! [4]
+void MyDaemon::handleSigTerm()
+{
+    snTerm->setEnabled(false);
+    char tmp;
+    ::read(sigtermFd[1], &tmp, sizeof(tmp));
+
+    // do Qt stuff
+
+    snTerm->setEnabled(true);
+}
+
+void MyDaemon::handleSigHup()
+{
+    snHup->setEnabled(false);
+    char tmp;
+    ::read(sighupFd[1], &tmp, sizeof(tmp));
+
+    // do Qt stuff
+
+    snHup->setEnabled(true);
+}
+//! [4]
diff --git a/doc/src/snippets/code/doc_src_wince-customization.qdoc b/doc/src/snippets/code/doc_src_wince-customization.qdoc
new file mode 100644
index 0000000000..0399231511
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_wince-customization.qdoc
@@ -0,0 +1,70 @@
+//! [0]
+wince<version><SDK-shortcut>-[architecture]-msvc2005
+//! [0]
+
+
+//! [1]
+CE_SDK        = Windows Mobile 5.0 Pocket PC SDK
+CE_ARCH       = ARMV4I
+//! [1]
+
+
+//! [2]
+DEFINES	     += UNDER_CE WINCE _WINDOWS _UNICODE UNICODE _WIN32_WCE=0x501 $$CE_ARCH _ARMV4I_ armv4i _ARM_ ARM _M_ARM ARM _WIN32 __arm__ Q_OS_WINCE_WM QT_NO_PRINTER QT_NO_PRINTDIALOG
+//! [2]
+
+
+//! [3]
+set PATH=C:\Qt\mobile5-shadow\bin;%PATH%
+//! [3]
+
+
+//! [4]
+cd c:\Qt\mobile5-shadow
+C:\Qt\%VERSION%\configure.exe -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005 -release
+//! [4]
+
+
+//! [5]
+set INCLUDE=C:\Program Files\Microsoft Visual Studio 8\VC\ce\include;
+    C:\Program Files\Windows CE Tools\wce500\Windows Mobile 5.0 Pocket PC SDK\Include\Armv4i
+set LIB=C:\Program Files\Microsoft Visual Studio 8\VC\ce\lib\armv4i;
+    C:\Program Files\Windows CE Tools\wce500\Windows Mobile 5.0 Pocket PC SDK\Lib\ARMV4I
+set PATH=C:\Program Files\Microsoft Visual Studio 8\VC\ce\bin\x86_arm;
+    %PATH%
+//! [5]
+
+
+//! [6]
+setcepaths wincewm50pocket-msvc2005
+//! [6]
+
+
+//! [7]
+nmake
+//! [7]
+
+//! [8]
+if(equals(TEMPLATE_PREFIX, "vc") | equals(TEMPLATE, "vc*")) {
+    DEFINES -= _M_ARM
+}
+//! [8]
+
+//! [9]
+wchar_t* libraries[] = {
+    L"QtCore4.dll",
+    L"QtGui4.dll",
+    0
+};
+
+for (int i = 0; libraries[i] != 0; ++i) {
+    HINSTANCE instance = LoadLibraryW(libraries[i]);
+    OutputDebugStringW(libraries[i]);
+    if (instance != NULL) {
+        OutputDebugStringW(L" : Successfully instantiated\n");
+        FreeLibrary(instance);
+    } else {
+        OutputDebugStringW(L" : Could not be loaded\n");
+    }
+}
+//! [9]
diff --git a/doc/src/snippets/code/doc_src_wince-introduction.qdoc b/doc/src/snippets/code/doc_src_wince-introduction.qdoc
new file mode 100644
index 0000000000..ffb4cfb1d0
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_wince-introduction.qdoc
@@ -0,0 +1,9 @@
+//! [0]
+qmake
+nmake
+//! [0]
+
+
+//! [1]
+qmake -tp vc
+//! [1]
diff --git a/doc/src/snippets/code/doc_src_wince-opengl.qdoc b/doc/src/snippets/code/doc_src_wince-opengl.qdoc
new file mode 100644
index 0000000000..db2bfaa012
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_wince-opengl.qdoc
@@ -0,0 +1,3 @@
+//! [0]
+configure -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005 -opengl-es-cl
+//! [0]
diff --git a/doc/src/snippets/code/src.gui.text.qtextdocumentwriter.cpp b/doc/src/snippets/code/src.gui.text.qtextdocumentwriter.cpp
new file mode 100644
index 0000000000..3f206ea2b6
--- /dev/null
+++ b/doc/src/snippets/code/src.gui.text.qtextdocumentwriter.cpp
@@ -0,0 +1,5 @@
+//! [0]
+        QTextDocumentWriter writer;
+        writer.setFormat("odf"); // same as writer.setFormat("ODF");
+//! [0]
+
diff --git a/doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp b/doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp
new file mode 100644
index 0000000000..c9b3b7c986
--- /dev/null
+++ b/doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp
@@ -0,0 +1,24 @@
+{
+//! [0]
+    QDBusPendingCall async = iface->asyncCall("RemoteMethod", value1, value2);
+    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(async, this);
+
+    QObject::connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
+                     this, SLOT(callFinishedSlot(QDBusPendingCallWatcher*)));
+//! [0]
+
+}
+
+//! [1]
+void MyClass::callFinishedSlot(QDBusPendingCallWatcher *call)
+{
+    QDBusPendingReply<QString, QByteArray> reply = *call;
+    if (reply.isError()) {
+        showError();
+    } else {
+        QString text = reply.argumentAt<0>();
+        QByteArray data = reply.argumentAt<1>();
+        showReply(text, data);
+    }
+}
+//! [1]
diff --git a/doc/src/snippets/code/src.qdbus.qdbuspendingreply.cpp b/doc/src/snippets/code/src.qdbus.qdbuspendingreply.cpp
new file mode 100644
index 0000000000..49363a8136
--- /dev/null
+++ b/doc/src/snippets/code/src.qdbus.qdbuspendingreply.cpp
@@ -0,0 +1,23 @@
+{
+//! [0]
+    QDBusPendingReply<QString> reply = interface->asyncCall("RemoteMethod");
+    reply.waitForFinished();
+    if (reply.isError())
+        // call failed. Show an error condition.
+        showError(reply.error());
+    else
+        // use the returned value
+        useValue(reply.value());
+//! [0]
+
+//! [2]
+    QDBusPendingReply<bool, QString> reply = interface->asyncCall("RemoteMethod");
+    reply.waitForFinished();
+    if (!reply.isError()) {
+        if (reply.argumentAt<0>())
+            showSuccess(reply.argumentAt<1>());
+        else
+            showFailure(reply.argumentAt<1>());
+    }
+//! [2]
+}
diff --git a/doc/src/snippets/code/src.scripttools.qscriptenginedebugger.cpp b/doc/src/snippets/code/src.scripttools.qscriptenginedebugger.cpp
new file mode 100644
index 0000000000..f81611c306
--- /dev/null
+++ b/doc/src/snippets/code/src.scripttools.qscriptenginedebugger.cpp
@@ -0,0 +1,9 @@
+//! [0]
+    QScriptEngine engine;
+    QScriptEngineDebugger debugger;
+    debugger.attachTo(&engine);
+//! [0]
+
+//! [1]
+    engine.evaluate("debugger");
+//! [1]
diff --git a/doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp b/doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp
new file mode 100644
index 0000000000..f04cd29151
--- /dev/null
+++ b/doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp
@@ -0,0 +1,35 @@
+
+void wrapInFunction()
+{
+
+//! [0]
+    view->page()->history();
+//! [0]
+
+
+//! [1]
+    view->page()->settings();
+//! [1]
+
+
+//! [2]
+    view->triggerAction(QWebPage::Copy);
+//! [2]
+
+
+//! [3]
+    view->page()->triggerPageAction(QWebPage::Stop);
+//! [3]
+
+
+//! [4]
+    view->page()->triggerPageAction(QWebPage::GoBack);
+//! [4]
+
+
+//! [5]
+    view->page()->triggerPageAction(QWebPage::GoForward);
+//! [5]
+
+}
+
diff --git a/doc/src/snippets/code/src_activeqt_container_qaxbase.cpp b/doc/src/snippets/code/src_activeqt_container_qaxbase.cpp
new file mode 100644
index 0000000000..94b0da83fc
--- /dev/null
+++ b/doc/src/snippets/code/src_activeqt_container_qaxbase.cpp
@@ -0,0 +1,159 @@
+//! [0]
+connect(buttonBack, SIGNAL(clicked()), webBrowser, SLOT(GoBack()));
+//! [0]
+
+
+//! [1]
+activeX->setProperty("text", "some text");
+int value = activeX->property("value");
+//! [1]
+
+
+//! [2]
+webBrowser->dynamicCall("GoHome()");
+//! [2]
+
+
+//! [3]
+connect(webBrowser, SIGNAL(TitleChanged(QString)),
+	this, SLOT(setCaption(QString)));
+//! [3]
+
+
+//! [4]
+dispinterface IControl
+{
+properties:
+    [id(1)] BSTR text;
+    [id(2)] IFontDisp *font;
+
+methods:
+    [id(6)] void showColumn([in] int i);
+    [id(3)] bool addColumn([in] BSTR t);
+    [id(4)] int fillList([in, out] SAFEARRAY(VARIANT) *list);
+    [id(5)] IDispatch *item([in] int i);
+};
+//! [4]
+
+
+//! [5]
+QAxObject object("<CLSID>");
+
+QString text = object.property("text").toString();
+object.setProperty("font", QFont("Times New Roman", 12));
+
+connect(this, SIGNAL(clicked(int)), &object, SLOT(showColumn(int)));
+bool ok = object.dynamicCall("addColumn(const QString&)", "Column 1").toBool();
+
+QList<QVariant> varlist;
+QList<QVariant> parameters;
+parameters << QVariant(varlist);
+int n = object.dynamicCall("fillList(QList<QVariant>&)", parameters).toInt();
+
+QAxObject *item = object.querySubItem("item(int)", 5);
+//! [5]
+
+
+//! [6]
+IUnknown *iface = 0;
+activeX->queryInterface(IID_IUnknown, (void**)&iface);
+if (iface) {
+    // use the interface
+    iface->Release();
+}
+//! [6]
+
+
+//! [7]
+ctrl->setControl("{8E27C92B-1264-101C-8A2F-040224009C02}");
+//! [7]
+
+
+//! [8]
+ctrl->setControl("MSCal.Calendar");
+//! [8]
+
+
+//! [9]
+ctrl->setControl("Calendar Control 9.0");
+//! [9]
+
+
+//! [10]
+ctrl->setControl("c:/files/file.doc");
+//! [10]
+
+
+//! [11]
+<domain/username>:<password>@server/{8E27C92B-1264-101C-8A2F-040224009C02}
+//! [11]
+
+
+//! [12]
+{8E27C92B-1264-101C-8A2F-040224009C02}:<LicenseKey>
+//! [12]
+
+
+//! [13]
+{8E27C92B-1264-101C-8A2F-040224009C02}&
+//! [13]
+
+
+//! [14]
+ctrl->setControl("DOMAIN/user:password@server/{8E27C92B-1264-101C-8A2F-040224009C02}:LicenseKey");
+//! [14]
+
+
+//! [15]
+activeX->dynamicCall("Navigate(const QString&)", "qtsoftware.com");
+//! [15]
+
+
+//! [16]
+activeX->dynamicCall("Navigate(\"qtsoftware.com\")");
+//! [16]
+
+
+//! [17]
+activeX->dynamicCall("Value", 5);
+QString text = activeX->dynamicCall("Text").toString();
+//! [17]
+
+
+//! [18]
+IWebBrowser2 *webBrowser = 0;
+activeX->queryInterface(IID_IWebBrowser2, (void **)&webBrowser);
+if (webBrowser) {
+    webBrowser->Navigate2(pvarURL);
+    webBrowser->Release();
+}
+//! [18]
+
+
+//! [19]
+QAxWidget outlook("Outlook.Application");
+QAxObject *session = outlook.querySubObject("Session");
+if (session) {
+    QAxObject *defFolder = session->querySubObject(
+			    "GetDefaultFolder(OlDefaultFolders)",
+			    "olFolderContacts");
+    //...
+}
+//! [19]
+
+
+//! [20]
+void Receiver::slot(const QString &name, int argc, void *argv)
+{
+    VARIANTARG *params = (VARIANTARG*)argv;
+    if (name.startsWith("BeforeNavigate2(")) {
+	IDispatch *pDisp = params[argc-1].pdispVal;
+	VARIANTARG URL = *params[argc-2].pvarVal;
+	VARIANTARG Flags = *params[argc-3].pvarVal;
+	VARIANTARG TargetFrameName = *params[argc-4].pvarVal;
+	VARIANTARG PostData = *params[argc-5].pvarVal;
+	VARIANTARG Headers = *params[argc-6].pvarVal;
+	bool *Cancel = params[argc-7].pboolVal;
+    }
+}
+//! [20]
diff --git a/doc/src/snippets/code/src_activeqt_container_qaxscript.cpp b/doc/src/snippets/code/src_activeqt_container_qaxscript.cpp
new file mode 100644
index 0000000000..07fca1ec7f
--- /dev/null
+++ b/doc/src/snippets/code/src_activeqt_container_qaxscript.cpp
@@ -0,0 +1,18 @@
+//! [0]
+function setNumber(number)
+{
+    n = number;
+}
+//! [0]
+
+
+//! [1]
+QValueList args;
+args << 5;
+script->call("setNumber(const QVariant&)", args);
+//! [1]
+
+
+//! [2]
+script->call("setNumber(5)");
+//! [2]
diff --git a/doc/src/snippets/code/src_activeqt_control_qaxbindable.cpp b/doc/src/snippets/code/src_activeqt_control_qaxbindable.cpp
new file mode 100644
index 0000000000..c296789b68
--- /dev/null
+++ b/doc/src/snippets/code/src_activeqt_control_qaxbindable.cpp
@@ -0,0 +1,60 @@
+//! [0]
+class MyActiveX : public QWidget, public QAxBindable
+{
+    Q_OBJECT
+    Q_PROPERTY(int value READ value WRITE setValue)
+
+public:
+    MyActiveX(QWidget *parent = 0);
+    ...
+
+    int value() const;
+    void setValue(int);
+};
+//! [0]
+
+
+//! [1]
+void MyActiveQt::setText(const QString &text)
+{
+    if (!requestPropertyChange("text"))
+        return;
+
+    // update property
+
+    propertyChanged("text");
+}
+//! [1]
+
+
+//! [2]
+long AxImpl::queryInterface(const QUuid &iid, void **iface)
+{
+    *iface = 0;
+    if (iid == IID_ISomeCOMInterface)
+        *iface = (ISomeCOMInterface*)this;
+    else
+        return E_NOINTERFACE;
+
+    AddRef();
+    return S_OK;
+}
+//! [2]
+
+
+//! [3]
+HRESULT AxImpl::QueryInterface(REFIID iid, void **iface)
+{
+    return controllingUnknown()->QueryInterface(iid, iface);
+}
+
+ulong AxImpl::AddRef()
+{
+    return controllingUnknown()->AddRef();
+}
+
+ulong AxImpl::Release()
+{
+    return controllingUnknown()->Release();
+}
+//! [3]
diff --git a/doc/src/snippets/code/src_activeqt_control_qaxfactory.cpp b/doc/src/snippets/code/src_activeqt_control_qaxfactory.cpp
new file mode 100644
index 0000000000..6eca43402d
--- /dev/null
+++ b/doc/src/snippets/code/src_activeqt_control_qaxfactory.cpp
@@ -0,0 +1,155 @@
+//! [0]
+QStringList ActiveQtFactory::featureList() const
+{
+    QStringList list;
+    list << "ActiveX1";
+    list << "ActiveX2";
+    return list;
+}
+
+QObject *ActiveQtFactory::createObject(const QString &key)
+{
+    if (key == "ActiveX1")
+        return new ActiveX1(parent);
+    if (key == "ActiveX2")
+        return new ActiveX2(parent);
+    return 0;
+}
+
+const QMetaObject *ActiveQtFactory::metaObject(const QString &key) const
+{
+    if (key == "ActiveX1")
+        return &ActiveX1::staticMetaObject;
+    if (key == "ActiveX2")
+        return &ActiveX2::staticMetaObject;
+}
+
+QUuid ActiveQtFactory::classID(const QString &key) const
+{
+    if (key == "ActiveX1")
+        return "{01234567-89AB-CDEF-0123-456789ABCDEF}";
+    ...
+    return QUuid();
+}
+
+QUuid ActiveQtFactory::interfaceID(const QString &key) const
+{
+    if (key == "ActiveX1")
+        return "{01234567-89AB-CDEF-0123-456789ABCDEF}";
+    ...
+    return QUuid();
+}
+
+QUuid ActiveQtFactory::eventsID(const QString &key) const
+{
+    if (key == "ActiveX1")
+        return "{01234567-89AB-CDEF-0123-456789ABCDEF}";
+    ...
+    return QUuid();
+}
+
+QAXFACTORY_EXPORT(
+    ActiveQtFactory,			      // factory class
+    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // type library ID
+    "{01234567-89AB-CDEF-0123-456789ABCDEF}"  // application ID
+)
+//! [0]
+
+
+//! [1]
+QAXFACTORY_BEGIN(
+    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // type library ID
+    "{01234567-89AB-CDEF-0123-456789ABCDEF}"  // application ID
+)
+    QAXCLASS(Class1)
+    QAXCLASS(Class2)
+QAXFACTORY_END()
+//! [1]
+
+
+//! [2]
+#include <qapplication.h>
+#include <qaxfactory.h>
+
+#include "theactivex.h"
+
+QAXFACTORY_DEFAULT(
+    TheActiveX,				  // widget class
+    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // class ID
+    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // interface ID
+    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // event interface ID
+    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // type library ID
+    "{01234567-89AB-CDEF-0123-456789ABCDEF}"  // application ID
+)
+//! [2]
+
+
+//! [3]
+settings->setValue("/CLSID/" + classID(key)
+                   + "/Implemented Categories/"
+                   + "/{00000000-0000-0000-000000000000}/.",
+                   QString());
+//! [3]
+
+
+//! [4]
+settings->remove("/CLSID/" + classID(key)
+                 + "/Implemented Categories"
+                 + "/{00000000-0000-0000-000000000000}/.");
+//! [4]
+
+
+//! [5]
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    if (!QAxFactory::isServer()) {
+        // initialize for stand-alone execution
+    }
+    return app.exec();
+}
+//! [5]
+
+
+//! [6]
+if (QAxFactory::isServer()) {
+    QAxFactory::stopServer();
+    QAxFactory::startServer(QAxFactory::SingleInstance);
+}
+//! [6]
+
+
+//! [7]
+#include <qaxfactory.h>
+
+#include "theactivex.h"
+
+QAXFACTORY_DEFAULT(
+    TheActiveX,				  // widget class
+    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // class ID
+    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // interface ID
+    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // event interface ID
+    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // type library ID
+    "{01234567-89AB-CDEF-0123-456789ABCDEF}"  // application ID
+)
+//! [7]
+
+
+//! [8]
+QAXFACTORY_EXPORT(
+    MyFactory,			              // factory class
+    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // type library ID
+    "{01234567-89AB-CDEF-0123-456789ABCDEF}"  // application ID
+)
+//! [8]
+
+
+//! [9]
+QAXFACTORY_BEGIN(
+    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // type library ID
+    "{01234567-89AB-CDEF-0123-456789ABCDEF}"  // application ID
+)
+    QAXCLASS(Class1)
+    QAXCLASS(Class2)
+QAXFACTORY_END()
+//! [9]
diff --git a/doc/src/snippets/code/src_corelib_codecs_qtextcodec.cpp b/doc/src/snippets/code/src_corelib_codecs_qtextcodec.cpp
new file mode 100644
index 0000000000..1dfd325bf4
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_codecs_qtextcodec.cpp
@@ -0,0 +1,34 @@
+//! [0]
+QByteArray encodedString = "...";
+QTextCodec *codec = QTextCodec::codecForName("KOI8-R");
+QString string = codec->toUnicode(encodedString);
+//! [0]
+
+
+//! [1]
+QString string = "...";
+QTextCodec *codec = QTextCodec::codecForName("KOI8-R");
+QByteArray encodedString = codec->fromUnicode(string);
+//! [1]
+
+
+//! [2]
+QTextCodec *codec = QTextCodec::codecForName("Shift-JIS");
+QTextDecoder *decoder = codec->makeDecoder();
+
+QString string;
+while (new_data_available()) {
+    QByteArray chunk = get_new_data();
+    string += decoder->toUnicode(chunk);
+}
+//! [2]
+
+
+//! [3]
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QTextCodec::setCodecForTr(QTextCodec::codecForName("eucKR"));
+    ...
+}
+//! [3]
diff --git a/doc/src/snippets/code/src_corelib_codecs_qtextcodecplugin.cpp b/doc/src/snippets/code/src_corelib_codecs_qtextcodecplugin.cpp
new file mode 100644
index 0000000000..a6870b8026
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_codecs_qtextcodecplugin.cpp
@@ -0,0 +1,16 @@
+//! [0]
+QList<QByteArray> MyCodecPlugin::names() const
+{
+    return QList<QByteArray> << "IBM01140" << "hp15-tw";
+}
+
+QTextCodec *MyCodecPlugin::createForName(const QByteArray &name)
+{
+    if (name == "IBM01140") {
+        return new Ibm01140Codec;
+    } else if (name == "hp15-tw") {
+        return new Hp15TwCodec;
+    }
+    return 0;
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qfuture.cpp b/doc/src/snippets/code/src_corelib_concurrent_qfuture.cpp
new file mode 100644
index 0000000000..24fc791cbe
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_concurrent_qfuture.cpp
@@ -0,0 +1,24 @@
+//! [0]
+QFuture<QString> future = ...;
+
+QFuture<QString>::const_iterator i;
+for (i = future.constBegin(); i != future.constEnd(); ++i)
+    cout << *i << endl;
+//! [0]
+
+
+//! [1]
+QFuture<QString> future;
+...
+QFutureIterator<QString> i(future);
+while (i.hasNext())
+    qDebug() << i.next();
+//! [1]
+
+
+//! [2]
+QFutureIterator<QString> i(future);
+i.toBack();
+while (i.hasPrevious())
+    qDebug() << i.previous();
+//! [2]
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qfuturesynchronizer.cpp b/doc/src/snippets/code/src_corelib_concurrent_qfuturesynchronizer.cpp
new file mode 100644
index 0000000000..a50a99e86b
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_concurrent_qfuturesynchronizer.cpp
@@ -0,0 +1,13 @@
+//! [0]
+void someFunction()
+{
+    QFutureSynchronizer<void> synchronizer;
+
+    ...
+
+    synchronizer.addFuture(QtConcurrent::run(anotherFunction));
+    synchronizer.addFuture(QtConcurrent::map(list, mapFunction));
+
+    return; // QFutureSynchronizer waits for all futures to finish
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qfuturewatcher.cpp b/doc/src/snippets/code/src_corelib_concurrent_qfuturewatcher.cpp
new file mode 100644
index 0000000000..e1f06ccc2c
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_concurrent_qfuturewatcher.cpp
@@ -0,0 +1,10 @@
+//! [0]
+// Instantiate the objects and connect to the finished signal.
+MyClass myObject;
+QFutureWatcher<int> watcher;
+connect(&watcher, SIGNAL(finished()), &myObject, SLOT(handleFinished()));
+
+// Start the computation.
+QFuture<int> future = QtConcurrent::run(...);
+watcher.setFuture(future);
+//! [0]
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentexception.cpp b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentexception.cpp
new file mode 100644
index 0000000000..8b4d10acb8
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentexception.cpp
@@ -0,0 +1,35 @@
+//! [0]
+
+class MyException : public QtConcurrent::Exception
+{
+public:
+    void raise() const { throw *this; }
+    Exception *clone() const { return new MyException(*this); }
+};
+
+//! [0]
+
+
+//! [1]
+
+try  {
+    QtConcurrent::blockingMap(list, throwFunction); // throwFunction throws MyException
+} catch (MyException &e) {
+    // handle exception
+}
+
+//! [1]
+
+
+//! [2]
+
+void MyException::raise() const { throw *this; }
+
+//! [2]
+
+
+//! [3]
+
+MyException *MyException::clone() const { return new MyException(*this); }
+
+//! [3]
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentfilter.cpp b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentfilter.cpp
new file mode 100644
index 0000000000..d284d0245d
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentfilter.cpp
@@ -0,0 +1,131 @@
+//! [0]
+bool function(const T &t);
+//! [0]
+
+
+//! [1]
+bool allLowerCase(const QString &string)
+{
+    return string.lowered() == string;
+}
+
+QStringList strings = ...;
+QFuture<QString> lowerCaseStrings = QtConcurrent::filtered(strings, allLowerCase);
+//! [1]
+
+
+//! [2]
+QStringList strings = ...;
+QFuture<void> future = QtConcurrent::filter(strings, allLowerCase);
+//! [2]
+
+
+//! [3]
+V function(T &result, const U &intermediate)
+//! [3]
+
+
+//! [4]
+void addToDictionary(QSet<QString> &dictionary, const QString &string)
+{
+    dictionary.insert(string);
+}
+
+QStringList strings = ...;
+QFuture<QSet<QString> > dictionary = QtConcurrent::filteredReduced(strings, allLowerCase, addToDictionary);
+//! [4]
+
+
+//! [5]
+QStringList strings = ...;
+QFuture<QString> lowerCaseStrings = QtConcurrent::filtered(strings.constBegin(), strings.constEnd(), allLowerCase);
+
+// filter in-place only works on non-const iterators
+QFuture<void> future = QtConcurrent::filter(strings.begin(), strings.end(), allLowerCase);
+
+QFuture<QSet<QString> > dictionary = QtConcurrent::filteredReduced(strings.constBegin(), strings.constEnd(), allLowerCase, addToDictionary);
+//! [5]
+
+
+//! [6]
+QStringList strings = ...;
+
+// each call blocks until the entire operation is finished
+QStringList lowerCaseStrings = QtConcurrent::blockingFiltered(strings, allLowerCase);
+
+
+QtConcurrent::blockingFilter(strings, allLowerCase);
+
+QSet<QString> dictionary = QtConcurrent::blockingFilteredReduced(strings, allLowerCase, addToDictionary);
+//! [6]
+
+
+//! [7]
+// keep only images with an alpha channel
+QList<QImage> images = ...;
+QFuture<void> alphaImages = QtConcurrent::filter(strings, &QImage::hasAlphaChannel);
+
+// keep only gray scale images
+QList<QImage> images = ...;
+QFuture<QImage> grayscaleImages = QtConcurrent::filtered(images, &QImage::isGrayscale);
+
+// create a set of all printable characters
+QList<QChar> characters = ...;
+QFuture<QSet<QChar> > set = QtConcurrent::filteredReduced(characters, &QChar::isPrint, &QSet<QChar>::insert);
+//! [7]
+
+
+//! [8]
+// can mix normal functions and member functions with QtConcurrent::filteredReduced()
+
+// create a dictionary of all lower cased strings
+extern bool allLowerCase(const QString &string);
+QStringList strings = ...;
+QFuture<QSet<int> > averageWordLength = QtConcurrent::filteredReduced(strings, allLowerCase, QSet<QString>::insert);
+
+// create a collage of all gray scale images
+extern void addToCollage(QImage &collage, const QImage &grayscaleImage);
+QList<QImage> images = ...;
+QFuture<QImage> collage = QtConcurrent::filteredReduced(images, &QImage::isGrayscale, addToCollage);
+//! [8]
+
+
+//! [9]
+bool QString::contains(const QRegExp &regexp) const;
+//! [9]
+
+
+//! [10]
+boost::bind(&QString::contains, QRegExp("^\\S+$")); // matches strings without whitespace
+//! [10]
+
+
+//! [11]
+bool contains(const QString &string)
+//! [11]
+
+
+//! [12]
+QStringList strings = ...;
+boost::bind(static_cast<bool(QString::*)(const QRegExp&)>( &QString::contains ), QRegExp("..." ));
+//! [12]
+
+//! [13]
+struct StartsWith
+{
+    StartsWith(const QString &string)
+    : m_string(string) { }
+
+    typedef bool result_type;
+
+    bool operator()(const QString &testString)
+    {
+        return testString.startsWith(m_string);
+    }
+
+    QString m_string;
+};
+
+QList<QString> strings = ...;
+QFuture<QString> fooString = QtConcurrent::filtered(images, StartsWith(QLatin1String("Foo")));
+//! [13]
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp
new file mode 100644
index 0000000000..cbff31892c
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp
@@ -0,0 +1,144 @@
+//! [0]
+U function(const T &t);
+//! [0]
+
+
+//! [1]
+QImage scaled(const QImage &image)
+{
+    return image.scaled(100, 100);
+}
+
+QList<QImage> images = ...;
+QFuture<QImage> thumbnails = QtConcurrent::mapped(images, scaled);
+//! [1]
+
+
+//! [2]
+U function(T &t);
+//! [2]
+
+
+//! [3]
+void scale(QImage &image)
+{
+    image = image.scaled(100, 100);
+}
+
+QList<QImage> images = ...;
+QFuture<void> future = QtConcurrent::map(images, scale);
+//! [3]
+
+
+//! [4]
+V function(T &result, const U &intermediate)
+//! [4]
+
+
+//! [5]
+void addToCollage(QImage &collage, const QImage &thumbnail)
+{
+    QPainter p(&collage);
+    static QPoint offset = QPoint(0, 0);
+    p.drawImage(offset, thumbnail);
+    offset += ...;
+}
+
+QList<QImage> images = ...;
+QFuture<QImage> collage = QtConcurrent::mappedReduced(images, scaled, addToCollage);
+//! [5]
+
+
+//! [6]
+QList<QImage> images = ...;
+
+QFuture<QImage> thumbnails = QtConcurrent::mapped(images.constBegin(), images.constEnd(), scaled);
+
+// map in-place only works on non-const iterators
+QFuture<void> future = QtConcurrent::map(images.begin(), images.end(), scale);
+
+QFuture<QImage> collage = QtConcurrent::mappedReduced(images.constBegin(), images.constEnd(), scaled, addToCollage);
+//! [6]
+
+
+//! [7]
+QList<QImage> images = ...;
+
+// each call blocks until the entire operation is finished
+QList<QImage> future = QtConcurrent::blockingMapped(images, scaled);
+
+QtConcurrent::blockingMap(images, scale);
+
+QImage collage = QtConcurrent::blockingMappedReduced(images, scaled, addToCollage);
+//! [7]
+
+
+//! [8]
+// squeeze all strings in a QStringList
+QStringList strings = ...;
+QFuture<void> squeezedStrings = QtConcurrent::map(strings, &QString::squeeze);
+
+// swap the rgb values of all pixels on a list of images
+QList<QImage> images = ...;
+QFuture<QImage> bgrImages = QtConcurrent::mapped(images, &QImage::rgbSwapped);
+
+// create a set of the lengths of all strings in a list
+QStringList strings = ...;
+QFuture<QSet<int> > wordLengths = QtConcurrent::mappedReduced(string, &QString::length, &QSet<int>::insert);
+//! [8]
+
+
+//! [9]
+// can mix normal functions and member functions with QtConcurrent::mappedReduced()
+
+// compute the average length of a list of strings
+extern void computeAverage(int &average, int length);
+QStringList strings = ...;
+QFuture<int> averageWordLength = QtConcurrent::mappedReduced(strings, &QString::length, computeAverage);
+
+// create a set of the color distribution of all images in a list
+extern int colorDistribution(const QImage &string);
+QList<QImage> images = ...;
+QFuture<QSet<int> > totalColorDistribution = QtConcurrent::mappedReduced(images, colorDistribution, QSet<int>::insert);
+//! [9]
+
+
+//! [10]
+QImage QImage::scaledToWidth(int width, Qt::TransformationMode) const;
+//! [10]
+
+
+//! [11]
+boost::bind(&QImage::scaledToWidth, 100, Qt::SmoothTransformation)
+//! [11]
+
+
+//! [12]
+QImage scaledToWith(const QImage &image)
+//! [12]
+
+
+//! [13]
+QList<QImage> images = ...;
+QFuture<QImage> thumbnails = QtConcurrent::mapped(images, boost::bind(&QImage::scaledToWidth, 100 Qt::SmoothTransformation));
+//! [13]
+
+//! [14]
+struct Scaled
+{
+    Scaled(int size)
+    : m_size(size) { }
+
+    typedef QImage result_type;
+
+    QImage operator()(const QImage &image)
+    {
+        return image.scaled(m_size, m_size);
+    }
+
+    int m_size;
+};
+
+QList<QImage> images = ...;
+QFuture<QImage> thumbnails = QtConcurrent::mapped(images, Scaled(100));
+//! [14]
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp
new file mode 100644
index 0000000000..99583ba259
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp
@@ -0,0 +1,60 @@
+//! [0]
+extern void aFunction();
+QFuture<void> future = QtConcurrent::run(aFunction);
+//! [0]
+
+
+//! [1]
+extern void aFunctionWithArguments(int arg1, double arg2, const QString &string);
+
+int integer = ...;
+double floatingPoint = ...;
+QString string = ...;
+
+QFuture<void> future = QtConcurrent::run(aFunctionWithArguments, integer, floatingPoint, string);
+//! [1]
+
+
+//! [2]
+extern QString functionReturningAString();
+QFuture<QString> future = QtConcurrent::run(functionReturningAString);
+...
+QString result = future.result();
+//! [2]
+
+
+//! [3]
+extern QString someFunction(const QByteArray &input);
+
+QByteArray bytearray = ...;
+
+QFuture<QString> future = QtConcurrent::run(someFunction, bytearray);
+...
+QString result = future.result();
+//! [3]
+
+
+//! [4]
+// call 'QStringList QString::split(const QString &sep, SplitBehavior behavior, Qt::CaseSensitivity cs) const' in a separate thread
+QString string = ...;
+QFuture<QStringList> future = QtConcurrent::run(string, &QString::split, QString(", "), QString::KeepEmptyParts, Qt::CaseSensitive);
+...
+QStringList result = future.result();
+//! [4]
+
+
+//! [5]
+// call 'void QImage::invertPixels(InvertMode mode)' in a separate thread
+QImage image = ...;
+QFuture<void> future = QtConcurrent::run(image, &QImage::invertPixels, QImage::InvertRgba);
+...
+future.waitForFinished();
+// At this point, the pixels in 'image' have been inverted
+//! [5]
+
+
+//! [6]
+void someFunction(int arg1, double arg2);
+QFuture<void> future = QtConcurrent::run(boost::bind(someFunction, 1, 2.0));
+...
+//! [6]
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qthreadpool.cpp b/doc/src/snippets/code/src_corelib_concurrent_qthreadpool.cpp
new file mode 100644
index 0000000000..327a00ffa8
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_concurrent_qthreadpool.cpp
@@ -0,0 +1,13 @@
+//! [0]
+class HelloWorldTask : public QRunnable
+{
+    void run()
+    {
+        qDebug() << "Hello world from thread" << QThread::currentThread();
+    }
+}
+
+HelloWorldTask *hello = new HelloWorldTask();
+// QThreadPool takes ownership and deletes 'hello' automatically
+QThreadPool::globalInstance()->start(hello);
+//! [0]
diff --git a/doc/src/snippets/code/src_corelib_global_qglobal.cpp b/doc/src/snippets/code/src_corelib_global_qglobal.cpp
new file mode 100644
index 0000000000..72663e970a
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_global_qglobal.cpp
@@ -0,0 +1,458 @@
+//! [0]
+label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
+//! [0]
+
+
+//! [1]
+class MyClass
+{
+public:
+    enum Option {
+        NoOptions = 0x0,
+        ShowTabs = 0x1,
+        ShowAll = 0x2,
+        SqueezeBlank = 0x4
+    };
+    Q_DECLARE_FLAGS(Options, Option)
+    ...
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(MyClass::Options)
+//! [1]
+
+//! [meta-object flags]
+Q_FLAGS(Options)
+//! [meta-object flags]
+
+//! [2]
+typedef QFlags<Enum> Flags;
+//! [2]
+
+
+//! [3]
+int myValue = 10;
+int minValue = 2;
+int maxValue = 6;
+
+int boundedValue = qBound(minValue, myValue, maxValue);
+// boundedValue == 6
+//! [3]
+
+
+//! [4]
+if (!driver()->isOpen() || driver()->isOpenError()) {
+    qWarning("QSqlQuery::exec: database not open");
+    return false;
+}
+//! [4]
+
+
+//! [5]
+qint64 value = Q_INT64_C(932838457459459);
+//! [5]
+
+
+//! [6]
+quint64 value = Q_UINT64_C(932838457459459);
+//! [6]
+
+
+//! [7]
+void myMsgHandler(QtMsgType, const char *);
+//! [7]
+
+
+//! [8]
+qint64 value = Q_INT64_C(932838457459459);
+//! [8]
+
+
+//! [9]
+quint64 value = Q_UINT64_C(932838457459459);
+//! [9]
+
+
+//! [10]
+int absoluteValue;
+int myValue = -4;
+
+absoluteValue = qAbs(myValue);
+// absoluteValue == 4
+//! [10]
+
+
+//! [11]
+qreal valueA = 2.3;
+qreal valueB = 2.7;
+
+int roundedValueA = qRound(valueA);
+// roundedValueA = 2
+int roundedValueB = qRound(valueB);
+// roundedValueB = 3
+//! [11]
+
+
+//! [12]
+qreal valueA = 42949672960.3;
+qreal valueB = 42949672960.7;
+
+int roundedValueA = qRound(valueA);
+// roundedValueA = 42949672960
+int roundedValueB = qRound(valueB);
+// roundedValueB = 42949672961
+//! [12]
+
+
+//! [13]
+int myValue = 6;
+int yourValue = 4;
+
+int minValue = qMin(myValue, yourValue);
+// minValue == yourValue
+//! [13]
+
+
+//! [14]
+int myValue = 6;
+int yourValue = 4;
+
+int maxValue = qMax(myValue, yourValue);
+// maxValue == myValue
+//! [14]
+
+
+//! [15]
+int myValue = 10;
+int minValue = 2;
+int maxValue = 6;
+
+int boundedValue = qBound(minValue, myValue, maxValue);
+// boundedValue == 6
+//! [15]
+
+
+//! [16]
+#if QT_VERSION >= 0x040100
+    QIcon icon = style()->standardIcon(QStyle::SP_TrashIcon);
+#else
+    QPixmap pixmap = style()->standardPixmap(QStyle::SP_TrashIcon);
+    QIcon icon(pixmap);
+#endif
+//! [16]
+
+
+//! [17]
+// File: div.cpp
+
+#include <QtGlobal>
+
+int divide(int a, int b)
+{
+    Q_ASSERT(b != 0);
+    return a / b;
+}
+//! [17]
+
+
+//! [18]
+ASSERT: "b == 0" in file div.cpp, line 7
+//! [18]
+
+
+//! [19]
+// File: div.cpp
+
+#include <QtGlobal>
+
+int divide(int a, int b)
+{
+    Q_ASSERT_X(b != 0, "divide", "division by zero");
+    return a / b;
+}
+//! [19]
+
+
+//! [20]
+ASSERT failure in divide: "division by zero", file div.cpp, line 7
+//! [20]
+
+
+//! [21]
+int *a;
+
+Q_CHECK_PTR(a = new int[80]);   // WRONG!
+
+a = new (nothrow) int[80];      // Right
+Q_CHECK_PTR(a);
+//! [21]
+
+
+//! [22]
+template<typename TInputType>
+const TInputType &myMin(const TInputType &value1, const TInputType &value2)
+{
+    qDebug() << Q_FUNC_INFO << "was called with value1:" << value1 << "value2:" << value2;
+
+    if(value1 < value2)
+        return value1;
+    else
+        return value2;
+}
+//! [22]
+
+
+//! [23]
+#include <qapplication.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+void myMessageOutput(QtMsgType type, const char *msg)
+{
+    switch (type) {
+    case QtDebugMsg:
+        fprintf(stderr, "Debug: %s\n", msg);
+        break;
+    case QtWarningMsg:
+        fprintf(stderr, "Warning: %s\n", msg);
+        break;
+    case QtCriticalMsg:
+        fprintf(stderr, "Critical: %s\n", msg);
+        break;
+    case QtFatalMsg:
+        fprintf(stderr, "Fatal: %s\n", msg);
+        abort();
+    }
+}
+
+int main(int argc, char **argv)
+{
+    qInstallMsgHandler(myMessageOutput);
+    QApplication app(argc, argv);
+    ...
+    return app.exec();
+}
+//! [23]
+
+
+//! [24]
+qDebug("Items in list: %d", myList.size());
+//! [24]
+
+
+//! [25]
+qDebug() << "Brush:" << myQBrush << "Other value:" << i;
+//! [25]
+
+
+//! [26]
+void f(int c)
+{
+    if (c > 200)
+        qWarning("f: bad argument, c == %d", c);
+}
+//! [26]
+
+
+//! [27]
+qWarning() << "Brush:" << myQBrush << "Other value:"
+<< i;
+//! [27]
+
+
+//! [28]
+void load(const QString &fileName)
+{
+    QFile file(fileName);
+    if (!file.exists())
+        qCritical("File '%s' does not exist!", qPrintable(fileName));
+}
+//! [28]
+
+
+//! [29]
+qCritical() << "Brush:" << myQBrush << "Other
+value:" << i;
+//! [29]
+
+
+//! [30]
+int divide(int a, int b)
+{
+    if (b == 0)                                // program error
+        qFatal("divide: cannot divide by zero");
+    return a / b;
+}
+//! [30]
+
+
+//! [31]
+forever {
+    ...
+}
+//! [31]
+
+
+//! [32]
+CONFIG += no_keywords
+//! [32]
+
+
+//! [33]
+CONFIG += no_keywords
+//! [33]
+
+
+//! [34]
+QString FriendlyConversation::greeting(int type)
+{
+static const char *greeting_strings[] = {
+    QT_TR_NOOP("Hello"),
+    QT_TR_NOOP("Goodbye")
+};
+return tr(greeting_strings[type]);
+}
+//! [34]
+
+
+//! [35]
+static const char *greeting_strings[] = {
+    QT_TRANSLATE_NOOP("FriendlyConversation", "Hello"),
+    QT_TRANSLATE_NOOP("FriendlyConversation", "Goodbye")
+};
+
+QString FriendlyConversation::greeting(int type)
+{
+    return tr(greeting_strings[type]);
+}
+
+QString global_greeting(int type)
+{
+    return qApp->translate("FriendlyConversation",
+           greeting_strings[type]);
+}
+//! [35]
+
+
+//! [36]
+
+static { const char *source; const char *comment; } greeting_strings[] =
+{
+    QT_TRANSLATE_NOOP3("FriendlyConversation", "Hello",
+                       "A really friendly hello"),
+    QT_TRANSLATE_NOOP3("FriendlyConversation", "Goodbye",
+                       "A really friendly goodbye")
+};
+
+QString FriendlyConversation::greeting(int type)
+{
+    return tr(greeting_strings[type].source,
+              greeting_strings[type].comment);
+}
+
+QString global_greeting(int type)
+{
+    return qApp->translate("FriendlyConversation",
+           greeting_strings[type].source,
+           greeting_strings[type].comment);
+}
+//! [36]
+
+
+//! [37]
+qWarning("%s: %s", qPrintable(key), qPrintable(value));
+//! [37]
+
+
+//! [38]
+struct Point2D
+{
+    int x;
+    int y;
+};
+
+Q_DECLARE_TYPEINFO(Point2D, Q_PRIMITIVE_TYPE);
+//! [38]
+
+
+//! [39]
+class Point2D
+{
+public:
+    Point2D() { data = new int[2]; }
+    Point2D(const Point2D &other) { ... }
+    ~Point2D() { delete[] data; }
+
+    Point2D &operator=(const Point2D &other) { ... }
+
+    int x() const { return data[0]; }
+    int y() const { return data[1]; }
+
+private:
+    int *data;
+};
+
+Q_DECLARE_TYPEINFO(Point2D, Q_MOVABLE_TYPE);
+//! [39]
+
+
+//! [40]
+#if Q_BYTE_ORDER == Q_BIG_ENDIAN
+...
+#endif
+
+or
+
+#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+...
+#endif
+
+//! [40]
+
+
+//! [41]
+
+#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+...
+#endif
+
+//! [41]
+
+
+//! [42]
+#if Q_BYTE_ORDER == Q_BIG_ENDIAN
+...
+#endif
+
+//! [42]
+
+//! [begin namespace macro]
+namespace QT_NAMESPACE {
+//! [begin namespace macro]
+
+//! [end namespace macro]
+}
+//! [end namespace macro]
+
+//! [43]
+class MyClass : public QObject
+{
+    
+  private:
+    Q_DISABLE_COPY(MyClass)
+};
+
+//! [43]
+
+//! [44]
+class MyClass : public QObject
+{
+    
+  private:
+     MyClass(const MyClass &);
+     MyClass &operator=(const MyClass &);
+};
+//! [44]
+
+//! [45]
+  QWidget w = QWidget();
+//! [45]
diff --git a/doc/src/snippets/code/src_corelib_io_qabstractfileengine.cpp b/doc/src/snippets/code/src_corelib_io_qabstractfileengine.cpp
new file mode 100644
index 0000000000..a7d7c7544c
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_io_qabstractfileengine.cpp
@@ -0,0 +1,80 @@
+//! [0]
+class ZipEngineHandler : public QAbstractFileEngineHandler
+{
+public:
+    QAbstractFileEngine *create(const QString &fileName) const;
+};
+
+QAbstractFileEngine *ZipEngineHandler::create(const QString &fileName) const
+{
+    // ZipEngineHandler returns a ZipEngine for all .zip files
+    return fileName.toLower().endsWith(".zip") ? new ZipEngine(fileName) : 0;
+}
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    ZipEngineHandler engine;
+
+    MainWindow window;
+    window.show();
+
+    return app.exec();
+}
+//! [0]
+
+
+//! [1]
+QAbstractSocketEngine *ZipEngineHandler::create(const QString &fileName) const
+{
+    // ZipEngineHandler returns a ZipEngine for all .zip files
+    return fileName.toLower().endsWith(".zip") ? new ZipEngine(fileName) : 0;
+}
+//! [1]
+
+
+//! [2]
+QAbstractFileEngineIterator *
+CustomFileEngine::beginEntryList(QDir::Filters filters, const QStringList &filterNames)
+{
+    return new CustomFileEngineIterator(filters, filterNames);
+}
+//! [2]
+
+
+//! [3]
+class CustomIterator : public QAbstractFileEngineIterator
+{
+public:
+    CustomIterator(const QStringList &nameFilters, QDir::Filters filters)
+        : QAbstractFileEngineIterator(nameFilters, filters), index(0)
+    {
+        // In a real iterator, these entries are fetched from the
+        // file system based on the value of path().
+        entries << "entry1" << "entry2" << "entry3";
+    }
+
+    bool hasNext() const
+    {
+        return index < entries.size() - 1;
+    }
+
+    QString next()
+    {
+       if (!hasNext())
+           return QString();
+       ++index;
+       return currentFilePath();
+    }
+
+    QString currentFileName()
+    {
+        return entries.at(index);
+    }
+
+private:
+    QStringList entries;
+    int index;
+};
+//! [3]
diff --git a/doc/src/snippets/code/src_corelib_io_qdatastream.cpp b/doc/src/snippets/code/src_corelib_io_qdatastream.cpp
new file mode 100644
index 0000000000..fd6d56470c
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_io_qdatastream.cpp
@@ -0,0 +1,81 @@
+void wrapInFunction()
+{
+
+//! [0]
+QFile file("file.dat");
+file.open(QIODevice::WriteOnly);
+QDataStream out(&file);   // we will serialize the data into the file
+out << "the answer is";   // serialize a string
+out << (qint32)42;        // serialize an integer
+//! [0]
+
+
+//! [1]
+QFile file("file.dat");
+file.open(QIODevice::ReadOnly);
+QDataStream in(&file);    // read the data serialized from the file
+QString str;
+qint32 a;
+in >> str >> a;           // extract "the answer is" and 42
+//! [1]
+
+
+//! [2]
+stream.setVersion(QDataStream::Qt_4_0);
+//! [2]
+
+
+//! [3]
+QFile file("file.xxx");
+file.open(QIODevice::WriteOnly);
+QDataStream out(&file);
+
+// Write a header with a "magic number" and a version
+out << (quint32)0xA0B0C0D0;
+out << (qint32)123;
+
+out.setVersion(QDataStream::Qt_4_0);
+
+// Write the data
+out << lots_of_interesting_data;
+//! [3]
+
+
+//! [4]
+QFile file("file.xxx");
+file.open(QIODevice::ReadOnly);
+QDataStream in(&file);
+
+// Read and check the header
+quint32 magic;
+in >> magic;
+if (magic != 0xA0B0C0D0)
+    return XXX_BAD_FILE_FORMAT;
+
+// Read the version
+qint32 version;
+in >> version;
+if (version < 100)
+    return XXX_BAD_FILE_TOO_OLD;
+if (version > 123)
+    return XXX_BAD_FILE_TOO_NEW;
+
+if (version <= 110)
+    in.setVersion(QDataStream::Qt_3_2);
+else
+    in.setVersion(QDataStream::Qt_4_0);
+
+// Read the data
+in >> lots_of_interesting_data;
+if (version >= 120)
+    in >> data_new_in_XXX_version_1_2;
+in >> other_interesting_data;
+//! [4]
+
+
+//! [5]
+QDataStream out(file);
+out.setVersion(QDataStream::Qt_4_0);
+//! [5]
+
+}
diff --git a/doc/src/snippets/code/src_corelib_io_qdir.cpp b/doc/src/snippets/code/src_corelib_io_qdir.cpp
new file mode 100644
index 0000000000..4af4d4b733
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_io_qdir.cpp
@@ -0,0 +1,135 @@
+
+void wrapInFunction()
+{
+
+//! [0]
+QDir("/home/user/Documents")
+QDir("C:/Documents and Settings")
+//! [0]
+
+
+//! [1]
+QDir("images/landscape.png")
+//! [1]
+
+
+//! [2]
+QDir("Documents/Letters/Applications").dirName() // "Applications"
+QDir().dirName()                                 // "."
+//! [2]
+
+
+//! [3]
+QDir directory("Documents/Letters");
+QString path = directory.filePath("contents.txt");
+QString absolutePath = directory.absoluteFilePath("contents.txt");
+//! [3]
+
+
+//! [4]
+QDir dir("example");
+if (!dir.exists())
+    qWarning("Cannot find the example directory");
+//! [4]
+
+
+//! [5]
+QDir dir = QDir::root();                 // "/"
+if (!dir.cd("tmp")) {                    // "/tmp"
+    qWarning("Cannot find the \"/tmp\" directory");
+} else {
+    QFile file(dir.filePath("ex1.txt")); // "/tmp/ex1.txt"
+    if (!file.open(QIODevice::ReadWrite))
+        qWarning("Cannot create the file %s", file.name());
+}
+//! [5]
+
+
+//! [6]
+QString bin = "/local/bin";         // where /local/bin is a symlink to /usr/bin
+QDir binDir(bin);
+QString canonicalBin = binDir.canonicalPath();
+// canonicalBin now equals "/usr/bin"
+
+QString ls = "/local/bin/ls";       // where ls is the executable "ls"
+QDir lsDir(ls);
+QString canonicalLs = lsDir.canonicalPath();
+// canonicalLS now equals "/usr/bin/ls".
+//! [6]
+
+
+//! [7]
+QDir dir("/home/bob");
+QString s;
+
+s = dir.relativeFilePath("images/file.jpg");     // s is "images/file.jpg"
+s = dir.relativeFilePath("/home/mary/file.txt"); // s is "../mary/file.txt"
+//! [7]
+
+
+//! [8]
+QDir::setSearchPaths("icons", QStringList(QDir::homePath() + "/images"));
+QDir::setSearchPaths("docs", QStringList(":/embeddedDocuments"));
+...
+QPixmap pixmap("icons:undo.png"); // will look for undo.png in QDir::homePath() + "/images"
+QFile file("docs:design.odf"); // will look in the :/embeddedDocuments resource path
+//! [8]
+
+
+//! [9]
+QDir dir("/tmp/root_link");
+dir = dir.canonicalPath();
+if (dir.isRoot())
+    qWarning("It is a root link");
+//! [9]
+
+
+//! [10]
+// The current directory is "/usr/local"
+QDir d1("/usr/local/bin");
+QDir d2("bin");
+if (d1 == d2)
+    qDebug("They're the same");
+//! [10]
+
+
+//! [11]
+// The current directory is "/usr/local"
+QDir d1("/usr/local/bin");
+d1.setFilter(QDir::Executable);
+QDir d2("bin");
+if (d1 != d2)
+    qDebug("They differ");
+//! [11]
+
+
+//! [12]
+C:/Documents and Settings/Username
+//! [12]
+
+
+//! [13]
+Q_INIT_RESOURCE(myapp);
+//! [13]
+
+
+//! [14]
+inline void initMyResource() { Q_INIT_RESOURCE(myapp); }
+
+namespace MyNamespace
+{
+    ...
+
+    void myFunction()
+    {
+        initMyResource();
+    }
+}
+//! [14]
+
+
+//! [15]
+Q_CLEANUP_RESOURCE(myapp);
+//! [15]
+
+}
diff --git a/doc/src/snippets/code/src_corelib_io_qdiriterator.cpp b/doc/src/snippets/code/src_corelib_io_qdiriterator.cpp
new file mode 100644
index 0000000000..2983a25813
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_io_qdiriterator.cpp
@@ -0,0 +1,12 @@
+//! [0]
+QDirIterator it("/etc", QDirIterator::Subdirectories);
+while (it.hasNext()) {
+    qDebug() << it.next();
+
+    // /etc/.
+    // /etc/..
+    // /etc/X11
+    // /etc/X11/fs
+    // ...
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_corelib_io_qfile.cpp b/doc/src/snippets/code/src_corelib_io_qfile.cpp
new file mode 100644
index 0000000000..84b8b4aec0
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_io_qfile.cpp
@@ -0,0 +1,35 @@
+//! [0]
+QFile file;
+QDir::setCurrent("/tmp");
+file.setFileName("readme.txt");
+QDir::setCurrent("/home");
+file.open(QIODevice::ReadOnly);      // opens "/home/readme.txt" under Unix
+//! [0]
+
+
+//! [1]
+QByteArray myEncoderFunc(const QString &fileName);
+//! [1]
+
+
+//! [2]
+QString myDecoderFunc(const QByteArray &localFileName);
+//! [2]
+
+
+//! [3]
+#include <stdio.h>
+
+void printError(const char* msg)
+{
+    QFile file;
+    file.open(stderr, QIODevice::WriteOnly);
+    file.write(msg, qstrlen(msg));        // write to stderr
+    file.close();
+}
+//! [3]
+
+
+//! [4]
+CONFIG += console
+//! [4]
diff --git a/doc/src/snippets/code/src_corelib_io_qfileinfo.cpp b/doc/src/snippets/code/src_corelib_io_qfileinfo.cpp
new file mode 100644
index 0000000000..2ab15ee1ec
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_io_qfileinfo.cpp
@@ -0,0 +1,106 @@
+
+//![newstuff]
+    QFileInfo fi("c:/temp/foo"); => fi.absoluteFilePath() => "C:/temp/foo"
+//![newstuff]
+
+//! [0]
+#ifdef Q_OS_UNIX
+
+QFileInfo info1("/home/bob/bin/untabify");
+info1.isSymLink();          // returns true
+info1.absoluteFilePath();   // returns "/home/bob/bin/untabify"
+info1.size();               // returns 56201
+info1.symLinkTarget();      // returns "/opt/pretty++/bin/untabify"
+
+QFileInfo info2(info1.symLinkTarget());
+info1.isSymLink();          // returns false
+info1.absoluteFilePath();   // returns "/opt/pretty++/bin/untabify"
+info1.size();               // returns 56201
+
+#endif
+//! [0]
+
+
+//! [1]
+#ifdef Q_OS_WIN
+
+QFileInfo info1("C:\\Documents and Settings\\Bob\\untabify.lnk");
+info1.isSymLink();          // returns true
+info1.absoluteFilePath();   // returns "C:/Documents and Settings/Bob/untabify.lnk"
+info1.size();               // returns 743
+info1.symLinkTarget();      // returns "C:/Pretty++/untabify"
+
+QFileInfo info2(info1.symLinkTarget());
+info1.isSymLink();          // returns false
+info1.absoluteFilePath();   // returns "C:/Pretty++/untabify"
+info1.size();               // returns 63942
+
+#endif
+//! [1]
+
+
+//! [2]
+QString absolute = "/local/bin";
+QString relative = "local/bin";
+QFileInfo absFile(absolute);
+QFileInfo relFile(relative);
+
+QDir::setCurrent(QDir::rootPath());
+// absFile and relFile now point to the same file
+
+QDir::setCurrent("/tmp");
+// absFile now points to "/local/bin",
+// while relFile points to "/tmp/local/bin"
+//! [2]
+
+
+//! [3]
+QFileInfo fi("/tmp/archive.tar.gz");
+QString name = fi.fileName();                // name = "archive.tar.gz"
+//! [3]
+
+
+//! [4]
+QFileInfo fi("/Applications/Safari.app");
+QString bundle = fi.bundleName();                // name = "Safari"
+//! [4]
+
+
+//! [5]
+QFileInfo fi("/tmp/archive.tar.gz");
+QString base = fi.baseName();  // base = "archive"
+//! [5]
+
+
+//! [6]
+QFileInfo fi("/tmp/archive.tar.gz");
+QString base = fi.completeBaseName();  // base = "archive.tar"
+//! [6]
+
+
+//! [7]
+QFileInfo fi("/tmp/archive.tar.gz");
+QString ext = fi.completeSuffix();  // ext = "tar.gz"
+//! [7]
+
+
+//! [8]
+QFileInfo fi("/tmp/archive.tar.gz");
+QString ext = fi.suffix();  // ext = "gz"
+//! [8]
+
+
+//! [9]
+QFileInfo info(fileName);
+if (info.isSymLink())
+    fileName = info.symLinkTarget();
+//! [9]
+
+
+//! [10]
+QFileInfo fi("/tmp/archive.tar.gz");
+if (fi.permission(QFile::WriteUser | QFile::ReadGroup))
+    qWarning("I can change the file; my group can read the file");
+if (fi.permission(QFile::WriteGroup | QFile::WriteOther))
+    qWarning("The group or others can change the file");
+//! [10]
diff --git a/doc/src/snippets/code/src_corelib_io_qiodevice.cpp b/doc/src/snippets/code/src_corelib_io_qiodevice.cpp
new file mode 100644
index 0000000000..422ca11513
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_io_qiodevice.cpp
@@ -0,0 +1,59 @@
+//! [0]
+QProcess gzip;
+gzip.start("gzip", QStringList() << "-c");
+if (!gzip.waitForStarted())
+    return false;
+
+gzip.write("uncompressed data");
+
+QByteArray compressed;
+while (gzip.waitForReadyRead())
+    compressed += gzip.readAll();
+//! [0]
+
+
+//! [1]
+qint64 CustomDevice::bytesAvailable() const
+{
+    return buffer.size() + QIODevice::bytesAvailable();
+}
+//! [1]
+
+
+//! [2]
+QFile file("box.txt");
+if (file.open(QFile::ReadOnly)) {
+    char buf[1024];
+    qint64 lineLength = file.readLine(buf, sizeof(buf));
+    if (lineLength != -1) {
+        // the line is available in buf
+    }
+}
+//! [2]
+
+
+//! [3]
+bool CustomDevice::canReadLine() const
+{
+    return buffer.contains('\n') || QIODevice::canReadLine();
+}
+//! [3]
+
+
+//! [4]
+bool isExeFile(QFile *file)
+{
+    char buf[2];
+    if (file->peek(buf, sizeof(buf)) == sizeof(buf))
+        return (buf[0] == 'M' && buf[1] == 'Z');
+    return false;
+}
+//! [4]
+
+
+//! [5]
+bool isExeFile(QFile *file)
+{
+    return file->peek(2) == "MZ";
+}
+//! [5]
diff --git a/doc/src/snippets/code/src_corelib_io_qprocess.cpp b/doc/src/snippets/code/src_corelib_io_qprocess.cpp
new file mode 100644
index 0000000000..6eb8ccbb8f
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_io_qprocess.cpp
@@ -0,0 +1,94 @@
+
+void wrapInFunction()
+{
+
+//! [0]
+QProcess builder;
+builder.setProcessChannelMode(QProcess::MergedChannels);
+builder.start("make", QStringList() << "-j2");
+
+if (!builder.waitForFinished())
+    qDebug() << "Make failed:" << builder.errorString();
+else
+    qDebug() << "Make output:" << builder.readAll();
+//! [0]
+
+
+//! [1]
+QProcess more;
+more.start("more");
+more.write("Text to display");
+more.closeWriteChannel();
+// QProcess will emit readyRead() once "more" starts printing
+//! [1]
+
+
+//! [2]
+command1 | command2
+//! [2]
+
+
+//! [3]
+QProcess process1;
+QProcess process2;
+
+process1.setStandardOutputProcess(process2);
+
+process1.start("command1");
+process2.start("command2");
+//! [3]
+
+
+//! [4]
+class SandboxProcess : public QProcess
+{
+    ...
+ protected:
+     void setupChildProcess();
+    ...
+};
+
+void SandboxProcess::setupChildProcess()
+{
+    // Drop all privileges in the child process, and enter
+    // a chroot jail.
+#if defined Q_OS_UNIX
+    ::setgroups(0, 0);
+    ::chroot("/etc/safe");
+    ::chdir("/");
+    ::setgid(safeGid);
+    ::setuid(safeUid);
+    ::umask(0);
+#endif
+}
+
+//! [4]
+
+
+//! [5]
+QProcess process;
+process.start("del /s *.txt");
+// same as process.start("del", QStringList() << "/s" << "*.txt");
+...
+//! [5]
+
+
+//! [6]
+QProcess process;
+process.start("dir \"My Documents\"");
+//! [6]
+
+
+//! [7]
+QProcess process;
+process.start("dir \"\"\"My Documents\"\"\"");
+//! [7]
+
+
+//! [8]
+QStringList environment = QProcess::systemEnvironment();
+// environment = {"PATH=/usr/bin:/usr/local/bin",
+//                "USER=greg", "HOME=/home/greg"}
+//! [8]
+
+}
diff --git a/doc/src/snippets/code/src_corelib_io_qsettings.cpp b/doc/src/snippets/code/src_corelib_io_qsettings.cpp
new file mode 100644
index 0000000000..dfe666fd49
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_io_qsettings.cpp
@@ -0,0 +1,276 @@
+//! [0]
+QSettings settings("MySoft", "Star Runner");
+QColor color = settings.value("DataPump/bgcolor").value<QColor>();
+//! [0]
+
+
+//! [1]
+QSettings settings("MySoft", "Star Runner");
+QColor color = palette().background().color();
+settings.setValue("DataPump/bgcolor", color);
+//! [1]
+
+
+//! [2]
+QSettings settings("/home/petra/misc/myapp.ini",
+                   QSettings::IniFormat);
+//! [2]
+
+
+//! [3]
+QSettings settings("/Users/petra/misc/myapp.plist",
+                   QSettings::NativeFormat);
+//! [3]
+
+
+//! [4]
+QSettings settings("HKEY_CURRENT_USER\\Software\\Microsoft\\Office",
+                   QSettings::NativeFormat);
+//! [4]
+
+
+//! [5]
+settings.setValue("11.0/Outlook/Security/DontTrustInstalledFiles", 0);
+//! [5]
+
+
+//! [6]
+settings.setValue("HKEY_CURRENT_USER\\MySoft\\Star Runner\\Galaxy", "Milkyway");
+settings.setValue("HKEY_CURRENT_USER\\MySoft\\Star Runner\\Galaxy\\Sun", "OurStar");
+settings.value("HKEY_CURRENT_USER\\MySoft\\Star Runner\\Galaxy\\Default"); // returns "Milkyway"
+//! [6]
+
+
+//! [7]
+#ifdef Q_WS_MAC
+    QSettings settings("grenoullelogique.fr", "Squash");
+#else
+    QSettings settings("Grenoulle Logique", "Squash");
+#endif
+//! [7]
+
+
+//! [8]
+pos = @Point(100 100)
+//! [8]
+
+
+//! [9]
+windir = C:\Windows
+//! [9]
+
+
+//! [10]
+QSettings settings("Moose Tech", "Facturo-Pro");
+//! [10]
+
+
+//! [11]
+QSettings settings("Moose Soft", "Facturo-Pro");
+//! [11]
+
+
+//! [12]
+QCoreApplication::setOrganizationName("Moose Soft");
+QCoreApplication::setApplicationName("Facturo-Pro");
+QSettings settings;
+//! [12]
+
+
+//! [13]
+settings.beginGroup("mainwindow");
+settings.setValue("size", win->size());
+settings.setValue("fullScreen", win->isFullScreen());
+settings.endGroup();
+
+settings.beginGroup("outputpanel");
+settings.setValue("visible", panel->isVisible());
+settings.endGroup();
+//! [13]
+
+
+//! [14]
+settings.beginGroup("alpha");
+// settings.group() == "alpha"
+
+settings.beginGroup("beta");
+// settings.group() == "alpha/beta"
+
+settings.endGroup();
+// settings.group() == "alpha"
+
+settings.endGroup();
+// settings.group() == ""
+//! [14]
+
+
+//! [15]
+struct Login {
+    QString userName;
+    QString password;
+};
+QList<Login> logins;
+...
+
+QSettings settings;
+int size = settings.beginReadArray("logins");
+for (int i = 0; i < size; ++i) {
+    settings.setArrayIndex(i);
+    Login login;
+    login.userName = settings.value("userName").toString();
+    login.password = settings.value("password").toString();
+    logins.append(login);
+}
+settings.endArray();
+//! [15]
+
+
+//! [16]
+struct Login {
+    QString userName;
+    QString password;
+};
+QList<Login> logins;
+...
+
+QSettings settings;
+settings.beginWriteArray("logins");
+for (int i = 0; i < logins.size(); ++i) {
+    settings.setArrayIndex(i);
+    settings.setValue("userName", list.at(i).userName);
+    settings.setValue("password", list.at(i).password);
+}
+settings.endArray();
+//! [16]
+
+
+//! [17]
+QSettings settings;
+settings.setValue("fridge/color", Qt::white);
+settings.setValue("fridge/size", QSize(32, 96));
+settings.setValue("sofa", true);
+settings.setValue("tv", false);
+
+QStringList keys = settings.allKeys();
+// keys: ["fridge/color", "fridge/size", "sofa", "tv"]
+//! [17]
+
+
+//! [18]
+settings.beginGroup("fridge");
+keys = settings.allKeys();
+// keys: ["color", "size"]
+//! [18]
+
+
+//! [19]
+QSettings settings;
+settings.setValue("fridge/color", Qt::white);
+settings.setValue("fridge/size", QSize(32, 96));
+settings.setValue("sofa", true);
+settings.setValue("tv", false);
+
+QStringList keys = settings.childKeys();
+// keys: ["sofa", "tv"]
+//! [19]
+
+
+//! [20]
+settings.beginGroup("fridge");
+keys = settings.childKeys();
+// keys: ["color", "size"]
+//! [20]
+
+
+//! [21]
+QSettings settings;
+settings.setValue("fridge/color", Qt::white);
+settings.setValue("fridge/size", QSize(32, 96));
+settings.setValue("sofa", true);
+settings.setValue("tv", false);
+
+QStringList groups = settings.childGroups();
+// group: ["fridge"]
+//! [21]
+
+
+//! [22]
+settings.beginGroup("fridge");
+groups = settings.childGroups();
+// groups: []
+//! [22]
+
+
+//! [23]
+QSettings settings;
+settings.setValue("interval", 30);
+settings.value("interval").toInt();     // returns 30
+
+settings.setValue("interval", 6.55);
+settings.value("interval").toDouble();  // returns 6.55
+//! [23]
+
+
+//! [24]
+QSettings settings;
+settings.setValue("ape");
+settings.setValue("monkey", 1);
+settings.setValue("monkey/sea", 2);
+settings.setValue("monkey/doe", 4);
+
+settings.remove("monkey");
+QStringList keys = settings.allKeys();
+// keys: ["ape"]
+//! [24]
+
+
+//! [25]
+QSettings settings;
+settings.setValue("ape");
+settings.setValue("monkey", 1);
+settings.setValue("monkey/sea", 2);
+settings.setValue("monkey/doe", 4);
+
+settings.beginGroup("monkey");
+settings.remove("");
+settings.endGroup();
+
+QStringList keys = settings.allKeys();
+// keys: ["ape"]
+//! [25]
+
+
+//! [26]
+QSettings settings;
+settings.setValue("animal/snake", 58);
+settings.value("animal/snake", 1024).toInt();   // returns 58
+settings.value("animal/zebra", 1024).toInt();   // returns 1024
+settings.value("animal/zebra").toInt();         // returns 0
+//! [26]
+
+
+//! [27]
+bool myReadFunc(QIODevice &device, QSettings::SettingsMap &map);
+//! [27]
+
+
+//! [28]
+bool myWriteFunc(QIODevice &device, const QSettings::SettingsMap &map);
+//! [28]
+
+
+//! [29]
+bool readXmlFile(QIODevice &device, QSettings::SettingsMap &map);
+bool writeXmlFile(QIODevice &device, const QSettings::SettingsMap &map);
+
+int main(int argc, char *argv[])
+{
+    const QSettings::Format XmlFormat =
+            QSettings::registerFormat("xml", readXmlFile, writeXmlFile);
+
+    QSettings settings(XmlFormat, QSettings::UserSettings, "MySoft",
+                       "Star Runner");
+
+    ...
+}
+//! [29]
diff --git a/doc/src/snippets/code/src_corelib_io_qtemporaryfile.cpp b/doc/src/snippets/code/src_corelib_io_qtemporaryfile.cpp
new file mode 100644
index 0000000000..adb8a7164f
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_io_qtemporaryfile.cpp
@@ -0,0 +1,13 @@
+{
+//! [0]
+    // Within a function/method...
+
+    QTemporaryFile file;
+    if (file.open()) {
+        // file.fileName() returns the unique file name
+    }
+
+    // The QTemporaryFile destructor removes the temporary file
+    // as it goes out of scope.
+//! [0]
+}
diff --git a/doc/src/snippets/code/src_corelib_io_qtextstream.cpp b/doc/src/snippets/code/src_corelib_io_qtextstream.cpp
new file mode 100644
index 0000000000..e85fcc1c39
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_io_qtextstream.cpp
@@ -0,0 +1,89 @@
+//! [0]
+QFile data("output.txt");
+if (data.open(QFile::WriteOnly | QFile::Truncate)) {
+    QTextStream out(&data);
+    out << "Result: " << qSetFieldWidth(10) << left << 3.14 << 2.7;
+    // writes "Result: 3.14      2.7       "
+}
+//! [0]
+
+
+//! [1]
+QTextStream stream(stdin);
+QString line;
+do {
+    line = stream.readLine();
+} while (!line.isNull());
+//! [1]
+
+
+//! [2]
+QTextStream in("0x50 0x20");
+int firstNumber, secondNumber;
+
+in >> firstNumber;             // firstNumber == 80
+in >> dec >> secondNumber;     // secondNumber == 0
+
+char ch;
+in >> ch;                      // ch == 'x'
+//! [2]
+
+
+//! [3]
+int main(int argc, char *argv[])
+{
+    // read numeric arguments (123, 0x20, 4.5...)
+    for (int i = 1; i < argc; ++i) {
+          int number;
+          QTextStream in(argv[i]);
+          in >> number;
+          ...
+    }
+}
+//! [3]
+
+
+//! [4]
+QString str;
+QTextStream in(stdin);
+in >> str;
+//! [4]
+
+
+//! [5]
+QString s;
+QTextStream out(&s);
+out.setFieldWidth(10);
+out.setFieldAlignment(QTextStream::AlignCenter);
+out.setPadChar('-');
+out << "Qt" << "rocks!";
+//! [5]
+
+
+//! [6]
+----Qt------rocks!--
+//! [6]
+
+
+//! [7]
+QTextStream in(file);
+QChar ch1, ch2, ch3;
+in >> ch1 >> ch2 >> ch3;
+//! [7]
+
+
+//! [8]
+QTextStream out(stdout);
+out << "Qt rocks!" << endl;
+//! [8]
+
+
+//! [9]
+stream << '\n' << flush;
+//! [9]
+
+
+//! [10]
+QTextStream out(&file);
+out.setCodec("UTF-8");
+//! [10]
diff --git a/doc/src/snippets/code/src_corelib_io_qurl.cpp b/doc/src/snippets/code/src_corelib_io_qurl.cpp
new file mode 100644
index 0000000000..95de86cdb9
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_io_qurl.cpp
@@ -0,0 +1,47 @@
+//! [0]
+QUrl url("http://www.example.com/List of holidays.xml");
+// url.toEncoded() == "http://www.example.com/List%20of%20holidays.xml"
+//! [0]
+
+
+//! [1]
+QUrl url = QUrl::fromEncoded("http://qtsoftware.com/List%20of%20holidays.xml");
+//! [1]
+
+
+//! [2]
+bool checkUrl(const QUrl &url) {
+    if (!url.isValid()) {
+        qDebug(QString("Invalid URL: %1").arg(url.toString()));
+        return false;
+    }
+
+    return true;
+}
+//! [2]
+
+
+//! [3]
+QFtp ftp;
+ftp.connectToHost(url.host(), url.port(21));
+//! [3]
+
+
+//! [4]
+http://www.example.com/cgi-bin/drawgraph.cgi?type-pie/color-green
+//! [4]
+
+
+//! [5]
+QUrl baseUrl("http://qtsoftware.com/support");
+QUrl relativeUrl("../products/solutions");
+qDebug(baseUrl.resolved(relativeUrl).toString());
+// prints "http://qtsoftware.com/products/solutions"
+//! [5]
+
+
+//! [6]
+QByteArray ba = QUrl::toPercentEncoding("{a fishy string?}", "{}", "s");
+qDebug(ba.constData());
+// prints "{a fi%73hy %73tring%3F}"
+//! [6]
diff --git a/doc/src/snippets/code/src_corelib_kernel_qabstracteventdispatcher.cpp b/doc/src/snippets/code/src_corelib_kernel_qabstracteventdispatcher.cpp
new file mode 100644
index 0000000000..a531f22fce
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_kernel_qabstracteventdispatcher.cpp
@@ -0,0 +1,3 @@
+//! [0]
+bool myEventFilter(void *message);
+//! [0]
diff --git a/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp b/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp
new file mode 100644
index 0000000000..31576d5a7e
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp
@@ -0,0 +1,28 @@
+//! [0]
+beginInsertRows(parent, 2, 4);
+//! [0]
+
+
+//! [1]
+beginInsertRows(parent, 4, 5);
+//! [1]
+
+
+//! [2]
+beginRemoveRows(parent, 2, 3);
+//! [2]
+
+
+//! [3]
+beginInsertColumns(parent, 4, 6);
+//! [3]
+
+
+//! [4]
+beginInsertColumns(parent, 6, 8);
+//! [4]
+
+
+//! [5]
+beginRemoveColumns(parent, 4, 6);
+//! [5]
diff --git a/doc/src/snippets/code/src_corelib_kernel_qcoreapplication.cpp b/doc/src/snippets/code/src_corelib_kernel_qcoreapplication.cpp
new file mode 100644
index 0000000000..748d8947a1
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_kernel_qcoreapplication.cpp
@@ -0,0 +1,86 @@
+//! [0]
+QMouseEvent event(QEvent::MouseButtonPress, pos, 0, 0, 0);
+QApplication::sendEvent(mainWindow, &event);
+//! [0]
+
+
+//! [1]
+QPushButton *quitButton = new QPushButton("Quit");
+connect(quitButton, SIGNAL(clicked()), &app, SLOT(quit()));
+//! [1]
+
+
+//! [2]
+foreach (QString path, app.libraryPaths())
+    do_something(path);
+//! [2]
+
+
+//! [3]
+bool myEventFilter(void *message, long *result);
+//! [3]
+
+
+//! [4]
+static int *global_ptr = 0;
+
+static void cleanup_ptr()
+{
+    delete [] global_ptr;
+    global_ptr = 0;
+}
+
+void init_ptr()
+{
+    global_ptr = new int[100];      // allocate data
+    qAddPostRoutine(cleanup_ptr);   // delete later
+}
+//! [4]
+
+
+//! [5]
+class MyPrivateInitStuff : public QObject
+{
+public:
+    static MyPrivateInitStuff *initStuff(QObject *parent)
+    {
+        if (!p)
+            p = new MyPrivateInitStuff(parent);
+        return p;
+    }
+
+    ~MyPrivateInitStuff()
+    {
+        // cleanup goes here
+    }
+
+private:
+    MyPrivateInitStuff(QObject *parent)
+        : QObject(parent)
+    {
+        // initialization goes here
+    }
+
+    MyPrivateInitStuff *p;
+};
+//! [5]
+
+
+//! [6]
+static inline QString tr(const char *sourceText,
+                         const char *comment = 0);
+static inline QString trUtf8(const char *sourceText,
+                             const char *comment = 0);
+//! [6]
+
+
+//! [7]
+class MyMfcView : public CView
+{
+    Q_DECLARE_TR_FUNCTIONS(MyMfcView)
+
+public:
+    MyMfcView();
+    ...
+};
+//! [7]
diff --git a/doc/src/snippets/code/src_corelib_kernel_qmetaobject.cpp b/doc/src/snippets/code/src_corelib_kernel_qmetaobject.cpp
new file mode 100644
index 0000000000..c181a40808
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_kernel_qmetaobject.cpp
@@ -0,0 +1,96 @@
+
+void wrapInFunction()
+{
+
+//! [0]
+class MyClass
+{
+    Q_OBJECT
+    Q_CLASSINFO("author", "Sabrina Schweinsteiger")
+    Q_CLASSINFO("url", "http://doc.moosesoft.co.uk/1.0/")
+
+public:
+    ...
+};
+//! [0]
+
+
+//! [1]
+QByteArray normType = QMetaObject::normalizedType(" int    const  *");
+// normType is now "const int*"
+//! [1]
+
+
+//! [2]
+QMetaObject::invokeMethod(pushButton, "animateClick",
+                          Qt::QueuedConnection);
+//! [2]
+
+
+//! [3]
+QMetaObject::invokeMethod: Unable to handle unregistered datatype 'MyType'
+//! [3]
+
+
+//! [4]
+QString retVal;
+QMetaObject::invokeMethod(obj, "compute", Qt::DirectConnection,
+                          Q_RETURN_ARG(QString, retVal),
+                          Q_ARG(QString, "sqrt"),
+                          Q_ARG(int, 42),
+                          Q_ARG(double, 9.7));
+//! [4]
+
+
+//! [5]
+class MyClass
+{
+    Q_OBJECT
+    Q_CLASSINFO("author", "Sabrina Schweinsteiger")
+    Q_CLASSINFO("url", "http://doc.moosesoft.co.uk/1.0/")
+
+public:
+    ...
+};
+//! [5]
+
+
+//! [propertyCount]
+const QMetaObject* metaObject = obj->metaObject();
+QStringList properties;
+for(int i = metaObject->propertyOffset(); i < metaObject->propertyCount(); ++i)
+    properties << QString::fromLatin1(metaObject->property(i).name());
+//! [propertyCount]
+
+
+//! [methodCount]
+const QMetaObject* metaObject = obj->metaObject();
+QStringList methods;
+for(int i = metaObject->methodOffset(); i < metaObject->methodCount(); ++i)
+    methods << QString::fromLatin1(metaObject->method(i).signature());
+//! [methodCount]
+
+//! [6]
+int methodIndex = pushButton->metaObject()->indexOfMethod("animateClick()");
+QMetaMethod method = metaObject->method(methodIndex);
+method.invoke(pushButton, Qt::QueuedConnection);
+//! [6]
+
+//! [7]
+QMetaMethod::invoke: Unable to handle unregistered datatype 'MyType'
+//! [7]
+
+//! [8]
+QString retVal;
+QByteArray normalizedSignature = QMetaObject::normalizedSignature("compute(QString, int, double)");
+int methodIndex = obj->metaObject()->indexOfMethod(normalizedSignature);
+QMetaMethod method = metaObject->method(methodIndex);
+method.invoke(obj,
+              Qt::DirectConnection,
+              Q_RETURN_ARG(QString, retVal),
+              Q_ARG(QString, "sqrt"),
+              Q_ARG(int, 42),
+              Q_ARG(double, 9.7));
+//! [8]
+
+}
diff --git a/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp b/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp
new file mode 100644
index 0000000000..355a23720f
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp
@@ -0,0 +1,69 @@
+//! [0]
+struct MyStruct
+{
+    int i;
+    ...
+};
+
+Q_DECLARE_METATYPE(MyStruct)
+//! [0]
+
+
+//! [1]
+namespace MyNamespace
+{
+    ...
+}
+
+Q_DECLARE_METATYPE(MyNamespace::MyStruct)
+//! [1]
+
+
+//! [2]
+MyStruct s;
+QVariant var;
+var.setValue(s); // copy s into the variant
+
+...
+
+// retrieve the value
+MyStruct s2 = var.value<MyStruct>();
+//! [2]
+
+
+//! [3]
+int id = QMetaType::type("MyClass");
+if (id != -1) {
+    void *myClassPtr = QMetaType::construct(id);
+    ...
+    QMetaType::destroy(id, myClassPtr);
+    myClassPtr = 0;
+}
+//! [3]
+
+
+//! [4]
+qRegisterMetaType<MyClass>("MyClass");
+//! [4]
+
+
+//! [5]
+qRegisterMetaTypeStreamOperators<MyClass>("MyClass");
+//! [5]
+
+
+//! [6]
+QDataStream &operator<<(QDataStream &out, const MyClass &myObj);
+QDataStream &operator>>(QDataStream &in, MyClass &myObj);
+//! [6]
+
+
+//! [7]
+int id = qRegisterMetaType<MyStruct>();
+//! [7]
+
+
+//! [8]
+int id = qMetaTypeId<QString>();    // id is now QMetaType::QString
+id = qMetaTypeId<MyStruct>();       // compile error if MyStruct not declared
+//! [8]
diff --git a/doc/src/snippets/code/src_corelib_kernel_qmimedata.cpp b/doc/src/snippets/code/src_corelib_kernel_qmimedata.cpp
new file mode 100644
index 0000000000..94f1dc904e
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_kernel_qmimedata.cpp
@@ -0,0 +1,68 @@
+//! [0]
+void MyWidget::dragEnterEvent(QDragEnterEvent *event)
+{
+    if (event->mimeData()->hasUrls())
+        event->acceptProposedAction();
+}
+
+void MyWidget::dropEvent(QDropEvent *event)
+{
+    if (event->mimeData()->hasUrls()) {
+        foreach (QUrl url, event->mimeData()->urls()) {
+            ...
+        }
+    }
+}
+//! [0]
+
+
+//! [1]
+QByteArray csvData = ...;
+
+QMimeData *mimeData = new QMimeData;
+mimeData->setData("text/csv", csvData);
+//! [1]
+
+
+//! [2]
+void MyWidget::dropEvent(QDropEvent *event)
+{
+    const MyMimeData *myData =
+            qobject_cast<const MyMimeData *>(event->mimeData());
+    if (myData) {
+        // access myData's data directly (not through QMimeData's API)
+    }
+}
+//! [2]
+
+
+//! [3]
+application/x-qt-windows-mime;value="<custom type>"
+//! [3]
+
+
+//! [4]
+application/x-qt-windows-mime;value="FileGroupDescriptor"
+application/x-qt-windows-mime;value="FileContents"
+//! [4]
+
+
+//! [5]
+if (event->mimeData()->hasImage()) {
+    QImage image = qvariant_cast<QImage>(event->mimeData()->imageData());
+    ...
+}
+//! [5]
+
+
+//! [6]
+mimeData->setImageData(QImage("beautifulfjord.png"));
+//! [6]
+
+
+//! [7]
+if (event->mimeData()->hasColor()) {
+    QColor color = qvariant_cast<QColor>(event->mimeData()->colorData());
+    ...
+}
+//! [7]
diff --git a/doc/src/snippets/code/src_corelib_kernel_qobject.cpp b/doc/src/snippets/code/src_corelib_kernel_qobject.cpp
new file mode 100644
index 0000000000..5a7c5a76bd
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_kernel_qobject.cpp
@@ -0,0 +1,381 @@
+//! [0]
+QLineEdit *lineEdit = static_cast<QLineEdit *>(
+        qt_find_obj_child(myWidget, "QLineEdit", "my line edit"));
+if (lineEdit)
+    lineEdit->setText("Default");
+//! [0]
+
+
+//! [1]
+QObject *obj = new QPushButton;
+obj->metaObject()->className();             // returns "QPushButton"
+
+QPushButton::staticMetaObject.className();  // returns "QPushButton"
+//! [1]
+
+
+//! [2]
+QPushButton::staticMetaObject.className();  // returns "QPushButton"
+
+QObject *obj = new QPushButton;
+obj->metaObject()->className();             // returns "QPushButton"
+//! [2]
+
+
+//! [3]
+QObject *obj = new QTimer;          // QTimer inherits QObject
+
+QTimer *timer = qobject_cast<QTimer *>(obj);
+// timer == (QObject *)obj
+
+QAbstractButton *button = qobject_cast<QAbstractButton *>(obj);
+// button == 0
+//! [3]
+
+
+//! [4]
+QTimer *timer = new QTimer;         // QTimer inherits QObject
+timer->inherits("QTimer");          // returns true
+timer->inherits("QObject");         // returns true
+timer->inherits("QAbstractButton"); // returns false
+
+// QLayout inherits QObject and QLayoutItem
+QLayout *layout = new QLayout;
+layout->inherits("QObject");        // returns true
+layout->inherits("QLayoutItem");    // returns false
+//! [4]
+
+
+//! [5]
+qDebug("MyClass::setPrecision(): (%s) invalid precision %f",
+       qPrintable(objectName()), newPrecision);
+//! [5]
+
+
+//! [6]
+class MainWindow : public QMainWindow
+{
+public:
+    MainWindow();
+
+protected:
+    bool eventFilter(QObject *obj, QEvent *ev);
+
+private:
+    QTextEdit *textEdit;
+};
+
+MainWindow::MainWindow()
+{
+    textEdit = new QTextEdit;
+    setCentralWidget(textEdit);
+
+    textEdit->installEventFilter(this);
+}
+
+bool MainWindow::eventFilter(QObject *obj, QEvent *event)
+{
+    if (obj == textEdit) {
+        if (event->type() == QEvent::KeyPress) {
+            QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
+            qDebug() << "Ate key press" << keyEvent->key();
+            return true;
+        } else {
+            return false;
+        }
+    } else {
+        // pass the event on to the parent class
+        return QMainWindow::eventFilter(obj, event);
+    }
+}
+//! [6]
+
+
+//! [7]
+myObject->moveToThread(QApplication::instance()->thread());
+//! [7]
+
+
+//! [8]
+class MyObject : public QObject
+{
+    Q_OBJECT
+
+public:
+    MyObject(QObject *parent = 0);
+
+protected:
+    void timerEvent(QTimerEvent *event);
+};
+
+MyObject::MyObject(QObject *parent)
+    : QObject(parent)
+{
+    startTimer(50);     // 50-millisecond timer
+    startTimer(1000);   // 1-second timer
+    startTimer(60000);  // 1-minute timer
+}
+
+void MyObject::timerEvent(QTimerEvent *event)
+{
+    qDebug() << "Timer ID:" << event->timerId();
+}
+//! [8]
+
+
+//! [9]
+QList<QObject *> list = window()->queryList("QAbstractButton"));
+foreach (QObject *obj, list)
+    static_cast<QAbstractButton *>(obj)->setEnabled(false);
+//! [9]
+
+
+//! [10]
+QPushButton *button = parentWidget->findChild<QPushButton *>("button1");
+//! [10]
+
+
+//! [11]
+QListWidget *list = parentWidget->findChild<QListWidget *>();
+//! [11]
+
+
+//! [12]
+QList<QWidget *> widgets = parentWidget.findChildren<QWidget *>("widgetname");
+//! [12]
+
+
+//! [13]
+QList<QPushButton *> allPButtons = parentWidget.findChildren<QPushButton *>();
+//! [13]
+
+
+//! [14]
+monitoredObj->installEventFilter(filterObj);
+//! [14]
+
+
+//! [15]
+class KeyPressEater : public QObject
+{
+    Q_OBJECT
+    ...
+
+protected:
+    bool eventFilter(QObject *obj, QEvent *event);
+};
+
+bool KeyPressEater::eventFilter(QObject *obj, QEvent *event)
+{
+    if (event->type() == QEvent::KeyPress) {
+        QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
+        qDebug("Ate key press %d", keyEvent->key());
+        return true;
+    } else {
+        // standard event processing
+        return QObject::eventFilter(obj, event);
+    }
+}
+//! [15]
+
+
+//! [16]
+KeyPressEater *keyPressEater = new KeyPressEater(this);
+QPushButton *pushButton = new QPushButton(this);
+QListView *listView = new QListView(this);
+
+pushButton->installEventFilter(keyPressEater);
+listView->installEventFilter(keyPressEater);
+//! [16]
+
+
+//! [17]
+MyWindow::MyWindow()
+{
+    QLabel *senderLabel = new QLabel(tr("Name:"));
+    QLabel *recipientLabel = new QLabel(tr("Name:", "recipient"));
+    ...
+}
+//! [17]
+
+
+//! [18]
+int n = messages.count();
+showMessage(tr("%n message(s) saved", "", n));
+//! [18]
+
+
+//! [19]
+n == 1 ? tr("%n message saved") : tr("%n messages saved")
+//! [19]
+
+
+//! [20]
+label->setText(tr("F\374r \310lise"));
+//! [20]
+
+
+//! [21]
+if (receivers(SIGNAL(valueChanged(QByteArray))) > 0) {
+    QByteArray data;
+    get_the_value(&data);       // expensive operation
+    emit valueChanged(data);
+}
+//! [21]
+
+
+//! [22]
+QLabel *label = new QLabel;
+QScrollBar *scrollBar = new QScrollBar;
+QObject::connect(scrollBar, SIGNAL(valueChanged(int)),
+                 label,  SLOT(setNum(int)));
+//! [22]
+
+
+//! [23]
+// WRONG
+QObject::connect(scrollBar, SIGNAL(valueChanged(int value)),
+                 label, SLOT(setNum(int value)));
+//! [23]
+
+
+//! [24]
+class MyWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    MyWidget();
+
+signals:
+    void buttonClicked();
+
+private:
+    QPushButton *myButton;
+};
+
+MyWidget::MyWidget()
+{
+    myButton = new QPushButton(this);
+    connect(myButton, SIGNAL(clicked()),
+            this, SIGNAL(buttonClicked()));
+}
+//! [24]
+
+
+//! [25]
+QObject::connect: Cannot queue arguments of type 'MyType'
+(Make sure 'MyType' is registered using qRegisterMetaType().)
+//! [25]
+
+
+//! [26]
+disconnect(myObject, 0, 0, 0);
+//! [26]
+
+
+//! [27]
+myObject->disconnect();
+//! [27]
+
+
+//! [28]
+disconnect(myObject, SIGNAL(mySignal()), 0, 0);
+//! [28]
+
+
+//! [29]
+myObject->disconnect(SIGNAL(mySignal()));
+//! [29]
+
+
+//! [30]
+disconnect(myObject, 0, myReceiver, 0);
+//! [30]
+
+
+//! [31]
+myObject->disconnect(myReceiver);
+//! [31]
+
+
+//! [32]
+if (QLatin1String(signal) == SIGNAL(valueChanged(int))) {
+    // signal is valueChanged(int)
+}
+//! [32]
+
+
+//! [33]
+void on_<object name>_<signal name>(<signal parameters>);
+//! [33]
+
+
+//! [34]
+void on_button1_clicked();
+//! [34]
+
+
+//! [35]
+class MyClass : public QObject
+{
+    Q_OBJECT
+    Q_CLASSINFO("Author", "Pierre Gendron")
+    Q_CLASSINFO("URL", "http://www.my-organization.qc.ca")
+
+public:
+    ...
+};
+//! [35]
+
+
+//! [36]
+Q_PROPERTY(type name
+           READ getFunction
+           [WRITE setFunction]
+           [RESET resetFunction]
+           [DESIGNABLE bool]
+           [SCRIPTABLE bool]
+           [STORED bool]
+	   [USER bool])
+//! [36]
+
+
+//! [37]
+Q_PROPERTY(QString title READ title WRITE setTitle USER true)
+//! [37]
+
+
+//! [38]
+class MyClass : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(Priority)
+
+public:
+    MyClass(QObject *parent = 0);
+    ~MyClass();
+
+    enum Priority { High, Low, VeryHigh, VeryLow };
+    void setPriority(Priority priority);
+    Priority priority() const;
+};
+//! [38]
+
+
+//! [39]
+Q_FLAGS(Options Alignment)
+//! [39]
+
+
+//! [40]
+//: This name refers to a host name.
+hostNameLabel->setText(tr("Name:"));
+
+/*: This text refers to a C++ code example. */
+QString example = tr("Example");
+//! [40]
+
+//! [explicit tr context]
+QString text = QScrollBar::tr("Page up");
+//! [explicit tr context]
diff --git a/doc/src/snippets/code/src_corelib_kernel_qsystemsemaphore.cpp b/doc/src/snippets/code/src_corelib_kernel_qsystemsemaphore.cpp
new file mode 100644
index 0000000000..cd5665f276
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_kernel_qsystemsemaphore.cpp
@@ -0,0 +1,21 @@
+//! [0]
+QSystemSemaphore sem("market", 3, QSystemSemaphore::Create);
+                             // resources available == 3
+sem.acquire();               // resources available == 2
+sem.acquire();               // resources available == 1
+sem.acquire();               // resources available == 0
+sem.release();               // resources available == 1
+sem.release(2);              // resources available == 3
+//! [0]
+
+
+//! [1]
+QSystemSemaphore sem("market", 5, QSystemSemaphore::Create);
+sem.acquire(5);           // acquire all 5 resources
+sem.release(5);           // release the 5 resources
+//! [1]
+
+
+//! [2]
+sem.release(10);          // "create" 10 new resources
+//! [2]
diff --git a/doc/src/snippets/code/src_corelib_kernel_qtimer.cpp b/doc/src/snippets/code/src_corelib_kernel_qtimer.cpp
new file mode 100644
index 0000000000..02cdc0a68e
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_kernel_qtimer.cpp
@@ -0,0 +1,12 @@
+//! [0]
+#include <QApplication>
+#include <QTimer>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QTimer::singleShot(600000, &app, SLOT(quit()));
+    ...
+    return app.exec();
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp b/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp
new file mode 100644
index 0000000000..ef19dbbea4
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp
@@ -0,0 +1,97 @@
+//! [0]
+QDataStream out(...);
+QVariant v(123);                // The variant now contains an int
+int x = v.toInt();              // x = 123
+out << v;                       // Writes a type tag and an int to out
+v = QVariant("hello");          // The variant now contains a QByteArray
+v = QVariant(tr("hello"));      // The variant now contains a QString
+int y = v.toInt();              // y = 0 since v cannot be converted to an int
+QString s = v.toString();       // s = tr("hello")  (see QObject::tr())
+out << v;                       // Writes a type tag and a QString to out
+...
+QDataStream in(...);            // (opening the previously written stream)
+in >> v;                        // Reads an Int variant
+int z = v.toInt();              // z = 123
+qDebug("Type is %s",            // prints "Type is int"
+        v.typeName());
+v = v.toInt() + 100;            // The variant now hold the value 223
+v = QVariant(QStringList());
+//! [0]
+
+
+//! [1]
+QVariant x, y(QString()), z(QString(""));
+x.convert(QVariant::Int);
+// x.isNull() == true
+// y.isNull() == true, z.isNull() == false
+// y.isEmpty() == true, z.isEmpty() == true
+//! [1]
+
+
+//! [2]
+QVariant variant;
+...
+QColor color = variant.value<QColor>();
+//! [2]
+
+
+//! [3]
+QColor color = palette().background().color();
+QVariant variant = color;
+//! [3]
+
+
+//! [4]
+QVariant v;
+
+v.setValue(5);
+int i = v.toInt();         // i is now 5
+QString s = v.toString()   // s is now "5"
+
+MyCustomStruct c;
+v.setValue(c);
+
+...
+
+MyCustomStruct c2 = v.value<MyCustomStruct>();
+//! [4]
+
+
+//! [5]
+QVariant v;
+
+MyCustomStruct c;
+if (v.canConvert<MyCustomStruct>())
+    c = v.value<MyCustomStruct>(v);
+
+v = 7;
+int i = v.value<int>();                        // same as v.toInt()
+QString s = v.value<QString>();                // same as v.toString(), s is now "7"
+MyCustomStruct c2 = v.value<MyCustomStruct>(); // conversion failed, c2 is empty
+//! [5]
+
+
+//! [6]
+QVariant v = 42;
+
+v.canConvert<int>();              // returns true
+v.canConvert<QString>();          // returns true
+
+MyCustomStruct s;
+v.setValue(s);
+
+v.canConvert<int>();              // returns false
+v.canConvert<MyCustomStruct>();   // returns true
+//! [6]
+
+
+//! [7]
+MyCustomStruct s;
+return QVariant::fromValue(s);
+//! [7]
+
+
+//! [8]
+QObject *object = getObjectFromSomewhere();
+QVariant data = qVariantFromValue(object);
+//! [8]
diff --git a/doc/src/snippets/code/src_corelib_plugin_qlibrary.cpp b/doc/src/snippets/code/src_corelib_plugin_qlibrary.cpp
new file mode 100644
index 0000000000..06590610c7
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_plugin_qlibrary.cpp
@@ -0,0 +1,44 @@
+//! [0]
+QLibrary myLib("mylib");
+typedef void (*MyPrototype)();
+MyPrototype myFunction = (MyPrototype) myLib.resolve("mysymbol");
+if (myFunction)
+    myFunction();
+//! [0]
+
+
+//! [1]
+typedef void (*MyPrototype)();
+MyPrototype myFunction =
+        (MyPrototype) QLibrary::resolve("mylib", "mysymbol");
+if (myFunction)
+    myFunction();
+//! [1]
+
+
+//! [2]
+typedef int (*AvgFunction)(int, int);
+
+AvgFunction avg = (AvgFunction) library->resolve("avg");
+if (avg)
+    return avg(5, 8);
+else
+    return -1;
+//! [2]
+
+
+//! [3]
+extern "C" MY_EXPORT int avg(int a, int b)
+{
+    return (a + b) / 2;
+}
+//! [3]
+
+
+//! [4]
+#ifdef Q_WS_WIN
+#define MY_EXPORT __declspec(dllexport)
+#else
+#define MY_EXPORT
+#endif
+//! [4]
diff --git a/doc/src/snippets/code/src_corelib_plugin_quuid.cpp b/doc/src/snippets/code/src_corelib_plugin_quuid.cpp
new file mode 100644
index 0000000000..5c91afc4e4
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_plugin_quuid.cpp
@@ -0,0 +1,4 @@
+//! [0]
+// {67C8770B-44F1-410A-AB9A-F9B5446F13EE}
+QUuid IID_MyInterface(0x67c8770b, 0x44f1, 0x410a, 0xab, 0x9a, 0xf9, 0xb5, 0x44, 0x6f, 0x13, 0xee)
+//! [0]
diff --git a/doc/src/snippets/code/src_corelib_thread_qatomic.cpp b/doc/src/snippets/code/src_corelib_thread_qatomic.cpp
new file mode 100644
index 0000000000..3f67ddf8e9
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_thread_qatomic.cpp
@@ -0,0 +1,58 @@
+//! [0]
+MySharedType &MySharedType::operator=(const MySharedType &other)
+{
+    (void) other.data->atomicInt.ref();
+    if (!data->atomicInt.deref()) {
+        // The last reference has been released
+        delete d;
+    }
+    d = other.d;
+    return *this;
+}
+//! [0]
+
+
+//! [1]
+if (currentValue == expectedValue) {
+    currentValue = newValue;
+    return true;
+}
+return false;
+//! [1]
+
+
+//! [2]
+int originalValue = currentValue;
+currentValue = newValue;
+return originalValue;
+//! [2]
+
+
+//! [3]
+int originalValue = currentValue;
+currentValue += valueToAdd;
+return originalValue;
+//! [3]
+
+
+//! [4]
+if (currentValue == expectedValue) {
+    currentValue = newValue;
+    return true;
+}
+return false;
+//! [4]
+
+
+//! [5]
+T *originalValue = currentValue;
+currentValue = newValue;
+return originalValue;
+//! [5]
+
+
+//! [6]
+T *originalValue = currentValue;
+currentValue += valueToAdd;
+return originalValue;
+//! [6]
diff --git a/doc/src/snippets/code/src_corelib_thread_qmutex.cpp b/doc/src/snippets/code/src_corelib_thread_qmutex.cpp
new file mode 100644
index 0000000000..e79bb35a23
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_thread_qmutex.cpp
@@ -0,0 +1,153 @@
+//! [0]
+int number = 6;
+
+void method1()
+{
+    number *= 5;
+    number /= 4;
+}
+
+void method2()
+{
+    number *= 3;
+    number /= 2;
+}
+//! [0]
+
+
+//! [1]
+// method1()
+number *= 5;        // number is now 30
+number /= 4;        // number is now 7
+
+// method2()
+number *= 3;        // number is now 21
+number /= 2;        // number is now 10
+//! [1]
+
+
+//! [2]
+// Thread 1 calls method1()
+number *= 5;        // number is now 30
+
+// Thread 2 calls method2().
+//
+// Most likely Thread 1 has been put to sleep by the operating
+// system to allow Thread 2 to run.
+number *= 3;        // number is now 90
+number /= 2;        // number is now 45
+
+// Thread 1 finishes executing.
+number /= 4;        // number is now 11, instead of 10
+//! [2]
+
+
+//! [3]
+QMutex mutex;
+int number = 6;
+
+void method1()
+{
+    mutex.lock();
+    number *= 5;
+    number /= 4;
+    mutex.unlock();
+}
+
+void method2()
+{
+    mutex.lock();
+    number *= 3;
+    number /= 2;
+    mutex.unlock();
+}
+//! [3]
+
+
+//! [4]
+int complexFunction(int flag)
+{
+    mutex.lock();
+
+    int retVal = 0;
+
+    switch (flag) {
+    case 0:
+    case 1:
+        mutex.unlock();
+        return moreComplexFunction(flag);
+    case 2:
+        {
+            int status = anotherFunction();
+            if (status < 0) {
+                mutex.unlock();
+                return -2;
+            }
+            retVal = status + flag;
+        }
+        break;
+    default:
+        if (flag > 10) {
+            mutex.unlock();
+            return -1;
+        }
+        break;
+    }
+
+    mutex.unlock();
+    return retVal;
+}
+//! [4]
+
+
+//! [5]
+int complexFunction(int flag)
+{
+    QMutexLocker locker(&mutex);
+
+    int retVal = 0;
+
+    switch (flag) {
+    case 0:
+    case 1:
+        return moreComplexFunction(flag);
+    case 2:
+        {
+            int status = anotherFunction();
+            if (status < 0)
+                return -2;
+            retVal = status + flag;
+        }
+        break;
+    default:
+        if (flag > 10)
+            return -1;
+        break;
+    }
+
+    return retVal;
+}
+//! [5]
+
+
+//! [6]
+class SignalWaiter
+{
+private:
+    QMutexLocker locker;
+
+public:
+    SignalWaiter(QMutex *mutex)
+        : locker(mutex)
+    {
+    }
+
+    void waitForSignal()
+    {
+        ...
+        while (!signalled)
+            waitCondition.wait(locker.mutex());
+        ...
+    }
+};
+//! [6]
diff --git a/doc/src/snippets/code/src_corelib_thread_qmutexpool.cpp b/doc/src/snippets/code/src_corelib_thread_qmutexpool.cpp
new file mode 100644
index 0000000000..8e64a36050
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_thread_qmutexpool.cpp
@@ -0,0 +1,21 @@
+//! [0]
+class Number {
+public:
+    Number(double n) : num (n) { }
+
+    void setNumber(double n) { num = n; }
+    double number() const { return num; }
+
+private:
+    double num;
+};
+//! [0]
+
+
+//! [1]
+void calcSquare(Number *num)
+{
+    QMutexLocker locker(mutexpool.get(num));
+    num.setNumber(num.number() * num.number());
+}
+//! [1]
diff --git a/doc/src/snippets/code/src_corelib_thread_qreadwritelock.cpp b/doc/src/snippets/code/src_corelib_thread_qreadwritelock.cpp
new file mode 100644
index 0000000000..f0f4935ce6
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_thread_qreadwritelock.cpp
@@ -0,0 +1,69 @@
+//! [0]
+QReadWriteLock lock;
+
+void ReaderThread::run()
+{
+    ...
+    lock.lockForRead();
+    read_file();
+    lock.unlock();
+    ...
+}
+
+void WriterThread::run()
+{
+    ...
+    lock.lockForWrite();
+    write_file();
+    lock.unlock();
+    ...
+}
+//! [0]
+
+
+//! [1]
+QReadWriteLock lock;
+
+QByteArray readData()
+{
+    QReadLocker locker(&lock);
+    ...
+    return data;
+}
+//! [1]
+
+
+//! [2]
+QReadWriteLock lock;
+
+QByteArray readData()
+{
+    locker.lockForRead();
+    ...
+    locker.unlock();
+    return data;
+}
+//! [2]
+
+
+//! [3]
+QReadWriteLock lock;
+
+void writeData(const QByteArray &data)
+{
+    QWriteLocker locker(&lock);
+    ...
+}
+//! [3]
+
+
+//! [4]
+QReadWriteLock lock;
+
+void writeData(const QByteArray &data)
+{
+    locker.lockForWrite();
+    ...
+    locker.unlock();
+}
+//! [4]
diff --git a/doc/src/snippets/code/src_corelib_thread_qsemaphore.cpp b/doc/src/snippets/code/src_corelib_thread_qsemaphore.cpp
new file mode 100644
index 0000000000..e02f05e282
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_thread_qsemaphore.cpp
@@ -0,0 +1,33 @@
+//! [0]
+QSemaphore sem(5);      // sem.available() == 5
+
+sem.acquire(3);         // sem.available() == 2
+sem.acquire(2);         // sem.available() == 0
+sem.release(5);         // sem.available() == 5
+sem.release(5);         // sem.available() == 10
+
+sem.tryAcquire(1);      // sem.available() == 9, returns true
+sem.tryAcquire(250);    // sem.available() == 9, returns false
+//! [0]
+
+
+//! [1]
+QSemaphore sem(5);      // a semaphore that guards 5 resources
+sem.acquire(5);         // acquire all 5 resources
+sem.release(5);         // release the 5 resources
+sem.release(10);        // "create" 10 new resources
+//! [1]
+
+
+//! [2]
+QSemaphore sem(5);      // sem.available() == 5
+sem.tryAcquire(250);    // sem.available() == 5, returns false
+sem.tryAcquire(3);      // sem.available() == 2, returns true
+//! [2]
+
+
+//! [3]
+QSemaphore sem(5);            // sem.available() == 5
+sem.tryAcquire(250, 1000);    // sem.available() == 5, waits 1000 milliseconds and returns false
+sem.tryAcquire(3, 30000);     // sem.available() == 2, returns true without waiting
+//! [3]
diff --git a/doc/src/snippets/code/src_corelib_thread_qthread.cpp b/doc/src/snippets/code/src_corelib_thread_qthread.cpp
new file mode 100644
index 0000000000..58c35e5667
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_thread_qthread.cpp
@@ -0,0 +1,16 @@
+//! [0]
+class MyThread : public QThread
+{
+public:
+    void run();
+};
+
+void MyThread::run()
+{
+    QTcpSocket socket;
+    // connect QTcpSocket's signals somewhere meaningful
+    ...
+    socket.connectToHost(hostName, portNumber);
+    exec();
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp b/doc/src/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp
new file mode 100644
index 0000000000..5c83d973e6
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp
@@ -0,0 +1,49 @@
+//! [0]
+forever {
+    mutex.lock();
+    keyPressed.wait(&mutex);
+    do_something();
+    mutex.unlock();
+}
+//! [0]
+
+
+//! [1]
+forever {
+    getchar();
+    keyPressed.wakeAll();
+}
+//! [1]
+
+
+//! [2]
+forever {
+    mutex.lock();
+    keyPressed.wait(&mutex);
+    ++count;
+    mutex.unlock();
+
+    do_something();
+
+    mutex.lock();
+    --count;
+    mutex.unlock();
+}
+//! [2]
+
+
+//! [3]
+forever {
+    getchar();
+
+    mutex.lock();
+    // Sleep until there are no busy worker threads
+    while (count > 0) {
+        mutex.unlock();
+        sleep(1);
+        mutex.lock();
+    }
+    keyPressed.wakeAll();
+    mutex.unlock();          
+}
+//! [3]
diff --git a/doc/src/snippets/code/src_corelib_tools_qbitarray.cpp b/doc/src/snippets/code/src_corelib_tools_qbitarray.cpp
new file mode 100644
index 0000000000..e931d40dbe
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_tools_qbitarray.cpp
@@ -0,0 +1,136 @@
+//! [0]
+QBitArray ba(200);
+//! [0]
+
+
+//! [1]
+QBitArray ba;
+ba.resize(3);
+ba[0] = true;
+ba[1] = false;
+ba[2] = true;
+//! [1]
+
+
+//! [2]
+QBitArray ba(3);
+ba.setBit(0, true);
+ba.setBit(1, false);
+ba.setBit(2, true);
+//! [2]
+
+
+//! [3]
+QBitArray x(5);
+x.setBit(3, true);
+// x: [ 0, 0, 0, 1, 0 ]
+
+QBitArray y(5);
+y.setBit(4, true);
+// y: [ 0, 0, 0, 0, 1 ]
+
+x |= y;
+// x: [ 0, 0, 0, 1, 1 ]
+//! [3]
+
+
+//! [4]
+QBitArray().isNull();           // returns true
+QBitArray().isEmpty();          // returns true
+
+QBitArray(0).isNull();          // returns false
+QBitArray(0).isEmpty();         // returns true
+
+QBitArray(3).isNull();          // returns false
+QBitArray(3).isEmpty();         // returns false
+//! [4]
+
+
+//! [5]
+QBitArray().isNull();           // returns true
+QBitArray(0).isNull();          // returns false
+QBitArray(3).isNull();          // returns false
+//! [5]
+
+
+//! [6]
+QBitArray ba(8);
+ba.fill(true);
+// ba: [ 1, 1, 1, 1, 1, 1, 1, 1 ]
+
+ba.fill(false, 2);
+// ba: [ 0, 0 ]
+//! [6]
+
+
+//! [7]
+QBitArray a(3);
+a[0] = false;
+a[1] = true;
+a[2] = a[0] ^ a[1];
+//! [7]
+
+
+//! [8]
+QBitArray a(3);
+QBitArray b(2);
+a[0] = 1; a[1] = 0; a[2] = 1;   // a: [ 1, 0, 1 ]
+b[0] = 1; b[1] = 0;             // b: [ 1, 1 ]
+a &= b;                         // a: [ 1, 0, 0 ]
+//! [8]
+
+
+//! [9]
+QBitArray a(3);
+QBitArray b(2);
+a[0] = 1; a[1] = 0; a[2] = 1;   // a: [ 1, 0, 1 ]
+b[0] = 1; b[1] = 0;             // b: [ 1, 1 ]
+a |= b;                         // a: [ 1, 1, 1 ]
+//! [9]
+
+
+//! [10]
+QBitArray a(3);
+QBitArray b(2);
+a[0] = 1; a[1] = 0; a[2] = 1;   // a: [ 1, 0, 1 ]
+b[0] = 1; b[1] = 0;             // b: [ 1, 1 ]
+a ^= b;                         // a: [ 0, 1, 1 ]
+//! [10]
+
+
+//! [11]
+QBitArray a(3);
+QBitArray b;
+a[0] = 1; a[1] = 0; a[2] = 1;   // a: [ 1, 0, 1 ]
+b = ~a;                         // b: [ 0, 1, 0 ]
+//! [11]
+
+
+//! [12]
+QBitArray a(3);
+QBitArray b(2);
+QBitArray c;
+a[0] = 1; a[1] = 0; a[2] = 1;   // a: [ 1, 0, 1 ]
+b[0] = 1; b[1] = 0;             // b: [ 1, 1 ]
+c = a & b;                      // c: [ 1, 0, 0 ]
+//! [12]
+
+
+//! [13]
+QBitArray a(3);
+QBitArray b(2);
+QBitArray c;
+a[0] = 1; a[1] = 0; a[2] = 1;   // a: [ 1, 0, 1 ]
+b[0] = 1; b[1] = 0;             // b: [ 1, 1 ]
+c = a | b;                      // c: [ 1, 1, 1 ]
+//! [13]
+
+
+//! [14]
+QBitArray a(3);
+QBitArray b(2);
+QBitArray c;
+a[0] = 1; a[1] = 0; a[2] = 1;   // a: [ 1, 0, 1 ]
+b[0] = 1; b[1] = 0;             // b: [ 1, 1 ]
+c = a ^ b;                      // c: [ 0, 1, 1 ]
+//! [14]
diff --git a/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp b/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
new file mode 100644
index 0000000000..3c5b41396a
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
@@ -0,0 +1,364 @@
+
+void wrapInFunction()
+{
+
+//! [0]
+QByteArray ba("Hello");
+//! [0]
+
+
+//! [1]
+QByteArray ba;
+ba.resize(5);
+ba[0] = 0x3c;
+ba[1] = 0xb8;
+ba[2] = 0x64;
+ba[3] = 0x18;
+ba[4] = 0xca;
+//! [1]
+
+
+//! [2]
+for (int i = 0; i < ba.size(); ++i) {
+    if (ba.at(i) >= 'a' && ba.at(i) <= 'f')
+        cout << "Found character in range [a-f]" << endl;
+}
+//! [2]
+
+
+//! [3]
+QByteArray x("and");
+x.prepend("rock ");         // x == "rock and"
+x.append(" roll");          // x == "rock and roll"
+x.replace(5, 3, "&");       // x == "rock & roll"
+//! [3]
+
+
+//! [4]
+QByteArray ba("We must be <b>bold</b>, very <b>bold</b>");
+int j = 0;
+while ((j = ba.indexOf("<b>", j)) != -1) {
+    cout << "Found <b> tag at index position " << j << endl;
+    ++j;
+}
+//! [4]
+
+
+//! [5]
+QByteArray().isNull();          // returns true
+QByteArray().isEmpty();         // returns true
+
+QByteArray("").isNull();        // returns false
+QByteArray("").isEmpty();       // returns true
+
+QByteArray("abc").isNull();     // returns false
+QByteArray("abc").isEmpty();    // returns false
+//! [5]
+
+
+//! [6]
+QByteArray ba("Hello");
+int n = ba.size();          // n == 5
+ba.data()[0];               // returns 'H'
+ba.data()[4];               // returns 'o'
+ba.data()[5];               // returns '\0'
+//! [6]
+
+
+//! [7]
+QByteArray().isEmpty();         // returns true
+QByteArray("").isEmpty();       // returns true
+QByteArray("abc").isEmpty();    // returns false
+//! [7]
+
+
+//! [8]
+QByteArray ba("Hello world");
+char *data = ba.data();
+while (*data) {
+    cout << "[" << *data << "]" << endl;
+    ++data;
+}
+//! [8]
+
+
+//! [9]
+QByteArray ba;
+for (int i = 0; i < 10; ++i)
+    ba[i] = 'A' + i;
+// ba == "ABCDEFGHIJ"
+//! [9]
+
+
+//! [10]
+QByteArray ba("Stockholm");
+ba.truncate(5);             // ba == "Stock"
+//! [10]
+
+
+//! [11]
+QByteArray ba("STARTTLS\r\n");
+ba.chop(2);                 // ba == "STARTTLS"
+//! [11]
+
+
+//! [12]
+QByteArray x("free");
+QByteArray y("dom");
+x += y;
+// x == "freedom"
+//! [12]
+
+
+//! [13]
+QByteArray().isNull();          // returns true
+QByteArray("").isNull();        // returns false
+QByteArray("abc").isNull();     // returns false
+//! [13]
+
+
+//! [14]
+QByteArray ba("Istambul");
+ba.fill('o');
+// ba == "oooooooo"
+
+ba.fill('X', 2);
+// ba == "XX"
+//! [14]
+
+
+//! [15]
+QByteArray x("ship");
+QByteArray y("air");
+x.prepend(y);
+// x == "airship"
+//! [15]
+
+
+//! [16]
+QByteArray x("free");
+QByteArray y("dom");
+x.append(y);
+// x == "freedom"
+//! [16]
+
+
+//! [17]
+QByteArray ba("Meal");
+ba.insert(1, QByteArray("ontr"));
+// ba == "Montreal"
+//! [17]
+
+
+//! [18]
+QByteArray ba("Montreal");
+ba.remove(1, 4);
+// ba == "Meal"
+//! [18]
+
+
+//! [19]
+QByteArray x("Say yes!");
+QByteArray y("no");
+x.replace(4, 3, y);
+// x == "Say no!"
+//! [19]
+
+
+//! [20]
+QByteArray ba("colour behaviour flavour neighbour");
+ba.replace(QByteArray("ou"), QByteArray("o"));
+// ba == "color behavior flavor neighbor"
+//! [20]
+
+
+//! [21]
+QByteArray x("sticky question");
+QByteArray y("sti");
+x.indexOf(y);               // returns 0
+x.indexOf(y, 1);            // returns 10
+x.indexOf(y, 10);           // returns 10
+x.indexOf(y, 11);           // returns -1
+//! [21]
+
+
+//! [22]
+QByteArray ba("ABCBA");
+ba.indexOf("B");            // returns 1
+ba.indexOf("B", 1);         // returns 1
+ba.indexOf("B", 2);         // returns 3
+ba.indexOf("X");            // returns -1
+//! [22]
+
+
+//! [23]
+QByteArray x("crazy azimuths");
+QByteArray y("azy");
+x.lastIndexOf(y);           // returns 6
+x.lastIndexOf(y, 6);        // returns 6
+x.lastIndexOf(y, 5);        // returns 2
+x.lastIndexOf(y, 1);        // returns -1
+//! [23]
+
+
+//! [24]
+QByteArray ba("ABCBA");
+ba.lastIndexOf("B");        // returns 3
+ba.lastIndexOf("B", 3);     // returns 3
+ba.lastIndexOf("B", 2);     // returns 1
+ba.lastIndexOf("X");        // returns -1
+//! [24]
+
+
+//! [25]
+QByteArray url("ftp://ftp.trolltech.com/");
+if (url.startsWith("ftp:"))
+    ...
+//! [25]
+
+
+//! [26]
+QByteArray url("http://qtsoftware.com/index.html");
+if (url.endsWith(".html"))
+    ...
+//! [26]
+
+
+//! [27]
+QByteArray x("Pineapple");
+QByteArray y = x.left(4);
+// y == "Pine"
+//! [27]
+
+
+//! [28]
+QByteArray x("Pineapple");
+QByteArray y = x.right(5);
+// y == "apple"
+//! [28]
+
+
+//! [29]
+QByteArray x("Five pineapples");
+QByteArray y = x.mid(5, 4);     // y == "pine"
+QByteArray z = x.mid(5);        // z == "pineapples"
+//! [29]
+
+
+//! [30]
+QByteArray x("TROlltECH");
+QByteArray y = x.toLower();
+// y == "trolltech"
+//! [30]
+
+
+//! [31]
+QByteArray x("TROlltECH");
+QByteArray y = x.toUpper();
+// y == "TROLLTECH"
+//! [31]
+
+
+//! [32]
+QByteArray ba("  lots\t of\nwhitespace\r\n ");
+ba = ba.simplified();
+// ba == "lots of whitespace";
+//! [32]
+
+
+//! [33]
+QByteArray ba("  lots\t of\nwhitespace\r\n ");
+ba = ba.trimmed();
+// ba == "lots\t of\nwhitespace";
+//! [33]
+
+
+//! [34]
+QByteArray x("apple");
+QByteArray y = x.leftJustified(8, '.');   // y == "apple..."
+//! [34]
+
+
+//! [35]
+QByteArray x("apple");
+QByteArray y = x.rightJustified(8, '.');    // y == "...apple"
+//! [35]
+
+
+//! [36]
+QByteArray str("FF");
+bool ok;
+int hex = str.toInt(&ok, 16);     // hex == 255, ok == true
+int dec = str.toInt(&ok, 10);     // dec == 0, ok == false
+//! [36]
+
+
+//! [37]
+QByteArray str("FF");
+bool ok;
+long hex = str.toLong(&ok, 16);   // hex == 255, ok == true
+long dec = str.toLong(&ok, 10);   // dec == 0, ok == false
+//! [37]
+
+
+//! [38]
+QByteArray string("1234.56");
+double a = string.toDouble();   // a == 1234.56
+//! [38]
+
+
+//! [39]
+QByteArray text("Qt is great!");
+text.toBase64();        // returns "UXQgaXMgZ3JlYXQh"
+//! [39]
+
+
+//! [40]
+QByteArray ba;
+int n = 63;
+ba.setNum(n);           // ba == "63"
+ba.setNum(n, 16);       // ba == "3f"
+//! [40]
+
+
+//! [41]
+int n = 63;
+QByteArray::number(n);              // returns "63"
+QByteArray::number(n, 16);          // returns "3f"
+QByteArray::number(n, 16).toUpper();  // returns "3F"
+//! [41]
+
+
+//! [42]
+QByteArray ba = QByteArray::number(12.3456, 'E', 3);
+// ba == 1.235E+01
+//! [42]
+
+
+//! [43]
+ static const char mydata[] = {
+    0x00, 0x00, 0x03, 0x84, 0x78, 0x9c, 0x3b, 0x76,
+    0xec, 0x18, 0xc3, 0x31, 0x0a, 0xf1, 0xcc, 0x99,
+    ...
+    0x6d, 0x5b
+};
+
+QByteArray data = QByteArray::fromRawData(mydata, sizeof(mydata));
+QDataStream in(&data, QIODevice::ReadOnly);
+...
+//! [43]
+
+
+//! [44]
+QByteArray text = QByteArray::fromBase64("UXQgaXMgZ3JlYXQh");
+text.data();            // returns "Qt is great!"
+//! [44]
+
+
+//! [45]
+QByteArray text = QByteArray::fromHex("517420697320677265617421");
+text.data();            // returns "Qt is great!"
+//! [45]
+
+}
+
diff --git a/doc/src/snippets/code/src_corelib_tools_qdatetime.cpp b/doc/src/snippets/code/src_corelib_tools_qdatetime.cpp
new file mode 100644
index 0000000000..a1424f41ec
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_tools_qdatetime.cpp
@@ -0,0 +1,106 @@
+//! [0]
+QDate d1(1995, 5, 17);  // May 17, 1995
+QDate d2(1995, 5, 20);  // May 20, 1995
+d1.daysTo(d2);          // returns 3
+d2.daysTo(d1);          // returns -3
+//! [0]
+
+
+//! [1]
+QDate date = QDate::fromString("1MM12car2003", "d'MM'MMcaryyyy");
+// date is 1 December 2003
+//! [1]
+
+
+//! [2]
+QDate date = QDate::fromString("130", "Md"); // invalid
+//! [2]
+
+
+//! [3]
+QDate::fromString("1.30", "M.d");           // January 30 1900
+QDate::fromString("20000110", "yyyyMMdd");  // January 10, 2000
+QDate::fromString("20000110", "yyyyMd");    // January 10, 2000
+//! [3]
+
+
+//! [4]
+QDate::isValid(2002, 5, 17);  // true
+QDate::isValid(2002, 2, 30);  // false (Feb 30 does not exist)
+QDate::isValid(2004, 2, 29);  // true (2004 is a leap year)
+QDate::isValid(2000, 2, 29);  // true (2000 is a leap year)
+QDate::isValid(2006, 2, 29);  // false (2006 is not a leap year)
+QDate::isValid(2100, 2, 29);  // false (2100 is not a leap year)
+QDate::isValid(1202, 6, 6);   // true (even though 1202 is pre-Gregorian)
+//! [4]
+
+
+//! [5]
+QTime n(14, 0, 0);                // n == 14:00:00
+QTime t;
+t = n.addSecs(70);                // t == 14:01:10
+t = n.addSecs(-70);               // t == 13:58:50
+t = n.addSecs(10 * 60 * 60 + 5);  // t == 00:00:05
+t = n.addSecs(-15 * 60 * 60);     // t == 23:00:00
+//! [5]
+
+
+//! [6]
+QTime time = QTime::fromString("1mm12car00", "m'mm'hcarss");
+// time is 12:01.00
+//! [6]
+
+
+//! [7]
+QTime time = QTime::fromString("00:710", "hh:ms"); // invalid
+//! [7]
+
+
+//! [8]
+QTime time = QTime::fromString("1.30", "m.s");
+// time is 00:01:30.000
+//! [8]
+
+
+//! [9]
+QTime::isValid(21, 10, 30); // returns true
+QTime::isValid(22, 5,  62); // returns false
+//! [9]
+
+
+//! [10]
+QTime t;
+t.start();
+some_lengthy_task();
+qDebug("Time elapsed: %d ms", t.elapsed());
+//! [10]
+
+
+//! [11]
+QDateTime now = QDateTime::currentDateTime();
+QDateTime xmas(QDate(now.date().year(), 12, 25), QTime(0, 0));
+qDebug("There are %d seconds to Christmas", now.secsTo(xmas));
+//! [11]
+
+
+//! [12]
+QTime time1 = QTime::fromString("131", "HHh");
+// time1 is 13:00:00
+QTime time1 = QTime::fromString("1apA", "1amAM");
+// time1 is 01:00:00
+
+QDateTime dateTime2 = QDateTime::fromString("M1d1y9800:01:02",
+                                            "'M'M'd'd'y'yyhh:mm:ss");
+// dateTime is 1 January 1998 00:01:02
+//! [12]
+
+
+//! [13]
+QDateTime dateTime = QDateTime::fromString("130", "Mm"); // invalid
+//! [13]
+
+
+//! [14]
+QDateTime dateTime = QDateTime::fromString("1.30.1", "M.d.s");
+// dateTime is January 30 in 1900 at 00:00:01.
+//! [14]
diff --git a/doc/src/snippets/code/src_corelib_tools_qhash.cpp b/doc/src/snippets/code/src_corelib_tools_qhash.cpp
new file mode 100644
index 0000000000..05f6eb306e
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_tools_qhash.cpp
@@ -0,0 +1,259 @@
+//! [0]
+QHash<QString, int> hash;
+//! [0]
+
+
+//! [1]
+hash["one"] = 1;
+hash["three"] = 3;
+hash["seven"] = 7;
+//! [1]
+
+
+//! [2]
+hash.insert("twelve", 12);
+//! [2]
+
+
+//! [3]
+int num1 = hash["thirteen"];
+int num2 = hash.value("thirteen");
+//! [3]
+
+
+//! [4]
+int timeout = 30;
+if (hash.contains("TIMEOUT"))
+    timeout = hash.value("TIMEOUT");
+//! [4]
+
+
+//! [5]
+int timeout = hash.value("TIMEOUT", 30);
+//! [5]
+
+
+//! [6]
+// WRONG
+QHash<int, QWidget *> hash;
+...
+for (int i = 0; i < 1000; ++i) {
+    if (hash[i] == okButton)
+        cout << "Found button at index " << i << endl;
+}
+//! [6]
+
+
+//! [7]
+QHashIterator<QString, int> i(hash);
+while (i.hasNext()) {
+    i.next();
+    cout << i.key() << ": " << i.value() << endl;
+}
+//! [7]
+
+
+//! [8]
+QHash<QString, int>::const_iterator i = hash.constBegin();
+while (i != hash.constEnd()) {
+    cout << i.key() << ": " << i.value() << endl;
+    ++i;
+}
+//! [8]
+
+
+//! [9]
+hash.insert("plenty", 100);
+hash.insert("plenty", 2000);
+// hash.value("plenty") == 2000
+//! [9]
+
+
+//! [10]
+QList<int> values = hash.values("plenty");
+for (int i = 0; i < values.size(); ++i)
+    cout << values.at(i) << endl;
+//! [10]
+
+
+//! [11]
+QHash<QString, int>::iterator i = hash.find("plenty");
+while (i != hash.end() && i.key() == "plenty") {
+    cout << i.value() << endl;
+    ++i;
+}
+//! [11]
+
+
+//! [12]
+QHash<QString, int> hash;
+...
+foreach (int value, hash)
+    cout << value << endl;
+//! [12]
+
+
+//! [13]
+#ifndef EMPLOYEE_H
+#define EMPLOYEE_H
+
+class Employee
+{
+public:
+    Employee() {}
+    Employee(const QString &name, const QDate &dateOfBirth);
+    ...
+
+private:
+    QString myName;
+    QDate myDateOfBirth;
+};
+
+inline bool operator==(const Employee &e1, const Employee &e2)
+{
+    return e1.name() == e2.name()
+           && e1.dateOfBirth() == e2.dateOfBirth();
+}
+
+inline uint qHash(const Employee &key)
+{
+    return qHash(key.name()) ^ key.dateOfBirth().day();
+}
+
+#endif // EMPLOYEE_H
+//! [13]
+
+
+//! [14]
+QHash<QString, int> hash;
+hash.reserve(20000);
+for (int i = 0; i < 20000; ++i)
+    hash.insert(keys[i], values[i]);
+//! [14]
+
+
+//! [15]
+QHash<QObject *, int> objectHash;
+...
+QHash<QObject *, int>::iterator i = objectHash.find(obj);
+while (i != objectHash.end() && i.key() == obj) {
+    if (i.value() == 0) {
+        i = objectHash.erase(i);
+    } else {
+        ++i;
+    }
+}
+//! [15]
+
+
+//! [16]
+QHash<QString, int> hash;
+...
+QHash<QString, int>::const_iterator i = hash.find("HDR");
+while (i != hash.end() && i.key() == "HDR") {
+    cout << i.value() << endl;
+    ++i;
+}
+//! [16]
+
+
+//! [17]
+QHash<QString, int> hash;
+hash.insert("January", 1);
+hash.insert("February", 2);
+...
+hash.insert("December", 12);
+
+QHash<QString, int>::iterator i;
+for (i = hash.begin(); i != hash.end(); ++i)
+    cout << i.key() << ": " << i.value() << endl;
+//! [17]
+
+
+//! [18]
+QHash<QString, int>::iterator i;
+for (i = hash.begin(); i != hash.end(); ++i)
+    i.value() += 2;
+//! [18]
+
+
+//! [19]
+QHash<QString, int>::iterator i = hash.begin();
+while (i != hash.end()) {
+    if (i.key().startsWith("_"))
+        i = hash.erase(i);
+    else
+        ++i;
+}
+//! [19]
+
+
+//! [20]
+QHash<QString, int>::iterator i = hash.begin();
+while (i != hash.end()) {
+    QHash<QString, int>::iterator prev = i;
+    ++i;
+    if (prev.key().startsWith("_"))
+        hash.erase(prev);
+}
+//! [20]
+
+
+//! [21]
+// WRONG
+while (i != hash.end()) {
+    if (i.key().startsWith("_"))
+        hash.erase(i);
+    ++i;
+}
+//! [21]
+
+
+//! [22]
+if (i.key() == "Hello")
+    i.value() = "Bonjour";
+//! [22]
+
+
+//! [23]
+QHash<QString, int> hash;
+hash.insert("January", 1);
+hash.insert("February", 2);
+...
+hash.insert("December", 12);
+
+QHash<QString, int>::const_iterator i;
+for (i = hash.constBegin(); i != hash.constEnd(); ++i)
+    cout << i.key() << ": " << i.value() << endl;
+//! [23]
+
+
+//! [24]
+QMultiHash<QString, int> hash1, hash2, hash3;
+
+hash1.insert("plenty", 100);
+hash1.insert("plenty", 2000);
+// hash1.size() == 2
+
+hash2.insert("plenty", 5000);
+// hash2.size() == 1
+
+hash3 = hash1 + hash2;
+// hash3.size() == 3
+//! [24]
+
+
+//! [25]
+QList<int> values = hash.values("plenty");
+for (int i = 0; i < values.size(); ++i)
+    cout << values.at(i) << endl;
+//! [25]
+
+
+//! [26]
+QMultiHash<QString, int>::iterator i = hash.find("plenty");
+while (i != hash.end() && i.key() == "plenty") {
+    cout << i.value() << endl;
+    ++i;
+}
+//! [26]
diff --git a/doc/src/snippets/code/src_corelib_tools_qlinkedlist.cpp b/doc/src/snippets/code/src_corelib_tools_qlinkedlist.cpp
new file mode 100644
index 0000000000..3d63b2cb0c
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_tools_qlinkedlist.cpp
@@ -0,0 +1,164 @@
+//! [0]
+QLinkedList<int> integerList;
+QLinkedList<QTime> timeList;
+//! [0]
+
+
+//! [1]
+QLinkedList<QString> list;
+list << "one" << "two" << "three";
+// list: ["one", "two", "three"]
+//! [1]
+
+
+//! [2]
+QLinkedList<QWidget *> list;
+...
+while (!list.isEmpty())
+    delete list.takeFirst();
+//! [2]
+
+
+//! [3]
+QLinkedList<QString> list;
+list.append("one");
+list.append("two");
+list.append("three");
+// list: ["one", "two", "three"]
+//! [3]
+
+
+//! [4]
+QLinkedList<QString> list;
+list.prepend("one");
+list.prepend("two");
+list.prepend("three");
+// list: ["three", "two", "one"]
+//! [4]
+
+
+//! [5]
+QList<QString> list;
+list << "sun" << "cloud" << "sun" << "rain";
+list.removeAll("sun");
+// list: ["cloud", "rain"]
+//! [5]
+
+
+//! [6]
+QList<QString> list;
+list << "sun" << "cloud" << "sun" << "rain";
+list.removeOne("sun");
+// list: ["cloud", "sun", "rain"]
+//! [6]
+
+
+//! [7]
+QLinkedList<QString> list;
+list.append("January");
+list.append("February");
+...
+list.append("December");
+
+QLinkedList<QString>::iterator i;
+for (i = list.begin(); i != list.end(); ++i)
+    cout << *i << endl;
+//! [7]
+
+
+//! [8]
+QLinkedList<QString> list;
+...
+QLinkedList<QString>::iterator it = qFind(list.begin(),
+                                          list.end(), "Joel");
+if (it != list.end())
+    cout << "Found Joel" << endl;
+//! [8]
+
+
+//! [9]
+QLinkedList<int>::iterator i;
+for (i = list.begin(); i != list.end(); ++i)
+    *i += 2;
+//! [9]
+
+
+//! [10]
+QLinkedList<QString> list;
+...
+QLinkedList<QString>::iterator i = list.begin();
+while (i != list.end()) {
+    if ((*i).startsWith("_"))
+        i = list.erase(i);
+    else
+        ++i;
+}
+//! [10]
+
+
+//! [11]
+QLinkedList<QString>::iterator i = list.begin();
+while (i != list.end()) {
+    QLinkedList<QString>::iterator previous = i;
+    ++i;
+    if ((*previous).startsWith("_"))
+        list.erase(previous);
+}
+//! [11]
+
+
+//! [12]
+// WRONG
+while (i != list.end()) {
+    if ((*i).startsWith("_"))
+        list.erase(i);
+    ++i;
+}
+//! [12]
+
+
+//! [13]
+if (*it == "Hello")
+    *it = "Bonjour";
+//! [13]
+
+
+//! [14]
+QLinkedList<QString> list;
+list.append("January");
+list.append("February");
+...
+list.append("December");
+
+QLinkedList<QString>::const_iterator i;
+for (i = list.constBegin(); i != list.constEnd(); ++i)
+    cout << *i << endl;
+//! [14]
+
+
+//! [15]
+QLinkedList<QString> list;
+...
+QLinkedList<QString>::iterator it = qFind(list.constBegin(),
+                                          list.constEnd(), "Joel");
+if (it != list.constEnd())
+    cout << "Found Joel" << endl;
+//! [15]
+
+
+//! [16]
+std::list<double> stdlist;
+list.push_back(1.2);
+list.push_back(0.5);
+list.push_back(3.14);
+
+QLinkedList<double> list = QLinkedList<double>::fromStdList(stdlist);
+//! [16]
+
+
+//! [17]
+QLinkedList<double> list;
+list << 1.2 << 0.5 << 3.14;
+
+std::list<double> stdlist = list.toStdList();
+//! [17]
diff --git a/doc/src/snippets/code/src_corelib_tools_qlistdata.cpp b/doc/src/snippets/code/src_corelib_tools_qlistdata.cpp
new file mode 100644
index 0000000000..7d75e1be2c
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_tools_qlistdata.cpp
@@ -0,0 +1,227 @@
+//! [0]
+QList<int> integerList;
+QList<QDate> dateList;
+//! [0]
+
+
+//! [1]
+QList<QString> list;
+list << "one" << "two" << "three";
+// list: ["one", "two", "three"]
+//! [1]
+
+
+//! [2]
+if (list[0] == "Bob")
+    list[0] = "Robert";
+//! [2]
+
+
+//! [3]
+for (int i = 0; i < list.size(); ++i) {
+    if (list.at(i) == "Jane")
+        cout << "Found Jane at position " << i << endl;
+}
+//! [3]
+
+
+//! [4]
+QList<QWidget *> list;
+...
+while (!list.isEmpty())
+    delete list.takeFirst();
+//! [4]
+
+
+//! [5]
+int i = list.indexOf("Jane");
+if (i != -1)
+    cout << "First occurrence of Jane is at position " << i << endl;
+//! [5]
+
+
+//! [6]
+QList<QString> list;
+list.append("one");
+list.append("two");
+list.append("three");
+// list: ["one", "two", "three"]
+//! [6]
+
+
+//! [7]
+QList<QString> list;
+list.prepend("one");
+list.prepend("two");
+list.prepend("three");
+// list: ["three", "two", "one"]
+//! [7]
+
+
+//! [8]
+QList<QString> list;
+list << "alpha" << "beta" << "delta";
+list.insert(2, "gamma");
+// list: ["alpha", "beta", "gamma", "delta"]
+//! [8]
+
+
+//! [9]
+QList<QString> list;
+list << "sun" << "cloud" << "sun" << "rain";
+list.removeAll("sun");
+// list: ["cloud", "rain"]
+//! [9]
+
+
+//! [10]
+QList<QString> list;
+list << "sun" << "cloud" << "sun" << "rain";
+list.removeOne("sun");
+// list: ["cloud", ,"sun", "rain"]
+//! [10]
+
+
+//! [11]
+QList<QString> list;
+list << "A" << "B" << "C" << "D" << "E" << "F";
+list.move(1, 4);
+// list: ["A", "C", "D", "E", "B", "F"]
+//! [11]
+
+
+//! [12]
+QList<QString> list;
+list << "A" << "B" << "C" << "D" << "E" << "F";
+list.swap(1, 4);
+// list: ["A", "E", "C", "D", "B", "F"]
+//! [12]
+
+
+//! [13]
+QList<QString> list;
+list << "A" << "B" << "C" << "B" << "A";
+list.indexOf("B");          // returns 1
+list.indexOf("B", 1);       // returns 1
+list.indexOf("B", 2);       // returns 3
+list.indexOf("X");          // returns -1
+//! [13]
+
+
+//! [14]
+QList<QString> list;
+list << "A" << "B" << "C" << "B" << "A";
+list.lastIndexOf("B");      // returns 3
+list.lastIndexOf("B", 3);   // returns 3
+list.lastIndexOf("B", 2);   // returns 1
+list.lastIndexOf("X");      // returns -1
+//! [14]
+
+
+//! [15]
+QList<QString> list;
+list.append("January");
+list.append("February");
+...
+list.append("December");
+
+QList<QString>::iterator i;
+for (i = list.begin(); i != list.end(); ++i)
+    cout << *i << endl;
+//! [15]
+
+
+//! [16]
+QList<int>::iterator i;
+for (i = list.begin(); i != list.end(); ++i)
+    *i += 2;
+//! [16]
+
+
+//! [17]
+QList<QWidget *> list;
+...
+qDeleteAll(list.begin(), list.end());
+//! [17]
+
+
+//! [18]
+if (*it == "Hello")
+    *it = "Bonjour";
+//! [18]
+
+
+//! [19]
+QList<QString> list;
+list.append("January");
+list.append("February");
+...
+list.append("December");
+
+QList<QString>::const_iterator i;
+for (i = list.constBegin(); i != list.constEnd(); ++i)
+    cout << *i << endl;
+//! [19]
+
+
+//! [20]
+QList<QWidget *> list;
+...
+qDeleteAll(list.constBegin(), list.constEnd());
+//! [20]
+
+
+//! [21]
+QVector<double> vect;
+vect << 20.0 << 30.0 << 40.0 << 50.0;
+
+QList<double> list = QVector<T>::fromVector(vect);
+// list: [20.0, 30.0, 40.0, 50.0]
+//! [21]
+
+
+//! [22]
+QStringList list;
+list << "Sven" << "Kim" << "Ola";
+
+QVector<QString> vect = list.toVector();
+// vect: ["Sven", "Kim", "Ola"]
+//! [22]
+
+
+//! [23]
+QSet<double> set;
+set << 20.0 << 30.0 << 40.0 << ... << 70.0;
+
+QList<double> list = QList<double>::fromSet(set);
+qSort(list);
+//! [23]
+
+
+//! [24]
+QStringList list;
+list << "Julia" << "Mike" << "Mike" << "Julia" << "Julia";
+
+QSet<QString> set = list.toSet();
+set.contains("Julia");  // returns true
+set.contains("Mike");   // returns true
+set.size();             // returns 2
+//! [24]
+
+
+//! [25]
+std::list<double> stdlist;
+list.push_back(1.2);
+list.push_back(0.5);
+list.push_back(3.14);
+
+QList<double> list = QList<double>::fromStdList(stdlist);
+//! [25]
+
+
+//! [26]
+QList<double> list;
+list << 1.2 << 0.5 << 3.14;
+
+std::list<double> stdlist = list.toStdList();
+//! [26]
diff --git a/doc/src/snippets/code/src_corelib_tools_qlocale.cpp b/doc/src/snippets/code/src_corelib_tools_qlocale.cpp
new file mode 100644
index 0000000000..37ddb4e52b
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_tools_qlocale.cpp
@@ -0,0 +1,55 @@
+//! [0]
+QLocale egyptian(QLocale::Arabic, QLocale::Egypt);
+QString s1 = egyptian.toString(1.571429E+07, 'e');
+QString s2 = egyptian.toString(10);
+
+double d = egyptian.toDouble(s1);
+int i = egyptian.toInt(s2);
+//! [0]
+
+
+//! [1]
+QLocale::setDefault(QLocale(QLocale::Hebrew, QLocale::Israel));
+QLocale hebrew; // Constructs a default QLocale
+QString s1 = hebrew.toString(15714.3, 'e');
+
+bool ok;
+double d;
+
+QLocale::setDefault(QLocale::C);
+d = QString("1234,56").toDouble(&ok);   // ok == false
+d = QString("1234.56").toDouble(&ok);   // ok == true, d == 1234.56
+
+QLocale::setDefault(QLocale::German);
+d = QString("1234,56").toDouble(&ok);   // ok == true, d == 1234.56
+d = QString("1234.56").toDouble(&ok);   // ok == true, d == 1234.56
+
+QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
+str = QString("%1 %L2 %L3")
+      .arg(12345).arg(12345).arg(12345, 0, 16);
+// str == "12345 12,345 3039"
+//! [1]
+
+
+//! [2]
+QLocale korean("ko");
+QLocale swiss("de_CH");
+//! [2]
+
+
+//! [3]
+bool ok;
+double d;
+
+QLocale c(QLocale::C);
+d = c.toDouble( "1234.56", &ok );  // ok == true, d == 1234.56
+d = c.toDouble( "1,234.56", &ok ); // ok == true, d == 1234.56
+d = c.toDouble( "1234,56", &ok );  // ok == false
+
+QLocale german(QLocale::German);
+d = german.toDouble( "1234,56", &ok );  // ok == true, d == 1234.56
+d = german.toDouble( "1.234,56", &ok ); // ok == true, d == 1234.56
+d = german.toDouble( "1234.56", &ok );  // ok == false
+
+d = german.toDouble( "1.234", &ok );    // ok == true, d == 1234.0
+//! [3]
diff --git a/doc/src/snippets/code/src_corelib_tools_qmap.cpp b/doc/src/snippets/code/src_corelib_tools_qmap.cpp
new file mode 100644
index 0000000000..924ed22888
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_tools_qmap.cpp
@@ -0,0 +1,273 @@
+//! [0]
+QMap<QString, int> map;
+//! [0]
+
+
+//! [1]
+map["one"] = 1;
+map["three"] = 3;
+map["seven"] = 7;
+//! [1]
+
+
+//! [2]
+map.insert("twelve", 12);
+//! [2]
+
+
+//! [3]
+int num1 = map["thirteen"];
+int num2 = map.value("thirteen");
+//! [3]
+
+
+//! [4]
+int timeout = 30;
+if (map.contains("TIMEOUT"))
+    timeout = map.value("TIMEOUT");
+//! [4]
+
+
+//! [5]
+int timeout = map.value("TIMEOUT", 30);
+//! [5]
+
+
+//! [6]
+// WRONG
+QMap<int, QWidget *> map;
+...
+for (int i = 0; i < 1000; ++i) {
+    if (map[i] == okButton)
+        cout << "Found button at index " << i << endl;
+}
+//! [6]
+
+
+//! [7]
+QMapIterator<QString, int> i(map);
+while (i.hasNext()) {
+    i.next();
+    cout << i.key() << ": " << i.value() << endl;
+}
+//! [7]
+
+
+//! [8]
+QMap<QString, int>::const_iterator i = map.constBegin();
+while (i != map.constEnd()) {
+    cout << i.key() << ": " << i.value() << endl;
+    ++i;
+}
+//! [8]
+
+
+//! [9]
+map.insert("plenty", 100);
+map.insert("plenty", 2000);
+// map.value("plenty") == 2000
+//! [9]
+
+
+//! [10]
+QList<int> values = map.values("plenty");
+for (int i = 0; i < values.size(); ++i)
+    cout << values.at(i) << endl;
+//! [10]
+
+
+//! [11]
+QMap<QString, int>::iterator i = map.find("plenty");
+while (i != map.end() && i.key() == "plenty") {
+    cout << i.value() << endl;
+    ++i;
+}
+//! [11]
+
+
+//! [12]
+QMap<QString, int> map;
+...
+foreach (int value, map)
+    cout << value << endl;
+//! [12]
+
+
+//! [13]
+#ifndef EMPLOYEE_H
+#define EMPLOYEE_H
+
+class Employee
+{
+public:
+    Employee() {}
+    Employee(const QString &name, const QDate &dateOfBirth);
+    ...
+
+private:
+    QString myName;
+    QDate myDateOfBirth;
+};
+
+inline bool operator<(const Employee &e1, const Employee &e2)
+{
+    if (e1.name() != e2.name())
+        return e1.name() < e2.name();
+    return e1.dateOfBirth() < e2.dateOfBirth();
+}
+
+#endif // EMPLOYEE_H
+//! [13]
+
+
+//! [14]
+QMap<QString, int> map;
+...
+QMap<QString, int>::const_iterator i = map.find("HDR");
+while (i != map.end() && i.key() == "HDR") {
+    cout << i.value() << endl;
+    ++i;
+}
+//! [14]
+
+
+//! [15]
+QMap<int, QString> map;
+map.insert(1, "one");
+map.insert(5, "five");
+map.insert(10, "ten");
+
+map.lowerBound(0);      // returns iterator to (1, "one")
+map.lowerBound(1);      // returns iterator to (1, "one")
+map.lowerBound(2);      // returns iterator to (5, "five")
+map.lowerBound(10);     // returns iterator to (10, "ten")
+map.lowerBound(999);    // returns end()
+//! [15]
+
+
+//! [16]
+QMap<QString, int> map;
+...
+QMap<QString, int>::const_iterator i = map.lowerBound("HDR");
+QMap<QString, int>::const_iterator upperBound = map.upperBound("HDR");
+while (i != upperBound) {
+    cout << i.value() << endl;
+    ++i;
+}
+//! [16]
+
+
+//! [17]
+QMap<int, QString> map;
+map.insert(1, "one");
+map.insert(5, "five");
+map.insert(10, "ten");
+
+map.upperBound(0);      // returns iterator to (1, "one")
+map.upperBound(1);      // returns iterator to (5, "five")
+map.upperBound(2);      // returns iterator to (5, "five")
+map.upperBound(10);     // returns end()
+map.upperBound(999);    // returns end()
+//! [17]
+
+
+//! [18]
+QMap<QString, int> map;
+map.insert("January", 1);
+map.insert("February", 2);
+...
+map.insert("December", 12);
+
+QMap<QString, int>::iterator i;
+for (i = map.begin(); i != map.end(); ++i)
+    cout << i.key() << ": " << i.value() << endl;
+//! [18]
+
+
+//! [19]
+QMap<QString, int>::iterator i;
+for (i = map.begin(); i != map.end(); ++i)
+    i.value() += 2;
+//! [19]
+
+
+//! [20]
+QMap<QString, int>::iterator i = map.begin();
+while (i != map.end()) {
+    if (i.key().startsWith("_"))
+        i = map.erase(i);
+    else
+        ++i;
+}
+//! [20]
+
+
+//! [21]
+QMap<QString, int>::iterator i = map.begin();
+while (i != map.end()) {
+    QMap<QString, int>::iterator prev = i;
+    ++i;
+    if (prev.key().startsWith("_"))
+        map.erase(prev);
+}
+//! [21]
+
+
+//! [22]
+// WRONG
+while (i != map.end()) {
+    if (i.key().startsWith("_"))
+        map.erase(i);
+    ++i;
+}
+//! [22]
+
+
+//! [23]
+if (i.key() == "Hello")
+    i.value() = "Bonjour";
+//! [23]
+
+
+//! [24]
+QMap<QString, int> map;
+map.insert("January", 1);
+map.insert("February", 2);
+...
+map.insert("December", 12);
+
+QMap<QString, int>::const_iterator i;
+for (i = map.constBegin(); i != map.constEnd(); ++i)
+    cout << i.key() << ": " << i.value() << endl;
+//! [24]
+
+
+//! [25]
+QMultiMap<QString, int> map1, map2, map3;
+
+map1.insert("plenty", 100);
+map1.insert("plenty", 2000);
+// map1.size() == 2
+
+map2.insert("plenty", 5000);
+// map2.size() == 1
+
+map3 = map1 + map2;
+// map3.size() == 3
+//! [25]
+
+
+//! [26]
+QList<int> values = map.values("plenty");
+for (int i = 0; i < values.size(); ++i)
+    cout << values.at(i) << endl;
+//! [26]
+
+
+//! [27]
+QMultiMap<QString, int>::iterator i = map.find("plenty");
+while (i != map.end() && i.key() == "plenty") {
+    cout << i.value() << endl;
+    ++i;
+}
+//! [27]
diff --git a/doc/src/snippets/code/src_corelib_tools_qpoint.cpp b/doc/src/snippets/code/src_corelib_tools_qpoint.cpp
new file mode 100644
index 0000000000..f16d856d74
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_tools_qpoint.cpp
@@ -0,0 +1,109 @@
+//! [0]
+QPoint p;
+
+p.setX(p.x() + 1);
+p += QPoint(1, 0);
+p.rx()++;
+//! [0]
+
+
+//! [1]
+QPoint p(1, 2);
+p.rx()--;   // p becomes (0, 2)
+//! [1]
+
+
+//! [2]
+QPoint p(1, 2);
+p.ry()++;   // p becomes (1, 3)
+//! [2]
+
+
+//! [3]
+QPoint p( 3, 7);
+QPoint q(-1, 4);
+p += q;    // p becomes (2, 11)
+//! [3]
+
+
+//! [4]
+QPoint p( 3, 7);
+QPoint q(-1, 4);
+p -= q;    // p becomes (4, 3)
+//! [4]
+
+
+//! [5]
+QPoint p(-1, 4);
+p *= 2.5;    // p becomes (-3, 10)
+//! [5]
+
+
+//! [6]
+QPoint p(-3, 10);
+p /= 2.5;           // p becomes (-1, 4)
+//! [6]
+
+
+//! [7]
+QPoint oldPosition;
+
+MyWidget::mouseMoveEvent(QMouseEvent *event)
+{
+    QPoint point = event->pos() - oldPosition;
+    if (point.manhattanLength() > 3)
+        // the mouse has moved more than 3 pixels since the oldPosition
+}
+//! [7]
+
+
+//! [8]
+double trueLength = sqrt(pow(x(), 2) + pow(y(), 2));
+//! [8]
+
+
+//! [9]
+QPointF p;
+
+p.setX(p.x() + 1.0);
+p += QPointF(1.0, 0.0);
+p.rx()++;
+//! [9]
+
+
+//! [10]
+ QPointF p(1.1, 2.5);
+ p.rx()--;   // p becomes (0.1, 2.5)
+//! [10]
+
+
+//! [11]
+QPointF p(1.1, 2.5);
+p.ry()++;   // p becomes (1.1, 3.5)
+//! [11]
+
+
+//! [12]
+QPointF p( 3.1, 7.1);
+QPointF q(-1.0, 4.1);
+p += q;    // p becomes (2.1, 11.2)
+//! [12]
+
+
+//! [13]
+QPointF p( 3.1, 7.1);
+QPointF q(-1.0, 4.1);
+p -= q;    // p becomes (4.1, 3.0)
+//! [13]
+
+
+//! [14]
+QPointF p(-1.1, 4.1);
+p *= 2.5;    // p becomes (-2.75, 10.25)
+//! [14]
+
+
+//! [15]
+QPointF p(-2.75, 10.25);
+p /= 2.5;           // p becomes (-1.1, 4.1)
+//! [15]
diff --git a/doc/src/snippets/code/src_corelib_tools_qqueue.cpp b/doc/src/snippets/code/src_corelib_tools_qqueue.cpp
new file mode 100644
index 0000000000..da4c4a644c
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_tools_qqueue.cpp
@@ -0,0 +1,8 @@
+//! [0]
+QQueue<int> queue;
+queue.enqueue(1);
+queue.enqueue(2);
+queue.enqueue(3);
+while (!queue.isEmpty())
+    cout << queue.dequeue() << endl;
+//! [0]
diff --git a/doc/src/snippets/code/src_corelib_tools_qrect.cpp b/doc/src/snippets/code/src_corelib_tools_qrect.cpp
new file mode 100644
index 0000000000..fdab506747
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_tools_qrect.cpp
@@ -0,0 +1,10 @@
+//! [0]
+QRect r1(100, 200, 11, 16);
+QRect r2(QPoint(100, 200), QSize(11, 16));
+//! [0]
+
+
+//! [1]
+QRectF r1(100, 200, 11, 16);
+QRectF r2(QPoint(100, 200), QSize(11, 16));
+//! [1]
diff --git a/doc/src/snippets/code/src_corelib_tools_qregexp.cpp b/doc/src/snippets/code/src_corelib_tools_qregexp.cpp
new file mode 100644
index 0000000000..ae25885265
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_tools_qregexp.cpp
@@ -0,0 +1,184 @@
+//! [0]
+QRegExp rx("(\\d+)");
+QString str = "Offsets: 12 14 99 231 7";
+QStringList list;
+int pos = 0;
+
+while ((pos = rx.indexIn(str, pos)) != -1) {
+    list << rx.cap(1);
+    pos += rx.matchedLength();
+}
+// list: ["12", "14", "99", "231", "7"]
+//! [0]
+
+
+//! [1]
+QRegExp rx("*.txt");
+rx.setPatternSyntax(QRegExp::Wildcard);
+rx.exactMatch("README.txt");        // returns true
+rx.exactMatch("welcome.txt.bak");   // returns false
+//! [1]
+
+
+//! [2]
+QRegExp rx("ro+m");
+rx.setMinimal(true);
+//! [2]
+
+
+//! [3]
+QRegExp mark("\\b"      // word boundary
+              "[Mm]ark" // the word we want to match
+            );
+//! [3]
+
+
+//! [4]
+QRegExp rx("^\\d\\d?$");    // match integers 0 to 99
+rx.indexIn("123");          // returns -1 (no match)
+rx.indexIn("-6");           // returns -1 (no match)
+rx.indexIn("6");            // returns 0 (matched as position 0)
+//! [4]
+
+
+//! [5]
+QRegExp rx("^\\S+$");       // match strings without whitespace
+rx.indexIn("Hello world");  // returns -1 (no match)
+rx.indexIn("This_is-OK");   // returns 0 (matched at position 0)
+//! [5]
+
+
+//! [6]
+QRegExp rx("\\b(mail|letter|correspondence)\\b");
+rx.indexIn("I sent you an email");     // returns -1 (no match)
+rx.indexIn("Please write the letter"); // returns 17
+//! [6]
+
+
+//! [7]
+QString captured = rx.cap(1); // captured == "letter"
+//! [7]
+
+
+//! [8]
+QRegExp rx("&(?!amp;)");      // match ampersands but not &amp;
+QString line1 = "This & that";
+line1.replace(rx, "&amp;");
+// line1 == "This &amp; that"
+QString line2 = "His &amp; hers & theirs";
+line2.replace(rx, "&amp;");
+// line2 == "His &amp; hers &amp; theirs"
+//! [8]
+
+
+//! [9]
+QString str = "One Eric another Eirik, and an Ericsson. "
+              "How many Eiriks, Eric?";
+QRegExp rx("\\b(Eric|Eirik)\\b"); // match Eric or Eirik
+int pos = 0;    // where we are in the string
+int count = 0;  // how many Eric and Eirik's we've counted
+while (pos >= 0) {
+    pos = rx.indexIn(str, pos);
+    if (pos >= 0) {
+        ++pos;      // move along in str
+        ++count;    // count our Eric or Eirik
+    }
+}
+//! [9]
+
+
+//! [10]
+str = "Nokia Corporation and/or its subsidiary(-ies)\tqtsoftware.com\tNorway";
+QString company, web, country;
+rx.setPattern("^([^\t]+)\t([^\t]+)\t([^\t]+)$");
+if (rx.indexIn(str) != -1) {
+    company = rx.cap(1);
+    web = rx.cap(2);
+    country = rx.cap(3);
+}
+//! [10]
+
+
+//! [11]
+QStringList field = str.split("\t");
+//! [11]
+
+
+//! [12]
+QRegExp rx("*.html");
+rx.setPatternSyntax(QRegExp::Wildcard);
+rx.exactMatch("index.html");                // returns true
+rx.exactMatch("default.htm");               // returns false
+rx.exactMatch("readme.txt");                // returns false
+//! [12]
+
+
+//! [13]
+QString str = "offsets: 1.23 .50 71.00 6.00";
+QRegExp rx("\\d*\\.\\d+");    // primitive floating point matching
+int count = 0;
+int pos = 0;
+while ((pos = rx.indexIn(str, pos)) != -1) {
+    ++count;
+    pos += rx.matchedLength();
+}
+// pos will be 9, 14, 18 and finally 24; count will end up as 4
+//! [13]
+
+
+//! [14]
+QRegExp rx("(\\d+)(\\s*)(cm|inch(es)?)");
+int pos = rx.indexIn("Length: 36 inches");
+QStringList list = rx.capturedTexts();
+// list is now ("36 inches", "36", " ", "inches", "es")
+//! [14]
+
+
+//! [15]
+QRegExp rx("(\\d+)(?:\\s*)(cm|inch(?:es)?)");
+int pos = rx.indexIn("Length: 36 inches");
+QStringList list = rx.capturedTexts();
+// list is now ("36 inches", "36", "inches")
+//! [15]
+
+
+//! [16]
+QStringList list = rx.capturedTexts();
+QStringList::iterator it = list.begin();
+while (it != list.end()) {
+    myProcessing(*it);
+    ++it;
+}
+//! [16]
+
+
+//! [17]
+QRegExp rxlen("(\\d+)(?:\\s*)(cm|inch)");
+int pos = rxlen.indexIn("Length: 189cm");
+if (pos > -1) {
+    QString value = rxlen.cap(1); // "189"
+    QString unit = rxlen.cap(2);  // "cm"
+    // ...
+}
+//! [17]
+
+
+//! [18]
+QRegExp rx("/([a-z]+)/([a-z]+)");
+rx.indexIn("Output /dev/null");   // returns 7 (position of /dev/null)
+rx.pos(0);                        // returns 7 (position of /dev/null)
+rx.pos(1);                        // returns 8 (position of dev)
+rx.pos(2);                        // returns 12 (position of null)
+//! [18]
+
+
+//! [19]
+s1 = QRegExp::escape("bingo");   // s1 == "bingo"
+s2 = QRegExp::escape("f(x)");    // s2 == "f\\(x\\)"
+//! [19]
+
+
+//! [20]
+QRegExp rx("(" + QRegExp::escape(name) +
+           "|" + QRegExp::escape(alias) + ")");
+//! [20]
diff --git a/doc/src/snippets/code/src_corelib_tools_qsize.cpp b/doc/src/snippets/code/src_corelib_tools_qsize.cpp
new file mode 100644
index 0000000000..4804dd04ef
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_tools_qsize.cpp
@@ -0,0 +1,96 @@
+//! [0]
+QSize t1(10, 12);
+t1.scale(60, 60, Qt::IgnoreAspectRatio);
+// t1 is (60, 60)
+
+QSize t2(10, 12);
+t2.scale(60, 60, Qt::KeepAspectRatio);
+// t2 is (50, 60)
+
+QSize t3(10, 12);
+t3.scale(60, 60, Qt::KeepAspectRatioByExpanding);
+// t3 is (60, 72)
+//! [0]
+
+
+//! [1]
+QSize size(100, 10);
+size.rwidth() += 20;
+
+// size becomes (120,10)
+//! [1]
+
+
+//! [2]
+QSize size(100, 10);
+size.rheight() += 5;
+
+// size becomes (100,15)
+//! [2]
+
+
+//! [3]
+QSize s( 3, 7);
+QSize r(-1, 4);
+s += r;
+
+// s becomes (2,11)
+//! [3]
+
+
+//! [4]
+QSize s( 3, 7);
+QSize r(-1, 4);
+s -= r;
+
+// s becomes (4,3)
+//! [4]
+
+
+//! [5]
+QSizeF t1(10, 12);
+t1.scale(60, 60, Qt::IgnoreAspectRatio);
+// t1 is (60, 60)
+
+QSizeF t2(10, 12);
+t2.scale(60, 60, Qt::KeepAspectRatio);
+// t2 is (50, 60)
+
+QSizeF t3(10, 12);
+t3.scale(60, 60, Qt::KeepAspectRatioByExpanding);
+// t3 is (60, 72)
+//! [5]
+
+
+//! [6]
+QSizeF size(100.3, 10);
+size.rwidth() += 20.5;
+
+ // size becomes (120.8,10)
+//! [6]
+
+
+//! [7]
+QSizeF size(100, 10.2);
+size.rheight() += 5.5;
+
+// size becomes (100,15.7)
+//! [7]
+
+
+//! [8]
+QSizeF s( 3, 7);
+QSizeF r(-1, 4);
+s += r;
+
+// s becomes (2,11)
+//! [8]
+
+
+//! [9]
+QSizeF s( 3, 7);
+QSizeF r(-1, 4);
+s -= r;
+
+// s becomes (4,3)
+//! [9]
diff --git a/doc/src/snippets/code/src_corelib_tools_qstring.cpp b/doc/src/snippets/code/src_corelib_tools_qstring.cpp
new file mode 100644
index 0000000000..13cdbd5be0
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_tools_qstring.cpp
@@ -0,0 +1,47 @@
+//! [0]
+DEFINES += QT_NO_CAST_FROM_ASCII \
+           QT_NO_CAST_TO_ASCII
+//! [0]
+
+
+//! [1]
+QString url = QLatin1String("http://www.unicode.org/");
+//! [1]
+
+
+//! [2]
+double d = 12.34;
+QString str = QString("delta: %1").arg(d, 0, 'E', 3);
+// str == "delta: 1.234E+01"
+//! [2]
+
+
+//! [3]
+if (str == "auto" || str == "extern"
+        || str == "static" || str == "register") {
+    ...
+}
+//! [3]
+
+
+//! [4]
+if (str == QString("auto") || str == QString("extern")
+        || str == QString("static") || str == QString("register")) {
+    ...
+}
+//! [4]
+
+
+//! [5]
+if (str == QLatin1String("auto")
+        || str == QLatin1String("extern")
+        || str == QLatin1String("static")
+        || str == QLatin1String("register") {
+    ...
+}
+//! [5]
+
+
+//! [6]
+QLabel *label = new QLabel(QLatin1String("MOD"), this);
+//! [6]
diff --git a/doc/src/snippets/code/src_corelib_tools_qtimeline.cpp b/doc/src/snippets/code/src_corelib_tools_qtimeline.cpp
new file mode 100644
index 0000000000..a16205f6ee
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_tools_qtimeline.cpp
@@ -0,0 +1,15 @@
+//! [0]
+...
+progressBar = new QProgressBar(this);
+progressBar->setRange(0, 100);
+
+// Construct a 1-second timeline with a frame range of 0 - 100
+QTimeLine *timeLine = new QTimeLine(1000, this);
+timeLine->setFrameRange(0, 100);
+connect(timeLine, SIGNAL(frameChanged(int)), progressBar, SLOT(setValue(int)));
+
+// Clicking the push button will start the progress bar animation
+pushButton = new QPushButton(tr("Start animation"), this);
+connect(pushButton, SIGNAL(clicked()), timeLine, SLOT(start()));
+...
+//! [0]
diff --git a/doc/src/snippets/code/src_corelib_tools_qvector.cpp b/doc/src/snippets/code/src_corelib_tools_qvector.cpp
new file mode 100644
index 0000000000..bbe7ca288c
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_tools_qvector.cpp
@@ -0,0 +1,143 @@
+//! [0]
+QVector<int> integerVector;
+QVector<QString> stringVector;
+//! [0]
+
+
+//! [1]
+QVector<QString> vector(200);
+//! [1]
+
+
+//! [2]
+QVector<QString> vector(200, "Pass");
+//! [2]
+
+
+//! [3]
+if (vector[0] == "Liz")
+    vector[0] = "Elizabeth";
+//! [3]
+
+
+//! [4]
+for (int i = 0; i < vector.size(); ++i) {
+    if (vector.at(i) == "Alfonso")
+        cout << "Found Alfonso at position " << i << endl;
+}
+//! [4]
+
+
+//! [5]
+int i = vector.indexOf("Harumi");
+if (i != -1)
+    cout << "First occurrence of Harumi is at position " << i << endl;
+//! [5]
+
+
+//! [6]
+QVector<int> vector(10);
+int *data = vector.data();
+for (int i = 0; i < 10; ++i)
+    data[i] = 2 * i;
+//! [6]
+
+
+//! [7]
+QVector<QString> vector(0);
+vector.append("one");
+vector.append("two");
+vector.append("three");
+// vector: ["one", "two", "three"]
+//! [7]
+
+
+//! [8]
+QVector<QString> vector;
+vector.prepend("one");
+vector.prepend("two");
+vector.prepend("three");
+// vector: ["three", "two", "one"]
+//! [8]
+
+
+//! [9]
+QVector<QString> vector;
+vector << "alpha" << "beta" << "delta";
+vector.insert(2, "gamma");
+// vector: ["alpha", "beta", "gamma", "delta"]
+//! [9]
+
+
+//! [10]
+QVector<double> vector;
+vector << 2.718 << 1.442 << 0.4342;
+vector.insert(1, 3, 9.9);
+// vector: [2.718, 9.9, 9.9, 9.9, 1.442, 0.4342]
+//! [10]
+
+
+//! [11]
+QVector<QString> vector(3);
+vector.fill("Yes");
+// vector: ["Yes", "Yes", "Yes"]
+
+vector.fill("oh", 5);
+// vector: ["oh", "oh", "oh", "oh", "oh"]
+//! [11]
+
+
+//! [12]
+QVector<QString> vector;
+vector << "A" << "B" << "C" << "B" << "A";
+vector.indexOf("B");            // returns 1
+vector.indexOf("B", 1);         // returns 1
+vector.indexOf("B", 2);         // returns 3
+vector.indexOf("X");            // returns -1
+//! [12]
+
+
+//! [13]
+QList<QString> vector;
+vector << "A" << "B" << "C" << "B" << "A";
+vector.lastIndexOf("B");        // returns 3
+vector.lastIndexOf("B", 3);     // returns 3
+vector.lastIndexOf("B", 2);     // returns 1
+vector.lastIndexOf("X");        // returns -1
+//! [13]
+
+
+//! [14]
+QVector<double> vect;
+vect << "red" << "green" << "blue" << "black";
+
+QList<double> list = vect.toList();
+// list: ["red", "green", "blue", "black"]
+//! [14]
+
+
+//! [15]
+QStringList list;
+list << "Sven" << "Kim" << "Ola";
+
+QVector<QString> vect = QVector<QString>::fromList(list);
+// vect: ["Sven", "Kim", "Ola"]
+//! [15]
+
+
+//! [16]
+std::vector<double> stdvector;
+vector.push_back(1.2);
+vector.push_back(0.5);
+vector.push_back(3.14);
+
+QVector<double> vector = QVector<double>::fromStdVector(stdvector);
+//! [16]
+
+
+//! [17]
+QVector<double> vector;
+vector << 1.2 << 0.5 << 3.14;
+
+std::vector<double> stdvector = vector.toStdVector();
+//! [17]
diff --git a/doc/src/snippets/code/src_corelib_xml_qxmlstream.cpp b/doc/src/snippets/code/src_corelib_xml_qxmlstream.cpp
new file mode 100644
index 0000000000..b445a615af
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_xml_qxmlstream.cpp
@@ -0,0 +1,27 @@
+//! [0]
+  QXmlStreamReader xml;
+  ...
+  while (!xml.atEnd()) {
+        xml.readNext();
+        ... // do processing
+  }
+  if (xml.hasError()) {
+        ... // do error handling
+  }
+//! [0]
+
+
+//! [1]
+        writeStartElement(qualifiedName);
+        writeCharacters(text);
+        writeEndElement();
+//! [1]
+
+
+//! [2]
+        writeStartElement(namespaceUri, name);
+        writeCharacters(text);
+        writeEndElement();
+//! [2]
+
+
diff --git a/doc/src/snippets/code/src_gui_accessible_qaccessible.cpp b/doc/src/snippets/code/src_gui_accessible_qaccessible.cpp
new file mode 100644
index 0000000000..69ebeb2a6e
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_accessible_qaccessible.cpp
@@ -0,0 +1,8 @@
+//! [0]
+QAccessibleInterface *child = 0;
+int targetChild = object->navigate(Accessible::Child, 1, &child);
+if (child) {
+    // ...
+    delete child;
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_dialogs_qabstractprintdialog.cpp b/doc/src/snippets/code/src_gui_dialogs_qabstractprintdialog.cpp
new file mode 100644
index 0000000000..e947bd7a13
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_dialogs_qabstractprintdialog.cpp
@@ -0,0 +1,6 @@
+//! [0]
+QPrintDialog printDialog(printer, parent);
+if (printDialog.exec() == QDialog::Accepted) {
+    // print ...
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp b/doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp
new file mode 100644
index 0000000000..6962f4d0f9
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp
@@ -0,0 +1,91 @@
+//! [0]
+fileName = QFileDialog::getOpenFileName(this,
+    tr("Open Image"), "/home/jana", tr("Image Files (*.png *.jpg *.bmp)"));
+//! [0]
+
+
+//! [1]
+"Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)"
+//! [1]
+
+
+//! [2]
+QFileDialog dialog(this);
+dialog.setFileMode(QFileDialog::AnyFile);
+//! [2]
+
+
+//! [3]
+dialog.setNameFilter(tr("Images (*.png *.xpm *.jpg)"));
+//! [3]
+
+
+//! [4]
+dialog.setViewMode(QFileDialog::Detail);
+//! [4]
+
+
+//! [5]
+QStringList fileNames;
+if (dialog.exec())
+    fileNames = dialog.selectedFiles();
+//! [5]
+
+
+//! [6]
+dialog.setNameFilter("All C++ files (*.cpp *.cc *.C *.cxx *.c++)");
+dialog.setNameFilter("*.cpp *.cc *.C *.cxx *.c++");
+//! [6]
+
+
+//! [7]
+QStringList filters;
+filters << "Image files (*.png *.xpm *.jpg)"
+        << "Text files (*.txt)"
+        << "Any files (*)";
+
+QFileDialog dialog(this);
+dialog.setNameFilters(filters);
+dialog.exec();
+//! [7]
+
+
+//! [8]
+QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"),
+                                                "/home",
+                                                tr("Images (*.png *.xpm *.jpg)"));
+//! [8]
+
+
+//! [9]
+QStringList files = QFileDialog::getOpenFileNames(
+                        this,
+                        "Select one or more files to open",
+                        "/home",
+                        "Images (*.png *.xpm *.jpg)");
+//! [9]
+
+
+//! [10]
+QStringList list = files;
+QStringList::Iterator it = list.begin();
+while(it != list.end()) {
+    myProcessing(*it);
+    ++it;
+}
+//! [10]
+
+
+//! [11]
+QString fileName = QFileDialog::getSaveFileName(this, tr("Save File"),
+                           "/home/jana/untitled.png",
+                           tr("Images (*.png *.xpm *.jpg)"));
+//! [11]
+
+
+//! [12]
+QString dir = QFileDialog::getExistingDirectory(this, tr("Open Directory"),
+                                                "/home",
+                                                QFileDialog::ShowDirsOnly
+                                                | QFileDialog::DontResolveSymlinks);
+//! [12]
diff --git a/doc/src/snippets/code/src_gui_dialogs_qfontdialog.cpp b/doc/src/snippets/code/src_gui_dialogs_qfontdialog.cpp
new file mode 100644
index 0000000000..f1b06ece68
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_dialogs_qfontdialog.cpp
@@ -0,0 +1,45 @@
+//! [0]
+bool ok;
+QFont font = QFontDialog::getFont(
+                &ok, QFont("Helvetica [Cronyx]", 10), this);
+if (ok) {
+    // the user clicked OK and font is set to the font the user selected
+} else {
+    // the user canceled the dialog; font is set to the initial
+    // value, in this case Helvetica [Cronyx], 10
+}
+//! [0]
+
+
+//! [1]
+myWidget.setFont(QFontDialog::getFont(0, myWidget.font()));
+//! [1]
+
+
+//! [2]
+bool ok;
+QFont font = QFontDialog::getFont(&ok, QFont("Times", 12), this);
+if (ok) {
+    // font is set to the font the user selected
+} else {
+    // the user canceled the dialog; font is set to the initial
+    // value, in this case Times, 12.
+}
+//! [2]
+
+
+//! [3]
+myWidget.setFont(QFontDialog::getFont(0, myWidget.font()));
+//! [3]
+
+
+//! [4]
+bool ok;
+QFont font = QFontDialog::getFont(&ok, this);
+if (ok) {
+    // font is set to the font the user selected
+} else {
+    // the user canceled the dialog; font is set to the default
+    // application font, QApplication::font()
+}
+//! [4]
diff --git a/doc/src/snippets/code/src_gui_dialogs_qmessagebox.cpp b/doc/src/snippets/code/src_gui_dialogs_qmessagebox.cpp
new file mode 100644
index 0000000000..ff0d12880e
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_dialogs_qmessagebox.cpp
@@ -0,0 +1,108 @@
+//! [0]
+int ret = QMessageBox::warning(this, tr("My Application"),
+                               tr("The document has been modified.\n"
+                                  "Do you want to save your changes?"),
+                               QMessageBox::Save | QMessageBox::Discard
+                               | QMessageBox::Cancel,
+                               QMessageBox::Save);
+//! [0]
+
+
+//! [1]
+QMessageBox msgBox;
+msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+switch (msgBox.exec()) {
+case QMessageBox::Yes:
+    // yes was clicked
+    break;
+case QMessageBox::No:
+    // no was clicked
+    break;
+default:
+    // should never be reached
+    break;
+}
+//! [1]
+
+
+//! [2]
+QMessageBox msgBox;
+QPushButton *connectButton = msgBox.addButton(tr("Connect"), QMessageBox::ActionRole);
+QPushButton *abortButton = msgBox.addButton(QMessageBox::Abort);
+
+msgBox.exec();
+
+if (msgBox.clickedButton() == connectButton) {
+    // connect
+} else if (msgBox.clickedButton() == abortButton) {
+    // abort
+}
+//! [2]
+
+
+//! [3]
+QMessageBox messageBox(this);
+QAbstractButton *disconnectButton =
+      messageBox.addButton(tr("Disconnect"), QMessageBox::ActionRole);
+...
+messageBox.exec();
+if (messageBox.clickedButton() == disconnectButton) {
+    ...
+}
+//! [3]
+
+
+//! [4]
+#include <QApplication>
+#include <QMessageBox>
+
+int main(int argc, char *argv[])
+{
+    QT_REQUIRE_VERSION(argc, argv, "4.0.2")
+
+    QApplication app(argc, argv);
+    ...
+    return app.exec();
+}
+//! [4]
+
+//! [5]
+QMessageBox msgBox;
+msgBox.setText("The document has been modified.");
+msgBox.exec();
+//! [5]
+
+//! [6]
+QMessageBox msgBox;
+msgBox.setText("The document has been modified.");
+msgBox.setInformativeText("Do you want to save your changes?");
+msgBox.setStandardButtons(QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
+msgBox.setDefaultButton(QMessageBox::Save);
+int ret = msgBox.exec();
+//! [6]
+
+//! [7]
+switch (ret) {
+  case QMessageBox::Save:
+      // Save was clicked
+      break;
+  case QMessageBox::Discard:
+      // Don't Save was clicked
+      break;
+  case QMessageBox::Cancel:
+      // Cancel was clicked
+      break;
+  default:
+      // should never be reached
+      break;
+}
+//! [7]
+
+//! [9]
+QMessageBox msgBox(this);
+msgBox.setText(tr("The document has been modified.\n"
+                  "Do you want to save your changes?"));
+msgBox.setStandardButtons(QMessageBox::Save | QMessageBox::Discard
+                          | QMessageBox::Cancel);
+msgBox.setDefaultButton(QMessageBox::Save);
+//! [9]
diff --git a/doc/src/snippets/code/src_gui_dialogs_qwizard.cpp b/doc/src/snippets/code/src_gui_dialogs_qwizard.cpp
new file mode 100644
index 0000000000..7890e131f4
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_dialogs_qwizard.cpp
@@ -0,0 +1,40 @@
+//! [0]
+int LicenseWizard::nextId() const
+{
+    switch (currentId()) {
+    case Page_Intro:
+        if (field("intro.evaluate").toBool()) {
+            return Page_Evaluate;
+        } else {
+            return Page_Register;
+        }
+    case Page_Evaluate:
+        return Page_Conclusion;
+    case Page_Register:
+        if (field("register.upgradeKey").toString().isEmpty()) {
+            return Page_Details;
+        } else {
+            return Page_Conclusion;
+        }
+    case Page_Details:
+        return Page_Conclusion;
+    case Page_Conclusion:
+    default:
+        return -1;
+    }
+}
+//! [0]
+
+
+//! [1]
+MyWizard::MyWizard(QWidget *parent)
+    : QWizard(parent)
+{
+    ...
+    QList<QWizard::WizardButton> layout;
+    layout << QWizard::Stretch << QWizard::BackButton << QWizard::CancelButton
+           << QWizard::NextButton << QWizard::FinishButton;
+    setButtonLayout(layout);
+    ...
+}
+//! [1]
diff --git a/doc/src/snippets/code/src_gui_embedded_qcopchannel_qws.cpp b/doc/src/snippets/code/src_gui_embedded_qcopchannel_qws.cpp
new file mode 100644
index 0000000000..98fa4a98ca
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_embedded_qcopchannel_qws.cpp
@@ -0,0 +1,26 @@
+//! [0]
+void MyClass::receive(const QString &message, const QByteArray &data)
+{
+    QDataStream in(data);
+    if (message == "execute(QString,QString)") {
+        QString cmd;
+        QString arg;
+        in >> cmd >> arg;
+        ...
+    } else if (message == "delete(QString)") {
+        QString fileName;
+        in >> fileName;
+        ...
+    } else {
+        ...
+    }
+}
+//! [0]
+
+
+//! [1]
+QByteArray data;
+QDataStream out(&data, QIODevice::WriteOnly);
+out << QString("cat") << QString("file.txt");
+QCopChannel::send("System/Shell", "execute(QString,QString)", data);
+//! [1]
diff --git a/doc/src/snippets/code/src_gui_embedded_qmouse_qws.cpp b/doc/src/snippets/code/src_gui_embedded_qmouse_qws.cpp
new file mode 100644
index 0000000000..0ad3997a4a
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_embedded_qmouse_qws.cpp
@@ -0,0 +1,4 @@
+//! [0]
+s*Xs = a*Xd + b*Yd + c
+s*Ys = d*Xd + e*Yd + f
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_embedded_qmousetslib_qws.cpp b/doc/src/snippets/code/src_gui_embedded_qmousetslib_qws.cpp
new file mode 100644
index 0000000000..26cd76c2fa
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_embedded_qmousetslib_qws.cpp
@@ -0,0 +1,9 @@
+//! [0]
+configure  -L <path to tslib library> -I <path to tslib headers>
+//! [0]
+
+
+//! [1]
+module_raw input
+module linear
+//! [1]
diff --git a/doc/src/snippets/code/src_gui_embedded_qscreen_qws.cpp b/doc/src/snippets/code/src_gui_embedded_qscreen_qws.cpp
new file mode 100644
index 0000000000..52ce3b71cf
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_embedded_qscreen_qws.cpp
@@ -0,0 +1,8 @@
+//! [0]
+[screen driver][:driver specific options][:display number]
+//! [0]
+
+
+//! [1]
+Mach64:/dev/fb1:2
+//! [1]
diff --git a/doc/src/snippets/code/src_gui_embedded_qtransportauth_qws.cpp b/doc/src/snippets/code/src_gui_embedded_qtransportauth_qws.cpp
new file mode 100644
index 0000000000..5ccebe2e48
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_embedded_qtransportauth_qws.cpp
@@ -0,0 +1,47 @@
+
+void wrapInFunction()
+{
+
+//! [0]
+QTransportAuth::Data *conData;
+QTransportAuth *a = QTransportAuth::getInstance();
+
+conData = a->connectTransport(
+    QTransportAuth::Trusted | QTransportAuth::UnixStreamSock,
+    socketDescriptor );
+//! [0]
+
+
+//! [1]
+// mySocket can be any QIODevice subclass
+AuthDevice *ad = a->recvBuf( d, mySocket );
+
+// proxy in the auth device where the socket would have gone
+connect( ad, SIGNAL(readyRead()), this, SLOT(mySocketReadyRead()));
+//! [1]
+
+
+//! [2]
+AuthDevice *ad = a->authBuf( d, mySocket );
+
+ad->write( someData );
+//! [2]
+
+
+//! [3]
+policyCheck( QTransportAuth::Data &, const QString & )
+//! [3]
+
+
+//! [4]
+QTransportAuth::Result r = d.status & QTransportAuth::ErrMask;
+qWarning( "error: %s", QTransportAuth::errorStrings[r] );
+//! [4]
+
+
+//! [5]
+MD5(K XOR opad, MD5(K XOR ipad, text))
+//! [5]
+
+}
+
diff --git a/doc/src/snippets/code/src_gui_embedded_qwindowsystem_qws.cpp b/doc/src/snippets/code/src_gui_embedded_qwindowsystem_qws.cpp
new file mode 100644
index 0000000000..1364f2321d
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_embedded_qwindowsystem_qws.cpp
@@ -0,0 +1,45 @@
+//! [0]
+bool MyScreenSaver::save( int level )
+{
+    switch ( level ) {
+        case 0:
+            if ( dim_enabled ) {
+                // dim the screen
+            }
+            return true;
+        case 1:
+            if ( screenoff_enabled ) {
+                // turn off the screen
+            }
+            return true;
+        case 2:
+            if ( suspend_enabled ) {
+                // suspend
+            }
+            return true;
+        default:
+            return false;
+    }
+}
+
+...
+
+int timings[4];
+timings[0] = 5000;  // dim after 5 seconds
+timings[1] = 10000; // light off after 15 seconds
+timings[2] = 45000; // suspend after 60 seconds
+timings[3] = 0;
+QWSServer::setScreenSaverIntervals( timings );
+
+// ignore the key/mouse event that turns on the screen
+int blocklevel = 1;
+if ( !screenoff_enabled ) {
+    // screenoff is disabled, ignore the key/mouse event that wakes from suspend
+    blocklevel = 2;
+    if ( !suspend_enabled ) {
+        // suspend is disabled, never ignore events
+        blocklevel = -1;
+    }
+}
+QWSServer::setScreenSaverBlockLevel( blocklevel );
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsgridlayout.cpp b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsgridlayout.cpp
new file mode 100644
index 0000000000..ed09b97030
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsgridlayout.cpp
@@ -0,0 +1,13 @@
+//! [0]
+QGraphicsScene scene;
+QGraphicsWidget *textEdit = scene.addWidget(new QTextEdit);
+QGraphicsWidget *pushButton = scene.addWidget(new QPushButton);
+
+QGraphicsGridLayout *layout = new QGraphicsGridLayout;
+layout->addItem(textEdit, 0, 0);
+layout->addItem(pushButton, 0, 1);
+
+QGraphicsWidget *form = new QGraphicsWidget;
+form->setLayout(layout);
+scene.addItem(form);
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
new file mode 100644
index 0000000000..a57de9d45a
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
@@ -0,0 +1,221 @@
+//! [0]
+class SimpleItem : public QGraphicsItem
+{
+public:
+    QRectF boundingRect() const
+    {
+        qreal penWidth = 1;
+        return QRectF(-10 - penWidth / 2, -10 - penWidth / 2,
+                      20 + penWidth / 2, 20 + penWidth / 2);
+    }
+
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+               QWidget *widget)
+    {
+        painter->drawRoundedRect(-10, -10, 20, 20, 5, 5);
+    }
+};
+//! [0]
+
+
+//! [1]
+class CustomItem : public QGraphicsItem
+{
+   ...
+   enum { Type = UserType + 1 };
+
+   int type() const
+   {
+       // Enable the use of qgraphicsitem_cast with this item.
+       return Type;
+   }
+   ...
+};
+//! [1]
+
+
+//! [2]
+item->setCursor(Qt::IBeamCursor);
+//! [2]
+
+
+//! [3]
+item->setCursor(Qt::IBeamCursor);
+//! [3]
+
+
+//! [4]
+QGraphicsRectItem rect;
+rect.setPos(100, 100);
+
+rect.sceneTransform().map(QPointF(0, 0));
+// returns QPointF(100, 100);
+
+rect.sceneTransform().inverted().map(QPointF(100, 100));
+// returns QPointF(0, 0);
+//! [4]
+
+
+//! [5]
+QGraphicsRectItem rect;
+rect.setPos(100, 100);
+
+rect.deviceTransform(view->viewportTransform()).map(QPointF(0, 0));
+// returns the item's (0, 0) point in view's viewport coordinates
+
+rect.deviceTransform(view->viewportTransform()).inverted().map(QPointF(100, 100));
+// returns view's viewport's (100, 100) coordinate in item coordinates
+//! [5]
+
+
+//! [6]
+// Rotate an item 45 degrees around (0, 0).
+item->rotate(45);
+
+// Rotate an item 45 degrees around (x, y).
+item->setTransform(QTransform().translate(x, y).rotate(45).translate(-x, -y));
+//! [6]
+
+
+//! [7]
+// Scale an item by 3x2 from its origin
+item->scale(3, 2);
+
+// Scale an item by 3x2 from (x, y)
+item->setTransform(QTransform().translate(x, y).scale(3, 2).translate(-x, -y));
+//! [7]
+
+
+//! [8]
+QRectF CircleItem::boundingRect() const
+{
+    qreal penWidth = 1;
+    return QRectF(-radius - penWidth / 2, -radius - penWidth / 2,
+                  diameter + penWidth, diameter + penWidth);
+}
+//! [8]
+
+
+//! [9]
+QPainterPath RoundItem::shape() const
+{
+    QPainterPath path;
+    path.addEllipse(boundingRect());
+    return path;
+}
+//! [9]
+
+
+//! [10]
+void RoundRectItem::paint(QPainter *painter,
+                          const QStyleOptionGraphicsItem *option,
+                          QWidget *widget)
+{
+    painter->drawRoundedRect(-10, -10, 20, 20, 5, 5);
+}
+//! [10]
+
+
+//! [11]
+static const int ObjectName = 0;
+
+QGraphicsItem *item = scene.itemAt(100, 50);
+if (item->data(ObjectName).toString().isEmpty()) {
+    if (qgraphicsitem_cast<ButtonItem *>(item))
+        item->setData(ObjectName, "Button");
+}
+//! [11]
+
+
+//! [12]
+QGraphicsScene scene;
+QGraphicsEllipseItem *ellipse = scene.addEllipse(QRectF(-10, -10, 20, 20));
+QGraphicsLineItem *line = scene.addLine(QLineF(-10, -10, 20, 20));
+
+line->installSceneEventFilter(ellipse);
+// line's events are filtered by ellipse's sceneEventFilter() function.
+
+ellipse->installSceneEventFilter(line);
+// ellipse's events are filtered by line's sceneEventFilter() function.
+//! [12]
+
+
+//! [13]
+void CustomItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
+{
+    QMenu menu;
+    QAction *removeAction = menu.addAction("Remove");
+    QAction *markAction = menu.addAction("Mark");
+    QAction *selectedAction = menu.exec(event->screenPos());
+    // ...
+}
+//! [13]
+
+
+//! [14]
+CustomItem::CustomItem()
+{
+    setAcceptDrops(true);
+    ...
+}
+
+void CustomItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
+{
+    event->setAccepted(event->mimeData()->hasFormat("text/plain"));
+}
+//! [14]
+
+
+//! [15]
+QVariant Component::itemChange(GraphicsItemChange change, const QVariant &value)
+{
+    if (change == ItemPositionChange && scene()) {
+        // value is the new position.
+        QPointF newPos = value.toPointF();
+        QRectF rect = scene()->sceneRect();
+        if (!rect.contains(newPos)) {
+            // Keep the item inside the scene rect.
+            newPos.setX(qMin(rect.right(), qMax(newPos.x(), rect.left())));
+            newPos.setY(qMin(rect.bottom(), qMax(newPos.y(), rect.top())));
+            return newPos;
+        }
+    }
+    return QGraphicsItem::itemChange(change, value);
+}
+//! [15]
+
+
+//! [16]
+void CircleItem::setRadius(qreal newRadius)
+{
+    if (radius != newRadius) {
+        prepareGeometryChange();
+        radius = newRadius;
+    }
+}
+//! [16]
+
+
+//! [17]
+// Group all selected items together
+QGraphicsItemGroup *group = scene->createItemGroup(scene->selecteditems());
+
+// Destroy the group, and delete the group item
+scene->destroyItemGroup(group);
+//! [17]
+
+
+//! [QGraphicsItem type]
+class CustomItem : public QGraphicsItem
+{
+   ...
+   enum { Type = UserType + 1 };
+
+   int type() const
+   {
+       // Enable the use of qgraphicsitem_cast with this item.
+       return Type;
+   }
+   ...
+};
+//! [QGraphicsItem type]
diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicslinearlayout.cpp b/doc/src/snippets/code/src_gui_graphicsview_qgraphicslinearlayout.cpp
new file mode 100644
index 0000000000..77f749195d
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_graphicsview_qgraphicslinearlayout.cpp
@@ -0,0 +1,13 @@
+//! [0]
+QGraphicsScene scene;
+QGraphicsWidget *textEdit = scene.addWidget(new QTextEdit);
+QGraphicsWidget *pushButton = scene.addWidget(new QPushButton);
+
+QGraphicsLinearLayout *layout = new QGraphicsLinearLayout;
+layout->addItem(textEdit);
+layout->addItem(pushButton);
+
+QGraphicsWidget *form = new QGraphicsWidget;
+form->setLayout(layout);
+scene.addItem(form);
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsproxywidget.cpp b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsproxywidget.cpp
new file mode 100644
index 0000000000..6c62f26a77
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsproxywidget.cpp
@@ -0,0 +1,47 @@
+//! [0]
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    QTabWidget *tabWidget = new QTabWidget;
+
+    QGraphicsScene scene;
+    QGraphicsProxyWidget *proxy = scene.addWidget(tabWidget);
+
+    QGraphicsView view(&scene);
+    view.show();
+
+    return app.exec();
+}
+//! [0]
+
+//! [1]
+QGroupBox *groupBox = new QGroupBox("Contact Details");
+QLabel *numberLabel = new QLabel("Telephone number");
+QLineEdit *numberEdit = new QLineEdit;
+
+QFormLayout *layout = new QFormLayout;
+layout->addRow(numberLabel, numberEdit);
+groupBox->setLayout(layout);
+
+QGraphicsScene scene;
+QGraphicsProxyWidget *proxy = scene.addWidget(groupBox);
+
+QGraphicsView view(&scene);
+view.show();
+//! [1]
+
+//! [2]
+QGraphicsScene scene;
+
+QLineEdit *edit = new QLineEdit;
+QGraphicsProxyWidget *proxy = scene.addWidget(edit);
+
+edit->isVisible();  // returns true
+proxy->isVisible(); // also returns true
+
+edit->hide();
+
+edit->isVisible();  // returns false
+proxy->isVisible(); // also returns false
+//! [2]
diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsscene.cpp b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsscene.cpp
new file mode 100644
index 0000000000..20b0979a92
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsscene.cpp
@@ -0,0 +1,82 @@
+//! [0]
+QGraphicsScene scene;
+scene.addText("Hello, world!");
+
+QGraphicsView view(&scene);
+view.show();
+//! [0]
+
+
+//! [1]
+QGraphicsScene scene;
+scene.addItem(...
+...
+QPrinter printer(QPrinter::HighResolution);
+printer.setPaperSize(QPrinter::A4);
+
+QPainter painter(&printer);
+scene.render(&painter);
+//! [1]
+
+
+//! [2]
+QSizeF segmentSize = sceneRect().size() / pow(2, depth - 1);
+//! [2]
+
+
+//! [3]
+QGraphicsScene scene;
+QGraphicsView view(&scene);
+view.show();
+
+// a blue background
+scene.setBackgroundBrush(Qt::blue);
+
+// a gradient background
+QRadialGradient gradient(0, 0, 10);
+gradient.setSpread(QGradient::RepeatSpread);
+scene.setBackgroundBrush(gradient);
+//! [3]
+
+
+//! [4]
+QGraphicsScene scene;
+QGraphicsView view(&scene);
+view.show();
+
+// a white semi-transparent foreground
+scene.setForegroundBrush(QColor(255, 255, 255, 127));
+
+// a grid foreground
+scene.setForegroundBrush(QBrush(Qt::lightGray, Qt::CrossPattern));
+//! [4]
+
+
+//! [5]
+QRectF TileScene::rectForTile(int x, int y) const
+{
+    // Return the rectangle for the tile at position (x, y).
+    return QRectF(x * tileWidth, y * tileHeight, tileWidth, tileHeight);
+}
+
+void TileScene::setTile(int x, int y, const QPixmap &pixmap)
+{
+    // Sets or replaces the tile at position (x, y) with pixmap.
+    if (x >= 0 && x < numTilesH && y >= 0 && y < numTilesV) {
+        tiles[y][x] = pixmap;
+        invalidate(rectForTile(x, y), BackgroundLayer);
+    }
+}
+
+void TileScene::drawBackground(QPainter *painter, const QRectF &exposed)
+{
+    // Draws all tiles that intersect the exposed area.
+    for (int y = 0; y < numTilesV; ++y) {
+        for (int x = 0; x < numTilesH; ++x) {
+            QRectF rect = rectForTile(x, y);
+            if (exposed.intersects(rect))
+                painter->drawPixmap(rect.topLeft(), tiles[y][x]);
+        }
+    }
+}
+//! [5]
diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicssceneevent.cpp b/doc/src/snippets/code/src_gui_graphicsview_qgraphicssceneevent.cpp
new file mode 100644
index 0000000000..9b6c22eb16
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_graphicsview_qgraphicssceneevent.cpp
@@ -0,0 +1,5 @@
+//! [0]
+
+setDropAction(proposedAction());
+
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsview.cpp b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsview.cpp
new file mode 100644
index 0000000000..d22b8726fb
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsview.cpp
@@ -0,0 +1,92 @@
+//! [0]
+QGraphicsScene scene;
+scene.addText("Hello, world!");
+
+QGraphicsView view(&scene);
+view.show();
+//! [0]
+
+
+//! [1]
+QGraphicsScene scene;
+scene.addRect(QRectF(-10, -10, 20, 20));
+
+QGraphicsView view(&scene);
+view.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+view.show();
+//! [1]
+
+
+//! [2]
+QGraphicsView view;
+view.setBackgroundBrush(QImage(":/images/backgroundtile.png"));
+view.setCacheMode(QGraphicsView::CacheBackground);
+//! [2]
+
+
+//! [3]
+QGraphicsScene scene;
+scene.addText("GraphicsView rotated clockwise");
+
+QGraphicsView view(&scene);
+view.rotate(90); // the text is rendered with a 90 degree clockwise rotation
+view.show();
+//! [3]
+
+
+//! [4]
+QGraphicsScene scene;
+scene.addItem(...
+...
+
+QGraphicsView view(&scene);
+view.show();
+...
+
+QPrinter printer(QPrinter::HighResolution);
+printer.setPageSize(QPrinter::A4);
+QPainter painter(&printer);
+
+// print, fitting the viewport contents into a full page
+view.render(&painter);
+
+// print the upper half of the viewport into the lower.
+// half of the page.
+QRect viewport = view.viewport()->rect();
+view.render(&painter,
+            QRectF(0, printer.height() / 2,
+                   printer.width(), printer.height() / 2),
+            viewport.adjusted(0, 0, 0, -viewport.height() / 2));
+
+//! [4]
+
+
+//! [5]
+void CustomView::mousePressEvent(QMouseEvent *event)
+{
+    qDebug() << "There are" << items(event->pos()).size()
+             << "items at position" << mapToScene(event->pos());
+}
+//! [5]
+
+
+//! [6]
+void CustomView::mousePressEvent(QMouseEvent *event)
+{
+    if (QGraphicsItem *item = itemAt(event->pos())) {
+        qDebug() << "You clicked on item" << item;
+    } else {
+        qDebug() << "You didn't click on an item.";
+    }
+}
+//! [6]
+
+
+//! [7]
+QGraphicsScene scene;
+scene.addText("GraphicsView rotated clockwise");
+
+QGraphicsView view(&scene);
+view.rotate(90); // the text is rendered with a 90 degree clockwise rotation
+view.show();
+//! [7]
diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicswidget.cpp b/doc/src/snippets/code/src_gui_graphicsview_qgraphicswidget.cpp
new file mode 100644
index 0000000000..06fa6421b7
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_graphicsview_qgraphicswidget.cpp
@@ -0,0 +1,26 @@
+//! [0]
+void MyGroupBoxWidget::initStyleOption(QStyleOption *option) const
+{
+    QGraphicsWidget::initStyleOption(option);
+    if (QStyleOptionGroupBox *box = qstyleoption_cast<QStyleOptionGroupBox *>(option)) {
+        // Add group box specific state.
+        box->flat = isFlat();
+        ...
+    }
+}
+//! [0]
+
+
+//! [1]
+setTabOrder(a, b); // a to b
+setTabOrder(b, c); // a to b to c
+setTabOrder(c, d); // a to b to c to d
+//! [1]
+
+
+//! [2]
+// WRONG
+setTabOrder(c, d); // c to d
+setTabOrder(a, b); // a to b AND c to d
+setTabOrder(b, c); // a to b to c, but not c to d
+//! [2]
diff --git a/doc/src/snippets/code/src_gui_image_qbitmap.cpp b/doc/src/snippets/code/src_gui_image_qbitmap.cpp
new file mode 100644
index 0000000000..fa8317a1aa
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_image_qbitmap.cpp
@@ -0,0 +1,4 @@
+//! [0]
+uchar arrow_bits[] = { 0x3f, 0x1f, 0x0f, 0x1f, 0x3b, 0x71, 0xe0, 0xc0 };
+QBitmap bm(8, 8, arrow_bits, true);
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_image_qicon.cpp b/doc/src/snippets/code/src_gui_image_qicon.cpp
new file mode 100644
index 0000000000..2b7c893150
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_image_qicon.cpp
@@ -0,0 +1,22 @@
+//! [0]
+QToolButton *button = new QToolButton;
+button->setIcon(QIcon("open.xpm"));
+//! [0]
+
+
+//! [1]
+button->setIcon(QIcon());
+//! [1]
+
+
+//! [2]
+void MyWidget::drawIcon(QPainter *painter, QPoint pos)
+{
+    QPixmap pixmap = icon.pixmap(QSize(22, 22),
+                                   isEnabled() ? QIcon::Normal
+                                               : QIcon::Disabled,
+                                   isOn() ? QIcon::On
+                                          : QIcon::Off);
+    painter->drawPixmap(pos, pixmap);
+}
+//! [2]
diff --git a/doc/src/snippets/code/src_gui_image_qimage.cpp b/doc/src/snippets/code/src_gui_image_qimage.cpp
new file mode 100644
index 0000000000..3b7d8de1a1
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_image_qimage.cpp
@@ -0,0 +1,42 @@
+//! [0]
+QImage image(3, 3, QImage::Format_RGB32);
+QRgb value;
+
+value = qRgb(189, 149, 39); // 0xffbd9527
+image.setPixel(1, 1, value);
+
+value = qRgb(122, 163, 39); // 0xff7aa327
+image.setPixel(0, 1, value);
+image.setPixel(1, 0, value);
+
+value = qRgb(237, 187, 51); // 0xffedba31
+image.setPixel(2, 1, value);
+//! [0]
+
+
+//! [1]
+QImage image(3, 3, QImage::Format_Indexed8);
+QRgb value;
+
+value = qRgb(122, 163, 39); // 0xff7aa327
+image.setColor(0, value);
+
+value = qRgb(237, 187, 51); // 0xffedba31
+image.setColor(1, value);
+
+value = qRgb(189, 149, 39); // 0xffbd9527
+image.setColor(2, value);
+
+image.setPixel(0, 1, 0);
+image.setPixel(1, 0, 0);
+image.setPixel(1, 1, 2);
+image.setPixel(2, 1, 1);
+//! [1]
+
+
+//! [2]
+static const char * const start_xpm[] = {
+    "16 15 8 1",
+    "a c #cec6bd",
+....
+//! [2]
diff --git a/doc/src/snippets/code/src_gui_image_qimagereader.cpp b/doc/src/snippets/code/src_gui_image_qimagereader.cpp
new file mode 100644
index 0000000000..c645144ca5
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_image_qimagereader.cpp
@@ -0,0 +1,26 @@
+//! [0]
+QImageReader reader;
+reader.setFormat("png"); // same as reader.setFormat("PNG");
+//! [0]
+
+
+//! [1]
+QImageReader reader("image.png");
+// reader.format() == "png"
+//! [1]
+
+
+//! [2]
+QImage icon(64, 64, QImage::Format_RGB32);
+QImageReader reader("icon_64x64.bmp");
+if (reader.read(&icon)) {
+    // Display icon
+}
+//! [2]
+
+
+//! [3]
+QImageReader reader(":/image.png");
+if (reader.supportsOption(QImageIOHandler::Size))
+    qDebug() << "Size:" << reader.size();
+//! [3]
diff --git a/doc/src/snippets/code/src_gui_image_qimagewriter.cpp b/doc/src/snippets/code/src_gui_image_qimagewriter.cpp
new file mode 100644
index 0000000000..d4a41187e4
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_image_qimagewriter.cpp
@@ -0,0 +1,19 @@
+//! [0]
+QImageWriter writer;
+writer.setFormat("png"); // same as writer.setFormat("PNG");
+//! [0]
+
+
+//! [1]
+QImage image("some/image.jpeg");
+QImageWriter writer("images/outimage.png", "png");
+writer.setText("Author", "John Smith");
+writer.write(image);
+//! [1]
+
+
+//! [2]
+QImageWriter writer(fileName);
+if (writer.supportsOption(QImageIOHandler::Description))
+    writer.setText("Author", "John Smith");
+//! [2]
diff --git a/doc/src/snippets/code/src_gui_image_qmovie.cpp b/doc/src/snippets/code/src_gui_image_qmovie.cpp
new file mode 100644
index 0000000000..77130e8256
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_image_qmovie.cpp
@@ -0,0 +1,13 @@
+//! [0]
+QLabel label;
+QMovie *movie = new QMovie("animations/fire.gif");
+
+label.setMovie(movie);
+movie->start();
+//! [0]
+
+
+//! [1]
+QMovie movie("racecar.gif");
+movie.setSpeed(200); // 2x speed
+//! [1]
diff --git a/doc/src/snippets/code/src_gui_image_qpixmap.cpp b/doc/src/snippets/code/src_gui_image_qpixmap.cpp
new file mode 100644
index 0000000000..822b466084
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_image_qpixmap.cpp
@@ -0,0 +1,18 @@
+//! [0]
+static const char * const start_xpm[]={
+    "16 15 8 1",
+    "a c #cec6bd",
+....
+//! [0]
+
+
+//! [1]
+QPixmap myPixmap;
+myPixmap->setMask(myPixmap->createHeuristicMask());
+//! [1]
+
+//! [2]
+QPixmap pixmap("background.png");
+QRegion exposed;
+pixmap.scroll(10, 10, pixmap.rect(), &exposed);
+//! [2]
diff --git a/doc/src/snippets/code/src_gui_image_qpixmapcache.cpp b/doc/src/snippets/code/src_gui_image_qpixmapcache.cpp
new file mode 100644
index 0000000000..c4b6353880
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_image_qpixmapcache.cpp
@@ -0,0 +1,21 @@
+//! [0]
+QPixmap* pp;
+QPixmap p;
+if ((pp=QPixmapCache::find("my_big_image", pm))) {
+    p = *pp;
+} else {
+    p.load("bigimage.png");
+    QPixmapCache::insert("my_big_image", new QPixmap(p));
+}
+painter->drawPixmap(0, 0, p);
+//! [0]
+
+
+//! [1]
+QPixmap pm;
+if (!QPixmapCache::find("my_big_image", pm)) {
+    pm.load("bigimage.png");
+    QPixmapCache::insert("my_big_image", pm);
+}
+painter->drawPixmap(0, 0, pm);
+//! [1]
diff --git a/doc/src/snippets/code/src_gui_image_qpixmapfilter.cpp b/doc/src/snippets/code/src_gui_image_qpixmapfilter.cpp
new file mode 100644
index 0000000000..e305109baa
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_image_qpixmapfilter.cpp
@@ -0,0 +1,22 @@
+//! [0]
+QPixmapColorizeFilter *myFilter = new QPixmapColorFilter;
+myFilter->setColor(QColor(128, 0, 0));
+myFilter->draw(painter, QPoint(0, 0), originalPixmap);
+//! [0]
+
+//! [1]
+QPixmapConvolutionFilter *myFilter = new QPixmapConvolutionFilter;
+qreal kernel[] = {
+     0.0,-1.0, 0.0,
+    -1.0, 5.0,-1.0,
+     0.0,-1.0, 0.0
+    };
+myFilter->setConvolutionKernel(kernel, 3, 3);
+myFilter->draw(painter, QPoint(0, 0), originalPixmap);
+//! [1]
+
+//! [2]
+QPixmapDropShadowFilter *myFilter = new QPixmapDropShadowFilter;
+myFilter->draw(painter, QPoint(0, 0), originalPixmap);
+//! [2]
+
diff --git a/doc/src/snippets/code/src_gui_itemviews_qabstractitemview.cpp b/doc/src/snippets/code/src_gui_itemviews_qabstractitemview.cpp
new file mode 100644
index 0000000000..9814c74487
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_itemviews_qabstractitemview.cpp
@@ -0,0 +1,18 @@
+//! [0]
+void MyView::resizeEvent(QResizeEvent *event) {
+    horizontalScrollBar()->setRange(0, realWidth - width());
+    ...
+}
+//! [0]
+
+//! [1]
+setIndexWidget(index, new QLineEdit);
+...
+setIndexWidget(index, new QTextEdit);
+//! [1]
+
+//! [2]
+QItemSelectionModel *m = view->selectionModel();
+view->setModel(new model);
+delete m;
+//! [2]
diff --git a/doc/src/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp b/doc/src/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp
new file mode 100644
index 0000000000..ea5363cf31
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp
@@ -0,0 +1,23 @@
+//! [0]
+QDataWidgetMapper *mapper = new QDataWidgetMapper;
+mapper->setModel(model);
+mapper->addMapping(mySpinBox, 0);
+mapper->addMapping(myLineEdit, 1);
+mapper->addMapping(myCountryChooser, 2);
+mapper->toFirst();
+//! [0]
+
+
+//! [1]
+QDataWidgetMapper *mapper = new QDataWidgetMapper();
+mapper->setModel(myModel);
+mapper->addMapping(nameLineEdit, 0);
+mapper->addMapping(ageSpinBox, 1);
+//! [1]
+
+
+//! [2]
+QDataWidgetMapper *mapper = new QDataWidgetMapper(); 
+connect(myTableView->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),
+        mapper, SLOT(setCurrentModelIndex(QModelIndex)));
+//! [2]
diff --git a/doc/src/snippets/code/src_gui_itemviews_qitemeditorfactory.cpp b/doc/src/snippets/code/src_gui_itemviews_qitemeditorfactory.cpp
new file mode 100644
index 0000000000..29601bfe30
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_itemviews_qitemeditorfactory.cpp
@@ -0,0 +1,23 @@
+//! [0]
+Q_PROPERTY(QColor color READ color WRITE setColor USER true)
+//! [0]
+
+
+//! [1]
+QItemEditorCreator<MyEditor> *itemCreator =
+    new QItemEditorCreator<MyEditor>("myProperty");
+
+QItemEditorFactory *factory = new QItemEditorFactory;
+//! [1]
+
+
+//! [2]
+QItemEditorFactory *editorFactory = new QItemEditorFactory;
+QItemEditorCreatorBase *creator = new QStandardItemEditorCreator<MyFancyDateTimeEdit>();
+editorFactory->registerEditor(QVariant::DateType, creator);
+//! [2]
+
+
+//! [3]
+Q_PROPERTY(QColor color READ color WRITE setColor USER true)	
+//! [3]
diff --git a/doc/src/snippets/code/src_gui_itemviews_qitemselectionmodel.cpp b/doc/src/snippets/code/src_gui_itemviews_qitemselectionmodel.cpp
new file mode 100644
index 0000000000..9302fa6e95
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_itemviews_qitemselectionmodel.cpp
@@ -0,0 +1,10 @@
+//! [0]
+QItemSelection *selection = new QItemSelection(topLeft, bottomRight);
+//! [0]
+
+
+//! [1]
+QItemSelection *selection = new QItemSelection();
+...
+selection->select(topLeft, bottomRight);
+//! [1]
diff --git a/doc/src/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp b/doc/src/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp
new file mode 100644
index 0000000000..7480ccd77d
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp
@@ -0,0 +1,42 @@
+//! [0]
+QStandardItemModel model(4, 4);
+for (int row = 0; row < 4; ++row) {
+    for (int column = 0; column < 4; ++column) {
+        QStandardItem *item = new QStandardItem(QString("row %0, column %1").arg(row).arg(column));
+        model.setItem(row, column, item);
+    }
+}
+//! [0]
+
+
+//! [1]
+QStandardItemModel model;
+QStandardItem *parentItem = model.invisibleRootItem();
+for (int i = 0; i < 4; ++i) {
+    QStandardItem *item = new QStandardItem(QString("item %0").arg(i));
+    parentItem->appendRow(item);
+    parentItem = item;
+}
+//! [1]
+
+
+//! [2]
+QTreeView *treeView = new QTreeView(this);
+treeView->setModel(myStandardItemModel);
+connect(treeView, SIGNAL(clicked(QModelIndex)),
+        this, SLOT(clicked(QModelIndex)));
+//! [2]
+
+
+//! [3]
+void MyWidget::clicked(const QModelIndex &index)
+{
+    QStandardItem *item = myStandardItemModel->itemFromIndex(index);
+    // Do stuff with the item ...
+}
+//! [3]
+
+
+//! [4]
+treeView->scrollTo(item->index());
+//! [4]
diff --git a/doc/src/snippets/code/src_gui_itemviews_qtablewidget.cpp b/doc/src/snippets/code/src_gui_itemviews_qtablewidget.cpp
new file mode 100644
index 0000000000..80adc0bb20
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_itemviews_qtablewidget.cpp
@@ -0,0 +1,5 @@
+//! [0]
+setCellWidget(index, new QLineEdit);
+...
+setCellWidget(index, new QTextEdit);
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_itemviews_qtreewidget.cpp b/doc/src/snippets/code/src_gui_itemviews_qtreewidget.cpp
new file mode 100644
index 0000000000..ea0478ef10
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_itemviews_qtreewidget.cpp
@@ -0,0 +1,8 @@
+//! [0]
+QTreeWidget *treeWidget = new QTreeWidget();
+treeWidget->setColumnCount(1);
+QList<QTreeWidgetItem *> items;
+for (int i = 0; i < 10; ++i)
+    items.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("item: %1").arg(i))));
+treeWidget->insertTopLevelItems(0, items);
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_kernel_qaction.cpp b/doc/src/snippets/code/src_gui_kernel_qaction.cpp
new file mode 100644
index 0000000000..b052febed3
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_kernel_qaction.cpp
@@ -0,0 +1,9 @@
+//! [0]
+QApplication app(argc, argv);
+app.setAttribute(Qt::AA_DontShowIconsInMenus);  // Icons are *no longer shown* in menus
+// ...
+QAction *myAction = new QAction();
+// ...
+myAction->setIcon(SomeIcon);
+myAction->setIconVisibleInMenu(true);   // Icon *will* be shown in menus for *this* action.
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_kernel_qapplication.cpp b/doc/src/snippets/code/src_gui_kernel_qapplication.cpp
new file mode 100644
index 0000000000..bfb09e302c
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_kernel_qapplication.cpp
@@ -0,0 +1,143 @@
+//! [0]
+int main(int argc, char **argv)
+{
+#ifdef Q_WS_X11
+    bool useGUI = getenv("DISPLAY") != 0;
+#else
+    bool useGUI = true;
+#endif
+    QApplication app(argc, argv, useGUI);
+
+    if (useGUI) {
+       // start GUI version
+       ...
+    } else {
+       // start non-GUI version
+       ...
+    }
+    return app.exec();
+}
+//! [0]
+
+
+//! [1]
+QApplication::setStyle(new QWindowsStyle);
+//! [1]
+
+
+//! [2]
+int main(int argc, char *argv[])
+{
+    QApplication::setColorSpec(QApplication::ManyColor);
+    QApplication app(argc, argv);
+    ...
+    return app.exec();
+}
+//! [2]
+
+
+//! [3]
+QSize MyWidget::sizeHint() const
+{
+    return QSize(80, 25).expandedTo(QApplication::globalStrut());
+}
+//! [3]
+
+
+//! [4]
+void showAllHiddenTopLevelWidgets()
+{
+    foreach (QWidget *widget, QApplication::topLevelWidgets()) {
+        if (widget->isHidden())
+            widget->show();
+    }
+}
+//! [4]
+
+
+//! [5]
+void updateAllWidgets()
+{
+    foreach (QWidget *widget, QApplication::allWidgets())
+        widget->update();
+}
+//! [5]
+
+
+//! [6]
+int main(int argc, char *argv[])
+{
+    QApplication::setDesktopSettingsAware(false);
+    QApplication app(argc, argv);
+    ...
+    return app.exec();
+}
+//! [6]
+
+
+//! [7]
+if ((startPos - currentPos).manhattanLength() >=
+        QApplication::startDragDistance())
+    startTheDrag();
+//! [7]
+
+
+//! [8]
+void MyApplication::commitData(QSessionManager& manager)
+{
+    if (manager.allowsInteraction()) {
+        int ret = QMessageBox::warning(
+                    mainWindow,
+                    tr("My Application"),
+                    tr("Save changes to document?"),
+                    QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
+
+        switch (ret) {
+        case QMessageBox::Save:
+            manager.release();
+            if (!saveDocument())
+                manager.cancel();
+            break;
+        case QMessageBox::Discard:
+            break;
+        case QMessageBox::Cancel:
+        default:
+            manager.cancel();
+        }
+    } else {
+        // we did not get permission to interact, then
+        // do something reasonable instead
+    }
+}
+//! [8]
+
+
+//! [9]
+appname -session id
+//! [9]
+
+
+//! [10]
+foreach (QString command, mySession.restartCommand())
+    do_something(command);
+//! [10]
+
+
+//! [11]
+foreach (QString command, mySession.discardCommand())
+    do_something(command);
+//! [11]
+
+
+//! [12]
+QWidget *widget = qApp->widgetAt(x, y);
+if (widget)
+    widget = widget->window();
+//! [12]
+
+
+//! [13]
+QWidget *widget = qApp->widgetAt(point);
+if (widget)
+    widget = widget->window();
+//! [13]
diff --git a/doc/src/snippets/code/src_gui_kernel_qapplication_x11.cpp b/doc/src/snippets/code/src_gui_kernel_qapplication_x11.cpp
new file mode 100644
index 0000000000..2782200d8d
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_kernel_qapplication_x11.cpp
@@ -0,0 +1,5 @@
+//! [0]
+QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+calculateHugeMandelbrot();              // lunch time...
+QApplication::restoreOverrideCursor();
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_kernel_qclipboard.cpp b/doc/src/snippets/code/src_gui_kernel_qclipboard.cpp
new file mode 100644
index 0000000000..5d1cf2bb9d
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_kernel_qclipboard.cpp
@@ -0,0 +1,13 @@
+//! [0]
+QClipboard *clipboard = QApplication::clipboard();
+QString originalText = clipboard->text();
+...
+clipboard->setText(newText);
+//! [0]
+
+
+//! [1]
+QMimeData *data = new QMimeData;
+data->setImageData(image);
+clipboard->setMimeData(data, mode);
+//! [1]
diff --git a/doc/src/snippets/code/src_gui_kernel_qevent.cpp b/doc/src/snippets/code/src_gui_kernel_qevent.cpp
new file mode 100644
index 0000000000..cd3d0195d3
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_kernel_qevent.cpp
@@ -0,0 +1,14 @@
+//! [0]
+void MyWidget::wheelEvent(QWheelEvent *event)
+{
+    int numDegrees = event->delta() / 8;
+    int numSteps = numDegrees / 15;
+
+    if (event->orientation() == Qt::Horizontal) {
+        scrollHorizontally(numSteps);
+    } else {
+        scrollVertically(numSteps);
+    }
+    event->accept();
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_kernel_qformlayout.cpp b/doc/src/snippets/code/src_gui_kernel_qformlayout.cpp
new file mode 100644
index 0000000000..aed6956360
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_kernel_qformlayout.cpp
@@ -0,0 +1,36 @@
+//! [0]
+QFormLayout *formLayout = new QFormLayout;
+formLayout->addRow(tr("&Name:"), nameLineEdit);
+formLayout->addRow(tr("&Email:"), emailLineEdit);
+formLayout->addRow(tr("&Age:"), ageSpinBox);
+setLayout(formLayout);
+//! [0]
+
+
+//! [1]
+nameLabel = new QLabel(tr("&Name:"));
+nameLabel->setBuddy(nameLineEdit);
+
+emailLabel = new QLabel(tr("&Name:"));
+emailLabel->setBuddy(emailLineEdit);
+
+ageLabel = new QLabel(tr("&Name:"));
+ageLabel->setBuddy(ageSpinBox);
+
+QGridLayout *gridLayout = new QGridLayout;
+gridLayout->addWidget(nameLabel, 0, 0);
+gridLayout->addWidget(nameLineEdit, 0, 1);
+gridLayout->addWidget(emailLabel, 1, 0);
+gridLayout->addWidget(emailLineEdit, 1, 1);
+gridLayout->addWidget(ageLabel, 2, 0);
+gridLayout->addWidget(ageSpinBox, 2, 1);
+setLayout(gridLayout);
+//! [1]
+
+
+//! [2]
+formLayout->setRowWrapPolicy(QFormLayout::DontWrapRows);
+formLayout->setFieldGrowthPolicy(QFormLayout::FieldsStayAtSizeHint);
+formLayout->setFormAlignment(Qt::AlignHCenter | Qt::AlignTop);
+formLayout->setLabelAlignment(Qt::AlignLeft);
+//! [2]
diff --git a/doc/src/snippets/code/src_gui_kernel_qkeysequence.cpp b/doc/src/snippets/code/src_gui_kernel_qkeysequence.cpp
new file mode 100644
index 0000000000..a5c734d09d
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_kernel_qkeysequence.cpp
@@ -0,0 +1,19 @@
+//! [0]
+QKeySequence(QKeySequence::Print);
+QKeySequence(tr("Ctrl+P"));
+QKeySequence(tr("Ctrl+p"));
+QKeySequence(Qt::CTRL + Qt::Key_P);
+//! [0]
+
+
+//! [1]
+QKeySequence(tr("Ctrl+X, Ctrl+C"));
+QKeySequence(Qt::CTRL + Qt::Key_X, Qt::CTRL + Qt::Key_C);
+//! [1]
+
+
+//! [2]
+QMenu *file = new QMenu(this);
+file->addAction(tr("&Open..."), this, SLOT(open()),
+                  QKeySequence(tr("Ctrl+O", "File|Open")));
+//! [2]
diff --git a/doc/src/snippets/code/src_gui_kernel_qlayout.cpp b/doc/src/snippets/code/src_gui_kernel_qlayout.cpp
new file mode 100644
index 0000000000..26d178f870
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_kernel_qlayout.cpp
@@ -0,0 +1,27 @@
+//! [0]
+static void paintLayout(QPainter *painter, QLayoutItem *item)
+{
+    QLayout *layout = item->layout();
+    if (layout) {
+        for (int i = 0; i < layout->count(); ++i)
+            paintLayout(painter, layout->itemAt(i));
+    }
+    painter->drawRect(item->geometry());
+}
+
+void MyWidget::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+    if (layout())
+        paintLayout(&painter, layout());
+}
+//! [0]
+
+
+//! [1]
+QLayoutItem *child;
+while ((child = layout->takeAt(0)) != 0) {
+    ...
+    delete child;
+}
+//! [1]
diff --git a/doc/src/snippets/code/src_gui_kernel_qlayoutitem.cpp b/doc/src/snippets/code/src_gui_kernel_qlayoutitem.cpp
new file mode 100644
index 0000000000..db6438e434
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_kernel_qlayoutitem.cpp
@@ -0,0 +1,13 @@
+//! [0]
+int MyLayout::heightForWidth(int w) const
+{
+    if (cache_dirty || cached_width != w) {
+        // not all C++ compilers support "mutable"
+        MyLayout *that = (MyLayout*)this;
+        int h = calculateHeightForWidth(w);
+        that->cached_hfw = h;
+        return h;
+    }
+    return cached_hfw;
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_kernel_qshortcut.cpp b/doc/src/snippets/code/src_gui_kernel_qshortcut.cpp
new file mode 100644
index 0000000000..b5fdf95bf6
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_kernel_qshortcut.cpp
@@ -0,0 +1,15 @@
+//! [0]
+shortcut = new QShortcut(QKeySequence(tr("Ctrl+O", "File|Open")),
+                         parent);
+//! [0]
+
+
+//! [1]
+setKey(0);                  // no signal emitted
+setKey(QKeySequence());     // no signal emitted
+setKey(0x3b1);              // Greek letter alpha
+setKey(Qt::Key_D);              // 'd', e.g. to delete
+setKey('q');                // 'q', e.g. to quit
+setKey(Qt::CTRL + Qt::Key_P);       // Ctrl+P, e.g. to print document
+setKey("Ctrl+P");           // Ctrl+P, e.g. to print document
+//! [1]
diff --git a/doc/src/snippets/code/src_gui_kernel_qshortcutmap.cpp b/doc/src/snippets/code/src_gui_kernel_qshortcutmap.cpp
new file mode 100644
index 0000000000..6a85c3e30b
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_kernel_qshortcutmap.cpp
@@ -0,0 +1,3 @@
+//! [0]
+key = QKeySequence();
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_kernel_qsound.cpp b/doc/src/snippets/code/src_gui_kernel_qsound.cpp
new file mode 100644
index 0000000000..bdbd1cec0b
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_kernel_qsound.cpp
@@ -0,0 +1,9 @@
+//! [0]
+QSound::play("mysounds/bells.wav");
+//! [0]
+
+
+//! [1]
+QSound bells("mysounds/bells.wav");
+bells.play();
+//! [1]
diff --git a/doc/src/snippets/code/src_gui_kernel_qwidget.cpp b/doc/src/snippets/code/src_gui_kernel_qwidget.cpp
new file mode 100644
index 0000000000..4285eddc75
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_kernel_qwidget.cpp
@@ -0,0 +1,97 @@
+//! [0]
+w->setWindowState(w->windowState() ^ Qt::WindowFullScreen);
+//! [0]
+
+
+//! [1]
+w->setWindowState(w->windowState() & ~Qt::WindowMinimized | Qt::WindowActive);
+//! [1]
+
+
+//! [2]
+width = baseSize().width() + i * sizeIncrement().width();
+height = baseSize().height() + j * sizeIncrement().height();
+//! [2]
+
+
+//! [3]
+aWidget->window()->setWindowTitle("New Window Title");
+//! [3]
+
+
+//! [4]
+QFont font("Helvetica", 12, QFont::Bold);
+setFont(font);
+//! [4]
+
+
+//! [5]
+QFont font;
+font.setBold(false);
+setFont(font);
+//! [5]
+
+
+//! [6]
+setCursor(Qt::IBeamCursor);
+//! [6]
+
+
+//! [7]
+QPixmap pixmap(widget->size());
+widget->render(&pixmap);
+//! [7]
+
+
+//! [8]
+QPainter painter(this);
+...
+painter.end();
+myWidget->render(this);
+//! [8]
+
+
+//! [9]
+setTabOrder(a, b); // a to b
+setTabOrder(b, c); // a to b to c
+setTabOrder(c, d); // a to b to c to d
+//! [9]
+
+
+//! [10]
+// WRONG
+setTabOrder(c, d); // c to d
+setTabOrder(a, b); // a to b AND c to d
+setTabOrder(b, c); // a to b to c, but not c to d
+//! [10]
+
+
+//! [11]
+void MyWidget::closeEvent(QCloseEvent *event)
+{
+    QSettings settings("MyCompany", "MyApp");
+    settings.setValue("geometry", saveGeometry());
+    QWidget::closeEvent(event);
+}
+//! [11]
+
+
+//! [12]
+QSettings settings("MyCompany", "MyApp");
+myWidget->restoreGeometry(settings.value("myWidget/geometry").toByteArray());
+//! [12]
+
+
+//! [13]
+setUpdatesEnabled(false);
+bigVisualChanges();
+setUpdatesEnabled(true);
+//! [13]
+
+
+//! [14]
+...
+extern void qt_x11_set_global_double_buffer(bool);
+qt_x11_set_global_double_buffer(false);
+...
+//! [14]
diff --git a/doc/src/snippets/code/src_gui_painting_qbrush.cpp b/doc/src/snippets/code/src_gui_painting_qbrush.cpp
new file mode 100644
index 0000000000..8cb53105aa
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_painting_qbrush.cpp
@@ -0,0 +1,11 @@
+//! [0]
+QPainter painter(this);
+
+painter.setBrush(Qt::cyan);
+painter.setPen(Qt::darkCyan);
+painter.drawRect(0, 0, 100,100);
+
+painter.setBrush(Qt::NoBrush);
+painter.setPen(Qt::darkGreen);
+painter.drawRect(40, 40, 100, 100);
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_painting_qcolor.cpp b/doc/src/snippets/code/src_gui_painting_qcolor.cpp
new file mode 100644
index 0000000000..c21e58987f
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_painting_qcolor.cpp
@@ -0,0 +1,9 @@
+//! [0]
+// Specify semi-transparent red
+painter.setBrush(QColor(255, 0, 0, 127));
+painter.drawRect(0, 0, width()/2, height());
+
+// Specify semi-transparent blue
+painter.setBrush(QColor(0, 0, 255, 127));
+painter.drawRect(0, 0, width(), height()/2);
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_painting_qdrawutil.cpp b/doc/src/snippets/code/src_gui_painting_qdrawutil.cpp
new file mode 100644
index 0000000000..7e94d59d6a
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_painting_qdrawutil.cpp
@@ -0,0 +1,58 @@
+//! [0]
+QFrame frame:
+frame.setFrameStyle(QFrame::HLine | QFrame::Sunken);
+//! [0]
+
+
+//! [1]
+QFrame frame:
+frame.setFrameStyle(QFrame::Box | QFrame::Raised);
+//! [1]
+
+
+//! [2]
+QFrame frame:
+frame.setFrameStyle( QFrame::Panel | QFrame::Sunken);
+//! [2]
+
+
+//! [3]
+QFrame frame:
+frame.setFrameStyle(QFrame::WinPanel | QFrame::Raised);
+//! [3]
+
+
+//! [4]
+QFrame frame:
+frame.setFrameStyle(QFrame::Box | QFrame::Plain);
+//! [4]
+
+
+//! [5]
+QFrame frame:
+frame.setFrameStyle(QFrame::HLine | QFrame::Sunken);
+//! [5]
+
+
+//! [6]
+QFrame frame:
+frame.setFrameStyle(QFrame::Box | QFrame::Raised);
+//! [6]
+
+
+//! [7]
+QFrame frame:
+frame.setFrameStyle( QFrame::Panel | QFrame::Sunken);
+//! [7]
+
+
+//! [8]
+QFrame frame:
+frame.setFrameStyle(QFrame::WinPanel | QFrame::Raised);
+//! [8]
+
+
+//! [9]
+QFrame frame:
+frame.setFrameStyle(QFrame::Box | QFrame::Plain);
+//! [9]
diff --git a/doc/src/snippets/code/src_gui_painting_qmatrix.cpp b/doc/src/snippets/code/src_gui_painting_qmatrix.cpp
new file mode 100644
index 0000000000..4a8a427bee
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_painting_qmatrix.cpp
@@ -0,0 +1,22 @@
+//! [0]
+x' = m11*x + m21*y + dx
+y' = m22*y + m12*x + dy
+//! [0]
+
+
+//! [1]
+x' = m11*x + m21*y + dx
+y' = m22*y + m12*x + dy
+//! [1]
+
+
+//! [2]
+x' = m11*x + m21*y + dx
+y' = m22*y + m12*x + dy
+//! [2]
+
+
+//! [3]
+x' = m11*x + m21*y + dx
+y' = m22*y + m12*x + dy
+//! [3]
diff --git a/doc/src/snippets/code/src_gui_painting_qpainter.cpp b/doc/src/snippets/code/src_gui_painting_qpainter.cpp
new file mode 100644
index 0000000000..611daae92e
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_painting_qpainter.cpp
@@ -0,0 +1,202 @@
+//! [0]
+void SimpleExampleWidget::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+    painter.setPen(Qt::blue);
+    painter.setFont(QFont("Arial", 30));
+    painter.drawText(rect(), Qt::AlignCenter, "Qt");
+}
+//! [0]
+
+
+//! [1]
+void MyWidget::paintEvent(QPaintEvent *)
+{
+    QPainter p;
+    p.begin(this);
+    p.drawLine(...);        // drawing code
+    p.end();
+}
+//! [1]
+
+
+//! [2]
+void MyWidget::paintEvent(QPaintEvent *)
+{
+    QPainter p(this);
+    p.drawLine(...);        // drawing code
+}
+//! [2]
+
+
+//! [3]
+painter->begin(0); // impossible - paint device cannot be 0
+
+QPixmap image(0, 0);
+painter->begin(&image); // impossible - image.isNull() == true;
+
+painter->begin(myWidget);
+painter2->begin(myWidget); // impossible - only one painter at a time
+//! [3]
+
+
+//! [4]
+void QPainter::rotate(qreal angle)
+{
+    QMatrix matrix;
+    matrix.rotate(angle);
+    setWorldMatrix(matrix, true);
+}
+//! [4]
+
+
+//! [5]
+QPainterPath path;
+path.moveTo(20, 80);
+path.lineTo(20, 30);
+path.cubicTo(80, 0, 50, 50, 80, 80);
+
+QPainter painter(this);
+painter.drawPath(path);
+//! [5]
+
+
+//! [6]
+QLineF line(10.0, 80.0, 90.0, 20.0);
+
+QPainter(this);
+painter.drawLine(line);
+//! [6]
+
+
+//! [7]
+QRectF rectangle(10.0, 20.0, 80.0, 60.0);
+
+QPainter painter(this);
+painter.drawRect(rectangle);
+//! [7]
+
+
+//! [8]
+QRectF rectangle(10.0, 20.0, 80.0, 60.0);
+
+QPainter painter(this);
+painter.drawRoundedRect(rectangle, 20.0, 15.0);
+//! [8]
+
+
+//! [9]
+QRectF rectangle(10.0, 20.0, 80.0, 60.0);
+
+QPainter painter(this);
+painter.drawEllipse(rectangle);
+//! [9]
+
+
+//! [10]
+QRectF rectangle(10.0, 20.0, 80.0, 60.0);
+int startAngle = 30 * 16;
+int spanAngle = 120 * 16;
+
+QPainter painter(this);
+painter.drawArc(rectangle, startAngle, spanAngle);
+//! [10]
+
+
+//! [11]
+QRectF rectangle(10.0, 20.0, 80.0, 60.0);
+int startAngle = 30 * 16;
+int spanAngle = 120 * 16;
+
+QPainter painter(this);
+painter.drawPie(rectangle, startAngle, spanAngle);
+//! [11]
+
+
+//! [12]
+QRectF rectangle(10.0, 20.0, 80.0, 60.0);
+int startAngle = 30 * 16;
+int spanAngle = 120 * 16;
+
+QPainter painter(this);
+painter.drawChord(rect, startAngle, spanAngle);
+//! [12]
+
+
+//! [13]
+static const QPointF points[3] = {
+    QPointF(10.0, 80.0),
+    QPointF(20.0, 10.0),
+    QPointF(80.0, 30.0),
+};
+
+QPainter painter(this);
+painter.drawPolyline(points, 3);
+//! [13]
+
+
+//! [14]
+static const QPointF points[4] = {
+    QPointF(10.0, 80.0),
+    QPointF(20.0, 10.0),
+    QPointF(80.0, 30.0),
+    QPointF(90.0, 70.0)
+};
+
+QPainter painter(this);
+painter.drawPolygon(points, 4);
+//! [14]
+
+
+//! [15]
+static const QPointF points[4] = {
+    QPointF(10.0, 80.0),
+    QPointF(20.0, 10.0),
+    QPointF(80.0, 30.0),
+    QPointF(90.0, 70.0)
+};
+
+QPainter painter(this);
+painter.drawConvexPolygon(points, 4);
+//! [15]
+
+
+//! [16]
+QRectF target(10.0, 20.0, 80.0, 60.0);
+QRectF source(0.0, 0.0, 70.0, 40.0);
+QPixmap pixmap(":myPixmap.png");
+
+QPainter(this);
+painter.drawPixmap(target, image, source);
+//! [16]
+
+
+//! [17]
+QPainter painter(this);
+painter.drawText(rect, Qt::AlignCenter, tr("Qt by\nTrolltech"));
+//! [17]
+
+
+//! [18]
+QPicture picture;
+QPointF point(10.0, 20.0)
+picture.load("drawing.pic");
+
+QPainter painter(this);
+painter.drawPicture(0, 0, picture);
+//! [18]
+
+
+//! [19]
+fillRect(rectangle, background()).
+//! [19]
+
+
+//! [20]
+QRectF target(10.0, 20.0, 80.0, 60.0);
+QRectF source(0.0, 0.0, 70.0, 40.0);
+QImage image(":/images/myImage.png");
+
+QPainter painter(this);
+painter.drawImage(target, image, source);
+//! [20]
diff --git a/doc/src/snippets/code/src_gui_painting_qpainterpath.cpp b/doc/src/snippets/code/src_gui_painting_qpainterpath.cpp
new file mode 100644
index 0000000000..f5d1e8bedd
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_painting_qpainterpath.cpp
@@ -0,0 +1,109 @@
+//! [0]
+QPainterPath path;
+path.addRect(20, 20, 60, 60);
+
+path.moveTo(0, 0);
+path.cubicTo(99, 0,  50, 50,  99, 99);
+path.cubicTo(0, 99,  50, 50,  0, 0);
+
+QPainter painter(this);
+painter.fillRect(0, 0, 100, 100, Qt::white);
+painter.setPen(QPen(QColor(79, 106, 25), 1, Qt::SolidLine,
+                    Qt::FlatCap, Qt::MiterJoin));
+painter.setBrush(QColor(122, 163, 39));
+
+painter.drawPath(path);
+//! [0]
+
+
+//! [1]
+QLinearGradient myGradient;
+QPen myPen;
+
+QPainterPath myPath;
+myPath.cubicTo(c1, c2, endPoint);
+
+QPainter painter(this);
+painter.setBrush(myGradient);
+painter.setPen(myPen);
+painter.drawPath(myPath);
+//! [1]
+
+
+//! [2]
+QLinearGradient myGradient;
+QPen myPen;
+
+QPointF center, startPoint;
+
+QPainterPath myPath;
+myPath.moveTo(center);
+myPath.arcTo(boundingRect, startAngle,
+             sweepLength);
+
+QPainter painter(this);
+painter.setBrush(myGradient);
+painter.setPen(myPen);
+painter.drawPath(myPath);
+//! [2]
+
+
+//! [3]
+QLinearGradient myGradient;
+QPen myPen;
+QRectF myRectangle;
+
+QPainterPath myPath;
+myPath.addRect(myRectangle);
+
+QPainter painter(this);
+painter.setBrush(myGradient);
+painter.setPen(myPen);
+painter.drawPath(myPath);
+//! [3]
+
+
+//! [4]
+QLinearGradient myGradient;
+QPen myPen;
+QPolygonF myPolygon;
+
+QPainterPath myPath;
+myPath.addPolygon(myPolygon);
+
+QPainter painter(this);
+painter.setBrush(myGradient);
+painter.setPen(myPen);
+painter.drawPath(myPath);
+//! [4]
+
+
+//! [5]
+QLinearGradient myGradient;
+QPen myPen;
+QRectF boundingRectangle;
+
+QPainterPath myPath;
+myPath.addEllipse(boundingRectangle);
+
+QPainter painter(this);
+painter.setBrush(myGradient);
+painter.setPen(myPen);
+painter.drawPath(myPath);
+//! [5]
+
+
+//! [6]
+QLinearGradient myGradient;
+QPen myPen;
+QFont myFont;
+QPointF baseline(x, y);
+
+QPainterPath myPath;
+myPath.addText(baseline, myFont, tr("Qt"));
+
+QPainter painter(this);
+painter.setBrush(myGradient);
+painter.setPen(myPen);
+painter.drawPath(myPath);
+//! [6]
diff --git a/doc/src/snippets/code/src_gui_painting_qpen.cpp b/doc/src/snippets/code/src_gui_painting_qpen.cpp
new file mode 100644
index 0000000000..538fa09b34
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_painting_qpen.cpp
@@ -0,0 +1,41 @@
+//! [0]
+QPainter painter(this);
+QPen pen(Qt::green, 3, Qt::DashDotLine, Qt::RoundCap, Qt::RoundJoin);
+painter.setPen(pen);
+//! [0]
+
+
+//! [1]
+QPainter painter(this);
+QPen pen();  // creates a default pen
+
+pen.setStyle(Qt::DashDotLine);
+pen.setWidth(3);
+pen.setBrush(Qt::green);
+pen.setCapStyle(Qt::RoundCap);
+pen.setJoinStyle(Qt::RoundJoin);
+
+painter.setPen(pen);
+//! [1]
+
+
+//! [2]
+QPen pen;
+QVector<qreal> dashes;
+qreal space = 4;
+
+dashes << 1 << space << 3 << space << 9 << space
+           << 27 << space << 9;
+
+pen.setDashPattern(dashes);
+//! [2]
+
+
+//! [3]
+QPen pen;
+QVector<qreal> dashes;
+qreal space = 4;
+dashes << 1 << space << 3 << space << 9 << space
+           << 27 << space << 9;
+pen.setDashPattern(dashes);
+//! [3]
diff --git a/doc/src/snippets/code/src_gui_painting_qregion.cpp b/doc/src/snippets/code/src_gui_painting_qregion.cpp
new file mode 100644
index 0000000000..6c5dfa5e47
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_painting_qregion.cpp
@@ -0,0 +1,13 @@
+//! [0]
+void MyWidget::paintEvent(QPaintEvent *)
+{
+    QRegion r1(QRect(100, 100, 200, 80),    // r1: elliptic region
+               QRegion::Ellipse);
+    QRegion r2(QRect(100, 120, 90, 30));    // r2: rectangular region
+    QRegion r3 = r1.intersected(r2);        // r3: intersection
+
+    QPainter painter(this);
+    painter.setClipRegion(r3);
+    ...                                     // paint clipped graphics
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_painting_qregion_unix.cpp b/doc/src/snippets/code/src_gui_painting_qregion_unix.cpp
new file mode 100644
index 0000000000..50771efe77
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_painting_qregion_unix.cpp
@@ -0,0 +1,18 @@
+//! [0]
+QRegion r1(10, 10, 20, 20);
+r1.isNull();                // false
+r1.isEmpty();               // false
+
+QRegion r2(40, 40, 20, 20);
+QRegion r3;
+r3.isNull();                // true
+r3.isEmpty();               // true
+
+r3 = r1.intersected(r2);    // r3: intersection of r1 and r2
+r3.isNull();                // false
+r3.isEmpty();               // true
+
+r3 = r1.united(r2);         // r3: union of r1 and r2
+r3.isNull();                // false
+r3.isEmpty();               // false
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_painting_qtransform.cpp b/doc/src/snippets/code/src_gui_painting_qtransform.cpp
new file mode 100644
index 0000000000..91b1e947df
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_painting_qtransform.cpp
@@ -0,0 +1,42 @@
+//! [0]
+x' = m11*x + m21*y + dx
+y' = m22*y + m12*x + dy
+if (is not affine) {
+    w' = m13*x + m23*y + m33
+    x' /= w'
+    y' /= w'
+}
+//! [0]
+
+
+//! [1]
+x' = m11*x + m21*y + dx
+y' = m22*y + m12*x + dy
+if (is not affine) {
+    w' = m13*x + m23*y + m33
+    x' /= w'
+    y' /= w'
+}
+//! [1]
+
+
+//! [2]
+x' = m11*x + m21*y + dx
+y' = m22*y + m12*x + dy
+if (is not affine) {
+    w' = m13*x + m23*y + m33
+    x' /= w'
+    y' /= w'
+}
+//! [2]
+
+
+//! [3]
+x' = m11*x + m21*y + dx
+y' = m22*y + m12*x + dy
+if (is not affine) {
+    w' = m13*x + m23*y + m33
+    x' /= w'
+    y' /= w'
+}
+//! [3]
diff --git a/doc/src/snippets/code/src_gui_styles_qstyle.cpp b/doc/src/snippets/code/src_gui_styles_qstyle.cpp
new file mode 100644
index 0000000000..a78a6c862d
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_styles_qstyle.cpp
@@ -0,0 +1,8 @@
+//! [0]
+./myapplication -style motif
+//! [0]
+
+
+//! [1]
+./myapplication -style custom
+//! [1]
diff --git a/doc/src/snippets/code/src_gui_styles_qstyleoption.cpp b/doc/src/snippets/code/src_gui_styles_qstyleoption.cpp
new file mode 100644
index 0000000000..bf0c6707d1
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_styles_qstyleoption.cpp
@@ -0,0 +1,14 @@
+//! [0]
+int MyStyle::styleHint(StyleHint stylehint, const QStyleOption *opt,
+                       const QWidget *widget, QStyleHintReturn* returnData) const;
+{
+    if (stylehint == SH_RubberBand_Mask) {
+        const QStyleHintReturnMask *maskReturn =
+                qstyleoption_cast<const QStyleHintReturnMask *>(hint);
+        if (maskReturn) {
+            ...
+        }
+    }
+    ...
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_text_qfont.cpp b/doc/src/snippets/code/src_gui_text_qfont.cpp
new file mode 100644
index 0000000000..c74772cc03
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_text_qfont.cpp
@@ -0,0 +1,27 @@
+//! [0]
+QFont serifFont("Times", 10, QFont::Bold);
+QFont sansFont("Helvetica [Cronyx]", 12);
+//! [0]
+
+
+//! [1]
+QFont f("Helvetica");
+//! [1]
+
+
+//! [2]
+QFont f("Helvetica [Cronyx]");
+//! [2]
+
+
+//! [3]
+QFontInfo info(f1);
+QString family = info.family();
+//! [3]
+
+
+//! [4]
+QFontMetrics fm(f1);
+int textWidthInPixels = fm.width("How many pixels wide is this text?");
+int textHeightInPixels = fm.height();
+//! [4]
diff --git a/doc/src/snippets/code/src_gui_text_qfontmetrics.cpp b/doc/src/snippets/code/src_gui_text_qfontmetrics.cpp
new file mode 100644
index 0000000000..d7b17ab735
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_text_qfontmetrics.cpp
@@ -0,0 +1,14 @@
+//! [0]
+QFont font("times", 24);
+QFontMetrics fm(font);
+int pixelsWide = fm.width("What's the width of this text?");
+int pixelsHigh = fm.height();
+//! [0]
+
+
+//! [1]
+QFont font("times", 24);
+QFontMetricsF fm(font);
+qreal pixelsWide = fm.width("What's the width of this text?");
+qreal pixelsHigh = fm.height();
+//! [1]
diff --git a/doc/src/snippets/code/src_gui_text_qsyntaxhighlighter.cpp b/doc/src/snippets/code/src_gui_text_qsyntaxhighlighter.cpp
new file mode 100644
index 0000000000..5dd2e0d6b3
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_text_qsyntaxhighlighter.cpp
@@ -0,0 +1,86 @@
+//! [0]
+QTextEdit *editor = new QTextEdit;
+MyHighlighter *highlighter = new MyHighlighter(editor->document());
+//! [0]
+
+
+//! [1]
+void MyHighlighter::highlightBlock(const QString &text)
+{
+    QTextCharFormat myClassFormat;
+    myClassFormat.setFontWeight(QFont::Bold);
+    myClassFormat.setForeground(Qt::darkMagenta);
+    QString pattern = "\\bMy[A-Za-z]+\\b";
+
+    QRegExp expression(pattern);
+    int index = text.indexOf(expression);
+    while (index >= 0) {
+        int length = expression.matchedLength();
+        setFormat(index, length, myClassFormat);
+        index = text.indexOf(expression, index + length);
+    }
+}
+//! [1]
+
+
+//! [2]
+QTextCharFormat multiLineCommentFormat;
+multiLineCommentFormat.setForeground(Qt::red);
+
+QRegExp startExpression("/\\*");
+QRegExp endExpression("\\*/");
+
+setCurrentBlockState(0);
+
+int startIndex = 0;
+if (previousBlockState() != 1)
+    startIndex = text.indexOf(startExpression);
+
+while (startIndex >= 0) {
+   int endIndex = text.indexOf(endExpression, startIndex);
+   int commentLength;
+   if (endIndex == -1) {
+       setCurrentBlockState(1);
+       commentLength = text.length() - startIndex;
+   } else {
+       commentLength = endIndex - startIndex
+                       + endExpression.matchedLength();
+   }
+   setFormat(startIndex, commentLength, multiLineCommentFormat);
+   startIndex = text.indexOf(startExpression,
+                             startIndex + commentLength);
+}
+//! [2]
+
+
+//! [3]
+void MyHighlighter::highlightBlock(const QString &text)
+{
+    QTextCharFormat myClassFormat;
+    myClassFormat.setFontWeight(QFont::Bold);
+    myClassFormat.setForeground(Qt::darkMagenta);
+    QString pattern = "\\bMy[A-Za-z]+\\b";
+
+    QRegExp expression(pattern);
+    int index = text.indexOf(expression);
+    while (index >= 0) {
+        int length = expression.matchedLength();
+        setFormat(index, length, myClassFormat);
+        index = text.indexOf(expression, index + length);
+     }
+ }
+//! [3]
+
+
+//! [4]
+struct ParenthesisInfo
+{
+    QChar char;
+    int position;
+};
+
+struct BlockData : public QTextBlockUserData
+{
+    QVector<ParenthesisInfo> parentheses;
+};
+//! [4]
diff --git a/doc/src/snippets/code/src_gui_text_qtextcursor.cpp b/doc/src/snippets/code/src_gui_text_qtextcursor.cpp
new file mode 100644
index 0000000000..19c60b9993
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_text_qtextcursor.cpp
@@ -0,0 +1,40 @@
+//! [0]
+cursor.clearSelection();
+cursor.movePosition(QTextCursor::NextWord, QTextCursor::KeepAnchor);
+cursor.insertText("Hello World");
+//! [0]
+
+
+//! [1]
+QImage img = ...
+textDocument->addResource(QTextDocument::ImageResource, QUrl("myimage"), img);
+cursor.insertImage("myimage");
+//! [1]
+
+
+//! [2]
+QTextCursor cursor(textDocument);
+cursor.beginEditBlock();
+cursor.insertText("Hello");
+cursor.insertText("World");
+cursor.endEditBlock();
+
+textDocument->undo();
+//! [2]
+
+
+//! [3]
+QTextCursor cursor(textDocument);
+cursor.beginEditBlock();
+cursor.insertText("Hello");
+cursor.insertText("World");
+cursor.endEditBlock();
+
+...
+
+cursor.joinPreviousEditBlock();
+cursor.insertText("Hey");
+cursor.endEditBlock();
+
+textDocument->undo();
+//! [3]
diff --git a/doc/src/snippets/code/src_gui_text_qtextdocument.cpp b/doc/src/snippets/code/src_gui_text_qtextdocument.cpp
new file mode 100644
index 0000000000..60840f76b6
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_text_qtextdocument.cpp
@@ -0,0 +1,10 @@
+//! [0]
+QString plain = "#include <QtCore>"
+QString html = Qt::escape(plain);
+// html == "#include &lt;QtCore&gt;"
+//! [0]
+
+
+//! [1]
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body>...
+//! [1]
diff --git a/doc/src/snippets/code/src_gui_text_qtextlayout.cpp b/doc/src/snippets/code/src_gui_text_qtextlayout.cpp
new file mode 100644
index 0000000000..548bb783e0
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_text_qtextlayout.cpp
@@ -0,0 +1,24 @@
+//! [0]
+int leading = fontMetrics.leading();
+qreal height = 0;
+qreal widthUsed = 0;
+textLayout.beginLayout();
+while (1) {
+    QTextLine line = textLayout.createLine();
+    if (!line.isValid())
+        break;
+
+    line.setLineWidth(lineWidth);
+    height += leading;
+    line.setPosition(QPointF(0, height));
+    height += line.height();
+    widthUsed = qMax(widthUsed, line.naturalTextWidth());
+}
+textLayout.endLayout();
+//! [0]
+
+
+//! [1]
+QPainter painter(this);
+textLayout.draw(&painter, QPoint(0, 0));
+//! [1]
diff --git a/doc/src/snippets/code/src_gui_util_qcompleter.cpp b/doc/src/snippets/code/src_gui_util_qcompleter.cpp
new file mode 100644
index 0000000000..3017d8c30d
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_util_qcompleter.cpp
@@ -0,0 +1,23 @@
+//! [0]
+QStringList wordList;
+wordList << "alpha" << "omega" << "omicron" << "zeta";
+
+QLineEdit *lineEdit = new QLineEdit(this);
+
+QCompleter *completer = new QCompleter(wordList, this);
+completer->setCaseSensitivity(Qt::CaseInsensitive);
+lineEdit->setCompleter(completer);
+//! [0]
+
+
+//! [1]
+QCompleter *completer = new QCompleter(this);
+completer->setModel(new QDirModel(completer));
+lineEdit->setCompleter(completer);
+//! [1]
+
+
+//! [2]
+for (int i = 0; completer->setCurrentRow(i); i++)
+    qDebug() << completer->currentCompletion() << " is match number " << i;
+//! [2]
diff --git a/doc/src/snippets/code/src_gui_util_qdesktopservices.cpp b/doc/src/snippets/code/src_gui_util_qdesktopservices.cpp
new file mode 100644
index 0000000000..a9c630bcc7
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_util_qdesktopservices.cpp
@@ -0,0 +1,17 @@
+//! [0]
+class MyHelpHandler : public QObject
+{
+    Q_OBJECT
+public:
+    ...
+public slots:
+    void showHelp(const QUrl &url);
+};
+
+QDesktopServices::setUrlHandler("help", helpInstance, "showHelp");
+//! [0]
+
+
+//! [1]
+mailto:user@foo.com?subject=Test&body=Just a test
+//! [1]
diff --git a/doc/src/snippets/code/src_gui_util_qundostack.cpp b/doc/src/snippets/code/src_gui_util_qundostack.cpp
new file mode 100644
index 0000000000..3949e1ec0e
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_util_qundostack.cpp
@@ -0,0 +1,69 @@
+//! [0]
+class AppendText : public QUndoCommand
+{
+public:
+    AppendText(QString *doc, const QString &text)
+        : m_document(doc), m_text(text) { setText("append text"); }
+    virtual void undo()
+        { m_document->chop(m_text.length()); }
+    virtual void redo()
+        { m_document->append(m_text); }
+private:
+    QString *m_document;
+    QString m_text;
+};
+//! [0]
+
+
+//! [1]
+MyCommand *command1 = new MyCommand();
+stack->push(command1);
+MyCommand *command2 = new MyCommand();
+stack->push(command2);
+
+stack->undo();
+
+MyCommand *command3 = new MyCommand();
+stack->push(command3); // command2 gets deleted
+//! [1]
+
+
+//! [2]
+QUndoCommand *insertRed = new QUndoCommand(); // an empty command
+insertRed->setText("insert red text");
+
+new InsertText(document, idx, text, insertRed); // becomes child of insertRed
+new SetColor(document, idx, text.length(), Qt::red, insertRed);
+
+stack.push(insertRed);
+//! [2]
+
+
+//! [3]
+bool AppendText::mergeWith(const QUndoCommand *other)
+{
+    if (other->id() != id()) // make sure other is also an AppendText command
+        return false;
+    m_text += static_cast<const AppendText*>(other)->m_text;
+    return true;
+}
+//! [3]
+
+
+//! [4]
+stack.beginMacro("insert red text");
+stack.push(new InsertText(document, idx, text));
+stack.push(new SetColor(document, idx, text.length(), Qt::red));
+stack.endMacro(); // indexChanged() is emitted
+//! [4]
+
+
+//! [5]
+QUndoCommand *insertRed = new QUndoCommand(); // an empty command
+insertRed->setText("insert red text");
+
+new InsertText(document, idx, text, insertRed); // becomes child of insertRed
+new SetColor(document, idx, text.length(), Qt::red, insertRed);
+
+stack.push(insertRed);
+//! [5]
diff --git a/doc/src/snippets/code/src_gui_widgets_qabstractbutton.cpp b/doc/src/snippets/code/src_gui_widgets_qabstractbutton.cpp
new file mode 100644
index 0000000000..3c2b1927d9
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qabstractbutton.cpp
@@ -0,0 +1,20 @@
+//! [0]
+QPushButton *button = new QPushButton(tr("Ro&ck && Roll"), this);
+//! [0]
+
+
+//! [1]
+button->setIcon(QIcon(":/images/print.png"));
+button->setShortcut(tr("Alt+F7"));
+//! [1]
+
+
+//! [2]
+void MyWidget::reactToToggle(bool checked)
+{
+   if (checked) {
+      // Examine the new button states.
+      ...
+   }
+}
+//! [2]
diff --git a/doc/src/snippets/code/src_gui_widgets_qabstractspinbox.cpp b/doc/src/snippets/code/src_gui_widgets_qabstractspinbox.cpp
new file mode 100644
index 0000000000..67cfeb77a2
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qabstractspinbox.cpp
@@ -0,0 +1,8 @@
+//! [0]
+QSpinBox *spinBox = new QSpinBox(this);
+spinBox->setRange(0, 100);
+spinBox->setWrapping(true);
+spinBox->setValue(100);
+spinBox->stepBy(1);
+// value is 0
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_widgets_qcalendarwidget.cpp b/doc/src/snippets/code/src_gui_widgets_qcalendarwidget.cpp
new file mode 100644
index 0000000000..10ceecc0e7
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qcalendarwidget.cpp
@@ -0,0 +1,39 @@
+//! [0]
+QCalendarWidget *calendar;
+calendar->setGridVisible(true);
+//! [0]
+
+
+//! [1]
+QCalendarWidget *calendar;
+calendar->setGridVisible(true);
+calendar->setMinimumDate(QDate(2006, 6, 19));
+//! [1]
+
+
+//! [2]
+QCalendarWidget *calendar;
+calendar->setGridVisible(true);
+calendar->setMaximumDate(QDate(2006, 7, 3));
+//! [2]
+
+
+//! [3]
+QCalendarWidget *calendar;
+
+calendar->setDateRange(min, max);
+//! [3]
+
+
+//! [4]
+QCalendarWidget *calendar;
+
+calendar->setMinimumDate(min);
+calendar->setMaximumDate(max);
+//! [4]
+
+
+//! [5]
+QCalendarWidget *calendar;
+calendar->setGridVisible(true);
+//! [5]
diff --git a/doc/src/snippets/code/src_gui_widgets_qcheckbox.cpp b/doc/src/snippets/code/src_gui_widgets_qcheckbox.cpp
new file mode 100644
index 0000000000..73008380ce
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qcheckbox.cpp
@@ -0,0 +1,3 @@
+//! [0]
+QCheckBox *checkbox = new QCheckBox("C&ase sensitive", this);
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_widgets_qdatetimeedit.cpp b/doc/src/snippets/code/src_gui_widgets_qdatetimeedit.cpp
new file mode 100644
index 0000000000..796358da02
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qdatetimeedit.cpp
@@ -0,0 +1,39 @@
+//! [0]
+QDateTimeEdit *dateEdit = new QDateTimeEdit(QDate::currentDate());
+dateEdit->setMinimumDate(QDate::currentDate().addDays(-365));
+dateEdit->setMaximumDate(QDate::currentDate().addDays(365));
+dateEdit->setDisplayFormat("yyyy.MM.dd");
+//! [0]
+
+
+//! [1]
+setDateTimeRange(min, max);
+//! [1]
+
+
+//! [2]
+setMinimumDateTime(min);
+setMaximumDateTime(max);
+//! [2]
+
+
+//! [3]
+setDateRange(min, max);
+//! [3]
+
+
+//! [4]
+setMinimumDate(min);
+setMaximumDate(max);
+//! [4]
+
+
+//! [5]
+setTimeRange(min, max);
+//! [5]
+
+
+//! [6]
+setMinimumTime(min);
+setMaximumTime(max);
+//! [6]
diff --git a/doc/src/snippets/code/src_gui_widgets_qdockwidget.cpp b/doc/src/snippets/code/src_gui_widgets_qdockwidget.cpp
new file mode 100644
index 0000000000..2204e11f09
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qdockwidget.cpp
@@ -0,0 +1,8 @@
+//! [0]
+QDockWidget *dockWidget = qobject_cast<QDockWidget*>(parentWidget());
+if (dockWidget->features() & QDockWidget::DockWidgetVerticalTitleBar) {
+    // I need to be vertical
+} else {
+    // I need to be horizontal
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_widgets_qframe.cpp b/doc/src/snippets/code/src_gui_widgets_qframe.cpp
new file mode 100644
index 0000000000..99fe79d0f6
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qframe.cpp
@@ -0,0 +1,8 @@
+//! [0]
+QLabel label(...);
+label.setFrameStyle(QFrame::Panel | QFrame::Raised);
+label.setLineWidth(2);
+
+QProgressBar pbar(...);
+label.setFrameStyle(QFrame::NoFrame);
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_widgets_qgroupbox.cpp b/doc/src/snippets/code/src_gui_widgets_qgroupbox.cpp
new file mode 100644
index 0000000000..efd2246390
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qgroupbox.cpp
@@ -0,0 +1,3 @@
+//! [0]
+g->setTitle("&User information");
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_widgets_qlabel.cpp b/doc/src/snippets/code/src_gui_widgets_qlabel.cpp
new file mode 100644
index 0000000000..d3b925428e
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qlabel.cpp
@@ -0,0 +1,24 @@
+//! [0]
+QLabel *label = new QLabel(this);
+label->setFrameStyle(QFrame::Panel | QFrame::Sunken);
+label->setText("first line\nsecond line");
+label->setAlignment(Qt::AlignBottom | Qt::AlignRight);
+//! [0]
+
+
+//! [1]
+QLineEdit* phoneEdit = new QLineEdit(this);
+QLabel* phoneLabel = new QLabel("&Phone:", this);
+phoneLabel->setBuddy(phoneEdit);
+//! [1]
+
+
+//! [2]
+QLineEdit *nameEd  = new QLineEdit(this);
+QLabel    *nameLb  = new QLabel("&Name:", this);
+nameLb->setBuddy(nameEd);
+QLineEdit *phoneEd = new QLineEdit(this);
+QLabel    *phoneLb = new QLabel("&Phone:", this);
+phoneLb->setBuddy(phoneEd);
+// (layout setup not shown)
+//! [2]
diff --git a/doc/src/snippets/code/src_gui_widgets_qlineedit.cpp b/doc/src/snippets/code/src_gui_widgets_qlineedit.cpp
new file mode 100644
index 0000000000..8191a4f830
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qlineedit.cpp
@@ -0,0 +1,10 @@
+//! [0]
+void LineEdit::contextMenuEvent(QContextMenuEvent *event)
+{
+    QMenu *menu = createStandardContextMenu();
+    menu->addAction(tr("My Menu Item"));
+    //...
+    menu->exec(event->globalPos());
+    delete menu;
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_widgets_qmenu.cpp b/doc/src/snippets/code/src_gui_widgets_qmenu.cpp
new file mode 100644
index 0000000000..f30ac35674
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qmenu.cpp
@@ -0,0 +1,37 @@
+//! [0]
+exec(QCursor::pos());
+//! [0]
+
+
+//! [1]
+exec(somewidget.mapToGlobal(QPoint(0,0)));
+//! [1]
+
+
+//! [2]
+exec(e->globalPos());
+//! [2]
+
+
+//! [3]
+exec(QCursor::pos());
+//! [3]
+
+
+//! [4]
+exec(somewidget.mapToGlobal(QPoint(0, 0)));
+//! [4]
+
+
+//! [5]
+exec(e->globalPos());
+//! [5]
+
+
+//! [6]
+QMenu menu;
+QAction *at = actions[0]; // Assumes actions is not empty
+foreach (QAction *a, actions)
+    menu.addAction(a);
+menu.exec(pos, at);
+//! [6]
diff --git a/doc/src/snippets/code/src_gui_widgets_qmenubar.cpp b/doc/src/snippets/code/src_gui_widgets_qmenubar.cpp
new file mode 100644
index 0000000000..3ff24d3e43
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qmenubar.cpp
@@ -0,0 +1,8 @@
+//! [0]
+menubar->addMenu(fileMenu);
+//! [0]
+
+
+//! [1]
+QMenuBar *menuBar = new QMenuBar(0);
+//! [1]
diff --git a/doc/src/snippets/code/src_gui_widgets_qplaintextedit.cpp b/doc/src/snippets/code/src_gui_widgets_qplaintextedit.cpp
new file mode 100644
index 0000000000..7f189952bb
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qplaintextedit.cpp
@@ -0,0 +1,15 @@
+//! [0]
+void MyQPlainTextEdit::contextMenuEvent(QContextMenuEvent *event)
+{
+    QMenu *menu = createStandardContextMenu();
+    menu->addAction(tr("My Menu Item"));
+    //...
+    menu->exec(event->globalPos());
+    delete menu;
+}
+//! [0]
+
+
+//! [1]
+edit->textCursor().insertText(text);
+//! [1]
diff --git a/doc/src/snippets/code/src_gui_widgets_qpushbutton.cpp b/doc/src/snippets/code/src_gui_widgets_qpushbutton.cpp
new file mode 100644
index 0000000000..e4fc4ce13d
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qpushbutton.cpp
@@ -0,0 +1,3 @@
+//! [0]
+QPushButton *button = new QPushButton("&Download", this);
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_widgets_qradiobutton.cpp b/doc/src/snippets/code/src_gui_widgets_qradiobutton.cpp
new file mode 100644
index 0000000000..05344fcb63
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qradiobutton.cpp
@@ -0,0 +1,3 @@
+//! [0]
+QRadioButton *button = new QRadioButton("Search from the &cursor", this);
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_widgets_qrubberband.cpp b/doc/src/snippets/code/src_gui_widgets_qrubberband.cpp
new file mode 100644
index 0000000000..38a0dad856
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qrubberband.cpp
@@ -0,0 +1,22 @@
+//! [0]
+void Widget::mousePressEvent(QMouseEvent *event)
+{
+    origin = event->pos();
+    if (!rubberBand)
+        rubberBand = new QRubberBand(QRubberBand::Rectangle, this);
+    rubberBand->setGeometry(QRect(origin, QSize()));
+    rubberBand->show();
+}
+
+void Widget::mouseMoveEvent(QMouseEvent *event)
+{
+    rubberBand->setGeometry(QRect(origin, event->pos()).normalized());
+}
+
+void Widget::mouseReleaseEvent(QMouseEvent *event)
+{
+    rubberBand->hide();
+    // determine selection, for example using QRect::intersects()
+    // and QRect::contains().
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_widgets_qscrollarea.cpp b/doc/src/snippets/code/src_gui_widgets_qscrollarea.cpp
new file mode 100644
index 0000000000..a77dc20443
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qscrollarea.cpp
@@ -0,0 +1,9 @@
+//! [0]
+QLabel *imageLabel = new QLabel;
+QImage image("happyguy.png");
+imageLabel->setPixmap(QPixmap::fromImage(image));
+
+scrollArea = new QScrollArea;
+scrollArea->setBackgroundRole(QPalette::Dark);
+scrollArea->setWidget(imageLabel);
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_widgets_qspinbox.cpp b/doc/src/snippets/code/src_gui_widgets_qspinbox.cpp
new file mode 100644
index 0000000000..7dbd6d6272
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qspinbox.cpp
@@ -0,0 +1,40 @@
+//! [0]
+sb->setPrefix("$");
+//! [0]
+
+
+//! [1]
+sb->setSuffix(" km");
+//! [1]
+
+
+//! [2]
+setRange(minimum, maximum);
+//! [2]
+
+
+//! [3]
+setMinimum(minimum);
+setMaximum(maximum);
+//! [3]
+
+
+//! [4]
+spinbox->setPrefix("$");
+//! [4]
+
+
+//! [5]
+spinbox->setSuffix(" km");
+//! [5]
+
+
+//! [6]
+setRange(minimum, maximum);
+//! [6]
+
+
+//! [7]
+setMinimum(minimum);
+setMaximum(maximum);
+//! [7]
diff --git a/doc/src/snippets/code/src_gui_widgets_qsplashscreen.cpp b/doc/src/snippets/code/src_gui_widgets_qsplashscreen.cpp
new file mode 100644
index 0000000000..d20f1f2982
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qsplashscreen.cpp
@@ -0,0 +1,15 @@
+//! [0]
+QPixmap pixmap(":/splash.png");
+QSplashScreen *splash = new QSplashScreen(pixmap);
+splash->show();
+
+... // Loading some items
+splash->showMessage("Loaded modules");
+
+qApp->processEvents();
+
+... // Establishing connections
+splash->showMessage("Established connections");
+
+qApp->processEvents();
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_widgets_qsplitter.cpp b/doc/src/snippets/code/src_gui_widgets_qsplitter.cpp
new file mode 100644
index 0000000000..62f5db15d4
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qsplitter.cpp
@@ -0,0 +1,7 @@
+//! [0]
+QWidget *widget = splitter->widget(index);
+QSizePolicy policy = widget->sizePolicy();
+policy.setHorizontalStretch(stretch);
+policy.setVerticalStretch(stretch);
+widget->setSizePolicy(policy);
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_widgets_qstatusbar.cpp b/doc/src/snippets/code/src_gui_widgets_qstatusbar.cpp
new file mode 100644
index 0000000000..d03f5af6ee
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qstatusbar.cpp
@@ -0,0 +1,3 @@
+//! [0]
+statusBar()->addWidget(new MyReadWriteIndication);
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_widgets_qtextbrowser.cpp b/doc/src/snippets/code/src_gui_widgets_qtextbrowser.cpp
new file mode 100644
index 0000000000..0beb133e39
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qtextbrowser.cpp
@@ -0,0 +1,4 @@
+//! [0]
+backaction.setToolTip(browser.historyTitle(-1));
+forwardaction.setToolTip(browser.historyTitle(+1));
+//! [0]
diff --git a/doc/src/snippets/code/src_gui_widgets_qtextedit.cpp b/doc/src/snippets/code/src_gui_widgets_qtextedit.cpp
new file mode 100644
index 0000000000..5f0b73f9b0
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qtextedit.cpp
@@ -0,0 +1,20 @@
+//! [0]
+void MyTextEdit::contextMenuEvent(QContextMenuEvent *event)
+{
+    QMenu *menu = createStandardContextMenu();
+    menu->addAction(tr("My Menu Item"));
+    //...
+    menu->exec(event->globalPos());
+    delete menu;
+}
+//! [0]
+
+
+//! [1]
+edit->textCursor().insertText(text);
+//! [1]
+
+
+//! [2]
+edit->textCursor().insertHtml(fragment);
+//! [2]
diff --git a/doc/src/snippets/code/src_gui_widgets_qvalidator.cpp b/doc/src/snippets/code/src_gui_widgets_qvalidator.cpp
new file mode 100644
index 0000000000..0240eea068
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qvalidator.cpp
@@ -0,0 +1,95 @@
+//! [0]
+QValidator *validator = new QIntValidator(100, 999, this);
+QLineEdit *edit = new QLineEdit(this);
+
+// the edit lineedit will only accept integers between 100 and 999
+edit->setValidator(validator);
+//! [0]
+
+
+//! [1]
+QString str;
+int pos = 0;
+QIntValidator v(100, 900, this);
+
+str = "1";
+v.validate(str, pos);     // returns Intermediate
+str = "012";
+v.validate(str, pos);     // returns Intermediate
+
+str = "123";
+v.validate(str, pos);     // returns Acceptable
+str = "678";
+v.validate(str, pos);     // returns Acceptable
+
+str = "999";
+v.validate(str, pos);    // returns Intermediate
+
+str = "1234";
+v.validate(str, pos);     // returns Invalid
+str = "-123";
+v.validate(str, pos);     // returns Invalid
+str = "abc";
+v.validate(str, pos);     // returns Invalid
+str = "12cm";
+v.validate(str, pos);     // returns Invalid
+//! [1]
+
+
+//! [2]
+int pos = 0;
+
+s = "abc";
+v.validate(s, pos);    // returns Invalid
+
+s = "5";
+v.validate(s, pos);    // returns Intermediate
+
+s = "50";
+v.validate(s, pos);    // returns Acceptable
+//! [2]
+
+
+//! [3]
+// regexp: optional '-' followed by between 1 and 3 digits
+QRegExp rx("-?\\d{1,3}");
+QValidator *validator = new QRegExpValidator(rx, this);
+
+QLineEdit *edit = new QLineEdit(this);
+edit->setValidator(validator);
+//! [3]
+
+
+//! [4]
+// integers 1 to 9999
+QRegExp rx("[1-9]\\d{0,3}");
+// the validator treats the regexp as "^[1-9]\\d{0,3}$"
+QRegExpValidator v(rx, 0);
+QString s;
+int pos = 0;
+
+s = "0";     v.validate(s, pos);    // returns Invalid
+s = "12345"; v.validate(s, pos);    // returns Invalid
+s = "1";     v.validate(s, pos);    // returns Acceptable
+
+rx.setPattern("\\S+");            // one or more non-whitespace characters
+v.setRegExp(rx);
+s = "myfile.txt";  v.validate(s, pos); // Returns Acceptable
+s = "my file.txt"; v.validate(s, pos); // Returns Invalid
+
+// A, B or C followed by exactly five digits followed by W, X, Y or Z
+rx.setPattern("[A-C]\\d{5}[W-Z]");
+v.setRegExp(rx);
+s = "a12345Z"; v.validate(s, pos);        // Returns Invalid
+s = "A12345Z"; v.validate(s, pos);        // Returns Acceptable
+s = "B12";     v.validate(s, pos);        // Returns Intermediate
+
+// match most 'readme' files
+rx.setPattern("read\\S?me(\.(txt|asc|1st))?");
+rx.setCaseSensitive(false);
+v.setRegExp(rx);
+s = "readme";      v.validate(s, pos); // Returns Acceptable
+s = "README.1ST";  v.validate(s, pos); // Returns Acceptable
+s = "read me.txt"; v.validate(s, pos); // Returns Invalid
+s = "readm";       v.validate(s, pos); // Returns Intermediate
+//! [4]
diff --git a/doc/src/snippets/code/src_gui_widgets_qworkspace.cpp b/doc/src/snippets/code/src_gui_widgets_qworkspace.cpp
new file mode 100644
index 0000000000..0c55e5f536
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_widgets_qworkspace.cpp
@@ -0,0 +1,8 @@
+//! [0]
+MainWindow::MainWindow()
+{
+    workspace = new QWorkspace;
+    setCentralWidget(workspace);
+    ...
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_network_access_qftp.cpp b/doc/src/snippets/code/src_network_access_qftp.cpp
new file mode 100644
index 0000000000..25e3da3af5
--- /dev/null
+++ b/doc/src/snippets/code/src_network_access_qftp.cpp
@@ -0,0 +1,59 @@
+//! [0]
+QFtp *ftp = new QFtp(parent);
+ftp->connectToHost("ftp.trolltech.com");
+ftp->login();
+//! [0]
+
+
+//! [1]
+ftp->connectToHost("ftp.trolltech.com");  // id == 1
+ftp->login();                             // id == 2
+ftp->cd("qt");                            // id == 3
+ftp->get("INSTALL");                      // id == 4
+ftp->close();                             // id == 5
+//! [1]
+
+
+//! [2]
+start(1)
+stateChanged(HostLookup)
+stateChanged(Connecting)
+stateChanged(Connected)
+finished(1, false)
+
+start(2)
+stateChanged(LoggedIn)
+finished(2, false)
+
+start(3)
+finished(3, false)
+
+start(4)
+dataTransferProgress(0, 3798)
+dataTransferProgress(2896, 3798)
+readyRead()
+dataTransferProgress(3798, 3798)
+readyRead()
+finished(4, false)
+
+start(5)
+stateChanged(Closing)
+stateChanged(Unconnected)
+finished(5, false)
+
+done(false)
+//! [2]
+
+
+//! [3]
+start(1)
+stateChanged(HostLookup)
+stateChanged(Connecting)
+stateChanged(Connected)
+finished(1, false)
+
+start(2)
+finished(2, true)
+
+done(true)
+//! [3]
diff --git a/doc/src/snippets/code/src_network_access_qhttp.cpp b/doc/src/snippets/code/src_network_access_qhttp.cpp
new file mode 100644
index 0000000000..57698a0ea5
--- /dev/null
+++ b/doc/src/snippets/code/src_network_access_qhttp.cpp
@@ -0,0 +1,85 @@
+//! [0]
+content-type: text/html
+//! [0]
+
+
+//! [1]
+header.setValue("content-type", "text/html");
+QString contentType = header.value("content-type");
+//! [1]
+
+
+//! [2]
+QHttpRequestHeader header("GET", QUrl::toPercentEncoding("/index.html"));
+header.setValue("Host", "qtsoftware.com");
+http->setHost("qtsoftware.com");
+http->request(header);
+//! [2]
+
+
+//! [3]
+http->setHost("qtsoftware.com");                // id == 1
+http->get(QUrl::toPercentEncoding("/index.html")); // id == 2
+//! [3]
+
+
+//! [4]
+requestStarted(1)
+requestFinished(1, false)
+
+requestStarted(2)
+stateChanged(Connecting)
+stateChanged(Sending)
+dataSendProgress(77, 77)
+stateChanged(Reading)
+responseHeaderReceived(responseheader)
+dataReadProgress(5388, 0)
+readyRead(responseheader)
+dataReadProgress(18300, 0)
+readyRead(responseheader)
+stateChanged(Connected)
+requestFinished(2, false)
+
+done(false)
+
+stateChanged(Closing)
+stateChanged(Unconnected)
+//! [4]
+
+
+//! [5]
+http->setHost("www.foo.bar");       // id == 1
+http->get("/index.html");           // id == 2
+http->post("register.html", data);  // id == 3
+//! [5]
+
+
+//! [6]
+requestStarted(1)
+requestFinished(1, false)
+
+requestStarted(2)
+stateChanged(HostLookup)
+requestFinished(2, true)
+
+done(true)
+
+stateChanged(Unconnected)
+//! [6]
+
+
+//! [7]
+void Ticker::getTicks()
+{
+  http = new QHttp(this);
+  connect(http, SIGNAL(done(bool)), this, SLOT(showPage()));
+  http->setProxy("proxy.example.com", 3128);
+  http->setHost("ticker.example.com");
+  http->get("/ticks.asp");
+}
+
+void Ticker::showPage()
+{
+  display(http->readAll());
+}
+//! [7]
diff --git a/doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp b/doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp
new file mode 100644
index 0000000000..0ef0a3bbf8
--- /dev/null
+++ b/doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp
@@ -0,0 +1,21 @@
+//! [0]
+QNetworkAccessManager *manager = new QNetworkAccessManager(this);
+connect(manager, SIGNAL(finished(QNetworkReply*)),
+        this, SLOT(replyFinished(QNetworkReply*)));
+
+manager->get(QNetworkRequest(QUrl("http://qtsoftware.com")));
+//! [0]
+
+
+//! [1]
+QNetworkRequest request;
+request.setUrl(QUrl("http://qtsoftware.com"));
+request.setRawHeader("User-Agent", "MyOwnBrowser 1.0");
+
+QNetworkReply *reply = manager->get(request);
+connect(reply, SIGNAL(readyRead()), this, SLOT(slotReadyRead()));
+connect(reply, SIGNAL(error(QNetworkReply::NetworkError)),
+        this, SLOT(slotError(QNetworkReply::NetworkError)));
+connect(reply, SIGNAL(sslErrors(QList<QSslError>)),
+        this, SLOT(slotSslErrors(QList<QSslError>)));
+//! [1]
diff --git a/doc/src/snippets/code/src_network_access_qnetworkrequest.cpp b/doc/src/snippets/code/src_network_access_qnetworkrequest.cpp
new file mode 100644
index 0000000000..d1f6962b4f
--- /dev/null
+++ b/doc/src/snippets/code/src_network_access_qnetworkrequest.cpp
@@ -0,0 +1,3 @@
+//! [0]
+request.setRawHeader("Last-Modified", "Sun, 06 Nov 1994 08:49:37 GMT");
+//! [0]
diff --git a/doc/src/snippets/code/src_network_kernel_qhostaddress.cpp b/doc/src/snippets/code/src_network_kernel_qhostaddress.cpp
new file mode 100644
index 0000000000..0b90404d6f
--- /dev/null
+++ b/doc/src/snippets/code/src_network_kernel_qhostaddress.cpp
@@ -0,0 +1,8 @@
+//! [0]
+Q_IPV6ADDR addr = hostAddr.toIPv6Address();
+// addr contains 16 unsigned characters
+
+for (int i = 0; i < 16; ++i) {
+    // process addr[i]
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp b/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp
new file mode 100644
index 0000000000..e748f90908
--- /dev/null
+++ b/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp
@@ -0,0 +1,50 @@
+//! [0]
+// To find the IP address of qtsoftware.com
+QHostInfo::lookupHost("qtsoftware.com",
+                      this, SLOT(printResults(QHostInfo)));
+
+// To find the host name for 4.2.2.1
+QHostInfo::lookupHost("4.2.2.1",
+                      this, SLOT(printResults(QHostInfo)));
+//! [0]
+
+
+//! [1]
+QHostInfo info = QHostInfo::fromName("qtsoftware.com");
+//! [1]
+
+
+//! [2]
+QHostInfo::lookupHost("www.kde.org",
+                      this, SLOT(lookedUp(QHostInfo)));
+//! [2]
+
+
+//! [3]
+void MyWidget::lookedUp(const QHostInfo &host)
+{
+    if (host.error() != QHostInfo::NoError) {
+        qDebug() << "Lookup failed:" << host.errorString();
+        return;
+    }
+
+    foreach (QHostAddress address, host.addresses())
+        qDebug() << "Found address:" << address.toString();
+}
+//! [3]
+
+
+//! [4]
+QHostInfo::lookupHost("4.2.2.1",
+                      this, SLOT(lookedUp(QHostInfo)));
+//! [4]
+
+
+//! [5]
+QHostInfo info;
+...
+if (!info.addresses().isEmpty()) {
+    QHostAddress address = info.addresses().first();
+    // use the first IP address
+}
+//! [5]
diff --git a/doc/src/snippets/code/src_network_kernel_qnetworkproxy.cpp b/doc/src/snippets/code/src_network_kernel_qnetworkproxy.cpp
new file mode 100644
index 0000000000..34e9466790
--- /dev/null
+++ b/doc/src/snippets/code/src_network_kernel_qnetworkproxy.cpp
@@ -0,0 +1,14 @@
+//! [0]
+QNetworkProxy proxy;
+proxy.setType(QNetworkProxy::Socks5Proxy);
+proxy.setHostName("proxy.example.com");
+proxy.setPort(1080);
+proxy.setUser("username");
+proxy.setPassword("password");
+QNetworkProxy::setApplicationProxy(proxy);
+//! [0]
+
+
+//! [1]
+serverSocket->setProxy(QNetworkProxy::NoProxy);
+//! [1]
diff --git a/doc/src/snippets/code/src_network_socket_qabstractsocket.cpp b/doc/src/snippets/code/src_network_socket_qabstractsocket.cpp
new file mode 100644
index 0000000000..d64931aa7a
--- /dev/null
+++ b/doc/src/snippets/code/src_network_socket_qabstractsocket.cpp
@@ -0,0 +1,30 @@
+//! [0]
+socket->connectToHost("imap", 143);
+if (socket->waitForConnected(1000))
+    qDebug("Connected!");
+//! [0]
+
+
+//! [1]
+socket->disconnectFromHost();
+    if (socket->state() == QAbstractSocket::UnconnectedState || 
+        socket->waitForDisconnected(1000))
+        qDebug("Disconnected!");
+//! [1]
+
+
+//! [2]
+ // This slot is connected to QAbstractSocket::readyRead()
+ void SocketClass::readyReadSlot()
+ {
+     while (!socket.atEnd()) {
+         QByteArray data = socket.read(100);
+         ....
+     }
+ }
+//! [2]
+
+
+//! [3]
+socket->setProxy(QNetworkProxy::NoProxy);
+//! [3]
diff --git a/doc/src/snippets/code/src_network_socket_qlocalsocket_unix.cpp b/doc/src/snippets/code/src_network_socket_qlocalsocket_unix.cpp
new file mode 100644
index 0000000000..da96e6f112
--- /dev/null
+++ b/doc/src/snippets/code/src_network_socket_qlocalsocket_unix.cpp
@@ -0,0 +1,12 @@
+//! [0]
+socket->connectToServer("market");
+if (socket->waitForConnected(1000))
+    qDebug("Connected!");
+//! [0]
+
+
+//! [1]
+socket->disconnectFromServer();
+if (socket->waitForDisconnected(1000))
+    qDebug("Disconnected!");
+//! [1]
diff --git a/doc/src/snippets/code/src_network_socket_qnativesocketengine.cpp b/doc/src/snippets/code/src_network_socket_qnativesocketengine.cpp
new file mode 100644
index 0000000000..2aca1e1f56
--- /dev/null
+++ b/doc/src/snippets/code/src_network_socket_qnativesocketengine.cpp
@@ -0,0 +1,21 @@
+//! [0]
+QNativeSocketEngine socketLayer;
+socketLayer.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv4Protocol);
+socketLayer.connectToHost(QHostAddress::LocalHost, 22);
+// returns false
+
+socketLayer.waitForWrite();
+socketLayer.connectToHost(QHostAddress::LocalHost, 22);
+// returns true
+//! [0]
+
+
+//! [1]
+QNativeSocketEngine socketLayer;
+socketLayer.bind(QHostAddress::Any, 4000);
+socketLayer.listen();
+if (socketLayer.waitForRead()) {
+    int clientSocket = socketLayer.accept();
+    // a client is connected
+}
+//! [1]
diff --git a/doc/src/snippets/code/src_network_socket_qtcpserver.cpp b/doc/src/snippets/code/src_network_socket_qtcpserver.cpp
new file mode 100644
index 0000000000..0021e3b1aa
--- /dev/null
+++ b/doc/src/snippets/code/src_network_socket_qtcpserver.cpp
@@ -0,0 +1,3 @@
+//! [0]
+server->setProxy(QNetworkProxy::NoProxy);
+//! [0]
diff --git a/doc/src/snippets/code/src_network_socket_qudpsocket.cpp b/doc/src/snippets/code/src_network_socket_qudpsocket.cpp
new file mode 100644
index 0000000000..966fb50d13
--- /dev/null
+++ b/doc/src/snippets/code/src_network_socket_qudpsocket.cpp
@@ -0,0 +1,25 @@
+//! [0]
+void Server::initSocket()
+{
+    udpSocket = new QUdpSocket(this);
+    udpSocket->bind(QHostAddress::LocalHost, 7755);
+
+    connect(udpSocket, SIGNAL(readyRead()),
+            this, SLOT(readPendingDatagrams()));
+}
+
+void Server::readPendingDatagrams()
+{
+    while (udpSocket->hasPendingDatagrams()) {
+        QByteArray datagram;
+        datagram.resize(udpSocket->pendingDatagramSize());
+        QHostAddress sender;
+        quint16 senderPort;
+
+        udpSocket->readDatagram(datagram.data(), datagram.size(),
+                                &sender, &senderPort);
+
+        processTheDatagram(datagram);
+    }
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_network_ssl_qsslcertificate.cpp b/doc/src/snippets/code/src_network_ssl_qsslcertificate.cpp
new file mode 100644
index 0000000000..2ec84ae112
--- /dev/null
+++ b/doc/src/snippets/code/src_network_ssl_qsslcertificate.cpp
@@ -0,0 +1,6 @@
+//! [0]
+foreach (QSslCertificate cert, QSslCertificate::fromPath("C:/ssl/certificate.*.pem", QSsl::Pem,
+                                                         QRegExp::Wildcard)) {
+    qDebug() << cert.issuerInfo(QSslCertificate::Organization);
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_network_ssl_qsslconfiguration.cpp b/doc/src/snippets/code/src_network_ssl_qsslconfiguration.cpp
new file mode 100644
index 0000000000..fb3e1ab260
--- /dev/null
+++ b/doc/src/snippets/code/src_network_ssl_qsslconfiguration.cpp
@@ -0,0 +1,5 @@
+//! [0]
+QSslConfiguration config = sslSocket.sslConfiguration();
+config.setProtocol(QSsl::TlsV1);
+sslSocket.setSslConfiguration(config);
+//! [0]
diff --git a/doc/src/snippets/code/src_network_ssl_qsslsocket.cpp b/doc/src/snippets/code/src_network_ssl_qsslsocket.cpp
new file mode 100644
index 0000000000..afffbab1e6
--- /dev/null
+++ b/doc/src/snippets/code/src_network_ssl_qsslsocket.cpp
@@ -0,0 +1,56 @@
+//! [0]
+QSslSocket *socket = new QSslSocket(this);
+connect(socket, SIGNAL(encrypted()), this, SLOT(ready()));
+
+socket->connectToHostEncrypted("imap.example.com", 993);
+//! [0]
+
+
+//! [1]
+void SslServer::incomingConnection(int socketDescriptor)
+{
+    QSslSocket *serverSocket = new QSslSocket;
+    if (serverSocket->setSocketDescriptor(socketDescriptor)) {
+        connect(serverSocket, SIGNAL(encrypted()), this, SLOT(ready()));
+        serverSocket->startServerEncryption();
+    } else {
+        delete serverSocket;
+    }
+}
+//! [1]
+
+
+//! [2]
+QSslSocket socket;
+socket.connectToHostEncrypted("http.example.com", 443);
+if (!socket.waitForEncrypted()) {
+    qDebug() << socket.errorString();
+    return false;
+}
+
+socket.write("GET / HTTP/1.0\r\n\r\n");
+while (socket.waitForReadyRead())
+    qDebug() << socket.readAll().data();
+//! [2]
+
+
+//! [3]
+QSslSocket socket;
+connect(&socket, SIGNAL(encrypted()), receiver, SLOT(socketEncrypted()));
+
+socket.connectToHostEncrypted("imap", 993);
+socket->write("1 CAPABILITY\r\n");
+//! [3]
+
+
+//! [4]
+QSslSocket socket;
+socket.setCiphers("DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:AES256-SHA");
+//! [4]
+
+
+//! [5]
+socket->connectToHostEncrypted("imap", 993);
+if (socket->waitForEncrypted(1000))
+    qDebug("Encrypted!");
+//! [5]
diff --git a/doc/src/snippets/code/src_opengl_qgl.cpp b/doc/src/snippets/code/src_opengl_qgl.cpp
new file mode 100644
index 0000000000..15b0005424
--- /dev/null
+++ b/doc/src/snippets/code/src_opengl_qgl.cpp
@@ -0,0 +1,132 @@
+//! [0]
+QGLFormat fmt;
+fmt.setAlpha(true);
+fmt.setStereo(true);
+QGLFormat::setDefaultFormat(fmt);
+//! [0]
+
+
+//! [1]
+QGLFormat fmt;
+fmt.setDoubleBuffer(false);                 // single buffer
+fmt.setDirectRendering(false);              // software rendering
+MyGLWidget* myWidget = new MyGLWidget(fmt, ...);
+//! [1]
+
+
+//! [2]
+QGLFormat fmt;
+fmt.setOverlay(true);
+fmt.setStereo(true);
+MyGLWidget* myWidget = new MyGLWidget(fmt, ...);
+if (!myWidget->format().stereo()) {
+    // ok, goggles off
+    if (!myWidget->format().hasOverlay()) {
+        qFatal("Cool hardware required");
+    }
+}
+//! [2]
+
+
+//! [3]
+// The rendering in MyGLWidget depends on using
+// stencil buffer and alpha channel
+MyGLWidget::MyGLWidget(QWidget* parent)
+    : QGLWidget(QGLFormat(QGL::StencilBuffer | QGL::AlphaChannel), parent)
+{
+    if (!format().stencil())
+        qWarning("Could not get stencil buffer; results will be suboptimal");
+    if (!format().alpha())
+        qWarning("Could not get alpha channel; results will be suboptimal");
+    ...
+}
+//! [3]
+
+
+//! [4]
+QApplication a(argc, argv);
+QGLFormat f;
+f.setDoubleBuffer(false);
+QGLFormat::setDefaultFormat(f);
+//! [4]
+
+
+//! [5]
+QGLFormat f = QGLFormat::defaultOverlayFormat();
+f.setDoubleBuffer(true);
+QGLFormat::setDefaultOverlayFormat(f);
+//! [5]
+
+
+//! [6]
+// ...continued from above
+MyGLWidget* myWidget = new MyGLWidget(QGLFormat(QGL::HasOverlay), ...);
+if (myWidget->format().hasOverlay()) {
+    // Yes, we got an overlay, let's check _its_ format:
+    QGLContext* olContext = myWidget->overlayContext();
+    if (olContext->format().doubleBuffer())
+        ; // yes, we got a double buffered overlay
+    else
+        ; // no, only single buffered overlays are available
+}
+//! [6]
+
+
+//! [7]
+QGLContext *cx;
+//  ...
+QGLFormat f;
+f.setStereo(true);
+cx->setFormat(f);
+if (!cx->create())
+    exit(); // no OpenGL support, or cannot render on the specified paintdevice
+if (!cx->format().stereo())
+    exit(); // could not create stereo context
+//! [7]
+
+
+//! [8]
+class MyGLDrawer : public QGLWidget
+{
+    Q_OBJECT        // must include this if you use Qt signals/slots
+
+public:
+    MyGLDrawer(QWidget *parent)
+        : QGLWidget(parent) {}
+
+protected:
+
+    void initializeGL()
+    {
+        // Set up the rendering context, define display lists etc.:
+        ...
+        glClearColor(0.0, 0.0, 0.0, 0.0);
+        glEnable(GL_DEPTH_TEST);
+        ...
+    }
+
+    void resizeGL(int w, int h)
+    {
+        // setup viewport, projection etc.:
+        glViewport(0, 0, (GLint)w, (GLint)h);
+        ...
+        glFrustum(...);
+        ...
+    }
+
+    void paintGL()
+    {
+        // draw the scene:
+        ...
+        glRotatef(...);
+        glMaterialfv(...);
+        glBegin(GL_QUADS);
+        glVertex3f(...);
+        glVertex3f(...);
+        ...
+        glEnd();
+        ...
+    }
+
+};
+//! [8]
diff --git a/doc/src/snippets/code/src_opengl_qglcolormap.cpp b/doc/src/snippets/code/src_opengl_qglcolormap.cpp
new file mode 100644
index 0000000000..b47de762f5
--- /dev/null
+++ b/doc/src/snippets/code/src_opengl_qglcolormap.cpp
@@ -0,0 +1,21 @@
+//! [0]
+#include <QApplication>
+#include <QGLColormap>
+
+int main()
+{
+    QApplication app(argc, argv);
+
+    MySuperGLWidget widget;     // a QGLWidget in color-index mode
+    QGLColormap colormap;
+
+    // This will fill the colormap with colors ranging from
+    // black to white.
+    for (int i = 0; i < colormap.size(); i++)
+        colormap.setEntry(i, qRgb(i, i, i));
+
+    widget.setColormap(colormap);
+    widget.show();
+    return app.exec();
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_opengl_qglpixelbuffer.cpp b/doc/src/snippets/code/src_opengl_qglpixelbuffer.cpp
new file mode 100644
index 0000000000..589ffc0f32
--- /dev/null
+++ b/doc/src/snippets/code/src_opengl_qglpixelbuffer.cpp
@@ -0,0 +1,19 @@
+//! [0]
+QGLPixelBuffer pbuffer(...);
+...
+pbuffer.makeCurrent();
+GLuint dynamicTexture = pbuffer.generateDynamicTexture();
+pbuffer.bindToDynamicTexture(dynamicTexture);
+...
+pbuffer.releaseFromDynamicTexture();
+//! [0]
+
+
+//! [1]
+QGLPixelBuffer pbuffer(...);
+...
+pbuffer.makeCurrent();
+GLuint dynamicTexture = pbuffer.generateDynamicTexture();
+...
+pbuffer.updateDynamicTexture(dynamicTexture);
+//! [1]
diff --git a/doc/src/snippets/code/src_qdbus_qdbusabstractinterface.cpp b/doc/src/snippets/code/src_qdbus_qdbusabstractinterface.cpp
new file mode 100644
index 0000000000..cc5b86deba
--- /dev/null
+++ b/doc/src/snippets/code/src_qdbus_qdbusabstractinterface.cpp
@@ -0,0 +1,20 @@
+//! [0]
+QString value = retrieveValue();
+QDBusMessage reply;
+
+QDBusReply<int> api = interface->call(QLatin1String("GetAPIVersion"));
+if (api >= 14)
+  reply = interface->call(QLatin1String("ProcessWorkUnicode"), value);
+else
+  reply = interface->call(QLatin1String("ProcessWork"), QLatin1String("UTF-8"), value.toUtf8());
+//! [0]
+
+//! [1]
+QString value = retrieveValue();
+QDBusPendingCall pcall = interface->asyncCall(QLatin1String("Process"), value);
+
+QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);
+
+QObject::connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
+                 this, SLOT(callFinishedSlot(QDBusPendingCallWatcher*)));
+//! [1]
diff --git a/doc/src/snippets/code/src_qdbus_qdbusargument.cpp b/doc/src/snippets/code/src_qdbus_qdbusargument.cpp
new file mode 100644
index 0000000000..b98251054f
--- /dev/null
+++ b/doc/src/snippets/code/src_qdbus_qdbusargument.cpp
@@ -0,0 +1,151 @@
+//! [0]
+struct MyStructure
+{
+    int count;
+    QString name;
+};
+QT_DECLARE_METATYPE(MyStructure)
+
+// Marshall the MyStructure data into a D-Bus argument
+QDBusArgument &operator<<(QDBusArgument &argument, const MyStructure &mystruct)
+{
+    argument.beginStructure();
+    argument << mystruct.count << mystruct.name;
+    argument.endStructure();
+    return argument;
+}
+
+// Retrieve the MyStructure data from the D-Bus argument
+const QDBusArgument &operator>>(const QDBusArgument &argument, MyStructure &mystruct)
+{
+    argument.beginStructure();
+    argument >> mystruct.count >> mystruct.name;
+    argument.endStructure();
+    return argument;
+}
+//! [0]
+
+
+//! [1]
+qDBusRegisterMetaType<MyStructure>();
+//! [1]
+
+
+//! [2]
+MyType item = qdbus_cast<Type>(argument);
+//! [2]
+
+
+//! [3]
+MyType item;
+argument >> item;
+//! [3]
+
+
+//! [4]
+QDBusArgument &operator<<(QDBusArgument &argument, const MyStructure &mystruct)
+{
+    argument.beginStructure();
+    argument << mystruct.member1 << mystruct.member2 << ... ;
+    argument.endStructure();
+    return argument;
+}
+//! [4]
+
+
+//! [5]
+QDBusArgument &operator<<(QDBusArgument &argument, const MyStructure &mystruct)
+{
+    argument.beginStructure();
+    argument << mystruct.member1 << mystruct.member2;
+
+    argument.beginStructure();
+    argument << mystruct.member3.subMember1 << mystruct.member3.subMember2;
+    argument.endStructure();
+
+    argument << mystruct.member4;
+    argument.endStructure();
+    return argument;
+}
+//! [5]
+
+
+//! [6]
+// append an array of MyElement types
+QDBusArgument &operator<<(QDBusArgument &argument, const MyArray &myarray)
+{
+    argument.beginArray( qMetaTypeId<MyElement>() );
+    for ( int i = 0; i < myarray.length; ++i )
+        argument << myarray.elements[i];
+    argument.endArray();
+    return argument;
+}
+//! [6]
+
+
+//! [7]
+// append a dictionary that associates ints to MyValue types
+QDBusArgument &operator<<(QDBusArgument &argument, const MyDictionary &mydict)
+{
+    argument.beginMap( QVariant::Int, qMetaTypeId<MyValue>() );
+    for ( int i = 0; i < mydict.length; ++i ) {
+        argument.beginMapEntry();
+        argument << mydict.data[i].key << mydict.data[i].value;
+        argument.endMapEntry();
+    }
+    argument.endMap();
+    return argument;
+}
+//! [7]
+
+
+//! [8]
+const QDBusArgument &operator>>(const QDBusArgument &argument, MyStructure &mystruct)
+{
+    argument.beginStructure()
+    argument >> mystruct.member1 >> mystruct.member2 >> mystruct.member3 >> ...;
+    argument.endStructure();
+    return argument;
+}
+//! [8]
+
+
+//! [9]
+// extract a MyArray array of MyElement elements
+const QDBusArgument &operator>>(const QDBusArgument &argument, MyArray &myarray)
+{
+    argument.beginArray();
+    myarray.clear();
+
+    while ( !argument.atEnd() ) {
+        MyElement element;
+        argument >> element;
+        myarray.append( element );
+    }
+
+    argument.endArray();
+    return argument;
+}
+//! [9]
+
+
+//! [10]
+// extract a MyDictionary map that associates ints to MyValue elements
+const QDBusArgument &operator>>(const QDBusArgument &argument, MyDictionary &mydict)
+{
+    argument.beginMap();
+    mydict.clear();
+
+    while ( !argMap.atEnd() ) {
+        int key;
+        MyValue value;
+        argument.beginMapEntry();
+        argument >> key >> value;
+        argument.endMapEntry();
+        mydict.append( key, value );
+    }
+
+    argument.endMap();
+    return argument;
+}
+//! [10]
diff --git a/doc/src/snippets/code/src_qdbus_qdbuscontext.cpp b/doc/src/snippets/code/src_qdbus_qdbuscontext.cpp
new file mode 100644
index 0000000000..2a8c868ad9
--- /dev/null
+++ b/doc/src/snippets/code/src_qdbus_qdbuscontext.cpp
@@ -0,0 +1,32 @@
+//! [0]
+class MyObject: public QObject,
+                protected QDBusContext
+{
+    Q_OBJECT
+    QDBusConnection conn;
+    QDBusMessage msg;
+
+...
+
+protected slots:
+    void process();
+public slots:
+    void methodWithError();
+    QString methodWithDelayedReply();
+};
+
+void MyObject::methodWithError()
+{
+    sendErrorReply(QDBusError::NotSupported,
+                   "The method call 'methodWithError()' is not supported");
+}
+
+QString MyObject::methodWithDelayedReply()
+{
+    conn = connection();
+    msg = message();
+    setDelayedReply(true);
+    QMetaObject::invokeMethod(this, "process", Qt::QueuedConnection);
+    return QString();
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_qdbus_qdbusinterface.cpp b/doc/src/snippets/code/src_qdbus_qdbusinterface.cpp
new file mode 100644
index 0000000000..df883e7d78
--- /dev/null
+++ b/doc/src/snippets/code/src_qdbus_qdbusinterface.cpp
@@ -0,0 +1,11 @@
+//! [0]
+QDBusInterface remoteApp( "com.example.Calculator", "/Calculator/Operations",
+                          "org.mathematics.RPNCalculator" );
+remoteApp.call( "PushOperand", 2 );
+remoteApp.call( "PushOperand", 2 );
+remoteApp.call( "ExecuteOperation", "+" );
+QDBusReply<int> reply = remoteApp.call( "PopOperand" );
+
+if ( reply.isValid() )
+    printf( "%d", reply.value() );          // prints 4
+//! [0]
diff --git a/doc/src/snippets/code/src_qdbus_qdbusmetatype.cpp b/doc/src/snippets/code/src_qdbus_qdbusmetatype.cpp
new file mode 100644
index 0000000000..99fd6e4f70
--- /dev/null
+++ b/doc/src/snippets/code/src_qdbus_qdbusmetatype.cpp
@@ -0,0 +1,3 @@
+//! [0]
+qDBusRegisterMetaType<MyClass>();
+//! [0]
diff --git a/doc/src/snippets/code/src_qdbus_qdbusreply.cpp b/doc/src/snippets/code/src_qdbus_qdbusreply.cpp
new file mode 100644
index 0000000000..4dc896f9ee
--- /dev/null
+++ b/doc/src/snippets/code/src_qdbus_qdbusreply.cpp
@@ -0,0 +1,14 @@
+//! [0]
+QDBusReply<QString> reply = interface->call("RemoteMethod");
+if (reply.isValid())
+    // use the returned value
+    useValue(reply.value());
+else
+    // call failed. Show an error condition.
+    showError(reply.error());
+//! [0]
+
+
+//! [1]
+QString reply = interface->call("RemoteMethod");
+//! [1]
diff --git a/doc/src/snippets/code/src_qt3support_canvas_q3canvas.cpp b/doc/src/snippets/code/src_qt3support_canvas_q3canvas.cpp
new file mode 100644
index 0000000000..bca056c9da
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_canvas_q3canvas.cpp
@@ -0,0 +1,51 @@
+//! [0]
+QPrinter pr;
+if (pr.setup()) {
+    QPainter p(&pr);
+    canvas.drawArea(canvas.rect(), &p);
+}
+//! [0]
+
+
+//! [1]
+void MyCanvasView::contentsMousePressEvent(QMouseEvent* e)
+{
+    Q3CanvasItemList l = canvas()->collisions(e->pos());
+    for (Q3CanvasItemList::Iterator it=l.begin(); it!=l.end(); ++it) {
+        if ((*it)->rtti() == Q3CanvasRectangle::RTTI)
+            qDebug("A Q3CanvasRectangle lies somewhere at this point");
+    }
+}
+//! [1]
+
+
+//! [2]
+QMatrix wm;
+wm.scale(2, 2);   // Zooms in by 2 times
+wm.rotate(90);    // Rotates 90 degrees counter clockwise
+                  // around the origin.
+wm.translate(0, -canvas->height());
+                  // moves the canvas down so what was visible
+                  // before is still visible.
+myCanvasView->setWorldMatrix(wm);
+//! [2]
+
+
+//! [3]
+QRect rc = QRect(myCanvasView->contentsX(), myCanvasView->contentsY(),
+                 myCanvasView->visibleWidth(), myCanvasView->visibleHeight());
+QRect canvasRect = myCanvasView->inverseWorldMatrix().mapRect(rc);
+//! [3]
+
+
+//! [4]
+Q3CanvasItem* item;
+// Find an item, e.g. with Q3CanvasItem::collisions().
+...
+if (item->rtti() == MySprite::RTTI) {
+    MySprite* s = (MySprite*)item;
+    if (s->isDamagable()) s->loseHitPoints(1000);
+    if (s->isHot()) myself->loseHitPoints(1000);
+    ...
+}
+//! [4]
diff --git a/doc/src/snippets/code/src_qt3support_dialogs_q3filedialog.cpp b/doc/src/snippets/code/src_qt3support_dialogs_q3filedialog.cpp
new file mode 100644
index 0000000000..ea669857d3
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_dialogs_q3filedialog.cpp
@@ -0,0 +1,229 @@
+//! [0]
+QString s = Q3FileDialog::getOpenFileName(
+                "/home",
+                "Images (*.png *.xpm *.jpg)",
+                this,
+                "open file dialog",
+                "Choose a file");
+//! [0]
+
+
+//! [1]
+"Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)"
+//! [1]
+
+
+//! [2]
+Q3FileDialog* fd = new Q3FileDialog(this, "file dialog", true);
+fd->setMode(Q3FileDialog::AnyFile);
+//! [2]
+
+
+//! [3]
+fd->setFilter("Images (*.png *.xpm *.jpg)");
+//! [3]
+
+
+//! [4]
+fd->setViewMode(Q3FileDialog::Detail);
+//! [4]
+
+
+//! [5]
+QString fileName;
+if (fd->exec() == QDialog::Accepted)
+    fileName = fd->selectedFile();
+//! [5]
+
+
+//! [6]
+class Preview : public QLabel, public Q3FilePreview
+{
+public:
+    Preview(QWidget *parent=0) : QLabel(parent) {}
+
+    void previewUrl(const Q3Url &u)
+    {
+        QString path = u.path();
+        QPixmap pix(path);
+        if (pix.isNull())
+            setText("This is not a pixmap");
+        else
+            setPixmap(pix);
+    }
+};
+//! [6]
+
+
+//! [7]
+Preview* p = new Preview;
+
+Q3FileDialog* fd = new Q3FileDialog(this);
+fd->setContentsPreviewEnabled(true);
+fd->setContentsPreview(p, p);
+fd->setPreviewMode(Q3FileDialog::Contents);
+fd->show();
+//! [7]
+
+
+//! [8]
+QStringList list = myFileDialog.selectedFiles();
+QStringList::Iterator it = list.begin();
+while(it != list.end()) {
+    myProcessing(*it);
+    ++it;
+}
+//! [8]
+
+
+//! [9]
+fd->setFilter("All C++ files (*.cpp *.cc *.C *.cxx *.c++)");
+fd->setFilter("*.cpp *.cc *.C *.cxx *.c++");
+fd->setFilter("All C++ files (*.cpp;*.cc;*.C;*.cxx;*.c++)");
+fd->setFilter("*.cpp;*.cc;*.C;*.cxx;*.c++");
+//! [9]
+
+
+//! [10]
+QString s = Q3FileDialog::getOpenFileName(
+                "/home",
+                "Images (*.png *.xpm *.jpg)",
+                this,
+                "open file dialog",
+                "Choose a file to open");
+//! [10]
+
+
+//! [11]
+QString s = Q3FileDialog::getSaveFileName(
+                "/home",
+                "Images (*.png *.xpm *.jpg)",
+                this,
+                "save file dialog",
+                "Choose a filename to save under");
+//! [11]
+
+
+//! [12]
+QString s = Q3FileDialog::getExistingDirectory(
+                "/home",
+                this,
+                "get existing directory",
+                "Choose a directory",
+                true);
+//! [12]
+
+
+//! [13]
+MyFileDialog::MyFileDialog(QWidget* parent, const char* name) :
+    Q3FileDialog(parent, name)
+{
+    QLabel* label = new QLabel("Added widgets", this);
+    QLineEdit* lineedit = new QLineEdit(this);
+    QPushButton* pushbutton = new QPushButton(this);
+
+    addWidgets(label, lineedit, pushbutton);
+}
+//! [13]
+
+
+//! [14]
+QString types("Image files (*.png *.xpm *.jpg);;"
+              "Text files (*.txt);;"
+              "Any files (*)");
+Q3FileDialog fd = new Q3FileDialog(this);
+fd->setFilters(types);
+fd->show();
+//! [14]
+
+
+//! [15]
+Q3FileDialog* fd = new Q3FileDialog(this);
+fd->addFilter("Images (*.png *.jpg *.xpm)");
+fd->show();
+//! [15]
+
+
+//! [16]
+QStringList files = Q3FileDialog::getOpenFileNames(
+                        "Images (*.png *.xpm *.jpg)",
+                        "/home",
+                        this,
+                        "open files dialog",
+                        "Select one or more files to open");
+//! [16]
+
+
+//! [17]
+QStringList list = files;
+QStringList::Iterator it = list.begin();
+while(it != list.end()) {
+    myProcessing(*it);
+    ++it;
+}
+//! [17]
+
+
+//! [18]
+class Preview : public QLabel, public Q3FilePreview
+{
+public:
+    Preview(QWidget *parent=0) : QLabel(parent) {}
+
+    void previewUrl(const Q3Url &u)
+    {
+        QString path = u.path();
+        QPixmap pix(path);
+        if (pix.isNull())
+            setText("This is not a pixmap");
+        else
+            setText("This is a pixmap");
+    }
+};
+
+//...
+
+int main(int argc, char** argv)
+{
+    Preview* p = new Preview;
+
+    Q3FileDialog* fd = new Q3FileDialog(this);
+    fd->setInfoPreviewEnabled(true);
+    fd->setInfoPreview(p, p);
+    fd->setPreviewMode(Q3FileDialog::Info);
+    fd->show();
+}
+
+//! [18]
+
+
+//! [19]
+class Preview : public QLabel, public Q3FilePreview
+{
+public:
+    Preview(QWidget *parent=0) : QLabel(parent) {}
+
+    void previewUrl(const Q3Url &u)
+    {
+        QString path = u.path();
+        QPixmap pix(path);
+        if (pix.isNull())
+            setText("This is not a pixmap");
+        else
+            setPixmap(pix);
+    }
+};
+
+//...
+
+int main(int argc, char** argv)
+{
+    Preview* p = new Preview;
+
+    Q3FileDialog* fd = new Q3FileDialog(this);
+    fd->setContentsPreviewEnabled(true);
+    fd->setContentsPreview(p, p);
+    fd->setPreviewMode(Q3FileDialog::Contents);
+    fd->show();
+}
+//! [19]
diff --git a/doc/src/snippets/code/src_qt3support_dialogs_q3progressdialog.cpp b/doc/src/snippets/code/src_qt3support_dialogs_q3progressdialog.cpp
new file mode 100644
index 0000000000..8aeafe8ab8
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_dialogs_q3progressdialog.cpp
@@ -0,0 +1,41 @@
+//! [0]
+Q3ProgressDialog progress("Copying files...", "Abort Copy", numFiles,
+                          this, "progress", true);
+for (int i = 0; i < numFiles; i++) {
+    progress.setProgress(i);
+    qApp->processEvents();
+
+    if (progress.wasCanceled())
+        break;
+    //... copy one file
+}
+progress.setProgress(numFiles);
+//! [0]
+
+
+//! [1]
+Operation::Operation(QObject *parent = 0)
+    : QObject(parent), steps(0)
+{
+    pd = new Q3ProgressDialog("Operation in progress.", "Cancel", 100);
+    connect(pd, SIGNAL(canceled()), this, SLOT(cancel()));
+    t = new QTimer(this);
+    connect(t, SIGNAL(timeout()), this, SLOT(perform()));
+    t->start(0);
+}
+
+void Operation::perform()
+{
+    pd->setProgress(steps);
+    //... perform one percent of the operation
+    steps++;
+    if (steps > pd->totalSteps())
+        t->stop();
+}
+
+void Operation::cancel()
+{
+    t->stop();
+    //... cleanup
+}
+//! [1]
diff --git a/doc/src/snippets/code/src_qt3support_itemviews_q3iconview.cpp b/doc/src/snippets/code/src_qt3support_itemviews_q3iconview.cpp
new file mode 100644
index 0000000000..8c303891ea
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_itemviews_q3iconview.cpp
@@ -0,0 +1,75 @@
+//! [0]
+(void) new Q3IconViewItem(
+                iconView,        // A pointer to a Q3IconView
+                "This is the text of the item",
+                aPixmap);
+//! [0]
+
+
+//! [1]
+Q3IconViewItem *item;
+for (item = iconView->firstItem(); item; item = item->nextItem())
+    do_something_with(item);
+//! [1]
+
+
+//! [2]
+Q3IconViewItem *item;
+for (item = iconView->firstItem(); item; item = item->nextItem())
+    do_something_with(item);
+//! [2]
+
+
+//! [3]
+int MyIconViewItem::compare(Q3IconViewItem *i) const
+{
+    return key().compare(i->key());
+}
+//! [3]
+
+
+//! [4]
+Q3IconView *iv = new Q3IconView(this);
+QDir dir(path, "*.xpm");
+for (uint i = 0; i < dir.count(); i++) {
+    (void) new Q3IconViewItem(iv, dir[i], QPixmap(path + dir[i]));
+}
+iv->resize(600, 400);
+iv->show();
+//! [4]
+
+
+//! [5]
+for (Q3IconViewItem *item = iv->firstItem(); item; item = item->nextItem())
+    do_something(item);
+//! [5]
+
+
+//! [6]
+Q3DragObject *MyIconView::dragObject()
+{
+    return new Q3TextDrag(currentItem()->text(), this);
+}
+//! [6]
+
+
+//! [7]
+bool MyIconViewItem::acceptDrop(const QMimeSource *mime) const
+{
+    if (mime->provides("text/plain"))
+        return true;
+    return false;
+}
+
+void MyIconViewItem::dropped(QDropEvent *evt, const Q3ValueList<Q3IconDragItem>&)
+{
+    QString label;
+    if (Q3TextDrag::decode(evt, label))
+        setText(label);
+}
+//! [7]
+
+
+//! [8]
+(void) new Q3IconViewItem(myIconview, "The text of the item", aPixmap);
+//! [8]
diff --git a/doc/src/snippets/code/src_qt3support_itemviews_q3listview.cpp b/doc/src/snippets/code/src_qt3support_itemviews_q3listview.cpp
new file mode 100644
index 0000000000..615f124fd3
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_itemviews_q3listview.cpp
@@ -0,0 +1,73 @@
+//! [0]
+(void) new Q3ListViewItem(listView, "Column 1", "Column 2");
+(void) new Q3ListViewItem(listView->firstChild(), "A", "B", "C");
+//! [0]
+
+
+//! [1]
+Q3ListViewItem * myChild = myItem->firstChild();
+while(myChild) {
+    doSomething(myChild);
+    myChild = myChild->nextSibling();
+}
+//! [1]
+
+
+//! [2]
+Q3ListViewItemIterator it(listview);
+while (it.current()) {
+    Q3ListViewItem *item = it.current();
+    doSomething(item);
+    ++it;
+}
+//! [2]
+
+
+//! [3]
+int MyListViewItem::compare(Q3ListViewItem *i, int col,
+                             bool ascending) const
+{
+    return key(col, ascending).compare(i->key(col, ascending));
+}
+//! [3]
+
+
+//! [4]
+Q3ListViewItem *i = itemAt(p);
+if (i) {
+    if (p.x() > header()->sectionPos(header()->mapToIndex(0)) +
+            treeStepSize() * (i->depth() + (rootIsDecorated() ? 1 : 0)) + itemMargin() ||
+            p.x() < header()->sectionPos(header()->mapToIndex(0))) {
+        ; // p is not on root decoration
+    else
+        ; // p is on the root decoration
+}
+//! [4]
+
+
+//! [5]
+QRect r(listView->itemRect(item));
+r.setHeight(qMin(item->totalHeight(),
+                 listView->viewport->height() - r.y()))
+//! [5]
+
+
+//! [6]
+QList<Q3ListViewItem *> lst;
+Q3ListViewItemIterator it(myListView);
+while (it.current()) {
+    if (it.current()->isSelected())
+        lst.append(it.current());
+    ++it;
+}
+//! [6]
+
+
+//! [7]
+QList<Q3ListViewItem *> lst;
+Q3ListViewItemIterator it(myListView, Selected);
+while (it.current()) {
+    lst.append(it.current());
+    ++it;
+}
+//! [7]
diff --git a/doc/src/snippets/code/src_qt3support_itemviews_q3table.cpp b/doc/src/snippets/code/src_qt3support_itemviews_q3table.cpp
new file mode 100644
index 0000000000..47f9c4ebb5
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_itemviews_q3table.cpp
@@ -0,0 +1,57 @@
+
+void wrapInFunction()
+{
+
+//! [0]
+for (int row = 0; row < table->numRows(); row++) {
+    for (int col = 0; col < table->numCols(); col++) {
+        table->setItem(row, col,
+            new Q3TableItem(table, Q3TableItem::WhenCurrent, QString::number(row * col)));
+    }
+}
+//! [0]
+
+
+//! [1]
+QWidget* MyTableItem::createEditor() const
+{
+    QHBox* hbox = new QHBox(table()->viewport());
+    hbox->setFocusProxy(new QLineEdit(hbox));
+    new QLineEdit(hbox);
+    return hbox;
+}
+//! [1]
+
+
+//! [2]
+p->setClipRect(table()->cellRect(row, col), QPainter::ClipPainter);
+//... your drawing code
+p->setClipping(false);
+//! [2]
+
+
+//! [3]
+Q3Table *table = new Q3Table(100, 250, this);
+table->setPixmap(3, 2, pix);
+table->setText(3, 2, "A pixmap");
+//! [3]
+
+
+//! [4]
+p->setClipRect(cellRect(row, col), QPainter::CoordPainter);
+//... your drawing code
+p->setClipping(false);
+//! [4]
+
+
+//! [5]
+Q3TableItem *i = item(row, col);
+if (initFromCell || (i && !i->isReplaceable()))
+    // If we had a Q3TableItem ask the base class to create the editor
+    return Q3Table::createEditor(row, col, initFromCell);
+else
+    return ...(create your own editor)
+//! [5]
+
+}
+
diff --git a/doc/src/snippets/code/src_qt3support_network_q3dns.cpp b/doc/src/snippets/code/src_qt3support_network_q3dns.cpp
new file mode 100644
index 0000000000..9638ff1171
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_network_q3dns.cpp
@@ -0,0 +1,58 @@
+//! [0]
+QStringList list = myDns.qualifiedNames();
+QStringList::Iterator it = list.begin();
+while( it != list.end() ) {
+    myProcessing( *it );
+    ++it;
+}
+//! [0]
+
+
+//! [1]
+Q3ValueList<QHostAddress> list = myDns.addresses();
+Q3ValueList<QHostAddress>::Iterator it = list.begin();
+while( it != list.end() ) {
+    myProcessing( *it );
+    ++it;
+}
+//! [1]
+
+
+//! [2]
+Q3ValueList<Q3Dns::MailServer> list = myDns.mailServers();
+Q3ValueList<Q3Dns::MailServer>::Iterator it = list.begin();
+while( it != list.end() ) {
+    myProcessing( *it );
+    ++it;
+}
+//! [2]
+
+
+//! [3]
+Q3ValueList<Q3Dns::Server> list = myDns.servers();
+Q3ValueList<Q3Dns::Server>::Iterator it = list.begin();
+while( it != list.end() ) {
+    myProcessing( *it );
+    ++it;
+}
+//! [3]
+
+
+//! [4]
+QStringList list = myDns.hostNames();
+QStringList::Iterator it = list.begin();
+while( it != list.end() ) {
+    myProcessing( *it );
+    ++it;
+}
+//! [4]
+
+
+//! [5]
+QStringList list = myDns.texts();
+QStringList::Iterator it = list.begin();
+while( it != list.end() ) {
+    myProcessing( *it );
+    ++it;
+}
+//! [5]
diff --git a/doc/src/snippets/code/src_qt3support_network_q3ftp.cpp b/doc/src/snippets/code/src_qt3support_network_q3ftp.cpp
new file mode 100644
index 0000000000..37e17d45b6
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_network_q3ftp.cpp
@@ -0,0 +1,65 @@
+//! [0]
+QUrlOperator op( "ftp://ftp.trolltech.com" );
+op.listChildren(); // Asks the server to provide a directory listing
+//! [0]
+
+
+//! [1]
+Q3Ftp *ftp = new Q3Ftp( this ); // this is an optional QObject parent
+ftp->connectToHost( "ftp.trolltech.com" );
+ftp->login();
+//! [1]
+
+
+//! [2]
+ftp->connectToHost( "ftp.trolltech.com" );  // id == 1
+ftp->login();                               // id == 2
+ftp->cd( "qt" );                            // id == 3
+ftp->get( "INSTALL" );                      // id == 4
+ftp->close();                               // id == 5
+//! [2]
+
+
+//! [3]
+start( 1 )
+stateChanged( HostLookup )
+stateChanged( Connecting )
+stateChanged( Connected )
+finished( 1, false )
+
+start( 2 )
+stateChanged( LoggedIn )
+finished( 2, false )
+
+start( 3 )
+finished( 3, false )
+
+start( 4 )
+dataTransferProgress( 0, 3798 )
+dataTransferProgress( 2896, 3798 )
+readyRead()
+dataTransferProgress( 3798, 3798 )
+readyRead()
+finished( 4, false )
+
+start( 5 )
+stateChanged( Closing )
+stateChanged( Unconnected )
+finished( 5, false )
+
+done( false )
+//! [3]
+
+
+//! [4]
+start( 1 )
+stateChanged( HostLookup )
+stateChanged( Connecting )
+stateChanged( Connected )
+finished( 1, false )
+
+start( 2 )
+finished( 2, true )
+
+done( true )
+//! [4]
diff --git a/doc/src/snippets/code/src_qt3support_network_q3http.cpp b/doc/src/snippets/code/src_qt3support_network_q3http.cpp
new file mode 100644
index 0000000000..6729c5fa52
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_network_q3http.cpp
@@ -0,0 +1,74 @@
+//! [0]
+content-type: text/html
+//! [0]
+
+
+//! [1]
+header.setValue( "content-type", "text/html" );
+QString contentType = header.value( "content-type" );
+//! [1]
+
+
+//! [2]
+QUrlOperator op( "http://qtsoftware.com" );
+op.get( "index.html" );
+//! [2]
+
+
+//! [3]
+Q3HttpRequestHeader header( "GET", "/index.html" );
+header.setValue( "Host", "qtsoftware.com" );
+http->setHost( "qtsoftware.com" );
+http->request( header );
+//! [3]
+
+
+//! [4]
+http->setHost( "qtsoftware.com" ); // id == 1
+http->get( "/index.html" );           // id == 2
+//! [4]
+
+
+//! [5]
+requestStarted( 1 )
+requestFinished( 1, false )
+
+requestStarted( 2 )
+stateChanged( Connecting )
+stateChanged( Sending )
+dataSendProgress( 77, 77 )
+stateChanged( Reading )
+responseHeaderReceived( responseheader )
+dataReadProgress( 5388, 0 )
+readyRead( responseheader )
+dataReadProgress( 18300, 0 )
+readyRead( responseheader )
+stateChanged( Connected )
+requestFinished( 2, false )
+
+done( false )
+
+stateChanged( Closing )
+stateChanged( Unconnected )
+//! [5]
+
+
+//! [6]
+http->setHost( "www.foo.bar" );       // id == 1
+http->get( "/index.html" );           // id == 2
+http->post( "register.html", data );  // id == 3
+//! [6]
+
+
+//! [7]
+requestStarted( 1 )
+requestFinished( 1, false )
+
+requestStarted( 2 )
+stateChanged( HostLookup )
+requestFinished( 2, true )
+
+done( true )
+
+stateChanged( Unconnected )
+//! [7]
diff --git a/doc/src/snippets/code/src_qt3support_network_q3localfs.cpp b/doc/src/snippets/code/src_qt3support_network_q3localfs.cpp
new file mode 100644
index 0000000000..243be9eb87
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_network_q3localfs.cpp
@@ -0,0 +1,4 @@
+//! [0]
+Q3UrlOperator op( "file:///tmp" );
+op.listChildren(); // Asks the server to provide a directory listing
+//! [0]
diff --git a/doc/src/snippets/code/src_qt3support_network_q3networkprotocol.cpp b/doc/src/snippets/code/src_qt3support_network_q3networkprotocol.cpp
new file mode 100644
index 0000000000..51d1059a2a
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_network_q3networkprotocol.cpp
@@ -0,0 +1,8 @@
+//! [0]
+Q3NetworkProtocol::registerNetworkProtocol( "nntp", new Q3NetworkProtocolFactory<Nntp> );
+//! [0]
+
+
+//! [1]
+Q3Ftp *ftp = Q3NetworkProtocol::getNetworkProtocol( "ftp" );
+//! [1]
diff --git a/doc/src/snippets/code/src_qt3support_network_q3socket.cpp b/doc/src/snippets/code/src_qt3support_network_q3socket.cpp
new file mode 100644
index 0000000000..34474fb6e1
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_network_q3socket.cpp
@@ -0,0 +1,4 @@
+//! [0]
+while( !socket->canReadLine() ) // WRONG
+    ;
+//! [0]
diff --git a/doc/src/snippets/code/src_qt3support_network_q3socketdevice.cpp b/doc/src/snippets/code/src_qt3support_network_q3socketdevice.cpp
new file mode 100644
index 0000000000..cd50fd215e
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_network_q3socketdevice.cpp
@@ -0,0 +1,4 @@
+//! [0]
+::close( sd->socket() );
+sd->writeBlock( someData, 42 );
+//! [0]
diff --git a/doc/src/snippets/code/src_qt3support_network_q3url.cpp b/doc/src/snippets/code/src_qt3support_network_q3url.cpp
new file mode 100644
index 0000000000..3b78a571fa
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_network_q3url.cpp
@@ -0,0 +1,43 @@
+//! [0]
+Q3Url url( "http://qtsoftware.com" );
+// or
+Q3Url url( "file:///home/myself/Mail", "Inbox" );
+//! [0]
+
+
+//! [1]
+Q3Url url( "http://qtsoftware.com" );
+QString s = url;
+// or
+QString s( "http://qtsoftware.com" );
+Q3Url url( s );
+//! [1]
+
+
+//! [2]
+Q3Url url( "ftp://ftp.trolltech.com/qt/source", "qt-2.1.0.tar.gz" );
+//! [2]
+
+
+//! [3]
+Q3Url url( "ftp://ftp.trolltech.com/qt/source", "/usr/local" );
+//! [3]
+
+
+//! [4]
+Q3Url url( "ftp://ftp.trolltech.com/qt/source", "file:///usr/local" );
+//! [4]
+
+
+//! [5]
+QString url = http://qtsoftware.com
+Q3Url::encode( url );
+// url is now "http%3A//www%20trolltech%20com"
+//! [5]
+
+
+//! [6]
+QString url = "http%3A//www%20trolltech%20com"
+Q3Url::decode( url );
+// url is now "http://qtsoftware.com"
+//! [6]
diff --git a/doc/src/snippets/code/src_qt3support_network_q3urloperator.cpp b/doc/src/snippets/code/src_qt3support_network_q3urloperator.cpp
new file mode 100644
index 0000000000..03b8f7baec
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_network_q3urloperator.cpp
@@ -0,0 +1,37 @@
+//! [0]
+Q3UrlOperator *op = new Q3UrlOperator();
+op->copy( QString("ftp://ftp.trolltech.com/qt/source/qt-2.1.0.tar.gz"),
+	 "file:///tmp" );
+//! [0]
+
+
+//! [1]
+Q3UrlOperator op( "http://www.whatever.org/cgi-bin/search.pl?cmd=Hello" );
+op.get();
+//! [1]
+
+
+//! [2]
+Q3UrlOperator op( "ftp://ftp.whatever.org/pub" );
+// do some other stuff like op.listChildren() or op.mkdir( "new_dir" )
+op.get( "a_file.txt" );
+//! [2]
+
+
+//! [3]
+Q3UrlOperator op( "http://www.whatever.org/cgi-bin" );
+op.get( "search.pl?cmd=Hello" ); // WRONG!
+//! [3]
+
+
+//! [4]
+Q3UrlOperator op( "ftp://ftp.whatever.com/home/me/filename.dat" );
+op.put( data );
+//! [4]
+
+
+//! [5]
+Q3UrlOperator op( "ftp://ftp.whatever.com/home/me" );
+// do some other stuff like op.listChildren() or op.mkdir( "new_dir" )
+op.put( data, "filename.dat" );
+//! [5]
diff --git a/doc/src/snippets/code/src_qt3support_other_q3accel.cpp b/doc/src/snippets/code/src_qt3support_other_q3accel.cpp
new file mode 100644
index 0000000000..ba315c0d98
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_other_q3accel.cpp
@@ -0,0 +1,40 @@
+//! [0]
+QPushButton p("&Exit", parent); // automatic shortcut Alt+E
+Q3PopupMenu *fileMenu = new fileMenu(parent);
+fileMenu->insertItem("Undo", parent, SLOT(undo()),
+                     Qt::CTRL + Qt::Key_Z);
+//! [0]
+
+
+//! [1]
+accelerator->insertItem(QKeySequence("M"));
+//! [1]
+
+
+//! [2]
+Q3Accel *a = new Q3Accel(myWindow);
+a->connectItem(a->insertItem(Qt::CTRL + Qt::Key_P),
+               myWindow, SLOT(printDoc()));
+//! [2]
+
+
+//! [3]
+Q3Accel *a = new Q3Accel(myWindow);	   // create accels for myWindow
+a->insertItem(CTRL + Key_P, 200);	   // Ctrl+P, e.g. to print document
+a->insertItem(ALT + Key_X, 201);	   // Alt+X, e.g. to quit
+a->insertItem(UNICODE_ACCEL + 'q', 202);   // Unicode 'q', e.g. to quit
+a->insertItem(Key_D);			   // gets a unique negative id < -1
+a->insertItem(CTRL + SHIFT + Key_P);	   // gets a unique negative id < -1
+//! [3]
+
+
+//! [4]
+a->connectItem(201, mainView, SLOT(quit()));
+//! [4]
+
+
+//! [5]
+Q3PopupMenu *file = new Q3PopupMenu(this);
+file->insertItem(p1, tr("&Open..."), this, SLOT(open()),
+                  Q3Accel::stringToKey(tr("Ctrl+O", "File|Open")));
+//! [5]
diff --git a/doc/src/snippets/code/src_qt3support_other_q3mimefactory.cpp b/doc/src/snippets/code/src_qt3support_other_q3mimefactory.cpp
new file mode 100644
index 0000000000..f00ad7363d
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_other_q3mimefactory.cpp
@@ -0,0 +1,32 @@
+//! [0]
+static const char* myimage_data[]={
+"...",
+...
+"..."};
+//! [0]
+
+
+//! [1]
+Q3MimeSourceFactory::defaultFactory()->setImage("myimage", QImage(myimage_data));
+//! [1]
+
+
+//! [2]
+QLabel* label = new QLabel(
+    "Rich text with embedded image:<img source=\"myimage\">"
+    "Isn't that <em>cute</em>?");
+//! [2]
+
+
+//! [3]
+delete label;
+Q3MimeSourceFactory::defaultFactory()->setData("myimage", 0);
+//! [3]
+
+
+//! [4]
+setExtensionType("html", "text/html;charset=iso8859-1");
+setExtensionType("htm", "text/html;charset=iso8859-1");
+setExtensionType("txt", "text/plain");
+setExtensionType("xml", "text/xml;charset=UTF-8");
+//! [4]
diff --git a/doc/src/snippets/code/src_qt3support_other_q3process.cpp b/doc/src/snippets/code/src_qt3support_other_q3process.cpp
new file mode 100644
index 0000000000..2ce94bb20e
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_other_q3process.cpp
@@ -0,0 +1,8 @@
+//! [0]
+QStringList list = myProcess.arguments();
+QStringList::Iterator it = list.begin();
+while( it != list.end() ) {
+    myProcessing( *it );
+    ++it;
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_qt3support_other_q3process_unix.cpp b/doc/src/snippets/code/src_qt3support_other_q3process_unix.cpp
new file mode 100644
index 0000000000..c443c2e75f
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_other_q3process_unix.cpp
@@ -0,0 +1,4 @@
+//! [0]
+process->tryTerminate();
+QTimer::singleShot( 5000, process, SLOT(kill()) );
+//! [0]
diff --git a/doc/src/snippets/code/src_qt3support_painting_q3paintdevicemetrics.cpp b/doc/src/snippets/code/src_qt3support_painting_q3paintdevicemetrics.cpp
new file mode 100644
index 0000000000..1e807d5ccd
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_painting_q3paintdevicemetrics.cpp
@@ -0,0 +1,4 @@
+//! [0]
+Q3PaintDeviceMetrics pdm(myWidget);
+double aspect = (double)pdm.widthMM() / (double)pdm.heightMM();
+//! [0]
diff --git a/doc/src/snippets/code/src_qt3support_painting_q3painter.cpp b/doc/src/snippets/code/src_qt3support_painting_q3painter.cpp
new file mode 100644
index 0000000000..e932250014
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_painting_q3painter.cpp
@@ -0,0 +1,4 @@
+//! [0]
+QPainter p(myWidget);
+p.drawArc(QRect(10,10, 70,100), 100*16, 160*16); // draws a "(" arc
+//! [0]
diff --git a/doc/src/snippets/code/src_qt3support_painting_q3picture.cpp b/doc/src/snippets/code/src_qt3support_painting_q3picture.cpp
new file mode 100644
index 0000000000..709b3860a3
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_painting_q3picture.cpp
@@ -0,0 +1,14 @@
+//! [0]
+Q3Picture picture;
+picture.load("drawing.svg", SVG);
+//! [0]
+
+
+//! [1]
+Q3Picture picture;
+QPainter painter;
+painter.begin(&picture);           // paint in picture
+...
+painter.end();                     // painting done
+picture.save("drawing.svg", SVG);  // save picture
+//! [1]
diff --git a/doc/src/snippets/code/src_qt3support_sql_q3databrowser.cpp b/doc/src/snippets/code/src_qt3support_sql_q3databrowser.cpp
new file mode 100644
index 0000000000..cb86b323f9
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_sql_q3databrowser.cpp
@@ -0,0 +1,8 @@
+//! [0]
+QStringList list = myDataBrowser.sort();
+QStringList::Iterator it = list.begin();
+while(it != list.end()) {
+    myProcessing(*it);
+    ++it;
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_qt3support_sql_q3datatable.cpp b/doc/src/snippets/code/src_qt3support_sql_q3datatable.cpp
new file mode 100644
index 0000000000..aa72f4421d
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_sql_q3datatable.cpp
@@ -0,0 +1,8 @@
+//! [0]
+QStringList list = myDataTable.sort();
+QStringList::Iterator it = list.begin();
+while( it != list.end() ) {
+    myProcessing( *it );
+    ++it;
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_qt3support_sql_q3dataview.cpp b/doc/src/snippets/code/src_qt3support_sql_q3dataview.cpp
new file mode 100644
index 0000000000..b0b9a5922d
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_sql_q3dataview.cpp
@@ -0,0 +1,4 @@
+//! [0]
+myView.setRecord(record);
+myView.readFields();
+//! [0]
diff --git a/doc/src/snippets/code/src_qt3support_sql_q3sqlcursor.cpp b/doc/src/snippets/code/src_qt3support_sql_q3sqlcursor.cpp
new file mode 100644
index 0000000000..b3b643d966
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_sql_q3sqlcursor.cpp
@@ -0,0 +1,100 @@
+//! [0]
+Q3SqlCursor cur( "staff" ); // Specify the table/view name
+cur.select(); // We'll retrieve every record
+while ( cur.next() ) {
+    qDebug( cur.value( "id" ).toString() + ": " +
+    cur.value( "surname" ).toString() + ' ' +
+    cur.value( "salary" ).toString() );
+}
+//! [0]
+
+
+//! [1]
+Q3SqlCursor cur( "prices" );
+cur.select( "id=202" );
+if ( cur.next() ) {
+    QSqlRecord *buffer = cur.primeUpdate();
+    double price = buffer->value( "price" ).toDouble();
+    double newprice = price * 1.05;
+    buffer->setValue( "price", newprice );
+    cur.update();
+}
+//! [1]
+
+
+//! [2]
+Q3SqlCursor cur("Employee"); // Use the Employee table or view
+cur.select("deptno=10"); // select all records in department 10
+while(cur.next()) {
+    ... // process data
+}
+...
+// select records in other departments, ordered by department number
+cur.select("deptno>10", cur.index("deptno"));
+...
+//! [2]
+
+
+//! [3]
+Q3SqlCursor cur("Employee");
+cur.select("deptno=10"); // select all records in department 10
+while(cur.next()) {
+    ... // process data
+}
+...
+cur.select(); // re-selects all records in department 10
+...
+//! [3]
+
+
+//! [4]
+Q3SqlCursor cur("Employee");
+QSqlIndex pk = cur.primaryIndex();
+cur.setValue("id", 10);
+cur.select(pk, pk); // generates "SELECT ... FROM Employee WHERE id=10 ORDER BY id"
+...
+//! [4]
+
+
+//! [5]
+Q3SqlCursor cur("Employee");
+cur.setMode(Q3SqlCursor::Writable); // allow insert/update/delete
+...
+cur.setMode(Q3SqlCursor::Insert | Q3SqlCursor::Update); // allow inserts and updates only
+...
+cur.setMode(Q3SqlCursor::ReadOnly); // no inserts/updates/deletes allowed
+
+//! [5]
+
+
+//! [6]
+Q3SqlCursor cur("prices");
+QSqlRecord *buffer = cur.primeInsert();
+buffer->setValue("id",    53981);
+buffer->setValue("name",  "Thingy");
+buffer->setValue("price", 105.75);
+cur.insert();
+//! [6]
+
+
+//! [7]
+Q3SqlCursor cur("prices");
+cur.select("id=202");
+if (cur.next()) {
+    QSqlRecord *buffer = cur.primeUpdate();
+    double price = buffer->value("price").toDouble();
+    double newprice = price * 1.05;
+    buffer->setValue("price", newprice);
+    cur.update();
+}
+//! [7]
+
+
+//! [8]
+Q3SqlCursor cur("prices");
+cur.select("id=999");
+if (cur.next()) {
+    cur.primeDelete();
+    cur.del();
+}
+//! [8]
diff --git a/doc/src/snippets/code/src_qt3support_sql_q3sqlform.cpp b/doc/src/snippets/code/src_qt3support_sql_q3sqlform.cpp
new file mode 100644
index 0000000000..e91b7ed1bd
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_sql_q3sqlform.cpp
@@ -0,0 +1,26 @@
+//! [0]
+QLineEdit  myEditor(this);
+Q3SqlForm   myForm(this);
+Q3SqlCursor myCursor("mytable");
+
+// Execute a query to make the cursor valid
+myCursor.select();
+// Move the cursor to a valid record (the first record)
+myCursor.next();
+// Set the form's record pointer to the cursor's edit buffer (which
+// contains the current record's values)
+myForm.setRecord(myCursor.primeUpdate());
+
+// Insert a field into the form that uses myEditor to edit the
+// field 'somefield' in 'mytable'
+myForm.insert(&myEditor, "somefield");
+
+// Update myEditor with the value from the mapped database field
+myForm.readFields();
+...
+// Let the user edit the form
+...
+// Update the database
+myForm.writeFields();  // Update the cursor's edit buffer from the form
+myCursor.update();        // Update the database from the cursor's buffer
+//! [0]
diff --git a/doc/src/snippets/code/src_qt3support_sql_q3sqlmanager_p.cpp b/doc/src/snippets/code/src_qt3support_sql_q3sqlmanager_p.cpp
new file mode 100644
index 0000000000..9d5b2c1528
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_sql_q3sqlmanager_p.cpp
@@ -0,0 +1,11 @@
+//! [0]
+Q3SqlCursor* myCursor = myManager.cursor();
+...
+QSqlRecord* buf = myCursor->primeUpdate();
+buf->setValue("name", "Ola");
+buf->setValue("city", "Oslo");
+...
+myCursor->update();  // update current record
+myCursor->select();  // refresh the cursor
+myManager.findBuffer(myCursor->primaryIndex()); // go to the updated record
+//! [0]
diff --git a/doc/src/snippets/code/src_qt3support_sql_q3sqlpropertymap.cpp b/doc/src/snippets/code/src_qt3support_sql_q3sqlpropertymap.cpp
new file mode 100644
index 0000000000..55146de182
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_sql_q3sqlpropertymap.cpp
@@ -0,0 +1,35 @@
+//! [0]
+Q3SqlPropertyMap *myMap  = new Q3SqlPropertyMap();
+Q3SqlForm        *myForm = new Q3SqlForm(this);
+MyEditor myEditor(this);
+
+// Set the Q3SqlForm's record buffer to the update buffer of
+// a pre-existing Q3SqlCursor called 'cur'.
+myForm->setRecord(cur->primeUpdate());
+
+// Install the customized map
+myMap->insert("MyEditor", "content");
+myForm->installPropertyMap(myMap); // myForm now owns myMap
+...
+// Insert a field into the form that uses a myEditor to edit the
+// field 'somefield'
+myForm->insert(&myEditor, "somefield");
+
+// Update myEditor with the value from the mapped database field
+myForm->readFields();
+...
+// Let the user edit the form
+...
+// Update the database fields with the values in the form
+myForm->writeFields();
+...
+//! [0]
+
+
+//! [1]
+Q3SqlPropertyMap *myMap = new Q3SqlPropertyMap;
+
+myMap->insert("MyEditor", "content");
+Q3SqlPropertyMap::installDefaultMap(myMap);
+...
+//! [1]
diff --git a/doc/src/snippets/code/src_qt3support_sql_q3sqlselectcursor.cpp b/doc/src/snippets/code/src_qt3support_sql_q3sqlselectcursor.cpp
new file mode 100644
index 0000000000..bfb7b04ea2
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_sql_q3sqlselectcursor.cpp
@@ -0,0 +1,11 @@
+//! [0]
+...
+Q3SqlSelectCursor* cur = new Q3SqlSelectCursor("SELECT id, firstname, lastname FROM author");
+Q3DataTable* table = new Q3DataTable(this);
+table->setSqlCursor(cur, true, true);
+table->refresh();
+...
+cur->exec("SELECT * FROM books");
+table->refresh();
+...
+//! [0]
diff --git a/doc/src/snippets/code/src_qt3support_text_q3simplerichtext.cpp b/doc/src/snippets/code/src_qt3support_text_q3simplerichtext.cpp
new file mode 100644
index 0000000000..073d71610c
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_text_q3simplerichtext.cpp
@@ -0,0 +1,3 @@
+//! [0]
+Q3SimpleRichText myrichtext(contents, mywidget->font());
+//! [0]
diff --git a/doc/src/snippets/code/src_qt3support_text_q3textbrowser.cpp b/doc/src/snippets/code/src_qt3support_text_q3textbrowser.cpp
new file mode 100644
index 0000000000..b042efb9d1
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_text_q3textbrowser.cpp
@@ -0,0 +1,3 @@
+//! [0]
+mimeSourceFactory()->setExtensionType("qml", "text/utf8");
+//! [0]
diff --git a/doc/src/snippets/code/src_qt3support_text_q3textedit.cpp b/doc/src/snippets/code/src_qt3support_text_q3textedit.cpp
new file mode 100644
index 0000000000..e8d5784a25
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_text_q3textedit.cpp
@@ -0,0 +1,31 @@
+//! [0]
+QFile file(fileName); // Read the text from a file
+if (file.open(IO_ReadOnly)) {
+    QTextStream stream(&file);
+    textEdit->setText(stream.read());
+}
+
+QFile file(fileName); // Write the text to a file
+if (file.open(IO_WriteOnly)) {
+    QTextStream stream(&file);
+    stream << textEdit->text();
+    textEdit->setModified(false);
+}
+//! [0]
+
+
+//! [1]
+This is <font color=red>red</font> while <b>this</b> is <font color=blue>blue</font>.
+<font color=green><font color=yellow>Yellow,</font> and <u>green</u>.
+//! [1]
+
+
+//! [2]
+Q3TextEdit * log = new Q3TextEdit(this);
+log->setTextFormat(Qt::LogText);
+Q3StyleSheetItem * item = new Q3StyleSheetItem(log->styleSheet(), "mytag");
+item->setColor("red");
+item->setFontWeight(QFont::Bold);
+item->setFontUnderline(true);
+log->append("This is a <mytag>custom tag</mytag>!");
+//! [2]
diff --git a/doc/src/snippets/code/src_qt3support_text_q3textstream.cpp b/doc/src/snippets/code/src_qt3support_text_q3textstream.cpp
new file mode 100644
index 0000000000..664a6909b4
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_text_q3textstream.cpp
@@ -0,0 +1,29 @@
+//! [0]
+QString str;
+Q3TextStream ts( &str, IO_WriteOnly );
+ts << "pi = " << 3.14; // str == "pi = 3.14"
+//! [0]
+
+
+//! [1]
+QString str = "pi = 3.14";
+Q3TextStream ts( &str, IO_WriteOnly );
+ts <<  "2+2 = " << 2+2; // str == "2+2 = 414"
+//! [1]
+
+
+//! [2]
+QByteArray array;
+Q3TextStream ts( array, IO_WriteOnly );
+ts << "pi = " << 3.14 << '\0'; // array == "pi = 3.14"
+//! [2]
+
+
+//! [3]
+QByteArray array;
+QBuffer buf( array );
+buf.open( IO_WriteOnly );
+Q3TextStream ts( &buf );
+ts << "pi = " << 3.14 << '\0'; // array == "pi = 3.14"
+buf.close();
+//! [3]
diff --git a/doc/src/snippets/code/src_qt3support_tools_q3cstring.cpp b/doc/src/snippets/code/src_qt3support_tools_q3cstring.cpp
new file mode 100644
index 0000000000..9985e9d561
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_tools_q3cstring.cpp
@@ -0,0 +1,40 @@
+//! [0]
+Q3CString str("helloworld", 6); // assigns "hello" to str
+//! [0]
+
+
+//! [1]
+Q3CString a;                // a.data() == 0,  a.size() == 0, a.length() == 0
+Q3CString b == "";        // b.data() == "", b.size() == 1, b.length() == 0
+a.isNull();                // true  because a.data() == 0
+a.isEmpty();        // true  because a.length() == 0
+b.isNull();                // false because b.data() == ""
+b.isEmpty();        // true  because b.length() == 0
+//! [1]
+
+
+//! [2]
+Q3CString s = "truncate this string";
+s.truncate(5);                      // s == "trunc"
+//! [2]
+
+
+//! [3]
+Q3CString s;
+s.sprintf("%d - %s", 1, "first");                // result < 256 chars
+
+Q3CString big(25000);                        // very long string
+big.sprintf("%d - %s", 2, longString);        // result < 25000 chars
+//! [3]
+
+
+//! [4]
+Q3CString s("apple");
+Q3CString t = s.leftJustify(8, '.');  // t == "apple..."
+//! [4]
+
+
+//! [5]
+Q3CString s("pie");
+Q3CString t = s.rightJustify(8, '.');  // t == ".....pie"
+//! [5]
diff --git a/doc/src/snippets/code/src_qt3support_tools_q3deepcopy.cpp b/doc/src/snippets/code/src_qt3support_tools_q3deepcopy.cpp
new file mode 100644
index 0000000000..36f7491ee0
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_tools_q3deepcopy.cpp
@@ -0,0 +1,58 @@
+//! [0]
+// all 5 strings share the same data
+QString s1 = "abcd";
+QString s2 = s1;
+QString s3 = s2;
+QString s4 = s3;
+QString s5 = s2;
+//! [0]
+
+
+//! [1]
+// s1, s2 and s5 share the same data, neither s3 nor s4 are shared
+QString s1 = "abcd";
+QString s2 = s1;
+Q3DeepCopy<QString> s3 = s2;  // s3 is a deep copy of s2
+QString s4 = s3;             // s4 is a deep copy of s3
+QString s5 = s2;
+//! [1]
+
+
+//! [2]
+// s1, s2 and s5 share the same data, s3 and s4 share the same data
+QString s1 = "abcd";
+QString s2 = s1;
+QString s3 = Q3DeepCopy<QString>( s2 );  // s3 is a deep copy of s2
+QString s4 = s3;                        // s4 is a shallow copy of s3
+QString s5 = s2;
+//! [2]
+
+
+//! [3]
+Q3DeepCopy<QString> global_string;  // global string data
+QMutex global_mutex;               // mutex to protext global_string
+
+...
+
+void setGlobalString( const QString &str )
+{
+    global_mutex.lock();
+    global_string = str;           // global_string is a deep copy of str
+    global_mutex.unlock();
+}
+
+...
+
+void MyThread::run()
+{
+    global_mutex.lock();
+    QString str = global_string;          // str is a deep copy of global_string
+    global_mutex.unlock();
+
+    // process the string data
+    ...
+
+    // update global_string
+    setGlobalString( str );
+}
+//! [3]
diff --git a/doc/src/snippets/code/src_qt3support_tools_q3garray.cpp b/doc/src/snippets/code/src_qt3support_tools_q3garray.cpp
new file mode 100644
index 0000000000..7108262059
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_tools_q3garray.cpp
@@ -0,0 +1,20 @@
+//! [0]
+static uchar bindata[] = { 231, 1, 44, ... };
+QByteArray	a;
+a.setRawData(bindata, sizeof(bindata));	// a points to bindata
+QDataStream s(a, IO_ReadOnly);		// open on a's data
+s >> <something>;				// read raw bindata
+s.close();
+a.resetRawData(bindata, sizeof(bindata)); // finished
+//! [0]
+
+
+//! [1]
+static uchar bindata[] = { 231, 1, 44, ... };
+QByteArray	a, b;
+a.setRawData(bindata, sizeof(bindata));	// a points to bindata
+a.resize(8);				// will crash
+b = a;					// will crash
+a[2] = 123;					// might crash
+  // forget to resetRawData - will crash
+//! [1]
diff --git a/doc/src/snippets/code/src_qt3support_tools_q3signal.cpp b/doc/src/snippets/code/src_qt3support_tools_q3signal.cpp
new file mode 100644
index 0000000000..7793ba2bcc
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_tools_q3signal.cpp
@@ -0,0 +1,38 @@
+//! [0]
+#include <q3signal.h>
+
+class MyClass
+{
+public:
+    MyClass();
+    ~MyClass();
+
+    void doSomething();
+
+    void connect(QObject *receiver, const char *member);
+
+private:
+    Q3Signal *sig;
+};
+
+MyClass::MyClass()
+{
+    sig = new Q3Signal;
+}
+
+MyClass::~MyClass()
+{
+    delete sig;
+}
+
+void MyClass::doSomething()
+{
+    // ... does something
+    sig->activate(); // emits the signal
+}
+
+void MyClass::connect(QObject *receiver, const char *member)
+{
+    sig->connect(receiver, member);
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_qt3support_widgets_q3combobox.cpp b/doc/src/snippets/code/src_qt3support_widgets_q3combobox.cpp
new file mode 100644
index 0000000000..90d7b149d0
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_widgets_q3combobox.cpp
@@ -0,0 +1,15 @@
+//! [0]
+Q3ComboBox *c = new Q3ComboBox(this, tr("read-only combobox"));
+//! [0]
+
+
+//! [1]
+Q3ComboBox *c1 = new Q3ComboBox(false, this, tr("read-only combobox"));
+Q3ComboBox *c2 = new Q3ComboBox(true, this, tr("editable combobox"));
+//! [1]
+
+
+//! [2]
+static const char* items[] = { "red", "green", "blue", 0 };
+combo->insertStrList( items );
+//! [2]
diff --git a/doc/src/snippets/code/src_qt3support_widgets_q3datetimeedit.cpp b/doc/src/snippets/code/src_qt3support_widgets_q3datetimeedit.cpp
new file mode 100644
index 0000000000..74070ec4b1
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_widgets_q3datetimeedit.cpp
@@ -0,0 +1,28 @@
+
+void wrapInFunction()
+{
+
+//! [0]
+Q3DateEdit *dateEdit = new Q3DateEdit(QDate::currentDate(), this);
+dateEdit->setRange(QDate::currentDate().addDays(-365),
+                    QDate::currentDate().addDays( 365));
+dateEdit->setOrder(Q3DateEdit::MDY);
+dateEdit->setAutoAdvance(true);
+//! [0]
+
+
+//! [1]
+QTime timeNow = QTime::currentTime();
+Q3TimeEdit *timeEdit = new Q3TimeEdit(timeNow, this);
+timeEdit->setRange(timeNow, timeNow.addSecs(60 * 60));
+//! [1]
+
+
+//! [2]
+Q3DateTimeEdit *dateTimeEdit = new Q3DateTimeEdit(QDateTime::currentDateTime(), this);
+dateTimeEdit->dateEdit()->setRange(QDateTime::currentDate(),
+                                    QDateTime::currentDate().addDays(7));
+//! [2]
+
+}
+
diff --git a/doc/src/snippets/code/src_qt3support_widgets_q3dockarea.cpp b/doc/src/snippets/code/src_qt3support_widgets_q3dockarea.cpp
new file mode 100644
index 0000000000..bde7d84ecd
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_widgets_q3dockarea.cpp
@@ -0,0 +1,8 @@
+//! [0]
+ts << *myDockArea;
+//! [0]
+
+
+//! [1]
+ts >> *myDockArea;
+//! [1]
diff --git a/doc/src/snippets/code/src_qt3support_widgets_q3dockwindow.cpp b/doc/src/snippets/code/src_qt3support_widgets_q3dockwindow.cpp
new file mode 100644
index 0000000000..1476dcb48e
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_widgets_q3dockwindow.cpp
@@ -0,0 +1,4 @@
+//! [0]
+Q3ToolBar *fileTools = new Q3ToolBar(this, "File Actions");
+moveDockWindow(fileTools, Left);
+//! [0]
diff --git a/doc/src/snippets/code/src_qt3support_widgets_q3gridview.cpp b/doc/src/snippets/code/src_qt3support_widgets_q3gridview.cpp
new file mode 100644
index 0000000000..43dca3e66e
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_widgets_q3gridview.cpp
@@ -0,0 +1,6 @@
+//! [0]
+p->setClipRect(cellRect(), QPainter::CoordPainter);
+//... your drawing code
+p->setClipping(false);
+
+//! [0]
diff --git a/doc/src/snippets/code/src_qt3support_widgets_q3header.cpp b/doc/src/snippets/code/src_qt3support_widgets_q3header.cpp
new file mode 100644
index 0000000000..684d182125
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_widgets_q3header.cpp
@@ -0,0 +1,6 @@
+//! [0]
+// Allow resizing of all current and future sections
+header->setResizeEnabled(true);
+// Disable resizing of section 3, (the fourth section added)
+header->setResizeEnabled(false, 3);
+//! [0]
diff --git a/doc/src/snippets/code/src_qt3support_widgets_q3mainwindow.cpp b/doc/src/snippets/code/src_qt3support_widgets_q3mainwindow.cpp
new file mode 100644
index 0000000000..c63b481d9c
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_widgets_q3mainwindow.cpp
@@ -0,0 +1,45 @@
+//! [0]
+Q3MainWindow *mw = new Q3MainWindow;
+QTextEdit *edit = new QTextEdit(mw, "editor");
+edit->setFocus();
+mw->setWindowTitle("Main Window");
+mw->setCentralWidget(edit);
+mw->show();
+//! [0]
+
+
+//! [1]
+Q3ToolBar *tb = new Q3ToolBar(this);
+addDockWindow(tb, tr("Menubar"), Top, false);
+QMenuBar *mb = new QMenuBar(tb);
+mb->setFrameStyle(QFrame::NoFrame);
+tb->setStretchableWidget(mb);
+setDockEnabled(tb, Left, false);
+setDockEnabled(tb, Right, false);
+//! [1]
+
+
+//! [2]
+QFile file(filename);
+if (file.open(IO_WriteOnly)) {
+    QTextStream stream(&file);
+    stream << *mainWindow;
+    file.close();
+}
+//! [2]
+
+
+//! [3]
+QFile file(filename);
+if (file.open(IO_ReadOnly)) {
+    QTextStream stream(&file);
+    stream >> *mainWindow;
+    file.close();
+}
+//! [3]
+
+
+//! [4]
+Q3PopupMenu * help = new Q3PopupMenu(this);
+help->insertItem("What's &This", this , SLOT(enterWhatsThis()), Qt::SHIFT+Qt::Key_F1);
+//! [4]
diff --git a/doc/src/snippets/code/src_qt3support_widgets_q3scrollview.cpp b/doc/src/snippets/code/src_qt3support_widgets_q3scrollview.cpp
new file mode 100644
index 0000000000..58d5acfee9
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_widgets_q3scrollview.cpp
@@ -0,0 +1,61 @@
+//! [0]
+Q3ScrollView* sv = new Q3ScrollView(...);
+QWidget *widget = new QWidget(sv->viewport());
+QVBoxLayout *layout = new QVBoxLayout(widget);
+addChild(widget);
+//! [0]
+
+
+//! [1]
+QLabel* child1 = new QLabel("CHILD", widget);
+QLabel* child2 = new QLabel("CHILD", widget);
+QLabel* child3 = new QLabel("CHILD", widget);
+layout->addWidget(child1);
+layout->addWidget(child2);
+layout->addWidget(child3);
+...
+//! [1]
+
+
+//! [2]
+Q3ScrollView* sv = new Q3ScrollView(...);
+QLabel* child1 = new QLabel("CHILD", sv->viewport());
+sv->addChild(child1);
+QLabel* child2 = new QLabel("CHILD", sv->viewport());
+sv->addChild(child2);
+QLabel* child3 = new QLabel("CHILD", sv->viewport());
+sv->addChild(child3);
+//! [2]
+
+
+//! [3]
+Q3ScrollView* sv = new Q3ScrollView(...);
+sv->enableClipper(true);
+QLabel* child1 = new QLabel("CHILD", sv->viewport());
+sv->addChild(child1);
+QLabel* child2 = new QLabel("CHILD", sv->viewport());
+sv->addChild(child2);
+QLabel* child3 = new QLabel("CHILD", sv->viewport());
+sv->addChild(child3);
+//! [3]
+
+
+//! [4]
+{
+    // Fill a 40000 by 50000 rectangle at (100000,150000)
+
+    // Calculate the coordinates...
+    int x1 = 100000, y1 = 150000;
+    int x2 = x1+40000-1, y2 = y1+50000-1;
+
+    // Clip the coordinates so X/Windows will not have problems...
+    if (x1 < clipx) x1=clipx;
+    if (y1 < clipy) y1=clipy;
+    if (x2 > clipx+clipw-1) x2=clipx+clipw-1;
+    if (y2 > clipy+cliph-1) y2=clipy+cliph-1;
+
+    // Paint using the small coordinates...
+    if (x2 >= x1 && y2 >= y1)
+        p->fillRect(x1, y1, x2-x1+1, y2-y1+1, red);
+}
+//! [4]
diff --git a/doc/src/snippets/code/src_qt3support_widgets_q3whatsthis.cpp b/doc/src/snippets/code/src_qt3support_widgets_q3whatsthis.cpp
new file mode 100644
index 0000000000..f7b48ba6f3
--- /dev/null
+++ b/doc/src/snippets/code/src_qt3support_widgets_q3whatsthis.cpp
@@ -0,0 +1,3 @@
+//! [0]
+(void)Q3WhatsThis::whatsThisButton( my_help_tool_bar );
+//! [0]
diff --git a/doc/src/snippets/code/src_qtestlib_qtestcase.cpp b/doc/src/snippets/code/src_qtestlib_qtestcase.cpp
new file mode 100644
index 0000000000..c143e334d0
--- /dev/null
+++ b/doc/src/snippets/code/src_qtestlib_qtestcase.cpp
@@ -0,0 +1,188 @@
+
+void wrapInFunction()
+{
+
+//! [0]
+QVERIFY(1 + 1 == 2);
+//! [0]
+
+
+//! [1]
+QVERIFY2(1 + 1 == 2, "A breach in basic arithmetic occured.");
+//! [1]
+
+
+//! [2]
+QCOMPARE(QString("hello").toUpper(), QString("HELLO"));
+//! [2]
+
+
+//! [3]
+void TestQString::toInt_data()
+{
+    QTest::addColumn<QString>("aString");
+    QTest::addColumn<int>("expected");
+
+    QTest::newRow("positive value") << "42" << 42;
+    QTest::newRow("negative value") << "-42" << -42;
+    QTest::newRow("zero") << "0" << 0;
+}
+//! [3]
+
+
+//! [4]
+void TestQString::toInt()
+{
+     QFETCH(QString, aString);
+     QFETCH(int, expected);
+
+     QCOMPARE(aString.toInt(), expected);
+}
+//! [4]
+
+
+//! [5]
+if (sizeof(int) != 4)
+    QFAIL("This test has not been ported to this platform yet.");
+//! [5]
+
+
+//! [6]
+QFETCH(QString, myString);
+QCOMPARE(QString("hello").toUpper(), myString);
+//! [6]
+
+
+//! [7]
+QTEST(QString("hello").toUpper(), "myString");
+//! [7]
+
+
+//! [8]
+if (!QSqlDatabase::drivers().contains("SQLITE"))
+    QSKIP("This test requires the SQLITE database driver", SkipAll);
+//! [8]
+
+
+//! [9]
+QEXPECT_FAIL("", "Will fix in the next release", Continue);
+QCOMPARE(i, 42);
+QCOMPARE(j, 43);
+//! [9]
+
+
+//! [10]
+QEXPECT_FAIL("data27", "Oh my, this is soooo broken", Abort);
+QCOMPARE(i, 42);
+//! [10]
+
+
+//! [11]
+class TestQString: public QObject { ... };
+QTEST_MAIN(TestQString)
+//! [11]
+
+
+//! [12]
+#ifdef Q_WS_X11
+    QTEST_MAIN(MyX11Test)
+#else
+    // do nothing on non-X11 platforms
+    QTEST_NOOP_MAIN
+#endif
+//! [12]
+
+
+//! [13]
+QTest::keyClick(myWidget, 'a');
+//! [13]
+
+
+//! [14]
+QTest::keyClick(myWidget, Qt::Key_Escape);
+
+QTest::keyClick(myWidget, Qt::Key_Escape, Qt::ShiftModifier, 200);
+//! [14]
+
+
+//! [15]
+QTest::keyClicks(myWidget, "hello world");
+//! [15]
+
+
+//! [16]
+namespace QTest {
+    template<>
+    char *toString(const MyPoint &point)
+    {
+        QByteArray ba = "MyPoint(";
+        ba += QByteArray::number(point.x()) + ", " + QByteArray::number(point.y());
+        ba += ")";
+        return qstrdup(ba.data());
+    }
+}
+//! [16]
+
+
+//! [17]
+int i = 0;
+while (myNetworkServerNotResponding() && i++ < 50)
+    QTest::qWait(250);
+//! [17]
+
+
+//! [18]
+MyFirstTestObject test1;
+QTest::qExec(&test1);
+
+MySecondTestObject test2;
+QTest::qExec(&test2);
+//! [18]
+
+
+//! [19]
+QDir dir;
+
+QTest::ignoreMessage(QtWarningMsg, "QDir::mkdir: Empty or null file name(s)");
+dir.mkdir("");
+//! [19]
+
+
+//! [20]
+void myTestFunction_data()
+{
+    QTest::addColumn<QString>("aString");
+    QTest::newRow("just hello") << QString("hello");
+    QTest::newRow("a null string") << QString();
+}
+//! [20]
+
+
+//! [21]
+void myTestFunction_data() {
+    QTest::addColumn<int>("intval");
+    QTest::addColumn<QString>("str");
+    QTest::addColumn<double>("dbl");
+
+    QTest::newRow("row1") << 1 << "hello" << 1.5;
+}
+//! [21]
+
+
+//! [22]
+void MyTestClass::cleanup()
+{
+    if (qstrcmp(currentTestFunction(), "myDatabaseTest") == 0) {
+        // clean up all database connections
+        closeAllDatabases();
+    }
+}
+//! [22]
+
+
+//! [23]
+QTest::qSleep(250);
+//! [23]
+
+}
+
diff --git a/doc/src/snippets/code/src_script_qscriptable.cpp b/doc/src/snippets/code/src_script_qscriptable.cpp
new file mode 100644
index 0000000000..3a02d51823
--- /dev/null
+++ b/doc/src/snippets/code/src_script_qscriptable.cpp
@@ -0,0 +1,25 @@
+//! [0]
+class MyScriptableObject: public QObject,
+      protected QScriptable
+{
+    Q_OBJECT
+...
+
+public slots:
+    void doSomething();
+    double doSomethingElse();
+}
+//! [0]
+
+
+//! [1]
+void MyScriptableObject::doSomething()
+{
+  context()->throwError("Threw an error from a slot");
+}
+
+double MyScriptableObject::doSomethingElse()
+{
+  return qscriptvalue_cast<double>(thisObject());
+}
+//! [1]
diff --git a/doc/src/snippets/code/src_script_qscriptclass.cpp b/doc/src/snippets/code/src_script_qscriptclass.cpp
new file mode 100644
index 0000000000..9d55e0f7f0
--- /dev/null
+++ b/doc/src/snippets/code/src_script_qscriptclass.cpp
@@ -0,0 +1,10 @@
+//! [0]
+if (extension == Callable) {
+    QScriptContext *context = qvariant_cast<QScriptContext*>(argument);
+    QScriptEngine *engine = context->engine();
+    double sum = 0;
+    for (int i = 0; i < context->argumentCount(); ++i)
+        sum += context->argument(i).toNumber();
+    return sum;
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_script_qscriptcontext.cpp b/doc/src/snippets/code/src_script_qscriptcontext.cpp
new file mode 100644
index 0000000000..a2f1815862
--- /dev/null
+++ b/doc/src/snippets/code/src_script_qscriptcontext.cpp
@@ -0,0 +1,28 @@
+//! [0]
+foo(20.5, "hello", new Object())
+//! [0]
+
+
+//! [1]
+QScriptValue Person_prototype_fullName(QScriptContext *context, QScriptEngine *engine)
+{
+    QScriptValue self = context->thisObject();
+    QString result;
+    result += self.property("firstName").toString();
+    result += QLatin1String(" ");
+    result += self.property("lastName").toString();
+    return result;
+}
+//! [1]
+
+
+//! [2]
+QScriptValue myInclude(QScriptContext *ctx, QScriptEngine *eng)
+{
+    QString fileName = ctx->argument(0).toString();
+    QString contents = readTheFile(fileName);
+    ctx->setActivationObject(ctx->parentContext()->activationObject());
+    ctx->setThisObject(ctx->parentContext()->thisObject());
+    return eng->evaluate(contents, fileName);
+}
+//! [2]
diff --git a/doc/src/snippets/code/src_script_qscriptengine.cpp b/doc/src/snippets/code/src_script_qscriptengine.cpp
new file mode 100644
index 0000000000..81d4fbcee8
--- /dev/null
+++ b/doc/src/snippets/code/src_script_qscriptengine.cpp
@@ -0,0 +1,292 @@
+//! [0]
+QScriptEngine myEngine;
+QScriptValue three = myEngine.evaluate("1 + 2");
+//! [0]
+
+
+//! [1]
+QScriptValue fun = myEngine.evaluate("function(a, b) { return a + b; }");
+QScriptValueList args;
+args << 1 << 2;
+QScriptValue threeAgain = fun.call(QScriptValue(), args);
+//! [1]
+
+
+//! [2]
+QString fileName = "helloworld.qs";
+QFile scriptFile(fileName);
+if (!scriptFile.open(QIODevice::ReadOnly))
+    // handle error
+QTextStream stream(&scriptFile);
+QString contents = stream.readAll();
+scriptFile.close();
+myEngine.evaluate(contents, fileName);
+//! [2]
+
+
+//! [3]
+myEngine.globalObject().setProperty("myNumber", 123);
+...
+QScriptValue myNumberPlusOne = myEngine.evaluate("myNumber + 1");
+//! [3]
+
+
+//! [4]
+QScriptValue result = myEngine.evaluate(...);
+if (myEngine.hasUncaughtException()) {
+    int line = myEngine.uncaughtExceptionLineNumber();
+    qDebug() << "uncaught exception at line" << line << ":" << result.toString();
+}
+//! [4]
+
+
+//! [5]
+QPushButton button;
+QScriptValue scriptButton = myEngine.newQObject(&button);
+myEngine.globalObject().setProperty("button", scriptButton);
+
+myEngine.evaluate("button.checkable = true");
+
+qDebug() << scriptButton.property("checkable").toBoolean();
+scriptButton.property("show").call(); // call the show() slot
+//! [5]
+
+
+//! [6]
+QScriptValue myAdd(QScriptContext *context, QScriptEngine *engine)
+{
+   QScriptValue a = context->argument(0);
+   QScriptValue b = context->argument(1);
+   return a.toNumber() + b.toNumber();
+}
+//! [6]
+
+
+//! [7]
+QScriptValue fun = myEngine.newFunction(myAdd);
+myEngine.globalObject().setProperty("myAdd", fun);
+//! [7]
+
+
+//! [8]
+QScriptValue result = myEngine.evaluate("myAdd(myNumber, 1)");
+//! [8]
+
+
+//! [9]
+QScriptValue Foo(QScriptContext *context, QScriptEngine *engine)
+{
+    if (context->calledAsConstructor()) {
+        // initialize the new object
+        context->thisObject().setProperty("bar", ...);
+        // ...
+        // return a non-object value to indicate that the
+        // thisObject() should be the result of the "new Foo()" expression
+        return engine->undefinedValue();
+    } else {
+        // not called as "new Foo()", just "Foo()"
+        // create our own object and return that one
+        QScriptValue object = engine->newObject();
+        object.setPrototype(context->callee().property("prototype"));
+        object.setProperty("baz", ...);
+        return object;
+    }
+}
+
+...
+
+QScriptValue fooProto = engine->newObject();
+fooProto.setProperty("whatever", ...);
+engine->globalObject().setProperty("Foo", engine->newFunction(Foo, fooProto));
+//! [9]
+
+
+//! [10]
+class Bar { ... };
+
+Q_DECLARE_METATYPE(Bar)
+
+QScriptValue constructBar(QScriptContext *context, QScriptEngine *engine)
+{
+    Bar bar;
+    // initialize from arguments in context, if desired
+    ...
+    return engine->toScriptValue(bar);
+}
+
+class BarPrototype : public QObject, public QScriptable
+{
+// provide the scriptable interface of this type using slots and properties
+...
+};
+
+...
+
+// create and register the Bar prototype and constructor in the engine
+BarPrototype *barPrototypeObject = new BarPrototype(...);
+QScriptValue barProto = engine->newQObject(barPrototypeObject);
+engine->setDefaultPrototype(qMetaTypeId<Bar>, barProto);
+QScriptValue barCtor = engine->newFunction(constructBar, barProto);
+engine->globalObject().setProperty("Bar", barCtor);
+//! [10]
+
+
+//! [11]
+static QScriptValue getSetFoo(QScriptContext *context, QScriptEngine *engine)
+{
+    QScriptValue callee = context->callee();
+    if (context->argumentCount() == 1) // writing?
+        callee.setProperty("value", context->argument(0));
+    return callee.property("value");
+}
+
+....
+
+QScriptValue object = engine.newObject();
+object.setProperty("foo", engine.newFunction(getSetFoo),
+    QScriptValue::PropertyGetter | QScriptValue::PropertySetter);
+//! [11]
+
+
+//! [12]
+QScriptValue object = engine.newObject();
+object.setProperty("foo", engine.newFunction(getFoo), QScriptValue::PropertyGetter);
+object.setProperty("foo", engine.newFunction(setFoo), QScriptValue::PropertySetter);
+//! [12]
+
+
+//! [13]
+Q_SCRIPT_DECLARE_QMETAOBJECT(QLineEdit, QWidget*)
+
+...
+
+QScriptValue lineEditClass = engine.scriptValueFromQMetaObject<QLineEdit>();
+engine.globalObject().setProperty("QLineEdit", lineEditClass);
+//! [13]
+
+
+//! [14]
+if (hello && world)
+    print("hello world");
+//! [14]
+
+
+//! [15]
+if (hello &&
+//! [15]
+
+
+//! [16]
+0 = 0
+//! [16]
+
+
+//! [17]
+./test.js
+//! [17]
+
+
+//! [18]
+foo["bar"]
+//! [18]
+
+
+//! [19]
+QScriptEngine engine;
+QScriptContext *context = engine.pushContext();
+context->activationObject().setProperty("myArg", 123);
+engine.evaluate("var tmp = myArg + 42");
+...
+engine.popContext();
+//! [19]
+
+
+//! [20]
+struct MyStruct {
+    int x;
+    int y;
+};
+//! [20]
+
+
+//! [21]
+Q_DECLARE_METATYPE(MyStruct)
+//! [21]
+
+
+//! [22]
+QScriptValue toScriptValue(QScriptEngine *engine, const MyStruct &s)
+{
+  QScriptValue obj = engine->newObject();
+  obj.setProperty("x", s.x);
+  obj.setProperty("y", s.y);
+  return obj;
+}
+
+void fromScriptValue(const QScriptValue &obj, MyStruct &s)
+{
+  s.x = obj.property("x").toInt32();
+  s.y = obj.property("y").toInt32();
+}
+//! [22]
+
+
+//! [23]
+qScriptRegisterMetaType(engine, toScriptValue, fromScriptValue);
+//! [23]
+
+
+//! [24]
+MyStruct s = qscriptvalue_cast<MyStruct>(context->argument(0));
+...
+MyStruct s2;
+s2.x = s.x + 10;
+s2.y = s.y + 20;
+QScriptValue v = engine->toScriptValue(s2);
+//! [24]
+
+
+//! [25]
+QScriptValue createMyStruct(QScriptContext *, QScriptEngine *engine)
+{
+    MyStruct s;
+    s.x = 123;
+    s.y = 456;
+    return engine->toScriptValue(s);
+}
+...
+QScriptValue ctor = engine.newFunction(createMyStruct);
+engine.globalObject().setProperty("MyStruct", ctor);
+//! [25]
+
+
+//! [26]
+Q_DECLARE_METATYPE(QVector<int>)
+
+...
+
+qScriptRegisterSequenceMetaType<QVector<int> >(engine);
+...
+QVector<int> v = qscriptvalue_cast<QVector<int> >(engine->evaluate("[5, 1, 3, 2]"));
+qSort(v.begin(), v.end());
+QScriptValue a = engine->toScriptValue(v);
+qDebug() << a.toString(); // outputs "[1, 2, 3, 5]"
+//! [26]
+
+//! [27]
+QScriptValue mySpecialQObjectConstructor(QScriptContext *context,
+                                         QScriptEngine *engine)
+{
+    QObject *parent = context->argument(0).toQObject();
+    QObject *object = new QObject(parent);
+    return engine->newQObject(object, QScriptEngine::ScriptOwnership);
+}
+
+...
+
+QScriptValue ctor = engine.newFunction(mySpecialQObjectConstructor);
+QScriptValue metaObject = engine.newQMetaObject(&QObject::staticMetaObject, ctor);
+engine.globalObject().setProperty("QObject", metaObject);
+
+QScriptValue result = engine.evaluate("new QObject()");
+//! [27]
diff --git a/doc/src/snippets/code/src_script_qscriptengineagent.cpp b/doc/src/snippets/code/src_script_qscriptengineagent.cpp
new file mode 100644
index 0000000000..649d782f37
--- /dev/null
+++ b/doc/src/snippets/code/src_script_qscriptengineagent.cpp
@@ -0,0 +1,12 @@
+//! [0]
+var a = Math.random() + 2;
+//! [0]
+
+
+//! [1]
+function cube(a) {
+    return a * a * a;
+}
+
+var a = cube(3);
+//! [1]
diff --git a/doc/src/snippets/code/src_script_qscriptvalue.cpp b/doc/src/snippets/code/src_script_qscriptvalue.cpp
new file mode 100644
index 0000000000..d050f2e22e
--- /dev/null
+++ b/doc/src/snippets/code/src_script_qscriptvalue.cpp
@@ -0,0 +1,40 @@
+//! [0]
+QScriptEngine myEngine;
+QScriptValue myObject = myEngine.newObject();
+QScriptValue myOtherObject = myEngine.newObject();
+myObject.setProperty("myChild", myOtherObject);
+myObject.setProperty("name", "John Doe");
+//! [0]
+
+
+//! [1]
+QScriptValue val(&myEngine, 123);
+myObject.setProperty("myReadOnlyProperty", val, QScriptValue::ReadOnly);
+//! [1]
+
+
+//! [2]
+QScriptEngine engine;
+engine.evaluate("function fullName() { return this.firstName + ' ' + this.lastName; }");
+engine.evaluate("somePerson = { firstName: 'John', lastName: 'Doe' }");
+
+QScriptValue global = engine.globalObject();
+QScriptValue fullName = global.property("fullName");
+QScriptValue who = global.property("somePerson");
+qDebug() << fullName.call(who).toString(); // "John Doe"
+
+engine.evaluate("function cube(x) { return x * x * x; }");
+QScriptValue cube = global.property("cube");
+QScriptValueList args;
+args << 3;
+qDebug() << cube.call(QScriptValue(), args).toNumber(); // 27
+//! [2]
+
+
+//! [3]
+QScriptValue myNativeFunction(QScriptContext *ctx, QScriptEngine *)
+{
+    QScriptValue otherFunction = ...;
+    return otherFunction.call(ctx->thisObject(), ctx->argumentsObject());
+}
+//! [3]
diff --git a/doc/src/snippets/code/src_script_qscriptvalueiterator.cpp b/doc/src/snippets/code/src_script_qscriptvalueiterator.cpp
new file mode 100644
index 0000000000..c9de60270a
--- /dev/null
+++ b/doc/src/snippets/code/src_script_qscriptvalueiterator.cpp
@@ -0,0 +1,32 @@
+//! [0]
+QScriptValue object;
+...
+QScriptValueIterator it(object);
+while (it.hasNext()) {
+    it.next();
+    qDebug() << it.name() << ": " << it.value().toString();
+}
+//! [0]
+
+
+//! [1]
+QScriptValue obj = ...; // the object to iterate over
+while (obj.isObject()) {
+    QScriptValueIterator it(obj);
+    while (it.hasNext()) {
+        it.next();
+        qDebug() << it.name();
+    }
+    obj = obj.prototype();
+}
+//! [1]
+
+
+//! [2]
+while (it.hasNext()) {
+    it.next();
+    if (it.flags() & QScriptValue::SkipInEnumeration)
+        continue;
+    qDebug() << "found enumerated property:" << it.name();
+}
+//! [2]
diff --git a/doc/src/snippets/code/src_sql_kernel_qsqldatabase.cpp b/doc/src/snippets/code/src_sql_kernel_qsqldatabase.cpp
new file mode 100644
index 0000000000..8194611a9e
--- /dev/null
+++ b/doc/src/snippets/code/src_sql_kernel_qsqldatabase.cpp
@@ -0,0 +1,95 @@
+//! [0]
+// WRONG
+QSqlDatabase db = QSqlDatabase::database("sales");
+QSqlQuery query("SELECT NAME, DOB FROM EMPLOYEES", db);
+QSqlDatabase::removeDatabase("sales"); // will output a warning
+
+// "db" is now a dangling invalid database connection,
+// "query" contains an invalid result set
+//! [0]
+
+
+//! [1]
+{
+    QSqlDatabase db = QSqlDatabase::database("sales");
+    QSqlQuery query("SELECT NAME, DOB FROM EMPLOYEES", db);
+}
+// Both "db" and "query" are destroyed because they are out of scope
+QSqlDatabase::removeDatabase("sales"); // correct
+//! [1]
+
+
+//! [2]
+QSqlDatabase::registerSqlDriver("MYDRIVER",
+                                new QSqlDriverCreator<MyDatabaseDriver>);
+QSqlDatabase db = QSqlDatabase::addDatabase("MYDRIVER");
+//! [2]
+
+
+//! [3]
+...
+db = QSqlDatabase::addDatabase("QODBC");
+db.setDatabaseName("DRIVER={Microsoft Access Driver (*.mdb)};FIL={MS Access};DBQ=myaccessfile.mdb");
+if (db.open()) {
+    // success!
+}
+...
+//! [3]
+
+
+//! [4]
+...
+// MySQL connection
+db.setConnectOptions("CLIENT_SSL=1;CLIENT_IGNORE_SPACE=1"); // use an SSL connection to the server
+if (!db.open()) {
+    db.setConnectOptions(); // clears the connect option string
+    ...
+}
+...
+// PostgreSQL connection
+db.setConnectOptions("requiressl=1"); // enable PostgreSQL SSL connections
+if (!db.open()) {
+    db.setConnectOptions(); // clear options
+    ...
+}
+...
+// ODBC connection
+db.setConnectOptions("SQL_ATTR_ACCESS_MODE=SQL_MODE_READ_ONLY;SQL_ATTR_TRACE=SQL_OPT_TRACE_ON"); // set ODBC options
+if (!db.open()) {
+    db.setConnectOptions(); // don't try to set this option
+    ...
+}
+//! [4]
+
+
+//! [5]
+#include "qtdir/src/sql/drivers/psql/qsql_psql.cpp"
+//! [5]
+
+
+//! [6]
+PGconn *con = PQconnectdb("host=server user=bart password=simpson dbname=springfield");
+QPSQLDriver *drv =  new QPSQLDriver(con);
+QSqlDatabase db = QSqlDatabase::addDatabase(drv); // becomes the new default connection
+QSqlQuery query;
+query.exec("SELECT NAME, ID FROM STAFF");
+...
+//! [6]
+
+
+//! [7]
+unix:LIBS += -lpq
+win32:LIBS += libpqdll.lib
+//! [7]
+
+
+//! [8]
+QSqlDatabase db;
+qDebug() << db.isValid();    // Returns false
+
+db = QSqlDatabase::database("sales");
+qDebug() << db.isValid();    // Returns true if "sales" connection exists
+
+QSqlDatabase::removeDatabase("sales");
+qDebug() << db.isValid();    // Returns false
+//! [8]
diff --git a/doc/src/snippets/code/src_sql_kernel_qsqldriver.cpp b/doc/src/snippets/code/src_sql_kernel_qsqldriver.cpp
new file mode 100644
index 0000000000..d5992c3b92
--- /dev/null
+++ b/doc/src/snippets/code/src_sql_kernel_qsqldriver.cpp
@@ -0,0 +1,24 @@
+//! [0]
+QSqlDatabase db = ...;
+QVariant v = db.driver()->handle();
+if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*")==0) {
+    // v.data() returns a pointer to the handle
+    sqlite3 *handle = *static_cast<sqlite3 **>(v.data());
+    if (handle != 0) { // check that it is not NULL
+        ...
+    }
+}
+//! [0]
+
+
+//! [1]
+if (v.typeName() == "PGconn*") {
+    PGconn *handle = *static_cast<PGconn **>(v.data());
+    if (handle != 0) ...
+}
+
+if (v.typeName() == "MYSQL*") {
+    MYSQL *handle = *static_cast<MYSQL **>(v.data());
+    if (handle != 0) ...
+}
+//! [1]
diff --git a/doc/src/snippets/code/src_sql_kernel_qsqlerror.cpp b/doc/src/snippets/code/src_sql_kernel_qsqlerror.cpp
new file mode 100644
index 0000000000..e25948c7fe
--- /dev/null
+++ b/doc/src/snippets/code/src_sql_kernel_qsqlerror.cpp
@@ -0,0 +1,6 @@
+//! [0]
+QSqlQueryModel model;
+model.setQuery("select * from myTable");
+if (model.lastError().isValid())
+    qDebug() << model.lastError();
+//! [0]
diff --git a/doc/src/snippets/code/src_sql_kernel_qsqlindex.cpp b/doc/src/snippets/code/src_sql_kernel_qsqlindex.cpp
new file mode 100644
index 0000000000..a372c3e1c6
--- /dev/null
+++ b/doc/src/snippets/code/src_sql_kernel_qsqlindex.cpp
@@ -0,0 +1,8 @@
+//! [0]
+QStringList list = myIndex.toStringList();
+QStringList::Iterator it = list.begin();
+while(it != list.end()) {
+    myProcessing(*it);
+    ++it;
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp b/doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp
new file mode 100644
index 0000000000..d0544b8984
--- /dev/null
+++ b/doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp
@@ -0,0 +1,40 @@
+//! [0]
+SELECT forename, surname FROM people;
+//! [0]
+
+
+//! [1]
+QSqlQuery q("select * from employees");
+QSqlRecord rec = q.record();
+
+qDebug() << "Number of columns: " << rec.count();
+
+int nameCol = rec.indexOf("name"); // index of the field "name"
+while (q.next())
+    qDebug() << q.value(nameCol).toString(); // output all names
+//! [1]
+
+
+//! [2]
+QSqlQuery q;
+q.prepare("insert into myTable values (?, ?)");
+
+QVariantList ints;
+ints << 1 << 2 << 3 << 4;
+q.addBindValue(ints);
+
+QVariantList names;
+names << "Harald" << "Boris" << "Trond" << QVariant(QVariant::String);
+q.addBindValue(names);
+
+if (!q.execBatch())
+    qDebug() << q.lastError();
+//! [2]
+
+
+//! [3]
+1  Harald
+2  Boris
+3  Trond
+4  NULL
+//! [3]
diff --git a/doc/src/snippets/code/src_sql_kernel_qsqlresult.cpp b/doc/src/snippets/code/src_sql_kernel_qsqlresult.cpp
new file mode 100644
index 0000000000..7e6c91380b
--- /dev/null
+++ b/doc/src/snippets/code/src_sql_kernel_qsqlresult.cpp
@@ -0,0 +1,45 @@
+//! [0]
+QSqlQuery q;
+q.prepare("insert into test (i1, i2, s) values (?, ?, ?)");
+
+QVariantList col1;
+QVariantList col2;
+QVariantList col3;
+
+col1 << 1 << 3;
+col2 << 2 << 4;
+col3 << "hello" << "world";
+
+q.bindValue(0, col1);
+q.bindValue(1, col2);
+q.bindValue(2, col3);
+
+if (!q.execBatch())
+    qDebug() << q.lastError();
+//! [0]
+
+
+//! [1]
+QSqlQuery query = ...
+QVariant v = query.result()->handle();
+if (v.isValid() && qstrcmp(v.typeName(), "sqlite3_stmt*")) {
+    // v.data() returns a pointer to the handle
+    sqlite3_stmt *handle = *static_cast<sqlite3_stmt **>(v.data());
+    if (handle != 0) { // check that it is not NULL
+        ...
+    }
+}
+//! [1]
+
+
+//! [2]
+if (v.typeName() == "PGresult*") {
+    PGresult *handle = *static_cast<PGresult **>(v.data());
+    if (handle != 0) ...
+}
+
+if (v.typeName() == "MYSQL_STMT*") {
+    MYSQL_STMT *handle = *static_cast<MYSQL_STMT **>(v.data());
+    if (handle != 0) ...
+}
+//! [2]
diff --git a/doc/src/snippets/code/src_sql_models_qsqlquerymodel.cpp b/doc/src/snippets/code/src_sql_models_qsqlquerymodel.cpp
new file mode 100644
index 0000000000..e3bce7567f
--- /dev/null
+++ b/doc/src/snippets/code/src_sql_models_qsqlquerymodel.cpp
@@ -0,0 +1,12 @@
+//! [0]
+while (myModel->canFetchMore())
+    myModel->fetchMore();
+//! [0]
+
+
+//! [1]
+QSqlQueryModel model;
+model.setQuery("select * from MyTable");
+if (model.lastError().isValid())
+    qDebug() << model.lastError();
+//! [1]
diff --git a/doc/src/snippets/code/src_svg_qgraphicssvgitem.cpp b/doc/src/snippets/code/src_svg_qgraphicssvgitem.cpp
new file mode 100644
index 0000000000..f0846e64db
--- /dev/null
+++ b/doc/src/snippets/code/src_svg_qgraphicssvgitem.cpp
@@ -0,0 +1,11 @@
+//! [0]
+QSvgRenderer *renderer = new QSvgRenderer(QLatin1String("SvgCardDeck.svg"));
+QGraphicsSvgItem *black = new QGraphicsSvgItem();
+QGraphicsSvgItem *red   = new QGraphicsSvgItem();
+
+black->setSharedRenderer(renderer);
+black->setElementId(QLatin1String("black_joker"));
+
+red->setSharedRenderer(renderer);
+red->setElementId(QLatin1String("red_joker"));
+//! [0]
diff --git a/doc/src/snippets/code/src_xml_dom_qdom.cpp b/doc/src/snippets/code/src_xml_dom_qdom.cpp
new file mode 100644
index 0000000000..d07d6d2274
--- /dev/null
+++ b/doc/src/snippets/code/src_xml_dom_qdom.cpp
@@ -0,0 +1,178 @@
+//! [0]
+QDomDocument doc;
+QDomImplementation impl;
+
+// This will create the element, but the resulting XML document will
+// be invalid, because '~' is not a valid character in a tag name.
+impl.setInvalidDataPolicy(QDomImplementation::AcceptInvalidData);
+QDomElement elt1 = doc.createElement("foo~bar");
+
+// This will create an element with the tag name "foobar".
+impl.setInvalidDataPolicy(QDomImplementation::DropInvalidData);
+QDomElement elt2 = doc.createElement("foo~bar");
+
+// This will create a null element.
+impl.setInvalidDataPolicy(QDomImplementation::ReturnNullNode);
+QDomElement elt3 = doc.createElement("foo~bar");
+//! [0]
+
+
+//! [1]
+QDomDocument d;
+d.setContent(someXML);
+QDomNode n = d.firstChild();
+while (!n.isNull()) {
+    if (n.isElement()) {
+        QDomElement e = n.toElement();
+        cout << "Element name: " << e.tagName() << endl;
+        break;
+    }
+    n = n.nextSibling();
+}
+//! [1]
+
+
+//! [2]
+QDomDocument document;
+QDomElement element1 = document.documentElement();
+QDomElement element2 = element1;
+//! [2]
+
+
+//! [3]
+QDomElement element3 = document.createElement("MyElement");
+QDomElement element4 = document.createElement("MyElement");
+//! [3]
+
+
+//! [4]
+<body>
+<h1>Heading</h1>
+<p>Hello <b>you</b></p>
+</body>
+//! [4]
+
+
+//! [5]
+<h1>Heading</h1>
+<p>The text...</p>
+<h2>Next heading</h2>
+//! [5]
+
+
+//! [6]
+<h1>Heading</h1>
+<p>The text...</p>
+<h2>Next heading</h2>
+//! [6]
+
+
+//! [7]
+<link href="http://qtsoftware.com" color="red" />
+//! [7]
+
+
+//! [8]
+QDomElement e = //...
+//...
+QDomAttr a = e.attributeNode("href");
+cout << a.value() << endl;                // prints "http://qtsoftware.com"
+a.setValue("http://doc.trolltech.com"); // change the node's attribute
+QDomAttr a2 = e.attributeNode("href");
+cout << a2.value() << endl;               // prints "http://doc.trolltech.com"
+//! [8]
+
+
+//! [9]
+QDomElement e = //...
+//...
+QString s = e.text()
+//! [9]
+
+
+//! [10]
+QString text;
+QDomElement element = doc.documentElement();
+for(QDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling())
+{
+    QDomText t = n.toText();
+    if (!t.isNull())
+        text += t.data();
+}
+//! [10]
+
+
+//! [11]
+QDomDocument doc = // ...
+QDomElement root = doc.firstChildElement("database");
+QDomElement elt = root.firstChildElement("entry");
+for (; !elt.isNull(); elt = elt.nextSiblingElement("entry")) {
+    // ...
+}
+//! [11]
+
+
+//! [12]
+<img src="myimg.png">
+//! [12]
+
+
+//! [13]
+<h1>Hello <b>Qt</b> <![CDATA[<xml is cool>]]></h1>
+//! [13]
+
+
+//! [14]
+Hello Qt <xml is cool>
+//! [14]
+
+
+//! [15]
+<!-- this is a comment -->
+//! [15]
+
+
+//! [16]
+QDomDocument doc("mydocument");
+QFile file("mydocument.xml");
+if (!file.open(QIODevice::ReadOnly))
+    return;
+if (!doc.setContent(&file)) {
+    file.close();
+    return;
+}
+file.close();
+
+// print out the element names of all elements that are direct children
+// of the outermost element.
+QDomElement docElem = doc.documentElement();
+
+QDomNode n = docElem.firstChild();
+while(!n.isNull()) {
+    QDomElement e = n.toElement(); // try to convert the node to an element.
+    if(!e.isNull()) {
+        cout << qPrintable(e.tagName()) << endl; // the node really is an element.
+    }
+    n = n.nextSibling();
+}
+
+// Here we append a new element to the end of the document
+QDomElement elem = doc.createElement("img");
+elem.setAttribute("src", "myimage.png");
+docElem.appendChild(elem);
+//! [16]
+
+
+//! [17]
+QDomDocument doc("MyML");
+QDomElement root = doc.createElement("MyML");
+doc.appendChild(root);
+
+QDomElement tag = doc.createElement("Greeting");
+root.appendChild(tag);
+
+QDomText t = doc.createTextNode("Hello World");
+tag.appendChild(t);
+
+QString xml = doc.toString();
+//! [17]
diff --git a/doc/src/snippets/code/src_xml_sax_qxml.cpp b/doc/src/snippets/code/src_xml_sax_qxml.cpp
new file mode 100644
index 0000000000..478cf9d222
--- /dev/null
+++ b/doc/src/snippets/code/src_xml_sax_qxml.cpp
@@ -0,0 +1,3 @@
+//! [0]
+xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
+//! [0]
diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qabstracturiresolver.cpp b/doc/src/snippets/code/src_xmlpatterns_api_qabstracturiresolver.cpp
new file mode 100644
index 0000000000..990a849687
--- /dev/null
+++ b/doc/src/snippets/code/src_xmlpatterns_api_qabstracturiresolver.cpp
@@ -0,0 +1,3 @@
+//! [0]
+return baseURI.resolved(relative);
+//! [0]
diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlforwarditerator.cpp b/doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlforwarditerator.cpp
new file mode 100644
index 0000000000..f31ea3f5c4
--- /dev/null
+++ b/doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlforwarditerator.cpp
@@ -0,0 +1,3 @@
+//! [0]
+OutputType inputToOutputItem(const InputType &inputType) const;
+//! [0]
diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp b/doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp
new file mode 100644
index 0000000000..351a30be2d
--- /dev/null
+++ b/doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp
@@ -0,0 +1,22 @@
+//! [0]
+myInstance = QXmlNodeModelIndex();
+//! [0]
+
+//! [1]
+QFile queryFile(argv[1]);
+QFile chemistryData(argv[2]);
+QString moleculeName = argv[3];
+
+QXmlQuery query;
+query.setQuery(&queryFile, QUrl::fromLocalFile(queryFile.fileName()));
+
+ChemistryNodeModel myNodeModel(query.namePool(), chemistryData);
+QXmlNodeModelIndex startNode = myNodeModel.nodeFor(moleculeName);
+query.bindVariable("queryRoot", startNode);
+
+QFile out;
+out.open(stdout, QIODevice::WriteOnly);
+
+QXmlSerializer serializer(query, &out);
+query.evaluateTo(&serializer);
+//! [1]
diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlreceiver.cpp b/doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlreceiver.cpp
new file mode 100644
index 0000000000..e286fa98c4
--- /dev/null
+++ b/doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlreceiver.cpp
@@ -0,0 +1,7 @@
+//! [0]
+QXmlQuery query;
+query.setQuery("doc('index.html')/html/body/p[1]");
+
+QXmlSerializer serializer(query, myOutputDevice);
+query.evaluateTo(&serializer);
+//! [0]
diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qsimplexmlnodemodel.cpp b/doc/src/snippets/code/src_xmlpatterns_api_qsimplexmlnodemodel.cpp
new file mode 100644
index 0000000000..0906328f86
--- /dev/null
+++ b/doc/src/snippets/code/src_xmlpatterns_api_qsimplexmlnodemodel.cpp
@@ -0,0 +1,19 @@
+//! [0]
+QXmlNodeModelIndex MyTreeModel::nextFromSimpleAxis(SimpleAxis axis, const QXmlNodeModelIndex &ni) const
+{
+    // Convert the QXmlNodeModelIndex to a value that is specific to what we represent.
+    const MyValue value = toMyValue(ni);
+
+    switch(axis)
+    {
+        case Parent:
+            return toNodeIndex(value.parent());
+        case FirstChild:
+        case PreviousSibling:
+        case NextSibling:
+            // and so on
+            ;
+    }
+    return QXmlNodeModelIndex();
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp b/doc/src/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp
new file mode 100644
index 0000000000..d7e6ab1db6
--- /dev/null
+++ b/doc/src/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp
@@ -0,0 +1,8 @@
+//! [0]
+QXmlQuery query;
+query.setQuery("doc('index.html')/html/body/p[1]");
+
+QXmlFormatter formatter(query, myOutputDevice);
+formatter.setIndentationDepth(2);
+query.evaluateTo(&formatter);
+//! [0]
diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qxmlname.cpp b/doc/src/snippets/code/src_xmlpatterns_api_qxmlname.cpp
new file mode 100644
index 0000000000..2c891b5e63
--- /dev/null
+++ b/doc/src/snippets/code/src_xmlpatterns_api_qxmlname.cpp
@@ -0,0 +1,8 @@
+// Fills the bits from begin to end with 1s and leaves the rest as 0.
+
+template<typename IntegralT>
+inline IntegralT bitmask(IntegralT begin, IntegralT end)
+{
+   IntegralT filled_bits = (1 << (end - begin + 1)) - 1;
+   return filled_bits << begin;
+}
diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp b/doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp
new file mode 100644
index 0000000000..76e1b34dec
--- /dev/null
+++ b/doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp
@@ -0,0 +1,152 @@
+//! [0]
+    QXmlNamePool namePool(query.namePool());
+    query.bindVariable(QXmlName(namePool, localName), value);
+//! [0]
+
+
+{
+//! [1]
+    QByteArray myDocument;
+    QBuffer buffer(&myDocument); // This is a QIODevice.
+    buffer.open(QIODevice::ReadOnly);
+    QXmlQuery query;
+    query.bindVariable("myDocument", &buffer);
+    query.setQuery("doc($myDocument)");
+//! [1]
+}
+
+
+{
+    QIODevice *device = 0;
+//! [2]
+    QXmlNamePool namePool(query.namePool());
+    query.bindVariable(QXmlName(namePool, localName), device);
+//! [2]
+
+}
+
+{
+    QIODevice *myOutputDevice = 0;
+//! [3]
+    QFile xq("myquery.xq");
+
+    QXmlQuery query;
+    query.setQuery(&xq, QUrl::fromLocalFile(xq.fileName()));
+
+    QXmlSerializer serializer(query, myOutputDevice);
+    query.evaluateTo(&serializer);
+//! [3]
+}
+
+{
+    QIODevice *myOutputDevice = 0;
+//! [4]
+    QFile xq("myquery.xq");
+    QString fileName("the filename");
+    QString publisherName("the publisher");
+    qlonglong year = 1234;
+
+    QXmlQuery query;
+
+    query.bindVariable("file", QVariant(fileName));
+    query.bindVariable("publisher", QVariant(publisherName));
+    query.bindVariable("year", QVariant(year));
+
+    query.setQuery(&xq, QUrl::fromLocalFile(xq.fileName()));
+
+    QXmlSerializer serializer(query, myOutputDevice);
+    query.evaluateTo(&serializer);
+//! [4]
+}
+
+{
+//! [5]
+    QFile xq("myquery.xq");
+    QString fileName("the filename");
+    QString publisherName("the publisher");
+    qlonglong year = 1234;
+
+    QXmlQuery query;
+
+    query.bindVariable("file", QVariant(fileName));
+    query.bindVariable("publisher", QVariant(publisherName));
+    query.bindVariable("year", QVariant(year));
+
+    query.setQuery(&xq, QUrl::fromLocalFile(xq.fileName()));
+
+    QXmlResultItems result;
+    query.evaluateTo(&result);
+    QXmlItem item(result.next());
+    while (!item.isNull()) {
+        if (item.isAtomicValue()) {
+            QVariant v = item.toAtomicValue();
+            switch (v.type()) {
+                case QVariant::LongLong:
+                    // xs:integer
+                    break;
+                case QVariant::String:
+                    // xs:string
+                    break;
+                default:
+                    // error
+                    break;
+            }
+        }
+        else if (item.isNode()) {
+            QXmlNodeModelIndex i = item.toNodeModelIndex();
+            // process node
+        }
+        item = result.next();
+    }
+//! [5]
+}
+
+{
+//! [6]
+    QFile xq("myquery.xq");
+
+    QXmlQuery query;
+    query.setQuery(&xq, QUrl::fromLocalFile(xq.fileName()));
+
+    QXmlResultItems result;
+    query.evaluateTo(&result);
+    QXmlItem item(result.next());
+    while (!item.isNull()) {
+        if (item.isAtomicValue()) {
+            QVariant v = item.toAtomicValue();
+            switch (v.type()) {
+                case QVariant::LongLong:
+                    // xs:integer
+                    break;
+                case QVariant::String:
+                    // xs:string
+                    break;
+                default:
+                    if (v.userType() == qMetaTypeId<QXmlName>()) {
+                        QXmlName n = qVariantValue<QXmlName>(v);
+                        // process QXmlName n...
+                    }
+                    else {
+                        // error
+                    }
+                    break;
+            }
+        }
+        else if (item.isNode()) {
+            QXmlNodeModelIndex i = item.toNodeModelIndex();
+            // process node
+        }
+        item = result.next();
+    }
+//! [6]
+}
+
+{
+    QIODevice *out = 0;
+//! [7]
+    QXmlQuery query(QXmlQuery::XSLT20);
+    query.setFocus(QUrl("myInput.xml"));
+    query.setQuery(QUrl("myStylesheet.xsl"));
+    query.evaluateTo(out);
+//! [7]
+}
diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qxmlresultitems.cpp b/doc/src/snippets/code/src_xmlpatterns_api_qxmlresultitems.cpp
new file mode 100644
index 0000000000..190d6106d3
--- /dev/null
+++ b/doc/src/snippets/code/src_xmlpatterns_api_qxmlresultitems.cpp
@@ -0,0 +1,16 @@
+//! [0]
+QXmlQuery query;
+query.setQuery("<e/>, 1, 'two'");
+QXmlResultItems result;
+
+if (query.isValid()) {
+    query.evaluateTo(&result);
+    QXmlItem item(result.next());
+    while (!item.isNull()) {
+        // use item
+        item = result.next();
+    }
+    if (result.hasError())
+        /* Runtime error! */;
+}
+//! [0]
diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qxmlserializer.cpp b/doc/src/snippets/code/src_xmlpatterns_api_qxmlserializer.cpp
new file mode 100644
index 0000000000..e286fa98c4
--- /dev/null
+++ b/doc/src/snippets/code/src_xmlpatterns_api_qxmlserializer.cpp
@@ -0,0 +1,7 @@
+//! [0]
+QXmlQuery query;
+query.setQuery("doc('index.html')/html/body/p[1]");
+
+QXmlSerializer serializer(query, myOutputDevice);
+query.evaluateTo(&serializer);
+//! [0]
diff --git a/doc/src/snippets/code/tools_assistant_compat_lib_qassistantclient.cpp b/doc/src/snippets/code/tools_assistant_compat_lib_qassistantclient.cpp
new file mode 100644
index 0000000000..f5097a9f81
--- /dev/null
+++ b/doc/src/snippets/code/tools_assistant_compat_lib_qassistantclient.cpp
@@ -0,0 +1,25 @@
+//! [0]
+        QProcess *process = new QProcess(this);
+        QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath)
+            + QLatin1String("/assistant");
+        
+        process->start(app, QStringList() << QLatin1String("-enableRemoteControl"));
+        if (!process->waitForStarted()) {
+            QMessageBox::critical(this, tr("Remote Control"),
+                tr("Could not start Qt Assistant from %1.").arg(app));
+            return;
+        }
+        
+        // show index page
+        QTextStream str(process);
+        str << QLatin1String("SetSource qthelp://mycompany.com/doc/index.html")
+            << QLatin1Char('\0') << endl;
+    }
+//! [0]
+
+
+//! [1]
+        CONFIG += assistant
+//! [1]
+
+
diff --git a/doc/src/snippets/code/tools_designer_src_lib_extension_default_extensionfactory.cpp b/doc/src/snippets/code/tools_designer_src_lib_extension_default_extensionfactory.cpp
new file mode 100644
index 0000000000..cdfd07648f
--- /dev/null
+++ b/doc/src/snippets/code/tools_designer_src_lib_extension_default_extensionfactory.cpp
@@ -0,0 +1,35 @@
+//! [0]
+        QObject *ANewExtensionFactory::createExtension(QObject *object,
+                const QString &iid, QObject *parent) const
+        {
+            if (iid != Q_TYPEID(QDesignerContainerExtension))
+                return 0;
+
+            if (MyCustomWidget *widget = qobject_cast<MyCustomWidget*>
+                   (object))
+                return new MyContainerExtension(widget, parent);
+
+            return 0;
+        }
+//! [0]
+
+
+//! [1]
+        QObject *AGeneralExtensionFactory::createExtension(QObject *object,
+                const QString &iid, QObject *parent) const
+        {
+            MyCustomWidget *widget = qobject_cast<MyCustomWidget*>(object);
+
+            if (widget && (iid == Q_TYPEID(QDesignerTaskMenuExtension))) {
+                return new MyTaskMenuExtension(widget, parent);
+
+            } else if (widget && (iid == Q_TYPEID(QDesignerContainerExtension))) {
+                return new MyContainerExtension(widget, parent);
+
+            } else {
+                return 0;
+            }
+        }
+//! [1]
+
+
diff --git a/doc/src/snippets/code/tools_designer_src_lib_extension_extension.cpp b/doc/src/snippets/code/tools_designer_src_lib_extension_extension.cpp
new file mode 100644
index 0000000000..60bd0ccc4a
--- /dev/null
+++ b/doc/src/snippets/code/tools_designer_src_lib_extension_extension.cpp
@@ -0,0 +1,15 @@
+//! [0]
+       QDesignerPropertySheetExtension *propertySheet;
+       QExtensionManager manager = formEditor->extensionManager();
+
+       propertySheet = qt_extension<QDesignerPropertySheetExtension*>(manager, widget);
+
+       if(propertySheet) {...}
+//! [0]
+
+
+//! [1]
+   Q_DECLARE_EXTENSION_INTERFACE(MyExtension, "com.mycompany.myproduct.myextension")
+//! [1]
+
+
diff --git a/doc/src/snippets/code/tools_designer_src_lib_extension_qextensionmanager.cpp b/doc/src/snippets/code/tools_designer_src_lib_extension_qextensionmanager.cpp
new file mode 100644
index 0000000000..47cee58d3f
--- /dev/null
+++ b/doc/src/snippets/code/tools_designer_src_lib_extension_qextensionmanager.cpp
@@ -0,0 +1,17 @@
+//! [0]
+        void MyPlugin::initialize(QDesignerFormEditorInterface *formEditor)
+        {
+            if (initialized)
+                return;
+
+            QExtensionManager *manager = formEditor->extensionManager();
+            Q_ASSERT(manager != 0);
+
+            manager->registerExtensions(new MyExtensionFactory(manager),
+                                        Q_TYPEID(QDesignerTaskMenuExtension));
+
+            initialized = true;
+        }
+//! [0]
+
+
diff --git a/doc/src/snippets/code/tools_designer_src_lib_sdk_abstractformeditor.cpp b/doc/src/snippets/code/tools_designer_src_lib_sdk_abstractformeditor.cpp
new file mode 100644
index 0000000000..ef13069d07
--- /dev/null
+++ b/doc/src/snippets/code/tools_designer_src_lib_sdk_abstractformeditor.cpp
@@ -0,0 +1,11 @@
+//! [0]
+        QDesignerObjectInspectorInterface *objectInspector = 0;
+        objectInspector = formEditor->objectInspector();
+
+        QDesignerFormWindowManagerInterface *manager = 0;
+        manager = formEditor->formWindowManager();
+
+        objectInspector->setFormWindow(manager->formWindow(0));
+//! [0]
+
+
diff --git a/doc/src/snippets/code/tools_designer_src_lib_sdk_abstractformwindow.cpp b/doc/src/snippets/code/tools_designer_src_lib_sdk_abstractformwindow.cpp
new file mode 100644
index 0000000000..840697d86d
--- /dev/null
+++ b/doc/src/snippets/code/tools_designer_src_lib_sdk_abstractformwindow.cpp
@@ -0,0 +1,25 @@
+//! [0]
+    QDesignerFormWindowInterface *formWindow;
+    formWindow = QDesignerFormWindowInterface::findFormWindow(myWidget);
+//! [0]
+
+
+//! [1]
+    QList<QDesignerFormWindowInterface *> forms;
+    QDesignerFormWindowInterface *formWindow;
+
+    QDesignerFormWindowManagerInterface *manager = formEditor->formWindowManager();
+
+    for (int i = 0; i < manager->formWindowCount(); i++) {
+        formWindow = manager->formWindow(i);
+        forms.append(formWindow);
+    }
+//! [1]
+
+
+//! [2]
+        if (formWindow->isManaged(myWidget))
+            formWindow->manageWidget(myWidget->childWidget);
+//! [2]
+
+
diff --git a/doc/src/snippets/code/tools_designer_src_lib_sdk_abstractformwindowcursor.cpp b/doc/src/snippets/code/tools_designer_src_lib_sdk_abstractformwindowcursor.cpp
new file mode 100644
index 0000000000..fbe4fb8b7c
--- /dev/null
+++ b/doc/src/snippets/code/tools_designer_src_lib_sdk_abstractformwindowcursor.cpp
@@ -0,0 +1,8 @@
+//! [0]
+    QDesignerFormWindowInterface *formWindow = 0;
+    formWindow = QDesignerFormWindowInterface::findFormWindow(myWidget);
+
+    formWindow->cursor()->setProperty(myWidget, myProperty, newValue);
+//! [0]
+
+
diff --git a/doc/src/snippets/code/tools_designer_src_lib_sdk_abstractformwindowmanager.cpp b/doc/src/snippets/code/tools_designer_src_lib_sdk_abstractformwindowmanager.cpp
new file mode 100644
index 0000000000..b54f0a6dbf
--- /dev/null
+++ b/doc/src/snippets/code/tools_designer_src_lib_sdk_abstractformwindowmanager.cpp
@@ -0,0 +1,11 @@
+//! [0]
+        QDesignerFormWindowManagerInterface *manager = 0;
+        QDesignerFormWindowInterface *formWindow = 0;
+
+        manager = formEditor->formWindowManager();
+        formWindow = manager->formWindow(0);
+
+        manager->setActiveFormWindow(formWindow);
+//! [0]
+
+
diff --git a/doc/src/snippets/code/tools_designer_src_lib_sdk_abstractobjectinspector.cpp b/doc/src/snippets/code/tools_designer_src_lib_sdk_abstractobjectinspector.cpp
new file mode 100644
index 0000000000..ef13069d07
--- /dev/null
+++ b/doc/src/snippets/code/tools_designer_src_lib_sdk_abstractobjectinspector.cpp
@@ -0,0 +1,11 @@
+//! [0]
+        QDesignerObjectInspectorInterface *objectInspector = 0;
+        objectInspector = formEditor->objectInspector();
+
+        QDesignerFormWindowManagerInterface *manager = 0;
+        manager = formEditor->formWindowManager();
+
+        objectInspector->setFormWindow(manager->formWindow(0));
+//! [0]
+
+
diff --git a/doc/src/snippets/code/tools_designer_src_lib_sdk_abstractpropertyeditor.cpp b/doc/src/snippets/code/tools_designer_src_lib_sdk_abstractpropertyeditor.cpp
new file mode 100644
index 0000000000..bbc396fcff
--- /dev/null
+++ b/doc/src/snippets/code/tools_designer_src_lib_sdk_abstractpropertyeditor.cpp
@@ -0,0 +1,23 @@
+//! [0]
+        QDesignerPropertyEditorInterface *propertyEditor = 0;
+        propertyEditor = formEditor->propertyEditor();
+
+        connect(propertyEditor, SIGNAL(propertyChanged(QString, QVariant)),
+                this, SLOT(checkProperty(QString, QVariant)));
+//! [0]
+
+
+//! [1]
+        void checkProperty(QString property, QVariant value) {
+            QDesignerPropertyEditorInterface *propertyEditor = 0;
+            propertyEditor = formEditor->propertyEditor();
+
+            QObject *object = propertyeditor->object();
+            MyCustomWidget *widget = qobject_cast<MyCustomWidget>(object);
+
+            if (widget && property == aProperty && value != expectedValue)
+                {...}
+        }
+//! [1]
+
+
diff --git a/doc/src/snippets/code/tools_designer_src_lib_sdk_abstractwidgetbox.cpp b/doc/src/snippets/code/tools_designer_src_lib_sdk_abstractwidgetbox.cpp
new file mode 100644
index 0000000000..b80c59ead5
--- /dev/null
+++ b/doc/src/snippets/code/tools_designer_src_lib_sdk_abstractwidgetbox.cpp
@@ -0,0 +1,30 @@
+//! [0]
+        QDesignerWidgetBoxInterface *widgetBox = 0:
+        widgetBox = formEditor->widgetBox();
+
+        widgetBox->load();
+//! [0]
+
+
+//! [1]
+        QString originalFile = widgetBox->fileName();
+
+        widgetBox->setFileName("myWidgetBox.xml");
+        widgetBox->save();
+//! [1]
+
+
+//! [2]
+        widgetBox->setFileName(originalFile);
+        widgetBox->load();
+//! [2]
+
+
+//! [3]
+        if (widgetBox->filename() != "myWidgetBox.xml") {
+            widgetBox->setFileName("myWidgetBox.xml");
+            widgetBox->load();
+        }
+//! [3]
+
+
diff --git a/doc/src/snippets/code/tools_designer_src_lib_uilib_abstractformbuilder.cpp b/doc/src/snippets/code/tools_designer_src_lib_uilib_abstractformbuilder.cpp
new file mode 100644
index 0000000000..b572fba881
--- /dev/null
+++ b/doc/src/snippets/code/tools_designer_src_lib_uilib_abstractformbuilder.cpp
@@ -0,0 +1,17 @@
+//! [0]
+        MyForm::MyForm(QWidget *parent)
+            : QWidget(parent)
+        {
+            QFormBuilder builder;
+            QFile file(":/forms/myWidget.ui");
+            file.open(QFile::ReadOnly);
+            QWidget *myWidget = builder.load(&file, this);
+            file.close();
+
+            QVBoxLayout *layout = new QVBoxLayout;
+            layout->addWidget(myWidget);
+            setLayout(layout);
+        }
+//! [0]
+
+
diff --git a/doc/src/snippets/code/tools_designer_src_lib_uilib_formbuilder.cpp b/doc/src/snippets/code/tools_designer_src_lib_uilib_formbuilder.cpp
new file mode 100644
index 0000000000..a88dab58ee
--- /dev/null
+++ b/doc/src/snippets/code/tools_designer_src_lib_uilib_formbuilder.cpp
@@ -0,0 +1,26 @@
+//! [0]
+        MyForm::MyForm(QWidget *parent)
+            : QWidget(parent)
+        {
+            QFormBuilder builder;
+            QFile file(":/forms/myWidget.ui");
+            file.open(QFile::ReadOnly);
+            QWidget *myWidget = builder.load(&file, this);
+            file.close();
+
+            QVBoxLayout *layout = new QVBoxLayout;
+            layout->addWidget(myWidget);
+            setLayout(layout);
+        }
+//! [0]
+
+
+//! [1]
+    <!DOCTYPE RCC><RCC version="1.0">
+    <qresource prefix="/forms">
+       <file>mywidget.ui</file>
+    </qresource>
+    </RCC>
+//! [1]
+
+
diff --git a/doc/src/snippets/code/tools_patternist_qapplicationargumentparser.cpp b/doc/src/snippets/code/tools_patternist_qapplicationargumentparser.cpp
new file mode 100644
index 0000000000..da28cd518d
--- /dev/null
+++ b/doc/src/snippets/code/tools_patternist_qapplicationargumentparser.cpp
@@ -0,0 +1,5 @@
+//! [0]
+ \include main.cpp
+//! [0]
+
+
diff --git a/doc/src/snippets/code/tools_shared_qtgradienteditor_qtgradientdialog.cpp b/doc/src/snippets/code/tools_shared_qtgradienteditor_qtgradientdialog.cpp
new file mode 100644
index 0000000000..72e86ba593
--- /dev/null
+++ b/doc/src/snippets/code/tools_shared_qtgradienteditor_qtgradientdialog.cpp
@@ -0,0 +1,44 @@
+//! [0]
+    bool ok;
+    QGradient gradient = QtGradientDialog::getGradient(&ok, QRadialGradient(), this);
+    if (ok) {
+        // the user clicked OK and gradient is set to the gradient the user selected
+    } else {
+        // the user canceled the dialog; gradient is set to the initial
+        // value, in this case radial gradient
+    }
+//! [0]
+
+
+//! [1]
+    bool detailsVisible;
+    QColor::Spec spec;
+    QGradient gradient;
+
+    QtGradientDialog dlg(this);
+    dlg.setDetailsVisible(detailsVisible);
+    dlg.setSpec(spec);
+    dlg.setGradient(gradient);
+    if (dlg.exec() != QDialog::Accepted)
+        return;
+
+    gradient = dlg.gradient();
+    // detailsVisible and spec properties can be changed interactively by the user too,
+    // we store the values of these properties for the next time QtGradientDialog is executed.
+    detailsVisible = dlg.detailsVisible();
+    spec = dlg.spec();
+//! [1]
+
+
+//! [2]
+        QtGradientDialog dlg;
+        dlg.setBackgroundCheckered(true);
+//! [2]
+
+
+//! [3]
+        QtGradientDialog dlg;
+        dlg.setBackgroundCheckered(false);
+//! [3]
+
+
diff --git a/doc/src/snippets/code/tools_shared_qtpropertybrowser_qtpropertybrowser.cpp b/doc/src/snippets/code/tools_shared_qtpropertybrowser_qtpropertybrowser.cpp
new file mode 100644
index 0000000000..62f4319001
--- /dev/null
+++ b/doc/src/snippets/code/tools_shared_qtpropertybrowser_qtpropertybrowser.cpp
@@ -0,0 +1,47 @@
+//! [0]
+        QtSpinBoxFactory *factory;
+        QSet<QtIntPropertyManager *> managers = factory->propertyManagers();
+//! [0]
+
+
+//! [1]
+        QtBrowserItem *item;
+        QList<QtBrowserItem *> childrenItems = item->children();
+
+        QList<QtProperty *> childrenProperties = item->property()->subProperties();
+//! [1]
+
+
+//! [2]
+        QtProperty *property1, *property2, *property3;
+
+        property2->addSubProperty(property1);
+        property3->addSubProperty(property2);
+
+        QtAbstractPropertyBrowser *editor;
+
+        editor->addProperty(property1);
+        editor->addProperty(property2);
+        editor->addProperty(property3);
+//! [2]
+
+
+//! [3]
+        QtIntPropertyManager *intManager;
+        QtDoublePropertyManager *doubleManager;
+
+        QtProperty *myInteger = intManager->addProperty();
+        QtProperty *myDouble = doubleManager->addProperty();
+
+        QtSpinBoxFactory  *spinBoxFactory;
+        QtDoubleSpinBoxFactory *doubleSpinBoxFactory;
+
+        QtAbstractPropertyBrowser *editor;
+        editor->setFactoryForManager(intManager, spinBoxFactory);
+        editor->setFactoryForManager(doubleManager, doubleSpinBoxFactory);
+
+        editor->addProperty(myInteger);
+        editor->addProperty(myDouble);
+//! [3]
+
+
diff --git a/doc/src/snippets/code/tools_shared_qtpropertybrowser_qtvariantproperty.cpp b/doc/src/snippets/code/tools_shared_qtpropertybrowser_qtvariantproperty.cpp
new file mode 100644
index 0000000000..fbc96824b3
--- /dev/null
+++ b/doc/src/snippets/code/tools_shared_qtpropertybrowser_qtvariantproperty.cpp
@@ -0,0 +1,16 @@
+//! [0]
+        QtVariantPropertyManager *variantPropertyManager;
+        QtProperty *property;
+
+        variantPropertyManager->setValue(property, 10);
+//! [0]
+
+
+//! [1]
+        QtVariantPropertyManager *variantPropertyManager;
+        QtVariantProperty *property;
+
+        property->setValue(10);
+//! [1]
+
+
diff --git a/doc/src/snippets/code/tools_shared_qttoolbardialog_qttoolbardialog.cpp b/doc/src/snippets/code/tools_shared_qttoolbardialog_qttoolbardialog.cpp
new file mode 100644
index 0000000000..9162b63b7e
--- /dev/null
+++ b/doc/src/snippets/code/tools_shared_qttoolbardialog_qttoolbardialog.cpp
@@ -0,0 +1,12 @@
+//! [0]
+    QtToolBarManager *toolBarManager;
+
+    void MyMainWindow::customize()
+        {
+            QtToolBarDialog dialog(this);
+            dialog.setToolBarManager(toolBarManager);
+            dialog.exec();
+        }
+//! [0]
+
+
diff --git a/doc/src/snippets/complexpingpong-example.qdoc b/doc/src/snippets/complexpingpong-example.qdoc
new file mode 100644
index 0000000000..257f7029e1
--- /dev/null
+++ b/doc/src/snippets/complexpingpong-example.qdoc
@@ -0,0 +1,4 @@
+Ask your question: When is the next Qt release?
+Reply was: Sorry, I don't know the answer
+Ask your question: What is the answer to life, the universe and everything?
+Reply was: 42
diff --git a/doc/src/snippets/console/dbus_pingpong.txt b/doc/src/snippets/console/dbus_pingpong.txt
new file mode 100644
index 0000000000..3c700db5c1
--- /dev/null
+++ b/doc/src/snippets/console/dbus_pingpong.txt
@@ -0,0 +1,3 @@
+[qtuser@workstation:~/dev/qt-4.4/examples/dbus/pingpong]$ ./pong &
+[qtuser@workstation:~/dev/qt-4.4/examples/dbus/pingpong]$ ./ping Hello
+Reply was: ping("Hello") got called
diff --git a/doc/src/snippets/coordsys/coordsys.cpp b/doc/src/snippets/coordsys/coordsys.cpp
new file mode 100644
index 0000000000..2fb07446a1
--- /dev/null
+++ b/doc/src/snippets/coordsys/coordsys.cpp
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+class MyWidget : public QWidget
+{
+public:
+    MyWidget();
+
+protected:
+    void paintEvent(QPaintEvent *);
+};
+
+MyWidget::MyWidget()
+{
+    QPalette palette(MyWidget::palette());
+    palette.setColor(backgroundRole(), Qt::white);
+    setPalette(palette);
+}
+
+void MyWidget::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+    painter.setRenderHint(QPainter::Antialiasing);
+    painter.setPen(Qt::darkGreen);
+    painter.drawRect(1, 2, 6, 4);
+
+    //painter.setPen(Qt::darkGray);
+    //painter.drawLine(2, 8, 6, 2);
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MyWidget widget;
+    widget.show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/coordsys/coordsys.pro b/doc/src/snippets/coordsys/coordsys.pro
new file mode 100644
index 0000000000..b6aac7cfc2
--- /dev/null
+++ b/doc/src/snippets/coordsys/coordsys.pro
@@ -0,0 +1 @@
+SOURCES += coordsys.cpp
diff --git a/doc/src/snippets/customstyle/customstyle.cpp b/doc/src/snippets/customstyle/customstyle.cpp
new file mode 100644
index 0000000000..0e3d00e973
--- /dev/null
+++ b/doc/src/snippets/customstyle/customstyle.cpp
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "customstyle.h"
+
+CustomStyle::CustomStyle()
+{
+//! [0]
+    QSpinBox *spinBox = qobject_cast<QSpinBox *>(widget);
+    if (spinBox) {
+//! [0] //! [1]
+    }
+//! [1]
+}
+
+//! [2]
+void CustomStyle::drawPrimitive(PrimitiveElement element, const QStyleOption *option,
+                                QPainter *painter, const QWidget *widget) const
+{
+    if (element == PE_IndicatorSpinUp || element == PE_IndicatorSpinDown) {
+	QPolygon points(3);
+	int x = option->rect.x();
+	int y = option->rect.y();
+	int w = option->rect.width() / 2;
+	int h = option->rect.height() / 2;
+	x += (option->rect.width() - w) / 2;
+	y += (option->rect.height() - h) / 2;
+
+	if (element == PE_IndicatorSpinUp) {
+	    points[0] = QPoint(x, y + h);
+	    points[1] = QPoint(x + w, y + h);
+	    points[2] = QPoint(x + w / 2, y);
+	} else { // PE_SpinBoxDown
+	    points[0] = QPoint(x, y);
+	    points[1] = QPoint(x + w, y);
+	    points[2] = QPoint(x + w / 2, y + h);
+	}
+
+	if (option->state & State_Enabled) {
+	    painter->setPen(option->palette.mid().color());
+	    painter->setBrush(option->palette.buttonText());
+	} else {
+	    painter->setPen(option->palette.buttonText().color());
+	    painter->setBrush(option->palette.mid());
+	}
+	painter->drawPolygon(points);
+    } else {
+	QWindowsStyle::drawPrimitive(element, option, painter, widget);
+//! [2] //! [3]
+    }
+//! [3] //! [4]
+}
+//! [4]
diff --git a/doc/src/snippets/customstyle/customstyle.h b/doc/src/snippets/customstyle/customstyle.h
new file mode 100644
index 0000000000..238eb6cc03
--- /dev/null
+++ b/doc/src/snippets/customstyle/customstyle.h
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CUSTOMSTYLE_H
+#define CUSTOMSTYLE_H
+
+#include <QWindowsStyle>
+
+//! [0]
+class CustomStyle : public QWindowsStyle
+{
+    Q_OBJECT
+
+public:
+    CustomStyle()
+    ~CustomStyle() {}
+
+    void drawPrimitive(PrimitiveElement element, const QStyleOption *option,
+                       QPainter *painter, const QWidget *widget) const;
+};
+//! [0]
+
+#endif
diff --git a/doc/src/snippets/customstyle/customstyle.pro b/doc/src/snippets/customstyle/customstyle.pro
new file mode 100644
index 0000000000..af0ee4e141
--- /dev/null
+++ b/doc/src/snippets/customstyle/customstyle.pro
@@ -0,0 +1,2 @@
+HEADERS += customstyle.h
+SOURCES += customstyle.cpp main.cpp
diff --git a/doc/src/snippets/customstyle/main.cpp b/doc/src/snippets/customstyle/main.cpp
new file mode 100644
index 0000000000..a6efacda78
--- /dev/null
+++ b/doc/src/snippets/customstyle/main.cpp
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [using a custom style]
+#include <QtGui>
+
+#include "customstyle.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication::setStyle(new CustomStyle);
+    QApplication app(argc, argv);
+    QSpinBox spinBox;
+    spinBox.show();
+    return app.exec();
+}
+//! [using a custom style]
diff --git a/doc/src/snippets/customviewstyle.cpp b/doc/src/snippets/customviewstyle.cpp
new file mode 100644
index 0000000000..6cfbac72cc
--- /dev/null
+++ b/doc/src/snippets/customviewstyle.cpp
@@ -0,0 +1,29 @@
+#include <QtGui>
+
+#include "customviewstyle.h"
+
+
+
+void CustomViewStyle::drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const
+{
+
+//![0]
+    switch (element) {
+        case (PE_PanelItemViewItem): {
+            painter->save();
+
+            QPoint topLeft = option->rect.topLeft();
+            QPoint bottomRight = option->rect.topRight();
+            QLinearGradient backgroundGradient(topLeft, bottomRight);
+            backgroundGradient.setColorAt(0.0, QColor(Qt::yellow).lighter(190));
+            backgroundGradient.setColorAt(1.0, Qt::white);
+            painter->fillRect(option->rect, QBrush(backgroundGradient));
+
+            painter->restore();
+        break;
+        }    
+        default:
+            QWindowsStyle::drawPrimitive(element, option, painter, widget);
+    }
+//![0]
+}
diff --git a/doc/src/snippets/dbus-pingpong-example.qdoc b/doc/src/snippets/dbus-pingpong-example.qdoc
new file mode 100644
index 0000000000..13a34a82ca
--- /dev/null
+++ b/doc/src/snippets/dbus-pingpong-example.qdoc
@@ -0,0 +1,3 @@
+$ ./pong &
+$ ./ping Hello
+Reply was: ping("Hello") got called
diff --git a/doc/src/snippets/designer/autoconnection/autoconnection.pro b/doc/src/snippets/designer/autoconnection/autoconnection.pro
new file mode 100644
index 0000000000..fba94debfa
--- /dev/null
+++ b/doc/src/snippets/designer/autoconnection/autoconnection.pro
@@ -0,0 +1,5 @@
+TEMPLATE    = app
+FORMS       = imagedialog.ui
+HEADERS     = imagedialog.h
+SOURCES     = imagedialog.cpp \
+              main.cpp
diff --git a/doc/src/snippets/designer/autoconnection/imagedialog.cpp b/doc/src/snippets/designer/autoconnection/imagedialog.cpp
new file mode 100644
index 0000000000..a08650bcbc
--- /dev/null
+++ b/doc/src/snippets/designer/autoconnection/imagedialog.cpp
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "imagedialog.h"
+
+ImageDialog::ImageDialog(QWidget *parent)
+    : QDialog(parent)
+{
+    setupUi(this);
+    okButton->setAutoDefault(false);
+    cancelButton->setAutoDefault(false);
+
+    colorDepthCombo->addItem(tr("2 colors (1 bit per pixel)"));
+    colorDepthCombo->addItem(tr("4 colors (2 bits per pixel)"));
+    colorDepthCombo->addItem(tr("16 colors (4 bits per pixel)"));
+    colorDepthCombo->addItem(tr("256 colors (8 bits per pixel)"));
+    colorDepthCombo->addItem(tr("65536 colors (16 bits per pixel)"));
+    colorDepthCombo->addItem(tr("16 million colors (24 bits per pixel)"));
+
+    connect(cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
+}
+
+void ImageDialog::on_okButton_clicked()
+{
+    if (nameLineEdit->text().isEmpty())
+        (void) QMessageBox::information(this, tr("No Image Name"),
+            tr("Please supply a name for the image."), QMessageBox::Cancel);
+    else
+        accept();
+}
diff --git a/doc/src/snippets/designer/autoconnection/imagedialog.h b/doc/src/snippets/designer/autoconnection/imagedialog.h
new file mode 100644
index 0000000000..e99b7f0b41
--- /dev/null
+++ b/doc/src/snippets/designer/autoconnection/imagedialog.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef IMAGEDIALOG_H
+#define IMAGEDIALOG_H
+
+#include "ui_imagedialog.h"
+
+//! [0]
+class ImageDialog : public QDialog, private Ui::ImageDialog
+{
+    Q_OBJECT
+
+public:
+    ImageDialog(QWidget *parent = 0);
+
+private slots:
+    void on_okButton_clicked();
+};
+//! [0]
+
+#endif
diff --git a/doc/src/snippets/designer/autoconnection/imagedialog.ui b/doc/src/snippets/designer/autoconnection/imagedialog.ui
new file mode 100644
index 0000000000..1c5e546f2c
--- /dev/null
+++ b/doc/src/snippets/designer/autoconnection/imagedialog.ui
@@ -0,0 +1,389 @@
+<ui version="4.0" >
+ <comment></comment>
+ <class>ImageDialog</class>
+ <widget class="QDialog" >
+  <property name="objectName" >
+   <string notr="true" >ImageDialog</string>
+  </property>
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>320</width>
+    <height>180</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Create Image</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="objectName" >
+    <string notr="true" />
+   </property>
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" >
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="margin" >
+      <number>1</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item row="1" column="0" >
+      <widget class="QLabel" name="widthLabel" >
+       <property name="objectName" >
+        <string notr="true" >widthLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>27</y>
+         <width>67</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Width:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0" >
+      <widget class="QLabel" name="heightLabel" >
+       <property name="objectName" >
+        <string notr="true" >heightLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>55</y>
+         <width>67</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Height:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1" >
+      <widget class="QComboBox" name="colorDepthCombo" >
+       <property name="objectName" >
+        <string notr="true" >colorDepthCombo</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>83</y>
+         <width>227</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="insertPolicy" >
+        <enum>QComboBox::InsertAtBottom</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" >
+      <widget class="QLineEdit" name="nameLineEdit" >
+       <property name="objectName" >
+        <string notr="true" >nameLineEdit</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>83</y>
+         <width>227</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>1</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>Untitled image</string>
+       </property>
+       <property name="echoMode" >
+        <enum>QLineEdit::Normal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1" >
+      <widget class="QSpinBox" name="spinBox" >
+       <property name="objectName" >
+        <string notr="true" >spinBox</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>1</y>
+         <width>227</width>
+         <height>20</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="buttonSymbols" >
+        <enum>QAbstractSpinBox::UpDownArrows</enum>
+       </property>
+       <property name="value" >
+        <number>32</number>
+       </property>
+       <property name="maximum" >
+        <number>1024</number>
+       </property>
+       <property name="minimum" >
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1" >
+      <widget class="QSpinBox" name="spinBox_2" >
+       <property name="objectName" >
+        <string notr="true" >spinBox_2</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>27</y>
+         <width>227</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="buttonSymbols" >
+        <enum>QAbstractSpinBox::UpDownArrows</enum>
+       </property>
+       <property name="value" >
+        <number>32</number>
+       </property>
+       <property name="maximum" >
+        <number>1024</number>
+       </property>
+       <property name="minimum" >
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0" >
+      <widget class="QLabel" name="nameLabel" >
+       <property name="objectName" >
+        <string notr="true" >nameLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>1</y>
+         <width>67</width>
+         <height>20</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Name:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0" >
+      <widget class="QLabel" name="colorDepthLabel" >
+       <property name="objectName" >
+        <string notr="true" >colorDepthLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>83</y>
+         <width>67</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Color depth:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer>
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="geometry" >
+      <rect>
+       <x>9</x>
+       <y>121</y>
+       <width>302</width>
+       <height>18</height>
+      </rect>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="margin" >
+      <number>1</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="objectName" >
+        <string notr="true" />
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>1</y>
+         <width>128</width>
+         <height>24</height>
+        </rect>
+       </property>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okButton" >
+       <property name="objectName" >
+        <string notr="true" >okButton</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>135</x>
+         <y>1</y>
+         <width>80</width>
+         <height>24</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>OK</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton" >
+       <property name="objectName" >
+        <string notr="true" >cancelButton</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>221</x>
+         <y>1</y>
+         <width>80</width>
+         <height>24</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>nameLineEdit</tabstop>
+  <tabstop>spinBox</tabstop>
+  <tabstop>spinBox_2</tabstop>
+  <tabstop>colorDepthCombo</tabstop>
+  <tabstop>okButton</tabstop>
+  <tabstop>cancelButton</tabstop>
+ </tabstops>
+ <connections>
+  <connection>
+   <sender>nameLineEdit</sender>
+   <signal>returnPressed()</signal>
+   <receiver>okButton</receiver>
+   <slot>animateClick()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>-1</x>
+     <y>7</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>-1</x>
+     <y>7</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/doc/src/snippets/designer/autoconnection/main.cpp b/doc/src/snippets/designer/autoconnection/main.cpp
new file mode 100644
index 0000000000..f5c762c49b
--- /dev/null
+++ b/doc/src/snippets/designer/autoconnection/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "imagedialog.h"
+
+#include <QApplication>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    ImageDialog *dialog = new ImageDialog;
+    dialog->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/designer/designer.pro b/doc/src/snippets/designer/designer.pro
new file mode 100644
index 0000000000..1445ca58b2
--- /dev/null
+++ b/doc/src/snippets/designer/designer.pro
@@ -0,0 +1,6 @@
+TEMPLATE        = subdirs
+SUBDIRS         = autoconnection \
+                  imagedialog \
+                  multipleinheritance \
+                  noautoconnection \
+                  singleinheritance
diff --git a/doc/src/snippets/designer/imagedialog/imagedialog.pro b/doc/src/snippets/designer/imagedialog/imagedialog.pro
new file mode 100644
index 0000000000..164a7b2cbd
--- /dev/null
+++ b/doc/src/snippets/designer/imagedialog/imagedialog.pro
@@ -0,0 +1,3 @@
+TEMPLATE    = app
+FORMS       = imagedialog.ui
+SOURCES     = main.cpp
diff --git a/doc/src/snippets/designer/imagedialog/imagedialog.ui b/doc/src/snippets/designer/imagedialog/imagedialog.ui
new file mode 100644
index 0000000000..1c5e546f2c
--- /dev/null
+++ b/doc/src/snippets/designer/imagedialog/imagedialog.ui
@@ -0,0 +1,389 @@
+<ui version="4.0" >
+ <comment></comment>
+ <class>ImageDialog</class>
+ <widget class="QDialog" >
+  <property name="objectName" >
+   <string notr="true" >ImageDialog</string>
+  </property>
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>320</width>
+    <height>180</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Create Image</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="objectName" >
+    <string notr="true" />
+   </property>
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" >
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="margin" >
+      <number>1</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item row="1" column="0" >
+      <widget class="QLabel" name="widthLabel" >
+       <property name="objectName" >
+        <string notr="true" >widthLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>27</y>
+         <width>67</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Width:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0" >
+      <widget class="QLabel" name="heightLabel" >
+       <property name="objectName" >
+        <string notr="true" >heightLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>55</y>
+         <width>67</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Height:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1" >
+      <widget class="QComboBox" name="colorDepthCombo" >
+       <property name="objectName" >
+        <string notr="true" >colorDepthCombo</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>83</y>
+         <width>227</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="insertPolicy" >
+        <enum>QComboBox::InsertAtBottom</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" >
+      <widget class="QLineEdit" name="nameLineEdit" >
+       <property name="objectName" >
+        <string notr="true" >nameLineEdit</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>83</y>
+         <width>227</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>1</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>Untitled image</string>
+       </property>
+       <property name="echoMode" >
+        <enum>QLineEdit::Normal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1" >
+      <widget class="QSpinBox" name="spinBox" >
+       <property name="objectName" >
+        <string notr="true" >spinBox</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>1</y>
+         <width>227</width>
+         <height>20</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="buttonSymbols" >
+        <enum>QAbstractSpinBox::UpDownArrows</enum>
+       </property>
+       <property name="value" >
+        <number>32</number>
+       </property>
+       <property name="maximum" >
+        <number>1024</number>
+       </property>
+       <property name="minimum" >
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1" >
+      <widget class="QSpinBox" name="spinBox_2" >
+       <property name="objectName" >
+        <string notr="true" >spinBox_2</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>27</y>
+         <width>227</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="buttonSymbols" >
+        <enum>QAbstractSpinBox::UpDownArrows</enum>
+       </property>
+       <property name="value" >
+        <number>32</number>
+       </property>
+       <property name="maximum" >
+        <number>1024</number>
+       </property>
+       <property name="minimum" >
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0" >
+      <widget class="QLabel" name="nameLabel" >
+       <property name="objectName" >
+        <string notr="true" >nameLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>1</y>
+         <width>67</width>
+         <height>20</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Name:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0" >
+      <widget class="QLabel" name="colorDepthLabel" >
+       <property name="objectName" >
+        <string notr="true" >colorDepthLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>83</y>
+         <width>67</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Color depth:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer>
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="geometry" >
+      <rect>
+       <x>9</x>
+       <y>121</y>
+       <width>302</width>
+       <height>18</height>
+      </rect>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="margin" >
+      <number>1</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="objectName" >
+        <string notr="true" />
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>1</y>
+         <width>128</width>
+         <height>24</height>
+        </rect>
+       </property>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okButton" >
+       <property name="objectName" >
+        <string notr="true" >okButton</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>135</x>
+         <y>1</y>
+         <width>80</width>
+         <height>24</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>OK</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton" >
+       <property name="objectName" >
+        <string notr="true" >cancelButton</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>221</x>
+         <y>1</y>
+         <width>80</width>
+         <height>24</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>nameLineEdit</tabstop>
+  <tabstop>spinBox</tabstop>
+  <tabstop>spinBox_2</tabstop>
+  <tabstop>colorDepthCombo</tabstop>
+  <tabstop>okButton</tabstop>
+  <tabstop>cancelButton</tabstop>
+ </tabstops>
+ <connections>
+  <connection>
+   <sender>nameLineEdit</sender>
+   <signal>returnPressed()</signal>
+   <receiver>okButton</receiver>
+   <slot>animateClick()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>-1</x>
+     <y>7</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>-1</x>
+     <y>7</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/doc/src/snippets/designer/imagedialog/main.cpp b/doc/src/snippets/designer/imagedialog/main.cpp
new file mode 100644
index 0000000000..3613dde1b7
--- /dev/null
+++ b/doc/src/snippets/designer/imagedialog/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "ui_imagedialog.h"
+#include <QApplication>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QDialog *window = new QDialog;
+    Ui::ImageDialog ui;
+    ui.setupUi(window);
+
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/designer/multipleinheritance/imagedialog.cpp b/doc/src/snippets/designer/multipleinheritance/imagedialog.cpp
new file mode 100644
index 0000000000..638640848f
--- /dev/null
+++ b/doc/src/snippets/designer/multipleinheritance/imagedialog.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "imagedialog.h"
+
+ImageDialog::ImageDialog(QWidget *parent)
+    : QDialog(parent)
+{
+    setupUi(this);
+
+    colorDepthCombo->addItem(tr("2 colors (1 bit per pixel)"));
+    colorDepthCombo->addItem(tr("4 colors (2 bits per pixel)"));
+    colorDepthCombo->addItem(tr("16 colors (4 bits per pixel)"));
+    colorDepthCombo->addItem(tr("256 colors (8 bits per pixel)"));
+    colorDepthCombo->addItem(tr("65536 colors (16 bits per pixel)"));
+    colorDepthCombo->addItem(tr("16 million colors (24 bits per pixel)"));
+
+    connect(okButton, SIGNAL(clicked()), this, SLOT(accept()));
+    connect(cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
+}
diff --git a/doc/src/snippets/designer/multipleinheritance/imagedialog.h b/doc/src/snippets/designer/multipleinheritance/imagedialog.h
new file mode 100644
index 0000000000..81161e7a31
--- /dev/null
+++ b/doc/src/snippets/designer/multipleinheritance/imagedialog.h
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef IMAGEDIALOG_H
+#define IMAGEDIALOG_H
+
+#include "ui_imagedialog.h"
+
+class ImageDialog : public QDialog, private Ui::ImageDialog
+{
+    Q_OBJECT
+
+public:
+    ImageDialog(QWidget *parent = 0);
+};
+
+#endif
diff --git a/doc/src/snippets/designer/multipleinheritance/imagedialog.ui b/doc/src/snippets/designer/multipleinheritance/imagedialog.ui
new file mode 100644
index 0000000000..1c5e546f2c
--- /dev/null
+++ b/doc/src/snippets/designer/multipleinheritance/imagedialog.ui
@@ -0,0 +1,389 @@
+<ui version="4.0" >
+ <comment></comment>
+ <class>ImageDialog</class>
+ <widget class="QDialog" >
+  <property name="objectName" >
+   <string notr="true" >ImageDialog</string>
+  </property>
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>320</width>
+    <height>180</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Create Image</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="objectName" >
+    <string notr="true" />
+   </property>
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" >
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="margin" >
+      <number>1</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item row="1" column="0" >
+      <widget class="QLabel" name="widthLabel" >
+       <property name="objectName" >
+        <string notr="true" >widthLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>27</y>
+         <width>67</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Width:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0" >
+      <widget class="QLabel" name="heightLabel" >
+       <property name="objectName" >
+        <string notr="true" >heightLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>55</y>
+         <width>67</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Height:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1" >
+      <widget class="QComboBox" name="colorDepthCombo" >
+       <property name="objectName" >
+        <string notr="true" >colorDepthCombo</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>83</y>
+         <width>227</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="insertPolicy" >
+        <enum>QComboBox::InsertAtBottom</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" >
+      <widget class="QLineEdit" name="nameLineEdit" >
+       <property name="objectName" >
+        <string notr="true" >nameLineEdit</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>83</y>
+         <width>227</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>1</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>Untitled image</string>
+       </property>
+       <property name="echoMode" >
+        <enum>QLineEdit::Normal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1" >
+      <widget class="QSpinBox" name="spinBox" >
+       <property name="objectName" >
+        <string notr="true" >spinBox</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>1</y>
+         <width>227</width>
+         <height>20</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="buttonSymbols" >
+        <enum>QAbstractSpinBox::UpDownArrows</enum>
+       </property>
+       <property name="value" >
+        <number>32</number>
+       </property>
+       <property name="maximum" >
+        <number>1024</number>
+       </property>
+       <property name="minimum" >
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1" >
+      <widget class="QSpinBox" name="spinBox_2" >
+       <property name="objectName" >
+        <string notr="true" >spinBox_2</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>27</y>
+         <width>227</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="buttonSymbols" >
+        <enum>QAbstractSpinBox::UpDownArrows</enum>
+       </property>
+       <property name="value" >
+        <number>32</number>
+       </property>
+       <property name="maximum" >
+        <number>1024</number>
+       </property>
+       <property name="minimum" >
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0" >
+      <widget class="QLabel" name="nameLabel" >
+       <property name="objectName" >
+        <string notr="true" >nameLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>1</y>
+         <width>67</width>
+         <height>20</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Name:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0" >
+      <widget class="QLabel" name="colorDepthLabel" >
+       <property name="objectName" >
+        <string notr="true" >colorDepthLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>83</y>
+         <width>67</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Color depth:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer>
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="geometry" >
+      <rect>
+       <x>9</x>
+       <y>121</y>
+       <width>302</width>
+       <height>18</height>
+      </rect>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="margin" >
+      <number>1</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="objectName" >
+        <string notr="true" />
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>1</y>
+         <width>128</width>
+         <height>24</height>
+        </rect>
+       </property>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okButton" >
+       <property name="objectName" >
+        <string notr="true" >okButton</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>135</x>
+         <y>1</y>
+         <width>80</width>
+         <height>24</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>OK</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton" >
+       <property name="objectName" >
+        <string notr="true" >cancelButton</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>221</x>
+         <y>1</y>
+         <width>80</width>
+         <height>24</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>nameLineEdit</tabstop>
+  <tabstop>spinBox</tabstop>
+  <tabstop>spinBox_2</tabstop>
+  <tabstop>colorDepthCombo</tabstop>
+  <tabstop>okButton</tabstop>
+  <tabstop>cancelButton</tabstop>
+ </tabstops>
+ <connections>
+  <connection>
+   <sender>nameLineEdit</sender>
+   <signal>returnPressed()</signal>
+   <receiver>okButton</receiver>
+   <slot>animateClick()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>-1</x>
+     <y>7</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>-1</x>
+     <y>7</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/doc/src/snippets/designer/multipleinheritance/main.cpp b/doc/src/snippets/designer/multipleinheritance/main.cpp
new file mode 100644
index 0000000000..f5c762c49b
--- /dev/null
+++ b/doc/src/snippets/designer/multipleinheritance/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "imagedialog.h"
+
+#include <QApplication>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    ImageDialog *dialog = new ImageDialog;
+    dialog->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/designer/multipleinheritance/multipleinheritance.pro b/doc/src/snippets/designer/multipleinheritance/multipleinheritance.pro
new file mode 100644
index 0000000000..fba94debfa
--- /dev/null
+++ b/doc/src/snippets/designer/multipleinheritance/multipleinheritance.pro
@@ -0,0 +1,5 @@
+TEMPLATE    = app
+FORMS       = imagedialog.ui
+HEADERS     = imagedialog.h
+SOURCES     = imagedialog.cpp \
+              main.cpp
diff --git a/doc/src/snippets/designer/noautoconnection/imagedialog.cpp b/doc/src/snippets/designer/noautoconnection/imagedialog.cpp
new file mode 100644
index 0000000000..1529377467
--- /dev/null
+++ b/doc/src/snippets/designer/noautoconnection/imagedialog.cpp
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "imagedialog.h"
+
+//! [0]
+ImageDialog::ImageDialog(QWidget *parent)
+    : QDialog(parent)
+{
+    setupUi(this);
+    okButton->setAutoDefault(false);
+    cancelButton->setAutoDefault(false);
+//! [0]
+
+    colorDepthCombo->addItem(tr("2 colors (1 bit per pixel)"));
+    colorDepthCombo->addItem(tr("4 colors (2 bits per pixel)"));
+    colorDepthCombo->addItem(tr("16 colors (4 bits per pixel)"));
+    colorDepthCombo->addItem(tr("256 colors (8 bits per pixel)"));
+    colorDepthCombo->addItem(tr("65536 colors (16 bits per pixel)"));
+    colorDepthCombo->addItem(tr("16 million colors (24 bits per pixel)"));
+
+    connect(cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
+//! [1]
+    connect(okButton, SIGNAL(clicked()), this, SLOT(checkValues()));
+}
+//! [1]
+
+//! [2]
+void ImageDialog::checkValues()
+{
+    if (nameLineEdit->text().isEmpty())
+        (void) QMessageBox::information(this, tr("No Image Name"),
+            tr("Please supply a name for the image."), QMessageBox::Cancel);
+    else
+        accept();
+}
+//! [2]
diff --git a/doc/src/snippets/designer/noautoconnection/imagedialog.h b/doc/src/snippets/designer/noautoconnection/imagedialog.h
new file mode 100644
index 0000000000..c67b01e738
--- /dev/null
+++ b/doc/src/snippets/designer/noautoconnection/imagedialog.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef IMAGEDIALOG_H
+#define IMAGEDIALOG_H
+
+#include "ui_imagedialog.h"
+
+//! [0]
+class ImageDialog : public QDialog, private Ui::ImageDialog
+{
+    Q_OBJECT
+
+public:
+    ImageDialog(QWidget *parent = 0);
+
+private slots:
+    void checkValues();
+};
+//! [0]
+
+#endif
diff --git a/doc/src/snippets/designer/noautoconnection/imagedialog.ui b/doc/src/snippets/designer/noautoconnection/imagedialog.ui
new file mode 100644
index 0000000000..1c5e546f2c
--- /dev/null
+++ b/doc/src/snippets/designer/noautoconnection/imagedialog.ui
@@ -0,0 +1,389 @@
+<ui version="4.0" >
+ <comment></comment>
+ <class>ImageDialog</class>
+ <widget class="QDialog" >
+  <property name="objectName" >
+   <string notr="true" >ImageDialog</string>
+  </property>
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>320</width>
+    <height>180</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Create Image</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="objectName" >
+    <string notr="true" />
+   </property>
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" >
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="margin" >
+      <number>1</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item row="1" column="0" >
+      <widget class="QLabel" name="widthLabel" >
+       <property name="objectName" >
+        <string notr="true" >widthLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>27</y>
+         <width>67</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Width:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0" >
+      <widget class="QLabel" name="heightLabel" >
+       <property name="objectName" >
+        <string notr="true" >heightLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>55</y>
+         <width>67</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Height:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1" >
+      <widget class="QComboBox" name="colorDepthCombo" >
+       <property name="objectName" >
+        <string notr="true" >colorDepthCombo</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>83</y>
+         <width>227</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="insertPolicy" >
+        <enum>QComboBox::InsertAtBottom</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" >
+      <widget class="QLineEdit" name="nameLineEdit" >
+       <property name="objectName" >
+        <string notr="true" >nameLineEdit</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>83</y>
+         <width>227</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>1</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>Untitled image</string>
+       </property>
+       <property name="echoMode" >
+        <enum>QLineEdit::Normal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1" >
+      <widget class="QSpinBox" name="spinBox" >
+       <property name="objectName" >
+        <string notr="true" >spinBox</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>1</y>
+         <width>227</width>
+         <height>20</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="buttonSymbols" >
+        <enum>QAbstractSpinBox::UpDownArrows</enum>
+       </property>
+       <property name="value" >
+        <number>32</number>
+       </property>
+       <property name="maximum" >
+        <number>1024</number>
+       </property>
+       <property name="minimum" >
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1" >
+      <widget class="QSpinBox" name="spinBox_2" >
+       <property name="objectName" >
+        <string notr="true" >spinBox_2</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>27</y>
+         <width>227</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="buttonSymbols" >
+        <enum>QAbstractSpinBox::UpDownArrows</enum>
+       </property>
+       <property name="value" >
+        <number>32</number>
+       </property>
+       <property name="maximum" >
+        <number>1024</number>
+       </property>
+       <property name="minimum" >
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0" >
+      <widget class="QLabel" name="nameLabel" >
+       <property name="objectName" >
+        <string notr="true" >nameLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>1</y>
+         <width>67</width>
+         <height>20</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Name:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0" >
+      <widget class="QLabel" name="colorDepthLabel" >
+       <property name="objectName" >
+        <string notr="true" >colorDepthLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>83</y>
+         <width>67</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Color depth:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer>
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="geometry" >
+      <rect>
+       <x>9</x>
+       <y>121</y>
+       <width>302</width>
+       <height>18</height>
+      </rect>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="margin" >
+      <number>1</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="objectName" >
+        <string notr="true" />
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>1</y>
+         <width>128</width>
+         <height>24</height>
+        </rect>
+       </property>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okButton" >
+       <property name="objectName" >
+        <string notr="true" >okButton</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>135</x>
+         <y>1</y>
+         <width>80</width>
+         <height>24</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>OK</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton" >
+       <property name="objectName" >
+        <string notr="true" >cancelButton</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>221</x>
+         <y>1</y>
+         <width>80</width>
+         <height>24</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>nameLineEdit</tabstop>
+  <tabstop>spinBox</tabstop>
+  <tabstop>spinBox_2</tabstop>
+  <tabstop>colorDepthCombo</tabstop>
+  <tabstop>okButton</tabstop>
+  <tabstop>cancelButton</tabstop>
+ </tabstops>
+ <connections>
+  <connection>
+   <sender>nameLineEdit</sender>
+   <signal>returnPressed()</signal>
+   <receiver>okButton</receiver>
+   <slot>animateClick()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>-1</x>
+     <y>7</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>-1</x>
+     <y>7</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/doc/src/snippets/designer/noautoconnection/main.cpp b/doc/src/snippets/designer/noautoconnection/main.cpp
new file mode 100644
index 0000000000..f5c762c49b
--- /dev/null
+++ b/doc/src/snippets/designer/noautoconnection/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "imagedialog.h"
+
+#include <QApplication>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    ImageDialog *dialog = new ImageDialog;
+    dialog->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/designer/noautoconnection/noautoconnection.pro b/doc/src/snippets/designer/noautoconnection/noautoconnection.pro
new file mode 100644
index 0000000000..fba94debfa
--- /dev/null
+++ b/doc/src/snippets/designer/noautoconnection/noautoconnection.pro
@@ -0,0 +1,5 @@
+TEMPLATE    = app
+FORMS       = imagedialog.ui
+HEADERS     = imagedialog.h
+SOURCES     = imagedialog.cpp \
+              main.cpp
diff --git a/doc/src/snippets/designer/singleinheritance/imagedialog.cpp b/doc/src/snippets/designer/singleinheritance/imagedialog.cpp
new file mode 100644
index 0000000000..2614858b78
--- /dev/null
+++ b/doc/src/snippets/designer/singleinheritance/imagedialog.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "imagedialog.h"
+
+ImageDialog::ImageDialog(QWidget *parent)
+    : QDialog(parent)
+{
+    ui.setupUi(this);
+
+    ui.colorDepthCombo->addItem(tr("2 colors (1 bit per pixel)"));
+    ui.colorDepthCombo->addItem(tr("4 colors (2 bits per pixel)"));
+    ui.colorDepthCombo->addItem(tr("16 colors (4 bits per pixel)"));
+    ui.colorDepthCombo->addItem(tr("256 colors (8 bits per pixel)"));
+    ui.colorDepthCombo->addItem(tr("65536 colors (16 bits per pixel)"));
+    ui.colorDepthCombo->addItem(tr("16 million colors (24 bits per pixel)"));
+
+    connect(ui.okButton, SIGNAL(clicked()), this, SLOT(accept()));
+    connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
+}
diff --git a/doc/src/snippets/designer/singleinheritance/imagedialog.h b/doc/src/snippets/designer/singleinheritance/imagedialog.h
new file mode 100644
index 0000000000..08e0c613ef
--- /dev/null
+++ b/doc/src/snippets/designer/singleinheritance/imagedialog.h
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef IMAGEDIALOG_H
+#define IMAGEDIALOG_H
+
+#include "ui_imagedialog.h"
+
+class ImageDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    ImageDialog(QWidget *parent = 0);
+
+private:
+    Ui::ImageDialog ui;
+};
+
+#endif
diff --git a/doc/src/snippets/designer/singleinheritance/imagedialog.ui b/doc/src/snippets/designer/singleinheritance/imagedialog.ui
new file mode 100644
index 0000000000..1c5e546f2c
--- /dev/null
+++ b/doc/src/snippets/designer/singleinheritance/imagedialog.ui
@@ -0,0 +1,389 @@
+<ui version="4.0" >
+ <comment></comment>
+ <class>ImageDialog</class>
+ <widget class="QDialog" >
+  <property name="objectName" >
+   <string notr="true" >ImageDialog</string>
+  </property>
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>320</width>
+    <height>180</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Create Image</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="objectName" >
+    <string notr="true" />
+   </property>
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" >
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="margin" >
+      <number>1</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item row="1" column="0" >
+      <widget class="QLabel" name="widthLabel" >
+       <property name="objectName" >
+        <string notr="true" >widthLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>27</y>
+         <width>67</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Width:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0" >
+      <widget class="QLabel" name="heightLabel" >
+       <property name="objectName" >
+        <string notr="true" >heightLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>55</y>
+         <width>67</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Height:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1" >
+      <widget class="QComboBox" name="colorDepthCombo" >
+       <property name="objectName" >
+        <string notr="true" >colorDepthCombo</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>83</y>
+         <width>227</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="insertPolicy" >
+        <enum>QComboBox::InsertAtBottom</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" >
+      <widget class="QLineEdit" name="nameLineEdit" >
+       <property name="objectName" >
+        <string notr="true" >nameLineEdit</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>83</y>
+         <width>227</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>1</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>Untitled image</string>
+       </property>
+       <property name="echoMode" >
+        <enum>QLineEdit::Normal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1" >
+      <widget class="QSpinBox" name="spinBox" >
+       <property name="objectName" >
+        <string notr="true" >spinBox</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>1</y>
+         <width>227</width>
+         <height>20</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="buttonSymbols" >
+        <enum>QAbstractSpinBox::UpDownArrows</enum>
+       </property>
+       <property name="value" >
+        <number>32</number>
+       </property>
+       <property name="maximum" >
+        <number>1024</number>
+       </property>
+       <property name="minimum" >
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1" >
+      <widget class="QSpinBox" name="spinBox_2" >
+       <property name="objectName" >
+        <string notr="true" >spinBox_2</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>74</x>
+         <y>27</y>
+         <width>227</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="buttonSymbols" >
+        <enum>QAbstractSpinBox::UpDownArrows</enum>
+       </property>
+       <property name="value" >
+        <number>32</number>
+       </property>
+       <property name="maximum" >
+        <number>1024</number>
+       </property>
+       <property name="minimum" >
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0" >
+      <widget class="QLabel" name="nameLabel" >
+       <property name="objectName" >
+        <string notr="true" >nameLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>1</y>
+         <width>67</width>
+         <height>20</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Name:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0" >
+      <widget class="QLabel" name="colorDepthLabel" >
+       <property name="objectName" >
+        <string notr="true" >colorDepthLabel</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>83</y>
+         <width>67</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="text" >
+        <string>Color depth:</string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer>
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="geometry" >
+      <rect>
+       <x>9</x>
+       <y>121</y>
+       <width>302</width>
+       <height>18</height>
+      </rect>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="margin" >
+      <number>1</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="objectName" >
+        <string notr="true" />
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>1</y>
+         <width>128</width>
+         <height>24</height>
+        </rect>
+       </property>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okButton" >
+       <property name="objectName" >
+        <string notr="true" >okButton</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>135</x>
+         <y>1</y>
+         <width>80</width>
+         <height>24</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>OK</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton" >
+       <property name="objectName" >
+        <string notr="true" >cancelButton</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>221</x>
+         <y>1</y>
+         <width>80</width>
+         <height>24</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>nameLineEdit</tabstop>
+  <tabstop>spinBox</tabstop>
+  <tabstop>spinBox_2</tabstop>
+  <tabstop>colorDepthCombo</tabstop>
+  <tabstop>okButton</tabstop>
+  <tabstop>cancelButton</tabstop>
+ </tabstops>
+ <connections>
+  <connection>
+   <sender>nameLineEdit</sender>
+   <signal>returnPressed()</signal>
+   <receiver>okButton</receiver>
+   <slot>animateClick()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>-1</x>
+     <y>7</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>-1</x>
+     <y>7</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/doc/src/snippets/designer/singleinheritance/main.cpp b/doc/src/snippets/designer/singleinheritance/main.cpp
new file mode 100644
index 0000000000..f5c762c49b
--- /dev/null
+++ b/doc/src/snippets/designer/singleinheritance/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "imagedialog.h"
+
+#include <QApplication>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    ImageDialog *dialog = new ImageDialog;
+    dialog->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/designer/singleinheritance/singleinheritance.pro b/doc/src/snippets/designer/singleinheritance/singleinheritance.pro
new file mode 100644
index 0000000000..fba94debfa
--- /dev/null
+++ b/doc/src/snippets/designer/singleinheritance/singleinheritance.pro
@@ -0,0 +1,5 @@
+TEMPLATE    = app
+FORMS       = imagedialog.ui
+HEADERS     = imagedialog.h
+SOURCES     = imagedialog.cpp \
+              main.cpp
diff --git a/doc/src/snippets/dialogs/dialogs.cpp b/doc/src/snippets/dialogs/dialogs.cpp
new file mode 100644
index 0000000000..7474e30717
--- /dev/null
+++ b/doc/src/snippets/dialogs/dialogs.cpp
@@ -0,0 +1,269 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+typedef QDialog WordCountDialog;
+typedef QDialog FindDialog;
+
+#define this 0
+#define setWordCount(x) isVisible()
+
+QString tr(const char *text)
+{
+    return QApplication::translate(text, text);
+}
+
+class EditorWindow : public QMainWindow
+{
+public:
+    void find();
+    void countWords();
+
+private:
+    FindDialog *findDialog;
+};
+
+//! [0]
+void EditorWindow::find()
+{
+    if (!findDialog) {
+        findDialog = new FindDialog(this);
+        connect(findDialog, SIGNAL(findNext()), this, SLOT(findNext()));
+    }
+
+    findDialog->show();
+    findDialog->raise();
+    findDialog->activateWindow();
+}
+//! [0]
+
+//! [1]
+void EditorWindow::countWords()
+{
+    WordCountDialog dialog(this);
+    dialog.setWordCount(document().wordCount());
+    dialog.exec();
+}
+//! [1]
+
+inline bool boo()
+{
+    QMessageBox::information(this, "Application name",
+                             "Unable to find the user preferences file.\n"
+                             "The factory default will be used instead.");
+
+    QString filename;
+    if (QFile::exists(filename) &&
+        QMessageBox::question(
+            this,
+            tr("Overwrite File? -- Application Name"),
+            tr("A file called %1 already exists."
+               "Do you want to overwrite it?")
+            .arg(filename),
+            tr("&Yes"), tr("&No"),
+            QString(), 0, 1))
+        return false;
+
+    switch(QMessageBox::warning(this, "Application name",
+                                "Could not connect to the <mumble> server.\n"
+                                "This program can't function correctly "
+                                "without the server.\n\n",
+                                "Retry",
+                                "Quit", 0, 0, 1)) {
+    case 0: // The user clicked the Retry again button or pressed Enter
+        // try again
+        break;
+    case 1: // The user clicked the Quit or pressed Escape
+        // exit
+        break;
+    }
+
+    switch(QMessageBox::information(this, "Application name here",
+                                    "The document contains unsaved changes\n"
+                                    "Do you want to save the changes before exiting?",
+                                    "&Save", "&Discard", "Cancel",
+                                    0,      // Enter == button 0
+                                    2)) { // Escape == button 2
+    case 0: // Save clicked or Alt+S pressed or Enter pressed.
+        // save
+        break;
+    case 1: // Discard clicked or Alt+D pressed
+        // don't save but exit
+        break;
+    case 2: // Cancel clicked or Escape pressed
+        // don't exit
+        break;
+    }
+
+    switch(QMessageBox::warning(this, "Application name here",
+                                "Could not save the user preferences,\n"
+                                "because the disk is full. You can delete\n"
+                                "some files and press Retry, or you can\n"
+                                "abort the Save Preferences operation.",
+                                QMessageBox::Retry | QMessageBox::Default,
+                                QMessageBox::Abort | QMessageBox::Escape)) {
+    case QMessageBox::Retry: // Retry clicked or Enter pressed
+        // try again
+        break;
+    case QMessageBox::Abort: // Abort clicked or Escape pressed
+        // abort
+        break;
+    }
+
+    QString errorDetails;
+    QMessageBox::critical(0, "Application name here",
+                          QString("An internal error occurred. Please ") +
+                          "call technical support at 1234-56789 and report\n"+
+                          "these numbers:\n\n" + errorDetails +
+                          "\n\nApplication will now exit.");
+
+    QMessageBox::about(this, "About <Application>",
+                       "<Application> is a <one-paragraph blurb>\n\n"
+                       "Copyright 1991-2003 Such-and-such. "
+                       "<License words here.>\n\n"
+                       "For technical support, call 1234-56789 or see\n"
+                       "http://www.such-and-such.com/Application/\n");
+
+    {
+        // saving the file
+        QMessageBox mb("Application name here",
+                       "Saving the file will overwrite the original file on the disk.\n"
+                       "Do you really want to save?",
+                       QMessageBox::Information,
+                       QMessageBox::Yes | QMessageBox::Default,
+                       QMessageBox::No,
+                       QMessageBox::Cancel | QMessageBox::Escape);
+        mb.setButtonText(QMessageBox::Yes, "Save");
+        mb.setButtonText(QMessageBox::No, "Discard");
+        switch(mb.exec()) {
+        case QMessageBox::Yes:
+            // save and exit
+            break;
+        case QMessageBox::No:
+            // exit without saving
+            break;
+        case QMessageBox::Cancel:
+            // don't save and don't exit
+            break;
+        }
+    }
+
+    {
+        // hardware failure
+//! [2]
+        QMessageBox mb("Application Name",
+                       "Hardware failure.\n\nDisk error detected\nDo you want to stop?",
+                       QMessageBox::Question,
+                       QMessageBox::Yes | QMessageBox::Default,
+                       QMessageBox::No | QMessageBox::Escape,
+                       QMessageBox::NoButton);
+        if (mb.exec() == QMessageBox::No) {
+            // try again
+//! [2]
+        }
+    }
+}
+
+inline void moo()
+{
+    int numFiles;
+//! [3]
+    QProgressDialog progress("Copying files...", "Abort Copy", 0, numFiles, this);
+    progress.setWindowModality(Qt::WindowModal);
+
+    for (int i = 0; i < numFiles; i++) {
+        progress.setValue(i);
+
+        if (progress.wasCanceled())
+            break;
+        //... copy one file
+    }
+    progress.setValue(numFiles);
+//! [3]
+}
+
+class Operation : public QObject
+{
+public:
+    Operation(QObject *parent);
+    void perform();
+    void cancel();
+
+private:
+    int steps;
+    QProgressDialog *pd;
+    QTimer *t;
+};
+
+//! [4]
+// Operation constructor
+Operation::Operation(QObject *parent)
+    : QObject(parent), steps(0)
+{
+    pd = new QProgressDialog("Operation in progress.", "Cancel", 0, 100);
+    connect(pd, SIGNAL(canceled()), this, SLOT(cancel()));
+    t = new QTimer(this);
+    connect(t, SIGNAL(timeout()), this, SLOT(perform()));
+    t->start(0);
+}
+//! [4] //! [5]
+
+void Operation::perform()
+{
+    pd->setValue(steps);
+    //... perform one percent of the operation
+    steps++;
+    if (steps > pd->maximum())
+        t->stop();
+}
+//! [5] //! [6]
+
+void Operation::cancel()
+{
+    t->stop();
+    //... cleanup
+}
+//! [6]
+
+int main()
+{
+}
diff --git a/doc/src/snippets/dialogs/dialogs.pro b/doc/src/snippets/dialogs/dialogs.pro
new file mode 100644
index 0000000000..fd5d36328b
--- /dev/null
+++ b/doc/src/snippets/dialogs/dialogs.pro
@@ -0,0 +1 @@
+SOURCES += dialogs.cpp
diff --git a/doc/src/snippets/dockwidgets/Resources/modules.html b/doc/src/snippets/dockwidgets/Resources/modules.html
new file mode 100644
index 0000000000..9c67393dab
--- /dev/null
+++ b/doc/src/snippets/dockwidgets/Resources/modules.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!-- /home/dboddie/dev/qt-4.0/doc/src/classes.qdoc -->
+<head>
+    <title>Qt 4.0: Qt Classes by Module</title>
+    <style>h3.fn,span.fn { margin-left: 1cm; text-indent: -1cm; }
+a:link { color: #004faf; text-decoration: none }
+a:visited { color: #672967; text-decoration: none }
+td.postheader { font-family: sans-serif }
+tr.address { font-family: sans-serif }
+body { background: #ffffff; color: black; }</style>
+    <link rel="next" href="qtcore.html" />
+    <link rel="start" href="index.html" />
+</head>
+<body>
+<h1 align="center">Qt Classes by Module</h1>
+<table align="center" cellpadding="2" cellspacing="1" border="0">
+<tr valign="top" bgcolor="#f0f0f0"><td>QtCore</td><td>Core classes used by other modules.</td></tr>
+<tr valign="top" bgcolor="#e0e0e0"><td>QtGui</td><td>Graphical User Interface components</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td>QtNetwork</td><td>Classes for network programming.</td></tr>
+<tr valign="top" bgcolor="#e0e0e0"><td>QtOpenGL</td><td>OpenGL support classes.</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td>QtSql</td><td>Classes for database integration using SQL.</td></tr>
+<tr valign="top" bgcolor="#e0e0e0"><td>QtXml</td><td>Classes for handling XML.</td></tr>
+</table>
+</body>
+</html>
diff --git a/doc/src/snippets/dockwidgets/Resources/qtcore.html b/doc/src/snippets/dockwidgets/Resources/qtcore.html
new file mode 100644
index 0000000000..947ad40389
--- /dev/null
+++ b/doc/src/snippets/dockwidgets/Resources/qtcore.html
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!-- /home/dboddie/dev/qt-4.0/doc/src/classes.qdoc -->
+<head>
+    <title>Qt 4.0: QtCore Classes</title>
+    <style>h3.fn,span.fn { margin-left: 1cm; text-indent: -1cm; }
+a:link { color: #004faf; text-decoration: none }
+a:visited { color: #672967; text-decoration: none }
+td.postheader { font-family: sans-serif }
+tr.address { font-family: sans-serif }
+body { background: #ffffff; color: black; }</style>
+    <link rel="prev" href="modules.html" />
+    <link rel="contents" href="modules.html" />
+    <link rel="next" href="qtgui.html" />
+</head>
+<body>
+<h1 align="center">QtCore Classes</h1>
+<p><table width="100%">
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QAbstractEventDispatcher</b></td><td>Manages Qt's event queue, excluding GUI-related events</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QAbstractItemModel</b></td><td>The abstract interface for item model classes</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QAbstractListModel</b></td><td>Abstract model that can be subclassed to create one-dimensional list models</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QAbstractTableModel</b></td><td>Abstract model that can be subclassed to create table models</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QBasicTimer</b></td><td>Timer events for </td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QBitArray</b></td><td>Array of bits</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QBuffer</b></td><td>QIODevice interface for a QByteArray</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QByteArray</b></td><td>Array of bytes</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QByteArrayMatcher</b></td><td>Holds a sequence of bytes that can be quickly matched in a byte array</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QCache</b></td><td>Template class that provides a cache</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QChar</b></td><td>16-bit Unicode character</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QChildEvent</b></td><td>Event parameters for child object events</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QCoreApplication</b></td><td>Event loop for Qt applications</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QCustomEvent</b></td><td>Support for custom events</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDataStream</b></td><td>Serialization of binary data to a QIODevice</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDate</b></td><td>Date functions</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDateTime</b></td><td>Date and time functions</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDir</b></td><td>Access to directory structures and their contents</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QEvent</b></td><td>The base class of all event classes. Event objects contain event parameters</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QFile</b></td><td>Interface for reading from and writing to files</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QFileEngine</b></td><td>Abstraction for accessing the filesystem</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QFileEngineHandler</b></td><td>Allows custom QFileEngines to be plugged into Qt</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QFileInfo</b></td><td>System-independent file information</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QHash</b></td><td>Template class that provides a hash-table-based dictionary</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QIODevice</b></td><td>The base interface class of all I/O devices in Qt</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QLatin1Char</b></td><td>8-bit ASCII/Latin-1 character</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QLatin1String</b></td><td>Thin wrapper around an ASCII/Latin-1 encoded string literal</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QLibrary</b></td><td>Loads shared libraries at runtime</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QLibraryInfo</b></td><td>Information about the Qt library</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QLine</b></td><td>Two-dimensional vector that uses integer point coordinates for accuracy</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QLineF</b></td><td>Two-dimensional vector that uses floating point coordinates for accuracy</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QLinkedList</b></td><td>Template class that provides linked lists</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QList</b></td><td>Template class that provides lists</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QLocale</b></td><td>Converts between numbers and their string representations in various languages</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMap</b></td><td>Template class that provides a skip-list-based dictionary</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMetaClassInfo</b></td><td>Additional information about a class</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMetaEnum</b></td><td>Meta data about an enumerator</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMetaMember</b></td><td>Meta data about a member function</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMetaObject</b></td><td>Meta information about Qt objects</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMetaProperty</b></td><td>Meta data about a property</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMetaType</b></td><td>Manages named types in the meta object system</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMimeData</b></td><td>Container for data that records information about its MIME type</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QModelIndex</b></td><td>Used to locate data in a data model</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMultiHash</b></td><td>Convenience QHash subclass that provides multi-valued hashes</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMultiMap</b></td><td>Convenience QMap subclass that provides multi-valued maps</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMutex</b></td><td>Access serialization between threads</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMutexLocker</b></td><td>Convenience class that simplifies locking and unlocking mutexes</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QObject</b></td><td>The base class of all Qt objects</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QObjectCleanupHandler</b></td><td>Watches the lifetime of multiple QObjects</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPair</b></td><td>Template class that stores a pair of items</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPersistentModelIndex</b></td><td>Used to locate data in a data model</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPluginLoader</b></td><td>Loads a plugin at runtime</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPoint</b></td><td>Defines a point in the plane</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPointF</b></td><td>Point object that uses floating point coordinates for accuracy</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPointer</b></td><td>Template class that provides guarded pointers to QObjects</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QProcess</b></td><td>Used to start external programs and to communicate with them</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QQueue</b></td><td>Generic container that provides a queue</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QReadLocker</b></td><td>Convenience class that simplifies locking and unlocking read-write locks for read access</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QReadWriteLock</b></td><td>Read-write locking</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QRect</b></td><td>Defines a rectangle in the plane</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QRectF</b></td><td>Defines a rectangle in the plane using floating point coordinates for accuracy</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QRegExp</b></td><td>Pattern matching using regular expressions</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QResource</b></td><td>Access to application resource data</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSemaphore</b></td><td>General counting semaphore</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSet</b></td><td>Template class that provides a hash-table-based set</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSettings</b></td><td>Persistent platform-independent application settings</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSharedData</b></td><td>Base class for shared data objects</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSharedDataPointer</b></td><td>Pointer to a shared data object</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSignal</b></td><td>Can be used to send signals for classes that do not inherit QObject</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSignalMapper</b></td><td>Bundles signals from identifiable senders</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSize</b></td><td>Defines the size of a two-dimensional object</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSizeF</b></td><td>Defines the size of a two-dimensional object using floating point values for accuracy</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSocketNotifier</b></td><td>Support for monitoring activity on a file descriptor</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStack</b></td><td>Template class that provides a stack</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QString</b></td><td>Unicode character string</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStringList</b></td><td>List of strings</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTemporaryFile</b></td><td>I/O device that operates on temporary files</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextCodec</b></td><td>Conversions between text encodings</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextCodecPlugin</b></td><td>Abstract base for custom QTextCodec plugins</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextDecoder</b></td><td>State-based decoder</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextEncoder</b></td><td>State-based encoder</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextIStream</b></td><td>Convenience class for input streams</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextOStream</b></td><td>Convenience class for output streams</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextStream</b></td><td>Convenient interface for reading and writing text</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QThread</b></td><td>Platform-independent threads</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QThreadStorage</b></td><td>Per-thread data storage</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTime</b></td><td>Clock time functions</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTimer</b></td><td>Repetitive and single-shot timers</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTimerEvent</b></td><td>Parameters that describe a timer event</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTranslator</b></td><td>Internationalization support for text output</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTranslatorMessage</b></td><td>Translator message and its properties</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTsciiCodec</b></td><td>Conversion to and from the Tamil TSCII encoding</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QUrl</b></td><td>Convenient interface for working with URLs</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QUuid</b></td><td>Defines a Universally Unique Identifier (UUID)</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QVarLengthArray</b></td><td>Low-level variable-length array</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QVariant</b></td><td>Acts like a union for the most common Qt data types</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QVector</b></td><td>Template class that provides a dynamic array</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QWaitCondition</b></td><td>Condition variable for synchronizing threads</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QWriteLocker</b></td><td>Convenience class that simplifies locking and unlocking read-write locks for write access</td></tr>
+</table></p>
+</body>
+</html>
diff --git a/doc/src/snippets/dockwidgets/Resources/qtgui.html b/doc/src/snippets/dockwidgets/Resources/qtgui.html
new file mode 100644
index 0000000000..9182b4cb42
--- /dev/null
+++ b/doc/src/snippets/dockwidgets/Resources/qtgui.html
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!-- /home/dboddie/dev/qt-4.0/doc/src/classes.qdoc -->
+<head>
+    <title>Qt 4.0: QtGui Classes</title>
+    <style>h3.fn,span.fn { margin-left: 1cm; text-indent: -1cm; }
+a:link { color: #004faf; text-decoration: none }
+a:visited { color: #672967; text-decoration: none }
+td.postheader { font-family: sans-serif }
+tr.address { font-family: sans-serif }
+body { background: #ffffff; color: black; }</style>
+    <link rel="prev" href="qtcore.html" />
+    <link rel="contents" href="modules.html" />
+    <link rel="next" href="qtnetwork.html" />
+</head>
+<body>
+<h1 align="center">QtGui Classes</h1>
+<p><table width="100%">
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QAbstractButton</b></td><td>The abstract base class of button widgets, providing functionality common to buttons</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QAbstractItemDelegate</b></td><td>Used to display and edit data items from a model</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QAbstractItemView</b></td><td>The basic functionality for item view classes</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QAbstractScrollArea</b></td><td>Scrolling area with on-demand scroll bars</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QAbstractSlider</b></td><td>Integer value within a range</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QAbstractSpinBox</b></td><td>Spinwidget and a line edit to display values</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QAbstractTextDocumentLayout</b></td><td>Abstract base class used to implement custom layouts for QTextDocuments</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QAccessible</b></td><td>Enums and static functions relating to accessibility</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QAccessibleInterface</b></td><td>Defines an interface that exposes information about accessible objects</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QAccessibleObject</b></td><td>Implements parts of the QAccessibleInterface for QObjects</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QAccessiblePlugin</b></td><td>Abstract base for accessibility plugins</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QAccessibleWidget</b></td><td>Implements the QAccessibleInterface for QWidgets</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QAction</b></td><td>Abstract user interface action that can be inserted into widgets with QWidget::addAction()</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QActionGroup</b></td><td>Groups actions together</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QApplication</b></td><td>Manages the GUI application's control flow and main settings</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QBitmap</b></td><td>Monochrome (1-bit depth) pixmaps</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QBoxLayout</b></td><td>Lines up child widgets horizontally or vertically</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QBrush</b></td><td>Defines the fill pattern of shapes drawn by a QPainter</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QButtonGroup</b></td><td>Container to organize groups of button widgets</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QCDEStyle</b></td><td>CDE look and feel</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QCheckBox</b></td><td>Checkbox with a text label</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QClipboard</b></td><td>Access to the window system clipboard</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QCloseEvent</b></td><td>Parameters that describe a close event</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QColor</b></td><td>Colors based on RGB or HSV values</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QColorDialog</b></td><td>Dialog widget for specifying colors</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QColorGroup</b></td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QComboBox</b></td><td>Combined button and popup list</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QCommonStyle</b></td><td>Encapsulates the common Look and Feel of a GUI</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QConicalGradient</b></td><td>Used in combination with QBrush to specify a conical gradient brush</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QContextMenuEvent</b></td><td>Parameters that describe a context menu event</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QCopChannel</b></td><td>Communication capabilities between several clients</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QCursor</b></td><td>Mouse cursor with an arbitrary shape</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDateTimeEdit</b></td><td>Widget for editing dates and times</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDecoration</b></td><td>Allows the appearance of the Qtopia Core Window Manager to be customized</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDecorationFactory</b></td><td>Creates QDecoration objects</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDecorationPlugin</b></td><td>Abstract base for custom QDecoration plugins</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDesktopWidget</b></td><td>Access to screen information on multi-head systems</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDial</b></td><td>Rounded range control (like a speedometer or potentiometer)</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDialog</b></td><td>The base class of dialog windows</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDirModel</b></td><td>Data model for the local filesystem</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDirectPainter</b></td><td>Direct access to the video hardware</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDockWidget</b></td><td>Widget that can be docked inside a QMainWindow or floated as a top-level window on the desktop</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDoubleSpinBox</b></td><td>Spin box widget that takes doubles</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDoubleValidator</b></td><td>Range checking of floating-point numbers</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDrag</b></td><td>Support for MIME-based drag and drop data transfer</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDragEnterEvent</b></td><td>Event which is sent to a widget when a drag and drop action enters it</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDragLeaveEvent</b></td><td>Event that is sent to a widget when a drag and drop action leaves it</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDragMoveEvent</b></td><td>Event which is sent while a drag and drop action is in progress</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDropEvent</b></td><td>Event which is sent when a drag and drop action is completed</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QErrorMessage</b></td><td>Error message display dialog</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QFileDialog</b></td><td>Dialog that allow users to select files or directories</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QFileIconProvider</b></td><td>File icon for the QDirModel class</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QFileOpenEvent</b></td><td>Event that will be sent when there is a request to open a file</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QFocusEvent</b></td><td>Event parameters for widget focus events</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QFocusFrame</b></td><td>Focus frame which can be outside of a widget's normal paintable area</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QFont</b></td><td>Font used for drawing text</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QFontDatabase</b></td><td>Information about the fonts available in the underlying window system</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QFontDialog</b></td><td>Dialog widget for selecting a font</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QFontInfo</b></td><td>General information about fonts</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QFontMetrics</b></td><td>Font metrics information</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QFontMetricsF</b></td><td>Font metrics information</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QFrame</b></td><td>The base class of widgets that can have a frame</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QGfxDriverFactory</b></td><td>Creates QScreen objects for Qtopia Core</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QGfxDriverPlugin</b></td><td>Abstract base for Qtopia Core graphics driver plugins</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QGradient</b></td><td>Used in combination with QBrush to specify gradient fills</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QGridLayout</b></td><td>Lays out widgets in a grid</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QGridWidget</b></td><td>Simple geometry management of its children</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QGroupBox</b></td><td>Group box frame with a title</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QHBoxLayout</b></td><td>Lines up widgets horizontally</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QHBoxWidget</b></td><td>Horizontal geometry management for its child widgets</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QHeaderView</b></td><td>Header row or header column for item views</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QHideEvent</b></td><td>Event which is sent after a widget is hidden</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QHoverEvent</b></td><td>Parameters that describe a mouse event</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QIcon</b></td><td>Scalable icons in different modes and states</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QIconDragEvent</b></td><td>Indicates that a main icon drag has begun</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QIconEngine</b></td><td>Abstract base class for QIcon renderers</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QIconEnginePlugin</b></td><td>Abstract base for custom QIconEngine plugins</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QImage</b></td><td>Hardware-independent pixmap that allows direct access to the pixel data, and can be used as a paint device</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QImageIOHandler</b></td><td>Defines the common image I/O interface for all image formats in Qt</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QImageIOHandlerFactoryInterface</b></td><td>The factory interface for QImageIOPlugin</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QImageIOPlugin</b></td><td>Defines an interface for writing an image format plugin</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QImageReader</b></td><td>Format independent interface for reading images from files or other devices</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QImageWriter</b></td><td>Format independent interface for writing images to files or other devices</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QInputContext</b></td><td>Abstracts the input method dependent data and composing state</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QInputContextPlugin</b></td><td>Abstract base for custom QInputContext plugins</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QInputDialog</b></td><td>Simple convenience dialog to get a single value from the user</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QInputEvent</b></td><td>The base class for events that describe user input</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QInputMethodEvent</b></td><td>Parameters for input method events</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QIntValidator</b></td><td>Validator that ensures a string contains a valid integer within a specified range</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QItemDelegate</b></td><td>Display and editing facilities for data items from a model</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QItemSelection</b></td><td>Manages information about selected items in a model</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QItemSelectionModel</b></td><td>Keeps track of a view's selected items</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QItemSelectionRange</b></td><td>Manages information about a range of selected items in a model</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QKbdDriverFactory</b></td><td>Creates QWSKeyboardHandler objects for Qtopia Core</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QKbdDriverPlugin</b></td><td>Abstract base for Qtopia Core keyboard driver plugins</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QKeyEvent</b></td><td>Describes a key event</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QKeySequence</b></td><td>Encapsulates a key sequence as used by shortcuts</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QLCDNumber</b></td><td>Displays a number with LCD-like digits</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QLabel</b></td><td>Text or image display</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QLayout</b></td><td>The base class of geometry managers</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QLayoutItem</b></td><td>Abstract item that a QLayout manipulates</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QLineEdit</b></td><td>One-line text editor</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QLinearGradient</b></td><td>Used in combination with QBrush to specify a linear gradient brush</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QListView</b></td><td>Default model/view implementation of a list, and of an icon view</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QListWidget</b></td><td>Item-based list widget</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QListWidgetItem</b></td><td>Item for use with the QListWidget item view class</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMacMime</b></td><td>Maps open-standard MIME to Mac flavors</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMacStyle</b></td><td>Implements an Appearance Manager style</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMainWindow</b></td><td>Main application window</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMatrix</b></td><td>2D transformations of a coordinate system</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMenu</b></td><td>Menu widget for use in menu bars, context menus, and other popup menus</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMenuBar</b></td><td>Horizontal menu bar</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMenuItem</b></td><td>Represents an item in a menu</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMessageBox</b></td><td>Modal dialog with a short message, an icon, and some buttons</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMotifPlusStyle</b></td><td>More sophisticated Motif-ish look and feel</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMotifStyle</b></td><td>Motif look and feel</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMouseDriverFactory</b></td><td>Creates QWSMouseHandler objects for Qtopia Core</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMouseDriverPlugin</b></td><td>Abstract base for Qtopia Core mouse driver plugins</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMouseEvent</b></td><td>Parameters that describe a mouse event</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMoveEvent</b></td><td>Event parameters for move events</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QMovie</b></td><td>Convenience class for playing movies with QImageReader</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPaintDevice</b></td><td>The base class of objects that can be painted</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPaintEngine</b></td><td>Abstract definition of how QPainter draws to a given device on a given platform</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPaintEvent</b></td><td>Event parameters for paint events</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPainter</b></td><td>Does low-level painting e.g. on widgets</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPainterPath</b></td><td>Container for painting operations, enabling graphical shapes to be constructed and reused</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPalette</b></td><td>Color groups for each widget state</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPen</b></td><td>Defines how a QPainter should draw lines and outlines of shapes</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPicture</b></td><td>Paint device that records and replays QPainter commands</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPictureFormatPlugin</b></td><td>Abstract base for custom picture format plugins</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPictureIO</b></td><td>Parameters for loading and saving pictures</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPixmap</b></td><td>Off-screen, pixel-based paint device</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPixmapCache</b></td><td>Application-wide cache for pixmaps</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPlatinumStyle</b></td><td>Mac/Platinum look and feel</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPolygon</b></td><td>Vector of points</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPolygonF</b></td><td>Vector of points</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPrintEngine</b></td><td>Defines an interface for how QPrinter interacts with a given printing subsystem</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPrinter</b></td><td>Paint device that paints on a printer</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QProgressBar</b></td><td>Horizontal progress bar</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QProgressDialog</b></td><td>Feedback on the progress of a slow operation</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QProxyModel</b></td><td>Support for filtering and sorting data that is passed between another model and a view</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QPushButton</b></td><td>Command button</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QRadialGradient</b></td><td>Used in combination with QBrush to specify a radial gradient brush</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QRadioButton</b></td><td>Radio button with a text label</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QRegExpValidator</b></td><td>Used to check a string against a regular expression</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QRegion</b></td><td>Clip region for a painter</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QResizeEvent</b></td><td>Event parameters for resize events</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QRubberBand</b></td><td>Rectangle or line that can indicate a selection or a boundary</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSGIStyle</b></td><td>SGI/Irix look and feel</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QScreen</b></td><td>And its descendants manage the framebuffer and palette</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QScrollArea</b></td><td>Scrolling view onto another widget</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QScrollBar</b></td><td>Vertical or horizontal scroll bar</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSessionManager</b></td><td>Access to the session manager</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QShortcut</b></td><td>Used to create keyboard shortcuts</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QShowEvent</b></td><td>Event that is sent when a widget is shown</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSizeGrip</b></td><td>Corner-grip for resizing a top-level window</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSizePolicy</b></td><td>Layout attribute describing horizontal and vertical resizing policy</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSlider</b></td><td>Vertical or horizontal slider</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSound</b></td><td>Access to the platform audio facilities</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSpacerItem</b></td><td>Blank space in a layout</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSpinBox</b></td><td>Spin box widget</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSplashScreen</b></td><td>Splash screen that can be shown during application startup</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSplitter</b></td><td>Implements a splitter widget</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSplitterHandle</b></td><td>Handle functionality of the splitter</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStackedLayout</b></td><td>Stack of widgets where only one widget is visible at a time</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStackedWidget</b></td><td>Stack of widgets where only one widget is visible at a time</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStandardItemModel</b></td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStatusBar</b></td><td>Horizontal bar suitable for presenting status information</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyle</b></td><td>Abstract base class that encapsulates the look and feel of a GUI</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleFactory</b></td><td>Creates QStyle objects</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleHintReturn</b></td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleOption</b></td><td>Stores the parameters used by QStyle functions</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleOptionButton</b></td><td>Used to describe the parameters for drawing buttons</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleOptionComboBox</b></td><td>Used to describe the parameter for drawing a combobox</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleOptionComplex</b></td><td>Used to hold parameters that are common to all complex controls</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleOptionDockWidget</b></td><td>Used to describe the parameters for drawing a dock window</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleOptionFocusRect</b></td><td>Used to describe the parameters for drawing a focus rectangle with QStyle</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleOptionFrame</b></td><td>Used to describe the parameters for drawing a frame</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleOptionHeader</b></td><td>Used to describe the parameters for drawing a header</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleOptionMenuItem</b></td><td>Used to describe the parameter necessary for drawing a menu item</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleOptionProgressBar</b></td><td>Used to describe the parameters necessary for drawing a progress bar</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleOptionQ3DockWindow</b></td><td>Used to describe the parameters for drawing various parts of a </td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleOptionQ3ListView</b></td><td>Used to describe the parameters for drawing a Q3ListView</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleOptionQ3ListViewItem</b></td><td>Used to describe an item drawn in a Q3ListView</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleOptionSlider</b></td><td>Used to describe the parameters needed for drawing a slider</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleOptionSpinBox</b></td><td>Used to describe the parameters necessary for drawing a spin box</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleOptionTab</b></td><td>Used to describe the parameters for drawing a tab bar</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleOptionTitleBar</b></td><td>Used to describe the parameters for drawing a title bar</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleOptionToolBox</b></td><td>Used to describe the parameters needed for drawing a tool box</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleOptionToolButton</b></td><td>Used to describe the parameters for drawing a tool button</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStyleOptionViewItem</b></td><td>Used to describe the parameters used to draw an item in a view widget</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStylePainter</b></td><td>Convenience class for drawing QStyle elements inside a widget</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QStylePlugin</b></td><td>Abstract base for custom QStyle plugins</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTabBar</b></td><td>Tab bar, e.g. for use in tabbed dialogs</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTabWidget</b></td><td>Stack of tabbed widgets</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTableView</b></td><td>Default model/view implementation of a table view</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTableWidget</b></td><td>Item-based table view with a default model</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTableWidgetItem</b></td><td>Item for use with the QTableWidget class</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTableWidgetSelectionRange</b></td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTabletEvent</b></td><td>Parameters that describe a Tablet event</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextBlock</b></td><td>Container for text fragments in a QTextDocument</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextBlockFormat</b></td><td>Formatting information for blocks of text in a QTextDocument</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextBlockGroup</b></td><td>Container for text blocks within a QTextDocument</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextBrowser</b></td><td>Rich text browser with hypertext navigation</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextCharFormat</b></td><td>Formatting information for characters in a QTextDocument</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextCursor</b></td><td>Offers an API to access and modify QTextDocuments</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextDocument</b></td><td>Holds formatted text that can be viewed and edited using a QTextEdit</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextDocumentFragment</b></td><td>Represents a piece of formatted text from a QTextDocument</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextEdit</b></td><td>Widget that is used to edit and display both plain and rich text</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextFormat</b></td><td>Formatting information for a QTextDocument</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextFragment</b></td><td>Holds a piece of text in a QTextDocument with a single QTextCharFormat</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextFrame</b></td><td>Represents a frame in a QTextDocument</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextFrameFormat</b></td><td>Formatting information for frames in a QTextDocument</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextImageFormat</b></td><td>Formatting information for images in a QTextDocument</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextInlineObject</b></td><td>Represents an inline object in a QTextLayout</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextLayout</b></td><td>Used to lay out and paint a single paragraph of text</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextLength</b></td><td>Encapsulates the different types of length used in a QTextDocument</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextLine</b></td><td>Represents a line of text inside a QTextLayout</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextList</b></td><td>Decorated list of items in a QTextDocument</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextListFormat</b></td><td>Formatting information for lists in a QTextDocument</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextObject</b></td><td>Base class for different kinds of objects that can group parts of a QTextDocument together</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextOption</b></td><td>Description of general rich text properties</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextTable</b></td><td>Represents a table in a QTextDocument</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextTableCell</b></td><td>Represents the properties of a cell in a QTextTable</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTextTableFormat</b></td><td>Formatting information for tables in a QTextDocument</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QToolBar</b></td><td>Movable panel that contains a set of controls</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QToolBarChangeEvent</b></td><td>Event that is sent whenever a the toolbar button is clicked on Mac OS X</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QToolBox</b></td><td>Column of tabbed widget items</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QToolButton</b></td><td>Quick-access button to commands or options, usually used inside a QToolBar</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QToolTip</b></td><td>Tool tips (balloon help) for any widget</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTreeView</b></td><td>Default model/view implementation of a tree view</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTreeWidget</b></td><td>Tree view that uses a predefined tree model</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTreeWidgetItem</b></td><td>Item for use with the QTreeWidget convenience class</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QVBoxLayout</b></td><td>Lines up widgets vertically</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QVBoxWidget</b></td><td>Vertical geometry management of its child widgets</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QValidator</b></td><td>Validation of input text</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QWSInputMethod</b></td><td>International input methods for Qtopia Core</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QWSKeyboardHandler</b></td><td>Implements the keyboard driver for Qtopia Core</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QWSMouseHandler</b></td><td>Mouse driver for Qtopia Core</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QWSServer</b></td><td>Server-specific functionality in Qtopia Core</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QWSWindow</b></td><td>Server-specific functionality in Qtopia Core</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QWhatsThis</b></td><td>Simple description of any widget, i.e. answering the question &quot;What's this?&quot;</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QWhatsThisAction</b></td><td>Ready-made action to invoke &quot;What's This&quot; context help</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QWheelEvent</b></td><td>Parameters that describe a wheel event</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QWidget</b></td><td>The base class of all user interface objects</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QWidgetContainerPlugin</b></td><td>Abstract base for complex custom container QWidget plugins</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QWidgetItem</b></td><td>Layout item that represents a widget</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QWidgetPlugin</b></td><td>Abstract base for custom QWidget plugins</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QWindowsMime</b></td><td>Maps open-standard MIME to Window Clipboard formats</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QWindowsStyle</b></td><td>Microsoft Windows-like look and feel</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QWindowsXPStyle</b></td><td>Microsoft WindowsXP-like look and feel</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QWorkspace</b></td><td>Workspace window that be used in an MDI application</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QX11Info</b></td><td>Information about the X display configuration</td></tr>
+</table></p>
+</body>
+</html>
diff --git a/doc/src/snippets/dockwidgets/Resources/qtnetwork.html b/doc/src/snippets/dockwidgets/Resources/qtnetwork.html
new file mode 100644
index 0000000000..01e1fa48b1
--- /dev/null
+++ b/doc/src/snippets/dockwidgets/Resources/qtnetwork.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!-- /home/dboddie/dev/qt-4.0/doc/src/classes.qdoc -->
+<head>
+    <title>Qt 4.0: QtNetwork Classes</title>
+    <style>h3.fn,span.fn { margin-left: 1cm; text-indent: -1cm; }
+a:link { color: #004faf; text-decoration: none }
+a:visited { color: #672967; text-decoration: none }
+td.postheader { font-family: sans-serif }
+tr.address { font-family: sans-serif }
+body { background: #ffffff; color: black; }</style>
+    <link rel="prev" href="qtgui.html" />
+    <link rel="contents" href="modules.html" />
+    <link rel="next" href="qtopengl.html" />
+</head>
+<body>
+<h1 align="center">QtNetwork Classes</h1>
+<p><table width="100%">
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QAbstractSocket</b></td><td>The base functionality common to all socket types</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QFtp</b></td><td>Implementation of the FTP protocol</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QHostAddress</b></td><td>IP address</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QHostInfo</b></td><td>Static functions for host name lookups</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QHttp</b></td><td>Implementation of the HTTP protocol</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QHttpHeader</b></td><td>Header information for HTTP</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QHttpRequestHeader</b></td><td>Request header information for HTTP</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QHttpResponseHeader</b></td><td>Response header information for HTTP</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTcpServer</b></td><td>TCP-based server</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QTcpSocket</b></td><td>TCP socket</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QUdpSocket</b></td><td>UDP socket</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QUrlInfo</b></td><td>Stores information about URLs</td></tr>
+</table></p>
+</body>
+</html>
diff --git a/doc/src/snippets/dockwidgets/Resources/qtopengl.html b/doc/src/snippets/dockwidgets/Resources/qtopengl.html
new file mode 100644
index 0000000000..c42c4ae261
--- /dev/null
+++ b/doc/src/snippets/dockwidgets/Resources/qtopengl.html
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!-- /home/dboddie/dev/qt-4.0/doc/src/classes.qdoc -->
+<head>
+    <title>Qt 4.0: QtOpenGL Classes</title>
+    <style>h3.fn,span.fn { margin-left: 1cm; text-indent: -1cm; }
+a:link { color: #004faf; text-decoration: none }
+a:visited { color: #672967; text-decoration: none }
+td.postheader { font-family: sans-serif }
+tr.address { font-family: sans-serif }
+body { background: #ffffff; color: black; }</style>
+    <link rel="prev" href="qtnetwork.html" />
+    <link rel="contents" href="modules.html" />
+    <link rel="next" href="qtsql.html" />
+</head>
+<body>
+<h1 align="center">QtOpenGL Classes</h1>
+<p><table width="100%">
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QGLColormap</b></td><td>Used for installing custom colormaps into QGLWidgets</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QGLContext</b></td><td>Encapsulates an OpenGL rendering context</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QGLFormat</b></td><td>The display format of an OpenGL rendering context</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QGLWidget</b></td><td>Widget for rendering OpenGL graphics</td></tr>
+</table></p>
+</body>
+</html>
diff --git a/doc/src/snippets/dockwidgets/Resources/qtsql.html b/doc/src/snippets/dockwidgets/Resources/qtsql.html
new file mode 100644
index 0000000000..db44d6d36b
--- /dev/null
+++ b/doc/src/snippets/dockwidgets/Resources/qtsql.html
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!-- /home/dboddie/dev/qt-4.0/doc/src/classes.qdoc -->
+<head>
+    <title>Qt 4.0: QtSql Classes</title>
+    <style>h3.fn,span.fn { margin-left: 1cm; text-indent: -1cm; }
+a:link { color: #004faf; text-decoration: none }
+a:visited { color: #672967; text-decoration: none }
+td.postheader { font-family: sans-serif }
+tr.address { font-family: sans-serif }
+body { background: #ffffff; color: black; }</style>
+    <link rel="prev" href="qtopengl.html" />
+    <link rel="contents" href="modules.html" />
+    <link rel="next" href="qtxml.html" />
+</head>
+<body>
+<h1 align="center">QtSql Classes</h1>
+<p><table width="100%">
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSqlDatabase</b></td><td>Represents a connection to a database</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSqlDriver</b></td><td>Abstract base class for accessing specific SQL databases</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSqlDriverCreator</b></td><td>Template class that provides a SQL driver factory for a specific driver type</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSqlDriverCreatorBase</b></td><td>The base class for SQL driver factories</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSqlDriverPlugin</b></td><td>Abstract base for custom QSqlDriver plugins</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSqlError</b></td><td>SQL database error information</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSqlField</b></td><td>Manipulates the fields in SQL database tables and views</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSqlIndex</b></td><td>Functions to manipulate and describe database indexes</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSqlQuery</b></td><td>Means of executing and manipulating SQL statements</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSqlQueryModel</b></td><td>Read-only data model for SQL result sets</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSqlRecord</b></td><td>Encapsulates a database record</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSqlRelation</b></td><td>Stores information about an SQL foreign key</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSqlRelationalDelegate</b></td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSqlRelationalTableModel</b></td><td>Editable data model for a single database table, with foreign key support</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSqlResult</b></td><td>Abstract interface for accessing data from specific SQL databases</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QSqlTableModel</b></td><td>Editable data model for a single database table</td></tr>
+</table></p>
+</body>
+</html>
diff --git a/doc/src/snippets/dockwidgets/Resources/qtxml.html b/doc/src/snippets/dockwidgets/Resources/qtxml.html
new file mode 100644
index 0000000000..d10d542377
--- /dev/null
+++ b/doc/src/snippets/dockwidgets/Resources/qtxml.html
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!-- /home/dboddie/dev/qt-4.0/doc/src/classes.qdoc -->
+<head>
+    <title>Qt 4.0: QtXml Classes</title>
+    <style>h3.fn,span.fn { margin-left: 1cm; text-indent: -1cm; }
+a:link { color: #004faf; text-decoration: none }
+a:visited { color: #672967; text-decoration: none }
+td.postheader { font-family: sans-serif }
+tr.address { font-family: sans-serif }
+body { background: #ffffff; color: black; }</style>
+    <link rel="prev" href="qtsql.html" />
+    <link rel="contents" href="modules.html" />
+</head>
+<body>
+<h1 align="center">QtXml Classes</h1>
+<p><table width="100%">
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDomAttr</b></td><td>Represents one attribute of a QDomElement</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDomCDATASection</b></td><td>Represents an XML CDATA section</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDomCharacterData</b></td><td>Represents a generic string in the DOM</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDomComment</b></td><td>Represents an XML comment</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDomDocument</b></td><td>Represents an XML document</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDomDocumentFragment</b></td><td>Tree of QDomNodes which is not usually a complete QDomDocument</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDomDocumentType</b></td><td>The representation of the DTD in the document tree</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDomElement</b></td><td>Represents one element in the DOM tree</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDomEntity</b></td><td>Represents an XML entity</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDomEntityReference</b></td><td>Represents an XML entity reference</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDomImplementation</b></td><td>Information about the features of the DOM implementation</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDomNamedNodeMap</b></td><td>Collection of nodes that can be accessed by name</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDomNode</b></td><td>The base class for all the nodes in a DOM tree</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDomNodeList</b></td><td>List of QDomNode objects</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDomNotation</b></td><td>Represents an XML notation</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDomProcessingInstruction</b></td><td>Represents an XML processing instruction</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QDomText</b></td><td>Represents text data in the parsed XML document</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QXmlAttributes</b></td><td>XML attributes</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QXmlContentHandler</b></td><td>Interface to report the logical content of XML data</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QXmlDTDHandler</b></td><td>Interface to report DTD content of XML data</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QXmlDeclHandler</b></td><td>Interface to report declaration content of XML data</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QXmlDefaultHandler</b></td><td>Default implementation of all the XML handler classes</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QXmlEntityResolver</b></td><td>Interface to resolve external entities contained in XML data</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QXmlErrorHandler</b></td><td>Interface to report errors in XML data</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QXmlInputSource</b></td><td>The input data for the QXmlReader subclasses</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QXmlLexicalHandler</b></td><td>Interface to report the lexical content of XML data</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QXmlLocator</b></td><td>The XML handler classes with information about the parsing position within a file</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QXmlNamespaceSupport</b></td><td>Helper class for XML readers which want to include namespace support</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QXmlParseException</b></td><td>Used to report errors with the QXmlErrorHandler interface</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QXmlReader</b></td><td>Interface for XML readers (i.e. parsers)</td></tr>
+<tr valign="top" bgcolor="#f0f0f0"><td><b>QXmlSimpleReader</b></td><td>Implementation of a simple XML parser</td></tr>
+</table></p>
+</body>
+</html>
diff --git a/doc/src/snippets/dockwidgets/Resources/titles.txt b/doc/src/snippets/dockwidgets/Resources/titles.txt
new file mode 100644
index 0000000000..016825d874
--- /dev/null
+++ b/doc/src/snippets/dockwidgets/Resources/titles.txt
@@ -0,0 +1,7 @@
+Qt Classes by Module		:/Resources/modules.html
+QtCore				:/Resources/qtcore.html
+QtGui				:/Resources/qtgui.html
+QtNetwork			:/Resources/qtnetwork.html
+QtOpenGL			:/Resources/qtopengl.html
+QtSql				:/Resources/qtsql.html
+QtXml				:/Resources/qtxml.html
diff --git a/doc/src/snippets/dockwidgets/dockwidgets.pro b/doc/src/snippets/dockwidgets/dockwidgets.pro
new file mode 100644
index 0000000000..11d80f3f46
--- /dev/null
+++ b/doc/src/snippets/dockwidgets/dockwidgets.pro
@@ -0,0 +1,4 @@
+HEADERS     = mainwindow.h
+RESOURCES   = dockwidgets.qrc
+SOURCES     = main.cpp \
+              mainwindow.cpp
diff --git a/doc/src/snippets/dockwidgets/dockwidgets.qrc b/doc/src/snippets/dockwidgets/dockwidgets.qrc
new file mode 100644
index 0000000000..8c462a517d
--- /dev/null
+++ b/doc/src/snippets/dockwidgets/dockwidgets.qrc
@@ -0,0 +1,12 @@
+<RCC>
+    <qresource>
+        <file>Resources/titles.txt</file>
+        <file>Resources/modules.html</file>
+        <file>Resources/qtcore.html</file>
+        <file>Resources/qtgui.html</file>
+        <file>Resources/qtnetwork.html</file>
+        <file>Resources/qtopengl.html</file>
+        <file>Resources/qtsql.html</file>
+        <file>Resources/qtxml.html</file>
+    </qresource>
+</RCC>
diff --git a/doc/src/snippets/dockwidgets/main.cpp b/doc/src/snippets/dockwidgets/main.cpp
new file mode 100644
index 0000000000..7dfd2f4ade
--- /dev/null
+++ b/doc/src/snippets/dockwidgets/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QMainWindow *window = new MainWindow;
+    window->show();
+    window->resize(640, 480);
+    return app.exec();
+}
diff --git a/doc/src/snippets/dockwidgets/mainwindow.cpp b/doc/src/snippets/dockwidgets/mainwindow.cpp
new file mode 100644
index 0000000000..ec803030a9
--- /dev/null
+++ b/doc/src/snippets/dockwidgets/mainwindow.cpp
@@ -0,0 +1,123 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent)
+{
+    setWindowTitle("Dock Widgets");
+
+    setupDockWindow();
+    setupContents();
+    setupMenus();
+
+    textBrowser = new QTextBrowser(this);
+
+    connect(headingList, SIGNAL(itemClicked(QListWidgetItem *)),
+            this, SLOT(updateText(QListWidgetItem *)));
+
+    updateText(headingList->item(0));
+    headingList->setCurrentRow(0);
+    setCentralWidget(textBrowser);
+}
+
+void MainWindow::setupContents()
+{
+    QFile titlesFile(":/Resources/titles.txt");
+    titlesFile.open(QFile::ReadOnly);
+    int chapter = 0;
+
+    do {
+        QString line = titlesFile.readLine().trimmed();
+        QStringList parts = line.split("\t", QString::SkipEmptyParts);
+        if (parts.size() != 2)
+            break;
+
+        QString chapterTitle = parts[0];
+        QString fileName = parts[1];
+
+        QFile chapterFile(fileName);
+
+        chapterFile.open(QFile::ReadOnly);
+        QListWidgetItem *item = new QListWidgetItem(chapterTitle, headingList);
+        item->setData(Qt::DisplayRole, chapterTitle);
+        item->setData(Qt::UserRole, chapterFile.readAll());
+        item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
+        chapterFile.close();
+
+        chapter++;
+    } while (titlesFile.isOpen());
+
+    titlesFile.close();
+}
+
+void MainWindow::setupDockWindow()
+{
+//! [0]
+    contentsWindow = new QDockWidget(tr("Table of Contents"), this);
+    contentsWindow->setAllowedAreas(Qt::LeftDockWidgetArea
+                                  | Qt::RightDockWidgetArea);
+    addDockWidget(Qt::LeftDockWidgetArea, contentsWindow);
+
+    headingList = new QListWidget(contentsWindow);
+    contentsWindow->setWidget(headingList);
+//! [0]
+}
+
+void MainWindow::setupMenus()
+{
+    QAction *exitAct = new QAction(tr("E&xit"), this);
+    exitAct->setShortcut(tr("Ctrl+Q"));
+    exitAct->setStatusTip(tr("Exit the application"));
+    connect(exitAct, SIGNAL(triggered()), qApp, SLOT(closeAllWindows()));
+
+    QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
+    fileMenu->addAction(exitAct);
+}
+
+void MainWindow::updateText(QListWidgetItem *item)
+{
+    QString text = item->data(Qt::UserRole).toString();
+    textBrowser->setHtml(text);
+}
diff --git a/doc/src/snippets/dockwidgets/mainwindow.h b/doc/src/snippets/dockwidgets/mainwindow.h
new file mode 100644
index 0000000000..fffadd4429
--- /dev/null
+++ b/doc/src/snippets/dockwidgets/mainwindow.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+
+class QDockWidget;
+class QListWidget;
+class QListWidgetItem;
+class QTextBrowser;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+public:
+    MainWindow(QWidget *parent = 0);
+
+private slots:
+    void updateText(QListWidgetItem *item);
+
+private:
+    void setupContents();
+    void setupDockWindow();
+    void setupMenus();
+
+    QDockWidget *contentsWindow;
+    QListWidget *headingList;
+    QTextBrowser *textBrowser;
+};
+
+#endif
diff --git a/doc/src/snippets/draganddrop/draganddrop.pro b/doc/src/snippets/draganddrop/draganddrop.pro
new file mode 100644
index 0000000000..67bc32bd10
--- /dev/null
+++ b/doc/src/snippets/draganddrop/draganddrop.pro
@@ -0,0 +1,5 @@
+HEADERS     = dragwidget.h \
+              mainwindow.h
+SOURCES     = dragwidget.cpp \
+              main.cpp \
+              mainwindow.cpp
diff --git a/doc/src/snippets/draganddrop/dragwidget.cpp b/doc/src/snippets/draganddrop/dragwidget.cpp
new file mode 100644
index 0000000000..2fe3e5355b
--- /dev/null
+++ b/doc/src/snippets/draganddrop/dragwidget.cpp
@@ -0,0 +1,154 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "dragwidget.h"
+
+DragWidget::DragWidget(QWidget *parent)
+    : QFrame(parent)
+{
+    setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
+    dragDropLabel = new QLabel("", this);
+    dragDropLabel->setAlignment(Qt::AlignHCenter);
+
+    QHBoxLayout *layout = new QHBoxLayout(this);
+    layout->addStretch(0);
+    layout->addWidget(dragDropLabel);
+    layout->addStretch(0);
+
+    setAcceptDrops(true);
+}
+
+// Accept all actions, but deal with them separately later.
+//! [0]
+void DragWidget::dragEnterEvent(QDragEnterEvent *event)
+{
+    event->acceptProposedAction();
+}
+//! [0]
+
+//! [1]
+void DragWidget::dropEvent(QDropEvent *event)
+{
+    if (event->source() == this && event->possibleActions() & Qt::MoveAction)
+        return;
+//! [1]
+
+//! [2]
+    if (event->proposedAction() == Qt::MoveAction) {
+        event->acceptProposedAction();
+        // Process the data from the event.
+//! [2]
+        emit dragResult(tr("The data was moved here."));
+//! [3]
+    } else if (event->proposedAction() == Qt::CopyAction) {
+        event->acceptProposedAction();
+        // Process the data from the event.
+//! [3]
+        emit dragResult(tr("The data was copied here."));
+//! [4]
+    } else {
+        // Ignore the drop.
+        return;
+    }
+//! [4]
+    // End of quote
+
+    emit mimeTypes(event->mimeData()->formats());
+    setData(event->mimeData()->formats()[0],
+            event->mimeData()->data(event->mimeData()->formats()[0]));
+//! [5]
+}
+//! [5]
+
+//! [6]
+void DragWidget::mousePressEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton)
+        dragStartPosition = event->pos();
+}
+//! [6]
+
+//! [7]
+void DragWidget::mouseMoveEvent(QMouseEvent *event)
+{
+    if (!(event->buttons() & Qt::LeftButton))
+        return;
+    if ((event->pos() - dragStartPosition).manhattanLength()
+         < QApplication::startDragDistance())
+        return;
+
+    QDrag *drag = new QDrag(this);
+    QMimeData *mimeData = new QMimeData;
+
+    mimeData->setData(mimeType, data);
+    drag->setMimeData(mimeData);
+
+    Qt::DropAction dropAction = drag->exec(Qt::CopyAction | Qt::MoveAction);
+//! [7]
+
+    switch (dropAction) {
+        case Qt::CopyAction:
+            emit dragResult(tr("The text was copied."));
+            break;
+        case Qt::MoveAction:
+            emit dragResult(tr("The text was moved."));
+            break;
+        default:
+            emit dragResult(tr("Unknown action."));
+            break;
+    }
+//! [8]
+}
+//! [8]
+
+void DragWidget::setData(const QString &mimetype, const QByteArray &newData)
+{
+    mimeType = mimetype;
+    data = QByteArray(newData);
+
+    dragDropLabel->setText(tr("%1 bytes").arg(data.size()));
+
+    QStringList formats;
+    formats << mimetype;
+    emit mimeTypes(formats);
+}
diff --git a/doc/src/snippets/draganddrop/dragwidget.h b/doc/src/snippets/draganddrop/dragwidget.h
new file mode 100644
index 0000000000..07fd091d05
--- /dev/null
+++ b/doc/src/snippets/draganddrop/dragwidget.h
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DRAGWIDGET_H
+#define DRAGWIDGET_H
+
+#include <QByteArray>
+#include <QFrame>
+#include <QString>
+#include <QStringList>
+
+class QComboBox;
+class QFrame;
+class QLabel;
+class QTextBrowser;
+
+class DragWidget : public QFrame
+{
+    Q_OBJECT
+
+public:
+    DragWidget(QWidget *parent);
+    void setData(const QString &mimetype, const QByteArray &newData);
+
+signals:
+    void dragResult(const QString &actionText);
+    void mimeTypes(const QStringList &types);
+
+protected:
+    void dragEnterEvent(QDragEnterEvent *event);
+    void dropEvent(QDropEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+
+private:
+    QByteArray data;
+    QLabel *dragDropLabel;
+    QPoint dragStartPosition;
+    QString mimeType;
+};
+
+#endif
diff --git a/doc/src/snippets/draganddrop/main.cpp b/doc/src/snippets/draganddrop/main.cpp
new file mode 100644
index 0000000000..73a8bc665e
--- /dev/null
+++ b/doc/src/snippets/draganddrop/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *window1 = new MainWindow;
+    MainWindow *window2 = new MainWindow;
+    window1->show();
+    window2->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/draganddrop/mainwindow.cpp b/doc/src/snippets/draganddrop/mainwindow.cpp
new file mode 100644
index 0000000000..943b075bf4
--- /dev/null
+++ b/doc/src/snippets/draganddrop/mainwindow.cpp
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "dragwidget.h"
+#include "mainwindow.h"
+
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent)
+{
+    QFrame *centralWidget = new QFrame(this);
+
+    QLabel *mimeTypeLabel = new QLabel(tr("MIME types:"), centralWidget);
+    mimeTypeCombo = new QComboBox(centralWidget);
+
+    QLabel *dataLabel = new QLabel(tr("Amount of data (bytes):"), centralWidget);
+    dragWidget = new DragWidget(centralWidget);
+
+    connect(dragWidget, SIGNAL(mimeTypes(const QStringList &)),
+            this, SLOT(setMimeTypes(const QStringList &)));
+    connect(dragWidget, SIGNAL(dragResult(const QString &)),
+            this, SLOT(setDragResult(const QString &)));
+
+    QVBoxLayout *mainLayout = new QVBoxLayout(centralWidget);
+    mainLayout->addWidget(mimeTypeLabel);
+    mainLayout->addWidget(mimeTypeCombo);
+    mainLayout->addSpacing(32);
+    mainLayout->addWidget(dataLabel);
+    mainLayout->addWidget(dragWidget);
+
+    statusBar();
+    dragWidget->setData(QString("text/plain"), QByteArray("Hello world"));
+    setCentralWidget(centralWidget);
+    setWindowTitle(tr("Drag and Drop"));
+}
+
+void MainWindow::setDragResult(const QString &actionText)
+{
+    statusBar()->showMessage(actionText);
+}
+
+void MainWindow::setMimeTypes(const QStringList &types)
+{
+    mimeTypeCombo->clear();
+    mimeTypeCombo->addItems(types);
+}
diff --git a/doc/src/snippets/draganddrop/mainwindow.h b/doc/src/snippets/draganddrop/mainwindow.h
new file mode 100644
index 0000000000..789b54a0d1
--- /dev/null
+++ b/doc/src/snippets/draganddrop/mainwindow.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include <QPixmap>
+#include <QPoint>
+
+class QComboBox;
+class QLabel;
+class QLineEdit;
+class QMouseEvent;
+class QTextEdit;
+class DragWidget;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow(QWidget *parent = 0);
+
+public slots:
+    void setDragResult(const QString &actionText);
+    void setMimeTypes(const QStringList &types);
+
+private:
+    QComboBox *mimeTypeCombo;
+    DragWidget *dragWidget;
+};
+
+#endif
diff --git a/doc/src/snippets/dragging/dragging.pro b/doc/src/snippets/dragging/dragging.pro
new file mode 100644
index 0000000000..bedfc76ab2
--- /dev/null
+++ b/doc/src/snippets/dragging/dragging.pro
@@ -0,0 +1,4 @@
+HEADERS     = mainwindow.h
+RESOURCES   = images.qrc
+SOURCES     = main.cpp \
+              mainwindow.cpp
diff --git a/doc/src/snippets/dragging/images.qrc b/doc/src/snippets/dragging/images.qrc
new file mode 100644
index 0000000000..30b8a2986e
--- /dev/null
+++ b/doc/src/snippets/dragging/images.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+   <file>images/file.png</file>
+</qresource>
+</RCC>
diff --git a/doc/src/snippets/dragging/images/file.png b/doc/src/snippets/dragging/images/file.png
new file mode 100644
index 0000000000..9520080ed0
--- /dev/null
+++ b/doc/src/snippets/dragging/images/file.png
diff --git a/doc/src/snippets/dragging/main.cpp b/doc/src/snippets/dragging/main.cpp
new file mode 100644
index 0000000000..19c7c203d8
--- /dev/null
+++ b/doc/src/snippets/dragging/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *window = new MainWindow;
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/dragging/mainwindow.cpp b/doc/src/snippets/dragging/mainwindow.cpp
new file mode 100644
index 0000000000..8c79895d30
--- /dev/null
+++ b/doc/src/snippets/dragging/mainwindow.cpp
@@ -0,0 +1,111 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent)
+{
+    QFrame *centralFrame = new QFrame(this);
+
+    QLabel *nameLabel = new QLabel(tr("Comment:"), centralFrame);
+    commentEdit = new QTextEdit(centralFrame);
+    QLabel *dragLabel = new QLabel(tr("<p>Drag the icon to a filer "
+                                      "window or the desktop background:</p>"),
+                                      centralFrame);
+    iconLabel = new QLabel(centralFrame);
+    iconPixmap.load(":/images/file.png");
+    iconLabel->setPixmap(iconPixmap);
+
+    QGridLayout *grid = new QGridLayout(centralFrame);
+    grid->addWidget(nameLabel, 0, 0);
+    grid->addWidget(commentEdit, 1, 0, 1, 2);
+    grid->addWidget(dragLabel, 2, 0);
+    grid->addWidget(iconLabel, 2, 1);
+
+    statusBar();
+    setCentralWidget(centralFrame);
+    setWindowTitle(tr("Dragging"));
+}
+
+//! [0]
+void MainWindow::mousePressEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton
+        && iconLabel->geometry().contains(event->pos())) {
+
+//! [1]
+        QDrag *drag = new QDrag(this);
+        QMimeData *mimeData = new QMimeData;
+
+        mimeData->setText(commentEdit->toPlainText());
+        drag->setMimeData(mimeData);
+//! [1]
+        drag->setPixmap(iconPixmap);
+
+        Qt::DropAction dropAction = drag->exec();
+//! [0]
+
+        QString actionText;
+        switch (dropAction) {
+            case Qt::CopyAction:
+                actionText = tr("The text was copied.");
+                break;
+            case Qt::MoveAction:
+                actionText = tr("The text was moved.");
+                break;
+            case Qt::LinkAction:
+                actionText = tr("The text was linked.");
+                break;
+            case Qt::IgnoreAction:
+                actionText = tr("The drag was ignored.");
+                break;
+            default:
+                actionText = tr("Unknown action.");
+                break;
+        }
+        statusBar()->showMessage(actionText);
+//! [2]
+    }
+}
+//! [2]
diff --git a/doc/src/snippets/dragging/mainwindow.h b/doc/src/snippets/dragging/mainwindow.h
new file mode 100644
index 0000000000..6c90e60e35
--- /dev/null
+++ b/doc/src/snippets/dragging/mainwindow.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include <QPixmap>
+#include <QPoint>
+
+class QLabel;
+class QLineEdit;
+class QMouseEvent;
+class QTextEdit;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow(QWidget *parent = 0);
+
+protected:
+    void mousePressEvent(QMouseEvent *event);
+
+private:
+    QLabel *iconLabel;
+    QLineEdit *nameEdit;
+    QPixmap iconPixmap;
+    QPoint dragStartPosition;
+    QTextEdit *commentEdit;
+};
+
+#endif
diff --git a/doc/src/snippets/dropactions/dropactions.pro b/doc/src/snippets/dropactions/dropactions.pro
new file mode 100644
index 0000000000..6283406f25
--- /dev/null
+++ b/doc/src/snippets/dropactions/dropactions.pro
@@ -0,0 +1,3 @@
+HEADERS     = window.h
+SOURCES     = main.cpp \
+              window.cpp
diff --git a/doc/src/snippets/dropactions/main.cpp b/doc/src/snippets/dropactions/main.cpp
new file mode 100644
index 0000000000..e10789cb5d
--- /dev/null
+++ b/doc/src/snippets/dropactions/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Window *window = new Window;
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/dropactions/window.cpp b/doc/src/snippets/dropactions/window.cpp
new file mode 100644
index 0000000000..c790f9b0bf
--- /dev/null
+++ b/doc/src/snippets/dropactions/window.cpp
@@ -0,0 +1,106 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+
+Window::Window(QWidget *parent)
+    : QWidget(parent)
+{
+    QLabel *textLabel = new QLabel(tr("Data:"), this);
+    textBrowser = new QTextBrowser(this);
+
+    QLabel *mimeTypeLabel = new QLabel(tr("MIME types:"), this);
+    mimeTypeCombo = new QComboBox(this);
+
+    QVBoxLayout *layout = new QVBoxLayout(this);
+    layout->addWidget(textLabel);
+    layout->addWidget(textBrowser);
+    layout->addWidget(mimeTypeLabel);
+    layout->addWidget(mimeTypeCombo);
+/*
+    ...
+    setAcceptDrops(true);
+*/
+    setAcceptDrops(true);
+    setWindowTitle(tr("Drop Actions"));
+}
+
+void Window::dragEnterEvent(QDragEnterEvent *event)
+{
+    if (event->mimeData()->hasFormat("text/plain"))
+        event->acceptProposedAction();
+}
+
+void Window::dropEvent(QDropEvent *event)
+{
+    QMenu actionMenu(this);
+    QAction *copyAction = 0;
+    QAction *moveAction = 0;
+    QAction *linkAction = 0;
+    QAction *ignoreAction = 0;
+    if (event->possibleActions() & Qt::CopyAction)
+        copyAction = actionMenu.addAction(tr("Copy"));
+    if (event->possibleActions() & Qt::MoveAction)
+        moveAction = actionMenu.addAction(tr("Move"));
+    if (event->possibleActions() & Qt::LinkAction)
+        linkAction = actionMenu.addAction(tr("Link"));
+    if (event->possibleActions() & Qt::IgnoreAction)
+        ignoreAction = actionMenu.addAction(tr("Ignore"));
+
+    QAction *result = actionMenu.exec(QCursor::pos());
+
+    if (copyAction && result == copyAction)
+        event->setDropAction(Qt::CopyAction);
+    else if (moveAction && result == moveAction)
+        event->setDropAction(Qt::MoveAction);
+    else if (linkAction && result == linkAction)
+        event->setDropAction(Qt::LinkAction);
+    else {
+        event->setDropAction(Qt::IgnoreAction);
+        return;
+    }
+
+    textBrowser->setPlainText(event->mimeData()->text());
+    mimeTypeCombo->clear();
+    mimeTypeCombo->addItems(event->mimeData()->formats());
+}
diff --git a/doc/src/snippets/dropactions/window.h b/doc/src/snippets/dropactions/window.h
new file mode 100644
index 0000000000..4bbec4082f
--- /dev/null
+++ b/doc/src/snippets/dropactions/window.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QString>
+#include <QStringList>
+#include <QWidget>
+
+class QComboBox;
+class QFrame;
+class QTextBrowser;
+
+class Window : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Window(QWidget *parent = 0);
+
+protected:
+    void dragEnterEvent(QDragEnterEvent *event);
+    void dropEvent(QDropEvent *event);
+
+private:
+    QComboBox *mimeTypeCombo;
+    QFrame *dropFrame;
+    QTextBrowser *textBrowser;
+    QString oldText;
+    QStringList oldMimeTypes;
+};
+
+#endif
diff --git a/doc/src/snippets/droparea.cpp b/doc/src/snippets/droparea.cpp
new file mode 100644
index 0000000000..48884350d2
--- /dev/null
+++ b/doc/src/snippets/droparea.cpp
@@ -0,0 +1,139 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** $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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "droparea.h"
+
+DropArea::DropArea(QWidget *parent)
+    : QLabel(parent)
+{
+    setMinimumSize(200, 200);
+    setFrameStyle(QFrame::Sunken | QFrame::StyledPanel);
+    setAlignment(Qt::AlignCenter);
+    setAcceptDrops(true);
+    setAutoFillBackground(true);
+    clear();
+}
+
+void DropArea::dragEnterEvent(QDragEnterEvent *event)
+{
+    setText(tr("<drop content>"));
+    setBackgroundRole(QPalette::Highlight);
+
+    event->acceptProposedAction();
+    emit changed(event->mimeData());
+}
+
+void DropArea::dragMoveEvent(QDragMoveEvent *event)
+{
+    event->acceptProposedAction();
+}
+
+void DropArea::dropEvent(QDropEvent *event)
+{
+    const QMimeData *mimeData = event->mimeData();
+
+    if (mimeData->hasImage()) {
+        setPixmap(qvariant_cast<QPixmap>(mimeData->imageData()));
+    } else if (mimeData->hasHtml()) {
+        setText(mimeData->html());
+        setTextFormat(Qt::RichText);
+    } else if (mimeData->hasText()) {
+        setText(mimeData->text());
+        setTextFormat(Qt::PlainText);
+    } else {
+        setText(tr("Cannot display data"));
+    }
+
+    setBackgroundRole(QPalette::Dark);
+    event->acceptProposedAction();
+}
+
+//![0]
+void DropArea::paste()
+{
+    const QClipboard *clipboard = QApplication::clipboard();
+    const QMimeData *mimeData = clipboard->mimeData();
+
+    if (mimeData->hasImage()) {
+        setPixmap(qvariant_cast<QPixmap>(mimeData->imageData()));
+    } else if (mimeData->hasHtml()) {
+        setText(mimeData->html());
+        setTextFormat(Qt::RichText);
+    } else if (mimeData->hasText()) {
+        setText(mimeData->text());
+        setTextFormat(Qt::PlainText);
+    } else {
+        setText(tr("Cannot display data"));
+    }
+//![0]
+
+    emit changed(mimeData);
+    setBackgroundRole(QPalette::Dark);
+    //event->acceptProposedAction();
+}
+
+void DropArea::dragLeaveEvent(QDragLeaveEvent *event)
+{
+    clear();
+    event->accept();
+}
+
+void DropArea::clear()
+{
+    setText(tr("<drop content>"));
+    setBackgroundRole(QPalette::Dark);
+
+    emit changed();
+}
+
+QPixmap DropArea::extractPixmap(const QByteArray &data, const QString &format)
+{
+    QList<QByteArray> imageFormats = QImageReader::supportedImageFormats();
+    QPixmap pixmap;
+
+    foreach (QByteArray imageFormat, imageFormats) {
+        if (format.mid(6) == QString(imageFormat)) {
+            pixmap.loadFromData(data, imageFormat);
+            break;
+        }
+    }
+    return pixmap;
+}
diff --git a/doc/src/snippets/dropevents/dropevents.pro b/doc/src/snippets/dropevents/dropevents.pro
new file mode 100644
index 0000000000..6283406f25
--- /dev/null
+++ b/doc/src/snippets/dropevents/dropevents.pro
@@ -0,0 +1,3 @@
+HEADERS     = window.h
+SOURCES     = main.cpp \
+              window.cpp
diff --git a/doc/src/snippets/dropevents/main.cpp b/doc/src/snippets/dropevents/main.cpp
new file mode 100644
index 0000000000..d71a9aff96
--- /dev/null
+++ b/doc/src/snippets/dropevents/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    Window *window = new Window;
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/dropevents/window.cpp b/doc/src/snippets/dropevents/window.cpp
new file mode 100644
index 0000000000..6db6da9e4d
--- /dev/null
+++ b/doc/src/snippets/dropevents/window.cpp
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+
+//! [0]
+Window::Window(QWidget *parent)
+    : QWidget(parent)
+{
+//! [0]
+    QLabel *textLabel = new QLabel(tr("Data:"), this);
+    textBrowser = new QTextBrowser(this);
+
+    QLabel *mimeTypeLabel = new QLabel(tr("MIME types:"), this);
+    mimeTypeCombo = new QComboBox(this);
+
+    QVBoxLayout *layout = new QVBoxLayout(this);
+    layout->addWidget(textLabel);
+    layout->addWidget(textBrowser);
+    layout->addWidget(mimeTypeLabel);
+    layout->addWidget(mimeTypeCombo);
+
+//! [1]
+    setAcceptDrops(true);
+//! [1]
+    setWindowTitle(tr("Drop Events"));
+//! [2]
+}
+//! [2]
+
+//! [3]
+void Window::dragEnterEvent(QDragEnterEvent *event)
+{
+    if (event->mimeData()->hasFormat("text/plain"))
+        event->acceptProposedAction();
+}
+//! [3]
+
+//! [4]
+void Window::dropEvent(QDropEvent *event)
+{
+    textBrowser->setPlainText(event->mimeData()->text());
+    mimeTypeCombo->clear();
+    mimeTypeCombo->addItems(event->mimeData()->formats());
+
+    event->acceptProposedAction();
+}
+//! [4]
diff --git a/doc/src/snippets/dropevents/window.h b/doc/src/snippets/dropevents/window.h
new file mode 100644
index 0000000000..4bbec4082f
--- /dev/null
+++ b/doc/src/snippets/dropevents/window.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QString>
+#include <QStringList>
+#include <QWidget>
+
+class QComboBox;
+class QFrame;
+class QTextBrowser;
+
+class Window : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Window(QWidget *parent = 0);
+
+protected:
+    void dragEnterEvent(QDragEnterEvent *event);
+    void dropEvent(QDropEvent *event);
+
+private:
+    QComboBox *mimeTypeCombo;
+    QFrame *dropFrame;
+    QTextBrowser *textBrowser;
+    QString oldText;
+    QStringList oldMimeTypes;
+};
+
+#endif
diff --git a/doc/src/snippets/droprectangle/droprectangle.pro b/doc/src/snippets/droprectangle/droprectangle.pro
new file mode 100644
index 0000000000..6283406f25
--- /dev/null
+++ b/doc/src/snippets/droprectangle/droprectangle.pro
@@ -0,0 +1,3 @@
+HEADERS     = window.h
+SOURCES     = main.cpp \
+              window.cpp
diff --git a/doc/src/snippets/droprectangle/main.cpp b/doc/src/snippets/droprectangle/main.cpp
new file mode 100644
index 0000000000..e10789cb5d
--- /dev/null
+++ b/doc/src/snippets/droprectangle/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Window *window = new Window;
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/droprectangle/window.cpp b/doc/src/snippets/droprectangle/window.cpp
new file mode 100644
index 0000000000..22859e8029
--- /dev/null
+++ b/doc/src/snippets/droprectangle/window.cpp
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+
+Window::Window(QWidget *parent)
+    : QWidget(parent)
+{
+    QLabel *textLabel = new QLabel(tr("Data:"), this);
+    textBrowser = new QTextBrowser(this);
+
+    QLabel *mimeTypeLabel = new QLabel(tr("MIME types:"), this);
+    mimeTypeCombo = new QComboBox(this);
+
+    dropFrame = new QFrame(this);
+    dropFrame->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
+    QLabel *dropLabel = new QLabel(tr("Drop items here"), dropFrame);
+    dropLabel->setAlignment(Qt::AlignHCenter);
+
+    QVBoxLayout *dropFrameLayout = new QVBoxLayout(dropFrame);
+    dropFrameLayout->addWidget(dropLabel);
+
+    QHBoxLayout *dropLayout = new QHBoxLayout;
+    dropLayout->addStretch(0);
+    dropLayout->addWidget(dropFrame);
+    dropLayout->addStretch(0);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout(this);
+    mainLayout->addWidget(textLabel);
+    mainLayout->addWidget(textBrowser);
+    mainLayout->addWidget(mimeTypeLabel);
+    mainLayout->addWidget(mimeTypeCombo);
+    mainLayout->addSpacing(32);
+    mainLayout->addLayout(dropLayout);
+
+    setAcceptDrops(true);
+    setWindowTitle(tr("Drop Rectangle"));
+}
+
+//! [0]
+void Window::dragMoveEvent(QDragMoveEvent *event)
+{
+    if (event->mimeData()->hasFormat("text/plain")
+        && event->answerRect().intersects(dropFrame->geometry()))
+
+        event->acceptProposedAction();
+}
+//! [0]
+
+void Window::dropEvent(QDropEvent *event)
+{
+    textBrowser->setPlainText(event->mimeData()->text());
+    mimeTypeCombo->clear();
+    mimeTypeCombo->addItems(event->mimeData()->formats());
+
+    event->acceptProposedAction();
+}
diff --git a/doc/src/snippets/droprectangle/window.h b/doc/src/snippets/droprectangle/window.h
new file mode 100644
index 0000000000..8406a8813f
--- /dev/null
+++ b/doc/src/snippets/droprectangle/window.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QString>
+#include <QStringList>
+#include <QWidget>
+
+class QComboBox;
+class QFrame;
+class QTextBrowser;
+
+class Window : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Window(QWidget *parent = 0);
+
+protected:
+    void dragMoveEvent(QDragMoveEvent *event);
+    void dropEvent(QDropEvent *event);
+
+private:
+    QComboBox *mimeTypeCombo;
+    QFrame *dropFrame;
+    QTextBrowser *textBrowser;
+    QString oldText;
+    QStringList oldMimeTypes;
+};
+
+#endif
diff --git a/doc/src/snippets/eventfilters/eventfilters.pro b/doc/src/snippets/eventfilters/eventfilters.pro
new file mode 100644
index 0000000000..b569a336e6
--- /dev/null
+++ b/doc/src/snippets/eventfilters/eventfilters.pro
@@ -0,0 +1,3 @@
+HEADERS   = filterobject.h
+SOURCES   = filterobject.cpp \
+            main.cpp
diff --git a/doc/src/snippets/eventfilters/filterobject.cpp b/doc/src/snippets/eventfilters/filterobject.cpp
new file mode 100644
index 0000000000..64930daa47
--- /dev/null
+++ b/doc/src/snippets/eventfilters/filterobject.cpp
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "filterobject.h"
+
+FilterObject::FilterObject(QObject *parent)
+    : QObject(parent), target(0)
+{
+}
+
+//! [0]
+bool FilterObject::eventFilter(QObject *object, QEvent *event)
+{
+    if (object == target && event->type() == QEvent::KeyPress) {
+        QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
+        if (keyEvent->key() == Qt::Key_Tab) {
+            // Special tab handling
+            return true;
+        } else
+            return false;
+    }
+    return false;
+}
+//! [0]
+
+void FilterObject::setFilteredObject(QObject *object)
+{
+    if (target)
+        target->removeEventFilter(this);
+
+    target = object;
+
+    if (target)
+        target->installEventFilter(this);
+}
diff --git a/doc/src/snippets/eventfilters/filterobject.h b/doc/src/snippets/eventfilters/filterobject.h
new file mode 100644
index 0000000000..599878444f
--- /dev/null
+++ b/doc/src/snippets/eventfilters/filterobject.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef FILTEROBJECT_H
+#define FILTEROBJECT_H
+
+#include <QObject>
+
+class FilterObject : public QObject
+{
+    Q_OBJECT
+
+public:
+    FilterObject(QObject *parent = 0);
+    bool eventFilter(QObject *object, QEvent *event);
+    void setFilteredObject(QObject *object);
+
+private:
+    QObject *target;
+};
+
+#endif
diff --git a/doc/src/snippets/eventfilters/main.cpp b/doc/src/snippets/eventfilters/main.cpp
new file mode 100644
index 0000000000..dafddc7b12
--- /dev/null
+++ b/doc/src/snippets/eventfilters/main.cpp
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QTextEdit>
+
+#include "filterobject.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QTextEdit editor;
+    FilterObject filter;
+    filter.setFilteredObject(&editor);
+    editor.show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/events/events.cpp b/doc/src/snippets/events/events.cpp
new file mode 100644
index 0000000000..e6045e66a4
--- /dev/null
+++ b/doc/src/snippets/events/events.cpp
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QCheckBox>
+#include <QMouseEvent>
+
+class MyCheckBox : public QCheckBox
+{
+public:
+    void mousePressEvent(QMouseEvent *event);
+};
+
+//! [0]
+void MyCheckBox::mousePressEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton) {
+        // handle left mouse button here
+    } else {
+        // pass on other buttons to base class
+        QCheckBox::mousePressEvent(event);
+    }
+}
+//! [0]
+
+class MyWidget : public QWidget
+{
+public:
+    bool event(QEvent *event);
+};
+
+static const int MyCustomEventType = 1099;
+
+class MyCustomEvent : public QEvent
+{
+public:
+    MyCustomEvent() : QEvent((QEvent::Type)MyCustomEventType) {}
+};
+
+//! [1]
+bool MyWidget::event(QEvent *event)
+{
+    if (event->type() == QEvent::KeyPress) {
+	QKeyEvent *ke = static_cast<QKeyEvent *>(event);
+	if (ke->key() == Qt::Key_Tab) {
+	    // special tab handling here
+	    return true;
+	}
+    } else if (event->type() == MyCustomEventType) {
+	MyCustomEvent *myEvent = static_cast<MyCustomEvent *>(event);
+	// custom event handling here
+	return true;
+    }
+
+    return QWidget::event(event);
+}
+//! [1]
+
+int main()
+{
+}
diff --git a/doc/src/snippets/events/events.pro b/doc/src/snippets/events/events.pro
new file mode 100644
index 0000000000..9c4087454b
--- /dev/null
+++ b/doc/src/snippets/events/events.pro
@@ -0,0 +1 @@
+SOURCES += events.cpp
diff --git a/doc/src/snippets/explicitlysharedemployee/employee.cpp b/doc/src/snippets/explicitlysharedemployee/employee.cpp
new file mode 100644
index 0000000000..e2476f97e8
--- /dev/null
+++ b/doc/src/snippets/explicitlysharedemployee/employee.cpp
@@ -0,0 +1,110 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "employee.h"
+
+//! [0]
+EmployeeData::EmployeeData()
+{
+    id = -1;
+    name = 0;
+}
+//! [0]
+
+//! [1]
+EmployeeData::EmployeeData(const EmployeeData &other)
+//! [1] //! [2]
+    : QSharedData(other)
+{
+    id = other.id;
+    if (other.name) {
+        name = new QString(*other.name);
+    } else {
+        name = 0;
+    }
+}
+//! [2]
+
+//! [3]
+EmployeeData::~EmployeeData()
+//! [3] //! [4]
+{
+    delete name;
+}
+//! [4]
+
+//! [5]
+Employee::Employee()
+//! [5] //! [6]
+{
+    d = new EmployeeData;
+}
+//! [6]
+
+//! [7]
+Employee::Employee(int id, const QString &name)
+//! [7] //! [8]
+{
+    d = new EmployeeData;
+    setId(id);
+    setName(name);
+}
+//! [8]
+
+//! [9]
+void Employee::setName(const QString &name)
+//! [9] //! [10]
+{
+    if (!d->name)
+        d->name = new QString;
+    *d->name = name;
+}
+//! [10]
+
+//! [11]
+QString Employee::name() const
+//! [11] //! [12]
+{
+    if (!d->name)
+        return QString();
+    return *d->name;
+}
+//! [12]
diff --git a/doc/src/snippets/explicitlysharedemployee/employee.h b/doc/src/snippets/explicitlysharedemployee/employee.h
new file mode 100644
index 0000000000..02ef134e39
--- /dev/null
+++ b/doc/src/snippets/explicitlysharedemployee/employee.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef EMPLOYEE_H
+#define EMPLOYEE_H
+
+#include <QSharedData>
+#include <QString>
+
+class EmployeeData : public QSharedData
+{
+public:
+    EmployeeData();
+    EmployeeData(const EmployeeData &other);
+    ~EmployeeData();
+
+    int id;
+    QString *name;
+};
+
+class Employee
+{
+public:
+    Employee();
+    Employee(int id, const QString &name);
+
+    void setId(int id) { d->id = id; }
+    void setName(const QString &name);
+
+    int id() const { return d->id; }
+    QString name() const;
+
+private:
+    QExplicitlySharedDataPointer<EmployeeData> d;
+};
+
+#endif
diff --git a/doc/src/snippets/explicitlysharedemployee/explicitlysharedemployee.pro b/doc/src/snippets/explicitlysharedemployee/explicitlysharedemployee.pro
new file mode 100644
index 0000000000..536a77de53
--- /dev/null
+++ b/doc/src/snippets/explicitlysharedemployee/explicitlysharedemployee.pro
@@ -0,0 +1,3 @@
+HEADERS = employee.h
+SOURCES = employee.cpp \
+          main.cpp
diff --git a/doc/src/snippets/explicitlysharedemployee/main.cpp b/doc/src/snippets/explicitlysharedemployee/main.cpp
new file mode 100644
index 0000000000..c3222bb973
--- /dev/null
+++ b/doc/src/snippets/explicitlysharedemployee/main.cpp
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "employee.h"
+
+int main()
+{
+    {
+        Employee e1(10, "Albrecht Durer");
+        Employee e2 = e1;
+        e1.setName("Hans Holbein");
+    }
+}
diff --git a/doc/src/snippets/file/file.cpp b/doc/src/snippets/file/file.cpp
new file mode 100644
index 0000000000..c4f59a2077
--- /dev/null
+++ b/doc/src/snippets/file/file.cpp
@@ -0,0 +1,124 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QFile>
+#include <QTextStream>
+
+static void process_line(const QByteArray &)
+{
+}
+
+static void process_line(const QString &)
+{
+}
+
+static void noStream_snippet()
+{
+//! [0]
+    QFile file("in.txt");
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+        return;
+
+    while (!file.atEnd()) {
+        QByteArray line = file.readLine();
+        process_line(line);
+    }
+//! [0]
+}
+
+static void readTextStream_snippet()
+{
+//! [1]
+    QFile file("in.txt");
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+        return;
+
+    QTextStream in(&file);
+    while (!in.atEnd()) {
+        QString line = in.readLine();
+        process_line(line);
+    }
+//! [1]
+}
+
+static void writeTextStream_snippet()
+{
+//! [2]
+    QFile file("out.txt");
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
+        return;
+
+    QTextStream out(&file);
+    out << "The magic number is: " << 49 << "\n";
+//! [2]
+}
+
+static void writeTextStream_snippet()
+{
+    QFile file("out.dat");
+    if (!file.open(QIODevice::WriteOnly))
+        return;
+
+    QDataStream out(&file);
+    out << "The magic number is: " << 49 << "\n";
+}
+
+static void readRegularEmptyFile_snippet()
+{
+//! [3]
+    QFile file("/proc/modules");
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+        return;
+
+    QTextStream in(&file);
+    QString line = in.readLine();
+    while (!line.isNull()) {
+        process_line(line);
+        line = in.readLine();
+    }
+//! [3]
+}
+
+int main()
+{
+    lineByLine_snippet();
+    writeStream_snippet();
+}
diff --git a/doc/src/snippets/file/file.pro b/doc/src/snippets/file/file.pro
new file mode 100644
index 0000000000..bda6a94679
--- /dev/null
+++ b/doc/src/snippets/file/file.pro
@@ -0,0 +1,14 @@
+######################################################################
+# Automatically generated by qmake (1.08a) Tue Jan 4 17:11:37 2005
+######################################################################
+
+TEMPLATE = app
+CONFIG -= moc
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += file.cpp
+CONFIG += qt warn_on debug  create_prl link_prl
+OBJECTS_DIR=.obj/debug-shared
+MOC_DIR=.moc/debug-shared
diff --git a/doc/src/snippets/filedialogurls.cpp b/doc/src/snippets/filedialogurls.cpp
new file mode 100644
index 0000000000..4b59590fc9
--- /dev/null
+++ b/doc/src/snippets/filedialogurls.cpp
@@ -0,0 +1,22 @@
+
+#include <QtGui>
+
+int main(int argv, char **args)
+{
+    QApplication app(argv, args);
+    
+//![0]
+    QList<QUrl> urls;
+    urls << QUrl::fromLocalFile("/home/gvatteka/dev/qt-45")
+         << QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::MusicLocation));
+
+    QFileDialog dialog;
+    dialog.setSidebarUrls(urls);
+    dialog.setFileMode(QFileDialog::AnyFile);
+    if(dialog.exec()) {
+        // ...
+    }
+//![0]
+
+    return app.exec();
+}
diff --git a/doc/src/snippets/fileinfo/fileinfo.pro b/doc/src/snippets/fileinfo/fileinfo.pro
new file mode 100644
index 0000000000..2705d1f9a6
--- /dev/null
+++ b/doc/src/snippets/fileinfo/fileinfo.pro
@@ -0,0 +1,11 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Thu Apr 3 11:48:36 2008
+######################################################################
+
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += main.cpp
diff --git a/doc/src/snippets/fileinfo/main.cpp b/doc/src/snippets/fileinfo/main.cpp
new file mode 100644
index 0000000000..f3bd741517
--- /dev/null
+++ b/doc/src/snippets/fileinfo/main.cpp
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QPushButton>
+#include <QFileInfo>
+#include <QDir>
+#include <QGroupBox>
+#include <QVBoxLayout>
+#include <QDebug>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+//! [0]
+    QFileInfo fileInfo1("~/examples/191697/.");
+    QFileInfo fileInfo2("~/examples/191697/..");
+    QFileInfo fileInfo3("~/examples/191697/main.cpp");
+//! [0]    
+//! [1]    
+    QFileInfo fileInfo4(".");
+    QFileInfo fileInfo5("..");
+    QFileInfo fileInfo6("main.cpp");
+//! [1]    
+
+    qDebug() << fileInfo1.fileName();
+    qDebug() << fileInfo2.fileName();
+    qDebug() << fileInfo3.fileName();
+    qDebug() << fileInfo4.fileName();
+    qDebug() << fileInfo5.fileName();
+    qDebug() << fileInfo6.fileName();
+
+    QPushButton* button1 = new QPushButton(fileInfo1.dir().path());
+    QPushButton* button2 = new QPushButton(fileInfo2.dir().path());
+    QPushButton* button3 = new QPushButton(fileInfo3.dir().path());
+    QPushButton* button4 = new QPushButton(fileInfo4.dir().path());
+    QPushButton* button5 = new QPushButton(fileInfo5.dir().path());
+    QPushButton* button6 = new QPushButton(fileInfo6.dir().path());
+
+    QVBoxLayout* vbox = new QVBoxLayout;
+    vbox->addWidget(button1);
+    vbox->addWidget(button2);
+    vbox->addWidget(button3);
+    vbox->addWidget(button4);
+    vbox->addWidget(button5);
+    vbox->addWidget(button6);
+    vbox->addStretch(1);
+
+    QGroupBox *groupBox = new QGroupBox("QFileInfo::dir() test");
+    groupBox->setLayout(vbox);
+    groupBox->show();
+
+    return app.exec();
+}
diff --git a/doc/src/snippets/graphicssceneadditemsnippet.cpp b/doc/src/snippets/graphicssceneadditemsnippet.cpp
new file mode 100644
index 0000000000..e5ef2240ab
--- /dev/null
+++ b/doc/src/snippets/graphicssceneadditemsnippet.cpp
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+class CustomScene : public QGraphicsScene
+{
+public:
+    CustomScene()
+        { addItem(new QGraphicsEllipseItem(QRect(10, 10, 30, 30))); }
+
+    void drawItems(QPainter *painter, int numItems, QGraphicsItem *items[],
+                   const QStyleOptionGraphicsItem options[],
+                   QWidget *widget = 0);
+};
+
+//! [0]
+void CustomScene::drawItems(QPainter *painter, int numItems,
+                            QGraphicsItem *items[],
+                            const QStyleOptionGraphicsItem options[],
+                            QWidget *widget)
+{
+    for (int i = 0; i < numItems; ++i) {
+         // Draw the item
+         painter->save();
+         painter->setMatrix(items[i]->sceneMatrix(), true);
+         items[i]->paint(painter, &options[i], widget);
+         painter->restore();
+     }
+}
+//! [0]
+
+int main(int argv, char **args)
+{
+    QApplication app(argv, args);
+
+    CustomScene scene;
+    QGraphicsView view(&scene);
+
+    view.show();
+
+    return app.exec();
+}
diff --git a/doc/src/snippets/i18n-non-qt-class/i18n-non-qt-class.pro b/doc/src/snippets/i18n-non-qt-class/i18n-non-qt-class.pro
new file mode 100644
index 0000000000..9abd1e8802
--- /dev/null
+++ b/doc/src/snippets/i18n-non-qt-class/i18n-non-qt-class.pro
@@ -0,0 +1,7 @@
+HEADERS       = myclass.h
+RESOURCES     = resources.qrc
+SOURCES       = main.cpp \
+                myclass.cpp
+TRANSLATIONS  = translations/i18n-non-qt-class_en.ts \
+                translations/i18n-non-qt-class_fr.ts
+QT -= gui
diff --git a/doc/src/snippets/i18n-non-qt-class/main.cpp b/doc/src/snippets/i18n-non-qt-class/main.cpp
new file mode 100644
index 0000000000..3f402e1d64
--- /dev/null
+++ b/doc/src/snippets/i18n-non-qt-class/main.cpp
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore>
+#include "myclass.h"
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication app(argc, argv);
+
+    QTranslator translator;
+    translator.load(":/translations/i18n-non-qt-class_" + QLocale::system().name());
+    app.installTranslator(&translator);
+
+    MyClass instance;
+    return 0;
+}
diff --git a/doc/src/snippets/i18n-non-qt-class/myclass.cpp b/doc/src/snippets/i18n-non-qt-class/myclass.cpp
new file mode 100644
index 0000000000..2bbe55fc0b
--- /dev/null
+++ b/doc/src/snippets/i18n-non-qt-class/myclass.cpp
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <iostream>
+#include "myclass.h"
+
+MyClass::MyClass()
+{
+    std::cout << tr("Hello Qt!\n").toLocal8Bit().constData();
+}
diff --git a/doc/src/snippets/i18n-non-qt-class/myclass.h b/doc/src/snippets/i18n-non-qt-class/myclass.h
new file mode 100644
index 0000000000..41d580eb48
--- /dev/null
+++ b/doc/src/snippets/i18n-non-qt-class/myclass.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MYCLASS_H
+#define MYCLASS_H
+
+#include <QCoreApplication>
+
+//! [0]
+class MyClass
+{
+    Q_DECLARE_TR_FUNCTIONS(MyClass)
+
+public:
+    MyClass();
+//! [0]
+    /* ... */
+//! [1]
+};
+//! [1]
+
+#endif
diff --git a/doc/src/snippets/i18n-non-qt-class/myclass.ts b/doc/src/snippets/i18n-non-qt-class/myclass.ts
new file mode 100644
index 0000000000..9bd90f2441
--- /dev/null
+++ b/doc/src/snippets/i18n-non-qt-class/myclass.ts
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="1.1">
+<context>
+    <name>MyClass</name>
+    <message>
+        <location filename="myclass.cpp" line="6"/>
+        <source>Hello Qt!
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/doc/src/snippets/i18n-non-qt-class/resources.qrc b/doc/src/snippets/i18n-non-qt-class/resources.qrc
new file mode 100644
index 0000000000..903ac8578b
--- /dev/null
+++ b/doc/src/snippets/i18n-non-qt-class/resources.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>translations/i18n-non-qt-class_en.qm</file>
+    <file>translations/i18n-non-qt-class_fr.qm</file>
+</qresource>
+</RCC>
diff --git a/doc/src/snippets/i18n-non-qt-class/translations/i18n-non-qt-class_en.ts b/doc/src/snippets/i18n-non-qt-class/translations/i18n-non-qt-class_en.ts
new file mode 100644
index 0000000000..54f188694c
--- /dev/null
+++ b/doc/src/snippets/i18n-non-qt-class/translations/i18n-non-qt-class_en.ts
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="1.1">
+<context>
+    <name>MyClass</name>
+    <message>
+        <location filename="../myclass.cpp" line="6"/>
+        <source>Hello Qt!
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/doc/src/snippets/i18n-non-qt-class/translations/i18n-non-qt-class_fr.ts b/doc/src/snippets/i18n-non-qt-class/translations/i18n-non-qt-class_fr.ts
new file mode 100644
index 0000000000..3f3cebc230
--- /dev/null
+++ b/doc/src/snippets/i18n-non-qt-class/translations/i18n-non-qt-class_fr.ts
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="1.1" language="fr">
+<context>
+    <name>MyClass</name>
+    <message>
+        <location filename="../myclass.cpp" line="6"/>
+        <source>Hello Qt!
+</source>
+        <translation>Bonjour Qt!
+</translation>
+    </message>
+</context>
+</TS>
diff --git a/doc/src/snippets/image/image.cpp b/doc/src/snippets/image/image.cpp
new file mode 100644
index 0000000000..75d84f6893
--- /dev/null
+++ b/doc/src/snippets/image/image.cpp
@@ -0,0 +1,105 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+int main()
+{
+    int x, y;
+    {
+        // BIT ACCESS
+        QImage image;
+        // sets bit at (x, y) to 1
+        if (image.format() == QImage::Format_MonoLSB)
+            image.scanLine(y)[x >> 3] |= 1 << (x & 7);
+        else
+            image.scanLine(y)[x >> 3] |= 1 << (7 - (x & 7));
+    }
+
+    {
+        // 8-BIT ACCESS
+        QImage image;
+        // set entry 19 in the color table to yellow
+        image.setColor(19, qRgb(255, 255, 0));
+
+        // set 8 bit pixel at (x,y) to value yellow (in color table)
+        image.scanLine(y)[x] = 19;
+    }
+
+    {
+        // 32-BIT
+        QImage image;
+        // sets 32 bit pixel at (x,y) to yellow.
+        uint *ptr = reinterpret_cast<uint *>(image.scanLine(y)) + x;
+        *ptr = qRgb(255, 255, 0);
+    }
+
+    {
+        // SAVE
+//! [0]
+        QImage image;
+        QByteArray ba;
+        QBuffer buffer(&ba);
+        buffer.open(QIODevice::WriteOnly);
+        image.save(&buffer, "PNG"); // writes image into ba in PNG format
+//! [0]
+    }
+
+    {
+        // PIX SAVE
+//! [1]
+        QPixmap pixmap;
+        QByteArray bytes;
+        QBuffer buffer(&bytes);
+        buffer.open(QIODevice::WriteOnly);
+        pixmap.save(&buffer, "PNG"); // writes pixmap into bytes in PNG format
+//! [1]
+    }
+
+    {
+        // MASK
+//! [2]
+        QPixmap alpha("image-with-alpha.png");
+        QPixmap alphacopy = alpha;
+        alphacopy.setMask(alphacopy.mask());
+//! [2]
+    }
+}
diff --git a/doc/src/snippets/image/image.pro b/doc/src/snippets/image/image.pro
new file mode 100644
index 0000000000..0df436abee
--- /dev/null
+++ b/doc/src/snippets/image/image.pro
@@ -0,0 +1 @@
+SOURCES += image.cpp
diff --git a/doc/src/snippets/image/supportedformat.cpp b/doc/src/snippets/image/supportedformat.cpp
new file mode 100644
index 0000000000..2335a94f34
--- /dev/null
+++ b/doc/src/snippets/image/supportedformat.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+int main(int argv, char **args)
+{
+//! [0]
+	QImageWriter writer;
+	writer.setFormat("png");
+	if (writer.supportsOption(QImageIOHandler::Description))
+	    qDebug() << "Png supports embedded text";
+//! [0]
+    return 0;
+}
diff --git a/doc/src/snippets/inherited-slot/button.cpp b/doc/src/snippets/inherited-slot/button.cpp
new file mode 100644
index 0000000000..bbb3e70c79
--- /dev/null
+++ b/doc/src/snippets/inherited-slot/button.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QDebug>
+#include "button.h"
+
+Button::Button(QWidget *parent)
+    : QPushButton(parent)
+{
+}
+
+void Button::animateClick()
+{
+    qDebug() << "Extra code goes here...";
+    QPushButton::animateClick();
+}
diff --git a/doc/src/snippets/inherited-slot/button.h b/doc/src/snippets/inherited-slot/button.h
new file mode 100644
index 0000000000..7f43ede02a
--- /dev/null
+++ b/doc/src/snippets/inherited-slot/button.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QPushButton>
+
+//! [Button class with reimplemented slot]
+class Button : public QPushButton
+{
+    Q_OBJECT
+
+public:
+    Button(QWidget *parent = 0);
+
+public slots:
+    void animateClick();
+};
+//! [Button class with reimplemented slot]
+
+#endif
diff --git a/doc/src/snippets/inherited-slot/inherited-slot.pro b/doc/src/snippets/inherited-slot/inherited-slot.pro
new file mode 100644
index 0000000000..702e9cc9c2
--- /dev/null
+++ b/doc/src/snippets/inherited-slot/inherited-slot.pro
@@ -0,0 +1,3 @@
+HEADERS   = button.h
+SOURCES   = main.cpp \
+            button.cpp
diff --git a/doc/src/snippets/inherited-slot/main.cpp b/doc/src/snippets/inherited-slot/main.cpp
new file mode 100644
index 0000000000..999328b5ec
--- /dev/null
+++ b/doc/src/snippets/inherited-slot/main.cpp
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QDebug>
+#include <QHBoxLayout>
+#include <QLineEdit>
+#include <QMetaMethod>
+#include <QWidget>
+#include "button.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QWidget window;
+    QHBoxLayout *layout = new QHBoxLayout(&window);
+    QLineEdit *lineEdit = new QLineEdit;
+    Button *button = new Button;
+
+    QObject::connect(lineEdit, SIGNAL(returnPressed()), button, SLOT(animateClick()));
+
+    layout->addWidget(lineEdit);
+    layout->addWidget(button);
+    window.show();
+
+    for (int i = 0; i < button->metaObject()->methodCount(); ++i)
+        qDebug() << i << button->metaObject()->method(i).signature();
+    return app.exec();
+}
diff --git a/doc/src/snippets/itemselection/itemselection.pro b/doc/src/snippets/itemselection/itemselection.pro
new file mode 100644
index 0000000000..b1126bfe73
--- /dev/null
+++ b/doc/src/snippets/itemselection/itemselection.pro
@@ -0,0 +1,3 @@
+HEADERS     = model.h
+SOURCES     = main.cpp \
+              model.cpp
diff --git a/doc/src/snippets/itemselection/main.cpp b/doc/src/snippets/itemselection/main.cpp
new file mode 100644
index 0000000000..a337008f79
--- /dev/null
+++ b/doc/src/snippets/itemselection/main.cpp
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+  main.cpp
+
+  A simple example that shows how selections can be used directly on a model.
+  It shows the result of some selections made using a table view.
+*/
+
+#include <QApplication>
+#include <QItemSelection>
+#include <QItemSelectionModel>
+#include <QTableView>
+
+#include "model.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+//! [0]
+    TableModel *model = new TableModel(8, 4, &app);
+
+    QTableView *table = new QTableView(0);
+    table->setModel(model);
+
+    QItemSelectionModel *selectionModel = table->selectionModel();
+//! [0] //! [1]
+    QModelIndex topLeft;
+    QModelIndex bottomRight;
+
+    topLeft = model->index(0, 0, QModelIndex());
+    bottomRight = model->index(5, 2, QModelIndex());
+//! [1]
+
+//! [2]
+    QItemSelection selection(topLeft, bottomRight);
+    selectionModel->select(selection, QItemSelectionModel::Select);
+//! [2]
+
+//! [3]
+    QItemSelection toggleSelection;
+
+    topLeft = model->index(2, 1, QModelIndex());
+    bottomRight = model->index(7, 3, QModelIndex());
+    toggleSelection.select(topLeft, bottomRight);
+
+    selectionModel->select(toggleSelection, QItemSelectionModel::Toggle);
+//! [3]
+
+//! [4]
+    QItemSelection columnSelection;
+
+    topLeft = model->index(0, 1, QModelIndex());
+    bottomRight = model->index(0, 2, QModelIndex());
+
+    columnSelection.select(topLeft, bottomRight);
+
+    selectionModel->select(columnSelection,
+        QItemSelectionModel::Select | QItemSelectionModel::Columns);
+
+    QItemSelection rowSelection;
+
+    topLeft = model->index(0, 0, QModelIndex());
+    bottomRight = model->index(1, 0, QModelIndex());
+
+    rowSelection.select(topLeft, bottomRight);
+
+    selectionModel->select(rowSelection,
+        QItemSelectionModel::Select | QItemSelectionModel::Rows);
+//! [4]
+
+    table->setWindowTitle("Selected items in a table model");
+    table->show();
+    table->resize(460, 280);
+    return app.exec();
+}
diff --git a/doc/src/snippets/itemselection/model.cpp b/doc/src/snippets/itemselection/model.cpp
new file mode 100644
index 0000000000..d4ca02b48f
--- /dev/null
+++ b/doc/src/snippets/itemselection/model.cpp
@@ -0,0 +1,239 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+    model.cpp
+
+    Provides a table model for use in various examples.
+*/
+
+#include <QtGui>
+
+#include "model.h"
+
+/*!
+    Constructs a table model with at least one row and one column.
+*/
+
+TableModel::TableModel(int rows, int columns, QObject *parent)
+    : QAbstractTableModel(parent)
+{
+    QStringList newList;
+
+    for (int column = 0; column < qMax(1, columns); ++column) {
+        newList.append("");
+    }
+
+    for (int row = 0; row < qMax(1, rows); ++row) {
+        rowList.append(newList);
+    }
+}
+
+
+/*!
+    Returns the number of items in the row list as the number of rows
+    in the model.
+*/
+
+int TableModel::rowCount(const QModelIndex &/*parent*/) const
+{
+    return rowList.size();
+}
+
+/*!
+    Returns the number of items in the first list item as the number of
+    columns in the model. All rows should have the same number of columns.
+*/
+
+int TableModel::columnCount(const QModelIndex &/*parent*/) const
+{
+    return rowList[0].size();
+}
+
+/*!
+    Returns an appropriate value for the requested data.
+    If the view requests an invalid index, an invalid variant is returned.
+    Any valid index that corresponds to a string in the list causes that
+    string to be returned for the display role; otherwise an invalid variant
+    is returned.
+*/
+
+QVariant TableModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+
+    if (role == Qt::DisplayRole)
+        return rowList[index.row()][index.column()];
+    else
+        return QVariant();
+}
+
+/*!
+    Returns the appropriate header string depending on the orientation of
+    the header and the section. If anything other than the display role is
+    requested, we return an invalid variant.
+*/
+
+QVariant TableModel::headerData(int section, Qt::Orientation orientation,
+                                int role) const
+{
+    if (role != Qt::DisplayRole)
+        return QVariant();
+
+    if (orientation == Qt::Horizontal)
+        return QString("Column %1").arg(section);
+    else
+        return QString("Row %1").arg(section);
+}
+
+/*!
+    Returns an appropriate value for the item's flags. Valid items are
+    enabled, selectable, and editable.
+*/
+
+Qt::ItemFlags TableModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return Qt::ItemIsEnabled;
+
+    return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
+}
+
+/*!
+    Changes an item in the model, but only if the following conditions
+    are met:
+
+    * The index supplied is valid.
+    * The role associated with editing text is specified.
+
+    The dataChanged() signal is emitted if the item is changed.
+*/
+
+bool TableModel::setData(const QModelIndex &index,
+                         const QVariant &value, int role)
+{
+    if (!index.isValid() || role != Qt::EditRole)
+        return false;
+
+    rowList[index.row()][index.column()] = value.toString();
+    emit dataChanged(index, index);
+    return true;
+}
+
+/*!
+    Inserts a number of rows into the model at the specified position.
+*/
+
+bool TableModel::insertRows(int position, int rows, const QModelIndex &parent)
+{
+    int columns = columnCount();
+    beginInsertRows(parent, position, position + rows - 1);
+
+    for (int row = 0; row < rows; ++row) {
+        QStringList items;
+        for (int column = 0; column < columns; ++column)
+            items.append("");
+        rowList.insert(position, items);
+    }
+
+    endInsertRows();
+    return true;
+}
+
+/*!
+    Inserts a number of columns into the model at the specified position.
+    Each entry in the list is extended in turn with the required number of
+    empty strings.
+*/
+
+bool TableModel::insertColumns(int position, int columns,
+                               const QModelIndex &parent)
+{
+    int rows = rowCount();
+    beginInsertColumns(parent, position, position + columns - 1);
+
+    for (int row = 0; row < rows; ++row) {
+        for (int column = position; column < columns; ++column) {
+            rowList[row].insert(position, "");
+        }
+    }
+
+    endInsertColumns();
+    return true;
+}
+
+/*!
+    Removes a number of rows from the model at the specified position.
+*/
+
+bool TableModel::removeRows(int position, int rows, const QModelIndex &parent)
+{
+    beginRemoveRows(parent, position, position + rows - 1);
+
+    for (int row = 0; row < rows; ++row) {
+        rowList.removeAt(position);
+    }
+
+    endRemoveRows();
+    return true;
+}
+
+/*!
+    Removes a number of columns from the model at the specified position.
+    Each row is shortened by the number of columns specified.
+*/
+
+bool TableModel::removeColumns(int position, int columns,
+                               const QModelIndex &parent)
+{
+    int rows = rowCount();
+    beginRemoveColumns(parent, position, position + columns - 1);
+
+    for (int row = 0; row < rows; ++row) {
+        for (int column = 0; column < columns; ++column) {
+            rowList[row].removeAt(position);
+        }
+    }
+
+    endRemoveColumns();
+    return true;
+}
diff --git a/doc/src/snippets/itemselection/model.h b/doc/src/snippets/itemselection/model.h
new file mode 100644
index 0000000000..207f83a8bd
--- /dev/null
+++ b/doc/src/snippets/itemselection/model.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MODEL_H
+#define MODEL_H
+
+#include <QAbstractTableModel>
+#include <QStringList>
+#include <QVariant>
+
+class TableModel : public QAbstractTableModel
+{
+    Q_OBJECT
+
+public:
+    TableModel(int rows = 1, int columns = 1, QObject *parent = 0);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    QVariant data(const QModelIndex &index, int role) const;
+    QVariant headerData(int section, Qt::Orientation orientation,
+                        int role = Qt::DisplayRole) const;
+
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+    bool setData(const QModelIndex &index, const QVariant &value,
+                 int role = Qt::EditRole);
+
+    bool insertRows(int position, int rows, const QModelIndex &parent = QModelIndex());
+    bool insertColumns(int position, int columns, const QModelIndex &parent = QModelIndex());
+    bool removeRows(int position, int rows, const QModelIndex &parent = QModelIndex());
+    bool removeColumns(int position, int columns, const QModelIndex &parent = QModelIndex());
+
+private:
+    QList<QStringList> rowList;
+};
+
+#endif
diff --git a/doc/src/snippets/javastyle.cpp b/doc/src/snippets/javastyle.cpp
new file mode 100644
index 0000000000..ab40aaaf46
--- /dev/null
+++ b/doc/src/snippets/javastyle.cpp
@@ -0,0 +1,2746 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "javastyle.h"
+#include <math.h>
+
+static const int windowsItemFrame        =  2;
+static const int windowsSepHeight        =  2;
+static const int windowsItemHMargin      =  3;
+static const int windowsItemVMargin      =  2;
+static const int windowsArrowHMargin     =  6;
+static const int windowsTabSpacing       = 12;
+static const int windowsCheckMarkHMargin =  2;
+static const int windowsRightBorder      = 15;
+static const int windowsCheckMarkWidth   = 12;
+
+JavaStyle::JavaStyle()
+{
+    qApp->setPalette(standardPalette());
+}
+
+
+inline QPoint JavaStyle::adjustScrollPoint(const QPoint &point,
+                    Qt::Orientation orientation,
+                    bool add) const
+{
+    int adder = add ? -1 : 1;
+    QPoint retPoint;
+
+    if (orientation == Qt::Horizontal) {
+        retPoint = QPoint(point.y() * adder, point.x());
+    } else {
+        retPoint = QPoint(point.x(), point.y() * adder);
+    }
+
+    return retPoint;
+}
+
+QPalette JavaStyle::standardPalette() const
+{
+    QPalette palette = QWindowsStyle::standardPalette();
+
+    palette.setBrush(QPalette::Active, QPalette::Button,
+                     QColor(184, 207, 229));
+    palette.setBrush(QPalette::Active, QPalette::WindowText,
+                     Qt::black);
+    palette.setBrush(QPalette::Active, QPalette::Background,
+                     QColor(238, 238, 238));
+    palette.setBrush(QPalette::Active, QPalette::Window,
+                     QColor(238 ,238, 238));
+    palette.setBrush(QPalette::Active, QPalette::Base, Qt::white);
+    palette.setBrush(QPalette::Active, QPalette::AlternateBase, QColor(238, 238, 238));
+    palette.setBrush(QPalette::Active, QPalette::Text, Qt::black);
+    palette.setBrush(QPalette::Active, QPalette::BrightText, Qt::white);
+
+    palette.setBrush(QPalette::Active, QPalette::Light, QColor(163, 184, 204)); // focusFrameColor
+    palette.setBrush(QPalette::Active, QPalette::Midlight, QColor(99, 130, 191)); // tabBarBorderColor
+    palette.setBrush(QPalette::Active, QPalette::Dark, QColor(106, 104, 100));
+    palette.setBrush(QPalette::Active, QPalette::Mid, QColor(122, 138, 153)); //defaultFrameColor
+    palette.setBrush(QPalette::Active, QPalette::Shadow, QColor(122, 138, 153)); // defaultFrame
+
+    palette.setBrush(QPalette::Active, QPalette::Highlight, QColor(184, 207, 229));
+    palette.setBrush(QPalette::Active, QPalette::HighlightedText, Qt::black);
+
+    palette.setBrush(QPalette::Inactive, QPalette::Highlight, QColor(184, 207, 229));
+    palette.setBrush(QPalette::Inactive, QPalette::HighlightedText, Qt::black);
+    
+    palette.setBrush(QPalette::Disabled, QPalette::Button,
+                     QColor(238, 238, 238));
+    palette.setBrush(QPalette::Disabled, QPalette::WindowText,
+                     QColor(153, 153, 153));
+    palette.setBrush(QPalette::Disabled, QPalette::Background, QColor(238, 238, 238));
+
+    palette.setBrush(QPalette::Inactive, QPalette::Button,
+                     QColor(184, 207, 229));
+    palette.setBrush(QPalette::Inactive, QPalette::Background,
+                     QColor(238, 238, 238));
+    palette.setBrush(QPalette::Inactive, QPalette::Window,
+                     QColor(238 ,238, 238));
+    palette.setBrush(QPalette::Inactive, QPalette::Light, QColor(163, 184, 204)); // focusFrameColor
+    palette.setBrush(QPalette::Inactive, QPalette::Midlight, QColor(99, 130, 191)); // tabBarBorderColor
+    palette.setBrush(QPalette::Inactive, QPalette::Dark,QColor(106, 104, 100));
+    palette.setBrush(QPalette::Inactive, QPalette::Mid, QColor(122, 138, 153)); //defaultFrame
+    palette.setBrush(QPalette::Inactive, QPalette::Shadow, QColor(122, 138, 153)); // defaultFrame
+
+    return palette;
+}
+
+inline void JavaStyle::drawScrollBarArrow(const QRect &rect, QPainter *painter,
+                      const QStyleOptionSlider *option,
+                      bool add) const
+{
+
+    painter->save();
+
+    Qt::Orientation orient = option->orientation;
+    QPoint offset;
+
+    if (add) {
+        if (orient == Qt::Vertical) {
+            offset = rect.bottomLeft();
+        } else {
+            offset = rect.topRight();
+        }
+    } else {
+        offset = rect.topLeft();
+    }
+
+    QPainterPath arrow;
+    arrow.moveTo(offset + adjustScrollPoint(QPoint(4, 8), orient, add));
+    arrow.lineTo(offset + adjustScrollPoint(QPoint(7, 5), orient, add));
+    arrow.lineTo(offset + adjustScrollPoint(QPoint(8, 5), orient, add));
+    arrow.lineTo(offset + adjustScrollPoint(QPoint(11, 8), orient, add));
+    arrow.lineTo(offset + adjustScrollPoint(QPoint(4, 8), orient, add));
+
+    QColor fillColor;
+    if (option->state & State_Sunken)
+        fillColor = QColor(option->palette.color(QPalette::Button));
+    else
+        fillColor = option->palette.color(QPalette::Background);
+
+    painter->fillRect(rect, fillColor);
+
+    painter->setPen(option->palette.color(QPalette::Base));
+    int adjust = option->state & State_Sunken ? 0 : 1;
+    painter->drawRect(rect.adjusted(adjust, adjust, -1, -1));
+    painter->setPen(option->palette.color(QPalette::Mid));
+    painter->drawRect(rect.adjusted(0, 0, -1, -1));
+
+    painter->setPen(option->palette.color(QPalette::WindowText));
+    painter->setBrush(option->palette.color(QPalette::WindowText));
+    painter->drawPath(arrow);
+
+    painter->restore();
+}
+
+inline QPoint JavaStyle::adjustScrollHandlePoint(Qt::Orientation orig,
+                         const QPoint &point) const
+{
+    QPoint retPoint;
+
+    if (orig == Qt::Vertical)
+        retPoint = point;
+    else
+        retPoint = QPoint(point.y(), point.x());
+
+    return retPoint;
+}
+
+void JavaStyle::drawControl(ControlElement control, const QStyleOption *option,
+                            QPainter *painter, const QWidget *widget) const
+{
+
+    painter->save();
+
+    switch (control) {
+        case CE_ToolBoxTabShape: {
+            const QStyleOptionToolBox *box =
+            qstyleoption_cast<const QStyleOptionToolBox *>(option);
+
+            painter->save();
+
+            if (box->direction == Qt::RightToLeft) {
+                painter->rotate(1);
+                painter->translate(box->rect.width(), -box->rect.height());
+            }
+
+            int textWidth = box->fontMetrics.width(box->text) + 20;
+
+            QPolygon innerLine;
+            innerLine << (box->rect.topLeft() + QPoint(0, 1)) <<
+                (box->rect.topLeft() + QPoint(textWidth, 1)) <<
+                (box->rect.bottomLeft() + QPoint(textWidth + 15, -3)) <<
+                (box->rect.bottomRight() + QPoint(0, -3)) <<
+                box->rect.bottomRight() <<
+                box->rect.bottomLeft() <<
+                box->rect.topLeft();
+
+            painter->setPen(box->palette.color(QPalette::Base));
+            painter->setBrush(QColor(200, 221, 242));
+            painter->drawPolygon(innerLine);
+
+            QPolygon outerLine;
+            outerLine << (box->rect.bottomRight() + QPoint(0, -3)) <<
+               box->rect.bottomRight() <<
+               box->rect.bottomLeft() <<
+               box->rect.topLeft() <<
+               (box->rect.topLeft() + QPoint(textWidth, 0)) <<
+               (box->rect.bottomLeft() + QPoint(textWidth + 15, -4)) <<
+               (box->rect.bottomRight() + QPoint(0, -4));
+
+            painter->setPen(box->palette.color(QPalette::Midlight));
+            painter->setBrush(Qt::NoBrush);
+            painter->drawPolyline(outerLine);
+
+            painter->restore();
+            break;
+        }
+        case CE_DockWidgetTitle: {
+            const QStyleOptionDockWidgetV2 *docker =
+                new QStyleOptionDockWidgetV2(
+                *qstyleoption_cast<const QStyleOptionDockWidget *>(option));
+
+            QRect rect = docker->rect;
+            QRect titleRect = rect;
+            if (docker->verticalTitleBar) {
+                QRect r = rect;
+                QSize s = r.size();
+                s.transpose();
+                r.setSize(s);
+
+                titleRect = QRect(r.left() + rect.bottom()
+                                - titleRect.bottom(),
+                                r.top() + titleRect.left() - rect.left(),
+                                titleRect.height(), titleRect.width());
+
+                painter->translate(r.left(), r.top() + r.width());
+                painter->rotate(-90);
+                painter->translate(-r.left(), -r.top());
+
+                rect = r;
+            }
+
+            QLinearGradient gradient(rect.topLeft(),
+                                     rect.bottomLeft());
+            gradient.setColorAt(1.0, QColor(191, 212, 231));
+            gradient.setColorAt(0.3, Qt::white);
+            gradient.setColorAt(0.0, QColor(221, 232, 243));
+
+            painter->setPen(Qt::NoPen);
+            painter->setBrush(gradient);
+            painter->drawRect(rect.adjusted(0, 0, -1, -1));
+
+            if (!docker->title.isEmpty()) {
+                QRect textRect = docker->fontMetrics.boundingRect(docker->title);
+                textRect.moveCenter(rect.center());
+
+                QFont font = painter->font();
+                font.setPointSize(font.pointSize() - 1);
+                painter->setFont(font);
+                painter->setPen(docker->palette.text().color());
+                painter->drawText(textRect, docker->title,
+                                  QTextOption(Qt::AlignHCenter |
+                                  Qt::AlignVCenter));
+            }
+            break;
+        }
+        case CE_RubberBand: {
+            painter->setPen(option->palette.color(QPalette::Active,
+                            QPalette::WindowText));
+            painter->drawRect(option->rect.adjusted(0, 0, -1, -1));
+            break;
+        }
+        case CE_SizeGrip: {
+            break;
+        }
+        case CE_HeaderSection: {
+            const QStyleOptionHeader *header =
+                qstyleoption_cast<const QStyleOptionHeader *>(option);
+
+            painter->setPen(Qt::NoPen);
+            painter->setBrush(option->palette.color(QPalette::Active,
+                              QPalette::Background));
+            painter->drawRect(option->rect);
+
+            painter->setPen(header->palette.color(QPalette::Mid));
+            if (header->orientation == Qt::Horizontal) {
+                if (header->position == QStyleOptionHeader::Beginning ||
+                    header->position == QStyleOptionHeader::OnlyOneSection) {
+                    painter->drawRect(header->rect.adjusted(0, 0, -1, -1));
+                    painter->setPen(header->palette.color(QPalette::Base));
+                    painter->drawLine(header->rect.bottomLeft() + QPoint(1, -1),
+                                      header->rect.topLeft() + QPoint(1, 1));
+                    painter->drawLine(header->rect.topLeft() + QPoint(1, 1),
+                                      header->rect.topRight() + QPoint(-1, 1));
+                } else {
+                    painter->drawLine(header->rect.bottomRight(),
+                                      header->rect.topRight());
+                    painter->drawLine(header->rect.topLeft(),
+                                      header->rect.topRight());
+                    painter->drawLine(header->rect.bottomLeft(),
+                                      header->rect.bottomRight());
+                    painter->setPen(option->palette.color(QPalette::Base));
+                    painter->drawLine(header->rect.bottomLeft() + QPoint(0, -1),
+                                      header->rect.topLeft() + QPoint(0, 1));
+                    painter->drawLine(header->rect.topLeft() + QPoint(1, 1),
+                                      header->rect.topRight() + QPoint(-1, 1));
+                }
+            } else { // Vertical
+                if (header->position == QStyleOptionHeader::Beginning ||
+                    header->position == QStyleOptionHeader::OnlyOneSection) {
+                    painter->drawRect(header->rect.adjusted(0, 0, -1, -1));
+                    painter->setPen(header->palette.color(QPalette::Base));
+                    painter->drawLine(header->rect.bottomLeft() + QPoint(1, -1),
+                                  header->rect.topLeft() + QPoint(1, 1));
+                    painter->drawLine(header->rect.topLeft() + QPoint(1, 1),
+                                  header->rect.topRight() + QPoint(-1, 1));
+                } else {
+                    painter->drawLine(header->rect.bottomLeft(),
+                                      header->rect.bottomRight());
+                    painter->drawLine(header->rect.topLeft(),
+                                      header->rect.bottomLeft());
+                    painter->drawLine(header->rect.topRight(),
+                                      header->rect.bottomRight());
+                    painter->setPen(header->palette.color(QPalette::Base));
+                    painter->drawLine(header->rect.topLeft(),
+                                      header->rect.topRight() + QPoint(-1, 0));
+                    painter->drawLine(header->rect.bottomLeft() + QPoint(1, -1),
+                                      header->rect.topLeft() + QPoint(1, 0));
+                }
+            }
+            break;
+        }
+        case CE_ToolBar: {
+            QRect rect = option->rect;
+
+            QLinearGradient gradient(rect.topLeft(), rect.bottomLeft());
+            gradient.setColorAt(1.0, QColor(221, 221, 221));
+            gradient.setColorAt(0.0, QColor(241, 241, 241));
+
+            if (option->state & State_Horizontal) {
+                painter->setPen(QColor(204, 204, 204));
+                painter->setBrush(gradient);
+            } else {
+                painter->setPen(Qt::NoPen);
+                painter->setBrush(option->palette.color(QPalette::Background));
+            }
+            painter->drawRect(rect.adjusted(0, 0, -1, -1));
+            break;
+        }
+        case CE_ProgressBar: {
+            const QStyleOptionProgressBar *bar1 =
+                qstyleoption_cast<const QStyleOptionProgressBar *>(option);
+
+            QStyleOptionProgressBarV2 *bar = new QStyleOptionProgressBarV2(*bar1);
+
+            QRect rect = bar->rect;
+            if (bar->orientation == Qt::Vertical) {
+                rect = QRect(rect.left(), rect.top(), rect.height(), rect.width());
+                QMatrix m;
+                m.translate(rect.height()-1, 0);
+                m.rotate(90.0);
+                painter->setMatrix(m);
+            }
+
+            painter->setPen(bar->palette.color(QPalette::Mid));
+            painter->drawRect(rect.adjusted(0, 0, -1, -1));
+
+            QRect grooveRect = subElementRect(SE_ProgressBarGroove, bar,
+                                              widget);
+            if (bar->orientation == Qt::Vertical) {
+                grooveRect = QRect(grooveRect.left(), grooveRect.top(),
+                                   grooveRect.height(), grooveRect.width());
+            }
+
+            QStyleOptionProgressBar grooveBar = *bar;
+            grooveBar.rect = grooveRect;
+
+            drawControl(CE_ProgressBarGroove, &grooveBar, painter, widget);
+
+            QRect progressRect = subElementRect(SE_ProgressBarContents, bar,
+                                                widget);
+            if (bar->orientation == Qt::Vertical) {
+                progressRect = QRect(progressRect.left(), progressRect.top(),
+                progressRect.height(), progressRect.width());
+                progressRect.adjust(0, 0, 0, -1);
+            }
+            QStyleOptionProgressBar progressOpt = *bar;
+            progressOpt.rect = progressRect;
+            drawControl(CE_ProgressBarContents, &progressOpt, painter, widget);
+
+            QRect labelRect = subElementRect(SE_ProgressBarLabel, bar, widget);
+            if (bar->orientation == Qt::Vertical) {
+                labelRect = QRect(labelRect.left(), labelRect.top(),
+                labelRect.height(), labelRect.width());
+            }
+            QStyleOptionProgressBar subBar = *bar;
+            subBar.rect = labelRect;
+            if (bar->textVisible)
+                drawControl(CE_ProgressBarLabel, &subBar, painter, widget);
+
+            delete bar;
+            break;
+        }
+        case CE_ProgressBarGroove: {
+            painter->setBrush(option->palette.color(QPalette::Background));
+            painter->setPen(Qt::NoPen);
+            painter->drawRect(option->rect.adjusted(0, 0, -1, -1));
+
+            painter->setPen(option->palette.color(QPalette::Button));
+            painter->drawLine(option->rect.topLeft() + QPoint(0, 0),
+                              option->rect.topRight() + QPoint(0, 0));
+            break;
+        }
+        case CE_ProgressBarContents: {
+            const QStyleOptionProgressBar *bar =
+                qstyleoption_cast<const QStyleOptionProgressBar *>(option);
+            int progress = int((double(bar->progress) /
+                                double(bar->maximum - bar->minimum)) *
+                                bar->rect.width());
+
+            painter->setBrush(bar->palette.color(QPalette::Light));
+            painter->setPen(Qt::NoPen);
+            QRect progressRect = QRect(bar->rect.topLeft(), QPoint(progress,
+            bar->rect.bottom()));
+            painter->drawRect(progressRect);
+
+            painter->setPen(bar->palette.color(QPalette::Midlight));
+            painter->setBrush(Qt::NoBrush);
+
+            painter->drawLine(bar->rect.bottomLeft(), bar->rect.topLeft());
+            painter->drawLine(bar->rect.topLeft(), QPoint(progress,
+                              bar->rect.top()));
+            break;
+        }
+        case CE_ProgressBarLabel: {
+            painter->save();
+            const QStyleOptionProgressBar *bar =
+                qstyleoption_cast<const QStyleOptionProgressBar *>(option);
+
+            QRect rect = bar->rect;
+                QRect leftRect;
+
+            int progressIndicatorPos = int((double(bar->progress) /
+                    double(bar->maximum - bar->minimum)) *
+                    bar->rect.width());
+
+            QFont font;
+            font.setBold(true);
+            painter->setFont(font);
+            painter->setPen(bar->palette.color(QPalette::Midlight));
+
+            if (progressIndicatorPos >= 0 &&
+                progressIndicatorPos <= rect.width()) {
+                leftRect = QRect(bar->rect.topLeft(),
+                                 QPoint(progressIndicatorPos,
+                bar->rect.bottom()));
+            } else if (progressIndicatorPos > rect.width()) {
+                painter->setPen(bar->palette.color(QPalette::Base));
+            } else {
+                painter->setPen(bar->palette.color(QPalette::Midlight));
+            }
+
+            QRect textRect = QFontMetrics(font).boundingRect(bar->text);
+            textRect.moveCenter(option->rect.center());
+            painter->drawText(textRect, bar->text,
+                              QTextOption(Qt::AlignCenter));
+            if (!leftRect.isNull()) {
+                painter->setPen(bar->palette.color(QPalette::Base));
+                painter->setClipRect(leftRect, Qt::IntersectClip);
+                painter->drawText(textRect, bar->text,
+                                  QTextOption(Qt::AlignCenter));
+            }
+
+            painter->restore();
+            break;
+        }
+        case CE_MenuBarEmptyArea: {
+            QRect emptyArea = option->rect.adjusted(0, 0, -1, -1);
+            QLinearGradient gradient(emptyArea.topLeft(), emptyArea.bottomLeft()
+                                     - QPoint(0, 1));
+            gradient.setColorAt(0.0, option->palette.color(QPalette::Base));
+            gradient.setColorAt(1.0, QColor(223, 223, 223));
+
+            painter->setPen(QColor(238, 238, 238));
+            painter->setBrush(gradient);
+            painter->drawRect(emptyArea.adjusted(0, 0, 0, -1));
+            break;
+        }
+        case CE_MenuBarItem: {
+            if (!(option->state & State_Sunken)) {
+                QLinearGradient gradient(option->rect.topLeft(),
+                                         option->rect.bottomLeft());
+                gradient.setColorAt(0.0, Qt::white);
+                gradient.setColorAt(1.0, QColor(223, 223, 223));
+
+                painter->setPen(Qt::NoPen);
+                painter->setBrush(gradient);
+            } else {
+                painter->setBrush(option->palette.color(QPalette::Light));
+            }
+
+            painter->drawRect(option->rect);
+            if (option->state & State_Sunken) {
+                painter->setPen(option->palette.color(QPalette::Mid));
+                painter->drawRect(option->rect.adjusted(0, 0, -1, -1));
+                painter->setPen(option->palette.color(QPalette::Base));
+                painter->setBrush(Qt::NoBrush);
+                painter->drawLine(option->rect.bottomRight() + QPoint(0, -1),
+                                  option->rect.topRight() + QPoint(0, -1));
+            }
+            QCommonStyle::drawControl(control, option, painter, widget);
+            break;
+        }
+        case CE_MenuItem: {
+            const QStyleOptionMenuItem *menuItem =
+                qstyleoption_cast<const QStyleOptionMenuItem *>(option);
+
+            bool selected = menuItem->state & State_Selected;
+            bool checkable = menuItem->checkType !=
+                             QStyleOptionMenuItem::NotCheckable;
+            bool checked = menuItem->checked;
+
+            if (menuItem->menuItemType == QStyleOptionMenuItem::Separator) {
+                QPoint center = menuItem->rect.center();
+
+                painter->setPen(menuItem->palette.color(QPalette::Midlight));
+                painter->drawLine(QPoint(menuItem->rect.left() - 2, center.y()),
+                                  QPoint(menuItem->rect.right(), center.y()));
+                painter->setPen(menuItem->palette.color(QPalette::Base));
+                painter->drawLine(QPoint(menuItem->rect.left() - 2,
+                                  center.y() + 1),
+                QPoint(menuItem->rect.right(),
+                      center.y() + 1));
+
+                break;
+            }
+
+            if (selected) {
+                painter->setBrush(menuItem->palette.color(QPalette::Light));
+                painter->setPen(Qt::NoPen);
+                painter->drawRect(menuItem->rect);
+                painter->setPen(menuItem->palette.color(QPalette::Midlight));
+                painter->drawLine(menuItem->rect.topLeft(),
+                                  menuItem->rect.topRight());
+                painter->setPen(menuItem->palette.color(QPalette::Base));
+                painter->drawLine(menuItem->rect.bottomLeft(),
+                                  menuItem->rect.bottomRight());
+            }
+
+            if (checkable) {
+                QRect checkRect(option->rect.left() + 5,
+                                option->rect.center().y() - 5, 10, 10);
+                if (menuItem->checkType & QStyleOptionMenuItem::Exclusive) {
+                    QStyleOptionButton button;
+                    button.rect = checkRect;
+                    button.state = menuItem->state;
+                    if (button.state & State_Sunken)
+                        button.state ^= State_Sunken;
+                    if (checked)
+                        button.state |= State_On;
+                    button.palette = menuItem->palette;
+                    drawPrimitive(PE_IndicatorRadioButton, &button, painter,
+                              widget);
+                } else {
+                    QBrush buttonBrush = gradientBrush(option->rect);
+                    painter->setBrush(buttonBrush);
+                    painter->setPen(option->palette.color(QPalette::Mid));
+
+                    painter->drawRect(checkRect);
+
+                    if (checked) {
+                        QImage image(":/images/checkboxchecked.png");
+                        painter->drawImage(QPoint(option->rect.left() + 5,
+                                           option->rect.center().y() - 8), image);
+                    }
+                }
+            }
+
+            bool dis = !(menuItem->state & State_Enabled);
+            bool act = menuItem->state & State_Selected;
+            const QStyleOption *opt = option;
+            const QStyleOptionMenuItem *menuitem = menuItem;
+            int checkcol = qMax(menuitem->maxIconWidth, 20);
+            if (menuItem->icon.isNull())
+                checkcol = 0;
+
+            QPainter *p = painter;
+            QRect vCheckRect = visualRect(opt->direction, menuitem->rect,
+                                          QRect(menuitem->rect.x(),
+                                          menuitem->rect.y(),
+                                          checkcol, menuitem->rect.height()));
+            if (!menuItem->icon.isNull()) {
+                QIcon::Mode mode = dis ? QIcon::Disabled : QIcon::Normal;
+                if (act && !dis)
+                    mode = QIcon::Active;
+                QPixmap pixmap;
+                if (checked)
+                    pixmap = menuItem->icon.pixmap(
+                    pixelMetric(PM_SmallIconSize), mode, QIcon::On);
+                else
+                    pixmap = menuItem->icon.pixmap(
+                        pixelMetric(PM_SmallIconSize), mode);
+                int pixw = pixmap.width();
+                int pixh = pixmap.height();
+
+                int adjustedIcon = checkable ? 15 : 0;
+                QRect pmr(0, 0, pixw, pixh);
+                pmr.moveCenter(vCheckRect.center());
+                painter->setPen(menuItem->palette.text().color());
+                if (checkable && checked)
+                    painter->drawPixmap(QPoint(pmr.left() +
+                    adjustedIcon, pmr.top() + 1), pixmap);
+                else
+                    painter->drawPixmap(pmr.topLeft() +
+                    QPoint(adjustedIcon, 0), pixmap);
+            }
+
+            if (selected) {
+                painter->setPen(menuItem->palette.highlightedText().color());
+            } else {
+                painter->setPen(menuItem->palette.text().color());
+            }
+            int x, y, w, h;
+            menuitem->rect.getRect(&x, &y, &w, &h);
+            int tab =  menuitem->tabWidth;
+            QColor discol;
+            if (dis) {
+                discol = menuitem->palette.text().color();
+                p->setPen(discol);
+            }
+            int xm = windowsItemFrame + checkcol + windowsItemHMargin;
+            int xpos = menuitem->rect.x() + xm;
+        QRect textRect;
+        if (!menuItem->icon.isNull())
+        textRect.setRect(xpos, y + windowsItemVMargin, w - xm -
+            windowsRightBorder - tab + 1, h - 2 * windowsItemVMargin);
+        else
+        textRect.setRect(menuItem->rect.left() + 9,
+                 y + windowsItemVMargin,
+                 w - xm - windowsRightBorder - tab,
+                 h - 2 * windowsItemVMargin);
+
+        if (checkable)
+        textRect.adjust(10, 0, 10, 0);
+
+            QRect vTextRect = visualRect(opt->direction, menuitem->rect,
+                     textRect);
+            QString s = menuitem->text;
+            if (!s.isEmpty()) {
+                int t = s.indexOf(QLatin1Char('\t'));
+                int text_flags = Qt::AlignVCenter | Qt::TextShowMnemonic |
+                 Qt::TextDontClip | Qt::TextSingleLine;
+                if (!styleHint(SH_UnderlineShortcut, menuitem, widget))
+                    text_flags |= Qt::TextHideMnemonic;
+                text_flags |= Qt::AlignLeft;
+                if (t >= 0) {
+                    QRect vShortcutRect = visualRect(opt->direction,
+                             menuitem->rect,
+                        QRect(textRect.topRight(),
+            QPoint(menuitem->rect.right(), textRect.bottom())));
+                    if (dis && !act) {
+                        p->setPen(menuitem->palette.light().color());
+                        p->drawText(vShortcutRect.adjusted(1, 1, 1, 1),
+                    text_flags,
+                    s.mid(t + 1));
+                        p->setPen(discol);
+                    }
+                    p->drawText(vShortcutRect, text_flags, s.mid(t + 1));
+                    s = s.left(t);
+                }
+                QFont font = menuitem->font;
+                if (menuitem->menuItemType == QStyleOptionMenuItem::DefaultItem)
+                    font.setBold(true);
+                p->setFont(font);
+                if (dis && !act) {
+                    p->setPen(menuitem->palette.light().color());
+                    p->drawText(vTextRect.adjusted(1,1,1,1), text_flags,
+                s.left(t));
+                    p->setPen(discol);
+                }
+                p->drawText(vTextRect, text_flags, s.left(t));
+            }
+
+            if (menuItem->menuItemType & QStyleOptionMenuItem::SubMenu) {
+                QPoint center = menuItem->rect.center();
+                QPoint drawStart(menuItem->rect.right() - 6, center.y() + 4);
+
+                QPainterPath arrow;
+                arrow.moveTo(drawStart);
+                arrow.lineTo(drawStart + QPoint(0, -8));
+                arrow.lineTo(drawStart + QPoint(4, -5));
+                arrow.lineTo(drawStart + QPoint(4, -4));
+                arrow.lineTo(drawStart + QPoint(0, 0));
+
+                painter->save();
+                painter->setBrush(menuItem->palette.color(QPalette::Text));
+                painter->setPen(Qt::NoPen);
+                painter->drawPath(arrow);
+                painter->restore();
+            }
+
+            break;
+        }
+        case CE_MenuVMargin: {
+            break;
+        }
+        case CE_MenuHMargin: {
+            break;
+        }
+        case CE_Splitter: {
+            drawSplitter(option, painter, option->state & State_Horizontal);
+            break;
+        }
+        case CE_ScrollBarAddPage: {
+        case CE_ScrollBarSubPage:
+            const QStyleOptionSlider *scrollBar =
+                qstyleoption_cast<const QStyleOptionSlider *>(option);
+            QRect myRect;
+            if (scrollBar->orientation == Qt::Horizontal) {
+                myRect = QRect(option->rect.topLeft(),
+                option->rect.bottomRight()).adjusted(0, 0, 1, -1);
+            } else {
+                myRect = option->rect;
+            }
+
+            painter->setPen(Qt::NoPen);
+            painter->setBrush(option->palette.color(QPalette::Background));
+            painter->drawRect(myRect);
+
+            painter->setBrush(Qt::NoBrush);
+            painter->setPen(scrollBar->palette.color(QPalette::Mid));
+            painter->drawRect(myRect.adjusted(0, 0, -1, 0));
+            painter->setPen(scrollBar->palette.color(QPalette::Button));
+            painter->drawLine(myRect.bottomLeft() + QPoint(1, 0),
+                              myRect.topLeft() + QPoint(1, 1));
+            painter->drawLine(myRect.topLeft() + QPoint(1, 1),
+                              myRect.topRight() + QPoint(-1, 1));
+            break;
+        }
+        case CE_ScrollBarSubLine: {
+            const QStyleOptionSlider *scrollBar =
+                qstyleoption_cast<const QStyleOptionSlider *>(option);
+            int scrollBarExtent = pixelMetric(PM_ScrollBarExtent);
+            QRect scrollBarSubLine = option->rect;
+
+            QRect button1;
+            QRect button2;
+
+            if (scrollBar->orientation == Qt::Horizontal) {
+                button1.setRect(scrollBarSubLine.left(), scrollBarSubLine.top(),
+                16, scrollBarExtent);
+                button2.setRect(scrollBarSubLine.right() - 15,
+                scrollBarSubLine.top(), 16, scrollBarExtent);
+            } else {
+                button1.setRect(scrollBarSubLine.left(), scrollBarSubLine.top(),
+                scrollBarExtent, 16);
+                button2.setRect(scrollBarSubLine.left(),
+                scrollBarSubLine.bottom() - 15, scrollBarExtent, 16);
+            }
+
+            painter->fillRect(button2, Qt::blue);
+
+            drawScrollBarArrow(button1, painter, scrollBar);
+            drawScrollBarArrow(button2, painter, scrollBar);
+            break;
+        }
+        case CE_ScrollBarAddLine: {
+            const QStyleOptionSlider *scrollBar =
+                qstyleoption_cast<const QStyleOptionSlider *>(option);
+            QRect button(option->rect.left(), option->rect.top(), 16, 16);
+            drawScrollBarArrow(button, painter, scrollBar, true);
+            break;
+        }
+        case CE_ScrollBarSlider: {
+            const QStyleOptionSlider *scrollBar =
+                qstyleoption_cast<const QStyleOptionSlider *>(option);
+
+            painter->setPen(scrollBar->palette.color(QPalette::Midlight));
+            painter->drawRect(scrollBar->rect.adjusted(-1, 0, -3, -1));
+
+            QPoint g1, g2;
+            if (scrollBar->orientation == Qt::Horizontal) {
+                g1 = option->rect.topLeft();
+                g2 = option->rect.bottomLeft();
+            } else {
+                g1 = option->rect.topLeft();
+                g2 = option->rect.topRight();
+            }
+
+            if (scrollBar->state & State_Enabled) {
+                QLinearGradient gradient(g1, g2);
+                gradient.setColorAt(1.0, QColor(188, 210, 230));
+                gradient.setColorAt(0.3, Qt::white);
+                gradient.setColorAt(0.0, QColor(223, 233, 243));
+                painter->setBrush(gradient);
+            } else {
+                painter->setPen(scrollBar->palette.buttonText().color());
+                painter->setBrush(scrollBar->palette.button());
+            }
+            painter->drawRect(scrollBar->rect.adjusted(0, 0, -1, -1));
+
+            int sliderLength = option->rect.height();
+            int drawPos = scrollBar->orientation == Qt::Vertical ?
+                (sliderLength / 2) + 1 : 1 - ((option->rect.width() / 2));
+
+            QPoint origin;
+            if (scrollBar->orientation == Qt::Vertical)
+                origin = option->rect.bottomLeft();
+            else
+                origin = option->rect.topLeft();
+
+            painter->setPen(scrollBar->palette.color(QPalette::Base));
+            painter->drawLine(origin + adjustScrollHandlePoint(
+                             scrollBar->orientation,
+                    QPoint(4, -drawPos)),
+                    origin + adjustScrollHandlePoint(
+                    scrollBar->orientation,
+                    QPoint(13, -drawPos)));
+            painter->drawLine(origin + adjustScrollHandlePoint(
+                        scrollBar->orientation,
+                      QPoint(4,  2 - drawPos)),
+                      origin + adjustScrollHandlePoint(
+                      scrollBar->orientation,
+                      QPoint(13, 2 - drawPos)));
+            painter->drawLine(origin + adjustScrollHandlePoint(
+                    scrollBar->orientation,
+                    QPoint(4,  4 - drawPos)),
+                    origin + adjustScrollHandlePoint(
+                    scrollBar->orientation,
+                    QPoint(13, 4 - drawPos)));
+
+            painter->setPen(option->palette.color(QPalette::Midlight));
+            painter->drawLine(origin + adjustScrollHandlePoint(
+                    scrollBar->orientation,
+                    QPoint(3, -(drawPos + 1))),
+                    origin + adjustScrollHandlePoint(
+                    scrollBar->orientation,
+                    QPoint(12, -(drawPos + 1))));
+            painter->drawLine(origin + adjustScrollHandlePoint(
+                    scrollBar->orientation,
+                    QPoint(3, 1 - drawPos)),
+                    origin + adjustScrollHandlePoint(
+                    scrollBar->orientation,
+                    QPoint(12, 1 - drawPos)));
+            painter->drawLine(origin + adjustScrollHandlePoint(
+                    scrollBar->orientation,
+                    QPoint(3, 3 - drawPos)),
+                    origin + adjustScrollHandlePoint(
+                    scrollBar->orientation,
+                    QPoint(12, 3 - drawPos)));
+
+            break;
+        }
+        case CE_TabBarTabLabel: {
+            QStyleOptionTab copy =
+                *qstyleoption_cast<const QStyleOptionTab *>(option);
+            if (copy.state & State_HasFocus)
+                copy.state ^= State_HasFocus;
+                painter->setBrush(Qt::NoBrush);
+                QWindowsStyle::drawControl(CE_TabBarTabLabel, &copy, painter,
+                                           widget);
+            break;
+        }
+        case CE_TabBarTabShape: {
+            const QStyleOptionTab *tab =
+                qstyleoption_cast<const QStyleOptionTab *>(option);
+            QRect myRect = option->rect;
+            QPoint bottomLeft, bottomRight, topLeft, topRight;
+
+            if ((tab->position == QStyleOptionTab::Beginning) ||
+                (tab->position == QStyleOptionTab::OnlyOneTab)) {
+                if (tab->shape == QTabBar::RoundedSouth ||
+                    tab->shape == QTabBar::RoundedNorth) {
+                    myRect = myRect.adjusted(2, 0, 0, 0);
+                } else {
+                    myRect = myRect.adjusted(0, 2, 0, 0);
+                }
+            }
+
+            switch (tab->shape) {
+                case QTabBar::RoundedNorth:
+                    topLeft = myRect.topLeft();
+                    topRight = myRect.topRight();
+                    bottomLeft = myRect.bottomLeft();
+                    bottomRight = myRect.bottomRight();
+                    break;
+                case QTabBar::RoundedSouth:
+                    topLeft = myRect.bottomLeft();
+                    topRight = myRect.bottomRight();
+                    bottomLeft = myRect.topLeft();
+                    bottomRight = myRect.topRight();
+                    break;
+                case QTabBar::RoundedWest:
+                    topLeft = myRect.topLeft();
+                    topRight = myRect.bottomLeft();
+                    bottomLeft = myRect.topRight();
+                    bottomRight = myRect.bottomRight();
+                    break;
+                case QTabBar::RoundedEast:
+                    topLeft = myRect.topRight();
+                    topRight = myRect.bottomRight();
+                    bottomLeft = myRect.topLeft();
+                    bottomRight = myRect.bottomLeft();
+                    break;
+                default:
+                    ;
+            }
+
+            QPainterPath outerPath;
+            outerPath.moveTo(bottomLeft + adjustTabPoint(QPoint(0, -2),
+                             tab->shape));
+            outerPath.lineTo(bottomLeft + adjustTabPoint(QPoint(0, -14),
+                             tab->shape));
+            outerPath.lineTo(topLeft + adjustTabPoint(QPoint(6 , 0),
+                             tab->shape));
+            outerPath.lineTo(topRight + adjustTabPoint(QPoint(0, 0),
+                             tab->shape));
+            outerPath.lineTo(bottomRight + adjustTabPoint(QPoint(0, -2),
+                             tab->shape));
+
+            if (tab->state & State_Selected ||
+                tab->position == QStyleOptionTab::OnlyOneTab) {
+                QPainterPath innerPath;
+                innerPath.moveTo(topLeft + adjustTabPoint(QPoint(6, 2),
+                                 tab->shape));
+                innerPath.lineTo(topRight + adjustTabPoint(QPoint(-1, 2),
+                                 tab->shape));
+                innerPath.lineTo(bottomRight + adjustTabPoint(QPoint(-1 , -2),
+                                 tab->shape));
+                innerPath.lineTo(bottomLeft + adjustTabPoint(QPoint(2 , -2),
+                                 tab->shape));
+                innerPath.lineTo(bottomLeft + adjustTabPoint(QPoint(2 , -14),
+                                 tab->shape));
+                innerPath.lineTo(topLeft + adjustTabPoint(QPoint(6, 2),
+                                 tab->shape));
+
+                QPainterPath whitePath;
+                whitePath.moveTo(bottomLeft + adjustTabPoint(QPoint(1, -2),
+                                 tab->shape));
+                whitePath.lineTo(bottomLeft + adjustTabPoint(QPoint(1, -14),
+                                 tab->shape));
+                whitePath.lineTo(topLeft + adjustTabPoint(QPoint(6, 1),
+                                 tab->shape));
+                whitePath.lineTo(topRight + adjustTabPoint(QPoint(-1, 1),
+                                 tab->shape));
+
+                painter->setPen(tab->palette.color(QPalette::Midlight));
+                painter->setBrush(QColor(200, 221, 242));
+                painter->drawPath(outerPath);
+                painter->setPen(QColor(200, 221, 242));
+                painter->drawRect(QRect(bottomLeft + adjustTabPoint( 
+                                        QPoint(2, -3), tab->shape),
+                                        bottomRight + adjustTabPoint(
+                                        QPoint(-2, 0), tab->shape)));
+                painter->setPen(tab->palette.color(QPalette::Base));
+                painter->setBrush(Qt::NoBrush);
+                painter->drawPath(whitePath);
+
+                if (option->state & State_HasFocus) { 
+                    painter->setPen(option->palette.color(QPalette::Mid));
+                    painter->drawPath(innerPath);
+                }
+            } else {
+                painter->setPen(tab->palette.color(QPalette::Mid));
+                painter->drawPath(outerPath);
+            }
+            break;
+        }
+        case CE_PushButtonLabel:
+            painter->save();
+
+            if (const QStyleOptionButton *button =
+                qstyleoption_cast<const QStyleOptionButton *>(option)) {
+                QRect ir = button->rect;
+                uint tf = Qt::AlignVCenter | Qt::TextShowMnemonic;
+                if (!styleHint(SH_UnderlineShortcut, button, widget))
+                    tf |= Qt::TextHideMnemonic;
+
+                if (!button->icon.isNull()) {
+                    QPoint point;
+
+                    QIcon::Mode mode = button->state & State_Enabled ? QIcon::Normal
+                                                                  : QIcon::Disabled;
+                    if (mode == QIcon::Normal && button->state & State_HasFocus)
+                        mode = QIcon::Active;
+                    QIcon::State state = QIcon::Off;
+                    if (button->state & State_On)
+                        state = QIcon::On;
+
+                    QPixmap pixmap = button->icon.pixmap(button->iconSize, mode,
+                             state);
+                    int w = pixmap.width();
+                    int h = pixmap.height();
+
+                    if (!button->text.isEmpty())
+                        w += button->fontMetrics.width(button->text) + 2;
+
+                    point = QPoint(ir.x() + ir.width() / 2 - w / 2,
+                                   ir.y() + ir.height() / 2 - h / 2);
+
+                    if (button->direction == Qt::RightToLeft)
+                        point.rx() += pixmap.width();
+
+                    painter->drawPixmap(visualPos(button->direction, button->rect,
+                              point), pixmap);
+
+                    if (button->direction == Qt::RightToLeft)
+                        ir.translate(-point.x() - 2, 0);
+                    else
+                        ir.translate(point.x() + pixmap.width(), 0);
+
+                    if (!button->text.isEmpty())
+                        tf |= Qt::AlignLeft;
+
+                } else {
+                    tf |= Qt::AlignHCenter;
+                }
+
+                if (button->fontMetrics.height() > 14)
+                    ir.translate(0, 1);
+
+                drawItemText(painter, ir, tf, button->palette, (button->state &
+                                 State_Enabled),
+                             button->text, QPalette::ButtonText);
+            }
+
+            painter->restore();
+            break;
+
+        default:
+            QWindowsStyle::drawControl(control, option, painter, widget);
+    }
+    painter->restore();
+}
+
+inline QPoint JavaStyle::adjustTabPoint(const QPoint &point,
+                                        QTabBar::Shape shape) const
+{
+    QPoint rPoint;
+
+    switch (shape) {
+        case QTabBar::RoundedWest:
+            rPoint = QPoint(point.y(), point.x());
+            break;
+        case QTabBar::RoundedSouth:
+            rPoint = QPoint(point.x(), point.y() * -1);
+            break;
+        case QTabBar::RoundedEast:
+            rPoint = QPoint(point.y() * -1, point.x());
+            break;
+        default:
+            rPoint = point;
+    }
+    return rPoint;
+}
+
+QRect JavaStyle::subControlRect(ComplexControl control,
+                                const QStyleOptionComplex *option,
+                                SubControl subControl,
+                                const QWidget *widget) const
+{
+    QRect rect = QWindowsStyle::subControlRect(control, option, subControl,
+                                               widget);
+
+    switch (control) {
+        case CC_TitleBar: {
+            const QStyleOptionTitleBar *bar =
+            qstyleoption_cast<const QStyleOptionTitleBar *>(option);
+
+            switch (subControl) {
+                case SC_TitleBarMinButton: {
+                    rect = QRect(bar->rect.topRight() + QPoint(-68, 2),
+                    QSize(15, 15));
+                    break;
+                }
+                case SC_TitleBarMaxButton: {
+                    rect = QRect(bar->rect.topRight() + QPoint(-43, 3),
+                                 QSize(15, 15));
+                    break;
+                }
+                case SC_TitleBarCloseButton: {
+                    rect = QRect(bar->rect.topRight() + QPoint(-18, 3),
+                                 QSize(15, 15));
+                    break;
+                }
+                case SC_TitleBarLabel: {
+                    QRect labelRect = bar->fontMetrics.boundingRect(bar->text);
+                    rect = labelRect;
+                    rect.translate(bar->rect.left() + 30, 0);
+                    rect.moveTop(bar->rect.top());
+                    rect.adjust(0, 2, 2, 2);
+                    break;
+                }
+                case SC_TitleBarSysMenu: {
+                    rect = QRect(bar->rect.topLeft() + QPoint(6, 3),
+                                 QSize(16, 16));
+                    break;
+                }
+                default:
+                    ;
+            }
+            break;
+        }
+        case CC_GroupBox: {
+            const QStyleOptionGroupBox *box =
+                qstyleoption_cast<const QStyleOptionGroupBox *>(option);
+            bool hasCheckbox = box->subControls & SC_GroupBoxCheckBox;
+            int checkAdjust = 13;
+
+            QRect textRect = box->fontMetrics.boundingRect(box->text);
+
+            switch (subControl) {
+                case SC_GroupBoxFrame: {
+                    rect = box->rect;
+                    break;
+                }
+                case SC_GroupBoxCheckBox: {
+                    if (hasCheckbox) {
+                        rect = QRect(box->rect.topLeft() + QPoint(7, 4 +
+                                     (textRect.height() / 2 - checkAdjust / 2)),
+                        QSize(checkAdjust, checkAdjust));
+                    }
+                    else {
+                        rect = QRect();
+                    }
+                    break;
+                }
+                case SC_GroupBoxLabel: {
+                    rect = QRect(box->rect.topLeft() + QPoint(7 + (hasCheckbox ?
+                    checkAdjust + 2 : 0), 4), textRect.size());
+                    break;
+                }
+                case SC_GroupBoxContents: {
+                    rect = box->rect.adjusted(10, 10 + textRect.height(), -10,
+                                              -10);
+                    break;
+                }
+                default:
+                    ;
+            }
+            break;
+        }
+        case CC_SpinBox: {
+            const QStyleOptionSpinBox *spinBox =
+            qstyleoption_cast<const QStyleOptionSpinBox *>(option);
+            int spinnerWidth = 16;
+            QRect myRect = spinBox->rect;
+            QPoint center = myRect.center();
+            int frameWidth = pixelMetric(PM_SpinBoxFrameWidth, spinBox, widget);
+
+            switch (subControl) {
+                case SC_SpinBoxUp: {
+                    rect = QRect(myRect.topRight() + QPoint(-16, 0),
+                    QSize(16, center.y() - myRect.topRight().y()));
+                    break;
+                }
+                case SC_SpinBoxDown: {
+                    rect = QRect(QPoint(myRect.bottomRight().x() - 16,
+                                 center.y() + 1),
+                                 QSize(16, myRect.bottomRight().y() -
+                                       center.y() - 1));
+                    break;
+                }
+                case SC_SpinBoxFrame: {
+                    rect = QRect(myRect.topLeft(), myRect.bottomRight() +
+                                 QPoint(-16, 0));
+                    break;
+                }
+                case SC_SpinBoxEditField: {
+                    rect = QRect(myRect.topLeft() + QPoint(2, 2),
+                    myRect.bottomRight() + QPoint(-15 - frameWidth, -2));
+                    break;
+                }
+                default:
+                    ;
+            }
+            break;
+        }
+        case CC_ToolButton: {
+            const QStyleOptionToolButton *button =
+                qstyleoption_cast<const QStyleOptionToolButton *>(option);
+
+            switch (subControl) {
+                case SC_ToolButton: {
+                    rect = option->rect.adjusted(1, 1, -1, -1);
+                    break;
+                }
+                case SC_ToolButtonMenu: {
+                    rect = QRect(option->rect.bottomRight() +
+                                 QPoint(-11, -11), QSize(10, 10));
+                    break;
+                }
+            }
+            break;
+        }
+        case CC_ComboBox: {
+            const QStyleOptionComboBox *combo =
+                qstyleoption_cast<const QStyleOptionComboBox *>(option);
+
+            bool reverse = combo->direction == Qt::RightToLeft;
+
+            switch (subControl) {
+                case SC_ComboBoxFrame:
+                    rect = combo->rect;
+                    break;
+                case SC_ComboBoxArrow:
+                    if (reverse) {
+                        rect = QRect(combo->rect.topLeft(),
+                        combo->rect.bottomLeft() + QPoint(17, 0));
+                    } else {
+                        rect = QRect(combo->rect.topRight() + QPoint(-17, 0),
+                        combo->rect.bottomRight());
+                    }
+                    break;
+                case SC_ComboBoxEditField:
+                    if (reverse) {
+                        rect = QRect(combo->rect.topLeft() + QPoint(19, 2),
+                        combo->rect.bottomRight() + QPoint(-2, 2));
+                    } else {
+                        rect = QRect(combo->rect.topLeft() + QPoint(2, 2),
+                        combo->rect.bottomRight() + QPoint(-19, -2));
+                    }
+                    break;
+                case SC_ComboBoxListBoxPopup:
+                    rect = combo->rect;
+                    break;
+            }
+            break;
+        }
+        case CC_ScrollBar: {
+            const QStyleOptionSlider *scrollBar =
+                qstyleoption_cast<const QStyleOptionSlider *>(option);
+            int scrollBarExtent = pixelMetric(PM_ScrollBarExtent, scrollBar,
+                          widget);
+            int sliderMaxLength = ((scrollBar->orientation == Qt::Horizontal) ?
+                                   scrollBar->rect.width() :
+                                    scrollBar->rect.height()) - (16 * 3);
+            int sliderMinLength = pixelMetric(PM_ScrollBarSliderMin, scrollBar,
+                                              widget);
+            int sliderLength;
+
+            if (scrollBar->maximum != scrollBar->minimum) {
+                uint valueRange = scrollBar->maximum - scrollBar->minimum;
+                sliderLength = (scrollBar->pageStep * sliderMaxLength) /
+                (valueRange + scrollBar->pageStep);
+
+                if (sliderLength < sliderMinLength || valueRange > INT_MAX / 2)
+                    sliderLength = sliderMinLength;
+                if (sliderLength > sliderMaxLength)
+                    sliderLength = sliderMaxLength;
+            } else {
+                sliderLength = sliderMaxLength;
+            }
+            int sliderStart = 16 + sliderPositionFromValue(scrollBar->minimum,
+                                                           scrollBar->maximum,
+                                                    scrollBar->sliderPosition,
+                                                sliderMaxLength - sliderLength,
+                                                        scrollBar->upsideDown);
+            QRect scrollBarRect = scrollBar->rect;
+
+            switch (subControl) {
+                case SC_ScrollBarSubLine:
+                    if (scrollBar->orientation == Qt::Horizontal) {
+                        rect.setRect(scrollBarRect.left(), scrollBarRect.top(),
+                        scrollBarRect.width() - 16, scrollBarExtent);
+                    } else {
+                        rect.setRect(scrollBarRect.left(), scrollBarRect.top(),
+                        scrollBarExtent, scrollBarRect.height() - 16);
+                    }
+                    break;
+                case SC_ScrollBarAddLine:
+                    if (scrollBar->orientation == Qt::Horizontal) {
+                        rect.setRect(scrollBarRect.right() - 15,
+                        scrollBarRect.top(), 16, scrollBarExtent);
+                    } else {
+                        rect.setRect(scrollBarRect.left(), scrollBarRect.bottom()
+                                     - 15, scrollBarExtent, 16);
+                    }
+                    break;
+                case SC_ScrollBarSubPage:
+                    if (scrollBar->orientation == Qt::Horizontal) {
+                        rect.setRect(scrollBarRect.left() + 16, scrollBarRect.top(),
+                                     sliderStart - (scrollBarRect.left() + 16),
+                                     scrollBarExtent);
+                    } else {
+                        rect.setRect(scrollBarRect.left(), scrollBarRect.top() + 16,
+                                     scrollBarExtent,
+                        sliderStart - (scrollBarRect.left() + 16));
+                    }
+                    break;
+                case SC_ScrollBarAddPage:
+                    if (scrollBar->orientation == Qt::Horizontal)
+                        rect.setRect(sliderStart + sliderLength, 0,
+                                     sliderMaxLength - sliderStart -
+                        sliderLength + 16, scrollBarExtent);
+                    else
+                        rect.setRect(0, sliderStart + sliderLength,
+                                     scrollBarExtent, sliderMaxLength -
+                    sliderStart - sliderLength + 16);
+                    break;
+                case SC_ScrollBarGroove:
+                    if (scrollBar->orientation == Qt::Horizontal) {
+                        rect = scrollBarRect.adjusted(16, 0, -32, 0);
+                    } else {
+                        rect = scrollBarRect.adjusted(0, 16, 0, -32);
+                    }
+                    break;
+                case SC_ScrollBarSlider:
+                    if (scrollBar->orientation == Qt::Horizontal) {
+                        rect.setRect(sliderStart, 0, sliderLength,
+                                     scrollBarExtent);
+                    } else {
+                        rect.setRect(0, sliderStart, scrollBarExtent,
+                                     sliderLength);
+                    }
+                    break;
+                default:
+                    return QWindowsStyle::subControlRect(control, option,
+                                                         subControl, widget);
+            }
+            break;
+        }
+        case CC_Slider: {
+            const QStyleOptionSlider *slider =
+                qstyleoption_cast<const QStyleOptionSlider *>(option);
+            rect = slider->rect;
+            int tickSize = pixelMetric(PM_SliderTickmarkOffset, option, widget);
+            int handleSize = pixelMetric(PM_SliderControlThickness, option,
+                                         widget);
+
+            int dist = slider->orientation == Qt::Vertical ? slider->rect.height() :
+                                              slider->rect.width();
+            int pos = QStyle::sliderPositionFromValue(slider->minimum,
+                slider->maximum, slider->sliderValue, dist - handleSize);
+
+            switch (subControl) {
+                case SC_SliderGroove: {
+                    QPoint center = rect.center();
+
+                    if (slider->orientation == Qt::Horizontal) {
+                        rect.setHeight(handleSize);
+                        if (slider->tickPosition == QSlider::TicksBelow) {
+                            center.ry() -= tickSize;
+                        }
+                    } else {
+                        rect.adjust(0, 0, 0, 0);
+                        rect.setWidth(handleSize);
+                        if (slider->tickPosition == QSlider::TicksBelow) {
+                            center.rx() -= tickSize;
+                        }
+                    }
+                    rect.moveCenter(center);
+                    break;
+                }
+                case SC_SliderHandle: {
+                    QPoint center = rect.center();
+
+                    if (slider->orientation == Qt::Horizontal) {
+                        rect.setHeight(handleSize);
+                        if (slider->tickPosition == QSlider::TicksBelow) {
+                            center.ry() -= tickSize;
+                        }
+
+                        rect.moveCenter(center);
+
+                        if (slider->upsideDown)
+                            rect.setLeft(slider->rect.right() -
+                                         pos - (handleSize - 1));
+                        else
+                            rect.setLeft(pos);
+
+                        rect.setWidth(handleSize - 1);
+                    } else {
+                        rect.setWidth(handleSize);
+                        if (slider->tickPosition == QSlider::TicksBelow) {
+                            center.rx() -= tickSize;
+                        }
+
+                        rect.moveCenter(center);
+
+                        if (slider->upsideDown)
+                            rect.setTop(slider->rect.bottom() -
+                                        ((pos + handleSize) - 2));
+                        else
+                            rect.setTop(slider->rect.top() + pos);
+
+                        rect.setHeight(handleSize);
+                    }
+                    break;
+                }
+                case SC_SliderTickmarks: {
+                    QPoint center = slider->rect.center();
+
+                    if (slider->tickPosition & QSlider::TicksBelow) {
+                        if (slider->orientation == Qt::Horizontal) {
+                            rect.setHeight(tickSize);
+                            center.ry() += tickSize / 2;
+                            rect.adjust(6, 0, -10, 0);
+                        } else {
+                            rect.setWidth(tickSize);
+                            center.rx() += tickSize / 2;
+                            rect.adjust(0, 6, 0, -10);
+                        }
+                    } else {
+                        rect = QRect();
+                    }
+                    rect.moveCenter(center);
+                    break;
+                }
+                default:
+                    ;
+            }
+            break;
+        }
+        default:
+            return QWindowsStyle::subControlRect(control, option, subControl,
+                                                 widget);
+    }
+    return rect;
+}
+
+static const char * const sliderHandleImage[] = {
+    "15 16 7 1",
+    "   c None",
+    "+  c #FFFFFF",
+    "@  c #FFFFFF",
+    "$  c #FFFFFF",
+    "(  c #E5EDF5",
+    ")  c #F2F6FA",
+    "[  c #FFFFFF",
+    " +++++++++++++ ",
+    "+@@@@@@@@@@@@@+",
+    "+@(((((((((((@+",
+    "+@(((((((((((@+",
+    "+@)))))))))))@+",
+    "+@[[[[[[[[[[[@+",
+    "+@[[[[[[[[[[[@+",
+    "+@)))))))))))@+",
+    "+@)))))))))))@+",
+    " +@)))))))))@+ ",
+    "  +@(((((((@+  ",
+    "   +@(((((@+   ",
+    "    +@(((@+    ",
+    "     +@(@+     ",
+    "      +@+      ",
+    "       +       "};
+
+
+void JavaStyle::drawComplexControl(ComplexControl control,
+                                   const QStyleOptionComplex *option,
+                                   QPainter *painter,
+                                   const QWidget *widget) const
+{
+    painter->save();
+
+    switch (control) {
+        case CC_TitleBar: {
+            const QStyleOptionTitleBar *bar =
+                qstyleoption_cast<const QStyleOptionTitleBar *>(option);
+
+            bool sunken = bar->state & State_Sunken;
+
+            QLinearGradient gradient(bar->rect.bottomLeft(),
+                                     bar->rect.topLeft());
+            gradient.setColorAt(0.0, QColor(191, 212, 231));
+            gradient.setColorAt(0.7, Qt::white);
+            gradient.setColorAt(1.0, QColor(221, 232, 243));
+
+            painter->setPen(Qt::NoPen);
+            if (bar->titleBarState & State_Active) {
+                painter->setBrush(gradient);
+            }
+            else
+                painter->setBrush(bar->palette.color(QPalette::Active,
+                                  QPalette::Background));
+
+            painter->drawRect(bar->rect.adjusted(0, 0, -1, -1));
+
+            painter->setBrush(QColor(233, 233, 233));
+            painter->drawRect(QRect(bar->rect.bottomLeft() + QPoint(0, 1),
+                                    bar->rect.bottomRight() + QPoint(0, 2)));
+
+            QRect minButtonRect = subControlRect(control, bar,
+                                                 SC_TitleBarMinButton);
+            QRect maxButtonRect = subControlRect(control, bar,
+                                                 SC_TitleBarMaxButton);
+            QRect closeButtonRect = subControlRect(control, bar,
+                                                   SC_TitleBarCloseButton);
+            QRect systemButtonRect = subControlRect(control, bar,
+                                                    SC_TitleBarSysMenu);
+            QRect labelRect = subControlRect(control, bar, SC_TitleBarLabel);
+            QRect gripRect = QRect(QPoint(labelRect.right() + 5, bar->rect.top() + 5),
+                                   QPoint(minButtonRect.left() - 5,
+                                          bar->rect.bottom() - 4));
+
+            QColor textColor = option->palette.color(QPalette::Text);
+            painter->setPen(textColor);
+            painter->setBrush(Qt::NoBrush);
+
+            drawItemText(painter, labelRect, Qt::TextShowMnemonic |
+                         Qt::AlignHCenter | Qt::AlignCenter,
+                         bar->palette, bar->state & State_Enabled, bar->text,
+                         textColor.isValid() ? QPalette::NoRole :
+                         QPalette::WindowText);
+
+            for (int i = 0; i < gripRect.width(); ++i) {
+                painter->setPen(i % 2 ? bar->palette.color(QPalette::Midlight)
+                                      : Qt::white);
+
+                for (int j = 0; j < 4; ++j) {
+                    painter->drawPoint(i + gripRect.left(),
+                               gripRect.top() - 2 + i % 4 + 4 * j);
+                }
+            }
+
+            QPixmap maximizePixmap(":/images/internalmaximize.png");
+            QPixmap minimizePixmap(":/images/internalminimize.png");
+            QPixmap closePixmap(":/images/internalclose.png");
+            QPixmap internalPixmap(":/images/internalsystem.png");
+            QPixmap internalCloseDownPixmap(":/images/internalclosedown.png");
+            QPixmap minimizeDownPixmap(":/images/internalminimizedown.png");
+            QPixmap maximizeDownPixmap(":/images/internalmaximizedown.png");
+
+            if (bar->activeSubControls & SC_TitleBarCloseButton &&
+                bar->state & State_Sunken)
+                painter->drawPixmap(closeButtonRect.topLeft(),
+                                    internalCloseDownPixmap);
+            else
+                painter->drawPixmap(closeButtonRect.topLeft(), closePixmap);
+
+            if (bar->activeSubControls & SC_TitleBarMinButton &&
+                bar->state & State_Sunken)
+                painter->drawPixmap(minButtonRect.topLeft(),
+                                    minimizeDownPixmap);
+            else
+                painter->drawPixmap(minButtonRect.topLeft(), minimizePixmap);
+
+            if (bar->activeSubControls & SC_TitleBarMaxButton &&
+                bar->state & State_Sunken)
+                painter->drawPixmap(maxButtonRect.topLeft(),
+                                    maximizeDownPixmap);
+            else
+                painter->drawPixmap(maxButtonRect.topLeft(), maximizePixmap);
+
+            painter->drawPixmap(systemButtonRect.topLeft(), internalPixmap);
+
+            break;
+        }
+        case CC_GroupBox: {
+            const QStyleOptionGroupBox *box =
+                qstyleoption_cast<const QStyleOptionGroupBox *>(option);
+
+            QRect frameRect = subControlRect(control, box, SC_GroupBoxFrame);
+            QRect labelRect = subControlRect(control, box, SC_GroupBoxLabel);
+            QRect contentsRect = subControlRect(control, box,
+                                                SC_GroupBoxContents);
+            QRect checkerRect = subControlRect(control, box,
+                                               SC_GroupBoxCheckBox);
+
+            int y = labelRect.center().y();
+
+            painter->setPen(box->palette.color(QPalette::Button));
+            painter->drawRect(frameRect.adjusted(2, y - frameRect.top(), -2,
+                                                 -2));
+
+            painter->setPen(box->palette.color(QPalette::Background));
+
+            if (box->subControls & SC_GroupBoxCheckBox) {
+                painter->drawLine(checkerRect.left() - 1, y,
+                                  checkerRect.right() + 2, y);
+                QStyleOptionButton checker;
+                checker.QStyleOption::operator=(*box);
+                checker.rect = checkerRect;
+                drawPrimitive(PE_IndicatorCheckBox, &checker, painter, widget);
+            }
+
+            if (box->subControls & SC_GroupBoxLabel && !box->text.isEmpty()) {
+                painter->drawLine(labelRect.left() - 1, y,
+                              labelRect.right() +1, y);
+
+                QColor textColor = box->textColor;
+                if (textColor.isValid())
+                    painter->setPen(textColor);
+
+                drawItemText(painter, labelRect,  Qt::TextShowMnemonic |
+                Qt::AlignHCenter | int(box->textAlignment),
+                box->palette, box->state & State_Enabled,
+                box->text, textColor.isValid() ? QPalette::NoRole :
+                QPalette::WindowText);
+            }
+            break;
+        }
+        case CC_SpinBox: {
+            const QStyleOptionSpinBox *spinner =
+            qstyleoption_cast<const QStyleOptionSpinBox *>(option);
+
+            QRect frameRect = subControlRect(control, spinner, SC_SpinBoxFrame);
+            QRect upRect = subControlRect(control, spinner, SC_SpinBoxUp);
+            QRect downRect = subControlRect(control, spinner, SC_SpinBoxDown);
+
+            painter->setPen(Qt::white);
+            painter->drawRect(frameRect.adjusted(1, 1, -1, -1));
+            painter->drawPoint(frameRect.bottomLeft());
+
+            painter->setPen(spinner->palette.color(QPalette::Mid));
+            painter->drawRect(frameRect.adjusted(0, 0, -1, -2));
+
+            bool isEnabled = (spinner->state & State_Enabled);
+            bool hover = isEnabled && (spinner->state & State_MouseOver);
+            bool sunken = (spinner->state & State_Sunken);
+            bool upIsActive = (spinner->activeSubControls == SC_SpinBoxUp);
+            bool downIsActive = (spinner->activeSubControls == SC_SpinBoxDown);
+            bool stepUpEnabled = spinner->stepEnabled &
+                             QAbstractSpinBox::StepUpEnabled;
+            bool stepDownEnabled = spinner->stepEnabled &
+                               QAbstractSpinBox::StepDownEnabled;
+
+            painter->setBrush(spinner->palette.color(QPalette::Background));
+
+            painter->drawRect(upRect);
+            if (upIsActive && stepUpEnabled) {
+                if (sunken) {
+                    drawSunkenButtonShadow(painter, upRect,
+                                       spinner->palette.color(QPalette::Mid));
+                } else if (hover) {
+                    drawButtonHoverFrame(painter, upRect,
+                    spinner->palette.color(QPalette::Mid),
+                    spinner->palette.color(QPalette::Button));
+                }
+            }
+
+            QStyleOptionSpinBox upSpin = *spinner;
+            upSpin.rect = upRect;
+            drawPrimitive(PE_IndicatorSpinUp, &upSpin, painter, widget);
+
+            painter->drawRect(downRect);
+            if (downIsActive && stepDownEnabled) {
+                if (sunken) {
+                    drawSunkenButtonShadow(painter, downRect,
+                    spinner->palette.color(QPalette::Mid));
+                } else if (hover) {
+                    drawButtonHoverFrame(painter, downRect,
+                    spinner->palette.color(QPalette::Mid),
+                    spinner->palette.color(QPalette::Button));
+                }
+            }
+
+            QStyleOptionSpinBox downSpin = *spinner;
+            downSpin.rect = downRect;
+            drawPrimitive(PE_IndicatorSpinDown, &downSpin, painter, widget);
+
+            break;
+        }
+        case CC_ToolButton: {
+            const QStyleOptionToolButton *button =
+                qstyleoption_cast<const QStyleOptionToolButton *>(option);
+
+            painter->setPen(Qt::white);
+            painter->drawRect(button->rect.adjusted(1, 1, -1, -1));
+
+            QStyleOptionToolButton panelOption = *button;
+            QRect panelRect;
+            if (!(button->state & State_MouseOver) &&
+                !(button->state & State_On)) {
+                painter->setPen(QColor(153, 153, 153));
+                painter->drawRect(button->rect.adjusted(0, 0, -2, -2));
+
+                panelRect = subControlRect(control, option, SC_ToolButton);
+                panelOption.rect = panelRect;
+            } else {
+                panelOption.rect.adjust(0, 0, -1, -1);
+            }
+
+            QRect menuRect = subControlRect(control, option, SC_ToolButtonMenu);
+
+            drawPrimitive(PE_PanelButtonTool, &panelOption, painter, widget);
+
+            QStyleOptionToolButton menuOption = *button;
+            menuOption.rect = menuRect;
+
+            QStyleOptionToolButton label = *button;
+            int fw = 5; 
+
+            drawControl(CE_ToolButtonLabel, &label, painter, widget);
+            if (button->subControls & SC_ToolButtonMenu) {
+                painter->setPen(button->palette.color(QPalette::WindowText));
+                drawPrimitive(PE_IndicatorArrowDown, &menuOption, painter, widget);
+            }
+
+            if (button->state & State_HasFocus) {
+                QStyleOptionToolButton focusOption = *button;
+                focusOption.rect = label.rect.adjusted(-1, -1, 1, 1);
+
+                drawPrimitive(PE_FrameFocusRect, &focusOption, painter, widget);
+            }
+            
+            break;
+        }
+        case CC_ComboBox: {
+            const QStyleOptionComboBox *combo =
+                qstyleoption_cast<const QStyleOptionComboBox *>(option);
+
+            QRect frameRect = subControlRect(control, option, SC_ComboBoxFrame,
+                                         widget);
+            painter->setPen(combo->palette.color(QPalette::Mid));
+
+            if (option->state & State_HasFocus)
+                painter->setBrush(option->palette.color(QPalette::Light));
+            else
+                painter->setBrush(combo->palette.color(QPalette::Background));
+
+            painter->drawRect(frameRect.adjusted(0, 0, -1, -1));
+
+            QRect arrowRect = subControlRect(control, option, SC_ComboBoxArrow,
+                                             widget);
+            painter->setPen(combo->palette.color(QPalette::Button));
+            painter->setBrush(Qt::NoBrush);
+
+            if (combo->direction == Qt::LeftToRight) {
+                painter->drawRect(QRect(frameRect.topLeft() + QPoint(1, 1),
+                                  arrowRect.bottomLeft() + QPoint(-2, -2)));
+            } else {
+                painter->drawRect(QRect(arrowRect.topLeft() + QPoint(1, 1),
+                                    frameRect.bottomRight() + QPoint(-2, -2)));
+            }
+
+            QStyleOptionButton button;
+            button.rect = arrowRect;
+            button.state = combo->state;
+            button.palette = combo->palette;
+
+            if (button.state & State_On)
+                button.state ^= State_On;
+
+            painter->save();
+            drawButtonBackground(&button, painter, false);
+            painter->restore();
+
+            QPoint center = arrowRect.center();
+            QPoint offset = QPoint(arrowRect.bottomLeft().x() + 1,
+                               center.y() + 7);
+            QPainterPath arrow;
+            arrow.moveTo(offset + QPoint(4, -8));
+            arrow.lineTo(offset + QPoint(7, -5));
+            arrow.lineTo(offset + QPoint(8, -5));
+            arrow.lineTo(offset + QPoint(11, -8));
+            arrow.lineTo(offset + QPoint(4, -8));
+
+            painter->setBrush(combo->palette.color(QPalette::WindowText));
+            painter->setPen(combo->palette.color(QPalette::WindowText));
+
+            painter->drawPath(arrow);
+
+            QRect fieldRect = subControlRect(control, option,
+                                             SC_ComboBoxEditField, widget);
+
+            break;
+        }
+        case CC_Slider: {
+            const QStyleOptionSlider *slider =
+                qstyleoption_cast<const QStyleOptionSlider *>(option);
+
+            bool horizontal = slider->orientation == Qt::Horizontal;
+
+            QRect groove = subControlRect(control, option, SC_SliderGroove,
+                                          widget);
+            QRect ticks = subControlRect(control, option, SC_SliderTickmarks,
+                                         widget);
+            QRect handle = subControlRect(control, option, SC_SliderHandle,
+                                          widget);
+
+            QRect afterHandle = QRect(handle.topLeft() + xySwitch(QPoint(4, 6), horizontal),
+                                      groove.bottomRight() + xySwitch(QPoint(-4, -6), horizontal));
+            QRect beforeHandle = QRect(groove.topLeft() + xySwitch(QPoint(4, 6), horizontal),
+                                       handle.bottomRight() + xySwitch(QPoint(-4, -6), horizontal));
+
+            if (slider->upsideDown || !horizontal) {
+                QRect remember;
+                remember = afterHandle;
+                afterHandle = beforeHandle;
+                beforeHandle = remember;
+            }
+
+            painter->setPen(slider->palette.color(QPalette::Mid));
+            painter->setBrush(option->palette.color(QPalette::Background));
+            painter->drawRect(afterHandle);
+            painter->setPen(slider->palette.color(QPalette::Light));
+            painter->drawLine(afterHandle.topLeft() + xySwitch(QPoint(0, 1), horizontal),
+                          afterHandle.topRight() + xySwitch(QPoint(0, 1), horizontal));
+            painter->setPen(option->palette.color(QPalette::Midlight));
+
+            if (horizontal) {
+                painter->setBrush(gradientBrush(QRect(QPoint(groove.x(),
+                                                handle.y() + 1),
+                                                QSize(groove.width(),
+                                                handle.height() + 1))));
+            } else {
+                QRect rect = QRect(QPoint(groove.x(),
+                                   handle.x() - 1),
+                                   QSize(groove.height(),
+                                   handle.width() + 1));
+                QLinearGradient gradient(groove.bottomLeft(),
+                                         groove.bottomRight());
+                gradient.setColorAt(1.0, QColor(188, 210, 230));
+                gradient.setColorAt(0.3, Qt::white);
+                gradient.setColorAt(0.0, QColor(223, 233, 243));
+
+                painter->setBrush(gradient);
+            }
+
+            painter->drawRect(beforeHandle);
+
+            QPainterPath handlePath;
+            QPainterPath innerPath;
+            QPoint topLeft, topRight, bottomLeft;
+            if (horizontal) {
+                topLeft = handle.topLeft();
+                topRight = handle.topRight();
+                bottomLeft = handle.bottomLeft();
+            } else {
+                topLeft = handle.bottomLeft();
+                topRight = handle.topLeft();
+                bottomLeft = handle.topRight();
+            }
+
+            if (horizontal) {
+                QImage image(sliderHandleImage);
+
+                image.setColor(1,
+                    option->palette.color(QPalette::Midlight).rgb());
+                image.setColor(2,
+                    option->palette.color(QPalette::Button).rgb());
+
+                if (!(slider->state & State_Enabled)) {
+                    image.setColor(4, slider->palette.color(QPalette::Background).rgb());
+                    image.setColor(5, slider->palette.color(QPalette::Background).rgb());
+                    image.setColor(6, slider->palette.color(QPalette::Background).rgb());
+                }
+
+                painter->drawImage(handle.topLeft(), image);
+            } else {
+                QImage image(":/images/verticalsliderhandle.png");
+                painter->drawImage(handle.topLeft(), image);
+            }
+
+            if (slider->tickPosition & QSlider::TicksBelow) {
+                painter->setPen(slider->palette.color(QPalette::Light));
+                int tickInterval = slider->tickInterval ? slider->tickInterval :
+                                                          slider->pageStep;
+
+                for (int i = 0; i <= slider->maximum; i += tickInterval) {
+                    if (horizontal) {
+                        int pos = int(((i / double(slider->maximum)) *
+                            ticks.width()) - 1);
+                        painter->drawLine(QPoint(ticks.left() + pos,
+                        ticks.top() + 2), QPoint(ticks.left() + pos, ticks.top() + 8));
+                    } else {
+                        int pos = int(((i / double(slider->maximum)) *
+                            ticks.height()) - 1);
+                        painter->drawLine(QPoint(ticks.left() + 2, ticks.bottom() - pos),
+                                          QPoint(ticks.right() - 2, ticks.bottom() - pos));
+                    }
+                }
+                if (horizontal) {
+                    painter->drawLine(QPoint(ticks.right(), ticks.top() + 2),
+                                      QPoint(ticks.right(), ticks.top() + 8));
+                } else {
+                    painter->drawLine(QPoint(ticks.left() + 2, ticks.top()),
+                              QPoint(ticks.right() - 2, ticks.top()));
+                }
+            }
+            break;
+        }
+        default:
+            QWindowsStyle::drawComplexControl(control, option, painter, widget);
+    }
+    painter->restore();
+}
+
+inline void JavaStyle::drawSunkenButtonShadow(QPainter *painter,
+                                              QRect rect,
+                                              const QColor &frameColor,
+                                              bool reverse) const
+{
+    painter->save();
+
+    painter->setPen(frameColor);
+
+    if (!reverse) {
+        painter->drawLine(QLine(QPoint(rect.x() + 1, rect.y() + 1),
+                                QPoint(rect.x() + rect.width() - 1, rect.y() + 1)));
+        painter->drawLine(QLine(QPoint(rect.x() + 1, rect.y()),
+                                QPoint(rect.x() + 1, rect.y() + rect.height())));
+    } else {
+        painter->drawLine(QLine(QPoint(rect.right(), rect.bottom()),
+                                QPoint(rect.right(), rect.top())));
+        painter->drawLine(QLine(QPoint(rect.left(), rect.top() + 1),
+                                QPoint(rect.right(), rect.top() + 1)));
+    }
+    painter->restore();
+}
+
+inline void JavaStyle::drawButtonHoverFrame(QPainter *painter, QRect rect,
+                                            const QColor &frameColor,
+                                            const QColor &activeFrame) const
+{
+    painter->save();
+
+    painter->setPen(activeFrame);
+    painter->drawRect(rect);
+    rect.adjust(1, 1, -1, -1);
+    painter->setPen(frameColor);
+    painter->drawRect(rect);
+    rect.adjust(1, 1, -1, -1);
+    painter->setPen(activeFrame);
+    painter->drawRect(rect);
+
+    painter->restore();
+}
+
+QStyle::SubControl JavaStyle::hitTestComplexControl(ComplexControl control,
+                                                    const QStyleOptionComplex *option,
+                                                    const QPoint &pos,
+                                                    const QWidget *widget) const
+{
+    SubControl ret = SC_None;
+
+    switch (control) {
+        case CC_TitleBar: {
+            const QStyleOptionTitleBar *bar =
+                qstyleoption_cast<const QStyleOptionTitleBar *>(option);
+
+            QRect maximize = subControlRect(control, bar, SC_TitleBarMaxButton);
+            if (maximize.contains(pos)) {
+                ret = SC_TitleBarMaxButton;
+                break;
+            }
+            QRect minimize = subControlRect(control, bar, SC_TitleBarMinButton);
+            if (minimize.contains(pos)) {
+                ret = SC_TitleBarMinButton;
+                break;
+            }
+            QRect close = subControlRect(control, bar, SC_TitleBarCloseButton);
+            if (close.contains(pos)) {
+                ret = SC_TitleBarCloseButton;
+                break;
+            }
+            QRect system = subControlRect(control, bar, SC_TitleBarSysMenu);
+            if (system.contains(pos)) {
+                ret = SC_TitleBarSysMenu;
+                break;
+            }
+            ret = SC_TitleBarLabel;
+            break;
+        }
+        case CC_ScrollBar:
+            if (const QStyleOptionSlider *scrollBar =
+                qstyleoption_cast<const QStyleOptionSlider *>(option)) {
+                    QRect slider = subControlRect(control, scrollBar,
+                                                  SC_ScrollBarSlider, widget);
+                if (slider.contains(pos)) {
+                    ret = SC_ScrollBarSlider;
+                    break;
+                }
+
+                QRect scrollBarAddLine = subControlRect(control, scrollBar,
+                    SC_ScrollBarAddLine, widget);
+                if (scrollBarAddLine.contains(pos)) {
+                    ret = SC_ScrollBarAddLine;
+                    break;
+                }
+
+                QRect scrollBarSubPage = subControlRect(control, scrollBar,
+                            SC_ScrollBarSubPage, widget);
+                if (scrollBarSubPage.contains(pos)) {
+                    ret = SC_ScrollBarSubPage;
+                    break;
+                }
+
+                QRect scrollBarAddPage = subControlRect(control, scrollBar,
+                            SC_ScrollBarAddPage, widget);
+                if (scrollBarAddPage.contains(pos)) {
+                    ret = SC_ScrollBarAddPage;
+                    break;
+                }
+
+                QRect scrollBarSubLine = subControlRect(control, scrollBar,
+                            SC_ScrollBarSubLine, widget);
+                if (scrollBarSubLine.contains(pos)) {
+                    ret = SC_ScrollBarSubLine;
+                    break;
+                }
+            }
+            break;
+
+        default:
+            ret = QWindowsStyle::hitTestComplexControl(control, option, pos,
+                                                       widget);
+    }
+    return ret;
+}
+
+void JavaStyle::polish(QWidget *widget)
+{
+    if (qobject_cast<QCheckBox *>(widget) ||
+        qobject_cast<QRadioButton *>(widget) ||
+        qobject_cast<QPushButton *>(widget) ||
+        qobject_cast<QToolButton *>(widget) ||
+        qobject_cast<QSpinBox *>(widget) ||
+        qobject_cast<QGroupBox *>(widget))
+            widget->setAttribute(Qt::WA_Hover, true);
+}
+
+void JavaStyle::unpolish(QWidget *widget)
+{
+    if (qobject_cast<QPushButton *>(widget) ||
+        qobject_cast<QCheckBox *>(widget) ||
+        qobject_cast<QRadioButton *>(widget) ||
+        qobject_cast<QToolButton *>(widget) ||
+        qobject_cast<QSpinBox *>(widget) ||
+        qobject_cast<QGroupBox *>(widget))
+            widget->setAttribute(Qt::WA_Hover, false);
+}
+
+void JavaStyle::drawSplitter(const QStyleOption *option, QPainter *painter,
+                 bool horizontal) const
+{
+    QRect rect = option->rect;
+
+    painter->setPen(Qt::NoPen);
+    painter->setBrush(option->palette.color(QPalette::Background));
+
+    painter->drawRect(rect);
+
+    QColor colors[] = { Qt::white, option->palette.color(QPalette::Mid) };
+    int iterations = horizontal ? rect.height() - 1 : rect.width() - 1;
+    for (int i = 0; i < iterations; ++i) {
+        painter->setPen(colors[i % 2]);
+        painter->drawPoint(xySwitch(QPoint(rect.x() + 0 + (i % 4),
+                                           rect.y() + i), horizontal));
+    }
+}
+
+inline QPoint JavaStyle::xySwitch(const QPoint &point, bool horizontal) const
+{
+    QPoint retPoint = point;
+
+    if (!horizontal) {
+        retPoint = QPoint(point.y(), point.x());
+    }
+
+    return retPoint;
+}
+
+void JavaStyle::drawPrimitive(PrimitiveElement element,
+                              const QStyleOption *option,
+                              QPainter *painter,
+                              const QWidget *widget) const
+{
+    painter->save();
+
+    switch (element) {
+        case PE_PanelButtonBevel:
+        case PE_FrameButtonBevel: {
+            painter->save();
+            painter->setBrush(option->palette.background());
+            painter->setPen(Qt::NoPen);
+            painter->drawRect(option->rect);
+            painter->restore();
+            break;
+        }
+        case PE_IndicatorBranch: {
+            painter->save();
+            QColor lineColor(204, 204, 255);
+            QPixmap openPixmap(":/images/jtreeopen.png");
+            QPixmap closedPixmap(":/images/jtreeclosed.png");
+            QRect pixmapRect(QPoint(0, 0), QSize(12, 12));
+            pixmapRect.moveCenter(option->rect.center());
+            pixmapRect.translate(2, 0);
+            QPoint center = option->rect.center();
+
+            painter->setPen(lineColor);
+            painter->setBrush(Qt::NoBrush);
+
+            if (option->state & State_Item) {
+                painter->drawLine(center,
+                                  QPoint(option->rect.right(), center.y()));
+
+                painter->drawLine(center, QPoint(center.x(),
+                                  option->rect.top()));
+
+                if (option->state & State_Sibling) {
+                    painter->drawLine(center, QPoint(center.x(),
+                                      option->rect.bottom()));
+                }
+                
+                if (option->state & State_Children)
+                    if (option->state & State_Open)
+                        painter->drawPixmap(pixmapRect.topLeft(), closedPixmap);
+                    else
+                        painter->drawPixmap(pixmapRect.topLeft(), openPixmap);
+            } else if (option->state & State_Sibling) {
+                painter->drawLine(center.x(), option->rect.top(), center.x(),
+                                  option->rect.bottom());
+            }
+
+            painter->restore();
+            break;
+        }
+        case PE_IndicatorViewItemCheck: {
+            break;
+        }
+        case PE_FrameWindow: {
+            painter->save();
+            bool active = option->state & State_Active;
+
+            painter->setPen(Qt::NoPen);
+            painter->setBrush(active ? option->palette.color(QPalette::Midlight)
+                                     : option->palette.color(QPalette::Mid));
+
+            painter->drawRect(QRect(option->rect.topLeft(), option->rect.bottomLeft() + QPoint(5, 0)));
+            painter->drawRect(QRect(option->rect.bottomLeft(), option->rect.bottomRight() + QPoint(0, -5)));
+            painter->drawRect(QRect(option->rect.bottomRight() + QPoint(-5, 0), option->rect.topRight()));
+            painter->drawRect(QRect(option->rect.topLeft(), option->rect.topRight() + QPoint(0, 4)));
+
+            painter->setBrush(Qt::NoBrush);
+            painter->setPen(option->palette.color(QPalette::Active, QPalette::WindowText));
+            painter->drawLine(option->rect.topLeft() + QPoint(2, 14),
+                              option->rect.bottomLeft() + QPoint(2, -14));
+
+            painter->drawLine(option->rect.topRight() + QPoint(-2, 14),
+                              option->rect.bottomRight() + QPoint(-2, -14));
+
+            painter->drawLine(option->rect.topLeft() + QPoint(14, 2),
+                              option->rect.topRight() + QPoint(-14, 2));
+
+            painter->drawLine(option->rect.bottomLeft() + QPoint(14, -2),
+                              option->rect.bottomRight() + QPoint(-14, -2));
+
+            painter->setPen(active ? option->palette.color(QPalette::Light) :
+                            option->palette.color(QPalette::Button));
+            painter->drawLine(option->rect.topLeft() + QPoint(3, 15),
+                              option->rect.bottomLeft() + QPoint(3, -13));
+
+            painter->drawLine(option->rect.topRight() + QPoint(-1, 15),
+                              option->rect.bottomRight() + QPoint(-1, -13));
+
+            painter->drawLine(option->rect.topLeft() + QPoint(15, 3),
+                              option->rect.topRight() + QPoint(-13, 3));
+
+            painter->drawLine(option->rect.bottomLeft() + QPoint(15, -1),
+                              option->rect.bottomRight() + QPoint(-13, -1));
+
+            painter->restore();
+            break;
+        }
+        case PE_IndicatorSpinUp: {
+            const QStyleOptionSpinBox *spinner =
+                qstyleoption_cast<const QStyleOptionSpinBox *>(option);
+            int add = spinner->state & State_Sunken &&
+                    spinner->activeSubControls & SC_SpinBoxUp ? 1 : 0;
+
+            QPoint center = option->rect.center();
+            painter->drawLine(center.x() + add, center.y() + 1 + add,
+                              center.x() + 2 + add, center.y() + 1 + add);
+            painter->drawPoint(center.x() + 1 + add, center.y() + add);
+            break;
+        }
+        case PE_IndicatorSpinDown: {
+            const QStyleOptionSpinBox *spinner =
+                qstyleoption_cast<const QStyleOptionSpinBox *>(option);
+
+            int add = spinner->state & State_Sunken &&
+                      spinner->activeSubControls & SC_SpinBoxDown ? 1 : 0;
+            QPoint center = option->rect.center();
+            painter->drawLine(center.x() + add, center.y() + add,
+                              center.x() + 2 + add, center.y() + add);
+            painter->drawPoint(center.x() + 1 + add, center.y() + 1 + add);
+            break;
+        }
+        case PE_FrameDockWidget: { 
+            drawPrimitive(PE_FrameWindow, option, painter, widget);
+            break;
+        }
+        case PE_IndicatorToolBarHandle: {
+            QPoint offset;
+            bool horizontal = option->state & State_Horizontal;
+
+            if (horizontal)
+                offset = option->rect.topLeft();
+            else
+                offset = option->rect.topLeft();
+
+            int iterations = horizontal ? option->rect.height() :
+                                          option->rect.width();
+
+            for (int i = 0; i < iterations; ++i) {
+                painter->setPen(i % 2 ? Qt::white :
+                    option->palette.color(QPalette::Mid));
+                int add = i % 4;
+                painter->drawPoint(offset + xySwitch(QPoint(add, i),
+                                                     horizontal));
+                painter->drawPoint(offset + xySwitch(QPoint(add + 4, i),
+                                                     horizontal));
+                if (add + 8 < 10)
+                    painter->drawPoint(offset + xySwitch(QPoint(add + 8, i),
+                                       horizontal));
+            }
+            
+            break;
+        }
+        case PE_IndicatorToolBarSeparator: {
+            break;
+        }
+        case PE_PanelButtonTool: {
+            const QStyleOptionToolButton *button =
+            qstyleoption_cast<const QStyleOptionToolButton *>(option);
+
+            if (!button)  {
+                painter->setPen(Qt::red);
+                if (!(option->state & State_Enabled))
+                    painter->drawRect(option->rect.adjusted(0, 0, -1, -1));
+                drawButtonBackground(option, painter, false);
+                break;
+            }
+
+            if (button->state & State_MouseOver || button->state & State_On) {
+                QStyleOptionButton bevel;
+                bevel.state = button->state;
+                bevel.rect = button->rect;
+                bevel.palette = button->palette;
+
+                drawButtonBackground(&bevel, painter, false);
+            } else {
+                painter->setPen(Qt::NoPen);
+                painter->setBrush(button->palette.color(QPalette::Background));
+
+                painter->drawRect(button->rect.adjusted(0, 0, -1, -1));
+            }
+            break;
+        }
+        case PE_FrameMenu: {
+            painter->setPen(option->palette.color(QPalette::Midlight));
+            painter->drawRect(option->rect.adjusted(0, 0, -1, -1));
+            break;
+        }
+        case PE_PanelButtonCommand: {
+            const QStyleOptionButton *btn =
+                qstyleoption_cast<const QStyleOptionButton *>(option);
+            bool hover = (btn->state & State_Enabled) &&
+                         (btn->state & State_MouseOver);
+            bool sunken = btn->state & State_Sunken;
+            bool isDefault = btn->features & QStyleOptionButton::DefaultButton;
+            bool on = option->state & State_On;
+
+            drawButtonBackground(option, painter, false);
+
+            QRect rect = option->rect.adjusted(0, 0, -1, -1);
+            if (hover && !sunken && !isDefault && !on) {
+                drawButtonHoverFrame(painter, rect,
+                    btn->palette.color(QPalette::Mid),
+                    btn->palette.color(QPalette::Button));
+            } else if (isDefault) {
+                drawPrimitive(PE_FrameDefaultButton, option, painter, widget);
+            }
+            break;
+        }
+        case PE_FrameDefaultButton: {
+            painter->setPen(option->palette.color(QPalette::Mid));
+            QRect rect = option->rect.adjusted(0, 0, -1, -1);
+            painter->drawRect(rect);
+            painter->drawRect(rect.adjusted(1, 1, -1, -1));
+            break;
+        }
+//! [0]
+        case PE_IndicatorCheckBox: {
+            painter->save();
+            drawButtonBackground(option, painter, true);
+
+            if (option->state & State_Enabled &&
+                option->state & State_MouseOver &&
+                !(option->state & State_Sunken)) {
+                painter->setPen(option->palette.color(QPalette::Button));
+                QRect rect = option->rect.adjusted(1, 1, -2, -2);
+                painter->drawRect(rect);
+                rect = rect.adjusted(1, 1, -1, -1);
+                painter->drawRect(rect);
+            }
+
+            if (option->state & State_On) {
+                QImage image(":/images/checkboxchecked.png");
+                painter->drawImage(option->rect.topLeft(), image);
+            }
+            painter->restore();
+            break;
+//! [0]
+        }
+        case PE_IndicatorRadioButton: {
+            painter->save();
+            QBrush radioBrush = option->palette.button();
+
+            if (!(option->state & State_Sunken) &&
+                option->state & State_Enabled)
+                radioBrush = gradientBrush(option->rect);
+
+            painter->setBrush(radioBrush);
+            if (option->state & State_Enabled)
+                painter->setPen(option->palette.color(QPalette::Mid));
+            else
+                painter->setPen(option->palette.color(QPalette::Disabled,
+                                                      QPalette::WindowText));
+            painter->drawEllipse(option->rect.adjusted(0, 0, -1, -1));
+
+            if (option->state & State_MouseOver &&
+                option->state & State_Enabled &&
+                !(option->state & State_Sunken)) {
+                gradientBrush(option->rect);
+                painter->setPen(option->palette.color(QPalette::Button));
+                painter->setBrush(Qt::NoBrush);
+                QRect rect = option->rect.adjusted(1, 1, -2, -2);
+                painter->drawEllipse(rect);
+                rect = rect.adjusted(1, 1, -1, -1);
+                painter->drawEllipse(rect);
+            }
+
+            if (option->state & State_On) {
+                painter->setBrush(option->palette.color(QPalette::Text));
+                painter->setPen(Qt::NoPen);
+                painter->drawEllipse(option->rect.adjusted(3, 3, -3, -3));
+            }
+            if (option->state & State_Sunken &&
+                option->state & State_Enabled) {
+                painter->setPen(option->palette.color(QPalette::Mid));
+                painter->drawArc(option->rect.adjusted(1, 1, -2, -2), 80 * 16,
+                                 100 * 16);
+            }
+            painter->restore();
+            break;
+        }
+        case PE_FrameTabWidget: {
+            painter->setPen(option->palette.color(QPalette::Midlight));
+            painter->drawRect(option->rect.adjusted(0, 0, -1, -1));
+            painter->setPen(Qt::white);
+            painter->drawRect(option->rect.adjusted(1, 1, -2, -2));
+            break;
+        }
+        case PE_Frame:
+        case PE_FrameLineEdit: {
+            const QStyleOptionFrame *frame =
+                qstyleoption_cast<const QStyleOptionFrame *>(option);
+            const QStyleOptionFrameV2 frameV2(*frame);
+
+            painter->setPen(frame->palette.color(QPalette::Mid));
+            painter->drawRect(frameV2.rect.adjusted(0, 0, -2, -2));
+            painter->setPen(Qt::white);
+            painter->drawRect(frameV2.rect.adjusted(1, 1, -1, -1));
+            painter->setPen(frameV2.palette.color(QPalette::Active,
+                                                  QPalette::Background));
+            painter->drawLine(frameV2.rect.bottomLeft(),
+            frameV2.rect.bottomLeft() + QPoint(1, -1));
+            painter->drawLine(frameV2.rect.topRight(),
+            frameV2.rect.topRight() + QPoint(-1, 1));
+            break;
+        }
+        case PE_FrameFocusRect: {
+            painter->setPen(option->palette.color(QPalette::Light));
+            painter->setBrush(Qt::NoBrush);
+            QRect rect = option->rect;
+            rect = rect.adjusted(0,0, -1, -1);
+            painter->drawRect(rect);
+            break;
+        }
+        default:
+            QWindowsStyle::drawPrimitive(element, option, painter, widget);
+    }
+    painter->restore();
+}
+
+//! [1]
+void JavaStyle::drawButtonBackground(const QStyleOption *option,
+                                     QPainter *painter, bool isCheckbox) const
+{
+    QBrush buttonBrush = option->palette.button();
+    bool sunken = option->state & State_Sunken;
+    bool disabled = !(option->state & State_Enabled);
+    bool on = option->state & State_On;
+
+    if (!sunken && !disabled && (!on || isCheckbox))
+        buttonBrush = gradientBrush(option->rect);
+
+        painter->fillRect(option->rect, buttonBrush);
+
+        QRect rect = option->rect.adjusted(0, 0, -1, -1);
+
+        if (disabled)
+            painter->setPen(option->palette.color(QPalette::Disabled,
+                                                  QPalette::WindowText));
+        else
+            painter->setPen(option->palette.color(QPalette::Mid));
+
+        painter->drawRect(rect);
+
+        if (sunken && !disabled) {
+            drawSunkenButtonShadow(painter, rect,
+                   option->palette.color(QPalette::Mid),
+                   option->direction == Qt::RightToLeft);
+    }
+}
+//! [1]
+
+QBrush JavaStyle::gradientBrush(const QRect &rect) const
+{
+    QLinearGradient gradient(rect.topLeft(), rect.bottomLeft());
+    gradient.setColorAt(1.0, QColor(188, 210, 230));
+    gradient.setColorAt(0.3, Qt::white);
+    gradient.setColorAt(0.0, QColor(223, 233, 243));
+
+    return QBrush(gradient);
+}
+
+QRect JavaStyle::subElementRect(SubElement element,
+                                const QStyleOption *option,
+                                const QWidget *widget) const
+{
+    QRect rect;
+
+    switch (element) {
+        case SE_ToolBoxTabContents: {
+            const QStyleOptionToolBox *box =
+                qstyleoption_cast<const QStyleOptionToolBox *>(option);
+
+            rect.moveTopLeft(box->rect.topLeft() + QPoint(0, 2));
+            rect.setHeight(box->rect.height() - 4);
+            rect.setWidth(box->fontMetrics.width(box->text) + 15);
+            break;
+        }
+        case SE_ProgressBarLabel:
+        case SE_ProgressBarGroove:
+        case SE_ProgressBarContents: {
+            rect = option->rect.adjusted(1, 1, -1, -1);
+            break;
+        }
+        case SE_PushButtonFocusRect: {
+            const QStyleOptionButton *btn =
+                qstyleoption_cast<const QStyleOptionButton *>(option);
+
+            rect = btn->fontMetrics.boundingRect(btn->text);
+            rect = QRect(0, 0, btn->fontMetrics.width(btn->text),
+                         rect.height());
+
+            if (!btn->icon.isNull()) {
+                rect.adjust(0, 0, btn->iconSize.width(), btn->iconSize.height()
+                    > rect.height() ? btn->iconSize.height() - rect.height() : 0);
+                rect.translate(-btn->iconSize.width(), 0);
+                rect.adjust(-1, -1, 1, 1);
+            }
+            rect = QRect(int(ceil((btn->rect.width() - rect.width()) / 2.0)),
+                         int(ceil((btn->rect.height() - rect.height()) / 2.0)),
+                         rect.width() - 1, rect.height());
+            rect.adjust(-1, 0, 1, 0);
+
+            break;
+        }
+        default:
+            rect = QWindowsStyle::subElementRect(element, option, widget);
+    }
+    return rect;
+}
+
+int JavaStyle::pixelMetric(PixelMetric metric,
+                           const QStyleOption* /* option */,
+                           const QWidget* /*widget*/) const
+{
+    int value = 0;
+
+    switch (metric) {
+        case PM_ButtonShiftHorizontal:
+        case PM_ButtonShiftVertical:
+        case PM_TabBarTabShiftHorizontal:
+        case PM_ButtonDefaultIndicator:
+        case PM_TabBarTabShiftVertical:
+            value = 0;
+            break;
+        case PM_TabBarBaseOverlap:
+        case PM_DefaultFrameWidth:
+            value = 2;
+            break;
+        case PM_TabBarTabVSpace:
+            value = 4;
+            break;
+        case PM_ScrollBarExtent:
+            value = 16;
+            break;
+        case PM_ScrollBarSliderMin:
+            value = 26;
+            break;
+        case PM_SplitterWidth:
+            value = 8;
+            break;
+        case PM_SliderThickness:
+            value = 16;
+            break;
+        case PM_SliderControlThickness:
+            value = 16;
+            break;
+        case PM_SliderTickmarkOffset:
+            value = 10;
+            break;
+        case PM_SliderSpaceAvailable:
+            break;
+        case PM_MenuPanelWidth:
+            value = 1;
+            break;
+        case PM_MenuVMargin:
+            value = 2;
+            break;
+        case PM_MenuBarPanelWidth:
+            value = 1;
+            break;
+        case PM_MenuBarItemSpacing:
+            value = 0;
+            break;
+        case PM_MenuBarHMargin:
+            value = 3;
+            break;
+        case PM_MenuBarVMargin:
+            value = 0;
+            break;
+        case PM_ComboBoxFrameWidth:
+            value = 1;
+            break;
+        case PM_MenuButtonIndicator:
+            value = 15;
+            break;
+        case PM_ToolBarItemMargin:
+            value = 3;
+            break;
+        case PM_ToolBarHandleExtent:
+            value = 13;
+            break;
+        case PM_SpinBoxFrameWidth:
+            value = 2;
+            break;
+        case PM_TitleBarHeight: {
+            value = 21;
+            break;
+        case PM_MDIFrameWidth:
+            value = 6;
+            break;
+        }
+        case PM_DockWidgetFrameWidth: {
+            value = 5;
+            break;
+        }
+        default:
+            value = QWindowsStyle::pixelMetric(metric);
+    }
+    return value;
+}
+
+
+int JavaStyle::styleHint(StyleHint hint, const QStyleOption *option,
+                         const QWidget *widget,
+                         QStyleHintReturn *returnData) const
+{
+    int ret;
+
+    switch (hint) {
+        case SH_Table_GridLineColor: {
+            ret = static_cast<int>(option->palette.color(QPalette::Mid).rgb());
+            break;
+        }
+        case QStyle::SH_Menu_Scrollable:
+            ret = 1; 
+            break;
+        default:
+            ret = QWindowsStyle::styleHint(hint, option, widget, returnData);
+    }
+    return ret;
+}
+
+QPixmap JavaStyle::standardPixmap(StandardPixmap standardPixmap,
+                  const QStyleOption *option,
+                  const QWidget *widget) const
+{
+    QPixmap pixmap = QWindowsStyle::standardPixmap(standardPixmap, option,
+                                                   widget);
+
+    QPixmap maximizePixmap(":/images/internalmaximize.png");
+    QPixmap minimizePixmap(":/images/internalminimize.png");
+    QPixmap closePixmap(":/images/internalclose.png");
+    QPixmap internalPixmap(":/images/internalsystem.png");
+    QPixmap internalCloseDownPixmap(":/images/internalclosedown.png");
+    QPixmap minimizeDownPixmap(":/images/internalminimizedown.png");
+    QPixmap maximizeDownPixmap(":/images/internalmaximizedown.png");
+    QPixmap dirOpenPixmap(":/images/open24.png");
+    QPixmap filePixmap(":/images/file.png");
+
+    switch (standardPixmap) {
+        case SP_DirLinkIcon:
+        case SP_DirClosedIcon:
+        case SP_DirIcon:
+        case SP_DirOpenIcon: {
+            pixmap = closePixmap;
+            break;
+        }
+        case SP_FileIcon: {
+            pixmap = filePixmap;
+            break;
+        }
+        case SP_FileDialogBack: {
+            pixmap = QPixmap(":/images/fileback.png");
+            break;
+        }
+        case SP_FileDialogToParent: {
+            pixmap = QPixmap(":/images/fileparent.png");
+            break;
+        }
+        case SP_FileDialogNewFolder: {
+            pixmap = QPixmap(":/images/open24.png");
+            break;
+        }
+        case SP_FileDialogListView: {
+            pixmap = QPixmap(":/images/filelist.png");
+            break;
+        }
+        case SP_FileDialogDetailedView: {
+            pixmap = QPixmap(":/images/filedetail.png");
+            break;
+        }
+        case SP_MessageBoxInformation: {
+            pixmap = QPixmap(":/images/information.png");
+            break;
+        }
+        case SP_MessageBoxWarning: {
+            pixmap = QPixmap(":/images/warning.png");
+        }
+        case SP_MessageBoxCritical: {
+            pixmap = QPixmap(":/images/critical.png");
+            break;
+        }
+        case SP_MessageBoxQuestion: {
+            pixmap = QPixmap(":/images/question.png");
+            break;
+        }
+        case SP_TitleBarNormalButton:
+            pixmap = maximizePixmap;
+            break;
+        case SP_TitleBarCloseButton:
+            pixmap = closePixmap;
+            break;
+        default:
+            ;
+    }
+
+    return pixmap;
+}
+
+QSize JavaStyle::sizeFromContents(ContentsType type,
+                                  const QStyleOption *option,
+                                  const QSize &contentsSize,
+                                  const QWidget *widget) const
+{
+    switch (type) {
+        case CT_ComboBox: {
+            return QSize(contentsSize.width() + 27, contentsSize.height());
+        }
+        case CT_Slider: {
+            const QStyleOptionSlider *slider =
+                qstyleoption_cast<const QStyleOptionSlider *>(option);
+            if (slider->tickPosition == QSlider::TicksBelow) {
+                return QSize(contentsSize.width(), contentsSize.height() + 15);
+            } else {
+                return contentsSize;
+            }
+        }
+        case CT_MenuBarItem: {
+            const QStyleOptionMenuItem *menuItem =
+                qstyleoption_cast<const QStyleOptionMenuItem *>(option);
+            QFontMetrics metrics(menuItem->font);
+            QRect boundingRect = metrics.boundingRect(menuItem->text);
+            int width = boundingRect.width() + 14;
+            int height = boundingRect.height() + 3;
+            if (height < 20)
+                height = 20;
+
+            return QSize(width, height);
+        }
+        case CT_MenuItem: {
+            const QStyleOptionMenuItem *menuItem =
+                qstyleoption_cast<const QStyleOptionMenuItem *>(option);
+            QSize defaultSize =  QWindowsStyle::sizeFromContents(type, option,
+                contentsSize, widget);
+
+            if (menuItem->menuItemType == QStyleOptionMenuItem::Separator)
+                return defaultSize;
+
+            int width = 30;
+            int height = 0;
+
+            if (!menuItem->icon.isNull()) {
+                width += 20; 
+                height += 20;
+            }
+            if (!menuItem->text.isEmpty()) {
+                QFontMetrics metrics(menuItem->font);
+                QString text = menuItem->text;
+                text.remove(QLatin1Char('\t'));
+                QRect textRect = metrics.boundingRect(text);
+                width += textRect.width();
+                if (height < textRect.height())
+                    height += textRect.height();
+            }
+            if (menuItem->checkType != QStyleOptionMenuItem::NotCheckable) {
+                width += 10;
+                if (height < 10)
+                    height = 10;
+            }
+            return QSize(width, height);
+        }
+        default:
+            return QWindowsStyle::sizeFromContents(type, option, contentsSize,
+                                                   widget);
+    }
+}
diff --git a/doc/src/snippets/layouts/layouts.cpp b/doc/src/snippets/layouts/layouts.cpp
new file mode 100644
index 0000000000..551bfc7d2b
--- /dev/null
+++ b/doc/src/snippets/layouts/layouts.cpp
@@ -0,0 +1,130 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    {
+//! [0]
+    QWidget *window = new QWidget;
+//! [0] //! [1]
+    QPushButton *button1 = new QPushButton("One");
+//! [1] //! [2]
+    QPushButton *button2 = new QPushButton("Two");
+    QPushButton *button3 = new QPushButton("Three");
+    QPushButton *button4 = new QPushButton("Four");
+    QPushButton *button5 = new QPushButton("Five");
+//! [2]
+
+//! [3]
+    QHBoxLayout *layout = new QHBoxLayout;
+//! [3] //! [4]
+    layout->addWidget(button1);
+    layout->addWidget(button2);
+    layout->addWidget(button3);
+    layout->addWidget(button4);
+    layout->addWidget(button5);
+
+    window->setLayout(layout);
+//! [4] //! [5]
+    window->show();
+//! [5]
+    }
+    
+    {
+//! [6]
+    QWidget *window = new QWidget;
+//! [6] //! [7]
+    QPushButton *button1 = new QPushButton("One");
+//! [7] //! [8]
+    QPushButton *button2 = new QPushButton("Two");
+    QPushButton *button3 = new QPushButton("Three");
+    QPushButton *button4 = new QPushButton("Four");
+    QPushButton *button5 = new QPushButton("Five");
+//! [8]
+
+//! [9]
+    QVBoxLayout *layout = new QVBoxLayout;
+//! [9] //! [10]
+    layout->addWidget(button1);
+    layout->addWidget(button2);
+    layout->addWidget(button3);
+    layout->addWidget(button4);
+    layout->addWidget(button5);
+
+    window->setLayout(layout);
+//! [10] //! [11]
+    window->show();
+//! [11]
+    }
+    
+    {
+//! [12]
+    QWidget *window = new QWidget;
+//! [12] //! [13]
+    QPushButton *button1 = new QPushButton("One");
+//! [13] //! [14]
+    QPushButton *button2 = new QPushButton("Two");
+    QPushButton *button3 = new QPushButton("Three");
+    QPushButton *button4 = new QPushButton("Four");
+    QPushButton *button5 = new QPushButton("Five");
+//! [14]
+
+//! [15]
+    QGridLayout *layout = new QGridLayout;
+//! [15] //! [16]
+    layout->addWidget(button1, 0, 0);
+    layout->addWidget(button2, 0, 1);
+    layout->addWidget(button3, 1, 0, 1, 2);
+    layout->addWidget(button4, 2, 0);
+    layout->addWidget(button5, 2, 1);
+
+    window->setLayout(layout);
+//! [16] //! [17]
+    window->show();
+//! [17]
+    }
+
+    return app.exec();
+}
diff --git a/doc/src/snippets/layouts/layouts.pro b/doc/src/snippets/layouts/layouts.pro
new file mode 100644
index 0000000000..79dd54cc3b
--- /dev/null
+++ b/doc/src/snippets/layouts/layouts.pro
@@ -0,0 +1,12 @@
+######################################################################
+# Automatically generated by qmake (2.00a) Wed May 4 15:30:40 2005
+######################################################################
+
+TEMPLATE = app
+INCLUDEPATH += .
+
+# Input
+SOURCES += layouts.cpp
+CONFIG += qt warn_on debug  create_prl link_prl
+OBJECTS_DIR=.obj/debug-shared
+MOC_DIR=.moc/debug-shared
diff --git a/doc/src/snippets/mainwindowsnippet.cpp b/doc/src/snippets/mainwindowsnippet.cpp
new file mode 100644
index 0000000000..ab0401d1d0
--- /dev/null
+++ b/doc/src/snippets/mainwindowsnippet.cpp
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+MainWindow::MainWindow()
+{
+    createMenus();
+    createToolBars();
+    createDockWidgets();
+    //setMenuWidget(new QPushButton("Hello"));
+}
+
+void MainWindow::createMenus()
+{
+    //setMenuWidget(new QPushButton("Hello"));
+    QMenu *menu = new QMenu("File");
+    menu->addAction("Save &As");
+    
+    QMenuBar *bar = new QMenuBar;
+    bar->addMenu(menu);
+    
+    setMenuWidget(new QWidget());
+}
+
+void MainWindow::createToolBars()
+{
+    setToolButtonStyle(Qt::ToolButtonTextOnly);
+    QToolBar *t1 = new QToolBar;
+    t1->addAction(new QAction("t1", this));
+
+    QToolBar *t2 = new QToolBar;
+    t2->addAction(new QAction("t2", this));
+
+    addToolBar(Qt::LeftToolBarArea, t1);
+    addToolBar(Qt::LeftToolBarArea, t2);
+}
+
+void MainWindow::createDockWidgets()
+{
+    QWidget *dockWidgetContents = new QWidget;
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(new QPushButton("My Button."));
+    dockWidgetContents->setLayout(layout);
+
+//! [0]
+    QDockWidget *dockWidget = new QDockWidget(tr("Dock Widget"), this);
+    dockWidget->setAllowedAreas(Qt::LeftDockWidgetArea | 
+				Qt::RightDockWidgetArea);
+    dockWidget->setWidget(dockWidgetContents);
+    addDockWidget(Qt::LeftDockWidgetArea, dockWidget); 
+//! [0]
+}
diff --git a/doc/src/snippets/matrix/matrix.cpp b/doc/src/snippets/matrix/matrix.cpp
new file mode 100644
index 0000000000..1ebbcf2a0d
--- /dev/null
+++ b/doc/src/snippets/matrix/matrix.cpp
@@ -0,0 +1,141 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <cmath>
+
+class SimpleTransformation : public QWidget
+{
+    void paintEvent(QPaintEvent *);
+};
+
+//! [0]
+void SimpleTransformation::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+    painter.setPen(QPen(Qt::blue, 1, Qt::DashLine));
+    painter.drawRect(0, 0, 100, 100);
+
+    painter.rotate(45);
+
+    painter.setFont(QFont("Helvetica", 24));
+    painter.setPen(QPen(Qt::black, 1));
+    painter.drawText(20, 10, "QMatrix");
+}
+//! [0]
+
+class CombinedTransformation : public QWidget
+{
+    void paintEvent(QPaintEvent *);
+};
+
+//! [1]
+void CombinedTransformation::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+    painter.setPen(QPen(Qt::blue, 1, Qt::DashLine));
+    painter.drawRect(0, 0, 100, 100);
+
+    QMatrix matrix;
+    matrix.translate(50, 50);
+    matrix.rotate(45);
+    matrix.scale(0.5, 1.0);
+    painter.setMatrix(matrix);
+
+    painter.setFont(QFont("Helvetica", 24));
+    painter.setPen(QPen(Qt::black, 1));
+    painter.drawText(20, 10, "QMatrix");
+}
+//! [1]
+
+class BasicOperations : public QWidget
+{
+    void paintEvent(QPaintEvent *);
+};
+
+//! [2]
+void BasicOperations::paintEvent(QPaintEvent *)
+{
+    double pi = 3.14;
+
+    double a    = pi/180 * 45.0;
+    double sina = sin(a);
+    double cosa = cos(a);
+
+    QMatrix translationMatrix(1, 0, 0, 1, 50.0, 50.0);
+    QMatrix rotationMatrix(cosa, sina, -sina, cosa, 0, 0);
+    QMatrix scalingMatrix(0.5, 0, 0, 1.0, 0, 0);
+
+    QMatrix matrix;
+    matrix =  scalingMatrix * rotationMatrix * translationMatrix;
+
+    QPainter painter(this);
+    painter.setPen(QPen(Qt::blue, 1, Qt::DashLine));
+    painter.drawRect(0, 0, 100, 100);
+
+    painter.setMatrix(matrix);
+
+    painter.setFont(QFont("Helvetica", 24));
+    painter.setPen(QPen(Qt::black, 1));
+    painter.drawText(20, 10, "QMatrix");
+}
+//! [2]
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    QWidget widget;
+
+    SimpleTransformation *simpleWidget = new SimpleTransformation;
+    CombinedTransformation *combinedWidget = new CombinedTransformation;
+    BasicOperations *basicWidget = new BasicOperations;
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(simpleWidget);
+    layout->addWidget(combinedWidget);
+    layout->addWidget(basicWidget);
+    widget.setLayout(layout);
+
+    widget.show();
+    widget.resize(130, 350);
+    return app.exec();
+}
diff --git a/doc/src/snippets/matrix/matrix.pro b/doc/src/snippets/matrix/matrix.pro
new file mode 100644
index 0000000000..91c307dc4c
--- /dev/null
+++ b/doc/src/snippets/matrix/matrix.pro
@@ -0,0 +1,11 @@
+######################################################################
+# Automatically generated by qmake (2.00a) Fri Jan 6 16:44:56 2006
+######################################################################
+
+TEMPLATE = app
+TARGET += 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += matrix.cpp
diff --git a/doc/src/snippets/mdiareasnippets.cpp b/doc/src/snippets/mdiareasnippets.cpp
new file mode 100644
index 0000000000..3eaa750d61
--- /dev/null
+++ b/doc/src/snippets/mdiareasnippets.cpp
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+void mainWindowExample()
+{
+    QMdiArea *mdiArea = new QMdiArea;
+//! [0]
+    QMainWindow *mainWindow = new QMainWindow;
+    mainWindow->setCentralWidget(mdiArea);
+//! [0]
+
+    mdiArea->addSubWindow(new QPushButton("Push Me Now!"));
+
+    mainWindow->show();
+}
+
+void addingSubWindowsExample()
+{
+    QWidget *internalWidget1 = new QWidget;
+    QWidget *internalWidget2 = new QWidget;
+    
+//! [1]
+    QMdiArea mdiArea;
+    QMdiSubWindow *subWindow1 = new QMdiSubWindow;
+    subWindow1->setWidget(internalWidget1);
+    subWindow1->setAttribute(Qt::WA_DeleteOnClose);
+    mdiArea.addSubWindow(subWindow1);
+
+    QMdiSubWindow *subWindow2 =
+	mdiArea.addSubWindow(internalWidget2);
+
+//! [1]
+    subWindow1->show();
+    subWindow2->show();
+
+    mdiArea.show();
+}
+
+int main(int argv, char **args)
+{
+    QApplication app(argv, args);
+
+    mainWindowExample();
+    //addingSubWindowsExample();
+
+   QAction *act = new QAction(qApp);
+   act->setShortcut(Qt::ALT + Qt::Key_S);
+   act->setShortcutContext( Qt::ApplicationShortcut );
+   QObject::connect(act, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+
+    QWidget widget5;
+    widget5.show();
+    widget5.addAction(act);
+
+    return app.exec();
+}
+
+
diff --git a/doc/src/snippets/medianodesnippet.cpp b/doc/src/snippets/medianodesnippet.cpp
new file mode 100644
index 0000000000..8b74111edf
--- /dev/null
+++ b/doc/src/snippets/medianodesnippet.cpp
@@ -0,0 +1,29 @@
+#include <QtGui>
+
+#include <phonon/mediaobject.h>
+#include <phonon/audiooutput.h>
+#include <phonon/videowidget.h>
+#include <phonon/medianode.h>
+#include <phonon/path.h>
+
+
+int main(int argv, char **args)
+{
+    QApplication app(argv, args);
+
+//![0]
+    Phonon::MediaObject *mediaObject = new Phonon::MediaObject;
+    Phonon::AudioOutput *audioOutput = new Phonon::AudioOutput;
+    Phonon::VideoWidget *videoWidget = new Phonon::VideoWidget;
+
+    Phonon::createPath(mediaObject, audioOutput);
+    Phonon::createPath(mediaObject, videoWidget);
+
+    QList<Phonon::Path> inputPaths =
+        audioOutput->inputPaths();   // inputPaths = [ mediaObject ]
+    QList<Phonon::Path> outputPaths =
+        mediaObject->outputPaths(); // outputPaths = [ audioOutput, videoWidget ]
+//![0]
+
+    return app.exec();
+}
diff --git a/doc/src/snippets/moc/main.cpp b/doc/src/snippets/moc/main.cpp
new file mode 100644
index 0000000000..17188fc891
--- /dev/null
+++ b/doc/src/snippets/moc/main.cpp
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "myclass1.h"
+
+MyClass::MyClass(QObject *) {}
+MyClass::~MyClass() {}
+void MyClass::mySlot() {}
+#undef MyClass
+
+#include "myclass2.h"
+
+MyClass::MyClass(QObject *) {}
+MyClass::~MyClass() {}
+void MyClass::setPriority(Priority) {}
+MyClass::Priority MyClass::priority() const { return High; }
+#undef MyClass
+
+#include "myclass3.h"
+
+MyClass::MyClass(QObject *) {}
+MyClass::~MyClass() {}
+#undef MyClass
+
+int main()
+{
+    return 0;
+}
diff --git a/doc/src/snippets/moc/moc.pro b/doc/src/snippets/moc/moc.pro
new file mode 100644
index 0000000000..f199abe8a1
--- /dev/null
+++ b/doc/src/snippets/moc/moc.pro
@@ -0,0 +1,2 @@
+HEADERS += myclass1.h myclass2.h myclass3.h
+SOURCES += main.cpp
diff --git a/doc/src/snippets/moc/myclass1.h b/doc/src/snippets/moc/myclass1.h
new file mode 100644
index 0000000000..c918b049b4
--- /dev/null
+++ b/doc/src/snippets/moc/myclass1.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MYCLASS1_H
+#define MYCLASS1_H
+
+#include <QObject>
+
+#define MyClass MyClass1
+
+//! [0]
+class MyClass : public QObject
+{
+    Q_OBJECT
+
+public:
+    MyClass(QObject *parent = 0);
+    ~MyClass();
+
+signals:
+    void mySignal();
+
+public slots:
+    void mySlot();
+};
+//! [0]
+
+#endif
diff --git a/doc/src/snippets/moc/myclass2.h b/doc/src/snippets/moc/myclass2.h
new file mode 100644
index 0000000000..1dd3bf9175
--- /dev/null
+++ b/doc/src/snippets/moc/myclass2.h
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MYCLASS2_H
+#define MYCLASS2_H
+
+#include <QObject>
+
+#define MyClass MyClass2
+
+//! [0]
+class MyClass : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(Priority priority READ priority WRITE setPriority)
+    Q_ENUMS(Priority)
+
+public:
+    enum Priority { High, Low, VeryHigh, VeryLow };
+
+    MyClass(QObject *parent = 0);
+    ~MyClass();
+
+    void setPriority(Priority priority);
+    Priority priority() const;
+};
+//! [0]
+
+#endif
diff --git a/doc/src/snippets/moc/myclass3.h b/doc/src/snippets/moc/myclass3.h
new file mode 100644
index 0000000000..4ba281c3fa
--- /dev/null
+++ b/doc/src/snippets/moc/myclass3.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MYCLASS3_H
+#define MYCLASS3_H
+
+#include <QObject>
+
+//! [0]
+class MyClass : public QObject
+{
+    Q_OBJECT
+    Q_CLASSINFO("Author", "Oscar Peterson")
+    Q_CLASSINFO("Status", "Active")
+
+public:
+    MyClass(QObject *parent = 0);
+    ~MyClass();
+};
+//! [0]
+
+#endif
diff --git a/doc/src/snippets/modelview-subclasses/main.cpp b/doc/src/snippets/modelview-subclasses/main.cpp
new file mode 100644
index 0000000000..60ba842c0c
--- /dev/null
+++ b/doc/src/snippets/modelview-subclasses/main.cpp
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+    main.cpp
+
+    An example of a main window application that used a subclassed model
+    and view to display data from sound files.
+*/
+
+#include <QApplication>
+
+#include "model.h"
+#include "view.h"
+#include "window.h"
+
+/*!
+    The main function for the linear model example. This creates and
+    populates a model with long integers then displays the contents of the
+    model using a QListView widget.
+*/
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    MainWindow *window = new MainWindow;
+
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/modelview-subclasses/model.cpp b/doc/src/snippets/modelview-subclasses/model.cpp
new file mode 100644
index 0000000000..16518c779d
--- /dev/null
+++ b/doc/src/snippets/modelview-subclasses/model.cpp
@@ -0,0 +1,153 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+  model.cpp
+
+  A simple model that uses a QVector as its data source.
+*/
+
+#include "model.h"
+
+/*!
+    Returns the number of items in the string list as the number of rows
+    in the model.
+*/
+
+int LinearModel::rowCount(const QModelIndex &parent) const
+{
+    Q_USING(parent);
+
+    return values.count();
+}
+
+/*
+    Returns an appropriate value for the requested data.
+    If the view requests an invalid index, an invalid variant is returned.
+    If a header is requested then we just return the column or row number,
+    depending on the orientation of the header.
+    Any valid index that corresponds to a string in the list causes that
+    string to be returned.
+*/
+
+/*!
+    Returns a model index for other component to use when referencing the
+    item specified by the given row, column, and type. The parent index
+    is ignored.
+*/
+
+QModelIndex LinearModel::index(int row, int column, const QModelIndex &parent) const
+{
+    if (parent == QModelIndex() && row >= 0 && row < rowCount()
+        && column == 0)
+        return createIndex(row, column, 0);
+    else
+        return QModelIndex();
+}
+
+QVariant LinearModel::data(const QModelIndex &index, int role) const
+{
+    Q_UNUSED(role);
+
+    if (!index.isValid())
+        return QVariant();
+
+    return values.at(index.row());
+}
+
+/*!
+    Returns Qt::ItemIsEditable so that all items in the vector can be edited.
+*/
+
+Qt::ItemFlags LinearModel::flags(const QModelIndex &index) const
+{
+    // all items in the model are editable
+    return QAbstractListModel::flags(index) | Qt::ItemIsEditable;
+}
+
+/*!
+    Changes an item in the string list, but only if the following conditions
+    are met:
+
+    * The index supplied is valid.
+    * The index corresponds to an item to be shown in a view.
+    * The role associated with editing text is specified.
+
+    The dataChanged() signal is emitted if the item is changed.
+*/
+
+bool LinearModel::setData(const QModelIndex &index,
+                          const QVariant &value, int role)
+{
+    if (!index.isValid() || role != Qt::EditRole)
+        return false;
+    values.replace(index.row(), value.toInt());
+    emit dataChanged(index, index);
+    return true;
+}
+
+/*!
+    Inserts a number of rows into the model at the specified position.
+*/
+
+bool LinearModel::insertRows(int position, int rows, const QModelIndex &parent)
+{
+    beginInsertRows(parent, position, position + rows - 1);
+
+    values.insert(position, rows, 0);
+
+    endInsertRows();
+    return true;
+}
+
+/*!
+    Removes a number of rows from the model at the specified position.
+*/
+
+bool LinearModel::removeRows(int position, int rows, const QModelIndex &parent)
+{
+    beginRemoveRows(QModelIndex(), position, position+rows-1);
+
+    values.remove(position, rows);
+
+    endRemoveRows();
+    return true;
+}
diff --git a/doc/src/snippets/modelview-subclasses/model.h b/doc/src/snippets/modelview-subclasses/model.h
new file mode 100644
index 0000000000..7965f49f33
--- /dev/null
+++ b/doc/src/snippets/modelview-subclasses/model.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MODEL_H
+#define MODEL_H
+
+#include <QAbstractListModel>
+#include <QObject>
+#include <qvector.h>
+
+class LinearModel : public QAbstractListModel
+{
+    Q_OBJECT
+public:
+    LinearModel(QObject *parent = 0)
+        : QAbstractListModel(parent) {}
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const;
+    QVariant data(const QModelIndex &index, int role) const;
+
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+    bool setData(const QModelIndex &index, const QVariant &value,
+                 int role = Qt::EditRole);
+
+    bool insertRows(int position, int rows, const QModelIndex &index = QModelIndex());
+    bool removeRows(int position, int rows, const QModelIndex &index = QModelIndex());
+
+private:
+    QVector<int> values;
+};
+
+#endif
diff --git a/doc/src/snippets/modelview-subclasses/view.cpp b/doc/src/snippets/modelview-subclasses/view.cpp
new file mode 100644
index 0000000000..7d683ea4e9
--- /dev/null
+++ b/doc/src/snippets/modelview-subclasses/view.cpp
@@ -0,0 +1,315 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    view.cpp
+
+    Provides a view to represent a one-dimensional sequence of integers
+    obtained from a list model as a series of rows.
+*/
+
+#include <QAbstractItemModel>
+#include <QBrush>
+#include <QItemSelection>
+#include <QPainter>
+#include <QPaintEvent>
+#include <QPen>
+#include <QPoint>
+#include <QResizeEvent>
+#include <QScrollBar>
+#include <QSizePolicy>
+
+#include "view.h"
+
+LinearView::LinearView(QWidget *parent)
+    : QAbstractItemView(parent)
+{
+    setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+}
+
+/*!
+    Returns the position of the item in viewport coordinates.
+*/
+
+QRect LinearView::itemViewportRect(const QModelIndex &index) const
+{
+    QRect rect = itemRect(index);
+    QRect result(rect.left() - horizontalScrollBar()->value(),
+                 rect.top() - verticalScrollBar()->value(),
+                 rect.width(), viewport()->height());
+
+    return result;
+}
+
+/*!
+    Returns the rectangle of the item at position \a index in the
+    model. The rectangle is in contents coordinates.
+*/
+
+QRect LinearView::itemRect(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return QRect();
+    else
+        return QRect(index.row(), 0, 1, 1);
+}
+
+
+void LinearView::ensureVisible(const QModelIndex &index)
+{
+    QRect area = viewport()->rect();
+    QRect rect = itemViewportRect(index);
+
+    if (rect.left() < area.left())
+        horizontalScrollBar()->setValue(
+            horizontalScrollBar()->value() - rect.left());
+    else if (rect.right() > area.right())
+        horizontalScrollBar()->setValue(
+            horizontalScrollBar()->value() + rect.left() - area.width());
+}
+
+/*!
+    Returns the item that covers the coordinate given in the view.
+*/
+
+QModelIndex LinearView::itemAt(int x, int /* y */) const
+{
+    int row = x + horizontalScrollBar()->value();
+
+    return model()->index(row, 0, QModelIndex());
+}
+
+//void LinearView::dataChanged(const QModelIndex &/* topLeft */,
+//    const QModelIndex &/* bottomRight */)
+//{
+//    updateGeometries();
+//    if (isVisible())
+//        repaint();
+//}
+
+void LinearView::rowsInserted(const QModelIndex &/* parent */, int /* start */,
+    int /* end */)
+{
+    updateGeometries();
+    if (isVisible())
+        repaint();
+}
+
+void LinearView::rowsRemoved(const QModelIndex &/* parent */, int /* start */,
+    int /* end */)
+{
+    updateGeometries();
+    if (isVisible())
+        repaint();
+}
+/*
+void LinearView::verticalScrollbarAction(int action)
+{
+}
+
+void LinearView::horizontalScrollbarAction(int action)
+{
+}
+*/
+
+/*!
+    Select the items in the model that lie within the rectangle specified by
+    \a rect, using the selection \a command.
+*/
+
+void LinearView::setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command)
+{
+    QModelIndex leftIndex = itemAt(rect.left(), 0);
+    QModelIndex rightIndex = itemAt(rect.right(), 0);
+
+    QItemSelection selection(leftIndex, rightIndex);
+
+    selectionModel()->select(selection, command);
+}
+
+QModelIndex LinearView::moveCursor(QAbstractItemView::CursorAction cursorAction,
+                                   Qt::KeyboardModifiers)
+{
+    QModelIndex current = currentIndex();
+
+    switch (cursorAction) {
+    case MoveLeft:{
+        if (current.row() > 0)
+            return model()->index(current.row() - 1, 0, QModelIndex());
+        else
+            return model()->index(0, 0, QModelIndex());
+        break;}
+    case MoveRight:{
+        if (current.row() < rows(current) - 1)
+            return model()->index(current.row() + 1, 0, QModelIndex());
+        else
+            return model()->index(rows(current) - 1, 0,QModelIndex());
+        break;}
+    case MoveUp:
+        return current;
+    case MoveDown:
+        return current;
+    case MovePageUp:
+        return current;
+    case MovePageDown:
+        return current;
+    case MoveHome:
+        return model()->index(0, 0, QModelIndex());
+    case MoveEnd:
+        return model()->index(rows(current) - 1, 0, QModelIndex());
+    default:
+        return current;
+    }
+}
+
+int LinearView::horizontalOffset() const
+{
+    return horizontalScrollBar()->value();
+}
+
+int LinearView::verticalOffset() const
+{
+    return verticalScrollBar()->value();
+}
+
+/*!
+    Returns a rectangle corresponding to the selection in viewport cooridinates.
+*/
+
+QRect LinearView::selectionViewportRect(const QItemSelection &selection) const
+{
+    int ranges = selection.count();
+
+    if (ranges == 0)
+        return QRect();
+
+    // Note that we use the top and bottom functions of the selection range
+    // since the data is stored in rows.
+
+    int firstRow = selection.at(0).top();
+    int lastRow = selection.at(0).top();
+
+    for (int i = 0; i < ranges; ++i) {
+        firstRow = qMin(firstRow, selection.at(i).top());
+        lastRow = qMax(lastRow, selection.at(i).bottom());
+    }
+
+    QModelIndex firstItem = model()->index(qMin(firstRow, lastRow), 0,
+        QModelIndex());
+    QModelIndex lastItem = model()->index(qMax(firstRow, lastRow), 0,
+        QModelIndex());
+
+    QRect firstRect = itemViewportRect(firstItem);
+    QRect lastRect = itemViewportRect(lastItem);
+
+    return QRect(firstRect.left(), firstRect.top(),
+        lastRect.right() - firstRect.left(), firstRect.height());
+}
+
+void LinearView::paintEvent(QPaintEvent *event)
+{
+    QPainter painter(viewport());
+
+    QRect updateRect = event->rect();
+    QBrush background(Qt::black);
+    QPen foreground(Qt::white);
+
+    painter.fillRect(updateRect, background);
+    painter.setPen(foreground);
+
+    QModelIndex firstItem = itemAt(updateRect.left(), updateRect.top());
+    if (!firstItem.isValid())
+        firstItem = model()->index(0, 0, QModelIndex());
+
+    QModelIndex lastItem = itemAt(updateRect.right(), updateRect.bottom());
+    if (!lastItem.isValid())
+        lastItem = model()->index(rows() - 1, 0, QModelIndex());
+
+    int x = updateRect.left();
+    //int top = updateRect.top();
+    //int bottom = updateRect.bottom();
+
+    int row = firstItem.row();
+    QModelIndex index = model()->index(row, 0, QModelIndex());
+    int value = model()->data(index, Qt::DisplayRole).toInt();
+    int midPoint = viewport()->height()/2;
+    int y2 = midPoint - int(value * midPoint/255.0);
+
+    while (row <= lastItem.row()) {
+
+        QModelIndex index = model()->index(row, 0, QModelIndex());
+        int value = model()->data(index, Qt::DisplayRole).toInt();
+
+        int y1 = y2;
+        y2 = midPoint - int(value * midPoint/255.0);
+
+        painter.drawLine(x-1, y1, x, y2);
+        ++row; ++x;
+    }
+}
+
+void LinearView::resizeEvent(QResizeEvent * /* event */)
+{
+    updateGeometries();
+}
+
+void LinearView::updateGeometries()
+{
+    if (viewport()->width() < rows()) {
+        horizontalScrollBar()->setPageStep(viewport()->width());
+        horizontalScrollBar()->setRange(0, rows() - viewport()->width() - 1);
+    }
+}
+
+QSize LinearView::sizeHint() const
+{
+    return QSize(rows(), 200);
+}
+
+int LinearView::rows(const QModelIndex &index) const
+{
+    return model()->rowCount(model()->parent(index));
+}
+
+bool LinearView::isIndexHidden(const QModelIndex &index) const
+{
+    return false;
+}
diff --git a/doc/src/snippets/modelview-subclasses/view.h b/doc/src/snippets/modelview-subclasses/view.h
new file mode 100644
index 0000000000..d6d64bbd84
--- /dev/null
+++ b/doc/src/snippets/modelview-subclasses/view.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef VIEW_H
+#define VIEW_H
+
+#include <QAbstractItemView>
+#include <QItemSelection>
+#include <QItemSelectionModel>
+#include <QModelIndex>
+#include <QRect>
+#include <QSize>
+#include <QWidget>
+
+class LinearView : public QAbstractItemView
+{
+    Q_OBJECT
+public:
+    LinearView(QWidget *parent = 0);
+
+    QRect itemViewportRect(const QModelIndex &index) const;
+    void ensureVisible(const QModelIndex &index);
+    QModelIndex itemAt(int x, int y) const;
+
+protected slots:
+    /*void dataChanged(const QModelIndex &topLeft, const QModelIndex
+    &bottomRight);*/
+    void rowsInserted(const QModelIndex &parent, int start, int end);
+    void rowsRemoved(const QModelIndex &parent, int start, int end);
+    /*void selectionChanged(const QItemSelection &deselected, const QItemSelection &selected);
+    void verticalScrollbarAction(int action);
+    void horizontalScrollbarAction(int action);*/
+
+protected:
+    void setSelection(const QRect&, QItemSelectionModel::SelectionFlags command);
+    QRect selectionViewportRect(const QItemSelection &selection) const;
+    QRect itemRect(const QModelIndex &item) const;
+    bool isIndexHidden(const QModelIndex &index) const;
+    int horizontalOffset() const;
+    int verticalOffset() const;
+    QModelIndex moveCursor(QAbstractItemView::CursorAction cursorAction,
+                           Qt::KeyboardModifiers modifiers);
+
+    void paintEvent(QPaintEvent *event);
+    void resizeEvent(QResizeEvent *event);
+    QSize sizeHint() const;
+
+private:
+    int rows(const QModelIndex &index = QModelIndex()) const;
+    void updateGeometries();
+};
+
+#endif
diff --git a/doc/src/snippets/modelview-subclasses/window.cpp b/doc/src/snippets/modelview-subclasses/window.cpp
new file mode 100644
index 0000000000..d87857d8b3
--- /dev/null
+++ b/doc/src/snippets/modelview-subclasses/window.cpp
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QAction>
+#include <QDataStream>
+#include <QMenu>
+#include <QMenuBar>
+#include <QFile>
+#include <QFileDialog>
+#include <QListView>
+
+#include "window.h"
+
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent)
+{
+    setWindowTitle("Model/View example");
+
+    setupModelView();
+
+    QAction *openAction = new QAction(tr("&Open"), this);
+    QAction *quitAction = new QAction(tr("E&xit"), this);
+    QMenu *fileMenu = new QMenu(tr("&File"), this);
+    fileMenu->addAction(openAction);
+    fileMenu->addAction(quitAction);
+    menuBar()->addMenu(fileMenu);
+
+    connect(openAction, SIGNAL(triggered()), this, SLOT(selectOpenFile()));
+    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
+
+    setCentralWidget(view);
+}
+
+void MainWindow::setupModelView()
+{
+    model = new LinearModel(this);
+    view = new LinearView(this);
+    view->setModel(model);
+}
+
+void MainWindow::selectOpenFile()
+{
+    QString fileName = QFileDialog::getOpenFileName(this,
+        tr("Select a file to open"), "", tr("Sound files (*.wav)"));
+    
+    if (!fileName.isEmpty())
+        openFile(fileName);
+}
+
+void MainWindow::openFile(const QString &fileName)
+{
+    QFile file(fileName);
+    int length = file.size();
+
+    if (file.open(QFile::ReadOnly)) {
+        model->removeRows(0, model->rowCount());
+
+        int rows = (length - 0x2c)/2;
+        model->insertRows(0, rows);
+
+        // Perform some dodgy tricks to extract the data from the file.
+        QDataStream stream(&file);
+        stream.setByteOrder(QDataStream::LittleEndian);
+
+        Q_INT16 left;
+        Q_INT16 right;
+
+        for (int row = 0; row < rows; ++row) {
+            QModelIndex index = model->index(row);
+
+            stream >> left >> right;
+            model->setData(index, int(left / 256));
+        }
+    }
+}
diff --git a/doc/src/snippets/modelview-subclasses/window.h b/doc/src/snippets/modelview-subclasses/window.h
new file mode 100644
index 0000000000..b4cead0da3
--- /dev/null
+++ b/doc/src/snippets/modelview-subclasses/window.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QMainWindow>
+#include <QString>
+#include <QWidget>
+
+#include "model.h"
+#include "view.h"
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+public:
+    MainWindow::MainWindow(QWidget *parent = 0);
+
+public slots:
+    void selectOpenFile();
+
+private:
+    void setupModelView();
+    void openFile(const QString &fileName);
+
+    LinearModel *model;
+    LinearView *view;
+};
+
+#endif
diff --git a/doc/src/snippets/myscrollarea.cpp b/doc/src/snippets/myscrollarea.cpp
new file mode 100644
index 0000000000..6cb123322b
--- /dev/null
+++ b/doc/src/snippets/myscrollarea.cpp
@@ -0,0 +1,129 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+class MyScrollArea : public QAbstractScrollArea
+{
+public:
+    MyScrollArea(QWidget *w);
+    void setWidget(QWidget *w);
+
+protected:
+    void scrollContentsBy(int dx, int dy);
+    void resizeEvent(QResizeEvent *event);
+
+private:
+    void updateWidgetPosition();
+    void updateArea();
+
+    QWidget *widget;
+};
+
+MyScrollArea::MyScrollArea(QWidget *widget)
+    : QAbstractScrollArea()
+{
+    setWidget(widget);
+}
+
+void MyScrollArea::setWidget(QWidget *w)
+{
+    widget = w;
+    widget->setParent(viewport());
+    if (!widget->testAttribute(Qt::WA_Resized))
+        widget->resize(widget->sizeHint());
+
+    verticalScrollBar()->setValue(0);
+    verticalScrollBar()->setValue(0);
+
+    updateArea();
+}
+
+void MyScrollArea::updateWidgetPosition()
+{
+//! [0]
+    int hvalue = horizontalScrollBar()->value();
+    int vvalue = verticalScrollBar()->value();
+    QPoint topLeft = viewport()->rect().topLeft();
+
+    widget->move(topLeft.x() - hvalue, topLeft.y() - vvalue);
+//! [0]
+}
+
+void MyScrollArea::scrollContentsBy(int /*dx*/, int /*dy*/)
+{
+    updateWidgetPosition();
+}
+
+void MyScrollArea::updateArea()
+{
+//! [1]
+    QSize areaSize = viewport()->size();
+    QSize  widgetSize = widget->size();
+
+    verticalScrollBar()->setPageStep(widgetSize.height());
+    horizontalScrollBar()->setPageStep(widgetSize.width());
+    verticalScrollBar()->setRange(0, widgetSize.height() - areaSize.height());
+    horizontalScrollBar()->setRange(0, widgetSize.width() - areaSize.width());
+    updateWidgetPosition();
+//! [1]
+}
+
+void MyScrollArea::resizeEvent(QResizeEvent *event)
+{
+    updateArea();
+}
+
+int main(int argv, char **args)
+{
+    QApplication app(argv, args);
+
+    QPixmap pixmap("mypixmap.png");
+    QLabel label;
+    label.setPixmap(pixmap);
+    MyScrollArea area(&label);
+    area.resize(300, 300);
+    area.show();
+    
+    area.setWidget(&label);
+
+    return app.exec();
+}
diff --git a/doc/src/snippets/network/tcpwait.cpp b/doc/src/snippets/network/tcpwait.cpp
new file mode 100644
index 0000000000..fa18d2340f
--- /dev/null
+++ b/doc/src/snippets/network/tcpwait.cpp
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QTcpSocket>
+
+#include "server.h"
+
+int main(int argv, char **args)
+{
+    QCoreApplication app(argv, args);
+
+    QTcpSocket socket;
+    socket.connectToHost("localhost", 1025);
+    
+//! [0]
+    int numRead = 0, numReadTotal = 0;
+    char buffer[50];
+
+    forever {
+	numRead  = socket.read(buffer, 50);
+
+	// do whatever with array
+	
+	numReadTotal += numRead;
+	if (numRead == 0 && !socket.waitForReadyRead()) 
+	    break;
+    }
+//! [0]
+    
+    return app.exec();
+}
diff --git a/doc/src/snippets/ntfsp.cpp b/doc/src/snippets/ntfsp.cpp
new file mode 100644
index 0000000000..ad5dc48bc6
--- /dev/null
+++ b/doc/src/snippets/ntfsp.cpp
@@ -0,0 +1,11 @@
+
+
+//! [0]
+extern Q_CORE_EXPORT int qt_ntfs_permission_lookup;
+//! [0]
+
+//! [1]
+qt_ntfs_permission_lookup++; // turn checking on
+qt_ntfs_permission_lookup--; // turn it off again
+//! [1]
+
diff --git a/doc/src/snippets/painterpath/painterpath.cpp b/doc/src/snippets/painterpath/painterpath.cpp
new file mode 100644
index 0000000000..ad4f623836
--- /dev/null
+++ b/doc/src/snippets/painterpath/painterpath.cpp
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    QImage image(100, 100, QImage::Format_RGB32);
+
+    QPainterPath path;
+    path.addRect(20, 20, 60, 60);
+
+    path.moveTo(0, 0);
+    path.cubicTo(99, 0,  50, 50,  99, 99);
+    path.cubicTo(0, 99,  50, 50,  0, 0);
+
+    QPainter painter(&image);
+    painter.fillRect(0, 0, 100, 100, Qt::white);
+
+    painter.save();
+    painter.translate(0.5, 0.5);
+    painter.setPen(QPen(QColor(79, 106, 25), 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
+    painter.setBrush(QColor(122, 163, 39));
+    painter.setRenderHint(QPainter::Antialiasing);
+
+    painter.drawPath(path);
+
+    painter.restore();
+    painter.end();
+
+    QLabel lab;
+    lab.setPixmap(QPixmap::fromImage(image));
+    lab.show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/painterpath/painterpath.pro b/doc/src/snippets/painterpath/painterpath.pro
new file mode 100644
index 0000000000..0a6ad46438
--- /dev/null
+++ b/doc/src/snippets/painterpath/painterpath.pro
@@ -0,0 +1 @@
+SOURCES += painterpath.cpp
diff --git a/doc/src/snippets/patternist/anyHTMLElement.xq b/doc/src/snippets/patternist/anyHTMLElement.xq
new file mode 100644
index 0000000000..9f5ee1275a
--- /dev/null
+++ b/doc/src/snippets/patternist/anyHTMLElement.xq
@@ -0,0 +1 @@
+doc('data.xml')/*:body
diff --git a/doc/src/snippets/patternist/anyXLinkAttribute.xq b/doc/src/snippets/patternist/anyXLinkAttribute.xq
new file mode 100644
index 0000000000..059bcc081c
--- /dev/null
+++ b/doc/src/snippets/patternist/anyXLinkAttribute.xq
@@ -0,0 +1,2 @@
+declare namespace xlink = "http://www.w3.org/1999/xlink";
+doc('image.svg')//@xlink:*
diff --git a/doc/src/snippets/patternist/bracesIncluded.xq b/doc/src/snippets/patternist/bracesIncluded.xq
new file mode 100644
index 0000000000..3961c28388
--- /dev/null
+++ b/doc/src/snippets/patternist/bracesIncluded.xq
@@ -0,0 +1 @@
+<e>{sum((1, 2, 3))}</e>
diff --git a/doc/src/snippets/patternist/bracesIncludedResult.xml b/doc/src/snippets/patternist/bracesIncludedResult.xml
new file mode 100644
index 0000000000..0004c7126c
--- /dev/null
+++ b/doc/src/snippets/patternist/bracesIncludedResult.xml
@@ -0,0 +1 @@
+<e>6</e>
diff --git a/doc/src/snippets/patternist/bracesOmitted.xq b/doc/src/snippets/patternist/bracesOmitted.xq
new file mode 100644
index 0000000000..ffbadd0773
--- /dev/null
+++ b/doc/src/snippets/patternist/bracesOmitted.xq
@@ -0,0 +1 @@
+<e>sum({(1, 2, 3)})</e>
diff --git a/doc/src/snippets/patternist/bracesOmittedResult.xml b/doc/src/snippets/patternist/bracesOmittedResult.xml
new file mode 100644
index 0000000000..744fb8fe6a
--- /dev/null
+++ b/doc/src/snippets/patternist/bracesOmittedResult.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<e>sum(1 2 3)</e>
\ No newline at end of file
diff --git a/doc/src/snippets/patternist/computedTreeFragment.xq b/doc/src/snippets/patternist/computedTreeFragment.xq
new file mode 100644
index 0000000000..c5b93ada62
--- /dev/null
+++ b/doc/src/snippets/patternist/computedTreeFragment.xq
@@ -0,0 +1,14 @@
+declare default element namespace "http://example.com/Namespace";
+declare variable $documentElementName := "doc";
+
+element {$documentElementName}
+{
+    attribute xml:base {"http://example.com/"},
+    element anotherElement
+    {
+        comment {" a comment "},
+        processing-instruction target {"data"},
+        element anotherElement {()},
+        text {"some text"}
+    }
+}
diff --git a/doc/src/snippets/patternist/copyAttribute.xq b/doc/src/snippets/patternist/copyAttribute.xq
new file mode 100644
index 0000000000..40e44942c5
--- /dev/null
+++ b/doc/src/snippets/patternist/copyAttribute.xq
@@ -0,0 +1,9 @@
+<html>
+    <body>
+        <p>
+        {
+            doc('feed.rss')/rss/@version
+        }
+        </p>
+    </body>
+</html>
diff --git a/doc/src/snippets/patternist/copyID.xq b/doc/src/snippets/patternist/copyID.xq
new file mode 100644
index 0000000000..2409cafe6b
--- /dev/null
+++ b/doc/src/snippets/patternist/copyID.xq
@@ -0,0 +1,3 @@
+(: Copy the value of xml:id attribute from other.html. This is a comment by the way! :)
+<html xmlns="http://www.w3.org/1999/xhtml/"
+      xml:id="{doc("other.html")/html/@xml:id}"/>
diff --git a/doc/src/snippets/patternist/directTreeFragment.xq b/doc/src/snippets/patternist/directTreeFragment.xq
new file mode 100644
index 0000000000..96bc963b4a
--- /dev/null
+++ b/doc/src/snippets/patternist/directTreeFragment.xq
@@ -0,0 +1,7 @@
+<doc xmlns="http://example.com/Namespace" xml:base="http://example.com/">
+
+    <!-- a comment -->
+    <?target data?>
+    <anotherElement/>
+    some text
+</doc>
diff --git a/doc/src/snippets/patternist/doc.txt b/doc/src/snippets/patternist/doc.txt
new file mode 100644
index 0000000000..d30b057b2c
--- /dev/null
+++ b/doc/src/snippets/patternist/doc.txt
@@ -0,0 +1,35 @@
+<doc>
+  <p>
+    <span>1</span>
+    <span>2</span>
+  </p>
+  <p>
+    <span>3</span>
+    <span>4</span>
+  </p>
+  <p>
+    <span>5</span>
+    <span>6</span>
+  </p>
+  <p>
+    <span>7</span>
+    <span>8</span>
+  </p>
+  <p>
+    <span>9</span>
+    <span>a</span>
+  </p>
+  <p>
+    <span>b</span>
+    <span>c</span>
+  </p>
+  <p>
+    <span>d</span>
+    <span>e</span>
+  </p>
+  <p>
+    <span>f</span>
+    <span>0</span>
+  </p>
+</doc>
+
diff --git a/doc/src/snippets/patternist/docPlainHTML.xq b/doc/src/snippets/patternist/docPlainHTML.xq
new file mode 100644
index 0000000000..622bec8919
--- /dev/null
+++ b/doc/src/snippets/patternist/docPlainHTML.xq
@@ -0,0 +1 @@
+doc("myPlainHTML.html")/body
diff --git a/doc/src/snippets/patternist/docPlainHTML2.xq b/doc/src/snippets/patternist/docPlainHTML2.xq
new file mode 100644
index 0000000000..5e7fbaedce
--- /dev/null
+++ b/doc/src/snippets/patternist/docPlainHTML2.xq
@@ -0,0 +1 @@
+doc("myPlainHTML.html")/html/body
diff --git a/doc/src/snippets/patternist/embedDataInXHTML.xq b/doc/src/snippets/patternist/embedDataInXHTML.xq
new file mode 100644
index 0000000000..b513922a3b
--- /dev/null
+++ b/doc/src/snippets/patternist/embedDataInXHTML.xq
@@ -0,0 +1,10 @@
+declare default element namespace "http://www.w3.org/1999/xhtml";
+<html>
+    <body>
+        {
+            for $i in doc("testResult.xml")/tests/test[@status = "failure"]
+            order by $i/@name
+            return <p>{$i/@name}</p>
+        }
+    </body>
+</html>
diff --git a/doc/src/snippets/patternist/embedDataInXHTML2.xq b/doc/src/snippets/patternist/embedDataInXHTML2.xq
new file mode 100644
index 0000000000..754ddba87f
--- /dev/null
+++ b/doc/src/snippets/patternist/embedDataInXHTML2.xq
@@ -0,0 +1,10 @@
+declare namespace x = "http://www.w3.org/1998/xhtml";
+<x:html>
+    <x:body>
+        {
+            for $i in doc("testResult.xml")/tests/test[@status = "failure"]
+            order by $i/@name
+            return <x:p>{$i/@name}</x:p>
+        }
+    </x:body>
+</x:html>
diff --git a/doc/src/snippets/patternist/emptyParagraphs.xq b/doc/src/snippets/patternist/emptyParagraphs.xq
new file mode 100644
index 0000000000..6024d28a85
--- /dev/null
+++ b/doc/src/snippets/patternist/emptyParagraphs.xq
@@ -0,0 +1 @@
+doc('index.html')//p[string-length(.) = 0]
diff --git a/doc/src/snippets/patternist/escapeCurlyBraces.xq b/doc/src/snippets/patternist/escapeCurlyBraces.xq
new file mode 100644
index 0000000000..669e7c197f
--- /dev/null
+++ b/doc/src/snippets/patternist/escapeCurlyBraces.xq
@@ -0,0 +1,4 @@
+<doc>
+    This is one left followed by one right curly brace: {{ }}
+    Here they are again, but with character references: &#x7B; &#x7D;
+</doc>
diff --git a/doc/src/snippets/patternist/escapeStringLiterals.xml b/doc/src/snippets/patternist/escapeStringLiterals.xml
new file mode 100644
index 0000000000..425ccb0754
--- /dev/null
+++ b/doc/src/snippets/patternist/escapeStringLiterals.xml
@@ -0,0 +1,2 @@
+<p>"I hate quotations" -- Ralph Waldo Emerson" 
+ '"I hate quotations"" -- Ralph Waldo Emerson"', appeared above</p>
\ No newline at end of file
diff --git a/doc/src/snippets/patternist/escapeStringLiterals.xq b/doc/src/snippets/patternist/escapeStringLiterals.xq
new file mode 100644
index 0000000000..4a6054ba62
--- /dev/null
+++ b/doc/src/snippets/patternist/escapeStringLiterals.xq
@@ -0,0 +1,7 @@
+<p>
+{
+    """I hate quotations"" -- Ralph Waldo Emerson""",
+    "&#xA;",
+    '''"I hate quotations"" -- Ralph Waldo Emerson"'', appeared above'
+}
+</p>
diff --git a/doc/src/snippets/patternist/expressionInsideAttribute.xq b/doc/src/snippets/patternist/expressionInsideAttribute.xq
new file mode 100644
index 0000000000..97f46b1c4f
--- /dev/null
+++ b/doc/src/snippets/patternist/expressionInsideAttribute.xq
@@ -0,0 +1,2 @@
+declare variable $additionalClass := "example";
+<p class="important {$additionalClass} obsolete"/>
diff --git a/doc/src/snippets/patternist/filterOnPath.xq b/doc/src/snippets/patternist/filterOnPath.xq
new file mode 100644
index 0000000000..d23dfe8c7b
--- /dev/null
+++ b/doc/src/snippets/patternist/filterOnPath.xq
@@ -0,0 +1,2 @@
+let $doc := doc('doc.txt')
+return ($doc/doc/p/span)[1]
diff --git a/doc/src/snippets/patternist/filterOnStep.xq b/doc/src/snippets/patternist/filterOnStep.xq
new file mode 100644
index 0000000000..46b77fa3cd
--- /dev/null
+++ b/doc/src/snippets/patternist/filterOnStep.xq
@@ -0,0 +1,2 @@
+let $doc := doc('doc.txt')
+return $doc/doc/p/span[1]
\ No newline at end of file
diff --git a/doc/src/snippets/patternist/firstParagraph.xq b/doc/src/snippets/patternist/firstParagraph.xq
new file mode 100644
index 0000000000..db5e2c7205
--- /dev/null
+++ b/doc/src/snippets/patternist/firstParagraph.xq
@@ -0,0 +1 @@
+doc("index.html")/html/body/p[@xml:id = "thatSpecialOne"]
diff --git a/doc/src/snippets/patternist/fnStringOnAttribute.xq b/doc/src/snippets/patternist/fnStringOnAttribute.xq
new file mode 100644
index 0000000000..b26e9f2f47
--- /dev/null
+++ b/doc/src/snippets/patternist/fnStringOnAttribute.xq
@@ -0,0 +1,9 @@
+<html>
+    <body>
+        <p>
+        {
+            string(doc('feed.rss')/rss/@version)
+        }
+        </p>
+    </body>
+</html>
diff --git a/doc/src/snippets/patternist/forClause.xq b/doc/src/snippets/patternist/forClause.xq
new file mode 100644
index 0000000000..a412dca47a
--- /dev/null
+++ b/doc/src/snippets/patternist/forClause.xq
@@ -0,0 +1,3 @@
+for $i in(reverse(1 to 10)),
+    $d in xs:integer(doc("numbers.xml")/numbers/number)
+return ($i + $d)
diff --git a/doc/src/snippets/patternist/forClause2.xq b/doc/src/snippets/patternist/forClause2.xq
new file mode 100644
index 0000000000..4fa505d53f
--- /dev/null
+++ b/doc/src/snippets/patternist/forClause2.xq
@@ -0,0 +1,3 @@
+for $i in(reverse(1 to 10)),
+    $d in xs:integer(doc("numbers.xml")/numbers/number)
+return $i + $d
diff --git a/doc/src/snippets/patternist/forClauseOnFeed.xq b/doc/src/snippets/patternist/forClauseOnFeed.xq
new file mode 100644
index 0000000000..9ec33397b1
--- /dev/null
+++ b/doc/src/snippets/patternist/forClauseOnFeed.xq
@@ -0,0 +1,6 @@
+for $item in doc('feed.rss')//item
+return <p>
+        {
+            $item/description/node()
+        }
+       </p>
diff --git a/doc/src/snippets/patternist/indented.xml b/doc/src/snippets/patternist/indented.xml
new file mode 100644
index 0000000000..a312c63f2b
--- /dev/null
+++ b/doc/src/snippets/patternist/indented.xml
@@ -0,0 +1,5 @@
+<a>
+   <b/>
+   <c/>
+   <p>Some Text</p>
+</a>
diff --git a/doc/src/snippets/patternist/introAcneRemover.xq b/doc/src/snippets/patternist/introAcneRemover.xq
new file mode 100644
index 0000000000..4e6ee80441
--- /dev/null
+++ b/doc/src/snippets/patternist/introAcneRemover.xq
@@ -0,0 +1,8 @@
+<result>
+    <para>The following skin care products have shipped, ordered by shipping date(oldest first):</para>
+    {
+        for $i in doc("myOrders.xml")/orders/order[@product = "Acme Skin Care"]
+        order by xs:date($i/@shippingDate) descending
+        return $i
+    }
+</result>
diff --git a/doc/src/snippets/patternist/introExample2.xq b/doc/src/snippets/patternist/introExample2.xq
new file mode 100644
index 0000000000..411cc171f8
--- /dev/null
+++ b/doc/src/snippets/patternist/introExample2.xq
@@ -0,0 +1,5 @@
+<bibliography>
+{
+    doc($file)/bib/book[publisher = $publisher and @year > $year]/<book year="{@year}">{title}</book>
+}
+</bibliography>
diff --git a/doc/src/snippets/patternist/introFileHierarchy.xml b/doc/src/snippets/patternist/introFileHierarchy.xml
new file mode 100644
index 0000000000..cfa6151ce1
--- /dev/null
+++ b/doc/src/snippets/patternist/introFileHierarchy.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<directory name="home">
+
+    <file name="myNote.txt" mimetype="text/plain" size="8" extension="txt" uri="file:///home/frans/myNote.txt">
+        <content asBase64Binary="TXkgTm90ZSE=" asStringFromUTF-8="My Note!"/>
+    </file>
+
+    <directory name="src">
+        ...
+    </directory>
+
+    ...
+
+</directory>
diff --git a/doc/src/snippets/patternist/introNavigateFS.xq b/doc/src/snippets/patternist/introNavigateFS.xq
new file mode 100644
index 0000000000..1f5a3a73e7
--- /dev/null
+++ b/doc/src/snippets/patternist/introNavigateFS.xq
@@ -0,0 +1,12 @@
+declare variable $myRoot := <e/>; (: This line is a dummy and shouldn't appear in the documentation. :)
+<html>
+    <body>
+        {
+            $myRoot//file[@mimetype = 'text/xml' or @mimetype = 'application/xml']
+            /
+            (if(doc-available(@uri))
+             then ()
+             else <p>Failed to parse file {@uri}.</p>)
+        }
+    </body>
+</html>
diff --git a/doc/src/snippets/patternist/introductionExample.xq b/doc/src/snippets/patternist/introductionExample.xq
new file mode 100644
index 0000000000..1a309dd7f5
--- /dev/null
+++ b/doc/src/snippets/patternist/introductionExample.xq
@@ -0,0 +1,3 @@
+<bibliography>
+{doc("library.xml")/bib/book[publisher="Addison-Wesley" and @year>1991]/<book year="{@year}">{title}</book>}
+</bibliography> 
diff --git a/doc/src/snippets/patternist/invalidLetOrderBy.xq b/doc/src/snippets/patternist/invalidLetOrderBy.xq
new file mode 100644
index 0000000000..d65f24066f
--- /dev/null
+++ b/doc/src/snippets/patternist/invalidLetOrderBy.xq
@@ -0,0 +1,3 @@
+let $i := (2, 3, 1)
+order by $i[1]
+return $i
diff --git a/doc/src/snippets/patternist/items.xq b/doc/src/snippets/patternist/items.xq
new file mode 100644
index 0000000000..0b46ec14e0
--- /dev/null
+++ b/doc/src/snippets/patternist/items.xq
@@ -0,0 +1,5 @@
+<aNode/>,
+xs:base64Binary("FFFF"),
+current-date(),
+3e3, (: A floating point value :)
+attribute {"name"} {()}
diff --git a/doc/src/snippets/patternist/letOrderBy.xq b/doc/src/snippets/patternist/letOrderBy.xq
new file mode 100644
index 0000000000..f4106d2807
--- /dev/null
+++ b/doc/src/snippets/patternist/letOrderBy.xq
@@ -0,0 +1,4 @@
+for $a in (8, -4, 2)
+let $b := ($a * -1, $a)
+order by $a
+return $b
diff --git a/doc/src/snippets/patternist/literalsAndOperators.xq b/doc/src/snippets/patternist/literalsAndOperators.xq
new file mode 100644
index 0000000000..ec4af33ba1
--- /dev/null
+++ b/doc/src/snippets/patternist/literalsAndOperators.xq
@@ -0,0 +1,2 @@
+declare variable $date := fn:current-date(); (: This line should not be part of the example. It exists in order to make the query valid. :)
+fn:current-date() - $date > xs:dayTimeDuration("P365D")
diff --git a/doc/src/snippets/patternist/mobeyDick.xml b/doc/src/snippets/patternist/mobeyDick.xml
new file mode 100644
index 0000000000..32d0b6caec
--- /dev/null
+++ b/doc/src/snippets/patternist/mobeyDick.xml
@@ -0,0 +1,4 @@
+<book xmlns:dc='http://purl.org/dc/elements/1.1'
+      xmlns='http://example.com/MyDefault'>
+    <dc:title>Mobey Dick</dc:title> ...
+</book>
diff --git a/doc/src/snippets/patternist/nextLastParagraph.xq b/doc/src/snippets/patternist/nextLastParagraph.xq
new file mode 100644
index 0000000000..9424f792bd
--- /dev/null
+++ b/doc/src/snippets/patternist/nextLastParagraph.xq
@@ -0,0 +1 @@
+doc('index.html')//p[last() - 1]
diff --git a/doc/src/snippets/patternist/nodeConstructorsAreExpressions.xq b/doc/src/snippets/patternist/nodeConstructorsAreExpressions.xq
new file mode 100644
index 0000000000..ce36e843a7
--- /dev/null
+++ b/doc/src/snippets/patternist/nodeConstructorsAreExpressions.xq
@@ -0,0 +1,4 @@
+let $docURI := 'maybeNotWellformed.xml'
+return if(doc-available($docURI))
+       then doc($docURI)//p/<para>{./node()}</para>
+       else <para>Failed to load {$docURI}</para>
diff --git a/doc/src/snippets/patternist/nodeConstructorsInPaths.xq b/doc/src/snippets/patternist/nodeConstructorsInPaths.xq
new file mode 100644
index 0000000000..beb294fba4
--- /dev/null
+++ b/doc/src/snippets/patternist/nodeConstructorsInPaths.xq
@@ -0,0 +1 @@
+doc('feed.rss')//item/<p>{description/node()}</p>
diff --git a/doc/src/snippets/patternist/nodeTestChildElement.xq b/doc/src/snippets/patternist/nodeTestChildElement.xq
new file mode 100644
index 0000000000..7aa7b34375
--- /dev/null
+++ b/doc/src/snippets/patternist/nodeTestChildElement.xq
@@ -0,0 +1 @@
+doc('index.html')/descendant-or-self::element(p)/child::element(span)
diff --git a/doc/src/snippets/patternist/notIndented.xml b/doc/src/snippets/patternist/notIndented.xml
new file mode 100644
index 0000000000..b3321f286e
--- /dev/null
+++ b/doc/src/snippets/patternist/notIndented.xml
@@ -0,0 +1 @@
+<a><b/><c/><p>Some Text</p></a>
diff --git a/doc/src/snippets/patternist/oneElementConstructor.xq b/doc/src/snippets/patternist/oneElementConstructor.xq
new file mode 100644
index 0000000000..b7eb615f8a
--- /dev/null
+++ b/doc/src/snippets/patternist/oneElementConstructor.xq
@@ -0,0 +1 @@
+<myElement/>
diff --git a/doc/src/snippets/patternist/paragraphsExceptTheFiveFirst.xq b/doc/src/snippets/patternist/paragraphsExceptTheFiveFirst.xq
new file mode 100644
index 0000000000..16438d1889
--- /dev/null
+++ b/doc/src/snippets/patternist/paragraphsExceptTheFiveFirst.xq
@@ -0,0 +1 @@
+doc('index.html')//p[position() > 5]
diff --git a/doc/src/snippets/patternist/paragraphsWithTables.xq b/doc/src/snippets/patternist/paragraphsWithTables.xq
new file mode 100644
index 0000000000..dbb9fcf94b
--- /dev/null
+++ b/doc/src/snippets/patternist/paragraphsWithTables.xq
@@ -0,0 +1 @@
+doc('index.html')/html/body/p[table]
diff --git a/doc/src/snippets/patternist/pathAB.xq b/doc/src/snippets/patternist/pathAB.xq
new file mode 100644
index 0000000000..26fd1e5dc4
--- /dev/null
+++ b/doc/src/snippets/patternist/pathAB.xq
@@ -0,0 +1 @@
+doc('index.html')//p/span
diff --git a/doc/src/snippets/patternist/pathsAllParagraphs.xq b/doc/src/snippets/patternist/pathsAllParagraphs.xq
new file mode 100644
index 0000000000..ba47900f90
--- /dev/null
+++ b/doc/src/snippets/patternist/pathsAllParagraphs.xq
@@ -0,0 +1 @@
+doc('index.html')//p
diff --git a/doc/src/snippets/patternist/simpleHTML.xq b/doc/src/snippets/patternist/simpleHTML.xq
new file mode 100644
index 0000000000..93ac31ec69
--- /dev/null
+++ b/doc/src/snippets/patternist/simpleHTML.xq
@@ -0,0 +1 @@
+doc("index.html")/html/body/p[@class="example"]
diff --git a/doc/src/snippets/patternist/simpleXHTML.xq b/doc/src/snippets/patternist/simpleXHTML.xq
new file mode 100644
index 0000000000..fda5371676
--- /dev/null
+++ b/doc/src/snippets/patternist/simpleXHTML.xq
@@ -0,0 +1,2 @@
+declare namespace x = "http://www.w3.org/1999/xhtml/";
+doc("index.html")/x:html/x:body/x:p[@class="example"]
diff --git a/doc/src/snippets/patternist/svgDocumentElement.xml b/doc/src/snippets/patternist/svgDocumentElement.xml
new file mode 100644
index 0000000000..0c7be4e2da
--- /dev/null
+++ b/doc/src/snippets/patternist/svgDocumentElement.xml
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"/>
diff --git a/doc/src/snippets/patternist/tablesInParagraphs.xq b/doc/src/snippets/patternist/tablesInParagraphs.xq
new file mode 100644
index 0000000000..fc92cf003c
--- /dev/null
+++ b/doc/src/snippets/patternist/tablesInParagraphs.xq
@@ -0,0 +1 @@
+doc('index.html')/html/body/p/table
diff --git a/doc/src/snippets/patternist/twoSVGElements.xq b/doc/src/snippets/patternist/twoSVGElements.xq
new file mode 100644
index 0000000000..ab4fe3580b
--- /dev/null
+++ b/doc/src/snippets/patternist/twoSVGElements.xq
@@ -0,0 +1,5 @@
+declare namespace s = "http://www.w3.org/2000/svg";
+declare default element namespace "http://www.w3.org/2000/svg";
+let $doc := doc('image.svg')
+return ($doc/svg,
+        $doc/s:svg)
diff --git a/doc/src/snippets/patternist/xmlStylesheet.xq b/doc/src/snippets/patternist/xmlStylesheet.xq
new file mode 100644
index 0000000000..9e022081b8
--- /dev/null
+++ b/doc/src/snippets/patternist/xmlStylesheet.xq
@@ -0,0 +1 @@
+<?xml-stylesheet type="test/xsl" href="formatter.xsl"?>
diff --git a/doc/src/snippets/patternist/xsBooleanTrue.xq b/doc/src/snippets/patternist/xsBooleanTrue.xq
new file mode 100644
index 0000000000..897a99e4d6
--- /dev/null
+++ b/doc/src/snippets/patternist/xsBooleanTrue.xq
@@ -0,0 +1 @@
+xs:boolean("true")
diff --git a/doc/src/snippets/patternist/xsvgDocumentElement.xml b/doc/src/snippets/patternist/xsvgDocumentElement.xml
new file mode 100644
index 0000000000..fb6a236e7c
--- /dev/null
+++ b/doc/src/snippets/patternist/xsvgDocumentElement.xml
@@ -0,0 +1 @@
+<x:svg xmlns:x="http://www.w3.org/2000/svg"/>
diff --git a/doc/src/snippets/persistentindexes/main.cpp b/doc/src/snippets/persistentindexes/main.cpp
new file mode 100644
index 0000000000..eeca8ac20e
--- /dev/null
+++ b/doc/src/snippets/persistentindexes/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *window = new MainWindow;
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/persistentindexes/mainwindow.cpp b/doc/src/snippets/persistentindexes/mainwindow.cpp
new file mode 100644
index 0000000000..594881a837
--- /dev/null
+++ b/doc/src/snippets/persistentindexes/mainwindow.cpp
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+#include "model.h"
+
+/*!
+    The main window constructor creates and populates a model with values
+    from a string list then displays the contents of the model using a
+    QListView widget.
+*/
+
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent)
+{
+    QMenu *fileMenu = new QMenu(tr("&File"));
+
+    QAction *quitAction = fileMenu->addAction(tr("E&xit"));
+    quitAction->setShortcut(tr("Ctrl+Q"));
+
+    QMenu *itemsMenu = new QMenu(tr("&Items"));
+
+    insertAction = itemsMenu->addAction(tr("&Insert Item"));
+    removeAction = itemsMenu->addAction(tr("&Remove Item"));
+
+    menuBar()->addMenu(fileMenu);
+    menuBar()->addMenu(itemsMenu);
+
+    QStringList numbers;
+    numbers << tr("One") << tr("Two") << tr("Three") << tr("Four") << tr("Five")
+            << tr("Six") << tr("Seven") << tr("Eight") << tr("Nine") << tr("Ten");
+
+    model = new StringListModel(numbers);
+    QListView *view = new QListView(this);
+    view->setModel(model);
+
+    selectionModel = view->selectionModel();
+
+    connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+    connect(insertAction, SIGNAL(triggered()), this, SLOT(insertItem()));
+    connect(removeAction, SIGNAL(triggered()), this, SLOT(removeItem()));
+    connect(selectionModel,
+            SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
+            this, SLOT(updateMenus(const QModelIndex &)));
+    
+    setCentralWidget(view);
+    setWindowTitle("View onto a string list model");
+}
+
+void MainWindow::insertItem()
+{
+    if (!selectionModel->currentIndex().isValid())
+        return;
+
+    QString itemText = QInputDialog::getText(this, tr("Insert Item"),
+        tr("Input text for the new item:"));
+
+    if (itemText.isNull())
+        return;
+
+    int row = selectionModel->currentIndex().row();
+
+    if (model->insertRows(row, 1))
+        model->setData(model->index(row, 0), itemText, Qt::EditRole);
+}
+
+void MainWindow::removeItem()
+{
+    if (!selectionModel->currentIndex().isValid())
+        return;
+
+    int row = selectionModel->currentIndex().row();
+
+    model->removeRows(row, 1);
+}
+
+void MainWindow::updateMenus(const QModelIndex &currentIndex)
+{
+    insertAction->setEnabled(currentIndex.isValid());
+    removeAction->setEnabled(currentIndex.isValid());
+}
diff --git a/doc/src/snippets/persistentindexes/mainwindow.h b/doc/src/snippets/persistentindexes/mainwindow.h
new file mode 100644
index 0000000000..e0672d5efb
--- /dev/null
+++ b/doc/src/snippets/persistentindexes/mainwindow.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include <QModelIndex>
+
+class QAbstractItemModel;
+class QAction;
+class QItemSelectionModel;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow(QWidget *parent = 0);
+
+private slots:
+    void insertItem();
+    void removeItem();
+    void updateMenus(const QModelIndex &currentIndex);
+
+private:
+    QAbstractItemModel *model;
+    QAction *insertAction;
+    QAction *removeAction;
+    QItemSelectionModel *selectionModel;
+};
+
+#endif
diff --git a/doc/src/snippets/persistentindexes/model.cpp b/doc/src/snippets/persistentindexes/model.cpp
new file mode 100644
index 0000000000..7158f34066
--- /dev/null
+++ b/doc/src/snippets/persistentindexes/model.cpp
@@ -0,0 +1,169 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+  model.cpp
+
+  A simple model that uses a QStringList as its data source.
+*/
+
+#include <qdebug.h>
+
+#include "model.h"
+
+/*!
+    Returns the number of items in the string list as the number of rows
+    in the model.
+*/
+
+int StringListModel::rowCount(const QModelIndex &parent) const
+{
+    return stringList.count();
+}
+
+/*!
+    Returns an appropriate value for the requested data.
+    If the view requests an invalid index, an invalid variant is returned.
+    If a header is requested then we just return the column or row number,
+    depending on the orientation of the header.
+    Any valid index that corresponds to a string in the list causes that
+    string to be returned.
+*/
+
+QVariant StringListModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+
+    if (index.row() < 0 || index.row() >= stringList.size())
+        return QVariant();
+
+    if (role == Qt::DisplayRole)
+        return stringList.at(index.row());
+    else
+        return QVariant();
+}
+
+/*!
+    Returns the appropriate header string depending on the orientation of
+    the header and the section. If anything other than the display role is
+    requested, we return an invalid variant.
+*/
+
+QVariant StringListModel::headerData(int section, Qt::Orientation orientation,
+                                     int role) const
+{
+    if (role != Qt::DisplayRole)
+        return QVariant();
+
+    if (orientation == Qt::Horizontal)
+        return QString("Column %1").arg(section);
+    else
+        return QString("Row %1").arg(section);
+}
+
+/*!
+    Returns an appropriate value for the item's flags. Valid items are
+    enabled, selectable, and editable.
+*/
+
+Qt::ItemFlags StringListModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return Qt::ItemIsEnabled;
+
+    return QAbstractItemModel::flags(index) | Qt::ItemIsEditable;
+}
+
+/*!
+    Changes an item in the string list, but only if the following conditions
+    are met:
+
+    * The index supplied is valid.
+    * The index corresponds to an item to be shown in a view.
+    * The role associated with editing text is specified.
+
+    The dataChanged() signal is emitted if the item is changed.
+*/
+
+bool StringListModel::setData(const QModelIndex &index,
+                              const QVariant &value, int role)
+{
+    if (index.isValid() && role == Qt::EditRole) {
+
+        stringList.replace(index.row(), value.toString());
+        emit dataChanged(index, index);
+        return true;
+    }
+    return false;
+}
+
+/*!
+    Inserts a number of rows into the model at the specified position.
+*/
+
+bool StringListModel::insertRows(int position, int rows, const QModelIndex &parent)
+{
+    beginInsertRows(parent, position, position + rows - 1);
+
+    for (int row = 0; row < rows; ++row) {
+        stringList.insert(position, "");
+    }
+
+    endInsertRows();
+    return true;
+}
+
+/*!
+    Removes a number of rows from the model at the specified position.
+*/
+
+bool StringListModel::removeRows(int position, int rows, const QModelIndex &parent)
+{
+    beginRemoveRows(parent, position, position + rows - 1);
+
+    for (int row = 0; row < rows; ++row) {
+        stringList.removeAt(position);
+    }
+
+    endRemoveRows();
+    return true;
+}
diff --git a/doc/src/snippets/persistentindexes/model.h b/doc/src/snippets/persistentindexes/model.h
new file mode 100644
index 0000000000..c787c363d1
--- /dev/null
+++ b/doc/src/snippets/persistentindexes/model.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MODEL_H
+#define MODEL_H
+
+#include <QAbstractListModel>
+#include <QObject>
+#include <QStringList>
+
+class StringListModel : public QAbstractListModel
+{
+    Q_OBJECT
+public:
+    StringListModel(const QStringList &strings, QObject *parent = 0)
+        : QAbstractListModel(parent), stringList(strings) {}
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    QVariant data(const QModelIndex &index, int role) const;
+    QVariant headerData(int section, Qt::Orientation orientation,
+                        int role = Qt::DisplayRole) const;
+
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+    bool setData(const QModelIndex &index, const QVariant &value,
+                 int role = Qt::EditRole);
+
+    bool insertRows(int position, int rows, const QModelIndex &index = QModelIndex());
+    bool removeRows(int position, int rows, const QModelIndex &index = QModelIndex());
+
+private:
+    QStringList stringList;
+};
+
+#endif
diff --git a/doc/src/snippets/persistentindexes/persistentindexes.pro b/doc/src/snippets/persistentindexes/persistentindexes.pro
new file mode 100644
index 0000000000..aaf41bd1ce
--- /dev/null
+++ b/doc/src/snippets/persistentindexes/persistentindexes.pro
@@ -0,0 +1,5 @@
+HEADERS     = mainwindow.h \
+              model.h
+SOURCES     = main.cpp \
+              mainwindow.cpp \
+              model.cpp
diff --git a/doc/src/snippets/phonon.cpp b/doc/src/snippets/phonon.cpp
new file mode 100644
index 0000000000..e50eabd434
--- /dev/null
+++ b/doc/src/snippets/phonon.cpp
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+    
+
+Window::Window()
+{
+    {
+//![0]
+    Phonon::MediaObject *music =
+        Phonon::createPlayer(Phonon::MusicCategory,
+                             Phonon::MediaSource("/path/mysong.wav"));
+    music->play();
+//![0]
+    }
+
+    {
+    QWidget *parentWidget = new QWidget;
+    QUrl url("Myfancymusic");
+//![1]
+    Phonon::VideoPlayer *player =
+        new Phonon::VideoPlayer(Phonon::VideoCategory, parentWidget);
+    player->play(url);
+//![1]
+    }
+
+    {
+//![2]
+    Phonon::MediaObject *mediaObject = new Phonon::MediaObject(this);
+    mediaObject->setCurrentSource(Phonon::MediaSource("/mymusic/barbiegirl.wav"));
+    Phonon::AudioOutput *audioOutput =
+        new Phonon::AudioOutput(Phonon::MusicCategory, this);
+    Phonon::Path path = Phonon::createPath(mediaObject, audioOutput);
+//![2]
+    
+//![3]
+    Phonon::Effect *effect =
+        new Phonon::Effect(
+            Phonon::BackendCapabilities::availableAudioEffects()[0], this);
+    path.insertEffect(effect);
+//![3]    
+    }
+
+    {
+//![4]
+    Phonon::MediaObject *mediaObject = new Phonon::MediaObject(this);
+
+    Phonon::VideoWidget *videoWidget = new Phonon::VideoWidget(this);
+    Phonon::createPath(mediaObject, videoWidget);
+
+    Phonon::AudioOutput *audioOutput =
+        new Phonon::AudioOutput(Phonon::VideoCategory, this);
+    Phonon::createPath(mediaObject, audioOutput);
+//![4]
+//![5]
+    mediaObject->play();
+//![5]
+    }
+}
diff --git a/doc/src/snippets/phonon/samplebackend/main.cpp b/doc/src/snippets/phonon/samplebackend/main.cpp
new file mode 100644
index 0000000000..724ef5ce96
--- /dev/null
+++ b/doc/src/snippets/phonon/samplebackend/main.cpp
@@ -0,0 +1,115 @@
+//! [snippet]
+QObject *Backend::createObject(BackendInterface::Class c, QObject *parent, const QList<QVariant> &args)
+{
+    switch (c) {
+    case MediaObjectClass:
+        return new MediaObject(parent);
+    case VolumeFaderEffectClass:
+        return new VolumeFaderEffect(parent);
+    case AudioOutputClass:
+        return new AudioOutput(parent);
+    case AudioDataOutputClass:
+        return new AudioDataOutput(parent);
+    case VisualizationClass:
+        return new Visualization(parent);
+    case VideoDataOutputClass:
+        return new VideoDataOutput(parent);
+    case EffectClass:
+        return new Effect(args[0].toInt(), parent);
+    case VideoWidgetClass:
+        return new VideoWidget(qobject_cast<QWidget *>(parent));
+    }
+    return 0;
+}
+
+QSet<int> Backend::objectDescriptionIndexes(ObjectDescriptionType type) const
+{
+    QSet<int> set;
+    switch(type)
+    {
+    case Phonon::AudioOutputDeviceType:
+        // use AudioDeviceEnumerator to list ALSA and OSS devices
+        set << 10000 << 10001;
+        break;
+    case Phonon::AudioCaptureDeviceType:
+        set << 20000 << 20001;
+        break;
+    case Phonon::VideoOutputDeviceType:
+        break;
+    case Phonon::VideoCaptureDeviceType:
+        set << 30000 << 30001;
+        break;
+    case Phonon::VisualizationType:
+    case Phonon::AudioCodecType:
+    case Phonon::VideoCodecType:
+    case Phonon::ContainerFormatType:
+        break;
+    case Phonon::EffectType:
+        set << 0x7F000001;
+        break;
+    }
+    return set;
+}
+
+QHash<QByteArray, QVariant> Backend::objectDescriptionProperties(ObjectDescriptionType type, int index) const
+{
+    QHash<QByteArray, QVariant> ret;
+    switch (type) {
+    case Phonon::AudioOutputDeviceType:
+        switch (index) {
+        case 10000:
+            ret.insert("name", QLatin1String("internal Soundcard"));
+            break;
+        case 10001:
+            ret.insert("name", QLatin1String("USB Headset"));
+            ret.insert("icon", KIcon("usb-headset"));
+            ret.insert("available", false);
+            break;
+        }
+        break;
+    case Phonon::AudioCaptureDeviceType:
+        switch (index) {
+        case 20000:
+            ret.insert("name", QLatin1String("Soundcard"));
+            ret.insert("description", QLatin1String("first description"));
+            break;
+        case 20001:
+            ret.insert("name", QLatin1String("DV"));
+            ret.insert("description", QLatin1String("second description"));
+            break;
+        }
+        break;
+    case Phonon::VideoOutputDeviceType:
+        break;
+    case Phonon::VideoCaptureDeviceType:
+        switch (index) {
+        case 30000:
+            ret.insert("name", QLatin1String("USB Webcam"));
+            ret.insert("description", QLatin1String("first description"));
+            break;
+        case 30001:
+            ret.insert("name", QLatin1String("DV"));
+            ret.insert("description", QLatin1String("second description"));
+            break;
+        }
+        break;
+    case Phonon::VisualizationType:
+        break;
+    case Phonon::AudioCodecType:
+        break;
+    case Phonon::VideoCodecType:
+        break;
+    case Phonon::ContainerFormatType:
+        break;
+    case Phonon::EffectType:
+        switch (index) {
+        case 0x7F000001:
+            ret.insert("name", QLatin1String("Delay"));
+            ret.insert("description", QLatin1String("Simple delay effect with time, feedback and level controls."));
+            break;
+        }
+        break;
+    }
+    return ret;
+}
+//! [snippet]
diff --git a/doc/src/snippets/phononeffectparameter.cpp b/doc/src/snippets/phononeffectparameter.cpp
new file mode 100644
index 0000000000..e0351f5709
--- /dev/null
+++ b/doc/src/snippets/phononeffectparameter.cpp
@@ -0,0 +1,35 @@
+#include <QtGui>
+
+#include <phonon/backendcapabilities.h>
+#include <phonon/phononnamespace.h>
+#include <phonon/effect.h>
+#include <phonon/effectparameter.h>
+#include <phonon/effectwidget.h>
+
+
+int main(int argv, char **args)
+{
+    QApplication app(argv, args);
+    app.setApplicationName("effectsnippets");
+
+    QList<Phonon::EffectDescription> effects =
+        Phonon::BackendCapabilities::availableAudioEffects();
+
+    Phonon::Effect *effect = new Phonon::Effect(effects.at(3));
+    
+//![0]
+    QList<Phonon::EffectParameter> parameters = effect->parameters();
+
+    foreach(Phonon::EffectParameter parameter, parameters) {
+        // Do something with parameter
+    }
+//![0]
+
+//![1]
+    Phonon::EffectWidget *effectWidget = new Phonon::EffectWidget(effect);
+//![1]
+    
+    effectWidget->show();
+
+    return app.exec();
+}
diff --git a/doc/src/snippets/phononobjectdescription.cpp b/doc/src/snippets/phononobjectdescription.cpp
new file mode 100644
index 0000000000..b9d1f2976e
--- /dev/null
+++ b/doc/src/snippets/phononobjectdescription.cpp
@@ -0,0 +1,40 @@
+#include <QtGui>
+
+#include <phonon/phononnamespace.h>
+#include <phonon/audiooutput.h>
+#include <phonon/seekslider.h>
+#include <phonon/mediaobject.h>
+#include <phonon/volumeslider.h>
+#include <phonon/backendcapabilities.h>
+#include <phonon/effect.h>
+#include <phonon/effectparameter.h>
+#include <phonon/objectdescriptionmodel.h>
+#include <QList>
+
+int main(int argv, char **args)
+{
+    QApplication app(argv, args);
+    
+//![0]
+    QList<Phonon::EffectDescription> effectDescriptions =
+            Phonon::BackendCapabilities::availableAudioEffects();
+
+//![1]
+    QList<Phonon::AudioOutputDevice> audioOutputDevices =
+            Phonon::BackendCapabilities::availableAudioOutputDevices();
+
+//![1]
+    foreach (Phonon::EffectDescription effectDescription, effectDescriptions) {
+        Phonon::Effect *effect = new Phonon::Effect(effectDescription);
+
+        // ... Do something with the effect, like insert it into a media graph
+    }
+
+    Phonon::AudioOutput *audioOutput = new Phonon::AudioOutput;
+
+    audioOutput->setOutputDevice(audioOutputDevices[0]);
+//![0]
+
+    return app.exec();
+
+}
diff --git a/doc/src/snippets/picture/picture.cpp b/doc/src/snippets/picture/picture.cpp
new file mode 100644
index 0000000000..07cedbf363
--- /dev/null
+++ b/doc/src/snippets/picture/picture.cpp
@@ -0,0 +1,152 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+void myProcessing(const QString &)
+{
+}
+
+int main()
+{
+    QWidget myWidget;
+    {
+        // RECORD
+//! [0]
+        QPicture picture;
+        QPainter painter;
+        painter.begin(&picture);           // paint in picture
+        painter.drawEllipse(10,20, 80,70); // draw an ellipse
+        painter.end();                     // painting done
+        picture.save("drawing.pic");       // save picture
+//! [0]
+    }
+
+    {
+        // REPLAY
+//! [1]
+        QPicture picture;
+        picture.load("drawing.pic");           // load picture
+        QPainter painter;
+        painter.begin(&myWidget);              // paint in myWidget
+        painter.drawPicture(0, 0, picture);    // draw the picture at (0,0)
+        painter.end();                         // painting done
+//! [1]
+    }
+
+    QPicture myPicture;
+    {
+        // FORMATS
+//! [2]
+        QStringList list = QPicture::inputFormatList();
+        foreach (QString string, list)
+            myProcessing(string);
+//! [2]
+    }
+
+    {
+        // OUTPUT
+//! [3]
+        QStringList list = QPicture::outputFormatList();
+        foreach (QString string, list)
+            myProcessing(string);
+//! [3]
+    }
+
+    {
+        // PIC READ
+//! [4]
+        QPictureIO iio;
+        QPixmap  pixmap;
+        iio.setFileName("vegeburger.pic");
+        if (iio.read()) {        // OK
+            QPicture picture = iio.picture();
+            QPainter painter(&pixmap);
+            painter.drawPicture(0, 0, picture);
+        }
+//! [4]
+    }
+
+    {
+        QPixmap pixmap;
+        // PIC WRITE
+//! [5]
+        QPictureIO iio;
+        QPicture   picture;
+        QPainter painter(&picture);
+        painter.drawPixmap(0, 0, pixmap);
+        iio.setPicture(picture);
+        iio.setFileName("vegeburger.pic");
+        iio.setFormat("PIC");
+        if (iio.write())
+            return true; // returned true if written successfully
+//! [5]
+    }
+
+}
+
+// SVG READ
+//! [6]
+void readSVG(QPictureIO *picture)
+{
+    // read the picture using the picture->ioDevice()
+}
+//! [6]
+
+// SVG WRITE
+//! [7]
+void writeSVG(QPictureIO *picture)
+{
+    // write the picture using the picture->ioDevice()
+}
+//! [7]
+
+// USE SVG
+void foo() {
+
+//! [8]
+    // add the SVG picture handler
+    // ...
+//! [8]
+    QPictureIO::defineIOHandler("SVG", 0, 0, readSVG, writeSVG);
+    // ...
+
+}
diff --git a/doc/src/snippets/picture/picture.pro b/doc/src/snippets/picture/picture.pro
new file mode 100644
index 0000000000..b46019f49a
--- /dev/null
+++ b/doc/src/snippets/picture/picture.pro
@@ -0,0 +1,12 @@
+######################################################################
+# Automatically generated by qmake (2.00a) Sun Jun 26 15:25:59 2005
+######################################################################
+
+TEMPLATE = app
+INCLUDEPATH += .
+
+# Input
+SOURCES += picture.cpp
+OBJECTS_DIR=.obj/debug-shared
+MOC_DIR=.moc/debug-shared
+CONFIG += qt warn_on debug  create_prl link_prl
diff --git a/doc/src/snippets/plaintextlayout/main.cpp b/doc/src/snippets/plaintextlayout/main.cpp
new file mode 100644
index 0000000000..41713dd2b1
--- /dev/null
+++ b/doc/src/snippets/plaintextlayout/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Window *window = new Window;
+    window->resize(337, 343);
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/plaintextlayout/plaintextlayout.pro b/doc/src/snippets/plaintextlayout/plaintextlayout.pro
new file mode 100644
index 0000000000..6283406f25
--- /dev/null
+++ b/doc/src/snippets/plaintextlayout/plaintextlayout.pro
@@ -0,0 +1,3 @@
+HEADERS     = window.h
+SOURCES     = main.cpp \
+              window.cpp
diff --git a/doc/src/snippets/plaintextlayout/window.cpp b/doc/src/snippets/plaintextlayout/window.cpp
new file mode 100644
index 0000000000..0e91dc1e68
--- /dev/null
+++ b/doc/src/snippets/plaintextlayout/window.cpp
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <math.h>
+
+#include "window.h"
+
+Window::Window(QWidget *parent)
+    : QWidget(parent)
+{
+    text = QString("Support for text rendering and layout in Qt 4 has been "
+                   "redesigned around a system that allows textual content to "
+                   "be represented in a more flexible way than was possible "
+                   "with Qt 3. Qt 4 also provides a more convenient "
+                   "programming interface for editing documents. These "
+                   "improvements are made available through a reimplementation "
+                   "of the existing text rendering engine, and the "
+                   "introduction of several new classes. "
+                   "See the relevant module overview for a detailed discussion "
+                   "of this framework. The following sections provide a brief "
+                   "overview of the main concepts behind Scribe.");
+
+    setWindowTitle(tr("Plain Text Layout"));
+}
+
+void Window::paintEvent(QPaintEvent *event)
+{
+//! [0]
+    QTextLayout textLayout(text, font);
+    qreal margin = 10;
+    qreal radius = qMin(width()/2.0, height()/2.0) - margin;
+    QFontMetrics fm(font);
+
+    qreal lineHeight = fm.height();
+    qreal y = 0;
+
+    textLayout.beginLayout();
+
+    while (1) {
+        // create a new line 
+        QTextLine line = textLayout.createLine();
+        if (!line.isValid())
+            break;
+
+        qreal x1 = qMax(0.0, pow(pow(radius,2)-pow(radius-y,2), 0.5));
+        qreal x2 = qMax(0.0, pow(pow(radius,2)-pow(radius-(y+lineHeight),2), 0.5));
+        qreal x = qMax(x1, x2) + margin;
+        qreal lineWidth = (width() - margin) - x;
+
+        line.setLineWidth(lineWidth);
+        line.setPosition(QPointF(x, margin+y));
+        y += line.height();
+    }
+
+    textLayout.endLayout();
+
+    QPainter painter;
+    painter.begin(this);
+    painter.setRenderHint(QPainter::Antialiasing);
+    painter.fillRect(rect(), Qt::white);
+    painter.setBrush(QBrush(Qt::black));
+    painter.setPen(QPen(Qt::black));
+    textLayout.draw(&painter, QPoint(0,0));
+
+    painter.setBrush(QBrush(QColor("#a6ce39")));
+    painter.setPen(QPen(Qt::black));
+    painter.drawEllipse(QRectF(-radius, margin, 2*radius, 2*radius));
+    painter.end();
+//! [0]
+}
diff --git a/doc/src/snippets/plaintextlayout/window.h b/doc/src/snippets/plaintextlayout/window.h
new file mode 100644
index 0000000000..291250e279
--- /dev/null
+++ b/doc/src/snippets/plaintextlayout/window.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QWidget>
+
+class Window : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Window(QWidget *parent = 0);
+
+protected:
+    void paintEvent(QPaintEvent *event);
+
+private:
+    QFont font;
+    QString text;
+};
+
+#endif
diff --git a/doc/src/snippets/pointer/pointer.cpp b/doc/src/snippets/pointer/pointer.cpp
new file mode 100644
index 0000000000..1be5ef05e5
--- /dev/null
+++ b/doc/src/snippets/pointer/pointer.cpp
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QLabel>
+#include <QPointer>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+//! [0]
+    QPointer<QLabel> label = new QLabel;
+    label->setText("&Status:");
+//! [0]
+
+//! [1]
+    if (label)
+//! [1] //! [2]
+        label->show();
+//! [2]
+    return 0;
+}
diff --git a/doc/src/snippets/polygon/polygon.cpp b/doc/src/snippets/polygon/polygon.cpp
new file mode 100644
index 0000000000..b95ac376a4
--- /dev/null
+++ b/doc/src/snippets/polygon/polygon.cpp
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+int main()
+{
+    {
+        // STREAM
+//! [0]
+        QPolygon polygon;
+        polygon << QPoint(10, 20) << QPoint(20, 30);
+//! [0]
+    }
+
+    {
+        // STREAMF
+//! [1]
+        QPolygonF polygon;
+        polygon << QPointF(10.4, 20.5) << QPointF(20.2, 30.2);
+//! [1]
+    }
+
+    {
+        // SETPOINTS
+//! [2]
+        static const int points[] = { 10, 20, 30, 40 };
+        QPolygon polygon;
+        polygon.setPoints(2, points);
+//! [2]
+    }
+
+    {
+        // SETPOINTS2
+//! [3]
+        QPolygon polygon;
+        polygon.setPoints(2, 10, 20, 30, 40);
+//! [3]
+    }
+
+    {
+        // PUTPOINTS
+//! [4]
+        QPolygon polygon(1);
+        polygon[0] = QPoint(4, 5);
+        polygon.putPoints(1, 2, 6,7, 8,9);
+//! [4]
+    }
+
+    {
+        // PUTPOINTS2
+//! [5]
+        QPolygon polygon(3);
+        polygon.putPoints(0, 3, 4,5, 0,0, 8,9);
+        polygon.putPoints(1, 1, 6,7);
+//! [5]
+    }
+
+    {
+        // PUTPOINTS3
+//! [6]
+        QPolygon polygon1;
+        polygon1.putPoints(0, 3, 1,2, 0,0, 5,6);
+        // polygon1 is now the three-point polygon(1,2, 0,0, 5,6);
+
+        QPolygon polygon2;
+        polygon2.putPoints(0, 3, 4,4, 5,5, 6,6);
+        // polygon2 is now (4,4, 5,5, 6,6);
+
+        polygon1.putPoints(2, 3, polygon2);
+        // polygon1 is now the five-point polygon(1,2, 0,0, 4,4, 5,5, 6,6);
+//! [6]
+    }
+    return 0;
+}
diff --git a/doc/src/snippets/polygon/polygon.pro b/doc/src/snippets/polygon/polygon.pro
new file mode 100644
index 0000000000..39841a5aa9
--- /dev/null
+++ b/doc/src/snippets/polygon/polygon.pro
@@ -0,0 +1 @@
+SOURCES += polygon.cpp
diff --git a/doc/src/snippets/porting4-dropevents/main.cpp b/doc/src/snippets/porting4-dropevents/main.cpp
new file mode 100644
index 0000000000..a54e0b7322
--- /dev/null
+++ b/doc/src/snippets/porting4-dropevents/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    MyWidget window;
+    window.show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/porting4-dropevents/porting4-dropevents.pro b/doc/src/snippets/porting4-dropevents/porting4-dropevents.pro
new file mode 100644
index 0000000000..6283406f25
--- /dev/null
+++ b/doc/src/snippets/porting4-dropevents/porting4-dropevents.pro
@@ -0,0 +1,3 @@
+HEADERS     = window.h
+SOURCES     = main.cpp \
+              window.cpp
diff --git a/doc/src/snippets/porting4-dropevents/window.cpp b/doc/src/snippets/porting4-dropevents/window.cpp
new file mode 100644
index 0000000000..853687a28f
--- /dev/null
+++ b/doc/src/snippets/porting4-dropevents/window.cpp
@@ -0,0 +1,125 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+
+MyWidget::MyWidget(QWidget *parent)
+    : QWidget(parent)
+{
+    QLabel *textLabel = new QLabel(tr("Data:"), this);
+    dataLabel = new QLabel(this);
+    dataLabel->setFixedSize(200, 200);
+
+    QVBoxLayout *layout = new QVBoxLayout(this);
+    layout->addWidget(textLabel);
+    layout->addWidget(dataLabel);
+
+    setAcceptDrops(true);
+    setWindowTitle(tr("Drop Events"));
+}
+
+//! [0]
+void MyWidget::dragEnterEvent(QDragEnterEvent *event)
+{
+    if (event->mimeData()->hasText() || event->mimeData()->hasImage())
+        event->acceptProposedAction();
+}
+//! [0]
+
+//! [1]
+void MyWidget::dropEvent(QDropEvent *event)
+{
+    if (event->mimeData()->hasText())
+        dataLabel->setText(event->mimeData()->text());
+    else if (event->mimeData()->hasImage()) {
+        QVariant imageData = event->mimeData()->imageData();
+        dataLabel->setPixmap(qvariant_cast<QPixmap>(imageData));
+    }
+    event->acceptProposedAction();
+}
+//! [1]
+
+//! [2]
+void MyWidget::mousePressEvent(QMouseEvent *event)
+{
+//! [2]
+    QString text = dataLabel->text();
+    QPixmap iconPixmap(32, 32);
+    iconPixmap.fill(qRgba(255, 0, 0, 127));
+    QImage image(100, 100, QImage::Format_RGB32);
+    image.fill(qRgb(0, 0, 255));
+
+//! [3]
+    if (event->button() == Qt::LeftButton) {
+
+        QDrag *drag = new QDrag(this);
+        QMimeData *mimeData = new QMimeData;
+
+        mimeData->setText(text);
+        mimeData->setImageData(image);
+        drag->setMimeData(mimeData);
+        drag->setPixmap(iconPixmap);
+
+        Qt::DropAction dropAction = drag->exec();
+//! [3]
+        // ...
+//! [4]
+        event->accept();
+    }
+//! [4]
+    else if (event->button() == Qt::MidButton) {
+
+        QDrag *drag = new QDrag(this);
+        QMimeData *mimeData = new QMimeData;
+
+        mimeData->setImageData(image);
+        drag->setMimeData(mimeData);
+        drag->setPixmap(iconPixmap);
+
+        Qt::DropAction dropAction = drag->exec();
+        // ...
+        event->accept();
+    }
+//! [5]
+}
+//! [5]
diff --git a/doc/src/snippets/porting4-dropevents/window.h b/doc/src/snippets/porting4-dropevents/window.h
new file mode 100644
index 0000000000..4aebb8ce7b
--- /dev/null
+++ b/doc/src/snippets/porting4-dropevents/window.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QString>
+#include <QStringList>
+#include <QWidget>
+
+class QComboBox;
+class QFrame;
+class QLabel;
+
+class MyWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    MyWidget(QWidget *parent = 0);
+
+protected:
+    void dragEnterEvent(QDragEnterEvent *event);
+    void dropEvent(QDropEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+
+private:
+    QComboBox *mimeTypeCombo;
+    QFrame *dropFrame;
+    QLabel *dataLabel;
+    QString oldText;
+    QStringList oldMimeTypes;
+};
+
+#endif
diff --git a/doc/src/snippets/printing-qprinter/errors.cpp b/doc/src/snippets/printing-qprinter/errors.cpp
new file mode 100644
index 0000000000..55f78e8717
--- /dev/null
+++ b/doc/src/snippets/printing-qprinter/errors.cpp
@@ -0,0 +1,25 @@
+#include <QtGui>
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+//! [0]
+    QPrinter printer;
+    printer.setOutputFormat(QPrinter::PdfFormat);
+    printer.setOutputFileName("/foobar/nonwritable.pdf");
+    QPainter painter;
+    if (! painter.begin(&printer)) { // failed to open file
+        qWarning("failed to open file, is it writable?");
+        return 1;
+    }
+    painter.drawText(10, 10, "Test");
+    if (! printer.newPage()) {
+        qWarning("failed in flushing page to disk, disk full?");
+        return 1;
+    }
+    painter.drawText(10, 10, "Test 2");
+    painter.end();
+//! [0]
+    return 0;
+}
diff --git a/doc/src/snippets/printing-qprinter/main.cpp b/doc/src/snippets/printing-qprinter/main.cpp
new file mode 100644
index 0000000000..2289ae4cef
--- /dev/null
+++ b/doc/src/snippets/printing-qprinter/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "object.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Object object;
+    QTimer timer;
+    timer.setSingleShot(true);
+    timer.connect(&timer, SIGNAL(timeout()), &object, SLOT(print()));
+    timer.start(0);
+    return app.exec();
+}
diff --git a/doc/src/snippets/printing-qprinter/object.cpp b/doc/src/snippets/printing-qprinter/object.cpp
new file mode 100644
index 0000000000..e6bab28b8d
--- /dev/null
+++ b/doc/src/snippets/printing-qprinter/object.cpp
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "object.h"
+
+Object::Object(QObject *parent)
+    : QObject(parent)
+{
+}
+
+void Object::print()
+{
+    int numberOfPages = 10;
+    int lastPage = numberOfPages - 1;
+
+//! [0]
+    QPrinter printer(QPrinter::HighResolution);
+    printer.setOutputFileName("print.ps");
+    QPainter painter;
+    painter.begin(&printer);
+
+    for (int page = 0; page < numberOfPages; ++page) {
+
+        // Use the painter to draw on the page.
+
+        if (page != lastPage)
+            printer.newPage();
+    }
+
+    painter.end();
+//! [0]
+    qApp->quit();
+}
diff --git a/doc/src/snippets/printing-qprinter/object.h b/doc/src/snippets/printing-qprinter/object.h
new file mode 100644
index 0000000000..3f5021e740
--- /dev/null
+++ b/doc/src/snippets/printing-qprinter/object.h
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QObject>
+
+class Object : public QObject
+{
+    Q_OBJECT
+
+public:
+    Object(QObject *parent = 0);
+
+public slots:
+    void print();
+};
diff --git a/doc/src/snippets/printing-qprinter/printing-qprinter.pro b/doc/src/snippets/printing-qprinter/printing-qprinter.pro
new file mode 100644
index 0000000000..c50fc1967d
--- /dev/null
+++ b/doc/src/snippets/printing-qprinter/printing-qprinter.pro
@@ -0,0 +1,3 @@
+SOURCES   = main.cpp \
+            object.cpp
+HEADERS   = object.h
diff --git a/doc/src/snippets/process/process.cpp b/doc/src/snippets/process/process.cpp
new file mode 100644
index 0000000000..2d6ce1085d
--- /dev/null
+++ b/doc/src/snippets/process/process.cpp
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QProcess>
+
+bool zip()
+{
+//! [0]
+    QProcess gzip;
+    gzip.start("gzip", QStringList() << "-c");
+    if (!gzip.waitForStarted())
+        return false;
+
+    gzip.write("Qt rocks!");
+    gzip.closeWriteChannel();
+
+    if (!gzip.waitForFinished())
+        return false;
+
+    QByteArray result = gzip.readAll();
+//! [0]
+
+    gzip.start("gzip", QStringList() << "-d" << "-c");
+    gzip.write(result);
+    gzip.closeWriteChannel();
+
+    if (!gzip.waitForFinished())
+        return false;
+
+    qDebug("Result: %s", gzip.readAll().data());
+    return true;
+}
+
+
+int main()
+{
+    zip();
+    return 0;
+}
diff --git a/doc/src/snippets/process/process.pro b/doc/src/snippets/process/process.pro
new file mode 100644
index 0000000000..f96847de8d
--- /dev/null
+++ b/doc/src/snippets/process/process.pro
@@ -0,0 +1 @@
+SOURCES += process.cpp
diff --git a/doc/src/snippets/qabstractsliderisnippet.cpp b/doc/src/snippets/qabstractsliderisnippet.cpp
new file mode 100644
index 0000000000..b545c1d8ab
--- /dev/null
+++ b/doc/src/snippets/qabstractsliderisnippet.cpp
@@ -0,0 +1,510 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+QAbstractSliderPrivate::QAbstractSliderPrivate()
+    : minimum(0), maximum(99), singleStep(1), pageStep(10),
+      value(0), position(0), pressValue(-1), tracking(true), blocktracking(false), pressed(false),
+      invertedAppearance(false), invertedControls(false),
+      orientation(Qt::Horizontal), repeatAction(QAbstractSlider::SliderNoAction)
+{
+}
+
+QAbstractSliderPrivate::~QAbstractSliderPrivate()
+{
+}
+
+oid QAbstractSlider::setRange(int min, int max)
+{
+    Q_D(QAbstractSlider);
+    int oldMin = d->minimum;
+    int oldMax = d->maximum;
+    d->minimum = min;
+    d->maximum = qMax(min, max);
+    if (oldMin != d->minimum || oldMax != d->maximum) {
+        sliderChange(SliderRangeChange);
+        emit rangeChanged(d->minimum, d->maximum);
+        setValue(d->value); // re-bound
+    }
+}
+
+
+void QAbstractSliderPrivate::setSteps(int single, int page)
+{
+    Q_Q(QAbstractSlider);
+    singleStep = qAbs(single);
+    pageStep = qAbs(page);
+    q->sliderChange(QAbstractSlider::SliderStepsChange);
+}
+
+AbstractSlider::QAbstractSlider(QWidget *parent)
+    :QWidget(*new QAbstractSliderPrivate, parent, 0)
+{
+}
+
+QAbstractSlider::QAbstractSlider(QAbstractSliderPrivate &dd, QWidget *parent)
+    :QWidget(dd, parent, 0)
+{
+}
+
+QAbstractSlider::~QAbstractSlider()
+{
+}
+
+void QAbstractSlider::setOrientation(Qt::Orientation orientation)
+{
+    Q_D(QAbstractSlider);
+    if (d->orientation == orientation)
+        return;
+
+    d->orientation = orientation;
+    if (!testAttribute(Qt::WA_WState_OwnSizePolicy)) {
+        QSizePolicy sp = sizePolicy();
+        sp.transpose();
+        setSizePolicy(sp);
+        setAttribute(Qt::WA_WState_OwnSizePolicy, false);
+    }
+    update();
+    updateGeometry();
+}
+
+Qt::Orientation QAbstractSlider::orientation() const
+{
+    Q_D(const QAbstractSlider);
+    return d->orientation;
+}
+
+
+void QAbstractSlider::setMinimum(int min)
+{
+    Q_D(QAbstractSlider);
+    setRange(min, qMax(d->maximum, min));
+}
+
+int QAbstractSlider::minimum() const
+{
+    Q_D(const QAbstractSlider);
+    return d->minimum;
+}
+
+
+void QAbstractSlider::setMaximum(int max)
+{
+    Q_D(QAbstractSlider);
+    setRange(qMin(d->minimum, max), max);
+}
+
+int QAbstractSlider::maximum() const
+{
+    Q_D(const QAbstractSlider);
+    return d->maximum;
+}
+
+
+
+void QAbstractSlider::setSingleStep(int step)
+{
+    Q_D(QAbstractSlider);
+    d->setSteps(step, d->pageStep);
+}
+
+int QAbstractSlider::singleStep() const
+{
+    Q_D(const QAbstractSlider);
+    return d->singleStep;
+}
+
+
+void QAbstractSlider::setPageStep(int step)
+{
+    Q_D(QAbstractSlider);
+    d->setSteps(d->singleStep, step);
+}
+
+int QAbstractSlider::pageStep() const
+{
+    Q_D(const QAbstractSlider);
+    return d->pageStep;
+}
+
+oid QAbstractSlider::setTracking(bool enable)
+{
+    Q_D(QAbstractSlider);
+    d->tracking = enable;
+}
+
+bool QAbstractSlider::hasTracking() const
+{
+    Q_D(const QAbstractSlider);
+    return d->tracking;
+}
+
+
+
+void QAbstractSlider::setSliderDown(bool down)
+{
+    Q_D(QAbstractSlider);
+    bool doEmit = d->pressed != down;
+
+    d->pressed = down;
+
+    if (doEmit) {
+        if (down)
+            emit sliderPressed();
+        else
+            emit sliderReleased();
+    }
+
+    if (!down && d->position != d->value)
+        triggerAction(SliderMove);
+}
+
+bool QAbstractSlider::isSliderDown() const
+{
+    Q_D(const QAbstractSlider);
+    return d->pressed;
+}
+
+
+void QAbstractSlider::setSliderPosition(int position)
+{
+    Q_D(QAbstractSlider);
+    position = d->bound(position);
+    if (position == d->position)
+        return;
+    d->position = position;
+    if (!d->tracking)
+        update();
+    if (d->pressed)
+        emit sliderMoved(position);
+    if (d->tracking && !d->blocktracking)
+        triggerAction(SliderMove);
+}
+
+int QAbstractSlider::sliderPosition() const
+{
+    Q_D(const QAbstractSlider);
+    return d->position;
+}
+
+
+
+int QAbstractSlider::value() const
+{
+    Q_D(const QAbstractSlider);
+    return d->value;
+}
+
+//! [0]
+void QAbstractSlider::setValue(int value)
+//! [0]
+{
+    Q_D(QAbstractSlider);
+    value = d->bound(value);
+    if (d->value == value && d->position == value)
+        return;
+    d->value = value;
+    if (d->position != value) {
+        d->position = value;
+        if (d->pressed)
+            emit sliderMoved((d->position = value));
+    }
+#ifndef QT_NO_ACCESSIBILITY
+//! [1]
+    QAccessible::updateAccessibility(this, 0, QAccessible::ValueChanged);
+//! [1]
+#endif
+    sliderChange(SliderValueChange);
+    emit valueChanged(value);
+//! [2]
+}
+//! [2]
+
+bool QAbstractSlider::invertedAppearance() const
+{
+    Q_D(const QAbstractSlider);
+    return d->invertedAppearance;
+}
+
+void QAbstractSlider::setInvertedAppearance(bool invert)
+{
+    Q_D(QAbstractSlider);
+    d->invertedAppearance = invert;
+    update();
+}
+
+
+
+bool QAbstractSlider::invertedControls() const
+{
+    Q_D(const QAbstractSlider);
+    return d->invertedControls;
+}
+
+void QAbstractSlider::setInvertedControls(bool invert)
+{
+    Q_D(QAbstractSlider);
+    d->invertedControls = invert;
+}
+
+void QAbstractSlider::triggerAction(SliderAction action)
+{
+    Q_D(QAbstractSlider);
+    d->blocktracking = true;
+    switch (action) {
+    case SliderSingleStepAdd:
+        setSliderPosition(d->value + d->singleStep);
+        break;
+    case SliderSingleStepSub:
+        setSliderPosition(d->value - d->singleStep);
+        break;
+    case SliderPageStepAdd:
+        setSliderPosition(d->value + d->pageStep);
+        break;
+    case SliderPageStepSub:
+        setSliderPosition(d->value - d->pageStep);
+        break;
+    case SliderToMinimum:
+        setSliderPosition(d->minimum);
+        break;
+    case SliderToMaximum:
+        setSliderPosition(d->maximum);
+        break;
+    case SliderMove:
+    case SliderNoAction:
+        break;
+    };
+    emit actionTriggered(action);
+    d->blocktracking = false;
+    setValue(d->position);
+}
+
+void QAbstractSlider::setRepeatAction(SliderAction action, int thresholdTime, int repeatTime)
+{
+    Q_D(QAbstractSlider);
+    if ((d->repeatAction = action) == SliderNoAction) {
+        d->repeatActionTimer.stop();
+    } else {
+        d->repeatActionTime = repeatTime;
+        d->repeatActionTimer.start(thresholdTime, this);
+    }
+}
+
+QAbstractSlider::SliderAction QAbstractSlider::repeatAction() const
+{
+    Q_D(const QAbstractSlider);
+    return d->repeatAction;
+}
+
+void QAbstractSlider::timerEvent(QTimerEvent *e)
+{
+    Q_D(QAbstractSlider);
+    if (e->timerId() == d->repeatActionTimer.timerId()) {
+        if (d->repeatActionTime) { // was threshold time, use repeat time next time
+            d->repeatActionTimer.start(d->repeatActionTime, this);
+            d->repeatActionTime = 0;
+        }
+        if (d->repeatAction == SliderPageStepAdd)
+            d->setAdjustedSliderPosition(d->value + d->pageStep);
+        else if (d->repeatAction == SliderPageStepSub)
+            d->setAdjustedSliderPosition(d->value - d->pageStep);
+        else
+            triggerAction(d->repeatAction);
+    }
+}
+
+oid QAbstractSlider::sliderChange(SliderChange)
+{
+    update();
+}
+
+
+#ifndef QT_NO_WHEELEVENT
+void QAbstractSlider::wheelEvent(QWheelEvent * e)
+{
+    Q_D(QAbstractSlider);
+    e->ignore();
+    if (e->orientation() != d->orientation && !rect().contains(e->pos()))
+        return;
+
+    static qreal offset = 0;
+    static QAbstractSlider *offset_owner = 0;
+    if (offset_owner != this){
+        offset_owner = this;
+        offset = 0;
+    }
+
+    int step = qMin(QApplication::wheelScrollLines() * d->singleStep, d->pageStep);
+    if ((e->modifiers() & Qt::ControlModifier) || (e->modifiers() & Qt::ShiftModifier))
+        step = d->pageStep;
+    offset += e->delta() * step / 120;
+    if (d->invertedControls)
+        offset = -offset;
+
+    if (qAbs(offset) < 1)
+        return;
+
+    int prevValue = d->value;
+    d->position = d->value + int(offset); // value will be updated by triggerAction()
+    triggerAction(SliderMove);
+    if (prevValue == d->value) {
+        offset = 0;
+    } else {
+        offset -= int(offset);
+        e->accept();
+    }
+}
+#endif
+void QAbstractSlider::keyPressEvent(QKeyEvent *ev)
+{
+    Q_D(QAbstractSlider);
+    SliderAction action = SliderNoAction;
+    switch (ev->key()) {
+#ifdef QT_KEYPAD_NAVIGATION
+        case Qt::Key_Select:
+            if (QApplication::keypadNavigationEnabled())
+                setEditFocus(!hasEditFocus());
+            else
+                ev->ignore();
+            break;
+        case Qt::Key_Back:
+            if (QApplication::keypadNavigationEnabled() && hasEditFocus()) {
+                setValue(d->origValue);
+                setEditFocus(false);
+            } else
+                ev->ignore();
+            break;
+#endif
+
+        // It seems we need to use invertedAppearance for Left and right, otherwise, things look weird.
+        case Qt::Key_Left:
+#ifdef QT_KEYPAD_NAVIGATION
+            if (QApplication::keypadNavigationEnabled() && !hasEditFocus()) {
+                ev->ignore();
+                return;
+            }
+            if (QApplication::keypadNavigationEnabled() && d->orientation == Qt::Vertical)
+                action = d->invertedControls ? SliderSingleStepSub : SliderSingleStepAdd;
+            else
+#endif
+            action = !d->invertedAppearance ? SliderSingleStepSub : SliderSingleStepAdd;
+            break;
+        case Qt::Key_Right:
+#ifdef QT_KEYPAD_NAVIGATION
+            if (QApplication::keypadNavigationEnabled() && !hasEditFocus()) {
+                ev->ignore();
+                return;
+            }
+            if (QApplication::keypadNavigationEnabled() && d->orientation == Qt::Vertical)
+                action = d->invertedControls ? SliderSingleStepAdd : SliderSingleStepSub;
+            else
+#endif
+            action = !d->invertedAppearance ? SliderSingleStepAdd : SliderSingleStepSub;
+            break;
+        case Qt::Key_Up:
+#ifdef QT_KEYPAD_NAVIGATION
+            if (QApplication::keypadNavigationEnabled()) {
+                ev->ignore();
+                break;
+            }
+#endif
+            action = d->invertedControls ? SliderSingleStepSub : SliderSingleStepAdd;
+            break;
+        case Qt::Key_Down:
+#ifdef QT_KEYPAD_NAVIGATION
+            if (QApplication::keypadNavigationEnabled()) {
+                ev->ignore();
+                break;
+            }
+#endif
+            action = d->invertedControls ? SliderSingleStepAdd : SliderSingleStepSub;
+            break;
+        case Qt::Key_PageUp:
+            action = d->invertedControls ? SliderPageStepSub : SliderPageStepAdd;
+            break;
+        case Qt::Key_PageDown:
+            action = d->invertedControls ? SliderPageStepAdd : SliderPageStepSub;
+            break;
+        case Qt::Key_Home:
+            action = SliderToMinimum;
+            break;
+        case Qt::Key_End:
+            action = SliderToMaximum;
+            break;
+        default:
+            ev->ignore();
+            break;
+    }
+    if (action)
+        triggerAction(action);
+}
+
+void QAbstractSlider::changeEvent(QEvent *ev)
+{
+    Q_D(QAbstractSlider);
+    switch (ev->type()) {
+    case QEvent::EnabledChange:
+        if (!isEnabled()) {
+            d->repeatActionTimer.stop();
+            setSliderDown(false);
+        }
+        // fall through...
+    default:
+        QWidget::changeEvent(ev);
+    }
+}
+
+bool QAbstractSlider::event(QEvent *e)
+{
+#ifdef QT_KEYPAD_NAVIGATION
+    Q_D(QAbstractSlider);
+    switch (e->type()) {
+    case QEvent::FocusIn:
+        d->origValue = d->value;
+        break;
+    default:
+        break;
+    }
+#endif
+    
+    return QWidget::event(e);
+}
+
+
diff --git a/doc/src/snippets/qcalendarwidget/main.cpp b/doc/src/snippets/qcalendarwidget/main.cpp
new file mode 100644
index 0000000000..b1dfaa5618
--- /dev/null
+++ b/doc/src/snippets/qcalendarwidget/main.cpp
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QCalendarWidget>
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    QCalendarWidget calendar;
+    calendar.setSelectedDate(calendar.selectedDate().addDays(3));
+    calendar.setGridVisible(true);
+    calendar.show();
+
+    QCalendarWidget calendarMin;
+    calendarMin.setMinimumDate(calendarMin.selectedDate().addDays(-7));
+    calendarMin.setGridVisible(true);
+    calendarMin.show();
+
+    QCalendarWidget calendarMax;
+    calendarMax.setMaximumDate(calendarMax.selectedDate().addDays(7));
+    calendarMax.setGridVisible(true);
+    calendarMax.show();
+
+    return app.exec();
+}
diff --git a/doc/src/snippets/qcalendarwidget/qcalendarwidget.pro b/doc/src/snippets/qcalendarwidget/qcalendarwidget.pro
new file mode 100644
index 0000000000..88c5e24c54
--- /dev/null
+++ b/doc/src/snippets/qcalendarwidget/qcalendarwidget.pro
@@ -0,0 +1 @@
+SOURCES   = main.cpp
diff --git a/doc/src/snippets/qcolumnview/main.cpp b/doc/src/snippets/qcolumnview/main.cpp
new file mode 100644
index 0000000000..e882b4f7b7
--- /dev/null
+++ b/doc/src/snippets/qcolumnview/main.cpp
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QStandardItemModel model;
+
+    QStandardItem *name = new QStandardItem("Name");
+    QStandardItem *firstName = new QStandardItem("First Name");
+    QStandardItem *lastName = new QStandardItem("Last Name");
+
+    name->appendRow(firstName);
+    name->appendRow(lastName);
+    model.appendRow(name);
+
+    QStandardItem *john = new QStandardItem("John");
+    QStandardItem *smith = new QStandardItem("Smith");
+
+    firstName->appendRow(john);
+    lastName->appendRow(smith);
+
+    QStandardItem *address = new QStandardItem("Address");
+    QStandardItem *street = new QStandardItem("Street");
+    QStandardItem *city = new QStandardItem("City");
+    QStandardItem *state = new QStandardItem("State");
+    QStandardItem *country = new QStandardItem("Country");
+
+    address->appendRow(street);
+    address->appendRow(city);
+    address->appendRow(state);
+    address->appendRow(country);
+    model.appendRow(address);
+
+    QColumnView columnView;
+    columnView.setModel(&model);
+    columnView.show();
+
+    return app.exec();
+}
\ No newline at end of file
diff --git a/doc/src/snippets/qcolumnview/qcolumnview.pro b/doc/src/snippets/qcolumnview/qcolumnview.pro
new file mode 100644
index 0000000000..5254077af2
--- /dev/null
+++ b/doc/src/snippets/qcolumnview/qcolumnview.pro
@@ -0,0 +1 @@
+SOURCES = main.cpp
\ No newline at end of file
diff --git a/doc/src/snippets/qdbusextratypes/qdbusextratypes.cpp b/doc/src/snippets/qdbusextratypes/qdbusextratypes.cpp
new file mode 100644
index 0000000000..7a27ce0a65
--- /dev/null
+++ b/doc/src/snippets/qdbusextratypes/qdbusextratypes.cpp
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore>
+#include <QtDBus>
+
+static QVariant callMyDBusFunction() { return QVariant(); }
+
+int main()
+{
+    QDBusMessage myDBusMessage;
+
+//! [0]
+    QList<QVariant> arguments;
+    arguments << QVariant(42) << QVariant::fromValue(QDBusVariant(43)) << QVariant("hello");
+    myDBusMessage.setArguments(arguments);
+//! [0]
+
+//! [1]
+    // call a D-Bus function that returns a D-Bus variant
+    QVariant v = callMyDBusFunction();
+    // retrieve the D-Bus variant
+    QDBusVariant dbusVariant = qvariant_cast<QDBusVariant>(v);
+    // retrieve the actual value stored in the D-Bus variant
+    QVariant result = dbusVariant.variant();
+//! [1]
+
+    return 0;
+}
diff --git a/doc/src/snippets/qdbusextratypes/qdbusextratypes.pro b/doc/src/snippets/qdbusextratypes/qdbusextratypes.pro
new file mode 100644
index 0000000000..e31e8d941e
--- /dev/null
+++ b/doc/src/snippets/qdbusextratypes/qdbusextratypes.pro
@@ -0,0 +1,2 @@
+SOURCES += qdbusextratypes.cpp
+QT = core dbus
diff --git a/doc/src/snippets/qdebug/qdebug.pro b/doc/src/snippets/qdebug/qdebug.pro
new file mode 100644
index 0000000000..e62a71cac4
--- /dev/null
+++ b/doc/src/snippets/qdebug/qdebug.pro
@@ -0,0 +1 @@
+SOURCES   = qdebugsnippet.cpp
diff --git a/doc/src/snippets/qdebug/qdebugsnippet.cpp b/doc/src/snippets/qdebug/qdebugsnippet.cpp
new file mode 100644
index 0000000000..b713f21760
--- /dev/null
+++ b/doc/src/snippets/qdebug/qdebugsnippet.cpp
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtDebug>
+
+class Coordinate : public QObject
+{
+public:
+    int myX, myY;
+
+    int x() const { return myX; };
+    int y() const { return myY; };
+};
+
+//! [0]
+QDebug operator<<(QDebug dbg, const Coordinate &c)
+{
+    dbg.nospace() << "(" << c.x() << ", " << c.y() << ")";
+    
+    return dbg.space();
+}
+//! [0]
+
+int main(int argv, char **args)
+{
+    Coordinate coordinate;
+    coordinate.myX = 10;
+    coordinate.myY = 44;
+
+//! [1]
+    qDebug() << "Date:" << QDate::currentDate();
+    qDebug() << "Types:" << QString("String") << QChar('x') << QRect(0, 10, 50, 40);
+    qDebug() << "Custom coordinate type:" << coordinate;
+//! [1]
+}
diff --git a/doc/src/snippets/qdir-filepaths/main.cpp b/doc/src/snippets/qdir-filepaths/main.cpp
new file mode 100644
index 0000000000..b8a348cee1
--- /dev/null
+++ b/doc/src/snippets/qdir-filepaths/main.cpp
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QDir>
+#include <iostream>
+
+int main(int argc, char *argv[])
+{
+    QDir directory("Documents/Letters");
+    QString path = directory.filePath("contents.txt");
+    QString absolutePath = directory.absoluteFilePath("contents.txt");
+
+    std::cout << qPrintable(directory.dirName()) << std::endl;
+    std::cout << qPrintable(path) << std::endl;
+    std::cout << qPrintable(absolutePath) << std::endl;
+    return 0;
+}
diff --git a/doc/src/snippets/qdir-filepaths/qdir-filepaths.pro b/doc/src/snippets/qdir-filepaths/qdir-filepaths.pro
new file mode 100644
index 0000000000..bba41b9c12
--- /dev/null
+++ b/doc/src/snippets/qdir-filepaths/qdir-filepaths.pro
@@ -0,0 +1 @@
+SOURCES = main.cpp
diff --git a/doc/src/snippets/qdir-listfiles/main.cpp b/doc/src/snippets/qdir-listfiles/main.cpp
new file mode 100644
index 0000000000..003ca28c0a
--- /dev/null
+++ b/doc/src/snippets/qdir-listfiles/main.cpp
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#include <QDir>
+#include <iostream>
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication app(argc, argv);
+    QDir dir;
+    dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
+    dir.setSorting(QDir::Size | QDir::Reversed);
+
+    QFileInfoList list = dir.entryInfoList();
+    std::cout << "     Bytes Filename" << std::endl;
+    for (int i = 0; i < list.size(); ++i) {
+        QFileInfo fileInfo = list.at(i);
+        std::cout << qPrintable(QString("%1 %2").arg(fileInfo.size(), 10)
+                                                .arg(fileInfo.fileName()));
+        std::cout << std::endl;
+    }
+    return 0;
+}
+//! [0]
diff --git a/doc/src/snippets/qdir-listfiles/qdir-listfiles.pro b/doc/src/snippets/qdir-listfiles/qdir-listfiles.pro
new file mode 100644
index 0000000000..bba41b9c12
--- /dev/null
+++ b/doc/src/snippets/qdir-listfiles/qdir-listfiles.pro
@@ -0,0 +1 @@
+SOURCES = main.cpp
diff --git a/doc/src/snippets/qdir-namefilters/main.cpp b/doc/src/snippets/qdir-namefilters/main.cpp
new file mode 100644
index 0000000000..acaf8a5b0e
--- /dev/null
+++ b/doc/src/snippets/qdir-namefilters/main.cpp
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QDir>
+#include <iostream>
+
+int main(int argc, char *argv[])
+{
+    QDir dir;
+    dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
+    dir.setSorting(QDir::Size | QDir::Reversed);
+
+//! [0]
+    QStringList filters;
+    filters << "*.cpp" << "*.cxx" << "*.cc";
+    dir.setNameFilters(filters);
+//! [0]
+
+    QFileInfoList list = dir.entryInfoList();
+    std::cout << "     Bytes Filename" << std::endl;
+    for (int i = 0; i < list.size(); ++i) {
+        QFileInfo fileInfo = list.at(i);
+        std::cout << qPrintable(QString("%1 %2").arg(fileInfo.size(), 10)
+                                                .arg(fileInfo.fileName()));
+        std::cout << std::endl;
+    }
+    return 0;
+}
diff --git a/doc/src/snippets/qdir-namefilters/qdir-namefilters.pro b/doc/src/snippets/qdir-namefilters/qdir-namefilters.pro
new file mode 100644
index 0000000000..bba41b9c12
--- /dev/null
+++ b/doc/src/snippets/qdir-namefilters/qdir-namefilters.pro
@@ -0,0 +1 @@
+SOURCES = main.cpp
diff --git a/doc/src/snippets/qfontdatabase/main.cpp b/doc/src/snippets/qfontdatabase/main.cpp
new file mode 100644
index 0000000000..4c2cacefd9
--- /dev/null
+++ b/doc/src/snippets/qfontdatabase/main.cpp
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+//! [0]
+    QFontDatabase database;
+    QTreeWidget fontTree;
+    fontTree.setColumnCount(2);
+    fontTree.setHeaderLabels(QStringList() << "Font" << "Smooth Sizes");
+
+    foreach (QString family, database.families()) {
+        QTreeWidgetItem *familyItem = new QTreeWidgetItem(&fontTree);
+        familyItem->setText(0, family);
+
+        foreach (QString style, database.styles(family)) {
+            QTreeWidgetItem *styleItem = new QTreeWidgetItem(familyItem);
+            styleItem->setText(0, style);
+
+            QString sizes;
+            foreach (int points, database.smoothSizes(family, style))
+                sizes += QString::number(points) + " ";
+
+            styleItem->setText(1, sizes.trimmed());
+        }
+//! [0] //! [1]
+    }
+//! [1]
+
+    fontTree.resizeColumnToContents(0);
+    fontTree.show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/qfontdatabase/qfontdatabase.pro b/doc/src/snippets/qfontdatabase/qfontdatabase.pro
new file mode 100644
index 0000000000..ce12e3b40f
--- /dev/null
+++ b/doc/src/snippets/qfontdatabase/qfontdatabase.pro
@@ -0,0 +1 @@
+SOURCES    = main.cpp
diff --git a/doc/src/snippets/qgl-namespace/main.cpp b/doc/src/snippets/qgl-namespace/main.cpp
new file mode 100644
index 0000000000..45392f7a43
--- /dev/null
+++ b/doc/src/snippets/qgl-namespace/main.cpp
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QGL>
+
+int main(int argc, char *argv[])
+{
+    return 0;
+}
diff --git a/doc/src/snippets/qgl-namespace/qgl-namespace.pro b/doc/src/snippets/qgl-namespace/qgl-namespace.pro
new file mode 100644
index 0000000000..9be6edc909
--- /dev/null
+++ b/doc/src/snippets/qgl-namespace/qgl-namespace.pro
@@ -0,0 +1,2 @@
+SOURCES = main.cpp
+QT += opengl
diff --git a/doc/src/snippets/qlabel/main.cpp b/doc/src/snippets/qlabel/main.cpp
new file mode 100644
index 0000000000..9d53af9e25
--- /dev/null
+++ b/doc/src/snippets/qlabel/main.cpp
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+class Updater : public QObject
+{
+    Q_OBJECT
+
+public:
+    Updater(QWidget *widget);
+
+public slots:
+    void adjustSize();
+
+private:
+    QWidget *widget;
+};
+
+Updater::Updater(QWidget *widget)
+    : widget(widget)
+{
+}
+
+void Updater::adjustSize()
+{
+    widget->adjustSize();
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QLabel *label = new QLabel("My label");
+    QLineEdit *editor = new QLineEdit("New text");
+    QWidget window;
+    //Updater updater(&label);
+    QObject::connect(editor, SIGNAL(textChanged(const QString &)),
+                     label, SLOT(setText(const QString &)));
+    //QObject::connect(editor, SIGNAL(textChanged(const QString &)),
+    //                 &updater, SLOT(adjustSize()));
+    //editor.show();
+    //label.show();
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(label);
+    layout->addWidget(editor);
+    window.setLayout(layout);
+    window.show();
+    return app.exec();
+}
+
+#include "main.moc"
diff --git a/doc/src/snippets/qlabel/qlabel.pro b/doc/src/snippets/qlabel/qlabel.pro
new file mode 100644
index 0000000000..bba41b9c12
--- /dev/null
+++ b/doc/src/snippets/qlabel/qlabel.pro
@@ -0,0 +1 @@
+SOURCES = main.cpp
diff --git a/doc/src/snippets/qlineargradient/main.cpp b/doc/src/snippets/qlineargradient/main.cpp
new file mode 100644
index 0000000000..69384c4ac2
--- /dev/null
+++ b/doc/src/snippets/qlineargradient/main.cpp
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "paintwidget.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    PaintWidget window;
+    window.show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/qlineargradient/paintwidget.cpp b/doc/src/snippets/qlineargradient/paintwidget.cpp
new file mode 100644
index 0000000000..79d77c68af
--- /dev/null
+++ b/doc/src/snippets/qlineargradient/paintwidget.cpp
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "paintwidget.h"
+
+PaintWidget::PaintWidget(QWidget *parent)
+    : QWidget(parent)
+{
+}
+
+void PaintWidget::paintEvent(QPaintEvent *event)
+{
+    QLinearGradient gradient1(rect().topLeft(), rect().bottomRight());
+    gradient1.setColorAt(0, QColor("#ffffcc"));
+    gradient1.setColorAt(1, QColor("#ccccff"));
+
+    QRectF ellipseRect(width()*0.25, height()*0.25, width()*0.5, height()*0.5);
+    QLinearGradient gradient2(ellipseRect.topLeft(), ellipseRect.bottomRight());
+    gradient2.setColorAt(0, QColor("#ccccff"));
+    gradient2.setColorAt(1, QColor("#ffffcc"));
+
+    QPainter painter;
+    painter.begin(this);
+    painter.setRenderHint(QPainter::Antialiasing);
+    painter.fillRect(rect(), QBrush(gradient1));
+    painter.setBrush(QBrush(gradient2));
+    painter.drawEllipse(ellipseRect);
+    painter.end();
+}
diff --git a/doc/src/snippets/qlineargradient/paintwidget.h b/doc/src/snippets/qlineargradient/paintwidget.h
new file mode 100644
index 0000000000..642f1c38d0
--- /dev/null
+++ b/doc/src/snippets/qlineargradient/paintwidget.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PAINTWIDGET_H
+#define PAINTWIDGET_H
+
+#include <QWidget>
+
+class QPaintEvent;
+
+class PaintWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    PaintWidget(QWidget *parent = 0);
+
+protected:
+    void paintEvent(QPaintEvent *event);
+};
+
+#endif
diff --git a/doc/src/snippets/qlineargradient/qlineargradient.pro b/doc/src/snippets/qlineargradient/qlineargradient.pro
new file mode 100644
index 0000000000..48c7d9e937
--- /dev/null
+++ b/doc/src/snippets/qlineargradient/qlineargradient.pro
@@ -0,0 +1,3 @@
+HEADERS     = paintwidget.h
+SOURCES     = main.cpp \
+              paintwidget.cpp
diff --git a/doc/src/snippets/qlistview-dnd/main.cpp b/doc/src/snippets/qlistview-dnd/main.cpp
new file mode 100644
index 0000000000..19c7c203d8
--- /dev/null
+++ b/doc/src/snippets/qlistview-dnd/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *window = new MainWindow;
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/qlistview-dnd/mainwindow.cpp b/doc/src/snippets/qlistview-dnd/mainwindow.cpp
new file mode 100644
index 0000000000..99f9069f05
--- /dev/null
+++ b/doc/src/snippets/qlistview-dnd/mainwindow.cpp
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+#include "model.h"
+
+MainWindow::MainWindow()
+{
+    QMenu *fileMenu = new QMenu(tr("&File"));
+
+    QAction *quitAction = fileMenu->addAction(tr("E&xit"));
+    quitAction->setShortcut(tr("Ctrl+Q"));
+
+    menuBar()->addMenu(fileMenu);
+
+//  For convenient quoting:
+//! [0]
+QListView *listView = new QListView(this);
+listView->setSelectionMode(QAbstractItemView::ExtendedSelection);
+listView->setDragEnabled(true);
+listView->setAcceptDrops(true);
+listView->setDropIndicatorShown(true);
+//! [0]
+
+    this->listView = listView;
+
+    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
+
+    setupListItems();
+
+    setCentralWidget(listView);
+    setWindowTitle(tr("List View"));
+}
+
+void MainWindow::setupListItems()
+{
+    QStringList items;
+    items << tr("Oak") << tr("Fir") << tr("Pine") << tr("Birch") << tr("Hazel")
+          << tr("Redwood") << tr("Sycamore") << tr("Chestnut")
+          << tr("Mahogany");
+
+    DragDropListModel *model = new DragDropListModel(items, this);
+    listView->setModel(model);
+}
diff --git a/doc/src/snippets/qlistview-dnd/mainwindow.h b/doc/src/snippets/qlistview-dnd/mainwindow.h
new file mode 100644
index 0000000000..44477f67bb
--- /dev/null
+++ b/doc/src/snippets/qlistview-dnd/mainwindow.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QMainWindow>
+
+class QListView;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+private:
+    void setupListItems();
+
+    QListView *listView;
+};
+
+#endif
diff --git a/doc/src/snippets/qlistview-dnd/model.cpp b/doc/src/snippets/qlistview-dnd/model.cpp
new file mode 100644
index 0000000000..b8182b7a2b
--- /dev/null
+++ b/doc/src/snippets/qlistview-dnd/model.cpp
@@ -0,0 +1,168 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of an example program for Qt.
+** EDITIONS: NOLIMITS
+**
+****************************************************************************/
+
+/*
+  model.cpp
+
+  A simple model that uses a QStringList as its data source.
+*/
+
+#include <QtGui>
+
+#include "model.h"
+
+DragDropListModel::DragDropListModel(const QStringList &strings,
+                                     QObject *parent)
+    : QStringListModel(strings, parent)
+{
+}
+
+//! [0]
+bool DragDropListModel::dropMimeData(const QMimeData *data,
+    Qt::DropAction action, int row, int column, const QModelIndex &parent)
+{
+    if (action == Qt::IgnoreAction)
+        return true;
+
+    if (!data->hasFormat("application/vnd.text.list"))
+        return false;
+
+    if (column > 0)
+//! [0] //! [1]
+        return false;
+//! [1]
+
+//! [2]
+    int beginRow;
+
+    if (row != -1)
+        beginRow = row;
+//! [2] //! [3]
+    else if (parent.isValid())
+        beginRow = parent.row();
+//! [3] //! [4]
+    else
+        beginRow = rowCount(QModelIndex());
+//! [4]
+
+//! [5]
+    QByteArray encodedData = data->data("application/vnd.text.list");
+    QDataStream stream(&encodedData, QIODevice::ReadOnly);
+    QStringList newItems;
+    int rows = 0;
+
+    while (!stream.atEnd()) {
+        QString text;
+        stream >> text;
+        newItems << text;
+        ++rows;
+    }
+//! [5]
+
+//! [6]
+    insertRows(beginRow, rows, QModelIndex());
+    foreach (QString text, newItems) {
+        QModelIndex idx = index(beginRow, 0, QModelIndex());
+        setData(idx, text);
+        beginRow++;
+    }
+
+    return true;
+}
+//! [6]
+
+//! [7]
+Qt::ItemFlags DragDropListModel::flags(const QModelIndex &index) const
+{
+    Qt::ItemFlags defaultFlags = QStringListModel::flags(index);
+
+    if (index.isValid())
+        return Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | defaultFlags;
+    else
+        return Qt::ItemIsDropEnabled | defaultFlags;
+}
+//! [7]
+
+//! [8]
+QMimeData *DragDropListModel::mimeData(const QModelIndexList &indexes) const
+{
+    QMimeData *mimeData = new QMimeData();
+    QByteArray encodedData;
+
+    QDataStream stream(&encodedData, QIODevice::WriteOnly);
+
+    foreach (QModelIndex index, indexes) {
+        if (index.isValid()) {
+            QString text = data(index, Qt::DisplayRole).toString();
+            stream << text;
+        }
+    }
+
+    mimeData->setData("application/vnd.text.list", encodedData);
+    return mimeData;
+}
+//! [8]
+
+//! [9]
+QStringList DragDropListModel::mimeTypes() const
+{
+    QStringList types;
+    types << "application/vnd.text.list";
+    return types;
+}
+//! [9]
+
+//! [10]
+Qt::DropActions DragDropListModel::supportedDropActions() const
+{
+    return Qt::CopyAction | Qt::MoveAction;
+}
+//! [10]
diff --git a/doc/src/snippets/qlistview-dnd/model.h b/doc/src/snippets/qlistview-dnd/model.h
new file mode 100644
index 0000000000..60c84083e9
--- /dev/null
+++ b/doc/src/snippets/qlistview-dnd/model.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of an example program for Qt.
+** EDITIONS: NOLIMITS
+**
+****************************************************************************/
+
+#ifndef MODEL_H
+#define MODEL_H
+
+#include <QObject>
+#include <QStringListModel>
+
+class DragDropListModel : public QStringListModel
+{
+    Q_OBJECT
+
+public:
+    DragDropListModel(const QStringList &strings, QObject *parent = 0);
+
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+
+    bool dropMimeData(const QMimeData *data, Qt::DropAction action,
+                      int row, int column, const QModelIndex &parent);
+    QMimeData *mimeData(const QModelIndexList &indexes) const;
+    QStringList mimeTypes() const;
+    Qt::DropActions supportedDropActions() const;
+};
+
+#endif
diff --git a/doc/src/snippets/qlistview-dnd/qlistview-dnd.pro b/doc/src/snippets/qlistview-dnd/qlistview-dnd.pro
new file mode 100644
index 0000000000..71fa273a69
--- /dev/null
+++ b/doc/src/snippets/qlistview-dnd/qlistview-dnd.pro
@@ -0,0 +1,5 @@
+SOURCES     = main.cpp \
+              mainwindow.cpp \
+              model.cpp
+HEADERS     = mainwindow.h \
+              model.h
diff --git a/doc/src/snippets/qlistview-using/main.cpp b/doc/src/snippets/qlistview-using/main.cpp
new file mode 100644
index 0000000000..19c7c203d8
--- /dev/null
+++ b/doc/src/snippets/qlistview-using/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *window = new MainWindow;
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/qlistview-using/mainwindow.cpp b/doc/src/snippets/qlistview-using/mainwindow.cpp
new file mode 100644
index 0000000000..0573d4379c
--- /dev/null
+++ b/doc/src/snippets/qlistview-using/mainwindow.cpp
@@ -0,0 +1,138 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+#include "model.h"
+
+MainWindow::MainWindow()
+{
+    QMenu *fileMenu = new QMenu(tr("&File"));
+
+    QAction *quitAction = fileMenu->addAction(tr("E&xit"));
+    quitAction->setShortcut(tr("Ctrl+Q"));
+
+    QMenu *itemsMenu = new QMenu(tr("&Items"));
+
+    insertAction = itemsMenu->addAction(tr("&Insert Item"));
+    removeAction = itemsMenu->addAction(tr("&Remove Item"));
+    QAction *ascendingAction = itemsMenu->addAction(tr("Sort in &Ascending Order"));
+    QAction *descendingAction = itemsMenu->addAction(tr("Sort in &Descending Order"));
+
+    menuBar()->addMenu(fileMenu);
+    menuBar()->addMenu(itemsMenu);
+
+    QStringList strings;
+    strings << tr("Oak") << tr("Fir") << tr("Pine") << tr("Birch")
+            << tr("Hazel") << tr("Redwood") << tr("Sycamore") << tr("Chestnut");
+    model = new StringListModel(strings, this);
+/*  For convenient quoting:
+    QListView *listView = new QListView(this);
+*/
+    listView = new QListView(this);
+    listView->setModel(model);
+    listView->setSelectionMode(QAbstractItemView::SingleSelection);
+
+    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
+    connect(ascendingAction, SIGNAL(triggered()), this, SLOT(sortAscending()));
+    connect(descendingAction, SIGNAL(triggered()), this, SLOT(sortDescending()));
+    connect(insertAction, SIGNAL(triggered()), this, SLOT(insertItem()));
+    connect(removeAction, SIGNAL(triggered()), this, SLOT(removeItem()));
+    connect(listView->selectionModel(),
+            SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
+            this, SLOT(updateMenus(const QModelIndex &)));
+
+    updateMenus(listView->selectionModel()->currentIndex());
+
+    setCentralWidget(listView);
+    setWindowTitle(tr("List View"));
+}
+
+void MainWindow::sortAscending()
+{
+    model->sort(0, Qt::AscendingOrder);
+}
+
+void MainWindow::sortDescending()
+{
+    model->sort(0, Qt::DescendingOrder);
+}
+
+void MainWindow::insertItem()
+{
+    QModelIndex currentIndex = listView->currentIndex();
+    if (!currentIndex.isValid())
+        return;
+
+    QString itemText = QInputDialog::getText(this, tr("Insert Item"),
+        tr("Input text for the new item:"));
+
+    if (itemText.isNull())
+        return;
+
+    if (model->insertRow(currentIndex.row(), QModelIndex())) {
+        QModelIndex newIndex = model->index(currentIndex.row(), 0, QModelIndex());
+        model->setData(newIndex, itemText, Qt::EditRole);
+
+        QString toolTipText = tr("Tooltip:") + itemText;
+        QString statusTipText = tr("Status tip:") + itemText;
+        QString whatsThisText = tr("What's This?:") + itemText;
+        model->setData(newIndex, toolTipText, Qt::ToolTipRole);
+        model->setData(newIndex, toolTipText, Qt::StatusTipRole);
+        model->setData(newIndex, whatsThisText, Qt::WhatsThisRole);
+    }
+}
+
+void MainWindow::removeItem()
+{
+    QModelIndex currentIndex = listView->currentIndex();
+    if (!currentIndex.isValid())
+        return;
+
+    model->removeRow(currentIndex.row(), QModelIndex());
+}
+
+void MainWindow::updateMenus(const QModelIndex &current)
+{
+    insertAction->setEnabled(current.isValid());
+    removeAction->setEnabled(current.isValid());
+}
diff --git a/doc/src/snippets/qlistview-using/mainwindow.h b/doc/src/snippets/qlistview-using/mainwindow.h
new file mode 100644
index 0000000000..a0c2f17482
--- /dev/null
+++ b/doc/src/snippets/qlistview-using/mainwindow.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QMainWindow>
+#include <QModelIndex>
+
+class QAction;
+class QListView;
+class StringListModel;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+public slots:
+    void insertItem();
+    void removeItem();
+    void sortAscending();
+    void sortDescending();
+    void updateMenus(const QModelIndex &current);
+
+private:
+    QAction *insertAction;
+    QAction *removeAction;
+    QListView *listView;
+    StringListModel *model;
+};
+
+#endif
diff --git a/doc/src/snippets/qlistview-using/model.cpp b/doc/src/snippets/qlistview-using/model.cpp
new file mode 100644
index 0000000000..e54ed562bb
--- /dev/null
+++ b/doc/src/snippets/qlistview-using/model.cpp
@@ -0,0 +1,175 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of an example program for Qt.
+** EDITIONS: NOLIMITS
+**
+****************************************************************************/
+
+/*
+  model.cpp
+
+  A simple model that uses a QStringList as its data source.
+*/
+
+#include "model.h"
+
+/*!
+    Returns the number of items in the string list as the number of rows
+    in the model.
+*/
+
+int StringListModel::rowCount(const QModelIndex &parent) const
+{
+    return stringList.count();
+}
+
+/*!
+    Returns an appropriate value for the requested data.
+    If the view requests an invalid index, an invalid variant is returned.
+    Any valid index that corresponds to a string in the list causes that
+    string to be returned.
+*/
+
+QVariant StringListModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+
+    if (index.row() >= stringList.size())
+        return QVariant();
+
+    if (role == Qt::DisplayRole)
+        return stringList.at(index.row());
+    else
+        return QVariant();
+}
+
+/*!
+    Returns the appropriate header string depending on the orientation of
+    the header and the section. If anything other than the display role is
+    requested, we return an invalid variant.
+*/
+
+QVariant StringListModel::headerData(int section, Qt::Orientation orientation,
+                                     int role) const
+{
+    if (role != Qt::DisplayRole)
+        return QVariant();
+
+    if (orientation == Qt::Horizontal)
+        return QString("Column %1").arg(section);
+    else
+        return QString("Row %1").arg(section);
+}
+
+/*!
+    Returns an appropriate value for the item's flags. Valid items are
+    enabled, selectable, and editable.
+*/
+
+Qt::ItemFlags StringListModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return Qt::ItemIsEnabled;
+
+    return QAbstractItemModel::flags(index) | Qt::ItemIsEditable;
+}
+
+/*!
+    Changes an item in the string list, but only if the following conditions
+    are met:
+
+    * The index supplied is valid.
+    * The index corresponds to an item to be shown in a view.
+    * The role associated with editing text is specified.
+
+    The dataChanged() signal is emitted if the item is changed.
+*/
+
+bool StringListModel::setData(const QModelIndex &index,
+                              const QVariant &value, int role)
+{
+    if (index.isValid() && role == Qt::EditRole) {
+
+        stringList.replace(index.row(), value.toString());
+        emit dataChanged(index, index);
+        return true;
+    }
+    return false;
+}
+
+/*!
+    Inserts a number of rows into the model at the specified position.
+*/
+
+bool StringListModel::insertRows(int position, int rows, const QModelIndex &parent)
+{
+    beginInsertRows(QModelIndex(), position, position+rows-1);
+
+    for (int row = 0; row < rows; ++row) {
+        stringList.insert(position, "");
+    }
+
+    endInsertRows();
+    return true;
+}
+
+/*!
+    Removes a number of rows from the model at the specified position.
+*/
+
+bool StringListModel::removeRows(int position, int rows, const QModelIndex &parent)
+{
+    beginRemoveRows(QModelIndex(), position, position+rows-1);
+
+    for (int row = 0; row < rows; ++row) {
+        stringList.removeAt(position);
+    }
+
+    endRemoveRows();
+    return true;
+}
diff --git a/doc/src/snippets/qlistview-using/model.h b/doc/src/snippets/qlistview-using/model.h
new file mode 100644
index 0000000000..a0bde47a59
--- /dev/null
+++ b/doc/src/snippets/qlistview-using/model.h
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of an example program for Qt.
+** EDITIONS: NOLIMITS
+**
+****************************************************************************/
+
+#ifndef MODEL_H
+#define MODEL_H
+
+#include <QAbstractListModel>
+#include <QObject>
+#include <QStringList>
+
+class StringListModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    StringListModel(const QStringList &strings, QObject *parent = 0)
+        : QAbstractListModel(parent), stringList(strings) {}
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    QVariant data(const QModelIndex &index, int role) const;
+    QVariant headerData(int section, Qt::Orientation orientation,
+                        int role = Qt::DisplayRole) const;
+
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+    bool setData(const QModelIndex &index, const QVariant &value,
+                 int role = Qt::EditRole);
+
+    bool insertRows(int position, int rows, const QModelIndex &index = QModelIndex());
+    bool removeRows(int position, int rows, const QModelIndex &index = QModelIndex());
+
+private:
+    QStringList stringList;
+};
+
+#endif
diff --git a/doc/src/snippets/qlistview-using/qlistview-using.pro b/doc/src/snippets/qlistview-using/qlistview-using.pro
new file mode 100644
index 0000000000..71fa273a69
--- /dev/null
+++ b/doc/src/snippets/qlistview-using/qlistview-using.pro
@@ -0,0 +1,5 @@
+SOURCES     = main.cpp \
+              mainwindow.cpp \
+              model.cpp
+HEADERS     = mainwindow.h \
+              model.h
diff --git a/doc/src/snippets/qlistwidget-dnd/main.cpp b/doc/src/snippets/qlistwidget-dnd/main.cpp
new file mode 100644
index 0000000000..19c7c203d8
--- /dev/null
+++ b/doc/src/snippets/qlistwidget-dnd/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *window = new MainWindow;
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/qlistwidget-dnd/mainwindow.cpp b/doc/src/snippets/qlistwidget-dnd/mainwindow.cpp
new file mode 100644
index 0000000000..30a42f9b19
--- /dev/null
+++ b/doc/src/snippets/qlistwidget-dnd/mainwindow.cpp
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+MainWindow::MainWindow()
+{
+    QMenu *fileMenu = new QMenu(tr("&File"));
+
+    QAction *quitAction = fileMenu->addAction(tr("E&xit"));
+    quitAction->setShortcut(tr("Ctrl+Q"));
+
+    menuBar()->addMenu(fileMenu);
+
+//  For convenient quoting:
+//! [0]
+QListWidget *listWidget = new QListWidget(this);
+listWidget->setSelectionMode(QAbstractItemView::SingleSelection);
+listWidget->setDragEnabled(true);
+listWidget->viewport()->setAcceptDrops(true);
+listWidget->setDropIndicatorShown(true);
+//! [0] //! [1]
+listWidget->setDragDropMode(QAbstractItemView::InternalMove);
+//! [1]
+
+    this->listWidget = listWidget;
+
+    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
+
+    setupListItems();
+
+    setCentralWidget(listWidget);
+    setWindowTitle(tr("List Widget"));
+}
+
+void MainWindow::setupListItems()
+{
+    QListWidgetItem *item;
+    item = new QListWidgetItem(tr("Oak"), listWidget);
+    item = new QListWidgetItem(tr("Fir"), listWidget);
+    item = new QListWidgetItem(tr("Pine"), listWidget);
+    item = new QListWidgetItem(tr("Birch"), listWidget);
+    item = new QListWidgetItem(tr("Hazel"), listWidget);
+    item = new QListWidgetItem(tr("Redwood"), listWidget);
+    item = new QListWidgetItem(tr("Sycamore"), listWidget);
+    item = new QListWidgetItem(tr("Chestnut"), listWidget);
+    item = new QListWidgetItem(tr("Mahogany"), listWidget);
+}
diff --git a/doc/src/snippets/qlistwidget-dnd/mainwindow.h b/doc/src/snippets/qlistwidget-dnd/mainwindow.h
new file mode 100644
index 0000000000..5f763e2d75
--- /dev/null
+++ b/doc/src/snippets/qlistwidget-dnd/mainwindow.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QMainWindow>
+
+class QListWidget;
+class QListWidgetItem;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+private:
+    void setupListItems();
+
+    QListWidget *listWidget;
+};
+
+#endif
diff --git a/doc/src/snippets/qlistwidget-dnd/qlistwidget-dnd.pro b/doc/src/snippets/qlistwidget-dnd/qlistwidget-dnd.pro
new file mode 100644
index 0000000000..12a900a7c6
--- /dev/null
+++ b/doc/src/snippets/qlistwidget-dnd/qlistwidget-dnd.pro
@@ -0,0 +1,3 @@
+SOURCES     = main.cpp \
+              mainwindow.cpp
+HEADERS     = mainwindow.h
diff --git a/doc/src/snippets/qlistwidget-using/main.cpp b/doc/src/snippets/qlistwidget-using/main.cpp
new file mode 100644
index 0000000000..19c7c203d8
--- /dev/null
+++ b/doc/src/snippets/qlistwidget-using/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *window = new MainWindow;
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/qlistwidget-using/mainwindow.cpp b/doc/src/snippets/qlistwidget-using/mainwindow.cpp
new file mode 100644
index 0000000000..bf5fe0b500
--- /dev/null
+++ b/doc/src/snippets/qlistwidget-using/mainwindow.cpp
@@ -0,0 +1,159 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+MainWindow::MainWindow()
+{
+    QMenu *fileMenu = new QMenu(tr("&File"));
+
+    QAction *quitAction = fileMenu->addAction(tr("E&xit"));
+    quitAction->setShortcut(tr("Ctrl+Q"));
+
+    QMenu *itemsMenu = new QMenu(tr("&Items"));
+
+    insertAction = itemsMenu->addAction(tr("&Insert Item"));
+    removeAction = itemsMenu->addAction(tr("&Remove Item"));
+    QAction *ascendingAction = itemsMenu->addAction(tr("Sort in &Ascending Order"));
+    QAction *descendingAction = itemsMenu->addAction(tr("Sort in &Descending Order"));
+
+    menuBar()->addMenu(fileMenu);
+    menuBar()->addMenu(itemsMenu);
+
+/*  For convenient quoting:
+//! [0]
+    QListWidget *listWidget = new QListWidget(this);
+//! [0]
+*/
+    listWidget = new QListWidget(this);
+    listWidget->setSelectionMode(QAbstractItemView::SingleSelection);
+
+    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
+    connect(ascendingAction, SIGNAL(triggered()), this, SLOT(sortAscending()));
+    connect(descendingAction, SIGNAL(triggered()), this, SLOT(sortDescending()));
+    connect(insertAction, SIGNAL(triggered()), this, SLOT(insertItem()));
+    connect(removeAction, SIGNAL(triggered()), this, SLOT(removeItem()));
+    connect(listWidget,
+            SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)),
+            this, SLOT(updateMenus(QListWidgetItem *)));
+
+    setupListItems();
+    updateMenus(listWidget->currentItem());
+
+    setCentralWidget(listWidget);
+    setWindowTitle(tr("List Widget"));
+}
+
+void MainWindow::setupListItems()
+{
+//! [1]
+    new QListWidgetItem(tr("Oak"), listWidget);
+    new QListWidgetItem(tr("Fir"), listWidget);
+    new QListWidgetItem(tr("Pine"), listWidget);
+//! [1]
+    new QListWidgetItem(tr("Birch"), listWidget);
+//! [2]
+    new QListWidgetItem(tr("Hazel"), listWidget);
+//! [2]
+    new QListWidgetItem(tr("Redwood"), listWidget);
+//! [3]
+    new QListWidgetItem(tr("Sycamore"), listWidget);
+    new QListWidgetItem(tr("Chestnut"), listWidget);
+    new QListWidgetItem(tr("Mahogany"), listWidget);
+//! [3]
+}
+
+void MainWindow::sortAscending()
+{
+//! [4]
+    listWidget->sortItems(Qt::AscendingOrder);
+//! [4]
+}
+
+void MainWindow::sortDescending()
+{
+//! [5]
+    listWidget->sortItems(Qt::DescendingOrder);
+//! [5]
+}
+
+void MainWindow::insertItem()
+{
+    if (!listWidget->currentItem())
+        return;
+
+    QString itemText = QInputDialog::getText(this, tr("Insert Item"),
+        tr("Input text for the new item:"));
+
+    if (itemText.isNull())
+        return;
+
+//! [6]
+    QListWidgetItem *newItem = new QListWidgetItem;
+    newItem->setText(itemText);
+//! [6]
+    int row = listWidget->row(listWidget->currentItem());
+//! [7]
+    listWidget->insertItem(row, newItem);
+//! [7]
+
+    QString toolTipText = tr("Tooltip:") + itemText;
+    QString statusTipText = tr("Status tip:") + itemText;
+    QString whatsThisText = tr("What's This?:") + itemText;
+//! [8]
+    newItem->setToolTip(toolTipText);
+    newItem->setStatusTip(toolTipText);
+    newItem->setWhatsThis(whatsThisText);
+//! [8]
+}
+
+void MainWindow::removeItem()
+{
+    listWidget->takeItem(listWidget->row(listWidget->currentItem()));
+}
+
+void MainWindow::updateMenus(QListWidgetItem *current)
+{
+    insertAction->setEnabled(current != 0);
+    removeAction->setEnabled(current != 0);
+}
diff --git a/doc/src/snippets/qlistwidget-using/mainwindow.h b/doc/src/snippets/qlistwidget-using/mainwindow.h
new file mode 100644
index 0000000000..64c4765de9
--- /dev/null
+++ b/doc/src/snippets/qlistwidget-using/mainwindow.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QMainWindow>
+
+class QAction;
+class QListWidget;
+class QListWidgetItem;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+public slots:
+    void insertItem();
+    void removeItem();
+    void sortAscending();
+    void sortDescending();
+    void updateMenus(QListWidgetItem *current);
+
+private:
+    void setupListItems();
+
+    QAction *insertAction;
+    QAction *removeAction;
+    QListWidget *listWidget;
+};
+
+#endif
diff --git a/doc/src/snippets/qlistwidget-using/qlistwidget-using.pro b/doc/src/snippets/qlistwidget-using/qlistwidget-using.pro
new file mode 100644
index 0000000000..12a900a7c6
--- /dev/null
+++ b/doc/src/snippets/qlistwidget-using/qlistwidget-using.pro
@@ -0,0 +1,3 @@
+SOURCES     = main.cpp \
+              mainwindow.cpp
+HEADERS     = mainwindow.h
diff --git a/doc/src/snippets/qmacnativewidget/main.mm b/doc/src/snippets/qmacnativewidget/main.mm
new file mode 100644
index 0000000000..66c6fbfd60
--- /dev/null
+++ b/doc/src/snippets/qmacnativewidget/main.mm
@@ -0,0 +1,94 @@
+#include <QtGui/QtGui>
+#include <QtGui/qmacnativewidget_mac.h>
+#ifdef QT_MAC_USE_COCOA
+#import <Cocoa/Cocoa.h>
+#else
+#include <Carbon/Carbon.h>
+#endif
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+#ifdef QT_MAC_USE_COCOA
+//![0]
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSWindow *window = [[NSWindow alloc] initWithContentRect:NSMakeRect(200, app.desktop()->height() - 200, 239, 200)
+                        styleMask:NSTitledWindowMask | NSClosableWindowMask
+                                  | NSMiniaturizableWindowMask | NSResizableWindowMask
+                        backing:NSBackingStoreBuffered defer:NO];
+
+    QMacNativeWidget *nativeWidget = new QMacNativeWidget();
+    nativeWidget->move(0, 0);
+    nativeWidget->setPalette(QPalette(Qt::red));
+    nativeWidget->setAutoFillBackground(true);
+    QVBoxLayout *layout = new QVBoxLayout();
+    QPushButton *pushButton = new QPushButton("An Embedded Qt Button!", nativeWidget);
+    pushButton->setAttribute(Qt::WA_LayoutUsesWidgetRect); // Don't use the layout rect calculated from QMacStyle.
+    layout->addWidget(pushButton);
+    nativeWidget->setLayout(layout);
+
+    // Adjust Cocoa layouts
+    NSView *nativeWidgetView = reinterpret_cast<NSView *>(nativeWidget->winId());
+    NSView *contentView = [window contentView];
+    [contentView setAutoresizesSubviews:YES];
+    [nativeWidgetView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+    [nativeWidgetView setAutoresizesSubviews:YES];
+    NSView *pushButtonView = reinterpret_cast<NSView *>(pushButton->winId());
+    [pushButtonView setAutoresizingMask:NSViewWidthSizable];
+
+    // Add the nativeWidget to the window.
+    [contentView addSubview:nativeWidgetView positioned:NSWindowAbove relativeTo:nil];
+    nativeWidget->show();
+    pushButton->show();
+
+    // Show the window.
+    [window makeKeyAndOrderFront:window];
+    [pool release];
+//![0]
+#else
+//![1]
+    Rect contentRect;
+    SetRect(&contentRect, 200, 200, 400, 400);
+    HIWindowRef windowRef;
+    CreateNewWindow(kDocumentWindowClass, kWindowStandardDocumentAttributes | kWindowCompositingAttribute | kWindowStandardHandlerAttribute | kWindowLiveResizeAttribute, &contentRect, &windowRef);
+    HIViewRef contentView = 0;
+    GetRootControl(windowRef, &contentView);
+
+    QMacNativeWidget *nativeWidget = new QMacNativeWidget();
+    nativeWidget->move(0, 0);
+    nativeWidget->setPalette(QPalette(Qt::red));
+    nativeWidget->setAutoFillBackground(true);
+    QVBoxLayout *layout = new QVBoxLayout();
+    QPushButton *pushButton = new QPushButton("An Embedded Qt Button!", nativeWidget);
+    pushButton->setAttribute(Qt::WA_LayoutUsesWidgetRect); // Don't use the layout rect calculated from QMacStyle.
+    layout->addWidget(pushButton);
+    nativeWidget->setLayout(layout);
+    HIViewRef nativeWidgetView = reinterpret_cast<HIViewRef>(nativeWidget->winId());
+    // Add the nativeWidget to the window.
+    HIViewAddSubview(contentView, nativeWidgetView);
+
+    // Adjust Carbon layouts
+    HILayoutInfo layoutInfo;
+    layoutInfo.version = kHILayoutInfoVersionZero;
+    HIViewGetLayoutInfo(nativeWidgetView, &layoutInfo);
+
+    layoutInfo.binding.top.toView = contentView;
+    layoutInfo.binding.top.kind = kHILayoutBindTop;
+    layoutInfo.binding.left.toView = contentView;
+    layoutInfo.binding.left.kind = kHILayoutBindLeft;
+    layoutInfo.binding.right.toView = contentView;
+    layoutInfo.binding.right.kind = kHILayoutBindRight;
+    layoutInfo.binding.bottom.toView = contentView;
+    layoutInfo.binding.bottom.kind = kHILayoutBindBottom;
+
+    HIViewSetLayoutInfo(nativeWidgetView, &layoutInfo);
+    HIViewApplyLayout(nativeWidgetView);
+
+    pushButton->show();
+    nativeWidget->show();
+    // Show the window.
+    ShowWindow(windowRef);
+//![1]
+#endif
+    return app.exec(); // gives us the same behavior in both
+}
diff --git a/doc/src/snippets/qmacnativewidget/qmacnativewidget.pro b/doc/src/snippets/qmacnativewidget/qmacnativewidget.pro
new file mode 100644
index 0000000000..15176e189a
--- /dev/null
+++ b/doc/src/snippets/qmacnativewidget/qmacnativewidget.pro
@@ -0,0 +1,8 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Thu Sep 4 15:50:09 2008
+######################################################################
+
+CONFIG+=x86_64
+
+OBJECTIVE_SOURCES += main.mm
+LIBS += -framework Cocoa -framework Carbon
diff --git a/doc/src/snippets/qmake/comments.pro b/doc/src/snippets/qmake/comments.pro
new file mode 100644
index 0000000000..189d271edd
--- /dev/null
+++ b/doc/src/snippets/qmake/comments.pro
@@ -0,0 +1,10 @@
+#! [0]
+# Comments usually start at the beginning of a line, but they
+# can also follow other content on the same line.
+#! [0]
+
+#! [1]
+# To include a literal hash character, use the $$LITERAL_HASH variable:
+urlPieces = http://doc.trolltech.com/4.0/qtextdocument.html pageCount
+message($$join(urlPieces, $$LITERAL_HASH))
+#! [1]
diff --git a/doc/src/snippets/qmake/configscopes.pro b/doc/src/snippets/qmake/configscopes.pro
new file mode 100644
index 0000000000..6ab7f7c428
--- /dev/null
+++ b/doc/src/snippets/qmake/configscopes.pro
@@ -0,0 +1,23 @@
+SOURCES = main.cpp
+#! [0]
+CONFIG += opengl
+#! [0]
+
+#! [1]
+opengl {
+    TARGET = application-gl
+} else {
+#! [1] #! [2]
+    TARGET = application
+#! [2] #! [3]
+}
+#! [3]
+
+#! [4]
+CONFIG(opengl) {
+    message(Building with OpenGL support.)
+} else {
+#! [4] #! [5]
+    message(OpenGL support is not available.)
+}
+#! [5]
diff --git a/doc/src/snippets/qmake/debug_and_release.pro b/doc/src/snippets/qmake/debug_and_release.pro
new file mode 100644
index 0000000000..92e8dbf76a
--- /dev/null
+++ b/doc/src/snippets/qmake/debug_and_release.pro
@@ -0,0 +1,14 @@
+#! [0]
+CONFIG += debug_and_release
+
+CONFIG(debug, debug|release) {
+    TARGET = debug_binary
+} else {
+#! [0] #! [1]
+    TARGET = release_binary
+}
+#! [1]
+
+#! [2]
+CONFIG += build_all
+#! [2]
diff --git a/doc/src/snippets/qmake/delegate.h b/doc/src/snippets/qmake/delegate.h
new file mode 100644
index 0000000000..d9f14fe767
--- /dev/null
+++ b/doc/src/snippets/qmake/delegate.h
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
diff --git a/doc/src/snippets/qmake/dereferencing.pro b/doc/src/snippets/qmake/dereferencing.pro
new file mode 100644
index 0000000000..ff0c97995c
--- /dev/null
+++ b/doc/src/snippets/qmake/dereferencing.pro
@@ -0,0 +1,5 @@
+#! [0]
+TEMP_SOURCES = $$SOURCES
+#! [0]
+# Do something with the SOURCES variable then restore its old value.
+SOURCES = $$TEMP_SOURCES
diff --git a/doc/src/snippets/qmake/destdir.pro b/doc/src/snippets/qmake/destdir.pro
new file mode 100644
index 0000000000..b2f943904a
--- /dev/null
+++ b/doc/src/snippets/qmake/destdir.pro
@@ -0,0 +1,2 @@
+SOURCES = main.cpp
+DESTDIR = output
diff --git a/doc/src/snippets/qmake/dirname.pro b/doc/src/snippets/qmake/dirname.pro
new file mode 100644
index 0000000000..59e1f20b3f
--- /dev/null
+++ b/doc/src/snippets/qmake/dirname.pro
@@ -0,0 +1,6 @@
+#! [0]
+FILE = /etc/X11R6/XF86Config
+DIRNAME = $$dirname(FILE) #/etc/X11R6
+#! [0]
+message($$FILE)
+message($$DIRNAME)
diff --git a/doc/src/snippets/qmake/environment.pro b/doc/src/snippets/qmake/environment.pro
new file mode 100644
index 0000000000..808bdeba47
--- /dev/null
+++ b/doc/src/snippets/qmake/environment.pro
@@ -0,0 +1,9 @@
+#! [0] #! [1]
+DESTDIR = $$(PWD)
+message(The project will be installed in $$DESTDIR)
+#! [0]
+
+DESTDIR = $(PWD)
+message(The project will be installed in the value of PWD)
+message(when the Makefile is processed.)
+#! [1]
diff --git a/doc/src/snippets/qmake/functions.pro b/doc/src/snippets/qmake/functions.pro
new file mode 100644
index 0000000000..2766120719
--- /dev/null
+++ b/doc/src/snippets/qmake/functions.pro
@@ -0,0 +1,34 @@
+#! [0]
+EXTRAS = handlers tests docs
+for(dir, EXTRAS) {
+    exists($$dir) {
+        SUBDIRS += $$dir
+    }
+}
+#! [0]
+
+SOURCES = paintwidget_mac.cpp paintwidget_unix.cpp paintwidget_win.cpp
+macx {
+    SOURCES = $$find(SOURCES, "_mac")
+}
+
+#! [1]
+HEADERS = model.h
+HEADERS += $$OTHER_HEADERS
+HEADERS = $$unique(HEADERS)
+#! [1]
+
+CONFIG += debug
+#! [2]
+options = $$find(CONFIG, "debug") $$find(CONFIG, "release")
+#! [3]
+count(options, 2) {
+    message(Both release and debug specified.)
+}
+#! [2] #! [3]
+
+#! [4]
+eval(TARGET = myapp) {
+    message($$TARGET)
+}
+#! [4]
diff --git a/doc/src/snippets/qmake/include.pro b/doc/src/snippets/qmake/include.pro
new file mode 100644
index 0000000000..37e7156957
--- /dev/null
+++ b/doc/src/snippets/qmake/include.pro
@@ -0,0 +1,3 @@
+#! [0]
+include(other.pro)
+#! [0]
diff --git a/doc/src/snippets/qmake/main.cpp b/doc/src/snippets/qmake/main.cpp
new file mode 100644
index 0000000000..d9f14fe767
--- /dev/null
+++ b/doc/src/snippets/qmake/main.cpp
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
diff --git a/doc/src/snippets/qmake/model.cpp b/doc/src/snippets/qmake/model.cpp
new file mode 100644
index 0000000000..d9f14fe767
--- /dev/null
+++ b/doc/src/snippets/qmake/model.cpp
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
diff --git a/doc/src/snippets/qmake/model.h b/doc/src/snippets/qmake/model.h
new file mode 100644
index 0000000000..d9f14fe767
--- /dev/null
+++ b/doc/src/snippets/qmake/model.h
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
diff --git a/doc/src/snippets/qmake/other.pro b/doc/src/snippets/qmake/other.pro
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/doc/src/snippets/qmake/other.pro
diff --git a/doc/src/snippets/qmake/paintwidget_mac.cpp b/doc/src/snippets/qmake/paintwidget_mac.cpp
new file mode 100644
index 0000000000..d9f14fe767
--- /dev/null
+++ b/doc/src/snippets/qmake/paintwidget_mac.cpp
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
diff --git a/doc/src/snippets/qmake/paintwidget_unix.cpp b/doc/src/snippets/qmake/paintwidget_unix.cpp
new file mode 100644
index 0000000000..ada3e520d6
--- /dev/null
+++ b/doc/src/snippets/qmake/paintwidget_unix.cpp
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+int main(int argc, char *argv[])
+{
+    return 0;
+}
diff --git a/doc/src/snippets/qmake/paintwidget_win.cpp b/doc/src/snippets/qmake/paintwidget_win.cpp
new file mode 100644
index 0000000000..d9f14fe767
--- /dev/null
+++ b/doc/src/snippets/qmake/paintwidget_win.cpp
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
diff --git a/doc/src/snippets/qmake/project_location.pro b/doc/src/snippets/qmake/project_location.pro
new file mode 100644
index 0000000000..09d9b3d9d0
--- /dev/null
+++ b/doc/src/snippets/qmake/project_location.pro
@@ -0,0 +1,6 @@
+#! [project file]
+message($$_PRO_FILE_)
+#! [project file]
+#! [project file directory]
+message($$_PRO_FILE_PWD_)
+#! [project file directory]
diff --git a/doc/src/snippets/qmake/qtconfiguration.pro b/doc/src/snippets/qmake/qtconfiguration.pro
new file mode 100644
index 0000000000..0c854d93a6
--- /dev/null
+++ b/doc/src/snippets/qmake/qtconfiguration.pro
@@ -0,0 +1,19 @@
+# Show information about the Qt installation.
+#! [0]
+message(Qt version: $$[QT_VERSION])
+message(Qt is installed in $$[QT_INSTALL_PREFIX])
+message(Qt resources can be found in the following locations:)
+message(Documentation: $$[QT_INSTALL_DOCS])
+message(Header files: $$[QT_INSTALL_HEADERS])
+message(Libraries: $$[QT_INSTALL_LIBS])
+message(Binary files (executables): $$[QT_INSTALL_BINS])
+message(Plugins: $$[QT_INSTALL_PLUGINS])
+message(Data files: $$[QT_INSTALL_DATA])
+message(Translation files: $$[QT_INSTALL_TRANSLATIONS])
+message(Settings: $$[QT_INSTALL_SETTINGS])
+message(Examples: $$[QT_INSTALL_EXAMPLES])
+message(Demonstrations: $$[QT_INSTALL_DEMOS])
+#! [0]
+
+# Show configuration information.
+message(CONFIG = $$CONFIG)
diff --git a/doc/src/snippets/qmake/quoting.pro b/doc/src/snippets/qmake/quoting.pro
new file mode 100644
index 0000000000..62efb2042e
--- /dev/null
+++ b/doc/src/snippets/qmake/quoting.pro
@@ -0,0 +1,8 @@
+#! [0]
+DEST = "Program Files"
+#! [0]
+count(DEST, 1) {
+    message(Only one item found in DEST.)
+} else {
+    message(More than one item found in DEST.)
+}
diff --git a/doc/src/snippets/qmake/replace.pro b/doc/src/snippets/qmake/replace.pro
new file mode 100644
index 0000000000..504e01a018
--- /dev/null
+++ b/doc/src/snippets/qmake/replace.pro
@@ -0,0 +1,4 @@
+#! [0]
+MESSAGE = This is a tent.
+message($$replace(MESSAGE, tent, test))
+#! [0]
diff --git a/doc/src/snippets/qmake/replacefunction.pro b/doc/src/snippets/qmake/replacefunction.pro
new file mode 100644
index 0000000000..98013ba42d
--- /dev/null
+++ b/doc/src/snippets/qmake/replacefunction.pro
@@ -0,0 +1,46 @@
+#! [0]
+defineReplace(headersAndSources) {
+    variable = $$1
+    names = $$eval($$variable)
+    headers =
+    sources =
+
+    for(name, names) {
+        header = $${name}.h
+        exists($$header) {
+            headers += $$header
+        }
+        source = $${name}.cpp
+        exists($$source) {
+            sources += $$source
+        }
+    }
+    return($$headers $$sources)
+}
+#! [0]
+
+defineReplace(matchingFiles) {
+    names = $$ARGS
+    files =
+
+    for(name, names) {
+        header = $${name}.h
+        source = $${name}.cpp
+        exists($$header):exists($$source) {
+            files += $$header
+            files += $$source
+        }
+    }
+    return($$files)
+}
+
+names = delegate model view main
+message(Finding all headers and sources from the following list of names:)
+message($$names)
+allFiles = $$headersAndSources(names)
+message(Found: $$allFiles)
+
+message(Finding only matching headers and sources from the following list of names:)
+message($$names)
+matching = $$matchingFiles($$names)
+message(Found: $$matching)
diff --git a/doc/src/snippets/qmake/scopes.pro b/doc/src/snippets/qmake/scopes.pro
new file mode 100644
index 0000000000..4e59afbac2
--- /dev/null
+++ b/doc/src/snippets/qmake/scopes.pro
@@ -0,0 +1,42 @@
+#! [syntax]
+<condition> {
+    <command or definition>
+    ...
+}
+#! [syntax]
+
+#! [0]
+win32 {
+    SOURCES += paintwidget_win.cpp
+}
+#! [0]
+
+#! [1]
+!win32 {
+    SOURCES -= paintwidget_win.cpp
+}
+#! [1]
+
+unix {
+    SOURCES += paintwidget_unix.cpp
+}
+
+#! [2]
+macx {
+    debug {
+        HEADERS += debugging.h
+    }
+}
+#! [2]
+
+#! [3]
+macx:debug {
+    HEADERS += debugging.h
+}
+#! [3]
+
+#! [4]
+win32|macx {
+    HEADERS += debugging.h
+}
+#! [4]
diff --git a/doc/src/snippets/qmake/shared_or_static.pro b/doc/src/snippets/qmake/shared_or_static.pro
new file mode 100644
index 0000000000..31c25ea44b
--- /dev/null
+++ b/doc/src/snippets/qmake/shared_or_static.pro
@@ -0,0 +1,8 @@
+TEMPLIBS = $$[QT_INSTALL_LIBS] libQtGui.prl
+include($$join(TEMPLIBS, "/"))
+
+contains(QMAKE_PRL_CONFIG, shared) {
+    message(Shared Qt)
+} else {
+    message(Static Qt)
+}
diff --git a/doc/src/snippets/qmake/specifications.pro b/doc/src/snippets/qmake/specifications.pro
new file mode 100644
index 0000000000..f9a0d0a1cb
--- /dev/null
+++ b/doc/src/snippets/qmake/specifications.pro
@@ -0,0 +1,7 @@
+#! [0]
+message($$QMAKESPEC)
+
+linux-g++ {
+    message(Linux)
+}
+#! [0]
diff --git a/doc/src/snippets/qmake/testfunction.pro b/doc/src/snippets/qmake/testfunction.pro
new file mode 100644
index 0000000000..785ffed6be
--- /dev/null
+++ b/doc/src/snippets/qmake/testfunction.pro
@@ -0,0 +1,20 @@
+#! [0]
+defineTest(allFiles) {
+    files = $$ARGS
+
+    for(file, files) {
+        !exists($$file) {
+            return(false)
+        }
+    }
+    return(true)
+}
+#! [0]
+
+files = delegate.h model.h view.h
+
+allFiles($$files) {
+    message(All files are present: $$files)
+} else {
+    message(Not all files are present: $$files)
+}
diff --git a/doc/src/snippets/qmake/variables.pro b/doc/src/snippets/qmake/variables.pro
new file mode 100644
index 0000000000..bba5d9f72d
--- /dev/null
+++ b/doc/src/snippets/qmake/variables.pro
@@ -0,0 +1,7 @@
+#! [0]
+HEADERS = mainwindow.h paintwidget.h
+#! [0] #! [1]
+SOURCES = main.cpp mainwindow.cpp \
+          paintwidget.cpp
+CONFIG += qt
+#! [1]
diff --git a/doc/src/snippets/qmake/view.h b/doc/src/snippets/qmake/view.h
new file mode 100644
index 0000000000..d9f14fe767
--- /dev/null
+++ b/doc/src/snippets/qmake/view.h
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
diff --git a/doc/src/snippets/qmetaobject-invokable/main.cpp b/doc/src/snippets/qmetaobject-invokable/main.cpp
new file mode 100644
index 0000000000..dfd7e4d012
--- /dev/null
+++ b/doc/src/snippets/qmetaobject-invokable/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QDebug>
+#include "window.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Window window;
+    qDebug() << window.metaObject()->methodCount();
+    window.show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/qmetaobject-invokable/qmetaobject-invokable.pro b/doc/src/snippets/qmetaobject-invokable/qmetaobject-invokable.pro
new file mode 100644
index 0000000000..4df19215f0
--- /dev/null
+++ b/doc/src/snippets/qmetaobject-invokable/qmetaobject-invokable.pro
@@ -0,0 +1,3 @@
+HEADERS   = window.h
+SOURCES   = main.cpp \
+            window.cpp
diff --git a/doc/src/snippets/qmetaobject-invokable/window.cpp b/doc/src/snippets/qmetaobject-invokable/window.cpp
new file mode 100644
index 0000000000..c676708eb1
--- /dev/null
+++ b/doc/src/snippets/qmetaobject-invokable/window.cpp
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "window.h"
+
+Window::Window()
+{
+}
+
+void Window::normalMethod()
+{
+    // Cannot be called by the meta-object system.
+    show();
+}
+
+void Window::invokableMethod()
+{
+    // Can be called by the meta-object system.
+    show();
+}
diff --git a/doc/src/snippets/qmetaobject-invokable/window.h b/doc/src/snippets/qmetaobject-invokable/window.h
new file mode 100644
index 0000000000..2fd833a1a7
--- /dev/null
+++ b/doc/src/snippets/qmetaobject-invokable/window.h
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QWidget>
+
+//! [Window class with invokable method]
+class Window : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Window();
+    void normalMethod();
+    Q_INVOKABLE void invokableMethod();
+};
+//! [Window class with invokable method]
+
+#endif
diff --git a/doc/src/snippets/qprocess-environment/main.cpp b/doc/src/snippets/qprocess-environment/main.cpp
new file mode 100644
index 0000000000..148518b87a
--- /dev/null
+++ b/doc/src/snippets/qprocess-environment/main.cpp
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore>
+
+void startProcess()
+{
+    {
+//! [0]
+QProcess process;
+QStringList env = QProcess::systemEnvironment();
+env << "TMPDIR=C:\\MyApp\\temp"; // Add an environment variable
+env.replaceInStrings(QRegExp("^PATH=(.*)", Qt::CaseInsensitive), "PATH=\\1;C:\\Bin");
+process.setEnvironment(env);
+process.start("myapp");
+//! [0]
+    }
+
+    {
+//! [1]
+QProcess process;
+QHash<QString, QString> env = QProcess::systemEnvironmentHash();
+env.insert("TMPDIR", "C:\\MyApp\\temp"); // Add an environment variable
+env["PATH"] += ";C:\\Bin";
+process.setEnvironment(env);
+process.start("myapp");
+//! [0]
+    }
+}
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication app(argc, argv);
+    startProcess();
+    return app.exec();
+}
diff --git a/doc/src/snippets/qprocess-environment/qprocess-environment.pro b/doc/src/snippets/qprocess-environment/qprocess-environment.pro
new file mode 100644
index 0000000000..bba41b9c12
--- /dev/null
+++ b/doc/src/snippets/qprocess-environment/qprocess-environment.pro
@@ -0,0 +1 @@
+SOURCES = main.cpp
diff --git a/doc/src/snippets/qprocess/qprocess-simpleexecution.cpp b/doc/src/snippets/qprocess/qprocess-simpleexecution.cpp
new file mode 100644
index 0000000000..4d4eda74f0
--- /dev/null
+++ b/doc/src/snippets/qprocess/qprocess-simpleexecution.cpp
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QtGui>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+//! [0]
+    QObject *parent;
+//! [0]
+    parent = &app;
+
+//! [1]
+    QString program = "./path/to/Qt/examples/widgets/analogclock";
+//! [1]
+    program = "./../../../../examples/widgets/analogclock/analogclock";
+
+//! [2]
+    QStringList arguments;
+    arguments << "-style" << "motif";
+
+    QProcess *myProcess = new QProcess(parent);
+    myProcess->start(program, arguments);
+//! [2]
+
+    return app.exec();
+}
diff --git a/doc/src/snippets/qprocess/qprocess.pro b/doc/src/snippets/qprocess/qprocess.pro
new file mode 100644
index 0000000000..4dbc429035
--- /dev/null
+++ b/doc/src/snippets/qprocess/qprocess.pro
@@ -0,0 +1,11 @@
+######################################################################
+# Automatically generated by qmake (2.00a) Mon Mar 20 17:17:02 2006
+######################################################################
+
+TEMPLATE = app
+TARGET += 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += qprocess-simpleexecution.cpp
diff --git a/doc/src/snippets/qsignalmapper/buttonwidget.cpp b/doc/src/snippets/qsignalmapper/buttonwidget.cpp
new file mode 100644
index 0000000000..ae92b3a9a7
--- /dev/null
+++ b/doc/src/snippets/qsignalmapper/buttonwidget.cpp
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "buttonwidget.h"
+
+//! [0]
+ButtonWidget::ButtonWidget(QStringList texts, QWidget *parent)
+    : QWidget(parent)
+{
+    signalMapper = new QSignalMapper(this);
+
+    QGridLayout *gridLayout = new QGridLayout;
+    for (int i = 0; i < texts.size(); ++i) {
+	QPushButton *button = new QPushButton(texts[i]);
+	connect(button, SIGNAL(clicked()), signalMapper, SLOT(map()));
+//! [0] //! [1]
+	signalMapper->setMapping(button, texts[i]);
+	gridLayout->addWidget(button, i / 3, i % 3);
+    }
+
+    connect(signalMapper, SIGNAL(mapped(const QString &)),
+//! [1] //! [2]
+            this, SIGNAL(clicked(const QString &)));
+
+    setLayout(gridLayout);
+}
+//! [2]
diff --git a/doc/src/snippets/qsignalmapper/buttonwidget.h b/doc/src/snippets/qsignalmapper/buttonwidget.h
new file mode 100644
index 0000000000..652f4142f3
--- /dev/null
+++ b/doc/src/snippets/qsignalmapper/buttonwidget.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BUTTONWIDGET_H
+#define BUTTONWIDGET_H
+
+#include <qwidget.h>
+
+class QSignalMapper;
+class QString;
+class QStringList;
+
+//! [0]
+class ButtonWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    ButtonWidget(QStringList texts, QWidget *parent = 0);
+
+signals:
+    void clicked(const QString &text);
+
+private:
+    QSignalMapper *signalMapper;
+//! [0] //! [1]
+};
+//! [1]
+
+#endif
diff --git a/doc/src/snippets/qsignalmapper/main.cpp b/doc/src/snippets/qsignalmapper/main.cpp
new file mode 100644
index 0000000000..39fdbd2034
--- /dev/null
+++ b/doc/src/snippets/qsignalmapper/main.cpp
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "buttonwidget.h"
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QStringList texts;
+    texts << "January" << "February" << "March" << "April"
+          << "May" << "June" << "July" << "August"
+          << "September" << "October" << "November"
+          << "December";
+    MainWindow *mw = new MainWindow;
+    ButtonWidget *buttons = new ButtonWidget(texts, mw);
+    mw->setCentralWidget(buttons);
+    mw->show();
+    QObject::connect(buttons, SIGNAL(clicked(const QString &)),
+                     mw, SLOT(buttonPressed(const QString &)));
+    return app.exec();
+}
diff --git a/doc/src/snippets/qsignalmapper/mainwindow.h b/doc/src/snippets/qsignalmapper/mainwindow.h
new file mode 100644
index 0000000000..b8f5376414
--- /dev/null
+++ b/doc/src/snippets/qsignalmapper/mainwindow.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QMainWindow>
+#include <QStatusBar>
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow()
+    {
+        statusBar()->showMessage(tr("Ready"));
+    }
+
+public slots:
+    void buttonPressed(const QString &text)
+    {
+        statusBar()->showMessage(tr("Chose %1").arg(text));
+    }
+};
diff --git a/doc/src/snippets/qsignalmapper/qsignalmapper.pro b/doc/src/snippets/qsignalmapper/qsignalmapper.pro
new file mode 100644
index 0000000000..7c314025b9
--- /dev/null
+++ b/doc/src/snippets/qsignalmapper/qsignalmapper.pro
@@ -0,0 +1,10 @@
+######################################################################
+# Automatically generated by qmake (1.08a) Wed Mar 10 15:35:05 2004
+######################################################################
+
+TEMPLATE = app
+INCLUDEPATH += .
+
+# Input
+HEADERS += buttonwidget.h mainwindow.h
+SOURCES += buttonwidget.cpp main.cpp
diff --git a/doc/src/snippets/qsortfilterproxymodel-details/main.cpp b/doc/src/snippets/qsortfilterproxymodel-details/main.cpp
new file mode 100644
index 0000000000..6952499af5
--- /dev/null
+++ b/doc/src/snippets/qsortfilterproxymodel-details/main.cpp
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QApplication>
+#include <QSortFilterProxyModel>
+
+class MyItemModel : public QStandardItemModel
+{
+public:
+    MyItemModel(QWidget *parent = 0);
+};
+
+MyItemModel::MyItemModel(QWidget *parent)
+    : QStandardItemModel(parent)
+{};
+
+class Widget : public QWidget
+{
+public:
+    Widget(QWidget *parent = 0);
+};
+
+Widget::Widget(QWidget *parent)
+    : QWidget(parent)
+{
+//! [0] //! [1]
+        QTreeView *treeView = new QTreeView;
+//! [0]
+        MyItemModel *model = new MyItemModel(this);
+
+        treeView->setModel(model);
+//! [1]
+
+//! [2]
+        MyItemModel *sourceModel = new MyItemModel(this);
+        QSortFilterProxyModel *proxyModel = new QSortFilterProxyModel(this);
+
+        proxyModel->setSourceModel(sourceModel);
+        treeView->setModel(proxyModel);
+//! [2]
+
+//! [3]
+        treeView->setSortingEnabled(true);
+//! [3]
+
+//! [4]
+        proxyModel->sort(2, Qt::AscendingOrder);
+//! [4] //! [5]
+        proxyModel->setFilterRegExp(QRegExp(".png", Qt::CaseInsensitive,
+                                            QRegExp::FixedString));
+        proxyModel->setFilterKeyColumn(1);
+//! [5]
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Widget widget;
+    widget.show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/qsortfilterproxymodel-details/qsortfilterproxymodel-details.pro b/doc/src/snippets/qsortfilterproxymodel-details/qsortfilterproxymodel-details.pro
new file mode 100644
index 0000000000..bba41b9c12
--- /dev/null
+++ b/doc/src/snippets/qsortfilterproxymodel-details/qsortfilterproxymodel-details.pro
@@ -0,0 +1 @@
+SOURCES = main.cpp
diff --git a/doc/src/snippets/qsortfilterproxymodel/main.cpp b/doc/src/snippets/qsortfilterproxymodel/main.cpp
new file mode 100644
index 0000000000..a587bcb3a7
--- /dev/null
+++ b/doc/src/snippets/qsortfilterproxymodel/main.cpp
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QObject *parent = &app;
+
+    QStringList numbers;
+    numbers << "One" << "Two" << "Three" << "Four" << "Five";
+
+    QAbstractItemModel *stringListModel = new QStringListModel(numbers, parent);
+
+//! [0]
+    QSortFilterProxyModel *filterModel = new QSortFilterProxyModel(parent);
+    filterModel->setSourceModel(stringListModel);
+//! [0]
+
+    QWidget *window = new QWidget;
+
+//! [1]
+    QListView *filteredView = new QListView;
+    filteredView->setModel(filterModel);
+//! [1]
+    filteredView->setWindowTitle("Filtered view onto a string list model");
+
+    QLineEdit *patternEditor = new QLineEdit;
+    QObject::
+    connect(patternEditor, SIGNAL(textChanged(const QString &)),
+            filterModel, SLOT(setFilterRegExp(const QString &)));
+
+    QVBoxLayout *layout = new QVBoxLayout(window);
+    layout->addWidget(filteredView);
+    layout->addWidget(patternEditor);
+
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/qsortfilterproxymodel/qsortfilterproxymodel.pro b/doc/src/snippets/qsortfilterproxymodel/qsortfilterproxymodel.pro
new file mode 100644
index 0000000000..16181f21cf
--- /dev/null
+++ b/doc/src/snippets/qsortfilterproxymodel/qsortfilterproxymodel.pro
@@ -0,0 +1 @@
+SOURCES     = main.cpp
diff --git a/doc/src/snippets/qsplashscreen/main.cpp b/doc/src/snippets/qsplashscreen/main.cpp
new file mode 100644
index 0000000000..6a66349086
--- /dev/null
+++ b/doc/src/snippets/qsplashscreen/main.cpp
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <stdlib.h>
+
+#include "mainwindow.h"
+
+//! [0]
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QPixmap pixmap(":/splash.png");
+    QSplashScreen splash(pixmap);
+    splash.show();
+    app.processEvents();
+//! [0]
+
+    sleep(5);
+//! [1]
+    QMainWindow window;
+    window.show();
+    splash.finish(&window);
+    return app.exec();
+}
+//! [1]
diff --git a/doc/src/snippets/qsplashscreen/mainwindow.cpp b/doc/src/snippets/qsplashscreen/mainwindow.cpp
new file mode 100644
index 0000000000..a26ab6234b
--- /dev/null
+++ b/doc/src/snippets/qsplashscreen/mainwindow.cpp
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+MainWindow::MainWindow()
+{
+    QLabel *label = new QLabel(tr("This is the main window."));
+    label->setAlignment(Qt::AlignCenter);
+    setCentralWidget(label);
+}
diff --git a/doc/src/snippets/qsplashscreen/mainwindow.h b/doc/src/snippets/qsplashscreen/mainwindow.h
new file mode 100644
index 0000000000..e77322ec3d
--- /dev/null
+++ b/doc/src/snippets/qsplashscreen/mainwindow.h
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+};
+
+#endif
diff --git a/doc/src/snippets/qsplashscreen/qsplashscreen.pro b/doc/src/snippets/qsplashscreen/qsplashscreen.pro
new file mode 100644
index 0000000000..c798079872
--- /dev/null
+++ b/doc/src/snippets/qsplashscreen/qsplashscreen.pro
@@ -0,0 +1,4 @@
+HEADERS = mainwindow.h
+RESOURCES = qsplashscreen.qrc
+SOURCES = main.cpp \
+          mainwindow.cpp
diff --git a/doc/src/snippets/qsplashscreen/qsplashscreen.qrc b/doc/src/snippets/qsplashscreen/qsplashscreen.qrc
new file mode 100644
index 0000000000..330ec78682
--- /dev/null
+++ b/doc/src/snippets/qsplashscreen/qsplashscreen.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+   <file>splash.png</file>
+</qresource>
+</RCC>
diff --git a/doc/src/snippets/qsplashscreen/splash.png b/doc/src/snippets/qsplashscreen/splash.png
new file mode 100644
index 0000000000..d82f6d2184
--- /dev/null
+++ b/doc/src/snippets/qsplashscreen/splash.png
diff --git a/doc/src/snippets/qsql-namespace/main.cpp b/doc/src/snippets/qsql-namespace/main.cpp
new file mode 100644
index 0000000000..9ed2b4dc69
--- /dev/null
+++ b/doc/src/snippets/qsql-namespace/main.cpp
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QSql>
+
+int main(int argc, char *argv[])
+{
+    return 0;
+}
diff --git a/doc/src/snippets/qsql-namespace/qsql-namespace.pro b/doc/src/snippets/qsql-namespace/qsql-namespace.pro
new file mode 100644
index 0000000000..e8183d3cee
--- /dev/null
+++ b/doc/src/snippets/qsql-namespace/qsql-namespace.pro
@@ -0,0 +1,2 @@
+SOURCES = main.cpp
+QT += sql
diff --git a/doc/src/snippets/qstack/main.cpp b/doc/src/snippets/qstack/main.cpp
new file mode 100644
index 0000000000..6fa0a41023
--- /dev/null
+++ b/doc/src/snippets/qstack/main.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <iostream>
+using namespace std;
+
+int main(int argc, char *argv[])
+{
+//! [0]
+    QStack<int> stack;
+    stack.push(1);
+    stack.push(2);
+    stack.push(3);
+    while (!stack.isEmpty())
+        cout << stack.pop() << endl;
+//! [0]
+}
diff --git a/doc/src/snippets/qstack/qstack.pro b/doc/src/snippets/qstack/qstack.pro
new file mode 100644
index 0000000000..721ae4b2e8
--- /dev/null
+++ b/doc/src/snippets/qstack/qstack.pro
@@ -0,0 +1,11 @@
+######################################################################
+# Automatically generated by qmake (2.00a) Wed Apr 5 15:41:54 2006
+######################################################################
+
+TEMPLATE = app
+TARGET += 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += main.cpp
diff --git a/doc/src/snippets/qstackedlayout/main.cpp b/doc/src/snippets/qstackedlayout/main.cpp
new file mode 100644
index 0000000000..94ff644e1f
--- /dev/null
+++ b/doc/src/snippets/qstackedlayout/main.cpp
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QApplication>
+
+class Widget : public QWidget
+{
+public:
+    Widget(QWidget *parent = 0);
+};
+
+Widget::Widget(QWidget *parent)
+    : QWidget(parent)
+{
+//! [0]
+    QWidget *firstPageWidget = new QWidget;
+    QWidget *secondPageWidget = new QWidget;
+    QWidget *thirdPageWidget = new QWidget;
+
+    QStackedLayout *stackedLayout = new QStackedLayout;
+    stackedLayout->addWidget(firstPageWidget);
+    stackedLayout->addWidget(secondPageWidget);
+    stackedLayout->addWidget(thirdPageWidget);
+
+//! [0] //! [1]
+    QComboBox *pageComboBox = new QComboBox;
+    pageComboBox->addItem(tr("Page 1"));
+    pageComboBox->addItem(tr("Page 2"));
+    pageComboBox->addItem(tr("Page 3"));
+    connect(pageComboBox, SIGNAL(activated(int)),
+            stackedLayout, SLOT(setCurrentIndex(int)));
+//! [1]
+
+//! [2]
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+//! [2]
+    mainLayout->addWidget(pageComboBox);
+//! [3]
+    mainLayout->addLayout(stackedLayout);
+    setLayout(mainLayout);
+//! [3]
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Widget widget;
+    widget.show();
+    return app.exec();
+}
+
diff --git a/doc/src/snippets/qstackedlayout/qstackedlayout.pro b/doc/src/snippets/qstackedlayout/qstackedlayout.pro
new file mode 100644
index 0000000000..89c757cfd6
--- /dev/null
+++ b/doc/src/snippets/qstackedlayout/qstackedlayout.pro
@@ -0,0 +1,11 @@
+######################################################################
+# Automatically generated by qmake (2.00a) Thu Apr 6 10:47:18 2006
+######################################################################
+
+TEMPLATE = app
+TARGET += 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += main.cpp
diff --git a/doc/src/snippets/qstackedwidget/main.cpp b/doc/src/snippets/qstackedwidget/main.cpp
new file mode 100644
index 0000000000..301c06d6bf
--- /dev/null
+++ b/doc/src/snippets/qstackedwidget/main.cpp
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QApplication>
+
+class Widget : public QWidget
+{
+public:
+    Widget(QWidget *parent = 0);
+};
+
+Widget::Widget(QWidget *parent)
+    : QWidget(parent)
+{
+//! [0]
+    QWidget *firstPageWidget = new QWidget;
+    QWidget *secondPageWidget = new QWidget;
+    QWidget *thirdPageWidget = new QWidget;
+
+    QStackedWidget *stackedWidget = new QStackedWidget;
+    stackedWidget->addWidget(firstPageWidget);
+    stackedWidget->addWidget(secondPageWidget);
+    stackedWidget->addWidget(thirdPageWidget);
+
+//! [0] //! [1]
+    QComboBox *pageComboBox = new QComboBox;
+    pageComboBox->addItem(tr("Page 1"));
+    pageComboBox->addItem(tr("Page 2"));
+    pageComboBox->addItem(tr("Page 3"));
+    connect(pageComboBox, SIGNAL(activated(int)),
+            stackedWidget, SLOT(setCurrentIndex(int)));
+
+//! [1] //! [2]
+    QVBoxLayout *layout = new QVBoxLayout;
+//! [2]
+    layout->addWidget(pageComboBox);
+//! [3]
+    layout->addWidget(stackedWidget);
+    setLayout(layout);
+//! [3]
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Widget widget;
+    widget.show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/qstackedwidget/qstackedwidget.pro b/doc/src/snippets/qstackedwidget/qstackedwidget.pro
new file mode 100644
index 0000000000..227dd36e85
--- /dev/null
+++ b/doc/src/snippets/qstackedwidget/qstackedwidget.pro
@@ -0,0 +1,11 @@
+######################################################################
+# Automatically generated by qmake (2.00a) Thu Apr 6 10:33:16 2006
+######################################################################
+
+TEMPLATE = app
+TARGET += 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += main.cpp
diff --git a/doc/src/snippets/qstandarditemmodel/main.cpp b/doc/src/snippets/qstandarditemmodel/main.cpp
new file mode 100644
index 0000000000..1d9696e052
--- /dev/null
+++ b/doc/src/snippets/qstandarditemmodel/main.cpp
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QApplication>
+
+class Widget : public QWidget
+{
+public:
+    Widget(QWidget *parentWidget = 0);
+};
+
+Widget::Widget(QWidget *parentWidget)
+    : QWidget(parentWidget)
+{
+    QStandardItemModel *model = new QStandardItemModel();
+    QModelIndex parent;
+    for (int i = 0; i < 4; ++i) {
+        parent = model->index(0, 0, parent);
+        model->insertRows(0, 1, parent);
+        model->insertColumns(0, 1, parent);
+        QModelIndex index = model->index(0, 0, parent);
+        model->setData(index, i);
+    }
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Widget widget;
+    widget.show();
+    return app.exec();
+}
+
diff --git a/doc/src/snippets/qstandarditemmodel/qstandarditemmodel.pro b/doc/src/snippets/qstandarditemmodel/qstandarditemmodel.pro
new file mode 100644
index 0000000000..421ee59030
--- /dev/null
+++ b/doc/src/snippets/qstandarditemmodel/qstandarditemmodel.pro
@@ -0,0 +1,11 @@
+######################################################################
+# Automatically generated by qmake (2.00a) Mon Apr 10 11:16:20 2006
+######################################################################
+
+TEMPLATE = app
+TARGET += 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += main.cpp
diff --git a/doc/src/snippets/qstatustipevent/main.cpp b/doc/src/snippets/qstatustipevent/main.cpp
new file mode 100644
index 0000000000..e1d971b354
--- /dev/null
+++ b/doc/src/snippets/qstatustipevent/main.cpp
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QApplication>
+
+class MainWindow : public QMainWindow
+{
+public:
+    MainWindow(QWidget *parent = 0);
+};
+
+//! [0] //! [1]
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent)
+{
+//! [0]
+    QWidget *myWidget = new QWidget;
+    myWidget->setStatusTip(tr("This is my widget."));
+
+    setCentralWidget(myWidget);
+//! [1]
+
+//! [2]
+    QMenu *fileMenu = menuBar()->addMenu(tr("File"));
+
+    QAction *newAct = new QAction(tr("&New"), this);
+    newAct->setStatusTip(tr("Create a new file."));
+    fileMenu->addAction(newAct);
+//! [2]
+
+    statusBar()->showMessage(tr("Ready"));
+    setWindowTitle(tr("QStatusTipEvent"));
+//! [3]
+}
+//! [3]
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow window;
+    window.show();
+    return app.exec();
+}
+
diff --git a/doc/src/snippets/qstatustipevent/qstatustipevent.pro b/doc/src/snippets/qstatustipevent/qstatustipevent.pro
new file mode 100644
index 0000000000..f4fe6ba336
--- /dev/null
+++ b/doc/src/snippets/qstatustipevent/qstatustipevent.pro
@@ -0,0 +1,11 @@
+######################################################################
+# Automatically generated by qmake (2.00a) Tue Apr 11 12:09:28 2006
+######################################################################
+
+TEMPLATE = app
+TARGET += 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += main.cpp
diff --git a/doc/src/snippets/qstring/main.cpp b/doc/src/snippets/qstring/main.cpp
new file mode 100644
index 0000000000..150044bacd
--- /dev/null
+++ b/doc/src/snippets/qstring/main.cpp
@@ -0,0 +1,942 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QApplication>
+#include <stdio.h>
+
+class Widget : public QWidget
+{
+public:
+    Widget(QWidget *parent = 0);
+
+    void constCharPointer();
+    void constCharArray();
+    void characterReference();
+    void atFunction();
+    void stringLiteral();
+    void modify();
+    void index();
+    QString boolToString(bool b);
+    void nullVsEmpty();
+
+    void appendFunction();
+    void argFunction();
+    void chopFunction();
+    void compareFunction();
+    void compareSensitiveFunction();
+    void containsFunction();
+    void countFunction();
+    void dataFunction();
+    void endsWithFunction();
+    void fillFunction();
+    void fromRawDataFunction();
+
+    void indexOfFunction();
+    void firstIndexOfFunction();
+    void insertFunction();
+    void isNullFunction();
+    void isEmptyFunction();
+    void lastIndexOfFunction();
+    void leftFunction();
+    void leftJustifiedFunction();
+    void leftRefFunction();
+    void midFunction();
+    void midRefFunction();
+    void numberFunction();
+
+    void prependFunction();
+    void removeFunction();
+    void replaceFunction();
+    void reserveFunction();
+    void resizeFunction();
+    void rightFunction();
+    void rightJustifiedFunction();
+    void rightRefFunction();
+    void sectionFunction();
+    void setNumFunction();
+    void simplifiedFunction();
+
+    void sizeFunction();
+    void splitFunction();
+    void splitCaseSensitiveFunction();
+    void sprintfFunction();
+    void startsWithFunction();
+    void toDoubleFunction();
+    void toFloatFunction();
+    void toIntFunction();
+    void toLongFunction();
+    void toLongLongFunction();
+
+    void toLowerFunction();
+    void toShortFunction();
+    void toUIntFunction();
+    void toULongFunction();
+    void toULongLongFunction();
+    void toUShortFunction();
+    void toUpperFunction();
+    void trimmedFunction();
+    void truncateFunction();
+
+    void plusEqualOperator();
+    void arrayOperator();
+};
+
+Widget::Widget(QWidget *parent)
+    : QWidget(parent)
+{
+}
+
+void Widget::constCharPointer()
+{
+//! [0]
+    QString str = "Hello";
+//! [0]
+}
+
+void Widget::constCharArray()
+{
+//! [1]
+    static const QChar data[4] = { 0x0055, 0x006e, 0x10e3, 0x03a3 };
+    QString str(data, 4);
+//! [1]
+}
+
+void Widget::characterReference()
+{
+//! [2]
+    QString str;
+    str.resize(4);
+
+    str[0] = QChar('U');
+    str[1] = QChar('n');
+    str[2] = QChar(0x10e3);
+    str[3] = QChar(0x03a3);
+//! [2]
+}
+
+void Widget::atFunction()
+{
+//! [3]
+    QString str;
+
+    for (int i = 0; i < str.size(); ++i) {
+        if (str.at(i) >= QChar('a') && str.at(i) <= QChar('f'))
+            qDebug() << "Found character in range [a-f]";
+    }
+//! [3]
+}
+
+void Widget::stringLiteral()
+{
+//! [4]
+    QString str;
+
+    if (str == "auto" || str == "extern"
+            || str == "static" || str == "register") {
+        // ...
+    }
+//! [4]
+}
+
+void Widget::modify()
+{
+//! [5]
+    QString str = "and";
+    str.prepend("rock ");     // str == "rock and"
+    str.append(" roll");        // str == "rock and roll"
+    str.replace(5, 3, "&");   // str == "rock & roll"
+//! [5]
+}
+
+void Widget::index()
+{
+//! [6]
+    QString str = "We must be <b>bold</b>, very <b>bold</b>";
+    int j = 0;
+
+    while ((j = str.indexOf("<b>", j)) != -1) {
+        qDebug() << "Found <b> tag at index position" << j;
+        ++j;
+    }
+//! [6]
+}
+
+//! [7]
+    QString Widget::boolToString(bool b)
+    {
+        QString result;
+        if (b)
+            result = "True";
+        else
+            result = "False";
+        return result;
+    }
+//! [7]
+
+
+void Widget::nullVsEmpty()
+{
+//! [8]
+    QString().isNull();               // returns true
+    QString().isEmpty();              // returns true
+
+    QString("").isNull();             // returns false
+    QString("").isEmpty();            // returns true
+
+    QString("abc").isNull();          // returns false
+    QString("abc").isEmpty();         // returns false
+//! [8]
+}
+
+void Widget::appendFunction()
+{
+//! [9]
+    QString x = "free";
+    QString y = "dom";
+
+    x.append(y);
+    // x == "freedom"
+//! [9]
+
+//! [10]
+    x.insert(x.size(), y);
+//! [10]
+}
+
+void Widget::argFunction()
+{
+//! [11]
+    QString i;           // current file's number
+    QString total;       // number of files to process
+    QString fileName;    // current file's name
+
+    QString status = QString("Processing file %1 of %2: %3")
+                    .arg(i).arg(total).arg(fileName);
+//! [11]
+
+//! [12] //! [13]
+    QString str;
+//! [12]
+    str = "%1 %2";
+
+    str.arg("%1f", "Hello");        // returns "%1f Hello"
+    str.arg("%1f").arg("Hello");    // returns "Hellof %2"
+//! [13]
+
+//! [14]
+    str = QString("Decimal 63 is %1 in hexadecimal")
+            .arg(63, 0, 16);
+    // str == "Decimal 63 is 3f in hexadecimal"
+
+    QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
+    str = QString("%1 %L2 %L3")
+            .arg(12345)
+            .arg(12345)
+            .arg(12345, 0, 16);
+    // str == "12345 12,345 3039"
+//! [14]
+}
+
+void Widget::chopFunction()
+{
+//! [15]
+    QString str("LOGOUT\r\n");
+    str.chop(2);
+    // str == "LOGOUT"
+//! [15]
+}
+
+void Widget::compareFunction()
+{
+    int x = QString::compare("auto", "auto");   // x == 0
+    int y = QString::compare("auto", "car");    // y < 0
+    int z = QString::compare("car", "auto");    // z > 0
+}
+
+void Widget::compareSensitiveFunction()
+{
+//! [16]
+    int x = QString::compare("aUtO", "AuTo", Qt::CaseInsensitive);  // x == 0
+    int y = QString::compare("auto", "Car", Qt::CaseSensitive);     // y > 0
+    int z = QString::compare("auto", "Car", Qt::CaseInsensitive);   // z < 0
+//! [16]
+}
+
+void Widget::containsFunction()
+{
+//! [17]
+    QString str = "Peter Pan";
+    str.contains("peter", Qt::CaseInsensitive);    // returns true
+//! [17]
+}
+
+void Widget::countFunction()
+{
+//! [18]
+    QString str = "banana and panama";
+    str.count(QRegExp("a[nm]a"));    // returns 4
+//! [18]
+}
+
+void Widget::dataFunction()
+{
+//! [19]
+    QString str = "Hello world";
+    QChar *data = str.data();
+    while (!data->isNull()) {
+        qDebug() << data->unicode();
+        ++data;
+    }
+//! [19]
+}
+
+void Widget::endsWithFunction()
+{
+//! [20]
+    QString str = "Bananas";
+    str.endsWith("anas");         // returns true
+    str.endsWith("pple");         // returns false
+//! [20]
+}
+
+void Widget::fillFunction()
+{
+//! [21]
+    QString str = "Berlin";
+    str.fill('z');
+    // str == "zzzzzz"
+
+    str.fill('A', 2);
+    // str == "AA"
+//! [21]
+}
+
+void Widget::fromRawDataFunction()
+{
+//! [22]
+     QRegExp pattern;
+     static const QChar unicode[] = {
+             0x005A, 0x007F, 0x00A4, 0x0060,
+             0x1009, 0x0020, 0x0020};
+     int size = sizeof(unicode) / sizeof(QChar);
+
+     QString str = QString::fromRawData(unicode, size);
+     if (str.contains(QRegExp(pattern))) {
+         // ...
+//! [22] //! [23]
+     }
+//! [23]
+}
+
+void Widget::indexOfFunction()
+{
+//! [24]
+    QString x = "sticky question";
+    QString y = "sti";
+    x.indexOf(y);               // returns 0
+    x.indexOf(y, 1);            // returns 10
+    x.indexOf(y, 10);           // returns 10
+    x.indexOf(y, 11);           // returns -1
+//! [24]
+}
+
+void Widget::firstIndexOfFunction()
+{
+//! [25]
+    QString str = "the minimum";
+    str.indexOf(QRegExp("m[aeiou]"), 0);       // returns 4
+//! [25]
+}
+
+void Widget::insertFunction()
+{
+//! [26]
+    QString str = "Meal";
+    str.insert(1, QString("ontr"));
+    // str == "Montreal"
+//! [26]
+}
+
+void Widget::isEmptyFunction()
+{
+//! [27]
+    QString().isEmpty();            // returns true
+    QString("").isEmpty();          // returns true
+    QString("x").isEmpty();         // returns false
+    QString("abc").isEmpty();       // returns false
+//! [27]
+}
+
+void Widget::isNullFunction()
+{
+//! [28]
+    QString().isNull();             // returns true
+    QString("").isNull();           // returns false
+    QString("abc").isNull();        // returns false
+//! [28]
+}
+
+void Widget::lastIndexOfFunction()
+{
+//! [29]
+    QString x = "crazy azimuths";
+    QString y = "az";
+    x.lastIndexOf(y);           // returns 6
+    x.lastIndexOf(y, 6);        // returns 6
+    x.lastIndexOf(y, 5);        // returns 2
+    x.lastIndexOf(y, 1);        // returns -1
+//! [29]
+
+//! [30]
+    QString str = "the minimum";
+    str.lastIndexOf(QRegExp("m[aeiou]"));      // returns 8
+//! [30]
+}
+
+void Widget::leftFunction()
+{
+//! [31]
+    QString x = "Pineapple";
+    QString y = x.left(4);      // y == "Pine"
+//! [31]
+}
+
+void Widget::leftJustifiedFunction()
+{
+//! [32]
+    QString s = "apple";
+    QString t = s.leftJustified(8, '.');    // t == "apple..."
+//! [32]
+
+//! [33]
+    QString str = "Pineapple";
+    str = str.leftJustified(5, '.', true);    // str == "Pinea"
+//! [33]
+}
+
+void Widget::midFunction()
+{
+//! [34]
+    QString x = "Nine pineapples";
+    QString y = x.mid(5, 4);            // y == "pine"
+    QString z = x.mid(5);               // z == "pineapples"
+//! [34]
+}
+
+void Widget::numberFunction()
+{
+//! [35]
+    long a = 63;
+    QString s = QString::number(a, 16);             // s == "3f"
+    QString t = QString::number(a, 16).toUpper();     // t == "3F"
+//! [35]
+}
+
+void Widget::prependFunction()
+{
+//! [36]
+    QString x = "ship";
+    QString y = "air";
+    x.prepend(y);
+    // x == "airship"
+//! [36]
+}
+
+void Widget::removeFunction()
+{
+//! [37]
+    QString s = "Montreal";
+    s.remove(1, 4);
+    // s == "Meal"
+//! [37]
+
+//! [38]
+    QString t = "Ali Baba";
+    t.remove(QChar('a'), Qt::CaseInsensitive);
+    // t == "li Bb"
+//! [38]
+
+//! [39]
+    QString r = "Telephone";
+    r.remove(QRegExp("[aeiou]."));
+    // r == "The"
+//! [39]
+}
+
+void Widget::replaceFunction()
+{
+//! [40]
+    QString x = "Say yes!";
+    QString y = "no";
+    x.replace(4, 3, y);
+    // x == "Say no!"
+//! [40]
+
+//! [41]
+    QString str = "colour behaviour flavour neighbour";
+    str.replace(QString("ou"), QString("o"));
+    // str == "color behavior flavor neighbor"
+//! [41]
+
+//! [42]
+    QString s = "Banana";
+    s.replace(QRegExp("a[mn]"), "ox");
+    // s == "Boxoxa"
+//! [42]
+
+//! [43]
+    QString t = "A <i>bon mot</i>.";
+    t.replace(QRegExp("<i>([^<]*)</i>"), "\\emph{\\1}");
+    // t == "A \\emph{bon mot}."
+//! [43]
+
+//! [86]
+    QString equis = "xxxxxx";
+    equis.replace("xx", "x");
+    // equis == "xxx"    
+//! [86]
+}
+
+void Widget::reserveFunction()
+{
+//! [44]
+    QString result;
+    int maxSize;
+    bool condition;
+    QChar nextChar;
+
+    result.reserve(maxSize);
+
+    while (condition)
+        result.append(nextChar);
+
+    result.squeeze();
+//! [44]
+}
+
+void Widget::resizeFunction()
+{
+//! [45]
+    QString s = "Hello world";
+    s.resize(5);
+    // s == "Hello"
+
+    s.resize(8);
+    // s == "Hello???" (where ? stands for any character)
+//! [45]
+
+//! [46]
+    QString t = "Hello";
+    t += QString(10, 'X');
+    // t == "HelloXXXXXXXXXX"
+//! [46]
+
+//! [47]
+    QString r = "Hello";
+    r = r.leftJustified(10, ' ');
+    // r == "Hello     "
+//! [47]
+}
+
+void Widget::rightFunction()
+{
+//! [48]
+    QString x = "Pineapple";
+    QString y = x.right(5);      // y == "apple"
+//! [48]
+}
+
+void Widget::rightJustifiedFunction()
+{
+//! [49]
+    QString s = "apple";
+    QString t = s.rightJustified(8, '.');    // t == "...apple"
+//! [49]
+
+//! [50]
+    QString str = "Pineapple";
+    str = str.rightJustified(5, '.', true);    // str == "Pinea"
+//! [50]
+}
+
+void Widget::sectionFunction()
+{
+//! [51] //! [52]
+    QString str;
+//! [51]
+    QString csv = "forename,middlename,surname,phone";
+    QString path = "/usr/local/bin/myapp"; // First field is empty
+    QString::SectionFlag flag = QString::SectionSkipEmpty;
+
+
+    str = csv.section(',', 2, 2);   // str == "surname"
+    str = path.section('/', 3, 4);  // str == "bin/myapp"
+    str = path.section('/', 3, 3, flag); // str == "myapp"
+//! [52]
+
+//! [53]
+    str = csv.section(',', -3, -2);  // str == "middlename,surname"
+    str = path.section('/', -1); // str == "myapp"
+//! [53]
+
+//! [54]
+    QString data = "forename**middlename**surname**phone";
+
+    str = data.section("**", 2, 2); // str == "surname"
+    str = data.section("**", -3, -2); // str == "middlename**surname"
+//! [54]
+
+//! [55]
+    QString line = "forename\tmiddlename  surname \t \t phone";
+    QRegExp sep("\\s+");
+    str = line.section(sep, 2, 2); // s == "surname"
+    str = line.section(sep, -3, -2); // s == "middlename  surname"
+//! [55]
+}
+
+void Widget::setNumFunction()
+{
+//! [56]
+    QString str;
+    str.setNum(1234);       // str == "1234"
+//! [56]
+}
+
+void Widget::simplifiedFunction()
+{
+//! [57]
+    QString str = "  lots\t of\nwhitespace\r\n ";
+    str = str.simplified();
+    // str == "lots of whitespace";
+//! [57]
+}
+
+void Widget::sizeFunction()
+{
+//! [58]
+    QString str = "World";
+    int n = str.size();         // n == 5
+    str.data()[0];              // returns 'W'
+    str.data()[4];              // returns 'd'
+    str.data()[5];              // returns '\0'
+//! [58]
+}
+
+void Widget::splitFunction()
+{
+//! [59]
+    QString str;
+    QStringList list;
+
+    str = "Some  text\n\twith  strange whitespace.";
+    list = str.split(QRegExp("\\s+"));
+    // list: [ "Some", "text", "with", "strange", "whitespace." ]
+//! [59]
+
+//! [60]
+    str = "This time, a normal English sentence.";
+    list = str.split(QRegExp("\\W+"), QString::SkipEmptyParts);
+    // list: [ "This", "time", "a", "normal", "English", "sentence" ]
+//! [60]
+
+//! [61]
+    str = "Now: this sentence fragment.";
+    list = str.split(QRegExp("\\b"));
+    // list: [ "", "Now", ": ", "this", " ", "sentence", " ", "fragment", "." ]
+//! [61]
+}
+
+void Widget::splitCaseSensitiveFunction()
+{
+//! [62]
+    QString str = "a,,b,c";
+
+    QStringList list1 = str.split(",");
+    // list1: [ "a", "", "b", "c" ]
+
+    QStringList list2 = str.split(",", QString::SkipEmptyParts);
+    // list2: [ "a", "b", "c" ]
+//! [62]
+}
+
+void Widget::sprintfFunction()
+{
+//! [63]
+    size_t BufSize;
+    char buf[BufSize];
+
+    ::snprintf(buf, BufSize, "%lld", 123456789LL);
+    QString str = QString::fromAscii(buf);
+//! [63]
+
+//! [64]
+    QString result;
+    QTextStream(&result) << "pi = " << 3.14;
+    // result == "pi = 3.14"
+//! [64]
+}
+
+void Widget::startsWithFunction()
+{
+//! [65]
+    QString str = "Bananas";
+    str.startsWith("Ban");     // returns true
+    str.startsWith("Car");     // returns false
+//! [65]
+}
+
+void Widget::toDoubleFunction()
+{
+//! [66]
+    QString str = "1234.56";
+    double val = str.toDouble();   // val == 1234.56
+//! [66]
+
+//! [67]
+    bool ok;
+    double d;
+
+    d = QString( "1234.56e-02" ).toDouble(&ok); // ok == true, d == 12.3456
+//! [67]
+
+//! [68] //! [69]
+    QLocale::setDefault(QLocale::C);
+    d = QString( "1234,56" ).toDouble(&ok); // ok == false
+//! [68]
+    d = QString( "1234.56" ).toDouble(&ok); // ok == true, d == 1234.56
+
+//! [69] //! [70]
+    QLocale::setDefault(QLocale::German);
+    d = QString( "1234,56" ).toDouble(&ok); // ok == true, d == 1234.56
+    d = QString( "1234.56" ).toDouble(&ok); // ok == true, d == 1234.56
+
+//! [70]
+    QLocale::setDefault(QLocale::C);
+    d = QString( "1,234,567.89" ).toDouble(&ok); // ok == false
+}
+
+void Widget::toFloatFunction()
+{
+//! [71]
+    QString str1 = "1234.56";
+    str1.toFloat();             // returns 1234.56
+
+    bool ok;
+    QString str2 = "R2D2";
+    str2.toFloat(&ok);          // returns 0.0, sets ok to false
+//! [71]
+}
+
+void Widget::toIntFunction()
+{
+//! [72]
+    QString str = "FF";
+    bool ok;
+    int hex = str.toInt(&ok, 16);       // hex == 255, ok == true
+    int dec = str.toInt(&ok, 10);       // dec == 0, ok == false
+//! [72]
+}
+
+void Widget::toLongFunction()
+{
+//! [73]
+    QString str = "FF";
+    bool ok;
+
+    long hex = str.toLong(&ok, 16);     // hex == 255, ok == true
+    long dec = str.toLong(&ok, 10);     // dec == 0, ok == false
+//! [73]
+}
+
+void Widget::toLongLongFunction()
+{
+//! [74]
+    QString str = "FF";
+    bool ok;
+
+    qint64 hex = str.toLongLong(&ok, 16);      // hex == 255, ok == true
+    qint64 dec = str.toLongLong(&ok, 10);      // dec == 0, ok == false
+//! [74]
+}
+
+void Widget::toLowerFunction()
+{
+//! [75]
+    QString str = "TROlltECH";
+    str = str.toLower();        // str == "trolltech"
+//! [75]
+}
+
+void Widget::toShortFunction()
+{
+//! [76]
+    QString str = "FF";
+    bool ok;
+
+    short hex = str.toShort(&ok, 16);   // hex == 255, ok == true
+    short dec = str.toShort(&ok, 10);   // dec == 0, ok == false
+//! [76]
+}
+
+void Widget::toUIntFunction()
+{
+//! [77]
+    QString str = "FF";
+    bool ok;
+
+    uint hex = str.toUInt(&ok, 16);     // hex == 255, ok == true
+    uint dec = str.toUInt(&ok, 10);     // dec == 0, ok == false
+//! [77]
+}
+
+void Widget::toULongFunction()
+{
+//! [78]
+    QString str = "FF";
+    bool ok;
+
+    ulong hex = str.toULong(&ok, 16);   // hex == 255, ok == true
+    ulong dec = str.toULong(&ok, 10);   // dec == 0, ok == false
+//! [78]
+}
+
+void Widget::toULongLongFunction()
+{
+//! [79]
+    QString str = "FF";
+    bool ok;
+
+    quint64 hex = str.toULongLong(&ok, 16);    // hex == 255, ok == true
+    quint64 dec = str.toULongLong(&ok, 10);    // dec == 0, ok == false
+//! [79]
+}
+
+void Widget::toUShortFunction()
+{
+//! [80]
+    QString str = "FF";
+    bool ok;
+
+    ushort hex = str.toUShort(&ok, 16);     // hex == 255, ok == true
+    ushort dec = str.toUShort(&ok, 10);     // dec == 0, ok == false
+//! [80]
+}
+
+void Widget::toUpperFunction()
+{
+//! [81]
+    QString str = "TeXt";
+    str = str.toUpper();        // str == "TEXT"
+//! [81]
+}
+
+void Widget::trimmedFunction()
+{
+//! [82]
+    QString str = "  lots\t of\nwhitespace\r\n ";
+    str = str.trimmed();
+    // str == "lots\t of\nwhitespace"
+//! [82]
+}
+
+void Widget::truncateFunction()
+{
+//! [83]
+    QString str = "Vladivostok";
+    str.truncate(4);
+    // str == "Vlad"
+//! [83]
+}
+
+void Widget::plusEqualOperator()
+{
+//! [84]
+    QString x = "free";
+    QString y = "dom";
+    x += y;
+    // x == "freedom"
+//! [84]
+}
+
+void Widget::arrayOperator()
+{
+//! [85]
+    QString str;
+
+    if (str[0] == QChar('?'))
+        str[0] = QChar('_');
+//! [85]
+}
+
+void Widget::midRefFunction()
+{
+//! [midRef]
+    QString x = "Nine pineapples";
+    QStringRef y = x.midRef(5, 4);      // y == "pine"
+    QStringRef z = x.midRef(5);         // z == "pineapples"
+//! [midRef]
+}
+
+void Widget::leftRefFunction()
+{
+//! [leftRef]
+    QString x = "Pineapple";
+    QStringRef y = x.leftRef(4);        // y == "Pine"
+//! [leftRef]
+}
+
+void Widget::rightRefFunction()
+{
+//! [rightRef]
+    QString x = "Pineapple";
+    QStringRef y = x.rightRef(5);       // y == "apple"
+//! [rightRef]
+}
+
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Widget widget;
+    widget.show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/qstring/qstring.pro b/doc/src/snippets/qstring/qstring.pro
new file mode 100644
index 0000000000..71039d1463
--- /dev/null
+++ b/doc/src/snippets/qstring/qstring.pro
@@ -0,0 +1,11 @@
+######################################################################
+# Automatically generated by qmake (2.00a) Wed Apr 12 11:28:45 2006
+######################################################################
+
+TEMPLATE = app
+TARGET += 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += main.cpp
diff --git a/doc/src/snippets/qstringlist/main.cpp b/doc/src/snippets/qstringlist/main.cpp
new file mode 100644
index 0000000000..b0def5b71b
--- /dev/null
+++ b/doc/src/snippets/qstringlist/main.cpp
@@ -0,0 +1,156 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <iostream>
+using namespace std;
+
+class Widget : public QWidget
+{
+public:
+    Widget(QWidget *parent = 0);
+};
+
+Widget::Widget(QWidget *parent)
+    : QWidget(parent)
+{
+//! [0]
+    QStringList fonts;
+    fonts << "Arial" << "Helvetica" << "Times" << "Courier";
+//! [0]
+
+//! [1]
+    for (int i = 0; i < fonts.size(); ++i)
+         cout << fonts.at(i).toLocal8Bit().constData() << endl;
+//! [1]
+
+//! [2]
+    QStringListIterator javaStyleIterator(fonts);
+    while (javaStyleIterator.hasNext())
+         cout << javaStyleIterator.next().toLocal8Bit().constData() << endl;
+//! [2]
+
+//! [3]
+    QStringList::const_iterator constIterator;
+    for (constIterator = fonts.constBegin(); constIterator != fonts.constEnd();
+           ++constIterator)
+        cout << (*constIterator).toLocal8Bit().constData() << endl;
+//! [3]
+
+//! [4]
+    QString str = fonts.join(",");
+     // str == "Arial,Helvetica,Times,Courier"
+//! [4]
+
+//! [5] //! [6]
+    QStringList list;
+//! [5]
+    list = str.split(",");
+     // list: ["Arial", "Helvetica", "Times", "Courier"]
+//! [6]
+
+//! [7]
+    QStringList monospacedFonts = fonts.filter(QRegExp("Courier|Fixed"));
+//! [7]
+
+//! [8]
+    QStringList files;
+    files << "$QTDIR/src/moc/moc.y"
+          << "$QTDIR/src/moc/moc.l"
+          << "$QTDIR/include/qconfig.h";
+
+    files.replaceInStrings("$QTDIR", "/usr/lib/qt");
+    // files: [ "/usr/lib/qt/src/moc/moc.y", ...]
+//! [8]
+
+    QString str1, str2, str3;
+//! [9]
+    QStringList longerList = (QStringList() << str1 << str2 << str3);
+//! [9]
+
+    list.clear();
+//! [10]
+    list << "Bill Murray" << "John Doe" << "Bill Clinton";
+
+//! [11]
+    QStringList result;
+//! [11]
+    result = list.filter("Bill");
+    // result: ["Bill Murray", "Bill Clinton"]
+//! [10]
+
+    result.clear();
+//! [12]
+    foreach (QString str, list) {
+        if (str.contains("Bill"))
+            result += str;
+    }
+//! [12]
+
+    list.clear();
+//! [13]
+    list << "alpha" << "beta" << "gamma" << "epsilon";
+    list.replaceInStrings("a", "o");
+    // list == ["olpho", "beto", "gommo", "epsilon"]
+//! [13]
+
+    list.clear();
+//! [14]
+    list << "alpha" << "beta" << "gamma" << "epsilon";
+    list.replaceInStrings(QRegExp("^a"), "o");
+    // list == ["olpha", "beta", "gamma", "epsilon"]
+//! [14]
+
+    list.clear();
+//! [15]
+    list << "Bill Clinton" << "Murray, Bill";
+    list.replaceInStrings(QRegExp("^(.*), (.*)$"), "\\2 \\1");
+    // list == ["Bill Clinton", "Bill Murray"]
+//! [15]
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Widget widget;
+    widget.show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/qstringlist/qstringlist.pro b/doc/src/snippets/qstringlist/qstringlist.pro
new file mode 100644
index 0000000000..adb2f9e54e
--- /dev/null
+++ b/doc/src/snippets/qstringlist/qstringlist.pro
@@ -0,0 +1,11 @@
+######################################################################
+# Automatically generated by qmake (2.00a) Wed May 3 11:08:01 2006
+######################################################################
+
+TEMPLATE = app
+TARGET += 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += main.cpp
diff --git a/doc/src/snippets/qstringlistmodel/main.cpp b/doc/src/snippets/qstringlistmodel/main.cpp
new file mode 100644
index 0000000000..020dd8c1cf
--- /dev/null
+++ b/doc/src/snippets/qstringlistmodel/main.cpp
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+class Widget : public QWidget
+{
+public:
+    Widget(QWidget *parent = 0);
+};
+
+Widget::Widget(QWidget *parent)
+    : QWidget(parent)
+{
+//! [0]
+    QStringListModel *model = new QStringListModel();
+    QStringList list;
+    list << "a" << "b" << "c";
+    model->setStringList(list);
+//! [0]
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Widget widget;
+    widget.show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/qstringlistmodel/qstringlistmodel.pro b/doc/src/snippets/qstringlistmodel/qstringlistmodel.pro
new file mode 100644
index 0000000000..aaa359c853
--- /dev/null
+++ b/doc/src/snippets/qstringlistmodel/qstringlistmodel.pro
@@ -0,0 +1,11 @@
+######################################################################
+# Automatically generated by qmake (2.00a) Wed May 3 15:25:22 2006
+######################################################################
+
+TEMPLATE = app
+TARGET += 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += main.cpp
diff --git a/doc/src/snippets/qstyleoption/main.cpp b/doc/src/snippets/qstyleoption/main.cpp
new file mode 100644
index 0000000000..f7b21a1fa2
--- /dev/null
+++ b/doc/src/snippets/qstyleoption/main.cpp
@@ -0,0 +1,140 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QApplication>
+
+class MyPushButton : public QPushButton
+{
+public:
+    MyPushButton(QWidget *parent = 0);
+
+    void paintEvent(QPaintEvent *);
+};
+
+MyPushButton::MyPushButton(QWidget *parent)
+    : QPushButton(parent)
+{
+}
+
+//! [0]
+void MyPushButton::paintEvent(QPaintEvent *)
+{
+    QStyleOptionButton option;
+    option.initFrom(this);
+    option.state = isDown() ? QStyle::State_Sunken : QStyle::State_Raised;
+    if (isDefault())
+        option.features |= QStyleOptionButton::DefaultButton;
+    option.text = text();
+    option.icon = icon();
+
+    QPainter painter(this);
+    style()->drawControl(QStyle::CE_PushButton, &option, &painter, this);
+}
+//! [0]
+
+
+
+class MyStyle : public QStyle
+{
+public:
+    MyStyle();
+
+    void drawPrimitive(PrimitiveElement element, const QStyleOption *option,
+                       QPainter *painter, const QWidget *widget);
+};
+
+MyStyle::MyStyle()
+{
+//! [1]
+    QStyleOptionFrame *option;
+
+    if (const QStyleOptionFrame *frameOption =
+           qstyleoption_cast<const QStyleOptionFrame *>(option)) {
+        QStyleOptionFrameV2 frameOptionV2(*frameOption);
+
+        // draw the frame using frameOptionV2
+    }
+//! [1]
+
+//! [2]
+    if (const QStyleOptionProgressBar *progressBarOption =
+           qstyleoption_cast<const QStyleOptionProgressBar *>(option)) {
+        QStyleOptionProgressBarV2 progressBarV2(*progressBarOption);
+
+        // draw the progress bar using progressBarV2
+    }
+//! [2]
+
+//! [3]
+    if (const QStyleOptionTab *tabOption =
+           qstyleoption_cast<const QStyleOptionTab *>(option)) {
+        QStyleOptionTabV2 tabV2(*tabOption);
+
+        // draw the tab using tabV2
+   }
+//! [3]
+}
+
+//! [4]
+void MyStyle::drawPrimitive(PrimitiveElement element,
+                            const QStyleOption *option,
+                            QPainter *painter,
+                            const QWidget *widget)
+{
+    if (element == PE_FrameFocusRect) {
+        const QStyleOptionFocusRect *focusRectOption =
+                qstyleoption_cast<const QStyleOptionFocusRect *>(option);
+        if (focusRectOption) {
+            // ...
+        }
+    }
+    // ...
+}
+//! [4]
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MyPushButton button;
+    button.show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/qstyleoption/qstyleoption.pro b/doc/src/snippets/qstyleoption/qstyleoption.pro
new file mode 100644
index 0000000000..2f17f036f2
--- /dev/null
+++ b/doc/src/snippets/qstyleoption/qstyleoption.pro
@@ -0,0 +1,11 @@
+######################################################################
+# Automatically generated by qmake (2.00a) Thu Apr 20 16:22:46 2006
+######################################################################
+
+TEMPLATE = app
+TARGET += 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += main.cpp
diff --git a/doc/src/snippets/qstyleplugin/main.cpp b/doc/src/snippets/qstyleplugin/main.cpp
new file mode 100644
index 0000000000..04584b4d18
--- /dev/null
+++ b/doc/src/snippets/qstyleplugin/main.cpp
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QtGui>
+
+class MyStylePlugin : public QStylePlugin
+{
+public:
+    MyStylePlugin(QObject *parent = 0);
+
+    QStyle *create(const QString &key);
+    QStringList keys() const;
+};
+
+class RocketStyle : public QCommonStyle
+{
+public:
+    RocketStyle() {};
+
+};
+
+class StarBusterStyle : public QCommonStyle
+{
+public:
+    StarBusterStyle() {};
+};
+
+MyStylePlugin::MyStylePlugin(QObject *parent)
+    : QStylePlugin(parent)
+{
+}
+
+//! [0]
+QStringList MyStylePlugin::keys() const
+{
+    return QStringList() << "Rocket" << "StarBuster";
+}
+//! [0]
+
+//! [1]
+QStyle *MyStylePlugin::create(const QString &key)
+{
+    QString lcKey = key;
+    if (lcKey == "rocket") {
+        return new RocketStyle;
+    } else if (lcKey == "starbuster") {
+        return new StarBusterStyle;
+    }
+    return 0;
+//! [1] //! [2]
+}
+//! [2]
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MyStylePlugin plugin;
+    return app.exec();
+}
diff --git a/doc/src/snippets/qstyleplugin/qstyleplugin.pro b/doc/src/snippets/qstyleplugin/qstyleplugin.pro
new file mode 100644
index 0000000000..d17c20f69b
--- /dev/null
+++ b/doc/src/snippets/qstyleplugin/qstyleplugin.pro
@@ -0,0 +1,11 @@
+######################################################################
+# Automatically generated by qmake (2.00a) Tue May 2 15:31:16 2006
+######################################################################
+
+TEMPLATE = app
+TARGET += 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += main.cpp
diff --git a/doc/src/snippets/qsvgwidget/main.cpp b/doc/src/snippets/qsvgwidget/main.cpp
new file mode 100644
index 0000000000..b0ab95e6b3
--- /dev/null
+++ b/doc/src/snippets/qsvgwidget/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtSvg>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+//! [0]
+    QSvgWidget window(":/files/spheres.svg");
+    window.show();
+//! [0]
+    QSvgRenderer *renderer = window.renderer();
+    QImage image(150, 150, QImage::Format_RGB32);
+    QPainter painter;
+    painter.begin(&image);
+    renderer->render(&painter);
+    painter.end();
+    image.save("spheres.png", "PNG", 9);
+    return app.exec();
+}
diff --git a/doc/src/snippets/qsvgwidget/qsvgwidget.pro b/doc/src/snippets/qsvgwidget/qsvgwidget.pro
new file mode 100644
index 0000000000..d7e3698bb2
--- /dev/null
+++ b/doc/src/snippets/qsvgwidget/qsvgwidget.pro
@@ -0,0 +1,3 @@
+QT              += svg
+RESOURCES       = qsvgwidget.qrc
+SOURCES         = main.cpp
diff --git a/doc/src/snippets/qsvgwidget/qsvgwidget.qrc b/doc/src/snippets/qsvgwidget/qsvgwidget.qrc
new file mode 100644
index 0000000000..13d8b36123
--- /dev/null
+++ b/doc/src/snippets/qsvgwidget/qsvgwidget.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/files" >
+   <file>spheres.svg</file>
+</qresource>
+</RCC>
diff --git a/doc/src/snippets/qsvgwidget/spheres.svg b/doc/src/snippets/qsvgwidget/spheres.svg
new file mode 100644
index 0000000000..9e3819306a
--- /dev/null
+++ b/doc/src/snippets/qsvgwidget/spheres.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" standalone="no"?>
+<svg width="8cm" height="8cm" viewBox="0 0 400 400"
+     xmlns="http://www.w3.org/2000/svg" 
+     xmlns:xlink="http://www.w3.org/1999/xlink/"
+     baseProfile="tiny" version="1.2">
+  <title>Spheres</title>
+  <desc>Gradient filled spheres with different colors.</desc>
+    <defs>
+      <!-- Create radial gradients for each circle to make them look like
+           spheres. -->
+      <radialGradient id="blueSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="blue" />
+        <stop offset="100%" stop-color="#222244" />
+      </radialGradient>
+      <radialGradient id="redSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="red" />
+        <stop offset="100%" stop-color="#442222" />
+      </radialGradient>
+      <radialGradient id="greenSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="green" />
+        <stop offset="100%" stop-color="#113311" />
+      </radialGradient>
+      <radialGradient id="yellowSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="yellow" />
+        <stop offset="100%" stop-color="#444422" />
+      </radialGradient>
+      <radialGradient id="shadow" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="50">
+        <stop offset="0%" stop-color="black" stop-opacity="1.0" />
+        <stop offset="100%" stop-color="white" stop-opacity="0.0" />
+      </radialGradient>
+
+      <!-- Define a shadow for each sphere. -->
+      <circle id="shadow" fill="url(#shadow)" cx="0" cy="0" r="100" />
+    </defs>
+  <g fill="#ffee99" stroke="none" >
+    <rect x="0" y="0" width="400" height="400" />
+  </g>
+  <g fill="white" stroke="none" >
+    <rect x="0" y="175" width="400" height="225" />
+  </g>
+  <g transform="translate(200,290) scale(2.0,1.0) rotate(45)" >
+    <rect fill="#a6ce39" x="-69" y="-69" width="138" height="138" />
+    <circle fill="black" cx="0" cy="0" r="50" />
+    <circle fill="#a6ce39" cx="0" cy="0" r="33" />
+    <path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10
+                          L -11,22 L -1,12 Z" />
+  </g>
+  <g transform="translate(200,175)">
+    <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+    <circle fill="url(#blueSphere)" cx="0" cy="0" r="100" />
+  </g>
+  <g transform="translate(315,240)">
+    <g transform="scale(0.5,0.5)">
+      <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+      <circle fill="url(#redSphere)" cx="0" cy="0" r="100" />
+    </g>
+  </g>
+  <g transform="translate(80,275)">
+    <g transform="scale(0.65,0.65)">
+      <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+      <circle fill="url(#greenSphere)" cx="0" cy="0" r="100" />
+    </g>
+  </g>
+  <g transform="translate(255,325)">
+    <g transform="scale(0.3,0.3)">
+      <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+      <circle fill="url(#yellowSphere)" cx="0" cy="0" r="100" />
+    </g>
+  </g>
+</svg>
diff --git a/doc/src/snippets/qsvgwidget/sunflower.svg b/doc/src/snippets/qsvgwidget/sunflower.svg
new file mode 100644
index 0000000000..b60dd11a63
--- /dev/null
+++ b/doc/src/snippets/qsvgwidget/sunflower.svg
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
+<svg width="289.619" height="450.482"
+     xmlns="http://www.w3.org/2000/svg" baseProfile="tiny" version="1.1">
+  <defs> 
+    <marker id="ArrowEnd" viewBox="0 0 10 10" refX="0" refY="5" 
+     markerUnits="strokeWidth" 
+     markerWidth="4" 
+     markerHeight="3" 
+     orient="auto"> 
+        <path d="M 0 0 L 10 5 L 0 10 z" /> 
+    </marker>
+    <marker id="ArrowStart" viewBox="0 0 10 10" refX="10" refY="5" 
+     markerUnits="strokeWidth" 
+     markerWidth="4" 
+     markerHeight="3" 
+     orient="auto"> 
+        <path d="M 10 0 L 0 5 L 10 10 z" /> 
+    </marker> </defs>
+<g>
+<defs><linearGradient id="1" x1="155.352" y1="450.482" x2="155.352" y2="140" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#9ded37"/>
+<stop offset="1" style="stop-color:#f8ff76"/>
+</linearGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#1)" d="M 132.72 145.241C 211.668 237.549 150.166 295.646 148.222 342.665C 146.89 374.889 171.099 410.104 185.352 445.241C 185.352 445.241 185.352 445.241 132.72 352.933C 106.405 306.779 159.036 306.779 159.036 237.549C 159.036 191.395 132.72 145.241 132.72 145.241z"/>
+<defs><radialGradient id="2" cx="145.352" cy="45.2408" r="47.7391" fx="145.352" fy="45.2408" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#2)" d="M 155.352 45.2408C 155.352 67.3199 150.872 85.2408 145.352 85.2408C 139.832 85.2408 135.352 67.3199 135.352 45.2408C 135.352 23.1618 139.832 5.24084 145.352 5.24084C 150.872 5.24084 155.352 23.1618 155.352 45.2408z"/>
+<defs><radialGradient id="3" cx="170.135" cy="48.3609" r="48.0339" fx="170.135" fy="48.3609" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#3)" d="M 179.823 50.8388C 174.351 72.2289 165.569 88.4808 160.221 87.1129C 154.874 85.7448 154.975 67.2728 160.447 45.8828C 165.919 24.4928 174.701 8.24084 180.048 9.60886C 185.396 10.9768 185.295 29.4489 179.823 50.8388z"/>
+<g>
+<defs><radialGradient id="4" cx="192.599" cy="57.0958" r="48.4248" fx="192.599" fy="57.0958" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#4)" d="M 201.476 61.6998C 191.31 81.2998 179.081 95.1448 174.181 92.6039C 169.282 90.0618 173.556 72.0909 183.722 52.4919C 193.888 32.8918 206.116 19.0468 211.016 21.5878C 215.916 24.1299 211.642 42.1008 201.476 61.6998z"/>
+<defs><radialGradient id="5" cx="213.162" cy="71.2758" r="48.6431" fx="213.162" fy="71.2758" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#5)" d="M 220.621 77.9368C 205.915 94.4048 190.636 104.788 186.519 101.112C 182.402 97.4348 190.997 81.0838 205.703 64.6148C 220.409 48.1469 235.688 37.7639 239.805 41.4398C 243.922 45.1169 235.327 61.4678 220.621 77.9368z"/>
+</g>
+<defs><radialGradient id="6" cx="229.082" cy="90.7439" r="48.5357" fx="229.082" fy="90.7439" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#6)" d="M 234.466 99.1708C 215.86 111.058 198.346 116.932 195.374 112.28C 192.403 107.629 205.092 94.2048 223.698 82.3168C 242.303 70.4298 259.817 64.5558 262.789 69.2079C 265.761 73.8589 253.071 87.2838 234.466 99.1708z"/>
+<defs><radialGradient id="7" cx="239.796" cy="113.308" r="48.1584" fx="239.796" fy="113.308" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#7)" d="M 242.923 122.806C 221.952 129.712 203.529 131.061 201.803 125.819C 200.076 120.576 215.697 110.715 236.668 103.81C 257.639 96.9038 276.063 95.5548 277.789 100.797C 279.515 106.04 263.895 115.901 242.923 122.806z"/>
+<g>
+<defs><radialGradient id="8" cx="244.53" cy="136.94" r="47.7879" fx="244.53" fy="136.94" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#8)" d="M 245.429 146.899C 223.44 148.885 205.188 146.035 204.692 140.538C 204.195 135.04 221.641 128.966 243.63 126.981C 265.62 124.995 283.871 127.845 284.368 133.342C 284.864 138.84 267.418 144.914 245.429 146.899z"/>
+<defs><radialGradient id="9" cx="243.651" cy="161.904" r="47.8795" fx="243.651" fy="161.904" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#9)" d="M 242.055 171.776C 220.259 168.25 203.284 160.965 204.165 155.516C 205.047 150.067 223.453 148.506 245.249 152.032C 267.044 155.558 284.02 162.843 283.138 168.292C 282.257 173.741 263.85 175.302 242.055 171.776z"/>
+</g>
+<g>
+<g>
+<g>
+<defs><radialGradient id="10" cx="236.069" cy="186.194" r="48.3388" fx="236.069" fy="186.194" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#10)" d="M 231.976 195.318C 211.831 186.281 197.314 174.858 199.573 169.822C 201.832 164.785 220.017 168.033 240.162 177.07C 260.306 186.107 274.824 197.53 272.565 202.566C 270.305 207.603 252.12 204.355 231.976 195.318z"/>
+<defs><radialGradient id="11" cx="223.077" cy="207.529" r="48.6188" fx="223.077" fy="207.529" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#11)" d="M 216.851 215.354C 199.575 201.606 188.341 186.942 191.778 182.623C 195.215 178.303 212.028 185.956 229.304 199.704C 246.581 213.452 257.814 228.116 254.377 232.435C 250.94 236.755 234.128 229.102 216.851 215.354z"/>
+</g>
+<g>
+<defs><radialGradient id="12" cx="205.914" cy="224.449" r="48.6182" fx="205.914" fy="224.449" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#12)" d="M 198.079 230.664C 184.358 213.366 176.731 196.542 181.055 193.111C 185.379 189.681 200.027 200.937 213.748 218.234C 227.469 235.532 235.097 252.356 230.772 255.787C 226.448 259.217 211.801 247.961 198.079 230.664z"/>
+<defs><radialGradient id="13" cx="184.559" cy="237.407" r="48.3362" fx="184.559" fy="237.407" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#13)" d="M 175.429 241.486C 166.422 221.328 163.203 203.138 168.242 200.886C 173.282 198.635 184.683 213.169 193.689 233.328C 202.695 253.486 205.915 271.676 200.875 273.928C 195.836 276.179 184.435 261.645 175.429 241.486z"/>
+</g>
+</g>
+<g>
+<g>
+<defs><radialGradient id="14" cx="160.281" cy="243.964" r="47.8592" fx="160.281" fy="243.964" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#14)" d="M 150.388 245.427C 147.158 223.586 148.968 205.202 154.428 204.395C 159.888 203.587 166.943 220.66 170.173 242.501C 173.404 264.342 171.594 282.726 166.134 283.534C 160.673 284.341 153.619 267.268 150.388 245.427z"/>
+<defs><radialGradient id="15" cx="135.307" cy="244.504" r="47.8021" fx="135.307" fy="244.504" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#15)" d="M 125.361 243.47C 127.645 221.509 133.954 204.148 139.444 204.719C 144.934 205.289 147.537 223.578 145.254 245.538C 142.971 267.499 136.661 284.86 131.171 284.289C 125.681 283.719 123.078 265.43 125.361 243.47z"/>
+</g>
+<g>
+<defs><radialGradient id="16" cx="111.808" cy="239.15" r="48.183" fx="111.808" fy="239.15" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#16)" d="M 102.353 235.894C 109.541 215.018 119.613 199.532 124.831 201.33C 130.05 203.127 128.452 221.53 121.263 242.406C 114.074 263.282 104.003 278.768 98.784 276.97C 93.5651 275.173 95.1639 256.77 102.353 235.894z"/>
+<defs><radialGradient id="17" cx="89.3906" cy="228.131" r="48.5494" fx="89.3906" fy="228.131" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#17)" d="M 81.0375 222.633C 93.1756 204.19 106.771 191.684 111.381 194.718C 115.992 197.753 109.882 215.186 97.7439 233.629C 85.6057 252.072 72.0108 264.578 67.4001 261.544C 62.7894 258.509 68.8993 241.076 81.0375 222.633z"/>
+</g>
+</g>
+</g>
+<g>
+<g>
+<g>
+<defs><radialGradient id="18" cx="53.7557" cy="185.38" r="48.3405" fx="53.7557" fy="185.38" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#18)" d="M 49.653 176.26C 69.7881 167.202 87.9697 163.935 90.2343 168.969C 92.4989 174.003 77.9935 185.441 57.8584 194.5C 37.7233 203.558 19.5417 206.825 17.2771 201.791C 15.0125 196.757 29.5179 185.319 49.653 176.26z"/>
+<defs><radialGradient id="19" cx="46.4327" cy="161.498" r="47.8981" fx="46.4327" fy="161.498" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#19)" d="M 44.7181 151.646C 66.47 147.861 84.894 149.202 85.8404 154.64C 86.7868 160.078 69.8991 167.564 48.1473 171.35C 26.3954 175.135 7.97139 173.794 7.02501 168.356C 6.07862 162.918 22.9663 155.432 44.7181 151.646z"/>
+</g>
+<g>
+<defs><radialGradient id="20" cx="45.1827" cy="137.429" r="47.7585" fx="45.1827" fy="137.429" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#20)" d="M 45.7397 127.445C 67.7843 128.674 85.4281 134.146 85.1206 139.657C 84.8131 145.168 66.6702 148.643 44.6257 147.413C 22.5811 146.184 4.93733 140.712 5.2448 135.201C 5.55227 129.69 23.6952 126.215 45.7397 127.445z"/>
+<defs><radialGradient id="21" cx="49.6787" cy="112.858" r="48.1368" fx="49.6787" fy="112.858" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#21)" d="M 52.6929 103.323C 73.7448 109.978 89.4821 119.652 87.8184 124.915C 86.1547 130.178 67.7165 129.048 46.6645 122.393C 25.6126 115.738 9.87529 106.064 11.539 100.801C 13.2027 95.5378 31.6409 96.6678 52.6929 103.323z"/>
+</g>
+</g>
+<g>
+<g>
+<defs><radialGradient id="22" cx="60.9007" cy="90.3528" r="48.5468" fx="60.9007" fy="90.3528" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#22)" d="M 66.3768 81.9858C 84.8509 94.0758 97.3927 107.639 94.3701 112.257C 91.3475 116.876 73.8987 110.811 55.4246 98.7198C 36.9505 86.6299 24.4087 73.0668 27.4313 68.4489C 30.4539 63.8298 47.9027 69.8948 66.3768 81.9858z"/>
+<defs><radialGradient id="23" cx="77.0826" cy="71.3239" r="48.6458" fx="77.0826" fy="71.3239" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#23)" d="M 84.4616 64.5748C 99.363 80.8669 108.152 97.1148 104.079 100.84C 100.006 104.565 84.6051 94.3648 69.7038 78.0728C 54.8024 61.7809 46.013 45.5338 50.086 41.8078C 54.1589 38.0829 69.5603 48.2828 84.4616 64.5748z"/>
+</g>
+<g>
+<defs><radialGradient id="24" cx="96.6928" cy="57.3108" r="48.4711" fx="96.6928" fy="57.3108" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#24)" d="M 105.406 52.4048C 116.239 71.6429 121.128 89.4579 116.318 92.1658C 111.508 94.8738 98.8115 81.4558 87.979 62.2168C 77.1465 42.9778 72.2579 25.1638 77.0676 22.4558C 81.8773 19.7478 94.5739 33.1658 105.406 52.4048z"/>
+<defs><radialGradient id="25" cx="119.819" cy="47.8708" r="48.0557" fx="119.819" fy="47.8708" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#25)" d="M 129.477 45.2769C 135.203 66.6008 135.524 85.0708 130.193 86.5018C 124.863 87.9338 115.888 71.7878 110.161 50.4648C 104.434 29.1408 104.113 10.6718 109.444 9.23984C 114.775 7.80783 123.75 23.9538 129.477 45.2769z"/>
+</g>
+</g>
+</g>
+<defs><radialGradient id="26" cx="69.0797" cy="209.914" r="48.6339" fx="69.0797" fy="209.914" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#ffa048"/>
+<stop offset="1" style="stop-color:#ff472e"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#26)" d="M 62.6124 202.287C 79.4523 188.008 96.0187 179.835 99.5885 184.045C 103.158 188.255 92.3869 203.262 75.547 217.541C 58.707 231.82 42.1406 239.993 38.5709 235.783C 35.0011 231.573 45.7725 216.566 62.6124 202.287z"/>
+<defs><radialGradient id="27" cx="145.352" cy="145.241" r="92.2646" fx="145.352" fy="145.241" gradientUnits="userSpaceOnUse">
+<stop offset="0" style="stop-color:#fff82e"/>
+<stop offset="1" style="stop-color:#ffffff"/>
+</radialGradient>
+</defs><path style="stroke:#000000; stroke-width:1; fill:url(#27)" d="M 85.3517 145.241C 85.3517 178.359 112.234 205.241 145.352 205.241C 178.47 205.241 205.352 178.359 205.352 145.241C 205.352 112.123 178.47 85.2408 145.352 85.2408C 112.234 85.2408 85.3517 112.123 85.3517 145.241z"/>
+</g>
+</svg>
diff --git a/doc/src/snippets/qt-namespace/main.cpp b/doc/src/snippets/qt-namespace/main.cpp
new file mode 100644
index 0000000000..5b3d422a6a
--- /dev/null
+++ b/doc/src/snippets/qt-namespace/main.cpp
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <Qt>
+
+int main(int argc, char *argv[])
+{
+    return 0;
+}
diff --git a/doc/src/snippets/qt-namespace/qt-namespace.pro b/doc/src/snippets/qt-namespace/qt-namespace.pro
new file mode 100644
index 0000000000..bba41b9c12
--- /dev/null
+++ b/doc/src/snippets/qt-namespace/qt-namespace.pro
@@ -0,0 +1 @@
+SOURCES = main.cpp
diff --git a/doc/src/snippets/qtablewidget-dnd/Images/cubed.png b/doc/src/snippets/qtablewidget-dnd/Images/cubed.png
new file mode 100644
index 0000000000..2cd9048ca6
--- /dev/null
+++ b/doc/src/snippets/qtablewidget-dnd/Images/cubed.png
diff --git a/doc/src/snippets/qtablewidget-dnd/Images/squared.png b/doc/src/snippets/qtablewidget-dnd/Images/squared.png
new file mode 100644
index 0000000000..bfdf993289
--- /dev/null
+++ b/doc/src/snippets/qtablewidget-dnd/Images/squared.png
diff --git a/doc/src/snippets/qtablewidget-dnd/images.qrc b/doc/src/snippets/qtablewidget-dnd/images.qrc
new file mode 100644
index 0000000000..1d49b52866
--- /dev/null
+++ b/doc/src/snippets/qtablewidget-dnd/images.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+   <file>Images/squared.png</file>
+   <file>Images/cubed.png</file>
+</qresource>
+</RCC>
diff --git a/doc/src/snippets/qtablewidget-dnd/main.cpp b/doc/src/snippets/qtablewidget-dnd/main.cpp
new file mode 100644
index 0000000000..19c7c203d8
--- /dev/null
+++ b/doc/src/snippets/qtablewidget-dnd/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *window = new MainWindow;
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/qtablewidget-dnd/mainwindow.cpp b/doc/src/snippets/qtablewidget-dnd/mainwindow.cpp
new file mode 100644
index 0000000000..3b8f359cd5
--- /dev/null
+++ b/doc/src/snippets/qtablewidget-dnd/mainwindow.cpp
@@ -0,0 +1,144 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "math.h"
+
+#include "mainwindow.h"
+
+MainWindow::MainWindow()
+{
+    QMenu *fileMenu = new QMenu(tr("&File"));
+
+    QAction *quitAction = fileMenu->addAction(tr("E&xit"));
+    quitAction->setShortcut(tr("Ctrl+Q"));
+
+    QMenu *itemsMenu = new QMenu(tr("&Items"));
+
+    QAction *sumItemsAction = itemsMenu->addAction(tr("&Sum Items"));
+    QAction *averageItemsAction = itemsMenu->addAction(tr("&Average Items"));
+
+    menuBar()->addMenu(fileMenu);
+    menuBar()->addMenu(itemsMenu);
+
+    tableWidget = new QTableWidget(12, 3, this);
+    tableWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
+    tableWidget->setDragEnabled(true);
+    tableWidget->setAcceptDrops(true);
+    tableWidget->setDropIndicatorShown(true);
+
+    QTableWidgetItem *valuesHeaderItem = new QTableWidgetItem(tr("Values"));
+    tableWidget->setHorizontalHeaderItem(0, valuesHeaderItem);
+    valuesHeaderItem->setTextAlignment(Qt::AlignVCenter);
+    QTableWidgetItem *squaresHeaderItem = new QTableWidgetItem(tr("Squares"));
+    squaresHeaderItem->setIcon(QIcon(QPixmap(":/Images/squared.png")));
+    squaresHeaderItem->setTextAlignment(Qt::AlignVCenter);
+    QTableWidgetItem *cubesHeaderItem = new QTableWidgetItem(tr("Cubes"));
+    cubesHeaderItem->setIcon(QIcon(QPixmap(":/Images/cubed.png")));
+    cubesHeaderItem->setTextAlignment(Qt::AlignVCenter);
+    tableWidget->setHorizontalHeaderItem(1, squaresHeaderItem);
+    tableWidget->setHorizontalHeaderItem(2, cubesHeaderItem);
+
+    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
+    connect(sumItemsAction, SIGNAL(triggered()), this, SLOT(sumItems()));
+    connect(averageItemsAction, SIGNAL(triggered()), this, SLOT(averageItems()));
+
+    setupTableItems();
+
+    setCentralWidget(tableWidget);
+    setWindowTitle(tr("Table Widget"));
+}
+
+void MainWindow::setupTableItems()
+{
+    for (int row = 0; row < tableWidget->rowCount()-1; ++row) {
+        for (int column = 0; column < tableWidget->columnCount(); ++column) {
+    QTableWidgetItem *newItem = new QTableWidgetItem(tr("%1").arg(
+        pow((float)row, (float)column+1)));
+    tableWidget->setItem(row, column, newItem);
+        }
+    }
+    for (int column = 0; column < tableWidget->columnCount(); ++column) {
+        QTableWidgetItem *newItem = new QTableWidgetItem;
+        newItem->setFlags(Qt::ItemIsEnabled | Qt::ItemIsUserCheckable);
+        tableWidget->setItem(tableWidget->rowCount()-1, column, newItem);
+    }
+}
+
+void MainWindow::averageItems()
+{
+    QList<QTableWidgetItem *> selected = tableWidget->selectedItems();
+    QTableWidgetItem *item;
+    int number = 0;
+    double total = 0;
+
+    foreach (item, selected) {
+        bool ok;
+        double value = item->text().toDouble(&ok);
+        
+        if (ok && !item->text().isEmpty()) {
+            total += value;
+            number++;
+        }
+    }
+    if (number > 0)
+        tableWidget->currentItem()->setText(QString::number(total/number));
+}
+
+void MainWindow::sumItems()
+{
+    QList<QTableWidgetItem *> selected = tableWidget->selectedItems();
+    QTableWidgetItem *item;
+    int number = 0;
+    double total = 0;
+
+    foreach (item, selected) {
+        bool ok;
+        double value = item->text().toDouble(&ok);
+
+        if (ok && !item->text().isEmpty()) {
+            total += value;
+            number++;
+        }
+    }
+    if (number > 0)
+        tableWidget->currentItem()->setText(QString::number(total));
+}
diff --git a/doc/src/snippets/qtablewidget-dnd/mainwindow.h b/doc/src/snippets/qtablewidget-dnd/mainwindow.h
new file mode 100644
index 0000000000..5c955a71aa
--- /dev/null
+++ b/doc/src/snippets/qtablewidget-dnd/mainwindow.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QMainWindow>
+
+class QAction;
+class QTableWidget;
+class QTableWidgetItem;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+public slots:
+    void averageItems();
+    void sumItems();
+
+private:
+    void setupTableItems();
+
+    QAction *removeAction;
+    QTableWidget *tableWidget;
+};
+
+#endif
diff --git a/doc/src/snippets/qtablewidget-dnd/qtablewidget-dnd.pro b/doc/src/snippets/qtablewidget-dnd/qtablewidget-dnd.pro
new file mode 100644
index 0000000000..ffe134cbb6
--- /dev/null
+++ b/doc/src/snippets/qtablewidget-dnd/qtablewidget-dnd.pro
@@ -0,0 +1,4 @@
+SOURCES     = main.cpp \
+              mainwindow.cpp
+HEADERS     = mainwindow.h
+RESOURCES   += images.qrc
diff --git a/doc/src/snippets/qtablewidget-resizing/main.cpp b/doc/src/snippets/qtablewidget-resizing/main.cpp
new file mode 100644
index 0000000000..19c7c203d8
--- /dev/null
+++ b/doc/src/snippets/qtablewidget-resizing/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *window = new MainWindow;
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/qtablewidget-resizing/mainwindow.cpp b/doc/src/snippets/qtablewidget-resizing/mainwindow.cpp
new file mode 100644
index 0000000000..7920998565
--- /dev/null
+++ b/doc/src/snippets/qtablewidget-resizing/mainwindow.cpp
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+MainWindow::MainWindow()
+{
+    QMenu *fileMenu = new QMenu(tr("&File"));
+
+    QAction *quitAction = fileMenu->addAction(tr("E&xit"));
+    quitAction->setShortcut(tr("Ctrl+Q"));
+
+    QMenu *tableMenu = new QMenu(tr("&Table"));
+
+    QAction *tableWidthAction = tableMenu->addAction(tr("Change Table &Width"));
+    QAction *tableHeightAction = tableMenu->addAction(tr("Change Table &Height"));
+
+    menuBar()->addMenu(fileMenu);
+    menuBar()->addMenu(tableMenu);
+
+//! [0]
+    tableWidget = new QTableWidget(this);
+//! [0]
+    tableWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
+
+    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
+    connect(tableWidthAction, SIGNAL(triggered()), this, SLOT(changeWidth()));
+    connect(tableHeightAction, SIGNAL(triggered()), this, SLOT(changeHeight()));
+
+    setupTableItems();
+
+    setCentralWidget(tableWidget);
+    setWindowTitle(tr("Table Widget Resizing"));
+}
+
+void MainWindow::setupTableItems()
+{
+//! [1]
+    tableWidget->setRowCount(10);
+    tableWidget->setColumnCount(5);
+//! [1]
+
+    for (int row = 0; row < tableWidget->rowCount(); ++row) {
+        for (int column = 0; column < tableWidget->columnCount(); ++column) {
+//! [2]
+    QTableWidgetItem *newItem = new QTableWidgetItem(tr("%1").arg(
+        (row+1)*(column+1)));
+    tableWidget->setItem(row, column, newItem);
+//! [2]
+        }
+    }
+}
+
+void MainWindow::changeWidth()
+{
+    bool ok;
+
+    int newWidth = QInputDialog::getInteger(this, tr("Change table width"),
+        tr("Input the number of columns required (1-20):"),
+        tableWidget->columnCount(), 1, 20, 1, &ok);
+
+    if (ok)
+        tableWidget->setColumnCount(newWidth);
+}
+
+void MainWindow::changeHeight()
+{
+    bool ok;
+
+    int newHeight = QInputDialog::getInteger(this, tr("Change table height"),
+        tr("Input the number of rows required (1-20):"),
+        tableWidget->rowCount(), 1, 20, 1, &ok);
+
+    if (ok)
+        tableWidget->setRowCount(newHeight);
+}
diff --git a/doc/src/snippets/qtablewidget-resizing/mainwindow.h b/doc/src/snippets/qtablewidget-resizing/mainwindow.h
new file mode 100644
index 0000000000..5472372503
--- /dev/null
+++ b/doc/src/snippets/qtablewidget-resizing/mainwindow.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QMainWindow>
+
+class QAction;
+class QTableWidget;
+class QTableWidgetItem;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+public slots:
+    void changeHeight();
+    void changeWidth();
+
+private:
+    void setupTableItems();
+
+    QTableWidget *tableWidget;
+};
+
+#endif
diff --git a/doc/src/snippets/qtablewidget-resizing/qtablewidget-resizing.pro b/doc/src/snippets/qtablewidget-resizing/qtablewidget-resizing.pro
new file mode 100644
index 0000000000..12a900a7c6
--- /dev/null
+++ b/doc/src/snippets/qtablewidget-resizing/qtablewidget-resizing.pro
@@ -0,0 +1,3 @@
+SOURCES     = main.cpp \
+              mainwindow.cpp
+HEADERS     = mainwindow.h
diff --git a/doc/src/snippets/qtablewidget-using/Images/cubed.png b/doc/src/snippets/qtablewidget-using/Images/cubed.png
new file mode 100644
index 0000000000..2cd9048ca6
--- /dev/null
+++ b/doc/src/snippets/qtablewidget-using/Images/cubed.png
diff --git a/doc/src/snippets/qtablewidget-using/Images/squared.png b/doc/src/snippets/qtablewidget-using/Images/squared.png
new file mode 100644
index 0000000000..bfdf993289
--- /dev/null
+++ b/doc/src/snippets/qtablewidget-using/Images/squared.png
diff --git a/doc/src/snippets/qtablewidget-using/images.qrc b/doc/src/snippets/qtablewidget-using/images.qrc
new file mode 100644
index 0000000000..1d49b52866
--- /dev/null
+++ b/doc/src/snippets/qtablewidget-using/images.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+   <file>Images/squared.png</file>
+   <file>Images/cubed.png</file>
+</qresource>
+</RCC>
diff --git a/doc/src/snippets/qtablewidget-using/main.cpp b/doc/src/snippets/qtablewidget-using/main.cpp
new file mode 100644
index 0000000000..19c7c203d8
--- /dev/null
+++ b/doc/src/snippets/qtablewidget-using/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *window = new MainWindow;
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/qtablewidget-using/mainwindow.cpp b/doc/src/snippets/qtablewidget-using/mainwindow.cpp
new file mode 100644
index 0000000000..b16ef701b8
--- /dev/null
+++ b/doc/src/snippets/qtablewidget-using/mainwindow.cpp
@@ -0,0 +1,151 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "math.h"
+
+#include "mainwindow.h"
+
+MainWindow::MainWindow()
+{
+    QMenu *fileMenu = new QMenu(tr("&File"));
+
+    QAction *quitAction = fileMenu->addAction(tr("E&xit"));
+    quitAction->setShortcut(tr("Ctrl+Q"));
+
+    QMenu *itemsMenu = new QMenu(tr("&Items"));
+
+    QAction *sumItemsAction = itemsMenu->addAction(tr("&Sum Items"));
+    QAction *averageItemsAction = itemsMenu->addAction(tr("&Average Items"));
+
+    menuBar()->addMenu(fileMenu);
+    menuBar()->addMenu(itemsMenu);
+
+//! [0]
+    tableWidget = new QTableWidget(12, 3, this);
+//! [0]
+    tableWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
+
+//! [1]
+    QTableWidgetItem *valuesHeaderItem = new QTableWidgetItem(tr("Values"));
+    tableWidget->setHorizontalHeaderItem(0, valuesHeaderItem);
+//! [1]
+    valuesHeaderItem->setTextAlignment(Qt::AlignVCenter);
+    QTableWidgetItem *squaresHeaderItem = new QTableWidgetItem(tr("Squares"));
+    squaresHeaderItem->setIcon(QIcon(QPixmap(":/Images/squared.png")));
+    squaresHeaderItem->setTextAlignment(Qt::AlignVCenter);
+//! [2]
+    QTableWidgetItem *cubesHeaderItem = new QTableWidgetItem(tr("Cubes"));
+    cubesHeaderItem->setIcon(QIcon(QPixmap(":/Images/cubed.png")));
+    cubesHeaderItem->setTextAlignment(Qt::AlignVCenter);
+//! [2]
+    tableWidget->setHorizontalHeaderItem(1, squaresHeaderItem);
+    tableWidget->setHorizontalHeaderItem(2, cubesHeaderItem);
+
+    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
+    connect(sumItemsAction, SIGNAL(triggered()), this, SLOT(sumItems()));
+    connect(averageItemsAction, SIGNAL(triggered()), this, SLOT(averageItems()));
+
+    setupTableItems();
+
+    setCentralWidget(tableWidget);
+    setWindowTitle(tr("Table Widget"));
+}
+
+void MainWindow::setupTableItems()
+{
+    for (int row = 0; row < tableWidget->rowCount()-1; ++row) {
+        for (int column = 0; column < tableWidget->columnCount(); ++column) {
+//! [3]
+    QTableWidgetItem *newItem = new QTableWidgetItem(tr("%1").arg(
+        pow(row, column+1)));
+    tableWidget->setItem(row, column, newItem);
+//! [3]
+        }
+    }
+    for (int column = 0; column < tableWidget->columnCount(); ++column) {
+        QTableWidgetItem *newItem = new QTableWidgetItem;
+        newItem->setFlags(Qt::ItemIsEnabled);
+        tableWidget->setItem(tableWidget->rowCount()-1, column, newItem);
+    }
+}
+
+void MainWindow::averageItems()
+{
+    QList<QTableWidgetItem *> selected = tableWidget->selectedItems();
+    QTableWidgetItem *item;
+    int number = 0;
+    double total = 0;
+
+    foreach (item, selected) {
+        bool ok;
+        double value = item->text().toDouble(&ok);
+        
+        if (ok && !item->text().isEmpty()) {
+            total += value;
+            number++;
+        }
+    }
+    if (number > 0)
+        tableWidget->currentItem()->setText(QString::number(total/number));
+}
+
+void MainWindow::sumItems()
+{
+//! [4]
+    QList<QTableWidgetItem *> selected = tableWidget->selectedItems();
+    QTableWidgetItem *item;
+    int number = 0;
+    double total = 0;
+
+    foreach (item, selected) {
+        bool ok;
+        double value = item->text().toDouble(&ok);
+
+        if (ok && !item->text().isEmpty()) {
+            total += value;
+            number++;
+        }
+    }
+//! [4]
+    if (number > 0)
+        tableWidget->currentItem()->setText(QString::number(total));
+}
diff --git a/doc/src/snippets/qtablewidget-using/mainwindow.h b/doc/src/snippets/qtablewidget-using/mainwindow.h
new file mode 100644
index 0000000000..fb18e3368e
--- /dev/null
+++ b/doc/src/snippets/qtablewidget-using/mainwindow.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QMainWindow>
+
+class QAction;
+class QTableWidget;
+class QTableWidgetItem;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+public slots:
+    void averageItems();
+    void sumItems();
+
+private:
+    void setupTableItems();
+
+    QAction *removeAction;
+//! [0]
+    QTableWidget *tableWidget;
+//! [0]
+};
+
+#endif
diff --git a/doc/src/snippets/qtablewidget-using/qtablewidget-using.pro b/doc/src/snippets/qtablewidget-using/qtablewidget-using.pro
new file mode 100644
index 0000000000..ffe134cbb6
--- /dev/null
+++ b/doc/src/snippets/qtablewidget-using/qtablewidget-using.pro
@@ -0,0 +1,4 @@
+SOURCES     = main.cpp \
+              mainwindow.cpp
+HEADERS     = mainwindow.h
+RESOURCES   += images.qrc
diff --git a/doc/src/snippets/qtcast/qtcast.cpp b/doc/src/snippets/qtcast/qtcast.cpp
new file mode 100644
index 0000000000..2294bb7f97
--- /dev/null
+++ b/doc/src/snippets/qtcast/qtcast.cpp
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QLabel>
+#include <QPushButton>
+
+#include "qtcast.h"
+
+MyWidget::MyWidget()
+{
+//! [0]
+    QObject *obj = new MyWidget;
+//! [0]
+
+//! [1]
+    QWidget *widget = qobject_cast<QWidget *>(obj);
+//! [1]
+
+//! [2]
+    MyWidget *myWidget = qobject_cast<MyWidget *>(obj);
+//! [2]
+
+//! [3]
+    QLabel *label = qobject_cast<QLabel *>(obj);
+//! [3] //! [4]
+    // label is 0
+//! [4]
+
+//! [5]
+    if (QLabel *label = qobject_cast<QLabel *>(obj)) {
+//! [5] //! [6]
+        label->setText(tr("Ping"));
+    } else if (QPushButton *button = qobject_cast<QPushButton *>(obj)) {
+        button->setText(tr("Pong!"));
+    }
+//! [6]
+}
+
+int main()
+{
+    return 0;
+}
diff --git a/doc/src/snippets/qtcast/qtcast.h b/doc/src/snippets/qtcast/qtcast.h
new file mode 100644
index 0000000000..ee43b14272
--- /dev/null
+++ b/doc/src/snippets/qtcast/qtcast.h
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTCAST_H
+#define QTCAST_H
+
+#include <QWidget>
+
+class MyWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    MyWidget();
+};
+
+#endif
diff --git a/doc/src/snippets/qtcast/qtcast.pro b/doc/src/snippets/qtcast/qtcast.pro
new file mode 100644
index 0000000000..6476162794
--- /dev/null
+++ b/doc/src/snippets/qtcast/qtcast.pro
@@ -0,0 +1,2 @@
+HEADERS     = qtcast.h
+SOURCES     = qtcast.cpp
diff --git a/doc/src/snippets/qtest-namespace/main.cpp b/doc/src/snippets/qtest-namespace/main.cpp
new file mode 100644
index 0000000000..51d6560d0a
--- /dev/null
+++ b/doc/src/snippets/qtest-namespace/main.cpp
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QTest>
+
+int main(int argc, char *argv[])
+{
+    QTest::qSleep(10);
+    return 0;
+}
diff --git a/doc/src/snippets/qtest-namespace/qtest-namespace.pro b/doc/src/snippets/qtest-namespace/qtest-namespace.pro
new file mode 100644
index 0000000000..0dfaf99de3
--- /dev/null
+++ b/doc/src/snippets/qtest-namespace/qtest-namespace.pro
@@ -0,0 +1,2 @@
+SOURCES = main.cpp
+CONFIG += qtestlib
diff --git a/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp b/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp
new file mode 100644
index 0000000000..a02f37365b
--- /dev/null
+++ b/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp
@@ -0,0 +1,147 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of an example program for Qt.
+** EDITIONS: NOLIMITS
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "dragdropmodel.h"
+
+DragDropModel::DragDropModel(const QStringList &strings, QObject *parent)
+    : TreeModel(strings, parent)
+{
+}
+
+bool DragDropModel::dropMimeData(const QMimeData *data,
+    Qt::DropAction action, int row, int column, const QModelIndex &parent)
+{
+    if (action == Qt::IgnoreAction)
+        return true;
+
+    if (!data->hasFormat("text/plain"))
+        return false;
+
+    int beginRow;
+
+    if (row != -1)
+        beginRow = row;
+    else if (parent.isValid())
+        beginRow = 0;
+    else
+        beginRow = rowCount(QModelIndex());
+
+    QByteArray encodedData = data->data("text/plain");
+    QDataStream stream(&encodedData, QIODevice::ReadOnly);
+    QHash<qint64, QMap<int,QHash<int,QString> > > newItems;
+
+    while (!stream.atEnd()) {
+        qint64 id;
+        int row;
+        int column;
+        QString text;
+        stream >> id >> row >> column >> text;
+        newItems[id][row][column] = text;
+    }
+    int rows = newItems.count();
+
+    insertRows(beginRow, rows, parent);
+    QMap<int,QHash<int,QString> > childItems;
+    foreach (childItems, newItems.values()) {
+        QHash<int,QString> rowItems;
+        foreach (rowItems, childItems.values()) {
+            foreach (int column, rowItems.keys()) {
+                QModelIndex idx = index(beginRow, column, parent);
+                setData(idx, rowItems[column]);
+            }
+            ++beginRow;
+        }
+    }
+
+    return true;
+}
+
+Qt::ItemFlags DragDropModel::flags(const QModelIndex &index) const
+{
+    Qt::ItemFlags defaultFlags = TreeModel::flags(index);
+
+    if (index.isValid())
+        return Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | defaultFlags;
+    else
+        return Qt::ItemIsDropEnabled | defaultFlags;
+}
+
+QMimeData *DragDropModel::mimeData(const QModelIndexList &indexes) const
+{
+    QMimeData *mimeData = new QMimeData();
+    QByteArray encodedData;
+
+    QDataStream stream(&encodedData, QIODevice::WriteOnly);
+
+    foreach (QModelIndex index, indexes) {
+        if (index.isValid()) {
+            QString text = data(index, Qt::DisplayRole).toString();
+            stream << index.internalId() << index.row() << index.column() << text;
+        }
+    }
+
+    mimeData->setData("text/plain", encodedData);
+    return mimeData;
+}
+
+QStringList DragDropModel::mimeTypes() const
+{
+    QStringList types;
+    types << "text/plain";
+    return types;
+}
+
+Qt::DropActions DragDropModel::supportedDropActions() const
+{
+    return Qt::CopyAction | Qt::MoveAction;
+}
diff --git a/doc/src/snippets/qtreeview-dnd/dragdropmodel.h b/doc/src/snippets/qtreeview-dnd/dragdropmodel.h
new file mode 100644
index 0000000000..b8cef91730
--- /dev/null
+++ b/doc/src/snippets/qtreeview-dnd/dragdropmodel.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of an example program for Qt.
+** EDITIONS: NOLIMITS
+**
+****************************************************************************/
+
+#ifndef DRAGDROPMODEL_H
+#define DRAGDROPMODEL_H
+
+#include "treemodel.h"
+
+class DragDropModel : public TreeModel
+{
+    Q_OBJECT
+
+public:
+    DragDropModel(const QStringList &strings, QObject *parent = 0);
+
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+
+    bool dropMimeData(const QMimeData *data, Qt::DropAction action,
+                      int row, int column, const QModelIndex &parent);
+    QMimeData *mimeData(const QModelIndexList &indexes) const;
+    QStringList mimeTypes() const;
+    Qt::DropActions supportedDropActions() const;
+};
+
+#endif
diff --git a/doc/src/snippets/qtreeview-dnd/main.cpp b/doc/src/snippets/qtreeview-dnd/main.cpp
new file mode 100644
index 0000000000..19c7c203d8
--- /dev/null
+++ b/doc/src/snippets/qtreeview-dnd/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *window = new MainWindow;
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/qtreeview-dnd/mainwindow.cpp b/doc/src/snippets/qtreeview-dnd/mainwindow.cpp
new file mode 100644
index 0000000000..f98333fd33
--- /dev/null
+++ b/doc/src/snippets/qtreeview-dnd/mainwindow.cpp
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+#include "dragdropmodel.h"
+
+MainWindow::MainWindow()
+{
+    QMenu *fileMenu = new QMenu(tr("&File"));
+
+    QAction *quitAction = fileMenu->addAction(tr("E&xit"));
+    quitAction->setShortcut(tr("Ctrl+Q"));
+
+    menuBar()->addMenu(fileMenu);
+
+//  For convenient quoting:
+    QTreeView *treeView = new QTreeView(this);
+    treeView->setSelectionMode(QAbstractItemView::ExtendedSelection);
+    treeView->setDragEnabled(true);
+    treeView->setAcceptDrops(true);
+    treeView->setDropIndicatorShown(true);
+
+    this->treeView = treeView;
+
+    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
+
+    setupItems();
+
+    setCentralWidget(treeView);
+    setWindowTitle(tr("Tree View"));
+}
+
+void MainWindow::setupItems()
+{
+    QStringList items;
+    items << tr("Widgets\tUser interface objects used to create GUI applications.")
+          << tr("  QWidget\tThe basic building block for all other widgets.")
+          << tr("  QDialog\tThe base class for dialog windows.")
+          << tr("Tools\tUtilities and applications for Qt developers.")
+          << tr("  Qt Designer\tA GUI form designer for Qt applications.")
+          << tr("  Qt Assistant\tA documentation browser for Qt documentation.");
+
+    DragDropModel *model = new DragDropModel(items, this);
+    QModelIndex index = model->index(0, 0, QModelIndex());
+    model->insertRows(2, 3, index);
+    index = model->index(0, 0, QModelIndex());
+    index = model->index(2, 0, index);
+    model->setData(index, QVariant("QFrame"));
+    model->removeRows(3, 2, index.parent());
+    treeView->setModel(model);
+}
diff --git a/doc/src/snippets/qtreeview-dnd/mainwindow.h b/doc/src/snippets/qtreeview-dnd/mainwindow.h
new file mode 100644
index 0000000000..ca0d9476d0
--- /dev/null
+++ b/doc/src/snippets/qtreeview-dnd/mainwindow.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QMainWindow>
+
+class QTreeView;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+private:
+    void setupItems();
+
+    QTreeView *treeView;
+};
+
+#endif
diff --git a/doc/src/snippets/qtreeview-dnd/qtreeview-dnd.pro b/doc/src/snippets/qtreeview-dnd/qtreeview-dnd.pro
new file mode 100644
index 0000000000..5dfabfc83d
--- /dev/null
+++ b/doc/src/snippets/qtreeview-dnd/qtreeview-dnd.pro
@@ -0,0 +1,9 @@
+SOURCES     = dragdropmodel.cpp \
+              main.cpp \
+              mainwindow.cpp \
+              treeitem.cpp \
+              treemodel.cpp
+HEADERS     = dragdropmodel.h \
+              mainwindow.h \
+              treeitem.h \
+              treemodel.h
diff --git a/doc/src/snippets/qtreeview-dnd/treeitem.cpp b/doc/src/snippets/qtreeview-dnd/treeitem.cpp
new file mode 100644
index 0000000000..99ce09a481
--- /dev/null
+++ b/doc/src/snippets/qtreeview-dnd/treeitem.cpp
@@ -0,0 +1,126 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+    treeitem.cpp
+
+    A container for items of data supplied by the simple tree model.
+*/
+
+#include <QStringList>
+
+#include "treeitem.h"
+
+TreeItem::TreeItem(const QList<QVariant> &data, TreeItem *parent)
+{
+    parentItem = parent;
+    itemData = data;
+}
+
+TreeItem::~TreeItem()
+{
+    qDeleteAll(childItems);
+}
+
+void TreeItem::appendChild(TreeItem *item)
+{
+    childItems.append(item);
+}
+
+TreeItem *TreeItem::child(int row)
+{
+    return childItems.value(row);
+}
+
+int TreeItem::childCount() const
+{
+    return childItems.count();
+}
+
+int TreeItem::columnCount() const
+{
+    return itemData.count();
+}
+
+QVariant TreeItem::data(int column) const
+{
+    return itemData.value(column);
+}
+
+bool TreeItem::insertChild(int row, TreeItem *item)
+{
+    if (row < 0 || row > childItems.count())
+        return false;
+
+    childItems.insert(row, item);
+    return true;
+}
+
+TreeItem *TreeItem::parent()
+{
+    return parentItem;
+}
+
+bool TreeItem::removeChild(int row)
+{
+    if (row < 0 || row >= childItems.count())
+        return false;
+
+    delete childItems.takeAt(row);
+    return true;
+}
+
+int TreeItem::row() const
+{
+    if (parentItem)
+        return parentItem->childItems.indexOf(const_cast<TreeItem*>(this));
+
+    return 0;
+}
+
+bool TreeItem::setData(int column, const QVariant &data)
+{
+    if (column < 0 || column >= itemData.count())
+        return false;
+
+    itemData.replace(column, data);
+    return true;
+}
diff --git a/doc/src/snippets/qtreeview-dnd/treeitem.h b/doc/src/snippets/qtreeview-dnd/treeitem.h
new file mode 100644
index 0000000000..84116ba797
--- /dev/null
+++ b/doc/src/snippets/qtreeview-dnd/treeitem.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TREEITEM_H
+#define TREEITEM_H
+
+#include <QList>
+#include <QVariant>
+
+class TreeItem
+{
+public:
+    TreeItem(const QList<QVariant> &data, TreeItem *parent = 0);
+    ~TreeItem();
+
+    void appendChild(TreeItem *child);
+
+    TreeItem *child(int row);
+    int childCount() const;
+    int columnCount() const;
+    QVariant data(int column) const;
+    bool insertChild(int row, TreeItem *item);
+    TreeItem *parent();
+    bool removeChild(int row);
+    int row() const;
+    bool setData(int column, const QVariant &data);
+
+private:
+    QList<TreeItem*> childItems;
+    QList<QVariant> itemData;
+    TreeItem *parentItem;
+};
+
+#endif
diff --git a/doc/src/snippets/qtreeview-dnd/treemodel.cpp b/doc/src/snippets/qtreeview-dnd/treemodel.cpp
new file mode 100644
index 0000000000..0fd0682b8c
--- /dev/null
+++ b/doc/src/snippets/qtreeview-dnd/treemodel.cpp
@@ -0,0 +1,263 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+    treemodel.cpp
+
+    Provides a simple tree model to show how to create and use hierarchical
+    models.
+*/
+
+#include <QtGui>
+
+#include "treeitem.h"
+#include "treemodel.h"
+
+TreeModel::TreeModel(const QStringList &strings, QObject *parent)
+    : QAbstractItemModel(parent)
+{
+    QList<QVariant> rootData;
+    rootData << "Title" << "Summary";
+    rootItem = new TreeItem(rootData);
+    setupModelData(strings, rootItem);
+}
+
+TreeModel::~TreeModel()
+{
+    delete rootItem;
+}
+
+int TreeModel::columnCount(const QModelIndex &parent) const
+{
+    if (parent.isValid())
+        return static_cast<TreeItem*>(parent.internalPointer())->columnCount();
+    else
+        return rootItem->columnCount();
+}
+
+QVariant TreeModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+
+    if (role != Qt::DisplayRole)
+        return QVariant();
+
+    TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
+
+    return item->data(index.column());
+}
+
+Qt::ItemFlags TreeModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return Qt::ItemIsEnabled;
+
+    return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+}
+
+QVariant TreeModel::headerData(int section, Qt::Orientation orientation,
+                               int role) const
+{
+    if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
+        return rootItem->data(section);
+
+    return QVariant();
+}
+
+QModelIndex TreeModel::index(int row, int column, const QModelIndex &parent)
+            const
+{
+    TreeItem *parentItem;
+
+    if (!parent.isValid())
+        parentItem = rootItem;
+    else
+        parentItem = static_cast<TreeItem*>(parent.internalPointer());
+
+    TreeItem *childItem = parentItem->child(row);
+    if (childItem)
+        return createIndex(row, column, childItem);
+    else
+        return QModelIndex();
+}
+
+bool TreeModel::insertRows(int position, int rows, const QModelIndex &parent)
+{
+    TreeItem *parentItem;
+
+    if (!parent.isValid())
+        parentItem = rootItem;
+    else
+        parentItem = static_cast<TreeItem*>(parent.internalPointer());
+
+    if (position < 0 || position > parentItem->childCount())
+        return false;
+
+    QList<QVariant> blankList;
+    for (int column = 0; column < columnCount(); ++column)
+        blankList << QVariant("");
+
+    beginInsertRows(parent, position, position + rows - 1);
+
+    for (int row = 0; row < rows; ++row) {
+        TreeItem *newItem = new TreeItem(blankList, parentItem);
+        if (!parentItem->insertChild(position, newItem))
+            break;
+    }
+
+    endInsertRows();
+    return true;
+}
+
+QModelIndex TreeModel::parent(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return QModelIndex();
+
+    TreeItem *childItem = static_cast<TreeItem*>(index.internalPointer());
+    TreeItem *parentItem = childItem->parent();
+
+    if (parentItem == rootItem)
+        return QModelIndex();
+
+    return createIndex(parentItem->row(), 0, parentItem);
+}
+
+bool TreeModel::removeRows(int position, int rows, const QModelIndex &parent)
+{
+    TreeItem *parentItem;
+
+    if (!parent.isValid())
+        parentItem = rootItem;
+    else
+        parentItem = static_cast<TreeItem*>(parent.internalPointer());
+
+    if (position < 0 || position > parentItem->childCount())
+        return false;
+
+    beginRemoveRows(parent, position, position + rows - 1);
+
+    for (int row = 0; row < rows; ++row) {
+        if (!parentItem->removeChild(position))
+            break;
+    }
+
+    endRemoveRows();
+    return true;
+}
+
+int TreeModel::rowCount(const QModelIndex &parent) const
+{
+    TreeItem *parentItem;
+
+    if (!parent.isValid())
+        parentItem = rootItem;
+    else
+        parentItem = static_cast<TreeItem*>(parent.internalPointer());
+
+    return parentItem->childCount();
+}
+
+bool TreeModel::setData(const QModelIndex &index,
+                        const QVariant &value, int role)
+{
+    if (!index.isValid() || role != Qt::EditRole)
+        return false;
+
+    TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
+
+    if (item->setData(index.column(), value))
+        emit dataChanged(index, index);
+    else
+        return false;
+
+    return true;
+}
+
+void TreeModel::setupModelData(const QStringList &lines, TreeItem *parent)
+{
+    QList<TreeItem*> parents;
+    QList<int> indentations;
+    parents << parent;
+    indentations << 0;
+
+    int number = 0;
+
+    while (number < lines.count()) {
+        int position = 0;
+        while (position < lines[number].length()) {
+            if (lines[number].mid(position, 1) != " ")
+                break;
+            position++;
+        }
+
+        QString lineData = lines[number].mid(position).trimmed();
+
+        if (!lineData.isEmpty()) {
+            // Read the column data from the rest of the line.
+            QStringList columnStrings = lineData.split("\t", QString::SkipEmptyParts);
+            QList<QVariant> columnData;
+            for (int column = 0; column < columnStrings.count(); ++column)
+                columnData << columnStrings[column];
+
+            if (position > indentations.last()) {
+                // The last child of the current parent is now the new parent
+                // unless the current parent has no children.
+
+                if (parents.last()->childCount() > 0) {
+                    parents << parents.last()->child(parents.last()->childCount()-1);
+                    indentations << position;
+                }
+            } else {
+                while (position < indentations.last() && parents.count() > 0) {
+                    parents.pop_back();
+                    indentations.pop_back();
+                }
+            }
+
+            // Append a new item to the current parent's list of children.
+            parents.last()->appendChild(new TreeItem(columnData, parents.last()));
+        }
+
+        number++;
+    }
+}
diff --git a/doc/src/snippets/qtreeview-dnd/treemodel.h b/doc/src/snippets/qtreeview-dnd/treemodel.h
new file mode 100644
index 0000000000..e0a45b3d50
--- /dev/null
+++ b/doc/src/snippets/qtreeview-dnd/treemodel.h
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TREEMODEL_H
+#define TREEMODEL_H
+
+#include <QAbstractItemModel>
+#include <QModelIndex>
+#include <QVariant>
+
+class TreeItem;
+
+class TreeModel : public QAbstractItemModel
+{
+    Q_OBJECT
+
+public:
+    TreeModel(const QStringList &strings, QObject *parent = 0);
+    ~TreeModel();
+
+    QVariant data(const QModelIndex &index, int role) const;
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+    QVariant headerData(int section, Qt::Orientation orientation,
+                        int role = Qt::DisplayRole) const;
+    QModelIndex index(int row, int column,
+                      const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex parent(const QModelIndex &index) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+
+    bool insertRows(int position, int rows, const QModelIndex &parent = QModelIndex());
+    bool removeRows(int position, int rows, const QModelIndex &parent = QModelIndex());
+    bool setData(const QModelIndex &index, const QVariant &value,
+                 int role = Qt::EditRole);
+
+private:
+    void setupModelData(const QStringList &lines, TreeItem *parent);
+
+    TreeItem *rootItem;
+};
+
+#endif
diff --git a/doc/src/snippets/qtreewidget-using/main.cpp b/doc/src/snippets/qtreewidget-using/main.cpp
new file mode 100644
index 0000000000..19c7c203d8
--- /dev/null
+++ b/doc/src/snippets/qtreewidget-using/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *window = new MainWindow;
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/qtreewidget-using/mainwindow.cpp b/doc/src/snippets/qtreewidget-using/mainwindow.cpp
new file mode 100644
index 0000000000..68ab54bc98
--- /dev/null
+++ b/doc/src/snippets/qtreewidget-using/mainwindow.cpp
@@ -0,0 +1,231 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+MainWindow::MainWindow()
+{
+    QMenu *fileMenu = new QMenu(tr("&File"));
+
+    QAction *quitAction = fileMenu->addAction(tr("E&xit"));
+    quitAction->setShortcut(tr("Ctrl+Q"));
+
+    QMenu *itemsMenu = new QMenu(tr("&Items"));
+
+    insertAction = itemsMenu->addAction(tr("&Insert Item"));
+    removeAction = itemsMenu->addAction(tr("&Remove Item"));
+    removeAction->setEnabled(false);
+    itemsMenu->addSeparator();
+    ascendingAction = itemsMenu->addAction(tr("Sort in &Ascending Order"));
+    descendingAction = itemsMenu->addAction(tr("Sort in &Descending Order"));
+    autoSortAction = itemsMenu->addAction(tr("&Automatically Sort Items"));
+    autoSortAction->setCheckable(true);
+    itemsMenu->addSeparator();
+    QAction *findItemsAction = itemsMenu->addAction(tr("&Find Items"));
+    findItemsAction->setShortcut(tr("Ctrl+F"));
+
+    menuBar()->addMenu(fileMenu);
+    menuBar()->addMenu(itemsMenu);
+
+/*  For convenient quoting:
+//! [0]
+    QTreeWidget *treeWidget = new QTreeWidget(this);
+//! [0]
+*/
+    treeWidget = new QTreeWidget(this);
+//! [1]
+    treeWidget->setColumnCount(2);
+//! [1] //! [2]
+    QStringList headers;
+    headers << tr("Subject") << tr("Default");
+    treeWidget->setHeaderLabels(headers);
+//! [2]
+
+    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
+    connect(ascendingAction, SIGNAL(triggered()), this, SLOT(sortAscending()));
+    connect(autoSortAction, SIGNAL(triggered()), this, SLOT(updateSortItems()));
+    connect(descendingAction, SIGNAL(triggered()), this, SLOT(sortDescending()));
+    connect(findItemsAction, SIGNAL(triggered()), this, SLOT(findItems()));
+    connect(insertAction, SIGNAL(triggered()), this, SLOT(insertItem()));
+    connect(removeAction, SIGNAL(triggered()), this, SLOT(removeItem()));
+    connect(treeWidget,
+            SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)),
+            this, SLOT(updateMenus(QTreeWidgetItem *)));
+
+    setupTreeItems();
+    updateMenus(treeWidget->currentItem());
+
+    setCentralWidget(treeWidget);
+    setWindowTitle(tr("Tree Widget"));
+}
+
+void MainWindow::setupTreeItems()
+{
+//! [3]
+    QTreeWidgetItem *cities = new QTreeWidgetItem(treeWidget);
+    cities->setText(0, tr("Cities"));
+    QTreeWidgetItem *osloItem = new QTreeWidgetItem(cities);
+    osloItem->setText(0, tr("Oslo"));
+    osloItem->setText(1, tr("Yes"));
+//! [3]
+
+    (new QTreeWidgetItem(cities))->setText(0, tr("Stockholm"));
+    (new QTreeWidgetItem(cities))->setText(0, tr("Helsinki"));
+    (new QTreeWidgetItem(cities))->setText(0, tr("Copenhagen"));
+
+//! [4] //! [5]
+    QTreeWidgetItem *planets = new QTreeWidgetItem(treeWidget, cities);
+//! [4]
+    planets->setText(0, tr("Planets"));
+//! [5]
+    (new QTreeWidgetItem(planets))->setText(0, tr("Mercury"));
+    (new QTreeWidgetItem(planets))->setText(0, tr("Venus"));
+
+    QTreeWidgetItem *earthItem = new QTreeWidgetItem(planets);
+    earthItem->setText(0, tr("Earth"));
+    earthItem->setText(1, tr("Yes"));
+
+    (new QTreeWidgetItem(planets))->setText(0, tr("Mars"));
+    (new QTreeWidgetItem(planets))->setText(0, tr("Jupiter"));
+    (new QTreeWidgetItem(planets))->setText(0, tr("Saturn"));
+    (new QTreeWidgetItem(planets))->setText(0, tr("Uranus"));
+    (new QTreeWidgetItem(planets))->setText(0, tr("Neptune"));
+    (new QTreeWidgetItem(planets))->setText(0, tr("Pluto"));
+}
+
+void MainWindow::findItems()
+{
+    QString itemText = QInputDialog::getText(this, tr("Find Items"),
+        tr("Text to find (including wildcards):"));
+
+    if (itemText.isEmpty())
+        return;
+
+//! [6]
+    QTreeWidgetItem *item;
+//! [6]
+    foreach (item, treeWidget->selectedItems())
+        treeWidget->setItemSelected(item, false);
+
+//! [7]
+    QList<QTreeWidgetItem *> found = treeWidget->findItems(
+        itemText, Qt::MatchWildcard);
+
+    foreach (item, found) {
+        treeWidget->setItemSelected(item, true);
+        // Show the item->text(0) for each item.
+    }
+//! [7]
+}
+
+void MainWindow::insertItem()
+{
+    QTreeWidgetItem *currentItem = treeWidget->currentItem();
+
+    if (!currentItem)
+        return;
+
+    QString itemText = QInputDialog::getText(this, tr("Insert Item"),
+        tr("Input text for the new item:"));
+
+    if (itemText.isEmpty())
+        return;
+
+//! [8]
+    QTreeWidgetItem *parent = currentItem->parent();
+    QTreeWidgetItem *newItem;
+    if (parent)
+        newItem = new QTreeWidgetItem(parent, treeWidget->currentItem());
+    else
+//! [8] //! [9]
+        newItem = new QTreeWidgetItem(treeWidget, treeWidget->currentItem());
+//! [9]
+
+    newItem->setText(0, itemText);
+}
+
+void MainWindow::removeItem()
+{
+    QTreeWidgetItem *currentItem = treeWidget->currentItem();
+
+    if (!currentItem)
+        return;
+
+//! [10]
+    QTreeWidgetItem *parent = currentItem->parent();
+    int index;
+
+    if (parent) {
+        index = parent->indexOfChild(treeWidget->currentItem());
+        delete parent->takeChild(index);
+    } else {
+        index = treeWidget->indexOfTopLevelItem(treeWidget->currentItem());
+        delete treeWidget->takeTopLevelItem(index);
+//! [10] //! [11]
+    }
+//! [11]
+}
+
+void MainWindow::sortAscending()
+{
+    treeWidget->sortItems(0, Qt::AscendingOrder);
+}
+
+void MainWindow::sortDescending()
+{
+    treeWidget->sortItems(0, Qt::DescendingOrder);
+}
+
+void MainWindow::updateMenus(QTreeWidgetItem *current)
+{
+    insertAction->setEnabled(current != 0);
+    removeAction->setEnabled(current != 0);
+}
+
+void MainWindow::updateSortItems()
+{
+    ascendingAction->setEnabled(!autoSortAction->isChecked());
+    descendingAction->setEnabled(!autoSortAction->isChecked());
+
+    treeWidget->setSortingEnabled(autoSortAction->isChecked());
+}
diff --git a/doc/src/snippets/qtreewidget-using/mainwindow.h b/doc/src/snippets/qtreewidget-using/mainwindow.h
new file mode 100644
index 0000000000..4ffb9f314b
--- /dev/null
+++ b/doc/src/snippets/qtreewidget-using/mainwindow.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QMainWindow>
+
+class QAction;
+class QTreeWidget;
+class QTreeWidgetItem;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+public slots:
+    void findItems();
+    void insertItem();
+    void removeItem();
+    void sortAscending();
+    void sortDescending();
+    void updateMenus(QTreeWidgetItem *current);
+    void updateSortItems();
+
+private:
+    void setupTreeItems();
+
+    QAction *ascendingAction;
+    QAction *autoSortAction;
+    QAction *descendingAction;
+    QAction *insertAction;
+    QAction *removeAction;
+    QTreeWidget *treeWidget;
+};
+
+#endif
diff --git a/doc/src/snippets/qtreewidget-using/qtreewidget-using.pro b/doc/src/snippets/qtreewidget-using/qtreewidget-using.pro
new file mode 100644
index 0000000000..12a900a7c6
--- /dev/null
+++ b/doc/src/snippets/qtreewidget-using/qtreewidget-using.pro
@@ -0,0 +1,3 @@
+SOURCES     = main.cpp \
+              mainwindow.cpp
+HEADERS     = mainwindow.h
diff --git a/doc/src/snippets/qtreewidgetitemiterator-using/main.cpp b/doc/src/snippets/qtreewidgetitemiterator-using/main.cpp
new file mode 100644
index 0000000000..19c7c203d8
--- /dev/null
+++ b/doc/src/snippets/qtreewidgetitemiterator-using/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *window = new MainWindow;
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.cpp b/doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.cpp
new file mode 100644
index 0000000000..d3f3c39cde
--- /dev/null
+++ b/doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.cpp
@@ -0,0 +1,198 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+MainWindow::MainWindow()
+{
+    QMenu *fileMenu = new QMenu(tr("&File"));
+
+    QAction *quitAction = fileMenu->addAction(tr("E&xit"));
+    quitAction->setShortcut(tr("Ctrl+Q"));
+
+    QMenu *itemsMenu = new QMenu(tr("&Items"));
+
+    insertAction = itemsMenu->addAction(tr("&Insert Item"));
+    removeAction = itemsMenu->addAction(tr("&Remove Item"));
+    removeAction->setEnabled(false);
+    itemsMenu->addSeparator();
+    ascendingAction = itemsMenu->addAction(tr("Sort in &Ascending Order"));
+    descendingAction = itemsMenu->addAction(tr("Sort in &Descending Order"));
+    autoSortAction = itemsMenu->addAction(tr("&Automatically Sort Items"));
+    autoSortAction->setCheckable(true);
+    itemsMenu->addSeparator();
+    QAction *findItemsAction = itemsMenu->addAction(tr("&Find Items"));
+    findItemsAction->setShortcut(tr("Ctrl+F"));
+
+    menuBar()->addMenu(fileMenu);
+    menuBar()->addMenu(itemsMenu);
+
+/*  For convenient quoting:
+    QTreeWidget *treeWidget = new QTreeWidget(this);
+*/
+    treeWidget = new QTreeWidget(this);
+    treeWidget->setColumnCount(2);
+    QStringList headers;
+    headers << tr("Subject") << tr("Default");
+    treeWidget->setHeaderLabels(headers);
+
+    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
+    connect(ascendingAction, SIGNAL(triggered()), this, SLOT(sortAscending()));
+    connect(autoSortAction, SIGNAL(triggered()), this, SLOT(updateSortItems()));
+    connect(descendingAction, SIGNAL(triggered()), this, SLOT(sortDescending()));
+    connect(findItemsAction, SIGNAL(triggered()), this, SLOT(findItems()));
+    connect(insertAction, SIGNAL(triggered()), this, SLOT(insertItem()));
+    connect(removeAction, SIGNAL(triggered()), this, SLOT(removeItem()));
+    connect(treeWidget,
+            SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)),
+            this, SLOT(updateMenus(QTreeWidgetItem *)));
+
+    setupTreeItems();
+    updateMenus(treeWidget->currentItem());
+
+    setCentralWidget(treeWidget);
+    setWindowTitle(tr("Tree Widget"));
+}
+
+void MainWindow::setupTreeItems()
+{
+    QTreeWidgetItem *planets = new QTreeWidgetItem(treeWidget);
+    planets->setText(0, tr("Planets"));
+    (new QTreeWidgetItem(planets))->setText(0, tr("Mercury"));
+    (new QTreeWidgetItem(planets))->setText(0, tr("Venus"));
+
+    QTreeWidgetItem *earthItem = new QTreeWidgetItem(planets);
+    earthItem->setText(0, tr("Earth"));
+    earthItem->setText(1, tr("Yes"));
+
+    (new QTreeWidgetItem(planets))->setText(0, tr("Mars"));
+    (new QTreeWidgetItem(planets))->setText(0, tr("Jupiter"));
+    (new QTreeWidgetItem(planets))->setText(0, tr("Saturn"));
+    (new QTreeWidgetItem(planets))->setText(0, tr("Uranus"));
+    (new QTreeWidgetItem(planets))->setText(0, tr("Neptune"));
+    (new QTreeWidgetItem(planets))->setText(0, tr("Pluto"));
+}
+
+void MainWindow::findItems()
+{
+    QString itemText = QInputDialog::getText(this, tr("Find Items"),
+        tr("Text to find:"));
+
+    if (itemText.isEmpty())
+        return;
+
+//! [0]
+    QTreeWidgetItemIterator it(treeWidget);
+    while (*it) {
+        if ((*it)->text(0) == itemText)
+            (*it)->setSelected(true);
+        ++it;
+    }
+//! [0]
+}
+
+void MainWindow::insertItem()
+{
+    QTreeWidgetItem *currentItem = treeWidget->currentItem();
+
+    if (!currentItem)
+        return;
+
+    QString itemText = QInputDialog::getText(this, tr("Insert Item"),
+        tr("Input text for the new item:"));
+
+    if (itemText.isEmpty())
+        return;
+
+    QTreeWidgetItem *parent = currentItem->parent();
+    QTreeWidgetItem *newItem;
+    if (parent)
+        newItem = new QTreeWidgetItem(parent, treeWidget->currentItem());
+    else
+        newItem = new QTreeWidgetItem(treeWidget, treeWidget->currentItem());
+
+    newItem->setText(0, itemText);
+}
+
+void MainWindow::removeItem()
+{
+    QTreeWidgetItem *currentItem = treeWidget->currentItem();
+
+    if (!currentItem)
+        return;
+
+    QTreeWidgetItem *parent = currentItem->parent();
+    int index;
+
+    if (parent) {
+        index = parent->indexOfChild(treeWidget->currentItem());
+        delete parent->takeChild(index);
+    } else {
+        index = treeWidget->indexOfTopLevelItem(treeWidget->currentItem());
+        delete treeWidget->takeTopLevelItem(index);
+    }
+}
+
+void MainWindow::sortAscending()
+{
+    treeWidget->sortItems(0, Qt::AscendingOrder);
+}
+
+void MainWindow::sortDescending()
+{
+    treeWidget->sortItems(0, Qt::DescendingOrder);
+}
+
+void MainWindow::updateMenus(QTreeWidgetItem *current)
+{
+    insertAction->setEnabled(current != 0);
+    removeAction->setEnabled(current != 0);
+}
+
+void MainWindow::updateSortItems()
+{
+    ascendingAction->setEnabled(!autoSortAction->isChecked());
+    descendingAction->setEnabled(!autoSortAction->isChecked());
+
+    treeWidget->setSortingEnabled(autoSortAction->isChecked());
+}
diff --git a/doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.h b/doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.h
new file mode 100644
index 0000000000..4ffb9f314b
--- /dev/null
+++ b/doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QMainWindow>
+
+class QAction;
+class QTreeWidget;
+class QTreeWidgetItem;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+public slots:
+    void findItems();
+    void insertItem();
+    void removeItem();
+    void sortAscending();
+    void sortDescending();
+    void updateMenus(QTreeWidgetItem *current);
+    void updateSortItems();
+
+private:
+    void setupTreeItems();
+
+    QAction *ascendingAction;
+    QAction *autoSortAction;
+    QAction *descendingAction;
+    QAction *insertAction;
+    QAction *removeAction;
+    QTreeWidget *treeWidget;
+};
+
+#endif
diff --git a/doc/src/snippets/qtreewidgetitemiterator-using/qtreewidgetitemiterator-using.pro b/doc/src/snippets/qtreewidgetitemiterator-using/qtreewidgetitemiterator-using.pro
new file mode 100644
index 0000000000..12a900a7c6
--- /dev/null
+++ b/doc/src/snippets/qtreewidgetitemiterator-using/qtreewidgetitemiterator-using.pro
@@ -0,0 +1,3 @@
+SOURCES     = main.cpp \
+              mainwindow.cpp
+HEADERS     = mainwindow.h
diff --git a/doc/src/snippets/qtscript/evaluation/evaluation.pro b/doc/src/snippets/qtscript/evaluation/evaluation.pro
new file mode 100644
index 0000000000..a495c02847
--- /dev/null
+++ b/doc/src/snippets/qtscript/evaluation/evaluation.pro
@@ -0,0 +1,2 @@
+SOURCES   = main.cpp
+QT       += script
diff --git a/doc/src/snippets/qtscript/evaluation/main.cpp b/doc/src/snippets/qtscript/evaluation/main.cpp
new file mode 100644
index 0000000000..a80ef7e286
--- /dev/null
+++ b/doc/src/snippets/qtscript/evaluation/main.cpp
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtScript>
+
+int main(int argc, char *argv[])
+{
+//! [0]
+    QScriptEngine engine;
+    qDebug() << "the magic number is:" << engine.evaluate("1 + 2").toNumber();
+//! [0]
+    return 0;
+}
diff --git a/doc/src/snippets/qtscript/registeringobjects/main.cpp b/doc/src/snippets/qtscript/registeringobjects/main.cpp
new file mode 100644
index 0000000000..88f37b6c22
--- /dev/null
+++ b/doc/src/snippets/qtscript/registeringobjects/main.cpp
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QObject>
+#include <QtScript>
+#include "myobject.h"
+
+int main(int argc, char *argv[])
+{
+//! [0]
+    QScriptEngine engine;
+    QObject *someObject = new MyObject;
+    QScriptValue objectValue = engine.newQObject(someObject);
+    engine.globalObject().setProperty("myObject", objectValue);
+//! [0]
+    qDebug() << "myObject's calculate() function returns"
+             << engine.evaluate("myObject.calculate(10)").toNumber();
+    return 0;
+}
diff --git a/doc/src/snippets/qtscript/registeringobjects/myobject.cpp b/doc/src/snippets/qtscript/registeringobjects/myobject.cpp
new file mode 100644
index 0000000000..ac3ed68fe6
--- /dev/null
+++ b/doc/src/snippets/qtscript/registeringobjects/myobject.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "myobject.h"
+
+MyObject::MyObject()
+{
+}
+
+int MyObject::calculate(int value) const
+{
+    int total = 0;
+    for (int i = 0; i <= value; ++i)
+        total += i;
+    return total;
+}
diff --git a/doc/src/snippets/qtscript/registeringobjects/myobject.h b/doc/src/snippets/qtscript/registeringobjects/myobject.h
new file mode 100644
index 0000000000..82706c3544
--- /dev/null
+++ b/doc/src/snippets/qtscript/registeringobjects/myobject.h
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MYOBJECT_H
+#define MYOBJECT_H
+
+#include <QObject>
+
+class MyObject : public QObject
+{
+    Q_OBJECT
+
+public:
+    MyObject();
+
+public slots:
+    int calculate(int value) const;
+};
+
+#endif
diff --git a/doc/src/snippets/qtscript/registeringobjects/registeringobjects.pro b/doc/src/snippets/qtscript/registeringobjects/registeringobjects.pro
new file mode 100644
index 0000000000..0a755e204d
--- /dev/null
+++ b/doc/src/snippets/qtscript/registeringobjects/registeringobjects.pro
@@ -0,0 +1,4 @@
+SOURCES   = main.cpp \
+            myobject.cpp
+HEADERS   = myobject.h
+QT       += script
diff --git a/doc/src/snippets/qtscript/registeringvalues/main.cpp b/doc/src/snippets/qtscript/registeringvalues/main.cpp
new file mode 100644
index 0000000000..d9c9c748d0
--- /dev/null
+++ b/doc/src/snippets/qtscript/registeringvalues/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtScript>
+
+int main(int argc, char *argv[])
+{
+    QScriptEngine engine;
+//! [0]
+    engine.globalObject().setProperty("foo", 123);
+    qDebug() << "foo times two is:" << engine.evaluate("foo * 2").toNumber();
+//! [0]
+    return 0;
+}
+
diff --git a/doc/src/snippets/qtscript/registeringvalues/registeringvalues.pro b/doc/src/snippets/qtscript/registeringvalues/registeringvalues.pro
new file mode 100644
index 0000000000..a495c02847
--- /dev/null
+++ b/doc/src/snippets/qtscript/registeringvalues/registeringvalues.pro
@@ -0,0 +1,2 @@
+SOURCES   = main.cpp
+QT       += script
diff --git a/doc/src/snippets/qtscript/scriptedslot/main.cpp b/doc/src/snippets/qtscript/scriptedslot/main.cpp
new file mode 100644
index 0000000000..a84a8028ab
--- /dev/null
+++ b/doc/src/snippets/qtscript/scriptedslot/main.cpp
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QTextEdit>
+#include <QTimer>
+#include <QtScript>
+#include "myobject.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QScriptEngine engine;
+    QFile scriptFile(":/object.js");
+    scriptFile.open(QFile::ReadOnly);
+    engine.evaluate(scriptFile.readAll());
+    scriptFile.close();
+
+    QTextEdit editor;
+    QTimer timer;
+    QScriptValue constructor = engine.evaluate("Object");
+    QScriptValueList arguments;
+    arguments << engine.newQObject(&timer);
+    arguments << engine.newQObject(&editor);
+    QScriptValue object = constructor.construct(arguments);
+    if (engine.hasUncaughtException()) {
+        qDebug() << engine.uncaughtException().toString();
+    }
+
+    editor.show();
+    timer.start(1000);
+
+    return app.exec();
+}
diff --git a/doc/src/snippets/qtscript/scriptedslot/object.js b/doc/src/snippets/qtscript/scriptedslot/object.js
new file mode 100644
index 0000000000..44ad0e657c
--- /dev/null
+++ b/doc/src/snippets/qtscript/scriptedslot/object.js
@@ -0,0 +1,18 @@
+function Object(timer, editor)
+{
+    this.editor = editor;
+    this.counter = 0;
+    timer.timeout.connect(notify);
+    timer.timeout.connect(this, this.addLine);
+}
+
+Object.prototype.addLine = function()
+{
+    this.editor.append(this.counter);
+    this.counter += 1;
+}
+
+function notify()
+{
+    print("timeout() received");
+}
diff --git a/doc/src/snippets/qtscript/scriptedslot/scriptedslot.pro b/doc/src/snippets/qtscript/scriptedslot/scriptedslot.pro
new file mode 100644
index 0000000000..a10f06ec8b
--- /dev/null
+++ b/doc/src/snippets/qtscript/scriptedslot/scriptedslot.pro
@@ -0,0 +1,3 @@
+RESOURCES = scriptedslot.qrc
+SOURCES   = main.cpp
+QT       += script
diff --git a/doc/src/snippets/qtscript/scriptedslot/scriptedslot.qrc b/doc/src/snippets/qtscript/scriptedslot/scriptedslot.qrc
new file mode 100644
index 0000000000..fc7ff67b95
--- /dev/null
+++ b/doc/src/snippets/qtscript/scriptedslot/scriptedslot.qrc
@@ -0,0 +1,5 @@
+<RCC>
+  <qresource prefix="/" >
+    <file>object.js</file>
+  </qresource>
+</RCC>
diff --git a/doc/src/snippets/quiloader/main.cpp b/doc/src/snippets/quiloader/main.cpp
new file mode 100644
index 0000000000..fadf1d4dd4
--- /dev/null
+++ b/doc/src/snippets/quiloader/main.cpp
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtUiTools>
+
+#include "mywidget.h"
+
+//! [0]
+QWidget *loadCustomWidget(QWidget *parent)
+{
+    QUiLoader loader;
+    QWidget *myWidget;
+
+    QStringList availableWidgets = loader.availableWidgets();
+
+    if (availableWidgets.contains("AnalogClock"))
+        myWidget = loader.createWidget("AnalogClock", parent);
+
+    return myWidget;
+}
+//! [0]
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MyWidget widget;
+    widget.show();
+
+    QWidget *customWidget = loadCustomWidget(0);
+    customWidget->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/quiloader/myform.ui b/doc/src/snippets/quiloader/myform.ui
new file mode 100644
index 0000000000..00702e860a
--- /dev/null
+++ b/doc/src/snippets/quiloader/myform.ui
@@ -0,0 +1,130 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>Form</class>
+ <widget class="QWidget" name="Form" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>258</width>
+    <height>224</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Export Document</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>8</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Export Options</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>8</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="1" column="0" >
+       <widget class="QRadioButton" name="radioButton_2" >
+        <property name="text" >
+         <string>&amp;DocBook</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QRadioButton" name="radioButton" >
+        <property name="text" >
+         <string>&amp;LaTeX</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QCheckBox" name="checkBox_2" >
+        <property name="text" >
+         <string>Include p&amp;ictures</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QCheckBox" name="checkBox" >
+        <property name="text" >
+         <string>&amp;Compress</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QRadioButton" name="radioButton_2_2" >
+        <property name="text" >
+         <string>&amp;HTML</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QRadioButton" name="radioButton_3" >
+        <property name="text" >
+         <string>&amp;PostScript</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QRadioButton" name="radioButton_4" >
+        <property name="text" >
+         <string>PD&amp;F</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QCheckBox" name="checkBox_3" >
+        <property name="text" >
+         <string>Include &amp;metadata</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" >
+       <widget class="QCheckBox" name="checkBox_4" >
+        <property name="text" >
+         <string>Create inde&amp;x</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/doc/src/snippets/quiloader/mywidget.cpp b/doc/src/snippets/quiloader/mywidget.cpp
new file mode 100644
index 0000000000..f01d26f863
--- /dev/null
+++ b/doc/src/snippets/quiloader/mywidget.cpp
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtUiTools>
+
+#include "mywidget.h"
+
+//! [0]
+MyWidget::MyWidget(QWidget *parent)
+    : QWidget(parent)
+{
+    QUiLoader loader;
+    QFile file(":/forms/myform.ui");
+    file.open(QFile::ReadOnly);
+    QWidget *myWidget = loader.load(&file, this);
+    file.close();
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(myWidget);
+    setLayout(layout);
+}
+//! [0]
diff --git a/doc/src/snippets/quiloader/mywidget.h b/doc/src/snippets/quiloader/mywidget.h
new file mode 100644
index 0000000000..dd998bdbe5
--- /dev/null
+++ b/doc/src/snippets/quiloader/mywidget.h
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MYWIDGET_H
+#define MYWIDGET_H
+
+#include <QWidget>
+
+class MyWidget : public QWidget
+{
+public:
+    MyWidget(QWidget *parent = 0);
+};
+
+#endif
diff --git a/doc/src/snippets/quiloader/mywidget.qrc b/doc/src/snippets/quiloader/mywidget.qrc
new file mode 100644
index 0000000000..47684d68b8
--- /dev/null
+++ b/doc/src/snippets/quiloader/mywidget.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/forms">
+<file>myform.ui</file>
+</qresource>
+</RCC>
diff --git a/doc/src/snippets/quiloader/quiloader.pro b/doc/src/snippets/quiloader/quiloader.pro
new file mode 100644
index 0000000000..c82d0e5bbd
--- /dev/null
+++ b/doc/src/snippets/quiloader/quiloader.pro
@@ -0,0 +1,4 @@
+HEADERS     = mywidget.h
+SOURCES     = main.cpp mywidget.cpp
+RESOURCES   = mywidget.qrc
+CONFIG     += uitools
diff --git a/doc/src/snippets/qx11embedcontainer/main.cpp b/doc/src/snippets/qx11embedcontainer/main.cpp
new file mode 100644
index 0000000000..3fbab39b40
--- /dev/null
+++ b/doc/src/snippets/qx11embedcontainer/main.cpp
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QX11EmbedContainer>
+
+//! [0]
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    if (app.arguments().count() != 2) {
+        qFatal("Error - expected executable path as argument");
+        return 1;
+    }
+
+    QX11EmbedContainer container;
+    container.show();
+
+    QProcess process(&container);
+    QString executable(app.arguments()[1]);
+    QStringList arguments;
+    arguments << QString::number(container.winId());
+    process.start(executable, arguments);
+
+    int status = app.exec();
+    process.close();
+    return status;
+}
+//! [0]
diff --git a/doc/src/snippets/qx11embedcontainer/qx11embedcontainer.pro b/doc/src/snippets/qx11embedcontainer/qx11embedcontainer.pro
new file mode 100644
index 0000000000..bba41b9c12
--- /dev/null
+++ b/doc/src/snippets/qx11embedcontainer/qx11embedcontainer.pro
@@ -0,0 +1 @@
+SOURCES = main.cpp
diff --git a/doc/src/snippets/qx11embedwidget/embedwidget.cpp b/doc/src/snippets/qx11embedwidget/embedwidget.cpp
new file mode 100644
index 0000000000..e3ea1c9028
--- /dev/null
+++ b/doc/src/snippets/qx11embedwidget/embedwidget.cpp
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "embedwidget.h"
+
+EmbedWidget::EmbedWidget(QWidget *parent)
+    : QX11EmbedWidget(parent)
+{
+    gradient = QRadialGradient(100, 100, 90, 60, 60);
+    gradient.setColorAt(0.0, Qt::white);
+    gradient.setColorAt(0.9, QColor(192, 192, 255));
+    gradient.setColorAt(1.0, QColor(0, 32, 64));
+}
+
+QSize EmbedWidget::sizeHint() const
+{
+    return QSize(200, 200);
+}
+
+void EmbedWidget::paintEvent(QPaintEvent *event)
+{
+    QPainter painter;
+    painter.begin(this);
+    painter.setRenderHint(QPainter::Antialiasing);
+    painter.fillRect(event->rect(), QBrush(gradient));
+    painter.end();
+}
diff --git a/doc/src/snippets/qx11embedwidget/embedwidget.h b/doc/src/snippets/qx11embedwidget/embedwidget.h
new file mode 100644
index 0000000000..0391a9dac5
--- /dev/null
+++ b/doc/src/snippets/qx11embedwidget/embedwidget.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef EMBEDWIDGET_H
+#define EMBEDWIDGET_H
+
+#include <QRadialGradient>
+#include <QSize>
+#include <QX11EmbedWidget>
+
+class QPaintEvent;
+
+class EmbedWidget : public QX11EmbedWidget
+{
+    Q_OBJECT
+
+public:
+    EmbedWidget(QWidget *parent = 0);
+    QSize sizeHint() const;
+
+protected:
+    void paintEvent(QPaintEvent *event);
+
+private:
+    QRadialGradient gradient;
+};
+
+#endif
diff --git a/doc/src/snippets/qx11embedwidget/main.cpp b/doc/src/snippets/qx11embedwidget/main.cpp
new file mode 100644
index 0000000000..9801ae6f82
--- /dev/null
+++ b/doc/src/snippets/qx11embedwidget/main.cpp
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include "embedwidget.h"
+
+//! [0]
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    if (app.arguments().count() != 2) {
+        qFatal("Error - expected window id as argument");
+        return 1;
+    }
+
+    QString windowId(app.arguments()[1]);
+    EmbedWidget window;
+    window.embedInto(windowId.toULong());
+    window.show();
+
+    return app.exec();
+}
+//! [0]
diff --git a/doc/src/snippets/qx11embedwidget/qx11embedwidget.pro b/doc/src/snippets/qx11embedwidget/qx11embedwidget.pro
new file mode 100644
index 0000000000..b72e0adff2
--- /dev/null
+++ b/doc/src/snippets/qx11embedwidget/qx11embedwidget.pro
@@ -0,0 +1,3 @@
+HEADERS = embedwidget.h
+SOURCES = embedwidget.cpp \
+          main.cpp
diff --git a/doc/src/snippets/qxmlquery/bindingExample.cpp b/doc/src/snippets/qxmlquery/bindingExample.cpp
new file mode 100644
index 0000000000..8ed9974af7
--- /dev/null
+++ b/doc/src/snippets/qxmlquery/bindingExample.cpp
@@ -0,0 +1,9 @@
+//! [0]
+    QBuffer device;
+    device.setData(myQString.toUtf8());
+    device.open(QIODevice::ReadOnly);
+
+    QXmlQuery query;
+    query.setQuery("doc($inputDocument)/query[theDocument]");
+    query.bindVariable("inputDocument", &device);
+//! [0]
diff --git a/doc/src/snippets/qxmlstreamwriter/main.cpp b/doc/src/snippets/qxmlstreamwriter/main.cpp
new file mode 100644
index 0000000000..a0e701084a
--- /dev/null
+++ b/doc/src/snippets/qxmlstreamwriter/main.cpp
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QCoreApplication>
+#include <QFile>
+#include <QXmlStreamWriter>
+#include <stdio.h>
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication app(argc, argv);
+    QFile output;
+    output.open(stdout, QIODevice::WriteOnly);
+//! [write output]
+//! [start stream]
+    QXmlStreamWriter stream(&output);
+    stream.setAutoFormatting(true);
+    stream.writeStartDocument();
+//! [start stream]
+    stream.writeDTD("<!DOCTYPE xbel>");
+    stream.writeStartElement("xbel");
+    stream.writeAttribute("version", "1.0");
+    stream.writeStartElement("folder");
+    stream.writeAttribute("folded", "no");
+//! [write element]
+    stream.writeStartElement("bookmark");
+    stream.writeAttribute("href", "http://www.qtsoftware.com/");
+    stream.writeTextElement("title", "Qt Software");
+    stream.writeEndElement(); // bookmark
+//! [write element]
+    stream.writeEndElement(); // folder
+    stream.writeEndElement(); // xbel
+//! [finish stream]
+    stream.writeEndDocument();
+//! [finish stream]
+//! [write output]
+    output.close();
+    return 0;
+}
diff --git a/doc/src/snippets/qxmlstreamwriter/qxmlstreamwriter.pro b/doc/src/snippets/qxmlstreamwriter/qxmlstreamwriter.pro
new file mode 100644
index 0000000000..8f74a5d7ae
--- /dev/null
+++ b/doc/src/snippets/qxmlstreamwriter/qxmlstreamwriter.pro
@@ -0,0 +1,2 @@
+SOURCES   = main.cpp
+QT += xml
diff --git a/doc/src/snippets/reading-selections/main.cpp b/doc/src/snippets/reading-selections/main.cpp
new file mode 100644
index 0000000000..d8d5943de3
--- /dev/null
+++ b/doc/src/snippets/reading-selections/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+  main.cpp
+
+  A simple example that shows how selections can be used directly on a model.
+  It shows the result of some selections made using a table view.
+*/
+
+#include <QApplication>
+
+#include "window.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QMainWindow *window = new MainWindow;
+    window->show();
+    window->resize(640, 480);
+    return app.exec();
+}
diff --git a/doc/src/snippets/reading-selections/model.cpp b/doc/src/snippets/reading-selections/model.cpp
new file mode 100644
index 0000000000..7ac48c5741
--- /dev/null
+++ b/doc/src/snippets/reading-selections/model.cpp
@@ -0,0 +1,239 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+    model.cpp
+
+    Provides a table model for use in various examples.
+*/
+
+#include <QtGui>
+
+#include "model.h"
+
+/*!
+    Constructs a table model with at least one row and one column.
+*/
+
+TableModel::TableModel(int rows, int columns, QObject *parent)
+    : QAbstractTableModel(parent)
+{
+    QStringList newList;
+
+    for (int column = 0; column < qMax(1, columns); ++column) {
+        newList.append("");
+    }
+
+    for (int row = 0; row < qMax(1, rows); ++row) {
+        rowList.append(newList);
+    }
+}
+
+
+/*!
+    Returns the number of items in the row list as the number of rows
+    in the model.
+*/
+
+int TableModel::rowCount(const QModelIndex &/*parent*/) const
+{
+    return rowList.size();
+}
+
+/*!
+    Returns the number of items in the first list item as the number of
+    columns in the model. All rows should have the same number of columns.
+*/
+
+int TableModel::columnCount(const QModelIndex &/*parent*/) const
+{
+    return rowList[0].size();
+}
+
+/*!
+    Returns an appropriate value for the requested data.
+    If the view requests an invalid index, an invalid variant is returned.
+    Any valid index that corresponds to a string in the list causes that
+    string to be returned for the display role; otherwise an invalid variant
+    is returned.
+*/
+
+QVariant TableModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+
+    if (role == Qt::DisplayRole)
+        return rowList[index.row()][index.column()];
+    else
+        return QVariant();
+}
+
+/*!
+    Returns the appropriate header string depending on the orientation of
+    the header and the section. If anything other than the display role is
+    requested, we return an invalid variant.
+*/
+
+QVariant TableModel::headerData(int section, Qt::Orientation orientation,
+                                int role) const
+{
+    if (role != Qt::DisplayRole)
+        return QVariant();
+
+    if (orientation == Qt::Horizontal)
+        return QString("Column %1").arg(section);
+    else
+        return QString("Row %1").arg(section);
+}
+
+/*!
+    Returns an appropriate value for the item's flags. Valid items are
+    enabled, selectable, and editable.
+*/
+
+Qt::ItemFlags TableModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return Qt::ItemIsEnabled;
+
+    return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+}
+
+/*!
+    Changes an item in the model, but only if the following conditions
+    are met:
+
+    * The index supplied is valid.
+    * The role associated with editing text is specified.
+
+    The dataChanged() signal is emitted if the item is changed.
+*/
+
+bool TableModel::setData(const QModelIndex &index,
+                         const QVariant &value, int role)
+{
+    if (!index.isValid() || role != Qt::EditRole)
+        return false;
+
+    rowList[index.row()][index.column()] = value.toString();
+    emit dataChanged(index, index);
+    return true;
+}
+
+/*!
+    Inserts a number of rows into the model at the specified position.
+*/
+
+bool TableModel::insertRows(int position, int rows, const QModelIndex &parent)
+{
+    int columns = columnCount();
+    beginInsertRows(parent, position, position + rows - 1);
+
+    for (int row = 0; row < rows; ++row) {
+        QStringList items;
+        for (int column = 0; column < columns; ++column)
+            items.append("");
+        rowList.insert(position, items);
+    }
+
+    endInsertRows();
+    return true;
+}
+
+/*!
+    Inserts a number of columns into the model at the specified position.
+    Each entry in the list is extended in turn with the required number of
+    empty strings.
+*/
+
+bool TableModel::insertColumns(int position, int columns,
+                               const QModelIndex &parent)
+{
+    int rows = rowCount();
+    beginInsertColumns(parent, position, position + columns - 1);
+
+    for (int row = 0; row < rows; ++row) {
+        for (int column = position; column < columns; ++column) {
+            rowList[row].insert(position, "");
+        }
+    }
+
+    endInsertColumns();
+    return true;
+}
+
+/*!
+    Removes a number of rows from the model at the specified position.
+*/
+
+bool TableModel::removeRows(int position, int rows, const QModelIndex &parent)
+{
+    beginRemoveRows(parent, position, position + rows - 1);
+
+    for (int row = 0; row < rows; ++row) {
+        rowList.removeAt(position);
+    }
+
+    endRemoveRows();
+    return true;
+}
+
+/*!
+    Removes a number of columns from the model at the specified position.
+    Each row is shortened by the number of columns specified.
+*/
+
+bool TableModel::removeColumns(int position, int columns,
+                               const QModelIndex &parent)
+{
+    int rows = rowCount();
+    beginRemoveColumns(parent, position, position + columns - 1);
+
+    for (int row = 0; row < rows; ++row) {
+        for (int column = 0; column < columns; ++column) {
+            rowList[row].removeAt(position);
+        }
+    }
+
+    endRemoveColumns();
+    return true;
+}
diff --git a/doc/src/snippets/reading-selections/model.h b/doc/src/snippets/reading-selections/model.h
new file mode 100644
index 0000000000..207f83a8bd
--- /dev/null
+++ b/doc/src/snippets/reading-selections/model.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MODEL_H
+#define MODEL_H
+
+#include <QAbstractTableModel>
+#include <QStringList>
+#include <QVariant>
+
+class TableModel : public QAbstractTableModel
+{
+    Q_OBJECT
+
+public:
+    TableModel(int rows = 1, int columns = 1, QObject *parent = 0);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    QVariant data(const QModelIndex &index, int role) const;
+    QVariant headerData(int section, Qt::Orientation orientation,
+                        int role = Qt::DisplayRole) const;
+
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+    bool setData(const QModelIndex &index, const QVariant &value,
+                 int role = Qt::EditRole);
+
+    bool insertRows(int position, int rows, const QModelIndex &parent = QModelIndex());
+    bool insertColumns(int position, int columns, const QModelIndex &parent = QModelIndex());
+    bool removeRows(int position, int rows, const QModelIndex &parent = QModelIndex());
+    bool removeColumns(int position, int columns, const QModelIndex &parent = QModelIndex());
+
+private:
+    QList<QStringList> rowList;
+};
+
+#endif
diff --git a/doc/src/snippets/reading-selections/reading-selections.pro b/doc/src/snippets/reading-selections/reading-selections.pro
new file mode 100644
index 0000000000..91ebd3e84f
--- /dev/null
+++ b/doc/src/snippets/reading-selections/reading-selections.pro
@@ -0,0 +1,2 @@
+HEADERS += model.h window.h
+SOURCES += main.cpp model.cpp window.cpp
diff --git a/doc/src/snippets/reading-selections/window.cpp b/doc/src/snippets/reading-selections/window.cpp
new file mode 100644
index 0000000000..acf5096c0f
--- /dev/null
+++ b/doc/src/snippets/reading-selections/window.cpp
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+  window.cpp
+
+  A minimal subclass of QTableView with slots to allow the selection model
+  to be monitored.
+*/
+
+#include <QAbstractItemModel>
+#include <QItemSelection>
+#include <QItemSelectionModel>
+#include <QMenu>
+#include <QMenuBar>
+#include <QStatusBar>
+
+#include "model.h"
+#include "window.h"
+
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent)
+{
+    setWindowTitle("Selected Items in a Table Model");
+
+    model = new TableModel(8, 4, this);
+
+    table = new QTableView(this);
+    table->setModel(model);
+
+    QMenu *actionMenu = new QMenu(tr("&Actions"), this);
+    QAction *fillAction = actionMenu->addAction(tr("&Fill Selection"));
+    QAction *clearAction = actionMenu->addAction(tr("&Clear Selection"));
+    QAction *selectAllAction = actionMenu->addAction(tr("&Select All"));
+    menuBar()->addMenu(actionMenu);
+
+    connect(fillAction, SIGNAL(triggered()), this, SLOT(fillSelection()));
+    connect(clearAction, SIGNAL(triggered()), this, SLOT(clearSelection()));
+    connect(selectAllAction, SIGNAL(triggered()), this, SLOT(selectAll()));
+
+    selectionModel = table->selectionModel();
+
+    statusBar();
+    setCentralWidget(table);
+}
+
+void MainWindow::fillSelection()
+{
+//! [0]
+    QModelIndexList indexes = selectionModel->selectedIndexes();
+    QModelIndex index;
+
+    foreach(index, indexes) {
+        QString text = QString("(%1,%2)").arg(index.row()).arg(index.column());
+        model->setData(index, text);
+    }
+//! [0]
+}
+
+void MainWindow::clearSelection()
+{
+    QModelIndexList indexes = selectionModel->selectedIndexes();
+    QModelIndex index;
+
+    foreach(index, indexes)
+        model->setData(index, "");
+}
+
+void MainWindow::selectAll()
+{
+//! [1]
+    QModelIndex parent = QModelIndex();
+//! [1] //! [2]
+    QModelIndex topLeft = model->index(0, 0, parent);
+    QModelIndex bottomRight = model->index(model->rowCount(parent)-1,
+        model->columnCount(parent)-1, parent);
+//! [2]
+
+//! [3]
+    QItemSelection selection(topLeft, bottomRight);
+    selectionModel->select(selection, QItemSelectionModel::Select);
+//! [3]
+}
diff --git a/doc/src/snippets/reading-selections/window.h b/doc/src/snippets/reading-selections/window.h
new file mode 100644
index 0000000000..02b2e5d2fb
--- /dev/null
+++ b/doc/src/snippets/reading-selections/window.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QItemSelection>
+#include <QMainWindow>
+#include <QAbstractItemModel>
+#include <QWidget>
+#include <QTableView>
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+public:
+    MainWindow(QWidget *parent = 0);
+
+private slots:
+    void fillSelection();
+    void clearSelection();
+    void selectAll();
+
+private:
+    QAbstractItemModel *model;
+    QItemSelectionModel *selectionModel;
+    QTableView *table;
+};
+
+#endif
diff --git a/doc/src/snippets/scribe-overview/main.cpp b/doc/src/snippets/scribe-overview/main.cpp
new file mode 100644
index 0000000000..b38b1d3d42
--- /dev/null
+++ b/doc/src/snippets/scribe-overview/main.cpp
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+void mergeFormat(QTextEdit *edit)
+{
+//! [0]
+    QTextDocument *document = edit->document(); 
+    QTextCursor cursor(document);
+
+    cursor.movePosition(QTextCursor::Start); 
+    cursor.movePosition(QTextCursor::EndOfLine, QTextCursor::KeepAnchor);
+
+    QTextCharFormat format;
+    format.setFontWeight(QFont::Bold);
+
+    cursor.mergeCharFormat(format);
+//! [0]
+}
+
+int main(int argc, char *argv[])
+{
+    QWidget *parent = 0;
+    QString aStringContainingHTMLtext("<h1>Scribe Overview</h1>");
+
+    QApplication app(argc, argv);
+
+//! [1]
+    QTextEdit *editor = new QTextEdit(parent);
+    editor->setHtml(aStringContainingHTMLtext);
+    editor->show();
+//! [1]
+
+    return app.exec();
+}
diff --git a/doc/src/snippets/scribe-overview/scribe-overview.pro b/doc/src/snippets/scribe-overview/scribe-overview.pro
new file mode 100644
index 0000000000..16181f21cf
--- /dev/null
+++ b/doc/src/snippets/scribe-overview/scribe-overview.pro
@@ -0,0 +1 @@
+SOURCES     = main.cpp
diff --git a/doc/src/snippets/scriptdebugger.cpp b/doc/src/snippets/scriptdebugger.cpp
new file mode 100644
index 0000000000..a1889d5f30
--- /dev/null
+++ b/doc/src/snippets/scriptdebugger.cpp
@@ -0,0 +1,64 @@
+
+#include <QtGui>
+#include <QtScript>
+#include <QtScriptTools>
+
+// Perhaps shpw entire example for getting debugger up with script
+int main(int argv, char **args)
+{
+    QApplication app(argv, args);
+
+     QString fileName("helloscript.qs");
+     QFile scriptFile(fileName);
+     scriptFile.open(QIODevice::ReadOnly);
+     QTextStream stream(&scriptFile);
+     QString contents = stream.readAll();
+     scriptFile.close();
+
+    QScriptEngine *engine = new QScriptEngine();
+
+    QScriptEngineDebugger *debugger = new QScriptEngineDebugger();
+    debugger->attachTo(engine);
+
+    // Set up configuration with only stack and code
+    QWidget *widget = new QWidget;
+//![0]
+    QWidget *codeWindow = debugger->widget(QScriptEngineDebugger::CodeWidget);
+    QWidget *stackWidget = debugger->widget(QScriptEngineDebugger::StackWidget);
+    
+    QLayout *layout = new QHBoxLayout;
+    layout->addWidget(codeWindow);
+    layout->addWidget(stackWidget);
+//![0]
+
+//![1]
+    QAction *continueAction = debugger->action(QScriptEngineDebugger::ContinueAction);
+    QAction *stepOverAction = debugger->action(QScriptEngineDebugger::StepOverAction);
+    QAction *stepIntoAction = debugger->action(QScriptEngineDebugger::StepIntoAction);
+
+    QToolBar *toolBar = new QToolBar;
+    toolBar->addAction(continueAction);
+//![1]
+    toolBar->addAction(stepOverAction);
+    toolBar->addAction(stepIntoAction);
+
+    layout->addWidget(toolBar);
+    continueAction->setIcon(QIcon("copy.png"));
+
+    debugger->setAutoShowStandardWindow(false);
+
+    widget->setLayout(layout);  
+    widget->show();
+
+     QPushButton button;
+     QScriptValue scriptButton = engine->newQObject(&button);
+     engine->globalObject().setProperty("button", scriptButton);
+
+//![2]
+     debugger->action(QScriptEngineDebugger::InterruptAction)->trigger();
+     engine->evaluate(contents, fileName);
+//![2]
+
+    return app.exec();
+}
+
diff --git a/doc/src/snippets/seekslider.cpp b/doc/src/snippets/seekslider.cpp
new file mode 100644
index 0000000000..d5dfd1445b
--- /dev/null
+++ b/doc/src/snippets/seekslider.cpp
@@ -0,0 +1,26 @@
+#include <QtGui>
+
+#include <phonon/audiooutput.h>
+#include <phonon/seekslider.h>
+#include <phonon/mediaobject.h>
+#include <phonon/audiooutput.h>
+
+int main(int argv, char **args)
+{
+    QApplication app(argv, args);
+
+//![0]
+    Phonon::MediaObject *moo = new Phonon::MediaObject;;
+    Phonon::AudioOutput *device = new Phonon::AudioOutput;
+    Phonon::createPath(moo, device);
+    moo->setCurrentSource(QString("/home/gvatteka/Music/Lumme-Badloop.ogg"));
+
+    Phonon::SeekSlider *slider = new Phonon::SeekSlider;
+    slider->setMediaObject(moo);
+    
+    slider->show();
+    moo->play();
+//![0]
+
+    app.exec();
+}
diff --git a/doc/src/snippets/separations/finalwidget.cpp b/doc/src/snippets/separations/finalwidget.cpp
new file mode 100644
index 0000000000..c6b103ae44
--- /dev/null
+++ b/doc/src/snippets/separations/finalwidget.cpp
@@ -0,0 +1,127 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+finalwidget.cpp
+
+A widget to display an image and a label containing a description.
+*/
+
+#include <QtGui>
+#include "finalwidget.h"
+
+FinalWidget::FinalWidget(QWidget *parent, const QString &name,
+                         const QSize &labelSize)
+    : QFrame(parent)
+{
+    hasImage = false;
+    imageLabel = new QLabel;
+    imageLabel->setFrameShadow(QFrame::Sunken);
+    imageLabel->setFrameShape(QFrame::StyledPanel);
+    imageLabel->setMinimumSize(labelSize);
+    nameLabel = new QLabel(name);
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(imageLabel, 1);
+    layout->addWidget(nameLabel, 0);
+    setLayout(layout);
+}
+
+/*!
+    If the mouse moves far enough when the left mouse button is held down,
+    start a drag and drop operation.
+*/
+
+void FinalWidget::mouseMoveEvent(QMouseEvent *event)
+{
+    if (!(event->buttons() & Qt::LeftButton))
+        return;
+    if ((event->pos() - dragStartPosition).manhattanLength()
+         < QApplication::startDragDistance())
+        return;
+    if (!hasImage)
+        return;
+
+    QDrag *drag = new QDrag(this);
+    QMimeData *mimeData = new QMimeData;
+
+//! [0]
+    QByteArray output;
+    QBuffer outputBuffer(&output);
+    outputBuffer.open(QIODevice::WriteOnly);
+    imageLabel->pixmap()->toImage().save(&outputBuffer, "PNG");
+    mimeData->setData("image/png", output);
+//! [0]
+/*
+//! [1]
+    mimeData->setImageData(QVariant(*imageLabel->pixmap()));
+//! [1]
+*/
+    drag->setMimeData(mimeData);
+    drag->setPixmap(imageLabel->pixmap()->scaled(64, 64, Qt::KeepAspectRatio));
+//! [2]
+    drag->setHotSpot(QPoint(drag->pixmap().width()/2,
+                            drag->pixmap().height()));
+//! [2]
+
+    drag->start();
+}
+
+/*!
+    Check for left mouse button presses in order to enable drag and drop.
+*/
+
+void FinalWidget::mousePressEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton)
+        dragStartPosition = event->pos();
+}
+
+const QPixmap* FinalWidget::pixmap() const
+{
+    return imageLabel->pixmap();
+}
+
+void FinalWidget::setPixmap(const QPixmap &pixmap)
+{
+    imageLabel->setPixmap(pixmap);
+    hasImage = true;
+}
diff --git a/doc/src/snippets/separations/finalwidget.h b/doc/src/snippets/separations/finalwidget.h
new file mode 100644
index 0000000000..df45fcce37
--- /dev/null
+++ b/doc/src/snippets/separations/finalwidget.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef FINALWIDGET_H
+#define FINALWIDGET_H
+
+#include <QFrame>
+#include <QImage>
+#include <QPoint>
+#include <QSize>
+
+class QGridLayout;
+class QLabel;
+class QMouseEvent;
+class QWidget;
+
+class FinalWidget : public QFrame
+{
+    Q_OBJECT
+
+public:
+    FinalWidget(QWidget *parent, const QString &name, const QSize &labelSize);
+    void setPixmap(const QPixmap &pixmap);
+    const QPixmap *pixmap() const;
+
+protected:
+    void mouseMoveEvent(QMouseEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+
+private:
+    void createImage();
+
+    bool hasImage;
+    QImage originalImage;
+    QLabel *imageLabel;
+    QLabel *nameLabel;
+    QPoint dragStartPosition;
+};
+
+#endif
diff --git a/doc/src/snippets/separations/main.cpp b/doc/src/snippets/separations/main.cpp
new file mode 100644
index 0000000000..0a859c2bf7
--- /dev/null
+++ b/doc/src/snippets/separations/main.cpp
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include "viewer.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Viewer viewer;
+    viewer.show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/separations/screenwidget.cpp b/doc/src/snippets/separations/screenwidget.cpp
new file mode 100644
index 0000000000..daa276b784
--- /dev/null
+++ b/doc/src/snippets/separations/screenwidget.cpp
@@ -0,0 +1,218 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+screenwidget.cpp
+
+A widget to display colour components from an image using independently
+selected colors. Controls are provided to allow the image to be inverted, and
+the color to be selection via a standard dialog. The image is displayed in a
+label widget.
+*/
+
+#include <QApplication>
+#include <QColorDialog>
+#include <QGridLayout>
+#include <QImage>
+#include <QLabel>
+#include <QMenu>
+#include <QMimeData>
+#include <QMouseEvent>
+#include <QPixmap>
+#include <QPushButton>
+#include <QWidget>
+
+#include "screenwidget.h"
+
+/*!
+Initializes the paint color, the mask color (cyan, magenta,
+or yellow), connects the color selector and invert checkbox to functions,
+and creates a two-by-two grid layout.
+*/
+
+ScreenWidget::ScreenWidget(QWidget *parent, QColor initialColor,
+                           const QString &name, Separation mask,
+                           const QSize &labelSize)
+    : QFrame(parent)
+{
+    paintColor = initialColor;
+    maskColor = mask;
+    inverted = false;
+
+    imageLabel = new QLabel;
+    imageLabel->setFrameShadow(QFrame::Sunken);
+    imageLabel->setFrameShape(QFrame::StyledPanel);
+    imageLabel->setMinimumSize(labelSize);
+
+    nameLabel = new QLabel(name);
+    colorButton = new QPushButton(tr("Modify..."));
+    colorButton->setBackgroundRole(QPalette::Button);
+    colorButton->setMinimumSize(32, 32);
+
+    QPalette palette(colorButton->palette());
+    palette.setColor(QPalette::Button, initialColor);
+    colorButton->setPalette(palette);
+
+    invertButton = new QPushButton(tr("Invert"));
+    //invertButton->setToggleButton(true);
+    //invertButton->setOn(inverted);
+    invertButton->setEnabled(false);
+
+    connect(colorButton, SIGNAL(clicked()), this, SLOT(setColor()));
+    connect(invertButton, SIGNAL(clicked()), this, SLOT(invertImage()));
+
+    QGridLayout *gridLayout = new QGridLayout;
+    gridLayout->addWidget(imageLabel, 0, 0, 1, 2);
+    gridLayout->addWidget(nameLabel, 1, 0);
+    gridLayout->addWidget(colorButton, 1, 1);
+    gridLayout->addWidget(invertButton, 2, 1, 1, 1);
+    setLayout(gridLayout);
+}
+
+/*!
+    Creates a new image by separating out the cyan, magenta, or yellow
+    component, depending on the mask color specified in the constructor.
+
+    The amount of the component found in each pixel of the image is used
+    to determine how much of a user-selected ink is used for each pixel
+    in the new image for the label widget.
+*/
+
+void ScreenWidget::createImage()
+{
+    newImage = originalImage.copy();
+
+    // Create CMY components for the ink being used.
+    float cyanInk = (255 - paintColor.red())/255.0;
+    float magentaInk = (255 - paintColor.green())/255.0;
+    float yellowInk = (255 - paintColor.blue())/255.0;
+
+    int (*convert)(QRgb);
+
+    switch (maskColor) {
+        case Cyan:
+            convert = qRed;
+            break;
+        case Magenta:
+            convert = qGreen;
+            break;
+        case Yellow:
+            convert = qBlue;
+            break;
+    }
+
+    for (int y = 0; y < newImage.height(); ++y) {
+        for (int x = 0; x < newImage.width(); ++x) {
+            QRgb p(originalImage.pixel(x, y));
+
+            // Separate the source pixel into its cyan component.
+            int amount;
+
+            if (inverted)
+                amount = convert(p);
+            else
+                amount = 255 - convert(p);
+
+            QColor newColor(
+                255 - qMin(int(amount * cyanInk), 255),
+                255 - qMin(int(amount * magentaInk), 255),
+                255 - qMin(int(amount * yellowInk), 255));
+
+            newImage.setPixel(x, y, newColor.rgb());
+        }
+    }
+
+    imageLabel->setPixmap(QPixmap::fromImage(newImage));
+}
+
+/*!
+    Returns a pointer to the modified image.
+*/
+
+QImage* ScreenWidget::image()
+{
+    return &newImage;
+}
+
+/*!
+    Sets whether the amount of ink applied to the canvas is to be inverted
+    (subtracted from the maximum value) before the ink is applied.
+*/
+
+void ScreenWidget::invertImage()
+{
+    //inverted = invertButton->isOn();
+    inverted = !inverted;
+    createImage();
+    emit imageChanged();
+}
+
+/*!
+    Separate the current image into cyan, magenta, and yellow components.
+    Create a representation of how each component might appear when applied
+    to a blank white piece of paper.
+*/
+
+void ScreenWidget::setColor()
+{
+    QColor newColor = QColorDialog::getColor(paintColor);
+
+    if (newColor.isValid()) {
+        paintColor = newColor;
+        QPalette palette(colorButton->palette());
+        palette.setColor(QPalette::Button, paintColor);
+        colorButton->setPalette(palette);
+        createImage();
+        emit imageChanged();
+    }
+}
+
+/*!
+    Records the original image selected by the user, creates a color
+    separation, and enables the invert image checkbox.
+*/
+
+void ScreenWidget::setImage(QImage &image)
+{
+    originalImage = image;
+    createImage();
+    invertButton->setEnabled(true);
+}
diff --git a/doc/src/snippets/separations/screenwidget.h b/doc/src/snippets/separations/screenwidget.h
new file mode 100644
index 0000000000..3371028944
--- /dev/null
+++ b/doc/src/snippets/separations/screenwidget.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SCREENWIDGET_H
+#define SCREENWIDGET_H
+
+#include <QColor>
+#include <QFrame>
+#include <QImage>
+#include <QSize>
+
+class QGridLayout;
+class QLabel;
+class QPushButton;
+class QWidget;
+
+class ScreenWidget : public QFrame
+{
+    Q_OBJECT
+public:
+    enum Separation { Cyan, Magenta, Yellow };
+
+    ScreenWidget(QWidget *parent, QColor initialColor, const QString &name,
+                 Separation mask, const QSize &labelSize);
+    void setImage(QImage &image);
+    QImage* image();
+
+signals:
+    void imageChanged();
+
+public slots:
+    void setColor();
+    void invertImage();
+
+private:
+    void createImage();
+
+    bool inverted;
+    QColor paintColor;
+    QImage newImage;
+    QImage originalImage;
+    QLabel *imageLabel;
+    QLabel *nameLabel;
+    QPushButton *colorButton;
+    QPushButton *invertButton;
+    Separation maskColor;
+};
+
+#endif
diff --git a/doc/src/snippets/separations/separations.pro b/doc/src/snippets/separations/separations.pro
new file mode 100644
index 0000000000..48af2c8472
--- /dev/null
+++ b/doc/src/snippets/separations/separations.pro
@@ -0,0 +1,7 @@
+HEADERS     = finalwidget.h \
+              screenwidget.h \
+              viewer.h
+SOURCES     = finalwidget.cpp \
+              main.cpp \
+              screenwidget.cpp \
+              viewer.cpp
diff --git a/doc/src/snippets/separations/separations.qdoc b/doc/src/snippets/separations/separations.qdoc
new file mode 100644
index 0000000000..509135226c
--- /dev/null
+++ b/doc/src/snippets/separations/separations.qdoc
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+    \example painting/separations
+    \title Color Separations Example
+
+    This example enables simple color manipulation of images and demonstrates a
+    number of image-related features of Qt, from per-pixel image manipulation to
+    drag and drop handling of images.
+
+    \image separations-example.png
+
+    The application allows the user to load an image, shown in the top-left
+    part of the main window, and to adjust its color balance by replacing its
+    initial cyan, magenta, and yellow components with different colors.
+*/
diff --git a/doc/src/snippets/separations/viewer.cpp b/doc/src/snippets/separations/viewer.cpp
new file mode 100644
index 0000000000..f33be69893
--- /dev/null
+++ b/doc/src/snippets/separations/viewer.cpp
@@ -0,0 +1,329 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+viewer.cpp
+
+Provides a main window for displaying a user-specified original image
+with three color separations in a grid layout.
+
+A main menu provides entries for selecting files, and adjusting the
+brightness of the separations.
+*/
+
+#include <QtGui>
+
+#include "finalwidget.h"
+#include "screenwidget.h"
+#include "viewer.h"
+
+/*
+    Constructor: initializes a default value for the brightness, creates
+    the main menu entries, and constructs a central widget that contains
+    enough space for images to be displayed.
+*/
+
+Viewer::Viewer()
+{
+    setWindowTitle(tr("QImage Color Separations"));
+
+    brightness = 255;
+
+    createMenus();
+    setCentralWidget(createCentralWidget());
+}
+
+/*
+    Creates a main menu with two entries: a File menu, to allow the image
+    to be selected, and a Brightness menu to allow the brightness of the
+    separations to be changed.
+
+    Initially, the Brightness menu items are disabled, but the first entry in
+    the menu is checked to reflect the default brightness.
+*/
+
+void Viewer::createMenus()
+{
+    fileMenu = new QMenu(tr("&File"), this);
+    brightnessMenu = new QMenu(tr("&Brightness"), this);
+
+    QAction *openAction = fileMenu->addAction(tr("&Open..."));
+    openAction->setShortcut(QKeySequence("Ctrl+O"));
+    saveAction = fileMenu->addAction(tr("&Save..."));
+    saveAction->setShortcut(QKeySequence("Ctrl+S"));
+    saveAction->setEnabled(false);
+    QAction *quitAction = fileMenu->addAction(tr("E&xit"));
+    quitAction->setShortcut(QKeySequence("Ctrl+Q"));
+
+    QAction *noBrightness = brightnessMenu->addAction(tr("&0%"));
+    noBrightness->setCheckable(true);
+    QAction *quarterBrightness = brightnessMenu->addAction(tr("&25%"));
+    quarterBrightness->setCheckable(true);
+    QAction *halfBrightness = brightnessMenu->addAction(tr("&50%"));
+    halfBrightness->setCheckable(true);
+    QAction *threeQuartersBrightness = brightnessMenu->addAction(tr("&75%"));
+    threeQuartersBrightness->setCheckable(true);
+    QAction *fullBrightness = brightnessMenu->addAction(tr("&100%"));
+    fullBrightness->setCheckable(true);
+
+    menuMap[noBrightness] = None;
+    menuMap[quarterBrightness] = Quarter;
+    menuMap[halfBrightness] = Half;
+    menuMap[threeQuartersBrightness] = ThreeQuarters;
+    menuMap[fullBrightness] = Full;
+
+    currentBrightness = fullBrightness;
+    currentBrightness->setChecked(true);
+    brightnessMenu->setEnabled(false);
+
+    menuBar()->addMenu(fileMenu);
+    menuBar()->addMenu(brightnessMenu);
+
+    connect(openAction, SIGNAL(triggered()), this, SLOT(chooseFile()));
+    connect(saveAction, SIGNAL(triggered()), this, SLOT(saveImage()));
+    connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+    connect(brightnessMenu, SIGNAL(triggered(QAction *)), this,
+            SLOT(setBrightness(QAction *)));
+}
+
+/*
+    Constructs a central widget for the window consisting of a two-by-two
+    grid of labels, each of which will contain an image. We restrict the
+    size of the labels to 256 pixels, and ensure that the window cannot
+    be resized.
+*/
+
+QFrame* Viewer::createCentralWidget()
+{
+    QFrame* frame = new QFrame(this);
+    grid = new QGridLayout(frame);
+    grid->setSpacing(8);
+    grid->setMargin(4);
+
+    layout()->setSizeConstraint(QLayout::SetFixedSize);
+
+    QSize labelSize(256, 256);
+
+    finalWidget = new FinalWidget(frame, tr("Final image"), labelSize);
+
+    cyanWidget = new ScreenWidget(frame, Qt::cyan, tr("Cyan"),
+                                  ScreenWidget::Cyan, labelSize);
+    magentaWidget = new ScreenWidget(frame, Qt::magenta, tr("Magenta"),
+                                     ScreenWidget::Magenta, labelSize);
+    yellowWidget = new ScreenWidget(frame, Qt::yellow, tr("Yellow"),
+                                    ScreenWidget::Yellow, labelSize);
+
+    connect(cyanWidget, SIGNAL(imageChanged()), this, SLOT(createImage()));
+    connect(magentaWidget, SIGNAL(imageChanged()), this, SLOT(createImage()));
+    connect(yellowWidget, SIGNAL(imageChanged()), this, SLOT(createImage()));
+
+    grid->addWidget(finalWidget, 0, 0, Qt::AlignTop | Qt::AlignHCenter);
+    grid->addWidget(cyanWidget, 0, 1, Qt::AlignTop | Qt::AlignHCenter);
+    grid->addWidget(magentaWidget, 1, 0, Qt::AlignTop | Qt::AlignHCenter);
+    grid->addWidget(yellowWidget, 1, 1, Qt::AlignTop | Qt::AlignHCenter);
+
+    return frame;
+}
+
+/*
+    Provides a dialog window to allow the user to specify an image file.
+    If a file is selected, the appropriate function is called to process
+    and display it.
+*/
+
+void Viewer::chooseFile()
+{
+    QString imageFile = QFileDialog::getOpenFileName(this,
+        tr("Choose an image file to open"), path, tr("Images (*.*)"));
+
+    if (!imageFile.isEmpty()) {
+        openImageFile(imageFile);
+        path = imageFile;
+    }
+}
+
+/*
+    Changes the value of the brightness according to the entry selected in the
+    Brightness menu. The selected entry is checked, and the previously selected
+    entry is unchecked.
+
+    The color separations are updated to use the new value for the brightness.
+*/
+
+void Viewer::setBrightness(QAction *action)
+{
+    if (!menuMap.contains(action) || scaledImage.isNull())
+        return;
+
+    Brightness amount = menuMap[action];
+
+    switch (amount) {
+        case None:
+            brightness = 0; break;
+        case Quarter:
+            brightness = 64; break;
+        case Half:
+            brightness = 128; break;
+        case ThreeQuarters:
+            brightness = 191; break;
+        case Full:
+            brightness = 255; break;
+        default: return;
+    }
+
+    currentBrightness->setChecked(false);
+    currentBrightness = action;
+    currentBrightness->setChecked(true);
+
+    createImage();
+}
+
+/*
+    Load the image from the file given, and create four pixmaps based
+    on the original image.
+
+    The window caption is set, and the Brightness menu enabled if the image file
+    can be loaded.
+*/
+
+void Viewer::openImageFile(QString &imageFile)
+{
+    QImage originalImage;
+
+    if (originalImage.load(imageFile)) {
+        setWindowTitle(imageFile);
+        //menuBar()->setItemEnabled(brightnessMenuId, true);
+        saveAction->setEnabled(true);
+        brightnessMenu->setEnabled(true);
+
+        /* Note: the ScaleMin value may be different for Qt 4. */
+        scaledImage = originalImage.scaled(256, 256, Qt::KeepAspectRatio);
+
+        cyanWidget->setImage(scaledImage);
+        magentaWidget->setImage(scaledImage);
+        yellowWidget->setImage(scaledImage);
+        createImage();
+    }
+    else
+        (void) QMessageBox::warning(this, tr("Cannot open file"),
+            tr("The selected file could not be opened."),
+            QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton);
+}
+
+/*
+    Creates an image by combining the contents of the three screens
+    to present a page preview.
+
+    The image associated with each screen is separated into cyan,
+    magenta, and yellow components. We add up the values for each
+    component from the three screen images, and subtract the totals
+    from the maximum value for each corresponding primary color.
+*/
+
+void Viewer::createImage()
+{
+    QImage newImage = scaledImage.copy();
+
+    QImage *image1 = cyanWidget->image();
+    QImage *image2 = magentaWidget->image();
+    QImage *image3 = yellowWidget->image();
+    int darkness = 255 - brightness;
+
+    for (int y = 0; y < newImage.height(); ++y) {
+        for (int x = 0; x < newImage.width(); ++x) {
+
+            // Create three screens, using the quantities of the source
+            // CMY components to determine how much of each of the
+            // inks are to be put on each screen.
+            QRgb p1(image1->pixel(x, y));
+            float cyan1 = 255 - qRed(p1);
+            float magenta1 = 255 - qGreen(p1);
+            float yellow1 = 255 - qBlue(p1);
+
+            QRgb p2(image2->pixel(x, y));
+            float cyan2 = 255 - qRed(p2);
+            float magenta2 = 255 - qGreen(p2);
+            float yellow2 = 255 - qBlue(p2);
+
+            QRgb p3(image3->pixel(x, y));
+            float cyan3 = 255 - qRed(p3);
+            float magenta3 = 255 - qGreen(p3);
+            float yellow3 = 255 - qBlue(p3);
+
+            QColor newColor(
+                qMax(255 - int(cyan1+cyan2+cyan3) - darkness, 0),
+                qMax(255 - int(magenta1+magenta2+magenta3) - darkness, 0),
+                qMax(255 - int(yellow1+yellow2+yellow3) - darkness, 0));
+
+            newImage.setPixel(x, y, newColor.rgb());
+        }
+    }
+
+    finalWidget->setPixmap(QPixmap::fromImage(newImage));
+}
+
+/*
+    Provides a dialog window to allow the user to save the image file.
+*/
+
+void Viewer::saveImage()
+{
+    QString imageFile = QFileDialog::getSaveFileName(this,
+        tr("Choose a filename to save the image"), "", tr("Images (*.png)"));
+
+    QFileInfo info(imageFile);
+
+    if (!info.baseName().isEmpty()) {
+        QString newImageFile = QFileInfo(info.absoluteDir(),
+            info.baseName() + ".png").absoluteFilePath();
+
+        if (!finalWidget->pixmap()->save(newImageFile, "PNG"))
+            (void) QMessageBox::warning(this, tr("Cannot save file"),
+                tr("The file could not be saved."),
+                QMessageBox::Cancel, QMessageBox::NoButton,
+                QMessageBox::NoButton);
+    }
+    else
+        (void) QMessageBox::warning(this, tr("Cannot save file"),
+            tr("Please enter a valid filename."),
+            QMessageBox::Cancel, QMessageBox::NoButton,
+            QMessageBox::NoButton);
+}
diff --git a/doc/src/snippets/separations/viewer.h b/doc/src/snippets/separations/viewer.h
new file mode 100644
index 0000000000..148f081c2c
--- /dev/null
+++ b/doc/src/snippets/separations/viewer.h
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef VIEWER_H
+#define VIEWER_H
+
+#include <QImage>
+#include <QMainWindow>
+#include <QMap>
+
+class QAction;
+class QFrame;
+class QGridLayout;
+class QLabel;
+class QMenu;
+class FinalWidget;
+class ScreenWidget;
+
+class Viewer : public QMainWindow
+{
+    Q_OBJECT
+public:
+    enum Brightness { None, Quarter, Half, ThreeQuarters, Full };
+    Viewer();
+
+public slots:
+    void chooseFile();
+    void setBrightness(QAction *action);
+    void createImage();
+    void saveImage();
+
+private:
+    void createMenus();
+    QFrame *createCentralWidget();
+    void openImageFile(QString &filePath);
+
+    FinalWidget *finalWidget;
+    int brightness;
+    QAction *currentBrightness;
+    QAction *saveAction;
+    QGridLayout *grid;
+    QImage scaledImage;
+    QMap <QAction*,Brightness> menuMap;
+    QMenu *brightnessMenu;
+    QMenu *fileMenu;
+    QString path;
+    ScreenWidget *cyanWidget;
+    ScreenWidget *magentaWidget;
+    ScreenWidget *yellowWidget;
+};
+
+#endif
diff --git a/doc/src/snippets/settings/settings.cpp b/doc/src/snippets/settings/settings.cpp
new file mode 100644
index 0000000000..b1b8a0318f
--- /dev/null
+++ b/doc/src/snippets/settings/settings.cpp
@@ -0,0 +1,185 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+QWidget *win;
+QWidget *panel;
+
+void snippet_ctor1()
+{
+//! [0]
+    QSettings settings("MySoft", "Star Runner");
+//! [0]
+}
+
+void snippet_ctor2()
+{
+//! [1]
+    QCoreApplication::setOrganizationName("MySoft");
+//! [1] //! [2]
+    QCoreApplication::setOrganizationDomain("mysoft.com");
+//! [2] //! [3]
+    QCoreApplication::setApplicationName("Star Runner");
+//! [3]
+
+//! [4]
+    QSettings settings;
+//! [4]
+
+//! [5]
+    settings.setValue("editor/wrapMargin", 68);
+//! [5] //! [6]
+    int margin = settings.value("editor/wrapMargin").toInt();
+//! [6]
+    {
+//! [7]
+    int margin = settings.value("editor/wrapMargin", 80).toInt();
+//! [7]
+    }
+
+//! [8]
+    settings.setValue("mainwindow/size", win->size());
+//! [8] //! [9]
+    settings.setValue("mainwindow/fullScreen", win->isFullScreen());
+//! [9] //! [10]
+    settings.setValue("outputpanel/visible", panel->isVisible());
+//! [10]
+
+//! [11]
+    settings.beginGroup("mainwindow");
+    settings.setValue("size", win->size());
+    settings.setValue("fullScreen", win->isFullScreen());
+    settings.endGroup();
+//! [11]
+
+//! [12]
+    settings.beginGroup("outputpanel");
+    settings.setValue("visible", panel->isVisible());
+    settings.endGroup();
+//! [12]
+}
+
+void snippet_locations()
+{
+//! [13]
+    QSettings obj1("MySoft", "Star Runner");
+//! [13] //! [14]
+    QSettings obj2("MySoft");
+    QSettings obj3(QSettings::SystemScope, "MySoft", "Star Runner");
+    QSettings obj4(QSettings::SystemScope, "MySoft");
+//! [14]
+
+    {
+//! [15]
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope,
+                       "MySoft", "Star Runner");
+//! [15]
+    }
+
+    {
+    QSettings settings("starrunner.ini", QSettings::IniFormat);
+    }
+
+    {
+    QSettings settings("HKEY_CURRENT_USER\\Software\\Microsoft",
+                       QSettings::NativeFormat);
+    }
+}
+
+class MainWindow : public QMainWindow
+{
+public:
+    MainWindow();
+
+    void writeSettings();
+    void readSettings();
+
+protected:
+    void closeEvent(QCloseEvent *event);
+};
+
+//! [16]
+void MainWindow::writeSettings()
+{
+    QSettings settings("Moose Soft", "Clipper");
+
+    settings.beginGroup("MainWindow");
+    settings.setValue("size", size());
+    settings.setValue("pos", pos());
+    settings.endGroup();
+}
+//! [16]
+
+//! [17]
+void MainWindow::readSettings()
+{
+    QSettings settings("Moose Soft", "Clipper");
+
+    settings.beginGroup("MainWindow");
+    resize(settings.value("size", QSize(400, 400)).toSize());
+    move(settings.value("pos", QPoint(200, 200)).toPoint());
+    settings.endGroup();
+}
+//! [17]
+
+//! [18]
+MainWindow::MainWindow()
+{
+//! [18] //! [19]
+    readSettings();
+//! [19] //! [20]
+}
+//! [20]
+
+bool userReallyWantsToQuit() { return true; }
+
+//! [21]
+void MainWindow::closeEvent(QCloseEvent *event)
+{
+    if (userReallyWantsToQuit()) {
+        writeSettings();
+        event->accept();
+    } else {
+        event->ignore();
+    }
+}
+//! [21]
diff --git a/doc/src/snippets/shareddirmodel/main.cpp b/doc/src/snippets/shareddirmodel/main.cpp
new file mode 100644
index 0000000000..63905212d2
--- /dev/null
+++ b/doc/src/snippets/shareddirmodel/main.cpp
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+  main.cpp
+
+  A simple example of how to view a model in several views, and share a
+  selection model.
+*/
+
+#include <QtGui>
+
+//! [0] //! [1]
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QSplitter *splitter = new QSplitter;
+
+//! [2] //! [3]
+    QDirModel *model = new QDirModel;
+//! [0] //! [2] //! [4] //! [5]
+    QTreeView *tree = new QTreeView(splitter);
+//! [3] //! [6]
+    tree->setModel(model);
+//! [4] //! [6] //! [7]
+    tree->setRootIndex(model->index(QDir::currentPath()));
+//! [7]
+
+    QListView *list = new QListView(splitter);
+    list->setModel(model);
+    list->setRootIndex(model->index(QDir::currentPath()));
+
+//! [5]
+    QItemSelectionModel *selection = new QItemSelectionModel(model);
+    tree->setSelectionModel(selection);
+    list->setSelectionModel(selection);
+
+//! [8]
+    splitter->setWindowTitle("Two views onto the same directory model");
+    splitter->show();
+    return app.exec();
+}
+//! [1] //! [8]
diff --git a/doc/src/snippets/shareddirmodel/shareddirmodel.pro b/doc/src/snippets/shareddirmodel/shareddirmodel.pro
new file mode 100644
index 0000000000..28dcadcbfa
--- /dev/null
+++ b/doc/src/snippets/shareddirmodel/shareddirmodel.pro
@@ -0,0 +1 @@
+SOURCES += main.cpp
diff --git a/doc/src/snippets/sharedemployee/employee.cpp b/doc/src/snippets/sharedemployee/employee.cpp
new file mode 100644
index 0000000000..41ba9228db
--- /dev/null
+++ b/doc/src/snippets/sharedemployee/employee.cpp
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "employee.h"
diff --git a/doc/src/snippets/sharedemployee/employee.h b/doc/src/snippets/sharedemployee/employee.h
new file mode 100644
index 0000000000..22fae8ba0f
--- /dev/null
+++ b/doc/src/snippets/sharedemployee/employee.h
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef EMPLOYEE_H
+#define EMPLOYEE_H
+
+//! [0]
+#include <QSharedData>
+#include <QString>
+
+class EmployeeData : public QSharedData
+{
+  public:
+    EmployeeData() : id(-1) { name.clear(); }
+    EmployeeData(const EmployeeData &other)
+        : QSharedData(other), id(other.id), name(other.name) { }
+    ~EmployeeData() { }
+
+    int id;
+    QString name;
+};
+
+class Employee
+{
+  public:
+//! [1]
+    Employee() { d = new EmployeeData; }
+//! [1] //! [2]
+    Employee(int id, QString name) {
+        d = new EmployeeData;
+        setId(id);
+        setName(name);
+    }
+//! [2] //! [7]
+    Employee(const Employee &other) 
+          : d (other.d) 
+    { 
+    } 
+//! [7]  
+//! [3]
+    void setId(int id) { d->id = id; }
+//! [3] //! [4]
+    void setName(QString name) { d->name = name; }
+//! [4]
+
+//! [5]
+    int id() const { return d->id; }
+//! [5] //! [6]
+    QString name() const { return d->name; }
+//! [6]
+
+  private:
+    QSharedDataPointer<EmployeeData> d;
+};
+//! [0]
+
+#endif
diff --git a/doc/src/snippets/sharedemployee/main.cpp b/doc/src/snippets/sharedemployee/main.cpp
new file mode 100644
index 0000000000..9e12116b96
--- /dev/null
+++ b/doc/src/snippets/sharedemployee/main.cpp
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#include "employee.h"
+
+int main()
+{
+    Employee e1(1001, "Albrecht Durer");
+    Employee e2 = e1;
+    e1.setName("Hans Holbein");
+}
+//! [0]
diff --git a/doc/src/snippets/sharedemployee/sharedemployee.pro b/doc/src/snippets/sharedemployee/sharedemployee.pro
new file mode 100644
index 0000000000..536a77de53
--- /dev/null
+++ b/doc/src/snippets/sharedemployee/sharedemployee.pro
@@ -0,0 +1,3 @@
+HEADERS = employee.h
+SOURCES = employee.cpp \
+          main.cpp
diff --git a/doc/src/snippets/sharedtablemodel/main.cpp b/doc/src/snippets/sharedtablemodel/main.cpp
new file mode 100644
index 0000000000..d333575c68
--- /dev/null
+++ b/doc/src/snippets/sharedtablemodel/main.cpp
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+  main.cpp
+
+  A simple example that shows how a single model can be shared between
+  multiple views.
+*/
+
+#include <QApplication>
+#include <QHeaderView>
+#include <QItemSelectionModel>
+#include <QTableView>
+
+#include "model.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    TableModel *model = new TableModel(4, 2, &app);
+
+//! [0]
+    QTableView *firstTableView = new QTableView;
+    QTableView *secondTableView = new QTableView;
+//! [0]
+
+//! [1]
+    firstTableView->setModel(model);
+    secondTableView->setModel(model);
+//! [1]
+
+    firstTableView->horizontalHeader()->setModel(model);
+
+    for (int row = 0; row < 4; ++row) {
+        for (int column = 0; column < 2; ++column) {
+            QModelIndex index = model->index(row, column, QModelIndex());
+            model->setData(index, QVariant(QString("(%1, %2)").arg(row).arg(column)));
+        }
+    }
+
+//! [2]
+    secondTableView->setSelectionModel(firstTableView->selectionModel());
+//! [2]
+
+    firstTableView->setWindowTitle("First table view");
+    secondTableView->setWindowTitle("Second table view");
+    firstTableView->show();
+    secondTableView->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/sharedtablemodel/model.cpp b/doc/src/snippets/sharedtablemodel/model.cpp
new file mode 100644
index 0000000000..ad7d2eddf8
--- /dev/null
+++ b/doc/src/snippets/sharedtablemodel/model.cpp
@@ -0,0 +1,237 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+    model.cpp
+
+    Provides a table model for use in various examples.
+*/
+
+#include <QtGui>
+
+#include "model.h"
+
+/*!
+    Constructs a table model with at least one row and one column.
+*/
+
+TableModel::TableModel(int rows, int columns, QObject *parent)
+    : QAbstractTableModel(parent)
+{
+    QStringList newList;
+
+    for (int column = 0; column < qMax(1, columns); ++column) {
+        newList.append("");
+    }
+
+    for (int row = 0; row < qMax(1, rows); ++row) {
+        rowList.append(newList);
+    }
+}
+
+
+/*!
+    Returns the number of items in the row list as the number of rows
+    in the model.
+*/
+
+int TableModel::rowCount(const QModelIndex &/*parent*/) const
+{
+    return rowList.size();
+}
+
+/*!
+    Returns the number of items in the first list item as the number of
+    columns in the model. All rows should have the same number of columns.
+*/
+
+int TableModel::columnCount(const QModelIndex &/*parent*/) const
+{
+    return rowList[0].size();
+}
+
+/*!
+    Returns an appropriate value for the requested data.
+    If the view requests an invalid index, an invalid variant is returned.
+    Any valid index that corresponds to a string in the list causes that
+    string to be returned for the display role; otherwise an invalid variant
+    is returned.
+*/
+
+QVariant TableModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+
+    if (role == Qt::DisplayRole)
+        return rowList[index.row()][index.column()];
+    else
+        return QVariant();
+}
+
+/*!
+    Returns the appropriate header string depending on the orientation of
+    the header and the section. If anything other than the display role is
+    requested, we return an invalid variant.
+*/
+
+QVariant TableModel::headerData(int section, Qt::Orientation orientation,
+                                int role) const
+{
+    if (role != Qt::DisplayRole)
+        return QVariant();
+
+    if (orientation == Qt::Horizontal)
+        return QString("Column %1").arg(section);
+    else
+        return QString("Row %1").arg(section);
+}
+
+/*!
+    Returns an appropriate value for the item's flags. Valid items are
+    enabled, selectable, and editable.
+*/
+
+Qt::ItemFlags TableModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return Qt::ItemIsEnabled;
+
+    return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
+}
+
+/*!
+    Changes an item in the model, but only if the following conditions
+    are met:
+
+    * The index supplied is valid.
+    * The role associated with editing text is specified.
+
+    The dataChanged() signal is emitted if the item is changed.
+*/
+
+bool TableModel::setData(const QModelIndex &index,
+                         const QVariant &value, int role)
+{
+    if (!index.isValid() || role != Qt::EditRole)
+        return false;
+
+    rowList[index.row()][index.column()] = value.toString();
+    emit dataChanged(index, index);
+    return true;
+}
+
+/*!
+    Inserts a number of rows into the model at the specified position.
+*/
+
+bool TableModel::insertRows(int position, int rows, const QModelIndex &parent)
+{
+    int columns = columnCount();
+    beginInsertRows(parent, position, position + rows - 1);
+
+    for (int row = 0; row < rows; ++row) {
+        QStringList items;
+        for (int column = 0; column < columns; ++column)
+            items.append("");
+        rowList.insert(position, items);
+    }
+
+    endInsertRows();
+    return true;
+}
+
+/*!
+    Inserts a number of columns into the model at the specified position.
+    Each entry in the list is extended in turn with the required number of
+    empty strings.
+*/
+
+bool TableModel::insertColumns(int position, int columns, const QModelIndex &parent)
+{
+    int rows = rowCount();
+    beginInsertColumns(parent, position, position + columns - 1);
+
+    for (int row = 0; row < rows; ++row) {
+        for (int column = position; column < columns; ++column) {
+            rowList[row].insert(position, "");
+        }
+    }
+
+    endInsertColumns();
+    return true;
+}
+
+/*!
+    Removes a number of rows from the model at the specified position.
+*/
+
+bool TableModel::removeRows(int position, int rows, const QModelIndex &parent)
+{
+    beginRemoveRows(parent, position, position + rows - 1);
+
+    for (int row = 0; row < rows; ++row) {
+        rowList.removeAt(position);
+    }
+
+    endRemoveRows();
+    return true;
+}
+
+/*!
+    Removes a number of columns from the model at the specified position.
+    Each row is shortened by the number of columns specified.
+*/
+
+bool TableModel::removeColumns(int position, int columns, const QModelIndex &parent)
+{
+    int rows = rowCount();
+    beginRemoveColumns(parent, position, position + columns - 1);
+
+    for (int row = 0; row < rows; ++row) {
+        for (int column = 0; column < columns; ++column) {
+            rowList[row].removeAt(position);
+        }
+    }
+
+    endRemoveColumns();
+    return true;
+}
diff --git a/doc/src/snippets/sharedtablemodel/model.h b/doc/src/snippets/sharedtablemodel/model.h
new file mode 100644
index 0000000000..207f83a8bd
--- /dev/null
+++ b/doc/src/snippets/sharedtablemodel/model.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MODEL_H
+#define MODEL_H
+
+#include <QAbstractTableModel>
+#include <QStringList>
+#include <QVariant>
+
+class TableModel : public QAbstractTableModel
+{
+    Q_OBJECT
+
+public:
+    TableModel(int rows = 1, int columns = 1, QObject *parent = 0);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    QVariant data(const QModelIndex &index, int role) const;
+    QVariant headerData(int section, Qt::Orientation orientation,
+                        int role = Qt::DisplayRole) const;
+
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+    bool setData(const QModelIndex &index, const QVariant &value,
+                 int role = Qt::EditRole);
+
+    bool insertRows(int position, int rows, const QModelIndex &parent = QModelIndex());
+    bool insertColumns(int position, int columns, const QModelIndex &parent = QModelIndex());
+    bool removeRows(int position, int rows, const QModelIndex &parent = QModelIndex());
+    bool removeColumns(int position, int columns, const QModelIndex &parent = QModelIndex());
+
+private:
+    QList<QStringList> rowList;
+};
+
+#endif
diff --git a/doc/src/snippets/sharedtablemodel/sharedtablemodel.pro b/doc/src/snippets/sharedtablemodel/sharedtablemodel.pro
new file mode 100644
index 0000000000..10671e6e25
--- /dev/null
+++ b/doc/src/snippets/sharedtablemodel/sharedtablemodel.pro
@@ -0,0 +1,2 @@
+HEADERS += model.h
+SOURCES += main.cpp model.cpp
diff --git a/doc/src/snippets/signalmapper/accountsfile.txt b/doc/src/snippets/signalmapper/accountsfile.txt
new file mode 100644
index 0000000000..2ec5ffbc17
--- /dev/null
+++ b/doc/src/snippets/signalmapper/accountsfile.txt
@@ -0,0 +1 @@
+1 + 1 = 2
diff --git a/doc/src/snippets/signalmapper/filereader.cpp b/doc/src/snippets/signalmapper/filereader.cpp
new file mode 100644
index 0000000000..8732dab349
--- /dev/null
+++ b/doc/src/snippets/signalmapper/filereader.cpp
@@ -0,0 +1,59 @@
+#include <QtGui>
+#include "filereader.h"
+
+
+FileReader::FileReader(QWidget *parent)
+    : QWidget(parent)
+{
+    textEdit = new QTextEdit;
+
+    taxFileButton = new QPushButton("Tax File");
+    accountFileButton = new QPushButton("Accounts File");
+    reportFileButton = new QPushButton("Report File");
+
+//! [0]
+    signalMapper = new QSignalMapper(this);
+    signalMapper->setMapping(taxFileButton, QString("taxfile.txt"));
+    signalMapper->setMapping(accountFileButton, QString("accountsfile.txt"));
+    signalMapper->setMapping(reportFileButton, QString("reportfile.txt"));
+
+    connect(taxFileButton, SIGNAL(clicked()),
+        signalMapper, SLOT (map()));
+    connect(accountFileButton, SIGNAL(clicked()),
+        signalMapper, SLOT (map()));
+    connect(reportFileButton, SIGNAL(clicked()),
+        signalMapper, SLOT (map()));
+//! [0]
+
+//! [1]
+    connect(signalMapper, SIGNAL(mapped(const QString &)),
+        this, SLOT(readFile(const QString &)));
+//! [1]
+
+    QHBoxLayout *buttonLayout = new QHBoxLayout;
+    buttonLayout->addWidget(taxFileButton);
+    buttonLayout->addWidget(accountFileButton);
+    buttonLayout->addWidget(reportFileButton);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(textEdit);
+    mainLayout->addLayout(buttonLayout);
+
+    setLayout(mainLayout);
+}
+
+void FileReader::readFile(const QString &filename)
+{
+    QFile file(filename);
+    
+    if (!file.open(QIODevice::ReadOnly)) {
+        QMessageBox::information(this, tr("Unable to open file"),
+            file.errorString());
+        return;
+    }
+
+
+    QTextStream in(&file);
+    textEdit->setPlainText(in.readAll());
+}
+
diff --git a/doc/src/snippets/signalmapper/filereader.h b/doc/src/snippets/signalmapper/filereader.h
new file mode 100644
index 0000000000..a3be088299
--- /dev/null
+++ b/doc/src/snippets/signalmapper/filereader.h
@@ -0,0 +1,28 @@
+#ifndef FILEREADER_H
+#define FILEREADER_H
+
+#include <QTextEdit>
+#include <QPushButton>
+#include <QSignalMapper>
+
+class FileReader : public QWidget
+{
+    Q_OBJECT
+
+public:
+    FileReader(QWidget *parent=0);
+    void readFromFile(QString filename);
+
+public slots:
+    void readFile(const QString &);
+
+private:
+    QTextEdit *textEdit;
+    QPushButton *taxFileButton;
+    QPushButton *accountFileButton;
+    QPushButton *reportFileButton;
+    QSignalMapper *signalMapper;
+};
+
+#endif
+
diff --git a/doc/src/snippets/signalmapper/main.cpp b/doc/src/snippets/signalmapper/main.cpp
new file mode 100644
index 0000000000..ebc601b7b0
--- /dev/null
+++ b/doc/src/snippets/signalmapper/main.cpp
@@ -0,0 +1,13 @@
+#include <QtGui>
+#include "filereader.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    FileReader *reader = new FileReader;
+    reader->show();
+
+    return app.exec();
+}
+
diff --git a/doc/src/snippets/signalmapper/reportfile.txt b/doc/src/snippets/signalmapper/reportfile.txt
new file mode 100644
index 0000000000..30123cc602
--- /dev/null
+++ b/doc/src/snippets/signalmapper/reportfile.txt
@@ -0,0 +1,2 @@
+Tax this year = 50%
+Total profit = 2
diff --git a/doc/src/snippets/signalmapper/signalmapper.pro b/doc/src/snippets/signalmapper/signalmapper.pro
new file mode 100644
index 0000000000..9a9d669559
--- /dev/null
+++ b/doc/src/snippets/signalmapper/signalmapper.pro
@@ -0,0 +1,12 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Wed Jul 2 14:50:56 2008
+######################################################################
+
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+HEADERS += filereader.h
+SOURCES += filereader.cpp main.cpp
diff --git a/doc/src/snippets/signalmapper/taxfile.txt b/doc/src/snippets/signalmapper/taxfile.txt
new file mode 100644
index 0000000000..a682e0aaa5
--- /dev/null
+++ b/doc/src/snippets/signalmapper/taxfile.txt
@@ -0,0 +1 @@
+Tax this year = 50%
diff --git a/doc/src/snippets/signalsandslots/lcdnumber.cpp b/doc/src/snippets/signalsandslots/lcdnumber.cpp
new file mode 100644
index 0000000000..2374992180
--- /dev/null
+++ b/doc/src/snippets/signalsandslots/lcdnumber.cpp
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "lcdnumber.h"
+
+LcdNumber::LcdNumber(QWidget *parent)
+{
+}
+
+void LcdNumber::display(int)
+{
+}
+
+void LcdNumber::display(double)
+{
+}
+
+void LcdNumber::display(const QString &)
+{
+}
+
+void LcdNumber::setHexMode()
+{
+}
+
+void LcdNumber::setDecMode()
+{
+}
+
+void LcdNumber::setOctMode()
+{
+}
+
+void LcdNumber::setBinMode()
+{
+}
+
+void LcdNumber::setSmallDecimalPoint(bool)
+{
+}
diff --git a/doc/src/snippets/signalsandslots/lcdnumber.h b/doc/src/snippets/signalsandslots/lcdnumber.h
new file mode 100644
index 0000000000..b1d5f50ffc
--- /dev/null
+++ b/doc/src/snippets/signalsandslots/lcdnumber.h
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#ifndef LCDNUMBER_H
+//! [0] //! [1]
+#define LCDNUMBER_H
+//! [1]
+
+//! [2]
+#include <QFrame>
+//! [2]
+
+//! [3]
+class LcdNumber : public QFrame
+//! [3] //! [4]
+{
+//! [4] //! [5]
+    Q_OBJECT
+//! [5]
+
+//! [6]
+public:
+//! [6] //! [7]
+    LcdNumber(QWidget *parent = 0);
+//! [7]
+
+//! [8]
+signals:
+//! [8] //! [9]
+    void overflow();
+//! [9]
+
+//! [10]
+public slots:
+//! [10] //! [11]
+    void display(int num);
+    void display(double num);
+    void display(const QString &str);
+    void setHexMode();
+    void setDecMode();
+    void setOctMode();
+    void setBinMode();
+    void setSmallDecimalPoint(bool point);
+//! [11] //! [12]
+};
+//! [12]
+
+//! [13]
+#endif
+//! [13]
diff --git a/doc/src/snippets/signalsandslots/signalsandslots.cpp b/doc/src/snippets/signalsandslots/signalsandslots.cpp
new file mode 100644
index 0000000000..a8f3a01c94
--- /dev/null
+++ b/doc/src/snippets/signalsandslots/signalsandslots.cpp
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QAbstractButton>
+
+#include "signalsandslots.h"
+
+//! [0]
+void Counter::setValue(int value)
+{
+    if (value != m_value) {
+        m_value = value;
+        emit valueChanged(value);
+    }
+}
+//! [0]
+
+int main()
+{
+//! [1]
+    Counter a, b;
+//! [1] //! [2]
+    QObject::connect(&a, SIGNAL(valueChanged(int)),
+                     &b, SLOT(setValue(int)));
+//! [2]
+
+//! [3]
+    a.setValue(12);     // a.value() == 12, b.value() == 12
+//! [3] //! [4]
+    b.setValue(48);     // a.value() == 12, b.value() == 48
+//! [4]
+
+
+    QWidget *widget = reinterpret_cast<QWidget *>(new QObject(0));
+//! [5]
+    if (widget->inherits("QAbstractButton")) {
+        QAbstractButton *button = static_cast<QAbstractButton *>(widget);
+        button->toggle();
+//! [5] //! [6]
+    }
+//! [6]
+
+//! [7]
+    if (QAbstractButton *button = qobject_cast<QAbstractButton *>(widget))
+        button->toggle();
+//! [7]
+}
diff --git a/doc/src/snippets/signalsandslots/signalsandslots.h b/doc/src/snippets/signalsandslots/signalsandslots.h
new file mode 100644
index 0000000000..25d8984e1b
--- /dev/null
+++ b/doc/src/snippets/signalsandslots/signalsandslots.h
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SIGNALSANDSLOTS_H
+#define SIGNALSANDSLOTS_H
+
+#define Counter PlainCounter
+
+//! [0]
+class Counter
+{
+public:
+    Counter() { m_value = 0; }
+
+    int value() const { return m_value; }
+    void setValue(int value);
+
+private:
+    int m_value;
+};
+//! [0]
+
+#undef Counter
+#define Counter ObjectCounter
+
+//! [1]
+#include <QObject>
+//! [1]
+
+//! [2]
+class Counter : public QObject
+//! [2] //! [3]
+{
+    Q_OBJECT
+
+public:
+    Counter() { m_value = 0; }
+
+    int value() const { return m_value; }
+
+public slots:
+    void setValue(int value);
+
+signals:
+    void valueChanged(int newValue);
+
+private:
+    int m_value;
+};
+//! [3]
+
+#endif
diff --git a/doc/src/snippets/simplemodel-use/main.cpp b/doc/src/snippets/simplemodel-use/main.cpp
new file mode 100644
index 0000000000..acb680da30
--- /dev/null
+++ b/doc/src/snippets/simplemodel-use/main.cpp
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+  main.cpp
+
+  A simple example of how to access items from an existing model.
+*/
+
+#include <QtGui>
+
+/*!
+    Create a default directory model and, using the index-based interface to
+    the model and some QLabel widgets, populate the window's layout with the
+    names of objects in the directory.
+
+    Note that we only want to read the filenames in the highest level of the
+    directory, so we supply a default (invalid) QModelIndex to the model in
+    order to indicate that we want top-level items.
+*/
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QWidget *window = new QWidget;
+    QVBoxLayout *layout = new QVBoxLayout(window);
+    QLabel *title = new QLabel("Some items from the directory model", window);
+    title->setBackgroundRole(QPalette::Base);
+    title->setMargin(8);
+    layout->addWidget(title);
+    
+//! [0]
+    QDirModel *model = new QDirModel;
+    QModelIndex parentIndex = model->index(QDir::currentPath());
+    int numRows = model->rowCount(parentIndex);
+//! [0]
+
+//! [1]
+    for (int row = 0; row < numRows; ++row) {
+        QModelIndex index = model->index(row, 0, parentIndex);
+//! [1]
+
+//! [2]
+        QString text = model->data(index, Qt::DisplayRole).toString();
+        // Display the text in a widget.
+//! [2]
+
+        QLabel *label = new QLabel(text, window);
+        layout->addWidget(label);
+//! [3]
+    }
+//! [3]
+
+    window->setWindowTitle("A simple model example");
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/simplemodel-use/simplemodel-use.pro b/doc/src/snippets/simplemodel-use/simplemodel-use.pro
new file mode 100644
index 0000000000..28dcadcbfa
--- /dev/null
+++ b/doc/src/snippets/simplemodel-use/simplemodel-use.pro
@@ -0,0 +1 @@
+SOURCES += main.cpp
diff --git a/doc/src/snippets/snippets.pro b/doc/src/snippets/snippets.pro
new file mode 100644
index 0000000000..50e33b322f
--- /dev/null
+++ b/doc/src/snippets/snippets.pro
@@ -0,0 +1,109 @@
+### A qmake file for the snippets. *** This is not for distribution. ***
+#
+# Snippets that don't work are commented out and marked with "broken";
+# other commented out snippets were probably not designed to be built.
+
+TEMPLATE        = subdirs
+SUBDIRS         = brush \
+                  buffer \
+#                  clipboard \      # broken
+                  coordsys \
+#                  customstyle \
+                  designer \
+                  dialogs \
+                  dockwidgets \
+                  draganddrop \
+                  dragging \
+                  dropactions \
+                  dropevents \
+                  droprectangle \
+                  events \
+#                  file \
+                  image \
+                  inherited-slot \
+                  itemselection \
+                  layouts \
+                  matrix \
+                  moc \
+#                  modelview-subclasses \   # broken
+                  painterpath \
+                  persistentindexes \
+                  picture \
+                  plaintextlayout \
+#                  pointer \
+                  polygon \
+                  process \
+                  qdbusextratypes \
+                  qcalendarwidget \
+                  qdir-filepaths \
+                  qdir-listfiles \
+                  qdir-namefilters \
+                  qfontdatabase \
+                  qlabel \
+                  qlineargradient \
+                  qlistview-dnd \
+                  qlistview-using \
+                  qlistwidget-dnd \
+                  qlistwidget-using \
+#                  qmake \                  # not designed to be built
+                  qmetaobject-invokable \
+                  qprocess \
+                  qprocess-environment \
+#                  qsignalmapper \
+                  qsortfilterproxymodel-details \
+                  qsplashscreen \
+                  qstack \
+                  qstackedlayout \
+                  qstackedwidget \
+                  qstandarditemmodel \
+                  qstatustipevent \
+                  qstring \
+                  qstringlist \
+                  qstringlistmodel \
+                  qstyleoption \
+                  qstyleplugin \
+                  qsvgwidget \
+                  qtablewidget-dnd \
+                  qtablewidget-resizing \
+                  qtablewidget-using \
+                  qtcast \
+                  qtreeview-dnd \
+                  qtreewidgetitemiterator-using \
+                  qtreewidget-using \
+                  quiloader \
+                  qx11embedcontainer \
+                  qx11embedwidget \
+                  reading-selections \
+                  scribe-overview \
+                  separations \
+#                  settings \               # not designed to be built
+                  shareddirmodel \
+                  sharedemployee \
+                  sharedtablemodel \
+#                  signalsandslots \
+                  simplemodel-use \
+#                  splitter \
+                  sqldatabase \
+                  stringlistmodel \
+#                  styles \
+                  textblock-formats \
+                  textblock-fragments \
+                  textdocument-blocks \
+                  textdocument-charformats \
+                  textdocument-cursors \
+                  textdocument-find \
+                  textdocument-frames \
+                  textdocument-imageformat \
+                  textdocument-images \
+                  textdocument-listitems \
+                  textdocument-lists \
+                  textdocument-printing \
+#                  textdocument-resources \
+                  textdocument-selections \
+                  textdocument-tables \
+#                  threads \
+                  timers \
+                  updating-selections \
+#                  whatsthis \
+                  widget-mask \
+                  xml
diff --git a/doc/src/snippets/splitter/splitter.cpp b/doc/src/snippets/splitter/splitter.cpp
new file mode 100644
index 0000000000..8584b629b8
--- /dev/null
+++ b/doc/src/snippets/splitter/splitter.cpp
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+void processSize(int)
+{
+}
+
+int main()
+{
+    QWidget *parent = 0;
+
+//! [0]
+    QSplitter *splitter = new QSplitter(parent);
+    QListView *listview = new QListView;
+    QTreeView *treeview = new QTreeView;
+    QTextEdit *textedit = new QTextEdit;
+    splitter->addWidget(listview);
+    splitter->addWidget(treeview);
+    splitter->addWidget(textedit);
+//! [0]
+
+    {
+    // SAVE STATE
+//! [1]
+    QSettings settings;
+    settings.setValue("splitterSizes", splitter->saveState());
+//! [1]
+    }
+
+    {
+    // RESTORE STATE
+//! [2]
+    QSettings settings;
+    splitter->restoreState(settings.value("splitterSizes").toByteArray());
+//! [2]
+    }
+
+//! [3]
+    QListIterator<int> it(splitter->sizes());
+    while (it.hasNext())
+        processSize(it.next());
+//! [3]
+
+    return 0;
+}
diff --git a/doc/src/snippets/splitter/splitter.pro b/doc/src/snippets/splitter/splitter.pro
new file mode 100644
index 0000000000..2414a914a5
--- /dev/null
+++ b/doc/src/snippets/splitter/splitter.pro
@@ -0,0 +1 @@
+SOURCES += splitter.cpp
diff --git a/doc/src/snippets/splitterhandle/main.cpp b/doc/src/snippets/splitterhandle/main.cpp
new file mode 100644
index 0000000000..3f4e7ecdfa
--- /dev/null
+++ b/doc/src/snippets/splitterhandle/main.cpp
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QLabel>
+
+#include "splitter.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Splitter splitter(Qt::Horizontal);
+    splitter.addWidget(new QLabel("Hello"));
+    splitter.addWidget(new QLabel("World"));
+    Splitter verticalSplitter(Qt::Vertical, &splitter);
+    verticalSplitter.addWidget(new QLabel("A"));
+    verticalSplitter.addWidget(new QLabel("B"));
+    splitter.show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/splitterhandle/splitter.cpp b/doc/src/snippets/splitterhandle/splitter.cpp
new file mode 100644
index 0000000000..192dc79842
--- /dev/null
+++ b/doc/src/snippets/splitterhandle/splitter.cpp
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "splitter.h"
+
+SplitterHandle::SplitterHandle(Qt::Orientation orientation, QSplitter *parent)
+    : QSplitterHandle(orientation, parent)
+{
+    gradient.setColorAt(0.0, Qt::darkGreen);
+    gradient.setColorAt(0.25, Qt::white);
+    gradient.setColorAt(1.0, Qt::darkGreen);
+}
+
+//! [0]
+void SplitterHandle::paintEvent(QPaintEvent *event)
+{
+    QPainter painter(this);
+    if (orientation() == Qt::Horizontal) {
+        gradient.setStart(rect().left(), rect().height()/2);
+        gradient.setFinalStop(rect().right(), rect().height()/2);
+    } else {
+        gradient.setStart(rect().width()/2, rect().top());
+        gradient.setFinalStop(rect().width()/2, rect().bottom());
+    }
+    painter.fillRect(event->rect(), QBrush(gradient));
+}
+//! [0]
+
+Splitter::Splitter(Qt::Orientation orientation, QWidget *parent)
+    : QSplitter(orientation, parent)
+{
+}
+
+//! [1]
+QSplitterHandle *Splitter::createHandle()
+{
+    return new SplitterHandle(orientation(), this);
+}
+//! [1]
diff --git a/doc/src/snippets/splitterhandle/splitter.h b/doc/src/snippets/splitterhandle/splitter.h
new file mode 100644
index 0000000000..f9cb1a4cc8
--- /dev/null
+++ b/doc/src/snippets/splitterhandle/splitter.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SPLITTER_H
+#define SPLITTER_H
+
+#include <QLinearGradient>
+#include <QSplitter>
+#include <QSplitterHandle>
+
+class QPaintEvent;
+
+//! [0]
+class Splitter : public QSplitter
+{
+public:
+    Splitter(Qt::Orientation orientation, QWidget *parent = 0);
+
+protected:
+    QSplitterHandle *createHandle();
+};
+//! [0]
+
+class SplitterHandle : public QSplitterHandle
+{
+public:
+    SplitterHandle(Qt::Orientation orientation, QSplitter *parent);
+
+protected:
+    void paintEvent(QPaintEvent *event);
+
+private:
+    QLinearGradient gradient;
+};
+
+#endif
diff --git a/doc/src/snippets/splitterhandle/splitterhandle.pro b/doc/src/snippets/splitterhandle/splitterhandle.pro
new file mode 100644
index 0000000000..0c2a999c1f
--- /dev/null
+++ b/doc/src/snippets/splitterhandle/splitterhandle.pro
@@ -0,0 +1,3 @@
+HEADERS   = splitter.h
+SOURCES   = main.cpp \
+            splitter.cpp
diff --git a/doc/src/snippets/sqldatabase/sqldatabase.cpp b/doc/src/snippets/sqldatabase/sqldatabase.cpp
new file mode 100644
index 0000000000..ae176acab0
--- /dev/null
+++ b/doc/src/snippets/sqldatabase/sqldatabase.cpp
@@ -0,0 +1,560 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtSql>
+
+#include <iostream>
+
+using namespace std;
+
+QString tr(const char *text)
+{
+    return QApplication::translate(text, text);
+}
+
+void QSqlDatabase_snippets()
+{
+    {
+//! [0]
+    QSqlDatabase db = QSqlDatabase::addDatabase("QPSQL");
+    db.setHostName("acidalia");
+    db.setDatabaseName("customdb");
+    db.setUserName("mojito");
+    db.setPassword("J0a1m8");
+    bool ok = db.open();
+//! [0]
+    Q_UNUSED(ok);
+    }
+
+    {
+//! [1]
+    QSqlDatabase db = QSqlDatabase::database();
+//! [1]
+    }
+}
+
+void QSqlField_snippets()
+{
+#if 0
+    {
+//! [2]
+    QSqlField field("age", QVariant::Int);
+    field.setValue(QPixmap());  // WRONG
+//! [2]
+    }
+#endif
+
+    {
+//! [3]
+    QSqlField field("age", QVariant::Int);
+    field.setValue(QString("123"));  // casts QString to int
+//! [3]
+    }
+
+    {
+//! [4]
+    QSqlQuery query;
+//! [4] //! [5]
+    QSqlRecord record = query.record();
+//! [5] //! [6]
+    QSqlField field = record.field("country");
+//! [6]
+    }
+}
+
+void doSomething(const QString &)
+{
+}
+
+void QSqlQuery_snippets()
+{
+    {
+    // typical loop
+//! [7]
+    QSqlQuery query("SELECT country FROM artist");
+    while (query.next()) {
+        QString country = query.value(0).toString();
+        doSomething(country);
+    }
+//! [7]
+    }
+
+    {
+    // field index lookup
+//! [8]
+    QSqlQuery query("SELECT * FROM artist");
+    int fieldNo = query.record().indexOf("country");
+    while (query.next()) {
+        QString country = query.value(fieldNo).toString();
+        doSomething(country);
+    }
+//! [8]
+    }
+
+    {
+    // named with named
+//! [9]
+    QSqlQuery query;
+    query.prepare("INSERT INTO person (id, forename, surname) "
+                  "VALUES (:id, :forename, :surname)");
+    query.bindValue(":id", 1001);
+    query.bindValue(":forename", "Bart");
+    query.bindValue(":surname", "Simpson");
+    query.exec();
+//! [9]
+    }
+
+    {
+    // positional with named
+//! [10]
+    QSqlQuery query;
+    query.prepare("INSERT INTO person (id, forename, surname) "
+                  "VALUES (:id, :forename, :surname)");
+    query.bindValue(0, 1001);
+    query.bindValue(1, "Bart");
+    query.bindValue(2, "Simpson");
+    query.exec();
+//! [10]
+    }
+
+    {
+    // positional 1
+//! [11]
+    QSqlQuery query;
+    query.prepare("INSERT INTO person (id, forename, surname) "
+                  "VALUES (?, ?, ?)");
+    query.bindValue(0, 1001);
+    query.bindValue(1, "Bart");
+    query.bindValue(2, "Simpson");
+    query.exec();
+//! [11]
+    }
+
+    {
+    // positional 2
+//! [12]
+    QSqlQuery query;
+    query.prepare("INSERT INTO person (id, forename, surname) "
+                  "VALUES (?, ?, ?)");
+    query.addBindValue(1001);
+    query.addBindValue("Bart");
+    query.addBindValue("Simpson");
+    query.exec();
+//! [12]
+    }
+
+    {
+    // stored
+//! [13]
+    QSqlQuery query;
+    query.prepare("CALL AsciiToInt(?, ?)");
+    query.bindValue(0, "A");
+    query.bindValue(1, 0, QSql::Out);
+    query.exec();
+    int i = query.boundValue(1).toInt(); // i is 65
+//! [13]
+    Q_UNUSED(i);
+    }
+
+    QSqlQuery query;
+
+    {
+    // examine with named binding
+//! [14]
+    QMapIterator<QString, QVariant> i(query.boundValues());
+    while (i.hasNext()) {
+        i.next();
+        cout << i.key().toAscii().data() << ": "
+             << i.value().toString().toAscii().data() << endl;
+    }
+//! [14]
+    }
+
+    {
+    // examine with positional binding
+//! [15]
+    QList<QVariant> list = query.boundValues().values();
+    for (int i = 0; i < list.size(); ++i)
+        cout << i << ": " << list.at(i).toString().toAscii().data() << endl;
+//! [15]
+    }
+}
+
+void QSqlQueryModel_snippets()
+{
+    {
+//! [16]
+    QSqlQueryModel *model = new QSqlQueryModel;
+    model->setQuery("SELECT name, salary FROM employee");
+    model->setHeaderData(0, Qt::Horizontal, tr("Name"));
+    model->setHeaderData(1, Qt::Horizontal, tr("Salary"));
+
+//! [17]
+    QTableView *view = new QTableView;
+//! [17] //! [18]
+    view->setModel(model);
+//! [18] //! [19]
+    view->show();
+//! [16] //! [19] //! [20]
+    view->setEditTriggers(QAbstractItemView::NoEditTriggers);
+//! [20]
+    }
+
+//! [21]
+    QSqlQueryModel model;
+    model.setQuery("SELECT * FROM employee");
+    int salary = model.record(4).value("salary").toInt();
+//! [21]
+    Q_UNUSED(salary);
+
+    {
+//! [22]
+    int salary = model.data(model.index(4, 2)).toInt();
+//! [22]
+    Q_UNUSED(salary);
+    }
+
+    for (int row = 0; row < model.rowCount(); ++row) {
+        for (int col = 0; col < model.columnCount(); ++col) {
+            qDebug() << model.data(model.index(row, col));
+        }
+    }
+}
+
+class MyModel : public QSqlQueryModel
+{
+public:
+    QVariant data(const QModelIndex &item, int role) const;
+
+    int m_specialColumnNo;
+};
+
+//! [23]
+QVariant MyModel::data(const QModelIndex &item, int role) const
+{
+    if (item.column() == m_specialColumnNo) {
+        // handle column separately
+    }
+    return QSqlQueryModel::data(item, role);
+}
+//! [23]
+
+void QSqlTableModel_snippets()
+{
+//! [24]
+    QSqlTableModel *model = new QSqlTableModel;
+    model->setTable("employee");
+    model->setEditStrategy(QSqlTableModel::OnManualSubmit);
+    model->select();
+    model->removeColumn(0); // don't show the ID
+    model->setHeaderData(0, Qt::Horizontal, tr("Name"));
+    model->setHeaderData(1, Qt::Horizontal, tr("Salary"));
+
+    QTableView *view = new QTableView;
+    view->setModel(model);
+    view->show();
+//! [24]
+
+    {
+//! [25]
+    QSqlTableModel model;
+    model.setTable("employee");
+    QString name = model.record(4).value("name").toString();
+//! [25]
+    }
+}
+
+void sql_intro_snippets()
+{
+    {
+//! [26]
+    QSqlDatabase db = QSqlDatabase::addDatabase("QMYSQL");
+    db.setHostName("bigblue");
+    db.setDatabaseName("flightdb");
+    db.setUserName("acarlson");
+    db.setPassword("1uTbSbAs");
+    bool ok = db.open();
+//! [26]
+    Q_UNUSED(ok);
+    }
+
+    {
+//! [27]
+    QSqlDatabase firstDB = QSqlDatabase::addDatabase("QMYSQL", "first");
+    QSqlDatabase secondDB = QSqlDatabase::addDatabase("QMYSQL", "second");
+//! [27]
+    }
+
+    {
+//! [28]
+    QSqlDatabase defaultDB = QSqlDatabase::database();
+//! [28] //! [29]
+    QSqlDatabase firstDB = QSqlDatabase::database("first");
+//! [29] //! [30]
+    QSqlDatabase secondDB = QSqlDatabase::database("second");
+//! [30]
+    }
+
+    {
+    // SELECT1
+//! [31]
+    QSqlQuery query;
+    query.exec("SELECT name, salary FROM employee WHERE salary > 50000");
+//! [31]
+
+//! [32]
+    while (query.next()) {
+        QString name = query.value(0).toString();
+        int salary = query.value(1).toInt();
+        qDebug() << name << salary;
+    }
+//! [32]
+    }
+
+    {
+    // FEATURE
+//! [33]
+    QSqlQuery query;
+    int numRows;
+    query.exec("SELECT name, salary FROM employee WHERE salary > 50000");
+
+    QSqlDatabase defaultDB = QSqlDatabase::database();
+    if (defaultDB.driver()->hasFeature(QSqlDriver::QuerySize)) {
+        numRows = query.size();
+    } else {
+        // this can be very slow
+        query.last();
+        numRows = query.at() + 1;
+    }
+//! [33]
+    }
+
+    {
+    // INSERT1
+//! [34]
+    QSqlQuery query;
+    query.exec("INSERT INTO employee (id, name, salary) "
+               "VALUES (1001, 'Thad Beaumont', 65000)");
+//! [34]
+    }
+
+    {
+    // NAMED BINDING
+//! [35]
+    QSqlQuery query;
+    query.prepare("INSERT INTO employee (id, name, salary) "
+                  "VALUES (:id, :name, :salary)");
+    query.bindValue(":id", 1001);
+    query.bindValue(":name", "Thad Beaumont");
+    query.bindValue(":salary", 65000);
+    query.exec();
+//! [35]
+    }
+
+    {
+    // POSITIONAL BINDING
+//! [36]
+    QSqlQuery query;
+    query.prepare("INSERT INTO employee (id, name, salary) "
+                  "VALUES (?, ?, ?)");
+    query.addBindValue(1001);
+    query.addBindValue("Thad Beaumont");
+    query.addBindValue(65000);
+    query.exec();
+//! [36]
+    }
+
+    {
+    // UPDATE1
+//! [37]
+    QSqlQuery query;
+    query.exec("UPDATE employee SET salary = 70000 WHERE id = 1003");
+//! [37]
+    }
+
+    {
+    // DELETE1
+//! [38]
+    QSqlQuery query;
+    query.exec("DELETE FROM employee WHERE id = 1007");
+//! [38]
+    }
+
+    {
+    // TRANSACTION
+//! [39]
+    QSqlDatabase::database().transaction();
+    QSqlQuery query;
+    query.exec("SELECT id FROM employee WHERE name = 'Torild Halvorsen'");
+    if (query.next()) {
+        int employeeId = query.value(0).toInt();
+        query.exec("INSERT INTO project (id, name, ownerid) "
+                   "VALUES (201, 'Manhattan Project', "
+                   + QString::number(employeeId) + ')');
+    }
+    QSqlDatabase::database().commit();
+//! [39]
+    }
+
+    {
+    // SQLQUERYMODEL1
+//! [40]
+    QSqlQueryModel model;
+    model.setQuery("SELECT * FROM employee");
+
+    for (int i = 0; i < model.rowCount(); ++i) {
+        int id = model.record(i).value("id").toInt();
+        QString name = model.record(i).value("name").toString();
+        qDebug() << id << name;
+    }
+//! [40]
+    }
+
+    {
+    // SQLTABLEMODEL1
+//! [41]
+    QSqlTableModel model;
+    model.setTable("employee");
+    model.setFilter("salary > 50000");
+    model.setSort(2, Qt::DescendingOrder);
+    model.select();
+
+    for (int i = 0; i < model.rowCount(); ++i) {
+        QString name = model.record(i).value("name").toString();
+        int salary = model.record(i).value("salary").toInt();
+        qDebug() << name << salary;
+    }
+//! [41]
+    }
+
+    {
+    // SQLTABLEMODEL2
+    QSqlTableModel model;
+    model.setTable("employee");
+
+//! [42]
+    for (int i = 0; i < model.rowCount(); ++i) {
+        QSqlRecord record = model.record(i);
+        double salary = record.value("salary").toInt();
+        salary *= 1.1;
+        record.setValue("salary", salary);
+        model.setRecord(i, record);
+    }
+    model.submitAll();
+//! [42]
+
+    // SQLTABLEMODEL3
+    int row = 1;
+    int column = 2;
+//! [43]
+    model.setData(model.index(row, column), 75000);
+    model.submitAll();
+//! [43]
+
+    // SQLTABLEMODEL4
+//! [44]
+    model.insertRows(row, 1);
+    model.setData(model.index(row, 0), 1013);
+    model.setData(model.index(row, 1), "Peter Gordon");
+    model.setData(model.index(row, 2), 68500);
+    model.submitAll();
+//! [44]
+
+//! [45]
+    model.removeRows(row, 5);
+//! [45] //! [46]
+    model.submitAll();
+//! [46]
+    }
+}
+
+//! [47]
+class XyzResult : public QSqlResult
+{
+public:
+    XyzResult(const QSqlDriver *driver)
+        : QSqlResult(driver) {}
+    ~XyzResult() {}
+
+protected:
+    QVariant data(int /* index */) { return QVariant(); }
+    bool isNull(int /* index */) { return false; }
+    bool reset(const QString & /* query */) { return false; }
+    bool fetch(int /* index */) { return false; }
+    bool fetchFirst() { return false; }
+    bool fetchLast() { return false; }
+    int size() { return 0; }
+    int numRowsAffected() { return 0; }
+    QSqlRecord record() { return QSqlRecord(); }
+};
+//! [47]
+
+//! [48]
+class XyzDriver : public QSqlDriver
+{
+public:
+    XyzDriver() {}
+    ~XyzDriver() {}
+
+    bool hasFeature(DriverFeature /* feature */) const { return false; }
+    bool open(const QString & /* db */, const QString & /* user */,
+              const QString & /* password */, const QString & /* host */,
+              int /* port */, const QString & /* options */)
+        { return false; }
+    void close() {}
+    QSqlResult *createResult() const { return new XyzResult(this); }
+};
+//! [48]
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    QSqlDatabase_snippets();
+    QSqlField_snippets();
+    QSqlQuery_snippets();
+    QSqlQueryModel_snippets();
+    QSqlTableModel_snippets();
+
+    XyzDriver driver;
+    XyzResult result(&driver);
+}
diff --git a/doc/src/snippets/sqldatabase/sqldatabase.pro b/doc/src/snippets/sqldatabase/sqldatabase.pro
new file mode 100644
index 0000000000..43996956b3
--- /dev/null
+++ b/doc/src/snippets/sqldatabase/sqldatabase.pro
@@ -0,0 +1,2 @@
+SOURCES += sqldatabase.cpp
+QT += sql
diff --git a/doc/src/snippets/streaming/main.cpp b/doc/src/snippets/streaming/main.cpp
new file mode 100644
index 0000000000..7ea53def4e
--- /dev/null
+++ b/doc/src/snippets/streaming/main.cpp
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QByteArray>
+#include <QDataStream>
+
+//! [0]
+struct Movie
+{
+    int id;
+    QString title;
+    QDate releaseDate;
+};
+//! [0]
+
+//! [1]
+QDataStream &operator<<(QDataStream &out, const Movie &movie)
+{
+    out << (quint32)movie.id << movie.title
+        << movie.releaseDate;
+    return out;
+}
+//! [1]
+
+//! [2]
+QDataStream &operator>>(QDataStream &in, Movie &movie)
+{
+    quint32 id;
+    QDate date;
+
+    in >> id >> movie.title >> date;
+    movie.id = (int)id;
+    movie.releaseDate = date;
+    return in;
+}
+//! [2]
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    Movie m;
+    m.id = 0001;
+    m.title = "Happy Meal";
+    m.releaseDate = QDate(1995, 5, 17);
+
+    QByteArray byteArray;
+    QDataStream stream(&byteArray, QIODevice::WriteOnly);
+    stream << m;
+    
+    // display
+    qDebug() << m.id << m.releaseDate << m.title;
+
+    Movie m2;
+    
+    int id2;
+    QString title2;
+    QDate date2;
+
+    QDataStream stream2(byteArray);
+    stream2 >> id2 >> title2 >> date2;
+
+    m2.id = id2;
+    m2.title = title2;
+    m2.releaseDate = date2;
+
+    qDebug() << id2 << " " << date2 << " " << title2;
+
+    return 0;
+}
diff --git a/doc/src/snippets/streaming/streaming.pro b/doc/src/snippets/streaming/streaming.pro
new file mode 100644
index 0000000000..8c5eb91f05
--- /dev/null
+++ b/doc/src/snippets/streaming/streaming.pro
@@ -0,0 +1,2 @@
+SOURCES = main.cpp
+CONFIG += CONSOLE
\ No newline at end of file
diff --git a/doc/src/snippets/stringlistmodel/main.cpp b/doc/src/snippets/stringlistmodel/main.cpp
new file mode 100644
index 0000000000..383acc67fd
--- /dev/null
+++ b/doc/src/snippets/stringlistmodel/main.cpp
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    The main function for the string list model example. This creates and
+    populates a model with values from a string list then displays the
+    contents of the model using a QListView widget.
+*/
+
+#include <QAbstractItemModel>
+#include <QApplication>
+#include <QListView>
+
+#include "model.h"
+
+//! [0]
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+// Unindented for quoting purposes:
+//! [1]
+QStringList numbers;
+numbers << "One" << "Two" << "Three" << "Four" << "Five";
+
+QAbstractItemModel *model = new StringListModel(numbers);
+//! [0] //! [1] //! [2] //! [3]
+QListView *view = new QListView;
+//! [2]
+view->setWindowTitle("View onto a string list model");
+//! [4]
+view->setModel(model);
+//! [3] //! [4]
+
+    model->insertRows(5, 7, QModelIndex());
+
+    for (int row = 5; row < 12; ++row) {
+        QModelIndex index = model->index(row, 0, QModelIndex());
+        model->setData(index, QString::number(row+1));
+    }
+
+//! [5]
+    view->show();
+    return app.exec();
+}
+//! [5]
diff --git a/doc/src/snippets/stringlistmodel/model.cpp b/doc/src/snippets/stringlistmodel/model.cpp
new file mode 100644
index 0000000000..8f681cc96f
--- /dev/null
+++ b/doc/src/snippets/stringlistmodel/model.cpp
@@ -0,0 +1,182 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+  model.cpp
+
+  A simple model that uses a QStringList as its data source.
+*/
+
+#include "model.h"
+
+/*!
+    Returns the number of items in the string list as the number of rows
+    in the model.
+*/
+
+//! [0]
+int StringListModel::rowCount(const QModelIndex &parent) const
+{
+    return stringList.count();
+}
+//! [0]
+
+/*!
+    Returns an appropriate value for the requested data.
+    If the view requests an invalid index, an invalid variant is returned.
+    Any valid index that corresponds to a string in the list causes that
+    string to be returned.
+*/
+
+//! [1]
+QVariant StringListModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+
+    if (index.row() >= stringList.size())
+        return QVariant();
+
+    if (role == Qt::DisplayRole)
+        return stringList.at(index.row());
+    else
+        return QVariant();
+}
+//! [1]
+
+/*!
+    Returns the appropriate header string depending on the orientation of
+    the header and the section. If anything other than the display role is
+    requested, we return an invalid variant.
+*/
+
+//! [2]
+QVariant StringListModel::headerData(int section, Qt::Orientation orientation,
+                                     int role) const
+{
+    if (role != Qt::DisplayRole)
+        return QVariant();
+
+    if (orientation == Qt::Horizontal)
+        return QString("Column %1").arg(section);
+    else
+        return QString("Row %1").arg(section);
+}
+//! [2]
+
+/*!
+    Returns an appropriate value for the item's flags. Valid items are
+    enabled, selectable, and editable.
+*/
+
+//! [3]
+Qt::ItemFlags StringListModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return Qt::ItemIsEnabled;
+
+    return QAbstractItemModel::flags(index) | Qt::ItemIsEditable;
+}
+//! [3]
+
+/*!
+    Changes an item in the string list, but only if the following conditions
+    are met:
+
+    * The index supplied is valid.
+    * The index corresponds to an item to be shown in a view.
+    * The role associated with editing text is specified.
+
+    The dataChanged() signal is emitted if the item is changed.
+*/
+
+//! [4]
+bool StringListModel::setData(const QModelIndex &index,
+                              const QVariant &value, int role)
+{
+    if (index.isValid() && role == Qt::EditRole) {
+
+        stringList.replace(index.row(), value.toString());
+        emit dataChanged(index, index);
+        return true;
+    }
+//! [4] //! [5]
+    return false;
+}
+//! [5]
+
+/*!
+    Inserts a number of rows into the model at the specified position.
+*/
+
+//! [6]
+bool StringListModel::insertRows(int position, int rows, const QModelIndex &parent)
+{
+    beginInsertRows(QModelIndex(), position, position+rows-1);
+
+    for (int row = 0; row < rows; ++row) {
+        stringList.insert(position, "");
+    }
+
+    endInsertRows();
+    return true;
+//! [6] //! [7]
+}
+//! [7]
+
+/*!
+    Removes a number of rows from the model at the specified position.
+*/
+
+//! [8]
+bool StringListModel::removeRows(int position, int rows, const QModelIndex &parent)
+{
+    beginRemoveRows(QModelIndex(), position, position+rows-1);
+
+    for (int row = 0; row < rows; ++row) {
+        stringList.removeAt(position);
+    }
+
+    endRemoveRows();
+    return true;
+//! [8] //! [9]
+}
+//! [9]
diff --git a/doc/src/snippets/stringlistmodel/model.h b/doc/src/snippets/stringlistmodel/model.h
new file mode 100644
index 0000000000..8e8f9c6db0
--- /dev/null
+++ b/doc/src/snippets/stringlistmodel/model.h
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MODEL_H
+#define MODEL_H
+
+#include <QAbstractListModel>
+#include <QObject>
+#include <QStringList>
+
+//! [0]
+class StringListModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    StringListModel(const QStringList &strings, QObject *parent = 0)
+        : QAbstractListModel(parent), stringList(strings) {}
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    QVariant data(const QModelIndex &index, int role) const;
+    QVariant headerData(int section, Qt::Orientation orientation,
+//! [0] //! [1]
+                        int role = Qt::DisplayRole) const;
+//! [1]
+
+//! [2]
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+    bool setData(const QModelIndex &index, const QVariant &value,
+//! [2] //! [3]
+                 int role = Qt::EditRole);
+//! [3]
+
+//! [4]
+    bool insertRows(int position, int rows, const QModelIndex &index = QModelIndex());
+    bool removeRows(int position, int rows, const QModelIndex &index = QModelIndex());
+//! [4]
+
+//! [5]
+private:
+    QStringList stringList;
+};
+//! [5]
+
+#endif
diff --git a/doc/src/snippets/stringlistmodel/stringlistmodel.pro b/doc/src/snippets/stringlistmodel/stringlistmodel.pro
new file mode 100644
index 0000000000..b1126bfe73
--- /dev/null
+++ b/doc/src/snippets/stringlistmodel/stringlistmodel.pro
@@ -0,0 +1,3 @@
+HEADERS     = model.h
+SOURCES     = main.cpp \
+              model.cpp
diff --git a/doc/src/snippets/styles/styles.cpp b/doc/src/snippets/styles/styles.cpp
new file mode 100644
index 0000000000..f411c0c387
--- /dev/null
+++ b/doc/src/snippets/styles/styles.cpp
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QStyleOption>
+#include <QStylePainter>
+#include <QWidget>
+
+class MyWidget : public QWidget
+{
+protected:
+    void paintEvent(QPaintEvent *event);
+    void paintEvent2(QPaintEvent *event);
+
+};
+
+//! [0] //! [1]
+void MyWidget::paintEvent(QPaintEvent * /* event */)
+//! [0]
+{
+//! [2]
+    QPainter painter(this);
+//! [2]
+
+    QStyleOptionFocusRect option;
+    option.initFrom(this);
+    option.backgroundColor = palette().color(QPalette::Background);
+
+//! [3]
+    style()->drawPrimitive(QStyle::PE_FrameFocusRect, &option, &painter, this);
+//! [3]
+}
+//! [1]
+
+void MyWidget::paintEvent2(QPaintEvent * /* event */)
+//! [4]
+{
+//! [4] //! [5] //! [6]
+    QStylePainter painter(this);
+//! [5]
+
+    QStyleOptionFocusRect option;
+    option.initFrom(this);
+    option.backgroundColor = palette().color(QPalette::Background);
+
+//! [7]
+    painter.drawPrimitive(QStyle::PE_FrameFocusRect, option);
+//! [7]
+}
+//! [6]
+
+int main()
+{
+    return 0;
+}
diff --git a/doc/src/snippets/stylesheet/common-mistakes.cpp b/doc/src/snippets/stylesheet/common-mistakes.cpp
new file mode 100644
index 0000000000..1c7e3a8def
--- /dev/null
+++ b/doc/src/snippets/stylesheet/common-mistakes.cpp
@@ -0,0 +1,12 @@
+//! [1]
+        QPushButton {
+            color: grey;
+            border-image: url(/home/kamlie/code/button.png) 3 10 3 10;
+            border-top: 3px transparent;
+            border-bottom: 3px transparent;
+            border-right: 10px transparent;
+            border-left: 10px transparent;
+        }
+//! [1]
+
+
diff --git a/doc/src/snippets/textblock-formats/main.cpp b/doc/src/snippets/textblock-formats/main.cpp
new file mode 100644
index 0000000000..6d84a401c1
--- /dev/null
+++ b/doc/src/snippets/textblock-formats/main.cpp
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+QString tr(const char *text)
+{
+    return QApplication::translate(text, text);
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+//! [0]
+    QTextEdit *editor = new QTextEdit();
+    QTextCursor cursor(editor->textCursor());
+//! [0]
+    cursor.movePosition(QTextCursor::Start); 
+
+    QTextBlockFormat blockFormat = cursor.blockFormat();
+    blockFormat.setTopMargin(4);
+    blockFormat.setLeftMargin(4);
+    blockFormat.setRightMargin(4);
+    blockFormat.setBottomMargin(4);
+
+    cursor.setBlockFormat(blockFormat);
+    cursor.insertText(tr("This contains plain text inside a "
+                         "text block with margins to keep it separate "
+                         "from other parts of the document."));
+
+    cursor.insertBlock();
+
+//! [1]
+    QTextBlockFormat backgroundFormat = blockFormat;
+    backgroundFormat.setBackground(QColor("lightGray"));
+
+    cursor.setBlockFormat(backgroundFormat);
+//! [1]
+    cursor.insertText(tr("The background color of a text block can be "
+                         "changed to highlight text."));
+
+    cursor.insertBlock();
+
+    QTextBlockFormat rightAlignedFormat = blockFormat;
+    rightAlignedFormat.setAlignment(Qt::AlignRight);
+
+    cursor.setBlockFormat(rightAlignedFormat);
+    cursor.insertText(tr("The alignment of the text within a block is "
+                         "controlled by the alignment properties of "
+                         "the block itself. This text block is "
+                         "right-aligned."));
+
+    cursor.insertBlock();
+
+    QTextBlockFormat paragraphFormat = blockFormat;
+    paragraphFormat.setAlignment(Qt::AlignJustify);
+    paragraphFormat.setTextIndent(32);
+
+    cursor.setBlockFormat(paragraphFormat);
+    cursor.insertText(tr("Text can be formatted so that the first "
+                         "line in a paragraph has its own margin. "
+                         "This makes the text more readable."));
+
+    cursor.insertBlock();
+
+    QTextBlockFormat reverseFormat = blockFormat;
+    reverseFormat.setAlignment(Qt::AlignJustify);
+    reverseFormat.setTextIndent(32);
+
+    cursor.setBlockFormat(reverseFormat);
+    cursor.insertText(tr("The direction of the text can be reversed. "
+                         "This is useful for right-to-left "
+                         "languages."));
+
+    editor->setWindowTitle(tr("Text Block Formats"));
+    editor->resize(480, 480);
+    editor->show();
+    
+    return app.exec();
+}
diff --git a/doc/src/snippets/textblock-formats/textblock-formats.pro b/doc/src/snippets/textblock-formats/textblock-formats.pro
new file mode 100644
index 0000000000..d664835b09
--- /dev/null
+++ b/doc/src/snippets/textblock-formats/textblock-formats.pro
@@ -0,0 +1,2 @@
+QT          += xml
+SOURCES     = main.cpp
diff --git a/doc/src/snippets/textblock-fragments/main.cpp b/doc/src/snippets/textblock-fragments/main.cpp
new file mode 100644
index 0000000000..96dc33e8bc
--- /dev/null
+++ b/doc/src/snippets/textblock-fragments/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *window = new MainWindow;
+    window->resize(640, 480);
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/textblock-fragments/mainwindow.cpp b/doc/src/snippets/textblock-fragments/mainwindow.cpp
new file mode 100644
index 0000000000..ab1d9b4916
--- /dev/null
+++ b/doc/src/snippets/textblock-fragments/mainwindow.cpp
@@ -0,0 +1,149 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+#include "xmlwriter.h"
+
+MainWindow::MainWindow()
+{
+    QMenu *fileMenu = new QMenu(tr("&File"));
+
+    QAction *saveAction = fileMenu->addAction(tr("&Save..."));
+    saveAction->setShortcut(tr("Ctrl+S"));
+
+    QAction *quitAction = fileMenu->addAction(tr("E&xit"));
+    quitAction->setShortcut(tr("Ctrl+Q"));
+
+    QMenu *insertMenu = new QMenu(tr("&Insert"));
+
+    QAction *calendarAction = insertMenu->addAction(tr("&Calendar"));
+    calendarAction->setShortcut(tr("Ctrl+I"));
+
+    menuBar()->addMenu(fileMenu);
+    menuBar()->addMenu(insertMenu);
+
+    editor = new QTextEdit(this);
+
+    connect(saveAction, SIGNAL(triggered()), this, SLOT(saveFile()));
+    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
+    connect(calendarAction, SIGNAL(triggered()), this, SLOT(insertCalendar()));
+
+    setCentralWidget(editor);
+    setWindowTitle(tr("Text Document Writer"));
+}
+
+void MainWindow::saveFile()
+{
+    QString fileName = QFileDialog::getSaveFileName(this,
+        tr("Save document as:"), "", tr("XML (*.xml)"));
+
+    if (!fileName.isEmpty()) {
+        if (writeXml(fileName))
+            setWindowTitle(fileName);
+        else
+            QMessageBox::warning(this, tr("Warning"),
+                tr("Failed to save the document."), QMessageBox::Cancel,
+                QMessageBox::NoButton);
+    }
+}
+
+void MainWindow::insertCalendar()
+{
+    QTextCursor cursor(editor->textCursor());
+    cursor.movePosition(QTextCursor::Start); 
+
+    QTextCharFormat format(cursor.charFormat());
+    format.setFontFamily("Courier");
+    
+    QTextCharFormat boldFormat = format;
+    boldFormat.setFontWeight(QFont::Bold);
+
+    cursor.insertBlock();
+    cursor.insertText(" ", boldFormat);
+
+    QDate date = QDate::currentDate();
+    int year = date.year(), month = date.month();
+
+    for (int weekDay = 1; weekDay <= 7; ++weekDay) {
+        cursor.insertText(QString("%1 ").arg(QDate::shortDayName(weekDay), 3),
+            boldFormat);
+    }
+
+    cursor.insertBlock();
+    cursor.insertText(" ", format);
+
+    for (int column = 1; column < QDate(year, month, 1).dayOfWeek(); ++column) {
+        cursor.insertText("    ", format);
+    }
+
+    for (int day = 1; day <= date.daysInMonth(); ++day) {
+        int weekDay = QDate(year, month, day).dayOfWeek();
+
+        if (QDate(year, month, day) == date)
+            cursor.insertText(QString("%1 ").arg(day, 3), boldFormat);
+        else
+            cursor.insertText(QString("%1 ").arg(day, 3), format);
+
+        if (weekDay == 7) {
+            cursor.insertBlock();
+            cursor.insertText(" ", format);
+        }
+    }
+}
+
+bool MainWindow::writeXml(const QString &fileName)
+{
+    XmlWriter documentWriter(editor->document());
+
+    QDomDocument *domDocument = documentWriter.toXml();
+    QFile file(fileName);
+
+    if (file.open(QFile::WriteOnly)) {
+        QTextStream textStream(&file);
+        
+        textStream << domDocument->toByteArray(1);
+        return true;
+    }
+    else
+        return false;
+}
diff --git a/doc/src/snippets/textblock-fragments/mainwindow.h b/doc/src/snippets/textblock-fragments/mainwindow.h
new file mode 100644
index 0000000000..e2f4961429
--- /dev/null
+++ b/doc/src/snippets/textblock-fragments/mainwindow.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QMainWindow>
+
+class QTextEdit;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+public slots:
+    void insertCalendar();
+    void saveFile();
+
+private:
+    bool writeXml(const QString &fileName);
+
+    QTextEdit *editor;
+};
+
+#endif
diff --git a/doc/src/snippets/textblock-fragments/textblock-fragments.pro b/doc/src/snippets/textblock-fragments/textblock-fragments.pro
new file mode 100644
index 0000000000..83ed78e573
--- /dev/null
+++ b/doc/src/snippets/textblock-fragments/textblock-fragments.pro
@@ -0,0 +1,6 @@
+QT          += xml
+HEADERS     = mainwindow.h \
+              xmlwriter.h
+SOURCES     = main.cpp \
+              mainwindow.cpp \
+              xmlwriter.cpp
diff --git a/doc/src/snippets/textblock-fragments/xmlwriter.cpp b/doc/src/snippets/textblock-fragments/xmlwriter.cpp
new file mode 100644
index 0000000000..c96a36b4a9
--- /dev/null
+++ b/doc/src/snippets/textblock-fragments/xmlwriter.cpp
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "xmlwriter.h"
+
+QDomDocument *XmlWriter::toXml()
+{
+    QDomImplementation implementation;
+    QDomDocumentType docType = implementation.createDocumentType(
+        "scribe-document", "scribe", "qtsoftware.com/scribe");
+
+    document = new QDomDocument(docType);
+
+    // ### This processing instruction is required to ensure that any kind
+    // of encoding is given when the document is written.
+    QDomProcessingInstruction process = document->createProcessingInstruction(
+        "xml", "version=\"1.0\" encoding=\"utf-8\"");
+    document->appendChild(process);
+
+    QDomElement documentElement = document->createElement("document");
+    document->appendChild(documentElement);
+
+//! [0]
+    QTextBlock currentBlock = textDocument->begin();
+
+    while (currentBlock.isValid()) {
+//! [0]
+        QDomElement blockElement = document->createElement("block");
+        document->appendChild(blockElement);
+
+        readFragment(currentBlock, blockElement, document);
+
+//! [1]
+        processBlock(currentBlock);
+//! [1]
+
+//! [2]
+        currentBlock = currentBlock.next();
+    }
+//! [2]
+
+    return document;
+}
+
+void XmlWriter::readFragment(const QTextBlock &currentBlock,
+                             QDomElement blockElement,
+                             QDomDocument *document)
+{
+//! [3] //! [4]
+    QTextBlock::iterator it;
+    for (it = currentBlock.begin(); !(it.atEnd()); ++it) {
+        QTextFragment currentFragment = it.fragment();
+        if (currentFragment.isValid())
+//! [3] //! [5]
+            processFragment(currentFragment);
+//! [4] //! [5]
+
+        if (currentFragment.isValid()) {
+            QDomElement fragmentElement = document->createElement("fragment");
+            blockElement.appendChild(fragmentElement);
+
+            fragmentElement.setAttribute("length", currentFragment.length());
+            QDomText fragmentText = document->createTextNode(currentFragment.text());
+
+            fragmentElement.appendChild(fragmentText);
+//! [6]
+        }
+//! [7]
+    }
+//! [6] //! [7]
+}
+
+void XmlWriter::processBlock(const QTextBlock &currentBlock)
+{
+}
+
+void XmlWriter::processFragment(const QTextFragment &currentFragment)
+{
+}
diff --git a/doc/src/snippets/textblock-fragments/xmlwriter.h b/doc/src/snippets/textblock-fragments/xmlwriter.h
new file mode 100644
index 0000000000..d7a057cf7d
--- /dev/null
+++ b/doc/src/snippets/textblock-fragments/xmlwriter.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef XMLWRITER_H
+#define XMLWRITER_H
+
+#include <QDomDocument>
+
+class QTextDocument;
+
+class XmlWriter
+{
+public:
+    XmlWriter(QTextDocument *document) : textDocument(document) {}
+    QDomDocument *toXml();
+
+private:
+    void readFragment(const QTextBlock &currentBlock, QDomElement blockElement,
+                      QDomDocument *document);
+    void processBlock(const QTextBlock &currentBlock);
+    void processFragment(const QTextFragment &currentFragment);
+
+    QDomDocument *document;
+    QTextDocument *textDocument;
+};
+
+#endif
diff --git a/doc/src/snippets/textdocument-blocks/main.cpp b/doc/src/snippets/textdocument-blocks/main.cpp
new file mode 100644
index 0000000000..96dc33e8bc
--- /dev/null
+++ b/doc/src/snippets/textdocument-blocks/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *window = new MainWindow;
+    window->resize(640, 480);
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/textdocument-blocks/mainwindow.cpp b/doc/src/snippets/textdocument-blocks/mainwindow.cpp
new file mode 100644
index 0000000000..14ddb8b03a
--- /dev/null
+++ b/doc/src/snippets/textdocument-blocks/mainwindow.cpp
@@ -0,0 +1,157 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+#include "xmlwriter.h"
+
+MainWindow::MainWindow()
+{
+    QMenu *fileMenu = new QMenu(tr("&File"));
+
+    QAction *saveAction = fileMenu->addAction(tr("&Save..."));
+    saveAction->setShortcut(tr("Ctrl+S"));
+
+    QAction *quitAction = fileMenu->addAction(tr("E&xit"));
+    quitAction->setShortcut(tr("Ctrl+Q"));
+
+    QMenu *insertMenu = new QMenu(tr("&Insert"));
+
+    QAction *calendarAction = insertMenu->addAction(tr("&Calendar"));
+    calendarAction->setShortcut(tr("Ctrl+I"));
+
+    menuBar()->addMenu(fileMenu);
+    menuBar()->addMenu(insertMenu);
+
+//! [0]
+    editor = new QTextEdit(this);
+//! [0]
+
+    connect(saveAction, SIGNAL(triggered()), this, SLOT(saveFile()));
+    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
+    connect(calendarAction, SIGNAL(triggered()), this, SLOT(insertCalendar()));
+
+    setCentralWidget(editor);
+    setWindowTitle(tr("Text Document Writer"));
+}
+
+void MainWindow::saveFile()
+{
+    QString fileName = QFileDialog::getSaveFileName(this,
+        tr("Save document as:"), "", tr("XML (*.xml)"));
+
+    if (!fileName.isEmpty()) {
+        if (writeXml(fileName))
+            setWindowTitle(fileName);
+        else
+            QMessageBox::warning(this, tr("Warning"),
+                tr("Failed to save the document."), QMessageBox::Cancel,
+                QMessageBox::NoButton);
+    }
+}
+
+void MainWindow::insertCalendar()
+{
+//! [1]
+    QTextCursor cursor(editor->textCursor());
+    cursor.movePosition(QTextCursor::Start); 
+
+    QTextCharFormat format(cursor.charFormat());
+    format.setFontFamily("Courier");
+    
+    QTextCharFormat boldFormat = format;
+    boldFormat.setFontWeight(QFont::Bold);
+
+    cursor.insertBlock();
+    cursor.insertText(" ", boldFormat);
+
+    QDate date = QDate::currentDate();
+    int year = date.year(), month = date.month();
+
+    for (int weekDay = 1; weekDay <= 7; ++weekDay) {
+        cursor.insertText(QString("%1 ").arg(QDate::shortDayName(weekDay), 3),
+            boldFormat);
+    }
+
+    cursor.insertBlock();
+    cursor.insertText(" ", format);
+
+    for (int column = 1; column < QDate(year, month, 1).dayOfWeek(); ++column) {
+        cursor.insertText("    ", format);
+    }
+
+    for (int day = 1; day <= date.daysInMonth(); ++day) {
+//! [1] //! [2]
+        int weekDay = QDate(year, month, day).dayOfWeek();
+
+        if (QDate(year, month, day) == date)
+            cursor.insertText(QString("%1 ").arg(day, 3), boldFormat);
+        else
+            cursor.insertText(QString("%1 ").arg(day, 3), format);
+
+        if (weekDay == 7) {
+            cursor.insertBlock();
+            cursor.insertText(" ", format);
+        }
+//! [2] //! [3]
+    }
+//! [3]
+}
+
+bool MainWindow::writeXml(const QString &fileName)
+{
+    XmlWriter documentWriter(editor->document());
+
+    QDomDocument *domDocument = documentWriter.toXml();
+    QFile file(fileName);
+
+    if (file.open(QFile::WriteOnly)) {
+        QTextStream textStream(&file);
+        textStream.setCodec(QTextCodec::codecForName("UTF-8"));
+        
+        textStream << domDocument->toString(1).toUtf8();
+        file.close();
+        return true;
+    }
+    else
+        return false;
+}
diff --git a/doc/src/snippets/textdocument-blocks/mainwindow.h b/doc/src/snippets/textdocument-blocks/mainwindow.h
new file mode 100644
index 0000000000..e2f4961429
--- /dev/null
+++ b/doc/src/snippets/textdocument-blocks/mainwindow.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QMainWindow>
+
+class QTextEdit;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+public slots:
+    void insertCalendar();
+    void saveFile();
+
+private:
+    bool writeXml(const QString &fileName);
+
+    QTextEdit *editor;
+};
+
+#endif
diff --git a/doc/src/snippets/textdocument-blocks/textdocument-blocks.pro b/doc/src/snippets/textdocument-blocks/textdocument-blocks.pro
new file mode 100644
index 0000000000..83ed78e573
--- /dev/null
+++ b/doc/src/snippets/textdocument-blocks/textdocument-blocks.pro
@@ -0,0 +1,6 @@
+QT          += xml
+HEADERS     = mainwindow.h \
+              xmlwriter.h
+SOURCES     = main.cpp \
+              mainwindow.cpp \
+              xmlwriter.cpp
diff --git a/doc/src/snippets/textdocument-blocks/xmlwriter.cpp b/doc/src/snippets/textdocument-blocks/xmlwriter.cpp
new file mode 100644
index 0000000000..bfb16a0df6
--- /dev/null
+++ b/doc/src/snippets/textdocument-blocks/xmlwriter.cpp
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "xmlwriter.h"
+
+QDomDocument *XmlWriter::toXml()
+{
+    QDomImplementation implementation;
+    QDomDocumentType docType = implementation.createDocumentType(
+        "scribe-document", "scribe", "qtsoftware.com/scribe");
+
+    document = new QDomDocument(docType);
+
+    // ### This processing instruction is required to ensure that any kind
+    // of encoding is given when the document is written.
+    QDomProcessingInstruction process = document->createProcessingInstruction(
+        "xml", "version=\"1.0\" encoding=\"utf-8\"");
+    document->appendChild(process);
+
+    QDomElement documentElement = document->createElement("document");
+    document->appendChild(documentElement);
+
+    QTextBlock firstBlock = textDocument->begin();
+    createItems(documentElement, firstBlock);
+
+    return document;
+}
+
+void XmlWriter::createItems(QDomElement &parent, const QTextBlock &block)
+{
+    QTextBlock currentBlock = block;
+
+    while (currentBlock.isValid()) {
+        QDomElement blockElement = document->createElement("block");
+        blockElement.setAttribute("length", currentBlock.length());
+        parent.appendChild(blockElement);
+
+        if (!(currentBlock.text().isNull())) {
+            QDomText textNode = document->createTextNode(currentBlock.text());
+            blockElement.appendChild(textNode);
+        }
+
+        currentBlock = currentBlock.next();
+    }
+}
diff --git a/doc/src/snippets/textdocument-blocks/xmlwriter.h b/doc/src/snippets/textdocument-blocks/xmlwriter.h
new file mode 100644
index 0000000000..2bd59c8b8a
--- /dev/null
+++ b/doc/src/snippets/textdocument-blocks/xmlwriter.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef XMLWRITER_H
+#define XMLWRITER_H
+
+#include <QDomDocument>
+
+class QTextDocument;
+
+class XmlWriter
+{
+public:
+    XmlWriter(QTextDocument *document) : textDocument(document) {}
+    QDomDocument *toXml();
+
+private:
+    void createItems(QDomElement &parent, const QTextBlock &block);
+
+    QDomDocument *document;
+    QTextDocument *textDocument;
+};
+
+#endif
diff --git a/doc/src/snippets/textdocument-charformats/main.cpp b/doc/src/snippets/textdocument-charformats/main.cpp
new file mode 100644
index 0000000000..2abe34616f
--- /dev/null
+++ b/doc/src/snippets/textdocument-charformats/main.cpp
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+QString tr(const char *text)
+{
+    return QApplication::translate(text, text);
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QTextEdit *editor = new QTextEdit();
+
+    QTextCursor cursor(editor->textCursor());
+    cursor.movePosition(QTextCursor::Start); 
+
+    QTextCharFormat plainFormat(cursor.charFormat());
+
+    QTextCharFormat headingFormat = plainFormat;
+    headingFormat.setFontWeight(QFont::Bold);
+    headingFormat.setFontPointSize(16);
+
+    QTextCharFormat emphasisFormat = plainFormat;
+    emphasisFormat.setFontItalic(true);
+
+    QTextCharFormat qtFormat = plainFormat;
+    qtFormat.setForeground(QColor("#990000"));
+
+    QTextCharFormat underlineFormat = plainFormat;
+    underlineFormat.setFontUnderline(true);
+
+//! [0]
+    cursor.insertText(tr("Character formats"),
+                      headingFormat);
+
+    cursor.insertBlock();
+
+    cursor.insertText(tr("Text can be displayed in a variety of "
+                                  "different character formats. "), plainFormat);
+    cursor.insertText(tr("We can emphasize text by "));
+    cursor.insertText(tr("making it italic"), emphasisFormat);
+//! [0]
+    cursor.insertText(tr(", give it a "), plainFormat);
+    cursor.insertText(tr("different color "), qtFormat);
+    cursor.insertText(tr("to the default text color, "), plainFormat);
+    cursor.insertText(tr("underline it"), underlineFormat);
+    cursor.insertText(tr(", and use many other effects."), plainFormat);
+
+    editor->setWindowTitle(tr("Text Document Character Formats"));
+    editor->resize(320, 480);
+    editor->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/textdocument-charformats/textdocument-charformats.pro b/doc/src/snippets/textdocument-charformats/textdocument-charformats.pro
new file mode 100644
index 0000000000..16181f21cf
--- /dev/null
+++ b/doc/src/snippets/textdocument-charformats/textdocument-charformats.pro
@@ -0,0 +1 @@
+SOURCES     = main.cpp
diff --git a/doc/src/snippets/textdocument-css/main.cpp b/doc/src/snippets/textdocument-css/main.cpp
new file mode 100644
index 0000000000..b055cb8aba
--- /dev/null
+++ b/doc/src/snippets/textdocument-css/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+//! [0]
+    QTextBrowser browser;
+    QColor linkColor(Qt::red);
+    QString sheet = QString::fromLatin1("a { text-decoration: underline; color: %1 }").arg(linkColor.name());
+    browser.document()->setDefaultStyleSheet(sheet);
+//! [0]
+    browser.setSource(QUrl("../../../html/index.html"));
+    browser.resize(800, 600);
+    browser.show();
+
+    return app.exec();
+}
+
diff --git a/doc/src/snippets/textdocument-css/textdocument-css.pro b/doc/src/snippets/textdocument-css/textdocument-css.pro
new file mode 100644
index 0000000000..28dcadcbfa
--- /dev/null
+++ b/doc/src/snippets/textdocument-css/textdocument-css.pro
@@ -0,0 +1 @@
+SOURCES += main.cpp
diff --git a/doc/src/snippets/textdocument-cursors/main.cpp b/doc/src/snippets/textdocument-cursors/main.cpp
new file mode 100644
index 0000000000..e1981dc6da
--- /dev/null
+++ b/doc/src/snippets/textdocument-cursors/main.cpp
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+QString tr(const char *text)
+{
+    return QApplication::translate(text, text);
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QTextEdit *editor = new QTextEdit;
+
+//! [0]
+    QTextDocument *document = editor->document();
+    QTextCursor redCursor(document);
+//! [0] //! [1]
+    QTextCursor blueCursor(document);
+//! [1]
+
+    QTextCharFormat redFormat(redCursor.charFormat());
+    redFormat.setForeground(Qt::red);
+    QTextCharFormat blueFormat(blueCursor.charFormat());
+    blueFormat.setForeground(Qt::blue);
+
+    redCursor.setCharFormat(redFormat);
+    blueCursor.setCharFormat(blueFormat);
+
+    for (int i = 0; i < 20; ++i) {
+        if (i % 2 == 0)
+            redCursor.insertText(tr("%1 ").arg(i), redFormat);
+        if (i % 5 == 0)
+            blueCursor.insertText(tr("%1 ").arg(i), blueFormat);
+    }
+
+    editor->setWindowTitle(tr("Text Document Cursors"));
+    editor->resize(320, 480);
+    editor->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/textdocument-cursors/textdocument-cursors.pro b/doc/src/snippets/textdocument-cursors/textdocument-cursors.pro
new file mode 100644
index 0000000000..16181f21cf
--- /dev/null
+++ b/doc/src/snippets/textdocument-cursors/textdocument-cursors.pro
@@ -0,0 +1 @@
+SOURCES     = main.cpp
diff --git a/doc/src/snippets/textdocument-find/main.cpp b/doc/src/snippets/textdocument-find/main.cpp
new file mode 100644
index 0000000000..0e76052a79
--- /dev/null
+++ b/doc/src/snippets/textdocument-find/main.cpp
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+QString tr(const char *text)
+{
+    return QApplication::translate(text, text);
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QTextEdit *editor = new QTextEdit();
+
+    QTextCursor cursor(editor->textCursor());
+    cursor.movePosition(QTextCursor::Start);
+
+    QTextCharFormat plainFormat(cursor.charFormat());
+    QTextCharFormat colorFormat = plainFormat;
+    colorFormat.setForeground(Qt::red);
+
+    cursor.insertText(tr("Text can be displayed in a variety of "
+                                  "different character "
+                                  "formats. "), plainFormat);
+    cursor.insertText(tr("We can emphasize text by making it "));
+    cursor.insertText(tr("italic, give it a different color "));
+    cursor.insertText(tr("to the default text color, underline it, "));
+    cursor.insertText(tr("and use many other effects."));
+
+    QString searchString = tr("text");
+
+    QTextDocument *document = editor->document();
+//! [0]
+    QTextCursor newCursor(document);
+
+    while (!newCursor.isNull() && !newCursor.atEnd()) {
+        newCursor = document->find(searchString, newCursor);
+
+        if (!newCursor.isNull()) {
+            newCursor.movePosition(QTextCursor::WordRight,
+                                   QTextCursor::KeepAnchor);
+
+            newCursor.mergeCharFormat(colorFormat);
+        }
+//! [0] //! [1]
+    }
+//! [1]
+
+    editor->setWindowTitle(tr("Text Document Find"));
+    editor->resize(320, 480);
+    editor->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/textdocument-find/textdocument-find.pro b/doc/src/snippets/textdocument-find/textdocument-find.pro
new file mode 100644
index 0000000000..16181f21cf
--- /dev/null
+++ b/doc/src/snippets/textdocument-find/textdocument-find.pro
@@ -0,0 +1 @@
+SOURCES     = main.cpp
diff --git a/doc/src/snippets/textdocument-frames/main.cpp b/doc/src/snippets/textdocument-frames/main.cpp
new file mode 100644
index 0000000000..17475ab942
--- /dev/null
+++ b/doc/src/snippets/textdocument-frames/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *window = new MainWindow;
+    window->resize(480, 480);
+    window->show();
+    return app.exec();
+}
+
diff --git a/doc/src/snippets/textdocument-frames/mainwindow.cpp b/doc/src/snippets/textdocument-frames/mainwindow.cpp
new file mode 100644
index 0000000000..c81f237f46
--- /dev/null
+++ b/doc/src/snippets/textdocument-frames/mainwindow.cpp
@@ -0,0 +1,162 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+#include "xmlwriter.h"
+
+MainWindow::MainWindow()
+{
+    QMenu *fileMenu = new QMenu(tr("&File"));
+
+    QAction *saveAction = fileMenu->addAction(tr("&Save..."));
+    saveAction->setShortcut(tr("Ctrl+S"));
+
+    QAction *quitAction = fileMenu->addAction(tr("E&xit"));
+    quitAction->setShortcut(tr("Ctrl+Q"));
+
+    menuBar()->addMenu(fileMenu);
+    editor = new QTextEdit();
+
+    QTextCursor cursor(editor->textCursor());
+    cursor.movePosition(QTextCursor::Start); 
+
+    QTextFrame *mainFrame = cursor.currentFrame();
+    
+    QTextCharFormat plainCharFormat;
+    QTextCharFormat boldCharFormat;
+    boldCharFormat.setFontWeight(QFont::Bold);
+/*  main frame
+//! [0]
+    QTextFrame *mainFrame = cursor.currentFrame();
+    cursor.insertText(...);
+//! [0]
+*/
+    cursor.insertText("Text documents are represented by the "
+                      "QTextDocument class, rather than by QString objects. "
+                      "Each QTextDocument object contains information about "
+                      "the document's internal representation, its structure, "
+                      "and keeps track of modifications to provide undo/redo "
+                      "facilities. This approach allows features such as the "
+                      "layout management to be delegated to specialized "
+                      "classes, but also provides a focus for the framework.",
+                      plainCharFormat);
+
+//! [1]
+    QTextFrameFormat frameFormat;
+    frameFormat.setMargin(32);
+    frameFormat.setPadding(8);
+    frameFormat.setBorder(4);
+//! [1]
+    cursor.insertFrame(frameFormat);
+
+/*  insert frame
+//! [2]
+    cursor.insertFrame(frameFormat);
+    cursor.insertText(...);
+//! [2]
+*/
+    cursor.insertText("Documents are either converted from external sources "
+                      "or created from scratch using Qt. The creation process "
+                      "can done by an editor widget, such as QTextEdit, or by "
+                      "explicit calls to the Scribe API.", boldCharFormat);
+
+    cursor = mainFrame->lastCursorPosition();
+/*  last cursor
+//! [3]
+    cursor = mainFrame->lastCursorPosition();
+    cursor.insertText(...);
+//! [3]
+*/
+    cursor.insertText("There are two complementary ways to visualize the "
+                      "contents of a document: as a linear buffer that is "
+                      "used by editors to modify the contents, and as an "
+                      "object hierarchy containing structural information "
+                      "that is useful to layout engines. In the hierarchical "
+                      "model, the objects generally correspond to visual "
+                      "elements such as frames, tables, and lists. At a lower "
+                      "level, these elements describe properties such as the "
+                      "style of text used and its alignment. The linear "
+                      "representation of the document is used for editing and "
+                      "manipulation of the document's contents.",
+                      plainCharFormat);
+
+
+    connect(saveAction, SIGNAL(triggered()), this, SLOT(saveFile()));
+    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
+
+    setCentralWidget(editor);
+    setWindowTitle(tr("Text Document Frames"));
+}
+
+void MainWindow::saveFile()
+{
+    QString fileName = QFileDialog::getSaveFileName(this,
+        tr("Save document as:"), "", tr("XML (*.xml)"));
+
+    if (!fileName.isEmpty()) {
+        if (writeXml(fileName))
+            setWindowTitle(fileName);
+        else
+            QMessageBox::warning(this, tr("Warning"),
+                tr("Failed to save the document."), QMessageBox::Cancel,
+                QMessageBox::NoButton);
+    }
+}
+bool MainWindow::writeXml(const QString &fileName)
+{
+    XmlWriter documentWriter(editor->document());
+
+    QDomDocument *domDocument = documentWriter.toXml();
+    QFile file(fileName);
+
+    if (file.open(QFile::WriteOnly)) {
+        QTextStream textStream(&file);
+        textStream.setCodec(QTextCodec::codecForName("UTF-8"));
+        
+        textStream << domDocument->toString(1).toUtf8();
+        file.close();
+        return true;
+    }
+    else
+        return false;
+}
diff --git a/doc/src/snippets/textdocument-frames/mainwindow.h b/doc/src/snippets/textdocument-frames/mainwindow.h
new file mode 100644
index 0000000000..b9875305f0
--- /dev/null
+++ b/doc/src/snippets/textdocument-frames/mainwindow.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QMainWindow>
+
+class QTextEdit;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+public slots:
+    void saveFile();
+
+private:
+    bool writeXml(const QString &fileName);
+
+    QTextEdit *editor;
+};
+
+#endif
diff --git a/doc/src/snippets/textdocument-frames/textdocument-frames.pro b/doc/src/snippets/textdocument-frames/textdocument-frames.pro
new file mode 100644
index 0000000000..91ae50f491
--- /dev/null
+++ b/doc/src/snippets/textdocument-frames/textdocument-frames.pro
@@ -0,0 +1,6 @@
+SOURCES     = main.cpp \
+              mainwindow.cpp \
+              xmlwriter.cpp
+HEADERS     = mainwindow.h \
+              xmlwriter.h
+QT          += xml
diff --git a/doc/src/snippets/textdocument-frames/xmlwriter.cpp b/doc/src/snippets/textdocument-frames/xmlwriter.cpp
new file mode 100644
index 0000000000..37f81cffd1
--- /dev/null
+++ b/doc/src/snippets/textdocument-frames/xmlwriter.cpp
@@ -0,0 +1,117 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "xmlwriter.h"
+
+QDomDocument *XmlWriter::toXml()
+{
+    QDomImplementation implementation;
+    QDomDocumentType docType = implementation.createDocumentType(
+        "scribe-document", "scribe", "qtsoftware.com/scribe");
+
+    document = new QDomDocument(docType);
+
+    // ### This processing instruction is required to ensure that any kind
+    // of encoding is given when the document is written.
+    QDomProcessingInstruction process = document->createProcessingInstruction(
+        "xml", "version=\"1.0\" encoding=\"utf-8\"");
+    document->appendChild(process);
+
+    QDomElement documentElement = document->createElement("document");
+    document->appendChild(documentElement);
+
+//! [0]
+    QTextFrame *root = textDocument->rootFrame();
+//! [0]
+    
+    if (root)
+        processFrame(documentElement, root);
+
+    return document;
+}
+
+void XmlWriter::processBlock(QDomElement &parent, const QTextBlock &block)
+{
+    QDomElement blockElement = document->createElement("block");
+    blockElement.setAttribute("position", block.position());
+    blockElement.setAttribute("length", block.length());
+    parent.appendChild(blockElement);
+
+    QTextBlock::iterator it;
+    for (it = block.begin(); !(it.atEnd()); ++it) {
+        QTextFragment fragment = it.fragment();
+
+        if (fragment.isValid()) {
+            QDomElement fragmentElement = document->createElement("fragment");
+            blockElement.appendChild(fragmentElement);
+
+            fragmentElement.setAttribute("length", fragment.length());
+            QDomText fragmentText = document->createTextNode(fragment.text());
+
+            fragmentElement.appendChild(fragmentText);
+        }
+    }
+}
+
+void XmlWriter::processFrame(QDomElement &parent, QTextFrame *frame)
+{
+    QDomElement frameElement = document->createElement("frame");
+    frameElement.setAttribute("begin", frame->firstPosition());
+    frameElement.setAttribute("end", frame->lastPosition());
+    parent.appendChild(frameElement);
+
+//! [1]
+    QTextFrame::iterator it;
+    for (it = frame->begin(); !(it.atEnd()); ++it) {
+
+        QTextFrame *childFrame = it.currentFrame();
+        QTextBlock childBlock = it.currentBlock();
+
+        if (childFrame)
+//! [1] //! [2]
+            processFrame(frameElement, childFrame);
+        else if (childBlock.isValid())
+            processBlock(frameElement, childBlock);
+    }
+//! [2]
+}
diff --git a/doc/src/snippets/textdocument-frames/xmlwriter.h b/doc/src/snippets/textdocument-frames/xmlwriter.h
new file mode 100644
index 0000000000..23c6e7d9ce
--- /dev/null
+++ b/doc/src/snippets/textdocument-frames/xmlwriter.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef XMLWRITER_H
+#define XMLWRITER_H
+
+#include <QDomDocument>
+
+class QTextDocument;
+
+class XmlWriter
+{
+public:
+    XmlWriter(QTextDocument *document) : textDocument(document) {}
+    QDomDocument *toXml();
+
+private:
+    void processBlock(QDomElement &parent, const QTextBlock &block);
+    void processFrame(QDomElement &parent, QTextFrame *frame);
+
+    QDomDocument *document;
+//! [0]
+    QTextDocument *textDocument;
+//! [0]
+};
+
+#endif
diff --git a/doc/src/snippets/textdocument-imagedrop/main.cpp b/doc/src/snippets/textdocument-imagedrop/main.cpp
new file mode 100644
index 0000000000..ba6a35c272
--- /dev/null
+++ b/doc/src/snippets/textdocument-imagedrop/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "textedit.h"
+
+int main(int argc, char * argv[])
+{
+    QApplication app(argc, argv);
+
+    TextEdit *textEdit = new TextEdit;
+    textEdit->show();
+
+    return app.exec();
+}
\ No newline at end of file
diff --git a/doc/src/snippets/textdocument-imagedrop/textdocument-imagedrop.pro b/doc/src/snippets/textdocument-imagedrop/textdocument-imagedrop.pro
new file mode 100644
index 0000000000..96d3038a09
--- /dev/null
+++ b/doc/src/snippets/textdocument-imagedrop/textdocument-imagedrop.pro
@@ -0,0 +1,2 @@
+SOURCES = textedit.cpp main.cpp
+HEADERS = textedit.h
\ No newline at end of file
diff --git a/doc/src/snippets/textdocument-imagedrop/textedit.cpp b/doc/src/snippets/textdocument-imagedrop/textedit.cpp
new file mode 100644
index 0000000000..c6254f79c9
--- /dev/null
+++ b/doc/src/snippets/textdocument-imagedrop/textedit.cpp
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "textedit.h"
+#include <QtGui>
+
+TextEdit::TextEdit(QWidget *parent)
+	: QTextEdit(parent)
+{
+}
+
+//! [0]
+bool TextEdit::canInsertFromMimeData( const QMimeData *source ) const
+{
+    if (source->hasImage())
+        return true;
+    else
+        return QTextEdit::canInsertFromMimeData(source);
+}
+//! [0]
+
+//! [1]
+void TextEdit::insertFromMimeData( const QMimeData *source )
+{
+    if (source->hasImage())
+    {
+        QImage image = qvariant_cast<QImage>(source->imageData());
+        QTextCursor cursor = this->textCursor();
+        QTextDocument *document = this->document();
+        document->addResource(QTextDocument::ImageResource, QUrl("image"), image);
+        cursor.insertImage("image");
+    }
+}
+//! [1]
diff --git a/doc/src/snippets/textdocument-imagedrop/textedit.h b/doc/src/snippets/textdocument-imagedrop/textedit.h
new file mode 100644
index 0000000000..b50a27e94f
--- /dev/null
+++ b/doc/src/snippets/textdocument-imagedrop/textedit.h
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TEXTEDIT_H
+#define TEXTEDIT_H
+
+#include <QTextEdit>
+
+class TextEdit : public QTextEdit
+{
+    Q_OBJECT
+    
+public: 
+    TextEdit(QWidget *parent=0);
+    bool canInsertFromMimeData( const QMimeData *source ) const;
+    void insertFromMimeData( const QMimeData *source );
+};
+
+#endif
\ No newline at end of file
diff --git a/doc/src/snippets/textdocument-imageformat/images.qrc b/doc/src/snippets/textdocument-imageformat/images.qrc
new file mode 100644
index 0000000000..6473daf34e
--- /dev/null
+++ b/doc/src/snippets/textdocument-imageformat/images.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+   <file>images/advert.png</file>
+   <file>images/newimage.png</file>
+</qresource>
+</RCC>
diff --git a/doc/src/snippets/textdocument-imageformat/images/advert.png b/doc/src/snippets/textdocument-imageformat/images/advert.png
new file mode 100644
index 0000000000..40e10d5225
--- /dev/null
+++ b/doc/src/snippets/textdocument-imageformat/images/advert.png
diff --git a/doc/src/snippets/textdocument-imageformat/images/newimage.png b/doc/src/snippets/textdocument-imageformat/images/newimage.png
new file mode 100644
index 0000000000..0eec048a77
--- /dev/null
+++ b/doc/src/snippets/textdocument-imageformat/images/newimage.png
diff --git a/doc/src/snippets/textdocument-imageformat/main.cpp b/doc/src/snippets/textdocument-imageformat/main.cpp
new file mode 100644
index 0000000000..9933aede3f
--- /dev/null
+++ b/doc/src/snippets/textdocument-imageformat/main.cpp
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+QString tr(const char *text)
+{
+    return QApplication::translate(text, text);
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QTextEdit *editor = new QTextEdit;
+
+    QTextDocument *document = new QTextDocument(editor);
+    QTextCursor cursor(document);
+
+    QTextImageFormat imageFormat;
+    imageFormat.setName(":/images/advert.png");
+    cursor.insertImage(imageFormat);
+
+    QTextBlock block = cursor.block();
+    QTextFragment fragment;
+    QTextBlock::iterator it;
+
+    for (it = block.begin(); !(it.atEnd()); ++it) {
+        fragment = it.fragment();
+
+        if (fragment.contains(cursor.position()))
+            break;
+    }
+
+//! [0]
+    if (fragment.isValid()) {
+        QTextImageFormat newImageFormat = fragment.charFormat().toImageFormat();
+
+        if (newImageFormat.isValid()) {
+            newImageFormat.setName(":/images/newimage.png");
+            QTextCursor helper = cursor;
+
+            helper.setPosition(fragment.position());
+            helper.setPosition(fragment.position() + fragment.length(),
+                                QTextCursor::KeepAnchor);
+            helper.setCharFormat(newImageFormat);
+//! [0] //! [1]
+        }
+//! [1] //! [2]
+    }
+//! [2]
+
+    cursor.insertBlock();
+    cursor.insertText("Code less. Create more.");
+
+    editor->setDocument(document);
+    editor->setWindowTitle(tr("Text Document Image Format"));
+    editor->resize(320, 480);
+    editor->show();
+    
+    return app.exec();
+}
diff --git a/doc/src/snippets/textdocument-imageformat/textdocument-imageformat.pro b/doc/src/snippets/textdocument-imageformat/textdocument-imageformat.pro
new file mode 100644
index 0000000000..1c6437050a
--- /dev/null
+++ b/doc/src/snippets/textdocument-imageformat/textdocument-imageformat.pro
@@ -0,0 +1,2 @@
+SOURCES     = main.cpp
+RESOURCES   += images.qrc
diff --git a/doc/src/snippets/textdocument-images/images.qrc b/doc/src/snippets/textdocument-images/images.qrc
new file mode 100644
index 0000000000..09e305e8f2
--- /dev/null
+++ b/doc/src/snippets/textdocument-images/images.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+   <file>images/advert.png</file>
+</qresource>
+</RCC>
diff --git a/doc/src/snippets/textdocument-images/images/advert.png b/doc/src/snippets/textdocument-images/images/advert.png
new file mode 100644
index 0000000000..40e10d5225
--- /dev/null
+++ b/doc/src/snippets/textdocument-images/images/advert.png
diff --git a/doc/src/snippets/textdocument-images/main.cpp b/doc/src/snippets/textdocument-images/main.cpp
new file mode 100644
index 0000000000..8c0f646023
--- /dev/null
+++ b/doc/src/snippets/textdocument-images/main.cpp
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+QString tr(const char *text)
+{
+    return QApplication::translate(text, text);
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QTextEdit *editor = new QTextEdit;
+
+//! [0]
+    QTextDocument *document = new QTextDocument(editor);
+    QTextCursor cursor(document);
+//! [0]
+
+//! [1]
+    QTextImageFormat imageFormat;
+    imageFormat.setName(":/images/advert.png");
+    cursor.insertImage(imageFormat);
+//! [1]
+
+    cursor.insertBlock();
+    cursor.insertText("Code less. Create more.");
+
+    editor->setDocument(document);
+    editor->setWindowTitle(tr("Text Document Images"));
+    editor->resize(320, 480);
+    editor->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/textdocument-images/textdocument-images.pro b/doc/src/snippets/textdocument-images/textdocument-images.pro
new file mode 100644
index 0000000000..1c6437050a
--- /dev/null
+++ b/doc/src/snippets/textdocument-images/textdocument-images.pro
@@ -0,0 +1,2 @@
+SOURCES     = main.cpp
+RESOURCES   += images.qrc
diff --git a/doc/src/snippets/textdocument-listitems/main.cpp b/doc/src/snippets/textdocument-listitems/main.cpp
new file mode 100644
index 0000000000..96dc33e8bc
--- /dev/null
+++ b/doc/src/snippets/textdocument-listitems/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *window = new MainWindow;
+    window->resize(640, 480);
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/textdocument-listitems/mainwindow.cpp b/doc/src/snippets/textdocument-listitems/mainwindow.cpp
new file mode 100644
index 0000000000..85ce5249cf
--- /dev/null
+++ b/doc/src/snippets/textdocument-listitems/mainwindow.cpp
@@ -0,0 +1,198 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+MainWindow::MainWindow()
+{
+    QMenu *fileMenu = new QMenu(tr("&File"));
+
+    fileMenu->addAction(tr("E&xit"), this, SLOT(close()),
+        QKeySequence(tr("Ctrl+Q", "File|Exit")));
+
+    QMenu *actionsMenu = new QMenu(tr("&Actions"));
+    actionsMenu->addAction(tr("&Highlight List Items"),
+                        this, SLOT(highlightListItems()));
+    actionsMenu->addAction(tr("&Show Current List"), this, SLOT(showList()));
+
+    QMenu *insertMenu = new QMenu(tr("&Insert"));
+
+    insertMenu->addAction(tr("&List"), this, SLOT(insertList()),
+        QKeySequence(tr("Ctrl+L", "Insert|List")));
+
+    menuBar()->addMenu(fileMenu);
+    menuBar()->addMenu(insertMenu);
+    menuBar()->addMenu(actionsMenu);
+
+    editor = new QTextEdit(this);
+    document = new QTextDocument(this);
+    editor->setDocument(document);
+
+    setCentralWidget(editor);
+    setWindowTitle(tr("Text Document List Items"));
+}
+
+void MainWindow::highlightListItems()
+{
+    QTextCursor cursor = editor->textCursor();
+    QTextList *list = cursor.currentList();
+
+    if (!list)
+        return;
+
+    cursor.beginEditBlock();
+//! [0]
+    for (int index = 0; index < list->count(); ++index) {
+        QTextBlock listItem = list->item(index);
+//! [0]
+        QTextBlockFormat newBlockFormat = listItem.blockFormat();
+        newBlockFormat.setBackground(Qt::lightGray);
+        QTextCursor itemCursor = cursor;
+        itemCursor.setPosition(listItem.position());
+        //itemCursor.movePosition(QTextCursor::StartOfBlock);
+        itemCursor.movePosition(QTextCursor::EndOfBlock,
+                                QTextCursor::KeepAnchor);
+        itemCursor.setBlockFormat(newBlockFormat);
+        /*
+//! [1]
+        processListItem(listItem);
+//! [1]
+        */
+//! [2]
+    }
+//! [2]
+    cursor.endEditBlock();
+}
+
+void MainWindow::showList()
+{
+    QTextCursor cursor = editor->textCursor();
+    QTextFrame *frame = cursor.currentFrame();
+
+    if (!frame)
+        return;
+
+    QTreeWidget *treeWidget = new QTreeWidget;
+    treeWidget->setColumnCount(1);
+    QStringList headerLabels;
+    headerLabels << tr("Lists");
+    treeWidget->setHeaderLabels(headerLabels);
+
+    QTreeWidgetItem *parentItem = 0;
+    QTreeWidgetItem *item;
+    QTreeWidgetItem *lastItem = 0;
+    parentItems.clear();
+    previousItems.clear();
+
+//! [3]
+    QTextFrame::iterator it;
+    for (it = frame->begin(); !(it.atEnd()); ++it) {
+
+        QTextBlock block = it.currentBlock();
+
+        if (block.isValid()) {
+
+            QTextList *list = block.textList();
+
+            if (list) {
+                int index = list->itemNumber(block);
+//! [3]
+                if (index == 0) {
+                    parentItems.append(parentItem);
+                    previousItems.append(lastItem);
+                    listStructures.append(list);
+                    parentItem = lastItem;
+                    lastItem = 0;
+
+                    if (parentItem != 0)
+                        item = new QTreeWidgetItem(parentItem, lastItem);
+                    else
+                        item = new QTreeWidgetItem(treeWidget, lastItem);
+
+                } else {
+
+                    while (parentItem != 0 && listStructures.last() != list) {
+                        listStructures.pop_back();
+                        parentItem = parentItems.takeLast();
+                        lastItem = previousItems.takeLast();
+                    }
+                    if (parentItem != 0)
+                        item = new QTreeWidgetItem(parentItem, lastItem);
+                    else
+                        item = new QTreeWidgetItem(treeWidget, lastItem);
+                }
+                item->setText(0, block.text());
+                lastItem = item;
+                /*
+//! [4]
+                processListItem(list, index);
+//! [4]
+                */
+//! [5]
+            }
+//! [5] //! [6]
+        }
+//! [6] //! [7]
+    }
+//! [7]
+
+    treeWidget->setWindowTitle(tr("List Contents"));
+    treeWidget->show();
+}
+
+void MainWindow::insertList()
+{
+    QTextCursor cursor = editor->textCursor();
+    cursor.beginEditBlock();
+
+    QTextList *list = cursor.currentList();
+    QTextListFormat listFormat;
+    if (list)
+        listFormat = list->format();
+
+    listFormat.setStyle(QTextListFormat::ListDisc);
+    listFormat.setIndent(listFormat.indent() + 1);
+    cursor.insertList(listFormat);
+
+    cursor.endEditBlock();
+}
diff --git a/doc/src/snippets/textdocument-listitems/mainwindow.h b/doc/src/snippets/textdocument-listitems/mainwindow.h
new file mode 100644
index 0000000000..223f72c281
--- /dev/null
+++ b/doc/src/snippets/textdocument-listitems/mainwindow.h
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QList>
+#include <QMainWindow>
+#include <QString>
+
+class QAction;
+class QTextDocument;
+class QTextEdit;
+class QTextList;
+class QTreeWidgetItem;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+public slots:
+    void insertList();
+    void highlightListItems();
+    void showList();
+
+private:
+    QString currentFile;
+    QTextEdit *editor;
+    QTextDocument *document;
+    QList<QTextList*> listStructures;
+    QList<QTreeWidgetItem*> previousItems;
+    QList<QTreeWidgetItem*> parentItems;
+};
+
+#endif
diff --git a/doc/src/snippets/textdocument-listitems/textdocument-listitems.pro b/doc/src/snippets/textdocument-listitems/textdocument-listitems.pro
new file mode 100644
index 0000000000..5da8d6e1a1
--- /dev/null
+++ b/doc/src/snippets/textdocument-listitems/textdocument-listitems.pro
@@ -0,0 +1,3 @@
+HEADERS     = mainwindow.h
+SOURCES     = main.cpp \
+              mainwindow.cpp
diff --git a/doc/src/snippets/textdocument-lists/main.cpp b/doc/src/snippets/textdocument-lists/main.cpp
new file mode 100644
index 0000000000..96dc33e8bc
--- /dev/null
+++ b/doc/src/snippets/textdocument-lists/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *window = new MainWindow;
+    window->resize(640, 480);
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/textdocument-lists/mainwindow.cpp b/doc/src/snippets/textdocument-lists/mainwindow.cpp
new file mode 100644
index 0000000000..f6ddb8e9ec
--- /dev/null
+++ b/doc/src/snippets/textdocument-lists/mainwindow.cpp
@@ -0,0 +1,193 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+MainWindow::MainWindow()
+{
+    QMenu *fileMenu = new QMenu(tr("&File"));
+
+    fileMenu->addAction(tr("E&xit"), this, SLOT(close()),
+        QKeySequence(tr("Ctrl+Q", "File|Exit")));
+
+    QMenu *editMenu = new QMenu(tr("&Edit"));
+
+    cutAction = editMenu->addAction(tr("Cu&t"), this, SLOT(cutSelection()),
+        QKeySequence(tr("Ctrl+X", "Edit|Cut")));
+    copyAction = editMenu->addAction(tr("&Copy"), this, SLOT(copySelection()),
+        QKeySequence(tr("Ctrl+C", "Edit|Copy")));
+    pasteAction = editMenu->addAction(tr("&Paste"), this,
+        SLOT(pasteSelection()), QKeySequence(tr("Ctrl+V", "Edit|Paste")));
+
+    QMenu *selectMenu = new QMenu(tr("&Select"));
+    selectMenu->addAction(tr("&Word"), this, SLOT(selectWord()));
+    selectMenu->addAction(tr("&Line"), this, SLOT(selectLine()));
+    selectMenu->addAction(tr("&Block"), this, SLOT(selectBlock()));
+    selectMenu->addAction(tr("&Frame"), this, SLOT(selectFrame()));
+
+    QMenu *insertMenu = new QMenu(tr("&Insert"));
+
+    insertMenu->addAction(tr("&List"), this, SLOT(insertList()),
+        QKeySequence(tr("Ctrl+L", "Insert|List")));
+
+    menuBar()->addMenu(fileMenu);
+    menuBar()->addMenu(editMenu);
+    menuBar()->addMenu(selectMenu);
+    menuBar()->addMenu(insertMenu);
+
+    editor = new QTextEdit(this);
+    document = new QTextDocument(this);
+    editor->setDocument(document);
+
+    connect(editor, SIGNAL(selectionChanged()), this, SLOT(updateMenus()));
+
+    updateMenus();
+
+    setCentralWidget(editor);
+    setWindowTitle(tr("Text Document Writer"));
+}
+
+void MainWindow::cutSelection()
+{
+    QTextCursor cursor = editor->textCursor();
+    if (cursor.hasSelection()) {
+        selection = cursor.selection();
+        cursor.removeSelectedText();
+    }
+}
+
+void MainWindow::copySelection()
+{
+    QTextCursor cursor = editor->textCursor();
+    if (cursor.hasSelection()) {
+        selection = cursor.selection();
+        cursor.clearSelection();
+    }
+}
+
+void MainWindow::pasteSelection()
+{
+    QTextCursor cursor = editor->textCursor();
+    cursor.insertFragment(selection);
+}
+
+void MainWindow::selectWord()
+{
+    QTextCursor cursor = editor->textCursor();
+    QTextBlock block = cursor.block();
+
+    cursor.beginEditBlock();
+    cursor.movePosition(QTextCursor::StartOfWord);
+    cursor.movePosition(QTextCursor::EndOfWord, QTextCursor::KeepAnchor);
+    cursor.endEditBlock();
+
+    editor->setTextCursor(cursor);
+}
+
+void MainWindow::selectLine()
+{
+    QTextCursor cursor = editor->textCursor();
+    QTextBlock block = cursor.block();
+
+    cursor.beginEditBlock();
+    cursor.movePosition(QTextCursor::StartOfLine);
+    cursor.movePosition(QTextCursor::EndOfLine, QTextCursor::KeepAnchor);
+    cursor.endEditBlock();
+
+    editor->setTextCursor(cursor);
+}
+
+void MainWindow::selectBlock()
+{
+    QTextCursor cursor = editor->textCursor();
+    QTextBlock block = cursor.block();
+
+    cursor.beginEditBlock();
+    cursor.movePosition(QTextCursor::StartOfBlock);
+    cursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor);
+    cursor.endEditBlock();
+
+    editor->setTextCursor(cursor);
+}
+
+void MainWindow::selectFrame()
+{
+    QTextCursor cursor = editor->textCursor();
+    QTextFrame *frame = cursor.currentFrame();
+
+    cursor.beginEditBlock();
+    cursor.setPosition(frame->firstPosition());
+    cursor.setPosition(frame->lastPosition(), QTextCursor::KeepAnchor);
+    cursor.endEditBlock();
+
+    editor->setTextCursor(cursor);
+}
+
+void MainWindow::insertList()
+{
+    QTextCursor cursor = editor->textCursor();
+    cursor.beginEditBlock();
+
+    QTextList *list = cursor.currentList();
+//! [0]
+    QTextListFormat listFormat;
+    if (list) {
+        listFormat = list->format();
+        listFormat.setIndent(listFormat.indent() + 1);
+    }
+
+    listFormat.setStyle(QTextListFormat::ListDisc);
+    cursor.insertList(listFormat);
+//! [0]
+
+    cursor.endEditBlock();
+}
+
+void MainWindow::updateMenus()
+{
+    QTextCursor cursor = editor->textCursor();
+    cutAction->setEnabled(cursor.hasSelection());
+    copyAction->setEnabled(cursor.hasSelection());
+
+    pasteAction->setEnabled(!selection.isEmpty());
+}
diff --git a/doc/src/snippets/textdocument-lists/mainwindow.h b/doc/src/snippets/textdocument-lists/mainwindow.h
new file mode 100644
index 0000000000..e1907aaa5c
--- /dev/null
+++ b/doc/src/snippets/textdocument-lists/mainwindow.h
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QMainWindow>
+#include <QTextDocumentFragment>
+
+class QAction;
+class QTextDocument;
+class QTextEdit;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+public slots:
+    void cutSelection();
+    void copySelection();
+    void insertList();
+    void pasteSelection();
+    void selectWord();
+    void selectLine();
+    void selectBlock();
+    void selectFrame();
+    void updateMenus();
+
+private:
+    QAction *cutAction;
+    QAction *copyAction;
+    QAction *pasteAction;
+    QString currentFile;
+    QTextEdit *editor;
+    QTextDocument *document;
+    QTextDocumentFragment selection;
+};
+
+#endif
diff --git a/doc/src/snippets/textdocument-lists/textdocument-lists.pro b/doc/src/snippets/textdocument-lists/textdocument-lists.pro
new file mode 100644
index 0000000000..5da8d6e1a1
--- /dev/null
+++ b/doc/src/snippets/textdocument-lists/textdocument-lists.pro
@@ -0,0 +1,3 @@
+HEADERS     = mainwindow.h
+SOURCES     = main.cpp \
+              mainwindow.cpp
diff --git a/doc/src/snippets/textdocument-printing/main.cpp b/doc/src/snippets/textdocument-printing/main.cpp
new file mode 100644
index 0000000000..96dc33e8bc
--- /dev/null
+++ b/doc/src/snippets/textdocument-printing/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *window = new MainWindow;
+    window->resize(640, 480);
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/textdocument-printing/mainwindow.cpp b/doc/src/snippets/textdocument-printing/mainwindow.cpp
new file mode 100644
index 0000000000..9cbf7fbebb
--- /dev/null
+++ b/doc/src/snippets/textdocument-printing/mainwindow.cpp
@@ -0,0 +1,125 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+MainWindow::MainWindow()
+{
+    QMenu *fileMenu = new QMenu(tr("&File"));
+
+    fileMenu->addAction(tr("&Open..."), this, SLOT(openFile()),
+                        QKeySequence(tr("Ctrl+O", "File|Open")));
+
+    printAction = fileMenu->addAction(tr("&Print..."), this, SLOT(printFile()));
+    printAction->setEnabled(false);
+
+    pdfPrintAction = fileMenu->addAction(tr("Print as P&DF..."), this, SLOT(printPdf()));
+    pdfPrintAction->setEnabled(false);
+
+    fileMenu->addAction(tr("E&xit"), this, SLOT(close()),
+                        QKeySequence(tr("Ctrl+Q", "File|Exit")));
+
+    menuBar()->addMenu(fileMenu);
+
+    editor = new QTextEdit(this);
+    document = new QTextDocument(this);
+    editor->setDocument(document);
+
+    connect(editor, SIGNAL(selectionChanged()), this, SLOT(updateMenus()));
+
+    setCentralWidget(editor);
+    setWindowTitle(tr("Text Document Writer"));
+}
+
+void MainWindow::openFile()
+{
+    QString fileName = QFileDialog::getOpenFileName(this,
+        tr("Open file"), currentFile, "HTML files (*.html);;Text files (*.txt)");
+    
+    if (!fileName.isEmpty()) {
+        QFileInfo info(fileName);
+        if (info.completeSuffix() == "html") {
+            QFile file(fileName);
+            
+            if (file.open(QIODevice::ReadOnly)) {
+                editor->setHtml(file.readAll());
+                file.close();
+                currentFile = fileName;
+            }
+        } else if (info.completeSuffix() == "txt") {
+            QFile file(fileName);
+            
+            if (file.open(QIODevice::ReadOnly)) {
+                editor->setPlainText(file.readAll());
+                file.close();
+                currentFile = fileName;
+            }
+        }
+        printAction->setEnabled(true);
+        pdfPrintAction->setEnabled(true);
+    }
+}
+
+void MainWindow::printFile()
+{
+//! [0]
+    QTextDocument *document = editor->document();
+    QPrinter printer;
+
+    QPrintDialog *dlg = new QPrintDialog(&printer, this);
+    if (dlg->exec() != QDialog::Accepted)
+        return;
+
+    document->print(&printer);
+//! [0]
+}
+
+void MainWindow::printPdf()
+{
+    QPrinter printer(QPrinter::HighResolution);
+    printer.setOutputFormat(QPrinter::PdfFormat);
+
+    QPrintDialog *printDialog = new QPrintDialog(&printer, this);
+    if (printDialog->exec() == QDialog::Accepted)
+        editor->document()->print(&printer);
+}
diff --git a/doc/src/snippets/textdocument-printing/mainwindow.h b/doc/src/snippets/textdocument-printing/mainwindow.h
new file mode 100644
index 0000000000..5d69a8199d
--- /dev/null
+++ b/doc/src/snippets/textdocument-printing/mainwindow.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QHash>
+#include <QMainWindow>
+#include <QTextDocumentFragment>
+
+class QAction;
+class QTextDocument;
+class QTextEdit;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+public slots:
+    void openFile();
+    void printFile();
+    void printPdf();
+
+private:
+    QAction *printAction;
+    QAction *pdfPrintAction;
+    QString currentFile;
+    QTextEdit *editor;
+    QTextDocument *document;
+};
+
+#endif
diff --git a/doc/src/snippets/textdocument-printing/textdocument-printing.pro b/doc/src/snippets/textdocument-printing/textdocument-printing.pro
new file mode 100644
index 0000000000..5da8d6e1a1
--- /dev/null
+++ b/doc/src/snippets/textdocument-printing/textdocument-printing.pro
@@ -0,0 +1,3 @@
+HEADERS     = mainwindow.h
+SOURCES     = main.cpp \
+              mainwindow.cpp
diff --git a/doc/src/snippets/textdocument-resources/main.cpp b/doc/src/snippets/textdocument-resources/main.cpp
new file mode 100644
index 0000000000..dac1a8f523
--- /dev/null
+++ b/doc/src/snippets/textdocument-resources/main.cpp
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+QString tr(const char *text)
+{
+    return QApplication::translate(text, text);
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QTextEdit *editor = new QTextEdit;
+
+    QTextDocument *document = new QTextDocument(editor);
+    QTextCursor cursor(document);
+
+    QImage image(64, 64, QImage::Format_RGB32);
+    image.fill(qRgb(255, 160, 128));
+
+//! [Adding a resource]
+    document->addResource(QTextDocument::ImageResource,
+        QUrl("mydata://image.png"), QVariant(image));
+//! [Adding a resource]
+
+//! [Inserting an image with a cursor]
+    QTextImageFormat imageFormat;
+    imageFormat.setName("mydata://image.png");
+    cursor.insertImage(imageFormat);
+//! [Inserting an image with a cursor]
+
+    cursor.insertBlock();
+    cursor.insertText("Code less. Create more.");
+
+    editor->setDocument(document);
+    editor->setWindowTitle(tr("Text Document Images"));
+    editor->resize(320, 480);
+    editor->show();
+
+//! [Inserting an image using HTML]
+    editor->append("<img src=\"mydata://image.png\" />");
+//! [Inserting an image using HTML]
+
+    return app.exec();
+}
diff --git a/doc/src/snippets/textdocument-resources/textdocument-resources.pro b/doc/src/snippets/textdocument-resources/textdocument-resources.pro
new file mode 100644
index 0000000000..16181f21cf
--- /dev/null
+++ b/doc/src/snippets/textdocument-resources/textdocument-resources.pro
@@ -0,0 +1 @@
+SOURCES     = main.cpp
diff --git a/doc/src/snippets/textdocument-selections/main.cpp b/doc/src/snippets/textdocument-selections/main.cpp
new file mode 100644
index 0000000000..96dc33e8bc
--- /dev/null
+++ b/doc/src/snippets/textdocument-selections/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *window = new MainWindow;
+    window->resize(640, 480);
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/textdocument-selections/mainwindow.cpp b/doc/src/snippets/textdocument-selections/mainwindow.cpp
new file mode 100644
index 0000000000..47f626b2db
--- /dev/null
+++ b/doc/src/snippets/textdocument-selections/mainwindow.cpp
@@ -0,0 +1,204 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+MainWindow::MainWindow()
+{
+    QMenu *fileMenu = new QMenu(tr("&File"));
+
+    fileMenu->addAction(tr("&Open..."), this, SLOT(openFile()),
+                        QKeySequence(tr("Ctrl+O", "File|Open")));
+
+    QAction *quitAction = fileMenu->addAction(tr("E&xit"), this, SLOT(close()));
+    quitAction->setShortcut(tr("Ctrl+Q"));
+
+    QMenu *editMenu = new QMenu(tr("&Edit"));
+
+    cutAction = editMenu->addAction(tr("Cu&t"), this, SLOT(cutSelection()));
+    cutAction->setShortcut(tr("Ctrl+X"));
+    cutAction->setEnabled(false);
+
+    copyAction = editMenu->addAction(tr("&Copy"), this, SLOT(copySelection()));
+    copyAction->setShortcut(tr("Ctrl+C"));
+    copyAction->setEnabled(false);
+
+    pasteAction = editMenu->addAction(tr("&Paste"), this, SLOT(pasteSelection()));
+    pasteAction->setShortcut(tr("Ctrl+V"));
+    pasteAction->setEnabled(false);
+
+    QMenu *selectMenu = new QMenu(tr("&Select"));
+    selectMenu->addAction(tr("&Word"), this, SLOT(selectWord()));
+    selectMenu->addAction(tr("&Line"), this, SLOT(selectLine()));
+    selectMenu->addAction(tr("&Block"), this, SLOT(selectBlock()));
+    selectMenu->addAction(tr("&Frame"), this, SLOT(selectFrame()));
+
+    menuBar()->addMenu(fileMenu);
+    menuBar()->addMenu(editMenu);
+    menuBar()->addMenu(selectMenu);
+
+    editor = new QTextEdit(this);
+    document = new QTextDocument(this);
+    editor->setDocument(document);
+
+    connect(editor, SIGNAL(selectionChanged()), this, SLOT(updateMenus()));
+
+    setCentralWidget(editor);
+    setWindowTitle(tr("Text Document Writer"));
+}
+
+void MainWindow::openFile()
+{
+    QString fileName = QFileDialog::getOpenFileName(this,
+        tr("Open file"), currentFile, "HTML files (*.html);;Text files (*.txt)");
+    
+    if (!fileName.isEmpty()) {
+        QFileInfo info(fileName);
+        if (info.completeSuffix() == "html") {
+            QFile file(fileName);
+            
+            if (file.open(QFile::ReadOnly)) {
+                editor->setHtml(QString(file.readAll()));
+                file.close();
+                currentFile = fileName;
+            }
+        } else if (info.completeSuffix() == "txt") {
+            QFile file(fileName);
+            
+            if (file.open(QFile::ReadOnly)) {
+                editor->setPlainText(file.readAll());
+                file.close();
+                currentFile = fileName;
+            }
+        }
+    }
+}
+
+void MainWindow::cutSelection()
+{
+    QTextCursor cursor = editor->textCursor();
+    if (cursor.hasSelection()) {
+        selection = cursor.selection();
+        cursor.removeSelectedText();
+    }
+}
+
+void MainWindow::copySelection()
+{
+    QTextCursor cursor = editor->textCursor();
+    if (cursor.hasSelection()) {
+        selection = cursor.selection();
+        cursor.clearSelection();
+    }
+}
+
+void MainWindow::pasteSelection()
+{
+    QTextCursor cursor = editor->textCursor();
+    cursor.insertFragment(selection);
+}
+
+void MainWindow::selectWord()
+{
+    QTextCursor cursor = editor->textCursor();
+    QTextBlock block = cursor.block();
+
+//! [0]
+    cursor.beginEditBlock();
+//! [1]
+    cursor.movePosition(QTextCursor::StartOfWord);
+    cursor.movePosition(QTextCursor::EndOfWord, QTextCursor::KeepAnchor);
+//! [1]
+    cursor.endEditBlock();
+//! [0]
+
+    editor->setTextCursor(cursor);
+}
+
+void MainWindow::selectLine()
+{
+    QTextCursor cursor = editor->textCursor();
+    QTextBlock block = cursor.block();
+
+    cursor.beginEditBlock();
+    cursor.movePosition(QTextCursor::StartOfLine);
+    cursor.movePosition(QTextCursor::EndOfLine, QTextCursor::KeepAnchor);
+    cursor.endEditBlock();
+
+    editor->setTextCursor(cursor);
+}
+
+void MainWindow::selectBlock()
+{
+    QTextCursor cursor = editor->textCursor();
+    QTextBlock block = cursor.block();
+
+    cursor.beginEditBlock();
+    cursor.movePosition(QTextCursor::StartOfBlock);
+    cursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor);
+    cursor.endEditBlock();
+
+    editor->setTextCursor(cursor);
+}
+
+void MainWindow::selectFrame()
+{
+    QTextCursor cursor = editor->textCursor();
+    QTextFrame *frame = cursor.currentFrame();
+
+    cursor.beginEditBlock();
+    cursor.setPosition(frame->firstPosition());
+    cursor.setPosition(frame->lastPosition(), QTextCursor::KeepAnchor);
+    cursor.endEditBlock();
+
+    editor->setTextCursor(cursor);
+}
+
+void MainWindow::updateMenus()
+{
+    QTextCursor cursor = editor->textCursor();
+    cutAction->setEnabled(cursor.hasSelection());
+    copyAction->setEnabled(cursor.hasSelection());
+
+    pasteAction->setEnabled(!selection.isEmpty());
+}
diff --git a/doc/src/snippets/textdocument-selections/mainwindow.h b/doc/src/snippets/textdocument-selections/mainwindow.h
new file mode 100644
index 0000000000..effe935a02
--- /dev/null
+++ b/doc/src/snippets/textdocument-selections/mainwindow.h
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QMainWindow>
+#include <QTextDocumentFragment>
+
+class QAction;
+class QTextDocument;
+class QTextEdit;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+public slots:
+    void cutSelection();
+    void copySelection();
+    void openFile();
+    void pasteSelection();
+    void selectWord();
+    void selectLine();
+    void selectBlock();
+    void selectFrame();
+    void updateMenus();
+
+private:
+    QAction *cutAction;
+    QAction *copyAction;
+    QAction *pasteAction;
+    QString currentFile;
+    QTextEdit *editor;
+    QTextDocument *document;
+    QTextDocumentFragment selection;
+};
+
+#endif
diff --git a/doc/src/snippets/textdocument-selections/textdocument-selections.pro b/doc/src/snippets/textdocument-selections/textdocument-selections.pro
new file mode 100644
index 0000000000..253c452723
--- /dev/null
+++ b/doc/src/snippets/textdocument-selections/textdocument-selections.pro
@@ -0,0 +1,4 @@
+QT          += xml
+HEADERS     = mainwindow.h
+SOURCES     = main.cpp \
+              mainwindow.cpp
diff --git a/doc/src/snippets/textdocument-tables/main.cpp b/doc/src/snippets/textdocument-tables/main.cpp
new file mode 100644
index 0000000000..1854ad5ca3
--- /dev/null
+++ b/doc/src/snippets/textdocument-tables/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *window = new MainWindow;
+    window->resize(480, 480);
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/textdocument-tables/mainwindow.cpp b/doc/src/snippets/textdocument-tables/mainwindow.cpp
new file mode 100644
index 0000000000..10d1abbb73
--- /dev/null
+++ b/doc/src/snippets/textdocument-tables/mainwindow.cpp
@@ -0,0 +1,205 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+#include "xmlwriter.h"
+
+MainWindow::MainWindow()
+{
+    QMenu *fileMenu = new QMenu(tr("&File"));
+
+    QAction *saveAction = fileMenu->addAction(tr("&Save..."));
+    saveAction->setShortcut(tr("Ctrl+S"));
+    QAction *quitAction = fileMenu->addAction(tr("E&xit"));
+    quitAction->setShortcut(tr("Ctrl+Q"));
+
+    QMenu *showMenu = new QMenu(tr("&Show"));
+
+    QAction *showTableAction = showMenu->addAction(tr("&Table"));
+
+    menuBar()->addMenu(fileMenu);
+    menuBar()->addMenu(showMenu);
+
+    editor = new QTextEdit();
+
+//! [0] //! [1]
+    QTextCursor cursor(editor->textCursor());
+//! [0]
+    cursor.movePosition(QTextCursor::Start);
+//! [1]
+
+    int rows = 11;
+    int columns = 4;
+
+//! [2]
+    QTextTableFormat tableFormat;
+    tableFormat.setBackground(QColor("#e0e0e0"));
+    QVector<QTextLength> constraints;
+    constraints << QTextLength(QTextLength::PercentageLength, 16);
+    constraints << QTextLength(QTextLength::PercentageLength, 28);
+    constraints << QTextLength(QTextLength::PercentageLength, 28);
+    constraints << QTextLength(QTextLength::PercentageLength, 28);
+    tableFormat.setColumnWidthConstraints(constraints);
+//! [3]
+    QTextTable *table = cursor.insertTable(rows, columns, tableFormat);
+//! [2] //! [3]
+
+    int column;
+    int row;
+    QTextTableCell cell;
+    QTextCursor cellCursor;
+    
+    QTextCharFormat charFormat;
+    charFormat.setForeground(Qt::black);
+
+//! [4]
+    cell = table->cellAt(0, 0);
+    cellCursor = cell.firstCursorPosition();
+    cellCursor.insertText(tr("Week"), charFormat);
+//! [4]
+
+//! [5]
+    for (column = 1; column < columns; ++column) {
+        cell = table->cellAt(0, column);
+        cellCursor = cell.firstCursorPosition();
+        cellCursor.insertText(tr("Team %1").arg(column), charFormat);
+    }
+
+    for (row = 1; row < rows; ++row) {
+        cell = table->cellAt(row, 0);
+        cellCursor = cell.firstCursorPosition();
+        cellCursor.insertText(tr("%1").arg(row), charFormat);
+
+        for (column = 1; column < columns; ++column) {
+            if ((row-1) % 3 == column-1) {
+//! [5] //! [6]
+                cell = table->cellAt(row, column);
+                QTextCursor cellCursor = cell.firstCursorPosition();
+                cellCursor.insertText(tr("On duty"), charFormat);
+            }
+//! [6] //! [7]
+        }
+//! [7] //! [8]
+    }
+//! [8]
+
+    connect(saveAction, SIGNAL(triggered()), this, SLOT(saveFile()));
+    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
+    connect(showTableAction, SIGNAL(triggered()), this, SLOT(showTable()));
+
+    setCentralWidget(editor);
+    setWindowTitle(tr("Text Document Tables"));
+}
+
+void MainWindow::saveFile()
+{
+    QString fileName = QFileDialog::getSaveFileName(this,
+        tr("Save document as:"), "", tr("XML (*.xml)"));
+
+    if (!fileName.isEmpty()) {
+        if (writeXml(fileName))
+            setWindowTitle(fileName);
+        else
+            QMessageBox::warning(this, tr("Warning"),
+                tr("Failed to save the document."), QMessageBox::Cancel,
+                QMessageBox::NoButton);
+    }
+}
+
+void MainWindow::showTable()
+{
+    QTextCursor cursor = editor->textCursor();
+    QTextTable *table = cursor.currentTable();
+
+    if (!table)
+        return;
+
+    QTableWidget *tableWidget = new QTableWidget(table->rows(), table->columns());
+
+//! [9]
+    for (int row = 0; row < table->rows(); ++row) {
+        for (int column = 0; column < table->columns(); ++column) {
+            QTextTableCell tableCell = table->cellAt(row, column);
+//! [9]
+            QTextFrame::iterator it;
+            QString text;
+            for (it = tableCell.begin(); !(it.atEnd()); ++it) {
+                QTextBlock childBlock = it.currentBlock();
+                if (childBlock.isValid())
+                    text += childBlock.text();
+            }
+            QTableWidgetItem *newItem = new QTableWidgetItem(text);
+            tableWidget->setItem(row, column, newItem);
+            /*
+//! [10]
+            processTableCell(tableCell);
+//! [10]
+            */
+//! [11]
+        }
+//! [11] //! [12]
+    }
+//! [12]
+
+    tableWidget->setWindowTitle(tr("Table Contents"));
+    tableWidget->show();
+}
+
+bool MainWindow::writeXml(const QString &fileName)
+{
+    XmlWriter documentWriter(editor->document());
+
+    QDomDocument *domDocument = documentWriter.toXml();
+    QFile file(fileName);
+
+    if (file.open(QFile::WriteOnly)) {
+        QTextStream textStream(&file);
+        textStream.setCodec(QTextCodec::codecForName("UTF-8"));
+
+        textStream << domDocument->toString(1).toUtf8();
+        file.close();
+        return true;
+    }
+    else
+        return false;
+}
diff --git a/doc/src/snippets/textdocument-tables/mainwindow.h b/doc/src/snippets/textdocument-tables/mainwindow.h
new file mode 100644
index 0000000000..fbb3442274
--- /dev/null
+++ b/doc/src/snippets/textdocument-tables/mainwindow.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QMainWindow>
+
+class QTextEdit;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+public slots:
+    void saveFile();
+    void showTable();
+
+private:
+    bool writeXml(const QString &fileName);
+
+    QTextEdit *editor;
+};
+
+#endif
diff --git a/doc/src/snippets/textdocument-tables/textdocument-tables.pro b/doc/src/snippets/textdocument-tables/textdocument-tables.pro
new file mode 100644
index 0000000000..91ae50f491
--- /dev/null
+++ b/doc/src/snippets/textdocument-tables/textdocument-tables.pro
@@ -0,0 +1,6 @@
+SOURCES     = main.cpp \
+              mainwindow.cpp \
+              xmlwriter.cpp
+HEADERS     = mainwindow.h \
+              xmlwriter.h
+QT          += xml
diff --git a/doc/src/snippets/textdocument-tables/xmlwriter.cpp b/doc/src/snippets/textdocument-tables/xmlwriter.cpp
new file mode 100644
index 0000000000..c753c06eec
--- /dev/null
+++ b/doc/src/snippets/textdocument-tables/xmlwriter.cpp
@@ -0,0 +1,154 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "xmlwriter.h"
+
+QDomDocument *XmlWriter::toXml()
+{
+    QDomImplementation implementation;
+    QDomDocumentType docType = implementation.createDocumentType(
+        "scribe-document", "scribe", "qtsoftware.com/scribe");
+
+    document = new QDomDocument(docType);
+
+    // ### This processing instruction is required to ensure that any kind
+    // of encoding is given when the document is written.
+    QDomProcessingInstruction process = document->createProcessingInstruction(
+        "xml", "version=\"1.0\" encoding=\"utf-8\"");
+    document->appendChild(process);
+
+    QDomElement documentElement = document->createElement("document");
+    document->appendChild(documentElement);
+
+    QTextFrame *root = textDocument->rootFrame();
+    
+    if (root)
+        processFrame(documentElement, root);
+
+    return document;
+}
+
+void XmlWriter::processBlock(QDomElement &parent, const QTextBlock &block)
+{
+    QDomElement blockElement = document->createElement("block");
+    blockElement.setAttribute("position", block.position());
+    blockElement.setAttribute("length", block.length());
+    parent.appendChild(blockElement);
+
+    QTextBlock::iterator it;
+    for (it = block.begin(); !(it.atEnd()); ++it) {
+        QTextFragment fragment = it.fragment();
+
+        if (fragment.isValid()) {
+            QDomElement fragmentElement = document->createElement("fragment");
+            blockElement.appendChild(fragmentElement);
+
+            fragmentElement.setAttribute("length", fragment.length());
+            QDomText fragmentText = document->createTextNode(fragment.text());
+
+            fragmentElement.appendChild(fragmentText);
+        }
+    }
+}
+
+void XmlWriter::processFrame(QDomElement &parent, QTextFrame *frame)
+{
+    QDomElement frameElement = document->createElement("frame");
+    frameElement.setAttribute("begin", frame->firstPosition());
+    frameElement.setAttribute("end", frame->lastPosition());
+    parent.appendChild(frameElement);
+
+//! [0]
+    QTextFrame::iterator it;
+    for (it = frame->begin(); !(it.atEnd()); ++it) {
+
+        QTextFrame *childFrame = it.currentFrame();
+        QTextBlock childBlock = it.currentBlock();
+
+        if (childFrame) {
+            QTextTable *childTable = qobject_cast<QTextTable*>(childFrame);
+
+            if (childTable)
+                processTable(frameElement, childTable);
+            else
+                processFrame(frameElement, childFrame);
+
+        } else if (childBlock.isValid())
+//! [0] //! [1]
+            processBlock(frameElement, childBlock);
+    }
+//! [1]
+}
+
+void XmlWriter::processTable(QDomElement &parent, QTextTable *table)
+{
+    QDomElement element = document->createElement("table");
+
+    for (int row = 0; row < table->rows(); ++row) {
+        for (int column = 0; column < table->columns(); ++column) {
+            QTextTableCell cell = table->cellAt(row, column);
+            processTableCell(element, cell);
+        }
+    }
+    parent.appendChild(element);
+}
+
+void XmlWriter::processTableCell(QDomElement &parent, const QTextTableCell &cell)
+{
+    QDomElement element = document->createElement("cell");
+    element.setAttribute("row", cell.row());
+    element.setAttribute("column", cell.column());
+    
+    QTextFrame::iterator it;
+    for (it = cell.begin(); !(it.atEnd()); ++it) {
+
+        QTextFrame *childFrame = it.currentFrame();
+        QTextBlock childBlock = it.currentBlock();
+
+        if (childFrame)
+            processFrame(element, childFrame);
+        else if (childBlock.isValid())
+            processBlock(element, childBlock);
+    }
+    parent.appendChild(element);
+}
diff --git a/doc/src/snippets/textdocument-tables/xmlwriter.h b/doc/src/snippets/textdocument-tables/xmlwriter.h
new file mode 100644
index 0000000000..3a6f1a984b
--- /dev/null
+++ b/doc/src/snippets/textdocument-tables/xmlwriter.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef XMLWRITER_H
+#define XMLWRITER_H
+
+#include <QDomDocument>
+
+class QTextDocument;
+
+class XmlWriter
+{
+public:
+    XmlWriter(QTextDocument *document) : textDocument(document) {}
+    QDomDocument *toXml();
+
+private:
+    void processBlock(QDomElement &parent, const QTextBlock &block);
+    void processFrame(QDomElement &parent, QTextFrame *frame);
+    void processTable(QDomElement &parent, QTextTable *table);
+    void processTableCell(QDomElement &parent, const QTextTableCell &cell);
+
+    QDomDocument *document;
+    QTextDocument *textDocument;
+};
+
+#endif
diff --git a/doc/src/snippets/textdocument-texttable/main.cpp b/doc/src/snippets/textdocument-texttable/main.cpp
new file mode 100644
index 0000000000..0917dfce6b
--- /dev/null
+++ b/doc/src/snippets/textdocument-texttable/main.cpp
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+int main(int argc, char * argv[])
+{
+    int rows = 6;
+    int columns = 2;
+
+    QApplication app(argc, argv);
+    QTextEdit *textEdit = new QTextEdit;
+    QTextCursor cursor(textEdit->textCursor());
+    cursor.movePosition(QTextCursor::Start);
+
+    QTextTableFormat tableFormat;
+    tableFormat.setAlignment(Qt::AlignHCenter);
+    tableFormat.setCellPadding(2);
+    tableFormat.setCellSpacing(2);
+    QTextTable *table = cursor.insertTable(rows, columns);
+    table->setFormat(tableFormat);
+    
+    QTextCharFormat boldFormat;
+    boldFormat.setFontWeight(QFont::Bold);
+
+    QTextBlockFormat centerFormat;
+    centerFormat.setAlignment(Qt::AlignHCenter);
+    cursor.mergeBlockFormat(centerFormat);
+
+    cursor = table->cellAt(0, 0).firstCursorPosition();
+    cursor.insertText(("Details"), boldFormat);
+
+    cursor = table->cellAt(1, 0).firstCursorPosition();
+    cursor.insertText("Alan");
+
+    cursor = table->cellAt(1, 1).firstCursorPosition();
+    cursor.insertText("5, Pickety Street");
+
+//! [0]
+    table->mergeCells(0, 0, 1, 2);
+//! [0] //! [1]
+    table->splitCell(0, 0, 1, 1);
+//! [1]
+
+    textEdit->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/textdocumentendsnippet.cpp b/doc/src/snippets/textdocumentendsnippet.cpp
new file mode 100644
index 0000000000..4123f7854f
--- /dev/null
+++ b/doc/src/snippets/textdocumentendsnippet.cpp
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <iostream.h>
+
+int main(int argv, char **args)
+{
+    QString contentString("One\nTwp\nThree");
+
+    QTextDocument *doc = new QTextDocument(contentString);
+
+//! [0]
+    for (QTextBlock it = doc->begin(); it != doc->end(); it = it.next())
+        cout << it.text().toStdString() << endl;
+//! [0]
+
+    return 0;
+}
diff --git a/doc/src/snippets/threads/threads.cpp b/doc/src/snippets/threads/threads.cpp
new file mode 100644
index 0000000000..76a19dba3b
--- /dev/null
+++ b/doc/src/snippets/threads/threads.cpp
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QCache>
+#include <QMutex>
+#include <QThreadStorage>
+
+#include "threads.h"
+
+//! [0]
+void MyThread::run()
+//! [0] //! [1]
+{
+//! [1] //! [2]
+}
+//! [2]
+
+#define Counter ReentrantCounter
+
+//! [3]
+class Counter
+//! [3] //! [4]
+{
+public:
+    Counter() { n = 0; }
+
+    void increment() { ++n; }
+    void decrement() { --n; }
+    int value() const { return n; }
+
+private:
+    int n;
+};
+//! [4]
+
+#undef Counter
+#define Counter ThreadSafeCounter
+
+//! [5]
+class Counter
+//! [5] //! [6]
+{
+public:
+    Counter() { n = 0; }
+
+    void increment() { QMutexLocker locker(&mutex); ++n; }
+    void decrement() { QMutexLocker locker(&mutex); --n; }
+    int value() const { QMutexLocker locker(&mutex); return n; }
+
+private:
+    mutable QMutex mutex;
+    int n;
+};
+//! [6]
+
+typedef int SomeClass;
+
+//! [7]
+QThreadStorage<QCache<QString, SomeClass> *> caches;
+
+void cacheObject(const QString &key, SomeClass *object)
+//! [7] //! [8]
+{
+    if (!caches.hasLocalData())
+        caches.setLocalData(new QCache<QString, SomeClass>);
+
+    caches.localData()->insert(key, object);
+}
+
+void removeFromCache(const QString &key)
+//! [8] //! [9]
+{
+    if (!caches.hasLocalData())
+        return;
+
+    caches.localData()->remove(key);
+}
+//! [9]
+
+int main()
+{
+    return 0;
+}
diff --git a/doc/src/snippets/threads/threads.h b/doc/src/snippets/threads/threads.h
new file mode 100644
index 0000000000..45a59cd377
--- /dev/null
+++ b/doc/src/snippets/threads/threads.h
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QThread>
+
+//! [0]
+class MyThread : public QThread
+{
+    Q_OBJECT
+
+protected:
+    void run();
+};
+//! [0]
diff --git a/doc/src/snippets/timeline/main.cpp b/doc/src/snippets/timeline/main.cpp
new file mode 100644
index 0000000000..b2767ba62b
--- /dev/null
+++ b/doc/src/snippets/timeline/main.cpp
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <math.h>
+
+int main(int argv, char *args[])
+{
+    QApplication app(argv, args);
+
+//! [0]
+    QGraphicsItem *ball = new QGraphicsEllipseItem(0, 0, 20, 20);
+    
+    QTimeLine *timer = new QTimeLine(5000);
+    timer->setFrameRange(0, 100);
+    
+    QGraphicsItemAnimation *animation = new QGraphicsItemAnimation;
+    animation->setItem(ball);
+    animation->setTimeLine(timer);
+
+    for (int i = 0; i < 200; ++i) 
+	animation->setPosAt(i / 200.0, QPointF(i, i));
+    
+    QGraphicsScene *scene = new QGraphicsScene();
+    scene->setSceneRect(0, 0, 250, 250);
+    scene->addItem(ball);
+
+    QGraphicsView *view = new QGraphicsView(scene);
+    view->show();
+
+    timer->start();
+//! [0]
+
+    return app.exec();
+}
diff --git a/doc/src/snippets/timeline/timeline.pro b/doc/src/snippets/timeline/timeline.pro
new file mode 100644
index 0000000000..bba41b9c12
--- /dev/null
+++ b/doc/src/snippets/timeline/timeline.pro
@@ -0,0 +1 @@
+SOURCES = main.cpp
diff --git a/doc/src/snippets/timers/timers.cpp b/doc/src/snippets/timers/timers.cpp
new file mode 100644
index 0000000000..9f901f0fdd
--- /dev/null
+++ b/doc/src/snippets/timers/timers.cpp
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QTimer>
+
+class Foo : public QObject
+{
+public:
+    Foo();
+};
+
+Foo::Foo()
+{
+//! [0]
+    QTimer *timer = new QTimer(this);
+//! [0] //! [1]
+    connect(timer, SIGNAL(timeout()), this, SLOT(updateCaption()));
+//! [1] //! [2]
+    timer->start(1000);
+//! [2]
+
+//! [3]
+    QTimer::singleShot(200, this, SLOT(updateCaption()));
+//! [3]
+
+    {
+    // ZERO-CASE
+//! [4]
+    QTimer *timer = new QTimer(this);
+//! [4] //! [5]
+    connect(timer, SIGNAL(timeout()), this, SLOT(processOneThing()));
+//! [5] //! [6]
+    timer->start();
+//! [6]
+    }
+}
+
+int main()
+{
+    
+}
diff --git a/doc/src/snippets/timers/timers.pro b/doc/src/snippets/timers/timers.pro
new file mode 100644
index 0000000000..8cb4eecefe
--- /dev/null
+++ b/doc/src/snippets/timers/timers.pro
@@ -0,0 +1 @@
+SOURCES += timers.cpp
diff --git a/doc/src/snippets/transform/main.cpp b/doc/src/snippets/transform/main.cpp
new file mode 100644
index 0000000000..a4712a469e
--- /dev/null
+++ b/doc/src/snippets/transform/main.cpp
@@ -0,0 +1,141 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <cmath>
+
+class SimpleTransformation : public QWidget
+{
+    void paintEvent(QPaintEvent *);
+};
+
+//! [0]
+void SimpleTransformation::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+    painter.setPen(QPen(Qt::blue, 1, Qt::DashLine));
+    painter.drawRect(0, 0, 100, 100);
+
+    painter.rotate(45);
+
+    painter.setFont(QFont("Helvetica", 24));
+    painter.setPen(QPen(Qt::black, 1));
+    painter.drawText(20, 10, "QTransform");
+}
+//! [0]
+
+class CombinedTransformation : public QWidget
+{
+    void paintEvent(QPaintEvent *);
+};
+
+//! [1]
+void CombinedTransformation::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+    painter.setPen(QPen(Qt::blue, 1, Qt::DashLine));
+    painter.drawRect(0, 0, 100, 100);
+
+    QTransform transform;
+    transform.translate(50, 50);
+    transform.rotate(45);
+    transform.scale(0.5, 1.0);
+    painter.setTransform(transform);
+
+    painter.setFont(QFont("Helvetica", 24));
+    painter.setPen(QPen(Qt::black, 1));
+    painter.drawText(20, 10, "QTransform");
+}
+//! [1]
+
+class BasicOperations : public QWidget
+{
+    void paintEvent(QPaintEvent *);
+};
+
+//! [2]
+void BasicOperations::paintEvent(QPaintEvent *)
+{
+    double pi = 3.14;
+
+    double a    = pi/180 * 45.0;
+    double sina = sin(a);
+    double cosa = cos(a);
+
+    QTransform translationTransform(1, 0, 0, 1, 50.0, 50.0);
+    QTransform rotationTransform(cosa, sina, -sina, cosa, 0, 0);
+    QTransform scalingTransform(0.5, 0, 0, 1.0, 0, 0);
+
+    QTransform transform;
+    transform = scalingTransform * rotationTransform * translationTransform;
+
+    QPainter painter(this);
+    painter.setPen(QPen(Qt::blue, 1, Qt::DashLine));
+    painter.drawRect(0, 0, 100, 100);
+
+    painter.setTransform(transform);
+
+    painter.setFont(QFont("Helvetica", 24));
+    painter.setPen(QPen(Qt::black, 1));
+    painter.drawText(20, 10, "QTransform");
+}
+//! [2]
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    QWidget widget;
+
+    SimpleTransformation *simpleWidget = new SimpleTransformation;
+    CombinedTransformation *combinedWidget = new CombinedTransformation;
+    BasicOperations *basicWidget = new BasicOperations;
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(simpleWidget);
+    layout->addWidget(combinedWidget);
+    layout->addWidget(basicWidget);
+    widget.setLayout(layout);
+
+    widget.show();
+    widget.resize(130, 350);
+    return app.exec();
+}
diff --git a/doc/src/snippets/transform/transform.pro b/doc/src/snippets/transform/transform.pro
new file mode 100644
index 0000000000..5254077af2
--- /dev/null
+++ b/doc/src/snippets/transform/transform.pro
@@ -0,0 +1 @@
+SOURCES = main.cpp
\ No newline at end of file
diff --git a/doc/src/snippets/uitools/calculatorform/calculatorform.pro b/doc/src/snippets/uitools/calculatorform/calculatorform.pro
new file mode 100644
index 0000000000..1a18378f81
--- /dev/null
+++ b/doc/src/snippets/uitools/calculatorform/calculatorform.pro
@@ -0,0 +1,5 @@
+#! [0]
+TEMPLATE    = app
+FORMS       = calculatorform.ui
+SOURCES     = main.cpp
+#! [0]
diff --git a/doc/src/snippets/uitools/calculatorform/calculatorform.ui b/doc/src/snippets/uitools/calculatorform/calculatorform.ui
new file mode 100644
index 0000000000..dda0e62ddd
--- /dev/null
+++ b/doc/src/snippets/uitools/calculatorform/calculatorform.ui
@@ -0,0 +1,303 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>CalculatorForm</class>
+ <widget class="QWidget" name="CalculatorForm" >
+  <property name="objectName" >
+   <string notr="true" >CalculatorForm</string>
+  </property>
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>276</width>
+    <height>98</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy>
+    <hsizetype>5</hsizetype>
+    <vsizetype>5</vsizetype>
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle" >
+   <string>Calculator Builder</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="objectName" >
+    <string notr="true" />
+   </property>
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <layout class="QHBoxLayout" >
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="margin" >
+      <number>1</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <layout class="QVBoxLayout" >
+       <property name="objectName" >
+        <string notr="true" />
+       </property>
+       <property name="margin" >
+        <number>1</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label" >
+         <property name="objectName" >
+          <string notr="true" >label</string>
+         </property>
+         <property name="geometry" >
+          <rect>
+           <x>1</x>
+           <y>1</y>
+           <width>45</width>
+           <height>19</height>
+          </rect>
+         </property>
+         <property name="text" >
+          <string>Input 1</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="inputSpinBox1" >
+         <property name="objectName" >
+          <string notr="true" >inputSpinBox1</string>
+         </property>
+         <property name="geometry" >
+          <rect>
+           <x>1</x>
+           <y>26</y>
+           <width>45</width>
+           <height>25</height>
+          </rect>
+         </property>
+         <property name="mouseTracking" >
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_3" >
+       <property name="objectName" >
+        <string notr="true" >label_3</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>54</x>
+         <y>1</y>
+         <width>7</width>
+         <height>52</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>+</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" >
+       <property name="objectName" >
+        <string notr="true" />
+       </property>
+       <property name="margin" >
+        <number>1</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_2" >
+         <property name="objectName" >
+          <string notr="true" >label_2</string>
+         </property>
+         <property name="geometry" >
+          <rect>
+           <x>1</x>
+           <y>1</y>
+           <width>45</width>
+           <height>19</height>
+          </rect>
+         </property>
+         <property name="text" >
+          <string>Input 2</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="inputSpinBox2" >
+         <property name="objectName" >
+          <string notr="true" >inputSpinBox2</string>
+         </property>
+         <property name="geometry" >
+          <rect>
+           <x>1</x>
+           <y>26</y>
+           <width>45</width>
+           <height>25</height>
+          </rect>
+         </property>
+         <property name="mouseTracking" >
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_3_2" >
+       <property name="objectName" >
+        <string notr="true" >label_3_2</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>120</x>
+         <y>1</y>
+         <width>7</width>
+         <height>52</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>=</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" >
+       <property name="objectName" >
+        <string notr="true" />
+       </property>
+       <property name="margin" >
+        <number>1</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_2_2_2" >
+         <property name="objectName" >
+          <string notr="true" >label_2_2_2</string>
+         </property>
+         <property name="geometry" >
+          <rect>
+           <x>1</x>
+           <y>1</y>
+           <width>37</width>
+           <height>17</height>
+          </rect>
+         </property>
+         <property name="text" >
+          <string>Output</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="outputWidget" >
+         <property name="objectName" >
+          <string notr="true" >outputWidget</string>
+         </property>
+         <property name="geometry" >
+          <rect>
+           <x>1</x>
+           <y>24</y>
+           <width>37</width>
+           <height>27</height>
+          </rect>
+         </property>
+         <property name="frameShape" >
+          <enum>QFrame::Box</enum>
+         </property>
+         <property name="frameShadow" >
+          <enum>QFrame::Sunken</enum>
+         </property>
+         <property name="text" >
+          <string>0</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignAbsolute|Qt::AlignBottom|Qt::AlignCenter|Qt::AlignHCenter|Qt::AlignHorizontal_Mask|Qt::AlignJustify|Qt::AlignLeading|Qt::AlignLeft|Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing|Qt::AlignVCenter|Qt::AlignVertical_Mask</set>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0" >
+    <spacer>
+     <property name="objectName" >
+      <string notr="true" >verticalSpacer</string>
+     </property>
+     <property name="geometry" >
+      <rect>
+       <x>85</x>
+       <y>69</y>
+       <width>20</width>
+       <height>20</height>
+      </rect>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1" >
+    <spacer>
+     <property name="objectName" >
+      <string notr="true" >horizontalSpacer</string>
+     </property>
+     <property name="geometry" >
+      <rect>
+       <x>188</x>
+       <y>26</y>
+       <width>79</width>
+       <height>20</height>
+      </rect>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/doc/src/snippets/uitools/calculatorform/main.cpp b/doc/src/snippets/uitools/calculatorform/main.cpp
new file mode 100644
index 0000000000..e9af926a20
--- /dev/null
+++ b/doc/src/snippets/uitools/calculatorform/main.cpp
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#include "ui_calculatorform.h"
+//! [0]
+#include <QApplication>
+
+//! [1]
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QWidget *widget = new QWidget;
+    Ui::CalculatorForm ui;
+    ui.setupUi(widget);
+
+    widget->show();
+    return app.exec();
+}
+//! [1]
diff --git a/doc/src/snippets/updating-selections/main.cpp b/doc/src/snippets/updating-selections/main.cpp
new file mode 100644
index 0000000000..d8d5943de3
--- /dev/null
+++ b/doc/src/snippets/updating-selections/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+  main.cpp
+
+  A simple example that shows how selections can be used directly on a model.
+  It shows the result of some selections made using a table view.
+*/
+
+#include <QApplication>
+
+#include "window.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QMainWindow *window = new MainWindow;
+    window->show();
+    window->resize(640, 480);
+    return app.exec();
+}
diff --git a/doc/src/snippets/updating-selections/model.cpp b/doc/src/snippets/updating-selections/model.cpp
new file mode 100644
index 0000000000..ad7d2eddf8
--- /dev/null
+++ b/doc/src/snippets/updating-selections/model.cpp
@@ -0,0 +1,237 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+    model.cpp
+
+    Provides a table model for use in various examples.
+*/
+
+#include <QtGui>
+
+#include "model.h"
+
+/*!
+    Constructs a table model with at least one row and one column.
+*/
+
+TableModel::TableModel(int rows, int columns, QObject *parent)
+    : QAbstractTableModel(parent)
+{
+    QStringList newList;
+
+    for (int column = 0; column < qMax(1, columns); ++column) {
+        newList.append("");
+    }
+
+    for (int row = 0; row < qMax(1, rows); ++row) {
+        rowList.append(newList);
+    }
+}
+
+
+/*!
+    Returns the number of items in the row list as the number of rows
+    in the model.
+*/
+
+int TableModel::rowCount(const QModelIndex &/*parent*/) const
+{
+    return rowList.size();
+}
+
+/*!
+    Returns the number of items in the first list item as the number of
+    columns in the model. All rows should have the same number of columns.
+*/
+
+int TableModel::columnCount(const QModelIndex &/*parent*/) const
+{
+    return rowList[0].size();
+}
+
+/*!
+    Returns an appropriate value for the requested data.
+    If the view requests an invalid index, an invalid variant is returned.
+    Any valid index that corresponds to a string in the list causes that
+    string to be returned for the display role; otherwise an invalid variant
+    is returned.
+*/
+
+QVariant TableModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+
+    if (role == Qt::DisplayRole)
+        return rowList[index.row()][index.column()];
+    else
+        return QVariant();
+}
+
+/*!
+    Returns the appropriate header string depending on the orientation of
+    the header and the section. If anything other than the display role is
+    requested, we return an invalid variant.
+*/
+
+QVariant TableModel::headerData(int section, Qt::Orientation orientation,
+                                int role) const
+{
+    if (role != Qt::DisplayRole)
+        return QVariant();
+
+    if (orientation == Qt::Horizontal)
+        return QString("Column %1").arg(section);
+    else
+        return QString("Row %1").arg(section);
+}
+
+/*!
+    Returns an appropriate value for the item's flags. Valid items are
+    enabled, selectable, and editable.
+*/
+
+Qt::ItemFlags TableModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return Qt::ItemIsEnabled;
+
+    return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
+}
+
+/*!
+    Changes an item in the model, but only if the following conditions
+    are met:
+
+    * The index supplied is valid.
+    * The role associated with editing text is specified.
+
+    The dataChanged() signal is emitted if the item is changed.
+*/
+
+bool TableModel::setData(const QModelIndex &index,
+                         const QVariant &value, int role)
+{
+    if (!index.isValid() || role != Qt::EditRole)
+        return false;
+
+    rowList[index.row()][index.column()] = value.toString();
+    emit dataChanged(index, index);
+    return true;
+}
+
+/*!
+    Inserts a number of rows into the model at the specified position.
+*/
+
+bool TableModel::insertRows(int position, int rows, const QModelIndex &parent)
+{
+    int columns = columnCount();
+    beginInsertRows(parent, position, position + rows - 1);
+
+    for (int row = 0; row < rows; ++row) {
+        QStringList items;
+        for (int column = 0; column < columns; ++column)
+            items.append("");
+        rowList.insert(position, items);
+    }
+
+    endInsertRows();
+    return true;
+}
+
+/*!
+    Inserts a number of columns into the model at the specified position.
+    Each entry in the list is extended in turn with the required number of
+    empty strings.
+*/
+
+bool TableModel::insertColumns(int position, int columns, const QModelIndex &parent)
+{
+    int rows = rowCount();
+    beginInsertColumns(parent, position, position + columns - 1);
+
+    for (int row = 0; row < rows; ++row) {
+        for (int column = position; column < columns; ++column) {
+            rowList[row].insert(position, "");
+        }
+    }
+
+    endInsertColumns();
+    return true;
+}
+
+/*!
+    Removes a number of rows from the model at the specified position.
+*/
+
+bool TableModel::removeRows(int position, int rows, const QModelIndex &parent)
+{
+    beginRemoveRows(parent, position, position + rows - 1);
+
+    for (int row = 0; row < rows; ++row) {
+        rowList.removeAt(position);
+    }
+
+    endRemoveRows();
+    return true;
+}
+
+/*!
+    Removes a number of columns from the model at the specified position.
+    Each row is shortened by the number of columns specified.
+*/
+
+bool TableModel::removeColumns(int position, int columns, const QModelIndex &parent)
+{
+    int rows = rowCount();
+    beginRemoveColumns(parent, position, position + columns - 1);
+
+    for (int row = 0; row < rows; ++row) {
+        for (int column = 0; column < columns; ++column) {
+            rowList[row].removeAt(position);
+        }
+    }
+
+    endRemoveColumns();
+    return true;
+}
diff --git a/doc/src/snippets/updating-selections/model.h b/doc/src/snippets/updating-selections/model.h
new file mode 100644
index 0000000000..207f83a8bd
--- /dev/null
+++ b/doc/src/snippets/updating-selections/model.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MODEL_H
+#define MODEL_H
+
+#include <QAbstractTableModel>
+#include <QStringList>
+#include <QVariant>
+
+class TableModel : public QAbstractTableModel
+{
+    Q_OBJECT
+
+public:
+    TableModel(int rows = 1, int columns = 1, QObject *parent = 0);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    QVariant data(const QModelIndex &index, int role) const;
+    QVariant headerData(int section, Qt::Orientation orientation,
+                        int role = Qt::DisplayRole) const;
+
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+    bool setData(const QModelIndex &index, const QVariant &value,
+                 int role = Qt::EditRole);
+
+    bool insertRows(int position, int rows, const QModelIndex &parent = QModelIndex());
+    bool insertColumns(int position, int columns, const QModelIndex &parent = QModelIndex());
+    bool removeRows(int position, int rows, const QModelIndex &parent = QModelIndex());
+    bool removeColumns(int position, int columns, const QModelIndex &parent = QModelIndex());
+
+private:
+    QList<QStringList> rowList;
+};
+
+#endif
diff --git a/doc/src/snippets/updating-selections/updating-selections.pro b/doc/src/snippets/updating-selections/updating-selections.pro
new file mode 100644
index 0000000000..91ebd3e84f
--- /dev/null
+++ b/doc/src/snippets/updating-selections/updating-selections.pro
@@ -0,0 +1,2 @@
+HEADERS += model.h window.h
+SOURCES += main.cpp model.cpp window.cpp
diff --git a/doc/src/snippets/updating-selections/window.cpp b/doc/src/snippets/updating-selections/window.cpp
new file mode 100644
index 0000000000..3ca4911f41
--- /dev/null
+++ b/doc/src/snippets/updating-selections/window.cpp
@@ -0,0 +1,110 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+  window.cpp
+
+  A minimal subclass of QTableView with slots to allow the selection model
+  to be monitored.
+*/
+
+#include <QAbstractItemModel>
+#include <QItemSelection>
+#include <QItemSelectionModel>
+#include <QStatusBar>
+
+#include "model.h"
+#include "window.h"
+
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent)
+{
+    setWindowTitle("Selected items in a table model");
+
+    model = new TableModel(8, 4, this);
+
+    table = new QTableView(this);
+    table->setModel(model);
+
+    selectionModel = table->selectionModel();
+    connect(selectionModel,
+        SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)),
+        this, SLOT(updateSelection(const QItemSelection &, const QItemSelection &)));
+    connect(selectionModel,
+        SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
+        this, SLOT(changeCurrent(const QModelIndex &, const QModelIndex &)));
+
+    statusBar();
+    setCentralWidget(table);
+}
+
+//! [0]
+void MainWindow::updateSelection(const QItemSelection &selected,
+    const QItemSelection &deselected)
+{
+    QModelIndex index;
+    QModelIndexList items = selected.indexes();
+
+    foreach (index, items) {
+        QString text = QString("(%1,%2)").arg(index.row()).arg(index.column());
+        model->setData(index, text);
+//! [0] //! [1]
+    }
+//! [1]
+
+//! [2]
+    items = deselected.indexes();
+
+    foreach (index, items)
+        model->setData(index, "");
+}
+//! [2]
+
+//! [3]
+void MainWindow::changeCurrent(const QModelIndex &current,
+    const QModelIndex &previous)
+{
+    statusBar()->showMessage(
+        tr("Moved from (%1,%2) to (%3,%4)")
+            .arg(previous.row()).arg(previous.column())
+            .arg(current.row()).arg(current.column()));
+}
+//! [3]
diff --git a/doc/src/snippets/updating-selections/window.h b/doc/src/snippets/updating-selections/window.h
new file mode 100644
index 0000000000..f3556f7b6e
--- /dev/null
+++ b/doc/src/snippets/updating-selections/window.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QItemSelection>
+#include <QMainWindow>
+#include <QModelIndex>
+#include <QWidget>
+#include <QTableView>
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+public:
+    MainWindow(QWidget *parent = 0);
+
+public slots:
+    void updateSelection(const QItemSelection &selected,
+                         const QItemSelection &deselected);
+    void changeCurrent(const QModelIndex &current, const QModelIndex &previous);
+
+private:
+    QAbstractItemModel *model;
+    QItemSelectionModel *selectionModel;
+    QTableView *table;
+};
+
+#endif
diff --git a/doc/src/snippets/videomedia.cpp b/doc/src/snippets/videomedia.cpp
new file mode 100644
index 0000000000..323aca9f47
--- /dev/null
+++ b/doc/src/snippets/videomedia.cpp
@@ -0,0 +1,19 @@
+
+
+#include <QtGui>
+#include <phonon>
+
+
+int main(int argv, char **args)
+{
+    QApplication app(argv, args);
+
+    Phonon::VideoPlayer *player = new Phonon::VideoPlayer(Phonon::VideoCategory, 0);
+
+//![0]
+    player->mediaObject()->isSeekable();
+//![0]
+
+    return app.exec();
+}
+
diff --git a/doc/src/snippets/volumeslider.cpp b/doc/src/snippets/volumeslider.cpp
new file mode 100644
index 0000000000..960ca59c67
--- /dev/null
+++ b/doc/src/snippets/volumeslider.cpp
@@ -0,0 +1,29 @@
+#include <QtGui>
+
+#include <phonon/audiooutput.h>
+#include <phonon/mediaobject.h>
+#include <phonon/volumeslider.h>
+
+int main(int argv, char **args)
+{
+    QApplication app(argv, args);
+    app.setApplicationName("Volume slider tester");
+
+    Phonon::MediaObject *mediaObject = new Phonon::MediaObject;
+    mediaObject->setCurrentSource(QString("/home/gvatteka/Music/Lumme-Badloop.ogg"));
+
+//! [0]
+    Phonon::AudioOutput *audioOutput = new Phonon::AudioOutput(Phonon::MusicCategory);
+    Phonon::createPath(mediaObject, audioOutput);
+
+    Phonon::VolumeSlider *volumeSlider = new Phonon::VolumeSlider;
+    volumeSlider->setAudioOutput(audioOutput);
+//! [0]
+
+    mediaObject->play();
+    
+    volumeSlider->show();
+
+    return app.exec();
+}
+
diff --git a/doc/src/snippets/webkit/simple/main.cpp b/doc/src/snippets/webkit/simple/main.cpp
new file mode 100644
index 0000000000..a6a4fc2e66
--- /dev/null
+++ b/doc/src/snippets/webkit/simple/main.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QUrl>
+#include <QWebView>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QWidget *parent = 0;
+//! [Using QWebView]
+    QWebView *view = new QWebView(parent);
+    view->load(QUrl("http://qtsoftware.com/"));
+    view->show();
+//! [Using QWebView]
+    return app.exec();
+}
diff --git a/doc/src/snippets/webkit/simple/simple.pro b/doc/src/snippets/webkit/simple/simple.pro
new file mode 100644
index 0000000000..61cd3bfcdb
--- /dev/null
+++ b/doc/src/snippets/webkit/simple/simple.pro
@@ -0,0 +1,2 @@
+QT       += webkit
+SOURCES   = main.cpp
diff --git a/doc/src/snippets/webkit/webpage/main.cpp b/doc/src/snippets/webkit/webpage/main.cpp
new file mode 100644
index 0000000000..b433ac22ea
--- /dev/null
+++ b/doc/src/snippets/webkit/webpage/main.cpp
@@ -0,0 +1,62 @@
+#include <QtGui>
+#include <QWebPage>
+#include <QWebFrame>
+
+//! [0]
+class Thumbnailer : public QObject
+{
+    Q_OBJECT
+
+public:
+    Thumbnailer(const QUrl &url);
+
+signals:
+    void finished();
+
+private slots:
+    void render();
+
+private:
+    QWebPage page;
+
+};
+//! [0]
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    Thumbnailer thumbnail(QUrl("http://qtsoftware.com"));
+
+    QObject::connect(&thumbnail, SIGNAL(finished()),
+        &app, SLOT(quit()));
+
+    return app.exec();
+}
+
+//! [1]
+Thumbnailer::Thumbnailer(const QUrl &url)
+{
+    page.mainFrame()->load(url);
+    connect(&page, SIGNAL(loadFinished(bool)),
+        this, SLOT(render()));
+}
+//! [1]
+
+//! [2]
+void Thumbnailer::render()
+{
+    page.setViewportSize(page.mainFrame()->contentsSize());
+    QImage image(page.viewportSize(), QImage::Format_ARGB32);
+    QPainter painter(&image);
+
+    page.mainFrame()->render(&painter);
+    painter.end();
+
+    QImage thumbnail = image.scaled(400, 400);
+    thumbnail.save("thumbnail.png");
+
+    emit finished();
+}
+//! [2]
+#include "main.moc"
diff --git a/doc/src/snippets/webkit/webpage/webpage.pro b/doc/src/snippets/webkit/webpage/webpage.pro
new file mode 100644
index 0000000000..fcad03b15c
--- /dev/null
+++ b/doc/src/snippets/webkit/webpage/webpage.pro
@@ -0,0 +1,3 @@
+CONFIG += console
+QT += webkit
+SOURCES = main.cpp
\ No newline at end of file
diff --git a/doc/src/snippets/whatsthis/whatsthis.cpp b/doc/src/snippets/whatsthis/whatsthis.cpp
new file mode 100644
index 0000000000..ce7edc4d5b
--- /dev/null
+++ b/doc/src/snippets/whatsthis/whatsthis.cpp
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+class MainWindow : public QMainWindow
+{
+public:
+    MainWindow();
+
+    QAction *newAct;
+};
+
+MainWindow()
+{
+//! [0]
+    newAct = new QAction(tr("&New"), this);
+    newAct->setShortcut(tr("Ctrl+N"));
+    newAct->setStatusTip(tr("Create a new file"));
+    newAct->setWhatsThis(tr("Click this option to create a new file."));
+//! [0]
+}
+
+int main()
+{
+    return 0;
+}
diff --git a/doc/src/snippets/whatsthis/whatsthis.pro b/doc/src/snippets/whatsthis/whatsthis.pro
new file mode 100644
index 0000000000..1310a4f92c
--- /dev/null
+++ b/doc/src/snippets/whatsthis/whatsthis.pro
@@ -0,0 +1 @@
+SOURCES += whatsthis.cpp
diff --git a/doc/src/snippets/widget-mask/main.cpp b/doc/src/snippets/widget-mask/main.cpp
new file mode 100644
index 0000000000..accbb71ced
--- /dev/null
+++ b/doc/src/snippets/widget-mask/main.cpp
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+//! [0]
+    QLabel topLevelLabel;
+    QPixmap pixmap(":/images/tux.png");
+    topLevelLabel.setPixmap(pixmap);
+    topLevelLabel.setMask(pixmap.mask());
+//! [0]
+    topLevelLabel.show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/widget-mask/mask.qrc b/doc/src/snippets/widget-mask/mask.qrc
new file mode 100644
index 0000000000..92f2272532
--- /dev/null
+++ b/doc/src/snippets/widget-mask/mask.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/images" >
+   <file>tux.png</file>
+</qresource>
+</RCC>
diff --git a/doc/src/snippets/widget-mask/tux.png b/doc/src/snippets/widget-mask/tux.png
new file mode 100644
index 0000000000..a95527f3f2
--- /dev/null
+++ b/doc/src/snippets/widget-mask/tux.png
diff --git a/doc/src/snippets/widget-mask/widget-mask.pro b/doc/src/snippets/widget-mask/widget-mask.pro
new file mode 100644
index 0000000000..f0807a5e1b
--- /dev/null
+++ b/doc/src/snippets/widget-mask/widget-mask.pro
@@ -0,0 +1,3 @@
+SOURCES     = main.cpp
+RESOURCES   = mask.qrc
+CONFIG      += qt
diff --git a/doc/src/snippets/widgetdelegate.cpp b/doc/src/snippets/widgetdelegate.cpp
new file mode 100644
index 0000000000..83237fe69b
--- /dev/null
+++ b/doc/src/snippets/widgetdelegate.cpp
@@ -0,0 +1,27 @@
+
+#include <QtGui>
+
+#include "widgetdelegate.h"
+
+//![0]
+void WidgetDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
+                           const QModelIndex &index) const
+{
+    if (index.column() == 1) {
+        int progress = index.data().toInt();
+
+        QStyleOptionProgressBar progressBarOption;
+        progressBarOption.rect = option.rect;
+        progressBarOption.minimum = 0;
+        progressBarOption.maximum = 100;
+        progressBarOption.progress = progress;
+        progressBarOption.text = QString::number(progress) + "%";
+        progressBarOption.textVisible = true;
+
+        QApplication::style()->drawControl(QStyle::CE_ProgressBar,
+                                           &progressBarOption, painter);
+    } else
+        QStyledItemDelegate::paint(painter, option, index);
+
+//![0]
+}
diff --git a/doc/src/snippets/widgets-tutorial/childwidget/childwidget.pro b/doc/src/snippets/widgets-tutorial/childwidget/childwidget.pro
new file mode 100644
index 0000000000..bba41b9c12
--- /dev/null
+++ b/doc/src/snippets/widgets-tutorial/childwidget/childwidget.pro
@@ -0,0 +1 @@
+SOURCES = main.cpp
diff --git a/doc/src/snippets/widgets-tutorial/childwidget/main.cpp b/doc/src/snippets/widgets-tutorial/childwidget/main.cpp
new file mode 100644
index 0000000000..8a97810f02
--- /dev/null
+++ b/doc/src/snippets/widgets-tutorial/childwidget/main.cpp
@@ -0,0 +1,17 @@
+#include <QtGui>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QWidget *window = new QWidget();
+    window->resize(320, 240);
+    window->setWindowTitle(tr("Child widget"));
+    window->show();
+
+//! [create, position and show]
+    QPushButton *button = new QPushButton(tr("Press me"), window);
+    button->move(100, 100);
+    button->show();
+//! [create, position and show]
+    return app.exec();
+}
diff --git a/doc/src/snippets/widgets-tutorial/nestedlayouts/main.cpp b/doc/src/snippets/widgets-tutorial/nestedlayouts/main.cpp
new file mode 100644
index 0000000000..f541464901
--- /dev/null
+++ b/doc/src/snippets/widgets-tutorial/nestedlayouts/main.cpp
@@ -0,0 +1,48 @@
+#include <QtGui>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QWidget *window = new QWidget();
+//! [create, lay out widgets and show]
+    QLabel *queryLabel = new QLabel(tr("Query:"));
+    QLineEdit *queryEdit = new QLineEdit();
+    QTableView *resultView = new QTableView();
+
+    QHBoxLayout *queryLayout = new QHBoxLayout();
+    queryLayout->addWidget(queryLabel);
+    queryLayout->addWidget(queryEdit);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout();
+    mainLayout->addLayout(queryLayout);
+    mainLayout->addWidget(resultView);
+    window->setLayout(mainLayout);
+//! [create, lay out widgets and show]
+
+    QStandardItemModel model;
+    model.setHorizontalHeaderLabels(QStringList() << tr("Name") << tr("Office"));
+    QList<QStringList> rows = QList<QStringList>()
+        << (QStringList() << "Verne Nilsen" << "123")
+        << (QStringList() << "Carlos Tang" << "77")
+        << (QStringList() << "Bronwyn Hawcroft" << "119")
+        << (QStringList() << "Alessandro Hanssen" << "32")
+        << (QStringList() << "Andrew John Bakken" << "54")
+        << (QStringList() << "Vanessa Weatherley" << "85")
+        << (QStringList() << "Rebecca Dickens" << "17")
+        << (QStringList() << "David Bradley" << "42")
+        << (QStringList() << "Knut Walters" << "25")
+        << (QStringList() << "Andrea Jones" << "34");
+    foreach (QStringList row, rows) {
+        QList<QStandardItem *> items;
+        foreach (QString text, row)
+            items.append(new QStandardItem(text));
+        model.appendRow(items);
+    }
+
+    resultView->setModel(&model);
+    resultView->verticalHeader()->hide();
+    resultView->horizontalHeader()->setStretchLastSection(true);
+    window->setWindowTitle(tr("Nested layouts"));
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/widgets-tutorial/nestedlayouts/nestedlayouts.pro b/doc/src/snippets/widgets-tutorial/nestedlayouts/nestedlayouts.pro
new file mode 100644
index 0000000000..bba41b9c12
--- /dev/null
+++ b/doc/src/snippets/widgets-tutorial/nestedlayouts/nestedlayouts.pro
@@ -0,0 +1 @@
+SOURCES = main.cpp
diff --git a/doc/src/snippets/widgets-tutorial/toplevel/main.cpp b/doc/src/snippets/widgets-tutorial/toplevel/main.cpp
new file mode 100644
index 0000000000..cffdff8851
--- /dev/null
+++ b/doc/src/snippets/widgets-tutorial/toplevel/main.cpp
@@ -0,0 +1,13 @@
+#include <QtGui>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+//! [create, resize and show]
+    QWidget *window = new QWidget();
+    window->resize(320, 240);
+    window->show();
+//! [create, resize and show]
+    window->setWindowTitle(tr("Top-level widget"));
+    return app.exec();
+}
diff --git a/doc/src/snippets/widgets-tutorial/toplevel/toplevel.pro b/doc/src/snippets/widgets-tutorial/toplevel/toplevel.pro
new file mode 100644
index 0000000000..bba41b9c12
--- /dev/null
+++ b/doc/src/snippets/widgets-tutorial/toplevel/toplevel.pro
@@ -0,0 +1 @@
+SOURCES = main.cpp
diff --git a/doc/src/snippets/widgets-tutorial/windowlayout/main.cpp b/doc/src/snippets/widgets-tutorial/windowlayout/main.cpp
new file mode 100644
index 0000000000..0c6e814754
--- /dev/null
+++ b/doc/src/snippets/widgets-tutorial/windowlayout/main.cpp
@@ -0,0 +1,19 @@
+#include <QtGui>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QWidget *window = new QWidget();
+//! [create, lay out widgets and show]
+    QLabel *label = new QLabel(tr("Name:"));
+    QLineEdit *lineEdit = new QLineEdit();
+
+    QHBoxLayout *layout = new QHBoxLayout();
+    layout->addWidget(label);
+    layout->addWidget(lineEdit);
+    window->setLayout(layout);
+//! [create, lay out widgets and show]
+    window->setWindowTitle(tr("Window layout"));
+    window->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/widgets-tutorial/windowlayout/windowlayout.pro b/doc/src/snippets/widgets-tutorial/windowlayout/windowlayout.pro
new file mode 100644
index 0000000000..bba41b9c12
--- /dev/null
+++ b/doc/src/snippets/widgets-tutorial/windowlayout/windowlayout.pro
@@ -0,0 +1 @@
+SOURCES = main.cpp
diff --git a/doc/src/snippets/xml/prettyprint/main.cpp b/doc/src/snippets/xml/prettyprint/main.cpp
new file mode 100644
index 0000000000..fa13ff6f97
--- /dev/null
+++ b/doc/src/snippets/xml/prettyprint/main.cpp
@@ -0,0 +1,144 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QCoreApplication>
+#include <QFile>
+#include <QHash>
+#include <QPair>
+#include <QStringList>
+#include <QTextStream>
+#include <QXmlStreamReader>
+
+/*
+    This class exists for the sole purpose of creating a translation context.
+ */
+class PrettyPrint
+{
+    Q_DECLARE_TR_FUNCTIONS(PrettyPrint)
+};
+
+int main(int argc, char *argv[])
+{
+    enum ExitCode
+    {
+        Success,
+        ParseFailure,
+        ArgumentError,
+        WriteError,
+        FileFailure
+    };
+
+    QCoreApplication app(argc, argv);
+
+    QTextStream errorStream(stderr);
+
+    if (argc != 2)
+    {
+        errorStream << PrettyPrint::tr(
+                       "Usage: prettyprint <path to XML file>\n");
+        return ArgumentError;
+    }
+
+    QString inputFilePath(QCoreApplication::arguments().at(1));
+    QFile inputFile(inputFilePath);
+
+    if (!QFile::exists(inputFilePath))
+    {
+        errorStream << PrettyPrint::tr(
+                       "File %1 does not exist.\n").arg(inputFilePath);
+        return FileFailure;
+
+    } else if (!inputFile.open(QIODevice::ReadOnly)) {
+        errorStream << PrettyPrint::tr(
+                       "Failed to open file %1.\n").arg(inputFilePath);
+        return FileFailure;
+    }
+
+    QFile outputFile;
+    if (!outputFile.open(stdout, QIODevice::WriteOnly))
+    {
+        QTextStream(stderr) << PrettyPrint::tr("Failed to open stdout.");
+        return WriteError;
+    }
+
+    QXmlStreamReader reader(&inputFile);
+    int indentation = 0;
+    QHash<int,QPair<int, int> > indentationStack;
+
+    while (!reader.atEnd())
+    {
+        reader.readNext();
+        if (reader.isStartElement()) {
+            indentationStack[indentation] = QPair<int,int>(
+                reader.lineNumber(), reader.columnNumber());
+            indentation += 1;
+        } else if (reader.isEndElement()) {
+            indentationStack.remove(indentation);
+            indentation -= 1;
+        }
+
+        if (reader.error())
+        {
+            errorStream << PrettyPrint::tr(
+                           "Error: %1 in file %2 at line %3, column %4.\n").arg(
+                               reader.errorString(), inputFilePath,
+                               QString::number(reader.lineNumber()),
+                               QString::number(reader.columnNumber()));
+            if (indentationStack.contains(indentation-1)) {
+                int line = indentationStack[indentation-1].first;
+                int column = indentationStack[indentation-1].second;
+                errorStream << PrettyPrint::tr(
+                               "Opened at line %1, column %2.\n").arg(
+                                   QString::number(line),
+                                   QString::number(column));
+            }
+            return ParseFailure;
+
+        } else if (reader.isStartElement() && !reader.name().isEmpty()) {
+            outputFile.write(QByteArray().fill(' ', indentation));
+            outputFile.write(reader.name().toString().toLocal8Bit());
+            outputFile.write(QString(" line %1, column %2\n").arg(
+                reader.lineNumber()).arg(reader.columnNumber()).toLocal8Bit());
+        }
+    }
+
+    return Success;
+}
diff --git a/doc/src/snippets/xml/prettyprint/prettyprint.pro b/doc/src/snippets/xml/prettyprint/prettyprint.pro
new file mode 100644
index 0000000000..61945e0651
--- /dev/null
+++ b/doc/src/snippets/xml/prettyprint/prettyprint.pro
@@ -0,0 +1,4 @@
+CONFIG   += console
+QT       -= gui
+QT       += xml
+SOURCES  += main.cpp
diff --git a/doc/src/snippets/xml/rsslisting/handler.cpp b/doc/src/snippets/xml/rsslisting/handler.cpp
new file mode 100644
index 0000000000..1088871d4e
--- /dev/null
+++ b/doc/src/snippets/xml/rsslisting/handler.cpp
@@ -0,0 +1,183 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+handler.cpp
+
+Provides a handler for processing XML elements found by the reader.
+
+The handler looks for <title> and <link> elements within <item> elements,
+and records the text found within them. Link information stored within
+rdf:about attributes of <item> elements is also recorded when it is
+available.
+
+For each item found, a signal is emitted which specifies its title and
+link information. This may be used by user interfaces for the purpose of
+displaying items as they are read.
+*/
+
+#include <QtGui>
+
+#include "handler.h"
+
+/*
+    Reset the state of the handler to ensure that new documents are
+    read correctly.
+
+    We return true to indicate that parsing should continue.
+*/
+
+bool Handler::startDocument()
+{
+    inItem = false;
+    inTitle = false;
+    inLink = false;
+
+    return true;
+}
+
+/*
+    Process each starting element in the XML document.
+
+    Nested item, title, or link elements are not allowed, so we return false
+    if we encounter any of these. We also prohibit multiple definitions of
+    title strings.
+
+    Link destinations are read by this function if they are specified as
+    attributes in item elements.
+
+    For all cases not explicitly checked for, we return true to indicate that
+    the element is acceptable, and that parsing should continue. By doing
+    this, we can ignore elements in which we are not interested.
+*/
+
+bool Handler::startElement(const QString &, const QString &,
+    const QString & qName, const QXmlAttributes &attr)
+{
+    if (qName == "item") {
+
+        if (inItem)
+            return false;
+        else {
+            inItem = true;
+            linkString = attr.value("rdf:about");
+        }
+    }
+    else if (qName == "title") {
+
+        if (inTitle)
+            return false;
+        else if (!titleString.isEmpty())
+            return false;
+        else if (inItem)
+            inTitle = true;
+    }
+    else if (qName == "link") {
+
+        if (inLink)
+            return false;
+        else if (inItem)
+            inLink = true;
+    }
+
+    return true;
+}
+
+/*
+    Process each ending element in the XML document.
+
+    For recognized elements, we reset flags to ensure that we can read new
+    instances of these elements. If we have read an item element, emit a
+    signal to indicate that a new item is available for display.
+
+    We return true to indicate that parsing should continue.
+*/
+
+bool Handler::endElement(const QString &, const QString &,
+    const QString & qName)
+{
+    if (qName == "title" && inTitle)
+        inTitle = false;
+    else if (qName == "link" && inLink)
+        inLink = false;
+    else if (qName == "item") {
+        if (!titleString.isEmpty() && !linkString.isEmpty())
+            emit newItem(titleString, linkString);
+        inItem = false;
+        titleString = "";
+        linkString = "";
+    }
+
+    return true;
+}
+
+/*
+    Collect characters when reading the contents of title or link elements
+    when they occur within an item element.
+
+    We return true to indicate that parsing should continue.
+*/
+
+bool Handler::characters (const QString &chars)
+{
+    if (inTitle)
+        titleString += chars;
+    else if (inLink)
+        linkString += chars;
+
+    return true;
+}
+
+/*
+    Report a fatal parsing error, and return false to indicate to the reader
+    that parsing should stop.
+*/
+
+//! [0]
+bool Handler::fatalError (const QXmlParseException & exception)
+{
+    qWarning() << "Fatal error on line" << exception.lineNumber()
+               << ", column" << exception.columnNumber() << ":"
+               << exception.message();
+
+    return false;
+}
+//! [0]
diff --git a/doc/src/snippets/xml/rsslisting/handler.h b/doc/src/snippets/xml/rsslisting/handler.h
new file mode 100644
index 0000000000..dfe8e62dda
--- /dev/null
+++ b/doc/src/snippets/xml/rsslisting/handler.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef HANDLER_H
+#define HANDLER_H
+
+#include <QObject>
+#include <QString>
+#include <QXmlDefaultHandler>
+
+/* Note that QObject must precede QXmlDefaultHandler in the following list. */
+
+class Handler : public QObject, public QXmlDefaultHandler
+{
+    Q_OBJECT
+public:
+    bool startDocument();
+    bool startElement(const QString &, const QString &, const QString &qName,
+                       const QXmlAttributes &attr);
+    bool endElement(const QString &, const QString &, const QString &qName);
+    bool characters(const QString &chars);
+
+    bool fatalError(const QXmlParseException &exception);
+
+signals:
+    void newItem(QString &title, QString &link);
+
+private:
+    QString titleString;
+    QString linkString;
+    bool inItem;
+    bool inTitle;
+    bool inLink;
+};
+
+#endif
+
diff --git a/doc/src/snippets/xml/rsslisting/main.cpp b/doc/src/snippets/xml/rsslisting/main.cpp
new file mode 100644
index 0000000000..aec9d4dbed
--- /dev/null
+++ b/doc/src/snippets/xml/rsslisting/main.cpp
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+main.cpp
+
+Provides the main function for the RSS news reader example.
+*/
+
+#include <QtGui>
+
+#include "rsslisting.h"
+
+/*!
+    Create an application and a main widget. Open the main widget for
+    user input, and exit with an appropriate return value when it is
+    closed.
+*/
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    RSSListing *rsslisting = new RSSListing;
+    rsslisting->show();
+    return app.exec();
+}
diff --git a/doc/src/snippets/xml/rsslisting/rsslisting.cpp b/doc/src/snippets/xml/rsslisting/rsslisting.cpp
new file mode 100644
index 0000000000..f5c65e5f69
--- /dev/null
+++ b/doc/src/snippets/xml/rsslisting/rsslisting.cpp
@@ -0,0 +1,252 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+rsslisting.cpp
+
+Provides a widget for displaying news items from RDF news sources.
+RDF is an XML-based format for storing items of information (see
+http://www.w3.org/RDF/ for details).
+
+The widget itself provides a simple user interface for specifying
+the URL of a news source, and controlling the downloading of news.
+
+The widget downloads and parses the XML asynchronously, feeding the
+data to an XML reader in pieces. This allows the user to interrupt
+its operation, and also allows very large data sources to be read.
+*/
+
+
+#include <QtCore>
+#include <QtGui>
+#include <QtNetwork>
+#include <QtXml>
+
+#include "rsslisting.h"
+
+
+/*
+    Constructs an RSSListing widget with a simple user interface, and sets
+    up the XML reader to use a custom handler class.
+
+    The user interface consists of a line edit, two push buttons, and a
+    list view widget. The line edit is used for entering the URLs of news
+    sources; the push buttons start and abort the process of reading the
+    news.
+*/
+
+RSSListing::RSSListing(QWidget *parent)
+    : QWidget(parent)
+{
+    lineEdit = new QLineEdit(this);
+
+    fetchButton = new QPushButton(tr("Fetch"), this);
+    abortButton = new QPushButton(tr("Abort"), this);
+    abortButton->setEnabled(false);
+
+    treeWidget = new QTreeWidget(this);
+    QStringList headerLabels;
+    headerLabels << tr("Title") << tr("Link");
+    treeWidget->setHeaderLabels(headerLabels);
+
+    handler = 0;
+
+    connect(&http, SIGNAL(readyRead(const QHttpResponseHeader &)),
+             this, SLOT(readData(const QHttpResponseHeader &)));
+
+    connect(&http, SIGNAL(requestFinished(int, bool)),
+             this, SLOT(finished(int, bool)));
+
+    connect(lineEdit, SIGNAL(returnPressed()), this, SLOT(fetch()));
+    connect(fetchButton, SIGNAL(clicked()), this, SLOT(fetch()));
+    connect(abortButton, SIGNAL(clicked()), &http, SLOT(abort()));
+
+    QVBoxLayout *layout = new QVBoxLayout(this);
+
+    QHBoxLayout *hboxLayout = new QHBoxLayout;
+
+    hboxLayout->addWidget(lineEdit);
+    hboxLayout->addWidget(fetchButton);
+    hboxLayout->addWidget(abortButton);
+
+    layout->addLayout(hboxLayout);
+    layout->addWidget(treeWidget);
+
+    setWindowTitle(tr("RSS listing example"));
+}
+
+/*
+    Starts fetching data from a news source specified in the line
+    edit widget.
+
+    The line edit is made read only to prevent the user from modifying its
+    contents during the fetch; this is only for cosmetic purposes.
+    The fetch button is disabled, and the abort button is enabled to allow
+    the user to interrupt processing. The list view is cleared, and we
+    define the last list view item to be 0, meaning that there are no
+    existing items in the list.
+
+    We reset the flag used to determine whether parsing should begin again
+    or continue. A new handler is created, if required, and made available
+    to the reader.
+
+    The HTTP handler is supplied with the raw contents of the line edit and
+    a fetch is initiated. We keep the ID value returned by the HTTP handler
+    for future reference.
+*/
+
+void RSSListing::fetch()
+{
+    lineEdit->setReadOnly(true);
+    fetchButton->setEnabled(false);
+    abortButton->setEnabled(true);
+    treeWidget->clear();
+
+    lastItemCreated = 0;
+
+    newInformation = true;
+
+    if (handler != 0)
+        delete handler;
+    handler = new Handler;
+
+//! [0]
+    xmlReader.setContentHandler(handler);
+    xmlReader.setErrorHandler(handler);
+//! [0]
+
+    connect(handler, SIGNAL(newItem(QString &, QString &)),
+             this, SLOT(addItem(QString &, QString &)));
+
+    QUrl url(lineEdit->text());
+
+    http.setHost(url.host());
+    connectionId = http.get(url.path());
+}
+
+/*
+    Reads data received from the RDF source.
+
+    We read all the available data, and pass it to the XML
+    input source. The first time we receive new information,
+    the reader is set up for a new incremental parse;
+    we continue parsing using a different function on
+    subsequent calls involving the same data source.
+
+    If parsing fails for any reason, we abort the fetch.
+*/
+
+//! [1]
+void RSSListing::readData(const QHttpResponseHeader &resp)
+{
+    bool ok;
+
+    if (resp.statusCode() != 200)
+        http.abort();
+    else {
+        xmlInput.setData(http.readAll());
+
+        if (newInformation) {
+            ok = xmlReader.parse(&xmlInput, true);
+            newInformation = false;
+        }
+        else
+            ok = xmlReader.parseContinue();
+
+        if (!ok)
+            http.abort();
+    }
+}
+//! [1]
+
+/*
+    Finishes processing an HTTP request.
+
+    The default behavior is to keep the text edit read only.
+
+    If an error has occurred, the user interface is made available
+    to the user for further input, allowing a new fetch to be
+    started.
+
+    If the HTTP get request has finished, we perform a final
+    parsing operation on the data returned to ensure that it was
+    well-formed. Whether this is successful or not, we make the
+    user interface available to the user for further input.
+*/
+
+void RSSListing::finished(int id, bool error)
+{
+    if (error) {
+        qWarning("Received error during HTTP fetch.");
+        lineEdit->setReadOnly(false);
+        abortButton->setEnabled(false);
+        fetchButton->setEnabled(true);
+    }
+    else if (id == connectionId) {
+
+        bool ok = xmlReader.parseContinue();
+        if (!ok)
+            qWarning("Parse error at the end of input.");
+
+        lineEdit->setReadOnly(false);
+        abortButton->setEnabled(false);
+        fetchButton->setEnabled(true);
+    }
+}
+
+/*
+    Adds an item to the list view as it is reported by the handler.
+
+    We keep a record of the last item created to ensure that the
+    items are created in sequence.
+*/
+
+void RSSListing::addItem(QString &title, QString &link)
+{
+    QTreeWidgetItem *item;
+
+    item = new QTreeWidgetItem(treeWidget, lastItemCreated);
+    item->setText(0, title);
+    item->setText(1, link);
+
+    lastItemCreated = item;
+}
+
diff --git a/doc/src/snippets/xml/rsslisting/rsslisting.h b/doc/src/snippets/xml/rsslisting/rsslisting.h
new file mode 100644
index 0000000000..203d5f31e0
--- /dev/null
+++ b/doc/src/snippets/xml/rsslisting/rsslisting.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef RSSLISTING_H
+#define RSSLISTING_H
+
+#include <QHttp>
+#include <QWidget>
+#include <QXmlInputSource>
+#include <QXmlSimpleReader>
+
+#include "handler.h"
+
+class QLineEdit;
+class QTreeWidget;
+class QTreeWidgetItem;
+class QPushButton;
+
+class RSSListing : public QWidget
+{
+    Q_OBJECT
+public:
+    RSSListing(QWidget *widget = 0);
+
+public slots:
+    void addItem(QString &title, QString &link);
+    void fetch();
+    void finished(int id, bool error);
+    void readData(const QHttpResponseHeader &);
+
+private:
+    Handler *handler;
+    QXmlInputSource xmlInput;
+    QXmlSimpleReader xmlReader;
+
+    bool newInformation;
+
+    QHttp http;
+    int connectionId;
+
+    QLineEdit *lineEdit;
+    QTreeWidget *treeWidget;
+    QTreeWidgetItem *lastItemCreated;
+    QPushButton *abortButton;
+    QPushButton *fetchButton;
+};
+
+#endif
+
diff --git a/doc/src/snippets/xml/simpleparse/handler.cpp b/doc/src/snippets/xml/simpleparse/handler.cpp
new file mode 100644
index 0000000000..440f6bea9c
--- /dev/null
+++ b/doc/src/snippets/xml/simpleparse/handler.cpp
@@ -0,0 +1,139 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+handler.cpp
+
+Provides a handler for processing XML elements found by the reader.
+
+The handler stores the names of elements it finds and their indentation
+levels. The indentation level is initially set to zero.
+When a starting element is found, the indentation level is increased;
+when an ending element is found, the indentation level is decreased.
+*/
+
+#include <QDebug>
+#include "handler.h"
+
+/*!
+    Reset the state of the handler to ensure that new documents are
+    read correctly.
+
+    We return true to indicate that parsing should continue.
+*/
+
+bool Handler::startDocument()
+{
+    elementName.clear();
+    elementIndentation.clear();
+    indentationLevel = 0;
+
+    return true;
+}
+
+/*!
+    Process each starting element in the XML document.
+
+    Append the element name to the list of elements found; add its
+    corresponding indentation level to the list of indentation levels.
+
+    Increase the level of indentation by one column.
+
+    We return true to indicate that parsing should continue.
+*/
+
+bool Handler::startElement(const QString &, const QString &,
+    const QString & qName, const QXmlAttributes &)
+{
+    elementName.append(qName);
+    elementIndentation.append(indentationLevel);
+    indentationLevel += 1;
+
+    return true;
+}
+
+/*!
+    Process each ending element in the XML document.
+
+    Decrease the level of indentation by one column.
+
+    We return true to indicate that parsing should continue.
+*/
+
+bool Handler::endElement(const QString &, const QString &,
+    const QString &)
+{
+    indentationLevel -= 1;
+
+    return true;
+}
+
+/*!
+    Report a fatal parsing error, and return false to indicate to the reader
+    that parsing should stop.
+*/
+
+bool Handler::fatalError (const QXmlParseException & exception)
+{
+    qWarning() << QString("Fatal error on line %1, column %2: %3").arg(
+        exception.lineNumber()).arg(exception.columnNumber()).arg(
+        exception.message());
+
+    return false;
+}
+
+/*!
+    Return the list of element names found.
+*/
+
+QStringList& Handler::names ()
+{
+    return elementName;
+}
+
+/*!
+    Return the list of indentations used for each element found.
+*/
+
+QList<int>& Handler::indentations ()
+{
+    return elementIndentation;
+}
diff --git a/doc/src/snippets/xml/simpleparse/handler.h b/doc/src/snippets/xml/simpleparse/handler.h
new file mode 100644
index 0000000000..c69c91946c
--- /dev/null
+++ b/doc/src/snippets/xml/simpleparse/handler.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef HANDLER_H
+#define HANDLER_H
+
+#include <qstring.h>
+#include <qxml.h>
+
+class Handler : public QXmlDefaultHandler
+{
+public:
+    bool startDocument();
+    bool startElement(const QString &, const QString &, const QString &qName,
+                       const QXmlAttributes &);
+    bool endElement(const QString &, const QString &, const QString &);
+
+    bool fatalError(const QXmlParseException &exception);
+
+    QStringList& names();
+    QList<int>& indentations();
+
+private:
+    int indentationLevel;
+    QStringList elementName;
+    QList<int> elementIndentation;
+};
+
+#endif
+
diff --git a/doc/src/snippets/xml/simpleparse/main.cpp b/doc/src/snippets/xml/simpleparse/main.cpp
new file mode 100644
index 0000000000..e3a7b326c2
--- /dev/null
+++ b/doc/src/snippets/xml/simpleparse/main.cpp
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qfile.h>
+#include <qxml.h>
+#include "handler.h"
+
+#include <iostream>
+
+int main(int argc, char **argv)
+{
+    if (argc != 2) {
+        std::cout << "Usage: " << argv[0] << " <filename>" << std::endl;
+        return 1;
+    }
+
+    QFile *file = new QFile(argv[1]);
+
+//! [0]
+    QXmlSimpleReader xmlReader;
+    QXmlInputSource *source = new QXmlInputSource(file);
+//! [0]
+
+//! [1]
+    Handler *handler = new Handler;
+    xmlReader.setContentHandler(handler);
+    xmlReader.setErrorHandler(handler);
+//! [1]
+
+//! [2]
+    bool ok = xmlReader.parse(source);
+
+    if (!ok)
+        std::cout << "Parsing failed." << std::endl;
+//! [2]
+    else {
+        QStringList names = handler->names();
+        QList<int> indentations = handler->indentations();
+
+        int items = names.count();
+
+        for (int i = 0; i < items; ++i) {
+            for (int j = 0; j < indentations[i]; ++j)
+                std::cout << " ";
+            std::cout << names[i].toLocal8Bit().constData() << std::endl;
+        }
+    }
+
+    return 0;
+}
diff --git a/doc/src/snippets/xml/simpleparse/simpleparse.pro b/doc/src/snippets/xml/simpleparse/simpleparse.pro
new file mode 100644
index 0000000000..fbea770b9a
--- /dev/null
+++ b/doc/src/snippets/xml/simpleparse/simpleparse.pro
@@ -0,0 +1,4 @@
+HEADERS     = handler.h
+SOURCES     = handler.cpp \
+              main.cpp
+QT         += xml
diff --git a/doc/src/snippets/xml/xml.pro b/doc/src/snippets/xml/xml.pro
new file mode 100644
index 0000000000..a321badb39
--- /dev/null
+++ b/doc/src/snippets/xml/xml.pro
@@ -0,0 +1,8 @@
+### A qmake file for the snippets. *** This is not for distribution. ***
+#
+# The snippets that don't work are commented out.
+
+TEMPLATE        = subdirs
+SUBDIRS         = prettyprint
+#                  rsslisting
+#                  simpleparse
diff --git a/doc/src/sql-driver.qdoc b/doc/src/sql-driver.qdoc
new file mode 100644
index 0000000000..8a33760ded
--- /dev/null
+++ b/doc/src/sql-driver.qdoc
@@ -0,0 +1,762 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page sql-driver.html
+    \title SQL Database Drivers
+    \ingroup architecture
+    \brief How to configure and install QtSql drivers for supported databases.
+
+    The QtSql module uses driver \l{How to Create Qt
+    Plugins}{plugins} to communicate with the different database
+    APIs. Since Qt's SQL Module API is database-independent, all
+    database-specific code is contained within these drivers. Several
+    drivers are supplied with Qt and other drivers can be added. The
+    driver source code is supplied and can be used as a model for
+    \l{#development}{writing your own drivers}.
+
+    \tableofcontents
+
+    \section1 Supported Databases
+
+    The table below lists the drivers included with Qt. Due to
+    license incompatibilities with the GPL, not all of the plugins
+    are provided with Open Source Versions of Qt.
+
+    \table
+    \header \o Driver name \o DBMS
+    \row \o \link #QDB2 QDB2\endlink \o IBM DB2 (version 7.1 and above)
+    \row \o \link #QIBASE QIBASE\endlink \o Borland InterBase
+    \row \o \link #QMYSQL QMYSQL\endlink \o MySQL
+    \row \o \link #QOCI QOCI\endlink \o Oracle Call Interface Driver
+    \row \o \link #QODBC QODBC\endlink
+         \o Open Database Connectivity (ODBC) - Microsoft SQL Server and other
+            ODBC-compliant databases
+    \row \o \link #QPSQL QPSQL\endlink \o PostgreSQL (versions 7.3 and above)
+    \row \o \link #QSQLITE2 QSQLITE2\endlink \o SQLite version 2
+    \row \o \link #QSQLITE QSQLITE\endlink \o SQLite version 3
+    \row \o \link #QTDS QTDS\endlink \o Sybase Adaptive Server
+    \endtable
+
+    \bold{Note:} To build a driver plugin you need to have the appropriate
+    client library for your Database Management System (DBMS). This provides
+    access to the API exposed by the DBMS, and is typically shipped with it.
+    Most installation programs also allow you to install "development
+    libraries", and these are what you need. These libraries are responsible
+    for the low-level communication with the DBMS.
+
+    \target building
+    \section1 Building the Drivers Using Configure
+
+    On Unix and Mac OS X, the Qt \c configure script tries to
+    automatically detect the available client libraries on your
+    machine. Run \c{configure -help} to see what drivers can be
+    built. You should get an output similar to this:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 0
+
+    The \c configure script cannot detect the neccessary libraries
+    and include files if they are not in the standard paths, so it
+    may be necessary to specify these paths using the \c -I and \c -L
+    command-line options. For example, if your MySQL include files
+    are installed in \c /usr/local/mysql (or in \c{C:\mysql\include}
+    on Windows), then pass the following parameter to configure: \c
+    -I/usr/local/mysql (or \c{-I C:\mysql\include} for Windows).
+
+    On Windows the \c -I parameter doesn't accept spaces in
+    filenames, so use the 8.3 name instead; for example, use
+    \c{C:\progra~1\mysql} instead of \c{C:\Program Files\mysql}.
+
+    Use the \c{-qt-sql-<driver>} parameter to build the database driver
+    statically into your Qt library or \c{-plugin-sql-<driver>} to build
+    the driver as a plugin. Look at the sections that follow for
+    additional information about required libraries.
+
+    \target buildingmanually
+    \section1 Building the Plugins Manually
+
+    \target QMYSQL
+    \section2 QMYSQL for MySQL 4 and higher
+
+    \section3 QMYSQL Stored Procedure Support
+
+    MySQL 5 introduces stored procedure support at the SQL level, but no
+    API to control IN, OUT and INOUT parameters. Therefore, parameters
+    have to be set and read using SQL commands instead of QSqlQuery::bindValue().
+
+    Example stored procedure:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 1
+
+    Source code to access the OUT values:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 2
+
+    \bold{Note:} \c{@outval1} and \c{@outval2} are variables local to the current
+    connection and will not be affected by queries sent from another host
+    or connection.
+
+    \section3 Embedded MySQL Server
+
+    The MySQL embedded server is a drop-in replacement for the normal
+    client library. With the embedded MySQL server, a MySQL server is
+    not required to use MySQL functionality.
+
+    To use the embedded MySQL server, simply link the Qt plugin to \c
+    libmysqld instead of libmysqlclient. This can be done by replacing
+    \c -lmysqlclient_r by \c -lmysqld in the \c qmake command in the
+    section below.
+
+    Please refer to the MySQL documentation, chapter "libmysqld, the Embedded
+    MySQL Server Library" for more information about the MySQL embedded server.
+
+    \section3 How to Build the QMYSQL Plugin on Unix and Mac OS X
+
+    You need the MySQL header files and as well as the shared library
+    \c{libmysqlclient.so}. Depending on your Linux distribution you may
+    need to install a package which is usually called "mysql-devel".
+
+    Tell \l qmake where to find the MySQL header files and shared
+    libraries (here it is assumed that MySQL is installed in
+    \c{/usr/local}) and run \c{make}:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 3
+
+    After installing Qt, as described in the \l{Installing Qt on X11
+    Platforms} document, you also need to install the plugin in the
+    standard location:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 4
+
+    \section3 How to Build the QMYSQL Plugin on Windows
+
+    You need to get the MySQL installation files. Run \c SETUP.EXE and
+    choose "Custom Install". Install the "Libs & Include Files" Module.
+    Build the plugin as follows (here it is assumed that MySQL is
+    installed in \c{C:\MySQL}):
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 5
+
+    If you are not using a Microsoft compiler, replace \c nmake with \c
+    make in the line above.
+
+    \note This database plugin is not supported for Windows CE.
+
+    \note Including \c{"-o Makefile"} as an argument to \l qmake to
+    tell it where to build the makefile can cause the plugin to be
+    built in release mode only. If you are expecting a debug version
+    to be built as well, don't use the \c{"-o Makefile"} option.
+
+    \target QOCI
+    \section2 QOCI for the Oracle Call Interface (OCI)
+
+    \section3 General Information about the OCI plugin
+
+    The Qt OCI plugin supports Oracle 9i, 10g and higher. After
+    connecting to the Oracle server, the plugin will auto-detect the
+    database version and enable features accordingly.
+
+    It's possible to connect to a Oracle database without a tnsnames.ora file.
+    This requires that the database SID is passed to the driver as the database
+    name and that a hostname is given.
+
+    \section3 OCI User Authentication
+
+    The Qt OCI plugin supports authentication using
+    external credentials (OCI_CRED_EXT). Usually, this means that the database
+    server will use the user authentication provided by the operating system
+    instead of its own authentication mechanism.
+
+    Leave the username and password empty when opening a connection with
+    QSqlDatabase to use the external credentials authentication.
+
+    \section3 OCI BLOB/LOB Support
+
+    Binary Large Objects (BLOBs) can be read and written, but be aware
+    that this process may require a lot of memory. You should use a forward
+    only query to select LOB fields (see QSqlQuery::setForwardOnly()).
+
+    Inserting BLOBs should be done using either a prepared query where the
+    BLOBs are bound to placeholders or QSqlTableModel, which uses a prepared
+    query to do this internally.
+
+    \section3 How to Build the OCI Plugin on Unix and Mac OS X
+
+    For Oracle 10g, all you need is the "Instant Client Package - Basic" and
+    "Instant Client Package - SDK". For Oracle prior to 10g, you require
+    the standard Oracle client and the SDK packages.
+
+    Oracle library files required to build the driver:
+
+    \list
+    \i \c libclntsh.so (all versions)
+    \i \c libwtc9.so (only Oracle 9)
+    \endlist
+
+    Tell \c qmake where to find the Oracle header files and shared
+    libraries and run make:
+
+    For Oracle version 9:
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 6
+
+    For Oracle version 10, we assume that you installed the RPM packages of the
+    Instant Client Package SDK (you need to adjust the version number accordingly):
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 7
+
+    \bold{Note:} If you are using the Oracle Instant Client package,
+    you will need to set LD_LIBRARY_PATH when building the OCI SQL plugin
+    and when running an applicaiton that uses the OCI SQL plugin. You can
+    avoid this requirement by setting and RPATH and listing all of the
+    libraries to link to. Here is an example:
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 32
+
+    If you wish to build the OCI plugin manually with this method the procedure looks like this:
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 33
+
+    \section3 How to Build the OCI Plugin on Windows
+
+    Choosing the option "Programmer" in the Oracle Client Installer from
+    the Oracle Client Installation CD is sufficient to build the plugin.
+
+    Build the plugin as follows (here it is assumed that Oracle Client is
+    installed in \c{C:\oracle}):
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 8
+
+    If you are not using a Microsoft compiler, replace \c nmake with \c
+    make in the line above.
+
+    When you run your application you will also need to add the \c oci.dll
+    path to your \c PATH environment variable:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 9
+
+    \bold{Note:} This database plugin is not supported for Windows CE.
+
+    \target QODBC
+    \section2 QODBC for Open Database Connectivity (ODBC)
+
+    \section3 General Information about the ODBC plugin
+
+    ODBC is a general interface that allows you to connect to multiple
+    DBMSs using a common interface. The QODBC driver allows you to connect
+    to an ODBC driver manager and access the available data sources. Note
+    that you also need to install and configure ODBC drivers for the ODBC
+    driver manager that is installed on your system. The QODBC plugin
+    then allows you to use these data sources in your Qt applications.
+
+    \bold{Note:} You should use native drivers in preference to the ODBC
+    driver where they are available. ODBC support can be used as a fallback
+    for compliant databases if no native drivers are available.
+
+    On Windows an ODBC driver manager should be installed by default.
+    For Unix systems there are some implementations which must be
+    installed first. Note that every client that uses your application is
+    required to have an ODBC driver manager installed, otherwise the
+    QODBC plugin will not work.
+
+    Be aware that when connecting to an ODBC datasource you must pass in
+    the name of the ODBC datasource to the QSqlDatabase::setDatabaseName()
+    function rather than the actual database name.
+
+    The QODBC Plugin needs an ODBC compliant driver manager version 2.0 or
+    later to work. Some ODBC drivers claim to be version 2.0 compliant,
+    but do not offer all the necessary functionality. The QODBC plugin
+    therefore checks whether the data source can be used after a
+    connection has been established and refuses to work if the check
+    fails. If you don't like this behavior, you can remove the \c{#define
+    ODBC_CHECK_DRIVER} line from the file \c{qsql_odbc.cpp}. Do this at
+    your own risk!
+
+    By default, Qt instructs the ODBC driver to behave as an ODBC 2.x
+    driver. However, for some \e{driver-manager/ODBC 3.x-driver}
+    combinations (e.g., \e{unixODBC/MaxDB ODBC}), telling the ODBC
+    driver to behave as a 2.x driver can cause the driver plugin to
+    have unexpected behavior. To avoid this problem, instruct the ODBC
+    driver to behave as a 3.x driver by
+    \l{QSqlDatabase::setConnectOptions()} {setting the connect option}
+    \c{"SQL_ATTR_ODBC_VERSION=SQL_OV_ODBC3"} before you
+    \l{QSqlDatabase::open()} {open your database connection}. Note
+    that this will affect multiple aspects of ODBC driver behavior,
+    e.g., the SQLSTATEs.  Before setting this connect option, consult
+    your ODBC documentation about behavior differences you can expect.
+
+    If you experience very slow access of the ODBC datasource, make sure
+    that ODBC call tracing is turned off in the ODBC datasource manager.
+
+    Some drivers don't support scrollable cursors. In that case case only
+    queries in forwardOnly mode can be used successfully.
+
+    \section3 ODBC Stored Procedure Support
+
+    With Microsoft SQL Server the result set returned by a stored
+    procedure that uses the return statement, or returns multiple result
+    sets, will be accessible only if you set the query's forward only
+    mode to \e forward using \l QSqlQuery::setForwardOnly().
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 10
+
+    \bold{Note:} The value returned by the stored procedure's return statement
+    is discarded.
+
+    \section3 ODBC Unicode Support
+
+    The QODBC Plugin will use the Unicode API if UNICODE is defined. On
+    Windows NT based systems, this is the default. Note that the ODBC
+    driver and the DBMS must also support Unicode.
+
+    Some driver managers and drivers don't support UNICODE. To use the
+    QODBC plugin with such drivers it has to be compiled with the
+    Q_ODBC_VERSION_2 defined.
+
+    For the Oracle 9 ODBC driver (Windows), it is neccessary to check
+    "SQL_WCHAR support" in the ODBC driver manager otherwise Oracle
+    will convert all Unicode strings to local 8-bit.
+
+    \section3 How to Build the ODBC Plugin on Unix and Mac OS X
+
+    It is recommended that you use unixODBC. You can find the latest
+    version and ODBC drivers at \l http://www.unixodbc.org.
+    You need the unixODBC header files and shared libraries.
+
+    Tell \c qmake where to find the unixODBC header files and shared
+    libraries (here it is assumed that unixODBC is installed in
+    \c{/usr/local/unixODBC}) and run \c{make}:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 11
+
+    \section3 How to Build the ODBC Plugin on Windows
+
+    The ODBC header and include files should already be installed in the
+    right directories. You just have to build the plugin as follows:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 12
+
+    If you are not using a Microsoft compiler, replace \c nmake with \c
+    make in the line above.
+
+    \bold{Note:} This database plugin is not officially supported for Windows CE.
+
+    \target QPSQL
+    \section2 QPSQL for PostgreSQL (Version 7.3 and Above)
+
+    \section3 General Information about the QPSQL driver
+
+    The QPSQL driver supports version 7.3 and higher of the PostgreSQL server.
+    We recommend that you use a client library from version 7.3.15, 7.4.13,
+    8.0.8, 8.1.4 or more recent as these versions contain security fixes, and
+    as the QPSQL driver might not build with older versions of the client
+    library depending on your platform.
+
+    For more information about PostgreSQL visit \l http://www.postgresql.org.
+
+    \section3 QPSQL Unicode Support
+
+    The QPSQL driver automatically detects whether the PostgreSQL
+    database you are connecting to supports Unicode or not. Unicode is
+    automatically used if the server supports it. Note that the driver
+    only supports the UTF-8 encoding. If your database uses any other
+    encoding, the server must be compiled with Unicode conversion
+    support.
+
+    Unicode support was introduced in PostgreSQL version 7.1 and it will
+    only work if both the server and the client library have been compiled
+    with multibyte support. More information about how to set up a
+    multibyte enabled PostgreSQL server can be found in the PostgreSQL
+    Administrator Guide, Chapter 5.
+
+    \section3 QPSQL BLOB Support
+
+    Binary Large Objects are supported through the \c BYTEA field type in
+    PostgreSQL server versions >= 7.1.
+
+    \section3 How to Build the QPSQL Plugin on Unix and Mac OS X
+
+    You need the PostgreSQL client library and headers installed.
+
+    To make \c qmake find the PostgreSQL header files and shared
+    libraries, run \c qmake the following way (assuming that the
+    PostgreSQL client is installed in \c{/usr}):
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 13
+
+    After installing Qt, as described in the \l{Installing Qt on X11 Platforms} document,
+    you also need to install the plugin in the standard location:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 14
+
+    \section3 How to Build the QPSQL Plugin on Windows
+
+    Install the appropriate PostgreSQL developer libraries for your
+    compiler. Assuming that PostgreSQL was installed in \c{C:\psql},
+    build the plugin as follows:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 15
+
+    Users of MinGW may wish to consult the following online document:
+    \l{Compiling PostgreSQL On Native Win32 FAQ}.
+
+    \bold{Note:} This database plugin is not supported for Windows CE.
+
+    \target QTDS
+    \section2 QTDS for Sybase Adaptive Server
+    \section3 General Information about QTDS
+
+    It is not possible to set the port with QSqlDatabase::setPort() due to limitations in the
+    Sybase client library. Refer to the Sybase documentation for information on how to set up
+    a Sybase client configuration file to enable connections to databases on non-default ports.
+
+    \section3 How to Build the QDTS Plugin on Unix and Mac OS X
+
+    Under Unix, two libraries are available which support the TDS protocol:
+
+    \list
+    \i FreeTDS, a free implementation of the TDS protocol
+      (\l{http://www.freetds.org}). Note that FreeTDS is not yet stable,
+      so some functionality may not work as expected.
+
+    \i Sybase Open Client, available from \l{http://www.sybase.com}.
+      Note for Linux users: Get the Open Client RPM from
+      \l{http://linux.sybase.com}.
+    \endlist
+
+    Regardless of which library you use, the shared object file
+    \c{libsybdb.so} is needed. Set the \c SYBASE environment variable to
+    point to the directory where you installed the client library and
+    execute \c{qmake}:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 16
+
+    \section3 How to Build the QDTS Plugin on Windows
+
+    You can either use the DB-Library supplied by Microsoft or the Sybase
+    Open Client (\l{http://www.sybase.com}). You must include \c
+    NTWDBLIB.LIB to build the plugin:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 17
+
+    By default the Microsoft library is used on Windows, if you want to
+    force the use of the Sybase Open Client, you must define \c
+    Q_USE_SYBASE in \c{%QTDIR%\src\sql\drivers\tds\qsql_tds.cpp}. If you
+    are not using a Microsoft compiler, replace \c nmake with \c make in
+    the line above.
+
+    \bold{Note:} This database plugin is not supported for Windows CE.
+
+    \target QDB2
+    \section2 QDB2 for IBM DB2 (Version 7.1 and Above)
+
+    \section3 General Information about QDB2
+
+    The Qt DB2 plugin makes it possible to access IBM DB2 databases. It
+    has been tested with IBM DB2 v7.1 and 7.2. You must install the IBM
+    DB2 development client library, which contains the header and library
+    files necessary for compiling the QDB2 plugin.
+
+    The QDB2 driver supports prepared queries, reading/writing of Unicode
+    strings and reading/writing of BLOBs.
+
+    We suggest using a forward-only query when calling stored procedures
+    in DB2 (see QSqlQuery::setForwardOnly()).
+
+    \section3 How to Build the QDB2 Plugin on Unix and Mac OS X
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 18
+
+    After installing Qt, as described in the \l{Installing Qt on X11 Platforms} document,
+    you also need to install the plugin in the standard location:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 19
+
+    \section3 How to Build the QDB2 Plugin on Windows
+
+    The DB2 header and include files should already be installed in the
+    right directories. You just have to build the plugin as follows:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 20
+
+    If you are not using a Microsoft compiler, replace \c nmake
+    with \c make in the line above.
+
+    \bold{Note:} This database plugin is not supported for Windows CE.
+
+    \target QSQLITE2
+    \section2 QSQLITE2 for SQLite Version 2
+
+    The Qt SQLite 2 plugin is offered for compatibility. Whenever
+    possible, use the \l{#QSQLITE}{version 3 plugin} instead. The
+    build instructions for version 3 apply to version 2 as well.
+
+    \target QSQLITE
+    \section2 QSQLITE for SQLite (Version 3 and Above)
+
+    \section3 General Information about QSQLITE
+
+    The Qt SQLite plugin makes it possible to access SQLite
+    databases. SQLite is an in-process database, which means that it
+    is not necessary to have a database server. SQLite operates on a
+    single file, which must be set as the database name when opening
+    a connection. If the file does not exist, SQLite will try to
+    create it. SQLite also supports in-memory databases, simply pass
+    ":memory:" as the database name.
+
+    SQLite has some restrictions regarding multiple users and
+    multiple transactions. If you try to read/write on a resource from different
+    transactions, your application might freeze until one transaction commits
+    or rolls back. The Qt SQLite driver will retry to write to a locked resource
+    until it runs into a timeout (see \c{QSQLITE_BUSY_TIMEOUT}
+    at QSqlDatabase::setConnectOptions()).
+
+    In SQLite any column, with the exception of an INTEGER PRIMARY KEY column,
+    may be used to store any type of value. For instance, a column declared as
+    INTEGER may contain an integer value in one row and a text value in the
+    next. This is due to SQLite associating the type of a value with the value
+    itself rather than with the column it is stored in. A consequence of this
+    is that the type returned by QSqlField::type() only indicates the field's
+    recommended type. No assumption of the actual type should be made from
+    this and the type of the individual values should be checked.
+
+    The driver is locked for updates while a select is executed. This
+    may cause problems when using QSqlTableModel because Qt's item views
+    fetch data as needed (with QSqlQuery::fetchMore() in the case of
+    QSqlTableModel).
+
+    You can find information about SQLite on \l{http://www.sqlite.org}.
+
+    \section3 How to Build the QSQLITE Plugin
+
+    SQLite version 3 is included as a third-party library within Qt.
+    It can be built by passing the following parameters to the
+    configure script: \c{-plugin-sql-sqlite} (build as a plugin) or
+    \c{-qt-sql-sqlite} (linked directly into the Qt library).
+
+    If you don't want to use the SQLite library included with Qt, you
+    can build it manually (replace \c $SQLITE by the directory where
+    SQLite resides):
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 21
+
+    After installing Qt, as described in the \l{Installing Qt on X11 Platforms} document,
+    you also need to install the plugin in the standard location:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 22
+
+    On Windows:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 23
+
+    \section3 QSQLITE File Format Compatibility
+
+    SQLite minor releases sometimes break file format forward compatibility.
+    For example, SQLite 3.3 can read database files created with SQLite 3.2,
+    but databases created with SQLite 3.3 cannot be read by SQLite 3.2.
+    Please refer to the SQLite documentation and change logs for information about
+    file format compatibility between versions.
+
+    Qt minor releases usually follow the SQLite minor releases, while Qt patch releases
+    follow SQLite patch releases. Patch releases are therefore both backward and forward
+    compatible.
+
+    To force SQLite to use a specific file format, it is neccessary to build and
+    ship your own database plugin with your own SQLite library as illustrated above.
+    Some versions of SQLite can be forced to write a specific file format by setting
+    the \c{SQLITE_DEFAULT_FILE_FORMAT} define when building SQLite.
+
+    \target QIBASE
+    \section2 QIBASE for Borland InterBase
+
+    \section3 General Information about QIBASE
+
+    The Qt InterBase plugin makes it possible to access the InterBase and
+    Firebird databases. InterBase can either be used as a client/server or
+    without a server in which case it operates on local files. The
+    database file must exist before a connection can be established.
+
+    Note that InterBase requires you to specify the full path to the
+    database file, no matter whether it is stored locally or on another
+    server.
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 24
+
+    You need the InterBase/Firebird development headers and libraries
+    to build this plugin.
+
+    Due to license incompatibilities with the GPL, users of the Qt Open Source
+    Edition are not allowed to link this plugin to the commercial editions of
+    InterBase. Please use Firebird or the free edition of InterBase.
+
+    \section3 QIBASE Unicode Support and Text Encoding
+
+    By default the driver connects to the database using UNICODE_FSS. This can
+    be overridden by setting the ISC_DPB_LC_CTYPE parameter with
+    QSqlDatabase::setConnectOptions() before opening the connection.
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 25
+
+    If Qt doesn't support the given text encoding the driver will issue a
+    warning message and connect to the database using UNICODE_FSS.
+
+    Note that if the text encoding set when connecting to the database is
+    not the same as in the database, problems with transliteration might arise.
+
+    \section3 QIBASE Stored procedures
+
+    InterBase/Firebird return OUT values as result set, so when calling stored
+    procedure, only IN values need to be bound via QSqlQuery::bindValue(). The
+    RETURN/OUT values can be retrieved via QSqlQuery::value(). Example:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 26
+
+    \section3 How to Build the QIBASE Plugin on Unix and Mac OS X
+
+    The following assumes InterBase or Firebird is installed in
+    \c{/opt/interbase}:
+
+    If you are using InterBase:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 27
+
+    If you are using Firebird, the Firebird library has to be set explicitly:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 28
+
+    \section3 How to Build the QIBASE Plugin on Windows
+
+    The following assumes InterBase or Firebird is installed in
+    \c{C:\interbase}:
+
+    If you are using InterBase:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 29
+
+    If you are using Firebird, the Firebird library has to be set explicitely:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 30
+
+    If you are not using a Microsoft compiler, replace \c nmake
+    with \c make in the line above.
+
+    Note that \c{C:\interbase\bin} must be in the \c PATH.
+
+    \bold{Note:} This database plugin is not supported for Windows CE.
+
+    \target troubleshooting
+    \section1 Troubleshooting
+
+    You should always use client libraries that have been compiled with
+    the same compiler as you are using for your project. If you cannot get
+    a source distibution to compile the client libraries yourself, you
+    must make sure that the pre-compiled library is compatible with
+    your compiler, otherwise you will get a lot of "undefined symbols"
+    errors. Some compilers have tools to convert libraries, e.g. Borland
+    ships the tool \c{COFF2OMF.EXE} to convert libraries that have been
+    generated with Microsoft Visual C++.
+
+    If the compilation of a plugin succeeds but it cannot be loaded,
+    make sure that the following requirements are met:
+
+    \list
+    \i Ensure that you are using a shared Qt library; you cannot use the
+        plugins with a static build.
+    \i Ensure that the plugin is in the correct directory. You can use
+        QApplication::libraryPaths() to determine where Qt looks for plugins.
+    \i Ensure that the client libraries of the DBMS are available on the
+        system. On Unix, run the command \c{ldd} and pass the name of the
+        plugin as parameter, for example \c{ldd libqsqlmysql.so}. You will
+        get a warning if any of the client libraries couldn't be found.
+        On Windows, you can use Visual Studio's dependency walker.
+    \i Compile Qt with \c{QT_DEBUG_COMPONENT} defined to get very verbose
+        debug output when loading plugins.
+    \endlist
+
+    If you experience plugin load problems and see output like this:
+
+    \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 31
+
+    The problem is usually that the plugin had the wrong \l{How to
+    Create Qt Plugins#The Build Key}{build key}. This might require
+    removing an entry from the \l{How to Create Qt Plugins#The Plugin
+    Cache} {plugin cache}. Here is some more \l{How to Create Qt
+    Plugins#Debugging Plugins} {plugin debugging info}.
+
+    \target development
+    \section1 How to Write Your Own Database Driver
+
+    QSqlDatabase is responsible for loading and managing database driver
+    plugins. When a database is added (see QSqlDatabase::addDatabase()),
+    the appropriate driver plugin is loaded (using QSqlDriverPlugin).
+    QSqlDatabase relies on the driver plugin to provide interfaces for
+    QSqlDriver and QSqlResult.
+
+    QSqlDriver is an abstract base class which defines the functionality
+    of a SQL database driver. This includes functions such as
+    QSqlDriver::open() and QSqlDriver::close(). QSqlDriver is responsible
+    for connecting to a database, establish the proper environment, etc.
+    In addition, QSqlDriver can create QSqlQuery objects appropriate for
+    the particular database API. QSqlDatabase forwards many of its
+    function calls directly to QSqlDriver which provides the concrete
+    implementation.
+
+    QSqlResult is an abstract base class which defines the functionality
+    of a SQL database query. This includes statements such as \c{SELECT},
+    \c{UPDATE}, and \c{ALTER} \c{TABLE}. QSqlResult contains functions
+    such as QSqlResult::next() and QSqlResult::value(). QSqlResult is
+    responsible for sending queries to the database, returning result
+    data, etc. QSqlQuery forwards many of its function calls directly to
+    QSqlResult which provides the concrete implementation.
+
+    QSqlDriver and QSqlResult are closely connected. When implementing a
+    Qt SQL driver, both of these classes must to be subclassed and the
+    abstract virtual methods in each class must be implemented.
+
+    To implement a Qt SQL driver as a plugin (so that it is
+    recognized and loaded by the Qt library at runtime), the driver
+    must use the Q_EXPORT_PLUGIN2() macro. Read \l{How to Create Qt
+    Plugins} for more information on this. You can also check out how
+    this is done in the SQL plugins that are provided with Qt in
+    \c{QTDIR/src/plugins/sqldrivers} and \c{QTDIR/src/sql/drivers}.
+
+    The following code can be used as a skeleton for a SQL driver:
+
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 47
+    \codeline
+    \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 48
+*/
diff --git a/doc/src/styles.qdoc b/doc/src/styles.qdoc
new file mode 100644
index 0000000000..9e724164a1
--- /dev/null
+++ b/doc/src/styles.qdoc
@@ -0,0 +1,2059 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page style-reference.html
+
+    \title Implementing Styles and Style Aware Widgets
+    \ingroup architecture
+    \brief An overview of styles and the styling of widgets.
+
+    \tableofcontents
+
+    \section1 Introduction
+
+    Styles (classes that inherit QStyle) draw on behalf of widgets
+    and encapsulate the look and feel of a GUI. Several styles are
+    built into Qt (e.g., windows style and motif style). Other styles are
+    only available on specific platforms (such as the windows XP style).
+    Custom styles are made available as plugins or by creating an
+    instance of the style class in an application and setting it with
+    QApplication::setStyle().
+
+    To implement a new style, you inherit one of Qt's existing styles
+    - the one most resembling the style you want to create - and
+    reimplement a few virtual functions. This process is somewhat
+    involved, and we therefore provide this overview. We give a
+    step-by-step walkthrough of how to style individual Qt widgets.
+    We will examine the QStyle virtual functions, member variables,
+    and enumerations.
+
+    The part of this document that does not concern the styling of
+    individual widgets is meant to be read sequentially because later
+    sections tend to depend on earlier ones. The description of the
+    widgets can be used for reference while implementing a style.
+    However, you may need to consult the Qt source code in some cases.
+    The sequence in the styling process should become clear after
+    reading this document, which will aid you in locating relevant code.
+
+    To develop style aware widgets (i.e., widgets that conform to
+    the style in which they are drawn), you need to draw them using the
+    current style. This document shows how widgets draw themselves
+    and which possibilities the style gives them.
+
+    \section1 The QStyle implementation
+
+    The API of QStyle contains functions that draw the widgets, static
+    helper functions to do common and difficult tasks (e.g.,
+    calculating the position of slider handles) and functions to do
+    the various calculations necessary while drawing (e.g., for the
+    widgets to calculate their size hints). The style also help some
+    widgets with the layout of their contents. In addition, it creates
+    a QPalette that contains \l{QBrush}es to draw with.
+
+    QStyle draws graphical elements; an element is a widget or a
+    widget part like a push button bevel, a window frame, or a scroll
+    bar. When a widget asks a style to draw an element, it provides the
+    style with a style option, which is a class that contains the
+    information necessary for drawing.
+
+    We will in the course of this section look at the style elements,
+    the style options, and the functions of QStyle. Finally, we describe
+    how the palette is used.
+
+    Items in item views is drawn by \l{Delegate Classes}{delegates} in
+    Qt. The item view headers are still drawn by the style. Qt's
+    default delegate, QStyledItemDelegate, draws its items partially
+    through the current style; it draws the check box indicators and
+    calculate bounding rectangles for the elements of which the item
+    consists. In this document, we only describe how to implement a
+    QStyle subclass. If you wish to add support for other datatypes
+    than those supported by the QStyledItemDelegate, you need to
+    implement a custom delegate. Note that delegates must be set
+    programmatically for each individual widget (i.e., default
+    delegates cannot be provided as plugins).
+
+    \section2 The Style Elements
+
+    A style element is a graphical part of a GUI. A widget consists
+    of a hierarchy (or tree) of style elements. For instance, when a
+    style receives a request to draw a push button (from QPushButton,
+    for example), it draws a label (text and icon), a button bevel,
+    and a focus frame. The button bevel, in turn, consists of a frame
+    around the bevel and two other elements, which we will look at
+    later. Below is a conceptual illustration of the push button
+    element tree. We will see the actual tree for QPushButton when we
+    go through the individual widgets.
+
+    \image javastyle/conceptualpushbuttontree.png
+
+    Widgets are not necessarily drawn by asking the style to draw
+    only one element. Widgets can make several calls to the style to
+    draw different elements. An example is QTabWidget, which draws its
+    tabs and frame individually.
+
+    There are three element types: primitive elements, control
+    elements, and complex control elements. The elements are defined
+    by the \l{QStyle::}{ComplexControl}, \l{QStyle::}{ControlElement},
+    and \l{QStyle::}{PrimitiveElement} enums. The values of
+    each element enum has a prefix to identify their type: \c{CC_} for
+    complex elements, \c{CE_} for control elements, and \c{PE_} for
+    primitive elements. We will in the following three sections see what
+    defines the different elements and see examples of widgets that use
+    them.
+
+    The QStyle class description contains a list of these elements and
+    their roles in styling widgets. We will see how they are used when
+    we style individual widgets.
+
+    \section3 Primitive Elements
+
+    Primitive elements are GUI elements that are common and often used
+    by several widgets. Examples of these are frames, button bevels,
+    and arrows for spin boxes, scroll bars, and combo boxes.
+    Primitive elements cannot exist on their own: they are always part
+    of a larger construct. They take no part in the interaction with
+    the user, but are passive decorations in the GUI.
+
+    \section3 Control Elements
+
+    A control element performs an action or displays information
+    to the user. Examples of control elements are push buttons, check
+    boxes, and header sections in tables and tree views. Control
+    elements are not necessarily complete widgets such as push
+    buttons, but can also be widget parts such as tab bar tabs and
+    scroll bar sliders. They differ from primitive elements in that
+    they are not passive, but fill a function in the interaction with
+    the user. Controls that consist of several elements often use the
+    style to calculate the bounding rectangles of the elements. The
+    available sub elements are defined by the \l{QStyle::}{SubElement}
+    enum. This enum is only used for calculating bounding rectangles,
+    and sub elements are as such not graphical elements to be drawn
+    like primitive, control, and complex elements.
+
+    \section3 Complex Control Elements
+
+    Complex control elements contain sub controls. Complex controls
+    behave differently depending on where the user handles them with
+    the mouse and which keyboard keys are pressed. This is dependent
+    on which sub control (if any) that the mouse is over or received a
+    mouse press. Examples of complex controls are scroll bars and
+    combo boxes. With a scroll bar, you can use the mouse to move the
+    slider and press the line up and line down buttons. The available
+    sub controls are defined by the \l{QStyle}{SubControl} enum.
+
+    In addition to drawing, the style needs to provide the widgets
+    with information on which sub control (if any) a mouse press was
+    made on. For instance, a QScrollBar needs to know if the user
+    pressed the slider, the slider groove, or one of the buttons.
+
+    Note that sub controls are not the same as the control elements
+    described in the previous section. You cannot use the style to
+    draw a sub control; the style will only calculate the bounding
+    rectangle in which the sub control should be drawn. It is common,
+    though, that complex elements use control and primitive elements
+    to draw their sub controls, which is an approach that is
+    frequently used by the built-in styles in Qt and also the Java
+    style. For instance, the Java style uses PE_IndicatorCheckBox to
+    draw the check box in group boxes (which is a sub control of
+    CC_GroupBox). Some sub controls have an equivalent control element,
+    e.g., the scroll bar slider (SC_SCrollBarSlider and
+    CE_ScrollBarSlider).
+
+    \section3 Other QStyle Tasks
+
+    The style elements and widgets, as mentioned, use the style to
+    calculate bounding rectangles of sub elements and sub controls,
+    and pixel metrics, which is a style dependent size in screen
+    pixels, for measures when drawing. The available rectangles and
+    pixel metrics are represented by three enums in QStyle:
+    \l{QStyle::}{SubElement}, \l{QStyle::}{SubControl}, and
+    \l{QStyle::}{PixelMetric}. Values of the enums can easily by
+    identified as they start with SE_, SC_ and PM_.
+
+    The style also contain a set of style hints, which is
+    represented as values in the \l{QStyle::}{StyleHint} enum. All
+    widgets do not have the same functionality and look in the
+    different styles. For instance, when the menu items in a menu do not
+    fit in a single column on the screen, some styles support
+    scrolling while others draw more than one column to fit all items.
+
+    A style usually has a set of standard images (such as a warning, a
+    question, and an error image) for message boxes, file dialogs,
+    etc. QStyle provides the \l{QStyle::}{StandardPixmap} enum. Its
+    values represent the standard images. Qt's widgets use these, so
+    when you implement a custom style you should supply the images
+    used by the style that is being implemented.
+
+    The style calculates the spacing between widgets in layouts. There
+    are two ways the style can handle these calculations. You can set
+    the PM_LayoutHorizontalSpacing and PM_LayoutVerticalSpacing, which
+    is the way the java style does it (through QCommonStyle).
+    Alternatively, you can implement QStyle::layoutSpacing() and
+    QStyle::layoutSpacingImplementation() if you need more control over 
+    this part of the layout. In these functions you can calculate the
+    spacing based on control types (QSizePolicy::ControlType) for
+    different size policies (QSizePolicy::Policy) and also the style
+    option for the widget in question.
+
+    \section2 Style Options
+
+    A style option (a class that inherit QStyleOption) stores
+    parameters used by QStyle functions. The sub-classes of
+    QStyleOption contain all information necessary to style the
+    individual widgets. The style options keep public variables for
+    performance reasons. Style options are filled out by the widgets.
+
+    The widgets can be in a number of different states, which are
+    defined by the \l{QStyle::}{State} enum. Some of the state flags have
+    different meanings depending on the widget, but others are common
+    for all widgets like State_Disabled. It is QStyleOption that sets
+    the common states with QStyleOption::init(); the rest of the
+    states are set by the individual widgets.
+
+    Most notably, the style options contain the palette and bounding
+    rectangles of the widgets to be drawn. Most widgets have
+    specialized style options. QPushButton and QCheckBox, for
+    instance, use QStyleOptionButton as style option, which contain
+    the text, icon, and the size of their icon. The exact contents of
+    all options are described when we go through individual widgets.
+
+    \section2 QStyle Functions
+
+    The QStyle class defines three functions for drawing the primitive,
+    control, and complex elements:
+    \l{QStyle::}{drawPrimitive()},
+    \l{QStyle::}{drawControl()}, and
+    \l{QStyle::}{drawComplexControl()}. The functions takes the
+    following parameters:
+
+    \list
+        \o the enum value of the element to draw
+        \o a QStyleOption which contains the information needed to
+           draw the element.
+        \o a QPainter with which to draw the element.
+        \o a pointer to a QWidget, typically the widget
+           that the element is painted on.
+    \endlist
+
+    Not all widgets send a pointer to themselves. If the style
+    option sent to the function does not contain the information you
+    need, you should check the widget implementation to see if it
+    sends a pointer to itself.
+
+    The QStyle class also provides helper functions that are used
+    when drawing the elements. The \l{QStyle::}{drawItemText()}
+    function draws text within a specified rectangle and taking a
+    QPalette as a parameter. The \l{QStyle::}{drawItemPixmap()}
+    function helps to align a pixmap within a specified bounding
+    rectangle.
+
+    Other QStyle functions do various calculations for the
+    functions that draw. The widgets also use these functions for
+    calculating size hints and also for bounding rectangle
+    calculations if they draw several style elements themselves.
+    As with the functions that draw elements the helper functions
+    typically takes the same arguments.
+
+    \list
+        \o The \l{QStyle::}{subElementRect()} function takes a
+        \l{QStyle::}{SubElement} enum value, and calculates a bounding
+        rectangle for a sub element. The style uses this function to
+        know where to draw the different parts of an element. This is
+        mainly done for reuse. If you create a new style, you can use
+        the same location of sub elements as the super class.
+
+        \o The \l{QStyle::}{subControlRect()} function is used to
+        calculate bounding rectangles for sub controls in complex
+        controls. When you implement a new style, you reimplement \c
+        subControlRect() and calculate the rectangles that are different
+        from the super class.
+
+        \o The \l{QStyle::}{pixelMetric()} function returns a pixel
+        metric, which is a style dependent size given in screen
+        pixels. It takes a value of the \l{QStyle::}{PixelMetric} enum
+        and returns the correct measure. Note that pixel metrics do
+        not necessarily have to be static measures, but can be
+        calculated with, for example, the style option.
+
+        \o The \l{QStyle::}{hitTestComplexControl()} function returns the
+        sub control that the mouse pointer is over in a complex control.
+        Usually, this is simply a matter of using
+        \l{QStyle::}{subControlRect()} to get the bounding rectangles of
+        the sub controls, and see which rectangle contains the position of
+        the cursor.
+    \endlist
+
+    QStyle also have the functions \l{QStyle::}{polish()} and
+    \l{QStyle::}{unpolish()}. All widgets are sent to the \c polish()
+    function before being shown and to \c unpolish() when they
+    are hidden. You can use these functions to set attributes on the
+    widgets or do other work that is required by your style. For
+    instance, if you need to know when the mouse is hovering over the
+    widget, you need to set the \l{Qt::}{WA_Hover} widget attribute.
+    The State_MouseOver state flag will then be set in the widget's
+    style options.
+
+    QStyle has a few static helper functions that do some common and
+    difficult tasks. They can calculate the position of a slider
+    handle from the value of the slider and transform rectangles
+    and draw text considering reverse layouts; see the QStyle
+    class documentation for more details.
+
+    The usual approach when one reimplements QStyle virtual
+    functions is to do work on elements that are different from the
+    super class; for all other elements, you can simply use the super
+    class implementation.
+
+    \section2 The Palette
+
+    Each style provides a color - that is, QBrush - palette that
+    should be used for drawing the widgets. There is one set of colors
+    for the different widget states (QPalette::ColorGroup): active
+    (widgets in the window that has keyboard focus), inactive (widgets
+    used for other windows), and disabled (widgets that are set
+    disabled). The states can be found by querying the State_Active
+    and State_Enabled state flags. Each set contains color certain
+    roles given by the QPalette::ColorRole enum. The roles describe in
+    which situations the colors should be used (e.g., for painting
+    widget backgrounds, text, or buttons).
+
+    How the color roles are used is up to the style. For instance, if
+    the style uses gradients, one can use a palette color and make it
+    darker or lighter with QColor::darker() and QColor::lighter() to
+    create the gradient. In general, if you need a brush that is not
+    provided by the palette, you should try to derive it from one.
+
+    QPalette, which provides the palette, stores colors for
+    different widget states and color roles. The palette for a style
+    is returned by \l{QStyle::}{standardPalette()}. The standard
+    palette is not installed automatically when a new style is set
+    on the application (QApplication::setStyle()) or widget
+    (QWidget::setStyle()), so you must set the palette yourself
+    with (QApplication::setPalette()) or (QWidget::setPalette()).
+
+    It is not recommended to hard code colors as applications and
+    individual widgets can set their own palette and also use the
+    styles palette for drawing. Note that none of Qt's widgets set
+    their own palette. The java style does hard code some colors, but
+    its author looks past this in silence. Of course, it is not
+    intended that the style should look good with any palette.
+
+    \section2 Implementation Issues
+
+    When you implement styles, there are several issues to
+    consider. We will give some hints and advice on implementation
+    here.
+
+    When implementing styles, it is necessary to look through the
+    code of the widgets and code of the base class and its ancestors.
+    This is because the widgets use the style differently, because the
+    implementation in the different styles virtual functions can
+    affect the state of the drawing (e.g., by altering the QPainter
+    state without restoring it and drawing some elements without using
+    the appropriate pixel metrics and sub elements).
+
+    It is recommended that the styles do not alter the proposed size
+    of widgets with the QStyle::sizeFromContents() function but let
+    the QCommonStyle implementation handle it. If changes need to be
+    made, you should try to keep them small; application development
+    may be difficult if the layout of widgets looks considerably
+    different in the various styles.
+
+    We recommend using the QPainter directly for drawing, i.e., not
+    use pixmaps or images. This makes it easier for the style conform
+    to the palette (although you can set your own color table on a
+    QImage with \l{QImage::}{setColorTable()}).
+
+    It is, naturally, possible to draw elements without using the
+    style to draw the sub elements as intended by Qt. This is
+    discouraged as custom widgets may depend on these sub elements to
+    be implemented correctly. The widget walkthrough shows how Qt
+    uses the sub elements.
+
+    \section1 Java Style
+
+    We have implemented a style that resembles the Java default look
+    and feel (previously known as Metal). We have done this as it is
+    relatively simple to implement and we wanted to build a style for
+    this overview document. To keep it simple and not to extensive, we
+    have simplified the style somewhat, but Qt is perfectly able to
+    make an exact copy of the style. However, there are no concrete
+    plans to implement the style as a part of Qt.
+
+    In this section we will have a look at some implementation
+    issues. Finally, we will see a complete example on the styling of
+    a Java widget. We will continue to use the java style
+    throughout the document for examples and widget images. The
+    implementation itself is somewhat involved, and it is not
+    intended that you should read through it.
+
+    \section2 Design and Implementation
+
+    The first step in designing the style was to select the base
+    class. We chose to subclass QWindowsStyle. This class implements
+    most of the functionality we need other than performing the actual
+    drawing. Also, windows and java share layout of sub controls for
+    several of the complex controls (which reduces the amount of code
+    required considerably).
+
+    The style is implemented in one class. We have done this
+    because we find it convenient to keep all code in one file. Also,
+    it is an advantage with regards to optimization as we instantiate
+    less objects. We also keep the number of functions at a minimum by
+    using switches to identify which element to draw in the functions.
+    This results in large functions, but since we divide the code for
+    each element in the switches, the code should still be easy to
+    read.
+
+    \section2 Limitations and Differences from Java
+
+    We have not fully implemented every element in the Java style.
+    This way, we have reduced the amount and complexity of the code.
+    In general, the style was intended as a practical example for
+    this style overview document, and not to be a part of Qt
+    itself.
+
+    Not all widgets have every state implemented. This goes for
+    states that are common, e.g., State_Disabled. Each state is,
+    however, implemented for at least one widget.
+
+    We have only implemented ticks below the slider. Flat push
+    buttons are also left out. We do not handle the case where the
+    title bars and dock window titles grows to small for their
+    contents, but simply draw sub controls over each other.
+
+    We have not tried to emulate the Java fonts. Java and Qt use very
+    different font engines, so we don't consider it worth the effort
+    as we only use the style as an example for this overview.
+
+    We have hardcoded the colors (we don't use the QPalette) for
+    the linear gradients, which are used, for example, for button
+    bevels, tool bars, and check boxes. This is because the Java
+    palette cannot produce these colors. Java does not change these
+    colors based on widget color group or role anyway (they are not
+    dependent on the palette), so it does not present a problem in any
+    case.
+
+    It is Qt's widgets that are styled. Some widgets do not exist
+    at all in Java, e.g., QToolBox. Others contain elements that the
+    Java widgets don't. The tree widget is an example of the latter in
+    which Java's JTree does not have a header.
+
+    The style does not handle reverse layouts. We assume that the
+    layout direction is left to right. QWindowsStyle handles reverse
+    widgets; if we implemented reverse layouts, widgets that we change
+    the position of sub elements, or handle text alignment in labels
+    our selves would need to be updated.
+
+    \section2 Styling Java Check Boxes
+
+    As an example, we will examine the styling of check boxes in the
+    java style. We describe the complete process and print all code in
+    both the java style and Qt classes involved. In the rest of this
+    document, we will not examine the source code of the individual
+    widgets. Hopefully, this will give you an idea on how to search
+    through the code if you need to check specific implementation
+    details; most widgets follow the same structure as the check
+    boxes. We have edited the QCommonStyle code somewhat to remove
+    code that is not directly relevant for check box styling.
+ 
+    We start with a look at how QCheckBox builds it style option,
+    which is QStyleOptionButton for checkboxes:
+
+    \snippet doc/src/snippets/code/doc_src_styles.qdoc 0
+
+    First we let QStyleOption set up the option with the information
+    that is common for all widgets with \c init().  We will look at
+    this shortly.
+
+    The down boolean is true when the user press the box down; this is
+    true whether the box is checked or not of the checkbox.  The
+    State_NoChange state is set when we have a tristate checkbox and
+    it is partially checked. It has State_On if the box is checked and
+    State_Off if it is unchecked. State_MouseOver is set if the mouse
+    hovers over the checkbox and the widget has attribute Qt::WA_Hover
+    set - you set this in QStyle::polish(). In addition, the style
+    option also contains the text, icon, and icon size of the button.
+
+    \l{QStyleOption::}{init()} sets up the style option with the
+    attributes that are common for all widgets. We print its
+    implementation here:
+
+    \snippet doc/src/snippets/code/doc_src_styles.qdoc 1
+
+    The State_Enabled is set when the widget is enabled. When the
+    widget has focus the State_HasFocus flag is set. Equally, the
+    State_Active flag is set when the widget is a child of the active
+    window. The State_MouseOver will only be set if the widget has
+    the WA_HoverEnabled windows flag set. Notice that keypad
+    navigation must be enabled in Qt for the State_HasEditFocus to
+    be included; it is not included by default.
+
+    In addition to setting state flags the QStyleOption contains
+    other information about the widget: \c direction is the layout
+    direction of the layout, \c rect is the bounding rectangle of the
+    widget (the area in which to draw), \c palette is the QPalette
+    that should be used for drawing the widget, and \c fontMetrics is
+    the metrics of the font that is used by the widget.
+
+    We give an image of a checkbox and the style option to match
+    it.
+
+    \image javastyle/checkboxexample.png A java style checkbox
+
+    The above checkbox will have the following state flags in its
+    style option:
+
+    \table 90%
+    \header
+        \o State flag
+        \o Set
+    \row
+        \o State_Sunken
+        \o Yes
+    \row
+        \o State_NoChange
+        \o No
+    \row
+        \o State_On
+        \o Yes
+    \row
+        \o State_Off
+        \o No
+    \row
+        \o State_MouseOver
+        \o Yes
+    \row
+        \o State_Enabled
+        \o Yes
+    \row
+        \o State_HasFocus
+        \o Yes
+    \row
+        \o State_KeyboardFocusChange
+        \o No
+    \row
+        \o State_Active
+        \o Yes
+    \endtable
+
+    The QCheckBox paints itself in QWidget::paintEvent() with
+    style option \c opt and QStylePainter \c p. The QStylePainter
+    class is a convenience class to draw style elements. Most
+    notably, it wraps the methods in QStyle used for painting. The
+    QCheckBox draws itself as follows:
+
+    \snippet doc/src/snippets/code/doc_src_styles.qdoc 2
+
+    QCommonStyle handles the CE_CheckBox element. The QCheckBox
+    has two sub elements: SE_CheckBoxIndicator (the checked indicator)
+    and SE_CheckBoxContents (the contents, which is used for the
+    checkbox label). QCommonStyle also implements these sub element
+    bounding rectangles. We have a look at the QCommonStyle code:
+
+    \snippet doc/src/snippets/code/doc_src_styles.qdoc 3
+
+    As can be seen from the code extract, the common style gets
+    the bounding rectangles of the two sub elements of
+    CE_CheckBox, and then draws them. If the checkbox has focus,
+    the focus frame is also drawn.
+
+    The java style draws CE_CheckBoxIndicator, while QCommonStyle
+    handles CE_CheckboxLabel. We will examine each implementation and
+    start with CE_CheckBoxLabel:
+
+    \snippet doc/src/snippets/code/doc_src_styles.qdoc 4
+
+    \l{QStyle::}{visualAlignment()} adjusts the alignment of text
+    according to the layout direction. We then draw an icon if it
+    exists, and adjust the space left for the text.
+    \l{QStyle::}{drawItemText()} draws the text taking alignment,
+    layout direction, and the mnemonic into account. It also uses the
+    palette to draw the text in the right color.
+
+    The drawing of labels often get somewhat involved. Luckily, it
+    can usually be handled by the base class. The java style
+    implements its own push button label since Java-contrary to
+    windows-center button contents also when the button has an icon.
+    You can examine that implementation if you need an example of
+    reimplementing label drawing.
+
+    We take a look at the java implementation
+    of CE_CheckBoxIndicator in \c drawControl():
+
+    \snippet doc/src/snippets/javastyle.cpp 0
+
+    We first save the state of the painter. This is not always
+    necessary but in this case the QWindowsStyle needs the painter in
+    the same state as it was when PE_IndicatorCheckBox was called (We
+    could also set the state with function calls, of course). We then
+    use \c drawButtonBackground() to draw the background of the check
+    box indicator. This is a helper function that draws the background
+    and also the frame of push buttons and check boxes. We take a look
+    at that function below. We then check if the mouse is hovering
+    over the checkbox. If it is, we draw the frame java checkboxes
+    have when the box is not pressed down and the mouse is over it.
+    You may note that java does not handle tristate boxes, so we have
+    not implemented it.
+
+    Here we use a png image for our indicator. We could also check
+    here if the widget is disabled. We would then have to use
+    another image with the indicator in the disabled color.
+
+    \snippet doc/src/snippets/javastyle.cpp 1
+
+    We have seen how check boxes are styled in the java style from the
+    widget gets a paint request to the style is finished painting. To
+    learn in detail how each widget is painted, you need to go through
+    the code step-by-step as we have done here.  However, it is
+    usually enough to know which style elements the widgets draw. The
+    widget builds a style option and calls on the style one or more
+    times to draw the style elements of which it consists. Usually,
+    it is also sufficient to know the states a widget can be in and the
+    other contents of the style option, i.e., what we list in the next
+    section.
+
+    \section1 Widget Walkthrough
+
+    In this section, we will examine how most of Qt's widgets are
+    styled.  Hopefully, this will save you some time and effort while
+    developing your own styles and widgets. You will not find
+    information here that is not attainable elsewhere (i.e., by
+    examining the source code or the class descriptions for the style
+    related classes).
+
+    We mostly use java style widgets as examples. The java style does not
+    draw every element in the element trees. This is because they are
+    not visible for that widget in the java style. We still make sure
+    that all elements are implemented in a way that conforms with the
+    java style as custom widgets might need them (this does not
+    exclude leaving implementations to QWindowsStyle though).
+
+    The following is given for each widget:
+
+    \list
+        \o A table with the members (variables, etc.) of its style option.
+        \o A table over the state flags (QStyle::StateFlag) that
+           can be set on the widget and when the states are set.
+        \o Its element tree (see section \l{The Style Elements}).
+        \o An image of the widget in which the elements are outlined.
+        \omit This is not written yet - probably never will be
+              either
+        \o List of style hints that should be checked for the
+           widget.
+        \o List of standard pixmaps that could be used by the
+           elements.
+        \endomit
+    \endlist
+
+    The element tree contains the primitive, control, and complex
+    style elements. By doing a top-down traversal of the element tree,
+    you get the sequence in which the elements should be drawn. In the
+    nodes, we have written the sub element rectangles, sub control
+    elements, and pixel metrics that should be considered when drawing
+    the element of the node.
+
+    Our approach on styling center on the drawing of the widgets. The
+    calculations of sub elements rectangles, sub controls, and pixel
+    metrics used \bold during drawing is only listed as contents in
+    the element trees. Note that there are rectangles and pixel
+    metrics that are only used by widgets. This leaves these
+    calculations untreated in the walkthrough. For instance, the
+    \l{QStyle::}{subControlRect()} and
+    \l{QStyle::}{sizeFromContents()} functions often call
+    \l{QStyle::}{subElementRect()} to calculate their bounding
+    rectangles. We could draw trees for this as well. However, how
+    these calculations are done is completely up to the individual
+    styles, and they do not have to follow a specific structure (Qt
+    does not impose a specific structure). You should still make sure
+    that you use the appropriate pixel metrics, though. To limit the
+    size of the document, we have therefore chosen not to include
+    trees or describe the calculations made by the Java (or any other)
+    style.
+
+    You may be confused about how the different pixel metrics, sub
+    element rectangles, and sub control rectangles should be used when
+    examining the trees. If you are in doubt after reading the QStyle
+    enum descriptions, we suggest that you examine the QCommonStyle
+    and QWindowsStyle implementations.
+
+    Some of the bounding rectangles that we outline in the widget
+    images are equal. Reasons for this are that some elements draw
+    backgrounds while others draw frames and labels. If in doubt,
+    check the description of each element in QStyle. Also, some
+    elements are there to layout, i.e., decide where to draw, other
+    elements.
+
+    \section2 Common Widget Properties
+
+    Some states and variables are common for all widgets. These are
+    set with QStyleOption::init(). Not all elements use this function;
+    it is the widgets that create the style options, and for some
+    elements the information from \l{QStyleOption::}{init()} is not
+    necessary.
+
+    A table with the common states follows:
+
+    \table 90%
+        \header
+            \o State
+            \o State Set When
+        \row
+            \o State_Enabled
+            \o Set if the widget is not disabled (see
+               QWidget::setEnabled())
+        \row
+            \o State_Focus
+            \o Set if the widget has focus (see
+               QWidget::hasFocus())
+        \row
+            \o State_KeyobordFocusChange
+            \o Set when the user changes focus with the keyboard
+               (see Qt::WA_KeyboardFocusChange)
+        \row
+            \o State_MouseOver
+            \o Set if the mouse cursor is over the widget
+        \row
+            \o State_Active
+            \o Set if the widget is a child of the active window.
+        \row
+            \o State_HasEditFocus
+            \o Set if the widget has the edit focus
+    \endtable
+
+    The other common members for widgets are:
+
+    \table 90%
+        \header
+            \o Member
+            \o Content
+        \row
+            \o rect
+            \o The bounding rectangle of the element to draw. This
+               is set to the widget bounding rectangle
+               (QWidget::rect()).
+        \row
+            \o direction
+            \o The layout direction; a value of the
+               Qt::LayoutDirection enum.
+        \row
+            \o palette
+            \o The QPalette to use when drawing the element. This
+               is set to the widgets palette (QWidget::palette()).
+        \row
+            \o fontMetrics
+            \o The QFontMetrics to use when drawing text on the
+               widget.
+    \endtable
+
+    The complex style options (classes that inherit
+    QStyleOptionComplex) used for complex style elements share two
+    variables: \l{QStyleOptionComplex::}{subControls} and
+    \l{QStyleOptionComplex::}{activeSubControls}. Both variables are
+    an OR'ed combination of QStyle::SubControl enum values. They
+    indicate which sub controls the complex control consists of and
+    which of these controls are currently active.
+
+    As mentioned, the style calculates the size of the widgets
+    contents, which the widgets calculate their size hints from. In
+    addition, complex controls also use the style to test which
+    sub-controls the mouse is over. 
+
+    \section2 Widget Reference
+
+    Without further delay, we present the widget walkthrough; each
+    widget has its own sub-section.
+
+    \section3 Push Buttons
+
+    The style structure for push buttons is shown below. By doing a
+    top-down traversal of the tree, you get the sequence in which the
+    elements should be drawn.
+
+    \image javastyle/pushbutton.png The style structure for push buttons
+
+    The layout of the buttons, with regard element bounds, varies from
+    style to style. This makes it difficult to show conceptual images
+    of this. Also, elements may - even be intended to - have the same
+    bounds; the PE_PushButtonBevel, for instance, is used in
+    QCommonStyle to draw the elements that contains it:
+    PE_FrameDefaultButton, PE_FrameButtonBevel, and
+    PE_PanelButtonCommand, all of which have the same bounds in common
+    and windows style.  PE_PushButtonBevel is also responsible for
+    drawing the menu indicator (QCommonStyle draws
+    PE_IndicatorArrowDown).
+
+    An image of a push button in the java style that show the bounding
+    rectangles of the elements is given below. Colors are used to
+    separate the bounding rectangles in the image; they do not fill
+    any other purpose. This is also true for similar images for the
+    other widgets.
+
+    \image javastyle/button.png
+
+    The java style, as well as all other styles implemented in Qt,
+    does not use PE_FrameButtonBevel. It is usual that a button
+    with a PE_DefaultFrame adjusts the PE_PanelButtonCommand's
+    rectangle by PM_ButtonDefaultIndicator. The CE_PushButtonLabel
+    is found by adjusting the rect by PM_DefaultFrameWidth.
+
+    We will now examine the style option for push
+    buttons - QStyleOptionButton. A table for the states that
+    QPushButton can set on the style option follows:
+
+    \table 90%
+        \header
+            \o State
+            \o State Set When
+        \row
+            \o State_Sunken
+            \o Button is down or menu is pressed shown
+        \row
+            \o State_On
+            \o Button is checked
+        \row
+            \o State_Raised
+            \o Button is not flat and not pressed down
+    \endtable
+
+    Other members of QStyleOptionButton is:
+
+    \table 90%
+        \header
+            \o Member
+            \o Content
+        \row
+            \o features
+            \o Flags of the QStyleOptionButton::ButtonFeatures enum,
+               which describes various button properties (see enum)
+        \row
+            \o icon
+            \o The buttons QIcon (if any)
+        \row
+            \o iconSize
+            \o The QSize of the icon
+        \row
+            \o text
+            \o a QString with the buttons text
+    \endtable
+
+    \section3 Check and Radio Buttons
+
+    The structures for radio and check buttons are identical.
+    We show the structure using QCheckBox element and pixel
+    metric names:
+
+    \image javastyle/checkbox.png
+
+    QStyleOptionButton is used as the style option for both check
+    and radio buttons. We first give a table of the states that
+    can be set in the option:
+
+    \table 90%
+        \header
+            \o State
+            \o State Set When
+        \row
+            \o State_sunken
+            \o The box is pressed down
+        \row
+            \o State_NoChange
+            \o The box is partially checked (for tristate
+               checkboxes.)
+        \row
+            \o State_On
+            \o The box is checked
+        \row
+            \o State_Off
+            \o The box is unchecked
+    \endtable
+
+    See \l{Push Buttons} for a table over other members in the
+    QStyleOptionButtonClass.
+
+    \section3 Tabs
+
+    In Qt, QTabBar uses the style to draw its tabs. Tabs exist either
+    in a QTabWidget, which contains a QTabBar, or as a separate bar.
+    If the bar is not part of a tab widget, it draws its own base.
+
+    QTabBar lays out the tabs, so the style does not have control over
+    tab placement. However, while laying out its tabs, the bar asks
+    the style for PM_TabBarTabHSpace and PM_TabBarTabVSpace, which is
+    extra width and height over the minimum size of the tab bar tab
+    label (icon and text). The style can also further influence the
+    tab size before it is laid out, as the tab bar asks for
+    CT_TabBarTab. The bounding rectangle of the bar is decided by the
+    tab widget when it is part of the widget (still considering
+    CT_TabBarTab).
+
+    The tab bar is responsible for drawing the buttons that appear on
+    the tab bar when all tabs do not fit. Their placement is not
+    controlled by the style, but the buttons are \l{QToolButton}s
+    and are therefore drawn by the style.
+
+    Here is the style structure for QTabWidget and QTabBar:
+
+    \image javastyle/tab.png
+
+    The dotted lines indicate that the QTabWidget contains a tab bar,
+    but does not draw it itself, that QTabBar only draws its base line
+    when not part of a tab widget, and that the tab bar keeps two tool
+    buttons that scroll the bar when all tabs do not fit; see \l{Tool
+    Buttons} for their element tree. Also note that since the buttons
+    are children of the tab bar, they are drawn after the bar. The
+    tabs bounding rectangles overlap the base by PM_TabBarBaseOverlap.
+
+    Here is a tab widget in the java style:
+
+    \image javastyle/tabwidget.png
+
+    In the java style (and also windows), the tab bar shape and label
+    have the same bounding rectangle as CE_TabBarTab. Notice that the
+    tabs overlap with the tab widget frame. The base of the tab bar
+    (if drawn) is the area where the tabs and frame overlap.
+
+    The style option for tabs (QStyleOptionTab) contains the necessary
+    information for drawing tabs. The option contains the position of
+    the tab in the tab bar, the position of the selected tab, the
+    shape of the tab, the text, and icon. After Qt 4.1 the option
+    should be cast to a QStyleOptionTabV2, which also contains the
+    icons size.
+
+    As the java style tabs don't overlap, we also present an image of
+    a tab widget in the windows style. Note that if you want the tabs
+    to overlap horizontally, you do that when drawing the tabs in
+    CE_TabBarTabShape; the tabs bounding rectangles will not be
+    altered by the tab bar. The tabs are drawn from left to right in a
+    north tab bar shape, top to bottom in an east tab bar shape, etc.
+    The selected tab is drawn last, so that it is easy to draw it over
+    the other tabs (if it is to be bigger).
+
+    \image javastyle/windowstabimage.png
+
+    A table of the states a tab bar can set on its tabs follows:
+
+    \table 90%
+        \header
+            \o State
+            \o State Set When
+        \row
+            \o State_Sunken
+            \o The tab is pressed on with the mouse.
+        \row
+            \o State_Selected
+            \o If it is the current tab.
+        \row
+            \o State_HasFocus
+            \o The tab bar has focus and the tab is selected
+    \endtable
+
+    Note that individual tabs may be disabled even if the tab bar
+    is not. The tab will be active if the tab bar is active.
+
+    Here follows a table of QStyleOptionTabV2's members:
+
+    \table 90%
+        \header
+            \o Member
+            \o Content
+        \row
+            \o cornerWidgets
+            \o Is flags of the CornerWidget enum, which indicate
+               if and which corner widgets the tab bar has.
+        \row
+            \o icon
+            \o The QIcon of the tab
+        \row
+            \o iconSize
+            \o The QSize of the icon
+        \row
+            \o position
+            \o A TabPosition enum value that indicates the tabs
+               position on the bar relative to the other tabs.
+        \row
+            \o row
+            \o holds which row the tab is in
+        \row
+            \o selectedPosition
+            \o A value of the SelectedPosition enum that indicates
+               whether the selected tab is adjacent to or is the
+               tab.
+        \row
+            \o shape
+            \o A value of the QTabBar::Shape enum indication
+               whether the tab has rounded or triangular corners
+               and the orientation of the tab.
+        \row
+            \o text
+            \o The tab text
+    \endtable
+
+    The frame for tab widgets use QStyleOptionTabWidgetFrame as
+    style option. We list its members here. It does not have
+    states set besides the common flags.
+
+    \table 90%
+        \header
+            \o Member
+            \o content
+        \row
+            \o leftCornerWidgetSize
+            \o The QSize of the left corner widget (if any).
+        \row
+            \o rightCornerWidgetSize
+            \o The QSize of the right corner widget (if any).
+        \row
+            \o lineWidth
+            \o holds the line with for drawing the panel.
+        \row
+            \o midLineWith
+            \o this value is currently always 0.
+        \row
+            \o shape
+            \o The shape of the tabs on the tab bar.
+        \row
+            \o tabBarSize
+            \o The QSize of the tab bar.
+    \endtable
+
+    \section3 Scroll Bars
+
+    Here is the style structure for scrollBars:
+
+    \image javastyle/scrollbar.png
+
+    QScrollBar simply creates its style option and then draws
+    CC_ScrollBar. Some styles draw the background of add page and sub
+    page with PE_PanelButtonBevel and also use indicator arrows to
+    draw the arrows in the nest and previous line indicators; we have
+    not included these in the tree as their use is up to the
+    individual style. The style's PM_MaximumDragDistance is the
+    maximum distance in pixels the mouse can move from the bounds
+    of the scroll bar and still move the handle.
+
+    Here is an image of a scrollbar in the java style:
+
+    \image javastyle/scrollbarimage.png
+
+    You may notice that the scrollbar is slightly different from
+    Java's as it has two line up indicators. We have done this to show
+    how that you can have two separate bounding rectangles for a
+    single sub control. The scroll bar is an example of a widget that
+    is entirely implemented by the java style - neither QWindowsStyle
+    nor QCommonStyle are involved in the drawing.
+
+    We have a look at the different states a scroll bar can set on
+    the style option:
+
+    \table 90%
+        \header
+            \o State
+            \o State Set When
+        \row
+            \o State_Horizontal
+            \o The scroll bar is horizontal
+    \endtable
+
+    The style option of QScrollBar is QStyleOptionSlider. Its
+    members are listed in the following table. The option is used
+    by all \l{QAbstractSlider}s; we only describe the members
+    relevant for scroll bars here.
+
+    \table 90%
+        \header
+            \o Member
+            \o Content
+        \row
+            \o maximum
+            \o the maximum value of the scroll bar
+        \row
+            \o minimum
+            \o the minimum value of the scroll bar
+        \row
+            \o notchTarget
+            \o the number of pixels between notches
+        \row
+            \o orientation
+            \o a value of the Qt::Orientation enum that specifies
+               whether the scroll bar is vertical or horizontal
+        \row
+            \o pageStep
+            \o the number to increase or decrease the sliders
+               value (relative to the size of the slider and its value
+               range) on page steps.
+        \row
+            \o singleStep
+            \o the number to increase or decrease the sliders
+               value on single (or line) steps
+        \row
+            \o sliderValue
+            \o The value of the slider
+        \row
+            \o sliderPosition
+            \o the position of the slider handle. This is the same
+               as \c sliderValue if the scroll bar is
+               QAbstractSlider::tracking. If not, the scroll
+               bar does not update its value before the mouse
+               releases the handle.
+        \row
+            \o upsideDown
+            \o holds the direction in which the scroll bar
+               increases its value. This is used instead of
+               QStyleOption::direction for all abstract sliders.
+    \endtable
+
+    \section3 Sliders
+
+    When calculating the sliders size hint, PM_SliderTickness and
+    PM_SliderLength is queried from the style. As with scroll bars,
+    the QSlider only lets the user move the handle if the mouse is
+    within PM_MaximumDragDistance from the slider bounds. When it
+    draws itself it creates the style option and calls \c
+    drawComplexControl() with CC_Slider:
+
+    \image javastyle/slider.png
+
+    We also show a picture of a slider in the java style. We show
+    the bounding rectangles of the sub elements as all drawing is done
+    in CC_Slider.
+
+    \image javastyle/sliderimage.png
+
+    QSlider uses QStyleOptionSlider as all \l{QAbstractSlider}s do. We
+    present a table with the members that affect QSlider:
+
+    \table 90%
+        \header
+            \o Member
+            \o Content
+        \row
+            \o maximum
+            \o the maximum value of the slider
+        \row
+            \o minimum
+            \o the minimum value of the slider
+        \row
+            \o notchTarget
+            \o this is the number of pixels between each notch
+        \row
+            \o orientation
+            \o a Qt::Orientation enum value that gives whether the
+               slider is vertical or horizontal.
+        \row
+            \o pageStep
+            \o a number in slider value to increase or decrease
+               for page steps
+        \row
+            \o singleStep
+            \o the number to increase or decrease the sliders
+               value on single (or line) steps.
+        \row
+            \o sliderValue
+            \o the value of the slider.
+        \row
+            \o sliderPosition
+            \o the position of the slider given as a slider value.
+               This  will be equal to the \c sliderValue if the
+               slider is \l{QAbstractSlider::}{tracking}; if
+               not, the sliders value will not change until the handle is
+               released with the mouse.
+        \row
+            \o  upsideDown
+            \o  this member is used instead of QStyleOption::direction
+                for all abstract sliders.
+    \endtable
+
+    You should note that the slider does not use direction for
+    reverse layouts; it uses \c upsideDown.
+
+    \section3 Spin Boxes
+
+    When QSpinBox paints itself it creates a QStyleOptionSpinBox and
+    asks the style to draw CC_SpinBox. The edit field is a line
+    edit that is a child of the spin box. The dimensions of the
+    field is calculated by the style with SC_SpinBoxEditField.
+
+    Here follows the style tree for spin boxes. It is not
+    required that a style uses the button panel primitive to paint
+    the indicator backgrounds. You can see an image below the tree
+    showing the sub elements in QSpinBox in the java style.
+
+    \image javastyle/spinbox.png
+
+    \image javastyle/spinboximage.png
+
+    The QStyleOptionSpinBox, which is the style option for spin
+    boxes. It can set the following states on the spin box.:
+
+    \table 90%
+        \header
+            \o State
+            \o State Set When
+        \row
+            \o State_Sunken
+            \o Is set if one of the sub controls CC_SpinUp or
+               CC_SpinDown is pressed on with the mouse.
+    \endtable
+
+    The rest of the members in the spin boxes style options are:
+
+    \table 90%
+        \header
+            \o Property
+            \o Function
+        \row
+            \o frame
+            \o boolean that is true if the spin box is to draw a
+               frame.
+        \row
+            \o buttonSymbols
+            \o Value of the ButtonSymbols enum that decides the
+               symbol on the up/down buttons.
+        \row
+            \o stepEnabled
+            \o A value of the StepEnabled indication which of the
+               spin box buttons are pressed down.
+    \endtable
+
+    \section3 Title Bar
+
+    The title bar complex control, CC_TitleBar, is used to draw
+    the title bars of internal windows in QMdiArea. It typically
+    consists of a window title and close, minimize, system menu, and
+    maximize buttons. Some styles also provide buttons for shading
+    the window, and a button for context sensitive help.
+
+    The bar is drawn in CC_TitleBar without using any sub elements.
+    How the individual styles draw their buttons is individual, but
+    there are standard pixmaps for the buttons that the style should
+    provide.
+
+    \image javastyle/titlebar.png
+
+    In an image over a title bar in the java style, we show the
+    bounding rectangles of the sub elements supported by the java style
+    (all of which are drawn with standard pixmaps). It is usual to
+    draw the button backgrounds using PE_PanelButtonTool, but it's no
+    rule.
+
+    \image javastyle/titlebarimage.png
+
+    The style option for title bars is QStyleOptionTitleBar. It's
+    members are:
+
+    \table 90%
+        \header
+            \o Member
+            \o Content
+        \row
+            \o icon
+            \o The title bars icon
+        \row
+            \o text
+            \o the text for the title bar's label
+        \row
+            \o windowFlags
+            \o flags of the Qt::WindowFlag enum. The window flags
+               used by QMdiArea for window management.
+        \row
+            \o titleBarState
+            \o this is the QWidget::windowState() of the window
+               that contains the title bar.
+    \endtable
+
+    \section3 Combo Box
+
+    A QComboBox uses the style to draw the button and label of
+    non-editable boxes with CC_ComboBox and CE_ComboBoxLabel.
+
+    The list that pops up when the user clicks on the combo box is
+    drawn by a \l{Delegate Classes}{delegate}, which we do not cover
+    in this overview. You can, however, use the style to control the
+    list's size and position with the sub element
+    SC_ComboBoxListBoxPopup. The style also decides where the edit
+    field for editable boxes should be with SC_ComboBoxEditField; the
+    field itself is a QLineEdit that is a child of the combo box.
+
+    \image javastyle/combobox.png
+
+    We show an image over a java style combo box in which we have
+    outlined its sub elements and sub element rectangles:
+
+    \image javastyle/comboboximage.png
+
+    Java combo boxes do not use the focus rect; it changes its
+    background color when it has focus. The SC_ComboBoxEdit field is
+    used both by QComboBox to calculate the size of the edit field and
+    the style for calculating the size of the combo box label.
+
+    The style option for combo boxes is QStyleOptionComboBox. It
+    can set the following states:
+
+    \table 90%
+        \header
+            \o State
+            \o Set When
+        \row
+            \o State_Selected
+            \o The box is not editable and has focus
+        \row
+            \o State_Sunken
+            \o SC_ComboBoxArrow is active
+        \row
+            \o State_on
+            \o The container (list) of the box is visible
+    \endtable
+
+    The style options other members are:
+
+    \table
+        \header
+            \o Member
+            \o Content
+        \row
+            \o currentIcon
+            \o the icon of the current (selected) item of the
+               combo box.
+        \row
+            \o currentText
+            \o the text of the current item in the box.
+        \row
+            \o editable
+            \o holds whether the combo box is editable or not
+        \row
+            \o frame
+            \o holds whether the combo box has a frame or not
+        \row
+            \o iconSize
+            \o the size of the current items icon.
+        \row
+            \o popupRect
+            \o the bounding rectangle of the combo box's popup
+               list.
+    \endtable
+
+    \section3 Group Boxes
+
+    When calculating the size hint, QGroupBox fetches three pixel
+    metrics from the style: PM_IndicatorWidth,
+    PM_CheckBoxLabelSpacing, and PM_IndicatorHeight.  QGroupBox has
+    the following style element tree:
+
+    \image javastyle/groupbox.png
+
+    Qt does not impose restrictions on how the check box is drawn; the
+    java style draws it with CE_IndicatorCheckBox. See \l{Check and
+    Radio Buttons} for the complete tree.
+
+    We also give an image of the widget with the sub controls and
+    sub control rectangles drawn:
+
+    \image javastyle/groupboximage.png
+
+    The style option for group boxes are QStyleOptionGroupBox. The
+    following states can be set on it:
+
+    \table 90%
+        \header
+            \o State
+            \o Set When
+        \row
+            \o State_On
+            \o The check box is checked
+        \row
+            \o State_Sunken
+            \o The checkbox is pressed down
+        \row
+            \o State_Off
+            \o The check box is unchecked (or there is no check box)
+    \endtable
+
+    The remaining members of QStyleOptionGroupBox are:
+
+    \table
+        \header
+            \o Member
+            \o Content
+        \row
+            \o features
+            \o flags of the QStyleOptionFrameV2::FrameFeatures
+               enum describing the frame of the group box.
+        \row
+            \o lineWidth
+            \o the line width with which to draw the panel. This
+               is always 1.
+        \row
+            \o text
+            \o the text of the group box.
+        \row
+            \o textAlignment
+            \o the alignment of the group box title
+        \row
+            \o textColor
+            \o the QColor of the text
+    \endtable
+
+    \section3 Splitters
+
+    As the structure of splitters are simple and do not contain any
+    sub elements, we do not include image of splitters. CE_Splitter
+    does not use any other elements or metrics.
+
+    For its style option, Splitters uses the base class QStyleOption.
+    It can set the following state flags on it:
+
+    \table 90%
+        \header
+            \o State
+            \o Set When
+        \row
+            \o State_Horizontal
+            \o Set if it is a horizontal splitter
+    \endtable
+
+    QSplitter does not use \l{QStyleOption::}{init()} to set up its
+    option; it sets the State_MouseOver and State_Disabled flags
+    itself.
+
+    \section3 Progress Bar
+
+    The CE_ProgressBar element is used by QProgressBar, and it is the
+    only element used by this widget. We start with looking at the
+    style structure:
+
+    \image javastyle/progressbar.png
+
+    Here is a progress bar in the windows style (the java style
+    bounding rectangles are equal):
+
+    \image javastyle/progressbarimage.png
+
+    The style option for QProgressBar is QStyleOptionProgressBarV2.
+    The bar does not set any state flags, but the other members of the
+    option are:
+
+    \table 90%
+        \header
+            \o Member
+            \o Content
+        \row
+            \o minimum
+            \o The minimum value of the bar
+        \row
+            \o maximum
+            \o The maximum value of the bar
+        \row
+            \o progress
+            \o The current value of the bar
+        \row
+            \o textAlignment
+            \o How the text is aligned in the label
+        \row
+            \o textVisible
+            \o Whether the label is drawn
+        \row
+            \o text
+            \o The label text
+        \row
+            \o orientation
+            \o Progress bars can be vertical or horizontal
+        \row
+            \o invertedAppearance
+            \o The progress is inverted (i.e., right to left in a
+               horizontal bar)
+        \row
+            \o bottomToTop
+            \o Boolean that if true, turns the label of vertical
+               progress bars 90 degrees.
+    \endtable
+
+    \section3 Tool Buttons
+
+    Tool buttons exist either independently or as part of tool bars.
+    They are drawn equally either way. The QToolButton draws only one
+    style element: CC_ToolButton.
+
+    As you must be used to by now (at least if you have read this
+    document sequentially), we have a tree of the widget's style
+    structure:
+
+    \image javastyle/toolbutton.png
+
+    Note that PE_FrameButtonTool and PE_IndicatorArrowDown are
+    included in the tree as the java style draws them, but they can
+    safely be omitted if you prefer it. The structure may also be
+    different. QWindowsStyle, for instance, draws both
+    PE_IndicatorButtonDropDown and PE_IndicatorArrowDown in
+    CE_ToolButton.
+
+    We also have an image of a tool button where we have outlined
+    the sub element bounding rectangles and sub controls.
+
+    \image javastyle/toolbuttonimage.png
+
+    Here is the states table for tool buttons:
+
+    \table 90%
+        \header
+            \o State
+            \o Set When
+        \row
+            \o State_AutoRise
+            \o the tool button has the autoRise property set
+        \row
+            \o State_raised
+            \o the button is not sunken (i.e., by being checked or
+               pressed on with the mouse).
+        \row
+            \o State_Sunken
+            \o the button is down
+        \row
+            \o State_On
+            \o the button is checkable and checked.
+    \endtable
+
+    QStyleOptionToolButton also contains the following members:
+
+    \table
+        \header
+            \o Member
+            \o Content
+        \row
+            \o arrowType
+            \o a Qt::ArrowType enum value, which contains the
+                 direction of the buttons arrow (if an arrow is to
+                 be used in place of an icon)
+        \row
+            \o features
+            \o flags of the QStyleOptionToolButton::ButtonFeature
+               enum describing if the button has an arrow, a menu,
+               and/or has a popup-delay.
+        \row
+            \o font
+            \o the QFont of the buttons label
+        \row
+            \o icon
+            \o the QIcon of the tool button
+        \row
+            \o iconSize
+            \o the icon size of the button's icon
+        \row
+            \o pos
+            \o the position of the button, as given by
+               QWidget::pos()
+        \row
+            \o text
+            \o the text of the button
+        \row
+            \o toolButtonStyle
+            \o a Qt::ToolButtonStyle enum value which decides
+               whether the button shows the icon, the text, or both.
+    \endtable
+
+    \section3 Toolbars
+
+    Toolbars are part of the \l{QMainWindow}{main window framework}
+    and cooperates with the QMainWindow to which it belongs while it
+    builds its style option. A main window has 4 areas that toolbars
+    can be placed in. They are positioned next to the four sides of
+    the window (i.e., north, south, west, and east). Within each area
+    there can be more than one line of toolbars; a line consists of
+    toolbars with equal orientation (vertical or horizontal) placed
+    next to each other.
+
+    \l{QToolbar}{QToolbar}s in Qt consists of three elements
+    CE_ToolBar, PE_IndicatorToolBarHandle, and
+    PE_IndicatorToolBarSeparator. It is QMainWindowLayout that
+    calculates the bounding rectangles (i.e., position and size of the
+    toolbars and their contents. The main window also uses the \c
+    sizeHint() of the items in the toolbars when calculating the size
+    of the bars.
+
+    Here is the element tree for QToolBar:
+
+    \image javastyle/toolbar.png
+
+    The dotted lines indicate that the QToolBar keeps an instance of
+    QToolBarLayout and that QToolBarSeparators are kept by
+    QToolBarLayout. When the toolbar is floating (i.e., has its own
+    window) the PE_FrameMenu element is drawn, else QToolbar draws
+    CE_ToolBar.
+
+    Here is an image of a toolbar in the java style:
+
+    \image javastyle/toolbarimage.png
+
+    QToolBarSaparator uses QStyleOption for their style option. It
+    sets the State_horizontal flag if the toolbar they live in is
+    horizontal. Other than that, they use \l{QStyleOption::}{init()}.
+
+    The style option for QToolBar is QStyleOptionToolBar. The only
+    state flag set (besides the common flags) is State_Horizontal
+    if the bar is horizontal (i.e., in the north or south toolbar area).
+    The member variables of the style option are:
+
+    \table 90%
+        \header
+            \o Member
+            \o Content
+        \row
+            \o features
+            \o Holds whether the bar is movable in a value of the
+               ToolBarFeature, which is either Movable or None.
+        \row
+            \o lineWidth
+            \o The width of the tool bar frame.
+        \row
+            \o midLineWidth
+            \o This variable is currently not used and is always
+               0.
+        \row
+            \o positionOfLine
+            \o The position of the toolbar line within the toolbar
+               area to which it belongs.
+        \row
+            \o positionWithinLine
+            \o The position of the toolbar within the toolbar line.
+        \row
+            \o toolBarArea
+            \o The toolbar area in which the toolbar lives.
+    \endtable
+
+    \section3 Menus
+
+    Menus in Qt are implemented in QMenu. The QMenu keeps a list of
+    action, which it draws as menu items. When QMenu receives paint
+    events ,it calculates the size of each menu item and draws them
+    individually with CE_MenuItem. (Menu items do not have a separate
+    element for their label (contents), so all drawing is done in
+    CE_MenuItem. The menu also draws the frame of the menu with
+    PE_FrameMenu. It also draws CE_MenuScroller if the style supports
+    scrolling. CE_MenuTearOff is drawn if the menu is to large for its
+    bounding rectangle.
+
+    In the style structure tree, we also include QMenu as it also does
+    styling related work. The bounding rectangles of menu items are
+    calculated for the menus size hint and when the menu is displayed
+    or resized.
+
+    \image javastyle/menu.png
+
+    The CE_MenuScroller and CE_MenuTearOff elements are handled by
+    QCommonStyle and are not shown unless the menu is to large to fit
+    on the screen. PE_FrameMenu is only drawn for pop-up menus.
+
+    QMenu calculates rectangles based on its actions and calls
+    CE_MenuItem and CE_MenuScroller if the style supports that.
+
+    It is also usual to use PE_IndicatorCheckBox (instead of using
+    PE_IndicatorMenuCheckMark) and PE_IndicatorRadioButton for drawing
+    checkable menu items; we have not included them in the style tree
+    as this is optional and varies from style to style.
+
+    \image javastyle/menuimage.png
+
+    The style option for menu items is QStyleOptionMenuItem. The
+    following tables describe its state flags and other members.
+
+    \table 90%
+        \header
+            \o State
+            \o Set When
+        \row
+            \o State_Selected
+            \o The mouse is over the action and the action is not
+               a separator.
+        \row
+            \o State_Sunken
+            \o The mouse is pressed down on the menu item.
+        \row
+            \o State_DownArrow
+            \o Set if the menu item is a menu scroller and it scrolls
+               the menu downwards.
+    \endtable
+
+    \table 90%
+        \header
+            \o Member
+            \o Content
+        \row
+            \o checkType
+            \o A value of the \l{QStyleOptionMenuItem::}{CheckType} enum,
+               which is either NotCheckable, Exclusive, or
+               NonExclusive.
+        \row
+            \o checked
+            \o Boolean that is true if the menu item is checked.
+        \row
+            \o font
+            \o The QFont to use for the menu item's text.
+        \row
+            \o icon
+            \o the QIcon of the menu item.
+        \row
+            \o maxIconWidth
+            \o The maximum width allowed for the icon
+        \row
+            \o menuHasChecableItem
+            \o Boolean which is true if at least one item in the
+               menu is checkable.
+        \row
+            \o menuItemType
+            \o The type of the menu item. This a value of the
+               \l{QStyleOptionMenuItem::}{MenuItemType}.
+        \row
+            \o menuRect
+            \o The bounding rectangle for the QMenu that the menu
+               item lives in.
+        \row
+            \o tabWidth
+            \o This is the distance between the text of the menu
+               item and the shortcut.
+        \row
+            \o text
+            \o The text of the menu item.
+    \endtable
+
+    The setup of the style option for CE_MenuTearOff and
+    CE_MenuScroller also uses QStyleOptionMenuItem; they only set the
+    \c menuRect variable in addition to the common settings with
+    QStyleOption's \l{QStyleOption::}{init()}. 
+
+    \section3 Menu Bar
+
+    QMenuBar uses the style to draw each menu bar item and the empty
+    area of the menu bar. The pull-down menus themselves are
+    \l{QMenu}s (see \l{Menus}). The style element tree for the menu
+    bar follows:
+
+    \image javastyle/menubar.png
+
+    The panel and empty area is drawn after the menu items. The
+    QPainter that the QMenuBar sends to the style has the bounding
+    rectangles of the items clipped out (i.e., clip region), so you
+    don't need to worry about drawing over the items. The pixel
+    metrics in QMenuBar is used when the bounding rectangles of the
+    menu bar items are calculated.
+
+    \image javastyle/menubarimage.png
+
+    QStyleOptionMenuItem is used for menu bar items. The members that
+    are used by QMenuBar is described in the following table:
+
+    \table
+        \header
+            \o Member
+            \o Content
+        \row
+            \o menuRect
+            \o the bounding rectangle of the entire menu bar to
+               which the item belongs.
+        \row
+            \o text
+            \o the text of the item
+        \row
+            \o icon
+            \o the icon of the menu item (it is not common that
+               styles draw this icon)
+    \endtable
+
+    QStyleOptionMenuItem is also used for drawing CE_EmptyMenuBarArea.
+
+    QStyleOptionFrame is used for drawing the panel frame The
+    \l{QStyleOptionFrame::}{lineWidth} is set to PM_MenuBarPanelWidth.
+    The \l{QStyleOptionFrame::}{midLineWidth} is currently always set
+    to 0. 
+
+    \section3 Item View Headers
+
+    It is the style that draws the headers of Qt's item views. The
+    item views keeps the dimensions on individual sections. Also
+    note that the delegates may use the style to paint decorations
+    and frames around items. QItemDelegate, for instance, draws
+    PE_FrameFocusRect and PE_IndicatorViewItemCheck.
+
+    \image javastyle/header.png
+
+    Here is a QTableWidget showing the bounding rects of a Java
+    header:
+
+    \image javastyle/headerimage.png
+
+    The QHeaderView uses CT_HeaderSection, PM_HeaderMargin and
+    PM_HeaderGripMargin for size and hit test calculations. The
+    PM_HeaderMarkSize is currently not used by Qt. QTableView draws
+    the button in the top-left corner (i.e., the area where the
+    vertical and horizontal headers intersect) as a CE_Header.
+
+    The style option for header views is QStyleOptionHeader. The view
+    paints one header section at a time, so the data is for the
+    section being drawn. Its contents are:
+
+    \table 90%
+        \header
+            \o Member
+            \o Content
+        \row
+            \o icon
+            \o the icon of the header (for section that is being
+               drawn).
+        \row
+            \o iconAlignment
+            \o the alignment (Qt::Alignment) of the icon in the header.
+        \row
+            \o orientation
+            \o a Qt::Orientation value deciding whether the header
+               is the horizontal header above the view or the
+               vertical header on the left.
+        \row
+            \o position
+            \o a QStyleOptionHeader::SectionPosition value
+               giving the header section's position relative to
+               the other sections.
+        \row
+            \o section
+            \o holds the section that is being drawn.
+        \row
+            \o selectedPosition
+            \o a QStyleOptionHeader::SelectedPosition value giving
+               the selected section's position relative to the
+               section that is being painted.
+        \row
+            \o sortIndicator
+            \o a QStyleOptionHeader::SortIndicator value that
+               describes the direction in which the section's sort
+               indicator should be drawn.
+        \row
+            \o text
+            \o the text of the currently drawn section.
+        \row
+            \o textAlignment
+            \o the Qt::Alignment of the text within the
+               headersection.
+    \endtable
+
+    \section3 Tree Branch Indicators
+
+    The branch indicators in a tree view is drawn by the style with
+    PE_IndicatorBranch. We think of indicators here as the indicators
+    that describe the relationship of the nodes in the tree. The
+    generic QStyleOption is sent to the style for drawing this
+    elements. The various branch types are described by states. Since
+    there are no specific style option, we simply present the states
+    table:
+
+    \table 90%
+        \header
+            \o State
+            \o Set When
+        \row
+            \o State_Sibling
+            \o the node in the tree has a sibling (i.e., there is
+               another node in the same column).
+        \row
+            \o State_Item
+            \o this branch indicator has an item.
+        \row
+            \o State_Children
+            \o the branch has children (i.e., a new sub-tree can
+               be opened at the branch).
+        \row
+            \o State_Open
+            \o the branch indicator has an opened sub-tree.
+    \endtable
+
+    The tree view (and tree widget) use the style to draw the branches
+    (or nodes if you will) of the tree.
+
+    QStyleOption is used as the style for PE_IndicatorBranch has state
+    flags set depending on what type of branch it is.
+
+    Since there is no tree structure for branch indicators, we only
+    present an image of a tree in the java style. Each state is marked
+    in the image with a rectangle in a specific color (i.e., these
+    rectangles are not bounding rectangles). All combinations of
+    states you must be aware of are represented in the image.
+
+    \image javastyle/branchindicatorimage.png
+
+    \section3 Tool Boxes
+
+    PM_SmallIconSize for sizeHints.
+
+    QToolBox is a container that keeps a collection of widgets. It has
+    one tab for each widget and display one of them at a time. The
+    tool box lays the components it displays (the tool box buttons
+    and selected widget) in a QVBoxLayout. The style tree for tool
+    boxes looks like this:
+
+    \image javastyle/toolbox.png
+
+    We show an image of a tool box in the Plastique style:
+
+    \image javastyle/toolboximage.png
+
+    All elements have the same bounding rectangles in the
+    Plastique as well as the other Qt built-in styles.
+
+    The style option for tool boxes is QStyleOptionToolBox. It
+    contains the text and icon of the tool box contents. The only
+    state set by QToolBox is State_Sunken, which is set when the user
+    presses a tab down with the mouse. The rest of the
+    QStyleOptionToolBox members are:
+
+    \table 90%
+        \header
+            \o Member
+            \o Content
+        \row
+            \o icon
+            \o the icon on the toolbox tab
+        \row
+            \o text
+            \o the text on the toolbox tab
+    \endtable
+
+    \section3 Size Grip
+
+    The size grip calculates its size hint with CT_SizeGrip. The pixel
+    metric PM_SizeGripSize is currently unused by Qt. The element tree
+    for and an image in the Plastique style of QSizeGrip follows:
+
+    \image javastyle/sizegrip.png
+
+    \image javastyle/sizegripimage.png
+
+    We show the size grip in a \l{QMainWindow}'s bottom right
+    corner.
+
+    The size grip style option, QStyleOptionSizeGrip, have one
+    member except the common members from QStyleOption:
+
+    \table 90%
+        \header
+            \o Member
+            \o Content
+        \row
+            \o corner
+            \o a Qt::Corner value that describe which corner in a
+               window (or equivalent) the grip is located.
+    \endtable
+
+    \section3 Rubber Band
+
+    The \l{QRubberBand}'s style tree consists of two nodes.
+
+    \image javastyle/rubberband.png
+
+    We present an image of a Java style window being moved in a
+    QMdiArea with a rubber band:
+
+    \image javastyle/rubberbandimage.png
+
+    The style option for rubber bands is QStyleOptionRubberBand.
+    Its members are:
+
+    \table
+        \header
+            \o Member
+            \o Content
+        \row
+            \o opaque
+            \o boolean that is true if the rubber band must be
+               drawn in an opaque style (i.e., color)
+        \row
+            \o shape
+            \o a QRubberBand::Shape enum value that holds the
+               shape of the band (which is either a rectangle or a
+               line) 
+    \endtable
+
+    \section3 Dock Widgets
+
+    When the dock widget lays out its contents it asks the style for
+    these pixel metrics: PM_DockWidgetSeparatorExtent,
+    PM_DockWidgetTitleBarButtonMargin, PM_DockWidgetFrameWidth, and
+    PM_DockWidgetTitleMargin. It also calculates the bounding
+    rectangles of the float and close buttons with
+    SE_DockWidgetCloseButton and SE_DockWidgetFloatButton.
+
+    \image javastyle/dockwidget.png
+
+    The dotted lines indicate that the sender keeps instances of the
+    recipient of the arrow (i.e., it is not a style element to draw).
+    The dock widget only draws PE_frameDockWidget when it is detached
+    from its main window (i.e., it is a top level window). If it is
+    docked it draws the indicator dock widget resize handle. We show a
+    dock widget in both docked and floating state in the plastique
+    style: 
+
+    \image javastyle/dockwidgetimage.png
+
+    The style option is QStyleOptionDockWidget:
+
+    \table 90%
+        \header
+            \o Member
+            \o Content
+        \row
+            \o closeable
+            \o boolean that holds whether the dock window can be
+               closed
+        \row
+            \o floatable
+            \o boolean that holds whether the dock window can
+               float (i.e., detach from the main window in which
+               it lives)
+        \row
+            \o movable
+            \o boolean that holds whether the window is movable
+               (i.e., can move to other dock widget areas)
+        \row
+            \o title
+            \o the title text of the dock window
+    \endtable
+
+    For the buttons, QStyleOptionButton is used (see \l{Tool Buttons}
+    for content description). The dock widget resize handle has a
+    plain QStyleOption.
+*/
diff --git a/doc/src/stylesheet.qdoc b/doc/src/stylesheet.qdoc
new file mode 100644
index 0000000000..c0d13da186
--- /dev/null
+++ b/doc/src/stylesheet.qdoc
@@ -0,0 +1,3964 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page stylesheet.html
+    \startpage index.html QtReference Documentation
+    \nextpage The Style Sheet Syntax
+    \title Qt Style Sheets
+    \ingroup architecture
+    \brief How to use style sheets to customize the appearance of widgets.
+
+    \keyword style sheet
+    \keyword stylesheet
+
+    Qt Style Sheets are a powerful mechanism that allows you to
+    customize the appearance of widgets, in addition to what is
+    already possible by subclassing QStyle. The concepts,
+    terminology, and syntax of Qt Style Sheets are heavily inspired
+    by HTML \l{http://www.w3.org/Style/CSS/}{Cascading Style Sheets
+    (CSS)} but adapted to the world of widgets.
+
+    Topics:
+
+    \list
+    \i \l{Overview}
+    \i \l{The Style Sheet Syntax}
+    \tableofcontents{1 The Style Sheet Syntax}
+    \i \l{Qt Designer Integration}
+    \tableofcontents{1 Qt Designer Integration}
+    \i \l{Customizing Qt Widgets Using Style Sheets}
+    \tableofcontents{1 Customizing Qt Widgets Using Style Sheets}
+    \i \l{Qt Style Sheets Reference}
+    \tableofcontents{1 Qt Style Sheets Reference}
+    \i \l{Qt Style Sheets Examples}
+    \tableofcontents{1 Qt Style Sheets Examples}
+    \endlist
+
+    \target overview
+    \section1 Overview
+
+    Styles sheets are textual specifications that can be set on the
+    whole application using QApplication::setStyleSheet() or on a
+    specific widget (and its children) using
+    QWidget::setStyleSheet(). If several style sheets are set at
+    different levels, Qt derives the effective style sheet from all
+    of those that are set. This is called cascading.
+
+    For example, the following style sheet specifies that all
+    \l{QLineEdit}s should use yellow as their background color, and
+    all \l{QCheckBox}es should use red as the text color:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 0
+
+    For this kind of customization, style sheets are much more
+    powerful than QPalette. For example, it might be tempting to set
+    the QPalette::Button role to red for a QPushButton to obtain a
+    red push button. However, this wasn't guaranteed to work for all
+    styles, because style authors are restricted by the different
+    platforms' guidelines and (on Windows XP and Mac OS X) by the
+    native theme engine.
+
+    Style sheets let you perform all kinds of customizations that are
+    difficult or impossible to perform using QPalette alone. If you
+    want yellow backgrounds for mandatory fields, red text for
+    potentially destructive push buttons, or fancy check boxes, style
+    sheets are the answer.
+
+    Style sheets are applied on top of the current \l{QStyle}{widget
+    style}, meaning that your applications will look as native as
+    possible, but any style sheet constraints will be taken into
+    consideration. Unlike palette fiddling, style sheets offer
+    guarantees: If you set the background color of a QPushButton to be
+    red, you can be assured that the button will have a red background
+    in all styles, on all platforms. In addition, \l{Qt Designer}
+    provides style sheet integration, making it easy to view the effects
+    of a style sheet in different \l{QStyle}{widget styles}.
+
+    In addition, style sheets can be used to provide a distinctive
+    look and feel for your application, without having to subclass
+    QStyle. For example, you can specify arbitrary images for radio
+    buttons and check boxes to make them stand out. Using this
+    technique, you can also achieve minor customizations that would
+    normally require subclassing several style classes, such as
+    specifying a \l{QStyle::styleHint()}{style hint}. The
+    \l{widgets/stylesheet}{Style Sheet} example depicted below defines
+    two distinctive style sheets that you can try out and modify at
+    will.
+
+    \table
+    \row \o \inlineimage stylesheet-coffee-xp.png
+         \o \inlineimage stylesheet-pagefold.png
+    \row \o Coffee theme running on Windows XP
+         \o Pagefold theme running on Windows XP
+    \endtable
+
+    \table
+    \row \o \inlineimage stylesheet-coffee-cleanlooks.png
+         \o \inlineimage stylesheet-pagefold-mac.png
+    \row \o Coffee theme running on Ubuntu Linux
+         \o Pagefold theme running on Mac OS X
+    \endtable
+
+    When a style sheet is active, the QStyle returned by QWidget::style()
+    is a wrapper "style sheet" style, \e not the platform-specific style. The
+    wrapper style ensures that any active style sheet is respected and
+    otherwise forwards the drawing operations to the underlying,
+    platform-specific style (e.g., QWindowsXPStyle on Windows XP).
+
+    Since Qt 4.5, Qt style sheets fully supports Mac OS X.
+
+    \warning Qt style sheets are currently not supported for custom QStyle
+    subclasses. We plan to address this in some future release.
+*/
+
+    /*!
+    \page stylesheet-syntax.html
+    \contentspage {Qt Style Sheet}{Contents}
+    \previouspage Qt Style Sheet
+    \nextpage Qt Designer Integration
+    \title The Style Sheet Syntax
+
+    Qt Style Sheet terminology and syntactic rules are almost
+    identical to those of HTML CSS. If you already know CSS, you can
+    probably skim quickly through this section.
+
+    \section1 Style Rules
+
+    Style sheets consist of a sequence of style rules. A \e{style
+    rule} is made up of a selector and a declaration. The
+    \e{selector} specifies which widgets are affected by the rule;
+    the \e{declaration} specifies which properties should be set on
+    the widget. For example:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 1
+
+    In the above style rule, \c QPushButton is the selector and \c{{
+    color: red }} is the declaration. The rule specifies that
+    QPushButton and its subclasses (e.g., \c MyPushButton) should use
+    red as their foreground color.
+
+    Qt Style Sheet is generally case insensitive (i.e., \c color, 
+    \c Color, \c COLOR, and \c cOloR refer to the same property). 
+    The only exceptions are class names,
+    \l{QObject::setObjectName()}{object names}, and Qt property
+    names, which are case sensitive.
+
+    Several selectors can be specified for the same declaration,
+    using commas (\c{,}) to separate the selectors. For example,
+    the rule
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 2
+
+    is equivalent to this sequence of three rules:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 3
+
+    The declaration part of a style rule is a list of
+    \tt{\e{property}: \e{value}} pairs, enclosed in braces (\c{{}})
+    and separated with semicolons. For example:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 4
+
+    See the \l{List of Properties} section below for the list of
+    properties provided by Qt widgets.
+
+    \section1 Selector Types
+
+    All the examples so far used the simplest type of selector, the
+    Type Selector. Qt Style Sheets support all the
+    \l{http://www.w3.org/TR/REC-CSS2/selector.html#q1}{selectors
+    defined in CSS2}. The table below summarizes the most useful
+    types of selectors.
+
+    \table 100%
+    \header
+        \o Selector
+        \o Example
+        \o Explanation
+
+    \row
+        \o Universal Selector
+        \o \c *
+        \o Matches all widgets.
+
+    \row
+        \o Type Selector
+        \o \c QPushButton
+        \o Matches instances of QPushButton and of its subclasses.
+
+    \row
+        \o Property Selector
+        \o \c{QPushButton[flat="false"]}
+        \o Matches instances of QPushButton that are not
+           \l{QPushButton::}{flat}. You may use this selector to test
+           for any Qt property specified using Q_PROPERTY(). In
+           addition, the special \c class property is supported, for
+           the name of the class.
+            
+           This selector may also be used to test dynamic properties.
+           For more information on customization using dynamic properties,
+           refer to \l{Customizing Using Dynamic Properties}.
+
+           Instead of \c =, you can also use \c ~= to test whether a
+           Qt property of type QStringList contains a given QString.
+
+           \warning If the value of the Qt property changes after the
+           style sheet has been set, it might be necessary to force a
+           style sheet recomputation. One way to achieve this is to
+           unset the style sheet and set it again.
+
+    \row
+        \o Class Selector
+        \o \c .QPushButton
+        \o Matches instances of QPushButton, but not of its subclasses.
+
+           This is equivalent to \c{*[class~="QPushButton"]}.
+
+    \row
+        \o ID \target ID Selector
+           Selector
+        \o \c{QPushButton#okButton}
+        \o Matches all QPushButton instances whose
+           \l{QObject::objectName}{object name} is \c okButton.
+
+    \row
+        \o Descendant Selector
+        \o \c{QDialog QPushButton}
+        \o Matches all instances of QPushButton that are descendants
+           (children, grandchildren, etc.) of a QDialog.
+
+    \row
+        \o Child Selector
+        \o \c{QDialog > QPushButton}
+        \o Matches all instances of QPushButton that are direct
+           children of a QDialog.
+    \endtable
+
+    \section1 Sub-Controls
+
+    For styling complex widgets, it is necessary to access subcontrols of the
+    widget, such as the drop-down button of a QComboBox or the up and down
+    arrows of a QSpinBox. Selectors may contain \e{subcontrols} that make it
+    possible to restrict the application of a rule to specific widget
+    subcontrols. For example:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 5
+
+    The above rule styles the drop-down button of all \l{QComboBox}es.
+    Although the double-colon (\c{::}) syntax is reminiscent of CSS3
+    Pseudo-Elements, Qt Sub-Controls differ conceptually from these and have
+    different cascading semantics.
+   
+    Sub-controls are always positioned with respect to another element - a
+    reference element. This reference element could be the widget or another
+    Sub-control. For example, the \l{Qt Style Sheets Reference#drop-down-sub}
+    {::drop-down} of a QComboBox is placed, by default, in the top right corner
+    of the Padding rectangle of the QComboBox. The
+    \l{Qt Style Sheets Reference#drop-down-sub}{::drop-down} is placed,
+    by default, in the Center of the Contents rectangle of the
+    \l{Qt Style Sheets Reference#drop-down-sub}{::drop-down} Sub-control. See
+    the \l{List of Stylable Widgets} below for the Sub-controls to use to
+    style a widget and their default positions.
+
+    The origin rectangle to be used can be changed using the
+    \l{Qt Style Sheets Reference#subcontrol-origin-prop}{subcontrol-origin}
+    property. For example, if we want to place the drop-down in the margin
+    rectangle of the QComboBox instead of the default Padding rectangle, we
+    can specify:
+    
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 6
+    
+    The alignment of the drop-down within the Margin rectangle is changed 
+    using \l{Qt Style Sheets Reference#subcontrol-position-prop}
+    {subcontrol-position} property.
+
+    The \l{Qt Style Sheets Reference#width-prop}{width} and
+    \l{Qt Style Sheets Reference#height-prop}{height} properties can be used
+    to control the size of the Sub-control. Note that setting a
+    \l{Qt Style Sheets Reference#image-prop}{image} implicitly sets the size
+    of a Sub-control.
+
+    The relative positioning scheme
+    (\l{Qt Style Sheets Reference#position-prop}{position} : relative),
+    allows the position of the Sub-Control to be offset from its initial
+    position. For example, when the QComboBox's drop-down button is
+    pressed, we might like the arrow inside to be offset to give a
+    "pressed" effect. To achieve this, we can specify:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 7
+
+    The absolute positioning scheme
+    (\l{Qt Style Sheets Reference#position-prop}{position} : absolute),
+    allows the position and size of the Sub-control to be changed with
+    respect to the reference element.
+
+    Once positioned, they are treated the same as widgets and can be styled
+    using the the \l{box model}.
+
+    See the \l{List of Sub-Controls} below for a list of supported
+    sub-controls, and \l{Customizing the QPushButton's Menu Indicator
+    Sub-Control} for a realistic example.
+
+    \note With complex widgets such as QComboBox and QScrollBar, if one
+    property or sub-control is customized, \bold{all} the other properties or
+    sub-controls must be customized as well.
+
+    \section1 Pseudo-States
+
+    Selectors may contain \e{pseudo-states} that denote that restrict
+    the application of the rule based on the widget's state.
+    Pseudo-states appear at the end of the selector, with a colon
+    (\c{:}) in between. For example, the following rule applies when
+    the mouse hovers over a QPushButton:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 8
+
+    Pseudo-states can be negated using the exclamation operator. For
+    example, the following rule applies when the mouse does not hover
+    over a QRadioButton:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 9
+
+    Pseudo-states can be chained, in which case a logical AND is
+    implied. For example, the following rule applies to when the
+    mouse hovers over a checked QCheckBox:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 10
+
+    Negated Pseudo-states may appear in Pseudo-state chains. For example,
+    the following rule applies when the mouse hovers over a QPushButton
+    that is not pressed:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 11
+
+    If needed, logical OR can be expressed using the comma operator:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 12
+
+    Pseudo-states can appear in combination with subcontrols. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 13
+
+    See the \l{List of Pseudo-States} section below for the list of
+    pseudo-states provided by Qt widgets.
+
+    \section1 Conflict Resolution
+
+    Conflicts arise when several style rules specify the same
+    properties with different values. Consider the following style
+    sheet:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 14
+
+    Both rules match QPushButton instances called \c okButton and
+    there is a conflict for the \c color property. To resolve this
+    conflict, we must take into account the \e specificity of the
+    selectors. In the above example, \c{QPushButton#okButton} is
+    considered more specific than \c QPushButton, because it
+    (usually) refers to a single object, not to all instances of a
+    class.
+
+    Similarly, selectors with pseudo-states are more specific that
+    ones that do not specify pseudo-states. Thus, the following style
+    sheet specifies that a \l{QPushButton} should have white text
+    when the mouse is hovering over it, otherwise red text:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 15
+
+    Here's a tricky one:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 16
+
+    Here, both selectors have the same specificity, so if the mouse
+    hovers over the button while it is enabled, the second rule takes
+    precedence. If we want the text to be white in that case, we can
+    reorder the rules like this:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 17
+
+    Alternatively, we can make the first rule more specific:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 18
+
+    A similar issue arises in conjunction with Type Selectors.
+    Consider the following example:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 19
+
+    Both rules apply to QPushButton instances (since QPushButton
+    inherits QAbstractButton) and there is a conflict for the
+    \l{Qt Style Sheets Reference#color-prop}{color} property. Because QPushButton
+    inherits QAbstractButton, it might be tempting to assume that
+    \c QPushButton is more specific than \c QAbstractButton. However,
+    for style sheet computations, all Type Selectors have the same
+    specificity, and the rule that appears last takes precedence. In
+    other words, \l{Qt Style Sheets Reference#color-prop}{color} is set to \c gray
+    for all \l{QAbstractButton}s, including \l{QPushButton}s. If we really
+    want \l{QPushButton}s to have red text, we can always reorder the
+    rules.
+
+    For determining the specificity of a rule, Qt Style Sheets follow
+    the
+    \l{http://www.w3.org/TR/REC-CSS2/cascade.html#specificity}{CSS2
+    Specification}:
+
+    \quotation
+    \e{A selector's specificity is calculated as follows:}
+
+    \list
+    \o \e{count the number of ID attributes in the selector (= a)}
+    \o \e{count the number of other attributes and pseudo-classes in the selector (= b)}
+    \o \e{count the number of element names in the selector (= c)}
+    \o \e{ignore pseudo-elements [i.e., \l{subcontrols}].}
+    \endlist
+
+    \e{Concatenating the three numbers a-b-c (in a number system with a
+    large base) gives the specificity.}
+
+    \e{Some examples:}
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 20
+    \endquotation
+
+    \section1 Cascading
+
+    Style sheets can be set on the QApplication, on parent widgets,
+    and on child widgets. An arbitrary widget's effective style sheet
+    is obtained by merging the style sheets set on the widget's
+    ancestors (parent, grandparent, etc.), as well as any style sheet
+    set on the QApplication.
+
+    When conflicts arise, the widget's own style sheet is always
+    preferred to any inherited style sheet, irrespective of the
+    specificity of the conflicting rules. Likewise, the parent
+    widget's style sheet is preferred to the grandparent's, etc.
+
+    One consequence of this is that setting a style rule on a widget
+    automatically gives it precedence over other rules specified in
+    the ancestor widgets' style sheets or the QApplication style
+    sheet. Consider the following example. First, we set a style
+    sheet on the QApplication:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 21
+
+    Then we set a style sheet on a QPushButton object:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 22
+
+    The style sheet on the QPushButton forces the QPushButton (and
+    any child widget) to have blue text, in spite of the more
+    specific rule set provided by the application-wide style sheet.
+
+    The result would have been the same if we had written
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 23
+
+    except that if the QPushButton had children (which is unlikely),
+    the style sheet would have no impact on them.
+
+    Style sheet cascading is a complex topic. Refer to the
+    \l{http://www.w3.org/TR/CSS2/cascade.html#cascade}{CSS2
+    Specification} for the gory details. Be aware that Qt currently
+    doesn't implement \c{!important}.
+
+    \section1 Inheritance
+
+    In classic CSS, when font and color of an item is not explicitly set,
+    it gets automatically inherited from the parent. When using Qt Style Sheets,
+    a widget does \bold{not} automatically inherit its font and color setting
+    from its parent widget.
+
+    For example, consider a QPushButton inside a QGroupBox:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 24
+
+    The QPushButton does not have an explicit color set. Hence, instead
+    of inheriting color of its parent QGroupBox, it has the system color.
+    If we want to set the color on a QGroupBox and its children, 
+    we can write:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 25
+
+    In contrast, setting a font and propagate using QWidget::setFont() and
+    QWidget::setPalette() propagates to child widgets.
+
+    \section1 Widgets inside C++ namespaces
+    
+    The Type Selector can be used to style widgets of a particular type. For
+    example,
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 26
+
+    Qt Style Sheet uses QObject::className() of the widget to determine
+    when to apply the Type Selector. When custom widgets are inside namespaces, 
+    the QObject::className() returns <namespace>::<classname>. This conflicts
+    with the syntax for \l{Sub-Controls}. To overcome this problem, 
+    when using the Type Selector for widgets inside namespaces, we must
+    replace the "::" with "--". For example,
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 27
+
+    \section1 Setting QObject properties
+    
+    From 4.3 and above, any designable Q_PROPERTY 
+    can be set using the qproperty-<property name> syntax.
+    
+    For example,
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 28
+
+    If the property references an enum declared with Q_ENUMS, you should
+    reference its constants by name, i.e., not their numeric value.
+
+    */
+
+    /*!
+    \page stylesheet-designer.html
+    \contentspage {Qt Style Sheet}{Contents}
+    \previouspage The Style Sheet Syntax
+    \nextpage Customizing Qt Widgets Using Style Sheets
+    \title Qt Designer Integration
+
+    \l{Qt Designer}{Qt Designer} is an excellent tool
+    to preview style sheets. You can right-click on any widget in Designer
+    and select \gui{Change styleSheet...} to set the style sheet.
+
+    \image designer-stylesheet-options.png
+
+    In Qt 4.2 and later, \l{Qt Designer}{Qt Designer} also includes a
+    style sheet syntax highlighter and validator. The validator indicates
+    if the syntax is valid or invalid, at the bottom left of the \gui{Edit
+    Style Sheet} dialog.
+
+    \image designer-validator-highlighter.png
+
+    When you click \gui{OK} or \gui{Apply}, \QD will automatically display
+    the widget with its new stylesheet.
+
+    \image designer-stylesheet-usage.png
+    */
+
+    /*!
+    \page stylesheet-customizing.html
+    \contentspage {Qt Style Sheet}{Contents}
+    \previouspage Qt Designer Integration
+    \nextpage Qt Style Sheets Reference
+    \title Customizing Qt Widgets Using Style Sheets
+
+    When using style sheets, every widget is treated as a box with four
+    concentric rectangles: the margin rectangle, the border rectangle, the
+    padding rectangle, and the content rectangle. The box model describes
+    this in further detail.
+
+    \target box model
+    \section1 The Box Model
+
+    The four concentric rectangles appear conceptually as below:
+
+    \image stylesheet-boxmodel.png
+
+    \list
+    \o The margin falls outside the border.
+    \o The border is drawn between the margin and the padding.
+    \o The padding falls inside the border, between the border and
+       the actual contents.
+    \o The content is what is left from the original widget or
+       subcontrol once we have removed the margin, the border, and
+       the padding.
+    \endlist
+
+    The \l{Qt Style Sheets Reference#margin-prop}{margin},
+    \l{Qt Style Sheets Reference#border-width-prop}
+    {border-width}, and
+    \l{Qt Style Sheets Reference#padding-prop}{padding}
+    properties all default to zero. In that case, all four rectangles
+    (\c margin, \c border, \c padding, and \c content) coincide exactly.
+
+    You can specify a background for the widget using the 
+    \l{Qt Style Sheets Reference#background-image-prop}{background-image} 
+    property. By default, the background-image is drawn only for the area 
+    inside the border. This can be changed using the 
+    \l{Qt Style Sheets Reference#background-clip-prop}{background-clip}
+    property. You can use 
+    \l{Qt Style Sheets Reference#background-repeat-prop}{background-repeat}
+    and
+    \l{Qt Style Sheets Reference#background-origin-prop}{background-origin}
+    to control the repetition and origin of the background image.
+
+    A background-image does not scale with the size of the widget. To provide
+    a "skin" or background that scales along with the widget size, one must
+    use
+    \l{Qt Style Sheets Reference#border-image-prop}{border-image}. Since the
+    border-image property provides an alternate background, it is not required
+    to specify a background-image when border-image is specified. In the case,
+    when both of them are specified, the border-image draws over the 
+    background-image.
+
+    In addition, the \l{Qt Style Sheets Reference#image-prop}{image} property
+    may be used to draw an image over the border-image. The image specified does
+    not tile or stretch and when its size does not match the size of the widget,
+    its alignment is specified using the
+    \l{Qt Style Sheets Reference#image-position-prop}{image-position} 
+    property. Unlike background-image and border-image, one may specify a
+    SVG in the image property, in which case the image is scaled automatically
+    according to the widget size.
+
+    The steps to render a rule are as follows:
+        \list
+        \o Set clip for entire rendering operation (border-radius)
+        \o Draw the background (background-image)
+        \o Draw the border (border-image, border)
+        \o Draw overlay image (image)
+        \endlist
+
+    \target sub controls
+    \section1 Sub-controls
+
+    A widget is considered as a heirarchy (tree) of subcontrols drawn on top 
+    of each other. For example, the QComboBox draws the drop-down sub-control
+    followed by the down-arrow sub-control. A QComboBox is thus rendered as
+    follows:
+        \list
+        \o Render the QComboBox { } rule
+        \o Render the QComboBox::drop-down { } rule
+        \o Render the QComboBox::down-arrow { } rule
+        \endlist
+
+    Sub-controls share a parent-child relationship. In the case of QComboBox,
+    the parent of down-arrow is the drop-down and the parent of drop-down is
+    the widget itself. Sub-controls are positioned within their parent using
+    the \l{Qt Style Sheets Reference#subcontrol-position-prop}
+    {subcontrol-position} and
+    \l{Qt Style Sheets Reference#subcontrol-origin-prop}{subcontrol-origin}
+    properties.
+    
+    Once positioned, sub-controls can be styled using the the \l{box model}.
+
+    \note With complex widgets such as QComboBox and QScrollBar, if one
+    property or sub-control is customized, \bold{all} the other properties or
+    sub-controls must be customized as well.
+
+    */
+
+    /*!
+    \page stylesheet-reference.html
+    \contentspage {Qt Style Sheet}{Contents}
+    \previouspage Customizing Qt Widgets Using Style Sheets
+    \nextpage Qt Style Sheets Examples
+    \title Qt Style Sheets Reference
+
+    Qt Style Sheets support various properties, pseudo-states, and
+    subcontrols that make it possible to customize the look of
+    widgets.
+
+    \tableofcontents
+
+    \section1 List of Stylable Widgets
+
+    The following table lists the Qt widgets that can be customized
+    using style sheets:
+
+    \table 100%
+    \header
+        \o Widget
+        \o How to Style
+
+    \row
+        \o QAbstractScrollArea \target qabstractscrollarea-widget
+        \o Supports the \l{box model}.
+
+           All derivatives of QAbstractScrollArea, including QTextEdit,
+           and QAbstractItemView (all item view classes), support
+           scrollable backgrounds using 
+           \l{Qt Style Sheets Reference#background-attachment-prop}
+           {background-attachment}. Setting the background-attachment to
+           \c{fixed} provides a background-image that does not scroll with the
+           viewport. Setting the background-attachment to \c{scroll}, scrolls
+           the background-image when the scroll bars move.
+
+           See \l{Qt Style Sheets Examples#Customizing QAbstractScrollArea}
+           {Customizing QAbstractScrollArea} for an example.
+
+    \row
+        \o QCheckBox \target qcheckbox-widget
+        \o Supports the \l{box model}. The check indicator can be
+           styled using the \l{#indicator-sub}{::indicator}
+           subcontrol. By default, the indicator is placed in the Top
+           Left corner of the Contents rectangle of the widget.
+
+           The \l{#spacing-prop}{spacing} property
+           specifies the spacing between the check indicator and
+           the text.
+
+           See \l{Qt Style Sheets Examples#Customizing QCheckBox}
+           {Customizing QCheckBox} for an example.
+
+    \row
+        \o QColumnView \target qcolumnview-widget
+        \o The grip can be styled be using the \l{image-prop}{image} property.
+           The arrow indicators can by styled using the 
+           \l{left-arrow-sub}{::left-arrow} subcontrol and the 
+           \l{right-arrow-sub}{::right-arrow} subcontrol.
+
+    \row
+        \o QComboBox \target qcombobox-widget
+        \o The frame around the combobox can be styled using the 
+           \l{box model}. The drop-down button can be styled using
+           the \l{#drop-down-sub}{::drop-down} subcontrol. By default, the
+           drop-down button is placed in the top right corner of the padding
+           rectangle of the widget. The arrow mark inside the drop-down button 
+           can be styled using the \l{#down-arrow-sub}{::down-arrow} 
+           subcontrol. By default, the arrow is placed in the center of the 
+           contents rectangle of the drop-down subcontrol.
+
+           See \l{Qt Style Sheets Examples#Customizing QComboBox}{Customizing QComboBox} 
+           for an example.
+
+    \row
+        \o QDateEdit \target qdateedit-widget
+        \o See \l{#qspinbox-widget}{QSpinBox}.
+
+    \row
+        \o QDateTimeEdit \target qdatetimeedit-widget
+        \o See \l{#qspinbox-widget}{QSpinBox}.
+
+    \row
+        \o QDialog \target qdialog-widget
+        \o Supports only the \l{Qt Style Sheets Reference#background-prop}{background},
+           \l{#background-clip-prop}{background-clip} and
+           \l{#background-origin-prop}{background-origin} properties.
+
+           \warning Make sure you define the Q_OBJECT macro for your custom
+           widget.
+
+    \row
+        \o QDialogButtonBox \target qdialogbuttonbox-widget
+        \o The layout of buttons can be altered using the
+           \l{#button-layout-prop}{button-layout} property.
+
+    \row
+        \o QDockWidget \target qdockwidget-widget
+        \o Supports styling of the title bar and the title bar buttons when docked.
+
+        The dock widget border can be styled using the \l{#border-prop}{border}
+        property. The \l{#title-sub}{::title} subcontrol can be used to customize
+        the title bar. The close and float buttons are positioned with respect
+        to the \l{title-sub}{::title} subcontrol using the 
+        \l{#close-button-sub}{::close-button} and
+        \l{#float-button-sub}{::float-button} respectively.
+
+        When the title bar is vertical, the \l{#vertical-ps}{:vertical} pseudo 
+        class is set. In addition, depending on QDockWidget::DockWidgetFeature,
+        the \l{#closable-ps}{:closable}, \l{#floatable-ps}{:floatable} and
+        \l{#movable-ps}{:movable} pseudo states are set.
+
+        \note Use QMainWindow::separator to style the resize handle.
+
+        \warning The style sheet has no effect when the QDockWidget is undocked
+        as Qt uses native top level windows when undocked.
+
+        See \l{Qt Style Sheets Examples#Customizing QDockWidget}
+        {Customizing QDockWidget} for an example.
+
+    \row
+        \o QDoubleSpinBox \target qdoublespinbox-widget
+        \o See \l{#qspinbox-widget}{QSpinBox}.
+
+    \row
+        \o QFrame \target qframe-widget
+        \o Supports the \l{box model}.
+
+           Since 4.3, setting a stylesheet on a QLabel automatically
+           sets the QFrame::frameStyle property to QFrame::StyledPanel.
+
+           See \l{Qt Style Sheets Examples#Customizing QFrame}{Customizing QFrame}
+           for an example.
+
+    \row
+        \o QGroupBox \target qgroupbox-widget
+        \o Supports the \l{box model}. The title can be styled using the
+           \l{#title-sub}{::title} subcontrol. By default, the title is placed
+           depending on QGroupBox::textAlignment.
+
+           In the case of a checkable QGroupBox, the title includes the
+           check indicator. The indicator is styled using the 
+           the \l{#indicator-sub}{::indicator} subcontrol. The 
+           \l{#spacing-prop}{spacing} property can be used to control
+           the spacing between the text and indicator.
+
+           See \l{Qt Style Sheets Examples#Customizing QGroupBox}{Customizing QGroupBox}
+           for an example.
+
+    \row
+        \o QHeaderView \target qheaderview-widget
+        \o Supports the \l{box model}. The sections of the header view are
+           styled using the \l{#section-sub}{::section} sub control. The
+           \c{section} Sub-control supports the \l{#middle-ps}{:middle},
+           \l{#first-ps}{:first}, \l{#last-ps}{:last}, 
+           \l{#only-one-ps}{:only-one}, \l{#next-selected-ps}{:next-selected},
+           \l{#previous-selected-ps}{:previous-selected}, 
+           \l{#selected-ps}{:selected} pseudo states.
+
+           Sort indicator in can be styled using the 
+           \l{#up-arrow-sub}{::up-arrow} and the 
+           \l{#down-arrow-sub}{::down-arrow} Sub-control.
+
+           See \l{Qt Style Sheets Examples#Customizing QHeaderView}{Customizing QHeaderView}
+           for an example.
+
+    \row
+        \o QLabel \target qlabel-widget
+        \o Supports the \l{box model}. Does not support the
+           \l{#hover-ps}{:hover} pseudo-state. 
+
+           Since 4.3, setting a stylesheet on a QLabel automatically
+           sets the QFrame::frameStyle property to QFrame::StyledPanel.
+
+           See \l{Qt Style Sheets Examples#Customizing QFrame}{Customizing QFrame} for an
+           example (a QLabel derives from QFrame).
+
+    \row
+        \o QLineEdit \target qlineedit-widget
+        \o Support the \l{box model}.
+
+           The color and background of the selected item is styled using
+           \l{#selection-color-prop}{selection-color} and
+           \l{#selection-background-color-prop}{selection-background-color}
+           respectively.
+
+           The password character can be styled using the
+           \l{#lineedit-password-character-prop}{lineedit-password-character}
+           property.
+
+           See \l{Qt Style Sheets Examples#Customizing QLineEdit}{Customizing QLineEdit}
+           for an example.
+
+    \row
+        \o QListView \target qlistview-widget
+        \o Supports the \l{box model}. When 
+           \l{QAbstractItemView::alternatingRowColors}{alternating row colors} 
+           is enabled, the alternating colors can be styled using the 
+           \l{#alternate-background-color-prop}{alternate-background-color}
+           property.
+
+           The color and background of the selected item is styled using
+           \l{#selection-color-prop}{selection-color} and
+           \l{#selection-background-color-prop}{selection-background-color}
+           respectively.
+
+           The selection behavior is controlled by the
+           \l{#show-decoration-selected-prop}{show-decoration-selected} property.
+
+           Use the \l{#item-sub}{::item} subcontrol for more fine grained
+           control over the items in the QListView.
+
+           See \l{qabstractscrollarea-widget}{QAbsractScrollArea} to
+           style scrollable backgrounds.
+
+           See \l{Qt Style Sheets Examples#Customizing QListView}
+           {Customzing QListView} for an example.
+
+    \row
+        \o QListWidget \target qlistwidget-widget
+        \o See \l{#qlistview-widget}{QListView}.
+
+    \row
+        \o QMainWindow \target qmainwindow-widget
+        \o Supports styling of the separator
+
+           The separator in a QMainWindow when using QDockWidget is styled
+           using the \l{#separator-sub}{::separator} subcontrol.
+
+           See \l{Qt Style Sheets Examples#Customizing QMainWindow}{Customizing QMainWindow}
+           for an example.
+
+    \row
+        \o QMenu \target qmenu-widget
+        \o Supports the \l{box model}. 
+
+           Individual items are styled using the \l{#item-sub}{::item} 
+           subcontrol. In addition to the usually supported pseudo states,
+           \c{item} subcontrol supports the 
+           \l{#selected-ps}{:selected}, \l{#default-ps}{:default},
+           \l{#exclusive-ps}{:exclusive} and the 
+           \l{#non-exclusive-ps}{non-exclusive} pseudo states. 
+
+           The indicator of checkable menu items is styled using the
+           \l{#indicator-sub}{::indicator} subcontrol.
+
+           The separator is styled using the \l{#separator-sub}{::separator}
+           subcontrol.
+
+           For items with a sub menu, the arrow marks are styled using the
+           \l{::right-arrow-sub}{right-arrow} and 
+           \l{::left-arrow-sub}{left-arrow}.
+
+            The scroller is styled using the \l{#scroller-sub}{::scroller}.
+
+            The tear-off is styled using the \l{#tear-off-sub}{::tear-off}.
+
+           See \l{Qt Style Sheets Examples#Customizing QMenu}{Customizing QMenu}
+           for an example.
+
+    \row
+        \o QMenuBar \target qmenubar-widget
+        \o Supports the \l{box model}. The \l{#spacing-prop}{spacing}
+           property specifies the spacing between menu items.
+           Individual items are styled using the \l{#item-sub}{::item}
+           subcontrol.
+
+           \warning When running on Qt/Mac, the menu bar is usually embedded into the
+           system-wide menu bar. In this case, the style sheet will have no effect.
+
+           See \l{Qt Style Sheets Examples#Customizing QMenuBar}{Customizing QMenuBar}
+           for an example.
+
+    \row
+        \o QMessageBox \target qmessagebox-widget
+        \o The \l{#messagebox-text-interaction-flags-prop}
+           {messagebox-text-interaction-flags} property can be used to alter
+           the interaction with text in the message box.
+
+    \row
+        \o QProgressBar \target qprogressbar-widget
+        \o Supports the \l{box model}. The chunks of the progress bar
+           can be styled using the \l{#chunk-sub}{::chunk} subcontrol.
+           The chunk is displayed on the Contents rectangle of the widget.
+
+           If the progress bar displays text, use the \l{text-align-prop}{text-align}
+           property to position the text.
+
+           Indeterminate progress bars have the 
+           \l{#indeterminate-ps}{:indeterminate} pseudo state set.
+
+           See \l{Qt Style Sheets Examples#Customizing QProgressBar}{Customizing QProgressBar}
+           for an example.
+
+    \row
+        \o QPushButton \target qpushbutton-widget
+        \o Supports the \l{box model}. Supports the \l{#default-ps}{:default},
+           \l{#flat-ps}{:flat}, \l{#checked-ps}{:checked} pseudo states.
+
+           For QPushButton with a menu, the menu indicator is styled
+           using the \l{#menu-indicator-sub}{::menu-indicator}
+           subcontrol. Appearance of checkable push buttons can be
+           customized using the \l{#open-ps}{:open} and 
+           \l{#closed-ps}{:closed} pseudo-states.
+
+           \warning If you only set a background-color on a QPushButton, the background
+           may not appear unless you set the border property to some value. This is
+           because, by default, the QPushButton draws a native border which completely
+           overlaps the background-color. For example,
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 30
+
+           See \l{Qt Style Sheets Examples#Customizing QPushButton}{Customizing QPushButton}
+           for an example.
+
+    \row
+        \o QRadioButton \target qradiobutton-widget
+        \o Supports the \l{box model}. The check indicator can be
+           styled using the \l{#indicator-sub}{::indicator}
+           subcontrol. By default, the indicator is placed in the Top
+           Left corner of the Contents rectangle of the widget.
+
+           The \l{#spacing-prop}{spacing} property
+           specifies the spacing between the check indicator and
+           the text.
+
+           See \l{Qt Style Sheets Examples#Customizing QRadioButton}
+           {Customizing QRadioButton} for an example.
+
+    \row
+        \o QScrollBar \target qscrollbar-widget
+        \o Supports the \l{box model}. The Contents rectangle of the widget
+           is considered to be the groove over which the slider moves. The extent
+           of the QScrollBar (i.e the width or the height depending on the orientation)
+           is set using the \l{#width-prop}{width} or \l{#height-prop}{height} property
+           respectively. To determine the orientation, use the 
+           \l{#horizontal-ps}{:horizontal} and the \l{vertical-ps}{:vertical}
+           pseudo states.
+
+           The slider can be styled using the \l{#handle-sub}{::handle} subcontrol.
+           Setting the \l{#min-width-prop}{min-width} or \l{#min-height-prop}{min-height}
+           provides size contraints for the slider depending on the orientation.
+
+           The \l{add-line-sub}{::add-line} subcontrol can be used to style the
+           button to add a line. By default, the add-line subcontrol is placed in 
+           top right corner of the Border rectangle of the widget. Depending on the
+           orientation the \l{#right-arrow-sub}{::right-arrow} or 
+           \l{#down-arrow-sub}{::down-arrow}. By default, the arrows are placed in 
+           the center of the Contents rectangle of the add-line subcontrol. 
+
+           The \l{sub-line-sub}{::sub-line} subcontrol can be used to style the
+           button to subtract a line. By default, the sub-line subcontrol is placed in 
+           bottom right corner of the Border rectangle of the widget. Depending on the
+           orientation the \l{#left-arrow-sub}{::left-arrow} or 
+           \l{#up-arrow-sub}{::up-arrow}. By default, the arrows are placed in 
+           the center of the Contents rectangle of the sub-line subcontrol. 
+
+           The \l{sub-page-sub}{::sub-page} subcontrol can be used to style the
+           region of the slider that subtracts a page. The \l{add-page-sub}{::add-page}
+           subcontrol can be used to style the region of the slider that adds a page.
+
+           See \l{Qt Style Sheets Examples#Customizing QScrollBar}{Customizing QScrollBar} 
+           for an example.
+
+    \row
+        \o QSizeGrip \target qsizegrip-widget
+        \o Supports the \l{#width-prop}{width},
+           \l{#height-prop}{height}, and \l{#image-prop}{image}
+           properties.
+
+           See \l{Qt Style Sheets Examples#Customizing QSizeGrip}{Customizing QSizeGrip}
+           for an example.
+
+    \row
+        \o QSlider \target qslider-widget
+        \o Supports the \l{box model}. For horizontal slides, the 
+           \l{min-width-prop}{min-width} and \l{height-prop}{height}
+           properties must be provided. For vertical sliders, the 
+           \l{min-height-prop}{min-height} and \l{width-prop}{width}
+           properties must be provided.
+
+           The groove of the slider is styled 
+           using the \l{#groove-sub}{::groove}. The groove is 
+           positioned by default in the Contents rectangle of the widget. 
+           The thumb of the slider is styled using \l{#handle-sub}{::handle}
+           subcontrol. The subcontrol moves in the Contents rectangle of
+           the groove subcontrol.
+
+           See \l{Qt Style Sheets Examples#Customizing QSlider}{Customizing QSlider}
+           for an example.
+
+    \row
+        \o QSpinBox \target qspinbox-widget
+        \o The frame of the spin box can be styled using the \l{box
+           model}. 
+
+           The up button and arrow can be styled using the 
+           \l{#up-button-sub}{::up-button} and
+           \l{#up-arrow-sub}{::up-arrow} subcontrols. By default,
+           the up-button is placed in the top right corner in the 
+           Padding rectangle of the widget. Without an explicit size,
+           it occupies half the height of its reference rectangle.
+           The up-arrow is placed in the center of the Contents
+           rectangle of the up-button.
+
+           The down button and arrow can be styled using the 
+           \l{#down-button-sub}{::down-button} and
+           \l{#down-arrow-sub}{::down-arrow} subcontrols. By default,
+           the down-button is placed in the bottom right corner in the 
+           Padding rectangle of the widget. Without an explicit size,
+           it occupies half the height of its reference rectangle.
+           The bottom-arrow is placed in the center of the Contents
+           rectangle of the bottom-button.
+
+           See \l{Qt Style Sheets Examples#Customizing QSpinBox}{Customizing QSpinBox}
+           for an example.
+
+    \row
+        \o QSplitter \target qsplitter-widget
+        \o Supports the \l{box model}. The handle of the splitter 
+           is styled using the \l{#handle-sub}{::handle} subcontrol.
+
+           See \l{Qt Style Sheets Examples#Customizing QSplitter}{Customizing QSplitter}
+           for an example.
+
+    \row
+        \o QStatusBar \target qstatusbar-widget
+        \o Supports only the \l{Qt Style Sheets Reference#background-prop}
+           {background} property.
+           The frame for individual items can be style using the
+           \l{#item-sub}{::item} subcontrol.
+
+           See \l{Qt Style Sheets Examples#Customizing QStatusBar}{Customizing QStatusBar}
+           for an example.
+
+    \row
+        \o QTabBar \target qtabbar-widget
+        \o Individual tabs may be styled using the \l{#tab-sub}{::tab}
+           subcontrol. The tabs support the
+           \l{#only-one-ps}{:only-one}, \l{#first-ps}{:first},
+           \l{#last-ps}{:last}, \l{#middle-ps}{:middle},
+           \l{#previous-selected-ps}{:previous--selected},
+           \l{#next-selected-ps}{:next-selected},
+           \l{#selected-ps}{:selected} pseudo states.
+
+            The \l{#top-ps}{:top}, \l{#left-ps}{:left}, \l{#right-ps}{:right},
+            \l{#bottom-ps}{:bottom} pseudo states depending on the orientation
+            of the tabs.
+
+            Overlapping tabs for the selected state are created by using
+            negative margins or using the \c{absolute} position scheme.
+
+            The tear indicator of the QTabBar is styled using the 
+            \l{#tear-sub}{::tear} subcontrol.
+
+            QTabBar used two QToolButtons for its scrollers that can be styled
+            using the \c{QTabBar QToolButton} selector. To specify the width
+            of the scroll button use the \l{#scroller-sub}{::scroller} 
+            subcontrol.
+
+            The alignment of the tabs within the QTabBar is styled
+            using the \l{#Alignment}{alignment} property. \warning 
+
+            To change the position of the QTabBar within a QTabWidget, use the
+            \l{#tab-bar-sub}{tab-bar} subcontrol (and set subcontrol-position).
+
+           See \l{Qt Style Sheets Examples#Customizing QTabWidget and QTabBar}{Customizing QTabBar}
+           for an example.
+
+    \row
+        \o QTabWidget \target qtabwidget-widget
+        \o The frame of the tab widget is styled using the 
+           \l{#pane-sub}{::pane} subcontrol. The left and right
+           corners are styled using the \l{#left-corner-sub}{::left-corner}
+           and \l{#right-corner-sub}{::right-corner} respectively.
+           The position of the the tab bar is controlled using the
+           \l{#tab-bar-sub}{::tab-bar} subcontrol.
+
+           By default, the subcontrols have positions of a QTabWidget in 
+           the QWindowsStyle. To place the QTabBar in the center, set the
+           subcontrol-position of the tab-bar subcontrol.
+
+            The \l{#top-ps}{:top}, \l{#left-ps}{:left}, \l{#right-ps}{:right},
+            \l{#bottom-ps}{:bottom} pseudo states depending on the orientation
+            of the tabs.
+
+           See \l{Qt Style Sheets Examples#Customizing QTabWidget and QTabBar}
+           {Customizing QTabWidget} for an example.
+
+    \row
+        \o QTableView \target qtableview-widget
+        \o Supports the \l{box model}. When
+           \l{QAbstractItemView::alternatingRowColors}{alternating row colors} 
+           is enabled, the alternating colors can be styled using the 
+           \l{#alternate-background-color-prop}{alternate-background-color}
+           property.
+
+           The color and background of the selected item is styled using
+           \l{#selection-color-prop}{selection-color} and
+           \l{#selection-background-color-prop}{selection-background-color}
+           respectively.
+
+           The corner widget in a QTableView is implemented as a QAbstractButton
+           and can be styled using the "QTableView QTableCornerButton::section"
+           selector.
+
+           \warning If you only set a background-color on a QTableCornerButton, 
+           the background may not appear unless you set the border property to 
+           some value. This is because, by default, the QTableCornerButton draws a 
+           native border which completely overlaps the background-color. 
+
+           The color of the grid can be specified using the
+           \l{#gridline-color-prop}{gridline-color} property.
+
+           See \l{qabstractscrollarea-widget}{QAbsractScrollArea} to
+           style scrollable backgrounds.
+
+           See \l{Qt Style Sheets Examples#Customizing QTableView}
+           {Customzing QTableView} for an example.
+
+    \row
+        \o QTableWidget \target qtablewidget-widget
+        \o See \l{#qtableview-widget}{QTableView}.
+
+    \row
+        \o QTextEdit \target qtextedit-widget
+        \o Supports the \l{box model}.
+
+           The color and background of selected text is styled using
+           \l{#selection-color-prop}{selection-color} and
+           \l{#selection-background-color-prop}{selection-background-color}
+           respectively.
+
+           See \l{qabstractscrollarea-widget}{QAbsractScrollArea} to
+           style scrollable backgrounds.
+
+    \row
+        \o QTimeEdit \target qtimeedit-widget
+        \o See \l{#qspinbox-widget}{QSpinBox}.
+
+    \row
+        \o QToolBar \target qtoolbar-widget
+        \o Supports the \l{box model}. 
+
+           The \l{#top-ps}{:top}, \l{#left-ps}{:left}, \l{#right-ps}{:right},
+           \l{#bottom-ps}{:bottom} pseudo states depending on the area in
+           which the tool bar is grouped.
+
+           The \l{#first-ps}{:first}, \l{#last-ps}{:last}, \l{#middle-ps}{:middle},
+           \l{#only-one-ps}{:only-one} pseudo states indicator the position
+           of the tool bar within a line group (See 
+           QStyleOptionToolBar::positionWithinLine).
+
+           The separator of a QToolBar is styled using the 
+           \l{#separator-sub}{::separator} subcontrol.
+
+           The handle (to move the toolbar) is styled using the
+           \l{#handle-sub}{::handle} subcontrol.
+
+           See \l{Qt Style Sheets Examples#Customizing QToolBar}{Customizing QToolBar} 
+           for an example.
+
+    \row
+        \o QToolButton \target qtoolbutton-widget
+        \o Supports the \l{box model}.
+
+           If the QToolButton has a menu, is 
+           \l{#menu-indicator-sub}{::menu-indicator} subcontrol can be used to
+           style the indicator. By default, the menu-indicator is positioned
+           at the bottom right of the Padding rectangle of the widget.
+
+           If the QToolButton is in QToolButton::MenuButtonPopup mode,
+           the \l{#menu-button-sub}{::menu-button} subcontrol is used to draw the
+           menu button. \l{#menu-arrow-sub}{::menu-arrow} subcontrol is used to
+           draw the menu arrow inside the menu-button. By default, it is
+           positioned in the center of the Contents rectangle of the the
+           menu-button subcontrol.
+
+           When the QToolButton displays arrows, the \l{#up-arrow-sub}{::up-arrow},
+           \l{#down-arrow-sub}{::down-arrow}, \l{#left-arrow-sub}{::left-arrow}
+           and \l{#right-arrow-sub}{::right-arrow} subcontrols are used.
+
+           \warning If you only set a background-color on a QToolButton, the background
+           will not appear unless you set the border property to some value. This is
+           because, by default, the QToolButton draws a native border which completely
+           overlaps the background-color. For example,
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 31
+
+           See \l{Qt Style Sheets Examples#Customizing QToolButton}{Customizing QToolButton}
+           for an example.
+
+    \row
+        \o QToolBox \target qtoolbox-widget
+        \o Supports the \l{box model}. 
+
+          The individual tabs can by styled using the 
+          \l{#tab-sub}{::tab} subcontrol. The tabs support the
+          \l{#only-one-ps}{:only-one}, \l{#first-ps}{:first},
+          \l{#last-ps}{:last}, \l{#middle-ps}{:middle},
+         \l{#previous-selected-ps}{:previous-selected},
+          \l{#next-selected-ps}{:next-selected},
+          \l{#selected-ps}{:selected} pseudo states.
+
+    \row
+        \o QToolTip \target qtooltip-widget
+        \o Supports the \l{box model}. The \l{#opacity-prop}{opacity}
+           property controls the opacity of the tooltip.
+
+           See \l{Qt Style Sheets Examples#Customizing QFrame}{Customizing QFrame}
+           for an example (a QToolTip is a QFrame).
+
+    \row
+        \o QTreeView \target qtreeview-widget
+        \o Supports the \l{box model}. When 
+           \l{QAbstractItemView::alternatingRowColors}{alternating row colors} 
+           is enabled, the alternating colors can be styled using the 
+           \l{#alternate-background-color-prop}{alternate-background-color}
+           property.
+
+           The color and background of the selected item is styled using
+           \l{#selection-color-prop}{selection-color} and
+           \l{#selection-background-color-prop}{selection-background-color}
+           respectively.
+
+           The selection behavior is controlled by the
+           \l{#show-decoration-selected-prop}{show-decoration-selected} property.
+
+           The branches of the tree view can be styled using the 
+           \l{#branch-sub}{::branch} subcontrol. The
+           ::branch Sub-control supports the \l{open-ps}{:open},
+           \l{closed-ps}{:closed}, \l{has-siblings-ps}{:has-sibling} and
+           \l{has-children-ps}{:has-children} pseudo states. 
+
+           Use the \l{#item-sub}{::item} subcontrol for more fine grained
+           control over the items in the QTreeView.
+
+           See \l{qabstractscrollarea-widget}{QAbsractScrollArea} to
+           style scrollable backgrounds.
+
+           See \l{Qt Style Sheets Examples#Customizing QTreeView}{Customizing QTreeView}
+           for an example to style the branches.
+
+    \row
+        \o QTreeWidget \target qtreewidget-widget
+        \o See \l{#qtreeview-widget}{QTreeView}.
+
+    \row
+        \o QWidget \target qwidget-widget
+        \o Supports only the \l{Qt Style Sheets Reference#background-prop}{background},
+           \l{#background-clip-prop}{background-clip} and
+           \l{#background-origin-prop}{background-origin} properties.
+
+           If you subclass from QWidget, you need to provide a paintEvent for your
+           custom QWidget as below:
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 32
+
+           The above code is a no-operation if there is no stylesheet set.
+
+           \warning Make sure you define the Q_OBJECT macro for your custom 
+           widget.
+
+    \endtable
+
+    \section1 List of Properties
+
+    The table below lists all the properties supported by Qt Style
+    Sheets. Which values can be given to an property depend on the
+    \l{List of Property Types}{property's type}. Unless otherwise
+    specified, properties below apply to all widgets. Properties
+    marked with an asterisk * are specific to Qt and have no equivalent
+    in CSS2 or CSS3.
+
+    \table 100%
+    \header
+        \o Property
+        \o Type
+        \o Description
+
+    \row
+        \o \bold{\c alternate-background-color} \target alternate-background-color-prop
+        \o \l{#Brush}{Brush} \BR
+        \o The \l{QAbstractItemView::alternatingRowColors}
+           {alternate background color} used in QAbstractItemView subclasses.
+
+           If this property is not set, the default value is
+           whatever is set for the palette's
+           \l{QPalette::}{AlternateBase} role.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 33
+
+           See also \l{Qt Style Sheets Reference#background-prop}{background} and
+           \l{#selection-background-color-prop}{selection-background-color}.
+
+    \row
+        \o \bold{\c background} \target background-prop
+        \o \l{#Background}{Background}
+        \o Shorthand notation for setting the background. Equivalent
+           to specifying \c background-color, \c background-image, \c
+           background-repeat, and/or \c background-position.
+
+           This property is supported by QAbstractItemView
+           subclasses, QAbstractSpinBox subclasses, QCheckBox,
+           QComboBox, QDialog, QFrame, QGroupBox, QLabel, QLineEdit,
+           QMenu, QMenuBar, QPushButton, QRadioButton, QSplitter,
+           QTextEdit, QToolTip, and plain \l{QWidget}s.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 34
+
+
+           Often, it is required to set a fill pattern similar to the styles
+           in Qt::BrushStyle. You can use the background-color property for
+           Qt::SolidPattern, Qt::RadialGradientPattern, Qt::LinearGradientPattern
+           and Qt::ConicalGradientPattern.  The other patterns are easily achieved 
+           by creating a background image that contains the pattern.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 35
+
+           See also \l{#background-origin-prop}{background-origin},
+           \l{#selection-background-color-prop}{selection-background-color},
+           \l{#background-clip-prop}{background-clip},
+           \l{#background-attachment-prop}{background-attachment}
+           and \l{#alternate-background-color-prop}{alternate-background-color}.
+
+    \row
+        \o \c background-color \target background-color-prop
+        \o \l{#Brush}{Brush} \BR
+        \o The background color used for the widget.
+
+           Examples:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 36
+
+    \row
+        \o \c background-image \target background-image-prop
+        \o \l{#Url}{Url}
+        \o The background image used for the widget. Semi-transparent
+           parts of the image let the \c background-color shine
+           through.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 37
+
+    \row
+        \o \c background-repeat \target background-repeat-prop
+        \o \l{#Repeat}{Repeat}
+        \o Whether and how the background image is repeated to fill
+           the \c background-origin rectangle.
+
+           If this property is not specified, the background image
+           is repeated in both directions (\c repeat).
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 38
+
+    \row
+        \o \c background-position
+        \o \l{#Alignment}{Alignment}
+        \o The alignment of the background image within the \c
+           background-origin rectangle.
+
+           If this property is not specified, the alignment is \c
+           top \c left.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 39
+
+    \row
+        \o \bold{\c background-attachment} \target background-attachment-prop
+        \o \l{#Attachment}{Attachment}
+        \o Determines whether the background-image in a QAbstractScrollArea
+           is scrolled or fixed with respect to the viewport.
+           By default, the background-image scrolls with the viewport.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 40
+
+        See also \l{Qt Style Sheets Reference#background-prop}{background}
+
+    \row
+        \o \bold{\c background-clip} \target background-clip-prop
+        \o \l{#Origin}{Origin}
+        \o The widget's rectangle, in which the \c background is drawn.
+
+           This property specifies the rectangle to which the \c background-color
+           and \c background-image are clipped.
+
+           This property is supported by QAbstractItemView
+           subclasses, QAbstractSpinBox subclasses, QCheckBox,
+           QComboBox, QDialog, QFrame, QGroupBox, QLabel,
+           QPushButton, QRadioButton, QSplitter, QTextEdit, QToolTip,
+           and plain \l{QWidget}s.
+
+           If this property is not specified, the default is \c
+           border.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 41
+
+           See also \l{Qt Style Sheets Reference#background-prop}{background}, 
+           \l{#background-origin-prop}{background-origin} and \l{The Box Model}.
+
+    \row
+        \o \bold{\c background-origin} \target background-origin-prop
+        \o \l{#Origin}{Origin}
+        \o The widget's background rectangle, to use in conjunction
+           with \c background-position and \c background-image.
+
+           This property is supported by QAbstractItemView
+           subclasses, QAbstractSpinBox subclasses, QCheckBox,
+           QComboBox, QDialog, QFrame, QGroupBox, QLabel,
+           QPushButton, QRadioButton, QSplitter, QTextEdit, QToolTip,
+           and plain \l{QWidget}s.
+
+           If this property is not specified, the default is \c
+           padding.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 42
+
+           See also \l{Qt Style Sheets Reference#background-prop}{background} and
+           \l{The Box Model}.
+
+    \row
+        \o \bold{\c border} \target border-prop
+        \o \l{#Border}{Border}
+        \o Shorthand notation for setting the widget's border. Equivalent
+           to specifying \c border-color, \c border-style, and/or
+           \c border-width.
+
+           This property is supported by QAbstractItemView
+           subclasses, QAbstractSpinBox subclasses, QCheckBox,
+           QComboBox, QDialog, QFrame, QGroupBox, QLabel, QLineEdit,
+           QMenu, QMenuBar, QPushButton, QRadioButton, QSplitter,
+           QTextEdit, QToolTip, and plain \l{QWidget}s.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 43
+
+    \row
+        \o \c border-top
+        \o \l{#Border}{Border}
+        \o Shorthand notation for setting the widget's top border.
+           Equivalent to specifying \c border-top-color, \c
+           border-top-style, and/or \c border-top-width.
+
+    \row
+        \o \c border-right
+        \o \l{#Border}{Border}
+        \o Shorthand notation for setting the widget's right border.
+           Equivalent to specifying \c border-right-color, \c
+           border-right-style, and/or \c border-right-width.
+
+    \row
+        \o \c border-bottom
+        \o \l{#Border}{Border}
+        \o Shorthand notation for setting the widget's bottom border.
+           Equivalent to specifying \c border-bottom-color, \c
+           border-bottom-style, and/or \c border-bottom-width.
+
+    \row
+        \o \c border-left
+        \o \l{#Border}{Border}
+        \o Shorthand notation for setting the widget's left border.
+           Equivalent to specifying \c border-left-color, \c
+           border-left-style, and/or \c border-left-width.
+
+    \row
+        \o \bold{\c border-color} \target border-attrs
+           \target border-color-prop
+        \o \l{#Box Colors}{Box Colors}
+        \o The color of all the border's edges. Equivalent to
+           specifying \c border-top-color, \c border-right-color, \c
+           border-bottom-color, and \c border-left-color.
+
+           This property is supported by QAbstractItemView
+           subclasses, QAbstractSpinBox subclasses, QCheckBox,
+           QComboBox, QDialog, QFrame, QGroupBox, QLabel, QLineEdit,
+           QMenu, QMenuBar, QPushButton, QRadioButton, QSplitter,
+           QTextEdit, QToolTip, and plain \l{QWidget}s.
+
+           If this property is not specified, it defaults to
+           \l{#color-prop}{color} (i.e., the widget's foreground
+           color).
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 44
+
+           See also \l{Qt Style Sheets Reference#border-style-prop}{border-style},
+           \l{Qt Style Sheets Reference#border-width-prop}{border-width},
+           \l{#border-image-prop}{border-image}, and \l{The Box Model}.
+
+    \row
+        \o \c border-top-color
+        \o \l{#Brush}{Brush} \BR
+        \o The color of the border's top edge.
+
+    \row
+        \o \c border-right-color
+        \o \l{#Brush}{Brush} \BR
+        \o The color of the border's right edge.
+
+    \row
+        \o \c border-bottom-color
+        \o \l{#Brush}{Brush} \BR
+        \o The color of the border's bottom edge.
+
+    \row
+        \o \c border-left-color
+        \o \l{#Brush}{Brush} \BR
+        \o The color of the border's left edge.
+
+    \row
+        \o \bold{\c border-image} \target border-image-prop
+        \o \l{#Border Image}{Border Image}
+        \o The image used to fill the border. The image is cut into
+           nine parts and stretched appropriately if necessary. See
+           \l{#Border Image}{Border Image} for details.
+
+           This property is supported by QAbstractItemView
+           subclasses, QAbstractSpinBox subclasses, QCheckBox,
+           QComboBox, QDialog, QFrame, QGroupBox, QLabel, QLineEdit,
+           QMenu, QMenuBar, QPushButton, QRadioButton, QSplitter,
+           QTextEdit and QToolTip.
+
+           See also \l{#border-color-prop}{border-color},
+           \l{Qt Style Sheets Reference#border-style-prop}{border-style},
+           \l{Qt Style Sheets Reference#border-width-prop}{border-width}, and
+           \l{The Box Model}.
+
+    \row
+        \o \bold{\c border-radius} \target border-radius-prop
+        \o \l{#Radius}{Radius}
+        \o The radius of the border's corners. Equivalent to
+           specifying \c border-top-left-radius, \c
+           border-top-right-radius, \c border-bottom-right-radius,
+           and \c border-bottom-left-radius.
+
+           The border-radius clips the element's 
+           \l{Qt Style Sheets Reference#background-prop}{background}.
+
+           This property is supported by QAbstractItemView
+           subclasses, QAbstractSpinBox subclasses, QCheckBox,
+           QComboBox, QFrame, QGroupBox, QLabel, QLineEdit, QMenu,
+           QMenuBar, QPushButton, QRadioButton, QSplitter, QTextEdit,
+           and QToolTip.
+
+           If this property is not specified, it defaults to 0.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 45
+
+           See also \l{Qt Style Sheets Reference#border-width-prop}{border-width} and
+           \l{The Box Model}.
+
+    \row
+        \o \c border-top-left-radius
+        \o \l{#Radius}{Radius}
+        \o The radius of the border's top-left corner.
+
+    \row
+        \o \c border-top-right-radius
+        \o \l{#Radius}{Radius}
+        \o The radius of the border's top-right corner.
+
+    \row
+        \o \c border-bottom-right-radius
+        \o \l{#Radius}{Radius}
+        \o The radius of the border's bottom-right corner. Setting
+           this property to a positive value results in a rounded
+           corner.
+
+    \row
+        \o \c border-bottom-left-radius
+        \o \l{#Radius}{Radius}
+        \o The radius of the border's bottom-left corner. Setting this
+           property to a positive value results in a rounded corner.
+
+    \row
+        \o \bold{\c border-style} \target border-style-prop
+        \o \l {Border Style}
+        \o The style of all the border's edges.
+
+           This property is supported by QAbstractItemView
+           subclasses, QAbstractSpinBox subclasses, QCheckBox,
+           QComboBox, QFrame, QGroupBox, QLabel, QLineEdit, QMenu,
+           QMenuBar, QPushButton, QRadioButton, QSplitter, QTextEdit,
+           and QToolTip.
+
+           If this property is not specified, it defaults to \c none.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 46
+
+           See also \l{#border-color-prop}{border-color},
+           \l{Qt Style Sheets Reference#border-style-prop}{border-style},
+           \l{#border-image-prop}{border-image}, and \l{The Box Model}.
+
+    \row
+        \o \c border-top-style
+        \o \l{#Border Style}{Border Style}
+        \o The style of the border's top edge.
+
+    \row
+        \o \c border-right-style
+        \o \l{#Border Style}{Border Style}
+        \o The style of the border's right edge/
+
+    \row
+        \o \c border-bottom-style
+        \o \l{#Border Style}{Border Style}
+        \o The style of the border's bottom edge.
+
+    \row
+        \o \c border-left-style
+        \o \l{#Border Style}{Border Style}
+        \o The style of the border's left edge.
+
+    \row
+        \o \bold{\c border-width} \target border-width-prop
+        \o \l{#Box Lengths}{Box Lengths}
+        \o The width of the border. Equivalent to setting \c
+           border-top-width, \c border-right-width, \c
+           border-bottom-width, and \c border-left-width.
+
+           This property is supported by QAbstractItemView
+           subclasses, QAbstractSpinBox subclasses, QCheckBox,
+           QComboBox, QFrame, QGroupBox, QLabel, QLineEdit, QMenu,
+           QMenuBar, QPushButton, QRadioButton, QSplitter, QTextEdit,
+           and QToolTip.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 47
+
+           See also \l{#border-color-prop}{border-color},
+           \l{#border-radius-prop}{border-radius},
+           \l{Qt Style Sheets Reference#border-style-prop}{border-style},
+           \l{#border-image-prop}{border-image}, and
+           \l{The Box Model}.
+
+    \row
+        \o \c border-top-width
+        \o \l{#Length}{Length}
+        \o The width of the border's top edge.
+
+    \row
+        \o \c border-right-width
+        \o \l{#Length}{Length}
+        \o The width of the border's right edge.
+
+    \row
+        \o \c border-bottom-width
+        \o \l{#Length}{Length}
+        \o The width of the border's bottom edge.
+
+    \row
+        \o \c border-left-width
+        \o \l{#Length}{Length}
+        \o The width of the border's left edge.
+
+    \row
+        \o \bold{\c bottom} \target bottom-prop
+        \o \l{#Length}{Length}
+        \o If \l{#position-prop}{position} is \c relative (the
+           default), moves a \l{subcontrol} by a certain offset up;
+           specifying \tt{bottom: \e{y}} is then equivalent to
+           specifying \tt{\l{Qt Style Sheets Reference#top-prop}{top}: -\e{y}}.
+
+           If \l{#position-prop}{position} is \c absolute, the \c
+           bottom property specifies the subcontrol's bottom edge
+           in relation to the parent's bottom edge (see also
+           \l{Qt Style Sheets Reference#subcontrol-origin-prop}
+           {subcontrol-origin}).
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 48
+
+           See also \l{Qt Style Sheets Reference#left-prop}{left}, \l{#right-prop}{right}, and
+           \l{Qt Style Sheets Reference#top-prop}{top}.
+
+    \row
+        \o \bold{\c button-layout} \target button-layout-prop
+        \o \l{#Number}{Number}
+        \o The layout of buttons in a QDialogButtonBox or
+           a QMessageBox. The possible values are 0
+           (\l{QDialogButtonBox::}{WinLayout}), 1
+           (\l{QDialogButtonBox::}{MacLayout}), 2
+           (\l{QDialogButtonBox::}{KdeLayout}), and 3
+           (\l{QDialogButtonBox::}{GnomeLayout}).
+
+           If this property is not specified, it defaults to the
+           value specified by the current style for the
+           \l{QStyle::}{SH_DialogButtonLayout} style hint.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 49
+
+    \row
+        \o \bold{\c color} \target color-prop
+        \o \l{#Brush}{Brush} \BR 
+        \o The color used to render text.
+
+           This property is supported by all widgets that respect
+           the \l QWidget::palette.
+
+           If this property is not set, the default is whatever is
+           set for in the widget's palette for the
+           QWidget::foregroundRole (typically black).
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 50
+
+           See also \l{Qt Style Sheets Reference#background-prop}{background} and
+           \l{#selection-color-prop}{selection-color}.
+
+    \row
+        \o \bold{\c dialogbuttonbox-buttons-have-icons}
+        \o \l{#Boolean}{Boolean}
+        \o Whether the buttons in a QDialogButtonBox show icons
+
+        If this property is set to 1, the buttons of a QDialogButtonBox
+        show icons; if it is set to 0, the icons are not shown.
+
+        See the \l{Qt Style Sheets Reference#list of icons}{List of Icons}
+        section for information on how to set icons.
+
+        \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 51
+
+        \note Styles defining this property must be applied before the
+        QDialogButtonBox is created; this means that you must apply the
+        style to the parent widget or to the application itself.
+
+    \omit
+    \row
+        \o \bold{\c etch-disabled-text}*
+        \o \l{#Boolean}{Boolean}
+        \o Whether disabled text is drawn etched.
+
+           If this property is not specified, it defaults to the
+           value specified by the current style for the
+           \l{QStyle::}{SH_EtchDisabledText} style hint.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 52
+    \endomit
+
+    \row
+        \o \bold{\c font} \target font-prop
+        \o \l{#Font}{Font}
+        \o Shorthand notation for setting the text's font. Equivalent
+           to specifying \c font-family, \c font-size, \c font-style,
+           and/or \c font-weight.
+
+           This property is supported by all widgets that respect
+           the \l QWidget::font.
+
+           If this property is not set, the default is the
+           QWidget::font.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 53
+
+    \row
+        \o \c font-family
+        \o String
+        \o The font family.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 54
+
+        \note If you specify more than one parameter in \c font-family,
+        e.g., \c{font-family: Verdana, Arial}, Qt will only use the first
+        font. If it cannot be found, Qt uses the system fallbacks instead.
+
+    \row
+        \o \c font-size
+        \o \l{#Font Size}{Font Size}
+        \o The font size. In this version of Qt, only pt and px metrics are 
+           supported.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 55
+
+    \row
+        \o \c font-style
+        \o \l {Font Style}
+        \o The font style.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 56
+
+    \row
+        \o \c font-weight
+        \o \l{#Font Weight}{Font Weight}
+        \o The weight of the font.
+
+    \row
+        \o \bold{\c gridline-color}* \target gridline-color-prop
+        \o \l{#Color}{Color} \BR
+        \o The color of the grid line in a QTableView.
+
+           If this property is not specified, it defaults to the
+           value specified by the current style for the
+           \l{QStyle::}{SH_Table_GridLineColor} style hint.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 57
+
+    \row
+        \o \bold{\c height} \target height-prop
+        \o \l{#Length}{Length}
+        \o The height of a \l{subcontrol} (or in some case, a widget).
+
+           If this property is not specified, it defaults to a value
+           that depends on the subcontrol/widget and on the current style.
+
+           \warning Unless otherwise specified, this property has no effect 
+           when set on widgets. If you want a widget with a fixed height, set
+           the \l{#min-width-prop}{min-height} and 
+           \l{#max-width-prop}{max-height} to the same value.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 58
+
+           See also \l{#width-prop}{width}.
+
+    \row
+        \o \bold{\c icon-size} \target icon-size-prop
+        \o \l{#Length}{Length}
+        \o The width and height of the icon in a widget.
+
+           The icon size of the following widgets can be set using this 
+           property.
+               \list
+               \i QCheckBox
+               \i QListView
+               \i QPushButton
+               \i QRadioButton
+               \i QTabBar
+               \i QToolBar
+               \i QToolBox
+               \i QTreeView
+               \endlist
+
+    \row
+        \o \bold{\c image}* \target image-prop
+        \o \l{#Url}{Url}+
+        \o The image that is drawn in the contents rectangle of a 
+           \l{subcontrol}. 
+
+           The image property accepts a list of \l{#Url}{Url}s or 
+           an \c{svg}. The actual image that is drawn is determined
+           using the same algorithm as QIcon (i.e) the image is never scaled
+           up but always scaled down if necessary. If a \c{svg} is specified,
+           the image is scaled to the size of the contents rectangle.
+
+           Setting the image property on sub controls implicitly sets the 
+           width and height of the sub-control (unless the image in a SVG).
+
+           In Qt 4.3 and later, the alignment of the
+           image within the rectangle can be specified using 
+           \l{image-position-prop}{image-position}.
+
+           \warning The QIcon SVG plugin is needed to render SVG images.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 59
+
+    \row
+        \o \bold{\c image-position} \target image-position-prop
+        \o \l{#Alignment}{alignment}
+        \o In Qt 4.3 and later, the alignment of the image image's position can be specified
+           using relative or absolute position.
+
+    \row
+        \o \bold{\c left} \target left-prop
+        \o \l{#Length}{Length}
+        \o If \l{#position-prop}{position} is \c relative (the
+           default), moves a \l{subcontrol} by a certain offset to
+           the right.
+
+           If \l{#position-prop}{position} is \c absolute, the \c
+           left property specifies the subcontrol's left edge in
+           relation to the parent's left edge (see also
+           \l{Qt Style Sheets Reference#subcontrol-origin-prop}{subcontrol-origin}).
+
+           If this property is not specified, it defaults to \c 0.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 60
+
+           See also \l{#right-prop}{right}, \l{Qt Style Sheets Reference#top-prop}{top}, and
+           \l{#bottom-prop}{bottom}.
+
+    \row
+        \o \bold{\c lineedit-password- \BR \c character}* \target lineedit-password-character-prop
+        \o \l{#Number}{Number}
+        \o The QLineEdit password character as a Unicode number.
+
+           If this property is not specified, it defaults to the
+           value specified by the current style for the
+           \l{QStyle::}{SH_LineEdit_PasswordCharacter} style hint.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 61
+
+    \row
+        \o \bold{\c margin} \target margin-prop
+        \o \l {Box Lengths}
+        \o The widget's margins. Equivalent to specifying \c
+           margin-top, \c margin-right, \c margin-bottom, and \c
+           margin-left.
+
+           This property is supported by QAbstractItemView
+           subclasses, QAbstractSpinBox subclasses, QCheckBox,
+           QComboBox, QFrame, QGroupBox, QLabel, QLineEdit, QMenu,
+           QMenuBar, QPushButton, QRadioButton, QSplitter, QTextEdit,
+           and QToolTip.
+
+           If this property is not specified, it defaults to \c 0.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 62
+
+           See also \l{Qt Style Sheets Reference#padding-prop}{padding},
+           \l{#spacing-prop}{spacing}, and \l{The Box Model}.
+
+    \row
+        \o \c margin-top
+        \o \l{#Length}{Length}
+        \o The widget's top margin.
+
+    \row
+        \o \c margin-right
+        \o \l{#Length}{Length}
+        \o The widget's right margin.
+
+    \row
+        \o \c margin-bottom
+        \o \l{#Length}{Length}
+        \o The widget's bottom margin.
+
+    \row
+        \o \c margin-left
+        \o \l{#Length}{Length}
+        \o The widget's left margin.
+
+    \row
+        \o \bold{\c max-height} \target max-height-prop
+        \o \l{#Length}{Length}
+        \o The widget's or a subcontrol's maximum height.
+
+           This property is supported by QAbstractItemView
+           subclasses, QAbstractSpinBox subclasses, QCheckBox,
+           QComboBox, QFrame, QGroupBox, QLabel, QLineEdit, QMenu,
+           QMenuBar, QPushButton, QRadioButton, QSizeGrip, QSpinBox,
+           QSplitter, QStatusBar, QTextEdit, and QToolTip.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 63
+
+           See also \l{#max-width-prop}{max-width}.
+
+    \row
+        \o \bold{\c max-width} \target max-width-prop
+        \o \l{#Length}{Length}
+        \o The widget's or a subcontrol's maximum width.
+
+           This property is supported by QAbstractItemView
+           subclasses, QAbstractSpinBox subclasses, QCheckBox,
+           QComboBox, QFrame, QGroupBox, QLabel, QLineEdit, QMenu,
+           QMenuBar, QPushButton, QRadioButton, QSizeGrip, QSpinBox,
+           QSplitter, QStatusBar, QTextEdit, and QToolTip.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 64
+
+           See also \l{#max-height-prop}{max-height}.
+
+
+    \row
+        \o \bold{\c messagebox-text- \target messagebox-text-interaction-flags-prop
+           \BR \c interaction-flags}*
+        \o \l{#Number}{Number}
+        \o The interaction behavior for text in a message box.
+           Possible values are based on Qt::TextInteractionFlags.
+
+           If this property is not specified, it defaults to the
+           value specified by the current style for the
+           \l{QStyle::}{SH_MessageBox_TextInteractionFlags} style
+           hint.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 65
+
+    \row
+        \o \bold{\c min-height} \target min-height-prop
+        \o \l{#Length}{Length}
+        \o The widget's or a subcontrol's minimum height.
+
+           This property is supported by QAbstractItemView
+           subclasses, QAbstractSpinBox subclasses, QCheckBox,
+           QComboBox, QFrame, QGroupBox, QLabel, QLineEdit, QMenu,
+           QMenuBar, QPushButton, QRadioButton, QSizeGrip, QSpinBox,
+           QSplitter, QStatusBar, QTextEdit, and QToolTip.
+
+           If this property is not specified, the minimum height is
+           derived based on the widget's contents and the style.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 66
+
+           See also \l{#min-width-prop}{min-width}.
+
+    \row
+        \o \bold{\c min-width} \target min-width-prop
+        \o \l{#Length}{Length}
+        \o The widget's or a subcontrol's minimum width.
+
+           This property is supported by QAbstractItemView
+           subclasses, QAbstractSpinBox subclasses, QCheckBox,
+           QComboBox, QFrame, QGroupBox, QLabel, QLineEdit, QMenu,
+           QMenuBar, QPushButton, QRadioButton, QSizeGrip, QSpinBox,
+           QSplitter, QStatusBar, QTextEdit, and QToolTip.
+
+           If this property is not specified, the minimum width is
+           derived based on the widget's contents and the style.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 67
+
+           See also \l{#min-height-prop}{min-height}.
+
+    \row
+        \o \bold{\c opacity}* \target opacity-prop
+        \o \l{#Number}{Number}
+        \o The opacity for a widget. Possible values are from 0
+           (transparent) to 255 (opaque). For the moment, this is
+           only supported for \l{QToolTip}{tooltips}.
+
+           If this property is not specified, it defaults to the
+           value specified by the current style for the
+           \l{QStyle::}{SH_ToolTipLabel_Opacity} style hint.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 68
+
+    \row
+        \o \bold{\c padding} \target padding-prop
+        \o \l{#Box Lengths}{Box Lengths}
+        \o The widget's padding. Equivalent to specifying \c
+           padding-top, \c padding-right, \c padding-bottom, and \c
+           padding-left.
+
+           This property is supported by QAbstractItemView
+           subclasses, QAbstractSpinBox subclasses, QCheckBox,
+           QComboBox, QFrame, QGroupBox, QLabel, QLineEdit, QMenu,
+           QMenuBar, QPushButton, QRadioButton, QSplitter, QTextEdit,
+           and QToolTip.
+
+           If this property is not specified, it defaults to \c 0.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 69
+
+           See also \l{#margin-prop}{margin},
+           \l{#spacing-prop}{spacing}, and \l{The Box Model}.
+
+    \row
+        \o \c padding-top
+        \o \l{#Length}{Length}
+        \o The widget's top padding.
+
+    \row
+        \o \c padding-right
+        \o \l{#Length}{Length}
+        \o The widget's right padding.
+
+    \row
+        \o \c padding-bottom
+        \o \l{#Length}{Length}
+        \o The widget's bottom padding.
+
+    \row
+        \o \c padding-left
+        \o \l{#Length}{Length}
+        \o The widget's left padding.
+
+    \row
+        \o \bold{\c paint-alternating-row-colors-for-empty-area} 
+            \target paint-alternating-row-colors-for-empty-area-prop
+        \o \c bool
+        \o Whether the QTreeView paints alternating row colors for the empty 
+           area (i.e the area where there are no items)
+
+    \row
+        \o \bold{\c position} \target position-prop
+        \o \c relative \BR
+           | \c absolute
+        \o Whether offsets specified using \l{Qt Style Sheets Reference#left-prop}{left},
+           \l{#right-prop}{right}, \l{Qt Style Sheets Reference#top-prop}{top}, and
+           \l{#bottom-prop}{bottom} are relative or absolute
+           coordinates.
+
+           If this property is not specified, it defaults to \c
+           relative.
+
+    \row
+        \o \bold{\c right} \target right-prop
+        \o \l{#Length}{Length}
+        \o If \l{#position-prop}{position} is \c relative (the
+           default), moves a \l{subcontrol} by a certain offset to
+           the left; specifying \tt{right: \e{x}} is then equivalent
+           to specifying \tt{\l{Qt Style Sheets Reference#left-prop}{left}: -\e{x}}.
+
+           If \l{#position-prop}{position} is \c absolute, the \c
+           right property specifies the subcontrol's right edge in
+           relation to the parent's right edge (see also
+           \l{Qt Style Sheets Reference#subcontrol-origin-prop}{subcontrol-origin}).
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 70
+
+           See also \l{Qt Style Sheets Reference#left-prop}{left}, \l{Qt Style Sheets Reference#top-prop}{top}, and
+           \l{#bottom-prop}{bottom}.
+
+    \row
+        \o \bold{\c selection-background-color}* \target selection-background-color-prop
+        \o \l{#Brush}{Brush} \BR
+        \o The background of selected text or items.
+
+           This property is supported by all widgets that respect
+           the \l QWidget::palette and that show selection text.
+
+           If this property is not set, the default value is
+           whatever is set for the palette's
+           \l{QPalette::}{Highlight} role.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 71
+
+           See also \l{#selection-color-prop}{selection-color} and
+           \l{Qt Style Sheets Reference#background-prop}{background}.
+
+    \row
+        \o \bold{\c selection-color}* \target selection-color-prop
+        \o \l{#Brush}{Brush} \BR
+        \o The foreground of selected text or items.
+
+           This property is supported by all widgets that respect
+           the \l QWidget::palette and that show selection text.
+
+           If this property is not set, the default value is
+           whatever is set for the palette's
+           \l{QPalette::}{HighlightedText} role.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 72
+
+           See also
+           \l{#selection-background-color-prop}{selection-background-color}
+           and \l{#color-prop}{color}.
+
+    \row
+        \o \bold{\c show-decoration- \target show-decoration-selected-prop
+           \BR \c selected}*
+        \o \l{#Boolean}{Boolean}
+        \o Controls whether selections in a QListView cover the
+           entire row or just the extent of the text.
+
+           If this property is not specified, it defaults to the
+           value specified by the current style for the
+           \l{QStyle::}{SH_ItemView_ShowDecorationSelected} style
+           hint.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 73
+
+    \row
+        \o \bold{\c spacing}* \target spacing-prop
+        \o \l{#Length}{Length}
+        \o Internal spacing in the widget.
+
+           This property is supported by QCheckBox, checkable
+           \l{QGroupBox}es, QMenuBar, and QRadioButton.
+
+           If this property is not specified, the default value
+           depends on the widget and on the current style.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 74
+
+           See also \l{Qt Style Sheets Reference#padding-prop}{padding} and
+           \l{#margin-prop}{margin}.
+
+    \row
+        \o \bold{\c subcontrol-origin}* \target subcontrol-origin-prop
+        \o \l{#Origin}{Origin}
+        \o The origin rectangle of the \l subcontrol within the
+           parent element.
+
+           If this property is not specified, the default is \c
+           padding.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 75
+
+           See also
+           \l{Qt Style Sheets Reference#subcontrol-position-prop}{subcontrol-position}.
+
+    \row
+        \o \bold{\c subcontrol-position}* \target subcontrol-position-prop
+        \o \l{#Alignment}{Alignment}
+        \o The alignment of the \l subcontrol within the origin
+           rectangle specified by \l{Qt Style Sheets Reference#subcontrol-origin-prop}
+           {subcontrol-origin}.
+
+           If this property is not specified, it defaults to a value
+           that depends on the subcontrol.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 76
+
+           See also
+           \l{Qt Style Sheets Reference#subcontrol-origin-prop}{subcontrol-origin}.
+
+    \row
+        \o \bold{\c text-align} \target text-align-prop
+        \o \l{#Alignment}{Alignment}
+        \o The alignment of text and icon within the contents of the widget.
+
+           If this value is not specified, it defaults to the value
+           that depends on the native style.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 77
+
+            This property is currently supported only by QPushButton 
+            and QProgressBar.
+
+    \row    
+        \o \bold{\c text-decoration}
+        \o \c none \BR
+           \c underline \BR
+           \c overline \BR
+           \c line-through
+        \o Additional text effects
+
+    \row
+        \o \bold{\c top} \target top-prop
+        \o \l{#Length}{Length}
+        \o If \l{#position-prop}{position} is \c relative (the
+           default), moves a \l{subcontrol} by a certain offset
+           down.
+
+           If \l{#position-prop}{position} is \c absolute, the \c top
+           property specifies the subcontrol's top edge in relation
+           to the parent's top edge (see also
+           \l{Qt Style Sheets Reference#subcontrol-origin-prop}{subcontrol-origin}).
+
+           If this property is not specified, it defaults to \c 0.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 78
+
+           See also \l{Qt Style Sheets Reference#left-prop}{left}, \l{#right-prop}{right}, and
+           \l{#bottom-prop}{bottom}.
+
+    \row
+        \o \bold{\c width} \target width-prop
+        \o \l{#Length}{Length}
+        \o The width of a \l{subcontrol} (or a widget in some cases).
+
+           If this property is not specified, it defaults to a value
+           that depends on the subcontrol/widget and on the current style.
+
+           \warning Unless otherwise specified, this property has no effect 
+           when set on widgets. If you want a widget with a fixed width, set
+           the \l{#min-width-prop}{min-width} and 
+           \l{#max-width-prop}{max-width} to the same value.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 79
+
+           See also \l{#height-prop}{height}.
+
+    \endtable
+
+    \target list of icons
+    \section1 List of Icons
+
+    Icons used in Qt can be customized using the following properties. Each of
+    the properties listed in this section have the type \l{#Icon}{Icon}.
+
+    Note that for icons to appear in buttons in a QDialogButtonBox, you need to
+    set the dialogbuttonbox-buttons-have-icons property to true. Also, to
+    customize the size of the icons, use the icon-size property.
+
+    \table 100%
+    \header
+        \o Name
+        \o QStyle::StandardPixmap
+
+    \row
+        \o backward-icon
+        \o QStyle::SP_ArrowBack
+
+    \row
+        \o cd-icon
+        \o QStyle::SP_DriveCDIcon
+
+    \row
+        \o computer-icon
+        \o QStyle::SP_ComputerIcon
+
+    \row
+        \o desktop-icon
+        \o QStyle::SP_DesktopIcon
+
+    \row
+        \o dialog-apply-icon
+        \o QStyle::SP_DialogApplyButton
+
+    \row
+        \o dialog-cancel-icon
+        \o QStyle::SP_DialogCancelButton
+
+    \row
+        \o dialog-close-icon
+        \o QStyle::SP_DialogCloseButton
+
+    \row
+        \o dialog-discard-icon
+        \o QStyle::SP_DialogDiscardButton
+
+    \row
+        \o dialog-help-icon
+        \o QStyle::SP_DialogHelpButton
+
+    \row
+        \o dialog-no-icon
+        \o QStyle::SP_DialogNoButton
+
+    \row
+        \o dialog-ok-icon
+        \o QStyle::SP_DialogOkButton
+
+    \row
+        \o dialog-open-icon
+        \o QStyle::SP_DialogOpenButton
+
+    \row
+        \o dialog-reset-icon
+        \o QStyle::SP_DialogResetButton
+
+    \row
+        \o dialog-save-icon
+        \o QStyle::SP_DialogSaveButton
+
+    \row
+        \o dialog-yes-icon
+        \o QStyle::SP_DialogYesButton
+
+    \row
+        \o directory-closed-icon
+        \o QStyle::SP_DirClosedIcon
+
+    \row
+        \o directory-icon
+        \o QStyle::SP_DirIcon
+
+    \row
+        \o directory-link-icon
+        \o QStyle::SP_DirLinkIcon
+
+    \row
+        \o directory-open-icon
+        \o QStyle::SP_DirOpenIcon
+
+    \row
+        \o dockwidget-close-icon
+        \o QStyle::SP_DockWidgetCloseButton
+
+    \row
+        \o downarrow-icon
+        \o QStyle::SP_ArrowDown
+
+    \row
+        \o dvd-icon
+        \o QStyle::SP_DriveDVDIcon
+
+    \row
+        \o file-icon
+        \o QStyle::SP_FileIcon
+
+    \row
+        \o file-link-icon
+        \o QStyle::SP_FileLinkIcon
+
+    \omit
+    \row
+        \o filedialog-backward-icon
+        \o QStyle::SP_FileDialogBack
+    \endomit
+
+    \row
+        \o filedialog-contentsview-icon
+        \o QStyle::SP_FileDialogContentsView
+
+    \row
+        \o filedialog-detailedview-icon
+        \o QStyle::SP_FileDialogDetailedView
+
+    \row
+        \o filedialog-end-icon
+        \o QStyle::SP_FileDialogEnd
+
+    \row
+        \o filedialog-infoview-icon
+        \o QStyle::SP_FileDialogInfoView
+
+    \row
+        \o filedialog-listview-icon
+        \o QStyle::SP_FileDialogListView
+
+    \row
+        \o filedialog-new-directory-icon
+        \o QStyle::SP_FileDialogNewFolder
+
+    \row
+        \o filedialog-parent-directory-icon
+        \o QStyle::SP_FileDialogToParent
+
+    \row
+        \o filedialog-start-icon
+        \o  QStyle::SP_FileDialogStart
+
+    \row
+        \o floppy-icon
+        \o QStyle::SP_DriveFDIcon
+
+    \row
+        \o forward-icon
+        \o QStyle::SP_ArrowForward
+
+    \row
+        \o harddisk-icon
+        \o QStyle::SP_DriveHDIcon
+
+    \row
+        \o home-icon
+        \o QStyle::SP_DirHomeIcon
+
+    \row
+        \o leftarrow-icon
+        \o QStyle::SP_ArrowLeft
+
+    \row
+        \o messagebox-critical-icon
+        \o QStyle::SP_MessageBoxCritical
+
+    \row
+        \o messagebox-information-icon
+        \o QStyle::SP_MessageBoxInformation
+
+    \row
+        \o messagebox-question-icon
+        \o QStyle::SP_MessageBoxQuestion
+
+    \row
+        \o messagebox-warning-icon
+        \o QStyle::SP_MessageBoxWarning
+
+    \row
+        \o network-icon
+        \o QStyle::SP_DriveNetIcon
+
+    \row
+        \o rightarrow-icon
+        \o QStyle::SP_ArrowRight
+
+    \row
+        \o titlebar-contexthelp-icon
+        \o QStyle::SP_TitleBarContextHelpButton
+
+    \row
+        \o titlebar-maximize-icon
+        \o QStyle::SP_TitleBarMaxButton
+
+    \row
+        \o titlebar-menu-icon
+        \o QStyle::SP_TitleBarMenuButton
+
+    \row
+        \o titlebar-minimize-icon
+        \o QStyle::SP_TitleBarMinButton
+
+    \row
+        \o titlebar-normal-icon
+        \o QStyle::SP_TitleBarNormalButton
+
+    \row
+        \o titlebar-shade-icon
+        \o QStyle::SP_TitleBarShadeButton
+
+    \row
+        \o titlebar-unshade-icon
+        \o QStyle::SP_TitleBarUnshadeButton
+
+    \row
+        \o trash-icon
+        \o QStyle::SP_TrashIcon
+
+    \row
+        \o uparrow-icon
+        \o QStyle::SP_ArrowUp
+
+    \endtable
+
+    \section1 List of Property Types
+
+    The following table summarizes the syntax and meaning of the
+    different property types.
+
+    \table 100%
+    \header
+        \o Type
+        \o Syntax
+        \o Description
+
+    \row
+        \o \bold Alignment \target Alignment
+        \o \{ \c top \BR
+           | \c bottom \BR
+           | \c left \BR
+           | \c right \BR
+           | \c center \}*
+        \o Horizontal and/or vertical alignment.
+
+           Example:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 80
+
+    \row
+        \o \bold Attachment \target Attachment
+        \o \{ \c scroll \BR
+           | \c fixed \}*
+        \o Scroll or fixed attachment.
+
+    \row
+        \o \bold Background \target Background
+        \o \{ \l{#Brush}{Brush} \BR
+           | \l{#Url}{Url} \BR
+           | \l{#Repeat}{Repeat} \BR
+           | \l{#Alignment}{Alignment} \}*
+        \o A sequence of \l{#Brush}{Brush}, \l{#Url}{Url},
+           \l{#Repeat}{Repeat}, and \l{#Alignment}{Alignment}.
+
+    \row
+        \o \bold Boolean \target Boolean
+        \o 0 | 1
+        \o True (\c 1) or false (\c 0).
+
+           Example:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 81
+
+    \row
+        \o \bold Border \target Border
+        \o \{ \l{#Border Style}{Border Style} \BR
+           | \l{#Length}{Length} \BR
+           | \l{#Brush}{Brush} \}*
+        \o Shorthand border property.
+
+    \row
+        \o \bold{Border \target Border Image
+           Image}
+        \o \c none \BR
+           | \l{Url} \l{Number}\{4\} \BR (\c stretch | \c repeat){0,2}
+        \o A border image is an image that is composed of nine parts
+           (top left, top center, top right, center left, center,
+           center right, bottom left, bottom center, and bottom
+           right). When a border of a certain size is required, the
+           corner parts are used as is, and the top, right, bottom,
+           and left parts are stretched or repeated to produce a
+           border with the desired size.
+
+           See the
+           \l{http://www.w3.org/TR/css3-background/#the-border-image}
+           {CSS3 Draft Specification} for details.
+
+    \row
+        \o \bold{Border \target Border Style
+           Style}
+        \o \c dashed \BR
+           | \c dot-dash \BR
+           | \c dot-dot-dash \BR
+           | \c dotted \BR
+           | \c double \BR
+           | \c groove \BR
+           | \c inset \BR
+           | \c outset \BR
+           | \c ridge \BR
+           | \c solid \BR
+           | \c none
+        \o Specifies the pattern used to draw a border.
+           See the \l{http://www.w3.org/TR/css3-background/#border-style}
+           {CSS3 Draft Specification} for details.
+
+    \row
+        \o \bold{Box \target Box Colors 
+        Colors}
+        \o \l{#Brush}{Brush}\{1,4\}
+        \o One to four occurrences of \l{#Brush}{Brush}, specifying the top,
+           right, bottom, and left edges of a box, respectively. If
+           the left color is not specified, it is taken to be the
+           same as the right color. If the bottom color is not
+           specified, it is taken to be the same as the top color. If
+           the right color is not specified, it is taken to be the
+           same as the top color.
+
+           Example:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 82
+
+    \row
+        \o \bold{Box \target Box Lengths
+           Lengths}
+        \o \l{#Length}{Length}\{1,4\}
+        \o One to four occurrences of \l{#Length}{Length}, specifying the
+           top, right, bottom, and left edges of a box,
+           respectively. If the left length is not specified, it is
+           taken to be the same as the right length. If the bottom
+           length is not specified, is it taken to be the same as the
+           top length. If the right length is not specified, it is
+           taken to be the same as the top length.
+
+           Examples:
+
+           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 83
+
+    \row
+        \o \bold Brush \target Brush
+        \o \l{#Color}{Color} \BR
+           | \l{Gradient} \BR
+           | \l{PaletteRole}
+        \o Specifies a Color or a Gradient or an entry in the Palette.
+
+    \row
+        \o \bold Color \target Color
+        \o \tt{rgb(\e{r}, \e{g}, \e{b})} \BR
+           | \tt{rgba(\e{r}, \e{g}, \e{b}, \e{a})} \BR
+           | \tt{hsv(\e{h}, \e{s}, \e{v})} \BR
+           | \tt{hsva(\e{h}, \e{s}, \e{v}, \e{a})} \BR
+           | \tt{#\e{rrggbb}} \BR
+           | \l{QColor::setNamedColor()}{Color Name} \BR
+        \o Specifies a color as RGB (red, green, blue) or RGBA
+           (red, green, blue, alpha) or HSV (hue, saturation, value) or HSVA 
+           (hue, saturation, value, alpha) or a named color. The \c rgb() or \c rgba()
+           syntax can be used with integer values between 0 and 255, or with
+           percentages. The value of s, v, and a in \c hsv() or \c hsva() must all 
+           be in the range 0-255; the value of h must be in the range 0-359.
+
+           Examples:
+
+            \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 84
+
+            \note The RGB colors allowed are the same as those allowed with
+            CSS 2.1, as listed
+            \l{http://www.w3.org/TR/CSS21/syndata.html#color-units}{here}. 
+
+    \row
+        \o \bold Font \target Font
+        \o (\l{#Font Style}{Font Style} | \l{#Font Weight}{Font Weight}){0,2} \l{#Font Size}{Font Size} String
+        \o Shorthand font property.
+
+    \row
+        \o \bold{Font \target Font Size
+           Size}
+        \o \l{Length}
+        \o The size of a font.
+
+    \row
+        \o \bold{Font \target Font Style
+           Style}
+        \o \c normal \BR
+           | \c italic \BR
+           | \c oblique
+        \o The style of a font.
+
+    \row
+        \o \bold{Font \target Font Weight
+           Weight}
+        \o \c normal \BR
+           | \c bold \BR
+           | \c 100 \BR
+           | \c 200 \BR
+           ... \BR
+           | \c 900
+        \o The weight of a font.
+
+    \row
+        \o \bold Gradient \target Gradient
+        \o \c qlineargradient \BR
+           | \c qradialgradient \BR
+           | \c qconicalgradient
+        \o Specifies gradient fills. There are three types of gradient fills:
+
+           \list
+           \o \e{Linear} gradients interpolate colors between start and
+              end points.
+           \o \e{Radial} gradients interpolate colors between a focal
+              point and end points on a circle surrounding it.
+           \o \e{Conical} gradients interpolate colors around a center
+              point.
+           \endlist
+
+        Gradients are specified in Object Bounding Mode. Imagine the box 
+        in which the gradient is rendered, to have its top left corner at (0, 0)
+        and its bottom right corner at (1, 1). Gradient parameters are
+        then specified as percentages from 0 to 1. These values are 
+        extrapolated to actual box coordinates at runtime. It is possible
+        specify values that lie outside the bounding box (-0.6 or 1.8, for
+        instance).
+
+        \warning The stops have to appear sorted in ascending order.
+
+        Examples:
+
+        \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 85
+
+    \row
+        \o \bold Icon \target Icon
+        \o (\l{#Url}{Url} (\c disabled | \c active | \c normal | \c selected)?
+            (\c on | \c off)? )*
+        \o A list of url, QIcon::Mode and QIcon::State.
+
+            Example:
+            \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 86
+
+    \row
+        \o \bold Length \target Length
+        \o \l{#Number}{Number} (\c px | \c pt | \c em | \c ex)?
+        \o A number followed by a measurement unit. The CSS standard recommends
+           that user agents must 
+           \l{http://www.w3.org/TR/CSS21/syndata.html#illegalvalues}{ignore}
+           a declaration with an illegal value. In Qt, it is mandatory to 
+           specify measurement units. For compatibility with earlier versions 
+           of Qt, numbers without measurement units are treated as pixels 
+           in most contexts. The supported units are:
+
+           \list
+           \o \c px: pixels
+           \o \c pt: the size of one point (i.e., 1/72 of an inch)
+           \o \c em: the em width of the font (i.e., the width of 'M')
+           \o \c ex: the ex width of the font (i.e., the height of 'x')
+           \endlist
+
+    \row
+        \o \bold Number \target Number
+        \o A decimal integer or a real number
+        \o Examples: \c 0, \c 18, \c +127, \c -255, \c 12.34, \c -.5,
+           \c 0009.
+
+    \row
+        \o \bold Origin \target Origin
+        \o \c margin \BR
+           | \c border \BR
+           | \c padding \BR
+           | \c content
+        \o Indicates which of four rectangles to use.
+
+           \list
+           \o \c margin: The margin rectangle. The margin falls outside the border.
+           \o \c border: The border rectangle. This is where any border is drawn.
+           \o \c padding: The padding rectangle. Unlike the margins,
+                          padding is located inside the border.
+           \o \c content: The content rectangle. This specifies where
+                          the actual contents go, excluding any
+                          padding, border, or margin.
+           \endlist
+
+           See also \l{The Box Model}.
+
+    \row
+        \o \bold PaletteRole \target PaletteRole
+        \o \c alternate-base \BR
+              | \c base \BR
+              | \c bright-text \BR
+              | \c button \BR
+              | \c button-text \BR
+              | \c dark \BR
+              | \c highlight \BR
+              | \c highlighted-text \BR
+              | \c light \BR
+              | \c link \BR
+              | \c link-visited \BR
+              | \c mid \BR
+              | \c midlight \BR
+              | \c shadow \BR
+              | \c text \BR
+              | \c window \BR
+              | \c window-text \BR
+        \o These values correspond the \l{QPalette::ColorRole}{Color roles} 
+           in the widget's QPalette.
+
+            For example,
+            \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 87
+
+    \row
+        \o \bold Radius \target Radius
+        \o \l{#Length}{Length}\{1, 2\}
+        \o One or two occurrences of \l{#Length}{Length}. If only one length is
+           specified, it is used as the radius of the quarter circle
+           defining the corner. If two lengths are specified, the
+           first length is the horizontal radius of a quarter
+           ellipse, whereas the second length is the vertical radius.
+
+    \row
+        \o \bold Repeat \target Repeat
+        \o \c repeat-x \BR
+           | \c repeat-y \BR
+           | \c repeat \BR
+           | \c no-repeat
+        \o A value indicating the nature of repetition.
+
+           \list
+           \o \c repeat-x: Repeat horizontally.
+           \o \c repeat-y: Repeat vertically.
+           \o \c repeat: Repeat horizontally and vertically.
+           \o \c no-repeat: Don't repeat.
+           \endlist
+
+    \row
+        \o \bold Url \target Url
+        \o \tt{url(\e{filename})}
+        \o \tt{\e{filename}} is the name of a file on the local disk
+           or stored using \l{the Qt Resource System}. Setting an
+           image implicitly sets the width and height of the element.
+
+    \endtable
+
+    \section1 List of Pseudo-States
+
+    The following pseudo-states are supported:
+
+    \table 100%
+    \header
+        \o Pseudo-State
+        \o Description
+
+    \row \o \c :active \target active
+          \o This state is set when the widget resides in an active window.
+
+    \row
+        \o \c :adjoins-item \target adjoins-item-ps
+        \o This state is set when the \l{#branch-sub}{::branch} of a QTreeView
+           is adjacent to an item.
+
+    \row
+        \o \c :alternate \target alternate-ps
+        \o This state is set for every alternate row whe painting the row of
+           a QAbstractItemView when QAbstractItemView::alternatingRowColors()
+           is  set to true.
+
+    \row
+        \o \c :bottom \target bottom-ps
+        \o The item is positioned at the bottom. For example, a QTabBar
+           that has its tabs positioned at the bottom.
+
+    \row
+        \o \c :checked \target checked-ps
+        \o The item is checked. For example, the 
+            \l{QAbstractButton::checked}{checked} state of QAbstractButton.
+
+    \row
+        \o \c :closable \target closable-ps
+        \o The items can be closed. For example, the QDockWidget has the
+           QDockWidget::DockWidgetClosable feature turned on.
+
+    \row
+        \o \c :closed \target closed-ps
+        \o The item is in the closed state. For example, an non-expanded 
+           item in a QTreeView
+
+    \row
+        \o \c :default \target default-ps
+        \o The item is the default. For example, a 
+           \l{QPushButton::default}{default} QPushButton or a default action
+           in a QMenu.
+
+    \row
+        \o \c :disabled \target disabled-ps
+        \o The item is \l{QWidget::enabled}{disabled}.
+
+    \row
+        \o \c :editable \target editable-ps
+        \o The QComboBox is editable.
+
+    \row
+        \o \c :edit-focus \target edit-focus-ps
+        \o The item has edit focus (See QStyle::State_HasEditFocus). This state 
+           is available only for Qt Extended applications.
+
+    \row
+        \o \c :enabled \target enabled-ps
+        \o The item is \l{QWidget::enabled}{enabled}.
+
+    \row
+        \o \c :exclusive \target exclusive-ps
+        \o The item is part of an exclusive item group. For example, a menu
+           item in a exclusive QActionGroup.
+
+    \row
+        \o \c :first \target first-ps
+        \o The item is the first (in a list). For example, the first
+           tab in a QTabBar.
+
+    \row
+        \o \c :flat \target flat-ps
+        \o The item is flat. For example, a
+           \l{QPushButton::flat}{flat} QPushButton.
+
+    \row
+        \o \c :floatable \target floatable-ps
+        \o The items can be floated. For example, the QDockWidget has the
+           QDockWidget::DockWidgetFloatable feature turned on.
+
+    \row
+        \o \c :focus \target focus-ps
+        \o The item has \l{QWidget::hasFocus()}{input focus}.
+
+    \row
+        \o \c :has-children \target has-children-ps
+        \o The item has children. For example, an item in a
+           QTreeView that has child items.
+
+    \row
+        \o \c :has-siblings \target has-siblings-ps
+        \o The item has siblings. For example, an item in a
+           QTreeView that siblings.
+
+    \row
+        \o \c :horizontal \target horizontal-ps
+        \o The item has horizontal orientation
+
+    \row
+        \o \c :hover \target hover-ps
+        \o The mouse is hovering over the item.
+
+    \row
+        \o \c :indeterminate \target indeterminate-ps
+        \o The item has indeterminate state. For example, a QCheckBox 
+           or QRadioButton is \l{Qt::PartiallyChecked}{partially checked}.
+
+    \row
+        \o \c :last \target last-ps
+        \o The item is the last (in a list). For example, the last
+           tab in a QTabBar.
+
+    \row
+        \o \c :left \target left-ps
+        \o The item is positioned at the left. For example, a QTabBar
+           that has its tabs positioned at the left.
+
+    \row
+        \o \c :maximized \target maximized-ps
+        \o The item is maximized. For example, a maximized QMdiSubWindow.
+
+    \row
+        \o \c :middle \target middle-ps
+        \o The item is in the middle (in a list). For example, a tab
+           that is not in the beginning or the end in a QTabBar.
+
+    \row
+        \o \c :minimized \target minimized-ps
+        \o The item is minimized. For example, a minimized QMdiSubWindow.
+
+    \row
+        \o \c :movable \target movable-ps
+        \o The item can be moved around. For example, the QDockWidget has the
+           QDockWidget::DockWidgetMovable feature turned on.
+
+    \row
+        \o \c :no-frame \target no-frame-ps
+        \o The item has no frame. For example, a frameless QSpinBox
+           or QLineEdit.
+
+    \row
+        \o \c :non-exclusive \target non-exclusive-ps
+        \o The item is part of a non-exclusive item group. For example, a menu
+           item in a non-exclusive QActionGroup.
+
+    \row
+        \o \c :off \target off-ps
+        \o For items that can be toggled, this applies to items
+           in the "off" state.
+
+    \row
+        \o \c :on \target on-ps
+        \o For items that can be toggled, this applies to widgets
+           in the "on" state. 
+
+    \row
+        \o \c :only-one \target only-one-ps
+        \o The item is the only one (in a list). For example, a lone tab
+           in a QTabBar.
+
+    \row
+        \o \c :open \target open-ps
+        \o The item is in the open state. For example, an expanded 
+           item in a QTreeView, or a QComboBox or QPushButton with
+           an open menu.
+
+    \row
+        \o \c :next-selected \target next-selected-ps
+        \o The next item (in a list) is selected. For example, the
+           selected tab of a QTabBar is next to this item.
+
+    \row
+        \o \c :pressed \target pressed-ps
+        \o The item is being pressed using the mouse.
+
+    \row
+        \o \c :previous-selected \target previous-selected-ps
+        \o The previous item (in a list) is selected. For example, a
+           tab in a QTabBar that is next to the selected tab.
+
+    \row
+        \o \c :read-only \target read-only-ps
+        \o The item is marked read only or non-editable. For example,
+           a read only QLineEdit or a non-editable QComboBox.
+
+    \row
+        \o \c :right \target right-ps
+        \o The item is positioned at the right. For example, a QTabBar
+           that has its tabs positioned at the right.
+
+    \row 
+        \o \c :selected \target selected-ps
+        \o The item is selected. For example, the selected tab in
+           a QTabBar or the selected item in a QMenu.
+
+    \row
+        \o \c :top \target top-ps
+        \o The item is positioned at the top. For example, a QTabBar
+           that has its tabs positioned at the top.
+
+    \row
+        \o \c :unchecked \target unchecked-ps
+        \o The item is
+           \l{QAbstractButton::checked}{unchecked}.
+
+    \row
+        \o \c :vertical \target vertical-ps
+        \o The item has vertical orientation.
+
+    \row
+        \o \c :window \target window-ps
+        \o The widget is a window (i.e top level widget)
+
+    \endtable
+
+    \target subcontrols
+    \section1 List of Sub-Controls
+
+    The following subcontrols are available:
+
+    \table 100%
+    \header
+        \o Sub-Control
+        \o Description
+
+    \row
+        \o \c ::add-line \target add-line-sub
+        \o The button to add a line of a QScrollBar.
+
+    \row
+        \o \c ::add-page \target add-page-sub
+        \o The region between the handle (slider) and the \l{#add-line-sub}{add-line}
+           of a QScrollBar.
+
+    \row
+        \o \c ::branch \target branch-sub
+        \o The branch indicator of a QTreeView.
+
+    \row
+        \o \c ::chunk \target chunk-sub
+        \o The progress chunk of a QProgressBar.
+
+    \row
+        \o \c ::close-button \target close-button-sub
+        \o The close button of a QDockWidget.
+
+    \row
+        \o \c ::corner \target corner-sub
+        \o The corner between two scrollbars in a QAbstractScrollArea
+
+    \row
+        \o \c ::down-arrow \target down-arrow-sub
+        \o The down arrow of a QComboBox, QHeaderView (sort indicator),
+           QScrollBar or QSpinBox.
+
+    \row
+        \o \c ::down-button \target down-button-sub
+        \o  The down button of a QScrollBar or a QSpinBox.
+
+    \row
+        \o \c ::drop-down \target drop-down-sub
+        \o The drop-down button of a QComboBox.
+
+    \row
+        \o \c ::float-button \target float-button-sub
+        \o The float button of a QDockWidget
+
+    \row
+        \o \c ::groove \target groove-sub
+        \o The groove of a QSlider.
+
+    \row
+        \o \c ::indicator \target indicator-sub
+        \o The indicator of a QAbstractItemView, a QCheckBox, a QRadioButton, 
+           a checkable QMenu item or a checkable QGroupBox.
+
+    \row
+        \o \c ::handle \target handle-sub
+        \o The handle (slider) of a QScrollBar, a QSplitter, or a QSlider.
+
+    \row
+        \o \c ::icon \target icon-sub
+        \o The icon of a QAbstractItemView or a QMenu.
+
+    \row
+        \o \c ::item \target item-sub
+        \o An item of a QAbstractItemView, a QMenuBar, a QMenu, or 
+        a QStatusBar.
+
+    \row
+        \o \c ::left-arrow \target left-arrow-sub
+        \o The left arrow of a QScrollBar.
+
+    \row
+        \o \c ::left-corner \target left-corner-sub
+        \o The left corner of a QTabWidget. For example, this control can be
+           used to control position the left corner widget in a QTabWidget.
+
+    \row
+        \o \c ::menu-arrow \target menu-arrow-sub
+        \o The arrow of a QToolButton with a menu.
+
+    \row
+        \o \c ::menu-button \target menu-button-sub
+        \o The menu button of a QToolButton.
+
+    \row
+        \o \c ::menu-indicator \target menu-indicator-sub
+        \o The menu indicator of a QPushButton.
+
+    \row
+        \o \c ::right-arrow \target right-arrow-sub
+        \o The right arrow of a QMenu or a QScrollBar.
+
+    \row
+        \o \c ::pane \target pane-sub
+        \o The pane (frame) of a QTabWidget.
+
+    \row
+        \o \c ::right-corner \target right-corner-sub
+        \o The right corner of a QTabWidget. For example, this control can be
+           used to control the position the right corner widget in a QTabWidget.
+
+    \row
+        \o \c ::scroller \target scroller-sub
+        \o The scroller of a QMenu or QTabBar.
+
+    \row
+        \o \c ::section \target section-sub
+        \o The section of a QHeaderView.
+
+    \row
+        \o \c ::separator \target separator-sub
+        \o The separator of a QMenu or in a QMainWindow.
+
+    \row
+        \o \c ::sub-line \target sub-line-sub
+        \o The button to subtract a line of a QScrollBar.
+
+    \row
+        \o \c ::sub-page \target sub-page-sub
+        \o The region between the handle (slider) and the \l{#sub-line-sub}{sub-line}
+           of a QScrollBar.
+
+    \row
+        \o \c ::tab \target tab-sub
+        \o The tab of a QTabBar or QToolBox.
+
+    \row
+        \o \c ::tab-bar \target tab-bar-sub
+        \o The tab bar of a QTabWidget. This subcontrol exists only to
+           control the position of the QTabBar inside the QTabWidget. To
+           style the tabs using the \l{#tab-sub}{::tab} subcontrol.
+
+    \row
+        \o \c ::tear \target tear-sub
+        \o The tear indicator of a QTabBar.
+
+    \row
+        \o \c ::tear-off \target tear-off-sub
+        \o The tear-off indicator of a QMenu.
+
+    \row
+        \o \c ::text \target text-ps
+        \o The text of a QAbstractItemView.
+
+    \row
+        \o \c ::title \target title-sub
+        \o The title of a QGroupBox or a QDockWidget.
+
+    \row
+        \o \c ::up-arrow \target up-arrow-sub
+        \o The up arrow of a QHeaderView (sort indicator), QScrollBar 
+           or a QSpinBox.
+
+    \row
+        \o \c ::up-button \target up-button-sub
+        \o The up button of a QSpinBox.
+
+    \endtable
+
+    See \l{Customizing the QPushButton's Menu Indicator Sub-Control}
+    for an example of how to customize a subcontrol.
+    */
+
+    /*!
+    \page stylesheet-examples.html
+    \contentspage {Qt Style Sheet}{Contents}
+    \previouspage Qt Style Sheets Reference
+    \title Qt Style Sheets Examples
+
+    \tableofcontents
+    \section1 Style Sheet Usage
+
+    We will now see a few examples to get started with using Qt Style Sheets.
+
+    \section2 Customizing the Foreground and Background Colors
+
+    Let's start by setting yellow as the background color of all
+    \l{QLineEdit}s in an application. This could be achieved like
+    this:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 88
+
+    If we want the property to apply only to the \l{QLineEdit}s that are
+    children (or grandchildren or grand-grandchildren) of a specific dialog,
+    we would rather do this:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 89
+
+    If we want the property to apply only to one specific QLineEdit,
+    we can give it a name using QObject::setObjectName() and use an
+    ID Selector to refer to it:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 90
+
+    Alternatively, we can set the
+    \l{Qt Style Sheets Reference#background-prop}{background-color} property directly on the
+    QLineEdit, omitting the selector:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 91
+
+    To ensure a good contrast, we should also specify a suitable
+    color for the text:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 92
+
+    It might be a good idea to change the colors used for selected
+    text as well:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 93
+
+
+    \section2 Customizing Using Dynamic Properties
+
+    There are many situations where we need to present a form that
+    has mandatory fields. To indicate to the user that the field is
+    mandatory, one effective (albeit esthetically dubious) solution
+    is to use yellow as the background color for those fields. It
+    turns out this is very easy to implement using Qt Style Sheets.
+    First, we would use the following application-wide style sheet:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 94
+
+    This means that every widget whose \c mandatoryField Qt property
+    is set to true would have a yellow background.
+
+    Then, for each mandatory field widget, we would simply create a
+    \c mandatoryField property on the fly and set it to true. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 95
+
+    \section2 Customizing a QPushButton Using the Box Model
+
+    This time, we will show how to create a red QPushButton. This
+    QPushButton would presumably be connected to a very destructive
+    piece of code.
+
+    First, we are tempted to use this style sheet:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 96
+
+    However, the result is a boring, flat button with no borders:
+
+    \image stylesheet-redbutton1.png A flat red button
+
+    What happened is this:
+
+    \list
+    \o We have made a request that cannot be satisfied using the
+       native styles alone (e.g., the Windows XP theme engine doesn't
+       let us specify the background color of a button).
+    \o Therefore, the button is rendered using style sheets.
+    \o We haven't specified any values for
+       \l{Qt Style Sheets Reference#border-width-prop}{border-width} and
+       \l{Qt Style Sheets Reference#border-style-prop}{border-style}, so by default we obtain
+       a 0-pixel wide border of style \c none.
+    \endlist
+
+    Let's improve the situation by specifying a border:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 97
+
+    \image stylesheet-redbutton2.png A red button with a beige border
+
+    Things look already a lot better. But the button looks a bit
+    cramped. Let's specify some spacing between the border and the
+    text using the \l{Qt Style Sheets Reference#padding-prop}{padding}. Additionally, we will
+    enforce a minimum width, round the corners, and specify a larger
+    font to make the button look nicer:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 98
+
+    \image stylesheet-redbutton3.png A red button with a round beige border and big, bold text
+
+    The only issue remaining is that the button doesn't react when we
+    press it. We can fix this by specifying a slightly different
+    background color and use a different border style.
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 99
+
+    \section2 Customizing the QPushButton's Menu Indicator Sub-Control
+
+    Subcontrols give access to the sub-elements of a widget. For
+    example, a QPushButton associated with a menu (using
+    QPushButton::setMenu()) has a menu indicator. Let's customize
+    the menu indicator for the red push button:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 100
+
+    By default, the menu indicator is located at the bottom-right
+    corner of the padding rectangle. We can change this by specifying
+    \l{Qt Style Sheets Reference#subcontrol-position-prop}{subcontrol-position} and
+    \l{Qt Style Sheets Reference#subcontrol-origin-prop}{subcontrol-origin} to anchor the
+    indicator differently. We can also use \l{Qt Style Sheets Reference#top-prop}{top} and
+    \l{Qt Style Sheets Reference#left-prop}{left} to move the indicator by a few pixels. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 101
+
+    This positions the \c myindicator.png to the center right of the
+    QPushButton's \l{Qt Style Sheets Reference#padding-prop}{padding} rectangle (see
+    \l{Qt Style Sheets Reference#subcontrol-origin-prop}{subcontrol-origin} for more
+    information).
+
+    \section2 Complex Selector Example
+
+    Since red seems to be our favorite color, let's make the text in
+    QLineEdit red by setting the following application-wide
+    stylesheet:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 102
+
+    However, we would like to give a visual indication that a
+    QLineEdit is read-only by making it appear gray:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 103
+
+    At some point, our design team comes with the requirement that
+    all \l{QLineEdit}s in the registration form (with the
+    \l{QObject::objectName}{object name} \c registrationDialog) to be
+    brown:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 104
+
+    A few UI design meetings later, we decide that all our
+    \l{QDialog}s should have brown colored \l{QLineEdit}s:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 105
+
+    Quiz: What happens if we have a read-only QLineEdit in a QDialog?
+    [Hint: The \l{The Style Sheet Syntax#Conflict Resolution}{Conflict Resolution} section above explains
+    what happens in cases like this.]
+
+    \section1 Customizing specific widgets
+
+    This section provides examples to customize specific widgets using Style Sheets.
+
+    \section2 Customizing QAbstractScrollArea
+
+    The background of any QAbstractScrollArea (Item views, QTextEdit 
+    and QTextBrowser) can be set using the background properties. For example,
+    to set a background-image that scrolls with the scroll bar:
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 106
+
+    If the background-image is to be fixed with the viewport:
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 107
+
+    \section2 Customizing QCheckBox
+
+    Styling of a QCheckBox is almost indentical to styling a QRadioButton. The
+    main difference is that a tristate QCheckBox has an indeterminate state.
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 108
+
+    \section2 Customizing QComboBox
+
+    We will look at an example where the drop down button of a QComboBox
+    appears "merged" with the combo box frame.
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 109
+
+    The pop-up of the QComboBox is a QAbstractItemView and is styled using 
+    the descendant selector:
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 110
+
+    \section2 Customizing QDockWidget
+
+    The title bar and the buttons of a QDockWidget can be customized as 
+    follows:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 111
+
+    If one desires to move the dock widget buttons to the left, the following
+    style sheet can be used:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 112
+
+    \note To customize the separator (resize handle) of a QDockWidget,
+    use QMainWindow::separator.
+
+    \section2 Customizing QFrame
+
+    A QFrame is styled using the \l{The Box Model}.
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 113
+
+    \section2 Customizing QGroupBox
+    
+    Let us look at an example that moves the QGroupBox's title to
+    the center.
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 114
+
+    For a checkable QGroupBox, use the \{#indicator-sub}{::indicator} subcontrol
+    and style it exactly like a QCheckBox (i.e)
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 115
+
+    \section2 Customizing QHeaderView
+
+    QHeaderView is customized as follows:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 116
+
+    \section2 Customizing QLineEdit
+
+    The frame of a QLineEdit is styled using the \l{The Box Model}. To
+    create a line edit with rounded corners, we can set:
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 117
+
+    The password character of line edits that have QLineEdit::Password
+    echo mode can be set using:
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 118
+
+    The background of a read only QLineEdit can be modified as below:
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 119
+
+    \section2 Customizing QListView
+
+    The background color of alternating rows can be customized using the following
+    style sheet:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 120
+
+    To provide a special background when you hover over items, we can use the
+    \l{item-sub}{::item} subcontrol. For example,
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 121
+
+    \section2 Customizing QMainWindow
+
+    The separator of a QMainWindow can be styled as follows:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 122
+
+    \section2 Customizing QMenu
+    
+    Individual items of a QMenu are styled using the 'item' subcontrol as 
+    follows:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 123
+
+    For a more advanced customization, use a style sheet as follows:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 124
+
+    \section2 Customizing QMenuBar
+
+    QMenuBar is styled as follows:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 125
+
+    \section2 Customizing QProgressBar
+
+    The QProgressBar's \l{stylesheet-reference.html#border-prop}{border},
+    \l{stylesheet-reference.html#chunk-sub}{chunk}, and
+    \l{stylesheet-reference.html#text-align-prop}{text-align} can be customized using
+    style sheets. However, if one property or sub-control is customized,
+    all the other properties or sub-controls must be customized as well.
+
+    \image progressBar-stylesheet.png
+
+    For example, we change the \l{stylesheet-reference.html#border-prop}
+    {border} to grey and the \l{stylesheet-reference.html#chunk-sub}{chunk}
+    to cerulean.
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 126
+
+    This leaves the \l{stylesheet-reference.html#text-align-prop}
+    {text-align}, which we customize by positioning the text in the center of
+    the progress bar.
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 127
+
+    A \l{stylesheet-reference.html#margin-prop}{margin} can be included to
+    obtain more visible chunks.
+
+    \image progressBar2-stylesheet.png
+
+    In the screenshot above, we use a
+    \l{stylesheet-reference.html#margin-prop}{margin} of 0.5 pixels.
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 128
+
+    \section2 Customizing QPushButton
+
+    A QPushButton is styled as follows:
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 129
+
+    For a QPushButton with a menu, use the 
+    \l{Qt Style Sheets Reference#menu-indicator-sub}{::menu-indicator} 
+    subcontrol.
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 130
+
+    Checkable QPushButton have the \l{Qt Style Sheets Reference#checked-ps}
+    {:checked} pseudo state set.
+
+    \section2 Customizing QRadioButton
+
+    The indicator of a QRadioButton can be changed using:
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 131
+
+    \section2 Customizing QScrollBar
+
+    The QScrollBar can be styled using its subcontrols like
+    \l{stylesheet-reference.html#handle-sub}{handle},
+    \l{stylesheet-reference.html#add-line-sub}{add-line},
+    \l{stylesheet-reference.html#sub-line-sub}{sub-line}, and so on. Note that
+    if one property or sub-control is customized, all the other properties or
+    sub-controls must be customized as well.
+
+    \image stylesheet-scrollbar1.png
+
+    The scroll bar above has been styled in aquamarine with a solid grey
+    border.
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 132
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 133
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 134
+
+    The \l{stylesheet-reference.html#left-arrow-sub}{left-arrow} and
+    \l{stylesheet-reference.html#right-arrow-sub}{right-arrow} have a solid grey
+    border with a white background. As an alternative, you could also embed the
+    image of an arrow.
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 135
+
+    If you want the scroll buttons of the scroll bar to be placed together
+    (instead of the edges) like on Mac OS X, you can use the following
+    stylesheet:
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 136
+    
+    The scroll bar using the above stylesheet looks like this:
+        \image stylesheet-scrollbar2.png
+
+
+    To customize a vertical scroll bar use a style sheet similar to the following:
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 137
+
+    \section2 Customizing QSizeGrip
+
+    QSizeGrip is usually styled by just setting an image.
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 138
+
+    \section2 Customizing QSlider
+
+    You can style horizontal slider as below:
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 139
+
+    If you want to change the color of the slider parts before and after the handle, you can use the add-page
+    and sub-page subcontrols. For example, for a vertical slider:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 140
+
+    \section2 Customizing QSpinBox
+
+    QSpinBox can be completely customized as below (the style sheet has commentary inline):
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 141
+
+
+    \section2 Customizing QSplitter
+
+    A QSplitter derives from a QFrame and hence can be styled like a QFrame. 
+    The grip or the handle is customized using the 
+    \l{Qt Style Sheets Reference#handle-sub}{::handle} subcontrol.
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 142
+
+    \section2 Customizing QStatusBar
+
+    We can provide a background for the status bar and a border for items
+    inside the status bar as follows:
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 143
+
+    Note that widgets that have been added to the QStatusBar can be styled
+    using the descendant declaration (i.e)
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 144
+
+    \section2 Customizing QTabWidget and QTabBar
+
+    \image tabWidget-stylesheet1.png
+
+    For the screenshot above, we need a stylesheet as follows:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 145
+
+    Often we require the tabs to overlap to look like below:
+    \image tabWidget-stylesheet2.png
+
+    For a tab widget that looks like above, we make use of 
+    \l{http://www.communitymx.com/content/article.cfm?cid=B0029}
+    {negative margins}. The resulting stylesheet looks like this:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 146
+
+    To move the tab bar to the center (as below), we require the following stylesheet:
+    \image tabWidget-stylesheet3.png
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 147
+
+    The tear indicator and the scroll buttons can be further customized as follows:
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 148
+
+    \section2 Customizing QTableView
+
+    Suppose we'd like our selected item in QTableView to have bubblegum pink
+    fade to white as its background.
+
+    \image tableWidget-stylesheet.png
+
+    This is possible with the
+    \l{stylesheet-reference.html#selection-background-color-prop}
+    {selection-background-color} property and the syntax required is:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 149
+
+    The corner widget can be customized using the following style sheet
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 150
+
+    \section2 Customizing QToolBar
+    
+    The background and the handle of a QToolBar is customized as below:
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 151
+
+    \section2 Customizing QToolBox
+
+    The tabs of the QToolBox are customized using the 'tab' subcontrol.
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 152
+
+    \section2 Customizing QToolButton
+
+    There are three types of QToolButtons.
+    \list
+       \i The QToolButton has no menu. In this case, the QToolButton is styled
+          exactly like QPushButton.  See 
+          \l{#Customizing QPushButton}{Customizing QPushButton} for an
+          example.
+
+       \i The QToolButton has a menu and has the QToolButton::popupMode set to
+          QToolButton::DelayedPopup or QToolButton::InstantPopup. In this case,
+          the QToolButton is styled exactly like a QPushButton with a menu.
+          See \l{#Customizing QPushButton}{Customizing QPushButton} for an
+          example of the usage of the menu-indicator pseudo state.
+
+        \i The QToolButton has its QToolButton::popupMode set to
+           QToolButton::MenuButtonPopup. In this case, we style it as follows:
+    \endlist
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 153
+
+
+    \section2 Customizing QToolTip
+
+    QToolTip is customized exactly like a QLabel. In addition, for platforms
+    that support it, the opacity property may be set to adjust the opacity.
+
+    For example,
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 154
+
+    \section2 Customizing QTreeView
+
+    The background color of alternating rows can be customized using the following
+    style sheet:
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 155
+
+    To provide a special background when you hover over items, we can use the
+    \l{item-sub}{::item} subcontrol. For example,
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 156
+
+    The branches of a QTreeView are styled using the 
+    \l{Qt Style Sheets Reference#branch-sub}{::branch} subcontrol. The
+    following stylesheet color codes the various states when drawing
+    a branch.
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 157
+    
+    Colorful, though it is, a more useful example can be made using the
+    following images:
+
+    \table
+    \row
+    \o \inlineimage stylesheet-vline.png
+    \o \inlineimage stylesheet-branch-more.png
+    \o \inlineimage stylesheet-branch-end.png
+    \o \inlineimage stylesheet-branch-closed.png
+    \o \inlineimage stylesheet-branch-open.png
+    \row
+    \o vline.png
+    \o branch-more.png
+    \o branch-end.png
+    \o branch-closed.png
+    \o branch-open.png
+    \endtable
+
+    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 158
+
+    The resulting tree view looks like this:
+
+    \image stylesheet-treeview.png
+
+    \sa {Style Sheet Example}, {Supported HTML Subset}, QStyle
+
+
+    \section1 Common mistakes
+
+    This section lists some common mistakes when using stylesheets.
+
+    \section2 QPushButton and images
+
+    When styling a QPushButton, it is often desirable to use an image as the
+    button graphic. It is common to try the
+    \l{Qt Style Sheets Reference#background-image-prop}{background-image}
+    property,
+    but this has a number of drawbacks: For instance, the background will
+    often appear hidden behind the button decoration, because it is not
+    considered a background. In addition, if the button is resized, the
+    entire background will be stretched or tiled, which does not
+    always look good.
+
+    It is better to use the
+    \l{Qt Style Sheets Reference#border-image-prop}{border-image}
+    property, as it will always display the image,
+    regardless of the background (you can combine it with a background if it
+    has alpha values in it), and it has special settings to deal with button
+    resizing.
+
+    Consider the following snippet:
+
+    \snippet doc/src/snippets/stylesheet/common-mistakes.cpp 1
+
+    This will produce a button looking like this:
+
+    \image stylesheet-border-image-normal.png
+
+    The numbers after the url gives the top, right, bottom and left number of
+    pixels, respectively. These numbers correspond to the border and should not
+    stretch when the size changes.
+    Whenever you resize the button, the middle part of the image will stretch
+    in both directions, while the pixels specified in the stylesheet
+    will not. This makes the borders of the button look more natural, like
+    this:
+
+    \table
+    \row
+    \o \inlineimage stylesheet-border-image-stretched.png
+    \row
+    \o With borders
+    \endtable
+
+    \table
+    \row
+    \o \inlineimage stylesheet-border-image-wrong.png
+    \row
+    \o Without borders
+    \endtable
+
+    */
diff --git a/doc/src/tech-preview/images/mainwindow-docks-example.png b/doc/src/tech-preview/images/mainwindow-docks-example.png
new file mode 100644
index 0000000000..a5641fd9cd
--- /dev/null
+++ b/doc/src/tech-preview/images/mainwindow-docks-example.png
diff --git a/doc/src/tech-preview/images/mainwindow-docks.png b/doc/src/tech-preview/images/mainwindow-docks.png
new file mode 100644
index 0000000000..96dafc3e7d
--- /dev/null
+++ b/doc/src/tech-preview/images/mainwindow-docks.png
diff --git a/doc/src/tech-preview/images/plaintext-layout.png b/doc/src/tech-preview/images/plaintext-layout.png
new file mode 100644
index 0000000000..9a0f9c15db
--- /dev/null
+++ b/doc/src/tech-preview/images/plaintext-layout.png
diff --git a/doc/src/tech-preview/known-issues.html b/doc/src/tech-preview/known-issues.html
new file mode 100644
index 0000000000..05df69e722
--- /dev/null
+++ b/doc/src/tech-preview/known-issues.html
@@ -0,0 +1,110 @@
+<html>
+<head>
+<title>Known issues</title>
+<link rel="stylesheet" href="http://qtsoftware.com/trollstyle.css">
+<style type="text/css">
+    H2 { position: relative; top: 10px; }
+    H4 { margin-left: 15px; }
+    .issue { margin-left: 15px; }
+    .workaround { margin-left: 30px; margin-right: 30px; padding: 2px; border-style: solid; border-color: #AACA00; border-width: 1px; }
+</style>
+</head>
+<body bgcolor="#ffffff">
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tr bgcolor="#E5E5E5">
+        <td><img src="http://doc.trolltech.com/doctitle.png" width="443" height="32" border="0"></td>
+        <td align="right" valign="middle"></td></tr></table>
+<h1>Known Issues: Qt 4.0.0 Technology Preview 1</h1>
+<p>
+    This is the list of known and reported issues for the the Qt 4.0.0 
+    Technology Preview 1. This list is updated daily.
+</p>
+<br><br>
+<table width="100%">
+    <tr><td align="left"><b><a href="#buildissues">Build Issues</a></b></td></tr>
+    <tr><td align="left"><b><a href="#general">General</a></b></td></tr>
+    <tr><td align="left"><b><a href="#demos">Demos</a></b></td></tr>
+    <tr><td align="left"><b><a href="#window">Windows specific</a></b></td></tr>
+    <tr><td align="left"><b><a href="#x11">X11 specific</a></b></td></tr>
+    <tr><td align="left"><b><a href="#mac">Mac specific</a></b></td></tr>
+</table>
+<br><br>
+<!-- Build section ------------------------------------------------- -->
+<a name="buildissues"></a>
+<h2>Build Issues</h2>
+    <h4>Static libraries on Mac OS X</h4>
+    <p class="issue">Building a static build on mac will fail the first time.</p>
+    <p class="workaround">Run qmake a second time.</p>
+    
+    <h4>QTDIR</h4>
+    <p class="issue">Some applications(e.g. uic3) need QTDIR set and QTDIR/bin in the path to work.</p>
+    <p class="workaround">Set QTDIR and PATH as described in INSTALL.</p>
+
+    <h4>ODBC driver on Windows</h4>
+    <p class="issue">Problems compiling the ODBC driver.</p>
+    <p class="workaround">Change the include from qapplication.h to qcoreapplication.h</p>
+
+    <h4>QtGui does not link because of accessibility errors</h4>
+    <p class="issue">undefined reference to QAccessible::setRootObject(QObject*)</p>
+    <p class="workaround">Rerun configure and rebuild, if that does not help, add the contents of $QTDIR/.qt.config to $QTDIR/.qmake.cache</p>
+
+
+<!-- General section ---------------------------------------------- -->
+<a name="general"></a>
+<h2>General</h2>
+
+    <h4>No connection to Oracle</h4>
+    <p class="issue">I cannot connect to my Oracle server</p>
+    <p class="workaround">Use the Oracle &gt;= 9 client libraries, currently there is no workaround for OCI 8</p>
+
+    <h4>QSqlModel</h4>
+    <p class="issue">Only the first 16 rows from a database result are displayed</p>
+    <p class="workaround">You are using a database driver which does not report back the size of a result set and incremental fetching is not yet implemented in the itemviews. You can either use another database like MySQL or increase the QSQL_PREFETCH in qsqlmodel.cpp</p>
+
+
+<!-- Demos section ------------------------------------------------- -->
+<a name="demos"></a>
+<h2>Demos</h2>
+
+    <h4>-</h4>
+
+
+<!-- Windows platform section -------------------------------------- -->
+<a name="window"></a>
+<h2>Windows specific</h2>
+
+    <h4>Qt Assistant</h4>
+    <p class="issue">Problems with zooming and laying out text. Sometimes the text overlaps.</p>
+
+    <h4>GDI handle leak</h4>
+    <p class="issue">Setting fonts through QPainter::setFont() leaks GDI
+    handles on windows. This is for instance visible in the OpenGL
+    part of the Arthur demo. The issue will be fixed before the next
+    preview.</p>
+
+<!-- X11 platform section ------------------------------------------ -->
+<a name="x11"></a>
+<h2>X11 specific</h2>
+
+    <h4>-</h4>
+
+
+<!-- Mac platform section ------------------------------------------ -->
+<a name="mac"></a>
+<h2>Mac specific</h2>
+
+    <h4>QComboBox</h4>
+    <p class="issue">Does not have the native Mac look and feel yet. It is rendered in a Windows-like style.</p>
+
+    <h4>Clicking on widgets</h4>
+    <p class="issue"><i>Jaguar 10.2 only:</i> Clicking on widgets that has a focusrect may fail.</p>
+    <p class="workaround">Use 10.3 for now.</p>
+
+    
+<!-- [Page footer] ------------------------------------------------- -->
+<table width="100%">
+    <tr><td><hr size="1" noshade></td></tr>
+    <tr><td align="center" valign="bottom"><a href="http://qtsoftware.com">qtsoftware.com</a></td></tr>
+</table>
+</body>
+</html>
diff --git a/doc/src/templates.qdoc b/doc/src/templates.qdoc
new file mode 100644
index 0000000000..ab602a7d49
--- /dev/null
+++ b/doc/src/templates.qdoc
@@ -0,0 +1,230 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page templates.html
+    \title Why Doesn't Qt Use Templates for Signals and Slots?
+    \ingroup architecture
+    \brief The reasoning behind Qt's implementation of signals and slots.
+
+    Templates are a builtin mechanism in C++ that allows the compiler to
+    generate code on the fly, depending on the type of the arguments
+    passed. As such, templates are highly interesting to framework
+    creators, and we do use advanced templates in many places
+    in Qt. However, there are limitations: There are things that you can
+    easily express with templates, and there are things that are
+    impossible to express with templates. A generic vector container class
+    is easily expressible, even with partial specialisation for pointer
+    types, while a function that sets up a graphical user interface based
+    on a XML description given as a string is not expressible as
+    template. And then there is gray area in between. Things that you can
+    hack with templates at the cost of code size, readability,
+    portability, usability, extensability, robustness and ultimately
+    design beauty. Both templates and the C preprocessor can be stretched
+    to do incredibility smart and mind boggling things. But just because
+    those things can be done, does not necessarily mean doing them is the
+    right design choice.
+
+    There is an important practical challenge we have to mention: due to
+    the inadequacies of various compilers it is still not possible to
+    fully exploit the template mechanism in cross-platform
+    applications. Code unfortunately is not meant to be published in
+    books, but compiled with real-world compilers on real-world operating
+    system. Even today, many widely used C++ compilers have problems with
+    advanced templates. For example, you cannot safely rely on partial
+    template specialisation, which is essential for some non-trivial
+    problem domains. Some compilers also have limitations with regards to
+    template member functions, which make it hard to combine generic
+    programming with object orientated programming. However, we do not
+    perceive these problems as a serious limitation in our work. Even if
+    all our users had access to a fully standards compliant modern C++
+    compiler with excellent template support, we would not abandon the
+    string-based approach used by our meta object compiler for a template
+    based signals and slots system. Here are five reasons why:
+
+    \section1 Syntax matters
+
+    Syntax isn't just sugar: the syntax we use to express our algorithms can
+    significantly affect the readability and maintainability of our code.
+    The syntax used for Qt's signals and slots has proved very successful in
+    practice. The syntax is intuitive, simple to use and easy to read.
+    People learning Qt find the syntax helps them understand and utilize the
+    signals and slots concept -- despite its highly abstract and generic
+    nature. Furthermore, declaring signals in class definitions ensures that
+    the signals are protected in the sense of protected C++ member
+    functions. This helps programmers get their design right from the very
+    beginning, without even having to think about design patterns.
+
+    \section1 Code Generators are Good
+
+    Qt's \c{moc} (Meta Object Compiler) provides a clean way to go
+    beyond the compiled language's facilities. It does so by generating
+    additional C++ code which can be compiled by any standard C++ compiler.
+    The \c{moc} reads C++ source files. If it finds one or more class
+    declarations that contain the Q_OBJECT macro, it produces another C++
+    source file which contains the meta object code for those classes. The
+    C++ source file generated by the \c{moc} must be compiled and
+    linked with the implementation of the class (or it can be
+    \c{#included} into the class's source file). Typically \c{moc}
+    is not called manually, but automatically by the build system, so it
+    requires no additional effort by the programmer.
+
+    The \c{moc} is not the only code generator Qt is using. Another
+    prominent example is the \c{uic} (User Interface Compiler). It
+    takes a user interface description in XML and creates C++ code that
+    sets up the form. Outside Qt, code generators are common as well. Take
+    for example \c{rpc} and \c{idl}, that enable programs or
+    objects to communicate over process or machine boundaries. Or the vast
+    variety of scanner and parser generators, with \c{lex} and
+    \c{yacc} being the most well-known ones. They take a grammar
+    specification as input and generate code that implements a state
+    machine. The alternatives to code generators are hacked compilers,
+    proprietary languages or graphical programming tools with one-way
+    dialogs or wizards that generate obscure code during design time
+    rather than compile time. Rather than locking our customers into a
+    proprietary C++ compiler or into a particular Integrated Development
+    Environment, we enable them to use whatever tools they prefer. Instead
+    of forcing programmers to add generated code into source repositories,
+    we encourage them to add our tools to their build system: cleaner,
+    safer and more in the spirit of UNIX.
+
+
+    \section1 GUIs are Dynamic
+
+    C++ is a standarized, powerful and elaborate general-purpose language.
+    It's the only language that is exploited on such a wide range of
+    software projects, spanning every kind of application from entire
+    operating systems, database servers and high end graphics
+    applications to common desktop applications. One of the keys to C++'s
+    success is its scalable language design that focuses on maximum
+    performance and minimal memory consumption whilst still maintaining
+    ANSI C compatibility.
+
+    For all these advantages, there are some downsides. For C++, the static
+    object model is a clear disadvantage over the dynamic messaging approach
+    of Objective C when it comes to component-based graphical user interface
+    programming. What's good for a high end database server or an operating
+    system isn't necessarily the right design choice for a GUI frontend.
+    With \c{moc}, we have turned this disadvantage into an advantage,
+    and added the flexibility required to meet the challenge of safe and
+    efficient graphical user interface programming.
+
+    Our approach goes far beyond anything you can do with templates. For
+    example, we can have object properties. And we can have overloaded
+    signals and slots, which feels natural when programming in a language
+    where overloads are a key concept. Our signals add zero bytes to the
+    size of a class instance, which means we can add new signals without
+    breaking binary compatibility. Because we do not rely on excessive
+    inlining as done with templates, we can keep the code size smaller.
+    Adding new connections just expands to a simple function call rather
+    than a complex template function. 
+
+    Another benefit is that we can explore an object's signals and slots at
+    runtime. We can establish connections using type-safe call-by-name,
+    without having to know the exact types of the objects we are connecting.
+    This is impossible with a template based solution. This kind of runtime
+    introspection opens up new possibilities, for example GUIs that are
+    generated and connected from Qt Designer's XML \c{ui} files. 
+
+    \section1 Calling Performance is Not Everything
+
+    Qt's signals and slots implementation is not as fast as a
+    template-based solution. While emitting a signal is approximately the
+    cost of four ordinary function calls with common template
+    implementations, Qt requires effort comparable to about ten function
+    calls. This is not surprising since the Qt mechanism includes a
+    generic marshaller, introspection, queued calls between different
+    threads, and ultimately scriptability. It does not rely on excessive
+    inlining and code expansion and it provides unmatched runtime
+    safety. Qt's iterators are safe while those of faster template-based
+    systems are not. Even during the process of emitting a signal to
+    several receivers, those receivers can be deleted safely without your
+    program crashing. Without this safety, your application would
+    eventually crash with a difficult to debug free'd memory read or write
+    error.
+
+    Nonetheless, couldn't a template-based solution improve the performance
+    of an application using signals and slots? While it is true that Qt adds
+    a small overhead to the cost of calling a slot through a signal, the
+    cost of the call is only a small proportion of the entire cost of a
+    slot. Benchmarking against Qt's signals and slots system is typically
+    done with empty slots. As soon as you do anything useful in your slots,
+    for example a few simple string operations, the calling overhead becomes
+    negligible. Qt's system is so optimized that anything that requires
+    operator new or delete (for example, string operations or
+    inserting/removing something from a template container) is significantly
+    more expensive than emitting a signal.
+
+    Aside: If you have a signals and slots connection in a tight inner loop
+    of a performance critical task and you identify this connection as the
+    bottleneck, think about using the standard listener-interface pattern
+    rather than signals and slots. In cases where this occurs, you probably
+    only require a 1:1 connection anyway. For example, if you have an object
+    that downloads data from the network, it's a perfectly sensible design
+    to use a signal to indicate that the requested data arrived. But if you
+    need to send out every single byte one by one to a consumer, use a
+    listener interface rather than signals and slots.
+
+    \section1 No Limits
+
+    Because we had the \c{moc} for signals and slots, we could add
+    other useful things to it that could not be done with templates.
+    Among these are scoped translations via a generated \c{tr()}
+    function, and an advanced property system with introspection and
+    extended runtime type information. The property system alone is a
+    great advantage: a powerful and generic user interface design tool
+    like Qt Designer would be a lot harder to write - if not impossible -
+    without a powerful and introspective property system. But it does not
+    end here. We also provide a dynamic qobject_cast<T>() mechanism
+    that does not rely on the system's RTTI and thus does not share its
+    limitations. We use it to safely query interfaces from dynamically
+    loaded components. Another application domain are dynamic meta
+    objects. We can e.g. take ActiveX components and at runtime create a
+    meta object around it. Or we can export Qt components as ActiveX
+    components by exporting its meta object. You cannot do either of these
+    things with templates.
+
+    C++ with the \c{moc} essentially gives us the flexibility of
+    Objective-C or of a Java Runtime Environment, while maintaining C++'s
+    unique performance and scalability advantages. It is what makes Qt the
+    flexible and comfortable tool we have today.
+
+*/
diff --git a/doc/src/threads.qdoc b/doc/src/threads.qdoc
new file mode 100644
index 0000000000..54bcf2ddea
--- /dev/null
+++ b/doc/src/threads.qdoc
@@ -0,0 +1,609 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page threads.html
+    \title Thread Support in Qt
+    \ingroup architecture
+    \brief A detailed discussion of thread handling in Qt.
+
+    Qt provides thread support in the form of platform-independent
+    threading classes, a thread-safe way of posting events, and
+    signal-slot connections across threads. This makes it easy to
+    develop portable multithreaded Qt applications and take advantage
+    of multiprocessor machines. Multithreaded programming is also a
+    useful paradigm for performing time-consuming operations without
+    freezing the user interface of an application.
+
+    Earlier versions of Qt offered an option to build the library
+    without thread support. Since Qt 4.0, threads are always enabled.
+
+    This document is intended for an audience that has knowledge of,
+    and experience with, multithreaded applications. If you are new
+    to threading see our \l{#reading}{Recommended Reading} list.
+
+    Topics:
+
+    \tableofcontents
+
+    \section1 The Threading Classes
+
+    Qt includes the following thread classes:
+
+    \list
+    \o QThread provides the means to start a new thread.
+    \o QThreadStorage provides per-thread data storage.
+    \o QThreadPool manages a pool of threads that run QRunnable objects.
+    \o QRunnable is an abstract class representing a runnable object.
+    \o QMutex provides a mutual exclusion lock, or mutex.
+    \o QMutexLocker is a convenience class that automatically locks
+       and unlocks a QMutex.
+    \o QReadWriteLock provides a lock that allows simultaneous read access.
+    \o QReadLocker and QWriteLocker are convenience classes that automatically
+       lock and unlock a QReadWriteLock.
+    \o QSemaphore provides an integer semaphore (a generalization of a mutex).
+    \o QWaitCondition provides a way for threads to go to sleep until
+       woken up by another thread.
+    \o QAtomicInt provides atomic operations on integers.
+    \o QAtomicPointer provides atomic operations on pointers.
+    \endlist
+
+    \note Qt's threading classes are implemented with native threading APIs;
+    e.g., Win32 and pthreads. Therefore, they can be used with threads of the
+    same native API.
+
+    \section2 Creating a Thread
+
+    To create a thread, subclass QThread and reimplement its
+    \l{QThread::run()}{run()} function. For example:
+
+    \snippet doc/src/snippets/threads/threads.h 0
+    \codeline
+    \snippet doc/src/snippets/threads/threads.cpp 0
+    \snippet doc/src/snippets/threads/threads.cpp 1
+    \dots
+    \snippet doc/src/snippets/threads/threads.cpp 2
+
+    Then, create an instance of the thread object and call
+    QThread::start(). The code that appears in the
+    \l{QThread::run()}{run()} reimplementation will then be executed
+    in a separate thread. Creating threads is explained in more
+    detail in the QThread documentation.
+
+    Note that QCoreApplication::exec() must always be called from the
+    main thread (the thread that executes \c{main()}), not from a
+    QThread. In GUI applications, the main thread is also called the
+    GUI thread because it's the only thread that is allowed to
+    perform GUI-related operations.
+
+    In addition, you must create the QApplication (or
+    QCoreApplication) object before you can create a QThread.
+
+    \section2 Synchronizing Threads
+
+    The QMutex, QReadWriteLock, QSemaphore, and QWaitCondition
+    classes provide means to synchronize threads. While the main idea
+    with threads is that they should be as concurrent as possible,
+    there are points where threads must stop and wait for other
+    threads. For example, if two threads try to access the same
+    global variable simultaneously, the results are usually
+    undefined.
+
+    QMutex provides a mutually exclusive lock, or mutex. At most one
+    thread can hold the mutex at any time. If a thread tries to
+    acquire the mutex while the mutex is already locked, the thread will
+    be put to sleep until the thread that currently holds the mutex
+    unlocks it. Mutexes are often used to protect accesses to shared
+    data (i.e., data that can be accessed from multiple threads
+    simultaneously). In the \l{Reentrancy and Thread-Safety} section
+    below, we will use it to make a class thread-safe.
+
+    QReadWriteLock is similar to QMutex, except that it distinguishes
+    between "read" and "write" access to shared data and allows
+    multiple readers to access the data simultaneously. Using
+    QReadWriteLock instead of QMutex when it is possible can make
+    multithreaded programs more concurrent.
+
+    QSemaphore is a generalization of QMutex that protects a certain
+    number of identical resources. In contrast, a mutex protects
+    exactly one resource. The \l{threads/semaphores}{Semaphores}
+    example shows a typical application of semaphores: synchronizing
+    access to a circular buffer between a producer and a consumer.
+
+    QWaitCondition allows a thread to wake up other threads when some
+    condition has been met. One or many threads can block waiting for
+    a QWaitCondition to set a condition with
+    \l{QWaitCondition::wakeOne()}{wakeOne()} or
+    \l{QWaitCondition::wakeAll()}{wakeAll()}. Use
+    \l{QWaitCondition::wakeOne()}{wakeOne()} to wake one randomly
+    selected event or \l{QWaitCondition::wakeAll()}{wakeAll()} to
+    wake them all. The \l{threads/waitconditions}{Wait Conditions}
+    example shows how to solve the producer-consumer problem using
+    QWaitCondition instead of QSemaphore.
+
+    Note that Qt's synchronization classes rely on the use of properly
+    aligned pointers. For instance, you cannot use packed classes with
+    MSVC.
+
+    \target qtconcurrent intro
+    \section1 QtConcurrent
+
+    The QtConcurrent namespace provides high-level APIs that make it
+    possible to write multi-threaded programs without using low-level
+    threading primitives such as mutexes, read-write locks, wait
+    conditions, or semaphores. Programs written with QtConcurrent
+    automatically adjust the number of threads used according to the
+    number of processor cores available. This means that applications
+    written today will continue to scale when deployed on multi-core
+    systems in the future.
+
+    QtConcurrent includes functional programming style APIs for
+    parallel list processing, including a MapReduce and FilterReduce
+    implementation for shared-memory (non-distributed) systems, and
+    classes for managing asynchronous computations in GUI
+    applications:
+
+    \list
+
+    \o QtConcurrent::map() applies a function to every item in a container,
+    modifying the items in-place.
+
+    \o QtConcurrent::mapped() is like map(), except that it returns a new
+    container with the modifications.
+
+    \o QtConcurrent::mappedReduced() is like mapped(), except that the
+    modified results are reduced or folded into a single result.
+
+    \o QtConcurrent::filter() removes all items from a container based on the
+    result of a filter function.
+
+    \o QtConcurrent::filtered() is like filter(), except that it returns a new
+    container with the filtered results.
+
+    \o QtConcurrent::filteredReduced() is like filtered(), except that the
+    filtered results are reduced or folded into a single result.
+
+    \o QtConcurrent::run() runs a function in another thread.
+
+    \o QFuture represents the result of an asynchronous computation.
+
+    \o QFutureIterator allows iterating through results available via QFuture.
+
+    \o QFutureWatcher allows monitoring a QFuture using signals-and-slots.
+
+    \o QFutureSynchronizer is a convenience class that automatically
+    synchronizes several QFutures.
+
+    \endlist
+
+    Qt Concurrent supports several STL-compatible container and iterator types, 
+    but works best with Qt containers that have random-access iterators, such as 
+    QList or QVector. The map and filter functions accept both containers and begin/end iterators.
+
+    STL Iterator support overview:
+
+    \table
+    \header
+        \o Iterator Type
+        \o Example classes
+        \o Support status
+    \row
+        \o Input Iterator
+        \o 
+        \o Not Supported
+    \row
+        \o Output Iterator
+        \o 
+        \o Not Supported
+    \row
+        \o Forward Iterator
+        \o std::slist
+        \o Supported
+    \row
+        \o Bidirectional Iterator
+        \o QLinkedList, std::list
+        \o Supported
+    \row
+        \o Random Access Iterator
+        \o QList, QVector, std::vector
+        \o Supported and Recommended
+    \endtable
+    
+    Random access iterators can be faster in cases where Qt Concurrent is iterating
+    over a large number of lightweight items, since they allow skipping to any point
+    in the container. In addition, using random access iterators allows Qt Concurrent
+    to provide progress information trough QFuture::progressValue() and QFutureWatcher::
+    progressValueChanged().
+
+    The non in-place modifying functions such as mapped() and filtered() makes a 
+    copy of the container when called. If you are using STL containers this copy operation
+    might take some time, in this case we recommend specifying the begin and end iterators
+    for the container instead.
+
+    \keyword reentrant
+    \keyword thread-safe
+    \section1 Reentrancy and Thread-Safety
+
+    Throughout the Qt documentation, the terms \e reentrant and \e
+    thread-safe are used to specify how a function can be used in
+    multithreaded applications:
+
+    \list
+    \o A \e reentrant function can be called simultaneously by
+       multiple threads provided that each invocation of the function
+       references unique data.
+    \o A \e thread-safe function can be called simultaneously by
+       multiple threads when each invocation references shared data.
+       All access to the shared data is serialized.
+    \endlist
+
+    By extension, a class is said to be reentrant if each and every
+    one of its functions can be called simultaneously by multiple
+    threads on different instances of the class. Similarly, the class
+    is said to be thread-safe if the functions can be called by
+    different threads on the same instance.
+
+    Classes in the documentation will be documented as thread-safe only
+    if they are intended to be used by multiple threads.
+
+    Note that the terminology in this domain isn't entirely
+    standardized. POSIX uses a somewhat different definition of
+    reentrancy and thread-safety for its C APIs. When dealing with an
+    object-oriented C++ class library such as Qt, the definitions
+    must be adapted.
+
+    Most C++ classes are inherently reentrant, since they typically
+    only reference member data. Any thread can call such a member
+    function on an instance of the class, as long as no other thread
+    is calling a member function on the same instance. For example,
+    the \c Counter class below is reentrant:
+
+    \snippet doc/src/snippets/threads/threads.cpp 3
+    \snippet doc/src/snippets/threads/threads.cpp 4
+
+    The class isn't thread-safe, because if multiple threads try to
+    modify the data member \c n, the result is undefined. This is
+    because C++'s \c ++ and \c -- operators aren't necessarily
+    atomic. Indeed, they usually expand to three machine
+    instructions:
+
+    \list 1
+    \o Load the variable's value in a register.
+    \o Increment or decrement the register's value.
+    \o Store the register's value back into main memory.
+    \endlist
+
+    If thread A and thread B load the variable's old value
+    simultaneously, increment their register, and store it back, they
+    end up overwriting each other, and the variable is incremented
+    only once!
+
+    Clearly, the access must be serialized: Thread A must perform
+    steps 1, 2, 3 without interruption (atomically) before thread B
+    can perform the same steps; or vice versa. An easy way to make
+    the class thread-safe is to protect all access to the data
+    members with a QMutex:
+
+    \snippet doc/src/snippets/threads/threads.cpp 5
+    \snippet doc/src/snippets/threads/threads.cpp 6
+
+    The QMutexLocker class automatically locks the mutex in its
+    constructor and unlocks it when the destructor is invoked, at the
+    end of the function. Locking the mutex ensures that access from
+    different threads will be serialized. The \c mutex data member is
+    declared with the \c mutable qualifier because we need to lock
+    and unlock the mutex in \c value(), which is a const function.
+
+    Most Qt classes are reentrant and not thread-safe, to avoid the
+    overhead of repeatedly locking and unlocking a QMutex. For
+    example, QString is reentrant, meaning that you can use it in
+    different threads, but you can't access the same QString object
+    from different threads simultaneously (unless you protect it with
+    a mutex yourself). A few classes and functions are thread-safe;
+    these are mainly thread-related classes such as QMutex, or
+    fundamental functions such as QCoreApplication::postEvent().
+
+    \section1 Threads and QObjects
+
+    QThread inherits QObject. It emits signals to indicate that the
+    thread started or finished executing, and provides a few slots as
+    well.
+
+    More interesting is that \l{QObject}s can be used in multiple
+    threads, emit signals that invoke slots in other threads, and
+    post events to objects that "live" in other threads. This is
+    possible because each thread is allowed to have its own event
+    loop.
+
+    \section2 QObject Reentrancy
+
+    QObject is reentrant. Most of its non-GUI subclasses, such as
+    QTimer, QTcpSocket, QUdpSocket, QHttp, QFtp, and QProcess, are
+    also reentrant, making it possible to use these classes from
+    multiple threads simultaneously. Note that these classes are
+    designed to be created and used from within a single thread;
+    creating an object in one thread and calling its functions from
+    another thread is not guaranteed to work. There are three
+    constraints to be aware of:
+
+    \list
+    \o \e{The child of a QObject must always be created in the thread
+       where the parent was created.} This implies, among other
+       things, that you should never pass the QThread object (\c
+       this) as the parent of an object created in the thread (since
+       the QThread object itself was created in another thread).
+
+    \o \e{Event driven objects may only be used in a single thread.}
+       Specifically, this applies to the \l{timers.html}{timer
+       mechanism} and the \l{QtNetwork}{network module}. For example,
+       you cannot start a timer or connect a socket in a thread that
+       is not the \l{QObject::thread()}{object's thread}.
+
+    \o \e{You must ensure that all objects created in a thread are
+       deleted before you delete the QThread.} This can be done
+       easily by creating the objects on the stack in your
+       \l{QThread::run()}{run()} implementation.
+    \endlist
+
+    Although QObject is reentrant, the GUI classes, notably QWidget
+    and all its subclasses, are not reentrant. They can only be used
+    from the main thread. As noted earlier, QCoreApplication::exec()
+    must also be called from that thread.
+
+    In practice, the impossibility of using GUI classes in other
+    threads than the main thread can easily be worked around by
+    putting time-consuming operations in a separate worker thread and
+    displaying the results on screen in the main thread when the
+    worker thread is finished. This is the approach used for
+    implementing the \l{threads/mandelbrot}{Mandelbrot} and
+    the \l{network/blockingfortuneclient}{Blocking Fortune Client}
+    example.
+
+    \section2 Per-Thread Event Loop
+
+    Each thread can have its own event loop. The initial thread
+    starts its event loops using QCoreApplication::exec(); other
+    threads can start an event loop using QThread::exec(). Like
+    QCoreApplication, QThread provides an
+    \l{QThread::exit()}{exit(int)} function and a
+    \l{QThread::quit()}{quit()} slot.
+
+    An event loop in a thread makes it possible for the thread to use
+    certain non-GUI Qt classes that require the presence of an event
+    loop (such as QTimer, QTcpSocket, and QProcess). It also makes it
+    possible to connect signals from any threads to slots of a
+    specific thread. This is explained in more detail in the
+    \l{Signals and Slots Across Threads} section below.
+
+    \image threadsandobjects.png Threads, objects, and event loops
+
+    A QObject instance is said to \e live in the thread in which it
+    is created. Events to that object are dispatched by that thread's
+    event loop. The thread in which a QObject lives is available using
+    QObject::thread().
+
+    Note that for QObjects that are created before QApplication,
+    QObject::thread() returns zero. This means that the main thread
+    will only handle posted events for these objects; other event
+    processing is not done at all for objects with no thread. Use the
+    QObject::moveToThread() function to change the thread affinity for
+    an object and its children (the object cannot be moved if it has a
+    parent).
+
+    Calling \c delete on a QObject from another thread than the
+    thread where it is created (or accessing the object in other
+    ways) is unsafe unless you can guarantee that the object isn't
+    processing events at the same moment. Use QObject::deleteLater()
+    instead; it will post a
+    \l{QEvent::DeferredDelete}{DeferredDelete} event, which the
+    event loop of the object's thread will eventually pick up.
+
+    If no event loop is running, events won't be delivered to the
+    object. For example, if you create a QTimer object in a thread
+    but never call \l{QThread::exec()}{exec()}, the QTimer will never emit its
+    \l{QTimer::timeout()}{timeout()} signal. Calling
+    \l{QObject::deleteLater()}{deleteLater()} won't work either. (These
+    restrictions apply to the main thread as well.)
+
+    You can manually post events to any object in any thread at any
+    time using the thread-safe function
+    QCoreApplication::postEvent(). The events will automatically be
+    dispatched by the event loop of the thread where the object was
+    created.
+
+    Event filters are supported in all threads, with the restriction
+    that the monitoring object must live in the same thread as the
+    monitored object. Similarly, QCoreApplication::sendEvent()
+    (unlike \l{QCoreApplication::postEvent()}{postEvent()}) can only
+    be used to dispatch events to objects living in the thread from
+    which the function is called.
+
+    \section2 Accessing QObject Subclasses from Other Threads
+
+    QObject and all of its subclasses are not thread-safe. This
+    includes the entire event delivery system. It is important to keep
+    in mind that the event loop may be delivering events to your
+    QObject subclass while you are accessing the object from another
+    thread.
+
+    If you are calling a function on an QObject subclass that doesn't
+    live in the current thread and the object might receive events,
+    you must protect all access to your QObject subclass's internal
+    data with a mutex; otherwise, you may experience crashes or other
+    undesired behavior.
+
+    Like other objects, QThread objects live in the thread where the
+    object was created -- \e not in the thread that is created when
+    QThread::run() is called. It is generally unsafe to provide slots
+    in your QThread subclass, unless you protect the member variables
+    with a mutex.
+
+    On the other hand, you can safely emit signals from your
+    QThread::run() implementation, because signal emission is
+    thread-safe.
+
+    \section2 Signals and Slots Across Threads
+
+    Qt supports three types of signal-slot connections:
+
+    \list
+    \o With \l{Qt::DirectConnection}{direct connections}, the
+       slot gets called immediately when the signal is emitted. The
+       slot is executed in the thread that emitted the signal (which
+       is not necessarily the thread where the receiver object
+       lives).
+
+    \o With \l{Qt::QueuedConnection}{queued connections}, the
+       slot is invoked when control returns to the event loop of the
+       thread to which the object belongs. The slot is executed in
+       the thread where the receiver object lives.
+
+    \o With \l{Qt::AutoConnection}{auto connections} (the default),
+       the behavior is the same as with direct connections if
+       the signal is emitted in the thread where the receiver lives;
+       otherwise, the behavior is that of a queued connection.
+    \endlist
+
+    The connection type can be specified by passing an additional
+    argument to \l{QObject::connect()}{connect()}. Be aware that
+    using direct connections when the sender and receiver live in
+    different threads is unsafe if an event loop is running in the
+    receiver's thread, for the same reason that calling any function
+    on an object living in another thread is unsafe.
+
+    QObject::connect() itself is thread-safe.
+
+    The \l{threads/mandelbrot}{Mandelbrot} example uses a queued
+    connection to communicate between a worker thread and the main
+    thread. To avoid freezing the main thread's event loop (and, as a
+    consequence, the application's user interface), all the
+    Mandelbrot fractal computation is done in a separate worker
+    thread. The thread emits a signal when it is done rendering the
+    fractal.
+
+    Similarly, the \l{network/blockingfortuneclient}{Blocking Fortune
+    Client} example uses a separate thread for communicating with
+    a TCP server asynchronously.
+
+    \section1 Threads and Implicit Sharing
+
+    Qt uses an optimization called \l{implicit sharing} for many of
+    its value class, notably QImage and QString. Beginning with Qt 4,
+    implicit shared classes can safely be copied across threads, like
+    any other value classes. They are fully
+    \l{#reentrant}{reentrant}. The implicit sharing is really
+    \e implicit.
+
+    In many people's minds, implicit sharing and multithreading are
+    incompatible concepts, because of the way the reference counting
+    is typically done. Qt, however, uses atomic reference counting to
+    ensure the integrity of the shared data, avoiding potential
+    corruption of the reference counter.
+
+    Note that atomic reference counting does not guarantee
+    \l{#thread-safe}{thread-safety}. Proper locking should be used
+    when sharing an instance of an implicitly shared class between
+    threads. This is the same requirement placed on all
+    \l{#reentrant}{reentrant} classes, shared or not. Atomic reference
+    counting does, however, guarantee that a thread working on its
+    own, local instance of an implicitly shared class is safe. We
+    recommend using \l{Signals and Slots Across Threads}{signals and
+    slots} to pass data between threads, as this can be done without
+    the need for any explicit locking.
+
+    To sum it up, implicitly shared classes in Qt 4 are really \e
+    implicitly shared. Even in multithreaded applications, you can
+    safely use them as if they were plain, non-shared, reentrant
+    value-based classes.
+
+    \section1 Threads and the SQL Module
+
+    A connection can only be used from within the thread that created it.
+    Moving connections between threads or creating queries from a different
+    thread is not supported.
+
+    In addition, the third party libraries used by the QSqlDrivers can impose
+    further restrictions on using the SQL Module in a multithreaded program.
+    Consult the manual of your database client for more information
+
+    \section1 Painting in Threads
+
+    QPainter can be used to paint onto QImage, QPrinter, and QPicture
+    paint devices. Painting onto QPixmaps and QWidgets is \e not
+    supported. On Mac OS X the automatic progress dialog will not be 
+    displayed if you are printing from outside the GUI thread.
+
+    Any number of threads can paint at any given time, however only
+    one thread at a time can paint on a given paint device. In other
+    words, two threads can paint at the same time if each paints onto
+    separate QImages, but the two threads cannot paint onto the same
+    QImage at the same time.
+
+    Note that on X11 systems without FontConfig support, Qt cannot
+    render text outside of the GUI thread. You can use the
+    QFontDatabase::supportsThreadedFontRendering() function to detect
+    whether or not font rendering can be used outside the GUI thread.
+
+    \section1 Threads and Rich Text Processing
+
+    The QTextDocument, QTextCursor, and \link richtext.html all
+    related classes\endlink are reentrant.
+
+    Note that a QTextDocument instance created in the GUI thread may
+    contain QPixmap image resources. Use QTextDocument::clone() to
+    create a copy of the document, and pass the copy to another thread for
+    further processing (such as printing).
+
+    \section1 Threads and the SVG module
+
+     The QSvgGenerator and QSvgRenderer classes in the QtSvg module
+     are reentrant.
+
+    \target reading
+    \section1 Recommended Reading
+
+    \list
+    \o \l{Threads Primer: A Guide to Multithreaded Programming}
+    \o \l{Thread Time: The Multithreaded Programming Guide}
+    \o \l{Pthreads Programming: A POSIX Standard for Better Multiprocessing}
+    \o \l{Win32 Multithreaded Programming}
+    \endlist
+*/
diff --git a/doc/src/timers.qdoc b/doc/src/timers.qdoc
new file mode 100644
index 0000000000..4f54343063
--- /dev/null
+++ b/doc/src/timers.qdoc
@@ -0,0 +1,136 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page timers.html
+    \title Timers
+    \ingroup architecture
+    \brief How to use timers in your application.
+
+    QObject, the base class of all Qt objects, provides the basic
+    timer support in Qt. With QObject::startTimer(), you start a
+    timer with an interval in milliseconds as argument. The function
+    returns a unique integer timer ID. The timer will now fire at
+    regular intervals until you explicitly call QObject::killTimer()
+    with the timer ID.
+
+    For this mechanism to work, the application must run in an event
+    loop. You start an event loop with QApplication::exec(). When a
+    timer fires, the application sends a QTimerEvent, and the flow of
+    control leaves the event loop until the timer event is processed.
+    This implies that a timer cannot fire while your application is
+    busy doing something else. In other words: the accuracy of timers
+    depends on the granularity of your application.
+
+    In multithreaded applications, you can use the timer mechanism in
+    any thread that has an event loop. To start an event loop from a
+    non-GUI thread, use QThread::exec(). Qt uses the the object's
+    \l{QObject::thread()}{thread affinity} to determine which thread
+    will deliver the QTimerEvent. Because of this, you must start and
+    stop all timers in the object's thread; it is not possible to
+    start timers for objects in another thread.
+
+    The upper limit for the interval value is determined by the number
+    of milliseconds that can be specified in a signed integer
+    (in practice, this is a period of just over 24 days). The accuracy
+    depends on the underlying operating system. Windows 98 has 55
+    millisecond accuracy; other systems that we have tested can handle
+    1 millisecond intervals.
+
+    The main API for the timer functionality is QTimer. That class
+    provides regular timers that emit a signal when the timer fires, and
+    inherits QObject so that it fits well into the ownership structure
+    of most GUI programs. The normal way of using it is like this:
+
+    \snippet doc/src/snippets/timers/timers.cpp 0
+    \snippet doc/src/snippets/timers/timers.cpp 1
+    \snippet doc/src/snippets/timers/timers.cpp 2
+
+    The QTimer object is made into a child of this widget so that,
+    when this widget is deleted, the timer is deleted too.
+    Next, its \l{QTimer::}{timeout()} signal is connected to the slot
+    that will do the work, it is started with a value of 1000
+    milliseconds, indicating that it will time out every second.
+
+    QTimer also provides a static function for single-shot timers.
+    For example:
+
+    \snippet doc/src/snippets/timers/timers.cpp 3
+
+    200 milliseconds (0.2 seconds) after this line of code is
+    executed, the \c updateCaption() slot will be called.
+
+    For QTimer to work, you must have an event loop in your
+    application; that is, you must call QCoreApplication::exec()
+    somewhere. Timer events will be delivered only while the event
+    loop is running.
+
+    In multithreaded applications, you can use QTimer in any thread
+    that has an event loop. To start an event loop from a non-GUI
+    thread, use QThread::exec(). Qt uses the the timer's
+    \l{QObject::thread()}{thread affinity} to determine which thread
+    will emit the \l{QTimer::}{timeout()} signal. Because of this, you
+    must start and stop the timer in its thread; it is not possible to
+    start a timer from another thread.
+
+    The \l{widgets/analogclock}{Analog Clock} example shows how to use
+    QTimer to redraw a widget at regular intervals. From \c{AnalogClock}'s
+    implementation:
+
+    \snippet examples/widgets/analogclock/analogclock.cpp 0
+    \snippet examples/widgets/analogclock/analogclock.cpp 2
+    \snippet examples/widgets/analogclock/analogclock.cpp 3
+    \snippet examples/widgets/analogclock/analogclock.cpp 4
+    \snippet examples/widgets/analogclock/analogclock.cpp 5
+    \snippet examples/widgets/analogclock/analogclock.cpp 6
+    \dots
+    \snippet examples/widgets/analogclock/analogclock.cpp 7
+
+    Every second, QTimer will call the QWidget::update() slot to
+    refresh the clock's display.
+
+    If you already have a QObject subclass and want an easy
+    optimization, you can use QBasicTimer instead of QTimer. With
+    QBasicTimer, you must reimplement
+    \l{QObject::timerEvent()}{timerEvent()} in your QObject subclass
+    and handle the timeout there. The \l{widgets/wiggly}{Wiggly}
+    example shows how to use QBasicTimer.
+*/
diff --git a/doc/src/tools-list.qdoc b/doc/src/tools-list.qdoc
new file mode 100644
index 0000000000..7af9936e73
--- /dev/null
+++ b/doc/src/tools-list.qdoc
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \group qttools
+    \title Qt's Tools
+    \ingroup buildsystem
+
+    Qt is supplied with several command line and graphical tools to
+    ease and speed the development process. Each tool is listed here
+    with a link to its documentation.
+
+    \table
+    \header \o Tool \o Description
+    \row \o \l{Qt Designer Manual}{Qt Designer}
+         \o Create forms visually.
+    \row \o \l{Qt Assistant Manual}{Qt Assistant}
+         \o Quickly find the help you need.
+    \row \o \l{Qt Linguist Manual}{Qt Linguist, lupdate, lrelease, lconvert}
+         \o Translate applications to reach international markets.
+    \row \o \l{qmake Manual}{qmake}
+         \o Create makefiles from simple platform-independent project files (\c .pro files).
+    \omit
+    \row \o \l{emb-qvfb.html}{qvfb}
+         \o Run and test embedded applications on the desktop.
+    \row \o \l{emb-makeqpf.html}{makeqpf}
+         \o Create pre-rendered fonts for embedded devices.
+    \endomit
+    \row \o \l{moc}{Meta-Object Compiler (moc)}
+         \o Generate meta-object information for QObject subclasses.
+    \row \o \l{User Interface Compiler (uic)}
+         \o Generate C++ code from user interface files.
+    \row \o \l{Resource Compiler (rcc)}
+         \o Embed resources into Qt applications during the build process.
+    \row \o \l{Configuring Qt}{Configuring Qt (qtconfig)}
+         \o X11-based Qt configuration tool with online help.
+    \row \o \l{Fine-Tuning Features in Qt}{Configuring Qt Embedded (qconfig)}
+         \o Qt Embedded (Linux and Windows CE) configuration tool.
+    \row \o \l{Examples and Demos Launcher}
+         \o A launcher for Qt's Examples and Demonstration programs.
+    \row \o \l{qt3to4 - The Qt 3 to 4 Porting Tool}
+         \o A tool to assist in porting applications from Qt 3 to Qt 4.
+    \row \o \l{QtDBus XML compiler (qdbusxml2cpp)}
+         \o A tool to convert D-Bus interface descriptions to C++ source code.
+    \row \o \l{D-Bus Viewer}
+         \o A tool to introspect D-Bus objects and messages.
+    \endtable
+
+*/
diff --git a/doc/src/topics.qdoc b/doc/src/topics.qdoc
new file mode 100644
index 0000000000..301f0d4e57
--- /dev/null
+++ b/doc/src/topics.qdoc
@@ -0,0 +1,304 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\group topics
+\title Topics
+
+This page provides a collection of documents grouped by topic.
+
+The \l{Grouped Classes} page contains a similar list of groups for
+Qt's class documentation.
+
+\generatelist{related}
+*/
+
+/*!
+\group architecture
+\title Architecture
+\ingroup topics
+\brief Documents about Qt's architecture and design.
+
+These documents describe aspects of Qt's architecture and design,
+including overviews of core Qt features and technologies.
+
+\generatelist{related}
+*/
+
+/*!
+\group buildsystem
+\title Build System
+\ingroup topics
+\brief Tools to help automate building and installation of Qt applications.
+
+Qt is provided with a set of build tools to help developers automate
+the process of building and installing Qt applications.
+
+\table 100%
+\header \o Development \o Cross-Platform Issues \o Specific Tools
+\row
+\o
+ \list
+    \o \l {Debugging Techniques}
+    \o \l {Qt's Tools}
+    \o \l {The Qt Resource System}
+    \o \l {Using Precompiled Headers}
+\endlist
+\o
+\list
+    \o \l {Cross Compiling Qt for Embedded Linux Applications}
+    \o \l {Deploying Qt Applications}
+    \o \l {Installation}{Installing Qt}
+    \o \l {Window System Specific Notes}
+\endlist
+\o
+\list
+    \o \l lupdate and \l lrelease
+    \o \l {moc}{Meta-Object Compiler (moc)}
+    \o \l {User Interface Compiler (uic)}
+    \o \l {Resource Compiler (rcc)}
+\endlist
+\endtable
+
+
+*/
+
+/*!
+\group classlists
+\title Class and Function Indexes
+\ingroup topics
+\brief Collections of classes and functions grouped together into lists.
+
+The following documents contain collections of classes, grouped by
+subject area or related to particular functionality, or comprehensive
+lists of classes and functions.
+
+\generatelist{related}
+*/
+
+/*!
+\group codecs
+\title Codecs
+\ingroup topics
+\brief Codec support in Qt.
+
+These codecs provide facilities for conversion between Unicode and
+specific text encodings.
+
+\generatelist{related}
+*/
+
+/*!
+\group gui-programming
+\title GUI Programming
+\ingroup topics
+\brief Resources for developers of GUI applications.
+
+The following list contains links to guides and other resources for
+developers of graphical user interface (GUI) applications.
+
+\generatelist{related}
+*/
+
+/*!
+\group howto
+\title How To Guides and Learning Resources
+\ingroup topics
+\brief Guides providing help on aspects of using Qt.
+
+These guides provide specific help about specific Qt-related topics.
+
+\generatelist{related}
+*/
+
+/*!
+\group licensing
+\title Licensing Information
+\ingroup topics
+\brief Information about licenses and licensing issues.
+
+These documents include information about Qt's licenses and the licenses
+of third party components used in Qt.
+
+\generatelist{related}
+*/
+
+/*!
+\group platform-notes
+\title Platform-Specific Notes
+\ingroup topics
+\brief Documents describing platform-specific features of Qt.
+
+These documents describe platform-specific features provided by Qt, and
+discuss issues related to particular platforms and environments.
+
+\generatelist{related}
+*/
+
+/*!
+\group porting
+\title Porting Guides
+\ingroup topics
+\brief Guides related to porting Qt applications and libraries.
+
+A number of guides and documents are available that cover porting issues,
+from detailed coverage of API differences between Qt 3 and Qt 4 to
+platform and tool-specific documentation.
+
+\generatelist{related}
+*/
+
+/*!
+\group text-processing
+\title Text Processing
+\ingroup topics
+\brief Text processing guides and classes.
+
+Qt provides an extensive collection of classes for text handling.
+The following guides and references describe basic text handling, support
+for internationalization and character encodings, and Qt's rich text
+system.
+
+\generatelist{related}
+*/
+
+/*!
+    \group tutorials
+    \title Tutorials
+    \ingroup topics
+    \brief Tutorials, guides and overviews to help you learn Qt.
+
+    A collection of tutorials and "walkthrough" guides are provided with Qt to
+    help new users get started with Qt development. These documents cover a
+    range of topics, from basic use of widgets to step-by-step tutorials that
+    show how an application is put together.
+
+    \section1 \l{Widgets Tutorial}
+
+    \inlineimage widget-examples.png
+
+    A beginner's guide to getting started with widgets and layouts to create
+    GUI applications.
+
+    \section1 \l{Address Book Tutorial}
+
+    \inlineimage addressbook-tutorial.png
+
+    A seven part guide to creating a fully-functioning address book
+    application. This tutorial is also available with
+    \l{Tutoriel "Carnet d'adresses"}{French explanation}.
+
+*/
+
+/*!
+\group activeqt-tools
+\title Tools for ActiveQt
+\ingroup topics
+\brief Tools to help integrate Qt applications with ActiveX components.
+
+These tools provide support for integrating Qt with ActiveX components.
+
+\generatelist{related}
+
+\sa {ActiveQt Framework}
+*/
+
+/*!
+\group scripting
+\title Scripting with ECMAScript
+\ingroup topics
+\brief Guides and references covering application scripting with ECMAScript.
+
+Qt 4.3 and later provides support for application scripting with ECMAScript.
+The following guides and references cover aspects of programming with
+ECMAScript and Qt.
+
+\generatelist{related}
+*/
+
+/*!
+\group threading
+\title Threading and Concurrent Programming
+\ingroup topics
+\brief Guides and references covering threading and concurrent programming.
+
+Qt provides a number of classes to handle the primitives used for multithreaded
+programming. From Qt 4.4, the QtConcurrent namespace also provides a set of higher
+level classes for concurrent programming.
+
+\generatelist{related}
+*/
+
+/*!
+\group qtce
+\title Qt for Windows CE
+\ingroup topics
+\ingroup qt-embedded
+\brief Documents related to Qt on Windows CE
+
+Qt for Windows CE is a C++ framework for GUI and application development
+for embedded devices running Windows CE. It runs on a variety of processors,
+including ARM, Intel x86, MIPS and SH-4.
+
+\table 100%
+\header \o Getting Started \o Reference \o Performance and Optimization
+\row
+\o
+ \list
+    \o \l {Qt for Windows CE Requirements}
+    \o \l {Installing Qt on Windows CE}
+    \o \l {Windows CE - Introduction to using Qt}{Introduction to using Qt}
+    \o \l {Qt Examples#Qt for Embedded Linux}{Examples}
+\endlist
+\o
+\list
+    \o \l {Qt for Embedded Linux Classes}{Classes}
+    \o \l {Windows CE - Using shadow builds}{Using shadow builds}
+    \o \l {Windows CE - Working with Custom SDKs}{Working with Custom SDKs}
+\endlist
+\o
+\list
+    \o \l {Windows CE OpenGL ES}{OpenGL ES}
+    \o \l {Qt Performance Tuning}
+    \o \l {Fine-Tuning Features in Qt}
+\endlist
+\endtable
+*/
diff --git a/doc/src/trademarks.qdoc b/doc/src/trademarks.qdoc
new file mode 100644
index 0000000000..647c6a6321
--- /dev/null
+++ b/doc/src/trademarks.qdoc
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page trademarks.html
+
+    \title Trademarks
+    \ingroup licensing
+    \brief Information about trademarks owned by Nokia and other organisations.
+
+    Nokia, the Nokia logo, Qt, and the Qt logo are trademarks of Nokia
+    Corporation and/or its subsidiaries in Finland and other countries.
+
+    \list
+    \o Intel, Intel Inside (logos), MMX and Pentium are \reg trademarks of
+       Intel Corporation in the United States, other countries, or both.
+    \o Java and all Java-based trademarks are trademarks of Sun Microsystems,
+       Inc. in the United States, other countries, or both.
+    \o Linux is a \reg trademark of Linus Torvalds in the United States, other
+       countries or both. 
+    \o Mac, Mac OS and Macintosh are \reg trademarks of Apple Computer, Inc.,
+       registered in the U.S. and other countries. 
+    \o Microsoft, Windows, Windows NT, XP, Visual Studio and the Windows logo
+       are \reg trademarks of Microsoft Corporation in the United States, other
+       countries, or both. 
+    \o Motif is a registered trademark of The Open Group in the United States,
+       other countries, or both. 
+    \o OpenGL is a \reg trademark of Silicon Graphics, Inc. in the United States
+       and other countries. 
+    \o UNIX is a registered trademark of The Open Group in the United States
+       and other countries. 
+    \o All other company, product, or service names may be trademarks or
+       service marks of others and are the property of their respective owners.
+       The use of the word partner does not imply a partnership relationship
+       between Nokia and any other company.
+    \endlist
+*/
diff --git a/doc/src/trolltech-webpages.qdoc b/doc/src/trolltech-webpages.qdoc
new file mode 100644
index 0000000000..3897fcf668
--- /dev/null
+++ b/doc/src/trolltech-webpages.qdoc
@@ -0,0 +1,245 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \externalpage http://www.qtsoftware.com/products/qt
+    \title Qt website
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/bugreport-form
+    \title Bug Report Form
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/products/add-on-products/add-on-products/
+    \title Third-Party Tools
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/products/add-on-products
+    \title Qt Solutions
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/developer/documentation/books
+    \title Books about Qt Programming
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/products/qt/qt3/book
+    \title GUI Programming with Qt 3
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/products/qt/
+    \title Qt Homepage
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/products/qt
+    \title About Qt
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/products/qt/indepth/vs-integration
+    \title Visual Studio Integration
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Widgets/qtcalendarwidget/
+    \title Calendar Widget
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Widgets/qtwizard/
+    \title QtWizard
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Utilities/qtcorba/
+    \title CORBA Framework
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Widgets/qtwindowlistmenu/
+    \title Window Menu
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/customers/casestories
+    \title Customer Success Stories
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/developer
+    \title Developer Zone
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/developer/downloads
+    \title Downloads
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/developer/faqs/
+    \title FAQs
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/developer/faqs/licensing
+    \title License FAQ
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/developer/downloads/freesoftware
+    \title Free Software and Contributions
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/products/qt/licenses/licensing/
+    \title Qt Licensing Overview
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/products/qt/licenses/pricing/
+    \title Qt License Pricing
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/products/qt/orderform
+    \title How to Order
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/support-services/support/platform-support-policy
+    \title Platform Support Policy
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/products/
+    \title Product Overview
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/developer/supported-platforms/supported-platforms/
+    \title Qt 4 Platforms Overview
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/developer/supported-platforms/supported-platforms/
+    \title Qt 4 Supported Platforms
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/products/qtopia/
+    \title Qt Extended
+*/
+
+/*!
+    \externalpage http://doc.trolltech.com/qq/
+    \title Qt Quarterly
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/developer/task-tracker
+    \title Task Tracker
+*/
+
+/*!
+    \externalpage http://lists.trolltech.com
+    \title Qt Mailing Lists
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/products/qt/learnmore/whitepapers
+    \title Whitepapers
+*/
+
+/*!
+    \externalpage http://doc.trolltech.com/qtcanvas
+    \title QtCanvas
+*/
+
+/*!
+    \externalpage http://labs.trolltech.com/page/Projects/Itemview/Modeltest
+    \title ModelTest
+*/
+
+/*!
+    \externalpage http://labs.trolltech.com/page/Projects/Accessibility/QDBusBridge
+    \title D-Bus Accessibility Bridge
+*/
+
+/*!
+    \externalpage http://labs.trolltech.com/blogs/2008/12/05/qtestlib-now-with-nice-graphs-pointing-upwards/
+    \title qtestlib-tools Announcement
+*/
+
+/*!
+    \externalpage http://labs.trolltech.com/gitweb?p=qtestlib-tools;a=summary
+    \title qtestlib-tools
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/developer/downloads/qt/qsa
+    \title Qt Script for Applications (QSA)
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Utilities/qtsharedmemory/
+    \title QtSharedMemory
+*/
+
+/*!
+    \externalpage http://doc.trolltech.com/qq/qq21-portingcanvas.html
+    \title Porting to Qt 4.2's Graphics View
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Windows/qtwinforms/
+    \title QtWinForms Solution
+*/
+
+/*!
+    \externalpage http://www.qtsoftware.com/developer/faqs/qt/installation
+    \title Installation FAQ
+*/
diff --git a/doc/src/tutorials/addressbook-fr.qdoc b/doc/src/tutorials/addressbook-fr.qdoc
new file mode 100644
index 0000000000..2847f1be0a
--- /dev/null
+++ b/doc/src/tutorials/addressbook-fr.qdoc
@@ -0,0 +1,1064 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page tutorials-addressbook-fr.html
+
+    \startpage {index.html}{Qt Reference Documentation}
+    \nextpage {tutorials/addressbook-fr/part1}{Chapitre 1}
+
+    \title Tutoriel "Carnet d'adresses"
+    \ingroup howto
+    \ingroup tutorials
+    \brief Une introduction à la programation d'interface graphique montrant comment construire une application simple avec Qt.
+
+    Ce tutoriel est une introduction à la programmation de GUI (interface utilisateur)
+    à l'aide des outils fournis par la plateforme multiplate-forme Qt.
+
+    \image addressbook-tutorial-screenshot.png
+
+    Ce tutoriel va nous amener à découvrir quelques technologies fondamentales fournies 
+    par Qt, tel que:
+
+    \list
+    \o Les Widgets et leur mise en page à l'aide des layouts
+    \o Les signaux et slots
+    \o Les structures de données de collections
+    \o Les entrées/sorties
+    \endlist
+
+    Si c'est votre premier contact avec Qt, lisez \l{How to Learn Qt}{Comment apprendre Qt}
+    si ce n'est déjà fait.
+
+    Le code source du tutoriel est distribué avec Qt dans le dossier \c examples/tutorials/addressbook
+
+    Les chapitres du tutoriel:
+
+    \list 1
+    \o \l{tutorials/addressbook-fr/part1}{Conception de l'interface utilisateur}
+    \o \l{tutorials/addressbook-fr/part2}{Ajouter des adresses}
+    \o \l{tutorials/addressbook-fr/part3}{Navigation entre les éléments}
+    \o \l{tutorials/addressbook-fr/part4}{éditer et supprimer des adresses}
+    \o \l{tutorials/addressbook-fr/part5}{Ajout d'une fonction de recherche}
+    \o \l{tutorials/addressbook-fr/part6}{Sauvegarde et chargement}
+    \o \l{tutorials/addressbook-fr/part7}{Fonctionnalités avancées}
+    \endlist
+
+    La petite application que nous développerons ici ne possède pas tous les éléments
+    des interfaces dernier cri, elle va nous permettre d'utiliser les techniques de base
+    utilisées dans les applications plus complexes.
+
+    Lorsque vous aurez terminé ce tutoriel, nous vous recommandons de poursuivre avec l'exemple
+    "\l{mainwindows/application}{Application}", qui présente une interface simple utilisant
+    les menus et barres d'outils, la barre d'état, etc.
+
+*/
+
+/*!
+    \page tutorials-addressbook-fr-part1.html
+    \contentspage {Tutoriel "Carnet d'adresses"}{Sommaire}
+    \nextpage {tutorials/addressbook-fr/part2}{Chapitre 2}
+    \example tutorials/addressbook-fr/part1
+    \title Carnet d'adresses 1 - Conception de l'interface utilisateur
+
+    La première partie de ce tutoriel traite de la conception d'une interface graphique
+    (GUI) basique, que l'on utilisera pour l'application Carnet d'adresses.
+
+    La première étape dans la création d'applications graphiques est la conception de
+    l'interface utilisateur. Dans ce chapitre, nous verrons comment créer les labels
+    et champs de saisie nécessaires à l'implementation d'un carnet d'adresses de base.
+    Le résultat attendu est illustré par la capture d'écran ci-dessous.
+
+    \image addressbook-tutorial-part1-screenshot.png
+
+    Nous allons avoir besoin de deux objets QLabel, \c nameLabel et \c addressLabel,
+    ainsi que deux champs de saisie: un objet QLineEdit, \c nameLine, et un objet
+    QTextEdit, \c addressText, afin de permettre à l'utilisateur d'entrer le nom d'un
+    contact et son adresse. Les widgets utilisés ainsi que leur placement sont visibles ci-dessous.
+
+    \image addressbook-tutorial-part1-labeled-screenshot.png
+
+    Trois fichiers sont nécessaires à l'implémentation de ce carnet d'adresses:
+
+    \list
+        \o \c{addressbook.h} - le fichier de définition (header) pour la classe \c AddressBook,
+        \o \c{addressbook.cpp} - le fichier source, qui comprend l'implémentation de la classe
+            \c AddressBook
+        \o \c{main.cpp} - le fichier qui contient la méthode \c main() , et
+        une instance de la classe \c AddressBook.
+    \endlist
+
+    \section1 Programmation en Qt - héritage
+
+
+    Lorsque l'on écrit des programmes avec Qt, on a généralement recours à
+    l'héritage depuis des objets Qt, afin d'y ajouter des fonctionnalités.
+    C'est l'un des concepts fondamentaux de la création de widgets personnalisés
+    ou de collections de widgets. Utiliser l'héritage afin de compléter
+    ou modifier le comportement d'un widget présente les avantages suivants:
+
+    \list
+    \o La possibilité d'implémenter des méthodes virtuelles et des méthodes 
+    virtuelles pures pour obtenir exactement ce que l'on souhaite, avec la possibilité
+    d'utiliser l'implémentation de la classe mère si besoin est.
+    \o Cela permet l'encapsulation partielle de l'interface utilisateur dans une classe,
+    afin que les autres parties de l'application n'aient pas à se soucier de chacun des
+    widgets qui forment l'interface utilisateur.
+    \o La classe fille peut être utilisée pour créer de nombreux widgets personnalisés
+    dans une même application ou bibliothèque, et le code de la classe fille peut être
+    réutilisé dans d'autres projets
+    \endlist
+
+    Comme Qt ne fournit pas de widget standard pour un carnet d'adresses, nous 
+    partirons d'une classe de widget Qt standard et y ajouterons des fonctionnalités.
+    La classe \c AddressBook crée dans ce tutoriel peut être réutilisée si on a besoin d'un
+    widget carnet d'adresses basique.
+
+
+    \section1 La classe AddressBook
+
+    Le fichier \l{tutorials/addressbook-fr/part1/addressbook.h}{\c addressbook.h} permet de
+    définir la classe \c AddressBook.
+
+    On commence par définir \c AddressBook comme une classe fille de QWidget et déclarer
+    un constructeur. On utilise également la macro Q_OBJECT pour indiquer que la classe
+    exploite les fonctionnalités de signaux et slots offertes par Qt ainsi que
+    l'internationalisation, bien que nous ne les utilisions pas à ce stade.
+
+    \snippet tutorials/addressbook-fr/part1/addressbook.h class definition
+
+    La classe contient les déclarations de \c nameLine et \c addressText,
+    les instances privées de QLineEdit et QTextEdit mentionnées précédemment.
+    Vous verrez, dans les chapitres à venir que les informations contenues
+    dans \c nameLine et \c addressText sont nécessaires à de nombreuses méthodes
+    du carnet d'adresses.
+
+    Il n'est pas nécessaire de déclarer les objets QLabel que nous allons utiliser 
+    puisque nous n'aurons pas besoin d'y faire référence après leur création.
+    La façon dont Qt gère la parenté des objets est traitée dans la section suivante.
+
+    La macro Q_OBJECT implémente des fonctionnalités parmi les plus avancées de Qt.
+    Pour le moment, il est bon de voir la macro Q_OBJECT comme un raccourci nous 
+    permettant d'utiliser les méthodes \l{QObject::}{tr()} et \l{QObject::}{connect()}.
+
+    Nous en avons maintenant terminé avec le fichier \c addressbook.h et allons
+    passer à l'implémentation du fichier \c addressbook.cpp.
+
+    \section1 Implémentation de la classe AddressBook
+
+    Le constructeur de la classe \c{AddressBook} prend en paramètre un QWidget, \e parent.
+    Par convention, on passe ce paramètre au constructeur de la classe mère.
+    Ce concept de parenté, où un parent peut avoir un ou plusieurs enfants, est utile
+    pour regrouper les Widgets avec Qt. Par exemple, si vous détruisez le parent,
+    tous ses enfants seront détruits égalament.
+
+
+    \snippet tutorials/addressbook/part1/addressbook.cpp constructor and input fields
+
+    à l'intérieur de ce constructeur, on déclare et instancie deux objets locaux
+    QLabel, \c nameLabel et \c addressLabel, de même on instancie \c nameLine et
+    \c addressText. La méthode \l{QObject::tr()}{tr()} renvoie une version traduite
+    de la chaîne de caractères, si elle existe; dans le cas contraire, elle renvoie
+    la chaîne elle même. On peut voir cette méthode comme un marqueur \tt{<insérer
+    la traduction ici>}, permettant de repérer les objets QString à considérer
+    pour traduire une application. Vous remarquerez, dans les chapitres à venir
+    comme dans les \l{Qt Examples}{exemples Qt}, qu'elle est utilisée chaque fois
+    que l'on utilise une chaîne susceptible d'être traduite.
+
+    Lorsque l'on programme avec Qt, il est utile de savoir comment fonctionnent les
+    agencements ou layouts. Qt fournit trois classes principales de layouts pour
+    contrôler le placement des widgets: QHBoxLayout, QVBoxLayout et QGridLayout.
+
+    \image addressbook-tutorial-part1-labeled-layout.png
+
+    On utilise un QGridLayout pour positionner nos labels et champs de saisie de manière
+    structurée. QGridLayout divise l'espace disponible en une grille, et place les
+    widgets dans les cellules que l'on spécifie par les numéros de ligne et de colonne.
+    Le diagramme ci-dessus présente les cellules et la position des widgets, et cette
+    organisation est obtenue à l'aide du code suivant:
+
+    \snippet tutorials/addressbook/part1/addressbook.cpp layout
+
+    On remarque que le label \c AddressLabel est positionné en utilisant Qt::AlignTop
+    comme argument optionnel. Ceci est destiné à assurer qu'il ne sera pas centré
+    verticalement dans la cellule (1,0). Pour un aperçu rapide des layouts de Qt,
+    consultez la section \l{Layout Classes}.
+
+    Afin d'installer l'objet layout dans un widget, il faut appeler la méthode
+    \l{QWidget::setLayout()}{setLayout()} du widget en question:
+
+    \snippet tutorials/addressbook/part1/addressbook.cpp setting the layout
+
+    Enfin, on initialise le titre du widget à "Simple Address Book"
+
+    \section1 Exécution de l'application
+
+    Un fichier séparé, \c main.cpp, est utilisé pour la méthode \c main(). Dans cette
+    fonction, on crée une instance de QApplication, \c app. QApplication se charge de
+    des ressources communes à l'ensemble de l'application, tel que les polices de
+    caractères et le curseur par défaut, ainsi que de l'exécution de la boucle d'évènements.
+    De ce fait, il y a toujours un objet QApplication dans toute application graphique en Qt.
+
+    \snippet tutorials/addressbook/part1/main.cpp main function
+
+    On construit un nouveau widget \c AddressBook sur le tas en utilisant le mot-clé
+    \c new et en invoquant sa méthode \l{QWidget::show()}{show()} pour l'afficher.
+    Cependant, le widget ne sera pas visible tant que la boucle d'évènements
+    n'aura pas été lancée. On démarre la boucle d'évènements en appelant la
+    méthode \l{QApplication::}{exec()} de l'application; le résultat renvoyé
+    par cette méthode est lui même utilisé comme valeur de retour pour la méthode
+    \c main().
+*/
+
+/*!
+    \page tutorials-addressbook-fr-part2.html
+    \previouspage {tutorials/addressbook-fr/part1}{Chapitre 1}
+    \contentspage {Tutoriel "Carnet d'adresses"}{Sommaire}
+    \nextpage {tutorials/addressbook-fr/part3}{Chapitre 3}
+    \example tutorials/addressbook-fr/part2
+    \title Carnet d'adresses 2 - Ajouter des adresses
+
+    La prochaine étape pour créer notre carnet d'adresses est d'ajouter un soupçon
+    d'interactivité.
+
+    \image addressbook-tutorial-part2-add-contact.png
+
+    Nous allons fournir un bouton que l'utilisateur peut
+    cliquer pour ajouter un nouveau contact. Une structure de données est aussi
+    nécessaire afin de pouvoir stocker les contacts en mémoire.
+
+    \section1 Définition de la classe AddressBook
+
+    Maintenant que nous avons mis en place les labels et les champs de saisie,
+    nous ajoutons les boutons pour compléter le processus d'ajout d'un contact.
+    Cela veut dire que notre fichier \c addressbook.h a maintenant trois
+    objets QPushButton et trois slots publics correspondant.
+
+    \snippet tutorials/addressbook/part2/addressbook.h slots
+
+    Un slot est une méthode qui répond à un signal. Nous allons
+    voir ce concept en détail lorsque nous implémenterons la classe \c{AddressBook}.
+    Pour une explication détaillée du concept de signal et slot, vous pouvez
+    vous référer au document \l{Signals and Slots}.
+
+    Les trois objets QPushButton \c addButton, \c submitButton et \c cancelButton
+    sont maintenant inclus dans la déclaration des variables privées, avec
+    \c nameLine et \c addressText du chapitre précédent.
+
+    \snippet tutorials/addressbook/part2/addressbook.h pushbutton declaration
+
+    Nous avons besoin d'un conteneur pour stocker les contacts du carnet
+    d'adresses, de façon à pouvoir les énumérer et les afficher.
+    Un objet QMap, \c contacts, est utilisé pour ça, car il permet de stocker
+    des paires clé-valeur: le nom du contact est la \e{clé} et l'adresse du contact
+    est la \e{valeur}.
+
+    \snippet tutorials/addressbook/part2/addressbook.h remaining private variables
+
+    Nous déclarons aussi deux objects QString privés: \c oldName et \c oldAddress.
+    Ces objets sont nécessaires pour conserver le nom et l'adresse du dernier contact
+    affiché avant que l'utilisateur ne clique sur le bouton "Add". Grâce à ces variables
+    si l'utilisateur clique sur "Cancel", il est possible de revenir
+    à l'affichage du dernier contact.
+
+    \section1 Implémentation de la classe AddressBook
+
+    Dans le constructeur de \c AddressBook, \c nameLine et
+    \c addressText sont mis en mode lecture seule, de façon à autoriser l'affichage
+    mais pas la modification du contact courant.
+
+    \dots
+    \snippet tutorials/addressbook/part2/addressbook.cpp setting readonly 1
+    \dots
+    \snippet tutorials/addressbook/part2/addressbook.cpp setting readonly 2
+
+    Ensuite, nous instancions les boutons \c addButton, \c submitButton, et
+    \c cancelButton.
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp pushbutton declaration
+
+    Le bouton \c addButton est affiché en invoquant la méthode \l{QPushButton::show()}
+    {show()}, tandis que \c submitButton et \c cancelButton sont cachés en invoquant
+    \l{QPushButton::hide()}{hide()}. Ces deux boutons ne seront affichés que lorsque 
+    l'utilisateur cliquera sur "Add", et ceci est géré par la méthode \c addContact()
+    décrite plus loin.
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp connecting signals and slots
+
+    Nous connectons le signal \l{QPushButton::clicked()}{clicked()} de chaque bouton 
+    au slot qui gèrera l'action.
+    L'image ci-dessous illustre ceci:
+
+    \image addressbook-tutorial-part2-signals-and-slots.png
+
+    Ensuite, nous arrangeons proprement les boutons sur la droite du widget
+    AddressBook, et nous utilisons un QVBoxLayout pour les aligner verticalement.
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp vertical layout
+
+    La methode \l{QBoxLayout::addStretch()}{addStretch()} est utilisée pour
+    assurer que les boutons ne sont pas répartis uniformément, mais regroupés
+    dans la partie supperieure du widget. La figure ci-dessous montre la différence
+    si \l{QBoxLayout::addStretch()}{addStretch()} est utilisé ou pas.
+
+    \image addressbook-tutorial-part2-stretch-effects.png
+
+    Ensuite nous ajoutons \c buttonLayout1 à \c mainLayout, en utilisant
+    \l{QGridLayout::addLayout()}{addLayout()}. Ceci nous permet d'imbriquer les
+    mises en page puisque \c buttonLayout1 est maintenant un enfant de \c mainLayout.
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp grid layout
+
+    Les coordonnées du layout global ressemblent maintenant à ça:
+
+    \image addressbook-tutorial-part2-labeled-layout.png
+
+    Dans la méthode \c addContact(), nous stockons les détails du dernier
+    contact affiché dans \c oldName et \c oldAddress. Ensuite, nous
+    vidons ces champs de saisie et nous désactivons le mode
+    lecture seule. Le focus est placé sur \c nameLine et on affiche
+    \c submitButton et \c cancelButton.
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp addContact
+
+    La méthode \c submitContact() peut être divisée en trois parties:
+
+    \list 1
+    \o Nous extrayons les détails du contact depuis \c nameLine et \c addressText
+    et les stockons dans des objets QString. Nous les validons pour s'assurer
+    que l'utilisateur n'a pas cliqué sur "Add" avec des champs de saisie
+    vides; sinon un message est affiché avec QMessageBox pour rappeller à
+    l'utilisateur que les deux champs doivent être complétés.
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp submitContact part1
+
+    \o Ensuite, nous vérifions si le contact existe déjà. Si aucun contacts
+    existant n'entre en conflit avec le nouveau, nous l'ajoutons à
+    \c contacts et nous affichons un QMessageBox pour informer l'utilisateur
+    que le contact a été ajouté.
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp submitContact part2
+
+    Si le contact existe déjà, nous affichons un QMessageBox pour informer
+    l'utilisateur du problème.
+    Notre objet \c contacts est basé sur des paires clé-valeur formés par
+    le nom et l'adresse, nous voulons nous assurer que la \e clé est unique.
+
+    \o Une fois que les deux vérifications précédentes ont été traitées,
+    nous restaurons les boutons à leur état normal à l'aide du code
+    suivant:
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp submitContact part3
+
+    \endlist
+
+    La capture d'écran ci-dessous montre l'affichage fournit par un objet
+    QMessageBox, utilisé ici pour afficher un message d'information
+    à l'utilisateur:
+
+    \image addressbook-tutorial-part2-add-successful.png
+
+    La méthode \c cancel() restaure les détails du dernier contact, active
+    \c addButton, et cache \c submitButton et \c cancelButton.
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp cancel
+
+    L'idée générale pour augmenter la flexibilité lors de l'ajout d'un 
+    contact est de donner la possiblité de cliquer sur "Add" 
+    ou "Cancel" à n'importe quel moment.
+    L'organigramme ci-dessous reprend l'ensemble des interactions dévelopées
+    jusqu'ici:
+
+    \image addressbook-tutorial-part2-add-flowchart.png
+*/
+
+/*!
+    \page tutorials-addressbook-fr-part3.html
+    \previouspage {tutorials/addressbook-fr/part2}{Chapitre 2}
+    \contentspage {Tutoriel "Carnet d'adresses"}{Sommaire}
+    \nextpage {tutorials/addressbook-fr/part4}{Chapitre 4}
+    \example tutorials/addressbook-fr/part3
+    \title Carnet d'adresses 3 - Navigation entre les éléments
+
+    L'application "Carnet d'adresses" est maintenant à moitié terminée. Il
+    nous faut maintenant ajouter quelques fonctions pour naviguer entre
+    les contacts. Avant de commencer, il faut se décider sur le type de structure de
+    données le plus approprié pour stocker les contacts.
+
+    Dans le chapitre 2, nous avons utilisé un QMap utilisant des paires clé-valeur,
+    avec le nom du contact comme \e clé, et l'adresse du contact comme \e valeur.
+    Cela fonctionnait bien jusqu'ici, mais pour ajouter la navigation entre les
+    entrées, quelques améliorations sont nécessaires.
+
+    Nous améliorerons le QMap en le faisant ressembler à une structure de données
+    similaire à une liste liée, où tous les éléments sont connectés, y compris
+    le premier et le dernier élément. La figure ci-dessous illustre cette structure
+    de donnée.
+
+    \image addressbook-tutorial-part3-linkedlist.png
+
+    \section1 Définition de la classe AddressBook
+
+    Pour ajouter les fonctions de navigation au carnet d'adresses, nous avons
+    besoin de deux slots supplémentaires dans notre classe \c AddressBook:
+    \c next() et \c previous(). Ceux-ci sont ajoutés au fichier addressbook.h:
+
+    \snippet tutorials/addressbook/part3/addressbook.h navigation functions
+
+    Nous avons aussi besoin de deux nouveaux objets QPushButton, nous ajoutons
+    donc les variables privées \c nextButton et \c previousButton.
+
+    \snippet tutorials/addressbook/part3/addressbook.h navigation pushbuttons
+
+    \section1 Implémentation de la classe AddressBook
+
+    A l'intérieur du constructeur de \c AddressBook, dans \c addressbook.cpp, nous
+    instancions \c nextButton et \c previousButton et nous les désactivons
+    par défaut. Nous faisons ceci car la navigation ne doit être activée
+    que lorsqu'il y a plus d'un contact dans le carnet d'adresses.
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp navigation pushbuttons
+
+    Nous connectons alors ces boutons à leur slots respectifs:
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp connecting navigation signals
+
+    L'image ci-dessous montre l'interface utilisateur que nous allons créer.
+    Remarquez que cela ressemble de plus en plus à l'interface du programme
+    complet.
+
+    \image addressbook-tutorial-part3-screenshot.png
+
+    Nous suivons les conventions pour les fonctions \c next() et \c previous()
+    en plaçant \c nextButton à droite et \c previousButton à gauche. Pour
+    faire cette mise en page intuitive, nous utilisons un QHBoxLayout pour
+    placer les widgets côte à côte:
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp navigation layout
+
+    L'objet QHBoxLayout, \c buttonLayout2, est ensuite ajouté à \c mainLayout.
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp adding navigation layout
+
+    La figure ci-dessous montre les systèmes de coordonnées pour les widgets du
+    \c mainLayout.
+    \image addressbook-tutorial-part3-labeled-layout.png
+
+    Dans notre méthode \c addContact(), nous avons desactivé ces boutons 
+    pour être sûr que l'utilisateur n'utilise pas la navigation lors de 
+    l'ajout d'un contact.
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp disabling navigation
+
+    Dans notre méthode \c submitContact(), nous activons les boutons de
+    navigation, \c nextButton et \c previousButton, en fonction de la
+    taille de \c contacts. Commen mentionné plus tôt, la navigation n'est 
+    activée que si il y a plus d'un contact dans le carnet d'adresses.
+    Les lignes suivantes montrent comment faire cela:
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp enabling navigation
+
+    Nous incluons aussi ces lignes de code dans le bouton \c cancel().
+
+    Souvenez vous que nous voulons émuler une liste-liée ciruculaire à
+    l'aide de l'objet QMap, \c contacts. Pour faire cela, nous obtenons un itérateur 
+    sur \c contact dans la méthode \c next(), et ensuite:
+
+    \list
+        \o Si l'itérateur n'est pas à la fin de \c contacts, nous l'incrémentons
+        \o Si l'itérateur est à la fin de \c contacts, nous changeons sa position
+        jusqu'au début de \c contacts. Cela donne l'illusion que notre QMap 
+        fonctionne comme une liste circulaire.
+    \endlist
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp next() function
+
+    Une fois que nous avons itéré jusqu'à l'objet recherché dans \c contacts,
+    nous affichons son contenu sur \c nameLine et \c addressText.
+
+    De la même façon, pour la méthode \c previous(), nous obtenons un 
+    itérateur sur \c contacts et ensuite:
+
+    \list
+        \o Si l'itérateur est à la fin de \c contacts, on réinitialise
+           l'affichage et on retourne.
+        \o Si l'itérateur est au début de \c contacts, on change sa 
+           position jusqu'à la fin
+        \o Ensuite, on décrémente l'itérateur
+    \endlist
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp previous() function
+
+    à nouveau, nous affichons le contenu de l'objet courant dans \c contacts.
+
+*/
+
+/*!
+
+    \page tutorials-addressbook-fr-part4.html
+    \previouspage {tutorials/addressbook-fr/part3}{Chapitre 3}
+    \contentspage {Tutoriel "Carnet d'adresses"}{Sommaire}
+    \nextpage {tutorials/addressbook-fr/part5}{Chapitre 5}
+    \example tutorials/addressbook-fr/part4
+    \title Carnet d'Adresses 4 - éditer et supprimer des adresses
+
+
+    Dans ce chapitre, nous verrons comment modifier les données des contacts
+    contenus dans l'application carnet d'adresses.
+
+
+    \image addressbook-tutorial-screenshot.png
+
+    Nous avons maintenant un carnet d'adresses qui ne se contente pas de
+    lister des contacts de façon ordonnée, mais permet également la 
+    navigation. Il serait pratique d'inclure des fonctions telles qu'éditer et
+    supprimer, afin que les détails associés à un contact puissent être
+    modifiés lorsque c'est nécessaire. Cependant, cela requiert une légère
+    modification, sous la forme d'énumérations. Au chapitre précédent, nous avions deux
+    modes: \c {AddingMode} et \c {NavigationMode}, mais ils n'étaient pas
+    définis en tant qu'énumérations. Au lieu de ça, on activait et désactivait les
+    boutons correspondants manuellement, au prix de multiples redondances dans
+    le code.
+
+    Dans ce chapitre, on définit l'énumération \c Mode avec trois valeurs possibles.
+
+    \list
+        \o \c{NavigationMode},
+        \o \c{AddingMode}, et
+        \o \c{EditingMode}.
+    \endlist
+
+    \section1 Définition de la classe AddressBook
+
+    Le fichier \c addressbook.h est mis a jour pour contenir l'énumération \c Mode :
+
+    \snippet tutorials/addressbook/part4/addressbook.h Mode enum
+
+    On ajoute également deux nouveaux slots, \c editContact() et
+    \c removeContact(), à notre liste de slots publics.
+
+    \snippet tutorials/addressbook/part4/addressbook.h edit and remove slots
+
+    Afin de basculer d'un mode à l'autre, on introduit la méthode
+    \c updateInterface() pour contrôller l'activation et la désactivation de
+    tous les objets QPushButton. On ajoute également deux nouveaux boutons,
+    \c editButton et \c removeButton, pour les fonctions d'édition
+    et de suppression mentionnées plus haut.
+
+    \snippet tutorials/addressbook/part4/addressbook.h updateInterface() declaration
+    \dots
+    \snippet tutorials/addressbook/part4/addressbook.h buttons declaration
+    \dots
+    \snippet tutorials/addressbook/part4/addressbook.h mode declaration
+
+    Enfin, on déclare \c currentMode pour garder une trace du mode 
+    actuellement utilisé.
+
+    \section1 Implémentation de la classe AddressBook
+
+    Il nous faut maintenant implémenter les fonctionnalités de changement de
+    mode de l'application carnet d'adresses. Les boutons \c editButton et
+    \c removeButton sont instanciés et désactivés par défaut, puisque le
+    carnet d'adresses démarre sans aucun contact en mémoire.
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp edit and remove buttons
+
+    Ces boutons sont ensuite connectés à leurs slots respectifs,
+    \c editContact() et \c removeContact(), avant d'être ajoutés à
+    \c buttonLayout1.
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp connecting edit and remove
+    \dots
+    \snippet tutorials/addressbook/part4/addressbook.cpp adding edit and remove to the layout
+
+    La methode \c editContact() place les anciens détails du contact dans
+    \c oldName et \c oldAddress, avant de basculer vers le mode
+    \c EditingMode. Dans ce mode, les boutons \c submitButton et
+    \c cancelButton sont tous deux activés, l'utilisateur peut par conséquent
+    modifier les détails du contact et cliquer sur l'un de ces deux boutons
+    par la suite.
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp editContact() function
+
+    La méthode \c submitContact() a été divisée en deux avec un bloc
+    \c{if-else}. On teste \c currentMode pour voir si le mode courant est
+    \c AddingMode. Si c'est le cas, on procède à l'ajout.
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp submitContact() function beginning
+    \dots
+    \snippet tutorials/addressbook/part4/addressbook.cpp submitContact() function part1
+
+    Sinon, on s'assure que \c currentMode est en \c EditingMode. Si c'est le
+    cas, on compare \c oldName et \c name. Si le nom a changé, on supprime
+    l'ancien contact de \c contacts et on insère le contact mis a jour.
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp submitContact() function part2
+
+    Si seule l'adresse a changé (i.e. \c oldAddress n'est pas identique à
+    \c address), on met à jour l'adresse du contact. Enfin on règle
+    \c currentMode à \c NavigationMode. C'est une étape importante puisque
+    c'est cela qui réactive tous les boutons désactivés.
+
+    Afin de retirer un contact du carnet d'adresses, on implémente la méthode
+    \c removeContact(). Cette méthode vérifie que le contact est présent dans
+    \c contacts.
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp removeContact() function
+
+    Si c'est le cas, on affiche une boîte de dialogue QMessageBox, demandant
+    confirmation de la suppression à l'utilisateur. Une fois la confirmation
+    effectuée, on appelle \c previous(), afin de s'assurer que l'interface
+    utilisateur affiche une autre entrée, et on supprime le contact en
+    utilisant le méthode \l{QMap::remove()}{remove()} de \l{QMap}. Dans un
+    souci pratique, on informe l'utilisateur de la suppression par le biais
+    d'une autre QMessageBox. Les deux boîtes de dialogue utilisées dans cette
+    méthode sont représentées ci-dessous.
+
+    \image addressbook-tutorial-part4-remove.png
+
+    \section2 Mise à jour de l'Interface utilisateur
+
+    On a évoqué plus haut la méthode \c updateInterface() comme moyen
+    d'activer et de désactiver les différents boutons de l'interface en
+    fonction du mode. Cette méthode met à jour le mode courant selon
+    l'argument \c mode qui lui est passé, en l'assignant à \c currentMode,
+    avant de tester sa valeur.
+
+    Chacun des boutons est ensuite activé ou désactivé, en fonction du mode.
+    Le code source pour les cas \c AddingMode et \c EditingMode est visible 
+    ci-dessous:
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp update interface() part 1
+
+    Dans le cas de \c NavigationMode, en revanche, des tests conditionnels
+    sont passés en paramètre de QPushButton::setEnabled(). Ceci permet de
+    s'assurer que les boutons \c editButton et \c removeButton ne sont activés
+    que s'il existe au moins un contact dans le carnet d'adresses;
+    \c nextButton et \c previousButton ne sont activés que lorsqu'il existe
+    plus d'un contact dans le carnet d'adresses.
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp update interface() part 2
+
+    En effectuant les opérations de réglage du mode et de mise à jour de
+    l'interface utilisateur au sein de la même méthode, on est à l'abri de
+    l'éventualité où l'interface utilisateur se "désynchronise" de l'état
+    interne de l'application.
+
+*/
+
+/*!
+    \page tutorials-addressbook-fr-part5.html
+    \previouspage {tutorials/addressbook-fr/part4}{Chapitre 4}
+    \contentspage {Tutoriel "Carnet d'adresses"}{Sommaire}
+    \nextpage {tutorials/addressbook-fr/part6}{Chapitre 6}
+    \example tutorials/addressbook-fr/part5
+    \title Carnet d'adresse 5 - Ajout d'une fonction de recherche
+
+    Dans ce chapitre, nous allons voir les possibilités pour rechercher
+    des contacts dans le carnet d'adresse.
+
+    \image addressbook-tutorial-part5-screenshot.png
+
+    Plus nous ajoutons des contacts dans l'application, plus
+    il devient difficile de naviguer avec les boutons \e Next et \e Previous.
+    Dans ce cas, une fonction de recherche serait plus efficace pour rechercher
+    les contacts.
+    La capture d'écran ci-dessus montre le bouton de recherche \e Find et sa position
+    dans le paneau de bouton.
+
+    Lorsque l'utilisateur clique sur le bouton \e Find, il est courant d'afficher
+    une boîte de dialogue qui demande à l'utilisateur d'entrer un nom de contact.
+    Qt fournit la classe QDialog, que nous sous-classons dans ce chapitre pour
+    implémenter la class \c FindDialog.
+
+    \section1 Définition de la classe FindDialog
+
+    \image addressbook-tutorial-part5-finddialog.png
+
+    Pour sous-classer QDialog, nous commençons par inclure le header de
+    QDialog dans le fichier \c finddialog.h. De plus, nous déclarons les
+    classes QLineEdit et QPushButton car nous utilisons ces widgets dans
+    notre classe dialogue.
+
+    Tout comme dans la classe \c AddressBook, la classe \c FindDialog utilise
+    la macro Q_OBJECT et son constructeur est défini de façon à accepter
+    un QWidget parent, même si cette boîte de dialogue sera affichée dans une
+    fenêtre séparée.
+
+    \snippet tutorials/addressbook/part5/finddialog.h FindDialog header
+
+    Nous définissons la méthode publique \c getFindText() pour être utilisée
+    par les classes qui instancient \c FindDialog, ce qui leur permet d'obtenir
+    le texte entré par l'utilisateur. Un slot public, \c findClicked(), est
+    défini pour prendre en charge le texte lorsque l'utilisateur clique sur
+    le bouton \gui Find.
+
+    Finalement, nous définissons les variables privées \c findButton,
+    \c lineEdit et \c findText, qui correspondent respectivement au bouton
+    \gui Find, au champ de texte dans lequel l'utilisateur tape le texte
+    à rechercher, et à une variable interne stockant le texte pour une
+    utilisation ultérieure.
+
+    \section1 Implémentation de la classe FindDialog
+
+    Dans le constructeur de \c FindDialog, nous instancions les objets des
+    variables privées \c lineEdit, \c findButton et \c findText. Nous utilisons ensuite
+    un QHBoxLayout pour positionner les widgets.
+
+    \snippet tutorials/addressbook/part5/finddialog.cpp constructor
+
+    Nous mettons en place la mise en page et le titre de la fenêtre, et
+    nous connectons les signaux aux slots. Remarquez que le signal
+    \l{QPushButton::clicked()}{clicked()} de \c{findButton} est connecté
+    à \c findClicked() et \l{QDialog::accept()}{accept()}. Le slot
+    \l{QDialog::accept()}{accept()} fourni par le QDialog ferme
+    la boîte de dialogue et lui donne le code de retour \l{QDialog::}{Accepted}.
+    Nous utilisons cette fonction pour aider la méthode \c findContact() de la classe
+    \c{AddressBook} à savoir si l'objet \c FindDialog a été fermé. Ceci sera
+    expliqué plus loin lorsque nous verrons la méthode \c findContact().
+
+    \image addressbook-tutorial-part5-signals-and-slots.png
+
+    Dans \c findClicked(), nous validons le champ de texte pour nous
+    assurer que l'utilisateur n'a pas cliqué sur le bouton \gui Find sans
+    avoir entré un nom de contact. Ensuite, nous stockons le texte du champ
+    d'entrée \c lineEdit dans \c findText. Et finalement nous vidons le
+    contenu de \c lineEdit et cachons la boîte de dialogue.
+
+    \snippet tutorials/addressbook/part5/finddialog.cpp findClicked() function
+
+    La variable \c findText a un accesseur publique associé: \c getFindText().
+    Étant donné que nous ne modifions \c findText directement que dans le
+    constructeur et la méthode \c findClicked(), nous ne créons pas
+    de manipulateurs associé à \c getFindText().
+    Puisque \c getFindText() est publique, les classes instanciant et
+    utilisant \c FindDialog peuvent toujours accéder à la chaîne de
+    caractères que l'utilisateur a entré et accepté.
+
+    \snippet tutorials/addressbook/part5/finddialog.cpp getFindText() function
+
+    \section1 Définition de la classe AddressBook
+
+    Pour utiliser \c FindDialog depuis la classe \c AddressBook, nous
+    incluons \c finddialog.h dans le fichier \c addressbook.h.
+
+    \snippet tutorials/addressbook/part5/addressbook.h include finddialog's header
+
+    Jusqu'ici, toutes les fonctionnalités du carnet d'adresses ont un
+    QPushButton et un slot correspondant. De la même façon, pour la
+    fonctionnalité \gui Find, nous avons \c findButton et \c findContact().
+
+    Le \c findButton est déclaré comme une variable privée et la
+    méthode \c findContact() est déclarée comme un slot public.
+
+    \snippet tutorials/addressbook/part5/addressbook.h findContact() declaration
+    \dots
+    \snippet tutorials/addressbook/part5/addressbook.h findButton declaration
+
+    Finalement, nous déclarons la variable privée \c dialog que nous allons
+    utiliser pour accéder à une instance de \c FindDialog.
+
+    \snippet tutorials/addressbook/part5/addressbook.h FindDialog declaration
+
+    Une fois que nous avons instancié la boîte de dialogue, nous voulons l'utiliser
+    plus qu'une fois. Utiliser une variable privée nous permet d'y référer
+    à plus d'un endroit dans la classe.
+
+    \section1 Implémentation de la classe AddressBook
+
+    Dans le constructeur de \c AddressBook, nous instancions nos objets privés,
+    \c findbutton et \c findDialog:
+
+    \snippet tutorials/addressbook/part5/addressbook.cpp instantiating findButton
+    \dots
+    \snippet tutorials/addressbook/part5/addressbook.cpp instantiating FindDialog
+
+    Ensuite, nous connectons le signal \l{QPushButton::clicked()}{clicked()} de
+    \c{findButton} à \c findContact().
+
+    \snippet tutorials/addressbook/part5/addressbook.cpp signals and slots for find
+
+    Maintenant, tout ce qui manque est le code de notre méthode \c findContact():
+
+    \snippet tutorials/addressbook/part5/addressbook.cpp findContact() function
+
+    Nous commençons par afficher l'instance de \c FindDialog, \c dialog.
+    L'utilisateur peut alors entrer le nom du contact à rechercher. Lorsque
+    l'utilisateur clique sur le bouton \c findButton, la boîte de dialogue est
+    masquée et le code de retour devient QDialog::Accepted. Ce code de retour
+    vient remplir la condition du premier if.
+
+    Ensuite, nous extrayons le texte que nous utiliserons pour la recherche,
+    il s'agit ici de \c contactName obtenu à l'aide de la méthode \c getFindText()
+    de \c FindDialog. Si le contact existe dans le carnet d'adresse, nous
+    l'affichons directement. Sinon, nous affichons le QMessageBox suivant pour
+    indiquer que la recherche à échouée.
+
+    \image addressbook-tutorial-part5-notfound.png
+*/
+
+/*!
+    \page tutorials-addressbook-part6.html
+    \previouspage {tutorials/addressbook-fr/part5}{Chapitre 5}
+    \contentspage {Tutoriel "Carnet d'adresses"}{Sommaire}
+    \nextpage {tutorials/addressbook-fr/part7}{Chapitre 7}
+    \example tutorials/addressbook-fr/part6
+    \title Carnet d'Adresses 6 - Sauvegarde et chargement
+
+    Ce chapitre couvre les fonctionnalités de gestion des fichiers de Qt que
+    l'on utilise pour écrire les procédures de sauvegarde et chargement pour
+    l'application carnet d'adresses.
+
+    \image addressbook-tutorial-part6-screenshot.png
+
+    Bien que la navigation et la recherche de contacts soient des
+    fonctionnalités importantes, notre carnet d'adresses ne sera pleinement
+    utilisable qu'une fois que l'on pourra sauvegarder les contacts existants
+    et les charger à nouveau par la suite.
+    Qt fournit de nombreuses classes pour gérer les \l{Input/Output and
+    Networking}{entrées et sorties}, mais nous avons choisi de nous contenter d'une
+    combinaison de deux classes simples à utiliser ensemble: QFile et QDataStream.
+
+    Un objet QFile représente un fichier sur le disque qui peut être lu, et
+    dans lequel on peut écrire. QFile est une classe fille de la classe plus
+    générique QIODevice, qui peut représenter différents types de
+    périphériques.
+
+    Un objet QDataStream est utilisé pour sérialiser des données binaires
+    dans le but de les passer à un QIODevice pour les récupérer dans le
+    futur. Pour lire ou écrire dans un QIODevice, il suffit d'ouvrir le
+    flux, avec le périphérique approprié en paramètre, et d'y lire ou
+    écrire.
+
+    \section1 Définition de la classe AddressBook
+
+    On déclare deux slots publics, \c saveToFile() et \c loadFromFile(), 
+    ainsi que deux objets QPushButton, \c loadButton et \c saveButton.
+
+    \snippet tutorials/addressbook/part6/addressbook.h save and load functions declaration
+    \dots
+    \snippet tutorials/addressbook/part6/addressbook.h save and load buttons declaration
+
+    \section1 Implémentation de la classe AddressBook
+
+    Dans notre constructeur, on instancie \c loadButton et \c saveButton.
+    Idéalement, l'interface serait plus conviviale avec des boutons
+    affichant "Load contacts from a file" et "Save contacts to a file". Mais
+    compte tenu de la dimension des autres boutons, on initialise les labels
+    des boutons à \gui{Load...} et \gui{Save...}. Heureusement, Qt offre une
+    façon simple d'ajouter des info-bulles avec
+    \l{QWidget::setToolTip()}{setToolTip()}, et nous l'exploitons de la façon
+    suivante pour nos boutons:
+
+    \snippet tutorials/addressbook/part6/addressbook.cpp tooltip 1
+    \dots
+    \snippet tutorials/addressbook/part6/addressbook.cpp tooltip 2
+
+    Bien qu'on ne cite pas le code correspondant ici, nous ajoutons ces deux boutons au
+    layout de droite, \c button1Layout, comme pour les fonctionnalités précédentes, et 
+    nous connectons leurs signaux
+    \l{QPushButton::clicked()}{clicked()} à leurs slots respectifs.
+
+    Pour la sauvegarde, on commence par récupérer le nom de fichier 
+    \c fileName, en utilisant QFileDialog::getSaveFileName(). C'est une
+    méthode pratique fournie par QFileDialog, qui ouvre une boîte de
+    dialogue modale et permet à l'utilisateur d'entrer un nom de fichier ou
+    de choisir un fichier \c{.abk} existant. Les fichiers \c{.abk}
+    correspondent à l'extension choisie pour la sauvegarde des contacts de
+    notre carnet d'adresses.
+
+    \snippet tutorials/addressbook/part6/addressbook.cpp saveToFile() function part1
+
+    La boîte de dialogue affichée est visible sur la capture d'écran ci-
+    dessous.
+
+    \image addressbook-tutorial-part6-save.png
+
+    Si \c fileName n'est pas vide, on crée un objet QFile, \c file, à partir
+    de \c fileName. QFile fonctionne avec QDataStream puisqu'il dérive de
+    QIODevice.
+
+    Ensuite, on essaie d'ouvrir le fichier en écriture, ce qui correspond au
+    mode \l{QIODevice::}{WriteOnly}. Si cela échoue, on en informe
+    l'utilisateur avec une QMessageBox.
+
+    \snippet tutorials/addressbook/part6/addressbook.cpp saveToFile() function part2
+
+    Dans le cas contraire, on instancie un objet QDataStream, \c out, afin
+    d'écrire dans le fichier ouvert. QDataStream nécessite que la même
+    version de flux soit utilisée pour la lecture et l'écriture. On s'assure
+    que c'est le cas en spécifiant explicitement d'utiliser la
+    \l{QDataStream::Qt_4_5}{version introduite avec Qt 4.5} avant de
+    sérialiser les données vers le fichier \c file.
+
+    \snippet tutorials/addressbook/part6/addressbook.cpp saveToFile() function part3
+
+    Pour le chargement, on récupère également \c fileName en utilisant
+    QFileDialog::getOpenFileName(). Cette méthode est l'homologue de
+    QFileDialog::getSaveFileName() et affiche également une boîte de
+    dialogue modale permettant à l'utilisateur d'entrer un nom de fichier ou
+    de selectionner un fichier \c{.abk} existant, afin de le charger dans le
+    carnet d'adresses.
+
+    \snippet tutorials/addressbook/part6/addressbook.cpp loadFromFile() function part1
+
+    Sous Windows, par exemple, cette méthode affiche une boîte de dialogue
+    native pour la sélection de fichier, comme illustré sur la capture
+    d'écran suivante:
+
+    \image addressbook-tutorial-part6-load.png
+
+    Si \c fileName n'est pas vide, on utilise une fois de plus un objet
+    QFile, \c file, et on tente de l'ouvrir en lecture, avec le mode
+    \l{QIODevice::}{ReadOnly}. De même que précédemment dans notre
+    implémentation de \c saveToFile(), si cette tentative s'avère
+    infructueuse, on en informe l'utilisateur par le biais d'une
+    QMessageBox.
+
+    \snippet tutorials/addressbook/part6/addressbook.cpp loadFromFile() function part2
+
+    Dans le cas contraire, on instancie un objet QDataStream, \c in, en
+    spécifiant la version à utiliser comme précédemment, et on lit les
+    informations sérialisées vers la structure de données \c contacts. Notez
+    qu'on purge \c contacts avant d'y mettre les informations lues afin de
+    simplifier le processus de lecture de fichier. Une façon plus avancée de
+    procéder serait de lire les contacts dans un objet QMap temporaire, et
+    de copier uniquement les contacts n'existant pas encore dans
+    \c contacts.
+
+    \snippet tutorials/addressbook/part6/addressbook.cpp loadFromFile() function part3
+
+    Pour afficher les contacts lus depuis le fichier, on doit d'abord
+    valider les données obtenues afin de s'assurer que le fichier lu
+    contient effectivement des entrées de carnet d'adresses. Si c'est le
+    cas, on affiche le premier contact; sinon on informe l'utilisateur du
+    problème par une QMessageBox. Enfin, on met à jour l'interface afin
+    d'activer et de désactiver les boutons de façon appropriée.
+*/
+
+/*!
+    \page tutorials-addressbook-fr-part7.html
+    \previouspage {tutorials/addressbook-fr/part6}{Chapitre 6}
+    \contentspage {Tutoriel "Carnet d'adresses"}{Sommaire}
+    \example tutorials/addressbook-fr/part7
+    \title Carnet d'adresse 7 - Fonctionnalités avancées
+
+    Ce chapitre couvre quelques fonctionnalités additionnelles qui
+    feront de notre carnet d'adresses une application plus pratique
+    pour une utilisation quotidienne.
+
+    \image addressbook-tutorial-part7-screenshot.png
+
+    Bien que notre application carnet d'adresses soit utile en tant que telle,
+    il serait pratique de pouvoir échanger les contacts avec d'autres applications.
+    Le format vCard est un un format de fichier populaire pour échanger
+    ce type de données.
+    Dans ce chapitre, nous étendrons notre carnet d'adresses pour permettre
+    d'exporter des contacts dans des fichiers vCard \c{.vcf}.
+
+    \section1 Définition de la classe AddressBook
+
+    Nous ajoutons un objet QPushButton, \c exportButton, et un slot
+    public correspondant, \c exportAsVCard(), à notre classe \c AddressBook 
+    dans le fichier \c addressbook.h.
+
+    \snippet tutorials/addressbook/part7/addressbook.h exportAsVCard() declaration
+    \dots
+    \snippet tutorials/addressbook/part7/addressbook.h exportButton declaration
+
+    \section1 Implémentation de la classe AddressBook
+
+    Dans le constructeur de \c AddressBook, nous connectons le signal
+    \l{QPushButton::clicked()}{clicked()} de \c{exportButton} au slot
+    \c exportAsVCard().
+    Nous ajoutons aussi ce bouton à \c buttonLayout1, le layout responsable
+    du groupe de boutons sur la droite.
+
+    Dans la méthode \c exportAsVCard(), nous commençons par extraire le
+    nom du contact dans \n name. Nous déclarons \c firstname, \c lastName et
+    \c nameList.
+    Ensuite, nous cherchons la position du premier espace blanc de \c name.
+    Si il y a un espace, nous séparons le nom du contact en \c firstName et
+    \c lastName. Finalement, nous remplaçons l'espace par un underscore ("_").
+    Si il n'y a pas d'espace, nous supposons que le contact ne comprend que
+    le prénom.
+
+    \snippet tutorials/addressbook/part7/addressbook.cpp export function part1
+
+    Comme pour la méthode \c saveToFile(), nous ouvrons une boîte de dialogue
+    pour donner la possibilité à l'utilisateur de choisir un emplacement pour
+    le fichier. Avec le nom de fichier choisi, nous créons une instance de QFile
+    pour y écrire.
+
+    Nous essayons d'ouvrir le fichier en mode \l{QIODevice::}{WriteOnly}. Si
+    cela échoue, nous affichons un QMessageBox pour informer l'utilisateur
+    à propos de l'origine du problème et nous quittons la méthode. Sinon, nous passons le
+    fichier comme paramètre pour créer un objet QTextStream, \c out. De la même façon que
+    QDataStream, la classe QTextStream fournit les fonctionnalités pour 
+    lire et écrire des fichiers de texte. Grâce à celà, le fichier \c{.vcf}
+    généré pourra être ouvert et édité à l'aide d'un simple éditeur de texte.
+
+    \snippet tutorials/addressbook/part7/addressbook.cpp export function part2
+
+    Nous écrivons ensuite un fichier vCard avec la balise \c{BEGIN:VCARD},
+    suivit par \c{VERSION:2.1}.
+    Le nom d'un contact est écrit à l'aide de la balise \c{N:}. Pour la balise
+    \c{FN:}, qui remplit le titre du contact, nous devons vérifier si le contact
+    à un nom de famille défini ou non. Si oui, nous utilions les détails de
+    \c nameList pour remplir le champ, dans le cas contraire on écrit uniquement le contenu
+    de \c firstName.
+ 
+    \snippet tutorials/addressbook/part7/addressbook.cpp export function part3
+
+    Nous continuons en écrivant l'adresse du contact. Les points-virgules
+    dans l'adresse sont échappés à l'aide de "\\", les retours de ligne sont
+    remplacés par des points-virgules, et les vigules sont remplacées par des espaces.
+    Finalement nous écrivons les balises  \c{ADR;HOME:;} suivies par l'adresse
+    et la balise \c{END:VCARD}.
+
+    \snippet tutorials/addressbook/part7/addressbook.cpp export function part4
+
+    À la fin de la méthode, un QMessageBox est affiché pour informer l'utilisateur
+    que la vCard a été exportée avec succès. 
+
+    \e{vCard est une marque déposée de \l{http://www.imc.org}
+    {Internet Mail Consortium}}.
+*/
diff --git a/doc/src/tutorials/addressbook-sdk.qdoc b/doc/src/tutorials/addressbook-sdk.qdoc
new file mode 100644
index 0000000000..b6b257d55f
--- /dev/null
+++ b/doc/src/tutorials/addressbook-sdk.qdoc
@@ -0,0 +1,179 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page tutorials-addressbook-sdk.html
+
+    \startpage {index.html}{Qt Reference Documentation}
+    \nextpage \l{Designing the User Interface}{Chapter 1}
+
+    \title Address Book Tutorial
+    \ingroup howto
+    \ingroup tutorials
+    \brief An introduction to GUI programming with Qt and Qt Creator,
+    describing in detail how to put together a simple yet fully-
+    functioning application.
+
+    This tutorial gives an introduction to GUI programming using the Qt SDK.
+
+    ### Screenshot
+
+    In the process, we will learn about some basic technologies provided by
+    Qt, such as:
+
+    \list
+        \o  Widgets and layout managers
+        \o  Container classes
+        \o  Signals and slots
+        \o  Input and output devices
+    \endlist
+
+    If you are completely new to Qt, please read \l{How to Learn Qt} if you
+    have not already done so.
+
+    The tutorial's source code is located in Qt's
+    \c{examples/tutorials/addressbook} directory.
+
+    Tutorial chapters:
+
+    \list 1
+        \o \l{Designing the User Interface}
+        \o \l{Adding Addresses}
+        \o \l{Navigating between Entries}
+        \o \l{Editing and Removing Addresses}
+        \o \l{Adding a Find Function}
+        \o \l{Loading and Saving}
+        \o \l{Additional Features}
+    \endlist
+
+    Although this little application does not look much like a fully-fledged
+    modern GUI application, it uses many of the basic techniques that are used
+    in more complex applications. After you have worked through it, we
+    recommend checking out the \l{mainwindows/application}{Application}
+    example, which presents a small GUI application, with menus, toolbars, a
+    status bar, and so on.
+*/
+
+
+/*!
+    \page tutorials-addressbook-sdk-part1.html
+    \contentspage {Address Book Tutorial}{Contents}
+    \nextpage \l{Adding Addresses}{Chapter 2}
+    \title Address Book 1 - Designing the User Interface
+
+    The first part of this tutorial covers the design of the basic graphical
+    user interface (GUI) we use for the Address Book application.
+
+    The first step to creating a GUI program is to design the user interface.
+    In this chapter, our goal is to set up the labels and input fields needed
+    to implement a basic address book application. The figure below is a
+    screenshot of our expected output.
+
+    \image addressbook-tutorial-part1-screenshot.png
+
+    We begin by launching Qt Creator and use it to generate a new project. To
+    do this, select \gui New from the \gui File menu. In the
+    \gui{New File or Project} dialog. Follow the step by step guide on how to
+    create a \gui Project with Qt Creator, refer to the document
+    \l{Creating a Project in Qt Creator}{here}. Ensure that you select QWidget
+    as your subclass and name it \c AddressBook.
+
+    There are five files generated in this \gui{Project}:
+
+    \list
+        \o  \c{addressbook.pro} - the project file,
+        \o  \c{addressbook.h} - the definition file for the \c AddressBook
+            class,
+        \o  \c{addressbook.cpp} - the implementation file for the
+            \c AddressBook class,
+        \o  \c{main.cpp} - the file containing a \c main() function, with an
+            instance of \c AddressBook, and
+        \o  \c{addressbook.ui} - the user interface file created with \QD.
+    \endlist
+
+    Now we have all the files we need, let's move on to designing the user
+    interface.
+
+    \section1 Placing the Widgets on the Form
+
+    In the \gui{Project Sidebar}, double-click on the \c{addressbook.ui} file.
+    The \QD plugin will be launched, allowing you to design your program's user
+    interface.
+
+    We require two \l{QLabel}s to label the input fields as well as a
+    QLineEdit and a QTextEdit as the input fields. So, drag those widgets from
+    the \gui{Widget Box} to your form. In the \gui{Property Editor}, set their
+    \gui{objectName} property to \c nameLabel and \c addressLabel for the
+    \l{QLabel}s, \c nameLine for the QLineEdit and finally, \c addressText for
+    the QTextEdit.
+
+    Next, we have to position the widgets properly, according to the screenshot
+    earlier. We use a QGridLayout to position our labels and input fields in a
+    structured manner. QGridLayout divides the available space into a grid and
+    places widgets in the cells we specify with row and column numbers. The
+    diagram below shows the layout cells and the position of our widgets.
+
+    \image addressbook-tutorial-part1-labeled-screenshot.png
+
+
+    \section1 Qt Programming - Subclassing
+
+    When writing Qt programs, we usually subclass Qt objects to add
+    functionality. This is one of the essential concepts behind creating custom
+    widgets or collections of standard widgets. Subclassing to extend or change
+    the behavior of a widget has the following advantages:
+
+    \list
+        \o  We can write implementations of virtual or pure virtual functions
+            to obtain exactly what we need, falling back on the base class's
+            implementation when necessary.
+        \o  It allows us to encapsulate parts of the user interface within a
+            class, so that the other parts of the application do not need to
+            know about the individual widgets in the user interface.
+        \o  The subclass can be used to create multiple custom widgets in the
+            same application or library, and the code for the subclass can be
+            reused in other projects.
+    \endlist
+
+
+
+
+*/
diff --git a/doc/src/tutorials/addressbook.qdoc b/doc/src/tutorials/addressbook.qdoc
new file mode 100644
index 0000000000..3b0d2bc1d5
--- /dev/null
+++ b/doc/src/tutorials/addressbook.qdoc
@@ -0,0 +1,1006 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page tutorials-addressbook.html
+
+    \startpage {index.html}{Qt Reference Documentation}
+    \nextpage {tutorials/addressbook/part1}{Chapter 1}
+
+    \title Address Book Tutorial
+    \ingroup howto
+    \ingroup tutorials
+    \brief An introduction to GUI programming, showing how to put together a
+    simple yet fully-functioning application.
+
+    This tutorial gives an introduction to GUI programming using the Qt
+    cross-platform framework.
+
+    \image addressbook-tutorial-screenshot.png
+
+    \omit
+    It doesn't cover everything; the emphasis is on teaching the programming
+    philosophy of GUI programming, and Qt's features are introduced as needed.
+    Some commonly used features are never used in this tutorial.
+    \endomit
+
+    In the process, we will learn about some basic technologies provided by Qt,
+    such as
+
+    \list
+    \o Widgets and layout managers
+    \o Container classes
+    \o Signals and slots
+    \o Input and output devices
+    \endlist
+
+    If you are completely new to Qt, please read \l{How to Learn Qt} if you
+    have not already done so.
+
+    The tutorial's source code is located in Qt's \c examples/tutorials/addressbook
+    directory.
+
+    Tutorial chapters:
+
+    \list 1
+    \o \l{tutorials/addressbook/part1}{Designing the User Interface}
+    \o \l{tutorials/addressbook/part2}{Adding Addresses}
+    \o \l{tutorials/addressbook/part3}{Navigating between Entries}
+    \o \l{tutorials/addressbook/part4}{Editing and Removing Addresses}
+    \o \l{tutorials/addressbook/part5}{Adding a Find Function}
+    \o \l{tutorials/addressbook/part6}{Loading and Saving}
+    \o \l{tutorials/addressbook/part7}{Additional Features}
+    \endlist
+
+    Although this little application does not look much like a fully-fledged
+    modern GUI application, it uses many of the basic techniques that are used
+    in more complex applications. After you have worked through it, we
+    recommend checking out the \l{mainwindows/application}{Application}
+    example, which presents a small GUI application, with menus, toolbars, a
+    status bar, and so on.
+*/
+
+/*!
+    \page tutorials-addressbook-part1.html
+    \contentspage {Address Book Tutorial}{Contents}
+    \nextpage {tutorials/addressbook/part2}{Chapter 2}
+    \example tutorials/addressbook/part1
+    \title Address Book 1 - Designing the User Interface
+
+    The first part of this tutorial covers the design of the basic graphical
+    user interface (GUI) we use for the Address Book application.
+
+    The first step to creating a GUI program is to design the user interface.
+    In this chapter, our goal is to set up the labels and input fields needed
+    to implement a basic address book application. The figure below is a
+    screenshot of our expected output.
+
+    \image addressbook-tutorial-part1-screenshot.png
+
+    We require two QLabel objects, \c nameLabel and \c addressLabel, as well
+    as two input fields, a QLineEdit object, \c nameLine, and a QTextEdit
+    object, \c addressText, to enable the user to enter a contact's name and
+    address. The widgets used and their positions are shown in the figure
+    below.
+
+    \image addressbook-tutorial-part1-labeled-screenshot.png
+
+    There are three files used to implement this address book:
+
+    \list
+        \o \c{addressbook.h} - the definition file for the \c AddressBook
+            class,
+        \o \c{addressbook.cpp} - the implementation file for the
+            \c AddressBook class, and
+        \o \c{main.cpp} - the file containing a \c main() function, with
+            an instance of \c AddressBook.
+    \endlist
+
+    \section1 Qt Programming - Subclassing
+
+    When writing Qt programs, we usually subclass Qt objects to add
+    functionality. This is one of the essential concepts behind creating
+    custom widgets or collections of standard widgets. Subclassing to
+    extend or change the behavior of a widget has the following advantages:
+
+    \list
+    \o We can write implementations of virtual or pure virtual functions to
+    obtain exactly what we need, falling back on the base class's implementation
+    when necessary.
+    \o It allows us to encapsulate parts of the user interface within a class,
+    so that the other parts of the application don't need to know about the
+    individual widgets in the user interface.
+    \o The subclass can be used to create multiple custom widgets in the same
+    application or library, and the code for the subclass can be reused in other
+    projects.
+    \endlist
+
+    Since Qt does not provide a specific address book widget, we subclass a
+    standard Qt widget class and add features to it. The \c AddressBook class
+    we create in this tutorial can be reused in situations where a basic address
+    book widget is needed.
+
+    \section1 Defining the AddressBook Class
+
+    The \l{tutorials/addressbook/part1/addressbook.h}{\c addressbook.h} file is
+    used to define the \c AddressBook class.
+
+    We start by defining \c AddressBook as a QWidget subclass and declaring
+    a constructor. We also use the Q_OBJECT macro to indicate that the class
+    uses internationalization and Qt's signals and slots features, even
+    if we do not use all of these features at this stage.
+
+    \snippet tutorials/addressbook/part1/addressbook.h class definition
+
+    The class holds declarations of \c nameLine and \c addressText, the
+    private instances of QLineEdit and QTextEdit mentioned earlier.
+    You will see, in the coming chapters, that data stored in \c nameLine and
+    \c addressText is needed for many of the address book's functions.
+
+    We do not need to include declarations of the QLabel objects we will use
+    because we will not need to reference them once they have been created.
+    The way Qt tracks the ownership of objects is explained in the next section.
+
+    The Q_OBJECT macro itself implements some of the more advanced features of Qt.
+    For now, it is useful to think of the Q_OBJECT macro as a shortcut which allows
+    us to use the \l{QObject::}{tr()} and \l{QObject::}{connect()} functions.
+
+    We have now completed the \c addressbook.h file and we move on to
+    implement the corresponding \c addressbook.cpp file.
+
+    \section1 Implementing the AddressBook Class
+
+    The constructor of \c AddressBook accepts a QWidget parameter, \a parent.
+    By convention, we pass this parameter to the base class's constructor.
+    This concept of ownership, where a parent can have one or more children,
+    is useful for grouping widgets in Qt. For example, if you delete a parent,
+    all of its children will be deleted as well.
+
+    \snippet tutorials/addressbook/part1/addressbook.cpp constructor and input fields
+
+    Within this constructor, we declare and instantiate two local QLabel objects,
+    \c nameLabel and \c addressLabel, as well as instantiate \c nameLine and
+    \c addressText. The
+    \l{QObject::tr()}{tr()} function returns a translated version of the
+    string, if there is one available; otherwise, it returns the string itself.
+    Think of this function as an \c{<insert translation here>} marker to mark
+    QString objects for translation. You will notice, in the coming chapters as
+    well as in the \l{Qt Examples}, that we include it whenever we use a
+    translatable string.
+
+    When programming with Qt, it is useful to know how layouts work.
+    Qt provides three main layout classes: QHBoxLayout, QVBoxLayout
+    and QGridLayout to handle the positioning of widgets.
+
+    \image addressbook-tutorial-part1-labeled-layout.png
+
+    We use a QGridLayout to position our labels and input fields in a
+    structured manner. QGridLayout divides the available space into a grid and
+    places widgets in the cells we specify with row and column numbers. The
+    diagram above shows the layout cells and the position of our widgets, and
+    we specify this arrangement using the following code:
+
+    \snippet tutorials/addressbook/part1/addressbook.cpp layout
+
+    Notice that \c addressLabel is positioned using Qt::AlignTop as an
+    additional argument. This is to make sure it is not vertically centered in
+    cell (1,0). For a basic overview on Qt Layouts, refer to the \l{Layout Classes}
+    document.
+
+    In order to install the layout object onto the widget, we have to invoke
+    the widget's \l{QWidget::setLayout()}{setLayout()} function:
+
+    \snippet tutorials/addressbook/part1/addressbook.cpp setting the layout
+
+    Lastly, we set the widget's title to "Simple Address Book".
+
+    \section1 Running the Application
+
+    A separate file, \c main.cpp, is used for the \c main() function. Within
+    this function, we instantiate a QApplication object, \c app. QApplication
+    is responsible for various application-wide resources, such as the default
+    font and cursor, and for running an event loop. Hence, there is always one
+    QApplication object in every GUI application using Qt.
+
+    \snippet tutorials/addressbook/part1/main.cpp main function
+
+    We construct a new \c AddressBook widget on the heap using the \c new
+    keyword and invoke its \l{QWidget::show()}{show()} function to display it.
+    However, the widget will not be shown until the application's event loop
+    is started. We start the event loop by calling the application's
+    \l{QApplication::}{exec()} function; the result returned by this function
+    is used as the return value from the \c main() function.
+*/
+
+/*!
+    \page tutorials-addressbook-part2.html
+    \previouspage Address Book 1 - Designing the User Interface
+    \contentspage {Address Book Tutorial}{Contents}
+    \nextpage {tutorials/addressbook/part3}{Chapter 3}
+    \example tutorials/addressbook/part2
+    \title Address Book 2 - Adding Addresses
+
+    The next step to creating our basic address book application is to allow
+    a little bit of user interaction.
+
+    \image addressbook-tutorial-part2-add-contact.png
+
+    We will provide a push button that the user can click to add a new contact.
+    Also, some form of data structure is needed to store these contacts in an
+    organized way.
+
+    \section1 Defining the AddressBook Class
+
+    Now that we have the labels and input fields set up, we add push buttons to
+    complete the process of adding a contact. This means that our
+    \c addressbook.h file now has three QPushButton objects declared and three
+    corresponding public slots.
+
+    \snippet tutorials/addressbook/part2/addressbook.h slots
+
+    A slot is a function that responds to a particular signal. We will discuss
+    this concept in further detail when implementing the \c AddressBook class.
+    However, for an overview of Qt's signals and slots concept, you can refer
+    to the \l{Signals and Slots} document.
+
+    Three QPushButton objects: \c addButton, \c submitButton and
+    \c cancelButton, are now included in our private variable declarations,
+    along with \c nameLine and \c addressText from the last chapter.
+
+    \snippet tutorials/addressbook/part2/addressbook.h pushbutton declaration
+
+    We need a container to store our address book contacts, so that we can
+    traverse and display them. A QMap object, \c contacts, is used for this
+    purpose as it holds a key-value pair: the contact's name as the \e key,
+    and the contact's address as the \e{value}.
+
+    \snippet tutorials/addressbook/part2/addressbook.h remaining private variables
+
+    We also declare two private QString objects, \c oldName and \c oldAddress.
+    These objects are needed to hold the name and address of the contact that
+    was last displayed, before the user clicked "Add". So, when the user clicks
+    "Cancel", we can revert to displaying the details of the last contact.
+
+    \section1 Implementing the AddressBook Class
+
+    Within the constructor of \c AddressBook, we set the \c nameLine and
+    \c addressText to read-only, so that we can only display but not edit
+    existing cotact details.
+
+    \dots
+    \snippet tutorials/addressbook/part2/addressbook.cpp setting readonly 1
+    \dots
+    \snippet tutorials/addressbook/part2/addressbook.cpp setting readonly 2
+
+    Then, we instantiate our push buttons: \c addButton, \c submitButton, and
+    \c cancelButton.
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp pushbutton declaration
+
+    The \c addButton is displayed by invoking the \l{QPushButton::show()}
+    {show()} function, while the \c submitButton and \c cancelButton are
+    hidden by invoking \l{QPushButton::hide()}{hide()}. These two push
+    buttons will only be displayed when the user clicks "Add" and this is
+    handled by the \c addContact() function discussed below.
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp connecting signals and slots
+
+    We connect the push buttons' \l{QPushButton::clicked()}{clicked()} signal
+    to their respective slots. The figure below illustrates this.
+
+    \image addressbook-tutorial-part2-signals-and-slots.png
+
+    Next, we arrange our push buttons neatly to the right of our address book
+    widget, using a QVBoxLayout to line them up vertically.
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp vertical layout
+
+    The \l{QBoxLayout::addStretch()}{addStretch()} function is used to ensure
+    the push buttons are not evenly spaced, but arranged closer to the top of
+    the widget. The figure below shows the difference between using
+    \l{QBoxLayout::addStretch()}{addStretch()} and not using it.
+
+    \image addressbook-tutorial-part2-stretch-effects.png
+
+    We then add \c buttonLayout1 to \c mainLayout, using
+    \l{QGridLayout::addLayout()}{addLayout()}. This gives us nested layouts
+    as \c buttonLayout1 is now a child of \c mainLayout.
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp grid layout
+
+    Our layout coordinates now look like this:
+
+    \image addressbook-tutorial-part2-labeled-layout.png
+
+    In the \c addContact() function, we store the last displayed contact
+    details in \c oldName and \c oldAddress. Then we clear these input
+    fields and turn off the read-only mode. The focus is set on \c nameLine
+    and we display \c submitButton and \c cancelButton.
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp addContact
+
+    The \c submitContact() function can be divided into three parts:
+
+    \list 1
+    \o We extract the contact's details from \c nameLine and \c addressText
+    and store them in QString objects. We also validate to make sure that the
+    user did not click "Submit" with empty input fields; otherwise, a
+    QMessageBox is displayed to remind the user for a name and address.
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp submitContact part1
+
+    \o We then proceed to check if the contact already exists. If it does not
+    exist, we add the contact to \c contacts and we display a QMessageBox to
+    inform the user that the contact has been added.
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp submitContact part2
+
+    If the contact already exists, again, we display a QMessageBox to inform
+    the user about this, to prevent the user from adding duplicate contacts.
+    Our \c contacts object is based on key-value pairs of name and addresses,
+    hence, we want to ensure that \e key is unique.
+
+    \o Once we have handled both cases mentioned above, we restore the push
+    buttons to their normal state with the following code:
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp submitContact part3
+
+    \endlist
+
+    The screenshot below shows the QMessageBox object we use to display
+    information messages to the user.
+
+    \image addressbook-tutorial-part2-add-successful.png
+
+    The \c cancel() function restores the last displayed contact details and
+    enables \c addButton, as well as hides \c submitButton and
+    \c cancelButton.
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp cancel
+
+    The general idea to add a contact is to give the user the flexibility to
+    click "Submit" or "Cancel" at any time. The flowchart below further
+    explains this concept:
+
+    \image addressbook-tutorial-part2-add-flowchart.png
+*/
+
+/*!
+    \page tutorials-addressbook-part3.html
+    \previouspage Address Book 2 - Adding Addresses
+    \contentspage {Address Book Tutorial}{Contents}
+    \nextpage {tutorials/addressbook/part4}{Chapter 4}
+    \example tutorials/addressbook/part3
+    \title Address Book 3 - Navigating between Entries
+
+    The address book application is now half complete. We need to add some
+    functions to navigate between contacts. But first, we have to decide
+    what sort of a data structure we would like to use to hold these contacts.
+
+    In Chapter 2, we used a QMap of key-value pairs with the contact's name
+    as the \e key, and the contact's address as the \e value. This works well
+    for our case. However, in order to navigate and display each entry, a
+    little bit of enhancement is needed.
+
+    We enhance the QMap by making it replicate a data structure similar to a
+    circularly-linked list, where all elements are connected, including the
+    first element and the last element. The figure below illustrates this data
+    structure.
+
+    \image addressbook-tutorial-part3-linkedlist.png
+
+    \section1 Defining the AddressBook Class
+
+    In order to add navigation functions to the address book application, we
+    need to add two more slots to our \c AddressBook class: \c next() and
+    \c previous(). These are added to our \c addressbook.h file:
+
+    \snippet tutorials/addressbook/part3/addressbook.h navigation functions
+
+    We also require another two QPushButton objects, so we declare \c nextButton
+    and \c previousButton as private variables:
+
+    \snippet tutorials/addressbook/part3/addressbook.h navigation pushbuttons
+
+    \section1 Implementing the AddressBook Class
+
+    In the \c AddressBook constructor in \c addressbook.cpp, we instantiate
+    \c nextButton and \c previousButton and disable them by default. This is
+    because navigation is only enabled when there is more than one contact
+    in the address book.
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp navigation pushbuttons
+
+    We then connect these push buttons to their respective slots:
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp connecting navigation signals
+
+    The image below is our expected graphical user interface. Notice that it
+    is getting closer to our expected final output.
+
+    \image addressbook-tutorial-part3-screenshot.png
+
+    We follow basic conventions for \c next() and \c previous() functions by
+    placing the \c nextButton on the right and the \c previousButton on the
+    left. In order to achieve this intuitive layout, we use QHBoxLayout to
+    place the widgets side-by-side:
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp navigation layout
+
+    The QHBoxLayout object, \c buttonLayout2, is then added to \c mainLayout.
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp adding navigation layout
+
+    The figure below shows the coordinates of the widgets in \c mainLayout.
+    \image addressbook-tutorial-part3-labeled-layout.png
+
+    Within our \c addContact() function, we have to disable these buttons so
+    that the user does not attempt to navigate while adding a contact.
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp disabling navigation
+
+    Also, in our \c submitContact() function, we enable the navigation
+    buttons, \c nextButton and \c previousButton, depending on the size
+    of \c contacts. As mentioned earlier, navigation is only enabled when
+    there is more than one contact in the address book. The following lines
+    of code demonstrates how to do this:
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp enabling navigation
+
+    We also include these lines of code in the \c cancel() function.
+
+    Recall that we intend to emulate a circularly-linked list with our QMap
+    object, \c contacts. So, in the \c next() function, we obtain an iterator
+    for \c contacts and then:
+
+    \list
+        \o If the iterator is not at the end of \c contacts, we increment it
+        by one.
+        \o If the iterator is at the end of \c contacts, we move it to the
+        beginning of \c contacts. This gives us the illusion that our QMap is
+        working like a circularly-linked list.
+    \endlist
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp next() function
+
+    Once we have iterated to the correct object in \c contacts, we display
+    its contents on \c nameLine and \c addressText.
+
+    Similarly, for the \c previous() function, we obtain an iterator for
+    \c contacts and then:
+
+    \list
+        \o If the iterator is at the end of \c contacts, we clear the
+        display and return.
+        \o If the iterator is the beginning of \c contacts, we move it to
+        the end.
+        \o We then decrement the iterator by one.
+    \endlist
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp previous() function
+
+    Again, we display the contents of the current object in \c contacts.
+
+*/
+
+/*!
+    \page tutorials-addressbook-part4.html
+    \previouspage Address Book 3 - Navigating between Entries
+    \contentspage {Address Book Tutorial}{Contents}
+    \nextpage {tutorials/addressbook/part5}{Chapter 5}
+    \example tutorials/addressbook/part4
+    \title Address Book 4 - Editing and Removing Addresses
+
+    In this chapter, we look at ways to modify the contents of contact stored
+    in the address book application.
+
+    \image addressbook-tutorial-screenshot.png
+
+    We now have an address book that not only holds contacts in an organized
+    manner, but also allows navigation. It would be convenient to include
+    edit and remove functions so that a contact's details can be changed
+    when needed. However, this requires a little improvement, in the form of
+    enums. In our previous chapters, we had two modes: \c{AddingMode} and
+    \c{NavigationMode} - but they weren't defined as enums. Instead, we
+    enabled and disabled the corresponding buttons manually, resulting in
+    multiple lines of repeated code.
+
+    In this chapter, we define the \c Mode enum with three different values:
+
+    \list
+        \o \c{NavigationMode},
+        \o \c{AddingMode}, and
+        \o \c{EditingMode}.
+    \endlist
+
+    \section1 Defining the AddressBook Class
+
+    The \c addressbook.h file is updated to contain the \c Mode enum:
+
+    \snippet tutorials/addressbook/part4/addressbook.h Mode enum
+
+    We also add two new slots, \c editContact() and \c removeContact(), to
+    our current list of public slots.
+
+    \snippet tutorials/addressbook/part4/addressbook.h edit and remove slots
+
+    In order to switch between modes, we introduce the \c updateInterface() function
+    to control the enabling and disabling of all QPushButton objects. We also
+    add two new push buttons, \c editButton and \c removeButton, for the edit
+    and remove functions mentioned earlier.
+
+    \snippet tutorials/addressbook/part4/addressbook.h updateInterface() declaration
+    \dots
+    \snippet tutorials/addressbook/part4/addressbook.h buttons declaration
+    \dots
+    \snippet tutorials/addressbook/part4/addressbook.h mode declaration
+
+    Lastly, we declare \c currentMode to keep track of the current mode of the
+    enum.
+
+    \section1 Implementing the AddressBook Class
+
+    We now have to implement the mode-changing features of the address book
+    application. The \c editButton and \c removeButton are instantiated and
+    disabled by default, as the address book starts up with zero contacts in
+    memory.
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp edit and remove buttons
+
+    These buttons are then connected to their respective slots, \c editContact()
+    and \c removeContact(), and we add them to \c buttonLayout1.
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp connecting edit and remove
+    \dots
+    \snippet tutorials/addressbook/part4/addressbook.cpp adding edit and remove to the layout
+
+    The \c editContact() function stores the contact's old details in
+    \c oldName and \c oldAddress, before switching the mode to \c EditingMode.
+    In this mode, the \c submitButton and \c cancelButton are both enabled,
+    hence, the user can change the contact's details and click either button.
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp editContact() function
+
+    The \c submitContact() function has been divided in two with an \c{if-else}
+    statement. We check \c currentMode to see if it's in \c AddingMode. If it is,
+    we proceed with our adding process.
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp submitContact() function beginning
+    \dots
+    \snippet tutorials/addressbook/part4/addressbook.cpp submitContact() function part1
+
+    Otherwise, we check to see if \c currentMode is in \c EditingMode. If it
+    is, we compare \c oldName with \c name. If the name has changed, we remove
+    the old contact from \c contacts and insert the newly updated contact.
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp submitContact() function part2
+
+    If only the address has changed (i.e., \c oldAddress is not the same as \c address),
+    we update the contact's address. Lastly, we set \c currentMode to
+    \c NavigationMode. This is an important step as it re-enables all the
+    disabled push buttons.
+
+    To remove a contact from the address book, we implement the
+    \c removeContact() function. This function checks to see if the contact
+    exists in \c contacts.
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp removeContact() function
+
+    If it does, we display a QMessageBox, to confirm the removal with the
+    user. Once the user has confirmed, we call \c previous() to ensure that the
+    user interface shows another contact, and we remove the contact using \l{QMap}'s
+    \l{QMap::remove()}{remove()} function. As a courtesy, we display a QMessageBox
+    to inform the user. Both the message boxes used in this function are shown below:
+
+    \image addressbook-tutorial-part4-remove.png
+
+    \section2 Updating the User Interface
+
+    We mentioned the \c updateInterface() function earlier as a means to
+    enable and disable the push buttons depending on the current mode.
+    The function updates the current mode according to the \c mode argument
+    passed to it, assigning it to \c currentMode before checking its value.
+
+    Each of the push buttons is then enabled or disabled, depending on the
+    current mode. The code for \c AddingMode and \c EditingMode is shown below:
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp update interface() part 1
+
+    For \c NavigationMode, however, we include conditions within the
+    parameters of the QPushButton::setEnabled(). This is to ensure that
+    the \c editButton and \c removeButton push buttons are enabled when there
+    is at least one contact in the address book; \c nextButton and \c previousButton
+    are only enabled when there is more than one contact in the address book.
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp update interface() part 2
+
+    By performing the task of setting the mode and updating the user interface in
+    the same function, we avoid the possibility of the user interface getting "out
+    of sync" with the internal state of the application.
+*/
+
+/*!
+    \page tutorials-addressbook-part5.html
+    \previouspage Address Book 4 - Editing and Removing Addresses
+    \contentspage {Address Book Tutorial}{Contents}
+    \nextpage {tutorials/addressbook/part6}{Chapter 6}
+    \example tutorials/addressbook/part5
+    \title Address Book 5 - Adding a Find Function
+
+    In this chapter, we look at ways to locate contacts and addresses in
+    the address book application.
+
+    \image addressbook-tutorial-part5-screenshot.png
+
+    As we keep adding contacts to our address book application, it becomes
+    tedious to navigate them with the \e Next and \e Previous buttons. In this
+    case, a \e Find function would be more efficient in looking up contacts.
+    The screenshot above shows the \e Find button and its position on the panel
+    of buttons.
+
+    When the user clicks on the \e Find button, it is useful to display a
+    dialog that can prompt the user for a contact's name. Qt provides QDialog,
+    which we subclass in this chapter, to implement a \c FindDialog class.
+
+    \section1 Defining the FindDialog Class
+
+    \image addressbook-tutorial-part5-finddialog.png
+
+    In order to subclass QDialog, we first include the header for QDialog in
+    the \c finddialog.h file. Also, we use forward declaration to declare
+    QLineEdit and QPushButton since we will be using those widgets in our
+    dialog class.
+
+    As in our \c AddressBook class, the \c FindDialog class includes
+    the Q_OBJECT macro and its constructor is defined to accept a parent
+    QWidget, even though the dialog will be opened as a separate window.
+
+    \snippet tutorials/addressbook/part5/finddialog.h FindDialog header
+
+    We define a public function, \c getFindText() for use by classes that
+    instantiate \c FindDialog, which allows them to obtain the text
+    entered by the user. A public slot, \c findClicked(), is defined to
+    handle the search string when the user clicks the \gui Find button.
+
+    Lastly, we define the private variables, \c findButton, \c lineEdit
+    and \c findText, corresponding to the \gui Find button, the line edit
+    into which the user types the search string, and an internal string
+    used to store the search string for later use.
+
+    \section1 Implementing the FindDialog Class
+
+    Within the constructor of \c FindDialog, we set up the private variables,
+    \c lineEdit, \c findButton and \c findText. We use a QHBoxLayout to
+    position the widgets.
+
+    \snippet tutorials/addressbook/part5/finddialog.cpp constructor
+
+    We set the layout and window title, as well as connect the signals
+    to their respective slots. Notice that \c{findButton}'s
+    \l{QPushButton::clicked()}{clicked()} signal is connected to to
+    \c findClicked() and \l{QDialog::accept()}{accept()}. The
+    \l{QDialog::accept()}{accept()} slot provided by QDialog hides
+    the dialog and sets the result code to \l{QDialog::}{Accepted}.
+    We use this function to help \c{AddressBook}'s \c findContact() function
+    know when the \c FindDialog object has been closed. This will be
+    further explained when discussing the \c findContact() function.
+
+    \image addressbook-tutorial-part5-signals-and-slots.png
+
+    In \c findClicked(), we validate \c lineEdit to ensure that the user
+    did not click the \gui Find button without entering a contact's name. Then, we set
+    \c findText to the search string, extracted from \c lineEdit. After that,
+    we clear the contents of \c lineEdit and hide the dialog.
+
+    \snippet tutorials/addressbook/part5/finddialog.cpp findClicked() function
+
+    The \c findText variable has a public getter function, \c getFindText(),
+    associated with it. Since we only ever set \c findText directly in both the
+    constructor and in the \c findClicked() function, we do not create a
+    setter function to accompany \c getFindText().
+    Because \c getFindText() is public, classes instantiating and using
+    \c FindDialog can always access the search string that the user has
+    entered and accepted.
+
+    \snippet tutorials/addressbook/part5/finddialog.cpp getFindText() function
+
+    \section1 Defining the AddressBook Class
+
+    To ensure we can use \c FindDialog from within our \c AddressBook class, we
+    include \c finddialog.h in the \c addressbook.h file.
+
+    \snippet tutorials/addressbook/part5/addressbook.h include finddialog's header
+
+    So far, all our address book features have a QPushButton and a
+    corresponding slot. Similarly, for the \gui Find feature we have
+    \c findButton and \c findContact().
+
+    The \c findButton is declared as a private variable and the
+    \c findContact() function is declared as a public slot.
+
+    \snippet tutorials/addressbook/part5/addressbook.h findContact() declaration
+    \dots
+    \snippet tutorials/addressbook/part5/addressbook.h findButton declaration
+
+    Lastly, we declare the private variable, \c dialog, which we will use to
+    refer to an instance of \c FindDialog.
+
+    \snippet tutorials/addressbook/part5/addressbook.h FindDialog declaration
+
+    Once we have instantiated a dialog, we will want to use it more than once;
+    using a private variable allows us to refer to it from more than one place
+    in the class.
+
+    \section1 Implementing the AddressBook Class
+
+    Within the \c AddressBook class's constructor, we instantiate our private
+    objects, \c findButton and \c findDialog:
+
+    \snippet tutorials/addressbook/part5/addressbook.cpp instantiating findButton
+    \dots
+    \snippet tutorials/addressbook/part5/addressbook.cpp instantiating FindDialog
+
+    Next, we connect the \c{findButton}'s
+    \l{QPushButton::clicked()}{clicked()} signal to \c findContact().
+
+    \snippet tutorials/addressbook/part5/addressbook.cpp signals and slots for find
+
+    Now all that is left is the code for our \c findContact() function:
+
+    \snippet tutorials/addressbook/part5/addressbook.cpp findContact() function
+
+    We start out by displaying the \c FindDialog instance, \c dialog. This is
+    when the user enters a contact name to look up. Once the user clicks
+    the dialog's \c findButton, the dialog is hidden and the result code is
+    set to QDialog::Accepted. This ensures that
+    our \c if statement is always true.
+
+    We then proceed to extract the search string, which in this case is
+    \c contactName, using \c{FindDialog}'s \c getFindText() function. If the
+    contact exists in our address book, we display it immediately. Otherwise,
+    we display the QMessageBox shown below to indicate that their search
+    failed.
+
+    \image addressbook-tutorial-part5-notfound.png
+*/
+
+/*!
+    \page tutorials-addressbook-part6.html
+    \previouspage Address Book 5 - Adding a Find Function
+    \contentspage {Address Book Tutorial}{Contents}
+    \nextpage {tutorials/addressbook/part7}{Chapter 7}
+    \example tutorials/addressbook/part6
+    \title Address Book 6 - Loading and Saving
+
+    This chapter covers the file handling features of Qt that we use to write
+    loading and saving routines for the address book application.
+
+    \image addressbook-tutorial-part6-screenshot.png
+
+    Although browsing and searching for contacts are useful features, our address
+    book is not really fully ready for use until we can saving existing contacts
+    and load them again at a later time.
+    Qt provides a number of classes for \l{Input/Output and Networking}{input and output},
+    but we have chosen to use two which are simple to use in combination: QFile and
+    QDataStream.
+
+    A QFile object represents a file on disk that can be read from and written to.
+    QFile is a subclass of the more general QIODevice class which represents many
+    different kinds of devices.
+
+    A QDataStream object is used to serialize binary data so that it can be stored
+    in a QIODevice and retrieved again later. Reading from a QIODevice and writing
+    to it is as simple as opening the stream - with the respective device as a
+    parameter - and reading from or writing to it.
+
+    \section1 Defining the AddressBook Class
+
+    We declare two public slots, \c saveToFile() and \c loadFromFile(), as well
+    as two QPushButton objects, \c loadButton and \c saveButton.
+
+    \snippet tutorials/addressbook/part6/addressbook.h save and load functions declaration
+    \dots
+    \snippet tutorials/addressbook/part6/addressbook.h save and load buttons declaration
+
+    \section1 Implementing the AddressBook Class
+
+    In our constructor, we instantiate \c loadButton and \c saveButton.
+    Ideally, it would be more user-friendly to set the push buttons' labels
+    to "Load contacts from a file" and "Save contacts to a file". However, due
+    to the size of our other push buttons, we set the labels to \gui{Load...}
+    and \gui{Save...}. Fortunately, Qt provides a simple way to set tooltips with
+    \l{QWidget::setToolTip()}{setToolTip()} and we use it in the following way
+    for our push buttons:
+
+    \snippet tutorials/addressbook/part6/addressbook.cpp tooltip 1
+    \dots
+    \snippet tutorials/addressbook/part6/addressbook.cpp tooltip 2
+
+    Although it is not shown here, just like the other features we implemented,
+    we add the push buttons to the layout panel on the right, \c button1Layout,
+    and we connect the push buttons' \l{QPushButton::clicked()}{clicked()}
+    signals to their respective slots.
+
+    For the saving feature, we first obtain \c fileName using
+    QFileDialog::getSaveFileName(). This is a convenience function provided
+    by QFileDialog, which pops up a modal file dialog and allows the user to
+    enter a file name or select any existing \c{.abk} file. The \c{.abk} file
+    is our Address Book extension that we create when we save contacts.
+
+    \snippet tutorials/addressbook/part6/addressbook.cpp saveToFile() function part1
+
+    The file dialog that pops up is displayed in the screenshot below:
+
+    \image addressbook-tutorial-part6-save.png
+
+    If \c fileName is not empty, we create a QFile object, \c file with
+    \c fileName. QFile works with QDataStream as QFile is a QIODevice.
+
+    Next, we attempt to open the file in \l{QIODevice::}{WriteOnly} mode.
+    If this is unsuccessful, we display a QMessageBox to inform the user.
+
+    \snippet tutorials/addressbook/part6/addressbook.cpp saveToFile() function part2
+
+    Otherwise, we instantiate a QDataStream object, \c out, to write the open
+    file. QDataStream requires that the same version of the stream is used
+    for reading and writing. We ensure that this is the case by setting the
+    version used to the \l{QDataStream::Qt_4_5}{version introduced with Qt 4.5}
+    before serializing the data to \c file.
+
+    \snippet tutorials/addressbook/part6/addressbook.cpp saveToFile() function part3
+
+    For the loading feature, we also obtain \c fileName using
+    QFileDialog::getOpenFileName(). This function, the counterpart to
+    QFileDialog::getSaveFileName(), also pops up the modal file dialog and
+    allows the user to enter a file name or select any existing \c{.abk} file
+    to load it into the address book.
+
+    \snippet tutorials/addressbook/part6/addressbook.cpp loadFromFile() function part1
+
+    On Windows, for example, this function pops up a native file dialog, as
+    shown in the following screenshot.
+
+    \image addressbook-tutorial-part6-load.png
+
+    If \c fileName is not empty, again, we use a QFile object, \c file, and
+    attempt to open it in \l{QIODevice::}{ReadOnly} mode. In a similar way
+    to our implementation of \c saveToFile(), if this attempt is unsuccessful,
+    we display a QMessageBox to inform the user.
+
+    \snippet tutorials/addressbook/part6/addressbook.cpp loadFromFile() function part2
+
+    Otherwise, we instantiate a QDataStream object, \c in, set its version as
+    above and read the serialized data into the \c contacts data structure.
+    Note that we empty \c contacts before reading data into it to simplify the
+    file reading process. A more advanced method would be to read the contacts
+    into temporary QMap object, and copy only the contacts that do not already
+    exist in \c contacts.
+
+    \snippet tutorials/addressbook/part6/addressbook.cpp loadFromFile() function part3
+
+    To display the contacts that have been read from the file, we must first
+    validate the data obtained to ensure that the file we read from actually
+    contains address book contacts. If it does, we display the first contact;
+    otherwise, we display a QMessageBox to inform the user about the problem.
+    Lastly, we update the interface to enable and disable the push buttons
+    accordingly.
+*/
+
+/*!
+    \page tutorials-addressbook-part7.html
+    \previouspage Address Book 6 - Loading and Saving
+    \contentspage {Address Book Tutorial}{Contents}
+    \example tutorials/addressbook/part7
+    \title Address Book 7 - Additional Features
+
+    This chapter covers some additional features that make the address book
+    application more convenient for everyday use.
+
+    \image addressbook-tutorial-part7-screenshot.png
+
+    Although our address book application is useful in its own right, it would
+    be useful if we could exchange contact data with other applications.
+    The vCard format is a popular file format that can be used for this purpose.
+    In this chapter, we extend our address book client to allow contacts to
+    be exported to vCard \c{.vcf} files.
+
+    \section1 Defining the AddressBook Class
+
+    We add a QPushButton object, \c exportButton, and a corresponding public
+    slot, \c exportAsVCard() to our \c AddressBook class in the
+    \c addressbook.h file.
+
+    \snippet tutorials/addressbook/part7/addressbook.h exportAsVCard() declaration
+    \dots
+    \snippet tutorials/addressbook/part7/addressbook.h exportButton declaration
+
+    \section1 Implementing the AddressBook Class
+
+    Within the \c AddressBook constructor, we connect \c{exportButton}'s
+    \l{QPushButton::clicked()}{clicked()} signal to \c exportAsVCard().
+    We also add this button to our \c buttonLayout1, the layout responsible
+    for our panel of buttons on the right.
+
+    In our \c exportAsVCard() function, we start by extracting the contact's
+    name into \c name. We declare \c firstName, \c lastName and \c nameList.
+    Next, we look for the index of the first white space in \c name. If there
+    is a white space, we split the contact's name into \c firstName and
+    \c lastName. Then, we replace the space with an underscore ("_").
+    Alternately, if there is no white space, we assume that the contact only
+    has a first name.
+
+    \snippet tutorials/addressbook/part7/addressbook.cpp export function part1
+
+    As with the \c saveToFile() function, we open a file dialog to let the user
+    choose a location for the file. Using the file name chosen, we create an
+    instance of QFile to write to.
+
+    We attempt to open the file in \l{QIODevice::}{WriteOnly} mode. If this
+    process fails, we display a QMessageBox to inform the user about the
+    problem and return. Otherwise, we pass the file as a parameter to a
+    QTextStream object, \c out. Like QDataStream, the QTextStream class
+    provides functionality to read and write plain text to files. As a result,
+    the \c{.vcf} file generated can be opened for editing in a text editor.
+
+    \snippet tutorials/addressbook/part7/addressbook.cpp export function part2
+
+    We then write out a vCard file with the \c{BEGIN:VCARD} tag, followed by
+    the \c{VERSION:2.1} tag. The contact's name is written with the \c{N:}
+    tag. For the \c{FN:} tag, which fills in the "File as" property of a vCard,
+    we have to check whether the contact has a last name or not. If the contact
+    does, we use the details in \c nameList to fill it. Otherwise, we write
+    \c firstName only.
+
+    \snippet tutorials/addressbook/part7/addressbook.cpp export function part3
+
+    We proceed to write the contact's address. The semicolons in the address
+    are escaped with "\\", the newlines are replaced with semicolons, and the
+    commas are replaced with spaces. Lastly, we write the \c{ADR;HOME:;}
+    tag, followed by \c address and then the \c{END:VCARD} tag.
+
+    \snippet tutorials/addressbook/part7/addressbook.cpp export function part4
+
+    In the end, a QMessageBox is displayed to inform the user that the vCard
+    has been successfully exported.
+
+    \e{vCard is a trademark of the \l{http://www.imc.org}
+    {Internet Mail Consortium}}.
+*/
diff --git a/doc/src/tutorials/widgets-tutorial.qdoc b/doc/src/tutorials/widgets-tutorial.qdoc
new file mode 100644
index 0000000000..ce977f3f73
--- /dev/null
+++ b/doc/src/tutorials/widgets-tutorial.qdoc
@@ -0,0 +1,193 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page widgets-tutorial.html
+
+    \title Widgets Tutorial
+    \ingroup tutorials
+
+    \brief This tutorial covers basic usage of widgets and layouts, showing how they are used to build GUI applications.
+
+    \section1 Introduction
+
+    Widgets are the basic building blocks of graphical user interface (GUI)
+    applications made with Qt. Each GUI component, such as a button, label or
+    text editor, is a widget and can be placed within an existing user
+    interface or displayed as an independent window. Each type of component
+    is provided by a particular subclass of QWidget, which is itself a
+    subclass of QObject.
+
+    QWidget is not an abstract class; it can be used as a container for other
+    widgets, and can be subclassed with minimal effort to create custom
+    widgets. It is most often used to create windows in which other widgets
+    are placed.
+
+    As with \l{QObject}s, widgets can be created with parent objects to
+    indicate ownership, ensuring that objects are deleted when they are no
+    longer used. With widgets, these parent-child relationships have an
+    additional meaning: each child is displayed within the screen area
+    occupied by its parent. This means that, when a window is deleted, all
+    the widgets it contains are automatically deleted.
+
+    \section1 Creating a Window
+
+    If a widget is created without a parent, it is treated as a window, or
+    \e{top-level widget}, when it is shown. Since it has no parent object to
+    ensure that it is deleted when no longer needed, it is up to the
+    developer to keep track of the top-level widgets in an application.
+
+    In the following example, we use QWidget to create and show a window with
+    a default size:
+
+    \raw HTML
+    <table align="left" width="100%">
+    <tr><td>
+    \endraw
+    \snippet snippets/widgets-tutorial/toplevel/main.cpp create, resize and show
+    \raw HTML
+    </td><td align="right">
+    \endraw
+    \inlineimage widgets-tutorial-toplevel.png
+    \raw HTML
+    </td></tr>
+    </table>
+    \endraw
+
+    We can add a child widget to this window by passing \c window as the
+    parent to its constructor. In this case, we add a button to the window
+    and place it in a specific location:
+
+    \raw HTML
+    <table align="left" width="100%">
+    <tr><td>
+    \endraw
+    \snippet snippets/widgets-tutorial/childwidget/main.cpp create, position and show
+    \raw HTML
+    </td><td align="right">
+    \endraw
+    \inlineimage widgets-tutorial-childwidget.png
+    \raw HTML
+    </td></tr>
+    </table>
+    \endraw
+
+    The button is now a child of the window and will be deleted when the
+    window is destroyed. Note that hiding or closing the window does not
+    automatically destroy it.
+
+    \section1 Using Layouts
+
+    Usually, child widgets are arranged inside a window using layout objects
+    rather than by specifying positions and sizes explicitly. Here, we
+    construct a label and line edit widget that we would like to arrange
+    side-by-side.
+
+    \raw HTML
+    <table align="left" width="100%">
+    <tr><td>
+    \endraw
+    \snippet snippets/widgets-tutorial/windowlayout/main.cpp create, lay out widgets and show
+    \raw HTML
+    </td><td align="right">
+    \endraw
+    \inlineimage widgets-tutorial-windowlayout.png
+    \raw HTML
+    </td></tr>
+    </table>
+    \endraw
+
+    The \c layout object we construct manages the positions and sizes of
+    widgets supplied to it with the \l{QHBoxLayout::}{addWidget()} function.
+    The layout itself is supplied to the window itself in the call to
+    \l{QWidget::}{setLayout()}. Layouts are only visible through the effects
+    they have on the widgets (and other layouts) they are responsible for
+    managing.
+
+    In the example above, the ownership of each widget is not immediately
+    clear. Since we construct the widgets and the layout without parent
+    objects, we would expect to see an empty window and two separate windows
+    containing a label and a line edit. However, when we tell the layout to
+    manage the label and line edit and set the layout on the window, both the
+    widgets and the layout itself are ''reparented'' to become children of
+    the window.
+
+    Just as widgets can contain other widgets, layouts can be used to provide
+    different levels of grouping for widgets. Here, we want to display a
+    label alongside a line edit at the top of a window, above a table view
+    showing the results of a query.
+
+    \raw HTML
+    <table align="left" width="100%">
+    <tr><td>
+    \endraw
+    \snippet snippets/widgets-tutorial/nestedlayouts/main.cpp create, lay out widgets and show
+    \raw HTML
+    </td><td align="right">
+    \endraw
+    \inlineimage widgets-tutorial-nestedlayouts.png
+    \raw HTML
+    </td></tr>
+    </table>
+    \endraw
+
+    As well as QHBoxLayout and QVBoxLayout, Qt also provides QGridLayout
+    and QFormLayout classes to help with more complex user interfaces.
+
+    
+
+    \omit
+    In the simple example below, the widget is created on the stack and will
+    automatically be deleted when the \c{main()} function exits.
+
+    {{{#include <QtGui>
+
+    int main(int argc, char *argv[])
+    {
+        QApplication app(argc, argv);
+        QWidget window;
+        window.resize(480, 360);
+        window.show();
+        return app.exec();
+    }
+    }}}
+    \endomit
+*/
diff --git a/doc/src/uic.qdoc b/doc/src/uic.qdoc
new file mode 100644
index 0000000000..b0a4630b2b
--- /dev/null
+++ b/doc/src/uic.qdoc
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page uic.html
+    \title User Interface Compiler (uic)
+    \ingroup buildsystem
+    \ingroup qttools
+    \keyword uic
+
+    \omit KEEP THIS FILE SYNCHRONIZED WITH uic.1 \endomit
+
+    This page documents the \e{User Interface Compiler} for the Qt GUI
+    toolkit. The \c uic reads an XML format user interface definition
+    (\c .ui) file as generated by \l{designer-manual.html}{Qt
+    Designer} and creates a corresponding C++ header file.
+
+    Usage:
+    \snippet doc/src/snippets/code/doc_src_uic.qdoc 0
+
+    \section1 Options
+
+    The following table lists the command-line options recognized by
+    \c uic.
+
+    \table
+    \header \o Option \o Description
+    \row \o \c{-o <file>} \o Write output to \c <file> instead of to standard output.
+    \row \o \c{-tr <func>} \o Use \c <func> for translating strings instead of \c tr().
+    \row \o \c{-p} \o Don't generate guards against multiple inclusion (\c #ifndef FOO_H ...).
+    \row \o \c{-h} \o Display the usage and the list of options.
+    \row \o \c{-v} \o Display \c{uic}'s version number.
+    \endtable
+
+    \section1 Examples
+
+    If you use \c qmake, \c uic will be invoked automatically for
+    header files.
+
+    Here are useful makefile rules if you only use GNU make:
+
+    \snippet doc/src/snippets/code/doc_src_uic.qdoc 1
+
+    If you want to write portably, you can use individual rules of the
+    following form:
+
+    \snippet doc/src/snippets/code/doc_src_uic.qdoc 2
+
+    You must also remember to add \c{ui_foo.h} to your \c HEADERS
+    (substitute your favorite name).
+*/
diff --git a/doc/src/unicode.qdoc b/doc/src/unicode.qdoc
new file mode 100644
index 0000000000..42ac5a4454
--- /dev/null
+++ b/doc/src/unicode.qdoc
@@ -0,0 +1,165 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! 
+    \page unicode.html
+    \title Unicode
+    \ingroup architecture
+    \ingroup text-processing
+    \brief Information about support for Unicode in Qt.
+
+    Unicode is a multi-byte character set, portable across all major
+    computing platforms and with decent coverage over most of the world.
+    It is also single-locale; it includes no code pages or other
+    complexities that make software harder to write and test. There is no
+    competing character set that's reasonably cross-platform. For these
+    reasons, Unicode 4.0 is used as the native character set for Qt.
+
+
+    \section1 Information about Unicode on the Web
+
+    The \l{http://www.unicode.org/}{Unicode Consortium} has a number
+    of documents available, including
+
+    \list
+
+    \i \l{http://www.unicode.org/unicode/standard/principles.html}{A
+    technical introduction to Unicode}
+    \i \l{http://www.unicode.org/unicode/standard/standard.html}{The
+    home page for the standard}
+
+    \endlist
+
+
+    \section1 The Standard
+
+    The current version of the standard is 4.0.0.
+
+    \list
+
+    \i \link http://www.amazon.com/exec/obidos/ASIN/0321185781/trolltech/t
+    The Unicode Standard, version 4.0.\endlink  See also
+    \link http://www.unicode.org/unicode/standard/versions/
+    its home page.\endlink
+    \i \link http://www.amazon.com/exec/obidos/ASIN/0201616335/trolltech/t
+    The Unicode Standard, version 3.2.\endlink 
+    \i \link http://www.amazon.com/exec/obidos/ASIN/0201473459/trolltech/t
+    The Unicode Standard, version 2.0.\endlink  See also the
+    \link http://www.unicode.org/unicode/reports/tr8.html 2.1
+    update\endlink and
+    \link http://www.unicode.org/unicode/standard/versions/enumeratedversions.html#Unicode 2.1.9 the 2.1.9 data files\endlink at www.unicode.org.
+
+    \endlist
+
+    \section1 Unicode in Qt
+
+    In Qt, and in most applications that use Qt, most or all user-visible
+    strings are stored using Unicode. Qt provides:
+
+    \list
+
+    \i Translation to/from legacy encodings for file I/O: see
+    QTextCodec and QTextStream.
+    \i Translation from Input Methods and 8-bit keyboard input.
+    \i Translation to legacy character sets for on-screen display.
+    \i A string class, QString, that stores Unicode characters, with
+    support for migrating from C strings including fast (cached)
+    translation to and from US-ASCII, and all the usual string
+    operations.
+    \i Unicode-aware widgets where appropriate.
+    \i Unicode support detection on Windows, so that Qt provides Unicode
+    even on Windows platforms that do not support it natively.
+
+    \endlist
+
+    To fully benefit from Unicode, we recommend using QString for storing
+    all user-visible strings, and performing all text file I/O using
+    QTextStream. Use QKeyEvent::text() for keyboard input in any custom
+    widgets you write; it does not make much difference for slow typists
+    in Western Europe or North America, but for fast typists or people
+    using special input methods using text() is beneficial.
+
+    All the function arguments in Qt that may be user-visible strings,
+    QLabel::setText() and a many others, take \c{const QString &}s.
+    QString provides implicit casting from \c{const char *}
+    so that things like
+
+    \snippet doc/src/snippets/code/doc_src_unicode.qdoc 0
+
+    will work. There is also a function, QObject::tr(), that provides
+    translation support, like this:
+
+    \snippet doc/src/snippets/code/doc_src_unicode.qdoc 1
+
+    QObject::tr() maps from \c{const char *} to a Unicode string, and
+    uses installable QTranslator objects to do the mapping.
+
+    Qt provides a number of built-in QTextCodec classes, that is,
+    classes that know how to translate between Unicode and legacy
+    encodings to support programs that must talk to other programs or
+    read/write files in legacy file formats.
+
+    By default, conversion to/from \c{const char *} uses a
+    locale-dependent codec. However, applications can easily find codecs
+    for other locales, and set any open file or network connection to use
+    a special codec. It is also possible to install new codecs, for
+    encodings that the built-in ones do not support. (At the time of
+    writing, Vietnamese/VISCII is one such example.)
+
+    Since US-ASCII and ISO-8859-1 are so common, there are also especially
+    fast functions for mapping to and from them. For example, to open an
+    application's icon one might do this:
+
+    \snippet doc/src/snippets/code/doc_src_unicode.qdoc 2
+
+    or
+
+    \snippet doc/src/snippets/code/doc_src_unicode.qdoc 3
+
+    Regarding output, Qt will do a best-effort conversion from
+    Unicode to whatever encoding the system and fonts provide.
+    Depending on operating system, locale, font availability, and Qt's
+    support for the characters used, this conversion may be good or bad.
+    We will extend this in upcoming versions, with emphasis on the most
+    common locales first.
+
+    \sa {Internationalization with Qt}
+*/
diff --git a/doc/src/unix-signal-handlers.qdoc b/doc/src/unix-signal-handlers.qdoc
new file mode 100644
index 0000000000..6efaa6f163
--- /dev/null
+++ b/doc/src/unix-signal-handlers.qdoc
@@ -0,0 +1,103 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page unix-signals.html
+    \title Calling Qt Functions From Unix Signal Handlers
+    \ingroup platform-notes
+    \brief You can't. But don't despair, there is a way...
+
+    You \e can't call Qt functions from Unix signal handlers. The
+    standard POSIX rule applies: You can only call async-signal-safe
+    functions from signal handlers. See \l
+    {http://www.opengroup.org/onlinepubs/000095399/functions/xsh_chap02_04.html#tag_02_04_01}
+    {Signal Actions} for the complete list of functions you can call
+    from Unix signal handlers.
+
+    But don't despair, there is a way to use Unix signal handlers with
+    Qt. The strategy is to have your Unix signal handler do something
+    that will eventually cause a Qt signal to be emitted, and then you
+    simply return from your Unix signal handler. Back in your Qt
+    program, that Qt signal gets emitted and then received by your Qt
+    slot function, where you can safely do whatever Qt stuff you
+    weren't allowed to do in the Unix signal handler.
+
+    One simple way to make this happen is to declare a socket pair in
+    your class for each Unix signal you want to handle. The socket
+    pairs are declared as static data members. You also create a
+    QSocketNotifier to monitor the \e read end of each socket pair,
+    declare your Unix signal handlers to be static class methods, and
+    declare a slot function corresponding to each of your Unix signal
+    handlers. In this example, we intend to handle both the SIGHUP and
+    SIGTERM signals. Note: You should read the socketpair(2) and the
+    sigaction(2) man pages before plowing through the following code
+    snippets.
+    
+    \snippet doc/src/snippets/code/doc_src_unix-signal-handlers.qdoc 0
+
+    In the MyDaemon constructor, use the socketpair(2) function to
+    initialize each file descriptor pair, and then create the
+    QSocketNotifier to monitor the \e read end of each pair. The
+    activated() signal of each QSocketNotifier is connected to the
+    appropriate slot function, which effectively converts the Unix
+    signal to the QSocketNotifier::activated() signal.
+
+    \snippet doc/src/snippets/code/doc_src_unix-signal-handlers.qdoc 1
+
+    Somewhere else in your startup code, you install your Unix signal
+    handlers with sigaction(2).
+
+    \snippet doc/src/snippets/code/doc_src_unix-signal-handlers.qdoc 2
+
+    In your Unix signal handlers, you write a byte to the \e write end
+    of a socket pair and return. This will cause the corresponding
+    QSocketNotifier to emit its activated() signal, which will in turn
+    cause the appropriate Qt slott function to run.
+
+    \snippet doc/src/snippets/code/doc_src_unix-signal-handlers.qdoc 3
+
+    In the slot functions connected to the
+    QSocketNotifier::activated() signals, you \e read the byte. Now
+    you are safely back in Qt with your signal, and you can do all the
+    Qt stuff you weren'tr allowed to do in the Unix signal handler.
+
+    \snippet doc/src/snippets/code/doc_src_unix-signal-handlers.qdoc 4
+*/
diff --git a/doc/src/wince-customization.qdoc b/doc/src/wince-customization.qdoc
new file mode 100644
index 0000000000..b61c48da46
--- /dev/null
+++ b/doc/src/wince-customization.qdoc
@@ -0,0 +1,264 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page windowsce-customization.html
+    \ingroup qtce
+    \title Windows CE - Working with Custom SDKs
+    \brief How to set up Qt for use with custom Windows CE SDKs.
+
+    When working with a custom SDK for Windows CE, Qt provides an easy way
+    to add support for it to your development environment. The following is
+    a tutorial that covers how to create a specification for Qt on Windows
+    CE platforms.
+
+    \tableofcontents
+
+    \section1 Creating a Custom Build Specification
+
+    Create a subdirectory in the \c mkspecs folder of the Qt directory.
+    New specifications for Qt for Windows CE following this naming convention:
+
+    \snippet doc/src/snippets/code/doc_src_wince-customization.qdoc 0
+
+    Using this convention makes it possible for \l{qmake} to identify that
+    you are building Qt for Windows CE, and will customize the compilation
+    process accordingly.
+
+    Create the files \c qmake.conf and \c qplatformdefs.h inside the new
+    specification directory. Take a look at the implementation of the other
+    Windows CE specifications included in the \c mkspecs directory to see
+    what is required to build Qt for Windows CE successfully.
+
+
+    \section1 Fine-Tuning Options
+
+    Compared to the desktop versions, Qt for Windows CE needs two additional
+    options:
+
+    \list
+    \o \bold{CE_SDK} specifies the name of the SDK.
+    \o \bold{CE_ARCH} specifies information about the target architecture.
+    \endlist
+
+    Following is an example configuration for the Windows Mobile 5 for 
+    Pocket PC SDK:
+
+    \snippet doc/src/snippets/code/doc_src_wince-customization.qdoc 1
+
+    \note \l{qmake} uses this information to build a valid Visual Studio
+    project file. You need to ensure that they are identical to the
+    configuration of the custom SDK, otherwise you might not be able to compile
+    or debug your project with Visual Studio.
+
+    Additionally, most Windows CE SDKs use extra compiler options. These
+    can be specified by expanding the \c DEFINES value.
+
+    For example, with Windows Mobile 5 for Pocket PC, the \c DEFINES variable
+    is expanded in the following way:
+
+    \snippet doc/src/snippets/code/doc_src_wince-customization.qdoc 2
+
+    The mkspec may require additional configuration to be used inside of Visual
+    Studio, depending on the Windows CE SDK. The above example defines
+    \c _M_ARM. This definition is available internally in Visual Studio. Hence,
+    the compiler will warn you about redefinition during the build step. These
+    warnings can be disabled by adding a \c default_post.prf file containing
+    the following lines, within the subdirectory.
+
+    \snippet doc/src/snippets/code/doc_src_wince-customization.qdoc 8
+
+
+    \section1 Cross-compilation Environment for a Custom SDK
+
+    Qt for Windows CE supports a convenience script, \c{setcepaths.bat}, that
+    prepares the environment in a command prompt for cross-compilation.
+    However, on custom SDKs, the \c checksdk tool is provided to identify the
+    environment, so Qt compiles successfully.
+
+    \c checksdk is generated during the \c configure step and allows for the
+    following options:
+
+    \list
+        \o  \c list: Returns a list of available Windows CE SDKs. (This list
+            may contain one or more SDKs not supported on Qt for Windows CE,
+            e.g., Pocket PC 2003.)
+        \o  \c sdk: The parameter to specify an SDK. Returns a setup of
+            environment variables that must be set to cross-compile Qt.
+        \o  \c script: Stores your setup in a \c{.bat} file. This simplifies
+            the process of switching environments when you load a command
+            prompt in future.
+    \endlist
+
+
+    \section1 Compiling Qt for a Custom SDK
+
+    Windows CE is highly customizable, hence it is possible that some SDKs have
+    feature-stripped setups. Depending on the SDK's configuration, Qt may not
+    compile in its standard configuration, as Qt for Windows CE is designed to
+    be compatible with the Standard SDK setup.
+
+    However, it is possible to exclude features of Qt and create a version that
+    compiles for the desired SDK.
+
+    Further information on stripping features can be found in the
+    \l{Fine-Tuning Features in Qt}{QFeatures} documentation.
+
+
+    \section1 Making Qt Applications Start on a Custom Device
+
+    Sometimes, a Windows CE device has been created with a configuration
+    different from the corresponding SDK's configuration. In this case, symbols
+    that were available at linking stage will be missing from the run-time
+    libraries.
+    
+    Unfortunately, the operating system will not provide an error message that
+    mentions which symbols are absent. Instead, a message box with the following
+    message will appear:
+
+    \c{app.exe is not a valid CE application!}
+
+    To identify the missing symbols, you need to create a temporary
+    application that attempts to dynamically load the Qt for Windows CE
+    libraries using \c LoadLibrary. The following code can be used for this:
+    
+    \snippet doc/src/snippets/code/doc_src_wince-customization.qdoc 9
+
+    Once you have compiled and deployed the application as well as the Qt
+    libraries, start a remote debugger. The debugger will then print the
+    ordinal number of the unresolved symbol.
+
+    Search for parts of Qt that rely on these functions and disable them using
+    the \l{Fine-Tuning Features in Qt}{QFeatures} functionality.
+
+    In our experience, when Qt applications do not start on Windows CE, it is
+    usually the result of missing symbols for the following classes or
+    features:
+    \list
+    \o \l{Drag and Drop}
+    \o \l{QClipboard}
+    \o \l{QCursor}
+    \endlist
+
+    Please refer to the Microsoft documentation
+    \l{http://msdn.microsoft.com/en-us/library/e7tsx612.aspx}{here} for
+    information on what ordinals are and how you can create them. Information
+    on accessing the corresponding symbol name to a given ordinal value can
+    also be found in the Microsoft documentation.
+
+*/
+
+/*! 
+    \page shadow builds-wince.html
+    \ingroup qtce
+    \title Windows CE - Using shadow builds
+    \brief How to create a shadow build for Qt for Windows CE.
+
+    \tableofcontents
+
+    While developing for Windows CE you might want to compile a
+    version of Qt for several different platforms and SDKs. In order
+    to create those different builds of Qt you do not have to copy the
+    whole Qt package or the Qt source. You are able to create multiple
+    Qt builds from a single source tree. Such builds are called shadow
+    builds.
+
+    Basically a shadow build is created by calling configure.exe from a
+    different directory.
+
+    To make sure that the shadow build compiles correctly it is important
+    that you following these guidelines:
+
+    \list
+    \o The original Qt source package must be left untouched - configure must
+    never have been run in the source tree directory.
+
+    \o The shadow build directory must be on the same level as the Qt source
+        package.\br
+    If the Qt package is in \c{C:\Qt\%VERSION%} the shadow build directory
+    could be \c{C:\Qt\shadowbuild}. A shadow build from a directory like
+    \c{C:\shadowbuild} will not compile.
+    \o Avoid using "release" and "debug" in the path to the shadow build
+    directory. (This is an internal limitation of the build system.)
+    \o The \c{\bin} directory of the shadow build directory must be added to the
+    \c PATH environment variable.
+    \o Perl has been installed on your system. (\l{ActivePerl} is a popular
+    distribution of Perl on Windows.)
+    \endlist
+
+    So lets assume you have installed Qt in \c{C:\Qt\%VERSION%} and you want
+    to create a shadow build in \c{C:\Qt\mobile5-shadow}:
+
+    \list
+    \o First add \c{C:\Qt\mobile5-shadow\bin} to the \c PATH variable.
+
+    \snippet doc/src/snippets/code/doc_src_wince-customization.qdoc 3
+
+    \o Make sure the enviroment variables for your compiler are set.
+
+    Visual Studio includes \c{vcvars32.bat} for that purpose - or simply use
+    the "Visual Studio Command Prompt" from the Start menu.
+
+    \o Now navigate to your shadow build directory and run configure:
+
+    \snippet doc/src/snippets/code/doc_src_wince-customization.qdoc 4
+
+    \o To build Qt, you have to update your \c{PATH, INCLUDE} and \c LIB paths
+    to point to your target platforms.
+
+    For a default installation of the Windows Mobile 5.0 Pocket PC SDK, you
+    can do the following:
+
+    \snippet doc/src/snippets/code/doc_src_wince-customization.qdoc 5
+
+    We have provided a convenience script for this called \c{setcepaths}. Simply
+    type:
+
+    \snippet doc/src/snippets/code/doc_src_wince-customization.qdoc 6
+
+    \o Finally, to build the shadow build type:
+
+    \snippet doc/src/snippets/code/doc_src_wince-customization.qdoc 7
+
+    \o That's all. You have successfully created a shadow build of Qt in
+    \c{C:\Qt\mobile5-shadow}.
+    \endlist
+*/
diff --git a/doc/src/wince-introduction.qdoc b/doc/src/wince-introduction.qdoc
new file mode 100644
index 0000000000..d94116bd2b
--- /dev/null
+++ b/doc/src/wince-introduction.qdoc
@@ -0,0 +1,110 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page wince-with-qt-introduction.html
+
+    \title Windows CE - Introduction to using Qt
+    \brief An introduction to Qt for Windows CE developers.
+    \ingroup howto
+    \ingroup qtce
+
+    \tableofcontents
+
+    \section1 Required tools
+
+    In order to use Qt for Windows CE you need to have Visual Studio
+    2005 and at least one of the supported Windows CE/Mobile SDKs
+    installed.
+
+    We recommend the \e{Windows Mobile 5.0 SDK for Pocket PC} SDK available
+    \l{http://www.microsoft.com/downloads/details.aspx?FamilyID=83a52af2-f524-4ec5-9155-717cbe5d25ed&amp;DisplayLang=en}{here}.
+
+    \section1 Installing Qt
+
+    Follow the instructions found in \l{Installing Qt on Windows CE}.
+
+    \section1 Building your own applications
+
+    If you are new to Qt development, have a look at \l{How to Learn Qt}
+    and \l{Tutorials}. In general there is little or no difference in
+    developing Qt applications for Windows CE compared to any of the
+    other platforms supported by Qt.
+
+    Once you have a \c .pro file, there are two ways of building your
+    application. You can either do it on the command line or inside of
+    VS2005. To do it on the command line, simply write:
+
+    \snippet doc/src/snippets/code/doc_src_wince-introduction.qdoc 0
+
+    To build the project inside of VS2005, on the command line write:
+
+    \snippet doc/src/snippets/code/doc_src_wince-introduction.qdoc 1
+
+    then start VS2005 with the generated \c .vcproj or \c .sln file and
+    select \e{Build project}.
+
+    For more information on how to use qmake have a look at the \l
+    {qmake Tutorial}.
+
+    \section1 Running the application
+
+    In order to run the application, it needs to be deployed on the
+    Windows CE/Mobile device you want to test it for. This can either
+    be done manually or automated using VS2005.
+
+    To do it manually, simply copy the executable, the Qt \c{.dll}
+    files needed for the application to run, and the C-runtime library
+    into a folder on the device, and then click on the executable to
+    start the program. You can either use the \e Explorer found in
+    ActiveSync or the \e{Remote File Viewer} found in VS2005 to do
+    this.
+
+    VS2005 can do this step automatically for you as well. If you have
+    built the project inside VS2005, simply select \e Deploy and then
+    \e Debug to deploy and then run the application. You can change the
+    device type by changing the \e{Target Device} specified in the
+    VS2005 toolbar.
+
+    Further information on deploying Qt applications for Windows can
+    be found in the \l{Deploying an Application on Windows}
+    {deployment document}.
+*/
diff --git a/doc/src/wince-opengl.qdoc b/doc/src/wince-opengl.qdoc
new file mode 100644
index 0000000000..b151aa9880
--- /dev/null
+++ b/doc/src/wince-opengl.qdoc
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page windowsce-opengl.html
+    \title Windows CE OpenGL ES
+    \ingroup qtce
+    \brief Information about support for OpenGL ES with Qt for Windows CE.
+
+    \section1 Introduction
+
+    \l {http://www.opengl.org}{OpenGL} is an industry standard API for 2D/3D
+    graphics. It provides a powerful, low-level interface between software
+    and acceleration hardware, and it is operating system and window system
+    independent.
+
+    \l {http://www.khronos.org/opengles}{OpenGL ES} is a subset of the
+    \l {http://www.opengl.org}{OpenGL} standard. It is meant for use in
+    embedded systems. Hence, it has a smaller, more constrained API.
+
+    Qt for Windows CE uses EGL 1.1 to embed OpenGL ES windows within the
+    Windows CE window manager.
+
+    To use OpenGL ES enabled widgets in a Qt for Windows CE application, you
+    only need to subclass QGLWidget and draw on instances of the subclass with
+    OpenGL ES functions.
+
+    OpenGL ES includes profiles for floating-point and fixed-point arithmetic.
+    The floating point profile is called OpenGL ES CM (Common) and the
+    fixed-point profile is called OpenGL ES CL (Common Lite).
+
+    You can run \c{configure} with the \c{-opengl-es-cm} option for the Common
+    profile or \c{-opengl-es-cl} for the Common Lite profile. In both cases,
+    ensure that the \c{lib} and \c{includes} paths include the OpenGL ES
+    headers and libararies from your SDK. The OpenGL ES lib should be called
+    either \c{libGLES_CM.lib} for the Common profile or \c{libGLES_CL.lib}
+    for the Common Lite profile.
+
+    To configure Qt for Windows Mobile 5.0 and OpenGL ES Common Lite support
+    you can run \c{configure} like this:
+
+    \snippet doc/src/snippets/code/doc_src_wince-opengl.qdoc 0
+
+    The distinction between the Common and Common Lite profiles is important,
+    because the Common Lite profile has less functionality and only supports a
+    fixed-point vertex format.
+
+    To start programming with Qt and OpenGL ES on Windows CE, you can start
+    with the \l{Hello GL ES Example}. This example shows how to use QGLWidget
+    and QGLPainter with OpenGL ES. It also provides some hints on how to port
+    OpenGL code to OpenGL ES.
+
+    \section2 Using OpenGL to Accelerate Normal 2D Painting
+
+    Qt provides QOpenGLPaintEngine, a subclass of QPaintEngine that translates
+    QPainter operations into OpenGL calls. This is especially convenient for
+    drawing text or QImage objects in an OpenGL ES context. For further
+    details, refer to the \l{Hello GL ES Example}.
+
+*/
diff --git a/doc/src/winsystem.qdoc b/doc/src/winsystem.qdoc
new file mode 100644
index 0000000000..5d5f3a7032
--- /dev/null
+++ b/doc/src/winsystem.qdoc
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page winsystem.html
+    \title Window System Specific Notes
+    \ingroup buildsystem
+    \ingroup deployment
+
+    Qt is a cross-platform GUI toolkit, so almost the entire API is the
+    same on all platforms and window systems. If you wish to use
+    platform-specific features, and still maintain a platform-independent
+    source tree, you should protect the platform-specific code using the
+    appropriate \c{#ifdef} directives (see below).
+
+    Qt provides a few low-level global functions for fine-tuning
+    applications on specific platforms. See \l{Special-Purpose Global
+    Functions Exported by Qt} for details.
+
+    \tableofcontents
+
+    For information about which platforms are supported by Qt, see the
+    \l{Platform Notes}. For information on distributing Qt applications, see
+    \l{Deploying Qt Applications}.
+
+    \target x11
+    \section1 Qt for X11
+
+    When compiling for this platform, the macro \c{Q_WS_X11} is defined.
+
+    \e{Not documented here. Please contact Qt's technical support team
+    if you have queries.}
+
+    See the \l{Qt for X11 Requirements} page for more information about the
+    libraries required to build Qt with as many features as possible.
+
+    \target win
+    \section1 Qt for Windows
+
+    When compiling for this platform, the macro \c{Q_WS_WIN} is defined.
+
+    \e{Not documented here. Please contact Qt's technical support team
+    if you have queries.}
+
+    \target macosx
+    \section1 Qt for Mac OS X
+
+    When compiling for this platform, the macro \c{Q_WS_MAC} is defined.
+
+    \list
+    \i \l{Qt for Mac OS X - Specific Issues}
+    \i \l{Qt is Mac OS X Native}
+    \endlist
+
+    \target qws
+    \section1 Qt for Embedded Linux
+
+    When compiling for this platform, the macro \c{Q_WS_QWS} is
+    defined (the window system is literally the Qt Window System). See
+    the \l{Qt for Embedded Linux} documentation for more information.
+*/
diff --git a/doc/src/xquery-introduction.qdoc b/doc/src/xquery-introduction.qdoc
new file mode 100644
index 0000000000..37a45ac6a9
--- /dev/null
+++ b/doc/src/xquery-introduction.qdoc
@@ -0,0 +1,1024 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page xquery-introduction.html
+    \title A Short Path to XQuery
+    \ingroup scripting
+
+    \startpage index.html QtReference Documentation
+    \target XQuery-introduction
+
+XQuery is a language for querying XML data or non-XML data that can be
+modeled as XML. XQuery is specified by the \l{http://www.w3.org}{W3C}.
+
+\tableofcontents
+
+\section1 Introduction
+
+Where Java and C++ are \e{statement-based} languages, the XQuery
+language is \e{expression-based}. The simplest XQuery expression is an
+XML element constructor:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 20
+
+This \c{<recipe/>} element is an XQuery expression that forms a
+complete XQuery. In fact, this XQuery doesn't actually query
+anything. It just creates an empty \c{<recipe/>} element in the
+output. But \l{Constructing Elements} {constructing new elements in an
+XQuery} is often necessary.
+
+An XQuery expression can also be enclosed in curly braces and embedded
+in another XQuery expression. This XQuery has a document expression
+embedded in a node expression:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 21
+
+It creates a new \c{<html>} element in the output and sets its \c{id}
+attribute to be the \c{id} attribute from an \c{<html>} element in the
+\c{other.html} file.
+
+\section1 Using Path Expressions To Match & Select Items
+
+In C++ and Java, we write nested \c{for} loops and recursive functions
+to traverse XML trees in search of elements of interest. In XQuery, we
+write these iterative and recursive algorithms with \e{path
+expressions}.
+
+A path expression looks somewhat like a typical \e{file pathname} for
+locating a file in a hierarchical file system. It is a sequence of one
+or more \e{steps} separated by slash '/' or double slash '//'.
+Although path expressions are used for traversing XML trees, not file
+systems, in QtXmlPatterms we can model a file system to look like an
+XML tree, so in QtXmlPatterns we can use XQuery to traverse a file
+system. See the \l {File System Example} {file system example}.
+
+Think of a path expression as an algorithm for traversing an XML tree
+to find and collect items of interest. This algorithm is evaluated by
+evaluating each step moving from left to right through the sequence. A
+step is evaluated with a set of input items (nodes and atomic values),
+sometimes called the \e focus.  The step is evaluated for each item in
+the focus. These evaluations produce a new set of items, called the \e
+result, which then becomes the focus that is passed to the next step.
+Evaluation of the final step produces the final result, which is the
+result of the XQuery.  The items in the result set are presented in
+\l{http://www.w3.org/TR/xquery/#id-document-order} {document order}
+and without duplicates.
+
+With QtXmlPatterns, a standard way to present the initial focus to a
+query is to call QXmlQuery::setFocus(). Another common way is to let
+the XQuery itself create the initial focus by using the first step of
+the path expression to call the XQuery \c{doc()} function. The
+\c{doc()} function loads an XML document and returns the \e {document
+node}. Note that the document node is \e{not} the same as the
+\e{document element}. The \e{document node} is a node constructed in
+memory, when the document is loaded. It represents the entire XML
+document, not the document element. The \e{document element} is the
+single, top-level XML element in the file. The \c{doc()} function
+returns the document node, which becomes the singleton node in the
+initial focus set. The document node will have one child node, and
+that child node will represent the document element.  Consider the
+following XQuery:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 18
+
+The \c{doc()} function loads the file \l{cookbook.xml} and returns the
+document node. The document node then becomes the focus for the next
+step \c{//recipe}. Here the double slash means select all \c{<recipe>}
+elements found below the document node, regardless of where they
+appear in the document tree.  The query selects all \c{<recipe>}
+elements in the cookbook. See \l{Running The Cookbook Examples} for
+instructions on how to run this query (and most of the ones that
+follow) from the command line.
+
+Conceptually, evaluation of the steps of a path expression is similar
+to iterating through the same number of nested \e{for} loops. Consider
+the following XQuery, which builds on the previous one:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 19
+
+This XQuery is a single path expression composed of three steps. The
+first step creates the initial focus by calling the \c{doc()}
+function. We can paraphrase what the query engine does at each step:
+
+\list 1
+    \o for each node in the initial focus (the document node)...
+    \o for each descendant node that is a \c{<recipe>} element...
+    \o collect the child nodes that are \c{<title>} elements.
+\endlist
+
+Again the double slash means select all the \c{<recipe>} elements in the
+document. The single slash before the \c{<title>} element means select
+only those \c{<title>} elements that are \e{child} elements of a
+\c{<recipe>} element (i.e. not grandchildren, etc). The XQuery evaluates
+to a final result set containing the \c{<title>} element of each
+\c{<recipe>} element in the cookbook.
+
+\section2 Axis Steps
+
+The most common kind of path step is called an \e{axis step}, which
+tells the query engine which way to navigate from the context node,
+and which test to perform when it encounters nodes along the way. An
+axis step has two parts, an \e{axis specifier}, and a \e{node test}.
+Conceptually, evaluation of an axis step proceeds as follows: For each
+node in the focus set, the query engine navigates out from the node
+along the specified axis and applies the node test to each node it
+encounters. The nodes selected by the node test are collected in the
+result set, which becomes the focus set for the next step.
+
+In the example XQuery above, the second and third steps are both axis
+steps. Both apply the \c{element(name)} node test to nodes encountered
+while traversing along some axis. But in this example, the two axis
+steps are written in a \l{Shorthand Form} {shorthand form}, where the
+axis specifier and the node test are not written explicitly but are
+implied. XQueries are normally written in this shorthand form, but
+they can also be written in the longhand form. If we rewrite the
+XQuery in the longhand form, it looks like this:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 22
+
+The two axis steps have been expanded. The first step (\c{//recipe})
+has been rewritten as \c{/descendant-or-self::element(recipe)}, where
+\c{descendant-or-self::} is the axis specifier and \c{element(recipe)}
+is the node test. The second step (\c{title}) has been rewritten as
+\c{/child::element(title)}, where \c{child::} is the axis specifier
+and \c{element(title)} is the node test. The output of the expanded
+XQuery will be exactly the same as the output of the shorthand form.
+
+To create an axis step, concatenate an axis specifier and a node
+test. The following sections list the axis specifiers and node tests
+that are available.
+
+\section2 Axis Specifiers
+
+An axis specifier defines the direction you want the query engine to
+take, when it navigates away from the context node. QtXmlPatterns
+supports the following axes.
+
+\table
+\header
+  \o Axis Specifier
+  \o refers to the axis containing...
+  \row
+    \o \c{self::}
+    \o the context node itself
+  \row
+    \o \c{attribute::}
+    \o all attribute nodes of the context node
+  \row
+    \o \c{child::}
+    \o all child nodes of the context node (not attributes)
+  \row
+    \o \c{descendant::}
+    \o all descendants of the context node (children, grandchildren, etc)
+  \row
+    \o \c{descendant-or-self::}
+    \o all nodes in \c{descendant} + \c{self}
+  \row
+    \o \c{parent::}
+    \o the parent node of the context node, or empty if there is no parent
+  \row
+    \o \c{ancestor::}
+    \o all ancestors of the context node (parent, grandparent, etc)
+  \row
+    \o \c{ancestor-or-self::}
+    \o all nodes in \c{ancestor} + \c{self}
+  \row
+    \o \c{following::}
+    \o all nodes in the tree containing the context node, \e not
+    including \c{descendant}, \e and that follow the context node
+    in the document
+  \row
+    \o \c{preceding::}
+    \o all nodes in the tree contianing the context node, \e not
+    including \c{ancestor}, \e and that precede the context node in
+    the document
+  \row
+    \o \c{following-sibling::}
+    \o all children of the context node's \c{parent} that follow the
+    context node in the document
+  \row
+    \o \c{preceding-sibling::}
+    \o all children of the context node's \c{parent} that precede the
+    context node in the document
+\endtable
+
+\section2 Node Tests
+
+A node test is a conditional expression that must be true for a node
+if the node is to be selected by the axis step. The conditional
+expression can test just the \e kind of node, or it can test the \e
+kind of node and the \e name of the node. The XQuery specification for
+\l{http://www.w3.org/TR/xquery/#node-tests} {node tests} also defines
+a third condition, the node's \e {Schema Type}, but schema type tests
+are not supported in QtXmlPatterns.
+
+QtXmlPatterns supports the following node tests. The tests that have a
+\c{name} parameter test the node's name in addition to its \e{kind}
+and are often called the \l{Name Tests}.
+
+\table
+\header
+  \o Node Test
+  \o matches all...
+  \row
+    \o \c{node()}
+    \o nodes of any kind
+  \row
+    \o \c{text()}
+    \o text nodes
+  \row
+    \o \c{comment()}
+    \o comment nodes
+  \row
+    \o \c{element()}
+    \o element nodes (same as star: *)
+  \row
+    \o \c{element(name)}
+    \o element nodes named \c{name}
+  \row
+    \o \c{attribute()}
+    \o attribute nodes
+  \row
+    \o \c{attribute(name)}
+    \o attribute nodes named \c{name}
+   \row
+    \o \c{processing-instruction()}
+    \o processing-instructions
+  \row
+    \o \c{processing-instruction(name)}
+    \o processing-instructions named \c{name}
+  \row
+    \o \c{document-node()}
+    \o document nodes (there is only one)
+  \row
+    \o \c{document-node(element(name))}
+    \o document node with document element \c{name}
+\endtable
+
+\target Shorthand Form
+\section2 Shorthand Form
+
+Writing axis steps using the longhand form with axis specifiers and
+node tests is semantically clear but syntactically verbose. The
+shorthand form is easy to learn and, once you learn it, just as easy
+to read. In the shorthand form, the axis specifier and node test are
+implied by the syntax. XQueries are normally written in the shorthand
+form. Here is a table of some frequently used shorthand forms:
+
+\table
+\header
+  \o Shorthand syntax
+  \o Short for...
+  \o matches all...
+  \row
+    \o \c{name}
+    \o \c{child::element(name)}
+    \o child nodes that are \c{name} elements
+
+  \row
+    \o \c{*}
+    \o \c{child::element()}
+    \o child nodes that are elements (\c{node()} matches
+    \e all child nodes)
+
+  \row
+    \o \c{..}
+    \o \c{parent::node()}
+    \o parent nodes (there is only one)
+
+  \row
+    \o \c{@*}
+    \o \c{attribute::attribute()}
+    \o attribute nodes
+
+  \row
+    \o \c{@name}
+    \o \c{attribute::attribute(name)}
+    \o \c{name} attributes
+
+  \row
+    \o \c{//}
+    \o \c{descendant-or-self::node()}
+    \o descendent nodes (when used instead of '/')
+
+\endtable
+
+The \l{http://www.w3.org/TR/xquery/}{XQuery language specification}
+has a more detailed section on the shorthand form, which it calls the
+\l{http://www.w3.org/TR/xquery/#abbrev} {abbreviated syntax}. More
+examples of path expressions written in the shorthand form are found
+there. There is also a section listing examples of path expressions
+written in the the \l{http://www.w3.org/TR/xquery/#unabbrev} {longhand
+form}.
+
+\target Name Tests
+\section2 Name Tests
+
+The name tests are the \l{Node Tests} that have the \c{name}
+parameter. A name test must match the node \e name in addition to the
+node \e kind. We have already seen name tests used:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 19
+
+In this path expression, both \c{recipe} and \c{title} are name tests
+written in the shorthand form. XQuery resolves these names
+(\l{http://www.w3.org/TR/xquery/#id-basics}{QNames}) to their expanded
+form using whatever
+\l{http://www.w3.org/TR/xquery/#dt-namespace-declaration} {namespace
+declarations} it knows about. Resolving a name to its expanded form
+means replacing its namespace prefix, if one is present (there aren't
+any present in the example), with a namespace URI. The expanded name
+then consists of the namespace URI and the local name.
+
+But the names in the example above don't have namespace prefixes,
+because we didn't include a namespace declaration in our
+\c{cookbook.xml} file. However, we will often use XQuery to query XML
+documents that use namespaces. Forgetting to declare the correct
+namespace(s) in an XQuery is a common cause of XQuery failures. Let's
+add a \e{default} namespace to \c{cookbook.xml} now. Change the
+\e{document element} in \c{cookbook.xml} from:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 23
+
+to...
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 24
+
+This is called a \e{default namespace} declaration because it doesn't
+include a namespace prefix. By including this default namespace
+declaration in the document element, we mean that all unprefixed
+\e{element} names in the document, including the document element
+itself (\c{cookbook}), are automatically in the default namespace
+\c{http://cookbook/namespace}. Note that unprefixed \e{attribute}
+names are not affected by the default namespace declaration. They are
+always considered to be in \e{no namespace}.  Note also that the URL
+we choose as our namespace URI need not refer to an actual location,
+and doesn't refer to one in this case. But click on
+\l{http://www.w3.org/XML/1998/namespace}, for example, which is the
+namespace URI for elements and attributes prefixed with \c{xml:}.
+
+Now when we try to run the previous XQuery example, no output is
+produced! The path expression no longer matches anything in the
+cookbook file because our XQuery doesn't yet know about the namespace
+declaration we added to the cookbook document. There are two ways we
+can declare the namespace in the XQuery. We can give it a \e{namespace
+prefix} (e.g. \c{c} for cookbook) and prefix each name test with the
+namespace prefix:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 3
+
+Or we can declare the namespace to be the \e{default element
+namespace}, and then we can still run the original XQuery:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 4
+
+Both methods will work and produce the same output, all the
+\c{<title>} elements:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 5
+
+But note how the output is slightly different from the output we saw
+before we added the default namespace declaration to the cookbook file.
+QtXmlPatterns automatically includes the correct namespace attribute
+in each \c{<title>} element in the output. When QtXmlPatterns loads a
+document and expands a QName, it creates an instance of QXmlName,
+which retains the namespace prefix along with the namespace URI and
+the local name. See QXmlName for further details.
+
+One thing to keep in mind from this namespace discussion, whether you
+run XQueries in a Qt program using QtXmlPatterns, or you run them from
+the command line using xmlpatterns, is that if you don't get the
+output you expect, it might be because the data you are querying uses
+namespaces, but you didn't declare those namespaces in your XQuery.
+
+\section3 Wildcards in Name Tests
+
+The wildcard \c{'*'} can be used in a name test. To find all the
+attributes in the cookbook but select only the ones in the \c{xml}
+namespace, use the \c{xml:} namespace prefix but replace the
+\e{local name} (the attribute name) with the wildcard:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 7
+
+Oops! If you save this XQuery in \c{file.xq} and run it through
+\c{xmlpatterns}, it doesn't work. You get an error message instead,
+something like this: \e{Error SENR0001 in file:///...file.xq, at line
+1, column 1: Attribute xml:id can't be serialized because it appears
+at the top level.} The XQuery actually ran correctly. It selected a
+bunch of \c{xml:id} attributes and put them in the result set. But
+then \c{xmlpatterns} sent the result set to a \l{QXmlSerializer}
+{serializer}, which tried to output it as well-formed XML. Since the
+result set contains only attributes and attributes alone are not
+well-formed XML, the \l{QXmlSerializer} {serializer} reports a
+\l{http://www.w3.org/TR/2005/WD-xslt-xquery-serialization-20050915/#id-errors}
+{serialization error}.
+
+Fear not. XQuery can do more than just find and select elements and
+attributes. It can \l{Constructing Elements} {construct new ones on
+the fly} as well, which is what we need to do here if we want
+\c{xmlpatterns} to let us see the attributes we selected. The example
+above and the ones below are revisited in the \l{Constructing
+Elements} section. You can jump ahead to see the modified examples
+now, and then come back, or you can press on from here.
+
+To find all the \c{name} attributes in the cookbook and select them
+all regardless of their namespace, replace the namespace prefix with
+the wildcard and write \c{name} (the attribute name) as the local
+name:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 8
+
+To find and select all the attributes of the \e{document element} in
+the cookbook, replace the entire name test with the wildcard:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 9
+
+\section1 Using Predicates In Path Expressions
+
+Predicates can be used to further filter the nodes selected by a path
+expression. A predicate is an expression in square brackets ('[' and
+']') that either returns a boolean value or a number. A predicate can
+appear at the end of any path step in a path expression. The predicate
+is applied to each node in the focus set.  If a node passes the
+filter, the node is included in the result set.  The query below
+selects the recipe element that has the \c{<title>} element
+\c{"Hard-Boiled Eggs"}.
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 10
+
+The dot expression ('.') can be used in predicates and path
+expressions to refer to the current context node. The following query
+uses the dot expression to refer to the current \c{<method>} element.
+The query selects the empty \c{<method>} elements from the cookbook.
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 11
+
+Note that passing the dot expression to the
+\l{http://www.w3.org/TR/xpath-functions/#func-string-length}
+{string-length()} function is optional. When
+\l{http://www.w3.org/TR/xpath-functions/#func-string-length}
+{string-length()} is called with no parameter, the context node is
+assumed:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 12
+
+Actually, selecting an empty \c{<method>} element might not be very
+useful by itself. It doesn't tell you which recipe has the empty
+method:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 31
+
+\target Empty Method Not Robust
+What you probably want to see instead are the \c{<recipe>} elements that
+have empty \c{<method>} elements:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 32
+
+The predicate uses the
+\l{http://www.w3.org/TR/xpath-functions/#func-string-length}
+{string-length()} function to test the length of each \c{<method>}
+element in each \c{<recipe>} element found by the node test. If a
+\c{<method>} contains no text, the predicate evaluates to \c{true} and
+the \c{<recipe>} element is selected. If the method contains some
+text, the predicate evaluates to \c{false}, and the \c{<recipe>}
+element is discarded.  The output is the entire recipe that has no
+instructions for preparation:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 33
+
+The astute reader will have noticed that this use of
+\c{string-length()} to find an empty element is unreliable. It works
+in this case, because the method element is written as \c{<method/>},
+guaranteeing that its string length will be 0. It will still work if
+the method element is written as \c{<method></method>}, but it will
+fail if there is any whitespace between the opening and ending
+\c{<method>} tags. A more robust way to find the recipes with empty
+methods is presented in the section on \l{Boolean Predicates}.
+
+There are many more functions and operators defined for XQuery and
+XPath. They are all \l{http://www.w3.org/TR/xpath-functions}
+{documented here}.
+
+\section2 Positional Predicates
+
+Predicates are often used to filter items based on their position in
+a sequence. For path expressions processing items loaded from XML
+documents, the normal sequence is
+\l{http://www.w3.org/TR/xquery/#id-document-order} {document order}.
+This query returns the second \c{<recipe>} element in the
+\c{cookbook.xml} file:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 13
+
+The other frequently used positional function is
+\l{http://www.w3.org/TR/xpath-functions/#func-last} {last()}, which
+returns the numeric position of the last item in the focus set. Stated
+another way, \l{http://www.w3.org/TR/xpath-functions/#func-last}
+{last()} returns the size of the focus set. This query returns the
+last recipe in the cookbook:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 16
+
+And this query returns the next to last \c{<recipe>}:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 17
+
+\section2 Boolean Predicates
+
+The other kind of predicate evaluates to \e true or \e false. A
+boolean predicate takes the value of its expression and determines its
+\e{effective boolean value} according to the following rules:
+
+\list
+    \o An expression that evaluates to a single node is \c{true}.
+
+    \o An expression that evaluates to a string is \c{false} if the
+       string is empty and \c{true} if the string is not empty.
+
+    \o An expression that evaluates to a boolean value (i.e. type
+    \c{xs:boolean}) is that value.
+
+    \o If the expression evaluates to anything else, it's an error
+    (e.g. type \c{xs:date}).
+
+\endlist
+
+We have already seen some boolean predicates in use.  Earlier, we saw
+a \e{not so robust} way to find the \l{Empty Method Not Robust}
+{recipes that have no instructions}. \c{[string-length(method) = 0]}
+is a boolean predicate that would fail in the example if the empty
+method element was written with both opening and closing tags and
+there was whitespace between the tags. Here is a more robust way that
+uses a different boolean predicate.
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 34
+
+This one uses the
+\l{http://www.w3.org/TR/xpath-functions/#func-empty} {empty()} and
+function to test whether the method contains any steps. If the method
+contains no steps, then \c{empty(step)} will return \c{true}, and
+hence the predicate will evaluate to \c{true}.
+
+But even that version isn't foolproof. Suppose the method does contain
+steps, but all the steps themselves are empty. That's still a case of
+a recipe with no instructions that won't be detected. There is a
+better way:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 35
+
+This version uses the
+\l{http://www.w3.org/TR/xpath-functions/#func-not} {not} and
+\l{http://www.w3.org/TR/xpath-functions/#func-normalize-space}
+{normalize-space()} functions. \c{normalize-space(method))} returns
+the contents of the method element as a string, but with all the
+whitespace normalized, i.e., the string value of each \c{<step>}
+element will have its whitespace normalized, and then all the
+normalized step values will be concatenated. If that string is empty,
+then \c{not()} returns \c{true} and the predicate is \c{true}.
+
+We can also use the
+\l{http://www.w3.org/TR/xpath-functions/#func-position} {position()}
+function in a comparison to inspect positions with conditional logic. The
+\l{http://www.w3.org/TR/xpath-functions/#func-position} {position()}
+function returns the position index of the current context item in the
+sequence of items:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 14
+
+Note that the first position in the sequence is position 1, not 0. We
+can also select \e{all} the recipes after the first one:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 15
+
+\target Constructing Elements
+\section1 Constructing Elements
+
+In the section about \l{Wildcards in Name Tests} {using wildcards in
+name tests}, we saw three simple example XQueries, each of which
+selected a different list of XML attributes from the cookbook.  We
+couldn't use \c{xmlpatterns} to run these queries, however, because
+\c{xmlpatterns} sends the XQuery results to a \l{QXmlSerializer}
+{serializer}, which expects to serialize the results as well-formed
+XML. Since a list of XML attributes by itself is not well-formed XML,
+the serializer reported an error for each XQuery.
+
+Since an attribute must appear in an element, for each attribute in
+the result set, we must create an XML element. We can do that using a
+\l{http://www.w3.org/TR/xquery/#id-for-let} {\e{for} clause} with a
+\l{http://www.w3.org/TR/xquery/#id-variables} {bound variable}, and a
+\l{http://www.w3.org/TR/xquery/#id-orderby-return} {\e{return}
+clause} with an element constructor:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 25
+
+The \e{for} clause produces a sequence of attribute nodes from the result
+of the path expression. Each attribute node in the sequence is bound
+to the variable \c{$i}. The \e{return} clause then constructs a \c{<p>}
+element around the attribute node. Here is the output:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 28
+
+The output contains one \c{<p>} element for each \c{xml:id} attribute
+in the cookbook. Note that XQuery puts each attribute in the right
+place in its \c{<p>} element, despite the fact that in the \e{return}
+clause, the \c{$i} variable is positioned as if it is meant to become
+\c{<p>} element content.
+
+The other two examples from the \l{Wildcards in Name Tests} {wildcard}
+section can be rewritten the same way. Here is the XQuery that selects
+all the \c{name} attributes, regardless of namespace:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 26
+
+And here is its output:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 29
+
+And here is the XQuery that selects all the attributes from the
+\e{document element}:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 27
+
+And here is its output:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 30
+
+\section2 Element Constructors are Expressions
+
+Because node constructors are expressions, they can be used in
+XQueries wherever expressions are allowed.
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 40
+
+If \c{cookbook.xml} is loaded without error, a \c{<resept>} element
+(Norweigian word for recipe) is constructed for each \c{<recipe>}
+element in the cookbook, and the child nodes of the \c{<recipe>} are
+copied into the \c{<resept>} element. But if the cookbook document
+doesn't exist or does not contain well-formed XML, a single
+\c{<resept>} element is constructed containing an error message.
+
+\section1 Constructing Atomic Values
+
+XQuery also has atomic values. An atomic value is a value in the value
+space of one of the built-in datatypes in the \l
+{http://www.w3.org/TR/xmlschema-2} {XML Schema language}. These
+\e{atomic types} have built-in operators for doing arithmetic,
+comparisons, and for converting values to other atomic types. See the
+\l {http://www.w3.org/TR/xmlschema-2/#built-in-datatypes} {Built-in
+Datatype Hierarchy} for the entire tree of built-in, primitive and
+derived atomic types. \note Click on a data type in the tree for its
+detailed specification.
+
+To construct an atomic value as element content, enclose an expression
+in curly braces and embed it in the element constructor:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 36
+
+Sending this XQuery through xmlpatterns produces:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 37
+
+To compute the value of an attribute, enclose the expression in
+curly braces and embed it in the attribute value:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 38
+
+Sending this XQuery through xmlpatterns produces:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 39
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 40
+
+If \c{cookbook.xml} is loaded without error, a \c{<resept>} element
+(Norweigian word for recipe) is constructed for each \c{<recipe>}
+element in the cookbook, and the child nodes of the \c{<recipe>} are
+copied into the \c{<resept>} element. But if the cookbook document
+doesn't exist or does not contain well-formed XML, a single
+\c{<resept>} element is constructed containing an error message.
+
+\section1 Running The Cookbook Examples
+
+Most of the XQuery examples in this document refer to the cookbook
+written in XML shown below. Save it as \c{cookbook.xml}. In the same
+directory, save one of the cookbook XQuery examples in a \c{.xq} file
+(e.g. \c{file.xq}). Run the XQuery using Qt's command line utility:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 6
+
+\section2 cookbook.xml
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 100
+
+\section1 Further Reading
+
+There is much more to the XQuery language than we have presented in
+this short introduction. We will be adding more here in later
+releases. In the meantime, playing with the \c{xmlpatterns} utility
+and making modifications to the XQuery examples provided here will be
+quite informative. An XQuery textbook will be a good investment.
+
+You can also ask questions on XQuery mail lists:
+
+\list
+\o
+\l{http://lists.trolltech.com/qt-interest/}{qt-interest}
+\o
+\l{http://www.x-query.com/mailman/listinfo/talk}{talk at x-query.com}.
+\endlist
+
+\l{http://www.functx.com/functx/}{FunctX} has a collection of XQuery
+functions that can be both useful and educational.
+
+This introduction contains many links to the specifications, which, of course,
+are the ultimate source of information about XQuery. They can be a bit
+difficult, though, so consider investing in a textbook:
+
+\list
+
+    \o \l{http://www.w3.org/TR/xquery/}{XQuery 1.0: An XML Query
+    Language} - the main source for syntax and semantics.
+
+    \o \l{http://www.w3.org/TR/xpath-functions/}{XQuery 1.0 and XPath
+       2.0 Functions and Operators} - the builtin functions and operators.
+
+\endlist
+
+\section1 FAQ
+
+The answers to these frequently asked questions explain the causes of
+several common mistakes that most beginners make.  Reading through the
+answers ahead of time might save you a lot of head scratching.
+
+\section2 Why didn't my path expression match anything?
+
+The most common cause of this bug is failure to declare one or more
+namespaces in your XQuery. Consider the following query for selecting
+all the examples in an XHTML document:
+
+\quotefile snippets/patternist/simpleHTML.xq
+
+It won't match anything because \c{index.html} is an XHTML file, and
+all XHTML files declare the default namespace
+\c{"http://www.w3.org/1999/xhtml"} in their top (\c{<html>}) element.
+But the query doesn't declare this namespace, so the path expression
+expands \c{html} to \c{{}html} and tries to match that expanded name.
+But the actual expanded name is
+\c{{http://www.w3.org/1999/xhtml}html}. One possible fix is to declare the
+correct default namespace in the XQuery:
+
+\quotefile snippets/patternist/simpleXHTML.xq
+
+Another common cause of this bug is to confuse the \e{document node}
+with the top element node. They are different. This query won't match
+anything:
+
+\quotefile snippets/patternist/docPlainHTML.xq
+
+The \c{doc()} function returns the \e{document node}, not the top
+element node (\c{<html>}). Don't forget to match the top element node
+in the path expression:
+
+\quotefile snippets/patternist/docPlainHTML2.xq
+
+\section2 What if my input namespace is different from my output namespace?
+
+Just remember to declare both namespaces in your XQuery and use them
+properly. Consider the following query, which is meant to generate
+XHTML output from XML input:
+
+\quotefile snippets/patternist/embedDataInXHTML.xq
+
+We want the \c{<html>}, \c{<body>}, and \c{<p>} nodes we create in the
+output to be in the standard XHTML namespace, so we declare the
+default namespace to be \c{http://www.w3.org/1999/xhtml}. That's
+correct for the output, but that same default namespace will also be
+applied to the node names in the path expression we're trying to match
+in the input (\c{/tests/test[@status = "failure"]}), which is wrong,
+because the namespace used in \c{testResult.xml} is perhaps in the
+empty namespace. So we must declare that namespace too, with a
+namespace prefix, and then use the prefix with the node names in
+the path expression. This one will probably work better:
+
+\quotefile snippets/patternist/embedDataInXHTML2.xq
+
+\section2 Why doesn't my return clause work?
+
+Recall that XQuery is an \e{expression-based} language, not
+\e{statement-based}. Because an XQuery is a lot of expressions,
+understanding XQuery expression precedence is very important.
+Consider the following query:
+
+\quotefile snippets/patternist/forClause2.xq
+
+It looks ok, but it isn't. It is supposed to be a FLWOR expression
+comprising a \e{for} clause and a \e{return} clause, but it isn't just
+that. It \e{has} a FLWOR expression, certainly (with the \e{for} and
+\e{return} clauses), but it \e{also} has an arithmetic expression
+(\e{+ $d}) dangling at the end because we didn't enclose the return
+expression in parentheses.
+
+Using parentheses to establish precedence is more important in XQuery
+than in other languages, because XQuery is \e{expression-based}. In
+In this case, without parantheses enclosing \c{$i + $d}, the return
+clause only returns \c{$i}. The \c{+$d} will have the result of the
+FLWOR expression as its left operand. And, since the scope of variable
+\c{$d} ends at the end of the \e{return} clause, a variable out of
+scope error will be reported. Correct these problems by using
+parentheses.
+
+\quotefile snippets/patternist/forClause.xq
+
+\section2 Why didn't my expression get evaluated?
+
+You probably misplaced some curly braces. When you want an expression
+evaluated inside an element constructor, enclose the expression in
+curly braces. Without the curly braces, the expression will be
+interpreted as text. Here is a \c{sum()} expression used in an \c{<e>}
+element. The table shows cases where the curly braces are missing,
+misplaced, and placed correctly:
+
+\table
+\header
+  \o element constructor with expression...
+  \o evaluates to...
+  \row
+    \o <e>sum((1, 2, 3))</e>
+    \o <e>sum((1, 2, 3))</e>
+  \row
+    \o <e>sum({(1, 2, 3)})</e>
+    \o <e>sum(1 2 3)</e>
+  \row
+    \o <e>{sum((1, 2, 3))}</e>
+    \o <e>6</e>
+\endtable
+
+\section2 My predicate is correct, so why doesn't it select the right stuff?
+
+Either you put your predicate in the wrong place in your path
+expression, or you forgot to add some parentheses.  Consider this
+input file \c{doc.txt}:
+
+\quotefile snippets/patternist/doc.txt
+
+Suppose you want the first \c{<span>} element of every \c{<p>}
+element. Apply a position filter (\c{[1]}) to the \c{/span} path step:
+
+\quotefile snippets/patternist/filterOnStep.xq
+
+Applying the \c{[1]} filter to the \c{/span} step returns the first
+\c{<span>} element of each \c{<p>} element:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 41
+
+\note: You can write the same query this way:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 44
+
+Or you can reduce it right down to this:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 45
+
+On the other hand, suppose you really want only one \c{<span>}
+element, the first one in the document (i.e., you only want the first
+\c{<span>} element in the first \c{<p>} element). Then you have to do
+more filtering. There are two ways you can do it. You can apply the
+\c{[1]} filter in the same place as above but enclose the path
+expression in parentheses:
+
+\quotefile snippets/patternist/filterOnPath.xq
+
+Or you can apply a second position filter (\c{[1]} again) to the
+\c{/p} path step:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 43
+
+Either way the query will return only the first \c{<span>} element in
+the document:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 42
+
+\section2 Why doesn't my FLWOR behave as expected?
+
+The quick answer is you probably expected your XQuery FLWOR to behave
+just like a C++ \e{for} loop. But they aren't the same. Consider a
+simple example:
+
+\quotefile snippets/patternist/letOrderBy.xq
+
+This query evaluates to \e{4 -4 -2 2 -8 8}. The \e{for} clause does
+set up a \e{for} loop style iteration, which does evaluate the rest of
+the FLWOR multiple times, one time for each value returned by the
+\e{in} expression. That much is similar to the C++ \e{for} loop.
+
+But consider the \e{return} clause. In C++ if you hit a \e{return}
+statement, you break out of the \e{for} loop and return from the
+function with one value. Not so in XQuery. The \e{return} clause is
+the last clause of the FLWOR, and it means: \e{Append the return value
+to the result list and then begin the next iteration of the FLWOR}.
+When the \e{for} clause's \e{in} expression no longer returns a value,
+the entire result list is returned.
+
+Next, consider the \e{order by} clause. It doesn't do any sorting on
+each iteration of the FLWOR. It just evaluates its expression on each
+iteration (\c{$a} in this case) to get an ordering value to map to the
+result item from each iteration. These ordering values are kept in a
+parallel list. The result list is sorted at the end using the parallel
+list of ordering values.
+
+The last difference to note here is that the \e{let} clause does
+\e{not} set up an iteration through a sequence of values like the
+\e{for} clause does. The \e{let} clause isn't a sort of nested loop.
+It isn't a loop at all. It is just a variable binding.  On each
+iteration, it binds the \e{entire} sequence of values on the right to
+the variable on the left. In the example above, it binds (4 -4) to
+\c{$b} on the first iteration, (-2 2) on the second iteration, and (-8
+8) on the third iteration. So the following query doesn't iterate
+through anything, and doesn't do any ordering:
+
+\quotefile snippets/patternist/invalidLetOrderBy.xq
+
+It binds the entire sequence (2, 3, 1) to \c{$i} one time only; the
+\e{order by} clause only has one thing to order and hence does
+nothing, and the query evaluates to 2 3 1, the sequence assigned to
+\c{$i}.
+
+\note We didn't include a \e{where} clause in the example. The
+\e{where} clause is for filtering results.
+
+\section2 Why are my elements created in the wrong order?
+
+The short answer is your elements are \e{not} created in the wrong
+order, because when appearing as operands to a path expression,
+there is no correct order. Consider the following query,
+which again uses the input file \c{doc.txt}:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 46
+
+The query finds all the \c{<p>} elements in the file. For each \c{<p>}
+element, it builds a \c{<p>} element in the output containing the
+concatenated contents of all the \c{<p>} element's child \c{<span>}
+elements. Running the query through \c{xmlpatterns} might produce the
+following output, which is not sorted in the expected order.
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 47
+
+You can use a \e{for} loop to ensure that the order of
+the result set corresponds to the order of the input sequence:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 48
+
+This version produces the same result set but in the expected order:
+
+\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 49
+
+\section2 Why can't I use \c{true} and \c{false} in my XQuery?
+
+You can, but not by just using the names \c{true} and \c{false}
+directly, because they are \l{Name Tests} {name tests} although they look
+like boolean constants. The simple way to create the boolean values is
+to use the builtin functions \c{true()} and \c{false()} wherever
+you want to use \c{true} and \c{false}. The other way is to invoke the
+boolean constructor:
+
+\quotefile snippets/patternist/xsBooleanTrue.xq
+
+*/
diff --git a/examples/README b/examples/README
new file mode 100644
index 0000000000..10e14ceef4
--- /dev/null
+++ b/examples/README
@@ -0,0 +1,39 @@
+Qt is supplied with a number of example applications and demonstrations that
+have been written to provide developers with examples of the Qt API in use,
+highlight good programming practice, and showcase features found in each of
+Qt's core technologies.
+
+The example and demo launcher can be used to explore the different categories
+available. It provides an overview of each example, lets you view the
+documentation in Qt Assistant, and is able to launch examples and demos.
+
+Documentation for examples can be found in the Tutorials and Examples section
+of the Qt documentation.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/activeqt/README b/examples/activeqt/README
new file mode 100644
index 0000000000..24be2de827
--- /dev/null
+++ b/examples/activeqt/README
@@ -0,0 +1,39 @@
+Qt is supplied with a number of example applications and demonstrations that
+have been written to provide developers with examples of the Qt API in use,
+highlight good programming practice, and showcase features found in each of
+Qt's core technologies.
+
+The example and demo launcher can be used to explore the different categories
+available. It provides an overview of each example, lets you view the
+documentation in Qt Assistant, and is able to launch examples and demos.
+
+Documentation for examples can be found in the Tutorial and Examples section
+of the Qt documentation.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/activeqt/activeqt.pro b/examples/activeqt/activeqt.pro
new file mode 100644
index 0000000000..262e1a1506
--- /dev/null
+++ b/examples/activeqt/activeqt.pro
@@ -0,0 +1,20 @@
+TEMPLATE      = subdirs
+SUBDIRS      += comapp \
+                hierarchy \
+                menus \
+                multiple \
+                simple \
+                webbrowser \
+                wrapper
+
+contains(QT_CONFIG, opengl):SUBDIRS += opengl
+
+# For now only the contain examples with mingw, for the others you need
+# an IDL compiler
+win32-g++|wince*:SUBDIRS = webbrowser
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/activeqt
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS activeqt.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt
+INSTALLS += target sources
diff --git a/examples/activeqt/comapp/comapp.pro b/examples/activeqt/comapp/comapp.pro
new file mode 100644
index 0000000000..84ce072b10
--- /dev/null
+++ b/examples/activeqt/comapp/comapp.pro
@@ -0,0 +1,13 @@
+TEMPLATE = app
+CONFIG  += qaxserver
+
+# Input
+SOURCES += main.cpp
+
+RC_FILE  = comapp.rc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/comapp
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS comapp.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/comapp
+INSTALLS += target sources
diff --git a/examples/activeqt/comapp/comapp.rc b/examples/activeqt/comapp/comapp.rc
new file mode 100644
index 0000000000..24e339ae41
--- /dev/null
+++ b/examples/activeqt/comapp/comapp.rc
@@ -0,0 +1 @@
+1 TYPELIB "comapp.rc"
diff --git a/examples/activeqt/comapp/main.cpp b/examples/activeqt/comapp/main.cpp
new file mode 100644
index 0000000000..95caaa3db4
--- /dev/null
+++ b/examples/activeqt/comapp/main.cpp
@@ -0,0 +1,272 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QAxFactory>
+#include <QTabWidget>
+#include <QTimer>
+
+class Application;
+class DocumentList;
+
+//! [0]
+class Document : public QObject
+{
+    Q_OBJECT
+
+    Q_CLASSINFO("ClassID", "{2b5775cd-72c2-43da-bc3b-b0e8d1e1c4f7}")
+    Q_CLASSINFO("InterfaceID", "{2ce1761e-07a3-415c-bd11-0eab2c7283de}")
+
+    Q_PROPERTY(Application *application READ application)
+    Q_PROPERTY(QString title READ title WRITE setTitle)
+
+public:
+    Document(DocumentList *list);
+    ~Document();
+
+    Application *application() const;
+
+    QString title() const;
+    void setTitle(const QString &title);
+
+private:
+    QWidget *page;
+};
+//! [0]
+
+//! [1]
+class DocumentList : public QObject
+{
+    Q_OBJECT
+
+    Q_CLASSINFO("ClassID", "{496b761d-924b-4554-a18a-8f3704d2a9a6}")
+    Q_CLASSINFO("InterfaceID", "{6c9e30e8-3ff6-4e6a-9edc-d219d074a148}")
+
+    Q_PROPERTY(Application* application READ application)
+    Q_PROPERTY(int count READ count)
+
+public:
+    DocumentList(Application *application);
+
+    int count() const;
+    Application *application() const;
+
+public slots:
+    Document *addDocument();
+    Document *item(int index) const;
+
+private:
+    QList<Document*> list;
+};
+//! [1]
+
+//! [2]
+class Application : public QObject
+{
+    Q_OBJECT
+
+    Q_CLASSINFO("ClassID", "{b50a71db-c4a7-4551-8d14-49983566afee}")
+    Q_CLASSINFO("InterfaceID", "{4a427759-16ef-4ed8-be79-59ffe5789042}")
+    Q_CLASSINFO("RegisterObject", "yes")
+
+    Q_PROPERTY(DocumentList* documents READ documents)
+    Q_PROPERTY(QString id READ id)
+    Q_PROPERTY(bool visible READ isVisible WRITE setVisible)
+
+public:
+    Application(QObject *parent = 0);
+    DocumentList *documents() const;
+
+    QString id() const { return objectName(); }
+
+    void setVisible(bool on);
+    bool isVisible() const;
+
+    QTabWidget *window() const { return ui; }
+
+public slots:
+    void quit();
+
+private:
+    DocumentList *docs;
+
+    QTabWidget *ui;
+};
+//! [2]
+
+//! [3]
+Document::Document(DocumentList *list)
+: QObject(list)
+{
+    QTabWidget *tabs = list->application()->window();
+    page = new QWidget(tabs);
+    page->setWindowTitle("Unnamed");
+    tabs->addTab(page, page->windowTitle());
+
+    page->show();
+}
+
+Document::~Document()
+{
+    delete page;
+}
+
+Application *Document::application() const
+{
+    return qobject_cast<DocumentList*>(parent())->application();
+}
+
+QString Document::title() const
+{
+    return page->windowTitle();
+}
+
+void Document::setTitle(const QString &t)
+{
+    page->setWindowTitle(t);
+
+    QTabWidget *tabs = application()->window();
+    int index = tabs->indexOf(page);
+    tabs->setTabText(index, page->windowTitle());
+}
+
+//! [3] //! [4]
+DocumentList::DocumentList(Application *application)
+: QObject(application)
+{
+}
+
+Application *DocumentList::application() const
+{
+    return qobject_cast<Application*>(parent());
+}
+
+int DocumentList::count() const
+{
+    return list.count();
+}
+
+Document *DocumentList::item(int index) const
+{
+    if (index >= list.count())
+        return 0;
+
+    return list.at(index);
+}
+
+Document *DocumentList::addDocument()
+{
+    Document *document = new Document(this);
+    list.append(document);
+
+    return document;
+}
+
+
+//! [4] //! [5]
+Application::Application(QObject *parent)
+: QObject(parent), ui(0)
+{
+    ui = new QTabWidget;
+
+    setObjectName("From QAxFactory");
+    docs = new DocumentList(this);
+}
+
+DocumentList *Application::documents() const
+{
+    return docs;
+}
+
+void Application::setVisible(bool on)
+{
+    ui->setShown(on);
+}
+
+bool Application::isVisible() const
+{
+    return ui->isVisible();
+}
+
+void Application::quit()
+{
+    delete docs;
+    docs = 0;
+
+    delete ui;
+    ui = 0;
+    QTimer::singleShot(0, qApp, SLOT(quit()));
+}
+
+#include "main.moc"
+//! [5] //! [6]
+
+
+QAXFACTORY_BEGIN("{edd3e836-f537-4c6f-be7d-6014c155cc7a}", "{b7da3de8-83bb-4bbe-9ab7-99a05819e201}")
+   QAXCLASS(Application)
+   QAXTYPE(Document)
+   QAXTYPE(DocumentList)
+QAXFACTORY_END()
+
+//! [6] //! [7]
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    app.setQuitOnLastWindowClosed(false);
+
+    // started by COM - don't do anything
+    if (QAxFactory::isServer())
+        return app.exec();
+
+    // started by user
+    Application appobject(0);
+    appobject.setObjectName("From Application");
+
+    QAxFactory::startServer();
+    QAxFactory::registerActiveObject(&appobject);
+
+    appobject.setVisible(true);
+
+    QObject::connect(qApp, SIGNAL(lastWindowClosed()), &appobject, SLOT(quit()));
+
+    return app.exec();
+}
+//! [7]
diff --git a/examples/activeqt/dotnet/walkthrough/Form1.cs b/examples/activeqt/dotnet/walkthrough/Form1.cs
new file mode 100644
index 0000000000..9fb572afeb
--- /dev/null
+++ b/examples/activeqt/dotnet/walkthrough/Form1.cs
@@ -0,0 +1,127 @@
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Data;
+
+namespace csharp
+{
+	/// <summary>
+	/// Summary description for Form1.
+	/// </summary>
+	public class Form1 : System.Windows.Forms.Form
+	{
+		private AxwrapperaxLib.AxQPushButton resetButton;
+		private AxmultipleaxLib.AxQAxWidget2 circleWidget;
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.Container components = null;
+
+		public Form1()
+		{
+			//
+			// Required for Windows Form Designer support
+			//
+			InitializeComponent();
+
+			//
+			// TODO: Add any constructor code after InitializeComponent call
+			//
+		}
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if (components != null) 
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
+		#region Windows Form Designer generated code
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			System.Resources.ResourceManager resources = new System.Resources.ResourceManager(typeof(Form1));
+			this.resetButton = new AxwrapperaxLib.AxQPushButton();
+			this.circleWidget = new AxmultipleaxLib.AxQAxWidget2();
+			((System.ComponentModel.ISupportInitialize)(this.resetButton)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.circleWidget)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// resetButton
+			// 
+			this.resetButton.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);
+			this.resetButton.Enabled = true;
+			this.resetButton.Location = new System.Drawing.Point(160, 296);
+			this.resetButton.Name = "resetButton";
+			this.resetButton.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("resetButton.OcxState")));
+			this.resetButton.Size = new System.Drawing.Size(168, 32);
+			this.resetButton.TabIndex = 1;
+			this.resetButton.clicked += new System.EventHandler(this.resetLineWidth);
+			// 
+			// circleWidget
+			// 
+			this.circleWidget.Anchor = (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+				| System.Windows.Forms.AnchorStyles.Left) 
+				| System.Windows.Forms.AnchorStyles.Right);
+			this.circleWidget.Enabled = true;
+			this.circleWidget.Location = new System.Drawing.Point(8, 8);
+			this.circleWidget.Name = "circleWidget";
+			this.circleWidget.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("circleWidget.OcxState")));
+			this.circleWidget.Size = new System.Drawing.Size(320, 264);
+			this.circleWidget.TabIndex = 2;
+			this.circleWidget.ClickEvent += new System.EventHandler(this.circleClicked);
+			// 
+			// Form1
+			// 
+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+			this.ClientSize = new System.Drawing.Size(336, 333);
+			this.Controls.AddRange(new System.Windows.Forms.Control[] {
+																		  this.circleWidget,
+																		  this.resetButton});
+			this.Name = "Form1";
+			this.Text = "Form1";
+			((System.ComponentModel.ISupportInitialize)(this.resetButton)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.circleWidget)).EndInit();
+			this.ResumeLayout(false);
+
+		}
+		#endregion
+
+		/// <summary>
+		/// The main entry point for the application.
+		/// </summary>
+		[STAThread]
+		static void Main() 
+		{
+			Application.Run(new Form1());
+		}
+
+//! [0]
+		private void circleClicked(object sender, System.EventArgs e)
+		{
+			this.circleWidget.lineWidth++;
+		}
+//! [0]
+
+//! [1]
+		private void resetLineWidth(object sender, System.EventArgs e)
+		{
+			this.circleWidget.lineWidth = 1;
+			this.resetButton.setFocus();
+		}	
+//! [1]
+	}
+}
diff --git a/examples/activeqt/dotnet/walkthrough/Form1.resx b/examples/activeqt/dotnet/walkthrough/Form1.resx
new file mode 100644
index 0000000000..6353f829fe
--- /dev/null
+++ b/examples/activeqt/dotnet/walkthrough/Form1.resx
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+        
+            Version 1.3
+                
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+        
+            Example:
+        
+                ... ado.net/XML headers & schema ...
+                <resheader name="resmimetype">text/microsoft-resx</resheader>
+                <resheader name="version">1.3</resheader>
+                <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+                <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+                <data name="Name1">this is my long string</data>
+                <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+                <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                    [base64 mime encoded serialized .NET Framework object]
+                </data>
+                <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                    [base64 mime encoded string representing a byte array form of the .NET Framework object]
+                </data>
+        
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+            
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+                     
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+        
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+                   that the ResXResourceWriter will generate, however the reader can 
+                   read any of the formats listed below.
+        
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+        
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+        -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="resetButton.OcxState" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFpTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0xLjAuMzMw
+        MC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFT
+        eXN0ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAGwMA
+        AAIBAAAAAQAAAAAAAAAAAAAAAAYDAAAAAAAFAAAACGVuYWJsZWQAAAAAEgEAAAACeAAAAAAQAAAAAAAA
+        AAJ5AAAAABAAAAAAAAAABndpZHRoAAAAABAAAACoAAAAB2hlaWdodAAAAAAQAAAAGgAAAA1taW5pbXVt
+        V2lkdGgAAAAAEAAAAAAAAAAObWluaW11bUhlaWdodAAAAAAQAAAAAAAAAA1tYXhpbXVtV2lkdGgAAAAA
+        EAAAf/8AAAAObWF4aW11bUhlaWdodAAAAAAQAAB//wAAAA9iYWNrZ3JvdW5kTW9kZQAAAAAQAAAABAAA
+        ABdwYWxldHRlRm9yZWdyb3VuZENvbG9yAAAAAAr/AAAAAAAAF3BhbGV0dGVCYWNrZ3JvdW5kQ29sb3IA
+        AAAACv/U0MgAAAARYmFja2dyb3VuZE9yaWdpbgAAAAAQAAAAAAAAAAVmb250AAAAAAUAAAAYAE0AUwAg
+        AFMAaABlAGwAbAAgAEQAbABnAFP//wUBADIAAAAACGNhcHRpb24AAAAAA/////8AAAAJaWNvblRleHQA
+        AAAAA/////8AAAAObW91c2VUcmFja2luZwAAAAASAAAAAAxmb2N1c1BvbGljeQAAAAAQAAAAAQAAAA91
+        cGRhdGVzRW5hYmxlZAAAAAASAQAAAAptYXhpbWl6ZWQAAAAAEgAAAAALZnVsbFNjcmVlbgAAAAASAAAA
+        AAxhY2NlcHREcm9wcwAAAAASAAAAABNpbnB1dE1ldGhvZEVuYWJsZWQAAAAAEgAAAAAFdGV4dAAAAAAD
+        AAAADAAmAFIAZQBzAGUAdAAAAAt0b2dnbGVUeXBlAAAAABAAAAAAAAAABWRvd24AAAAAEgAAAAAMdG9n
+        Z2xlU3RhdGUAAAAAEAAAAAAAAAALYXV0b1Jlc2l6ZQAAAAASAAAAAAthdXRvUmVwZWF0AAAAABIAAAAA
+        EGV4Y2x1c2l2ZVRvZ2dsZQAAAAASAAAAAAxhdXRvRGVmYXVsdAAAAAASAQAAAAttZW51QnV0dG9uAAAA
+        ABIAAAAABWZsYXQAAAAAEgAL
+</value>
+  </data>
+  <data name="circleWidget.OcxState" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFpTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0xLjAuMzMw
+        MC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFT
+        eXN0ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAALwAA
+        AAIBAAAAAQAAAAAAAAAAAAAAABoAAAAAAAAFAAAACmxpbmVXaWR0aAAAAAAQAAAAAAs=
+</value>
+  </data>
+  <data name="$this.Name">
+    <value>Form1</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/activeqt/dotnet/walkthrough/Form1.vb b/examples/activeqt/dotnet/walkthrough/Form1.vb
new file mode 100644
index 0000000000..f5f241bd97
--- /dev/null
+++ b/examples/activeqt/dotnet/walkthrough/Form1.vb
@@ -0,0 +1,88 @@
+Public Class Form1
+    Inherits System.Windows.Forms.Form
+
+#Region " Windows Form Designer generated code "
+
+    Public Sub New()
+        MyBase.New()
+
+        'This call is required by the Windows Form Designer.
+        InitializeComponent()
+
+        'Add any initialization after the InitializeComponent() call
+
+    End Sub
+
+    'Form overrides dispose to clean up the component list.
+    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
+        If disposing Then
+            If Not (components Is Nothing) Then
+                components.Dispose()
+            End If
+        End If
+        MyBase.Dispose(disposing)
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    Friend WithEvents circleWidget As AxmultipleaxLib.AxQAxWidget2
+    Friend WithEvents resetButton As AxwrapperaxLib.AxQPushButton
+    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
+        Dim resources As System.Resources.ResourceManager = New System.Resources.ResourceManager(GetType(Form1))
+        Me.circleWidget = New AxmultipleaxLib.AxQAxWidget2()
+        Me.resetButton = New AxwrapperaxLib.AxQPushButton()
+        CType(Me.circleWidget, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.resetButton, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'circleWidget
+        '
+        Me.circleWidget.Anchor = (((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+                    Or System.Windows.Forms.AnchorStyles.Left) _
+                    Or System.Windows.Forms.AnchorStyles.Right)
+        Me.circleWidget.Enabled = True
+        Me.circleWidget.Location = New System.Drawing.Point(8, 8)
+        Me.circleWidget.Name = "circleWidget"
+        Me.circleWidget.OcxState = CType(resources.GetObject("circleWidget.OcxState"), System.Windows.Forms.AxHost.State)
+        Me.circleWidget.Size = New System.Drawing.Size(280, 216)
+        Me.circleWidget.TabIndex = 0
+        '
+        'resetButton
+        '
+        Me.resetButton.Anchor = (System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right)
+        ' VB is case insensitive, but our C++ controls are not.
+        ' Me.resetButton.enabled = True
+        Me.resetButton.Location = New System.Drawing.Point(184, 240)
+        Me.resetButton.Name = "resetButton"
+        Me.resetButton.OcxState = CType(resources.GetObject("resetButton.OcxState"), System.Windows.Forms.AxHost.State)
+        Me.resetButton.Size = New System.Drawing.Size(104, 24)
+        Me.resetButton.TabIndex = 1
+        '
+        'Form1
+        '
+        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
+        Me.ClientSize = New System.Drawing.Size(292, 273)
+        Me.Controls.AddRange(New System.Windows.Forms.Control() {Me.resetButton, Me.circleWidget})
+        Me.Name = "Form1"
+        Me.Text = "Form1"
+        CType(Me.circleWidget, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.resetButton, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+#End Region
+
+    Private Sub circleWidget_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles circleWidget.ClickEvent
+        Me.circleWidget.lineWidth = Me.circleWidget.lineWidth + 1
+    End Sub
+
+    Private Sub resetButton_clicked(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles resetButton.clicked
+        Me.circleWidget.lineWidth = 1
+        Me.resetButton.setFocus()
+    End Sub
+End Class
diff --git a/examples/activeqt/dotnet/walkthrough/csharp.csproj b/examples/activeqt/dotnet/walkthrough/csharp.csproj
new file mode 100644
index 0000000000..4c5502b8aa
--- /dev/null
+++ b/examples/activeqt/dotnet/walkthrough/csharp.csproj
@@ -0,0 +1,143 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.0.9466"
+        SchemaVersion = "1.0"
+        ProjectGuid = "{F15600FD-7677-4C01-B98A-6776CE500617}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "csharp"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "WinExe"
+                RootNamespace = "csharp"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "true"
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.Drawing"
+                    AssemblyName = "System.Drawing"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Drawing.dll"
+                />
+                <Reference
+                    Name = "System.Windows.Forms"
+                    AssemblyName = "System.Windows.Forms"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Windows.Forms.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"
+                />
+                <Reference
+                    Name = "stdole"
+                    Guid = "{00020430-0000-0000-C000-000000000046}"
+                    VersionMajor = "2"
+                    VersionMinor = "0"
+                    Lcid = "0"
+                    WrapperTool = "primary"
+                />
+                <Reference
+                    Name = "wrapperaxLib"
+                    Guid = "{3B756301-0075-4E40-8BE8-5A81DE2426B7}"
+                    VersionMajor = "1"
+                    VersionMinor = "0"
+                    Lcid = "0"
+                    WrapperTool = "tlbimp"
+                />
+                <Reference
+                    Name = "AxwrapperaxLib"
+                    Guid = "{3B756301-0075-4E40-8BE8-5A81DE2426B7}"
+                    VersionMajor = "1"
+                    VersionMinor = "0"
+                    Lcid = "0"
+                    WrapperTool = "aximp"
+                />
+                <Reference
+                    Name = "multipleaxLib"
+                    Guid = "{05828915-AD1C-47AB-AB96-D6AD1E25F0E2}"
+                    VersionMajor = "1"
+                    VersionMinor = "0"
+                    Lcid = "0"
+                    WrapperTool = "tlbimp"
+                />
+                <Reference
+                    Name = "AxmultipleaxLib"
+                    Guid = "{05828915-AD1C-47AB-AB96-D6AD1E25F0E2}"
+                    VersionMajor = "1"
+                    VersionMinor = "0"
+                    Lcid = "0"
+                    WrapperTool = "aximp"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "Form1.cs"
+                    SubType = "Form"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Form1.resx"
+                    DependentUpon = "Form1.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/activeqt/dotnet/walkthrough/vb.vbproj b/examples/activeqt/dotnet/walkthrough/vb.vbproj
new file mode 100644
index 0000000000..eb0a9d63d8
--- /dev/null
+++ b/examples/activeqt/dotnet/walkthrough/vb.vbproj
@@ -0,0 +1,147 @@
+<VisualStudioProject>
+    <VisualBasic
+        ProjectType = "Local"
+        ProductVersion = "7.0.9466"
+        SchemaVersion = "1.0"
+        ProjectGuid = "{BFF242A6-967C-4F73-BEBE-DED2D9C395C6}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "vb"
+                AssemblyOriginatorKeyFile = ""
+                AssemblyOriginatorKeyMode = "None"
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "WinExe"
+                OptionCompare = "Binary"
+                OptionExplicit = "On"
+                OptionStrict = "Off"
+                RootNamespace = "vb"
+                StartupObject = "vb.Form1"
+            >
+                <Config
+                    Name = "Debug"
+                    BaseAddress = "285212672"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = ""
+                    DefineDebug = "true"
+                    DefineTrace = "true"
+                    DebugSymbols = "true"
+                    IncrementalBuild = "true"
+                    Optimize = "false"
+                    OutputPath = "bin\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "1"
+                />
+                <Config
+                    Name = "Release"
+                    BaseAddress = "285212672"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = ""
+                    DefineDebug = "false"
+                    DefineTrace = "true"
+                    DebugSymbols = "false"
+                    IncrementalBuild = "false"
+                    Optimize = "true"
+                    OutputPath = "bin\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "1"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                />
+                <Reference
+                    Name = "System.Drawing"
+                    AssemblyName = "System.Drawing"
+                />
+                <Reference
+                    Name = "System.Windows.Forms"
+                    AssemblyName = "System.Windows.Forms"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                />
+                <Reference
+                    Name = "stdole"
+                    Guid = "{00020430-0000-0000-C000-000000000046}"
+                    VersionMajor = "2"
+                    VersionMinor = "0"
+                    Lcid = "0"
+                    WrapperTool = "primary"
+                />
+                <Reference
+                    Name = "wrapperaxLib"
+                    Guid = "{3B756301-0075-4E40-8BE8-5A81DE2426B7}"
+                    VersionMajor = "1"
+                    VersionMinor = "0"
+                    Lcid = "0"
+                    WrapperTool = "tlbimp"
+                />
+                <Reference
+                    Name = "multipleaxLib"
+                    Guid = "{05828915-AD1C-47AB-AB96-D6AD1E25F0E2}"
+                    VersionMajor = "1"
+                    VersionMinor = "0"
+                    Lcid = "0"
+                    WrapperTool = "tlbimp"
+                />
+                <Reference
+                    Name = "AxwrapperaxLib"
+                    Guid = "{3B756301-0075-4E40-8BE8-5A81DE2426B7}"
+                    VersionMajor = "1"
+                    VersionMinor = "0"
+                    Lcid = "0"
+                    WrapperTool = "aximp"
+                />
+                <Reference
+                    Name = "AxmultipleaxLib"
+                    Guid = "{05828915-AD1C-47AB-AB96-D6AD1E25F0E2}"
+                    VersionMajor = "1"
+                    VersionMinor = "0"
+                    Lcid = "0"
+                    WrapperTool = "aximp"
+                />
+            </References>
+            <Imports>
+                <Import Namespace = "Microsoft.VisualBasic" />
+                <Import Namespace = "System" />
+                <Import Namespace = "System.Collections" />
+                <Import Namespace = "System.Data" />
+                <Import Namespace = "System.Drawing" />
+                <Import Namespace = "System.Diagnostics" />
+                <Import Namespace = "System.Windows.Forms" />
+            </Imports>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "Form1.vb"
+                    SubType = "Form"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Form1.resx"
+                    DependentUpon = "Form1.vb"
+                    BuildAction = "EmbeddedResource"
+                />
+            </Include>
+        </Files>
+    </VisualBasic>
+</VisualStudioProject>
+
diff --git a/examples/activeqt/dotnet/wrapper/app.csproj b/examples/activeqt/dotnet/wrapper/app.csproj
new file mode 100644
index 0000000000..dce4bf0b81
--- /dev/null
+++ b/examples/activeqt/dotnet/wrapper/app.csproj
@@ -0,0 +1,93 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.0.9466"
+        SchemaVersion = "1.0"
+        ProjectGuid = "{334C8F04-E034-4082-9380-43906DDE71AB}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "wrapper"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Exe"
+                RootNamespace = "wrapper"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "true"
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "D:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "D:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "D:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"
+                />
+                <Reference
+                    Name = "lib"
+                    AssemblyName = "lib"
+                    HintPath = "lib\lib.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "main.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/activeqt/dotnet/wrapper/lib/lib.vcproj b/examples/activeqt/dotnet/wrapper/lib/lib.vcproj
new file mode 100644
index 0000000000..f49c35d52c
--- /dev/null
+++ b/examples/activeqt/dotnet/wrapper/lib/lib.vcproj
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="lib"
+	ProjectGUID="{2E94A303-45A2-47AC-B87A-7C3519E9D6D8}"
+	Keyword="ManagedCProj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="2"
+			CharacterSet="2"
+			ManagedExtensions="TRUE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\QtCore&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG"
+				IgnoreStandardIncludePath="FALSE"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="QtCored4.lib"
+				OutputFile="lib.dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="$(QTDIR)/lib"
+				GenerateDebugInformation="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="2"
+			CharacterSet="2"
+			ManagedExtensions="TRUE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\QtCore&quot;"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="WIN32;NDEBUG"
+				MinimalRebuild="FALSE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="QtCore4.lib"
+				OutputFile="$(OutDir)/lib.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(QTDIR)/lib"
+				GenerateDebugInformation="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
+			<File
+				RelativePath="networker.cpp">
+			</File>
+			<File
+				RelativePath="tools.cpp">
+			</File>
+			<File
+				RelativePath="worker.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc">
+			<File
+				RelativePath="networker.h">
+			</File>
+			<File
+				RelativePath="tools.h">
+			</File>
+			<File
+				RelativePath="worker.h">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="$(QTDIR)\bin\moc.exe $(InputName).h -o moc_$(InputName).cpp"
+						Outputs="moc_$(InputName).cpp"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="$(QTDIR)\bin\moc.exe $(InputName).h -o moc_$(InputName).cpp"
+						Outputs="moc_$(InputName).cpp"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Generated MOC"
+			Filter="">
+			<File
+				RelativePath="moc_worker.cpp">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/examples/activeqt/dotnet/wrapper/lib/networker.cpp b/examples/activeqt/dotnet/wrapper/lib/networker.cpp
new file mode 100644
index 0000000000..54e862b460
--- /dev/null
+++ b/examples/activeqt/dotnet/wrapper/lib/networker.cpp
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#include "networker.h"
+#include "worker.h"
+#include "tools.h"
+
+netWorker::netWorker()
+{
+    workerObject = new Worker();
+}
+//! [0] //! [1]
+
+netWorker::~netWorker()
+{
+    delete workerObject;
+}
+//! [1] //! [2]
+
+String *netWorker::get_StatusString()
+{
+    return QStringToString(workerObject->statusString());
+}
+//! [2] //! [3]
+
+void netWorker::set_StatusString(String *string)
+{
+    workerObject->setStatusString(StringToQString(string));
+    __raise statusStringChanged(string);
+}
+//! [3]
diff --git a/examples/activeqt/dotnet/wrapper/lib/networker.h b/examples/activeqt/dotnet/wrapper/lib/networker.h
new file mode 100644
index 0000000000..583c6c4ae3
--- /dev/null
+++ b/examples/activeqt/dotnet/wrapper/lib/networker.h
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// lib.h
+
+#pragma once
+
+#using <mscorlib.dll>
+using namespace System;
+
+//! [0]
+class Worker;
+
+// .NET class
+public __gc class netWorker
+{
+public:
+    netWorker();
+    ~netWorker();
+
+    __property String *get_StatusString();
+    __property void set_StatusString(String *string);
+
+    __event void statusStringChanged(String *args);
+
+private:
+    Worker *workerObject;
+};
+//! [0]
diff --git a/examples/activeqt/dotnet/wrapper/lib/tools.cpp b/examples/activeqt/dotnet/wrapper/lib/tools.cpp
new file mode 100644
index 0000000000..aa67aea46a
--- /dev/null
+++ b/examples/activeqt/dotnet/wrapper/lib/tools.cpp
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#include <QString>
+
+#using <mscorlib.dll>
+#include <vcclr.h>
+
+using namespace System;
+
+String *QStringToString(const QString &qstring)
+{
+    return new String((const wchar_t *)qstring.utf16());
+}
+//! [0] //! [1]
+
+QString StringToQString(String *string)
+{
+    const wchar_t __pin *chars = PtrToStringChars(string);
+    return QString::fromUtf16((const ushort *)chars);
+}
+//! [1]
diff --git a/examples/activeqt/dotnet/wrapper/lib/tools.h b/examples/activeqt/dotnet/wrapper/lib/tools.h
new file mode 100644
index 0000000000..8569eca5dc
--- /dev/null
+++ b/examples/activeqt/dotnet/wrapper/lib/tools.h
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TOOLS_H
+#define TOOLS_H
+
+#using <mscorlib.dll>
+
+QT_BEGIN_NAMESPACE
+class QString;
+QT_END_NAMESPACE
+
+System::String *QStringToString(const QString &qstring);
+QString StringToQString(System::String *string);
+
+#endif // TOOLS_H
diff --git a/examples/activeqt/dotnet/wrapper/lib/worker.cpp b/examples/activeqt/dotnet/wrapper/lib/worker.cpp
new file mode 100644
index 0000000000..695db57284
--- /dev/null
+++ b/examples/activeqt/dotnet/wrapper/lib/worker.cpp
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "worker.h"
+#include "tools.h"
+
+Worker::Worker()
+{
+    status = "Idle";
+}
+
+void Worker::setStatusString(const QString &string)
+{
+    status = string;
+    emit statusStringChanged(status);
+}
+
+QString Worker::statusString() const
+{
+    return status;
+}
diff --git a/examples/activeqt/dotnet/wrapper/lib/worker.h b/examples/activeqt/dotnet/wrapper/lib/worker.h
new file mode 100644
index 0000000000..8bab9ed8ee
--- /dev/null
+++ b/examples/activeqt/dotnet/wrapper/lib/worker.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WORKER_H
+#define WORKER_H
+
+#include <QObject>
+
+// native Qt/C++ class
+//! [0]
+class Worker : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString statusString READ statusString WRITE setStatusString)
+public:
+    Worker();
+
+    QString statusString() const;
+
+public slots:
+    void setStatusString(const QString &string);
+
+signals:
+    void statusStringChanged(const QString &string);
+
+private:
+    QString status;
+};
+//! [0]
+
+#endif // WORKER_H
diff --git a/examples/activeqt/dotnet/wrapper/main.cs b/examples/activeqt/dotnet/wrapper/main.cs
new file mode 100644
index 0000000000..1d430298c0
--- /dev/null
+++ b/examples/activeqt/dotnet/wrapper/main.cs
@@ -0,0 +1,40 @@
+//! [0]
+using System;
+
+namespace WrapperApp
+{
+	class App
+	{
+		void Run()
+		{
+			netWorker worker = new netWorker();
+
+			worker.statusStringChanged += new netWorker.__Delegate_statusStringChanged(onStatusStringChanged);
+
+			System.Console.Out.WriteLine(worker.StatusString);
+
+			System.Console.Out.WriteLine("Working cycle begins...");
+			worker.StatusString = "Working";
+			worker.StatusString = "Lunch Break";
+			worker.StatusString = "Working";
+			worker.StatusString = "Idle";
+			System.Console.Out.WriteLine("Working cycle ends...");
+		}
+
+		private void onStatusStringChanged(string str)
+		{
+			System.Console.Out.WriteLine(str);
+		}
+
+		[STAThread]
+//! [0] //! [1]
+		static void Main(string[] args)
+		{
+			App app = new App();
+			app.Run();
+		}
+//! [1] //! [2]
+	}
+//! [2] //! [3]
+}
+//! [3]
diff --git a/examples/activeqt/dotnet/wrapper/wrapper.sln b/examples/activeqt/dotnet/wrapper/wrapper.sln
new file mode 100644
index 0000000000..e25e6bdfb2
--- /dev/null
+++ b/examples/activeqt/dotnet/wrapper/wrapper.sln
@@ -0,0 +1,28 @@
+Microsoft Visual Studio Solution File, Format Version 7.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "app", "app.csproj", "{334C8F04-E034-4082-9380-43906DDE71AB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib", "lib\lib.vcproj", "{2E94A303-45A2-47AC-B87A-7C3519E9D6D8}"
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		ConfigName.0 = Debug
+		ConfigName.1 = Release
+	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+		{334C8F04-E034-4082-9380-43906DDE71AB}.0 = {2E94A303-45A2-47AC-B87A-7C3519E9D6D8}
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{334C8F04-E034-4082-9380-43906DDE71AB}.Debug.ActiveCfg = Debug|.NET
+		{334C8F04-E034-4082-9380-43906DDE71AB}.Debug.Build.0 = Debug|.NET
+		{334C8F04-E034-4082-9380-43906DDE71AB}.Release.ActiveCfg = Release|.NET
+		{334C8F04-E034-4082-9380-43906DDE71AB}.Release.Build.0 = Release|.NET
+		{2E94A303-45A2-47AC-B87A-7C3519E9D6D8}.Debug.ActiveCfg = Debug|Win32
+		{2E94A303-45A2-47AC-B87A-7C3519E9D6D8}.Debug.Build.0 = Debug|Win32
+		{2E94A303-45A2-47AC-B87A-7C3519E9D6D8}.Release.ActiveCfg = Release|Win32
+		{2E94A303-45A2-47AC-B87A-7C3519E9D6D8}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/examples/activeqt/hierarchy/hierarchy.inf b/examples/activeqt/hierarchy/hierarchy.inf
new file mode 100644
index 0000000000..cb7e90f021
--- /dev/null
+++ b/examples/activeqt/hierarchy/hierarchy.inf
@@ -0,0 +1,9 @@
+[version]
+    signature="$CHICAGO$"
+    AdvancedINF=2.0
+ [Add.Code]
+    hierarchyax.dll=hierarchyax.dll
+ [hierarchyax.dll]
+    file-win32-x86=thiscab
+    clsid={d574a747-8016-46db-a07c-b2b4854ee75c}
+    RegisterServer=yes
diff --git a/examples/activeqt/hierarchy/hierarchy.pro b/examples/activeqt/hierarchy/hierarchy.pro
new file mode 100644
index 0000000000..abe5f1bb2b
--- /dev/null
+++ b/examples/activeqt/hierarchy/hierarchy.pro
@@ -0,0 +1,16 @@
+TEMPLATE = lib
+TARGET	 = hierarchyax
+
+CONFIG	+= qt warn_off qaxserver dll
+contains(CONFIG, static):DEFINES += QT_NODLL
+
+SOURCES	 = objects.cpp main.cpp
+HEADERS	 = objects.h
+RC_FILE	 = $$QT_SOURCE_TREE/src/activeqt/control/qaxserver.rc
+DEF_FILE = $$QT_SOURCE_TREE/src/activeqt/control/qaxserver.def
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/hierarchy
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hierarchy.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/hierarchy
+INSTALLS += target sources
diff --git a/examples/activeqt/hierarchy/main.cpp b/examples/activeqt/hierarchy/main.cpp
new file mode 100644
index 0000000000..e817635241
--- /dev/null
+++ b/examples/activeqt/hierarchy/main.cpp
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#include "objects.h"
+#include <QAxFactory>
+
+QAXFACTORY_BEGIN("{9e626211-be62-4d18-9483-9419358fbb03}", "{75c276de-1df5-451f-a004-e4fa1a587df1}")
+    QAXCLASS(QParentWidget)
+    QAXTYPE(QSubWidget)
+QAXFACTORY_END()
+//! [0]
diff --git a/examples/activeqt/hierarchy/objects.cpp b/examples/activeqt/hierarchy/objects.cpp
new file mode 100644
index 0000000000..c3928b5b15
--- /dev/null
+++ b/examples/activeqt/hierarchy/objects.cpp
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "objects.h"
+#include <QLayout>
+#include <QPainter>
+
+/* Implementation of QParentWidget */
+//! [0]
+QParentWidget::QParentWidget(QWidget *parent)
+: QWidget(parent)
+{
+    vbox = new QVBoxLayout(this);    
+}
+
+//! [0] //! [1]
+void QParentWidget::createSubWidget(const QString &name)
+{
+    QSubWidget *sw = new QSubWidget(this, name);
+    vbox->addWidget(sw);
+    sw->setLabel(name);
+    sw->show();
+}
+
+//! [1] //! [2]
+QSubWidget *QParentWidget::subWidget(const QString &name)
+{
+    return qFindChild<QSubWidget*>(this, name);
+}
+
+//! [2]
+QSize QParentWidget::sizeHint() const
+{
+    return QWidget::sizeHint().expandedTo(QSize(100, 100));
+}
+
+/* Implementation of QSubWidget */
+//! [3]
+QSubWidget::QSubWidget(QWidget *parent, const QString &name)
+: QWidget(parent)
+{
+    setObjectName(name);
+}
+
+void QSubWidget::setLabel(const QString &text)
+{
+    lbl = text;
+    setObjectName(text);
+    update();
+}
+
+QString QSubWidget::label() const
+{
+    return lbl;
+}
+
+QSize QSubWidget::sizeHint() const
+{
+    QFontMetrics fm(font());
+    return QSize(fm.width(lbl), fm.height());
+}
+
+void QSubWidget::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+    painter.setPen(palette().text().color());
+    painter.drawText(rect(), Qt::AlignCenter, lbl);
+//! [3] //! [4]
+}
+//! [4]
diff --git a/examples/activeqt/hierarchy/objects.h b/examples/activeqt/hierarchy/objects.h
new file mode 100644
index 0000000000..e719e6d687
--- /dev/null
+++ b/examples/activeqt/hierarchy/objects.h
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef OBJECTS_H
+#define OBJECTS_H
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QVBoxLayout;
+QT_END_NAMESPACE
+class QSubWidget;
+
+//! [0]
+class QParentWidget : public QWidget
+{
+    Q_OBJECT
+    Q_CLASSINFO("ClassID", "{d574a747-8016-46db-a07c-b2b4854ee75c}");
+    Q_CLASSINFO("InterfaceID", "{4a30719d-d9c2-4659-9d16-67378209f822}");
+    Q_CLASSINFO("EventsID", "{4a30719d-d9c2-4659-9d16-67378209f823}");
+public:
+    QParentWidget(QWidget *parent = 0);
+
+    QSize sizeHint() const;
+
+public slots:
+    void createSubWidget( const QString &name );
+
+    QSubWidget *subWidget( const QString &name );
+
+private:
+    QVBoxLayout *vbox;
+};
+//! [0]
+
+//! [1]
+class QSubWidget : public QWidget
+{
+    Q_OBJECT
+    Q_PROPERTY( QString label READ label WRITE setLabel )
+
+    Q_CLASSINFO("ClassID", "{850652f4-8f71-4f69-b745-bce241ccdc30}");
+    Q_CLASSINFO("InterfaceID", "{2d76cc2f-3488-417a-83d6-debff88b3c3f}");
+    Q_CLASSINFO("ToSuperClass", "QSubWidget");
+    
+public:
+    QSubWidget(QWidget *parent = 0, const QString &name = QString());
+
+    void setLabel( const QString &text );
+    QString label() const;
+
+    QSize sizeHint() const;
+
+protected:
+    void paintEvent( QPaintEvent *e );
+
+private:
+    QString lbl;
+};
+//! [1]
+
+#endif // OBJECTS_H
diff --git a/examples/activeqt/menus/fileopen.xpm b/examples/activeqt/menus/fileopen.xpm
new file mode 100644
index 0000000000..880417eeeb
--- /dev/null
+++ b/examples/activeqt/menus/fileopen.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static const char *fileopen[] = {
+"    16    13        5            1",
+". c #040404",
+"# c #808304",
+"a c None",
+"b c #f3f704",
+"c c #f3f7f3",
+"aaaaaaaaa...aaaa",
+"aaaaaaaa.aaa.a.a",
+"aaaaaaaaaaaaa..a",
+"a...aaaaaaaa...a",
+".bcb.......aaaaa",
+".cbcbcbcbc.aaaaa",
+".bcbcbcbcb.aaaaa",
+".cbcb...........",
+".bcb.#########.a",
+".cb.#########.aa",
+".b.#########.aaa",
+"..#########.aaaa",
+"...........aaaaa"
+};
diff --git a/examples/activeqt/menus/filesave.xpm b/examples/activeqt/menus/filesave.xpm
new file mode 100644
index 0000000000..bd6870f475
--- /dev/null
+++ b/examples/activeqt/menus/filesave.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static const char *filesave[] = {
+"    14    14        4            1",
+". c #040404",
+"# c #808304",
+"a c #bfc2bf",
+"b c None",
+"..............",
+".#.aaaaaaaa.a.",
+".#.aaaaaaaa...",
+".#.aaaaaaaa.#.",
+".#.aaaaaaaa.#.",
+".#.aaaaaaaa.#.",
+".#.aaaaaaaa.#.",
+".##........##.",
+".############.",
+".##.........#.",
+".##......aa.#.",
+".##......aa.#.",
+".##......aa.#.",
+"b............."
+};
diff --git a/examples/activeqt/menus/main.cpp b/examples/activeqt/menus/main.cpp
new file mode 100644
index 0000000000..56f8a9fc16
--- /dev/null
+++ b/examples/activeqt/menus/main.cpp
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "menus.h"
+#include <QApplication>
+#include <QAxFactory>
+
+QAXFACTORY_DEFAULT(QMenus,
+		    "{4dc3f340-a6f7-44e4-a79b-3e9217695fbd}",
+		    "{9ee49617-7d5c-441a-b833-4b068d40d751}",
+		    "{13eca64b-ee2a-4f3c-aa04-5d9d975979a7}",
+		    "{ce947ee3-0403-4fdc-895a-4fe779394b46}",
+		    "{8de435ce-8d2a-46ac-b3b3-cb800d0847c7}");
+
+int main( int argc, char **argv )
+{
+    QApplication a( argc, argv );
+
+    QWidget *window = 0;
+    if ( !QAxFactory::isServer() ) {
+	window = new QMenus();
+	window->show();
+    }
+
+    return a.exec();
+}
diff --git a/examples/activeqt/menus/menus.cpp b/examples/activeqt/menus/menus.cpp
new file mode 100644
index 0000000000..27f064e862
--- /dev/null
+++ b/examples/activeqt/menus/menus.cpp
@@ -0,0 +1,178 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "menus.h"
+#include <QAction>
+#include <QAxFactory>
+#include <QMenuBar>
+#include <QMessageBox>
+#include <QTextEdit>
+#include <QPixmap>
+
+#include "fileopen.xpm"
+#include "filesave.xpm"
+
+QMenus::QMenus(QWidget *parent) 
+    : QMainWindow(parent, 0) // QMainWindow's default flag is WType_TopLevel
+{
+    QAction *action;
+
+    QMenu *file = new QMenu(this);
+
+    action = new QAction(QPixmap((const char**)fileopen), "&Open", this);
+    action->setShortcut(tr("CTRL+O"));
+    connect(action, SIGNAL(triggered()), this, SLOT(fileOpen()));
+    file->addAction(action);
+
+    action = new QAction(QPixmap((const char**)filesave),"&Save", this);
+    action->setShortcut(tr("CTRL+S"));
+    connect(action, SIGNAL(triggered()), this, SLOT(fileSave()));
+    file->addAction(action);
+
+    QMenu *edit = new QMenu(this);
+
+    action = new QAction("&Normal", this);
+    action->setShortcut(tr("CTRL+N"));
+    action->setToolTip("Normal");
+    action->setStatusTip("Toggles Normal");
+    action->setCheckable(true);
+    connect(action, SIGNAL(triggered()), this, SLOT(editNormal()));
+    edit->addAction(action);
+
+    action = new QAction("&Bold", this);
+    action->setShortcut(tr("CTRL+B"));
+    action->setCheckable(true);
+    connect(action, SIGNAL(triggered()), this, SLOT(editBold()));
+    edit->addAction(action);
+
+    action = new QAction("&Underline", this);
+    action->setShortcut(tr("CTRL+U"));
+    action->setCheckable(true);
+    connect(action, SIGNAL(triggered()), this, SLOT(editUnderline()));
+    edit->addAction(action);
+
+    QMenu *advanced = new QMenu(this);
+    action = new QAction("&Font...", this);
+    connect(action, SIGNAL(triggered()), this, SLOT(editAdvancedFont()));
+    advanced->addAction(action);
+
+    action = new QAction("&Style...", this);
+    connect(action, SIGNAL(triggered()), this, SLOT(editAdvancedStyle()));
+    advanced->addAction(action);
+
+    edit->addMenu(advanced)->setText("&Advanced");
+
+    edit->addSeparator();
+
+    action = new QAction("Una&vailable", this);
+    action->setShortcut(tr("CTRL+V"));
+    action->setCheckable(true);
+    action->setEnabled(false);
+    connect(action, SIGNAL(triggered()), this, SLOT(editUnderline()));
+    edit->addAction(action);
+
+    QMenu *help = new QMenu(this);
+
+    action = new QAction("&About...", this);
+    action->setShortcut(tr("F1"));
+    connect(action, SIGNAL(triggered()), this, SLOT(helpAbout()));
+    help->addAction(action);
+
+    action = new QAction("&About Qt...", this);
+    connect(action, SIGNAL(triggered()), this, SLOT(helpAboutQt()));
+    help->addAction(action);
+
+    if (!QAxFactory::isServer())
+        menuBar()->addMenu(file)->setText("&File");
+    menuBar()->addMenu(edit)->setText("&Edit");
+    menuBar()->addMenu(help)->setText("&Help");
+
+    editor = new QTextEdit(this);
+    setCentralWidget(editor);
+
+    statusBar();
+}
+
+void QMenus::fileOpen()
+{
+    editor->append("File Open selected.");
+}
+
+void QMenus::fileSave()
+{
+    editor->append("File Save selected.");
+}
+
+void QMenus::editNormal()
+{
+    editor->append("Edit Normal selected.");
+}
+
+void QMenus::editBold()
+{
+    editor->append("Edit Bold selected.");
+}
+
+void QMenus::editUnderline()
+{
+    editor->append("Edit Underline selected.");
+}
+
+void QMenus::editAdvancedFont()
+{
+    editor->append("Edit Advanced Font selected.");
+}
+
+void QMenus::editAdvancedStyle()
+{
+    editor->append("Edit Advanced Style selected.");
+}
+
+void QMenus::helpAbout()
+{
+    QMessageBox::about(this, "About QMenus", 
+			"This example implements an in-place ActiveX control with menus and status messages.");
+}
+
+void QMenus::helpAboutQt()
+{
+    QMessageBox::aboutQt(this);
+}
diff --git a/examples/activeqt/menus/menus.h b/examples/activeqt/menus/menus.h
new file mode 100644
index 0000000000..c961cd5cc0
--- /dev/null
+++ b/examples/activeqt/menus/menus.h
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MENUS_H
+#define MENUS_H
+
+#include <QMainWindow>
+
+QT_BEGIN_NAMESPACE
+class QTextEdit;
+QT_END_NAMESPACE
+
+class QMenus : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    QMenus(QWidget *parent = 0);
+
+public slots:
+    void fileOpen();
+    void fileSave();
+
+    void editNormal();
+    void editBold();
+    void editUnderline();
+
+    void editAdvancedFont();
+    void editAdvancedStyle();
+
+    void helpAbout();
+    void helpAboutQt();
+
+private:
+    QTextEdit *editor;
+};
+
+#endif // MENUS_H
diff --git a/examples/activeqt/menus/menus.inf b/examples/activeqt/menus/menus.inf
new file mode 100644
index 0000000000..f97efe86d8
--- /dev/null
+++ b/examples/activeqt/menus/menus.inf
@@ -0,0 +1,9 @@
+[version]
+    signature="$CHICAGO$"
+    AdvancedINF=2.0
+ [Add.Code]
+    menusax.exe=menusax.exe
+ [menusax.exe]
+    file-win32-x86=thiscab
+    clsid={4dc3f340-a6f7-44e4-a79b-3e9217695fbd}
+    RegisterServer=yes
diff --git a/examples/activeqt/menus/menus.pro b/examples/activeqt/menus/menus.pro
new file mode 100644
index 0000000000..c962b6b718
--- /dev/null
+++ b/examples/activeqt/menus/menus.pro
@@ -0,0 +1,14 @@
+TEMPLATE = app
+TARGET	 = menusax
+
+CONFIG	+= qt warn_off qaxserver
+
+SOURCES	 = main.cpp menus.cpp
+HEADERS	 = menus.h
+RC_FILE	 = $$QT_SOURCE_TREE/src/activeqt/control/qaxserver.rc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/menus
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS menus.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/menus
+INSTALLS += target sources
diff --git a/examples/activeqt/multiple/ax1.h b/examples/activeqt/multiple/ax1.h
new file mode 100644
index 0000000000..a53e4f457a
--- /dev/null
+++ b/examples/activeqt/multiple/ax1.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef AX1_H
+#define AX1_H
+
+#include <QWidget>
+#include <QPainter>
+
+//! [0]
+class QAxWidget1 : public QWidget
+{
+    Q_OBJECT
+    Q_CLASSINFO("ClassID", "{1D9928BD-4453-4bdd-903D-E525ED17FDE5}")
+    Q_CLASSINFO("InterfaceID", "{99F6860E-2C5A-42ec-87F2-43396F4BE389}")
+    Q_CLASSINFO("EventsID", "{0A3E9F27-E4F1-45bb-9E47-63099BCCD0E3}")
+
+    Q_PROPERTY(QColor fillColor READ fillColor WRITE setFillColor)
+public:
+    QAxWidget1(QWidget *parent = 0)
+        : QWidget(parent), fill_color(Qt::red)
+    {
+    }
+
+    QColor fillColor() const
+    {
+	return fill_color;
+    }
+    void setFillColor(const QColor &fc)
+    {
+	fill_color = fc;
+	repaint();
+    }
+
+protected:
+    void paintEvent(QPaintEvent *e)
+    {
+	QPainter paint(this);
+	QRect r = rect();
+	r.adjust(10, 10, -10, -10);
+	paint.fillRect(r, fill_color);
+    }
+
+private:
+    QColor fill_color;
+};
+//! [0]
+
+#endif // AX1_H
diff --git a/examples/activeqt/multiple/ax2.h b/examples/activeqt/multiple/ax2.h
new file mode 100644
index 0000000000..b6b50f3e6a
--- /dev/null
+++ b/examples/activeqt/multiple/ax2.h
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef AX2_H
+#define AX2_H
+
+#include <QWidget>
+#include <QPainter>
+
+//! [0]
+class QAxWidget2 : public QWidget
+{
+    Q_OBJECT
+    Q_CLASSINFO("ClassID", "{58139D56-6BE9-4b17-937D-1B1EDEDD5B71}")
+    Q_CLASSINFO("InterfaceID", "{B66280AB-08CC-4dcc-924F-58E6D7975B7D}")
+    Q_CLASSINFO("EventsID", "{D72BACBA-03C4-4480-B4BB-DE4FE3AA14A0}")
+    Q_CLASSINFO("ToSuperClass", "QAxWidget2")
+    Q_CLASSINFO("StockEvents", "yes")
+    Q_CLASSINFO("Insertable", "yes")
+
+    Q_PROPERTY( int lineWidth READ lineWidth WRITE setLineWidth )
+public:
+    QAxWidget2(QWidget *parent = 0)
+	: QWidget(parent), line_width( 1 )
+    {
+    }
+
+    int lineWidth() const
+    {
+	return line_width;
+    }
+    void setLineWidth( int lw )
+    {
+	line_width = lw;
+	repaint();
+    }
+
+protected:
+    void paintEvent( QPaintEvent *e )
+    {
+	QPainter paint( this );
+	QPen pen = paint.pen();
+	pen.setWidth( line_width );
+	paint.setPen( pen );
+
+	QRect r = rect();
+	r.adjust( 10, 10, -10, -10 );
+	paint.drawEllipse( r );
+    }
+
+private:
+    int line_width;
+};
+//! [0]
+
+#endif // AX2_H
diff --git a/examples/activeqt/multiple/main.cpp b/examples/activeqt/multiple/main.cpp
new file mode 100644
index 0000000000..612292eeec
--- /dev/null
+++ b/examples/activeqt/multiple/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#include "ax1.h"
+#include "ax2.h"
+#include <QAxFactory>
+
+QT_USE_NAMESPACE
+
+QAXFACTORY_BEGIN("{98DE28B6-6CD3-4e08-B9FA-3D1DB43F1D2F}", "{05828915-AD1C-47ab-AB96-D6AD1E25F0E2}")
+    QAXCLASS(QAxWidget1)
+    QAXCLASS(QAxWidget2)
+QAXFACTORY_END()
+//! [0]
diff --git a/examples/activeqt/multiple/multiple.inf b/examples/activeqt/multiple/multiple.inf
new file mode 100644
index 0000000000..7f6be769c7
--- /dev/null
+++ b/examples/activeqt/multiple/multiple.inf
@@ -0,0 +1,9 @@
+[version]
+    signature="$CHICAGO$"
+    AdvancedINF=2.0
+ [Add.Code]
+    multipleax.dll=multipleax.dll
+ [multipleax.dll]
+    file-win32-x86=thiscab
+    clsid={1D9928BD-4453-4bdd-903D-E525ED17FDE5}
+    RegisterServer=yes
diff --git a/examples/activeqt/multiple/multiple.pro b/examples/activeqt/multiple/multiple.pro
new file mode 100644
index 0000000000..7b86950a30
--- /dev/null
+++ b/examples/activeqt/multiple/multiple.pro
@@ -0,0 +1,16 @@
+TEMPLATE = lib
+TARGET	 = multipleax
+
+CONFIG	+= qt warn_off qaxserver dll
+contains(CONFIG, static):DEFINES += QT_NODLL
+
+SOURCES	 = main.cpp
+HEADERS	 = ax1.h ax2.h
+RC_FILE  = multipleax.rc
+DEF_FILE = $$QT_SOURCE_TREE/src/activeqt/control/qaxserver.def
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/multiple
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS multiple.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/multiple
+INSTALLS += target sources
diff --git a/examples/activeqt/multiple/multipleax.rc b/examples/activeqt/multiple/multipleax.rc
new file mode 100644
index 0000000000..1809e0d550
--- /dev/null
+++ b/examples/activeqt/multiple/multipleax.rc
@@ -0,0 +1,32 @@
+#include "winver.h"
+
+1 TYPELIB "multipleax.rc"
+1 ICON DISCARDABLE "..\\..\\..\\src\\activeqt\\control\\qaxserver.ico"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,0
+ PRODUCTVERSION 1,0,0,0
+ FILEFLAGSMASK 0x3fL
+ FILEOS 0x00040000L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904e4"
+        BEGIN
+            VALUE "CompanyName", "Nokia Corporation and/or its subsidiary(-ies)"
+            VALUE "FileDescription", "Multiple Example (ActiveQt)"
+            VALUE "FileVersion", "1.0.0.0"
+            VALUE "LegalCopyright", "Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)."
+            VALUE "InternalName", "multipleax.dll"
+            VALUE "OriginalFilename", "multipleax.dll"
+            VALUE "ProductName", "Multiple Example (ActiveQt)"
+            VALUE "ProductVersion", "1.0.0.0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END
diff --git a/examples/activeqt/opengl/glbox.cpp b/examples/activeqt/opengl/glbox.cpp
new file mode 100644
index 0000000000..4cb015b7b4
--- /dev/null
+++ b/examples/activeqt/opengl/glbox.cpp
@@ -0,0 +1,250 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** This is a simple QGLWidget displaying an openGL wireframe box
+**
+** The OpenGL code is mostly borrowed from Brian Pauls "spin" example
+** in the Mesa distribution
+**
+****************************************************************************/
+
+#include "glbox.h"
+#include <QAxAggregated>
+#include <QUuid>
+//! [0]
+#include <objsafe.h>
+//! [0]
+
+#if defined(Q_CC_MSVC)
+#pragma warning(disable:4305) // init: truncation from const double to float
+#endif
+
+/*!
+  Create a GLBox widget
+*/
+
+GLBox::GLBox( QWidget* parent, const char* name )
+    : QGLWidget( parent )
+{
+    xRot = yRot = zRot = 0.0;		// default object rotation
+    scale = 1.25;			// default object scale
+    object = 0;
+}
+
+
+/*!
+  Release allocated resources
+*/
+
+GLBox::~GLBox()
+{
+    makeCurrent();
+    glDeleteLists( object, 1 );
+}
+
+
+/*!
+  Paint the box. The actual openGL commands for drawing the box are
+  performed here.
+*/
+
+void GLBox::paintGL()
+{
+    glClear( GL_COLOR_BUFFER_BIT );
+
+    glLoadIdentity();
+    glTranslatef( 0.0, 0.0, -10.0 );
+    glScalef( scale, scale, scale );
+
+    glRotatef( xRot, 1.0, 0.0, 0.0 ); 
+    glRotatef( yRot, 0.0, 1.0, 0.0 ); 
+    glRotatef( zRot, 0.0, 0.0, 1.0 );
+
+    glCallList( object );
+}
+
+
+/*!
+  Set up the OpenGL rendering state, and define display list
+*/
+
+void GLBox::initializeGL()
+{
+    qglClearColor(Qt::black); 		// Let OpenGL clear to black
+    object = makeObject();		// Generate an OpenGL display list
+    glShadeModel( GL_FLAT );
+}
+
+
+
+/*!
+  Set up the OpenGL view port, matrix mode, etc.
+*/
+
+void GLBox::resizeGL( int w, int h )
+{
+    glViewport( 0, 0, (GLint)w, (GLint)h );
+    glMatrixMode( GL_PROJECTION );
+    glLoadIdentity();
+    glFrustum( -1.0, 1.0, -1.0, 1.0, 5.0, 15.0 );
+    glMatrixMode( GL_MODELVIEW );
+}
+
+
+/*!
+  Generate an OpenGL display list for the object to be shown, i.e. the box
+*/
+
+GLuint GLBox::makeObject()
+{	
+    GLuint list;
+
+    list = glGenLists( 1 );
+
+    glNewList( list, GL_COMPILE );
+
+    qglColor(Qt::white);		      // Shorthand for glColor3f or glIndex
+
+    glLineWidth( 2.0 );
+
+    glBegin( GL_LINE_LOOP );
+    glVertex3f(  1.0,  0.5, -0.4 );
+    glVertex3f(  1.0, -0.5, -0.4 );
+    glVertex3f( -1.0, -0.5, -0.4 );
+    glVertex3f( -1.0,  0.5, -0.4 );
+    glEnd();
+
+    glBegin( GL_LINE_LOOP );
+    glVertex3f(  1.0,  0.5, 0.4 );
+    glVertex3f(  1.0, -0.5, 0.4 );
+    glVertex3f( -1.0, -0.5, 0.4 );
+    glVertex3f( -1.0,  0.5, 0.4 );
+    glEnd();
+
+    glBegin( GL_LINES );
+    glVertex3f(  1.0,  0.5, -0.4 );   glVertex3f(  1.0,  0.5, 0.4 );
+    glVertex3f(  1.0, -0.5, -0.4 );   glVertex3f(  1.0, -0.5, 0.4 );
+    glVertex3f( -1.0, -0.5, -0.4 );   glVertex3f( -1.0, -0.5, 0.4 );
+    glVertex3f( -1.0,  0.5, -0.4 );   glVertex3f( -1.0,  0.5, 0.4 );
+    glEnd();
+
+    glEndList();
+
+    return list;
+}
+
+
+/*!
+  Set the rotation angle of the object to \e degrees around the X axis.
+*/
+
+void GLBox::setXRotation( int degrees )
+{
+    xRot = (GLfloat)(degrees % 360);
+    updateGL();
+}
+
+
+/*!
+  Set the rotation angle of the object to \e degrees around the Y axis.
+*/
+
+void GLBox::setYRotation( int degrees )
+{
+    yRot = (GLfloat)(degrees % 360);
+    updateGL();
+}
+
+
+/*!
+  Set the rotation angle of the object to \e degrees around the Z axis.
+*/
+
+void GLBox::setZRotation( int degrees )
+{
+    zRot = (GLfloat)(degrees % 360);
+    updateGL();
+}
+
+//! [1]
+class ObjectSafetyImpl : public QAxAggregated, 
+			 public IObjectSafety
+{
+public:
+//! [1] //! [2]
+    ObjectSafetyImpl() {}
+
+    long queryInterface( const QUuid &iid, void **iface )
+    {
+	*iface = 0;
+	if ( iid == IID_IObjectSafety )
+	    *iface = (IObjectSafety*)this;
+	else
+	    return E_NOINTERFACE;
+
+	AddRef();
+	return S_OK;
+    }
+
+//! [2] //! [3]
+    QAXAGG_IUNKNOWN;
+
+//! [3] //! [4]
+    HRESULT WINAPI GetInterfaceSafetyOptions( REFIID riid, DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions )
+    {
+	*pdwSupportedOptions = INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACESAFE_FOR_UNTRUSTED_CALLER;
+	*pdwEnabledOptions = INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACESAFE_FOR_UNTRUSTED_CALLER;
+	return S_OK;
+    }
+    HRESULT WINAPI SetInterfaceSafetyOptions( REFIID riid, DWORD pdwSupportedOptions, DWORD pdwEnabledOptions )
+    {
+	return S_OK;
+    }
+};
+//! [4] //! [5]
+
+QAxAggregated *GLBox::createAggregate()
+{
+    return new ObjectSafetyImpl();
+}
+//! [5]
diff --git a/examples/activeqt/opengl/glbox.h b/examples/activeqt/opengl/glbox.h
new file mode 100644
index 0000000000..3ebf818e9f
--- /dev/null
+++ b/examples/activeqt/opengl/glbox.h
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** This is a simple QGLWidget displaying an openGL wireframe box
+**
+****************************************************************************/
+
+#ifndef GLBOX_H
+#define GLBOX_H
+
+#include <QtOpenGL>
+//! [0]
+#include <QAxBindable>
+
+class GLBox : public QGLWidget,
+	      public QAxBindable
+{
+    Q_OBJECT
+//! [0] //! [1]
+
+public:
+
+    GLBox( QWidget* parent, const char* name = 0 );
+    ~GLBox();
+
+    QAxAggregated *createAggregate();
+
+public slots:
+
+    void		setXRotation( int degrees );
+//! [1]
+    void		setYRotation( int degrees );
+    void		setZRotation( int degrees );
+
+protected:
+
+    void		initializeGL();
+    void		paintGL();
+    void		resizeGL( int w, int h );
+
+    virtual GLuint 	makeObject();
+
+private:
+
+    GLuint object;
+    GLfloat xRot, yRot, zRot, scale;
+
+};
+
+#endif // GLBOX_H
diff --git a/examples/activeqt/opengl/globjwin.cpp b/examples/activeqt/opengl/globjwin.cpp
new file mode 100644
index 0000000000..3ac5d78621
--- /dev/null
+++ b/examples/activeqt/opengl/globjwin.cpp
@@ -0,0 +1,111 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "globjwin.h"
+#include "glbox.h"
+#include <QPushButton>
+#include <QSlider>
+#include <QLayout>
+#include <QFrame>
+#include <QMenuBar>
+#include <QMenu>
+#include <QApplication>
+
+
+GLObjectWindow::GLObjectWindow(QWidget* parent)
+    : QWidget(parent)
+{
+
+    // Create a menu
+    QMenu *file = new QMenu( this );
+    file->addAction( "Exit",  qApp, SLOT(quit())/*, CTRL+Key_Q*/);
+
+    // Create a menu bar
+    QMenuBar *m = new QMenuBar( this );
+    m->addMenu(file)->setText("&File");
+
+    // Create a nice frame to put around the OpenGL widget
+    QFrame* f = new QFrame(this);
+    f->setFrameStyle( QFrame::Sunken | QFrame::Panel );
+    f->setLineWidth( 2 );
+
+    // Create our OpenGL widget
+    GLBox* c = new GLBox( f, "glbox");
+
+    // Create the three sliders; one for each rotation axis
+    QSlider* x = new QSlider(Qt::Vertical, this);
+    x->setMaximum(360);
+    x->setPageStep(60);
+    x->setTickPosition( QSlider::TicksLeft );
+    QObject::connect( x, SIGNAL(valueChanged(int)),c,SLOT(setXRotation(int)) );
+
+    QSlider* y = new QSlider(Qt::Vertical, this);
+    y->setMaximum(360);
+    y->setPageStep(60);
+    y->setTickPosition( QSlider::TicksLeft );
+    QObject::connect( y, SIGNAL(valueChanged(int)),c,SLOT(setYRotation(int)) );
+
+    QSlider* z = new QSlider(Qt::Vertical, this);
+    z->setMaximum(360);
+    z->setPageStep(60);
+    z->setTickPosition( QSlider::TicksLeft );
+    QObject::connect( z, SIGNAL(valueChanged(int)),c,SLOT(setZRotation(int)) );
+
+    // Now that we have all the widgets, put them into a nice layout
+
+    // Top level layout, puts the sliders to the left of the frame/GL widget
+    QHBoxLayout* hlayout = new QHBoxLayout(this);
+
+    // Put the sliders on top of each other
+    QVBoxLayout* vlayout = new QVBoxLayout();
+    vlayout->addWidget( x );
+    vlayout->addWidget( y );
+    vlayout->addWidget( z );
+
+    // Put the GL widget inside the frame
+    QHBoxLayout* flayout = new QHBoxLayout(f);
+    flayout->setMargin(0);
+    flayout->addWidget( c, 1 );
+
+    hlayout->setMenuBar( m );
+    hlayout->addLayout( vlayout );
+    hlayout->addWidget( f, 1 );
+}
diff --git a/examples/activeqt/opengl/globjwin.h b/examples/activeqt/opengl/globjwin.h
new file mode 100644
index 0000000000..d707aa63f3
--- /dev/null
+++ b/examples/activeqt/opengl/globjwin.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** The GLObjectWindow contains a GLBox and three sliders connected to
+** the GLBox's rotation slots.
+**
+****************************************************************************/
+
+#ifndef GLOBJWIN_H
+#define GLOBJWIN_H
+
+#include <qwidget.h>
+
+class GLObjectWindow : public QWidget
+{
+    Q_OBJECT
+
+public:
+    GLObjectWindow(QWidget *parent = 0);
+};
+
+#endif
diff --git a/examples/activeqt/opengl/main.cpp b/examples/activeqt/opengl/main.cpp
new file mode 100644
index 0000000000..469bdfb29d
--- /dev/null
+++ b/examples/activeqt/opengl/main.cpp
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+//
+// Qt OpenGL example: Box
+//
+// A small example showing how a GLWidget can be used just as any Qt widget
+//
+// File: main.cpp
+//
+// The main() function
+//
+
+#include "globjwin.h"
+#include "glbox.h"
+#include <QApplication>
+#include <QtOpenGL>
+//! [0]
+#include <QAxFactory>
+
+QAXFACTORY_DEFAULT( GLBox,
+		    "{5fd9c22e-ed45-43fa-ba13-1530bb6b03e0}",
+		    "{33b051af-bb25-47cf-a390-5cfd2987d26a}",
+		    "{8c996c29-eafa-46ac-a6f9-901951e765b5}",
+		    "{2c3c183a-eeda-41a4-896e-3d9c12c3577d}",
+		    "{83e16271-6480-45d5-aaf1-3f40b7661ae4}"
+		  )
+
+//! [0] //! [1]
+/*
+  The main program is here.
+*/
+
+int main( int argc, char **argv )
+{
+    QApplication::setColorSpec( QApplication::CustomColor );
+    QApplication a(argc,argv);
+
+    if ( !QGLFormat::hasOpenGL() ) {
+	qWarning( "This system has no OpenGL support. Exiting." );
+	return -1;
+    }
+
+    if ( !QAxFactory::isServer() ) {
+	GLObjectWindow w;
+	w.resize( 400, 350 );
+	w.show();
+	return a.exec();
+//! [1] //! [2]
+    }
+    return a.exec();
+//! [2] //! [3]
+}
+//! [3]
diff --git a/examples/activeqt/opengl/opengl.inf b/examples/activeqt/opengl/opengl.inf
new file mode 100644
index 0000000000..4a79e67d01
--- /dev/null
+++ b/examples/activeqt/opengl/opengl.inf
@@ -0,0 +1,9 @@
+[version]
+    signature="$CHICAGO$"
+    AdvancedINF=2.0
+ [Add.Code]
+    openglax.exe=openglax.exe
+ [openglax.exe]
+    file-win32-x86=thiscab
+    clsid={5fd9c22e-ed45-43fa-ba13-1530bb6b03e0}
+    RegisterServer=yes
diff --git a/examples/activeqt/opengl/opengl.pro b/examples/activeqt/opengl/opengl.pro
new file mode 100644
index 0000000000..8eb81beaf5
--- /dev/null
+++ b/examples/activeqt/opengl/opengl.pro
@@ -0,0 +1,19 @@
+TEMPLATE = app
+TARGET	 = openglax
+
+CONFIG	+= qt warn_off qaxserver
+
+QT += opengl
+
+HEADERS	 = glbox.h \
+	   globjwin.h
+SOURCES	 = glbox.cpp \
+	   globjwin.cpp \
+	   main.cpp
+RC_FILE	 = $$QT_SOURCE_TREE/src/activeqt/control/qaxserver.rc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/opengl
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS opengl.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/opengl
+INSTALLS += target sources
diff --git a/examples/activeqt/qutlook/addressview.cpp b/examples/activeqt/qutlook/addressview.cpp
new file mode 100644
index 0000000000..281fe6a07f
--- /dev/null
+++ b/examples/activeqt/qutlook/addressview.cpp
@@ -0,0 +1,289 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#include "addressview.h"
+#include "msoutl.h"
+#include <QtGui>
+
+class AddressBookModel : public QAbstractListModel
+{
+public:
+    AddressBookModel(AddressView *parent);
+    ~AddressBookModel();
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    int columnCount(const QModelIndex &parent) const;
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const;
+    QVariant data(const QModelIndex &index, int role) const;
+
+    void changeItem(const QModelIndex &index, const QString &firstName, const QString &lastName, const QString &address, const QString &email);
+    void addItem(const QString &firstName, const QString &lastName, const QString &address, const QString &email);
+    void update();
+
+private:
+    Outlook::Application outlook;
+    Outlook::Items * contactItems;
+
+    mutable QHash<QModelIndex, QStringList> cache;
+};
+//! [0] //! [1]
+
+AddressBookModel::AddressBookModel(AddressView *parent)
+: QAbstractListModel(parent)
+{
+    if (!outlook.isNull()) {
+        Outlook::NameSpace session(outlook.Session());
+        session.Logon();
+        Outlook::MAPIFolder *folder = session.GetDefaultFolder(Outlook::olFolderContacts);
+        contactItems = new Outlook::Items(folder->Items());
+	connect(contactItems, SIGNAL(ItemAdd(IDispatch*)), parent, SLOT(updateOutlook()));
+	connect(contactItems, SIGNAL(ItemChange(IDispatch*)), parent, SLOT(updateOutlook()));
+	connect(contactItems, SIGNAL(ItemRemove()), parent, SLOT(updateOutlook()));    
+
+        delete folder;
+    }
+}
+
+//! [1] //! [2]
+AddressBookModel::~AddressBookModel()
+{
+    delete contactItems;
+
+    if (!outlook.isNull())
+        Outlook::NameSpace(outlook.Session()).Logoff();
+}
+
+//! [2] //! [3]
+int AddressBookModel::rowCount(const QModelIndex &) const
+{
+    return contactItems ? contactItems->Count() : 0;
+}
+
+int AddressBookModel::columnCount(const QModelIndex &parent) const
+{
+    return 4;
+}
+
+//! [3] //! [4]
+QVariant AddressBookModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    if (role != Qt::DisplayRole)
+        return QVariant();
+
+    switch (section) {
+    case 0:
+        return tr("First Name");
+    case 1:
+        return tr("Last Name");
+    case 2:
+        return tr("Address");
+    case 3:
+        return tr("Email");
+    default:
+        break;
+    }
+
+    return QVariant();
+}
+
+//! [4] //! [5]
+QVariant AddressBookModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || role != Qt::DisplayRole)
+        return QVariant();
+
+    QStringList data;
+    if (cache.contains(index)) {
+        data = cache.value(index);
+    } else {
+        Outlook::ContactItem contact(contactItems->Item(index.row() + 1));
+        data << contact.FirstName() << contact.LastName() << contact.HomeAddress() << contact.Email1Address();
+        cache.insert(index, data);
+    }
+
+    if (index.column() < data.count())
+        return data.at(index.column());
+
+    return QVariant();
+}
+
+//! [5] //! [6]
+void AddressBookModel::changeItem(const QModelIndex &index, const QString &firstName, const QString &lastName, const QString &address, const QString &email)
+{
+    Outlook::ContactItem item(contactItems->Item(index.row() + 1));
+
+    item.SetFirstName(firstName);
+    item.SetLastName(lastName);
+    item.SetHomeAddress(address);
+    item.SetEmail1Address(email);
+
+    item.Save();
+
+    cache.take(index);
+}
+
+//! [6] //! [7]
+void AddressBookModel::addItem(const QString &firstName, const QString &lastName, const QString &address, const QString &email)
+{
+    Outlook::ContactItem item(outlook.CreateItem(Outlook::olContactItem));
+    if (!item.isNull()) {
+        item.SetFirstName(firstName);
+        item.SetLastName(lastName);
+        item.SetHomeAddress(address);
+        item.SetEmail1Address(email);
+
+        item.Save();
+    }
+}
+
+//! [7] //! [8]
+void AddressBookModel::update()
+{
+    cache.clear();
+
+    emit reset();
+}
+
+
+//! [8] //! [9]
+AddressView::AddressView(QWidget *parent)
+: QWidget(parent)
+{
+    QGridLayout *mainGrid = new QGridLayout(this);
+
+    QLabel *liFirstName = new QLabel("First &Name", this);
+    liFirstName->resize(liFirstName->sizeHint());
+    mainGrid->addWidget(liFirstName, 0, 0);
+
+    QLabel *liLastName = new QLabel("&Last Name", this);
+    liLastName->resize(liLastName->sizeHint());
+    mainGrid->addWidget(liLastName, 0, 1);
+
+    QLabel *liAddress = new QLabel("Add&ress", this);
+    liAddress->resize(liAddress->sizeHint());
+    mainGrid->addWidget(liAddress, 0, 2);
+
+    QLabel *liEMail = new QLabel("&E-Mail", this);
+    liEMail->resize(liEMail->sizeHint());
+    mainGrid->addWidget(liEMail, 0, 3);
+
+    add = new QPushButton("A&dd", this);
+    add->resize(add->sizeHint());
+    mainGrid->addWidget(add, 0, 4);
+    connect(add, SIGNAL(clicked()), this, SLOT(addEntry()));
+
+    iFirstName = new QLineEdit(this);
+    iFirstName->resize(iFirstName->sizeHint());
+    mainGrid->addWidget(iFirstName, 1, 0);
+    liFirstName->setBuddy(iFirstName);
+
+    iLastName = new QLineEdit(this);
+    iLastName->resize(iLastName->sizeHint());
+    mainGrid->addWidget(iLastName, 1, 1);
+    liLastName->setBuddy(iLastName);
+
+    iAddress = new QLineEdit(this);
+    iAddress->resize(iAddress->sizeHint());
+    mainGrid->addWidget(iAddress, 1, 2);
+    liAddress->setBuddy(iAddress);
+
+    iEMail = new QLineEdit(this);
+    iEMail->resize(iEMail->sizeHint());
+    mainGrid->addWidget(iEMail, 1, 3);
+    liEMail->setBuddy(iEMail);
+
+    change = new QPushButton("&Change", this);
+    change->resize(change->sizeHint());
+    mainGrid->addWidget(change, 1, 4);
+    connect(change, SIGNAL(clicked()), this, SLOT(changeEntry()));
+
+    treeView = new QTreeView(this);
+    treeView->setSelectionMode(QTreeView::SingleSelection);
+    treeView->setRootIsDecorated(false);
+
+    model = new AddressBookModel(this);
+    treeView->setModel(model);
+
+    connect(treeView->selectionModel(), SIGNAL(currentChanged(QModelIndex, QModelIndex)), this, SLOT(itemSelected(QModelIndex)));
+
+    mainGrid->addWidget(treeView, 2, 0, 1, 5);
+}
+
+void AddressView::updateOutlook()
+{
+    model->update();
+}
+
+void AddressView::addEntry()
+{
+    if (!iFirstName->text().isEmpty() || !iLastName->text().isEmpty() ||
+         !iAddress->text().isEmpty() || !iEMail->text().isEmpty()) {
+        model->addItem(iFirstName->text(), iFirstName->text(), iAddress->text(), iEMail->text());
+    }
+
+    iFirstName->setText("");
+    iLastName->setText("");
+    iAddress->setText("");
+    iEMail->setText("");
+}
+
+void AddressView::changeEntry()
+{
+    QModelIndex current = treeView->currentIndex();
+
+    if (current.isValid())
+        model->changeItem(current, iFirstName->text(), iLastName->text(), iAddress->text(), iEMail->text());
+}
+
+//! [9] //! [10]
+void AddressView::itemSelected(const QModelIndex &index)
+{
+    if (!index.isValid())
+	return;
+
+    QAbstractItemModel *model = treeView->model();
+    iFirstName->setText(model->data(model->index(index.row(), 0)).toString());
+    iLastName->setText(model->data(model->index(index.row(), 1)).toString());
+    iAddress->setText(model->data(model->index(index.row(), 2)).toString());
+    iEMail->setText(model->data(model->index(index.row(), 3)).toString());
+}
+//! [10]
diff --git a/examples/activeqt/qutlook/addressview.h b/examples/activeqt/qutlook/addressview.h
new file mode 100644
index 0000000000..5363cc1f15
--- /dev/null
+++ b/examples/activeqt/qutlook/addressview.h
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ADDRESSVIEW_H
+#define ADDRESSVIEW_H
+
+#include <QWidget>
+
+class AddressBookModel;
+QT_BEGIN_NAMESPACE
+class QLineEdit;
+class QModelIndex;
+class QPushButton;
+class QTreeView;
+QT_END_NAMESPACE
+
+//! [0]
+class AddressView : public QWidget
+{
+    Q_OBJECT
+
+public:
+    AddressView(QWidget *parent = 0);
+
+protected slots:
+    void addEntry();
+    void changeEntry();
+    void itemSelected(const QModelIndex &index);
+
+    void updateOutlook();
+
+protected:
+    AddressBookModel *model;
+
+    QTreeView *treeView;
+    QPushButton *add, *change;
+    QLineEdit *iFirstName, *iLastName, *iAddress, *iEMail;
+};
+//! [0]
+
+#endif // ADDRESSVIEW_H
diff --git a/examples/activeqt/qutlook/fileopen.xpm b/examples/activeqt/qutlook/fileopen.xpm
new file mode 100644
index 0000000000..880417eeeb
--- /dev/null
+++ b/examples/activeqt/qutlook/fileopen.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static const char *fileopen[] = {
+"    16    13        5            1",
+". c #040404",
+"# c #808304",
+"a c None",
+"b c #f3f704",
+"c c #f3f7f3",
+"aaaaaaaaa...aaaa",
+"aaaaaaaa.aaa.a.a",
+"aaaaaaaaaaaaa..a",
+"a...aaaaaaaa...a",
+".bcb.......aaaaa",
+".cbcbcbcbc.aaaaa",
+".bcbcbcbcb.aaaaa",
+".cbcb...........",
+".bcb.#########.a",
+".cb.#########.aa",
+".b.#########.aaa",
+"..#########.aaaa",
+"...........aaaaa"
+};
diff --git a/examples/activeqt/qutlook/fileprint.xpm b/examples/activeqt/qutlook/fileprint.xpm
new file mode 100644
index 0000000000..6ada912fa0
--- /dev/null
+++ b/examples/activeqt/qutlook/fileprint.xpm
@@ -0,0 +1,24 @@
+/* XPM */
+static const char *fileprint[] = {
+"    16    14        6            1",
+". c #000000",
+"# c #848284",
+"a c #c6c3c6",
+"b c #ffff00",
+"c c #ffffff",
+"d c None",
+"ddddd.........dd",
+"dddd.cccccccc.dd",
+"dddd.c.....c.ddd",
+"ddd.cccccccc.ddd",
+"ddd.c.....c....d",
+"dd.cccccccc.a.a.",
+"d..........a.a..",
+".aaaaaaaaaa.a.a.",
+".............aa.",
+".aaaaaa###aa.a.d",
+".aaaaaabbbaa...d",
+".............a.d",
+"d.aaaaaaaaa.a.dd",
+"dd...........ddd"
+};
diff --git a/examples/activeqt/qutlook/filesave.xpm b/examples/activeqt/qutlook/filesave.xpm
new file mode 100644
index 0000000000..bd6870f475
--- /dev/null
+++ b/examples/activeqt/qutlook/filesave.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static const char *filesave[] = {
+"    14    14        4            1",
+". c #040404",
+"# c #808304",
+"a c #bfc2bf",
+"b c None",
+"..............",
+".#.aaaaaaaa.a.",
+".#.aaaaaaaa...",
+".#.aaaaaaaa.#.",
+".#.aaaaaaaa.#.",
+".#.aaaaaaaa.#.",
+".#.aaaaaaaa.#.",
+".##........##.",
+".############.",
+".##.........#.",
+".##......aa.#.",
+".##......aa.#.",
+".##......aa.#.",
+"b............."
+};
diff --git a/examples/activeqt/qutlook/main.cpp b/examples/activeqt/qutlook/main.cpp
new file mode 100644
index 0000000000..b015d8af17
--- /dev/null
+++ b/examples/activeqt/qutlook/main.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#include "addressview.h"
+#include <QApplication>
+
+int main(int argc, char ** argv)
+{
+    QApplication a(argc, argv);
+
+    AddressView view;
+    view.setWindowTitle("Qt Example - Looking at Outlook");
+    view.show();
+
+    return a.exec();
+}
+//! [0]
diff --git a/examples/activeqt/qutlook/qutlook.pro b/examples/activeqt/qutlook/qutlook.pro
new file mode 100644
index 0000000000..c1154e0ddd
--- /dev/null
+++ b/examples/activeqt/qutlook/qutlook.pro
@@ -0,0 +1,23 @@
+#! [0] #! [1]
+TEMPLATE = app
+TARGET	 = qutlook
+CONFIG	+= qaxcontainer
+
+TYPELIBS = $$system(dumpcpp -getfile {00062FFF-0000-0000-C000-000000000046})
+#! [0]
+
+isEmpty(TYPELIBS) {
+    message("Microsoft Outlook type library not found!")
+    REQUIRES += Outlook
+} else {
+#! [1] #! [2]
+    HEADERS  = addressview.h
+    SOURCES  = addressview.cpp main.cpp
+}
+#! [2]
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/qutlook
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qutlook.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/qutlook
+INSTALLS += target sources
diff --git a/examples/activeqt/simple/main.cpp b/examples/activeqt/simple/main.cpp
new file mode 100644
index 0000000000..7f939e4290
--- /dev/null
+++ b/examples/activeqt/simple/main.cpp
@@ -0,0 +1,137 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QAxBindable>
+#include <QAxFactory>
+#include <QApplication>
+#include <QLayout>
+#include <QSlider>
+#include <QLCDNumber>
+#include <QLineEdit>
+#include <QMessageBox>
+
+//! [0]
+class QSimpleAX : public QWidget, public QAxBindable
+{
+    Q_OBJECT
+    Q_PROPERTY( QString text READ text WRITE setText )
+    Q_PROPERTY( int value READ value WRITE setValue )
+public:
+    QSimpleAX(QWidget *parent = 0)
+    : QWidget(parent)
+    {
+	QVBoxLayout *vbox = new QVBoxLayout( this );
+
+        slider = new QSlider( Qt::Horizontal, this );
+	LCD = new QLCDNumber( 3, this );
+	edit = new QLineEdit( this );
+
+	connect( slider, SIGNAL( valueChanged( int ) ), this, SLOT( setValue(int) ) );
+	connect( edit, SIGNAL(textChanged(const QString&)), this, SLOT(setText(const QString&)) );
+
+	vbox->addWidget( slider );
+	vbox->addWidget( LCD );
+	vbox->addWidget( edit );
+    }
+
+    QString text() const 
+    { 
+	return edit->text(); 
+    }
+    int value() const
+    {
+	return slider->value();
+    }
+
+signals:
+    void someSignal();
+    void valueChanged(int);
+    void textChanged(const QString&);
+
+public slots:
+    void setText( const QString &string )
+    {
+	if ( !requestPropertyChange( "text" ) )
+	    return;
+
+	edit->blockSignals( true );
+	edit->setText( string );
+	edit->blockSignals( false );
+	emit someSignal();
+	emit textChanged( string );
+
+	propertyChanged( "text" );
+    }
+    void about()
+    {
+	QMessageBox::information( this, "About QSimpleAX", "This is a Qt widget, and this slot has been\n"
+							  "called through ActiveX/OLE automation!" );
+    }
+    void setValue( int i )
+    {
+	if ( !requestPropertyChange( "value" ) )
+	    return;
+	slider->blockSignals( true );
+	slider->setValue( i );
+	slider->blockSignals( false );
+	LCD->display( i );
+	emit valueChanged( i );
+
+	propertyChanged( "value" );
+    }
+
+private:
+    QSlider *slider;
+    QLCDNumber *LCD;
+    QLineEdit *edit;
+};
+
+//! [0]
+#include "main.moc"
+
+//! [1]
+QAXFACTORY_DEFAULT(QSimpleAX,
+	   "{DF16845C-92CD-4AAB-A982-EB9840E74669}",
+	   "{616F620B-91C5-4410-A74E-6B81C76FFFE0}",
+	   "{E1816BBA-BF5D-4A31-9855-D6BA432055FF}",
+	   "{EC08F8FC-2754-47AB-8EFE-56A54057F34E}",	   
+	   "{A095BA0C-224F-4933-A458-2DD7F6B85D8F}")
+//! [1]
diff --git a/examples/activeqt/simple/simple.inf b/examples/activeqt/simple/simple.inf
new file mode 100644
index 0000000000..3657e9fb87
--- /dev/null
+++ b/examples/activeqt/simple/simple.inf
@@ -0,0 +1,11 @@
+//! [0]
+[version]
+    signature="$CHICAGO$"
+    AdvancedINF=2.0
+ [Add.Code]
+    simpleax.exe=simpleax.exe
+ [simpleax.exe]
+    file-win32-x86=thiscab
+    clsid={DF16845C-92CD-4AAB-A982-EB9840E74669}
+    RegisterServer=yes
+//! [0]
diff --git a/examples/activeqt/simple/simple.pro b/examples/activeqt/simple/simple.pro
new file mode 100644
index 0000000000..d0f201947a
--- /dev/null
+++ b/examples/activeqt/simple/simple.pro
@@ -0,0 +1,13 @@
+TEMPLATE = app
+TARGET	 = simpleax
+
+CONFIG	+= qt warn_off qaxserver
+
+SOURCES	 = main.cpp
+RC_FILE	 = $$QT_SOURCE_TREE/src/activeqt/control/qaxserver.rc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/simple
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS simple.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/simple
+INSTALLS += target sources
diff --git a/examples/activeqt/webbrowser/main.cpp b/examples/activeqt/webbrowser/main.cpp
new file mode 100644
index 0000000000..fe93eab8fa
--- /dev/null
+++ b/examples/activeqt/webbrowser/main.cpp
@@ -0,0 +1,189 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QMessageBox>
+#include <QProgressBar>
+#include <QStatusBar>
+#include <QMainWindow>
+#include <QAbstractEventDispatcher>
+
+#if defined(Q_OS_WINCE)
+#include "ui_wincemainwindow.h"
+#include <windows.h>
+#else
+#include "ui_mainwindow.h"
+#endif
+
+//! [0]
+class MainWindow : public QMainWindow, public Ui::MainWindow
+{
+    Q_OBJECT
+public:
+    MainWindow();
+
+public slots:
+    void on_WebBrowser_TitleChange(const QString &title);
+    void on_WebBrowser_ProgressChange(int a, int b);
+    void on_WebBrowser_CommandStateChange(int cmd, bool on);
+    void on_WebBrowser_BeforeNavigate();
+    void on_WebBrowser_NavigateComplete(QString);
+
+    void on_actionGo_triggered();
+    void on_actionNewWindow_triggered();
+    void on_actionAbout_triggered();
+    void on_actionAboutQt_triggered();
+    void on_actionFileClose_triggered();
+
+private:
+    QProgressBar *pb;
+};
+//! [0] //! [1]
+
+MainWindow::MainWindow()
+{
+    setupUi(this);
+
+    connect(addressEdit, SIGNAL(returnPressed()), actionGo, SLOT(trigger()));
+    connect(actionBack, SIGNAL(triggered()), WebBrowser, SLOT(GoBack()));
+    connect(actionForward, SIGNAL(triggered()), WebBrowser, SLOT(GoForward()));
+    connect(actionStop, SIGNAL(triggered()), WebBrowser, SLOT(Stop()));
+    connect(actionRefresh, SIGNAL(triggered()), WebBrowser, SLOT(Refresh()));
+    connect(actionHome, SIGNAL(triggered()), WebBrowser, SLOT(GoHome()));
+    connect(actionSearch, SIGNAL(triggered()), WebBrowser, SLOT(GoSearch()));
+
+    pb = new QProgressBar(statusBar());
+    pb->setTextVisible(false);
+    pb->hide();
+    statusBar()->addPermanentWidget(pb);
+
+    WebBrowser->dynamicCall("GoHome()");
+}
+
+//! [1] //! [2]
+void MainWindow::on_WebBrowser_TitleChange(const QString &title)
+{
+    setWindowTitle("Qt WebBrowser - " + title);
+}
+
+void MainWindow::on_WebBrowser_ProgressChange(int a, int b)
+{
+    if (a <= 0 || b <= 0) {
+	pb->hide();
+	return;
+    }
+    pb->show();
+    pb->setRange(0, b);
+    pb->setValue(a);
+}
+
+void MainWindow::on_WebBrowser_CommandStateChange(int cmd, bool on)
+{
+    switch (cmd) {
+    case 1:
+	actionForward->setEnabled(on);
+	break;
+    case 2:
+	actionBack->setEnabled(on);
+	break;
+    }
+}
+
+void MainWindow::on_WebBrowser_BeforeNavigate()
+{
+    actionStop->setEnabled(true);
+}
+
+void MainWindow::on_WebBrowser_NavigateComplete(QString)
+{
+    actionStop->setEnabled(false);
+}
+
+//! [2] //! [3]
+void MainWindow::on_actionGo_triggered()
+{
+    WebBrowser->dynamicCall("Navigate(const QString&)", addressEdit->text());
+}
+
+void MainWindow::on_actionNewWindow_triggered()
+{
+    MainWindow *window = new MainWindow;
+    window->show();
+    if (addressEdit->text().isEmpty())
+	return;
+    window->addressEdit->setText(addressEdit->text());
+    window->actionStop->setEnabled(true);
+    window->on_actionGo_triggered();
+}
+
+void MainWindow::on_actionAbout_triggered()
+{
+    QMessageBox::about(this, tr("About WebBrowser"),
+		tr("This Example has been created using the ActiveQt integration into Qt Designer.\n"
+		   "It demonstrates the use of QAxWidget to embed the Internet Explorer ActiveX\n"
+		   "control into a Qt application."));
+}
+
+void MainWindow::on_actionAboutQt_triggered()
+{
+    QMessageBox::aboutQt(this, tr("About Qt"));
+}
+
+void MainWindow::on_actionFileClose_triggered()
+{
+    close();
+}
+
+#include "main.moc"
+
+//! [3] //! [4]
+int main(int argc, char ** argv)
+{
+    QApplication a(argc, argv);
+    MainWindow w;
+#if defined(Q_OS_WINCE)
+    w.showMaximized();
+#else
+    w.show();
+#endif
+    return a.exec();
+}
+//! [4]
diff --git a/examples/activeqt/webbrowser/mainwindow.ui b/examples/activeqt/webbrowser/mainwindow.ui
new file mode 100644
index 0000000000..12a0a328e6
--- /dev/null
+++ b/examples/activeqt/webbrowser/mainwindow.ui
@@ -0,0 +1,306 @@
+<ui version="4.0" stdsetdef="1" >
+  <class>MainWindow</class>
+  <widget class="QMainWindow" name="MainWindow" >
+    <property name="objectName" >
+      <string notr="true" >MainWindow</string>
+    </property>
+    <property name="geometry" >
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>812</width>
+        <height>605</height>
+      </rect>
+    </property>
+    <property name="windowTitle" >
+      <string>Qt WebBrowser</string>
+    </property>
+    <widget class="QWidget" name="centralWidget">
+    <layout class="QHBoxLayout" >
+      <property name="objectName" >
+        <string notr="true" >unnamed</string>
+      </property>
+      <property name="margin" >
+        <number>0</number>
+      </property>
+      <property name="spacing" >
+        <number>6</number>
+      </property>
+      <item>
+        <widget class="QFrame" name="Frame3" >
+          <property name="objectName" >
+            <string notr="true" >Frame3</string>
+          </property>
+          <property name="frameShape" >
+            <enum>QFrame::StyledPanel</enum>
+          </property>
+          <property name="frameShadow" >
+            <enum>QFrame::Sunken</enum>
+          </property>
+          <layout class="QVBoxLayout" >
+            <property name="objectName" >
+              <string notr="true" >unnamed</string>
+            </property>
+            <property name="margin" >
+              <number>1</number>
+            </property>
+            <property name="spacing" >
+              <number>0</number>
+            </property>
+            <item>
+              <widget class="WebAxWidget" name="WebBrowser" >
+                <property name="objectName" >
+                  <string notr="true" >WebBrowser</string>
+                </property>
+                <property name="focusPolicy" >
+                  <enum>Qt::StrongFocus</enum>
+                </property>
+                <property name="control" >
+                  <string>{8856F961-340A-11D0-A96B-00C04FD705A2}</string>
+                </property>
+              </widget>
+            </item>
+          </layout>
+        </widget>
+      </item>
+    </layout>
+    </widget>
+    <widget class="QToolBar" name="tbNavigate" >
+      <property name="objectName" >
+        <string notr="true" >tbNavigate</string>
+      </property>
+      <property name="windowTitle" >
+        <string>Navigation</string>
+      </property>
+      <addaction name="actionBack" />
+      <addaction name="actionForward" />
+      <addaction name="actionStop" />
+      <addaction name="actionRefresh" />
+      <addaction name="actionHome" />
+      <addaction name="separator" />
+      <addaction name="actionSearch" />
+    </widget>
+    <widget class="QToolBar" name="tbAddress" >
+      <property name="objectName" >
+        <string notr="true" >tbAddress</string>
+      </property>
+      <property name="windowTitle" >
+        <string>Address</string>
+      </property>
+      <widget class="QLabel" name="lblAddress" >
+        <property name="objectName" >
+          <string notr="true" >lblAddress</string>
+        </property>
+        <property name="text" >
+          <string>Address</string>
+        </property>
+      </widget>
+      <widget class="QLineEdit" name="addressEdit" >
+        <property name="objectName" >
+          <string notr="true" >addressEdit</string>
+        </property>
+      </widget>
+      <addaction name="actionGo" />
+    </widget>
+    <widget class="QMenuBar" name="menubar" >
+      <property name="objectName" >
+        <string notr="true" >menubar</string>
+      </property>
+      <widget class="QMenu" name="PopupMenu" >
+        <property name="objectName" >
+          <string notr="true" >PopupMenu</string>
+        </property>
+        <property name="title" >
+          <string>&amp;File</string>
+        </property>
+        <widget class="QMenu" name="FileNewGroup_2" >
+          <property name="objectName" >
+            <string notr="true" >FileNewGroup_2</string>
+          </property>
+          <property name="title" >
+            <string>New</string>
+          </property>
+          <addaction name="actionNewWindow" />
+        </widget>
+        <addaction name="FileNewGroup" />
+        <addaction name="FileNewGroup_2" />
+        <addaction name="separator" />
+        <addaction name="actionFileClose" />
+      </widget>
+      <widget class="QMenu" name="unnamed" >
+        <property name="objectName" >
+          <string notr="true" >unnamed</string>
+        </property>
+        <property name="title" >
+          <string>&amp;Help</string>
+        </property>
+        <addaction name="actionAbout" />
+        <addaction name="actionAboutQt" />
+      </widget>
+      <addaction name="PopupMenu" />
+      <addaction name="unnamed" />
+    </widget>
+    <action name="actionGo" >
+      <property name="objectName" >
+        <string>actionGo</string>
+      </property>
+      <property name="icon" >
+        <iconset>image0</iconset>
+      </property>
+      <property name="iconText" >
+        <string>Go</string>
+      </property>
+    </action>
+    <action name="actionBack" >
+      <property name="objectName" >
+        <string>actionBack</string>
+      </property>
+      <property name="icon" >
+        <iconset>image1</iconset>
+      </property>
+      <property name="iconText" >
+        <string>Back</string>
+      </property>
+      <property name="shortcut" >
+        <string>Backspace</string>
+      </property>
+    </action>
+    <action name="actionForward" >
+      <property name="objectName" >
+        <string>actionForward</string>
+      </property>
+      <property name="icon" >
+        <iconset>image2</iconset>
+      </property>
+      <property name="iconText" >
+        <string>Forward</string>
+      </property>
+    </action>
+    <action name="actionStop" >
+      <property name="objectName" >
+        <string>actionStop</string>
+      </property>
+      <property name="icon" >
+        <iconset>image3</iconset>
+      </property>
+      <property name="iconText" >
+        <string>Stop</string>
+      </property>
+    </action>
+    <action name="actionRefresh" >
+      <property name="objectName" >
+        <string>actionRefresh</string>
+      </property>
+      <property name="icon" >
+        <iconset>image4</iconset>
+      </property>
+      <property name="iconText" >
+        <string>Refresh</string>
+      </property>
+    </action>
+    <action name="actionHome" >
+      <property name="objectName" >
+        <string>actionHome</string>
+      </property>
+      <property name="icon" >
+        <iconset>image5</iconset>
+      </property>
+      <property name="iconText" >
+        <string>Home</string>
+      </property>
+    </action>
+    <action name="actionFileClose" >
+      <property name="objectName" >
+        <string>actionFileClose</string>
+      </property>
+      <property name="iconText" >
+        <string>Close</string>
+      </property>
+      <property name="text" >
+        <string>C&amp;lose</string>
+      </property>
+    </action>
+    <action name="actionSearch" >
+      <property name="objectName" >
+        <string>actionSearch</string>
+      </property>
+      <property name="icon" >
+        <iconset>image6</iconset>
+      </property>
+      <property name="iconText" >
+        <string>Search</string>
+      </property>
+    </action>
+    <action name="actionAbout" >
+      <property name="objectName" >
+        <string>actionAbout</string>
+      </property>
+      <property name="iconText" >
+        <string>About</string>
+      </property>
+    </action>
+    <action name="actionAboutQt" >
+      <property name="objectName" >
+        <string>actionAboutQt</string>
+      </property>
+      <property name="iconText" >
+        <string>About Qt</string>
+      </property>
+    </action>
+    <actiongroup name="FileNewGroup" >
+      <action name="actionNewWindow" >
+        <property name="objectName" >
+          <string>actionNewWindow</string>
+        </property>
+        <property name="iconText" >
+          <string>Window</string>
+        </property>
+        <property name="shortcut" >
+          <string>Ctrl+N</string>
+        </property>
+      </action>
+      <property name="objectName" >
+        <string>FileNewGroup</string>
+      </property>
+    </actiongroup>
+  </widget>
+	<customwidgets>
+		<customwidget>
+			<class>WebAxWidget</class>
+			<extends>QAxWidget</extends>
+			<header>webaxwidget.h</header>
+		</customwidget>
+	</customwidgets>
+	<connections>
+    <connection>
+      <sender>addressEdit</sender>
+      <signal>returnPressed()</signal>
+      <receiver>actionGo</receiver>
+      <slot>trigger()</slot>
+    </connection>
+  </connections>
+  <layoutdefault spacing="6" margin="11" />
+  <images>
+    <image name="image0" >
+      <data format="XPM.GZ" length="1241" >789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade65232365200210543251d2e253d856405bffcbc54103b11c8563600020b03105719c4b530b08072f50880513560a09c080338d5209420294a4451a38c90426621ab5146d10de524a2aa417505445122861a547722bb0c971a3d2aa921c2ae446c6a9431fc85a9064551220e354009653dec00294e712a1ac4e97078a9a9b5e6020013b3f563</data>
+    </image>
+    <image name="image1" >
+      <data format="XPM.GZ" length="4494" >789ce596497332470c86effe15947573a5f4c1cc30cc542a07ef60bc808dd7540e3d9b6df006186c93ca7f8fba2535ce57be98dc9292313c487a2575f7ccf063a376d53baa6dfc589bbe9ad7fbbc96df99496da3983d3e7efcfec76f7faead87418dfe1a51500bd67f595befbfd6f2daf1f35369014e08a05e6fd4ab96e31e73d0282bc7a7cae23ff3ccfe8170ca6cee9843f51f3b4ec8cff9efccdebf2d2cf9b06bb9417a25c74f98bdff99390a84fb8e49af70f39891b2e40bfbf8b6b0917e87968346a8f5a6cc51c07ab02f2cf1983237552f709c86691e3bbd5be5821998a32067bd1765d13f67563d530a4b3df8b01c523d8ec74059faed086bfc82390e851b8ed3c86485e34365a9bfc5ece3df8433e10bcb5140f5dd3cf0e099f32f99e350cecb5858f2b1c1dc52fda663d334a277c0ecfd5d61c9373973120967969b548fd71b079e797d8e985b21eb63aecceb85e7c299f4ffaa2ce7739359ebc195631387c6ad1f5e302791ccbba72cf173e15cfa2d2cc7619cf1fa63c9dccaa4ff4bcfdc7fa82cfdf7999348f6bf299c4bfd4c59ea0f99535dafca71d60a65ffebca52ff8c3989e47cce98351fb785759e7bcbad65bf0be624ca9a8e87caac0fb1702ef191b2cc9731a7b9ec4f87d934659e27e142f8c671e6eb9d0ae7b2be07cc6924ccf999698a7e4f58f572e64cebb9f393444994e68e4365d9ff7be15caef70766ad678cb0f8f18359ebe109b3af27f199fadd794cf254eb196599774758e77d5496f5dd64a67959af122ef87c639b59eb81d34ba97fe3f4215196f3922acbbc28acf527cc792c7a857029ecf63bcded05efb8a52cf3cc9833ed2f66563dac0b8b1ebe3317ea77f73352173db8f6ccf54a66df0f30fb7c777d9bc214d2cf88d9cf73cfece3ddf3296b66da7fe199d7a32b5cc8feef31fbfe8f99bdde96b0faddf3272bac390665b99e90d9e7ef33972de9d73d7ff3d873255c49fc1b73257ee4f8d2eb5d336b3e8e8535ff86d9e7bbf35f2cf51366ef77cfeb6299df62563f3c0a8b1fdcf3d3569778773f756e66f7fcac967e175f797ffff5dfd9ff4103010d6698a35955030b2cb1c25bbcc3fbd5344861882352b8c5077c5c45836678c267ca7fc1314ebeaf81537cc599eb608e6ff88e1f2b682c705314b6486182dbb8f31d0ddca529f644619ff2db641d3cf82a8bfa9d62d7da670d3cc4233c760a63eaa08d2734478fac8f87ffc833788a6738c073bc20ebe3255eb1069d863e5e3b851bacfb7c6b0d0c30c488f24a3a2d4ddaf1986a3d600b13179be280ef597809e876e206000c69d8ec0e590f32c8a18012b7a0825b9799e018eee0de4e0b4318c103ff2ea2985b78c47d28a487ce276b634cca40356d1655801c3bf044af2136e0195ef8b711be4045ab50ff42e16bdbb6463d8e610253fe3d4855ec3ed80abd9f62397ef9c9e6cee835249bc31bbc731ff0010beacbcdbfaca29f2836a3e839fd1f3acb5cb6fd6e13b6605b34766097d6664cdf0d7faad9813dd827df08daf4de812ddaa7061c4017baf43ea6daef70c8fb0247704c932dc897b94e67da09553a811ef4a94a0f4ee10c069435216b630ae7a43b800b7fc6164ea543ea73ea75663b22a50e5cc215ec50956beaf606ead08080147b64c76403d20ebdc6142268528d3655ee3a1db6f88b535ee015b42081d4205ee1f4f335878501ea7644331dc81acecdb7ef63b86b32eae59956cff63237f92af7319c9a82669c989256bd0b6fa6fabe86bbfe0ecdadb9a399ce61b49a86355adfbedd45736756bc27b30afd161a9a9179585de33bf69fd2f8ebd7b5bf014644b906</data>
+    </image>
+    <image name="image2" >
+      <data format="XPM.GZ" length="4494" >789ce5965b4f23471085dff915d6d6db2aaac5e3b92aca037703cbc55c8c21ca43cf8c8d0dd85c6c307694ff9eeaaed3bd68771f968d14298a0a109fabebd4e99a9ef17cfad8e81d1f343e7e5a99cecc6c5435aaa1796a7cac9fc7e3c5ef7ffcf6e7ca8756d4909f661c35a20fbfac7ce8cc1a55e3f07ed2b7409702b4badaccfb996563020f5c7ecbf340b9a31c3591dff7ac7943e002cc8e73cf74acdcc27a8a2d37a5be4e1d9f04567f9fc105f25dcfea9726caad62a07c1158f58f94e3087e868ea57fa5fa0be590bfb11c3525affd4e03ebfa25b8507fbcaa1c47ca66e459fdf10c6c30af4dcfda8f5f9513dfffce71e1f5a956967adddfaeb25f4f7b60e8d199e596f42f6bc787ca213f554e5be06dc7a28ffdee282791cedb5c83d19fd795a55ecf4b3fb0ee07ebd312fae796e3283665e238524e2265de031bcc774d396d61be25b8c4fe1f02abfeab67f49f2867decfbd6393b6a03f03438f3bca19fa51cb33fc6f80fd7eae2c27e257e7cb4de5b4045f78d679f24960ddcfb172e6f73357ce63e88fc115ce43e558fcabbeb905fb7e47cae24ff5daca41af007bbd81e5b425f53aff6160d52f95f318f37d01a39ee7ca05f4790a469e0e1c97590bfa1b81f53c3e2bfbf5ecf697b532efe754398f31af437085eb65948b18e723f70cbf9e2bcc633db0f65b533609fcbafb372bf318fdcfc015e65b281731ee0ff6acf70767ca5e8f7be01abcab5cfa7e89e53cce2ba3fd1681b5df8172013f44e00acfbf4a39e8ef287b7dbe02234feefce795d727a36c12ccf75239d4b7c1bede9def42fcc0ef7960d5cbc05ebf543635aed752b94aa1ff02ee83ddf3b6a87c3d3f2b9b047a4fcaa17e0cf6f5eef928ab13f5476960d5eb7ac6f5dd07d7e04839e83d29d7be9ffbfe31b50dc723cfa87f08acf947e51a7ad457ee6760773ecaa4f47e36036bfd96673c3fb6c13578a01cf41f9505d5af3b2f655dc28fa93da33e550ef523e5e06f08861eb9e7b94cdfe7ddf753d50feb6f94437e00f67edcf3aa4e831ed8afe73bb05fefe655f7c37edcfd62bb81ddfb82935776cfeb41c87766ff2cfe7f1a4c6cb8e48ae91f68d4dce7015ff390473fad71c3b77cc7639ef03d3ffcb48f013ff293a84c79c6d54f693c8bc28b28589539bff2e2ed647e586389184bacf13a6ff0e6d71a32f92dde96bfdf9dbccc6387dba2d086caae4c668ff7bf68f0673ee0433ee263eef0099ff2199f8b62d0e32e5f704fea2fe5b70d3f57729556b91b349a1c718b634e64faa9fc7fc919e772220a91213254ca273b884bf72b4a54f1846ad925e93b1af56940d734a4110fe4efb5c40dddda907311734c7752d10b3a1ae289c634a17b7dafe331e995b3b124fbdfd25d85471763596fab7aa2a4f53d444653ded3773bb96e8faeae1de2ea8dff9da0b0ebfcd858e3357aa667bb1f68b4a5e7d256853559e8f56d64aefe85e6f44a0b5aea3bac5c2bebf74b8775fb6bfbb858771e7a6f1df09c36f89a36698bb6f53d5c4ef08ee4e6a2dd269b9d488729ed4a171b7bd40ece3228cce5d305edd3673ed7773139bd133a14d5233a96cff7a9237142a77446e7125dba900e70681564f5a6acdc1285ae9e0feaf150d675e8d2d59dd315ad52931fec2973d1a5489c6698e29c5a508829797bd629a52665bcf9fdd32ed95c1d50217b5c18b67390f34befb8e78873a9b6b39ad285216328a2de3bef5b32a59db5ccec42a6b565aaf7dffba6e663d3972b211ea86b065f3cbccbc7b53890399a21a55f677f5863e4f670c337df667f58e3d6dc99dbef3dd5ff6bdf73ff82c65fbfaefc0d4fb5b868</data>
+    </image>
+    <image name="image3" >
+      <data format="XPM.GZ" length="802" >789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade65232325500210543251d2e25658564056503300071f540dc3430007371012a492a830156496538c094848922c9c2259134c099304914e3604c8424aa5e6449b0044216ca824ba2da8b4512218b4d122e8b55520fee5974072164511da487ea490c7f22cba249e20d3efc018f3fcae0d2702eb5d2106992b5d65c00b9a48974</data>
+    </image>
+    <image name="image4" >
+      <data format="XPM.GZ" length="1241" >789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade65232365200210543251d2e253d856405bffcbc54105b19c8563600020b03103711c4b530b08072f50880513524ab518681443435ca984ae08ae06a94114a10ac443435ca3043904d4c4453a38ca604ae11590d9a0ab80bd0d46078914c35c4d885a608871a547f61f81d5d117a1862018930e5b8d5c0950c741a1b1e6a6aadb90086a9d853</data>
+    </image>
+    <image name="image5" >
+      <data format="XPM.GZ" length="5598" >789ca5985973db480ec7dff3295cc15b6a0b2351a428d6d63ef83e255bbe647b6a1fd02465dd872d9f53f3dd076c005dc926ce6a32eed8553f37fadf7fa0c1a69cdfbe6cdc9cb537befcf6e97145ab61be910fe861e34bf1349dbefdfedffffcf1e97323dae07f51bdbe117dfed7a7cfddd546bed199cfca0ae888016afeab62e8796ef110ee545caf05be16ae5bfc6ee096e7b6e756983f51b6f53b81257ecfb8eee7e9b162f66af1c78125fe48987f23f3fb81657e691cd5bddecc7316d555efd058f7eb2867aa771058f4de8c55cffb6dd4a34cf5b68d357e681c6515634db81a7e3ef59c35cccf5560bf9ef6953389c77660af074f15c751e05c38a6d81f2ef9f3a848f4e9d658f2c36b635dbfa54cc2383556bd33e12492fc70df38f1f3f8ae4cc2745a711285fda7caa4f95e06967a2d8c63f27a8fc2a60fa4acfa980a371b898f0767dc6cf8fdbc9f84c27e4de124d2fabe186b3dee8c75ff1365dbef2db0ccef0987fd2f2a6632fd576552fd2b63d57b08ecd7d39d70b321fd0560acfb6d1a4b7e3050764de7d79f08a70de937ea7b7689e68f4de1e0776e2c7ab8abecb47eb170aa7ee822b0e89f1b4b7fd24dc529abe9794f02cbf99e2b3badc7a5b1ee97089b3e0e8d253f3c364e253e5576120ff7c63a9f7966d2e771d358e75bca4ef3bb0e2cf9758db5fe47c6b21eeb81bd3f07c2ad58ebd130d67e6a194b3cf97e62b2fa24c67a1f5d2aab3f8781a53e17c6eaa7082cfa3de156acf9d5034b7e3563f1eb96c6eaf7c0b815fbf8d2739e3aedefb1b1de9723618b77a49cebf946c6e20f5f8d251e753e8b5bb9e74c980a4afc7a7fbf66b1ed8fb7c67a9ec7c2ad5cfd74038bdfa6b1f6cbd458fd2e84b358efbb0363f5b71358fccd8c33596f9c4bfddcc458fac78d8cf5797b3296f5f82c4c49e6f5c9bf9fb23ce41307967e3935d6f36c0b67b1ce3f188b5f3757367f5363b98fdc38b0cc0f8cf5f90bf3ea97028bfe50981289777d63edcf81b1c4439897f3c52d615738cfe0df371c1deb7db265acf98d8d253f7a50d67a60c758cfcbf4cc7f2fb0f8bf1736bfae30d6f35f1a4b3ce6c6e2df95ca85f6f7dc58f3db0e5c783e14e6ebc533e87e963fbe0873f9fd3cc97c91693fd028b0d4e3c558f3eb0b9b5f972bab3fe78c353f3056bfabc0e2371636bfe4cf9b29d1e76b69acfdb863accfd33cb0dc2fa7c6e2179e03cb79ae940b7dffbf1b6bfd1363f53b12367f581a6b3d1bca56df6e60a9bfc6e765def4ecef6bc7eafaf9e8d558fbb7a15ce87d7263acf7ffbdb1e40f33e1e0cf29ebfea8eb6d7ff29f17f8f4137dfe51d8fa0117ca65ee3fbfe3bd705116b2de9f775e3af50313e1a229f1f0682cf1b052e6e1d9dfbf1cddd4fd2363cdcfef5fb05b7d1f0c944bed4f67ac9f5f27c265bf4c3d9f07eefb787f1f96695eaa1e0a174d7d7f81b1ee4f81a5fe75e552d9bf1fca7e617e9e8d556f33b0c4fbcf5ffdb44c956bc6a2d75dfd6c2020fd3ce2ff69a0c31c0b2cff91461fef71804374bfaa81231ce3044b9ce2ecd734380fc2392e70890ff888bfa6f184cff8c24e5ef10ddf71f3a37c3ed6c015afdec26dfeb983bbb887fb78f0f734380fe031c7437f3247788c27d8fe713e1f6a1076f014cfb08be7ac7481977885d75c951fe4f3630dcea3c3eb7b9cc70d6b9ce12d9fee26de610debeb69b0fb578cb89a0d8c399711e794609373d9c39455f2b53466d8c20c17809c45cc7a3c00f011081cffccff379fef35388f1d0428a0c401f459e58c3d45700f0003cee71d8678fc730d7430e2557d3c8331f7568c37308129cc7006733e9d262c6008cb6ff3f94ea3c72bc678ca3f1fb80a637884154c71c974c55d72c91a4feca4fdf553f8ad46554d8e9ee30a9eb1efab31611f2ff0ca346427bb9c11e114debe7e7ebed328318702e7f0ce9dbee47a1c724655b745b0c94ea6b0c55519f059b98f73d19a6cc30eecc21eecfb7100877004c770026de8e070bdfe805338832e9cc3055cc2955f7b0d3de8f0cfebb5356ee016eea0c6a30e11342086049a907aadcd35355a90111250f5e5288706bfdb4bea572a78b49e06ddd3a0d2807a2502110d6944639ad09466ebf9e8ae684e0bf5b1a4075ab28f11ffa1df678dc7f57cb0c68a9ee899355e7c2ddbf40a31bdb1c63bcdfe86c6803669cb9f4555c76b38a76dcee57d5d1f5c8f1d5af0b9745581bb029a5c8f3eedd21eed73b70ebe56fa91061dd061f05139e9d1116b1cfb9aee55c4fcf6330d5cd289d778a6b65fdd831dea702e256b9cf2b974a84367d4fd580347744e17744957acc13e7cfc095d538f356ed8cd2ddd518dea147da4c1956890ffcf295ed5e4c83b4a59f182b9455935e3b801ab791c7fa4e188d7a4bcbee66353feaef9df8852ca2f3e9ee3ef73840f359cabfec22979f4ddbd1bf018ba118f318f899bf298b9b95bb8e537cffe9ffffef4171c39a0bf</data>
+    </image>
+    <image name="image6" >
+      <data format="XPM.GZ" length="3742" >789c8d96c9521c490c86ef3c458775734cc8ddd5b5c6c41c303b180cc60b66620eaacc2c9aa5599b7562de7da45fc5180c8e98fa39f091522e4a49c9bbb783bdedcdc1db77735733991d864198c8e5e06dbc9e4eeffffceb8fbfe7de64d9407f466531c8defc36f76667360883adb3d364c013051ae2039f8147266359068f4dc6740a2e4db05f05d726f0253898c017c6a3cc04ffafce79aa3af0143c36c17e055caa0aacbf06aeb2203e5f09ae4d185f75ce472de6e7737063c2fcb57356b702fed673e32c473d4bcf3760198f02e69325706b022f3a676df0f567e05035d1ed273dc79883e7c1d1045e70ae2456d84fd9738a589f0b703261bc72ae25e17ee4b0e7d8f3b5733374e603e32c37c11ff36970db12f193f7e07c1c6bec87c6e0c604ff0e1c4db03f36cec7e3a6f4fd2e38e779eee7bd05e7e350fa7e4fc0455ee6b84fb9eab913bfdf1c5ce5758efba54fffb1e75302d726f8af3817a5f8f922584cf06fc0211f951ebfd0b30afe07ce4510dfdf1e38e665e9f9f1e01c32cf1fda06a73c2f7c7eac5f8c8b61eef582f315b909dc82f1c17e07dc1459e5f1c77d953abb787e0ab832611cf957366dd9c707f556762a3fcf8673ddd6d8afdc1957b909fe98af2a65d4c787c08d09e3c8bfaad504f378de83a309e35fc049d9d747bda19c7dbe8f602d88d6fd11af3a33c1ffde398e02ec69178c0b04bb7fa12be03e08e7ab4b895e2f74ec1ca2e73f6d811b2d37df1feaa9969082f71ff4a73a98c01f9cdb3678fde27eea58f7f9cdc8bfba33c11efda2199ac01bcead048fd72678a4e9e3f6a86f6d172acc87fc69f290f9386f3d72f478a1bf348509fea8b7a66c9b80fec1a8b7a66a53f47cc2fe9b5ae77346fe35ad09e761703081d12f9b68c2fc57ce6d0c1e6fe463934ce0efc63234c11ffd5b4a13c66f9cb53d79fded832bcd27f47f5aeb59055e744eb1df3fe2251aeee4e7453f9264c27aa847b44f7f4f909fda3efb7ae30c5c84b65f1fef435b9a608ff7a4ad4c981ffb6b6b13d8fda5edfb37eff4dcb65e2f787f5a7cb0f7fd0413ecf13eb49d09f6783ff07cf97d8ec0a3f8d8df516f483faf07c45b1f27e9f30ff989e9fdbe11ff1034fd3c9eebe068c238fa9f6677f2fb27ac1f475dd3f97da25fc6c204be755673ef3f8db3360c1f1f824b13c651df2877c44fd0df511efe5ea39f44318151cf9a4e2ab0af870d63fee4dc55fdfe109f880ff3fb788a8ff98df733762630fa471aa6febda2839e5b3f0fe1bef4f18bc9fb01fa7dca4ce0bb9e5b671ef69c3cff18f99cc626d853cf551f3fe453ca531bbdde979cbb2c793e207f536102a39fa5ca0446bf4279f97b89feaabb5181511f38bedf2ffa47373461bdcfe0dc8471d46387860fc6fbaad155c11ef7a5d953747ede69cf2a30fe3fd06c5121fe88572726f8a37f68720ffbfdadf7ac02fb7e82098c7e85ebf2fde37dea92098cf7acc367bc33fbff7a6ecfc4c22d078eaac41d1ff0e4d7f66a7df84293e71ecfec858f9ee8d1fef8a9c733fb139ef2299ff1395ff0255fc167c233befee1f1cc3ef10ddff21ddff303cfabe77bd584177891971e3d7ed8db4e7b2df30aaff29a7aac3ff9ebe4a9bdf2067fe04ddee28ffafb36eff027de558fcfbaab2ffc95bf3db5578b3dfecefb3ce411673c56ceb9e0b23f47a5fbac7fb26f889988742f2a129e504b81a246e0c8ec293cb7a7441d0b1dd0840ee9883486744253bea4533a7bd5fe9c2ed4feb29fff4aff32a36b8dd5e92fe6bfa15bddcf1dddd303cd93c6911668aa2b5cbc363f3c16799f9630fbb2d20aadd21aadeb3d547a8617f6f0d8a00fb4495bfadb47daa61dfa84f977e933c597f64f6e6c9fbed057fa467bf49df669c8bb34a2eca53d8d35576ef88e722aa8a48a6a6a448320a20fd36bf3eb7f407c2c89efb5500f6422877224c77222533915e6b397fbd117f54ccee54275295732936bb9915bb9937b797869ff34e7649ecfe4bd2ce81a8bbc2a4bb2fc5a3dfe2c59915559fb75fdfe8f7affe7f7b97f011cdd9635</data>
+    </image>
+  </images>
+</ui>
diff --git a/examples/activeqt/webbrowser/webaxwidget.h b/examples/activeqt/webbrowser/webaxwidget.h
new file mode 100644
index 0000000000..0e82311f33
--- /dev/null
+++ b/examples/activeqt/webbrowser/webaxwidget.h
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WEBAXWIDGET_H
+#define WEBAXWIDGET_H
+
+#include <ActiveQt/QAxWidget>
+#include "windows.h"
+
+class WebAxWidget : public QAxWidget
+{
+public:
+    
+    WebAxWidget(QWidget* parent = 0, Qt::WindowFlags f = 0) 
+        : QAxWidget(parent, f)
+    {
+    }
+protected:
+    virtual bool translateKeyEvent(int message, int keycode) const
+    {
+        if (message >= WM_KEYFIRST && message <= WM_KEYLAST)
+            return true;
+        else
+            return QAxWidget::translateKeyEvent(message, keycode);
+    }
+
+};
+
+#endif // WEBAXWIDGET_H
diff --git a/examples/activeqt/webbrowser/webbrowser.pro b/examples/activeqt/webbrowser/webbrowser.pro
new file mode 100644
index 0000000000..992d871a2e
--- /dev/null
+++ b/examples/activeqt/webbrowser/webbrowser.pro
@@ -0,0 +1,17 @@
+TEMPLATE = app
+
+CONFIG += qaxcontainer
+
+QTDIR_build:REQUIRES = shared
+
+HEADERS  = webaxwidget.h
+SOURCES	 = main.cpp
+FORMS	 = mainwindow.ui
+wince*: FORMS = wincemainwindow.ui
+
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/webbrowser
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS webbrowser.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/webbrowser
+INSTALLS += target sources
diff --git a/examples/activeqt/webbrowser/wincemainwindow.ui b/examples/activeqt/webbrowser/wincemainwindow.ui
new file mode 100644
index 0000000000..98a9ddb715
--- /dev/null
+++ b/examples/activeqt/webbrowser/wincemainwindow.ui
@@ -0,0 +1,299 @@
+<ui version="4.0" stdsetdef="1" >
+  <class>MainWindow</class>
+  <widget class="QMainWindow" name="MainWindow" >
+    <property name="objectName" >
+      <string notr="true" >MainWindow</string>
+    </property>
+    <property name="geometry" >
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>812</width>
+        <height>605</height>
+      </rect>
+    </property>
+    <property name="windowTitle" >
+      <string>Qt WebBrowser</string>
+    </property>
+    <widget class="QWidget" name="centralWidget">
+    <layout class="QHBoxLayout" >
+      <property name="objectName" >
+        <string notr="true" >unnamed</string>
+      </property>
+      <property name="margin" >
+        <number>0</number>
+      </property>
+      <property name="spacing" >
+        <number>6</number>
+      </property>
+      <item>
+        <widget class="QFrame" name="Frame3" >
+          <property name="objectName" >
+            <string notr="true" >Frame3</string>
+          </property>
+          <property name="frameShape" >
+            <enum>QFrame::StyledPanel</enum>
+          </property>
+          <property name="frameShadow" >
+            <enum>QFrame::Sunken</enum>
+          </property>
+          <layout class="QVBoxLayout" >
+            <property name="objectName" >
+              <string notr="true" >unnamed</string>
+            </property>
+            <property name="margin" >
+              <number>1</number>
+            </property>
+            <property name="spacing" >
+              <number>0</number>
+            </property>
+            <item>
+              <widget class="QAxWidget" name="WebBrowser" >
+                <property name="objectName" >
+                  <string notr="true" >WebBrowser</string>
+                </property>
+                <property name="focusPolicy" >
+                  <enum>Qt::StrongFocus</enum>
+                </property>
+                <property name="control" >
+                  <string>{F5AFC7EF-1571-48B6-A69C-F1833F4C3A44}</string>
+                </property>
+              </widget>
+            </item>
+          </layout>
+        </widget>
+      </item>
+    </layout>
+    </widget>
+    <widget class="QToolBar" name="tbNavigate" >
+      <property name="objectName" >
+        <string notr="true" >tbNavigate</string>
+      </property>
+      <property name="windowTitle" >
+        <string>Navigation</string>
+      </property>
+      <addaction name="actionBack" />
+      <addaction name="actionForward" />
+      <addaction name="actionStop" />
+      <addaction name="actionRefresh" />
+      <addaction name="actionHome" />
+      <addaction name="separator" />
+      <addaction name="actionSearch" />
+    </widget>
+    <widget class="QToolBar" name="tbAddress" >
+      <property name="objectName" >
+        <string notr="true" >tbAddress</string>
+      </property>
+      <property name="windowTitle" >
+        <string>Address</string>
+      </property>
+      <widget class="QLabel" name="lblAddress" >
+        <property name="objectName" >
+          <string notr="true" >lblAddress</string>
+        </property>
+        <property name="text" >
+          <string>Address</string>
+        </property>
+      </widget>
+      <widget class="QLineEdit" name="addressEdit" >
+        <property name="objectName" >
+          <string notr="true" >addressEdit</string>
+        </property>
+      </widget>
+      <addaction name="actionGo" />
+    </widget>
+    <widget class="QMenuBar" name="menubar" >
+      <property name="objectName" >
+        <string notr="true" >menubar</string>
+      </property>
+      <widget class="QMenu" name="PopupMenu" >
+        <property name="objectName" >
+          <string notr="true" >PopupMenu</string>
+        </property>
+        <property name="title" >
+          <string>&amp;File</string>
+        </property>
+        <widget class="QMenu" name="FileNewGroup_2" >
+          <property name="objectName" >
+            <string notr="true" >FileNewGroup_2</string>
+          </property>
+          <property name="title" >
+            <string>New</string>
+          </property>
+          <addaction name="actionNewWindow" />
+        </widget>
+        <addaction name="FileNewGroup" />
+        <addaction name="FileNewGroup_2" />
+        <addaction name="separator" />
+        <addaction name="actionFileClose" />
+      </widget>
+      <widget class="QMenu" name="unnamed" >
+        <property name="objectName" >
+          <string notr="true" >unnamed</string>
+        </property>
+        <property name="title" >
+          <string>&amp;Help</string>
+        </property>
+        <addaction name="actionAbout" />
+        <addaction name="actionAboutQt" />
+      </widget>
+      <addaction name="PopupMenu" />
+      <addaction name="unnamed" />
+    </widget>
+    <action name="actionGo" >
+      <property name="objectName" >
+        <string>actionGo</string>
+      </property>
+      <property name="icon" >
+        <iconset>image0</iconset>
+      </property>
+      <property name="iconText" >
+        <string>Go</string>
+      </property>
+    </action>
+    <action name="actionBack" >
+      <property name="objectName" >
+        <string>actionBack</string>
+      </property>
+      <property name="icon" >
+        <iconset>image1</iconset>
+      </property>
+      <property name="iconText" >
+        <string>Back</string>
+      </property>
+      <property name="shortcut" >
+        <string>Backspace</string>
+      </property>
+    </action>
+    <action name="actionForward" >
+      <property name="objectName" >
+        <string>actionForward</string>
+      </property>
+      <property name="icon" >
+        <iconset>image2</iconset>
+      </property>
+      <property name="iconText" >
+        <string>Forward</string>
+      </property>
+    </action>
+    <action name="actionStop" >
+      <property name="objectName" >
+        <string>actionStop</string>
+      </property>
+      <property name="icon" >
+        <iconset>image3</iconset>
+      </property>
+      <property name="iconText" >
+        <string>Stop</string>
+      </property>
+    </action>
+    <action name="actionRefresh" >
+      <property name="objectName" >
+        <string>actionRefresh</string>
+      </property>
+      <property name="icon" >
+        <iconset>image4</iconset>
+      </property>
+      <property name="iconText" >
+        <string>Refresh</string>
+      </property>
+    </action>
+    <action name="actionHome" >
+      <property name="objectName" >
+        <string>actionHome</string>
+      </property>
+      <property name="icon" >
+        <iconset>image5</iconset>
+      </property>
+      <property name="iconText" >
+        <string>Home</string>
+      </property>
+    </action>
+    <action name="actionFileClose" >
+      <property name="objectName" >
+        <string>actionFileClose</string>
+      </property>
+      <property name="iconText" >
+        <string>Close</string>
+      </property>
+      <property name="text" >
+        <string>C&amp;lose</string>
+      </property>
+    </action>
+    <action name="actionSearch" >
+      <property name="objectName" >
+        <string>actionSearch</string>
+      </property>
+      <property name="icon" >
+        <iconset>image6</iconset>
+      </property>
+      <property name="iconText" >
+        <string>Search</string>
+      </property>
+    </action>
+    <action name="actionAbout" >
+      <property name="objectName" >
+        <string>actionAbout</string>
+      </property>
+      <property name="iconText" >
+        <string>About</string>
+      </property>
+    </action>
+    <action name="actionAboutQt" >
+      <property name="objectName" >
+        <string>actionAboutQt</string>
+      </property>
+      <property name="iconText" >
+        <string>About Qt</string>
+      </property>
+    </action>
+    <actiongroup name="FileNewGroup" >
+      <action name="actionNewWindow" >
+        <property name="objectName" >
+          <string>actionNewWindow</string>
+        </property>
+        <property name="iconText" >
+          <string>Window</string>
+        </property>
+        <property name="shortcut" >
+          <string>Ctrl+N</string>
+        </property>
+      </action>
+      <property name="objectName" >
+        <string>FileNewGroup</string>
+      </property>
+    </actiongroup>
+  </widget>
+  <connections>
+    <connection>
+      <sender>addressEdit</sender>
+      <signal>returnPressed()</signal>
+      <receiver>actionGo</receiver>
+      <slot>trigger()</slot>
+    </connection>
+  </connections>
+  <layoutdefault spacing="6" margin="11" />
+  <images>
+    <image name="image0" >
+      <data format="XPM.GZ" length="1241" >789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade65232365200210543251d2e253d856405bffcbc54103b11c8563600020b03105719c4b530b08072f50880513560a09c080338d5209420294a4451a38c90426621ab5146d10de524a2aa417505445122861a547722bb0c971a3d2aa921c2ae446c6a9431fc85a9064551220e354009653dec00294e712a1ac4e97078a9a9b5e6020013b3f563</data>
+    </image>
+    <image name="image1" >
+      <data format="XPM.GZ" length="4494" >789ce596497332470c86effe15947573a5f4c1cc30cc542a07ef60bc808dd7540e3d9b6df006186c93ca7f8fba2535ce57be98dc9292313c487a2575f7ccf063a376d53baa6dfc589bbe9ad7fbbc96df99496da3983d3e7efcfec76f7faead87418dfe1a51500bd67f595befbfd6f2daf1f35369014e08a05e6fd4ab96e31e73d0282bc7a7cae23ff3ccfe8170ca6cee9843f51f3b4ec8cff9efccdebf2d2cf9b06bb9417a25c74f98bdff99390a84fb8e49af70f39891b2e40bfbf8b6b0917e87968346a8f5a6cc51c07ab02f2cf1983237552f709c86691e3bbd5be5821998a32067bd1765d13f67563d530a4b3df8b01c523d8ec74059faed086bfc82390e851b8ed3c86485e34365a9bfc5ece3df8433e10bcb5140f5dd3cf0e099f32f99e350cecb5858f2b1c1dc52fda663d334a277c0ecfd5d61c9373973120967969b548fd71b079e797d8e985b21eb63aecceb85e7c299f4ffaa2ce7739359ebc195631387c6ad1f5e302791ccbba72cf173e15cfa2d2cc7619cf1fa63c9dccaa4ff4bcfdc7fa82cfdf7999348f6bf299c4bfd4c59ea0f99535dafca71d60a65ffebca52ff8c3989e47cce98351fb785759e7bcbad65bf0be624ca9a8e87caac0fb1702ef191b2cc9731a7b9ec4f87d934659e27e142f8c671e6eb9d0ae7b2be07cc6924ccf999698a7e4f58f572e64cebb9f393444994e68e4365d9ff7be15caef70766ad678cb0f8f18359ebe109b3af27f199fadd794cf254eb196599774758e77d5496f5dd64a67959af122ef87c639b59eb81d34ba97fe3f4215196f3922acbbc28acf527cc792c7a857029ecf63bcded05efb8a52cf3cc9833ed2f66563dac0b8b1ebe3317ea77f73352173db8f6ccf54a66df0f30fb7c777d9bc214d2cf88d9cf73cfece3ddf3296b66da7fe199d7a32b5cc8feef31fbfe8f99bdde96b0faddf3272bac390665b99e90d9e7ef33972de9d73d7ff3d873255c49fc1b73257ee4f8d2eb5d336b3e8e8535ff86d9e7bbf35f2cf51366ef77cfeb6299df62563f3c0a8b1fdcf3d3569778773f756e66f7fcac967e175f797ffff5dfd9ff4103010d6698a35955030b2cb1c25bbcc3fbd5344861882352b8c5077c5c45836678c267ca7fc1314ebeaf81537cc599eb608e6ff88e1f2b682c705314b6486182dbb8f31d0ddca529f644619ff2db641d3cf82a8bfa9d62d7da670d3cc4233c760a63eaa08d2734478fac8f87ffc833788a6738c073bc20ebe3255eb1069d863e5e3b851bacfb7c6b0d0c30c488f24a3a2d4ddaf1986a3d600b13179be280ef597809e876e206000c69d8ec0e590f32c8a18012b7a0825b9799e018eee0de4e0b4318c103ff2ea2985b78c47d28a487ce276b634cca40356d1655801c3bf044af2136e0195ef8b711be4045ab50ff42e16bdbb6463d8e610253fe3d4855ec3ed80abd9f62397ef9c9e6cee835249bc31bbc731ff0010beacbcdbfaca29f2836a3e839fd1f3acb5cb6fd6e13b6605b34766097d6664cdf0d7faad9813dd827df08daf4de812ddaa7061c4017baf43ea6daef70c8fb0247704c932dc897b94e67da09553a811ef4a94a0f4ee10c069435216b630ae7a43b800b7fc6164ea543ea73ea75663b22a50e5cc215ec50956beaf606ead08080147b64c76403d20ebdc6142268528d3655ee3a1db6f88b535ee015b42081d4205ee1f4f335878501ea7644331dc81acecdb7ef63b86b32eae59956cff63237f92af7319c9a82669c989256bd0b6fa6fabe86bbfe0ecdadb9a399ce61b49a86355adfbedd45736756bc27b30afd161a9a9179585de33bf69fd2f8ebd7b5bf014644b906</data>
+    </image>
+    <image name="image2" >
+      <data format="XPM.GZ" length="4494" >789ce5965b4f23471085dff915d6d6db2aaac5e3b92aca037703cbc55c8c21ca43cf8c8d0dd85c6c307694ff9eeaaed3bd68771f968d14298a0a109fabebd4e99a9ef17cfad8e81d1f343e7e5a99cecc6c5435aaa1796a7cac9fc7e3c5ef7ffcf6e7ca8756d4909f661c35a20fbfac7ce8cc1a55e3f07ed2b7409702b4badaccfb996563020f5c7ecbf340b9a31c3591dff7ac7943e002cc8e73cf74acdcc27a8a2d37a5be4e1d9f04567f9fc105f25dcfea9726caad62a07c1158f58f94e3087e868ea57fa5fa0be590bfb11c3525affd4e03ebfa25b8507fbcaa1c47ca66e459fdf10c6c30af4dcfda8f5f9513dfffce71e1f5a956967adddfaeb25f4f7b60e8d199e596f42f6bc787ca213f554e5be06dc7a28ffdee282791cedb5c83d19fd795a55ecf4b3fb0ee07ebd312fae796e3283665e238524e2265de031bcc774d396d61be25b8c4fe1f02abfeab67f49f2867decfbd6393b6a03f03438f3bca19fa51cb33fc6f80fd7eae2c27e257e7cb4de5b4045f78d679f24960ddcfb172e6f73357ce63e88fc115ce43e558fcabbeb905fb7e47cae24ff5daca41af007bbd81e5b425f53aff6160d52f95f318f37d01a39ee7ca05f4790a469e0e1c97590bfa1b81f53c3e2bfbf5ecf697b532efe754398f31af437085eb65948b18e723f70cbf9e2bcc633db0f65b533609fcbafb372bf318fdcfc015e65b281731ee0ff6acf70767ca5e8f7be01abcab5cfa7e89e53cce2ba3fd1681b5df8172013f44e00acfbf4a39e8ef287b7dbe02234feefce795d727a36c12ccf75239d4b7c1bede9def42fcc0ef7960d5cbc05ebf543635aed752b94aa1ff02ee83ddf3b6a87c3d3f2b9b047a4fcaa17e0cf6f5eef928ab13f5476960d5eb7ac6f5dd07d7e04839e83d29d7be9ffbfe31b50dc723cfa87f08acf947e51a7ad457ee6760773ecaa4f47e36036bfd96673c3fb6c13578a01cf41f9505d5af3b2f655dc28fa93da33e550ef523e5e06f08861eb9e7b94cdfe7ddf753d50feb6f94437e00f67edcf3aa4e831ed8afe73bb05fefe655f7c37edcfd62bb81ddfb82935776cfeb41c87766ff2cfe7f1a4c6cb8e48ae91f68d4dce7015ff390473fad71c3b77cc7639ef03d3ffcb48f013ff293a84c79c6d54f693c8bc28b28589539bff2e2ed647e586389184bacf13a6ff0e6d71a32f92dde96bfdf9dbccc6387dba2d086caae4c668ff7bf68f0673ee0433ee263eef0099ff2199f8b62d0e32e5f704fea2fe5b70d3f57729556b91b349a1c718b634e64faa9fc7fc919e772220a91213254ca273b884bf72b4a54f1846ad925e93b1af56940d734a4110fe4efb5c40dddda907311734c7752d10b3a1ae289c634a17b7dafe331e995b3b124fbdfd25d85471763596fab7aa2a4f53d444653ded3773bb96e8faeae1de2ea8dff9da0b0ebfcd858e3357aa667bb1f68b4a5e7d256853559e8f56d64aefe85e6f44a0b5aea3bac5c2bebf74b8775fb6bfbb858771e7a6f1df09c36f89a36698bb6f53d5c4ef08ee4e6a2dd269b9d488729ed4a171b7bd40ece3228cce5d305edd3673ed7773139bd133a14d5233a96cff7a9237142a77446e7125dba900e70681564f5a6acdc1285ae9e0feaf150d675e8d2d59dd315ad52931fec2973d1a5489c6698e29c5a508829797bd629a52665bcf9fdd32ed95c1d50217b5c18b67390f34befb8e78873a9b6b39ad285216328a2de3bef5b32a59db5ccec42a6b565aaf7dffba6e663d3972b211ea86b065f3cbccbc7b53890399a21a55f677f5863e4f670c337df667f58e3d6dc99dbef3dd5ff6bdf73ff82c65fbfaefc0d4fb5b868</data>
+    </image>
+    <image name="image3" >
+      <data format="XPM.GZ" length="802" >789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade65232325500210543251d2e25658564056503300071f540dc3430007371012a492a830156496538c094848922c9c2259134c099304914e3604c8424aa5e6449b0044216ca824ba2da8b4512218b4d122e8b55520fee5974072164511da487ea490c7f22cba249e20d3efc018f3fcae0d2702eb5d2106992b5d65c00b9a48974</data>
+    </image>
+    <image name="image4" >
+      <data format="XPM.GZ" length="1241" >789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade65232365200210543251d2e253d856405bffcbc54105b19c8563600020b03103711c4b530b08072f50880513524ab518681443435ca984ae08ae06a94114a10ac443435ca3043904d4c4453a38ca604ae11590d9a0ab80bd0d46078914c35c4d885a608871a547f61f81d5d117a1862018930e5b8d5c0950c741a1b1e6a6aadb90086a9d853</data>
+    </image>
+    <image name="image5" >
+      <data format="XPM.GZ" length="5598" >789ca5985973db480ec7dff3295cc15b6a0b2351a428d6d63ef83e255bbe647b6a1fd02465dd872d9f53f3dd076c005dc926ce6a32eed8553f37fadf7fa0c1a69cdfbe6cdc9cb537befcf6e97145ab61be910fe861e34bf1349dbefdfedffffcf1e97323dae07f51bdbe117dfed7a7cfddd546bed199cfca0ae888016afeab62e8796ef110ee545caf05be16ae5bfc6ee096e7b6e756983f51b6f53b81257ecfb8eee7e9b162f66af1c78125fe48987f23f3fb81657e691cd5bddecc7316d555efd058f7eb2867aa771058f4de8c55cffb6dd4a34cf5b68d357e681c6515634db81a7e3ef59c35cccf5560bf9ef6953389c77660af074f15c751e05c38a6d81f2ef9f3a848f4e9d658f2c36b635dbfa54cc2383556bd33e12492fc70df38f1f3f8ae4cc2745a711285fda7caa4f95e06967a2d8c63f27a8fc2a60fa4acfa980a371b898f0767dc6cf8fdbc9f84c27e4de124d2fabe186b3dee8c75ff1365dbef2db0ccef0987fd2f2a6632fd576552fd2b63d57b08ecd7d39d70b321fd0560acfb6d1a4b7e3050764de7d79f08a70de937ea7b7689e68f4de1e0776e2c7ab8abecb47eb170aa7ee822b0e89f1b4b7fd24dc529abe9794f02cbf99e2b3badc7a5b1ee97089b3e0e8d253f3c364e253e5576120ff7c63a9f7966d2e771d358e75bca4ef3bb0e2cf9758db5fe47c6b21eeb81bd3f07c2ad58ebd130d67e6a194b3cf97e62b2fa24c67a1f5d2aab3f8781a53e17c6eaa7082cfa3de156acf9d5034b7e3563f1eb96c6eaf7c0b815fbf8d2739e3aedefb1b1de9723618b77a49cebf946c6e20f5f8d251e753e8b5bb9e74c980a4afc7a7fbf66b1ed8fb7c67a9ec7c2ad5cfd74038bdfa6b1f6cbd458fd2e84b358efbb0363f5b71358fccd8c33596f9c4bfddcc458fac78d8cf5797b3296f5f82c4c49e6f5c9bf9fb23ce41307967e3935d6f36c0b67b1ce3f188b5f3757367f5363b98fdc38b0cc0f8cf5f90bf3ea97028bfe50981289777d63edcf81b1c4439897f3c52d615738cfe0df371c1deb7db265acf98d8d253f7a50d67a60c758cfcbf4cc7f2fb0f8bf1736bfae30d6f35f1a4b3ce6c6e2df95ca85f6f7dc58f3db0e5c783e14e6ebc533e87e963fbe0873f9fd3cc97c91693fd028b0d4e3c558f3eb0b9b5f972bab3fe78c353f3056bfabc0e2371636bfe4cf9b29d1e76b69acfdb863accfd33cb0dc2fa7c6e2179e03cb79ae940b7dffbf1b6bfd1363f53b12367f581a6b3d1bca56df6e60a9bfc6e765def4ecef6bc7eafaf9e8d558fbb7a15ce87d7263acf7ffbdb1e40f33e1e0cf29ebfea8eb6d7ff29f17f8f4137dfe51d8fa0117ca65ee3fbfe3bd705116b2de9f775e3af50313e1a229f1f0682cf1b052e6e1d9dfbf1cddd4fd2363cdcfef5fb05b7d1f0c944bed4f67ac9f5f27c265bf4c3d9f07eefb787f1f96695eaa1e0a174d7d7f81b1ee4f81a5fe75e552d9bf1fca7e617e9e8d556f33b0c4fbcf5ffdb44c956bc6a2d75dfd6c2020fd3ce2ff69a0c31c0b2cff91461fef71804374bfaa81231ce3044b9ce2ecd734380fc2392e70890ff888bfa6f184cff8c24e5ef10ddf71f3a37c3ed6c015afdec26dfeb983bbb887fb78f0f734380fe031c7437f3247788c27d8fe713e1f6a1076f014cfb08be7ac7481977885d75c951fe4f3630dcea3c3eb7b9cc70d6b9ce12d9fee26de610debeb69b0fb578cb89a0d8c399711e794609373d9c39455f2b53466d8c20c17809c45cc7a3c00f011081cffccff379fef35388f1d0428a0c401f459e58c3d45700f0003cee71d8678fc730d7430e2557d3c8331f7568c37308129cc7006733e9d262c6008cb6ff3f94ea3c72bc678ca3f1fb80a637884154c71c974c55d72c91a4feca4fdf553f8ad46554d8e9ee30a9eb1efab31611f2ff0ca346427bb9c11e114debe7e7ebed328318702e7f0ce9dbee47a1c724655b745b0c94ea6b0c55519f059b98f73d19a6cc30eecc21eecfb7100877004c770026de8e070bdfe805338832e9cc3055cc2955f7b0d3de8f0cfebb5356ee016eea0c6a30e11342086049a907aadcd35355a90111250f5e5288706bfdb4bea572a78b49e06ddd3a0d2807a2502110d6944639ad09466ebf9e8ae684e0bf5b1a4075ab28f11ffa1df678dc7f57cb0c68a9ee899355e7c2ddbf40a31bdb1c63bcdfe86c6803669cb9f4555c76b38a76dcee57d5d1f5c8f1d5af0b9745581bb029a5c8f3eedd21eed73b70ebe56fa91061dd061f05139e9d1116b1cfb9aee55c4fcf6330d5cd289d778a6b65fdd831dea702e256b9cf2b974a84367d4fd580347744e17744957acc13e7cfc095d538f356ed8cd2ddd518dea147da4c1956890ffcf295ed5e4c83b4a59f182b9455935e3b801ab791c7fa4e188d7a4bcbee66353feaef9df8852ca2f3e9ee3ef73840f359cabfec22979f4ddbd1bf018ba118f318f899bf298b9b95bb8e537cffe9ffffef4171c39a0bf</data>
+    </image>
+    <image name="image6" >
+      <data format="XPM.GZ" length="3742" >789c8d96c9521c490c86ef3c458775734cc8ddd5b5c6c41c303b180cc60b66620eaacc2c9aa5599b7562de7da45fc5180c8e98fa39f091522e4a49c9bbb783bdedcdc1db77735733991d864198c8e5e06dbc9e4eeffffceb8fbfe7de64d9407f466531c8defc36f76667360883adb3d364c013051ae2039f8147266359068f4dc6740a2e4db05f05d726f0253898c017c6a3cc04ffafce79aa3af0143c36c17e055caa0aacbf06aeb2203e5f09ae4d185f75ce472de6e7737063c2fcb57356b702fed673e32c473d4bcf3760198f02e69325706b022f3a676df0f567e05035d1ed273dc79883e7c1d1045e70ae2456d84fd9738a589f0b703261bc72ae25e17ee4b0e7d8f3b5733374e603e32c37c11ff36970db12f193f7e07c1c6bec87c6e0c604ff0e1c4db03f36cec7e3a6f4fd2e38e779eee7bd05e7e350fa7e4fc0455ee6b84fb9eab913bfdf1c5ce5758efba54fffb1e75302d726f8af3817a5f8f922584cf06fc0211f951ebfd0b30afe07ce4510dfdf1e38e665e9f9f1e01c32cf1fda06a73c2f7c7eac5f8c8b61eef582f315b909dc82f1c17e07dc1459e5f1c77d953abb787e0ab832611cf957366dd9c707f556762a3fcf8673ddd6d8afdc1957b909fe98af2a65d4c787c08d09e3c8bfaad504f378de83a309e35fc049d9d747bda19c7dbe8f602d88d6fd11af3a33c1ffde398e02ec69178c0b04bb7fa12be03e08e7ab4b895e2f74ec1ca2e73f6d811b2d37df1feaa9969082f71ff4a73a98c01f9cdb3678fde27eea58f7f9cdc8bfba33c11efda2199ac01bcead048fd72678a4e9e3f6a86f6d172acc87fc69f290f9386f3d72f478a1bf348509fea8b7a66c9b80fec1a8b7a66a53f47cc2fe9b5ae77346fe35ad09e761703081d12f9b68c2fc57ce6d0c1e6fe463934ce0efc63234c11ffd5b4a13c66f9cb53d79fded832bcd27f47f5aeb59055e744eb1df3fe2251aeee4e7453f9264c27aa847b44f7f4f909fda3efb7ae30c5c84b65f1fef435b9a608ff7a4ad4c981ffb6b6b13d8fda5edfb37eff4dcb65e2f787f5a7cb0f7fd0413ecf13eb49d09f6783ff07cf97d8ec0a3f8d8df516f483faf07c45b1f27e9f30ff989e9fdbe11ff1034fd3c9eebe068c238fa9f6677f2fb27ac1f475dd3f97da25fc6c204be755673ef3f8db3360c1f1f824b13c651df2877c44fd0df511efe5ea39f44318151cf9a4e2ab0af870d63fee4dc55fdfe109f880ff3fb788a8ff98df733762630fa471aa6febda2839e5b3f0fe1bef4f18bc9fb01fa7dca4ce0bb9e5b671ef69c3cff18f99cc626d853cf551f3fe453ca531bbdde979cbb2c793e207f536102a39fa5ca0446bf4279f97b89feaabb5181511f38bedf2ffa47373461bdcfe0dc8471d46387860fc6fbaad155c11ef7a5d953747ede69cf2a30fe3fd06c5121fe88572726f8a37f68720ffbfdadf7ac02fb7e82098c7e85ebf2fde37dea92098cf7acc367bc33fbff7a6ecfc4c22d078eaac41d1ff0e4d7f66a7df84293e71ecfec858f9ee8d1fef8a9c733fb139ef2299ff1395ff0255fc167c233befee1f1cc3ef10ddff21ddff303cfabe77bd584177891971e3d7ed8db4e7b2df30aaff29a7aac3ff9ebe4a9bdf2067fe04ddee28ffafb36eff027de558fcfbaab2ffc95bf3db5578b3dfecefb3ce411673c56ceb9e0b23f47a5fbac7fb26f889988742f2a129e504b81a246e0c8ec293cb7a7441d0b1dd0840ee9883486744253bea4533a7bd5fe9c2ed4feb29fff4aff32a36b8dd5e92fe6bfa15bddcf1dddd303cd93c6911668aa2b5cbc363f3c16799f9630fbb2d20aadd21aadeb3d547a8617f6f0d8a00fb4495bfadb47daa61dfa84f977e933c597f64f6e6c9fbed057fa467bf49df669c8bb34a2eca53d8d35576ef88e722aa8a48a6a6a448320a20fd36bf3eb7f407c2c89efb5500f6422877224c77222533915e6b397fbd117f54ccee54275295732936bb9915bb9937b797869ff34e7649ecfe4bd2ce81a8bbc2a4bb2fc5a3dfe2c59915559fb75fdfe8f7affe7f7b97f011cdd9635</data>
+    </image>
+  </images>
+</ui>
diff --git a/examples/activeqt/wrapper/main.cpp b/examples/activeqt/wrapper/main.cpp
new file mode 100644
index 0000000000..a403084afa
--- /dev/null
+++ b/examples/activeqt/wrapper/main.cpp
@@ -0,0 +1,161 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QAxFactory>
+#include <QCheckBox>
+#include <QRadioButton>
+#include <QPushButton>
+#include <QToolButton>
+#include <QPixmap>
+
+/* XPM */
+static const char *fileopen[] = {
+"    16    13        5            1",
+". c #040404",
+"# c #808304",
+"a c None",
+"b c #f3f704",
+"c c #f3f7f3",
+"aaaaaaaaa...aaaa",
+"aaaaaaaa.aaa.a.a",
+"aaaaaaaaaaaaa..a",
+"a...aaaaaaaa...a",
+".bcb.......aaaaa",
+".cbcbcbcbc.aaaaa",
+".bcbcbcbcb.aaaaa",
+".cbcb...........",
+".bcb.#########.a",
+".cb.#########.aa",
+".b.#########.aaa",
+"..#########.aaaa",
+"...........aaaaa"
+};
+
+
+//! [0]
+class ActiveQtFactory : public QAxFactory
+{
+public:
+    ActiveQtFactory( const QUuid &lib, const QUuid &app ) 
+	: QAxFactory( lib, app ) 
+    {}
+    QStringList featureList() const
+    {
+	QStringList list;
+	list << "QCheckBox";
+	list << "QRadioButton";
+	list << "QPushButton";
+	list << "QToolButton";
+	return list;
+    }
+    QObject *createObject(const QString &key)
+    {
+	if ( key == "QCheckBox" )
+	    return new QCheckBox(0);
+	if ( key == "QRadioButton" )
+	    return new QRadioButton(0);
+	if ( key == "QPushButton" )
+	    return new QPushButton(0 );
+	if ( key == "QToolButton" ) {
+	    QToolButton *tb = new QToolButton(0);
+//	    tb->setIcon( QPixmap(fileopen) );
+	    return tb;
+	}
+
+	return 0;
+    }
+    const QMetaObject *metaObject( const QString &key ) const
+    {
+	if ( key == "QCheckBox" )
+	    return &QCheckBox::staticMetaObject;
+	if ( key == "QRadioButton" )
+	    return &QRadioButton::staticMetaObject;
+	if ( key == "QPushButton" )
+	    return &QPushButton::staticMetaObject;
+	if ( key == "QToolButton" )
+	    return &QToolButton::staticMetaObject;
+
+	return 0;
+    }
+    QUuid classID( const QString &key ) const
+    {
+	if ( key == "QCheckBox" )
+	    return "{6E795DE9-872D-43CF-A831-496EF9D86C68}";
+	if ( key == "QRadioButton" )
+	    return "{AFCF78C8-446C-409A-93B3-BA2959039189}";
+	if ( key == "QPushButton" )
+	    return "{2B262458-A4B6-468B-B7D4-CF5FEE0A7092}";
+	if ( key == "QToolButton" )
+	    return "{7c0ffe7a-60c3-4666-bde2-5cf2b54390a1}";
+
+	return QUuid();
+    }
+    QUuid interfaceID( const QString &key ) const
+    {
+	if ( key == "QCheckBox" )
+	    return "{4FD39DD7-2DE0-43C1-A8C2-27C51A052810}";
+	if ( key == "QRadioButton" )
+	    return "{7CC8AE30-206C-48A3-A009-B0A088026C2F}";
+	if ( key == "QPushButton" )
+	    return "{06831CC9-59B6-436A-9578-6D53E5AD03D3}";
+	if ( key == "QToolButton" )
+	    return "{6726080f-d63d-4950-a366-9bf33e5cdf84}";
+
+	return QUuid();
+    }
+    QUuid eventsID( const QString &key ) const
+    {
+	if ( key == "QCheckBox" )
+	    return "{FDB6FFBE-56A3-4E90-8F4D-198488418B3A}";
+	if ( key == "QRadioButton" )
+	    return "{73EE4860-684C-4A66-BF63-9B9EFFA0CBE5}";
+	if ( key == "QPushButton" )
+	    return "{3CC3F17F-EA59-4B58-BBD3-842D467131DD}";
+	if ( key == "QToolButton" )
+	    return "{f4d421fd-4ead-4fd9-8a25-440766939639}";
+
+	return QUuid();
+    }
+};
+//! [0] //! [1]
+
+QAXFACTORY_EXPORT( ActiveQtFactory, "{3B756301-0075-4E40-8BE8-5A81DE2426B7}", "{AB068077-4924-406a-BBAF-42D91C8727DD}" )
+//! [1]
diff --git a/examples/activeqt/wrapper/wrapper.inf b/examples/activeqt/wrapper/wrapper.inf
new file mode 100644
index 0000000000..fc17a3de03
--- /dev/null
+++ b/examples/activeqt/wrapper/wrapper.inf
@@ -0,0 +1,9 @@
+[version]
+    signature="$CHICAGO$"
+    AdvancedINF=2.0
+ [Add.Code]
+    wrapperax.dll=wrapperax.dll
+ [wrapperax.dll]
+    file-win32-x86=thiscab
+    clsid={23F5012A-7333-43D3-BCA8-836AABC61B4A}
+    RegisterServer=yes
diff --git a/examples/activeqt/wrapper/wrapper.pro b/examples/activeqt/wrapper/wrapper.pro
new file mode 100644
index 0000000000..4eb6baf6cb
--- /dev/null
+++ b/examples/activeqt/wrapper/wrapper.pro
@@ -0,0 +1,15 @@
+TEMPLATE = lib
+TARGET	 = wrapperax
+
+CONFIG	+= qt warn_off qaxserver dll
+contains(CONFIG, static):DEFINES += QT_NODLL
+
+SOURCES	 = main.cpp
+RC_FILE	 = wrapperax.rc
+DEF_FILE = $$QT_SOURCE_TREE/src/activeqt/control/qaxserver.def
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/wrapper
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS wrapper.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/wrapper
+INSTALLS += target sources
diff --git a/examples/activeqt/wrapper/wrapperax.rc b/examples/activeqt/wrapper/wrapperax.rc
new file mode 100644
index 0000000000..453688d90a
--- /dev/null
+++ b/examples/activeqt/wrapper/wrapperax.rc
@@ -0,0 +1,32 @@
+#include "winver.h"
+
+1 TYPELIB "wrapperax.rc"
+1 ICON DISCARDABLE "..\\..\\..\\src\\activeqt\\control\\qaxserver.ico"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,0
+ PRODUCTVERSION 1,0,0,0
+ FILEFLAGSMASK 0x3fL
+ FILEOS 0x00040000L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904e4"
+        BEGIN
+            VALUE "CompanyName", "Nokia Corporation and/or its subsidiary(-ies)"
+            VALUE "FileDescription", "Wrapper Example (ActiveQt)"
+            VALUE "FileVersion", "1.0.0.0"
+            VALUE "LegalCopyright", "Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)."
+            VALUE "InternalName", "wrapperax.dll"
+            VALUE "OriginalFilename", "wrapperax.dll"
+            VALUE "ProductName", "Wrapper Example (ActiveQt)"
+            VALUE "ProductVersion", "1.0.0.0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END
diff --git a/examples/assistant/README b/examples/assistant/README
new file mode 100644
index 0000000000..85f5a4373d
--- /dev/null
+++ b/examples/assistant/README
@@ -0,0 +1,38 @@
+Support for interactive help is provided by the Qt Assistant application.
+Developers can take advantages of the facilities it offers to display
+specially-prepared documentation to users of their applications.
+
+
+The example launcher provided with Qt can be used to explore each of the
+examples in this directory.
+
+Documentation for these examples can be found via the Tutorial and Examples
+link in the main Qt documentation.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/assistant/assistant.pro b/examples/assistant/assistant.pro
new file mode 100644
index 0000000000..14771788e0
--- /dev/null
+++ b/examples/assistant/assistant.pro
@@ -0,0 +1,8 @@
+TEMPLATE      = subdirs
+SUBDIRS       = simpletextviewer
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/assistant
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS assistant.pro README
+sources.path = $$[QT_INSTALL_EXAMPLES]/assistant
+INSTALLS += target sources
diff --git a/examples/assistant/simpletextviewer/documentation/about.txt b/examples/assistant/simpletextviewer/documentation/about.txt
new file mode 100644
index 0000000000..eeab35f4a6
--- /dev/null
+++ b/examples/assistant/simpletextviewer/documentation/about.txt
@@ -0,0 +1,9 @@
+The Simple Text Viewer enables the user to select and view existing
+files.
+
+HTML files is displayed using rich text, while other files are
+presented as plain text. The application provides a file dialog
+allowing the user to search for files using wildcard matching. The
+search is performed within in the specified directory, and the user is
+given an option to browse the existing file system to find the
+relevant directory.
diff --git a/examples/assistant/simpletextviewer/documentation/browse.html b/examples/assistant/simpletextviewer/documentation/browse.html
new file mode 100644
index 0000000000..987abf31f6
--- /dev/null
+++ b/examples/assistant/simpletextviewer/documentation/browse.html
@@ -0,0 +1,34 @@
+<html>
+    <head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Browse</title>
+    </head>
+    <body style="font-size:12pt;font-family:helvetica">
+	
+        <p><center><h2>Browse</h2></center></p>
+ 
+        <p>
+        The file dialog let you browse the current file system to
+        specify the directory in which the file you want to open
+        resides. 
+        Note that only the specified directory will be searched, any
+        subdirectories will simply be ignored.
+        </p>
+
+        <br />
+        <br />
+        <table align="center" cellpadding="2" cellspacing="1" border="0" width="100%">
+        <tr valign="top" bgcolor="#f0f0f0">
+        <td><center><img src="images/browse.png" /></center></td>
+        </tr>
+        </table>
+
+        <br />
+        <br />
+        <p>
+        See also: <a href="filedialog.html">File Dialog</a>, <a href="wildcardmatching.html">Wildcard Matching</a>,
+        <a href="findfile.html">Find File</a>
+        </p>
+    </body>
+</html>
+
diff --git a/examples/assistant/simpletextviewer/documentation/filedialog.html b/examples/assistant/simpletextviewer/documentation/filedialog.html
new file mode 100644
index 0000000000..afa65ed577
--- /dev/null
+++ b/examples/assistant/simpletextviewer/documentation/filedialog.html
@@ -0,0 +1,48 @@
+<html>
+    <head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>File Dialog</title>
+    </head>
+    <body style="font-size:12pt;font-family:helvetica">
+
+	<p><center><h2>File Dialog</h2></center></p>
+
+        <p>
+        In the file dialog you can name a particular file name, or
+        search for files using wildcard matching, i.e. specify a
+        file name containing wildcards. In addition you must specify
+        the directory in which the file you search for resides. 
+        </p>
+
+        <br />
+        <br />
+        <table align="center" cellpadding="2" cellspacing="1" border="0" width="100%">
+        <tr valign="top" bgcolor="#f0f0f0">
+        <td><center><img src="images/filedialog.png" /></center></td>
+        </tr>
+        </table>
+
+        <br />
+        <br />
+        <p>
+        By default the dialog will search for all files (*) in the
+        current directory (the directory the application is run from).
+        </p>
+
+        <p>
+        When editing the file name and directory parameters, an
+        overview of the matching files are displayed in the
+        dialog. The overview is updated whenever the parameters
+        change.
+        </p>
+
+        <br />
+        <br />
+        <p>
+        See also: <a href="browse.html">Browse</a>, <a href="wildcardmatching.html">Wildcard Matching</a>, 
+        <a href="findfile.html">Find File</a>
+        </p>
+    </body>
+</html>
+
+
diff --git a/examples/assistant/simpletextviewer/documentation/findfile.html b/examples/assistant/simpletextviewer/documentation/findfile.html
new file mode 100644
index 0000000000..32e0147181
--- /dev/null
+++ b/examples/assistant/simpletextviewer/documentation/findfile.html
@@ -0,0 +1,32 @@
+<html>
+    <head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Find File</title>
+    </head>
+    <body style="font-size:12pt;font-family:helvetica">
+
+	<p><center><h2>Find File</h2></center></p>
+
+        <p>
+        To open and view a file in the Simple Text Viewer, select the
+        'Open...' option in the 'File' menu. The application will then
+        provide you with a file dialog that you can use to search for
+        any existing file.
+        </p>
+
+        <br />
+        <br />
+        <table align="center" cellpadding="2" cellspacing="1" border="0" width="100%">
+        <tr valign="top" bgcolor="#f0f0f0">
+        <td><center><img src="images/fadedfilemenu.png" /></center></td>
+        </tr>
+        </table>
+
+        <br />
+        <br />
+        <p>
+        See also: <a href="openfile.html">Open File</a>, <a href="filedialog.html">File Dialog</a>
+        </p>
+    </body>
+</html>
+
diff --git a/examples/assistant/simpletextviewer/documentation/images/browse.png b/examples/assistant/simpletextviewer/documentation/images/browse.png
new file mode 100644
index 0000000000..86db6b19eb
--- /dev/null
+++ b/examples/assistant/simpletextviewer/documentation/images/browse.png
diff --git a/examples/assistant/simpletextviewer/documentation/images/fadedfilemenu.png b/examples/assistant/simpletextviewer/documentation/images/fadedfilemenu.png
new file mode 100644
index 0000000000..fde0e43f67
--- /dev/null
+++ b/examples/assistant/simpletextviewer/documentation/images/fadedfilemenu.png
diff --git a/examples/assistant/simpletextviewer/documentation/images/filedialog.png b/examples/assistant/simpletextviewer/documentation/images/filedialog.png
new file mode 100644
index 0000000000..883a33a269
--- /dev/null
+++ b/examples/assistant/simpletextviewer/documentation/images/filedialog.png
diff --git a/examples/assistant/simpletextviewer/documentation/images/handbook.png b/examples/assistant/simpletextviewer/documentation/images/handbook.png
new file mode 100644
index 0000000000..3bd2b928b0
--- /dev/null
+++ b/examples/assistant/simpletextviewer/documentation/images/handbook.png
diff --git a/examples/assistant/simpletextviewer/documentation/images/mainwindow.png b/examples/assistant/simpletextviewer/documentation/images/mainwindow.png
new file mode 100644
index 0000000000..c28d5e9ffe
--- /dev/null
+++ b/examples/assistant/simpletextviewer/documentation/images/mainwindow.png
diff --git a/examples/assistant/simpletextviewer/documentation/images/open.png b/examples/assistant/simpletextviewer/documentation/images/open.png
new file mode 100644
index 0000000000..1e5bba3c8c
--- /dev/null
+++ b/examples/assistant/simpletextviewer/documentation/images/open.png
diff --git a/examples/assistant/simpletextviewer/documentation/images/wildcard.png b/examples/assistant/simpletextviewer/documentation/images/wildcard.png
new file mode 100644
index 0000000000..6e83a56cc4
--- /dev/null
+++ b/examples/assistant/simpletextviewer/documentation/images/wildcard.png
diff --git a/examples/assistant/simpletextviewer/documentation/index.html b/examples/assistant/simpletextviewer/documentation/index.html
new file mode 100644
index 0000000000..5a7b1d5fac
--- /dev/null
+++ b/examples/assistant/simpletextviewer/documentation/index.html
@@ -0,0 +1,41 @@
+<html>
+    <head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Manual</title>
+    </head>
+    <body style="font-size:12pt;font-family:helvetica">
+
+	<p><center><h2>Simple Text Viewer</h2></center></p>
+
+	<p>
+        The Simple Text Viewer enables the user to select and view
+        existing files. 
+        </p>
+
+        <p><center>
+        <img src="images/mainwindow.png" />
+        </center></p>
+
+        <p>
+        HTML files is displayed using rich text, while
+        other files are presented as plain text. The application
+        provides a file dialog allowing the user to search for files
+        using wildcard matching. The search is performed within in the
+        specified directory, and the user is given an option to browse
+        the existing file system to find the relevant directory.
+        </p>
+
+	<ul>
+	    <li><a href="findfile.html">Find File</a></li>
+            <ul>
+                <li><a href="filedialog.html">File Dialog</a></li>
+                <li><a href="wildcardmatching.html">WildCard Matching</a></li>
+                <li><a href="browse.html">Browse</a></li>
+            </ul>
+	    <li><a href="openfile.html">Open File</a></li>
+	</ul>
+    </body>
+</html>
+
+
+
diff --git a/examples/assistant/simpletextviewer/documentation/intro.html b/examples/assistant/simpletextviewer/documentation/intro.html
new file mode 100644
index 0000000000..2e2aa40de7
--- /dev/null
+++ b/examples/assistant/simpletextviewer/documentation/intro.html
@@ -0,0 +1,28 @@
+<html>
+    <head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Manual</title>
+    </head>
+    <body style="font-size:12pt;font-family:helvetica">
+
+	<p><center><h2>Simple Text Viewer</h2></center></p>
+
+	<p>
+        The Simple Text Viewer enables the user to select and view
+        existing files. 
+        </p>
+
+        <p><center>
+        <img src="images/mainwindow.png" />
+        </center></p>
+
+        <p>
+        The application provides its own custom documentation that is
+        available through the <b>Help</b> menu in the main window's menubar
+        and through the <b>Help</b> button in the application's find file
+        dialog.
+        </p>
+
+    </body>
+</html>
+
diff --git a/examples/assistant/simpletextviewer/documentation/openfile.html b/examples/assistant/simpletextviewer/documentation/openfile.html
new file mode 100644
index 0000000000..e172de95ea
--- /dev/null
+++ b/examples/assistant/simpletextviewer/documentation/openfile.html
@@ -0,0 +1,36 @@
+<html>
+    <head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Open File</title>
+    </head>
+    <body style="font-size:12pt;font-family:helvetica">
+
+	<p><center><h2>Open File</h2></center></p>
+
+        <p>
+        Once the file you want to view appears in the dialog's
+        display, you can open it in two different ways.
+        </p>
+
+        <p>
+        By pressing the 'Open' button the currently selected file will
+        be opened. By default, the first file in the list of matching
+        files is selected. Another way of opening a file is to simply
+        double click the displayed file name.
+        </p>
+
+        <br />
+        <br />
+        <table align="center" cellpadding="2" cellspacing="1" border="0" width="100%">
+        <tr valign="top" bgcolor="#f0f0f0">
+        <td><center><img src="images/open.png" /></center></td>
+        </tr>
+        </table>
+
+        <br />
+        <br />
+        <p>
+        See also: <a href="findfile.html">Find File</a>
+        </p>
+    </body>
+</html>
diff --git a/examples/assistant/simpletextviewer/documentation/simpletextviewer.adp b/examples/assistant/simpletextviewer/documentation/simpletextviewer.adp
new file mode 100644
index 0000000000..660df4f382
--- /dev/null
+++ b/examples/assistant/simpletextviewer/documentation/simpletextviewer.adp
@@ -0,0 +1,40 @@
+<!DOCTYPE DCF>
+
+<assistantconfig version="3.2.0">
+
+<profile>
+    <property name="name">simpletextviewer</property>
+    <property name="title">Simple Text Viewer</property>
+    <property name="applicationicon">images/handbook.png</property>
+    <property name="startpage">index.html</property>
+    <property name="aboutmenutext">About Simple Text Viewer</property>
+    <property name="abouturl">about.txt</property>
+    <property name="assistantdocs">.</property>
+</profile>
+
+<DCF ref="index.html" icon="images/handbook.png" title="Simple Text Viewer">
+        <section ref="./findfile.html" title="Find File">
+            <keyword ref="./index.html">Display</keyword>
+            <keyword ref="./index.html">Rich text</keyword>
+            <keyword ref="./index.html">Plain text</keyword>
+            <keyword ref="./findfile.html">Find</keyword>
+            <keyword ref="./findfile.html">File menu</keyword>
+            <keyword ref="./filedialog.html">File name</keyword>
+            <keyword ref="./filedialog.html">File dialog</keyword>
+            <keyword ref="./wildcardmatching.html">File globbing</keyword>
+            <keyword ref="./wildcardmatching.html">Wildcard matching</keyword>
+            <keyword ref="./wildcardmatching.html">Wildcard syntax</keyword>
+            <keyword ref="./browse.html">Browse</keyword>
+            <keyword ref="./browse.html">Directory</keyword>
+            <keyword ref="./openfile.html">Open</keyword>
+            <keyword ref="./openfile.html">Select</keyword>
+
+            <section ref="./filedialog.html" title="File Dialog" />
+            <section ref="./wildcardmatching.html" title="Wildcard Matching" />
+            <section ref="./browse.html" title="Browse" />
+        </section>
+        <section ref="./openfile.html" title="Open File" />
+</DCF>
+
+</assistantconfig>
+
diff --git a/examples/assistant/simpletextviewer/documentation/wildcardmatching.html b/examples/assistant/simpletextviewer/documentation/wildcardmatching.html
new file mode 100644
index 0000000000..eb1839a068
--- /dev/null
+++ b/examples/assistant/simpletextviewer/documentation/wildcardmatching.html
@@ -0,0 +1,57 @@
+<html>
+    <head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Wildcard Matching</title>
+    </head>
+    <body style="font-size:12pt;font-family:helvetica">
+
+	<p><center><h2>Wildcard Matching</h2></center></p>
+
+        <p>
+        Most command shells such as bash or cmd.exe support "file
+        globbing", the ability to identify a group of files by using
+        wildcards. 
+
+        <br />
+        <br />
+        <table align="center" cellpadding="2" cellspacing="1" border="0" width="100%">
+        <tr valign="top" bgcolor="#f0f0f0">
+        <td><center><img src="images/wildcard.png" /></center></td>
+        </tr>
+        </table>
+
+        <br />
+        <br />
+        <p>
+        Wildcard matching provides four features:     
+        </p>   
+
+	<ul>
+	    <li>Any character represents itself apart from those
+	    mentioned below. Thus 'c' matches the character 'c'.
+            </li>
+	    <li>The '?' character matches any single character.</li>
+	    <li>The '*' matches zero or more of any characters.</li>
+	    <li>Sets of characters can be represented in square brackets. 
+                Within the character class, like outside, backslash 
+                has no special meaning.
+	    </li>
+	</ul>
+
+        <p>
+        For example we could identify HTML files with
+        <code>*.html</code>. This will match zero or more characters
+        followed by a dot followed by 'h', 't', 'm' and 'l'.
+        </p>
+
+        <br />
+        <br />
+        <p>
+        See also: <a href="browse.html">Browse</a>, <a href="filedialog.html">File Dialog</a>,
+        <a href="findfile.html">Find File</a>
+        </p>
+    </body>
+</html>
+
+
+
diff --git a/examples/assistant/simpletextviewer/findfiledialog.cpp b/examples/assistant/simpletextviewer/findfiledialog.cpp
new file mode 100644
index 0000000000..f73657e0d4
--- /dev/null
+++ b/examples/assistant/simpletextviewer/findfiledialog.cpp
@@ -0,0 +1,221 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "findfiledialog.h"
+
+//! [0]
+FindFileDialog::FindFileDialog(QTextEdit *editor, QAssistantClient *assistant,
+                               QWidget *parent)
+    : QDialog(parent)
+{
+    currentAssistantClient = assistant;
+    currentEditor = editor;
+//! [0]
+
+    createButtons();
+    createComboBoxes();
+    createFilesTree();
+    createLabels();
+    createLayout();
+
+    directoryComboBox->addItem(QDir::toNativeSeparators(QDir::currentPath()));
+    fileNameComboBox->addItem("*");
+    findFiles();
+
+    setWindowTitle(tr("Find File"));
+//! [1]
+}
+//! [1]
+
+void FindFileDialog::browse()
+{
+    QString currentDirectory = directoryComboBox->currentText();
+    QString newDirectory = QFileDialog::getExistingDirectory(this,
+                               tr("Select Directory"), currentDirectory);
+    if (!newDirectory.isEmpty()) {
+        directoryComboBox->addItem(QDir::toNativeSeparators(newDirectory));
+        directoryComboBox->setCurrentIndex(directoryComboBox->count() - 1);
+        update();
+    }
+}
+
+//! [2]
+void FindFileDialog::help()
+{
+    currentAssistantClient->showPage(QLibraryInfo::location(QLibraryInfo::ExamplesPath) +
+            QDir::separator() +  "assistant/simpletextviewer/documentation/filedialog.html");
+}
+//! [2]
+
+void FindFileDialog::openFile(QTreeWidgetItem *item)
+{
+    if (!item) {
+        item = foundFilesTree->currentItem();
+        if (!item)
+            return;
+    }
+
+    QString fileName = item->text(0);
+    QString path = directoryComboBox->currentText() + QDir::separator();
+
+    QFile file(path + fileName);
+    if (file.open(QIODevice::ReadOnly)) {
+        QString data(file.readAll());
+
+        if (fileName.endsWith(".html"))
+            currentEditor->setHtml(data);
+        else
+            currentEditor->setPlainText(data);
+    }
+    close();
+}
+
+void FindFileDialog::update()
+{
+    findFiles();
+    buttonBox->button(QDialogButtonBox::Open)->setEnabled(
+            foundFilesTree->topLevelItemCount() > 0);
+}
+
+void FindFileDialog::findFiles()
+{
+    QRegExp filePattern(fileNameComboBox->currentText() + "*");
+    filePattern.setPatternSyntax(QRegExp::Wildcard);
+
+    QDir directory(directoryComboBox->currentText());
+
+    QStringList allFiles = directory.entryList(QDir::Files | QDir::NoSymLinks);
+    QStringList matchingFiles;
+
+    foreach (QString file, allFiles) {
+        if (filePattern.exactMatch(file))
+            matchingFiles << file;
+    }
+    showFiles(matchingFiles);
+}
+
+void FindFileDialog::showFiles(const QStringList &files)
+{
+    foundFilesTree->clear();
+
+    for (int i = 0; i < files.count(); ++i) {
+        QTreeWidgetItem *item = new QTreeWidgetItem(foundFilesTree);
+        item->setText(0, files[i]);
+    }
+
+    if (files.count() > 0)
+        foundFilesTree->setCurrentItem(foundFilesTree->topLevelItem(0));
+}
+
+void FindFileDialog::createButtons()
+{
+    browseButton = new QToolButton;
+    browseButton->setText(tr("..."));
+    connect(browseButton, SIGNAL(clicked()), this, SLOT(browse()));
+
+    buttonBox = new QDialogButtonBox(QDialogButtonBox::Open
+                                     | QDialogButtonBox::Cancel
+                                     | QDialogButtonBox::Help);
+    connect(buttonBox, SIGNAL(accepted()), this, SLOT(openFile()));
+    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+    connect(buttonBox, SIGNAL(helpRequested()), this, SLOT(help()));
+}
+
+void FindFileDialog::createComboBoxes()
+{
+    directoryComboBox = new QComboBox;
+    fileNameComboBox = new QComboBox;
+
+    fileNameComboBox->setEditable(true);
+    fileNameComboBox->setSizePolicy(QSizePolicy::Expanding,
+                                    QSizePolicy::Preferred);
+
+    directoryComboBox->setMinimumContentsLength(30);
+    directoryComboBox->setSizeAdjustPolicy(
+            QComboBox::AdjustToMinimumContentsLength);
+    directoryComboBox->setSizePolicy(QSizePolicy::Expanding,
+                                     QSizePolicy::Preferred);
+
+    connect(fileNameComboBox, SIGNAL(editTextChanged(const QString &)),
+            this, SLOT(update()));
+    connect(directoryComboBox, SIGNAL(currentIndexChanged(const QString &)),
+            this, SLOT(update()));
+}
+
+void FindFileDialog::createFilesTree()
+{
+    foundFilesTree = new QTreeWidget;
+    foundFilesTree->setColumnCount(1);
+    foundFilesTree->setHeaderLabels(QStringList(tr("Matching Files")));
+    foundFilesTree->setRootIsDecorated(false);
+    foundFilesTree->setSelectionMode(QAbstractItemView::SingleSelection);
+
+    connect(foundFilesTree, SIGNAL(itemActivated(QTreeWidgetItem *, int)),
+            this, SLOT(openFile(QTreeWidgetItem *)));
+}
+
+void FindFileDialog::createLabels()
+{
+    directoryLabel = new QLabel(tr("Search in:"));
+    fileNameLabel = new QLabel(tr("File name (including wildcards):"));
+}
+
+void FindFileDialog::createLayout()
+{
+    QHBoxLayout *fileLayout = new QHBoxLayout;
+    fileLayout->addWidget(fileNameLabel);
+    fileLayout->addWidget(fileNameComboBox);
+
+    QHBoxLayout *directoryLayout = new QHBoxLayout;
+    directoryLayout->addWidget(directoryLabel);
+    directoryLayout->addWidget(directoryComboBox);
+    directoryLayout->addWidget(browseButton);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addLayout(fileLayout);
+    mainLayout->addLayout(directoryLayout);
+    mainLayout->addWidget(foundFilesTree);
+    mainLayout->addStretch();
+    mainLayout->addWidget(buttonBox);
+    setLayout(mainLayout);
+}
diff --git a/examples/assistant/simpletextviewer/findfiledialog.h b/examples/assistant/simpletextviewer/findfiledialog.h
new file mode 100644
index 0000000000..0c89fda950
--- /dev/null
+++ b/examples/assistant/simpletextviewer/findfiledialog.h
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef FINDFILEDIALOG_H
+#define FINDFILEDIALOG_H
+
+#include <QAssistantClient>
+#include <QDialog>
+
+QT_BEGIN_NAMESPACE
+class QComboBox;
+class QDialogButtonBox;
+class QLabel;
+class QTextEdit;
+class QToolButton;
+class QTreeWidget;
+class QTreeWidgetItem;
+QT_END_NAMESPACE
+
+//! [0]
+class FindFileDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    FindFileDialog(QTextEdit *editor, QAssistantClient *assistant,
+                   QWidget *parent = 0);
+
+private slots:
+    void browse();
+    void help();
+    void openFile(QTreeWidgetItem *item = 0);
+    void update();
+
+private:
+    void findFiles();
+    void showFiles(const QStringList &files);
+
+    void createButtons();
+    void createComboBoxes();
+    void createFilesTree();
+    void createLabels();
+    void createLayout();
+
+    QAssistantClient *currentAssistantClient;
+    QTextEdit *currentEditor;
+    QTreeWidget *foundFilesTree;
+
+    QComboBox *directoryComboBox;
+    QComboBox *fileNameComboBox;
+
+    QLabel *directoryLabel;
+    QLabel *fileNameLabel;
+
+    QDialogButtonBox *buttonBox;
+
+    QToolButton *browseButton;
+};
+//! [0]
+
+#endif
diff --git a/examples/assistant/simpletextviewer/main.cpp b/examples/assistant/simpletextviewer/main.cpp
new file mode 100644
index 0000000000..1d51376c06
--- /dev/null
+++ b/examples/assistant/simpletextviewer/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/assistant/simpletextviewer/mainwindow.cpp b/examples/assistant/simpletextviewer/mainwindow.cpp
new file mode 100644
index 0000000000..cc2f3c0486
--- /dev/null
+++ b/examples/assistant/simpletextviewer/mainwindow.cpp
@@ -0,0 +1,154 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+#include "findfiledialog.h"
+
+//! [0]
+MainWindow::MainWindow()
+{
+    textViewer = new QTextEdit;
+    textViewer->setReadOnly(true);
+    QFile file("documentation/intro.html");
+    if (file.open(QIODevice::ReadOnly))
+        textViewer->setHtml(file.readAll());
+
+    setCentralWidget(textViewer);
+
+    createActions();
+    createMenus();
+
+    initializeAssistant();
+
+    setWindowTitle(tr("Simple Text Viewer"));
+    resize(750, 400);
+}
+//! [0]
+
+//! [1]
+void MainWindow::closeEvent(QCloseEvent *)
+{
+    if (assistantClient)
+        assistantClient->closeAssistant();
+}
+//! [1]
+
+void MainWindow::about()
+{
+    QMessageBox::about(this, tr("About Simple Text Viewer"),
+                         tr("This example demonstrates how to use\n" \
+                            "Qt Assistant as help system for your\n" \
+                            "own application."));
+}
+
+//! [2]
+void MainWindow::assistant()
+{
+    assistantClient->showPage(QLibraryInfo::location(QLibraryInfo::ExamplesPath) +
+                                              QDir::separator() +
+                                              "assistant/simpletextviewer/documentation/index.html");
+}
+//! [2]
+
+//! [3]
+void MainWindow::open()
+{
+    FindFileDialog dialog(textViewer, assistantClient);
+    dialog.exec();
+}
+//! [3]
+
+void MainWindow::createActions()
+{
+    assistantAct = new QAction(tr("Help Contents"), this);
+    assistantAct->setShortcut(tr("F1"));
+    connect(assistantAct, SIGNAL(triggered()), this, SLOT(assistant()));
+
+    openAct = new QAction(tr("&Open..."), this);
+    openAct->setShortcut(tr("Ctrl+O"));
+    connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
+
+    clearAct = new QAction(tr("&Clear"), this);
+    clearAct->setShortcut(tr("Ctrl+C"));
+    connect(clearAct, SIGNAL(triggered()), textViewer, SLOT(clear()));
+
+    exitAct = new QAction(tr("E&xit"), this);
+    exitAct->setShortcut(tr("Ctrl+Q"));
+    connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));
+
+    aboutAct = new QAction(tr("&About"), this);
+    connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
+
+    aboutQtAct = new QAction(tr("About &Qt"), this);
+    connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+}
+
+void MainWindow::createMenus()
+{
+    fileMenu = new QMenu(tr("&File"), this);
+    fileMenu->addAction(openAct);
+    fileMenu->addAction(clearAct);
+    fileMenu->addSeparator();
+    fileMenu->addAction(exitAct);
+
+    helpMenu = new QMenu(tr("&Help"), this);
+    helpMenu->addAction(assistantAct);
+    helpMenu->addSeparator();
+    helpMenu->addAction(aboutAct);
+    helpMenu->addAction(aboutQtAct);
+
+
+    menuBar()->addMenu(fileMenu);
+    menuBar()->addMenu(helpMenu);
+}
+
+//! [4]
+void MainWindow::initializeAssistant()
+{
+    assistantClient = new QAssistantClient(QLibraryInfo::location(QLibraryInfo::BinariesPath), this);
+
+    QStringList arguments;
+    arguments << "-profile" << QString("documentation") + QDir::separator() + QString("simpletextviewer.adp");
+    assistantClient->setArguments(arguments);
+}
+//! [4]
diff --git a/examples/assistant/simpletextviewer/mainwindow.h b/examples/assistant/simpletextviewer/mainwindow.h
new file mode 100644
index 0000000000..b56d2017fa
--- /dev/null
+++ b/examples/assistant/simpletextviewer/mainwindow.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QAssistantClient>
+#include <QMainWindow>
+#include <QTextEdit>
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+private slots:
+    void about();
+//! [0]
+    void assistant();
+//! [0]
+    void open();
+
+protected:
+//! [1]
+    void closeEvent(QCloseEvent *event);
+//! [1]
+
+private:
+    void createActions();
+    void createMenus();
+//! [2]
+    void initializeAssistant();
+//! [2]
+
+//! [3]
+    QAssistantClient *assistantClient;
+//! [3]
+    QTextEdit *textViewer;
+
+    QMenu *fileMenu;
+    QMenu *helpMenu;
+
+    QAction *assistantAct;
+    QAction *clearAct;
+    QAction *openAct;
+    QAction *exitAct;
+    QAction *aboutAct;
+    QAction *aboutQtAct;
+};
+
+#endif
diff --git a/examples/assistant/simpletextviewer/simpletextviewer.pro b/examples/assistant/simpletextviewer/simpletextviewer.pro
new file mode 100644
index 0000000000..4b66edb3cc
--- /dev/null
+++ b/examples/assistant/simpletextviewer/simpletextviewer.pro
@@ -0,0 +1,16 @@
+CONFIG += assistant
+
+QT += network
+
+HEADERS       = mainwindow.h \
+                findfiledialog.h
+SOURCES       = main.cpp \
+                mainwindow.cpp \
+                findfiledialog.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/assistant/simpletextviewer
+sources.files = $$SOURCES $$HEADERS $$RESOURCES documentation *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/assistant/simpletextviewer
+INSTALLS += target sources
+
diff --git a/examples/dbus/complexpingpong/complexping.cpp b/examples/dbus/complexpingpong/complexping.cpp
new file mode 100644
index 0000000000..18fa66dcaa
--- /dev/null
+++ b/examples/dbus/complexpingpong/complexping.cpp
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <stdio.h>
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QFile>
+#include <QtCore/QDebug>
+#include <QtCore/QProcess>
+#include <QtDBus/QtDBus>
+
+#include "ping-common.h"
+#include "complexping.h"
+
+void Ping::start(const QString &name, const QString &oldValue, const QString &newValue)
+{
+    Q_UNUSED(oldValue);
+
+    if (name != SERVICE_NAME || newValue.isEmpty())
+        return;
+
+    // open stdin for reading
+    qstdin.open(stdin, QIODevice::ReadOnly);
+
+    // find our remote
+    iface = new QDBusInterface(SERVICE_NAME, "/", "com.trolltech.QtDBus.ComplexPong.Pong",
+                               QDBusConnection::sessionBus(), this);
+    if (!iface->isValid()) {
+        fprintf(stderr, "%s\n",
+                qPrintable(QDBusConnection::sessionBus().lastError().message()));
+        QCoreApplication::instance()->quit();
+    }
+
+    connect(iface, SIGNAL(aboutToQuit()), QCoreApplication::instance(), SLOT(quit()));
+
+    while (true) {
+        printf("Ask your question: ");
+
+        QString line = QString::fromLocal8Bit(qstdin.readLine()).trimmed();
+        if (line.isEmpty()) {
+            iface->call("quit");
+            return;
+        } else if (line == "value") {
+            QVariant reply = iface->property("value");
+            if (!reply.isNull())
+                printf("value = %s\n", qPrintable(reply.toString()));
+        } else if (line.startsWith("value=")) {
+            iface->setProperty("value", line.mid(6));            
+        } else {
+            QDBusReply<QDBusVariant> reply = iface->call("query", line);
+            if (reply.isValid())
+                printf("Reply was: %s\n", qPrintable(reply.value().variant().toString()));
+        }
+
+        if (iface->lastError().isValid())
+            fprintf(stderr, "Call failed: %s\n", qPrintable(iface->lastError().message()));
+    }
+}    
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    if (!QDBusConnection::sessionBus().isConnected()) {
+        fprintf(stderr, "Cannot connect to the D-Bus session bus.\n"
+                "To start it, run:\n"
+                "\teval `dbus-launch --auto-syntax`\n");
+        return 1;
+    }
+
+    Ping ping;
+    ping.connect(QDBusConnection::sessionBus().interface(),
+                 SIGNAL(serviceOwnerChanged(QString,QString,QString)),
+                 SLOT(start(QString,QString,QString)));
+
+    QProcess pong;
+    pong.start("./complexpong");
+
+    app.exec();
+}
diff --git a/examples/dbus/complexpingpong/complexping.h b/examples/dbus/complexpingpong/complexping.h
new file mode 100644
index 0000000000..4c2a473244
--- /dev/null
+++ b/examples/dbus/complexpingpong/complexping.h
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef COMPLEXPING_H
+#define COMPLEXPING_H
+
+#include <QtCore/QObject>
+#include <QtCore/QFile>
+#include <QtDBus/QDBusInterface>
+
+class Ping: public QObject
+{
+    Q_OBJECT
+public slots:
+    void start(const QString &, const QString &, const QString &);
+public:
+    QFile qstdin;
+    QDBusInterface *iface;
+};
+
+#endif
diff --git a/examples/dbus/complexpingpong/complexping.pro b/examples/dbus/complexpingpong/complexping.pro
new file mode 100644
index 0000000000..4b37b038a8
--- /dev/null
+++ b/examples/dbus/complexpingpong/complexping.pro
@@ -0,0 +1,16 @@
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+QT -= gui
+CONFIG += qdbus
+
+# Input
+HEADERS += complexping.h ping-common.h
+SOURCES += complexping.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong
+INSTALLS += target sources
diff --git a/examples/dbus/complexpingpong/complexpingpong.pro b/examples/dbus/complexpingpong/complexpingpong.pro
new file mode 100644
index 0000000000..cd618d549d
--- /dev/null
+++ b/examples/dbus/complexpingpong/complexpingpong.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+win32:CONFIG += console
+SUBDIRS = complexping.pro complexpong.pro
diff --git a/examples/dbus/complexpingpong/complexpong.cpp b/examples/dbus/complexpingpong/complexpong.cpp
new file mode 100644
index 0000000000..283e440d3e
--- /dev/null
+++ b/examples/dbus/complexpingpong/complexpong.cpp
@@ -0,0 +1,105 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QTimer>
+#include <QtDBus/QtDBus>
+
+#include "ping-common.h"
+#include "complexpong.h"
+
+// the property
+QString Pong::value() const
+{
+    return m_value;
+}
+
+void Pong::setValue(const QString &newValue)
+{
+    m_value = newValue;
+}
+
+void Pong::quit()
+{
+    QTimer::singleShot(0, QCoreApplication::instance(), SLOT(quit()));
+}
+
+QDBusVariant Pong::query(const QString &query)
+{
+    QString q = query.toLower();
+    if (q == "hello")
+        return QDBusVariant("World");
+    if (q == "ping")
+        return QDBusVariant("Pong");
+    if (q.indexOf("the answer to life, the universe and everything") != -1)
+        return QDBusVariant(42);
+    if (q.indexOf("unladen swallow") != -1) {
+        if (q.indexOf("european") != -1)
+            return QDBusVariant(11.0);
+        return QDBusVariant(QByteArray("african or european?"));
+    }
+
+    return QDBusVariant("Sorry, I don't know the answer");
+}
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    QObject obj;
+    Pong *pong = new Pong(&obj);
+    pong->connect(&app, SIGNAL(aboutToQuit()), SIGNAL(aboutToQuit()));
+    pong->setProperty("value", "initial value");
+    QDBusConnection::sessionBus().registerObject("/", &obj);
+
+    if (!QDBusConnection::sessionBus().registerService(SERVICE_NAME)) {
+        fprintf(stderr, "%s\n",
+                qPrintable(QDBusConnection::sessionBus().lastError().message()));        
+        exit(1);
+    }
+    
+    app.exec();
+    return 0;
+}
+
diff --git a/examples/dbus/complexpingpong/complexpong.h b/examples/dbus/complexpingpong/complexpong.h
new file mode 100644
index 0000000000..5682e99c6f
--- /dev/null
+++ b/examples/dbus/complexpingpong/complexpong.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef COMPLEXPONG_H
+#define COMPLEXPONG_H
+
+#include <QtCore/QObject>
+#include <QtDBus/QDBusAbstractAdaptor>
+#include <QtDBus/QDBusVariant>
+
+class Pong: public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "com.trolltech.QtDBus.ComplexPong.Pong")
+    Q_PROPERTY(QString value READ value WRITE setValue)
+public:
+    QString m_value;
+    QString value() const;
+    void setValue(const QString &newValue);
+
+    Pong(QObject *obj) : QDBusAbstractAdaptor(obj)
+    { }
+signals:
+    void aboutToQuit();
+public slots:
+    QDBusVariant query(const QString &query);
+    Q_NOREPLY void quit();
+};
+
+#endif
diff --git a/examples/dbus/complexpingpong/complexpong.pro b/examples/dbus/complexpingpong/complexpong.pro
new file mode 100644
index 0000000000..e62fb8569a
--- /dev/null
+++ b/examples/dbus/complexpingpong/complexpong.pro
@@ -0,0 +1,16 @@
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+QT -= gui
+CONFIG += qdbus
+
+# Input
+HEADERS += complexpong.h
+SOURCES += complexpong.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong
+INSTALLS += target sources
diff --git a/examples/dbus/complexpingpong/ping-common.h b/examples/dbus/complexpingpong/ping-common.h
new file mode 100644
index 0000000000..06228a9819
--- /dev/null
+++ b/examples/dbus/complexpingpong/ping-common.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#define SERVICE_NAME            "com.trolltech.QtDBus.PingExample"
diff --git a/examples/dbus/dbus-chat/chat.cpp b/examples/dbus/dbus-chat/chat.cpp
new file mode 100644
index 0000000000..1dbc7647b6
--- /dev/null
+++ b/examples/dbus/dbus-chat/chat.cpp
@@ -0,0 +1,164 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "chat.h"
+#include <QtGui/QApplication>
+#include <QtGui/QMessageBox>
+
+#include "chat_adaptor.h"
+#include "chat_interface.h"
+
+ChatMainWindow::ChatMainWindow()
+    : m_nickname(QLatin1String("nickname"))
+{
+    setupUi(this);
+    sendButton->setEnabled(false);
+
+    connect(messageLineEdit, SIGNAL(textChanged(QString)),
+            this, SLOT(textChangedSlot(QString)));
+    connect(sendButton, SIGNAL(clicked(bool)), this, SLOT(sendClickedSlot()));
+    connect(actionChangeNickname, SIGNAL(triggered(bool)), this, SLOT(changeNickname()));
+    connect(actionAboutQt, SIGNAL(triggered(bool)), this, SLOT(aboutQt()));
+    connect(qApp, SIGNAL(lastWindowClosed()), this, SLOT(exiting()));
+
+    // add our D-Bus interface and connect to D-Bus
+    new ChatAdaptor(this);
+    QDBusConnection::sessionBus().registerObject("/", this);
+
+    com::trolltech::chat *iface;
+    iface = new com::trolltech::chat(QString(), QString(), QDBusConnection::sessionBus(), this);
+    //connect(iface, SIGNAL(message(QString,QString)), this, SLOT(messageSlot(QString,QString)));
+    QDBusConnection::sessionBus().connect(QString(), QString(), "com.trolltech.chat", "message", this, SLOT(messageSlot(QString,QString)));
+    connect(iface, SIGNAL(action(QString,QString)), this, SLOT(actionSlot(QString,QString)));
+
+    NicknameDialog dialog;
+    dialog.cancelButton->setVisible(false);
+    dialog.exec();
+    m_nickname = dialog.nickname->text().trimmed();
+    emit action(m_nickname, QLatin1String("joins the chat"));
+}
+
+ChatMainWindow::~ChatMainWindow()
+{
+}
+
+void ChatMainWindow::rebuildHistory()
+{
+    QString history = m_messages.join( QLatin1String("\n" ) );
+    chatHistory->setPlainText(history);
+}
+
+void ChatMainWindow::messageSlot(const QString &nickname, const QString &text)
+{
+    QString msg( QLatin1String("<%1> %2") );
+    msg = msg.arg(nickname, text);
+    m_messages.append(msg);
+
+    if (m_messages.count() > 100)
+        m_messages.removeFirst();
+    rebuildHistory();
+}
+
+void ChatMainWindow::actionSlot(const QString &nickname, const QString &text)
+{
+    QString msg( QLatin1String("* %1 %2") );
+    msg = msg.arg(nickname, text);
+    m_messages.append(msg);
+
+    if (m_messages.count() > 100)
+        m_messages.removeFirst();
+    rebuildHistory();
+}
+
+void ChatMainWindow::textChangedSlot(const QString &newText)
+{
+    sendButton->setEnabled(!newText.isEmpty());
+}
+
+void ChatMainWindow::sendClickedSlot()
+{
+    //emit message(m_nickname, messageLineEdit->text());
+    QDBusMessage msg = QDBusMessage::createSignal("/", "com.trolltech.chat", "message");
+    msg << m_nickname << messageLineEdit->text();
+    QDBusConnection::sessionBus().send(msg);
+    messageLineEdit->setText(QString());
+}
+
+void ChatMainWindow::changeNickname()
+{
+    NicknameDialog dialog(this);
+    if (dialog.exec() == QDialog::Accepted) {
+        QString old = m_nickname;
+        m_nickname = dialog.nickname->text().trimmed();
+        emit action(old, QString("is now known as %1").arg(m_nickname));
+    }
+}
+
+void ChatMainWindow::aboutQt()
+{
+    QMessageBox::aboutQt(this);
+}
+
+void ChatMainWindow::exiting()
+{
+    emit action(m_nickname, QLatin1String("leaves the chat"));
+}
+
+NicknameDialog::NicknameDialog(QWidget *parent)
+    : QDialog(parent)
+{
+    setupUi(this);
+}
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    if (!QDBusConnection::sessionBus().isConnected()) {
+        qWarning("Cannot connect to the D-Bus session bus.\n"
+                 "Please check your system settings and try again.\n");
+        return 1;
+    }
+
+    ChatMainWindow chat;
+    chat.show();
+    return app.exec();
+}
diff --git a/examples/dbus/dbus-chat/chat.h b/examples/dbus/dbus-chat/chat.h
new file mode 100644
index 0000000000..48b549e2d7
--- /dev/null
+++ b/examples/dbus/dbus-chat/chat.h
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CHAT_H
+#define CHAT_H
+
+#include <QtCore/QStringList>
+#include <QtDBus/QtDBus>
+#include "ui_chatmainwindow.h"
+#include "ui_chatsetnickname.h"
+
+class ChatMainWindow: public QMainWindow, Ui::ChatMainWindow
+{
+    Q_OBJECT
+    QString m_nickname;
+    QStringList m_messages;
+public:
+    ChatMainWindow();
+    ~ChatMainWindow();
+
+    void rebuildHistory();
+
+signals:
+    void message(const QString &nickname, const QString &text);
+    void action(const QString &nickname, const QString &text);
+
+private slots:
+    void messageSlot(const QString &nickname, const QString &text);
+    void actionSlot(const QString &nickname, const QString &text);
+    void textChangedSlot(const QString &newText);
+    void sendClickedSlot();
+    void changeNickname();
+    void aboutQt();
+    void exiting();
+};
+
+class NicknameDialog: public QDialog, public Ui::NicknameDialog
+{
+    Q_OBJECT
+public:
+    NicknameDialog(QWidget *parent = 0);
+};
+
+#endif
diff --git a/examples/dbus/dbus-chat/chat_adaptor.cpp b/examples/dbus/dbus-chat/chat_adaptor.cpp
new file mode 100644
index 0000000000..4292a58d46
--- /dev/null
+++ b/examples/dbus/dbus-chat/chat_adaptor.cpp
@@ -0,0 +1,35 @@
+/*
+ * This file was generated by dbusxml2cpp version 0.6
+ * Command line was: dbusxml2cpp -i chat_adaptor.h -a :chat_adaptor.cpp com.trolltech.chat.xml
+ *
+ * dbusxml2cpp is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#include "chat_adaptor.h"
+#include <QtCore/QMetaObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+
+/*
+ * Implementation of adaptor class ChatAdaptor
+ */
+
+ChatAdaptor::ChatAdaptor(QObject *parent)
+    : QDBusAbstractAdaptor(parent)
+{
+    // constructor
+    setAutoRelaySignals(true);
+}
+
+ChatAdaptor::~ChatAdaptor()
+{
+    // destructor
+}
+
diff --git a/examples/dbus/dbus-chat/chat_adaptor.h b/examples/dbus/dbus-chat/chat_adaptor.h
new file mode 100644
index 0000000000..9d8e7a6d27
--- /dev/null
+++ b/examples/dbus/dbus-chat/chat_adaptor.h
@@ -0,0 +1,57 @@
+/*
+ * This file was generated by dbusxml2cpp version 0.6
+ * Command line was: dbusxml2cpp -a chat_adaptor.h: com.trolltech.chat.xml
+ *
+ * dbusxml2cpp is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#ifndef CHAT_ADAPTOR_H_142741156243605
+#define CHAT_ADAPTOR_H_142741156243605
+
+#include <QtCore/QObject>
+#include <QtDBus/QtDBus>
+
+QT_BEGIN_NAMESPACE
+class QByteArray;
+template<class T> class QList;
+template<class Key, class Value> class QMap;
+class QString;
+class QStringList;
+class QVariant;
+QT_END_NAMESPACE
+
+/*
+ * Adaptor class for interface com.trolltech.chat
+ */
+class ChatAdaptor: public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "com.trolltech.chat")
+    Q_CLASSINFO("D-Bus Introspection", ""
+"  <interface name=\"com.trolltech.chat\" >\n"
+"    <signal name=\"message\" >\n"
+"      <arg direction=\"out\" type=\"s\" name=\"nickname\" />\n"
+"      <arg direction=\"out\" type=\"s\" name=\"text\" />\n"
+"    </signal>\n"
+"    <signal name=\"action\" >\n"
+"      <arg direction=\"out\" type=\"s\" name=\"nickname\" />\n"
+"      <arg direction=\"out\" type=\"s\" name=\"text\" />\n"
+"    </signal>\n"
+"  </interface>\n"
+        "")
+public:
+    ChatAdaptor(QObject *parent);
+    virtual ~ChatAdaptor();
+
+public: // PROPERTIES
+public Q_SLOTS: // METHODS
+Q_SIGNALS: // SIGNALS
+    void action(const QString &nickname, const QString &text);
+    void message(const QString &nickname, const QString &text);
+};
+
+#endif
diff --git a/examples/dbus/dbus-chat/chat_interface.cpp b/examples/dbus/dbus-chat/chat_interface.cpp
new file mode 100644
index 0000000000..5e2d2a72e9
--- /dev/null
+++ b/examples/dbus/dbus-chat/chat_interface.cpp
@@ -0,0 +1,25 @@
+/*
+ * This file was generated by dbusxml2cpp version 0.6
+ * Command line was: dbusxml2cpp -i chat_interface.h -p :chat_interface.cpp chat/com.trolltech.chat.xml
+ *
+ * dbusxml2cpp is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#include "chat_interface.h"
+/*
+ * Implementation of interface class ComTrolltechChatInterface
+ */
+
+ComTrolltechChatInterface::ComTrolltechChatInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
+    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
+{
+}
+
+ComTrolltechChatInterface::~ComTrolltechChatInterface()
+{
+}
+
diff --git a/examples/dbus/dbus-chat/chat_interface.h b/examples/dbus/dbus-chat/chat_interface.h
new file mode 100644
index 0000000000..75140cc24e
--- /dev/null
+++ b/examples/dbus/dbus-chat/chat_interface.h
@@ -0,0 +1,49 @@
+/*
+ * This file was generated by dbusxml2cpp version 0.6
+ * Command line was: dbusxml2cpp -p chat_interface.h: com.trolltech.chat.xml
+ *
+ * dbusxml2cpp is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#ifndef CHAT_INTERFACE_H_143021156243606
+#define CHAT_INTERFACE_H_143021156243606
+
+#include <QtCore/QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+#include <QtDBus/QtDBus>
+
+/*
+ * Proxy class for interface com.trolltech.chat
+ */
+class ComTrolltechChatInterface: public QDBusAbstractInterface
+{
+    Q_OBJECT
+public:
+    static inline const char *staticInterfaceName()
+    { return "com.trolltech.chat"; }
+
+public:
+    ComTrolltechChatInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+
+    ~ComTrolltechChatInterface();
+
+public Q_SLOTS: // METHODS
+Q_SIGNALS: // SIGNALS
+    void action(const QString &nickname, const QString &text);
+    void message(const QString &nickname, const QString &text);
+};
+
+namespace com {
+  namespace trolltech {
+    typedef ::ComTrolltechChatInterface chat;
+  }
+}
+#endif
diff --git a/examples/dbus/dbus-chat/chatmainwindow.ui b/examples/dbus/dbus-chat/chatmainwindow.ui
new file mode 100644
index 0000000000..0616dcb137
--- /dev/null
+++ b/examples/dbus/dbus-chat/chatmainwindow.ui
@@ -0,0 +1,185 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>ChatMainWindow</class>
+ <widget class="QMainWindow" name="ChatMainWindow" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>QtDBus Chat</string>
+  </property>
+  <widget class="QWidget" name="centralwidget" >
+   <layout class="QHBoxLayout" >
+    <property name="margin" >
+     <number>9</number>
+    </property>
+    <property name="spacing" >
+     <number>6</number>
+    </property>
+    <item>
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>0</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QTextBrowser" name="chatHistory" >
+        <property name="acceptDrops" >
+         <bool>false</bool>
+        </property>
+        <property name="toolTip" >
+         <string>Messages sent and received from other users</string>
+        </property>
+        <property name="acceptRichText" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="label" >
+          <property name="text" >
+           <string>Message:</string>
+          </property>
+          <property name="buddy" >
+           <cstring>messageLineEdit</cstring>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="messageLineEdit" />
+        </item>
+        <item>
+         <widget class="QPushButton" name="sendButton" >
+          <property name="sizePolicy" >
+           <sizepolicy>
+            <hsizetype>1</hsizetype>
+            <vsizetype>0</vsizetype>
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="toolTip" >
+           <string>Sends a message to other people</string>
+          </property>
+          <property name="whatsThis" >
+           <string/>
+          </property>
+          <property name="text" >
+           <string>Send</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menubar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>800</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuQuit" >
+    <property name="title" >
+     <string>Help</string>
+    </property>
+    <addaction name="actionAboutQt" />
+   </widget>
+   <widget class="QMenu" name="menuFile" >
+    <property name="title" >
+     <string>File</string>
+    </property>
+    <addaction name="actionChangeNickname" />
+    <addaction name="separator" />
+    <addaction name="actionQuit" />
+   </widget>
+   <addaction name="menuFile" />
+   <addaction name="menuQuit" />
+  </widget>
+  <widget class="QStatusBar" name="statusbar" />
+  <action name="actionQuit" >
+   <property name="text" >
+    <string>Quit</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+Q</string>
+   </property>
+  </action>
+  <action name="actionAboutQt" >
+   <property name="text" >
+    <string>About Qt...</string>
+   </property>
+  </action>
+  <action name="actionChangeNickname" >
+   <property name="text" >
+    <string>Change nickname...</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+N</string>
+   </property>
+  </action>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>chatHistory</tabstop>
+  <tabstop>messageLineEdit</tabstop>
+  <tabstop>sendButton</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>messageLineEdit</sender>
+   <signal>returnPressed()</signal>
+   <receiver>sendButton</receiver>
+   <slot>animateClick()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>299</x>
+     <y>554</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>744</x>
+     <y>551</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>actionQuit</sender>
+   <signal>triggered(bool)</signal>
+   <receiver>ChatMainWindow</receiver>
+   <slot>close()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>399</x>
+     <y>299</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/examples/dbus/dbus-chat/chatsetnickname.ui b/examples/dbus/dbus-chat/chatsetnickname.ui
new file mode 100644
index 0000000000..fb9894e09f
--- /dev/null
+++ b/examples/dbus/dbus-chat/chatsetnickname.ui
@@ -0,0 +1,149 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>NicknameDialog</class>
+ <widget class="QDialog" name="NicknameDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>396</width>
+    <height>105</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy>
+    <hsizetype>1</hsizetype>
+    <vsizetype>1</vsizetype>
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle" >
+   <string>Set nickname</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <layout class="QVBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="label" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>1</hsizetype>
+         <vsizetype>1</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>New nickname:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="nickname" />
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>131</width>
+         <height>31</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okButton" >
+       <property name="text" >
+        <string>OK</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton" >
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>okButton</sender>
+   <signal>clicked()</signal>
+   <receiver>NicknameDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>278</x>
+     <y>253</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>96</x>
+     <y>254</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cancelButton</sender>
+   <signal>clicked()</signal>
+   <receiver>NicknameDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>369</x>
+     <y>253</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>179</x>
+     <y>282</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/examples/dbus/dbus-chat/com.trolltech.chat.xml b/examples/dbus/dbus-chat/com.trolltech.chat.xml
new file mode 100644
index 0000000000..618c8c4dcc
--- /dev/null
+++ b/examples/dbus/dbus-chat/com.trolltech.chat.xml
@@ -0,0 +1,15 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="com.trolltech.chat">
+    <signal name="message">
+      <arg name="nickname" type="s" direction="out"/>
+      <arg name="text" type="s" direction="out"/>
+    </signal>
+    <signal name="action">
+      <arg name="nickname" type="s" direction="out"/>
+      <arg name="text" type="s" direction="out"/>
+    </signal>
+  </interface>
+</node>
+
diff --git a/examples/dbus/dbus-chat/dbus-chat.pro b/examples/dbus/dbus-chat/dbus-chat.pro
new file mode 100644
index 0000000000..a094048850
--- /dev/null
+++ b/examples/dbus/dbus-chat/dbus-chat.pro
@@ -0,0 +1,19 @@
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+CONFIG += qdbus
+
+# Input
+HEADERS += chat.h chat_adaptor.h chat_interface.h
+SOURCES += chat.cpp chat_adaptor.cpp chat_interface.cpp
+FORMS += chatmainwindow.ui chatsetnickname.ui
+
+#DBUS_ADAPTORS += com.trolltech.chat.xml
+#DBUS_INTERFACES += com.trolltech.chat.xml
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/dbus/chat
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml
+sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/chat
+INSTALLS += target sources
diff --git a/examples/dbus/dbus.pro b/examples/dbus/dbus.pro
new file mode 100644
index 0000000000..36bdc1a552
--- /dev/null
+++ b/examples/dbus/dbus.pro
@@ -0,0 +1,12 @@
+TEMPLATE = subdirs
+SUBDIRS = listnames \
+	  pingpong \
+	  complexpingpong \
+	  dbus-chat \
+	  remotecontrolledcar
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/dbus
+sources.files = *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/dbus
+INSTALLS += sources
diff --git a/examples/dbus/listnames/listnames.cpp b/examples/dbus/listnames/listnames.cpp
new file mode 100644
index 0000000000..dca32e6abf
--- /dev/null
+++ b/examples/dbus/listnames/listnames.cpp
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+#include <QtCore/QStringList>
+#include <QtDBus/QtDBus>
+
+void method1()
+{
+    qDebug() << "Method 1:";
+
+    QDBusReply<QStringList> reply = QDBusConnection::sessionBus().interface()->registeredServiceNames();
+    if (!reply.isValid()) {
+        qDebug() << "Error:" << reply.error().message();
+        exit(1);
+    }
+    foreach (QString name, reply.value())
+        qDebug() << name;
+}
+
+void method2()
+{
+    qDebug() << "Method 2:";
+
+    QDBusConnection bus = QDBusConnection::sessionBus();
+    QDBusInterface dbus_iface("org.freedesktop.DBus", "/org/freedesktop/DBus",
+                              "org.freedesktop.DBus", bus);
+    qDebug() << dbus_iface.call("ListNames").arguments().at(0);
+}
+
+void method3()
+{
+    qDebug() << "Method 3:";
+    qDebug() << QDBusConnection::sessionBus().interface()->registeredServiceNames().value();
+}
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    if (!QDBusConnection::sessionBus().isConnected()) {
+        fprintf(stderr, "Cannot connect to the D-Bus session bus.\n"
+                "To start it, run:\n"
+                "\teval `dbus-launch --auto-syntax`\n");
+        return 1;
+    }
+
+    method1();
+    method2();
+    method3();
+
+    return 0;
+}
diff --git a/examples/dbus/listnames/listnames.pro b/examples/dbus/listnames/listnames.pro
new file mode 100644
index 0000000000..e2096a7c06
--- /dev/null
+++ b/examples/dbus/listnames/listnames.pro
@@ -0,0 +1,17 @@
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+QT -= gui
+CONFIG += qdbus
+win32:CONFIG += console
+
+# Input
+SOURCES += listnames.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/dbus/listnames
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/listnames
+INSTALLS += target sources
+
diff --git a/examples/dbus/pingpong/ping-common.h b/examples/dbus/pingpong/ping-common.h
new file mode 100644
index 0000000000..06228a9819
--- /dev/null
+++ b/examples/dbus/pingpong/ping-common.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#define SERVICE_NAME            "com.trolltech.QtDBus.PingExample"
diff --git a/examples/dbus/pingpong/ping.cpp b/examples/dbus/pingpong/ping.cpp
new file mode 100644
index 0000000000..d773be4453
--- /dev/null
+++ b/examples/dbus/pingpong/ping.cpp
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <stdio.h>
+
+#include <QtCore/QCoreApplication>
+#include <QtDBus/QtDBus>
+
+#include "ping-common.h"
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    if (!QDBusConnection::sessionBus().isConnected()) {
+        fprintf(stderr, "Cannot connect to the D-Bus session bus.\n"
+                "To start it, run:\n"
+                "\teval `dbus-launch --auto-syntax`\n");
+        return 1;
+    }
+
+    QDBusInterface iface(SERVICE_NAME, "/", "", QDBusConnection::sessionBus());
+    if (iface.isValid()) {
+        QDBusReply<QString> reply = iface.call("ping", argc > 1 ? argv[1] : "");
+        if (reply.isValid()) {
+            printf("Reply was: %s\n", qPrintable(reply.value()));
+            return 0;
+        }
+
+        fprintf(stderr, "Call failed: %s\n", qPrintable(reply.error().message()));
+        return 1;
+    }
+
+    fprintf(stderr, "%s\n",
+            qPrintable(QDBusConnection::sessionBus().lastError().message()));
+    return 1;
+}
diff --git a/examples/dbus/pingpong/ping.pro b/examples/dbus/pingpong/ping.pro
new file mode 100644
index 0000000000..5e5f07afef
--- /dev/null
+++ b/examples/dbus/pingpong/ping.pro
@@ -0,0 +1,16 @@
+TEMPLATE = app
+TARGET = ping
+DEPENDPATH += .
+INCLUDEPATH += .
+QT -= gui
+CONFIG += qdbus
+
+# Input
+HEADERS += ping-common.h
+SOURCES += ping.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong
+INSTALLS += target sources
diff --git a/examples/dbus/pingpong/pingpong.pro b/examples/dbus/pingpong/pingpong.pro
new file mode 100644
index 0000000000..07fca74c9a
--- /dev/null
+++ b/examples/dbus/pingpong/pingpong.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+win32:CONFIG += console
+SUBDIRS = ping.pro pong.pro
diff --git a/examples/dbus/pingpong/pong.cpp b/examples/dbus/pingpong/pong.cpp
new file mode 100644
index 0000000000..fc7800ce15
--- /dev/null
+++ b/examples/dbus/pingpong/pong.cpp
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QTimer>
+#include <QtDBus/QtDBus>
+
+#include "ping-common.h"
+#include "pong.h"
+
+QString Pong::ping(const QString &arg)
+{
+    QMetaObject::invokeMethod(QCoreApplication::instance(), "quit");
+    return QString("ping(\"%1\") got called").arg(arg);
+}
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    if (!QDBusConnection::sessionBus().isConnected()) {
+        fprintf(stderr, "Cannot connect to the D-Bus session bus.\n"
+                "To start it, run:\n"
+                "\teval `dbus-launch --auto-syntax`\n");
+        return 1;
+    }
+
+    if (!QDBusConnection::sessionBus().registerService(SERVICE_NAME)) {
+        fprintf(stderr, "%s\n",
+                qPrintable(QDBusConnection::sessionBus().lastError().message()));        
+        exit(1);
+    }
+
+    Pong pong;
+    QDBusConnection::sessionBus().registerObject("/", &pong, QDBusConnection::ExportAllSlots);
+    
+    app.exec();
+    return 0;
+}
diff --git a/examples/dbus/pingpong/pong.h b/examples/dbus/pingpong/pong.h
new file mode 100644
index 0000000000..4bc45d8683
--- /dev/null
+++ b/examples/dbus/pingpong/pong.h
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PONG_H
+#define PONG_H
+
+#include <QtCore/QObject>
+
+class Pong: public QObject
+{
+    Q_OBJECT
+public slots:
+    Q_SCRIPTABLE QString ping(const QString &arg);
+};
+
+#endif
diff --git a/examples/dbus/pingpong/pong.pro b/examples/dbus/pingpong/pong.pro
new file mode 100644
index 0000000000..f377a71f28
--- /dev/null
+++ b/examples/dbus/pingpong/pong.pro
@@ -0,0 +1,16 @@
+TEMPLATE = app
+TARGET = pong
+DEPENDPATH += .
+INCLUDEPATH += .
+QT -= gui
+CONFIG += qdbus
+
+# Input
+HEADERS += ping-common.h pong.h
+SOURCES += pong.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong
+INSTALLS += target sources
diff --git a/examples/dbus/remotecontrolledcar/car/car.cpp b/examples/dbus/remotecontrolledcar/car/car.cpp
new file mode 100644
index 0000000000..5f3bef9a1a
--- /dev/null
+++ b/examples/dbus/remotecontrolledcar/car/car.cpp
@@ -0,0 +1,138 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "car.h"
+#include <QtGui/QtGui>
+#include <math.h>
+
+static const double Pi = 3.14159265358979323846264338327950288419717;
+
+QRectF Car::boundingRect() const
+{
+    return QRectF(-35, -81, 70, 115);
+}
+
+Car::Car() : color(Qt::green), wheelsAngle(0), speed(0)
+{
+    startTimer(1000 / 33);
+    setFlag(QGraphicsItem::ItemIsMovable, true);
+    setFlag(QGraphicsItem::ItemIsFocusable, true);
+}
+
+void Car::accelerate()
+{
+    if (speed < 10)
+        ++speed;
+}
+
+void Car::decelerate()
+{
+    if (speed > -10)
+        --speed;
+}
+
+void Car::turnLeft()
+{
+    if (wheelsAngle > -30)
+        wheelsAngle -= 5;
+}
+
+void Car::turnRight()
+{
+    if (wheelsAngle < 30)
+       wheelsAngle += 5;
+}
+
+void Car::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    painter->setBrush(Qt::gray);
+    painter->drawRect(-20, -58, 40, 2); // front axel
+    painter->drawRect(-20, 7, 40, 2); // rear axel
+
+    painter->setBrush(color);
+    painter->drawRect(-25, -79, 50, 10); // front wing
+
+    painter->drawEllipse(-25, -48, 50, 20); // side pods
+    painter->drawRect(-25, -38, 50, 35); // side pods
+    painter->drawRect(-5, 9, 10, 10); // back pod
+
+    painter->drawEllipse(-10, -81, 20, 100); // main body
+
+    painter->drawRect(-17, 19, 34, 15); // rear wing
+
+    painter->setBrush(Qt::black);
+    painter->drawPie(-5, -51, 10, 15, 0, 180 * 16);
+    painter->drawRect(-5, -44, 10, 10); // cocpit
+
+    painter->save();
+    painter->translate(-20, -58);
+    painter->rotate(wheelsAngle);
+    painter->drawRect(-10, -7, 10, 15); // front left
+    painter->restore();
+
+    painter->save();
+    painter->translate(20, -58);
+    painter->rotate(wheelsAngle);
+    painter->drawRect(0, -7, 10, 15); // front left
+    painter->restore();
+
+    painter->drawRect(-30, 0, 12, 17); // rear left
+    painter->drawRect(19, 0, 12, 17);  // rear right
+}
+
+void Car::timerEvent(QTimerEvent *event)
+{
+    Q_UNUSED(event);
+
+    const qreal axelDistance = 54;
+    qreal wheelsAngleRads = (wheelsAngle * Pi) / 180;
+    qreal turnDistance = ::cos(wheelsAngleRads) * axelDistance * 2;
+    qreal turnRateRads = wheelsAngleRads / turnDistance;  // rough estimate
+    qreal turnRate = (turnRateRads * 180) / Pi;
+    qreal rotation = speed * turnRate;
+    
+    rotate(rotation);
+    translate(0, -speed);
+    update();
+}
diff --git a/examples/dbus/remotecontrolledcar/car/car.h b/examples/dbus/remotecontrolledcar/car/car.h
new file mode 100644
index 0000000000..609bc03a44
--- /dev/null
+++ b/examples/dbus/remotecontrolledcar/car/car.h
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CAR_H
+#define CAR_H
+
+#include <QGraphicsItem>
+#include <QObject>
+#include <QBrush>
+
+class Car : public QObject, public QGraphicsItem
+{
+    Q_OBJECT
+
+public:
+    Car();
+    QRectF boundingRect() const;
+
+public Q_SLOTS:
+    void accelerate();
+    void decelerate();
+    void turnLeft();
+    void turnRight();
+
+Q_SIGNALS:
+    void crashed();
+
+protected:
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
+    void timerEvent(QTimerEvent *event);
+
+private:
+    QBrush color;
+    qreal wheelsAngle; // used when applying rotation
+    qreal speed; // delta movement along the body axis
+};
+
+#endif // CAR_H
diff --git a/examples/dbus/remotecontrolledcar/car/car.pro b/examples/dbus/remotecontrolledcar/car/car.pro
new file mode 100644
index 0000000000..d4a97fa65a
--- /dev/null
+++ b/examples/dbus/remotecontrolledcar/car/car.pro
@@ -0,0 +1,20 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Mon Aug 28 19:50:14 2006
+######################################################################
+
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+CONFIG += qdbus
+
+# Input
+# DBUS_ADAPTORS += car.xml
+HEADERS += car.h car_adaptor_p.h
+SOURCES += car.cpp main.cpp car_adaptor.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/car
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.xml
+sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/car
+INSTALLS += target sources
diff --git a/examples/dbus/remotecontrolledcar/car/car.xml b/examples/dbus/remotecontrolledcar/car/car.xml
new file mode 100644
index 0000000000..641c6982d4
--- /dev/null
+++ b/examples/dbus/remotecontrolledcar/car/car.xml
@@ -0,0 +1,11 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+	"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/com/trollech/examples/car">
+	<interface name="com.trolltech.Examples.CarInterface">
+		<method name="accelerate"/>
+		<method name="decelerate"/>
+		<method name="turnLeft"/>
+		<method name="turnRight"/>
+		<signal name="crashed"/>
+	</interface>
+</node>
\ No newline at end of file
diff --git a/examples/dbus/remotecontrolledcar/car/car_adaptor.cpp b/examples/dbus/remotecontrolledcar/car/car_adaptor.cpp
new file mode 100644
index 0000000000..f0c9aa0c50
--- /dev/null
+++ b/examples/dbus/remotecontrolledcar/car/car_adaptor.cpp
@@ -0,0 +1,59 @@
+/*
+ * This file was generated by dbusxml2cpp version 0.6
+ * Command line was: dbusxml2cpp -c CarAdaptor -a car_adaptor_p.h:car_adaptor.cpp car.xml
+ *
+ * dbusxml2cpp is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#include "car_adaptor_p.h"
+#include <QtCore/QMetaObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+
+/*
+ * Implementation of adaptor class CarAdaptor
+ */
+
+CarAdaptor::CarAdaptor(QObject *parent)
+    : QDBusAbstractAdaptor(parent)
+{
+    // constructor
+    setAutoRelaySignals(true);
+}
+
+CarAdaptor::~CarAdaptor()
+{
+    // destructor
+}
+
+void CarAdaptor::accelerate()
+{
+    // handle method call com.trolltech.Examples.CarInterface.accelerate
+    QMetaObject::invokeMethod(parent(), "accelerate");
+}
+
+void CarAdaptor::decelerate()
+{
+    // handle method call com.trolltech.Examples.CarInterface.decelerate
+    QMetaObject::invokeMethod(parent(), "decelerate");
+}
+
+void CarAdaptor::turnLeft()
+{
+    // handle method call com.trolltech.Examples.CarInterface.turnLeft
+    QMetaObject::invokeMethod(parent(), "turnLeft");
+}
+
+void CarAdaptor::turnRight()
+{
+    // handle method call com.trolltech.Examples.CarInterface.turnRight
+    QMetaObject::invokeMethod(parent(), "turnRight");
+}
+
diff --git a/examples/dbus/remotecontrolledcar/car/car_adaptor_p.h b/examples/dbus/remotecontrolledcar/car/car_adaptor_p.h
new file mode 100644
index 0000000000..39782f5f7f
--- /dev/null
+++ b/examples/dbus/remotecontrolledcar/car/car_adaptor_p.h
@@ -0,0 +1,57 @@
+/*
+ * This file was generated by dbusxml2cpp version 0.6
+ * Command line was: dbusxml2cpp -c CarAdaptor -a car_adaptor_p.h:car_adaptor.cpp car.xml
+ *
+ * dbusxml2cpp is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#ifndef CAR_ADAPTOR_P_H_1157030132
+#define CAR_ADAPTOR_P_H_1157030132
+
+#include <QtCore/QObject>
+#include <QtDBus/QtDBus>
+
+QT_BEGIN_NAMESPACE
+class QByteArray;
+template<class T> class QList;
+template<class Key, class Value> class QMap;
+class QString;
+class QStringList;
+class QVariant;
+QT_END_NAMESPACE
+
+/*
+ * Adaptor class for interface com.trolltech.Examples.CarInterface
+ */
+class CarAdaptor: public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "com.trolltech.Examples.CarInterface")
+    Q_CLASSINFO("D-Bus Introspection", ""
+"  <interface name=\"com.trolltech.Examples.CarInterface\" >\n"
+"    <method name=\"accelerate\" />\n"
+"    <method name=\"decelerate\" />\n"
+"    <method name=\"turnLeft\" />\n"
+"    <method name=\"turnRight\" />\n"
+"    <signal name=\"crashed\" />\n"
+"  </interface>\n"
+        "")
+public:
+    CarAdaptor(QObject *parent);
+    virtual ~CarAdaptor();
+
+public: // PROPERTIES
+public Q_SLOTS: // METHODS
+    void accelerate();
+    void decelerate();
+    void turnLeft();
+    void turnRight();
+Q_SIGNALS: // SIGNALS
+    void crashed();
+};
+
+#endif
diff --git a/examples/dbus/remotecontrolledcar/car/main.cpp b/examples/dbus/remotecontrolledcar/car/main.cpp
new file mode 100644
index 0000000000..13a191a63b
--- /dev/null
+++ b/examples/dbus/remotecontrolledcar/car/main.cpp
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "car.h"
+#include "car_adaptor_p.h"
+#include <QtGui/QApplication>
+#include <QtGui/QGraphicsView>
+#include <QtGui/QGraphicsScene>
+#include <QtDBus/QDBusConnection>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QGraphicsScene scene;
+    scene.setSceneRect(-500, -500, 1000, 1000);
+    scene.setItemIndexMethod(QGraphicsScene::NoIndex);
+
+    Car *car = new Car();
+    scene.addItem(car);
+
+    QGraphicsView view(&scene);
+    view.setRenderHint(QPainter::Antialiasing);
+    view.setBackgroundBrush(Qt::darkGray);
+    view.setWindowTitle(QT_TRANSLATE_NOOP(QGraphicsView, "Qt DBus Controlled Car"));
+    view.resize(400, 300);
+    view.show();
+
+    new CarAdaptor(car);
+    QDBusConnection connection = QDBusConnection::sessionBus();
+    connection.registerObject("/Car", car);
+    connection.registerService("com.trolltech.CarExample");
+
+    return app.exec();
+}
diff --git a/examples/dbus/remotecontrolledcar/controller/car.xml b/examples/dbus/remotecontrolledcar/controller/car.xml
new file mode 100644
index 0000000000..641c6982d4
--- /dev/null
+++ b/examples/dbus/remotecontrolledcar/controller/car.xml
@@ -0,0 +1,11 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+	"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/com/trollech/examples/car">
+	<interface name="com.trolltech.Examples.CarInterface">
+		<method name="accelerate"/>
+		<method name="decelerate"/>
+		<method name="turnLeft"/>
+		<method name="turnRight"/>
+		<signal name="crashed"/>
+	</interface>
+</node>
\ No newline at end of file
diff --git a/examples/dbus/remotecontrolledcar/controller/car_interface.cpp b/examples/dbus/remotecontrolledcar/controller/car_interface.cpp
new file mode 100644
index 0000000000..daa946745e
--- /dev/null
+++ b/examples/dbus/remotecontrolledcar/controller/car_interface.cpp
@@ -0,0 +1,26 @@
+/*
+ * This file was generated by dbusxml2cpp version 0.6
+ * Command line was: dbusxml2cpp -c CarInterface -p car_interface_p.h:car_interface.cpp car.xml
+ *
+ * dbusxml2cpp is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#include "car_interface_p.h"
+
+/*
+ * Implementation of interface class CarInterface
+ */
+
+CarInterface::CarInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
+    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
+{
+}
+
+CarInterface::~CarInterface()
+{
+}
+
diff --git a/examples/dbus/remotecontrolledcar/controller/car_interface_p.h b/examples/dbus/remotecontrolledcar/controller/car_interface_p.h
new file mode 100644
index 0000000000..33733124f2
--- /dev/null
+++ b/examples/dbus/remotecontrolledcar/controller/car_interface_p.h
@@ -0,0 +1,74 @@
+/*
+ * This file was generated by dbusxml2cpp version 0.6
+ * Command line was: dbusxml2cpp -c CarInterface -p car_interface_p.h:car_interface.cpp car.xml
+ *
+ * dbusxml2cpp is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#ifndef CAR_INTERFACE_P_H_1156853585
+#define CAR_INTERFACE_P_H_1156853585
+
+#include <QtCore/QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+#include <QtDBus/QtDBus>
+
+/*
+ * Proxy class for interface com.trolltech.Examples.CarInterface
+ */
+class CarInterface: public QDBusAbstractInterface
+{
+    Q_OBJECT
+public:
+    static inline const char *staticInterfaceName()
+    { return "com.trolltech.Examples.CarInterface"; }
+
+public:
+    CarInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+
+    ~CarInterface();
+
+public Q_SLOTS: // METHODS
+    inline QDBusReply<void> accelerate()
+    {
+        QList<QVariant> argumentList;
+        return callWithArgumentList(QDBus::Block, QLatin1String("accelerate"), argumentList);
+    }
+
+    inline QDBusReply<void> decelerate()
+    {
+        QList<QVariant> argumentList;
+        return callWithArgumentList(QDBus::Block, QLatin1String("decelerate"), argumentList);
+    }
+
+    inline QDBusReply<void> turnLeft()
+    {
+        QList<QVariant> argumentList;
+        return callWithArgumentList(QDBus::Block, QLatin1String("turnLeft"), argumentList);
+    }
+
+    inline QDBusReply<void> turnRight()
+    {
+        QList<QVariant> argumentList;
+        return callWithArgumentList(QDBus::Block, QLatin1String("turnRight"), argumentList);
+    }
+
+Q_SIGNALS: // SIGNALS
+    void crashed();
+};
+
+namespace com {
+  namespace trolltech {
+    namespace Examples {
+      typedef ::CarInterface CarInterface;
+    }
+  }
+}
+#endif
diff --git a/examples/dbus/remotecontrolledcar/controller/controller.cpp b/examples/dbus/remotecontrolledcar/controller/controller.cpp
new file mode 100644
index 0000000000..7d27bd37a2
--- /dev/null
+++ b/examples/dbus/remotecontrolledcar/controller/controller.cpp
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "controller.h"
+#include "car_interface_p.h"
+
+Controller::Controller(QWidget *parent)
+    : QWidget(parent)
+{
+    ui.setupUi(this);
+    car = new CarInterface("com.trolltech.CarExample", "/Car",
+                           QDBusConnection::sessionBus(), this);
+    startTimer(1000);
+}
+
+void Controller::timerEvent(QTimerEvent *event)
+{
+    Q_UNUSED(event);
+    if (car->isValid())
+        ui.label->setText("connected");
+    else
+        ui.label->setText("disconnected");
+}
+
+void Controller::on_accelerate_clicked()
+{
+    car->accelerate();
+}
+
+void Controller::on_decelerate_clicked()
+{
+    car->decelerate();
+}
+
+void Controller::on_left_clicked()
+{
+    car->turnLeft();
+}
+
+void Controller::on_right_clicked()
+{
+    car->turnRight();
+}
diff --git a/examples/dbus/remotecontrolledcar/controller/controller.h b/examples/dbus/remotecontrolledcar/controller/controller.h
new file mode 100644
index 0000000000..200ef3c471
--- /dev/null
+++ b/examples/dbus/remotecontrolledcar/controller/controller.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CONTROLLER_H
+#define CONTROLLER_H
+
+#include "ui_controller.h"
+
+class CarInterface;
+
+class Controller : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Controller(QWidget *parent = 0);
+
+protected:
+    void timerEvent(QTimerEvent *event);
+
+private slots:
+    void on_accelerate_clicked();
+    void on_decelerate_clicked();
+    void on_left_clicked();
+    void on_right_clicked();
+
+private:
+    Ui::Controller ui;
+    CarInterface *car;
+};
+
+#endif
+
diff --git a/examples/dbus/remotecontrolledcar/controller/controller.pro b/examples/dbus/remotecontrolledcar/controller/controller.pro
new file mode 100644
index 0000000000..3015127cb9
--- /dev/null
+++ b/examples/dbus/remotecontrolledcar/controller/controller.pro
@@ -0,0 +1,21 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Tue Aug 29 12:28:05 2006
+######################################################################
+
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+CONFIG += qdbus
+
+# Input
+# DBUS_INTERFACES += car.xml
+FORMS += controller.ui
+HEADERS += car_interface_p.h controller.h
+SOURCES += main.cpp car_interface.cpp controller.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/controller
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml
+sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/controller
+INSTALLS += target sources
diff --git a/examples/dbus/remotecontrolledcar/controller/controller.ui b/examples/dbus/remotecontrolledcar/controller/controller.ui
new file mode 100644
index 0000000000..379015bf30
--- /dev/null
+++ b/examples/dbus/remotecontrolledcar/controller/controller.ui
@@ -0,0 +1,64 @@
+<ui version="4.0" >
+ <class>Controller</class>
+ <widget class="QWidget" name="Controller" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>255</width>
+    <height>111</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Controller</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="1" column="1" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Controller</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QPushButton" name="decelerate" >
+     <property name="text" >
+      <string>Decelerate</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QPushButton" name="accelerate" >
+     <property name="text" >
+      <string>Accelerate</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2" >
+    <widget class="QPushButton" name="right" >
+     <property name="text" >
+      <string>Right</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QPushButton" name="left" >
+     <property name="text" >
+      <string>Left</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/examples/dbus/remotecontrolledcar/controller/main.cpp b/examples/dbus/remotecontrolledcar/controller/main.cpp
new file mode 100644
index 0000000000..f28661ef82
--- /dev/null
+++ b/examples/dbus/remotecontrolledcar/controller/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtDBus>
+
+#include "controller.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Controller controller;
+    controller.show();
+    return app.exec();
+}
diff --git a/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro b/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro
new file mode 100644
index 0000000000..73bfa37d00
--- /dev/null
+++ b/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro
@@ -0,0 +1,8 @@
+TEMPLATE = subdirs
+SUBDIRS = car \
+	  controller
+
+# install
+sources.files = *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar
+INSTALLS += sources
diff --git a/examples/designer/README b/examples/designer/README
new file mode 100644
index 0000000000..fb9443caed
--- /dev/null
+++ b/examples/designer/README
@@ -0,0 +1,37 @@
+Qt Designer is a capable graphical user interface designer that lets you
+create and configure forms without writing code. GUIs created with
+Qt Designer can be compiled into an application or created at run-time.
+
+
+Some of the examples in this directory can be run from the example launcher;
+others can only be used from within Qt Designer.
+
+Documentation for these examples can be found via the "Tutorial and Examples"
+link in the main Qt documentation.
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/designer/calculatorbuilder/calculatorbuilder.pro b/examples/designer/calculatorbuilder/calculatorbuilder.pro
new file mode 100644
index 0000000000..1d69cc856f
--- /dev/null
+++ b/examples/designer/calculatorbuilder/calculatorbuilder.pro
@@ -0,0 +1,14 @@
+#! [0]
+CONFIG      += uitools
+
+HEADERS     = calculatorform.h
+RESOURCES   = calculatorbuilder.qrc
+SOURCES     = calculatorform.cpp \
+              main.cpp
+#! [0]
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/designer/calculatorbuilder
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.ui *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/designer/calculatorbuilder
+INSTALLS += target sources
diff --git a/examples/designer/calculatorbuilder/calculatorbuilder.qrc b/examples/designer/calculatorbuilder/calculatorbuilder.qrc
new file mode 100644
index 0000000000..19b39059e7
--- /dev/null
+++ b/examples/designer/calculatorbuilder/calculatorbuilder.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/forms">
+   <file>calculatorform.ui</file>
+</qresource>
+</RCC>
diff --git a/examples/designer/calculatorbuilder/calculatorform.cpp b/examples/designer/calculatorbuilder/calculatorform.cpp
new file mode 100644
index 0000000000..92d75c5d45
--- /dev/null
+++ b/examples/designer/calculatorbuilder/calculatorform.cpp
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#include <QtUiTools>
+//! [0]
+#include <QtGui>
+
+#include "calculatorform.h"
+
+//! [1]
+CalculatorForm::CalculatorForm(QWidget *parent)
+    : QWidget(parent)
+{
+    QUiLoader loader;
+
+    QFile file(":/forms/calculatorform.ui");
+    file.open(QFile::ReadOnly);
+    QWidget *formWidget = loader.load(&file, this);
+    file.close();
+//! [1]
+
+//! [2]
+    ui_inputSpinBox1 = qFindChild<QSpinBox*>(this, "inputSpinBox1");
+    ui_inputSpinBox2 = qFindChild<QSpinBox*>(this, "inputSpinBox2");
+    ui_outputWidget = qFindChild<QLabel*>(this, "outputWidget");
+//! [2]
+
+//! [3]
+    QMetaObject::connectSlotsByName(this);
+//! [3]
+
+//! [4]
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(formWidget);
+    setLayout(layout);
+
+    setWindowTitle(tr("Calculator Builder"));
+}
+//! [4]
+
+//! [5]
+void CalculatorForm::on_inputSpinBox1_valueChanged(int value)
+{
+    ui_outputWidget->setText(QString::number(value + ui_inputSpinBox2->value()));
+}
+//! [5] //! [6]
+
+//! [6] //! [7]
+void CalculatorForm::on_inputSpinBox2_valueChanged(int value)
+{
+    ui_outputWidget->setText(QString::number(value + ui_inputSpinBox1->value()));
+}
+//! [7]
diff --git a/examples/designer/calculatorbuilder/calculatorform.h b/examples/designer/calculatorbuilder/calculatorform.h
new file mode 100644
index 0000000000..8b322b707e
--- /dev/null
+++ b/examples/designer/calculatorbuilder/calculatorform.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CALCULATORFORM_H
+#define CALCULATORFORM_H
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QLabel;
+class QSpinBox;
+QT_END_NAMESPACE
+
+//! [0]
+class CalculatorForm : public QWidget
+{
+    Q_OBJECT
+
+public:
+    CalculatorForm(QWidget *parent = 0);
+
+private slots:
+    void on_inputSpinBox1_valueChanged(int value);
+    void on_inputSpinBox2_valueChanged(int value);
+
+private:
+    QSpinBox *ui_inputSpinBox1;
+    QSpinBox *ui_inputSpinBox2;
+    QLabel *ui_outputWidget;
+};
+//! [0]
+
+#endif
diff --git a/examples/designer/calculatorbuilder/calculatorform.ui b/examples/designer/calculatorbuilder/calculatorform.ui
new file mode 100644
index 0000000000..dda0e62ddd
--- /dev/null
+++ b/examples/designer/calculatorbuilder/calculatorform.ui
@@ -0,0 +1,303 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>CalculatorForm</class>
+ <widget class="QWidget" name="CalculatorForm" >
+  <property name="objectName" >
+   <string notr="true" >CalculatorForm</string>
+  </property>
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>276</width>
+    <height>98</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy>
+    <hsizetype>5</hsizetype>
+    <vsizetype>5</vsizetype>
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle" >
+   <string>Calculator Builder</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="objectName" >
+    <string notr="true" />
+   </property>
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <layout class="QHBoxLayout" >
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="margin" >
+      <number>1</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <layout class="QVBoxLayout" >
+       <property name="objectName" >
+        <string notr="true" />
+       </property>
+       <property name="margin" >
+        <number>1</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label" >
+         <property name="objectName" >
+          <string notr="true" >label</string>
+         </property>
+         <property name="geometry" >
+          <rect>
+           <x>1</x>
+           <y>1</y>
+           <width>45</width>
+           <height>19</height>
+          </rect>
+         </property>
+         <property name="text" >
+          <string>Input 1</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="inputSpinBox1" >
+         <property name="objectName" >
+          <string notr="true" >inputSpinBox1</string>
+         </property>
+         <property name="geometry" >
+          <rect>
+           <x>1</x>
+           <y>26</y>
+           <width>45</width>
+           <height>25</height>
+          </rect>
+         </property>
+         <property name="mouseTracking" >
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_3" >
+       <property name="objectName" >
+        <string notr="true" >label_3</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>54</x>
+         <y>1</y>
+         <width>7</width>
+         <height>52</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>+</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" >
+       <property name="objectName" >
+        <string notr="true" />
+       </property>
+       <property name="margin" >
+        <number>1</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_2" >
+         <property name="objectName" >
+          <string notr="true" >label_2</string>
+         </property>
+         <property name="geometry" >
+          <rect>
+           <x>1</x>
+           <y>1</y>
+           <width>45</width>
+           <height>19</height>
+          </rect>
+         </property>
+         <property name="text" >
+          <string>Input 2</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="inputSpinBox2" >
+         <property name="objectName" >
+          <string notr="true" >inputSpinBox2</string>
+         </property>
+         <property name="geometry" >
+          <rect>
+           <x>1</x>
+           <y>26</y>
+           <width>45</width>
+           <height>25</height>
+          </rect>
+         </property>
+         <property name="mouseTracking" >
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_3_2" >
+       <property name="objectName" >
+        <string notr="true" >label_3_2</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>120</x>
+         <y>1</y>
+         <width>7</width>
+         <height>52</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>=</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" >
+       <property name="objectName" >
+        <string notr="true" />
+       </property>
+       <property name="margin" >
+        <number>1</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_2_2_2" >
+         <property name="objectName" >
+          <string notr="true" >label_2_2_2</string>
+         </property>
+         <property name="geometry" >
+          <rect>
+           <x>1</x>
+           <y>1</y>
+           <width>37</width>
+           <height>17</height>
+          </rect>
+         </property>
+         <property name="text" >
+          <string>Output</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="outputWidget" >
+         <property name="objectName" >
+          <string notr="true" >outputWidget</string>
+         </property>
+         <property name="geometry" >
+          <rect>
+           <x>1</x>
+           <y>24</y>
+           <width>37</width>
+           <height>27</height>
+          </rect>
+         </property>
+         <property name="frameShape" >
+          <enum>QFrame::Box</enum>
+         </property>
+         <property name="frameShadow" >
+          <enum>QFrame::Sunken</enum>
+         </property>
+         <property name="text" >
+          <string>0</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignAbsolute|Qt::AlignBottom|Qt::AlignCenter|Qt::AlignHCenter|Qt::AlignHorizontal_Mask|Qt::AlignJustify|Qt::AlignLeading|Qt::AlignLeft|Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing|Qt::AlignVCenter|Qt::AlignVertical_Mask</set>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0" >
+    <spacer>
+     <property name="objectName" >
+      <string notr="true" >verticalSpacer</string>
+     </property>
+     <property name="geometry" >
+      <rect>
+       <x>85</x>
+       <y>69</y>
+       <width>20</width>
+       <height>20</height>
+      </rect>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1" >
+    <spacer>
+     <property name="objectName" >
+      <string notr="true" >horizontalSpacer</string>
+     </property>
+     <property name="geometry" >
+      <rect>
+       <x>188</x>
+       <y>26</y>
+       <width>79</width>
+       <height>20</height>
+      </rect>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/examples/designer/calculatorbuilder/main.cpp b/examples/designer/calculatorbuilder/main.cpp
new file mode 100644
index 0000000000..56358b8845
--- /dev/null
+++ b/examples/designer/calculatorbuilder/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "calculatorform.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(calculatorbuilder);
+
+    QApplication app(argc, argv);
+    CalculatorForm calculator;
+    calculator.show();
+    return app.exec();
+}
diff --git a/examples/designer/calculatorform/calculatorform.cpp b/examples/designer/calculatorform/calculatorform.cpp
new file mode 100644
index 0000000000..3de2852db8
--- /dev/null
+++ b/examples/designer/calculatorform/calculatorform.cpp
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "calculatorform.h"
+
+//! [0]
+CalculatorForm::CalculatorForm(QWidget *parent)
+    : QWidget(parent)
+{
+    ui.setupUi(this);
+}
+//! [0]
+
+//! [1]
+void CalculatorForm::on_inputSpinBox1_valueChanged(int value)
+{
+    ui.outputWidget->setText(QString::number(value + ui.inputSpinBox2->value()));
+}
+//! [1]
+
+//! [2]
+void CalculatorForm::on_inputSpinBox2_valueChanged(int value)
+{
+    ui.outputWidget->setText(QString::number(value + ui.inputSpinBox1->value()));
+}
+//! [2]
diff --git a/examples/designer/calculatorform/calculatorform.h b/examples/designer/calculatorform/calculatorform.h
new file mode 100644
index 0000000000..37f0a18774
--- /dev/null
+++ b/examples/designer/calculatorform/calculatorform.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CALCULATORFORM_H
+#define CALCULATORFORM_H
+
+//! [0]
+#include "ui_calculatorform.h"
+//! [0]
+
+//! [1]
+class CalculatorForm : public QWidget
+{
+    Q_OBJECT
+
+public:
+    CalculatorForm(QWidget *parent = 0);
+
+private slots:
+    void on_inputSpinBox1_valueChanged(int value);
+    void on_inputSpinBox2_valueChanged(int value);
+
+private:
+    Ui::CalculatorForm ui;
+};
+//! [1]
+
+#endif
diff --git a/examples/designer/calculatorform/calculatorform.pro b/examples/designer/calculatorform/calculatorform.pro
new file mode 100644
index 0000000000..73f4351325
--- /dev/null
+++ b/examples/designer/calculatorform/calculatorform.pro
@@ -0,0 +1,13 @@
+#! [0]
+HEADERS     = calculatorform.h
+#! [0] #! [1]
+FORMS       = calculatorform.ui
+#! [1]
+SOURCES     = calculatorform.cpp \
+              main.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/designer/calculatorform
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/designer/calculatorform
+INSTALLS += target sources
diff --git a/examples/designer/calculatorform/calculatorform.ui b/examples/designer/calculatorform/calculatorform.ui
new file mode 100644
index 0000000000..3a956399ae
--- /dev/null
+++ b/examples/designer/calculatorform/calculatorform.ui
@@ -0,0 +1,284 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>CalculatorForm</class>
+ <widget class="QWidget" name="CalculatorForm" >
+  <property name="objectName" >
+   <string notr="true" >CalculatorForm</string>
+  </property>
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy>
+    <hsizetype>5</hsizetype>
+    <vsizetype>5</vsizetype>
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle" >
+   <string>Calculator Form</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="objectName" >
+    <string notr="true" />
+   </property>
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="6" >
+    <spacer>
+     <property name="objectName" >
+      <string notr="true" >horizontalSpacer</string>
+     </property>
+     <property name="geometry" >
+      <rect>
+       <x>239</x>
+       <y>9</y>
+       <width>152</width>
+       <height>52</height>
+      </rect>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="4" >
+    <widget class="QLabel" name="label_3_2" >
+     <property name="objectName" >
+      <string notr="true" >label_3_2</string>
+     </property>
+     <property name="geometry" >
+      <rect>
+       <x>169</x>
+       <y>9</y>
+       <width>20</width>
+       <height>52</height>
+      </rect>
+     </property>
+     <property name="text" >
+      <string>=</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="5" >
+    <layout class="QVBoxLayout" >
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="margin" >
+      <number>1</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="label_2_2_2" >
+       <property name="objectName" >
+        <string notr="true" >label_2_2_2</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>1</y>
+         <width>36</width>
+         <height>17</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>Output</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="outputWidget" >
+       <property name="objectName" >
+        <string notr="true" >outputWidget</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>24</y>
+         <width>36</width>
+         <height>27</height>
+        </rect>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::Box</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Sunken</enum>
+       </property>
+       <property name="text" >
+        <string>0</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignAbsolute|Qt::AlignBottom|Qt::AlignCenter|Qt::AlignHCenter|Qt::AlignHorizontal_Mask|Qt::AlignJustify|Qt::AlignLeading|Qt::AlignLeft|Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing|Qt::AlignVCenter|Qt::AlignVertical_Mask</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="2" >
+    <spacer>
+     <property name="objectName" >
+      <string notr="true" >verticalSpacer</string>
+     </property>
+     <property name="geometry" >
+      <rect>
+       <x>89</x>
+       <y>67</y>
+       <width>20</width>
+       <height>224</height>
+      </rect>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="3" >
+    <layout class="QVBoxLayout" >
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="margin" >
+      <number>1</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="label_2" >
+       <property name="objectName" >
+        <string notr="true" >label_2</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>1</y>
+         <width>46</width>
+         <height>19</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>Input 2</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QSpinBox" name="inputSpinBox2" >
+       <property name="objectName" >
+        <string notr="true" >inputSpinBox2</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>26</y>
+         <width>46</width>
+         <height>25</height>
+        </rect>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QLabel" name="label_3" >
+     <property name="objectName" >
+      <string notr="true" >label_3</string>
+     </property>
+     <property name="geometry" >
+      <rect>
+       <x>63</x>
+       <y>9</y>
+       <width>20</width>
+       <height>52</height>
+      </rect>
+     </property>
+     <property name="text" >
+      <string>+</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <layout class="QVBoxLayout" >
+     <property name="objectName" >
+      <string notr="true" />
+     </property>
+     <property name="margin" >
+      <number>1</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="label" >
+       <property name="objectName" >
+        <string notr="true" >label</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>1</y>
+         <width>46</width>
+         <height>19</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>Input 1</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QSpinBox" name="inputSpinBox1" >
+       <property name="objectName" >
+        <string notr="true" >inputSpinBox1</string>
+       </property>
+       <property name="geometry" >
+        <rect>
+         <x>1</x>
+         <y>26</y>
+         <width>46</width>
+         <height>25</height>
+        </rect>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/examples/designer/calculatorform/main.cpp b/examples/designer/calculatorform/main.cpp
new file mode 100644
index 0000000000..dcb7366cb9
--- /dev/null
+++ b/examples/designer/calculatorform/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "calculatorform.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    CalculatorForm calculator;
+    calculator.show();
+    return app.exec();
+}
+
diff --git a/examples/designer/containerextension/containerextension.pro b/examples/designer/containerextension/containerextension.pro
new file mode 100644
index 0000000000..6a2cb58d12
--- /dev/null
+++ b/examples/designer/containerextension/containerextension.pro
@@ -0,0 +1,26 @@
+#! [0]
+TEMPLATE = lib
+#! [0]
+TARGET   = $$qtLibraryTarget($$TARGET)
+#! [1]
+CONFIG  += designer plugin
+#! [1]
+QTDIR_build:DESTDIR  = $$QT_BUILD_TREE/plugins/designer
+
+#! [2]
+HEADERS += multipagewidget.h \
+           multipagewidgetplugin.h \ 
+           multipagewidgetcontainerextension.h \
+           multipagewidgetextensionfactory.h 
+
+SOURCES += multipagewidget.cpp \
+           multipagewidgetplugin.cpp \
+           multipagewidgetcontainerextension.cpp \
+           multipagewidgetextensionfactory.cpp 
+#! [2]
+
+# install
+target.path = $$[QT_INSTALL_PLUGINS]/designer
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/designer/containerextension
+INSTALLS += target sources
diff --git a/examples/designer/containerextension/multipagewidget.cpp b/examples/designer/containerextension/multipagewidget.cpp
new file mode 100644
index 0000000000..5a3697b358
--- /dev/null
+++ b/examples/designer/containerextension/multipagewidget.cpp
@@ -0,0 +1,131 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "multipagewidget.h"
+
+MultiPageWidget::MultiPageWidget(QWidget *parent)
+    : QWidget(parent)
+{
+    comboBox = new QComboBox();
+    comboBox->setObjectName("__qt__passive_comboBox");
+    stackWidget = new QStackedWidget();
+
+    connect(comboBox, SIGNAL(activated(int)),
+            this, SLOT(setCurrentIndex(int)));
+
+    layout = new QVBoxLayout();
+    layout->addWidget(comboBox);
+    layout->addWidget(stackWidget);
+    setLayout(layout);
+}
+
+QSize MultiPageWidget::sizeHint() const
+{
+    return QSize(200, 150);
+}
+
+void MultiPageWidget::addPage(QWidget *page)
+{
+    insertPage(count(), page);
+}
+
+void MultiPageWidget::removePage(int index)
+{
+    QWidget *widget = stackWidget->widget(index);
+    stackWidget->removeWidget(widget);
+
+    comboBox->removeItem(index);
+}
+
+int MultiPageWidget::count() const
+{
+    return stackWidget->count();
+}
+
+int MultiPageWidget::currentIndex() const
+{
+    return stackWidget->currentIndex();
+}
+
+void MultiPageWidget::insertPage(int index, QWidget *page)
+{
+    page->setParent(stackWidget);
+
+    stackWidget->insertWidget(index, page);
+
+    QString title = page->windowTitle();
+    if (title.isEmpty()) {
+        title = tr("Page %1").arg(comboBox->count() + 1);
+        page->setWindowTitle(title);
+    }
+    comboBox->insertItem(index, title);
+}
+
+void MultiPageWidget::setCurrentIndex(int index)
+{
+    if (index != currentIndex()) {
+        stackWidget->setCurrentIndex(index);
+        comboBox->setCurrentIndex(index);
+        emit currentIndexChanged(index);
+    }
+}
+
+QWidget* MultiPageWidget::widget(int index)
+{
+    return stackWidget->widget(index);
+}
+
+QString MultiPageWidget::pageTitle() const
+{
+    if (const QWidget *currentWidget = stackWidget->currentWidget())
+        return currentWidget->windowTitle();
+    return QString();
+}
+
+void MultiPageWidget::setPageTitle(QString const &newTitle)
+{
+    comboBox->setItemText(currentIndex(), newTitle);
+    if (QWidget *currentWidget = stackWidget->currentWidget())
+        currentWidget->setWindowTitle(newTitle);
+    emit pageTitleChanged(newTitle);
+}
diff --git a/examples/designer/containerextension/multipagewidget.h b/examples/designer/containerextension/multipagewidget.h
new file mode 100644
index 0000000000..77a09c5ff4
--- /dev/null
+++ b/examples/designer/containerextension/multipagewidget.h
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MULTIPAGEWIDGET_H
+#define MULTIPAGEWIDGET_H
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QComboBox;
+class QStackedWidget;
+class QVBoxLayout;
+QT_END_NAMESPACE
+
+//! [0]
+class MultiPageWidget : public QWidget
+{
+    Q_OBJECT
+    Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex)
+    Q_PROPERTY(QString pageTitle READ pageTitle WRITE setPageTitle STORED false)
+
+public:
+    MultiPageWidget(QWidget *parent = 0);
+
+    QSize sizeHint() const;
+
+    int count() const;
+    int currentIndex() const;
+    QWidget *widget(int index);
+    QString pageTitle() const;
+    
+public slots:   
+    void addPage(QWidget *page);
+    void insertPage(int index, QWidget *page);
+    void removePage(int index);
+    void setPageTitle(QString const &newTitle);
+    void setCurrentIndex(int index);
+
+signals:
+    void currentIndexChanged(int index);
+    void pageTitleChanged(const QString &title);
+
+private:
+    QStackedWidget *stackWidget;
+    QComboBox *comboBox;
+    QVBoxLayout *layout;
+};
+//! [0]
+
+#endif
diff --git a/examples/designer/containerextension/multipagewidgetcontainerextension.cpp b/examples/designer/containerextension/multipagewidgetcontainerextension.cpp
new file mode 100644
index 0000000000..b61da3daf5
--- /dev/null
+++ b/examples/designer/containerextension/multipagewidgetcontainerextension.cpp
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "multipagewidgetcontainerextension.h"
+#include "multipagewidget.h"
+
+//! [0]
+MultiPageWidgetContainerExtension::MultiPageWidgetContainerExtension(MultiPageWidget *widget,
+                                                                     QObject *parent)
+    :QObject(parent)
+{
+    myWidget = widget;
+}
+//! [0]
+
+//! [1]
+void MultiPageWidgetContainerExtension::addWidget(QWidget *widget)
+{
+    myWidget->addPage(widget);
+}
+//! [1]
+
+//! [2]
+int MultiPageWidgetContainerExtension::count() const
+{
+    return myWidget->count();
+}
+//! [2]
+
+//! [3]
+int MultiPageWidgetContainerExtension::currentIndex() const
+{
+    return myWidget->currentIndex();
+}
+//! [3]
+
+//! [4]
+void MultiPageWidgetContainerExtension::insertWidget(int index, QWidget *widget)
+{
+    myWidget->insertPage(index, widget);
+}
+//! [4]
+
+//! [5]
+void MultiPageWidgetContainerExtension::remove(int index)
+{
+    myWidget->removePage(index);
+}
+//! [5]
+
+//! [6]
+void MultiPageWidgetContainerExtension::setCurrentIndex(int index)
+{
+    myWidget->setCurrentIndex(index);
+}
+//! [6]
+
+//! [7]
+QWidget* MultiPageWidgetContainerExtension::widget(int index) const
+{
+    return myWidget->widget(index);
+}
+//! [7]
diff --git a/examples/designer/containerextension/multipagewidgetcontainerextension.h b/examples/designer/containerextension/multipagewidgetcontainerextension.h
new file mode 100644
index 0000000000..661146e0d1
--- /dev/null
+++ b/examples/designer/containerextension/multipagewidgetcontainerextension.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MULTIPAGEWIDGETCONTAINEREXTENSION_H
+#define MULTIPAGEWIDGETCONTAINEREXTENSION_H
+
+#include <QtDesigner/QDesignerContainerExtension>
+
+QT_BEGIN_NAMESPACE
+class QExtensionManager;
+QT_END_NAMESPACE
+class MultiPageWidget;
+
+//! [0]
+class MultiPageWidgetContainerExtension: public QObject,
+                                         public QDesignerContainerExtension
+{
+    Q_OBJECT
+    Q_INTERFACES(QDesignerContainerExtension)
+
+public:
+    MultiPageWidgetContainerExtension(MultiPageWidget *widget, QObject *parent);
+
+    void addWidget(QWidget *widget);
+    int count() const;
+    int currentIndex() const;
+    void insertWidget(int index, QWidget *widget);
+    void remove(int index);
+    void setCurrentIndex(int index);
+    QWidget *widget(int index) const;
+
+private:
+    MultiPageWidget *myWidget;
+};
+//! [0]
+
+#endif
diff --git a/examples/designer/containerextension/multipagewidgetextensionfactory.cpp b/examples/designer/containerextension/multipagewidgetextensionfactory.cpp
new file mode 100644
index 0000000000..4a1e81b3d8
--- /dev/null
+++ b/examples/designer/containerextension/multipagewidgetextensionfactory.cpp
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "multipagewidgetextensionfactory.h"
+#include "multipagewidgetcontainerextension.h"
+#include "multipagewidget.h"
+
+//! [0]
+MultiPageWidgetExtensionFactory::MultiPageWidgetExtensionFactory(QExtensionManager *parent)
+    : QExtensionFactory(parent)
+{}
+//! [0]
+
+//! [1]
+QObject *MultiPageWidgetExtensionFactory::createExtension(QObject *object,
+                                                          const QString &iid,
+                                                          QObject *parent) const
+{
+    MultiPageWidget *widget = qobject_cast<MultiPageWidget*>(object);
+
+    if (widget && (iid == Q_TYPEID(QDesignerContainerExtension))) {
+        return new MultiPageWidgetContainerExtension(widget, parent);
+    } else {
+        return 0;
+    }
+}
+//! [1]
diff --git a/examples/designer/containerextension/multipagewidgetextensionfactory.h b/examples/designer/containerextension/multipagewidgetextensionfactory.h
new file mode 100644
index 0000000000..9a96b37023
--- /dev/null
+++ b/examples/designer/containerextension/multipagewidgetextensionfactory.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MULTIPAGEWIDGETEXTENSIONFACTORY_H
+#define MULTIPAGEWIDGETEXTENSIONFACTORY_H
+
+#include <QtDesigner/QExtensionFactory>
+
+QT_BEGIN_NAMESPACE
+class QExtensionManager;
+QT_END_NAMESPACE
+
+//! [0]
+class MultiPageWidgetExtensionFactory: public QExtensionFactory
+{
+    Q_OBJECT
+
+public:
+    MultiPageWidgetExtensionFactory(QExtensionManager *parent = 0);
+
+protected:
+    QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const;
+};
+//! [0]
+
+#endif
diff --git a/examples/designer/containerextension/multipagewidgetplugin.cpp b/examples/designer/containerextension/multipagewidgetplugin.cpp
new file mode 100644
index 0000000000..c09ed3afab
--- /dev/null
+++ b/examples/designer/containerextension/multipagewidgetplugin.cpp
@@ -0,0 +1,197 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtDesigner/QExtensionFactory>
+#include <QtDesigner/QExtensionManager>
+#include <QtDesigner/QDesignerFormEditorInterface>
+#include <QtDesigner/QDesignerFormWindowInterface>
+#include <QtDesigner/QDesignerContainerExtension>
+#include <QtDesigner/QDesignerPropertySheetExtension>
+
+#include <QIcon>
+#include <QtPlugin>
+
+#include "multipagewidget.h"
+#include "multipagewidgetplugin.h"
+#include "multipagewidgetextensionfactory.h"
+
+//! [0]
+MultiPageWidgetPlugin::MultiPageWidgetPlugin(QObject *parent)
+    :QObject(parent)
+{
+    initialized = false;
+}
+
+QString MultiPageWidgetPlugin::name() const
+{
+    return QLatin1String("MultiPageWidget");
+}
+
+QString MultiPageWidgetPlugin::group() const
+{
+    return QLatin1String("Display Widgets [Examples]");
+}
+
+QString MultiPageWidgetPlugin::toolTip() const
+{
+    return QString();
+}
+
+QString MultiPageWidgetPlugin::whatsThis() const
+{
+    return QString();
+}
+
+QString MultiPageWidgetPlugin::includeFile() const
+{
+    return QLatin1String("multipagewidget.h");
+}
+
+QIcon MultiPageWidgetPlugin::icon() const
+{
+    return QIcon();
+}
+
+//! [0] //! [1]
+bool MultiPageWidgetPlugin::isContainer() const
+{
+    return true;
+}
+
+//! [1] //! [2]
+QWidget *MultiPageWidgetPlugin::createWidget(QWidget *parent)
+{
+    MultiPageWidget *widget = new MultiPageWidget(parent);
+    connect(widget, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(currentIndexChanged(int)));
+    connect(widget, SIGNAL(pageTitleChanged(const QString &)),
+            this, SLOT(pageTitleChanged(const QString &)));
+    return widget;
+}
+
+//! [2] //! [3]
+bool MultiPageWidgetPlugin::isInitialized() const
+{
+    return initialized;
+}
+//! [3]
+
+//! [4]
+void MultiPageWidgetPlugin::initialize(QDesignerFormEditorInterface *formEditor)
+{
+    if (initialized)
+        return;
+//! [4]
+
+//! [5]
+    QExtensionManager *manager = formEditor->extensionManager();
+//! [5] //! [6]
+    QExtensionFactory *factory = new MultiPageWidgetExtensionFactory(manager);
+
+    Q_ASSERT(manager != 0);
+    manager->registerExtensions(factory, Q_TYPEID(QDesignerContainerExtension));
+
+    initialized = true;
+}
+//! [6]
+
+//! [7]
+QString MultiPageWidgetPlugin::domXml() const
+{
+    return QLatin1String("\
+<ui language=\"c++\">\
+    <widget class=\"MultiPageWidget\" name=\"multipagewidget\">\
+        <widget class=\"QWidget\" name=\"page\" />\
+    </widget>\
+    <customwidgets>\
+        <customwidget>\
+            <class>MultiPageWidget</class>\
+            <extends>QWidget</extends>\
+            <addpagemethod>addPage</addpagemethod>\
+        </customwidget>\
+    </customwidgets>\
+</ui>");
+}
+//! [7]
+
+//! [8]
+void MultiPageWidgetPlugin::currentIndexChanged(int index)
+{
+    Q_UNUSED(index);
+    MultiPageWidget *widget = qobject_cast<MultiPageWidget*>(sender());
+//! [8] //! [9]
+    if (widget) {
+        QDesignerFormWindowInterface *form = QDesignerFormWindowInterface::findFormWindow(widget);
+        if (form)
+            form->emitSelectionChanged();
+    }
+}
+//! [9]
+
+//! [10]
+void MultiPageWidgetPlugin::pageTitleChanged(const QString &title)
+{
+    Q_UNUSED(title);
+    MultiPageWidget *widget = qobject_cast<MultiPageWidget*>(sender());
+//! [10] //! [11]
+    if (widget) {
+        QWidget *page = widget->widget(widget->currentIndex());
+        QDesignerFormWindowInterface *form;
+        form = QDesignerFormWindowInterface::findFormWindow(widget);
+//! [11]
+        if (form) {
+//! [12]
+            QDesignerFormEditorInterface *editor = form->core();
+            QExtensionManager *manager = editor->extensionManager();
+//! [12] //! [13]
+            QDesignerPropertySheetExtension *sheet;
+            sheet = qt_extension<QDesignerPropertySheetExtension*>(manager, page);
+            const int propertyIndex = sheet->indexOf(QLatin1String("windowTitle"));
+            sheet->setChanged(propertyIndex, true);
+        }
+    }
+}
+
+//! [13]
+
+//! [14]
+Q_EXPORT_PLUGIN2(containerextension, MultiPageWidgetPlugin)
+//! [14]
diff --git a/examples/designer/containerextension/multipagewidgetplugin.h b/examples/designer/containerextension/multipagewidgetplugin.h
new file mode 100644
index 0000000000..1431c8a3ef
--- /dev/null
+++ b/examples/designer/containerextension/multipagewidgetplugin.h
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#ifndef MULTIPAGEWIDGETPLUGIN_H
+#define MULTIPAGEWIDGETPLUGIN_H
+
+#include <QtDesigner/QDesignerCustomWidgetInterface>
+
+QT_BEGIN_NAMESPACE
+class QIcon;
+class QWidget;
+QT_END_NAMESPACE
+
+class MultiPageWidgetPlugin: public QObject, public QDesignerCustomWidgetInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(QDesignerCustomWidgetInterface)
+public:
+    MultiPageWidgetPlugin(QObject *parent = 0);
+
+    QString name() const;
+    QString group() const;
+    QString toolTip() const;
+    QString whatsThis() const;
+    QString includeFile() const;
+    QIcon icon() const;
+    bool isContainer() const;
+    QWidget *createWidget(QWidget *parent);
+    bool isInitialized() const;
+    void initialize(QDesignerFormEditorInterface *formEditor);
+    QString domXml() const;
+
+private slots:
+    void currentIndexChanged(int index);
+    void pageTitleChanged(const QString &title);
+
+private:
+    bool initialized;
+};
+
+#endif
+//! [0]
diff --git a/examples/designer/customwidgetplugin/analogclock.cpp b/examples/designer/customwidgetplugin/analogclock.cpp
new file mode 100644
index 0000000000..28155ba0e7
--- /dev/null
+++ b/examples/designer/customwidgetplugin/analogclock.cpp
@@ -0,0 +1,111 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "analogclock.h"
+
+AnalogClock::AnalogClock(QWidget *parent)
+    : QWidget(parent)
+{
+    QTimer *timer = new QTimer(this);
+    connect(timer, SIGNAL(timeout()), this, SLOT(update()));
+    timer->start(1000);
+
+    setWindowTitle(tr("Analog Clock"));
+    resize(200, 200);
+}
+
+void AnalogClock::paintEvent(QPaintEvent *)
+{
+    static const QPoint hourHand[3] = {
+        QPoint(7, 8),
+        QPoint(-7, 8),
+        QPoint(0, -40)
+    };
+    static const QPoint minuteHand[3] = {
+        QPoint(7, 8),
+        QPoint(-7, 8),
+        QPoint(0, -70)
+    };
+
+    QColor hourColor(127, 0, 127);
+    QColor minuteColor(0, 127, 127, 191);
+
+    int side = qMin(width(), height());
+    QTime time = QTime::currentTime();
+
+    QPainter painter(this);
+    painter.setRenderHint(QPainter::Antialiasing);
+    painter.translate(width() / 2, height() / 2);
+    painter.scale(side / 200.0, side / 200.0);
+
+    painter.setPen(Qt::NoPen);
+    painter.setBrush(hourColor);
+
+    painter.save();
+    painter.rotate(30.0 * ((time.hour() + time.minute() / 60.0)));
+    painter.drawConvexPolygon(hourHand, 3);
+    painter.restore();
+
+    painter.setPen(hourColor);
+
+    for (int i = 0; i < 12; ++i) {
+        painter.drawLine(88, 0, 96, 0);
+        painter.rotate(30.0);
+    }
+
+    painter.setPen(Qt::NoPen);
+    painter.setBrush(minuteColor);
+
+    painter.save();
+    painter.rotate(6.0 * (time.minute() + time.second() / 60.0));
+    painter.drawConvexPolygon(minuteHand, 3);
+    painter.restore();
+
+    painter.setPen(minuteColor);
+
+    for (int j = 0; j < 60; ++j) {
+        if ((j % 5) != 0)
+            painter.drawLine(92, 0, 96, 0);
+        painter.rotate(6.0);
+    }
+}
diff --git a/examples/designer/customwidgetplugin/analogclock.h b/examples/designer/customwidgetplugin/analogclock.h
new file mode 100644
index 0000000000..4d843ad6dd
--- /dev/null
+++ b/examples/designer/customwidgetplugin/analogclock.h
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ANALOGCLOCK_H
+#define ANALOGCLOCK_H
+
+#include <QWidget>
+#include <QtDesigner/QDesignerExportWidget>
+
+class QDESIGNER_WIDGET_EXPORT AnalogClock : public QWidget
+{
+    Q_OBJECT
+
+public:
+    AnalogClock(QWidget *parent = 0);
+
+protected:
+    void paintEvent(QPaintEvent *event);
+};
+
+#endif
diff --git a/examples/designer/customwidgetplugin/customwidgetplugin.cpp b/examples/designer/customwidgetplugin/customwidgetplugin.cpp
new file mode 100644
index 0000000000..bcea3b84a1
--- /dev/null
+++ b/examples/designer/customwidgetplugin/customwidgetplugin.cpp
@@ -0,0 +1,156 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "analogclock.h"
+#include "customwidgetplugin.h"
+
+#include <QtPlugin>
+
+//! [0]
+AnalogClockPlugin::AnalogClockPlugin(QObject *parent)
+    : QObject(parent)
+{
+    initialized = false;
+}
+//! [0]
+
+//! [1]
+void AnalogClockPlugin::initialize(QDesignerFormEditorInterface * /* core */)
+{
+    if (initialized)
+        return;
+
+    initialized = true;
+}
+//! [1]
+
+//! [2]
+bool AnalogClockPlugin::isInitialized() const
+{
+    return initialized;
+}
+//! [2]
+
+//! [3]
+QWidget *AnalogClockPlugin::createWidget(QWidget *parent)
+{
+    return new AnalogClock(parent);
+}
+//! [3]
+
+//! [4]
+QString AnalogClockPlugin::name() const
+{
+    return "AnalogClock";
+}
+//! [4]
+
+//! [5]
+QString AnalogClockPlugin::group() const
+{
+    return "Display Widgets [Examples]";
+}
+//! [5]
+
+//! [6]
+QIcon AnalogClockPlugin::icon() const
+{
+    return QIcon();
+}
+//! [6]
+
+//! [7]
+QString AnalogClockPlugin::toolTip() const
+{
+    return "";
+}
+//! [7]
+
+//! [8]
+QString AnalogClockPlugin::whatsThis() const
+{
+    return "";
+}
+//! [8]
+
+//! [9]
+bool AnalogClockPlugin::isContainer() const
+{
+    return false;
+}
+//! [9]
+
+//! [10]
+QString AnalogClockPlugin::domXml() const
+{
+    return "<ui language=\"c++\">\n"
+           " <widget class=\"AnalogClock\" name=\"analogClock\">\n"
+//! [11]
+           "  <property name=\"geometry\">\n"
+           "   <rect>\n"
+           "    <x>0</x>\n"
+           "    <y>0</y>\n"
+           "    <width>100</width>\n"
+           "    <height>100</height>\n"
+           "   </rect>\n"
+           "  </property>\n"
+//! [11]
+           "  <property name=\"toolTip\" >\n"
+           "   <string>The current time</string>\n"
+           "  </property>\n"
+           "  <property name=\"whatsThis\" >\n"
+           "   <string>The analog clock widget displays the current time.</string>\n"
+           "  </property>\n"
+           " </widget>\n"
+           "</ui>\n";
+}
+//! [10]
+
+//! [12]
+QString AnalogClockPlugin::includeFile() const
+{
+    return "analogclock.h";
+}
+//! [12]
+
+//! [13]
+Q_EXPORT_PLUGIN2(customwidgetplugin, AnalogClockPlugin)
+//! [13]
diff --git a/examples/designer/customwidgetplugin/customwidgetplugin.h b/examples/designer/customwidgetplugin/customwidgetplugin.h
new file mode 100644
index 0000000000..4438690bce
--- /dev/null
+++ b/examples/designer/customwidgetplugin/customwidgetplugin.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CUSTOMWIDGETPLUGIN_H
+#define CUSTOMWIDGETPLUGIN_H
+
+#include <QDesignerCustomWidgetInterface>
+
+//! [0]
+class AnalogClockPlugin : public QObject, public QDesignerCustomWidgetInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(QDesignerCustomWidgetInterface)
+
+public:
+    AnalogClockPlugin(QObject *parent = 0);
+
+    bool isContainer() const;
+    bool isInitialized() const;
+    QIcon icon() const;
+    QString domXml() const;
+    QString group() const;
+    QString includeFile() const;
+    QString name() const;
+    QString toolTip() const;
+    QString whatsThis() const;
+    QWidget *createWidget(QWidget *parent);
+    void initialize(QDesignerFormEditorInterface *core);
+
+private:
+    bool initialized;
+};
+//! [0]
+
+#endif
diff --git a/examples/designer/customwidgetplugin/customwidgetplugin.pro b/examples/designer/customwidgetplugin/customwidgetplugin.pro
new file mode 100644
index 0000000000..4feee59f6a
--- /dev/null
+++ b/examples/designer/customwidgetplugin/customwidgetplugin.pro
@@ -0,0 +1,21 @@
+#! [0] #! [1]
+CONFIG      += designer plugin
+#! [0]
+TARGET      = $$qtLibraryTarget($$TARGET)
+#! [2]
+TEMPLATE    = lib
+#! [1] #! [2]
+QTDIR_build:DESTDIR     = $$QT_BUILD_TREE/plugins/designer
+
+#! [3]
+HEADERS     = analogclock.h \
+              customwidgetplugin.h
+SOURCES     = analogclock.cpp \
+              customwidgetplugin.cpp
+#! [3]
+
+# install
+target.path = $$[QT_INSTALL_PLUGINS]/designer
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/designer/customwidgetplugin
+INSTALLS += target sources
diff --git a/examples/designer/designer.pro b/examples/designer/designer.pro
new file mode 100644
index 0000000000..0f30421aca
--- /dev/null
+++ b/examples/designer/designer.pro
@@ -0,0 +1,19 @@
+TEMPLATE    = subdirs
+SUBDIRS     = calculatorform
+
+!static:SUBDIRS += calculatorbuilder \
+                   containerextension \
+                   customwidgetplugin \
+                   taskmenuextension \
+                   worldtimeclockbuilder \
+                   worldtimeclockplugin
+
+# the sun cc compiler has a problem with the include lines for the form.prf
+solaris-cc*:SUBDIRS -= calculatorbuilder \
+		       worldtimeclockbuilder
+		     
+
+# install
+sources.files = README *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/designer
+INSTALLS += sources
diff --git a/examples/designer/taskmenuextension/taskmenuextension.pro b/examples/designer/taskmenuextension/taskmenuextension.pro
new file mode 100644
index 0000000000..83dd8788c3
--- /dev/null
+++ b/examples/designer/taskmenuextension/taskmenuextension.pro
@@ -0,0 +1,25 @@
+#! [0]
+TEMPLATE = lib
+#! [0]
+TARGET   = $$qtLibraryTarget($$TARGET)
+#! [1]
+CONFIG  += designer plugin
+#! [1]
+QTDIR_build:DESTDIR  = $$QT_BUILD_TREE/plugins/designer
+
+#! [2]
+HEADERS += tictactoe.h \
+           tictactoedialog.h \
+           tictactoeplugin.h \
+           tictactoetaskmenu.h
+SOURCES += tictactoe.cpp \
+           tictactoedialog.cpp \
+           tictactoeplugin.cpp \
+           tictactoetaskmenu.cpp
+#! [2]
+
+# install
+target.path = $$[QT_INSTALL_PLUGINS]/designer
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/designer/taskmenuextension
+INSTALLS += target sources
diff --git a/examples/designer/taskmenuextension/tictactoe.cpp b/examples/designer/taskmenuextension/tictactoe.cpp
new file mode 100644
index 0000000000..ba766ccd36
--- /dev/null
+++ b/examples/designer/taskmenuextension/tictactoe.cpp
@@ -0,0 +1,176 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "tictactoe.h"
+
+TicTacToe::TicTacToe(QWidget *parent)
+    : QWidget(parent)
+{
+}
+
+QSize TicTacToe::minimumSizeHint() const
+{
+    return QSize(200, 200);
+}
+
+QSize TicTacToe::sizeHint() const
+{
+    return QSize(200, 200);
+}
+
+void TicTacToe::setState(const QString &newState)
+{
+    turnNumber = 0;
+    myState = "---------";
+    int position = 0;
+    while (position < 9 && position < newState.length()) {
+        QChar mark = newState.at(position);
+        if (mark == Cross || mark == Nought) {
+            ++turnNumber;
+            myState.replace(position, 1, mark);
+        }
+        position++;
+    }
+    update();
+}
+
+QString TicTacToe::state() const
+{
+    return myState;
+}
+
+void TicTacToe::clearBoard()
+{
+    myState = "---------";
+    turnNumber = 0;
+    update();
+}
+
+void TicTacToe::mousePressEvent(QMouseEvent *event)
+{
+    if (turnNumber == 9) {
+        clearBoard();
+        update();
+    } else {
+        for (int position = 0; position < 9; ++position) {
+            QRect cell = cellRect(position / 3, position % 3);
+            if (cell.contains(event->pos())) {
+                if (myState.at(position) == Empty) {
+                    if (turnNumber % 2 == 0)
+                        myState.replace(position, 1, Cross);
+                    else
+                        myState.replace(position, 1, Nought);
+                    ++turnNumber;
+                    update();
+                }
+            }
+        }
+    }
+}
+
+void TicTacToe::paintEvent(QPaintEvent * /* event */)
+{
+    QPainter painter(this);
+    painter.setRenderHint(QPainter::Antialiasing);
+
+    painter.setPen(QPen(Qt::darkGreen, 1));
+    painter.drawLine(cellWidth(), 0, cellWidth(), height());
+    painter.drawLine(2 * cellWidth(), 0, 2 * cellWidth(), height());
+    painter.drawLine(0, cellHeight(), width(), cellHeight());
+    painter.drawLine(0, 2 * cellHeight(), width(), 2 * cellHeight());
+
+    painter.setPen(QPen(Qt::darkBlue, 2));
+
+    for (int position = 0; position < 9; ++position) {
+        QRect cell = cellRect(position / 3, position % 3);
+
+        if (myState.at(position) == Cross) {
+            painter.drawLine(cell.topLeft(), cell.bottomRight());
+            painter.drawLine(cell.topRight(), cell.bottomLeft());
+        } else if (myState.at(position) == Nought) {
+            painter.drawEllipse(cell);
+        }
+    }
+
+    painter.setPen(QPen(Qt::yellow, 3));
+
+    for (int position = 0; position < 9; position = position + 3) {
+        if (myState.at(position) != Empty
+                && myState.at(position + 1) == myState.at(position)
+                && myState.at(position + 2) == myState.at(position)) {
+            int y = cellRect((position / 3), 0).center().y();
+            painter.drawLine(0, y, width(), y);
+            turnNumber = 9;
+        }
+    }
+
+    for (int position = 0; position < 3; ++position) {
+        if (myState.at(position) != Empty
+                && myState.at(position + 3) == myState.at(position)
+                && myState.at(position + 6) == myState.at(position)) {
+            int x = cellRect(0, position).center().x();
+            painter.drawLine(x, 0, x, height());
+            turnNumber = 9;
+        }
+    }
+    if (myState.at(0) != Empty && myState.at(4) == myState.at(0)
+            && myState.at(8) == myState.at(0)) {
+        painter.drawLine(0, 0, width(), height());
+        turnNumber = 9;
+    }
+    if (myState.at(2) != Empty && myState.at(4) == myState.at(2)
+            && myState.at(6) == myState.at(2)) {
+        painter.drawLine(0, height(), width(), 0);
+        turnNumber = 9;
+    }
+}
+
+QRect TicTacToe::cellRect(int row, int column) const
+{
+    const int HMargin = width() / 30;
+    const int VMargin = height() / 30;
+    return QRect(column * cellWidth() + HMargin,
+                 row * cellHeight() + VMargin,
+                 cellWidth() - 2 * HMargin,
+                 cellHeight() - 2 * VMargin);
+}
diff --git a/examples/designer/taskmenuextension/tictactoe.h b/examples/designer/taskmenuextension/tictactoe.h
new file mode 100644
index 0000000000..ef3c533e57
--- /dev/null
+++ b/examples/designer/taskmenuextension/tictactoe.h
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TICTACTOE_H
+#define TICTACTOE_H
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QRect;
+class QSize;
+QT_END_NAMESPACE
+
+//! [0]
+class TicTacToe : public QWidget
+{
+    Q_OBJECT
+    Q_PROPERTY(QString state READ state WRITE setState)
+
+public:
+    TicTacToe(QWidget *parent = 0);
+
+    QSize minimumSizeHint() const;
+    QSize sizeHint() const;
+    void setState(const QString &newState);
+    QString state() const;
+    void clearBoard();
+
+protected:
+    void mousePressEvent(QMouseEvent *event);
+    void paintEvent(QPaintEvent *event);
+
+private:
+    enum { Empty = '-', Cross = 'X', Nought = 'O' };
+
+    QRect cellRect(int row, int col) const;
+    int cellWidth() const { return width() / 3; }
+    int cellHeight() const { return height() / 3; }
+
+    QString myState;
+    int turnNumber;
+};
+//! [0]
+
+#endif
diff --git a/examples/designer/taskmenuextension/tictactoedialog.cpp b/examples/designer/taskmenuextension/tictactoedialog.cpp
new file mode 100644
index 0000000000..a9bd16a084
--- /dev/null
+++ b/examples/designer/taskmenuextension/tictactoedialog.cpp
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtDesigner>
+
+#include "tictactoe.h"
+#include "tictactoedialog.h"
+
+//! [0]
+TicTacToeDialog::TicTacToeDialog(TicTacToe *tic, QWidget *parent)
+    : QDialog(parent)
+{
+    ticTacToe = tic;
+    editor = new TicTacToe;
+    editor->setState(ticTacToe->state());
+
+    buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok
+                                     | QDialogButtonBox::Cancel
+                                     | QDialogButtonBox::Reset);
+
+    connect(buttonBox->button(QDialogButtonBox::Reset), SIGNAL(clicked()),
+            this, SLOT(resetState()));
+    connect(buttonBox, SIGNAL(accepted()), this, SLOT(saveState()));
+    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(editor);
+    mainLayout->addWidget(buttonBox);
+
+    setLayout(mainLayout);
+    setWindowTitle(tr("Edit State"));
+}
+//! [0]
+
+//! [1]
+QSize TicTacToeDialog::sizeHint() const
+{
+    return QSize(250, 250);
+}
+//! [1]
+
+//! [2]
+void TicTacToeDialog::resetState()
+{
+    editor->clearBoard();
+}
+//! [2]
+
+//! [3]
+void TicTacToeDialog::saveState()
+{
+//! [3] //! [4]
+    if (QDesignerFormWindowInterface *formWindow
+            = QDesignerFormWindowInterface::findFormWindow(ticTacToe)) {
+        formWindow->cursor()->setProperty("state", editor->state());
+    }
+//! [4] //! [5]
+    accept();
+}
+//! [5]
diff --git a/examples/designer/taskmenuextension/tictactoedialog.h b/examples/designer/taskmenuextension/tictactoedialog.h
new file mode 100644
index 0000000000..55b25d29b5
--- /dev/null
+++ b/examples/designer/taskmenuextension/tictactoedialog.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TICTACTOEDIALOG_H
+#define TICTACTOEDIALOG_H
+
+#include <QDialog>
+
+QT_BEGIN_NAMESPACE
+class QDialogButtonBox;
+QT_END_NAMESPACE
+class TicTacToe;
+
+//! [0]
+class TicTacToeDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    TicTacToeDialog(TicTacToe *plugin = 0, QWidget *parent = 0);
+
+    QSize sizeHint() const;
+
+private slots:
+    void resetState();
+    void saveState();
+
+private:
+    TicTacToe *editor;
+    TicTacToe *ticTacToe;
+    QDialogButtonBox *buttonBox;
+};
+//! [0]
+
+#endif
diff --git a/examples/designer/taskmenuextension/tictactoeplugin.cpp b/examples/designer/taskmenuextension/tictactoeplugin.cpp
new file mode 100644
index 0000000000..0a2d13b0b7
--- /dev/null
+++ b/examples/designer/taskmenuextension/tictactoeplugin.cpp
@@ -0,0 +1,142 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtDesigner>
+#include <QtGui>
+#include <QtPlugin>
+
+#include "tictactoe.h"
+#include "tictactoeplugin.h"
+#include "tictactoetaskmenu.h"
+
+//! [0]
+TicTacToePlugin::TicTacToePlugin(QObject *parent)
+    : QObject(parent)
+{
+    initialized = false;
+}
+
+QString TicTacToePlugin::name() const
+{
+    return "TicTacToe";
+}
+
+QString TicTacToePlugin::group() const
+{
+    return "Display Widgets [Examples]";
+}
+
+QString TicTacToePlugin::toolTip() const
+{
+    return "";
+}
+
+QString TicTacToePlugin::whatsThis() const
+{
+    return "";
+}
+
+QString TicTacToePlugin::includeFile() const
+{
+    return "tictactoe.h";
+}
+
+QIcon TicTacToePlugin::icon() const
+{
+    return QIcon();
+}
+
+bool TicTacToePlugin::isContainer() const
+{
+    return false;
+}
+
+QWidget *TicTacToePlugin::createWidget(QWidget *parent)
+{
+    TicTacToe *ticTacToe = new TicTacToe(parent);
+    ticTacToe->setState("-X-XO----");
+    return ticTacToe;
+}
+
+bool TicTacToePlugin::isInitialized() const
+{
+    return initialized;
+}
+
+//! [0] //! [1]
+void TicTacToePlugin::initialize(QDesignerFormEditorInterface *formEditor)
+{
+//! [1] //! [2]
+    if (initialized)
+        return;
+
+    QExtensionManager *manager = formEditor->extensionManager();
+    Q_ASSERT(manager != 0);
+//! [2]
+
+//! [3]
+    manager->registerExtensions(new TicTacToeTaskMenuFactory(manager),
+                                Q_TYPEID(QDesignerTaskMenuExtension));
+
+    initialized = true;
+}
+
+QString TicTacToePlugin::domXml() const
+{
+    return QLatin1String("\
+<ui language=\"c++\">\
+    <widget class=\"TicTacToe\" name=\"ticTacToe\"/>\
+    <customwidgets>\
+        <customwidget>\
+            <class>TicTacToe</class>\
+            <propertyspecifications>\
+            <stringpropertyspecification name=\"state\" notr=\"true\" type=\"singleline\"/>\
+            </propertyspecifications>\
+        </customwidget>\
+    </customwidgets>\
+</ui>");
+}
+
+//! [3]
+
+//! [4]
+Q_EXPORT_PLUGIN2(taskmenuextension, TicTacToePlugin)
+//! [4]
diff --git a/examples/designer/taskmenuextension/tictactoeplugin.h b/examples/designer/taskmenuextension/tictactoeplugin.h
new file mode 100644
index 0000000000..b51540ef63
--- /dev/null
+++ b/examples/designer/taskmenuextension/tictactoeplugin.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#ifndef TICTACTOEPLUGIN_H
+#define TICTACTOEPLUGIN_H
+
+#include <QDesignerCustomWidgetInterface>
+
+QT_BEGIN_NAMESPACE
+class QIcon;
+class QWidget;
+QT_END_NAMESPACE
+
+class TicTacToePlugin : public QObject, public QDesignerCustomWidgetInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(QDesignerCustomWidgetInterface)
+
+public:
+    TicTacToePlugin(QObject *parent = 0);
+
+    QString name() const;
+    QString group() const;
+    QString toolTip() const;
+    QString whatsThis() const;
+    QString includeFile() const;
+    QIcon icon() const;
+    bool isContainer() const;
+    QWidget *createWidget(QWidget *parent);
+    bool isInitialized() const;
+    void initialize(QDesignerFormEditorInterface *formEditor);
+    QString domXml() const;
+
+private:
+    bool initialized;
+};
+
+#endif
+//! [0]
diff --git a/examples/designer/taskmenuextension/tictactoetaskmenu.cpp b/examples/designer/taskmenuextension/tictactoetaskmenu.cpp
new file mode 100644
index 0000000000..af5401a899
--- /dev/null
+++ b/examples/designer/taskmenuextension/tictactoetaskmenu.cpp
@@ -0,0 +1,104 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtDesigner>
+#include <QtGui>
+
+#include "tictactoe.h"
+#include "tictactoedialog.h"
+#include "tictactoetaskmenu.h"
+
+//! [0]
+TicTacToeTaskMenu::TicTacToeTaskMenu(TicTacToe *tic, QObject *parent)
+    : QObject(parent)
+{
+    ticTacToe = tic;
+
+    editStateAction = new QAction(tr("Edit State..."), this);
+    connect(editStateAction, SIGNAL(triggered()), this, SLOT(editState()));
+}
+//! [0]
+
+//! [1]
+void TicTacToeTaskMenu::editState()
+{
+    TicTacToeDialog dialog(ticTacToe);
+    dialog.exec();
+}
+//! [1]
+
+//! [2]
+QAction *TicTacToeTaskMenu::preferredEditAction() const
+{
+    return editStateAction;
+}
+//! [2]
+
+//! [3]
+QList<QAction *> TicTacToeTaskMenu::taskActions() const
+{
+    QList<QAction *> list;
+    list.append(editStateAction);
+    return list;
+}
+//! [3]
+
+//! [4]
+TicTacToeTaskMenuFactory::TicTacToeTaskMenuFactory(QExtensionManager *parent)
+    : QExtensionFactory(parent)
+{
+}
+//! [4]
+
+//! [5]
+QObject *TicTacToeTaskMenuFactory::createExtension(QObject *object,
+                                                   const QString &iid,
+                                                   QObject *parent) const
+{
+    if (iid != Q_TYPEID(QDesignerTaskMenuExtension))
+        return 0;
+
+    if (TicTacToe *tic = qobject_cast<TicTacToe*>(object))
+        return new TicTacToeTaskMenu(tic, parent);
+
+    return 0;
+}
+//! [5]
diff --git a/examples/designer/taskmenuextension/tictactoetaskmenu.h b/examples/designer/taskmenuextension/tictactoetaskmenu.h
new file mode 100644
index 0000000000..4bd317022f
--- /dev/null
+++ b/examples/designer/taskmenuextension/tictactoetaskmenu.h
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TICTACTOETASKMENU_H
+#define TICTACTOETASKMENU_H
+
+#include <QDesignerTaskMenuExtension>
+#include <QExtensionFactory>
+
+QT_BEGIN_NAMESPACE
+class QAction;
+class QExtensionManager;
+QT_END_NAMESPACE
+class TicTacToe;
+
+//! [0]
+class TicTacToeTaskMenu : public QObject, public QDesignerTaskMenuExtension
+{
+    Q_OBJECT
+    Q_INTERFACES(QDesignerTaskMenuExtension)
+
+public:
+    TicTacToeTaskMenu(TicTacToe *tic, QObject *parent);
+
+    QAction *preferredEditAction() const;
+    QList<QAction *> taskActions() const;
+
+private slots:
+    void editState();
+
+private:
+    QAction *editStateAction;
+    TicTacToe *ticTacToe;
+};
+//! [0]
+
+//! [1]
+class TicTacToeTaskMenuFactory : public QExtensionFactory
+{
+    Q_OBJECT
+
+public:
+    TicTacToeTaskMenuFactory(QExtensionManager *parent = 0);
+
+protected:
+    QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const;
+};
+//! [1]
+
+#endif
diff --git a/examples/designer/worldtimeclockbuilder/form.ui b/examples/designer/worldtimeclockbuilder/form.ui
new file mode 100644
index 0000000000..e5be1d911f
--- /dev/null
+++ b/examples/designer/worldtimeclockbuilder/form.ui
@@ -0,0 +1,162 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>WorldTimeForm</class>
+ <widget class="QWidget" name="WorldTimeForm" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>World Time Clock</string>
+  </property>
+  <layout class="QHBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="WorldTimeClock" name="worldTimeClock" />
+   </item>
+   <item>
+    <layout class="QVBoxLayout" >
+     <property name="margin" >
+      <number>1</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" >
+       <property name="margin" >
+        <number>1</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label" >
+         <property name="text" >
+          <string>Current time:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QTimeEdit" name="timeEdit" >
+         <property name="readOnly" >
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" >
+       <property name="margin" >
+        <number>1</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_2" >
+         <property name="text" >
+          <string>Set time zone:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="spinBox" >
+         <property name="maximum" >
+          <number>12</number>
+         </property>
+         <property name="minimum" >
+          <number>-12</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>WorldTimeClock</class>
+   <extends></extends>
+   <header>worldtimeclock.h</header>
+   <container>0</container>
+   <pixmap></pixmap>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>spinBox</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>worldTimeClock</receiver>
+   <slot>setTimeZone(int)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>339</x>
+     <y>166</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>230</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>worldTimeClock</sender>
+   <signal>updated(QTime)</signal>
+   <receiver>timeEdit</receiver>
+   <slot>setTime(QTime)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>141</x>
+     <y>59</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>291</x>
+     <y>133</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/examples/designer/worldtimeclockbuilder/main.cpp b/examples/designer/worldtimeclockbuilder/main.cpp
new file mode 100644
index 0000000000..35f7dc05d0
--- /dev/null
+++ b/examples/designer/worldtimeclockbuilder/main.cpp
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#include <QtUiTools>
+//! [0]
+#include <QtGui>
+
+//! [1]
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(worldtimeclockbuilder);
+
+    QApplication app(argc, argv);
+
+    QUiLoader loader;
+//! [1]
+
+//! [2]
+    QFile file(":/forms/form.ui");
+    file.open(QFile::ReadOnly);
+
+    QWidget *widget = loader.load(&file);
+
+    file.close();
+    widget->show();
+//! [2]
+
+//! [3]
+    return app.exec();
+}
+//! [3]
diff --git a/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro b/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro
new file mode 100644
index 0000000000..2690921673
--- /dev/null
+++ b/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro
@@ -0,0 +1,11 @@
+#! [0]
+CONFIG      += uitools
+SOURCES     = main.cpp
+RESOURCES   = worldtimeclockbuilder.qrc
+#! [0]
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/designer/worldtimeclockbuilder
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.ui *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/designer/worldtimeclockbuilder
+INSTALLS += target sources
diff --git a/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.qrc b/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.qrc
new file mode 100644
index 0000000000..89d5ac3c22
--- /dev/null
+++ b/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/forms">
+   <file>form.ui</file>
+</qresource>
+</RCC>
diff --git a/examples/designer/worldtimeclockplugin/worldtimeclock.cpp b/examples/designer/worldtimeclockplugin/worldtimeclock.cpp
new file mode 100644
index 0000000000..77eff54765
--- /dev/null
+++ b/examples/designer/worldtimeclockplugin/worldtimeclock.cpp
@@ -0,0 +1,122 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "worldtimeclock.h"
+
+WorldTimeClock::WorldTimeClock(QWidget *parent)
+    : QWidget(parent)
+{
+    timeZoneOffset = 0;
+
+    QTimer *timer = new QTimer(this);
+    connect(timer, SIGNAL(timeout()), this, SLOT(update()));
+    timer->start(1000);
+
+    setWindowTitle(tr("World Time Clock"));
+    resize(200, 200);
+}
+
+void WorldTimeClock::paintEvent(QPaintEvent *)
+{
+    static const QPoint hourHand[3] = {
+        QPoint(7, 8),
+        QPoint(-7, 8),
+        QPoint(0, -40)
+    };
+    static const QPoint minuteHand[3] = {
+        QPoint(7, 8),
+        QPoint(-7, 8),
+        QPoint(0, -70)
+    };
+
+    QColor hourColor(127, 0, 127);
+    QColor minuteColor(0, 127, 127, 191);
+
+    int side = qMin(width(), height());
+    QTime time = QTime::currentTime();
+    time = time.addSecs(timeZoneOffset);
+
+    QPainter painter(this);
+    painter.setRenderHint(QPainter::Antialiasing);
+    painter.translate(width() / 2, height() / 2);
+    painter.scale(side / 200.0, side / 200.0);
+
+    painter.setPen(Qt::NoPen);
+    painter.setBrush(hourColor);
+
+    painter.save();
+    painter.rotate(30.0 * ((time.hour() + time.minute() / 60.0)));
+    painter.drawConvexPolygon(hourHand, 3);
+    painter.restore();
+
+    painter.setPen(hourColor);
+
+    for (int i = 0; i < 12; ++i) {
+        painter.drawLine(88, 0, 96, 0);
+        painter.rotate(30.0);
+    }
+
+    painter.setPen(Qt::NoPen);
+    painter.setBrush(minuteColor);
+
+    painter.save();
+    painter.rotate(6.0 * (time.minute() + time.second() / 60.0));
+    painter.drawConvexPolygon(minuteHand, 3);
+    painter.restore();
+
+    painter.setPen(minuteColor);
+
+    for (int j = 0; j < 60; ++j) {
+        if ((j % 5) != 0)
+            painter.drawLine(92, 0, 96, 0);
+        painter.rotate(6.0);
+    }
+
+    emit updated(time);
+}
+
+void WorldTimeClock::setTimeZone(int hourOffset)
+{
+    timeZoneOffset = qMin(qMax(-12, hourOffset), 12) * 3600;
+    update();
+}
diff --git a/examples/designer/worldtimeclockplugin/worldtimeclock.h b/examples/designer/worldtimeclockplugin/worldtimeclock.h
new file mode 100644
index 0000000000..7bfe8c5fab
--- /dev/null
+++ b/examples/designer/worldtimeclockplugin/worldtimeclock.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WORLDTIMECLOCK_H
+#define WORLDTIMECLOCK_H
+
+#include <QTime>
+#include <QWidget>
+#include <QtDesigner/QDesignerExportWidget>
+
+//! [0] //! [1]
+class QDESIGNER_WIDGET_EXPORT WorldTimeClock : public QWidget
+{
+    Q_OBJECT
+//! [0]
+
+public:
+    WorldTimeClock(QWidget *parent = 0);
+
+public slots:
+    void setTimeZone(int hourOffset);
+
+signals:
+    void updated(QTime currentTime);
+
+protected:
+    void paintEvent(QPaintEvent *event);
+
+private:
+    int timeZoneOffset;
+//! [2]
+};
+//! [1] //! [2]
+
+#endif
diff --git a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.cpp b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.cpp
new file mode 100644
index 0000000000..e73c45bc34
--- /dev/null
+++ b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.cpp
@@ -0,0 +1,124 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "worldtimeclock.h"
+#include "worldtimeclockplugin.h"
+
+#include <QtPlugin>
+
+WorldTimeClockPlugin::WorldTimeClockPlugin(QObject *parent)
+    : QObject(parent)
+{
+    initialized = false;
+}
+
+void WorldTimeClockPlugin::initialize(QDesignerFormEditorInterface * /* core */)
+{
+    if (initialized)
+        return;
+
+    initialized = true;
+}
+
+bool WorldTimeClockPlugin::isInitialized() const
+{
+    return initialized;
+}
+
+QWidget *WorldTimeClockPlugin::createWidget(QWidget *parent)
+{
+    return new WorldTimeClock(parent);
+}
+
+QString WorldTimeClockPlugin::name() const
+{
+    return "WorldTimeClock";
+}
+
+QString WorldTimeClockPlugin::group() const
+{
+    return "Display Widgets [Examples]";
+}
+
+QIcon WorldTimeClockPlugin::icon() const
+{
+    return QIcon();
+}
+
+QString WorldTimeClockPlugin::toolTip() const
+{
+    return "";
+}
+
+QString WorldTimeClockPlugin::whatsThis() const
+{
+    return "";
+}
+
+bool WorldTimeClockPlugin::isContainer() const
+{
+    return false;
+}
+
+QString WorldTimeClockPlugin::domXml() const
+{
+    return "<ui language=\"c++\">\n"
+           " <widget class=\"WorldTimeClock\" name=\"worldTimeClock\">\n"
+           "  <property name=\"geometry\">\n"
+           "   <rect>\n"
+           "    <x>0</x>\n"
+           "    <y>0</y>\n"
+           "    <width>100</width>\n"
+           "    <height>100</height>\n"
+           "   </rect>\n"
+           "  </property>\n"
+           " </widget>\n"
+           "</ui>";
+}
+
+QString WorldTimeClockPlugin::includeFile() const
+{
+    return "worldtimeclock.h";
+}
+
+//! [0]
+Q_EXPORT_PLUGIN2(worldtimeclockplugin, WorldTimeClockPlugin)
+//! [0]
diff --git a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h
new file mode 100644
index 0000000000..87d797a9bd
--- /dev/null
+++ b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WORLDTIMECLOCKPLUGIN_H
+#define WORLDTIMECLOCKPLUGIN_H
+
+#include <QDesignerCustomWidgetInterface>
+
+//! [0]
+class WorldTimeClockPlugin : public QObject,
+                             public QDesignerCustomWidgetInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(QDesignerCustomWidgetInterface)
+
+public:
+    WorldTimeClockPlugin(QObject *parent = 0);
+
+    bool isContainer() const;
+    bool isInitialized() const;
+    QIcon icon() const;
+    QString domXml() const;
+    QString group() const;
+    QString includeFile() const;
+    QString name() const;
+    QString toolTip() const;
+    QString whatsThis() const;
+    QWidget *createWidget(QWidget *parent);
+    void initialize(QDesignerFormEditorInterface *core);
+
+private:
+    bool initialized;
+};
+//! [0]
+
+#endif
diff --git a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro
new file mode 100644
index 0000000000..cd117dc05d
--- /dev/null
+++ b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro
@@ -0,0 +1,21 @@
+#! [0]
+CONFIG      += designer plugin
+#! [0]
+TARGET      = $$qtLibraryTarget($$TARGET)
+#! [1]
+TEMPLATE    = lib
+#! [1]
+QTDIR_build:DESTDIR     = $$QT_BUILD_TREE/plugins/designer
+
+#! [2]
+HEADERS     = worldtimeclock.h \
+              worldtimeclockplugin.h
+SOURCES     = worldtimeclock.cpp \
+              worldtimeclockplugin.cpp
+#! [2]
+
+# install
+target.path = $$[QT_INSTALL_PLUGINS]/designer
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/designer/worldtimeclockplugin
+INSTALLS += target sources
diff --git a/examples/desktop/README b/examples/desktop/README
new file mode 100644
index 0000000000..efe569a604
--- /dev/null
+++ b/examples/desktop/README
@@ -0,0 +1,41 @@
+Qt provides features to enable applications to integrate with the user's
+preferred desktop environment.
+
+Features such as system tray icons, access to the desktop widget, and
+support for desktop services can be used to improve the appearance of
+applications and take advantage of underlying desktop facilities.
+
+
+The example launcher provided with Qt can be used to explore each of the
+examples in this directory.
+
+Documentation for these examples can be found via the Tutorial and Examples
+link in the main Qt documentation.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/desktop/desktop.pro b/examples/desktop/desktop.pro
new file mode 100644
index 0000000000..b65f4f2d8b
--- /dev/null
+++ b/examples/desktop/desktop.pro
@@ -0,0 +1,11 @@
+TEMPLATE      = subdirs
+CONFIG       += ordered
+SUBDIRS       = screenshot
+
+contains(QT_CONFIG, svg): SUBDIRS += systray
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/desktop
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS desktop.pro README
+sources.path = $$[QT_INSTALL_EXAMPLES]/desktop
+INSTALLS += target sources
diff --git a/examples/desktop/screenshot/main.cpp b/examples/desktop/screenshot/main.cpp
new file mode 100644
index 0000000000..59e86744bf
--- /dev/null
+++ b/examples/desktop/screenshot/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "screenshot.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Screenshot screenshot;
+    screenshot.show();
+    return app.exec();
+}
diff --git a/examples/desktop/screenshot/screenshot.cpp b/examples/desktop/screenshot/screenshot.cpp
new file mode 100644
index 0000000000..7d9545e387
--- /dev/null
+++ b/examples/desktop/screenshot/screenshot.cpp
@@ -0,0 +1,198 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "screenshot.h"
+
+//! [0]
+Screenshot::Screenshot()
+{
+    screenshotLabel = new QLabel;
+    screenshotLabel->setSizePolicy(QSizePolicy::Expanding,
+                                   QSizePolicy::Expanding);
+    screenshotLabel->setAlignment(Qt::AlignCenter);
+    screenshotLabel->setMinimumSize(240, 160);
+
+    createOptionsGroupBox();
+    createButtonsLayout();
+
+    mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(screenshotLabel);
+    mainLayout->addWidget(optionsGroupBox);
+    mainLayout->addLayout(buttonsLayout);
+    setLayout(mainLayout);
+
+    shootScreen();
+    delaySpinBox->setValue(5);
+
+    setWindowTitle(tr("Screenshot"));
+    resize(300, 200);
+}
+//! [0]
+
+//! [1]
+void Screenshot::resizeEvent(QResizeEvent * /* event */)
+{
+    QSize scaledSize = originalPixmap.size();
+    scaledSize.scale(screenshotLabel->size(), Qt::KeepAspectRatio);
+    if (!screenshotLabel->pixmap()
+            || scaledSize != screenshotLabel->pixmap()->size())
+        updateScreenshotLabel();
+}
+//! [1]
+
+//! [2]
+void Screenshot::newScreenshot()
+{
+    if (hideThisWindowCheckBox->isChecked())
+        hide();
+    newScreenshotButton->setDisabled(true);
+
+    QTimer::singleShot(delaySpinBox->value() * 1000, this, SLOT(shootScreen()));
+}
+//! [2]
+
+//! [3]
+void Screenshot::saveScreenshot()
+{
+    QString format = "png";
+    QString initialPath = QDir::currentPath() + tr("/untitled.") + format;
+
+    QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"),
+                               initialPath,
+                               tr("%1 Files (*.%2);;All Files (*)")
+                               .arg(format.toUpper())
+                               .arg(format));
+    if (!fileName.isEmpty())
+        originalPixmap.save(fileName, format.toAscii());
+}
+//! [3]
+
+//! [4]
+void Screenshot::shootScreen()
+{
+    if (delaySpinBox->value() != 0)
+        qApp->beep();
+//! [4]
+    originalPixmap = QPixmap(); // clear image for low memory situations
+                                // on embedded devices.
+//! [5]
+    originalPixmap = QPixmap::grabWindow(QApplication::desktop()->winId());
+    updateScreenshotLabel();
+
+    newScreenshotButton->setDisabled(false);
+    if (hideThisWindowCheckBox->isChecked())
+        show();
+}
+//! [5]
+
+//! [6]
+void Screenshot::updateCheckBox()
+{
+    if (delaySpinBox->value() == 0) {
+        hideThisWindowCheckBox->setDisabled(true);
+        hideThisWindowCheckBox->setChecked(false);
+    }
+    else
+        hideThisWindowCheckBox->setDisabled(false);
+}
+//! [6]
+
+//! [7]
+void Screenshot::createOptionsGroupBox()
+{
+    optionsGroupBox = new QGroupBox(tr("Options"));
+
+    delaySpinBox = new QSpinBox;
+    delaySpinBox->setSuffix(tr(" s"));
+    delaySpinBox->setMaximum(60);
+    connect(delaySpinBox, SIGNAL(valueChanged(int)), this, SLOT(updateCheckBox()));
+
+    delaySpinBoxLabel = new QLabel(tr("Screenshot Delay:"));
+
+    hideThisWindowCheckBox = new QCheckBox(tr("Hide This Window"));
+
+    optionsGroupBoxLayout = new QGridLayout;
+    optionsGroupBoxLayout->addWidget(delaySpinBoxLabel, 0, 0);
+    optionsGroupBoxLayout->addWidget(delaySpinBox, 0, 1);
+    optionsGroupBoxLayout->addWidget(hideThisWindowCheckBox, 1, 0, 1, 2);
+    optionsGroupBox->setLayout(optionsGroupBoxLayout);
+}
+//! [7]
+
+//! [8]
+void Screenshot::createButtonsLayout()
+{
+    newScreenshotButton = createButton(tr("New Screenshot"),
+                                       this, SLOT(newScreenshot()));
+
+    saveScreenshotButton = createButton(tr("Save Screenshot"),
+                                        this, SLOT(saveScreenshot()));
+
+    quitScreenshotButton = createButton(tr("Quit"), this, SLOT(close()));
+
+    buttonsLayout = new QHBoxLayout;
+    buttonsLayout->addStretch();
+    buttonsLayout->addWidget(newScreenshotButton);
+    buttonsLayout->addWidget(saveScreenshotButton);
+    buttonsLayout->addWidget(quitScreenshotButton);
+}
+//! [8]
+
+//! [9]
+QPushButton *Screenshot::createButton(const QString &text, QWidget *receiver,
+                                      const char *member)
+{
+    QPushButton *button = new QPushButton(text);
+    button->connect(button, SIGNAL(clicked()), receiver, member);
+    return button;
+}
+//! [9]
+
+//! [10]
+void Screenshot::updateScreenshotLabel()
+{
+    screenshotLabel->setPixmap(originalPixmap.scaled(screenshotLabel->size(),
+                                                     Qt::KeepAspectRatio,
+                                                     Qt::SmoothTransformation));
+}
+//! [10]
diff --git a/examples/desktop/screenshot/screenshot.h b/examples/desktop/screenshot/screenshot.h
new file mode 100644
index 0000000000..ecc7724472
--- /dev/null
+++ b/examples/desktop/screenshot/screenshot.h
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SCREENSHOT_H
+#define SCREENSHOT_H
+
+#include <QPixmap>
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QCheckBox;
+class QGridLayout;
+class QGroupBox;
+class QHBoxLayout;
+class QLabel;
+class QPushButton;
+class QSpinBox;
+class QVBoxLayout;
+QT_END_NAMESPACE
+
+//! [0]
+class Screenshot : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Screenshot();
+
+protected:
+    void resizeEvent(QResizeEvent *event);
+
+private slots:
+    void newScreenshot();
+    void saveScreenshot();
+    void shootScreen();
+    void updateCheckBox();
+
+private:
+    void createOptionsGroupBox();
+    void createButtonsLayout();
+    QPushButton *createButton(const QString &text, QWidget *receiver,
+                              const char *member);
+    void updateScreenshotLabel();
+
+    QPixmap originalPixmap;
+
+    QLabel *screenshotLabel;
+    QGroupBox *optionsGroupBox;
+    QSpinBox *delaySpinBox;
+    QLabel *delaySpinBoxLabel;
+    QCheckBox *hideThisWindowCheckBox;
+    QPushButton *newScreenshotButton;
+    QPushButton *saveScreenshotButton;
+    QPushButton *quitScreenshotButton;
+
+    QVBoxLayout *mainLayout;
+    QGridLayout *optionsGroupBoxLayout;
+    QHBoxLayout *buttonsLayout;
+};
+//! [0]
+
+#endif
diff --git a/examples/desktop/screenshot/screenshot.pro b/examples/desktop/screenshot/screenshot.pro
new file mode 100644
index 0000000000..3ecbf8f50a
--- /dev/null
+++ b/examples/desktop/screenshot/screenshot.pro
@@ -0,0 +1,9 @@
+HEADERS             = screenshot.h
+SOURCES             = main.cpp \
+                      screenshot.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/desktop/screenshot
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS screenshot.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/desktop/screenshot
+INSTALLS += target sources
diff --git a/examples/desktop/systray/images/bad.svg b/examples/desktop/systray/images/bad.svg
new file mode 100644
index 0000000000..186dba9cc8
--- /dev/null
+++ b/examples/desktop/systray/images/bad.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg viewBox="-10 -10 178 178" height="177.523" id="svg1" inkscape:version="0.40" sodipodi:docbase="/mnt/donnees/09-Mes_images/Travaux/Travaux vectoriel/pictogrammes/sécu SVG/produits chimiques" sodipodi:docname="XiIrritant.svg" sodipodi:version="0.32" width="155.932" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink">
+<metadata>
+<rdf:RDF xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<cc:Work rdf:about="">
+<dc:title>Irritant</dc:title>
+<dc:description>produit chimique</dc:description>
+<dc:subject>
+<rdf:Bag>
+<rdf:li></rdf:li>
+<rdf:li>symbol</rdf:li>
+<rdf:li>signs_and_symbols</rdf:li>
+</rdf:Bag>
+</dc:subject>
+<dc:publisher>
+<cc:Agent rdf:about="http://www.openclipart.org">
+<dc:title>yves GUILLOU</dc:title>
+</cc:Agent>
+</dc:publisher>
+<dc:creator>
+<cc:Agent>
+<dc:title>yves GUILLOU</dc:title>
+</cc:Agent>
+</dc:creator>
+<dc:rights>
+<cc:Agent>
+<dc:title>yves GUILLOU</dc:title>
+</cc:Agent>
+</dc:rights>
+<dc:date></dc:date>
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<cc:license rdf:resource="http://web.resource.org/cc/PublicDomain"/>
+<dc:language>en</dc:language>
+</cc:Work>
+<cc:License rdf:about="http://web.resource.org/cc/PublicDomain">
+<cc:permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
+<cc:permits rdf:resource="http://web.resource.org/cc/Distribution"/>
+<cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
+</cc:License>
+</rdf:RDF>
+</metadata>
+<sodipodi:namedview bordercolor="#666666" borderopacity="1.0" id="base" inkscape:current-layer="svg1" inkscape:cx="62.372805" inkscape:cy="34.864537" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1121" inkscape:window-width="1590" inkscape:window-x="200" inkscape:window-y="0" inkscape:zoom="6.6399849" pagecolor="#ffffff"/>
+<defs id="defs2">
+<marker id="ArrowEnd" markerHeight="3" markerUnits="strokeWidth" markerWidth="4" orient="auto" refX="0" refY="5" viewBox="0 0 10 10">
+<path d="M 0 0 L 10 5 L 0 10 z" id="path4"/>
+</marker>
+<marker id="ArrowStart" markerHeight="3" markerUnits="strokeWidth" markerWidth="4" orient="auto" refX="10" refY="5" viewBox="0 0 10 10">
+<path d="M 10 0 L 0 5 L 10 10 z" id="path6"/>
+</marker>
+</defs>
+<g id="g7">
+<g id="g8">
+<path d="M 155.932 155.932L 155.932 0L 0 0L 0 155.932L 155.932 155.932z" id="path9" style="stroke:none; fill:#000000"/>
+<path d="M 150.83 150.83L 150.83 5.1011L 5.1011 5.1011L 5.1011 150.83L 150.83 150.83z" id="path10" style="stroke:none; fill:#ff9900"/>
+</g>
+<g id="g11">
+<path d="M 140.823 111.783L 44.3677 14.0771L 15.1084 44.1489L 111.564 141.854L 140.823 111.783z" id="path12" style="stroke:none; fill:#000000"/>
+<path d="M 111.783 15.1084L 14.0771 111.564L 44.1489 140.823L 141.855 44.3677L 111.783 15.1084z" id="path13" style="stroke:none; fill:#000000"/>
+</g>
+</g>
+</svg>
diff --git a/examples/desktop/systray/images/heart.svg b/examples/desktop/systray/images/heart.svg
new file mode 100644
index 0000000000..ba5f050b00
--- /dev/null
+++ b/examples/desktop/systray/images/heart.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) --><svg viewBox="100 200 550 500" height="595.27559pt" id="svg1" inkscape:version="0.40+cvs" sodipodi:docbase="C:\Documents and Settings\Jon Phillips\My Documents\projects\clipart-project\submissions" sodipodi:docname="heart-left-highlight.svg" sodipodi:version="0.32" width="595.27559pt" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg">
+<metadata>
+<rdf:RDF xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<cc:Work rdf:about="">
+<dc:title>Heart Left-Highlight</dc:title>
+<dc:description>This is a normal valentines day heart.</dc:description>
+<dc:subject>
+<rdf:Bag>
+<rdf:li>holiday</rdf:li>
+<rdf:li>valentines</rdf:li>
+<rdf:li></rdf:li>
+<rdf:li>valentine</rdf:li>
+<rdf:li>hash(0x8a091c0)</rdf:li>
+<rdf:li>hash(0x8a0916c)</rdf:li>
+<rdf:li>signs_and_symbols</rdf:li>
+<rdf:li>hash(0x8a091f0)</rdf:li>
+<rdf:li>day</rdf:li>
+</rdf:Bag>
+</dc:subject>
+<dc:publisher>
+<cc:Agent rdf:about="http://www.openclipart.org">
+<dc:title>Jon Phillips</dc:title>
+</cc:Agent>
+</dc:publisher>
+<dc:creator>
+<cc:Agent>
+<dc:title>Jon Phillips</dc:title>
+</cc:Agent>
+</dc:creator>
+<dc:rights>
+<cc:Agent>
+<dc:title>Jon Phillips</dc:title>
+</cc:Agent>
+</dc:rights>
+<dc:date></dc:date>
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<cc:license rdf:resource="http://web.resource.org/cc/PublicDomain"/>
+<dc:language>en</dc:language>
+</cc:Work>
+<cc:License rdf:about="http://web.resource.org/cc/PublicDomain">
+<cc:permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
+<cc:permits rdf:resource="http://web.resource.org/cc/Distribution"/>
+<cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
+</cc:License>
+</rdf:RDF>
+</metadata>
+<defs id="defs3"/>
+<sodipodi:namedview bordercolor="#666666" borderopacity="1.0" id="base" inkscape:current-layer="layer1" inkscape:cx="549.40674" inkscape:cy="596.00159" inkscape:document-units="px" inkscape:guide-bbox="true" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="615" inkscape:window-width="866" inkscape:window-x="88" inkscape:window-y="116" inkscape:zoom="0.35000000" pagecolor="#ffffff" showguides="true"/>
+<g id="layer1" inkscape:groupmode="layer" inkscape:label="Layer 1">
+<path d="M 263.41570,235.14588 C 197.17570,235.14588 143.41575,288.90587 143.41575,355.14588 C 143.41575,489.90139 279.34890,525.23318 371.97820,658.45392 C 459.55244,526.05056 600.54070,485.59932 600.54070,355.14588 C 600.54070,288.90588 546.78080,235.14587 480.54070,235.14588 C 432.49280,235.14588 391.13910,263.51631 371.97820,304.33338 C 352.81740,263.51630 311.46370,235.14587 263.41570,235.14588 z " id="path7" sodipodi:nodetypes="ccccccc" style="fill:#e60000;fill-opacity:1.0000000;stroke:#000000;stroke-width:18.700001;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"/>
+<path d="M 265.00000,253.59375 C 207.04033,253.59375 160.00000,300.63407 160.00000,358.59375 C 160.00000,476.50415 278.91857,507.43251 359.96875,624.00000 C 366.52868,614.08205 220.00000,478.47309 220.00000,378.59375 C 220.00000,320.63407 267.04033,273.59375 325.00000,273.59375 C 325.50453,273.59375 325.99718,273.64912 326.50000,273.65625 C 309.22436,261.07286 288.00557,253.59374 265.00000,253.59375 z " id="path220" sodipodi:nodetypes="ccccccc" style="fill:#e6e6e6;fill-opacity:0.64556962;stroke:none;stroke-width:18.700001;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"/>
+</g>
+</svg>
diff --git a/examples/desktop/systray/images/trash.svg b/examples/desktop/systray/images/trash.svg
new file mode 100644
index 0000000000..c44e4c75a2
--- /dev/null
+++ b/examples/desktop/systray/images/trash.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 10, SVG Export Plug-In . SVG Version: 3.0.0 Build 76)  --><svg enable-background="new 0 0 347 348" height="348" i:pageBounds="0 792 612 0" i:rulerOrigin="0 0" i:viewOrigin="131 567" overflow="visible" space="preserve" viewBox="-20 -20 387 388" width="347" xmlns="http://www.w3.org/2000/svg" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" xmlns:graph="http://ns.adobe.com/Graphs/1.0/" xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" xmlns:x="http://ns.adobe.com/Extensibility/1.0/" xmlns:xlink="http://www.w3.org/1999/xlink">
+<metadata>
+<rdf:RDF xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<cc:Work rdf:about="">
+<dc:title>Keep Tidy Inside</dc:title>
+<dc:description></dc:description>
+<dc:subject>
+<rdf:Bag>
+<rdf:li></rdf:li>
+<rdf:li>symbol</rdf:li>
+<rdf:li>bin</rdf:li>
+<rdf:li>signs_and_symbols</rdf:li>
+<rdf:li>clean</rdf:li>
+<rdf:li>rubish</rdf:li>
+<rdf:li>trash</rdf:li>
+<rdf:li>inside</rdf:li>
+<rdf:li>garbage</rdf:li>
+<rdf:li>sign</rdf:li>
+</rdf:Bag>
+</dc:subject>
+<dc:publisher>
+<cc:Agent rdf:about="http://www.openclipart.org">
+<dc:title>Martin Owens</dc:title>
+</cc:Agent>
+</dc:publisher>
+<dc:creator>
+<cc:Agent>
+<dc:title>Martin Owens</dc:title>
+</cc:Agent>
+</dc:creator>
+<dc:rights>
+<cc:Agent>
+<dc:title>Martin Owens</dc:title>
+</cc:Agent>
+</dc:rights>
+<dc:date></dc:date>
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<cc:license rdf:resource="http://web.resource.org/cc/PublicDomain"/>
+<dc:language>en</dc:language>
+</cc:Work>
+<cc:License rdf:about="http://web.resource.org/cc/PublicDomain">
+<cc:permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
+<cc:permits rdf:resource="http://web.resource.org/cc/Distribution"/>
+<cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
+</cc:License>
+</rdf:RDF>
+</metadata>
+<g i:dimmedPercent="50" i:knockout="Off" i:layer="yes" i:rgbTrio="#4F008000FFFF" id="Layer_1">
+<path d="M347,174c0,96.098-77.679,174-173.5,174C77.679,348,0,270.098,0,174    C0,77.902,77.679,0,173.5,0C269.321,0,347,77.902,347,174z" fill="#10A040" i:knockout="Off"/>
+<path d="M238,53c0,13.807-11.864,25-26.5,25S185,66.807,185,53s11.864-25,26.5-25    S238,39.193,238,53z" fill="#FFFFFF" i:knockout="Off"/>
+<path d="M66,175c1.055,6.355,19.333,126.417,19.333,126.417h68.333    c0,0,14.105-122.524,14.333-126.417c6.224-0.622,6.667-13-2-13c-12.164,0-89.205-0.059-98,0S61.167,174.487,66,175z" fill="#FFFFFF" i:knockout="Off"/>
+<path d="M78,141c17.292-5.325,24.179-23.532,27-31c14.513,6.596,40.333,12.265,59,8    c3.683,19.419-28.043,19.31-23,37C132.577,145.705,89.404,167.292,78,141z" fill="#FFFFFF" i:knockout="Off"/>
+<path d="M103,82l139-1c-0.6,3.421,33.633,57.497,29,67c-4.089,0.418-67,5-67,5    c6.109-9.379-13-43-13-43L103,82z" fill="#FFFFFF" i:knockout="Off"/>
+<path d="M270,156l-66-3c0,0-23.565,143.355-24,145s1.855,2.536,3,1s51-82,51-82    s19.754,80.701,20,82s3.721,1.209,4,0S270,156,270,156z" fill="#FFFFFF" i:knockout="Off"/>
+</g>
+</svg>
diff --git a/examples/desktop/systray/main.cpp b/examples/desktop/systray/main.cpp
new file mode 100644
index 0000000000..d406d16d9e
--- /dev/null
+++ b/examples/desktop/systray/main.cpp
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(systray);
+
+    QApplication app(argc, argv);
+
+    if (!QSystemTrayIcon::isSystemTrayAvailable()) {
+        QMessageBox::critical(0, QObject::tr("Systray"),
+                              QObject::tr("I couldn't detect any system tray "
+                                          "on this system."));
+        return 1;
+    }
+    QApplication::setQuitOnLastWindowClosed(false);
+
+    Window window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/desktop/systray/systray.pro b/examples/desktop/systray/systray.pro
new file mode 100644
index 0000000000..c73a48e9b9
--- /dev/null
+++ b/examples/desktop/systray/systray.pro
@@ -0,0 +1,22 @@
+HEADERS       = window.h
+SOURCES       = main.cpp \
+                window.cpp
+RESOURCES     = systray.qrc
+QT           += xml svg
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/desktop/systray
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS systray.pro resources images
+sources.path = $$[QT_INSTALL_EXAMPLES]/desktop/systray
+INSTALLS += target sources
+
+wince* {
+	CONFIG(debug, release|debug) {
+		addPlugins.sources = $$QT_BUILD_TREE/plugins/imageformats/qsvgd4.dll
+	}
+	CONFIG(release, release|debug) {
+		addPlugins.sources = $$QT_BUILD_TREE/plugins/imageformats/qsvg4.dll
+	}
+	addPlugins.path = imageformats
+	DEPLOYMENT += addPlugins
+}
diff --git a/examples/desktop/systray/systray.qrc b/examples/desktop/systray/systray.qrc
new file mode 100644
index 0000000000..b0d5e0cb7c
--- /dev/null
+++ b/examples/desktop/systray/systray.qrc
@@ -0,0 +1,7 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+   <file>images/bad.svg</file>
+   <file>images/heart.svg</file>
+   <file>images/trash.svg</file>
+</qresource>
+</RCC>
diff --git a/examples/desktop/systray/window.cpp b/examples/desktop/systray/window.cpp
new file mode 100644
index 0000000000..052ecdd5b2
--- /dev/null
+++ b/examples/desktop/systray/window.cpp
@@ -0,0 +1,259 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+
+//! [0]
+Window::Window()
+{
+    createIconGroupBox();
+    createMessageGroupBox();
+
+    iconLabel->setMinimumWidth(durationLabel->sizeHint().width());
+
+    createActions();
+    createTrayIcon();
+
+    connect(showMessageButton, SIGNAL(clicked()), this, SLOT(showMessage()));
+    connect(showIconCheckBox, SIGNAL(toggled(bool)),
+            trayIcon, SLOT(setVisible(bool)));
+    connect(iconComboBox, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(setIcon(int)));
+    connect(trayIcon, SIGNAL(messageClicked()), this, SLOT(messageClicked()));
+    connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
+            this, SLOT(iconActivated(QSystemTrayIcon::ActivationReason)));
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(iconGroupBox);
+    mainLayout->addWidget(messageGroupBox);
+    setLayout(mainLayout);
+
+    iconComboBox->setCurrentIndex(1);
+    trayIcon->show();
+
+    setWindowTitle(tr("Systray"));
+    resize(400, 300);
+}
+//! [0]
+
+//! [1]
+void Window::setVisible(bool visible)
+{
+    minimizeAction->setEnabled(visible);
+    maximizeAction->setEnabled(!isMaximized());
+    restoreAction->setEnabled(isMaximized() || !visible);
+    QDialog::setVisible(visible);
+}
+//! [1]
+
+//! [2]
+void Window::closeEvent(QCloseEvent *event)
+{
+    if (trayIcon->isVisible()) {
+        QMessageBox::information(this, tr("Systray"),
+                                 tr("The program will keep running in the "
+                                    "system tray. To terminate the program, "
+                                    "choose <b>Quit</b> in the context menu "
+                                    "of the system tray entry."));
+        hide();
+        event->ignore();
+    }
+}
+//! [2]
+
+//! [3]
+void Window::setIcon(int index)
+{
+    QIcon icon = iconComboBox->itemIcon(index);
+    trayIcon->setIcon(icon);
+    setWindowIcon(icon);
+
+    trayIcon->setToolTip(iconComboBox->itemText(index));
+}
+//! [3]
+
+//! [4]
+void Window::iconActivated(QSystemTrayIcon::ActivationReason reason)
+{
+    switch (reason) {
+    case QSystemTrayIcon::Trigger:
+    case QSystemTrayIcon::DoubleClick:
+        iconComboBox->setCurrentIndex((iconComboBox->currentIndex() + 1)
+                                      % iconComboBox->count());
+        break;
+    case QSystemTrayIcon::MiddleClick:
+        showMessage();
+        break;
+    default:
+        ;
+    }
+}
+//! [4]
+
+//! [5]
+void Window::showMessage()
+{
+    QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::MessageIcon(
+            typeComboBox->itemData(typeComboBox->currentIndex()).toInt());
+    trayIcon->showMessage(titleEdit->text(), bodyEdit->toPlainText(), icon,
+                          durationSpinBox->value() * 1000);
+}
+//! [5]
+
+//! [6]
+void Window::messageClicked()
+{
+    QMessageBox::information(0, tr("Systray"),
+                             tr("Sorry, I already gave what help I could.\n"
+                                "Maybe you should try asking a human?"));
+}
+//! [6]
+
+void Window::createIconGroupBox()
+{
+    iconGroupBox = new QGroupBox(tr("Tray Icon"));
+
+    iconLabel = new QLabel("Icon:");
+
+    iconComboBox = new QComboBox;
+    iconComboBox->addItem(QIcon(":/images/bad.svg"), tr("Bad"));
+    iconComboBox->addItem(QIcon(":/images/heart.svg"), tr("Heart"));
+    iconComboBox->addItem(QIcon(":/images/trash.svg"), tr("Trash"));
+
+    showIconCheckBox = new QCheckBox(tr("Show icon"));
+    showIconCheckBox->setChecked(true);
+
+    QHBoxLayout *iconLayout = new QHBoxLayout;
+    iconLayout->addWidget(iconLabel);
+    iconLayout->addWidget(iconComboBox);
+    iconLayout->addStretch();
+    iconLayout->addWidget(showIconCheckBox);
+    iconGroupBox->setLayout(iconLayout);
+}
+
+void Window::createMessageGroupBox()
+{
+    messageGroupBox = new QGroupBox(tr("Balloon Message"));
+
+    typeLabel = new QLabel(tr("Type:"));
+
+    typeComboBox = new QComboBox;
+    typeComboBox->addItem(tr("None"), QSystemTrayIcon::NoIcon);
+    typeComboBox->addItem(style()->standardIcon(
+            QStyle::SP_MessageBoxInformation), tr("Information"),
+            QSystemTrayIcon::Information);
+    typeComboBox->addItem(style()->standardIcon(
+            QStyle::SP_MessageBoxWarning), tr("Warning"),
+            QSystemTrayIcon::Warning);
+    typeComboBox->addItem(style()->standardIcon(
+            QStyle::SP_MessageBoxCritical), tr("Critical"),
+            QSystemTrayIcon::Critical);
+    typeComboBox->setCurrentIndex(1);
+
+    durationLabel = new QLabel(tr("Duration:"));
+
+    durationSpinBox = new QSpinBox;
+    durationSpinBox->setRange(5, 60);
+    durationSpinBox->setSuffix(" s");
+    durationSpinBox->setValue(15);
+
+    durationWarningLabel = new QLabel(tr("(some systems might ignore this "
+                                         "hint)"));
+    durationWarningLabel->setIndent(10);
+
+    titleLabel = new QLabel(tr("Title:"));
+
+    titleEdit = new QLineEdit(tr("Cannot connect to network"));
+
+    bodyLabel = new QLabel(tr("Body:"));
+
+    bodyEdit = new QTextEdit;
+    bodyEdit->setPlainText(tr("Don't believe me. Honestly, I don't have a "
+                              "clue.\nClick this balloon for details."));
+
+    showMessageButton = new QPushButton(tr("Show Message"));
+    showMessageButton->setDefault(true);
+
+    QGridLayout *messageLayout = new QGridLayout;
+    messageLayout->addWidget(typeLabel, 0, 0);
+    messageLayout->addWidget(typeComboBox, 0, 1, 1, 2);
+    messageLayout->addWidget(durationLabel, 1, 0);
+    messageLayout->addWidget(durationSpinBox, 1, 1);
+    messageLayout->addWidget(durationWarningLabel, 1, 2, 1, 3);
+    messageLayout->addWidget(titleLabel, 2, 0);
+    messageLayout->addWidget(titleEdit, 2, 1, 1, 4);
+    messageLayout->addWidget(bodyLabel, 3, 0);
+    messageLayout->addWidget(bodyEdit, 3, 1, 2, 4);
+    messageLayout->addWidget(showMessageButton, 5, 4);
+    messageLayout->setColumnStretch(3, 1);
+    messageLayout->setRowStretch(4, 1);
+    messageGroupBox->setLayout(messageLayout);
+}
+
+void Window::createActions()
+{
+    minimizeAction = new QAction(tr("Mi&nimize"), this);
+    connect(minimizeAction, SIGNAL(triggered()), this, SLOT(hide()));
+
+    maximizeAction = new QAction(tr("Ma&ximize"), this);
+    connect(maximizeAction, SIGNAL(triggered()), this, SLOT(showMaximized()));
+
+    restoreAction = new QAction(tr("&Restore"), this);
+    connect(restoreAction, SIGNAL(triggered()), this, SLOT(showNormal()));
+
+    quitAction = new QAction(tr("&Quit"), this);
+    connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+}
+
+void Window::createTrayIcon()
+{
+    trayIconMenu = new QMenu(this);
+    trayIconMenu->addAction(minimizeAction);
+    trayIconMenu->addAction(maximizeAction);
+    trayIconMenu->addAction(restoreAction);
+    trayIconMenu->addSeparator();
+    trayIconMenu->addAction(quitAction);
+
+    trayIcon = new QSystemTrayIcon(this);
+    trayIcon->setContextMenu(trayIconMenu);
+}
diff --git a/examples/desktop/systray/window.h b/examples/desktop/systray/window.h
new file mode 100644
index 0000000000..d9bfd520eb
--- /dev/null
+++ b/examples/desktop/systray/window.h
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QSystemTrayIcon>
+#include <QDialog>
+
+QT_BEGIN_NAMESPACE
+class QAction;
+class QCheckBox;
+class QComboBox;
+class QGroupBox;
+class QLabel;
+class QLineEdit;
+class QMenu;
+class QPushButton;
+class QSpinBox;
+class QTextEdit;
+QT_END_NAMESPACE
+
+//! [0]
+class Window : public QDialog
+{
+    Q_OBJECT
+
+public:
+    Window();
+
+    void setVisible(bool visible);
+
+protected:
+    void closeEvent(QCloseEvent *event);
+
+private slots:
+    void setIcon(int index);
+    void iconActivated(QSystemTrayIcon::ActivationReason reason);
+    void showMessage();
+    void messageClicked();
+
+private:
+    void createIconGroupBox();
+    void createMessageGroupBox();
+    void createActions();
+    void createTrayIcon();
+
+    QGroupBox *iconGroupBox;
+    QLabel *iconLabel;
+    QComboBox *iconComboBox;
+    QCheckBox *showIconCheckBox;
+
+    QGroupBox *messageGroupBox;
+    QLabel *typeLabel;
+    QLabel *durationLabel;
+    QLabel *durationWarningLabel;
+    QLabel *titleLabel;
+    QLabel *bodyLabel;
+    QComboBox *typeComboBox;
+    QSpinBox *durationSpinBox;
+    QLineEdit *titleEdit;
+    QTextEdit *bodyEdit;
+    QPushButton *showMessageButton;
+
+    QAction *minimizeAction;
+    QAction *maximizeAction;
+    QAction *restoreAction;
+    QAction *quitAction;
+
+    QSystemTrayIcon *trayIcon;
+    QMenu *trayIconMenu;
+};
+//! [0]
+
+#endif
diff --git a/examples/dialogs/README b/examples/dialogs/README
new file mode 100644
index 0000000000..ab0f884fcb
--- /dev/null
+++ b/examples/dialogs/README
@@ -0,0 +1,40 @@
+Qt includes standard dialogs for many common operations, such as file
+selection, printing, and color selection.
+
+Custom dialogs can also be created for specialized modal or modeless
+interactions with users.
+
+
+The example launcher provided with Qt can be used to explore each of the
+examples in this directory.
+
+Documentation for these examples can be found via the Tutorial and Examples
+link in the main Qt documentation.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/dialogs/classwizard/classwizard.cpp b/examples/dialogs/classwizard/classwizard.cpp
new file mode 100644
index 0000000000..200d7acee1
--- /dev/null
+++ b/examples/dialogs/classwizard/classwizard.cpp
@@ -0,0 +1,431 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "classwizard.h"
+
+//! [0] //! [1]
+ClassWizard::ClassWizard(QWidget *parent)
+    : QWizard(parent)
+{
+    addPage(new IntroPage);
+    addPage(new ClassInfoPage);
+    addPage(new CodeStylePage);
+    addPage(new OutputFilesPage);
+    addPage(new ConclusionPage);
+//! [0]
+
+    setPixmap(QWizard::BannerPixmap, QPixmap(":/images/banner.png"));
+    setPixmap(QWizard::BackgroundPixmap, QPixmap(":/images/background.png"));
+
+    setWindowTitle(tr("Class Wizard"));
+//! [2]
+}
+//! [1] //! [2]
+
+//! [3]
+void ClassWizard::accept()
+//! [3] //! [4]
+{
+    QByteArray className = field("className").toByteArray();
+    QByteArray baseClass = field("baseClass").toByteArray();
+    QByteArray macroName = field("macroName").toByteArray();
+    QByteArray baseInclude = field("baseInclude").toByteArray();
+
+    QString outputDir = field("outputDir").toString();
+    QString header = field("header").toString();
+    QString implementation = field("implementation").toString();
+//! [4]
+
+    QByteArray block;
+
+    if (field("comment").toBool()) {
+        block += "/*\n";
+        block += "    " + header.toAscii() + "\n";
+        block += "*/\n";
+        block += "\n";
+    }
+    if (field("protect").toBool()) {
+        block += "#ifndef " + macroName + "\n";
+        block += "#define " + macroName + "\n";
+        block += "\n";
+    }
+    if (field("includeBase").toBool()) {
+        block += "#include " + baseInclude + "\n";
+        block += "\n";
+    }
+
+    block += "class " + className;
+    if (!baseClass.isEmpty())
+        block += " : public " + baseClass;
+    block += "\n";
+    block += "{\n";
+
+    /* qmake ignore Q_OBJECT */
+
+    if (field("qobjectMacro").toBool()) {
+        block += "    Q_OBJECT\n";
+        block += "\n";
+    }
+    block += "public:\n";
+
+    if (field("qobjectCtor").toBool()) {
+        block += "    " + className + "(QObject *parent = 0);\n";
+    } else if (field("qwidgetCtor").toBool()) {
+        block += "    " + className + "(QWidget *parent = 0);\n";
+    } else if (field("defaultCtor").toBool()) {
+        block += "    " + className + "();\n";
+        if (field("copyCtor").toBool()) {
+            block += "    " + className + "(const " + className + " &other);\n";
+            block += "\n";
+            block += "    " + className + " &operator=" + "(const " + className
+                     + " &other);\n";
+        }
+    }
+    block += "};\n";
+
+    if (field("protect").toBool()) {
+        block += "\n";
+        block += "#endif\n";
+    }
+
+    QFile headerFile(outputDir + "/" + header);
+    if (!headerFile.open(QFile::WriteOnly | QFile::Text)) {
+        QMessageBox::warning(0, QObject::tr("Simple Wizard"),
+                             QObject::tr("Cannot write file %1:\n%2")
+                             .arg(headerFile.fileName())
+                             .arg(headerFile.errorString()));
+        return;
+    }
+    headerFile.write(block);
+
+    block.clear();
+
+    if (field("comment").toBool()) {
+        block += "/*\n";
+        block += "    " + implementation.toAscii() + "\n";
+        block += "*/\n";
+        block += "\n";
+    }
+    block += "#include \"" + header.toAscii() + "\"\n";
+    block += "\n";
+
+    if (field("qobjectCtor").toBool()) {
+        block += className + "::" + className + "(QObject *parent)\n";
+        block += "    : " + baseClass + "(parent)\n";
+        block += "{\n";
+        block += "}\n";
+    } else if (field("qwidgetCtor").toBool()) {
+        block += className + "::" + className + "(QWidget *parent)\n";
+        block += "    : " + baseClass + "(parent)\n";
+        block += "{\n";
+        block += "}\n";
+    } else if (field("defaultCtor").toBool()) {
+        block += className + "::" + className + "()\n";
+        block += "{\n";
+        block += "    // missing code\n";
+        block += "}\n";
+
+        if (field("copyCtor").toBool()) {
+            block += "\n";
+            block += className + "::" + className + "(const " + className
+                     + " &other)\n";
+            block += "{\n";
+            block += "    *this = other;\n";
+            block += "}\n";
+            block += "\n";
+            block += className + " &" + className + "::operator=(const "
+                     + className + " &other)\n";
+            block += "{\n";
+            if (!baseClass.isEmpty())
+                block += "    " + baseClass + "::operator=(other);\n";
+            block += "    // missing code\n";
+            block += "    return *this;\n";
+            block += "}\n";
+        }
+    }
+
+    QFile implementationFile(outputDir + "/" + implementation);
+    if (!implementationFile.open(QFile::WriteOnly | QFile::Text)) {
+        QMessageBox::warning(0, QObject::tr("Simple Wizard"),
+                             QObject::tr("Cannot write file %1:\n%2")
+                             .arg(implementationFile.fileName())
+                             .arg(implementationFile.errorString()));
+        return;
+    }
+    implementationFile.write(block);
+
+//! [5]
+    QDialog::accept();
+//! [5] //! [6]
+}
+//! [6]
+
+//! [7]
+IntroPage::IntroPage(QWidget *parent)
+    : QWizardPage(parent)
+{
+    setTitle(tr("Introduction"));
+    setPixmap(QWizard::WatermarkPixmap, QPixmap(":/images/watermark1.png"));
+
+    label = new QLabel(tr("This wizard will generate a skeleton C++ class "
+                          "definition, including a few functions. You simply "
+                          "need to specify the class name and set a few "
+                          "options to produce a header file and an "
+                          "implementation file for your new C++ class."));
+    label->setWordWrap(true);
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(label);
+    setLayout(layout);
+}
+//! [7]
+
+//! [8] //! [9]
+ClassInfoPage::ClassInfoPage(QWidget *parent)
+    : QWizardPage(parent)
+{
+//! [8]
+    setTitle(tr("Class Information"));
+    setSubTitle(tr("Specify basic information about the class for which you "
+                   "want to generate skeleton source code files."));
+    setPixmap(QWizard::LogoPixmap, QPixmap(":/images/logo1.png"));
+
+//! [10]
+    classNameLabel = new QLabel(tr("&Class name:"));
+    classNameLineEdit = new QLineEdit;
+    classNameLabel->setBuddy(classNameLineEdit);
+
+    baseClassLabel = new QLabel(tr("B&ase class:"));
+    baseClassLineEdit = new QLineEdit;
+    baseClassLabel->setBuddy(baseClassLineEdit);
+
+    qobjectMacroCheckBox = new QCheckBox(tr("Generate Q_OBJECT &macro"));
+
+//! [10]
+    groupBox = new QGroupBox(tr("C&onstructor"));
+//! [9]
+
+    qobjectCtorRadioButton = new QRadioButton(tr("&QObject-style constructor"));
+    qwidgetCtorRadioButton = new QRadioButton(tr("Q&Widget-style constructor"));
+    defaultCtorRadioButton = new QRadioButton(tr("&Default constructor"));
+    copyCtorCheckBox = new QCheckBox(tr("&Generate copy constructor and "
+                                        "operator="));
+
+    defaultCtorRadioButton->setChecked(true);
+
+    connect(defaultCtorRadioButton, SIGNAL(toggled(bool)),
+            copyCtorCheckBox, SLOT(setEnabled(bool)));
+
+//! [11] //! [12]
+    registerField("className*", classNameLineEdit);
+    registerField("baseClass", baseClassLineEdit);
+    registerField("qobjectMacro", qobjectMacroCheckBox);
+//! [11]
+    registerField("qobjectCtor", qobjectCtorRadioButton);
+    registerField("qwidgetCtor", qwidgetCtorRadioButton);
+    registerField("defaultCtor", defaultCtorRadioButton);
+    registerField("copyCtor", copyCtorCheckBox);
+
+    QVBoxLayout *groupBoxLayout = new QVBoxLayout;
+//! [12]
+    groupBoxLayout->addWidget(qobjectCtorRadioButton);
+    groupBoxLayout->addWidget(qwidgetCtorRadioButton);
+    groupBoxLayout->addWidget(defaultCtorRadioButton);
+    groupBoxLayout->addWidget(copyCtorCheckBox);
+    groupBox->setLayout(groupBoxLayout);
+
+    QGridLayout *layout = new QGridLayout;
+    layout->addWidget(classNameLabel, 0, 0);
+    layout->addWidget(classNameLineEdit, 0, 1);
+    layout->addWidget(baseClassLabel, 1, 0);
+    layout->addWidget(baseClassLineEdit, 1, 1);
+    layout->addWidget(qobjectMacroCheckBox, 2, 0, 1, 2);
+    layout->addWidget(groupBox, 3, 0, 1, 2);
+    setLayout(layout);
+//! [13]
+}
+//! [13]
+
+//! [14]
+CodeStylePage::CodeStylePage(QWidget *parent)
+    : QWizardPage(parent)
+{
+    setTitle(tr("Code Style Options"));
+    setSubTitle(tr("Choose the formatting of the generated code."));
+    setPixmap(QWizard::LogoPixmap, QPixmap(":/images/logo2.png"));
+
+    commentCheckBox = new QCheckBox(tr("&Start generated files with a "
+//! [14]
+                                       "comment"));
+    commentCheckBox->setChecked(true);
+
+    protectCheckBox = new QCheckBox(tr("&Protect header file against multiple "
+                                       "inclusions"));
+    protectCheckBox->setChecked(true);
+
+    macroNameLabel = new QLabel(tr("&Macro name:"));
+    macroNameLineEdit = new QLineEdit;
+    macroNameLabel->setBuddy(macroNameLineEdit);
+
+    includeBaseCheckBox = new QCheckBox(tr("&Include base class definition"));
+    baseIncludeLabel = new QLabel(tr("Base class include:"));
+    baseIncludeLineEdit = new QLineEdit;
+    baseIncludeLabel->setBuddy(baseIncludeLineEdit);
+
+    connect(protectCheckBox, SIGNAL(toggled(bool)),
+            macroNameLabel, SLOT(setEnabled(bool)));
+    connect(protectCheckBox, SIGNAL(toggled(bool)),
+            macroNameLineEdit, SLOT(setEnabled(bool)));
+    connect(includeBaseCheckBox, SIGNAL(toggled(bool)),
+            baseIncludeLabel, SLOT(setEnabled(bool)));
+    connect(includeBaseCheckBox, SIGNAL(toggled(bool)),
+            baseIncludeLineEdit, SLOT(setEnabled(bool)));
+
+    registerField("comment", commentCheckBox);
+    registerField("protect", protectCheckBox);
+    registerField("macroName", macroNameLineEdit);
+    registerField("includeBase", includeBaseCheckBox);
+    registerField("baseInclude", baseIncludeLineEdit);
+
+    QGridLayout *layout = new QGridLayout;
+    layout->setColumnMinimumWidth(0, 20);
+    layout->addWidget(commentCheckBox, 0, 0, 1, 3);
+    layout->addWidget(protectCheckBox, 1, 0, 1, 3);
+    layout->addWidget(macroNameLabel, 2, 1);
+    layout->addWidget(macroNameLineEdit, 2, 2);
+    layout->addWidget(includeBaseCheckBox, 3, 0, 1, 3);
+    layout->addWidget(baseIncludeLabel, 4, 1);
+    layout->addWidget(baseIncludeLineEdit, 4, 2);
+//! [15]
+    setLayout(layout);
+}
+//! [15]
+
+//! [16]
+void CodeStylePage::initializePage()
+{
+    QString className = field("className").toString();
+    macroNameLineEdit->setText(className.toUpper() + "_H");
+
+    QString baseClass = field("baseClass").toString();
+
+    includeBaseCheckBox->setChecked(!baseClass.isEmpty());
+    includeBaseCheckBox->setEnabled(!baseClass.isEmpty());
+    baseIncludeLabel->setEnabled(!baseClass.isEmpty());
+    baseIncludeLineEdit->setEnabled(!baseClass.isEmpty());
+
+    if (baseClass.isEmpty()) {
+        baseIncludeLineEdit->clear();
+    } else if (QRegExp("Q[A-Z].*").exactMatch(baseClass)) {
+        baseIncludeLineEdit->setText("<" + baseClass + ">");
+    } else {
+        baseIncludeLineEdit->setText("\"" + baseClass.toLower() + ".h\"");
+    }
+}
+//! [16]
+
+OutputFilesPage::OutputFilesPage(QWidget *parent)
+    : QWizardPage(parent)
+{
+    setTitle(tr("Output Files"));
+    setSubTitle(tr("Specify where you want the wizard to put the generated "
+                   "skeleton code."));
+    setPixmap(QWizard::LogoPixmap, QPixmap(":/images/logo3.png"));
+
+    outputDirLabel = new QLabel(tr("&Output directory:"));
+    outputDirLineEdit = new QLineEdit;
+    outputDirLabel->setBuddy(outputDirLineEdit);
+
+    headerLabel = new QLabel(tr("&Header file name:"));
+    headerLineEdit = new QLineEdit;
+    headerLabel->setBuddy(headerLineEdit);
+
+    implementationLabel = new QLabel(tr("&Implementation file name:"));
+    implementationLineEdit = new QLineEdit;
+    implementationLabel->setBuddy(implementationLineEdit);
+
+    registerField("outputDir*", outputDirLineEdit);
+    registerField("header*", headerLineEdit);
+    registerField("implementation*", implementationLineEdit);
+
+    QGridLayout *layout = new QGridLayout;
+    layout->addWidget(outputDirLabel, 0, 0);
+    layout->addWidget(outputDirLineEdit, 0, 1);
+    layout->addWidget(headerLabel, 1, 0);
+    layout->addWidget(headerLineEdit, 1, 1);
+    layout->addWidget(implementationLabel, 2, 0);
+    layout->addWidget(implementationLineEdit, 2, 1);
+    setLayout(layout);
+}
+
+//! [17]
+void OutputFilesPage::initializePage()
+{
+    QString className = field("className").toString();
+    headerLineEdit->setText(className.toLower() + ".h");
+    implementationLineEdit->setText(className.toLower() + ".cpp");
+    outputDirLineEdit->setText(QDir::convertSeparators(QDir::tempPath()));
+}
+//! [17]
+
+ConclusionPage::ConclusionPage(QWidget *parent)
+    : QWizardPage(parent)
+{
+    setTitle(tr("Conclusion"));
+    setPixmap(QWizard::WatermarkPixmap, QPixmap(":/images/watermark2.png"));
+
+    label = new QLabel;
+    label->setWordWrap(true);
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(label);
+    setLayout(layout);
+}
+
+void ConclusionPage::initializePage()
+{
+    QString finishText = wizard()->buttonText(QWizard::FinishButton);
+    finishText.remove('&');
+    label->setText(tr("Click %1 to generate the class skeleton.")
+                   .arg(finishText));
+}
diff --git a/examples/dialogs/classwizard/classwizard.h b/examples/dialogs/classwizard/classwizard.h
new file mode 100644
index 0000000000..4808629fce
--- /dev/null
+++ b/examples/dialogs/classwizard/classwizard.h
@@ -0,0 +1,157 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CLASSWIZARD_H
+#define CLASSWIZARD_H
+
+#include <QWizard>
+
+QT_BEGIN_NAMESPACE
+class QCheckBox;
+class QGroupBox;
+class QLabel;
+class QLineEdit;
+class QRadioButton;
+QT_END_NAMESPACE
+
+//! [0]
+class ClassWizard : public QWizard
+{
+    Q_OBJECT
+
+public:
+    ClassWizard(QWidget *parent = 0);
+
+    void accept();
+};
+//! [0]
+
+//! [1]
+class IntroPage : public QWizardPage
+{
+    Q_OBJECT
+
+public:
+    IntroPage(QWidget *parent = 0);
+
+private:
+    QLabel *label;
+};
+//! [1]
+
+//! [2]
+class ClassInfoPage : public QWizardPage
+{
+    Q_OBJECT
+
+public:
+    ClassInfoPage(QWidget *parent = 0);
+
+private:
+    QLabel *classNameLabel;
+    QLabel *baseClassLabel;
+    QLineEdit *classNameLineEdit;
+    QLineEdit *baseClassLineEdit;
+    QCheckBox *qobjectMacroCheckBox;
+    QGroupBox *groupBox;
+    QRadioButton *qobjectCtorRadioButton;
+    QRadioButton *qwidgetCtorRadioButton;
+    QRadioButton *defaultCtorRadioButton;
+    QCheckBox *copyCtorCheckBox;
+};
+//! [2]
+
+//! [3]
+class CodeStylePage : public QWizardPage
+{
+    Q_OBJECT
+
+public:
+    CodeStylePage(QWidget *parent = 0);
+
+protected:
+    void initializePage();
+
+private:
+    QCheckBox *commentCheckBox;
+    QCheckBox *protectCheckBox;
+    QCheckBox *includeBaseCheckBox;
+    QLabel *macroNameLabel;
+    QLabel *baseIncludeLabel;
+    QLineEdit *macroNameLineEdit;
+    QLineEdit *baseIncludeLineEdit;
+};
+//! [3]
+
+class OutputFilesPage : public QWizardPage
+{
+    Q_OBJECT
+
+public:    
+    OutputFilesPage(QWidget *parent = 0);
+
+protected:
+    void initializePage();
+
+private:
+    QLabel *outputDirLabel;
+    QLabel *headerLabel;
+    QLabel *implementationLabel;
+    QLineEdit *outputDirLineEdit;
+    QLineEdit *headerLineEdit;
+    QLineEdit *implementationLineEdit;
+};
+
+class ConclusionPage : public QWizardPage
+{
+    Q_OBJECT
+
+public:
+    ConclusionPage(QWidget *parent = 0);
+
+protected:
+    void initializePage();
+
+private:
+    QLabel *label;
+};
+
+#endif
diff --git a/examples/dialogs/classwizard/classwizard.pro b/examples/dialogs/classwizard/classwizard.pro
new file mode 100644
index 0000000000..15b602988f
--- /dev/null
+++ b/examples/dialogs/classwizard/classwizard.pro
@@ -0,0 +1,10 @@
+HEADERS       = classwizard.h
+SOURCES       = classwizard.cpp \
+                main.cpp
+RESOURCES     = classwizard.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/dialogs/classwizard
+sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs/classwizard
+INSTALLS += target sources
diff --git a/examples/dialogs/classwizard/classwizard.qrc b/examples/dialogs/classwizard/classwizard.qrc
new file mode 100644
index 0000000000..41a5ddc7d1
--- /dev/null
+++ b/examples/dialogs/classwizard/classwizard.qrc
@@ -0,0 +1,11 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>images/background.png</file>
+    <file>images/banner.png</file>
+    <file>images/logo1.png</file>
+    <file>images/logo2.png</file>
+    <file>images/logo3.png</file>
+    <file>images/watermark1.png</file>
+    <file>images/watermark2.png</file>
+</qresource>
+</RCC>
diff --git a/examples/dialogs/classwizard/images/background.png b/examples/dialogs/classwizard/images/background.png
new file mode 100644
index 0000000000..44c7badb85
--- /dev/null
+++ b/examples/dialogs/classwizard/images/background.png
diff --git a/examples/dialogs/classwizard/images/banner.png b/examples/dialogs/classwizard/images/banner.png
new file mode 100644
index 0000000000..3169152b8e
--- /dev/null
+++ b/examples/dialogs/classwizard/images/banner.png
diff --git a/examples/dialogs/classwizard/images/logo1.png b/examples/dialogs/classwizard/images/logo1.png
new file mode 100644
index 0000000000..f9b594aafc
--- /dev/null
+++ b/examples/dialogs/classwizard/images/logo1.png
diff --git a/examples/dialogs/classwizard/images/logo2.png b/examples/dialogs/classwizard/images/logo2.png
new file mode 100644
index 0000000000..5dcbd4669d
--- /dev/null
+++ b/examples/dialogs/classwizard/images/logo2.png
diff --git a/examples/dialogs/classwizard/images/logo3.png b/examples/dialogs/classwizard/images/logo3.png
new file mode 100644
index 0000000000..9fd3ea2358
--- /dev/null
+++ b/examples/dialogs/classwizard/images/logo3.png
diff --git a/examples/dialogs/classwizard/images/watermark1.png b/examples/dialogs/classwizard/images/watermark1.png
new file mode 100644
index 0000000000..0091f5c17a
--- /dev/null
+++ b/examples/dialogs/classwizard/images/watermark1.png
diff --git a/examples/dialogs/classwizard/images/watermark2.png b/examples/dialogs/classwizard/images/watermark2.png
new file mode 100644
index 0000000000..3b88f2e360
--- /dev/null
+++ b/examples/dialogs/classwizard/images/watermark2.png
diff --git a/examples/dialogs/classwizard/main.cpp b/examples/dialogs/classwizard/main.cpp
new file mode 100644
index 0000000000..8230695f5c
--- /dev/null
+++ b/examples/dialogs/classwizard/main.cpp
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QTranslator>
+#include <QLocale>
+#include <QLibraryInfo>
+
+#include "classwizard.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(classwizard);
+    
+    QApplication app(argc, argv);
+
+    QString translatorFileName = QLatin1String("qt_");
+    translatorFileName += QLocale::system().name();
+    QTranslator *translator = new QTranslator(&app);
+    if (translator->load(translatorFileName, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
+        app.installTranslator(translator);
+
+    ClassWizard wizard;
+    wizard.show();
+    return app.exec();
+}
diff --git a/examples/dialogs/configdialog/configdialog.cpp b/examples/dialogs/configdialog/configdialog.cpp
new file mode 100644
index 0000000000..f442e10194
--- /dev/null
+++ b/examples/dialogs/configdialog/configdialog.cpp
@@ -0,0 +1,117 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "configdialog.h"
+#include "pages.h"
+
+ConfigDialog::ConfigDialog()
+{
+    contentsWidget = new QListWidget;
+    contentsWidget->setViewMode(QListView::IconMode);
+    contentsWidget->setIconSize(QSize(96, 84));
+    contentsWidget->setMovement(QListView::Static);
+    contentsWidget->setMaximumWidth(128);
+    contentsWidget->setSpacing(12);
+
+    pagesWidget = new QStackedWidget;
+    pagesWidget->addWidget(new ConfigurationPage);
+    pagesWidget->addWidget(new UpdatePage);
+    pagesWidget->addWidget(new QueryPage);
+
+    QPushButton *closeButton = new QPushButton(tr("Close"));
+
+    createIcons();
+    contentsWidget->setCurrentRow(0);
+
+    connect(closeButton, SIGNAL(clicked()), this, SLOT(close()));
+
+    QHBoxLayout *horizontalLayout = new QHBoxLayout;
+    horizontalLayout->addWidget(contentsWidget);
+    horizontalLayout->addWidget(pagesWidget, 1);
+
+    QHBoxLayout *buttonsLayout = new QHBoxLayout;
+    buttonsLayout->addStretch(1);
+    buttonsLayout->addWidget(closeButton);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addLayout(horizontalLayout);
+    mainLayout->addStretch(1);
+    mainLayout->addSpacing(12);
+    mainLayout->addLayout(buttonsLayout);
+    setLayout(mainLayout);
+
+    setWindowTitle(tr("Config Dialog"));
+}
+
+void ConfigDialog::createIcons()
+{
+    QListWidgetItem *configButton = new QListWidgetItem(contentsWidget);
+    configButton->setIcon(QIcon(":/images/config.png"));
+    configButton->setText(tr("Configuration"));
+    configButton->setTextAlignment(Qt::AlignHCenter);
+    configButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+
+    QListWidgetItem *updateButton = new QListWidgetItem(contentsWidget);
+    updateButton->setIcon(QIcon(":/images/update.png"));
+    updateButton->setText(tr("Update"));
+    updateButton->setTextAlignment(Qt::AlignHCenter);
+    updateButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+
+    QListWidgetItem *queryButton = new QListWidgetItem(contentsWidget);
+    queryButton->setIcon(QIcon(":/images/query.png"));
+    queryButton->setText(tr("Query"));
+    queryButton->setTextAlignment(Qt::AlignHCenter);
+    queryButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+
+    connect(contentsWidget,
+            SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)),
+            this, SLOT(changePage(QListWidgetItem *, QListWidgetItem*)));
+}
+
+void ConfigDialog::changePage(QListWidgetItem *current, QListWidgetItem *previous)
+{
+    if (!current)
+        current = previous;
+
+    pagesWidget->setCurrentIndex(contentsWidget->row(current));
+}
diff --git a/examples/dialogs/configdialog/configdialog.h b/examples/dialogs/configdialog/configdialog.h
new file mode 100644
index 0000000000..b09771c59f
--- /dev/null
+++ b/examples/dialogs/configdialog/configdialog.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CONFIGDIALOG_H
+#define CONFIGDIALOG_H
+
+#include <QDialog>
+
+QT_BEGIN_NAMESPACE
+class QListWidget;
+class QListWidgetItem;
+class QStackedWidget;
+QT_END_NAMESPACE
+
+class ConfigDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    ConfigDialog();
+
+public slots:
+    void changePage(QListWidgetItem *current, QListWidgetItem *previous);
+
+private:
+    void createIcons();
+
+    QListWidget *contentsWidget;
+    QStackedWidget *pagesWidget;
+};
+
+#endif
diff --git a/examples/dialogs/configdialog/configdialog.pro b/examples/dialogs/configdialog/configdialog.pro
new file mode 100644
index 0000000000..344a394e6c
--- /dev/null
+++ b/examples/dialogs/configdialog/configdialog.pro
@@ -0,0 +1,14 @@
+HEADERS     = configdialog.h \
+              pages.h
+SOURCES     = configdialog.cpp \
+              main.cpp \
+              pages.cpp
+RESOURCES   += configdialog.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/dialogs/configdialog
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs/configdialog
+INSTALLS += target sources
+wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
+
diff --git a/examples/dialogs/configdialog/configdialog.qrc b/examples/dialogs/configdialog/configdialog.qrc
new file mode 100644
index 0000000000..31d0d49666
--- /dev/null
+++ b/examples/dialogs/configdialog/configdialog.qrc
@@ -0,0 +1,7 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+   <file>images/config.png</file>
+   <file>images/query.png</file>
+   <file>images/update.png</file>
+</qresource>
+</RCC>
diff --git a/examples/dialogs/configdialog/images/config.png b/examples/dialogs/configdialog/images/config.png
new file mode 100644
index 0000000000..5c14d5f470
--- /dev/null
+++ b/examples/dialogs/configdialog/images/config.png
diff --git a/examples/dialogs/configdialog/images/query.png b/examples/dialogs/configdialog/images/query.png
new file mode 100644
index 0000000000..ea9e291eeb
--- /dev/null
+++ b/examples/dialogs/configdialog/images/query.png
diff --git a/examples/dialogs/configdialog/images/update.png b/examples/dialogs/configdialog/images/update.png
new file mode 100644
index 0000000000..3cb8ba6c77
--- /dev/null
+++ b/examples/dialogs/configdialog/images/update.png
diff --git a/examples/dialogs/configdialog/main.cpp b/examples/dialogs/configdialog/main.cpp
new file mode 100644
index 0000000000..afc5467881
--- /dev/null
+++ b/examples/dialogs/configdialog/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "configdialog.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(configdialog);
+
+    QApplication app(argc, argv);
+    ConfigDialog dialog;
+    return dialog.exec();
+}
diff --git a/examples/dialogs/configdialog/pages.cpp b/examples/dialogs/configdialog/pages.cpp
new file mode 100644
index 0000000000..27c322a15f
--- /dev/null
+++ b/examples/dialogs/configdialog/pages.cpp
@@ -0,0 +1,152 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "pages.h"
+
+ConfigurationPage::ConfigurationPage(QWidget *parent)
+    : QWidget(parent)
+{
+    QGroupBox *configGroup = new QGroupBox(tr("Server configuration"));
+
+    QLabel *serverLabel = new QLabel(tr("Server:"));
+    QComboBox *serverCombo = new QComboBox;
+    serverCombo->addItem(tr("Qt Software (Australia)"));
+    serverCombo->addItem(tr("Qt Software (Germany)"));
+    serverCombo->addItem(tr("Qt Software (Norway)"));
+    serverCombo->addItem(tr("Qt Software (People's Republic of China)"));
+    serverCombo->addItem(tr("Qt Software (USA)"));
+
+    QHBoxLayout *serverLayout = new QHBoxLayout;
+    serverLayout->addWidget(serverLabel);
+    serverLayout->addWidget(serverCombo);
+
+    QVBoxLayout *configLayout = new QVBoxLayout;
+    configLayout->addLayout(serverLayout);
+    configGroup->setLayout(configLayout);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(configGroup);
+    mainLayout->addStretch(1);
+    setLayout(mainLayout);
+}
+
+UpdatePage::UpdatePage(QWidget *parent)
+    : QWidget(parent)
+{
+    QGroupBox *updateGroup = new QGroupBox(tr("Package selection"));
+    QCheckBox *systemCheckBox = new QCheckBox(tr("Update system"));
+    QCheckBox *appsCheckBox = new QCheckBox(tr("Update applications"));
+    QCheckBox *docsCheckBox = new QCheckBox(tr("Update documentation"));
+
+    QGroupBox *packageGroup = new QGroupBox(tr("Existing packages"));
+
+    QListWidget *packageList = new QListWidget;
+    QListWidgetItem *qtItem = new QListWidgetItem(packageList);
+    qtItem->setText(tr("Qt"));
+    QListWidgetItem *qsaItem = new QListWidgetItem(packageList);
+    qsaItem->setText(tr("QSA"));
+    QListWidgetItem *teamBuilderItem = new QListWidgetItem(packageList);
+    teamBuilderItem->setText(tr("Teambuilder"));
+
+    QPushButton *startUpdateButton = new QPushButton(tr("Start update"));
+
+    QVBoxLayout *updateLayout = new QVBoxLayout;
+    updateLayout->addWidget(systemCheckBox);
+    updateLayout->addWidget(appsCheckBox);
+    updateLayout->addWidget(docsCheckBox);
+    updateGroup->setLayout(updateLayout);
+
+    QVBoxLayout *packageLayout = new QVBoxLayout;
+    packageLayout->addWidget(packageList);
+    packageGroup->setLayout(packageLayout);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(updateGroup);
+    mainLayout->addWidget(packageGroup);
+    mainLayout->addSpacing(12);
+    mainLayout->addWidget(startUpdateButton);
+    mainLayout->addStretch(1);
+    setLayout(mainLayout);
+}
+
+QueryPage::QueryPage(QWidget *parent)
+    : QWidget(parent)
+{
+    QGroupBox *packagesGroup = new QGroupBox(tr("Look for packages"));
+
+    QLabel *nameLabel = new QLabel(tr("Name:"));
+    QLineEdit *nameEdit = new QLineEdit;
+
+    QLabel *dateLabel = new QLabel(tr("Released after:"));
+    QDateTimeEdit *dateEdit = new QDateTimeEdit(QDate::currentDate());
+
+    QCheckBox *releasesCheckBox = new QCheckBox(tr("Releases"));
+    QCheckBox *upgradesCheckBox = new QCheckBox(tr("Upgrades"));
+
+    QSpinBox *hitsSpinBox = new QSpinBox;
+    hitsSpinBox->setPrefix(tr("Return up to "));
+    hitsSpinBox->setSuffix(tr(" results"));
+    hitsSpinBox->setSpecialValueText(tr("Return only the first result"));
+    hitsSpinBox->setMinimum(1);
+    hitsSpinBox->setMaximum(100);
+    hitsSpinBox->setSingleStep(10);
+
+    QPushButton *startQueryButton = new QPushButton(tr("Start query"));
+
+    QGridLayout *packagesLayout = new QGridLayout;
+    packagesLayout->addWidget(nameLabel, 0, 0);
+    packagesLayout->addWidget(nameEdit, 0, 1);
+    packagesLayout->addWidget(dateLabel, 1, 0);
+    packagesLayout->addWidget(dateEdit, 1, 1);
+    packagesLayout->addWidget(releasesCheckBox, 2, 0);
+    packagesLayout->addWidget(upgradesCheckBox, 3, 0);
+    packagesLayout->addWidget(hitsSpinBox, 4, 0, 1, 2);
+    packagesGroup->setLayout(packagesLayout);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(packagesGroup);
+    mainLayout->addSpacing(12);
+    mainLayout->addWidget(startQueryButton);
+    mainLayout->addStretch(1);
+    setLayout(mainLayout);
+}
diff --git a/examples/dialogs/configdialog/pages.h b/examples/dialogs/configdialog/pages.h
new file mode 100644
index 0000000000..534798f3b1
--- /dev/null
+++ b/examples/dialogs/configdialog/pages.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PAGES_H
+#define PAGES_H
+
+#include <QWidget>
+
+class ConfigurationPage : public QWidget
+{
+public:
+    ConfigurationPage(QWidget *parent = 0);
+};
+
+class QueryPage : public QWidget
+{
+public:
+    QueryPage(QWidget *parent = 0);
+};
+
+class UpdatePage : public QWidget
+{
+public:
+    UpdatePage(QWidget *parent = 0);
+};
+
+#endif
diff --git a/examples/dialogs/dialogs.pro b/examples/dialogs/dialogs.pro
new file mode 100644
index 0000000000..b9f029a0e1
--- /dev/null
+++ b/examples/dialogs/dialogs.pro
@@ -0,0 +1,17 @@
+TEMPLATE      = subdirs
+SUBDIRS       = classwizard \
+                configdialog \
+                standarddialogs \
+                tabdialog \
+                trivialwizard
+
+!wince*: SUBDIRS += licensewizard \
+                    extension \
+                    findfiles
+
+wince*: SUBDIRS += sipdialog
+
+# install
+sources.files = README *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs
+INSTALLS += sources
diff --git a/examples/dialogs/extension/extension.pro b/examples/dialogs/extension/extension.pro
new file mode 100644
index 0000000000..3e56cb9984
--- /dev/null
+++ b/examples/dialogs/extension/extension.pro
@@ -0,0 +1,9 @@
+HEADERS       = finddialog.h
+SOURCES       = finddialog.cpp \
+                main.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/dialogs/extension
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs/extension
+INSTALLS += target sources
diff --git a/examples/dialogs/extension/finddialog.cpp b/examples/dialogs/extension/finddialog.cpp
new file mode 100644
index 0000000000..80c2868caa
--- /dev/null
+++ b/examples/dialogs/extension/finddialog.cpp
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "finddialog.h"
+
+//! [0]
+FindDialog::FindDialog(QWidget *parent)
+    : QDialog(parent)
+{
+    label = new QLabel(tr("Find &what:"));
+    lineEdit = new QLineEdit;
+    label->setBuddy(lineEdit);
+
+    caseCheckBox = new QCheckBox(tr("Match &case"));
+    fromStartCheckBox = new QCheckBox(tr("Search from &start"));
+    fromStartCheckBox->setChecked(true);
+
+//! [1]
+    findButton = new QPushButton(tr("&Find"));
+    findButton->setDefault(true);
+
+    moreButton = new QPushButton(tr("&More"));
+    moreButton->setCheckable(true);
+//! [0]
+    moreButton->setAutoDefault(false);
+
+    buttonBox = new QDialogButtonBox(Qt::Vertical);
+    buttonBox->addButton(findButton, QDialogButtonBox::ActionRole);
+    buttonBox->addButton(moreButton, QDialogButtonBox::ActionRole);
+//! [1]
+
+//! [2]
+    extension = new QWidget;
+
+    wholeWordsCheckBox = new QCheckBox(tr("&Whole words"));
+    backwardCheckBox = new QCheckBox(tr("Search &backward"));
+    searchSelectionCheckBox = new QCheckBox(tr("Search se&lection"));
+//! [2]
+
+//! [3]
+    connect(moreButton, SIGNAL(toggled(bool)), extension, SLOT(setVisible(bool)));
+
+    QVBoxLayout *extensionLayout = new QVBoxLayout;
+    extensionLayout->setMargin(0);
+    extensionLayout->addWidget(wholeWordsCheckBox);
+    extensionLayout->addWidget(backwardCheckBox);
+    extensionLayout->addWidget(searchSelectionCheckBox);
+    extension->setLayout(extensionLayout);
+//! [3]
+
+//! [4]
+    QHBoxLayout *topLeftLayout = new QHBoxLayout;
+    topLeftLayout->addWidget(label);
+    topLeftLayout->addWidget(lineEdit);
+
+    QVBoxLayout *leftLayout = new QVBoxLayout;
+    leftLayout->addLayout(topLeftLayout);
+    leftLayout->addWidget(caseCheckBox);
+    leftLayout->addWidget(fromStartCheckBox);
+    leftLayout->addStretch(1);
+
+    QGridLayout *mainLayout = new QGridLayout;
+    mainLayout->setSizeConstraint(QLayout::SetFixedSize);
+    mainLayout->addLayout(leftLayout, 0, 0);
+    mainLayout->addWidget(buttonBox, 0, 1);
+    mainLayout->addWidget(extension, 1, 0, 1, 2);
+    setLayout(mainLayout);
+
+    setWindowTitle(tr("Extension"));
+//! [4] //! [5]
+    extension->hide();
+}
+//! [5]
diff --git a/examples/dialogs/extension/finddialog.h b/examples/dialogs/extension/finddialog.h
new file mode 100644
index 0000000000..4fc7ee589a
--- /dev/null
+++ b/examples/dialogs/extension/finddialog.h
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef FINDDIALOG_H
+#define FINDDIALOG_H
+
+#include <QDialog>
+
+QT_BEGIN_NAMESPACE
+class QCheckBox;
+class QDialogButtonBox;
+class QGroupBox;
+class QLabel;
+class QLineEdit;
+class QPushButton;
+QT_END_NAMESPACE
+
+//! [0]
+class FindDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    FindDialog(QWidget *parent = 0);
+
+private:
+    QLabel *label;
+    QLineEdit *lineEdit;
+    QCheckBox *caseCheckBox;
+    QCheckBox *fromStartCheckBox;
+    QCheckBox *wholeWordsCheckBox;
+    QCheckBox *searchSelectionCheckBox;
+    QCheckBox *backwardCheckBox;
+    QDialogButtonBox *buttonBox;
+    QPushButton *findButton;
+    QPushButton *moreButton;
+    QWidget *extension;
+};
+//! [0]
+
+#endif
diff --git a/examples/dialogs/extension/main.cpp b/examples/dialogs/extension/main.cpp
new file mode 100644
index 0000000000..fa70a55be4
--- /dev/null
+++ b/examples/dialogs/extension/main.cpp
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "finddialog.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    FindDialog dialog;
+    return dialog.exec();
+}
diff --git a/examples/dialogs/findfiles/findfiles.pro b/examples/dialogs/findfiles/findfiles.pro
new file mode 100644
index 0000000000..99be394186
--- /dev/null
+++ b/examples/dialogs/findfiles/findfiles.pro
@@ -0,0 +1,9 @@
+HEADERS       = window.h
+SOURCES       = main.cpp \
+                window.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/dialogs/findfiles
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs/findfiles
+INSTALLS += target sources
diff --git a/examples/dialogs/findfiles/main.cpp b/examples/dialogs/findfiles/main.cpp
new file mode 100644
index 0000000000..fa8b0abb9d
--- /dev/null
+++ b/examples/dialogs/findfiles/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "window.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Window window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/dialogs/findfiles/window.cpp b/examples/dialogs/findfiles/window.cpp
new file mode 100644
index 0000000000..7620a68c29
--- /dev/null
+++ b/examples/dialogs/findfiles/window.cpp
@@ -0,0 +1,250 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+
+//! [0]
+Window::Window(QWidget *parent)
+    : QDialog(parent)
+{
+    browseButton = createButton(tr("&Browse..."), SLOT(browse()));
+    findButton = createButton(tr("&Find"), SLOT(find()));
+
+    fileComboBox = createComboBox(tr("*"));
+    textComboBox = createComboBox();
+    directoryComboBox = createComboBox(QDir::currentPath());
+
+    fileLabel = new QLabel(tr("Named:"));
+    textLabel = new QLabel(tr("Containing text:"));
+    directoryLabel = new QLabel(tr("In directory:"));
+    filesFoundLabel = new QLabel;
+
+    createFilesTable();
+//! [0]
+
+//! [1]
+    QHBoxLayout *buttonsLayout = new QHBoxLayout;
+    buttonsLayout->addStretch();
+    buttonsLayout->addWidget(findButton);
+
+    QGridLayout *mainLayout = new QGridLayout;
+    mainLayout->addWidget(fileLabel, 0, 0);
+    mainLayout->addWidget(fileComboBox, 0, 1, 1, 2);
+    mainLayout->addWidget(textLabel, 1, 0);
+    mainLayout->addWidget(textComboBox, 1, 1, 1, 2);
+    mainLayout->addWidget(directoryLabel, 2, 0);
+    mainLayout->addWidget(directoryComboBox, 2, 1);
+    mainLayout->addWidget(browseButton, 2, 2);
+    mainLayout->addWidget(filesTable, 3, 0, 1, 3);
+    mainLayout->addWidget(filesFoundLabel, 4, 0);
+    mainLayout->addLayout(buttonsLayout, 5, 0, 1, 3);
+    setLayout(mainLayout);
+
+    setWindowTitle(tr("Find Files"));
+    resize(700, 300);
+}
+//! [1]
+
+//! [2]
+void Window::browse()
+{
+    QString directory = QFileDialog::getExistingDirectory(this,
+                               tr("Find Files"), QDir::currentPath());
+
+    if (!directory.isEmpty()) {
+        if (directoryComboBox->findText(directory) == -1)
+            directoryComboBox->addItem(directory);
+        directoryComboBox->setCurrentIndex(directoryComboBox->findText(directory));
+    }
+}
+//! [2]
+
+static void updateComboBox(QComboBox *comboBox)
+{
+    if (comboBox->findText(comboBox->currentText()) == -1)
+        comboBox->addItem(comboBox->currentText());
+}
+
+//! [3]
+void Window::find()
+{
+    filesTable->setRowCount(0);
+
+    QString fileName = fileComboBox->currentText();
+    QString text = textComboBox->currentText();
+    QString path = directoryComboBox->currentText();
+//! [3]
+
+    updateComboBox(fileComboBox);
+    updateComboBox(textComboBox);
+    updateComboBox(directoryComboBox);
+
+//! [4]
+    currentDir = QDir(path);
+    QStringList files;
+    if (fileName.isEmpty())
+        fileName = "*";
+    files = currentDir.entryList(QStringList(fileName),
+                                 QDir::Files | QDir::NoSymLinks);
+
+    if (!text.isEmpty())
+        files = findFiles(files, text);
+    showFiles(files);
+}
+//! [4]
+
+//! [5]
+QStringList Window::findFiles(const QStringList &files, const QString &text)
+{
+    QProgressDialog progressDialog(this);
+    progressDialog.setCancelButtonText(tr("&Cancel"));
+    progressDialog.setRange(0, files.size());
+    progressDialog.setWindowTitle(tr("Find Files"));
+
+//! [5] //! [6]
+    QStringList foundFiles;
+
+    for (int i = 0; i < files.size(); ++i) {
+        progressDialog.setValue(i);
+        progressDialog.setLabelText(tr("Searching file number %1 of %2...")
+                                    .arg(i).arg(files.size()));
+        qApp->processEvents();
+//! [6]
+
+        if (progressDialog.wasCanceled())
+            break;
+
+//! [7]
+        QFile file(currentDir.absoluteFilePath(files[i]));
+
+        if (file.open(QIODevice::ReadOnly)) {
+            QString line;
+            QTextStream in(&file);
+            while (!in.atEnd()) {
+                if (progressDialog.wasCanceled())
+                    break;
+                line = in.readLine();
+                if (line.contains(text)) {
+                    foundFiles << files[i];
+                    break;
+                }
+            }
+        }
+    }
+    return foundFiles;
+}
+//! [7]
+
+//! [8]
+void Window::showFiles(const QStringList &files)
+{
+    for (int i = 0; i < files.size(); ++i) {
+        QFile file(currentDir.absoluteFilePath(files[i]));
+        qint64 size = QFileInfo(file).size();
+
+        QTableWidgetItem *fileNameItem = new QTableWidgetItem(files[i]);
+        fileNameItem->setFlags(fileNameItem->flags() ^ Qt::ItemIsEditable);
+        QTableWidgetItem *sizeItem = new QTableWidgetItem(tr("%1 KB")
+                                             .arg(int((size + 1023) / 1024)));
+        sizeItem->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+        sizeItem->setFlags(sizeItem->flags() ^ Qt::ItemIsEditable);
+
+        int row = filesTable->rowCount();
+        filesTable->insertRow(row);
+        filesTable->setItem(row, 0, fileNameItem);
+        filesTable->setItem(row, 1, sizeItem);
+    }
+    filesFoundLabel->setText(tr("%1 file(s) found").arg(files.size()) +
+                             (" (Double click on a file to open it)"));
+}
+//! [8]
+
+//! [9]
+QPushButton *Window::createButton(const QString &text, const char *member)
+{
+    QPushButton *button = new QPushButton(text);
+    connect(button, SIGNAL(clicked()), this, member);
+    return button;
+}
+//! [9]
+
+//! [10]
+QComboBox *Window::createComboBox(const QString &text)
+{
+    QComboBox *comboBox = new QComboBox;
+    comboBox->setEditable(true);
+    comboBox->addItem(text);
+    comboBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    return comboBox;
+}
+//! [10]
+
+//! [11]
+void Window::createFilesTable()
+{
+    filesTable = new QTableWidget(0, 2);
+    filesTable->setSelectionBehavior(QAbstractItemView::SelectRows);
+
+    QStringList labels;
+    labels << tr("File Name") << tr("Size");
+    filesTable->setHorizontalHeaderLabels(labels);
+    filesTable->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch);
+    filesTable->verticalHeader()->hide();
+    filesTable->setShowGrid(false);
+
+    connect(filesTable, SIGNAL(cellActivated(int, int)),
+            this, SLOT(openFileOfItem(int, int)));
+}
+//! [11]
+
+//! [12]
+
+void Window::openFileOfItem(int row, int /* column */)
+{
+    QTableWidgetItem *item = filesTable->item(row, 0);
+
+    QDesktopServices::openUrl(currentDir.absoluteFilePath(item->text()));
+}
+
+//! [12]
+
diff --git a/examples/dialogs/findfiles/window.h b/examples/dialogs/findfiles/window.h
new file mode 100644
index 0000000000..8cd4813823
--- /dev/null
+++ b/examples/dialogs/findfiles/window.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QDialog>
+#include <QDir>
+
+QT_BEGIN_NAMESPACE
+class QComboBox;
+class QLabel;
+class QPushButton;
+class QTableWidget;
+class QTableWidgetItem;
+QT_END_NAMESPACE
+
+//! [0]
+class Window : public QDialog
+{
+    Q_OBJECT
+
+public:
+    Window(QWidget *parent = 0);
+
+private slots:
+    void browse();
+    void find();
+    void openFileOfItem(int row, int column);
+
+private:
+    QStringList findFiles(const QStringList &files, const QString &text);
+    void showFiles(const QStringList &files);
+    QPushButton *createButton(const QString &text, const char *member);
+    QComboBox *createComboBox(const QString &text = QString());
+    void createFilesTable();
+
+    QComboBox *fileComboBox;
+    QComboBox *textComboBox;
+    QComboBox *directoryComboBox;
+    QLabel *fileLabel;
+    QLabel *textLabel;
+    QLabel *directoryLabel;
+    QLabel *filesFoundLabel;
+    QPushButton *browseButton;
+    QPushButton *findButton;
+    QTableWidget *filesTable;
+
+    QDir currentDir;
+};
+//! [0]
+
+#endif
diff --git a/examples/dialogs/licensewizard/images/logo.png b/examples/dialogs/licensewizard/images/logo.png
new file mode 100644
index 0000000000..56f17a3e5a
--- /dev/null
+++ b/examples/dialogs/licensewizard/images/logo.png
diff --git a/examples/dialogs/licensewizard/images/watermark.png b/examples/dialogs/licensewizard/images/watermark.png
new file mode 100644
index 0000000000..124a05068b
--- /dev/null
+++ b/examples/dialogs/licensewizard/images/watermark.png
diff --git a/examples/dialogs/licensewizard/licensewizard.cpp b/examples/dialogs/licensewizard/licensewizard.cpp
new file mode 100644
index 0000000000..30b41659a3
--- /dev/null
+++ b/examples/dialogs/licensewizard/licensewizard.cpp
@@ -0,0 +1,360 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "licensewizard.h"
+
+//! [0] //! [1] //! [2]
+LicenseWizard::LicenseWizard(QWidget *parent)
+    : QWizard(parent)
+{
+//! [0]
+    setPage(Page_Intro, new IntroPage);
+    setPage(Page_Evaluate, new EvaluatePage);
+    setPage(Page_Register, new RegisterPage);
+    setPage(Page_Details, new DetailsPage);
+    setPage(Page_Conclusion, new ConclusionPage);
+//! [1]
+
+    setStartId(Page_Intro);
+//! [2]
+
+//! [3]
+#ifndef Q_WS_MAC
+//! [3] //! [4]
+    setWizardStyle(ModernStyle);
+#endif
+//! [4] //! [5]
+    setOption(HaveHelpButton, true);
+//! [5] //! [6]
+    setPixmap(QWizard::LogoPixmap, QPixmap(":/images/logo.png"));
+
+//! [7]
+    connect(this, SIGNAL(helpRequested()), this, SLOT(showHelp()));
+//! [7]
+
+    setWindowTitle(tr("License Wizard"));
+//! [8]
+}
+//! [6] //! [8]
+
+//! [9] //! [10]
+void LicenseWizard::showHelp()
+//! [9] //! [11]
+{
+    static QString lastHelpMessage;
+
+    QString message;
+
+    switch (currentId()) {
+    case Page_Intro:
+        message = tr("The decision you make here will affect which page you "
+                     "get to see next.");
+        break;
+//! [10] //! [11]
+    case Page_Evaluate:
+        message = tr("Make sure to provide a valid email address, such as "
+                     "toni.buddenbrook@example.de.");
+        break;
+    case Page_Register:
+        message = tr("If you don't provide an upgrade key, you will be "
+                     "asked to fill in your details.");
+        break;
+    case Page_Details:
+        message = tr("Make sure to provide a valid email address, such as "
+                     "thomas.gradgrind@example.co.uk.");
+        break;
+    case Page_Conclusion:
+        message = tr("You must accept the terms and conditions of the "
+                     "license to proceed.");
+        break;
+//! [12] //! [13]
+    default:
+        message = tr("This help is likely not to be of any help.");
+    }
+//! [12]
+
+    if (lastHelpMessage == message)
+        message = tr("Sorry, I already gave what help I could. "
+                     "Maybe you should try asking a human?");
+
+//! [14]
+    QMessageBox::information(this, tr("License Wizard Help"), message);
+//! [14]
+
+    lastHelpMessage = message;
+//! [15]
+}
+//! [13] //! [15]
+
+//! [16]
+IntroPage::IntroPage(QWidget *parent)
+    : QWizardPage(parent)
+{
+    setTitle(tr("Introduction"));
+    setPixmap(QWizard::WatermarkPixmap, QPixmap(":/images/watermark.png"));
+
+    topLabel = new QLabel(tr("This wizard will help you register your copy of "
+                             "<i>Super Product One</i>&trade; or start "
+                             "evaluating the product."));
+    topLabel->setWordWrap(true);
+
+    registerRadioButton = new QRadioButton(tr("&Register your copy"));
+    evaluateRadioButton = new QRadioButton(tr("&Evaluate the product for 30 "
+                                              "days"));
+    registerRadioButton->setChecked(true);
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(topLabel);
+    layout->addWidget(registerRadioButton);
+    layout->addWidget(evaluateRadioButton);
+    setLayout(layout);
+}
+//! [16] //! [17]
+
+//! [18]
+int IntroPage::nextId() const
+//! [17] //! [19]
+{
+    if (evaluateRadioButton->isChecked()) {
+        return LicenseWizard::Page_Evaluate;
+    } else {
+        return LicenseWizard::Page_Register;
+    }
+}
+//! [18] //! [19]
+
+//! [20]
+EvaluatePage::EvaluatePage(QWidget *parent)
+    : QWizardPage(parent)
+{
+    setTitle(tr("Evaluate <i>Super Product One</i>&trade;"));
+    setSubTitle(tr("Please fill both fields. Make sure to provide a valid "
+                   "email address (e.g., john.smith@example.com)."));
+
+    nameLabel = new QLabel(tr("N&ame:"));
+    nameLineEdit = new QLineEdit;
+//! [20]
+    nameLabel->setBuddy(nameLineEdit);
+
+    emailLabel = new QLabel(tr("&Email address:"));
+    emailLineEdit = new QLineEdit;
+    emailLineEdit->setValidator(new QRegExpValidator(QRegExp(".*@.*"), this));
+    emailLabel->setBuddy(emailLineEdit);
+
+//! [21]
+    registerField("evaluate.name*", nameLineEdit);
+    registerField("evaluate.email*", emailLineEdit);
+//! [21]
+
+    QGridLayout *layout = new QGridLayout;
+    layout->addWidget(nameLabel, 0, 0);
+    layout->addWidget(nameLineEdit, 0, 1);
+    layout->addWidget(emailLabel, 1, 0);
+    layout->addWidget(emailLineEdit, 1, 1);
+    setLayout(layout);
+//! [22]
+}
+//! [22]
+
+//! [23]
+int EvaluatePage::nextId() const
+{
+    return LicenseWizard::Page_Conclusion;
+}
+//! [23]
+
+RegisterPage::RegisterPage(QWidget *parent)
+    : QWizardPage(parent)
+{
+    setTitle(tr("Register Your Copy of <i>Super Product One</i>&trade;"));
+    setSubTitle(tr("If you have an upgrade key, please fill in "
+                   "the appropriate field."));
+
+    nameLabel = new QLabel(tr("N&ame:"));
+    nameLineEdit = new QLineEdit;
+    nameLabel->setBuddy(nameLineEdit);
+
+    upgradeKeyLabel = new QLabel(tr("&Upgrade key:"));
+    upgradeKeyLineEdit = new QLineEdit;
+    upgradeKeyLabel->setBuddy(upgradeKeyLineEdit);
+
+    registerField("register.name*", nameLineEdit);
+    registerField("register.upgradeKey", upgradeKeyLineEdit);
+
+    QGridLayout *layout = new QGridLayout;
+    layout->addWidget(nameLabel, 0, 0);
+    layout->addWidget(nameLineEdit, 0, 1);
+    layout->addWidget(upgradeKeyLabel, 1, 0);
+    layout->addWidget(upgradeKeyLineEdit, 1, 1);
+    setLayout(layout);
+}
+
+//! [24]
+int RegisterPage::nextId() const
+{
+    if (upgradeKeyLineEdit->text().isEmpty()) {
+        return LicenseWizard::Page_Details;
+    } else {
+        return LicenseWizard::Page_Conclusion;
+    }
+}
+//! [24]
+
+DetailsPage::DetailsPage(QWidget *parent)
+    : QWizardPage(parent)
+{
+    setTitle(tr("Fill In Your Details"));
+    setSubTitle(tr("Please fill all three fields. Make sure to provide a valid "
+                   "email address (e.g., tanaka.aya@example.co.jp)."));
+
+    companyLabel = new QLabel(tr("&Company name:"));
+    companyLineEdit = new QLineEdit;
+    companyLabel->setBuddy(companyLineEdit);
+
+    emailLabel = new QLabel(tr("&Email address:"));
+    emailLineEdit = new QLineEdit;
+    emailLineEdit->setValidator(new QRegExpValidator(QRegExp(".*@.*"), this));
+    emailLabel->setBuddy(emailLineEdit);
+
+    postalLabel = new QLabel(tr("&Postal address:"));
+    postalLineEdit = new QLineEdit;
+    postalLabel->setBuddy(postalLineEdit);
+
+    registerField("details.company*", companyLineEdit);
+    registerField("details.email*", emailLineEdit);
+    registerField("details.postal*", postalLineEdit);
+
+    QGridLayout *layout = new QGridLayout;
+    layout->addWidget(companyLabel, 0, 0);
+    layout->addWidget(companyLineEdit, 0, 1);
+    layout->addWidget(emailLabel, 1, 0);
+    layout->addWidget(emailLineEdit, 1, 1);
+    layout->addWidget(postalLabel, 2, 0);
+    layout->addWidget(postalLineEdit, 2, 1);
+    setLayout(layout);
+}
+
+//! [25]
+int DetailsPage::nextId() const
+{
+    return LicenseWizard::Page_Conclusion;
+}
+//! [25]
+
+ConclusionPage::ConclusionPage(QWidget *parent)
+    : QWizardPage(parent)
+{
+    setTitle(tr("Complete Your Registration"));
+    setPixmap(QWizard::WatermarkPixmap, QPixmap(":/images/watermark.png"));
+
+    bottomLabel = new QLabel;
+    bottomLabel->setWordWrap(true);
+
+    agreeCheckBox = new QCheckBox(tr("I agree to the terms of the license"));
+
+    registerField("conclusion.agree*", agreeCheckBox);
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(bottomLabel);
+    layout->addWidget(agreeCheckBox);
+    setLayout(layout);
+}
+
+//! [26]
+int ConclusionPage::nextId() const
+{
+    return -1;
+}
+//! [26]
+
+//! [27]
+void ConclusionPage::initializePage()
+{
+    QString licenseText;
+
+    if (wizard()->hasVisitedPage(LicenseWizard::Page_Evaluate)) {
+        licenseText = tr("<u>Evaluation License Agreement:</u> "
+                         "You can use this software for 30 days and make one "
+                         "backup, but you are not allowed to distribute it.");
+    } else if (wizard()->hasVisitedPage(LicenseWizard::Page_Details)) {
+        licenseText = tr("<u>First-Time License Agreement:</u> "
+                         "You can use this software subject to the license "
+                         "you will receive by email.");
+    } else {
+        licenseText = tr("<u>Upgrade License Agreement:</u> "
+                         "This software is licensed under the terms of your "
+                         "current license.");
+    }
+    bottomLabel->setText(licenseText);
+}
+//! [27]
+
+//! [28]
+void ConclusionPage::setVisible(bool visible)
+{
+    QWizardPage::setVisible(visible);
+
+    if (visible) {
+//! [29]
+        wizard()->setButtonText(QWizard::CustomButton1, tr("&Print"));
+        wizard()->setOption(QWizard::HaveCustomButton1, true);
+        connect(wizard(), SIGNAL(customButtonClicked(int)),
+                this, SLOT(printButtonClicked()));
+//! [29]
+    } else {
+        wizard()->setOption(QWizard::HaveCustomButton1, false);
+        disconnect(wizard(), SIGNAL(customButtonClicked(int)),
+                   this, SLOT(printButtonClicked()));
+    }
+}
+//! [28]
+
+void ConclusionPage::printButtonClicked()
+{
+    QPrinter printer;
+    QPrintDialog dialog(&printer, this);
+    if (dialog.exec())
+        QMessageBox::warning(this, tr("Print License"),
+                             tr("As an environmentally friendly measure, the "
+                                "license text will not actually be printed."));
+}
diff --git a/examples/dialogs/licensewizard/licensewizard.h b/examples/dialogs/licensewizard/licensewizard.h
new file mode 100644
index 0000000000..bcf22a2a2b
--- /dev/null
+++ b/examples/dialogs/licensewizard/licensewizard.h
@@ -0,0 +1,164 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef LICENSEWIZARD_H
+#define LICENSEWIZARD_H
+
+#include <QWizard>
+
+QT_BEGIN_NAMESPACE
+class QCheckBox;
+class QLabel;
+class QLineEdit;
+class QRadioButton;
+QT_END_NAMESPACE
+
+//! [0] //! [1]
+class LicenseWizard : public QWizard
+{
+//! [0]
+    Q_OBJECT
+
+public:
+//! [2]
+    enum { Page_Intro, Page_Evaluate, Page_Register, Page_Details,
+           Page_Conclusion };
+//! [2]
+
+    LicenseWizard(QWidget *parent = 0);
+
+private slots:
+    void showHelp();
+//! [3]
+};
+//! [1] //! [3]
+
+//! [4]
+class IntroPage : public QWizardPage
+{
+    Q_OBJECT
+
+public:
+    IntroPage(QWidget *parent = 0);
+
+    int nextId() const;
+
+private:
+    QLabel *topLabel;
+    QRadioButton *registerRadioButton;
+    QRadioButton *evaluateRadioButton;
+};
+//! [4]
+
+//! [5]
+class EvaluatePage : public QWizardPage
+{
+    Q_OBJECT
+
+public:
+    EvaluatePage(QWidget *parent = 0);
+
+    int nextId() const;
+
+private:
+    QLabel *nameLabel;
+    QLabel *emailLabel;
+    QLineEdit *nameLineEdit;
+    QLineEdit *emailLineEdit;
+};
+//! [5]
+
+class RegisterPage : public QWizardPage
+{
+    Q_OBJECT
+
+public:
+    RegisterPage(QWidget *parent = 0);
+
+    int nextId() const;
+
+private:
+    QLabel *nameLabel;
+    QLabel *upgradeKeyLabel;
+    QLineEdit *nameLineEdit;
+    QLineEdit *upgradeKeyLineEdit;
+};
+
+class DetailsPage : public QWizardPage
+{
+    Q_OBJECT
+
+public:
+    DetailsPage(QWidget *parent = 0);
+
+    int nextId() const;
+
+private:
+    QLabel *companyLabel;
+    QLabel *emailLabel;
+    QLabel *postalLabel;
+    QLineEdit *companyLineEdit;
+    QLineEdit *emailLineEdit;
+    QLineEdit *postalLineEdit;
+};
+
+//! [6]
+class ConclusionPage : public QWizardPage
+{
+    Q_OBJECT
+
+public:
+    ConclusionPage(QWidget *parent = 0);
+
+    void initializePage();
+    int nextId() const;
+    void setVisible(bool visible);
+
+private slots:
+    void printButtonClicked();
+
+private:
+    QLabel *bottomLabel;
+    QCheckBox *agreeCheckBox;
+};
+//! [6]
+
+#endif
diff --git a/examples/dialogs/licensewizard/licensewizard.pro b/examples/dialogs/licensewizard/licensewizard.pro
new file mode 100644
index 0000000000..fd5e37ccff
--- /dev/null
+++ b/examples/dialogs/licensewizard/licensewizard.pro
@@ -0,0 +1,10 @@
+HEADERS       = licensewizard.h
+SOURCES       = licensewizard.cpp \
+                main.cpp
+RESOURCES     = licensewizard.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/dialogs/licensewizard
+sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs/licensewizard
+INSTALLS += target sources
diff --git a/examples/dialogs/licensewizard/licensewizard.qrc b/examples/dialogs/licensewizard/licensewizard.qrc
new file mode 100644
index 0000000000..b069938515
--- /dev/null
+++ b/examples/dialogs/licensewizard/licensewizard.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>images/logo.png</file>
+    <file>images/watermark.png</file>
+</qresource>
+</RCC>
diff --git a/examples/dialogs/licensewizard/main.cpp b/examples/dialogs/licensewizard/main.cpp
new file mode 100644
index 0000000000..9d100324dd
--- /dev/null
+++ b/examples/dialogs/licensewizard/main.cpp
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QTranslator>
+#include <QLocale>
+#include <QLibraryInfo>
+
+#include "licensewizard.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(licensewizard);
+
+    QApplication app(argc, argv);
+
+    QString translatorFileName = QLatin1String("qt_");
+    translatorFileName += QLocale::system().name();
+    QTranslator *translator = new QTranslator(&app);
+    if (translator->load(translatorFileName, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
+        app.installTranslator(translator);
+    
+    LicenseWizard wizard;
+    wizard.show();
+    return app.exec();
+}
diff --git a/examples/dialogs/sipdialog/dialog.cpp b/examples/dialogs/sipdialog/dialog.cpp
new file mode 100644
index 0000000000..9f1b9adc22
--- /dev/null
+++ b/examples/dialogs/sipdialog/dialog.cpp
@@ -0,0 +1,124 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "dialog.h"
+
+//! [Dialog constructor part1]
+Dialog::Dialog()
+{
+    desktopGeometry = QApplication::desktop()->availableGeometry(0);
+
+    setWindowTitle(tr("SIP Dialog Example"));
+    QScrollArea *scrollArea = new QScrollArea(this);
+    QGroupBox *groupBox = new QGroupBox(scrollArea);
+    groupBox->setTitle(tr("SIP Dialog Example"));
+    QGridLayout *gridLayout = new QGridLayout(groupBox);
+    groupBox->setLayout(gridLayout);
+//! [Dialog constructor part1]
+
+//! [Dialog constructor part2]
+    QLineEdit* lineEdit = new QLineEdit(groupBox);
+    lineEdit->setText(tr("Open and close the SIP"));
+    lineEdit->setMinimumWidth(220);
+
+    QLabel* label = new QLabel(groupBox);
+    label->setText(tr("This dialog resizes if the SIP is opened"));
+    label->setMinimumWidth(220);
+
+    QPushButton* button = new QPushButton(groupBox);
+    button->setText(tr("Close Dialog"));
+    button->setMinimumWidth(220);
+//! [Dialog constructor part2]
+
+//! [Dialog constructor part3]
+    if (desktopGeometry.height() < 400)
+        gridLayout->setVerticalSpacing(80);
+    else
+        gridLayout->setVerticalSpacing(150);
+
+    gridLayout->addWidget(label);
+    gridLayout->addWidget(lineEdit);
+    gridLayout->addWidget(button);
+//! [Dialog constructor part3]
+
+//! [Dialog constructor part4]
+    scrollArea->setWidget(groupBox);
+    QHBoxLayout* layout = new QHBoxLayout();
+    layout->addWidget(scrollArea);
+    setLayout(layout);
+    scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+//! [Dialog constructor part4]
+
+//! [Dialog constructor part5]
+    connect(button, SIGNAL(pressed()), 
+        qApp, SLOT(closeAllWindows()));
+    connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), 
+        this, SLOT(desktopResized(int)));
+}
+//! [Dialog constructor part5]
+
+//! [desktopResized() function]
+void Dialog::desktopResized(int screen)
+{
+    if (screen != 0)
+        return;
+    reactToSIP();
+}
+//! [desktopResized() function]
+
+//! [reactToSIP() function]
+void Dialog::reactToSIP()
+{
+    QRect availableGeometry = QApplication::desktop()->availableGeometry(0);
+
+    if (desktopGeometry.width() == availableGeometry.width()) {
+        if (desktopGeometry.height() > availableGeometry.height()) {
+            setWindowState(windowState() & ~Qt::WindowMaximized);
+            setGeometry(availableGeometry);
+        } else {
+            setWindowState(windowState() | Qt::WindowMaximized);
+        }
+    }
+    desktopGeometry = availableGeometry;
+}
+//! [reactToSIP() function]
diff --git a/examples/dialogs/sipdialog/dialog.h b/examples/dialogs/sipdialog/dialog.h
new file mode 100644
index 0000000000..ffcc926409
--- /dev/null
+++ b/examples/dialogs/sipdialog/dialog.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DIALOG_H
+#define DIALOG_H
+
+#include <QDialog>
+
+//! [Dialog header]
+class Dialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    Dialog();
+    void reactToSIP();
+
+private:
+    QRect desktopGeometry;
+
+public slots:
+    void desktopResized(int screen);
+};
+//! [Dialog header]
+
+#endif
diff --git a/examples/dialogs/sipdialog/main.cpp b/examples/dialogs/sipdialog/main.cpp
new file mode 100644
index 0000000000..5fcbfd806e
--- /dev/null
+++ b/examples/dialogs/sipdialog/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "dialog.h"
+
+//! [main() function]
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Dialog dialog;
+    dialog.exec();
+}
+//! [main() function]
diff --git a/examples/dialogs/sipdialog/sipdialog.pro b/examples/dialogs/sipdialog/sipdialog.pro
new file mode 100644
index 0000000000..69667eba01
--- /dev/null
+++ b/examples/dialogs/sipdialog/sipdialog.pro
@@ -0,0 +1,12 @@
+HEADERS       = dialog.h
+SOURCES       = main.cpp \
+                dialog.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/dialogs/sipdialog
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs/sipdialog
+INSTALLS += target sources
+wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
+
+
diff --git a/examples/dialogs/standarddialogs/dialog.cpp b/examples/dialogs/standarddialogs/dialog.cpp
new file mode 100644
index 0000000000..0fe1f7e3fd
--- /dev/null
+++ b/examples/dialogs/standarddialogs/dialog.cpp
@@ -0,0 +1,390 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "dialog.h"
+
+#define MESSAGE \
+    Dialog::tr("<p>Message boxes have a caption, a text, " \
+               "and any number of buttons, each with standard or custom texts." \
+               "<p>Click a button to close the message box. Pressing the Esc button " \
+               "will activate the detected escape button (if any).")
+
+Dialog::Dialog(QWidget *parent)
+    : QDialog(parent)
+{
+    errorMessageDialog = new QErrorMessage(this);
+
+    int frameStyle = QFrame::Sunken | QFrame::Panel;
+
+    integerLabel = new QLabel;
+    integerLabel->setFrameStyle(frameStyle);
+    QPushButton *integerButton =
+            new QPushButton(tr("QInputDialog::get&Integer()"));
+
+    doubleLabel = new QLabel;
+    doubleLabel->setFrameStyle(frameStyle);
+    QPushButton *doubleButton =
+            new QPushButton(tr("QInputDialog::get&Double()"));
+
+    itemLabel = new QLabel;
+    itemLabel->setFrameStyle(frameStyle);
+    QPushButton *itemButton = new QPushButton(tr("QInputDialog::getIte&m()"));
+
+    textLabel = new QLabel;
+    textLabel->setFrameStyle(frameStyle);
+    QPushButton *textButton = new QPushButton(tr("QInputDialog::get&Text()"));
+
+    colorLabel = new QLabel;
+    colorLabel->setFrameStyle(frameStyle);
+    QPushButton *colorButton = new QPushButton(tr("QColorDialog::get&Color()"));
+
+    fontLabel = new QLabel;
+    fontLabel->setFrameStyle(frameStyle);
+    QPushButton *fontButton = new QPushButton(tr("QFontDialog::get&Font()"));
+
+    directoryLabel = new QLabel;
+    directoryLabel->setFrameStyle(frameStyle);
+    QPushButton *directoryButton =
+            new QPushButton(tr("QFileDialog::getE&xistingDirectory()"));
+
+    openFileNameLabel = new QLabel;
+    openFileNameLabel->setFrameStyle(frameStyle);
+    QPushButton *openFileNameButton =
+            new QPushButton(tr("QFileDialog::get&OpenFileName()"));
+
+    openFileNamesLabel = new QLabel;
+    openFileNamesLabel->setFrameStyle(frameStyle);
+    QPushButton *openFileNamesButton =
+            new QPushButton(tr("QFileDialog::&getOpenFileNames()"));
+
+    saveFileNameLabel = new QLabel;
+    saveFileNameLabel->setFrameStyle(frameStyle);
+    QPushButton *saveFileNameButton =
+            new QPushButton(tr("QFileDialog::get&SaveFileName()"));
+
+    criticalLabel = new QLabel;
+    criticalLabel->setFrameStyle(frameStyle);
+    QPushButton *criticalButton =
+            new QPushButton(tr("QMessageBox::critica&l()"));
+
+    informationLabel = new QLabel;
+    informationLabel->setFrameStyle(frameStyle);
+    QPushButton *informationButton =
+            new QPushButton(tr("QMessageBox::i&nformation()"));
+
+    questionLabel = new QLabel;
+    questionLabel->setFrameStyle(frameStyle);
+    QPushButton *questionButton =
+            new QPushButton(tr("QMessageBox::&question()"));
+
+    warningLabel = new QLabel;
+    warningLabel->setFrameStyle(frameStyle);
+    QPushButton *warningButton = new QPushButton(tr("QMessageBox::&warning()"));
+
+    errorLabel = new QLabel;
+    errorLabel->setFrameStyle(frameStyle);
+    QPushButton *errorButton =
+            new QPushButton(tr("QErrorMessage::show&M&essage()"));
+
+    connect(integerButton, SIGNAL(clicked()), this, SLOT(setInteger()));
+    connect(doubleButton, SIGNAL(clicked()), this, SLOT(setDouble()));
+    connect(itemButton, SIGNAL(clicked()), this, SLOT(setItem()));
+    connect(textButton, SIGNAL(clicked()), this, SLOT(setText()));
+    connect(colorButton, SIGNAL(clicked()), this, SLOT(setColor()));
+    connect(fontButton, SIGNAL(clicked()), this, SLOT(setFont()));
+    connect(directoryButton, SIGNAL(clicked()),
+            this, SLOT(setExistingDirectory()));
+    connect(openFileNameButton, SIGNAL(clicked()),
+            this, SLOT(setOpenFileName()));
+    connect(openFileNamesButton, SIGNAL(clicked()),
+            this, SLOT(setOpenFileNames()));
+    connect(saveFileNameButton, SIGNAL(clicked()),
+            this, SLOT(setSaveFileName()));
+    connect(criticalButton, SIGNAL(clicked()), this, SLOT(criticalMessage()));
+    connect(informationButton, SIGNAL(clicked()),
+            this, SLOT(informationMessage()));
+    connect(questionButton, SIGNAL(clicked()), this, SLOT(questionMessage()));
+    connect(warningButton, SIGNAL(clicked()), this, SLOT(warningMessage()));
+    connect(errorButton, SIGNAL(clicked()), this, SLOT(errorMessage()));
+
+    native = new QCheckBox(this);
+    native->setText("Use native file dialog.");
+    native->setChecked(true);
+#ifndef Q_WS_WIN
+#ifndef Q_OS_MAC
+    native->hide();
+#endif
+#endif
+    QGridLayout *layout = new QGridLayout;
+    layout->setColumnStretch(1, 1);
+    layout->setColumnMinimumWidth(1, 250);
+    layout->addWidget(integerButton, 0, 0);
+    layout->addWidget(integerLabel, 0, 1);
+    layout->addWidget(doubleButton, 1, 0);
+    layout->addWidget(doubleLabel, 1, 1);
+    layout->addWidget(itemButton, 2, 0);
+    layout->addWidget(itemLabel, 2, 1);
+    layout->addWidget(textButton, 3, 0);
+    layout->addWidget(textLabel, 3, 1);
+    layout->addWidget(colorButton, 4, 0);
+    layout->addWidget(colorLabel, 4, 1);
+    layout->addWidget(fontButton, 5, 0);
+    layout->addWidget(fontLabel, 5, 1);
+    layout->addWidget(directoryButton, 6, 0);
+    layout->addWidget(directoryLabel, 6, 1);
+    layout->addWidget(openFileNameButton, 7, 0);
+    layout->addWidget(openFileNameLabel, 7, 1);
+    layout->addWidget(openFileNamesButton, 8, 0);
+    layout->addWidget(openFileNamesLabel, 8, 1);
+    layout->addWidget(saveFileNameButton, 9, 0);
+    layout->addWidget(saveFileNameLabel, 9, 1);
+    layout->addWidget(criticalButton, 10, 0);
+    layout->addWidget(criticalLabel, 10, 1);
+    layout->addWidget(informationButton, 11, 0);
+    layout->addWidget(informationLabel, 11, 1);
+    layout->addWidget(questionButton, 12, 0);
+    layout->addWidget(questionLabel, 12, 1);
+    layout->addWidget(warningButton, 13, 0);
+    layout->addWidget(warningLabel, 13, 1);
+    layout->addWidget(errorButton, 14, 0);
+    layout->addWidget(errorLabel, 14, 1);
+    layout->addWidget(native, 15, 0);
+    setLayout(layout);
+
+    setWindowTitle(tr("Standard Dialogs"));
+}
+
+void Dialog::setInteger()
+{
+//! [0]
+    bool ok;
+    int i = QInputDialog::getInteger(this, tr("QInputDialog::getInteger()"),
+                                     tr("Percentage:"), 25, 0, 100, 1, &ok);
+    if (ok)
+        integerLabel->setText(tr("%1%").arg(i));
+//! [0]
+}
+
+void Dialog::setDouble()
+{
+//! [1]
+    bool ok;
+    double d = QInputDialog::getDouble(this, tr("QInputDialog::getDouble()"),
+                                       tr("Amount:"), 37.56, -10000, 10000, 2, &ok);
+    if (ok)
+        doubleLabel->setText(QString("$%1").arg(d));
+//! [1]
+}
+
+void Dialog::setItem()
+{
+//! [2]
+    QStringList items;
+    items << tr("Spring") << tr("Summer") << tr("Fall") << tr("Winter");
+
+    bool ok;
+    QString item = QInputDialog::getItem(this, tr("QInputDialog::getItem()"),
+                                         tr("Season:"), items, 0, false, &ok);
+    if (ok && !item.isEmpty())
+        itemLabel->setText(item);
+//! [2]
+}
+
+void Dialog::setText()
+{
+//! [3]
+    bool ok;
+    QString text = QInputDialog::getText(this, tr("QInputDialog::getText()"),
+                                         tr("User name:"), QLineEdit::Normal,
+                                         QDir::home().dirName(), &ok);
+    if (ok && !text.isEmpty())
+        textLabel->setText(text);
+//! [3]
+}
+
+void Dialog::setColor()
+{
+    QColor color = QColorDialog::getColor(Qt::green, this);
+    if (color.isValid()) {
+        colorLabel->setText(color.name());
+        colorLabel->setPalette(QPalette(color));
+        colorLabel->setAutoFillBackground(true);
+    }
+}
+
+void Dialog::setFont()
+{
+    bool ok;
+    QFont font = QFontDialog::getFont(&ok, QFont(fontLabel->text()), this);
+    if (ok) {
+        fontLabel->setText(font.key());
+        fontLabel->setFont(font);
+    }
+}
+
+void Dialog::setExistingDirectory()
+{
+    QFileDialog::Options options = QFileDialog::DontResolveSymlinks | QFileDialog::ShowDirsOnly;
+    if (!native->isChecked())
+        options |= QFileDialog::DontUseNativeDialog;
+    QString directory = QFileDialog::getExistingDirectory(this,
+                                tr("QFileDialog::getExistingDirectory()"),
+                                directoryLabel->text(),
+                                options);
+    if (!directory.isEmpty())
+        directoryLabel->setText(directory);
+}
+
+void Dialog::setOpenFileName()
+{
+    QFileDialog::Options options;
+    if (!native->isChecked())
+        options |= QFileDialog::DontUseNativeDialog;
+    QString selectedFilter;
+    QString fileName = QFileDialog::getOpenFileName(this,
+                                tr("QFileDialog::getOpenFileName()"),
+                                openFileNameLabel->text(),
+                                tr("All Files (*);;Text Files (*.txt)"),
+                                &selectedFilter,
+                                options);
+    if (!fileName.isEmpty())
+        openFileNameLabel->setText(fileName);
+}
+
+void Dialog::setOpenFileNames()
+{
+    QFileDialog::Options options;
+    if (!native->isChecked())
+        options |= QFileDialog::DontUseNativeDialog;
+    QString selectedFilter;
+    QStringList files = QFileDialog::getOpenFileNames(
+                                this, tr("QFileDialog::getOpenFileNames()"),
+                                openFilesPath,
+                                tr("All Files (*);;Text Files (*.txt)"),
+                                &selectedFilter,
+                                options);
+    if (files.count()) {
+        openFilesPath = files[0];
+        openFileNamesLabel->setText(QString("[%1]").arg(files.join(", ")));
+    }
+}
+
+void Dialog::setSaveFileName()
+{
+    QFileDialog::Options options;
+    if (!native->isChecked())
+        options |= QFileDialog::DontUseNativeDialog;
+    QString selectedFilter;
+    QString fileName = QFileDialog::getSaveFileName(this,
+                                tr("QFileDialog::getSaveFileName()"),
+                                saveFileNameLabel->text(),
+                                tr("All Files (*);;Text Files (*.txt)"),
+                                &selectedFilter,
+                                options);
+    if (!fileName.isEmpty())
+        saveFileNameLabel->setText(fileName);
+}
+
+void Dialog::criticalMessage()
+{
+    QMessageBox::StandardButton reply;
+    reply = QMessageBox::critical(this, tr("QMessageBox::critical()"),
+                                    MESSAGE,
+                                    QMessageBox::Abort | QMessageBox::Retry | QMessageBox::Ignore);
+    if (reply == QMessageBox::Abort)
+        criticalLabel->setText(tr("Abort"));
+    else if (reply == QMessageBox::Retry)
+        criticalLabel->setText(tr("Retry"));
+    else
+        criticalLabel->setText(tr("Ignore"));
+}
+
+void Dialog::informationMessage()
+{
+    QMessageBox::StandardButton reply;
+    reply = QMessageBox::information(this, tr("QMessageBox::information()"), MESSAGE);
+    if (reply == QMessageBox::Ok)
+        informationLabel->setText(tr("OK"));
+    else
+        informationLabel->setText(tr("Escape"));
+}
+
+void Dialog::questionMessage()
+{
+    QMessageBox::StandardButton reply;
+    reply = QMessageBox::question(this, tr("QMessageBox::question()"),
+                                    MESSAGE,
+                                    QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
+    if (reply == QMessageBox::Yes)
+        questionLabel->setText(tr("Yes"));
+    else if (reply == QMessageBox::No)
+        questionLabel->setText(tr("No"));
+    else
+        questionLabel->setText(tr("Cancel"));
+}
+
+void Dialog::warningMessage()
+{
+    QMessageBox msgBox(QMessageBox::Warning, tr("QMessageBox::warning()"),
+                       MESSAGE, 0, this);
+    msgBox.addButton(tr("Save &Again"), QMessageBox::AcceptRole);
+    msgBox.addButton(tr("&Continue"), QMessageBox::RejectRole);
+    if (msgBox.exec() == QMessageBox::AcceptRole)
+        warningLabel->setText(tr("Save Again"));
+    else
+        warningLabel->setText(tr("Continue"));
+
+}
+
+void Dialog::errorMessage()
+{
+    errorMessageDialog->showMessage(
+            tr("This dialog shows and remembers error messages. "
+               "If the checkbox is checked (as it is by default), "
+               "the shown message will be shown again, "
+               "but if the user unchecks the box the message "
+               "will not appear again if QErrorMessage::showMessage() "
+               "is called with the same message."));
+    errorLabel->setText(tr("If the box is unchecked, the message "
+                           "won't appear again."));
+}
diff --git a/examples/dialogs/standarddialogs/dialog.h b/examples/dialogs/standarddialogs/dialog.h
new file mode 100644
index 0000000000..35f0b051f5
--- /dev/null
+++ b/examples/dialogs/standarddialogs/dialog.h
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DIALOG_H
+#define DIALOG_H
+
+#include <QDialog>
+
+QT_BEGIN_NAMESPACE
+class QCheckBox;
+class QLabel;
+class QErrorMessage;
+QT_END_NAMESPACE
+
+class Dialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    Dialog(QWidget *parent = 0);
+
+private slots:
+    void setInteger();
+    void setDouble();
+    void setItem();
+    void setText();
+    void setColor();
+    void setFont();
+    void setExistingDirectory();
+    void setOpenFileName();
+    void setOpenFileNames();
+    void setSaveFileName();
+    void criticalMessage();
+    void informationMessage();
+    void questionMessage();
+    void warningMessage();
+    void errorMessage();
+
+private:
+    QCheckBox *native;
+    QLabel *integerLabel;
+    QLabel *doubleLabel;
+    QLabel *itemLabel;
+    QLabel *textLabel;
+    QLabel *colorLabel;
+    QLabel *fontLabel;
+    QLabel *directoryLabel;
+    QLabel *openFileNameLabel;
+    QLabel *openFileNamesLabel;
+    QLabel *saveFileNameLabel;
+    QLabel *criticalLabel;
+    QLabel *informationLabel;
+    QLabel *questionLabel;
+    QLabel *warningLabel;
+    QLabel *errorLabel;
+    QErrorMessage *errorMessageDialog;
+
+    QString openFilesPath;
+};
+
+#endif
diff --git a/examples/dialogs/standarddialogs/main.cpp b/examples/dialogs/standarddialogs/main.cpp
new file mode 100644
index 0000000000..3b7ed8b982
--- /dev/null
+++ b/examples/dialogs/standarddialogs/main.cpp
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QTranslator>
+#include <QLocale>
+#include <QLibraryInfo>
+
+#include "dialog.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QString translatorFileName = QLatin1String("qt_");
+    translatorFileName += QLocale::system().name();
+    QTranslator *translator = new QTranslator(&app);
+    if (translator->load(translatorFileName, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
+        app.installTranslator(translator);
+
+    Dialog dialog;
+    return dialog.exec();
+}
diff --git a/examples/dialogs/standarddialogs/standarddialogs.pro b/examples/dialogs/standarddialogs/standarddialogs.pro
new file mode 100644
index 0000000000..6bfa6bfc38
--- /dev/null
+++ b/examples/dialogs/standarddialogs/standarddialogs.pro
@@ -0,0 +1,11 @@
+HEADERS       = dialog.h
+SOURCES       = dialog.cpp \
+                main.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/dialogs/standarddialogs
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs/standarddialogs
+INSTALLS += target sources
+wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
+
diff --git a/examples/dialogs/tabdialog/main.cpp b/examples/dialogs/tabdialog/main.cpp
new file mode 100644
index 0000000000..04f3b33410
--- /dev/null
+++ b/examples/dialogs/tabdialog/main.cpp
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "tabdialog.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QString fileName;
+
+    if (argc >= 2)
+        fileName = argv[1];
+    else
+        fileName = ".";
+
+    TabDialog tabdialog(fileName);
+    return tabdialog.exec();
+}
diff --git a/examples/dialogs/tabdialog/tabdialog.cpp b/examples/dialogs/tabdialog/tabdialog.cpp
new file mode 100644
index 0000000000..189d085597
--- /dev/null
+++ b/examples/dialogs/tabdialog/tabdialog.cpp
@@ -0,0 +1,196 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "tabdialog.h"
+
+//! [0]
+TabDialog::TabDialog(const QString &fileName, QWidget *parent)
+    : QDialog(parent)
+{
+    QFileInfo fileInfo(fileName);
+
+    tabWidget = new QTabWidget;
+    tabWidget->addTab(new GeneralTab(fileInfo), tr("General"));
+    tabWidget->addTab(new PermissionsTab(fileInfo), tr("Permissions"));
+    tabWidget->addTab(new ApplicationsTab(fileInfo), tr("Applications"));
+//! [0]
+
+//! [1] //! [2]
+    buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok
+//! [1] //! [3]
+                                     | QDialogButtonBox::Cancel);
+
+    connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
+    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+//! [2] //! [3]
+
+//! [4]
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(tabWidget);
+    mainLayout->addWidget(buttonBox);
+    setLayout(mainLayout);
+//! [4]
+
+//! [5]
+    setWindowTitle(tr("Tab Dialog"));
+}
+//! [5]
+
+//! [6]
+GeneralTab::GeneralTab(const QFileInfo &fileInfo, QWidget *parent)
+    : QWidget(parent)
+{
+    QLabel *fileNameLabel = new QLabel(tr("File Name:"));
+    QLineEdit *fileNameEdit = new QLineEdit(fileInfo.fileName());
+
+    QLabel *pathLabel = new QLabel(tr("Path:"));
+    QLabel *pathValueLabel = new QLabel(fileInfo.absoluteFilePath());
+    pathValueLabel->setFrameStyle(QFrame::Panel | QFrame::Sunken);
+
+    QLabel *sizeLabel = new QLabel(tr("Size:"));
+    qlonglong size = fileInfo.size()/1024;
+    QLabel *sizeValueLabel = new QLabel(tr("%1 K").arg(size));
+    sizeValueLabel->setFrameStyle(QFrame::Panel | QFrame::Sunken);
+
+    QLabel *lastReadLabel = new QLabel(tr("Last Read:"));
+    QLabel *lastReadValueLabel = new QLabel(fileInfo.lastRead().toString());
+    lastReadValueLabel->setFrameStyle(QFrame::Panel | QFrame::Sunken);
+
+    QLabel *lastModLabel = new QLabel(tr("Last Modified:"));
+    QLabel *lastModValueLabel = new QLabel(fileInfo.lastModified().toString());
+    lastModValueLabel->setFrameStyle(QFrame::Panel | QFrame::Sunken);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(fileNameLabel);
+    mainLayout->addWidget(fileNameEdit);
+    mainLayout->addWidget(pathLabel);
+    mainLayout->addWidget(pathValueLabel);
+    mainLayout->addWidget(sizeLabel);
+    mainLayout->addWidget(sizeValueLabel);
+    mainLayout->addWidget(lastReadLabel);
+    mainLayout->addWidget(lastReadValueLabel);
+    mainLayout->addWidget(lastModLabel);
+    mainLayout->addWidget(lastModValueLabel);
+    mainLayout->addStretch(1);
+    setLayout(mainLayout);
+}
+//! [6]
+
+//! [7]
+PermissionsTab::PermissionsTab(const QFileInfo &fileInfo, QWidget *parent)
+    : QWidget(parent)
+{
+    QGroupBox *permissionsGroup = new QGroupBox(tr("Permissions"));
+
+    QCheckBox *readable = new QCheckBox(tr("Readable"));
+    if (fileInfo.isReadable())
+        readable->setChecked(true);
+
+    QCheckBox *writable = new QCheckBox(tr("Writable"));
+    if ( fileInfo.isWritable() )
+        writable->setChecked(true);
+
+    QCheckBox *executable = new QCheckBox(tr("Executable"));
+    if ( fileInfo.isExecutable() )
+        executable->setChecked(true);
+
+    QGroupBox *ownerGroup = new QGroupBox(tr("Ownership"));
+
+    QLabel *ownerLabel = new QLabel(tr("Owner"));
+    QLabel *ownerValueLabel = new QLabel(fileInfo.owner());
+    ownerValueLabel->setFrameStyle(QFrame::Panel | QFrame::Sunken);
+
+    QLabel *groupLabel = new QLabel(tr("Group"));
+    QLabel *groupValueLabel = new QLabel(fileInfo.group());
+    groupValueLabel->setFrameStyle(QFrame::Panel | QFrame::Sunken);
+
+    QVBoxLayout *permissionsLayout = new QVBoxLayout;
+    permissionsLayout->addWidget(readable);
+    permissionsLayout->addWidget(writable);
+    permissionsLayout->addWidget(executable);
+    permissionsGroup->setLayout(permissionsLayout);
+
+    QVBoxLayout *ownerLayout = new QVBoxLayout;
+    ownerLayout->addWidget(ownerLabel);
+    ownerLayout->addWidget(ownerValueLabel);
+    ownerLayout->addWidget(groupLabel);
+    ownerLayout->addWidget(groupValueLabel);
+    ownerGroup->setLayout(ownerLayout);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(permissionsGroup);
+    mainLayout->addWidget(ownerGroup);
+    mainLayout->addStretch(1);
+    setLayout(mainLayout);
+}
+//! [7]
+
+//! [8]
+ApplicationsTab::ApplicationsTab(const QFileInfo &fileInfo, QWidget *parent)
+    : QWidget(parent)
+{
+    QLabel *topLabel = new QLabel(tr("Open with:"));
+
+    QListWidget *applicationsListBox = new QListWidget;
+    QStringList applications;
+
+    for (int i = 1; i <= 30; ++i)
+        applications.append(tr("Application %1").arg(i));
+    applicationsListBox->insertItems(0, applications);
+
+    QCheckBox *alwaysCheckBox;
+
+    if (fileInfo.suffix().isEmpty())
+        alwaysCheckBox = new QCheckBox(tr("Always use this application to "
+            "open this type of file"));
+    else
+        alwaysCheckBox = new QCheckBox(tr("Always use this application to "
+            "open files with the extension '%1'").arg(fileInfo.suffix()));
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(topLabel);
+    layout->addWidget(applicationsListBox);
+    layout->addWidget(alwaysCheckBox);
+    setLayout(layout);
+}
+//! [8]
diff --git a/examples/dialogs/tabdialog/tabdialog.h b/examples/dialogs/tabdialog/tabdialog.h
new file mode 100644
index 0000000000..b22997d511
--- /dev/null
+++ b/examples/dialogs/tabdialog/tabdialog.h
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TABDIALOG_H
+#define TABDIALOG_H
+
+#include <QDialog>
+
+QT_BEGIN_NAMESPACE
+class QDialogButtonBox;
+class QFileInfo;
+class QTabWidget;
+QT_END_NAMESPACE
+
+//! [0]
+class GeneralTab : public QWidget
+{
+    Q_OBJECT
+
+public:
+    GeneralTab(const QFileInfo &fileInfo, QWidget *parent = 0);
+};
+//! [0]
+
+
+//! [1]
+class PermissionsTab : public QWidget
+{
+    Q_OBJECT
+
+public:
+    PermissionsTab(const QFileInfo &fileInfo, QWidget *parent = 0);
+};
+//! [1]
+
+
+//! [2]
+class ApplicationsTab : public QWidget
+{
+    Q_OBJECT
+
+public:
+    ApplicationsTab(const QFileInfo &fileInfo, QWidget *parent = 0);
+};
+//! [2]
+
+
+//! [3]
+class TabDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    TabDialog(const QString &fileName, QWidget *parent = 0);
+
+private:
+    QTabWidget *tabWidget;
+    QDialogButtonBox *buttonBox;
+};
+//! [3]
+
+#endif
diff --git a/examples/dialogs/tabdialog/tabdialog.pro b/examples/dialogs/tabdialog/tabdialog.pro
new file mode 100644
index 0000000000..3239a72a58
--- /dev/null
+++ b/examples/dialogs/tabdialog/tabdialog.pro
@@ -0,0 +1,10 @@
+HEADERS       = tabdialog.h
+SOURCES       = main.cpp \
+                tabdialog.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/dialogs/tabdialog
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs/tabdialog
+INSTALLS += target sources
+wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
diff --git a/examples/dialogs/trivialwizard/trivialwizard.cpp b/examples/dialogs/trivialwizard/trivialwizard.cpp
new file mode 100644
index 0000000000..128bce76cd
--- /dev/null
+++ b/examples/dialogs/trivialwizard/trivialwizard.cpp
@@ -0,0 +1,136 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QTranslator>
+#include <QLocale>
+#include <QLibraryInfo>
+
+//! [0] //! [1]
+QWizardPage *createIntroPage()
+{
+    QWizardPage *page = new QWizardPage;
+    page->setTitle("Introduction");
+
+    QLabel *label = new QLabel("This wizard will help you register your copy "
+                               "of Super Product Two.");
+    label->setWordWrap(true);
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(label);
+    page->setLayout(layout);
+
+    return page;
+}
+//! [0]
+
+//! [2]
+QWizardPage *createRegistrationPage()
+//! [1] //! [3]
+{
+//! [3]
+    QWizardPage *page = new QWizardPage;
+    page->setTitle("Registration");
+    page->setSubTitle("Please fill both fields.");
+
+    QLabel *nameLabel = new QLabel("Name:");
+    QLineEdit *nameLineEdit = new QLineEdit;
+
+    QLabel *emailLabel = new QLabel("Email address:");
+    QLineEdit *emailLineEdit = new QLineEdit;
+
+    QGridLayout *layout = new QGridLayout;
+    layout->addWidget(nameLabel, 0, 0);
+    layout->addWidget(nameLineEdit, 0, 1);
+    layout->addWidget(emailLabel, 1, 0);
+    layout->addWidget(emailLineEdit, 1, 1);
+    page->setLayout(layout);
+
+    return page;
+//! [4]
+}
+//! [2] //! [4]
+
+//! [5] //! [6]
+QWizardPage *createConclusionPage()
+//! [5] //! [7]
+{
+//! [7]
+    QWizardPage *page = new QWizardPage;
+    page->setTitle("Conclusion");
+
+    QLabel *label = new QLabel("You are now successfully registered. Have a "
+                               "nice day!");
+    label->setWordWrap(true);
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(label);
+    page->setLayout(layout);
+
+    return page;
+//! [8]
+}
+//! [6] //! [8]
+
+//! [9] //! [10]
+int main(int argc, char *argv[])
+//! [9] //! [11]
+{
+    QApplication app(argc, argv);
+
+    QString translatorFileName = QLatin1String("qt_");
+    translatorFileName += QLocale::system().name();
+    QTranslator *translator = new QTranslator(&app);
+    if (translator->load(translatorFileName, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
+        app.installTranslator(translator);
+
+
+    QWizard wizard;
+    wizard.addPage(createIntroPage());
+    wizard.addPage(createRegistrationPage());
+    wizard.addPage(createConclusionPage());
+
+    wizard.setWindowTitle("Trivial Wizard");
+    wizard.show();
+
+    return app.exec();
+}
+//! [10] //! [11]
diff --git a/examples/dialogs/trivialwizard/trivialwizard.pro b/examples/dialogs/trivialwizard/trivialwizard.pro
new file mode 100644
index 0000000000..970e12f250
--- /dev/null
+++ b/examples/dialogs/trivialwizard/trivialwizard.pro
@@ -0,0 +1,7 @@
+SOURCES       = trivialwizard.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/dialogs/trivialwizard
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs/trivialwizard
+INSTALLS += target sources
diff --git a/examples/draganddrop/README b/examples/draganddrop/README
new file mode 100644
index 0000000000..f4efd2e40b
--- /dev/null
+++ b/examples/draganddrop/README
@@ -0,0 +1,40 @@
+Qt supports native drag and drop on all platforms via an extensible
+MIME-based system that enables applications to send data to each other in the
+most appropriate formats.
+
+Drag and drop can also be implemented for internal use by applications.
+
+
+The example launcher provided with Qt can be used to explore each of the
+examples in this directory.
+
+Documentation for these examples can be found via the Tutorial and Examples
+link in the main Qt documentation.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/draganddrop/delayedencoding/delayedencoding.pro b/examples/draganddrop/delayedencoding/delayedencoding.pro
new file mode 100644
index 0000000000..c7b95b6ed5
--- /dev/null
+++ b/examples/draganddrop/delayedencoding/delayedencoding.pro
@@ -0,0 +1,14 @@
+QT          += svg
+
+HEADERS     = mimedata.h \
+              sourcewidget.h
+RESOURCES   = delayedencoding.qrc
+SOURCES     = main.cpp \
+              mimedata.cpp \
+              sourcewidget.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/delayedencoding
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/delayedencoding
+INSTALLS += target sources
diff --git a/examples/draganddrop/delayedencoding/delayedencoding.qrc b/examples/draganddrop/delayedencoding/delayedencoding.qrc
new file mode 100644
index 0000000000..374f21147d
--- /dev/null
+++ b/examples/draganddrop/delayedencoding/delayedencoding.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="">
+   <file>images/drag.png</file>
+   <file>images/example.svg</file>
+</qresource>
+</RCC>
diff --git a/examples/draganddrop/delayedencoding/images/drag.png b/examples/draganddrop/delayedencoding/images/drag.png
new file mode 100644
index 0000000000..dd795cfffc
--- /dev/null
+++ b/examples/draganddrop/delayedencoding/images/drag.png
diff --git a/examples/draganddrop/delayedencoding/images/example.svg b/examples/draganddrop/delayedencoding/images/example.svg
new file mode 100644
index 0000000000..4707cf891e
--- /dev/null
+++ b/examples/draganddrop/delayedencoding/images/example.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" standalone="no"?>
+<!-- ***********************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+************************************************************************ -->
+<svg width="8cm" height="8cm" viewBox="0 0 400 400"
+     xmlns="http://www.w3.org/2000/svg" baseProfile="tiny" version="1.1">
+  <title>Sphere</title>
+  <desc>A gradient filled sphere.</desc>
+  <g>
+    <defs>
+      <radialGradient id="blueSphere" gradientUnits="userSpaceOnUse"
+                      cx="200" cy="200" r="100" fx="150" fy="150">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="blue" />
+        <stop offset="100%" stop-color="black" />
+      </radialGradient>
+    </defs>
+    <rect fill="lightblue" x="0" y="0" width="400" height="400" />
+    <circle fill="url(#blueSphere)" stroke="black" stroke-width="2"  
+          cx="200" cy="200" r="100"/>
+  </g>
+</svg>
diff --git a/examples/draganddrop/delayedencoding/main.cpp b/examples/draganddrop/delayedencoding/main.cpp
new file mode 100644
index 0000000000..801e474fae
--- /dev/null
+++ b/examples/draganddrop/delayedencoding/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include "sourcewidget.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    SourceWidget window;
+    window.show();
+    return app.exec();
+}
+
diff --git a/examples/draganddrop/delayedencoding/mimedata.cpp b/examples/draganddrop/delayedencoding/mimedata.cpp
new file mode 100644
index 0000000000..5c7c23c9d5
--- /dev/null
+++ b/examples/draganddrop/delayedencoding/mimedata.cpp
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "mimedata.h"
+
+MimeData::MimeData()
+    : QMimeData()
+{
+}
+
+//![0]
+QStringList MimeData::formats() const
+{
+    return QMimeData::formats() << "image/png";
+}
+//![0]
+
+//![1]
+QVariant MimeData::retrieveData(const QString &mimeType, QVariant::Type type)
+         const
+{
+    emit dataRequested(mimeType);
+
+    return QMimeData::retrieveData(mimeType, type);
+}
+//![1]
+
diff --git a/examples/draganddrop/delayedencoding/mimedata.h b/examples/draganddrop/delayedencoding/mimedata.h
new file mode 100644
index 0000000000..13e834dae7
--- /dev/null
+++ b/examples/draganddrop/delayedencoding/mimedata.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MIMEDATA_H
+#define MIMEDATA_H
+
+#include <QMimeData>
+
+//![0]
+class MimeData : public QMimeData
+{
+    Q_OBJECT
+
+public:
+    MimeData();
+    QStringList formats() const;
+
+signals:
+    void dataRequested(const QString &mimeType) const;
+
+protected:
+    QVariant retrieveData(const QString &mimetype, QVariant::Type type) const;
+};
+//![0]
+
+#endif
diff --git a/examples/draganddrop/delayedencoding/sourcewidget.cpp b/examples/draganddrop/delayedencoding/sourcewidget.cpp
new file mode 100644
index 0000000000..f5aed89cff
--- /dev/null
+++ b/examples/draganddrop/delayedencoding/sourcewidget.cpp
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtSvg>
+#include "mimedata.h"
+#include "sourcewidget.h"
+
+SourceWidget::SourceWidget(QWidget *parent)
+    : QWidget(parent)
+{
+    QFile imageFile(":/images/example.svg");
+    imageFile.open(QIODevice::ReadOnly);
+    imageData = imageFile.readAll();
+    imageFile.close();
+
+    QScrollArea *imageArea = new QScrollArea;
+    imageLabel = new QSvgWidget;
+    imageLabel->renderer()->load(imageData);
+    imageArea->setWidget(imageLabel);
+    //imageLabel->setMinimumSize(imageLabel->renderer()->viewBox().size());
+
+    QLabel *instructTopLabel = new QLabel(tr("This is an SVG drawing:"));
+    QLabel *instructBottomLabel = new QLabel(
+        tr("Drag the icon to copy the drawing as a PNG file:"));
+    QPushButton *dragIcon = new QPushButton(tr("Export"));
+    dragIcon->setIcon(QIcon(":/images/drag.png"));
+
+    connect(dragIcon, SIGNAL(pressed()), this, SLOT(startDrag()));
+
+    QGridLayout *layout = new QGridLayout;
+    layout->addWidget(instructTopLabel, 0, 0, 1, 2);
+    layout->addWidget(imageArea, 1, 0, 2, 2);
+    layout->addWidget(instructBottomLabel, 3, 0);
+    layout->addWidget(dragIcon, 3, 1);
+    setLayout(layout);
+    setWindowTitle(tr("Delayed Encoding"));
+}
+
+//![1]
+void SourceWidget::createData(const QString &mimeType)
+{
+    if (mimeType != "image/png")
+        return;
+
+    QImage image(imageLabel->size(), QImage::Format_RGB32);
+    QPainter painter;
+    painter.begin(&image);
+    imageLabel->renderer()->render(&painter);
+    painter.end();
+
+    QByteArray data;
+    QBuffer buffer(&data);
+    buffer.open(QIODevice::WriteOnly);
+    image.save(&buffer, "PNG");
+    buffer.close();
+
+    mimeData->setData("image/png", data);
+}
+//![1]
+
+//![0]
+void SourceWidget::startDrag()
+{
+    mimeData = new MimeData;
+
+    connect(mimeData, SIGNAL(dataRequested(const QString &)),
+            this, SLOT(createData(const QString &)), Qt::DirectConnection);
+
+    QDrag *drag = new QDrag(this);
+    drag->setMimeData(mimeData);
+    drag->setPixmap(QPixmap(":/images/drag.png"));
+
+    drag->exec(Qt::CopyAction);
+}
+//![0]
+
diff --git a/examples/draganddrop/delayedencoding/sourcewidget.h b/examples/draganddrop/delayedencoding/sourcewidget.h
new file mode 100644
index 0000000000..8d6a6901cd
--- /dev/null
+++ b/examples/draganddrop/delayedencoding/sourcewidget.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SOURCEWIDGET_H
+#define SOURCEWIDGET_H
+
+#include <QByteArray>
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QSvgWidget;
+QT_END_NAMESPACE
+class MimeData;
+
+class SourceWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    SourceWidget(QWidget *parent = 0);
+//![0]
+public slots:
+    void createData(const QString &mimetype);
+    void startDrag();
+
+private:
+    QByteArray imageData;
+    QSvgWidget *imageLabel;
+    MimeData *mimeData;
+//![0]
+};
+
+#endif
diff --git a/examples/draganddrop/draganddrop.pro b/examples/draganddrop/draganddrop.pro
new file mode 100644
index 0000000000..0cd881ac2d
--- /dev/null
+++ b/examples/draganddrop/draganddrop.pro
@@ -0,0 +1,15 @@
+TEMPLATE    = subdirs
+SUBDIRS     = draggableicons \
+              draggabletext \
+              dropsite \
+              fridgemagnets \
+              puzzle
+
+contains(QT_CONFIG, svg): SUBDIRS += delayedencoding
+
+wince*: SUBDIRS -= dropsite
+
+# install
+sources.files = README *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/draganddrop
+INSTALLS += sources
diff --git a/examples/draganddrop/draggableicons/draggableicons.pro b/examples/draganddrop/draggableicons/draggableicons.pro
new file mode 100644
index 0000000000..74cfda9e36
--- /dev/null
+++ b/examples/draganddrop/draggableicons/draggableicons.pro
@@ -0,0 +1,10 @@
+HEADERS     = dragwidget.h
+RESOURCES   = draggableicons.qrc
+SOURCES     = dragwidget.cpp \
+              main.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/draggableicons
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/draggableicons
+INSTALLS += target sources
diff --git a/examples/draganddrop/draggableicons/draggableicons.qrc b/examples/draganddrop/draggableicons/draggableicons.qrc
new file mode 100644
index 0000000000..63f84ac066
--- /dev/null
+++ b/examples/draganddrop/draggableicons/draggableicons.qrc
@@ -0,0 +1,7 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="">
+   <file>images/boat.png</file>
+   <file>images/car.png</file>
+   <file>images/house.png</file>
+</qresource>
+</RCC>
diff --git a/examples/draganddrop/draggableicons/dragwidget.cpp b/examples/draganddrop/draggableicons/dragwidget.cpp
new file mode 100644
index 0000000000..021f816737
--- /dev/null
+++ b/examples/draganddrop/draggableicons/dragwidget.cpp
@@ -0,0 +1,169 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "dragwidget.h"
+
+//! [0]
+DragWidget::DragWidget(QWidget *parent)
+    : QFrame(parent)
+{
+    setMinimumSize(200, 200);
+    setFrameStyle(QFrame::Sunken | QFrame::StyledPanel);
+    setAcceptDrops(true);
+
+    QLabel *boatIcon = new QLabel(this);
+    boatIcon->setPixmap(QPixmap(":/images/boat.png"));
+    boatIcon->move(20, 20);
+    boatIcon->show();
+    boatIcon->setAttribute(Qt::WA_DeleteOnClose);
+
+    QLabel *carIcon = new QLabel(this);
+    carIcon->setPixmap(QPixmap(":/images/car.png"));
+    carIcon->move(120, 20);
+    carIcon->show();
+    carIcon->setAttribute(Qt::WA_DeleteOnClose);
+
+    QLabel *houseIcon = new QLabel(this);
+    houseIcon->setPixmap(QPixmap(":/images/house.png"));
+    houseIcon->move(20, 120);
+    houseIcon->show();
+    houseIcon->setAttribute(Qt::WA_DeleteOnClose);
+}
+//! [0]
+
+void DragWidget::dragEnterEvent(QDragEnterEvent *event)
+{
+    if (event->mimeData()->hasFormat("application/x-dnditemdata")) {
+        if (event->source() == this) {
+            event->setDropAction(Qt::MoveAction);
+            event->accept();
+        } else {
+            event->acceptProposedAction();
+        }
+    } else {
+        event->ignore();
+    }
+}
+
+void DragWidget::dragMoveEvent(QDragMoveEvent *event)
+{
+    if (event->mimeData()->hasFormat("application/x-dnditemdata")) {
+        if (event->source() == this) {
+            event->setDropAction(Qt::MoveAction);
+            event->accept();
+        } else {
+            event->acceptProposedAction();
+        }
+    } else {
+        event->ignore();
+    }
+}
+
+void DragWidget::dropEvent(QDropEvent *event)
+{
+    if (event->mimeData()->hasFormat("application/x-dnditemdata")) {
+        QByteArray itemData = event->mimeData()->data("application/x-dnditemdata");
+        QDataStream dataStream(&itemData, QIODevice::ReadOnly);
+        
+        QPixmap pixmap;
+        QPoint offset;
+        dataStream >> pixmap >> offset;
+
+        QLabel *newIcon = new QLabel(this);
+        newIcon->setPixmap(pixmap);
+        newIcon->move(event->pos() - offset);
+        newIcon->show();
+        newIcon->setAttribute(Qt::WA_DeleteOnClose);
+
+        if (event->source() == this) {
+            event->setDropAction(Qt::MoveAction);
+            event->accept();
+        } else {
+            event->acceptProposedAction();
+        }
+    } else {
+        event->ignore();
+    }
+}
+
+//! [1]
+void DragWidget::mousePressEvent(QMouseEvent *event)
+{
+    QLabel *child = static_cast<QLabel*>(childAt(event->pos()));
+    if (!child)
+        return;
+
+    QPixmap pixmap = *child->pixmap();
+
+    QByteArray itemData;
+    QDataStream dataStream(&itemData, QIODevice::WriteOnly);
+    dataStream << pixmap << QPoint(event->pos() - child->pos());
+//! [1]
+
+//! [2]
+    QMimeData *mimeData = new QMimeData;
+    mimeData->setData("application/x-dnditemdata", itemData);
+//! [2]
+        
+//! [3]
+    QDrag *drag = new QDrag(this);
+    drag->setMimeData(mimeData);
+    drag->setPixmap(pixmap);
+    drag->setHotSpot(event->pos() - child->pos());
+//! [3]
+
+    QPixmap tempPixmap = pixmap;
+    QPainter painter;
+    painter.begin(&tempPixmap);
+    painter.fillRect(pixmap.rect(), QColor(127, 127, 127, 127));
+    painter.end();
+
+    child->setPixmap(tempPixmap);
+
+    if (drag->exec(Qt::CopyAction | Qt::MoveAction, Qt::CopyAction) == Qt::MoveAction)
+        child->close();
+    else {
+        child->show();
+        child->setPixmap(pixmap);
+    }
+}
diff --git a/examples/draganddrop/draggableicons/dragwidget.h b/examples/draganddrop/draggableicons/dragwidget.h
new file mode 100644
index 0000000000..201adf83a4
--- /dev/null
+++ b/examples/draganddrop/draggableicons/dragwidget.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DRAGWIDGET_H
+#define DRAGWIDGET_H
+
+#include <QFrame>
+
+QT_BEGIN_NAMESPACE
+class QDragEnterEvent;
+class QDropEvent;
+QT_END_NAMESPACE
+
+//! [0]
+class DragWidget : public QFrame
+{
+public:
+    DragWidget(QWidget *parent=0);
+
+protected:
+    void dragEnterEvent(QDragEnterEvent *event);
+    void dragMoveEvent(QDragMoveEvent *event);
+    void dropEvent(QDropEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+};
+//! [0]
+
+#endif
diff --git a/examples/draganddrop/draggableicons/images/boat.png b/examples/draganddrop/draggableicons/images/boat.png
new file mode 100644
index 0000000000..46c894f06b
--- /dev/null
+++ b/examples/draganddrop/draggableicons/images/boat.png
diff --git a/examples/draganddrop/draggableicons/images/car.png b/examples/draganddrop/draggableicons/images/car.png
new file mode 100644
index 0000000000..3cb35e56cb
--- /dev/null
+++ b/examples/draganddrop/draggableicons/images/car.png
diff --git a/examples/draganddrop/draggableicons/images/house.png b/examples/draganddrop/draggableicons/images/house.png
new file mode 100644
index 0000000000..ee9d5b1159
--- /dev/null
+++ b/examples/draganddrop/draggableicons/images/house.png
diff --git a/examples/draganddrop/draggableicons/main.cpp b/examples/draganddrop/draggableicons/main.cpp
new file mode 100644
index 0000000000..cd945370cc
--- /dev/null
+++ b/examples/draganddrop/draggableicons/main.cpp
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QHBoxLayout>
+#include "dragwidget.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(draggableicons);
+
+    QApplication app(argc, argv);
+
+    QWidget mainWidget;
+    QHBoxLayout *horizontalLayout = new QHBoxLayout;
+    horizontalLayout->addWidget(new DragWidget);
+    horizontalLayout->addWidget(new DragWidget);
+
+    mainWidget.setLayout(horizontalLayout);
+    mainWidget.setWindowTitle(QObject::tr("Draggable Icons"));
+    mainWidget.show();
+
+    return app.exec();
+}
diff --git a/examples/draganddrop/draggabletext/draggabletext.pro b/examples/draganddrop/draggabletext/draggabletext.pro
new file mode 100644
index 0000000000..07c7c24b46
--- /dev/null
+++ b/examples/draganddrop/draggabletext/draggabletext.pro
@@ -0,0 +1,12 @@
+HEADERS     = draglabel.h \
+              dragwidget.h
+RESOURCES   = draggabletext.qrc
+SOURCES     = draglabel.cpp \
+              dragwidget.cpp \
+              main.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/draggabletext
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.txt *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/draggabletext
+INSTALLS += target sources
diff --git a/examples/draganddrop/draggabletext/draggabletext.qrc b/examples/draganddrop/draggabletext/draggabletext.qrc
new file mode 100644
index 0000000000..b72217d701
--- /dev/null
+++ b/examples/draganddrop/draggabletext/draggabletext.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/dictionary">
+   <file>words.txt</file>
+</qresource>
+</RCC>
diff --git a/examples/draganddrop/draggabletext/draglabel.cpp b/examples/draganddrop/draggabletext/draglabel.cpp
new file mode 100644
index 0000000000..4dfa099bb6
--- /dev/null
+++ b/examples/draganddrop/draggabletext/draglabel.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "draglabel.h"
+
+DragLabel::DragLabel(const QString &text, QWidget *parent)
+    : QLabel(text, parent)
+{
+    setAutoFillBackground(true);
+    setFrameShape(QFrame::Panel);
+    setFrameShadow(QFrame::Raised);
+}
diff --git a/examples/draganddrop/draggabletext/draglabel.h b/examples/draganddrop/draggabletext/draglabel.h
new file mode 100644
index 0000000000..8ba2778e77
--- /dev/null
+++ b/examples/draganddrop/draggabletext/draglabel.h
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DRAGLABEL_H
+#define DRAGLABEL_H
+
+#include <QLabel>
+
+QT_BEGIN_NAMESPACE
+class QDragEnterEvent;
+class QDragMoveEvent;
+class QFrame;
+QT_END_NAMESPACE
+
+class DragLabel : public QLabel
+{
+public:
+    DragLabel(const QString &text, QWidget *parent);
+};
+
+#endif
diff --git a/examples/draganddrop/draggabletext/dragwidget.cpp b/examples/draganddrop/draggabletext/dragwidget.cpp
new file mode 100644
index 0000000000..2af7b295de
--- /dev/null
+++ b/examples/draganddrop/draggabletext/dragwidget.cpp
@@ -0,0 +1,164 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "draglabel.h"
+#include "dragwidget.h"
+
+DragWidget::DragWidget(QWidget *parent)
+    : QWidget(parent)
+{
+    QFile dictionaryFile(":/dictionary/words.txt");
+    dictionaryFile.open(QIODevice::ReadOnly);
+    QTextStream inputStream(&dictionaryFile);
+
+    int x = 5;
+    int y = 5;
+
+    while (!inputStream.atEnd()) {
+        QString word;
+        inputStream >> word;
+        if (!word.isEmpty()) {
+            DragLabel *wordLabel = new DragLabel(word, this);
+            wordLabel->move(x, y);
+            wordLabel->show();
+            wordLabel->setAttribute(Qt::WA_DeleteOnClose);
+            x += wordLabel->width() + 2;
+            if (x >= 195) {
+                x = 5;
+                y += wordLabel->height() + 2;
+            }
+        }
+    }
+
+    QPalette newPalette = palette();
+    newPalette.setColor(QPalette::Window, Qt::white);
+    setPalette(newPalette);
+
+    setAcceptDrops(true);
+    setMinimumSize(400, qMax(200, y));
+    setWindowTitle(tr("Draggable Text"));
+}
+
+void DragWidget::dragEnterEvent(QDragEnterEvent *event)
+{
+    if (event->mimeData()->hasText()) {
+        if (children().contains(event->source())) {
+            event->setDropAction(Qt::MoveAction);
+            event->accept();
+        } else {
+            event->acceptProposedAction();
+        }
+    } else {
+        event->ignore();
+    }
+}
+
+void DragWidget::dropEvent(QDropEvent *event)
+{
+    if (event->mimeData()->hasText()) {
+        const QMimeData *mime = event->mimeData();
+        QStringList pieces = mime->text().split(QRegExp("\\s+"),
+                             QString::SkipEmptyParts);
+        QPoint position = event->pos();
+        QPoint hotSpot;
+
+        QList<QByteArray> hotSpotPos = mime->data("application/x-hotspot").split(' ');
+        if (hotSpotPos.size() == 2) {
+            hotSpot.setX(hotSpotPos.first().toInt());
+            hotSpot.setY(hotSpotPos.last().toInt());
+        }
+
+        foreach (QString piece, pieces) {
+            DragLabel *newLabel = new DragLabel(piece, this);
+            newLabel->move(position - hotSpot);
+            newLabel->show();
+            newLabel->setAttribute(Qt::WA_DeleteOnClose);
+
+            position += QPoint(newLabel->width(), 0);
+        }
+
+        if (event->source() == this) {
+            event->setDropAction(Qt::MoveAction);
+            event->accept();
+        } else {
+            event->acceptProposedAction();
+        }
+    } else {
+        event->ignore();
+    }
+    foreach (QObject *child, children()) {
+        if (child->inherits("QWidget")) {
+            QWidget *widget = static_cast<QWidget *>(child);
+            if (!widget->isVisible())
+                widget->deleteLater();
+        }
+    }
+}
+
+void DragWidget::mousePressEvent(QMouseEvent *event)
+{
+    QLabel *child = static_cast<QLabel*>(childAt(event->pos()));
+    if (!child)
+        return;
+
+    QPoint hotSpot = event->pos() - child->pos();
+
+    QMimeData *mimeData = new QMimeData;
+    mimeData->setText(child->text());
+    mimeData->setData("application/x-hotspot",
+                      QByteArray::number(hotSpot.x())
+                      + " " + QByteArray::number(hotSpot.y()));
+
+    QPixmap pixmap(child->size());
+    child->render(&pixmap);
+
+    QDrag *drag = new QDrag(this);
+    drag->setMimeData(mimeData);
+    drag->setPixmap(pixmap);
+    drag->setHotSpot(hotSpot);
+
+    Qt::DropAction dropAction = drag->exec(Qt::CopyAction | Qt::MoveAction, Qt::CopyAction);
+
+    if (dropAction == Qt::MoveAction)
+        child->close();
+}
diff --git a/examples/draganddrop/draggabletext/dragwidget.h b/examples/draganddrop/draggabletext/dragwidget.h
new file mode 100644
index 0000000000..b51f05b2a4
--- /dev/null
+++ b/examples/draganddrop/draggabletext/dragwidget.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DRAGWIDGET_H
+#define DRAGWIDGET_H
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QDragEnterEvent;
+class QDropEvent;
+QT_END_NAMESPACE
+
+class DragWidget : public QWidget
+{
+public:
+    DragWidget(QWidget *parent = 0);
+
+protected:
+    void dragEnterEvent(QDragEnterEvent *event);
+    void dropEvent(QDropEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+};
+
+#endif
diff --git a/examples/draganddrop/draggabletext/main.cpp b/examples/draganddrop/draggabletext/main.cpp
new file mode 100644
index 0000000000..e66c8b71d5
--- /dev/null
+++ b/examples/draganddrop/draggabletext/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include "dragwidget.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(draggabletext);
+
+    QApplication app(argc, argv);
+    DragWidget window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/draganddrop/draggabletext/words.txt b/examples/draganddrop/draggabletext/words.txt
new file mode 100644
index 0000000000..19b8b0325b
--- /dev/null
+++ b/examples/draganddrop/draggabletext/words.txt
@@ -0,0 +1,41 @@
+Qt
+Quarterly
+is
+a
+paper
+based
+newsletter
+exclusively
+available
+to
+Qt
+customers
+Every
+quarter
+we
+mail
+out
+an
+issue
+that
+we
+hope
+will
+bring
+added
+insight
+and
+pleasure
+to
+your
+Qt
+programming
+with
+high
+quality
+technical
+articles
+written
+by
+Qt
+experts
diff --git a/examples/draganddrop/dropsite/droparea.cpp b/examples/draganddrop/dropsite/droparea.cpp
new file mode 100644
index 0000000000..495e2bfe3e
--- /dev/null
+++ b/examples/draganddrop/dropsite/droparea.cpp
@@ -0,0 +1,127 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "droparea.h"
+
+//! [DropArea constructor]
+DropArea::DropArea(QWidget *parent)
+    : QLabel(parent)
+{
+    setMinimumSize(200, 200);
+    setFrameStyle(QFrame::Sunken | QFrame::StyledPanel);
+    setAlignment(Qt::AlignCenter);
+    setAcceptDrops(true);
+    setAutoFillBackground(true);
+    clear();
+}
+//! [DropArea constructor]
+
+//! [dragEnterEvent() function]
+void DropArea::dragEnterEvent(QDragEnterEvent *event)
+{
+    setText(tr("<drop content>"));
+    setBackgroundRole(QPalette::Highlight);
+
+    event->acceptProposedAction();
+    emit changed(event->mimeData());
+}
+//! [dragEnterEvent() function]
+
+//! [dragMoveEvent() function]
+void DropArea::dragMoveEvent(QDragMoveEvent *event)
+{
+    event->acceptProposedAction();
+}
+//! [dragMoveEvent() function]
+
+//! [dropEvent() function part1]
+void DropArea::dropEvent(QDropEvent *event)
+{
+    const QMimeData *mimeData = event->mimeData();
+//! [dropEvent() function part1]
+
+//! [dropEvent() function part2]
+    if (mimeData->hasImage()) {
+        setPixmap(qvariant_cast<QPixmap>(mimeData->imageData()));
+    } else if (mimeData->hasHtml()) {
+        setText(mimeData->html());
+        setTextFormat(Qt::RichText);
+    } else if (mimeData->hasText()) {
+        setText(mimeData->text());    
+        setTextFormat(Qt::PlainText);
+    } else if (mimeData->hasUrls()) {
+        QList<QUrl> urlList = mimeData->urls();
+        QString text;
+        for (int i = 0; i < urlList.size() && i < 32; ++i) {
+            QString url = urlList.at(i).path();
+            text += url + QString("\n");
+        }
+        setText(text);
+    } else {
+        setText(tr("Cannot display data"));
+    }
+//! [dropEvent() function part2]
+
+//! [dropEvent() function part3]    
+    setBackgroundRole(QPalette::Dark);
+    event->acceptProposedAction();
+}
+//! [dropEvent() function part3]
+
+//! [dragLeaveEvent() function]
+void DropArea::dragLeaveEvent(QDragLeaveEvent *event)
+{
+    clear();
+    event->accept();
+}
+//! [dragLeaveEvent() function]
+
+//! [clear() function]
+void DropArea::clear()
+{
+    setText(tr("<drop content>"));
+    setBackgroundRole(QPalette::Dark);
+
+    emit changed();
+}
+//! [clear() function]
diff --git a/examples/draganddrop/dropsite/droparea.h b/examples/draganddrop/dropsite/droparea.h
new file mode 100644
index 0000000000..8a40acccda
--- /dev/null
+++ b/examples/draganddrop/dropsite/droparea.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DROPAREA_H
+#define DROPAREA_H
+
+#include <QLabel>
+
+QT_BEGIN_NAMESPACE
+class QMimeData;
+QT_END_NAMESPACE
+
+//! [DropArea header part1]
+class DropArea : public QLabel
+{
+    Q_OBJECT
+
+public:
+    DropArea(QWidget *parent = 0);
+
+public slots:
+    void clear();
+
+signals:
+    void changed(const QMimeData *mimeData = 0);
+//! [DropArea header part1]
+
+//! [DropArea header part2]
+protected:
+    void dragEnterEvent(QDragEnterEvent *event);
+    void dragMoveEvent(QDragMoveEvent *event);
+    void dragLeaveEvent(QDragLeaveEvent *event);
+    void dropEvent(QDropEvent *event);
+
+private:
+    QLabel *label;
+};
+//! [DropArea header part2]
+
+#endif
diff --git a/examples/draganddrop/dropsite/dropsite.pro b/examples/draganddrop/dropsite/dropsite.pro
new file mode 100644
index 0000000000..29dd0fdb4d
--- /dev/null
+++ b/examples/draganddrop/dropsite/dropsite.pro
@@ -0,0 +1,12 @@
+HEADERS = droparea.h \
+          dropsitewindow.h
+SOURCES = droparea.cpp \
+          dropsitewindow.cpp \
+          main.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/dropsite
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/dropsite
+INSTALLS += target sources
+
diff --git a/examples/draganddrop/dropsite/dropsitewindow.cpp b/examples/draganddrop/dropsite/dropsitewindow.cpp
new file mode 100644
index 0000000000..627baaa3fe
--- /dev/null
+++ b/examples/draganddrop/dropsite/dropsitewindow.cpp
@@ -0,0 +1,144 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "droparea.h"
+#include "dropsitewindow.h"
+
+//! [constructor part1]
+DropSiteWindow::DropSiteWindow()
+{
+    abstractLabel = new QLabel(tr("This example accepts drags from other "
+                                  "applications and displays the MIME types "
+                                  "provided by the drag object."));
+    abstractLabel->setWordWrap(true);
+    abstractLabel->adjustSize();
+//! [constructor part1]
+
+//! [constructor part2]
+    dropArea = new DropArea;
+    connect(dropArea, SIGNAL(changed(const QMimeData *)),
+            this, SLOT(updateFormatsTable(const QMimeData *)));
+//! [constructor part2]
+
+//! [constructor part3]
+    QStringList labels;
+    labels << tr("Format") << tr("Content");
+
+    formatsTable = new QTableWidget;
+    formatsTable->setColumnCount(2);
+    formatsTable->setEditTriggers(QAbstractItemView::NoEditTriggers);
+    formatsTable->setHorizontalHeaderLabels(labels);
+    formatsTable->horizontalHeader()->setStretchLastSection(true);
+//! [constructor part3]
+
+//! [constructor part4]
+    clearButton = new QPushButton(tr("Clear"));
+    quitButton = new QPushButton(tr("Quit"));
+
+    buttonBox = new QDialogButtonBox;
+    buttonBox->addButton(clearButton, QDialogButtonBox::ActionRole);
+    buttonBox->addButton(quitButton, QDialogButtonBox::RejectRole);
+
+    connect(quitButton, SIGNAL(pressed()), this, SLOT(close()));
+    connect(clearButton, SIGNAL(pressed()), dropArea, SLOT(clear()));
+//! [constructor part4]
+
+//! [constructor part5]
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(abstractLabel);
+    mainLayout->addWidget(dropArea);
+    mainLayout->addWidget(formatsTable);
+    mainLayout->addWidget(buttonBox);
+    setLayout(mainLayout);
+
+    setWindowTitle(tr("Drop Site"));
+    setMinimumSize(350, 500);
+}
+//! [constructor part5]
+
+//! [updateFormatsTable() part1]
+void DropSiteWindow::updateFormatsTable(const QMimeData *mimeData)
+{
+    formatsTable->setRowCount(0);
+    if (!mimeData)
+        return;
+//! [updateFormatsTable() part1]
+
+//! [updateFormatsTable() part2]        
+    foreach (QString format, mimeData->formats()) {
+        QTableWidgetItem *formatItem = new QTableWidgetItem(format);
+        formatItem->setFlags(Qt::ItemIsEnabled);
+        formatItem->setTextAlignment(Qt::AlignTop | Qt::AlignLeft);
+//! [updateFormatsTable() part2]
+
+//! [updateFormatsTable() part3]
+        QString text;
+        if (format == "text/plain") {
+            text = mimeData->text().simplified();
+        } else if (format == "text/html") {
+            text = mimeData->html().simplified();
+        } else if (format == "text/uri-list") {
+            QList<QUrl> urlList = mimeData->urls();
+            for (int i = 0; i < urlList.size() && i < 32; ++i)
+                text.append(urlList[i].toString() + " ");
+        } else {
+            QByteArray data = mimeData->data(format);
+            for (int i = 0; i < data.size() && i < 32; ++i) {
+                QString hex = QString("%1").arg(uchar(data[i]), 2, 16,
+                                                QChar('0'))
+                                           .toUpper();
+                text.append(hex + " ");
+            }
+        }
+//! [updateFormatsTable() part3]   
+
+//! [updateFormatsTable() part4]
+        int row = formatsTable->rowCount();
+        formatsTable->insertRow(row);
+        formatsTable->setItem(row, 0, new QTableWidgetItem(format));
+        formatsTable->setItem(row, 1, new QTableWidgetItem(text));
+    }
+    
+    formatsTable->resizeColumnToContents(0);
+}
+//! [updateFormatsTable() part4] 
diff --git a/examples/draganddrop/dropsite/dropsitewindow.h b/examples/draganddrop/dropsite/dropsitewindow.h
new file mode 100644
index 0000000000..bbdc687ed3
--- /dev/null
+++ b/examples/draganddrop/dropsite/dropsitewindow.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DROPSITEWINDOW_H
+#define DROPSITEWINDOW_H
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QDialogButtonBox;
+class QLabel;
+class QMimeData;
+class QPushButton;
+class QTableWidget;
+QT_END_NAMESPACE
+class DropArea;
+
+//! [DropSiteWindow header]
+class DropSiteWindow : public QWidget
+{
+    Q_OBJECT
+
+public:
+    DropSiteWindow();
+
+public slots:
+    void updateFormatsTable(const QMimeData *mimeData);
+
+private:
+    DropArea *dropArea;
+    QLabel *abstractLabel;
+    QTableWidget *formatsTable;
+
+    QPushButton *clearButton;
+    QPushButton *quitButton;
+    QDialogButtonBox *buttonBox;
+};
+//! [DropSiteWindow header]
+
+#endif
diff --git a/examples/draganddrop/dropsite/main.cpp b/examples/draganddrop/dropsite/main.cpp
new file mode 100644
index 0000000000..62589ad98c
--- /dev/null
+++ b/examples/draganddrop/dropsite/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "dropsitewindow.h"
+
+//! [main() function]
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    DropSiteWindow window;
+    window.show();
+    return app.exec();
+}
+//! [main() function]
diff --git a/examples/draganddrop/fridgemagnets/draglabel.cpp b/examples/draganddrop/fridgemagnets/draglabel.cpp
new file mode 100644
index 0000000000..1bec024e2d
--- /dev/null
+++ b/examples/draganddrop/fridgemagnets/draglabel.cpp
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "draglabel.h"
+
+//! [0]
+DragLabel::DragLabel(const QString &text, QWidget *parent)
+    : QLabel(parent)
+{
+    QFontMetrics metric(font());
+    QSize size = metric.size(Qt::TextSingleLine, text);
+
+    QImage image(size.width() + 12, size.height() + 12,
+                 QImage::Format_ARGB32_Premultiplied);
+    image.fill(qRgba(0, 0, 0, 0));
+
+    QFont font;
+    font.setStyleStrategy(QFont::ForceOutline);
+//! [0]
+
+//! [1]
+    QLinearGradient gradient(0, 0, 0, image.height()-1);
+    gradient.setColorAt(0.0, Qt::white);
+    gradient.setColorAt(0.2, QColor(200, 200, 255));
+    gradient.setColorAt(0.8, QColor(200, 200, 255));
+    gradient.setColorAt(1.0, QColor(127, 127, 200));
+
+    QPainter painter;
+    painter.begin(&image);
+    painter.setRenderHint(QPainter::Antialiasing);
+    painter.setBrush(gradient);
+    painter.drawRoundedRect(QRectF(0.5, 0.5, image.width()-1, image.height()-1),
+                            25, 25, Qt::RelativeSize);
+
+    painter.setFont(font);
+    painter.setBrush(Qt::black);
+    painter.drawText(QRect(QPoint(6, 6), size), Qt::AlignCenter, text);
+    painter.end();
+//! [1]
+
+//! [2]
+    setPixmap(QPixmap::fromImage(image));
+    m_labelText = text;
+}
+//! [2]
+
+QString DragLabel::labelText() const
+{
+    return m_labelText;
+}
diff --git a/examples/draganddrop/fridgemagnets/draglabel.h b/examples/draganddrop/fridgemagnets/draglabel.h
new file mode 100644
index 0000000000..5d2fd5281b
--- /dev/null
+++ b/examples/draganddrop/fridgemagnets/draglabel.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DRAGLABEL_H
+#define DRAGLABEL_H
+
+#include <QLabel>
+
+QT_BEGIN_NAMESPACE
+class QDragEnterEvent;
+class QDragMoveEvent;
+class QFrame;
+QT_END_NAMESPACE
+
+//! [0]
+class DragLabel : public QLabel
+{
+public:
+    DragLabel(const QString &text, QWidget *parent);
+    QString labelText() const;
+
+private:
+    QString m_labelText;
+};
+//! [0]
+
+#endif
diff --git a/examples/draganddrop/fridgemagnets/dragwidget.cpp b/examples/draganddrop/fridgemagnets/dragwidget.cpp
new file mode 100644
index 0000000000..43a9588c5a
--- /dev/null
+++ b/examples/draganddrop/fridgemagnets/dragwidget.cpp
@@ -0,0 +1,212 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "draglabel.h"
+#include "dragwidget.h"
+
+//! [0]
+DragWidget::DragWidget(QWidget *parent)
+    : QWidget(parent)
+{
+    QFile dictionaryFile(":/dictionary/words.txt");
+    dictionaryFile.open(QFile::ReadOnly);
+    QTextStream inputStream(&dictionaryFile);
+//! [0]
+
+//! [1]
+    int x = 5;
+    int y = 5;
+
+    while (!inputStream.atEnd()) {
+        QString word;
+        inputStream >> word;
+        if (!word.isEmpty()) {
+            DragLabel *wordLabel = new DragLabel(word, this);
+            wordLabel->move(x, y);
+            wordLabel->show();
+            wordLabel->setAttribute(Qt::WA_DeleteOnClose);
+            x += wordLabel->width() + 2;
+            if (x >= 245) {
+                x = 5;
+                y += wordLabel->height() + 2;
+            }
+        }
+    }
+//! [1]
+
+//! [2]
+    QPalette newPalette = palette();
+    newPalette.setColor(QPalette::Window, Qt::white);
+    setPalette(newPalette);
+
+    setMinimumSize(400, qMax(200, y));
+    setWindowTitle(tr("Fridge Magnets"));
+//! [2] //! [3]
+    setAcceptDrops(true);
+}
+//! [3]
+
+//! [4]
+void DragWidget::dragEnterEvent(QDragEnterEvent *event)
+{
+//! [4] //! [5]
+    if (event->mimeData()->hasFormat("application/x-fridgemagnet")) {
+        if (children().contains(event->source())) {
+            event->setDropAction(Qt::MoveAction);
+            event->accept();
+        } else {
+            event->acceptProposedAction();
+//! [5] //! [6]
+        }
+//! [6] //! [7]
+    } else if (event->mimeData()->hasText()) {
+        event->acceptProposedAction();
+    } else {
+        event->ignore();
+    }
+}
+//! [7]
+
+//! [8]
+void DragWidget::dragMoveEvent(QDragMoveEvent *event)
+{
+    if (event->mimeData()->hasFormat("application/x-fridgemagnet")) {
+        if (children().contains(event->source())) {
+            event->setDropAction(Qt::MoveAction);
+            event->accept();
+        } else {
+            event->acceptProposedAction();
+        }
+    } else if (event->mimeData()->hasText()) {
+        event->acceptProposedAction();
+    } else {
+        event->ignore();
+    }
+}
+//! [8]
+
+//! [9]
+void DragWidget::dropEvent(QDropEvent *event)
+{
+    if (event->mimeData()->hasFormat("application/x-fridgemagnet")) {
+        const QMimeData *mime = event->mimeData();
+//! [9] //! [10]
+        QByteArray itemData = mime->data("application/x-fridgemagnet");
+        QDataStream dataStream(&itemData, QIODevice::ReadOnly);
+
+        QString text;
+        QPoint offset;
+        dataStream >> text >> offset;
+//! [10]
+//! [11]
+        DragLabel *newLabel = new DragLabel(text, this);
+        newLabel->move(event->pos() - offset);
+        newLabel->show();
+        newLabel->setAttribute(Qt::WA_DeleteOnClose);
+
+        if (event->source() == this) {
+            event->setDropAction(Qt::MoveAction);
+            event->accept();
+        } else {
+            event->acceptProposedAction();
+        }
+//! [11] //! [12]
+    } else if (event->mimeData()->hasText()) {
+        QStringList pieces = event->mimeData()->text().split(QRegExp("\\s+"),
+                             QString::SkipEmptyParts);
+        QPoint position = event->pos();
+
+        foreach (QString piece, pieces) {
+            DragLabel *newLabel = new DragLabel(piece, this);
+            newLabel->move(position);
+            newLabel->show();
+            newLabel->setAttribute(Qt::WA_DeleteOnClose);
+
+            position += QPoint(newLabel->width(), 0);
+        }
+
+        event->acceptProposedAction();
+    } else {
+        event->ignore();
+    }
+}
+//! [12]
+
+//! [13]
+void DragWidget::mousePressEvent(QMouseEvent *event)
+{
+//! [13]
+//! [14]
+    DragLabel *child = static_cast<DragLabel*>(childAt(event->pos()));
+    if (!child)
+        return;
+
+    QPoint hotSpot = event->pos() - child->pos();
+
+    QByteArray itemData;
+    QDataStream dataStream(&itemData, QIODevice::WriteOnly);
+    dataStream << child->labelText() << QPoint(hotSpot);
+//! [14]
+
+//! [15]
+    QMimeData *mimeData = new QMimeData;
+    mimeData->setData("application/x-fridgemagnet", itemData);
+    mimeData->setText(child->labelText());
+//! [15]
+
+//! [16]
+    QDrag *drag = new QDrag(this);
+    drag->setMimeData(mimeData);
+    drag->setPixmap(*child->pixmap());
+    drag->setHotSpot(hotSpot);
+
+    child->hide();
+//! [16]
+
+//! [17]
+    if (drag->exec(Qt::MoveAction | Qt::CopyAction, Qt::CopyAction) == Qt::MoveAction)
+        child->close();
+    else
+        child->show();
+}
+//! [17]
diff --git a/examples/draganddrop/fridgemagnets/dragwidget.h b/examples/draganddrop/fridgemagnets/dragwidget.h
new file mode 100644
index 0000000000..4722917615
--- /dev/null
+++ b/examples/draganddrop/fridgemagnets/dragwidget.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DRAGWIDGET_H
+#define DRAGWIDGET_H
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QDragEnterEvent;
+class QDropEvent;
+QT_END_NAMESPACE
+
+//! [0]
+class DragWidget : public QWidget
+{
+public:
+    DragWidget(QWidget *parent = 0);
+
+protected:
+    void dragEnterEvent(QDragEnterEvent *event);
+    void dragMoveEvent(QDragMoveEvent *event);
+    void dropEvent(QDropEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+};
+//! [0]
+
+#endif
diff --git a/examples/draganddrop/fridgemagnets/fridgemagnets.pro b/examples/draganddrop/fridgemagnets/fridgemagnets.pro
new file mode 100644
index 0000000000..f1baaefdac
--- /dev/null
+++ b/examples/draganddrop/fridgemagnets/fridgemagnets.pro
@@ -0,0 +1,12 @@
+HEADERS     = draglabel.h \
+              dragwidget.h
+RESOURCES   = fridgemagnets.qrc
+SOURCES     = draglabel.cpp \
+              dragwidget.cpp \
+              main.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/fridgemagnets
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.txt
+sources.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/fridgemagnets
+INSTALLS += target sources
diff --git a/examples/draganddrop/fridgemagnets/fridgemagnets.qrc b/examples/draganddrop/fridgemagnets/fridgemagnets.qrc
new file mode 100644
index 0000000000..b72217d701
--- /dev/null
+++ b/examples/draganddrop/fridgemagnets/fridgemagnets.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/dictionary">
+   <file>words.txt</file>
+</qresource>
+</RCC>
diff --git a/examples/draganddrop/fridgemagnets/main.cpp b/examples/draganddrop/fridgemagnets/main.cpp
new file mode 100644
index 0000000000..c24cdb2198
--- /dev/null
+++ b/examples/draganddrop/fridgemagnets/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include "dragwidget.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(fridgemagnets);
+
+    QApplication app(argc, argv);
+    DragWidget window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/draganddrop/fridgemagnets/words.txt b/examples/draganddrop/fridgemagnets/words.txt
new file mode 100644
index 0000000000..a7e1632b09
--- /dev/null
+++ b/examples/draganddrop/fridgemagnets/words.txt
@@ -0,0 +1,48 @@
+Colorless
+green
+ideas
+sleep
+furiously
+A
+colorless
+green
+idea
+is
+a
+new
+untried
+idea
+that
+is
+without
+vividness
+dull
+and
+unexciting
+To
+sleep
+furiously
+may
+seem
+a
+puzzling
+turn
+of
+phrase
+but
+the
+mind
+in
+sleep
+often
+indeed
+moves
+furiously
+with
+ideas
+and
+images
+flickering
+in
+and
+out
diff --git a/examples/draganddrop/puzzle/example.jpg b/examples/draganddrop/puzzle/example.jpg
new file mode 100644
index 0000000000..e09fb70757
--- /dev/null
+++ b/examples/draganddrop/puzzle/example.jpg
diff --git a/examples/draganddrop/puzzle/main.cpp b/examples/draganddrop/puzzle/main.cpp
new file mode 100644
index 0000000000..e0e5cc1907
--- /dev/null
+++ b/examples/draganddrop/puzzle/main.cpp
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(puzzle);
+
+    QApplication app(argc, argv);
+    MainWindow window;
+    window.openImage(":/images/example.jpg");
+    window.show();
+    return app.exec();
+}
diff --git a/examples/draganddrop/puzzle/mainwindow.cpp b/examples/draganddrop/puzzle/mainwindow.cpp
new file mode 100644
index 0000000000..f998882e9e
--- /dev/null
+++ b/examples/draganddrop/puzzle/mainwindow.cpp
@@ -0,0 +1,151 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <stdlib.h>
+
+#include "mainwindow.h"
+#include "pieceslist.h"
+#include "puzzlewidget.h"
+
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent)
+{
+    setupMenus();
+    setupWidgets();
+
+    setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+    setWindowTitle(tr("Puzzle"));
+}
+
+void MainWindow::openImage(const QString &path)
+{
+    QString fileName = path;
+
+    if (fileName.isNull())
+        fileName = QFileDialog::getOpenFileName(this,
+            tr("Open Image"), "", "Image Files (*.png *.jpg *.bmp)");
+
+    if (!fileName.isEmpty()) {
+        QPixmap newImage;
+        if (!newImage.load(fileName)) {
+            QMessageBox::warning(this, tr("Open Image"),
+                                  tr("The image file could not be loaded."),
+                                  QMessageBox::Cancel);
+            return;
+        }
+        puzzleImage = newImage;
+        setupPuzzle();
+    }
+}
+
+void MainWindow::setCompleted()
+{
+    QMessageBox::information(this, tr("Puzzle Completed"),
+        tr("Congratulations! You have completed the puzzle!\n"
+           "Click OK to start again."),
+        QMessageBox::Ok);
+
+    setupPuzzle();
+}
+
+void MainWindow::setupPuzzle()
+{
+    int size = qMin(puzzleImage.width(), puzzleImage.height());
+    puzzleImage = puzzleImage.copy((puzzleImage.width() - size)/2,
+        (puzzleImage.height() - size)/2, size, size).scaled(400,
+            400, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+
+    piecesList->clear();
+
+    for (int y = 0; y < 5; ++y) {
+        for (int x = 0; x < 5; ++x) {
+            QPixmap pieceImage = puzzleImage.copy(x*80, y*80, 80, 80);
+            piecesList->addPiece(pieceImage, QPoint(x, y));
+        }
+    }
+
+    qsrand(QCursor::pos().x() ^ QCursor::pos().y());
+
+    for (int i = 0; i < piecesList->count(); ++i) {
+        if (int(2.0*qrand()/(RAND_MAX+1.0)) == 1) {
+            QListWidgetItem *item = piecesList->takeItem(i);
+            piecesList->insertItem(0, item);
+        }
+    }
+
+    puzzleWidget->clear();
+}
+
+void MainWindow::setupMenus()
+{
+    QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
+
+    QAction *openAction = fileMenu->addAction(tr("&Open..."));
+    openAction->setShortcut(QKeySequence(tr("Ctrl+O")));
+
+    QAction *exitAction = fileMenu->addAction(tr("E&xit"));
+    exitAction->setShortcut(QKeySequence(tr("Ctrl+Q")));
+
+    QMenu *gameMenu = menuBar()->addMenu(tr("&Game"));
+
+    QAction *restartAction = gameMenu->addAction(tr("&Restart"));
+
+    connect(openAction, SIGNAL(triggered()), this, SLOT(openImage()));
+    connect(exitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+    connect(restartAction, SIGNAL(triggered()), this, SLOT(setupPuzzle()));
+}
+
+void MainWindow::setupWidgets()
+{
+    QFrame *frame = new QFrame;
+    QHBoxLayout *frameLayout = new QHBoxLayout(frame);
+
+    piecesList = new PiecesList;
+    puzzleWidget = new PuzzleWidget;
+
+    connect(puzzleWidget, SIGNAL(puzzleCompleted()),
+            this, SLOT(setCompleted()), Qt::QueuedConnection);
+
+    frameLayout->addWidget(piecesList);
+    frameLayout->addWidget(puzzleWidget);
+    setCentralWidget(frame);
+}
diff --git a/examples/draganddrop/puzzle/mainwindow.h b/examples/draganddrop/puzzle/mainwindow.h
new file mode 100644
index 0000000000..edfbb12e03
--- /dev/null
+++ b/examples/draganddrop/puzzle/mainwindow.h
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QPixmap>
+#include <QMainWindow>
+
+class PiecesList;
+class PuzzleWidget;
+QT_BEGIN_NAMESPACE
+class QListWidgetItem;
+QT_END_NAMESPACE
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow(QWidget *parent = 0);
+
+public slots:
+    void openImage(const QString &path = QString());
+    void setupPuzzle();
+
+private slots:
+    void setCompleted();
+
+private:
+    void setupMenus();
+    void setupWidgets();
+
+    QPixmap puzzleImage;
+    PiecesList *piecesList;
+    PuzzleWidget *puzzleWidget;
+};
+
+#endif
diff --git a/examples/draganddrop/puzzle/pieceslist.cpp b/examples/draganddrop/puzzle/pieceslist.cpp
new file mode 100644
index 0000000000..77d06fb6ed
--- /dev/null
+++ b/examples/draganddrop/puzzle/pieceslist.cpp
@@ -0,0 +1,122 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "pieceslist.h"
+
+PiecesList::PiecesList(QWidget *parent)
+    : QListWidget(parent)
+{
+    setDragEnabled(true);
+    setViewMode(QListView::IconMode);
+    setIconSize(QSize(60, 60));
+    setSpacing(10);
+    setAcceptDrops(true);
+    setDropIndicatorShown(true);
+}
+
+void PiecesList::dragEnterEvent(QDragEnterEvent *event)
+{
+    if (event->mimeData()->hasFormat("image/x-puzzle-piece"))
+        event->accept();
+    else
+        event->ignore();
+}
+
+void PiecesList::dragMoveEvent(QDragMoveEvent *event)
+{
+    if (event->mimeData()->hasFormat("image/x-puzzle-piece")) {
+        event->setDropAction(Qt::MoveAction);
+        event->accept();
+    } else
+        event->ignore();
+}
+
+void PiecesList::dropEvent(QDropEvent *event)
+{
+    if (event->mimeData()->hasFormat("image/x-puzzle-piece")) {
+        QByteArray pieceData = event->mimeData()->data("image/x-puzzle-piece");
+        QDataStream dataStream(&pieceData, QIODevice::ReadOnly);
+        QPixmap pixmap;
+        QPoint location;
+        dataStream >> pixmap >> location;
+
+        addPiece(pixmap, location);
+
+        event->setDropAction(Qt::MoveAction);
+        event->accept();
+    } else
+        event->ignore();
+}
+
+void PiecesList::addPiece(QPixmap pixmap, QPoint location)
+{
+    QListWidgetItem *pieceItem = new QListWidgetItem(this);
+    pieceItem->setIcon(QIcon(pixmap));
+    pieceItem->setData(Qt::UserRole, QVariant(pixmap));
+    pieceItem->setData(Qt::UserRole+1, location);
+    pieceItem->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable
+                        | Qt::ItemIsDragEnabled);
+}
+
+void PiecesList::startDrag(Qt::DropActions /*supportedActions*/)
+{
+    QListWidgetItem *item = currentItem();
+
+    QByteArray itemData;
+    QDataStream dataStream(&itemData, QIODevice::WriteOnly);
+    QPixmap pixmap = qVariantValue<QPixmap>(item->data(Qt::UserRole));
+    QPoint location = item->data(Qt::UserRole+1).toPoint();
+
+    dataStream << pixmap << location;
+
+    QMimeData *mimeData = new QMimeData;
+    mimeData->setData("image/x-puzzle-piece", itemData);
+
+    QDrag *drag = new QDrag(this);
+    drag->setMimeData(mimeData);
+    drag->setHotSpot(QPoint(pixmap.width()/2, pixmap.height()/2));
+    drag->setPixmap(pixmap);
+
+    if (drag->exec(Qt::MoveAction) == Qt::MoveAction)
+        delete takeItem(row(item));
+}
diff --git a/examples/draganddrop/puzzle/pieceslist.h b/examples/draganddrop/puzzle/pieceslist.h
new file mode 100644
index 0000000000..26685e3311
--- /dev/null
+++ b/examples/draganddrop/puzzle/pieceslist.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PIECESLIST_H
+#define PIECESLIST_H
+
+#include <QListWidget>
+
+class PiecesList : public QListWidget
+{
+    Q_OBJECT
+
+public:
+    PiecesList(QWidget *parent = 0);
+    void addPiece(QPixmap pixmap, QPoint location);
+
+protected:
+    void dragEnterEvent(QDragEnterEvent *event);
+    void dragMoveEvent(QDragMoveEvent *event);
+    void dropEvent(QDropEvent *event);
+    void startDrag(Qt::DropActions supportedActions);
+};
+
+#endif
diff --git a/examples/draganddrop/puzzle/puzzle.pro b/examples/draganddrop/puzzle/puzzle.pro
new file mode 100644
index 0000000000..26d2350e3d
--- /dev/null
+++ b/examples/draganddrop/puzzle/puzzle.pro
@@ -0,0 +1,20 @@
+HEADERS     = mainwindow.h \
+              pieceslist.h \
+              puzzlewidget.h
+RESOURCES   = puzzle.qrc
+SOURCES     = main.cpp \
+              mainwindow.cpp \
+              pieceslist.cpp \
+              puzzlewidget.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/puzzle
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg
+sources.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/puzzle
+INSTALLS += target sources
+
+wince*: {
+   addFile.sources = example.jpg
+   addFile.path = .
+   DEPLOYMENT += addFile
+}
diff --git a/examples/draganddrop/puzzle/puzzle.qrc b/examples/draganddrop/puzzle/puzzle.qrc
new file mode 100644
index 0000000000..4076cec026
--- /dev/null
+++ b/examples/draganddrop/puzzle/puzzle.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/images">
+   <file>example.jpg</file>
+</qresource>
+</RCC>
diff --git a/examples/draganddrop/puzzle/puzzlewidget.cpp b/examples/draganddrop/puzzle/puzzlewidget.cpp
new file mode 100644
index 0000000000..8548db521c
--- /dev/null
+++ b/examples/draganddrop/puzzle/puzzlewidget.cpp
@@ -0,0 +1,205 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "puzzlewidget.h"
+
+PuzzleWidget::PuzzleWidget(QWidget *parent)
+    : QWidget(parent)
+{
+    setAcceptDrops(true);
+    setMinimumSize(400, 400);
+    setMaximumSize(400, 400);
+}
+
+void PuzzleWidget::clear()
+{
+    pieceLocations.clear();
+    piecePixmaps.clear();
+    pieceRects.clear();
+    highlightedRect = QRect();
+    inPlace = 0;
+    update();
+}
+
+void PuzzleWidget::dragEnterEvent(QDragEnterEvent *event)
+{
+    if (event->mimeData()->hasFormat("image/x-puzzle-piece"))
+        event->accept();
+    else
+        event->ignore();
+}
+
+void PuzzleWidget::dragLeaveEvent(QDragLeaveEvent *event)
+{
+    QRect updateRect = highlightedRect;
+    highlightedRect = QRect();
+    update(updateRect);
+    event->accept();
+}
+
+void PuzzleWidget::dragMoveEvent(QDragMoveEvent *event)
+{
+    QRect updateRect = highlightedRect.unite(targetSquare(event->pos()));
+
+    if (event->mimeData()->hasFormat("image/x-puzzle-piece")
+        && findPiece(targetSquare(event->pos())) == -1) {
+
+        highlightedRect = targetSquare(event->pos());
+        event->setDropAction(Qt::MoveAction);
+        event->accept();
+    } else {
+        highlightedRect = QRect();
+        event->ignore();
+    }
+
+    update(updateRect);
+}
+
+void PuzzleWidget::dropEvent(QDropEvent *event)
+{
+    if (event->mimeData()->hasFormat("image/x-puzzle-piece")
+        && findPiece(targetSquare(event->pos())) == -1) {
+
+        QByteArray pieceData = event->mimeData()->data("image/x-puzzle-piece");
+        QDataStream dataStream(&pieceData, QIODevice::ReadOnly);
+        QRect square = targetSquare(event->pos());
+        QPixmap pixmap;
+        QPoint location;
+        dataStream >> pixmap >> location;
+
+        pieceLocations.append(location);
+        piecePixmaps.append(pixmap);
+        pieceRects.append(square);
+
+        highlightedRect = QRect();
+        update(square);
+
+        event->setDropAction(Qt::MoveAction);
+        event->accept();
+
+        if (location == QPoint(square.x()/80, square.y()/80)) {
+            inPlace++;
+            if (inPlace == 25)
+                emit puzzleCompleted();
+        }
+    } else {
+        highlightedRect = QRect();
+        event->ignore();
+    }
+}
+
+int PuzzleWidget::findPiece(const QRect &pieceRect) const
+{
+    for (int i = 0; i < pieceRects.size(); ++i) {
+        if (pieceRect == pieceRects[i]) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+void PuzzleWidget::mousePressEvent(QMouseEvent *event)
+{
+    QRect square = targetSquare(event->pos());
+    int found = findPiece(square);
+
+    if (found == -1)
+        return;
+
+    QPoint location = pieceLocations[found];
+    QPixmap pixmap = piecePixmaps[found];
+    pieceLocations.removeAt(found);
+    piecePixmaps.removeAt(found);
+    pieceRects.removeAt(found);
+
+    if (location == QPoint(square.x()/80, square.y()/80))
+        inPlace--;
+
+    update(square);
+
+    QByteArray itemData;
+    QDataStream dataStream(&itemData, QIODevice::WriteOnly);
+
+    dataStream << pixmap << location;
+
+    QMimeData *mimeData = new QMimeData;
+    mimeData->setData("image/x-puzzle-piece", itemData);
+
+    QDrag *drag = new QDrag(this);
+    drag->setMimeData(mimeData);
+    drag->setHotSpot(event->pos() - square.topLeft());
+    drag->setPixmap(pixmap);
+
+    if (!(drag->exec(Qt::MoveAction) == Qt::MoveAction)) {
+        pieceLocations.insert(found, location);
+        piecePixmaps.insert(found, pixmap);
+        pieceRects.insert(found, square);
+        update(targetSquare(event->pos()));
+
+        if (location == QPoint(square.x()/80, square.y()/80))
+            inPlace++;
+    }
+}
+
+void PuzzleWidget::paintEvent(QPaintEvent *event)
+{
+    QPainter painter;
+    painter.begin(this);
+    painter.fillRect(event->rect(), Qt::white);
+
+    if (highlightedRect.isValid()) {
+        painter.setBrush(QColor("#ffcccc"));
+        painter.setPen(Qt::NoPen);
+        painter.drawRect(highlightedRect.adjusted(0, 0, -1, -1));
+    }
+
+    for (int i = 0; i < pieceRects.size(); ++i) {
+        painter.drawPixmap(pieceRects[i], piecePixmaps[i]);
+    }
+    painter.end();
+}
+
+const QRect PuzzleWidget::targetSquare(const QPoint &position) const
+{
+    return QRect(position.x()/80 * 80, position.y()/80 * 80, 80, 80);
+}
diff --git a/examples/draganddrop/puzzle/puzzlewidget.h b/examples/draganddrop/puzzle/puzzlewidget.h
new file mode 100644
index 0000000000..312e25fc77
--- /dev/null
+++ b/examples/draganddrop/puzzle/puzzlewidget.h
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PUZZLEWIDGET_H
+#define PUZZLEWIDGET_H
+
+#include <QList>
+#include <QPoint>
+#include <QPixmap>
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QDragEnterEvent;
+class QDropEvent;
+class QMouseEvent;
+QT_END_NAMESPACE
+
+class PuzzleWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    PuzzleWidget(QWidget *parent = 0);
+    void clear();
+
+signals:
+    void puzzleCompleted();
+
+protected:
+    void dragEnterEvent(QDragEnterEvent *event);
+    void dragLeaveEvent(QDragLeaveEvent *event);
+    void dragMoveEvent(QDragMoveEvent *event);
+    void dropEvent(QDropEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+    void paintEvent(QPaintEvent *event);
+
+private:
+    int findPiece(const QRect &pieceRect) const;
+    const QRect targetSquare(const QPoint &position) const;
+
+    QList<QPixmap> piecePixmaps;
+    QList<QRect> pieceRects;
+    QList<QPoint> pieceLocations;
+    QRect highlightedRect;
+    int inPlace;
+};
+
+#endif
diff --git a/examples/examples.pro b/examples/examples.pro
new file mode 100644
index 0000000000..2c4fc81dd7
--- /dev/null
+++ b/examples/examples.pro
@@ -0,0 +1,43 @@
+TEMPLATE      = subdirs
+SUBDIRS       = \
+                desktop \
+                dialogs \
+                draganddrop \
+                graphicsview \
+                ipc \
+                itemviews \
+                layouts \
+                linguist \
+                mainwindows \
+                network \
+                painting \
+                qtconcurrent \
+                richtext \
+                sql \
+                threads \
+                tools \
+                tutorials \
+                widgets \
+                uitools \
+                xml \
+                script
+
+contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon
+contains(QT_CONFIG, webkit): SUBDIRS += webkit
+embedded:SUBDIRS += qws
+!wince*: {
+	!contains(QT_EDITION, Console):contains(QT_BUILD_PARTS, tools):SUBDIRS += designer
+	contains(QT_BUILD_PARTS, tools):SUBDIRS += assistant qtestlib help
+} else {
+	contains(QT_BUILD_PARTS, tools):SUBDIRS += qtestlib
+}
+contains(QT_CONFIG, opengl): SUBDIRS += opengl
+contains(QT_CONFIG, dbus): SUBDIRS += dbus
+win32:!contains(QT_EDITION, OpenSource|Console):SUBDIRS += activeqt
+contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns
+contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows
+
+# install
+sources.files = README *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]
+INSTALLS += sources
diff --git a/examples/graphicsview/README b/examples/graphicsview/README
new file mode 100644
index 0000000000..6c38c18683
--- /dev/null
+++ b/examples/graphicsview/README
@@ -0,0 +1,40 @@
+Qt is provided with a comprehensive canvas through the GraphicsView
+classes.
+
+These examples demonstrate the fundamental aspects of canvas programming
+with Qt.
+
+
+The example launcher provided with Qt can be used to explore each of the
+examples in this directory.
+
+Documentation for these examples can be found via the Tutorial and Examples
+link in the main Qt documentation.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro b/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro
new file mode 100644
index 0000000000..a166882adb
--- /dev/null
+++ b/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro
@@ -0,0 +1,12 @@
+HEADERS   = layoutitem.h \
+            window.h
+SOURCES   = layoutitem.cpp \
+            main.cpp \
+            window.cpp
+RESOURCES = basicgraphicslayouts.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/basicgraphicslayouts
+sources.files = $$SOURCES $$HEADERS $$RESOURCES basicgraphicslayouts.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/basicgraphicslayouts
+INSTALLS += target sources
diff --git a/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.qrc b/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.qrc
new file mode 100644
index 0000000000..fbe2efa572
--- /dev/null
+++ b/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.qrc
@@ -0,0 +1,5 @@
+<RCC>
+ <qresource>
+  <file>images/block.png</file>
+ </qresource>
+</RCC>
diff --git a/examples/graphicsview/basicgraphicslayouts/images/block.png b/examples/graphicsview/basicgraphicslayouts/images/block.png
new file mode 100644
index 0000000000..4c72a3f508
--- /dev/null
+++ b/examples/graphicsview/basicgraphicslayouts/images/block.png
diff --git a/examples/graphicsview/basicgraphicslayouts/layoutitem.cpp b/examples/graphicsview/basicgraphicslayouts/layoutitem.cpp
new file mode 100644
index 0000000000..8216b6e97b
--- /dev/null
+++ b/examples/graphicsview/basicgraphicslayouts/layoutitem.cpp
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "layoutitem.h"
+
+//! [0]
+LayoutItem::LayoutItem(QGraphicsItem *parent/* = 0*/)
+    : QGraphicsWidget(parent)
+{
+    pix = new QPixmap(QLatin1String(":/images/block.png"));
+    // Do not allow a size smaller than the pixmap with two frames around it.
+    setMinimumSize(pix->size() + QSize(12, 12));
+}
+//! [0]
+
+LayoutItem::~LayoutItem()
+{
+    delete pix;
+}
+ 
+//! [1]
+void LayoutItem::paint(QPainter *painter,
+    const QStyleOptionGraphicsItem *option, QWidget *widget /*= 0*/)
+{
+    Q_UNUSED(widget);
+    Q_UNUSED(option);
+
+    QRectF frame(QPointF(0,0), geometry().size());
+    qreal w = pix->width();
+    qreal h = pix->height();
+    QGradientStops stops;
+//! [1]
+
+//! [2]
+    // paint a background rect (with gradient)
+    QLinearGradient gradient(frame.topLeft(), frame.topLeft() + QPointF(200,200));
+    stops << QGradientStop(0.0, QColor(60, 60,  60));
+    stops << QGradientStop(frame.height()/2/frame.height(), QColor(102, 176, 54));
+
+    //stops << QGradientStop(((frame.height() + h)/2 )/frame.height(), QColor(157, 195,  55));
+    stops << QGradientStop(1.0, QColor(215, 215, 215));
+    gradient.setStops(stops);
+    painter->setBrush(QBrush(gradient));
+    painter->drawRoundedRect(frame, 10.0, 10.0);
+
+    // paint a rect around the pixmap (with gradient)
+    QPointF pixpos = frame.center() - (QPointF(w, h)/2);
+    QRectF innerFrame(pixpos, QSizeF(w, h));
+    innerFrame.adjust(-4, -4, +4, +4);
+    gradient.setStart(innerFrame.topLeft());
+    gradient.setFinalStop(innerFrame.bottomRight());
+    stops.clear();
+    stops << QGradientStop(0.0, QColor(215, 255, 200));
+    stops << QGradientStop(0.5, QColor(102, 176, 54));
+    stops << QGradientStop(1.0, QColor(0, 0,  0));
+    gradient.setStops(stops);
+    painter->setBrush(QBrush(gradient));
+    painter->drawRoundedRect(innerFrame, 10.0, 10.0);
+    painter->drawPixmap(pixpos, *pix);
+}
+//! [2]
diff --git a/examples/graphicsview/basicgraphicslayouts/layoutitem.h b/examples/graphicsview/basicgraphicslayouts/layoutitem.h
new file mode 100644
index 0000000000..cbda636d19
--- /dev/null
+++ b/examples/graphicsview/basicgraphicslayouts/layoutitem.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef LAYOUTITEM_H
+#define LAYOUTITEM_H
+#include <QtGui>
+
+//! [0]
+class LayoutItem : public QGraphicsWidget
+{
+    Q_OBJECT
+
+public:
+    LayoutItem(QGraphicsItem *parent = 0);
+    ~LayoutItem();
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+        QWidget *widget = 0);
+
+private:
+    QPixmap *pix;
+};
+//! [0]
+
+#endif
diff --git a/examples/graphicsview/basicgraphicslayouts/main.cpp b/examples/graphicsview/basicgraphicslayouts/main.cpp
new file mode 100644
index 0000000000..720f6ff491
--- /dev/null
+++ b/examples/graphicsview/basicgraphicslayouts/main.cpp
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    QGraphicsScene scene;
+
+    Window *window = new Window;
+    scene.addItem(window);
+    QGraphicsView view(&scene);
+    view.resize(600, 600);
+    view.show();
+
+    return app.exec();
+}
diff --git a/examples/graphicsview/basicgraphicslayouts/window.cpp b/examples/graphicsview/basicgraphicslayouts/window.cpp
new file mode 100644
index 0000000000..afa98ebb14
--- /dev/null
+++ b/examples/graphicsview/basicgraphicslayouts/window.cpp
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "window.h"
+#include "layoutitem.h"
+
+Window::Window(QGraphicsWidget *parent) : QGraphicsWidget(parent, Qt::Window)
+{
+//! [0]
+    QGraphicsLinearLayout *windowLayout = new QGraphicsLinearLayout(Qt::Vertical);
+    QGraphicsLinearLayout *linear = new QGraphicsLinearLayout(windowLayout);
+    LayoutItem *item = new LayoutItem;
+    linear->addItem(item);
+    linear->setStretchFactor(item, 1);
+//! [0]
+
+//! [1]
+    item = new LayoutItem;
+    linear->addItem(item);
+    linear->setStretchFactor(item, 3);
+    windowLayout->addItem(linear);
+//! [1]
+
+//! [2]
+    QGraphicsGridLayout *grid = new QGraphicsGridLayout(windowLayout);
+    item = new LayoutItem;
+    grid->addItem(item, 0, 0, 4, 1);
+    item = new LayoutItem;
+    item->setMaximumHeight(item->minimumHeight());
+    grid->addItem(item, 0, 1, 2, 1, Qt::AlignVCenter);
+    item = new LayoutItem;
+    item->setMaximumHeight(item->minimumHeight());
+    grid->addItem(item, 2, 1, 2, 1, Qt::AlignVCenter);
+    item = new LayoutItem;
+    grid->addItem(item, 0, 2);
+    item = new LayoutItem;
+    grid->addItem(item, 1, 2);
+    item = new LayoutItem;
+    grid->addItem(item, 2, 2);
+    item = new LayoutItem;
+    grid->addItem(item, 3, 2);
+    windowLayout->addItem(grid);
+//! [2]
+
+//! [3]
+    setLayout(windowLayout);
+    setWindowTitle(tr("Basic Graphics Layouts Example"));
+//! [3]
+
+}
+
+
+
diff --git a/examples/graphicsview/basicgraphicslayouts/window.h b/examples/graphicsview/basicgraphicslayouts/window.h
new file mode 100644
index 0000000000..0ecde8ae02
--- /dev/null
+++ b/examples/graphicsview/basicgraphicslayouts/window.h
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QtGui/QGraphicsWidget>
+
+//! [0]
+class Window : public QGraphicsWidget {
+    Q_OBJECT
+
+public:
+    Window(QGraphicsWidget *parent = 0);
+
+};
+//! [0]
+
+#endif  //WINDOW_H
+
diff --git a/examples/graphicsview/collidingmice/collidingmice.pro b/examples/graphicsview/collidingmice/collidingmice.pro
new file mode 100644
index 0000000000..77543b5c85
--- /dev/null
+++ b/examples/graphicsview/collidingmice/collidingmice.pro
@@ -0,0 +1,14 @@
+HEADERS += \
+	mouse.h
+SOURCES += \
+	main.cpp \
+        mouse.cpp
+
+RESOURCES += \
+	mice.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/collidingmice
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS collidingmice.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/collidingmice
+INSTALLS += target sources
diff --git a/examples/graphicsview/collidingmice/images/cheese.jpg b/examples/graphicsview/collidingmice/images/cheese.jpg
new file mode 100644
index 0000000000..dea5795fd0
--- /dev/null
+++ b/examples/graphicsview/collidingmice/images/cheese.jpg
diff --git a/examples/graphicsview/collidingmice/main.cpp b/examples/graphicsview/collidingmice/main.cpp
new file mode 100644
index 0000000000..4a44481b90
--- /dev/null
+++ b/examples/graphicsview/collidingmice/main.cpp
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mouse.h"
+
+#include <QtGui>
+
+#include <math.h>
+
+static const int MouseCount = 7;
+
+//! [0]
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
+//! [0]
+
+//! [1]
+    QGraphicsScene scene;
+    scene.setSceneRect(-300, -300, 600, 600);
+//! [1] //! [2]
+    scene.setItemIndexMethod(QGraphicsScene::NoIndex);
+//! [2]
+
+//! [3]
+    for (int i = 0; i < MouseCount; ++i) {
+        Mouse *mouse = new Mouse;
+        mouse->setPos(::sin((i * 6.28) / MouseCount) * 200,
+                      ::cos((i * 6.28) / MouseCount) * 200);
+        scene.addItem(mouse);
+    }
+//! [3]
+
+//! [4]
+    QGraphicsView view(&scene);
+    view.setRenderHint(QPainter::Antialiasing);
+    view.setBackgroundBrush(QPixmap(":/images/cheese.jpg"));
+//! [4] //! [5]
+    view.setCacheMode(QGraphicsView::CacheBackground);
+    view.setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
+    view.setDragMode(QGraphicsView::ScrollHandDrag);
+//! [5] //! [6]
+    view.setWindowTitle(QT_TRANSLATE_NOOP(QGraphicsView, "Colliding Mice"));
+    view.resize(400, 300);
+    view.show();
+
+    return app.exec();
+}
+//! [6]
diff --git a/examples/graphicsview/collidingmice/mice.qrc b/examples/graphicsview/collidingmice/mice.qrc
new file mode 100644
index 0000000000..accdb4d0a6
--- /dev/null
+++ b/examples/graphicsview/collidingmice/mice.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/" >
+        <file>images/cheese.jpg</file>
+    </qresource>
+</RCC>
diff --git a/examples/graphicsview/collidingmice/mouse.cpp b/examples/graphicsview/collidingmice/mouse.cpp
new file mode 100644
index 0000000000..1d10574631
--- /dev/null
+++ b/examples/graphicsview/collidingmice/mouse.cpp
@@ -0,0 +1,200 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mouse.h"
+
+#include <QGraphicsScene>
+#include <QPainter>
+#include <QStyleOption>
+
+#include <math.h>
+
+static const double Pi = 3.14159265358979323846264338327950288419717;
+static double TwoPi = 2.0 * Pi;
+
+static qreal normalizeAngle(qreal angle)
+{
+    while (angle < 0)
+        angle += TwoPi;
+    while (angle > TwoPi)
+        angle -= TwoPi;
+    return angle;
+}
+
+//! [0]
+Mouse::Mouse()
+    : angle(0), speed(0), mouseEyeDirection(0),
+      color(qrand() % 256, qrand() % 256, qrand() % 256)
+{
+    rotate(qrand() % (360 * 16));
+    startTimer(1000 / 33);
+}
+//! [0]
+
+//! [1]
+QRectF Mouse::boundingRect() const
+{
+    qreal adjust = 0.5;
+    return QRectF(-18 - adjust, -22 - adjust,
+                  36 + adjust, 60 + adjust);
+}
+//! [1]
+
+//! [2]
+QPainterPath Mouse::shape() const
+{
+    QPainterPath path;
+    path.addRect(-10, -20, 20, 40);
+    return path;
+}
+//! [2]
+
+//! [3]
+void Mouse::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
+{
+    // Body
+    painter->setBrush(color);
+    painter->drawEllipse(-10, -20, 20, 40);
+
+    // Eyes
+    painter->setBrush(Qt::white);
+    painter->drawEllipse(-10, -17, 8, 8);
+    painter->drawEllipse(2, -17, 8, 8);
+
+    // Nose
+    painter->setBrush(Qt::black);
+    painter->drawEllipse(QRectF(-2, -22, 4, 4));
+
+    // Pupils
+    painter->drawEllipse(QRectF(-8.0 + mouseEyeDirection, -17, 4, 4));
+    painter->drawEllipse(QRectF(4.0 + mouseEyeDirection, -17, 4, 4));
+
+    // Ears
+    painter->setBrush(scene()->collidingItems(this).isEmpty() ? Qt::darkYellow : Qt::red);
+    painter->drawEllipse(-17, -12, 16, 16);
+    painter->drawEllipse(1, -12, 16, 16);
+
+    // Tail
+    QPainterPath path(QPointF(0, 20));
+    path.cubicTo(-5, 22, -5, 22, 0, 25);
+    path.cubicTo(5, 27, 5, 32, 0, 30);
+    path.cubicTo(-5, 32, -5, 42, 0, 35);
+    painter->setBrush(Qt::NoBrush);
+    painter->drawPath(path);
+}
+//! [3]
+
+//! [4]
+void Mouse::timerEvent(QTimerEvent *)
+{
+//! [4]
+    // Don't move too far away
+//! [5]
+    QLineF lineToCenter(QPointF(0, 0), mapFromScene(0, 0));
+    if (lineToCenter.length() > 150) {
+        qreal angleToCenter = ::acos(lineToCenter.dx() / lineToCenter.length());
+        if (lineToCenter.dy() < 0)
+            angleToCenter = TwoPi - angleToCenter;
+        angleToCenter = normalizeAngle((Pi - angleToCenter) + Pi / 2);
+
+        if (angleToCenter < Pi && angleToCenter > Pi / 4) {
+            // Rotate left
+            angle += (angle < -Pi / 2) ? 0.25 : -0.25;
+        } else if (angleToCenter >= Pi && angleToCenter < (Pi + Pi / 2 + Pi / 4)) {
+            // Rotate right
+            angle += (angle < Pi / 2) ? 0.25 : -0.25;
+        }
+    } else if (::sin(angle) < 0) {
+        angle += 0.25;
+    } else if (::sin(angle) > 0) {
+        angle -= 0.25;
+//! [5] //! [6]
+    }
+//! [6]
+
+    // Try not to crash with any other mice
+//! [7]
+    QList<QGraphicsItem *> dangerMice = scene()->items(QPolygonF()
+                                                       << mapToScene(0, 0)
+                                                       << mapToScene(-30, -50)
+                                                       << mapToScene(30, -50));
+    foreach (QGraphicsItem *item, dangerMice) {
+        if (item == this)
+            continue;
+        
+        QLineF lineToMouse(QPointF(0, 0), mapFromItem(item, 0, 0));
+        qreal angleToMouse = ::acos(lineToMouse.dx() / lineToMouse.length());
+        if (lineToMouse.dy() < 0)
+            angleToMouse = TwoPi - angleToMouse;
+        angleToMouse = normalizeAngle((Pi - angleToMouse) + Pi / 2);
+
+        if (angleToMouse >= 0 && angleToMouse < Pi / 2) {
+            // Rotate right
+            angle += 0.5;
+        } else if (angleToMouse <= TwoPi && angleToMouse > (TwoPi - Pi / 2)) {
+            // Rotate left
+            angle -= 0.5;
+//! [7] //! [8]
+        }
+//! [8] //! [9]
+    }
+//! [9]
+
+    // Add some random movement
+//! [10]
+    if (dangerMice.size() > 1 && (qrand() % 10) == 0) {
+        if (qrand() % 1)
+            angle += (qrand() % 100) / 500.0;
+        else
+            angle -= (qrand() % 100) / 500.0;
+    }
+//! [10]
+
+//! [11]
+    speed += (-50 + qrand() % 100) / 100.0;
+
+    qreal dx = ::sin(angle) * 10;
+    mouseEyeDirection = (qAbs(dx / 5) < 1) ? 0 : dx / 5;
+
+    rotate(dx);
+    setPos(mapToParent(0, -(3 + sin(speed) * 3)));
+}
+//! [11]
diff --git a/examples/graphicsview/collidingmice/mouse.h b/examples/graphicsview/collidingmice/mouse.h
new file mode 100644
index 0000000000..832ea53704
--- /dev/null
+++ b/examples/graphicsview/collidingmice/mouse.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MOUSE_H
+#define MOUSE_H
+
+#include <QGraphicsItem>
+#include <QObject>
+
+//! [0]
+class Mouse : public QObject, public QGraphicsItem
+{
+    Q_OBJECT
+
+public:
+    Mouse();
+
+    QRectF boundingRect() const;
+    QPainterPath shape() const;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+               QWidget *widget);
+
+protected:
+    void timerEvent(QTimerEvent *event);
+
+private:
+    qreal angle;
+    qreal speed;
+    qreal mouseEyeDirection;
+    QColor color;
+};
+//! [0]
+
+#endif
diff --git a/examples/graphicsview/diagramscene/arrow.cpp b/examples/graphicsview/diagramscene/arrow.cpp
new file mode 100644
index 0000000000..0bc2ca8a70
--- /dev/null
+++ b/examples/graphicsview/diagramscene/arrow.cpp
@@ -0,0 +1,147 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "arrow.h"
+#include <math.h>
+
+const qreal Pi = 3.14;
+
+//! [0]
+Arrow::Arrow(DiagramItem *startItem, DiagramItem *endItem,
+         QGraphicsItem *parent, QGraphicsScene *scene)
+    : QGraphicsLineItem(parent, scene)
+{
+    myStartItem = startItem;
+    myEndItem = endItem;
+    setFlag(QGraphicsItem::ItemIsSelectable, true);
+    myColor = Qt::black;
+    setPen(QPen(myColor, 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+}
+//! [0]
+
+//! [1]
+QRectF Arrow::boundingRect() const
+{
+    qreal extra = (pen().width() + 20) / 2.0;
+
+    return QRectF(line().p1(), QSizeF(line().p2().x() - line().p1().x(),
+                                      line().p2().y() - line().p1().y()))
+        .normalized()
+        .adjusted(-extra, -extra, extra, extra);
+}
+//! [1]
+
+//! [2]
+QPainterPath Arrow::shape() const
+{
+    QPainterPath path = QGraphicsLineItem::shape();
+    path.addPolygon(arrowHead);
+    return path;
+}
+//! [2]
+
+//! [3]
+void Arrow::updatePosition()
+{
+    QLineF line(mapFromItem(myStartItem, 0, 0), mapFromItem(myEndItem, 0, 0));
+    setLine(line);
+}
+//! [3]
+
+//! [4]
+void Arrow::paint(QPainter *painter, const QStyleOptionGraphicsItem *,
+          QWidget *)
+{
+    if (myStartItem->collidesWithItem(myEndItem))
+        return;
+
+    QPen myPen = pen();
+    myPen.setColor(myColor);
+    qreal arrowSize = 20;
+    painter->setPen(myPen);
+    painter->setBrush(myColor);
+//! [4] //! [5]
+
+    QLineF centerLine(myStartItem->pos(), myEndItem->pos());
+    QPolygonF endPolygon = myEndItem->polygon();
+    QPointF p1 = endPolygon.first() + myEndItem->pos();
+    QPointF p2;
+    QPointF intersectPoint;
+    QLineF polyLine;
+    for (int i = 1; i < endPolygon.count(); ++i) {
+    p2 = endPolygon.at(i) + myEndItem->pos();
+    polyLine = QLineF(p1, p2);
+    QLineF::IntersectType intersectType =
+        polyLine.intersect(centerLine, &intersectPoint);
+    if (intersectType == QLineF::BoundedIntersection)
+        break;
+        p1 = p2;
+    }
+
+    setLine(QLineF(intersectPoint, myStartItem->pos()));
+//! [5] //! [6]
+
+    double angle = ::acos(line().dx() / line().length());
+    if (line().dy() >= 0)
+        angle = (Pi * 2) - angle;
+
+        QPointF arrowP1 = line().p1() + QPointF(sin(angle + Pi / 3) * arrowSize,
+                                        cos(angle + Pi / 3) * arrowSize);
+        QPointF arrowP2 = line().p1() + QPointF(sin(angle + Pi - Pi / 3) * arrowSize,
+                                        cos(angle + Pi - Pi / 3) * arrowSize);
+
+        arrowHead.clear();
+        arrowHead << line().p1() << arrowP1 << arrowP2;
+//! [6] //! [7]
+        painter->drawLine(line());
+        painter->drawPolygon(arrowHead);
+        if (isSelected()) {
+            painter->setPen(QPen(myColor, 1, Qt::DashLine));
+        QLineF myLine = line();
+        myLine.translate(0, 4.0);
+        painter->drawLine(myLine);
+        myLine.translate(0,-8.0);
+        painter->drawLine(myLine);
+    }
+}
+//! [7]
diff --git a/examples/graphicsview/diagramscene/arrow.h b/examples/graphicsview/diagramscene/arrow.h
new file mode 100644
index 0000000000..f624eb1c0b
--- /dev/null
+++ b/examples/graphicsview/diagramscene/arrow.h
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ARROW_H
+#define ARROW_H
+
+#include <QGraphicsLineItem>
+
+#include "diagramitem.h"
+
+QT_BEGIN_NAMESPACE
+class QGraphicsPolygonItem;
+class QGraphicsLineItem;
+class QGraphicsScene;
+class QRectF;
+class QGraphicsSceneMouseEvent;
+class QPainterPath;
+QT_END_NAMESPACE
+
+//! [0]
+class Arrow : public QGraphicsLineItem
+{
+public:
+    enum { Type = UserType + 4 };
+
+    Arrow(DiagramItem *startItem, DiagramItem *endItem,
+      QGraphicsItem *parent = 0, QGraphicsScene *scene = 0);
+
+    int type() const
+        { return Type; }
+    QRectF boundingRect() const;
+    QPainterPath shape() const;
+    void setColor(const QColor &color)
+        { myColor = color; }
+    DiagramItem *startItem() const
+        { return myStartItem; }
+    DiagramItem *endItem() const
+        { return myEndItem; }
+
+
+public slots:
+    void updatePosition();
+
+protected:
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+               QWidget *widget = 0);
+
+private:
+    DiagramItem *myStartItem;
+    DiagramItem *myEndItem;
+    QColor myColor;
+    QPolygonF arrowHead;
+};
+//! [0]
+
+#endif
diff --git a/examples/graphicsview/diagramscene/diagramitem.cpp b/examples/graphicsview/diagramscene/diagramitem.cpp
new file mode 100644
index 0000000000..b31f6b5c91
--- /dev/null
+++ b/examples/graphicsview/diagramscene/diagramitem.cpp
@@ -0,0 +1,152 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "diagramitem.h"
+#include "arrow.h"
+
+//! [0]
+DiagramItem::DiagramItem(DiagramType diagramType, QMenu *contextMenu,
+             QGraphicsItem *parent, QGraphicsScene *scene)
+    : QGraphicsPolygonItem(parent, scene)
+{
+    myDiagramType = diagramType;
+    myContextMenu = contextMenu;
+
+    QPainterPath path;
+    switch (myDiagramType) {
+        case StartEnd:
+            path.moveTo(200, 50);
+            path.arcTo(150, 0, 50, 50, 0, 90);
+            path.arcTo(50, 0, 50, 50, 90, 90);
+            path.arcTo(50, 50, 50, 50, 180, 90);
+            path.arcTo(150, 50, 50, 50, 270, 90);
+            path.lineTo(200, 25);
+            myPolygon = path.toFillPolygon();
+            break;
+        case Conditional:
+            myPolygon << QPointF(-100, 0) << QPointF(0, 100)
+                      << QPointF(100, 0) << QPointF(0, -100)
+                      << QPointF(-100, 0);
+            break;
+        case Step:
+            myPolygon << QPointF(-100, -100) << QPointF(100, -100)
+                      << QPointF(100, 100) << QPointF(-100, 100)
+                      << QPointF(-100, -100);
+            break;
+        default:
+            myPolygon << QPointF(-120, -80) << QPointF(-70, 80)
+                      << QPointF(120, 80) << QPointF(70, -80)
+                      << QPointF(-120, -80);
+            break;
+    }
+    setPolygon(myPolygon);
+    setFlag(QGraphicsItem::ItemIsMovable, true);
+    setFlag(QGraphicsItem::ItemIsSelectable, true);
+}
+//! [0]
+
+//! [1]
+void DiagramItem::removeArrow(Arrow *arrow)
+{
+    int index = arrows.indexOf(arrow);
+
+    if (index != -1)
+        arrows.removeAt(index);
+}
+//! [1]
+
+//! [2]
+void DiagramItem::removeArrows()
+{
+    foreach (Arrow *arrow, arrows) {
+        arrow->startItem()->removeArrow(arrow);
+        arrow->endItem()->removeArrow(arrow);
+        scene()->removeItem(arrow);
+        delete arrow;
+    }
+}
+//! [2]
+
+//! [3]
+void DiagramItem::addArrow(Arrow *arrow)
+{
+    arrows.append(arrow);
+}
+//! [3]
+
+//! [4]
+QPixmap DiagramItem::image() const
+{
+    QPixmap pixmap(250, 250);
+    pixmap.fill(Qt::transparent);
+    QPainter painter(&pixmap);
+    painter.setPen(QPen(Qt::black, 8));
+    painter.translate(125, 125);
+    painter.drawPolyline(myPolygon);
+
+    return pixmap;
+}
+//! [4]
+
+//! [5]
+void DiagramItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
+{
+    scene()->clearSelection();
+    setSelected(true);
+    myContextMenu->exec(event->screenPos());
+}
+//! [5]
+
+//! [6]
+QVariant DiagramItem::itemChange(GraphicsItemChange change,
+                     const QVariant &value)
+{
+    if (change == QGraphicsItem::ItemPositionChange) {
+        foreach (Arrow *arrow, arrows) {
+            arrow->updatePosition();
+        }
+    }
+
+    return value;
+}
+//! [6]
diff --git a/examples/graphicsview/diagramscene/diagramitem.h b/examples/graphicsview/diagramscene/diagramitem.h
new file mode 100644
index 0000000000..5409f20cc9
--- /dev/null
+++ b/examples/graphicsview/diagramscene/diagramitem.h
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DIAGRAMITEM_H
+#define DIAGRAMITEM_H
+
+#include <QGraphicsPixmapItem>
+#include <QList>
+
+QT_BEGIN_NAMESPACE
+class QPixmap;
+class QGraphicsItem;
+class QGraphicsScene;
+class QTextEdit;
+class QGraphicsSceneMouseEvent;
+class QMenu;
+class QGraphicsSceneContextMenuEvent;
+class QPainter;
+class QStyleOptionGraphicsItem;
+class QWidget;
+class QPolygonF;
+QT_END_NAMESPACE
+
+class Arrow;
+
+//! [0]
+class DiagramItem : public QGraphicsPolygonItem
+{
+public:
+    enum { Type = UserType + 15 };
+    enum DiagramType { Step, Conditional, StartEnd, Io };
+
+    DiagramItem(DiagramType diagramType, QMenu *contextMenu,
+        QGraphicsItem *parent = 0, QGraphicsScene *scene = 0);
+
+    void removeArrow(Arrow *arrow);
+    void removeArrows();
+    DiagramType diagramType() const
+        { return myDiagramType; }
+    QPolygonF polygon() const
+        { return myPolygon; }
+    void addArrow(Arrow *arrow);
+    QPixmap image() const;
+    int type() const
+        { return Type;}
+
+protected:
+    void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);
+    QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+
+private:
+    DiagramType myDiagramType;
+    QPolygonF myPolygon;
+    QMenu *myContextMenu;
+    QList<Arrow *> arrows;
+};
+//! [0]
+
+#endif
diff --git a/examples/graphicsview/diagramscene/diagramscene.cpp b/examples/graphicsview/diagramscene/diagramscene.cpp
new file mode 100644
index 0000000000..8065ec551c
--- /dev/null
+++ b/examples/graphicsview/diagramscene/diagramscene.cpp
@@ -0,0 +1,241 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "diagramscene.h"
+#include "arrow.h"
+
+//! [0]
+DiagramScene::DiagramScene(QMenu *itemMenu, QObject *parent)
+    : QGraphicsScene(parent)
+{
+    myItemMenu = itemMenu;
+    myMode = MoveItem;
+    myItemType = DiagramItem::Step;
+    line = 0;
+    textItem = 0;
+    myItemColor = Qt::white;
+    myTextColor = Qt::black;
+    myLineColor = Qt::black;
+}
+//! [0]
+
+//! [1]
+void DiagramScene::setLineColor(const QColor &color)
+{
+    myLineColor = color;
+    if (isItemChange(Arrow::Type)) {
+        Arrow *item =
+            qgraphicsitem_cast<Arrow *>(selectedItems().first());
+        item->setColor(myLineColor);
+        update();
+    }
+}
+//! [1]
+
+//! [2]
+void DiagramScene::setTextColor(const QColor &color)
+{
+    myTextColor = color;
+    if (isItemChange(DiagramTextItem::Type)) {
+        DiagramTextItem *item =
+            qgraphicsitem_cast<DiagramTextItem *>(selectedItems().first());
+        item->setDefaultTextColor(myTextColor);
+    }
+}
+//! [2]
+
+//! [3]
+void DiagramScene::setItemColor(const QColor &color)
+{
+    myItemColor = color;
+    if (isItemChange(DiagramItem::Type)) {
+        DiagramItem *item =
+            qgraphicsitem_cast<DiagramItem *>(selectedItems().first());
+        item->setBrush(myItemColor);
+    }
+}
+//! [3]
+
+//! [4]
+void DiagramScene::setFont(const QFont &font)
+{
+    myFont = font;
+
+    if (isItemChange(DiagramTextItem::Type)) {
+        QGraphicsTextItem *item =
+            qgraphicsitem_cast<DiagramTextItem *>(selectedItems().first());
+        //At this point the selection can change so the first selected item might not be a DiagramTextItem
+        if (item)
+            item->setFont(myFont);
+    }
+}
+//! [4]
+
+void DiagramScene::setMode(Mode mode)
+{
+    myMode = mode;
+}
+
+void DiagramScene::setItemType(DiagramItem::DiagramType type)
+{
+    myItemType = type;
+}
+
+//! [5]
+void DiagramScene::editorLostFocus(DiagramTextItem *item)
+{
+    QTextCursor cursor = item->textCursor();
+    cursor.clearSelection();
+    item->setTextCursor(cursor);
+
+    if (item->toPlainText().isEmpty()) {
+        removeItem(item);
+        item->deleteLater();
+    }
+}
+//! [5]
+
+//! [6]
+void DiagramScene::mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent)
+{
+    if (mouseEvent->button() != Qt::LeftButton)
+        return;
+
+    DiagramItem *item;
+    switch (myMode) {
+        case InsertItem:
+            item = new DiagramItem(myItemType, myItemMenu);
+            item->setBrush(myItemColor);
+            addItem(item);
+            item->setPos(mouseEvent->scenePos());
+            emit itemInserted(item);
+            break;
+//! [6] //! [7]
+        case InsertLine:
+            line = new QGraphicsLineItem(QLineF(mouseEvent->scenePos(),
+                                        mouseEvent->scenePos()));
+            line->setPen(QPen(myLineColor, 2));
+            addItem(line);
+            break;
+//! [7] //! [8]
+        case InsertText:
+            textItem = new DiagramTextItem();
+            textItem->setFont(myFont);
+            textItem->setTextInteractionFlags(Qt::TextEditorInteraction);
+            textItem->setZValue(1000.0);
+            connect(textItem, SIGNAL(lostFocus(DiagramTextItem *)),
+                    this, SLOT(editorLostFocus(DiagramTextItem *)));
+            connect(textItem, SIGNAL(selectedChange(QGraphicsItem *)),
+                    this, SIGNAL(itemSelected(QGraphicsItem *)));
+            addItem(textItem);
+            textItem->setDefaultTextColor(myTextColor);
+            textItem->setPos(mouseEvent->scenePos());
+            emit textInserted(textItem);
+//! [8] //! [9]
+    default:
+        ;
+    }
+    QGraphicsScene::mousePressEvent(mouseEvent);
+}
+//! [9]
+
+//! [10]
+void DiagramScene::mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent)
+{
+    if (myMode == InsertLine && line != 0) {
+        QLineF newLine(line->line().p1(), mouseEvent->scenePos());
+        line->setLine(newLine);
+    } else if (myMode == MoveItem) {
+        QGraphicsScene::mouseMoveEvent(mouseEvent);
+    }
+}
+//! [10]
+
+//! [11]
+void DiagramScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent)
+{
+    if (line != 0 && myMode == InsertLine) {
+        QList<QGraphicsItem *> startItems = items(line->line().p1());
+        if (startItems.count() && startItems.first() == line)
+            startItems.removeFirst();
+        QList<QGraphicsItem *> endItems = items(line->line().p2());
+        if (endItems.count() && endItems.first() == line)
+            endItems.removeFirst();
+
+        removeItem(line);
+        delete line;
+//! [11] //! [12]
+
+        if (startItems.count() > 0 && endItems.count() > 0 &&
+            startItems.first()->type() == DiagramItem::Type &&
+            endItems.first()->type() == DiagramItem::Type &&
+            startItems.first() != endItems.first()) {
+            DiagramItem *startItem =
+                qgraphicsitem_cast<DiagramItem *>(startItems.first());
+            DiagramItem *endItem =
+                qgraphicsitem_cast<DiagramItem *>(endItems.first());
+            Arrow *arrow = new Arrow(startItem, endItem);
+            arrow->setColor(myLineColor);
+            startItem->addArrow(arrow);
+            endItem->addArrow(arrow);
+            arrow->setZValue(-1000.0);
+            addItem(arrow);
+            arrow->updatePosition();
+        }
+    }
+//! [12] //! [13]
+    line = 0;
+    QGraphicsScene::mouseReleaseEvent(mouseEvent);
+}
+//! [13]
+
+//! [14]
+bool DiagramScene::isItemChange(int type)
+{
+    foreach (QGraphicsItem *item, selectedItems()) {
+        if (item->type() == type)
+            return true;
+    }
+    return false;
+}
+//! [14]
diff --git a/examples/graphicsview/diagramscene/diagramscene.h b/examples/graphicsview/diagramscene/diagramscene.h
new file mode 100644
index 0000000000..e33ee4f075
--- /dev/null
+++ b/examples/graphicsview/diagramscene/diagramscene.h
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DIAGRAMSCENE_H
+#define DIAGRAMSCENE_H
+
+#include <QGraphicsScene>
+#include "diagramitem.h"
+#include "diagramtextitem.h"
+
+QT_BEGIN_NAMESPACE
+class QGraphicsSceneMouseEvent;
+class QMenu;
+class QPointF;
+class QGraphicsLineItem;
+class QFont;
+class QGraphicsTextItem;
+class QColor;
+QT_END_NAMESPACE
+
+//! [0]
+class DiagramScene : public QGraphicsScene
+{
+    Q_OBJECT
+
+public:
+    enum Mode { InsertItem, InsertLine, InsertText, MoveItem };
+
+    DiagramScene(QMenu *itemMenu, QObject *parent = 0);
+    QFont font() const
+        { return myFont; }
+    QColor textColor() const
+        { return myTextColor; }
+    QColor itemColor() const
+        { return myItemColor; }
+    QColor lineColor() const
+        { return myLineColor; }
+    void setLineColor(const QColor &color);
+    void setTextColor(const QColor &color);
+    void setItemColor(const QColor &color);
+    void setFont(const QFont &font);
+
+public slots:
+    void setMode(Mode mode);
+    void setItemType(DiagramItem::DiagramType type);
+    void editorLostFocus(DiagramTextItem *item);
+
+signals:
+    void itemInserted(DiagramItem *item);
+    void textInserted(QGraphicsTextItem *item);
+    void itemSelected(QGraphicsItem *item);
+
+protected:
+    void mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent);
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent);
+
+private:
+    bool isItemChange(int type);
+
+    DiagramItem::DiagramType myItemType;
+    QMenu *myItemMenu;
+    Mode myMode;
+    bool leftButtonDown;
+    QPointF startPoint;
+    QGraphicsLineItem *line;
+    QFont myFont;
+    DiagramTextItem *textItem;
+    QColor myTextColor;
+    QColor myItemColor;
+    QColor myLineColor;
+};
+//! [0]
+
+#endif
diff --git a/examples/graphicsview/diagramscene/diagramscene.pro b/examples/graphicsview/diagramscene/diagramscene.pro
new file mode 100644
index 0000000000..fe261bd80f
--- /dev/null
+++ b/examples/graphicsview/diagramscene/diagramscene.pro
@@ -0,0 +1,20 @@
+HEADERS	    =   mainwindow.h \
+		diagramitem.h \
+		diagramscene.h \
+		arrow.h \
+		diagramtextitem.h
+SOURCES	    =   mainwindow.cpp \
+		diagramitem.cpp \
+		main.cpp \
+		arrow.cpp \
+		diagramtextitem.cpp \
+		diagramscene.cpp
+RESOURCES   =	diagramscene.qrc
+
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/diagramscene
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS diagramscene.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/diagramscene
+INSTALLS += target sources
+
diff --git a/examples/graphicsview/diagramscene/diagramscene.qrc b/examples/graphicsview/diagramscene/diagramscene.qrc
new file mode 100644
index 0000000000..a11158402f
--- /dev/null
+++ b/examples/graphicsview/diagramscene/diagramscene.qrc
@@ -0,0 +1,20 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>images/pointer.png</file>
+    <file>images/linepointer.png</file>
+    <file>images/textpointer.png</file>
+    <file>images/bold.png</file>
+    <file>images/italic.png</file>
+    <file>images/underline.png</file>
+    <file>images/floodfill.png</file>
+    <file>images/bringtofront.png</file>
+    <file>images/delete.png</file>
+    <file>images/sendtoback.png</file>
+    <file>images/linecolor.png</file>
+    <file>images/background1.png</file>
+    <file>images/background2.png</file>
+    <file>images/background3.png</file>
+    <file>images/background4.png</file>
+</qresource>
+</RCC>
+
diff --git a/examples/graphicsview/diagramscene/diagramtextitem.cpp b/examples/graphicsview/diagramscene/diagramtextitem.cpp
new file mode 100644
index 0000000000..008b70fd46
--- /dev/null
+++ b/examples/graphicsview/diagramscene/diagramtextitem.cpp
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "diagramtextitem.h"
+#include "diagramscene.h"
+
+//! [0]
+DiagramTextItem::DiagramTextItem(QGraphicsItem *parent, QGraphicsScene *scene)
+    : QGraphicsTextItem(parent, scene)
+{
+    setFlag(QGraphicsItem::ItemIsMovable);
+    setFlag(QGraphicsItem::ItemIsSelectable);
+}
+//! [0]
+
+//! [1]
+QVariant DiagramTextItem::itemChange(GraphicsItemChange change,
+                     const QVariant &value)
+{
+    if (change == QGraphicsItem::ItemSelectedHasChanged)
+        emit selectedChange(this);
+    return value;
+}
+//! [1]
+
+//! [2]
+void DiagramTextItem::focusOutEvent(QFocusEvent *event)
+{
+    setTextInteractionFlags(Qt::NoTextInteraction);
+    emit lostFocus(this);
+    QGraphicsTextItem::focusOutEvent(event);
+}
+//! [2]
+
+//! [5]
+void DiagramTextItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (textInteractionFlags() == Qt::NoTextInteraction)
+        setTextInteractionFlags(Qt::TextEditorInteraction);
+    QGraphicsTextItem::mouseDoubleClickEvent(event);
+}
+//! [5]
diff --git a/examples/graphicsview/diagramscene/diagramtextitem.h b/examples/graphicsview/diagramscene/diagramtextitem.h
new file mode 100644
index 0000000000..6f0ddcbf0c
--- /dev/null
+++ b/examples/graphicsview/diagramscene/diagramtextitem.h
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DIAGRAMTEXTITEM_H
+#define DIAGRAMTEXTITEM_H
+
+#include <QGraphicsTextItem>
+#include <QPen>
+
+QT_BEGIN_NAMESPACE
+class QFocusEvent;
+class QGraphicsItem;
+class QGraphicsScene;
+class QGraphicsSceneMouseEvent;
+QT_END_NAMESPACE
+
+//! [0]
+class DiagramTextItem : public QGraphicsTextItem
+{
+    Q_OBJECT
+
+public:
+    enum { Type = UserType + 3 };
+
+    DiagramTextItem(QGraphicsItem *parent = 0, QGraphicsScene *scene = 0);
+
+    int type() const
+        { return Type; }
+
+signals:
+    void lostFocus(DiagramTextItem *item);
+    void selectedChange(QGraphicsItem *item);
+
+protected:
+    QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+    void focusOutEvent(QFocusEvent *event);
+    void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
+};
+//! [0]
+
+#endif
diff --git a/examples/graphicsview/diagramscene/images/background1.png b/examples/graphicsview/diagramscene/images/background1.png
new file mode 100644
index 0000000000..0f93c6bf42
--- /dev/null
+++ b/examples/graphicsview/diagramscene/images/background1.png
diff --git a/examples/graphicsview/diagramscene/images/background2.png b/examples/graphicsview/diagramscene/images/background2.png
new file mode 100644
index 0000000000..1e293db67a
--- /dev/null
+++ b/examples/graphicsview/diagramscene/images/background2.png
diff --git a/examples/graphicsview/diagramscene/images/background3.png b/examples/graphicsview/diagramscene/images/background3.png
new file mode 100644
index 0000000000..3db4f8ea5f
--- /dev/null
+++ b/examples/graphicsview/diagramscene/images/background3.png
diff --git a/examples/graphicsview/diagramscene/images/background4.png b/examples/graphicsview/diagramscene/images/background4.png
new file mode 100644
index 0000000000..9c1f3bfd77
--- /dev/null
+++ b/examples/graphicsview/diagramscene/images/background4.png
diff --git a/examples/graphicsview/diagramscene/images/bold.png b/examples/graphicsview/diagramscene/images/bold.png
new file mode 100644
index 0000000000..986e65e250
--- /dev/null
+++ b/examples/graphicsview/diagramscene/images/bold.png
diff --git a/examples/graphicsview/diagramscene/images/bringtofront.png b/examples/graphicsview/diagramscene/images/bringtofront.png
new file mode 100644
index 0000000000..bda27578a2
--- /dev/null
+++ b/examples/graphicsview/diagramscene/images/bringtofront.png
diff --git a/examples/graphicsview/diagramscene/images/delete.png b/examples/graphicsview/diagramscene/images/delete.png
new file mode 100644
index 0000000000..df2a147d24
--- /dev/null
+++ b/examples/graphicsview/diagramscene/images/delete.png
diff --git a/examples/graphicsview/diagramscene/images/floodfill.png b/examples/graphicsview/diagramscene/images/floodfill.png
new file mode 100644
index 0000000000..54c0dae237
--- /dev/null
+++ b/examples/graphicsview/diagramscene/images/floodfill.png
diff --git a/examples/graphicsview/diagramscene/images/italic.png b/examples/graphicsview/diagramscene/images/italic.png
new file mode 100644
index 0000000000..9a438b57ad
--- /dev/null
+++ b/examples/graphicsview/diagramscene/images/italic.png
diff --git a/examples/graphicsview/diagramscene/images/linecolor.png b/examples/graphicsview/diagramscene/images/linecolor.png
new file mode 100644
index 0000000000..98a821f27e
--- /dev/null
+++ b/examples/graphicsview/diagramscene/images/linecolor.png
diff --git a/examples/graphicsview/diagramscene/images/linepointer.png b/examples/graphicsview/diagramscene/images/linepointer.png
new file mode 100644
index 0000000000..66933d43b3
--- /dev/null
+++ b/examples/graphicsview/diagramscene/images/linepointer.png
diff --git a/examples/graphicsview/diagramscene/images/pointer.png b/examples/graphicsview/diagramscene/images/pointer.png
new file mode 100644
index 0000000000..0b0b0aa69d
--- /dev/null
+++ b/examples/graphicsview/diagramscene/images/pointer.png
diff --git a/examples/graphicsview/diagramscene/images/sendtoback.png b/examples/graphicsview/diagramscene/images/sendtoback.png
new file mode 100644
index 0000000000..5aa3b0a243
--- /dev/null
+++ b/examples/graphicsview/diagramscene/images/sendtoback.png
diff --git a/examples/graphicsview/diagramscene/images/textpointer.png b/examples/graphicsview/diagramscene/images/textpointer.png
new file mode 100644
index 0000000000..b25832cada
--- /dev/null
+++ b/examples/graphicsview/diagramscene/images/textpointer.png
diff --git a/examples/graphicsview/diagramscene/images/underline.png b/examples/graphicsview/diagramscene/images/underline.png
new file mode 100644
index 0000000000..9b8209f525
--- /dev/null
+++ b/examples/graphicsview/diagramscene/images/underline.png
diff --git a/examples/graphicsview/diagramscene/main.cpp b/examples/graphicsview/diagramscene/main.cpp
new file mode 100644
index 0000000000..4e0307484d
--- /dev/null
+++ b/examples/graphicsview/diagramscene/main.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argv, char *args[])
+{
+    Q_INIT_RESOURCE(diagramscene);
+
+    QApplication app(argv, args);
+    MainWindow mainWindow;
+    mainWindow.setGeometry(100, 100, 800, 500);
+    mainWindow.show();
+
+    return app.exec();
+}
diff --git a/examples/graphicsview/diagramscene/mainwindow.cpp b/examples/graphicsview/diagramscene/mainwindow.cpp
new file mode 100644
index 0000000000..b536a7af85
--- /dev/null
+++ b/examples/graphicsview/diagramscene/mainwindow.cpp
@@ -0,0 +1,651 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QLabel>
+
+#include "mainwindow.h"
+#include "diagramitem.h"
+#include "diagramscene.h"
+#include "diagramtextitem.h"
+
+const int InsertTextButton = 10;
+
+//! [0]
+MainWindow::MainWindow()
+{
+    createActions();
+    createToolBox();
+    createMenus();
+
+    scene = new DiagramScene(itemMenu);
+    scene->setSceneRect(QRectF(0, 0, 5000, 5000));
+    connect(scene, SIGNAL(itemInserted(DiagramItem *)),
+            this, SLOT(itemInserted(DiagramItem *)));
+    connect(scene, SIGNAL(textInserted(QGraphicsTextItem *)),
+        this, SLOT(textInserted(QGraphicsTextItem *)));
+    connect(scene, SIGNAL(itemSelected(QGraphicsItem *)),
+        this, SLOT(itemSelected(QGraphicsItem *)));
+    createToolbars();
+
+    QHBoxLayout *layout = new QHBoxLayout;
+    layout->addWidget(toolBox);
+    view = new QGraphicsView(scene);
+    layout->addWidget(view);
+
+    QWidget *widget = new QWidget;
+    widget->setLayout(layout);
+
+    setCentralWidget(widget);
+    setWindowTitle(tr("Diagramscene"));
+}
+//! [0]
+
+//! [1]
+void MainWindow::backgroundButtonGroupClicked(QAbstractButton *button)
+{
+    QList<QAbstractButton *> buttons = backgroundButtonGroup->buttons();
+    foreach (QAbstractButton *myButton, buttons) {
+    if (myButton != button)
+        button->setChecked(false);
+    }
+    QString text = button->text();
+    if (text == tr("Blue Grid"))
+        scene->setBackgroundBrush(QPixmap(":/images/background1.png"));
+    else if (text == tr("White Grid"))
+        scene->setBackgroundBrush(QPixmap(":/images/background2.png"));
+    else if (text == tr("Gray Grid"))
+        scene->setBackgroundBrush(QPixmap(":/images/background3.png"));
+    else
+        scene->setBackgroundBrush(QPixmap(":/images/background4.png"));
+
+    scene->update();
+    view->update();
+}
+//! [1]
+
+//! [2]
+void MainWindow::buttonGroupClicked(int id)
+{
+    QList<QAbstractButton *> buttons = buttonGroup->buttons();
+    foreach (QAbstractButton *button, buttons) {
+    if (buttonGroup->button(id) != button)
+        button->setChecked(false);
+    }
+    if (id == InsertTextButton) {
+        scene->setMode(DiagramScene::InsertText);
+    } else {
+        scene->setItemType(DiagramItem::DiagramType(id));
+        scene->setMode(DiagramScene::InsertItem);
+    }
+}
+//! [2]
+
+//! [3]
+void MainWindow::deleteItem()
+{
+    foreach (QGraphicsItem *item, scene->selectedItems()) {
+        if (item->type() == DiagramItem::Type) {
+            qgraphicsitem_cast<DiagramItem *>(item)->removeArrows();
+        }
+        scene->removeItem(item);
+    }
+}
+//! [3]
+
+//! [4]
+void MainWindow::pointerGroupClicked(int)
+{
+    scene->setMode(DiagramScene::Mode(pointerTypeGroup->checkedId()));
+}
+//! [4]
+
+//! [5]
+void MainWindow::bringToFront()
+{
+    if (scene->selectedItems().isEmpty())
+        return;
+
+    QGraphicsItem *selectedItem = scene->selectedItems().first();
+    QList<QGraphicsItem *> overlapItems = selectedItem->collidingItems();
+
+    qreal zValue = 0;
+    foreach (QGraphicsItem *item, overlapItems) {
+        if (item->zValue() >= zValue &&
+            item->type() == DiagramItem::Type)
+            zValue = item->zValue() + 0.1;
+    }
+    selectedItem->setZValue(zValue);
+}
+//! [5]
+
+//! [6]
+void MainWindow::sendToBack()
+{
+    if (scene->selectedItems().isEmpty())
+        return;
+
+    QGraphicsItem *selectedItem = scene->selectedItems().first();
+    QList<QGraphicsItem *> overlapItems = selectedItem->collidingItems();
+
+    qreal zValue = 0;
+    foreach (QGraphicsItem *item, overlapItems) {
+        if (item->zValue() <= zValue &&
+            item->type() == DiagramItem::Type)
+            zValue = item->zValue() - 0.1;
+    }
+    selectedItem->setZValue(zValue);
+}
+//! [6]
+
+//! [7]
+void MainWindow::itemInserted(DiagramItem *item)
+{
+    pointerTypeGroup->button(int(DiagramScene::MoveItem))->setChecked(true);
+    scene->setMode(DiagramScene::Mode(pointerTypeGroup->checkedId()));
+    buttonGroup->button(int(item->diagramType()))->setChecked(false);
+}
+//! [7]
+
+//! [8]
+void MainWindow::textInserted(QGraphicsTextItem *)
+{
+    buttonGroup->button(InsertTextButton)->setChecked(false);
+    scene->setMode(DiagramScene::Mode(pointerTypeGroup->checkedId()));
+}
+//! [8]
+
+//! [9]
+void MainWindow::currentFontChanged(const QFont &)
+{
+    handleFontChange();
+}
+//! [9]
+
+//! [10]
+void MainWindow::fontSizeChanged(const QString &)
+{
+    handleFontChange();
+}
+//! [10]
+
+//! [11]
+void MainWindow::sceneScaleChanged(const QString &scale)
+{
+    double newScale = scale.left(scale.indexOf(tr("%"))).toDouble() / 100.0;
+    QMatrix oldMatrix = view->matrix();
+    view->resetMatrix();
+    view->translate(oldMatrix.dx(), oldMatrix.dy());
+    view->scale(newScale, newScale);
+}
+//! [11]
+
+//! [12]
+void MainWindow::textColorChanged()
+{
+    textAction = qobject_cast<QAction *>(sender());
+    fontColorToolButton->setIcon(createColorToolButtonIcon(
+                ":/images/textpointer.png",
+                qVariantValue<QColor>(textAction->data())));
+    textButtonTriggered();
+}
+//! [12]
+
+//! [13]
+void MainWindow::itemColorChanged()
+{
+    fillAction = qobject_cast<QAction *>(sender());
+    fillColorToolButton->setIcon(createColorToolButtonIcon(
+                 ":/images/floodfill.png",
+                 qVariantValue<QColor>(fillAction->data())));
+    fillButtonTriggered();
+}
+//! [13]
+
+//! [14]
+void MainWindow::lineColorChanged()
+{
+    lineAction = qobject_cast<QAction *>(sender());
+    lineColorToolButton->setIcon(createColorToolButtonIcon(
+                 ":/images/linecolor.png",
+                 qVariantValue<QColor>(lineAction->data())));
+    lineButtonTriggered();
+}
+//! [14]
+
+//! [15]
+void MainWindow::textButtonTriggered()
+{
+    scene->setTextColor(qVariantValue<QColor>(textAction->data()));
+}
+//! [15]
+
+//! [16]
+void MainWindow::fillButtonTriggered()
+{
+    scene->setItemColor(qVariantValue<QColor>(fillAction->data()));
+}
+//! [16]
+
+//! [17]
+void MainWindow::lineButtonTriggered()
+{
+    scene->setLineColor(qVariantValue<QColor>(lineAction->data()));
+}
+//! [17]
+
+//! [18]
+void MainWindow::handleFontChange()
+{
+    QFont font = fontCombo->currentFont();
+    font.setPointSize(fontSizeCombo->currentText().toInt());
+    font.setWeight(boldAction->isChecked() ? QFont::Bold : QFont::Normal);
+    font.setItalic(italicAction->isChecked());
+    font.setUnderline(underlineAction->isChecked());
+
+    scene->setFont(font);
+}
+//! [18]
+
+//! [19]
+void MainWindow::itemSelected(QGraphicsItem *item)
+{
+    DiagramTextItem *textItem =
+    qgraphicsitem_cast<DiagramTextItem *>(item);
+
+    QFont font = textItem->font();
+    QColor color = textItem->defaultTextColor();
+    fontCombo->setCurrentFont(font);
+    fontSizeCombo->setEditText(QString().setNum(font.pointSize()));
+    boldAction->setChecked(font.weight() == QFont::Bold);
+    italicAction->setChecked(font.italic());
+    underlineAction->setChecked(font.underline());
+}
+//! [19]
+
+//! [20]
+void MainWindow::about()
+{
+    QMessageBox::about(this, tr("About Diagram Scene"),
+                       tr("The <b>Diagram Scene</b> example shows "
+                          "use of the graphics framework."));
+}
+//! [20]
+
+//! [21]
+void MainWindow::createToolBox()
+{
+    buttonGroup = new QButtonGroup;
+    buttonGroup->setExclusive(false);
+    connect(buttonGroup, SIGNAL(buttonClicked(int)),
+            this, SLOT(buttonGroupClicked(int)));
+    QGridLayout *layout = new QGridLayout;
+    layout->addWidget(createCellWidget(tr("Conditional"),
+                               DiagramItem::Conditional), 0, 0);
+    layout->addWidget(createCellWidget(tr("Process"),
+                      DiagramItem::Step),0, 1);
+    layout->addWidget(createCellWidget(tr("Input/Output"),
+                      DiagramItem::Io), 1, 0);
+//! [21]
+
+    QToolButton *textButton = new QToolButton;
+    textButton->setCheckable(true);
+    buttonGroup->addButton(textButton, InsertTextButton);
+    textButton->setIcon(QIcon(QPixmap(":/images/textpointer.png")
+                        .scaled(30, 30)));
+    textButton->setIconSize(QSize(50, 50));
+    QGridLayout *textLayout = new QGridLayout;
+    textLayout->addWidget(textButton, 0, 0, Qt::AlignHCenter);
+    textLayout->addWidget(new QLabel(tr("Text")), 1, 0, Qt::AlignCenter);
+    QWidget *textWidget = new QWidget;
+    textWidget->setLayout(textLayout);
+    layout->addWidget(textWidget, 1, 1);
+
+    layout->setRowStretch(3, 10);
+    layout->setColumnStretch(2, 10);
+
+    QWidget *itemWidget = new QWidget;
+    itemWidget->setLayout(layout);
+
+    backgroundButtonGroup = new QButtonGroup;
+    connect(backgroundButtonGroup, SIGNAL(buttonClicked(QAbstractButton *)),
+            this, SLOT(backgroundButtonGroupClicked(QAbstractButton *)));
+
+    QGridLayout *backgroundLayout = new QGridLayout;
+    backgroundLayout->addWidget(createBackgroundCellWidget(tr("Blue Grid"),
+                ":/images/background1.png"), 0, 0);
+    backgroundLayout->addWidget(createBackgroundCellWidget(tr("White Grid"),
+                ":/images/background2.png"), 0, 1);
+    backgroundLayout->addWidget(createBackgroundCellWidget(tr("Gray Grid"),
+                    ":/images/background3.png"), 1, 0);
+    backgroundLayout->addWidget(createBackgroundCellWidget(tr("No Grid"),
+                ":/images/background4.png"), 1, 1);
+
+    backgroundLayout->setRowStretch(2, 10);
+    backgroundLayout->setColumnStretch(2, 10);
+
+    QWidget *backgroundWidget = new QWidget;
+    backgroundWidget->setLayout(backgroundLayout);
+
+
+//! [22]
+    toolBox = new QToolBox;
+    toolBox->setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Ignored));
+    toolBox->setMinimumWidth(itemWidget->sizeHint().width());
+    toolBox->addItem(itemWidget, tr("Basic Flowchart Shapes"));
+    toolBox->addItem(backgroundWidget, tr("Backgrounds"));
+}
+//! [22]
+
+//! [23]
+void MainWindow::createActions()
+{
+    toFrontAction = new QAction(QIcon(":/images/bringtofront.png"),
+                                tr("Bring to &Front"), this);
+    toFrontAction->setShortcut(tr("Ctrl+F"));
+    toFrontAction->setStatusTip(tr("Bring item to front"));
+    connect(toFrontAction, SIGNAL(triggered()),
+            this, SLOT(bringToFront()));
+//! [23]
+
+    sendBackAction = new QAction(QIcon(":/images/sendtoback.png"),
+                                 tr("Send to &Back"), this);
+    sendBackAction->setShortcut(tr("Ctrl+B"));
+    sendBackAction->setStatusTip(tr("Send item to back"));
+    connect(sendBackAction, SIGNAL(triggered()),
+        this, SLOT(sendToBack()));
+
+    deleteAction = new QAction(QIcon(":/images/delete.png"),
+                               tr("&Delete"), this);
+    deleteAction->setShortcut(tr("Delete"));
+    deleteAction->setStatusTip(tr("Delete item from diagram"));
+    connect(deleteAction, SIGNAL(triggered()),
+        this, SLOT(deleteItem()));
+
+    exitAction = new QAction(tr("E&xit"), this);
+    exitAction->setShortcut(tr("Ctrl+X"));
+    exitAction->setStatusTip(tr("Quit Scenediagram example"));
+    connect(exitAction, SIGNAL(triggered()), this, SLOT(close()));
+
+    boldAction = new QAction(tr("Bold"), this);
+    boldAction->setCheckable(true);
+    QPixmap pixmap(":/images/bold.png");
+    boldAction->setIcon(QIcon(pixmap));
+    boldAction->setShortcut(tr("Ctrl+B"));
+    connect(boldAction, SIGNAL(triggered()),
+            this, SLOT(handleFontChange()));
+
+    italicAction = new QAction(QIcon(":/images/italic.png"),
+                               tr("Italic"), this);
+    italicAction->setCheckable(true);
+    italicAction->setShortcut(tr("Ctrl+I"));
+    connect(italicAction, SIGNAL(triggered()),
+            this, SLOT(handleFontChange()));
+
+    underlineAction = new QAction(QIcon(":/images/underline.png"),
+                                  tr("Underline"), this);
+    underlineAction->setCheckable(true);
+    underlineAction->setShortcut(tr("Ctrl+U"));
+    connect(underlineAction, SIGNAL(triggered()),
+            this, SLOT(handleFontChange()));
+
+    aboutAction = new QAction(tr("A&bout"), this);
+    aboutAction->setShortcut(tr("Ctrl+B"));
+    connect(aboutAction, SIGNAL(triggered()),
+            this, SLOT(about()));
+}
+
+//! [24]
+void MainWindow::createMenus()
+{
+    fileMenu = menuBar()->addMenu(tr("&File"));
+    fileMenu->addAction(exitAction);
+
+    itemMenu = menuBar()->addMenu(tr("&Item"));
+    itemMenu->addAction(deleteAction);
+    itemMenu->addSeparator();
+    itemMenu->addAction(toFrontAction);
+    itemMenu->addAction(sendBackAction);
+
+    aboutMenu = menuBar()->addMenu(tr("&Help"));
+    aboutMenu->addAction(aboutAction);
+}
+//! [24]
+
+//! [25]
+void MainWindow::createToolbars()
+{
+//! [25]
+    editToolBar = addToolBar(tr("Edit"));
+    editToolBar->addAction(deleteAction);
+    editToolBar->addAction(toFrontAction);
+    editToolBar->addAction(sendBackAction);
+
+    fontCombo = new QFontComboBox();
+    fontSizeCombo = new QComboBox();
+    connect(fontCombo, SIGNAL(currentFontChanged(const QFont &)),
+            this, SLOT(currentFontChanged(const QFont &)));
+
+    fontSizeCombo = new QComboBox;
+    fontSizeCombo->setEditable(true);
+    for (int i = 8; i < 30; i = i + 2)
+        fontSizeCombo->addItem(QString().setNum(i));
+    QIntValidator *validator = new QIntValidator(2, 64, this);
+    fontSizeCombo->setValidator(validator);
+    connect(fontSizeCombo, SIGNAL(currentIndexChanged(const QString &)),
+            this, SLOT(fontSizeChanged(const QString &)));
+
+    fontColorToolButton = new QToolButton;
+    fontColorToolButton->setPopupMode(QToolButton::MenuButtonPopup);
+    fontColorToolButton->setMenu(createColorMenu(SLOT(textColorChanged()),
+                                                 Qt::black));
+    textAction = fontColorToolButton->menu()->defaultAction();
+    fontColorToolButton->setIcon(createColorToolButtonIcon(
+    ":/images/textpointer.png", Qt::black));
+    fontColorToolButton->setAutoFillBackground(true);
+    connect(fontColorToolButton, SIGNAL(clicked()),
+            this, SLOT(textButtonTriggered()));
+
+//! [26]
+    fillColorToolButton = new QToolButton;
+    fillColorToolButton->setPopupMode(QToolButton::MenuButtonPopup);
+    fillColorToolButton->setMenu(createColorMenu(SLOT(itemColorChanged()),
+                         Qt::white));
+    fillAction = fillColorToolButton->menu()->defaultAction();
+    fillColorToolButton->setIcon(createColorToolButtonIcon(
+    ":/images/floodfill.png", Qt::white));
+    connect(fillColorToolButton, SIGNAL(clicked()),
+            this, SLOT(fillButtonTriggered()));
+//! [26]
+
+    lineColorToolButton = new QToolButton;
+    lineColorToolButton->setPopupMode(QToolButton::MenuButtonPopup);
+    lineColorToolButton->setMenu(createColorMenu(SLOT(lineColorChanged()),
+                                 Qt::black));
+    lineAction = lineColorToolButton->menu()->defaultAction();
+    lineColorToolButton->setIcon(createColorToolButtonIcon(
+        ":/images/linecolor.png", Qt::black));
+    connect(lineColorToolButton, SIGNAL(clicked()),
+            this, SLOT(lineButtonTriggered()));
+
+    textToolBar = addToolBar(tr("Font"));
+    textToolBar->addWidget(fontCombo);
+    textToolBar->addWidget(fontSizeCombo);
+    textToolBar->addAction(boldAction);
+    textToolBar->addAction(italicAction);
+    textToolBar->addAction(underlineAction);
+
+    colorToolBar = addToolBar(tr("Color"));
+    colorToolBar->addWidget(fontColorToolButton);
+    colorToolBar->addWidget(fillColorToolButton);
+    colorToolBar->addWidget(lineColorToolButton);
+
+    QToolButton *pointerButton = new QToolButton;
+    pointerButton->setCheckable(true);
+    pointerButton->setChecked(true);
+    pointerButton->setIcon(QIcon(":/images/pointer.png"));
+    QToolButton *linePointerButton = new QToolButton;
+    linePointerButton->setCheckable(true);
+    linePointerButton->setIcon(QIcon(":/images/linepointer.png"));
+
+    pointerTypeGroup = new QButtonGroup;
+    pointerTypeGroup->addButton(pointerButton, int(DiagramScene::MoveItem));
+    pointerTypeGroup->addButton(linePointerButton,
+                                int(DiagramScene::InsertLine));
+    connect(pointerTypeGroup, SIGNAL(buttonClicked(int)),
+            this, SLOT(pointerGroupClicked(int)));
+
+    sceneScaleCombo = new QComboBox;
+    QStringList scales;
+    scales << tr("50%") << tr("75%") << tr("100%") << tr("125%") << tr("150%");
+    sceneScaleCombo->addItems(scales);
+    sceneScaleCombo->setCurrentIndex(2);
+    connect(sceneScaleCombo, SIGNAL(currentIndexChanged(const QString &)),
+            this, SLOT(sceneScaleChanged(const QString &)));
+
+    pointerToolbar = addToolBar(tr("Pointer type"));
+    pointerToolbar->addWidget(pointerButton);
+    pointerToolbar->addWidget(linePointerButton);
+    pointerToolbar->addWidget(sceneScaleCombo);
+//! [27]
+}
+//! [27]
+
+//! [28]
+QWidget *MainWindow::createBackgroundCellWidget(const QString &text,
+                        const QString &image)
+{
+    QToolButton *button = new QToolButton;
+    button->setText(text);
+    button->setIcon(QIcon(image));
+    button->setIconSize(QSize(50, 50));
+    button->setCheckable(true);
+    backgroundButtonGroup->addButton(button);
+
+    QGridLayout *layout = new QGridLayout;
+    layout->addWidget(button, 0, 0, Qt::AlignHCenter);
+    layout->addWidget(new QLabel(text), 1, 0, Qt::AlignCenter);
+
+    QWidget *widget = new QWidget;
+    widget->setLayout(layout);
+
+    return widget;
+}
+//! [28]
+
+//! [29]
+QWidget *MainWindow::createCellWidget(const QString &text,
+                      DiagramItem::DiagramType type)
+{
+
+    DiagramItem item(type, itemMenu);
+    QIcon icon(item.image());
+
+    QToolButton *button = new QToolButton;
+    button->setIcon(icon);
+    button->setIconSize(QSize(50, 50));
+    button->setCheckable(true);
+    buttonGroup->addButton(button, int(type));
+
+    QGridLayout *layout = new QGridLayout;
+    layout->addWidget(button, 0, 0, Qt::AlignHCenter);
+    layout->addWidget(new QLabel(text), 1, 0, Qt::AlignCenter);
+
+    QWidget *widget = new QWidget;
+    widget->setLayout(layout);
+
+    return widget;
+}
+//! [29]
+
+//! [30]
+QMenu *MainWindow::createColorMenu(const char *slot, QColor defaultColor)
+{
+    QList<QColor> colors;
+    colors << Qt::black << Qt::white << Qt::red << Qt::blue << Qt::yellow;
+    QStringList names;
+    names << tr("black") << tr("white") << tr("red") << tr("blue")
+          << tr("yellow");
+
+    QMenu *colorMenu = new QMenu;
+    for (int i = 0; i < colors.count(); ++i) {
+        QAction *action = new QAction(names.at(i), this);
+        action->setData(colors.at(i));
+        action->setIcon(createColorIcon(colors.at(i)));
+        connect(action, SIGNAL(triggered()),
+                this, slot);
+        colorMenu->addAction(action);
+        if (colors.at(i) == defaultColor) {
+            colorMenu->setDefaultAction(action);
+        }
+    }
+    return colorMenu;
+}
+//! [30]
+
+//! [31]
+QIcon MainWindow::createColorToolButtonIcon(const QString &imageFile,
+                        QColor color)
+{
+    QPixmap pixmap(50, 80);
+    pixmap.fill(Qt::transparent);
+    QPainter painter(&pixmap);
+    QPixmap image(imageFile);
+    QRect target(0, 0, 50, 60);
+    QRect source(0, 0, 42, 42);
+    painter.fillRect(QRect(0, 60, 50, 80), color);
+    painter.drawPixmap(target, image, source);
+
+    return QIcon(pixmap);
+}
+//! [31]
+
+//! [32]
+QIcon MainWindow::createColorIcon(QColor color)
+{
+    QPixmap pixmap(20, 20);
+    QPainter painter(&pixmap);
+    painter.setPen(Qt::NoPen);
+    painter.fillRect(QRect(0, 0, 20, 20), color);
+
+    return QIcon(pixmap);
+}
+//! [32]
diff --git a/examples/graphicsview/diagramscene/mainwindow.h b/examples/graphicsview/diagramscene/mainwindow.h
new file mode 100644
index 0000000000..e4dae4ff02
--- /dev/null
+++ b/examples/graphicsview/diagramscene/mainwindow.h
@@ -0,0 +1,151 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+
+#include "diagramitem.h"
+
+class DiagramScene;
+
+QT_BEGIN_NAMESPACE
+class QAction;
+class QToolBox;
+class QSpinBox;
+class QComboBox;
+class QFontComboBox;
+class QButtonGroup;
+class QLineEdit;
+class QGraphicsTextItem;
+class QFont;
+class QToolButton;
+class QAbstractButton;
+class QGraphicsView;
+QT_END_NAMESPACE
+
+//! [0]
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+   MainWindow();
+
+private slots:
+    void backgroundButtonGroupClicked(QAbstractButton *button);
+    void buttonGroupClicked(int id);
+    void deleteItem();
+    void pointerGroupClicked(int id);
+    void bringToFront();
+    void sendToBack();
+    void itemInserted(DiagramItem *item);
+    void textInserted(QGraphicsTextItem *item);
+    void currentFontChanged(const QFont &font);
+    void fontSizeChanged(const QString &size);
+    void sceneScaleChanged(const QString &scale);
+    void textColorChanged();
+    void itemColorChanged();
+    void lineColorChanged();
+    void textButtonTriggered();
+    void fillButtonTriggered();
+    void lineButtonTriggered();
+    void handleFontChange();
+    void itemSelected(QGraphicsItem *item);
+    void about();
+
+private:
+    void createToolBox();
+    void createActions();
+    void createMenus();
+    void createToolbars();
+    QWidget *createBackgroundCellWidget(const QString &text,
+                                        const QString &image);
+    QWidget *createCellWidget(const QString &text,
+                              DiagramItem::DiagramType type);
+    QMenu *createColorMenu(const char *slot, QColor defaultColor);
+    QIcon createColorToolButtonIcon(const QString &image, QColor color);
+    QIcon createColorIcon(QColor color);
+
+    DiagramScene *scene;
+    QGraphicsView *view;
+
+    QAction *exitAction;
+    QAction *addAction;
+    QAction *deleteAction;
+
+    QAction *toFrontAction;
+    QAction *sendBackAction;
+    QAction *aboutAction;
+
+    QMenu *fileMenu;
+    QMenu *itemMenu;
+    QMenu *aboutMenu;
+
+    QToolBar *textToolBar;
+    QToolBar *editToolBar;
+    QToolBar *colorToolBar;
+    QToolBar *pointerToolbar;
+
+    QComboBox *sceneScaleCombo;
+    QComboBox *itemColorCombo;
+    QComboBox *textColorCombo;
+    QComboBox *fontSizeCombo;
+    QFontComboBox *fontCombo;
+
+    QToolBox *toolBox;
+    QButtonGroup *buttonGroup;
+    QButtonGroup *pointerTypeGroup;
+    QButtonGroup *backgroundButtonGroup;
+    QToolButton *fontColorToolButton;
+    QToolButton *fillColorToolButton;
+    QToolButton *lineColorToolButton;
+    QAction *boldAction;
+    QAction *underlineAction;
+    QAction *italicAction;
+    QAction *textAction;
+    QAction *fillAction;
+    QAction *lineAction;
+};
+//! [0]
+
+#endif
diff --git a/examples/graphicsview/dragdroprobot/coloritem.cpp b/examples/graphicsview/dragdroprobot/coloritem.cpp
new file mode 100644
index 0000000000..2d6b145e5b
--- /dev/null
+++ b/examples/graphicsview/dragdroprobot/coloritem.cpp
@@ -0,0 +1,129 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "coloritem.h"
+
+ColorItem::ColorItem()
+    : color(qrand() % 256, qrand() % 256, qrand() % 256)
+{
+    setToolTip(QString("QColor(%1, %2, %3)\n%4")
+              .arg(color.red()).arg(color.green()).arg(color.blue())
+              .arg("Click and drag this color onto the robot!"));
+    setCursor(Qt::OpenHandCursor);
+}
+
+QRectF ColorItem::boundingRect() const
+{
+    return QRectF(-15.5, -15.5, 34, 34);
+}
+
+void ColorItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+    painter->setPen(Qt::NoPen);
+    painter->setBrush(Qt::darkGray);
+    painter->drawEllipse(-12, -12, 30, 30);
+    painter->setPen(QPen(Qt::black, 1));
+    painter->setBrush(QBrush(color));
+    painter->drawEllipse(-15, -15, 30, 30);
+}
+
+void ColorItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (event->button() != Qt::LeftButton) {
+        event->ignore();
+        return;
+    }
+
+    setCursor(Qt::ClosedHandCursor);
+}
+
+void ColorItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (QLineF(event->screenPos(), event->buttonDownScreenPos(Qt::LeftButton))
+        .length() < QApplication::startDragDistance()) {
+        return;
+    }
+
+    QDrag *drag = new QDrag(event->widget());
+    QMimeData *mime = new QMimeData;
+    drag->setMimeData(mime);
+
+    static int n = 0;
+    if (n++ > 2 && (qrand() % 3) == 0) {
+        QImage image(":/images/head.png");
+        mime->setImageData(image);
+
+        drag->setPixmap(QPixmap::fromImage(image).scaled(30, 40));
+        drag->setHotSpot(QPoint(15, 30));
+    } else {
+        mime->setColorData(color);
+        mime->setText(QString("#%1%2%3")
+                      .arg(color.red(), 2, 16, QLatin1Char('0'))
+                      .arg(color.green(), 2, 16, QLatin1Char('0'))
+                      .arg(color.blue(), 2, 16, QLatin1Char('0')));
+
+        QPixmap pixmap(34, 34);
+        pixmap.fill(Qt::white);
+
+        QPainter painter(&pixmap);
+        painter.translate(15, 15);
+        painter.setRenderHint(QPainter::Antialiasing);
+        paint(&painter, 0, 0);
+        painter.end();
+
+        pixmap.setMask(pixmap.createHeuristicMask());
+
+        drag->setPixmap(pixmap);
+        drag->setHotSpot(QPoint(15, 20));
+    }
+
+    drag->exec();
+    setCursor(Qt::OpenHandCursor);
+}
+
+void ColorItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *)
+{
+    setCursor(Qt::OpenHandCursor);
+}
diff --git a/examples/graphicsview/dragdroprobot/coloritem.h b/examples/graphicsview/dragdroprobot/coloritem.h
new file mode 100644
index 0000000000..67b2c70dec
--- /dev/null
+++ b/examples/graphicsview/dragdroprobot/coloritem.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef COLORITEM_H
+#define COLORITEM_H
+
+#include <QGraphicsItem>
+
+class ColorItem : public QGraphicsItem
+{
+public:
+    ColorItem();
+
+    QRectF boundingRect() const;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+
+protected:
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+
+private:
+    QColor color;
+};
+
+#endif
diff --git a/examples/graphicsview/dragdroprobot/dragdroprobot.pro b/examples/graphicsview/dragdroprobot/dragdroprobot.pro
new file mode 100644
index 0000000000..769e54ad04
--- /dev/null
+++ b/examples/graphicsview/dragdroprobot/dragdroprobot.pro
@@ -0,0 +1,18 @@
+HEADERS += \
+	coloritem.h \
+	robot.h
+
+SOURCES += \
+	coloritem.cpp \
+	main.cpp \
+	robot.cpp
+
+RESOURCES += \
+	robot.qrc
+
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/dragdroprobot
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dragdroprobot.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/dragdroprobot
+INSTALLS += target sources
diff --git a/examples/graphicsview/dragdroprobot/images/head.png b/examples/graphicsview/dragdroprobot/images/head.png
new file mode 100644
index 0000000000..1e520e09b8
--- /dev/null
+++ b/examples/graphicsview/dragdroprobot/images/head.png
diff --git a/examples/graphicsview/dragdroprobot/main.cpp b/examples/graphicsview/dragdroprobot/main.cpp
new file mode 100644
index 0000000000..204305efaf
--- /dev/null
+++ b/examples/graphicsview/dragdroprobot/main.cpp
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "coloritem.h"
+#include "robot.h"
+
+#include <math.h>
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
+
+    QGraphicsScene scene(-200, -200, 400, 400);
+
+    for (int i = 0; i < 10; ++i) {
+        ColorItem *item = new ColorItem;
+        item->setPos(::sin((i * 6.28) / 10.0) * 150,
+                     ::cos((i * 6.28) / 10.0) * 150);
+
+        scene.addItem(item);
+    }
+
+    Robot *robot = new Robot;
+    robot->scale(1.2, 1.2);
+    robot->setPos(0, -20);
+    scene.addItem(robot);
+
+    QGraphicsView view(&scene);
+    view.setRenderHint(QPainter::Antialiasing);
+    view.setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
+    view.setBackgroundBrush(QColor(230, 200, 167));
+    view.setWindowTitle("Drag and Drop Robot");
+    view.show();
+
+    return app.exec();
+}
diff --git a/examples/graphicsview/dragdroprobot/robot.cpp b/examples/graphicsview/dragdroprobot/robot.cpp
new file mode 100644
index 0000000000..c6d8c44250
--- /dev/null
+++ b/examples/graphicsview/dragdroprobot/robot.cpp
@@ -0,0 +1,273 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "robot.h"
+
+RobotPart::RobotPart(QGraphicsItem *parent)
+    : QGraphicsItem(parent), color(Qt::lightGray), dragOver(false)
+{
+    setAcceptDrops(true);
+}
+
+void RobotPart::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
+{
+    if (event->mimeData()->hasColor()
+        || (qgraphicsitem_cast<RobotHead *>(this) && event->mimeData()->hasImage())) {
+        event->setAccepted(true);
+        dragOver = true;
+        update();
+    } else {
+        event->setAccepted(false);
+    }
+}
+
+void RobotPart::dragLeaveEvent(QGraphicsSceneDragDropEvent *event)
+{
+    Q_UNUSED(event);
+    dragOver = false;
+    update();
+}
+
+void RobotPart::dropEvent(QGraphicsSceneDragDropEvent *event)
+{
+    dragOver = false;
+    if (event->mimeData()->hasColor())
+        color = qVariantValue<QColor>(event->mimeData()->colorData());
+    else if (event->mimeData()->hasImage())
+        pixmap = qVariantValue<QPixmap>(event->mimeData()->imageData());
+    update();
+}
+
+RobotHead::RobotHead(QGraphicsItem *parent)
+    : RobotPart(parent)
+{
+}
+
+QRectF RobotHead::boundingRect() const
+{
+    return QRectF(-15, -50, 30, 50);
+}
+
+void RobotHead::paint(QPainter *painter,
+           const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+    if (pixmap.isNull()) {
+        painter->setBrush(dragOver ? color.light(130) : color);
+        painter->drawRoundedRect(-10, -30, 20, 30, 25, 25, Qt::RelativeSize);
+        painter->setBrush(Qt::white);
+        painter->drawEllipse(-7, -3 - 20, 7, 7);
+        painter->drawEllipse(0, -3 - 20, 7, 7);
+        painter->setBrush(Qt::black);
+        painter->drawEllipse(-5, -1 - 20, 2, 2);
+        painter->drawEllipse(2, -1 - 20, 2, 2);
+        painter->setPen(QPen(Qt::black, 2));
+        painter->setBrush(Qt::NoBrush);
+        painter->drawArc(-6, -2 - 20, 12, 15, 190 * 16, 160 * 16);
+    } else {
+        painter->scale(.2272, .2824);
+        painter->drawPixmap(QPointF(-15 * 4.4, -50 * 3.54), pixmap);
+    }
+}
+
+int RobotHead::type() const
+{
+    return Type;
+}
+
+RobotTorso::RobotTorso(QGraphicsItem *parent)
+    : RobotPart(parent)
+{
+}
+
+QRectF RobotTorso::boundingRect() const
+{
+    return QRectF(-30, -20, 60, 60);
+}
+
+void RobotTorso::paint(QPainter *painter,
+           const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+    
+    painter->setBrush(dragOver ? color.light(130) : color);
+    painter->drawRoundedRect(-20, -20, 40, 60, 25, 25, Qt::RelativeSize);
+    painter->drawEllipse(-25, -20, 20, 20);
+    painter->drawEllipse(5, -20, 20, 20);
+    painter->drawEllipse(-20, 22, 20, 20);
+    painter->drawEllipse(0, 22, 20, 20);
+}
+
+RobotLimb::RobotLimb(QGraphicsItem *parent)
+    : RobotPart(parent)
+{
+}
+
+QRectF RobotLimb::boundingRect() const
+{
+    return QRectF(-5, -5, 40, 10);
+}
+
+void RobotLimb::paint(QPainter *painter,
+           const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    painter->setBrush(dragOver ? color.light(130) : color);
+    painter->drawRoundedRect(boundingRect(), 50, 50, Qt::RelativeSize);
+    painter->drawEllipse(-5, -5, 10, 10);
+}
+
+Robot::Robot()
+{
+    QGraphicsItem *torsoItem = new RobotTorso(this);    
+    QGraphicsItem *headItem = new RobotHead(torsoItem);
+    QGraphicsItem *upperLeftArmItem = new RobotLimb(torsoItem);
+    QGraphicsItem *lowerLeftArmItem = new RobotLimb(upperLeftArmItem);
+    QGraphicsItem *upperRightArmItem = new RobotLimb(torsoItem);
+    QGraphicsItem *lowerRightArmItem = new RobotLimb(upperRightArmItem);
+    QGraphicsItem *upperRightLegItem = new RobotLimb(torsoItem);
+    QGraphicsItem *lowerRightLegItem = new RobotLimb(upperRightLegItem);
+    QGraphicsItem *upperLeftLegItem = new RobotLimb(torsoItem);
+    QGraphicsItem *lowerLeftLegItem = new RobotLimb(upperLeftLegItem);
+    
+    headItem->setPos(0, -18);
+    upperLeftArmItem->setPos(-15, -10);
+    lowerLeftArmItem->setPos(30, 0);
+    upperRightArmItem->setPos(15, -10);
+    lowerRightArmItem->setPos(30, 0);
+    upperRightLegItem->setPos(10, 32);
+    lowerRightLegItem->setPos(30, 0);
+    upperLeftLegItem->setPos(-10, 32);
+    lowerLeftLegItem->setPos(30, 0);
+
+    timeLine = new QTimeLine;
+
+    QGraphicsItemAnimation *headAnimation = new QGraphicsItemAnimation;
+    headAnimation->setItem(headItem);
+    headAnimation->setTimeLine(timeLine);
+    headAnimation->setRotationAt(0, 20);
+    headAnimation->setRotationAt(1, -20);
+    headAnimation->setScaleAt(1, 1.1, 1.1);
+
+    QGraphicsItemAnimation *upperLeftArmAnimation = new QGraphicsItemAnimation;
+    upperLeftArmAnimation->setItem(upperLeftArmItem);
+    upperLeftArmAnimation->setTimeLine(timeLine);
+    upperLeftArmAnimation->setRotationAt(0, 190);
+    upperLeftArmAnimation->setRotationAt(1, 180);
+
+    QGraphicsItemAnimation *lowerLeftArmAnimation = new QGraphicsItemAnimation;
+    lowerLeftArmAnimation->setItem(lowerLeftArmItem);
+    lowerLeftArmAnimation->setTimeLine(timeLine);
+    lowerLeftArmAnimation->setRotationAt(0, 50);
+    lowerLeftArmAnimation->setRotationAt(1, 10);
+    
+    QGraphicsItemAnimation *upperRightArmAnimation = new QGraphicsItemAnimation;
+    upperRightArmAnimation->setItem(upperRightArmItem);
+    upperRightArmAnimation->setTimeLine(timeLine);
+    upperRightArmAnimation->setRotationAt(0, 300);
+    upperRightArmAnimation->setRotationAt(1, 310);
+
+    QGraphicsItemAnimation *lowerRightArmAnimation = new QGraphicsItemAnimation;
+    lowerRightArmAnimation->setItem(lowerRightArmItem);
+    lowerRightArmAnimation->setTimeLine(timeLine);
+    lowerRightArmAnimation->setRotationAt(0, 0);
+    lowerRightArmAnimation->setRotationAt(1, -70);
+
+    QGraphicsItemAnimation *upperLeftLegAnimation = new QGraphicsItemAnimation;
+    upperLeftLegAnimation->setItem(upperLeftLegItem);
+    upperLeftLegAnimation->setTimeLine(timeLine);
+    upperLeftLegAnimation->setRotationAt(0, 150);
+    upperLeftLegAnimation->setRotationAt(1, 80);
+
+    QGraphicsItemAnimation *lowerLeftLegAnimation = new QGraphicsItemAnimation;
+    lowerLeftLegAnimation->setItem(lowerLeftLegItem);
+    lowerLeftLegAnimation->setTimeLine(timeLine);
+    lowerLeftLegAnimation->setRotationAt(0, 70);
+    lowerLeftLegAnimation->setRotationAt(1, 10);
+
+    QGraphicsItemAnimation *upperRightLegAnimation = new QGraphicsItemAnimation;
+    upperRightLegAnimation->setItem(upperRightLegItem);
+    upperRightLegAnimation->setTimeLine(timeLine);
+    upperRightLegAnimation->setRotationAt(0, 40);
+    upperRightLegAnimation->setRotationAt(1, 120);
+    
+    QGraphicsItemAnimation *lowerRightLegAnimation = new QGraphicsItemAnimation;
+    lowerRightLegAnimation->setItem(lowerRightLegItem);
+    lowerRightLegAnimation->setTimeLine(timeLine);
+    lowerRightLegAnimation->setRotationAt(0, 10);
+    lowerRightLegAnimation->setRotationAt(1, 50);
+    
+    QGraphicsItemAnimation *torsoAnimation = new QGraphicsItemAnimation;
+    torsoAnimation->setItem(torsoItem);
+    torsoAnimation->setTimeLine(timeLine);
+    torsoAnimation->setRotationAt(0, 5);
+    torsoAnimation->setRotationAt(1, -20);
+
+    timeLine->setUpdateInterval(1000 / 25);
+    timeLine->setCurveShape(QTimeLine::SineCurve);
+    timeLine->setLoopCount(0);
+    timeLine->setDuration(2000);
+    timeLine->start();
+}
+
+Robot::~Robot()
+{
+    delete timeLine;
+}
+
+QRectF Robot::boundingRect() const
+{
+    return QRectF();
+}
+
+void Robot::paint(QPainter *painter,
+                  const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(painter);
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+}
diff --git a/examples/graphicsview/dragdroprobot/robot.h b/examples/graphicsview/dragdroprobot/robot.h
new file mode 100644
index 0000000000..c0b6d14610
--- /dev/null
+++ b/examples/graphicsview/dragdroprobot/robot.h
@@ -0,0 +1,110 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ROBOT_H
+#define ROBOT_H
+
+#include <QGraphicsItem>
+
+QT_BEGIN_NAMESPACE
+class QGraphicsSceneMouseEvent;
+class QTimeLine;
+QT_END_NAMESPACE
+
+class RobotPart : public QGraphicsItem
+{
+public:
+    RobotPart(QGraphicsItem *parent = 0);
+
+protected:
+    void dragEnterEvent(QGraphicsSceneDragDropEvent *event);
+    void dragLeaveEvent(QGraphicsSceneDragDropEvent *event);
+    void dropEvent(QGraphicsSceneDragDropEvent *event);
+
+    QPixmap pixmap;
+    QColor color;
+    bool dragOver;
+};
+
+class RobotHead : public RobotPart
+{
+public:
+    RobotHead(QGraphicsItem *parent = 0);
+
+    QRectF boundingRect() const;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
+
+    enum { Type = UserType + 1 };
+    int type() const;
+};
+
+class RobotTorso : public RobotPart
+{
+public:
+    RobotTorso(QGraphicsItem *parent = 0);
+
+    QRectF boundingRect() const;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
+};
+
+class RobotLimb : public RobotPart
+{
+public:
+    RobotLimb(QGraphicsItem *parent = 0);
+
+    QRectF boundingRect() const;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
+};
+
+class Robot : public RobotPart
+{
+public:
+    Robot();
+    ~Robot();
+    
+    QRectF boundingRect() const;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
+
+private:
+    QTimeLine *timeLine;    
+};
+
+#endif
diff --git a/examples/graphicsview/dragdroprobot/robot.qrc b/examples/graphicsview/dragdroprobot/robot.qrc
new file mode 100644
index 0000000000..b0969d2a64
--- /dev/null
+++ b/examples/graphicsview/dragdroprobot/robot.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/" >
+        <file>images/head.png</file>
+    </qresource>
+</RCC>
diff --git a/examples/graphicsview/elasticnodes/edge.cpp b/examples/graphicsview/elasticnodes/edge.cpp
new file mode 100644
index 0000000000..4018c25aed
--- /dev/null
+++ b/examples/graphicsview/elasticnodes/edge.cpp
@@ -0,0 +1,144 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QPainter>
+
+#include "edge.h"
+#include "node.h"
+
+#include <math.h>
+
+static const double Pi = 3.14159265358979323846264338327950288419717;
+static double TwoPi = 2.0 * Pi;
+
+Edge::Edge(Node *sourceNode, Node *destNode)
+    : arrowSize(10)
+{
+    setAcceptedMouseButtons(0);
+    source = sourceNode;
+    dest = destNode;
+    source->addEdge(this);
+    dest->addEdge(this);
+    adjust();
+}
+
+Edge::~Edge()
+{
+}
+
+Node *Edge::sourceNode() const
+{
+    return source;
+}
+
+void Edge::setSourceNode(Node *node)
+{
+    source = node;
+    adjust();
+}
+
+Node *Edge::destNode() const
+{
+    return dest;
+}
+
+void Edge::setDestNode(Node *node)
+{
+    dest = node;
+    adjust();
+}
+
+void Edge::adjust()
+{
+    if (!source || !dest)
+        return;
+
+    QLineF line(mapFromItem(source, 0, 0), mapFromItem(dest, 0, 0));
+    qreal length = line.length();
+    QPointF edgeOffset((line.dx() * 10) / length, (line.dy() * 10) / length);
+
+    prepareGeometryChange();
+    sourcePoint = line.p1() + edgeOffset;
+    destPoint = line.p2() - edgeOffset;
+}
+
+QRectF Edge::boundingRect() const
+{
+    if (!source || !dest)
+        return QRectF();
+
+    qreal penWidth = 1;
+    qreal extra = (penWidth + arrowSize) / 2.0;
+
+    return QRectF(sourcePoint, QSizeF(destPoint.x() - sourcePoint.x(),
+                                      destPoint.y() - sourcePoint.y()))
+        .normalized()
+        .adjusted(-extra, -extra, extra, extra);
+}
+
+void Edge::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
+{
+    if (!source || !dest)
+        return;
+
+    // Draw the line itself
+    QLineF line(sourcePoint, destPoint);
+    painter->setPen(QPen(Qt::black, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+    painter->drawLine(line);
+
+    // Draw the arrows if there's enough room
+    double angle = ::acos(line.dx() / line.length());
+    if (line.dy() >= 0)
+        angle = TwoPi - angle;
+
+    QPointF sourceArrowP1 = sourcePoint + QPointF(sin(angle + Pi / 3) * arrowSize,
+                                                  cos(angle + Pi / 3) * arrowSize);
+    QPointF sourceArrowP2 = sourcePoint + QPointF(sin(angle + Pi - Pi / 3) * arrowSize,
+                                                  cos(angle + Pi - Pi / 3) * arrowSize);   
+    QPointF destArrowP1 = destPoint + QPointF(sin(angle - Pi / 3) * arrowSize,
+                                              cos(angle - Pi / 3) * arrowSize);
+    QPointF destArrowP2 = destPoint + QPointF(sin(angle - Pi + Pi / 3) * arrowSize,
+                                              cos(angle - Pi + Pi / 3) * arrowSize);
+
+    painter->setBrush(Qt::black);
+    painter->drawPolygon(QPolygonF() << line.p1() << sourceArrowP1 << sourceArrowP2);
+    painter->drawPolygon(QPolygonF() << line.p2() << destArrowP1 << destArrowP2);        
+}
diff --git a/examples/graphicsview/elasticnodes/edge.h b/examples/graphicsview/elasticnodes/edge.h
new file mode 100644
index 0000000000..9078870e2a
--- /dev/null
+++ b/examples/graphicsview/elasticnodes/edge.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef EDGE_H
+#define EDGE_H
+
+#include <QGraphicsItem>
+
+class Node;
+
+class Edge : public QGraphicsItem
+{
+public:
+    Edge(Node *sourceNode, Node *destNode);
+    ~Edge();
+
+    Node *sourceNode() const;
+    void setSourceNode(Node *node);
+
+    Node *destNode() const;
+    void setDestNode(Node *node);
+
+    void adjust();
+
+    enum { Type = UserType + 2 };
+    int type() const { return Type; }
+    
+protected:
+    QRectF boundingRect() const;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    
+private:
+    Node *source, *dest;
+
+    QPointF sourcePoint;
+    QPointF destPoint;
+    qreal arrowSize;
+};
+
+#endif
diff --git a/examples/graphicsview/elasticnodes/elasticnodes.pro b/examples/graphicsview/elasticnodes/elasticnodes.pro
new file mode 100644
index 0000000000..77ca706ba5
--- /dev/null
+++ b/examples/graphicsview/elasticnodes/elasticnodes.pro
@@ -0,0 +1,16 @@
+HEADERS += \
+        edge.h \
+        node.h \
+        graphwidget.h
+
+SOURCES += \
+        edge.cpp \
+        main.cpp \
+        node.cpp \
+        graphwidget.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/elasticnodes
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS elasticnodes.pro 
+sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/elasticnodes
+INSTALLS += target sources
diff --git a/examples/graphicsview/elasticnodes/graphwidget.cpp b/examples/graphicsview/elasticnodes/graphwidget.cpp
new file mode 100644
index 0000000000..5c5029c720
--- /dev/null
+++ b/examples/graphicsview/elasticnodes/graphwidget.cpp
@@ -0,0 +1,224 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "graphwidget.h"
+#include "edge.h"
+#include "node.h"
+
+#include <QDebug>
+#include <QGraphicsScene>
+#include <QWheelEvent>
+
+#include <math.h>
+
+GraphWidget::GraphWidget()
+    : timerId(0)
+{
+    QGraphicsScene *scene = new QGraphicsScene(this);
+    scene->setItemIndexMethod(QGraphicsScene::NoIndex);
+    scene->setSceneRect(-200, -200, 400, 400);
+    setScene(scene);
+    setCacheMode(CacheBackground);
+    setViewportUpdateMode(BoundingRectViewportUpdate);
+    setRenderHint(QPainter::Antialiasing);
+    setTransformationAnchor(AnchorUnderMouse);
+    setResizeAnchor(AnchorViewCenter);
+
+    Node *node1 = new Node(this);
+    Node *node2 = new Node(this);
+    Node *node3 = new Node(this);
+    Node *node4 = new Node(this);
+    centerNode = new Node(this);
+    Node *node6 = new Node(this);
+    Node *node7 = new Node(this);
+    Node *node8 = new Node(this);
+    Node *node9 = new Node(this);
+    scene->addItem(node1);
+    scene->addItem(node2);
+    scene->addItem(node3);
+    scene->addItem(node4);
+    scene->addItem(centerNode);
+    scene->addItem(node6);
+    scene->addItem(node7);
+    scene->addItem(node8);
+    scene->addItem(node9);
+    scene->addItem(new Edge(node1, node2));
+    scene->addItem(new Edge(node2, node3));
+    scene->addItem(new Edge(node2, centerNode));
+    scene->addItem(new Edge(node3, node6));
+    scene->addItem(new Edge(node4, node1));
+    scene->addItem(new Edge(node4, centerNode));
+    scene->addItem(new Edge(centerNode, node6));
+    scene->addItem(new Edge(centerNode, node8));
+    scene->addItem(new Edge(node6, node9));
+    scene->addItem(new Edge(node7, node4));
+    scene->addItem(new Edge(node8, node7));
+    scene->addItem(new Edge(node9, node8));
+
+    node1->setPos(-50, -50);
+    node2->setPos(0, -50);
+    node3->setPos(50, -50);
+    node4->setPos(-50, 0);
+    centerNode->setPos(0, 0);
+    node6->setPos(50, 0);
+    node7->setPos(-50, 50);
+    node8->setPos(0, 50);
+    node9->setPos(50, 50);
+
+    scale(qreal(0.8), qreal(0.8));
+    setMinimumSize(400, 400);
+    setWindowTitle(tr("Elastic Nodes"));
+}
+
+void GraphWidget::itemMoved()
+{
+    if (!timerId)
+        timerId = startTimer(1000 / 25);
+}
+
+void GraphWidget::keyPressEvent(QKeyEvent *event)
+{
+    switch (event->key()) {
+    case Qt::Key_Up:
+        centerNode->moveBy(0, -20);
+        break;
+    case Qt::Key_Down:
+        centerNode->moveBy(0, 20);
+        break;
+    case Qt::Key_Left:
+        centerNode->moveBy(-20, 0);
+        break;
+    case Qt::Key_Right:
+        centerNode->moveBy(20, 0);
+        break;
+    case Qt::Key_Plus:
+        scaleView(qreal(1.2));
+        break;
+    case Qt::Key_Minus:
+        scaleView(1 / qreal(1.2));
+        break;
+    case Qt::Key_Space:
+    case Qt::Key_Enter:
+        foreach (QGraphicsItem *item, scene()->items()) {
+            if (qgraphicsitem_cast<Node *>(item))
+                item->setPos(-150 + qrand() % 300, -150 + qrand() % 300);
+        }
+        break;
+    default:
+        QGraphicsView::keyPressEvent(event);
+    }
+}
+
+void GraphWidget::timerEvent(QTimerEvent *event)
+{
+    Q_UNUSED(event);
+
+    QList<Node *> nodes;
+    foreach (QGraphicsItem *item, scene()->items()) {
+        if (Node *node = qgraphicsitem_cast<Node *>(item))
+            nodes << node;
+    }
+
+    foreach (Node *node, nodes)
+        node->calculateForces();
+
+    bool itemsMoved = false;
+    foreach (Node *node, nodes) {
+        if (node->advance())
+            itemsMoved = true;
+    }
+
+    if (!itemsMoved) {
+        killTimer(timerId);
+        timerId = 0;
+    }
+}
+
+void GraphWidget::wheelEvent(QWheelEvent *event)
+{
+    scaleView(pow((double)2, -event->delta() / 240.0));
+}
+
+void GraphWidget::drawBackground(QPainter *painter, const QRectF &rect)
+{
+    Q_UNUSED(rect);
+
+    // Shadow
+    QRectF sceneRect = this->sceneRect();
+    QRectF rightShadow(sceneRect.right(), sceneRect.top() + 5, 5, sceneRect.height());
+    QRectF bottomShadow(sceneRect.left() + 5, sceneRect.bottom(), sceneRect.width(), 5);
+    if (rightShadow.intersects(rect) || rightShadow.contains(rect))
+	painter->fillRect(rightShadow, Qt::darkGray);
+    if (bottomShadow.intersects(rect) || bottomShadow.contains(rect))
+	painter->fillRect(bottomShadow, Qt::darkGray);
+
+    // Fill
+    QLinearGradient gradient(sceneRect.topLeft(), sceneRect.bottomRight());
+    gradient.setColorAt(0, Qt::white);
+    gradient.setColorAt(1, Qt::lightGray);
+    painter->fillRect(rect.intersect(sceneRect), gradient);
+    painter->setBrush(Qt::NoBrush);
+    painter->drawRect(sceneRect);
+
+    // Text
+    QRectF textRect(sceneRect.left() + 4, sceneRect.top() + 4,
+                    sceneRect.width() - 4, sceneRect.height() - 4);
+    QString message(tr("Click and drag the nodes around, and zoom with the mouse "
+                       "wheel or the '+' and '-' keys"));
+
+    QFont font = painter->font();
+    font.setBold(true);
+    font.setPointSize(14);
+    painter->setFont(font);
+    painter->setPen(Qt::lightGray);
+    painter->drawText(textRect.translated(2, 2), message);
+    painter->setPen(Qt::black);
+    painter->drawText(textRect, message);
+}
+
+void GraphWidget::scaleView(qreal scaleFactor)
+{
+    qreal factor = matrix().scale(scaleFactor, scaleFactor).mapRect(QRectF(0, 0, 1, 1)).width();
+    if (factor < 0.07 || factor > 100)
+        return;
+
+    scale(scaleFactor, scaleFactor);
+}
diff --git a/examples/graphicsview/elasticnodes/graphwidget.h b/examples/graphicsview/elasticnodes/graphwidget.h
new file mode 100644
index 0000000000..2c86c7615c
--- /dev/null
+++ b/examples/graphicsview/elasticnodes/graphwidget.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GRAPHWIDGET_H
+#define GRAPHWIDGET_H
+
+#include <QtGui/QGraphicsView>
+
+class Node;
+
+class GraphWidget : public QGraphicsView
+{
+    Q_OBJECT
+
+public:
+    GraphWidget();
+
+    void itemMoved();
+
+protected:
+    void keyPressEvent(QKeyEvent *event);
+    void timerEvent(QTimerEvent *event);
+    void wheelEvent(QWheelEvent *event);
+    void drawBackground(QPainter *painter, const QRectF &rect);
+
+    void scaleView(qreal scaleFactor);
+
+private:
+    int timerId;
+    Node *centerNode;
+};
+
+#endif
diff --git a/examples/graphicsview/elasticnodes/main.cpp b/examples/graphicsview/elasticnodes/main.cpp
new file mode 100644
index 0000000000..8043d58450
--- /dev/null
+++ b/examples/graphicsview/elasticnodes/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "graphwidget.h"
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
+
+    GraphWidget widget;
+    widget.show();
+    return app.exec();
+}
diff --git a/examples/graphicsview/elasticnodes/node.cpp b/examples/graphicsview/elasticnodes/node.cpp
new file mode 100644
index 0000000000..6942fa007d
--- /dev/null
+++ b/examples/graphicsview/elasticnodes/node.cpp
@@ -0,0 +1,185 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
+#include <QPainter>
+#include <QStyleOption>
+
+#include "edge.h"
+#include "node.h"
+#include "graphwidget.h"
+
+Node::Node(GraphWidget *graphWidget)
+    : graph(graphWidget)
+{
+    setFlag(ItemIsMovable);
+    setCacheMode(DeviceCoordinateCache);
+    setZValue(1);
+}
+
+void Node::addEdge(Edge *edge)
+{
+    edgeList << edge;
+    edge->adjust();
+}
+
+QList<Edge *> Node::edges() const
+{
+    return edgeList;
+}
+
+void Node::calculateForces()
+{
+    if (!scene() || scene()->mouseGrabberItem() == this) {
+        newPos = pos();
+        return;
+    }
+    
+    // Sum up all forces pushing this item away
+    qreal xvel = 0;
+    qreal yvel = 0;
+    foreach (QGraphicsItem *item, scene()->items()) {
+        Node *node = qgraphicsitem_cast<Node *>(item);
+        if (!node)
+            continue;
+
+        QLineF line(mapFromItem(node, 0, 0), QPointF(0, 0));
+        qreal dx = line.dx();
+        qreal dy = line.dy();
+        double l = 2.0 * (dx * dx + dy * dy);
+        if (l > 0) {
+            xvel += (dx * 150.0) / l;
+            yvel += (dy * 150.0) / l;
+        }
+    }
+
+    // Now subtract all forces pulling items together
+    double weight = (edgeList.size() + 1) * 10;
+    foreach (Edge *edge, edgeList) {
+        QPointF pos;
+        if (edge->sourceNode() == this)
+            pos = mapFromItem(edge->destNode(), 0, 0);
+        else
+            pos = mapFromItem(edge->sourceNode(), 0, 0);
+        xvel += pos.x() / weight;
+        yvel += pos.y() / weight;
+    }
+    
+    if (qAbs(xvel) < 0.1 && qAbs(yvel) < 0.1)
+        xvel = yvel = 0;
+
+    QRectF sceneRect = scene()->sceneRect();
+    newPos = pos() + QPointF(xvel, yvel);
+    newPos.setX(qMin(qMax(newPos.x(), sceneRect.left() + 10), sceneRect.right() - 10));
+    newPos.setY(qMin(qMax(newPos.y(), sceneRect.top() + 10), sceneRect.bottom() - 10));
+}
+
+bool Node::advance()
+{
+    if (newPos == pos())
+        return false;
+
+    setPos(newPos);
+    return true;
+}
+
+QRectF Node::boundingRect() const
+{
+    qreal adjust = 2;
+    return QRectF(-10 - adjust, -10 - adjust,
+                  23 + adjust, 23 + adjust);
+}
+
+QPainterPath Node::shape() const
+{
+    QPainterPath path;
+    path.addEllipse(-10, -10, 20, 20);
+    return path;
+}
+
+void Node::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *)
+{
+    painter->setPen(Qt::NoPen);
+    painter->setBrush(Qt::darkGray);
+    painter->drawEllipse(-7, -7, 20, 20);
+
+    QRadialGradient gradient(-3, -3, 10);
+    if (option->state & QStyle::State_Sunken) {
+        gradient.setCenter(3, 3);
+        gradient.setFocalPoint(3, 3);
+        gradient.setColorAt(1, QColor(Qt::yellow).light(120));
+        gradient.setColorAt(0, QColor(Qt::darkYellow).light(120));
+    } else {
+        gradient.setColorAt(0, Qt::yellow);
+        gradient.setColorAt(1, Qt::darkYellow);
+    }
+    painter->setBrush(gradient);
+    painter->setPen(QPen(Qt::black, 0));
+    painter->drawEllipse(-10, -10, 20, 20);
+}
+
+QVariant Node::itemChange(GraphicsItemChange change, const QVariant &value)
+{
+    switch (change) {
+    case ItemPositionHasChanged:
+        foreach (Edge *edge, edgeList)
+            edge->adjust();
+        graph->itemMoved();
+        break;
+    default:
+        break;
+    };
+
+    return QGraphicsItem::itemChange(change, value);
+}
+
+void Node::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    update();
+    QGraphicsItem::mousePressEvent(event);
+}
+
+void Node::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    update();
+    QGraphicsItem::mouseReleaseEvent(event);
+}
diff --git a/examples/graphicsview/elasticnodes/node.h b/examples/graphicsview/elasticnodes/node.h
new file mode 100644
index 0000000000..42309c4538
--- /dev/null
+++ b/examples/graphicsview/elasticnodes/node.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef NODE_H
+#define NODE_H
+
+#include <QGraphicsItem>
+#include <QList>
+
+class Edge;
+class GraphWidget;
+QT_BEGIN_NAMESPACE
+class QGraphicsSceneMouseEvent;
+QT_END_NAMESPACE
+
+class Node : public QGraphicsItem
+{
+public:
+    Node(GraphWidget *graphWidget);
+
+    void addEdge(Edge *edge);
+    QList<Edge *> edges() const;
+
+    enum { Type = UserType + 1 };
+    int type() const { return Type; }
+
+    void calculateForces();
+    bool advance();
+
+    QRectF boundingRect() const;
+    QPainterPath shape() const;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+
+protected:
+    QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    
+private:
+    QList<Edge *> edgeList;
+    QPointF newPos;
+    GraphWidget *graph;
+};
+
+#endif
diff --git a/examples/graphicsview/graphicsview.pro b/examples/graphicsview/graphicsview.pro
new file mode 100644
index 0000000000..66eb0b41f5
--- /dev/null
+++ b/examples/graphicsview/graphicsview.pro
@@ -0,0 +1,18 @@
+TEMPLATE      = \
+              subdirs
+SUBDIRS       = \
+              elasticnodes \
+              collidingmice \
+              diagramscene \
+              dragdroprobot \
+              padnavigator \
+              basicgraphicslayouts
+
+contains(QT_CONFIG, qt3support):SUBDIRS += portedcanvas portedasteroids
+contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= dragdroprobot
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS graphicsview.pro README
+sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview
+INSTALLS += target sources
diff --git a/examples/graphicsview/padnavigator/backside.ui b/examples/graphicsview/padnavigator/backside.ui
new file mode 100644
index 0000000000..afa488c6f4
--- /dev/null
+++ b/examples/graphicsview/padnavigator/backside.ui
@@ -0,0 +1,208 @@
+<ui version="4.0" >
+ <class>BackSide</class>
+ <widget class="QWidget" name="BackSide" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>378</width>
+    <height>385</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>BackSide</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2" >
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Settings</string>
+     </property>
+     <property name="flat" >
+      <bool>true</bool>
+     </property>
+     <property name="checkable" >
+      <bool>true</bool>
+     </property>
+     <layout class="QGridLayout" name="gridLayout" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>Title:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QLineEdit" name="hostName" >
+        <property name="text" >
+         <string>Pad Navigator Example</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_2" >
+        <property name="text" >
+         <string>Modified:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_3" >
+        <property name="text" >
+         <string>Extent</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <layout class="QHBoxLayout" name="horizontalLayout" >
+        <item>
+         <widget class="QSlider" name="horizontalSlider" >
+          <property name="value" >
+           <number>42</number>
+          </property>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="spinBox" >
+          <property name="value" >
+           <number>42</number>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QDateTimeEdit" name="dateTimeEdit" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="title" >
+      <string>Other input</string>
+     </property>
+     <property name="flat" >
+      <bool>true</bool>
+     </property>
+     <property name="checkable" >
+      <bool>true</bool>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_2" >
+      <item>
+       <widget class="QTreeWidget" name="treeWidget" >
+        <column>
+         <property name="text" >
+          <string>Widgets On Graphics View</string>
+         </property>
+        </column>
+        <item>
+         <property name="text" >
+          <string>QGraphicsProxyWidget</string>
+         </property>
+         <item>
+          <property name="text" >
+           <string>QGraphicsWidget</string>
+          </property>
+          <item>
+           <property name="text" >
+            <string>QObject</string>
+           </property>
+          </item>
+          <item>
+           <property name="text" >
+            <string>QGraphicsItem</string>
+           </property>
+          </item>
+          <item>
+           <property name="text" >
+            <string>QGraphicsLayoutItem</string>
+           </property>
+          </item>
+         </item>
+        </item>
+        <item>
+         <property name="text" >
+          <string>QGraphicsGridLayout</string>
+         </property>
+         <item>
+          <property name="text" >
+           <string>QGraphicsLayout</string>
+          </property>
+          <item>
+           <property name="text" >
+            <string>QGraphicsLayoutItem</string>
+           </property>
+          </item>
+         </item>
+        </item>
+        <item>
+         <property name="text" >
+          <string>QGraphicsLinearLayout</string>
+         </property>
+         <item>
+          <property name="text" >
+           <string>QGraphicsLayout</string>
+          </property>
+          <item>
+           <property name="text" >
+            <string>QGraphicsLayoutItem</string>
+           </property>
+          </item>
+         </item>
+        </item>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>groupBox</tabstop>
+  <tabstop>hostName</tabstop>
+  <tabstop>dateTimeEdit</tabstop>
+  <tabstop>horizontalSlider</tabstop>
+  <tabstop>spinBox</tabstop>
+  <tabstop>groupBox_2</tabstop>
+  <tabstop>treeWidget</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>horizontalSlider</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>spinBox</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>184</x>
+     <y>125</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>275</x>
+     <y>127</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>spinBox</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>horizontalSlider</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>272</x>
+     <y>114</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>190</x>
+     <y>126</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/examples/graphicsview/padnavigator/images/artsfftscope.png b/examples/graphicsview/padnavigator/images/artsfftscope.png
new file mode 100644
index 0000000000..4db003f8d2
--- /dev/null
+++ b/examples/graphicsview/padnavigator/images/artsfftscope.png
diff --git a/examples/graphicsview/padnavigator/images/blue_angle_swirl.jpg b/examples/graphicsview/padnavigator/images/blue_angle_swirl.jpg
new file mode 100644
index 0000000000..5bf0debdbd
--- /dev/null
+++ b/examples/graphicsview/padnavigator/images/blue_angle_swirl.jpg
diff --git a/examples/graphicsview/padnavigator/images/kontact_contacts.png b/examples/graphicsview/padnavigator/images/kontact_contacts.png
new file mode 100644
index 0000000000..6fb4cc8f38
--- /dev/null
+++ b/examples/graphicsview/padnavigator/images/kontact_contacts.png
diff --git a/examples/graphicsview/padnavigator/images/kontact_journal.png b/examples/graphicsview/padnavigator/images/kontact_journal.png
new file mode 100644
index 0000000000..b1fedb6982
--- /dev/null
+++ b/examples/graphicsview/padnavigator/images/kontact_journal.png
diff --git a/examples/graphicsview/padnavigator/images/kontact_mail.png b/examples/graphicsview/padnavigator/images/kontact_mail.png
new file mode 100644
index 0000000000..672f8fa3ab
--- /dev/null
+++ b/examples/graphicsview/padnavigator/images/kontact_mail.png
diff --git a/examples/graphicsview/padnavigator/images/kontact_notes.png b/examples/graphicsview/padnavigator/images/kontact_notes.png
new file mode 100644
index 0000000000..229bf73ac6
--- /dev/null
+++ b/examples/graphicsview/padnavigator/images/kontact_notes.png
diff --git a/examples/graphicsview/padnavigator/images/kopeteavailable.png b/examples/graphicsview/padnavigator/images/kopeteavailable.png
new file mode 100644
index 0000000000..2eaf41afec
--- /dev/null
+++ b/examples/graphicsview/padnavigator/images/kopeteavailable.png
diff --git a/examples/graphicsview/padnavigator/images/metacontact_online.png b/examples/graphicsview/padnavigator/images/metacontact_online.png
new file mode 100644
index 0000000000..6a398dd10f
--- /dev/null
+++ b/examples/graphicsview/padnavigator/images/metacontact_online.png
diff --git a/examples/graphicsview/padnavigator/images/minitools.png b/examples/graphicsview/padnavigator/images/minitools.png
new file mode 100644
index 0000000000..0248c9d50a
--- /dev/null
+++ b/examples/graphicsview/padnavigator/images/minitools.png
diff --git a/examples/graphicsview/padnavigator/main.cpp b/examples/graphicsview/padnavigator/main.cpp
new file mode 100644
index 0000000000..dc5ff0cac1
--- /dev/null
+++ b/examples/graphicsview/padnavigator/main.cpp
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#ifndef QT_NO_OPENGL
+#  include <QtOpenGL>
+#endif
+
+#include "panel.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Q_INIT_RESOURCE(padnavigator);
+
+    Panel panel(3, 3);
+    panel.setFocus();
+    panel.show();
+
+    return app.exec();
+}
diff --git a/examples/graphicsview/padnavigator/padnavigator.pro b/examples/graphicsview/padnavigator/padnavigator.pro
new file mode 100644
index 0000000000..0d094c620a
--- /dev/null
+++ b/examples/graphicsview/padnavigator/padnavigator.pro
@@ -0,0 +1,24 @@
+HEADERS += \
+        panel.h \
+        roundrectitem.h \
+        splashitem.h
+
+SOURCES += \
+        panel.cpp \
+        roundrectitem.cpp \
+        splashitem.cpp \
+        main.cpp
+
+RESOURCES += \
+        padnavigator.qrc
+
+FORMS += \
+        backside.ui
+
+contains(QT_CONFIG, opengl):QT += opengl
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/padnavigator
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS padnavigator.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/padnavigator
+INSTALLS += target sources
diff --git a/examples/graphicsview/padnavigator/padnavigator.qrc b/examples/graphicsview/padnavigator/padnavigator.qrc
new file mode 100644
index 0000000000..30ee8e1a08
--- /dev/null
+++ b/examples/graphicsview/padnavigator/padnavigator.qrc
@@ -0,0 +1,14 @@
+<RCC>
+ <qresource>
+  <file>images/blue_angle_swirl.jpg</file>
+  <file>images/artsfftscope.png</file>
+  <file>images/kontact_contacts.png</file>
+  <file>images/kontact_journal.png</file>
+  <file>images/kontact_mail.png</file>
+  <file>images/kontact_notes.png</file>
+  <file>images/kopeteavailable.png</file>
+  <file>images/metacontact_online.png</file>
+  <file>images/minitools.png</file>
+  <file>images/blue_angle_swirl.jpg</file>
+ </qresource>
+</RCC>
diff --git a/examples/graphicsview/padnavigator/panel.cpp b/examples/graphicsview/padnavigator/panel.cpp
new file mode 100644
index 0000000000..28a3cb4eb8
--- /dev/null
+++ b/examples/graphicsview/padnavigator/panel.cpp
@@ -0,0 +1,238 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "panel.h"
+#include "roundrectitem.h"
+#include "splashitem.h"
+#include "ui_backside.h"
+
+#ifndef QT_NO_OPENGL
+#include <QtOpenGL/QtOpenGL>
+#else
+#endif
+#include <QtGui/QtGui>
+
+#include <math.h>
+
+Panel::Panel(int width, int height)
+    : selectedX(0),
+      selectedY(0),
+      width(width),
+      height(height),
+      flipped(false),
+      flipLeft(true)
+{
+    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setCacheMode(CacheBackground);
+    setViewportUpdateMode(FullViewportUpdate);
+    setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform
+                   | QPainter::TextAntialiasing);
+    setBackgroundBrush(QPixmap(":/images/blue_angle_swirl.jpg"));
+#ifndef QT_NO_OPENGL
+    setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers)));
+#endif
+    setMinimumSize(50, 50);
+
+    selectionTimeLine = new QTimeLine(150, this);
+    flipTimeLine = new QTimeLine(500, this);
+
+    QRectF bounds((-width / 2.0) * 150, (-height / 2.0) * 150, width * 150, height * 150);
+
+    scene = new QGraphicsScene(bounds, this);
+    scene->setItemIndexMethod(QGraphicsScene::NoIndex);
+    setScene(scene);
+
+    baseItem = new RoundRectItem(bounds, QColor(226, 255, 92, 64));
+    scene->addItem(baseItem);
+
+    QWidget *embed = new QWidget;
+    ui = new Ui_BackSide;
+    ui->setupUi(embed);
+    ui->hostName->setFocus();
+
+    backItem = new RoundRectItem(bounds, embed->palette().window(), embed);
+    backItem->setTransform(QTransform().rotate(180, Qt::YAxis));
+    backItem->setParentItem(baseItem);
+        
+    selectionItem = new RoundRectItem(QRectF(-60, -60, 120, 120), Qt::gray);
+    selectionItem->setParentItem(baseItem);
+    selectionItem->setZValue(-1);
+    selectionItem->setPos(posForLocation(0, 0));
+    startPos = selectionItem->pos();
+
+    grid = new QGraphicsItem **[height];
+        
+    for (int y = 0; y < height; ++y) {
+        grid[y] = new QGraphicsItem *[width];
+
+        for (int x = 0; x < width; ++x) {
+            RoundRectItem *item = new RoundRectItem(QRectF(-54, -54, 108, 108),
+                                                    QColor(214, 240, 110, 128));
+            item->setPos(posForLocation(x, y));
+                
+            item->setParentItem(baseItem);
+            item->setFlag(QGraphicsItem::ItemIsFocusable);
+            grid[y][x] = item;
+
+            switch (qrand() % 9) {
+            case 0: item->setPixmap(QPixmap(":/images/kontact_contacts.png")); break;
+            case 1: item->setPixmap(QPixmap(":/images/kontact_journal.png")); break;
+            case 2: item->setPixmap(QPixmap(":/images/kontact_notes.png")); break;
+            case 3: item->setPixmap(QPixmap(":/images/kopeteavailable.png")); break;
+            case 4: item->setPixmap(QPixmap(":/images/metacontact_online.png")); break;
+            case 5: item->setPixmap(QPixmap(":/images/minitools.png")); break;
+            case 6: item->setPixmap(QPixmap(":/images/kontact_journal.png")); break;
+            case 7: item->setPixmap(QPixmap(":/images/kontact_contacts.png")); break;
+            case 8: item->setPixmap(QPixmap(":/images/kopeteavailable.png")); break;
+            default:
+                break;
+            }
+
+            connect(item, SIGNAL(activated()), this, SLOT(flip()));
+        }
+    }
+
+    grid[0][0]->setFocus();
+
+    connect(backItem, SIGNAL(activated()),
+            this, SLOT(flip()));
+    connect(selectionTimeLine, SIGNAL(valueChanged(qreal)),
+            this, SLOT(updateSelectionStep(qreal)));
+    connect(flipTimeLine, SIGNAL(valueChanged(qreal)),
+            this, SLOT(updateFlipStep(qreal)));
+
+    splash = new SplashItem;
+    splash->setZValue(5);
+    splash->setPos(-splash->rect().width() / 2, scene->sceneRect().top());
+    scene->addItem(splash);
+
+    splash->grabKeyboard();
+    
+    updateSelectionStep(0);
+
+    setWindowTitle(tr("Pad Navigator Example"));
+}
+
+Panel::~Panel()
+{
+    for (int y = 0; y < height; ++y)
+        delete [] grid[y];
+    delete [] grid;
+}
+    
+void Panel::keyPressEvent(QKeyEvent *event)
+{
+    if (splash->isVisible() || event->key() == Qt::Key_Return || flipped) {
+        QGraphicsView::keyPressEvent(event);
+        return;
+    }
+
+    selectedX = (selectedX + width + (event->key() == Qt::Key_Right) - (event->key() == Qt::Key_Left)) % width;
+    selectedY = (selectedY + height + (event->key() == Qt::Key_Down) - (event->key() == Qt::Key_Up)) % height;
+    grid[selectedY][selectedX]->setFocus();
+    
+    selectionTimeLine->stop();
+    startPos = selectionItem->pos();
+    endPos = posForLocation(selectedX, selectedY);
+    selectionTimeLine->start();
+}
+
+void Panel::resizeEvent(QResizeEvent *event)
+{
+    QGraphicsView::resizeEvent(event);
+    fitInView(scene->sceneRect(), Qt::KeepAspectRatio);
+}
+
+void Panel::updateSelectionStep(qreal val)
+{
+    QPointF newPos(startPos.x() + (endPos - startPos).x() * val,
+                   startPos.y() + (endPos - startPos).y() * val);
+    selectionItem->setPos(newPos);
+    
+    QTransform transform;
+    yrot = newPos.x() / 6.0;
+    xrot = newPos.y() / 6.0;
+    transform.rotate(newPos.x() / 6.0, Qt::YAxis);
+    transform.rotate(newPos.y() / 6.0, Qt::XAxis);
+    baseItem->setTransform(transform);
+}
+
+void Panel::updateFlipStep(qreal val)
+{
+    qreal finalxrot = xrot - xrot * val;
+    qreal finalyrot;
+    if (flipLeft)
+        finalyrot = yrot - yrot * val - 180 * val;
+    else
+        finalyrot = yrot - yrot * val + 180 * val;
+    QTransform transform;
+    transform.rotate(finalyrot, Qt::YAxis);
+    transform.rotate(finalxrot, Qt::XAxis);
+    qreal scale = 1 - sin(3.14 * val) * 0.3;
+    transform.scale(scale, scale);
+    baseItem->setTransform(transform);
+    if (val == 0)
+        grid[selectedY][selectedX]->setFocus();
+}
+
+void Panel::flip()
+{
+    if (flipTimeLine->state() == QTimeLine::Running)
+        return;
+
+    if (flipTimeLine->currentValue() == 0) {
+        flipTimeLine->setDirection(QTimeLine::Forward);
+        flipTimeLine->start();
+        flipped = true;
+        flipLeft = selectionItem->pos().x() < 0;
+    } else {
+        flipTimeLine->setDirection(QTimeLine::Backward);
+        flipTimeLine->start();
+        flipped = false;
+    }
+}
+
+QPointF Panel::posForLocation(int x, int y) const
+{
+    return QPointF(x * 150, y * 150)
+        - QPointF((width - 1) * 75, (height - 1) * 75);
+}
diff --git a/examples/graphicsview/padnavigator/panel.h b/examples/graphicsview/padnavigator/panel.h
new file mode 100644
index 0000000000..03876b778d
--- /dev/null
+++ b/examples/graphicsview/padnavigator/panel.h
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/qgraphicsview.h>
+
+QT_BEGIN_NAMESPACE
+class QTimeLine;
+class Ui_BackSide;
+QT_END_NAMESPACE;
+
+class RoundRectItem;
+
+class Panel : public QGraphicsView
+{
+    Q_OBJECT
+public:
+    Panel(int width, int height);
+    ~Panel();
+
+protected:
+    void keyPressEvent(QKeyEvent *event);
+    void resizeEvent(QResizeEvent *event);
+
+private Q_SLOTS:
+    void updateSelectionStep(qreal val);
+    void updateFlipStep(qreal val);
+    void flip();
+
+private:
+    QPointF posForLocation(int x, int y) const;
+
+    QGraphicsScene *scene;
+    RoundRectItem *selectionItem;
+    RoundRectItem *baseItem;
+    RoundRectItem *backItem;
+    QGraphicsWidget *splash;
+    QTimeLine *selectionTimeLine;
+    QTimeLine *flipTimeLine;
+    int selectedX, selectedY;
+
+    QGraphicsItem ***grid;
+    
+    QPointF startPos;
+    QPointF endPos;
+    qreal xrot, yrot;
+    qreal xrot2, yrot2;
+
+    int width;
+    int height;
+    bool flipped;
+    bool flipLeft;
+
+    Ui_BackSide *ui;
+};
diff --git a/examples/graphicsview/padnavigator/roundrectitem.cpp b/examples/graphicsview/padnavigator/roundrectitem.cpp
new file mode 100644
index 0000000000..c5dc35d490
--- /dev/null
+++ b/examples/graphicsview/padnavigator/roundrectitem.cpp
@@ -0,0 +1,164 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "roundrectitem.h"
+
+#include <QtGui/QtGui>
+
+RoundRectItem::RoundRectItem(const QRectF &rect, const QBrush &brush, QWidget *embeddedWidget)
+    : QGraphicsRectItem(rect),
+      brush(brush),
+      timeLine(75),
+      lastVal(0),
+      opa(1),
+      proxyWidget(0)
+{
+    connect(&timeLine, SIGNAL(valueChanged(qreal)),
+            this, SLOT(updateValue(qreal)));
+    
+    if (embeddedWidget) {
+        proxyWidget = new QGraphicsProxyWidget(this);
+        proxyWidget->setFocusPolicy(Qt::StrongFocus);
+        proxyWidget->setWidget(embeddedWidget);
+        proxyWidget->setGeometry(boundingRect().adjusted(25, 25, -25, -25));
+    }
+}
+
+void RoundRectItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
+{
+    QTransform x = painter->worldTransform();
+
+    QLineF unit = x.map(QLineF(0, 0, 1, 1));
+    if (unit.p1().x() > unit.p2().x() || unit.p1().y() > unit.p2().y()) {
+        if (proxyWidget && proxyWidget->isVisible()) {
+            proxyWidget->hide();
+            proxyWidget->setGeometry(rect());
+        }
+        return;
+    }
+
+    if (proxyWidget && !proxyWidget->isVisible()) {
+        proxyWidget->show();
+        proxyWidget->setFocus();
+    }
+    if (proxyWidget && proxyWidget->pos() != QPoint())
+        proxyWidget->setGeometry(boundingRect().adjusted(25, 25, -25, -25));
+
+    painter->setOpacity(opacity());
+    painter->setPen(Qt::NoPen);
+    painter->setBrush(QColor(0, 0, 0, 64));
+    painter->drawRoundRect(rect().translated(2, 2));
+
+    if (!proxyWidget) {
+        QLinearGradient gradient(rect().topLeft(), rect().bottomRight());
+        const QColor col = brush.color();
+        gradient.setColorAt(0, col);
+        gradient.setColorAt(1, col.dark(int(200 + lastVal * 50)));
+        painter->setBrush(gradient);
+    } else {
+        painter->setBrush(brush);
+    }
+
+    painter->setPen(QPen(Qt::black, 1));
+    painter->drawRoundRect(rect());
+    if (!pix.isNull()) {
+        painter->scale(1.95, 1.95);
+        painter->drawPixmap(-pix.width() / 2, -pix.height() / 2, pix);;
+    }
+}
+
+QRectF RoundRectItem::boundingRect() const
+{
+    qreal penW = 0.5;
+    qreal shadowW = 2.0;
+    return rect().adjusted(-penW, -penW, penW + shadowW, penW + shadowW);
+}
+
+void RoundRectItem::setPixmap(const QPixmap &pixmap)
+{
+    pix = pixmap;
+    if (scene() && isVisible())
+        update();
+}
+
+qreal RoundRectItem::opacity() const
+{
+    RoundRectItem *parent = parentItem() ? (RoundRectItem *)parentItem() : 0;
+    return opa + (parent ? parent->opacity() : 0);
+}
+
+void RoundRectItem::setOpacity(qreal opacity)
+{
+    opa = opacity;
+    update();
+}
+
+void RoundRectItem::keyPressEvent(QKeyEvent *event)
+{
+    if (event->isAutoRepeat() || event->key() != Qt::Key_Return
+        || (timeLine.state() == QTimeLine::Running && timeLine.direction() == QTimeLine::Forward)) {
+        QGraphicsRectItem::keyPressEvent(event);
+        return;
+    }
+
+    timeLine.stop();
+    timeLine.setDirection(QTimeLine::Forward);
+    timeLine.start();
+    emit activated();
+}
+
+void RoundRectItem::keyReleaseEvent(QKeyEvent *event)
+{
+    if (event->key() != Qt::Key_Return) {
+        QGraphicsRectItem::keyReleaseEvent(event);
+        return;
+    }
+    timeLine.stop();
+    timeLine.setDirection(QTimeLine::Backward);
+    timeLine.start();
+}
+
+void RoundRectItem::updateValue(qreal value)
+{
+    lastVal = value;
+    if (!proxyWidget)
+        setTransform(QTransform().scale(1 - value / 10.0, 1 - value / 10.0));
+}
diff --git a/examples/graphicsview/padnavigator/roundrectitem.h b/examples/graphicsview/padnavigator/roundrectitem.h
new file mode 100644
index 0000000000..33e33d7ec0
--- /dev/null
+++ b/examples/graphicsview/padnavigator/roundrectitem.h
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/qobject.h>
+#include <QtCore/qtimeline.h>
+#include <QtGui/qgraphicsitem.h>
+#include <QtGui/qbrush.h>
+
+QT_BEGIN_NAMESPACE
+class QGraphicsProxyWidget;
+QT_END_NAMESPACE;
+
+class RoundRectItem : public QObject, public QGraphicsRectItem
+{
+    Q_OBJECT
+public:
+    RoundRectItem(const QRectF &rect, const QBrush &brush, QWidget *embeddedWidget = 0);
+
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *);
+    QRectF boundingRect() const;
+
+    void setPixmap(const QPixmap &pixmap);
+
+    qreal opacity() const;
+    void setOpacity(qreal opacity);
+
+Q_SIGNALS:
+    void activated();
+
+protected:
+    void keyPressEvent(QKeyEvent *event);
+    void keyReleaseEvent(QKeyEvent *event);
+
+private slots:
+    void updateValue(qreal value);
+
+private:
+    QBrush brush;
+    QPixmap pix;
+    QTimeLine timeLine;
+    qreal lastVal;
+    qreal opa;
+
+    QGraphicsProxyWidget *proxyWidget;
+};
diff --git a/examples/graphicsview/padnavigator/splashitem.cpp b/examples/graphicsview/padnavigator/splashitem.cpp
new file mode 100644
index 0000000000..2a374bf0a5
--- /dev/null
+++ b/examples/graphicsview/padnavigator/splashitem.cpp
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "splashitem.h"
+
+#include <QtGui/QtGui>
+
+SplashItem::SplashItem(QGraphicsItem *parent)
+    : QGraphicsWidget(parent)
+{
+    opacity = 1.0;
+
+    
+    timeLine = new QTimeLine(350);
+    timeLine->setCurveShape(QTimeLine::EaseInCurve);
+    connect(timeLine, SIGNAL(valueChanged(qreal)), this, SLOT(setValue(qreal)));
+
+    text = tr("Welcome to the Pad Navigator Example. You can use the"
+              " keyboard arrows to navigate the icons, and press enter"
+              " to activate an item. Please press any key to continue.");
+    resize(400, 175);
+}
+
+void SplashItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
+{
+    painter->setOpacity(opacity);
+    painter->setPen(QPen(Qt::black, 2));
+    painter->setBrush(QColor(245, 245, 255, 220));
+    painter->setClipRect(rect());
+    painter->drawRoundRect(3, -100 + 3, 400 - 6, 250 - 6);
+
+    QRectF textRect = rect().adjusted(10, 10, -10, -10);
+    int flags = Qt::AlignTop | Qt::AlignLeft | Qt::TextWordWrap;
+
+    QFont font;
+    font.setPixelSize(18);
+    painter->setPen(Qt::black);
+    painter->setFont(font);
+    painter->drawText(textRect, flags, text);
+}
+
+void SplashItem::keyPressEvent(QKeyEvent * /* event */)
+{
+    if (timeLine->state() == QTimeLine::NotRunning)
+        timeLine->start();
+}
+
+void SplashItem::setValue(qreal value)
+{
+    opacity = 1 - value;
+    setPos(x(), scene()->sceneRect().top() - rect().height() * value);
+    if (value == 1)
+        hide();
+}
diff --git a/examples/graphicsview/padnavigator/splashitem.h b/examples/graphicsview/padnavigator/splashitem.h
new file mode 100644
index 0000000000..982bbe293d
--- /dev/null
+++ b/examples/graphicsview/padnavigator/splashitem.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/qobject.h>
+#include <QtCore/qtimeline.h>
+#include <QtGui/qgraphicswidget.h>
+
+class SplashItem : public QGraphicsWidget
+{
+    Q_OBJECT
+public:
+    SplashItem(QGraphicsItem *parent = 0);
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+
+protected:
+    void keyPressEvent(QKeyEvent *event);
+
+private Q_SLOTS:
+    void setValue(qreal value);
+
+private:
+    QTimeLine *timeLine;
+    QString text;
+    qreal opacity;
+};
diff --git a/examples/graphicsview/portedasteroids/animateditem.cpp b/examples/graphicsview/portedasteroids/animateditem.cpp
new file mode 100644
index 0000000000..ac41fb5244
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/animateditem.cpp
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "animateditem.h"
+
+#include <QtGui/qbitmap.h>
+#include <QtGui/qpainter.h>
+
+AnimatedPixmapItem::AnimatedPixmapItem(const QList<QPixmap> &animation,
+                                       QGraphicsScene *scene)
+    : QGraphicsItem(0, scene), currentFrame(0), vx(0), vy(0)
+{
+    for (int i = 0; i < animation.size(); ++i) {
+        QPixmap pixmap = animation.at(i);
+        Frame frame;
+        frame.pixmap = pixmap;
+        frame.shape = QPainterPath();
+        frame.boundingRect = pixmap.rect();
+        frames << frame;
+    }
+}
+
+void AnimatedPixmapItem::setFrame(int frame)
+{
+    if (!frames.isEmpty()) {
+        prepareGeometryChange();
+        currentFrame = frame % frames.size();
+    }
+}
+
+void AnimatedPixmapItem::advance(int phase)
+{
+    if (phase == 1)
+        moveBy(vx, vy);
+}
+
+QRectF AnimatedPixmapItem::boundingRect() const
+{
+    return frames.at(currentFrame).boundingRect;
+}
+
+QPainterPath AnimatedPixmapItem::shape() const
+{
+    const Frame &f = frames.at(currentFrame);
+    if (f.shape.isEmpty()) {
+        QPainterPath path;
+        path.addRegion(f.pixmap.createHeuristicMask());
+        const_cast<Frame &>(f).shape = path;
+    }
+    return f.shape;
+}
+
+void AnimatedPixmapItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/,
+                               QWidget * /*widget*/)
+{
+    painter->drawPixmap(0, 0, frames.at(currentFrame).pixmap);
+}
diff --git a/examples/graphicsview/portedasteroids/animateditem.h b/examples/graphicsview/portedasteroids/animateditem.h
new file mode 100644
index 0000000000..54e8e563c1
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/animateditem.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ANIMATEDPIXMAPITEM_H
+#define ANIMATEDPIXMAPITEM_H
+
+#include <QGraphicsItem>
+
+class AnimatedPixmapItem : public QGraphicsItem
+{
+public:
+    AnimatedPixmapItem(const QList<QPixmap> &animation, QGraphicsScene *scene = 0);
+
+    void setFrame(int frame);
+    inline int frame() const
+    { return currentFrame; }
+    inline int frameCount() const
+    { return frames.size(); }
+    inline QPixmap image(int frame) const
+    { return frames.isEmpty() ? QPixmap() : frames.at(frame % frames.size()).pixmap; }
+    inline void setVelocity(qreal xvel, qreal yvel)
+    { vx = xvel; vy = yvel; }
+    inline qreal xVelocity() const
+    { return vx; }
+    inline qreal yVelocity() const
+    { return vy; }
+
+    QRectF boundingRect() const;
+    QPainterPath shape() const;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    
+    void advance(int phase);
+    
+private:
+    struct Frame {
+        QPixmap pixmap;
+        QPainterPath shape;
+        QRectF boundingRect;
+    };
+    
+    int currentFrame;
+    QList<Frame> frames;
+    qreal vx, vy;
+};
+
+#endif
diff --git a/examples/graphicsview/portedasteroids/bg.png b/examples/graphicsview/portedasteroids/bg.png
new file mode 100644
index 0000000000..1201172f24
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/bg.png
diff --git a/examples/graphicsview/portedasteroids/ledmeter.cpp b/examples/graphicsview/portedasteroids/ledmeter.cpp
new file mode 100644
index 0000000000..37aee269cb
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/ledmeter.cpp
@@ -0,0 +1,161 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+ * KAsteroids - Copyright (c) Martin R. Jones 1997
+ *
+ * Part of the KDE project
+ */
+
+#include <qpainter.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <Q3Frame>
+#include "ledmeter.h"
+
+KALedMeter::KALedMeter( QWidget *parent ) : Q3Frame( parent )
+{
+    mCRanges.setAutoDelete( TRUE );
+    mRange = 100;
+    mCount = 20;
+    mCurrentCount = 0;
+    mValue = 0;
+    setMinimumWidth( mCount * 2 + frameWidth() );
+}
+
+void KALedMeter::setRange( int r )
+{
+    mRange = r;
+    if ( mRange < 1 )
+        mRange = 1;
+    setValue( mValue );
+    update();
+}
+
+void KALedMeter::setCount( int c )
+{
+    mCount = c;
+    if ( mCount < 1 )
+        mCount = 1;
+    setMinimumWidth( mCount * 2 + frameWidth() );
+    calcColorRanges();
+    setValue( mValue );
+    update();
+}
+
+void KALedMeter::setValue( int v )
+{
+    mValue = v;
+    if ( mValue > mRange )
+        mValue = mRange;
+    else if ( mValue < 0 )
+        mValue = 0;
+    int c = ( mValue + mRange / mCount - 1 ) * mCount / mRange;
+    if ( c != mCurrentCount )
+    {
+        mCurrentCount = c;
+        update();
+    }
+}
+
+void KALedMeter::addColorRange( int pc, const QColor &c )
+{
+    ColorRange *cr = new ColorRange;
+    cr->mPc = pc;
+    cr->mColor = c;
+    mCRanges.append( cr );
+    calcColorRanges();
+}
+
+void KALedMeter::resizeEvent( QResizeEvent *e )
+{
+    Q3Frame::resizeEvent( e );
+    int w = ( width() - frameWidth() - 2 ) / mCount * mCount;
+    w += frameWidth() + 2;
+    setFrameRect( QRect( 0, 0, w, height() ) );
+}
+
+void KALedMeter::drawContents( QPainter *p )
+{
+    QRect b = contentsRect();
+
+    unsigned cidx = 0;
+    int ncol = mCount;
+    QColor col = colorGroup().foreground();
+   
+    if ( !mCRanges.isEmpty() )
+    {
+        col = mCRanges.at( cidx )->mColor;
+        ncol = mCRanges.at( cidx )->mValue;
+    }
+    p->setBrush( col );
+    p->setPen( col );
+
+    int lw = b.width() / mCount;
+    int lx = b.left() + 1;
+    for ( int i = 0; i < mCurrentCount; i++, lx += lw )
+    {
+        if ( i > ncol )
+        {
+            if ( ++cidx < mCRanges.count() )
+            {
+                col = mCRanges.at( cidx )->mColor;
+                ncol = mCRanges.at( cidx )->mValue;
+                p->setBrush( col );
+                p->setPen( col );
+            }
+        }
+
+        p->drawRect( lx, b.top() + 1, lw - 1, b.height() - 2 );
+    }
+}
+
+void KALedMeter::calcColorRanges()
+{
+    int prev = 0;
+    ColorRange *cr;
+    for ( cr = mCRanges.first(); cr; cr = mCRanges.next() )
+    {
+        cr->mValue = prev + cr->mPc * mCount / 100;
+        prev = cr->mValue;
+    }
+}
+
diff --git a/examples/graphicsview/portedasteroids/ledmeter.h b/examples/graphicsview/portedasteroids/ledmeter.h
new file mode 100644
index 0000000000..117b113d9c
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/ledmeter.h
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+ * KAsteroids - Copyright (c) Martin R. Jones 1997
+ *
+ * Part of the KDE project
+ */
+
+#ifndef __LEDMETER_H__
+#define __LEDMETER_H__
+
+#include <q3frame.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+
+
+class KALedMeter : public Q3Frame
+{
+    Q_OBJECT
+public:
+    KALedMeter( QWidget *parent );
+
+    int range() const { return mRange; }
+    void setRange( int r );
+
+    int count() const { return mCount; }
+    void setCount( int c );
+
+    int value () const { return mValue; }
+
+    void addColorRange( int pc, const QColor &c );
+
+public slots:
+    void setValue( int v );
+
+protected:
+    virtual void resizeEvent( QResizeEvent * );
+    virtual void drawContents( QPainter * );
+    void calcColorRanges();
+
+protected:
+    struct ColorRange
+    {
+	int mPc;
+	int mValue;
+	QColor mColor;
+    };
+
+    int mRange;
+    int mCount;
+    int mCurrentCount;
+    int mValue;
+    Q3PtrList<ColorRange> mCRanges;
+};
+
+#endif
diff --git a/examples/graphicsview/portedasteroids/main.cpp b/examples/graphicsview/portedasteroids/main.cpp
new file mode 100644
index 0000000000..69b5fd514a
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "toplevel.h"
+
+int main(int argc, char **argv)
+{
+    Q_INIT_RESOURCE(portedasteroids);
+
+    QApplication app(argc, argv);
+
+    qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
+    
+    KAstTopLevel topLevel;
+    topLevel.setWindowTitle("Ported Asteroids Game");
+    topLevel.show();
+
+    app.setQuitOnLastWindowClosed(true);
+    return app.exec();
+}
diff --git a/examples/graphicsview/portedasteroids/portedasteroids.pro b/examples/graphicsview/portedasteroids/portedasteroids.pro
new file mode 100644
index 0000000000..1452e91d7d
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/portedasteroids.pro
@@ -0,0 +1,19 @@
+TEMPLATE = app
+INCLUDEPATH += .
+
+# Input
+HEADERS += ledmeter.h sprites.h toplevel.h view.h
+SOURCES += ledmeter.cpp main.cpp toplevel.cpp view.cpp
+#The following line was inserted by qt3to4
+QT +=  qt3support 
+
+HEADERS += animateditem.h
+SOURCES += animateditem.cpp
+
+RESOURCES += portedasteroids.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/portedasteroids
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS portedasteroids.pro bg.png sounds sprites
+sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/portedasteroids
+INSTALLS += target sources
diff --git a/examples/graphicsview/portedasteroids/portedasteroids.qrc b/examples/graphicsview/portedasteroids/portedasteroids.qrc
new file mode 100644
index 0000000000..178082812a
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/portedasteroids.qrc
@@ -0,0 +1,163 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/trolltech/examples/graphicsview/portedasteroids">
+<file>bg.png</file>
+<file>sprites/bits/bits0000.png</file>
+<file>sprites/bits/bits0001.png</file>
+<file>sprites/bits/bits0002.png</file>
+<file>sprites/bits/bits0003.png</file>
+<file>sprites/bits/bits0004.png</file>
+<file>sprites/bits/bits0005.png</file>
+<file>sprites/bits/bits0006.png</file>
+<file>sprites/bits/bits0007.png</file>
+<file>sprites/bits/bits0008.png</file>
+<file>sprites/bits/bits0009.png</file>
+<file>sprites/bits/bits0010.png</file>
+<file>sprites/bits/bits0011.png</file>
+<file>sprites/bits/bits0012.png</file>
+<file>sprites/bits/bits0013.png</file>
+<file>sprites/bits/bits0014.png</file>
+<file>sprites/bits/bits0015.png</file>
+<file>sprites/ship/ship0000.png</file>
+<file>sprites/ship/ship0001.png</file>
+<file>sprites/ship/ship0002.png</file>
+<file>sprites/ship/ship0003.png</file>
+<file>sprites/ship/ship0004.png</file>
+<file>sprites/ship/ship0005.png</file>
+<file>sprites/ship/ship0006.png</file>
+<file>sprites/ship/ship0007.png</file>
+<file>sprites/ship/ship0008.png</file>
+<file>sprites/ship/ship0009.png</file>
+<file>sprites/ship/ship0010.png</file>
+<file>sprites/ship/ship0011.png</file>
+<file>sprites/ship/ship0012.png</file>
+<file>sprites/ship/ship0013.png</file>
+<file>sprites/ship/ship0014.png</file>
+<file>sprites/ship/ship0015.png</file>
+<file>sprites/ship/ship0016.png</file>
+<file>sprites/ship/ship0017.png</file>
+<file>sprites/ship/ship0018.png</file>
+<file>sprites/ship/ship0019.png</file>
+<file>sprites/ship/ship0020.png</file>
+<file>sprites/ship/ship0021.png</file>
+<file>sprites/ship/ship0022.png</file>
+<file>sprites/ship/ship0023.png</file>
+<file>sprites/ship/ship0024.png</file>
+<file>sprites/ship/ship0025.png</file>
+<file>sprites/ship/ship0026.png</file>
+<file>sprites/ship/ship0027.png</file>
+<file>sprites/ship/ship0028.png</file>
+<file>sprites/ship/ship0029.png</file>
+<file>sprites/ship/ship0030.png</file>
+<file>sprites/ship/ship0031.png</file>
+<file>sprites/rock1/rock10016.png</file>
+<file>sprites/rock1/rock10017.png</file>
+<file>sprites/rock1/rock10018.png</file>
+<file>sprites/rock1/rock10019.png</file>
+<file>sprites/rock1/rock10020.png</file>
+<file>sprites/rock1/rock10021.png</file>
+<file>sprites/rock1/rock10022.png</file>
+<file>sprites/rock1/rock10023.png</file>
+<file>sprites/rock1/rock10024.png</file>
+<file>sprites/rock1/rock10025.png</file>
+<file>sprites/rock1/rock10026.png</file>
+<file>sprites/rock1/rock10027.png</file>
+<file>sprites/rock1/rock10028.png</file>
+<file>sprites/rock1/rock10029.png</file>
+<file>sprites/rock1/rock10030.png</file>
+<file>sprites/rock1/rock10031.png</file>
+<file>sprites/rock1/rock10000.png</file>
+<file>sprites/rock1/rock10001.png</file>
+<file>sprites/rock1/rock10002.png</file>
+<file>sprites/rock1/rock10003.png</file>
+<file>sprites/rock1/rock10004.png</file>
+<file>sprites/rock1/rock10005.png</file>
+<file>sprites/rock1/rock10006.png</file>
+<file>sprites/rock1/rock10007.png</file>
+<file>sprites/rock1/rock10008.png</file>
+<file>sprites/rock1/rock10009.png</file>
+<file>sprites/rock1/rock10010.png</file>
+<file>sprites/rock1/rock10011.png</file>
+<file>sprites/rock1/rock10012.png</file>
+<file>sprites/rock1/rock10013.png</file>
+<file>sprites/rock1/rock10014.png</file>
+<file>sprites/rock1/rock10015.png</file>
+<file>sprites/rock2/rock20000.png</file>
+<file>sprites/rock2/rock20001.png</file>
+<file>sprites/rock2/rock20002.png</file>
+<file>sprites/rock2/rock20003.png</file>
+<file>sprites/rock2/rock20004.png</file>
+<file>sprites/rock2/rock20005.png</file>
+<file>sprites/rock2/rock20006.png</file>
+<file>sprites/rock2/rock20007.png</file>
+<file>sprites/rock2/rock20008.png</file>
+<file>sprites/rock2/rock20009.png</file>
+<file>sprites/rock2/rock20010.png</file>
+<file>sprites/rock2/rock20011.png</file>
+<file>sprites/rock2/rock20012.png</file>
+<file>sprites/rock2/rock20013.png</file>
+<file>sprites/rock2/rock20014.png</file>
+<file>sprites/rock2/rock20015.png</file>
+<file>sprites/rock2/rock20016.png</file>
+<file>sprites/rock2/rock20017.png</file>
+<file>sprites/rock2/rock20018.png</file>
+<file>sprites/rock2/rock20019.png</file>
+<file>sprites/rock2/rock20020.png</file>
+<file>sprites/rock2/rock20021.png</file>
+<file>sprites/rock2/rock20022.png</file>
+<file>sprites/rock2/rock20023.png</file>
+<file>sprites/rock2/rock20024.png</file>
+<file>sprites/rock2/rock20025.png</file>
+<file>sprites/rock2/rock20026.png</file>
+<file>sprites/rock2/rock20027.png</file>
+<file>sprites/rock2/rock20028.png</file>
+<file>sprites/rock2/rock20029.png</file>
+<file>sprites/rock2/rock20030.png</file>
+<file>sprites/rock2/rock20031.png</file>
+<file>sprites/rock3/rock30000.png</file>
+<file>sprites/rock3/rock30001.png</file>
+<file>sprites/rock3/rock30002.png</file>
+<file>sprites/rock3/rock30003.png</file>
+<file>sprites/rock3/rock30004.png</file>
+<file>sprites/rock3/rock30005.png</file>
+<file>sprites/rock3/rock30006.png</file>
+<file>sprites/rock3/rock30007.png</file>
+<file>sprites/rock3/rock30008.png</file>
+<file>sprites/rock3/rock30009.png</file>
+<file>sprites/rock3/rock30010.png</file>
+<file>sprites/rock3/rock30011.png</file>
+<file>sprites/rock3/rock30012.png</file>
+<file>sprites/rock3/rock30013.png</file>
+<file>sprites/rock3/rock30014.png</file>
+<file>sprites/rock3/rock30015.png</file>
+<file>sprites/rock3/rock30016.png</file>
+<file>sprites/rock3/rock30017.png</file>
+<file>sprites/rock3/rock30018.png</file>
+<file>sprites/rock3/rock30019.png</file>
+<file>sprites/rock3/rock30020.png</file>
+<file>sprites/rock3/rock30021.png</file>
+<file>sprites/rock3/rock30022.png</file>
+<file>sprites/rock3/rock30023.png</file>
+<file>sprites/rock3/rock30024.png</file>
+<file>sprites/rock3/rock30025.png</file>
+<file>sprites/rock3/rock30026.png</file>
+<file>sprites/rock3/rock30027.png</file>
+<file>sprites/rock3/rock30028.png</file>
+<file>sprites/rock3/rock30029.png</file>
+<file>sprites/rock3/rock30030.png</file>
+<file>sprites/rock3/rock30031.png</file>
+<file>sprites/missile/missile.png</file>
+<file>sprites/exhaust/exhaust.png</file>
+<file>sprites/powerups/shield.png</file>
+<file>sprites/powerups/shoot.png</file>
+<file>sprites/powerups/teleport.png</file>
+<file>sprites/powerups/brake.png</file>
+<file>sprites/powerups/energy.png</file>
+<file>sprites/shield/shield0000.png</file>
+<file>sprites/shield/shield0001.png</file>
+<file>sprites/shield/shield0002.png</file>
+<file>sprites/shield/shield0003.png</file>
+<file>sprites/shield/shield0004.png</file>
+<file>sprites/shield/shield0005.png</file>
+<file>sprites/shield/shield0006.png</file>
+</qresource>
+</RCC>
diff --git a/examples/graphicsview/portedasteroids/sounds/Explosion.wav b/examples/graphicsview/portedasteroids/sounds/Explosion.wav
new file mode 100644
index 0000000000..7b140b1c69
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sounds/Explosion.wav
diff --git a/examples/graphicsview/portedasteroids/sprites.h b/examples/graphicsview/portedasteroids/sprites.h
new file mode 100644
index 0000000000..1483d68525
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites.h
@@ -0,0 +1,170 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+ * KAsteroids - Copyright (c) Martin R. Jones 1997
+ *
+ * Part of the KDE project
+ */
+
+#ifndef __SPRITES_H__
+#define __SPRITES_H__
+
+#include "animateditem.h"
+
+#define ID_ROCK_LARGE           1024
+#define ID_ROCK_MEDIUM          1025
+#define ID_ROCK_SMALL           1026
+
+#define ID_MISSILE              1030
+
+#define ID_BIT                  1040
+#define ID_EXHAUST              1041
+
+#define ID_ENERGY_POWERUP       1310
+#define ID_TELEPORT_POWERUP     1311
+#define ID_BRAKE_POWERUP        1312
+#define ID_SHIELD_POWERUP       1313
+#define ID_SHOOT_POWERUP        1314
+
+#define ID_SHIP                 1350
+#define ID_SHIELD               1351
+
+#define MAX_SHIELD_AGE          350
+#define MAX_POWERUP_AGE         500
+#define MAX_MISSILE_AGE         40
+
+class KMissile : public AnimatedPixmapItem
+{
+public:
+    KMissile( const QList<QPixmap> &s, QGraphicsScene *c ) : AnimatedPixmapItem( s, c )
+        { myAge = 0; }
+
+    virtual int type() const { return ID_MISSILE; }
+
+    void growOlder() { myAge++; }
+    bool expired() { return myAge > MAX_MISSILE_AGE; }
+
+private:
+    int myAge;
+};
+
+class KBit : public AnimatedPixmapItem
+{
+public:
+    KBit( const QList<QPixmap> &s, QGraphicsScene *c ) : AnimatedPixmapItem( s, c )
+	{  death = 7; }
+
+    virtual int type() const {  return ID_BIT; }
+
+    void setDeath( int d ) { death = d; }
+    void growOlder() { death--; }
+    bool expired() { return death <= 0; }
+
+private:
+    int death;
+};
+
+class KExhaust : public AnimatedPixmapItem
+{
+public:
+    KExhaust( const QList<QPixmap> &s, QGraphicsScene *c ) : AnimatedPixmapItem( s, c )
+	{  death = 1; }
+
+    virtual int type() const {  return ID_EXHAUST; }
+
+    void setDeath( int d ) { death = d; }
+    void growOlder() { death--; }
+    bool expired() { return death <= 0; }
+
+private:
+    int death;
+};
+
+class KPowerup : public AnimatedPixmapItem
+{
+public:
+  KPowerup( const QList<QPixmap> &s, QGraphicsScene *c, int t ) : AnimatedPixmapItem( s, c ),
+        myAge( 0 ), _type(t) { }
+
+  virtual int type() const { return _type; }
+
+  void growOlder() { myAge++; }
+  bool expired() const { return myAge > MAX_POWERUP_AGE; }
+
+protected:
+  int myAge;
+  int _type;
+};
+
+class KRock : public AnimatedPixmapItem
+{
+public:
+    KRock (const QList<QPixmap> &s, QGraphicsScene *c, int t, int sk, int st) : AnimatedPixmapItem( s, c )
+        { _type = t; skip = cskip = sk; step = st; }
+
+    void nextFrame()
+	{
+	    if (cskip-- <= 0) {
+		setFrame( (frame()+step+frameCount())%frameCount() );
+		cskip = QABS(skip);
+	    }
+	}
+
+    virtual int type() const { return _type; }
+
+private:
+    int _type;
+    int skip;
+    int cskip;
+    int step;
+};
+
+class KShield : public AnimatedPixmapItem
+{
+public:
+  KShield( QList<QPixmap> &s, QGraphicsScene *c )
+      : AnimatedPixmapItem( s, c ) {}
+
+  virtual int type() const { return ID_SHIELD; }
+};
+
+#endif
diff --git a/examples/graphicsview/portedasteroids/sprites/bits/bits.ini b/examples/graphicsview/portedasteroids/sprites/bits/bits.ini
new file mode 100644
index 0000000000..cb2976f88f
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/bits/bits.ini
@@ -0,0 +1,9 @@
+Cyclic_Animation=On
+Width=12
+Height=12
+Final_frame=16 ;; NR_ROTS
+Antialias=On
+Output_Alpha=On
+Output_to_File=On
+Output_File_Type=n
+Input_File_Name=bits.pov
diff --git a/examples/graphicsview/portedasteroids/sprites/bits/bits.pov b/examples/graphicsview/portedasteroids/sprites/bits/bits.pov
new file mode 100644
index 0000000000..9be7ccb67b
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/bits/bits.pov
@@ -0,0 +1,31 @@
+
+#version 3.0
+global_settings { assumed_gamma 2.0 }
+
+#include "colors.inc"
+#include "textures.inc"
+#include "metals.inc"
+
+camera {
+  location <15, -15, -100>
+  look_at <0, 0, 0>
+}
+
+light_source { <50, 50, -50> colour White }
+light_source { <0, 0, -50> colour White }
+
+prism {
+    linear_sweep
+    linear_spline
+    0,
+    0.2,
+    5,
+    <2, 0>, <0, 2>, <-1, 1>, <0, -3>, <2, 0>
+    texture { T_Silver_2A }
+
+    rotate <360*clock, 50, 30>
+    scale <20, 20, 20>
+}
+
+
+
diff --git a/examples/graphicsview/portedasteroids/sprites/bits/bits0000.png b/examples/graphicsview/portedasteroids/sprites/bits/bits0000.png
new file mode 100644
index 0000000000..5ec9d02940
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/bits/bits0000.png
diff --git a/examples/graphicsview/portedasteroids/sprites/bits/bits0001.png b/examples/graphicsview/portedasteroids/sprites/bits/bits0001.png
new file mode 100644
index 0000000000..07b4012337
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/bits/bits0001.png
diff --git a/examples/graphicsview/portedasteroids/sprites/bits/bits0002.png b/examples/graphicsview/portedasteroids/sprites/bits/bits0002.png
new file mode 100644
index 0000000000..833379229c
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/bits/bits0002.png
diff --git a/examples/graphicsview/portedasteroids/sprites/bits/bits0003.png b/examples/graphicsview/portedasteroids/sprites/bits/bits0003.png
new file mode 100644
index 0000000000..9f1fc02836
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/bits/bits0003.png
diff --git a/examples/graphicsview/portedasteroids/sprites/bits/bits0004.png b/examples/graphicsview/portedasteroids/sprites/bits/bits0004.png
new file mode 100644
index 0000000000..eb1cc090c9
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/bits/bits0004.png
diff --git a/examples/graphicsview/portedasteroids/sprites/bits/bits0005.png b/examples/graphicsview/portedasteroids/sprites/bits/bits0005.png
new file mode 100644
index 0000000000..149be63c1a
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/bits/bits0005.png
diff --git a/examples/graphicsview/portedasteroids/sprites/bits/bits0006.png b/examples/graphicsview/portedasteroids/sprites/bits/bits0006.png
new file mode 100644
index 0000000000..4ac75c8ed1
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/bits/bits0006.png
diff --git a/examples/graphicsview/portedasteroids/sprites/bits/bits0007.png b/examples/graphicsview/portedasteroids/sprites/bits/bits0007.png
new file mode 100644
index 0000000000..907241dd7a
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/bits/bits0007.png
diff --git a/examples/graphicsview/portedasteroids/sprites/bits/bits0008.png b/examples/graphicsview/portedasteroids/sprites/bits/bits0008.png
new file mode 100644
index 0000000000..15332684fe
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/bits/bits0008.png
diff --git a/examples/graphicsview/portedasteroids/sprites/bits/bits0009.png b/examples/graphicsview/portedasteroids/sprites/bits/bits0009.png
new file mode 100644
index 0000000000..05402ba9eb
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/bits/bits0009.png
diff --git a/examples/graphicsview/portedasteroids/sprites/bits/bits0010.png b/examples/graphicsview/portedasteroids/sprites/bits/bits0010.png
new file mode 100644
index 0000000000..ca4f2297a9
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/bits/bits0010.png
diff --git a/examples/graphicsview/portedasteroids/sprites/bits/bits0011.png b/examples/graphicsview/portedasteroids/sprites/bits/bits0011.png
new file mode 100644
index 0000000000..91913c032f
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/bits/bits0011.png
diff --git a/examples/graphicsview/portedasteroids/sprites/bits/bits0012.png b/examples/graphicsview/portedasteroids/sprites/bits/bits0012.png
new file mode 100644
index 0000000000..e55d4399a4
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/bits/bits0012.png
diff --git a/examples/graphicsview/portedasteroids/sprites/bits/bits0013.png b/examples/graphicsview/portedasteroids/sprites/bits/bits0013.png
new file mode 100644
index 0000000000..9c7343600d
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/bits/bits0013.png
diff --git a/examples/graphicsview/portedasteroids/sprites/bits/bits0014.png b/examples/graphicsview/portedasteroids/sprites/bits/bits0014.png
new file mode 100644
index 0000000000..f0463a2a9b
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/bits/bits0014.png
diff --git a/examples/graphicsview/portedasteroids/sprites/bits/bits0015.png b/examples/graphicsview/portedasteroids/sprites/bits/bits0015.png
new file mode 100644
index 0000000000..bce35aac53
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/bits/bits0015.png
diff --git a/examples/graphicsview/portedasteroids/sprites/exhaust/exhaust.png b/examples/graphicsview/portedasteroids/sprites/exhaust/exhaust.png
new file mode 100644
index 0000000000..1d9bc33679
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/exhaust/exhaust.png
diff --git a/examples/graphicsview/portedasteroids/sprites/missile/missile.png b/examples/graphicsview/portedasteroids/sprites/missile/missile.png
new file mode 100644
index 0000000000..f1a83b2fc3
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/missile/missile.png
diff --git a/examples/graphicsview/portedasteroids/sprites/powerups/brake.png b/examples/graphicsview/portedasteroids/sprites/powerups/brake.png
new file mode 100644
index 0000000000..5f65a115fb
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/powerups/brake.png
diff --git a/examples/graphicsview/portedasteroids/sprites/powerups/energy.png b/examples/graphicsview/portedasteroids/sprites/powerups/energy.png
new file mode 100644
index 0000000000..4b40074873
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/powerups/energy.png
diff --git a/examples/graphicsview/portedasteroids/sprites/powerups/shield.png b/examples/graphicsview/portedasteroids/sprites/powerups/shield.png
new file mode 100644
index 0000000000..6ac686896e
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/powerups/shield.png
diff --git a/examples/graphicsview/portedasteroids/sprites/powerups/shoot.png b/examples/graphicsview/portedasteroids/sprites/powerups/shoot.png
new file mode 100644
index 0000000000..5e5bf08d32
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/powerups/shoot.png
diff --git a/examples/graphicsview/portedasteroids/sprites/powerups/teleport.png b/examples/graphicsview/portedasteroids/sprites/powerups/teleport.png
new file mode 100644
index 0000000000..009c229eda
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/powerups/teleport.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock1.ini b/examples/graphicsview/portedasteroids/sprites/rock1/rock1.ini
new file mode 100644
index 0000000000..e42fc76624
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock1.ini
@@ -0,0 +1,9 @@
+Cyclic_Animation=On
+Width=48
+Height=48
+Final_frame=32 ;; NR_ROTS
+Antialias=On
+Output_Alpha=On
+Output_to_File=On
+Output_File_Type=n
+Input_File_Name=rock1.pov
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock1.pov b/examples/graphicsview/portedasteroids/sprites/rock1/rock1.pov
new file mode 100644
index 0000000000..58298c0505
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock1.pov
@@ -0,0 +1,26 @@
+#include "colors.inc"
+#include "shapes.inc"
+#include "textures.inc"
+// #include "stones.inc"
+
+camera {
+	location        <2,2,-6>
+	up              <0, 1, 0>
+//	right           <4/3, 0, 0>
+	look_at         <0,0,0>
+}
+
+object { light_source { <10, 5, -5>  color red 1.1 green 1.1 blue 1.0 } }
+
+#declare Rock =
+mesh {
+ #include "rock.inc"   /* collection of triangle or smooth_triangle data */
+}
+
+object {
+  Rock
+  texture {  pigment {White}  }
+  scale 1.9
+  rotate <60, 45, 360*clock>
+}
+
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10000.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10000.png
new file mode 100644
index 0000000000..5fe70ef29a
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10000.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10001.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10001.png
new file mode 100644
index 0000000000..ea66dacd1c
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10001.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10002.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10002.png
new file mode 100644
index 0000000000..cb55ed0829
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10002.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10003.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10003.png
new file mode 100644
index 0000000000..f82934c3c4
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10003.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10004.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10004.png
new file mode 100644
index 0000000000..04efc2baac
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10004.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10005.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10005.png
new file mode 100644
index 0000000000..b9c0d03e96
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10005.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10006.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10006.png
new file mode 100644
index 0000000000..7f9126728d
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10006.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10007.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10007.png
new file mode 100644
index 0000000000..b28f219dab
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10007.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10008.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10008.png
new file mode 100644
index 0000000000..0153d4aee0
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10008.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10009.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10009.png
new file mode 100644
index 0000000000..c04d82720f
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10009.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10010.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10010.png
new file mode 100644
index 0000000000..c7d3c40d21
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10010.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10011.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10011.png
new file mode 100644
index 0000000000..233dfcecbc
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10011.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10012.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10012.png
new file mode 100644
index 0000000000..ec7b5ba308
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10012.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10013.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10013.png
new file mode 100644
index 0000000000..22eac3ad63
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10013.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10014.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10014.png
new file mode 100644
index 0000000000..ad1503d13f
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10014.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10015.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10015.png
new file mode 100644
index 0000000000..cec22e2773
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10015.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10016.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10016.png
new file mode 100644
index 0000000000..c7a96cb2e9
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10016.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10017.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10017.png
new file mode 100644
index 0000000000..c8310bd645
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10017.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10018.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10018.png
new file mode 100644
index 0000000000..b8d436b0d2
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10018.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10019.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10019.png
new file mode 100644
index 0000000000..e5d07997e6
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10019.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10020.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10020.png
new file mode 100644
index 0000000000..440f8d00c9
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10020.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10021.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10021.png
new file mode 100644
index 0000000000..de3d54df7f
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10021.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10022.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10022.png
new file mode 100644
index 0000000000..698056d5cb
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10022.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10023.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10023.png
new file mode 100644
index 0000000000..4e6ba042a8
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10023.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10024.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10024.png
new file mode 100644
index 0000000000..3b428509a1
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10024.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10025.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10025.png
new file mode 100644
index 0000000000..68139364f0
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10025.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10026.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10026.png
new file mode 100644
index 0000000000..4a2b171119
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10026.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10027.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10027.png
new file mode 100644
index 0000000000..30448fb693
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10027.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10028.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10028.png
new file mode 100644
index 0000000000..43ca1a91db
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10028.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10029.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10029.png
new file mode 100644
index 0000000000..9d7e88857e
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10029.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10030.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10030.png
new file mode 100644
index 0000000000..39b2ad2def
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10030.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock1/rock10031.png b/examples/graphicsview/portedasteroids/sprites/rock1/rock10031.png
new file mode 100644
index 0000000000..257ec7bf32
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock1/rock10031.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock2.ini b/examples/graphicsview/portedasteroids/sprites/rock2/rock2.ini
new file mode 100644
index 0000000000..d50e6fada7
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock2.ini
@@ -0,0 +1,9 @@
+Cyclic_Animation=On
+Width=32
+Height=32
+Final_frame=32 ;; NR_ROTS
+Antialias=On
+Output_Alpha=On
+Output_to_File=On
+Output_File_Type=n
+Input_File_Name=rock2.pov
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock2.pov b/examples/graphicsview/portedasteroids/sprites/rock2/rock2.pov
new file mode 100644
index 0000000000..2f37a20620
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock2.pov
@@ -0,0 +1,26 @@
+#include "colors.inc"
+#include "shapes.inc"
+#include "textures.inc"
+// #include "stones.inc"
+
+camera {
+	location        <2,2,-6>
+	up              <0, 1, 0>
+//	right           <4/3, 0, 0>
+	look_at         <0,0,0>
+}
+
+object { light_source { <10, 5, -5>  color red 1.1 green 1.1 blue 1.0 } }
+
+#declare Rock =
+mesh {
+ #include "rock.inc"   /* collection of triangle or smooth_triangle data */
+}
+
+object {
+  Rock
+  texture {  pigment {White}  }
+  scale 1.9
+  rotate <60, 30, 360*clock>
+}
+
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20000.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20000.png
new file mode 100644
index 0000000000..5cb52bb813
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20000.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20001.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20001.png
new file mode 100644
index 0000000000..d765be1bd9
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20001.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20002.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20002.png
new file mode 100644
index 0000000000..84e2380cc2
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20002.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20003.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20003.png
new file mode 100644
index 0000000000..39772b8aad
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20003.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20004.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20004.png
new file mode 100644
index 0000000000..b983079186
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20004.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20005.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20005.png
new file mode 100644
index 0000000000..70bb4d829e
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20005.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20006.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20006.png
new file mode 100644
index 0000000000..cf5c2f4c47
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20006.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20007.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20007.png
new file mode 100644
index 0000000000..479c21d277
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20007.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20008.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20008.png
new file mode 100644
index 0000000000..871abca06a
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20008.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20009.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20009.png
new file mode 100644
index 0000000000..bc31fbb526
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20009.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20010.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20010.png
new file mode 100644
index 0000000000..1da9953348
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20010.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20011.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20011.png
new file mode 100644
index 0000000000..d542c6edaa
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20011.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20012.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20012.png
new file mode 100644
index 0000000000..d104ff954b
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20012.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20013.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20013.png
new file mode 100644
index 0000000000..e12943df91
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20013.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20014.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20014.png
new file mode 100644
index 0000000000..dc7529cfdf
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20014.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20015.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20015.png
new file mode 100644
index 0000000000..0b49c2cde5
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20015.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20016.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20016.png
new file mode 100644
index 0000000000..adbad98698
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20016.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20017.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20017.png
new file mode 100644
index 0000000000..5a8aeef218
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20017.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20018.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20018.png
new file mode 100644
index 0000000000..11c6af47c4
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20018.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20019.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20019.png
new file mode 100644
index 0000000000..026b72b54a
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20019.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20020.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20020.png
new file mode 100644
index 0000000000..8bc7e20fe1
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20020.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20021.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20021.png
new file mode 100644
index 0000000000..e0a7626f97
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20021.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20022.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20022.png
new file mode 100644
index 0000000000..5796e12cd4
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20022.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20023.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20023.png
new file mode 100644
index 0000000000..d2cf0c6870
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20023.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20024.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20024.png
new file mode 100644
index 0000000000..071ce210fa
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20024.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20025.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20025.png
new file mode 100644
index 0000000000..ae8101d77f
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20025.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20026.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20026.png
new file mode 100644
index 0000000000..f2681d46f4
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20026.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20027.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20027.png
new file mode 100644
index 0000000000..e83fd41000
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20027.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20028.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20028.png
new file mode 100644
index 0000000000..5621b4d6d7
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20028.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20029.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20029.png
new file mode 100644
index 0000000000..aec4a34746
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20029.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20030.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20030.png
new file mode 100644
index 0000000000..89a8f5fa6d
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20030.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock2/rock20031.png b/examples/graphicsview/portedasteroids/sprites/rock2/rock20031.png
new file mode 100644
index 0000000000..69f537589b
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock2/rock20031.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock3.ini b/examples/graphicsview/portedasteroids/sprites/rock3/rock3.ini
new file mode 100644
index 0000000000..26a3cf9694
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock3.ini
@@ -0,0 +1,9 @@
+Cyclic_Animation=On
+Width=20
+Height=20
+Final_frame=32 ;; NR_ROTS
+Antialias=On
+Output_Alpha=On
+Output_to_File=On
+Output_File_Type=n
+Input_File_Name=rock3.pov
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock3.pov b/examples/graphicsview/portedasteroids/sprites/rock3/rock3.pov
new file mode 100644
index 0000000000..2f37a20620
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock3.pov
@@ -0,0 +1,26 @@
+#include "colors.inc"
+#include "shapes.inc"
+#include "textures.inc"
+// #include "stones.inc"
+
+camera {
+	location        <2,2,-6>
+	up              <0, 1, 0>
+//	right           <4/3, 0, 0>
+	look_at         <0,0,0>
+}
+
+object { light_source { <10, 5, -5>  color red 1.1 green 1.1 blue 1.0 } }
+
+#declare Rock =
+mesh {
+ #include "rock.inc"   /* collection of triangle or smooth_triangle data */
+}
+
+object {
+  Rock
+  texture {  pigment {White}  }
+  scale 1.9
+  rotate <60, 30, 360*clock>
+}
+
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30000.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30000.png
new file mode 100644
index 0000000000..de1205a888
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30000.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30001.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30001.png
new file mode 100644
index 0000000000..12ebc00313
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30001.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30002.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30002.png
new file mode 100644
index 0000000000..ebb899e334
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30002.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30003.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30003.png
new file mode 100644
index 0000000000..1ff7a0675d
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30003.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30004.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30004.png
new file mode 100644
index 0000000000..5b505bf10b
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30004.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30005.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30005.png
new file mode 100644
index 0000000000..f9680dcbaa
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30005.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30006.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30006.png
new file mode 100644
index 0000000000..e29746afca
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30006.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30007.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30007.png
new file mode 100644
index 0000000000..f01baa6b37
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30007.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30008.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30008.png
new file mode 100644
index 0000000000..cd10711322
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30008.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30009.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30009.png
new file mode 100644
index 0000000000..4f32955a10
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30009.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30010.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30010.png
new file mode 100644
index 0000000000..bb61d549b9
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30010.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30011.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30011.png
new file mode 100644
index 0000000000..8486e5a457
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30011.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30012.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30012.png
new file mode 100644
index 0000000000..d9ae4191e1
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30012.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30013.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30013.png
new file mode 100644
index 0000000000..ce694002ab
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30013.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30014.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30014.png
new file mode 100644
index 0000000000..981e92c130
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30014.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30015.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30015.png
new file mode 100644
index 0000000000..b8fb00c84e
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30015.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30016.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30016.png
new file mode 100644
index 0000000000..72bc42fc75
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30016.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30017.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30017.png
new file mode 100644
index 0000000000..c89f358cee
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30017.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30018.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30018.png
new file mode 100644
index 0000000000..e1ba724d4b
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30018.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30019.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30019.png
new file mode 100644
index 0000000000..5f004a7668
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30019.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30020.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30020.png
new file mode 100644
index 0000000000..58009bf92a
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30020.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30021.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30021.png
new file mode 100644
index 0000000000..8d9549c856
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30021.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30022.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30022.png
new file mode 100644
index 0000000000..1e8a1c2336
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30022.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30023.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30023.png
new file mode 100644
index 0000000000..9b960d6695
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30023.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30024.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30024.png
new file mode 100644
index 0000000000..6c15f2b897
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30024.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30025.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30025.png
new file mode 100644
index 0000000000..12b05da545
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30025.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30026.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30026.png
new file mode 100644
index 0000000000..16190e9442
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30026.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30027.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30027.png
new file mode 100644
index 0000000000..a8625015d9
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30027.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30028.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30028.png
new file mode 100644
index 0000000000..e3e0c18067
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30028.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30029.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30029.png
new file mode 100644
index 0000000000..ec70b84437
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30029.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30030.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30030.png
new file mode 100644
index 0000000000..da48df145e
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30030.png
diff --git a/examples/graphicsview/portedasteroids/sprites/rock3/rock30031.png b/examples/graphicsview/portedasteroids/sprites/rock3/rock30031.png
new file mode 100644
index 0000000000..c1dc1b92fc
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/rock3/rock30031.png
diff --git a/examples/graphicsview/portedasteroids/sprites/shield/shield0000.png b/examples/graphicsview/portedasteroids/sprites/shield/shield0000.png
new file mode 100644
index 0000000000..72332544af
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/shield/shield0000.png
diff --git a/examples/graphicsview/portedasteroids/sprites/shield/shield0001.png b/examples/graphicsview/portedasteroids/sprites/shield/shield0001.png
new file mode 100644
index 0000000000..2b0bc9d0d1
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/shield/shield0001.png
diff --git a/examples/graphicsview/portedasteroids/sprites/shield/shield0002.png b/examples/graphicsview/portedasteroids/sprites/shield/shield0002.png
new file mode 100644
index 0000000000..cdc0fe37ce
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/shield/shield0002.png
diff --git a/examples/graphicsview/portedasteroids/sprites/shield/shield0003.png b/examples/graphicsview/portedasteroids/sprites/shield/shield0003.png
new file mode 100644
index 0000000000..979ed5ad77
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/shield/shield0003.png
diff --git a/examples/graphicsview/portedasteroids/sprites/shield/shield0004.png b/examples/graphicsview/portedasteroids/sprites/shield/shield0004.png
new file mode 100644
index 0000000000..0bb93a22d8
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/shield/shield0004.png
diff --git a/examples/graphicsview/portedasteroids/sprites/shield/shield0005.png b/examples/graphicsview/portedasteroids/sprites/shield/shield0005.png
new file mode 100644
index 0000000000..32210bdd24
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/shield/shield0005.png
diff --git a/examples/graphicsview/portedasteroids/sprites/shield/shield0006.png b/examples/graphicsview/portedasteroids/sprites/shield/shield0006.png
new file mode 100644
index 0000000000..76c9920394
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/shield/shield0006.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship.ini b/examples/graphicsview/portedasteroids/sprites/ship/ship.ini
new file mode 100644
index 0000000000..479cc20ea8
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship.ini
@@ -0,0 +1,9 @@
+Cyclic_Animation=On
+Width=42
+Height=42
+Final_frame=32 ;; NR_ROTS
+Antialias=On
+Output_Alpha=On
+Output_to_File=On
+Output_File_Type=n
+Input_File_Name=ship.pov
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship.pov b/examples/graphicsview/portedasteroids/sprites/ship/ship.pov
new file mode 100644
index 0000000000..8f185cd7b5
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship.pov
@@ -0,0 +1,128 @@
+
+#version 3.0
+global_settings { assumed_gamma 2.0 }
+
+#include "colors.inc"
+#include "textures.inc"
+#include "metals.inc"
+
+camera {
+  orthographic
+  up <0, 130, 0>
+  right <130, 0, 0>
+  location <0, 0, -130>
+  look_at <0, 0, 0>
+}
+
+light_source { <50, 25, -25> colour White }
+light_source { <0, 0, -100> colour Gray80 }
+
+#declare ShipColor = color red 1.0 green 1.0 blue 0.9
+
+#declare BaseTexture =
+texture {
+    pigment { ShipColor }
+}
+
+#declare Grubby =
+texture {
+    pigment {
+        bozo
+        color_map {
+            [0.0 color rgbt <1, 1, 1, 1>]
+            [0.8 color rgbt <0.9, 0.9, 0.9, 0.5>]
+            [1.0 color rgbt <0.8, 0.8, 0.8, 0.5>]
+        }
+        turbulence 2.0
+        scale 3
+    }
+}
+
+#declare ShipTexture =
+texture { BaseTexture }
+texture { Grubby }
+
+union {
+    cone {
+	<12, 0, 0>, 0.5
+	<11, 0, 0>, 1.0
+	texture { ShipTexture }
+    }
+    cone {
+	<11, 0, 0>, 1.0
+	<8, 0, 0>, 2.0
+	texture { ShipTexture }
+    }
+    cone {
+	<8, 0, 0>, 2.0
+	<3.5, 0, 0>, 3.8
+	texture { ShipTexture }
+    }
+    difference {
+        cone {
+            <8, 0, -0.01>, 2.0
+            <3.5, 0, -0.01>, 3.8
+            pigment { color Gray20 }
+        }
+        box {
+            <9, -4.0, -3.7>,
+            <2, 4.0, 10>
+            rotate <0, -18, 0>
+        }
+        box {
+            <6.5, -4.0, -8>,
+            <10, 4.0, 8>
+        }
+        box {
+            <2, -4.0, -8>,
+            <4.5, 4.0, 8>
+        }
+    }
+    cone {
+	<3.5, 0, 0>, 3.8
+	<2, 0, 0>, 4.0
+	texture { ShipTexture }
+    }
+    cylinder {
+        <2, 0, 0>,
+        <-9, 0, 0>,
+        4.0
+        texture { ShipTexture }
+    }
+    cone {
+	<-9, 0, 0>, 4.0
+	<-10, 0, 0>, 3.5
+	texture { ShipTexture }
+    }
+    prism {
+	linear_sweep
+	linear_spline
+	0,
+	0.5,
+	4,
+	<7.5, 0>, <-7.5, 10>, <-7.5, -10>, <7.5, 0>
+	rotate <90, 0, 0>
+	texture { T_Silver_2A }
+	texture { ShipTexture }
+    }
+    prism {
+	linear_sweep
+	linear_spline
+	-0.5,
+	0.5,
+	4,
+	<4, 0>, <-7.5, 5>, <-7.5, -5>, <4, 0>
+	pigment { color White }
+    }
+    cone {
+	<-12, 0, 0>, 3.0
+	<-10, 0, 0>, 2.0
+	texture { T_Silver_2A }
+	pigment { color Gray60 }
+    }
+
+    rotate <0, 0,-360*clock>
+    scale <5, 5, 5>
+}
+
+
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0000.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0000.png
new file mode 100644
index 0000000000..a8f1bb37b7
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0000.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0001.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0001.png
new file mode 100644
index 0000000000..861f1301ee
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0001.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0002.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0002.png
new file mode 100644
index 0000000000..418ced1372
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0002.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0003.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0003.png
new file mode 100644
index 0000000000..50a386bb24
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0003.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0004.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0004.png
new file mode 100644
index 0000000000..f2bc0bc417
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0004.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0005.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0005.png
new file mode 100644
index 0000000000..7280485fcb
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0005.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0006.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0006.png
new file mode 100644
index 0000000000..51d26e9b57
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0006.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0007.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0007.png
new file mode 100644
index 0000000000..682c0428f4
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0007.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0008.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0008.png
new file mode 100644
index 0000000000..003d7fa2e8
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0008.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0009.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0009.png
new file mode 100644
index 0000000000..538b879967
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0009.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0010.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0010.png
new file mode 100644
index 0000000000..17999cd408
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0010.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0011.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0011.png
new file mode 100644
index 0000000000..1a4bbe9dee
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0011.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0012.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0012.png
new file mode 100644
index 0000000000..2523d85332
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0012.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0013.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0013.png
new file mode 100644
index 0000000000..8bd5971719
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0013.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0014.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0014.png
new file mode 100644
index 0000000000..a164ab7b9b
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0014.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0015.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0015.png
new file mode 100644
index 0000000000..ca8e0b9db7
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0015.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0016.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0016.png
new file mode 100644
index 0000000000..cfaf8c4b58
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0016.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0017.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0017.png
new file mode 100644
index 0000000000..8049617220
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0017.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0018.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0018.png
new file mode 100644
index 0000000000..4a3421bac4
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0018.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0019.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0019.png
new file mode 100644
index 0000000000..786d37550b
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0019.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0020.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0020.png
new file mode 100644
index 0000000000..bd4365cde0
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0020.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0021.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0021.png
new file mode 100644
index 0000000000..eb358c1299
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0021.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0022.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0022.png
new file mode 100644
index 0000000000..eb865e1331
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0022.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0023.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0023.png
new file mode 100644
index 0000000000..3738ce2c16
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0023.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0024.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0024.png
new file mode 100644
index 0000000000..a7c1adc92d
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0024.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0025.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0025.png
new file mode 100644
index 0000000000..2ca3aaebdf
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0025.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0026.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0026.png
new file mode 100644
index 0000000000..4661ca58aa
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0026.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0027.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0027.png
new file mode 100644
index 0000000000..f5c9203807
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0027.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0028.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0028.png
new file mode 100644
index 0000000000..08353d4283
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0028.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0029.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0029.png
new file mode 100644
index 0000000000..8685d31332
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0029.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0030.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0030.png
new file mode 100644
index 0000000000..78dd469536
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0030.png
diff --git a/examples/graphicsview/portedasteroids/sprites/ship/ship0031.png b/examples/graphicsview/portedasteroids/sprites/ship/ship0031.png
new file mode 100644
index 0000000000..6cd06439ff
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/sprites/ship/ship0031.png
diff --git a/examples/graphicsview/portedasteroids/toplevel.cpp b/examples/graphicsview/portedasteroids/toplevel.cpp
new file mode 100644
index 0000000000..1aecc842c8
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/toplevel.cpp
@@ -0,0 +1,543 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+ * KAsteroids - Copyright (c) Martin R. Jones 1997
+ *
+ * Part of the KDE project
+ */
+//	--- toplevel.cpp ---
+#include <q3accel.h>
+#include <qlabel.h>
+#include <qlayout.h>
+#include <qlcdnumber.h>
+#include <qpushbutton.h>
+
+#include <qapplication.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QShowEvent>
+#include <Q3Frame>
+#include <QPixmap>
+#include <QHideEvent>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
+
+#include "toplevel.h"
+#include "ledmeter.h"
+
+
+#define SB_SCORE	1
+#define SB_LEVEL	2
+#define SB_SHIPS	3
+
+struct SLevel
+{
+    int    nrocks;
+    double rockSpeed;
+};
+
+#define MAX_LEVELS	16
+
+SLevel levels[MAX_LEVELS] =
+{
+    { 1, 0.4 },
+    { 1, 0.6 },
+    { 2, 0.5 },
+    { 2, 0.7 },
+    { 2, 0.8 },
+    { 3, 0.6 },
+    { 3, 0.7 },
+    { 3, 0.8 },
+    { 4, 0.6 },
+    { 4, 0.7 },
+    { 4, 0.8 },
+    { 5, 0.7 },
+    { 5, 0.8 },
+    { 5, 0.9 },
+    { 5, 1.0 }
+};
+
+const char *soundEvents[] =
+{
+    "ShipDestroyed",
+    "RockDestroyed",
+    0
+};
+
+const char *soundDefaults[] =
+{
+    "Explosion.wav",
+    "ploop.wav",
+    0
+};
+
+
+KAstTopLevel::KAstTopLevel( QWidget *parent, const char *name )
+    : Q3MainWindow( parent, name, 0 )
+{
+    QWidget *border = new QWidget( this );
+    border->setBackgroundColor( Qt::black );
+    setCentralWidget( border );
+
+    Q3VBoxLayout *borderLayout = new Q3VBoxLayout( border );
+    borderLayout->addStretch( 1 );
+
+    QWidget *mainWin = new QWidget( border );
+    mainWin->setFixedSize(640, 480);
+    borderLayout->addWidget( mainWin, 0, Qt::AlignHCenter );
+
+    borderLayout->addStretch( 1 );
+
+    view = new KAsteroidsView( mainWin );
+    view->setFocusPolicy( Qt::StrongFocus );
+    connect( view, SIGNAL( shipKilled() ), SLOT( slotShipKilled() ) );
+    connect( view, SIGNAL( rockHit(int) ), SLOT( slotRockHit(int) ) );
+    connect( view, SIGNAL( rocksRemoved() ), SLOT( slotRocksRemoved() ) );
+    connect( view, SIGNAL( updateVitals() ), SLOT( slotUpdateVitals() ) );
+
+    Q3VBoxLayout *vb = new Q3VBoxLayout( mainWin );
+    Q3HBoxLayout *hb = new Q3HBoxLayout;
+    Q3HBoxLayout *hbd = new Q3HBoxLayout;
+    vb->addLayout( hb );
+
+    QFont labelFont( "helvetica", 24 );
+    QColorGroup grp( Qt::darkGreen, Qt::black, QColor( 128, 128, 128 ),
+	    QColor( 64, 64, 64 ), Qt::black, Qt::darkGreen, Qt::black );
+    QPalette pal( grp, grp, grp );
+
+    mainWin->setPalette( pal );
+
+    hb->addSpacing( 10 );
+
+    QLabel *label;
+    label = new QLabel( tr("Score"), mainWin );
+    label->setFont( labelFont );
+    label->setPalette( pal );
+    label->setFixedWidth( label->sizeHint().width() );
+    hb->addWidget( label );
+
+    scoreLCD = new QLCDNumber( 6, mainWin );
+    scoreLCD->setFrameStyle( Q3Frame::NoFrame );
+    scoreLCD->setSegmentStyle( QLCDNumber::Flat );
+    scoreLCD->setFixedWidth( 150 );
+    scoreLCD->setPalette( pal );
+    hb->addWidget( scoreLCD );
+    hb->addStretch( 10 );
+
+    label = new QLabel( tr("Level"), mainWin );
+    label->setFont( labelFont );
+    label->setPalette( pal );
+    label->setFixedWidth( label->sizeHint().width() );
+    hb->addWidget( label );
+
+    levelLCD = new QLCDNumber( 2, mainWin );
+    levelLCD->setFrameStyle( Q3Frame::NoFrame );
+    levelLCD->setSegmentStyle( QLCDNumber::Flat );
+    levelLCD->setFixedWidth( 70 );
+    levelLCD->setPalette( pal );
+    hb->addWidget( levelLCD );
+    hb->addStretch( 10 );
+
+    label = new QLabel( tr("Ships"), mainWin );
+    label->setFont( labelFont );
+    label->setFixedWidth( label->sizeHint().width() );
+    label->setPalette( pal );
+    hb->addWidget( label );
+
+    shipsLCD = new QLCDNumber( 1, mainWin );
+    shipsLCD->setFrameStyle( Q3Frame::NoFrame );
+    shipsLCD->setSegmentStyle( QLCDNumber::Flat );
+    shipsLCD->setFixedWidth( 40 );
+    shipsLCD->setPalette( pal );
+    hb->addWidget( shipsLCD );
+
+    hb->addStrut( 30 );
+
+    vb->addWidget( view, 10 );
+
+// -- bottom layout:
+    vb->addLayout( hbd );
+
+    QFont smallFont( "helvetica", 14 );
+    hbd->addSpacing( 10 );
+
+    QString sprites_prefix = ":/trolltech/examples/graphicsview/portedasteroids/sprites/";
+/*
+    label = new QLabel( tr( "T" ), mainWin );
+    label->setFont( smallFont );
+    label->setFixedWidth( label->sizeHint().width() );
+    label->setPalette( pal );
+    hbd->addWidget( label );
+
+    teleportsLCD = new QLCDNumber( 1, mainWin );
+    teleportsLCD->setFrameStyle( QFrame::NoFrame );
+    teleportsLCD->setSegmentStyle( QLCDNumber::Flat );
+    teleportsLCD->setPalette( pal );
+    teleportsLCD->setFixedHeight( 20 );
+    hbd->addWidget( teleportsLCD );
+
+    hbd->addSpacing( 10 );
+*/
+    QPixmap pm( sprites_prefix + "powerups/brake.png" );
+    label = new QLabel( mainWin );
+    label->setPixmap( pm );
+    label->setFixedWidth( label->sizeHint().width() );
+    label->setPalette( pal );
+    hbd->addWidget( label );
+
+    brakesLCD = new QLCDNumber( 1, mainWin );
+    brakesLCD->setFrameStyle( Q3Frame::NoFrame );
+    brakesLCD->setSegmentStyle( QLCDNumber::Flat );
+    brakesLCD->setPalette( pal );
+    brakesLCD->setFixedHeight( 20 );
+    hbd->addWidget( brakesLCD );
+
+    hbd->addSpacing( 10 );
+
+    pm.load( sprites_prefix + "powerups/shield.png" );
+    label = new QLabel( mainWin );
+    label->setPixmap( pm );
+    label->setFixedWidth( label->sizeHint().width() );
+    label->setPalette( pal );
+    hbd->addWidget( label );
+
+    shieldLCD = new QLCDNumber( 1, mainWin );
+    shieldLCD->setFrameStyle( Q3Frame::NoFrame );
+    shieldLCD->setSegmentStyle( QLCDNumber::Flat );
+    shieldLCD->setPalette( pal );
+    shieldLCD->setFixedHeight( 20 );
+    hbd->addWidget( shieldLCD );
+
+    hbd->addSpacing( 10 );
+
+    pm.load( sprites_prefix + "powerups/shoot.png" );
+    label = new QLabel( mainWin );
+    label->setPixmap( pm );
+    label->setFixedWidth( label->sizeHint().width() );
+    label->setPalette( pal );
+    hbd->addWidget( label );
+
+    shootLCD = new QLCDNumber( 1, mainWin );
+    shootLCD->setFrameStyle( Q3Frame::NoFrame );
+    shootLCD->setSegmentStyle( QLCDNumber::Flat );
+    shootLCD->setPalette( pal );
+    shootLCD->setFixedHeight( 20 );
+    hbd->addWidget( shootLCD );
+
+    hbd->addStretch( 1 );
+
+    label = new QLabel( tr( "Fuel" ), mainWin );
+    label->setFont( smallFont );
+    label->setFixedWidth( label->sizeHint().width() + 10 );
+    label->setPalette( pal );
+    hbd->addWidget( label );
+
+    powerMeter = new KALedMeter( mainWin );
+    powerMeter->setFrameStyle( Q3Frame::Box | Q3Frame::Plain );
+    powerMeter->setRange( MAX_POWER_LEVEL );
+    powerMeter->addColorRange( 10, Qt::darkRed );
+    powerMeter->addColorRange( 20, QColor(160, 96, 0) );
+    powerMeter->addColorRange( 70, Qt::darkGreen );
+    powerMeter->setCount( 40 );
+    powerMeter->setPalette( pal );
+    powerMeter->setFixedSize( 200, 12 );
+    hbd->addWidget( powerMeter );
+
+    shipsRemain = 3;
+    showHiscores = FALSE;
+
+    actions.insert( Qt::Key_Up, Thrust );
+    actions.insert( Qt::Key_Left, RotateLeft );
+    actions.insert( Qt::Key_Right, RotateRight );
+    actions.insert( Qt::Key_Space, Shoot );
+    actions.insert( Qt::Key_Z, Teleport );
+    actions.insert( Qt::Key_X, Brake );
+    actions.insert( Qt::Key_S, Shield );
+    actions.insert( Qt::Key_P, Pause );
+    actions.insert( Qt::Key_L, Launch );
+    actions.insert( Qt::Key_N, NewGame );
+
+    view->showText( tr( "Press N to start playing" ), Qt::yellow );
+}
+
+KAstTopLevel::~KAstTopLevel()
+{
+}
+
+void KAstTopLevel::playSound( const char * )
+{
+}
+
+void KAstTopLevel::keyPressEvent( QKeyEvent *event )
+{
+    if ( event->isAutoRepeat() || !actions.contains( event->key() ) )
+    {
+        event->ignore();
+        return;
+    }
+
+    Action a = actions[ event->key() ];
+
+    switch ( a )
+    {
+        case RotateLeft:
+            view->rotateLeft( TRUE );
+            break;
+
+        case RotateRight:
+            view->rotateRight( TRUE );
+            break;
+
+        case Thrust:
+            view->thrust( TRUE );
+            break;
+
+        case Shoot:
+            view->shoot( TRUE );
+            break;
+
+        case Shield:
+            view->setShield( TRUE );
+            break;
+
+        case Teleport:
+            view->teleport( TRUE );
+            break;
+
+        case Brake:
+            view->brake( TRUE );
+            break;
+
+        default:
+            event->ignore();
+            return;
+    }
+    event->accept();
+}
+
+void KAstTopLevel::keyReleaseEvent( QKeyEvent *event )
+{
+    if ( event->isAutoRepeat() || !actions.contains( event->key() ) )
+    {
+        event->ignore();
+        return;
+    }
+
+    Action a = actions[ event->key() ];
+
+    switch ( a )
+    {
+        case RotateLeft:
+            view->rotateLeft( FALSE );
+            break;
+
+        case RotateRight:
+            view->rotateRight( FALSE );
+            break;
+
+        case Thrust:
+            view->thrust( FALSE );
+            break;
+
+        case Shoot:
+            view->shoot( FALSE );
+            break;
+
+        case Brake:
+            view->brake( FALSE );
+            break;
+
+        case Shield:
+            view->setShield( FALSE );
+            break;
+
+        case Teleport:
+            view->teleport( FALSE );
+            break;
+
+        case Launch:
+            if ( waitShip )
+            {
+                view->newShip();
+                waitShip = FALSE;
+                view->hideText();
+            }
+            else
+            {
+                event->ignore();
+                return;
+            }
+            break;
+
+	case NewGame:
+	    slotNewGame();
+	    break;
+/*
+        case Pause:
+            {
+                view->pause( TRUE );
+                QMessageBox::information( this,
+                                          tr("KAsteroids is paused"),
+                                          tr("Paused") );
+                view->pause( FALSE );
+            }
+            break;
+*/
+        default:
+            event->ignore();
+            return;
+    }
+
+    event->accept();
+}
+
+void KAstTopLevel::showEvent( QShowEvent *e )
+{
+    Q3MainWindow::showEvent( e );
+    view->pause( FALSE );
+    view->setFocus();
+}
+
+void KAstTopLevel::hideEvent( QHideEvent *e )
+{
+    Q3MainWindow::hideEvent( e );
+    view->pause( TRUE );
+}
+
+void KAstTopLevel::slotNewGame()
+{
+    score = 0;
+    shipsRemain = SB_SHIPS;
+    scoreLCD->display( 0 );
+    level = 0;
+    levelLCD->display( level+1 );
+    shipsLCD->display( shipsRemain-1 );
+    view->newGame();
+    view->setRockSpeed( levels[0].rockSpeed );
+    view->addRocks( levels[0].nrocks );
+//    view->showText( tr( "Press L to launch." ), yellow );
+    view->newShip();
+    waitShip = FALSE;
+    view->hideText();
+    isPaused = FALSE;
+}
+
+void KAstTopLevel::slotShipKilled()
+{
+    shipsRemain--;
+    shipsLCD->display( shipsRemain-1 );
+
+    playSound( "ShipDestroyed" );
+
+    if ( shipsRemain )
+    {
+        waitShip = TRUE;
+        view->showText( tr( "Ship Destroyed. Press L to launch."), Qt::yellow );
+    }
+    else
+    {
+        view->showText( tr("Game Over!"), Qt::red );
+        view->endGame();
+	doStats();
+//        highscore->addEntry( score, level, showHiscores );
+    }
+}
+
+void KAstTopLevel::slotRockHit( int size )
+{
+    switch ( size )
+    {
+	case 0:
+	    score += 10;
+	     break;
+
+	case 1:
+	    score += 20;
+	    break;
+
+	default:
+	    score += 40;
+      }
+
+    playSound( "RockDestroyed" );
+
+    scoreLCD->display( score );
+}
+
+void KAstTopLevel::slotRocksRemoved()
+{
+    level++;
+
+    if ( level >= MAX_LEVELS )
+	level = MAX_LEVELS - 1;
+
+    view->setRockSpeed( levels[level-1].rockSpeed );
+    view->addRocks( levels[level-1].nrocks );
+
+    levelLCD->display( level+1 );
+}
+
+void KAstTopLevel::doStats()
+{
+    QString r( "0.00" );
+    if ( view->shots() )
+	 r = QString::number( (double)view->hits() / view->shots() * 100.0,
+			     'g', 2 );
+
+/* multi-line text broken in Qt 3
+    QString s = tr( "Game Over\n\nShots fired:\t%1\n  Hit:\t%2\n  Missed:\t%3\nHit ratio:\t%4 %\n\nPress N for a new game" )
+      .arg(view->shots()).arg(view->hits())
+      .arg(view->shots() - view->hits())
+      .arg(r);
+*/
+
+    view->showText( "Game Over.   Press N for a new game.", Qt::yellow, FALSE );
+}
+
+void KAstTopLevel::slotUpdateVitals()
+{
+    brakesLCD->display( view->brakeCount() );
+    shieldLCD->display( view->shieldCount() );
+    shootLCD->display( view->shootCount() );
+//    teleportsLCD->display( view->teleportCount() );
+    powerMeter->setValue( view->power() );
+}
diff --git a/examples/graphicsview/portedasteroids/toplevel.h b/examples/graphicsview/portedasteroids/toplevel.h
new file mode 100644
index 0000000000..67781da427
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/toplevel.h
@@ -0,0 +1,126 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+ * KAsteroids - Copyright (c) Martin R. Jones 1997
+ *
+ * Part of the KDE project
+ */
+
+#ifndef __KAST_TOPLEVEL_H__
+#define __KAST_TOPLEVEL_H__
+
+#include <q3mainwindow.h>
+#include <q3dict.h>
+#include <qmap.h>
+//Added by qt3to4:
+#include <QShowEvent>
+#include <QHideEvent>
+#include <QKeyEvent>
+
+#include "view.h"
+
+
+class KALedMeter;
+QT_BEGIN_NAMESPACE
+class QLCDNumber;
+QT_END_NAMESPACE
+
+class KAstTopLevel : public Q3MainWindow
+{
+    Q_OBJECT
+public:
+    KAstTopLevel( QWidget *parent=0, const char *name=0 );
+    virtual ~KAstTopLevel();
+
+private:
+    void playSound( const char *snd );
+    void readSoundMapping();
+    void doStats();
+
+protected:
+    virtual void showEvent( QShowEvent * );
+    virtual void hideEvent( QHideEvent * );
+    virtual void keyPressEvent( QKeyEvent *event );
+    virtual void keyReleaseEvent( QKeyEvent *event );
+
+private slots:
+    void slotNewGame();
+
+    void slotShipKilled();
+    void slotRockHit( int size );
+    void slotRocksRemoved();
+
+    void slotUpdateVitals();
+
+private:
+    KAsteroidsView *view;
+    QLCDNumber *scoreLCD;
+    QLCDNumber *levelLCD;
+    QLCDNumber *shipsLCD;
+
+    QLCDNumber *teleportsLCD;
+//    QLCDNumber *bombsLCD;
+    QLCDNumber *brakesLCD;
+    QLCDNumber *shieldLCD;
+    QLCDNumber *shootLCD;
+    KALedMeter *powerMeter;
+
+    bool   sound;
+    Q3Dict<QString> soundDict;
+
+    // waiting for user to press Enter to launch a ship
+    bool waitShip;
+    bool isPaused;
+
+    int shipsRemain;
+    int score;
+    int level;
+    bool showHiscores;
+
+    enum Action { Launch, Thrust, RotateLeft, RotateRight, Shoot, Teleport,
+                    Brake, Shield, Pause, NewGame  };
+
+    QMap<int,Action> actions;
+};
+
+#endif
+
diff --git a/examples/graphicsview/portedasteroids/view.cpp b/examples/graphicsview/portedasteroids/view.cpp
new file mode 100644
index 0000000000..fc6956b83f
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/view.cpp
@@ -0,0 +1,967 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+ * KAsteroids - Copyright (c) Martin R. Jones 1997
+ *
+ * Part of the KDE project
+ */
+
+#include <stdlib.h>
+#include <math.h>
+#include <qapplication.h>
+#include <qnamespace.h>
+#include <q3accel.h>
+#include <qmessagebox.h>
+#include <q3scrollview.h>
+#include <qdir.h>
+#include <QGraphicsItem>
+//Added by qt3to4:
+#include <QTimerEvent>
+#include <QPixmap>
+#include <QResizeEvent>
+#include <QShowEvent>
+
+#include "view.h"
+
+#define IMG_BACKGROUND ":/trolltech/examples/graphicsview/portedasteroids/bg.png"
+
+#define REFRESH_DELAY           33
+#define SHIP_SPEED              0.3
+#define MISSILE_SPEED           10.0
+#define SHIP_STEPS              64
+#define ROTATE_RATE             2
+#define SHIELD_ON_COST          1
+#define SHIELD_HIT_COST         30
+#define BRAKE_ON_COST           4
+
+#define MAX_ROCK_SPEED          2.5
+#define MAX_POWERUP_SPEED       1.5
+#define MAX_SHIP_SPEED		12
+#define MAX_BRAKES              5
+#define MAX_SHIELDS             5
+#define MAX_FIREPOWER		5
+
+#define TEXT_SPEED              4
+
+#define PI_X_2                  6.283185307
+#ifndef M_PI
+#define M_PI 3.141592654
+#endif
+
+static struct
+{
+    int id;
+    const char *path;
+    int frames;
+}
+kas_animations [] =
+{
+    { ID_ROCK_LARGE,       "rock1/rock1%1.png",       32 },
+    { ID_ROCK_MEDIUM,      "rock2/rock2%1.png",       32 },
+    { ID_ROCK_SMALL,       "rock3/rock3%1.png",       32 },
+    { ID_SHIP,             "ship/ship%1.png",         32 },
+    { ID_MISSILE,          "missile/missile.png",      1 },
+    { ID_BIT,              "bits/bits%1.png",         16 },
+    { ID_EXHAUST,          "exhaust/exhaust.png",      1 },
+    { ID_ENERGY_POWERUP,   "powerups/energy.png",      1 },
+//    { ID_TELEPORT_POWERUP, "powerups/teleport%1.png", 12 },
+    { ID_BRAKE_POWERUP,    "powerups/brake.png",       1 },
+    { ID_SHIELD_POWERUP,   "powerups/shield.png",      1 },
+    { ID_SHOOT_POWERUP,    "powerups/shoot.png",       1 },
+    { ID_SHIELD,           "shield/shield%1.png",      6 },
+    { 0,                   0,                          0 }
+};
+
+KAsteroidsView::KAsteroidsView( QWidget *parent, const char *name )
+    : QWidget( parent, name ),
+      field(0, 0, 640, 440),
+      view(&field,this)
+{
+    view.setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+    view.setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+    view.setCacheMode(QGraphicsView::CacheBackground);
+    view.setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
+    view.setOptimizationFlags(QGraphicsView::DontClipPainter
+                              | QGraphicsView::DontSavePainterState
+                              | QGraphicsView::DontAdjustForAntialiasing);
+    view.viewport()->setFocusProxy( this );
+    rocks.setAutoDelete( TRUE );
+    missiles.setAutoDelete( TRUE );
+    bits.setAutoDelete( TRUE );
+    powerups.setAutoDelete( TRUE );
+    exhaust.setAutoDelete( TRUE );
+
+    QPixmap pm( IMG_BACKGROUND );
+    field.setBackgroundBrush( pm );
+
+    textSprite = new QGraphicsTextItem( 0, &field );
+    QFont font( "helvetica", 18 );
+    textSprite->setFont( font );
+    textSprite->setCacheMode(QGraphicsItem::DeviceCoordinateCache);
+
+    shield = 0;
+    shieldOn = FALSE;
+    refreshRate = REFRESH_DELAY;
+
+    initialized = readSprites();
+
+    shieldTimer = new QTimer( this );
+    connect( shieldTimer, SIGNAL(timeout()), this, SLOT(hideShield()) );
+    mTimerId = -1;
+
+    shipPower = MAX_POWER_LEVEL;
+    vitalsChanged = TRUE;
+    can_destroy_powerups = FALSE;
+
+    mPaused = TRUE;
+
+    if ( !initialized ) {
+	textSprite->setHtml( tr("<font color=red>Error: Cannot read sprite images</font>") );
+	textSprite->setPos( (field.width()-textSprite->boundingRect().width()) / 2,
+			    (field.height()-textSprite->boundingRect().height()) / 2 );
+    }
+}
+
+// - - -
+
+KAsteroidsView::~KAsteroidsView()
+{
+}
+
+// - - -
+
+void KAsteroidsView::reset()
+{
+    if ( !initialized )
+	return;
+    rocks.clear();
+    missiles.clear();
+    bits.clear();
+    powerups.clear();
+    exhaust.clear();
+
+    shotsFired = 0;
+    shotsHit = 0;
+
+    rockSpeed = 1.0;
+    powerupSpeed = 1.0;
+    mFrameNum = 0;
+    mPaused = FALSE;
+
+    ship->hide();
+    shield->hide();
+/*
+    if ( mTimerId >= 0 ) {
+	killTimer( mTimerId );
+	mTimerId = -1;
+    }
+*/
+}
+
+// - --
+
+void KAsteroidsView::newGame()
+{
+    if ( !initialized )
+	return;
+    if ( shieldOn )
+    {
+      shield->hide();
+      shieldOn = FALSE;
+    }
+    reset();
+    if ( mTimerId < 0 )
+	mTimerId = startTimer( REFRESH_DELAY );
+    emit updateVitals();
+}
+
+// - - -
+
+void KAsteroidsView::endGame()
+{
+}
+
+void KAsteroidsView::pause( bool p )
+{
+    if ( !initialized )
+	return;
+    if ( !mPaused && p ) {
+	if ( mTimerId >= 0 ) {
+	    killTimer( mTimerId );
+	    mTimerId = -1;
+	}
+    } else if ( mPaused && !p )
+	mTimerId = startTimer( REFRESH_DELAY );
+    mPaused = p;
+}
+
+// - - -
+
+void KAsteroidsView::newShip()
+{
+    if ( !initialized )
+	return;
+    ship->setPos( width()/2, height()/2 );
+    ship->setFrame( 0 );
+    shield->setPos( width()/2, height()/2 );
+    shield->setFrame( 0 );
+    ship->setVelocity( 0.0, 0.0 );
+    shipDx = 0;
+    shipDy = 0;
+    shipAngle = 0;
+    rotateL = FALSE;
+    rotateR = FALSE;
+    thrustShip = FALSE;
+    shootShip = FALSE;
+    brakeShip = FALSE;
+    teleportShip = FALSE;
+    shieldOn = TRUE;
+    shootDelay = 0;
+    shipPower = MAX_POWER_LEVEL;
+    rotateRate = ROTATE_RATE;
+    rotateSlow = 0;
+
+    mBrakeCount = 0;
+    mTeleportCount = 0;
+    mShootCount = 0;
+
+    ship->show();
+    shield->show();
+    mShieldCount = 1;   // just in case the ship appears on a rock.
+    shieldTimer->start( 1000, TRUE );
+}
+
+void KAsteroidsView::setShield( bool s )
+{
+    if ( !initialized )
+	return;
+    if ( shieldTimer->isActive() && !s ) {
+	shieldTimer->stop();
+	hideShield();
+    } else {
+	shieldOn = s && mShieldCount;
+    }
+}
+
+void KAsteroidsView::brake( bool b )
+{
+    if ( !initialized )
+	return;
+    if ( mBrakeCount )
+    {
+	if ( brakeShip && !b )
+	{
+	    rotateL = FALSE;
+	    rotateR = FALSE;
+	    thrustShip = FALSE;
+	    rotateRate = ROTATE_RATE;
+	}
+
+	brakeShip = b;
+    }
+}
+
+// - - -
+
+bool KAsteroidsView::readSprites()
+{
+    QString sprites_prefix = ":/trolltech/examples/graphicsview/portedasteroids/sprites/";
+
+    int i = 0;
+    while ( kas_animations[i].id )
+    {
+        QList<QPixmap> anim;
+        QString wildcard = sprites_prefix + kas_animations[i].path;
+        wildcard.replace("%1", "*");
+        QFileInfo fi(wildcard);
+        foreach (QString entry, QDir(fi.path(), fi.fileName()).entryList())
+            anim << QPixmap(fi.path() + "/" + entry);
+	animation.insert( kas_animations[i].id, anim );
+	i++;
+    }
+
+    ship = new AnimatedPixmapItem( animation[ID_SHIP], &field );
+    ship->hide();
+
+    shield = new KShield( animation[ID_SHIELD], &field );
+    shield->hide();
+
+    return (!ship->image(0).isNull() && !shield->image(0).isNull());
+}
+
+// - - -
+
+void KAsteroidsView::addRocks( int num )
+{
+    if ( !initialized )
+	return;
+    for ( int i = 0; i < num; i++ )
+    {
+	KRock *rock = new KRock( animation[ID_ROCK_LARGE], &field,
+			     ID_ROCK_LARGE, randInt(2), randInt(2) ? -1 : 1 );
+	double dx = (2.0 - randDouble()*4.0) * rockSpeed;
+	double dy = (2.0 - randDouble()*4.0) * rockSpeed;
+	rock->setVelocity( dx, dy );
+	rock->setFrame( randInt( rock->frameCount() ) );
+	if ( dx > 0 )
+	{
+	    if ( dy > 0 )
+		rock->setPos( 5, 5 );
+	    else
+		rock->setPos( 5, field.height() - 25 );
+            rock->setFrame( 0 );
+	}
+	else
+	{
+	    if ( dy > 0 )
+		rock->setPos( field.width() - 25, 5 );
+	    else
+		rock->setPos( field.width() - 25, field.height() - 25 );
+            rock->setFrame( 0 );
+	}
+	rock->show();
+	rocks.append( rock );
+    }
+}
+
+// - - -
+
+void KAsteroidsView::showText( const QString &text, const QColor &color, bool scroll )
+{
+    if ( !initialized )
+	return;
+    textSprite->setHtml( QString("<font color=#%1%2%3>%4</font>")
+                         .arg(color.red(), 2, 16, QLatin1Char('0'))
+                         .arg(color.green(), 2, 16, QLatin1Char('0'))
+                         .arg(color.blue(), 2, 16, QLatin1Char('0'))
+                         .arg(text) );
+    Q_UNUSED(color);
+    // ### Porting: no such thing textSprite->setColor( color );
+
+    if ( scroll ) {
+	textSprite->setPos( (field.width()-textSprite->boundingRect().width()) / 2,
+			    -textSprite->boundingRect().height() );
+	textDy = TEXT_SPEED;
+    } else {
+	textSprite->setPos( (field.width()-textSprite->boundingRect().width()) / 2,
+                            (field.height()-textSprite->boundingRect().height()) / 2 );
+	textDy = 0;
+    }
+    textSprite->show();
+}
+
+// - - -
+
+void KAsteroidsView::hideText()
+{
+    textDy = -TEXT_SPEED;
+}
+
+// - - -
+
+void KAsteroidsView::resizeEvent(QResizeEvent* event)
+{
+    QWidget::resizeEvent(event);
+    field.setSceneRect(0, 0, width()-4, height()-4);
+    view.resize(width(),height());
+}
+
+// - - -
+
+void KAsteroidsView::timerEvent( QTimerEvent * )
+{
+    field.advance();
+
+    AnimatedPixmapItem *rock;
+
+    // move rocks forward
+    for ( rock = rocks.first(); rock; rock = rocks.next() ) {
+	((KRock *)rock)->nextFrame();
+	wrapSprite( rock );
+    }
+
+    wrapSprite( ship );
+
+    // check for missile collision with rocks.
+    processMissiles();
+
+    // these are generated when a ship explodes
+    for ( KBit *bit = bits.first(); bit; bit = bits.next() )
+    {
+	if ( bit->expired() )
+	{
+	    bits.removeRef( bit );
+	}
+	else
+	{
+	    bit->growOlder();
+	    bit->setFrame( ( bit->frame()+1 ) % bit->frameCount() );
+	}
+    }
+
+    for ( KExhaust *e = exhaust.first(); e; e = exhaust.next() )
+	exhaust.removeRef( e );
+
+    // move / rotate ship.
+    // check for collision with a rock.
+    processShip();
+
+    // move powerups and check for collision with player and missiles
+    processPowerups();
+
+    if ( textSprite->isVisible() )
+    {
+	if ( textDy < 0 &&
+	     textSprite->boundingRect().y() <= -textSprite->boundingRect().height() ) {
+	    textSprite->hide();
+	} else {
+	    textSprite->moveBy( 0, textDy );
+	}
+
+	if ( textSprite->sceneBoundingRect().y() > (field.height()-textSprite->boundingRect().height())/2 )
+	    textDy = 0;
+    }
+
+    if ( vitalsChanged && !(mFrameNum % 10) ) {
+	emit updateVitals();
+	vitalsChanged = FALSE;
+    }
+
+    mFrameNum++;
+}
+
+void KAsteroidsView::wrapSprite( QGraphicsItem *s )
+{
+    int x = int(s->x() + s->boundingRect().width() / 2);
+    int y = int(s->y() + s->boundingRect().height() / 2);
+
+    if ( x > field.width() )
+	s->setPos( s->x() - field.width(), s->y() );
+    else if ( x < 0 )
+	s->setPos( field.width() + s->x(), s->y() );
+
+    if ( y > field.height() )
+	s->setPos( s->x(), s->y() - field.height() );
+    else if ( y < 0 )
+	s->setPos( s->x(), field.height() + s->y() );
+}
+
+// - - -
+
+void KAsteroidsView::rockHit( AnimatedPixmapItem *hit )
+{
+    KPowerup *nPup = 0;
+    int rnd = int(randDouble()*30.0) % 30;
+    switch( rnd )
+    {
+      case 4:
+      case 5:
+          nPup = new KPowerup( animation[ID_ENERGY_POWERUP], &field,
+                               ID_ENERGY_POWERUP );
+	break;
+      case 10:
+//        nPup = new KPowerup( animation[ID_TELEPORT_POWERUP], &field,
+//                             ID_TELEPORT_POWERUP );
+	break;
+      case 15:
+          nPup = new KPowerup( animation[ID_BRAKE_POWERUP], &field,
+                               ID_BRAKE_POWERUP );
+	break;
+      case 20:
+          nPup = new KPowerup( animation[ID_SHIELD_POWERUP], &field,
+                               ID_SHIELD_POWERUP );
+	break;
+      case 24:
+      case 25:
+          nPup = new KPowerup( animation[ID_SHOOT_POWERUP], &field,
+                               ID_SHOOT_POWERUP );
+	break;
+    }
+    if ( nPup )
+    {
+	double r = 0.5 - randDouble();
+	nPup->setPos( hit->x(), hit->y() );
+        nPup->setFrame( 0 );
+	nPup->setVelocity( hit->xVelocity() + r, hit->yVelocity() + r );
+	powerups.append( nPup );
+    }
+
+    if ( hit->type() == ID_ROCK_LARGE || hit->type() == ID_ROCK_MEDIUM )
+    {
+	// break into smaller rocks
+	double addx[4] = { 1.0, 1.0, -1.0, -1.0 };
+	double addy[4] = { -1.0, 1.0, -1.0, 1.0 };
+
+	double dx = hit->xVelocity();
+	double dy = hit->yVelocity();
+
+	double maxRockSpeed = MAX_ROCK_SPEED * rockSpeed;
+	if ( dx > maxRockSpeed )
+	    dx = maxRockSpeed;
+	else if ( dx < -maxRockSpeed )
+	    dx = -maxRockSpeed;
+	if ( dy > maxRockSpeed )
+	    dy = maxRockSpeed;
+	else if ( dy < -maxRockSpeed )
+	    dy = -maxRockSpeed;
+
+	AnimatedPixmapItem *nrock;
+
+	for ( int i = 0; i < 4; i++ )
+	{
+	    double r = rockSpeed/2 - randDouble()*rockSpeed;
+	    if ( hit->type() == ID_ROCK_LARGE )
+	    {
+		nrock = new KRock( animation[ID_ROCK_MEDIUM], &field,
+                                   ID_ROCK_MEDIUM, randInt(2), randInt(2) ? -1 : 1 );
+		emit rockHit( 0 );
+	    }
+	    else
+	    {
+		nrock = new KRock( animation[ID_ROCK_SMALL], &field,
+                                   ID_ROCK_SMALL, randInt(2), randInt(2) ? -1 : 1 );
+		emit rockHit( 1 );
+	    }
+
+	    nrock->setPos( hit->x(), hit->y() );
+            nrock->setFrame( 0 );
+	    nrock->setVelocity( dx+addx[i]*rockSpeed+r, dy+addy[i]*rockSpeed+r );
+	    nrock->setFrame( randInt( nrock->frameCount() ) );
+	    rocks.append( nrock );
+	}
+    }
+    else if ( hit->type() == ID_ROCK_SMALL )
+	emit rockHit( 2 );
+    rocks.removeRef( hit );
+    if ( rocks.count() == 0 )
+	emit rocksRemoved();
+}
+
+void KAsteroidsView::reducePower( int val )
+{
+    shipPower -= val;
+    if ( shipPower <= 0 )
+    {
+	shipPower = 0;
+	thrustShip = FALSE;
+	if ( shieldOn )
+	{
+	    shieldOn = FALSE;
+	    shield->hide();
+	}
+    }
+    vitalsChanged = TRUE;
+}
+
+void KAsteroidsView::addExhaust( double x, double y, double dx,
+				 double dy, int count )
+{
+    for ( int i = 0; i < count; i++ )
+    {
+	KExhaust *e = new KExhaust( animation[ID_EXHAUST], &field );
+	e->setPos( x + 2 - randDouble()*4, y + 2 - randDouble()*4 );
+	e->setVelocity( dx, dy );
+	exhaust.append( e );
+    }
+}
+
+void KAsteroidsView::processMissiles()
+{
+    KMissile *missile;
+
+    // if a missile has hit a rock, remove missile and break rock into smaller
+    // rocks or remove completely.
+    Q3PtrListIterator<KMissile> it(missiles);
+
+    for ( ; it.current(); ++it )
+    {
+	missile = it.current();
+	missile->growOlder();
+
+	if ( missile->expired() )
+	{
+	    missiles.removeRef( missile );
+	    continue;
+	}
+
+	wrapSprite( missile );
+
+	QList<QGraphicsItem *> hits = missile->collidingItems(Qt::IntersectsItemBoundingRect);
+	QList<QGraphicsItem *>::Iterator hit;
+	for ( hit = hits.begin(); hit != hits.end(); ++hit )
+	{
+	    if ( (*hit)->type() >= ID_ROCK_LARGE &&
+		 (*hit)->type() <= ID_ROCK_SMALL && (*hit)->collidesWithItem(missile) )
+	    {
+                shotsHit++;
+                rockHit( static_cast<AnimatedPixmapItem *>(*hit) );
+                missiles.removeRef( missile );
+                break;
+	    }
+	}
+    }
+}
+
+// - - -
+
+void KAsteroidsView::processShip()
+{
+    if ( ship->isVisible() )
+    {
+	if ( shieldOn )
+	{
+	    shield->show();
+	    reducePower( SHIELD_ON_COST );
+	    static int sf = 0;
+	    sf++;
+
+	    if ( sf % 2 )
+		shield->setFrame( (shield->frame()+1) % shield->frameCount() );
+	    shield->setPos( ship->x() - 9, ship->y() - 9 );
+
+	    QList<QGraphicsItem *> hits = shield->collidingItems(Qt::IntersectsItemBoundingRect);
+	    QList<QGraphicsItem *>::Iterator it;
+	    for ( it = hits.begin(); it != hits.end(); ++it )
+	    {
+		if ( (*it)->type() >= ID_ROCK_LARGE &&
+		     (*it)->type() <= ID_ROCK_SMALL && (*it)->collidesWithItem(shield) )
+		{
+		    int factor;
+		    switch ( (*it)->type() )
+		    {
+			case ID_ROCK_LARGE:
+			    factor = 3;
+			    break;
+
+			case ID_ROCK_MEDIUM:
+			    factor = 2;
+			    break;
+
+			default:
+			    factor = 1;
+		    }
+
+		    if ( factor > mShieldCount )
+		    {
+			// shield not strong enough
+			shieldOn = FALSE;
+			break;
+		    }
+		    rockHit( static_cast<AnimatedPixmapItem *>(*it) );
+		    // the more shields we have the less costly
+		    reducePower( factor * (SHIELD_HIT_COST - mShieldCount*2) );
+		}
+	    }
+	}
+
+	if ( !shieldOn )
+	{
+	    shield->hide();
+	    QList<QGraphicsItem *> hits = ship->collidingItems(Qt::IntersectsItemBoundingRect);
+	    QList<QGraphicsItem *>::Iterator it;
+	    for ( it = hits.begin(); it != hits.end(); ++it )
+	    {
+		if ( (*it)->type() >= ID_ROCK_LARGE &&
+		     (*it)->type() <= ID_ROCK_SMALL && (*it)->collidesWithItem(ship))
+		{
+		    KBit *bit;
+		    for ( int i = 0; i < 12; i++ )
+		    {
+                      bit = new KBit( animation[ID_BIT], &field );
+		      bit->setPos( ship->x() + 5 - randDouble() * 10,
+                                   ship->y() + 5 - randDouble() * 10 );
+                      bit->setFrame( randInt(bit->frameCount()) );
+		      bit->setVelocity( 1-randDouble()*2,
+					1-randDouble()*2 );
+		      bit->setDeath( 60 + randInt(60) );
+		      bits.append( bit );
+		    }
+		    ship->hide();
+		    shield->hide();
+		    emit shipKilled();
+		    break;
+		}
+	    }
+	}
+
+
+	if ( rotateSlow )
+	    rotateSlow--;
+
+	if ( rotateL )
+	{
+	    shipAngle -= rotateSlow ? 1 : rotateRate;
+	    if ( shipAngle < 0 )
+		shipAngle += SHIP_STEPS;
+	}
+
+	if ( rotateR )
+	{
+	    shipAngle += rotateSlow ? 1 : rotateRate;
+	    if ( shipAngle >= SHIP_STEPS )
+		shipAngle -= SHIP_STEPS;
+	}
+
+	double angle = shipAngle * PI_X_2 / SHIP_STEPS;
+	double cosangle = cos( angle );
+	double sinangle = sin( angle );
+
+	if ( brakeShip )
+	{
+	    thrustShip = FALSE;
+	    rotateL = FALSE;
+	    rotateR = FALSE;
+	    rotateRate = ROTATE_RATE;
+	    if ( fabs(shipDx) < 2.5 && fabs(shipDy) < 2.5 )
+	    {
+		shipDx = 0.0;
+		shipDy = 0.0;
+		ship->setVelocity( shipDx, shipDy );
+		brakeShip = FALSE;
+	    }
+	    else
+	    {
+		double motionAngle = atan2( -shipDy, -shipDx );
+		if ( angle > M_PI )
+		    angle -= PI_X_2;
+		double angleDiff = angle - motionAngle;
+		if ( angleDiff > M_PI )
+		    angleDiff = PI_X_2 - angleDiff;
+		else if ( angleDiff < -M_PI )
+		    angleDiff = PI_X_2 + angleDiff;
+		double fdiff = fabs( angleDiff );
+		if ( fdiff > 0.08 )
+		{
+		    if ( angleDiff > 0 )
+			rotateL = TRUE;
+		    else if ( angleDiff < 0 )
+			rotateR = TRUE;
+		    if ( fdiff > 0.6 )
+			rotateRate = mBrakeCount + 1;
+		    else if ( fdiff > 0.4 )
+			rotateRate = 2;
+		    else
+			rotateRate = 1;
+
+		    if ( rotateRate > 5 )
+			rotateRate = 5;
+		}
+		else if ( fabs(shipDx) > 1 || fabs(shipDy) > 1 )
+		{
+		    thrustShip = TRUE;
+		    // we'll make braking a bit faster
+		    shipDx += cosangle/6 * (mBrakeCount - 1);
+		    shipDy += sinangle/6 * (mBrakeCount - 1);
+		    reducePower( BRAKE_ON_COST );
+		    addExhaust( ship->x() + 20 - cosangle*22,
+				ship->y() + 20 - sinangle*22,
+				shipDx-cosangle, shipDy-sinangle,
+				mBrakeCount+1 );
+		}
+	    }
+	}
+
+	if ( thrustShip )
+	{
+	    // The ship has a terminal velocity, but trying to go faster
+	    // still uses fuel (can go faster diagonally - don't care).
+	    double thrustx = cosangle/4;
+	    double thrusty = sinangle/4;
+	    if ( fabs(shipDx + thrustx) < MAX_SHIP_SPEED )
+		shipDx += thrustx;
+	    if ( fabs(shipDy + thrusty) < MAX_SHIP_SPEED )
+		shipDy += thrusty;
+	    ship->setVelocity( shipDx, shipDy );
+	    reducePower( 1 );
+	    addExhaust( ship->x() + 20 - cosangle*20,
+			ship->y() + 20 - sinangle*20,
+			shipDx-cosangle, shipDy-sinangle, 3 );
+	}
+
+	ship->setFrame( shipAngle >> 1 );
+
+	if ( shootShip )
+	{
+	    if ( !shootDelay && (int)missiles.count() < mShootCount + 2 )
+	    {
+	      KMissile *missile = new KMissile( animation[ID_MISSILE], &field );
+	      missile->setPos( 21+ship->x()+cosangle*21,
+			     21+ship->y()+sinangle*21 );
+              missile->setFrame( 0 );
+	      missile->setVelocity( shipDx + cosangle*MISSILE_SPEED,
+				    shipDy + sinangle*MISSILE_SPEED );
+	      missiles.append( missile );
+	      shotsFired++;
+	      reducePower( 1 );
+
+	      shootDelay = 5;
+	    }
+
+	    if ( shootDelay )
+	      shootDelay--;
+	}
+
+	if ( teleportShip )
+	{
+	    int ra = qrand() % 10;
+	    if( ra == 0 )
+	    ra += qrand() % 20;
+	    int xra = ra * 60 + ( (qrand() % 20) * (qrand() % 20) );
+	    int yra = ra * 50 - ( (qrand() % 20) * (qrand() % 20) );
+	    ship->setPos( xra, yra );
+	}
+
+	vitalsChanged = TRUE;
+    }
+}
+
+// - - -
+
+void KAsteroidsView::processPowerups()
+{
+    if ( !powerups.isEmpty() )
+    {
+	// if player gets the powerup remove it from the screen, if option
+	// "Can destroy powerups" is enabled and a missile hits the powerup
+	// destroy it
+
+	KPowerup *pup;
+	Q3PtrListIterator<KPowerup> it( powerups );
+
+	for( ; it.current(); ++it )
+	{
+	    pup = it.current();
+	    pup->growOlder();
+
+	    if( pup->expired() )
+	    {
+		powerups.removeRef( pup );
+		continue;
+	    }
+
+	    wrapSprite( pup );
+
+	    QList<QGraphicsItem *> hits = pup->collidingItems();
+	    QList<QGraphicsItem *>::Iterator it;
+	    for ( it = hits.begin(); it != hits.end(); ++it )
+	    {
+		if ( (*it) == ship )
+		{
+		    switch( pup->type() )
+		    {
+		      case ID_ENERGY_POWERUP:
+			shipPower += 150;
+			if ( shipPower > MAX_POWER_LEVEL )
+			    shipPower = MAX_POWER_LEVEL;
+			break;
+		      case ID_TELEPORT_POWERUP:
+			mTeleportCount++;
+			break;
+		      case ID_BRAKE_POWERUP:
+			if ( mBrakeCount < MAX_BRAKES )
+			    mBrakeCount++;
+			break;
+		      case ID_SHIELD_POWERUP:
+			if ( mShieldCount < MAX_SHIELDS )
+			    mShieldCount++;
+			break;
+		      case ID_SHOOT_POWERUP:
+			if ( mShootCount < MAX_FIREPOWER )
+			    mShootCount++;
+			break;
+		    }
+
+		    powerups.removeRef( pup );
+		    vitalsChanged = TRUE;
+		}
+		else if ( (*it) == shield )
+		{
+		    powerups.removeRef( pup );
+		}
+		else if ( (*it)->type() == ID_MISSILE )
+		{
+		    if ( can_destroy_powerups )
+		    {
+                        powerups.removeRef( pup );
+		    }
+		}
+	    }
+	}
+    }         // -- if( powerups.isEmpty() )
+}
+
+// - - -
+
+void KAsteroidsView::hideShield()
+{
+    shield->hide();
+    mShieldCount = 0;
+    shieldOn = FALSE;
+}
+
+double KAsteroidsView::randDouble()
+{
+    int v = qrand();
+    return (double)v / (double)RAND_MAX;
+}
+
+int KAsteroidsView::randInt( int range )
+{
+    return qrand() % range;
+}
+
+void KAsteroidsView::showEvent( QShowEvent *e )
+{
+#if defined( QT_LICENSE_PROFESSIONAL )
+    static bool wasThere = FALSE;
+
+    if ( !wasThere ) {
+        wasThere = TRUE;
+        QMessageBox::information( this, tr("QGraphicsView demo"),
+                                        tr("This game has been implemented using the QGraphicsView class.\n"
+                                           "The QGraphicsView class is not part of the Light Platform Edition. Please \n"
+                                           "contact Qt Software if you want to upgrade to the Full Platform Edition.") );
+    }
+#endif
+
+    QWidget::showEvent( e );
+}
diff --git a/examples/graphicsview/portedasteroids/view.h b/examples/graphicsview/portedasteroids/view.h
new file mode 100644
index 0000000000..d055f29a2c
--- /dev/null
+++ b/examples/graphicsview/portedasteroids/view.h
@@ -0,0 +1,184 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+ * KAsteroids - Copyright (c) Martin R. Jones 1997
+ *
+ * Part of the KDE project
+ */
+
+#ifndef __AST_VIEW_H__
+#define __AST_VIEW_H__
+
+#include <qwidget.h>
+#include <q3ptrlist.h>
+#include <q3intdict.h>
+#include <qtimer.h>
+#include <QGraphicsScene>
+#include <QGraphicsView>
+//Added by qt3to4:
+#include <QTimerEvent>
+#include <QShowEvent>
+#include <QResizeEvent>
+#include "sprites.h"
+
+#define MAX_POWER_LEVEL          1000
+
+class KAsteroidsView : public QWidget
+{
+    Q_OBJECT
+public:
+    KAsteroidsView( QWidget *parent = 0, const char *name = 0 );
+    virtual ~KAsteroidsView();
+
+    int refreshRate;
+
+    void reset();
+    void setRockSpeed( double rs ) { rockSpeed = rs; }
+    void addRocks( int num );
+    void newGame();
+    void endGame();
+    void newShip();
+
+    void rotateLeft( bool r ) { rotateL = r; rotateSlow = 5; }
+    void rotateRight( bool r ) { rotateR = r; rotateSlow = 5; }
+    void thrust( bool t ) { thrustShip = t && shipPower > 0; }
+    void shoot( bool s ) { shootShip = s; shootDelay = 0; }
+    void setShield( bool s );
+    void teleport( bool te) { teleportShip = te && mTeleportCount; }
+    void brake( bool b );
+    void pause( bool p);
+
+    void showText( const QString &text, const QColor &color, bool scroll=TRUE );
+    void hideText();
+
+    int shots() const { return shotsFired; }
+    int hits() const { return shotsHit; }
+    int power() const { return shipPower; }
+
+    int teleportCount() const { return mTeleportCount; }
+    int brakeCount() const { return mBrakeCount; }
+    int shieldCount() const { return mShieldCount; }
+    int shootCount() const { return mShootCount; }
+
+signals:
+    void shipKilled();
+    void rockHit( int size );
+    void rocksRemoved();
+    void updateVitals();
+
+private slots:
+    void hideShield();
+
+protected:
+    bool readSprites();
+    void wrapSprite( QGraphicsItem * );
+    void rockHit( AnimatedPixmapItem * );
+    void reducePower( int val );
+    void addExhaust( double x, double y, double dx, double dy, int count );
+    void processMissiles();
+    void processShip();
+    void processPowerups();
+    void processShield();
+    double randDouble();
+    int randInt( int range );
+
+    virtual void resizeEvent( QResizeEvent *event );
+    virtual void timerEvent( QTimerEvent * );
+
+    void showEvent( QShowEvent * );
+
+private:
+    QGraphicsScene field;
+    QGraphicsView view;
+    QMap<int, QList<QPixmap> > animation;
+    Q3PtrList<AnimatedPixmapItem> rocks;
+    Q3PtrList<KMissile> missiles;
+    Q3PtrList<KBit> bits;
+    Q3PtrList<KExhaust> exhaust;
+    Q3PtrList<KPowerup> powerups;
+    KShield *shield;
+    AnimatedPixmapItem *ship;
+    QGraphicsTextItem *textSprite;
+
+    bool rotateL;
+    bool rotateR;
+    bool thrustShip;
+    bool shootShip;
+    bool teleportShip;
+    bool brakeShip;
+    bool pauseShip;
+    bool shieldOn;
+
+    bool vitalsChanged;
+
+    int  shipAngle;
+    int  rotateSlow;
+    int  rotateRate;
+    int  shipPower;
+
+    int shotsFired;
+    int shotsHit;
+    int shootDelay;
+
+    int mBrakeCount;
+    int mShieldCount;
+    int mTeleportCount;
+    int mShootCount;
+
+    double shipDx;
+    double shipDy;
+
+    int  textDy;
+    int  mFrameNum;
+    bool mPaused;
+    int  mTimerId;
+
+    double rockSpeed;
+    double powerupSpeed;
+
+    bool can_destroy_powerups;
+
+    QTimer *shieldTimer;
+    bool initialized;
+};
+
+#endif
diff --git a/examples/graphicsview/portedcanvas/blendshadow.cpp b/examples/graphicsview/portedcanvas/blendshadow.cpp
new file mode 100644
index 0000000000..42cd0e366d
--- /dev/null
+++ b/examples/graphicsview/portedcanvas/blendshadow.cpp
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qimage.h>
+#include <qcolor.h>
+
+static inline int blendComponent( int v, int av, int s, int as )
+{
+    return as*s + av*v -(av*as*s)/255;  
+}
+    
+static inline QRgb blendShade( QRgb v, QRgb s )
+{
+    //shadow image is already reduced and blurred
+    int as = qAlpha(s); 
+    int av = qAlpha(v);
+    if ( as == 0 || av == 255 )
+	return v;
+
+    int a = as + av -(as*av)/255;
+    
+    int r = blendComponent( qRed(v),av, qRed(s), as)/a;
+    int g = blendComponent( qGreen(v),av, qGreen(s), as)/a;
+    int b = blendComponent( qBlue(v),av, qBlue(s), as)/a;
+
+    return qRgba(r,g,b,a);
+}
+
+ 
+
+int main( int*, char**)
+{
+    QImage image( "out.png" );
+    image.convertDepth( 32 );
+    QImage shade( "outshade.png" );
+    shade.convertDepth( 32 );
+    int dx = 10;
+    int dy = 5;
+	
+    int w = image.width();
+    int h = image.height();
+	
+    QImage img( w+dx, h+dy, 32 );
+    img.setAlphaBuffer( TRUE );
+
+    for ( int y = 0; y < h+dy; y++ ) {
+	for ( int x = 0; x < w+dx; x++ ) {
+	    QRgb sh =  (x<dx||y<dy) ? 0 : shade.pixel( x-dx, y-dy );
+	    QRgb pixel = (x<w&y<h) ? image.pixel( x, y ) : 0;
+	    img.setPixel( x, y, blendShade( pixel, sh ) ); 
+	}
+    }
+    img.save("blend.png", "PNG" );
+}
+
+
diff --git a/examples/graphicsview/portedcanvas/butterfly.png b/examples/graphicsview/portedcanvas/butterfly.png
new file mode 100644
index 0000000000..f3e050eca2
--- /dev/null
+++ b/examples/graphicsview/portedcanvas/butterfly.png
diff --git a/examples/graphicsview/portedcanvas/canvas.cpp b/examples/graphicsview/portedcanvas/canvas.cpp
new file mode 100644
index 0000000000..c8718dc607
--- /dev/null
+++ b/examples/graphicsview/portedcanvas/canvas.cpp
@@ -0,0 +1,733 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qdatetime.h>
+#include <qmainwindow.h>
+#include <qstatusbar.h>
+#include <qmessagebox.h>
+#include <qmenubar.h>
+#include <qapplication.h>
+#include <qpainter.h>
+#include <qprinter.h>
+#include <qlabel.h>
+#include <qimage.h>
+#include <q3progressdialog.h>
+#include <Q3PointArray>
+#include <Q3PtrList>
+#include <QPixmap>
+#include <Q3PopupMenu>
+#include <QMouseEvent>
+#include <Q3MemArray>
+#include "canvas.h"
+#include <QStyleOptionGraphicsItem>
+#include <qdebug.h>
+#include <stdlib.h>
+
+// We use a global variable to save memory - all the brushes and pens in
+// the mesh are shared.
+static QBrush *tb = 0;
+static QPen *tp = 0;
+
+class EdgeItem;
+class NodeItem;
+
+class EdgeItem: public QGraphicsLineItem
+{
+public:
+    EdgeItem( NodeItem*, NodeItem* );
+    void setFromPoint( int x, int y ) ;
+    void setToPoint( int x, int y );
+    static int count() { return c; }
+private:
+    static int c;
+};
+
+static const int imageRTTI = 984376;
+
+
+class ImageItem: public QGraphicsRectItem
+{
+public:
+    ImageItem( QImage img );
+    int rtti () const { return imageRTTI; }
+protected:
+    void paint( QPainter *, const QStyleOptionGraphicsItem *option, QWidget *widget );
+private:
+    QImage image;
+    QPixmap pixmap;
+};
+
+
+ImageItem::ImageItem( QImage img )
+    : image(img)
+{
+    setRect(0, 0, image.width(), image.height());
+    setFlag(ItemIsMovable);
+#if !defined(Q_WS_QWS)
+    pixmap.convertFromImage(image, Qt::OrderedAlphaDither);
+#endif
+}
+
+void ImageItem::paint( QPainter *p, const QStyleOptionGraphicsItem *option, QWidget * )
+{
+// On Qt/Embedded, we can paint a QImage as fast as a QPixmap,
+// but on other platforms, we need to use a QPixmap.
+#if defined(Q_WS_QWS)
+    p->drawImage( option->exposedRect, image, option->exposedRect, Qt::OrderedAlphaDither );
+#else
+    p->drawPixmap( option->exposedRect, pixmap, option->exposedRect );
+#endif
+}
+
+class NodeItem: public QGraphicsEllipseItem
+{
+public:
+    NodeItem();
+    ~NodeItem() {}
+
+    void addInEdge( EdgeItem *edge ) { inList.append( edge ); }
+    void addOutEdge( EdgeItem *edge ) { outList.append( edge ); }
+
+protected:
+    QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+
+
+    //    QPoint center() { return boundingRect().center(); }
+private:
+    Q3PtrList<EdgeItem> inList;
+    Q3PtrList<EdgeItem> outList;
+};
+
+
+int EdgeItem::c = 0;
+
+EdgeItem::EdgeItem( NodeItem *from, NodeItem *to )
+    : QGraphicsLineItem( )
+{
+    c++;
+    setPen( *tp );
+    from->addOutEdge( this );
+    to->addInEdge( this );
+    setLine( QLineF(int(from->x()), int(from->y()), int(to->x()), int(to->y()) ));
+    setZValue( 127 );
+    setBoundingRegionGranularity(0.05);
+}
+
+void EdgeItem::setFromPoint( int x, int y )
+{
+    setLine(QLineF( x,y, line().p2().x(), line().p2().y() ));
+}
+
+void EdgeItem::setToPoint( int x, int y )
+{
+    setLine(QLineF( line().p1().x(), line().p1().y(), x, y ));
+}
+
+QVariant NodeItem::itemChange(GraphicsItemChange change, const QVariant &value)
+{
+    if (change == ItemPositionHasChanged) {
+        Q3PtrListIterator<EdgeItem> it1( inList );
+        EdgeItem *edge;
+        while (( edge = it1.current() )) {
+            ++it1;
+            edge->setToPoint( int(x()), int(y()) );
+        }
+        Q3PtrListIterator<EdgeItem> it2( outList );
+        while (( edge = it2.current() )) {
+            ++it2;
+            edge->setFromPoint( int(x()), int(y()) );
+        }
+    }
+
+    return QGraphicsEllipseItem::itemChange(change, value);
+}
+
+NodeItem::NodeItem( )
+    : QGraphicsEllipseItem( QRectF(-3, -3, 6, 6) )
+{
+    setPen( *tp );
+    setBrush( *tb );
+    setZValue( 128 );
+    setFlag(ItemIsMovable);
+}
+
+FigureEditor::FigureEditor(
+	QGraphicsScene& c, QWidget* parent,
+	const char* name, Qt::WindowFlags f) :
+    QGraphicsView(&c,parent)
+{
+    setObjectName(name);
+    setWindowFlags(f);
+    setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+}
+
+void FigureEditor::clear()
+{
+    scene()->clear();
+}
+
+BouncyLogo::BouncyLogo() :
+    xvel(0), yvel(0)
+{
+    setPixmap(QPixmap(":/trolltech/examples/graphicsview/portedcanvas/qt-trans.xpm"));
+}
+
+const int logo_rtti = 1234;
+
+int BouncyLogo::type() const
+{
+    return logo_rtti;
+}
+
+QPainterPath BouncyLogo::shape() const
+{
+    QPainterPath path;
+    path.addRect(boundingRect());
+    return path;
+}
+
+void BouncyLogo::initPos()
+{
+    initSpeed();
+    int trial=1000;
+    do {
+	setPos(qrand()%int(scene()->width()),qrand()%int(scene()->height()));
+	advance(0);
+    } while (trial-- && xvel==0.0 && yvel==0.0);
+}
+
+void BouncyLogo::initSpeed()
+{
+    const double speed = 4.0;
+    double d = (double)(qrand()%1024) / 1024.0;
+    xvel = d*speed*2-speed;
+    yvel = (1-d)*speed*2-speed;
+}
+
+void BouncyLogo::advance(int stage)
+{
+    switch ( stage ) {
+      case 0: {
+	double vx = xvel;
+	double vy = yvel;
+
+	if ( vx == 0.0 && vy == 0.0 ) {
+	    // stopped last turn
+	    initSpeed();
+	    vx = xvel;
+	    vy = yvel;
+	}
+
+	double nx = x() + vx;
+	double ny = y() + vy;
+
+	if ( nx < 0 || nx >= scene()->width() )
+	    vx = -vx;
+	if ( ny < 0 || ny >= scene()->height() )
+	    vy = -vy;
+
+	for (int bounce=0; bounce<4; bounce++) {
+	    QList<QGraphicsItem *> l=scene()->collidingItems(this);
+            for (QList<QGraphicsItem *>::Iterator it=l.begin(); it!=l.end(); ++it) {
+                QGraphicsItem *hit = *it;
+                QPainterPath advancedShape = QMatrix().translate(xvel, yvel).map(shape());
+                if ( hit->type()==logo_rtti && hit->collidesWithPath(mapToItem(hit, advancedShape)) ) {
+		    switch ( bounce ) {
+		      case 0:
+			vx = -vx;
+			break;
+		      case 1:
+			vy = -vy;
+			vx = -vx;
+			break;
+		      case 2:
+			vx = -vx;
+			break;
+		      case 3:
+			// Stop for this turn
+			vx = 0;
+			vy = 0;
+			break;
+		    }
+		    xvel = vx;
+                    yvel = vy;
+		    break;
+		}
+	    }
+        }
+
+	if ( x()+vx < 0 || x()+vx >= scene()->width() )
+	    vx = 0;
+	if ( y()+vy < 0 || y()+vy >= scene()->height() )
+	    vy = 0;
+
+	xvel = vx;
+        yvel = vy;
+      } break;
+      case 1:
+        moveBy(xvel, yvel);
+	break;
+    }
+}
+
+static uint mainCount = 0;
+static QImage *butterflyimg;
+static QImage *logoimg;
+
+Main::Main(QGraphicsScene& c, QWidget* parent, const char* name, Qt::WindowFlags f) :
+    Q3MainWindow(parent,name,f),
+    canvas(c)
+{
+    editor = new FigureEditor(canvas,this);
+    QMenuBar* menu = menuBar();
+
+    Q3PopupMenu* file = new Q3PopupMenu( menu );
+    file->insertItem("&Fill canvas", this, SLOT(init()), Qt::CTRL+Qt::Key_F);
+    file->insertItem("&Erase canvas", this, SLOT(clear()), Qt::CTRL+Qt::Key_E);
+    file->insertItem("&New view", this, SLOT(newView()), Qt::CTRL+Qt::Key_N);
+    file->insertSeparator();
+    file->insertItem("&Print...", this, SLOT(print()), Qt::CTRL+Qt::Key_P);
+    file->insertSeparator();
+    file->insertItem("E&xit", qApp, SLOT(quit()), Qt::CTRL+Qt::Key_Q);
+    menu->insertItem("&File", file);
+
+    Q3PopupMenu* edit = new Q3PopupMenu( menu );
+    edit->insertItem("Add &Circle", this, SLOT(addCircle()), Qt::ALT+Qt::Key_C);
+    edit->insertItem("Add &Hexagon", this, SLOT(addHexagon()), Qt::ALT+Qt::Key_H);
+    edit->insertItem("Add &Polygon", this, SLOT(addPolygon()), Qt::ALT+Qt::Key_P);
+    edit->insertItem("Add Spl&ine", this, SLOT(addSpline()), Qt::ALT+Qt::Key_I);
+    edit->insertItem("Add &Text", this, SLOT(addText()), Qt::ALT+Qt::Key_T);
+    edit->insertItem("Add &Line", this, SLOT(addLine()), Qt::ALT+Qt::Key_L);
+    edit->insertItem("Add &Rectangle", this, SLOT(addRectangle()), Qt::ALT+Qt::Key_R);
+    edit->insertItem("Add &Sprite", this, SLOT(addSprite()), Qt::ALT+Qt::Key_S);
+    edit->insertItem("Create &Mesh", this, SLOT(addMesh()), Qt::ALT+Qt::Key_M );
+    edit->insertItem("Add &Alpha-blended image", this, SLOT(addButterfly()), Qt::ALT+Qt::Key_A);
+    menu->insertItem("&Edit", edit);
+
+    Q3PopupMenu* view = new Q3PopupMenu( menu );
+    view->insertItem("&Enlarge", this, SLOT(enlarge()), Qt::SHIFT+Qt::CTRL+Qt::Key_Plus);
+    view->insertItem("Shr&ink", this, SLOT(shrink()), Qt::SHIFT+Qt::CTRL+Qt::Key_Minus);
+    view->insertSeparator();
+    view->insertItem("&Rotate clockwise", this, SLOT(rotateClockwise()), Qt::CTRL+Qt::Key_PageDown);
+    view->insertItem("Rotate &counterclockwise", this, SLOT(rotateCounterClockwise()), Qt::CTRL+Qt::Key_PageUp);
+    view->insertItem("&Zoom in", this, SLOT(zoomIn()), Qt::CTRL+Qt::Key_Plus);
+    view->insertItem("Zoom &out", this, SLOT(zoomOut()), Qt::CTRL+Qt::Key_Minus);
+    view->insertItem("Translate left", this, SLOT(moveL()), Qt::CTRL+Qt::Key_Left);
+    view->insertItem("Translate right", this, SLOT(moveR()), Qt::CTRL+Qt::Key_Right);
+    view->insertItem("Translate up", this, SLOT(moveU()), Qt::CTRL+Qt::Key_Up);
+    view->insertItem("Translate down", this, SLOT(moveD()), Qt::CTRL+Qt::Key_Down);
+    view->insertItem("&Mirror", this, SLOT(mirror()), Qt::CTRL+Qt::Key_Home);
+    menu->insertItem("&View", view);
+
+    menu->insertSeparator();
+
+    Q3PopupMenu* help = new Q3PopupMenu( menu );
+    help->insertItem("&About", this, SLOT(help()), Qt::Key_F1);
+    help->setItemChecked(dbf_id, TRUE);
+    menu->insertItem("&Help",help);
+
+    statusBar();
+
+    setCentralWidget(editor);
+
+    printer = 0;
+
+    init();
+}
+
+void Main::init()
+{
+    clear();
+
+    static int r=24;
+    qsrand(++r);
+
+    mainCount++;
+    butterflyimg = 0;
+    logoimg = 0;
+
+    int i;
+    for ( i=0; i < int(canvas.width()) / 56; i++) {
+	addButterfly();
+    }
+    for ( i=0; i < int(canvas.width()) / 85; i++) {
+	addHexagon();
+    }
+    for ( i=0; i < int(canvas.width()) / 128; i++) {
+	addLogo();
+    }
+}
+
+Main::~Main()
+{
+    delete printer;
+    if ( !--mainCount ) {
+	delete[] butterflyimg;
+	butterflyimg = 0;
+	delete[] logoimg;
+	logoimg = 0;
+    }
+}
+
+void Main::newView()
+{
+    // Open a new view... have it delete when closed.
+    Main *m = new Main(canvas, 0, 0, Qt::WDestructiveClose);
+    m->show();
+}
+
+void Main::clear()
+{
+    editor->clear();
+}
+
+void Main::help()
+{
+    static QMessageBox* about = new QMessageBox( "Qt Canvas Example",
+	    "<h3>The QCanvas classes example</h3>"
+	    "<ul>"
+		"<li> Press ALT-S for some sprites."
+		"<li> Press ALT-C for some circles."
+		"<li> Press ALT-L for some lines."
+		"<li> Drag the objects around."
+		"<li> Read the code!"
+	    "</ul>", QMessageBox::Information, 1, 0, 0, this, 0, FALSE );
+    about->setButtonText( 1, "Dismiss" );
+    about->show();
+}
+
+void Main::aboutQt()
+{
+    QMessageBox::aboutQt( this, "Qt Canvas Example" );
+}
+
+void Main::enlarge()
+{
+    canvas.setSceneRect(0, 0, canvas.width()*4/3, canvas.height()*4/3);
+}
+
+void Main::shrink()
+{
+    canvas.setSceneRect(0, 0, qMax(canvas.width()*3/4, qreal(1.0)), qMax(canvas.height()*3/4, qreal(1.0)));
+}
+
+void Main::rotateClockwise()
+{
+    editor->rotate( 22.5 );
+}
+
+void Main::rotateCounterClockwise()
+{
+    editor->rotate( -22.5 );
+}
+
+void Main::zoomIn()
+{
+    editor->scale( 2.0, 2.0 );
+}
+
+void Main::zoomOut()
+{
+    editor->scale( 0.5, 0.5 );
+}
+
+void Main::mirror()
+{
+    editor->scale( -1, 1 );
+}
+
+void Main::moveL()
+{
+    editor->translate( -16, 0 );
+}
+
+void Main::moveR()
+{
+    editor->translate( +16, 0 );
+}
+
+void Main::moveU()
+{
+    editor->translate( 0, -16 );
+}
+
+void Main::moveD()
+{
+    editor->translate( 0, +16 );
+}
+
+void Main::print()
+{
+    if ( !printer ) printer = new QPrinter;
+    if ( printer->setup(this) ) {
+	QPainter pp(printer);
+        canvas.render(&pp);
+    }
+}
+
+
+void Main::addSprite()
+{
+    BouncyLogo* i = new BouncyLogo;
+    canvas.addItem(i);
+    i->initPos();
+    i->setZValue(qrand()%256);
+}
+
+QString butterfly_fn;
+QString logo_fn;
+
+
+void Main::addButterfly()
+{
+    if ( butterfly_fn.isEmpty() )
+	return;
+    if ( !butterflyimg ) {
+	butterflyimg = new QImage[4];
+	butterflyimg[0].load( butterfly_fn );
+	butterflyimg[1] = butterflyimg[0].smoothScale( int(butterflyimg[0].width()*0.75),
+		int(butterflyimg[0].height()*0.75) );
+	butterflyimg[2] = butterflyimg[0].smoothScale( int(butterflyimg[0].width()*0.5),
+		int(butterflyimg[0].height()*0.5) );
+	butterflyimg[3] = butterflyimg[0].smoothScale( int(butterflyimg[0].width()*0.25),
+		int(butterflyimg[0].height()*0.25) );
+    }
+    QAbstractGraphicsShapeItem* i = new ImageItem(butterflyimg[qrand()%4]);
+    canvas.addItem(i);
+    i->setPos(qrand()%int(canvas.width()-butterflyimg->width()),
+	    qrand()%int(canvas.height()-butterflyimg->height()));
+    i->setZValue(qrand()%256+250);
+}
+
+void Main::addLogo()
+{
+    if ( logo_fn.isEmpty() )
+	return;
+    if ( !logoimg ) {
+	logoimg = new QImage[4];
+	logoimg[0].load( logo_fn );
+	logoimg[1] = logoimg[0].smoothScale( int(logoimg[0].width()*0.75),
+		int(logoimg[0].height()*0.75) );
+	logoimg[2] = logoimg[0].smoothScale( int(logoimg[0].width()*0.5),
+		int(logoimg[0].height()*0.5) );
+	logoimg[3] = logoimg[0].smoothScale( int(logoimg[0].width()*0.25),
+		int(logoimg[0].height()*0.25) );
+    }
+    QAbstractGraphicsShapeItem* i = new ImageItem(logoimg[qrand()%4]);
+    canvas.addItem(i);
+    i->setPos(qrand()%int(canvas.width()-logoimg->width()),
+	    qrand()%int(canvas.height()-logoimg->width()));
+    i->setZValue(qrand()%256+256);
+}
+
+
+
+void Main::addCircle()
+{
+    QAbstractGraphicsShapeItem* i = canvas.addEllipse(QRectF(0,0,50,50));
+    i->setFlag(QGraphicsItem::ItemIsMovable);
+    i->setPen(Qt::NoPen);
+    i->setBrush( QColor(qrand()%32*8,qrand()%32*8,qrand()%32*8) );
+    i->setPos(qrand()%int(canvas.width()),qrand()%int(canvas.height()));
+    i->setZValue(qrand()%256);
+}
+
+void Main::addHexagon()
+{
+    const int size = int(canvas.width() / 25);
+    Q3PointArray pa(6);
+    pa[0] = QPoint(2*size,0);
+    pa[1] = QPoint(size,-size*173/100);
+    pa[2] = QPoint(-size,-size*173/100);
+    pa[3] = QPoint(-2*size,0);
+    pa[4] = QPoint(-size,size*173/100);
+    pa[5] = QPoint(size,size*173/100);
+    QGraphicsPolygonItem* i = canvas.addPolygon(pa);
+    i->setFlag(QGraphicsItem::ItemIsMovable);
+    i->setPen(Qt::NoPen);
+    i->setBrush( QColor(qrand()%32*8,qrand()%32*8,qrand()%32*8) );
+    i->setPos(qrand()%int(canvas.width()),qrand()%int(canvas.height()));
+    i->setZValue(qrand()%256);
+}
+
+void Main::addPolygon()
+{
+    const int size = int(canvas.width()/2);
+    Q3PointArray pa(6);
+    pa[0] = QPoint(0,0);
+    pa[1] = QPoint(size,size/5);
+    pa[2] = QPoint(size*4/5,size);
+    pa[3] = QPoint(size/6,size*5/4);
+    pa[4] = QPoint(size*3/4,size*3/4);
+    pa[5] = QPoint(size*3/4,size/4);
+    QGraphicsPolygonItem* i = canvas.addPolygon(pa);
+    i->setFlag(QGraphicsItem::ItemIsMovable);
+    i->setPen(Qt::NoPen);
+    i->setBrush( QColor(qrand()%32*8,qrand()%32*8,qrand()%32*8) );
+    i->setPos(qrand()%int(canvas.width()),qrand()%int(canvas.height()));
+    i->setZValue(qrand()%256);
+}
+
+void Main::addSpline()
+{
+    const int size = int(canvas.width()/6);
+
+    Q3PointArray pa(12);
+    pa[0] = QPoint(0,0);
+    pa[1] = QPoint(size/2,0);
+    pa[2] = QPoint(size,size/2);
+    pa[3] = QPoint(size,size);
+    pa[4] = QPoint(size,size*3/2);
+    pa[5] = QPoint(size/2,size*2);
+    pa[6] = QPoint(0,size*2);
+    pa[7] = QPoint(-size/2,size*2);
+    pa[8] = QPoint(size/4,size*3/2);
+    pa[9] = QPoint(0,size);
+    pa[10]= QPoint(-size/4,size/2);
+    pa[11]= QPoint(-size/2,0);
+
+    QPainterPath path;
+    path.moveTo(pa[0]);
+    for (int i = 1; i < pa.size(); i += 3)
+        path.cubicTo(pa[i], pa[(i + 1) % pa.size()], pa[(i + 2) % pa.size()]);
+
+    QGraphicsPathItem* item = canvas.addPath(path);
+    item->setFlag(QGraphicsItem::ItemIsMovable);
+    item->setPen(Qt::NoPen);
+    item->setBrush( QColor(qrand()%32*8,qrand()%32*8,qrand()%32*8) );
+    item->setPos(qrand()%int(canvas.width()),qrand()%int(canvas.height()));
+    item->setZValue(qrand()%256);
+}
+
+void Main::addText()
+{
+    QGraphicsTextItem* i = canvas.addText("QCanvasText");
+    i->setFlag(QGraphicsItem::ItemIsMovable);
+    i->setPos(qrand()%int(canvas.width()),qrand()%int(canvas.height()));
+    i->setZValue(qrand()%256);
+}
+
+void Main::addLine()
+{
+    QGraphicsLineItem* i = canvas.addLine(QLineF( qrand()%int(canvas.width()), qrand()%int(canvas.height()),
+                                                  qrand()%int(canvas.width()), qrand()%int(canvas.height()) ));
+    i->setFlag(QGraphicsItem::ItemIsMovable);
+    i->setPen( QPen(QColor(qrand()%32*8,qrand()%32*8,qrand()%32*8), 6) );
+    i->setZValue(qrand()%256);
+}
+
+void Main::addMesh()
+{
+    int x0 = 0;
+    int y0 = 0;
+
+    if ( !tb ) tb = new QBrush( Qt::red );
+    if ( !tp ) tp = new QPen( Qt::black );
+
+    int nodecount = 0;
+
+    int w = int(canvas.width());
+    int h = int(canvas.height());
+
+    const int dist = 30;
+    int rows = h / dist;
+    int cols = w / dist;
+
+#ifndef QT_NO_PROGRESSDIALOG
+    Q3ProgressDialog progress( "Creating mesh...", "Abort", rows,
+			      this, "progress", TRUE );
+#endif
+
+    canvas.update();
+    
+    Q3MemArray<NodeItem*> lastRow(cols);
+    for ( int j = 0; j < rows; j++ ) {
+	int n = j%2 ? cols-1 : cols;
+	NodeItem *prev = 0;
+	for ( int i = 0; i < n; i++ ) {
+	    NodeItem *el = new NodeItem;
+            canvas.addItem(el);
+	    nodecount++;
+	    int r = qrand();
+	    int xrand = r %20;
+	    int yrand = (r/20) %20;
+	    el->setPos( xrand + x0 + i*dist + (j%2 ? dist/2 : 0 ),
+                        yrand + y0 + j*dist );
+
+	    if ( j > 0 ) {
+		if ( i < cols-1 )
+		    canvas.addItem(new EdgeItem( lastRow[i], el));
+		if ( j%2 )
+		    canvas.addItem(new EdgeItem( lastRow[i+1], el));
+		else if ( i > 0 )
+		    canvas.addItem(new EdgeItem( lastRow[i-1], el));
+	    }
+	    if ( prev ) {
+		canvas.addItem(new EdgeItem( prev, el));
+	    }
+	    if ( i > 0 ) lastRow[i-1] = prev;
+	    prev = el;
+	}
+	lastRow[n-1]=prev;
+#ifndef QT_NO_PROGRESSDIALOG
+	progress.setProgress( j );
+	if ( progress.wasCancelled() )
+	    break;
+#endif
+    }
+#ifndef QT_NO_PROGRESSDIALOG
+    progress.setProgress( rows );
+#endif
+    // qDebug( "%d nodes, %d edges", nodecount, EdgeItem::count() );
+}
+
+void Main::addRectangle()
+{
+    QAbstractGraphicsShapeItem *i = canvas.addRect( QRectF(qrand()%int(canvas.width()),
+                                                          qrand()%int(canvas.height()),
+                                                          canvas.width()/5,
+                                                          canvas.width()/5) );
+    i->setFlag(QGraphicsItem::ItemIsMovable);
+    int z = qrand()%256;
+    i->setBrush( QColor(z,z,z) );
+    i->setPen( QPen(QColor(qrand()%32*8,qrand()%32*8,qrand()%32*8), 6) );
+    i->setZValue(z);
+}
diff --git a/examples/graphicsview/portedcanvas/canvas.doc b/examples/graphicsview/portedcanvas/canvas.doc
new file mode 100644
index 0000000000..f6d77ad685
--- /dev/null
+++ b/examples/graphicsview/portedcanvas/canvas.doc
@@ -0,0 +1,29 @@
+/*!   \page canvas-example.html
+
+  \ingroup examples
+  \title Canvas Example
+
+  This example shows a QCanvas and some \l{QCanvasItem}s in action.
+  You can do a lot more with QCanvas than we show here, but the
+  example provides a taste of what can be done.
+
+  <hr>
+
+  Header file:
+
+  \include canvas/canvas.h
+
+  <hr>
+
+  Implementation:
+
+  \include canvas/canvas.cpp
+
+  <hr>
+
+  Main:
+
+  \include canvas/main.cpp
+*/
+
+
diff --git a/examples/graphicsview/portedcanvas/canvas.h b/examples/graphicsview/portedcanvas/canvas.h
new file mode 100644
index 0000000000..769edbf134
--- /dev/null
+++ b/examples/graphicsview/portedcanvas/canvas.h
@@ -0,0 +1,131 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef EXAMPLE_H
+#define EXAMPLE_H
+
+#include <q3popupmenu.h>
+#include <q3mainwindow.h>
+#include <q3intdict.h>
+#include <QMouseEvent>
+#include <QGraphicsView>
+#include <QGraphicsScene>
+#include <QGraphicsItem>
+
+class BouncyLogo : public QGraphicsPixmapItem {
+    void initSpeed();
+public:
+    BouncyLogo();
+    void advance(int);
+    int type() const;
+
+    QPainterPath shape() const;
+
+    void initPos();
+private:
+    qreal xvel;
+    qreal yvel;
+};
+
+
+class FigureEditor : public QGraphicsView {
+    Q_OBJECT
+
+public:
+    FigureEditor(QGraphicsScene&, QWidget* parent=0, const char* name=0, Qt::WindowFlags f=0);
+    void clear();
+
+signals:
+    void status(const QString&);
+};
+
+class Main : public Q3MainWindow {
+    Q_OBJECT
+
+public:
+    Main(QGraphicsScene&, QWidget* parent=0, const char* name=0, Qt::WindowFlags f=0);
+    ~Main();
+
+public slots:
+    void help();
+
+private slots:
+    void aboutQt();
+    void newView();
+    void clear();
+    void init();
+
+    void addSprite();
+    void addCircle();
+    void addHexagon();
+    void addPolygon();
+    void addSpline();
+    void addText();
+    void addLine();
+    void addRectangle();
+    void addMesh();
+    void addLogo();
+    void addButterfly();
+
+    void enlarge();
+    void shrink();
+    void rotateClockwise();
+    void rotateCounterClockwise();
+    void zoomIn();
+    void zoomOut();
+    void mirror();
+    void moveL();
+    void moveR();
+    void moveU();
+    void moveD();
+
+    void print();
+
+private:
+    QGraphicsScene& canvas;
+    FigureEditor *editor;
+
+    Q3PopupMenu* options;
+    QPrinter* printer;
+    int dbf_id;
+};
+
+#endif
diff --git a/examples/graphicsview/portedcanvas/main.cpp b/examples/graphicsview/portedcanvas/main.cpp
new file mode 100644
index 0000000000..b68c4cb225
--- /dev/null
+++ b/examples/graphicsview/portedcanvas/main.cpp
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qstatusbar.h>
+#include <qmessagebox.h>
+#include <qmenubar.h>
+#include <qapplication.h>
+#include <qdesktopwidget.h>
+#include <qimage.h>
+#include <qtimer.h>
+
+#include "canvas.h"
+
+#include <stdlib.h>
+
+extern QString butterfly_fn;
+extern QString logo_fn;
+
+int main(int argc, char** argv)
+{
+    Q_INIT_RESOURCE(portedcanvas);
+
+    QApplication app(argc,argv);
+    
+    if ( argc > 1 )
+	butterfly_fn = argv[1];
+    else
+	butterfly_fn = ":/trolltech/examples/graphicsview/portedcanvas/butterfly.png";
+    
+    if ( argc > 2 )
+	logo_fn = argv[2];
+    else
+	logo_fn = ":/trolltech/examples/graphicsview/portedcanvas/qtlogo.png";
+    
+    QGraphicsScene canvas;
+    canvas.setSceneRect(0, 0, 800, 600);
+    Main m(canvas);
+    m.resize(m.sizeHint());
+    m.setCaption("Ported Canvas Example");
+    if ( QApplication::desktop()->width() > m.width() + 10
+	&& QApplication::desktop()->height() > m.height() +30 )
+	m.show();
+    else
+	m.showMaximized();
+    
+    QTimer timer;
+    QObject::connect(&timer, SIGNAL(timeout()), &canvas, SLOT(advance()));
+    timer.start(30);
+
+    QObject::connect( qApp, SIGNAL(lastWindowClosed()), qApp, SLOT(quit()) );
+    
+    return app.exec();
+}
+
diff --git a/examples/graphicsview/portedcanvas/makeimg.cpp b/examples/graphicsview/portedcanvas/makeimg.cpp
new file mode 100644
index 0000000000..93a8efefbe
--- /dev/null
+++ b/examples/graphicsview/portedcanvas/makeimg.cpp
@@ -0,0 +1,133 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qimage.h>
+#include <qcolor.h>
+
+static inline int blendComponent( int v, int av, int s, int as )
+{
+    //shadow gets a color inversely proportional to the
+    //alpha value
+    s = (s*(255-as))/255;
+    //then do standard blending
+    return as*s + av*v -(av*as*s)/255;  
+}
+    
+static inline QRgb blendShade( QRgb v, QRgb s )
+{
+    //pick a number: shadow is 1/3 of object
+    int as = qAlpha(s)/3; 
+    int av = qAlpha(v);
+    if ( as == 0 || av == 255 )
+	return v;
+
+    int a = as + av -(as*av)/255;
+
+    
+    int r = blendComponent( qRed(v),av, qRed(s), as)/a;
+    int g = blendComponent( qGreen(v),av, qGreen(s), as)/a;
+    int b = blendComponent( qBlue(v),av, qBlue(s), as)/a;
+
+    return qRgba(r,g,b,a);
+}
+
+int main( int*, char**)
+{
+    QImage *img;
+
+    img = new QImage( "in.png" );
+    int w,h;
+    int y;
+    img->setAlphaBuffer( TRUE );
+    *img = img->convertDepth( 32 );
+    w = img->width();
+    h = img->height();
+#if 0
+    for ( y = 0; y < h; y ++ ) {
+	uint *line = (uint*)img->scanLine( y );
+	for ( int x = 0; x < w; x++ ) {
+	    uint pixel = line[x];
+	    int r = qRed(pixel);
+	    int g = qGreen(pixel);
+	    int b = qBlue(pixel);
+	    int min = QMIN( r, QMIN( g, b ) );
+	    int max = QMAX( r, QMAX( g, b ) );
+	    r -= min;
+	    g -= min;
+	    b -= min;
+	    if ( max !=min ) {
+		r = (r*255)/(max-min);
+		g = (g*255)/(max-min);
+		b = (b*255)/(max-min);
+	    }
+	    int a = 255-min;
+	    a -=  (max-min)/3; //hack more transparency for colors.
+	    line[x] = qRgba( r, g, b, a );
+	}
+    }
+#endif    
+    *img = img->smoothScale( w/2, h/2 );
+
+    qDebug( "saving out.png");
+    img->save( "out.png", "PNG" );
+    
+    w = img->width();
+    h = img->height();
+    
+    QImage *img2 = new QImage( w, h, 32 );
+    img2->setAlphaBuffer( TRUE );
+    for ( y = 0; y < h; y++ ) {
+	for ( int x = 0; x < w; x++ ) {
+	    QRgb shader = img->pixel( x, y );
+
+	    int as = qAlpha(shader)/3;
+
+	    int r = (qRed(shader)*(255-as))/255;
+	    int g = (qGreen(shader)*(255-as))/255;
+	    int b = (qBlue(shader)*(255-as))/255;
+
+	    img2->setPixel( x, y, qRgba(r,g,b,as) ); 
+	}
+    }
+
+    img2->save( "outshade.png", "PNG" );
+
+}
diff --git a/examples/graphicsview/portedcanvas/portedcanvas.pro b/examples/graphicsview/portedcanvas/portedcanvas.pro
new file mode 100644
index 0000000000..71e3d8481f
--- /dev/null
+++ b/examples/graphicsview/portedcanvas/portedcanvas.pro
@@ -0,0 +1,16 @@
+TEMPLATE	= app
+TARGET		= portedcanvas
+
+CONFIG		+= qt warn_on
+
+HEADERS		= canvas.h
+SOURCES		= canvas.cpp main.cpp
+QT +=  qt3support 
+
+RESOURCES += portedcanvas.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/portedcanvas
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS portedcanvas.pro *.png *.xpm *.doc
+sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/portedcanvas
+INSTALLS += target sources
diff --git a/examples/graphicsview/portedcanvas/portedcanvas.qrc b/examples/graphicsview/portedcanvas/portedcanvas.qrc
new file mode 100644
index 0000000000..cf2e02464c
--- /dev/null
+++ b/examples/graphicsview/portedcanvas/portedcanvas.qrc
@@ -0,0 +1,7 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/trolltech/examples/graphicsview/portedcanvas">
+<file>qt-trans.xpm</file>
+<file>butterfly.png</file>
+<file>qtlogo.png</file>
+</qresource>
+</RCC>
diff --git a/examples/graphicsview/portedcanvas/qt-trans.xpm b/examples/graphicsview/portedcanvas/qt-trans.xpm
new file mode 100644
index 0000000000..225f684fd2
--- /dev/null
+++ b/examples/graphicsview/portedcanvas/qt-trans.xpm
@@ -0,0 +1,54 @@
+/* XPM */
+static char *qtlogo_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"54 34 13 1",
+/* colors */
+"  c #000000",
+". c #999999",
+"X c #333366",
+"o c #6666CC",
+"O c #333333",
+"@ c #666699",
+"# c #000066",
+"$ c #666666",
+"% c #3333CC",
+"& c #000033",
+"* c #9999CC",
+"= c #333399",
+"+ c None",
+/* pixels */
+"+++++++++++++++++++.$OOO$.++++++++++++++++++++++++++++",
+"+++++++++++++++++$         O.+++++++++++++++++++++++++",
+"+++++++++++++++.O            $++++++++++++++++++++++++",
+"++++++++++++++.    $.++.$     O+++++++++++++++++++++++",
+"+++++++++++++.   O.+++++++$    O++++++++++++++++++++++",
+"+++++++++++++O   ++++++++++$    $+++++++++++++++++++++",
+"++++++++++++$   .+++++++++++O    .++++++++++++++++++++",
+"+++++++++++.   O+++++++++++++    O++++++.+++++++++++++",
+"+++++++++++$   .+++++++++++++$    .+++.O +++++++++++++",
+"+++++++++++    +++++++++++++++    O+++.  +++++++++++++",
+"++++++++++.  &Xoooo*++++++++++$    +++.  +++++++++++++",
+"++++++++++@=%%%%%%%%%%*+++++++.    .++.  +++++++++++++",
+"+++++++**oooooo**++*o%%%%o+++++    $++O  +++++++++++++",
+"+++++*****$OOX@oooo*++*%%%%%*++O   $+.   OOO$++++++++*",
+"++..+.++....$O$+*ooooo*+*o%%%%%O   O+$   $$O.++++++**+",
+"***+*+++++$$....+++*oooo**+*o%%#   O++O  ++++++***o*++",
+"*+++++++++O  $.....++**oooo**+*X   &o*O  ++++*ooo*++++",
+"++++++++++$   O++.....++**oooo*X   &%%&  ..*o%%*++++++",
+"++++++++++$    ++++.....+++**ooO   $*o&  @oo*+++++++++",
+"++++++++++.    .++++++.....+++*O   Xo*O  .++++++++++++",
+"+++++++++++    O+++++++++......    .++O  +++++++++++++",
+"+++++++++++O    +++.$$$.++++++.   O+++O  +++++++++++++",
+"+++++++++++.    $$OO    O.++++O   .+++O  +++++++++++++",
+"++++++++++++O    .+++.O   $++.   O++++O  +++++++++++++",
+"++++++++++++.    O+++++O   $+O   +++++O  +++++++++++++",
+"+++++++++++++.    O+++++O   O   .+++++O  .++++++++++++",
+"++++++++++++++$     .++++O     .++++.+$  O+.$.++++++++",
+"+++++++++++++++.      O$$O    .+++++...      +++++++++",
+"+++++++++++++++++$            O+++++$$+.O O$.+++++++++",
+"+++++++++++++++++++$OO  O$.O   O.++. .++++++++++++++++",
+"+++++++++++++++++++++++++++.     OO  .++++++++++++++++",
+"++++++++++++++++++++++++++++.       O+++++++++++++++++",
+"+++++++++++++++++++++++++++++.      .+++++++++++++++++",
+"++++++++++++++++++++++++++++++.O  O.++++++++++++++++++"
+};
diff --git a/examples/graphicsview/portedcanvas/qtlogo.png b/examples/graphicsview/portedcanvas/qtlogo.png
new file mode 100644
index 0000000000..5aac08abb4
--- /dev/null
+++ b/examples/graphicsview/portedcanvas/qtlogo.png
diff --git a/examples/help/README b/examples/help/README
new file mode 100644
index 0000000000..85f5a4373d
--- /dev/null
+++ b/examples/help/README
@@ -0,0 +1,38 @@
+Support for interactive help is provided by the Qt Assistant application.
+Developers can take advantages of the facilities it offers to display
+specially-prepared documentation to users of their applications.
+
+
+The example launcher provided with Qt can be used to explore each of the
+examples in this directory.
+
+Documentation for these examples can be found via the Tutorial and Examples
+link in the main Qt documentation.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/help/contextsensitivehelp/contextsensitivehelp.pro b/examples/help/contextsensitivehelp/contextsensitivehelp.pro
new file mode 100644
index 0000000000..5a8c0b105a
--- /dev/null
+++ b/examples/help/contextsensitivehelp/contextsensitivehelp.pro
@@ -0,0 +1,18 @@
+TEMPLATE = app
+
+CONFIG += help
+
+SOURCES += main.cpp \
+           wateringconfigdialog.cpp \
+           helpbrowser.cpp
+
+HEADERS += wateringconfigdialog.h \
+           helpbrowser.h
+
+FORMS   += wateringconfigdialog.ui
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/help/contextsensitivehelp
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png *.doc doc
+sources.path = $$[QT_INSTALL_EXAMPLES]/help/contextsensitivehelp
+INSTALLS += target sources
diff --git a/examples/help/contextsensitivehelp/doc/amount.html b/examples/help/contextsensitivehelp/doc/amount.html
new file mode 100644
index 0000000000..7a02a6fd51
--- /dev/null
+++ b/examples/help/contextsensitivehelp/doc/amount.html
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+    <head>
+        <title>Water amount</title>
+    </head>
+    <body>
+        Depending on the plant, temperature and rain fall the amount needs to be larger 
+        or smaller. On a really hot day without rain, the suggested <a href="plants.html">amount</a>
+        can be increased by about 10%.
+    </body>
+</html>
diff --git a/examples/help/contextsensitivehelp/doc/filter.html b/examples/help/contextsensitivehelp/doc/filter.html
new file mode 100644
index 0000000000..64861126d8
--- /dev/null
+++ b/examples/help/contextsensitivehelp/doc/filter.html
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<title>Filter</title>
+</head>
+<body>
+Depending on the source of water, it needs to be filtered or not. Filtering
+is strongly recommened for the river and lake.
+
+
+</body>
+</html>
diff --git a/examples/help/contextsensitivehelp/doc/plants.html b/examples/help/contextsensitivehelp/doc/plants.html
new file mode 100644
index 0000000000..2d2bb6788c
--- /dev/null
+++ b/examples/help/contextsensitivehelp/doc/plants.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+    <head>
+        <title>Plants</title>
+    </head>
+    <body>
+        Different kind of plants need different amounts of water. Here's a short 
+        overview over the most common grown plants and their avarage need of water:
+        <br>
+        <table border=1>
+            <tr>
+                <td>Kind</td>
+                <td>Amount</td>
+            </tr>
+            <tr>
+                <td>Squash</td>
+                <td>2000</td>
+            </tr>
+            <tr>
+                <td>Bean</td>
+                <td>1500</td>
+            </tr>
+            <tr>
+                <td>Carrot</td>
+                <td>1200</td>
+            </tr>
+            <tr>
+                <td>Strawberry</td>
+                <td>1300</td>
+            </tr>
+            <tr>
+                <td>Raspberry</td>
+                <td>1000</td>
+            </tr>
+            <tr>
+                <td>Blueberry</td>
+                <td>1100</td>
+            </tr>
+        </table>
+        <br><br>
+        <font color="#ff0000">Warning:</font> Watering them too much or too little will 
+        cause irreversible damage!
+    </body>
+</html>
diff --git a/examples/help/contextsensitivehelp/doc/rain.html b/examples/help/contextsensitivehelp/doc/rain.html
new file mode 100644
index 0000000000..1ffe45240f
--- /dev/null
+++ b/examples/help/contextsensitivehelp/doc/rain.html
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+    <head>
+        <title>Rain</title>
+    </head>
+    <body>
+        Depending on the rain fall, the automated watering system should not be 
+        switched on at all. Also, the <a href="./temperature.html">temperature</a> should be 
+        considered.
+    </body>
+</html>
diff --git a/examples/help/contextsensitivehelp/doc/source.html b/examples/help/contextsensitivehelp/doc/source.html
new file mode 100644
index 0000000000..2140765064
--- /dev/null
+++ b/examples/help/contextsensitivehelp/doc/source.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+    <head>
+        <title>Water Source</title>
+    </head>
+    <body>
+        The current pipe system connects to four different sources. Be aware that only 
+        a limited amount of water can be taken from some sources.
+        <br>
+        <table border=1>
+            <tr>
+                <td>Source</td>
+                <td>Amount</td>
+            </tr>
+            <tr>
+                <td>Foundain</td>
+                <td>4000</td>
+            </tr>
+            <tr>
+                <td>River</td>
+                <td>6000</td>
+            </tr>
+            <tr>
+                <td>Lake</td>
+                <td>10000</td>
+            </tr>
+            <tr>
+                <td>Public Water System</td>
+                <td>unlimited</td>
+            </tr>
+        </table>
+    </body>
+</html>
diff --git a/examples/help/contextsensitivehelp/doc/temperature.html b/examples/help/contextsensitivehelp/doc/temperature.html
new file mode 100644
index 0000000000..4145ed725d
--- /dev/null
+++ b/examples/help/contextsensitivehelp/doc/temperature.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+    <head>
+        <title>Temperature</title>
+    </head>
+    <body>
+        Depending on the temperature, the plants need more or less water. The higher 
+        the temperature the higher the need for water. If the temperature does not
+        reach a certain level, maybe no automatic watering should be done at all.<br>
+        Before setting this parameter for good, you should also take the amount of <a href="./rain.html">
+            rain</a> into account.
+    </body>
+</html>
diff --git a/examples/help/contextsensitivehelp/doc/time.html b/examples/help/contextsensitivehelp/doc/time.html
new file mode 100644
index 0000000000..0cc81f4d02
--- /dev/null
+++ b/examples/help/contextsensitivehelp/doc/time.html
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<title>Starting time</title>
+</head>
+<body>
+Starting the watering too early may be ineffective since most water
+will evaporate.
+
+</body>
+</html>
diff --git a/examples/help/contextsensitivehelp/doc/wateringmachine.qch b/examples/help/contextsensitivehelp/doc/wateringmachine.qch
new file mode 100644
index 0000000000..e74f9b80a3
--- /dev/null
+++ b/examples/help/contextsensitivehelp/doc/wateringmachine.qch
diff --git a/examples/help/contextsensitivehelp/doc/wateringmachine.qhc b/examples/help/contextsensitivehelp/doc/wateringmachine.qhc
new file mode 100644
index 0000000000..3227c3a22f
--- /dev/null
+++ b/examples/help/contextsensitivehelp/doc/wateringmachine.qhc
diff --git a/examples/help/contextsensitivehelp/doc/wateringmachine.qhcp b/examples/help/contextsensitivehelp/doc/wateringmachine.qhcp
new file mode 100644
index 0000000000..eebf6520ed
--- /dev/null
+++ b/examples/help/contextsensitivehelp/doc/wateringmachine.qhcp
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<QHelpCollectionProject version="1.0">
+    <docFiles>
+        <generate>
+            <file>
+                <input>wateringmachine.qhp</input>
+                <output>wateringmachine.qch</output>
+            </file>
+        </generate>
+        <register>
+            <file>wateringmachine.qch</file>
+        </register>
+    </docFiles>
+</QHelpCollectionProject>
\ No newline at end of file
diff --git a/examples/help/contextsensitivehelp/doc/wateringmachine.qhp b/examples/help/contextsensitivehelp/doc/wateringmachine.qhp
new file mode 100644
index 0000000000..745d881a5c
--- /dev/null
+++ b/examples/help/contextsensitivehelp/doc/wateringmachine.qhp
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<QtHelpProject version="1.0">
+	<virtualFolder>wateringmachine</virtualFolder>
+	<namespace>wateringcompany.com.1_0_0.premium</namespace>
+	<filterSection>
+		<keywords>
+			<keyword name="plants" id="plants" ref="plants.html"/>
+			<keyword name="temperature" id="temperature" ref="temperature.html"/>
+			<keyword name="rain" id="rain" ref="rain.html"/>
+			<keyword name="time" id="time" ref="time.html"/>
+			<keyword name="amount" id="amount" ref="amount.html"/>
+			<keyword name="source" id="source" ref="source.html"/>
+			<keyword name="filtering" id="filtering" ref="filter.html"/>
+		</keywords>	
+		<files>
+			<file>plants.html</file>
+			<file>temperature.html</file>
+			<file>rain.html</file>
+			<file>time.html</file>
+			<file>amount.html</file>
+			<file>source.html</file>
+			<file>filter.html</file>
+		</files>
+	</filterSection>	
+</QtHelpProject>
diff --git a/examples/help/contextsensitivehelp/helpbrowser.cpp b/examples/help/contextsensitivehelp/helpbrowser.cpp
new file mode 100644
index 0000000000..100b940793
--- /dev/null
+++ b/examples/help/contextsensitivehelp/helpbrowser.cpp
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/QLibraryInfo>
+#include <QtGui/QApplication>
+#include <QtHelp/QHelpEngineCore>
+
+#include "helpbrowser.h"
+
+HelpBrowser::HelpBrowser(QWidget *parent)
+    : QTextBrowser(parent)
+{
+    QString collectionFile = QLibraryInfo::location(QLibraryInfo::ExamplesPath)
+        + QLatin1String("/help/contextsensitivehelp/doc/wateringmachine.qhc");
+
+    m_helpEngine = new QHelpEngineCore(collectionFile, this);
+    if (!m_helpEngine->setupData()) {
+        delete m_helpEngine;
+        m_helpEngine = 0;
+    }
+}
+
+void HelpBrowser::showHelpForKeyword(const QString &id)
+{
+    if (m_helpEngine) {
+        QMap<QString, QUrl> links = m_helpEngine->linksForIdentifier(id);
+        if (links.count())
+            setSource(links.constBegin().value());
+    }
+}
+
+QVariant HelpBrowser::loadResource(int type, const QUrl &name)
+{
+    QByteArray ba;
+    if (type < 4 && m_helpEngine) {
+        QUrl url(name);
+        if (name.isRelative())            
+            url = source().resolved(url);
+        ba = m_helpEngine->fileData(url);        
+    }
+    return ba;
+}
+
diff --git a/examples/help/contextsensitivehelp/helpbrowser.h b/examples/help/contextsensitivehelp/helpbrowser.h
new file mode 100644
index 0000000000..133552441e
--- /dev/null
+++ b/examples/help/contextsensitivehelp/helpbrowser.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef HELPBROWSER_H
+#define HELPBROWSER_H
+
+#include <QtGui/QTextBrowser>
+
+QT_BEGIN_NAMESPACE
+class QHelpEngineCore;
+QT_END_NAMESPACE;
+
+class HelpBrowser : public QTextBrowser
+{
+    Q_OBJECT
+
+public:
+    HelpBrowser(QWidget *parent);
+    void showHelpForKeyword(const QString &id);
+
+private:
+    QVariant loadResource(int type, const QUrl &name);
+
+    QHelpEngineCore *m_helpEngine;
+};
+
+#endif
diff --git a/examples/help/contextsensitivehelp/main.cpp b/examples/help/contextsensitivehelp/main.cpp
new file mode 100644
index 0000000000..b05cf3e95e
--- /dev/null
+++ b/examples/help/contextsensitivehelp/main.cpp
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+
+#include "wateringconfigdialog.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);    
+    WateringConfigDialog dia;
+    return dia.exec();
+}
diff --git a/examples/help/contextsensitivehelp/wateringconfigdialog.cpp b/examples/help/contextsensitivehelp/wateringconfigdialog.cpp
new file mode 100644
index 0000000000..285123a217
--- /dev/null
+++ b/examples/help/contextsensitivehelp/wateringconfigdialog.cpp
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "wateringconfigdialog.h"
+
+WateringConfigDialog::WateringConfigDialog()
+{
+    m_ui.setupUi(this);
+    m_widgetInfo.insert(m_ui.plantComboBox, tr("plants"));
+    m_widgetInfo.insert(m_ui.temperatureCheckBox, tr("temperature"));
+    m_widgetInfo.insert(m_ui.temperatureSpinBox, tr("temperature"));
+    m_widgetInfo.insert(m_ui.rainCheckBox, tr("rain"));
+    m_widgetInfo.insert(m_ui.rainSpinBox, tr("rain"));
+    m_widgetInfo.insert(m_ui.startTimeEdit, tr("starting time"));
+    m_widgetInfo.insert(m_ui.amountSpinBox, tr("water amount"));
+    m_widgetInfo.insert(m_ui.sourceComboBox, tr("water source"));
+    m_widgetInfo.insert(m_ui.filterCheckBox, tr("water filtering"));
+
+    connect(qApp, SIGNAL(focusChanged(QWidget*, QWidget*)),
+        this, SLOT(focusChanged(QWidget*, QWidget*)));
+}
+
+void WateringConfigDialog::focusChanged(QWidget *, QWidget *now)
+{
+    if (m_widgetInfo.contains(now)) {
+        m_ui.helpLabel->setText(tr("Information about %1:").arg(m_widgetInfo.value(now)));
+        QStringList lst = m_widgetInfo.value(now).split(QLatin1Char(' '));
+        m_ui.helpBrowser->showHelpForKeyword(lst.last());
+    }
+}
+
diff --git a/examples/help/contextsensitivehelp/wateringconfigdialog.h b/examples/help/contextsensitivehelp/wateringconfigdialog.h
new file mode 100644
index 0000000000..7fc3c514d4
--- /dev/null
+++ b/examples/help/contextsensitivehelp/wateringconfigdialog.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WATERINGCONFIGDIALOG_H
+#define WATERINGCONFIGDIALOG_H
+
+#include <QtGui/QDialog>
+#include "ui_wateringconfigdialog.h"
+
+class WateringConfigDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    WateringConfigDialog();
+
+private slots:
+    void focusChanged(QWidget *old, QWidget *now);
+    
+private:
+    Ui::WateringConfigDialog m_ui;
+    QMap<QWidget*, QString> m_widgetInfo;
+};
+
+#endif
diff --git a/examples/help/contextsensitivehelp/wateringconfigdialog.ui b/examples/help/contextsensitivehelp/wateringconfigdialog.ui
new file mode 100644
index 0000000000..a7f5349d78
--- /dev/null
+++ b/examples/help/contextsensitivehelp/wateringconfigdialog.ui
@@ -0,0 +1,446 @@
+<ui version="4.0" >
+ <class>WateringConfigDialog</class>
+ <widget class="QDialog" name="WateringConfigDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>334</width>
+    <height>550</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Watering Configuration</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <layout class="QGridLayout" >
+     <item row="0" column="0" >
+      <widget class="QLabel" name="label_3" >
+       <property name="text" >
+        <string>Plant:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" colspan="3" >
+      <widget class="QComboBox" name="plantComboBox" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <item>
+        <property name="text" >
+         <string>Squash</string>
+        </property>
+       </item>
+       <item>
+        <property name="text" >
+         <string>Bean</string>
+        </property>
+       </item>
+       <item>
+        <property name="text" >
+         <string>Carrot</string>
+        </property>
+       </item>
+       <item>
+        <property name="text" >
+         <string>Strawberry</string>
+        </property>
+       </item>
+       <item>
+        <property name="text" >
+         <string>Raspberry</string>
+        </property>
+       </item>
+       <item>
+        <property name="text" >
+         <string>Blueberry</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="1" column="0" >
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>67</width>
+         <height>16</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="2" column="0" >
+      <widget class="QLabel" name="label_2" >
+       <property name="text" >
+        <string>Water when:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1" colspan="3" >
+      <widget class="QCheckBox" name="temperatureCheckBox" >
+       <property name="text" >
+        <string>Temperature is higher than:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1" >
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="4" column="2" >
+      <widget class="QSpinBox" name="temperatureSpinBox" >
+       <property name="enabled" >
+        <bool>false</bool>
+       </property>
+       <property name="specialValueText" >
+        <string/>
+       </property>
+       <property name="suffix" >
+        <string>C</string>
+       </property>
+       <property name="minimum" >
+        <number>10</number>
+       </property>
+       <property name="maximum" >
+        <number>60</number>
+       </property>
+       <property name="value" >
+        <number>20</number>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="3" >
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="5" column="1" colspan="3" >
+      <widget class="QCheckBox" name="rainCheckBox" >
+       <property name="text" >
+        <string>Rain less than:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1" >
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="6" column="2" >
+      <widget class="QSpinBox" name="rainSpinBox" >
+       <property name="enabled" >
+        <bool>false</bool>
+       </property>
+       <property name="specialValueText" >
+        <string/>
+       </property>
+       <property name="suffix" >
+        <string>mm</string>
+       </property>
+       <property name="minimum" >
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="3" >
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="7" column="2" >
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="8" column="0" >
+      <widget class="QLabel" name="label" >
+       <property name="text" >
+        <string>Starting Time:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="8" column="1" colspan="3" >
+      <widget class="QTimeEdit" name="startTimeEdit" />
+     </item>
+     <item row="9" column="0" >
+      <widget class="QLabel" name="label_4" >
+       <property name="text" >
+        <string>Amount:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="9" column="1" colspan="3" >
+      <widget class="QSpinBox" name="amountSpinBox" >
+       <property name="suffix" >
+        <string>l</string>
+       </property>
+       <property name="minimum" >
+        <number>100</number>
+       </property>
+       <property name="maximum" >
+        <number>10000</number>
+       </property>
+       <property name="singleStep" >
+        <number>100</number>
+       </property>
+       <property name="value" >
+        <number>1000</number>
+       </property>
+      </widget>
+     </item>
+     <item row="10" column="0" >
+      <widget class="QLabel" name="label_5" >
+       <property name="text" >
+        <string>Source:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="10" column="1" colspan="3" >
+      <widget class="QComboBox" name="sourceComboBox" >
+       <item>
+        <property name="text" >
+         <string>Foundain</string>
+        </property>
+       </item>
+       <item>
+        <property name="text" >
+         <string>River</string>
+        </property>
+       </item>
+       <item>
+        <property name="text" >
+         <string>Lake</string>
+        </property>
+       </item>
+       <item>
+        <property name="text" >
+         <string>Public Water System</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="11" column="0" >
+      <widget class="QLabel" name="label_6" >
+       <property name="text" >
+        <string>Filter:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="11" column="1" colspan="2" >
+      <widget class="QCheckBox" name="filterCheckBox" >
+       <property name="text" >
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="12" column="0" >
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>20</width>
+         <height>10</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="4" column="4" >
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QGridLayout" >
+     <item row="0" column="1" >
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="1" column="0" colspan="2" >
+      <widget class="HelpBrowser" name="helpBrowser" />
+     </item>
+     <item row="0" column="0" >
+      <widget class="QLabel" name="helpLabel" >
+       <property name="text" >
+        <string>&lt;a href="test">Show Details&lt;/a></string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="Line" name="line" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>HelpBrowser</class>
+   <extends>QTextBrowser</extends>
+   <header>helpbrowser.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>WateringConfigDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>227</x>
+     <y>372</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>WateringConfigDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>286</x>
+     <y>378</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>temperatureCheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>temperatureSpinBox</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>132</x>
+     <y>101</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>132</x>
+     <y>125</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>rainCheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>rainSpinBox</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>110</x>
+     <y>154</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>113</x>
+     <y>169</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/examples/help/help.pro b/examples/help/help.pro
new file mode 100644
index 0000000000..1ce6322d84
--- /dev/null
+++ b/examples/help/help.pro
@@ -0,0 +1,11 @@
+TEMPLATE = subdirs
+CONFIG  += ordered
+
+SUBDIRS += contextsensitivehelp \
+           remotecontrol \
+           simpletextviewer
+
+# install
+sources.files = README *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/help
+INSTALLS += sources
diff --git a/examples/help/remotecontrol/enter.png b/examples/help/remotecontrol/enter.png
new file mode 100644
index 0000000000..f397f4b9c4
--- /dev/null
+++ b/examples/help/remotecontrol/enter.png
diff --git a/examples/help/remotecontrol/main.cpp b/examples/help/remotecontrol/main.cpp
new file mode 100644
index 0000000000..746dec420e
--- /dev/null
+++ b/examples/help/remotecontrol/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include "remotecontrol.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(remotecontrol);
+
+    QApplication a(argc, argv);
+    RemoteControl w;
+    w.show();
+    a.connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()));
+    return a.exec();
+}
diff --git a/examples/help/remotecontrol/remotecontrol.cpp b/examples/help/remotecontrol/remotecontrol.cpp
new file mode 100644
index 0000000000..8701afbab3
--- /dev/null
+++ b/examples/help/remotecontrol/remotecontrol.cpp
@@ -0,0 +1,175 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/QDir>
+#include <QtCore/QProcess>
+#include <QtCore/QTextStream>
+#include <QtCore/QLibraryInfo>
+
+#include <QtGui/QMessageBox>
+
+#include "remotecontrol.h"
+
+RemoteControl::RemoteControl(QWidget *parent, Qt::WFlags flags)
+        : QMainWindow(parent, flags)
+{
+    ui.setupUi(this);
+    connect(ui.indexLineEdit, SIGNAL(returnPressed()),
+        this, SLOT(on_indexButton_clicked()));
+    connect(ui.identifierLineEdit, SIGNAL(returnPressed()),
+        this, SLOT(on_identifierButton_clicked()));
+    connect(ui.urlLineEdit, SIGNAL(returnPressed()),
+        this, SLOT(on_urlButton_clicked()));
+
+    QString rc;
+    QTextStream(&rc) << QLatin1String("qthelp://com.trolltech.qt.")
+                     << (QT_VERSION >> 16) << ((QT_VERSION >> 8) & 0xFF)
+                     << (QT_VERSION & 0xFF)
+                     << QLatin1String("/qdoc/index.html");
+
+    ui.startUrlLineEdit->setText(rc);
+
+    process = new QProcess(this);
+    connect(process, SIGNAL(finished(int, QProcess::ExitStatus)),
+        this, SLOT(helpViewerClosed()));
+}
+
+RemoteControl::~RemoteControl()
+{
+    if (process->state() == QProcess::Running) {
+        process->terminate();
+        process->waitForFinished(3000);
+    }
+}
+
+void RemoteControl::on_actionQuit_triggered()
+{
+    close();
+}
+
+void RemoteControl::on_launchButton_clicked()
+{
+    if (process->state() == QProcess::Running)
+        return;
+
+    QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
+#if !defined(Q_OS_MAC)
+    app += QLatin1String("assistant");
+#else
+    app += QLatin1String("Assistant.app/Contents/MacOS/Assistant");
+#endif
+
+    ui.contentsCheckBox->setChecked(true);
+    ui.indexCheckBox->setChecked(true);
+    ui.bookmarksCheckBox->setChecked(true);
+
+    QStringList args;
+    args << QLatin1String("-enableRemoteControl");
+    process->start(app, args);
+    if (!process->waitForStarted()) {
+        QMessageBox::critical(this, tr("Remote Control"),
+            tr("Could not start Qt Assistant from %1.").arg(app));
+        return;
+    }
+
+    if (!ui.startUrlLineEdit->text().isEmpty())
+        sendCommand(QLatin1String("SetSource ")
+            + ui.startUrlLineEdit->text());
+        
+    ui.launchButton->setEnabled(false);
+    ui.startUrlLineEdit->setEnabled(false);
+    ui.actionGroupBox->setEnabled(true);
+}
+
+void RemoteControl::sendCommand(const QString &cmd)
+{
+    if (process->state() != QProcess::Running)
+        return;
+    process->write(cmd.toLocal8Bit() + '\0');
+}
+
+void RemoteControl::on_indexButton_clicked()
+{
+    sendCommand(QLatin1String("ActivateKeyword ")
+        + ui.indexLineEdit->text());
+}
+
+void RemoteControl::on_identifierButton_clicked()
+{
+    sendCommand(QLatin1String("ActivateIdentifier ")
+        + ui.identifierLineEdit->text());
+}
+
+void RemoteControl::on_urlButton_clicked()
+{
+    sendCommand(QLatin1String("SetSource ")
+        + ui.urlLineEdit->text());
+}
+
+void RemoteControl::on_syncContentsButton_clicked()
+{
+    sendCommand(QLatin1String("SyncContents"));
+}
+
+void RemoteControl::on_contentsCheckBox_toggled(bool checked)
+{
+    sendCommand(checked ?
+        QLatin1String("Show Contents") : QLatin1String("Hide Contents"));
+}
+
+void RemoteControl::on_indexCheckBox_toggled(bool checked)
+{
+    sendCommand(checked ?
+        QLatin1String("Show Index") : QLatin1String("Hide Index"));
+}
+
+void RemoteControl::on_bookmarksCheckBox_toggled(bool checked)
+{
+    sendCommand(checked ?
+        QLatin1String("Show Bookmarks") : QLatin1String("Hide Bookmarks"));
+}
+
+void RemoteControl::helpViewerClosed()
+{
+    ui.launchButton->setEnabled(true);
+    ui.startUrlLineEdit->setEnabled(true);
+    ui.actionGroupBox->setEnabled(false);
+}
diff --git a/examples/help/remotecontrol/remotecontrol.h b/examples/help/remotecontrol/remotecontrol.h
new file mode 100644
index 0000000000..cc1c1c8570
--- /dev/null
+++ b/examples/help/remotecontrol/remotecontrol.h
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef REMOTECONTROL_H
+#define REMOTECONTROL_H
+
+#include <QtGui/QMainWindow>
+#include "ui_remotecontrol.h"
+
+QT_BEGIN_NAMESPACE
+class QProcess;
+QT_END_NAMESPACE;
+
+class RemoteControl : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    RemoteControl(QWidget *parent = 0, Qt::WFlags flags = 0);
+    ~RemoteControl();
+    
+private:
+    Ui::RemoteControlClass ui;
+    QProcess *process;
+    
+private slots:
+    void on_launchButton_clicked();
+    void on_actionQuit_triggered();
+    void on_indexButton_clicked();
+    void on_identifierButton_clicked();
+    void on_urlButton_clicked();
+    void on_syncContentsButton_clicked();
+    void on_contentsCheckBox_toggled(bool checked);
+    void on_indexCheckBox_toggled(bool checked);
+    void on_bookmarksCheckBox_toggled(bool checked);
+    void helpViewerClosed();
+
+    void sendCommand(const QString &cmd);
+};
+
+#endif // REMOTECONTROL_H
diff --git a/examples/help/remotecontrol/remotecontrol.pro b/examples/help/remotecontrol/remotecontrol.pro
new file mode 100644
index 0000000000..05fc14c24e
--- /dev/null
+++ b/examples/help/remotecontrol/remotecontrol.pro
@@ -0,0 +1,13 @@
+TEMPLATE   = app
+
+HEADERS   += remotecontrol.h
+SOURCES   += main.cpp \
+             remotecontrol.cpp
+FORMS     += remotecontrol.ui
+RESOURCES += remotecontrol.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/help/remotecontrol
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png *.doc doc
+sources.path = $$[QT_INSTALL_EXAMPLES]/help/remotecontrol
+INSTALLS += target sources
diff --git a/examples/help/remotecontrol/remotecontrol.qrc b/examples/help/remotecontrol/remotecontrol.qrc
new file mode 100644
index 0000000000..9b4299d217
--- /dev/null
+++ b/examples/help/remotecontrol/remotecontrol.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/remotecontrol" >
+        <file>enter.png</file>
+    </qresource>
+</RCC>
diff --git a/examples/help/remotecontrol/remotecontrol.ui b/examples/help/remotecontrol/remotecontrol.ui
new file mode 100644
index 0000000000..1cfc7f5400
--- /dev/null
+++ b/examples/help/remotecontrol/remotecontrol.ui
@@ -0,0 +1,228 @@
+<ui version="4.0" >
+ <class>RemoteControlClass</class>
+ <widget class="QMainWindow" name="RemoteControlClass" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>344</width>
+    <height>364</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>RemoteControl</string>
+  </property>
+  <widget class="QWidget" name="centralWidget" >
+   <layout class="QGridLayout" >
+    <item row="0" column="0" >
+     <widget class="QLabel" name="label" >
+      <property name="text" >
+       <string>Start URL:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="1" colspan="2" >
+     <widget class="QLineEdit" name="startUrlLineEdit" />
+    </item>
+    <item row="1" column="1" >
+     <widget class="QPushButton" name="launchButton" >
+      <property name="text" >
+       <string>Launch Qt HelpViewer</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="2" >
+     <spacer>
+      <property name="orientation" >
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeHint" >
+       <size>
+        <width>101</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item row="2" column="1" >
+     <spacer>
+      <property name="orientation" >
+       <enum>Qt::Vertical</enum>
+      </property>
+      <property name="sizeType" >
+       <enum>QSizePolicy::Fixed</enum>
+      </property>
+      <property name="sizeHint" >
+       <size>
+        <width>113</width>
+        <height>16</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item row="3" column="0" colspan="3" >
+     <widget class="QGroupBox" name="actionGroupBox" >
+      <property name="enabled" >
+       <bool>false</bool>
+      </property>
+      <property name="title" >
+       <string>Actions</string>
+      </property>
+      <layout class="QGridLayout" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="label_2" >
+         <property name="text" >
+          <string>Search in Index:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" colspan="2" >
+        <layout class="QHBoxLayout" >
+         <property name="spacing" >
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLineEdit" name="indexLineEdit" />
+         </item>
+         <item>
+          <widget class="QToolButton" name="indexButton" >
+           <property name="text" >
+            <string/>
+           </property>
+           <property name="icon" >
+            <iconset resource="remotecontrol.qrc" >:/remotecontrol/enter.png</iconset>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QLabel" name="label_4" >
+         <property name="text" >
+          <string>Identifier:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1" colspan="2" >
+        <layout class="QHBoxLayout" >
+         <property name="spacing" >
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLineEdit" name="identifierLineEdit" />
+         </item>
+         <item>
+          <widget class="QToolButton" name="identifierButton" >
+           <property name="text" >
+            <string/>
+           </property>
+           <property name="icon" >
+            <iconset resource="remotecontrol.qrc" >:/remotecontrol/enter.png</iconset>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="2" column="0" >
+        <widget class="QLabel" name="label_3" >
+         <property name="text" >
+          <string>Show URL:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1" colspan="2" >
+        <layout class="QHBoxLayout" >
+         <property name="spacing" >
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLineEdit" name="urlLineEdit" />
+         </item>
+         <item>
+          <widget class="QToolButton" name="urlButton" >
+           <property name="text" >
+            <string/>
+           </property>
+           <property name="icon" >
+            <iconset resource="remotecontrol.qrc" >:/remotecontrol/enter.png</iconset>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="3" column="1" >
+        <widget class="QPushButton" name="syncContentsButton" >
+         <property name="text" >
+          <string>Sync Contents</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="2" >
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>81</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="4" column="0" colspan="3" >
+        <widget class="QCheckBox" name="contentsCheckBox" >
+         <property name="text" >
+          <string>Show Contents</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0" >
+        <widget class="QCheckBox" name="indexCheckBox" >
+         <property name="text" >
+          <string>Show Index</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="0" colspan="3" >
+        <widget class="QCheckBox" name="bookmarksCheckBox" >
+         <property name="text" >
+          <string>Show Bookmarks</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menuBar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>344</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuFile" >
+    <property name="title" >
+     <string>File</string>
+    </property>
+    <addaction name="actionQuit" />
+   </widget>
+   <addaction name="menuFile" />
+  </widget>
+  <widget class="QStatusBar" name="statusBar" />
+  <action name="actionQuit" >
+   <property name="text" >
+    <string>Quit</string>
+   </property>
+  </action>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <resources>
+  <include location="remotecontrol.qrc" />
+ </resources>
+ <connections/>
+</ui>
diff --git a/examples/help/simpletextviewer/assistant.cpp b/examples/help/simpletextviewer/assistant.cpp
new file mode 100644
index 0000000000..b6fb88aac9
--- /dev/null
+++ b/examples/help/simpletextviewer/assistant.cpp
@@ -0,0 +1,110 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/QByteArray>
+#include <QtCore/QDir>
+#include <QtCore/QLibraryInfo>
+#include <QtCore/QProcess>
+
+#include <QtGui/QMessageBox>
+
+#include "assistant.h"
+
+Assistant::Assistant()
+    : proc(0)
+{
+}
+
+//! [0]
+Assistant::~Assistant()
+{
+    if (proc && proc->state() == QProcess::Running) {
+        proc->terminate();
+        proc->waitForFinished(3000);
+    }
+    delete proc;
+}
+//! [0]
+
+//! [1]
+void Assistant::showDocumentation(const QString &page)
+{
+    if (!startAssistant())
+        return;
+
+    QByteArray ba("SetSource ");
+    ba.append("qthelp://com.trolltech.examples.simpletextviewer/doc/");
+    
+    proc->write(ba + page.toLocal8Bit() + '\0');
+}
+//! [1]
+
+//! [2]
+bool Assistant::startAssistant()
+{
+    if (!proc)
+        proc = new QProcess();
+
+    if (proc->state() != QProcess::Running) {
+        QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
+#if !defined(Q_OS_MAC)
+        app += QLatin1String("assistant");
+#else
+        app += QLatin1String("Assistant.app/Contents/MacOS/Assistant");    
+#endif
+
+        QStringList args;
+        args << QLatin1String("-collectionFile")
+            << QLibraryInfo::location(QLibraryInfo::ExamplesPath)
+            + QLatin1String("/help/simpletextviewer/documentation/simpletextviewer.qhc")
+            << QLatin1String("-enableRemoteControl");
+
+        proc->start(app, args);
+
+        if (!proc->waitForStarted()) {
+            QMessageBox::critical(0, QObject::tr("Simple Text Viewer"),
+                QObject::tr("Unable to launch Qt Assistant (%1)").arg(app));
+            return false;
+        }    
+    }
+    return true;
+}
+//! [2]
diff --git a/examples/help/simpletextviewer/assistant.h b/examples/help/simpletextviewer/assistant.h
new file mode 100644
index 0000000000..e58939c82d
--- /dev/null
+++ b/examples/help/simpletextviewer/assistant.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ASSISTANT_H
+#define ASSISTANT_H
+
+#include <QtCore/QString>
+
+QT_BEGIN_NAMESPACE
+class QProcess;
+QT_END_NAMESPACE
+
+class Assistant
+{
+public:
+    Assistant();
+    ~Assistant();
+    void showDocumentation(const QString &file);
+    
+private:
+    bool startAssistant();
+    QProcess *proc;
+};
+
+#endif
diff --git a/examples/help/simpletextviewer/documentation/about.txt b/examples/help/simpletextviewer/documentation/about.txt
new file mode 100644
index 0000000000..eeab35f4a6
--- /dev/null
+++ b/examples/help/simpletextviewer/documentation/about.txt
@@ -0,0 +1,9 @@
+The Simple Text Viewer enables the user to select and view existing
+files.
+
+HTML files is displayed using rich text, while other files are
+presented as plain text. The application provides a file dialog
+allowing the user to search for files using wildcard matching. The
+search is performed within in the specified directory, and the user is
+given an option to browse the existing file system to find the
+relevant directory.
diff --git a/examples/help/simpletextviewer/documentation/browse.html b/examples/help/simpletextviewer/documentation/browse.html
new file mode 100644
index 0000000000..987abf31f6
--- /dev/null
+++ b/examples/help/simpletextviewer/documentation/browse.html
@@ -0,0 +1,34 @@
+<html>
+    <head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Browse</title>
+    </head>
+    <body style="font-size:12pt;font-family:helvetica">
+	
+        <p><center><h2>Browse</h2></center></p>
+ 
+        <p>
+        The file dialog let you browse the current file system to
+        specify the directory in which the file you want to open
+        resides. 
+        Note that only the specified directory will be searched, any
+        subdirectories will simply be ignored.
+        </p>
+
+        <br />
+        <br />
+        <table align="center" cellpadding="2" cellspacing="1" border="0" width="100%">
+        <tr valign="top" bgcolor="#f0f0f0">
+        <td><center><img src="images/browse.png" /></center></td>
+        </tr>
+        </table>
+
+        <br />
+        <br />
+        <p>
+        See also: <a href="filedialog.html">File Dialog</a>, <a href="wildcardmatching.html">Wildcard Matching</a>,
+        <a href="findfile.html">Find File</a>
+        </p>
+    </body>
+</html>
+
diff --git a/examples/help/simpletextviewer/documentation/filedialog.html b/examples/help/simpletextviewer/documentation/filedialog.html
new file mode 100644
index 0000000000..afa65ed577
--- /dev/null
+++ b/examples/help/simpletextviewer/documentation/filedialog.html
@@ -0,0 +1,48 @@
+<html>
+    <head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>File Dialog</title>
+    </head>
+    <body style="font-size:12pt;font-family:helvetica">
+
+	<p><center><h2>File Dialog</h2></center></p>
+
+        <p>
+        In the file dialog you can name a particular file name, or
+        search for files using wildcard matching, i.e. specify a
+        file name containing wildcards. In addition you must specify
+        the directory in which the file you search for resides. 
+        </p>
+
+        <br />
+        <br />
+        <table align="center" cellpadding="2" cellspacing="1" border="0" width="100%">
+        <tr valign="top" bgcolor="#f0f0f0">
+        <td><center><img src="images/filedialog.png" /></center></td>
+        </tr>
+        </table>
+
+        <br />
+        <br />
+        <p>
+        By default the dialog will search for all files (*) in the
+        current directory (the directory the application is run from).
+        </p>
+
+        <p>
+        When editing the file name and directory parameters, an
+        overview of the matching files are displayed in the
+        dialog. The overview is updated whenever the parameters
+        change.
+        </p>
+
+        <br />
+        <br />
+        <p>
+        See also: <a href="browse.html">Browse</a>, <a href="wildcardmatching.html">Wildcard Matching</a>, 
+        <a href="findfile.html">Find File</a>
+        </p>
+    </body>
+</html>
+
+
diff --git a/examples/help/simpletextviewer/documentation/findfile.html b/examples/help/simpletextviewer/documentation/findfile.html
new file mode 100644
index 0000000000..32e0147181
--- /dev/null
+++ b/examples/help/simpletextviewer/documentation/findfile.html
@@ -0,0 +1,32 @@
+<html>
+    <head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Find File</title>
+    </head>
+    <body style="font-size:12pt;font-family:helvetica">
+
+	<p><center><h2>Find File</h2></center></p>
+
+        <p>
+        To open and view a file in the Simple Text Viewer, select the
+        'Open...' option in the 'File' menu. The application will then
+        provide you with a file dialog that you can use to search for
+        any existing file.
+        </p>
+
+        <br />
+        <br />
+        <table align="center" cellpadding="2" cellspacing="1" border="0" width="100%">
+        <tr valign="top" bgcolor="#f0f0f0">
+        <td><center><img src="images/fadedfilemenu.png" /></center></td>
+        </tr>
+        </table>
+
+        <br />
+        <br />
+        <p>
+        See also: <a href="openfile.html">Open File</a>, <a href="filedialog.html">File Dialog</a>
+        </p>
+    </body>
+</html>
+
diff --git a/examples/help/simpletextviewer/documentation/images/browse.png b/examples/help/simpletextviewer/documentation/images/browse.png
new file mode 100644
index 0000000000..86db6b19eb
--- /dev/null
+++ b/examples/help/simpletextviewer/documentation/images/browse.png
diff --git a/examples/help/simpletextviewer/documentation/images/fadedfilemenu.png b/examples/help/simpletextviewer/documentation/images/fadedfilemenu.png
new file mode 100644
index 0000000000..fde0e43f67
--- /dev/null
+++ b/examples/help/simpletextviewer/documentation/images/fadedfilemenu.png
diff --git a/examples/help/simpletextviewer/documentation/images/filedialog.png b/examples/help/simpletextviewer/documentation/images/filedialog.png
new file mode 100644
index 0000000000..883a33a269
--- /dev/null
+++ b/examples/help/simpletextviewer/documentation/images/filedialog.png
diff --git a/examples/help/simpletextviewer/documentation/images/handbook.png b/examples/help/simpletextviewer/documentation/images/handbook.png
new file mode 100644
index 0000000000..3bd2b928b0
--- /dev/null
+++ b/examples/help/simpletextviewer/documentation/images/handbook.png
diff --git a/examples/help/simpletextviewer/documentation/images/icon.png b/examples/help/simpletextviewer/documentation/images/icon.png
new file mode 100644
index 0000000000..6daec0ade2
--- /dev/null
+++ b/examples/help/simpletextviewer/documentation/images/icon.png
diff --git a/examples/help/simpletextviewer/documentation/images/mainwindow.png b/examples/help/simpletextviewer/documentation/images/mainwindow.png
new file mode 100644
index 0000000000..c28d5e9ffe
--- /dev/null
+++ b/examples/help/simpletextviewer/documentation/images/mainwindow.png
diff --git a/examples/help/simpletextviewer/documentation/images/open.png b/examples/help/simpletextviewer/documentation/images/open.png
new file mode 100644
index 0000000000..1e5bba3c8c
--- /dev/null
+++ b/examples/help/simpletextviewer/documentation/images/open.png
diff --git a/examples/help/simpletextviewer/documentation/images/wildcard.png b/examples/help/simpletextviewer/documentation/images/wildcard.png
new file mode 100644
index 0000000000..6e83a56cc4
--- /dev/null
+++ b/examples/help/simpletextviewer/documentation/images/wildcard.png
diff --git a/examples/help/simpletextviewer/documentation/index.html b/examples/help/simpletextviewer/documentation/index.html
new file mode 100644
index 0000000000..5a7b1d5fac
--- /dev/null
+++ b/examples/help/simpletextviewer/documentation/index.html
@@ -0,0 +1,41 @@
+<html>
+    <head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Manual</title>
+    </head>
+    <body style="font-size:12pt;font-family:helvetica">
+
+	<p><center><h2>Simple Text Viewer</h2></center></p>
+
+	<p>
+        The Simple Text Viewer enables the user to select and view
+        existing files. 
+        </p>
+
+        <p><center>
+        <img src="images/mainwindow.png" />
+        </center></p>
+
+        <p>
+        HTML files is displayed using rich text, while
+        other files are presented as plain text. The application
+        provides a file dialog allowing the user to search for files
+        using wildcard matching. The search is performed within in the
+        specified directory, and the user is given an option to browse
+        the existing file system to find the relevant directory.
+        </p>
+
+	<ul>
+	    <li><a href="findfile.html">Find File</a></li>
+            <ul>
+                <li><a href="filedialog.html">File Dialog</a></li>
+                <li><a href="wildcardmatching.html">WildCard Matching</a></li>
+                <li><a href="browse.html">Browse</a></li>
+            </ul>
+	    <li><a href="openfile.html">Open File</a></li>
+	</ul>
+    </body>
+</html>
+
+
+
diff --git a/examples/help/simpletextviewer/documentation/intro.html b/examples/help/simpletextviewer/documentation/intro.html
new file mode 100644
index 0000000000..2e2aa40de7
--- /dev/null
+++ b/examples/help/simpletextviewer/documentation/intro.html
@@ -0,0 +1,28 @@
+<html>
+    <head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Manual</title>
+    </head>
+    <body style="font-size:12pt;font-family:helvetica">
+
+	<p><center><h2>Simple Text Viewer</h2></center></p>
+
+	<p>
+        The Simple Text Viewer enables the user to select and view
+        existing files. 
+        </p>
+
+        <p><center>
+        <img src="images/mainwindow.png" />
+        </center></p>
+
+        <p>
+        The application provides its own custom documentation that is
+        available through the <b>Help</b> menu in the main window's menubar
+        and through the <b>Help</b> button in the application's find file
+        dialog.
+        </p>
+
+    </body>
+</html>
+
diff --git a/examples/help/simpletextviewer/documentation/openfile.html b/examples/help/simpletextviewer/documentation/openfile.html
new file mode 100644
index 0000000000..e172de95ea
--- /dev/null
+++ b/examples/help/simpletextviewer/documentation/openfile.html
@@ -0,0 +1,36 @@
+<html>
+    <head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Open File</title>
+    </head>
+    <body style="font-size:12pt;font-family:helvetica">
+
+	<p><center><h2>Open File</h2></center></p>
+
+        <p>
+        Once the file you want to view appears in the dialog's
+        display, you can open it in two different ways.
+        </p>
+
+        <p>
+        By pressing the 'Open' button the currently selected file will
+        be opened. By default, the first file in the list of matching
+        files is selected. Another way of opening a file is to simply
+        double click the displayed file name.
+        </p>
+
+        <br />
+        <br />
+        <table align="center" cellpadding="2" cellspacing="1" border="0" width="100%">
+        <tr valign="top" bgcolor="#f0f0f0">
+        <td><center><img src="images/open.png" /></center></td>
+        </tr>
+        </table>
+
+        <br />
+        <br />
+        <p>
+        See also: <a href="findfile.html">Find File</a>
+        </p>
+    </body>
+</html>
diff --git a/examples/help/simpletextviewer/documentation/simpletextviewer.qch b/examples/help/simpletextviewer/documentation/simpletextviewer.qch
new file mode 100644
index 0000000000..c40132803e
--- /dev/null
+++ b/examples/help/simpletextviewer/documentation/simpletextviewer.qch
diff --git a/examples/help/simpletextviewer/documentation/simpletextviewer.qhc b/examples/help/simpletextviewer/documentation/simpletextviewer.qhc
new file mode 100644
index 0000000000..db380cabfd
--- /dev/null
+++ b/examples/help/simpletextviewer/documentation/simpletextviewer.qhc
diff --git a/examples/help/simpletextviewer/documentation/simpletextviewer.qhcp b/examples/help/simpletextviewer/documentation/simpletextviewer.qhcp
new file mode 100644
index 0000000000..e7c23210ba
--- /dev/null
+++ b/examples/help/simpletextviewer/documentation/simpletextviewer.qhcp
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<QHelpCollectionProject version="1.0">
+    <assistant>
+        <title>Simple Text Viewer</title>
+        <applicationIcon>images/handbook.png</applicationIcon>
+        <cacheDirectory>Trolltech/SimpleTextViewer</cacheDirectory>
+        <startPage>qthelp://com.trolltech.examples.simpletextviewer/doc/index.html</startPage>
+        <aboutMenuText>
+            <text>About Simple Text Viewer</text>
+        </aboutMenuText>
+        <aboutDialog>
+            <file>about.txt</file>
+            <icon>images/icon.png</icon>
+        </aboutDialog>
+        <enableDocumentationManager>false</enableDocumentationManager>
+        <enableAddressBar>false</enableAddressBar>
+        <enableFilterFunctionality>false</enableFilterFunctionality>
+    </assistant>
+    <docFiles>
+        <generate>
+            <file>
+                <input>simpletextviewer.qhp</input>
+                <output>simpletextviewer.qch</output>
+                </file>
+            </generate>
+        <register>
+            <file>simpletextviewer.qch</file>
+            </register>
+        </docFiles>
+    </QHelpCollectionProject>
diff --git a/examples/help/simpletextviewer/documentation/simpletextviewer.qhp b/examples/help/simpletextviewer/documentation/simpletextviewer.qhp
new file mode 100644
index 0000000000..4cb83a5f32
--- /dev/null
+++ b/examples/help/simpletextviewer/documentation/simpletextviewer.qhp
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<QtHelpProject version="1.0">
+    <namespace>com.trolltech.examples.simpletextviewer</namespace>
+    <virtualFolder>doc</virtualFolder>
+    <filterSection>
+        <toc>
+            <section title="Simple Text Viewer" ref="index.html">
+                <section title="Find File" ref="./findfile.html">
+                    <section title="File Dialog" ref="./filedialog.html"></section>
+                    <section title="Wildcard Matching" ref="./wildcardmatching.html"></section>
+                    <section title="Browse" ref="./browse.html"></section>
+                    </section>
+                <section title="Open File" ref="./openfile.html"></section>
+                </section>
+            </toc>
+        <keywords>
+            <keyword name="Display" ref="./index.html"/>
+            <keyword name="Rich text" ref="./index.html"/>
+            <keyword name="Plain text" ref="./index.html"/>
+            <keyword name="Find" ref="./findfile.html"/>
+            <keyword name="File menu" ref="./findfile.html"/>
+            <keyword name="File name" ref="./filedialog.html"/>
+            <keyword name="File dialog" ref="./filedialog.html"/>
+            <keyword name="File globbing" ref="./wildcardmatching.html"/>
+            <keyword name="Wildcard matching" ref="./wildcardmatching.html"/>
+            <keyword name="Wildcard syntax" ref="./wildcardmatching.html"/>
+            <keyword name="Browse" ref="./browse.html"/>
+            <keyword name="Directory" ref="./browse.html"/>
+            <keyword name="Open" ref="./openfile.html"/>
+            <keyword name="Select" ref="./openfile.html"/>
+            </keywords>
+        <files>
+            <file>browse.html</file>
+            <file>filedialog.html</file>
+            <file>findfile.html</file>
+            <file>index.html</file>
+            <file>intro.html</file>
+            <file>openfile.html</file>
+            <file>wildcardmatching.html</file>
+            <file>images/browse.png</file>
+            <file>images/fadedfilemenu.png</file>
+            <file>images/filedialog.png</file>
+            <file>images/handbook.png</file>
+            <file>images/mainwindow.png</file>
+            <file>images/open.png</file>
+            <file>images/wildcard.png</file>
+            </files>
+        </filterSection>
+    </QtHelpProject>
diff --git a/examples/help/simpletextviewer/documentation/wildcardmatching.html b/examples/help/simpletextviewer/documentation/wildcardmatching.html
new file mode 100644
index 0000000000..eb1839a068
--- /dev/null
+++ b/examples/help/simpletextviewer/documentation/wildcardmatching.html
@@ -0,0 +1,57 @@
+<html>
+    <head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Wildcard Matching</title>
+    </head>
+    <body style="font-size:12pt;font-family:helvetica">
+
+	<p><center><h2>Wildcard Matching</h2></center></p>
+
+        <p>
+        Most command shells such as bash or cmd.exe support "file
+        globbing", the ability to identify a group of files by using
+        wildcards. 
+
+        <br />
+        <br />
+        <table align="center" cellpadding="2" cellspacing="1" border="0" width="100%">
+        <tr valign="top" bgcolor="#f0f0f0">
+        <td><center><img src="images/wildcard.png" /></center></td>
+        </tr>
+        </table>
+
+        <br />
+        <br />
+        <p>
+        Wildcard matching provides four features:     
+        </p>   
+
+	<ul>
+	    <li>Any character represents itself apart from those
+	    mentioned below. Thus 'c' matches the character 'c'.
+            </li>
+	    <li>The '?' character matches any single character.</li>
+	    <li>The '*' matches zero or more of any characters.</li>
+	    <li>Sets of characters can be represented in square brackets. 
+                Within the character class, like outside, backslash 
+                has no special meaning.
+	    </li>
+	</ul>
+
+        <p>
+        For example we could identify HTML files with
+        <code>*.html</code>. This will match zero or more characters
+        followed by a dot followed by 'h', 't', 'm' and 'l'.
+        </p>
+
+        <br />
+        <br />
+        <p>
+        See also: <a href="browse.html">Browse</a>, <a href="filedialog.html">File Dialog</a>,
+        <a href="findfile.html">Find File</a>
+        </p>
+    </body>
+</html>
+
+
+
diff --git a/examples/help/simpletextviewer/findfiledialog.cpp b/examples/help/simpletextviewer/findfiledialog.cpp
new file mode 100644
index 0000000000..51d78cef7b
--- /dev/null
+++ b/examples/help/simpletextviewer/findfiledialog.cpp
@@ -0,0 +1,222 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/QDir>
+#include <QtGui/QLayout>
+#include <QtGui/QComboBox>
+#include <QtGui/QTreeWidget>
+#include <QtGui/QLayout>
+#include <QtGui/QFileDialog>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QToolButton>
+#include <QtGui/QPushButton>
+#include <QtGui/QLabel>
+
+#include "findfiledialog.h"
+#include "assistant.h"
+#include "textedit.h"
+
+//! [0]
+FindFileDialog::FindFileDialog(TextEdit *editor, Assistant *assistant)
+    : QDialog(editor)
+{
+    currentAssistant = assistant;
+    currentEditor = editor;
+//! [0]
+
+    createButtons();
+    createComboBoxes();
+    createFilesTree();
+    createLabels();
+    createLayout();
+
+    directoryComboBox->addItem(QDir::toNativeSeparators(QDir::currentPath()));
+    fileNameComboBox->addItem("*");
+    findFiles();
+
+    setWindowTitle(tr("Find File"));
+//! [1]
+}
+//! [1]
+
+void FindFileDialog::browse()
+{
+    QString currentDirectory = directoryComboBox->currentText();
+    QString newDirectory = QFileDialog::getExistingDirectory(this,
+                               tr("Select Directory"), currentDirectory);
+    if (!newDirectory.isEmpty()) {
+        directoryComboBox->addItem(QDir::toNativeSeparators(newDirectory));
+        directoryComboBox->setCurrentIndex(directoryComboBox->count() - 1);
+        update();
+    }
+}
+
+//! [2]
+void FindFileDialog::help()
+{
+    currentAssistant->showDocumentation("filedialog.html");    
+}
+//! [2]
+
+void FindFileDialog::openFile(QTreeWidgetItem *item)
+{
+    if (!item) {
+        item = foundFilesTree->currentItem();
+        if (!item)
+            return;
+    }
+
+    QString fileName = item->text(0);
+    QString path = directoryComboBox->currentText() + QDir::separator();
+
+    currentEditor->setContents(path + fileName);
+    close();
+}
+
+void FindFileDialog::update()
+{
+    findFiles();
+    buttonBox->button(QDialogButtonBox::Open)->setEnabled(
+            foundFilesTree->topLevelItemCount() > 0);
+}
+
+void FindFileDialog::findFiles()
+{
+    QRegExp filePattern(fileNameComboBox->currentText() + "*");
+    filePattern.setPatternSyntax(QRegExp::Wildcard);
+
+    QDir directory(directoryComboBox->currentText());
+
+    QStringList allFiles = directory.entryList(QDir::Files | QDir::NoSymLinks);
+    QStringList matchingFiles;
+
+    foreach (QString file, allFiles) {
+        if (filePattern.exactMatch(file))
+            matchingFiles << file;
+    }
+    showFiles(matchingFiles);
+}
+
+void FindFileDialog::showFiles(const QStringList &files)
+{
+    foundFilesTree->clear();
+
+    for (int i = 0; i < files.count(); ++i) {
+        QTreeWidgetItem *item = new QTreeWidgetItem(foundFilesTree);
+        item->setText(0, files[i]);
+    }
+
+    if (files.count() > 0)
+        foundFilesTree->setCurrentItem(foundFilesTree->topLevelItem(0));
+}
+
+void FindFileDialog::createButtons()
+{
+    browseButton = new QToolButton;
+    browseButton->setText(tr("..."));
+    connect(browseButton, SIGNAL(clicked()), this, SLOT(browse()));
+
+    buttonBox = new QDialogButtonBox(QDialogButtonBox::Open
+                                     | QDialogButtonBox::Cancel
+                                     | QDialogButtonBox::Help);
+    connect(buttonBox, SIGNAL(accepted()), this, SLOT(openFile()));
+    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+    connect(buttonBox, SIGNAL(helpRequested()), this, SLOT(help()));
+}
+
+void FindFileDialog::createComboBoxes()
+{
+    directoryComboBox = new QComboBox;
+    fileNameComboBox = new QComboBox;
+
+    fileNameComboBox->setEditable(true);
+    fileNameComboBox->setSizePolicy(QSizePolicy::Expanding,
+                                    QSizePolicy::Preferred);
+
+    directoryComboBox->setMinimumContentsLength(30);
+    directoryComboBox->setSizeAdjustPolicy(
+            QComboBox::AdjustToMinimumContentsLength);
+    directoryComboBox->setSizePolicy(QSizePolicy::Expanding,
+                                     QSizePolicy::Preferred);
+
+    connect(fileNameComboBox, SIGNAL(editTextChanged(const QString &)),
+            this, SLOT(update()));
+    connect(directoryComboBox, SIGNAL(currentIndexChanged(const QString &)),
+            this, SLOT(update()));
+}
+
+void FindFileDialog::createFilesTree()
+{
+    foundFilesTree = new QTreeWidget;
+    foundFilesTree->setColumnCount(1);
+    foundFilesTree->setHeaderLabels(QStringList(tr("Matching Files")));
+    foundFilesTree->setRootIsDecorated(false);
+    foundFilesTree->setSelectionMode(QAbstractItemView::SingleSelection);
+
+    connect(foundFilesTree, SIGNAL(itemActivated(QTreeWidgetItem *, int)),
+            this, SLOT(openFile(QTreeWidgetItem *)));
+}
+
+void FindFileDialog::createLabels()
+{
+    directoryLabel = new QLabel(tr("Search in:"));
+    fileNameLabel = new QLabel(tr("File name (including wildcards):"));
+}
+
+void FindFileDialog::createLayout()
+{
+    QHBoxLayout *fileLayout = new QHBoxLayout;
+    fileLayout->addWidget(fileNameLabel);
+    fileLayout->addWidget(fileNameComboBox);
+
+    QHBoxLayout *directoryLayout = new QHBoxLayout;
+    directoryLayout->addWidget(directoryLabel);
+    directoryLayout->addWidget(directoryComboBox);
+    directoryLayout->addWidget(browseButton);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addLayout(fileLayout);
+    mainLayout->addLayout(directoryLayout);
+    mainLayout->addWidget(foundFilesTree);
+    mainLayout->addStretch();
+    mainLayout->addWidget(buttonBox);
+    setLayout(mainLayout);
+}
diff --git a/examples/help/simpletextviewer/findfiledialog.h b/examples/help/simpletextviewer/findfiledialog.h
new file mode 100644
index 0000000000..97af229274
--- /dev/null
+++ b/examples/help/simpletextviewer/findfiledialog.h
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef FINDFILEDIALOG_H
+#define FINDFILEDIALOG_H
+
+#include <QtGui/QDialog>
+
+QT_BEGIN_NAMESPACE
+class QComboBox;
+class QDialogButtonBox;
+class QLabel;
+class QToolButton;
+class QTreeWidget;
+class QTreeWidgetItem;
+QT_END_NAMESPACE
+
+class Assistant;
+class TextEdit;
+
+//! [0]
+class FindFileDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    FindFileDialog(TextEdit *editor, Assistant *assistant);
+
+private slots:
+    void browse();
+    void help();
+    void openFile(QTreeWidgetItem *item = 0);
+    void update();
+
+private:
+    void findFiles();
+    void showFiles(const QStringList &files);
+
+    void createButtons();
+    void createComboBoxes();
+    void createFilesTree();
+    void createLabels();
+    void createLayout();
+
+    Assistant *currentAssistant;
+    TextEdit *currentEditor;
+    QTreeWidget *foundFilesTree;
+
+    QComboBox *directoryComboBox;
+    QComboBox *fileNameComboBox;
+
+    QLabel *directoryLabel;
+    QLabel *fileNameLabel;
+
+    QDialogButtonBox *buttonBox;
+
+    QToolButton *browseButton;
+};
+//! [0]
+
+#endif
diff --git a/examples/help/simpletextviewer/main.cpp b/examples/help/simpletextviewer/main.cpp
new file mode 100644
index 0000000000..ce4ee608b2
--- /dev/null
+++ b/examples/help/simpletextviewer/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/help/simpletextviewer/mainwindow.cpp b/examples/help/simpletextviewer/mainwindow.cpp
new file mode 100644
index 0000000000..fc9af58658
--- /dev/null
+++ b/examples/help/simpletextviewer/mainwindow.cpp
@@ -0,0 +1,147 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/QLibraryInfo>
+#include <QtGui/QApplication>
+#include <QtGui/QAction>
+#include <QtGui/QMenu>
+#include <QtGui/QMenuBar>
+#include <QtGui/QMessageBox>
+
+#include "mainwindow.h"
+#include "findfiledialog.h"
+#include "assistant.h"
+#include "textedit.h"
+
+// ![0]
+MainWindow::MainWindow()
+{
+    assistant = new Assistant;
+// ![0]
+    textViewer = new TextEdit;
+    textViewer->setContents(QLibraryInfo::location(QLibraryInfo::ExamplesPath)
+            + QLatin1String("/help/simpletextviewer/documentation/intro.html"));
+    setCentralWidget(textViewer);
+
+    createActions();
+    createMenus();
+
+    setWindowTitle(tr("Simple Text Viewer"));
+    resize(750, 400);
+// ![1]
+}
+//! [1]
+
+//! [2]
+void MainWindow::closeEvent(QCloseEvent *)
+{
+    delete assistant;
+}
+//! [2]
+
+void MainWindow::about()
+{
+    QMessageBox::about(this, tr("About Simple Text Viewer"),
+                       tr("This example demonstrates how to use\n"
+                          "Qt Assistant as help system for your\n"
+                          "own application."));
+}
+
+//! [3]
+void MainWindow::showDocumentation()
+{
+    assistant->showDocumentation("index.html");    
+}
+//! [3]
+
+void MainWindow::open()
+{
+    FindFileDialog dialog(textViewer, assistant);
+    dialog.exec();
+}
+
+//! [4]
+void MainWindow::createActions()
+{
+    assistantAct = new QAction(tr("Help Contents"), this);
+    assistantAct->setShortcut(tr("F1"));
+    connect(assistantAct, SIGNAL(triggered()), this, SLOT(showDocumentation()));
+//! [4]
+
+    openAct = new QAction(tr("&Open..."), this);
+    openAct->setShortcut(tr("Ctrl+O"));
+    connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
+
+    clearAct = new QAction(tr("&Clear"), this);
+    clearAct->setShortcut(tr("Ctrl+C"));
+    connect(clearAct, SIGNAL(triggered()), textViewer, SLOT(clear()));
+
+    exitAct = new QAction(tr("E&xit"), this);
+    exitAct->setShortcut(tr("Ctrl+Q"));
+    connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));
+
+    aboutAct = new QAction(tr("&About"), this);
+    connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
+
+    aboutQtAct = new QAction(tr("About &Qt"), this);
+    connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+//! [5]
+}
+//! [5]
+
+void MainWindow::createMenus()
+{
+    fileMenu = new QMenu(tr("&File"), this);
+    fileMenu->addAction(openAct);
+    fileMenu->addAction(clearAct);
+    fileMenu->addSeparator();
+    fileMenu->addAction(exitAct);
+
+    helpMenu = new QMenu(tr("&Help"), this);
+    helpMenu->addAction(assistantAct);
+    helpMenu->addSeparator();
+    helpMenu->addAction(aboutAct);
+    helpMenu->addAction(aboutQtAct);
+
+
+    menuBar()->addMenu(fileMenu);
+    menuBar()->addMenu(helpMenu);
+}
diff --git a/examples/help/simpletextviewer/mainwindow.h b/examples/help/simpletextviewer/mainwindow.h
new file mode 100644
index 0000000000..46d3b82e4d
--- /dev/null
+++ b/examples/help/simpletextviewer/mainwindow.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QtGui/QMainWindow>
+
+class Assistant;
+class TextEdit;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+    void showDocumentation(const QString &file);
+
+private slots:
+    void about();
+    void showDocumentation();
+    void open();
+
+protected:
+    void closeEvent(QCloseEvent *event);
+
+private:
+    void createActions();
+    void createMenus();
+
+    Assistant *assistant;
+    TextEdit *textViewer;
+
+    QMenu *fileMenu;
+    QMenu *helpMenu;
+
+    QAction *assistantAct;
+    QAction *clearAct;
+    QAction *openAct;
+    QAction *exitAct;
+    QAction *aboutAct;
+    QAction *aboutQtAct;
+};
+
+#endif
diff --git a/examples/help/simpletextviewer/simpletextviewer.pro b/examples/help/simpletextviewer/simpletextviewer.pro
new file mode 100644
index 0000000000..e9e7ea2700
--- /dev/null
+++ b/examples/help/simpletextviewer/simpletextviewer.pro
@@ -0,0 +1,16 @@
+HEADERS       = mainwindow.h \
+                findfiledialog.h \
+                assistant.h \
+                textedit.h
+SOURCES       = main.cpp \
+                mainwindow.cpp \
+                findfiledialog.cpp \
+                assistant.cpp \
+                textedit.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/help/simpletextviewer
+sources.files = $$SOURCES $$HEADERS $$RESOURCES documentation *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/help/simpletextviewer
+INSTALLS += target sources
+
diff --git a/examples/help/simpletextviewer/textedit.cpp b/examples/help/simpletextviewer/textedit.cpp
new file mode 100644
index 0000000000..5c0fd1bd6f
--- /dev/null
+++ b/examples/help/simpletextviewer/textedit.cpp
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/QFileInfo>
+#include <QtCore/QFile>
+
+#include "textedit.h"
+
+TextEdit::TextEdit(QWidget *parent)
+    : QTextEdit(parent)
+{
+    setReadOnly(true);
+}
+
+void TextEdit::setContents(const QString &fileName)
+{
+    QFileInfo fi(fileName);
+    srcUrl = QUrl::fromLocalFile(fi.absoluteFilePath());
+    QFile file(fileName);
+    if (file.open(QIODevice::ReadOnly)) {
+        QString data(file.readAll());
+        if (fileName.endsWith(".html"))
+            setHtml(data);
+        else
+            setPlainText(data);
+    }
+}
+
+QVariant TextEdit::loadResource(int type, const QUrl &name)
+{
+    if (type == QTextDocument::ImageResource) {
+        QFile file(srcUrl.resolved(name).toLocalFile());
+        if (file.open(QIODevice::ReadOnly))
+            return file.readAll();
+    }
+    return QTextEdit::loadResource(type, name);
+}
diff --git a/examples/help/simpletextviewer/textedit.h b/examples/help/simpletextviewer/textedit.h
new file mode 100644
index 0000000000..58b64068ec
--- /dev/null
+++ b/examples/help/simpletextviewer/textedit.h
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TEXTEDIT_H
+#define TEXTEDIT_H
+
+#include <QtCore/QUrl>
+#include <QtGui/QTextEdit>
+
+class TextEdit : public QTextEdit
+{
+    Q_OBJECT
+
+public:
+    TextEdit(QWidget *parent = 0);
+    void setContents(const QString &fileName);
+
+private:
+    QVariant loadResource(int type, const QUrl &name);
+    QUrl srcUrl;
+};
+
+#endif
diff --git a/examples/ipc/README b/examples/ipc/README
new file mode 100644
index 0000000000..71e2f46c18
--- /dev/null
+++ b/examples/ipc/README
@@ -0,0 +1,35 @@
+These examples demonstrate IPC support in Qt.
+
+The example launcher provided with Qt can be used to explore each of the
+examples in this directory.
+
+Documentation for these examples can be found via the Tutorial and Examples
+link in the main Qt documentation.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/ipc/ipc.pro b/examples/ipc/ipc.pro
new file mode 100644
index 0000000000..0698f89eb0
--- /dev/null
+++ b/examples/ipc/ipc.pro
@@ -0,0 +1,8 @@
+TEMPLATE      = subdirs
+SUBDIRS       = sharedmemory 
+!wince*: SUBDIRS += localfortuneserver localfortuneclient
+
+# install
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS ipc.pro README
+sources.path = $$[QT_INSTALL_EXAMPLES]/ipc
+INSTALLS += sources
diff --git a/examples/ipc/localfortuneclient/client.cpp b/examples/ipc/localfortuneclient/client.cpp
new file mode 100644
index 0000000000..2edbcc3fd3
--- /dev/null
+++ b/examples/ipc/localfortuneclient/client.cpp
@@ -0,0 +1,153 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtNetwork>
+
+#include "client.h"
+
+Client::Client(QWidget *parent)
+    : QDialog(parent)
+{
+    hostLabel = new QLabel(tr("&Server name:"));
+    hostLineEdit = new QLineEdit("fortune");
+
+    hostLabel->setBuddy(hostLineEdit);
+
+    statusLabel = new QLabel(tr("This examples requires that you run the "
+                                "Fortune Server example as well."));
+
+    getFortuneButton = new QPushButton(tr("Get Fortune"));
+    getFortuneButton->setDefault(true);
+
+    quitButton = new QPushButton(tr("Quit"));
+
+    buttonBox = new QDialogButtonBox;
+    buttonBox->addButton(getFortuneButton, QDialogButtonBox::ActionRole);
+    buttonBox->addButton(quitButton, QDialogButtonBox::RejectRole);
+
+    socket = new QLocalSocket(this);
+
+    connect(hostLineEdit, SIGNAL(textChanged(const QString &)),
+            this, SLOT(enableGetFortuneButton()));
+    connect(getFortuneButton, SIGNAL(clicked()),
+            this, SLOT(requestNewFortune()));
+    connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
+    connect(socket, SIGNAL(readyRead()), this, SLOT(readFortune()));
+    connect(socket, SIGNAL(error(QLocalSocket::LocalSocketError)),
+            this, SLOT(displayError(QLocalSocket::LocalSocketError)));
+
+    QGridLayout *mainLayout = new QGridLayout;
+    mainLayout->addWidget(hostLabel, 0, 0);
+    mainLayout->addWidget(hostLineEdit, 0, 1);
+    mainLayout->addWidget(statusLabel, 2, 0, 1, 2);
+    mainLayout->addWidget(buttonBox, 3, 0, 1, 2);
+    setLayout(mainLayout);
+
+    setWindowTitle(tr("Fortune Client"));
+    hostLineEdit->setFocus();
+}
+
+void Client::requestNewFortune()
+{
+    getFortuneButton->setEnabled(false);
+    blockSize = 0;
+    socket->abort();
+    socket->connectToServer(hostLineEdit->text());
+}
+
+void Client::readFortune()
+{
+    QDataStream in(socket);
+    in.setVersion(QDataStream::Qt_4_0);
+
+    if (blockSize == 0) {
+        if (socket->bytesAvailable() < (int)sizeof(quint16))
+            return;
+        in >> blockSize;
+    }
+
+    if (in.atEnd())
+        return;
+
+    QString nextFortune;
+    in >> nextFortune;
+
+    if (nextFortune == currentFortune) {
+        QTimer::singleShot(0, this, SLOT(requestNewFortune()));
+        return;
+    }
+
+    currentFortune = nextFortune;
+    statusLabel->setText(currentFortune);
+    getFortuneButton->setEnabled(true);
+}
+
+void Client::displayError(QLocalSocket::LocalSocketError socketError)
+{
+    switch (socketError) {
+    case QLocalSocket::ServerNotFoundError:
+        QMessageBox::information(this, tr("Fortune Client"),
+                                 tr("The host was not found. Please check the "
+                                    "host name and port settings."));
+        break;
+    case QLocalSocket::ConnectionRefusedError:
+        QMessageBox::information(this, tr("Fortune Client"),
+                                 tr("The connection was refused by the peer. "
+                                    "Make sure the fortune server is running, "
+                                    "and check that the host name and port "
+                                    "settings are correct."));
+        break;
+    case QLocalSocket::PeerClosedError:
+        break;
+    default:
+        QMessageBox::information(this, tr("Fortune Client"),
+                                 tr("The following error occurred: %1.")
+                                 .arg(socket->errorString()));
+    }
+
+    getFortuneButton->setEnabled(true);
+}
+
+void Client::enableGetFortuneButton()
+{
+    getFortuneButton->setEnabled(!hostLineEdit->text().isEmpty());
+}
diff --git a/examples/ipc/localfortuneclient/client.h b/examples/ipc/localfortuneclient/client.h
new file mode 100644
index 0000000000..4dbdeb1cba
--- /dev/null
+++ b/examples/ipc/localfortuneclient/client.h
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CLIENT_H
+#define CLIENT_H
+
+#include <QDialog>
+#include <qlocalsocket.h>
+
+QT_BEGIN_NAMESPACE
+class QDialogButtonBox;
+class QLabel;
+class QLineEdit;
+class QPushButton;
+class QLocalSocket;
+QT_END_NAMESPACE
+
+class Client : public QDialog
+{
+    Q_OBJECT
+
+public:
+    Client(QWidget *parent = 0);
+
+private slots:
+    void requestNewFortune();
+    void readFortune();
+    void displayError(QLocalSocket::LocalSocketError socketError);
+    void enableGetFortuneButton();
+
+private:
+    QLabel *hostLabel;
+    QLineEdit *hostLineEdit;
+    QLabel *statusLabel;
+    QPushButton *getFortuneButton;
+    QPushButton *quitButton;
+    QDialogButtonBox *buttonBox;
+
+    QLocalSocket *socket;
+    QString currentFortune;
+    quint16 blockSize;
+};
+
+#endif
diff --git a/examples/ipc/localfortuneclient/localfortuneclient.pro b/examples/ipc/localfortuneclient/localfortuneclient.pro
new file mode 100644
index 0000000000..906cc8a91d
--- /dev/null
+++ b/examples/ipc/localfortuneclient/localfortuneclient.pro
@@ -0,0 +1,12 @@
+HEADERS       = client.h
+SOURCES       = client.cpp \
+                main.cpp
+QT           += network
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/ipc/localfortuneclient
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS localfortuneclient.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/ipc/localfortuneclient
+INSTALLS += target sources
+
+
diff --git a/examples/ipc/localfortuneclient/main.cpp b/examples/ipc/localfortuneclient/main.cpp
new file mode 100644
index 0000000000..11dcbc638a
--- /dev/null
+++ b/examples/ipc/localfortuneclient/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "client.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Client client;
+    client.show();
+    return client.exec();
+}
diff --git a/examples/ipc/localfortuneserver/localfortuneserver.pro b/examples/ipc/localfortuneserver/localfortuneserver.pro
new file mode 100644
index 0000000000..fca9a0ad93
--- /dev/null
+++ b/examples/ipc/localfortuneserver/localfortuneserver.pro
@@ -0,0 +1,12 @@
+HEADERS       = server.h
+SOURCES       = server.cpp \
+                main.cpp
+QT           += network
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/ipc/localfortuneserver
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS localfortuneserver.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/ipc/localfortuneserver
+INSTALLS += target sources
+
+
diff --git a/examples/ipc/localfortuneserver/main.cpp b/examples/ipc/localfortuneserver/main.cpp
new file mode 100644
index 0000000000..b505c44623
--- /dev/null
+++ b/examples/ipc/localfortuneserver/main.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QtCore>
+
+#include <stdlib.h>
+
+#include "server.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Server server;
+    server.show();
+    qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
+    return server.exec();
+}
diff --git a/examples/ipc/localfortuneserver/server.cpp b/examples/ipc/localfortuneserver/server.cpp
new file mode 100644
index 0000000000..96a2663d4c
--- /dev/null
+++ b/examples/ipc/localfortuneserver/server.cpp
@@ -0,0 +1,111 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtNetwork>
+
+#include <stdlib.h>
+
+#include "server.h"
+#include <qlocalserver.h>
+#include <qlocalsocket.h>
+
+Server::Server(QWidget *parent)
+    : QDialog(parent)
+{
+    statusLabel = new QLabel;
+    quitButton = new QPushButton(tr("Quit"));
+    quitButton->setAutoDefault(false);
+
+    server = new QLocalServer(this);
+    if (!server->listen("fortune")) {
+        QMessageBox::critical(this, tr("Fortune Server"),
+                              tr("Unable to start the server: %1.")
+                              .arg(server->errorString()));
+        close();
+        return;
+    }
+
+    statusLabel->setText(tr("The server is running.\n"
+                            "Run the Fortune Client example now."));
+
+    fortunes << tr("You've been leading a dog's life. Stay off the furniture.")
+             << tr("You've got to think about tomorrow.")
+             << tr("You will be surprised by a loud noise.")
+             << tr("You will feel hungry again in another hour.")
+             << tr("You might have mail.")
+             << tr("You cannot kill time without injuring eternity.")
+             << tr("Computers are not intelligent. They only think they are.");
+
+    connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
+    connect(server, SIGNAL(newConnection()), this, SLOT(sendFortune()));
+
+    QHBoxLayout *buttonLayout = new QHBoxLayout;
+    buttonLayout->addStretch(1);
+    buttonLayout->addWidget(quitButton);
+    buttonLayout->addStretch(1);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(statusLabel);
+    mainLayout->addLayout(buttonLayout);
+    setLayout(mainLayout);
+
+    setWindowTitle(tr("Fortune Server"));
+}
+
+void Server::sendFortune()
+{
+    QByteArray block;
+    QDataStream out(&block, QIODevice::WriteOnly);
+    out.setVersion(QDataStream::Qt_4_0);
+    out << (quint16)0;
+    out << fortunes.at(qrand() % fortunes.size());
+    out.device()->seek(0);
+    out << (quint16)(block.size() - sizeof(quint16));
+
+    QLocalSocket *clientConnection = server->nextPendingConnection();
+    connect(clientConnection, SIGNAL(disconnected()),
+            clientConnection, SLOT(deleteLater()));
+
+    clientConnection->write(block);
+    clientConnection->flush();
+    clientConnection->disconnectFromServer();
+}
diff --git a/examples/ipc/localfortuneserver/server.h b/examples/ipc/localfortuneserver/server.h
new file mode 100644
index 0000000000..7198fd9721
--- /dev/null
+++ b/examples/ipc/localfortuneserver/server.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SERVER_H
+#define SERVER_H
+
+#include <QDialog>
+
+QT_BEGIN_NAMESPACE
+class QLabel;
+class QPushButton;
+class QLocalServer;
+QT_END_NAMESPACE
+
+class Server : public QDialog
+{
+    Q_OBJECT
+
+public:
+    Server(QWidget *parent = 0);
+
+private slots:
+    void sendFortune();
+
+private:
+    QLabel *statusLabel;
+    QPushButton *quitButton;
+    QLocalServer *server;
+    QStringList fortunes;
+};
+
+#endif
diff --git a/examples/ipc/sharedmemory/dialog.cpp b/examples/ipc/sharedmemory/dialog.cpp
new file mode 100644
index 0000000000..245a4a1a7f
--- /dev/null
+++ b/examples/ipc/sharedmemory/dialog.cpp
@@ -0,0 +1,189 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "dialog.h"
+#include <QFileDialog>
+#include <QBuffer>
+#include <QtCore/QDebug>
+
+/*!
+  \class Dialog
+
+  \brief This class is a simple example of how to use QSharedMemory.
+
+  It is a simple dialog that presents a few buttons. To compile the
+  example, run make in qt/examples/ipc. Then run the executable twice
+  to create two processes running the dialog. In one of the processes,
+  press the button to load an image into a shared memory segment, and
+  then select an image file to load. Once the first process has loaded
+  and displayed the image, in the second process, press the button to
+  read the same image from shared memory. The second process displays
+  the same image loaded from its new loaction in shared memory.
+*/
+
+/*!
+  The class contains a data member \l {QSharedMemory} {sharedMemory},
+  which is initialized with the key "QSharedMemoryExample" to force
+  all instances of Dialog to access the same shared memory segment.
+  The constructor also connects the clicked() signal from each of the
+  three dialog buttons to the slot function appropriate for handling
+  each button.
+*/
+//! [0]
+Dialog::Dialog(QWidget *parent)
+  : QDialog(parent), sharedMemory("QSharedMemoryExample")
+{
+    ui.setupUi(this);
+    connect(ui.loadFromFileButton, SIGNAL(clicked()), SLOT(loadFromFile()));
+    connect(ui.loadFromSharedMemoryButton,
+	    SIGNAL(clicked()),
+	    SLOT(loadFromMemory()));
+    setWindowTitle(tr("SharedMemory Example"));
+}
+//! [0]
+
+/*!
+  This slot function is called when the \tt {Load Image From File...}
+  button is pressed on the firs Dialog process. First, it tests
+  whether the process is already connected to a shared memory segment
+  and, if so, detaches from that segment. This ensures that we always
+  start the example from the beginning if we run it multiple times
+  with the same two Dialog processes. After detaching from an existing
+  shared memory segment, the user is prompted to select an image file.
+  The selected file is loaded into a QImage. The QImage is displayed
+  in the Dialog and streamed into a QBuffer with a QDataStream.
+
+  Next, it gets a new shared memory segment from the system big enough
+  to hold the image data in the QBuffer, and it locks the segment to
+  prevent the second Dialog process from accessing it. Then it copies
+  the image from the QBuffer into the shared memory segment. Finally,
+  it unlocks the shared memory segment so the second Dialog process
+  can access it.
+
+  After this function runs, the user is expected to press the \tt
+  {Load Image from Shared Memory} button on the second Dialog process.
+
+  \sa loadFromMemory()
+ */
+//! [1]
+void Dialog::loadFromFile()
+{
+    if (sharedMemory.isAttached())
+        detach();
+
+    ui.label->setText(tr("Select an image file"));
+    QString fileName = QFileDialog::getOpenFileName(0, QString(), QString(),
+                                        tr("Images (*.png *.xpm *.jpg)"));
+    QImage image;
+    if (!image.load(fileName)) {
+        ui.label->setText(tr("Selected file is not an image, please select another."));
+        return;
+    }
+    ui.label->setPixmap(QPixmap::fromImage(image));
+//! [1] //! [2]
+
+    // load into shared memory
+    QBuffer buffer;
+    buffer.open(QBuffer::ReadWrite);
+    QDataStream out(&buffer);
+    out << image;
+    int size = buffer.size();
+
+    if (!sharedMemory.create(size)) {
+        ui.label->setText(tr("Unable to create shared memory segment."));
+        return;
+    }
+    sharedMemory.lock();
+    char *to = (char*)sharedMemory.data();
+    const char *from = buffer.data().data();
+    memcpy(to, from, qMin(sharedMemory.size(), size));
+    sharedMemory.unlock();
+}
+//! [2]
+
+/*!
+  This slot function is called in the second Dialog process, when the
+  user presses the \tt {Load Image from Shared Memory} button. First,
+  it attaches the process to the shared memory segment created by the
+  first Dialog process. Then it locks the segment for exclusive
+  access, copies the image data from the segment into a QBuffer, and
+  streams the QBuffer into a QImage. Then it unlocks the shared memory
+  segment, detaches from it, and finally displays the QImage in the
+  Dialog.
+
+  \sa loadFromFile()
+ */
+//! [3]
+void Dialog::loadFromMemory()
+{
+    if (!sharedMemory.attach()) {
+        ui.label->setText(tr("Unable to attach to shared memory segment.\n" \
+			     "Load an image first."));
+        return;
+    }
+
+    QBuffer buffer;
+    QDataStream in(&buffer);
+    QImage image;
+
+    sharedMemory.lock();
+    buffer.setData((char*)sharedMemory.constData(), sharedMemory.size());
+    buffer.open(QBuffer::ReadOnly);
+    in >> image;
+    sharedMemory.unlock();
+
+    sharedMemory.detach();
+    ui.label->setPixmap(QPixmap::fromImage(image));
+}
+//! [3]
+
+/*!
+  This private function is called by the destructor to detach the
+  process from its shared memory segment. When the last process
+  detaches from a shared memory segment, the system releases the
+  shared memory.
+ */
+void Dialog::detach()
+{
+    if (!sharedMemory.detach()) 
+        ui.label->setText(tr("Unable to detach from shared memory."));
+}
+
diff --git a/examples/ipc/sharedmemory/dialog.h b/examples/ipc/sharedmemory/dialog.h
new file mode 100644
index 0000000000..a0c84b6501
--- /dev/null
+++ b/examples/ipc/sharedmemory/dialog.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DIALOG_H
+#define DIALOG_H
+
+#include <qdialog.h>
+#include <qsharedmemory.h>
+#include "ui_dialog.h"
+
+//! [0]
+class Dialog : public QDialog
+{
+    Q_OBJECT
+
+  public:
+    Dialog(QWidget *parent = 0);
+
+  public slots:
+    void loadFromFile();
+    void loadFromMemory();
+
+ private:
+    void detach();
+
+  private:
+    Ui::Dialog ui;
+    QSharedMemory sharedMemory;
+};
+//! [0]
+
+#endif
+
diff --git a/examples/ipc/sharedmemory/dialog.ui b/examples/ipc/sharedmemory/dialog.ui
new file mode 100644
index 0000000000..e99d6fb3c4
--- /dev/null
+++ b/examples/ipc/sharedmemory/dialog.ui
@@ -0,0 +1,47 @@
+<ui version="4.0" >
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>451</width>
+    <height>322</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Dialog</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <widget class="QPushButton" name="loadFromFileButton" >
+     <property name="text" >
+      <string>Load Image From File...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Launch two of these dialogs.  In the first, press the top button and load an image from a file.  In the second, press the bottom button and display the loaded image from shared memory.</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignCenter</set>
+     </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QPushButton" name="loadFromSharedMemoryButton" >
+     <property name="text" >
+      <string>Display Image From Shared Memory</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/examples/ipc/sharedmemory/image.png b/examples/ipc/sharedmemory/image.png
new file mode 100644
index 0000000000..dd93453063
--- /dev/null
+++ b/examples/ipc/sharedmemory/image.png
diff --git a/examples/ipc/sharedmemory/main.cpp b/examples/ipc/sharedmemory/main.cpp
new file mode 100644
index 0000000000..533efeb668
--- /dev/null
+++ b/examples/ipc/sharedmemory/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include "dialog.h"
+
+//! [0]
+int main(int argc, char *argv[])
+{
+    QApplication application(argc, argv);
+    Dialog dialog;
+    dialog.show();
+    return application.exec();
+}
+//! [0]
+
diff --git a/examples/ipc/sharedmemory/qt.png b/examples/ipc/sharedmemory/qt.png
new file mode 100644
index 0000000000..60ef558efe
--- /dev/null
+++ b/examples/ipc/sharedmemory/qt.png
diff --git a/examples/ipc/sharedmemory/sharedmemory.pro b/examples/ipc/sharedmemory/sharedmemory.pro
new file mode 100644
index 0000000000..48330905e4
--- /dev/null
+++ b/examples/ipc/sharedmemory/sharedmemory.pro
@@ -0,0 +1,13 @@
+SOURCES += main.cpp \
+           dialog.cpp 
+
+HEADERS += dialog.h
+
+# Forms and resources
+FORMS += dialog.ui
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/ipc/sharedmemory
+sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
+sources.path = $$[QT_INSTALL_EXAMPLES]/ipc/sharedmemory
+INSTALLS += target sources
diff --git a/examples/itemviews/README b/examples/itemviews/README
new file mode 100644
index 0000000000..0ac70f4904
--- /dev/null
+++ b/examples/itemviews/README
@@ -0,0 +1,39 @@
+Item views are widgets that typically display data sets. Qt 4's model/view
+framework lets you handle large data sets by separating the underlying data
+from the way it is represented to the user, and provides support for
+customized rendering through the use of delegates.
+
+
+The example launcher provided with Qt can be used to explore each of the
+examples in this directory.
+
+Documentation for these examples can be found via the Tutorial and Examples
+link in the main Qt documentation.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/itemviews/addressbook/adddialog.cpp b/examples/itemviews/addressbook/adddialog.cpp
new file mode 100644
index 0000000000..3eaba49df5
--- /dev/null
+++ b/examples/itemviews/addressbook/adddialog.cpp
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "adddialog.h"
+
+//! [0]
+AddDialog::AddDialog(QWidget *parent)
+    : QDialog(parent)
+{
+    nameLabel = new QLabel("Name");
+    addressLabel = new QLabel("Address");
+    okButton = new QPushButton("OK");
+    cancelButton = new QPushButton("Cancel");
+    
+    nameText = new QLineEdit;
+    addressText = new QTextEdit;
+    
+    QGridLayout *gLayout = new QGridLayout;
+    gLayout->setColumnStretch(1, 2);
+    gLayout->addWidget(nameLabel, 0, 0);
+    gLayout->addWidget(nameText, 0, 1);
+    
+    gLayout->addWidget(addressLabel, 1, 0, Qt::AlignLeft|Qt::AlignTop);
+    gLayout->addWidget(addressText, 1, 1, Qt::AlignLeft);
+    
+    QHBoxLayout *buttonLayout = new QHBoxLayout;
+    buttonLayout->addWidget(okButton);
+    buttonLayout->addWidget(cancelButton);
+    
+    gLayout->addLayout(buttonLayout, 2, 1, Qt::AlignRight);
+    
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addLayout(gLayout);
+    setLayout(mainLayout);
+    
+    connect(okButton, SIGNAL(clicked()),
+            this, SLOT(accept()));
+            
+    connect(cancelButton, SIGNAL(clicked()),
+            this, SLOT(reject()));
+            
+    setWindowTitle(tr("Add a Contact"));
+}
+//! [0]
diff --git a/examples/itemviews/addressbook/adddialog.h b/examples/itemviews/addressbook/adddialog.h
new file mode 100644
index 0000000000..a68f566f26
--- /dev/null
+++ b/examples/itemviews/addressbook/adddialog.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ADDDIALOG_H
+#define ADDDIALOG_H
+
+#include <QDialog>
+
+QT_BEGIN_NAMESPACE
+class QLabel;
+class QPushButton;
+class QTextEdit;
+class QLineEdit;
+QT_END_NAMESPACE
+
+//! [0]
+class AddDialog : public QDialog
+{
+    Q_OBJECT
+    
+public:
+    AddDialog(QWidget *parent=0);
+    QLineEdit *nameText;
+    QTextEdit *addressText;
+
+private:
+    QLabel *nameLabel;
+    QLabel *addressLabel;
+    QPushButton *okButton;
+    QPushButton *cancelButton;
+};
+//! [0]
+
+#endif
diff --git a/examples/itemviews/addressbook/addressbook.pro b/examples/itemviews/addressbook/addressbook.pro
new file mode 100644
index 0000000000..6f6a72d9f7
--- /dev/null
+++ b/examples/itemviews/addressbook/addressbook.pro
@@ -0,0 +1,17 @@
+SOURCES   = adddialog.cpp \
+            addresswidget.cpp \
+            main.cpp \
+            mainwindow.cpp \
+            newaddresstab.cpp \
+            tablemodel.cpp
+HEADERS   = adddialog.h \
+            addresswidget.h \
+            mainwindow.h \
+            newaddresstab.h \
+            tablemodel.h
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/addressbook
+sources.files = $$SOURCES $$HEADERS $$RESOURCES addressbook.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/addressbook
+INSTALLS += target sources
diff --git a/examples/itemviews/addressbook/addresswidget.cpp b/examples/itemviews/addressbook/addresswidget.cpp
new file mode 100644
index 0000000000..e8d0527ece
--- /dev/null
+++ b/examples/itemviews/addressbook/addresswidget.cpp
@@ -0,0 +1,238 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "addresswidget.h"
+#include "adddialog.h"
+
+//! [0]
+AddressWidget::AddressWidget(QWidget *parent)
+    : QTabWidget(parent)
+{
+    table = new TableModel(this);
+    newAddressTab = new NewAddressTab(this);
+    connect(newAddressTab, SIGNAL(sendDetails(QString, QString)),
+        this, SLOT(addEntry(QString, QString))); 
+
+    addTab(newAddressTab, "Address Book");    
+
+    setupTabs();
+}
+//! [0]
+
+//! [2]
+void AddressWidget::addEntry()
+{    
+    AddDialog aDialog;
+
+    if (aDialog.exec()) {
+        QString name = aDialog.nameText->text();
+        QString address = aDialog.addressText->toPlainText();
+        
+        addEntry(name, address);
+    }
+}
+//! [2]
+
+//! [3]
+void AddressWidget::addEntry(QString name, QString address)
+{    
+    QList< QPair<QString, QString> >list = table->getList();
+    QPair<QString, QString> pair(name, address);
+
+    if (!list.contains(pair)) {
+        table->insertRows(0, 1, QModelIndex());
+
+        QModelIndex index = table->index(0, 0, QModelIndex());
+        table->setData(index, name, Qt::EditRole);
+        index = table->index(0, 1, QModelIndex());
+        table->setData(index, address, Qt::EditRole);
+        removeTab(indexOf(newAddressTab));
+    } else {
+        QMessageBox::information(this, tr("Duplicate Name"),
+            tr("The name \"%1\" already exists.").arg(name));
+    }
+}
+//! [3]
+
+//! [4a]
+void AddressWidget::editEntry()
+{
+    QTableView *temp = static_cast<QTableView*>(currentWidget());
+    QSortFilterProxyModel *proxy = static_cast<QSortFilterProxyModel*>(temp->model());
+    QItemSelectionModel *selectionModel = temp->selectionModel();
+
+    QModelIndexList indexes = selectionModel->selectedRows();
+    QModelIndex index, i;        
+    QString name;
+    QString address;
+    int row;
+
+    foreach (index, indexes) {
+        row = proxy->mapToSource(index).row();
+        i = table->index(row, 0, QModelIndex());
+        QVariant varName = table->data(i, Qt::DisplayRole);
+        name = varName.toString();
+    
+        i = table->index(row, 1, QModelIndex());
+        QVariant varAddr = table->data(i, Qt::DisplayRole);
+        address = varAddr.toString();
+    }
+//! [4a]
+    
+//! [4b]    
+    AddDialog aDialog;
+    aDialog.setWindowTitle(tr("Edit a Contact"));
+
+    aDialog.nameText->setReadOnly(true);
+    aDialog.nameText->setText(name);
+    aDialog.addressText->setText(address);
+
+    if (aDialog.exec()) {
+        QString newAddress = aDialog.addressText->toPlainText();
+        if (newAddress != address) {
+            i = table->index(row, 1, QModelIndex());
+            table->setData(i, newAddress, Qt::EditRole);
+        }
+    }
+}
+//! [4b]
+
+//! [5]
+void AddressWidget::removeEntry()
+{
+    QTableView *temp = static_cast<QTableView*>(currentWidget());
+    QSortFilterProxyModel *proxy = static_cast<QSortFilterProxyModel*>(temp->model());
+    QItemSelectionModel *selectionModel = temp->selectionModel();
+    
+    QModelIndexList indexes = selectionModel->selectedRows();
+    QModelIndex index;
+
+    foreach (index, indexes) {
+        int row = proxy->mapToSource(index).row();
+        table->removeRows(row, 1, QModelIndex());
+    }
+
+    if (table->rowCount(QModelIndex()) == 0) {
+        insertTab(0, newAddressTab, "Address Book");
+    }
+}
+//! [5]
+
+//! [1]
+void AddressWidget::setupTabs()
+{
+    QStringList groups;
+    groups << "ABC" << "DEF" << "GHI" << "JKL" << "MNO" << "PQR" << "STU" << "VW" << "XYZ";
+
+    for (int i = 0; i < groups.size(); ++i) {
+        QString str = groups.at(i);
+        
+        proxyModel = new QSortFilterProxyModel(this);
+        proxyModel->setSourceModel(table);
+        proxyModel->setDynamicSortFilter(true);
+    
+        QTableView *tableView = new QTableView;
+        tableView->setModel(proxyModel);
+        tableView->setSortingEnabled(true);
+        tableView->setSelectionBehavior(QAbstractItemView::SelectRows);
+        tableView->horizontalHeader()->setStretchLastSection(true);
+        tableView->verticalHeader()->hide();
+        tableView->setEditTriggers(QAbstractItemView::NoEditTriggers);
+        tableView->setSelectionMode(QAbstractItemView::SingleSelection);
+
+        QString newStr = QString("^[%1].*").arg(str);
+
+        proxyModel->setFilterRegExp(QRegExp(newStr, Qt::CaseInsensitive));
+        proxyModel->setFilterKeyColumn(0);
+        proxyModel->sort(0, Qt::AscendingOrder);
+    
+        connect(tableView->selectionModel(),
+            SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)),
+            this, SIGNAL(selectionChanged(const QItemSelection &)));
+
+        addTab(tableView, str);
+    }
+}
+//! [1]
+
+//! [7]
+void AddressWidget::readFromFile(QString fileName)
+{
+    QFile file(fileName);
+
+    if (!file.open(QIODevice::ReadOnly)) {
+        QMessageBox::information(this, tr("Unable to open file"),
+            file.errorString());
+        return;
+    }
+
+    QList< QPair<QString, QString> > pairs = table->getList();    
+    QDataStream in(&file);
+    in >> pairs;
+
+    if (pairs.isEmpty()) {
+        QMessageBox::information(this, tr("No contacts in file"),
+            tr("The file you are attempting to open contains no contacts."));  
+    } else {
+        for (int i=0; i<pairs.size(); ++i) {
+            QPair<QString, QString> p = pairs.at(i);
+            addEntry(p.first, p.second);
+        }
+    }
+}
+//! [7]
+
+//! [6]
+void AddressWidget::writeToFile(QString fileName)
+{
+    QFile file(fileName);
+
+    if (!file.open(QIODevice::WriteOnly)) {
+        QMessageBox::information(this, tr("Unable to open file"), file.errorString());
+        return;
+    }
+
+    QList< QPair<QString, QString> > pairs = table->getList();    
+    QDataStream out(&file);
+    out << pairs;
+}
+//! [6]
diff --git a/examples/itemviews/addressbook/addresswidget.h b/examples/itemviews/addressbook/addresswidget.h
new file mode 100644
index 0000000000..826e8b83e9
--- /dev/null
+++ b/examples/itemviews/addressbook/addresswidget.h
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ADDRESSWIDGET_H
+#define ADDRESSWIDGET_H
+
+#include <QTabWidget>
+#include <QItemSelection>
+#include "tablemodel.h"
+#include "newaddresstab.h"
+
+QT_BEGIN_NAMESPACE
+class QSortFilterProxyModel;
+class QItemSelectionModel;
+QT_END_NAMESPACE
+
+//! [0]
+class AddressWidget : public QTabWidget
+{
+    Q_OBJECT
+
+public:
+    AddressWidget(QWidget *parent=0);
+    void readFromFile(QString fileName);
+    void writeToFile(QString fileName);
+
+public slots:
+    void addEntry();
+    void addEntry(QString name, QString address);
+    void editEntry();
+    void removeEntry();
+
+signals:
+    void selectionChanged (const QItemSelection &selected);
+
+private:
+    void setupTabs();
+
+    TableModel *table;
+    NewAddressTab *newAddressTab;
+    QSortFilterProxyModel *proxyModel;
+};
+//! [0]
+
+#endif
diff --git a/examples/itemviews/addressbook/main.cpp b/examples/itemviews/addressbook/main.cpp
new file mode 100644
index 0000000000..da15c26a2d
--- /dev/null
+++ b/examples/itemviews/addressbook/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "mainwindow.h"
+
+//! [0]
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow mw;
+    mw.show();
+    return app.exec();
+}
+//! [0]
diff --git a/examples/itemviews/addressbook/mainwindow.cpp b/examples/itemviews/addressbook/mainwindow.cpp
new file mode 100644
index 0000000000..892352235e
--- /dev/null
+++ b/examples/itemviews/addressbook/mainwindow.cpp
@@ -0,0 +1,138 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "mainwindow.h"
+
+//! [0]
+MainWindow::MainWindow()
+{
+    addressWidget = new AddressWidget;
+    setCentralWidget(addressWidget);
+    createMenus();
+    setWindowTitle(tr("Address Book"));
+}
+//! [0]
+
+//! [1a]
+void MainWindow::createMenus()
+{
+    fileMenu = menuBar()->addMenu(tr("&File"));
+    
+    openAct = new QAction(tr("&Open..."), this);
+    fileMenu->addAction(openAct);
+    connect(openAct, SIGNAL(triggered()),
+        this, SLOT(openFile()));
+//! [1a]
+
+    saveAct = new QAction(tr("&Save As..."), this);
+    fileMenu->addAction(saveAct);
+    connect(saveAct, SIGNAL(triggered()),
+        this, SLOT(saveFile()));
+
+    fileMenu->addSeparator();
+
+    exitAct = new QAction(tr("E&xit"), this);
+    fileMenu->addAction(exitAct);
+    connect(exitAct, SIGNAL(triggered()),
+        this, SLOT(close()));
+
+    toolMenu = menuBar()->addMenu(tr("&Tools"));
+
+    addAct = new QAction(tr("&Add Entry..."), this);
+    toolMenu->addAction(addAct);
+    connect(addAct, SIGNAL(triggered()),
+        addressWidget, SLOT(addEntry()));
+    
+//! [1b]
+    editAct = new QAction(tr("&Edit Entry..."), this);
+    editAct->setEnabled(false);
+    toolMenu->addAction(editAct);
+    connect(editAct, SIGNAL(triggered()),
+        addressWidget, SLOT(editEntry()));
+
+    toolMenu->addSeparator();
+
+    removeAct = new QAction(tr("&Remove Entry"), this);
+    removeAct->setEnabled(false);
+    toolMenu->addAction(removeAct);
+    connect(removeAct, SIGNAL(triggered()),
+        addressWidget, SLOT(removeEntry()));
+
+    connect(addressWidget, SIGNAL(selectionChanged(const QItemSelection &)),
+        this, SLOT(updateActions(const QItemSelection &)));
+}
+//! [1b]
+
+//! [2]
+void MainWindow::openFile()
+{
+    QString fileName = QFileDialog::getOpenFileName(this);
+    if (!fileName.isEmpty()) {
+        addressWidget->readFromFile(fileName);
+    }
+}
+//! [2]
+
+//! [3]
+void MainWindow::saveFile()
+{
+    QString fileName = QFileDialog::getSaveFileName(this);
+    if (!fileName.isEmpty()) {
+        addressWidget->writeToFile(fileName);
+    }
+}
+//! [3]
+
+//! [4]
+void MainWindow::updateActions(const QItemSelection &selection)
+{
+    QModelIndexList indexes = selection.indexes();
+    
+    if (!indexes.isEmpty()) {
+        removeAct->setEnabled(true);
+        editAct->setEnabled(true);
+    } else {
+        removeAct->setEnabled(false);
+        editAct->setEnabled(false);
+    }
+}
+//! [4]
diff --git a/examples/itemviews/addressbook/mainwindow.h b/examples/itemviews/addressbook/mainwindow.h
new file mode 100644
index 0000000000..8c25e70109
--- /dev/null
+++ b/examples/itemviews/addressbook/mainwindow.h
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QtGui>
+#include "addresswidget.h"
+
+//! [0]
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+private slots:
+    void updateActions(const QItemSelection &selection);
+    void openFile();
+    void saveFile();
+
+private:
+    void createMenus();
+
+    AddressWidget *addressWidget;
+    QMenu *fileMenu;
+    QMenu *toolMenu;
+    QAction *openAct;
+    QAction *saveAct;
+    QAction *exitAct;
+    QAction *addAct;
+    QAction *editAct;
+    QAction *removeAct;
+};
+//! [0]
+
+#endif
diff --git a/examples/itemviews/addressbook/newaddresstab.cpp b/examples/itemviews/addressbook/newaddresstab.cpp
new file mode 100644
index 0000000000..bd0a314949
--- /dev/null
+++ b/examples/itemviews/addressbook/newaddresstab.cpp
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "newaddresstab.h"
+#include "adddialog.h"
+
+//! [0]
+NewAddressTab::NewAddressTab(QWidget *parent)
+{
+    Q_UNUSED(parent);
+
+    descriptionLabel = new QLabel(tr("There are currently no contacts in your address book. "
+                                      "\nClick Add to add new contacts."));
+    
+    addButton = new QPushButton(tr("Add"));
+    
+    connect(addButton, SIGNAL(clicked()), this, SLOT(addEntry()));
+    
+    mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(descriptionLabel);
+    mainLayout->addWidget(addButton, 0, Qt::AlignCenter);
+    
+    setLayout(mainLayout);
+}
+//! [0]
+
+//! [1]
+void NewAddressTab::addEntry()
+{
+    AddDialog aDialog;
+    
+    if (aDialog.exec()) {
+        QString name = aDialog.nameText->text();
+        QString address = aDialog.addressText->toPlainText();
+        
+        emit sendDetails(name, address);
+    }
+}
+//! [1]
diff --git a/examples/itemviews/addressbook/newaddresstab.h b/examples/itemviews/addressbook/newaddresstab.h
new file mode 100644
index 0000000000..5ef6c37f0a
--- /dev/null
+++ b/examples/itemviews/addressbook/newaddresstab.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef NEWADDRESSTAB_H
+#define NEWADDRESSTAB_H
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QLabel;
+class QPushButton;
+class QVBoxLayout;
+QT_END_NAMESPACE
+
+//! [0]
+class NewAddressTab : public QWidget
+{
+    Q_OBJECT
+    
+public:
+    NewAddressTab(QWidget *parent=0);
+
+public slots:
+    void addEntry();
+
+signals:
+    void sendDetails(QString name, QString address);
+
+private:
+    QLabel *descriptionLabel;
+    QPushButton *addButton;
+    QVBoxLayout *mainLayout;
+    
+};
+//! [0]
+
+#endif
diff --git a/examples/itemviews/addressbook/tablemodel.cpp b/examples/itemviews/addressbook/tablemodel.cpp
new file mode 100644
index 0000000000..56734518cf
--- /dev/null
+++ b/examples/itemviews/addressbook/tablemodel.cpp
@@ -0,0 +1,185 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "tablemodel.h"
+
+//! [0]
+TableModel::TableModel(QObject *parent)
+    : QAbstractTableModel(parent)
+{
+}
+
+TableModel::TableModel(QList< QPair<QString, QString> > pairs, QObject *parent)
+    : QAbstractTableModel(parent)
+{
+    listOfPairs=pairs;
+}
+//! [0]
+
+//! [1]
+int TableModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+    return listOfPairs.size();
+}
+
+int TableModel::columnCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+    return 2;
+}
+//! [1]
+
+//! [2]
+QVariant TableModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+    
+    if (index.row() >= listOfPairs.size() || index.row() < 0)
+        return QVariant();
+    
+    if (role == Qt::DisplayRole) {
+        QPair<QString, QString> pair = listOfPairs.at(index.row());
+        
+        if (index.column() == 0)
+            return pair.first;
+        else if (index.column() == 1)
+            return pair.second;
+    }
+    return QVariant();
+}
+//! [2]
+
+//! [3]
+QVariant TableModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    if (role != Qt::DisplayRole)
+        return QVariant();
+    
+    if (orientation == Qt::Horizontal) {
+        switch (section) {
+            case 0:
+                return tr("Name");
+                
+            case 1:
+                return tr("Address");
+                
+            default:
+                return QVariant();
+        }
+    }
+    return QVariant();
+}
+//! [3]
+
+//! [4]
+bool TableModel::insertRows(int position, int rows, const QModelIndex &index)
+{
+    Q_UNUSED(index);
+    beginInsertRows(QModelIndex(), position, position+rows-1);
+    
+    for (int row=0; row < rows; row++) {
+        QPair<QString, QString> pair(" ", " ");
+        listOfPairs.insert(position, pair);
+    }
+
+    endInsertRows();
+    return true;
+}
+//! [4]
+
+//! [5]
+bool TableModel::removeRows(int position, int rows, const QModelIndex &index)
+{
+    Q_UNUSED(index);    
+    beginRemoveRows(QModelIndex(), position, position+rows-1);
+    
+    for (int row=0; row < rows; ++row) {
+        listOfPairs.removeAt(position);
+    }
+
+    endRemoveRows();
+    return true;
+}
+//! [5]
+
+//! [6]
+bool TableModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+	if (index.isValid() && role == Qt::EditRole) {
+		int row = index.row();
+				
+		QPair<QString, QString> p = listOfPairs.value(row);
+		
+		if (index.column() == 0)
+			p.first = value.toString();
+		else if (index.column() == 1)
+			p.second = value.toString();
+        else
+            return false;
+            
+        listOfPairs.replace(row, p);
+		emit(dataChanged(index, index));
+		
+        return true;
+	}
+
+	return false;
+}
+//! [6]
+
+//! [7]
+Qt::ItemFlags TableModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return Qt::ItemIsEnabled;
+    
+    return QAbstractTableModel::flags(index) | Qt::ItemIsEditable;
+}
+//! [7]
+
+//! [8]
+QList< QPair<QString, QString> > TableModel::getList()
+{
+    return listOfPairs;
+}
+//! [8]
diff --git a/examples/itemviews/addressbook/tablemodel.h b/examples/itemviews/addressbook/tablemodel.h
new file mode 100644
index 0000000000..9433bec3a2
--- /dev/null
+++ b/examples/itemviews/addressbook/tablemodel.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TABLEMODEL_H
+#define TABLEMODEL_H
+
+#include <QAbstractTableModel>
+#include <QPair>
+#include <QList>
+
+//! [0]
+class TableModel : public QAbstractTableModel
+{
+    Q_OBJECT
+    
+public:
+    TableModel(QObject *parent=0);
+    TableModel(QList< QPair<QString, QString> > listofPairs, QObject *parent=0);
+
+    int rowCount(const QModelIndex &parent) const;
+    int columnCount(const QModelIndex &parent) const;
+    QVariant data(const QModelIndex &index, int role) const;
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const;
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+    bool setData(const QModelIndex &index, const QVariant &value, int role=Qt::EditRole);
+    bool insertRows(int position, int rows, const QModelIndex &index=QModelIndex());
+    bool removeRows(int position, int rows, const QModelIndex &index=QModelIndex());
+    QList< QPair<QString, QString> > getList();
+
+private:
+    QList< QPair<QString, QString> > listOfPairs;
+};
+//! [0]
+
+#endif
diff --git a/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro b/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro
new file mode 100644
index 0000000000..7870b39679
--- /dev/null
+++ b/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro
@@ -0,0 +1,10 @@
+HEADERS     = window.h
+SOURCES     = main.cpp \
+              window.cpp
+CONFIG     += qt
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/basicsortfiltermodel
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/basicsortfiltermodel
+INSTALLS += target sources
diff --git a/examples/itemviews/basicsortfiltermodel/main.cpp b/examples/itemviews/basicsortfiltermodel/main.cpp
new file mode 100644
index 0000000000..da499eda94
--- /dev/null
+++ b/examples/itemviews/basicsortfiltermodel/main.cpp
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+
+void addMail(QAbstractItemModel *model, const QString &subject,
+             const QString &sender, const QDateTime &date)
+{
+    model->insertRow(0);
+    model->setData(model->index(0, 0), subject);
+    model->setData(model->index(0, 1), sender);
+    model->setData(model->index(0, 2), date);
+}
+
+QAbstractItemModel *createMailModel(QObject *parent)
+{
+    QStandardItemModel *model = new QStandardItemModel(0, 3, parent);
+
+    model->setHeaderData(0, Qt::Horizontal, QObject::tr("Subject"));
+    model->setHeaderData(1, Qt::Horizontal, QObject::tr("Sender"));
+    model->setHeaderData(2, Qt::Horizontal, QObject::tr("Date"));
+
+    addMail(model, "Happy New Year!", "Grace K. <grace@software-inc.com>",
+            QDateTime(QDate(2006, 12, 31), QTime(17, 03)));
+    addMail(model, "Radically new concept", "Grace K. <grace@software-inc.com>",
+            QDateTime(QDate(2006, 12, 22), QTime(9, 44)));
+    addMail(model, "Accounts", "pascale@nospam.com",
+            QDateTime(QDate(2006, 12, 31), QTime(12, 50)));
+    addMail(model, "Expenses", "Joe Bloggs <joe@bloggs.com>",
+            QDateTime(QDate(2006, 12, 25), QTime(11, 39)));
+    addMail(model, "Re: Expenses", "Andy <andy@nospam.com>",
+            QDateTime(QDate(2007, 01, 02), QTime(16, 05)));
+    addMail(model, "Re: Accounts", "Joe Bloggs <joe@bloggs.com>",
+            QDateTime(QDate(2007, 01, 03), QTime(14, 18)));
+    addMail(model, "Re: Accounts", "Andy <andy@nospam.com>",
+            QDateTime(QDate(2007, 01, 03), QTime(14, 26)));
+    addMail(model, "Sports", "Linda Smith <linda.smith@nospam.com>",
+            QDateTime(QDate(2007, 01, 05), QTime(11, 33)));
+    addMail(model, "AW: Sports", "Rolf Newschweinstein <rolfn@nospam.com>",
+            QDateTime(QDate(2007, 01, 05), QTime(12, 00)));
+    addMail(model, "RE: Sports", "Petra Schmidt <petras@nospam.com>",
+            QDateTime(QDate(2007, 01, 05), QTime(12, 01)));
+
+    return model;
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Window window;
+    window.setSourceModel(createMailModel(&window));
+    window.show();
+    return app.exec();
+}
diff --git a/examples/itemviews/basicsortfiltermodel/window.cpp b/examples/itemviews/basicsortfiltermodel/window.cpp
new file mode 100644
index 0000000000..e60553e687
--- /dev/null
+++ b/examples/itemviews/basicsortfiltermodel/window.cpp
@@ -0,0 +1,157 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+
+Window::Window()
+{
+    proxyModel = new QSortFilterProxyModel;
+    proxyModel->setDynamicSortFilter(true);
+
+    sourceGroupBox = new QGroupBox(tr("Original Model"));
+    proxyGroupBox = new QGroupBox(tr("Sorted/Filtered Model"));
+
+    sourceView = new QTreeView;
+    sourceView->setRootIsDecorated(false);
+    sourceView->setAlternatingRowColors(true);
+
+    proxyView = new QTreeView;
+    proxyView->setRootIsDecorated(false);
+    proxyView->setAlternatingRowColors(true);
+    proxyView->setModel(proxyModel);
+    proxyView->setSortingEnabled(true);
+
+    sortCaseSensitivityCheckBox = new QCheckBox(tr("Case sensitive sorting"));
+    filterCaseSensitivityCheckBox = new QCheckBox(tr("Case sensitive filter"));
+
+    filterPatternLineEdit = new QLineEdit;
+    filterPatternLabel = new QLabel(tr("&Filter pattern:"));
+    filterPatternLabel->setBuddy(filterPatternLineEdit);
+
+    filterSyntaxComboBox = new QComboBox;
+    filterSyntaxComboBox->addItem(tr("Regular expression"), QRegExp::RegExp);
+    filterSyntaxComboBox->addItem(tr("Wildcard"), QRegExp::Wildcard);
+    filterSyntaxComboBox->addItem(tr("Fixed string"), QRegExp::FixedString);
+    filterSyntaxLabel = new QLabel(tr("Filter &syntax:"));
+    filterSyntaxLabel->setBuddy(filterSyntaxComboBox);
+
+    filterColumnComboBox = new QComboBox;
+    filterColumnComboBox->addItem(tr("Subject"));
+    filterColumnComboBox->addItem(tr("Sender"));
+    filterColumnComboBox->addItem(tr("Date"));
+    filterColumnLabel = new QLabel(tr("Filter &column:"));
+    filterColumnLabel->setBuddy(filterColumnComboBox);
+
+    connect(filterPatternLineEdit, SIGNAL(textChanged(const QString &)),
+            this, SLOT(filterRegExpChanged()));
+    connect(filterSyntaxComboBox, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(filterRegExpChanged()));
+    connect(filterColumnComboBox, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(filterColumnChanged()));
+    connect(filterCaseSensitivityCheckBox, SIGNAL(toggled(bool)),
+            this, SLOT(filterRegExpChanged()));
+    connect(sortCaseSensitivityCheckBox, SIGNAL(toggled(bool)),
+            this, SLOT(sortChanged()));
+
+    QHBoxLayout *sourceLayout = new QHBoxLayout;
+    sourceLayout->addWidget(sourceView);
+    sourceGroupBox->setLayout(sourceLayout);
+
+    QGridLayout *proxyLayout = new QGridLayout;
+    proxyLayout->addWidget(proxyView, 0, 0, 1, 3);
+    proxyLayout->addWidget(filterPatternLabel, 1, 0);
+    proxyLayout->addWidget(filterPatternLineEdit, 1, 1, 1, 2);
+    proxyLayout->addWidget(filterSyntaxLabel, 2, 0);
+    proxyLayout->addWidget(filterSyntaxComboBox, 2, 1, 1, 2);
+    proxyLayout->addWidget(filterColumnLabel, 3, 0);
+    proxyLayout->addWidget(filterColumnComboBox, 3, 1, 1, 2);
+    proxyLayout->addWidget(filterCaseSensitivityCheckBox, 4, 0, 1, 2);
+    proxyLayout->addWidget(sortCaseSensitivityCheckBox, 4, 2);
+    proxyGroupBox->setLayout(proxyLayout);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(sourceGroupBox);
+    mainLayout->addWidget(proxyGroupBox);
+    setLayout(mainLayout);
+
+    setWindowTitle(tr("Basic Sort/Filter Model"));
+    resize(500, 450);
+
+    proxyView->sortByColumn(1, Qt::AscendingOrder);
+    filterColumnComboBox->setCurrentIndex(1);
+
+    filterPatternLineEdit->setText("Andy|Grace");
+    filterCaseSensitivityCheckBox->setChecked(true);
+    sortCaseSensitivityCheckBox->setChecked(true);
+}
+
+void Window::setSourceModel(QAbstractItemModel *model)
+{
+    proxyModel->setSourceModel(model);
+    sourceView->setModel(model);
+}
+
+void Window::filterRegExpChanged()
+{
+    QRegExp::PatternSyntax syntax =
+            QRegExp::PatternSyntax(filterSyntaxComboBox->itemData(
+                    filterSyntaxComboBox->currentIndex()).toInt());
+    Qt::CaseSensitivity caseSensitivity =
+            filterCaseSensitivityCheckBox->isChecked() ? Qt::CaseSensitive
+                                                       : Qt::CaseInsensitive;
+
+    QRegExp regExp(filterPatternLineEdit->text(), caseSensitivity, syntax);
+    proxyModel->setFilterRegExp(regExp);
+}
+
+void Window::filterColumnChanged()
+{
+    proxyModel->setFilterKeyColumn(filterColumnComboBox->currentIndex());
+}
+
+void Window::sortChanged()
+{
+    proxyModel->setSortCaseSensitivity(
+            sortCaseSensitivityCheckBox->isChecked() ? Qt::CaseSensitive
+                                                     : Qt::CaseInsensitive);
+}
diff --git a/examples/itemviews/basicsortfiltermodel/window.h b/examples/itemviews/basicsortfiltermodel/window.h
new file mode 100644
index 0000000000..029a83ad01
--- /dev/null
+++ b/examples/itemviews/basicsortfiltermodel/window.h
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QAbstractItemModel;
+class QCheckBox;
+class QComboBox;
+class QGroupBox;
+class QLabel;
+class QLineEdit;
+class QSortFilterProxyModel;
+class QTreeView;
+QT_END_NAMESPACE
+
+class Window : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Window();
+
+    void setSourceModel(QAbstractItemModel *model);
+
+private slots:
+    void filterRegExpChanged();
+    void filterColumnChanged();
+    void sortChanged();
+
+private:
+    QSortFilterProxyModel *proxyModel;
+
+    QGroupBox *sourceGroupBox;
+    QGroupBox *proxyGroupBox;
+    QTreeView *sourceView;
+    QTreeView *proxyView;
+    QCheckBox *filterCaseSensitivityCheckBox;
+    QCheckBox *sortCaseSensitivityCheckBox;
+    QLabel *filterPatternLabel;
+    QLabel *filterSyntaxLabel;
+    QLabel *filterColumnLabel;
+    QLineEdit *filterPatternLineEdit;
+    QComboBox *filterSyntaxComboBox;
+    QComboBox *filterColumnComboBox;
+};
+
+#endif
diff --git a/examples/itemviews/chart/chart.pro b/examples/itemviews/chart/chart.pro
new file mode 100644
index 0000000000..d2024511c0
--- /dev/null
+++ b/examples/itemviews/chart/chart.pro
@@ -0,0 +1,13 @@
+HEADERS     = mainwindow.h \
+              pieview.h
+RESOURCES   = chart.qrc
+SOURCES     = main.cpp \
+              mainwindow.cpp \
+              pieview.cpp
+unix:!mac:LIBS+= -lm
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/chart
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.cht
+sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/chart
+INSTALLS += target sources
diff --git a/examples/itemviews/chart/chart.qrc b/examples/itemviews/chart/chart.qrc
new file mode 100644
index 0000000000..7401d4d2f8
--- /dev/null
+++ b/examples/itemviews/chart/chart.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/Charts" >
+   <file>qtdata.cht</file>
+</qresource>
+</RCC>
diff --git a/examples/itemviews/chart/main.cpp b/examples/itemviews/chart/main.cpp
new file mode 100644
index 0000000000..dc3733cd83
--- /dev/null
+++ b/examples/itemviews/chart/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(chart);
+
+    QApplication app(argc, argv);
+    MainWindow window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/itemviews/chart/mainwindow.cpp b/examples/itemviews/chart/mainwindow.cpp
new file mode 100644
index 0000000000..208a4658b5
--- /dev/null
+++ b/examples/itemviews/chart/mainwindow.cpp
@@ -0,0 +1,173 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "pieview.h"
+#include "mainwindow.h"
+
+MainWindow::MainWindow()
+{
+    QMenu *fileMenu = new QMenu(tr("&File"), this);
+    QAction *openAction = fileMenu->addAction(tr("&Open..."));
+    openAction->setShortcut(QKeySequence(tr("Ctrl+O")));
+    QAction *saveAction = fileMenu->addAction(tr("&Save As..."));
+    saveAction->setShortcut(QKeySequence(tr("Ctrl+S")));
+    QAction *quitAction = fileMenu->addAction(tr("E&xit"));
+    quitAction->setShortcut(QKeySequence(tr("Ctrl+Q")));
+
+    setupModel();
+    setupViews();
+
+    connect(openAction, SIGNAL(triggered()), this, SLOT(openFile()));
+    connect(saveAction, SIGNAL(triggered()), this, SLOT(saveFile()));
+    connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+
+    menuBar()->addMenu(fileMenu);
+    statusBar();
+
+    openFile(":/Charts/qtdata.cht");
+
+    setWindowTitle(tr("Chart"));
+    resize(870, 550);
+}
+
+void MainWindow::setupModel()
+{
+    model = new QStandardItemModel(8, 2, this);
+    model->setHeaderData(0, Qt::Horizontal, tr("Label"));
+    model->setHeaderData(1, Qt::Horizontal, tr("Quantity"));
+}
+
+void MainWindow::setupViews()
+{
+    QSplitter *splitter = new QSplitter;
+    QTableView *table = new QTableView;
+    pieChart = new PieView;
+    splitter->addWidget(table);
+    splitter->addWidget(pieChart);
+    splitter->setStretchFactor(0, 0);
+    splitter->setStretchFactor(1, 1);
+
+    table->setModel(model);
+    pieChart->setModel(model);
+
+    QItemSelectionModel *selectionModel = new QItemSelectionModel(model);
+    table->setSelectionModel(selectionModel);
+    pieChart->setSelectionModel(selectionModel);
+
+    QHeaderView *headerView = table->horizontalHeader();
+    headerView->setStretchLastSection(true);
+
+    setCentralWidget(splitter);
+}
+
+void MainWindow::openFile(const QString &path)
+{
+    QString fileName;
+    if (path.isNull())
+        fileName = QFileDialog::getOpenFileName(this, tr("Choose a data file"),
+                                                "", "*.cht");
+    else
+        fileName = path;
+
+    if (!fileName.isEmpty()) {
+        QFile file(fileName);
+
+        if (file.open(QFile::ReadOnly | QFile::Text)) {
+            QTextStream stream(&file);
+            QString line;
+
+            model->removeRows(0, model->rowCount(QModelIndex()), QModelIndex());
+
+            int row = 0;
+            do {
+                line = stream.readLine();
+                if (!line.isEmpty()) {
+
+                    model->insertRows(row, 1, QModelIndex());
+
+                    QStringList pieces = line.split(",", QString::SkipEmptyParts);
+                    model->setData(model->index(row, 0, QModelIndex()),
+                                   pieces.value(0));
+                    model->setData(model->index(row, 1, QModelIndex()),
+                                   pieces.value(1));
+                    model->setData(model->index(row, 0, QModelIndex()),
+                                   QColor(pieces.value(2)), Qt::DecorationRole);
+                    row++;
+                }
+            } while (!line.isEmpty());
+
+            file.close();
+            statusBar()->showMessage(tr("Loaded %1").arg(fileName), 2000);
+        }
+    }
+}
+
+void MainWindow::saveFile()
+{
+    QString fileName = QFileDialog::getSaveFileName(this,
+        tr("Save file as"), "", "*.cht");
+
+    if (!fileName.isEmpty()) {
+        QFile file(fileName);
+        QTextStream stream(&file);
+
+        if (file.open(QFile::WriteOnly | QFile::Text)) {
+            for (int row = 0; row < model->rowCount(QModelIndex()); ++row) {
+
+                QStringList pieces;
+
+                pieces.append(model->data(model->index(row, 0, QModelIndex()),
+                                          Qt::DisplayRole).toString());
+                pieces.append(model->data(model->index(row, 1, QModelIndex()),
+                                          Qt::DisplayRole).toString());
+                pieces.append(model->data(model->index(row, 0, QModelIndex()),
+                                          Qt::DecorationRole).toString());
+
+                stream << pieces.join(",") << "\n";
+            }
+        }
+
+        file.close();
+        statusBar()->showMessage(tr("Saved %1").arg(fileName), 2000);
+    }
+}
diff --git a/examples/itemviews/chart/mainwindow.h b/examples/itemviews/chart/mainwindow.h
new file mode 100644
index 0000000000..f3a9a10ff1
--- /dev/null
+++ b/examples/itemviews/chart/mainwindow.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+
+QT_BEGIN_NAMESPACE
+class QAbstractItemModel;
+class QAbstractItemView;
+class QItemSelectionModel;
+QT_END_NAMESPACE
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+private slots:
+    void openFile(const QString &path = QString());
+    void saveFile();
+
+private:
+    void setupModel();
+    void setupViews();
+
+    QAbstractItemModel *model;
+    QAbstractItemView *pieChart;
+    QItemSelectionModel *selectionModel;
+};
+
+#endif
diff --git a/examples/itemviews/chart/mydata.cht b/examples/itemviews/chart/mydata.cht
new file mode 100644
index 0000000000..029fd81458
--- /dev/null
+++ b/examples/itemviews/chart/mydata.cht
@@ -0,0 +1,8 @@
+London,4,red
+Stockholm,5,pink
+Paris,2,lightgreen
+Rome,11,green
+Lisbon,9,blue
+Madrid,8,lightblue
+Berlin,6,magenta
+Vienna,7,purple
diff --git a/examples/itemviews/chart/pieview.cpp b/examples/itemviews/chart/pieview.cpp
new file mode 100644
index 0000000000..6b62f25c67
--- /dev/null
+++ b/examples/itemviews/chart/pieview.cpp
@@ -0,0 +1,562 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <math.h>
+#include <QtGui>
+
+#ifndef M_PI
+#define M_PI 3.1415927
+#endif
+
+#include "pieview.h"
+
+PieView::PieView(QWidget *parent)
+    : QAbstractItemView(parent)
+{
+    horizontalScrollBar()->setRange(0, 0);
+    verticalScrollBar()->setRange(0, 0);
+
+    margin = 8;
+    totalSize = 300;
+    pieSize = totalSize - 2*margin;
+    validItems = 0;
+    totalValue = 0.0;
+    rubberBand = 0;
+}
+
+void PieView::dataChanged(const QModelIndex &topLeft,
+                          const QModelIndex &bottomRight)
+{
+    QAbstractItemView::dataChanged(topLeft, bottomRight);
+
+    validItems = 0;
+    totalValue = 0.0;
+
+    for (int row = 0; row < model()->rowCount(rootIndex()); ++row) {
+
+        QModelIndex index = model()->index(row, 1, rootIndex());
+        double value = model()->data(index).toDouble();
+
+        if (value > 0.0) {
+            totalValue += value;
+            validItems++;
+        }
+    }
+    viewport()->update();
+}
+
+bool PieView::edit(const QModelIndex &index, EditTrigger trigger, QEvent *event)
+{
+    if (index.column() == 0)
+        return QAbstractItemView::edit(index, trigger, event);
+    else
+        return false;
+}
+
+/*
+    Returns the item that covers the coordinate given in the view.
+*/
+
+QModelIndex PieView::indexAt(const QPoint &point) const
+{
+    if (validItems == 0)
+        return QModelIndex();
+
+    // Transform the view coordinates into contents widget coordinates.
+    int wx = point.x() + horizontalScrollBar()->value();
+    int wy = point.y() + verticalScrollBar()->value();
+
+    if (wx < totalSize) {
+        double cx = wx - totalSize/2;
+        double cy = totalSize/2 - wy; // positive cy for items above the center
+
+        // Determine the distance from the center point of the pie chart.
+        double d = pow(pow(cx, 2) + pow(cy, 2), 0.5);
+
+        if (d == 0 || d > pieSize/2)
+            return QModelIndex();
+
+        // Determine the angle of the point.
+        double angle = (180 / M_PI) * acos(cx/d);
+        if (cy < 0)
+            angle = 360 - angle;
+
+        // Find the relevant slice of the pie.
+        double startAngle = 0.0;
+
+        for (int row = 0; row < model()->rowCount(rootIndex()); ++row) {
+
+            QModelIndex index = model()->index(row, 1, rootIndex());
+            double value = model()->data(index).toDouble();
+
+            if (value > 0.0) {
+                double sliceAngle = 360*value/totalValue;
+
+                if (angle >= startAngle && angle < (startAngle + sliceAngle))
+                    return model()->index(row, 1, rootIndex());
+
+                startAngle += sliceAngle;
+            }
+        }
+    } else {
+        double itemHeight = QFontMetrics(viewOptions().font).height();
+        int listItem = int((wy - margin) / itemHeight);
+        int validRow = 0;
+
+        for (int row = 0; row < model()->rowCount(rootIndex()); ++row) {
+
+            QModelIndex index = model()->index(row, 1, rootIndex());
+            if (model()->data(index).toDouble() > 0.0) {
+
+                if (listItem == validRow)
+                    return model()->index(row, 0, rootIndex());
+
+                // Update the list index that corresponds to the next valid row.
+                validRow++;
+            }
+        }
+    }
+
+    return QModelIndex();
+}
+
+bool PieView::isIndexHidden(const QModelIndex & /*index*/) const
+{
+    return false;
+}
+
+/*
+    Returns the rectangle of the item at position \a index in the
+    model. The rectangle is in contents coordinates.
+*/
+
+QRect PieView::itemRect(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return QRect();
+
+    // Check whether the index's row is in the list of rows represented
+    // by slices.
+    QModelIndex valueIndex;
+
+    if (index.column() != 1)
+        valueIndex = model()->index(index.row(), 1, rootIndex());
+    else
+        valueIndex = index;
+
+    if (model()->data(valueIndex).toDouble() > 0.0) {
+
+        int listItem = 0;
+        for (int row = index.row()-1; row >= 0; --row) {
+            if (model()->data(model()->index(row, 1, rootIndex())).toDouble() > 0.0)
+                listItem++;
+        }
+
+        double itemHeight;
+
+        switch (index.column()) {
+        case 0:
+            itemHeight = QFontMetrics(viewOptions().font).height();
+
+            return QRect(totalSize,
+                         int(margin + listItem*itemHeight),
+                         totalSize - margin, int(itemHeight));
+        case 1:
+            return viewport()->rect();
+        }
+
+    }
+    return QRect();
+}
+
+QRegion PieView::itemRegion(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return QRegion();
+
+    if (index.column() != 1)
+        return itemRect(index);
+
+    if (model()->data(index).toDouble() <= 0.0)
+        return QRegion();
+
+    double startAngle = 0.0;
+    for (int row = 0; row < model()->rowCount(rootIndex()); ++row) {
+
+        QModelIndex sliceIndex = model()->index(row, 1, rootIndex());
+        double value = model()->data(sliceIndex).toDouble();
+
+        if (value > 0.0) {
+            double angle = 360*value/totalValue;
+
+            if (sliceIndex == index) {
+                QPainterPath slicePath;
+                slicePath.moveTo(totalSize/2, totalSize/2);
+                slicePath.arcTo(margin, margin, margin+pieSize, margin+pieSize,
+                                startAngle, angle);
+                slicePath.closeSubpath();
+
+                return QRegion(slicePath.toFillPolygon().toPolygon());
+            }
+
+            startAngle += angle;
+        }
+    }
+
+    return QRegion();
+}
+
+int PieView::horizontalOffset() const
+{
+    return horizontalScrollBar()->value();
+}
+
+void PieView::mousePressEvent(QMouseEvent *event)
+{
+    QAbstractItemView::mousePressEvent(event);
+    origin = event->pos();
+    if (!rubberBand)
+        rubberBand = new QRubberBand(QRubberBand::Rectangle, this);
+    rubberBand->setGeometry(QRect(origin, QSize()));
+    rubberBand->show();
+}
+
+void PieView::mouseMoveEvent(QMouseEvent *event)
+{
+    if (rubberBand)
+        rubberBand->setGeometry(QRect(origin, event->pos()).normalized());
+    QAbstractItemView::mouseMoveEvent(event);
+}
+
+void PieView::mouseReleaseEvent(QMouseEvent *event)
+{
+    QAbstractItemView::mouseReleaseEvent(event);
+    if (rubberBand)
+        rubberBand->hide();
+    viewport()->update();
+}
+
+QModelIndex PieView::moveCursor(QAbstractItemView::CursorAction cursorAction,
+                                Qt::KeyboardModifiers /*modifiers*/)
+{
+    QModelIndex current = currentIndex();
+
+    switch (cursorAction) {
+        case MoveLeft:
+        case MoveUp:
+            if (current.row() > 0)
+                current = model()->index(current.row() - 1, current.column(),
+                                         rootIndex());
+            else
+                current = model()->index(0, current.column(), rootIndex());
+            break;
+        case MoveRight:
+        case MoveDown:
+            if (current.row() < rows(current) - 1)
+                current = model()->index(current.row() + 1, current.column(),
+                                         rootIndex());
+            else
+                current = model()->index(rows(current) - 1, current.column(),
+                                         rootIndex());
+            break;
+        default:
+            break;
+    }
+
+    viewport()->update();
+    return current;
+}
+
+void PieView::paintEvent(QPaintEvent *event)
+{
+    QItemSelectionModel *selections = selectionModel();
+    QStyleOptionViewItem option = viewOptions();
+    QStyle::State state = option.state;
+
+    QBrush background = option.palette.base();
+    QPen foreground(option.palette.color(QPalette::WindowText));
+    QPen textPen(option.palette.color(QPalette::Text));
+    QPen highlightedPen(option.palette.color(QPalette::HighlightedText));
+
+    QPainter painter(viewport());
+    painter.setRenderHint(QPainter::Antialiasing);
+
+    painter.fillRect(event->rect(), background);
+    painter.setPen(foreground);
+
+    // Viewport rectangles
+    QRect pieRect = QRect(margin, margin, pieSize, pieSize);
+    QPoint keyPoint = QPoint(totalSize - horizontalScrollBar()->value(),
+                             margin - verticalScrollBar()->value());
+
+    if (validItems > 0) {
+
+        painter.save();
+        painter.translate(pieRect.x() - horizontalScrollBar()->value(),
+                          pieRect.y() - verticalScrollBar()->value());
+        painter.drawEllipse(0, 0, pieSize, pieSize);
+        double startAngle = 0.0;
+        int row;
+
+        for (row = 0; row < model()->rowCount(rootIndex()); ++row) {
+
+            QModelIndex index = model()->index(row, 1, rootIndex());
+            double value = model()->data(index).toDouble();
+
+            if (value > 0.0) {
+                double angle = 360*value/totalValue;
+
+                QModelIndex colorIndex = model()->index(row, 0, rootIndex());
+                QColor color = QColor(model()->data(colorIndex,
+                                Qt::DecorationRole).toString());
+
+                if (currentIndex() == index)
+                    painter.setBrush(QBrush(color, Qt::Dense4Pattern));
+                else if (selections->isSelected(index))
+                    painter.setBrush(QBrush(color, Qt::Dense3Pattern));
+                else
+                    painter.setBrush(QBrush(color));
+
+                painter.drawPie(0, 0, pieSize, pieSize, int(startAngle*16),
+                                int(angle*16));
+
+                startAngle += angle;
+            }
+        }
+        painter.restore();
+
+        int keyNumber = 0;
+
+        for (row = 0; row < model()->rowCount(rootIndex()); ++row) {
+
+            QModelIndex index = model()->index(row, 1, rootIndex());
+            double value = model()->data(index).toDouble();
+
+            if (value > 0.0) {
+                QModelIndex labelIndex = model()->index(row, 0, rootIndex());
+
+                QStyleOptionViewItem option = viewOptions();
+                option.rect = visualRect(labelIndex);
+                if (selections->isSelected(labelIndex))
+                    option.state |= QStyle::State_Selected;
+                if (currentIndex() == labelIndex)
+                    option.state |= QStyle::State_HasFocus;
+                itemDelegate()->paint(&painter, option, labelIndex);
+
+                keyNumber++;
+            }
+        }
+    }
+}
+
+void PieView::resizeEvent(QResizeEvent * /* event */)
+{
+    updateGeometries();
+}
+
+int PieView::rows(const QModelIndex &index) const
+{
+    return model()->rowCount(model()->parent(index));
+}
+
+void PieView::rowsInserted(const QModelIndex &parent, int start, int end)
+{
+    for (int row = start; row <= end; ++row) {
+
+        QModelIndex index = model()->index(row, 1, rootIndex());
+        double value = model()->data(index).toDouble();
+
+        if (value > 0.0) {
+            totalValue += value;
+            validItems++;
+        }
+    }
+
+    QAbstractItemView::rowsInserted(parent, start, end);
+}
+
+void PieView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
+{
+    for (int row = start; row <= end; ++row) {
+
+        QModelIndex index = model()->index(row, 1, rootIndex());
+        double value = model()->data(index).toDouble();
+        if (value > 0.0) {
+            totalValue -= value;
+            validItems--;
+        }
+    }
+
+    QAbstractItemView::rowsAboutToBeRemoved(parent, start, end);
+}
+
+void PieView::scrollContentsBy(int dx, int dy)
+{
+    viewport()->scroll(dx, dy);
+}
+
+void PieView::scrollTo(const QModelIndex &index, ScrollHint)
+{
+    QRect area = viewport()->rect();
+    QRect rect = visualRect(index);
+
+    if (rect.left() < area.left())
+        horizontalScrollBar()->setValue(
+            horizontalScrollBar()->value() + rect.left() - area.left());
+    else if (rect.right() > area.right())
+        horizontalScrollBar()->setValue(
+            horizontalScrollBar()->value() + qMin(
+                rect.right() - area.right(), rect.left() - area.left()));
+
+    if (rect.top() < area.top())
+        verticalScrollBar()->setValue(
+            verticalScrollBar()->value() + rect.top() - area.top());
+    else if (rect.bottom() > area.bottom())
+        verticalScrollBar()->setValue(
+            verticalScrollBar()->value() + qMin(
+                rect.bottom() - area.bottom(), rect.top() - area.top()));
+
+    update();
+}
+
+/*
+    Find the indices corresponding to the extent of the selection.
+*/
+
+void PieView::setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command)
+{
+    // Use content widget coordinates because we will use the itemRegion()
+    // function to check for intersections.
+
+    QRect contentsRect = rect.translated(
+                            horizontalScrollBar()->value(),
+                            verticalScrollBar()->value()).normalized();
+
+    int rows = model()->rowCount(rootIndex());
+    int columns = model()->columnCount(rootIndex());
+    QModelIndexList indexes;
+
+    for (int row = 0; row < rows; ++row) {
+        for (int column = 0; column < columns; ++column) {
+            QModelIndex index = model()->index(row, column, rootIndex());
+            QRegion region = itemRegion(index);
+            if (!region.intersect(contentsRect).isEmpty())
+                indexes.append(index);
+        }
+    }
+
+    if (indexes.size() > 0) {
+        int firstRow = indexes[0].row();
+        int lastRow = indexes[0].row();
+        int firstColumn = indexes[0].column();
+        int lastColumn = indexes[0].column();
+
+        for (int i = 1; i < indexes.size(); ++i) {
+            firstRow = qMin(firstRow, indexes[i].row());
+            lastRow = qMax(lastRow, indexes[i].row());
+            firstColumn = qMin(firstColumn, indexes[i].column());
+            lastColumn = qMax(lastColumn, indexes[i].column());
+        }
+
+        QItemSelection selection(
+            model()->index(firstRow, firstColumn, rootIndex()),
+            model()->index(lastRow, lastColumn, rootIndex()));
+        selectionModel()->select(selection, command);
+    } else {
+        QModelIndex noIndex;
+        QItemSelection selection(noIndex, noIndex);
+        selectionModel()->select(selection, command);
+    }
+
+    update();
+}
+
+void PieView::updateGeometries()
+{
+    horizontalScrollBar()->setPageStep(viewport()->width());
+    horizontalScrollBar()->setRange(0, qMax(0, 2*totalSize - viewport()->width()));
+    verticalScrollBar()->setPageStep(viewport()->height());
+    verticalScrollBar()->setRange(0, qMax(0, totalSize - viewport()->height()));
+}
+
+int PieView::verticalOffset() const
+{
+    return verticalScrollBar()->value();
+}
+
+/*
+    Returns the position of the item in viewport coordinates.
+*/
+
+QRect PieView::visualRect(const QModelIndex &index) const
+{
+    QRect rect = itemRect(index);
+    if (rect.isValid())
+        return QRect(rect.left() - horizontalScrollBar()->value(),
+                     rect.top() - verticalScrollBar()->value(),
+                     rect.width(), rect.height());
+    else
+        return rect;
+}
+
+/*
+    Returns a region corresponding to the selection in viewport coordinates.
+*/
+
+QRegion PieView::visualRegionForSelection(const QItemSelection &selection) const
+{
+    int ranges = selection.count();
+
+    if (ranges == 0)
+        return QRect();
+
+    QRegion region;
+    for (int i = 0; i < ranges; ++i) {
+        QItemSelectionRange range = selection.at(i);
+        for (int row = range.top(); row <= range.bottom(); ++row) {
+            for (int col = range.left(); col <= range.right(); ++col) {
+                QModelIndex index = model()->index(row, col, rootIndex());
+                region += visualRect(index);
+            }
+        }
+    }
+    return region;
+}
diff --git a/examples/itemviews/chart/pieview.h b/examples/itemviews/chart/pieview.h
new file mode 100644
index 0000000000..5bebefc87d
--- /dev/null
+++ b/examples/itemviews/chart/pieview.h
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PIEVIEW_H
+#define PIEVIEW_H
+
+#include <QAbstractItemView>
+#include <QFont>
+#include <QItemSelection>
+#include <QItemSelectionModel>
+#include <QModelIndex>
+#include <QRect>
+#include <QSize>
+#include <QPoint>
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QRubberBand;
+QT_END_NAMESPACE
+
+//! [0]
+class PieView : public QAbstractItemView
+{
+    Q_OBJECT
+
+public:
+    PieView(QWidget *parent = 0);
+
+    QRect visualRect(const QModelIndex &index) const;
+    void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible);
+    QModelIndex indexAt(const QPoint &point) const;
+
+protected slots:
+    void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+    void rowsInserted(const QModelIndex &parent, int start, int end);
+    void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end);
+
+protected:
+    bool edit(const QModelIndex &index, EditTrigger trigger, QEvent *event);
+    QModelIndex moveCursor(QAbstractItemView::CursorAction cursorAction,
+                           Qt::KeyboardModifiers modifiers);
+
+    int horizontalOffset() const;
+    int verticalOffset() const;
+
+    bool isIndexHidden(const QModelIndex &index) const;
+
+    void setSelection(const QRect&, QItemSelectionModel::SelectionFlags command);
+
+    void mousePressEvent(QMouseEvent *event);
+
+    void mouseMoveEvent(QMouseEvent *event);
+    void mouseReleaseEvent(QMouseEvent *event);
+
+    void paintEvent(QPaintEvent *event);
+    void resizeEvent(QResizeEvent *event);
+    void scrollContentsBy(int dx, int dy);
+
+    QRegion visualRegionForSelection(const QItemSelection &selection) const;
+
+private:
+    QRect itemRect(const QModelIndex &item) const;
+    QRegion itemRegion(const QModelIndex &index) const;
+    int rows(const QModelIndex &index = QModelIndex()) const;
+    void updateGeometries();
+
+    int margin;
+    int totalSize;
+    int pieSize;
+    int validItems;
+    double totalValue;
+    QPoint origin;
+    QRubberBand *rubberBand;
+};
+//! [0]
+
+#endif
diff --git a/examples/itemviews/chart/qtdata.cht b/examples/itemviews/chart/qtdata.cht
new file mode 100644
index 0000000000..6386246c4b
--- /dev/null
+++ b/examples/itemviews/chart/qtdata.cht
@@ -0,0 +1,14 @@
+Scientific Research,21,#99e600
+Engineering & Design,18,#99cc00
+Automotive,14,#99b300
+Aerospace,13,#9f991a
+Automation & Machine Tools,13,#a48033
+Medical & Bioinformatics,13,#a9664d
+Imaging & Special Effects,12,#ae4d66
+Defense,11,#b33380
+Test & Measurement Systems,9,#a64086
+Oil & Gas,9,#994d8d
+Entertainment & Broadcasting,7,#8d5a93
+Financial,6,#806699
+Consumer Electronics,4,#8073a6
+Other,38,#8080b3
diff --git a/examples/itemviews/coloreditorfactory/coloreditorfactory.pro b/examples/itemviews/coloreditorfactory/coloreditorfactory.pro
new file mode 100644
index 0000000000..ebb3b8e507
--- /dev/null
+++ b/examples/itemviews/coloreditorfactory/coloreditorfactory.pro
@@ -0,0 +1,11 @@
+HEADERS	    = colorlisteditor.h \
+	      window.h
+SOURCES	    = colorlisteditor.cpp \
+	      window.cpp \
+	      main.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/coloreditorfactory
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/coloreditorfactory
+INSTALLS += target sources
diff --git a/examples/itemviews/coloreditorfactory/colorlisteditor.cpp b/examples/itemviews/coloreditorfactory/colorlisteditor.cpp
new file mode 100644
index 0000000000..88b953ca4d
--- /dev/null
+++ b/examples/itemviews/coloreditorfactory/colorlisteditor.cpp
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "colorlisteditor.h"
+
+ColorListEditor::ColorListEditor(QWidget *widget) : QComboBox(widget)
+{
+    populateList();
+}
+
+//! [0]
+QColor ColorListEditor::color() const
+{
+    return qVariantValue<QColor>(itemData(currentIndex(), Qt::DecorationRole));
+}
+//! [0]
+
+//! [1]
+void ColorListEditor::setColor(QColor color)
+{
+    setCurrentIndex(findData(color, int(Qt::DecorationRole)));
+}
+//! [1]
+
+//! [2]
+void ColorListEditor::populateList()
+{
+    QStringList colorNames = QColor::colorNames();
+
+    for (int i = 0; i < colorNames.size(); ++i) {
+        QColor color(colorNames[i]);
+
+        insertItem(i, colorNames[i]);
+        setItemData(i, color, Qt::DecorationRole);
+    }
+}
+//! [2]
diff --git a/examples/itemviews/coloreditorfactory/colorlisteditor.h b/examples/itemviews/coloreditorfactory/colorlisteditor.h
new file mode 100644
index 0000000000..810e26856b
--- /dev/null
+++ b/examples/itemviews/coloreditorfactory/colorlisteditor.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef COLORLISTEDITOR_H
+#define COLORLISTEDITOR_H
+
+#include <QComboBox>
+
+QT_BEGIN_NAMESPACE
+class QColor;
+class QWidget;
+QT_END_NAMESPACE
+
+//! [0]
+class ColorListEditor : public QComboBox
+{
+    Q_OBJECT
+    Q_PROPERTY(QColor color READ color WRITE setColor USER true)
+
+public:
+    ColorListEditor(QWidget *widget = 0);
+
+public:
+    QColor color() const;
+    void setColor(QColor c);
+
+private:
+    void populateList();
+};
+//! [0]
+
+#endif
diff --git a/examples/itemviews/coloreditorfactory/main.cpp b/examples/itemviews/coloreditorfactory/main.cpp
new file mode 100644
index 0000000000..a9740af960
--- /dev/null
+++ b/examples/itemviews/coloreditorfactory/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+
+int main(int argv, char **args)
+{
+    QApplication app(argv, args);
+
+    Window window;
+    window.show();
+
+    return app.exec();
+}
diff --git a/examples/itemviews/coloreditorfactory/window.cpp b/examples/itemviews/coloreditorfactory/window.cpp
new file mode 100644
index 0000000000..2ac64a3e64
--- /dev/null
+++ b/examples/itemviews/coloreditorfactory/window.cpp
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+#include "colorlisteditor.h"
+
+//! [0]
+Window::Window()
+{
+    QItemEditorFactory *factory = new QItemEditorFactory;
+
+    QItemEditorCreatorBase *colorListCreator =
+        new QStandardItemEditorCreator<ColorListEditor>();
+
+    factory->registerEditor(QVariant::Color, colorListCreator);
+
+    QItemEditorFactory::setDefaultFactory(factory);
+
+    createGUI();
+}
+//! [0]
+
+void Window::createGUI()
+{
+    QList<QPair<QString, QColor> > list;
+    list << QPair<QString, QColor>(tr("Alice"), QColor("aliceblue")) <<
+            QPair<QString, QColor>(tr("Neptun"), QColor("aquamarine")) <<
+            QPair<QString, QColor>(tr("Ferdinand"), QColor("springgreen"));
+
+    QTableWidget *table = new QTableWidget(3, 2);
+    table->setHorizontalHeaderLabels(QStringList() << tr("Name")
+                                                   << tr("Hair Color"));
+    table->verticalHeader()->setVisible(false);
+    table->resize(150, 50);
+
+    for (int i = 0; i < 3; ++i) {
+        QPair<QString, QColor> pair = list.at(i);
+
+        QTableWidgetItem *nameItem = new QTableWidgetItem(pair.first);
+        QTableWidgetItem *colorItem = new QTableWidgetItem;
+        colorItem->setData(Qt::DisplayRole, pair.second);
+
+        table->setItem(i, 0, nameItem);
+        table->setItem(i, 1, colorItem);
+    }
+    table->resizeColumnToContents(0);
+    table->horizontalHeader()->setStretchLastSection(true);
+
+    QGridLayout *layout = new QGridLayout;
+    layout->addWidget(table, 0, 0);
+
+    setLayout(layout);
+
+    setWindowTitle(tr("Color Editor Factory"));
+}
diff --git a/examples/itemviews/coloreditorfactory/window.h b/examples/itemviews/coloreditorfactory/window.h
new file mode 100644
index 0000000000..fc7b13a1b8
--- /dev/null
+++ b/examples/itemviews/coloreditorfactory/window.h
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QWidget>
+
+class Window : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Window();
+
+private:
+    void createGUI();
+};
+
+#endif
diff --git a/examples/itemviews/combowidgetmapper/combowidgetmapper.pro b/examples/itemviews/combowidgetmapper/combowidgetmapper.pro
new file mode 100644
index 0000000000..7f5c8e8c96
--- /dev/null
+++ b/examples/itemviews/combowidgetmapper/combowidgetmapper.pro
@@ -0,0 +1,9 @@
+HEADERS   = window.h
+SOURCES   = main.cpp \
+            window.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/combowidgetmapper
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/combowidgetmapper
+INSTALLS += target sources
diff --git a/examples/itemviews/combowidgetmapper/main.cpp b/examples/itemviews/combowidgetmapper/main.cpp
new file mode 100644
index 0000000000..055ac21f6c
--- /dev/null
+++ b/examples/itemviews/combowidgetmapper/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "window.h"
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    Window window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/itemviews/combowidgetmapper/window.cpp b/examples/itemviews/combowidgetmapper/window.cpp
new file mode 100644
index 0000000000..69a4c3c9d0
--- /dev/null
+++ b/examples/itemviews/combowidgetmapper/window.cpp
@@ -0,0 +1,137 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "window.h"
+
+//! [Set up widgets]
+Window::Window(QWidget *parent)
+    : QWidget(parent)
+{
+    setupModel();
+
+    nameLabel = new QLabel(tr("Na&me:"));
+    nameEdit = new QLineEdit();
+    addressLabel = new QLabel(tr("&Address:"));
+    addressEdit = new QTextEdit();
+    typeLabel = new QLabel(tr("&Type:"));
+    typeComboBox = new QComboBox();
+    nextButton = new QPushButton(tr("&Next"));
+    previousButton = new QPushButton(tr("&Previous"));
+
+    nameLabel->setBuddy(nameEdit);
+    addressLabel->setBuddy(addressEdit);
+    typeLabel->setBuddy(typeComboBox);
+
+    typeComboBox->setModel(typeModel);
+//! [Set up widgets]
+
+//! [Set up the mapper]
+    mapper = new QDataWidgetMapper(this);
+    mapper->setModel(model);
+    mapper->addMapping(nameEdit, 0);
+    mapper->addMapping(addressEdit, 1);
+    mapper->addMapping(typeComboBox, 2, "currentIndex");
+//! [Set up the mapper]
+
+//! [Set up connections and layouts]
+    connect(previousButton, SIGNAL(clicked()),
+            mapper, SLOT(toPrevious()));
+    connect(nextButton, SIGNAL(clicked()),
+            mapper, SLOT(toNext()));
+    connect(mapper, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(updateButtons(int)));
+
+    QGridLayout *layout = new QGridLayout();
+    layout->addWidget(nameLabel, 0, 0, 1, 1);
+    layout->addWidget(nameEdit, 0, 1, 1, 1);
+    layout->addWidget(previousButton, 0, 2, 1, 1);
+    layout->addWidget(addressLabel, 1, 0, 1, 1);
+    layout->addWidget(addressEdit, 1, 1, 2, 1);
+    layout->addWidget(nextButton, 1, 2, 1, 1);
+    layout->addWidget(typeLabel, 3, 0, 1, 1);
+    layout->addWidget(typeComboBox, 3, 1, 1, 1);
+    setLayout(layout);
+
+    setWindowTitle(tr("Delegate Widget Mapper"));
+    mapper->toFirst();
+}
+//! [Set up connections and layouts]
+
+//! [Set up the model]
+void Window::setupModel()
+{
+    QStringList items;
+    items << tr("Home") << tr("Work") << tr("Other");
+    typeModel = new QStringListModel(items, this);
+    
+    model = new QStandardItemModel(5, 3, this);
+    QStringList names;
+    names << "Alice" << "Bob" << "Carol" << "Donald" << "Emma";
+    QStringList addresses;
+    addresses << "<qt>123 Main Street<br/>Market Town</qt>"
+              << "<qt>PO Box 32<br/>Mail Handling Service"
+                 "<br/>Service City</qt>"
+              << "<qt>The Lighthouse<br/>Remote Island</qt>"
+              << "<qt>47338 Park Avenue<br/>Big City</qt>"
+              << "<qt>Research Station<br/>Base Camp<br/>Big Mountain</qt>";
+
+    QStringList types;
+    types << "0" << "1" << "2" << "0" << "2";
+    
+    for (int row = 0; row < 5; ++row) {
+      QStandardItem *item = new QStandardItem(names[row]);
+      model->setItem(row, 0, item);
+      item = new QStandardItem(addresses[row]);
+      model->setItem(row, 1, item);
+      item = new QStandardItem(types[row]);
+      model->setItem(row, 2, item);
+    }
+}
+//! [Set up the model]
+
+//! [Slot for updating the buttons]
+void Window::updateButtons(int row)
+{
+    previousButton->setEnabled(row > 0);
+    nextButton->setEnabled(row < model->rowCount() - 1);
+}
+//! [Slot for updating the buttons]
diff --git a/examples/itemviews/combowidgetmapper/window.h b/examples/itemviews/combowidgetmapper/window.h
new file mode 100644
index 0000000000..8c45117166
--- /dev/null
+++ b/examples/itemviews/combowidgetmapper/window.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QComboBox;
+class QDataWidgetMapper;
+class QLabel;
+class QLineEdit;
+class QPushButton;
+class QStandardItemModel;
+class QStringListModel;
+class QTextEdit;
+QT_END_NAMESPACE
+
+//! [Window definition]
+class Window : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Window(QWidget *parent = 0);
+
+private slots:
+    void updateButtons(int row);
+
+private:
+    void setupModel();
+
+    QLabel *nameLabel;
+    QLabel *addressLabel;
+    QLabel *typeLabel;
+    QLineEdit *nameEdit;
+    QTextEdit *addressEdit;
+    QComboBox *typeComboBox;
+    QPushButton *nextButton;
+    QPushButton *previousButton;
+
+    QStandardItemModel *model;
+    QStringListModel *typeModel;
+    QDataWidgetMapper *mapper;
+};
+//! [Window definition]
+
+#endif
diff --git a/examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro b/examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro
new file mode 100644
index 0000000000..5a9b9f9a19
--- /dev/null
+++ b/examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro
@@ -0,0 +1,12 @@
+HEADERS     = mysortfilterproxymodel.h \
+              window.h
+SOURCES     = main.cpp \
+              mysortfilterproxymodel.cpp \
+              window.cpp
+CONFIG     += qt
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/customsortfiltermodel
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/customsortfiltermodel
+INSTALLS += target sources
diff --git a/examples/itemviews/customsortfiltermodel/main.cpp b/examples/itemviews/customsortfiltermodel/main.cpp
new file mode 100644
index 0000000000..043f28a05d
--- /dev/null
+++ b/examples/itemviews/customsortfiltermodel/main.cpp
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+
+void addMail(QAbstractItemModel *model, const QString &subject,
+             const QString &sender, const QDateTime &date)
+{
+    model->insertRow(0);
+    model->setData(model->index(0, 0), subject);
+    model->setData(model->index(0, 1), sender);
+    model->setData(model->index(0, 2), date);
+}
+
+QAbstractItemModel *createMailModel(QObject *parent)
+{
+    QStandardItemModel *model = new QStandardItemModel(0, 3, parent);
+
+    model->setHeaderData(0, Qt::Horizontal, QObject::tr("Subject"));
+    model->setHeaderData(1, Qt::Horizontal, QObject::tr("Sender"));
+    model->setHeaderData(2, Qt::Horizontal, QObject::tr("Date"));
+
+    addMail(model, "Happy New Year!", "Grace K. <grace@software-inc.com>",
+            QDateTime(QDate(2006, 12, 31), QTime(17, 03)));
+    addMail(model, "Radically new concept", "Grace K. <grace@software-inc.com>",
+            QDateTime(QDate(2006, 12, 22), QTime(9, 44)));
+    addMail(model, "Accounts", "pascale@nospam.com",
+            QDateTime(QDate(2006, 12, 31), QTime(12, 50)));
+    addMail(model, "Expenses", "Joe Bloggs <joe@bloggs.com>",
+            QDateTime(QDate(2006, 12, 25), QTime(11, 39)));
+    addMail(model, "Re: Expenses", "Andy <andy@nospam.com>",
+            QDateTime(QDate(2007, 01, 02), QTime(16, 05)));
+    addMail(model, "Re: Accounts", "Joe Bloggs <joe@bloggs.com>",
+            QDateTime(QDate(2007, 01, 03), QTime(14, 18)));
+    addMail(model, "Re: Accounts", "Andy <andy@nospam.com>",
+            QDateTime(QDate(2007, 01, 03), QTime(14, 26)));
+    addMail(model, "Sports", "Linda Smith <linda.smith@nospam.com>",
+            QDateTime(QDate(2007, 01, 05), QTime(11, 33)));
+    addMail(model, "AW: Sports", "Rolf Newschweinstein <rolfn@nospam.com>",
+            QDateTime(QDate(2007, 01, 05), QTime(12, 00)));
+    addMail(model, "RE: Sports", "Petra Schmidt <petras@nospam.com>",
+            QDateTime(QDate(2007, 01, 05), QTime(12, 01)));
+
+    return model;
+}
+
+//! [0]
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Window window;
+    window.setSourceModel(createMailModel(&window));
+    window.show();
+    return app.exec();
+}
+//! [0]
diff --git a/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp b/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp
new file mode 100644
index 0000000000..ead2eb797d
--- /dev/null
+++ b/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mysortfilterproxymodel.h"
+
+//! [0]
+MySortFilterProxyModel::MySortFilterProxyModel(QObject *parent)
+    : QSortFilterProxyModel(parent)
+{
+}
+//! [0]
+
+//! [1]
+void MySortFilterProxyModel::setFilterMinimumDate(const QDate &date)
+{
+    minDate = date;
+    invalidateFilter();
+}
+//! [1]
+
+//! [2]
+void MySortFilterProxyModel::setFilterMaximumDate(const QDate &date)
+{
+    maxDate = date;
+    invalidateFilter();
+}
+//! [2]
+
+//! [3]
+bool MySortFilterProxyModel::filterAcceptsRow(int sourceRow,
+        const QModelIndex &sourceParent) const
+{
+    QModelIndex index0 = sourceModel()->index(sourceRow, 0, sourceParent);
+    QModelIndex index1 = sourceModel()->index(sourceRow, 1, sourceParent);
+    QModelIndex index2 = sourceModel()->index(sourceRow, 2, sourceParent);
+
+    return (sourceModel()->data(index0).toString().contains(filterRegExp())
+            || sourceModel()->data(index1).toString().contains(filterRegExp()))
+           && dateInRange(sourceModel()->data(index2).toDate());
+}
+//! [3]
+
+//! [4] //! [5]
+bool MySortFilterProxyModel::lessThan(const QModelIndex &left,
+                                      const QModelIndex &right) const
+{
+    QVariant leftData = sourceModel()->data(left);
+    QVariant rightData = sourceModel()->data(right);
+//! [4]
+
+//! [6]
+    if (leftData.type() == QVariant::DateTime) {
+        return leftData.toDateTime() < rightData.toDateTime();
+    } else {
+        QRegExp *emailPattern = new QRegExp("([\\w\\.]*@[\\w\\.]*)");
+
+        QString leftString = leftData.toString();
+        if(left.column() == 1 && emailPattern->indexIn(leftString) != -1)
+            leftString = emailPattern->cap(1);
+
+        QString rightString = rightData.toString();
+        if(right.column() == 1 && emailPattern->indexIn(rightString) != -1)
+            rightString = emailPattern->cap(1);
+
+        return QString::localeAwareCompare(leftString, rightString) < 0;
+    }
+}
+//! [5] //! [6]
+
+//! [7]
+bool MySortFilterProxyModel::dateInRange(const QDate &date) const
+{
+    return (!minDate.isValid() || date > minDate)
+           && (!maxDate.isValid() || date < maxDate);
+}
+//! [7]
diff --git a/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.h b/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.h
new file mode 100644
index 0000000000..0e09bf1a91
--- /dev/null
+++ b/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MYSORTFILTERPROXYMODEL_H
+#define MYSORTFILTERPROXYMODEL_H
+
+#include <QDate>
+#include <QSortFilterProxyModel>
+
+//! [0]
+class MySortFilterProxyModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+
+public:
+    MySortFilterProxyModel(QObject *parent = 0);
+
+    QDate filterMinimumDate() const { return minDate; }
+    void setFilterMinimumDate(const QDate &date);
+
+    QDate filterMaximumDate() const { return maxDate; }
+    void setFilterMaximumDate(const QDate &date);
+
+protected:
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
+    bool lessThan(const QModelIndex &left, const QModelIndex &right) const;
+
+private:
+    bool dateInRange(const QDate &date) const;
+
+    QDate minDate;
+    QDate maxDate;
+};
+//! [0]
+
+#endif
diff --git a/examples/itemviews/customsortfiltermodel/window.cpp b/examples/itemviews/customsortfiltermodel/window.cpp
new file mode 100644
index 0000000000..54ba646e02
--- /dev/null
+++ b/examples/itemviews/customsortfiltermodel/window.cpp
@@ -0,0 +1,168 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mysortfilterproxymodel.h"
+#include "window.h"
+
+//! [0]
+Window::Window()
+{
+    proxyModel = new MySortFilterProxyModel(this);
+    proxyModel->setDynamicSortFilter(true);
+//! [0]
+
+//! [1]
+    sourceView = new QTreeView;
+    sourceView->setRootIsDecorated(false);
+    sourceView->setAlternatingRowColors(true);
+//! [1]
+
+    QHBoxLayout *sourceLayout = new QHBoxLayout;
+//! [2]
+    sourceLayout->addWidget(sourceView);
+    sourceGroupBox = new QGroupBox(tr("Original Model"));
+    sourceGroupBox->setLayout(sourceLayout);
+//! [2]
+
+//! [3]
+    filterCaseSensitivityCheckBox = new QCheckBox(tr("Case sensitive filter"));
+    filterCaseSensitivityCheckBox->setChecked(true);
+
+    filterPatternLineEdit = new QLineEdit;
+    filterPatternLineEdit->setText("Grace|Sports");
+
+    filterPatternLabel = new QLabel(tr("&Filter pattern:"));
+    filterPatternLabel->setBuddy(filterPatternLineEdit);
+
+    filterSyntaxComboBox = new QComboBox;
+    filterSyntaxComboBox->addItem(tr("Regular expression"), QRegExp::RegExp);
+    filterSyntaxComboBox->addItem(tr("Wildcard"), QRegExp::Wildcard);
+    filterSyntaxComboBox->addItem(tr("Fixed string"), QRegExp::FixedString);
+
+    fromDateEdit = new QDateEdit;
+    fromDateEdit->setDate(QDate(1970, 01, 01));
+    fromLabel = new QLabel(tr("F&rom:"));
+    fromLabel->setBuddy(fromDateEdit);
+
+    toDateEdit = new QDateEdit;
+    toDateEdit->setDate(QDate(2099, 12, 31));
+    toLabel = new QLabel(tr("&To:"));
+    toLabel->setBuddy(toDateEdit);
+
+    connect(filterPatternLineEdit, SIGNAL(textChanged(const QString &)),
+            this, SLOT(textFilterChanged()));
+    connect(filterSyntaxComboBox, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(textFilterChanged()));
+    connect(filterCaseSensitivityCheckBox, SIGNAL(toggled(bool)),
+            this, SLOT(textFilterChanged()));
+    connect(fromDateEdit, SIGNAL(dateChanged(const QDate &)),
+            this, SLOT(dateFilterChanged()));
+    connect(toDateEdit, SIGNAL(dateChanged(const QDate &)),
+//! [3] //! [4]
+            this, SLOT(dateFilterChanged()));
+//! [4]
+
+//! [5]
+    proxyView = new QTreeView;
+    proxyView->setRootIsDecorated(false);
+    proxyView->setAlternatingRowColors(true);
+    proxyView->setModel(proxyModel);
+    proxyView->setSortingEnabled(true);
+    proxyView->sortByColumn(1, Qt::AscendingOrder);
+
+    QGridLayout *proxyLayout = new QGridLayout;
+    proxyLayout->addWidget(proxyView, 0, 0, 1, 3);
+    proxyLayout->addWidget(filterPatternLabel, 1, 0);
+    proxyLayout->addWidget(filterPatternLineEdit, 1, 1);
+    proxyLayout->addWidget(filterSyntaxComboBox, 1, 2);
+    proxyLayout->addWidget(filterCaseSensitivityCheckBox, 2, 0, 1, 3);
+    proxyLayout->addWidget(fromLabel, 3, 0);
+    proxyLayout->addWidget(fromDateEdit, 3, 1, 1, 2);
+    proxyLayout->addWidget(toLabel, 4, 0);
+    proxyLayout->addWidget(toDateEdit, 4, 1, 1, 2);
+
+    proxyGroupBox = new QGroupBox(tr("Sorted/Filtered Model"));
+    proxyGroupBox->setLayout(proxyLayout);
+//! [5]
+
+//! [6]
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(sourceGroupBox);
+    mainLayout->addWidget(proxyGroupBox);
+    setLayout(mainLayout);
+
+    setWindowTitle(tr("Custom Sort/Filter Model"));
+    resize(500, 450);
+}
+//! [6]
+
+//! [7]
+void Window::setSourceModel(QAbstractItemModel *model)
+{
+    proxyModel->setSourceModel(model);
+    sourceView->setModel(model);
+}
+//! [7]
+
+//! [8]
+void Window::textFilterChanged()
+{
+    QRegExp::PatternSyntax syntax =
+            QRegExp::PatternSyntax(filterSyntaxComboBox->itemData(
+                    filterSyntaxComboBox->currentIndex()).toInt());
+    Qt::CaseSensitivity caseSensitivity =
+            filterCaseSensitivityCheckBox->isChecked() ? Qt::CaseSensitive
+                                                       : Qt::CaseInsensitive;
+
+    QRegExp regExp(filterPatternLineEdit->text(), caseSensitivity, syntax);
+    proxyModel->setFilterRegExp(regExp);
+}
+//! [8]
+
+//! [9]
+void Window::dateFilterChanged()
+{
+    proxyModel->setFilterMinimumDate(fromDateEdit->date());
+    proxyModel->setFilterMaximumDate(toDateEdit->date());
+}
+//! [9]
diff --git a/examples/itemviews/customsortfiltermodel/window.h b/examples/itemviews/customsortfiltermodel/window.h
new file mode 100644
index 0000000000..ba97408f1a
--- /dev/null
+++ b/examples/itemviews/customsortfiltermodel/window.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QAbstractItemModel;
+class QCheckBox;
+class QComboBox;
+class QDateEdit;
+class QGroupBox;
+class QLabel;
+class QLineEdit;
+class QTreeView;
+QT_END_NAMESPACE
+class MySortFilterProxyModel;
+
+//! [0]
+class Window : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Window();
+
+    void setSourceModel(QAbstractItemModel *model);
+
+private slots:
+    void textFilterChanged();
+    void dateFilterChanged();
+
+private:
+    MySortFilterProxyModel *proxyModel;
+
+    QGroupBox *sourceGroupBox;
+    QGroupBox *proxyGroupBox;
+    QTreeView *sourceView;
+    QTreeView *proxyView;
+    QCheckBox *filterCaseSensitivityCheckBox;
+    QLabel *filterPatternLabel;
+    QLabel *fromLabel;
+    QLabel *toLabel;
+    QLineEdit *filterPatternLineEdit;
+    QComboBox *filterSyntaxComboBox;
+    QDateEdit *fromDateEdit;
+    QDateEdit *toDateEdit;
+};
+//! [0]
+
+#endif
diff --git a/examples/itemviews/dirview/dirview.pro b/examples/itemviews/dirview/dirview.pro
new file mode 100644
index 0000000000..5865d3ca85
--- /dev/null
+++ b/examples/itemviews/dirview/dirview.pro
@@ -0,0 +1,7 @@
+SOURCES       = main.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/dirview
+sources.files = $$SOURCES *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/dirview
+INSTALLS += target sources
diff --git a/examples/itemviews/dirview/main.cpp b/examples/itemviews/dirview/main.cpp
new file mode 100644
index 0000000000..65d2ecc07b
--- /dev/null
+++ b/examples/itemviews/dirview/main.cpp
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QDirModel model;
+    QTreeView tree;
+    tree.setModel(&model);
+
+    // Demonstrating look and feel features
+    tree.setAnimated(false);
+    tree.setIndentation(20);
+    tree.setSortingEnabled(true);
+
+    tree.setWindowTitle(QObject::tr("Dir View"));
+    tree.resize(640, 480);
+    tree.show();
+
+    return app.exec();
+}
diff --git a/examples/itemviews/editabletreemodel/default.txt b/examples/itemviews/editabletreemodel/default.txt
new file mode 100644
index 0000000000..2b2fb579ae
--- /dev/null
+++ b/examples/itemviews/editabletreemodel/default.txt
@@ -0,0 +1,40 @@
+Getting Started				How to familiarize yourself with Qt Designer
+    Launching Designer			Running the Qt Designer application
+    The User Interface			How to interact with Qt Designer
+
+Designing a Component			Creating a GUI for your application
+    Creating a Dialog			How to create a dialog
+    Composing the Dialog		Putting widgets into the dialog example
+    Creating a Layout			Arranging widgets on a form
+    Signal and Slot Connections		Making widget communicate with each other
+
+Using a Component in Your Application	Generating code from forms
+    The Direct Approach			Using a form without any adjustments
+    The Single Inheritance Approach	Subclassing a form's base class
+    The Multiple Inheritance Approach	Subclassing the form itself
+    Automatic Connections		Connecting widgets using a naming scheme
+        A Dialog Without Auto-Connect	How to connect widgets without a naming scheme
+        A Dialog With Auto-Connect	Using automatic connections
+
+Form Editing Mode			How to edit a form in Qt Designer
+    Managing Forms			Loading and saving forms
+    Editing a Form			Basic editing techniques
+    The Property Editor			Changing widget properties
+    The Object Inspector		Examining the hierarchy of objects on a form
+    Layouts				Objects that arrange widgets on a form
+        Applying and Breaking Layouts	Managing widgets in layouts 
+        Horizontal and Vertical Layouts	Standard row and column layouts
+        The Grid Layout			Arranging widgets in a matrix
+    Previewing Forms			Checking that the design works
+
+Using Containers			How to group widgets together
+    General Features			Common container features
+    Frames				QFrame
+    Group Boxes				QGroupBox
+    Stacked Widgets			QStackedWidget
+    Tab Widgets				QTabWidget
+    Toolbox Widgets			QToolBox
+
+Connection Editing Mode			Connecting widgets together with signals and slots
+    Connecting Objects			Making connections in Qt Designer
+    Editing Connections			Changing existing connections
diff --git a/examples/itemviews/editabletreemodel/editabletreemodel.pro b/examples/itemviews/editabletreemodel/editabletreemodel.pro
new file mode 100644
index 0000000000..2b7b7def8c
--- /dev/null
+++ b/examples/itemviews/editabletreemodel/editabletreemodel.pro
@@ -0,0 +1,16 @@
+FORMS       = mainwindow.ui
+HEADERS     = mainwindow.h \
+              treeitem.h \
+              treemodel.h
+RESOURCES   = editabletreemodel.qrc
+SOURCES     = mainwindow.cpp \
+              treeitem.cpp \
+              treemodel.cpp \
+              main.cpp
+CONFIG  += qt
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/editabletreemodel
+sources.files = $$FORMS $$HEADERS $$RESOURCES $$SOURCES *.pro *.txt
+sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/editabletreemodel
+INSTALLS += target sources
diff --git a/examples/itemviews/editabletreemodel/editabletreemodel.qrc b/examples/itemviews/editabletreemodel/editabletreemodel.qrc
new file mode 100644
index 0000000000..2fb48f2e62
--- /dev/null
+++ b/examples/itemviews/editabletreemodel/editabletreemodel.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/" >
+        <file>default.txt</file>
+    </qresource>
+</RCC>
diff --git a/examples/itemviews/editabletreemodel/main.cpp b/examples/itemviews/editabletreemodel/main.cpp
new file mode 100644
index 0000000000..e476d2e229
--- /dev/null
+++ b/examples/itemviews/editabletreemodel/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(editabletreemodel);
+
+    QApplication app(argc, argv);
+    MainWindow window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/itemviews/editabletreemodel/mainwindow.cpp b/examples/itemviews/editabletreemodel/mainwindow.cpp
new file mode 100644
index 0000000000..f81b2febe2
--- /dev/null
+++ b/examples/itemviews/editabletreemodel/mainwindow.cpp
@@ -0,0 +1,181 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+#include "treemodel.h"
+
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent)
+{
+    setupUi(this);
+
+    QStringList headers;
+    headers << tr("Title") << tr("Description");
+
+    QFile file(":/default.txt");
+    file.open(QIODevice::ReadOnly);
+    TreeModel *model = new TreeModel(headers, file.readAll());
+    file.close();
+
+    view->setModel(model);
+    for (int column = 0; column < model->columnCount(); ++column)
+        view->resizeColumnToContents(column);
+
+    connect(exitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+
+    connect(view->selectionModel(),
+            SIGNAL(selectionChanged(const QItemSelection &,
+                                    const QItemSelection &)),
+            this, SLOT(updateActions()));
+
+    connect(actionsMenu, SIGNAL(aboutToShow()), this, SLOT(updateActions()));
+    connect(insertRowAction, SIGNAL(triggered()), this, SLOT(insertRow()));
+    connect(insertColumnAction, SIGNAL(triggered()), this, SLOT(insertColumn()));
+    connect(removeRowAction, SIGNAL(triggered()), this, SLOT(removeRow()));
+    connect(removeColumnAction, SIGNAL(triggered()), this, SLOT(removeColumn()));
+    connect(insertChildAction, SIGNAL(triggered()), this, SLOT(insertChild()));
+
+    updateActions();
+}
+
+void MainWindow::insertChild()
+{
+    QModelIndex index = view->selectionModel()->currentIndex();
+    QAbstractItemModel *model = view->model();
+
+    if (model->columnCount(index) == 0) {
+        if (!model->insertColumn(0, index))
+            return;
+    }
+
+    if (!model->insertRow(0, index))
+        return;
+
+    for (int column = 0; column < model->columnCount(index); ++column) {
+        QModelIndex child = model->index(0, column, index);
+        model->setData(child, QVariant("[No data]"), Qt::EditRole);
+        if (!model->headerData(column, Qt::Horizontal).isValid())
+            model->setHeaderData(column, Qt::Horizontal, QVariant("[No header]"),
+                                 Qt::EditRole);
+    }
+
+    view->selectionModel()->setCurrentIndex(model->index(0, 0, index),
+                                            QItemSelectionModel::ClearAndSelect);
+    updateActions();
+}
+
+bool MainWindow::insertColumn(const QModelIndex &parent)
+{
+    QAbstractItemModel *model = view->model();
+    int column = view->selectionModel()->currentIndex().column();
+
+    // Insert a column in the parent item.
+    bool changed = model->insertColumn(column + 1, parent);
+    if (changed)
+        model->setHeaderData(column + 1, Qt::Horizontal, QVariant("[No header]"),
+                             Qt::EditRole);
+
+    updateActions();
+
+    return changed;
+}
+
+void MainWindow::insertRow()
+{
+    QModelIndex index = view->selectionModel()->currentIndex();
+    QAbstractItemModel *model = view->model();
+
+    if (!model->insertRow(index.row()+1, index.parent()))
+        return;
+
+    updateActions();
+
+    for (int column = 0; column < model->columnCount(index.parent()); ++column) {
+        QModelIndex child = model->index(index.row()+1, column, index.parent());
+        model->setData(child, QVariant("[No data]"), Qt::EditRole);
+    }
+}
+
+bool MainWindow::removeColumn(const QModelIndex &parent)
+{
+    QAbstractItemModel *model = view->model();
+    int column = view->selectionModel()->currentIndex().column();
+
+    // Insert columns in each child of the parent item.
+    bool changed = model->removeColumn(column, parent);
+
+    if (!parent.isValid() && changed)
+        updateActions();
+
+    return changed;
+}
+
+void MainWindow::removeRow()
+{
+    QModelIndex index = view->selectionModel()->currentIndex();
+    QAbstractItemModel *model = view->model();
+    if (model->removeRow(index.row(), index.parent()))
+        updateActions();
+}
+
+void MainWindow::updateActions()
+{
+    bool hasSelection = !view->selectionModel()->selection().isEmpty();
+    removeRowAction->setEnabled(hasSelection);
+    removeColumnAction->setEnabled(hasSelection);
+
+    bool hasCurrent = view->selectionModel()->currentIndex().isValid();
+    insertRowAction->setEnabled(hasCurrent);
+    insertColumnAction->setEnabled(hasCurrent);
+
+    if (hasCurrent) {
+        view->closePersistentEditor(view->selectionModel()->currentIndex());
+
+        int row = view->selectionModel()->currentIndex().row();
+        int column = view->selectionModel()->currentIndex().column();
+        if (view->selectionModel()->currentIndex().parent().isValid())
+            statusBar()->showMessage(tr("Position: (%1,%2)").arg(row).arg(column));
+        else
+            statusBar()->showMessage(tr("Position: (%1,%2) in top level").arg(row).arg(column));
+    }
+}
diff --git a/examples/itemviews/editabletreemodel/mainwindow.h b/examples/itemviews/editabletreemodel/mainwindow.h
new file mode 100644
index 0000000000..6de08b693b
--- /dev/null
+++ b/examples/itemviews/editabletreemodel/mainwindow.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include <QModelIndex>
+
+#include "ui_mainwindow.h"
+
+class QAction;
+class QTreeView;
+class QWidget;
+
+class MainWindow : public QMainWindow, private Ui::MainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow(QWidget *parent = 0);
+
+public slots:
+    void updateActions();
+
+private slots:
+    void insertChild();
+    bool insertColumn(const QModelIndex &parent = QModelIndex());
+    void insertRow();
+    bool removeColumn(const QModelIndex &parent = QModelIndex());
+    void removeRow();
+};
+
+#endif
diff --git a/examples/itemviews/editabletreemodel/mainwindow.ui b/examples/itemviews/editabletreemodel/mainwindow.ui
new file mode 100644
index 0000000000..2ad084ae24
--- /dev/null
+++ b/examples/itemviews/editabletreemodel/mainwindow.ui
@@ -0,0 +1,128 @@
+<ui version="4.0" >
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>573</width>
+    <height>468</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Editable Tree Model</string>
+  </property>
+  <widget class="QWidget" name="centralwidget" >
+   <layout class="QVBoxLayout" >
+    <property name="margin" >
+     <number>0</number>
+    </property>
+    <property name="spacing" >
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="QTreeView" name="view" >
+      <property name="alternatingRowColors" >
+       <bool>true</bool>
+      </property>
+      <property name="selectionBehavior" >
+       <enum>QAbstractItemView::SelectItems</enum>
+      </property>
+      <property name="horizontalScrollMode" >
+       <enum>QAbstractItemView::ScrollPerPixel</enum>
+      </property>
+      <property name="animated" >
+       <bool>false</bool>
+      </property>
+      <property name="allColumnsShowFocus" >
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menubar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>573</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="fileMenu" >
+    <property name="title" >
+     <string>&amp;File</string>
+    </property>
+    <addaction name="exitAction" />
+   </widget>
+   <widget class="QMenu" name="actionsMenu" >
+    <property name="title" >
+     <string>&amp;Actions</string>
+    </property>
+    <addaction name="insertRowAction" />
+    <addaction name="insertColumnAction" />
+    <addaction name="separator" />
+    <addaction name="removeRowAction" />
+    <addaction name="removeColumnAction" />
+    <addaction name="separator" />
+    <addaction name="insertChildAction" />
+   </widget>
+   <addaction name="fileMenu" />
+   <addaction name="actionsMenu" />
+  </widget>
+  <widget class="QStatusBar" name="statusbar" />
+  <action name="exitAction" >
+   <property name="text" >
+    <string>E&amp;xit</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+Q</string>
+   </property>
+  </action>
+  <action name="insertRowAction" >
+   <property name="text" >
+    <string>Insert Row</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+I, R</string>
+   </property>
+  </action>
+  <action name="removeRowAction" >
+   <property name="text" >
+    <string>Remove Row</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+R, R</string>
+   </property>
+  </action>
+  <action name="insertColumnAction" >
+   <property name="text" >
+    <string>Insert Column</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+I, C</string>
+   </property>
+  </action>
+  <action name="removeColumnAction" >
+   <property name="text" >
+    <string>Remove Column</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+R, C</string>
+   </property>
+  </action>
+  <action name="insertChildAction" >
+   <property name="text" >
+    <string>Insert Child</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+N</string>
+   </property>
+  </action>
+ </widget>
+ <resources>
+  <include location="editabletreemodel.qrc" />
+ </resources>
+ <connections/>
+</ui>
diff --git a/examples/itemviews/editabletreemodel/treeitem.cpp b/examples/itemviews/editabletreemodel/treeitem.cpp
new file mode 100644
index 0000000000..81a1bf3ddb
--- /dev/null
+++ b/examples/itemviews/editabletreemodel/treeitem.cpp
@@ -0,0 +1,180 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+    treeitem.cpp
+
+    A container for items of data supplied by the simple tree model.
+*/
+
+#include <QStringList>
+
+#include "treeitem.h"
+
+//! [0]
+TreeItem::TreeItem(const QVector<QVariant> &data, TreeItem *parent)
+{
+    parentItem = parent;
+    itemData = data;
+}
+//! [0]
+
+//! [1]
+TreeItem::~TreeItem()
+{
+    qDeleteAll(childItems);
+}
+//! [1]
+
+//! [2]
+TreeItem *TreeItem::child(int number)
+{
+    return childItems.value(number);
+}
+//! [2]
+
+//! [3]
+int TreeItem::childCount() const
+{
+    return childItems.count();
+}
+//! [3]
+
+//! [4]
+int TreeItem::childNumber() const
+{
+    if (parentItem)
+        return parentItem->childItems.indexOf(const_cast<TreeItem*>(this));
+
+    return 0;
+}
+//! [4]
+
+//! [5]
+int TreeItem::columnCount() const
+{
+    return itemData.count();
+}
+//! [5]
+
+//! [6]
+QVariant TreeItem::data(int column) const
+{
+    return itemData.value(column);
+}
+//! [6]
+
+//! [7]
+bool TreeItem::insertChildren(int position, int count, int columns)
+{
+    if (position < 0 || position > childItems.size())
+        return false;
+
+    for (int row = 0; row < count; ++row) {
+        QVector<QVariant> data(columns);
+        TreeItem *item = new TreeItem(data, this);
+        childItems.insert(position, item);
+    }
+
+    return true;
+}
+//! [7]
+
+//! [8]
+bool TreeItem::insertColumns(int position, int columns)
+{
+    if (position < 0 || position > itemData.size())
+        return false;
+
+    for (int column = 0; column < columns; ++column)
+        itemData.insert(position, QVariant());
+
+    foreach (TreeItem *child, childItems)
+        child->insertColumns(position, columns);
+
+    return true;
+}
+//! [8]
+
+//! [9]
+TreeItem *TreeItem::parent()
+{
+    return parentItem;
+}
+//! [9]
+
+//! [10]
+bool TreeItem::removeChildren(int position, int count)
+{
+    if (position < 0 || position + count > childItems.size())
+        return false;
+
+    for (int row = 0; row < count; ++row)
+        delete childItems.takeAt(position);
+
+    return true;
+}
+//! [10]
+
+bool TreeItem::removeColumns(int position, int columns)
+{
+    if (position < 0 || position + columns > itemData.size())
+        return false;
+
+    for (int column = 0; column < columns; ++column)
+        itemData.remove(position);
+
+    foreach (TreeItem *child, childItems)
+        child->removeColumns(position, columns);
+
+    return true;
+}
+
+//! [11]
+bool TreeItem::setData(int column, const QVariant &value)
+{
+    if (column < 0 || column >= itemData.size())
+        return false;
+
+    itemData[column] = value;
+    return true;
+}
+//! [11]
diff --git a/examples/itemviews/editabletreemodel/treeitem.h b/examples/itemviews/editabletreemodel/treeitem.h
new file mode 100644
index 0000000000..9a3652991e
--- /dev/null
+++ b/examples/itemviews/editabletreemodel/treeitem.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TREEITEM_H
+#define TREEITEM_H
+
+#include <QList>
+#include <QVariant>
+#include <QVector>
+
+//! [0]
+class TreeItem
+{
+public:
+    TreeItem(const QVector<QVariant> &data, TreeItem *parent = 0);
+    ~TreeItem();
+
+    TreeItem *child(int number);
+    int childCount() const;
+    int columnCount() const;
+    QVariant data(int column) const;
+    bool insertChildren(int position, int count, int columns);
+    bool insertColumns(int position, int columns);
+    TreeItem *parent();
+    bool removeChildren(int position, int count);
+    bool removeColumns(int position, int columns);
+    int childNumber() const;
+    bool setData(int column, const QVariant &value);
+
+private:
+    QList<TreeItem*> childItems;
+    QVector<QVariant> itemData;
+    TreeItem *parentItem;
+};
+//! [0]
+
+#endif
diff --git a/examples/itemviews/editabletreemodel/treemodel.cpp b/examples/itemviews/editabletreemodel/treemodel.cpp
new file mode 100644
index 0000000000..f1dff0344a
--- /dev/null
+++ b/examples/itemviews/editabletreemodel/treemodel.cpp
@@ -0,0 +1,289 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "treeitem.h"
+#include "treemodel.h"
+
+//! [0]
+TreeModel::TreeModel(const QStringList &headers, const QString &data,
+                     QObject *parent)
+    : QAbstractItemModel(parent)
+{
+    QVector<QVariant> rootData;
+    foreach (QString header, headers)
+        rootData << header;
+
+    rootItem = new TreeItem(rootData);
+    setupModelData(data.split(QString("\n")), rootItem);
+}
+//! [0]
+
+//! [1]
+TreeModel::~TreeModel()
+{
+    delete rootItem;
+}
+//! [1]
+
+//! [2]
+int TreeModel::columnCount(const QModelIndex & /* parent */) const
+{
+    return rootItem->columnCount();
+}
+//! [2]
+
+QVariant TreeModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+
+    if (role != Qt::DisplayRole && role != Qt::EditRole)
+        return QVariant();
+
+    TreeItem *item = getItem(index);
+
+    return item->data(index.column());
+}
+
+//! [3]
+Qt::ItemFlags TreeModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return 0;
+
+    return Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+}
+//! [3]
+
+//! [4]
+TreeItem *TreeModel::getItem(const QModelIndex &index) const
+{
+    if (index.isValid()) {
+        TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
+        if (item) return item;
+    }
+    return rootItem;
+}
+//! [4]
+
+QVariant TreeModel::headerData(int section, Qt::Orientation orientation,
+                               int role) const
+{
+    if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
+        return rootItem->data(section);
+
+    return QVariant();
+}
+
+//! [5]
+QModelIndex TreeModel::index(int row, int column, const QModelIndex &parent) const
+{
+    if (parent.isValid() && parent.column() != 0)
+        return QModelIndex();
+//! [5]
+
+//! [6]
+    TreeItem *parentItem = getItem(parent);
+
+    TreeItem *childItem = parentItem->child(row);
+    if (childItem)
+        return createIndex(row, column, childItem);
+    else
+        return QModelIndex();
+}
+//! [6]
+
+bool TreeModel::insertColumns(int position, int columns, const QModelIndex &parent)
+{
+    bool success;
+
+    beginInsertColumns(parent, position, position + columns - 1);
+    success = rootItem->insertColumns(position, columns);
+    endInsertColumns();
+
+    return success;
+}
+
+bool TreeModel::insertRows(int position, int rows, const QModelIndex &parent)
+{
+    TreeItem *parentItem = getItem(parent);
+    bool success;
+
+    beginInsertRows(parent, position, position + rows - 1);
+    success = parentItem->insertChildren(position, rows, rootItem->columnCount());
+    endInsertRows();
+
+    return success;
+}
+
+//! [7]
+QModelIndex TreeModel::parent(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return QModelIndex();
+
+    TreeItem *childItem = getItem(index);
+    TreeItem *parentItem = childItem->parent();
+
+    if (parentItem == rootItem)
+        return QModelIndex();
+
+    return createIndex(parentItem->childNumber(), 0, parentItem);
+}
+//! [7]
+
+bool TreeModel::removeColumns(int position, int columns, const QModelIndex &parent)
+{
+    bool success;
+
+    beginRemoveColumns(parent, position, position + columns - 1);
+    success = rootItem->removeColumns(position, columns);
+    endRemoveColumns();
+
+    if (rootItem->columnCount() == 0)
+        removeRows(0, rowCount());
+
+    return success;
+}
+
+bool TreeModel::removeRows(int position, int rows, const QModelIndex &parent)
+{
+    TreeItem *parentItem = getItem(parent);
+    bool success = true;
+
+    beginRemoveRows(parent, position, position + rows - 1);
+    success = parentItem->removeChildren(position, rows);
+    endRemoveRows();
+
+    return success;
+}
+
+//! [8]
+int TreeModel::rowCount(const QModelIndex &parent) const
+{
+    TreeItem *parentItem = getItem(parent);
+
+    return parentItem->childCount();
+}
+//! [8]
+
+bool TreeModel::setData(const QModelIndex &index, const QVariant &value,
+                        int role)
+{
+    if (role != Qt::EditRole)
+        return false;
+
+    TreeItem *item = getItem(index);
+    bool result = item->setData(index.column(), value);
+
+    if (result)
+        emit dataChanged(index, index);
+
+    return result;
+}
+
+bool TreeModel::setHeaderData(int section, Qt::Orientation orientation,
+                              const QVariant &value, int role)
+{
+    if (role != Qt::EditRole || orientation != Qt::Horizontal)
+        return false;
+
+    bool result = rootItem->setData(section, value);
+
+    if (result)
+        emit headerDataChanged(orientation, section, section);
+
+    return result;
+}
+
+void TreeModel::setupModelData(const QStringList &lines, TreeItem *parent)
+{
+    QList<TreeItem*> parents;
+    QList<int> indentations;
+    parents << parent;
+    indentations << 0;
+
+    int number = 0;
+
+    while (number < lines.count()) {
+        int position = 0;
+        while (position < lines[number].length()) {
+            if (lines[number].mid(position, 1) != " ")
+                break;
+            position++;
+        }
+
+        QString lineData = lines[number].mid(position).trimmed();
+
+        if (!lineData.isEmpty()) {
+            // Read the column data from the rest of the line.
+            QStringList columnStrings = lineData.split("\t", QString::SkipEmptyParts);
+            QVector<QVariant> columnData;
+            for (int column = 0; column < columnStrings.count(); ++column)
+                columnData << columnStrings[column];
+
+            if (position > indentations.last()) {
+                // The last child of the current parent is now the new parent
+                // unless the current parent has no children.
+
+                if (parents.last()->childCount() > 0) {
+                    parents << parents.last()->child(parents.last()->childCount()-1);
+                    indentations << position;
+                }
+            } else {
+                while (position < indentations.last() && parents.count() > 0) {
+                    parents.pop_back();
+                    indentations.pop_back();
+                }
+            }
+
+            // Append a new item to the current parent's list of children.
+            TreeItem *parent = parents.last();
+            parent->insertChildren(parent->childCount(), 1, rootItem->columnCount());
+            for (int column = 0; column < columnData.size(); ++column)
+                parent->child(parent->childCount() - 1)->setData(column, columnData[column]);
+        }
+
+        number++;
+    }
+}
diff --git a/examples/itemviews/editabletreemodel/treemodel.h b/examples/itemviews/editabletreemodel/treemodel.h
new file mode 100644
index 0000000000..36ae7396b1
--- /dev/null
+++ b/examples/itemviews/editabletreemodel/treemodel.h
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TREEMODEL_H
+#define TREEMODEL_H
+
+#include <QAbstractItemModel>
+#include <QModelIndex>
+#include <QVariant>
+
+class TreeItem;
+
+//! [0]
+class TreeModel : public QAbstractItemModel
+{
+    Q_OBJECT
+
+public:
+    TreeModel(const QStringList &headers, const QString &data,
+              QObject *parent = 0);
+    ~TreeModel();
+//! [0] //! [1]
+
+    QVariant data(const QModelIndex &index, int role) const;
+    QVariant headerData(int section, Qt::Orientation orientation,
+                        int role = Qt::DisplayRole) const;
+
+    QModelIndex index(int row, int column,
+                      const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex parent(const QModelIndex &index) const;
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+//! [1]
+
+//! [2]
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+    bool setData(const QModelIndex &index, const QVariant &value,
+                 int role = Qt::EditRole);
+    bool setHeaderData(int section, Qt::Orientation orientation,
+                       const QVariant &value, int role = Qt::EditRole);
+
+    bool insertColumns(int position, int columns,
+                       const QModelIndex &parent = QModelIndex());
+    bool removeColumns(int position, int columns,
+                       const QModelIndex &parent = QModelIndex());
+    bool insertRows(int position, int rows,
+                    const QModelIndex &parent = QModelIndex());
+    bool removeRows(int position, int rows,
+                    const QModelIndex &parent = QModelIndex());
+
+private:
+    void setupModelData(const QStringList &lines, TreeItem *parent);
+    TreeItem *getItem(const QModelIndex &index) const;
+
+    TreeItem *rootItem;
+};
+//! [2]
+
+#endif
diff --git a/examples/itemviews/fetchmore/fetchmore.pro b/examples/itemviews/fetchmore/fetchmore.pro
new file mode 100644
index 0000000000..dcb84ed39d
--- /dev/null
+++ b/examples/itemviews/fetchmore/fetchmore.pro
@@ -0,0 +1,12 @@
+HEADERS   = filelistmodel.h \
+            window.h
+SOURCES   = filelistmodel.cpp \
+            main.cpp \
+            window.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/fetchmore
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/fetchmore
+INSTALLS += target sources
+
diff --git a/examples/itemviews/fetchmore/filelistmodel.cpp b/examples/itemviews/fetchmore/filelistmodel.cpp
new file mode 100644
index 0000000000..fc51087483
--- /dev/null
+++ b/examples/itemviews/fetchmore/filelistmodel.cpp
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "filelistmodel.h"
+#include <QApplication>
+#include <QPalette>
+#include <QBrush>
+#include <QDir>
+
+FileListModel::FileListModel(QObject *parent)
+    : QAbstractListModel(parent)
+{
+}
+
+//![4]
+int FileListModel::rowCount(const QModelIndex & /* parent */) const
+{
+    return fileCount;
+}
+
+QVariant FileListModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+    
+    if (index.row() >= fileList.size() || index.row() < 0)
+        return QVariant();
+    
+    if (role == Qt::DisplayRole)
+        return fileList.at(index.row());
+    else if (role == Qt::BackgroundRole) {
+        int batch = (index.row() / 100) % 2;
+        if (batch == 0)
+            return qApp->palette().base();
+        else
+            return qApp->palette().alternateBase();
+    }
+    return QVariant();
+}
+//![4]
+
+//![1]
+bool FileListModel::canFetchMore(const QModelIndex & /* index */) const
+{
+    if (fileCount < fileList.size())
+        return true;
+    else
+        return false;
+}
+//![1]
+
+//![2]
+void FileListModel::fetchMore(const QModelIndex & /* index */)
+{
+    int remainder = fileList.size() - fileCount;
+    int itemsToFetch = qMin(100, remainder);
+
+    beginInsertRows(QModelIndex(), fileCount, fileCount+itemsToFetch);
+    
+    fileCount += itemsToFetch;
+
+    endInsertRows();
+
+    emit numberPopulated(itemsToFetch);
+}
+//![2]
+
+//![0]
+void FileListModel::setDirPath(const QString &path)
+{
+    QDir dir(path);
+
+    fileList = dir.entryList();
+    fileCount = 0;
+    reset();
+}
+//![0]
+
diff --git a/examples/itemviews/fetchmore/filelistmodel.h b/examples/itemviews/fetchmore/filelistmodel.h
new file mode 100644
index 0000000000..921a9e2e69
--- /dev/null
+++ b/examples/itemviews/fetchmore/filelistmodel.h
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef FILELISTMODEL_H
+#define FILELISTMODEL_H
+
+#include <QAbstractListModel>
+#include <QList>
+#include <QStringList>
+
+//![0]
+class FileListModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    FileListModel(QObject *parent = 0);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+
+signals:
+    void numberPopulated(int number);
+
+public slots:
+    void setDirPath(const QString &path);
+
+protected:
+    bool canFetchMore(const QModelIndex &parent) const;
+    void fetchMore(const QModelIndex &parent);
+
+private:
+    QStringList fileList;
+    int fileCount;
+};
+//![0]
+
+#endif
diff --git a/examples/itemviews/fetchmore/main.cpp b/examples/itemviews/fetchmore/main.cpp
new file mode 100644
index 0000000000..58c970581e
--- /dev/null
+++ b/examples/itemviews/fetchmore/main.cpp
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include "window.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Window window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/itemviews/fetchmore/window.cpp b/examples/itemviews/fetchmore/window.cpp
new file mode 100644
index 0000000000..066f26be85
--- /dev/null
+++ b/examples/itemviews/fetchmore/window.cpp
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "filelistmodel.h"
+#include "window.h"
+
+Window::Window(QWidget *parent)
+    : QWidget(parent)
+{
+    FileListModel *model = new FileListModel(this);
+    model->setDirPath(QLibraryInfo::location(QLibraryInfo::PrefixPath));
+
+    QLabel *label = new QLabel(tr("&Directory:"));
+    QLineEdit *lineEdit = new QLineEdit;
+    label->setBuddy(lineEdit);
+
+    QListView *view = new QListView;
+    view->setModel(model);
+
+    logViewer = new QTextBrowser;
+    logViewer->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
+
+    connect(lineEdit, SIGNAL(textChanged(const QString &)),
+            model, SLOT(setDirPath(const QString &)));
+    connect(lineEdit, SIGNAL(textChanged(const QString &)),
+            logViewer, SLOT(clear()));
+    connect(model, SIGNAL(numberPopulated(int)),
+            this, SLOT(updateLog(int)));
+    
+    QGridLayout *layout = new QGridLayout;
+    layout->addWidget(label, 0, 0);
+    layout->addWidget(lineEdit, 0, 1);
+    layout->addWidget(view, 1, 0, 1, 2);
+    layout->addWidget(logViewer, 2, 0, 1, 2);
+
+    setLayout(layout);
+    setWindowTitle(tr("Fetch More Example"));
+}
+
+void Window::updateLog(int number)
+{
+    logViewer->append(tr("%1 items added.").arg(number));
+}
diff --git a/examples/itemviews/fetchmore/window.h b/examples/itemviews/fetchmore/window.h
new file mode 100644
index 0000000000..1b8076fd08
--- /dev/null
+++ b/examples/itemviews/fetchmore/window.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QTextBrowser;
+QT_END_NAMESPACE
+
+class Window : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Window(QWidget *parent = 0);
+
+public slots:
+    void updateLog(int number);
+
+private:
+    QTextBrowser *logViewer;
+};
+
+#endif
diff --git a/examples/itemviews/itemviews.pro b/examples/itemviews/itemviews.pro
new file mode 100644
index 0000000000..6202bbc1a3
--- /dev/null
+++ b/examples/itemviews/itemviews.pro
@@ -0,0 +1,22 @@
+TEMPLATE      = subdirs
+SUBDIRS       = addressbook \
+                basicsortfiltermodel \
+                chart \
+                coloreditorfactory \
+                combowidgetmapper \
+                customsortfiltermodel \
+                dirview \
+                editabletreemodel \
+                fetchmore \
+                pixelator \
+                puzzle \
+                simpledommodel \
+                simpletreemodel \
+                simplewidgetmapper \
+                spinboxdelegate \
+                stardelegate
+
+# install
+sources.files = README *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews
+INSTALLS += sources
diff --git a/examples/itemviews/pixelator/imagemodel.cpp b/examples/itemviews/pixelator/imagemodel.cpp
new file mode 100644
index 0000000000..ea42b62de1
--- /dev/null
+++ b/examples/itemviews/pixelator/imagemodel.cpp
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "imagemodel.h"
+
+//! [0]
+ImageModel::ImageModel(QObject *parent)
+    : QAbstractTableModel(parent)
+{
+}
+//! [0]
+
+//! [1]
+void ImageModel::setImage(const QImage &image)
+{
+    modelImage = image;
+    reset();
+}
+//! [1]
+
+//! [2]
+int ImageModel::rowCount(const QModelIndex & /* parent */) const
+{
+    return modelImage.height();
+}
+
+int ImageModel::columnCount(const QModelIndex & /* parent */) const
+//! [2] //! [3]
+{
+    return modelImage.width();
+}
+//! [3]
+
+//! [4]
+QVariant ImageModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || role != Qt::DisplayRole)
+        return QVariant();
+    return qGray(modelImage.pixel(index.column(), index.row()));
+}
+//! [4]
+
+//! [5]
+QVariant ImageModel::headerData(int /* section */,
+                                Qt::Orientation /* orientation */,
+                                int role) const
+{
+    if (role == Qt::SizeHintRole)
+        return QSize(1, 1);
+    return QVariant();
+}
+//! [5]
diff --git a/examples/itemviews/pixelator/imagemodel.h b/examples/itemviews/pixelator/imagemodel.h
new file mode 100644
index 0000000000..e92115afaa
--- /dev/null
+++ b/examples/itemviews/pixelator/imagemodel.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef IMAGEMODEL_H
+#define IMAGEMODEL_H
+
+#include <QAbstractTableModel>
+#include <QImage>
+
+//! [0]
+class ImageModel : public QAbstractTableModel
+{
+    Q_OBJECT
+
+public:
+    ImageModel(QObject *parent = 0);
+
+    void setImage(const QImage &image);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+
+private:
+    QImage modelImage;
+};
+//! [0]
+
+#endif
diff --git a/examples/itemviews/pixelator/images.qrc b/examples/itemviews/pixelator/images.qrc
new file mode 100644
index 0000000000..c105e13895
--- /dev/null
+++ b/examples/itemviews/pixelator/images.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+   <file>images/qt.png</file>
+</qresource>
+</RCC>
diff --git a/examples/itemviews/pixelator/images/qt.png b/examples/itemviews/pixelator/images/qt.png
new file mode 100644
index 0000000000..a2c9c77c16
--- /dev/null
+++ b/examples/itemviews/pixelator/images/qt.png
diff --git a/examples/itemviews/pixelator/main.cpp b/examples/itemviews/pixelator/main.cpp
new file mode 100644
index 0000000000..7a303475e0
--- /dev/null
+++ b/examples/itemviews/pixelator/main.cpp
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(images);
+
+    QApplication app(argc, argv);
+    MainWindow window;
+    window.show();
+    window.openImage(":/images/qt.png");
+    return app.exec();
+}
diff --git a/examples/itemviews/pixelator/mainwindow.cpp b/examples/itemviews/pixelator/mainwindow.cpp
new file mode 100644
index 0000000000..a2b98cf63d
--- /dev/null
+++ b/examples/itemviews/pixelator/mainwindow.cpp
@@ -0,0 +1,245 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "imagemodel.h"
+#include "mainwindow.h"
+#include "pixeldelegate.h"
+
+//! [0]
+MainWindow::MainWindow()
+{
+//! [0]
+    currentPath = QDir::homePath();
+    model = new ImageModel(this);
+
+    QWidget *centralWidget = new QWidget;
+
+//! [1]
+    view = new QTableView;
+    view->setShowGrid(false);
+    view->horizontalHeader()->hide();
+    view->verticalHeader()->hide();
+    view->horizontalHeader()->setMinimumSectionSize(1);
+    view->verticalHeader()->setMinimumSectionSize(1);
+    view->setModel(model);
+//! [1]
+
+//! [2]
+    PixelDelegate *delegate = new PixelDelegate(this);
+    view->setItemDelegate(delegate);
+//! [2]
+
+//! [3]
+    QLabel *pixelSizeLabel = new QLabel(tr("Pixel size:"));
+    QSpinBox *pixelSizeSpinBox = new QSpinBox;
+    pixelSizeSpinBox->setMinimum(4);
+    pixelSizeSpinBox->setMaximum(32);
+    pixelSizeSpinBox->setValue(12);
+//! [3]
+
+    QMenu *fileMenu = new QMenu(tr("&File"), this);
+    QAction *openAction = fileMenu->addAction(tr("&Open..."));
+    openAction->setShortcut(QKeySequence(tr("Ctrl+O")));
+
+    printAction = fileMenu->addAction(tr("&Print..."));
+    printAction->setEnabled(false);
+    printAction->setShortcut(QKeySequence(tr("Ctrl+P")));
+
+    QAction *quitAction = fileMenu->addAction(tr("E&xit"));
+    quitAction->setShortcut(QKeySequence(tr("Ctrl+Q")));
+
+    QMenu *helpMenu = new QMenu(tr("&Help"), this);
+    QAction *aboutAction = helpMenu->addAction(tr("&About"));
+
+    menuBar()->addMenu(fileMenu);
+    menuBar()->addSeparator();
+    menuBar()->addMenu(helpMenu);
+
+    connect(openAction, SIGNAL(triggered()), this, SLOT(chooseImage()));
+    connect(printAction, SIGNAL(triggered()), this, SLOT(printImage()));
+    connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+    connect(aboutAction, SIGNAL(triggered()), this, SLOT(showAboutBox()));
+//! [4]
+    connect(pixelSizeSpinBox, SIGNAL(valueChanged(int)),
+            delegate, SLOT(setPixelSize(int)));
+    connect(pixelSizeSpinBox, SIGNAL(valueChanged(int)),
+            this, SLOT(updateView()));
+//! [4]
+
+    QHBoxLayout *controlsLayout = new QHBoxLayout;
+    controlsLayout->addWidget(pixelSizeLabel);
+    controlsLayout->addWidget(pixelSizeSpinBox);
+    controlsLayout->addStretch(1);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(view);
+    mainLayout->addLayout(controlsLayout);
+    centralWidget->setLayout(mainLayout);
+
+    setCentralWidget(centralWidget);
+
+    setWindowTitle(tr("Pixelator"));
+    resize(640, 480);
+//! [5]
+}
+//! [5]
+
+void MainWindow::chooseImage()
+{
+    QString fileName = QFileDialog::getOpenFileName(this,
+        tr("Choose an image"), currentPath, "*");
+
+    if (!fileName.isEmpty())
+        openImage(fileName);
+}
+
+void MainWindow::openImage(const QString &fileName)
+{
+    QImage image;
+
+    if (image.load(fileName)) {
+        model->setImage(image);
+        if (!fileName.startsWith(":/")) {
+            currentPath = fileName;
+            setWindowTitle(tr("%1 - Pixelator").arg(currentPath));
+        }
+
+        printAction->setEnabled(true);
+        updateView();
+    }
+}
+
+void MainWindow::printImage()
+{
+#ifndef QT_NO_PRINTER
+    if (model->rowCount(QModelIndex())*model->columnCount(QModelIndex())
+        > 90000) {
+	    QMessageBox::StandardButton answer;
+	    answer = QMessageBox::question(this, tr("Large Image Size"),
+            tr("The printed image may be very large. Are you sure that "
+               "you want to print it?"),
+            QMessageBox::Yes | QMessageBox::No);
+        if (answer == QMessageBox::No)
+            return;
+    }
+
+    QPrinter printer(QPrinter::HighResolution);
+
+    QPrintDialog *dlg = new QPrintDialog(&printer, this);
+    dlg->setWindowTitle(tr("Print Image"));
+
+    if (dlg->exec() != QDialog::Accepted)
+        return;
+
+    QPainter painter;
+    painter.begin(&printer);
+
+    int rows = model->rowCount(QModelIndex());
+    int columns = model->columnCount(QModelIndex());
+    int sourceWidth = (columns+1) * ItemSize;
+    int sourceHeight = (rows+1) * ItemSize;
+
+    painter.save();
+
+    double xscale = printer.pageRect().width()/double(sourceWidth);
+    double yscale = printer.pageRect().height()/double(sourceHeight);
+    double scale = qMin(xscale, yscale);
+
+    painter.translate(printer.paperRect().x() + printer.pageRect().width()/2,
+                      printer.paperRect().y() + printer.pageRect().height()/2);
+    painter.scale(scale, scale);
+    painter.translate(-sourceWidth/2, -sourceHeight/2);
+
+    QStyleOptionViewItem option;
+    QModelIndex parent = QModelIndex();
+
+    QProgressDialog progress(tr("Printing..."), tr("Cancel"), 0, rows, this);
+    progress.setWindowModality(Qt::ApplicationModal);
+    float y = ItemSize/2;
+
+    for (int row = 0; row < rows; ++row) {
+        progress.setValue(row);
+        qApp->processEvents();
+        if (progress.wasCanceled())
+            break;
+
+        float x = ItemSize/2;
+
+        for (int column = 0; column < columns; ++column) {
+            option.rect = QRect(int(x), int(y), ItemSize, ItemSize);
+            view->itemDelegate()->paint(&painter, option,
+                                        model->index(row, column, parent));
+            x = x + ItemSize;
+        }
+        y = y + ItemSize;
+    }
+    progress.setValue(rows);
+
+    painter.restore();
+    painter.end();
+
+    if (progress.wasCanceled()) {
+        QMessageBox::information(this, tr("Printing canceled"),
+            tr("The printing process was canceled."), QMessageBox::Cancel);
+    }
+#else
+    QMessageBox::information(this, tr("Printing canceled"), 
+        tr("Printing is not supported on this Qt build"), QMessageBox::Cancel);
+#endif
+}
+
+void MainWindow::showAboutBox()
+{
+    QMessageBox::about(this, tr("About the Pixelator example"),
+        tr("This example demonstrates how a standard view and a custom\n"
+           "delegate can be used to produce a specialized representation\n"
+           "of data in a simple custom model."));
+}
+
+//! [6]
+void MainWindow::updateView()
+{
+    view->resizeColumnsToContents();
+    view->resizeRowsToContents();
+}
+//! [6]
diff --git a/examples/itemviews/pixelator/mainwindow.h b/examples/itemviews/pixelator/mainwindow.h
new file mode 100644
index 0000000000..df9510ee58
--- /dev/null
+++ b/examples/itemviews/pixelator/mainwindow.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+
+class ImageModel;
+QT_BEGIN_NAMESPACE
+class QAction;
+class QTableView;
+QT_END_NAMESPACE
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+    void openImage(const QString &fileName);
+
+public slots:
+    void chooseImage();
+    void printImage();
+    void showAboutBox();
+    void updateView();
+
+private:
+    ImageModel *model;
+    QAction *printAction;
+    QString currentPath;
+    QTableView *view;
+};
+
+#endif
diff --git a/examples/itemviews/pixelator/pixelator.pro b/examples/itemviews/pixelator/pixelator.pro
new file mode 100644
index 0000000000..dc052966a7
--- /dev/null
+++ b/examples/itemviews/pixelator/pixelator.pro
@@ -0,0 +1,14 @@
+HEADERS     = imagemodel.h \
+              mainwindow.h \
+              pixeldelegate.h
+SOURCES     = imagemodel.cpp \
+              main.cpp \
+              mainwindow.cpp \
+              pixeldelegate.cpp
+RESOURCES   += images.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/pixelator
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/pixelator
+INSTALLS += target sources
diff --git a/examples/itemviews/pixelator/pixeldelegate.cpp b/examples/itemviews/pixelator/pixeldelegate.cpp
new file mode 100644
index 0000000000..496b3656db
--- /dev/null
+++ b/examples/itemviews/pixelator/pixeldelegate.cpp
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "pixeldelegate.h"
+
+//! [0]
+PixelDelegate::PixelDelegate(QObject *parent)
+    : QAbstractItemDelegate(parent)
+{
+    pixelSize = 12;
+}
+//! [0]
+
+//! [1]
+void PixelDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
+                          const QModelIndex &index) const
+{
+//! [2]
+    if (option.state & QStyle::State_Selected)
+        painter->fillRect(option.rect, option.palette.highlight());
+//! [1]
+
+//! [3]
+    int size = qMin(option.rect.width(), option.rect.height());
+//! [3] //! [4]
+    int brightness = index.model()->data(index, Qt::DisplayRole).toInt();
+    double radius = (size/2.0) - (brightness/255.0 * size/2.0);
+    if (radius == 0.0)
+        return;
+//! [4]
+
+//! [5]
+    painter->save();
+//! [5] //! [6]
+    painter->setRenderHint(QPainter::Antialiasing, true);
+//! [6] //! [7]
+    painter->setPen(Qt::NoPen);
+//! [7] //! [8]
+    if (option.state & QStyle::State_Selected)
+//! [8] //! [9]
+        painter->setBrush(option.palette.highlightedText());
+    else
+//! [2]
+        painter->setBrush(QBrush(Qt::black));
+//! [9]
+
+//! [10]
+    painter->drawEllipse(QRectF(option.rect.x() + option.rect.width()/2 - radius,
+                                option.rect.y() + option.rect.height()/2 - radius,
+                                2*radius, 2*radius));
+    painter->restore();
+}
+//! [10]
+
+//! [11]
+QSize PixelDelegate::sizeHint(const QStyleOptionViewItem & /* option */,
+                              const QModelIndex & /* index */) const
+{
+    return QSize(pixelSize, pixelSize);
+}
+//! [11]
+
+//! [12]
+void PixelDelegate::setPixelSize(int size)
+{
+    pixelSize = size;
+}
+//! [12]
diff --git a/examples/itemviews/pixelator/pixeldelegate.h b/examples/itemviews/pixelator/pixeldelegate.h
new file mode 100644
index 0000000000..b38e470d01
--- /dev/null
+++ b/examples/itemviews/pixelator/pixeldelegate.h
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PIXELDELEGATE_H
+#define PIXELDELEGATE_H
+
+#include <QAbstractItemDelegate>
+#include <QFontMetrics>
+#include <QModelIndex>
+#include <QSize>
+
+QT_BEGIN_NAMESPACE
+class QAbstractItemModel;
+class QObject;
+class QPainter;
+QT_END_NAMESPACE
+
+static const int ItemSize = 256;
+
+//! [0]
+class PixelDelegate : public QAbstractItemDelegate
+{
+    Q_OBJECT
+
+public:
+    PixelDelegate(QObject *parent = 0);
+
+    void paint(QPainter *painter, const QStyleOptionViewItem &option,
+               const QModelIndex &index) const;
+
+    QSize sizeHint(const QStyleOptionViewItem &option,
+                   const QModelIndex &index ) const;
+
+public slots:
+    void setPixelSize(int size);
+
+private:
+    int pixelSize;
+};
+//! [0]
+
+#endif
diff --git a/examples/itemviews/puzzle/example.jpg b/examples/itemviews/puzzle/example.jpg
new file mode 100644
index 0000000000..e09fb70757
--- /dev/null
+++ b/examples/itemviews/puzzle/example.jpg
diff --git a/examples/itemviews/puzzle/main.cpp b/examples/itemviews/puzzle/main.cpp
new file mode 100644
index 0000000000..e0e5cc1907
--- /dev/null
+++ b/examples/itemviews/puzzle/main.cpp
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(puzzle);
+
+    QApplication app(argc, argv);
+    MainWindow window;
+    window.openImage(":/images/example.jpg");
+    window.show();
+    return app.exec();
+}
diff --git a/examples/itemviews/puzzle/mainwindow.cpp b/examples/itemviews/puzzle/mainwindow.cpp
new file mode 100644
index 0000000000..c6088f69db
--- /dev/null
+++ b/examples/itemviews/puzzle/mainwindow.cpp
@@ -0,0 +1,150 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <stdlib.h>
+
+#include "mainwindow.h"
+#include "piecesmodel.h"
+#include "puzzlewidget.h"
+
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent)
+{
+    setupMenus();
+    setupWidgets();
+    model = new PiecesModel(this);
+    piecesList->setModel(model);
+
+    setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+    setWindowTitle(tr("Puzzle"));
+}
+
+void MainWindow::openImage(const QString &path)
+{
+    QString fileName = path;
+
+    if (fileName.isNull())
+        fileName = QFileDialog::getOpenFileName(this,
+            tr("Open Image"), "", tr("Image Files (*.png *.jpg *.bmp)"));
+
+    if (!fileName.isEmpty()) {
+        QPixmap newImage;
+        if (!newImage.load(fileName)) {
+            QMessageBox::warning(this, tr("Open Image"),
+                                 tr("The image file could not be loaded."),
+                                 QMessageBox::Cancel);
+            return;
+        }
+        puzzleImage = newImage;
+        setupPuzzle();
+    }
+}
+
+void MainWindow::setCompleted()
+{
+    QMessageBox::information(this, tr("Puzzle Completed"),
+        tr("Congratulations! You have completed the puzzle!\n"
+           "Click OK to start again."),
+        QMessageBox::Ok);
+
+    setupPuzzle();
+}
+
+void MainWindow::setupPuzzle()
+{
+    int size = qMin(puzzleImage.width(), puzzleImage.height());
+    puzzleImage = puzzleImage.copy((puzzleImage.width() - size)/2,
+        (puzzleImage.height() - size)/2, size, size).scaled(400,
+            400, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+
+    qsrand(QCursor::pos().x() ^ QCursor::pos().y());
+
+    model->addPieces(puzzleImage);
+    puzzleWidget->clear();
+}
+
+void MainWindow::setupMenus()
+{
+    QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
+
+    QAction *openAction = fileMenu->addAction(tr("&Open..."));
+    openAction->setShortcut(QKeySequence(tr("Ctrl+O")));
+
+    QAction *exitAction = fileMenu->addAction(tr("E&xit"));
+    exitAction->setShortcut(QKeySequence(tr("Ctrl+Q")));
+
+    QMenu *gameMenu = menuBar()->addMenu(tr("&Game"));
+
+    QAction *restartAction = gameMenu->addAction(tr("&Restart"));
+
+    connect(openAction, SIGNAL(triggered()), this, SLOT(openImage()));
+    connect(exitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+    connect(restartAction, SIGNAL(triggered()), this, SLOT(setupPuzzle()));
+}
+
+void MainWindow::setupWidgets()
+{
+    QFrame *frame = new QFrame;
+    QHBoxLayout *frameLayout = new QHBoxLayout(frame);
+
+    piecesList = new QListView;
+    piecesList->setDragEnabled(true);
+    piecesList->setViewMode(QListView::IconMode);
+    piecesList->setIconSize(QSize(60, 60));
+    piecesList->setGridSize(QSize(80, 80));
+    piecesList->setSpacing(10);
+    piecesList->setMovement(QListView::Snap);
+    piecesList->setAcceptDrops(true);
+    piecesList->setDropIndicatorShown(true);
+
+    PiecesModel *model = new PiecesModel(this);
+    piecesList->setModel(model);
+
+    puzzleWidget = new PuzzleWidget;
+
+    connect(puzzleWidget, SIGNAL(puzzleCompleted()),
+            this, SLOT(setCompleted()), Qt::QueuedConnection);
+
+    frameLayout->addWidget(piecesList);
+    frameLayout->addWidget(puzzleWidget);
+    setCentralWidget(frame);
+}
diff --git a/examples/itemviews/puzzle/mainwindow.h b/examples/itemviews/puzzle/mainwindow.h
new file mode 100644
index 0000000000..2fb97d4d9a
--- /dev/null
+++ b/examples/itemviews/puzzle/mainwindow.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QPixmap>
+#include <QMainWindow>
+
+class PuzzleWidget;
+class PiecesModel;
+QT_BEGIN_NAMESPACE
+class QListView;
+QT_END_NAMESPACE
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow(QWidget *parent = 0);
+
+public slots:
+    void openImage(const QString &path = QString());
+    void setupPuzzle();
+
+private slots:
+    void setCompleted();
+
+private:
+    void setupMenus();
+    void setupWidgets();
+
+    QPixmap puzzleImage;
+    QListView *piecesList;
+    PuzzleWidget *puzzleWidget;
+    PiecesModel *model;
+};
+
+#endif
diff --git a/examples/itemviews/puzzle/piecesmodel.cpp b/examples/itemviews/puzzle/piecesmodel.cpp
new file mode 100644
index 0000000000..f480837737
--- /dev/null
+++ b/examples/itemviews/puzzle/piecesmodel.cpp
@@ -0,0 +1,204 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "piecesmodel.h"
+
+PiecesModel::PiecesModel(QObject *parent)
+    : QAbstractListModel(parent)
+{
+}
+
+QVariant PiecesModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+
+    if (role == Qt::DecorationRole)
+        return QIcon(pixmaps.value(index.row()).scaled(60, 60,
+                         Qt::KeepAspectRatio, Qt::SmoothTransformation));
+    else if (role == Qt::UserRole)
+        return pixmaps.value(index.row());
+    else if (role == Qt::UserRole + 1)
+        return locations.value(index.row());
+
+    return QVariant();
+}
+
+void PiecesModel::addPiece(const QPixmap &pixmap, const QPoint &location)
+{
+    int row;
+    if (int(2.0*qrand()/(RAND_MAX+1.0)) == 1)
+        row = 0;
+    else
+        row = pixmaps.size();
+
+    beginInsertRows(QModelIndex(), row, row);
+    pixmaps.insert(row, pixmap);
+    locations.insert(row, location);
+    endInsertRows();
+}
+
+Qt::ItemFlags PiecesModel::flags(const QModelIndex &index) const
+{
+    if (index.isValid())
+        return (Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled);
+
+    return Qt::ItemIsDropEnabled;
+}
+
+bool PiecesModel::removeRows(int row, int count, const QModelIndex &parent)
+{
+    if (parent.isValid())
+        return false;
+
+    if (row >= pixmaps.size() || row + count <= 0)
+        return false;
+
+    int beginRow = qMax(0, row);
+    int endRow = qMin(row + count - 1, pixmaps.size() - 1);
+
+    beginRemoveRows(parent, beginRow, endRow);
+
+    while (beginRow <= endRow) {
+        pixmaps.removeAt(beginRow);
+        locations.removeAt(beginRow);
+        ++beginRow;
+    }
+
+    endRemoveRows();
+    return true;
+}
+
+QStringList PiecesModel::mimeTypes() const
+{
+    QStringList types;
+    types << "image/x-puzzle-piece";
+    return types;
+}
+
+QMimeData *PiecesModel::mimeData(const QModelIndexList &indexes) const
+{
+    QMimeData *mimeData = new QMimeData();
+    QByteArray encodedData;
+
+    QDataStream stream(&encodedData, QIODevice::WriteOnly);
+
+    foreach (QModelIndex index, indexes) {
+        if (index.isValid()) {
+            QPixmap pixmap = qVariantValue<QPixmap>(data(index, Qt::UserRole));
+            QPoint location = data(index, Qt::UserRole+1).toPoint();
+            stream << pixmap << location;
+        }
+    }
+
+    mimeData->setData("image/x-puzzle-piece", encodedData);
+    return mimeData;
+}
+
+bool PiecesModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
+                               int row, int column, const QModelIndex &parent)
+{
+    if (!data->hasFormat("image/x-puzzle-piece"))
+        return false;
+
+    if (action == Qt::IgnoreAction)
+        return true;
+
+    if (column > 0)
+        return false;
+
+    int endRow;
+
+    if (!parent.isValid()) {
+        if (row < 0)
+            endRow = pixmaps.size();
+        else
+            endRow = qMin(row, pixmaps.size());
+    } else
+        endRow = parent.row();
+
+    QByteArray encodedData = data->data("image/x-puzzle-piece");
+    QDataStream stream(&encodedData, QIODevice::ReadOnly);
+
+    while (!stream.atEnd()) {
+        QPixmap pixmap;
+        QPoint location;
+        stream >> pixmap >> location;
+
+        beginInsertRows(QModelIndex(), endRow, endRow);
+        pixmaps.insert(endRow, pixmap);
+        locations.insert(endRow, location);
+        endInsertRows();
+
+        ++endRow;
+    }
+
+    return true;
+}
+
+int PiecesModel::rowCount(const QModelIndex &parent) const
+{
+    if (parent.isValid())
+        return 0;
+    else
+        return pixmaps.size();
+}
+
+Qt::DropActions PiecesModel::supportedDropActions() const
+{
+    return Qt::CopyAction | Qt::MoveAction;
+}
+
+void PiecesModel::addPieces(const QPixmap& pixmap)
+{
+    beginRemoveRows(QModelIndex(), 0, 24);
+    pixmaps.clear();
+    locations.clear();
+    endRemoveRows();
+    for (int y = 0; y < 5; ++y) {
+        for (int x = 0; x < 5; ++x) {
+            QPixmap pieceImage = pixmap.copy(x*80, y*80, 80, 80);
+            addPiece(pieceImage, QPoint(x, y));
+        }
+    }
+}
diff --git a/examples/itemviews/puzzle/piecesmodel.h b/examples/itemviews/puzzle/piecesmodel.h
new file mode 100644
index 0000000000..777768aacd
--- /dev/null
+++ b/examples/itemviews/puzzle/piecesmodel.h
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PIECESLIST_H
+#define PIECESLIST_H
+
+#include <QAbstractListModel>
+#include <QList>
+#include <QPixmap>
+#include <QPoint>
+#include <QStringList>
+
+QT_BEGIN_NAMESPACE
+class QMimeData;
+QT_END_NAMESPACE
+
+class PiecesModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    PiecesModel(QObject *parent = 0);
+
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+    bool removeRows(int row, int count, const QModelIndex &parent);
+
+    bool dropMimeData(const QMimeData *data, Qt::DropAction action,
+                      int row, int column, const QModelIndex &parent);
+    QMimeData *mimeData(const QModelIndexList &indexes) const;
+    QStringList mimeTypes() const;
+    int rowCount(const QModelIndex &parent) const;
+    Qt::DropActions supportedDropActions() const;
+
+    void addPiece(const QPixmap &pixmap, const QPoint &location);
+    void addPieces(const QPixmap& pixmap);
+
+private:
+    QList<QPoint> locations;
+    QList<QPixmap> pixmaps;
+};
+
+#endif
diff --git a/examples/itemviews/puzzle/puzzle.pro b/examples/itemviews/puzzle/puzzle.pro
new file mode 100644
index 0000000000..deed112f7d
--- /dev/null
+++ b/examples/itemviews/puzzle/puzzle.pro
@@ -0,0 +1,14 @@
+HEADERS     = mainwindow.h \
+              piecesmodel.h \
+              puzzlewidget.h
+RESOURCES   = puzzle.qrc
+SOURCES     = main.cpp \
+              mainwindow.cpp \
+              piecesmodel.cpp \
+              puzzlewidget.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/puzzle
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg
+sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/puzzle
+INSTALLS += target sources
diff --git a/examples/itemviews/puzzle/puzzle.qrc b/examples/itemviews/puzzle/puzzle.qrc
new file mode 100644
index 0000000000..4076cec026
--- /dev/null
+++ b/examples/itemviews/puzzle/puzzle.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/images">
+   <file>example.jpg</file>
+</qresource>
+</RCC>
diff --git a/examples/itemviews/puzzle/puzzlewidget.cpp b/examples/itemviews/puzzle/puzzlewidget.cpp
new file mode 100644
index 0000000000..aa41ead1db
--- /dev/null
+++ b/examples/itemviews/puzzle/puzzlewidget.cpp
@@ -0,0 +1,205 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "puzzlewidget.h"
+
+PuzzleWidget::PuzzleWidget(QWidget *parent)
+    : QWidget(parent)
+{
+    setAcceptDrops(true);
+    setMinimumSize(400, 400);
+    setMaximumSize(400, 400);
+}
+
+void PuzzleWidget::clear()
+{
+    pieceLocations.clear();
+    piecePixmaps.clear();
+    pieceRects.clear();
+    highlightedRect = QRect();
+    inPlace = 0;
+    update();
+}
+
+void PuzzleWidget::dragEnterEvent(QDragEnterEvent *event)
+{
+    if (event->mimeData()->hasFormat("image/x-puzzle-piece"))
+        event->accept();
+    else
+        event->ignore();
+}
+
+void PuzzleWidget::dragLeaveEvent(QDragLeaveEvent *event)
+{
+    QRect updateRect = highlightedRect;
+    highlightedRect = QRect();
+    update(updateRect);
+    event->accept();
+}
+
+void PuzzleWidget::dragMoveEvent(QDragMoveEvent *event)
+{
+    QRect updateRect = highlightedRect.unite(targetSquare(event->pos()));
+
+    if (event->mimeData()->hasFormat("image/x-puzzle-piece")
+        && findPiece(targetSquare(event->pos())) == -1) {
+
+        highlightedRect = targetSquare(event->pos());
+        event->setDropAction(Qt::MoveAction);
+        event->accept();
+    } else {
+        highlightedRect = QRect();
+        event->ignore();
+    }
+
+    update(updateRect);
+}
+
+void PuzzleWidget::dropEvent(QDropEvent *event)
+{
+    if (event->mimeData()->hasFormat("image/x-puzzle-piece")
+        && findPiece(targetSquare(event->pos())) == -1) {
+
+        QByteArray pieceData = event->mimeData()->data("image/x-puzzle-piece");
+        QDataStream stream(&pieceData, QIODevice::ReadOnly);
+        QRect square = targetSquare(event->pos());
+        QPixmap pixmap;
+        QPoint location;
+        stream >> pixmap >> location;
+
+        pieceLocations.append(location);
+        piecePixmaps.append(pixmap);
+        pieceRects.append(square);
+
+        highlightedRect = QRect();
+        update(square);
+
+        event->setDropAction(Qt::MoveAction);
+        event->accept();
+
+        if (location == QPoint(square.x()/80, square.y()/80)) {
+            inPlace++;
+            if (inPlace == 25)
+                emit puzzleCompleted();
+        }
+    } else {
+        highlightedRect = QRect();
+        event->ignore();
+    }
+}
+
+int PuzzleWidget::findPiece(const QRect &pieceRect) const
+{
+    for (int i = 0; i < pieceRects.size(); ++i) {
+        if (pieceRect == pieceRects[i]) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+void PuzzleWidget::mousePressEvent(QMouseEvent *event)
+{
+    QRect square = targetSquare(event->pos());
+    int found = findPiece(square);
+
+    if (found == -1)
+        return;
+
+    QPoint location = pieceLocations[found];
+    QPixmap pixmap = piecePixmaps[found];
+    pieceLocations.removeAt(found);
+    piecePixmaps.removeAt(found);
+    pieceRects.removeAt(found);
+
+    if (location == QPoint(square.x()/80, square.y()/80))
+        inPlace--;
+
+    update(square);
+
+    QByteArray itemData;
+    QDataStream dataStream(&itemData, QIODevice::WriteOnly);
+
+    dataStream << pixmap << location;
+
+    QMimeData *mimeData = new QMimeData;
+    mimeData->setData("image/x-puzzle-piece", itemData);
+
+    QDrag *drag = new QDrag(this);
+    drag->setMimeData(mimeData);
+    drag->setHotSpot(event->pos() - square.topLeft());
+    drag->setPixmap(pixmap);
+
+    if (drag->start(Qt::MoveAction) == 0) {
+        pieceLocations.insert(found, location);
+        piecePixmaps.insert(found, pixmap);
+        pieceRects.insert(found, square);
+        update(targetSquare(event->pos()));
+
+        if (location == QPoint(square.x()/80, square.y()/80))
+            inPlace++;
+    }
+}
+
+void PuzzleWidget::paintEvent(QPaintEvent *event)
+{
+    QPainter painter;
+    painter.begin(this);
+    painter.fillRect(event->rect(), Qt::white);
+
+    if (highlightedRect.isValid()) {
+        painter.setBrush(QColor("#ffcccc"));
+        painter.setPen(Qt::NoPen);
+        painter.drawRect(highlightedRect.adjusted(0, 0, -1, -1));
+    }
+
+    for (int i = 0; i < pieceRects.size(); ++i) {
+        painter.drawPixmap(pieceRects[i], piecePixmaps[i]);
+    }
+    painter.end();
+}
+
+const QRect PuzzleWidget::targetSquare(const QPoint &position) const
+{
+    return QRect(position.x()/80 * 80, position.y()/80 * 80, 80, 80);
+}
diff --git a/examples/itemviews/puzzle/puzzlewidget.h b/examples/itemviews/puzzle/puzzlewidget.h
new file mode 100644
index 0000000000..312e25fc77
--- /dev/null
+++ b/examples/itemviews/puzzle/puzzlewidget.h
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PUZZLEWIDGET_H
+#define PUZZLEWIDGET_H
+
+#include <QList>
+#include <QPoint>
+#include <QPixmap>
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QDragEnterEvent;
+class QDropEvent;
+class QMouseEvent;
+QT_END_NAMESPACE
+
+class PuzzleWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    PuzzleWidget(QWidget *parent = 0);
+    void clear();
+
+signals:
+    void puzzleCompleted();
+
+protected:
+    void dragEnterEvent(QDragEnterEvent *event);
+    void dragLeaveEvent(QDragLeaveEvent *event);
+    void dragMoveEvent(QDragMoveEvent *event);
+    void dropEvent(QDropEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+    void paintEvent(QPaintEvent *event);
+
+private:
+    int findPiece(const QRect &pieceRect) const;
+    const QRect targetSquare(const QPoint &position) const;
+
+    QList<QPixmap> piecePixmaps;
+    QList<QRect> pieceRects;
+    QList<QPoint> pieceLocations;
+    QRect highlightedRect;
+    int inPlace;
+};
+
+#endif
diff --git a/examples/itemviews/simpledommodel/domitem.cpp b/examples/itemviews/simpledommodel/domitem.cpp
new file mode 100644
index 0000000000..18f65eadfe
--- /dev/null
+++ b/examples/itemviews/simpledommodel/domitem.cpp
@@ -0,0 +1,102 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtXml>
+
+#include "domitem.h"
+
+//! [0]
+DomItem::DomItem(QDomNode &node, int row, DomItem *parent)
+{
+    domNode = node;
+//! [0]
+    // Record the item's location within its parent.
+//! [1]
+    rowNumber = row;
+    parentItem = parent;
+}
+//! [1]
+
+//! [2]
+DomItem::~DomItem()
+{
+    QHash<int,DomItem*>::iterator it;
+    for (it = childItems.begin(); it != childItems.end(); ++it)
+        delete it.value();
+}
+//! [2]
+
+//! [3]
+QDomNode DomItem::node() const
+{
+    return domNode;
+}
+//! [3]
+
+//! [4]
+DomItem *DomItem::parent()
+{
+    return parentItem;
+}
+//! [4]
+
+//! [5]
+DomItem *DomItem::child(int i)
+{
+    if (childItems.contains(i))
+        return childItems[i];
+
+    if (i >= 0 && i < domNode.childNodes().count()) {
+        QDomNode childNode = domNode.childNodes().item(i);
+        DomItem *childItem = new DomItem(childNode, i, this);
+        childItems[i] = childItem;
+        return childItem;
+    }
+    return 0;
+}
+//! [5]
+
+//! [6]
+int DomItem::row()
+{
+    return rowNumber;
+}
+//! [6]
diff --git a/examples/itemviews/simpledommodel/domitem.h b/examples/itemviews/simpledommodel/domitem.h
new file mode 100644
index 0000000000..61f2acc5fe
--- /dev/null
+++ b/examples/itemviews/simpledommodel/domitem.h
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DOMITEM_H
+#define DOMITEM_H
+
+#include <QDomNode>
+#include <QHash>
+
+//! [0]
+class DomItem
+{
+public:
+    DomItem(QDomNode &node, int row, DomItem *parent = 0);
+    ~DomItem();
+    DomItem *child(int i);
+    DomItem *parent();
+    QDomNode node() const;
+    int row();
+
+private:
+    QDomNode domNode;
+    QHash<int,DomItem*> childItems;
+    DomItem *parentItem;
+    int rowNumber;
+};
+//! [0]
+
+#endif
diff --git a/examples/itemviews/simpledommodel/dommodel.cpp b/examples/itemviews/simpledommodel/dommodel.cpp
new file mode 100644
index 0000000000..495fd55469
--- /dev/null
+++ b/examples/itemviews/simpledommodel/dommodel.cpp
@@ -0,0 +1,190 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtXml>
+
+#include "domitem.h"
+#include "dommodel.h"
+
+//! [0]
+DomModel::DomModel(QDomDocument document, QObject *parent)
+    : QAbstractItemModel(parent), domDocument(document)
+{
+    rootItem = new DomItem(domDocument, 0);
+}
+//! [0]
+
+//! [1]
+DomModel::~DomModel()
+{
+    delete rootItem;
+}
+//! [1]
+
+//! [2]
+int DomModel::columnCount(const QModelIndex &/*parent*/) const
+{
+    return 3;
+}
+//! [2]
+
+//! [3]
+QVariant DomModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+
+    if (role != Qt::DisplayRole)
+        return QVariant();
+
+    DomItem *item = static_cast<DomItem*>(index.internalPointer());
+
+    QDomNode node = item->node();
+//! [3] //! [4]
+    QStringList attributes;
+    QDomNamedNodeMap attributeMap = node.attributes();
+
+    switch (index.column()) {
+        case 0:
+            return node.nodeName();
+        case 1:
+            for (int i = 0; i < attributeMap.count(); ++i) {
+                QDomNode attribute = attributeMap.item(i);
+                attributes << attribute.nodeName() + "=\""
+                              +attribute.nodeValue() + "\"";
+            }
+            return attributes.join(" ");
+        case 2:
+            return node.nodeValue().split("\n").join(" ");
+        default:
+            return QVariant();
+    }
+}
+//! [4]
+
+//! [5]
+Qt::ItemFlags DomModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return 0;
+
+    return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+}
+//! [5]
+
+//! [6]
+QVariant DomModel::headerData(int section, Qt::Orientation orientation,
+                              int role) const
+{
+    if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
+        switch (section) {
+            case 0:
+                return tr("Name");
+            case 1:
+                return tr("Attributes");
+            case 2:
+                return tr("Value");
+            default:
+                return QVariant();
+        }
+    }
+
+    return QVariant();
+}
+//! [6]
+
+//! [7]
+QModelIndex DomModel::index(int row, int column, const QModelIndex &parent)
+            const
+{
+    if (!hasIndex(row, column, parent))
+        return QModelIndex();
+
+    DomItem *parentItem;
+
+    if (!parent.isValid())
+        parentItem = rootItem;
+    else
+        parentItem = static_cast<DomItem*>(parent.internalPointer());
+//! [7]
+
+//! [8]
+    DomItem *childItem = parentItem->child(row);
+    if (childItem)
+        return createIndex(row, column, childItem);
+    else
+        return QModelIndex();
+}
+//! [8]
+
+//! [9]
+QModelIndex DomModel::parent(const QModelIndex &child) const
+{
+    if (!child.isValid())
+        return QModelIndex();
+
+    DomItem *childItem = static_cast<DomItem*>(child.internalPointer());
+    DomItem *parentItem = childItem->parent();
+
+    if (!parentItem || parentItem == rootItem)
+        return QModelIndex();
+
+    return createIndex(parentItem->row(), 0, parentItem);
+}
+//! [9]
+
+//! [10]
+int DomModel::rowCount(const QModelIndex &parent) const
+{
+    if (parent.column() > 0)
+        return 0;
+
+    DomItem *parentItem;
+
+    if (!parent.isValid())
+        parentItem = rootItem;
+    else
+        parentItem = static_cast<DomItem*>(parent.internalPointer());
+
+    return parentItem->node().childNodes().count();
+}
+//! [10]
diff --git a/examples/itemviews/simpledommodel/dommodel.h b/examples/itemviews/simpledommodel/dommodel.h
new file mode 100644
index 0000000000..1178b2c1ff
--- /dev/null
+++ b/examples/itemviews/simpledommodel/dommodel.h
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DOMMODEL_H
+#define DOMMODEL_H
+
+#include <QAbstractItemModel>
+#include <QDomDocument>
+#include <QModelIndex>
+#include <QVariant>
+
+class DomItem;
+
+//! [0]
+class DomModel : public QAbstractItemModel
+{
+    Q_OBJECT
+
+public:
+    DomModel(QDomDocument document, QObject *parent = 0);
+    ~DomModel();
+
+    QVariant data(const QModelIndex &index, int role) const;
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+    QVariant headerData(int section, Qt::Orientation orientation,
+                        int role = Qt::DisplayRole) const;
+    QModelIndex index(int row, int column,
+                      const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex parent(const QModelIndex &child) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+
+private:
+    QDomDocument domDocument;
+    DomItem *rootItem;
+};
+//! [0]
+
+#endif
diff --git a/examples/itemviews/simpledommodel/main.cpp b/examples/itemviews/simpledommodel/main.cpp
new file mode 100644
index 0000000000..d2ecfc941b
--- /dev/null
+++ b/examples/itemviews/simpledommodel/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow window;
+    window.resize(640, 480);
+    window.show();
+    return app.exec();
+}
diff --git a/examples/itemviews/simpledommodel/mainwindow.cpp b/examples/itemviews/simpledommodel/mainwindow.cpp
new file mode 100644
index 0000000000..ac968998c9
--- /dev/null
+++ b/examples/itemviews/simpledommodel/mainwindow.cpp
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QDomDocument>
+#include <QFile>
+#include <QtGui>
+
+#include "dommodel.h"
+#include "mainwindow.h"
+
+MainWindow::MainWindow() : QMainWindow(), model(0)
+{
+    fileMenu = menuBar()->addMenu(tr("&File"));
+    fileMenu->addAction(tr("&Open..."), this, SLOT(openFile()),
+                        QKeySequence(tr("Ctrl+O")));
+    fileMenu->addAction(tr("E&xit"), this, SLOT(close()),
+                        QKeySequence(tr("Ctrl+Q")));
+
+    model = new DomModel(QDomDocument(), this);
+    view = new QTreeView(this);
+    view->setModel(model);
+
+    setCentralWidget(view);
+    setWindowTitle(tr("Simple DOM Model"));
+}
+
+void MainWindow::openFile()
+{
+    QString filePath = QFileDialog::getOpenFileName(this, tr("Open File"),
+        xmlPath, tr("XML files (*.xml);;HTML files (*.html);;"
+                    "SVG files (*.svg);;User Interface files (*.ui)"));
+
+    if (!filePath.isEmpty()) {
+        QFile file(filePath);
+        if (file.open(QIODevice::ReadOnly)) {
+            QDomDocument document;
+            if (document.setContent(&file)) {
+                DomModel *newModel = new DomModel(document, this);
+                view->setModel(newModel);
+                delete model;
+                model = newModel;
+                xmlPath = filePath;
+            }
+            file.close();
+        }
+    }
+}
diff --git a/examples/itemviews/simpledommodel/mainwindow.h b/examples/itemviews/simpledommodel/mainwindow.h
new file mode 100644
index 0000000000..4bc967a545
--- /dev/null
+++ b/examples/itemviews/simpledommodel/mainwindow.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include <QString>
+
+class DomModel;
+QT_BEGIN_NAMESPACE
+class QMenu;
+class QTreeView;
+QT_END_NAMESPACE
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+public slots:
+    void openFile();
+
+private:
+    DomModel *model;
+    QMenu *fileMenu;
+    QString xmlPath;
+    QTreeView *view;
+};
+
+#endif
diff --git a/examples/itemviews/simpledommodel/simpledommodel.pro b/examples/itemviews/simpledommodel/simpledommodel.pro
new file mode 100644
index 0000000000..bc9b1cafa3
--- /dev/null
+++ b/examples/itemviews/simpledommodel/simpledommodel.pro
@@ -0,0 +1,15 @@
+HEADERS     = domitem.h \
+              dommodel.h \
+              mainwindow.h
+SOURCES     = domitem.cpp \
+              dommodel.cpp \
+              main.cpp \
+              mainwindow.cpp
+CONFIG  += qt
+QT      += xml
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/simpledommodel
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/simpledommodel
+INSTALLS += target sources
diff --git a/examples/itemviews/simpletreemodel/default.txt b/examples/itemviews/simpletreemodel/default.txt
new file mode 100644
index 0000000000..2b2fb579ae
--- /dev/null
+++ b/examples/itemviews/simpletreemodel/default.txt
@@ -0,0 +1,40 @@
+Getting Started				How to familiarize yourself with Qt Designer
+    Launching Designer			Running the Qt Designer application
+    The User Interface			How to interact with Qt Designer
+
+Designing a Component			Creating a GUI for your application
+    Creating a Dialog			How to create a dialog
+    Composing the Dialog		Putting widgets into the dialog example
+    Creating a Layout			Arranging widgets on a form
+    Signal and Slot Connections		Making widget communicate with each other
+
+Using a Component in Your Application	Generating code from forms
+    The Direct Approach			Using a form without any adjustments
+    The Single Inheritance Approach	Subclassing a form's base class
+    The Multiple Inheritance Approach	Subclassing the form itself
+    Automatic Connections		Connecting widgets using a naming scheme
+        A Dialog Without Auto-Connect	How to connect widgets without a naming scheme
+        A Dialog With Auto-Connect	Using automatic connections
+
+Form Editing Mode			How to edit a form in Qt Designer
+    Managing Forms			Loading and saving forms
+    Editing a Form			Basic editing techniques
+    The Property Editor			Changing widget properties
+    The Object Inspector		Examining the hierarchy of objects on a form
+    Layouts				Objects that arrange widgets on a form
+        Applying and Breaking Layouts	Managing widgets in layouts 
+        Horizontal and Vertical Layouts	Standard row and column layouts
+        The Grid Layout			Arranging widgets in a matrix
+    Previewing Forms			Checking that the design works
+
+Using Containers			How to group widgets together
+    General Features			Common container features
+    Frames				QFrame
+    Group Boxes				QGroupBox
+    Stacked Widgets			QStackedWidget
+    Tab Widgets				QTabWidget
+    Toolbox Widgets			QToolBox
+
+Connection Editing Mode			Connecting widgets together with signals and slots
+    Connecting Objects			Making connections in Qt Designer
+    Editing Connections			Changing existing connections
diff --git a/examples/itemviews/simpletreemodel/main.cpp b/examples/itemviews/simpletreemodel/main.cpp
new file mode 100644
index 0000000000..89bdc774d9
--- /dev/null
+++ b/examples/itemviews/simpletreemodel/main.cpp
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "treemodel.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(simpletreemodel);
+
+    QApplication app(argc, argv);
+
+    QFile file(":/default.txt");
+    file.open(QIODevice::ReadOnly);
+    TreeModel model(file.readAll());
+    file.close();
+
+    QTreeView view;
+    view.setModel(&model);
+    view.setWindowTitle(QObject::tr("Simple Tree Model"));
+    view.show();
+    return app.exec();
+}
diff --git a/examples/itemviews/simpletreemodel/simpletreemodel.pro b/examples/itemviews/simpletreemodel/simpletreemodel.pro
new file mode 100644
index 0000000000..9db74d4483
--- /dev/null
+++ b/examples/itemviews/simpletreemodel/simpletreemodel.pro
@@ -0,0 +1,13 @@
+HEADERS     = treeitem.h \
+              treemodel.h
+RESOURCES   = simpletreemodel.qrc
+SOURCES     = treeitem.cpp \
+              treemodel.cpp \
+              main.cpp
+CONFIG  += qt
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/simpletreemodel
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.txt
+sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/simpletreemodel
+INSTALLS += target sources
diff --git a/examples/itemviews/simpletreemodel/simpletreemodel.qrc b/examples/itemviews/simpletreemodel/simpletreemodel.qrc
new file mode 100644
index 0000000000..a8ecc98d28
--- /dev/null
+++ b/examples/itemviews/simpletreemodel/simpletreemodel.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+   <file>default.txt</file>
+</qresource>
+</RCC>
diff --git a/examples/itemviews/simpletreemodel/treeitem.cpp b/examples/itemviews/simpletreemodel/treeitem.cpp
new file mode 100644
index 0000000000..d2c1eed831
--- /dev/null
+++ b/examples/itemviews/simpletreemodel/treeitem.cpp
@@ -0,0 +1,117 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+    treeitem.cpp
+
+    A container for items of data supplied by the simple tree model.
+*/
+
+#include <QStringList>
+
+#include "treeitem.h"
+
+//! [0]
+TreeItem::TreeItem(const QList<QVariant> &data, TreeItem *parent)
+{
+    parentItem = parent;
+    itemData = data;
+}
+//! [0]
+
+//! [1]
+TreeItem::~TreeItem()
+{
+    qDeleteAll(childItems);
+}
+//! [1]
+
+//! [2]
+void TreeItem::appendChild(TreeItem *item)
+{
+    childItems.append(item);
+}
+//! [2]
+
+//! [3]
+TreeItem *TreeItem::child(int row)
+{
+    return childItems.value(row);
+}
+//! [3]
+
+//! [4]
+int TreeItem::childCount() const
+{
+    return childItems.count();
+}
+//! [4]
+
+//! [5]
+int TreeItem::columnCount() const
+{
+    return itemData.count();
+}
+//! [5]
+
+//! [6]
+QVariant TreeItem::data(int column) const
+{
+    return itemData.value(column);
+}
+//! [6]
+
+//! [7]
+TreeItem *TreeItem::parent()
+{
+    return parentItem;
+}
+//! [7]
+
+//! [8]
+int TreeItem::row() const
+{
+    if (parentItem)
+        return parentItem->childItems.indexOf(const_cast<TreeItem*>(this));
+
+    return 0;
+}
+//! [8]
diff --git a/examples/itemviews/simpletreemodel/treeitem.h b/examples/itemviews/simpletreemodel/treeitem.h
new file mode 100644
index 0000000000..7bfd63b3c5
--- /dev/null
+++ b/examples/itemviews/simpletreemodel/treeitem.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TREEITEM_H
+#define TREEITEM_H
+
+#include <QList>
+#include <QVariant>
+
+//! [0]
+class TreeItem
+{
+public:
+    TreeItem(const QList<QVariant> &data, TreeItem *parent = 0);
+    ~TreeItem();
+
+    void appendChild(TreeItem *child);
+
+    TreeItem *child(int row);
+    int childCount() const;
+    int columnCount() const;
+    QVariant data(int column) const;
+    int row() const;
+    TreeItem *parent();
+
+private:
+    QList<TreeItem*> childItems;
+    QList<QVariant> itemData;
+    TreeItem *parentItem;
+};
+//! [0]
+
+#endif
diff --git a/examples/itemviews/simpletreemodel/treemodel.cpp b/examples/itemviews/simpletreemodel/treemodel.cpp
new file mode 100644
index 0000000000..ec7bd64b9b
--- /dev/null
+++ b/examples/itemviews/simpletreemodel/treemodel.cpp
@@ -0,0 +1,219 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+    treemodel.cpp
+
+    Provides a simple tree model to show how to create and use hierarchical
+    models.
+*/
+
+#include <QtGui>
+
+#include "treeitem.h"
+#include "treemodel.h"
+
+//! [0]
+TreeModel::TreeModel(const QString &data, QObject *parent)
+    : QAbstractItemModel(parent)
+{
+    QList<QVariant> rootData;
+    rootData << "Title" << "Summary";
+    rootItem = new TreeItem(rootData);
+    setupModelData(data.split(QString("\n")), rootItem);
+}
+//! [0]
+
+//! [1]
+TreeModel::~TreeModel()
+{
+    delete rootItem;
+}
+//! [1]
+
+//! [2]
+int TreeModel::columnCount(const QModelIndex &parent) const
+{
+    if (parent.isValid())
+        return static_cast<TreeItem*>(parent.internalPointer())->columnCount();
+    else
+        return rootItem->columnCount();
+}
+//! [2]
+
+//! [3]
+QVariant TreeModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+
+    if (role != Qt::DisplayRole)
+        return QVariant();
+
+    TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
+
+    return item->data(index.column());
+}
+//! [3]
+
+//! [4]
+Qt::ItemFlags TreeModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return 0;
+
+    return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+}
+//! [4]
+
+//! [5]
+QVariant TreeModel::headerData(int section, Qt::Orientation orientation,
+                               int role) const
+{
+    if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
+        return rootItem->data(section);
+
+    return QVariant();
+}
+//! [5]
+
+//! [6]
+QModelIndex TreeModel::index(int row, int column, const QModelIndex &parent)
+            const
+{
+    if (!hasIndex(row, column, parent))
+        return QModelIndex();
+
+    TreeItem *parentItem;
+
+    if (!parent.isValid())
+        parentItem = rootItem;
+    else
+        parentItem = static_cast<TreeItem*>(parent.internalPointer());
+
+    TreeItem *childItem = parentItem->child(row);
+    if (childItem)
+        return createIndex(row, column, childItem);
+    else
+        return QModelIndex();
+}
+//! [6]
+
+//! [7]
+QModelIndex TreeModel::parent(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return QModelIndex();
+
+    TreeItem *childItem = static_cast<TreeItem*>(index.internalPointer());
+    TreeItem *parentItem = childItem->parent();
+
+    if (parentItem == rootItem)
+        return QModelIndex();
+
+    return createIndex(parentItem->row(), 0, parentItem);
+}
+//! [7]
+
+//! [8]
+int TreeModel::rowCount(const QModelIndex &parent) const
+{
+    TreeItem *parentItem;
+    if (parent.column() > 0)
+        return 0;
+
+    if (!parent.isValid())
+        parentItem = rootItem;
+    else
+        parentItem = static_cast<TreeItem*>(parent.internalPointer());
+
+    return parentItem->childCount();
+}
+//! [8]
+
+void TreeModel::setupModelData(const QStringList &lines, TreeItem *parent)
+{
+    QList<TreeItem*> parents;
+    QList<int> indentations;
+    parents << parent;
+    indentations << 0;
+
+    int number = 0;
+
+    while (number < lines.count()) {
+        int position = 0;
+        while (position < lines[number].length()) {
+            if (lines[number].mid(position, 1) != " ")
+                break;
+            position++;
+        }
+
+        QString lineData = lines[number].mid(position).trimmed();
+
+        if (!lineData.isEmpty()) {
+            // Read the column data from the rest of the line.
+            QStringList columnStrings = lineData.split("\t", QString::SkipEmptyParts);
+            QList<QVariant> columnData;
+            for (int column = 0; column < columnStrings.count(); ++column)
+                columnData << columnStrings[column];
+
+            if (position > indentations.last()) {
+                // The last child of the current parent is now the new parent
+                // unless the current parent has no children.
+
+                if (parents.last()->childCount() > 0) {
+                    parents << parents.last()->child(parents.last()->childCount()-1);
+                    indentations << position;
+                }
+            } else {
+                while (position < indentations.last() && parents.count() > 0) {
+                    parents.pop_back();
+                    indentations.pop_back();
+                }
+            }
+
+            // Append a new item to the current parent's list of children.
+            parents.last()->appendChild(new TreeItem(columnData, parents.last()));
+        }
+
+        number++;
+    }
+}
diff --git a/examples/itemviews/simpletreemodel/treemodel.h b/examples/itemviews/simpletreemodel/treemodel.h
new file mode 100644
index 0000000000..3b535f92b4
--- /dev/null
+++ b/examples/itemviews/simpletreemodel/treemodel.h
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TREEMODEL_H
+#define TREEMODEL_H
+
+#include <QAbstractItemModel>
+#include <QModelIndex>
+#include <QVariant>
+
+class TreeItem;
+
+//! [0]
+class TreeModel : public QAbstractItemModel
+{
+    Q_OBJECT
+
+public:
+    TreeModel(const QString &data, QObject *parent = 0);
+    ~TreeModel();
+
+    QVariant data(const QModelIndex &index, int role) const;
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+    QVariant headerData(int section, Qt::Orientation orientation,
+                        int role = Qt::DisplayRole) const;
+    QModelIndex index(int row, int column,
+                      const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex parent(const QModelIndex &index) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+
+private:
+    void setupModelData(const QStringList &lines, TreeItem *parent);
+
+    TreeItem *rootItem;
+};
+//! [0]
+
+#endif
diff --git a/examples/itemviews/simplewidgetmapper/main.cpp b/examples/itemviews/simplewidgetmapper/main.cpp
new file mode 100644
index 0000000000..055ac21f6c
--- /dev/null
+++ b/examples/itemviews/simplewidgetmapper/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "window.h"
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    Window window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro b/examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro
new file mode 100644
index 0000000000..b2940d7780
--- /dev/null
+++ b/examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro
@@ -0,0 +1,9 @@
+HEADERS   = window.h
+SOURCES   = main.cpp \
+            window.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/simplewidgetmapper
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/simplewidgetmapper
+INSTALLS += target sources
diff --git a/examples/itemviews/simplewidgetmapper/window.cpp b/examples/itemviews/simplewidgetmapper/window.cpp
new file mode 100644
index 0000000000..406a3d7771
--- /dev/null
+++ b/examples/itemviews/simplewidgetmapper/window.cpp
@@ -0,0 +1,134 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+
+//! [Set up widgets]
+Window::Window(QWidget *parent)
+    : QWidget(parent)
+{
+    setupModel();
+
+    nameLabel = new QLabel(tr("Na&me:"));
+    nameEdit = new QLineEdit();
+    addressLabel = new QLabel(tr("&Address:"));
+    addressEdit = new QTextEdit();
+    ageLabel = new QLabel(tr("A&ge (in years):"));
+    ageSpinBox = new QSpinBox();
+    nextButton = new QPushButton(tr("&Next"));
+    previousButton = new QPushButton(tr("&Previous"));
+
+    nameLabel->setBuddy(nameEdit);
+    addressLabel->setBuddy(addressEdit);
+    ageLabel->setBuddy(ageSpinBox);
+//! [Set up widgets]
+
+//! [Set up the mapper]
+    mapper = new QDataWidgetMapper(this);
+    mapper->setModel(model);
+    mapper->addMapping(nameEdit, 0);
+    mapper->addMapping(addressEdit, 1);
+    mapper->addMapping(ageSpinBox, 2);
+
+    connect(previousButton, SIGNAL(clicked()),
+            mapper, SLOT(toPrevious()));
+    connect(nextButton, SIGNAL(clicked()),
+            mapper, SLOT(toNext()));
+    connect(mapper, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(updateButtons(int)));
+//! [Set up the mapper]
+
+//! [Set up the layout]
+    QGridLayout *layout = new QGridLayout();
+    layout->addWidget(nameLabel, 0, 0, 1, 1);
+    layout->addWidget(nameEdit, 0, 1, 1, 1);
+    layout->addWidget(previousButton, 0, 2, 1, 1);
+    layout->addWidget(addressLabel, 1, 0, 1, 1);
+    layout->addWidget(addressEdit, 1, 1, 2, 1);
+    layout->addWidget(nextButton, 1, 2, 1, 1);
+    layout->addWidget(ageLabel, 3, 0, 1, 1);
+    layout->addWidget(ageSpinBox, 3, 1, 1, 1);
+    setLayout(layout);
+
+    setWindowTitle(tr("Simple Widget Mapper"));
+    mapper->toFirst();
+}
+//! [Set up the layout]
+
+//! [Set up the model]
+void Window::setupModel()
+{
+    model = new QStandardItemModel(5, 3, this);
+
+    QStringList names;
+    names << "Alice" << "Bob" << "Carol" << "Donald" << "Emma";
+
+    QStringList addresses;
+    addresses << "<qt>123 Main Street<br/>Market Town</qt>"
+              << "<qt>PO Box 32<br/>Mail Handling Service"
+                 "<br/>Service City</qt>"
+              << "<qt>The Lighthouse<br/>Remote Island</qt>"
+              << "<qt>47338 Park Avenue<br/>Big City</qt>"
+              << "<qt>Research Station<br/>Base Camp<br/>Big Mountain</qt>";
+
+    QStringList ages;
+    ages << "20" << "31" << "32" << "19" << "26";
+    
+    for (int row = 0; row < 5; ++row) {
+      QStandardItem *item = new QStandardItem(names[row]);
+      model->setItem(row, 0, item);
+      item = new QStandardItem(addresses[row]);
+      model->setItem(row, 1, item);
+      item = new QStandardItem(ages[row]);
+      model->setItem(row, 2, item);
+    }
+}
+//! [Set up the model]
+
+//! [Slot for updating the buttons]
+void Window::updateButtons(int row)
+{
+    previousButton->setEnabled(row > 0);
+    nextButton->setEnabled(row < model->rowCount() - 1);
+}
+//! [Slot for updating the buttons]
diff --git a/examples/itemviews/simplewidgetmapper/window.h b/examples/itemviews/simplewidgetmapper/window.h
new file mode 100644
index 0000000000..726d4d688c
--- /dev/null
+++ b/examples/itemviews/simplewidgetmapper/window.h
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QDataWidgetMapper;
+class QLabel;
+class QLineEdit;
+class QPushButton;
+class QSpinBox;
+class QStandardItemModel;
+class QTextEdit;
+QT_END_NAMESPACE
+
+//! [Window definition]
+class Window : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Window(QWidget *parent = 0);
+
+private slots:
+    void updateButtons(int row);
+
+private:
+    void setupModel();
+
+    QLabel *nameLabel;
+    QLabel *addressLabel;
+    QLabel *ageLabel;
+    QLineEdit *nameEdit;
+    QTextEdit *addressEdit;
+    QSpinBox *ageSpinBox;
+    QPushButton *nextButton;
+    QPushButton *previousButton;
+
+    QStandardItemModel *model;
+    QDataWidgetMapper *mapper;
+};
+//! [Window definition]
+
+#endif
diff --git a/examples/itemviews/spinboxdelegate/delegate.cpp b/examples/itemviews/spinboxdelegate/delegate.cpp
new file mode 100644
index 0000000000..03a1a23565
--- /dev/null
+++ b/examples/itemviews/spinboxdelegate/delegate.cpp
@@ -0,0 +1,103 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+    delegate.cpp
+
+    A delegate that allows the user to change integer values from the model
+    using a spin box widget.
+*/
+
+#include <QtGui>
+
+#include "delegate.h"
+
+
+//! [0]
+SpinBoxDelegate::SpinBoxDelegate(QObject *parent)
+    : QItemDelegate(parent)
+{
+}
+//! [0]
+
+//! [1]
+QWidget *SpinBoxDelegate::createEditor(QWidget *parent,
+    const QStyleOptionViewItem &/* option */,
+    const QModelIndex &/* index */) const
+{
+    QSpinBox *editor = new QSpinBox(parent);
+    editor->setMinimum(0);
+    editor->setMaximum(100);
+
+    return editor;
+}
+//! [1]
+
+//! [2]
+void SpinBoxDelegate::setEditorData(QWidget *editor,
+                                    const QModelIndex &index) const
+{
+    int value = index.model()->data(index, Qt::EditRole).toInt();
+
+    QSpinBox *spinBox = static_cast<QSpinBox*>(editor);
+    spinBox->setValue(value);
+}
+//! [2]
+
+//! [3]
+void SpinBoxDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,
+                                   const QModelIndex &index) const
+{
+    QSpinBox *spinBox = static_cast<QSpinBox*>(editor);
+    spinBox->interpretText();
+    int value = spinBox->value();
+
+    model->setData(index, value, Qt::EditRole);
+}
+//! [3]
+
+//! [4]
+void SpinBoxDelegate::updateEditorGeometry(QWidget *editor,
+    const QStyleOptionViewItem &option, const QModelIndex &/* index */) const
+{
+    editor->setGeometry(option.rect);
+}
+//! [4]
diff --git a/examples/itemviews/spinboxdelegate/delegate.h b/examples/itemviews/spinboxdelegate/delegate.h
new file mode 100644
index 0000000000..a81cfd15ca
--- /dev/null
+++ b/examples/itemviews/spinboxdelegate/delegate.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DELEGATE_H
+#define DELEGATE_H
+
+#include <QItemDelegate>
+#include <QModelIndex>
+#include <QObject>
+#include <QSize>
+#include <QSpinBox>
+
+//! [0]
+class SpinBoxDelegate : public QItemDelegate
+{
+    Q_OBJECT
+
+public:
+    SpinBoxDelegate(QObject *parent = 0);
+
+    QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
+                          const QModelIndex &index) const;
+
+    void setEditorData(QWidget *editor, const QModelIndex &index) const;
+    void setModelData(QWidget *editor, QAbstractItemModel *model,
+                      const QModelIndex &index) const;
+
+    void updateEditorGeometry(QWidget *editor,
+        const QStyleOptionViewItem &option, const QModelIndex &index) const;
+};
+//! [0]
+
+#endif
diff --git a/examples/itemviews/spinboxdelegate/main.cpp b/examples/itemviews/spinboxdelegate/main.cpp
new file mode 100644
index 0000000000..4b9d6a4052
--- /dev/null
+++ b/examples/itemviews/spinboxdelegate/main.cpp
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+  main.cpp
+
+  A simple example that shows how a view can use a custom delegate to edit
+  data obtained from a model.
+*/
+
+#include <QApplication>
+#include <QHeaderView>
+#include <QItemSelectionModel>
+#include <QStandardItemModel>
+#include <QTableView>
+
+#include "delegate.h"
+
+//! [0]
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QStandardItemModel model(4, 2);
+    QTableView tableView;
+    tableView.setModel(&model);
+
+    SpinBoxDelegate delegate;
+    tableView.setItemDelegate(&delegate);
+//! [0]
+
+    tableView.horizontalHeader()->setStretchLastSection(true);
+
+//! [1]
+    for (int row = 0; row < 4; ++row) {
+        for (int column = 0; column < 2; ++column) {
+            QModelIndex index = model.index(row, column, QModelIndex());
+            model.setData(index, QVariant((row+1) * (column+1)));
+        }
+//! [1] //! [2]
+    }
+//! [2]
+
+//! [3]
+    tableView.setWindowTitle(QObject::tr("Spin Box Delegate"));
+    tableView.show();
+    return app.exec();
+}
+//! [3]
diff --git a/examples/itemviews/spinboxdelegate/spinboxdelegate.pro b/examples/itemviews/spinboxdelegate/spinboxdelegate.pro
new file mode 100644
index 0000000000..a202748d37
--- /dev/null
+++ b/examples/itemviews/spinboxdelegate/spinboxdelegate.pro
@@ -0,0 +1,9 @@
+HEADERS     = delegate.h
+SOURCES     = delegate.cpp \
+              main.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/spinboxdelegate
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/spinboxdelegate
+INSTALLS += target sources
diff --git a/examples/itemviews/stardelegate/main.cpp b/examples/itemviews/stardelegate/main.cpp
new file mode 100644
index 0000000000..5b27ee1cae
--- /dev/null
+++ b/examples/itemviews/stardelegate/main.cpp
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "stardelegate.h"
+#include "stareditor.h"
+#include "starrating.h"
+
+//! [0]
+void populateTableWidget(QTableWidget *tableWidget)
+{
+    static const struct {
+        const char *title;
+        const char *genre;
+        const char *artist;
+        int rating;
+    } staticData[] = {
+//! [0] //! [1]
+        { "Mass in B-Minor", "Baroque", "J.S. Bach", 5 },
+//! [1]
+        { "Three More Foxes", "Jazz", "Maynard Ferguson", 4 },
+        { "Sex Bomb", "Pop", "Tom Jones", 3 },
+        { "Barbie Girl", "Pop", "Aqua", 5 },
+//! [2]
+        { 0, 0, 0, 0 }
+//! [2] //! [3]
+    };
+//! [3] //! [4]
+
+    for (int row = 0; staticData[row].title != 0; ++row) {
+        QTableWidgetItem *item0 = new QTableWidgetItem(staticData[row].title);
+        QTableWidgetItem *item1 = new QTableWidgetItem(staticData[row].genre);
+        QTableWidgetItem *item2 = new QTableWidgetItem(staticData[row].artist);
+        QTableWidgetItem *item3 = new QTableWidgetItem;
+        item3->setData(0,
+                       qVariantFromValue(StarRating(staticData[row].rating)));
+
+        tableWidget->setItem(row, 0, item0);
+        tableWidget->setItem(row, 1, item1);
+        tableWidget->setItem(row, 2, item2);
+        tableWidget->setItem(row, 3, item3);
+    }
+}
+//! [4]
+
+//! [5]
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QTableWidget tableWidget(4, 4);
+    tableWidget.setItemDelegate(new StarDelegate);
+    tableWidget.setEditTriggers(QAbstractItemView::DoubleClicked
+                                | QAbstractItemView::SelectedClicked);
+    tableWidget.setSelectionBehavior(QAbstractItemView::SelectRows);
+
+    QStringList headerLabels;
+    headerLabels << "Title" << "Genre" << "Artist" << "Rating";
+    tableWidget.setHorizontalHeaderLabels(headerLabels);
+
+    populateTableWidget(&tableWidget);
+
+    tableWidget.resizeColumnsToContents();
+    tableWidget.resize(500, 300);
+    tableWidget.show();
+
+    return app.exec();
+}
+//! [5]
diff --git a/examples/itemviews/stardelegate/stardelegate.cpp b/examples/itemviews/stardelegate/stardelegate.cpp
new file mode 100644
index 0000000000..1e1297108e
--- /dev/null
+++ b/examples/itemviews/stardelegate/stardelegate.cpp
@@ -0,0 +1,130 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "stardelegate.h"
+#include "stareditor.h"
+#include "starrating.h"
+
+//! [0]
+void StarDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
+                         const QModelIndex &index) const
+{
+    if (qVariantCanConvert<StarRating>(index.data())) {
+        StarRating starRating = qVariantValue<StarRating>(index.data());
+
+        if (option.state & QStyle::State_Selected)
+            painter->fillRect(option.rect, option.palette.highlight());
+
+        starRating.paint(painter, option.rect, option.palette,
+                         StarRating::ReadOnly);
+    } else {
+        QStyledItemDelegate::paint(painter, option, index);
+    }
+//! [0]
+}
+
+//! [1]
+QSize StarDelegate::sizeHint(const QStyleOptionViewItem &option,
+                             const QModelIndex &index) const
+{
+    if (qVariantCanConvert<StarRating>(index.data())) {
+        StarRating starRating = qVariantValue<StarRating>(index.data());
+        return starRating.sizeHint();
+    } else {
+        return QStyledItemDelegate::sizeHint(option, index);
+    }
+}
+//! [1]
+
+//! [2]
+QWidget *StarDelegate::createEditor(QWidget *parent,
+                                    const QStyleOptionViewItem &option,
+                                    const QModelIndex &index) const
+
+{
+    if (qVariantCanConvert<StarRating>(index.data())) {
+        StarEditor *editor = new StarEditor(parent);
+        connect(editor, SIGNAL(editingFinished()),
+                this, SLOT(commitAndCloseEditor()));
+        return editor;
+    } else {
+        return QStyledItemDelegate::createEditor(parent, option, index);
+    }
+}
+//! [2]
+
+//! [3]
+void StarDelegate::setEditorData(QWidget *editor,
+                                 const QModelIndex &index) const
+{
+    if (qVariantCanConvert<StarRating>(index.data())) {
+        StarRating starRating = qVariantValue<StarRating>(index.data());
+        StarEditor *starEditor = qobject_cast<StarEditor *>(editor);
+        starEditor->setStarRating(starRating);
+    } else {
+        QStyledItemDelegate::setEditorData(editor, index);
+    }
+}
+//! [3]
+
+//! [4]
+void StarDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,
+                                const QModelIndex &index) const
+{
+    if (qVariantCanConvert<StarRating>(index.data())) {
+        StarEditor *starEditor = qobject_cast<StarEditor *>(editor);
+        model->setData(index, qVariantFromValue(starEditor->starRating()));
+    } else {
+        QStyledItemDelegate::setModelData(editor, model, index);
+    }
+}
+//! [4]
+
+//! [5]
+void StarDelegate::commitAndCloseEditor()
+{
+    StarEditor *editor = qobject_cast<StarEditor *>(sender());
+    emit commitData(editor);
+    emit closeEditor(editor);
+}
+//! [5]
diff --git a/examples/itemviews/stardelegate/stardelegate.h b/examples/itemviews/stardelegate/stardelegate.h
new file mode 100644
index 0000000000..84814ed45d
--- /dev/null
+++ b/examples/itemviews/stardelegate/stardelegate.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef STARDELEGATE_H
+#define STARDELEGATE_H
+
+#include <QStyledItemDelegate>
+
+//! [0]
+class StarDelegate : public QStyledItemDelegate
+{
+    Q_OBJECT
+
+public:
+    StarDelegate(QWidget *parent = 0) : QStyledItemDelegate(parent) {}
+
+    void paint(QPainter *painter, const QStyleOptionViewItem &option,
+               const QModelIndex &index) const;
+    QSize sizeHint(const QStyleOptionViewItem &option,
+                   const QModelIndex &index) const;
+    QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
+                          const QModelIndex &index) const;
+    void setEditorData(QWidget *editor, const QModelIndex &index) const;
+    void setModelData(QWidget *editor, QAbstractItemModel *model,
+                      const QModelIndex &index) const;
+
+private slots:
+    void commitAndCloseEditor();
+};
+//! [0]
+
+#endif
diff --git a/examples/itemviews/stardelegate/stardelegate.pro b/examples/itemviews/stardelegate/stardelegate.pro
new file mode 100644
index 0000000000..4e1ef45497
--- /dev/null
+++ b/examples/itemviews/stardelegate/stardelegate.pro
@@ -0,0 +1,14 @@
+HEADERS       = stardelegate.h \
+                stareditor.h \
+                starrating.h
+SOURCES       = main.cpp \
+                stardelegate.cpp \
+                stareditor.cpp \
+                starrating.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/stardelegate
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/stardelegate
+INSTALLS += target sources
+
diff --git a/examples/itemviews/stardelegate/stareditor.cpp b/examples/itemviews/stardelegate/stareditor.cpp
new file mode 100644
index 0000000000..633229f423
--- /dev/null
+++ b/examples/itemviews/stardelegate/stareditor.cpp
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "stareditor.h"
+#include "starrating.h"
+
+//! [0]
+StarEditor::StarEditor(QWidget *parent)
+    : QWidget(parent)
+{
+    setMouseTracking(true);
+    setAutoFillBackground(true);
+}
+//! [0]
+
+QSize StarEditor::sizeHint() const
+{
+    return myStarRating.sizeHint();
+}
+
+//! [1]
+void StarEditor::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+    myStarRating.paint(&painter, rect(), this->palette(),
+                       StarRating::Editable);
+}
+//! [1]
+
+//! [2]
+void StarEditor::mouseMoveEvent(QMouseEvent *event)
+{
+    int star = starAtPosition(event->x());
+
+    if (star != myStarRating.starCount() && star != -1) {
+        myStarRating.setStarCount(star);
+        update();
+    }
+}
+//! [2]
+
+//! [3]
+void StarEditor::mouseReleaseEvent(QMouseEvent * /* event */)
+{
+    emit editingFinished();
+}
+//! [3]
+
+//! [4]
+int StarEditor::starAtPosition(int x)
+{
+    int star = (x / (myStarRating.sizeHint().width()
+                     / myStarRating.maxStarCount())) + 1;
+    if (star <= 0 || star > myStarRating.maxStarCount())
+        return -1;
+
+    return star;
+}
+//! [4]
diff --git a/examples/itemviews/stardelegate/stareditor.h b/examples/itemviews/stardelegate/stareditor.h
new file mode 100644
index 0000000000..7365ca1f1a
--- /dev/null
+++ b/examples/itemviews/stardelegate/stareditor.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef STAREDITOR_H
+#define STAREDITOR_H
+
+#include <QWidget>
+
+#include "starrating.h"
+
+//! [0]
+class StarEditor : public QWidget
+{
+    Q_OBJECT
+
+public:
+    StarEditor(QWidget *parent = 0);
+
+    QSize sizeHint() const;
+    void setStarRating(const StarRating &starRating) {
+        myStarRating = starRating;
+    }
+    StarRating starRating() { return myStarRating; }
+
+signals:
+    void editingFinished();
+
+protected:
+    void paintEvent(QPaintEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
+    void mouseReleaseEvent(QMouseEvent *event);
+
+private:
+    int starAtPosition(int x);
+
+    StarRating myStarRating;
+};
+//! [0]
+
+#endif
diff --git a/examples/itemviews/stardelegate/starrating.cpp b/examples/itemviews/stardelegate/starrating.cpp
new file mode 100644
index 0000000000..e40f22d3cf
--- /dev/null
+++ b/examples/itemviews/stardelegate/starrating.cpp
@@ -0,0 +1,103 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <math.h>
+
+#include "starrating.h"
+
+const int PaintingScaleFactor = 20;
+
+//! [0]
+StarRating::StarRating(int starCount, int maxStarCount)
+{
+    myStarCount = starCount;
+    myMaxStarCount = maxStarCount;
+
+    starPolygon << QPointF(1.0, 0.5);
+    for (int i = 1; i < 5; ++i)
+        starPolygon << QPointF(0.5 + 0.5 * cos(0.8 * i * 3.14),
+                               0.5 + 0.5 * sin(0.8 * i * 3.14));
+
+    diamondPolygon << QPointF(0.4, 0.5) << QPointF(0.5, 0.4)
+                   << QPointF(0.6, 0.5) << QPointF(0.5, 0.6)
+                   << QPointF(0.4, 0.5);
+}
+//! [0]
+
+//! [1]
+QSize StarRating::sizeHint() const
+{
+    return PaintingScaleFactor * QSize(myMaxStarCount, 1);
+}
+//! [1]
+
+//! [2]
+void StarRating::paint(QPainter *painter, const QRect &rect,
+                       const QPalette &palette, EditMode mode) const
+{
+    painter->save();
+
+    painter->setRenderHint(QPainter::Antialiasing, true);
+    painter->setPen(Qt::NoPen);
+
+    if (mode == Editable) {
+        painter->setBrush(palette.highlight());
+    } else {
+        painter->setBrush(palette.foreground());
+    }
+
+    int yOffset = (rect.height() - PaintingScaleFactor) / 2;
+    painter->translate(rect.x(), rect.y() + yOffset);
+    painter->scale(PaintingScaleFactor, PaintingScaleFactor);
+
+    for (int i = 0; i < myMaxStarCount; ++i) {
+        if (i < myStarCount) {
+            painter->drawPolygon(starPolygon, Qt::WindingFill);
+        } else if (mode == Editable) {
+            painter->drawPolygon(diamondPolygon, Qt::WindingFill);
+        }
+        painter->translate(1.0, 0.0);
+    }
+
+    painter->restore();
+}
+//! [2]
diff --git a/examples/itemviews/stardelegate/starrating.h b/examples/itemviews/stardelegate/starrating.h
new file mode 100644
index 0000000000..1e73076450
--- /dev/null
+++ b/examples/itemviews/stardelegate/starrating.h
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef STARRATING_H
+#define STARRATING_H
+
+#include <QMetaType>
+#include <QPointF>
+#include <QVector>
+
+//! [0]
+class StarRating
+{
+public:
+    enum EditMode { Editable, ReadOnly };
+
+    StarRating(int starCount = 1, int maxStarCount = 5);
+
+    void paint(QPainter *painter, const QRect &rect,
+               const QPalette &palette, EditMode mode) const;
+    QSize sizeHint() const;
+    int starCount() const { return myStarCount; }
+    int maxStarCount() const { return myMaxStarCount; }
+    void setStarCount(int starCount) { myStarCount = starCount; }
+    void setMaxStarCount(int maxStarCount) { myMaxStarCount = maxStarCount; }
+
+private:
+    QPolygonF starPolygon;
+    QPolygonF diamondPolygon;
+    int myStarCount;
+    int myMaxStarCount;
+};
+//! [0]
+
+//! [1]
+Q_DECLARE_METATYPE(StarRating)
+//! [1]
+
+#endif
diff --git a/examples/layouts/README b/examples/layouts/README
new file mode 100644
index 0000000000..edaea78463
--- /dev/null
+++ b/examples/layouts/README
@@ -0,0 +1,41 @@
+Qt uses a layout-based approach to widget management. Widgets are arranged in
+the optimal positions in windows based on simple layout rules, leading to a
+consistent look and feel.
+
+Custom layouts can be used to provide more control over the positions and
+sizes of child widgets.
+
+
+The example launcher provided with Qt can be used to explore each of the
+examples in this directory.
+
+Documentation for these examples can be found via the Tutorial and Examples
+link in the main Qt documentation.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/layouts/basiclayouts/basiclayouts.pro b/examples/layouts/basiclayouts/basiclayouts.pro
new file mode 100644
index 0000000000..8fa73ffc5a
--- /dev/null
+++ b/examples/layouts/basiclayouts/basiclayouts.pro
@@ -0,0 +1,9 @@
+HEADERS     = dialog.h
+SOURCES     = dialog.cpp \
+              main.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/layouts/basiclayouts
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/layouts/basiclayouts
+INSTALLS += target sources
diff --git a/examples/layouts/basiclayouts/dialog.cpp b/examples/layouts/basiclayouts/dialog.cpp
new file mode 100644
index 0000000000..86cafb9d21
--- /dev/null
+++ b/examples/layouts/basiclayouts/dialog.cpp
@@ -0,0 +1,150 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "dialog.h"
+
+//! [0]
+Dialog::Dialog()
+{
+    createMenu();
+    createHorizontalGroupBox();
+    createGridGroupBox();
+    createFormGroupBox();
+//! [0]
+
+//! [1]
+    bigEditor = new QTextEdit;
+    bigEditor->setPlainText(tr("This widget takes up all the remaining space "
+                               "in the top-level layout."));
+
+    buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok
+                                     | QDialogButtonBox::Cancel);
+
+    connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
+    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+//! [1]
+
+//! [2]
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+//! [2] //! [3]
+    mainLayout->setMenuBar(menuBar);
+//! [3] //! [4]
+    mainLayout->addWidget(horizontalGroupBox);
+    mainLayout->addWidget(gridGroupBox);
+    mainLayout->addWidget(formGroupBox);
+    mainLayout->addWidget(bigEditor);
+    mainLayout->addWidget(buttonBox);
+//! [4] //! [5]
+    setLayout(mainLayout);
+
+    setWindowTitle(tr("Basic Layouts"));
+}
+//! [5]
+
+//! [6]
+void Dialog::createMenu()
+{
+    menuBar = new QMenuBar;
+
+    fileMenu = new QMenu(tr("&File"), this);
+    exitAction = fileMenu->addAction(tr("E&xit"));
+    menuBar->addMenu(fileMenu);
+
+    connect(exitAction, SIGNAL(triggered()), this, SLOT(accept()));
+}
+//! [6]
+
+//! [7]
+void Dialog::createHorizontalGroupBox()
+{
+    horizontalGroupBox = new QGroupBox(tr("Horizontal layout"));
+    QHBoxLayout *layout = new QHBoxLayout;
+
+    for (int i = 0; i < NumButtons; ++i) {
+        buttons[i] = new QPushButton(tr("Button %1").arg(i + 1));
+	layout->addWidget(buttons[i]);
+    }
+    horizontalGroupBox->setLayout(layout);
+}
+//! [7]
+
+//! [8]
+void Dialog::createGridGroupBox()
+{
+    gridGroupBox = new QGroupBox(tr("Grid layout"));
+//! [8]
+    QGridLayout *layout = new QGridLayout;
+
+//! [9]
+    for (int i = 0; i < NumGridRows; ++i) {
+	labels[i] = new QLabel(tr("Line %1:").arg(i + 1));
+	lineEdits[i] = new QLineEdit;
+	layout->addWidget(labels[i], i + 1, 0);
+	layout->addWidget(lineEdits[i], i + 1, 1);
+    }
+
+//! [9] //! [10]
+    smallEditor = new QTextEdit;
+    smallEditor->setPlainText(tr("This widget takes up about two thirds of the "
+                                 "grid layout."));
+    layout->addWidget(smallEditor, 0, 2, 4, 1);
+//! [10]
+
+//! [11]
+    layout->setColumnStretch(1, 10);
+    layout->setColumnStretch(2, 20);
+    gridGroupBox->setLayout(layout);
+}
+//! [11]
+
+//! [12]
+void Dialog::createFormGroupBox()
+{
+    formGroupBox = new QGroupBox(tr("Form layout"));
+    QFormLayout *layout = new QFormLayout;
+    layout->addRow(new QLabel(tr("Line 1:")), new QLineEdit);
+    layout->addRow(new QLabel(tr("Line 2, long text:")), new QComboBox);
+    layout->addRow(new QLabel(tr("Line 3:")), new QSpinBox);
+    formGroupBox->setLayout(layout);
+}
+//! [12]
diff --git a/examples/layouts/basiclayouts/dialog.h b/examples/layouts/basiclayouts/dialog.h
new file mode 100644
index 0000000000..b6b1e3a5a3
--- /dev/null
+++ b/examples/layouts/basiclayouts/dialog.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DIALOG_H
+#define DIALOG_H
+
+#include <QDialog>
+
+QT_BEGIN_NAMESPACE
+class QAction;
+class QDialogButtonBox;
+class QGroupBox;
+class QLabel;
+class QLineEdit;
+class QMenu;
+class QMenuBar;
+class QPushButton;
+class QTextEdit;
+QT_END_NAMESPACE
+
+//! [0]
+class Dialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    Dialog();
+
+private:
+    void createMenu();
+    void createHorizontalGroupBox();
+    void createGridGroupBox();
+    void createFormGroupBox();
+
+    enum { NumGridRows = 3, NumButtons = 4 };
+
+    QMenuBar *menuBar;
+    QGroupBox *horizontalGroupBox;
+    QGroupBox *gridGroupBox;
+    QGroupBox *formGroupBox;
+    QTextEdit *smallEditor;
+    QTextEdit *bigEditor;
+    QLabel *labels[NumGridRows];
+    QLineEdit *lineEdits[NumGridRows];
+    QPushButton *buttons[NumButtons];
+    QDialogButtonBox *buttonBox;
+
+    QMenu *fileMenu;
+    QAction *exitAction;
+};
+//! [0]
+
+#endif
diff --git a/examples/layouts/basiclayouts/main.cpp b/examples/layouts/basiclayouts/main.cpp
new file mode 100644
index 0000000000..09c49eece3
--- /dev/null
+++ b/examples/layouts/basiclayouts/main.cpp
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "dialog.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Dialog dialog;
+    return dialog.exec();
+}
diff --git a/examples/layouts/borderlayout/borderlayout.cpp b/examples/layouts/borderlayout/borderlayout.cpp
new file mode 100644
index 0000000000..25a4778e19
--- /dev/null
+++ b/examples/layouts/borderlayout/borderlayout.cpp
@@ -0,0 +1,214 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "borderlayout.h"
+
+BorderLayout::BorderLayout(QWidget *parent, int margin, int spacing)
+    : QLayout(parent)
+{
+    setMargin(margin);
+    setSpacing(spacing);
+}
+
+BorderLayout::BorderLayout(int spacing)
+{
+    setSpacing(spacing);
+}
+
+
+BorderLayout::~BorderLayout()
+{
+    QLayoutItem *l;
+    while ((l = takeAt(0)))
+        delete l;
+}
+
+void BorderLayout::addItem(QLayoutItem *item)
+{
+    add(item, West);
+}
+
+void BorderLayout::addWidget(QWidget *widget, Position position)
+{
+    add(new QWidgetItem(widget), position);
+}
+
+Qt::Orientations BorderLayout::expandingDirections() const
+{
+    return Qt::Horizontal | Qt::Vertical;
+}
+
+bool BorderLayout::hasHeightForWidth() const
+{
+    return false;
+}
+
+int BorderLayout::count() const
+{
+    return list.size();
+}
+
+QLayoutItem *BorderLayout::itemAt(int index) const
+{
+    ItemWrapper *wrapper = list.value(index);
+    if (wrapper)
+        return wrapper->item;
+    else
+        return 0;
+}
+
+QSize BorderLayout::minimumSize() const
+{
+    return calculateSize(MinimumSize);
+}
+
+void BorderLayout::setGeometry(const QRect &rect)
+{
+    ItemWrapper *center = 0;
+    int eastWidth = 0;
+    int westWidth = 0;
+    int northHeight = 0;
+    int southHeight = 0;
+    int centerHeight = 0;
+    int i;
+
+    QLayout::setGeometry(rect);
+
+    for (i = 0; i < list.size(); ++i) {
+        ItemWrapper *wrapper = list.at(i);
+        QLayoutItem *item = wrapper->item;
+        Position position = wrapper->position;
+
+        if (position == North) {
+            item->setGeometry(QRect(rect.x(), northHeight, rect.width(),
+                                    item->sizeHint().height()));
+
+            northHeight += item->geometry().height() + spacing();
+        } else if (position == South) {
+            item->setGeometry(QRect(item->geometry().x(),
+                                    item->geometry().y(), rect.width(),
+                                    item->sizeHint().height()));
+
+            southHeight += item->geometry().height() + spacing();
+
+            item->setGeometry(QRect(rect.x(),
+                              rect.y() + rect.height() - southHeight + spacing(),
+                              item->geometry().width(),
+                              item->geometry().height()));
+        } else if (position == Center) {
+            center = wrapper;
+        }
+    }
+
+    centerHeight = rect.height() - northHeight - southHeight;
+
+    for (i = 0; i < list.size(); ++i) {
+        ItemWrapper *wrapper = list.at(i);
+        QLayoutItem *item = wrapper->item;
+        Position position = wrapper->position;
+
+        if (position == West) {
+            item->setGeometry(QRect(rect.x() + westWidth, northHeight,
+                                    item->sizeHint().width(), centerHeight));
+
+            westWidth += item->geometry().width() + spacing();
+        } else if (position == East) {
+            item->setGeometry(QRect(item->geometry().x(), item->geometry().y(),
+                                    item->sizeHint().width(), centerHeight));
+
+            eastWidth += item->geometry().width() + spacing();
+
+            item->setGeometry(QRect(
+                              rect.x() + rect.width() - eastWidth + spacing(),
+                              northHeight, item->geometry().width(),
+                              item->geometry().height()));
+        }
+    }
+
+    if (center)
+        center->item->setGeometry(QRect(westWidth, northHeight,
+                                        rect.width() - eastWidth - westWidth,
+                                        centerHeight));
+}
+
+QSize BorderLayout::sizeHint() const
+{
+    return calculateSize(SizeHint);
+}
+
+QLayoutItem *BorderLayout::takeAt(int index)
+{
+    if (index >= 0 && index < list.size()) {
+        ItemWrapper *layoutStruct = list.takeAt(index);
+        return layoutStruct->item;
+    }
+    return 0;
+}
+
+void BorderLayout::add(QLayoutItem *item, Position position)
+{
+    list.append(new ItemWrapper(item, position));
+}
+
+QSize BorderLayout::calculateSize(SizeType sizeType) const
+{
+    QSize totalSize;
+
+    for (int i = 0; i < list.size(); ++i) {
+        ItemWrapper *wrapper = list.at(i);
+        Position position = wrapper->position;
+        QSize itemSize;
+
+        if (sizeType == MinimumSize)
+            itemSize = wrapper->item->minimumSize();
+        else // (sizeType == SizeHint)
+            itemSize = wrapper->item->sizeHint();
+
+        if (position == North || position == South || position == Center)
+            totalSize.rheight() += itemSize.height();
+
+        if (position == West || position == East || position == Center)
+            totalSize.rwidth() += itemSize.width();
+    }
+    return totalSize;
+}
diff --git a/examples/layouts/borderlayout/borderlayout.h b/examples/layouts/borderlayout/borderlayout.h
new file mode 100644
index 0000000000..781a01fd36
--- /dev/null
+++ b/examples/layouts/borderlayout/borderlayout.h
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BORDERLAYOUT_H
+#define BORDERLAYOUT_H
+
+#include <QLayout>
+#include <QRect>
+#include <QWidgetItem>
+
+class BorderLayout : public QLayout
+{
+public:
+    enum Position { West, North, South, East, Center };
+
+    BorderLayout(QWidget *parent, int margin = 0, int spacing = -1);
+    BorderLayout(int spacing = -1);
+    ~BorderLayout();
+
+    void addItem(QLayoutItem *item);
+    void addWidget(QWidget *widget, Position position);
+    Qt::Orientations expandingDirections() const;
+    bool hasHeightForWidth() const;
+    int count() const;
+    QLayoutItem *itemAt(int index) const;
+    QSize minimumSize() const;
+    void setGeometry(const QRect &rect);
+    QSize sizeHint() const;
+    QLayoutItem *takeAt(int index);
+
+    void add(QLayoutItem *item, Position position);
+
+private:
+    struct ItemWrapper
+    {
+	ItemWrapper(QLayoutItem *i, Position p) {
+	    item = i;
+	    position = p;
+	}
+
+	QLayoutItem *item;
+	Position position;
+    };
+
+    enum SizeType { MinimumSize, SizeHint };
+    QSize calculateSize(SizeType sizeType) const;
+
+    QList<ItemWrapper *> list;
+};
+
+#endif
diff --git a/examples/layouts/borderlayout/borderlayout.pro b/examples/layouts/borderlayout/borderlayout.pro
new file mode 100644
index 0000000000..e327574ebc
--- /dev/null
+++ b/examples/layouts/borderlayout/borderlayout.pro
@@ -0,0 +1,11 @@
+HEADERS     = borderlayout.h \
+              window.h
+SOURCES     = borderlayout.cpp \
+              main.cpp \
+              window.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/layouts/borderlayout
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/layouts/borderlayout
+INSTALLS += target sources
diff --git a/examples/layouts/borderlayout/main.cpp b/examples/layouts/borderlayout/main.cpp
new file mode 100644
index 0000000000..fa8b0abb9d
--- /dev/null
+++ b/examples/layouts/borderlayout/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "window.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Window window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/layouts/borderlayout/window.cpp b/examples/layouts/borderlayout/window.cpp
new file mode 100644
index 0000000000..2b085517a5
--- /dev/null
+++ b/examples/layouts/borderlayout/window.cpp
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "borderlayout.h"
+#include "window.h"
+
+Window::Window()
+{
+    QTextBrowser *centralWidget = new QTextBrowser;
+    centralWidget->setPlainText(tr("Central widget"));
+
+    BorderLayout *layout = new BorderLayout;
+    layout->addWidget(centralWidget, BorderLayout::Center);
+    layout->addWidget(createLabel("North"), BorderLayout::North);
+    layout->addWidget(createLabel("West"), BorderLayout::West);
+    layout->addWidget(createLabel("East 1"), BorderLayout::East);
+    layout->addWidget(createLabel("East 2") , BorderLayout::East);
+    layout->addWidget(createLabel("South"), BorderLayout::South);
+    setLayout(layout);
+
+    setWindowTitle(tr("Border Layout"));
+}
+
+QLabel *Window::createLabel(const QString &text)
+{
+    QLabel *label = new QLabel(text);
+    label->setFrameStyle(QFrame::Box | QFrame::Raised);
+    return label;
+}
diff --git a/examples/layouts/borderlayout/window.h b/examples/layouts/borderlayout/window.h
new file mode 100644
index 0000000000..708d2702d0
--- /dev/null
+++ b/examples/layouts/borderlayout/window.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QLabel;
+QT_END_NAMESPACE
+
+class Window : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Window();
+
+private:
+    QLabel *createLabel(const QString &text);
+};
+
+#endif
diff --git a/examples/layouts/dynamiclayouts/dialog.cpp b/examples/layouts/dynamiclayouts/dialog.cpp
new file mode 100644
index 0000000000..eee15f60be
--- /dev/null
+++ b/examples/layouts/dynamiclayouts/dialog.cpp
@@ -0,0 +1,170 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "dialog.h"
+
+Dialog::Dialog(QWidget *parent)
+    : QDialog(parent)
+{
+    createRotableGroupBox();
+    createOptionsGroupBox();
+    createButtonBox();
+
+    mainLayout = new QGridLayout;
+    mainLayout->addWidget(rotableGroupBox, 0, 0);
+    mainLayout->addWidget(optionsGroupBox, 1, 0);
+    mainLayout->addWidget(buttonBox, 2, 0);
+    setLayout(mainLayout);
+
+    mainLayout->setSizeConstraint(QLayout::SetMinimumSize);
+
+    setWindowTitle(tr("Dynamic Layouts"));
+}
+
+void Dialog::buttonsOrientationChanged(int index)
+{
+    mainLayout->setSizeConstraint(QLayout::SetNoConstraint);
+    setMinimumSize(0, 0);
+
+    Qt::Orientation orientation = Qt::Orientation(
+            buttonsOrientationComboBox->itemData(index).toInt());
+
+    if (orientation == buttonBox->orientation())
+        return;
+
+    mainLayout->removeWidget(buttonBox);
+
+    int spacing = mainLayout->spacing();
+
+    QSize oldSizeHint = buttonBox->sizeHint() + QSize(spacing, spacing);
+    buttonBox->setOrientation(orientation);
+    QSize newSizeHint = buttonBox->sizeHint() + QSize(spacing, spacing);
+
+    if (orientation == Qt::Horizontal) {
+        mainLayout->addWidget(buttonBox, 2, 0);
+        resize(size() + QSize(-oldSizeHint.width(), newSizeHint.height()));
+    } else {
+        mainLayout->addWidget(buttonBox, 0, 3, 2, 1);
+        resize(size() + QSize(newSizeHint.width(), -oldSizeHint.height()));
+    }
+
+    mainLayout->setSizeConstraint(QLayout::SetDefaultConstraint);
+}
+
+void Dialog::rotateWidgets()
+{
+    Q_ASSERT(rotableWidgets.count() % 2 == 0);
+
+    foreach (QWidget *widget, rotableWidgets)
+        rotableLayout->removeWidget(widget);
+
+    rotableWidgets.enqueue(rotableWidgets.dequeue());
+
+    const int n = rotableWidgets.count();
+    for (int i = 0; i < n / 2; ++i) {
+        rotableLayout->addWidget(rotableWidgets[n - i - 1], 0, i);
+        rotableLayout->addWidget(rotableWidgets[i], 1, i);
+    }
+}
+
+void Dialog::help()
+{
+    QMessageBox::information(this, tr("Dynamic Layouts Help"),
+                               tr("This example shows how to change layouts "
+                                  "dynamically."));
+}
+
+void Dialog::createRotableGroupBox()
+{
+    rotableGroupBox = new QGroupBox(tr("Rotable Widgets"));
+
+    rotableWidgets.enqueue(new QSpinBox);
+    rotableWidgets.enqueue(new QSlider);
+    rotableWidgets.enqueue(new QDial);
+    rotableWidgets.enqueue(new QProgressBar);
+
+    int n = rotableWidgets.count();
+    for (int i = 0; i < n; ++i) {
+        connect(rotableWidgets[i], SIGNAL(valueChanged(int)),
+                rotableWidgets[(i + 1) % n], SLOT(setValue(int)));
+    }
+
+    rotableLayout = new QGridLayout;
+    rotableGroupBox->setLayout(rotableLayout);
+
+    rotateWidgets();
+}
+
+void Dialog::createOptionsGroupBox()
+{
+    optionsGroupBox = new QGroupBox(tr("Options"));
+
+    buttonsOrientationLabel = new QLabel(tr("Orientation of buttons:"));
+
+    buttonsOrientationComboBox = new QComboBox;
+    buttonsOrientationComboBox->addItem(tr("Horizontal"), Qt::Horizontal);
+    buttonsOrientationComboBox->addItem(tr("Vertical"), Qt::Vertical);
+
+    connect(buttonsOrientationComboBox, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(buttonsOrientationChanged(int)));
+
+    optionsLayout = new QGridLayout;
+    optionsLayout->addWidget(buttonsOrientationLabel, 0, 0);
+    optionsLayout->addWidget(buttonsOrientationComboBox, 0, 1);
+    optionsLayout->setColumnStretch(2, 1);
+    optionsGroupBox->setLayout(optionsLayout);
+}
+
+void Dialog::createButtonBox()
+{
+    buttonBox = new QDialogButtonBox;
+
+    closeButton = buttonBox->addButton(QDialogButtonBox::Close);
+    helpButton = buttonBox->addButton(QDialogButtonBox::Help);
+    rotateWidgetsButton = buttonBox->addButton(tr("Rotate &Widgets"),
+                                               QDialogButtonBox::ActionRole);
+
+    connect(rotateWidgetsButton, SIGNAL(clicked()), this, SLOT(rotateWidgets()));
+    connect(closeButton, SIGNAL(clicked()), this, SLOT(close()));
+    connect(helpButton, SIGNAL(clicked()), this, SLOT(help()));
+}
diff --git a/examples/layouts/dynamiclayouts/dialog.h b/examples/layouts/dynamiclayouts/dialog.h
new file mode 100644
index 0000000000..bc1225ad38
--- /dev/null
+++ b/examples/layouts/dynamiclayouts/dialog.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DIALOG_H
+#define DIALOG_H
+
+#include <QDialog>
+#include <QQueue>
+
+QT_BEGIN_NAMESPACE
+class QComboBox;
+class QDialogButtonBox;
+class QGridLayout;
+class QGroupBox;
+class QLabel;
+class QPushButton;
+QT_END_NAMESPACE
+
+class Dialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    Dialog(QWidget *parent = 0);
+
+private slots:
+    void buttonsOrientationChanged(int index);
+    void rotateWidgets();
+    void help();
+
+private:
+    void createRotableGroupBox();
+    void createOptionsGroupBox();
+    void createButtonBox();
+
+    QGroupBox *rotableGroupBox;
+    QQueue<QWidget *> rotableWidgets;
+
+    QGroupBox *optionsGroupBox;
+    QLabel *buttonsOrientationLabel;
+    QComboBox *buttonsOrientationComboBox;
+
+    QDialogButtonBox *buttonBox;
+    QPushButton *closeButton;
+    QPushButton *helpButton;
+    QPushButton *rotateWidgetsButton;
+
+    QGridLayout *mainLayout;
+    QGridLayout *rotableLayout;
+    QGridLayout *optionsLayout;
+};
+
+#endif
diff --git a/examples/layouts/dynamiclayouts/dynamiclayouts.pro b/examples/layouts/dynamiclayouts/dynamiclayouts.pro
new file mode 100644
index 0000000000..c169dd0fd6
--- /dev/null
+++ b/examples/layouts/dynamiclayouts/dynamiclayouts.pro
@@ -0,0 +1,9 @@
+HEADERS     = dialog.h
+SOURCES     = dialog.cpp \
+              main.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/layouts/dynamiclayouts
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/layouts/dynamiclayouts
+INSTALLS += target sources
diff --git a/examples/layouts/dynamiclayouts/main.cpp b/examples/layouts/dynamiclayouts/main.cpp
new file mode 100644
index 0000000000..09c49eece3
--- /dev/null
+++ b/examples/layouts/dynamiclayouts/main.cpp
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "dialog.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Dialog dialog;
+    return dialog.exec();
+}
diff --git a/examples/layouts/flowlayout/flowlayout.cpp b/examples/layouts/flowlayout/flowlayout.cpp
new file mode 100644
index 0000000000..d1e857d591
--- /dev/null
+++ b/examples/layouts/flowlayout/flowlayout.cpp
@@ -0,0 +1,154 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "flowlayout.h"
+
+FlowLayout::FlowLayout(QWidget *parent, int margin, int spacing)
+    : QLayout(parent)
+{
+    setMargin(margin);
+    setSpacing(spacing);
+}
+
+FlowLayout::FlowLayout(int spacing)
+{
+    setSpacing(spacing);
+}
+
+FlowLayout::~FlowLayout()
+{
+    QLayoutItem *item;
+    while ((item = takeAt(0)))
+        delete item;
+}
+
+void FlowLayout::addItem(QLayoutItem *item)
+{
+    itemList.append(item);
+}
+
+int FlowLayout::count() const
+{
+    return itemList.size();
+}
+
+QLayoutItem *FlowLayout::itemAt(int index) const
+{
+    return itemList.value(index);
+}
+
+QLayoutItem *FlowLayout::takeAt(int index)
+{
+    if (index >= 0 && index < itemList.size())
+        return itemList.takeAt(index);
+    else
+        return 0;
+}
+
+Qt::Orientations FlowLayout::expandingDirections() const
+{
+    return 0;
+}
+
+bool FlowLayout::hasHeightForWidth() const
+{
+    return true;
+}
+
+int FlowLayout::heightForWidth(int width) const
+{
+    int height = doLayout(QRect(0, 0, width, 0), true);
+    return height;
+}
+
+void FlowLayout::setGeometry(const QRect &rect)
+{
+    QLayout::setGeometry(rect);
+    doLayout(rect, false);
+}
+
+QSize FlowLayout::sizeHint() const
+{
+    return minimumSize();
+}
+
+QSize FlowLayout::minimumSize() const
+{
+    QSize size;
+    QLayoutItem *item;
+    foreach (item, itemList)
+        size = size.expandedTo(item->minimumSize());
+
+    size += QSize(2*margin(), 2*margin());
+    return size;
+}
+
+int FlowLayout::doLayout(const QRect &rect, bool testOnly) const
+{
+    int x = rect.x();
+    int y = rect.y();
+    int lineHeight = 0;
+
+    QLayoutItem *item;
+    foreach (item, itemList) {
+        QWidget *wid = item->widget();
+        int spaceX = spacing() + wid->style()->layoutSpacing(
+                QSizePolicy::PushButton, QSizePolicy::PushButton, Qt::Horizontal);
+        int spaceY = spacing() + wid->style()->layoutSpacing(
+                QSizePolicy::PushButton, QSizePolicy::PushButton, Qt::Vertical);
+        int nextX = x + item->sizeHint().width() + spaceX;
+        if (nextX - spaceX > rect.right() && lineHeight > 0) {
+            x = rect.x();
+            y = y + lineHeight + spaceY;
+            nextX = x + item->sizeHint().width() + spaceX;
+            lineHeight = 0;
+        }
+
+        if (!testOnly)
+            item->setGeometry(QRect(QPoint(x, y), item->sizeHint()));
+
+        x = nextX;
+        lineHeight = qMax(lineHeight, item->sizeHint().height());
+    }
+    return y + lineHeight - rect.y();
+}
diff --git a/examples/layouts/flowlayout/flowlayout.h b/examples/layouts/flowlayout/flowlayout.h
new file mode 100644
index 0000000000..f864d8eeab
--- /dev/null
+++ b/examples/layouts/flowlayout/flowlayout.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef FLOWLAYOUT_H
+#define FLOWLAYOUT_H
+
+#include <QLayout>
+#include <QRect>
+#include <QWidgetItem>
+
+class FlowLayout : public QLayout
+{
+public:
+    FlowLayout(QWidget *parent, int margin = -1, int spacing = 0);
+    FlowLayout(int spacing = 0);
+    ~FlowLayout();
+
+    void addItem(QLayoutItem *item);
+    Qt::Orientations expandingDirections() const;
+    bool hasHeightForWidth() const;
+    int heightForWidth(int) const;
+    int count() const;
+    QLayoutItem *itemAt(int index) const;
+    QSize minimumSize() const;
+    void setGeometry(const QRect &rect);
+    QSize sizeHint() const;
+    QLayoutItem *takeAt(int index);
+
+private:
+    int doLayout(const QRect &rect, bool testOnly) const;
+
+    QList<QLayoutItem *> itemList;
+};
+
+#endif
diff --git a/examples/layouts/flowlayout/flowlayout.pro b/examples/layouts/flowlayout/flowlayout.pro
new file mode 100644
index 0000000000..0e9782459c
--- /dev/null
+++ b/examples/layouts/flowlayout/flowlayout.pro
@@ -0,0 +1,11 @@
+HEADERS     = flowlayout.h \
+              window.h
+SOURCES     = flowlayout.cpp \
+              main.cpp \
+              window.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/layouts/flowlayout
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/layouts/flowlayout
+INSTALLS += target sources
diff --git a/examples/layouts/flowlayout/main.cpp b/examples/layouts/flowlayout/main.cpp
new file mode 100644
index 0000000000..fa8b0abb9d
--- /dev/null
+++ b/examples/layouts/flowlayout/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "window.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Window window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/layouts/flowlayout/window.cpp b/examples/layouts/flowlayout/window.cpp
new file mode 100644
index 0000000000..51d9886721
--- /dev/null
+++ b/examples/layouts/flowlayout/window.cpp
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "flowlayout.h"
+#include "window.h"
+
+Window::Window()
+{
+    FlowLayout *flowLayout = new FlowLayout;
+
+    flowLayout->addWidget(new QPushButton(tr("Short")));
+    flowLayout->addWidget(new QPushButton(tr("Longer")));
+    flowLayout->addWidget(new QPushButton(tr("Different text")));
+    flowLayout->addWidget(new QPushButton(tr("More text")));
+    flowLayout->addWidget(new QPushButton(tr("Even longer button text")));
+    setLayout(flowLayout);
+
+    setWindowTitle(tr("Flow Layout"));
+}
diff --git a/examples/layouts/flowlayout/window.h b/examples/layouts/flowlayout/window.h
new file mode 100644
index 0000000000..ffd60af93d
--- /dev/null
+++ b/examples/layouts/flowlayout/window.h
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QLabel;
+QT_END_NAMESPACE
+
+class Window : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Window();
+};
+
+#endif
diff --git a/examples/layouts/layouts.pro b/examples/layouts/layouts.pro
new file mode 100644
index 0000000000..9676f4b690
--- /dev/null
+++ b/examples/layouts/layouts.pro
@@ -0,0 +1,10 @@
+TEMPLATE      = subdirs
+SUBDIRS       = basiclayouts \
+                borderlayout \
+                dynamiclayouts \
+                flowlayout
+
+# install
+sources.files = README *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/layouts
+INSTALLS += sources
diff --git a/examples/linguist/README b/examples/linguist/README
new file mode 100644
index 0000000000..d1ef0057e4
--- /dev/null
+++ b/examples/linguist/README
@@ -0,0 +1,37 @@
+Internationalization is a core feature of Qt. These examples show how to
+access translation and localization facilities at run-time.
+
+
+The example launcher provided with Qt can be used to explore each of the
+examples in this directory.
+
+Documentation for these examples can be found via the Tutorial and Examples
+link in the main Qt documentation.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/linguist/arrowpad/arrowpad.cpp b/examples/linguist/arrowpad/arrowpad.cpp
new file mode 100644
index 0000000000..149247e4ff
--- /dev/null
+++ b/examples/linguist/arrowpad/arrowpad.cpp
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "arrowpad.h"
+
+ArrowPad::ArrowPad(QWidget *parent)
+    : QWidget(parent)
+{
+//! [0]
+    upButton = new QPushButton(tr("&Up"));
+//! [0] //! [1]
+    downButton = new QPushButton(tr("&Down"));
+//! [1] //! [2]
+    leftButton = new QPushButton(tr("&Left"));
+//! [2] //! [3]
+    rightButton = new QPushButton(tr("&Right"));
+//! [3]
+
+    QGridLayout *mainLayout = new QGridLayout;
+    mainLayout->addWidget(upButton, 0, 1);
+    mainLayout->addWidget(leftButton, 1, 0);
+    mainLayout->addWidget(rightButton, 1, 2);
+    mainLayout->addWidget(downButton, 2, 1);
+    setLayout(mainLayout);
+}
diff --git a/examples/linguist/arrowpad/arrowpad.h b/examples/linguist/arrowpad/arrowpad.h
new file mode 100644
index 0000000000..d87a40c952
--- /dev/null
+++ b/examples/linguist/arrowpad/arrowpad.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ARROWPAD_H
+#define ARROWPAD_H
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QPushButton;
+QT_END_NAMESPACE
+
+//! [0]
+class ArrowPad : public QWidget
+//! [0] //! [1]
+{
+//! [1] //! [2]
+    Q_OBJECT
+//! [2]
+
+public:
+    ArrowPad(QWidget *parent = 0);
+
+private:
+    QPushButton *upButton;
+    QPushButton *downButton;
+    QPushButton *leftButton;
+    QPushButton *rightButton;
+};
+
+#endif
diff --git a/examples/linguist/arrowpad/arrowpad.pro b/examples/linguist/arrowpad/arrowpad.pro
new file mode 100644
index 0000000000..c8a6fb2fee
--- /dev/null
+++ b/examples/linguist/arrowpad/arrowpad.pro
@@ -0,0 +1,16 @@
+#! [0]
+HEADERS      = arrowpad.h \
+               mainwindow.h
+SOURCES      = arrowpad.cpp \
+               main.cpp \
+               mainwindow.cpp
+#! [0] #! [1]
+TRANSLATIONS = arrowpad_fr.ts \
+               arrowpad_nl.ts
+#! [1]
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/linguist/arrowpad
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/linguist/arrowpad
+INSTALLS += target sources
diff --git a/examples/linguist/arrowpad/main.cpp b/examples/linguist/arrowpad/main.cpp
new file mode 100644
index 0000000000..912cac41b3
--- /dev/null
+++ b/examples/linguist/arrowpad/main.cpp
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+//! [0]
+int main(int argc, char *argv[])
+//! [0] //! [1]
+{
+    QApplication app(argc, argv);
+
+    QString locale = QLocale::system().name();
+
+//! [2]
+    QTranslator translator;
+//! [2] //! [3]
+    translator.load(QString("arrowpad_") + locale);
+    app.installTranslator(&translator);
+//! [1] //! [3]
+
+    MainWindow mainWindow;
+    mainWindow.show();
+    return app.exec();
+}
diff --git a/examples/linguist/arrowpad/mainwindow.cpp b/examples/linguist/arrowpad/mainwindow.cpp
new file mode 100644
index 0000000000..a167cc2a37
--- /dev/null
+++ b/examples/linguist/arrowpad/mainwindow.cpp
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "arrowpad.h"
+#include "mainwindow.h"
+
+MainWindow::MainWindow()
+{
+//! [0]
+    arrowPad = new ArrowPad;
+//! [0]
+    setCentralWidget(arrowPad);
+
+//! [1]
+    exitAct = new QAction(tr("E&xit"), this);
+    exitAct->setShortcut(tr("Ctrl+Q"));
+    connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));
+//! [1]
+
+    fileMenu = menuBar()->addMenu(tr("&File"));
+    fileMenu->addAction(exitAct);
+}
diff --git a/examples/linguist/arrowpad/mainwindow.h b/examples/linguist/arrowpad/mainwindow.h
new file mode 100644
index 0000000000..74e89be34c
--- /dev/null
+++ b/examples/linguist/arrowpad/mainwindow.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+
+QT_BEGIN_NAMESPACE
+class QAction;
+class QMenu;
+QT_END_NAMESPACE
+class ArrowPad;
+
+//! [0]
+class MainWindow : public QMainWindow
+//! [0] //! [1]
+{
+    Q_OBJECT
+//! [1]
+
+public:
+    MainWindow();
+
+private:
+    ArrowPad *arrowPad;
+    QMenu *fileMenu;
+    QAction *exitAct;
+};
+
+#endif
diff --git a/examples/linguist/hellotr/hellotr.pro b/examples/linguist/hellotr/hellotr.pro
new file mode 100644
index 0000000000..c0065a4e37
--- /dev/null
+++ b/examples/linguist/hellotr/hellotr.pro
@@ -0,0 +1,11 @@
+#! [0]
+SOURCES      = main.cpp
+#! [0] #! [1]
+TRANSLATIONS = hellotr_la.ts
+#! [1]
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/linguist/hellotr
+sources.files = $$SOURCES *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/linguist/hellotr
+INSTALLS += target sources
diff --git a/examples/linguist/hellotr/main.cpp b/examples/linguist/hellotr/main.cpp
new file mode 100644
index 0000000000..f98089da37
--- /dev/null
+++ b/examples/linguist/hellotr/main.cpp
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QPushButton>
+//! [0]
+#include <QTranslator>
+//! [0]
+
+//! [1] //! [2]
+int main(int argc, char *argv[])
+//! [1] //! [3] //! [4]
+{
+    QApplication app(argc, argv);
+//! [3]
+
+//! [5]
+    QTranslator translator;
+//! [5] //! [6]
+    translator.load("hellotr_la");
+//! [6] //! [7]
+    app.installTranslator(&translator);
+//! [4] //! [7]
+
+//! [8]
+    QPushButton hello(QPushButton::tr("Hello world!"));
+//! [8]
+    hello.resize(100, 30);
+
+    hello.show();
+    return app.exec();
+}
+//! [2]
diff --git a/examples/linguist/linguist.pro b/examples/linguist/linguist.pro
new file mode 100644
index 0000000000..921667df47
--- /dev/null
+++ b/examples/linguist/linguist.pro
@@ -0,0 +1,9 @@
+TEMPLATE      = subdirs
+SUBDIRS       = arrowpad \
+                hellotr \
+                trollprint
+
+# install
+sources.files = README *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/linguist
+INSTALLS += sources
diff --git a/examples/linguist/trollprint/main.cpp b/examples/linguist/trollprint/main.cpp
new file mode 100644
index 0000000000..9f37661f6c
--- /dev/null
+++ b/examples/linguist/trollprint/main.cpp
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QString locale = QLocale::system().name();
+
+//! [0]
+    QTranslator translator;
+    translator.load(QString("trollprint_") + locale);
+    app.installTranslator(&translator);
+//! [0]
+
+    MainWindow mainWindow;
+    mainWindow.show();
+    return app.exec();
+}
diff --git a/examples/linguist/trollprint/mainwindow.cpp b/examples/linguist/trollprint/mainwindow.cpp
new file mode 100644
index 0000000000..f7aa1ca90d
--- /dev/null
+++ b/examples/linguist/trollprint/mainwindow.cpp
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+#include "printpanel.h"
+
+MainWindow::MainWindow()
+{
+    printPanel = new PrintPanel;
+    setCentralWidget(printPanel);
+
+    createActions();
+    createMenus();
+
+//! [0]
+    setWindowTitle(tr("Troll Print 1.0"));
+//! [0]
+}
+
+void MainWindow::about()
+{
+    QMessageBox::information(this, tr("About Troll Print 1.0"),
+                      tr("Troll Print 1.0.\n\n"
+                      "Copyright 1999 Software, Inc."));
+}
+
+//! [1]
+void MainWindow::createActions()
+{
+//! [2]
+    exitAct = new QAction(tr("E&xit"), this);
+    exitAct->setShortcut(tr("Ctrl+Q", "Quit"));
+//! [2]
+    connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));
+
+    aboutAct = new QAction(tr("&About"), this);
+    aboutAct->setShortcut(Qt::Key_F1);
+    connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
+
+    aboutQtAct = new QAction(tr("About &Qt"), this);
+    connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+}
+
+void MainWindow::createMenus()
+//! [1] //! [3]
+{
+    QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
+    fileMenu->addAction(exitAct);
+
+    menuBar()->addSeparator();
+
+    QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
+    helpMenu->addAction(aboutAct);
+    helpMenu->addAction(aboutQtAct);
+}
+//! [3]
diff --git a/examples/linguist/trollprint/mainwindow.h b/examples/linguist/trollprint/mainwindow.h
new file mode 100644
index 0000000000..415512bff4
--- /dev/null
+++ b/examples/linguist/trollprint/mainwindow.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+
+QT_BEGIN_NAMESPACE
+class QAction;
+class QMenu;
+QT_END_NAMESPACE
+class PrintPanel;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+private slots:
+    void about();
+
+private:
+    void createActions();
+    void createMenus();
+
+    PrintPanel *printPanel;
+    QMenu *fileMenu;
+    QMenu *helpMenu;
+    QAction *exitAct;
+    QAction *aboutAct;
+    QAction *aboutQtAct;
+};
+
+#endif
diff --git a/examples/linguist/trollprint/printpanel.cpp b/examples/linguist/trollprint/printpanel.cpp
new file mode 100644
index 0000000000..888c12ae05
--- /dev/null
+++ b/examples/linguist/trollprint/printpanel.cpp
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "printpanel.h"
+
+//! [0]
+PrintPanel::PrintPanel(QWidget *parent)
+    : QWidget(parent)
+{
+/*
+    QLabel *label = new QLabel(tr("<b>TROLL PRINT</b>"));
+    label->setAlignment(Qt::AlignCenter);
+*/
+//! [0]
+
+//! [1]
+    twoSidedGroupBox = new QGroupBox(tr("2-sided"));
+    twoSidedEnabledRadio = new QRadioButton(tr("Enabled"));
+    twoSidedDisabledRadio = new QRadioButton(tr("Disabled"));
+//! [1] //! [2]
+    twoSidedDisabledRadio->setChecked(true);
+
+    colorsGroupBox = new QGroupBox(tr("Colors"));
+    colorsEnabledRadio = new QRadioButton(tr("Enabled"));
+    colorsDisabledRadio = new QRadioButton(tr("Disabled"));
+//! [2]
+    colorsDisabledRadio->setChecked(true);
+
+    QHBoxLayout *twoSidedLayout = new QHBoxLayout;
+    twoSidedLayout->addWidget(twoSidedEnabledRadio);
+    twoSidedLayout->addWidget(twoSidedDisabledRadio);
+    twoSidedGroupBox->setLayout(twoSidedLayout);
+
+    QHBoxLayout *colorsLayout = new QHBoxLayout;
+    colorsLayout->addWidget(colorsEnabledRadio);
+    colorsLayout->addWidget(colorsDisabledRadio);
+    colorsGroupBox->setLayout(colorsLayout);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+/*
+    mainLayout->addWidget(label);
+*/
+    mainLayout->addWidget(twoSidedGroupBox);
+    mainLayout->addWidget(colorsGroupBox);
+    setLayout(mainLayout);
+}
diff --git a/examples/linguist/trollprint/printpanel.h b/examples/linguist/trollprint/printpanel.h
new file mode 100644
index 0000000000..f6eef67bc4
--- /dev/null
+++ b/examples/linguist/trollprint/printpanel.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PRINTPANEL_H
+#define PRINTPANEL_H
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QGroupBox;
+class QRadioButton;
+QT_END_NAMESPACE
+
+//! [0]
+class PrintPanel : public QWidget
+{
+    Q_OBJECT
+//! [0]
+
+public:
+    PrintPanel(QWidget *parent = 0);
+
+private:
+    QGroupBox *twoSidedGroupBox;
+    QGroupBox *colorsGroupBox;
+    QRadioButton *twoSidedEnabledRadio;
+    QRadioButton *twoSidedDisabledRadio;
+    QRadioButton *colorsEnabledRadio;
+    QRadioButton *colorsDisabledRadio;
+};
+
+#endif
diff --git a/examples/linguist/trollprint/trollprint.pro b/examples/linguist/trollprint/trollprint.pro
new file mode 100644
index 0000000000..9f3aaeb002
--- /dev/null
+++ b/examples/linguist/trollprint/trollprint.pro
@@ -0,0 +1,12 @@
+HEADERS       = mainwindow.h \
+                printpanel.h
+SOURCES       = main.cpp \
+                mainwindow.cpp \
+                printpanel.cpp
+TRANSLATIONS  = trollprint_pt.ts
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/linguist/trollprint
+sources.files = $$SOURCES $$HEADERS $$TRANSLATIONS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/linguist/trollprint
+INSTALLS += target sources
diff --git a/examples/linguist/trollprint/trollprint_pt.ts b/examples/linguist/trollprint/trollprint_pt.ts
new file mode 100644
index 0000000000..e5871bd087
--- /dev/null
+++ b/examples/linguist/trollprint/trollprint_pt.ts
@@ -0,0 +1,65 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Troll Print 1.0</source>
+        <translation>Troll Imprimir 1.0</translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation>&amp;Sair</translation>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation>&amp;Sobre</translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation>Sobre &amp;Qt</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>&amp;Arquivo</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>A&amp;juda</translation>
+    </message>
+    <message>
+        <source>About Troll Print 1.0</source>
+        <translation>Sobre Troll Imprimir 1.0</translation>
+    </message>
+    <message>
+        <source>Troll Print 1.0.
+
+Copyright 1999 Software, Inc.</source>
+        <translation>Troll Imprimir 1.0
+
+Copyright 1999 Software, Inc.</translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <comment>Quit</comment>
+        <translation>Ctrl+Q</translation>
+    </message>
+</context>
+<context>
+    <name>PrintPanel</name>
+    <message>
+        <source>2-sided</source>
+        <translation>2-lados</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Ativado</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Desativado</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation>Cores</translation>
+    </message>
+</context>
+</TS>
diff --git a/examples/mainwindows/README b/examples/mainwindows/README
new file mode 100644
index 0000000000..15a6c23e4b
--- /dev/null
+++ b/examples/mainwindows/README
@@ -0,0 +1,40 @@
+All the standard features of application main windows are provided by Qt.
+
+Main windows can have pull down menus, tool bars, and dock windows. These
+separate forms of user input are unified in an integrated action system that
+also supports keyboard shortcuts and accelerator keys in menu items.
+
+
+The example launcher provided with Qt can be used to explore each of the
+examples in this directory.
+
+Documentation for these examples can be found via the Tutorial and Examples
+link in the main Qt documentation.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/mainwindows/application/application.pro b/examples/mainwindows/application/application.pro
new file mode 100644
index 0000000000..ad1168a2e4
--- /dev/null
+++ b/examples/mainwindows/application/application.pro
@@ -0,0 +1,12 @@
+HEADERS       = mainwindow.h
+SOURCES       = main.cpp \
+                mainwindow.cpp
+#! [0]
+RESOURCES     = application.qrc
+#! [0]
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/application
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS application.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/application
+INSTALLS += target sources
diff --git a/examples/mainwindows/application/application.qrc b/examples/mainwindows/application/application.qrc
new file mode 100644
index 0000000000..0a776fab4d
--- /dev/null
+++ b/examples/mainwindows/application/application.qrc
@@ -0,0 +1,10 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>images/copy.png</file>
+    <file>images/cut.png</file>
+    <file>images/new.png</file>
+    <file>images/open.png</file>
+    <file>images/paste.png</file>
+    <file>images/save.png</file>
+</qresource>
+</RCC>
diff --git a/examples/mainwindows/application/images/copy.png b/examples/mainwindows/application/images/copy.png
new file mode 100644
index 0000000000..2aeb28288f
--- /dev/null
+++ b/examples/mainwindows/application/images/copy.png
diff --git a/examples/mainwindows/application/images/cut.png b/examples/mainwindows/application/images/cut.png
new file mode 100644
index 0000000000..54638e9386
--- /dev/null
+++ b/examples/mainwindows/application/images/cut.png
diff --git a/examples/mainwindows/application/images/new.png b/examples/mainwindows/application/images/new.png
new file mode 100644
index 0000000000..12131b0100
--- /dev/null
+++ b/examples/mainwindows/application/images/new.png
diff --git a/examples/mainwindows/application/images/open.png b/examples/mainwindows/application/images/open.png
new file mode 100644
index 0000000000..45fa2883a7
--- /dev/null
+++ b/examples/mainwindows/application/images/open.png
diff --git a/examples/mainwindows/application/images/paste.png b/examples/mainwindows/application/images/paste.png
new file mode 100644
index 0000000000..c14425cad1
--- /dev/null
+++ b/examples/mainwindows/application/images/paste.png
diff --git a/examples/mainwindows/application/images/save.png b/examples/mainwindows/application/images/save.png
new file mode 100644
index 0000000000..daba865faf
--- /dev/null
+++ b/examples/mainwindows/application/images/save.png
diff --git a/examples/mainwindows/application/main.cpp b/examples/mainwindows/application/main.cpp
new file mode 100644
index 0000000000..0f9d1b277d
--- /dev/null
+++ b/examples/mainwindows/application/main.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#include <QApplication>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(application);
+
+    QApplication app(argc, argv);
+    MainWindow mainWin;
+    mainWin.show();
+    return app.exec();
+}
+//! [0]
diff --git a/examples/mainwindows/application/mainwindow.cpp b/examples/mainwindows/application/mainwindow.cpp
new file mode 100644
index 0000000000..9a22254ccc
--- /dev/null
+++ b/examples/mainwindows/application/mainwindow.cpp
@@ -0,0 +1,388 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#include <QtGui>
+
+#include "mainwindow.h"
+//! [0]
+
+//! [1]
+MainWindow::MainWindow()
+//! [1] //! [2]
+{
+    textEdit = new QPlainTextEdit;
+    setCentralWidget(textEdit);
+
+    createActions();
+    createMenus();
+    createToolBars();
+    createStatusBar();
+
+    readSettings();
+
+    connect(textEdit->document(), SIGNAL(contentsChanged()),
+            this, SLOT(documentWasModified()));
+
+    setCurrentFile("");
+    setUnifiedTitleAndToolBarOnMac(true);
+}
+//! [2]
+
+//! [3]
+void MainWindow::closeEvent(QCloseEvent *event)
+//! [3] //! [4]
+{
+    if (maybeSave()) {
+        writeSettings();
+        event->accept();
+    } else {
+        event->ignore();
+    }
+}
+//! [4]
+
+//! [5]
+void MainWindow::newFile()
+//! [5] //! [6]
+{
+    if (maybeSave()) {
+        textEdit->clear();
+        setCurrentFile("");
+    }
+}
+//! [6]
+
+//! [7]
+void MainWindow::open()
+//! [7] //! [8]
+{
+    if (maybeSave()) {
+        QString fileName = QFileDialog::getOpenFileName(this);
+        if (!fileName.isEmpty())
+            loadFile(fileName);
+    }
+}
+//! [8]
+
+//! [9]
+bool MainWindow::save()
+//! [9] //! [10]
+{
+    if (curFile.isEmpty()) {
+        return saveAs();
+    } else {
+        return saveFile(curFile);
+    }
+}
+//! [10]
+
+//! [11]
+bool MainWindow::saveAs()
+//! [11] //! [12]
+{
+    QString fileName = QFileDialog::getSaveFileName(this);
+    if (fileName.isEmpty())
+        return false;
+
+    return saveFile(fileName);
+}
+//! [12]
+
+//! [13]
+void MainWindow::about()
+//! [13] //! [14]
+{
+   QMessageBox::about(this, tr("About Application"),
+            tr("The <b>Application</b> example demonstrates how to "
+               "write modern GUI applications using Qt, with a menu bar, "
+               "toolbars, and a status bar."));
+}
+//! [14]
+
+//! [15]
+void MainWindow::documentWasModified()
+//! [15] //! [16]
+{
+    setWindowModified(textEdit->document()->isModified());
+}
+//! [16]
+
+//! [17]
+void MainWindow::createActions()
+//! [17] //! [18]
+{
+    newAct = new QAction(QIcon(":/images/new.png"), tr("&New"), this);
+    newAct->setShortcuts(QKeySequence::New);
+    newAct->setStatusTip(tr("Create a new file"));
+    connect(newAct, SIGNAL(triggered()), this, SLOT(newFile()));
+
+//! [19]
+    openAct = new QAction(QIcon(":/images/open.png"), tr("&Open..."), this);
+    openAct->setShortcuts(QKeySequence::Open);
+    openAct->setStatusTip(tr("Open an existing file"));
+    connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
+//! [18] //! [19]
+
+    saveAct = new QAction(QIcon(":/images/save.png"), tr("&Save"), this);
+    saveAct->setShortcuts(QKeySequence::Save);
+    saveAct->setStatusTip(tr("Save the document to disk"));
+    connect(saveAct, SIGNAL(triggered()), this, SLOT(save()));
+
+    saveAsAct = new QAction(tr("Save &As..."), this);
+    saveAsAct->setShortcuts(QKeySequence::SaveAs);
+    saveAsAct->setStatusTip(tr("Save the document under a new name"));
+    connect(saveAsAct, SIGNAL(triggered()), this, SLOT(saveAs()));
+
+//! [20]
+    exitAct = new QAction(tr("E&xit"), this);
+    exitAct->setShortcut(tr("Ctrl+Q"));
+//! [20]
+    exitAct->setStatusTip(tr("Exit the application"));
+    connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));
+
+//! [21]
+    cutAct = new QAction(QIcon(":/images/cut.png"), tr("Cu&t"), this);
+//! [21]
+    cutAct->setShortcuts(QKeySequence::Cut);
+    cutAct->setStatusTip(tr("Cut the current selection's contents to the "
+                            "clipboard"));
+    connect(cutAct, SIGNAL(triggered()), textEdit, SLOT(cut()));
+
+    copyAct = new QAction(QIcon(":/images/copy.png"), tr("&Copy"), this);
+    copyAct->setShortcuts(QKeySequence::Copy);
+    copyAct->setStatusTip(tr("Copy the current selection's contents to the "
+                             "clipboard"));
+    connect(copyAct, SIGNAL(triggered()), textEdit, SLOT(copy()));
+
+    pasteAct = new QAction(QIcon(":/images/paste.png"), tr("&Paste"), this);
+    pasteAct->setShortcuts(QKeySequence::Paste);
+    pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current "
+                              "selection"));
+    connect(pasteAct, SIGNAL(triggered()), textEdit, SLOT(paste()));
+
+    aboutAct = new QAction(tr("&About"), this);
+    aboutAct->setStatusTip(tr("Show the application's About box"));
+    connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
+
+//! [22]
+    aboutQtAct = new QAction(tr("About &Qt"), this);
+    aboutQtAct->setStatusTip(tr("Show the Qt library's About box"));
+    connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+//! [22]
+
+//! [23]
+    cutAct->setEnabled(false);
+//! [23] //! [24]
+    copyAct->setEnabled(false);
+    connect(textEdit, SIGNAL(copyAvailable(bool)),
+            cutAct, SLOT(setEnabled(bool)));
+    connect(textEdit, SIGNAL(copyAvailable(bool)),
+            copyAct, SLOT(setEnabled(bool)));
+}
+//! [24]
+
+//! [25] //! [26]
+void MainWindow::createMenus()
+//! [25] //! [27]
+{
+    fileMenu = menuBar()->addMenu(tr("&File"));
+    fileMenu->addAction(newAct);
+//! [28]
+    fileMenu->addAction(openAct);
+//! [28]
+    fileMenu->addAction(saveAct);
+//! [26]
+    fileMenu->addAction(saveAsAct);
+    fileMenu->addSeparator();
+    fileMenu->addAction(exitAct);
+
+    editMenu = menuBar()->addMenu(tr("&Edit"));
+    editMenu->addAction(cutAct);
+    editMenu->addAction(copyAct);
+    editMenu->addAction(pasteAct);
+
+    menuBar()->addSeparator();
+
+    helpMenu = menuBar()->addMenu(tr("&Help"));
+    helpMenu->addAction(aboutAct);
+    helpMenu->addAction(aboutQtAct);
+}
+//! [27]
+
+//! [29] //! [30]
+void MainWindow::createToolBars()
+{
+    fileToolBar = addToolBar(tr("File"));
+    fileToolBar->addAction(newAct);
+//! [29] //! [31]
+    fileToolBar->addAction(openAct);
+//! [31]
+    fileToolBar->addAction(saveAct);
+
+    editToolBar = addToolBar(tr("Edit"));
+    editToolBar->addAction(cutAct);
+    editToolBar->addAction(copyAct);
+    editToolBar->addAction(pasteAct);
+}
+//! [30]
+
+//! [32]
+void MainWindow::createStatusBar()
+//! [32] //! [33]
+{
+    statusBar()->showMessage(tr("Ready"));
+}
+//! [33]
+
+//! [34] //! [35]
+void MainWindow::readSettings()
+//! [34] //! [36]
+{
+    QSettings settings("Trolltech", "Application Example");
+    QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint();
+    QSize size = settings.value("size", QSize(400, 400)).toSize();
+    resize(size);
+    move(pos);
+}
+//! [35] //! [36]
+
+//! [37] //! [38]
+void MainWindow::writeSettings()
+//! [37] //! [39]
+{
+    QSettings settings("Trolltech", "Application Example");
+    settings.setValue("pos", pos());
+    settings.setValue("size", size());
+}
+//! [38] //! [39]
+
+//! [40]
+bool MainWindow::maybeSave()
+//! [40] //! [41]
+{
+    if (textEdit->document()->isModified()) {
+        QMessageBox::StandardButton ret;
+        ret = QMessageBox::warning(this, tr("Application"),
+                     tr("The document has been modified.\n"
+                        "Do you want to save your changes?"),
+                     QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
+        if (ret == QMessageBox::Save)
+            return save();
+        else if (ret == QMessageBox::Cancel)
+            return false;
+    }
+    return true;
+}
+//! [41]
+
+//! [42]
+void MainWindow::loadFile(const QString &fileName)
+//! [42] //! [43]
+{
+    QFile file(fileName);
+    if (!file.open(QFile::ReadOnly | QFile::Text)) {
+        QMessageBox::warning(this, tr("Application"),
+                             tr("Cannot read file %1:\n%2.")
+                             .arg(fileName)
+                             .arg(file.errorString()));
+        return;
+    }
+
+    QTextStream in(&file);
+    QApplication::setOverrideCursor(Qt::WaitCursor);
+    textEdit->setPlainText(in.readAll());
+    QApplication::restoreOverrideCursor();
+
+    setCurrentFile(fileName);
+    statusBar()->showMessage(tr("File loaded"), 2000);
+}
+//! [43]
+
+//! [44]
+bool MainWindow::saveFile(const QString &fileName)
+//! [44] //! [45]
+{
+    QFile file(fileName);
+    if (!file.open(QFile::WriteOnly | QFile::Text)) {
+        QMessageBox::warning(this, tr("Application"),
+                             tr("Cannot write file %1:\n%2.")
+                             .arg(fileName)
+                             .arg(file.errorString()));
+        return false;
+    }
+
+    QTextStream out(&file);
+    QApplication::setOverrideCursor(Qt::WaitCursor);
+    out << textEdit->toPlainText();
+    QApplication::restoreOverrideCursor();
+
+    setCurrentFile(fileName);
+    statusBar()->showMessage(tr("File saved"), 2000);
+    return true;
+}
+//! [45]
+
+//! [46]
+void MainWindow::setCurrentFile(const QString &fileName)
+//! [46] //! [47]
+{
+    curFile = fileName;
+    textEdit->document()->setModified(false);
+    setWindowModified(false);
+
+    QString shownName;
+    if (curFile.isEmpty())
+        shownName = "untitled.txt";
+    else
+        shownName = strippedName(curFile);
+
+    setWindowTitle(tr("%1[*] - %2").arg(shownName).arg(tr("Application")));
+}
+//! [47]
+
+//! [48]
+QString MainWindow::strippedName(const QString &fullFileName)
+//! [48] //! [49]
+{
+    return QFileInfo(fullFileName).fileName();
+}
+//! [49]
diff --git a/examples/mainwindows/application/mainwindow.h b/examples/mainwindows/application/mainwindow.h
new file mode 100644
index 0000000000..264be03511
--- /dev/null
+++ b/examples/mainwindows/application/mainwindow.h
@@ -0,0 +1,106 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+
+QT_BEGIN_NAMESPACE
+class QAction;
+class QMenu;
+class QPlainTextEdit;
+QT_END_NAMESPACE
+
+//! [0]
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+protected:
+    void closeEvent(QCloseEvent *event);
+
+private slots:
+    void newFile();
+    void open();
+    bool save();
+    bool saveAs();
+    void about();
+    void documentWasModified();
+
+private:
+    void createActions();
+    void createMenus();
+    void createToolBars();
+    void createStatusBar();
+    void readSettings();
+    void writeSettings();
+    bool maybeSave();
+    void loadFile(const QString &fileName);
+    bool saveFile(const QString &fileName);
+    void setCurrentFile(const QString &fileName);
+    QString strippedName(const QString &fullFileName);
+
+    QPlainTextEdit *textEdit;
+    QString curFile;
+
+    QMenu *fileMenu;
+    QMenu *editMenu;
+    QMenu *helpMenu;
+    QToolBar *fileToolBar;
+    QToolBar *editToolBar;
+    QAction *newAct;
+    QAction *openAct;
+    QAction *saveAct;
+    QAction *saveAsAct;
+    QAction *exitAct;
+    QAction *cutAct;
+    QAction *copyAct;
+    QAction *pasteAct;
+    QAction *aboutAct;
+    QAction *aboutQtAct;
+};
+//! [0]
+
+#endif
diff --git a/examples/mainwindows/dockwidgets/dockwidgets.pro b/examples/mainwindows/dockwidgets/dockwidgets.pro
new file mode 100644
index 0000000000..afc8aaa243
--- /dev/null
+++ b/examples/mainwindows/dockwidgets/dockwidgets.pro
@@ -0,0 +1,10 @@
+HEADERS         = mainwindow.h
+SOURCES         = main.cpp \
+                  mainwindow.cpp
+RESOURCES       = dockwidgets.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/dockwidgets
+sources.files = $$SOURCES $$HEADERS $$RESOURCES dockwidgets.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/dockwidgets
+INSTALLS += target sources
diff --git a/examples/mainwindows/dockwidgets/dockwidgets.qrc b/examples/mainwindows/dockwidgets/dockwidgets.qrc
new file mode 100644
index 0000000000..968feac7ea
--- /dev/null
+++ b/examples/mainwindows/dockwidgets/dockwidgets.qrc
@@ -0,0 +1,8 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>images/new.png</file>
+    <file>images/print.png</file>
+    <file>images/save.png</file>
+    <file>images/undo.png</file>
+</qresource>
+</RCC>
diff --git a/examples/mainwindows/dockwidgets/images/new.png b/examples/mainwindows/dockwidgets/images/new.png
new file mode 100644
index 0000000000..dd795cfffc
--- /dev/null
+++ b/examples/mainwindows/dockwidgets/images/new.png
diff --git a/examples/mainwindows/dockwidgets/images/print.png b/examples/mainwindows/dockwidgets/images/print.png
new file mode 100644
index 0000000000..2afb769ee2
--- /dev/null
+++ b/examples/mainwindows/dockwidgets/images/print.png
diff --git a/examples/mainwindows/dockwidgets/images/save.png b/examples/mainwindows/dockwidgets/images/save.png
new file mode 100644
index 0000000000..46eac82ad1
--- /dev/null
+++ b/examples/mainwindows/dockwidgets/images/save.png
diff --git a/examples/mainwindows/dockwidgets/images/undo.png b/examples/mainwindows/dockwidgets/images/undo.png
new file mode 100644
index 0000000000..eee23d24a3
--- /dev/null
+++ b/examples/mainwindows/dockwidgets/images/undo.png
diff --git a/examples/mainwindows/dockwidgets/main.cpp b/examples/mainwindows/dockwidgets/main.cpp
new file mode 100644
index 0000000000..f4bed914f0
--- /dev/null
+++ b/examples/mainwindows/dockwidgets/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Q_INIT_RESOURCE(dockwidgets);
+    MainWindow mainWin;
+    mainWin.show();
+    return app.exec();
+}
diff --git a/examples/mainwindows/dockwidgets/mainwindow.cpp b/examples/mainwindows/dockwidgets/mainwindow.cpp
new file mode 100644
index 0000000000..16830348b5
--- /dev/null
+++ b/examples/mainwindows/dockwidgets/mainwindow.cpp
@@ -0,0 +1,343 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#include <QtGui>
+
+#include "mainwindow.h"
+//! [0]
+
+//! [1]
+MainWindow::MainWindow()
+{
+    textEdit = new QTextEdit;
+    setCentralWidget(textEdit);
+
+    createActions();
+    createMenus();
+    createToolBars();
+    createStatusBar();
+    createDockWindows();
+
+    setWindowTitle(tr("Dock Widgets"));
+
+    newLetter();
+    setUnifiedTitleAndToolBarOnMac(true);
+}
+//! [1]
+
+//! [2]
+void MainWindow::newLetter()
+{
+    textEdit->clear();
+
+    QTextCursor cursor(textEdit->textCursor());
+    cursor.movePosition(QTextCursor::Start);
+    QTextFrame *topFrame = cursor.currentFrame();
+    QTextFrameFormat topFrameFormat = topFrame->frameFormat();
+    topFrameFormat.setPadding(16);
+    topFrame->setFrameFormat(topFrameFormat);
+
+    QTextCharFormat textFormat;
+    QTextCharFormat boldFormat;
+    boldFormat.setFontWeight(QFont::Bold);
+    QTextCharFormat italicFormat;
+    italicFormat.setFontItalic(true);
+
+    QTextTableFormat tableFormat;
+    tableFormat.setBorder(1);
+    tableFormat.setCellPadding(16);
+    tableFormat.setAlignment(Qt::AlignRight);
+    cursor.insertTable(1, 1, tableFormat);
+    cursor.insertText("The Firm", boldFormat);
+    cursor.insertBlock();
+    cursor.insertText("321 City Street", textFormat);
+    cursor.insertBlock();
+    cursor.insertText("Industry Park");
+    cursor.insertBlock();
+    cursor.insertText("Some Country");
+    cursor.setPosition(topFrame->lastPosition());
+    cursor.insertText(QDate::currentDate().toString("d MMMM yyyy"), textFormat);
+    cursor.insertBlock();
+    cursor.insertBlock();
+    cursor.insertText("Dear ", textFormat);
+    cursor.insertText("NAME", italicFormat);
+    cursor.insertText(",", textFormat);
+    for (int i = 0; i < 3; ++i)
+        cursor.insertBlock();
+    cursor.insertText(tr("Yours sincerely,"), textFormat);
+    for (int i = 0; i < 3; ++i)
+        cursor.insertBlock();
+    cursor.insertText("The Boss", textFormat);
+    cursor.insertBlock();
+    cursor.insertText("ADDRESS", italicFormat);
+}
+//! [2]
+
+//! [3]
+void MainWindow::print()
+{
+#ifndef QT_NO_PRINTDIALOG
+    QTextDocument *document = textEdit->document();
+    QPrinter printer;
+
+    QPrintDialog *dlg = new QPrintDialog(&printer, this);
+    if (dlg->exec() != QDialog::Accepted)
+        return;
+
+    document->print(&printer);
+
+    statusBar()->showMessage(tr("Ready"), 2000);
+#endif
+}
+//! [3]
+
+//! [4]
+void MainWindow::save()
+{
+    QString fileName = QFileDialog::getSaveFileName(this,
+                        tr("Choose a file name"), ".",
+                        tr("HTML (*.html *.htm)"));
+    if (fileName.isEmpty())
+        return;
+    QFile file(fileName);
+    if (!file.open(QFile::WriteOnly | QFile::Text)) {
+        QMessageBox::warning(this, tr("Dock Widgets"),
+                             tr("Cannot write file %1:\n%2.")
+                             .arg(fileName)
+                             .arg(file.errorString()));
+        return;
+    }
+
+    QTextStream out(&file);
+    QApplication::setOverrideCursor(Qt::WaitCursor);
+    out << textEdit->toHtml();
+    QApplication::restoreOverrideCursor();
+
+    statusBar()->showMessage(tr("Saved '%1'").arg(fileName), 2000);
+}
+//! [4]
+
+//! [5]
+void MainWindow::undo()
+{
+    QTextDocument *document = textEdit->document();
+    document->undo();
+}
+//! [5]
+
+//! [6]
+void MainWindow::insertCustomer(const QString &customer)
+{
+    if (customer.isEmpty())
+        return;
+    QStringList customerList = customer.split(", ");
+    QTextDocument *document = textEdit->document();
+    QTextCursor cursor = document->find("NAME");
+    if (!cursor.isNull()) {
+        cursor.beginEditBlock();
+        cursor.insertText(customerList.at(0));
+        QTextCursor oldcursor = cursor;
+        cursor = document->find("ADDRESS");
+        if (!cursor.isNull()) {
+            for (int i = 1; i < customerList.size(); ++i) {
+                cursor.insertBlock();
+                cursor.insertText(customerList.at(i));
+            }
+            cursor.endEditBlock();
+        }
+        else
+            oldcursor.endEditBlock();
+    }
+}
+//! [6]
+
+//! [7]
+void MainWindow::addParagraph(const QString &paragraph)
+{
+    if (paragraph.isEmpty())
+        return;
+    QTextDocument *document = textEdit->document();
+    QTextCursor cursor = document->find(tr("Yours sincerely,"));
+    if (cursor.isNull())
+        return;
+    cursor.beginEditBlock();
+    cursor.movePosition(QTextCursor::PreviousBlock, QTextCursor::MoveAnchor, 2);
+    cursor.insertBlock();
+    cursor.insertText(paragraph);
+    cursor.insertBlock();
+    cursor.endEditBlock();
+
+}
+//! [7]
+
+void MainWindow::about()
+{
+   QMessageBox::about(this, tr("About Dock Widgets"),
+            tr("The <b>Dock Widgets</b> example demonstrates how to "
+               "use Qt's dock widgets. You can enter your own text, "
+               "click a customer to add a customer name and "
+               "address, and click standard paragraphs to add them."));
+}
+
+void MainWindow::createActions()
+{
+    newLetterAct = new QAction(QIcon(":/images/new.png"), tr("&New Letter"),
+                               this);
+    newLetterAct->setShortcuts(QKeySequence::New);
+    newLetterAct->setStatusTip(tr("Create a new form letter"));
+    connect(newLetterAct, SIGNAL(triggered()), this, SLOT(newLetter()));
+
+    saveAct = new QAction(QIcon(":/images/save.png"), tr("&Save..."), this);
+    saveAct->setShortcuts(QKeySequence::Save);
+    saveAct->setStatusTip(tr("Save the current form letter"));
+    connect(saveAct, SIGNAL(triggered()), this, SLOT(save()));
+
+    printAct = new QAction(QIcon(":/images/print.png"), tr("&Print..."), this);
+    printAct->setShortcuts(QKeySequence::Print);
+    printAct->setStatusTip(tr("Print the current form letter"));
+    connect(printAct, SIGNAL(triggered()), this, SLOT(print()));
+
+    undoAct = new QAction(QIcon(":/images/undo.png"), tr("&Undo"), this);
+    undoAct->setShortcuts(QKeySequence::Undo);
+    undoAct->setStatusTip(tr("Undo the last editing action"));
+    connect(undoAct, SIGNAL(triggered()), this, SLOT(undo()));
+
+    quitAct = new QAction(tr("&Quit"), this);
+    quitAct->setShortcut(tr("Ctrl+Q"));
+    quitAct->setStatusTip(tr("Quit the application"));
+    connect(quitAct, SIGNAL(triggered()), this, SLOT(close()));
+
+    aboutAct = new QAction(tr("&About"), this);
+    aboutAct->setStatusTip(tr("Show the application's About box"));
+    connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
+
+    aboutQtAct = new QAction(tr("About &Qt"), this);
+    aboutQtAct->setStatusTip(tr("Show the Qt library's About box"));
+    connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+}
+
+void MainWindow::createMenus()
+{
+    fileMenu = menuBar()->addMenu(tr("&File"));
+    fileMenu->addAction(newLetterAct);
+    fileMenu->addAction(saveAct);
+    fileMenu->addAction(printAct);
+    fileMenu->addSeparator();
+    fileMenu->addAction(quitAct);
+
+    editMenu = menuBar()->addMenu(tr("&Edit"));
+    editMenu->addAction(undoAct);
+
+    viewMenu = menuBar()->addMenu(tr("&View"));
+
+    menuBar()->addSeparator();
+
+    helpMenu = menuBar()->addMenu(tr("&Help"));
+    helpMenu->addAction(aboutAct);
+    helpMenu->addAction(aboutQtAct);
+}
+
+void MainWindow::createToolBars()
+{
+    fileToolBar = addToolBar(tr("File"));
+    fileToolBar->addAction(newLetterAct);
+    fileToolBar->addAction(saveAct);
+    fileToolBar->addAction(printAct);
+
+    editToolBar = addToolBar(tr("Edit"));
+    editToolBar->addAction(undoAct);
+}
+
+//! [8]
+void MainWindow::createStatusBar()
+{
+    statusBar()->showMessage(tr("Ready"));
+}
+//! [8]
+
+//! [9]
+void MainWindow::createDockWindows()
+{
+    QDockWidget *dock = new QDockWidget(tr("Customers"), this);
+    dock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+    customerList = new QListWidget(dock);
+    customerList->addItems(QStringList()
+            << "John Doe, Harmony Enterprises, 12 Lakeside, Ambleton"
+            << "Jane Doe, Memorabilia, 23 Watersedge, Beaton"
+            << "Tammy Shea, Tiblanka, 38 Sea Views, Carlton"
+            << "Tim Sheen, Caraba Gifts, 48 Ocean Way, Deal"
+            << "Sol Harvey, Chicos Coffee, 53 New Springs, Eccleston"
+            << "Sally Hobart, Tiroli Tea, 67 Long River, Fedula");
+    dock->setWidget(customerList);
+    addDockWidget(Qt::RightDockWidgetArea, dock);
+    viewMenu->addAction(dock->toggleViewAction());
+
+    dock = new QDockWidget(tr("Paragraphs"), this);
+    paragraphsList = new QListWidget(dock);
+    paragraphsList->addItems(QStringList()
+            << "Thank you for your payment which we have received today."
+            << "Your order has been dispatched and should be with you "
+               "within 28 days."
+            << "We have dispatched those items that were in stock. The "
+               "rest of your order will be dispatched once all the "
+               "remaining items have arrived at our warehouse. No "
+               "additional shipping charges will be made."
+            << "You made a small overpayment (less than $5) which we "
+               "will keep on account for you, or return at your request."
+            << "You made a small underpayment (less than $1), but we have "
+               "sent your order anyway. We'll add this underpayment to "
+               "your next bill."
+            << "Unfortunately you did not send enough money. Please remit "
+               "an additional $. Your order will be dispatched as soon as "
+               "the complete amount has been received."
+            << "You made an overpayment (more than $5). Do you wish to "
+               "buy more items, or should we return the excess to you?");
+    dock->setWidget(paragraphsList);
+    addDockWidget(Qt::RightDockWidgetArea, dock);
+    viewMenu->addAction(dock->toggleViewAction());
+
+    connect(customerList, SIGNAL(currentTextChanged(const QString &)),
+            this, SLOT(insertCustomer(const QString &)));
+    connect(paragraphsList, SIGNAL(currentTextChanged(const QString &)),
+            this, SLOT(addParagraph(const QString &)));
+}
+//! [9]
diff --git a/examples/mainwindows/dockwidgets/mainwindow.h b/examples/mainwindows/dockwidgets/mainwindow.h
new file mode 100644
index 0000000000..f4768d779b
--- /dev/null
+++ b/examples/mainwindows/dockwidgets/mainwindow.h
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+
+QT_BEGIN_NAMESPACE
+class QAction;
+class QListWidget;
+class QMenu;
+class QTextEdit;
+QT_END_NAMESPACE
+
+//! [0]
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+private slots:
+    void newLetter();
+    void save();
+    void print();
+    void undo();
+    void about();
+    void insertCustomer(const QString &customer);
+    void addParagraph(const QString &paragraph);
+
+private:
+    void createActions();
+    void createMenus();
+    void createToolBars();
+    void createStatusBar();
+    void createDockWindows();
+
+    QTextEdit *textEdit;
+    QListWidget *customerList;
+    QListWidget *paragraphsList;
+
+    QMenu *fileMenu;
+    QMenu *editMenu;
+    QMenu *viewMenu;
+    QMenu *helpMenu;
+    QToolBar *fileToolBar;
+    QToolBar *editToolBar;
+    QAction *newLetterAct;
+    QAction *saveAct;
+    QAction *printAct;
+    QAction *undoAct;
+    QAction *aboutAct;
+    QAction *aboutQtAct;
+    QAction *quitAct;
+};
+//! [0]
+
+#endif
diff --git a/examples/mainwindows/mainwindows.pro b/examples/mainwindows/mainwindows.pro
new file mode 100644
index 0000000000..90ff3a5260
--- /dev/null
+++ b/examples/mainwindows/mainwindows.pro
@@ -0,0 +1,13 @@
+TEMPLATE      = subdirs
+SUBDIRS       = application \
+                dockwidgets \
+                mdi \
+                menus \
+                recentfiles \
+                sdi
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/mainwindows
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mainwindows.pro README
+sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows
+INSTALLS += target sources
diff --git a/examples/mainwindows/mdi/images/copy.png b/examples/mainwindows/mdi/images/copy.png
new file mode 100644
index 0000000000..2aeb28288f
--- /dev/null
+++ b/examples/mainwindows/mdi/images/copy.png
diff --git a/examples/mainwindows/mdi/images/cut.png b/examples/mainwindows/mdi/images/cut.png
new file mode 100644
index 0000000000..54638e9386
--- /dev/null
+++ b/examples/mainwindows/mdi/images/cut.png
diff --git a/examples/mainwindows/mdi/images/new.png b/examples/mainwindows/mdi/images/new.png
new file mode 100644
index 0000000000..12131b0100
--- /dev/null
+++ b/examples/mainwindows/mdi/images/new.png
diff --git a/examples/mainwindows/mdi/images/open.png b/examples/mainwindows/mdi/images/open.png
new file mode 100644
index 0000000000..45fa2883a7
--- /dev/null
+++ b/examples/mainwindows/mdi/images/open.png
diff --git a/examples/mainwindows/mdi/images/paste.png b/examples/mainwindows/mdi/images/paste.png
new file mode 100644
index 0000000000..c14425cad1
--- /dev/null
+++ b/examples/mainwindows/mdi/images/paste.png
diff --git a/examples/mainwindows/mdi/images/save.png b/examples/mainwindows/mdi/images/save.png
new file mode 100644
index 0000000000..daba865faf
--- /dev/null
+++ b/examples/mainwindows/mdi/images/save.png
diff --git a/examples/mainwindows/mdi/main.cpp b/examples/mainwindows/mdi/main.cpp
new file mode 100644
index 0000000000..85928365ff
--- /dev/null
+++ b/examples/mainwindows/mdi/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(mdi);
+
+    QApplication app(argc, argv);
+    MainWindow mainWin;
+    mainWin.show();
+    return app.exec();
+}
diff --git a/examples/mainwindows/mdi/mainwindow.cpp b/examples/mainwindows/mdi/mainwindow.cpp
new file mode 100644
index 0000000000..49f9b21449
--- /dev/null
+++ b/examples/mainwindows/mdi/mainwindow.cpp
@@ -0,0 +1,399 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+#include "mdichild.h"
+
+MainWindow::MainWindow()
+{
+    mdiArea = new QMdiArea;
+    mdiArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+    mdiArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+    setCentralWidget(mdiArea);
+    connect(mdiArea, SIGNAL(subWindowActivated(QMdiSubWindow *)),
+            this, SLOT(updateMenus()));
+    windowMapper = new QSignalMapper(this);
+    connect(windowMapper, SIGNAL(mapped(QWidget *)),
+            this, SLOT(setActiveSubWindow(QWidget *)));
+
+    createActions();
+    createMenus();
+    createToolBars();
+    createStatusBar();
+    updateMenus();
+
+    readSettings();
+
+    setWindowTitle(tr("MDI"));
+    setUnifiedTitleAndToolBarOnMac(true);
+}
+
+void MainWindow::closeEvent(QCloseEvent *event)
+{
+    mdiArea->closeAllSubWindows();
+    if (activeMdiChild()) {
+        event->ignore();
+    } else {
+        writeSettings();
+        event->accept();
+    }
+}
+
+void MainWindow::newFile()
+{
+    MdiChild *child = createMdiChild();
+    child->newFile();
+    child->show();
+}
+
+void MainWindow::open()
+{
+    QString fileName = QFileDialog::getOpenFileName(this);
+    if (!fileName.isEmpty()) {
+        QMdiSubWindow *existing = findMdiChild(fileName);
+        if (existing) {
+            mdiArea->setActiveSubWindow(existing);
+            return;
+        }
+
+        MdiChild *child = createMdiChild();
+        if (child->loadFile(fileName)) {
+            statusBar()->showMessage(tr("File loaded"), 2000);
+            child->show();
+        } else {
+            child->close();
+        }
+    }
+}
+
+void MainWindow::save()
+{
+    if (activeMdiChild() && activeMdiChild()->save())
+        statusBar()->showMessage(tr("File saved"), 2000);
+}
+
+void MainWindow::saveAs()
+{
+    if (activeMdiChild() && activeMdiChild()->saveAs())
+        statusBar()->showMessage(tr("File saved"), 2000);
+}
+
+void MainWindow::cut()
+{
+    if (activeMdiChild())
+        activeMdiChild()->cut();
+}
+
+void MainWindow::copy()
+{
+    if (activeMdiChild())
+        activeMdiChild()->copy();
+}
+
+void MainWindow::paste()
+{
+    if (activeMdiChild())
+        activeMdiChild()->paste();
+}
+
+void MainWindow::about()
+{
+   QMessageBox::about(this, tr("About MDI"),
+            tr("The <b>MDI</b> example demonstrates how to write multiple "
+               "document interface applications using Qt."));
+}
+
+void MainWindow::updateMenus()
+{
+    bool hasMdiChild = (activeMdiChild() != 0);
+    saveAct->setEnabled(hasMdiChild);
+    saveAsAct->setEnabled(hasMdiChild);
+    pasteAct->setEnabled(hasMdiChild);
+    closeAct->setEnabled(hasMdiChild);
+    closeAllAct->setEnabled(hasMdiChild);
+    tileAct->setEnabled(hasMdiChild);
+    cascadeAct->setEnabled(hasMdiChild);
+    nextAct->setEnabled(hasMdiChild);
+    previousAct->setEnabled(hasMdiChild);
+    separatorAct->setVisible(hasMdiChild);
+
+    bool hasSelection = (activeMdiChild() &&
+                         activeMdiChild()->textCursor().hasSelection());
+    cutAct->setEnabled(hasSelection);
+    copyAct->setEnabled(hasSelection);
+}
+
+void MainWindow::updateWindowMenu()
+{
+    windowMenu->clear();
+    windowMenu->addAction(closeAct);
+    windowMenu->addAction(closeAllAct);
+    windowMenu->addSeparator();
+    windowMenu->addAction(tileAct);
+    windowMenu->addAction(cascadeAct);
+    windowMenu->addSeparator();
+    windowMenu->addAction(nextAct);
+    windowMenu->addAction(previousAct);
+    windowMenu->addAction(separatorAct);
+
+    QList<QMdiSubWindow *> windows = mdiArea->subWindowList();
+    separatorAct->setVisible(!windows.isEmpty());
+
+    for (int i = 0; i < windows.size(); ++i) {
+        MdiChild *child = qobject_cast<MdiChild *>(windows.at(i)->widget());
+
+        QString text;
+        if (i < 9) {
+            text = tr("&%1 %2").arg(i + 1)
+                               .arg(child->userFriendlyCurrentFile());
+        } else {
+            text = tr("%1 %2").arg(i + 1)
+                              .arg(child->userFriendlyCurrentFile());
+        }
+        QAction *action  = windowMenu->addAction(text);
+        action->setCheckable(true);
+        action ->setChecked(child == activeMdiChild());
+        connect(action, SIGNAL(triggered()), windowMapper, SLOT(map()));
+        windowMapper->setMapping(action, windows.at(i));
+    }
+}
+
+MdiChild *MainWindow::createMdiChild()
+{
+    MdiChild *child = new MdiChild;
+    mdiArea->addSubWindow(child);
+
+    connect(child, SIGNAL(copyAvailable(bool)),
+            cutAct, SLOT(setEnabled(bool)));
+    connect(child, SIGNAL(copyAvailable(bool)),
+            copyAct, SLOT(setEnabled(bool)));
+
+    return child;
+}
+
+void MainWindow::createActions()
+{
+    newAct = new QAction(QIcon(":/images/new.png"), tr("&New"), this);
+    newAct->setShortcuts(QKeySequence::New);
+    newAct->setStatusTip(tr("Create a new file"));
+    connect(newAct, SIGNAL(triggered()), this, SLOT(newFile()));
+
+    openAct = new QAction(QIcon(":/images/open.png"), tr("&Open..."), this);
+    openAct->setShortcuts(QKeySequence::Open);
+    openAct->setStatusTip(tr("Open an existing file"));
+    connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
+
+    saveAct = new QAction(QIcon(":/images/save.png"), tr("&Save"), this);
+    saveAct->setShortcuts(QKeySequence::Save);
+    saveAct->setStatusTip(tr("Save the document to disk"));
+    connect(saveAct, SIGNAL(triggered()), this, SLOT(save()));
+
+    saveAsAct = new QAction(tr("Save &As..."), this);
+    saveAsAct->setShortcuts(QKeySequence::SaveAs);
+    saveAsAct->setStatusTip(tr("Save the document under a new name"));
+    connect(saveAsAct, SIGNAL(triggered()), this, SLOT(saveAs()));
+
+//! [0]
+    exitAct = new QAction(tr("E&xit"), this);
+    exitAct->setShortcut(tr("Ctrl+Q"));
+    exitAct->setStatusTip(tr("Exit the application"));
+    connect(exitAct, SIGNAL(triggered()), qApp, SLOT(closeAllWindows()));
+//! [0]
+
+    cutAct = new QAction(QIcon(":/images/cut.png"), tr("Cu&t"), this);
+    cutAct->setShortcuts(QKeySequence::Cut);
+    cutAct->setStatusTip(tr("Cut the current selection's contents to the "
+                            "clipboard"));
+    connect(cutAct, SIGNAL(triggered()), this, SLOT(cut()));
+
+    copyAct = new QAction(QIcon(":/images/copy.png"), tr("&Copy"), this);
+    copyAct->setShortcuts(QKeySequence::Copy);
+    copyAct->setStatusTip(tr("Copy the current selection's contents to the "
+                             "clipboard"));
+    connect(copyAct, SIGNAL(triggered()), this, SLOT(copy()));
+
+    pasteAct = new QAction(QIcon(":/images/paste.png"), tr("&Paste"), this);
+    pasteAct->setShortcuts(QKeySequence::Paste);
+    pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current "
+                              "selection"));
+    connect(pasteAct, SIGNAL(triggered()), this, SLOT(paste()));
+
+    closeAct = new QAction(tr("Cl&ose"), this);
+    closeAct->setShortcut(tr("Ctrl+F4"));
+    closeAct->setStatusTip(tr("Close the active window"));
+    connect(closeAct, SIGNAL(triggered()),
+            mdiArea, SLOT(closeActiveSubWindow()));
+
+    closeAllAct = new QAction(tr("Close &All"), this);
+    closeAllAct->setStatusTip(tr("Close all the windows"));
+    connect(closeAllAct, SIGNAL(triggered()),
+            mdiArea, SLOT(closeAllSubWindows()));
+
+    tileAct = new QAction(tr("&Tile"), this);
+    tileAct->setStatusTip(tr("Tile the windows"));
+    connect(tileAct, SIGNAL(triggered()), mdiArea, SLOT(tileSubWindows()));
+
+    cascadeAct = new QAction(tr("&Cascade"), this);
+    cascadeAct->setStatusTip(tr("Cascade the windows"));
+    connect(cascadeAct, SIGNAL(triggered()), mdiArea, SLOT(cascadeSubWindows()));
+
+    nextAct = new QAction(tr("Ne&xt"), this);
+    nextAct->setShortcuts(QKeySequence::NextChild);
+    nextAct->setStatusTip(tr("Move the focus to the next window"));
+    connect(nextAct, SIGNAL(triggered()),
+            mdiArea, SLOT(activateNextSubWindow()));
+
+    previousAct = new QAction(tr("Pre&vious"), this);
+    previousAct->setShortcuts(QKeySequence::PreviousChild);
+    previousAct->setStatusTip(tr("Move the focus to the previous "
+                                 "window"));
+    connect(previousAct, SIGNAL(triggered()),
+            mdiArea, SLOT(activatePreviousSubWindow()));
+
+    separatorAct = new QAction(this);
+    separatorAct->setSeparator(true);
+
+    aboutAct = new QAction(tr("&About"), this);
+    aboutAct->setStatusTip(tr("Show the application's About box"));
+    connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
+
+    aboutQtAct = new QAction(tr("About &Qt"), this);
+    aboutQtAct->setStatusTip(tr("Show the Qt library's About box"));
+    connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+}
+
+void MainWindow::createMenus()
+{
+    fileMenu = menuBar()->addMenu(tr("&File"));
+    fileMenu->addAction(newAct);
+    fileMenu->addAction(openAct);
+    fileMenu->addAction(saveAct);
+    fileMenu->addAction(saveAsAct);
+    fileMenu->addSeparator();
+    QAction *action = fileMenu->addAction(tr("Switch layout direction"));
+    connect(action, SIGNAL(triggered()), this, SLOT(switchLayoutDirection()));
+    fileMenu->addAction(exitAct);
+
+    editMenu = menuBar()->addMenu(tr("&Edit"));
+    editMenu->addAction(cutAct);
+    editMenu->addAction(copyAct);
+    editMenu->addAction(pasteAct);
+
+    windowMenu = menuBar()->addMenu(tr("&Window"));
+    updateWindowMenu();
+    connect(windowMenu, SIGNAL(aboutToShow()), this, SLOT(updateWindowMenu()));
+
+    menuBar()->addSeparator();
+
+    helpMenu = menuBar()->addMenu(tr("&Help"));
+    helpMenu->addAction(aboutAct);
+    helpMenu->addAction(aboutQtAct);
+}
+
+void MainWindow::createToolBars()
+{
+    fileToolBar = addToolBar(tr("File"));
+    fileToolBar->addAction(newAct);
+    fileToolBar->addAction(openAct);
+    fileToolBar->addAction(saveAct);
+
+    editToolBar = addToolBar(tr("Edit"));
+    editToolBar->addAction(cutAct);
+    editToolBar->addAction(copyAct);
+    editToolBar->addAction(pasteAct);
+}
+
+void MainWindow::createStatusBar()
+{
+    statusBar()->showMessage(tr("Ready"));
+}
+
+void MainWindow::readSettings()
+{
+    QSettings settings("Trolltech", "MDI Example");
+    QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint();
+    QSize size = settings.value("size", QSize(400, 400)).toSize();
+    move(pos);
+    resize(size);
+}
+
+void MainWindow::writeSettings()
+{
+    QSettings settings("Trolltech", "MDI Example");
+    settings.setValue("pos", pos());
+    settings.setValue("size", size());
+}
+
+MdiChild *MainWindow::activeMdiChild()
+{
+    if (QMdiSubWindow *activeSubWindow = mdiArea->activeSubWindow())
+        return qobject_cast<MdiChild *>(activeSubWindow->widget());
+    return 0;
+}
+
+QMdiSubWindow *MainWindow::findMdiChild(const QString &fileName)
+{
+    QString canonicalFilePath = QFileInfo(fileName).canonicalFilePath();
+
+    foreach (QMdiSubWindow *window, mdiArea->subWindowList()) {
+        MdiChild *mdiChild = qobject_cast<MdiChild *>(window->widget());
+        if (mdiChild->currentFile() == canonicalFilePath)
+            return window;
+    }
+    return 0;
+}
+
+void MainWindow::switchLayoutDirection()
+{
+    if (layoutDirection() == Qt::LeftToRight)
+        qApp->setLayoutDirection(Qt::RightToLeft);
+    else
+        qApp->setLayoutDirection(Qt::LeftToRight);
+}
+
+void MainWindow::setActiveSubWindow(QWidget *window)
+{
+    if (!window)
+        return;
+    mdiArea->setActiveSubWindow(qobject_cast<QMdiSubWindow *>(window));
+}
diff --git a/examples/mainwindows/mdi/mainwindow.h b/examples/mainwindows/mdi/mainwindow.h
new file mode 100644
index 0000000000..ee91d36174
--- /dev/null
+++ b/examples/mainwindows/mdi/mainwindow.h
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+
+class MdiChild;
+QT_BEGIN_NAMESPACE
+class QAction;
+class QMenu;
+class QMdiArea;
+class QMdiSubWindow;
+class QSignalMapper;
+QT_END_NAMESPACE
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+protected:
+    void closeEvent(QCloseEvent *event);
+
+private slots:
+    void newFile();
+    void open();
+    void save();
+    void saveAs();
+    void cut();
+    void copy();
+    void paste();
+    void about();
+    void updateMenus();
+    void updateWindowMenu();
+    MdiChild *createMdiChild();
+    void switchLayoutDirection();
+    void setActiveSubWindow(QWidget *window);
+
+private:
+    void createActions();
+    void createMenus();
+    void createToolBars();
+    void createStatusBar();
+    void readSettings();
+    void writeSettings();
+    MdiChild *activeMdiChild();
+    QMdiSubWindow *findMdiChild(const QString &fileName);
+
+    QMdiArea *mdiArea;
+    QSignalMapper *windowMapper;
+
+    QMenu *fileMenu;
+    QMenu *editMenu;
+    QMenu *windowMenu;
+    QMenu *helpMenu;
+    QToolBar *fileToolBar;
+    QToolBar *editToolBar;
+    QAction *newAct;
+    QAction *openAct;
+    QAction *saveAct;
+    QAction *saveAsAct;
+    QAction *exitAct;
+    QAction *cutAct;
+    QAction *copyAct;
+    QAction *pasteAct;
+    QAction *closeAct;
+    QAction *closeAllAct;
+    QAction *tileAct;
+    QAction *cascadeAct;
+    QAction *nextAct;
+    QAction *previousAct;
+    QAction *separatorAct;
+    QAction *aboutAct;
+    QAction *aboutQtAct;
+};
+
+#endif
diff --git a/examples/mainwindows/mdi/mdi.pro b/examples/mainwindows/mdi/mdi.pro
new file mode 100644
index 0000000000..4601f1c9f0
--- /dev/null
+++ b/examples/mainwindows/mdi/mdi.pro
@@ -0,0 +1,12 @@
+HEADERS       = mainwindow.h \
+                mdichild.h
+SOURCES       = main.cpp \
+                mainwindow.cpp \
+                mdichild.cpp
+RESOURCES     = mdi.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/mdi
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mdi.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/mdi
+INSTALLS += target sources
diff --git a/examples/mainwindows/mdi/mdi.qrc b/examples/mainwindows/mdi/mdi.qrc
new file mode 100644
index 0000000000..0a776fab4d
--- /dev/null
+++ b/examples/mainwindows/mdi/mdi.qrc
@@ -0,0 +1,10 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>images/copy.png</file>
+    <file>images/cut.png</file>
+    <file>images/new.png</file>
+    <file>images/open.png</file>
+    <file>images/paste.png</file>
+    <file>images/save.png</file>
+</qresource>
+</RCC>
diff --git a/examples/mainwindows/mdi/mdichild.cpp b/examples/mainwindows/mdi/mdichild.cpp
new file mode 100644
index 0000000000..14334509da
--- /dev/null
+++ b/examples/mainwindows/mdi/mdichild.cpp
@@ -0,0 +1,176 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mdichild.h"
+
+MdiChild::MdiChild()
+{
+    setAttribute(Qt::WA_DeleteOnClose);
+    isUntitled = true;
+}
+
+void MdiChild::newFile()
+{
+    static int sequenceNumber = 1;
+
+    isUntitled = true;
+    curFile = tr("document%1.txt").arg(sequenceNumber++);
+    setWindowTitle(curFile + "[*]");
+
+    connect(document(), SIGNAL(contentsChanged()),
+            this, SLOT(documentWasModified()));
+}
+
+bool MdiChild::loadFile(const QString &fileName)
+{
+    QFile file(fileName);
+    if (!file.open(QFile::ReadOnly | QFile::Text)) {
+        QMessageBox::warning(this, tr("MDI"),
+                             tr("Cannot read file %1:\n%2.")
+                             .arg(fileName)
+                             .arg(file.errorString()));
+        return false;
+    }
+
+    QTextStream in(&file);
+    QApplication::setOverrideCursor(Qt::WaitCursor);
+    setPlainText(in.readAll());
+    QApplication::restoreOverrideCursor();
+
+    setCurrentFile(fileName);
+
+    connect(document(), SIGNAL(contentsChanged()),
+            this, SLOT(documentWasModified()));
+
+    return true;
+}
+
+bool MdiChild::save()
+{
+    if (isUntitled) {
+        return saveAs();
+    } else {
+        return saveFile(curFile);
+    }
+}
+
+bool MdiChild::saveAs()
+{
+    QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"),
+                                                    curFile);
+    if (fileName.isEmpty())
+        return false;
+
+    return saveFile(fileName);
+}
+
+bool MdiChild::saveFile(const QString &fileName)
+{
+    QFile file(fileName);
+    if (!file.open(QFile::WriteOnly | QFile::Text)) {
+        QMessageBox::warning(this, tr("MDI"),
+                             tr("Cannot write file %1:\n%2.")
+                             .arg(fileName)
+                             .arg(file.errorString()));
+        return false;
+    }
+
+    QTextStream out(&file);
+    QApplication::setOverrideCursor(Qt::WaitCursor);
+    out << toPlainText();
+    QApplication::restoreOverrideCursor();
+
+    setCurrentFile(fileName);
+    return true;
+}
+
+QString MdiChild::userFriendlyCurrentFile()
+{
+    return strippedName(curFile);
+}
+
+void MdiChild::closeEvent(QCloseEvent *event)
+{
+    if (maybeSave()) {
+        event->accept();
+    } else {
+        event->ignore();
+    }
+}
+
+void MdiChild::documentWasModified()
+{
+    setWindowModified(document()->isModified());
+}
+
+bool MdiChild::maybeSave()
+{
+    if (document()->isModified()) {
+	QMessageBox::StandardButton ret;
+        ret = QMessageBox::warning(this, tr("MDI"),
+                     tr("'%1' has been modified.\n"
+                        "Do you want to save your changes?")
+                     .arg(userFriendlyCurrentFile()),
+                     QMessageBox::Save | QMessageBox::Discard
+		     | QMessageBox::Cancel);
+        if (ret == QMessageBox::Save)
+            return save();
+        else if (ret == QMessageBox::Cancel)
+            return false;
+    }
+    return true;
+}
+
+void MdiChild::setCurrentFile(const QString &fileName)
+{
+    curFile = QFileInfo(fileName).canonicalFilePath();
+    isUntitled = false;
+    document()->setModified(false);
+    setWindowModified(false);
+    setWindowTitle(userFriendlyCurrentFile() + "[*]");
+}
+
+QString MdiChild::strippedName(const QString &fullFileName)
+{
+    return QFileInfo(fullFileName).fileName();
+}
diff --git a/examples/mainwindows/mdi/mdichild.h b/examples/mainwindows/mdi/mdichild.h
new file mode 100644
index 0000000000..04084c74a2
--- /dev/null
+++ b/examples/mainwindows/mdi/mdichild.h
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MDICHILD_H
+#define MDICHILD_H
+
+#include <QTextEdit>
+
+class MdiChild : public QTextEdit
+{
+    Q_OBJECT
+
+public:
+    MdiChild();
+
+    void newFile();
+    bool loadFile(const QString &fileName);
+    bool save();
+    bool saveAs();
+    bool saveFile(const QString &fileName);
+    QString userFriendlyCurrentFile();
+    QString currentFile() { return curFile; }
+
+protected:
+    void closeEvent(QCloseEvent *event);
+
+private slots:
+    void documentWasModified();
+
+private:
+    bool maybeSave();
+    void setCurrentFile(const QString &fileName);
+    QString strippedName(const QString &fullFileName);
+
+    QString curFile;
+    bool isUntitled;
+};
+
+#endif
diff --git a/examples/mainwindows/menus/main.cpp b/examples/mainwindows/menus/main.cpp
new file mode 100644
index 0000000000..1d51376c06
--- /dev/null
+++ b/examples/mainwindows/menus/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/mainwindows/menus/mainwindow.cpp b/examples/mainwindows/menus/mainwindow.cpp
new file mode 100644
index 0000000000..4c10f7358b
--- /dev/null
+++ b/examples/mainwindows/menus/mainwindow.cpp
@@ -0,0 +1,371 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+//! [0]
+MainWindow::MainWindow()
+{
+    QWidget *widget = new QWidget;
+    setCentralWidget(widget);
+//! [0]
+
+//! [1]
+    QWidget *topFiller = new QWidget;
+    topFiller->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+
+    infoLabel = new QLabel(tr("<i>Choose a menu option, or right-click to "
+                              "invoke a context menu</i>"));
+    infoLabel->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
+    infoLabel->setAlignment(Qt::AlignCenter);
+
+    QWidget *bottomFiller = new QWidget;
+    bottomFiller->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->setMargin(5);
+    layout->addWidget(topFiller);
+    layout->addWidget(infoLabel);
+    layout->addWidget(bottomFiller);
+    widget->setLayout(layout);
+//! [1]
+
+//! [2]
+    createActions();
+    createMenus();
+
+    QString message = tr("A context menu is available by right-clicking");
+    statusBar()->showMessage(message);
+
+    setWindowTitle(tr("Menus"));
+    setMinimumSize(160, 160);
+    resize(480, 320);
+}
+//! [2]
+
+//! [3]
+void MainWindow::contextMenuEvent(QContextMenuEvent *event)
+{
+    QMenu menu(this);
+    menu.addAction(cutAct);
+    menu.addAction(copyAct);
+    menu.addAction(pasteAct);
+    menu.exec(event->globalPos());
+}
+//! [3]
+
+void MainWindow::newFile()
+{
+    infoLabel->setText(tr("Invoked <b>File|New</b>"));
+}
+
+void MainWindow::open()
+{
+    infoLabel->setText(tr("Invoked <b>File|Open</b>"));
+}
+
+void MainWindow::save()
+{
+    infoLabel->setText(tr("Invoked <b>File|Save</b>"));
+}
+
+void MainWindow::print()
+{
+    infoLabel->setText(tr("Invoked <b>File|Print</b>"));
+}
+
+void MainWindow::undo()
+{
+    infoLabel->setText(tr("Invoked <b>Edit|Undo</b>"));
+}
+
+void MainWindow::redo()
+{
+    infoLabel->setText(tr("Invoked <b>Edit|Redo</b>"));
+}
+
+void MainWindow::cut()
+{
+    infoLabel->setText(tr("Invoked <b>Edit|Cut</b>"));
+}
+
+void MainWindow::copy()
+{
+    infoLabel->setText(tr("Invoked <b>Edit|Copy</b>"));
+}
+
+void MainWindow::paste()
+{
+    infoLabel->setText(tr("Invoked <b>Edit|Paste</b>"));
+}
+
+void MainWindow::bold()
+{
+    infoLabel->setText(tr("Invoked <b>Edit|Format|Bold</b>"));
+}
+
+void MainWindow::italic()
+{
+    infoLabel->setText(tr("Invoked <b>Edit|Format|Italic</b>"));
+}
+
+void MainWindow::leftAlign()
+{
+    infoLabel->setText(tr("Invoked <b>Edit|Format|Left Align</b>"));
+}
+
+void MainWindow::rightAlign()
+{
+    infoLabel->setText(tr("Invoked <b>Edit|Format|Right Align</b>"));
+}
+
+void MainWindow::justify()
+{
+    infoLabel->setText(tr("Invoked <b>Edit|Format|Justify</b>"));
+}
+
+void MainWindow::center()
+{
+    infoLabel->setText(tr("Invoked <b>Edit|Format|Center</b>"));
+}
+
+void MainWindow::setLineSpacing()
+{
+    infoLabel->setText(tr("Invoked <b>Edit|Format|Set Line Spacing</b>"));
+}
+
+void MainWindow::setParagraphSpacing()
+{
+    infoLabel->setText(tr("Invoked <b>Edit|Format|Set Paragraph Spacing</b>"));
+}
+
+void MainWindow::about()
+{
+    infoLabel->setText(tr("Invoked <b>Help|About</b>"));
+    QMessageBox::about(this, tr("About Menu"),
+            tr("The <b>Menu</b> example shows how to create "
+               "menu-bar menus and context menus."));
+}
+
+void MainWindow::aboutQt()
+{
+    infoLabel->setText(tr("Invoked <b>Help|About Qt</b>"));
+}
+
+//! [4]
+void MainWindow::createActions()
+{
+//! [5]
+    newAct = new QAction(tr("&New"), this);
+    newAct->setShortcuts(QKeySequence::New);
+    newAct->setStatusTip(tr("Create a new file"));
+    connect(newAct, SIGNAL(triggered()), this, SLOT(newFile()));
+//! [4]
+
+    openAct = new QAction(tr("&Open..."), this);
+    openAct->setShortcuts(QKeySequence::Open);
+    openAct->setStatusTip(tr("Open an existing file"));
+    connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
+//! [5]
+
+    saveAct = new QAction(tr("&Save"), this);
+    saveAct->setShortcuts(QKeySequence::Save);
+    saveAct->setStatusTip(tr("Save the document to disk"));
+    connect(saveAct, SIGNAL(triggered()), this, SLOT(save()));
+
+    printAct = new QAction(tr("&Print..."), this);
+    printAct->setShortcuts(QKeySequence::Print);
+    printAct->setStatusTip(tr("Print the document"));
+    connect(printAct, SIGNAL(triggered()), this, SLOT(print()));
+
+    exitAct = new QAction(tr("E&xit"), this);
+    exitAct->setShortcut(tr("Ctrl+Q"));
+    exitAct->setStatusTip(tr("Exit the application"));
+    connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));
+
+    undoAct = new QAction(tr("&Undo"), this);
+    undoAct->setShortcuts(QKeySequence::Undo);
+    undoAct->setStatusTip(tr("Undo the last operation"));
+    connect(undoAct, SIGNAL(triggered()), this, SLOT(undo()));
+
+    redoAct = new QAction(tr("&Redo"), this);
+    redoAct->setShortcuts(QKeySequence::Redo);
+    redoAct->setStatusTip(tr("Redo the last operation"));
+    connect(redoAct, SIGNAL(triggered()), this, SLOT(redo()));
+
+    cutAct = new QAction(tr("Cu&t"), this);
+    cutAct->setShortcuts(QKeySequence::Cut);
+    cutAct->setStatusTip(tr("Cut the current selection's contents to the "
+                            "clipboard"));
+    connect(cutAct, SIGNAL(triggered()), this, SLOT(cut()));
+
+    copyAct = new QAction(tr("&Copy"), this);
+    copyAct->setShortcut(tr("Ctrl+C"));
+    copyAct->setStatusTip(tr("Copy the current selection's contents to the "
+                             "clipboard"));
+    connect(copyAct, SIGNAL(triggered()), this, SLOT(copy()));
+
+    pasteAct = new QAction(tr("&Paste"), this);
+    pasteAct->setShortcuts(QKeySequence::Paste);
+    pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current "
+                              "selection"));
+    connect(pasteAct, SIGNAL(triggered()), this, SLOT(paste()));
+
+    boldAct = new QAction(tr("&Bold"), this);
+    boldAct->setCheckable(true);
+    boldAct->setShortcut(tr("Ctrl+B"));
+    boldAct->setStatusTip(tr("Make the text bold"));
+    connect(boldAct, SIGNAL(triggered()), this, SLOT(bold()));
+
+    QFont boldFont = boldAct->font();
+    boldFont.setBold(true);
+    boldAct->setFont(boldFont);
+
+    italicAct = new QAction(tr("&Italic"), this);
+    italicAct->setCheckable(true);
+    italicAct->setShortcut(tr("Ctrl+I"));
+    italicAct->setStatusTip(tr("Make the text italic"));
+    connect(italicAct, SIGNAL(triggered()), this, SLOT(italic()));
+
+    QFont italicFont = italicAct->font();
+    italicFont.setItalic(true);
+    italicAct->setFont(italicFont);
+
+    setLineSpacingAct = new QAction(tr("Set &Line Spacing..."), this);
+    setLineSpacingAct->setStatusTip(tr("Change the gap between the lines of a "
+                                       "paragraph"));
+    connect(setLineSpacingAct, SIGNAL(triggered()), this, SLOT(setLineSpacing()));
+
+    setParagraphSpacingAct = new QAction(tr("Set &Paragraph Spacing..."), this);
+    setLineSpacingAct->setStatusTip(tr("Change the gap between paragraphs"));
+    connect(setParagraphSpacingAct, SIGNAL(triggered()),
+            this, SLOT(setParagraphSpacing()));
+
+    aboutAct = new QAction(tr("&About"), this);
+    aboutAct->setStatusTip(tr("Show the application's About box"));
+    connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
+
+    aboutQtAct = new QAction(tr("About &Qt"), this);
+    aboutQtAct->setStatusTip(tr("Show the Qt library's About box"));
+    connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+    connect(aboutQtAct, SIGNAL(triggered()), this, SLOT(aboutQt()));
+
+    leftAlignAct = new QAction(tr("&Left Align"), this);
+    leftAlignAct->setCheckable(true);
+    leftAlignAct->setShortcut(tr("Ctrl+L"));
+    leftAlignAct->setStatusTip(tr("Left align the selected text"));
+    connect(leftAlignAct, SIGNAL(triggered()), this, SLOT(leftAlign()));
+
+    rightAlignAct = new QAction(tr("&Right Align"), this);
+    rightAlignAct->setCheckable(true);
+    rightAlignAct->setShortcut(tr("Ctrl+R"));
+    rightAlignAct->setStatusTip(tr("Right align the selected text"));
+    connect(rightAlignAct, SIGNAL(triggered()), this, SLOT(rightAlign()));
+
+    justifyAct = new QAction(tr("&Justify"), this);
+    justifyAct->setCheckable(true);
+    justifyAct->setShortcut(tr("Ctrl+J"));
+    justifyAct->setStatusTip(tr("Justify the selected text"));
+    connect(justifyAct, SIGNAL(triggered()), this, SLOT(justify()));
+
+    centerAct = new QAction(tr("&Center"), this);
+    centerAct->setCheckable(true);
+    centerAct->setShortcut(tr("Ctrl+E"));
+    centerAct->setStatusTip(tr("Center the selected text"));
+    connect(centerAct, SIGNAL(triggered()), this, SLOT(center()));
+
+//! [6] //! [7]
+    alignmentGroup = new QActionGroup(this);
+    alignmentGroup->addAction(leftAlignAct);
+    alignmentGroup->addAction(rightAlignAct);
+    alignmentGroup->addAction(justifyAct);
+    alignmentGroup->addAction(centerAct);
+    leftAlignAct->setChecked(true);
+//! [6]
+}
+//! [7]
+
+//! [8]
+void MainWindow::createMenus()
+{
+//! [9] //! [10]
+    fileMenu = menuBar()->addMenu(tr("&File"));
+    fileMenu->addAction(newAct);
+//! [9]
+    fileMenu->addAction(openAct);
+//! [10]
+    fileMenu->addAction(saveAct);
+    fileMenu->addAction(printAct);
+//! [11]
+    fileMenu->addSeparator();
+//! [11]
+    fileMenu->addAction(exitAct);
+
+    editMenu = menuBar()->addMenu(tr("&Edit"));
+    editMenu->addAction(undoAct);
+    editMenu->addAction(redoAct);
+    editMenu->addSeparator();
+    editMenu->addAction(cutAct);
+    editMenu->addAction(copyAct);
+    editMenu->addAction(pasteAct);
+    editMenu->addSeparator();
+
+    helpMenu = menuBar()->addMenu(tr("&Help"));
+    helpMenu->addAction(aboutAct);
+    helpMenu->addAction(aboutQtAct);
+//! [8]
+
+//! [12]
+    formatMenu = editMenu->addMenu(tr("&Format"));
+    formatMenu->addAction(boldAct);
+    formatMenu->addAction(italicAct);
+    formatMenu->addSeparator()->setText(tr("Alignment"));
+    formatMenu->addAction(leftAlignAct);
+    formatMenu->addAction(rightAlignAct);
+    formatMenu->addAction(justifyAct);
+    formatMenu->addAction(centerAct);
+    formatMenu->addSeparator();
+    formatMenu->addAction(setLineSpacingAct);
+    formatMenu->addAction(setParagraphSpacingAct);
+}
+//! [12]
diff --git a/examples/mainwindows/menus/mainwindow.h b/examples/mainwindows/menus/mainwindow.h
new file mode 100644
index 0000000000..4894a9a4a3
--- /dev/null
+++ b/examples/mainwindows/menus/mainwindow.h
@@ -0,0 +1,125 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+
+QT_BEGIN_NAMESPACE
+class QAction;
+class QActionGroup;
+class QLabel;
+class QMenu;
+QT_END_NAMESPACE
+
+//! [0]
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+protected:
+    void contextMenuEvent(QContextMenuEvent *event);
+//! [0]
+
+//! [1]
+private slots:
+    void newFile();
+    void open();
+    void save();
+    void print();
+    void undo();
+    void redo();
+    void cut();
+    void copy();
+    void paste();
+    void bold();
+    void italic();
+    void leftAlign();
+    void rightAlign();
+    void justify();
+    void center();
+    void setLineSpacing();
+    void setParagraphSpacing();
+    void about();
+    void aboutQt();
+//! [1]
+
+//! [2]
+private:
+    void createActions();
+    void createMenus();
+//! [2]
+
+//! [3]
+    QMenu *fileMenu;
+    QMenu *editMenu;
+    QMenu *formatMenu;
+    QMenu *helpMenu;
+    QActionGroup *alignmentGroup;
+    QAction *newAct;
+    QAction *openAct;
+    QAction *saveAct;
+    QAction *printAct;
+    QAction *exitAct;
+    QAction *undoAct;
+    QAction *redoAct;
+    QAction *cutAct;
+    QAction *copyAct;
+    QAction *pasteAct;
+    QAction *boldAct;
+    QAction *italicAct;
+    QAction *leftAlignAct;
+    QAction *rightAlignAct;
+    QAction *justifyAct;
+    QAction *centerAct;
+    QAction *setLineSpacingAct;
+    QAction *setParagraphSpacingAct;
+    QAction *aboutAct;
+    QAction *aboutQtAct;
+    QLabel *infoLabel;
+};
+//! [3]
+
+#endif
diff --git a/examples/mainwindows/menus/menus.pro b/examples/mainwindows/menus/menus.pro
new file mode 100644
index 0000000000..7b0a2ecc88
--- /dev/null
+++ b/examples/mainwindows/menus/menus.pro
@@ -0,0 +1,9 @@
+HEADERS       = mainwindow.h
+SOURCES       = mainwindow.cpp \
+                main.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/menus
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS menus.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/menus
+INSTALLS += target sources
diff --git a/examples/mainwindows/recentfiles/main.cpp b/examples/mainwindows/recentfiles/main.cpp
new file mode 100644
index 0000000000..d1c8eb0eef
--- /dev/null
+++ b/examples/mainwindows/recentfiles/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow *mainWin = new MainWindow;
+    mainWin->show();
+    return app.exec();
+}
diff --git a/examples/mainwindows/recentfiles/mainwindow.cpp b/examples/mainwindows/recentfiles/mainwindow.cpp
new file mode 100644
index 0000000000..c8c2f88db3
--- /dev/null
+++ b/examples/mainwindows/recentfiles/mainwindow.cpp
@@ -0,0 +1,256 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+MainWindow::MainWindow()
+{
+    setAttribute(Qt::WA_DeleteOnClose);
+
+    textEdit = new QTextEdit;
+    setCentralWidget(textEdit);
+
+    createActions();
+    createMenus();
+    (void)statusBar();
+
+    setWindowTitle(tr("Recent Files"));
+    resize(400, 300);
+}
+
+void MainWindow::newFile()
+{
+    MainWindow *other = new MainWindow;
+    other->show();
+}
+
+void MainWindow::open()
+{
+    QString fileName = QFileDialog::getOpenFileName(this);
+    if (!fileName.isEmpty())
+        loadFile(fileName);
+}
+
+void MainWindow::save()
+{
+    if (curFile.isEmpty())
+        saveAs();
+    else
+        saveFile(curFile);
+}
+
+void MainWindow::saveAs()
+{
+    QString fileName = QFileDialog::getSaveFileName(this);
+    if (fileName.isEmpty())
+        return;
+
+    saveFile(fileName);
+}
+
+void MainWindow::openRecentFile()
+{
+    QAction *action = qobject_cast<QAction *>(sender());
+    if (action)
+        loadFile(action->data().toString());
+}
+
+void MainWindow::about()
+{
+   QMessageBox::about(this, tr("About Recent Files"),
+            tr("The <b>Recent Files</b> example demonstrates how to provide a "
+               "recently used file menu in a Qt application."));
+}
+
+void MainWindow::createActions()
+{
+    newAct = new QAction(tr("&New"), this);
+    newAct->setShortcuts(QKeySequence::New);
+    newAct->setStatusTip(tr("Create a new file"));
+    connect(newAct, SIGNAL(triggered()), this, SLOT(newFile()));
+
+    openAct = new QAction(tr("&Open..."), this);
+    openAct->setShortcuts(QKeySequence::Open);
+    openAct->setStatusTip(tr("Open an existing file"));
+    connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
+
+    saveAct = new QAction(tr("&Save"), this);
+    saveAct->setShortcuts(QKeySequence::Save);
+    saveAct->setStatusTip(tr("Save the document to disk"));
+    connect(saveAct, SIGNAL(triggered()), this, SLOT(save()));
+
+    saveAsAct = new QAction(tr("Save &As..."), this);
+    saveAsAct->setShortcuts(QKeySequence::SaveAs);
+    saveAsAct->setStatusTip(tr("Save the document under a new name"));
+    connect(saveAsAct, SIGNAL(triggered()), this, SLOT(saveAs()));
+
+    for (int i = 0; i < MaxRecentFiles; ++i) {
+        recentFileActs[i] = new QAction(this);
+        recentFileActs[i]->setVisible(false);
+        connect(recentFileActs[i], SIGNAL(triggered()),
+                this, SLOT(openRecentFile()));
+    }
+
+    exitAct = new QAction(tr("E&xit"), this);
+    exitAct->setShortcut(tr("Ctrl+Q"));
+    exitAct->setStatusTip(tr("Exit the application"));
+    connect(exitAct, SIGNAL(triggered()), qApp, SLOT(closeAllWindows()));
+
+    aboutAct = new QAction(tr("&About"), this);
+    aboutAct->setStatusTip(tr("Show the application's About box"));
+    connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
+
+    aboutQtAct = new QAction(tr("About &Qt"), this);
+    aboutQtAct->setStatusTip(tr("Show the Qt library's About box"));
+    connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+}
+
+void MainWindow::createMenus()
+{
+    fileMenu = menuBar()->addMenu(tr("&File"));
+    fileMenu->addAction(newAct);
+    fileMenu->addAction(openAct);
+    fileMenu->addAction(saveAct);
+    fileMenu->addAction(saveAsAct);
+    separatorAct = fileMenu->addSeparator();
+    for (int i = 0; i < MaxRecentFiles; ++i)
+        fileMenu->addAction(recentFileActs[i]);
+    fileMenu->addSeparator();
+    fileMenu->addAction(exitAct);
+    updateRecentFileActions();
+
+    menuBar()->addSeparator();
+
+    helpMenu = menuBar()->addMenu(tr("&Help"));
+    helpMenu->addAction(aboutAct);
+    helpMenu->addAction(aboutQtAct);
+}
+
+void MainWindow::loadFile(const QString &fileName)
+{
+    QFile file(fileName);
+    if (!file.open(QFile::ReadOnly | QFile::Text)) {
+        QMessageBox::warning(this, tr("Recent Files"),
+                             tr("Cannot read file %1:\n%2.")
+                             .arg(fileName)
+                             .arg(file.errorString()));
+        return;
+    }
+
+    QTextStream in(&file);
+    QApplication::setOverrideCursor(Qt::WaitCursor);
+    textEdit->setPlainText(in.readAll());
+    QApplication::restoreOverrideCursor();
+
+    setCurrentFile(fileName);
+    statusBar()->showMessage(tr("File loaded"), 2000);
+}
+
+void MainWindow::saveFile(const QString &fileName)
+{
+    QFile file(fileName);
+    if (!file.open(QFile::WriteOnly | QFile::Text)) {
+        QMessageBox::warning(this, tr("Recent Files"),
+                             tr("Cannot write file %1:\n%2.")
+                             .arg(fileName)
+                             .arg(file.errorString()));
+        return;
+    }
+
+    QTextStream out(&file);
+    QApplication::setOverrideCursor(Qt::WaitCursor);
+    out << textEdit->toPlainText();
+    QApplication::restoreOverrideCursor();
+
+    setCurrentFile(fileName);
+    statusBar()->showMessage(tr("File saved"), 2000);
+}
+
+void MainWindow::setCurrentFile(const QString &fileName)
+{
+    curFile = fileName;
+    if (curFile.isEmpty())
+        setWindowTitle(tr("Recent Files"));
+    else
+        setWindowTitle(tr("%1 - %2").arg(strippedName(curFile))
+                                    .arg(tr("Recent Files")));
+
+    QSettings settings("Trolltech", "Recent Files Example");
+    QStringList files = settings.value("recentFileList").toStringList();
+    files.removeAll(fileName);
+    files.prepend(fileName);
+    while (files.size() > MaxRecentFiles)
+        files.removeLast();
+
+    settings.setValue("recentFileList", files);
+
+    foreach (QWidget *widget, QApplication::topLevelWidgets()) {
+        MainWindow *mainWin = qobject_cast<MainWindow *>(widget);
+        if (mainWin)
+            mainWin->updateRecentFileActions();
+    }
+}
+
+void MainWindow::updateRecentFileActions()
+{
+    QSettings settings("Trolltech", "Recent Files Example");
+    QStringList files = settings.value("recentFileList").toStringList();
+
+    int numRecentFiles = qMin(files.size(), (int)MaxRecentFiles);
+
+    for (int i = 0; i < numRecentFiles; ++i) {
+        QString text = tr("&%1 %2").arg(i + 1).arg(strippedName(files[i]));
+        recentFileActs[i]->setText(text);
+        recentFileActs[i]->setData(files[i]);
+        recentFileActs[i]->setVisible(true);
+    }
+    for (int j = numRecentFiles; j < MaxRecentFiles; ++j)
+        recentFileActs[j]->setVisible(false);
+
+    separatorAct->setVisible(numRecentFiles > 0);
+}
+
+QString MainWindow::strippedName(const QString &fullFileName)
+{
+    return QFileInfo(fullFileName).fileName();
+}
diff --git a/examples/mainwindows/recentfiles/mainwindow.h b/examples/mainwindows/recentfiles/mainwindow.h
new file mode 100644
index 0000000000..9d9d467c7b
--- /dev/null
+++ b/examples/mainwindows/recentfiles/mainwindow.h
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QList>
+#include <QMainWindow>
+
+QT_BEGIN_NAMESPACE
+class QAction;
+class QMenu;
+class QTextEdit;
+QT_END_NAMESPACE
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+private slots:
+    void newFile();
+    void open();
+    void save();
+    void saveAs();
+    void openRecentFile();
+    void about();
+
+private:
+    void createActions();
+    void createMenus();
+    void loadFile(const QString &fileName);
+    void saveFile(const QString &fileName);
+    void setCurrentFile(const QString &fileName);
+    void updateRecentFileActions();
+    QString strippedName(const QString &fullFileName);
+
+    QString curFile;
+
+    QTextEdit *textEdit;
+    QMenu *fileMenu;
+    QMenu *recentFilesMenu;
+    QMenu *helpMenu;
+    QAction *newAct;
+    QAction *openAct;
+    QAction *saveAct;
+    QAction *saveAsAct;
+    QAction *exitAct;
+    QAction *aboutAct;
+    QAction *aboutQtAct;
+    QAction *separatorAct;
+
+    enum { MaxRecentFiles = 5 };
+    QAction *recentFileActs[MaxRecentFiles];
+};
+
+#endif
diff --git a/examples/mainwindows/recentfiles/recentfiles.pro b/examples/mainwindows/recentfiles/recentfiles.pro
new file mode 100644
index 0000000000..7c62cdfe7d
--- /dev/null
+++ b/examples/mainwindows/recentfiles/recentfiles.pro
@@ -0,0 +1,9 @@
+HEADERS       = mainwindow.h
+SOURCES       = main.cpp \
+                mainwindow.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/recentfiles
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS recentfiles.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/recentfiles
+INSTALLS += target sources
diff --git a/examples/mainwindows/sdi/images/copy.png b/examples/mainwindows/sdi/images/copy.png
new file mode 100644
index 0000000000..2aeb28288f
--- /dev/null
+++ b/examples/mainwindows/sdi/images/copy.png
diff --git a/examples/mainwindows/sdi/images/cut.png b/examples/mainwindows/sdi/images/cut.png
new file mode 100644
index 0000000000..54638e9386
--- /dev/null
+++ b/examples/mainwindows/sdi/images/cut.png
diff --git a/examples/mainwindows/sdi/images/new.png b/examples/mainwindows/sdi/images/new.png
new file mode 100644
index 0000000000..12131b0100
--- /dev/null
+++ b/examples/mainwindows/sdi/images/new.png
diff --git a/examples/mainwindows/sdi/images/open.png b/examples/mainwindows/sdi/images/open.png
new file mode 100644
index 0000000000..45fa2883a7
--- /dev/null
+++ b/examples/mainwindows/sdi/images/open.png
diff --git a/examples/mainwindows/sdi/images/paste.png b/examples/mainwindows/sdi/images/paste.png
new file mode 100644
index 0000000000..c14425cad1
--- /dev/null
+++ b/examples/mainwindows/sdi/images/paste.png
diff --git a/examples/mainwindows/sdi/images/save.png b/examples/mainwindows/sdi/images/save.png
new file mode 100644
index 0000000000..daba865faf
--- /dev/null
+++ b/examples/mainwindows/sdi/images/save.png
diff --git a/examples/mainwindows/sdi/main.cpp b/examples/mainwindows/sdi/main.cpp
new file mode 100644
index 0000000000..163ad939b0
--- /dev/null
+++ b/examples/mainwindows/sdi/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(sdi);
+    QApplication app(argc, argv);
+    MainWindow *mainWin = new MainWindow;
+    mainWin->show();
+    return app.exec();
+}
diff --git a/examples/mainwindows/sdi/mainwindow.cpp b/examples/mainwindows/sdi/mainwindow.cpp
new file mode 100644
index 0000000000..61d63b32ff
--- /dev/null
+++ b/examples/mainwindows/sdi/mainwindow.cpp
@@ -0,0 +1,375 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+MainWindow::MainWindow()
+{
+    init();
+    setCurrentFile("");
+}
+
+MainWindow::MainWindow(const QString &fileName)
+{
+    init();
+    loadFile(fileName);
+}
+
+void MainWindow::closeEvent(QCloseEvent *event)
+{
+    if (maybeSave()) {
+        writeSettings();
+        event->accept();
+    } else {
+        event->ignore();
+    }
+}
+
+void MainWindow::newFile()
+{
+    MainWindow *other = new MainWindow;
+    other->move(x() + 40, y() + 40);
+    other->show();
+}
+
+void MainWindow::open()
+{
+    QString fileName = QFileDialog::getOpenFileName(this);
+    if (!fileName.isEmpty()) {
+        MainWindow *existing = findMainWindow(fileName);
+        if (existing) {
+            existing->show();
+            existing->raise();
+            existing->activateWindow();
+            return;
+        }
+
+        if (isUntitled && textEdit->document()->isEmpty()
+                && !isWindowModified()) {
+            loadFile(fileName);
+        } else {
+            MainWindow *other = new MainWindow(fileName);
+            if (other->isUntitled) {
+                delete other;
+                return;
+            }
+            other->move(x() + 40, y() + 40);
+            other->show();
+        }
+    }
+}
+
+bool MainWindow::save()
+{
+    if (isUntitled) {
+        return saveAs();
+    } else {
+        return saveFile(curFile);
+    }
+}
+
+bool MainWindow::saveAs()
+{
+    QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"),
+                                                    curFile);
+    if (fileName.isEmpty())
+        return false;
+
+    return saveFile(fileName);
+}
+
+void MainWindow::about()
+{
+   QMessageBox::about(this, tr("About SDI"),
+            tr("The <b>SDI</b> example demonstrates how to write single "
+               "document interface applications using Qt."));
+}
+
+void MainWindow::documentWasModified()
+{
+    setWindowModified(true);
+}
+
+void MainWindow::init()
+{
+    setAttribute(Qt::WA_DeleteOnClose);
+
+    isUntitled = true;
+
+    textEdit = new QTextEdit;
+    setCentralWidget(textEdit);
+
+    createActions();
+    createMenus();
+    createToolBars();
+    createStatusBar();
+
+    readSettings();
+
+    connect(textEdit->document(), SIGNAL(contentsChanged()),
+            this, SLOT(documentWasModified()));
+
+    setUnifiedTitleAndToolBarOnMac(true);
+}
+
+void MainWindow::createActions()
+{
+    newAct = new QAction(QIcon(":/images/new.png"), tr("&New"), this);
+    newAct->setShortcuts(QKeySequence::New);
+    newAct->setStatusTip(tr("Create a new file"));
+    connect(newAct, SIGNAL(triggered()), this, SLOT(newFile()));
+
+    openAct = new QAction(QIcon(":/images/open.png"), tr("&Open..."), this);
+    openAct->setShortcuts(QKeySequence::Open);
+    openAct->setStatusTip(tr("Open an existing file"));
+    connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
+
+    saveAct = new QAction(QIcon(":/images/save.png"), tr("&Save"), this);
+    saveAct->setShortcuts(QKeySequence::Save);
+    saveAct->setStatusTip(tr("Save the document to disk"));
+    connect(saveAct, SIGNAL(triggered()), this, SLOT(save()));
+
+    saveAsAct = new QAction(tr("Save &As..."), this);
+    saveAsAct->setShortcuts(QKeySequence::SaveAs);
+    saveAsAct->setStatusTip(tr("Save the document under a new name"));
+    connect(saveAsAct, SIGNAL(triggered()), this, SLOT(saveAs()));
+
+    closeAct = new QAction(tr("&Close"), this);
+    closeAct->setShortcut(tr("Ctrl+W"));
+    closeAct->setStatusTip(tr("Close this window"));
+    connect(closeAct, SIGNAL(triggered()), this, SLOT(close()));
+
+    exitAct = new QAction(tr("E&xit"), this);
+    exitAct->setShortcut(tr("Ctrl+Q"));
+    exitAct->setStatusTip(tr("Exit the application"));
+    connect(exitAct, SIGNAL(triggered()), qApp, SLOT(closeAllWindows()));
+
+    cutAct = new QAction(QIcon(":/images/cut.png"), tr("Cu&t"), this);
+    cutAct->setShortcuts(QKeySequence::Cut);
+    cutAct->setStatusTip(tr("Cut the current selection's contents to the "
+                            "clipboard"));
+    connect(cutAct, SIGNAL(triggered()), textEdit, SLOT(cut()));
+
+    copyAct = new QAction(QIcon(":/images/copy.png"), tr("&Copy"), this);
+    copyAct->setShortcuts(QKeySequence::Copy);
+    copyAct->setStatusTip(tr("Copy the current selection's contents to the "
+                             "clipboard"));
+    connect(copyAct, SIGNAL(triggered()), textEdit, SLOT(copy()));
+
+    pasteAct = new QAction(QIcon(":/images/paste.png"), tr("&Paste"), this);
+    pasteAct->setShortcuts(QKeySequence::Paste);
+    pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current "
+                              "selection"));
+    connect(pasteAct, SIGNAL(triggered()), textEdit, SLOT(paste()));
+
+    aboutAct = new QAction(tr("&About"), this);
+    aboutAct->setStatusTip(tr("Show the application's About box"));
+    connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
+
+    aboutQtAct = new QAction(tr("About &Qt"), this);
+    aboutQtAct->setStatusTip(tr("Show the Qt library's About box"));
+    connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+
+
+    cutAct->setEnabled(false);
+    copyAct->setEnabled(false);
+    connect(textEdit, SIGNAL(copyAvailable(bool)),
+            cutAct, SLOT(setEnabled(bool)));
+    connect(textEdit, SIGNAL(copyAvailable(bool)),
+            copyAct, SLOT(setEnabled(bool)));
+}
+
+//! [implicit tr context]
+void MainWindow::createMenus()
+{
+    fileMenu = menuBar()->addMenu(tr("&File"));
+//! [implicit tr context]
+    fileMenu->addAction(newAct);
+    fileMenu->addAction(openAct);
+    fileMenu->addAction(saveAct);
+    fileMenu->addAction(saveAsAct);
+    fileMenu->addSeparator();
+    fileMenu->addAction(closeAct);
+    fileMenu->addAction(exitAct);
+
+    editMenu = menuBar()->addMenu(tr("&Edit"));
+    editMenu->addAction(cutAct);
+    editMenu->addAction(copyAct);
+    editMenu->addAction(pasteAct);
+
+    menuBar()->addSeparator();
+
+    helpMenu = menuBar()->addMenu(tr("&Help"));
+    helpMenu->addAction(aboutAct);
+    helpMenu->addAction(aboutQtAct);
+}
+
+void MainWindow::createToolBars()
+{
+//! [0]
+    fileToolBar = addToolBar(tr("File"));
+    fileToolBar->addAction(newAct);
+    fileToolBar->addAction(openAct);
+//! [0]
+    fileToolBar->addAction(saveAct);
+
+    editToolBar = addToolBar(tr("Edit"));
+    editToolBar->addAction(cutAct);
+    editToolBar->addAction(copyAct);
+    editToolBar->addAction(pasteAct);
+}
+
+void MainWindow::createStatusBar()
+{
+    statusBar()->showMessage(tr("Ready"));
+}
+
+void MainWindow::readSettings()
+{
+    QSettings settings("Trolltech", "SDI Example");
+    QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint();
+    QSize size = settings.value("size", QSize(400, 400)).toSize();
+    move(pos);
+    resize(size);
+}
+
+void MainWindow::writeSettings()
+{
+    QSettings settings("Trolltech", "SDI Example");
+    settings.setValue("pos", pos());
+    settings.setValue("size", size());
+}
+
+bool MainWindow::maybeSave()
+{
+    if (textEdit->document()->isModified()) {
+	QMessageBox::StandardButton ret;
+        ret = QMessageBox::warning(this, tr("SDI"),
+                     tr("The document has been modified.\n"
+                        "Do you want to save your changes?"),
+                     QMessageBox::Save | QMessageBox::Discard
+		     | QMessageBox::Cancel);
+        if (ret == QMessageBox::Save)
+            return save();
+        else if (ret == QMessageBox::Cancel)
+            return false;
+    }
+    return true;
+}
+
+void MainWindow::loadFile(const QString &fileName)
+{
+
+    QFile file(fileName);
+    if (!file.open(QFile::ReadOnly | QFile::Text)) {
+        QMessageBox::warning(this, tr("SDI"),
+                             tr("Cannot read file %1:\n%2.")
+                             .arg(fileName)
+                             .arg(file.errorString()));
+        return;
+    }
+
+    QTextStream in(&file);
+    QApplication::setOverrideCursor(Qt::WaitCursor);
+    textEdit->setPlainText(in.readAll());
+    QApplication::restoreOverrideCursor();
+
+    setCurrentFile(fileName);
+    statusBar()->showMessage(tr("File loaded"), 2000);
+}
+
+bool MainWindow::saveFile(const QString &fileName)
+{
+    QFile file(fileName);
+    if (!file.open(QFile::WriteOnly | QFile::Text)) {
+        QMessageBox::warning(this, tr("SDI"),
+                             tr("Cannot write file %1:\n%2.")
+                             .arg(fileName)
+                             .arg(file.errorString()));
+        return false;
+    }
+
+    QTextStream out(&file);
+    QApplication::setOverrideCursor(Qt::WaitCursor);
+    out << textEdit->toPlainText();
+    QApplication::restoreOverrideCursor();
+
+    setCurrentFile(fileName);
+    statusBar()->showMessage(tr("File saved"), 2000);
+    return true;
+}
+
+void MainWindow::setCurrentFile(const QString &fileName)
+{
+    static int sequenceNumber = 1;
+
+    isUntitled = fileName.isEmpty();
+    if (isUntitled) {
+        curFile = tr("document%1.txt").arg(sequenceNumber++);
+    } else {
+        curFile = QFileInfo(fileName).canonicalFilePath();
+    }
+
+    textEdit->document()->setModified(false);
+    setWindowModified(false);
+
+    setWindowTitle(tr("%1[*] - %2").arg(strippedName(curFile))
+                                       .arg(tr("SDI")));
+}
+
+QString MainWindow::strippedName(const QString &fullFileName)
+{
+    return QFileInfo(fullFileName).fileName();
+}
+
+MainWindow *MainWindow::findMainWindow(const QString &fileName)
+{
+    QString canonicalFilePath = QFileInfo(fileName).canonicalFilePath();
+
+    foreach (QWidget *widget, qApp->topLevelWidgets()) {
+        MainWindow *mainWin = qobject_cast<MainWindow *>(widget);
+        if (mainWin && mainWin->curFile == canonicalFilePath)
+            return mainWin;
+    }
+    return 0;
+}
diff --git a/examples/mainwindows/sdi/mainwindow.h b/examples/mainwindows/sdi/mainwindow.h
new file mode 100644
index 0000000000..f08cee2f98
--- /dev/null
+++ b/examples/mainwindows/sdi/mainwindow.h
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+
+QT_BEGIN_NAMESPACE
+class QAction;
+class QMenu;
+class QTextEdit;
+QT_END_NAMESPACE
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+    MainWindow(const QString &fileName);
+
+protected:
+    void closeEvent(QCloseEvent *event);
+
+private slots:
+    void newFile();
+    void open();
+    bool save();
+    bool saveAs();
+    void about();
+    void documentWasModified();
+
+private:
+    void init();
+    void createActions();
+    void createMenus();
+    void createToolBars();
+    void createStatusBar();
+    void readSettings();
+    void writeSettings();
+    bool maybeSave();
+    void loadFile(const QString &fileName);
+    bool saveFile(const QString &fileName);
+    void setCurrentFile(const QString &fileName);
+    QString strippedName(const QString &fullFileName);
+    MainWindow *findMainWindow(const QString &fileName);
+
+    QTextEdit *textEdit;
+    QString curFile;
+    bool isUntitled;
+
+    QMenu *fileMenu;
+    QMenu *editMenu;
+    QMenu *helpMenu;
+    QToolBar *fileToolBar;
+    QToolBar *editToolBar;
+    QAction *newAct;
+    QAction *openAct;
+    QAction *saveAct;
+    QAction *saveAsAct;
+    QAction *closeAct;
+    QAction *exitAct;
+    QAction *cutAct;
+    QAction *copyAct;
+    QAction *pasteAct;
+    QAction *aboutAct;
+    QAction *aboutQtAct;
+};
+
+#endif
diff --git a/examples/mainwindows/sdi/sdi.pro b/examples/mainwindows/sdi/sdi.pro
new file mode 100644
index 0000000000..3283334c00
--- /dev/null
+++ b/examples/mainwindows/sdi/sdi.pro
@@ -0,0 +1,10 @@
+HEADERS       = mainwindow.h
+SOURCES       = main.cpp \
+                mainwindow.cpp
+RESOURCES     = sdi.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/sdi
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS sdi.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/sdi
+INSTALLS += target sources
diff --git a/examples/mainwindows/sdi/sdi.qrc b/examples/mainwindows/sdi/sdi.qrc
new file mode 100644
index 0000000000..0a776fab4d
--- /dev/null
+++ b/examples/mainwindows/sdi/sdi.qrc
@@ -0,0 +1,10 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>images/copy.png</file>
+    <file>images/cut.png</file>
+    <file>images/new.png</file>
+    <file>images/open.png</file>
+    <file>images/paste.png</file>
+    <file>images/save.png</file>
+</qresource>
+</RCC>
diff --git a/examples/network/README b/examples/network/README
new file mode 100644
index 0000000000..23721df4c3
--- /dev/null
+++ b/examples/network/README
@@ -0,0 +1,40 @@
+Qt is provided with an extensive set of network classes to support both
+client-based and server side network programming.
+
+These examples demonstrate the fundamental aspects of network programming
+with Qt.
+
+
+The example launcher provided with Qt can be used to explore each of the
+examples in this directory.
+
+Documentation for these examples can be found via the Tutorial and Examples
+link in the main Qt documentation.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/network/blockingfortuneclient/blockingclient.cpp b/examples/network/blockingfortuneclient/blockingclient.cpp
new file mode 100644
index 0000000000..207ff5fdf7
--- /dev/null
+++ b/examples/network/blockingfortuneclient/blockingclient.cpp
@@ -0,0 +1,154 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtNetwork>
+
+#include "blockingclient.h"
+
+BlockingClient::BlockingClient(QWidget *parent)
+    : QDialog(parent)
+{
+    hostLabel = new QLabel(tr("&Server name:"));
+    portLabel = new QLabel(tr("S&erver port:"));
+
+    hostLineEdit = new QLineEdit("Localhost");
+    portLineEdit = new QLineEdit;
+    portLineEdit->setValidator(new QIntValidator(1, 65535, this));
+
+    hostLabel->setBuddy(hostLineEdit);
+    portLabel->setBuddy(portLineEdit);
+
+    statusLabel = new QLabel(tr("This examples requires that you run the "
+                                "Fortune Server example as well."));
+
+    getFortuneButton = new QPushButton(tr("Get Fortune"));
+    getFortuneButton->setDefault(true);
+    getFortuneButton->setEnabled(false);
+
+    quitButton = new QPushButton(tr("Quit"));
+
+    buttonBox = new QDialogButtonBox;
+    buttonBox->addButton(getFortuneButton, QDialogButtonBox::ActionRole);
+    buttonBox->addButton(quitButton, QDialogButtonBox::RejectRole);
+
+    connect(hostLineEdit, SIGNAL(textChanged(const QString &)),
+            this, SLOT(enableGetFortuneButton()));
+    connect(portLineEdit, SIGNAL(textChanged(const QString &)),
+            this, SLOT(enableGetFortuneButton()));
+    connect(getFortuneButton, SIGNAL(clicked()),
+            this, SLOT(requestNewFortune()));
+    connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
+//! [0]
+    connect(&thread, SIGNAL(newFortune(const QString &)),
+            this, SLOT(showFortune(const QString &)));
+//! [0] //! [1]
+    connect(&thread, SIGNAL(error(int, const QString &)),
+            this, SLOT(displayError(int, const QString &)));
+//! [1]
+
+    QGridLayout *mainLayout = new QGridLayout;
+    mainLayout->addWidget(hostLabel, 0, 0);
+    mainLayout->addWidget(hostLineEdit, 0, 1);
+    mainLayout->addWidget(portLabel, 1, 0);
+    mainLayout->addWidget(portLineEdit, 1, 1);
+    mainLayout->addWidget(statusLabel, 2, 0, 1, 2);
+    mainLayout->addWidget(buttonBox, 3, 0, 1, 2);
+    setLayout(mainLayout);
+
+    setWindowTitle(tr("Blocking Fortune Client"));
+    portLineEdit->setFocus();
+}
+
+//! [2]
+void BlockingClient::requestNewFortune()
+{
+    getFortuneButton->setEnabled(false);
+    thread.requestNewFortune(hostLineEdit->text(),
+                             portLineEdit->text().toInt());
+}
+//! [2]
+
+//! [3]
+void BlockingClient::showFortune(const QString &nextFortune)
+{
+    if (nextFortune == currentFortune) {
+        requestNewFortune();
+        return;
+    }
+//! [3]
+
+//! [4]
+    currentFortune = nextFortune;
+    statusLabel->setText(currentFortune);
+    getFortuneButton->setEnabled(true);
+}
+//! [4]
+
+void BlockingClient::displayError(int socketError, const QString &message)
+{
+    switch (socketError) {
+    case QAbstractSocket::HostNotFoundError:
+        QMessageBox::information(this, tr("Blocking Fortune Client"),
+                                 tr("The host was not found. Please check the "
+                                    "host and port settings."));
+        break;
+    case QAbstractSocket::ConnectionRefusedError:
+        QMessageBox::information(this, tr("Blocking Fortune Client"),
+                                 tr("The connection was refused by the peer. "
+                                    "Make sure the fortune server is running, "
+                                    "and check that the host name and port "
+                                    "settings are correct."));
+        break;
+    default:
+        QMessageBox::information(this, tr("Blocking Fortune Client"),
+                                 tr("The following error occurred: %1.")
+                                 .arg(message));
+    }
+
+    getFortuneButton->setEnabled(true);
+}
+
+void BlockingClient::enableGetFortuneButton()
+{
+    getFortuneButton->setEnabled(!hostLineEdit->text().isEmpty()
+                                 && !portLineEdit->text().isEmpty());
+}
diff --git a/examples/network/blockingfortuneclient/blockingclient.h b/examples/network/blockingfortuneclient/blockingclient.h
new file mode 100644
index 0000000000..2bc0b80e28
--- /dev/null
+++ b/examples/network/blockingfortuneclient/blockingclient.h
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BLOCKINGCLIENT_H
+#define BLOCKINGCLIENT_H
+
+#include <QDialog>
+
+#include "fortunethread.h"
+
+QT_BEGIN_NAMESPACE
+class QDialogButtonBox;
+class QLabel;
+class QLineEdit;
+class QPushButton;
+QT_END_NAMESPACE
+
+//! [0]
+class BlockingClient : public QDialog
+{
+    Q_OBJECT
+
+public:
+    BlockingClient(QWidget *parent = 0);
+
+private slots:
+    void requestNewFortune();
+    void showFortune(const QString &fortune);
+    void displayError(int socketError, const QString &message);
+    void enableGetFortuneButton();
+
+private:
+    QLabel *hostLabel;
+    QLabel *portLabel;
+    QLineEdit *hostLineEdit;
+    QLineEdit *portLineEdit;
+    QLabel *statusLabel;
+    QPushButton *getFortuneButton;
+    QPushButton *quitButton;
+    QDialogButtonBox *buttonBox;
+
+    FortuneThread thread;
+    QString currentFortune;
+};
+//! [0]
+
+#endif
diff --git a/examples/network/blockingfortuneclient/blockingfortuneclient.pro b/examples/network/blockingfortuneclient/blockingfortuneclient.pro
new file mode 100644
index 0000000000..fa146fa0e8
--- /dev/null
+++ b/examples/network/blockingfortuneclient/blockingfortuneclient.pro
@@ -0,0 +1,12 @@
+HEADERS       = blockingclient.h \
+                fortunethread.h
+SOURCES       = blockingclient.cpp \
+                main.cpp \
+                fortunethread.cpp
+QT           += network
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/network/blockingfortuneclient
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS blockingfortuneclient.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/blockingfortuneclient
+INSTALLS += target sources
diff --git a/examples/network/blockingfortuneclient/fortunethread.cpp b/examples/network/blockingfortuneclient/fortunethread.cpp
new file mode 100644
index 0000000000..af1c612443
--- /dev/null
+++ b/examples/network/blockingfortuneclient/fortunethread.cpp
@@ -0,0 +1,138 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtNetwork>
+
+#include "fortunethread.h"
+
+FortuneThread::FortuneThread(QObject *parent)
+    : QThread(parent), quit(false)
+{
+}
+
+//! [0]
+FortuneThread::~FortuneThread()
+{
+    mutex.lock();
+    quit = true;
+    cond.wakeOne();
+    mutex.unlock();
+    wait();
+}
+//! [0]
+
+//! [1] //! [2]
+void FortuneThread::requestNewFortune(const QString &hostName, quint16 port)
+{
+//! [1]
+    QMutexLocker locker(&mutex);
+    this->hostName = hostName;
+    this->port = port;
+//! [3]
+    if (!isRunning())
+        start();
+    else
+        cond.wakeOne();
+}
+//! [2] //! [3]
+
+//! [4]
+void FortuneThread::run()
+{
+    mutex.lock();
+//! [4] //! [5]
+    QString serverName = hostName;
+    quint16 serverPort = port;
+    mutex.unlock();
+//! [5]
+
+//! [6]
+    while (!quit) {
+//! [7]
+        const int Timeout = 5 * 1000;
+
+        QTcpSocket socket;
+        socket.connectToHost(serverName, serverPort);
+//! [6] //! [8]
+
+        if (!socket.waitForConnected(Timeout)) {
+            emit error(socket.error(), socket.errorString());
+            return;
+        }
+//! [8] //! [9]
+
+        while (socket.bytesAvailable() < (int)sizeof(quint16)) {
+            if (!socket.waitForReadyRead(Timeout)) {
+                emit error(socket.error(), socket.errorString());
+                return;
+            }
+//! [9] //! [10]
+        }
+//! [10] //! [11]
+
+        quint16 blockSize;
+        QDataStream in(&socket);
+        in.setVersion(QDataStream::Qt_4_0);
+        in >> blockSize;
+//! [11] //! [12]
+
+        while (socket.bytesAvailable() < blockSize) {
+            if (!socket.waitForReadyRead(Timeout)) {
+                emit error(socket.error(), socket.errorString());
+                return;
+            }
+//! [12] //! [13]
+        }
+//! [13] //! [14]
+
+        mutex.lock();
+        QString fortune;
+        in >> fortune;
+        emit newFortune(fortune);
+//! [7] //! [14] //! [15]
+
+        cond.wait(&mutex);
+        serverName = hostName;
+        serverPort = port;
+        mutex.unlock();
+    }
+//! [15]
+}
diff --git a/examples/network/blockingfortuneclient/fortunethread.h b/examples/network/blockingfortuneclient/fortunethread.h
new file mode 100644
index 0000000000..c2fbe6f039
--- /dev/null
+++ b/examples/network/blockingfortuneclient/fortunethread.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef FORTUNETHREAD_H
+#define FORTUNETHREAD_H
+
+#include <QThread>
+#include <QMutex>
+#include <QWaitCondition>
+
+//! [0]
+class FortuneThread : public QThread
+{
+    Q_OBJECT
+
+public:
+    FortuneThread(QObject *parent = 0);
+    ~FortuneThread();
+
+    void requestNewFortune(const QString &hostName, quint16 port);
+    void run();
+
+signals:
+    void newFortune(const QString &fortune);
+    void error(int socketError, const QString &message);
+
+private:
+    QString hostName;
+    quint16 port;
+    QMutex mutex;
+    QWaitCondition cond;
+    bool quit;
+};
+//! [0]
+
+#endif
diff --git a/examples/network/blockingfortuneclient/main.cpp b/examples/network/blockingfortuneclient/main.cpp
new file mode 100644
index 0000000000..98982c1cff
--- /dev/null
+++ b/examples/network/blockingfortuneclient/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "blockingclient.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    BlockingClient client;
+    client.show();
+    return client.exec();
+}
diff --git a/examples/network/broadcastreceiver/broadcastreceiver.pro b/examples/network/broadcastreceiver/broadcastreceiver.pro
new file mode 100644
index 0000000000..ad04e2c01f
--- /dev/null
+++ b/examples/network/broadcastreceiver/broadcastreceiver.pro
@@ -0,0 +1,10 @@
+HEADERS       = receiver.h
+SOURCES       = receiver.cpp \
+                main.cpp
+QT           += network
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/network/broadcastreceiver
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS broadcastreceiver.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/broadcastreceiver
+INSTALLS += target sources
diff --git a/examples/network/broadcastreceiver/main.cpp b/examples/network/broadcastreceiver/main.cpp
new file mode 100644
index 0000000000..f815729118
--- /dev/null
+++ b/examples/network/broadcastreceiver/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "receiver.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Receiver receiver;
+    receiver.show();
+    return receiver.exec();
+}
diff --git a/examples/network/broadcastreceiver/receiver.cpp b/examples/network/broadcastreceiver/receiver.cpp
new file mode 100644
index 0000000000..ea9ab14008
--- /dev/null
+++ b/examples/network/broadcastreceiver/receiver.cpp
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtNetwork>
+
+#include "receiver.h"
+
+Receiver::Receiver(QWidget *parent)
+    : QDialog(parent)
+{
+    statusLabel = new QLabel(tr("Listening for broadcasted messages"));
+    quitButton = new QPushButton(tr("&Quit"));
+
+//! [0]
+    udpSocket = new QUdpSocket(this);
+    udpSocket->bind(45454);
+//! [0]
+
+//! [1]
+    connect(udpSocket, SIGNAL(readyRead()),
+            this, SLOT(processPendingDatagrams()));
+//! [1]
+    connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
+
+    QHBoxLayout *buttonLayout = new QHBoxLayout;
+    buttonLayout->addStretch(1);
+    buttonLayout->addWidget(quitButton);
+    buttonLayout->addStretch(1);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(statusLabel);
+    mainLayout->addLayout(buttonLayout);
+    setLayout(mainLayout);
+
+    setWindowTitle(tr("Broadcast Receiver"));
+}
+
+void Receiver::processPendingDatagrams()
+{
+//! [2]
+    while (udpSocket->hasPendingDatagrams()) {
+        QByteArray datagram;
+        datagram.resize(udpSocket->pendingDatagramSize());
+        udpSocket->readDatagram(datagram.data(), datagram.size());
+        statusLabel->setText(tr("Received datagram: \"%1\"")
+                             .arg(datagram.data()));
+    }
+//! [2]
+}
diff --git a/examples/network/broadcastreceiver/receiver.h b/examples/network/broadcastreceiver/receiver.h
new file mode 100644
index 0000000000..9939cbe4ff
--- /dev/null
+++ b/examples/network/broadcastreceiver/receiver.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef RECEIVER_H
+#define RECEIVER_H
+
+#include <QDialog>
+
+QT_BEGIN_NAMESPACE
+class QLabel;
+class QPushButton;
+class QUdpSocket;
+QT_END_NAMESPACE
+
+class Receiver : public QDialog
+{
+    Q_OBJECT
+
+public:
+    Receiver(QWidget *parent = 0);
+
+private slots:
+    void processPendingDatagrams();
+
+private:
+    QLabel *statusLabel;
+    QPushButton *quitButton;
+    QUdpSocket *udpSocket;
+};
+
+#endif
diff --git a/examples/network/broadcastsender/broadcastsender.pro b/examples/network/broadcastsender/broadcastsender.pro
new file mode 100644
index 0000000000..b300a505f7
--- /dev/null
+++ b/examples/network/broadcastsender/broadcastsender.pro
@@ -0,0 +1,10 @@
+HEADERS       = sender.h
+SOURCES       = sender.cpp \
+                main.cpp
+QT           += network
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/network/broadcastsender
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS broadcastsender.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/broadcastsender
+INSTALLS += target sources
diff --git a/examples/network/broadcastsender/main.cpp b/examples/network/broadcastsender/main.cpp
new file mode 100644
index 0000000000..85613c588b
--- /dev/null
+++ b/examples/network/broadcastsender/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "sender.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Sender sender;
+    sender.show();
+    return sender.exec();
+}
diff --git a/examples/network/broadcastsender/sender.cpp b/examples/network/broadcastsender/sender.cpp
new file mode 100644
index 0000000000..a74beaeda9
--- /dev/null
+++ b/examples/network/broadcastsender/sender.cpp
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtNetwork>
+
+#include "sender.h"
+
+Sender::Sender(QWidget *parent)
+    : QDialog(parent)
+{
+    statusLabel = new QLabel(tr("Ready to broadcast datagrams on port 45454"));
+
+    startButton = new QPushButton(tr("&Start"));
+    quitButton = new QPushButton(tr("&Quit"));
+
+    buttonBox = new QDialogButtonBox;
+    buttonBox->addButton(startButton, QDialogButtonBox::ActionRole);
+    buttonBox->addButton(quitButton, QDialogButtonBox::RejectRole);
+
+    timer = new QTimer(this);
+//! [0]
+    udpSocket = new QUdpSocket(this);
+//! [0]
+    messageNo = 1;
+
+    connect(startButton, SIGNAL(clicked()), this, SLOT(startBroadcasting()));
+    connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
+    connect(timer, SIGNAL(timeout()), this, SLOT(broadcastDatagram()));
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(statusLabel);
+    mainLayout->addWidget(buttonBox);
+    setLayout(mainLayout);
+
+    setWindowTitle(tr("Broadcast Sender"));
+}
+
+void Sender::startBroadcasting()
+{
+    startButton->setEnabled(false);
+    timer->start(1000);
+}
+
+void Sender::broadcastDatagram()
+{
+    statusLabel->setText(tr("Now broadcasting datagram %1").arg(messageNo));
+//! [1]
+    QByteArray datagram = "Broadcast message " + QByteArray::number(messageNo);
+    udpSocket->writeDatagram(datagram.data(), datagram.size(),
+                             QHostAddress::Broadcast, 45454);
+//! [1]
+    ++messageNo;
+}
diff --git a/examples/network/broadcastsender/sender.h b/examples/network/broadcastsender/sender.h
new file mode 100644
index 0000000000..92265b836a
--- /dev/null
+++ b/examples/network/broadcastsender/sender.h
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SENDER_H
+#define SENDER_H
+
+#include <QDialog>
+
+QT_BEGIN_NAMESPACE
+class QDialogButtonBox;
+class QLabel;
+class QPushButton;
+class QTimer;
+class QUdpSocket;
+QT_END_NAMESPACE
+
+class Sender : public QDialog
+{
+    Q_OBJECT
+
+public:
+    Sender(QWidget *parent = 0);
+
+private slots:
+    void startBroadcasting();
+    void broadcastDatagram();
+
+private:
+    QLabel *statusLabel;
+    QPushButton *startButton;
+    QPushButton *quitButton;
+    QDialogButtonBox *buttonBox;
+    QUdpSocket *udpSocket;
+    QTimer *timer;
+    int messageNo;
+};
+
+#endif
diff --git a/examples/network/download/download.pro b/examples/network/download/download.pro
new file mode 100644
index 0000000000..254c356cf5
--- /dev/null
+++ b/examples/network/download/download.pro
@@ -0,0 +1,19 @@
+######################################################################
+# Automatically generated by qmake (2.01a) fr. nov. 16 13:18:20 2007
+######################################################################
+
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+QT = core network
+CONFIG += console
+
+# Input
+SOURCES += main.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/network/download
+sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/download
+INSTALLS += target sources
diff --git a/examples/network/download/main.cpp b/examples/network/download/main.cpp
new file mode 100644
index 0000000000..e0158e72ae
--- /dev/null
+++ b/examples/network/download/main.cpp
@@ -0,0 +1,176 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QCoreApplication>
+#include <QFile>
+#include <QFileInfo>
+#include <QList>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QStringList>
+#include <QTimer>
+#include <QUrl>
+
+#include <stdio.h>
+
+class DownloadManager: public QObject
+{
+    Q_OBJECT
+    QNetworkAccessManager manager;
+    QList<QNetworkReply *> currentDownloads;
+
+public:
+    DownloadManager();
+    void doDownload(const QUrl &url);
+    QString saveFileName(const QUrl &url);
+    bool saveToDisk(const QString &filename, QIODevice *data);
+
+public slots:
+    void execute();
+    void downloadFinished(QNetworkReply *reply);
+};
+
+DownloadManager::DownloadManager()
+{
+    connect(&manager, SIGNAL(finished(QNetworkReply*)),
+            SLOT(downloadFinished(QNetworkReply*)));
+}
+
+void DownloadManager::doDownload(const QUrl &url)
+{
+    QNetworkRequest request(url);
+    QNetworkReply *reply = manager.get(request);
+
+    currentDownloads.append(reply);
+}
+
+QString DownloadManager::saveFileName(const QUrl &url)
+{
+    QString path = url.path();
+    QString basename = QFileInfo(path).fileName();
+
+    if (basename.isEmpty())
+        basename = "download";
+
+    if (QFile::exists(basename)) {
+        // already exists, don't overwrite
+        int i = 0;
+        basename += '.';
+        while (QFile::exists(basename + QString::number(i)))
+            ++i;
+
+        basename += QString::number(i);
+    }
+
+    return basename;
+}
+
+bool DownloadManager::saveToDisk(const QString &filename, QIODevice *data)
+{
+    QFile file(filename);
+    if (!file.open(QIODevice::WriteOnly)) {
+        fprintf(stderr, "Could not open %s for writing: %s\n",
+                qPrintable(filename),
+                qPrintable(file.errorString()));
+        return false;
+    }
+
+    file.write(data->readAll());
+    file.close();
+
+    return true;
+}
+
+void DownloadManager::execute()
+{
+    QStringList args = QCoreApplication::instance()->arguments();
+    args.takeFirst();           // skip the first argument, which is the program's name
+    if (args.isEmpty()) {
+        printf("Qt Download example - downloads all URLs in parallel\n"
+               "Usage: download url1 [url2... urlN]\n"
+               "\n"
+               "Downloads the URLs passed in the command-line to the local directory\n"
+               "If the target file already exists, a .0, .1, .2, etc. is appended to\n"
+               "differentiate.\n");
+        QCoreApplication::instance()->quit();
+        return;
+    }
+
+    foreach (QString arg, args) {
+        QUrl url = QUrl::fromEncoded(arg.toLocal8Bit());
+        doDownload(url);
+    }
+}
+
+void DownloadManager::downloadFinished(QNetworkReply *reply)
+{
+    QUrl url = reply->url();
+    if (reply->error()) {
+        fprintf(stderr, "Download of %s failed: %s\n",
+                url.toEncoded().constData(),
+                qPrintable(reply->errorString()));
+    } else {
+        QString filename = saveFileName(url);
+        if (saveToDisk(filename, reply))
+            printf("Download of %s succeded (saved to %s)\n",
+                   url.toEncoded().constData(), qPrintable(filename));
+    }
+
+    currentDownloads.removeAll(reply);
+    reply->deleteLater();
+
+    if (currentDownloads.isEmpty())
+        // all downloads finished
+        QCoreApplication::instance()->quit();
+}
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    DownloadManager manager;
+    QTimer::singleShot(0, &manager, SLOT(execute()));
+
+    app.exec();
+}
+
+#include "main.moc"
diff --git a/examples/network/downloadmanager/downloadmanager.cpp b/examples/network/downloadmanager/downloadmanager.cpp
new file mode 100644
index 0000000000..a4721a2478
--- /dev/null
+++ b/examples/network/downloadmanager/downloadmanager.cpp
@@ -0,0 +1,173 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "downloadmanager.h"
+
+#include <QFileInfo>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QString>
+#include <QStringList>
+#include <QTimer>
+#include <stdio.h>
+
+DownloadManager::DownloadManager(QObject *parent)
+    : QObject(parent), downloadedCount(0), totalCount(0)
+{
+}
+
+void DownloadManager::append(const QStringList &urlList)
+{
+    foreach (QString url, urlList)
+        append(QUrl::fromEncoded(url.toLocal8Bit()));
+
+    if (downloadQueue.isEmpty())
+        QTimer::singleShot(0, this, SIGNAL(finished()));
+}
+
+void DownloadManager::append(const QUrl &url)
+{
+    if (downloadQueue.isEmpty())
+        QTimer::singleShot(0, this, SLOT(startNextDownload()));
+
+    downloadQueue.enqueue(url);
+    ++totalCount;
+}
+
+QString DownloadManager::saveFileName(const QUrl &url)
+{
+    QString path = url.path();
+    QString basename = QFileInfo(path).fileName();
+
+    if (basename.isEmpty())
+        basename = "download";
+
+    if (QFile::exists(basename)) {
+        // already exists, don't overwrite
+        int i = 0;
+        basename += '.';
+        while (QFile::exists(basename + QString::number(i)))
+            ++i;
+
+        basename += QString::number(i);
+    }
+
+    return basename;
+}
+
+void DownloadManager::startNextDownload()
+{
+    if (downloadQueue.isEmpty()) {
+        printf("%d/%d files downloaded successfully\n", downloadedCount, totalCount);
+        emit finished();
+        return;
+    }
+
+    QUrl url = downloadQueue.dequeue();
+
+    QString filename = saveFileName(url);
+    output.setFileName(filename);
+    if (!output.open(QIODevice::WriteOnly)) {
+        fprintf(stderr, "Problem opening save file '%s' for download '%s': %s\n",
+                qPrintable(filename), url.toEncoded().constData(),
+                qPrintable(output.errorString()));
+
+        startNextDownload();
+        return;                 // skip this download
+    }
+
+    QNetworkRequest request(url);
+    currentDownload = manager.get(request);
+    connect(currentDownload, SIGNAL(downloadProgress(qint64,qint64)),
+            SLOT(downloadProgress(qint64,qint64)));
+    connect(currentDownload, SIGNAL(finished()),
+            SLOT(downloadFinished()));
+    connect(currentDownload, SIGNAL(readyRead()),
+            SLOT(downloadReadyRead()));
+
+    // prepare the output
+    printf("Downloading %s...\n", url.toEncoded().constData());
+    downloadTime.start();
+}
+
+void DownloadManager::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
+{
+    progressBar.setStatus(bytesReceived, bytesTotal);
+
+    // calculate the download speed
+    double speed = bytesReceived * 1000.0 / downloadTime.elapsed();
+    QString unit;
+    if (speed < 1024) {
+        unit = "bytes/sec";
+    } else if (speed < 1024*1024) {
+        speed /= 1024;
+        unit = "kB/s";
+    } else {
+        speed /= 1024*1024;
+        unit = "MB/s";
+    }
+
+    progressBar.setMessage(QString::fromLatin1("%1 %2")
+                           .arg(speed, 3, 'f', 1).arg(unit));
+    progressBar.update();
+}
+
+void DownloadManager::downloadFinished()
+{
+    progressBar.clear();
+    output.close();
+
+    if (currentDownload->error()) {
+        // download failed
+        fprintf(stderr, "Failed: %s\n", qPrintable(currentDownload->errorString()));
+    } else {
+        printf("Succeeded.\n");
+        ++downloadedCount;
+    }
+
+    currentDownload->deleteLater();
+    startNextDownload();
+}
+
+void DownloadManager::downloadReadyRead()
+{
+    output.write(currentDownload->readAll());
+}
diff --git a/examples/network/downloadmanager/downloadmanager.h b/examples/network/downloadmanager/downloadmanager.h
new file mode 100644
index 0000000000..7ed80c4d58
--- /dev/null
+++ b/examples/network/downloadmanager/downloadmanager.h
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DOWNLOADMANAGER_H
+#define DOWNLOADMANAGER_H
+
+#include <QFile>
+#include <QObject>
+#include <QQueue>
+#include <QTime>
+#include <QUrl>
+#include <QNetworkAccessManager>
+
+#include "textprogressbar.h"
+
+class DownloadManager: public QObject
+{
+    Q_OBJECT
+public:
+    DownloadManager(QObject *parent = 0);
+
+    void append(const QUrl &url);
+    void append(const QStringList &urlList);
+    QString saveFileName(const QUrl &url);
+
+signals:
+    void finished();
+
+private slots:
+    void startNextDownload();
+    void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
+    void downloadFinished();
+    void downloadReadyRead();
+
+private:
+    QNetworkAccessManager manager;
+    QQueue<QUrl> downloadQueue;
+    QNetworkReply *currentDownload;
+    QFile output;
+    QTime downloadTime;
+    TextProgressBar progressBar;
+
+    int downloadedCount;
+    int totalCount;
+};
+
+#endif
diff --git a/examples/network/downloadmanager/downloadmanager.pro b/examples/network/downloadmanager/downloadmanager.pro
new file mode 100644
index 0000000000..1b979cafcb
--- /dev/null
+++ b/examples/network/downloadmanager/downloadmanager.pro
@@ -0,0 +1,20 @@
+######################################################################
+# Automatically generated by qmake (2.01a) fr. nov. 16 14:11:36 2007
+######################################################################
+
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+QT = core network
+CONFIG += console
+
+# Input
+HEADERS += downloadmanager.h textprogressbar.h
+SOURCES += downloadmanager.cpp main.cpp textprogressbar.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/network/downloadmanager
+sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/downloadmanager
+INSTALLS += target sources
diff --git a/examples/network/downloadmanager/main.cpp b/examples/network/downloadmanager/main.cpp
new file mode 100644
index 0000000000..8a3fe2420a
--- /dev/null
+++ b/examples/network/downloadmanager/main.cpp
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QCoreApplication>
+#include <QStringList>
+#include "downloadmanager.h"
+#include <stdio.h>
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+    QStringList arguments = app.arguments();
+    arguments.takeFirst();      // remove the first argument, which is the program's name
+
+    if (arguments.isEmpty()) {
+        printf("Qt Download example\n"
+               "Usage: downloadmanager url1 [url2... urlN]\n"
+               "\n"
+               "Downloads the URLs passed in the command-line to the local directory\n"
+               "If the target file already exists, a .0, .1, .2, etc. is appended to\n"
+               "differentiate.\n");
+        return 0;
+    }
+
+    DownloadManager manager;
+    manager.append(arguments);
+
+    QObject::connect(&manager, SIGNAL(finished()), &app, SLOT(quit()));
+    app.exec();
+}
diff --git a/examples/network/downloadmanager/textprogressbar.cpp b/examples/network/downloadmanager/textprogressbar.cpp
new file mode 100644
index 0000000000..e1fbf5255c
--- /dev/null
+++ b/examples/network/downloadmanager/textprogressbar.cpp
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "textprogressbar.h"
+#include <QByteArray>
+#include <stdio.h>
+
+TextProgressBar::TextProgressBar()
+    : value(0), maximum(-1), iteration(0)
+{
+}
+
+void TextProgressBar::clear()
+{
+    printf("\n");
+    fflush(stdout);
+
+    iteration = 0;
+    value = 0;
+    maximum = -1;
+}
+
+void TextProgressBar::update()
+{
+    ++iteration;
+
+    if (maximum > 0) {
+        // we know the maximum
+        // draw a progress bar
+        int percent = value * 100 / maximum;
+        int hashes = percent / 2;
+
+        QByteArray progressbar(hashes, '#');
+        if (percent % 2)
+            progressbar += '>';
+
+        printf("\r[%-50s] %3d%% %s     ",
+               progressbar.constData(),
+               percent,
+               qPrintable(message));
+    } else {
+        // we don't know the maximum, so we can't draw a progress bar
+        int center = (iteration % 48) + 1; // 50 spaces, minus 2
+        QByteArray before(qMax(center - 2, 0), ' ');
+        QByteArray after(qMin(center + 2, 50), ' ');
+
+        printf("\r[%s###%s]      %s      ",
+               before.constData(), after.constData(), qPrintable(message));
+    }
+}
+
+void TextProgressBar::setMessage(const QString &m)
+{
+    message = m;
+}
+
+void TextProgressBar::setStatus(qint64 val, qint64 max)
+{
+    value = val;
+    maximum = max;
+}
diff --git a/examples/network/downloadmanager/textprogressbar.h b/examples/network/downloadmanager/textprogressbar.h
new file mode 100644
index 0000000000..34097d0428
--- /dev/null
+++ b/examples/network/downloadmanager/textprogressbar.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TEXTPROGRESSBAR_H
+#define TEXTPROGRESSBAR_H
+
+#include <QString>
+
+class TextProgressBar
+{
+public:
+    TextProgressBar();
+
+    void clear();
+    void update();
+    void setMessage(const QString &message);
+    void setStatus(qint64 value, qint64 maximum);
+
+private:
+    QString message;
+    qint64 value;
+    qint64 maximum;
+    int iteration;
+};
+
+#endif
diff --git a/examples/network/fortuneclient/client.cpp b/examples/network/fortuneclient/client.cpp
new file mode 100644
index 0000000000..4d658280ac
--- /dev/null
+++ b/examples/network/fortuneclient/client.cpp
@@ -0,0 +1,191 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtNetwork>
+
+#include "client.h"
+
+//! [0]
+Client::Client(QWidget *parent)
+    : QDialog(parent)
+{
+//! [0]
+    hostLabel = new QLabel(tr("&Server name:"));
+    portLabel = new QLabel(tr("S&erver port:"));
+
+    hostLineEdit = new QLineEdit("Localhost");
+    portLineEdit = new QLineEdit;
+    portLineEdit->setValidator(new QIntValidator(1, 65535, this));
+
+    hostLabel->setBuddy(hostLineEdit);
+    portLabel->setBuddy(portLineEdit);
+
+    statusLabel = new QLabel(tr("This examples requires that you run the "
+                                "Fortune Server example as well."));
+
+    getFortuneButton = new QPushButton(tr("Get Fortune"));
+    getFortuneButton->setDefault(true);
+    getFortuneButton->setEnabled(false);
+
+    quitButton = new QPushButton(tr("Quit"));
+
+    buttonBox = new QDialogButtonBox;
+    buttonBox->addButton(getFortuneButton, QDialogButtonBox::ActionRole);
+    buttonBox->addButton(quitButton, QDialogButtonBox::RejectRole);
+
+//! [1]
+    tcpSocket = new QTcpSocket(this);
+//! [1]
+
+    connect(hostLineEdit, SIGNAL(textChanged(const QString &)),
+            this, SLOT(enableGetFortuneButton()));
+    connect(portLineEdit, SIGNAL(textChanged(const QString &)),
+            this, SLOT(enableGetFortuneButton()));
+    connect(getFortuneButton, SIGNAL(clicked()),
+            this, SLOT(requestNewFortune()));
+    connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
+//! [2] //! [3]
+    connect(tcpSocket, SIGNAL(readyRead()), this, SLOT(readFortune()));
+//! [2] //! [4]
+    connect(tcpSocket, SIGNAL(error(QAbstractSocket::SocketError)),
+//! [3]
+            this, SLOT(displayError(QAbstractSocket::SocketError)));
+//! [4]
+
+    QGridLayout *mainLayout = new QGridLayout;
+    mainLayout->addWidget(hostLabel, 0, 0);
+    mainLayout->addWidget(hostLineEdit, 0, 1);
+    mainLayout->addWidget(portLabel, 1, 0);
+    mainLayout->addWidget(portLineEdit, 1, 1);
+    mainLayout->addWidget(statusLabel, 2, 0, 1, 2);
+    mainLayout->addWidget(buttonBox, 3, 0, 1, 2);
+    setLayout(mainLayout);
+
+    setWindowTitle(tr("Fortune Client"));
+    portLineEdit->setFocus();
+//! [5]
+}
+//! [5]
+
+//! [6]
+void Client::requestNewFortune()
+{
+    getFortuneButton->setEnabled(false);
+    blockSize = 0;
+    tcpSocket->abort();
+//! [7]
+    tcpSocket->connectToHost(hostLineEdit->text(),
+                             portLineEdit->text().toInt());
+//! [7]
+}
+//! [6]
+
+//! [8]
+void Client::readFortune()
+{
+//! [9]
+    QDataStream in(tcpSocket);
+    in.setVersion(QDataStream::Qt_4_0);
+
+    if (blockSize == 0) {
+        if (tcpSocket->bytesAvailable() < (int)sizeof(quint16))
+            return;
+//! [8]
+
+//! [10]
+        in >> blockSize;
+    }
+
+    if (tcpSocket->bytesAvailable() < blockSize)
+        return;
+//! [10] //! [11]
+
+    QString nextFortune;
+    in >> nextFortune;
+
+    if (nextFortune == currentFortune) {
+        QTimer::singleShot(0, this, SLOT(requestNewFortune()));
+        return;
+    }
+//! [11]
+
+//! [12]
+    currentFortune = nextFortune;
+//! [9]
+    statusLabel->setText(currentFortune);
+    getFortuneButton->setEnabled(true);
+}
+//! [12]
+
+//! [13]
+void Client::displayError(QAbstractSocket::SocketError socketError)
+{
+    switch (socketError) {
+    case QAbstractSocket::RemoteHostClosedError:
+        break;
+    case QAbstractSocket::HostNotFoundError:
+        QMessageBox::information(this, tr("Fortune Client"),
+                                 tr("The host was not found. Please check the "
+                                    "host name and port settings."));
+        break;
+    case QAbstractSocket::ConnectionRefusedError:
+        QMessageBox::information(this, tr("Fortune Client"),
+                                 tr("The connection was refused by the peer. "
+                                    "Make sure the fortune server is running, "
+                                    "and check that the host name and port "
+                                    "settings are correct."));
+        break;
+    default:
+        QMessageBox::information(this, tr("Fortune Client"),
+                                 tr("The following error occurred: %1.")
+                                 .arg(tcpSocket->errorString()));
+    }
+
+    getFortuneButton->setEnabled(true);
+}
+//! [13]
+
+void Client::enableGetFortuneButton()
+{
+    getFortuneButton->setEnabled(!hostLineEdit->text().isEmpty()
+                                 && !portLineEdit->text().isEmpty());
+}
diff --git a/examples/network/fortuneclient/client.h b/examples/network/fortuneclient/client.h
new file mode 100644
index 0000000000..b9fe7b11f2
--- /dev/null
+++ b/examples/network/fortuneclient/client.h
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CLIENT_H
+#define CLIENT_H
+
+#include <QDialog>
+#include <QTcpSocket>
+
+QT_BEGIN_NAMESPACE
+class QDialogButtonBox;
+class QLabel;
+class QLineEdit;
+class QPushButton;
+class QTcpSocket;
+QT_END_NAMESPACE
+
+//! [0]
+class Client : public QDialog
+{
+    Q_OBJECT
+
+public:
+    Client(QWidget *parent = 0);
+
+private slots:
+    void requestNewFortune();
+    void readFortune();
+    void displayError(QAbstractSocket::SocketError socketError);
+    void enableGetFortuneButton();
+
+private:
+    QLabel *hostLabel;
+    QLabel *portLabel;
+    QLineEdit *hostLineEdit;
+    QLineEdit *portLineEdit;
+    QLabel *statusLabel;
+    QPushButton *getFortuneButton;
+    QPushButton *quitButton;
+    QDialogButtonBox *buttonBox;
+
+    QTcpSocket *tcpSocket;
+    QString currentFortune;
+    quint16 blockSize;
+};
+//! [0]
+
+#endif
diff --git a/examples/network/fortuneclient/fortuneclient.pro b/examples/network/fortuneclient/fortuneclient.pro
new file mode 100644
index 0000000000..1c7b0a81ab
--- /dev/null
+++ b/examples/network/fortuneclient/fortuneclient.pro
@@ -0,0 +1,10 @@
+HEADERS       = client.h
+SOURCES       = client.cpp \
+                main.cpp
+QT           += network
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/network/fortuneclient
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fortuneclient.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/fortuneclient
+INSTALLS += target sources
diff --git a/examples/network/fortuneclient/main.cpp b/examples/network/fortuneclient/main.cpp
new file mode 100644
index 0000000000..11dcbc638a
--- /dev/null
+++ b/examples/network/fortuneclient/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "client.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Client client;
+    client.show();
+    return client.exec();
+}
diff --git a/examples/network/fortuneserver/fortuneserver.pro b/examples/network/fortuneserver/fortuneserver.pro
new file mode 100644
index 0000000000..e98385aa22
--- /dev/null
+++ b/examples/network/fortuneserver/fortuneserver.pro
@@ -0,0 +1,10 @@
+HEADERS       = server.h
+SOURCES       = server.cpp \
+                main.cpp
+QT           += network
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/network/fortuneserver
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fortuneserver.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/fortuneserver
+INSTALLS += target sources
diff --git a/examples/network/fortuneserver/main.cpp b/examples/network/fortuneserver/main.cpp
new file mode 100644
index 0000000000..b505c44623
--- /dev/null
+++ b/examples/network/fortuneserver/main.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QtCore>
+
+#include <stdlib.h>
+
+#include "server.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Server server;
+    server.show();
+    qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
+    return server.exec();
+}
diff --git a/examples/network/fortuneserver/server.cpp b/examples/network/fortuneserver/server.cpp
new file mode 100644
index 0000000000..09626a8c39
--- /dev/null
+++ b/examples/network/fortuneserver/server.cpp
@@ -0,0 +1,123 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtNetwork>
+
+#include <stdlib.h>
+
+#include "server.h"
+
+Server::Server(QWidget *parent)
+    : QDialog(parent)
+{
+    statusLabel = new QLabel;
+    quitButton = new QPushButton(tr("Quit"));
+    quitButton->setAutoDefault(false);
+
+//! [0] //! [1]
+    tcpServer = new QTcpServer(this);
+    if (!tcpServer->listen()) {
+        QMessageBox::critical(this, tr("Fortune Server"),
+                              tr("Unable to start the server: %1.")
+                              .arg(tcpServer->errorString()));
+        close();
+        return;
+    }
+//! [0]
+
+    statusLabel->setText(tr("The server is running on port %1.\n"
+                            "Run the Fortune Client example now.")
+                         .arg(tcpServer->serverPort()));
+//! [1]
+
+//! [2]
+    fortunes << tr("You've been leading a dog's life. Stay off the furniture.")
+             << tr("You've got to think about tomorrow.")
+             << tr("You will be surprised by a loud noise.")
+             << tr("You will feel hungry again in another hour.")
+             << tr("You might have mail.")
+             << tr("You cannot kill time without injuring eternity.")
+             << tr("Computers are not intelligent. They only think they are.");
+//! [2]
+
+    connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
+//! [3]
+    connect(tcpServer, SIGNAL(newConnection()), this, SLOT(sendFortune()));
+//! [3]
+
+    QHBoxLayout *buttonLayout = new QHBoxLayout;
+    buttonLayout->addStretch(1);
+    buttonLayout->addWidget(quitButton);
+    buttonLayout->addStretch(1);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(statusLabel);
+    mainLayout->addLayout(buttonLayout);
+    setLayout(mainLayout);
+
+    setWindowTitle(tr("Fortune Server"));
+}
+
+//! [4]
+void Server::sendFortune()
+{
+//! [5]
+    QByteArray block;
+    QDataStream out(&block, QIODevice::WriteOnly);
+    out.setVersion(QDataStream::Qt_4_0);
+//! [4] //! [6]
+    out << (quint16)0;
+    out << fortunes.at(qrand() % fortunes.size());
+    out.device()->seek(0);
+    out << (quint16)(block.size() - sizeof(quint16));
+//! [6] //! [7]
+
+    QTcpSocket *clientConnection = tcpServer->nextPendingConnection();
+    connect(clientConnection, SIGNAL(disconnected()),
+            clientConnection, SLOT(deleteLater()));
+//! [7] //! [8]
+
+    clientConnection->write(block);
+    clientConnection->disconnectFromHost();
+//! [5]
+}
+//! [8]
diff --git a/examples/network/fortuneserver/server.h b/examples/network/fortuneserver/server.h
new file mode 100644
index 0000000000..dcd64c72af
--- /dev/null
+++ b/examples/network/fortuneserver/server.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SERVER_H
+#define SERVER_H
+
+#include <QDialog>
+
+QT_BEGIN_NAMESPACE
+class QLabel;
+class QPushButton;
+class QTcpServer;
+QT_END_NAMESPACE
+
+//! [0]
+class Server : public QDialog
+{
+    Q_OBJECT
+
+public:
+    Server(QWidget *parent = 0);
+
+private slots:
+    void sendFortune();
+
+private:
+    QLabel *statusLabel;
+    QPushButton *quitButton;
+    QTcpServer *tcpServer;
+    QStringList fortunes;
+};
+//! [0]
+
+#endif
diff --git a/examples/network/ftp/ftp.pro b/examples/network/ftp/ftp.pro
new file mode 100644
index 0000000000..cabc00332b
--- /dev/null
+++ b/examples/network/ftp/ftp.pro
@@ -0,0 +1,11 @@
+HEADERS       = ftpwindow.h
+SOURCES       = ftpwindow.cpp \
+                main.cpp
+RESOURCES    += ftp.qrc
+QT           += network
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/network/ftp
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS ftp.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/ftp
+INSTALLS += target sources
diff --git a/examples/network/ftp/ftp.qrc b/examples/network/ftp/ftp.qrc
new file mode 100644
index 0000000000..b598ab8829
--- /dev/null
+++ b/examples/network/ftp/ftp.qrc
@@ -0,0 +1,7 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>images/cdtoparent.png</file>
+    <file>images/dir.png</file>
+    <file>images/file.png</file>
+</qresource>
+</RCC>
diff --git a/examples/network/ftp/ftpwindow.cpp b/examples/network/ftp/ftpwindow.cpp
new file mode 100644
index 0000000000..a05a5dd3d9
--- /dev/null
+++ b/examples/network/ftp/ftpwindow.cpp
@@ -0,0 +1,349 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtNetwork>
+
+#include "ftpwindow.h"
+
+FtpWindow::FtpWindow(QWidget *parent)
+    : QDialog(parent), ftp(0)
+{
+    ftpServerLabel = new QLabel(tr("Ftp &server:"));
+    ftpServerLineEdit = new QLineEdit("ftp.trolltech.com");
+    ftpServerLabel->setBuddy(ftpServerLineEdit);
+
+    statusLabel = new QLabel(tr("Please enter the name of an FTP server."));
+
+    fileList = new QTreeWidget;
+    fileList->setEnabled(false);
+    fileList->setRootIsDecorated(false);
+    fileList->setHeaderLabels(QStringList() << tr("Name") << tr("Size") << tr("Owner") << tr("Group") << tr("Time"));
+    fileList->header()->setStretchLastSection(false);
+
+    connectButton = new QPushButton(tr("Connect"));
+    connectButton->setDefault(true);
+    
+    cdToParentButton = new QPushButton;
+    cdToParentButton->setIcon(QPixmap(":/images/cdtoparent.png"));
+    cdToParentButton->setEnabled(false);
+
+    downloadButton = new QPushButton(tr("Download"));
+    downloadButton->setEnabled(false);
+
+    quitButton = new QPushButton(tr("Quit"));
+
+    buttonBox = new QDialogButtonBox;
+    buttonBox->addButton(downloadButton, QDialogButtonBox::ActionRole);
+    buttonBox->addButton(quitButton, QDialogButtonBox::RejectRole);
+
+    progressDialog = new QProgressDialog(this);
+
+    connect(fileList, SIGNAL(itemActivated(QTreeWidgetItem *, int)),
+            this, SLOT(processItem(QTreeWidgetItem *, int)));
+    connect(fileList, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)),
+            this, SLOT(enableDownloadButton()));
+    connect(progressDialog, SIGNAL(canceled()), this, SLOT(cancelDownload()));
+    connect(connectButton, SIGNAL(clicked()), this, SLOT(connectOrDisconnect()));
+    connect(cdToParentButton, SIGNAL(clicked()), this, SLOT(cdToParent()));
+    connect(downloadButton, SIGNAL(clicked()), this, SLOT(downloadFile()));
+    connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
+
+    QHBoxLayout *topLayout = new QHBoxLayout;
+    topLayout->addWidget(ftpServerLabel);
+    topLayout->addWidget(ftpServerLineEdit);
+    topLayout->addWidget(cdToParentButton);
+    topLayout->addWidget(connectButton);
+    
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addLayout(topLayout);
+    mainLayout->addWidget(fileList);
+    mainLayout->addWidget(statusLabel);
+    mainLayout->addWidget(buttonBox);
+    setLayout(mainLayout);
+
+    setWindowTitle(tr("FTP"));
+}
+
+QSize FtpWindow::sizeHint() const
+{
+    return QSize(500, 300);
+}
+
+//![0]
+void FtpWindow::connectOrDisconnect()
+{
+    if (ftp) {
+        ftp->abort();
+        ftp->deleteLater();
+        ftp = 0;
+//![0]
+        fileList->setEnabled(false);
+        cdToParentButton->setEnabled(false);
+        downloadButton->setEnabled(false);
+        connectButton->setEnabled(true);
+        connectButton->setText(tr("Connect"));
+#ifndef QT_NO_CURSOR
+        setCursor(Qt::ArrowCursor);
+#endif
+        return;
+    }
+
+#ifndef QT_NO_CURSOR
+    setCursor(Qt::WaitCursor);
+#endif
+
+//![1]    
+    ftp = new QFtp(this);
+    connect(ftp, SIGNAL(commandFinished(int, bool)),
+            this, SLOT(ftpCommandFinished(int, bool)));
+    connect(ftp, SIGNAL(listInfo(const QUrlInfo &)),
+            this, SLOT(addToList(const QUrlInfo &)));
+    connect(ftp, SIGNAL(dataTransferProgress(qint64, qint64)),
+            this, SLOT(updateDataTransferProgress(qint64, qint64)));
+
+    fileList->clear();
+    currentPath.clear();
+    isDirectory.clear();
+//![1]
+
+//![2]
+    QUrl url(ftpServerLineEdit->text());
+    if (!url.isValid() || url.scheme().toLower() != QLatin1String("ftp")) {
+        ftp->connectToHost(ftpServerLineEdit->text(), 21);
+        ftp->login();
+    } else {
+        ftp->connectToHost(url.host(), url.port(21));
+
+        if (!url.userName().isEmpty())
+            ftp->login(QUrl::fromPercentEncoding(url.userName().toLatin1()), url.password());
+        else
+            ftp->login();
+        if (!url.path().isEmpty())
+            ftp->cd(url.path());
+    }
+//![2]
+
+    fileList->setEnabled(true);
+    connectButton->setEnabled(false);
+    connectButton->setText(tr("Disconnect"));
+    statusLabel->setText(tr("Connecting to FTP server %1...")
+                         .arg(ftpServerLineEdit->text()));
+}
+
+//![3]
+void FtpWindow::downloadFile()
+{
+    QString fileName = fileList->currentItem()->text(0);
+//![3]
+//
+    if (QFile::exists(fileName)) {
+        QMessageBox::information(this, tr("FTP"),
+                                 tr("There already exists a file called %1 in "
+                                    "the current directory.")
+                                 .arg(fileName));
+        return;
+    }
+
+//![4]
+    file = new QFile(fileName);
+    if (!file->open(QIODevice::WriteOnly)) {
+        QMessageBox::information(this, tr("FTP"),
+                                 tr("Unable to save the file %1: %2.")
+                                 .arg(fileName).arg(file->errorString()));
+        delete file;
+        return;
+    }
+
+    ftp->get(fileList->currentItem()->text(0), file);
+
+    progressDialog->setLabelText(tr("Downloading %1...").arg(fileName));
+    downloadButton->setEnabled(false);
+    progressDialog->exec();
+}
+//![4]
+
+//![5]
+void FtpWindow::cancelDownload()
+{
+    ftp->abort();
+}
+//![5]
+
+//![6]
+void FtpWindow::ftpCommandFinished(int, bool error)
+{
+#ifndef QT_NO_CURSOR
+    setCursor(Qt::ArrowCursor);
+#endif
+
+    if (ftp->currentCommand() == QFtp::ConnectToHost) {
+        if (error) {
+            QMessageBox::information(this, tr("FTP"),
+                                     tr("Unable to connect to the FTP server "
+                                        "at %1. Please check that the host "
+                                        "name is correct.")
+                                     .arg(ftpServerLineEdit->text()));
+            connectOrDisconnect();
+            return;
+        }
+        statusLabel->setText(tr("Logged onto %1.")
+                             .arg(ftpServerLineEdit->text()));
+        fileList->setFocus();
+        downloadButton->setDefault(true);
+        connectButton->setEnabled(true);
+        return;
+    }
+//![6]
+
+//![7]
+    if (ftp->currentCommand() == QFtp::Login)
+        ftp->list();
+//![7]
+
+//![8]
+    if (ftp->currentCommand() == QFtp::Get) {
+        if (error) {
+            statusLabel->setText(tr("Canceled download of %1.")
+                                 .arg(file->fileName()));
+            file->close();
+            file->remove();
+        } else {
+            statusLabel->setText(tr("Downloaded %1 to current directory.")
+                                 .arg(file->fileName()));
+            file->close();
+        }
+        delete file;
+        enableDownloadButton();
+        progressDialog->hide();
+//![8]
+//![9]
+    } else if (ftp->currentCommand() == QFtp::List) {
+        if (isDirectory.isEmpty()) {
+            fileList->addTopLevelItem(new QTreeWidgetItem(QStringList() << tr("<empty>")));
+            fileList->setEnabled(false);
+        }
+    }
+//![9]
+}
+
+//![10]
+void FtpWindow::addToList(const QUrlInfo &urlInfo)
+{
+    QTreeWidgetItem *item = new QTreeWidgetItem;
+    item->setText(0, urlInfo.name());
+    item->setText(1, QString::number(urlInfo.size()));
+    item->setText(2, urlInfo.owner());
+    item->setText(3, urlInfo.group());
+    item->setText(4, urlInfo.lastModified().toString("MMM dd yyyy"));
+
+    QPixmap pixmap(urlInfo.isDir() ? ":/images/dir.png" : ":/images/file.png");
+    item->setIcon(0, pixmap);
+
+    isDirectory[urlInfo.name()] = urlInfo.isDir();
+    fileList->addTopLevelItem(item);
+    if (!fileList->currentItem()) {
+        fileList->setCurrentItem(fileList->topLevelItem(0));
+        fileList->setEnabled(true);
+    }
+}
+//![10]
+
+//![11]
+void FtpWindow::processItem(QTreeWidgetItem *item, int /*column*/)
+{
+    QString name = item->text(0);
+    if (isDirectory.value(name)) {
+        fileList->clear();
+        isDirectory.clear();
+        currentPath += "/" + name;
+        ftp->cd(name);
+        ftp->list();
+        cdToParentButton->setEnabled(true);
+#ifndef QT_NO_CURSOR
+        setCursor(Qt::WaitCursor);
+#endif
+        return;
+    }
+}
+//![11]
+
+//![12]
+void FtpWindow::cdToParent()
+{
+#ifndef QT_NO_CURSOR
+    setCursor(Qt::WaitCursor);
+#endif
+    fileList->clear();
+    isDirectory.clear();
+    currentPath = currentPath.left(currentPath.lastIndexOf('/'));
+    if (currentPath.isEmpty()) {
+        cdToParentButton->setEnabled(false);
+        ftp->cd("/");
+    } else {
+        ftp->cd(currentPath);
+    }
+    ftp->list();
+}
+//![12]
+
+//![13]
+void FtpWindow::updateDataTransferProgress(qint64 readBytes,
+                                           qint64 totalBytes)
+{
+    progressDialog->setMaximum(totalBytes);
+    progressDialog->setValue(readBytes);
+}
+//![13]
+
+//![14]
+void FtpWindow::enableDownloadButton()
+{
+    QTreeWidgetItem *current = fileList->currentItem();
+    if (current) {
+        QString currentFile = current->text(0);
+        downloadButton->setEnabled(!isDirectory.value(currentFile));
+    } else {
+        downloadButton->setEnabled(false);
+    }
+}
+//![14]
+
diff --git a/examples/network/ftp/ftpwindow.h b/examples/network/ftp/ftpwindow.h
new file mode 100644
index 0000000000..a3045faeee
--- /dev/null
+++ b/examples/network/ftp/ftpwindow.h
@@ -0,0 +1,104 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef FTPWINDOW_H
+#define FTPWINDOW_H
+
+#include <QDialog>
+#include <QHash>
+
+QT_BEGIN_NAMESPACE
+class QDialogButtonBox;
+class QFile;
+class QFtp;
+class QLabel;
+class QLineEdit;
+class QTreeWidget;
+class QTreeWidgetItem;
+class QProgressDialog;
+class QPushButton;
+class QUrlInfo;
+QT_END_NAMESPACE
+
+class FtpWindow : public QDialog
+{
+    Q_OBJECT
+
+public:
+    FtpWindow(QWidget *parent = 0);
+    QSize sizeHint() const;
+
+//![0]
+private slots:
+    void connectOrDisconnect();
+    void downloadFile();
+    void cancelDownload();
+
+    void ftpCommandFinished(int commandId, bool error);
+    void addToList(const QUrlInfo &urlInfo);
+    void processItem(QTreeWidgetItem *item, int column);
+    void cdToParent();
+    void updateDataTransferProgress(qint64 readBytes,
+                                    qint64 totalBytes);
+    void enableDownloadButton();
+//![0]
+
+private:
+    QLabel *ftpServerLabel;
+    QLineEdit *ftpServerLineEdit;
+    QLabel *statusLabel;
+    QTreeWidget *fileList;
+    QPushButton *cdToParentButton;
+    QPushButton *connectButton;
+    QPushButton *downloadButton;
+    QPushButton *quitButton;
+    QDialogButtonBox *buttonBox;
+    QProgressDialog *progressDialog;
+
+//![1]
+    QHash<QString, bool> isDirectory;
+    QString currentPath;
+    QFtp *ftp;
+    QFile *file;
+//![1]
+};
+
+#endif
diff --git a/examples/network/ftp/images/cdtoparent.png b/examples/network/ftp/images/cdtoparent.png
new file mode 100644
index 0000000000..24b6180829
--- /dev/null
+++ b/examples/network/ftp/images/cdtoparent.png
diff --git a/examples/network/ftp/images/dir.png b/examples/network/ftp/images/dir.png
new file mode 100644
index 0000000000..0ce5ae75fc
--- /dev/null
+++ b/examples/network/ftp/images/dir.png
diff --git a/examples/network/ftp/images/file.png b/examples/network/ftp/images/file.png
new file mode 100644
index 0000000000..be6c53089a
--- /dev/null
+++ b/examples/network/ftp/images/file.png
diff --git a/examples/network/ftp/main.cpp b/examples/network/ftp/main.cpp
new file mode 100644
index 0000000000..b9ffd33a14
--- /dev/null
+++ b/examples/network/ftp/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "ftpwindow.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(ftp);
+
+    QApplication app(argc, argv);
+    FtpWindow ftpWin;
+    ftpWin.show();
+    return ftpWin.exec();
+}
diff --git a/examples/network/http/authenticationdialog.ui b/examples/network/http/authenticationdialog.ui
new file mode 100644
index 0000000000..82d908cffb
--- /dev/null
+++ b/examples/network/http/authenticationdialog.ui
@@ -0,0 +1,129 @@
+<ui version="4.0" >
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>389</width>
+    <height>243</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Http authentication required</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" colspan="2" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>You need to supply a Username and a Password to access this site</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="label_2" >
+     <property name="text" >
+      <string>Username:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QLineEdit" name="userEdit" />
+   </item>
+   <item row="3" column="0" >
+    <widget class="QLabel" name="label_3" >
+     <property name="text" >
+      <string>Password:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" >
+    <widget class="QLineEdit" name="passwordEdit" />
+   </item>
+   <item row="5" column="0" colspan="2" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="label_4" >
+     <property name="text" >
+      <string>Site:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QLabel" name="siteDescription" >
+     <property name="font" >
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text" >
+      <string>%1 at %2</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>Dialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>Dialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/examples/network/http/http.pro b/examples/network/http/http.pro
new file mode 100644
index 0000000000..7f58d9fffb
--- /dev/null
+++ b/examples/network/http/http.pro
@@ -0,0 +1,11 @@
+HEADERS += httpwindow.h
+SOURCES += httpwindow.cpp \
+           main.cpp
+FORMS += authenticationdialog.ui
+QT += network
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/network/http
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS http.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/http
+INSTALLS += target sources
diff --git a/examples/network/http/httpwindow.cpp b/examples/network/http/httpwindow.cpp
new file mode 100644
index 0000000000..ebde7703aa
--- /dev/null
+++ b/examples/network/http/httpwindow.cpp
@@ -0,0 +1,262 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtNetwork>
+
+#include "httpwindow.h"
+#include "ui_authenticationdialog.h"
+
+HttpWindow::HttpWindow(QWidget *parent)
+    : QDialog(parent)
+{
+#ifndef QT_NO_OPENSSL
+    urlLineEdit = new QLineEdit("https://");
+#else
+    urlLineEdit = new QLineEdit("http://");
+#endif
+
+    urlLabel = new QLabel(tr("&URL:"));
+    urlLabel->setBuddy(urlLineEdit);
+    statusLabel = new QLabel(tr("Please enter the URL of a file you want to "
+                                "download."));
+
+    downloadButton = new QPushButton(tr("Download"));
+    downloadButton->setDefault(true);
+    quitButton = new QPushButton(tr("Quit"));
+    quitButton->setAutoDefault(false);
+
+    buttonBox = new QDialogButtonBox;
+    buttonBox->addButton(downloadButton, QDialogButtonBox::ActionRole);
+    buttonBox->addButton(quitButton, QDialogButtonBox::RejectRole);
+
+    progressDialog = new QProgressDialog(this);
+
+    http = new QHttp(this);
+
+    connect(urlLineEdit, SIGNAL(textChanged(const QString &)),
+            this, SLOT(enableDownloadButton()));
+    connect(http, SIGNAL(requestFinished(int, bool)),
+            this, SLOT(httpRequestFinished(int, bool)));
+    connect(http, SIGNAL(dataReadProgress(int, int)),
+            this, SLOT(updateDataReadProgress(int, int)));
+    connect(http, SIGNAL(responseHeaderReceived(const QHttpResponseHeader &)),
+            this, SLOT(readResponseHeader(const QHttpResponseHeader &)));
+    connect(http, SIGNAL(authenticationRequired(const QString &, quint16, QAuthenticator *)),
+            this, SLOT(slotAuthenticationRequired(const QString &, quint16, QAuthenticator *)));
+#ifndef QT_NO_OPENSSL
+    connect(http, SIGNAL(sslErrors(const QList<QSslError> &)),
+            this, SLOT(sslErrors(const QList<QSslError> &)));
+#endif
+    connect(progressDialog, SIGNAL(canceled()), this, SLOT(cancelDownload()));
+    connect(downloadButton, SIGNAL(clicked()), this, SLOT(downloadFile()));
+    connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
+
+    QHBoxLayout *topLayout = new QHBoxLayout;
+    topLayout->addWidget(urlLabel);
+    topLayout->addWidget(urlLineEdit);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addLayout(topLayout);
+    mainLayout->addWidget(statusLabel);
+    mainLayout->addWidget(buttonBox);
+    setLayout(mainLayout);
+
+    setWindowTitle(tr("HTTP"));
+    urlLineEdit->setFocus();
+}
+
+void HttpWindow::downloadFile()
+{
+    QUrl url(urlLineEdit->text());
+    QFileInfo fileInfo(url.path());
+    QString fileName = fileInfo.fileName();
+    if (fileName.isEmpty())
+        fileName = "index.html";
+
+    if (QFile::exists(fileName)) {
+        if (QMessageBox::question(this, tr("HTTP"), 
+                                  tr("There already exists a file called %1 in "
+                                     "the current directory. Overwrite?").arg(fileName),
+                                  QMessageBox::Ok|QMessageBox::Cancel, QMessageBox::Cancel)
+            == QMessageBox::Cancel)
+            return;
+        QFile::remove(fileName);
+    }
+
+    file = new QFile(fileName);
+    if (!file->open(QIODevice::WriteOnly)) {
+        QMessageBox::information(this, tr("HTTP"),
+                                 tr("Unable to save the file %1: %2.")
+                                 .arg(fileName).arg(file->errorString()));
+        delete file;
+        file = 0;
+        return;
+    }
+
+    QHttp::ConnectionMode mode = url.scheme().toLower() == "https" ? QHttp::ConnectionModeHttps : QHttp::ConnectionModeHttp;
+    http->setHost(url.host(), mode, url.port() == -1 ? 0 : url.port());
+    
+    if (!url.userName().isEmpty())
+        http->setUser(url.userName(), url.password());
+
+    httpRequestAborted = false;
+    QByteArray path = QUrl::toPercentEncoding(url.path(), "!$&'()*+,;=:@/");
+    if (path.isEmpty())
+        path = "/";
+    httpGetId = http->get(path, file);
+
+    progressDialog->setWindowTitle(tr("HTTP"));
+    progressDialog->setLabelText(tr("Downloading %1.").arg(fileName));
+    downloadButton->setEnabled(false);
+}
+
+void HttpWindow::cancelDownload()
+{
+    statusLabel->setText(tr("Download canceled."));
+    httpRequestAborted = true;
+    http->abort();
+    downloadButton->setEnabled(true);
+}
+
+void HttpWindow::httpRequestFinished(int requestId, bool error)
+{
+    if (requestId != httpGetId)
+        return;
+    if (httpRequestAborted) {
+        if (file) {
+            file->close();
+            file->remove();
+            delete file;
+            file = 0;
+        }
+
+        progressDialog->hide();
+        return;
+    }
+
+    if (requestId != httpGetId)
+        return;
+
+    progressDialog->hide();
+    file->close();
+
+    if (error) {
+        file->remove();
+        QMessageBox::information(this, tr("HTTP"),
+                                 tr("Download failed: %1.")
+                                 .arg(http->errorString()));
+    } else {
+        QString fileName = QFileInfo(QUrl(urlLineEdit->text()).path()).fileName();
+        statusLabel->setText(tr("Downloaded %1 to current directory.").arg(fileName));
+    }
+
+    downloadButton->setEnabled(true);
+    delete file;
+    file = 0;
+}
+
+void HttpWindow::readResponseHeader(const QHttpResponseHeader &responseHeader)
+{
+    switch (responseHeader.statusCode()) {
+    case 200:                   // Ok
+    case 301:                   // Moved Permanently
+    case 302:                   // Found
+    case 303:                   // See Other
+    case 307:                   // Temporary Redirect
+        // these are not error conditions
+        break;
+
+    default:
+        QMessageBox::information(this, tr("HTTP"),
+                                 tr("Download failed: %1.")
+                                 .arg(responseHeader.reasonPhrase()));
+        httpRequestAborted = true;
+        progressDialog->hide();
+        http->abort();
+    }
+}
+
+void HttpWindow::updateDataReadProgress(int bytesRead, int totalBytes)
+{
+    if (httpRequestAborted)
+        return;
+
+    progressDialog->setMaximum(totalBytes);
+    progressDialog->setValue(bytesRead);
+}
+
+void HttpWindow::enableDownloadButton()
+{
+    downloadButton->setEnabled(!urlLineEdit->text().isEmpty());
+}
+
+void HttpWindow::slotAuthenticationRequired(const QString &hostName, quint16, QAuthenticator *authenticator)
+{
+    QDialog dlg;
+    Ui::Dialog ui;
+    ui.setupUi(&dlg);
+    dlg.adjustSize();
+    ui.siteDescription->setText(tr("%1 at %2").arg(authenticator->realm()).arg(hostName));
+    
+    if (dlg.exec() == QDialog::Accepted) {
+        authenticator->setUser(ui.userEdit->text());
+        authenticator->setPassword(ui.passwordEdit->text());
+    }
+}
+
+#ifndef QT_NO_OPENSSL
+void HttpWindow::sslErrors(const QList<QSslError> &errors)
+{
+    QString errorString;
+    foreach (const QSslError &error, errors) {
+        if (!errorString.isEmpty())
+            errorString += ", ";
+        errorString += error.errorString();
+    }
+    
+    if (QMessageBox::warning(this, tr("HTTP Example"),
+                             tr("One or more SSL errors has occurred: %1").arg(errorString),
+                             QMessageBox::Ignore | QMessageBox::Abort) == QMessageBox::Ignore) {
+        http->ignoreSslErrors();
+    }
+}
+#endif
diff --git a/examples/network/http/httpwindow.h b/examples/network/http/httpwindow.h
new file mode 100644
index 0000000000..f0fb504433
--- /dev/null
+++ b/examples/network/http/httpwindow.h
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef HTTPWINDOW_H
+#define HTTPWINDOW_H
+
+#include <QDialog>
+
+QT_BEGIN_NAMESPACE
+class QDialogButtonBox;
+class QFile;
+class QHttp;
+class QHttpResponseHeader;
+class QLabel;
+class QLineEdit;
+class QProgressDialog;
+class QPushButton;
+class QSslError;
+class QAuthenticator;
+QT_END_NAMESPACE
+
+class HttpWindow : public QDialog
+{
+    Q_OBJECT
+
+public:
+    HttpWindow(QWidget *parent = 0);
+
+private slots:
+    void downloadFile();
+    void cancelDownload();
+    void httpRequestFinished(int requestId, bool error);
+    void readResponseHeader(const QHttpResponseHeader &responseHeader);
+    void updateDataReadProgress(int bytesRead, int totalBytes);
+    void enableDownloadButton();
+    void slotAuthenticationRequired(const QString &, quint16, QAuthenticator *);
+#ifndef QT_NO_OPENSSL
+    void sslErrors(const QList<QSslError> &errors);
+#endif
+
+private:
+    QLabel *statusLabel;
+    QLabel *urlLabel;
+    QLineEdit *urlLineEdit;
+    QProgressDialog *progressDialog;
+    QPushButton *downloadButton;
+    QPushButton *quitButton;
+    QDialogButtonBox *buttonBox;
+
+    QHttp *http;
+    QFile *file;
+    int httpGetId;
+    bool httpRequestAborted;
+};
+
+#endif
diff --git a/examples/network/http/main.cpp b/examples/network/http/main.cpp
new file mode 100644
index 0000000000..dba40828f4
--- /dev/null
+++ b/examples/network/http/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "httpwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    HttpWindow httpWin;
+    httpWin.show();
+    return httpWin.exec();
+}
diff --git a/examples/network/loopback/dialog.cpp b/examples/network/loopback/dialog.cpp
new file mode 100644
index 0000000000..06ec8dd32b
--- /dev/null
+++ b/examples/network/loopback/dialog.cpp
@@ -0,0 +1,187 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtNetwork>
+
+#include "dialog.h"
+
+#if !defined(Q_OS_WINCE)
+static const int TotalBytes = 50 * 1024 * 1024;
+#else
+static const int TotalBytes = 5 * 1024 * 1024;
+#endif
+static const int PayloadSize = 65536;
+
+Dialog::Dialog(QWidget *parent)
+    : QDialog(parent)
+{
+    clientProgressBar = new QProgressBar;
+    clientStatusLabel = new QLabel(tr("Client ready"));
+    serverProgressBar = new QProgressBar;
+    serverStatusLabel = new QLabel(tr("Server ready"));
+
+    startButton = new QPushButton(tr("&Start"));
+    quitButton = new QPushButton(tr("&Quit"));
+
+    buttonBox = new QDialogButtonBox;
+    buttonBox->addButton(startButton, QDialogButtonBox::ActionRole);
+    buttonBox->addButton(quitButton, QDialogButtonBox::RejectRole);
+
+    connect(startButton, SIGNAL(clicked()), this, SLOT(start()));
+    connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
+    connect(&tcpServer, SIGNAL(newConnection()),
+            this, SLOT(acceptConnection()));
+    connect(&tcpClient, SIGNAL(connected()), this, SLOT(startTransfer()));
+    connect(&tcpClient, SIGNAL(bytesWritten(qint64)),
+            this, SLOT(updateClientProgress(qint64)));
+    connect(&tcpClient, SIGNAL(error(QAbstractSocket::SocketError)),
+            this, SLOT(displayError(QAbstractSocket::SocketError)));
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(clientProgressBar);
+    mainLayout->addWidget(clientStatusLabel);
+    mainLayout->addWidget(serverProgressBar);
+    mainLayout->addWidget(serverStatusLabel);
+    mainLayout->addStretch(1);
+    mainLayout->addSpacing(10);
+    mainLayout->addWidget(buttonBox);
+    setLayout(mainLayout);
+
+    setWindowTitle(tr("Loopback"));
+}
+
+void Dialog::start()
+{
+    startButton->setEnabled(false);
+
+#ifndef QT_NO_CURSOR
+    QApplication::setOverrideCursor(Qt::WaitCursor);
+#endif
+
+    bytesWritten = 0;
+    bytesReceived = 0;
+
+    while (!tcpServer.isListening() && !tcpServer.listen()) {
+        QMessageBox::StandardButton ret = QMessageBox::critical(this,
+                                        tr("Loopback"),
+                                        tr("Unable to start the test: %1.")
+					.arg(tcpServer.errorString()),
+                                        QMessageBox::Retry
+					| QMessageBox::Cancel);
+        if (ret == QMessageBox::Cancel)
+            return;
+    }
+
+    serverStatusLabel->setText(tr("Listening"));
+    clientStatusLabel->setText(tr("Connecting"));
+    tcpClient.connectToHost(QHostAddress::LocalHost, tcpServer.serverPort());
+}
+
+void Dialog::acceptConnection()
+{
+    tcpServerConnection = tcpServer.nextPendingConnection();
+    connect(tcpServerConnection, SIGNAL(readyRead()),
+            this, SLOT(updateServerProgress()));
+    connect(tcpServerConnection, SIGNAL(error(QAbstractSocket::SocketError)),
+            this, SLOT(displayError(QAbstractSocket::SocketError)));
+
+    serverStatusLabel->setText(tr("Accepted connection"));
+    tcpServer.close();
+}
+
+void Dialog::startTransfer()
+{
+    bytesToWrite = TotalBytes - (int)tcpClient.write(QByteArray(PayloadSize, '@'));
+    clientStatusLabel->setText(tr("Connected"));
+}
+
+void Dialog::updateServerProgress()
+{
+    bytesReceived += (int)tcpServerConnection->bytesAvailable();
+    tcpServerConnection->readAll();
+
+    serverProgressBar->setMaximum(TotalBytes);
+    serverProgressBar->setValue(bytesReceived);
+    serverStatusLabel->setText(tr("Received %1MB")
+                               .arg(bytesReceived / (1024 * 1024)));
+
+    if (bytesReceived == TotalBytes) {
+        tcpServerConnection->close();
+        startButton->setEnabled(true);
+#ifndef QT_NO_CURSOR
+        QApplication::restoreOverrideCursor();
+#endif
+    }
+}
+
+void Dialog::updateClientProgress(qint64 numBytes)
+{
+    bytesWritten += (int)numBytes;
+    if (bytesToWrite > 0)
+        bytesToWrite -= (int)tcpClient.write(QByteArray(qMin(bytesToWrite, PayloadSize), '@'));
+
+    clientProgressBar->setMaximum(TotalBytes);
+    clientProgressBar->setValue(bytesWritten);
+    clientStatusLabel->setText(tr("Sent %1MB")
+                               .arg(bytesWritten / (1024 * 1024)));
+}
+
+void Dialog::displayError(QAbstractSocket::SocketError socketError)
+{
+    if (socketError == QTcpSocket::RemoteHostClosedError)
+        return;
+
+    QMessageBox::information(this, tr("Network error"),
+                             tr("The following error occurred: %1.")
+                             .arg(tcpClient.errorString()));
+
+    tcpClient.close();
+    tcpServer.close();
+    clientProgressBar->reset();
+    serverProgressBar->reset();
+    clientStatusLabel->setText(tr("Client ready"));
+    serverStatusLabel->setText(tr("Server ready"));
+    startButton->setEnabled(true);
+#ifndef QT_NO_CURSOR
+    QApplication::restoreOverrideCursor();
+#endif
+}
diff --git a/examples/network/loopback/dialog.h b/examples/network/loopback/dialog.h
new file mode 100644
index 0000000000..cc15376ff5
--- /dev/null
+++ b/examples/network/loopback/dialog.h
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DIALOG_H
+#define DIALOG_H
+
+#include <QDialog>
+#include <QTcpServer>
+#include <QTcpSocket>
+
+QT_BEGIN_NAMESPACE
+class QDialogButtonBox;
+class QLabel;
+class QProgressBar;
+class QPushButton;
+class QTcpServer;
+class QTcpSocket;
+QT_END_NAMESPACE
+
+class Dialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    Dialog(QWidget *parent = 0);
+
+public slots:
+    void start();
+    void acceptConnection();
+    void startTransfer();
+    void updateServerProgress();
+    void updateClientProgress(qint64 numBytes);
+    void displayError(QAbstractSocket::SocketError socketError);
+
+private:
+    QProgressBar *clientProgressBar;
+    QProgressBar *serverProgressBar;
+    QLabel *clientStatusLabel;
+    QLabel *serverStatusLabel;
+    QPushButton *startButton;
+    QPushButton *quitButton;
+    QDialogButtonBox *buttonBox;
+
+    QTcpServer tcpServer;
+    QTcpSocket tcpClient;
+    QTcpSocket *tcpServerConnection;
+    int bytesToWrite;
+    int bytesWritten;
+    int bytesReceived;
+};
+
+#endif
diff --git a/examples/network/loopback/loopback.pro b/examples/network/loopback/loopback.pro
new file mode 100644
index 0000000000..88b7a8bf05
--- /dev/null
+++ b/examples/network/loopback/loopback.pro
@@ -0,0 +1,10 @@
+HEADERS       = dialog.h
+SOURCES       = dialog.cpp \
+                main.cpp
+QT           += network
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/network/loopback
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS loopback.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/loopback
+INSTALLS += target sources
diff --git a/examples/network/loopback/main.cpp b/examples/network/loopback/main.cpp
new file mode 100644
index 0000000000..3e9e62cdb6
--- /dev/null
+++ b/examples/network/loopback/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "dialog.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Dialog dialog;
+    dialog.show();
+    return dialog.exec();
+}
diff --git a/examples/network/network-chat/chatdialog.cpp b/examples/network/network-chat/chatdialog.cpp
new file mode 100644
index 0000000000..7e88e5b87e
--- /dev/null
+++ b/examples/network/network-chat/chatdialog.cpp
@@ -0,0 +1,141 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "chatdialog.h"
+
+ChatDialog::ChatDialog(QWidget *parent)
+    : QDialog(parent)
+{
+    setupUi(this);
+
+    lineEdit->setFocusPolicy(Qt::StrongFocus);
+    textEdit->setFocusPolicy(Qt::NoFocus);
+    textEdit->setReadOnly(true);
+    listWidget->setFocusPolicy(Qt::NoFocus);
+
+    connect(lineEdit, SIGNAL(returnPressed()), this, SLOT(returnPressed()));
+    connect(&client, SIGNAL(newMessage(const QString &, const QString &)),
+            this, SLOT(appendMessage(const QString &, const QString &)));
+    connect(&client, SIGNAL(newParticipant(const QString &)),
+            this, SLOT(newParticipant(const QString &)));
+    connect(&client, SIGNAL(participantLeft(const QString &)),
+            this, SLOT(participantLeft(const QString &)));
+
+    myNickName = client.nickName();
+    newParticipant(myNickName);
+    tableFormat.setBorder(0);
+    QTimer::singleShot(10 * 1000, this, SLOT(showInformation()));
+}
+
+void ChatDialog::appendMessage(const QString &from, const QString &message)
+{
+    if (from.isEmpty() || message.isEmpty())
+        return;
+
+    QTextCursor cursor(textEdit->textCursor());
+    cursor.movePosition(QTextCursor::End);
+    QTextTable *table = cursor.insertTable(1, 2, tableFormat);
+    table->cellAt(0, 0).firstCursorPosition().insertText("<" + from + "> ");
+    table->cellAt(0, 1).firstCursorPosition().insertText(message);
+    QScrollBar *bar = textEdit->verticalScrollBar();
+    bar->setValue(bar->maximum());
+}
+
+void ChatDialog::returnPressed()
+{
+    QString text = lineEdit->text();
+    if (text.isEmpty())
+        return;
+
+    if (text.startsWith(QChar('/'))) {
+        QColor color = textEdit->textColor();
+        textEdit->setTextColor(Qt::red);
+        textEdit->append(tr("! Unknown command: %1")
+                         .arg(text.left(text.indexOf(' '))));
+        textEdit->setTextColor(color);
+    } else {
+        client.sendMessage(text);
+        appendMessage(myNickName, text);
+    }
+
+    lineEdit->clear();
+}
+
+void ChatDialog::newParticipant(const QString &nick)
+{
+    if (nick.isEmpty())
+        return;
+
+    QColor color = textEdit->textColor();
+    textEdit->setTextColor(Qt::gray);
+    textEdit->append(tr("* %1 has joined").arg(nick));
+    textEdit->setTextColor(color);
+    listWidget->addItem(nick);
+}
+
+void ChatDialog::participantLeft(const QString &nick)
+{
+    if (nick.isEmpty())
+        return;
+
+    QList<QListWidgetItem *> items = listWidget->findItems(nick,
+                                                           Qt::MatchExactly);
+    if (items.isEmpty())
+        return;
+
+    delete items.at(0);
+    QColor color = textEdit->textColor();
+    textEdit->setTextColor(Qt::gray);
+    textEdit->append(tr("* %1 has left").arg(nick));
+    textEdit->setTextColor(color);
+}
+
+void ChatDialog::showInformation()
+{
+    if (listWidget->count() == 1) {
+        QMessageBox::information(this, tr("Chat"),
+                                 tr("Launch several instances of this "
+                                    "program on your local network and "
+                                    "start chatting!"));
+    }
+}
diff --git a/examples/network/network-chat/chatdialog.h b/examples/network/network-chat/chatdialog.h
new file mode 100644
index 0000000000..552d79408d
--- /dev/null
+++ b/examples/network/network-chat/chatdialog.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CHATDIALOG_H
+#define CHATDIALOG_H
+
+#include "ui_chatdialog.h"
+#include "client.h"
+
+class ChatDialog : public QDialog, private Ui::ChatDialog
+{
+    Q_OBJECT
+
+public:
+    ChatDialog(QWidget *parent = 0);
+
+public slots:
+    void appendMessage(const QString &from, const QString &message);
+
+private slots:
+    void returnPressed();
+    void newParticipant(const QString &nick);
+    void participantLeft(const QString &nick);
+    void showInformation();
+
+private:
+    Client client;
+    QString myNickName;
+    QTextTableFormat tableFormat;
+};
+
+#endif
diff --git a/examples/network/network-chat/chatdialog.ui b/examples/network/network-chat/chatdialog.ui
new file mode 100644
index 0000000000..c85e0d0f55
--- /dev/null
+++ b/examples/network/network-chat/chatdialog.ui
@@ -0,0 +1,79 @@
+<ui version="4.0" >
+ <class>ChatDialog</class>
+ <widget class="QDialog" name="ChatDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>513</width>
+    <height>349</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Chat</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QTextEdit" name="textEdit" >
+       <property name="focusPolicy" >
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="readOnly" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QListWidget" name="listWidget" >
+       <property name="maximumSize" >
+        <size>
+         <width>180</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="focusPolicy" >
+        <enum>Qt::NoFocus</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="label" >
+       <property name="text" >
+        <string>Message:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="lineEdit" />
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/examples/network/network-chat/client.cpp b/examples/network/network-chat/client.cpp
new file mode 100644
index 0000000000..d5931a6bd1
--- /dev/null
+++ b/examples/network/network-chat/client.cpp
@@ -0,0 +1,140 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtNetwork>
+
+#include "client.h"
+#include "connection.h"
+#include "peermanager.h"
+
+Client::Client()
+{
+    peerManager = new PeerManager(this);
+    peerManager->setServerPort(server.serverPort());
+    peerManager->startBroadcasting();
+
+    QObject::connect(peerManager, SIGNAL(newConnection(Connection *)),
+                     this, SLOT(newConnection(Connection *)));
+    QObject::connect(&server, SIGNAL(newConnection(Connection *)),
+                     this, SLOT(newConnection(Connection *)));
+}
+
+void Client::sendMessage(const QString &message)
+{
+    if (message.isEmpty())
+        return;
+
+    QList<Connection *> connections = peers.values();
+    foreach (Connection *connection, connections)
+        connection->sendMessage(message);
+}
+
+QString Client::nickName() const
+{
+    return QString(peerManager->userName()) + "@" + QHostInfo::localHostName()
+           + ":" + QString::number(server.serverPort());
+}
+
+bool Client::hasConnection(const QHostAddress &senderIp, int senderPort) const
+{
+    if (senderPort == -1)
+        return peers.contains(senderIp);
+
+    if (!peers.contains(senderIp))
+        return false;
+
+    QList<Connection *> connections = peers.values(senderIp);
+    foreach (Connection *connection, connections) {
+        if (connection->peerPort() == senderPort)
+            return true;
+    }
+
+    return false;
+}
+
+void Client::newConnection(Connection *connection)
+{
+    connection->setGreetingMessage(peerManager->userName());
+
+    connect(connection, SIGNAL(error(QAbstractSocket::SocketError)),
+            this, SLOT(connectionError(QAbstractSocket::SocketError)));
+    connect(connection, SIGNAL(disconnected()), this, SLOT(disconnected()));
+    connect(connection, SIGNAL(readyForUse()), this, SLOT(readyForUse()));
+}
+
+void Client::readyForUse()
+{
+    Connection *connection = qobject_cast<Connection *>(sender());
+    if (!connection || hasConnection(connection->peerAddress(),
+                                     connection->peerPort()))
+        return;
+
+    connect(connection, SIGNAL(newMessage(const QString &, const QString &)),
+            this, SIGNAL(newMessage(const QString &, const QString &)));
+
+    peers.insert(connection->peerAddress(), connection);
+    QString nick = connection->name();
+    if (!nick.isEmpty())
+        emit newParticipant(nick);
+}
+
+void Client::disconnected()
+{
+    if (Connection *connection = qobject_cast<Connection *>(sender()))
+        removeConnection(connection);
+}
+
+void Client::connectionError(QAbstractSocket::SocketError /* socketError */)
+{
+    if (Connection *connection = qobject_cast<Connection *>(sender()))
+        removeConnection(connection);
+}
+
+void Client::removeConnection(Connection *connection)
+{
+    if (peers.contains(connection->peerAddress())) {
+        peers.remove(connection->peerAddress());
+        QString nick = connection->name();
+        if (!nick.isEmpty())
+            emit participantLeft(nick);
+    }
+    connection->deleteLater();
+}
diff --git a/examples/network/network-chat/client.h b/examples/network/network-chat/client.h
new file mode 100644
index 0000000000..307df46b47
--- /dev/null
+++ b/examples/network/network-chat/client.h
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CLIENT_H
+#define CLIENT_H
+
+#include <QAbstractSocket>
+#include <QHash>
+#include <QHostAddress>
+
+#include "server.h"
+
+class PeerManager;
+
+class Client : public QObject
+{
+    Q_OBJECT
+
+public:
+    Client();
+
+    void sendMessage(const QString &message);
+    QString nickName() const;
+    bool hasConnection(const QHostAddress &senderIp, int senderPort = -1) const;
+
+signals:
+    void newMessage(const QString &from, const QString &message);
+    void newParticipant(const QString &nick);
+    void participantLeft(const QString &nick);
+
+private slots:
+    void newConnection(Connection *connection);
+    void connectionError(QAbstractSocket::SocketError socketError);
+    void disconnected();
+    void readyForUse();
+
+private:
+    void removeConnection(Connection *connection);
+
+    PeerManager *peerManager;
+    Server server;
+    QMultiHash<QHostAddress, Connection *> peers;
+};
+
+#endif
diff --git a/examples/network/network-chat/connection.cpp b/examples/network/network-chat/connection.cpp
new file mode 100644
index 0000000000..116ca3acae
--- /dev/null
+++ b/examples/network/network-chat/connection.cpp
@@ -0,0 +1,276 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "connection.h"
+
+#include <QtNetwork>
+
+static const int TransferTimeout = 30 * 1000;
+static const int PongTimeout = 60 * 1000;
+static const int PingInterval = 5 * 1000;
+static const char SeparatorToken = ' ';
+
+Connection::Connection(QObject *parent)
+    : QTcpSocket(parent)
+{
+    greetingMessage = tr("undefined");
+    username = tr("unknown");
+    state = WaitingForGreeting;
+    currentDataType = Undefined;
+    numBytesForCurrentDataType = -1;
+    transferTimerId = 0;
+    isGreetingMessageSent = false;
+    pingTimer.setInterval(PingInterval);
+
+    QObject::connect(this, SIGNAL(readyRead()), this, SLOT(processReadyRead()));
+    QObject::connect(this, SIGNAL(disconnected()), &pingTimer, SLOT(stop()));
+    QObject::connect(&pingTimer, SIGNAL(timeout()), this, SLOT(sendPing()));
+    QObject::connect(this, SIGNAL(connected()),
+                     this, SLOT(sendGreetingMessage()));
+}
+
+QString Connection::name() const
+{
+    return username;
+}
+
+void Connection::setGreetingMessage(const QString &message)
+{
+    greetingMessage = message;
+}
+
+bool Connection::sendMessage(const QString &message)
+{
+    if (message.isEmpty())
+        return false;
+
+    QByteArray msg = message.toUtf8();
+    QByteArray data = "MESSAGE " + QByteArray::number(msg.size()) + " " + msg;
+    return write(data) == data.size();
+}
+
+void Connection::timerEvent(QTimerEvent *timerEvent)
+{
+    if (timerEvent->timerId() == transferTimerId) {
+        abort();
+        killTimer(transferTimerId);
+        transferTimerId = 0;
+    }
+}
+
+void Connection::processReadyRead()
+{
+    if (state == WaitingForGreeting) {
+        if (!readProtocolHeader())
+            return;
+        if (currentDataType != Greeting) {
+            abort();
+            return;
+        }
+        state = ReadingGreeting;
+    }
+
+    if (state == ReadingGreeting) {
+        if (!hasEnoughData())
+            return;
+
+        buffer = read(numBytesForCurrentDataType);
+        if (buffer.size() != numBytesForCurrentDataType) {
+            abort();
+            return;
+        }
+
+        username = QString(buffer) + "@" + peerAddress().toString() + ":"
+                   + QString::number(peerPort());
+        currentDataType = Undefined;
+        numBytesForCurrentDataType = 0;
+        buffer.clear();
+
+        if (!isValid()) {
+            abort();
+            return;
+        }
+
+        if (!isGreetingMessageSent)
+            sendGreetingMessage();
+
+        pingTimer.start();
+        pongTime.start();
+        state = ReadyForUse;
+        emit readyForUse();
+    }
+
+    do {
+        if (currentDataType == Undefined) {
+            if (!readProtocolHeader())
+                return;
+        }
+        if (!hasEnoughData())
+            return;
+        processData();
+    } while (bytesAvailable() > 0);
+}
+
+void Connection::sendPing()
+{
+    if (pongTime.elapsed() > PongTimeout) {
+        abort();
+        return;
+    }
+
+    write("PING 1 p");
+}
+
+void Connection::sendGreetingMessage()
+{
+    QByteArray greeting = greetingMessage.toUtf8();
+    QByteArray data = "GREETING " + QByteArray::number(greeting.size()) + " " + greeting;
+    if (write(data) == data.size())
+        isGreetingMessageSent = true;
+}
+
+int Connection::readDataIntoBuffer(int maxSize)
+{
+    if (maxSize > MaxBufferSize)
+        return 0;
+
+    int numBytesBeforeRead = buffer.size();
+    if (numBytesBeforeRead == MaxBufferSize) {
+        abort();
+        return 0;
+    }
+
+    while (bytesAvailable() > 0 && buffer.size() < maxSize) {
+        buffer.append(read(1));
+        if (buffer.endsWith(SeparatorToken))
+            break;
+    }
+    return buffer.size() - numBytesBeforeRead;
+}
+
+int Connection::dataLengthForCurrentDataType()
+{
+    if (bytesAvailable() <= 0 || readDataIntoBuffer() <= 0
+            || !buffer.endsWith(SeparatorToken))
+        return 0;
+
+    buffer.chop(1);
+    int number = buffer.toInt();
+    buffer.clear();
+    return number;
+}
+
+bool Connection::readProtocolHeader()
+{
+    if (transferTimerId) {
+        killTimer(transferTimerId);
+        transferTimerId = 0;
+    }
+
+    if (readDataIntoBuffer() <= 0) {
+        transferTimerId = startTimer(TransferTimeout);
+        return false;
+    }
+
+    if (buffer == "PING ") {
+        currentDataType = Ping;
+    } else if (buffer == "PONG ") {
+        currentDataType = Pong;
+    } else if (buffer == "MESSAGE ") {
+        currentDataType = PlainText;
+    } else if (buffer == "GREETING ") {
+        currentDataType = Greeting;
+    } else {
+        currentDataType = Undefined;
+        abort();
+        return false;
+    }
+
+    buffer.clear();
+    numBytesForCurrentDataType = dataLengthForCurrentDataType();
+    return true;
+}
+
+bool Connection::hasEnoughData()
+{
+    if (transferTimerId) {
+        QObject::killTimer(transferTimerId);
+        transferTimerId = 0;
+    }
+
+    if (numBytesForCurrentDataType <= 0)
+        numBytesForCurrentDataType = dataLengthForCurrentDataType();
+
+    if (bytesAvailable() < numBytesForCurrentDataType
+            || numBytesForCurrentDataType <= 0) {
+        transferTimerId = startTimer(TransferTimeout);
+        return false;
+    }
+
+    return true;
+}
+
+void Connection::processData()
+{
+    buffer = read(numBytesForCurrentDataType);
+    if (buffer.size() != numBytesForCurrentDataType) {
+        abort();
+        return;
+    }
+
+    switch (currentDataType) {
+    case PlainText:
+        emit newMessage(username, QString::fromUtf8(buffer));
+        break;
+    case Ping:
+        write("PONG 1 p");
+        break;
+    case Pong:
+        pongTime.restart();
+        break;
+    default:
+        break;
+    }
+
+    currentDataType = Undefined;
+    numBytesForCurrentDataType = 0;
+    buffer.clear();
+}
diff --git a/examples/network/network-chat/connection.h b/examples/network/network-chat/connection.h
new file mode 100644
index 0000000000..078415450e
--- /dev/null
+++ b/examples/network/network-chat/connection.h
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CONNECTION_H
+#define CONNECTION_H
+
+#include <QHostAddress>
+#include <QString>
+#include <QTcpSocket>
+#include <QTime>
+#include <QTimer>
+
+static const int MaxBufferSize = 1024000;
+
+class Connection : public QTcpSocket
+{
+    Q_OBJECT
+
+public:
+    enum ConnectionState {
+        WaitingForGreeting,
+        ReadingGreeting,
+        ReadyForUse
+    };
+    enum DataType {
+        PlainText,
+        Ping,
+        Pong,
+        Greeting,
+        Undefined
+    };
+
+    Connection(QObject *parent = 0);
+
+    QString name() const;
+    void setGreetingMessage(const QString &message);
+    bool sendMessage(const QString &message);
+
+signals:
+    void readyForUse();
+    void newMessage(const QString &from, const QString &message);
+
+protected:
+    void timerEvent(QTimerEvent *timerEvent);
+
+private slots:
+    void processReadyRead();
+    void sendPing();
+    void sendGreetingMessage();
+
+private:
+    int readDataIntoBuffer(int maxSize = MaxBufferSize);
+    int dataLengthForCurrentDataType();
+    bool readProtocolHeader();
+    bool hasEnoughData();
+    void processData();
+
+    QString greetingMessage;
+    QString username;
+    QTimer pingTimer;
+    QTime pongTime;
+    QByteArray buffer;
+    ConnectionState state;
+    DataType currentDataType;
+    int numBytesForCurrentDataType;
+    int transferTimerId;
+    bool isGreetingMessageSent;
+};
+
+#endif
diff --git a/examples/network/network-chat/main.cpp b/examples/network/network-chat/main.cpp
new file mode 100644
index 0000000000..ffe28c92f0
--- /dev/null
+++ b/examples/network/network-chat/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "chatdialog.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    ChatDialog dialog;
+    dialog.show();
+    return app.exec();
+}
diff --git a/examples/network/network-chat/network-chat.pro b/examples/network/network-chat/network-chat.pro
new file mode 100644
index 0000000000..5d5efea537
--- /dev/null
+++ b/examples/network/network-chat/network-chat.pro
@@ -0,0 +1,19 @@
+HEADERS       = chatdialog.h \
+                client.h \
+                connection.h \
+                peermanager.h \
+                server.h
+SOURCES       = chatdialog.cpp \
+                client.cpp \
+                connection.cpp \
+                main.cpp \
+                peermanager.cpp \
+                server.cpp
+FORMS         = chatdialog.ui
+QT           += network
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/network/network-chat
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS network-chat.pro *.chat
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/network-chat
+INSTALLS += target sources
diff --git a/examples/network/network-chat/peermanager.cpp b/examples/network/network-chat/peermanager.cpp
new file mode 100644
index 0000000000..4ed4c5a213
--- /dev/null
+++ b/examples/network/network-chat/peermanager.cpp
@@ -0,0 +1,170 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtNetwork>
+
+#include "client.h"
+#include "connection.h"
+#include "peermanager.h"
+
+static const qint32 BroadcastInterval = 2000;
+static const unsigned broadcastPort = 45000;
+
+PeerManager::PeerManager(Client *client)
+    : QObject(client)
+{
+    this->client = client;
+
+    QStringList envVariables;
+    envVariables << "USERNAME.*" << "USER.*" << "USERDOMAIN.*"
+                 << "HOSTNAME.*" << "DOMAINNAME.*";
+
+    QStringList environment = QProcess::systemEnvironment();
+    foreach (QString string, envVariables) {
+        int index = environment.indexOf(QRegExp(string));
+        if (index != -1) {
+            QStringList stringList = environment.at(index).split("=");
+            if (stringList.size() == 2) {
+                username = stringList.at(1).toUtf8();
+                break;
+            }
+        }
+    }
+
+    if (username.isEmpty())
+        username = "unknown";
+
+    updateAddresses();
+    serverPort = 0;
+
+    broadcastSocket.bind(QHostAddress::Any, broadcastPort, QUdpSocket::ShareAddress
+                         | QUdpSocket::ReuseAddressHint);
+    connect(&broadcastSocket, SIGNAL(readyRead()),
+            this, SLOT(readBroadcastDatagram()));
+
+    broadcastTimer.setInterval(BroadcastInterval);
+    connect(&broadcastTimer, SIGNAL(timeout()),
+            this, SLOT(sendBroadcastDatagram()));
+}
+
+void PeerManager::setServerPort(int port)
+{
+    serverPort = port;
+}
+
+QByteArray PeerManager::userName() const
+{
+    return username;
+}
+
+void PeerManager::startBroadcasting()
+{
+    broadcastTimer.start();
+}
+
+bool PeerManager::isLocalHostAddress(const QHostAddress &address)
+{
+    foreach (QHostAddress localAddress, ipAddresses) {
+        if (address == localAddress)
+            return true;
+    }
+    return false;
+}
+
+void PeerManager::sendBroadcastDatagram()
+{
+    QByteArray datagram(username);
+    datagram.append('@');
+    datagram.append(QByteArray::number(serverPort));
+
+    bool validBroadcastAddresses = true;
+    foreach (QHostAddress address, broadcastAddresses) {
+        if (broadcastSocket.writeDatagram(datagram, address,
+                                          broadcastPort) == -1)
+            validBroadcastAddresses = false;
+    }
+
+    if (!validBroadcastAddresses)
+        updateAddresses();
+}
+
+void PeerManager::readBroadcastDatagram()
+{
+    while (broadcastSocket.hasPendingDatagrams()) {
+        QHostAddress senderIp;
+        quint16 senderPort;
+        QByteArray datagram;
+        datagram.resize(broadcastSocket.pendingDatagramSize());
+        if (broadcastSocket.readDatagram(datagram.data(), datagram.size(),
+                                         &senderIp, &senderPort) == -1)
+            continue;
+
+        QList<QByteArray> list = datagram.split('@');
+        if (list.size() != 2)
+            continue;
+
+        int senderServerPort = list.at(1).toInt();
+        if (isLocalHostAddress(senderIp) && senderServerPort == serverPort)
+            continue;
+
+        if (!client->hasConnection(senderIp)) {
+            Connection *connection = new Connection(this);
+            emit newConnection(connection);
+            connection->connectToHost(senderIp, senderServerPort);
+        }
+    }
+}
+
+void PeerManager::updateAddresses()
+{
+    broadcastAddresses.clear();
+    ipAddresses.clear();
+    foreach (QNetworkInterface interface, QNetworkInterface::allInterfaces()) {
+        foreach (QNetworkAddressEntry entry, interface.addressEntries()) {
+            QHostAddress broadcastAddress = entry.broadcast();
+            if (broadcastAddress != QHostAddress::Null &&
+                entry.ip() != QHostAddress::LocalHost) {
+                broadcastAddresses << broadcastAddress;
+                ipAddresses << entry.ip();
+            }
+        }
+    }
+}
diff --git a/examples/network/network-chat/peermanager.h b/examples/network/network-chat/peermanager.h
new file mode 100644
index 0000000000..a7293299fa
--- /dev/null
+++ b/examples/network/network-chat/peermanager.h
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PEERMANAGER_H
+#define PEERMANAGER_H
+
+#include <QByteArray>
+#include <QList>
+#include <QObject>
+#include <QTimer>
+#include <QUdpSocket>
+
+class Client;
+class Connection;
+
+class PeerManager : public QObject
+{
+    Q_OBJECT
+
+public:
+    PeerManager(Client *client);
+
+    void setServerPort(int port);
+    QByteArray userName() const;
+    void startBroadcasting();
+    bool isLocalHostAddress(const QHostAddress &address);
+
+signals:
+    void newConnection(Connection *connection);
+
+private slots:
+    void sendBroadcastDatagram();
+    void readBroadcastDatagram();
+
+private:
+    void updateAddresses();
+
+    Client *client;
+    QList<QHostAddress> broadcastAddresses;
+    QList<QHostAddress> ipAddresses;
+    QUdpSocket broadcastSocket;
+    QTimer broadcastTimer;
+    QByteArray username;
+    int serverPort;
+};
+
+#endif
diff --git a/examples/network/network-chat/server.cpp b/examples/network/network-chat/server.cpp
new file mode 100644
index 0000000000..26f1e70d90
--- /dev/null
+++ b/examples/network/network-chat/server.cpp
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtNetwork>
+
+#include "connection.h"
+#include "server.h"
+
+Server::Server(QObject *parent)
+    : QTcpServer(parent)
+{
+    listen(QHostAddress::Any);
+}
+
+void Server::incomingConnection(int socketDescriptor)
+{
+    Connection *connection = new Connection(this);
+    connection->setSocketDescriptor(socketDescriptor);
+    emit newConnection(connection);
+}
diff --git a/examples/network/network-chat/server.h b/examples/network/network-chat/server.h
new file mode 100644
index 0000000000..d2976938de
--- /dev/null
+++ b/examples/network/network-chat/server.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SERVER_H
+#define SERVER_H
+
+#include <QTcpServer>
+
+class Connection;
+
+class Server : public QTcpServer
+{
+    Q_OBJECT
+
+public:
+    Server(QObject *parent = 0);
+
+signals:
+    void newConnection(Connection *connection);
+
+protected:
+    void incomingConnection(int socketDescriptor);
+};
+
+#endif
diff --git a/examples/network/network.pro b/examples/network/network.pro
new file mode 100644
index 0000000000..13b31166d8
--- /dev/null
+++ b/examples/network/network.pro
@@ -0,0 +1,21 @@
+TEMPLATE      = subdirs
+SUBDIRS       = blockingfortuneclient \
+ 		broadcastreceiver \
+                broadcastsender \
+                network-chat \
+		download \
+		downloadmanager \
+                fortuneclient \
+                fortuneserver \
+                ftp \
+                http \
+                loopback \
+                threadedfortuneserver \
+ 		torrent
+
+contains(QT_CONFIG, openssl):SUBDIRS += securesocketclient
+
+# install
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS network.pro README
+sources.path = $$[QT_INSTALL_EXAMPLES]/network
+INSTALLS += sources
diff --git a/examples/network/securesocketclient/certificateinfo.cpp b/examples/network/securesocketclient/certificateinfo.cpp
new file mode 100644
index 0000000000..d9be2e3c28
--- /dev/null
+++ b/examples/network/securesocketclient/certificateinfo.cpp
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "certificateinfo.h"
+#include "ui_certificateinfo.h"
+
+CertificateInfo::CertificateInfo(QWidget *parent)
+    : QDialog(parent)
+{
+    form = new Ui_CertificateInfo;
+    form->setupUi(this);
+
+    connect(form->certificationPathView, SIGNAL(currentRowChanged(int)),
+            this, SLOT(updateCertificateInfo(int)));
+}
+
+CertificateInfo::~CertificateInfo()
+{
+    delete form;
+}
+
+void CertificateInfo::setCertificateChain(const QList<QSslCertificate> &chain)
+{
+    this->chain = chain;
+
+    form->certificationPathView->clear();
+
+    for (int i = 0; i < chain.size(); ++i) {
+        const QSslCertificate &cert = chain.at(i);
+        form->certificationPathView->addItem(tr("%1%2 (%3)").arg(!i ? QString() : tr("Issued by: "))
+                                             .arg(cert.subjectInfo(QSslCertificate::Organization))
+                                             .arg(cert.subjectInfo(QSslCertificate::CommonName)));
+    }
+
+    form->certificationPathView->setCurrentRow(0);
+}
+
+void CertificateInfo::updateCertificateInfo(int index)
+{
+    form->certificateInfoView->clear();
+    if (index >= 0 && index < chain.size()) {
+        const QSslCertificate &cert = chain.at(index);
+        QStringList lines;
+        lines << tr("Organization: %1").arg(cert.subjectInfo(QSslCertificate::Organization))
+              << tr("Subunit: %1").arg(cert.subjectInfo(QSslCertificate::OrganizationalUnitName))
+              << tr("Country: %1").arg(cert.subjectInfo(QSslCertificate::CountryName))
+              << tr("Locality: %1").arg(cert.subjectInfo(QSslCertificate::LocalityName))
+              << tr("State/Province: %1").arg(cert.subjectInfo(QSslCertificate::StateOrProvinceName))
+              << tr("Common Name: %1").arg(cert.subjectInfo(QSslCertificate::CommonName))
+              << QString()
+              << tr("Issuer Organization: %1").arg(cert.issuerInfo(QSslCertificate::Organization))
+              << tr("Issuer Unit Name: %1").arg(cert.issuerInfo(QSslCertificate::OrganizationalUnitName))
+              << tr("Issuer Country: %1").arg(cert.issuerInfo(QSslCertificate::CountryName))
+              << tr("Issuer Locality: %1").arg(cert.issuerInfo(QSslCertificate::LocalityName))
+              << tr("Issuer State/Province: %1").arg(cert.issuerInfo(QSslCertificate::StateOrProvinceName))
+              << tr("Issuer Common Name: %1").arg(cert.issuerInfo(QSslCertificate::CommonName));
+        foreach (QString line, lines)
+            form->certificateInfoView->addItem(line);
+    } else {
+        form->certificateInfoView->clear();
+    }
+}
diff --git a/examples/network/securesocketclient/certificateinfo.h b/examples/network/securesocketclient/certificateinfo.h
new file mode 100644
index 0000000000..dc6a200785
--- /dev/null
+++ b/examples/network/securesocketclient/certificateinfo.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CERTIFICATEINFO_H
+#define CERTIFICATEINFO_H
+
+#include <QtGui/QDialog>
+#include <QtNetwork/QSslCertificate>
+
+QT_BEGIN_NAMESPACE
+class Ui_CertificateInfo;
+QT_END_NAMESPACE
+
+class CertificateInfo : public QDialog
+{
+    Q_OBJECT
+public:
+    CertificateInfo(QWidget *parent = 0);
+    ~CertificateInfo();
+
+    void setCertificateChain(const QList<QSslCertificate> &chain);
+
+private slots:
+    void updateCertificateInfo(int index);
+
+private:
+    Ui_CertificateInfo *form;
+    QList<QSslCertificate> chain;
+};
+
+#endif
diff --git a/examples/network/securesocketclient/certificateinfo.ui b/examples/network/securesocketclient/certificateinfo.ui
new file mode 100644
index 0000000000..3761fe8f50
--- /dev/null
+++ b/examples/network/securesocketclient/certificateinfo.ui
@@ -0,0 +1,85 @@
+<ui version="4.0" >
+ <class>CertificateInfo</class>
+ <widget class="QDialog" name="CertificateInfo" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>397</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Display Certificate Information</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Certification Path</string>
+     </property>
+     <layout class="QHBoxLayout" >
+      <item>
+       <widget class="QListWidget" name="certificationPathView" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="title" >
+      <string>Certificate Information</string>
+     </property>
+     <layout class="QHBoxLayout" >
+      <item>
+       <widget class="QListWidget" name="certificateInfoView" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox" >
+       <property name="standardButtons" >
+        <set>QDialogButtonBox::Close</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>clicked(QAbstractButton*)</signal>
+   <receiver>CertificateInfo</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>343</x>
+     <y>374</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>352</x>
+     <y>422</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/examples/network/securesocketclient/encrypted.png b/examples/network/securesocketclient/encrypted.png
new file mode 100644
index 0000000000..04a05c1cb1
--- /dev/null
+++ b/examples/network/securesocketclient/encrypted.png
diff --git a/examples/network/securesocketclient/main.cpp b/examples/network/securesocketclient/main.cpp
new file mode 100644
index 0000000000..200aa267f3
--- /dev/null
+++ b/examples/network/securesocketclient/main.cpp
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QMessageBox>
+
+#include "sslclient.h"
+
+int main(int argc, char **argv)
+{
+    Q_INIT_RESOURCE(securesocketclient);
+
+    QApplication app(argc, argv);
+
+    if (!QSslSocket::supportsSsl()) {
+	QMessageBox::information(0, "Secure Socket Client",
+				 "This system does not support OpenSSL.");
+        return -1;
+    }
+
+    SslClient client;
+    client.show();
+
+    return app.exec();
+}
diff --git a/examples/network/securesocketclient/securesocketclient.pro b/examples/network/securesocketclient/securesocketclient.pro
new file mode 100644
index 0000000000..4d70a718ac
--- /dev/null
+++ b/examples/network/securesocketclient/securesocketclient.pro
@@ -0,0 +1,16 @@
+HEADERS   += certificateinfo.h \
+             sslclient.h
+SOURCES   += certificateinfo.cpp \
+             main.cpp \
+             sslclient.cpp
+RESOURCES += securesocketclient.qrc
+FORMS     += certificateinfo.ui \
+             sslclient.ui \
+             sslerrors.ui
+QT        += network
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/network/securesocketclient
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png *.jpg images
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/securesocketclient
+INSTALLS += target sources
diff --git a/examples/network/securesocketclient/securesocketclient.qrc b/examples/network/securesocketclient/securesocketclient.qrc
new file mode 100644
index 0000000000..83b49c790c
--- /dev/null
+++ b/examples/network/securesocketclient/securesocketclient.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>encrypted.png</file>
+</qresource>
+</RCC>
diff --git a/examples/network/securesocketclient/sslclient.cpp b/examples/network/securesocketclient/sslclient.cpp
new file mode 100644
index 0000000000..bf8443da1c
--- /dev/null
+++ b/examples/network/securesocketclient/sslclient.cpp
@@ -0,0 +1,218 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "certificateinfo.h"
+#include "sslclient.h"
+#include "ui_sslclient.h"
+#include "ui_sslerrors.h"
+
+#include <QtGui/QScrollBar>
+#include <QtGui/QStyle>
+#include <QtGui/QToolButton>
+#include <QtNetwork/QSslCipher>
+
+SslClient::SslClient(QWidget *parent)
+    : QWidget(parent), socket(0), padLock(0), executingDialog(false)
+{
+    form = new Ui_Form;
+    form->setupUi(this);
+    form->hostNameEdit->setSelection(0, form->hostNameEdit->text().size());
+    form->sessionOutput->setHtml(tr("&lt;not connected&gt;"));
+
+    connect(form->hostNameEdit, SIGNAL(textChanged(QString)),
+            this, SLOT(updateEnabledState()));
+    connect(form->connectButton, SIGNAL(clicked()),
+            this, SLOT(secureConnect()));
+    connect(form->sendButton, SIGNAL(clicked()),
+            this, SLOT(sendData()));
+}
+
+SslClient::~SslClient()
+{
+    delete form;
+}
+
+void SslClient::updateEnabledState()
+{
+    bool unconnected = !socket || socket->state() == QAbstractSocket::UnconnectedState;
+
+    form->hostNameEdit->setReadOnly(!unconnected);
+    form->hostNameEdit->setFocusPolicy(unconnected ? Qt::StrongFocus : Qt::NoFocus);
+
+    form->hostNameLabel->setEnabled(unconnected);
+    form->portBox->setEnabled(unconnected);
+    form->portLabel->setEnabled(unconnected);
+    form->connectButton->setEnabled(unconnected && !form->hostNameEdit->text().isEmpty());
+
+    bool connected = socket && socket->state() == QAbstractSocket::ConnectedState;
+    form->sessionBox->setEnabled(connected);
+    form->sessionOutput->setEnabled(connected);
+    form->sessionInput->setEnabled(connected);
+    form->sessionInputLabel->setEnabled(connected);
+    form->sendButton->setEnabled(connected);
+}
+
+void SslClient::secureConnect()
+{
+    if (!socket) {
+        socket = new QSslSocket(this);
+        connect(socket, SIGNAL(stateChanged(QAbstractSocket::SocketState)),
+                this, SLOT(socketStateChanged(QAbstractSocket::SocketState)));
+        connect(socket, SIGNAL(encrypted()),
+                this, SLOT(socketEncrypted()));
+        connect(socket, SIGNAL(sslErrors(QList<QSslError>)),
+                this, SLOT(sslErrors(QList<QSslError>)));
+        connect(socket, SIGNAL(readyRead()),
+                this, SLOT(socketReadyRead()));
+    }
+
+    socket->connectToHostEncrypted(form->hostNameEdit->text(), form->portBox->value());
+    updateEnabledState();
+}
+
+void SslClient::socketStateChanged(QAbstractSocket::SocketState state)
+{
+    if (executingDialog)
+        return;
+
+    updateEnabledState();
+    if (state == QAbstractSocket::UnconnectedState) {
+        form->hostNameEdit->setPalette(QPalette());
+        form->hostNameEdit->setFocus();
+        form->cipherLabel->setText(tr("<none>"));
+        if (padLock)
+            padLock->hide();
+        socket->deleteLater();
+        socket = 0;
+    }
+}
+
+void SslClient::socketEncrypted()
+{
+    if (!socket)
+        return;                 // might have disconnected already
+
+    form->sessionOutput->clear();
+    form->sessionInput->setFocus();
+
+    QPalette palette;
+    palette.setColor(QPalette::Base, QColor(255, 255, 192));
+    form->hostNameEdit->setPalette(palette);
+
+    QSslCipher ciph = socket->sessionCipher();
+    QString cipher = QString("%1, %2 (%3/%4)").arg(ciph.authenticationMethod())
+                     .arg(ciph.name()).arg(ciph.usedBits()).arg(ciph.supportedBits());;
+    form->cipherLabel->setText(cipher);
+
+    if (!padLock) {
+        padLock = new QToolButton;
+        padLock->setIcon(QIcon(":/encrypted.png"));
+        padLock->setCursor(Qt::ArrowCursor);
+        padLock->setToolTip(tr("Display encryption details."));
+
+        int extent = form->hostNameEdit->height() - 2;
+        padLock->resize(extent, extent);
+        padLock->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Ignored);
+
+        QHBoxLayout *layout = new QHBoxLayout(form->hostNameEdit);
+        layout->setMargin(form->hostNameEdit->style()->pixelMetric(QStyle::PM_DefaultFrameWidth));
+        layout->setSpacing(0);
+        layout->addStretch();
+        layout->addWidget(padLock);
+
+        form->hostNameEdit->setLayout(layout);
+
+        connect(padLock, SIGNAL(clicked()),
+                this, SLOT(displayCertificateInfo()));
+    } else {
+        padLock->show();
+    }
+}
+
+void SslClient::socketReadyRead()
+{
+    appendString(QString::fromUtf8(socket->readAll()));
+}
+
+void SslClient::sendData()
+{
+    QString input = form->sessionInput->text();
+    appendString(input + "\n");
+    socket->write(input.toUtf8() + "\r\n");
+    form->sessionInput->clear();
+}
+
+void SslClient::sslErrors(const QList<QSslError> &errors)
+{
+    QDialog errorDialog(this);
+    Ui_SslErrors ui;
+    ui.setupUi(&errorDialog);
+    connect(ui.certificateChainButton, SIGNAL(clicked()),
+            this, SLOT(displayCertificateInfo()));
+
+    foreach (const QSslError &error, errors)
+        ui.sslErrorList->addItem(error.errorString());
+
+    executingDialog = true;
+    if (errorDialog.exec() == QDialog::Accepted)
+        socket->ignoreSslErrors();
+    executingDialog = false;
+
+    // did the socket state change?
+    if (socket->state() != QAbstractSocket::ConnectedState)
+        socketStateChanged(socket->state());
+}
+
+void SslClient::displayCertificateInfo()
+{
+    CertificateInfo *info = new CertificateInfo(this);
+    info->setCertificateChain(socket->peerCertificateChain());
+    info->exec();
+    info->deleteLater();
+}
+
+void SslClient::appendString(const QString &line)
+{
+    QTextCursor cursor(form->sessionOutput->textCursor());
+    cursor.movePosition(QTextCursor::End);
+    cursor.insertText(line);
+    form->sessionOutput->verticalScrollBar()->setValue(form->sessionOutput->verticalScrollBar()->maximum());
+}
diff --git a/examples/network/securesocketclient/sslclient.h b/examples/network/securesocketclient/sslclient.h
new file mode 100644
index 0000000000..ae208bbaf0
--- /dev/null
+++ b/examples/network/securesocketclient/sslclient.h
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SSLCLIENT_H
+#define SSLCLIENT_H
+
+#include <QtGui/QWidget>
+#include <QtNetwork/QAbstractSocket>
+#include <QtNetwork/QSslSocket>
+
+QT_BEGIN_NAMESPACE
+class QSslSocket;
+class QToolButton;
+class Ui_Form;
+QT_END_NAMESPACE
+
+class SslClient : public QWidget
+{
+    Q_OBJECT
+public:
+    SslClient(QWidget *parent = 0);
+    ~SslClient();
+    
+private slots:
+    void updateEnabledState();
+    void secureConnect();
+    void socketStateChanged(QAbstractSocket::SocketState state);
+    void socketEncrypted();
+    void socketReadyRead();
+    void sendData();
+    void sslErrors(const QList<QSslError> &errors);
+    void displayCertificateInfo();
+
+private:
+    void appendString(const QString &line);
+
+    QSslSocket *socket;
+    QToolButton *padLock;
+    Ui_Form *form;
+    bool executingDialog;
+};
+
+#endif
diff --git a/examples/network/securesocketclient/sslclient.ui b/examples/network/securesocketclient/sslclient.ui
new file mode 100644
index 0000000000..5a24751168
--- /dev/null
+++ b/examples/network/securesocketclient/sslclient.ui
@@ -0,0 +1,190 @@
+<ui version="4.0" >
+ <class>Form</class>
+ <widget class="QWidget" name="Form" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>343</width>
+    <height>320</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Secure Socket Client</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <layout class="QGridLayout" >
+     <item row="0" column="0" >
+      <widget class="QLabel" name="hostNameLabel" >
+       <property name="text" >
+        <string>Host name:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" >
+      <widget class="QLineEdit" name="hostNameEdit" >
+       <property name="text" >
+        <string>imap.example.com</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0" >
+      <widget class="QLabel" name="portLabel" >
+       <property name="text" >
+        <string>Port:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1" >
+      <widget class="QSpinBox" name="portBox" >
+       <property name="minimum" >
+        <number>1</number>
+       </property>
+       <property name="maximum" >
+        <number>65535</number>
+       </property>
+       <property name="value" >
+        <number>993</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QPushButton" name="connectButton" >
+     <property name="enabled" >
+      <bool>true</bool>
+     </property>
+     <property name="text" >
+      <string>Connect to host</string>
+     </property>
+     <property name="default" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="sessionBox" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
+     <property name="title" >
+      <string>Active session</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <item>
+       <layout class="QHBoxLayout" >
+        <item>
+         <widget class="QLabel" name="cipherText" >
+          <property name="text" >
+           <string>Cryptographic Cipher:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="cipherLabel" >
+          <property name="text" >
+           <string>&lt;none></string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="QTextEdit" name="sessionOutput" >
+        <property name="enabled" >
+         <bool>false</bool>
+        </property>
+        <property name="focusPolicy" >
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="readOnly" >
+         <bool>true</bool>
+        </property>
+        <property name="html" >
+         <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;/body>&lt;/html></string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" >
+        <item>
+         <widget class="QLabel" name="sessionInputLabel" >
+          <property name="text" >
+           <string>Input:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="sessionInput" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="sendButton" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="focusPolicy" >
+           <enum>Qt::TabFocus</enum>
+          </property>
+          <property name="text" >
+           <string>&amp;Send</string>
+          </property>
+          <property name="default" >
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>hostNameEdit</sender>
+   <signal>returnPressed()</signal>
+   <receiver>connectButton</receiver>
+   <slot>animateClick()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>126</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>142</x>
+     <y>78</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>sessionInput</sender>
+   <signal>returnPressed()</signal>
+   <receiver>sendButton</receiver>
+   <slot>animateClick()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>142</x>
+     <y>241</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>297</x>
+     <y>234</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/examples/network/securesocketclient/sslerrors.ui b/examples/network/securesocketclient/sslerrors.ui
new file mode 100644
index 0000000000..4aac18cddb
--- /dev/null
+++ b/examples/network/securesocketclient/sslerrors.ui
@@ -0,0 +1,110 @@
+<ui version="4.0" >
+ <class>SslErrors</class>
+ <widget class="QDialog" name="SslErrors" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>371</width>
+    <height>216</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Unable To Validate The Connection</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600; color:#ff0000;">Warning&lt;/span>&lt;span style=" color:#ff0000;">:&lt;/span>&lt;span style=" color:#000000;"> One or more errors with this connection prevent validating the authenticity of the host you are connecting to. Please review the following list of errors, and click &lt;/span>&lt;span style=" color:#000000;">Ignore&lt;/span>&lt;span style=" color:#000000;"> to continue, or &lt;/span>&lt;span style=" color:#000000;">Cancel&lt;/span>&lt;span style=" color:#000000;"> to abort the connection.&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
+     </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QListWidget" name="sslErrorList" />
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QPushButton" name="certificateChainButton" >
+       <property name="text" >
+        <string>View Certificate Chain</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton" >
+       <property name="text" >
+        <string>Ignore</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_2" >
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>pushButton</sender>
+   <signal>clicked()</signal>
+   <receiver>SslErrors</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>235</x>
+     <y>185</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>228</x>
+     <y>287</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>pushButton_2</sender>
+   <signal>clicked()</signal>
+   <receiver>SslErrors</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>325</x>
+     <y>192</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>333</x>
+     <y>231</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/examples/network/threadedfortuneserver/dialog.cpp b/examples/network/threadedfortuneserver/dialog.cpp
new file mode 100644
index 0000000000..4161c7fbfb
--- /dev/null
+++ b/examples/network/threadedfortuneserver/dialog.cpp
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtNetwork>
+
+#include <stdlib.h>
+
+#include "dialog.h"
+#include "fortuneserver.h"
+
+Dialog::Dialog(QWidget *parent)
+    : QDialog(parent)
+{
+    statusLabel = new QLabel;
+    quitButton = new QPushButton(tr("Quit"));
+    quitButton->setAutoDefault(false);
+
+    if (!server.listen()) {
+        QMessageBox::critical(this, tr("Threaded Fortune Server"),
+                              tr("Unable to start the server: %1.")
+                              .arg(server.errorString()));
+        close();
+        return;
+    }
+
+    statusLabel->setText(tr("The server is running on port %1.\n"
+                            "Run the Fortune Client example now.")
+                         .arg(server.serverPort()));
+
+    connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
+
+    QHBoxLayout *buttonLayout = new QHBoxLayout;
+    buttonLayout->addStretch(1);
+    buttonLayout->addWidget(quitButton);
+    buttonLayout->addStretch(1);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(statusLabel);
+    mainLayout->addLayout(buttonLayout);
+    setLayout(mainLayout);
+
+    setWindowTitle(tr("Threaded Fortune Server"));
+}
diff --git a/examples/network/threadedfortuneserver/dialog.h b/examples/network/threadedfortuneserver/dialog.h
new file mode 100644
index 0000000000..5fe1c677fa
--- /dev/null
+++ b/examples/network/threadedfortuneserver/dialog.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DIALOG_H
+#define DIALOG_H
+
+#include <QDialog>
+#include "fortuneserver.h"
+
+QT_BEGIN_NAMESPACE
+class QLabel;
+class QPushButton;
+QT_END_NAMESPACE
+
+class Dialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    Dialog(QWidget *parent = 0);
+
+private:
+    QLabel *statusLabel;
+    QPushButton *quitButton;
+    FortuneServer server;
+};
+
+#endif
diff --git a/examples/network/threadedfortuneserver/fortuneserver.cpp b/examples/network/threadedfortuneserver/fortuneserver.cpp
new file mode 100644
index 0000000000..e23c899647
--- /dev/null
+++ b/examples/network/threadedfortuneserver/fortuneserver.cpp
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "fortuneserver.h"
+#include "fortunethread.h"
+
+#include <stdlib.h>
+
+//! [0]
+FortuneServer::FortuneServer(QObject *parent)
+    : QTcpServer(parent)
+{
+    fortunes << tr("You've been leading a dog's life. Stay off the furniture.")
+             << tr("You've got to think about tomorrow.")
+             << tr("You will be surprised by a loud noise.")
+             << tr("You will feel hungry again in another hour.")
+             << tr("You might have mail.")
+             << tr("You cannot kill time without injuring eternity.")
+             << tr("Computers are not intelligent. They only think they are.");
+}
+//! [0]
+
+//! [1]
+void FortuneServer::incomingConnection(int socketDescriptor)
+{
+    QString fortune = fortunes.at(qrand() % fortunes.size());
+    FortuneThread *thread = new FortuneThread(socketDescriptor, fortune, this);
+    connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));
+    thread->start();
+}
+//! [1]
diff --git a/examples/network/threadedfortuneserver/fortuneserver.h b/examples/network/threadedfortuneserver/fortuneserver.h
new file mode 100644
index 0000000000..2374f85118
--- /dev/null
+++ b/examples/network/threadedfortuneserver/fortuneserver.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef FORTUNESERVER_H
+#define FORTUNESERVER_H
+
+#include <QStringList>
+#include <QTcpServer>
+
+//! [0]
+class FortuneServer : public QTcpServer
+{
+    Q_OBJECT
+
+public:
+    FortuneServer(QObject *parent = 0);
+
+protected:
+    void incomingConnection(int socketDescriptor);
+
+private:
+    QStringList fortunes;
+};
+//! [0]
+
+#endif
diff --git a/examples/network/threadedfortuneserver/fortunethread.cpp b/examples/network/threadedfortuneserver/fortunethread.cpp
new file mode 100644
index 0000000000..8c41076b66
--- /dev/null
+++ b/examples/network/threadedfortuneserver/fortunethread.cpp
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "fortunethread.h"
+
+#include <QtNetwork>
+
+//! [0]
+FortuneThread::FortuneThread(int socketDescriptor, const QString &fortune, QObject *parent)
+    : QThread(parent), socketDescriptor(socketDescriptor), text(fortune)
+{
+}
+//! [0]
+
+//! [1]
+void FortuneThread::run()
+{
+    QTcpSocket tcpSocket;
+//! [1] //! [2]
+    if (!tcpSocket.setSocketDescriptor(socketDescriptor)) {
+        emit error(tcpSocket.error());
+        return;
+    }
+//! [2] //! [3]
+
+    QByteArray block;
+    QDataStream out(&block, QIODevice::WriteOnly);
+    out.setVersion(QDataStream::Qt_4_0);
+    out << (quint16)0;
+    out << text;
+    out.device()->seek(0);
+    out << (quint16)(block.size() - sizeof(quint16));
+//! [3] //! [4]
+
+    tcpSocket.write(block);
+    tcpSocket.disconnectFromHost();
+    tcpSocket.waitForDisconnected();
+}
+//! [4]
diff --git a/examples/network/threadedfortuneserver/fortunethread.h b/examples/network/threadedfortuneserver/fortunethread.h
new file mode 100644
index 0000000000..e534032d7c
--- /dev/null
+++ b/examples/network/threadedfortuneserver/fortunethread.h
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef FORTUNETHREAD_H
+#define FORTUNETHREAD_H
+
+#include <QThread>
+#include <QTcpSocket>
+
+//! [0]
+class FortuneThread : public QThread
+{
+    Q_OBJECT
+
+public:
+    FortuneThread(int socketDescriptor, const QString &fortune, QObject *parent);
+
+    void run();
+
+signals:
+    void error(QTcpSocket::SocketError socketError);
+
+private:
+    int socketDescriptor;
+    QString text;
+};
+//! [0]
+
+#endif
diff --git a/examples/network/threadedfortuneserver/main.cpp b/examples/network/threadedfortuneserver/main.cpp
new file mode 100644
index 0000000000..51874952f6
--- /dev/null
+++ b/examples/network/threadedfortuneserver/main.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QtCore>
+
+#include <stdlib.h>
+
+#include "dialog.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Dialog dialog;
+    dialog.show();
+    qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
+    return dialog.exec();
+}
diff --git a/examples/network/threadedfortuneserver/threadedfortuneserver.pro b/examples/network/threadedfortuneserver/threadedfortuneserver.pro
new file mode 100644
index 0000000000..0867dac72b
--- /dev/null
+++ b/examples/network/threadedfortuneserver/threadedfortuneserver.pro
@@ -0,0 +1,14 @@
+HEADERS       = dialog.h \
+                fortuneserver.h \
+                fortunethread.h
+SOURCES       = dialog.cpp \
+                fortuneserver.cpp \
+                fortunethread.cpp \
+                main.cpp
+QT           += network
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/network/threadedfortuneserver
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS threadedfortuneserver.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/threadedfortuneserver
+INSTALLS += target sources
diff --git a/examples/network/torrent/addtorrentdialog.cpp b/examples/network/torrent/addtorrentdialog.cpp
new file mode 100644
index 0000000000..fb43f5970a
--- /dev/null
+++ b/examples/network/torrent/addtorrentdialog.cpp
@@ -0,0 +1,170 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "addtorrentdialog.h"
+#include "metainfo.h"
+
+#include <QFile>
+#include <QFileDialog>
+#include <QLineEdit>
+#include <QMetaObject>
+
+static QString stringNumber(qint64 number)
+{
+    QString tmp;
+    if (number > (1024 * 1024 * 1024))
+        tmp.sprintf("%.2fGB", number / (1024.0 * 1024.0 * 1024.0));
+    else if (number > (1024 * 1024))
+        tmp.sprintf("%.2fMB", number / (1024.0 * 1024.0));
+    else if (number > (1024))
+        tmp.sprintf("%.2fKB", number / (1024.0));
+    else
+        tmp.sprintf("%d bytes", int(number));
+    return tmp;
+}
+
+AddTorrentDialog::AddTorrentDialog(QWidget *parent)
+  : QDialog(parent, Qt::Sheet)
+{
+    ui.setupUi(this);
+
+    connect(ui.browseTorrents, SIGNAL(clicked()),
+            this, SLOT(selectTorrent()));
+    connect(ui.browseDestination, SIGNAL(clicked()),
+            this, SLOT(selectDestination()));
+    connect(ui.torrentFile, SIGNAL(textChanged(const QString &)),
+            this, SLOT(setTorrent(const QString &)));
+
+    ui.destinationFolder->setText(destinationDirectory = QDir::current().path());
+    ui.torrentFile->setFocus();
+}
+
+void AddTorrentDialog::selectTorrent()
+{
+    QString fileName = QFileDialog::getOpenFileName(this, tr("Choose a torrent file"),
+                                                    lastDirectory,
+                                                    tr("Torrents (*.torrent);; All files (*.*)"));
+    if (fileName.isEmpty())
+        return;
+    lastDirectory = QFileInfo(fileName).absolutePath();
+    setTorrent(fileName);
+}
+
+void AddTorrentDialog::selectDestination()
+{
+    QString dir = QFileDialog::getExistingDirectory(this, tr("Choose a destination directory"),
+                                                    lastDestinationDirectory);
+    if (dir.isEmpty())
+        return;
+    lastDestinationDirectory = destinationDirectory = dir;
+    ui.destinationFolder->setText(destinationDirectory);
+    enableOkButton();
+}
+
+void AddTorrentDialog::enableOkButton()
+{
+    ui.okButton->setEnabled(!ui.destinationFolder->text().isEmpty()
+                            && !ui.torrentFile->text().isEmpty());
+}
+
+void AddTorrentDialog::setTorrent(const QString &torrentFile)
+{
+    if (torrentFile.isEmpty()) {
+        enableOkButton();
+        return;
+    }
+
+    ui.torrentFile->setText(torrentFile);
+    if (!torrentFile.isEmpty())
+        lastDirectory = QFileInfo(torrentFile).absolutePath();
+
+    if (lastDestinationDirectory.isEmpty())
+        lastDestinationDirectory = lastDirectory;
+    
+    MetaInfo metaInfo;
+    QFile torrent(torrentFile);
+    if (!torrent.open(QFile::ReadOnly) || !metaInfo.parse(torrent.readAll())) {
+        enableOkButton();
+        return;
+    }
+    
+    ui.torrentFile->setText(torrentFile);
+    ui.announceUrl->setText(metaInfo.announceUrl());
+    if (metaInfo.comment().isEmpty())
+        ui.commentLabel->setText("<unknown>");
+    else
+        ui.commentLabel->setText(metaInfo.comment());
+    if (metaInfo.createdBy().isEmpty())
+        ui.creatorLabel->setText("<unknown>");
+    else
+        ui.creatorLabel->setText(metaInfo.createdBy());
+    ui.sizeLabel->setText(stringNumber(metaInfo.totalSize()));
+    if (metaInfo.fileForm() == MetaInfo::SingleFileForm) {
+        ui.torrentContents->setHtml(metaInfo.singleFile().name);
+    } else {
+        QString html;
+        foreach (MetaInfoMultiFile file, metaInfo.multiFiles()) {
+            QString name = metaInfo.name();
+            if (!name.isEmpty()) {
+                html += name;
+                if (!name.endsWith('/'))
+                    html += '/';
+            }
+            html += file.path + "<br>";
+        }
+        ui.torrentContents->setHtml(html);
+    }
+
+    QFileInfo info(torrentFile);
+    ui.destinationFolder->setText(info.absolutePath());
+
+    enableOkButton();
+}
+
+QString AddTorrentDialog::torrentFileName() const
+{
+    return ui.torrentFile->text();
+}
+
+QString AddTorrentDialog::destinationFolder() const
+{
+    return ui.destinationFolder->text();
+}
diff --git a/examples/network/torrent/addtorrentdialog.h b/examples/network/torrent/addtorrentdialog.h
new file mode 100644
index 0000000000..89cb77c816
--- /dev/null
+++ b/examples/network/torrent/addtorrentdialog.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ADDTORRENTDIALOG_H
+#define ADDTORRENTDIALOG_H
+
+#include <QDialog>
+
+#include "ui_addtorrentform.h"
+
+class AddTorrentDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    AddTorrentDialog(QWidget *parent = 0);
+
+    QString torrentFileName() const;
+    QString destinationFolder() const;
+
+public slots:
+    void setTorrent(const QString &torrentFile);
+
+private slots:
+    void selectTorrent();
+    void selectDestination();
+    void enableOkButton();
+
+private:
+    Ui_AddTorrentFile ui;
+    QString destinationDirectory;
+    QString lastDirectory;
+    QString lastDestinationDirectory;
+};
+
+#endif
diff --git a/examples/network/torrent/bencodeparser.cpp b/examples/network/torrent/bencodeparser.cpp
new file mode 100644
index 0000000000..9311c0c21b
--- /dev/null
+++ b/examples/network/torrent/bencodeparser.cpp
@@ -0,0 +1,235 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "bencodeparser.h"
+
+#include <QList>
+#include <QMetaType>
+
+BencodeParser::BencodeParser()
+{
+}
+
+bool BencodeParser::parse(const QByteArray &content)
+{
+    if (content.isEmpty()) {
+        errString = QString("No content");
+        return false;
+    }
+
+    this->content = content;
+    index = 0;
+    infoStart = 0;
+    infoLength = 0;
+    return getDictionary(&dictionaryValue);
+}
+
+QString BencodeParser::errorString() const
+{
+    return errString;
+}
+
+QMap<QByteArray, QVariant> BencodeParser::dictionary() const
+{
+    return dictionaryValue;
+}
+
+QByteArray BencodeParser::infoSection() const
+{
+    return content.mid(infoStart, infoLength);
+}
+
+bool BencodeParser::getByteString(QByteArray *byteString)
+{
+    const int contentSize = content.size();
+    int size = -1;
+    do {
+	char c = content.at(index);
+	if (c < '0' || c > '9') {
+	    if (size == -1)
+		return false;
+	    if (c != ':') {
+		errString = QString("Unexpected character at pos %1: %2")
+		    .arg(index).arg(c);
+		return false;
+	    }
+	    ++index;
+	    break;
+	}
+	if (size == -1)
+	    size = 0;
+	size *= 10;
+	size += c - '0';
+    } while (++index < contentSize);
+
+    if (byteString)
+	*byteString = content.mid(index, size);
+    index += size;
+    return true;
+}
+
+bool BencodeParser::getInteger(qint64 *integer)
+{
+    const int contentSize = content.size();
+    if (content.at(index) != 'i')
+	return false;
+
+    ++index;
+    qint64 num = -1;
+    bool negative = false;
+
+    do {
+	char c = content.at(index);
+	if (c < '0' || c > '9') {
+	    if (num == -1) {
+		if (c != '-' || negative)
+		    return false;
+		negative = true;
+		continue;
+	    } else {
+		if (c != 'e') {
+		    errString = QString("Unexpected character at pos %1: %2")
+			.arg(index).arg(c);
+		    return false;
+		}
+		++index;
+		break;
+	    }
+	}
+	if (num == -1)
+	    num = 0;
+	num *= 10;
+	num += c - '0';
+    } while (++index < contentSize);
+
+    if (integer)
+	*integer = negative ? -num : num;
+    return true;
+}
+
+bool BencodeParser::getList(QList<QVariant> *list)
+{
+    const int contentSize = content.size();
+    if (content.at(index) != 'l')
+	return false;
+
+    QList<QVariant> tmp;    
+    ++index;
+
+    do {
+	if (content.at(index) == 'e') {
+	    ++index;
+	    break;
+	}
+
+	qint64 number;
+	QByteArray byteString;
+	QList<QVariant> tmpList;
+	QMap<QByteArray, QVariant> dictionary;
+
+	if (getInteger(&number))
+	    tmp << number;
+	else if (getByteString(&byteString))
+	    tmp << byteString;
+	else if (getList(&tmpList))
+	    tmp << tmpList;
+	else if (getDictionary(&dictionary))
+	    tmp << qVariantFromValue<QMap<QByteArray, QVariant> >(dictionary);
+	else {
+	    errString = QString("error at index %1").arg(index);
+	    return false;
+	}
+    } while (index < contentSize);
+
+    if (list)
+	*list = tmp;
+    return true;
+}
+
+bool BencodeParser::getDictionary(QMap<QByteArray, QVariant> *dictionary)
+{
+    const int contentSize = content.size();
+    if (content.at(index) != 'd')
+	return false;
+
+    QMap<QByteArray, QVariant> tmp;    
+    ++index;
+
+    do {
+	if (content.at(index) == 'e') {
+	    ++index;
+	    break;
+	}
+
+	QByteArray key;
+	if (!getByteString(&key))
+	    break;
+
+	if (key == "info")
+	  infoStart = index;
+
+	qint64 number;
+	QByteArray byteString;
+	QList<QVariant> tmpList;
+	QMap<QByteArray, QVariant> dictionary;
+
+	if (getInteger(&number))
+	    tmp.insert(key, number);
+	else if (getByteString(&byteString))
+	    tmp.insert(key, byteString);
+	else if (getList(&tmpList))
+	    tmp.insert(key, tmpList);
+	else if (getDictionary(&dictionary))
+	    tmp.insert(key, qVariantFromValue<QMap<QByteArray, QVariant> >(dictionary));
+	else {
+	    errString = QString("error at index %1").arg(index);
+	    return false;
+	}
+
+	if (key == "info")
+	  infoLength = index - infoStart;
+
+    } while (index < contentSize);
+
+    if (dictionary)
+	*dictionary = tmp;
+    return true;
+}
diff --git a/examples/network/torrent/bencodeparser.h b/examples/network/torrent/bencodeparser.h
new file mode 100644
index 0000000000..b4fc74b417
--- /dev/null
+++ b/examples/network/torrent/bencodeparser.h
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BENCODEPARSER_H
+#define BENCODEPARSER_H
+
+#include <QByteArray>
+#include <QMap>
+#include <QString>
+#include <QVariant>
+#include <QList>
+
+typedef QMap<QByteArray,QVariant> Dictionary;
+Q_DECLARE_METATYPE(Dictionary)
+
+class BencodeParser
+{
+public:
+    BencodeParser();
+    
+    bool parse(const QByteArray &content);
+    QString errorString() const;
+
+    QMap<QByteArray, QVariant> dictionary() const;
+    QByteArray infoSection() const;
+
+private:
+    bool getByteString(QByteArray *byteString);
+    bool getInteger(qint64 *integer);
+    bool getList(QList<QVariant> *list);
+    bool getDictionary(QMap<QByteArray, QVariant> *dictionary);
+
+    QMap<QByteArray, QVariant> dictionaryValue;
+
+    QString errString;
+    QByteArray content;
+    int index;
+
+    int infoStart;
+    int infoLength;
+};
+
+#endif
diff --git a/examples/network/torrent/connectionmanager.cpp b/examples/network/torrent/connectionmanager.cpp
new file mode 100644
index 0000000000..3b78537011
--- /dev/null
+++ b/examples/network/torrent/connectionmanager.cpp
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "connectionmanager.h"
+
+#include <QByteArray>
+#include <QDateTime>
+
+static const int MaxConnections = 250;
+
+Q_GLOBAL_STATIC(ConnectionManager, connectionManager)
+
+ConnectionManager *ConnectionManager::instance()
+{
+    return connectionManager();
+}
+
+bool ConnectionManager::canAddConnection() const
+{
+    return (connections.size() < MaxConnections);
+}
+
+void ConnectionManager::addConnection(PeerWireClient *client)
+{
+    connections << client;
+}
+
+void ConnectionManager::removeConnection(PeerWireClient *client)
+{
+    connections.remove(client);
+}
+
+int ConnectionManager::maxConnections() const
+{
+    return MaxConnections;
+}
+
+QByteArray ConnectionManager::clientId() const
+{
+    if (id.isEmpty()) {
+        // Generate peer id
+        int startupTime = int(QDateTime::currentDateTime().toTime_t());
+
+        QString s;
+        s.sprintf("-QT%04x-", (QT_VERSION % 0xffff00) >> 8);
+        id += s.toLatin1();
+        id += QByteArray::number(startupTime, 10);
+        id += QByteArray(20 - id.size(), '-');
+    }
+    return id;
+}
diff --git a/examples/network/torrent/connectionmanager.h b/examples/network/torrent/connectionmanager.h
new file mode 100644
index 0000000000..3b791e3243
--- /dev/null
+++ b/examples/network/torrent/connectionmanager.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CONNECTIONMANAGER_H
+#define CONNECTIONMANAGER_H
+
+class PeerWireClient;
+
+#include <QByteArray>
+#include <QSet>
+
+class ConnectionManager
+{
+public:
+    static ConnectionManager *instance();
+
+    bool canAddConnection() const;
+    void addConnection(PeerWireClient *connection);
+    void removeConnection(PeerWireClient *connection);
+    int maxConnections() const;
+    QByteArray clientId() const;
+
+ private:
+    QSet<PeerWireClient *> connections;
+    mutable QByteArray id;
+};
+
+#endif
diff --git a/examples/network/torrent/filemanager.cpp b/examples/network/torrent/filemanager.cpp
new file mode 100644
index 0000000000..07d5cca695
--- /dev/null
+++ b/examples/network/torrent/filemanager.cpp
@@ -0,0 +1,447 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "filemanager.h"
+#include "metainfo.h"
+
+#include <QByteArray>
+#include <QDir>
+#include <QFile>
+#include <QTimer>
+#include <QTimerEvent>
+#include <QCryptographicHash>
+
+FileManager::FileManager(QObject *parent)
+    : QThread(parent)
+{
+    quit = false;
+    totalLength = 0;
+    readId = 0;
+    startVerification = false;
+    wokeUp = false;
+    newFile = false;
+    numPieces = 0;
+    verifiedPieces.fill(false);
+}
+
+FileManager::~FileManager()
+{
+    quit = true;
+    cond.wakeOne();
+    wait();
+
+    foreach (QFile *file, files) {
+        file->close();
+        delete file;
+    }
+}
+
+int FileManager::read(int pieceIndex, int offset, int length)
+{
+    ReadRequest request;
+    request.pieceIndex = pieceIndex;
+    request.offset = offset;
+    request.length = length;
+
+    QMutexLocker locker(&mutex);
+    request.id = readId++;
+    readRequests << request;
+
+    if (!wokeUp) {
+        wokeUp = true;
+        QMetaObject::invokeMethod(this, "wakeUp", Qt::QueuedConnection);
+    }
+
+    return request.id;
+}
+
+void FileManager::write(int pieceIndex, int offset, const QByteArray &data)
+{
+    WriteRequest request;
+    request.pieceIndex = pieceIndex;
+    request.offset = offset;
+    request.data = data;
+
+    QMutexLocker locker(&mutex);
+    writeRequests << request;
+
+    if (!wokeUp) {
+        wokeUp = true;
+        QMetaObject::invokeMethod(this, "wakeUp", Qt::QueuedConnection);
+    }
+}
+
+void FileManager::verifyPiece(int pieceIndex)
+{
+    QMutexLocker locker(&mutex);
+    pendingVerificationRequests << pieceIndex;
+    startVerification = true;
+
+    if (!wokeUp) {
+        wokeUp = true;
+        QMetaObject::invokeMethod(this, "wakeUp", Qt::QueuedConnection);
+    }
+}
+
+int FileManager::pieceLengthAt(int pieceIndex) const
+{
+    QMutexLocker locker(&mutex);
+    return (sha1s.size() == pieceIndex + 1)
+        ? (totalLength % pieceLength) : pieceLength;
+}
+
+QBitArray FileManager::completedPieces() const
+{
+    QMutexLocker locker(&mutex);
+    return verifiedPieces;
+}
+
+void FileManager::setCompletedPieces(const QBitArray &pieces)
+{
+    QMutexLocker locker(&mutex);
+    verifiedPieces = pieces;
+}
+
+QString FileManager::errorString() const
+{
+    return errString;
+}
+
+void FileManager::run()
+{
+    if (!generateFiles())
+        return;
+
+    do {
+        {
+            // Go to sleep if there's nothing to do.
+            QMutexLocker locker(&mutex);
+            if (!quit && readRequests.isEmpty() && writeRequests.isEmpty() && !startVerification)
+                cond.wait(&mutex);
+        }
+
+        // Read pending read requests
+        mutex.lock();
+        QList<ReadRequest> newReadRequests = readRequests;
+        readRequests.clear();
+        mutex.unlock();
+        while (!newReadRequests.isEmpty()) {
+            ReadRequest request = newReadRequests.takeFirst();
+            QByteArray block = readBlock(request.pieceIndex, request.offset, request.length);
+            emit dataRead(request.id, request.pieceIndex, request.offset, block);
+        }
+
+        // Write pending write requests
+        mutex.lock();
+        QList<WriteRequest> newWriteRequests = writeRequests;
+        writeRequests.clear();
+        while (!quit && !newWriteRequests.isEmpty()) {
+            WriteRequest request = newWriteRequests.takeFirst();
+            writeBlock(request.pieceIndex, request.offset, request.data);
+        }
+
+        // Process pending verification requests
+        if (startVerification) {
+            newPendingVerificationRequests = pendingVerificationRequests;
+            pendingVerificationRequests.clear();
+            verifyFileContents();
+            startVerification = false;
+        }
+        mutex.unlock();
+        newPendingVerificationRequests.clear();
+
+    } while (!quit);
+
+    // Write pending write requests
+    mutex.lock();
+    QList<WriteRequest> newWriteRequests = writeRequests;
+    writeRequests.clear();
+    mutex.unlock();
+    while (!newWriteRequests.isEmpty()) {
+        WriteRequest request = newWriteRequests.takeFirst();
+        writeBlock(request.pieceIndex, request.offset, request.data);
+    }
+}
+
+void FileManager::startDataVerification()
+{
+    QMutexLocker locker(&mutex);
+    startVerification = true;
+    cond.wakeOne();
+}
+
+bool FileManager::generateFiles()
+{
+    numPieces = -1;
+
+    // Set up the thread local data
+    if (metaInfo.fileForm() == MetaInfo::SingleFileForm) {
+        QMutexLocker locker(&mutex);
+        MetaInfoSingleFile singleFile = metaInfo.singleFile();
+
+        QString prefix;
+        if (!destinationPath.isEmpty()) {
+            prefix = destinationPath;
+            if (!prefix.endsWith("/"))
+                prefix += "/";
+            QDir dir;
+            if (!dir.mkpath(prefix)) {
+                errString = tr("Failed to create directory %1").arg(prefix);
+                emit error();
+                return false;
+            }
+        }
+        QFile *file = new QFile(prefix + singleFile.name);
+        if (!file->open(QFile::ReadWrite)) {
+            errString = tr("Failed to open/create file %1: %2")
+                        .arg(file->fileName()).arg(file->errorString());
+            emit error();
+            return false;
+        }
+
+        if (file->size() != singleFile.length) {
+            newFile = true;
+            if (!file->resize(singleFile.length)) {
+                errString = tr("Failed to resize file %1: %2")
+                            .arg(file->fileName()).arg(file->errorString());
+                emit error();
+                return false;
+            }
+        }
+        fileSizes << file->size();
+        files << file;
+        file->close();
+
+        pieceLength = singleFile.pieceLength;
+        totalLength = singleFile.length;
+        sha1s = singleFile.sha1Sums;
+    } else {
+        QMutexLocker locker(&mutex);
+        QDir dir;
+        QString prefix;
+
+        if (!destinationPath.isEmpty()) {
+            prefix = destinationPath;
+            if (!prefix.endsWith("/"))
+                prefix += "/";
+        }
+        if (!metaInfo.name().isEmpty()) {
+            prefix += metaInfo.name();
+            if (!prefix.endsWith("/"))
+                prefix += "/";
+        }
+        if (!dir.mkpath(prefix)) {
+            errString = tr("Failed to create directory %1").arg(prefix);
+            emit error();
+            return false;
+        }
+
+        foreach (const MetaInfoMultiFile &entry, metaInfo.multiFiles()) {
+            QString filePath = QFileInfo(prefix + entry.path).path();
+            if (!QFile::exists(filePath)) {
+                if (!dir.mkpath(filePath)) {
+                    errString = tr("Failed to create directory %1").arg(filePath);
+                    emit error();
+                    return false;
+                }
+            }
+
+            QFile *file = new QFile(prefix + entry.path);
+            if (!file->open(QFile::ReadWrite)) {
+                errString = tr("Failed to open/create file %1: %2")
+                            .arg(file->fileName()).arg(file->errorString());
+                emit error();
+                return false;
+            }
+
+            if (file->size() != entry.length) {
+                newFile = true;
+                if (!file->resize(entry.length)) {
+                    errString = tr("Failed to resize file %1: %2")
+                                .arg(file->fileName()).arg(file->errorString());
+                    emit error();
+                    return false;
+                }
+            }
+            fileSizes << file->size();
+            files << file;
+            file->close();
+
+            totalLength += entry.length;
+        }
+
+        sha1s = metaInfo.sha1Sums();
+        pieceLength = metaInfo.pieceLength();
+    }
+    numPieces = sha1s.size();
+    return true;
+}
+
+QByteArray FileManager::readBlock(int pieceIndex, int offset, int length)
+{
+    QByteArray block;
+    qint64 startReadIndex = (quint64(pieceIndex) * pieceLength) + offset;
+    qint64 currentIndex = 0;
+
+    for (int i = 0; !quit && i < files.size() && length > 0; ++i) {
+        QFile *file = files[i];
+        qint64 currentFileSize = fileSizes.at(i);
+        if ((currentIndex + currentFileSize) > startReadIndex) {
+            if (!file->isOpen()) {
+                if (!file->open(QFile::ReadWrite)) {
+                    errString = tr("Failed to read from file %1: %2")
+                        .arg(file->fileName()).arg(file->errorString());
+                    emit error();
+                    break;
+                }
+            }
+
+            file->seek(startReadIndex - currentIndex);
+            QByteArray chunk = file->read(qMin<qint64>(length, currentFileSize - file->pos()));
+            file->close();
+
+            block += chunk;
+            length -= chunk.size();
+            startReadIndex += chunk.size();
+            if (length < 0) {
+                errString = tr("Failed to read from file %1 (read %3 bytes): %2")
+                            .arg(file->fileName()).arg(file->errorString()).arg(length);
+                emit error();
+                break;
+            }
+        }
+        currentIndex += currentFileSize;
+    }
+    return block;
+}
+
+bool FileManager::writeBlock(int pieceIndex, int offset, const QByteArray &data)
+{
+    qint64 startWriteIndex = (qint64(pieceIndex) * pieceLength) + offset;
+    qint64 currentIndex = 0;
+    int bytesToWrite = data.size();
+    int written = 0;
+
+    for (int i = 0; !quit && i < files.size(); ++i) {
+        QFile *file = files[i];
+        qint64 currentFileSize = fileSizes.at(i);
+
+        if ((currentIndex + currentFileSize) > startWriteIndex) {
+            if (!file->isOpen()) {
+                if (!file->open(QFile::ReadWrite)) {
+                    errString = tr("Failed to write to file %1: %2")
+                        .arg(file->fileName()).arg(file->errorString());
+                    emit error();
+                    break;
+                }
+            }
+
+            file->seek(startWriteIndex - currentIndex);
+            qint64 bytesWritten = file->write(data.constData() + written,
+                                              qMin<qint64>(bytesToWrite, currentFileSize - file->pos()));
+            file->close();
+
+            if (bytesWritten <= 0) {
+                errString = tr("Failed to write to file %1: %2")
+                            .arg(file->fileName()).arg(file->errorString());
+                emit error();
+                return false;
+            }
+
+            written += bytesWritten;
+            startWriteIndex += bytesWritten;
+            bytesToWrite -= bytesWritten;
+            if (bytesToWrite == 0)
+                break;
+        }
+        currentIndex += currentFileSize;
+    }
+    return true;
+}
+
+void FileManager::verifyFileContents()
+{
+    // Verify all pieces the first time
+    if (newPendingVerificationRequests.isEmpty()) {
+        if (verifiedPieces.count(true) == 0) {
+            verifiedPieces.resize(sha1s.size());
+
+            int oldPercent = 0;
+            if (!newFile) {
+                int numPieces = sha1s.size();
+
+                for (int index = 0; index < numPieces; ++index) {
+                    verifySinglePiece(index);
+
+                    int percent = ((index + 1) * 100) / numPieces;
+                    if (oldPercent != percent) {
+                        emit verificationProgress(percent);
+                        oldPercent = percent;
+                    }
+                }
+            }
+        }
+        emit verificationDone();
+        return;
+    }
+
+    // Verify all pending pieces
+    foreach (int index, newPendingVerificationRequests)
+        emit pieceVerified(index, verifySinglePiece(index));
+}
+
+bool FileManager::verifySinglePiece(int pieceIndex)
+{
+    QByteArray block = readBlock(pieceIndex, 0, pieceLength);
+    QByteArray sha1Sum = QCryptographicHash::hash(block, QCryptographicHash::Sha1);
+
+    if (sha1Sum != sha1s.at(pieceIndex))
+        return false;
+    verifiedPieces.setBit(pieceIndex);
+    return true;
+}
+
+void FileManager::wakeUp()
+{
+    QMutexLocker locker(&mutex);
+    wokeUp = false;
+    cond.wakeOne();
+}
diff --git a/examples/network/torrent/filemanager.h b/examples/network/torrent/filemanager.h
new file mode 100644
index 0000000000..05d1f49f8b
--- /dev/null
+++ b/examples/network/torrent/filemanager.h
@@ -0,0 +1,144 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef FILEMANAGER_H
+#define FILEMANAGER_H
+
+#include <QBitArray>
+#include <QList>
+#include <QMutex>
+#include <QThread>
+#include <QWaitCondition>
+
+#include "metainfo.h"
+
+QT_BEGIN_NAMESPACE
+class QByteArray;
+class QFile;
+class QTimerEvent;
+QT_END_NAMESPACE
+
+class FileManager : public QThread
+{
+    Q_OBJECT
+
+public:
+    FileManager(QObject *parent = 0);
+    virtual ~FileManager();
+
+    inline void setMetaInfo(const MetaInfo &info) { metaInfo = info; }
+    inline void setDestinationFolder(const QString &directory) { destinationPath = directory; }
+    
+    int read(int pieceIndex, int offset, int length);
+    void write(int pieceIndex, int offset, const QByteArray &data);
+    void verifyPiece(int pieceIndex);
+    inline qint64 totalSize() const { return totalLength; }
+
+    inline int pieceCount() const { return numPieces; }
+    int pieceLengthAt(int pieceIndex) const;
+
+    QBitArray completedPieces() const;
+    void setCompletedPieces(const QBitArray &pieces);
+
+    QString errorString() const;
+
+public slots:
+    void startDataVerification();
+
+signals:
+    void dataRead(int id, int pieceIndex, int offset, const QByteArray &data);
+    void error();
+    void verificationProgress(int percent);
+    void verificationDone();
+    void pieceVerified(int pieceIndex, bool verified);
+
+protected:
+    void run();
+
+private slots:
+    bool verifySinglePiece(int pieceIndex);
+    void wakeUp();
+
+private:
+    bool generateFiles();
+    QByteArray readBlock(int pieceIndex, int offset, int length);
+    bool writeBlock(int pieceIndex, int offset, const QByteArray &data);
+    void verifyFileContents();
+
+    struct WriteRequest {
+        int pieceIndex;
+        int offset;
+        QByteArray data;
+    };
+    struct ReadRequest {
+        int pieceIndex;
+        int offset;
+        int length;
+        int id;
+    };
+
+    QString errString;
+    QString destinationPath;
+    MetaInfo metaInfo;
+    QList<QFile *> files;
+    QList<QByteArray> sha1s;
+    QBitArray verifiedPieces;
+
+    bool newFile;
+    int pieceLength;
+    qint64 totalLength;
+    int numPieces;
+    int readId;
+    bool startVerification;
+    bool quit;
+    bool wokeUp;
+
+    QList<WriteRequest> writeRequests;
+    QList<ReadRequest> readRequests;
+    QList<int> pendingVerificationRequests;
+    QList<int> newPendingVerificationRequests;
+    QList<qint64> fileSizes;
+
+    mutable QMutex mutex;
+    mutable QWaitCondition cond;
+};
+
+#endif
diff --git a/examples/network/torrent/forms/addtorrentform.ui b/examples/network/torrent/forms/addtorrentform.ui
new file mode 100644
index 0000000000..950bb67119
--- /dev/null
+++ b/examples/network/torrent/forms/addtorrentform.ui
@@ -0,0 +1,266 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>AddTorrentFile</class>
+ <widget class="QDialog" name="AddTorrentFile" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>464</width>
+    <height>385</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Add a torrent</string>
+  </property>
+  <property name="sizeGripEnabled" >
+   <bool>false</bool>
+  </property>
+  <property name="modal" >
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>8</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Select a torrent source</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>8</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="6" column="0" >
+       <widget class="QLabel" name="label_4" >
+        <property name="text" >
+         <string>Destination:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" colspan="2" >
+       <widget class="QLineEdit" name="torrentFile" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_2" >
+        <property name="text" >
+         <string>Tracker URL:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3" >
+       <widget class="QPushButton" name="browseTorrents" >
+        <property name="text" >
+         <string>Browse</string>
+        </property>
+        <property name="default" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="label_5" >
+        <property name="text" >
+         <string>File(s):</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="label_3" >
+        <property name="text" >
+         <string>Size:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_6" >
+        <property name="text" >
+         <string>Creator:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1" colspan="3" >
+       <widget class="QTextEdit" name="torrentContents" >
+        <property name="focusPolicy" >
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="tabChangesFocus" >
+         <bool>true</bool>
+        </property>
+        <property name="lineWrapMode" >
+         <enum>QTextEdit::NoWrap</enum>
+        </property>
+        <property name="readOnly" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1" colspan="2" >
+       <widget class="QLineEdit" name="destinationFolder" >
+        <property name="focusPolicy" >
+         <enum>Qt::StrongFocus</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="3" >
+       <widget class="QLabel" name="announceUrl" >
+        <property name="text" >
+         <string>&lt;none></string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>Torrent file:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="3" >
+       <widget class="QPushButton" name="browseDestination" >
+        <property name="text" >
+         <string>Browse</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="label_7" >
+        <property name="text" >
+         <string>Comment:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="3" >
+       <widget class="QLabel" name="commentLabel" >
+        <property name="text" >
+         <string>&lt;none></string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" colspan="3" >
+       <widget class="QLabel" name="creatorLabel" >
+        <property name="text" >
+         <string>&lt;none></string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1" colspan="3" >
+       <widget class="QLabel" name="sizeLabel" >
+        <property name="text" >
+         <string>0</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+     <widget class="QWidget" name="widget" >
+      <property name="geometry" >
+       <rect>
+        <x>10</x>
+        <y>40</y>
+        <width>364</width>
+        <height>33</height>
+       </rect>
+      </property>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>131</width>
+         <height>31</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okButton" >
+       <property name="enabled" >
+        <bool>false</bool>
+       </property>
+       <property name="text" >
+        <string>&amp;OK</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton" >
+       <property name="text" >
+        <string>&amp;Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>torrentFile</tabstop>
+  <tabstop>browseTorrents</tabstop>
+  <tabstop>torrentContents</tabstop>
+  <tabstop>destinationFolder</tabstop>
+  <tabstop>browseDestination</tabstop>
+  <tabstop>okButton</tabstop>
+  <tabstop>cancelButton</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>okButton</sender>
+   <signal>clicked()</signal>
+   <receiver>AddTorrentFile</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>278</x>
+     <y>253</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>96</x>
+     <y>254</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cancelButton</sender>
+   <signal>clicked()</signal>
+   <receiver>AddTorrentFile</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>369</x>
+     <y>253</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>179</x>
+     <y>282</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/examples/network/torrent/icons.qrc b/examples/network/torrent/icons.qrc
new file mode 100644
index 0000000000..9541ef7600
--- /dev/null
+++ b/examples/network/torrent/icons.qrc
@@ -0,0 +1,12 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+    <file>icons/peertopeer.png</file>
+    <file>icons/1uparrow.png</file>
+    <file>icons/1downarrow.png</file>
+    <file>icons/bottom.png</file>
+    <file>icons/player_pause.png</file>
+    <file>icons/player_play.png</file>
+    <file>icons/player_stop.png</file>
+    <file>icons/exit.png</file>
+</qresource>
+</RCC>
diff --git a/examples/network/torrent/icons/1downarrow.png b/examples/network/torrent/icons/1downarrow.png
new file mode 100644
index 0000000000..08403b82ba
--- /dev/null
+++ b/examples/network/torrent/icons/1downarrow.png
diff --git a/examples/network/torrent/icons/1uparrow.png b/examples/network/torrent/icons/1uparrow.png
new file mode 100644
index 0000000000..f044811787
--- /dev/null
+++ b/examples/network/torrent/icons/1uparrow.png
diff --git a/examples/network/torrent/icons/bottom.png b/examples/network/torrent/icons/bottom.png
new file mode 100644
index 0000000000..fe66b5d028
--- /dev/null
+++ b/examples/network/torrent/icons/bottom.png
diff --git a/examples/network/torrent/icons/edit_add.png b/examples/network/torrent/icons/edit_add.png
new file mode 100644
index 0000000000..85b022e7a4
--- /dev/null
+++ b/examples/network/torrent/icons/edit_add.png
diff --git a/examples/network/torrent/icons/edit_remove.png b/examples/network/torrent/icons/edit_remove.png
new file mode 100644
index 0000000000..93361f5225
--- /dev/null
+++ b/examples/network/torrent/icons/edit_remove.png
diff --git a/examples/network/torrent/icons/exit.png b/examples/network/torrent/icons/exit.png
new file mode 100644
index 0000000000..2f7ff43a71
--- /dev/null
+++ b/examples/network/torrent/icons/exit.png
diff --git a/examples/network/torrent/icons/peertopeer.png b/examples/network/torrent/icons/peertopeer.png
new file mode 100644
index 0000000000..f4856dcec5
--- /dev/null
+++ b/examples/network/torrent/icons/peertopeer.png
diff --git a/examples/network/torrent/icons/player_pause.png b/examples/network/torrent/icons/player_pause.png
new file mode 100644
index 0000000000..8c9bcc4556
--- /dev/null
+++ b/examples/network/torrent/icons/player_pause.png
diff --git a/examples/network/torrent/icons/player_play.png b/examples/network/torrent/icons/player_play.png
new file mode 100644
index 0000000000..70daa339be
--- /dev/null
+++ b/examples/network/torrent/icons/player_play.png
diff --git a/examples/network/torrent/icons/player_stop.png b/examples/network/torrent/icons/player_stop.png
new file mode 100644
index 0000000000..ce6585ae84
--- /dev/null
+++ b/examples/network/torrent/icons/player_stop.png
diff --git a/examples/network/torrent/icons/stop.png b/examples/network/torrent/icons/stop.png
new file mode 100644
index 0000000000..52e593ab21
--- /dev/null
+++ b/examples/network/torrent/icons/stop.png
diff --git a/examples/network/torrent/main.cpp b/examples/network/torrent/main.cpp
new file mode 100644
index 0000000000..38212546c9
--- /dev/null
+++ b/examples/network/torrent/main.cpp
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QApplication>
+#include <QtCore>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
+
+    Q_INIT_RESOURCE(icons);
+
+    MainWindow window;
+    window.show();
+
+    return app.exec();
+}
diff --git a/examples/network/torrent/mainwindow.cpp b/examples/network/torrent/mainwindow.cpp
new file mode 100644
index 0000000000..6ca3247446
--- /dev/null
+++ b/examples/network/torrent/mainwindow.cpp
@@ -0,0 +1,713 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "addtorrentdialog.h"
+#include "mainwindow.h"
+#include "ratecontroller.h"
+#include "torrentclient.h"
+
+// TorrentView extends QTreeWidget to allow drag and drop.
+class TorrentView : public QTreeWidget
+{
+    Q_OBJECT
+public:
+    TorrentView(QWidget *parent = 0);
+
+signals:
+    void fileDropped(const QString &fileName);
+
+protected:
+    void dragMoveEvent(QDragMoveEvent *event);
+    void dropEvent(QDropEvent *event);
+};
+
+// TorrentViewDelegate is used to draw the progress bars.
+class TorrentViewDelegate : public QItemDelegate
+{
+    Q_OBJECT
+public:
+    inline TorrentViewDelegate(MainWindow *mainWindow) : QItemDelegate(mainWindow) {}
+
+    inline void paint(QPainter *painter, const QStyleOptionViewItem &option,
+                      const QModelIndex &index ) const
+    {
+        if (index.column() != 2) {
+            QItemDelegate::paint(painter, option, index);
+            return;
+        }
+
+        // Set up a QStyleOptionProgressBar to precisely mimic the
+        // environment of a progress bar.
+        QStyleOptionProgressBar progressBarOption;
+        progressBarOption.state = QStyle::State_Enabled;
+        progressBarOption.direction = QApplication::layoutDirection();
+        progressBarOption.rect = option.rect;
+        progressBarOption.fontMetrics = QApplication::fontMetrics();
+        progressBarOption.minimum = 0;
+        progressBarOption.maximum = 100;
+        progressBarOption.textAlignment = Qt::AlignCenter;
+        progressBarOption.textVisible = true;
+
+        // Set the progress and text values of the style option.
+        int progress = qobject_cast<MainWindow *>(parent())->clientForRow(index.row())->progress();
+        progressBarOption.progress = progress < 0 ? 0 : progress;
+        progressBarOption.text = QString().sprintf("%d%%", progressBarOption.progress);
+
+        // Draw the progress bar onto the view.
+        QApplication::style()->drawControl(QStyle::CE_ProgressBar, &progressBarOption, painter);
+    }
+};
+
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent), quitDialog(0), saveChanges(false)
+{
+    // Initialize some static strings
+    QStringList headers;
+    headers << tr("Torrent") << tr("Peers/Seeds") << tr("Progress")
+            << tr("Down rate") << tr("Up rate") << tr("Status");
+
+    // Main torrent list
+    torrentView = new TorrentView(this);
+    torrentView->setItemDelegate(new TorrentViewDelegate(this));
+    torrentView->setHeaderLabels(headers);
+    torrentView->setSelectionBehavior(QAbstractItemView::SelectRows);
+    torrentView->setAlternatingRowColors(true);
+    torrentView->setRootIsDecorated(false);
+    setCentralWidget(torrentView);
+
+    // Set header resize modes and initial section sizes
+    QFontMetrics fm = fontMetrics();
+    QHeaderView *header = torrentView->header();
+    header->resizeSection(0, fm.width("typical-name-for-a-torrent.torrent"));
+    header->resizeSection(1, fm.width(headers.at(1) + "  "));
+    header->resizeSection(2, fm.width(headers.at(2) + "  "));
+    header->resizeSection(3, qMax(fm.width(headers.at(3) + "  "), fm.width(" 1234.0 KB/s ")));
+    header->resizeSection(4, qMax(fm.width(headers.at(4) + "  "), fm.width(" 1234.0 KB/s ")));
+    header->resizeSection(5, qMax(fm.width(headers.at(5) + "  "), fm.width(tr("Downloading") + "  ")));
+
+    // Create common actions
+    QAction *newTorrentAction = new QAction(QIcon(":/icons/bottom.png"), tr("Add &new torrent"), this);
+    pauseTorrentAction = new QAction(QIcon(":/icons/player_pause.png"), tr("&Pause torrent"), this);
+    removeTorrentAction = new QAction(QIcon(":/icons/player_stop.png"), tr("&Remove torrent"), this);
+    
+    // File menu
+    QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
+    fileMenu->addAction(newTorrentAction);
+    fileMenu->addAction(pauseTorrentAction);
+    fileMenu->addAction(removeTorrentAction);
+    fileMenu->addSeparator();
+    fileMenu->addAction(QIcon(":/icons/exit.png"), tr("E&xit"), this, SLOT(close()));
+
+    // Help menu
+    QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
+    helpMenu->addAction(tr("&About"), this, SLOT(about()));
+    helpMenu->addAction(tr("About &Qt"), qApp, SLOT(aboutQt()));
+
+    // Top toolbar
+    QToolBar *topBar = new QToolBar(tr("Tools"));
+    addToolBar(Qt::TopToolBarArea, topBar);
+    topBar->setMovable(false);
+    topBar->addAction(newTorrentAction);
+    topBar->addAction(removeTorrentAction);
+    topBar->addAction(pauseTorrentAction);
+    topBar->addSeparator();
+    downActionTool = topBar->addAction(QIcon(tr(":/icons/1downarrow.png")), tr("Move down"));
+    upActionTool = topBar->addAction(QIcon(tr(":/icons/1uparrow.png")), tr("Move up"));
+
+    // Bottom toolbar
+    QToolBar *bottomBar = new QToolBar(tr("Rate control"));
+    addToolBar(Qt::BottomToolBarArea, bottomBar);
+    bottomBar->setMovable(false);
+    downloadLimitSlider = new QSlider(Qt::Horizontal);
+    downloadLimitSlider->setRange(0, 1000);
+    bottomBar->addWidget(new QLabel(tr("Max download:")));
+    bottomBar->addWidget(downloadLimitSlider);
+    bottomBar->addWidget((downloadLimitLabel = new QLabel(tr("0 KB/s"))));
+    downloadLimitLabel->setFixedSize(QSize(fm.width(tr("99999 KB/s")), fm.lineSpacing()));
+    bottomBar->addSeparator();
+    uploadLimitSlider = new QSlider(Qt::Horizontal);
+    uploadLimitSlider->setRange(0, 1000);
+    bottomBar->addWidget(new QLabel(tr("Max upload:")));
+    bottomBar->addWidget(uploadLimitSlider);
+    bottomBar->addWidget((uploadLimitLabel = new QLabel(tr("0 KB/s"))));
+    uploadLimitLabel->setFixedSize(QSize(fm.width(tr("99999 KB/s")), fm.lineSpacing()));
+
+    // Set up connections
+    connect(torrentView, SIGNAL(itemSelectionChanged()),
+            this, SLOT(setActionsEnabled()));
+    connect(torrentView, SIGNAL(fileDropped(const QString &)),
+            this, SLOT(acceptFileDrop(const QString &)));
+    connect(uploadLimitSlider, SIGNAL(valueChanged(int)),
+            this, SLOT(setUploadLimit(int)));
+    connect(downloadLimitSlider, SIGNAL(valueChanged(int)),
+            this, SLOT(setDownloadLimit(int)));
+    connect(newTorrentAction, SIGNAL(triggered()),
+            this, SLOT(addTorrent()));
+    connect(pauseTorrentAction, SIGNAL(triggered()),
+            this, SLOT(pauseTorrent()));
+    connect(removeTorrentAction, SIGNAL(triggered()),
+            this, SLOT(removeTorrent()));
+    connect(upActionTool, SIGNAL(triggered(bool)),
+            this, SLOT(moveTorrentUp()));
+    connect(downActionTool, SIGNAL(triggered(bool)),
+            this, SLOT(moveTorrentDown()));
+
+    // Load settings and start
+    setWindowTitle(tr("Torrent Client"));
+    setActionsEnabled();
+    QMetaObject::invokeMethod(this, "loadSettings", Qt::QueuedConnection);
+}
+
+QSize MainWindow::sizeHint() const
+{
+    const QHeaderView *header = torrentView->header();
+
+    // Add up the sizes of all header sections. The last section is
+    // stretched, so its size is relative to the size of the width;
+    // instead of counting it, we count the size of its largest value.
+    int width = fontMetrics().width(tr("Downloading") + "  ");
+    for (int i = 0; i < header->count() - 1; ++i)
+        width += header->sectionSize(i);
+
+    return QSize(width, QMainWindow::sizeHint().height())
+        .expandedTo(QApplication::globalStrut());
+}
+
+const TorrentClient *MainWindow::clientForRow(int row) const
+{
+    // Return the client at the given row.
+    return jobs.at(row).client;
+}
+
+int MainWindow::rowOfClient(TorrentClient *client) const
+{
+    // Return the row that displays this client's status, or -1 if the
+    // client is not known.
+    int row = 0;
+    foreach (Job job, jobs) {
+        if (job.client == client)
+            return row;
+        ++row;
+    }
+    return -1;
+}
+
+void MainWindow::loadSettings()
+{
+    // Load base settings (last working directory, upload/download limits).
+    QSettings settings("Trolltech", "Torrent");
+    lastDirectory = settings.value("LastDirectory").toString();
+    if (lastDirectory.isEmpty())
+        lastDirectory = QDir::currentPath();
+    int up = settings.value("UploadLimit").toInt();
+    int down = settings.value("DownloadLimit").toInt();
+    uploadLimitSlider->setValue(up ? up : 170);
+    downloadLimitSlider->setValue(down ? down : 550);
+
+    // Resume all previous downloads.
+    int size = settings.beginReadArray("Torrents");
+    for (int i = 0; i < size; ++i) {
+        settings.setArrayIndex(i);
+        QByteArray resumeState = settings.value("resumeState").toByteArray();
+        QString fileName = settings.value("sourceFileName").toString();
+        QString dest = settings.value("destinationFolder").toString();
+
+        if (addTorrent(fileName, dest, resumeState)) {
+            TorrentClient *client = jobs.last().client;
+            client->setDownloadedBytes(settings.value("downloadedBytes").toLongLong());
+            client->setUploadedBytes(settings.value("uploadedBytes").toLongLong());
+        }
+    }
+}
+
+bool MainWindow::addTorrent()
+{
+    // Show the file dialog, let the user select what torrent to start downloading.
+    QString fileName = QFileDialog::getOpenFileName(this, tr("Choose a torrent file"),
+                                                    lastDirectory,
+                                                    tr("Torrents (*.torrent);;"
+                                                       " All files (*.*)"));
+    if (fileName.isEmpty())
+        return false;
+    lastDirectory = QFileInfo(fileName).absolutePath();
+
+    // Show the "Add Torrent" dialog.
+    AddTorrentDialog *addTorrentDialog = new AddTorrentDialog(this);
+    addTorrentDialog->setTorrent(fileName);
+    addTorrentDialog->deleteLater();
+    if (!addTorrentDialog->exec())
+        return false;
+
+    // Add the torrent to our list of downloads
+    addTorrent(fileName, addTorrentDialog->destinationFolder());
+    if (!saveChanges) {
+        saveChanges = true;
+        QTimer::singleShot(1000, this, SLOT(saveSettings()));
+    }
+    return true;
+}
+
+void MainWindow::removeTorrent()
+{
+    // Find the row of the current item, and find the torrent client
+    // for that row.
+    int row = torrentView->indexOfTopLevelItem(torrentView->currentItem());
+    TorrentClient *client = jobs.at(row).client;
+
+    // Stop the client.
+    client->disconnect();
+    connect(client, SIGNAL(stopped()), this, SLOT(torrentStopped()));
+    client->stop();
+
+    // Remove the row from the view.
+    delete torrentView->takeTopLevelItem(row);
+    jobs.removeAt(row);
+    setActionsEnabled();
+
+    saveChanges = true;
+    saveSettings();
+}
+
+void MainWindow::torrentStopped()
+{
+    // Schedule the client for deletion.
+    TorrentClient *client = qobject_cast<TorrentClient *>(sender());
+    client->deleteLater();
+
+    // If the quit dialog is shown, update its progress.
+    if (quitDialog) {
+        if (++jobsStopped == jobsToStop)
+            quitDialog->close();
+    }
+}
+
+void MainWindow::torrentError(TorrentClient::Error)
+{
+    // Delete the client.
+    TorrentClient *client = qobject_cast<TorrentClient *>(sender());
+    int row = rowOfClient(client);
+    QString fileName = jobs.at(row).torrentFileName;
+    jobs.removeAt(row);
+
+    // Display the warning.
+    QMessageBox::warning(this, tr("Error"),
+                         tr("An error occurred while downloading %0: %1")
+                         .arg(fileName)
+                         .arg(client->errorString()));
+
+    delete torrentView->takeTopLevelItem(row);
+    client->deleteLater();
+}
+
+bool MainWindow::addTorrent(const QString &fileName, const QString &destinationFolder,
+                            const QByteArray &resumeState)
+{
+    // Check if the torrent is already being downloaded.
+    foreach (Job job, jobs) {
+        if (job.torrentFileName == fileName && job.destinationDirectory == destinationFolder) {
+            QMessageBox::warning(this, tr("Already downloading"),
+                                 tr("The torrent file %1 is "
+                                    "already being downloaded.").arg(fileName));
+            return false;
+        }
+    }
+
+    // Create a new torrent client and attempt to parse the torrent data.
+    TorrentClient *client = new TorrentClient(this);
+    if (!client->setTorrent(fileName)) {
+        QMessageBox::warning(this, tr("Error"),
+                             tr("The torrent file %1 cannot not be opened/resumed.").arg(fileName));
+        delete client;
+        return false;
+    }
+    client->setDestinationFolder(destinationFolder);
+    client->setDumpedState(resumeState);
+
+    // Setup the client connections.
+    connect(client, SIGNAL(stateChanged(TorrentClient::State)), this, SLOT(updateState(TorrentClient::State)));
+    connect(client, SIGNAL(peerInfoUpdated()), this, SLOT(updatePeerInfo()));
+    connect(client, SIGNAL(progressUpdated(int)), this, SLOT(updateProgress(int)));
+    connect(client, SIGNAL(downloadRateUpdated(int)), this, SLOT(updateDownloadRate(int)));
+    connect(client, SIGNAL(uploadRateUpdated(int)), this, SLOT(updateUploadRate(int)));
+    connect(client, SIGNAL(stopped()), this, SLOT(torrentStopped()));
+    connect(client, SIGNAL(error(TorrentClient::Error)), this, SLOT(torrentError(TorrentClient::Error)));
+
+    // Add the client to the list of downloading jobs.
+    Job job;
+    job.client = client;
+    job.torrentFileName = fileName;
+    job.destinationDirectory = destinationFolder;
+    jobs << job;
+
+    // Create and add a row in the torrent view for this download.
+    QTreeWidgetItem *item = new QTreeWidgetItem(torrentView);
+
+    QString baseFileName = QFileInfo(fileName).fileName();
+    if (baseFileName.toLower().endsWith(".torrent"))
+        baseFileName.remove(baseFileName.size() - 8);
+
+    item->setText(0, baseFileName);
+    item->setToolTip(0, tr("Torrent: %1<br>Destination: %2")
+                     .arg(baseFileName).arg(destinationFolder));
+    item->setText(1, tr("0/0"));
+    item->setText(2, "0");
+    item->setText(3, "0.0 KB/s");
+    item->setText(4, "0.0 KB/s");
+    item->setText(5, tr("Idle"));
+    item->setFlags(item->flags() & ~Qt::ItemIsEditable);
+    item->setTextAlignment(1, Qt::AlignHCenter);
+
+    if (!saveChanges) {
+        saveChanges = true;
+        QTimer::singleShot(5000, this, SLOT(saveSettings()));
+    }
+    client->start();
+    return true;
+}
+
+void MainWindow::saveSettings()
+{
+    if (!saveChanges)
+      return;
+    saveChanges = false;
+
+    // Prepare and reset the settings
+    QSettings settings("Trolltech", "Torrent");
+    settings.clear();
+
+    settings.setValue("LastDirectory", lastDirectory);
+    settings.setValue("UploadLimit", uploadLimitSlider->value());
+    settings.setValue("DownloadLimit", downloadLimitSlider->value());
+
+    // Store data on all known torrents
+    settings.beginWriteArray("Torrents");
+    for (int i = 0; i < jobs.size(); ++i) {
+        settings.setArrayIndex(i);
+        settings.setValue("sourceFileName", jobs.at(i).torrentFileName);
+        settings.setValue("destinationFolder", jobs.at(i).destinationDirectory);
+        settings.setValue("uploadedBytes", jobs.at(i).client->uploadedBytes());
+        settings.setValue("downloadedBytes", jobs.at(i).client->downloadedBytes());
+        settings.setValue("resumeState", jobs.at(i).client->dumpedState());
+    }
+    settings.endArray();
+    settings.sync();
+}
+
+void MainWindow::updateState(TorrentClient::State)
+{
+    // Update the state string whenever the client's state changes.
+    TorrentClient *client = qobject_cast<TorrentClient *>(sender());
+    int row = rowOfClient(client);
+    QTreeWidgetItem *item = torrentView->topLevelItem(row);
+    if (item) {
+        item->setToolTip(0, tr("Torrent: %1<br>Destination: %2<br>State: %3")
+                         .arg(jobs.at(row).torrentFileName)
+                         .arg(jobs.at(row).destinationDirectory)
+                         .arg(client->stateString()));
+
+        item->setText(5, client->stateString());
+    }
+    setActionsEnabled();
+}
+
+void MainWindow::updatePeerInfo()
+{
+    // Update the number of connected, visited, seed and leecher peers.
+    TorrentClient *client = qobject_cast<TorrentClient *>(sender());
+    int row = rowOfClient(client);
+
+    QTreeWidgetItem *item = torrentView->topLevelItem(row);
+    item->setText(1, tr("%1/%2").arg(client->connectedPeerCount())
+                  .arg(client->seedCount()));
+}
+
+void MainWindow::updateProgress(int percent)
+{
+    TorrentClient *client = qobject_cast<TorrentClient *>(sender());
+    int row = rowOfClient(client);
+
+    // Update the progressbar.
+    QTreeWidgetItem *item = torrentView->topLevelItem(row);
+    if (item)
+        item->setText(2, QString::number(percent));
+}
+
+void MainWindow::setActionsEnabled()
+{
+    // Find the view item and client for the current row, and update
+    // the states of the actions.
+    QTreeWidgetItem *item = 0;
+    if (!torrentView->selectedItems().isEmpty())
+        item = torrentView->selectedItems().first();
+    TorrentClient *client = item ? jobs.at(torrentView->indexOfTopLevelItem(item)).client : 0;
+    bool pauseEnabled = client && ((client->state() == TorrentClient::Paused)
+                                       ||  (client->state() > TorrentClient::Preparing));
+
+    removeTorrentAction->setEnabled(item != 0);
+    pauseTorrentAction->setEnabled(item != 0 && pauseEnabled);
+
+    if (client && client->state() == TorrentClient::Paused) {
+        pauseTorrentAction->setIcon(QIcon(":/icons/player_play.png"));
+        pauseTorrentAction->setText(tr("Resume torrent"));
+    } else {
+        pauseTorrentAction->setIcon(QIcon(":/icons/player_pause.png"));
+        pauseTorrentAction->setText(tr("Pause torrent"));
+    }
+
+    int row = torrentView->indexOfTopLevelItem(item);
+    upActionTool->setEnabled(item && row != 0);
+    downActionTool->setEnabled(item && row != jobs.size() - 1);
+}
+
+void MainWindow::updateDownloadRate(int bytesPerSecond)
+{
+    // Update the download rate.
+    TorrentClient *client = qobject_cast<TorrentClient *>(sender());
+    int row = rowOfClient(client);
+    QString num;
+    num.sprintf("%.1f KB/s", bytesPerSecond / 1024.0);
+    torrentView->topLevelItem(row)->setText(3, num);
+
+    if (!saveChanges) {
+        saveChanges = true;
+        QTimer::singleShot(5000, this, SLOT(saveSettings()));
+    }
+}
+
+void MainWindow::updateUploadRate(int bytesPerSecond)
+{
+    // Update the upload rate.
+    TorrentClient *client = qobject_cast<TorrentClient *>(sender());
+    int row = rowOfClient(client);
+    QString num;
+    num.sprintf("%.1f KB/s", bytesPerSecond / 1024.0);
+    torrentView->topLevelItem(row)->setText(4, num);
+
+    if (!saveChanges) {
+        saveChanges = true;
+        QTimer::singleShot(5000, this, SLOT(saveSettings()));
+    }
+}
+
+void MainWindow::pauseTorrent()
+{
+    // Pause or unpause the current torrent.
+    int row = torrentView->indexOfTopLevelItem(torrentView->currentItem());
+    TorrentClient *client = jobs.at(row).client;
+    client->setPaused(client->state() != TorrentClient::Paused);
+    setActionsEnabled();
+}
+
+void MainWindow::moveTorrentUp()
+{
+    QTreeWidgetItem *item = torrentView->currentItem();
+    int row = torrentView->indexOfTopLevelItem(item);
+    if (row == 0)
+        return;
+
+    Job tmp = jobs.at(row - 1);
+    jobs[row - 1] = jobs[row];
+    jobs[row] = tmp;
+
+    QTreeWidgetItem *itemAbove = torrentView->takeTopLevelItem(row - 1);
+    torrentView->insertTopLevelItem(row, itemAbove);
+    setActionsEnabled();
+}
+
+void MainWindow::moveTorrentDown()
+{
+    QTreeWidgetItem *item = torrentView->currentItem();
+    int row = torrentView->indexOfTopLevelItem(item);
+    if (row == jobs.size() - 1)
+        return;
+
+    Job tmp = jobs.at(row + 1);
+    jobs[row + 1] = jobs[row];
+    jobs[row] = tmp;
+
+    QTreeWidgetItem *itemAbove = torrentView->takeTopLevelItem(row + 1);
+    torrentView->insertTopLevelItem(row, itemAbove);
+    setActionsEnabled();
+}
+
+static int rateFromValue(int value)
+{
+    int rate = 0;
+    if (value >= 0 && value < 250) {
+        rate = 1 + int(value * 0.124);
+    } else if (value < 500) {
+        rate = 32 + int((value - 250) * 0.384);
+    } else if (value < 750) {
+        rate = 128 + int((value - 500) * 1.536);
+    } else {
+        rate = 512 + int((value - 750) * 6.1445);
+    }
+    return rate;
+}
+
+void MainWindow::setUploadLimit(int value)
+{
+    int rate = rateFromValue(value);
+    uploadLimitLabel->setText(tr("%1 KB/s").arg(QString().sprintf("%4d", rate)));
+    RateController::instance()->setUploadLimit(rate * 1024);
+}
+
+void MainWindow::setDownloadLimit(int value)
+{
+    int rate = rateFromValue(value);
+    downloadLimitLabel->setText(tr("%1 KB/s").arg(QString().sprintf("%4d", rate)));
+    RateController::instance()->setDownloadLimit(rate * 1024);
+}
+
+void MainWindow::about()
+{
+    QLabel *icon = new QLabel;
+    icon->setPixmap(QPixmap(":/icons/peertopeer.png"));
+
+    QLabel *text = new QLabel;
+    text->setWordWrap(true);
+    text->setText("<p>The <b>Torrent Client</b> example demonstrates how to"
+                  " write a complete peer-to-peer file sharing"
+                  " application using Qt's network and thread classes.</p>"
+                  "<p>This feature complete client implementation of"
+                  " the BitTorrent protocol can efficiently"
+                  " maintain several hundred network connections"
+                  " simultaneously.</p>");
+
+    QPushButton *quitButton = new QPushButton("OK");
+
+    QHBoxLayout *topLayout = new QHBoxLayout;
+    topLayout->setMargin(10);
+    topLayout->setSpacing(10);
+    topLayout->addWidget(icon);
+    topLayout->addWidget(text);
+
+    QHBoxLayout *bottomLayout = new QHBoxLayout;
+    bottomLayout->addStretch();
+    bottomLayout->addWidget(quitButton);
+    bottomLayout->addStretch();
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addLayout(topLayout);
+    mainLayout->addLayout(bottomLayout);
+
+    QDialog about(this);
+    about.setModal(true);
+    about.setWindowTitle(tr("About Torrent Client"));
+    about.setLayout(mainLayout);
+
+    connect(quitButton, SIGNAL(clicked()), &about, SLOT(close()));
+
+    about.exec();
+}
+
+void MainWindow::acceptFileDrop(const QString &fileName)
+{
+    // Create and show the "Add Torrent" dialog.
+    AddTorrentDialog *addTorrentDialog = new AddTorrentDialog;
+    lastDirectory = QFileInfo(fileName).absolutePath();
+    addTorrentDialog->setTorrent(fileName);
+    addTorrentDialog->deleteLater();
+    if (!addTorrentDialog->exec())
+        return;
+
+    // Add the torrent to our list of downloads.
+    addTorrent(fileName, addTorrentDialog->destinationFolder());
+    saveSettings();
+}
+
+void MainWindow::closeEvent(QCloseEvent *)
+{
+    if (jobs.isEmpty())
+        return;
+
+    // Save upload / download numbers.
+    saveSettings();
+    saveChanges = false;
+
+    quitDialog = new QProgressDialog(tr("Disconnecting from trackers"), tr("Abort"), 0, jobsToStop, this);
+
+    // Stop all clients, remove the rows from the view and wait for
+    // them to signal that they have stopped.
+    jobsToStop = 0;
+    jobsStopped = 0;
+    foreach (Job job, jobs) {
+        ++jobsToStop;
+        TorrentClient *client = job.client;
+        client->disconnect();
+        connect(client, SIGNAL(stopped()), this, SLOT(torrentStopped()));
+        client->stop();
+        delete torrentView->takeTopLevelItem(0);
+    }
+
+    if (jobsToStop > jobsStopped)
+        quitDialog->exec();
+    quitDialog->deleteLater();
+    quitDialog = 0;
+}
+
+TorrentView::TorrentView(QWidget *parent)
+    : QTreeWidget(parent)
+{
+    setAcceptDrops(true);
+}
+
+void TorrentView::dragMoveEvent(QDragMoveEvent *event)
+{
+    // Accept file actions with a '.torrent' extension.
+    QUrl url(event->mimeData()->text());
+    if (url.isValid() && url.scheme().toLower() == "file"
+            && url.path().toLower().endsWith(".torrent"))
+        event->acceptProposedAction();
+}
+
+void TorrentView::dropEvent(QDropEvent *event)
+{
+    // Accept drops if the file has a '.torrent' extension and it
+    // exists.
+    QString fileName = QUrl(event->mimeData()->text()).path();
+    if (QFile::exists(fileName) && fileName.toLower().endsWith(".torrent"))
+        emit fileDropped(fileName);
+}
+
+#include "mainwindow.moc"
diff --git a/examples/network/torrent/mainwindow.h b/examples/network/torrent/mainwindow.h
new file mode 100644
index 0000000000..32497818d6
--- /dev/null
+++ b/examples/network/torrent/mainwindow.h
@@ -0,0 +1,132 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QList>
+#include <QStringList>
+#include <QMainWindow>
+
+#include "torrentclient.h"
+
+QT_BEGIN_NAMESPACE
+class QAction;
+class QCloseEvent;
+class QLabel;
+class QProgressDialog;
+class QSlider;
+QT_END_NAMESPACE
+class TorrentView;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow(QWidget *parent = 0);
+
+    QSize sizeHint() const;
+    const TorrentClient *clientForRow(int row) const;
+    
+protected:
+    void closeEvent(QCloseEvent *event);
+
+private slots:
+    void loadSettings();
+    void saveSettings();
+
+    bool addTorrent();
+    void removeTorrent();
+    void pauseTorrent();
+    void moveTorrentUp();
+    void moveTorrentDown();
+
+    void torrentStopped();
+    void torrentError(TorrentClient::Error error);
+
+    void updateState(TorrentClient::State state);
+    void updatePeerInfo();
+    void updateProgress(int percent);
+    void updateDownloadRate(int bytesPerSecond);
+    void updateUploadRate(int bytesPerSecond);
+
+    void setUploadLimit(int bytes);
+    void setDownloadLimit(int bytes);
+
+    void about();
+    void setActionsEnabled();
+    void acceptFileDrop(const QString &fileName);
+    
+private:
+    int rowOfClient(TorrentClient *client) const;
+    bool addTorrent(const QString &fileName, const QString &destinationFolder,
+                    const QByteArray &resumeState = QByteArray());
+    
+    TorrentView *torrentView;
+    QAction *pauseTorrentAction;
+    QAction *removeTorrentAction;
+    QAction *upActionTool;
+    QAction *downActionTool;
+    QSlider *uploadLimitSlider;
+    QSlider *downloadLimitSlider;
+    QLabel *uploadLimitLabel;
+    QLabel *downloadLimitLabel;
+
+    int uploadLimit;
+    int downloadLimit;
+
+    struct Job {
+        TorrentClient *client;
+        QString torrentFileName;
+        QString destinationDirectory;
+    };
+    QList<Job> jobs;
+    int jobsStopped;
+    int jobsToStop;
+
+    QString lastDirectory;
+    QProgressDialog *quitDialog;
+
+    bool saveChanges;
+};
+
+#endif
diff --git a/examples/network/torrent/metainfo.cpp b/examples/network/torrent/metainfo.cpp
new file mode 100644
index 0000000000..03d824c196
--- /dev/null
+++ b/examples/network/torrent/metainfo.cpp
@@ -0,0 +1,218 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "bencodeparser.h"
+#include "metainfo.h"
+
+#include <QDateTime>
+#include <QMetaType>
+#include <QString>
+
+MetaInfo::MetaInfo()
+{
+    clear();
+}
+
+void MetaInfo::clear()
+{
+    errString = "Unknown error";
+    content.clear();
+    infoData.clear();
+    metaInfoMultiFiles.clear();
+    metaInfoAnnounce.clear();
+    metaInfoAnnounceList.clear();
+    metaInfoCreationDate = QDateTime();
+    metaInfoComment.clear();
+    metaInfoCreatedBy.clear();
+    metaInfoName.clear();
+    metaInfoPieceLength = 0;
+    metaInfoSha1Sums.clear();
+}
+
+bool MetaInfo::parse(const QByteArray &data)
+{
+    clear();
+    content = data;
+
+    BencodeParser parser;
+    if (!parser.parse(content)) {
+        errString = parser.errorString();
+        return false;
+    }
+
+    infoData = parser.infoSection();
+
+    QMap<QByteArray, QVariant> dict = parser.dictionary();
+    if (!dict.contains("info"))
+        return false;
+
+    QMap<QByteArray, QVariant> info = qVariantValue<Dictionary>(dict.value("info"));
+
+    if (info.contains("files")) {
+        metaInfoFileForm = MultiFileForm;
+
+        QList<QVariant> files = info.value("files").toList();
+
+        for (int i = 0; i < files.size(); ++i) {
+            QMap<QByteArray, QVariant> file = qVariantValue<Dictionary>(files.at(i));
+            QList<QVariant> pathElements = file.value("path").toList();
+            QByteArray path;
+            foreach (QVariant p, pathElements) {
+                if (!path.isEmpty())
+                    path += "/";
+                path += p.toByteArray();
+            }
+
+            MetaInfoMultiFile multiFile;
+            multiFile.length = file.value("length").toLongLong();
+            multiFile.path = QString::fromUtf8(path);
+            multiFile.md5sum = file.value("md5sum").toByteArray();
+            metaInfoMultiFiles << multiFile;
+        }
+
+        metaInfoName = QString::fromUtf8(info.value("name").toByteArray());
+        metaInfoPieceLength = info.value("piece length").toInt();
+        QByteArray pieces = info.value("pieces").toByteArray();
+        for (int i = 0; i < pieces.size(); i += 20)
+            metaInfoSha1Sums << pieces.mid(i, 20);
+    } else if (info.contains("length")) {
+        metaInfoFileForm = SingleFileForm;
+        metaInfoSingleFile.length = info.value("length").toLongLong();
+        metaInfoSingleFile.md5sum = info.value("md5sum").toByteArray();
+        metaInfoSingleFile.name = QString::fromUtf8(info.value("name").toByteArray());
+        metaInfoSingleFile.pieceLength = info.value("piece length").toInt();
+
+        QByteArray pieces = info.value("pieces").toByteArray();
+        for (int i = 0; i < pieces.size(); i += 20)
+            metaInfoSingleFile.sha1Sums << pieces.mid(i, 20);
+    }
+
+    metaInfoAnnounce = QString::fromUtf8(dict.value("announce").toByteArray());
+
+    if (dict.contains("announce-list")) {
+        // ### unimplemented
+    }
+
+    if (dict.contains("creation date"))
+        metaInfoCreationDate.setTime_t(dict.value("creation date").toInt());
+    if (dict.contains("comment"))
+        metaInfoComment = QString::fromUtf8(dict.value("comment").toByteArray());
+    if (dict.contains("created by"))
+        metaInfoCreatedBy = QString::fromUtf8(dict.value("created by").toByteArray());
+
+    return true;
+}
+
+QByteArray MetaInfo::infoValue() const
+{
+    return infoData;
+}
+
+QString MetaInfo::errorString() const
+{
+    return errString;
+}
+
+MetaInfo::FileForm MetaInfo::fileForm() const
+{
+    return metaInfoFileForm;
+}
+
+QString MetaInfo::announceUrl() const
+{
+    return metaInfoAnnounce;
+}
+
+QStringList MetaInfo::announceList() const
+{
+    return metaInfoAnnounceList;
+}
+
+QDateTime MetaInfo::creationDate() const
+{
+    return metaInfoCreationDate;
+}
+
+QString MetaInfo::comment() const
+{
+    return metaInfoComment;
+}
+
+QString MetaInfo::createdBy() const
+{
+    return metaInfoCreatedBy;
+}
+
+MetaInfoSingleFile MetaInfo::singleFile() const
+{
+    return metaInfoSingleFile;
+}
+
+QList<MetaInfoMultiFile> MetaInfo::multiFiles() const
+{
+    return metaInfoMultiFiles;
+}
+
+QString MetaInfo::name() const
+{
+    return metaInfoName;
+}
+
+int MetaInfo::pieceLength() const
+{
+    return metaInfoPieceLength;
+}
+
+QList<QByteArray> MetaInfo::sha1Sums() const
+{
+    return metaInfoSha1Sums;
+}
+
+qint64 MetaInfo::totalSize() const
+{
+    if (fileForm() == SingleFileForm)
+        return singleFile().length;
+
+    qint64 size = 0;
+    foreach (MetaInfoMultiFile file, multiFiles())
+        size += file.length;
+    return size;
+}
diff --git a/examples/network/torrent/metainfo.h b/examples/network/torrent/metainfo.h
new file mode 100644
index 0000000000..de60b999cc
--- /dev/null
+++ b/examples/network/torrent/metainfo.h
@@ -0,0 +1,122 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef METAINFO_H
+#define METAINFO_H
+
+#include <QByteArray>
+#include <QDateTime>
+#include <QList>
+#include <QMap>
+#include <QString>
+#include <QStringList>
+#include <QVariant>
+
+struct MetaInfoSingleFile
+{
+    qint64 length;
+    QByteArray md5sum;
+    QString name;
+    int pieceLength;
+    QList<QByteArray> sha1Sums;
+};
+
+struct MetaInfoMultiFile
+{
+    qint64 length;
+    QByteArray md5sum;
+    QString path;
+};
+
+class MetaInfo
+{
+public:
+    enum FileForm {
+        SingleFileForm,
+        MultiFileForm
+    };
+
+    MetaInfo();
+    void clear();
+
+    bool parse(const QByteArray &data);
+    QString errorString() const;
+
+    QByteArray infoValue() const;
+
+    FileForm fileForm() const;
+    QString announceUrl() const;
+    QStringList announceList() const;
+    QDateTime creationDate() const;
+    QString comment() const;
+    QString createdBy() const;
+
+    // For single file form
+    MetaInfoSingleFile singleFile() const;
+
+    // For multifile form
+    QList<MetaInfoMultiFile> multiFiles() const;
+    QString name() const;
+    int pieceLength() const;
+    QList<QByteArray> sha1Sums() const;
+
+    // Total size
+    qint64 totalSize() const;
+
+private: 
+    QString errString;
+    QByteArray content;
+    QByteArray infoData;
+
+    FileForm metaInfoFileForm;
+    MetaInfoSingleFile metaInfoSingleFile;
+    QList<MetaInfoMultiFile> metaInfoMultiFiles;
+    QString metaInfoAnnounce;
+    QStringList metaInfoAnnounceList;
+    QDateTime metaInfoCreationDate;
+    QString metaInfoComment;
+    QString metaInfoCreatedBy;
+    QString metaInfoName;
+    int metaInfoPieceLength;
+    QList<QByteArray> metaInfoSha1Sums;
+};
+
+#endif
diff --git a/examples/network/torrent/peerwireclient.cpp b/examples/network/torrent/peerwireclient.cpp
new file mode 100644
index 0000000000..e79184b471
--- /dev/null
+++ b/examples/network/torrent/peerwireclient.cpp
@@ -0,0 +1,665 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "peerwireclient.h"
+
+#include <QHostAddress>
+#include <QTimerEvent>
+
+static const int PendingRequestTimeout = 60 * 1000;
+static const int ClientTimeout = 120 * 1000;
+static const int ConnectTimeout = 60 * 1000;
+static const int KeepAliveInterval = 30 * 1000;
+static const int RateControlTimerDelay = 2000;
+static const int MinimalHeaderSize = 48;
+static const int FullHeaderSize = 68;
+static const char ProtocolId[] = "BitTorrent protocol";
+static const char ProtocolIdSize = 19;
+
+// Reads a 32bit unsigned int from data in network order.
+static inline quint32 fromNetworkData(const char *data)
+{
+    const unsigned char *udata = (const unsigned char *)data;
+    return (quint32(udata[0]) << 24)
+        | (quint32(udata[1]) << 16)
+        | (quint32(udata[2]) << 8)
+        | (quint32(udata[3]));
+}
+
+// Writes a 32bit unsigned int from num to data in network order.
+static inline void toNetworkData(quint32 num, char *data)
+{
+    unsigned char *udata = (unsigned char *)data;
+    udata[3] = (num & 0xff);
+    udata[2] = (num & 0xff00) >> 8;
+    udata[1] = (num & 0xff0000) >> 16;
+    udata[0] = (num & 0xff000000) >> 24;
+}
+
+// Constructs an unconnected PeerWire client and starts the connect timer.
+PeerWireClient::PeerWireClient(const QByteArray &peerId, QObject *parent)
+    : QTcpSocket(parent), pendingBlockSizes(0),
+      pwState(ChokingPeer | ChokedByPeer), receivedHandShake(false), gotPeerId(false),
+      sentHandShake(false), nextPacketLength(-1), pendingRequestTimer(0), invalidateTimeout(false),
+      keepAliveTimer(0), torrentPeer(0)
+{
+    memset(uploadSpeedData, 0, sizeof(uploadSpeedData));
+    memset(downloadSpeedData, 0, sizeof(downloadSpeedData));
+
+    transferSpeedTimer = startTimer(RateControlTimerDelay);
+    timeoutTimer = startTimer(ConnectTimeout);
+    peerIdString = peerId;
+
+    connect(this, SIGNAL(readyRead()), this, SIGNAL(readyToTransfer()));
+    connect(this, SIGNAL(connected()), this, SIGNAL(readyToTransfer()));
+
+    connect(&socket, SIGNAL(connected()),
+            this, SIGNAL(connected()));
+    connect(&socket, SIGNAL(readyRead()),
+            this, SIGNAL(readyRead()));
+    connect(&socket, SIGNAL(disconnected()),
+            this, SIGNAL(disconnected()));
+    connect(&socket, SIGNAL(error(QAbstractSocket::SocketError)),
+            this, SIGNAL(error(QAbstractSocket::SocketError)));
+    connect(&socket, SIGNAL(bytesWritten(qint64)),
+            this, SIGNAL(bytesWritten(qint64)));
+    connect(&socket, SIGNAL(stateChanged(QAbstractSocket::SocketState)),
+            this, SLOT(socketStateChanged(QAbstractSocket::SocketState)));
+
+}
+
+// Registers the peer ID and SHA1 sum of the torrent, and initiates
+// the handshake.
+void PeerWireClient::initialize(const QByteArray &infoHash, int pieceCount)
+{
+    this->infoHash = infoHash;
+    peerPieces.resize(pieceCount);
+    if (!sentHandShake)
+        sendHandShake();
+}
+
+void PeerWireClient::setPeer(TorrentPeer *peer)
+{
+    torrentPeer = peer;
+}
+
+TorrentPeer *PeerWireClient::peer() const
+{
+    return torrentPeer;
+}
+
+QBitArray PeerWireClient::availablePieces() const
+{
+    return peerPieces;
+}
+
+QList<TorrentBlock> PeerWireClient::incomingBlocks() const
+{
+    return incoming;
+}
+
+// Sends a "choke" message, asking the peer to stop requesting blocks.
+void PeerWireClient::chokePeer()
+{
+    const char message[] = {0, 0, 0, 1, 0};
+    write(message, sizeof(message));
+    pwState |= ChokingPeer;
+
+    // After receiving a choke message, the peer will assume all
+    // pending requests are lost.
+    pendingBlocks.clear();
+    pendingBlockSizes = 0;
+}
+
+// Sends an "unchoke" message, allowing the peer to start/resume
+// requesting blocks.
+void PeerWireClient::unchokePeer()
+{
+    const char message[] = {0, 0, 0, 1, 1};
+    write(message, sizeof(message));
+    pwState &= ~ChokingPeer;
+
+    if (pendingRequestTimer)
+        killTimer(pendingRequestTimer);
+}
+
+// Sends a "keep-alive" message to prevent the peer from closing
+// the connection when there's no activity
+void PeerWireClient::sendKeepAlive()
+{
+    const char message[] = {0, 0, 0, 0};
+    write(message, sizeof(message));
+}
+
+// Sends an "interested" message, informing the peer that it has got
+// pieces that we'd like to download.
+void PeerWireClient::sendInterested()
+{
+    const char message[] = {0, 0, 0, 1, 2};
+    write(message, sizeof(message));
+    pwState |= InterestedInPeer;
+
+    // After telling the peer that we're interested, we expect to get
+    // unchoked within a certain timeframe; otherwise we'll drop the
+    // connection.
+    if (pendingRequestTimer)
+        killTimer(pendingRequestTimer);
+    pendingRequestTimer = startTimer(PendingRequestTimeout);
+}
+
+// Sends a "not interested" message, informing the peer that it does
+// not have any pieces that we'd like to download.
+void PeerWireClient::sendNotInterested()
+{
+    const char message[] = {0, 0, 0, 1, 3};
+    write(message, sizeof(message));
+    pwState &= ~InterestedInPeer;
+}
+
+// Sends a piece notification / a "have" message, informing the peer
+// that we have just downloaded a new piece.
+void PeerWireClient::sendPieceNotification(int piece)
+{
+    if (!sentHandShake)
+        sendHandShake();
+
+    char message[] = {0, 0, 0, 5, 4, 0, 0, 0, 0};
+    toNetworkData(piece, &message[5]);
+    write(message, sizeof(message));
+}
+
+// Sends the complete list of pieces that we have downloaded.
+void PeerWireClient::sendPieceList(const QBitArray &bitField)
+{
+    // The bitfield message may only be sent immediately after the
+    // handshaking sequence is completed, and before any other
+    // messages are sent.
+    if (!sentHandShake)
+        sendHandShake();
+
+    // Don't send the bitfield if it's all zeros.
+    if (bitField.count(true) == 0)
+	return;
+
+    int bitFieldSize = bitField.size();
+    int size = (bitFieldSize + 7) / 8;
+    QByteArray bits(size, '\0');
+    for (int i = 0; i < bitFieldSize; ++i) {
+        if (bitField.testBit(i)) {
+            quint32 byte = quint32(i) / 8;
+            quint32 bit = quint32(i) % 8;
+            bits[byte] = uchar(bits.at(byte)) | (1 << (7 - bit));
+        }
+    }
+
+    char message[] = {0, 0, 0, 1, 5};
+    toNetworkData(bits.size() + 1, &message[0]);
+    write(message, sizeof(message));
+    write(bits);
+}
+
+// Sends a request for a block.
+void PeerWireClient::requestBlock(int piece, int offset, int length)
+{
+    char message[] = {0, 0, 0, 1, 6};
+    toNetworkData(13, &message[0]);
+    write(message, sizeof(message));
+
+    char numbers[4 * 3];
+    toNetworkData(piece, &numbers[0]);
+    toNetworkData(offset, &numbers[4]);
+    toNetworkData(length, &numbers[8]);
+    write(numbers, sizeof(numbers));
+
+    incoming << TorrentBlock(piece, offset, length);
+
+    // After requesting a block, we expect the block to be sent by the
+    // other peer within a certain number of seconds. Otherwise, we
+    // drop the connection.
+    if (pendingRequestTimer)
+        killTimer(pendingRequestTimer);
+    pendingRequestTimer = startTimer(PendingRequestTimeout);
+}
+
+// Cancels a request for a block.
+void PeerWireClient::cancelRequest(int piece, int offset, int length)
+{
+    char message[] = {0, 0, 0, 1, 8};
+    toNetworkData(13, &message[0]);
+    write(message, sizeof(message));
+
+    char numbers[4 * 3];
+    toNetworkData(piece, &numbers[0]);
+    toNetworkData(offset, &numbers[4]);
+    toNetworkData(length, &numbers[8]);
+    write(numbers, sizeof(numbers));
+
+    incoming.removeAll(TorrentBlock(piece, offset, length));
+}
+
+// Sends a block to the peer.
+void PeerWireClient::sendBlock(int piece, int offset, const QByteArray &data)
+{
+    QByteArray block;
+
+    char message[] = {0, 0, 0, 1, 7};
+    toNetworkData(9 + data.size(), &message[0]);
+    block += QByteArray(message, sizeof(message));
+
+    char numbers[4 * 2];
+    toNetworkData(piece, &numbers[0]);
+    toNetworkData(offset, &numbers[4]);
+    block += QByteArray(numbers, sizeof(numbers));
+    block += data;
+
+    BlockInfo blockInfo;
+    blockInfo.pieceIndex = piece;
+    blockInfo.offset = offset;
+    blockInfo.length = data.size();
+    blockInfo.block = block;
+
+    pendingBlocks << blockInfo;
+    pendingBlockSizes += block.size();
+
+    if (pendingBlockSizes > 32 * 16384) {
+        chokePeer();
+        unchokePeer();
+        return;
+    }
+    emit readyToTransfer();
+}
+
+// Attempts to write 'bytes' bytes to the socket from the buffer.
+// This is used by RateController, which precisely controls how much
+// each client can write.
+qint64 PeerWireClient::writeToSocket(qint64 bytes)
+{
+    qint64 totalWritten = 0;
+    do {
+        if (outgoingBuffer.isEmpty() && !pendingBlocks.isEmpty()) {
+            BlockInfo block = pendingBlocks.takeFirst();
+            pendingBlockSizes -= block.length;
+            outgoingBuffer += block.block;
+        }
+        qint64 written = socket.write(outgoingBuffer.constData(),
+                                      qMin<qint64>(bytes - totalWritten, outgoingBuffer.size()));
+        if (written <= 0)
+            return totalWritten ? totalWritten : written;
+
+        totalWritten += written;
+        uploadSpeedData[0] += written;
+        outgoingBuffer.remove(0, written);
+    } while (totalWritten < bytes && (!outgoingBuffer.isEmpty() || !pendingBlocks.isEmpty()));
+
+    return totalWritten;
+}
+
+// Attempts to read at most 'bytes' bytes from the socket.
+qint64 PeerWireClient::readFromSocket(qint64 bytes)
+{
+    char buffer[1024];
+    qint64 totalRead = 0;
+    do {
+        qint64 bytesRead = socket.read(buffer, qMin<qint64>(sizeof(buffer), bytes - totalRead));
+        if (bytesRead <= 0)
+            break;
+        qint64 oldSize = incomingBuffer.size();
+        incomingBuffer.resize(oldSize + bytesRead);
+        memcpy(incomingBuffer.data() + oldSize, buffer, bytesRead);
+
+        totalRead += bytesRead;
+    } while (totalRead < bytes);
+
+    if (totalRead > 0) {
+        downloadSpeedData[0] += totalRead;
+        emit bytesReceived(totalRead);
+        processIncomingData();
+    }
+    return totalRead;
+}
+
+// Returns the average number of bytes per second this client is
+// downloading.
+qint64 PeerWireClient::downloadSpeed() const
+{
+    qint64 sum = 0;
+    for (unsigned int i = 0; i < sizeof(downloadSpeedData) / sizeof(qint64); ++i)
+        sum += downloadSpeedData[i];
+    return sum / (8 * 2);
+}
+
+// Returns the average number of bytes per second this client is
+// uploading.
+qint64 PeerWireClient::uploadSpeed() const
+{
+    qint64 sum = 0;
+    for (unsigned int i = 0; i < sizeof(uploadSpeedData) / sizeof(qint64); ++i)
+        sum += uploadSpeedData[i];
+    return sum / (8 * 2);
+}
+
+void PeerWireClient::setReadBufferSize(int size)
+{
+    socket.setReadBufferSize(size);
+}
+
+bool PeerWireClient::canTransferMore() const
+{
+    return bytesAvailable() > 0 || socket.bytesAvailable() > 0
+        || !outgoingBuffer.isEmpty() || !pendingBlocks.isEmpty();
+}
+
+void PeerWireClient::connectToHostImplementation(const QString &hostName,
+                                                 quint16 port, OpenMode openMode)
+
+{
+    setOpenMode(openMode);
+    socket.connectToHost(hostName, port, openMode);
+}
+
+void PeerWireClient::diconnectFromHostImplementation()
+{
+    socket.disconnectFromHost();
+}
+
+void PeerWireClient::timerEvent(QTimerEvent *event)
+{
+    if (event->timerId() == transferSpeedTimer) {
+        // Rotate the upload / download records.
+        for (int i = 6; i >= 0; --i) {
+            uploadSpeedData[i + 1] = uploadSpeedData[i];
+            downloadSpeedData[i + 1] = downloadSpeedData[i];
+        }
+        uploadSpeedData[0] = 0;
+        downloadSpeedData[0] = 0;
+    } else if (event->timerId() == timeoutTimer) {
+        // Disconnect if we timed out; otherwise the timeout is
+        // restarted.
+        if (invalidateTimeout) {
+            invalidateTimeout = false;
+        } else {
+            abort();
+            emit infoHashReceived(QByteArray());
+        }
+    } else if (event->timerId() == pendingRequestTimer) {
+        abort();
+    } else if (event->timerId() == keepAliveTimer) {
+        sendKeepAlive();
+    }
+    QTcpSocket::timerEvent(event);
+}
+
+// Sends the handshake to the peer.
+void PeerWireClient::sendHandShake()
+{
+    sentHandShake = true;
+
+    // Restart the timeout
+    if (timeoutTimer)
+        killTimer(timeoutTimer);
+    timeoutTimer = startTimer(ClientTimeout);
+
+    // Write the 68 byte PeerWire handshake.
+    write(&ProtocolIdSize, 1);
+    write(ProtocolId, ProtocolIdSize);
+    write(QByteArray(8, '\0'));
+    write(infoHash);
+    write(peerIdString);
+}
+
+void PeerWireClient::processIncomingData()
+{
+    invalidateTimeout = true;
+    if (!receivedHandShake) {
+        // Check that we received enough data
+        if (bytesAvailable() < MinimalHeaderSize)
+            return;
+
+        // Sanity check the protocol ID
+        QByteArray id = read(ProtocolIdSize + 1);
+        if (id.at(0) != ProtocolIdSize || !id.mid(1).startsWith(ProtocolId)) {
+            abort();
+            return;
+        }
+
+        // Discard 8 reserved bytes, then read the info hash and peer ID
+        (void) read(8);
+
+        // Read infoHash
+        QByteArray peerInfoHash = read(20);
+        if (!infoHash.isEmpty() && peerInfoHash != infoHash) {
+            abort();
+            return;
+        }
+
+        emit infoHashReceived(peerInfoHash);
+        if (infoHash.isEmpty()) {
+            abort();
+            return;
+        }
+
+        // Send handshake
+        if (!sentHandShake)
+            sendHandShake();
+        receivedHandShake = true;
+    }
+
+    // Handle delayed peer id arrival
+    if (!gotPeerId) {
+        if (bytesAvailable() < 20)
+            return;
+        gotPeerId = true;
+        if (read(20) == peerIdString) {
+            // We connected to ourself
+            abort();
+            return;
+        }
+    }
+
+    // Initialize keep-alive timer
+    if (!keepAliveTimer)
+        keepAliveTimer = startTimer(KeepAliveInterval);
+
+    do {
+        // Find the packet length
+        if (nextPacketLength == -1) {
+            if (bytesAvailable() < 4)
+                return;
+
+            char tmp[4];
+            read(tmp, sizeof(tmp));
+            nextPacketLength = fromNetworkData(tmp);
+
+            if (nextPacketLength < 0 || nextPacketLength > 200000) {
+                // Prevent DoS
+                abort();
+                return;
+            }
+        }
+
+        // KeepAlive
+        if (nextPacketLength == 0) {
+            nextPacketLength = -1;
+            continue;
+        }
+
+        // Wait with parsing until the whole packet has been received
+        if (bytesAvailable() < nextPacketLength)
+            return;
+
+        // Read the packet
+        QByteArray packet = read(nextPacketLength);
+        if (packet.size() != nextPacketLength) {
+            abort();
+            return;
+        }
+
+        switch (packet.at(0)) {
+        case ChokePacket:
+            // We have been choked.
+            pwState |= ChokedByPeer;
+            incoming.clear();
+            if (pendingRequestTimer)
+                killTimer(pendingRequestTimer);
+            emit choked();
+            break;
+        case UnchokePacket:
+            // We have been unchoked.
+            pwState &= ~ChokedByPeer;
+            emit unchoked();
+            break;
+        case InterestedPacket:
+            // The peer is interested in downloading.
+            pwState |= PeerIsInterested;
+            emit interested();
+            break;
+        case NotInterestedPacket:
+            // The peer is not interested in downloading.
+            pwState &= ~PeerIsInterested;
+            emit notInterested();
+            break;
+        case HavePacket: {
+            // The peer has a new piece available.
+            quint32 index = fromNetworkData(&packet.data()[1]);
+            if (index < quint32(peerPieces.size())) {
+                // Only accept indexes within the valid range.
+                peerPieces.setBit(int(index));
+            }
+            emit piecesAvailable(availablePieces());
+            break;
+        }
+        case BitFieldPacket:
+            // The peer has the following pieces available.
+            for (int i = 1; i < packet.size(); ++i) {
+                for (int bit = 0; bit < 8; ++bit) {
+                    if (packet.at(i) & (1 << (7 - bit))) {
+                        int bitIndex = int(((i - 1) * 8) + bit);
+                        if (bitIndex >= 0 && bitIndex < peerPieces.size()) {
+                            // Occasionally, broken clients claim to have
+                            // pieces whose index is outside the valid range.
+                            // The most common mistake is the index == size
+                            // case.
+                            peerPieces.setBit(bitIndex);
+                        }
+                    }
+                }
+            }
+            emit piecesAvailable(availablePieces());
+            break;
+        case RequestPacket: {
+            // The peer requests a block.
+            quint32 index = fromNetworkData(&packet.data()[1]);
+            quint32 begin = fromNetworkData(&packet.data()[5]);
+            quint32 length = fromNetworkData(&packet.data()[9]);
+            emit blockRequested(int(index), int(begin), int(length));
+            break;
+        }
+        case PiecePacket: {
+            int index = int(fromNetworkData(&packet.data()[1]));
+            int begin = int(fromNetworkData(&packet.data()[5]));
+
+            incoming.removeAll(TorrentBlock(index, begin, packet.size() - 9));
+
+            // The peer sends a block.
+            emit blockReceived(index, begin, packet.mid(9));
+
+            // Kill the pending block timer.
+            if (pendingRequestTimer) {
+                killTimer(pendingRequestTimer);
+                pendingRequestTimer = 0;
+            }
+            break;
+        }
+        case CancelPacket: {
+            // The peer cancels a block request.
+            quint32 index = fromNetworkData(&packet.data()[1]);
+            quint32 begin = fromNetworkData(&packet.data()[5]);
+            quint32 length = fromNetworkData(&packet.data()[9]);
+            for (int i = 0; i < pendingBlocks.size(); ++i) {
+                const BlockInfo &blockInfo = pendingBlocks.at(i);
+                if (blockInfo.pieceIndex == int(index)
+                    && blockInfo.offset == int(begin)
+                    && blockInfo.length == int(length)) {
+                    pendingBlocks.removeAt(i);
+                    break;
+                }
+            }
+            break;
+        }
+        default:
+            // Unsupported packet type; just ignore it.
+            break;
+        }
+        nextPacketLength = -1;
+    } while (bytesAvailable() > 0);
+}
+
+void PeerWireClient::socketStateChanged(QAbstractSocket::SocketState state)
+{
+    setLocalAddress(socket.localAddress());
+    setLocalPort(socket.localPort());
+    setPeerName(socket.peerName());
+    setPeerAddress(socket.peerAddress());
+    setPeerPort(socket.peerPort());
+    setSocketState(state);
+}
+
+qint64 PeerWireClient::readData(char *data, qint64 size)
+{
+    int n = qMin<int>(size, incomingBuffer.size());
+    memcpy(data, incomingBuffer.constData(), n);
+    incomingBuffer.remove(0, n);
+    return n;
+}
+
+qint64 PeerWireClient::readLineData(char *data, qint64 maxlen)
+{
+    return QIODevice::readLineData(data, maxlen);
+}
+
+qint64 PeerWireClient::writeData(const char *data, qint64 size)
+{
+    int oldSize = outgoingBuffer.size();
+    outgoingBuffer.resize(oldSize + size);
+    memcpy(outgoingBuffer.data() + oldSize, data, size);
+    emit readyToTransfer();
+    return size;
+}
diff --git a/examples/network/torrent/peerwireclient.h b/examples/network/torrent/peerwireclient.h
new file mode 100644
index 0000000000..a21faa272f
--- /dev/null
+++ b/examples/network/torrent/peerwireclient.h
@@ -0,0 +1,210 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PEERWIRECLIENT_H
+#define PEERWIRECLIENT_H
+
+#include <QBitArray>
+#include <QList>
+#include <QTcpSocket>
+
+QT_BEGIN_NAMESPACE
+class QHostAddress;
+class QTimerEvent;
+QT_END_NAMESPACE
+class TorrentPeer;
+
+struct TorrentBlock
+{
+    inline TorrentBlock(int p, int o, int l)
+        : pieceIndex(p), offset(o), length(l)
+    {
+    }
+    inline bool operator==(const TorrentBlock &other) const
+    {
+        return pieceIndex == other.pieceIndex
+                && offset == other.offset
+                && length == other.length;
+    }
+    
+    int pieceIndex;
+    int offset;
+    int length;
+};
+
+class PeerWireClient : public QTcpSocket
+{
+    Q_OBJECT
+
+public:
+    enum PeerWireStateFlag {
+        ChokingPeer = 0x1,
+        InterestedInPeer = 0x2,
+        ChokedByPeer = 0x4,
+        PeerIsInterested = 0x8
+    };
+    Q_DECLARE_FLAGS(PeerWireState, PeerWireStateFlag)
+
+    PeerWireClient(const QByteArray &peerId, QObject *parent = 0);
+    void initialize(const QByteArray &infoHash, int pieceCount);
+
+    void setPeer(TorrentPeer *peer);
+    TorrentPeer *peer() const;
+
+    // State
+    inline PeerWireState peerWireState() const { return pwState; }
+    QBitArray availablePieces() const;
+    QList<TorrentBlock> incomingBlocks() const;
+
+    // Protocol
+    void chokePeer();
+    void unchokePeer();
+    void sendInterested();
+    void sendKeepAlive();
+    void sendNotInterested();
+    void sendPieceNotification(int piece);
+    void sendPieceList(const QBitArray &bitField);
+    void requestBlock(int piece, int offset, int length);
+    void cancelRequest(int piece, int offset, int length);
+    void sendBlock(int piece, int offset, const QByteArray &data);
+
+    // Rate control
+    qint64 writeToSocket(qint64 bytes);
+    qint64 readFromSocket(qint64 bytes);
+    qint64 downloadSpeed() const;
+    qint64 uploadSpeed() const;
+
+    bool canTransferMore() const;
+    qint64 bytesAvailable() const { return incomingBuffer.size() + QTcpSocket::bytesAvailable(); }
+    qint64 socketBytesAvailable() const { return socket.bytesAvailable(); }
+    qint64 socketBytesToWrite() const { return socket.bytesToWrite(); }
+
+    void setReadBufferSize(int size);
+
+signals:
+    void infoHashReceived(const QByteArray &infoHash);
+    void readyToTransfer();
+
+    void choked();
+    void unchoked();
+    void interested();
+    void notInterested();
+
+    void piecesAvailable(const QBitArray &pieces);
+    void blockRequested(int pieceIndex, int begin, int length);
+    void blockReceived(int pieceIndex, int begin, const QByteArray &data);
+
+    void bytesReceived(qint64 size);
+
+protected slots:
+    void connectToHostImplementation(const QString &hostName,
+                                     quint16 port, OpenMode openMode = ReadWrite);
+    void diconnectFromHostImplementation();
+
+protected:
+    void timerEvent(QTimerEvent *event);
+
+    qint64 readData(char *data, qint64 maxlen);
+    qint64 readLineData(char *data, qint64 maxlen);
+    qint64 writeData(const char *data, qint64 len);
+
+private slots:
+    void sendHandShake();
+    void processIncomingData();
+    void socketStateChanged(QAbstractSocket::SocketState state);
+
+private:
+    // Data waiting to be read/written
+    QByteArray incomingBuffer;
+    QByteArray outgoingBuffer;
+
+    struct BlockInfo {
+        int pieceIndex;
+        int offset;
+        int length;
+        QByteArray block;
+    };
+    QList<BlockInfo> pendingBlocks;
+    int pendingBlockSizes;
+    QList<TorrentBlock> incoming;
+
+    enum PacketType {
+        ChokePacket = 0,
+        UnchokePacket = 1,
+        InterestedPacket = 2,
+        NotInterestedPacket = 3,
+        HavePacket = 4,
+        BitFieldPacket = 5,
+        RequestPacket = 6,
+        PiecePacket = 7,
+        CancelPacket = 8
+    };
+
+    // State
+    PeerWireState pwState;
+    bool receivedHandShake;
+    bool gotPeerId;
+    bool sentHandShake;
+    int nextPacketLength;
+
+    // Upload/download speed records
+    qint64 uploadSpeedData[8];
+    qint64 downloadSpeedData[8];
+    int transferSpeedTimer;
+
+    // Timeout handling
+    int timeoutTimer;
+    int pendingRequestTimer;
+    bool invalidateTimeout;
+    int keepAliveTimer;
+
+    // Checksum, peer ID and set of available pieces
+    QByteArray infoHash;
+    QByteArray peerIdString;
+    QBitArray peerPieces;
+    TorrentPeer *torrentPeer;
+
+    QTcpSocket socket;
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(PeerWireClient::PeerWireState)
+
+#endif
diff --git a/examples/network/torrent/ratecontroller.cpp b/examples/network/torrent/ratecontroller.cpp
new file mode 100644
index 0000000000..243d897e9c
--- /dev/null
+++ b/examples/network/torrent/ratecontroller.cpp
@@ -0,0 +1,156 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "peerwireclient.h"
+#include "ratecontroller.h"
+
+#include <QtCore>
+
+Q_GLOBAL_STATIC(RateController, rateController)
+
+RateController *RateController::instance()
+{
+    return rateController();
+}
+
+void RateController::addSocket(PeerWireClient *socket)
+{
+    connect(socket, SIGNAL(readyToTransfer()), this, SLOT(scheduleTransfer()));
+    socket->setReadBufferSize(downLimit * 4);
+    sockets << socket;
+    scheduleTransfer();
+}
+
+void RateController::removeSocket(PeerWireClient *socket)
+{
+    disconnect(socket, SIGNAL(readyToTransfer()), this, SLOT(scheduleTransfer()));
+    socket->setReadBufferSize(0);
+    sockets.remove(socket);
+}
+
+void RateController::setDownloadLimit(int bytesPerSecond)
+{
+    downLimit = bytesPerSecond;
+    foreach (PeerWireClient *socket, sockets)
+        socket->setReadBufferSize(downLimit * 4);
+}
+
+void RateController::scheduleTransfer()
+{
+    if (transferScheduled)
+        return;
+    transferScheduled = true;
+    QTimer::singleShot(50, this, SLOT(transfer()));
+}
+
+void RateController::transfer()
+{
+    transferScheduled = false;
+    if (sockets.isEmpty())
+        return;
+
+    int msecs = 1000;
+    if (!stopWatch.isNull())
+        msecs = qMin(msecs, stopWatch.elapsed());
+
+    qint64 bytesToWrite = (upLimit * msecs) / 1000;
+    qint64 bytesToRead = (downLimit * msecs) / 1000;
+    if (bytesToWrite == 0 && bytesToRead == 0) {
+        scheduleTransfer();
+        return;
+    }
+
+    QSet<PeerWireClient *> pendingSockets;
+    foreach (PeerWireClient *client, sockets) {
+        if (client->canTransferMore())
+            pendingSockets << client;
+    }
+    if (pendingSockets.isEmpty())
+        return;
+
+    stopWatch.start();
+
+    bool canTransferMore;
+    do {
+        canTransferMore = false;
+        qint64 writeChunk = qMax<qint64>(1, bytesToWrite / pendingSockets.size());
+        qint64 readChunk = qMax<qint64>(1, bytesToRead / pendingSockets.size());
+
+        QSetIterator<PeerWireClient *> it(pendingSockets);
+        while (it.hasNext() && (bytesToWrite > 0 || bytesToRead > 0)) {
+            PeerWireClient *socket = it.next();
+            if (socket->state() != QAbstractSocket::ConnectedState) {
+                pendingSockets.remove(socket);
+                continue;
+            }
+
+            bool dataTransferred = false;
+            qint64 available = qMin<qint64>(socket->socketBytesAvailable(), readChunk);
+            if (available > 0) {
+                qint64 readBytes = socket->readFromSocket(qMin<qint64>(available, bytesToRead));
+                if (readBytes > 0) {
+                    bytesToRead -= readBytes;
+                    dataTransferred = true;
+                }
+            }
+
+            if (upLimit * 2 > socket->bytesToWrite()) {
+                qint64 chunkSize = qMin<qint64>(writeChunk, bytesToWrite);
+                qint64 toWrite = qMin(upLimit * 2 - socket->bytesToWrite(), chunkSize);
+                if (toWrite > 0) {
+                    qint64 writtenBytes = socket->writeToSocket(toWrite);
+                    if (writtenBytes > 0) {
+                        bytesToWrite -= writtenBytes;
+                        dataTransferred = true;
+                    }
+                }
+            }
+
+            if (dataTransferred && socket->canTransferMore())
+                canTransferMore = true;
+            else
+                pendingSockets.remove(socket);
+        }
+    } while (canTransferMore && (bytesToWrite > 0 || bytesToRead > 0) && !pendingSockets.isEmpty());
+
+    if (canTransferMore || bytesToWrite == 0 || bytesToRead == 0)
+        scheduleTransfer();
+}
diff --git a/examples/network/torrent/ratecontroller.h b/examples/network/torrent/ratecontroller.h
new file mode 100644
index 0000000000..fb22159c08
--- /dev/null
+++ b/examples/network/torrent/ratecontroller.h
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef RATECONTROLLER_H
+#define RATECONTROLLER_H
+
+#include <QObject>
+#include <QSet>
+#include <QTime>
+
+class PeerWireClient;
+
+class RateController : public QObject
+{
+    Q_OBJECT
+
+public:
+    inline RateController(QObject *parent = 0)
+        : QObject(parent), transferScheduled(false) { }
+    static RateController *instance();
+
+    void addSocket(PeerWireClient *socket);
+    void removeSocket(PeerWireClient *socket);
+
+    inline int uploadLimit() const { return upLimit; }
+    inline int downloadLimit() const { return downLimit; }
+    inline void setUploadLimit(int bytesPerSecond) { upLimit = bytesPerSecond; }
+    void setDownloadLimit(int bytesPerSecond);
+
+public slots:
+    void transfer();
+    void scheduleTransfer();
+
+private:
+    QTime stopWatch;
+    QSet<PeerWireClient *> sockets;
+    int upLimit;
+    int downLimit;
+    bool transferScheduled;
+};
+
+#endif
diff --git a/examples/network/torrent/torrent.pro b/examples/network/torrent/torrent.pro
new file mode 100644
index 0000000000..10b267242f
--- /dev/null
+++ b/examples/network/torrent/torrent.pro
@@ -0,0 +1,37 @@
+HEADERS += addtorrentdialog.h \
+           bencodeparser.h \
+           connectionmanager.h \
+           mainwindow.h \
+           metainfo.h \
+           peerwireclient.h \
+           ratecontroller.h \
+           filemanager.h \  
+           torrentclient.h \
+           torrentserver.h \
+           trackerclient.h
+
+SOURCES += main.cpp \
+           addtorrentdialog.cpp \
+           bencodeparser.cpp \
+           connectionmanager.cpp \
+           mainwindow.cpp \
+           metainfo.cpp \
+           peerwireclient.cpp \
+           ratecontroller.cpp \
+           filemanager.cpp \
+           torrentclient.cpp \
+           torrentserver.cpp \
+           trackerclient.cpp
+
+# Forms and resources
+FORMS += forms/addtorrentform.ui
+RESOURCES += icons.qrc
+
+QT += network
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/network/torrent
+sources.files = $$SOURCES $$HEADERS $$RESOURCES torrent.pro *.torrent
+sources.files += icons forms 3rdparty
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/torrent
+INSTALLS += target sources
diff --git a/examples/network/torrent/torrentclient.cpp b/examples/network/torrent/torrentclient.cpp
new file mode 100644
index 0000000000..e8473bb1de
--- /dev/null
+++ b/examples/network/torrent/torrentclient.cpp
@@ -0,0 +1,1529 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "connectionmanager.h"
+#include "filemanager.h"
+#include "metainfo.h"
+#include "torrentclient.h"
+#include "torrentserver.h"
+#include "trackerclient.h"
+#include "peerwireclient.h"
+#include "ratecontroller.h"
+
+#include <QtCore>
+#include <QNetworkInterface>
+
+// These constants could also be configurable by the user.
+static const int ServerMinPort = 6881;
+static const int ServerMaxPort = /* 6889 */ 7000;
+static const int BlockSize = 16384;
+static const int MaxBlocksInProgress = 5;
+static const int MaxBlocksInMultiMode = 2;
+static const int MaxConnectionPerPeer = 1;
+static const int RateControlWindowLength = 10;
+static const int RateControlTimerDelay = 1000;
+static const int MinimumTimeBeforeRevisit = 30;
+static const int MaxUploads = 4;
+static const int UploadScheduleInterval = 10000;
+static const int EndGamePieces = 5;
+
+class TorrentPiece {
+public:
+    int index;
+    int length;
+    QBitArray completedBlocks;
+    QBitArray requestedBlocks;
+    bool inProgress;
+};
+
+class TorrentClientPrivate
+{
+public:
+    TorrentClientPrivate(TorrentClient *qq);
+
+    // State / error
+    void setError(TorrentClient::Error error);
+    void setState(TorrentClient::State state);
+    TorrentClient::Error error;
+    TorrentClient::State state;
+    QString errorString;
+    QString stateString;
+
+    // Where to save data
+    QString destinationFolder;
+    MetaInfo metaInfo;
+
+    // Announce tracker and file manager
+    QByteArray peerId;
+    QByteArray infoHash;
+    TrackerClient trackerClient;
+    FileManager fileManager;
+
+    // Connections
+    QList<PeerWireClient *> connections;
+    QList<TorrentPeer *> peers;
+    bool schedulerCalled;
+    void callScheduler();
+    bool connectingToClients;
+    void callPeerConnector();
+    int uploadScheduleTimer;
+
+    // Pieces
+    QMap<int, PeerWireClient *> readIds;
+    QMultiMap<PeerWireClient *, TorrentPiece *> payloads;
+    QMap<int, TorrentPiece *> pendingPieces;
+    QBitArray completedPieces;
+    QBitArray incompletePieces;
+    int pieceCount;
+
+    // Progress
+    int lastProgressValue;
+    qint64 downloadedBytes;
+    qint64 uploadedBytes;
+    int downloadRate[RateControlWindowLength];
+    int uploadRate[RateControlWindowLength];
+    int transferRateTimer;
+
+    TorrentClient *q;
+};
+
+TorrentClientPrivate::TorrentClientPrivate(TorrentClient *qq)
+    : trackerClient(qq), q(qq)
+{
+    error = TorrentClient::UnknownError;
+    state = TorrentClient::Idle;
+    errorString = QT_TRANSLATE_NOOP(TorrentClient, "Unknown error");
+    stateString = QT_TRANSLATE_NOOP(TorrentClient, "Idle");
+    schedulerCalled = false;
+    connectingToClients = false;
+    uploadScheduleTimer = 0;
+    lastProgressValue = -1;
+    pieceCount = 0;
+    downloadedBytes = 0;
+    uploadedBytes = 0;
+    memset(downloadRate, 0, sizeof(downloadRate));
+    memset(uploadRate, 0, sizeof(uploadRate));
+    transferRateTimer = 0;
+}
+
+void TorrentClientPrivate::setError(TorrentClient::Error errorCode)
+{
+    this->error = errorCode;
+    switch (error) {
+    case TorrentClient::UnknownError:
+        errorString = QT_TRANSLATE_NOOP(TorrentClient, "Unknown error");
+        break;
+    case TorrentClient::TorrentParseError:
+        errorString = QT_TRANSLATE_NOOP(TorrentClient, "Invalid torrent data");
+        break;
+    case TorrentClient::InvalidTrackerError:
+        errorString = QT_TRANSLATE_NOOP(TorrentClient, "Unable to connect to tracker");
+        break;
+    case TorrentClient::FileError:
+        errorString = QT_TRANSLATE_NOOP(TorrentClient, "File error");
+        break;
+    case TorrentClient::ServerError:
+        errorString = QT_TRANSLATE_NOOP(TorrentClient, "Unable to initialize server");
+        break;
+    }
+    emit q->error(errorCode);
+}
+
+void TorrentClientPrivate::setState(TorrentClient::State state)
+{
+    this->state = state;
+    switch (state) {
+    case TorrentClient::Idle:
+        stateString = QT_TRANSLATE_NOOP(TorrentClient, "Idle");
+        break;
+    case TorrentClient::Paused:
+        stateString = QT_TRANSLATE_NOOP(TorrentClient, "Paused");
+        break;
+    case TorrentClient::Stopping:
+        stateString = QT_TRANSLATE_NOOP(TorrentClient, "Stopping");
+        break;
+    case TorrentClient::Preparing:
+        stateString = QT_TRANSLATE_NOOP(TorrentClient, "Preparing");
+        break;
+    case TorrentClient::Searching:
+        stateString = QT_TRANSLATE_NOOP(TorrentClient, "Searching");
+        break;
+    case TorrentClient::Connecting:
+        stateString = QT_TRANSLATE_NOOP(TorrentClient, "Connecting");
+        break;
+    case TorrentClient::WarmingUp:
+        stateString = QT_TRANSLATE_NOOP(TorrentClient, "Warming up");
+        break;
+    case TorrentClient::Downloading:
+        stateString = QT_TRANSLATE_NOOP(TorrentClient, "Downloading");
+        break;
+    case TorrentClient::Endgame:
+        stateString = QT_TRANSLATE_NOOP(TorrentClient, "Finishing");
+        break;
+    case TorrentClient::Seeding:
+        stateString = QT_TRANSLATE_NOOP(TorrentClient, "Seeding");
+        break;
+    }
+    emit q->stateChanged(state);
+}
+
+void TorrentClientPrivate::callScheduler()
+{
+    if (!schedulerCalled) {
+        schedulerCalled = true;
+        QMetaObject::invokeMethod(q, "scheduleDownloads", Qt::QueuedConnection);
+    }
+}
+
+void TorrentClientPrivate::callPeerConnector()
+{
+    if (!connectingToClients) {
+        connectingToClients = true;
+        QTimer::singleShot(10000, q, SLOT(connectToPeers()));
+    }
+}
+
+TorrentClient::TorrentClient(QObject *parent)
+    : QObject(parent), d(new TorrentClientPrivate(this))
+{
+    // Connect the file manager
+    connect(&d->fileManager, SIGNAL(dataRead(int, int, int, const QByteArray &)),
+            this, SLOT(sendToPeer(int, int, int, const QByteArray &)));
+    connect(&d->fileManager, SIGNAL(verificationProgress(int)),
+            this, SLOT(updateProgress(int)));
+    connect(&d->fileManager, SIGNAL(verificationDone()),
+            this, SLOT(fullVerificationDone()));
+    connect(&d->fileManager, SIGNAL(pieceVerified(int, bool)),
+            this, SLOT(pieceVerified(int, bool)));
+    connect(&d->fileManager, SIGNAL(error()),
+            this, SLOT(handleFileError()));
+
+    // Connect the tracker client
+    connect(&d->trackerClient, SIGNAL(peerListUpdated(const QList<TorrentPeer> &)),
+            this, SLOT(addToPeerList(const QList<TorrentPeer> &)));
+    connect(&d->trackerClient, SIGNAL(stopped()),
+            this, SIGNAL(stopped()));
+}
+
+TorrentClient::~TorrentClient()
+{
+    qDeleteAll(d->peers);
+    qDeleteAll(d->pendingPieces);
+    delete d;
+}
+
+bool TorrentClient::setTorrent(const QString &fileName)
+{
+    QFile file(fileName);
+    if (!file.open(QIODevice::ReadOnly) || !setTorrent(file.readAll())) {
+        d->setError(TorrentParseError);
+        return false;
+    }
+    return true;
+}
+
+bool TorrentClient::setTorrent(const QByteArray &torrentData)
+{
+    if (!d->metaInfo.parse(torrentData)) {
+        d->setError(TorrentParseError);
+        return false;
+    }
+
+    // Calculate SHA1 hash of the "info" section in the torrent
+    QByteArray infoValue = d->metaInfo.infoValue();
+    d->infoHash = QCryptographicHash::hash(infoValue, QCryptographicHash::Sha1);
+
+    return true;
+}
+
+MetaInfo TorrentClient::metaInfo() const
+{
+    return d->metaInfo;
+}
+
+void TorrentClient::setDestinationFolder(const QString &directory)
+{
+    d->destinationFolder = directory;
+}
+
+QString TorrentClient::destinationFolder() const
+{
+    return d->destinationFolder;
+}
+
+void TorrentClient::setDumpedState(const QByteArray &dumpedState)
+{
+    // Recover partially completed pieces
+    QDataStream stream(dumpedState);
+
+    quint16 version = 0;
+    stream >> version;
+    if (version != 2)
+        return;
+
+    stream >> d->completedPieces;
+
+    while (!stream.atEnd()) {
+        int index;
+        int length;
+        QBitArray completed;
+        stream >> index >> length >> completed;
+        if (stream.status() != QDataStream::Ok) {
+            d->completedPieces.clear();
+            break;
+        }
+
+        TorrentPiece *piece = new TorrentPiece;
+        piece->index = index;
+        piece->length = length;
+        piece->completedBlocks = completed;
+        piece->requestedBlocks.resize(completed.size());
+        piece->inProgress = false;
+        d->pendingPieces[index] = piece;
+    }
+}
+
+QByteArray TorrentClient::dumpedState() const
+{
+    QByteArray partials;
+    QDataStream stream(&partials, QIODevice::WriteOnly);
+
+    stream << quint16(2);
+    stream << d->completedPieces;
+
+    // Save the state of all partially downloaded pieces into a format
+    // suitable for storing in settings.
+    QMap<int, TorrentPiece *>::ConstIterator it = d->pendingPieces.constBegin();
+    while (it != d->pendingPieces.constEnd()) {
+        TorrentPiece *piece = it.value();
+        if (blocksLeftForPiece(piece) > 0 && blocksLeftForPiece(piece) < piece->completedBlocks.size()) {
+            stream << piece->index;
+            stream << piece->length;
+            stream << piece->completedBlocks;
+        }
+        ++it;
+    }
+
+    return partials;
+}
+
+qint64 TorrentClient::progress() const
+{
+    return d->lastProgressValue;
+}
+
+void TorrentClient::setDownloadedBytes(qint64 bytes)
+{
+    d->downloadedBytes = bytes;
+}
+
+qint64 TorrentClient::downloadedBytes() const
+{
+    return d->downloadedBytes;
+}
+
+void TorrentClient::setUploadedBytes(qint64 bytes)
+{
+    d->uploadedBytes = bytes;
+}
+
+qint64 TorrentClient::uploadedBytes() const
+{
+    return d->uploadedBytes;
+}
+
+int TorrentClient::connectedPeerCount() const
+{
+    int tmp = 0;
+    foreach (PeerWireClient *client, d->connections) {
+        if (client->state() == QAbstractSocket::ConnectedState)
+            ++tmp;
+    }
+    return tmp;
+}
+
+int TorrentClient::seedCount() const
+{
+    int tmp = 0;
+    foreach (PeerWireClient *client, d->connections) {
+        if (client->availablePieces().count(true) == d->pieceCount)
+            ++tmp;
+    }
+    return tmp;
+}
+
+TorrentClient::State TorrentClient::state() const
+{
+    return d->state;
+}
+
+QString TorrentClient::stateString() const
+{
+    return d->stateString;
+}
+
+TorrentClient::Error TorrentClient::error() const
+{
+    return d->error;
+}
+
+QString TorrentClient::errorString() const
+{
+    return d->errorString;
+}
+
+QByteArray TorrentClient::peerId() const
+{
+    return d->peerId;
+}
+
+QByteArray TorrentClient::infoHash() const
+{
+    return d->infoHash;
+}
+
+void TorrentClient::start()
+{
+    if (d->state != Idle)
+        return;
+
+    TorrentServer::instance()->addClient(this);
+
+    // Initialize the file manager
+    d->setState(Preparing);
+    d->fileManager.setMetaInfo(d->metaInfo);
+    d->fileManager.setDestinationFolder(d->destinationFolder);
+    d->fileManager.setCompletedPieces(d->completedPieces);
+    d->fileManager.start(QThread::LowestPriority);
+    d->fileManager.startDataVerification();
+}
+
+void TorrentClient::stop()
+{
+    if (d->state == Stopping)
+        return;
+
+    TorrentServer::instance()->removeClient(this);
+
+    // Update the state
+    State oldState = d->state;
+    d->setState(Stopping);
+
+    // Stop the timer
+    if (d->transferRateTimer) {
+        killTimer(d->transferRateTimer);
+        d->transferRateTimer = 0;
+    }
+
+    // Abort all existing connections
+    foreach (PeerWireClient *client, d->connections) {
+        RateController::instance()->removeSocket(client);
+        ConnectionManager::instance()->removeConnection(client);
+        client->abort();
+    }
+    d->connections.clear();
+
+    // Perhaps stop the tracker
+    if (oldState > Preparing) {
+        d->trackerClient.stop();
+    } else {
+        d->setState(Idle);
+        emit stopped();
+    }
+}
+
+void TorrentClient::setPaused(bool paused)
+{
+    if (paused) {
+        // Abort all connections, and set the max number of
+        // connections to 0. Keep the list of peers, so we can quickly
+        // resume later.
+        d->setState(Paused);
+        foreach (PeerWireClient *client, d->connections)
+            client->abort();
+        d->connections.clear();
+        TorrentServer::instance()->removeClient(this);
+    } else {
+        // Restore the max number of connections, and start the peer
+        // connector. We should also quickly start receiving incoming
+        // connections.
+        d->setState(d->completedPieces.count(true) == d->fileManager.pieceCount()
+                    ? Seeding : Searching);
+        connectToPeers();
+        TorrentServer::instance()->addClient(this);
+    }
+}
+
+void TorrentClient::timerEvent(QTimerEvent *event)
+{
+    if (event->timerId() == d->uploadScheduleTimer) {
+        // Update the state of who's choked and who's not
+        scheduleUploads();
+        return;
+    }
+
+    if (event->timerId() != d->transferRateTimer) {
+        QObject::timerEvent(event);
+        return;
+    }
+
+    // Calculate average upload/download rate
+    qint64 uploadBytesPerSecond = 0;
+    qint64 downloadBytesPerSecond = 0;
+    for (int i = 0; i < RateControlWindowLength; ++i) {
+        uploadBytesPerSecond += d->uploadRate[i];
+        downloadBytesPerSecond += d->downloadRate[i];
+    }
+    uploadBytesPerSecond /= qint64(RateControlWindowLength);
+    downloadBytesPerSecond /= qint64(RateControlWindowLength);
+    for (int i = RateControlWindowLength - 2; i >= 0; --i) {
+        d->uploadRate[i + 1] = d->uploadRate[i];
+        d->downloadRate[i + 1] = d->downloadRate[i];
+    }
+    d->uploadRate[0] = 0;
+    d->downloadRate[0] = 0;
+    emit uploadRateUpdated(int(uploadBytesPerSecond));
+    emit downloadRateUpdated(int(downloadBytesPerSecond));
+
+    // Stop the timer if there is no activity.
+    if (downloadBytesPerSecond == 0 && uploadBytesPerSecond == 0) {
+        killTimer(d->transferRateTimer);
+        d->transferRateTimer = 0;
+    }
+}
+
+void TorrentClient::sendToPeer(int readId, int pieceIndex, int begin, const QByteArray &data)
+{
+    // Send the requested block to the peer if the client connection
+    // still exists; otherwise do nothing. This slot is called by the
+    // file manager after it has read a block of data.
+    PeerWireClient *client = d->readIds.value(readId);
+    if (client) {
+        if ((client->peerWireState() & PeerWireClient::ChokingPeer) == 0)
+            client->sendBlock(pieceIndex, begin, data);
+    }
+    d->readIds.remove(readId);
+}
+
+void TorrentClient::fullVerificationDone()
+{
+    // Update our list of completed and incomplete pieces.
+    d->completedPieces = d->fileManager.completedPieces();
+    d->incompletePieces.resize(d->completedPieces.size());
+    d->pieceCount = d->completedPieces.size();
+    for (int i = 0; i < d->fileManager.pieceCount(); ++i) {
+        if (!d->completedPieces.testBit(i))
+            d->incompletePieces.setBit(i);
+    }
+
+    updateProgress();
+
+    // If the checksums show that what the dumped state thought was
+    // partial was in fact complete, then we trust the checksums.
+    QMap<int, TorrentPiece *>::Iterator it = d->pendingPieces.begin();
+    while (it != d->pendingPieces.end()) {
+        if (d->completedPieces.testBit(it.key()))
+            it = d->pendingPieces.erase(it);
+        else
+            ++it;
+    }
+
+    d->uploadScheduleTimer = startTimer(UploadScheduleInterval);
+
+    // Start the server
+    TorrentServer *server = TorrentServer::instance();
+    if (!server->isListening()) {
+        // Set up the peer wire server
+        for (int i = ServerMinPort; i <= ServerMaxPort; ++i) {
+            if (server->listen(QHostAddress::Any, i))
+                break;
+        }
+        if (!server->isListening()) {
+            d->setError(ServerError);
+            return;
+        }
+    }
+
+    d->setState(d->completedPieces.count(true) == d->pieceCount ? Seeding : Searching);
+
+    // Start the tracker client
+    d->trackerClient.start(d->metaInfo);
+}
+
+void TorrentClient::pieceVerified(int pieceIndex, bool ok)
+{
+    TorrentPiece *piece = d->pendingPieces.value(pieceIndex);
+
+    // Remove this piece from all payloads
+    QMultiMap<PeerWireClient *, TorrentPiece *>::Iterator it = d->payloads.begin();
+    while (it != d->payloads.end()) {
+        if (it.value()->index == pieceIndex)
+            it = d->payloads.erase(it);
+        else
+            ++it;
+    }
+
+    if (!ok) {
+        // If a piece did not pass the SHA1 check, we'll simply clear
+        // its state, and the scheduler will re-request it
+        piece->inProgress = false;
+        piece->completedBlocks.fill(false);
+        piece->requestedBlocks.fill(false);
+        d->callScheduler();
+        return;
+    }
+
+    // Update the peer list so we know who's still interesting.
+    foreach (TorrentPeer *peer, d->peers) {
+        if (!peer->interesting)
+            continue;
+        bool interesting = false;
+        for (int i = 0; i < d->pieceCount; ++i) {
+            if (peer->pieces.testBit(i) && d->incompletePieces.testBit(i)) {
+                interesting = true;
+                break;
+            }
+        }
+        peer->interesting = interesting;
+    }
+
+    // Delete the piece and update our structures.
+    delete piece;
+    d->pendingPieces.remove(pieceIndex);
+    d->completedPieces.setBit(pieceIndex);
+    d->incompletePieces.clearBit(pieceIndex);
+
+    // Notify connected peers.
+    foreach (PeerWireClient *client, d->connections) {
+        if (client->state() == QAbstractSocket::ConnectedState
+            && !client->availablePieces().testBit(pieceIndex)) {
+            client->sendPieceNotification(pieceIndex);
+        }
+    }
+
+    // Notify the tracker if we've entered Seeding status; otherwise
+    // call the scheduler.
+    int completed = d->completedPieces.count(true);
+    if (completed == d->pieceCount) {
+        if (d->state != Seeding) {
+            d->setState(Seeding);
+            d->trackerClient.startSeeding();
+        }
+    } else {
+        if (completed == 1)
+            d->setState(Downloading);
+        else if (d->incompletePieces.count(true) < 5 && d->pendingPieces.size() > d->incompletePieces.count(true))
+            d->setState(Endgame);
+        d->callScheduler();
+    }
+
+    updateProgress();
+}
+
+void TorrentClient::handleFileError()
+{
+    if (d->state == Paused)
+        return;
+    setPaused(true);
+    emit error(FileError);
+}
+
+void TorrentClient::connectToPeers()
+{
+    d->connectingToClients = false;
+
+    if (d->state == Stopping || d->state == Idle || d->state == Paused)
+        return;
+
+    if (d->state == Searching)
+        d->setState(Connecting);
+
+    // Find the list of peers we are not currently connected to, where
+    // the more interesting peers are listed more than once.
+    QList<TorrentPeer *> weighedPeers = weighedFreePeers();
+
+    // Start as many connections as we can
+    while (!weighedPeers.isEmpty() && ConnectionManager::instance()->canAddConnection()
+           && (qrand() % (ConnectionManager::instance()->maxConnections() / 2))) {
+        PeerWireClient *client = new PeerWireClient(ConnectionManager::instance()->clientId(), this);
+        RateController::instance()->addSocket(client);
+        ConnectionManager::instance()->addConnection(client);
+
+        initializeConnection(client);
+        d->connections << client;
+
+        // Pick a random peer from the list of weighed peers.
+        TorrentPeer *peer = weighedPeers.takeAt(qrand() % weighedPeers.size());
+        weighedPeers.removeAll(peer);
+        peer->connectStart = QDateTime::currentDateTime().toTime_t();
+        peer->lastVisited = peer->connectStart;
+
+        // Connect to the peer.
+        client->setPeer(peer);
+        client->connectToHost(peer->address, peer->port);
+    }
+}
+
+QList<TorrentPeer *> TorrentClient::weighedFreePeers() const
+{
+    QList<TorrentPeer *> weighedPeers;
+
+    // Generate a list of peers that we want to connect to.
+    uint now = QDateTime::currentDateTime().toTime_t();
+    QList<TorrentPeer *> freePeers;
+    QMap<QString, int> connectionsPerPeer;
+    foreach (TorrentPeer *peer, d->peers) {
+        bool busy = false;
+        foreach (PeerWireClient *client, d->connections) {
+            if (client->state() == PeerWireClient::ConnectedState
+                && client->peerAddress() == peer->address
+                && client->peerPort() == peer->port) {
+                if (++connectionsPerPeer[peer->address.toString()] >= MaxConnectionPerPeer) {
+                    busy = true;
+                    break;
+                }
+            }
+        }
+        if (!busy && (now - peer->lastVisited) > uint(MinimumTimeBeforeRevisit))
+            freePeers << peer;
+    }
+
+    // Nothing to connect to
+    if (freePeers.isEmpty())
+        return weighedPeers;
+
+    // Assign points based on connection speed and pieces available.
+    QList<QPair<int, TorrentPeer *> > points;
+    foreach (TorrentPeer *peer, freePeers) {
+        int tmp = 0;
+        if (peer->interesting) {
+            tmp += peer->numCompletedPieces;
+            if (d->state == Seeding)
+                tmp = d->pieceCount - tmp;
+            if (!peer->connectStart) // An unknown peer is as interesting as a seed
+                tmp += d->pieceCount;
+
+            // 1/5 of the total score for each second below 5 it takes to
+            // connect.
+            if (peer->connectTime < 5)
+                tmp += (d->pieceCount / 10) * (5 - peer->connectTime);
+        }
+        points << QPair<int, TorrentPeer *>(tmp, peer);
+    }
+    qSort(points);
+
+    // Minimize the list so the point difference is never more than 1.
+    typedef QPair<int,TorrentPeer*> PointPair;
+    QMultiMap<int, TorrentPeer *> pointMap;
+    int lowestScore = 0;
+    int lastIndex = 0;
+    foreach (PointPair point, points) {
+        if (point.first > lowestScore) {
+            lowestScore = point.first;
+            ++lastIndex;
+        }
+        pointMap.insert(lastIndex, point.second);
+    }
+
+    // Now make up a list of peers where the ones with more points are
+    // listed many times.
+    QMultiMap<int, TorrentPeer *>::ConstIterator it = pointMap.constBegin();
+    while (it != pointMap.constEnd()) {
+        for (int i = 0; i < it.key() + 1; ++i)
+            weighedPeers << it.value();
+        ++it;
+    }
+
+    return weighedPeers;
+}
+
+void TorrentClient::setupIncomingConnection(PeerWireClient *client)
+{
+    // Connect signals
+    initializeConnection(client);
+
+    // Initialize this client
+    RateController::instance()->addSocket(client);
+    d->connections << client;
+
+    client->initialize(d->infoHash, d->pieceCount);
+    client->sendPieceList(d->completedPieces);
+
+    emit peerInfoUpdated();
+
+    if (d->state == Searching || d->state == Connecting) {
+        int completed = d->completedPieces.count(true);
+        if (completed == 0)
+            d->setState(WarmingUp);
+        else if (d->incompletePieces.count(true) < 5 && d->pendingPieces.size() > d->incompletePieces.count(true))
+            d->setState(Endgame);
+    }
+
+    if (d->connections.isEmpty())
+        scheduleUploads();
+}
+
+void TorrentClient::setupOutgoingConnection()
+{
+    PeerWireClient *client = qobject_cast<PeerWireClient *>(sender());
+
+    // Update connection statistics.
+    foreach (TorrentPeer *peer, d->peers) {
+        if (peer->port == client->peerPort() && peer->address == client->peerAddress()) {
+            peer->connectTime = peer->lastVisited - peer->connectStart;
+            break;
+        }
+    }
+
+    // Send handshake and piece list
+    client->initialize(d->infoHash, d->pieceCount);
+    client->sendPieceList(d->completedPieces);
+
+    emit peerInfoUpdated();
+
+    if (d->state == Searching || d->state == Connecting) {
+        int completed = d->completedPieces.count(true);
+        if (completed == 0)
+            d->setState(WarmingUp);
+        else if (d->incompletePieces.count(true) < 5 && d->pendingPieces.size() > d->incompletePieces.count(true))
+            d->setState(Endgame);
+    }
+}
+
+void TorrentClient::initializeConnection(PeerWireClient *client)
+{
+    connect(client, SIGNAL(connected()),
+            this, SLOT(setupOutgoingConnection()));
+    connect(client, SIGNAL(disconnected()),
+            this, SLOT(removeClient()));
+    connect(client, SIGNAL(error(QAbstractSocket::SocketError)),
+            this, SLOT(removeClient()));
+    connect(client, SIGNAL(piecesAvailable(const QBitArray &)),
+            this, SLOT(peerPiecesAvailable(const QBitArray &)));
+    connect(client, SIGNAL(blockRequested(int, int, int)),
+            this, SLOT(peerRequestsBlock(int, int, int)));
+    connect(client, SIGNAL(blockReceived(int, int, const QByteArray &)),
+            this, SLOT(blockReceived(int, int, const QByteArray &)));
+    connect(client, SIGNAL(choked()),
+            this, SLOT(peerChoked()));
+    connect(client, SIGNAL(unchoked()),
+            this, SLOT(peerUnchoked()));
+    connect(client, SIGNAL(bytesWritten(qint64)),
+            this, SLOT(peerWireBytesWritten(qint64)));
+    connect(client, SIGNAL(bytesReceived(qint64)),
+            this, SLOT(peerWireBytesReceived(qint64)));
+}
+
+void TorrentClient::removeClient()
+{
+    PeerWireClient *client = static_cast<PeerWireClient *>(sender());
+
+    // Remove the host from our list of known peers if the connection
+    // failed.
+    if (client->peer() && client->error() == QAbstractSocket::ConnectionRefusedError)
+        d->peers.removeAll(client->peer());
+
+    // Remove the client from RateController and all structures.
+    RateController::instance()->removeSocket(client);
+    d->connections.removeAll(client);
+    QMultiMap<PeerWireClient *, TorrentPiece *>::Iterator it = d->payloads.find(client);
+    while (it != d->payloads.end() && it.key() == client) {
+        TorrentPiece *piece = it.value();
+        piece->inProgress = false;
+        piece->requestedBlocks.fill(false);
+        it = d->payloads.erase(it);
+    }
+
+    // Remove pending read requests.
+    QMapIterator<int, PeerWireClient *> it2(d->readIds);
+    while (it2.findNext(client))
+        d->readIds.remove(it2.key());
+
+    // Delete the client later.
+    disconnect(client, SIGNAL(disconnected()), this, SLOT(removeClient()));
+    client->deleteLater();
+    ConnectionManager::instance()->removeConnection(client);
+
+    emit peerInfoUpdated();
+    d->callPeerConnector();
+}
+
+void TorrentClient::peerPiecesAvailable(const QBitArray &pieces)
+{
+    PeerWireClient *client = qobject_cast<PeerWireClient *>(sender());
+
+    // Find the peer in our list of announced peers. If it's there,
+    // then we can use the piece list into to gather statistics that
+    // help us decide what peers to connect to.
+    TorrentPeer *peer = 0;
+    QList<TorrentPeer *>::Iterator it = d->peers.begin();
+    while (it != d->peers.end()) {
+        if ((*it)->address == client->peerAddress() && (*it)->port == client->peerPort()) {
+            peer = *it;
+            break;
+        }
+        ++it;
+    }
+
+    // If the peer is a seed, and we are in seeding mode, then the
+    // peer is uninteresting.
+    if (pieces.count(true) == d->pieceCount) {
+        if (peer)
+            peer->seed = true;
+        emit peerInfoUpdated();
+        if (d->state == Seeding) {
+            client->abort();
+            return;
+        } else {
+            if (peer)
+                peer->interesting = true;
+            if ((client->peerWireState() & PeerWireClient::InterestedInPeer) == 0)
+                client->sendInterested();
+            d->callScheduler();
+            return;
+        }
+    }
+
+    // Update our list of available pieces.
+    if (peer) {
+        peer->pieces = pieces;
+        peer->numCompletedPieces = pieces.count(true);
+    }
+
+    // Check for interesting pieces, and tell the peer whether we are
+    // interested or not.
+    bool interested = false;
+    int piecesSize = pieces.size();
+    for (int pieceIndex = 0; pieceIndex < piecesSize; ++pieceIndex) {
+        if (!pieces.testBit(pieceIndex))
+            continue;
+        if (!d->completedPieces.testBit(pieceIndex)) {
+            interested = true;
+            if ((client->peerWireState() & PeerWireClient::InterestedInPeer) == 0) {
+                if (peer)
+                    peer->interesting = true;
+                client->sendInterested();
+            }
+
+            QMultiMap<PeerWireClient *, TorrentPiece *>::Iterator it = d->payloads.find(client);
+            int inProgress = 0;
+            while (it != d->payloads.end() && it.key() == client) {
+                if (it.value()->inProgress)
+                    inProgress += it.value()->requestedBlocks.count(true);
+                ++it;
+            }
+            if (!inProgress)
+                d->callScheduler();
+            break;
+        }
+    }
+    if (!interested && (client->peerWireState() & PeerWireClient::InterestedInPeer)) {
+        if (peer)
+            peer->interesting = false;
+        client->sendNotInterested();
+    }
+}
+
+void TorrentClient::peerRequestsBlock(int pieceIndex, int begin, int length)
+{
+    PeerWireClient *client = qobject_cast<PeerWireClient *>(sender());
+
+    // Silently ignore requests from choked peers
+    if (client->peerWireState() & PeerWireClient::ChokingPeer)
+        return;
+
+    // Silently ignore requests for pieces we don't have.
+    if (!d->completedPieces.testBit(pieceIndex))
+        return;
+
+    // Request the block from the file manager
+    d->readIds.insert(d->fileManager.read(pieceIndex, begin, length),
+                      qobject_cast<PeerWireClient *>(sender()));
+}
+
+void TorrentClient::blockReceived(int pieceIndex, int begin, const QByteArray &data)
+{
+    PeerWireClient *client = qobject_cast<PeerWireClient *>(sender());
+    if (data.size() == 0) {
+        client->abort();
+        return;
+    }
+
+    // Ignore it if we already have this block.
+    int blockBit = begin / BlockSize;
+    TorrentPiece *piece = d->pendingPieces.value(pieceIndex);
+    if (!piece || piece->completedBlocks.testBit(blockBit)) {
+        // Discard blocks that we already have, and fill up the pipeline.
+        requestMore(client);
+        return;
+    }
+
+    // If we are in warmup or endgame mode, cancel all duplicate
+    // requests for this block.
+    if (d->state == WarmingUp || d->state == Endgame) {
+        QMultiMap<PeerWireClient *, TorrentPiece *>::Iterator it = d->payloads.begin();
+        while (it != d->payloads.end()) {
+            PeerWireClient *otherClient = it.key();
+            if (otherClient != client && it.value()->index == pieceIndex) {
+                if (otherClient->incomingBlocks().contains(TorrentBlock(pieceIndex, begin, data.size())))
+                    it.key()->cancelRequest(pieceIndex, begin, data.size());
+            }
+            ++it;
+        }
+    }
+
+    if (d->state != Downloading && d->state != Endgame && d->completedPieces.count(true) > 0)
+        d->setState(Downloading);
+
+    // Store this block
+    d->fileManager.write(pieceIndex, begin, data);
+    piece->completedBlocks.setBit(blockBit);
+    piece->requestedBlocks.clearBit(blockBit);
+
+    if (blocksLeftForPiece(piece) == 0) {
+        // Ask the file manager to verify the newly downloaded piece
+        d->fileManager.verifyPiece(piece->index);
+        
+        // Remove this piece from all payloads
+        QMultiMap<PeerWireClient *, TorrentPiece *>::Iterator it = d->payloads.begin();
+        while (it != d->payloads.end()) {
+            if (!it.value() || it.value()->index == piece->index)
+                it = d->payloads.erase(it);
+            else
+                ++it;
+        }
+    }
+
+    // Fill up the pipeline.
+    requestMore(client);
+}
+
+void TorrentClient::peerWireBytesWritten(qint64 size)
+{
+    if (!d->transferRateTimer)
+        d->transferRateTimer = startTimer(RateControlTimerDelay);
+
+    d->uploadRate[0] += size;
+    d->uploadedBytes += size;
+    emit dataSent(size);
+}
+
+void TorrentClient::peerWireBytesReceived(qint64 size)
+{
+    if (!d->transferRateTimer)
+        d->transferRateTimer = startTimer(RateControlTimerDelay);
+
+    d->downloadRate[0] += size;
+    d->downloadedBytes += size;
+    emit dataSent(size);
+}
+
+int TorrentClient::blocksLeftForPiece(const TorrentPiece *piece) const
+{
+    int blocksLeft = 0;
+    int completedBlocksSize = piece->completedBlocks.size();
+    for (int i = 0; i < completedBlocksSize; ++i) {
+        if (!piece->completedBlocks.testBit(i))
+            ++blocksLeft;
+    }
+    return blocksLeft;
+}
+
+void TorrentClient::scheduleUploads()
+{
+    // Generate a list of clients sorted by their transfer
+    // speeds.  When leeching, we sort by download speed, and when
+    // seeding, we sort by upload speed. Seeds are left out; there's
+    // no use in unchoking them.
+    QList<PeerWireClient *> allClients = d->connections;
+    QMultiMap<int, PeerWireClient *> transferSpeeds;
+    foreach (PeerWireClient *client, allClients) {
+        if (client->state() == QAbstractSocket::ConnectedState
+            && client->availablePieces().count(true) != d->pieceCount) {
+            if (d->state == Seeding) {
+                transferSpeeds.insert(client->uploadSpeed(), client);
+            } else {
+                transferSpeeds.insert(client->downloadSpeed(), client);
+            }
+        }
+    }
+
+    // Unchoke the top 'MaxUploads' downloaders (peers that we are
+    // uploading to) and choke all others.
+    int maxUploaders = MaxUploads;
+    QMapIterator<int, PeerWireClient *> it(transferSpeeds);
+    it.toBack();
+    while (it.hasPrevious()) {
+        PeerWireClient *client = it.previous().value();
+        bool interested = (client->peerWireState() & PeerWireClient::PeerIsInterested);
+
+        if (maxUploaders) {
+            allClients.removeAll(client);
+            if (client->peerWireState() & PeerWireClient::ChokingPeer)
+                client->unchokePeer();
+            --maxUploaders;
+            continue;
+        }
+
+        if ((client->peerWireState() & PeerWireClient::ChokingPeer) == 0) {
+            if ((qrand() % 10) == 0) 
+                client->abort();
+            else
+                client->chokePeer();
+            allClients.removeAll(client);
+        }
+        if (!interested)
+            allClients.removeAll(client);
+    }
+
+    // Only interested peers are left in allClients. Unchoke one
+    // random peer to allow it to compete for a position among the
+    // downloaders.  (This is known as an "optimistic unchoke".)
+    if (!allClients.isEmpty()) {
+        PeerWireClient *client = allClients[qrand() % allClients.size()];
+        if (client->peerWireState() & PeerWireClient::ChokingPeer)
+            client->unchokePeer();
+    }
+}
+
+void TorrentClient::scheduleDownloads()
+{
+    d->schedulerCalled = false;
+
+    if (d->state == Stopping || d->state == Paused || d->state == Idle)
+        return;
+
+    // Check what each client is doing, and assign payloads to those
+    // who are either idle or done.
+    foreach (PeerWireClient *client, d->connections)
+        schedulePieceForClient(client);
+}
+
+void TorrentClient::schedulePieceForClient(PeerWireClient *client)
+{
+    // Only schedule connected clients.
+    if (client->state() != QTcpSocket::ConnectedState)
+        return;
+
+    // The peer has choked us; try again later.
+    if (client->peerWireState() & PeerWireClient::ChokedByPeer)
+        return;
+
+    // Make a list of all the client's pending pieces, and count how
+    // many blocks have been requested.
+    QList<int> currentPieces;
+    bool somePiecesAreNotInProgress = false;
+    TorrentPiece *lastPendingPiece = 0;
+    QMultiMap<PeerWireClient *, TorrentPiece *>::Iterator it = d->payloads.find(client);
+    while (it != d->payloads.end() && it.key() == client) {
+        lastPendingPiece = it.value();
+        if (lastPendingPiece->inProgress) {
+            currentPieces << lastPendingPiece->index;
+        } else {
+            somePiecesAreNotInProgress = true;
+        }
+        ++it;
+    }
+
+    // Skip clients that already have too many blocks in progress.
+    if (client->incomingBlocks().size() >= ((d->state == Endgame || d->state == WarmingUp)
+                                            ? MaxBlocksInMultiMode : MaxBlocksInProgress))
+        return;
+
+    // If all pieces are in progress, but we haven't filled up our
+    // block requesting quota, then we need to schedule another piece.
+    if (!somePiecesAreNotInProgress || client->incomingBlocks().size() > 0)
+        lastPendingPiece = 0;
+    TorrentPiece *piece = lastPendingPiece;
+
+    // In warmup state, all clients request blocks from the same pieces.
+    if (d->state == WarmingUp && d->pendingPieces.size() >= 4) {
+        piece = d->payloads.value(client);
+        if (!piece) {
+            QList<TorrentPiece *> values = d->pendingPieces.values();
+            piece = values.value(qrand() % values.size());
+            piece->inProgress = true;
+            d->payloads.insert(client, piece);
+        }
+        if (piece->completedBlocks.count(false) == client->incomingBlocks().size())
+            return;
+    }
+
+    // If no pieces are currently in progress, schedule a new one.
+    if (!piece) {
+        // Build up a list of what pieces that we have not completed
+        // are available to this client.
+        QBitArray incompletePiecesAvailableToClient = d->incompletePieces;
+
+        // Remove all pieces that are marked as being in progress
+        // already (i.e., pieces that this or other clients are
+        // already waiting for). A special rule applies to warmup and
+        // endgame mode; there, we allow several clients to request
+        // the same piece. In endgame mode, this only applies to
+        // clients that are currently uploading (more than 1.0KB/s).
+        if ((d->state == Endgame && client->uploadSpeed() < 1024) || d->state != WarmingUp) {
+            QMap<int, TorrentPiece *>::ConstIterator it = d->pendingPieces.constBegin();
+            while (it != d->pendingPieces.constEnd()) {
+                if (it.value()->inProgress)
+                    incompletePiecesAvailableToClient.clearBit(it.key());
+                ++it;
+            }
+        }
+
+        // Remove all pieces that the client cannot download.
+        incompletePiecesAvailableToClient &= client->availablePieces();
+
+        // Remove all pieces that this client has already requested.
+        foreach (int i, currentPieces)
+            incompletePiecesAvailableToClient.clearBit(i);
+
+        // Only continue if more pieces can be scheduled. If no pieces
+        // are available and no blocks are in progress, just leave
+        // the connection idle; it might become interesting later.
+        if (incompletePiecesAvailableToClient.count(true) == 0)
+            return;
+
+        // Check if any of the partially completed pieces can be
+        // recovered, and if so, pick a random one of them.
+        QList<TorrentPiece *> partialPieces;
+        QMap<int, TorrentPiece *>::ConstIterator it = d->pendingPieces.constBegin();
+        while (it != d->pendingPieces.constEnd()) {
+            TorrentPiece *tmp = it.value();
+            if (incompletePiecesAvailableToClient.testBit(it.key())) {
+                if (!tmp->inProgress || d->state == WarmingUp || d->state == Endgame) {
+                    partialPieces << tmp;
+                    break;
+                }
+            }
+            ++it;
+        }
+        if (!partialPieces.isEmpty())
+            piece = partialPieces.value(qrand() % partialPieces.size());
+
+        if (!piece) {
+            // Pick a random piece 3 out of 4 times; otherwise, pick either
+            // one of the most common or the least common pieces available,
+            // depending on the state we're in.
+            int pieceIndex = 0;
+            if (d->state == WarmingUp || (qrand() & 4) == 0) {
+                int *occurrances = new int[d->pieceCount];
+                memset(occurrances, 0, d->pieceCount * sizeof(int));
+                
+                // Count how many of each piece are available.
+                foreach (PeerWireClient *peer, d->connections) {
+                    QBitArray peerPieces = peer->availablePieces();
+                    int peerPiecesSize = peerPieces.size();
+                    for (int i = 0; i < peerPiecesSize; ++i) {
+                        if (peerPieces.testBit(i))
+                            ++occurrances[i];
+                    }
+                }
+
+                // Find the rarest or most common pieces.
+                int numOccurrances = d->state == WarmingUp ? 0 : 99999;
+                QList<int> piecesReadyForDownload;
+                for (int i = 0; i < d->pieceCount; ++i) {
+                    if (d->state == WarmingUp) {
+                        // Add common pieces
+                        if (occurrances[i] >= numOccurrances
+                            && incompletePiecesAvailableToClient.testBit(i)) {
+                            if (occurrances[i] > numOccurrances)
+                                piecesReadyForDownload.clear();
+                            piecesReadyForDownload.append(i);
+                            numOccurrances = occurrances[i];
+                        }
+                    } else {
+                        // Add rare pieces
+                        if (occurrances[i] <= numOccurrances
+                            && incompletePiecesAvailableToClient.testBit(i)) {
+                            if (occurrances[i] < numOccurrances)
+                                piecesReadyForDownload.clear();
+                            piecesReadyForDownload.append(i);
+                            numOccurrances = occurrances[i];
+                        }
+                    }
+                }
+
+                // Select one piece randomly
+                pieceIndex = piecesReadyForDownload.at(qrand() % piecesReadyForDownload.size());
+                delete [] occurrances;
+            } else {
+                // Make up a list of available piece indices, and pick
+                // a random one.
+                QList<int> values;
+                int incompletePiecesAvailableToClientSize = incompletePiecesAvailableToClient.size();
+                for (int i = 0; i < incompletePiecesAvailableToClientSize; ++i) {
+                    if (incompletePiecesAvailableToClient.testBit(i))
+                        values << i;
+                }
+                pieceIndex = values.at(qrand() % values.size());
+            }
+
+            // Create a new TorrentPiece and fill in all initial
+            // properties.
+            piece = new TorrentPiece;
+            piece->index = pieceIndex;
+            piece->length = d->fileManager.pieceLengthAt(pieceIndex);
+            int numBlocks = piece->length / BlockSize;
+            if (piece->length % BlockSize)
+                ++numBlocks;
+            piece->completedBlocks.resize(numBlocks);
+            piece->requestedBlocks.resize(numBlocks);
+            d->pendingPieces.insert(pieceIndex, piece);
+        }
+
+        piece->inProgress = true;
+        d->payloads.insert(client, piece);
+    }
+
+    // Request more blocks from all pending pieces.
+    requestMore(client);
+}
+
+void TorrentClient::requestMore(PeerWireClient *client)
+{
+    // Make a list of all pieces this client is currently waiting for,
+    // and count the number of blocks in progress.
+    QMultiMap<PeerWireClient *, TorrentPiece *>::Iterator it = d->payloads.find(client);
+    int numBlocksInProgress = client->incomingBlocks().size();
+    QList<TorrentPiece *> piecesInProgress;
+    while (it != d->payloads.end() && it.key() == client) {
+        TorrentPiece *piece = it.value();
+        if (piece->inProgress || (d->state == WarmingUp || d->state == Endgame))
+            piecesInProgress << piece;
+        ++it;
+    }
+
+    // If no pieces are in progress, call the scheduler.
+    if (piecesInProgress.isEmpty() && d->incompletePieces.count(true)) {
+        d->callScheduler();
+        return;
+    }
+
+    // If too many pieces are in progress, there's nothing to do.
+    int maxInProgress = ((d->state == Endgame || d->state == WarmingUp)
+                         ? MaxBlocksInMultiMode : MaxBlocksInProgress);
+    if (numBlocksInProgress == maxInProgress)
+        return;
+    
+    // Starting with the first piece that we're waiting for, request
+    // blocks until the quota is filled up.
+    foreach (TorrentPiece *piece, piecesInProgress) {
+        numBlocksInProgress += requestBlocks(client, piece, maxInProgress - numBlocksInProgress);
+        if (numBlocksInProgress == maxInProgress)
+            break;
+    }
+
+    // If we still didn't fill up the quota, we need to schedule more
+    // pieces.
+    if (numBlocksInProgress < maxInProgress && d->state != WarmingUp)
+        d->callScheduler();
+}
+
+int TorrentClient::requestBlocks(PeerWireClient *client, TorrentPiece *piece, int maxBlocks)
+{
+    // Generate the list of incomplete blocks for this piece.
+    QVector<int> bits;
+    int completedBlocksSize = piece->completedBlocks.size();
+    for (int i = 0; i < completedBlocksSize; ++i) {
+        if (!piece->completedBlocks.testBit(i) && !piece->requestedBlocks.testBit(i))
+            bits << i;
+    }
+
+    // Nothing more to request.
+    if (bits.size() == 0) {
+        if (d->state != WarmingUp && d->state != Endgame)
+            return 0;
+        bits.clear();
+        for (int i = 0; i < completedBlocksSize; ++i) {
+            if (!piece->completedBlocks.testBit(i))
+                bits << i;
+        }
+    }
+
+    if (d->state == WarmingUp || d->state == Endgame) {
+        // By randomizing the list of blocks to request, we
+        // significantly speed up the warmup and endgame modes, where
+        // the same blocks are requested from multiple peers. The
+        // speedup comes from an increased chance of receiving
+        // different blocks from the different peers.
+        for (int i = 0; i < bits.size(); ++i) {
+            int a = qrand() % bits.size();
+            int b = qrand() % bits.size();
+            int tmp = bits[a];
+            bits[a] = bits[b];
+            bits[b] = tmp;
+        }
+    }
+
+    // Request no more blocks than we've been asked to.
+    int blocksToRequest = qMin(maxBlocks, bits.size());
+
+    // Calculate the offset and size of each block, and send requests.
+    for (int i = 0; i < blocksToRequest; ++i) {
+        int blockSize = BlockSize;
+        if ((piece->length % BlockSize) && bits.at(i) == completedBlocksSize - 1)
+            blockSize = piece->length % BlockSize;
+        client->requestBlock(piece->index, bits.at(i) * BlockSize, blockSize);
+        piece->requestedBlocks.setBit(bits.at(i));
+    }
+
+    return blocksToRequest;
+}
+
+void TorrentClient::peerChoked()
+{
+    PeerWireClient *client = qobject_cast<PeerWireClient *>(sender());
+    if (!client)
+        return;
+
+    // When the peer chokes us, we immediately forget about all blocks
+    // we've requested from it. We also remove the piece from out
+    // payload, making it available to other clients.
+    QMultiMap<PeerWireClient *, TorrentPiece *>::Iterator it = d->payloads.find(client);
+    while (it != d->payloads.end() && it.key() == client) {
+        it.value()->inProgress = false;
+        it.value()->requestedBlocks.fill(false);
+        it = d->payloads.erase(it);
+    }
+}
+
+void TorrentClient::peerUnchoked()
+{
+    PeerWireClient *client = qobject_cast<PeerWireClient *>(sender());
+    if (!client)
+        return;
+
+    // We got unchoked, which means we can request more blocks.
+    if (d->state != Seeding)
+        d->callScheduler();
+}
+
+void TorrentClient::addToPeerList(const QList<TorrentPeer> &peerList)
+{
+    // Add peers we don't already know of to our list of peers.
+    QList<QHostAddress> addresses =  QNetworkInterface::allAddresses();
+    foreach (TorrentPeer peer, peerList) {
+        if (addresses.contains(peer.address)
+            && peer.port == TorrentServer::instance()->serverPort()) {
+            // Skip our own server.
+            continue;
+        }
+		
+        bool known = false;
+        foreach (TorrentPeer *knownPeer, d->peers) {
+            if (knownPeer->port == peer.port
+                && knownPeer->address == peer.address) {
+                known = true;
+                break;
+            }
+        }
+        if (!known) {
+            TorrentPeer *newPeer = new TorrentPeer;
+            *newPeer = peer;
+            newPeer->interesting = true;
+            newPeer->seed = false;
+            newPeer->lastVisited = 0;
+            newPeer->connectStart = 0;
+            newPeer->connectTime = 999999;
+            newPeer->pieces.resize(d->pieceCount);
+            newPeer->numCompletedPieces = 0;
+            d->peers << newPeer;
+        }
+    }
+
+    // If we've got more peers than we can connect to, we remove some
+    // of the peers that have no (or low) activity.
+    int maxPeers = ConnectionManager::instance()->maxConnections() * 3;
+    if (d->peers.size() > maxPeers) {
+        // Find what peers are currently connected & active
+        QSet<TorrentPeer *> activePeers;
+        foreach (TorrentPeer *peer, d->peers) {
+            foreach (PeerWireClient *client, d->connections) {
+                if (client->peer() == peer && (client->downloadSpeed() + client->uploadSpeed()) > 1024)
+                    activePeers << peer;
+            }
+        }
+
+        // Remove inactive peers from the peer list until we're below
+        // the max connections count.
+        QList<int> toRemove;
+        for (int i = 0; i < d->peers.size() && (d->peers.size() - toRemove.size()) > maxPeers; ++i) {
+            if (!activePeers.contains(d->peers.at(i)))
+                toRemove << i;
+        }
+        QListIterator<int> toRemoveIterator(toRemove);
+        toRemoveIterator.toBack();
+        while (toRemoveIterator.hasPrevious())
+            d->peers.removeAt(toRemoveIterator.previous());
+
+        // If we still have too many peers, remove the oldest ones.
+        while (d->peers.size() > maxPeers)
+            d->peers.takeFirst();
+    }
+
+    if (d->state != Paused && d->state != Stopping && d->state != Idle) {
+        if (d->state == Searching || d->state == WarmingUp)
+            connectToPeers();
+        else
+            d->callPeerConnector();
+    }
+}
+
+void TorrentClient::trackerStopped()
+{
+    d->setState(Idle);
+    emit stopped();
+}
+
+void TorrentClient::updateProgress(int progress)
+{
+    if (progress == -1 && d->pieceCount > 0) {
+        int newProgress = (d->completedPieces.count(true) * 100) / d->pieceCount;
+        if (d->lastProgressValue != newProgress) {
+            d->lastProgressValue = newProgress;
+            emit progressUpdated(newProgress);
+        }
+    } else if (d->lastProgressValue != progress) {
+        d->lastProgressValue = progress;
+        emit progressUpdated(progress);
+    }
+}
diff --git a/examples/network/torrent/torrentclient.h b/examples/network/torrent/torrentclient.h
new file mode 100644
index 0000000000..6caaf38deb
--- /dev/null
+++ b/examples/network/torrent/torrentclient.h
@@ -0,0 +1,205 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TORRENTCLIENT_H
+#define TORRENTCLIENT_H
+
+#include <QBitArray>
+#include <QHostAddress>
+#include <QList>
+
+class MetaInfo;
+class PeerWireClient;
+class TorrentClientPrivate;
+class TorrentPeer;
+class TorrentPiece;
+QT_BEGIN_NAMESPACE
+class QTimerEvent;
+QT_END_NAMESPACE
+
+class TorrentPeer {
+public:
+    QHostAddress address;
+    quint16 port;
+    QString id;
+    bool interesting;
+    bool seed;
+    uint lastVisited;
+    uint connectStart;
+    uint connectTime;
+    QBitArray pieces;
+    int numCompletedPieces;
+
+    inline bool operator==(const TorrentPeer &other)
+    {
+        return port == other.port
+            && address == other.address
+            && id == other.id;
+    }
+};
+
+class TorrentClient : public QObject
+{
+    Q_OBJECT
+
+public:
+    enum State {
+        Idle,
+        Paused,
+        Stopping,
+        Preparing,
+        Searching,
+        Connecting,
+        WarmingUp,
+        Downloading,
+        Endgame,
+        Seeding
+    };
+    enum Error {
+        UnknownError,
+        TorrentParseError,
+        InvalidTrackerError,
+        FileError,
+        ServerError
+    };
+
+    TorrentClient(QObject *parent = 0);
+    ~TorrentClient();
+
+    bool setTorrent(const QString &fileName);
+    bool setTorrent(const QByteArray &torrentData);
+    MetaInfo metaInfo() const;
+
+    void setMaxConnections(int connections);
+    int maxConnections() const;
+
+    void setDestinationFolder(const QString &directory);
+    QString destinationFolder() const;
+
+    void setDumpedState(const QByteArray &dumpedState);
+    QByteArray dumpedState() const;
+
+    // Progress and stats for download feedback.
+    qint64 progress() const;
+    void setDownloadedBytes(qint64 bytes);
+    qint64 downloadedBytes() const;
+    void setUploadedBytes(qint64 bytes);
+    qint64 uploadedBytes() const;
+    int connectedPeerCount() const;
+    int seedCount() const;
+   
+    // Accessors for the tracker
+    QByteArray peerId() const;
+    QByteArray infoHash() const;
+    quint16 serverPort() const;
+
+    // State and error.
+    State state() const;
+    QString stateString() const;
+    Error error() const;
+    QString errorString() const;
+
+signals:
+    void stateChanged(TorrentClient::State state);
+    void error(TorrentClient::Error error);
+
+    void downloadCompleted();
+    void peerInfoUpdated();
+    
+    void dataSent(int uploadedBytes);
+    void dataReceived(int downloadedBytes);
+    void progressUpdated(int percentProgress);
+    void downloadRateUpdated(int bytesPerSecond);
+    void uploadRateUpdated(int bytesPerSecond);
+
+    void stopped();
+
+public slots:
+    void start();
+    void stop();
+    void setPaused(bool paused);
+    void setupIncomingConnection(PeerWireClient *client);
+
+protected slots:
+    void timerEvent(QTimerEvent *event);
+
+private slots:
+    // File management
+    void sendToPeer(int readId, int pieceIndex, int begin, const QByteArray &data);
+    void fullVerificationDone();
+    void pieceVerified(int pieceIndex, bool ok);
+    void handleFileError();
+
+    // Connection handling
+    void connectToPeers();
+    QList<TorrentPeer *> weighedFreePeers() const;
+    void setupOutgoingConnection();
+    void initializeConnection(PeerWireClient *client);
+    void removeClient();
+    void peerPiecesAvailable(const QBitArray &pieces);
+    void peerRequestsBlock(int pieceIndex, int begin, int length);
+    void blockReceived(int pieceIndex, int begin, const QByteArray &data);
+    void peerWireBytesWritten(qint64 bytes);
+    void peerWireBytesReceived(qint64 bytes);
+    int blocksLeftForPiece(const TorrentPiece *piece) const;
+
+    // Scheduling
+    void scheduleUploads();
+    void scheduleDownloads();
+    void schedulePieceForClient(PeerWireClient *client);
+    void requestMore(PeerWireClient *client);
+    int requestBlocks(PeerWireClient *client, TorrentPiece *piece, int maxBlocks);
+    void peerChoked();
+    void peerUnchoked();
+
+    // Tracker handling
+    void addToPeerList(const QList<TorrentPeer> &peerList);
+    void trackerStopped();
+
+    // Progress
+    void updateProgress(int progress = -1);
+
+private:
+    TorrentClientPrivate *d;
+    friend class TorrentClientPrivate;
+};
+
+#endif
diff --git a/examples/network/torrent/torrentserver.cpp b/examples/network/torrent/torrentserver.cpp
new file mode 100644
index 0000000000..3087d6a02c
--- /dev/null
+++ b/examples/network/torrent/torrentserver.cpp
@@ -0,0 +1,104 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "connectionmanager.h"
+#include "peerwireclient.h"
+#include "ratecontroller.h"
+#include "torrentclient.h"
+#include "torrentserver.h"
+
+Q_GLOBAL_STATIC(TorrentServer, torrentServer)
+
+TorrentServer *TorrentServer::instance()
+{
+    return torrentServer();
+}
+
+void TorrentServer::addClient(TorrentClient *client)
+{
+    clients << client;
+}
+
+void TorrentServer::removeClient(TorrentClient *client)
+{
+    clients.removeAll(client);
+}
+
+void TorrentServer::incomingConnection(int socketDescriptor)
+{
+    PeerWireClient *client =
+  	new PeerWireClient(ConnectionManager::instance()->clientId(), this);
+
+    if (client->setSocketDescriptor(socketDescriptor)) {
+        if (ConnectionManager::instance()->canAddConnection() && !clients.isEmpty()) {
+            connect(client, SIGNAL(infoHashReceived(const QByteArray &)),
+                    this, SLOT(processInfoHash(const QByteArray &)));
+            connect(client, SIGNAL(error(QAbstractSocket::SocketError)),
+                    this, SLOT(removeClient()));
+            RateController::instance()->addSocket(client);
+            ConnectionManager::instance()->addConnection(client);
+            return;
+        }
+    }
+    client->abort();
+    delete client;
+}
+
+void TorrentServer::removeClient()
+{
+    PeerWireClient *peer = qobject_cast<PeerWireClient *>(sender());
+    RateController::instance()->removeSocket(peer);
+    ConnectionManager::instance()->removeConnection(peer);
+    peer->deleteLater();
+}
+
+void TorrentServer::processInfoHash(const QByteArray &infoHash)
+{
+    PeerWireClient *peer = qobject_cast<PeerWireClient *>(sender());
+    foreach (TorrentClient *client, clients) {
+        if (client->state() >= TorrentClient::Searching && client->infoHash() == infoHash) {
+            peer->disconnect(peer, 0, this, 0);
+            client->setupIncomingConnection(peer);
+            return;
+        }
+    }
+    removeClient();
+}
diff --git a/examples/network/torrent/torrentserver.h b/examples/network/torrent/torrentserver.h
new file mode 100644
index 0000000000..6ae89e1b92
--- /dev/null
+++ b/examples/network/torrent/torrentserver.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TORRENTSERVER_H
+#define TORRENTSERVER_H
+
+#include <QList>
+#include <QTcpServer>
+
+class TorrentClient;
+
+class TorrentServer : public QTcpServer
+{
+    Q_OBJECT
+
+public:
+    inline TorrentServer() {}
+    static TorrentServer *instance();
+
+    void addClient(TorrentClient *client);
+    void removeClient(TorrentClient *client);
+
+protected:
+    void incomingConnection(int socketDescriptor);
+
+private slots:
+    void removeClient();
+    void processInfoHash(const QByteArray &infoHash);
+
+private:
+    QList<TorrentClient *> clients;
+};
+
+#endif
diff --git a/examples/network/torrent/trackerclient.cpp b/examples/network/torrent/trackerclient.cpp
new file mode 100644
index 0000000000..bda8140058
--- /dev/null
+++ b/examples/network/torrent/trackerclient.cpp
@@ -0,0 +1,237 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "bencodeparser.h"
+#include "connectionmanager.h"
+#include "torrentclient.h"
+#include "torrentserver.h"
+#include "trackerclient.h"
+
+#include <QtCore>
+
+TrackerClient::TrackerClient(TorrentClient *downloader, QObject *parent)
+    : QObject(parent), torrentDownloader(downloader)
+{
+    length = 0;
+    requestInterval = 5 * 60;
+    requestIntervalTimer = -1;
+    firstTrackerRequest = true;
+    lastTrackerRequest = false;
+    firstSeeding = true;
+
+    connect(&http, SIGNAL(done(bool)), this, SLOT(httpRequestDone(bool)));
+}
+
+void TrackerClient::start(const MetaInfo &info)
+{
+    metaInfo = info;
+    QTimer::singleShot(0, this, SLOT(fetchPeerList()));
+
+    if (metaInfo.fileForm() == MetaInfo::SingleFileForm) {
+        length = metaInfo.singleFile().length;
+    } else {
+        QList<MetaInfoMultiFile> files = metaInfo.multiFiles();
+        for (int i = 0; i < files.size(); ++i)
+            length += files.at(i).length;
+    }
+}
+
+void TrackerClient::startSeeding()
+{
+    firstSeeding = true;
+    fetchPeerList();
+}
+
+void TrackerClient::stop()
+{
+    lastTrackerRequest = true;
+    http.abort();
+    fetchPeerList();
+}
+
+void TrackerClient::timerEvent(QTimerEvent *event)
+{
+    if (event->timerId() == requestIntervalTimer) {
+        if (http.state() == QHttp::Unconnected)
+            fetchPeerList();
+    } else {
+        QObject::timerEvent(event);
+    }
+}
+
+void TrackerClient::fetchPeerList()
+{
+    // Prepare connection details
+    QString fullUrl = metaInfo.announceUrl();
+    QUrl url(fullUrl);
+    QString passkey = "?";
+    if (fullUrl.contains("?passkey")) {
+        passkey = metaInfo.announceUrl().mid(fullUrl.indexOf("?passkey"), -1);
+        passkey += "&";
+    }
+
+    // Percent encode the hash
+    QByteArray infoHash = torrentDownloader->infoHash();
+    QString encodedSum;
+    for (int i = 0; i < infoHash.size(); ++i) {
+        encodedSum += '%';
+        encodedSum += QString::number(infoHash[i], 16).right(2).rightJustified(2, '0');
+    }
+
+    bool seeding = (torrentDownloader->state() == TorrentClient::Seeding);
+    QByteArray query;
+    query += url.path().toLatin1();
+    query += passkey;
+    query += "info_hash=" + encodedSum;
+    query += "&peer_id=" + ConnectionManager::instance()->clientId();
+    query += "&port=" + QByteArray::number(TorrentServer::instance()->serverPort());
+    query += "&compact=1";
+    query += "&uploaded=" + QByteArray::number(torrentDownloader->uploadedBytes());
+
+    if (!firstSeeding) {
+        query += "&downloaded=0";
+        query += "&left=0";
+    } else {
+        query += "&downloaded=" + QByteArray::number(
+            torrentDownloader->downloadedBytes());
+        int left = qMax<int>(0, metaInfo.totalSize() - torrentDownloader->downloadedBytes());
+        query += "&left=" + QByteArray::number(seeding ? 0 : left);
+    }
+
+    if (seeding && firstSeeding) {
+        query += "&event=completed";
+        firstSeeding = false;
+    } else if (firstTrackerRequest) {
+        firstTrackerRequest = false;
+        query += "&event=started";
+    } else if(lastTrackerRequest) {
+        query += "&event=stopped";
+    }
+
+    if (!trackerId.isEmpty())
+        query += "&trackerid=" + trackerId;
+
+    http.setHost(url.host(), url.port() == -1 ? 80 : url.port());
+    if (!url.userName().isEmpty())
+        http.setUser(url.userName(), url.password());
+    http.get(query);
+}
+
+void TrackerClient::httpRequestDone(bool error)
+{
+    if (lastTrackerRequest) {
+        emit stopped();
+        return;
+    }
+
+    if (error) {
+        emit connectionError(http.error());
+        return;
+    }
+
+    QByteArray response = http.readAll();
+    http.abort();
+
+    BencodeParser parser;
+    if (!parser.parse(response)) {
+        qWarning("Error parsing bencode response from tracker: %s",
+                 qPrintable(parser.errorString()));
+        http.abort();
+        return;
+    }
+
+    QMap<QByteArray, QVariant> dict = parser.dictionary();
+
+    if (dict.contains("failure reason")) {
+        // no other items are present
+        emit failure(QString::fromUtf8(dict.value("failure reason").toByteArray()));
+        return;
+    }
+
+    if (dict.contains("warning message")) {
+        // continue processing
+        emit warning(QString::fromUtf8(dict.value("warning message").toByteArray()));
+    }
+
+    if (dict.contains("tracker id")) {
+        // store it
+        trackerId = dict.value("tracker id").toByteArray();
+    }
+
+    if (dict.contains("interval")) {
+        // Mandatory item
+        if (requestIntervalTimer != -1)
+            killTimer(requestIntervalTimer);
+        requestIntervalTimer = startTimer(dict.value("interval").toInt() * 1000);
+    }
+
+    if (dict.contains("peers")) {
+        // store it
+        peers.clear();
+        QVariant peerEntry = dict.value("peers");
+        if (peerEntry.type() == QVariant::List) {
+            QList<QVariant> peerTmp = peerEntry.toList();
+            for (int i = 0; i < peerTmp.size(); ++i) {
+                TorrentPeer tmp;
+                QMap<QByteArray, QVariant> peer = qVariantValue<QMap<QByteArray, QVariant> >(peerTmp.at(i));
+                tmp.id = QString::fromUtf8(peer.value("peer id").toByteArray());
+                tmp.address.setAddress(QString::fromUtf8(peer.value("ip").toByteArray()));
+                tmp.port = peer.value("port").toInt();
+                peers << tmp;
+            }
+        } else {
+            QByteArray peerTmp = peerEntry.toByteArray();
+            for (int i = 0; i < peerTmp.size(); i += 6) {
+                TorrentPeer tmp;
+                uchar *data = (uchar *)peerTmp.constData() + i;
+                tmp.port = (int(data[4]) << 8) + data[5];
+                uint ipAddress = 0;
+                ipAddress += uint(data[0]) << 24;
+                ipAddress += uint(data[1]) << 16;
+                ipAddress += uint(data[2]) << 8;
+                ipAddress += uint(data[3]);
+                tmp.address.setAddress(ipAddress);
+                peers << tmp;
+            }
+        }
+        emit peerListUpdated(peers);
+    }
+}
diff --git a/examples/network/torrent/trackerclient.h b/examples/network/torrent/trackerclient.h
new file mode 100644
index 0000000000..f1ce37dbf5
--- /dev/null
+++ b/examples/network/torrent/trackerclient.h
@@ -0,0 +1,104 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TRACKERCLIENT_H
+#define TRACKERCLIENT_H
+
+#include <QByteArray>
+#include <QList>
+#include <QObject>
+#include <QHostAddress>
+#include <QHttp>
+
+#include "metainfo.h"
+#include "torrentclient.h"
+
+class TorrentClient;
+
+class TrackerClient : public QObject
+{
+    Q_OBJECT
+
+public:
+    TrackerClient(TorrentClient *downloader, QObject *parent = 0);
+
+    void start(const MetaInfo &info);
+    void stop();
+    void startSeeding();
+
+signals:
+    void connectionError(QHttp::Error error);
+
+    void failure(const QString &reason);
+    void warning(const QString &message);
+    void peerListUpdated(const QList<TorrentPeer> &peerList);
+
+    void uploadCountUpdated(qint64 newUploadCount);
+    void downloadCountUpdated(qint64 newDownloadCount);
+    
+    void stopped();
+
+protected:
+    void timerEvent(QTimerEvent *event);
+
+private slots:
+    void fetchPeerList();
+    void httpRequestDone(bool error);
+
+private:
+    TorrentClient *torrentDownloader;
+
+    int requestInterval;
+    int requestIntervalTimer;
+    QHttp http;
+    MetaInfo metaInfo;
+    QByteArray trackerId;
+    QList<TorrentPeer> peers;
+    qint64 uploadedBytes;
+    qint64 downloadedBytes;
+    qint64 length;
+    
+    bool firstTrackerRequest;
+    bool lastTrackerRequest;
+    bool firstSeeding;
+};
+
+#endif
diff --git a/examples/opengl/2dpainting/2dpainting.pro b/examples/opengl/2dpainting/2dpainting.pro
new file mode 100644
index 0000000000..c45b764e12
--- /dev/null
+++ b/examples/opengl/2dpainting/2dpainting.pro
@@ -0,0 +1,17 @@
+QT          += opengl
+
+HEADERS     = glwidget.h \
+              helper.h \
+              widget.h \
+              window.h
+SOURCES     = glwidget.cpp \
+              helper.cpp \
+              main.cpp \
+              widget.cpp \
+              window.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/2dpainting
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 2dpainting.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/2dpainting
+INSTALLS += target sources
diff --git a/examples/opengl/2dpainting/glwidget.cpp b/examples/opengl/2dpainting/glwidget.cpp
new file mode 100644
index 0000000000..d5f63d2f17
--- /dev/null
+++ b/examples/opengl/2dpainting/glwidget.cpp
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "glwidget.h"
+#include "helper.h"
+
+//! [0]
+GLWidget::GLWidget(Helper *helper, QWidget *parent)
+    : QGLWidget(QGLFormat(QGL::SampleBuffers), parent), helper(helper)
+{
+    elapsed = 0;
+    setFixedSize(200, 200);
+    setAutoFillBackground(false);
+}
+//! [0]
+
+//! [1]
+void GLWidget::animate()
+{
+    elapsed = (elapsed + qobject_cast<QTimer*>(sender())->interval()) % 1000;
+    repaint();
+}
+//! [1]
+
+//! [2]
+void GLWidget::paintEvent(QPaintEvent *event)
+{
+    QPainter painter;
+    painter.begin(this);
+    painter.setRenderHint(QPainter::Antialiasing);
+    helper->paint(&painter, event, elapsed);
+    painter.end();
+}
+//! [2]
diff --git a/examples/opengl/2dpainting/glwidget.h b/examples/opengl/2dpainting/glwidget.h
new file mode 100644
index 0000000000..f3a9bd5cd7
--- /dev/null
+++ b/examples/opengl/2dpainting/glwidget.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GLWIDGET_H
+#define GLWIDGET_H
+
+#include <QGLWidget>
+
+//! [0]
+class Helper;
+QT_BEGIN_NAMESPACE
+class QPaintEvent;
+class QWidget;
+QT_END_NAMESPACE
+
+class GLWidget : public QGLWidget
+{
+    Q_OBJECT
+
+public:
+    GLWidget(Helper *helper, QWidget *parent);
+
+public slots:
+    void animate();
+
+protected:
+    void paintEvent(QPaintEvent *event);
+
+private:
+    Helper *helper;
+    int elapsed;
+};
+//! [0]
+
+#endif
diff --git a/examples/opengl/2dpainting/helper.cpp b/examples/opengl/2dpainting/helper.cpp
new file mode 100644
index 0000000000..8796d87b8e
--- /dev/null
+++ b/examples/opengl/2dpainting/helper.cpp
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "helper.h"
+
+//! [0]
+Helper::Helper()
+{
+    QLinearGradient gradient(QPointF(50, -20), QPointF(80, 20));
+    gradient.setColorAt(0.0, Qt::white);
+    gradient.setColorAt(1.0, QColor(0xa6, 0xce, 0x39));
+
+    background = QBrush(QColor(64, 32, 64));
+    circleBrush = QBrush(gradient);
+    circlePen = QPen(Qt::black);
+    circlePen.setWidth(1);
+    textPen = QPen(Qt::white);
+    textFont.setPixelSize(50);
+}
+//! [0]
+
+//! [1]
+void Helper::paint(QPainter *painter, QPaintEvent *event, int elapsed)
+{
+    painter->fillRect(event->rect(), background);
+    painter->translate(100, 100);
+//! [1]
+
+//! [2]
+    painter->save();
+    painter->setBrush(circleBrush);
+    painter->setPen(circlePen);
+    painter->rotate(elapsed * 0.030);
+
+    qreal r = elapsed/1000.0;
+    int n = 30;
+    for (int i = 0; i < n; ++i) {
+        painter->rotate(30);
+        qreal radius = 0 + 120.0*((i+r)/n);
+        qreal circleRadius = 1 + ((i+r)/n)*20;
+        painter->drawEllipse(QRectF(radius, -circleRadius,
+                                    circleRadius*2, circleRadius*2));
+    }
+    painter->restore();
+//! [2]
+
+//! [3]
+    painter->setPen(textPen);
+    painter->setFont(textFont);
+    painter->drawText(QRect(-50, -50, 100, 100), Qt::AlignCenter, "Qt");
+}
+//! [3]
diff --git a/examples/opengl/2dpainting/helper.h b/examples/opengl/2dpainting/helper.h
new file mode 100644
index 0000000000..1d63cc95e2
--- /dev/null
+++ b/examples/opengl/2dpainting/helper.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef HELPER_H
+#define HELPER_H
+
+#include <QBrush>
+#include <QFont>
+#include <QPen>
+
+QT_BEGIN_NAMESPACE
+class QPainter;
+class QPaintEvent;
+QT_END_NAMESPACE
+
+//! [0]
+class Helper
+{
+public:
+    Helper();
+
+public:
+    void paint(QPainter *painter, QPaintEvent *event, int elapsed);
+
+private:
+    QBrush background;
+    QBrush circleBrush;
+    QFont textFont;
+    QPen circlePen;
+    QPen textPen;
+};
+//! [0]
+
+#endif
diff --git a/examples/opengl/2dpainting/main.cpp b/examples/opengl/2dpainting/main.cpp
new file mode 100644
index 0000000000..58c970581e
--- /dev/null
+++ b/examples/opengl/2dpainting/main.cpp
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include "window.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Window window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/opengl/2dpainting/widget.cpp b/examples/opengl/2dpainting/widget.cpp
new file mode 100644
index 0000000000..89d46083ed
--- /dev/null
+++ b/examples/opengl/2dpainting/widget.cpp
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "widget.h"
+#include "helper.h"
+
+
+//! [0]
+Widget::Widget(Helper *helper, QWidget *parent)
+    : QWidget(parent), helper(helper)
+{
+    elapsed = 0;
+    setFixedSize(200, 200);
+}
+//! [0]
+
+//! [1]
+void Widget::animate()
+{
+    elapsed = (elapsed + qobject_cast<QTimer*>(sender())->interval()) % 1000;
+    repaint();
+}
+//! [1]
+
+//! [2]
+void Widget::paintEvent(QPaintEvent *event)
+{
+    QPainter painter;
+    painter.begin(this);
+    painter.setRenderHint(QPainter::Antialiasing);
+    helper->paint(&painter, event, elapsed);
+    painter.end();
+}
+//! [2]
diff --git a/examples/opengl/2dpainting/widget.h b/examples/opengl/2dpainting/widget.h
new file mode 100644
index 0000000000..f88c676d5e
--- /dev/null
+++ b/examples/opengl/2dpainting/widget.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WIDGET_H
+#define WIDGET_H
+
+#include <QWidget>
+
+//! [0]
+class Helper;
+QT_BEGIN_NAMESPACE
+class QPaintEvent;
+QT_END_NAMESPACE
+
+class Widget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Widget(Helper *helper, QWidget *parent);
+
+public slots:
+    void animate();
+
+protected:
+    void paintEvent(QPaintEvent *event);
+
+private:
+    Helper *helper;
+    int elapsed;
+};
+//! [0]
+
+#endif
diff --git a/examples/opengl/2dpainting/window.cpp b/examples/opengl/2dpainting/window.cpp
new file mode 100644
index 0000000000..f55e90ea4f
--- /dev/null
+++ b/examples/opengl/2dpainting/window.cpp
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "glwidget.h"
+#include "widget.h"
+#include "window.h"
+
+//! [0]
+Window::Window()
+    : QWidget()
+{
+    Widget *native = new Widget(&helper, this);
+    GLWidget *openGL = new GLWidget(&helper, this);
+    QLabel *nativeLabel = new QLabel(tr("Native"));
+    nativeLabel->setAlignment(Qt::AlignHCenter);
+    QLabel *openGLLabel = new QLabel(tr("OpenGL"));
+    openGLLabel->setAlignment(Qt::AlignHCenter);
+
+    QGridLayout *layout = new QGridLayout;
+    layout->addWidget(native, 0, 0);
+    layout->addWidget(openGL, 0, 1);
+    layout->addWidget(nativeLabel, 1, 0);
+    layout->addWidget(openGLLabel, 1, 1);
+    setLayout(layout);
+
+    QTimer *timer = new QTimer(this);
+    connect(timer, SIGNAL(timeout()), native, SLOT(animate()));
+    connect(timer, SIGNAL(timeout()), openGL, SLOT(animate()));
+    timer->start(50);
+
+    setWindowTitle(tr("2D Painting on Native and OpenGL Widgets"));
+}
+//! [0]
diff --git a/examples/opengl/2dpainting/window.h b/examples/opengl/2dpainting/window.h
new file mode 100644
index 0000000000..84a44403d9
--- /dev/null
+++ b/examples/opengl/2dpainting/window.h
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QWidget>
+
+#include "helper.h"
+
+QT_BEGIN_NAMESPACE
+class QLabel;
+class QWidget;
+QT_END_NAMESPACE
+
+//! [0]
+class Window : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Window();
+
+private:
+    Helper helper;
+};
+//! [0]
+
+#endif
diff --git a/examples/opengl/README b/examples/opengl/README
new file mode 100644
index 0000000000..69bd134246
--- /dev/null
+++ b/examples/opengl/README
@@ -0,0 +1,41 @@
+Qt provides support for integration with OpenGL implementations on all
+platforms, giving developers the opportunity to display hardware accelerated
+3D graphics alongside a more conventional user interface.
+
+These examples demonstrate the basic techniques used to take advantage of
+OpenGL in Qt applications.
+
+
+The example launcher provided with Qt can be used to explore each of the
+examples in this directory.
+
+Documentation for these examples can be found via the Tutorial and Examples
+link in the main Qt documentation.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/opengl/framebufferobject/bubbles.svg b/examples/opengl/framebufferobject/bubbles.svg
new file mode 100644
index 0000000000..65867da2d8
--- /dev/null
+++ b/examples/opengl/framebufferobject/bubbles.svg
@@ -0,0 +1,215 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg width="20cm" height="15cm" viewBox="0 0 800 600"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink/"
+    baseProfile="tiny" version="1.2">
+  <title>Spheres</title>
+  <desc>Semi-transparent bubbles on a colored background.</desc>
+    <defs>
+      <!-- Create radial gradients for each bubble. -->
+      <radialGradient id="blueBubble" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" stop-opacity="1" />
+        <stop offset="25%" stop-color="#cdcdff" stop-opacity=".65" />
+        <stop offset="100%" stop-color="#cdaacd" stop-opacity=".75" />
+      </radialGradient>
+      <radialGradient id="redBubble" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" stop-opacity="1" />
+        <stop offset="25%" stop-color="#ffcdcd" stop-opacity=".65" />
+        <stop offset="100%" stop-color="#bbbb99" stop-opacity=".75" />
+      </radialGradient>
+      <radialGradient id="greenBubble" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" stop-opacity="1" />
+        <stop offset="25%" stop-color="#cdffcd" stop-opacity=".65" />
+        <stop offset="100%" stop-color="#99aaaa" stop-opacity=".75" />
+      </radialGradient>
+      <radialGradient id="yellowBubble" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" stop-opacity="1" />
+        <stop offset="25%" stop-color="#ffffcd" stop-opacity=".65" />
+        <stop offset="100%" stop-color="#bbbbaa" stop-opacity=".75" />
+      </radialGradient>
+      <radialGradient id="background" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="400" fx="250" fy="250">
+        <stop offset="0%" stop-color="#ffffee" />
+        <stop offset="100%" stop-color="#ccccaa" />
+      </radialGradient>
+      <linearGradient id="surface" gradientUnits="userSpaceOnUse"
+                      x1="-100" y1="200" x2="400" y2="200">
+        <stop offset="0%" stop-color="#ffffcc" />
+        <stop offset="100%" stop-color="#bbbb88" />
+      </linearGradient>
+
+      <!-- Create radial gradients for each circle to make them look like
+           spheres. -->
+      <radialGradient id="blueSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="blue" />
+        <stop offset="100%" stop-color="#222244" />
+      </radialGradient>
+      <radialGradient id="redSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="red" />
+        <stop offset="100%" stop-color="#442222" />
+      </radialGradient>
+      <radialGradient id="greenSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="green" />
+        <stop offset="100%" stop-color="#113311" />
+      </radialGradient>
+      <radialGradient id="yellowSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="yellow" />
+        <stop offset="100%" stop-color="#444422" />
+      </radialGradient>
+      <radialGradient id="shadowGrad" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="50">
+        <stop offset="0%" stop-color="black" stop-opacity="1.0" />
+        <stop offset="100%" stop-color="white" stop-opacity="0.0" />
+      </radialGradient>
+
+      <!-- Define a shadow for each sphere. -->
+      <circle id="shadow" fill="url(#shadowGrad)" cx="0" cy="0" r="100" />
+      <g id="bubble">
+        <circle fill="black" cx="0" cy="0" r="50" />
+        <circle fill="#a6ce39" cx="0" cy="0" r="33" />
+        <path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10
+                              L -11,22 L -1,12 Z" />
+        <circle cx="0" cy="0" r="100" />
+      </g>
+    </defs>
+  <g>
+    <rect fill="url(#background)" x="0" y="0" width="800" height="600" />
+  </g>
+
+  <g transform="translate(200,700)">
+    <use xlink:href="#bubble" fill="url(#blueBubble)" />
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="1s" dur="10s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(315,700)">
+    <g transform="scale(0.5,0.5)">
+      <use xlink:href="#bubble" fill="url(#redBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="3s" dur="7s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(80,700)">
+    <g transform="scale(0.65,0.65)">
+      <use xlink:href="#bubble" fill="url(#greenBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="5s" dur="9s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(255,700)">
+    <g transform="scale(0.3,0.3)">
+      <use xlink:href="#bubble" fill="url(#yellowBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="2s" dur="6s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(565,700)">
+    <g transform="scale(0.4,0.4)">
+      <use xlink:href="#bubble" fill="url(#blueBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="4s" dur="8s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(715,700)">
+    <g transform="scale(0.6,0.6)">
+      <use xlink:href="#bubble" fill="url(#redBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="1s" dur="4s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(645,700)">
+    <g transform="scale(0.375,0.375)">
+      <use xlink:href="#bubble" fill="url(#greenBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="0s" dur="11s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(555,700)">
+    <g transform="scale(0.9,0.9)">
+      <use xlink:href="#bubble" fill="url(#yellowBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="3s" dur="7.5s" fill="freeze" repeatCount="indefinite" />
+  </g>
+
+  <g transform="translate(360,700)">
+    <g transform="scale(0.5,0.5)">
+      <use xlink:href="#bubble" fill="url(#blueBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="3s" dur="6s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(215,700)">
+    <g transform="scale(0.45,0.45)">
+      <use xlink:href="#bubble" fill="url(#redBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="5.5s" dur="7s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(420,700)">
+    <g transform="scale(0.75,0.75)">
+      <use xlink:href="#bubble" fill="url(#greenBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="1s" dur="9s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(815,700)">
+    <g transform="scale(0.6,0.6)">
+      <use xlink:href="#bubble" fill="url(#yellowBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="2s" dur="9.5s" fill="freeze" repeatCount="indefinite" />
+  </g>
+
+  <g transform="translate(225,375)" >
+    <g transform="scale(1.0,0.5)" >
+      <path d="M 0 0 L 350 0 L 450 450 L -100 450 z"
+            fill="url(#surface)" stroke="none" />
+    </g>
+  </g>
+    <g transform="translate(200,0)" >
+    <g transform="translate(200,490) scale(2.0,1.0) rotate(45)" >
+      <rect fill="#a6ce39" x="-69" y="-69" width="138" height="138" />
+      <circle fill="black" cx="0" cy="0" r="50" />
+      <circle fill="#a6ce39" cx="0" cy="0" r="33" />
+      <path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10
+                            L -11,22 L -1,12 Z" />
+      <animateTransform attributeName="transform"  type="rotate" values="0; 360"
+	         begin="0s" dur="10s" fill="freeze" repeatCount="indefinite" />
+    </g>
+    <g transform="translate(200,375)">
+      <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+      <circle fill="url(#blueSphere)" cx="0" cy="0" r="100" />
+    </g>
+    <g transform="translate(315,440)">
+      <g transform="scale(0.5,0.5)">
+        <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+        <circle fill="url(#redSphere)" cx="0" cy="0" r="100" />
+      </g>
+    </g>
+    <g transform="translate(80,475)">
+      <g transform="scale(0.65,0.65)">
+        <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+        <circle fill="url(#greenSphere)" cx="0" cy="0" r="100" />
+      </g>
+    </g>
+    <g transform="translate(255,525)">
+      <g transform="scale(0.3,0.3)">
+        <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+        <circle fill="url(#yellowSphere)" cx="0" cy="0" r="100" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/examples/opengl/framebufferobject/designer.png b/examples/opengl/framebufferobject/designer.png
new file mode 100644
index 0000000000..4f32d57496
--- /dev/null
+++ b/examples/opengl/framebufferobject/designer.png
diff --git a/examples/opengl/framebufferobject/framebufferobject.pro b/examples/opengl/framebufferobject/framebufferobject.pro
new file mode 100644
index 0000000000..4bc667c6d0
--- /dev/null
+++ b/examples/opengl/framebufferobject/framebufferobject.pro
@@ -0,0 +1,22 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Fri May 12 17:15:46 2006
+######################################################################
+
+TEMPLATE = app
+TARGET =
+DEPENDPATH += .
+INCLUDEPATH += .
+
+QT += opengl svg
+
+# Input
+HEADERS += glwidget.h
+SOURCES += glwidget.cpp main.cpp
+RESOURCES += framebufferobject.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/framebufferobject
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.png *.svg
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/framebufferobject
+INSTALLS += target sources
+
diff --git a/examples/opengl/framebufferobject/framebufferobject.qrc b/examples/opengl/framebufferobject/framebufferobject.qrc
new file mode 100644
index 0000000000..986f1ca385
--- /dev/null
+++ b/examples/opengl/framebufferobject/framebufferobject.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/res">
+   <file>bubbles.svg</file>
+   <file>designer.png</file>
+</qresource>
+</RCC>
diff --git a/examples/opengl/framebufferobject/glwidget.cpp b/examples/opengl/framebufferobject/glwidget.cpp
new file mode 100644
index 0000000000..d3591d60c9
--- /dev/null
+++ b/examples/opengl/framebufferobject/glwidget.cpp
@@ -0,0 +1,309 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QImage>
+#include "glwidget.h"
+
+#include <math.h>
+
+#ifndef GL_MULTISAMPLE
+#define GL_MULTISAMPLE  0x809D
+#endif
+
+GLWidget::GLWidget(QWidget *parent)
+    : QGLWidget(QGLFormat(QGL::SampleBuffers|QGL::AlphaChannel), parent)
+{
+    setWindowTitle(tr("OpenGL framebuffer objects"));
+    makeCurrent();
+    fbo = new QGLFramebufferObject(1024, 1024);
+    rot_x = rot_y = rot_z = 0.0f;
+    scale = 0.1f;
+    anim = new QTimeLine(750, this);
+    anim->setUpdateInterval(20);
+    connect(anim, SIGNAL(valueChanged(qreal)), SLOT(animate(qreal)));
+    connect(anim, SIGNAL(finished()), SLOT(animFinished()));
+
+    svg_renderer = new QSvgRenderer(QLatin1String(":/res/bubbles.svg"), this);
+    connect(svg_renderer, SIGNAL(repaintNeeded()), this, SLOT(draw()));
+
+    logo = QImage(":/res/designer.png");
+    logo = logo.convertToFormat(QImage::Format_ARGB32);
+
+    tile_list = glGenLists(1);
+    glNewList(tile_list, GL_COMPILE);
+    glBegin(GL_QUADS);
+    {
+        glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f,  1.0f);
+        glTexCoord2f(1.0f, 0.0f); glVertex3f( 1.0f, -1.0f,  1.0f);
+        glTexCoord2f(1.0f, 1.0f); glVertex3f( 1.0f,  1.0f,  1.0f);
+        glTexCoord2f(0.0f, 1.0f); glVertex3f(-1.0f,  1.0f,  1.0f);
+
+        glTexCoord2f(1.0f, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f);
+        glTexCoord2f(1.0f, 1.0f); glVertex3f(-1.0f,  1.0f, -1.0f);
+        glTexCoord2f(0.0f, 1.0f); glVertex3f( 1.0f,  1.0f, -1.0f);
+        glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f);
+
+        glTexCoord2f(0.0f, 1.0f); glVertex3f(-1.0f,  1.0f, -1.0f);
+        glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f,  1.0f,  1.0f);
+        glTexCoord2f(1.0f, 0.0f); glVertex3f( 1.0f,  1.0f,  1.0f);
+        glTexCoord2f(1.0f, 1.0f); glVertex3f( 1.0f,  1.0f, -1.0f);
+
+        glTexCoord2f(1.0f, 1.0f); glVertex3f(-1.0f, -1.0f, -1.0f);
+        glTexCoord2f(0.0f, 1.0f); glVertex3f( 1.0f, -1.0f, -1.0f);
+        glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f,  1.0f);
+        glTexCoord2f(1.0f, 0.0f); glVertex3f(-1.0f, -1.0f,  1.0f);
+
+        glTexCoord2f(1.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f);
+        glTexCoord2f(1.0f, 1.0f); glVertex3f( 1.0f,  1.0f, -1.0f);
+        glTexCoord2f(0.0f, 1.0f); glVertex3f( 1.0f,  1.0f,  1.0f);
+        glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f,  1.0f);
+
+        glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f);
+        glTexCoord2f(1.0f, 0.0f); glVertex3f(-1.0f, -1.0f,  1.0f);
+        glTexCoord2f(1.0f, 1.0f); glVertex3f(-1.0f,  1.0f,  1.0f);
+        glTexCoord2f(0.0f, 1.0f); glVertex3f(-1.0f,  1.0f, -1.0f);
+    }
+    glEnd();
+    glEndList();
+
+    wave = new GLfloat[logo.width()*logo.height()];
+    memset(wave, 0, logo.width()*logo.height());
+    startTimer(30); // wave timer
+}
+
+GLWidget::~GLWidget()
+{
+    delete[] wave;
+    glDeleteLists(tile_list, 1);
+    delete fbo;
+}
+
+void GLWidget::paintEvent(QPaintEvent *)
+{
+    draw();
+}
+
+void GLWidget::draw()
+{
+    QPainter p(this); // used for text overlay
+
+    // save the GL state set for QPainter
+    saveGLState();
+
+    // render the 'bubbles.svg' file into our framebuffer object
+    QPainter fbo_painter(fbo);
+    svg_renderer->render(&fbo_painter);
+    fbo_painter.end();
+
+    // draw into the GL widget
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glFrustum(-1, 1, -1, 1, 10, 100);
+    glTranslatef(0.0f, 0.0f, -15.0f);
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+    glViewport(0, 0, width(), height());
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+    glBindTexture(GL_TEXTURE_2D, fbo->texture());
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glEnable(GL_TEXTURE_2D);
+    glEnable(GL_MULTISAMPLE);
+    glEnable(GL_CULL_FACE);
+
+    // draw background
+    glPushMatrix();
+    glScalef(1.7f, 1.7f, 1.7f);
+    glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+    glCallList(tile_list);
+    glPopMatrix();
+
+    const int w = logo.width();
+    const int h = logo.height();
+
+    glRotatef(rot_x, 1.0f, 0.0f, 0.0f);
+    glRotatef(rot_y, 0.0f, 1.0f, 0.0f);
+    glRotatef(rot_z, 0.0f, 0.0f, 1.0f);
+    glScalef(scale/w, scale/w, scale/w);
+
+    glDepthFunc(GL_LESS);
+    glEnable(GL_DEPTH_TEST);
+    // draw the Qt icon
+    glTranslatef(-w+1, -h+1, 0.0f);
+    for (int y=h-1; y>=0; --y) {
+        uint *p = (uint*) logo.scanLine(y);
+        uint *end = p + w;
+        int  x = 0;
+        while (p < end) {
+            glColor4ub(qRed(*p), qGreen(*p), qBlue(*p), uchar(qAlpha(*p)*.9));
+            glTranslatef(0.0f, 0.0f, wave[y*w+x]);
+            if (qAlpha(*p) > 128)
+                glCallList(tile_list);
+            glTranslatef(0.0f, 0.0f, -wave[y*w+x]);
+            glTranslatef(2.0f, 0.0f, 0.0f);
+            ++x;
+            ++p;
+        }
+        glTranslatef(-w*2.0f, 2.0f, 0.0f);
+    }
+
+    // restore the GL state that QPainter expects
+    restoreGLState();
+
+    // draw the overlayed text using QPainter
+    p.setPen(QColor(197, 197, 197, 157));
+    p.setBrush(QColor(197, 197, 197, 127));
+    p.drawRect(QRect(0, 0, width(), 50));
+    p.setPen(Qt::black);
+    p.setBrush(Qt::NoBrush);
+    const QString str1(tr("A simple OpenGL framebuffer object example."));
+    const QString str2(tr("Use the mouse wheel to zoom, press buttons and move mouse to rotate, double-click to flip."));
+    QFontMetrics fm(p.font());
+    p.drawText(width()/2 - fm.width(str1)/2, 20, str1);
+    p.drawText(width()/2 - fm.width(str2)/2, 20 + fm.lineSpacing(), str2);
+}
+
+void GLWidget::mousePressEvent(QMouseEvent *e)
+{
+    anchor = e->pos();
+}
+
+void GLWidget::mouseMoveEvent(QMouseEvent *e)
+{
+    QPoint diff = e->pos() - anchor;
+    if (e->buttons() & Qt::LeftButton) {
+        rot_x += diff.y()/5.0f;
+        rot_y += diff.x()/5.0f;
+    } else if (e->buttons() & Qt::RightButton) {
+        rot_z += diff.x()/5.0f;
+    }
+
+    anchor = e->pos();
+    draw();
+}
+
+void GLWidget::wheelEvent(QWheelEvent *e)
+{
+    e->delta() > 0 ? scale += scale*0.1f : scale -= scale*0.1f;
+    draw();
+}
+
+void GLWidget::mouseDoubleClickEvent(QMouseEvent *)
+{
+    anim->start();
+}
+
+void GLWidget::animate(qreal val)
+{
+    rot_y = val * 180;
+    draw();
+}
+
+void GLWidget::animFinished()
+{
+    if (anim->direction() == QTimeLine::Forward)
+        anim->setDirection(QTimeLine::Backward);
+    else
+        anim->setDirection(QTimeLine::Forward);
+}
+
+void GLWidget::saveGLState()
+{
+    glPushAttrib(GL_ALL_ATTRIB_BITS);
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+}
+
+void GLWidget::restoreGLState()
+{
+    glMatrixMode(GL_PROJECTION);
+    glPopMatrix();
+    glMatrixMode(GL_MODELVIEW);
+    glPopMatrix();
+    glPopAttrib();
+}
+
+#define PI 3.14159
+
+void GLWidget::timerEvent(QTimerEvent *)
+{
+    if (QApplication::mouseButtons() != 0)
+        return;
+
+    static bool scale_in = true;
+
+    if (scale_in && scale > 35.0f)
+        scale_in = false;
+    else if (!scale_in && scale < .5f)
+        scale_in = true;
+
+    scale = scale_in ? scale + scale*0.01f : scale-scale*0.01f;
+    rot_z += 0.3f;
+    rot_x += 0.1f;
+
+    int dx, dy; // disturbance point
+    float s, v, W, t;
+    int i, j;
+    static float wt[128][128];
+    const int width = logo.width();
+    const int AMP = 5;
+
+    dx = dy = width >> 1;
+
+    W = .3f;
+    v = -4; // wave speed
+
+    for (i = 0; i < width; ++i) {
+	for ( j = 0; j < width; ++j) {
+	    s = sqrt((double) ((j - dx) * (j - dx) + (i - dy) * (i - dy)));
+	    wt[i][j] += 0.1f;
+	    t = s / v;
+            if (s != 0)
+                wave[i*width + j] = AMP * sin(2 * PI * W * (wt[i][j] + t)) / (0.2*(s + 2));
+            else
+                wave[i*width + j] = AMP * sin(2 * PI * W * (wt[i][j] + t));
+	}
+    }
+}
diff --git a/examples/opengl/framebufferobject/glwidget.h b/examples/opengl/framebufferobject/glwidget.h
new file mode 100644
index 0000000000..b64cfa87f2
--- /dev/null
+++ b/examples/opengl/framebufferobject/glwidget.h
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtOpenGL>
+#include <QImage>
+#include <QTimeLine>
+#include <QSvgRenderer>
+
+class GLWidget : public QGLWidget
+{
+    Q_OBJECT
+
+public:
+    GLWidget(QWidget *parent);
+    ~GLWidget();
+
+    void saveGLState();
+    void restoreGLState();
+
+    void paintEvent(QPaintEvent *);
+    void mousePressEvent(QMouseEvent *);
+    void mouseDoubleClickEvent(QMouseEvent *);
+    void mouseMoveEvent(QMouseEvent *);
+    void timerEvent(QTimerEvent *);
+    void wheelEvent(QWheelEvent *);
+
+public slots:
+    void animate(qreal);
+    void animFinished();
+    void draw();
+
+private:
+    QPoint anchor;
+    float scale;
+    float rot_x, rot_y, rot_z;
+    GLuint tile_list;
+    GLfloat *wave;
+
+    QImage logo;
+    QTimeLine *anim;
+    QSvgRenderer *svg_renderer;
+    QGLFramebufferObject *fbo;
+};
+
diff --git a/examples/opengl/framebufferobject/main.cpp b/examples/opengl/framebufferobject/main.cpp
new file mode 100644
index 0000000000..f9af3f906b
--- /dev/null
+++ b/examples/opengl/framebufferobject/main.cpp
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtGui/QMessageBox>
+#include "glwidget.h"
+
+int main(int argc, char **argv)
+{
+    Q_INIT_RESOURCE(framebufferobject);
+
+    QApplication a(argc, argv);
+    if (!QGLFormat::hasOpenGL() || !QGLFramebufferObject::hasOpenGLFramebufferObjects()) {
+	QMessageBox::information(0, "OpenGL framebuffer objects",
+				 "This system does not support OpenGL/framebuffer objects.");
+        return -1;
+    }
+
+    GLWidget widget(0);
+    widget.resize(640, 480);
+    widget.show();
+    return a.exec();
+}
+
diff --git a/examples/opengl/framebufferobject2/cubelogo.png b/examples/opengl/framebufferobject2/cubelogo.png
new file mode 100644
index 0000000000..3ae0f9ba3f
--- /dev/null
+++ b/examples/opengl/framebufferobject2/cubelogo.png
diff --git a/examples/opengl/framebufferobject2/framebufferobject2.pro b/examples/opengl/framebufferobject2/framebufferobject2.pro
new file mode 100644
index 0000000000..9f1644c7a1
--- /dev/null
+++ b/examples/opengl/framebufferobject2/framebufferobject2.pro
@@ -0,0 +1,11 @@
+HEADERS += glwidget.h
+SOURCES += glwidget.cpp main.cpp
+RESOURCES += framebufferobject2.qrc
+
+QT += opengl
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/framebufferobject2
+sources.files = $$SOURCES $$HEADERS $$RESOURCES framebufferobject2.pro *.png
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/framebufferobject2
+INSTALLS += target sources
diff --git a/examples/opengl/framebufferobject2/framebufferobject2.qrc b/examples/opengl/framebufferobject2/framebufferobject2.qrc
new file mode 100644
index 0000000000..9fc1a56a1a
--- /dev/null
+++ b/examples/opengl/framebufferobject2/framebufferobject2.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/res">
+   <file>cubelogo.png</file>
+</qresource>
+</RCC>
diff --git a/examples/opengl/framebufferobject2/glwidget.cpp b/examples/opengl/framebufferobject2/glwidget.cpp
new file mode 100644
index 0000000000..24bc2ef240
--- /dev/null
+++ b/examples/opengl/framebufferobject2/glwidget.cpp
@@ -0,0 +1,249 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "glwidget.h"
+#include <QtGui/QImage>
+
+#include <math.h>
+
+static GLint cubeArray[][3] = {
+    {0, 0, 0}, {0, 1, 0}, {1, 1, 0}, {1, 0, 0},
+    {0, 0, 1}, {1, 0, 1}, {1, 1, 1}, {0, 1, 1},
+    {0, 0, 0}, {1, 0, 0}, {1, 0, 1}, {0, 0, 1},
+    {0, 1, 0}, {0, 1, 1}, {1, 1, 1}, {1, 1, 0},
+    {0, 1, 0}, {0, 0, 0}, {0, 0, 1}, {0, 1, 1},
+    {1, 0, 0}, {1, 1, 0}, {1, 1, 1}, {1, 0, 1}
+};
+
+static GLint cubeTextureArray[][2] = {
+    {0, 0}, {1, 0}, {1, 1}, {0, 1},
+    {0, 0}, {0, 1}, {1, 1}, {1, 0},
+    {0, 0}, {1, 0}, {1, 1}, {0, 1},
+    {1, 0}, {0, 0}, {0, 1}, {1, 1},
+    {0, 0}, {1, 0}, {1, 1}, {0, 1},
+    {1, 0}, {0, 0}, {0, 1}, {1, 1}
+};
+
+static GLint faceArray[][2] = {
+    {1, -1}, {1, 1}, {-1, 1}, {-1, -1}
+};
+
+static GLubyte colorArray[][4] = {
+    {102, 176, 54, 255},
+    {81, 141, 41, 255},
+    {62, 108, 32, 255},
+    {45, 79, 23, 255}
+};
+
+GLWidget::GLWidget(QWidget *parent)
+  : QGLWidget(QGLFormat(QGL::SampleBuffers), parent)
+{
+    // create the framebuffer object - make sure to have a current
+    // context before creating it
+    makeCurrent();
+    fbo = new QGLFramebufferObject(512, 512);
+    timerId = startTimer(20);
+    setWindowTitle(tr("OpenGL framebuffer objects 2"));
+}
+
+GLWidget::~GLWidget()
+{
+    glDeleteLists(pbufferList, 1);
+    delete fbo;
+}
+
+void GLWidget::initializeGL()
+{
+    glMatrixMode(GL_MODELVIEW);
+
+    glEnable(GL_CULL_FACE);
+
+    glEnableClientState(GL_VERTEX_ARRAY);
+    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+    glVertexPointer(3, GL_INT, 0, cubeArray);
+    glTexCoordPointer(2, GL_INT, 0, cubeTextureArray);
+    glColorPointer(4, GL_UNSIGNED_BYTE, 0, colorArray);
+
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glEnable(GL_BLEND);
+    glEnable(GL_TEXTURE_2D);
+    glEnable(GL_DEPTH_TEST);
+
+    glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
+    pbufferList = glGenLists(1);
+    glNewList(pbufferList, GL_COMPILE);
+    {
+        glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
+
+	// draw cube background
+        glPushMatrix();
+        glLoadIdentity();
+        glTranslatef(0.5f, 0.5f, -2.0f);
+	glDisable(GL_TEXTURE_2D);
+	glEnableClientState(GL_COLOR_ARRAY);
+	glVertexPointer(2, GL_INT, 0, faceArray);
+	glDrawArrays(GL_QUADS, 0, 4);
+	glVertexPointer(3, GL_INT, 0, cubeArray);
+	glDisableClientState(GL_COLOR_ARRAY);
+	glEnable(GL_TEXTURE_2D);
+        glPopMatrix();
+
+	// draw cube
+        glTranslatef(0.5f, 0.5f, 0.5f);
+        glRotatef(3.0f, 1.0f, 1.0f, 1.0f);
+        glTranslatef(-0.5f, -0.5f, -0.5f);
+        glColor4f(0.9f, 0.9f, 0.9f, 1.0f);
+        glDrawArrays(GL_QUADS, 0, 24);
+
+        glPushMatrix(); // this state is popped back in the paintGL() function
+    }
+    glEndList();
+
+    for (int i = 0; i < 3; ++i) {
+        yOffs[i] = 0.0f;
+        xInc[i] = 0.005f;
+        rot[i] = 0.0f;
+    }
+    xOffs[0]= 0.0f;
+    xOffs[1]= 0.5f;
+    xOffs[2]= 1.0f;
+
+    cubeTexture = bindTexture(QImage(":res/cubelogo.png"));
+
+    glPushMatrix(); // push to avoid stack underflow in the first paintGL() call
+}
+
+void GLWidget::resizeGL(int w, int h)
+{
+    glViewport(0, 0, w, h);
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    float aspect = w/(float)(h ? h : 1);
+    glFrustum(-aspect, aspect, -1, 1, 10, 100);
+    glTranslatef(-0.5f, -0.5f, -0.5f);
+    glTranslatef(0.0f, 0.0f, -15.0f);
+}
+
+void GLWidget::paintGL()
+{
+    glPopMatrix(); // pop the matrix pushed in the pbuffer list
+
+    // push the projection matrix and the entire GL state before
+    // doing any rendering into our framebuffer object
+    glPushAttrib(GL_ALL_ATTRIB_BITS);
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+
+    glViewport(0, 0, fbo->size().width(), fbo->size().height());
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glOrtho(-1, 1, -1, 1, -99, 99);
+    glTranslatef(-0.5f, -0.5f, 0.0f);
+    glMatrixMode(GL_MODELVIEW);
+
+    // render to the framebuffer object
+    fbo->bind();
+    glBindTexture(GL_TEXTURE_2D, cubeTexture);
+    glCallList(pbufferList);
+    fbo->release();
+
+    // pop the projection matrix and GL state back for rendering
+    // to the actual widget
+    glPopAttrib();
+    glMatrixMode(GL_PROJECTION);
+    glPopMatrix();
+
+    glBindTexture(GL_TEXTURE_2D, fbo->texture());
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+    // draw the background
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+    glLoadIdentity();
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+    glLoadIdentity();
+
+    glVertexPointer(2, GL_INT, 0, faceArray);
+    glTranslatef(-1.2f, -0.8f, 0.0f);
+    glScalef(0.2f, 0.2f, 0.2f);
+    for (int y = 0; y < 5; ++y) {
+	for (int x = 0; x < 5; ++x) {
+	    glTranslatef(2.0f, 0, 0);
+	    glColor4f(0.8, 0.8, 0.8, 1.0);
+	    glDrawArrays(GL_QUADS, 0, 4);
+	}
+ 	glTranslatef(-10.0f, 2.0f, 0);
+    }
+    glVertexPointer(3, GL_INT, 0, cubeArray);
+
+    glPopMatrix();
+    glMatrixMode(GL_MODELVIEW);
+
+    // draw the bouncing cubes
+    drawCube(0, 0.0f, 1.5f, 2.5f, 1.5f);
+    drawCube(1, 1.0f, 2.0f, 2.5f, 2.0f);
+    drawCube(2, 2.0f, 3.5f, 2.5f, 2.5f);
+    glPopMatrix();
+}
+
+void GLWidget::drawCube(int i, GLfloat z, GLfloat rotation, GLfloat jmp, GLfloat amp)
+{
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+    glTranslatef(xOffs[i], yOffs[i], z);
+    glTranslatef(0.5f, 0.5f, 0.5f);
+    GLfloat scale = 0.75 + i*(0.25f/2);
+    glScalef(scale, scale, scale);
+    glRotatef(rot[i], 1.0f, 1.0f, 1.0f);
+    glTranslatef(-0.5f, -0.5f, -0.5f);
+
+    glColor4f(1.0f, 1.0f, 1.0f, 0.8f);
+    glDrawArrays(GL_QUADS, 0, 24);
+
+    if (xOffs[i] > 1.0f || xOffs[i] < -1.0f) {
+        xInc[i] = -xInc[i];
+        xOffs[i] = xOffs[i] > 1.0f ? 1.0f : -1.0f;
+    }
+    xOffs[i] += xInc[i];
+    yOffs[i] = qAbs(cos((-3.141592f * jmp) * xOffs[i]) * amp) - 1;
+    rot[i] += rotation;
+}
diff --git a/examples/opengl/framebufferobject2/glwidget.h b/examples/opengl/framebufferobject2/glwidget.h
new file mode 100644
index 0000000000..e200ac22bc
--- /dev/null
+++ b/examples/opengl/framebufferobject2/glwidget.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtOpenGL>
+
+class GLWidget : public QGLWidget
+{
+public:
+    GLWidget(QWidget *parent);
+    ~GLWidget();
+    void initializeGL();
+    void resizeGL(int w, int h);
+    void paintGL();
+    void timerEvent(QTimerEvent *) { update(); }
+    void mousePressEvent(QMouseEvent *) { killTimer(timerId); }
+    void mouseReleaseEvent(QMouseEvent *) { timerId = startTimer(20); }
+
+    void drawCube(int i, GLfloat z, GLfloat ri, GLfloat jmp, GLfloat amp);
+
+private:
+    GLfloat rot[3], xOffs[3], yOffs[3], xInc[3];
+    GLuint pbufferList;
+    GLuint cubeTexture;
+    int timerId;
+
+    QGLFramebufferObject *fbo;
+};
+
diff --git a/examples/opengl/framebufferobject2/main.cpp b/examples/opengl/framebufferobject2/main.cpp
new file mode 100644
index 0000000000..912f4ec66a
--- /dev/null
+++ b/examples/opengl/framebufferobject2/main.cpp
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtGui/QMessageBox>
+#include "glwidget.h"
+
+int main(int argc, char **argv)
+{
+    Q_INIT_RESOURCE(framebufferobject2);
+
+    QApplication a(argc, argv);
+    if (!QGLFormat::hasOpenGL() || !QGLFramebufferObject::hasOpenGLFramebufferObjects()) {
+	QMessageBox::information(0, "OpenGL framebuffer objects 2",
+				 "This system does not support OpenGL/framebuffer objects.");
+        return -1;
+    }
+
+    GLWidget widget(0);
+    widget.resize(640, 480);
+    widget.show();
+    return a.exec();
+}
+
diff --git a/examples/opengl/grabber/glwidget.cpp b/examples/opengl/grabber/glwidget.cpp
new file mode 100644
index 0000000000..71550ac540
--- /dev/null
+++ b/examples/opengl/grabber/glwidget.cpp
@@ -0,0 +1,284 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtOpenGL>
+
+#include <math.h>
+
+#include "glwidget.h"
+
+GLWidget::GLWidget(QWidget *parent)
+    : QGLWidget(parent)
+{
+    gear1 = 0;
+    gear2 = 0;
+    gear3 = 0;
+    xRot = 0;
+    yRot = 0;
+    zRot = 0;
+    gear1Rot = 0;
+
+    QTimer *timer = new QTimer(this);
+    connect(timer, SIGNAL(timeout()), this, SLOT(advanceGears()));
+    timer->start(20);
+}
+
+GLWidget::~GLWidget()
+{
+    makeCurrent();
+    glDeleteLists(gear1, 1);
+    glDeleteLists(gear2, 1);
+    glDeleteLists(gear3, 1);
+}
+
+void GLWidget::setXRotation(int angle)
+{
+    normalizeAngle(&angle);
+    if (angle != xRot) {
+        xRot = angle;
+        emit xRotationChanged(angle);
+        updateGL();
+    }
+}
+
+void GLWidget::setYRotation(int angle)
+{
+    normalizeAngle(&angle);
+    if (angle != yRot) {
+        yRot = angle;
+        emit yRotationChanged(angle);
+        updateGL();
+    }
+}
+
+void GLWidget::setZRotation(int angle)
+{
+    normalizeAngle(&angle);
+    if (angle != zRot) {
+        zRot = angle;
+        emit zRotationChanged(angle);
+        updateGL();
+    }
+}
+
+void GLWidget::initializeGL()
+{
+    static const GLfloat lightPos[4] = { 5.0f, 5.0f, 10.0f, 1.0f };
+    static const GLfloat reflectance1[4] = { 0.8f, 0.1f, 0.0f, 1.0f };
+    static const GLfloat reflectance2[4] = { 0.0f, 0.8f, 0.2f, 1.0f };
+    static const GLfloat reflectance3[4] = { 0.2f, 0.2f, 1.0f, 1.0f };
+
+    glLightfv(GL_LIGHT0, GL_POSITION, lightPos);
+    glEnable(GL_LIGHTING);
+    glEnable(GL_LIGHT0);
+    glEnable(GL_DEPTH_TEST);
+
+    gear1 = makeGear(reflectance1, 1.0, 4.0, 1.0, 0.7, 20);
+    gear2 = makeGear(reflectance2, 0.5, 2.0, 2.0, 0.7, 10);
+    gear3 = makeGear(reflectance3, 1.3, 2.0, 0.5, 0.7, 10);
+
+    glEnable(GL_NORMALIZE);
+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);    
+}
+
+void GLWidget::paintGL()
+{
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+    glPushMatrix();
+    glRotated(xRot / 16.0, 1.0, 0.0, 0.0);
+    glRotated(yRot / 16.0, 0.0, 1.0, 0.0);
+    glRotated(zRot / 16.0, 0.0, 0.0, 1.0);
+
+    drawGear(gear1, -3.0, -2.0, 0.0, gear1Rot / 16.0);
+    drawGear(gear2, +3.1, -2.0, 0.0, -2.0 * (gear1Rot / 16.0) - 9.0);
+
+    glRotated(+90.0, 1.0, 0.0, 0.0);
+    drawGear(gear3, -3.1, -1.8, -2.2, +2.0 * (gear1Rot / 16.0) - 2.0);
+
+    glPopMatrix();
+}
+
+void GLWidget::resizeGL(int width, int height)
+{
+    int side = qMin(width, height);
+    glViewport((width - side) / 2, (height - side) / 2, side, side);
+
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glFrustum(-1.0, +1.0, -1.0, 1.0, 5.0, 60.0);
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+    glTranslated(0.0, 0.0, -40.0);
+}
+
+void GLWidget::mousePressEvent(QMouseEvent *event)
+{
+    lastPos = event->pos();
+}
+
+void GLWidget::mouseMoveEvent(QMouseEvent *event)
+{
+    int dx = event->x() - lastPos.x();
+    int dy = event->y() - lastPos.y();
+
+    if (event->buttons() & Qt::LeftButton) {
+        setXRotation(xRot + 8 * dy);
+        setYRotation(yRot + 8 * dx);
+    } else if (event->buttons() & Qt::RightButton) {
+        setXRotation(xRot + 8 * dy);
+        setZRotation(zRot + 8 * dx);
+    }
+    lastPos = event->pos();
+}
+
+void GLWidget::advanceGears()
+{
+    gear1Rot += 2 * 16;
+    updateGL();
+}
+
+GLuint GLWidget::makeGear(const GLfloat *reflectance, GLdouble innerRadius,
+                          GLdouble outerRadius, GLdouble thickness,
+                          GLdouble toothSize, GLint toothCount)
+{
+    const double Pi = 3.14159265358979323846;
+
+    GLuint list = glGenLists(1);
+    glNewList(list, GL_COMPILE);
+    glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, reflectance);
+
+    GLdouble r0 = innerRadius;
+    GLdouble r1 = outerRadius - toothSize / 2.0;
+    GLdouble r2 = outerRadius + toothSize / 2.0;
+    GLdouble delta = (2.0 * Pi / toothCount) / 4.0;
+    GLdouble z = thickness / 2.0;
+    int i, j;
+
+    glShadeModel(GL_FLAT);
+
+    for (i = 0; i < 2; ++i) {
+        GLdouble sign = (i == 0) ? +1.0 : -1.0;
+
+        glNormal3d(0.0, 0.0, sign);
+
+        glBegin(GL_QUAD_STRIP);
+        for (j = 0; j <= toothCount; ++j) {
+            GLdouble angle = 2.0 * Pi * j / toothCount;
+	    glVertex3d(r0 * cos(angle), r0 * sin(angle), sign * z);
+	    glVertex3d(r1 * cos(angle), r1 * sin(angle), sign * z);
+	    glVertex3d(r0 * cos(angle), r0 * sin(angle), sign * z);
+	    glVertex3d(r1 * cos(angle + 3 * delta), r1 * sin(angle + 3 * delta),
+                       sign * z);
+        }
+        glEnd();
+
+        glBegin(GL_QUADS);
+        for (j = 0; j < toothCount; ++j) {
+            GLdouble angle = 2.0 * Pi * j / toothCount;
+	    glVertex3d(r1 * cos(angle), r1 * sin(angle), sign * z);
+	    glVertex3d(r2 * cos(angle + delta), r2 * sin(angle + delta),
+                       sign * z);
+	    glVertex3d(r2 * cos(angle + 2 * delta), r2 * sin(angle + 2 * delta),
+                       sign * z);
+	    glVertex3d(r1 * cos(angle + 3 * delta), r1 * sin(angle + 3 * delta),
+                       sign * z);
+        }
+        glEnd();
+    }
+
+    glBegin(GL_QUAD_STRIP);
+    for (i = 0; i < toothCount; ++i) {
+        for (j = 0; j < 2; ++j) {
+            GLdouble angle = 2.0 * Pi * (i + (j / 2.0)) / toothCount;
+            GLdouble s1 = r1;
+            GLdouble s2 = r2;
+            if (j == 1)
+                qSwap(s1, s2);
+
+	    glNormal3d(cos(angle), sin(angle), 0.0);
+	    glVertex3d(s1 * cos(angle), s1 * sin(angle), +z);
+	    glVertex3d(s1 * cos(angle), s1 * sin(angle), -z);
+
+	    glNormal3d(s2 * sin(angle + delta) - s1 * sin(angle),
+                       s1 * cos(angle) - s2 * cos(angle + delta), 0.0);
+	    glVertex3d(s2 * cos(angle + delta), s2 * sin(angle + delta), +z);
+	    glVertex3d(s2 * cos(angle + delta), s2 * sin(angle + delta), -z);
+        }
+    }
+    glVertex3d(r1, 0.0, +z);
+    glVertex3d(r1, 0.0, -z);
+    glEnd();
+
+    glShadeModel(GL_SMOOTH);
+
+    glBegin(GL_QUAD_STRIP);
+    for (i = 0; i <= toothCount; ++i) {
+	GLdouble angle = i * 2.0 * Pi / toothCount;
+	glNormal3d(-cos(angle), -sin(angle), 0.0);
+	glVertex3d(r0 * cos(angle), r0 * sin(angle), +z);
+	glVertex3d(r0 * cos(angle), r0 * sin(angle), -z);
+    }
+    glEnd();
+
+    glEndList();
+
+    return list;
+}
+
+void GLWidget::drawGear(GLuint gear, GLdouble dx, GLdouble dy, GLdouble dz,
+                        GLdouble angle)
+{
+    glPushMatrix();
+    glTranslated(dx, dy, dz);
+    glRotated(angle, 0.0, 0.0, 1.0);
+    glCallList(gear);
+    glPopMatrix();
+}
+
+void GLWidget::normalizeAngle(int *angle)
+{
+    while (*angle < 0)
+        *angle += 360 * 16;
+    while (*angle > 360 * 16)
+        *angle -= 360 * 16;
+}
diff --git a/examples/opengl/grabber/glwidget.h b/examples/opengl/grabber/glwidget.h
new file mode 100644
index 0000000000..4e66b1ff9a
--- /dev/null
+++ b/examples/opengl/grabber/glwidget.h
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GLWIDGET_H
+#define GLWIDGET_H
+
+#include <QGLWidget>
+
+class GLWidget : public QGLWidget
+{
+    Q_OBJECT
+
+public:
+    GLWidget(QWidget *parent = 0);
+    ~GLWidget();
+
+    int xRotation() const { return xRot; }
+    int yRotation() const { return yRot; }
+    int zRotation() const { return zRot; }
+
+public slots:
+    void setXRotation(int angle);
+    void setYRotation(int angle);
+    void setZRotation(int angle);
+
+signals:
+    void xRotationChanged(int angle);
+    void yRotationChanged(int angle);
+    void zRotationChanged(int angle);
+
+protected:
+    void initializeGL();
+    void paintGL();
+    void resizeGL(int width, int height);
+    void mousePressEvent(QMouseEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
+
+private slots:
+    void advanceGears();
+
+private:
+    GLuint makeGear(const GLfloat *reflectance, GLdouble innerRadius,
+                    GLdouble outerRadius, GLdouble thickness,
+                    GLdouble toothSize, GLint toothCount);
+    void drawGear(GLuint gear, GLdouble dx, GLdouble dy, GLdouble dz,
+                  GLdouble angle);
+    void normalizeAngle(int *angle);
+
+    GLuint gear1;
+    GLuint gear2;
+    GLuint gear3;
+    int xRot;
+    int yRot;
+    int zRot;
+    int gear1Rot;
+    
+    QPoint lastPos;
+};
+
+#endif
diff --git a/examples/opengl/grabber/grabber.pro b/examples/opengl/grabber/grabber.pro
new file mode 100644
index 0000000000..15eaf0250a
--- /dev/null
+++ b/examples/opengl/grabber/grabber.pro
@@ -0,0 +1,12 @@
+HEADERS       = glwidget.h \
+                mainwindow.h
+SOURCES       = glwidget.cpp \
+                main.cpp \
+                mainwindow.cpp
+QT           += opengl
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/grabber
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grabber.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/grabber
+INSTALLS += target sources
diff --git a/examples/opengl/grabber/main.cpp b/examples/opengl/grabber/main.cpp
new file mode 100644
index 0000000000..4856752c8c
--- /dev/null
+++ b/examples/opengl/grabber/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow mainWin;
+    mainWin.show();
+    return app.exec();
+}
diff --git a/examples/opengl/grabber/mainwindow.cpp b/examples/opengl/grabber/mainwindow.cpp
new file mode 100644
index 0000000000..7e878f9677
--- /dev/null
+++ b/examples/opengl/grabber/mainwindow.cpp
@@ -0,0 +1,207 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtOpenGL>
+
+#include "glwidget.h"
+#include "mainwindow.h"
+
+MainWindow::MainWindow()
+{
+    centralWidget = new QWidget;
+    setCentralWidget(centralWidget);
+
+    glWidget = new GLWidget;
+    pixmapLabel = new QLabel;
+
+    glWidgetArea = new QScrollArea;
+    glWidgetArea->setWidget(glWidget);
+    glWidgetArea->setWidgetResizable(true);
+    glWidgetArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    glWidgetArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    glWidgetArea->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
+    glWidgetArea->setMinimumSize(50, 50);
+
+    pixmapLabelArea = new QScrollArea;
+    pixmapLabelArea->setWidget(pixmapLabel);
+    pixmapLabelArea->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
+    pixmapLabelArea->setMinimumSize(50, 50);
+
+    xSlider = createSlider(SIGNAL(xRotationChanged(int)),
+                           SLOT(setXRotation(int)));
+    ySlider = createSlider(SIGNAL(yRotationChanged(int)),
+                           SLOT(setYRotation(int)));
+    zSlider = createSlider(SIGNAL(zRotationChanged(int)),
+                           SLOT(setZRotation(int)));
+
+    createActions();
+    createMenus();
+
+    QGridLayout *centralLayout = new QGridLayout;
+    centralLayout->addWidget(glWidgetArea, 0, 0);
+    centralLayout->addWidget(pixmapLabelArea, 0, 1);
+    centralLayout->addWidget(xSlider, 1, 0, 1, 2);
+    centralLayout->addWidget(ySlider, 2, 0, 1, 2);
+    centralLayout->addWidget(zSlider, 3, 0, 1, 2);
+    centralWidget->setLayout(centralLayout);
+
+    xSlider->setValue(15 * 16);
+    ySlider->setValue(345 * 16);
+    zSlider->setValue(0 * 16);
+
+    setWindowTitle(tr("Grabber"));
+    resize(400, 300);
+}
+
+void MainWindow::renderIntoPixmap()
+{
+    QSize size = getSize();
+    if (size.isValid()) {
+        QPixmap pixmap = glWidget->renderPixmap(size.width(), size.height());
+        setPixmap(pixmap);
+    }
+}
+
+void MainWindow::grabFrameBuffer()
+{
+    QImage image = glWidget->grabFrameBuffer();
+    setPixmap(QPixmap::fromImage(image));
+}
+
+void MainWindow::clearPixmap()
+{
+    setPixmap(QPixmap());
+}
+
+void MainWindow::about()
+{
+    QMessageBox::about(this, tr("About Grabber"),
+            tr("The <b>Grabber</b> example demonstrates two approaches for "
+               "rendering OpenGL into a Qt pixmap."));
+}
+
+void MainWindow::createActions()
+{
+    renderIntoPixmapAct = new QAction(tr("&Render into Pixmap..."), this);
+    renderIntoPixmapAct->setShortcut(tr("Ctrl+R"));
+    connect(renderIntoPixmapAct, SIGNAL(triggered()),
+            this, SLOT(renderIntoPixmap()));
+
+    grabFrameBufferAct = new QAction(tr("&Grab Frame Buffer"), this);
+    grabFrameBufferAct->setShortcut(tr("Ctrl+G"));
+    connect(grabFrameBufferAct, SIGNAL(triggered()),
+            this, SLOT(grabFrameBuffer()));
+
+    clearPixmapAct = new QAction(tr("&Clear Pixmap"), this);
+    clearPixmapAct->setShortcut(tr("Ctrl+L"));
+    connect(clearPixmapAct, SIGNAL(triggered()), this, SLOT(clearPixmap()));
+
+    exitAct = new QAction(tr("E&xit"), this);
+    exitAct->setShortcut(tr("Ctrl+Q"));
+    connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));
+
+    aboutAct = new QAction(tr("&About"), this);
+    connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
+
+    aboutQtAct = new QAction(tr("About &Qt"), this);
+    connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+}
+
+void MainWindow::createMenus()
+{
+    fileMenu = menuBar()->addMenu(tr("&File"));
+    fileMenu->addAction(renderIntoPixmapAct);
+    fileMenu->addAction(grabFrameBufferAct);
+    fileMenu->addAction(clearPixmapAct);
+    fileMenu->addSeparator();
+    fileMenu->addAction(exitAct);
+
+    helpMenu = menuBar()->addMenu(tr("&Help"));
+    helpMenu->addAction(aboutAct);
+    helpMenu->addAction(aboutQtAct);
+}
+
+QSlider *MainWindow::createSlider(const char *changedSignal,
+                                  const char *setterSlot)
+{
+    QSlider *slider = new QSlider(Qt::Horizontal);
+    slider->setRange(0, 360 * 16);
+    slider->setSingleStep(16);
+    slider->setPageStep(15 * 16);
+    slider->setTickInterval(15 * 16);
+    slider->setTickPosition(QSlider::TicksRight);
+    connect(slider, SIGNAL(valueChanged(int)), glWidget, setterSlot);
+    connect(glWidget, changedSignal, slider, SLOT(setValue(int)));
+    return slider;
+}
+
+void MainWindow::setPixmap(const QPixmap &pixmap)
+{
+    pixmapLabel->setPixmap(pixmap);
+    QSize size = pixmap.size();
+    if (size - QSize(1, 0) == pixmapLabelArea->maximumViewportSize())
+        size -= QSize(1, 0);
+    pixmapLabel->resize(size);
+}
+
+QSize MainWindow::getSize()
+{
+    bool ok;
+    QString text = QInputDialog::getText(this, tr("Grabber"),
+                                         tr("Enter pixmap size:"),
+                                         QLineEdit::Normal,
+                                         tr("%1 x %2").arg(glWidget->width())
+                                                      .arg(glWidget->height()),
+                                         &ok);
+    if (!ok)
+        return QSize();
+
+    QRegExp regExp(tr("([0-9]+) *x *([0-9]+)"));
+    if (regExp.exactMatch(text)) {
+        int width = regExp.cap(1).toInt();
+        int height = regExp.cap(2).toInt();
+        if (width > 0 && width < 2048 && height > 0 && height < 2048)
+            return QSize(width, height);
+    }
+
+    return glWidget->size();
+}
diff --git a/examples/opengl/grabber/mainwindow.h b/examples/opengl/grabber/mainwindow.h
new file mode 100644
index 0000000000..8f777478c8
--- /dev/null
+++ b/examples/opengl/grabber/mainwindow.h
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+
+QT_BEGIN_NAMESPACE
+class QAction;
+class QLabel;
+class QMenu;
+class QScrollArea;
+class QSlider;
+QT_END_NAMESPACE
+class GLWidget;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+private slots:
+    void renderIntoPixmap();
+    void grabFrameBuffer();
+    void clearPixmap();
+    void about();
+
+private:
+    void createActions();
+    void createMenus();
+    QSlider *createSlider(const char *changedSignal, const char *setterSlot);
+    void setPixmap(const QPixmap &pixmap);
+    QSize getSize();
+
+    QWidget *centralWidget;
+    QScrollArea *glWidgetArea;
+    QScrollArea *pixmapLabelArea;
+    GLWidget *glWidget;
+    QLabel *pixmapLabel;
+    QSlider *xSlider;
+    QSlider *ySlider;
+    QSlider *zSlider;
+
+    QMenu *fileMenu;
+    QMenu *helpMenu;
+    QAction *grabFrameBufferAct;
+    QAction *renderIntoPixmapAct;
+    QAction *clearPixmapAct;
+    QAction *exitAct;
+    QAction *aboutAct;
+    QAction *aboutQtAct;
+};
+
+#endif
diff --git a/examples/opengl/hellogl/glwidget.cpp b/examples/opengl/hellogl/glwidget.cpp
new file mode 100644
index 0000000000..d81e7e6008
--- /dev/null
+++ b/examples/opengl/hellogl/glwidget.cpp
@@ -0,0 +1,266 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtOpenGL>
+
+#include <math.h>
+
+#include "glwidget.h"
+
+//! [0]
+GLWidget::GLWidget(QWidget *parent)
+    : QGLWidget(parent)
+{
+    object = 0;
+    xRot = 0;
+    yRot = 0;
+    zRot = 0;
+
+    trolltechGreen = QColor::fromCmykF(0.40, 0.0, 1.0, 0.0);
+    trolltechPurple = QColor::fromCmykF(0.39, 0.39, 0.0, 0.0);
+}
+//! [0]
+
+//! [1]
+GLWidget::~GLWidget()
+{
+    makeCurrent();
+    glDeleteLists(object, 1);
+}
+//! [1]
+
+//! [2]
+QSize GLWidget::minimumSizeHint() const
+{
+    return QSize(50, 50);
+}
+//! [2]
+
+//! [3]
+QSize GLWidget::sizeHint() const
+//! [3] //! [4]
+{
+    return QSize(400, 400);
+}
+//! [4]
+
+//! [5]
+void GLWidget::setXRotation(int angle)
+{
+    normalizeAngle(&angle);
+    if (angle != xRot) {
+        xRot = angle;
+        emit xRotationChanged(angle);
+        updateGL();
+    }
+}
+//! [5]
+
+void GLWidget::setYRotation(int angle)
+{
+    normalizeAngle(&angle);
+    if (angle != yRot) {
+        yRot = angle;
+        emit yRotationChanged(angle);
+        updateGL();
+    }
+}
+
+void GLWidget::setZRotation(int angle)
+{
+    normalizeAngle(&angle);
+    if (angle != zRot) {
+        zRot = angle;
+        emit zRotationChanged(angle);
+        updateGL();
+    }
+}
+
+//! [6]
+void GLWidget::initializeGL()
+{
+    qglClearColor(trolltechPurple.dark());
+    object = makeObject();
+    glShadeModel(GL_FLAT);
+    glEnable(GL_DEPTH_TEST);
+    glEnable(GL_CULL_FACE);
+}
+//! [6]
+
+//! [7]
+void GLWidget::paintGL()
+{
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glLoadIdentity();
+    glTranslated(0.0, 0.0, -10.0);
+    glRotated(xRot / 16.0, 1.0, 0.0, 0.0);
+    glRotated(yRot / 16.0, 0.0, 1.0, 0.0);
+    glRotated(zRot / 16.0, 0.0, 0.0, 1.0);
+    glCallList(object);
+}
+//! [7]
+
+//! [8]
+void GLWidget::resizeGL(int width, int height)
+{
+    int side = qMin(width, height);
+    glViewport((width - side) / 2, (height - side) / 2, side, side);
+
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glOrtho(-0.5, +0.5, +0.5, -0.5, 4.0, 15.0);
+    glMatrixMode(GL_MODELVIEW);
+}
+//! [8]
+
+//! [9]
+void GLWidget::mousePressEvent(QMouseEvent *event)
+{
+    lastPos = event->pos();
+}
+//! [9]
+
+//! [10]
+void GLWidget::mouseMoveEvent(QMouseEvent *event)
+{
+    int dx = event->x() - lastPos.x();
+    int dy = event->y() - lastPos.y();
+
+    if (event->buttons() & Qt::LeftButton) {
+        setXRotation(xRot + 8 * dy);
+        setYRotation(yRot + 8 * dx);
+    } else if (event->buttons() & Qt::RightButton) {
+        setXRotation(xRot + 8 * dy);
+        setZRotation(zRot + 8 * dx);
+    }
+    lastPos = event->pos();
+}
+//! [10]
+
+GLuint GLWidget::makeObject()
+{
+    GLuint list = glGenLists(1);
+    glNewList(list, GL_COMPILE);
+
+    glBegin(GL_QUADS);
+
+    GLdouble x1 = +0.06;
+    GLdouble y1 = -0.14;
+    GLdouble x2 = +0.14;
+    GLdouble y2 = -0.06;
+    GLdouble x3 = +0.08;
+    GLdouble y3 = +0.00;
+    GLdouble x4 = +0.30;
+    GLdouble y4 = +0.22;
+
+    quad(x1, y1, x2, y2, y2, x2, y1, x1);
+    quad(x3, y3, x4, y4, y4, x4, y3, x3);
+
+    extrude(x1, y1, x2, y2);
+    extrude(x2, y2, y2, x2);
+    extrude(y2, x2, y1, x1);
+    extrude(y1, x1, x1, y1);
+    extrude(x3, y3, x4, y4);
+    extrude(x4, y4, y4, x4);
+    extrude(y4, x4, y3, x3);
+
+    const double Pi = 3.14159265358979323846;
+    const int NumSectors = 200;
+
+    for (int i = 0; i < NumSectors; ++i) {
+        double angle1 = (i * 2 * Pi) / NumSectors;
+        GLdouble x5 = 0.30 * sin(angle1);
+        GLdouble y5 = 0.30 * cos(angle1);
+        GLdouble x6 = 0.20 * sin(angle1);
+        GLdouble y6 = 0.20 * cos(angle1);
+
+        double angle2 = ((i + 1) * 2 * Pi) / NumSectors;
+        GLdouble x7 = 0.20 * sin(angle2);
+        GLdouble y7 = 0.20 * cos(angle2);
+        GLdouble x8 = 0.30 * sin(angle2);
+        GLdouble y8 = 0.30 * cos(angle2);
+
+        quad(x5, y5, x6, y6, x7, y7, x8, y8);
+
+        extrude(x6, y6, x7, y7);
+        extrude(x8, y8, x5, y5);
+    }
+
+    glEnd();
+
+    glEndList();
+    return list;
+}
+
+void GLWidget::quad(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2,
+                    GLdouble x3, GLdouble y3, GLdouble x4, GLdouble y4)
+{
+    qglColor(trolltechGreen);
+
+    glVertex3d(x1, y1, -0.05);
+    glVertex3d(x2, y2, -0.05);
+    glVertex3d(x3, y3, -0.05);
+    glVertex3d(x4, y4, -0.05);
+
+    glVertex3d(x4, y4, +0.05);
+    glVertex3d(x3, y3, +0.05);
+    glVertex3d(x2, y2, +0.05);
+    glVertex3d(x1, y1, +0.05);
+}
+
+void GLWidget::extrude(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
+{
+    qglColor(trolltechGreen.dark(250 + int(100 * x1)));
+
+    glVertex3d(x1, y1, +0.05);
+    glVertex3d(x2, y2, +0.05);
+    glVertex3d(x2, y2, -0.05);
+    glVertex3d(x1, y1, -0.05);
+}
+
+void GLWidget::normalizeAngle(int *angle)
+{
+    while (*angle < 0)
+        *angle += 360 * 16;
+    while (*angle > 360 * 16)
+        *angle -= 360 * 16;
+}
diff --git a/examples/opengl/hellogl/glwidget.h b/examples/opengl/hellogl/glwidget.h
new file mode 100644
index 0000000000..a5f73ee9c5
--- /dev/null
+++ b/examples/opengl/hellogl/glwidget.h
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GLWIDGET_H
+#define GLWIDGET_H
+
+#include <QGLWidget>
+
+//! [0]
+class GLWidget : public QGLWidget
+{
+    Q_OBJECT
+
+public:
+    GLWidget(QWidget *parent = 0);
+    ~GLWidget();
+
+    QSize minimumSizeHint() const;
+    QSize sizeHint() const;
+//! [0]
+
+//! [1]
+public slots:
+    void setXRotation(int angle);
+    void setYRotation(int angle);
+    void setZRotation(int angle);
+
+signals:
+    void xRotationChanged(int angle);
+    void yRotationChanged(int angle);
+    void zRotationChanged(int angle);
+//! [1]
+
+//! [2]
+protected:
+    void initializeGL();
+    void paintGL();
+    void resizeGL(int width, int height);
+    void mousePressEvent(QMouseEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
+//! [2]
+
+//! [3]
+private:
+    GLuint makeObject();
+    void quad(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2,
+              GLdouble x3, GLdouble y3, GLdouble x4, GLdouble y4);
+    void extrude(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
+    void normalizeAngle(int *angle);
+
+    GLuint object;
+    int xRot;
+    int yRot;
+    int zRot;
+    QPoint lastPos;
+    QColor trolltechGreen;
+    QColor trolltechPurple;
+};
+//! [3]
+
+#endif
diff --git a/examples/opengl/hellogl/hellogl.pro b/examples/opengl/hellogl/hellogl.pro
new file mode 100644
index 0000000000..ce9c8e8e34
--- /dev/null
+++ b/examples/opengl/hellogl/hellogl.pro
@@ -0,0 +1,12 @@
+HEADERS       = glwidget.h \
+                window.h
+SOURCES       = glwidget.cpp \
+                main.cpp \
+                window.cpp
+QT           += opengl
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl
+INSTALLS += target sources
diff --git a/examples/opengl/hellogl/main.cpp b/examples/opengl/hellogl/main.cpp
new file mode 100644
index 0000000000..fa8b0abb9d
--- /dev/null
+++ b/examples/opengl/hellogl/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "window.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Window window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/opengl/hellogl/window.cpp b/examples/opengl/hellogl/window.cpp
new file mode 100644
index 0000000000..82031ee013
--- /dev/null
+++ b/examples/opengl/hellogl/window.cpp
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "glwidget.h"
+#include "window.h"
+
+//! [0]
+Window::Window()
+{
+    glWidget = new GLWidget;
+
+    xSlider = createSlider();
+    ySlider = createSlider();
+    zSlider = createSlider();
+
+    connect(xSlider, SIGNAL(valueChanged(int)), glWidget, SLOT(setXRotation(int)));
+    connect(glWidget, SIGNAL(xRotationChanged(int)), xSlider, SLOT(setValue(int)));
+    connect(ySlider, SIGNAL(valueChanged(int)), glWidget, SLOT(setYRotation(int)));
+    connect(glWidget, SIGNAL(yRotationChanged(int)), ySlider, SLOT(setValue(int)));
+    connect(zSlider, SIGNAL(valueChanged(int)), glWidget, SLOT(setZRotation(int)));
+    connect(glWidget, SIGNAL(zRotationChanged(int)), zSlider, SLOT(setValue(int)));
+//! [0]
+
+//! [1]
+    QHBoxLayout *mainLayout = new QHBoxLayout;
+    mainLayout->addWidget(glWidget);
+    mainLayout->addWidget(xSlider);
+    mainLayout->addWidget(ySlider);
+    mainLayout->addWidget(zSlider);
+    setLayout(mainLayout);
+
+    xSlider->setValue(15 * 16);
+    ySlider->setValue(345 * 16);
+    zSlider->setValue(0 * 16);
+    setWindowTitle(tr("Hello GL"));
+}
+//! [1]
+
+//! [2]
+QSlider *Window::createSlider()
+{
+    QSlider *slider = new QSlider(Qt::Vertical);
+    slider->setRange(0, 360 * 16);
+    slider->setSingleStep(16);
+    slider->setPageStep(15 * 16);
+    slider->setTickInterval(15 * 16);
+    slider->setTickPosition(QSlider::TicksRight);
+    return slider;
+}
+//! [2]
diff --git a/examples/opengl/hellogl/window.h b/examples/opengl/hellogl/window.h
new file mode 100644
index 0000000000..b20f8a8e13
--- /dev/null
+++ b/examples/opengl/hellogl/window.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QSlider;
+QT_END_NAMESPACE
+//! [0]
+class GLWidget;
+
+class Window : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Window();
+
+private:
+    QSlider *createSlider();
+
+    GLWidget *glWidget;
+    QSlider *xSlider;
+    QSlider *ySlider;
+    QSlider *zSlider;
+};
+//! [0]
+
+#endif
diff --git a/examples/opengl/hellogl_es/bubble.cpp b/examples/opengl/hellogl_es/bubble.cpp
new file mode 100644
index 0000000000..691d314111
--- /dev/null
+++ b/examples/opengl/hellogl_es/bubble.cpp
@@ -0,0 +1,140 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "bubble.h"
+
+Bubble::Bubble(const QPointF &position, qreal radius, const QPointF &velocity)
+    : position(position), vel(velocity), radius(radius)
+{
+    innerColor = randomColor();
+    outerColor = randomColor();
+    cache = 0;
+    updateBrush();
+}
+
+//! [0]
+void Bubble::updateCache()
+{
+    if (cache)
+        delete cache;
+    cache = new QImage(qRound(radius * 2 + 2), qRound(radius * 2 + 2), QImage::Format_ARGB32);
+    cache->fill(0x00000000);
+    QPainter p(cache);
+    p.setRenderHint(QPainter::HighQualityAntialiasing);
+    QPen pen(Qt::white);
+    pen.setWidth(2);
+    p.setPen(pen);
+    p.setBrush(brush);
+    p.drawEllipse(0, 0, int(2*radius), int(2*radius));
+}
+//! [0]
+
+Bubble::~Bubble()
+{
+    if (cache)
+        delete cache;
+}
+
+void Bubble::updateBrush()
+{
+    QRadialGradient gradient(QPointF(radius, radius), radius,
+                             QPointF(radius*0.5, radius*0.5));
+
+    gradient.setColorAt(0, QColor(255, 255, 255, 255));
+    gradient.setColorAt(0.25, innerColor);
+    gradient.setColorAt(1, outerColor);
+    brush = QBrush(gradient);
+    updateCache();
+}
+
+//! [1]
+void Bubble::drawBubble(QPainter *painter)
+{
+    painter->save();
+    painter->translate(position.x() - radius, position.y() - radius);
+    painter->setOpacity(0.8);
+    painter->drawImage(0, 0, *cache);
+    painter->restore();
+}
+//! [1]
+
+QColor Bubble::randomColor()
+{
+    int red = int(185 + 70.0*qrand()/(RAND_MAX+1.0));
+    int green = int(185 + 70.0*qrand()/(RAND_MAX+1.0));
+    int blue = int(205 + 50.0*qrand()/(RAND_MAX+1.0));
+    int alpha = int(91 + 100.0*qrand()/(RAND_MAX+1.0));
+
+    return QColor(red, green, blue, alpha);
+}
+
+void Bubble::move(const QRect &bbox)
+{
+    position += vel;
+    qreal leftOverflow = position.x() - radius - bbox.left();
+    qreal rightOverflow = position.x() + radius - bbox.right();
+    qreal topOverflow = position.y() - radius - bbox.top();
+    qreal bottomOverflow = position.y() + radius - bbox.bottom();
+    
+    if (leftOverflow < 0.0) {
+        position.setX(position.x() - 2 * leftOverflow);
+        vel.setX(-vel.x());
+    } else if (rightOverflow > 0.0) {
+        position.setX(position.x() - 2 * rightOverflow);
+        vel.setX(-vel.x());
+    }
+
+    if (topOverflow < 0.0) {
+        position.setY(position.y() - 2 * topOverflow);
+        vel.setY(-vel.y());
+    } else if (bottomOverflow > 0.0) {
+        position.setY(position.y() - 2 * bottomOverflow);
+        vel.setY(-vel.y());
+    }
+}
+
+QRectF Bubble::rect()
+{
+    return QRectF(position.x() - radius, position.y() - radius,
+                  2 * radius, 2 * radius);
+}
diff --git a/examples/opengl/hellogl_es/bubble.h b/examples/opengl/hellogl_es/bubble.h
new file mode 100644
index 0000000000..a32754fe0c
--- /dev/null
+++ b/examples/opengl/hellogl_es/bubble.h
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BUBBLE_H
+#define BUBBLE_H
+
+#include <QBrush>
+#include <QColor>
+#include <QPointF>
+#include <QRect>
+#include <QRectF>
+
+class QPainter;
+
+class Bubble
+{
+public:
+    Bubble(const QPointF &position, qreal radius, const QPointF &velocity);
+    ~Bubble();
+
+    void drawBubble(QPainter *painter);
+    void updateBrush();
+    void move(const QRect &bbox);
+    void updateCache();
+    QRectF rect();
+
+private:
+    QColor randomColor();
+
+    QBrush brush;
+    QPointF position;
+    QPointF vel;
+    qreal radius;
+    QColor innerColor;
+    QColor outerColor;
+    QImage *cache;
+};
+
+#endif
diff --git a/examples/opengl/hellogl_es/cl_helper.h b/examples/opengl/hellogl_es/cl_helper.h
new file mode 100644
index 0000000000..416c9bbf04
--- /dev/null
+++ b/examples/opengl/hellogl_es/cl_helper.h
@@ -0,0 +1,133 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifdef QT_OPENGL_ES_1_CL
+
+//! [0]
+#define FLOAT2X(f)      ((int) ( (f) * (65536)))
+#define X2FLOAT(x)      ((float)(x) / 65536.0f)
+
+#define f2vt(f)     FLOAT2X(f)
+#define vt2f(x)     X2FLOAT(x)
+
+#define q_vertexType GLfixed
+#define q_vertexTypeEnum GL_FIXED
+
+#define q_glFog             glFogx
+#define q_glFogv            glFogxv
+//! [0]
+
+#define q_glLight           glLightx
+#define q_glLightv          glLightxv
+#define q_glLightModel      glLightModelx
+#define q_glLightModelv     glLightModelxv
+
+#define q_glAlphaFunc       glAlphaFuncx
+
+#define q_glMaterial        glMaterialx
+#define q_glMaterialv       glMaterialxv
+#define q_glColor4          glColor4x
+
+#define q_glTexParameter    glTexParameterx
+#define q_glTexEnv          glTexEnvx
+
+#define q_glOrtho           glOrthox
+#define q_glFrustum         glFrustumx
+
+#define q_glTranslate       glTranslatex
+#define q_glScale           glScalex
+#define q_glRotate          glRotatex
+#define q_glLoadMatrix      glLoadMatrixx
+
+#define q_glClearColor      glClearColorx
+
+#define q_glMultMatrix      glMultMatrixx
+
+#define q_glNormal3         glNormal3x
+
+#define q_glPolygonOffset   glPolygonOffsetx
+#define q_glPointSize       glPointSizex
+
+//! [1]
+#else
+
+#define f2vt(f)     (f)
+#define vt2f(x)     (x)
+
+#define q_vertexType GLfloat
+#define q_vertexTypeEnum GL_FLOAT
+
+#define q_glFog             glFogf
+#define q_glFogv            glFogfv
+//! [1]
+
+#define q_glLight           glLightf
+#define q_glLightv          glLightfv
+#define q_glLightModel      glLightModelf
+#define q_glLightModelv     glLightModelfv
+
+#define q_glAlphaFunc       glAlphaFuncf
+
+#define q_glMaterial        glMaterialf
+#define q_glMaterialv       glMaterialfv
+#define q_glColor4          glColor4f
+
+#define q_glTexParameter    glTexParameterf
+#define q_glTexEnv          glTexEnvf
+
+#define q_glOrtho           glOrthof
+#define q_glFrustum         glFrustumf
+
+#define q_glTranslate       glTranslatef
+#define q_glScale           glScalef
+#define q_glRotate          glRotatef
+#define q_glLoadMatrix      glLoadMatrixf
+
+#define q_glClearColor      glClearColor
+
+#define q_glMultMatrix      glMultMatrixf
+
+#define q_glNormal3         glNormal3f
+
+#define q_glPolygonOffset   glPolygonOffsetf
+#define q_glPointSize       glPointSizef
+
+#endif
diff --git a/examples/opengl/hellogl_es/glwidget.cpp b/examples/opengl/hellogl_es/glwidget.cpp
new file mode 100644
index 0000000000..6098c999f6
--- /dev/null
+++ b/examples/opengl/hellogl_es/glwidget.cpp
@@ -0,0 +1,457 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "glwidget.h"
+#include <QPainter>
+#include <math.h>
+
+#include "bubble.h"
+#include "cl_helper.h"
+
+
+const int bubbleNum = 8;
+
+inline void CrossProduct(qreal &xOut, qreal &yOut, qreal &zOut, qreal x1, qreal y1, qreal z1, qreal x2, qreal y2, qreal z2)
+{
+   xOut = y1 * z2 - z1 * y2;
+   yOut = z1 * x2 - x1 * z2;
+   zOut = x1 * y2 - y1 * x2;
+}
+
+inline void Normalize(qreal &x, qreal &y, qreal &z)
+{
+    qreal l = sqrt(x*x + y*y + z*z);
+    x = x / l;
+    y = y / l;
+    z = z / l;
+}
+
+GLWidget::GLWidget(QWidget *parent)
+    : QGLWidget(parent)
+{
+    qtLogo = true;
+    createdVertices = 0;
+    createdNormals = 0;
+    m_vertexNumber = 0;
+    frames = 0;
+    setAttribute(Qt::WA_PaintOnScreen);
+    setAttribute(Qt::WA_NoSystemBackground);
+    setAutoBufferSwap(false);
+    m_showBubbles = true;
+}
+
+GLWidget::~GLWidget()
+{
+  if (createdVertices)
+      delete[] createdVertices;
+  if (createdNormals)
+      delete[] createdNormals;
+}
+
+void GLWidget::setScaling(int scale) {
+
+    if (scale > 50)
+        m_fScale = 1 + qreal(scale -50) / 50 * 0.5;
+    else if (scale < 50)
+        m_fScale =  1- (qreal(50 - scale) / 50 * 1/2);
+    else 
+      m_fScale = 1;
+}
+
+void GLWidget::setLogo() {
+    qtLogo = true;
+}
+
+void GLWidget::setTexture() {
+    qtLogo = false;
+}
+
+void GLWidget::showBubbles(bool bubbles)
+{
+   m_showBubbles = bubbles;
+}
+
+//! [2]
+void GLWidget::paintQtLogo()
+{
+    glDisable(GL_TEXTURE_2D);
+    glEnableClientState(GL_VERTEX_ARRAY);
+    glVertexPointer(3,q_vertexTypeEnum,0, createdVertices);
+    glEnableClientState(GL_NORMAL_ARRAY);
+    glNormalPointer(q_vertexTypeEnum,0,createdNormals);
+    glDrawArrays(GL_TRIANGLES, 0, m_vertexNumber / 3);
+}
+//! [2]
+
+void GLWidget::paintTexturedCube()
+{
+    glEnable(GL_TEXTURE_2D);
+    glBindTexture(GL_TEXTURE_2D, m_uiTexture);
+    q_vertexType afVertices[] = {
+        f2vt(-0.5), f2vt(0.5), f2vt(0.5), f2vt(0.5),f2vt(-0.5),f2vt(0.5),f2vt(-0.5),f2vt(-0.5),f2vt(0.5),
+        f2vt(0.5), f2vt(-0.5), f2vt(0.5), f2vt(-0.5),f2vt(0.5),f2vt(0.5),f2vt(0.5),f2vt(0.5),f2vt(0.5),
+        f2vt(-0.5), f2vt(-0.5), f2vt(-0.5), f2vt(0.5),f2vt(-0.5),f2vt(-0.5),f2vt(-0.5),f2vt(0.5),f2vt(-0.5),
+        f2vt(0.5), f2vt(0.5), f2vt(-0.5), f2vt(-0.5),f2vt(0.5),f2vt(-0.5),f2vt(0.5),f2vt(-0.5),f2vt(-0.5),
+
+        f2vt(0.5), f2vt(-0.5), f2vt(-0.5), f2vt(0.5),f2vt(-0.5),f2vt(0.5),f2vt(0.5),f2vt(0.5),f2vt(-0.5),
+        f2vt(0.5), f2vt(0.5), f2vt(0.5), f2vt(0.5),f2vt(0.5),f2vt(-0.5),f2vt(0.5),f2vt(-0.5),f2vt(0.5),
+        f2vt(-0.5), f2vt(0.5), f2vt(-0.5), f2vt(-0.5),f2vt(-0.5),f2vt(0.5),f2vt(-0.5),f2vt(-0.5),f2vt(-0.5),
+        f2vt(-0.5), f2vt(-0.5), f2vt(0.5), f2vt(-0.5),f2vt(0.5),f2vt(-0.5),f2vt(-0.5),f2vt(0.5),f2vt(0.5),
+
+        f2vt(0.5), f2vt(0.5),  f2vt(-0.5), f2vt(-0.5), f2vt(0.5),  f2vt(0.5),  f2vt(-0.5),  f2vt(0.5),  f2vt(-0.5),
+        f2vt(-0.5),  f2vt(0.5),  f2vt(0.5),  f2vt(0.5),  f2vt(0.5),  f2vt(-0.5), f2vt(0.5), f2vt(0.5),  f2vt(0.5),
+        f2vt(-0.5),  f2vt(-0.5), f2vt(-0.5), f2vt(-0.5), f2vt(-0.5), f2vt(0.5),  f2vt(0.5), f2vt(-0.5), f2vt(-0.5),
+        f2vt(0.5), f2vt(-0.5), f2vt(0.5),  f2vt(0.5),  f2vt(-0.5), f2vt(-0.5), f2vt(-0.5),  f2vt(-0.5), f2vt(0.5)
+    };
+    glEnableClientState(GL_VERTEX_ARRAY);
+    glVertexPointer(3,q_vertexTypeEnum,0,afVertices);
+
+    q_vertexType afTexCoord[] = {
+        f2vt(0.0f),f2vt(0.0f), f2vt(1.0f),f2vt(1.0f), f2vt(1.0f),f2vt(0.0f),
+        f2vt(1.0f),f2vt(1.0f), f2vt(0.0f),f2vt(0.0f), f2vt(0.0f),f2vt(1.0f),
+        f2vt(1.0f),f2vt(1.0f), f2vt(1.0f),f2vt(0.0f), f2vt(0.0f),f2vt(1.0f),
+        f2vt(0.0f),f2vt(0.0f), f2vt(0.0f),f2vt(1.0f), f2vt(1.0f),f2vt(0.0f),
+
+        f2vt(1.0f),f2vt(1.0f), f2vt(1.0f),f2vt(0.0f), f2vt(0.0f),f2vt(1.0f),
+        f2vt(0.0f),f2vt(0.0f), f2vt(0.0f),f2vt(1.0f), f2vt(1.0f),f2vt(0.0f),
+        f2vt(0.0f),f2vt(0.0f), f2vt(1.0f),f2vt(1.0f), f2vt(1.0f),f2vt(0.0f),
+        f2vt(1.0f),f2vt(1.0f), f2vt(0.0f),f2vt(0.0f), f2vt(0.0f),f2vt(1.0f),
+
+        f2vt(0.0f),f2vt(1.0f), f2vt(1.0f),f2vt(0.0f), f2vt(1.0f),f2vt(1.0f),
+        f2vt(1.0f),f2vt(0.0f), f2vt(0.0f),f2vt(1.0f), f2vt(0.0f),f2vt(0.0f),
+        f2vt(1.0f),f2vt(0.0f), f2vt(1.0f),f2vt(1.0f), f2vt(0.0f),f2vt(0.0f),
+        f2vt(0.0f),f2vt(1.0f), f2vt(0.0f),f2vt(0.0f), f2vt(1.0f),f2vt(1.0f)
+    };
+    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+    glTexCoordPointer(2,q_vertexTypeEnum,0,afTexCoord);
+
+    q_vertexType afNormals[] = {
+
+        f2vt(0),f2vt(0),f2vt(-1), f2vt(0),f2vt(0),f2vt(-1), f2vt(0),f2vt(0),f2vt(-1),
+        f2vt(0),f2vt(0),f2vt(-1), f2vt(0),f2vt(0),f2vt(-1), f2vt(0),f2vt(0),f2vt(-1),
+        f2vt(0),f2vt(0),f2vt(1), f2vt(0),f2vt(0),f2vt(1), f2vt(0),f2vt(0),f2vt(1),
+        f2vt(0),f2vt(0),f2vt(1), f2vt(0),f2vt(0),f2vt(1), f2vt(0),f2vt(0),f2vt(1),
+
+        f2vt(-1),f2vt(0),f2vt(0), f2vt(-1),f2vt(0),f2vt(0), f2vt(-1),f2vt(0),f2vt(0),
+        f2vt(-1),f2vt(0),f2vt(0), f2vt(-1),f2vt(0),f2vt(0), f2vt(-1),f2vt(0),f2vt(0),
+        f2vt(1),f2vt(0),f2vt(0), f2vt(1),f2vt(0),f2vt(0), f2vt(1),f2vt(0),f2vt(0),
+        f2vt(1),f2vt(0),f2vt(0), f2vt(1),f2vt(0),f2vt(0), f2vt(1),f2vt(0),f2vt(0),
+
+        f2vt(0),f2vt(-1),f2vt(0), f2vt(0),f2vt(-1),f2vt(0), f2vt(0),f2vt(-1),f2vt(0),
+        f2vt(0),f2vt(-1),f2vt(0), f2vt(0),f2vt(-1),f2vt(0), f2vt(0),f2vt(-1),f2vt(0),
+        f2vt(0),f2vt(1),f2vt(0), f2vt(0),f2vt(1),f2vt(0), f2vt(0),f2vt(1),f2vt(0),
+        f2vt(0),f2vt(1),f2vt(0), f2vt(0),f2vt(1),f2vt(0), f2vt(0),f2vt(1),f2vt(0)
+    };
+    glEnableClientState(GL_NORMAL_ARRAY);
+    glNormalPointer(q_vertexTypeEnum,0,afNormals);
+
+    glDrawArrays(GL_TRIANGLES, 0, 36);
+}
+
+void GLWidget::initializeGL ()
+{
+    q_glClearColor(f2vt(0.1f), f2vt(0.1f), f2vt(0.2f), f2vt(1.0f));
+
+    glEnable(GL_TEXTURE_2D);
+    glGenTextures(1, &m_uiTexture);
+    m_uiTexture = bindTexture(QImage(":/qt.png"));
+
+    q_glTexParameter(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+    q_glTexParameter(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+    glEnable(GL_LIGHTING);
+    glEnable(GL_LIGHT0);
+
+    q_vertexType aLightPosition[] = {f2vt(0.0f),f2vt(0.3f),f2vt(1.0f),f2vt(0.0f)};
+
+    q_glLightv(GL_LIGHT0, GL_SPOT_DIRECTION, aLightPosition);
+    m_fAngle = 0;
+    m_fScale = 1;
+    createGeometry();
+    createBubbles(bubbleNum - bubbles.count());
+}
+
+void GLWidget::paintGL()
+{
+    createBubbles(bubbleNum - bubbles.count());
+
+//! [3]    
+    QPainter painter;
+    painter.begin(this);
+
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+    glLoadIdentity();
+//! [3]    
+
+//! [4]    
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+    glMatrixMode(GL_TEXTURE);
+    glPushMatrix();
+
+    //Since OpenGL ES does not support glPush/PopAttrib(GL_ALL_ATTRIB_BITS) 
+    //we have to take care of the states ourselves
+
+    q_glClearColor(f2vt(0.1f), f2vt(0.1f), f2vt(0.2f), f2vt(1.0f));
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glEnable(GL_TEXTURE_2D);
+
+    q_glTexParameter(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+    q_glTexParameter(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+    glEnable(GL_LIGHTING);
+    glEnable(GL_LIGHT0);
+
+    glShadeModel(GL_FLAT);
+    glFrontFace(GL_CW);
+    glCullFace(GL_FRONT);
+    glEnable(GL_CULL_FACE);
+    glEnable(GL_DEPTH_TEST);
+
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+
+    q_glRotate(f2vt(m_fAngle), f2vt(0.0), f2vt(1.0), f2vt(0.0));
+    q_glRotate(f2vt(m_fAngle), f2vt(1.0), f2vt(0.0), f2vt(0.0));
+    q_glRotate(f2vt(m_fAngle), f2vt(0.0), f2vt(0.0), f2vt(1.0));
+    q_glScale(f2vt(m_fScale), f2vt(m_fScale),f2vt(m_fScale));
+    q_glTranslate(f2vt(0),f2vt(-0.2),f2vt(0));
+
+    q_vertexType matDiff[] = {f2vt(0.40), f2vt(1.0), f2vt(0.0), f2vt(1.0)};
+    q_glMaterialv(GL_FRONT_AND_BACK, GL_DIFFUSE, matDiff);
+
+    if (qtLogo)
+        paintQtLogo();
+    else
+        paintTexturedCube();
+//! [4]    
+
+//![5]
+    glMatrixMode(GL_MODELVIEW);
+    glPopMatrix();
+    glMatrixMode(GL_PROJECTION);
+    glPopMatrix();
+    glMatrixMode(GL_TEXTURE);
+    glPopMatrix();
+
+    glDisable(GL_LIGHTING);
+    glDisable(GL_LIGHT0);
+
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_CULL_FACE);
+//![5]
+
+//! [6]
+    if (m_showBubbles)
+        foreach (Bubble *bubble, bubbles) {
+            bubble->drawBubble(&painter);
+    }
+//! [6]
+
+//! [7]
+    QString framesPerSecond;
+    framesPerSecond.setNum(frames /(time.elapsed() / 1000.0), 'f', 2);
+
+    painter.setPen(Qt::white);
+
+    painter.drawText(20, 40, framesPerSecond + " fps");
+
+    painter.end();
+//! [7]
+    
+//! [8]
+    swapBuffers();
+//! [8]
+
+    QMutableListIterator<Bubble*> iter(bubbles);
+
+    while (iter.hasNext()) {
+        Bubble *bubble = iter.next();
+        bubble->move(rect());
+    }
+    if (!(frames % 100)) {
+        time.start();
+        frames = 0;
+    }
+    m_fAngle += 1.0f;
+    frames ++;
+}
+
+void GLWidget::createBubbles(int number)
+{
+    for (int i = 0; i < number; ++i) {
+        QPointF position(width()*(0.1 + (0.8*qrand()/(RAND_MAX+1.0))),
+                        height()*(0.1 + (0.8*qrand()/(RAND_MAX+1.0))));
+        qreal radius = qMin(width(), height())*(0.0175 + 0.0875*qrand()/(RAND_MAX+1.0));
+        QPointF velocity(width()*0.0175*(-0.5 + qrand()/(RAND_MAX+1.0)),
+                        height()*0.0175*(-0.5 + qrand()/(RAND_MAX+1.0)));
+
+        bubbles.append(new Bubble(position, radius, velocity));
+    }
+}
+
+void GLWidget::createGeometry()
+{
+    vertices.clear();
+    normals.clear();
+
+    qreal x1 = +0.06f;
+    qreal y1 = -0.14f;
+    qreal x2 = +0.14f;
+    qreal y2 = -0.06f;
+    qreal x3 = +0.08f;
+    qreal y3 = +0.00f;
+    qreal x4 = +0.30f;
+    qreal y4 = +0.22f;
+
+    quad(x1, y1, x2, y2, y2, x2, y1, x1);
+    quad(x3, y3, x4, y4, y4, x4, y3, x3);
+
+    extrude(x1, y1, x2, y2);
+    extrude(x2, y2, y2, x2);
+    extrude(y2, x2, y1, x1);
+    extrude(y1, x1, x1, y1);
+    extrude(x3, y3, x4, y4);
+    extrude(x4, y4, y4, x4);
+    extrude(y4, x4, y3, x3);
+
+    const qreal Pi = 3.14159f;
+    const int NumSectors = 100;
+
+    for (int i = 0; i < NumSectors; ++i) {
+        qreal angle1 = (i * 2 * Pi) / NumSectors;
+        qreal x5 = 0.30 * sin(angle1);
+        qreal y5 = 0.30 * cos(angle1);
+        qreal x6 = 0.20 * sin(angle1);
+        qreal y6 = 0.20 * cos(angle1);
+
+        qreal angle2 = ((i + 1) * 2 * Pi) / NumSectors;
+        qreal x7 = 0.20 * sin(angle2);
+        qreal y7 = 0.20 * cos(angle2);
+        qreal x8 = 0.30 * sin(angle2);
+        qreal y8 = 0.30 * cos(angle2);
+
+        quad(x5, y5, x6, y6, x7, y7, x8, y8);
+
+        extrude(x6, y6, x7, y7);
+        extrude(x8, y8, x5, y5);
+    }
+
+//! [1]
+    m_vertexNumber = vertices.size();
+    createdVertices = new q_vertexType[m_vertexNumber];
+    createdNormals = new q_vertexType[m_vertexNumber];
+    for (int i = 0;i < m_vertexNumber;i++) {
+      createdVertices[i] = f2vt(vertices.at(i) * 2);
+      createdNormals[i] = f2vt(normals.at(i));
+    }
+    vertices.clear();
+    normals.clear();
+}
+//! [1]
+
+//! [0]
+void GLWidget::quad(qreal x1, qreal y1, qreal x2, qreal y2, qreal x3, qreal y3, qreal x4, qreal y4)
+{
+    qreal nx, ny, nz;
+
+    vertices << x1 << y1 << -0.05f;
+    vertices << x2 << y2 << -0.05f;
+    vertices << x4 << y4 << -0.05f;
+
+    vertices << x3 << y3 << -0.05f;
+    vertices << x4 << y4 << -0.05f;
+    vertices << x2 << y2 << -0.05f;
+
+    CrossProduct(nx, ny, nz, x2 - x1, y2 - y1, 0, x4 - x1, y4 - y1, 0);
+    Normalize(nx, ny, nz);
+
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+
+    vertices << x4 << y4 << 0.05f;
+    vertices << x2 << y2 << 0.05f;
+    vertices << x1 << y1 << 0.05f;
+
+    vertices << x2 << y2 << 0.05f;
+    vertices << x4 << y4 << 0.05f;
+    vertices << x3 << y3 << 0.05f;
+
+    CrossProduct(nx, ny, nz, x2 - x4, y2 - y4, 0, x1 - x4, y1 - y4, 0);
+    Normalize(nx, ny, nz);
+
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+}
+//! [0]
+
+void GLWidget::extrude(qreal x1, qreal y1, qreal x2, qreal y2)
+{
+    qreal nx, ny, nz;
+
+    vertices << x1 << y1 << +0.05f;
+    vertices << x2 << y2 << +0.05f;
+    vertices << x1 << y1 << -0.05f;
+
+    vertices << x2 << y2 << -0.05f;
+    vertices << x1 << y1 << -0.05f;
+    vertices << x2 << y2 << +0.05f;
+
+    CrossProduct(nx, ny, nz, x2 - x1, y2 - y1, 0.0f, 0.0f, 0.0f, -0.1f);
+    Normalize(nx, ny, nz);
+
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+}
diff --git a/examples/opengl/hellogl_es/glwidget.h b/examples/opengl/hellogl_es/glwidget.h
new file mode 100644
index 0000000000..954342e3af
--- /dev/null
+++ b/examples/opengl/hellogl_es/glwidget.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GLWIDGET_H
+#define GLWIDGET_H
+
+#include <QGLWidget>
+#include <QTime>
+
+#include "cl_helper.h"
+
+
+class Bubble;
+class GLWidget : public QGLWidget {
+
+    Q_OBJECT
+public:
+    GLWidget(QWidget *parent = 0);
+    ~GLWidget();
+public slots: 
+    void setScaling(int scale);
+    void setLogo();
+    void setTexture();
+    void showBubbles(bool);
+protected:
+    void paintGL ();
+    void initializeGL ();
+private:
+    GLuint  m_uiTexture;
+    qreal   m_fAngle;
+    qreal   m_fScale;
+    bool m_showBubbles;
+    void paintTexturedCube();
+    void paintQtLogo();
+    void createGeometry();
+    void createBubbles(int number);
+    void quad(qreal x1, qreal y1, qreal x2, qreal y2, qreal x3, qreal y3, qreal x4, qreal y4);
+    void extrude(qreal x1, qreal y1, qreal x2, qreal y2);
+    QList<qreal> vertices;
+    QList<qreal> normals;
+    q_vertexType *createdVertices;
+    q_vertexType *createdNormals;
+    int m_vertexNumber;
+    bool qtLogo;
+    QList<Bubble*> bubbles;
+    int frames;
+    QTime time;
+};
+#endif
diff --git a/examples/opengl/hellogl_es/hellogl_es.pro b/examples/opengl/hellogl_es/hellogl_es.pro
new file mode 100644
index 0000000000..7459456785
--- /dev/null
+++ b/examples/opengl/hellogl_es/hellogl_es.pro
@@ -0,0 +1,34 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Thu Oct 4 19:01:12 2007
+######################################################################
+
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += main.cpp
+SOURCES += glwidget.cpp
+SOURCES += mainwindow.cpp
+SOURCES += bubble.cpp
+
+HEADERS += glwidget.h
+HEADERS += mainwindow.h
+HEADERS += bubble.h
+
+RESOURCES += texture.qrc
+QT += opengl
+
+contains(QT_CONFIG,opengles1) {
+        QMAKE_LIBS += "libGLES_CM.lib"
+}
+contains(QT_CONFIG,opengles1cl) {
+        QMAKE_LIBS += "libGLES_CL.lib"
+}
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl_es.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es
+INSTALLS += target sources
diff --git a/examples/opengl/hellogl_es/main.cpp b/examples/opengl/hellogl_es/main.cpp
new file mode 100644
index 0000000000..feff054783
--- /dev/null
+++ b/examples/opengl/hellogl_es/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QMainWindow>
+#include "mainwindow.h"
+
+int main( int argc, char ** argv )
+{
+    Q_INIT_RESOURCE(texture);
+    QApplication a( argc, argv );
+    MainWindow mw;
+    mw.showMaximized();
+    return a.exec();
+}
diff --git a/examples/opengl/hellogl_es/mainwindow.cpp b/examples/opengl/hellogl_es/mainwindow.cpp
new file mode 100644
index 0000000000..26fbeaa31b
--- /dev/null
+++ b/examples/opengl/hellogl_es/mainwindow.cpp
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mainwindow.h"
+
+#include <QApplication>
+#include <QMenuBar>
+#include <QGroupBox>
+#include <QGridLayout>
+#include <QSlider>
+#include <QLabel>
+#include <QTimer>
+
+#include "glwidget.h"
+
+MainWindow::MainWindow()
+{
+    GLWidget *glwidget = new GLWidget();
+    QLabel *label = new QLabel(this);
+    QTimer *timer = new QTimer(this);
+    QSlider *slider = new QSlider(this);
+    slider->setOrientation(Qt::Horizontal);
+    
+    slider->setRange(0, 100);
+    slider->setSliderPosition(50);
+    timer->setInterval(10);
+    label->setText("A QGlWidget with OpenGl ES");
+    label->setAlignment(Qt::AlignHCenter);
+
+    QGroupBox * groupBox = new QGroupBox(this);
+    setCentralWidget(groupBox);
+    groupBox->setTitle("OpenGL ES Example");
+
+    QGridLayout *layout = new QGridLayout(groupBox);
+
+    layout->addWidget(glwidget,1,0,8,1);
+    layout->addWidget(label,9,0,1,1);
+    layout->addWidget(slider, 11,0,1,1);
+
+    groupBox->setLayout(layout);
+
+    QMenu *fileMenu = new QMenu("File");
+    QMenu *helpMenu = new QMenu("Help");
+    QMenu *showMenu = new QMenu("Show");
+    menuBar()->addMenu(fileMenu);
+    menuBar()->addMenu(showMenu);
+    menuBar()->addMenu(helpMenu);
+    QAction *exit = new QAction("Exit", fileMenu);
+    QAction *aboutQt = new QAction("AboutQt", helpMenu);
+    QAction *showLogo = new QAction("Show 3D Logo", showMenu);
+    QAction *showTexture = new QAction("Show 2D Texture", showMenu);
+    QAction *showBubbles = new QAction("Show bubbles", showMenu);
+    showBubbles->setCheckable(true);
+    showBubbles->setChecked(true);
+    fileMenu->addAction(exit);
+    helpMenu->addAction(aboutQt);
+    showMenu->addAction(showLogo);
+    showMenu->addAction(showTexture);
+    showMenu->addAction(showBubbles);
+
+    QObject::connect(timer, SIGNAL(timeout()), glwidget, SLOT(updateGL()));
+    QObject::connect(exit, SIGNAL(triggered(bool)), this, SLOT(close()));
+    QObject::connect(aboutQt, SIGNAL(triggered(bool)), qApp, SLOT(aboutQt()));
+
+    QObject::connect(showLogo, SIGNAL(triggered(bool)), glwidget, SLOT(setLogo()));
+    QObject::connect(showTexture, SIGNAL(triggered(bool)), glwidget, SLOT(setTexture()));
+    QObject::connect(showBubbles, SIGNAL(triggered(bool)), glwidget, SLOT(showBubbles(bool)));
+    QObject::connect(slider, SIGNAL(valueChanged(int)), glwidget, SLOT(setScaling(int)));
+    timer->start();
+}
diff --git a/examples/opengl/hellogl_es/mainwindow.h b/examples/opengl/hellogl_es/mainwindow.h
new file mode 100644
index 0000000000..72b723c7b6
--- /dev/null
+++ b/examples/opengl/hellogl_es/mainwindow.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+
+class QSlider;
+class GLWidget;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+private:
+};
+
+#endif
diff --git a/examples/opengl/hellogl_es/qt.png b/examples/opengl/hellogl_es/qt.png
new file mode 100644
index 0000000000..79e383cf50
--- /dev/null
+++ b/examples/opengl/hellogl_es/qt.png
diff --git a/examples/opengl/hellogl_es/texture.qrc b/examples/opengl/hellogl_es/texture.qrc
new file mode 100644
index 0000000000..ff1d0e535f
--- /dev/null
+++ b/examples/opengl/hellogl_es/texture.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>qt.png</file>
+</qresource>
+</RCC>
diff --git a/examples/opengl/hellogl_es2/bubble.cpp b/examples/opengl/hellogl_es2/bubble.cpp
new file mode 100644
index 0000000000..691d314111
--- /dev/null
+++ b/examples/opengl/hellogl_es2/bubble.cpp
@@ -0,0 +1,140 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "bubble.h"
+
+Bubble::Bubble(const QPointF &position, qreal radius, const QPointF &velocity)
+    : position(position), vel(velocity), radius(radius)
+{
+    innerColor = randomColor();
+    outerColor = randomColor();
+    cache = 0;
+    updateBrush();
+}
+
+//! [0]
+void Bubble::updateCache()
+{
+    if (cache)
+        delete cache;
+    cache = new QImage(qRound(radius * 2 + 2), qRound(radius * 2 + 2), QImage::Format_ARGB32);
+    cache->fill(0x00000000);
+    QPainter p(cache);
+    p.setRenderHint(QPainter::HighQualityAntialiasing);
+    QPen pen(Qt::white);
+    pen.setWidth(2);
+    p.setPen(pen);
+    p.setBrush(brush);
+    p.drawEllipse(0, 0, int(2*radius), int(2*radius));
+}
+//! [0]
+
+Bubble::~Bubble()
+{
+    if (cache)
+        delete cache;
+}
+
+void Bubble::updateBrush()
+{
+    QRadialGradient gradient(QPointF(radius, radius), radius,
+                             QPointF(radius*0.5, radius*0.5));
+
+    gradient.setColorAt(0, QColor(255, 255, 255, 255));
+    gradient.setColorAt(0.25, innerColor);
+    gradient.setColorAt(1, outerColor);
+    brush = QBrush(gradient);
+    updateCache();
+}
+
+//! [1]
+void Bubble::drawBubble(QPainter *painter)
+{
+    painter->save();
+    painter->translate(position.x() - radius, position.y() - radius);
+    painter->setOpacity(0.8);
+    painter->drawImage(0, 0, *cache);
+    painter->restore();
+}
+//! [1]
+
+QColor Bubble::randomColor()
+{
+    int red = int(185 + 70.0*qrand()/(RAND_MAX+1.0));
+    int green = int(185 + 70.0*qrand()/(RAND_MAX+1.0));
+    int blue = int(205 + 50.0*qrand()/(RAND_MAX+1.0));
+    int alpha = int(91 + 100.0*qrand()/(RAND_MAX+1.0));
+
+    return QColor(red, green, blue, alpha);
+}
+
+void Bubble::move(const QRect &bbox)
+{
+    position += vel;
+    qreal leftOverflow = position.x() - radius - bbox.left();
+    qreal rightOverflow = position.x() + radius - bbox.right();
+    qreal topOverflow = position.y() - radius - bbox.top();
+    qreal bottomOverflow = position.y() + radius - bbox.bottom();
+    
+    if (leftOverflow < 0.0) {
+        position.setX(position.x() - 2 * leftOverflow);
+        vel.setX(-vel.x());
+    } else if (rightOverflow > 0.0) {
+        position.setX(position.x() - 2 * rightOverflow);
+        vel.setX(-vel.x());
+    }
+
+    if (topOverflow < 0.0) {
+        position.setY(position.y() - 2 * topOverflow);
+        vel.setY(-vel.y());
+    } else if (bottomOverflow > 0.0) {
+        position.setY(position.y() - 2 * bottomOverflow);
+        vel.setY(-vel.y());
+    }
+}
+
+QRectF Bubble::rect()
+{
+    return QRectF(position.x() - radius, position.y() - radius,
+                  2 * radius, 2 * radius);
+}
diff --git a/examples/opengl/hellogl_es2/bubble.h b/examples/opengl/hellogl_es2/bubble.h
new file mode 100644
index 0000000000..a32754fe0c
--- /dev/null
+++ b/examples/opengl/hellogl_es2/bubble.h
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BUBBLE_H
+#define BUBBLE_H
+
+#include <QBrush>
+#include <QColor>
+#include <QPointF>
+#include <QRect>
+#include <QRectF>
+
+class QPainter;
+
+class Bubble
+{
+public:
+    Bubble(const QPointF &position, qreal radius, const QPointF &velocity);
+    ~Bubble();
+
+    void drawBubble(QPainter *painter);
+    void updateBrush();
+    void move(const QRect &bbox);
+    void updateCache();
+    QRectF rect();
+
+private:
+    QColor randomColor();
+
+    QBrush brush;
+    QPointF position;
+    QPointF vel;
+    qreal radius;
+    QColor innerColor;
+    QColor outerColor;
+    QImage *cache;
+};
+
+#endif
diff --git a/examples/opengl/hellogl_es2/glwidget.cpp b/examples/opengl/hellogl_es2/glwidget.cpp
new file mode 100644
index 0000000000..213c5b2a36
--- /dev/null
+++ b/examples/opengl/hellogl_es2/glwidget.cpp
@@ -0,0 +1,642 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "glwidget.h"
+#include <QPainter>
+#include <math.h>
+
+#include "bubble.h"
+
+
+const int bubbleNum = 8;
+
+inline void CrossProduct(qreal &xOut, qreal &yOut, qreal &zOut, qreal x1, qreal y1, qreal z1, qreal x2, qreal y2, qreal z2)
+{
+   xOut = y1 * z2 - z1 * y2;
+   yOut = z1 * x2 - x1 * z2;
+   zOut = x1 * y2 - y1 * x2;
+}
+
+inline void Normalize(qreal &x, qreal &y, qreal &z)
+{
+    qreal l = sqrt(x*x + y*y + z*z);
+    x = x / l;
+    y = y / l;
+    z = z / l;
+}
+
+inline void IdentityMatrix(GLfloat *m)
+{
+    m[0 * 4 + 0] = 1.0f;
+    m[1 * 4 + 0] = 0.0f;
+    m[2 * 4 + 0] = 0.0f;
+    m[3 * 4 + 0] = 0.0f;
+    m[0 * 4 + 1] = 0.0f;
+    m[1 * 4 + 1] = 1.0f;
+    m[2 * 4 + 1] = 0.0f;
+    m[3 * 4 + 1] = 0.0f;
+    m[0 * 4 + 2] = 0.0f;
+    m[1 * 4 + 2] = 0.0f;
+    m[2 * 4 + 2] = 1.0f;
+    m[3 * 4 + 2] = 0.0f;
+    m[0 * 4 + 3] = 0.0f;
+    m[1 * 4 + 3] = 0.0f;
+    m[2 * 4 + 3] = 0.0f;
+    m[3 * 4 + 3] = 1.0f;
+}
+
+// Adjust a 4x4 matrix to apply a scale.
+inline void ScaleMatrix(GLfloat *m, GLfloat scalex, GLfloat scaley, GLfloat scalez)
+{
+    m[0 * 4 + 0] *= scalex;
+    m[0 * 4 + 1] *= scalex;
+    m[0 * 4 + 2] *= scalex;
+    m[0 * 4 + 3] *= scalex;
+    m[1 * 4 + 0] *= scaley;
+    m[1 * 4 + 1] *= scaley;
+    m[1 * 4 + 2] *= scaley;
+    m[1 * 4 + 3] *= scaley;
+    m[2 * 4 + 0] *= scalez;
+    m[2 * 4 + 1] *= scalez;
+    m[2 * 4 + 2] *= scalez;
+    m[2 * 4 + 3] *= scalez;
+}
+
+// Adjust a 4x4 matrix to apply a translation.
+inline void TranslateMatrix(GLfloat *m, GLfloat translatex, GLfloat translatey, GLfloat translatez)
+{
+    m[3 * 4 + 0] += m[0 * 4 + 0] * translatex + m[1 * 4 + 0] * translatey + m[2 * 4 + 0] * translatez;
+    m[3 * 4 + 1] += m[0 * 4 + 1] * translatex + m[1 * 4 + 1] * translatey + m[2 * 4 + 1] * translatez;
+    m[3 * 4 + 2] += m[0 * 4 + 2] * translatex + m[1 * 4 + 2] * translatey + m[2 * 4 + 2] * translatez;
+    m[3 * 4 + 3] += m[0 * 4 + 3] * translatex + m[1 * 4 + 3] * translatey + m[2 * 4 + 3] * translatez;
+}
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+// Adjust a 4x4 matrix to apply a rotation.
+inline void RotateMatrix(GLfloat *m, GLfloat angle, GLfloat vx, GLfloat vy, GLfloat vz)
+{
+    GLfloat len = sqrt(vx * vx + vy * vy + vz * vz);
+    if (len != 0) {
+        vx /= len;
+        vy /= len;
+        vz /= len;
+    }
+
+    GLfloat c, s, ic;
+    c = cos(angle * M_PI / 180.0);
+    s = sin(angle * M_PI / 180.0);
+    ic = 1.0f - c;
+
+    GLfloat rot[16];
+    rot[0 * 4 + 0] = vx * vx * ic + c;
+    rot[1 * 4 + 0] = vx * vy * ic - vz * s;
+    rot[2 * 4 + 0] = vx * vz * ic + vy * s;
+    rot[3 * 4 + 0] = 0.0f;
+    rot[0 * 4 + 1] = vy * vx * ic + vz * s;
+    rot[1 * 4 + 1] = vy * vy * ic + c;
+    rot[2 * 4 + 1] = vy * vz * ic - vx * s;
+    rot[3 * 4 + 1] = 0.0f;
+    rot[0 * 4 + 2] = vx * vz * ic - vy * s;
+    rot[1 * 4 + 2] = vy * vz * ic + vx * s;
+    rot[2 * 4 + 2] = vz * vz * ic + c;
+    rot[3 * 4 + 2] = 0.0f;
+    rot[0 * 4 + 3] = 0.0f;
+    rot[1 * 4 + 3] = 0.0f;
+    rot[2 * 4 + 3] = 0.0f;
+    rot[3 * 4 + 3] = 1.0f;
+
+    GLfloat temp[16];
+    for (int i = 0; i < 4; ++i) {
+        for (int j = 0; j < 4; ++j) {
+            temp[j * 4 + i] = 0.0f;
+            for (int k = 0; k < 4; ++k) {
+                temp[j * 4 + i] += m[k * 4 + i] * rot[j * 4 + k];
+            }
+        }
+    }
+
+    qMemCopy(m, temp, sizeof(temp));
+}
+
+GLWidget::GLWidget(QWidget *parent)
+    : QGLWidget(parent)
+{
+    qtLogo = true;
+    createdVertices = 0;
+    createdNormals = 0;
+    m_vertexNumber = 0;
+    frames = 0;
+    setAttribute(Qt::WA_PaintOnScreen);
+    setAttribute(Qt::WA_NoSystemBackground);
+    setAutoBufferSwap(false);
+    m_showBubbles = true;
+#ifndef Q_WS_QWS
+    setMinimumSize(300, 250);
+#endif
+}
+
+GLWidget::~GLWidget()
+{
+  if (createdVertices)
+      delete[] createdVertices;
+  if (createdNormals)
+      delete[] createdNormals;
+}
+
+void GLWidget::setScaling(int scale) {
+
+    if (scale > 50)
+        m_fScale = 1 + qreal(scale -50) / 50 * 0.5;
+    else if (scale < 50)
+        m_fScale =  1- (qreal(50 - scale) / 50 * 1/2);
+    else 
+      m_fScale = 1;
+}
+
+void GLWidget::setLogo() {
+    qtLogo = true;
+}
+
+void GLWidget::setTexture() {
+    qtLogo = false;
+}
+
+void GLWidget::showBubbles(bool bubbles)
+{
+   m_showBubbles = bubbles;
+}
+
+void GLWidget::paintQtLogo()
+{
+    glDisable(GL_TEXTURE_2D);
+    glVertexAttribPointer(vertexAttr1, 3, GL_FLOAT, GL_FALSE, 0, createdVertices);
+    glEnableVertexAttribArray(vertexAttr1);
+    glVertexAttribPointer(normalAttr1, 3, GL_FLOAT, GL_FALSE, 0, createdNormals);
+    glEnableVertexAttribArray(normalAttr1);
+    glDrawArrays(GL_TRIANGLES, 0, m_vertexNumber / 3);
+    glDisableVertexAttribArray(normalAttr1);
+    glDisableVertexAttribArray(vertexAttr1);
+}
+
+void GLWidget::paintTexturedCube()
+{
+    glEnable(GL_TEXTURE_2D);
+    glBindTexture(GL_TEXTURE_2D, m_uiTexture);
+    GLfloat afVertices[] = {
+        -0.5, 0.5, 0.5, 0.5,-0.5,0.5,-0.5,-0.5,0.5,
+        0.5, -0.5, 0.5, -0.5,0.5,0.5,0.5,0.5,0.5,
+        -0.5, -0.5, -0.5, 0.5,-0.5,-0.5,-0.5,0.5,-0.5,
+        0.5, 0.5, -0.5, -0.5,0.5,-0.5,0.5,-0.5,-0.5,
+
+        0.5, -0.5, -0.5, 0.5,-0.5,0.5,0.5,0.5,-0.5,
+        0.5, 0.5, 0.5, 0.5,0.5,-0.5,0.5,-0.5,0.5,
+        -0.5, 0.5, -0.5, -0.5,-0.5,0.5,-0.5,-0.5,-0.5,
+        -0.5, -0.5, 0.5, -0.5,0.5,-0.5,-0.5,0.5,0.5,
+
+        0.5, 0.5,  -0.5, -0.5, 0.5,  0.5,  -0.5,  0.5,  -0.5,
+        -0.5,  0.5,  0.5,  0.5,  0.5,  -0.5, 0.5, 0.5,  0.5,
+        -0.5,  -0.5, -0.5, -0.5, -0.5, 0.5,  0.5, -0.5, -0.5,
+        0.5, -0.5, 0.5,  0.5,  -0.5, -0.5, -0.5,  -0.5, 0.5
+    };
+    glVertexAttribPointer(vertexAttr2, 3, GL_FLOAT, GL_FALSE, 0, afVertices);
+    glEnableVertexAttribArray(vertexAttr2);
+
+    GLfloat afTexCoord[] = {
+        0.0f,0.0f, 1.0f,1.0f, 1.0f,0.0f,
+        1.0f,1.0f, 0.0f,0.0f, 0.0f,1.0f,
+        1.0f,1.0f, 1.0f,0.0f, 0.0f,1.0f,
+        0.0f,0.0f, 0.0f,1.0f, 1.0f,0.0f,
+
+        1.0f,1.0f, 1.0f,0.0f, 0.0f,1.0f,
+        0.0f,0.0f, 0.0f,1.0f, 1.0f,0.0f,
+        0.0f,0.0f, 1.0f,1.0f, 1.0f,0.0f,
+        1.0f,1.0f, 0.0f,0.0f, 0.0f,1.0f,
+
+        0.0f,1.0f, 1.0f,0.0f, 1.0f,1.0f,
+        1.0f,0.0f, 0.0f,1.0f, 0.0f,0.0f,
+        1.0f,0.0f, 1.0f,1.0f, 0.0f,0.0f,
+        0.0f,1.0f, 0.0f,0.0f, 1.0f,1.0f
+    };
+    glVertexAttribPointer(texCoordAttr2, 2, GL_FLOAT, GL_FALSE, 0, afTexCoord);
+    glEnableVertexAttribArray(texCoordAttr2);
+
+    GLfloat afNormals[] = {
+
+        0,0,-1, 0,0,-1, 0,0,-1,
+        0,0,-1, 0,0,-1, 0,0,-1,
+        0,0,1, 0,0,1, 0,0,1,
+        0,0,1, 0,0,1, 0,0,1,
+
+        -1,0,0, -1,0,0, -1,0,0,
+        -1,0,0, -1,0,0, -1,0,0,
+        1,0,0, 1,0,0, 1,0,0,
+        1,0,0, 1,0,0, 1,0,0,
+
+        0,-1,0, 0,-1,0, 0,-1,0,
+        0,-1,0, 0,-1,0, 0,-1,0,
+        0,1,0, 0,1,0, 0,1,0,
+        0,1,0, 0,1,0, 0,1,0
+    };
+    glVertexAttribPointer(normalAttr2, 3, GL_FLOAT, GL_FALSE, 0, afNormals);
+    glEnableVertexAttribArray(normalAttr2);
+
+    glUniform1i(textureUniform2, 0);    // use texture unit 0
+
+    glDrawArrays(GL_TRIANGLES, 0, 36);
+
+    glDisableVertexAttribArray(vertexAttr2);
+    glDisableVertexAttribArray(normalAttr2);
+    glDisableVertexAttribArray(texCoordAttr2);
+}
+
+static void reportCompileErrors(GLuint shader, const char *src)
+{
+    GLint value = 0;
+    glGetShaderiv(shader, GL_COMPILE_STATUS, &value);
+    bool compiled = (value != 0);
+    value = 0;
+    glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &value);
+    if (!compiled && value > 1) {
+        char *log = new char [value];
+        GLint len;
+        glGetShaderInfoLog(shader, value, &len, log);
+        qWarning("%s\n", log);
+        qWarning("when compiling:\n%s\n", src);
+        delete [] log;
+    }
+}
+
+static void reportLinkErrors(GLuint program, const char *vsrc, const char *fsrc)
+{
+    GLint value = 0;
+    glGetProgramiv(program, GL_LINK_STATUS, &value);
+    bool linked = (value != 0);
+    value = 0;
+    glGetProgramiv(program, GL_INFO_LOG_LENGTH, &value);
+    if (!linked && value > 1) {
+        char *log = new char [value];
+        GLint len;
+        glGetProgramInfoLog(program, value, &len, log);
+        qWarning("%s\n", log);
+        qWarning("when linking:\n%s\nwith:\n%s\n", vsrc, fsrc);
+        delete [] log;
+    }
+}
+
+void GLWidget::initializeGL ()
+{
+    glClearColor(0.1f, 0.1f, 0.2f, 1.0f);
+
+    glEnable(GL_TEXTURE_2D);
+    glGenTextures(1, &m_uiTexture);
+    m_uiTexture = bindTexture(QImage(":/qt.png"));
+
+    GLuint vshader1 = glCreateShader(GL_VERTEX_SHADER);
+    const char *vsrc1[1] = {
+        "attribute highp vec4 vertex;\n"
+        "attribute mediump vec3 normal;\n"
+        "uniform mediump mat4 matrix;\n"
+        "varying mediump vec4 color;\n"
+        "void main(void)\n"
+        "{\n"
+        "    vec3 toLight = normalize(vec3(0.0, 0.3, 1.0));\n"
+        "    float angle = max(dot(normal, toLight), 0.0);\n"
+        "    vec3 col = vec3(0.40, 1.0, 0.0);\n"
+        "    color = vec4(col * 0.2 + col * 0.8 * angle, 1.0);\n"
+        "    color = clamp(color, 0.0, 1.0);\n"
+        "    gl_Position = matrix * vertex;\n"
+        "}\n"
+    };
+    glShaderSource(vshader1, 1, vsrc1, 0);
+    glCompileShader(vshader1);
+    reportCompileErrors(vshader1, vsrc1[0]);
+
+    GLuint fshader1 = glCreateShader(GL_FRAGMENT_SHADER);
+    const char *fsrc1[1] = {
+        "varying mediump vec4 color;\n"
+        "void main(void)\n"
+        "{\n"
+        "    gl_FragColor = color;\n"
+        "}\n"
+    };
+    glShaderSource(fshader1, 1, fsrc1, 0);
+    glCompileShader(fshader1);
+    reportCompileErrors(fshader1, fsrc1[0]);
+
+    program1 = glCreateProgram();
+    glAttachShader(program1, vshader1);
+    glAttachShader(program1, fshader1);
+    glLinkProgram(program1);
+    reportLinkErrors(program1, vsrc1[0], fsrc1[0]);
+
+    vertexAttr1 = glGetAttribLocation(program1, "vertex");
+    normalAttr1 = glGetAttribLocation(program1, "normal");
+    matrixUniform1 = glGetUniformLocation(program1, "matrix");
+
+    GLuint vshader2 = glCreateShader(GL_VERTEX_SHADER);
+    const char *vsrc2[1] = {
+        "attribute highp vec4 vertex;\n"
+        "attribute highp vec4 texCoord;\n"
+        "attribute mediump vec3 normal;\n"
+        "uniform mediump mat4 matrix;\n"
+        "varying highp vec4 texc;\n"
+        "varying mediump float angle;\n"
+        "void main(void)\n"
+        "{\n"
+        "    vec3 toLight = normalize(vec3(0.0, 0.3, 1.0));\n"
+        "    angle = max(dot(normal, toLight), 0.0);\n"
+        "    gl_Position = matrix * vertex;\n"
+        "    texc = texCoord;\n"
+        "}\n"
+    };
+    glShaderSource(vshader2, 1, vsrc2, 0);
+    glCompileShader(vshader2);
+    reportCompileErrors(vshader2, vsrc2[0]);
+
+    GLuint fshader2 = glCreateShader(GL_FRAGMENT_SHADER);
+    const char *fsrc2[1] = {
+        "varying highp vec4 texc;\n"
+        "uniform sampler2D tex;\n"
+        "varying mediump float angle;\n"
+        "void main(void)\n"
+        "{\n"
+        "    highp vec3 color = texture2D(tex, texc.st).rgb;\n"
+        "    color = color * 0.2 + color * 0.8 * angle;\n"
+        "    gl_FragColor = vec4(clamp(color, 0.0, 1.0), 1.0);\n"
+        "}\n"
+    };
+    glShaderSource(fshader2, 1, fsrc2, 0);
+    glCompileShader(fshader2);
+    reportCompileErrors(fshader2, fsrc2[0]);
+
+    program2 = glCreateProgram();
+    glAttachShader(program2, vshader2);
+    glAttachShader(program2, fshader2);
+    glLinkProgram(program2);
+    reportLinkErrors(program2, vsrc2[0], fsrc2[0]);
+
+    vertexAttr2 = glGetAttribLocation(program2, "vertex");
+    normalAttr2 = glGetAttribLocation(program2, "normal");
+    texCoordAttr2 = glGetAttribLocation(program2, "texCoord");
+    matrixUniform2 = glGetUniformLocation(program2, "matrix");
+    textureUniform2 = glGetUniformLocation(program2, "tex");
+
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+
+    m_fAngle = 0;
+    m_fScale = 1;
+    createGeometry();
+    createBubbles(bubbleNum - bubbles.count());
+}
+
+void GLWidget::paintGL()
+{
+    createBubbles(bubbleNum - bubbles.count());
+
+    QPainter painter;
+    painter.begin(this);
+
+    glClearColor(0.1f, 0.1f, 0.2f, 1.0f);
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glEnable(GL_TEXTURE_2D);
+
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+
+    glFrontFace(GL_CW);
+    glCullFace(GL_FRONT);
+    glEnable(GL_CULL_FACE);
+    glEnable(GL_DEPTH_TEST);
+
+    GLfloat modelview[16];
+    IdentityMatrix(modelview);
+    RotateMatrix(modelview, m_fAngle, 0.0, 1.0, 0.0);
+    RotateMatrix(modelview, m_fAngle, 1.0, 0.0, 0.0);
+    RotateMatrix(modelview, m_fAngle, 0.0, 0.0, 1.0);
+    ScaleMatrix(modelview, m_fScale, m_fScale, m_fScale);
+    TranslateMatrix(modelview, 0, -0.2, 0);
+
+    if (qtLogo) {
+        glUseProgram(program1);
+        glUniformMatrix4fv(matrixUniform1, 1, GL_FALSE, modelview);
+        paintQtLogo();
+        glUseProgram(0);
+    } else {
+        glUseProgram(program2);
+        glUniformMatrix4fv(matrixUniform2, 1, GL_FALSE, modelview);
+        paintTexturedCube();
+        glUseProgram(0);
+    }
+
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_CULL_FACE);
+
+    if (m_showBubbles)
+        foreach (Bubble *bubble, bubbles) {
+            bubble->drawBubble(&painter);
+    }
+
+    QString framesPerSecond;
+    framesPerSecond.setNum(frames /(time.elapsed() / 1000.0), 'f', 2);
+
+    painter.setPen(Qt::white);
+
+    painter.drawText(20, 40, framesPerSecond + " fps");
+
+    painter.end();
+    
+    swapBuffers();
+
+    QMutableListIterator<Bubble*> iter(bubbles);
+
+    while (iter.hasNext()) {
+        Bubble *bubble = iter.next();
+        bubble->move(rect());
+    }
+    if (!(frames % 100)) {
+        time.start();
+        frames = 0;
+    }
+    m_fAngle += 1.0f;
+    frames ++;
+}
+
+void GLWidget::createBubbles(int number)
+{
+    for (int i = 0; i < number; ++i) {
+        QPointF position(width()*(0.1 + (0.8*qrand()/(RAND_MAX+1.0))),
+                        height()*(0.1 + (0.8*qrand()/(RAND_MAX+1.0))));
+        qreal radius = qMin(width(), height())*(0.0175 + 0.0875*qrand()/(RAND_MAX+1.0));
+        QPointF velocity(width()*0.0175*(-0.5 + qrand()/(RAND_MAX+1.0)),
+                        height()*0.0175*(-0.5 + qrand()/(RAND_MAX+1.0)));
+
+        bubbles.append(new Bubble(position, radius, velocity));
+    }
+}
+
+void GLWidget::createGeometry()
+{
+    vertices.clear();
+    normals.clear();
+
+    qreal x1 = +0.06f;
+    qreal y1 = -0.14f;
+    qreal x2 = +0.14f;
+    qreal y2 = -0.06f;
+    qreal x3 = +0.08f;
+    qreal y3 = +0.00f;
+    qreal x4 = +0.30f;
+    qreal y4 = +0.22f;
+
+    quad(x1, y1, x2, y2, y2, x2, y1, x1);
+    quad(x3, y3, x4, y4, y4, x4, y3, x3);
+
+    extrude(x1, y1, x2, y2);
+    extrude(x2, y2, y2, x2);
+    extrude(y2, x2, y1, x1);
+    extrude(y1, x1, x1, y1);
+    extrude(x3, y3, x4, y4);
+    extrude(x4, y4, y4, x4);
+    extrude(y4, x4, y3, x3);
+
+    const qreal Pi = 3.14159f;
+    const int NumSectors = 100;
+
+    for (int i = 0; i < NumSectors; ++i) {
+        qreal angle1 = (i * 2 * Pi) / NumSectors;
+        qreal x5 = 0.30 * sin(angle1);
+        qreal y5 = 0.30 * cos(angle1);
+        qreal x6 = 0.20 * sin(angle1);
+        qreal y6 = 0.20 * cos(angle1);
+
+        qreal angle2 = ((i + 1) * 2 * Pi) / NumSectors;
+        qreal x7 = 0.20 * sin(angle2);
+        qreal y7 = 0.20 * cos(angle2);
+        qreal x8 = 0.30 * sin(angle2);
+        qreal y8 = 0.30 * cos(angle2);
+
+        quad(x5, y5, x6, y6, x7, y7, x8, y8);
+
+        extrude(x6, y6, x7, y7);
+        extrude(x8, y8, x5, y5);
+    }
+
+    m_vertexNumber = vertices.size();
+    createdVertices = new GLfloat[m_vertexNumber];
+    createdNormals = new GLfloat[m_vertexNumber];
+    for (int i = 0;i < m_vertexNumber;i++) {
+      createdVertices[i] = vertices.at(i) * 2;
+      createdNormals[i] = normals.at(i);
+    }
+    vertices.clear();
+    normals.clear();
+}
+
+void GLWidget::quad(qreal x1, qreal y1, qreal x2, qreal y2, qreal x3, qreal y3, qreal x4, qreal y4)
+{
+    qreal nx, ny, nz;
+
+    vertices << x1 << y1 << -0.05f;
+    vertices << x2 << y2 << -0.05f;
+    vertices << x4 << y4 << -0.05f;
+
+    vertices << x3 << y3 << -0.05f;
+    vertices << x4 << y4 << -0.05f;
+    vertices << x2 << y2 << -0.05f;
+
+    CrossProduct(nx, ny, nz, x2 - x1, y2 - y1, 0, x4 - x1, y4 - y1, 0);
+    Normalize(nx, ny, nz);
+
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+
+    vertices << x4 << y4 << 0.05f;
+    vertices << x2 << y2 << 0.05f;
+    vertices << x1 << y1 << 0.05f;
+
+    vertices << x2 << y2 << 0.05f;
+    vertices << x4 << y4 << 0.05f;
+    vertices << x3 << y3 << 0.05f;
+
+    CrossProduct(nx, ny, nz, x2 - x4, y2 - y4, 0, x1 - x4, y1 - y4, 0);
+    Normalize(nx, ny, nz);
+
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+}
+
+void GLWidget::extrude(qreal x1, qreal y1, qreal x2, qreal y2)
+{
+    qreal nx, ny, nz;
+
+    vertices << x1 << y1 << +0.05f;
+    vertices << x2 << y2 << +0.05f;
+    vertices << x1 << y1 << -0.05f;
+
+    vertices << x2 << y2 << -0.05f;
+    vertices << x1 << y1 << -0.05f;
+    vertices << x2 << y2 << +0.05f;
+
+    CrossProduct(nx, ny, nz, x2 - x1, y2 - y1, 0.0f, 0.0f, 0.0f, -0.1f);
+    Normalize(nx, ny, nz);
+
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+    normals << nx << ny << nz;
+}
diff --git a/examples/opengl/hellogl_es2/glwidget.h b/examples/opengl/hellogl_es2/glwidget.h
new file mode 100644
index 0000000000..9a7823a493
--- /dev/null
+++ b/examples/opengl/hellogl_es2/glwidget.h
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GLWIDGET_H
+#define GLWIDGET_H
+
+#include <QGLWidget>
+#include <QTime>
+
+class Bubble;
+class GLWidget : public QGLWidget {
+
+    Q_OBJECT
+public:
+    GLWidget(QWidget *parent = 0);
+    ~GLWidget();
+public slots: 
+    void setScaling(int scale);
+    void setLogo();
+    void setTexture();
+    void showBubbles(bool);
+protected:
+    void paintGL ();
+    void initializeGL ();
+private:
+    GLuint  m_uiTexture;
+    qreal   m_fAngle;
+    qreal   m_fScale;
+    bool m_showBubbles;
+    void paintTexturedCube();
+    void paintQtLogo();
+    void createGeometry();
+    void createBubbles(int number);
+    void quad(qreal x1, qreal y1, qreal x2, qreal y2, qreal x3, qreal y3, qreal x4, qreal y4);
+    void extrude(qreal x1, qreal y1, qreal x2, qreal y2);
+    QList<qreal> vertices;
+    QList<qreal> normals;
+    GLfloat *createdVertices;
+    GLfloat *createdNormals;
+    int m_vertexNumber;
+    bool qtLogo;
+    QList<Bubble*> bubbles;
+    int frames;
+    QTime time;
+    GLuint program1;
+    GLuint program2;
+    GLuint vertexAttr1;
+    GLuint normalAttr1;
+    GLuint matrixUniform1;
+    GLuint vertexAttr2;
+    GLuint normalAttr2;
+    GLuint texCoordAttr2;
+    GLuint matrixUniform2;
+    GLuint textureUniform2;
+};
+#endif
diff --git a/examples/opengl/hellogl_es2/hellogl_es2.pro b/examples/opengl/hellogl_es2/hellogl_es2.pro
new file mode 100644
index 0000000000..92b42248de
--- /dev/null
+++ b/examples/opengl/hellogl_es2/hellogl_es2.pro
@@ -0,0 +1,27 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Thu Oct 4 19:01:12 2007
+######################################################################
+
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += main.cpp
+SOURCES += glwidget.cpp
+SOURCES += mainwindow.cpp
+SOURCES += bubble.cpp
+
+HEADERS += glwidget.h
+HEADERS += mainwindow.h
+HEADERS += bubble.h
+
+RESOURCES += texture.qrc
+QT += opengl
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es2
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl_es2.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es2
+INSTALLS += target sources
diff --git a/examples/opengl/hellogl_es2/main.cpp b/examples/opengl/hellogl_es2/main.cpp
new file mode 100644
index 0000000000..feff054783
--- /dev/null
+++ b/examples/opengl/hellogl_es2/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QMainWindow>
+#include "mainwindow.h"
+
+int main( int argc, char ** argv )
+{
+    Q_INIT_RESOURCE(texture);
+    QApplication a( argc, argv );
+    MainWindow mw;
+    mw.showMaximized();
+    return a.exec();
+}
diff --git a/examples/opengl/hellogl_es2/mainwindow.cpp b/examples/opengl/hellogl_es2/mainwindow.cpp
new file mode 100644
index 0000000000..26fbeaa31b
--- /dev/null
+++ b/examples/opengl/hellogl_es2/mainwindow.cpp
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mainwindow.h"
+
+#include <QApplication>
+#include <QMenuBar>
+#include <QGroupBox>
+#include <QGridLayout>
+#include <QSlider>
+#include <QLabel>
+#include <QTimer>
+
+#include "glwidget.h"
+
+MainWindow::MainWindow()
+{
+    GLWidget *glwidget = new GLWidget();
+    QLabel *label = new QLabel(this);
+    QTimer *timer = new QTimer(this);
+    QSlider *slider = new QSlider(this);
+    slider->setOrientation(Qt::Horizontal);
+    
+    slider->setRange(0, 100);
+    slider->setSliderPosition(50);
+    timer->setInterval(10);
+    label->setText("A QGlWidget with OpenGl ES");
+    label->setAlignment(Qt::AlignHCenter);
+
+    QGroupBox * groupBox = new QGroupBox(this);
+    setCentralWidget(groupBox);
+    groupBox->setTitle("OpenGL ES Example");
+
+    QGridLayout *layout = new QGridLayout(groupBox);
+
+    layout->addWidget(glwidget,1,0,8,1);
+    layout->addWidget(label,9,0,1,1);
+    layout->addWidget(slider, 11,0,1,1);
+
+    groupBox->setLayout(layout);
+
+    QMenu *fileMenu = new QMenu("File");
+    QMenu *helpMenu = new QMenu("Help");
+    QMenu *showMenu = new QMenu("Show");
+    menuBar()->addMenu(fileMenu);
+    menuBar()->addMenu(showMenu);
+    menuBar()->addMenu(helpMenu);
+    QAction *exit = new QAction("Exit", fileMenu);
+    QAction *aboutQt = new QAction("AboutQt", helpMenu);
+    QAction *showLogo = new QAction("Show 3D Logo", showMenu);
+    QAction *showTexture = new QAction("Show 2D Texture", showMenu);
+    QAction *showBubbles = new QAction("Show bubbles", showMenu);
+    showBubbles->setCheckable(true);
+    showBubbles->setChecked(true);
+    fileMenu->addAction(exit);
+    helpMenu->addAction(aboutQt);
+    showMenu->addAction(showLogo);
+    showMenu->addAction(showTexture);
+    showMenu->addAction(showBubbles);
+
+    QObject::connect(timer, SIGNAL(timeout()), glwidget, SLOT(updateGL()));
+    QObject::connect(exit, SIGNAL(triggered(bool)), this, SLOT(close()));
+    QObject::connect(aboutQt, SIGNAL(triggered(bool)), qApp, SLOT(aboutQt()));
+
+    QObject::connect(showLogo, SIGNAL(triggered(bool)), glwidget, SLOT(setLogo()));
+    QObject::connect(showTexture, SIGNAL(triggered(bool)), glwidget, SLOT(setTexture()));
+    QObject::connect(showBubbles, SIGNAL(triggered(bool)), glwidget, SLOT(showBubbles(bool)));
+    QObject::connect(slider, SIGNAL(valueChanged(int)), glwidget, SLOT(setScaling(int)));
+    timer->start();
+}
diff --git a/examples/opengl/hellogl_es2/mainwindow.h b/examples/opengl/hellogl_es2/mainwindow.h
new file mode 100644
index 0000000000..72b723c7b6
--- /dev/null
+++ b/examples/opengl/hellogl_es2/mainwindow.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+
+class QSlider;
+class GLWidget;
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+private:
+};
+
+#endif
diff --git a/examples/opengl/hellogl_es2/qt.png b/examples/opengl/hellogl_es2/qt.png
new file mode 100644
index 0000000000..79e383cf50
--- /dev/null
+++ b/examples/opengl/hellogl_es2/qt.png
diff --git a/examples/opengl/hellogl_es2/texture.qrc b/examples/opengl/hellogl_es2/texture.qrc
new file mode 100644
index 0000000000..ff1d0e535f
--- /dev/null
+++ b/examples/opengl/hellogl_es2/texture.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>qt.png</file>
+</qresource>
+</RCC>
diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro
new file mode 100644
index 0000000000..a4c2a22365
--- /dev/null
+++ b/examples/opengl/opengl.pro
@@ -0,0 +1,29 @@
+TEMPLATE      = subdirs
+
+contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles1cl)|contains(QT_CONFIG, opengles2){
+    contains(QT_CONFIG, opengles2) {
+        SUBDIRS   = hellogl_es2
+    } else {
+        SUBDIRS   = hellogl_es
+    }
+} else {
+    SUBDIRS   = 2dpainting \
+                grabber \
+                hellogl \
+                overpainting \
+                pbuffers \
+                framebufferobject2 \
+                samplebuffers \
+                textures
+
+    contains(QT_CONFIG, svg) {
+        SUBDIRS += framebufferobject \
+                pbuffers2
+    }
+}
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS opengl.pro README
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl
+INSTALLS += target sources
diff --git a/examples/opengl/overpainting/bubble.cpp b/examples/opengl/overpainting/bubble.cpp
new file mode 100644
index 0000000000..8bbe9b0015
--- /dev/null
+++ b/examples/opengl/overpainting/bubble.cpp
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "bubble.h"
+
+Bubble::Bubble(const QPointF &position, qreal radius, const QPointF &velocity)
+    : position(position), vel(velocity), radius(radius)
+{
+    innerColor = randomColor();
+    outerColor = randomColor();
+    updateBrush();
+}
+
+void Bubble::updateBrush()
+{
+    QRadialGradient gradient(QPointF(radius, radius), radius,
+                             QPointF(radius*0.5, radius*0.5));
+
+    gradient.setColorAt(0, QColor(255, 255, 255, 255));
+    gradient.setColorAt(0.25, innerColor);
+    gradient.setColorAt(1, outerColor);
+    brush = QBrush(gradient);
+}
+
+void Bubble::drawBubble(QPainter *painter)
+{
+    painter->save();
+    painter->translate(position.x() - radius, position.y() - radius);
+    painter->setBrush(brush);
+    painter->drawEllipse(0, 0, int(2*radius), int(2*radius));
+    painter->restore();
+}
+
+QColor Bubble::randomColor()
+{
+    int red = int(205 + 50.0*qrand()/(RAND_MAX+1.0));
+    int green = int(205 + 50.0*qrand()/(RAND_MAX+1.0));
+    int blue = int(205 + 50.0*qrand()/(RAND_MAX+1.0));
+    int alpha = int(91 + 100.0*qrand()/(RAND_MAX+1.0));
+
+    return QColor(red, green, blue, alpha);
+}
+
+void Bubble::move(const QRect &bbox)
+{
+    position += vel;
+    qreal leftOverflow = position.x() - radius - bbox.left();
+    qreal rightOverflow = position.x() + radius - bbox.right();
+    qreal topOverflow = position.y() - radius - bbox.top();
+    qreal bottomOverflow = position.y() + radius - bbox.bottom();
+    
+    if (leftOverflow < 0.0) {
+        position.setX(position.x() - 2 * leftOverflow);
+        vel.setX(-vel.x());
+    } else if (rightOverflow > 0.0) {
+        position.setX(position.x() - 2 * rightOverflow);
+        vel.setX(-vel.x());
+    }
+
+    if (topOverflow < 0.0) {
+        position.setY(position.y() - 2 * topOverflow);
+        vel.setY(-vel.y());
+    } else if (bottomOverflow > 0.0) {
+        position.setY(position.y() - 2 * bottomOverflow);
+        vel.setY(-vel.y());
+    }
+}
+
+QRectF Bubble::rect()
+{
+    return QRectF(position.x() - radius, position.y() - radius,
+                  2 * radius, 2 * radius);
+}
diff --git a/examples/opengl/overpainting/bubble.h b/examples/opengl/overpainting/bubble.h
new file mode 100644
index 0000000000..7e715503dd
--- /dev/null
+++ b/examples/opengl/overpainting/bubble.h
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BUBBLE_H
+#define BUBBLE_H
+
+#include <QBrush>
+#include <QColor>
+#include <QPointF>
+#include <QRect>
+#include <QRectF>
+
+QT_BEGIN_NAMESPACE
+class QPainter;
+QT_END_NAMESPACE
+
+class Bubble
+{
+public:
+    Bubble(const QPointF &position, qreal radius, const QPointF &velocity);
+
+    void drawBubble(QPainter *painter);
+    void updateBrush();
+    void move(const QRect &bbox);
+    QRectF rect();
+
+private:
+    QColor randomColor();
+
+    QBrush brush;
+    QPointF position;
+    QPointF vel;
+    qreal radius;
+    QColor innerColor;
+    QColor outerColor;
+};
+
+#endif
diff --git a/examples/opengl/overpainting/glwidget.cpp b/examples/opengl/overpainting/glwidget.cpp
new file mode 100644
index 0000000000..e3a7b1e530
--- /dev/null
+++ b/examples/opengl/overpainting/glwidget.cpp
@@ -0,0 +1,360 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtOpenGL>
+#include <stdlib.h>
+
+#include <math.h>
+
+#include "bubble.h"
+#include "glwidget.h"
+
+#ifndef GL_MULTISAMPLE
+#define GL_MULTISAMPLE  0x809D
+#endif
+
+//! [0]
+GLWidget::GLWidget(QWidget *parent)
+    : QGLWidget(QGLFormat(QGL::SampleBuffers), parent)
+{
+    QTime midnight(0, 0, 0);
+    qsrand(midnight.secsTo(QTime::currentTime()));
+
+    object = 0;
+    xRot = 0;
+    yRot = 0;
+    zRot = 0;
+
+    trolltechGreen = QColor::fromCmykF(0.40, 0.0, 1.0, 0.0);
+    trolltechPurple = QColor::fromCmykF(0.39, 0.39, 0.0, 0.0);
+
+    animationTimer.setSingleShot(false);
+    connect(&animationTimer, SIGNAL(timeout()), this, SLOT(animate()));
+    animationTimer.start(25);
+
+    setAutoFillBackground(false);
+    setMinimumSize(200, 200);
+    setWindowTitle(tr("Overpainting a Scene"));
+}
+//! [0]
+
+//! [1]
+GLWidget::~GLWidget()
+{
+    makeCurrent();
+    glDeleteLists(object, 1);
+}
+//! [1]
+
+void GLWidget::setXRotation(int angle)
+{
+    normalizeAngle(&angle);
+    if (angle != xRot)
+        xRot = angle;
+}
+
+void GLWidget::setYRotation(int angle)
+{
+    normalizeAngle(&angle);
+    if (angle != yRot)
+        yRot = angle;
+}
+
+void GLWidget::setZRotation(int angle)
+{
+    normalizeAngle(&angle);
+    if (angle != zRot)
+        zRot = angle;
+}
+
+//! [2]
+void GLWidget::initializeGL()
+{
+    object = makeObject();
+}
+//! [2]
+
+void GLWidget::mousePressEvent(QMouseEvent *event)
+{
+    lastPos = event->pos();
+}
+
+void GLWidget::mouseMoveEvent(QMouseEvent *event)
+{
+    int dx = event->x() - lastPos.x();
+    int dy = event->y() - lastPos.y();
+
+    if (event->buttons() & Qt::LeftButton) {
+        setXRotation(xRot + 8 * dy);
+        setYRotation(yRot + 8 * dx);
+    } else if (event->buttons() & Qt::RightButton) {
+        setXRotation(xRot + 8 * dy);
+        setZRotation(zRot + 8 * dx);
+    }
+    lastPos = event->pos();
+}
+
+void GLWidget::paintEvent(QPaintEvent *event)
+{
+    makeCurrent();
+//! [4]
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+//! [4]
+
+//! [6]
+    qglClearColor(trolltechPurple.dark());
+    glShadeModel(GL_SMOOTH);
+    glEnable(GL_DEPTH_TEST);
+    glEnable(GL_CULL_FACE);
+    glEnable(GL_LIGHTING);
+    glEnable(GL_LIGHT0);
+    glEnable(GL_MULTISAMPLE);
+    static GLfloat lightPosition[4] = { 0.5, 5.0, 7.0, 1.0 };
+    glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
+
+    setupViewport(width(), height());
+//! [6]
+
+//! [7]
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glLoadIdentity();
+    glTranslated(0.0, 0.0, -10.0);
+    glRotated(xRot / 16.0, 1.0, 0.0, 0.0);
+    glRotated(yRot / 16.0, 0.0, 1.0, 0.0);
+    glRotated(zRot / 16.0, 0.0, 0.0, 1.0);
+    glCallList(object);
+//! [7]
+
+//! [8]
+    glMatrixMode(GL_MODELVIEW);
+    glPopMatrix();
+//! [8]
+
+//! [10]
+    QPainter painter(this);
+    painter.setRenderHint(QPainter::Antialiasing);
+    foreach (Bubble *bubble, bubbles) {
+        if (bubble->rect().intersects(event->rect()))
+            bubble->drawBubble(&painter);
+    }
+    drawInstructions(&painter);
+    painter.end();
+}
+//! [10]
+
+//! [11]
+void GLWidget::resizeGL(int width, int height)
+{
+    setupViewport(width, height);
+}
+//! [11]
+
+//! [12]
+void GLWidget::showEvent(QShowEvent *event)
+{
+    Q_UNUSED(event);
+    createBubbles(20 - bubbles.count());
+}
+//! [12]
+
+QSize GLWidget::sizeHint() const
+{
+    return QSize(400, 400);
+}
+
+GLuint GLWidget::makeObject()
+{
+    GLuint list = glGenLists(1);
+    glNewList(list, GL_COMPILE);
+
+    glEnable(GL_NORMALIZE);
+    glBegin(GL_QUADS);
+
+    static GLfloat logoDiffuseColor[4] = {trolltechGreen.red()/255.0,
+                                          trolltechGreen.green()/255.0,
+                                          trolltechGreen.blue()/255.0, 1.0};
+    glMaterialfv(GL_FRONT, GL_DIFFUSE, logoDiffuseColor);
+
+    GLdouble x1 = +0.06;
+    GLdouble y1 = -0.14;
+    GLdouble x2 = +0.14;
+    GLdouble y2 = -0.06;
+    GLdouble x3 = +0.08;
+    GLdouble y3 = +0.00;
+    GLdouble x4 = +0.30;
+    GLdouble y4 = +0.22;
+
+    quad(x1, y1, x2, y2, y2, x2, y1, x1);
+    quad(x3, y3, x4, y4, y4, x4, y3, x3);
+
+    extrude(x1, y1, x2, y2);
+    extrude(x2, y2, y2, x2);
+    extrude(y2, x2, y1, x1);
+    extrude(y1, x1, x1, y1);
+    extrude(x3, y3, x4, y4);
+    extrude(x4, y4, y4, x4);
+    extrude(y4, x4, y3, x3);
+
+    const double Pi = 3.14159265358979323846;
+    const int NumSectors = 200;
+
+    for (int i = 0; i < NumSectors; ++i) {
+        double angle1 = (i * 2 * Pi) / NumSectors;
+        GLdouble x5 = 0.30 * sin(angle1);
+        GLdouble y5 = 0.30 * cos(angle1);
+        GLdouble x6 = 0.20 * sin(angle1);
+        GLdouble y6 = 0.20 * cos(angle1);
+
+        double angle2 = ((i + 1) * 2 * Pi) / NumSectors;
+        GLdouble x7 = 0.20 * sin(angle2);
+        GLdouble y7 = 0.20 * cos(angle2);
+        GLdouble x8 = 0.30 * sin(angle2);
+        GLdouble y8 = 0.30 * cos(angle2);
+
+        quad(x5, y5, x6, y6, x7, y7, x8, y8);
+
+        extrude(x6, y6, x7, y7);
+        extrude(x8, y8, x5, y5);
+    }
+
+    glEnd();
+
+    glEndList();
+    return list;
+}
+
+void GLWidget::quad(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2,
+                    GLdouble x3, GLdouble y3, GLdouble x4, GLdouble y4)
+{
+    glNormal3d(0.0, 0.0, -1.0);
+    glVertex3d(x1, y1, -0.05);
+    glVertex3d(x2, y2, -0.05);
+    glVertex3d(x3, y3, -0.05);
+    glVertex3d(x4, y4, -0.05);
+
+    glNormal3d(0.0, 0.0, 1.0);
+    glVertex3d(x4, y4, +0.05);
+    glVertex3d(x3, y3, +0.05);
+    glVertex3d(x2, y2, +0.05);
+    glVertex3d(x1, y1, +0.05);
+}
+
+void GLWidget::extrude(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
+{
+    qglColor(trolltechGreen.dark(250 + int(100 * x1)));
+
+    glNormal3d((x1 + x2)/2.0, (y1 + y2)/2.0, 0.0);
+    glVertex3d(x1, y1, +0.05);
+    glVertex3d(x2, y2, +0.05);
+    glVertex3d(x2, y2, -0.05);
+    glVertex3d(x1, y1, -0.05);
+}
+
+void GLWidget::normalizeAngle(int *angle)
+{
+    while (*angle < 0)
+        *angle += 360 * 16;
+    while (*angle > 360 * 16)
+        *angle -= 360 * 16;
+}
+
+void GLWidget::createBubbles(int number)
+{
+    for (int i = 0; i < number; ++i) {
+        QPointF position(width()*(0.1 + (0.8*qrand()/(RAND_MAX+1.0))),
+                        height()*(0.1 + (0.8*qrand()/(RAND_MAX+1.0))));
+        qreal radius = qMin(width(), height())*(0.0125 + 0.0875*qrand()/(RAND_MAX+1.0));
+        QPointF velocity(width()*0.0125*(-0.5 + qrand()/(RAND_MAX+1.0)),
+                        height()*0.0125*(-0.5 + qrand()/(RAND_MAX+1.0)));
+
+        bubbles.append(new Bubble(position, radius, velocity));
+    }
+}
+
+//! [13]
+void GLWidget::animate()
+{
+    QMutableListIterator<Bubble*> iter(bubbles);
+
+    while (iter.hasNext()) {
+        Bubble *bubble = iter.next();
+        bubble->move(rect());
+    }
+    update();
+}
+//! [13]
+
+//! [14]
+void GLWidget::setupViewport(int width, int height)
+{
+    int side = qMin(width, height);
+    glViewport((width - side) / 2, (height - side) / 2, side, side);
+
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glOrtho(-0.5, +0.5, +0.5, -0.5, 4.0, 15.0);
+    glMatrixMode(GL_MODELVIEW);
+}
+//! [14]
+
+//! [15]
+void GLWidget::drawInstructions(QPainter *painter)
+{
+    QString text = tr("Click and drag with the left mouse button "
+                      "to rotate the Qt logo.");
+    QFontMetrics metrics = QFontMetrics(font());
+    int border = qMax(4, metrics.leading());
+
+    QRect rect = metrics.boundingRect(0, 0, width() - 2*border, int(height()*0.125),
+                                      Qt::AlignCenter | Qt::TextWordWrap, text);
+    painter->setRenderHint(QPainter::TextAntialiasing);
+    painter->fillRect(QRect(0, 0, width(), rect.height() + 2*border),
+                     QColor(0, 0, 0, 127));
+    painter->setPen(Qt::white);
+    painter->fillRect(QRect(0, 0, width(), rect.height() + 2*border),
+                      QColor(0, 0, 0, 127));
+    painter->drawText((width() - rect.width())/2, border,
+                      rect.width(), rect.height(),
+                      Qt::AlignCenter | Qt::TextWordWrap, text);
+}
+//! [15]
diff --git a/examples/opengl/overpainting/glwidget.h b/examples/opengl/overpainting/glwidget.h
new file mode 100644
index 0000000000..f1b49c1c18
--- /dev/null
+++ b/examples/opengl/overpainting/glwidget.h
@@ -0,0 +1,114 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GLWIDGET_H
+#define GLWIDGET_H
+
+#include <QBrush>
+#include <QFont>
+#include <QImage>
+#include <QPen>
+#include <QGLWidget>
+#include <QTimer>
+
+class Bubble;
+QT_BEGIN_NAMESPACE
+class QPaintEvent;
+class QWidget;
+QT_END_NAMESPACE
+
+//! [0]
+class GLWidget : public QGLWidget
+{
+    Q_OBJECT
+
+public:
+    GLWidget(QWidget *parent = 0);
+    ~GLWidget();
+//! [0]
+
+    QSize sizeHint() const;
+    int xRotation() const { return xRot; }
+    int yRotation() const { return yRot; }
+    int zRotation() const { return zRot; }
+
+public slots:
+    void setXRotation(int angle);
+    void setYRotation(int angle);
+    void setZRotation(int angle);
+
+//! [1]
+protected:
+    void initializeGL();
+    void paintEvent(QPaintEvent *event);
+    void resizeGL(int width, int height);
+    void mousePressEvent(QMouseEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
+    void showEvent(QShowEvent *event);
+
+private slots:
+    void animate();
+
+private:
+    GLuint makeObject();
+    void createBubbles(int number);
+    void drawInstructions(QPainter *painter);
+//! [1]
+    void extrude(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
+    void normalizeAngle(int *angle);
+    void quad(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2,
+              GLdouble x3, GLdouble y3, GLdouble x4, GLdouble y4);
+    void setupViewport(int width, int height);
+
+    GLuint object;
+    int xRot;
+    int yRot;
+    int zRot;
+    QPoint lastPos;
+    QColor trolltechGreen;
+    QColor trolltechPurple;
+//! [4]
+    QList<Bubble*> bubbles;
+    QTimer animationTimer;
+};
+//! [4]
+
+#endif
diff --git a/examples/opengl/overpainting/main.cpp b/examples/opengl/overpainting/main.cpp
new file mode 100644
index 0000000000..c1b17df90e
--- /dev/null
+++ b/examples/opengl/overpainting/main.cpp
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include "glwidget.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    GLWidget window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/opengl/overpainting/overpainting.pro b/examples/opengl/overpainting/overpainting.pro
new file mode 100644
index 0000000000..b8e79eb651
--- /dev/null
+++ b/examples/opengl/overpainting/overpainting.pro
@@ -0,0 +1,13 @@
+QT          += opengl
+
+HEADERS     = bubble.h \
+              glwidget.h
+SOURCES     = bubble.cpp \
+              glwidget.cpp \
+              main.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/overpainting
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS overpainting.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/overpainting
+INSTALLS += target sources
diff --git a/examples/opengl/pbuffers/cubelogo.png b/examples/opengl/pbuffers/cubelogo.png
new file mode 100644
index 0000000000..3ae0f9ba3f
--- /dev/null
+++ b/examples/opengl/pbuffers/cubelogo.png
diff --git a/examples/opengl/pbuffers/glwidget.cpp b/examples/opengl/pbuffers/glwidget.cpp
new file mode 100644
index 0000000000..4dfbcf47be
--- /dev/null
+++ b/examples/opengl/pbuffers/glwidget.cpp
@@ -0,0 +1,260 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "glwidget.h"
+#include <QtGui/QImage>
+
+#include <math.h>
+
+static GLint cubeArray[][3] = {
+    {0, 0, 0}, {0, 1, 0}, {1, 1, 0}, {1, 0, 0},
+    {0, 0, 1}, {1, 0, 1}, {1, 1, 1}, {0, 1, 1},
+    {0, 0, 0}, {1, 0, 0}, {1, 0, 1}, {0, 0, 1},
+    {0, 1, 0}, {0, 1, 1}, {1, 1, 1}, {1, 1, 0},
+    {0, 1, 0}, {0, 0, 0}, {0, 0, 1}, {0, 1, 1},
+    {1, 0, 0}, {1, 1, 0}, {1, 1, 1}, {1, 0, 1}
+};
+
+static GLint cubeTextureArray[][2] = {
+    {0, 0}, {1, 0}, {1, 1}, {0, 1},
+    {0, 0}, {0, 1}, {1, 1}, {1, 0},
+    {0, 0}, {1, 0}, {1, 1}, {0, 1},
+    {1, 0}, {0, 0}, {0, 1}, {1, 1},
+    {0, 0}, {1, 0}, {1, 1}, {0, 1},
+    {1, 0}, {0, 0}, {0, 1}, {1, 1}
+};
+
+static GLint faceArray[][2] = {
+    {1, -1}, {1, 1}, {-1, 1}, {-1, -1}
+};
+
+static GLubyte colorArray[][4] = {
+    {102, 176, 54, 255},
+    {81, 141, 41, 255},
+    {62, 108, 32, 255},
+    {45, 79, 23, 255}
+};
+
+GLWidget::GLWidget(QWidget *parent)
+  : QGLWidget(QGLFormat(QGL::SampleBuffers), parent)
+{
+    // create the pbuffer
+    pbuffer = new QGLPixelBuffer(QSize(512, 512), format(), this);
+    timerId = startTimer(20);
+    setWindowTitle(tr("OpenGL pbuffers"));
+}
+
+GLWidget::~GLWidget()
+{
+    pbuffer->releaseFromDynamicTexture();
+    glDeleteTextures(1, &dynamicTexture);
+    glDeleteLists(pbufferList, 1);
+    delete pbuffer;
+}
+
+void GLWidget::initializeGL()
+{
+    glMatrixMode(GL_MODELVIEW);
+
+    glEnable(GL_CULL_FACE);
+    initCommon();
+    initPbuffer();
+
+    for (int i = 0; i < 3; ++i) {
+        yOffs[i] = 0.0f;
+        xInc[i] = 0.005f;
+        rot[i] = 0.0f;
+    }
+    xOffs[0]= 0.0f;
+    xOffs[1]= 0.5f;
+    xOffs[2]= 1.0f;
+
+    cubeTexture = bindTexture(QImage(":res/cubelogo.png"));
+}
+
+void GLWidget::resizeGL(int w, int h)
+{
+    glViewport(0, 0, w, h);
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    float aspect = w/(float)(h ? h : 1);
+    glFrustum(-aspect, aspect, -1, 1, 10, 100);
+    glTranslatef(-0.5f, -0.5f, -0.5f);
+    glTranslatef(0.0f, 0.0f, -15.0f);
+}
+
+void GLWidget::paintGL()
+{
+    // draw a spinning cube into the pbuffer..
+    pbuffer->makeCurrent();
+    glBindTexture(GL_TEXTURE_2D, cubeTexture);
+    glCallList(pbufferList);
+    glFlush();
+
+    // rendering directly to a texture is not supported on X11 and
+    // some Windows implementations, unfortunately
+    if (!hasDynamicTextureUpdate)
+        pbuffer->updateDynamicTexture(dynamicTexture);
+
+    // ..and use the pbuffer contents as a texture when rendering the
+    // background and the bouncing cubes
+    makeCurrent();
+    glBindTexture(GL_TEXTURE_2D, dynamicTexture);
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+    // draw the background
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+    glLoadIdentity();
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+    glLoadIdentity();
+
+    glVertexPointer(2, GL_INT, 0, faceArray);
+    glTranslatef(-1.2f, -0.8f, 0.0f);
+    glScalef(0.2f, 0.2f, 0.2f);
+    for (int y = 0; y < 5; ++y) {
+        for (int x = 0; x < 5; ++x) {
+            glTranslatef(2.0f, 0, 0);
+            glColor4f(0.8, 0.8, 0.8, 1.0);
+            glDrawArrays(GL_QUADS, 0, 4);
+        }
+        glTranslatef(-10.0f, 2.0f, 0);
+    }
+    glVertexPointer(3, GL_INT, 0, cubeArray);
+
+    glPopMatrix();
+    glMatrixMode(GL_MODELVIEW);
+    glPopMatrix();
+
+    // draw the bouncing cubes
+    drawCube(0, 0.0f, 1.5f, 2.5f, 1.5f);
+    drawCube(1, 1.0f, 2.0f, 2.5f, 2.0f);
+    drawCube(2, 2.0f, 3.5f, 2.5f, 2.5f);
+}
+
+void GLWidget::drawCube(int i, GLfloat z, GLfloat rotation, GLfloat jmp, GLfloat amp)
+{
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+    glTranslatef(xOffs[i], yOffs[i], z);
+    glTranslatef(0.5f, 0.5f, 0.5f);
+    GLfloat scale = 0.75 + i*(0.25f/2);
+    glScalef(scale, scale, scale);
+    glRotatef(rot[i], 1.0f, 1.0f, 1.0f);
+    glTranslatef(-0.5f, -0.5f, -0.5f);
+
+    glColor4f(1.0f, 1.0f, 1.0f, 0.8f);
+    glDrawArrays(GL_QUADS, 0, 24);
+
+    if (xOffs[i] > 1.0f || xOffs[i] < -1.0f) {
+        xInc[i] = -xInc[i];
+        xOffs[i] = xOffs[i] > 1.0f ? 1.0f : -1.0f;
+    }
+    xOffs[i] += xInc[i];
+    yOffs[i] = qAbs(cos((-3.141592f * jmp) * xOffs[i]) * amp) - 1;
+    rot[i] += rotation;
+}
+
+void GLWidget::initCommon()
+{
+    glEnableClientState(GL_VERTEX_ARRAY);
+    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+    glVertexPointer(3, GL_INT, 0, cubeArray);
+    glTexCoordPointer(2, GL_INT, 0, cubeTextureArray);
+    glColorPointer(4, GL_UNSIGNED_BYTE, 0, colorArray);
+
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glEnable(GL_BLEND);
+    glEnable(GL_TEXTURE_2D);
+    glEnable(GL_DEPTH_TEST);
+
+    glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
+}
+
+void GLWidget::initPbuffer()
+{
+    // set up the pbuffer context
+    pbuffer->makeCurrent();
+    initCommon();
+
+    glViewport(0, 0, pbuffer->size().width(), pbuffer->size().height());
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glOrtho(-1, 1, -1, 1, -99, 99);
+    glTranslatef(-0.5f, -0.5f, 0.0f);
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+
+    pbufferList = glGenLists(1);
+    glNewList(pbufferList, GL_COMPILE);
+    {
+        glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
+
+        // draw cube background
+        glPushMatrix();
+        glLoadIdentity();
+        glTranslatef(0.5f, 0.5f, -2.0f);
+        glDisable(GL_TEXTURE_2D);
+        glEnableClientState(GL_COLOR_ARRAY);
+        glVertexPointer(2, GL_INT, 0, faceArray);
+        glDrawArrays(GL_QUADS, 0, 4);
+        glVertexPointer(3, GL_INT, 0, cubeArray);
+        glDisableClientState(GL_COLOR_ARRAY);
+        glEnable(GL_TEXTURE_2D);
+        glPopMatrix();
+
+        // draw cube
+        glTranslatef(0.5f, 0.5f, 0.5f);
+        glRotatef(3.0f, 1.0f, 1.0f, 1.0f);
+        glTranslatef(-0.5f, -0.5f, -0.5f);
+        glColor4f(0.9f, 0.9f, 0.9f, 1.0f);
+        glDrawArrays(GL_QUADS, 0, 24);
+    }
+    glEndList();
+    // generate a texture that has the same size/format as the pbuffer
+    dynamicTexture = pbuffer->generateDynamicTexture();
+
+    // bind the dynamic texture to the pbuffer - this is a no-op under X11
+    hasDynamicTextureUpdate = pbuffer->bindToDynamicTexture(dynamicTexture);
+    makeCurrent();
+}
+
diff --git a/examples/opengl/pbuffers/glwidget.h b/examples/opengl/pbuffers/glwidget.h
new file mode 100644
index 0000000000..9f2e86cc2d
--- /dev/null
+++ b/examples/opengl/pbuffers/glwidget.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtOpenGL>
+
+class GLWidget : public QGLWidget
+{
+public:
+    GLWidget(QWidget *parent);
+    ~GLWidget();
+    void initializeGL();
+    void resizeGL(int w, int h);
+    void paintGL();
+    void timerEvent(QTimerEvent *) { update(); }
+    void mousePressEvent(QMouseEvent *) { killTimer(timerId); }
+    void mouseReleaseEvent(QMouseEvent *) { timerId = startTimer(20); }
+
+    void drawCube(int i, GLfloat z, GLfloat ri, GLfloat jmp, GLfloat amp);
+    void initCommon();
+    void initPbuffer();
+
+private:
+    GLfloat rot[3], xOffs[3], yOffs[3], xInc[3];
+    GLuint pbufferList;
+    GLuint dynamicTexture;
+    GLuint cubeTexture;
+    int timerId;
+    bool hasDynamicTextureUpdate;
+
+    QGLPixelBuffer *pbuffer;
+};
+
diff --git a/examples/opengl/pbuffers/main.cpp b/examples/opengl/pbuffers/main.cpp
new file mode 100644
index 0000000000..91799e0e6a
--- /dev/null
+++ b/examples/opengl/pbuffers/main.cpp
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtGui/QMessageBox>
+#include "glwidget.h"
+
+int main(int argc, char **argv)
+{
+    Q_INIT_RESOURCE(pbuffers);
+
+    QApplication a(argc, argv);
+    if (!QGLFormat::hasOpenGL() || !QGLPixelBuffer::hasOpenGLPbuffers()) {
+	QMessageBox::information(0, "OpenGL pbuffers",
+				 "This system does not support OpenGL/pbuffers.");
+        return -1;
+    }
+
+    GLWidget widget(0);
+    widget.resize(640, 480);
+    widget.show();
+    return a.exec();
+}
+
diff --git a/examples/opengl/pbuffers/pbuffers.pro b/examples/opengl/pbuffers/pbuffers.pro
new file mode 100644
index 0000000000..c1060e2361
--- /dev/null
+++ b/examples/opengl/pbuffers/pbuffers.pro
@@ -0,0 +1,11 @@
+HEADERS += glwidget.h
+SOURCES += glwidget.cpp main.cpp
+RESOURCES += pbuffers.qrc
+
+QT += opengl
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers
+sources.files = $$SOURCES $$HEADERS $$RESOURCES pbuffers.pro *.png
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers
+INSTALLS += target sources
diff --git a/examples/opengl/pbuffers/pbuffers.qrc b/examples/opengl/pbuffers/pbuffers.qrc
new file mode 100644
index 0000000000..9fc1a56a1a
--- /dev/null
+++ b/examples/opengl/pbuffers/pbuffers.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/res">
+   <file>cubelogo.png</file>
+</qresource>
+</RCC>
diff --git a/examples/opengl/pbuffers2/bubbles.svg b/examples/opengl/pbuffers2/bubbles.svg
new file mode 100644
index 0000000000..65867da2d8
--- /dev/null
+++ b/examples/opengl/pbuffers2/bubbles.svg
@@ -0,0 +1,215 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg width="20cm" height="15cm" viewBox="0 0 800 600"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink/"
+    baseProfile="tiny" version="1.2">
+  <title>Spheres</title>
+  <desc>Semi-transparent bubbles on a colored background.</desc>
+    <defs>
+      <!-- Create radial gradients for each bubble. -->
+      <radialGradient id="blueBubble" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" stop-opacity="1" />
+        <stop offset="25%" stop-color="#cdcdff" stop-opacity=".65" />
+        <stop offset="100%" stop-color="#cdaacd" stop-opacity=".75" />
+      </radialGradient>
+      <radialGradient id="redBubble" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" stop-opacity="1" />
+        <stop offset="25%" stop-color="#ffcdcd" stop-opacity=".65" />
+        <stop offset="100%" stop-color="#bbbb99" stop-opacity=".75" />
+      </radialGradient>
+      <radialGradient id="greenBubble" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" stop-opacity="1" />
+        <stop offset="25%" stop-color="#cdffcd" stop-opacity=".65" />
+        <stop offset="100%" stop-color="#99aaaa" stop-opacity=".75" />
+      </radialGradient>
+      <radialGradient id="yellowBubble" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" stop-opacity="1" />
+        <stop offset="25%" stop-color="#ffffcd" stop-opacity=".65" />
+        <stop offset="100%" stop-color="#bbbbaa" stop-opacity=".75" />
+      </radialGradient>
+      <radialGradient id="background" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="400" fx="250" fy="250">
+        <stop offset="0%" stop-color="#ffffee" />
+        <stop offset="100%" stop-color="#ccccaa" />
+      </radialGradient>
+      <linearGradient id="surface" gradientUnits="userSpaceOnUse"
+                      x1="-100" y1="200" x2="400" y2="200">
+        <stop offset="0%" stop-color="#ffffcc" />
+        <stop offset="100%" stop-color="#bbbb88" />
+      </linearGradient>
+
+      <!-- Create radial gradients for each circle to make them look like
+           spheres. -->
+      <radialGradient id="blueSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="blue" />
+        <stop offset="100%" stop-color="#222244" />
+      </radialGradient>
+      <radialGradient id="redSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="red" />
+        <stop offset="100%" stop-color="#442222" />
+      </radialGradient>
+      <radialGradient id="greenSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="green" />
+        <stop offset="100%" stop-color="#113311" />
+      </radialGradient>
+      <radialGradient id="yellowSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="yellow" />
+        <stop offset="100%" stop-color="#444422" />
+      </radialGradient>
+      <radialGradient id="shadowGrad" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="50">
+        <stop offset="0%" stop-color="black" stop-opacity="1.0" />
+        <stop offset="100%" stop-color="white" stop-opacity="0.0" />
+      </radialGradient>
+
+      <!-- Define a shadow for each sphere. -->
+      <circle id="shadow" fill="url(#shadowGrad)" cx="0" cy="0" r="100" />
+      <g id="bubble">
+        <circle fill="black" cx="0" cy="0" r="50" />
+        <circle fill="#a6ce39" cx="0" cy="0" r="33" />
+        <path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10
+                              L -11,22 L -1,12 Z" />
+        <circle cx="0" cy="0" r="100" />
+      </g>
+    </defs>
+  <g>
+    <rect fill="url(#background)" x="0" y="0" width="800" height="600" />
+  </g>
+
+  <g transform="translate(200,700)">
+    <use xlink:href="#bubble" fill="url(#blueBubble)" />
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="1s" dur="10s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(315,700)">
+    <g transform="scale(0.5,0.5)">
+      <use xlink:href="#bubble" fill="url(#redBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="3s" dur="7s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(80,700)">
+    <g transform="scale(0.65,0.65)">
+      <use xlink:href="#bubble" fill="url(#greenBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="5s" dur="9s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(255,700)">
+    <g transform="scale(0.3,0.3)">
+      <use xlink:href="#bubble" fill="url(#yellowBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="2s" dur="6s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(565,700)">
+    <g transform="scale(0.4,0.4)">
+      <use xlink:href="#bubble" fill="url(#blueBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="4s" dur="8s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(715,700)">
+    <g transform="scale(0.6,0.6)">
+      <use xlink:href="#bubble" fill="url(#redBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="1s" dur="4s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(645,700)">
+    <g transform="scale(0.375,0.375)">
+      <use xlink:href="#bubble" fill="url(#greenBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="0s" dur="11s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(555,700)">
+    <g transform="scale(0.9,0.9)">
+      <use xlink:href="#bubble" fill="url(#yellowBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="3s" dur="7.5s" fill="freeze" repeatCount="indefinite" />
+  </g>
+
+  <g transform="translate(360,700)">
+    <g transform="scale(0.5,0.5)">
+      <use xlink:href="#bubble" fill="url(#blueBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="3s" dur="6s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(215,700)">
+    <g transform="scale(0.45,0.45)">
+      <use xlink:href="#bubble" fill="url(#redBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="5.5s" dur="7s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(420,700)">
+    <g transform="scale(0.75,0.75)">
+      <use xlink:href="#bubble" fill="url(#greenBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="1s" dur="9s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(815,700)">
+    <g transform="scale(0.6,0.6)">
+      <use xlink:href="#bubble" fill="url(#yellowBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="2s" dur="9.5s" fill="freeze" repeatCount="indefinite" />
+  </g>
+
+  <g transform="translate(225,375)" >
+    <g transform="scale(1.0,0.5)" >
+      <path d="M 0 0 L 350 0 L 450 450 L -100 450 z"
+            fill="url(#surface)" stroke="none" />
+    </g>
+  </g>
+    <g transform="translate(200,0)" >
+    <g transform="translate(200,490) scale(2.0,1.0) rotate(45)" >
+      <rect fill="#a6ce39" x="-69" y="-69" width="138" height="138" />
+      <circle fill="black" cx="0" cy="0" r="50" />
+      <circle fill="#a6ce39" cx="0" cy="0" r="33" />
+      <path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10
+                            L -11,22 L -1,12 Z" />
+      <animateTransform attributeName="transform"  type="rotate" values="0; 360"
+	         begin="0s" dur="10s" fill="freeze" repeatCount="indefinite" />
+    </g>
+    <g transform="translate(200,375)">
+      <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+      <circle fill="url(#blueSphere)" cx="0" cy="0" r="100" />
+    </g>
+    <g transform="translate(315,440)">
+      <g transform="scale(0.5,0.5)">
+        <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+        <circle fill="url(#redSphere)" cx="0" cy="0" r="100" />
+      </g>
+    </g>
+    <g transform="translate(80,475)">
+      <g transform="scale(0.65,0.65)">
+        <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+        <circle fill="url(#greenSphere)" cx="0" cy="0" r="100" />
+      </g>
+    </g>
+    <g transform="translate(255,525)">
+      <g transform="scale(0.3,0.3)">
+        <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+        <circle fill="url(#yellowSphere)" cx="0" cy="0" r="100" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/examples/opengl/pbuffers2/designer.png b/examples/opengl/pbuffers2/designer.png
new file mode 100644
index 0000000000..4f32d57496
--- /dev/null
+++ b/examples/opengl/pbuffers2/designer.png
diff --git a/examples/opengl/pbuffers2/glwidget.cpp b/examples/opengl/pbuffers2/glwidget.cpp
new file mode 100644
index 0000000000..fa37946303
--- /dev/null
+++ b/examples/opengl/pbuffers2/glwidget.cpp
@@ -0,0 +1,326 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QImage>
+#include "glwidget.h"
+
+#include <math.h>
+
+#ifndef GL_MULTISAMPLE
+#define GL_MULTISAMPLE  0x809D
+#endif
+
+GLWidget::GLWidget(QWidget *parent)
+    : QGLWidget(QGLFormat(QGL::SampleBuffers), parent)
+{
+    setWindowTitle(tr("OpenGL pbuffers 2"));
+
+    pbuffer = new QGLPixelBuffer(1024, 1024, format(), this);
+
+    rot_x = rot_y = rot_z = 0.0f;
+    scale = 0.1f;
+    anim = new QTimeLine(750, this);
+    anim->setUpdateInterval(20);
+    connect(anim, SIGNAL(valueChanged(qreal)), SLOT(animate(qreal)));
+    connect(anim, SIGNAL(finished()), SLOT(animFinished()));
+
+    svg_renderer = new QSvgRenderer(QLatin1String(":/res/bubbles.svg"), this);
+    connect(svg_renderer, SIGNAL(repaintNeeded()), this, SLOT(draw()));
+
+    logo = QImage(":/res/designer.png");
+    logo = logo.convertToFormat(QImage::Format_ARGB32);
+
+    makeCurrent(); // need a current context to create the display list
+    tile_list = glGenLists(1);
+    glNewList(tile_list, GL_COMPILE);
+    glBegin(GL_QUADS);
+    {
+        glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f,  1.0f);
+        glTexCoord2f(1.0f, 0.0f); glVertex3f( 1.0f, -1.0f,  1.0f);
+        glTexCoord2f(1.0f, 1.0f); glVertex3f( 1.0f,  1.0f,  1.0f);
+        glTexCoord2f(0.0f, 1.0f); glVertex3f(-1.0f,  1.0f,  1.0f);
+
+        glTexCoord2f(1.0f, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f);
+        glTexCoord2f(1.0f, 1.0f); glVertex3f(-1.0f,  1.0f, -1.0f);
+        glTexCoord2f(0.0f, 1.0f); glVertex3f( 1.0f,  1.0f, -1.0f);
+        glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f);
+
+        glTexCoord2f(0.0f, 1.0f); glVertex3f(-1.0f,  1.0f, -1.0f);
+        glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f,  1.0f,  1.0f);
+        glTexCoord2f(1.0f, 0.0f); glVertex3f( 1.0f,  1.0f,  1.0f);
+        glTexCoord2f(1.0f, 1.0f); glVertex3f( 1.0f,  1.0f, -1.0f);
+
+        glTexCoord2f(1.0f, 1.0f); glVertex3f(-1.0f, -1.0f, -1.0f);
+        glTexCoord2f(0.0f, 1.0f); glVertex3f( 1.0f, -1.0f, -1.0f);
+        glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f,  1.0f);
+        glTexCoord2f(1.0f, 0.0f); glVertex3f(-1.0f, -1.0f,  1.0f);
+
+        glTexCoord2f(1.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f);
+        glTexCoord2f(1.0f, 1.0f); glVertex3f( 1.0f,  1.0f, -1.0f);
+        glTexCoord2f(0.0f, 1.0f); glVertex3f( 1.0f,  1.0f,  1.0f);
+        glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f,  1.0f);
+
+        glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f);
+        glTexCoord2f(1.0f, 0.0f); glVertex3f(-1.0f, -1.0f,  1.0f);
+        glTexCoord2f(1.0f, 1.0f); glVertex3f(-1.0f,  1.0f,  1.0f);
+        glTexCoord2f(0.0f, 1.0f); glVertex3f(-1.0f,  1.0f, -1.0f);
+}
+    glEnd();
+    glEndList();
+
+    wave = new GLfloat[logo.width()*logo.height()];
+    memset(wave, 0, logo.width()*logo.height());
+    startTimer(30); // wave timer
+
+    pbuffer->makeCurrent();
+    dynamicTexture = pbuffer->generateDynamicTexture();
+
+    // bind the dynamic texture to the pbuffer - this is a no-op under X11
+    hasDynamicTextureUpdate = pbuffer->bindToDynamicTexture(dynamicTexture);
+}
+
+GLWidget::~GLWidget()
+{
+    delete[] wave;
+    glDeleteLists(tile_list, 1);
+    pbuffer->releaseFromDynamicTexture();
+    glDeleteTextures(1, &dynamicTexture);
+    delete pbuffer;
+}
+
+void GLWidget::paintEvent(QPaintEvent *)
+{
+    draw();
+}
+
+void GLWidget::draw()
+{
+    QPainter p(this); // used for text overlay
+
+    // save the GL state set for QPainter
+    saveGLState();
+
+    // render the 'bubbles.svg' file into our pbuffer
+    QPainter pbuffer_painter(pbuffer);
+    svg_renderer->render(&pbuffer_painter);
+    pbuffer_painter.end();
+    glFlush();
+
+    // rendering directly to a texture is not supported on X11 and
+    // some Windows implementations, unfortunately
+    if (!hasDynamicTextureUpdate)
+        pbuffer->updateDynamicTexture(dynamicTexture);
+
+    makeCurrent();
+    // draw into the GL widget
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glFrustum(-1, 1, -1, 1, 10, 100);
+    glTranslatef(0.0f, 0.0f, -15.0f);
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+    glViewport(0, 0, width(), height());
+
+    glBindTexture(GL_TEXTURE_2D, dynamicTexture);
+    glEnable(GL_TEXTURE_2D);
+    glEnable(GL_MULTISAMPLE);
+    glEnable(GL_CULL_FACE);
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+    // draw background
+    glPushMatrix();
+    glScalef(1.7f, 1.7f, 1.7f);
+    glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+    glCallList(tile_list);
+    glPopMatrix();
+
+    const int w = logo.width();
+    const int h = logo.height();
+
+    glRotatef(rot_x, 1.0f, 0.0f, 0.0f);
+    glRotatef(rot_y, 0.0f, 1.0f, 0.0f);
+    glRotatef(rot_z, 0.0f, 0.0f, 1.0f);
+    glScalef(scale/w, scale/w, scale/w);
+
+    glDepthFunc(GL_LESS);
+    glEnable(GL_DEPTH_TEST);
+
+    // draw the Qt icon
+    glTranslatef(-w+1, -h+1, 0.0f);
+    for (int y=h-1; y>=0; --y) {
+        uint *p = (uint*) logo.scanLine(y);
+        uint *end = p + w;
+        int  x = 0;
+        while (p < end) {
+            glColor4ub(qRed(*p), qGreen(*p), qBlue(*p), uchar(qAlpha(*p)*.9));
+            glTranslatef(0.0f, 0.0f, wave[y*w+x]);
+            if (qAlpha(*p) > 128)
+                glCallList(tile_list);
+            glTranslatef(0.0f, 0.0f, -wave[y*w+x]);
+            glTranslatef(2.0f, 0.0f, 0.0f);
+            ++x;
+            ++p;
+        }
+        glTranslatef(-w*2.0f, 2.0f, 0.0f);
+    }
+
+    // restore the GL state that QPainter expects
+    restoreGLState();
+
+    // draw the overlayed text using QPainter
+    p.setPen(QColor(197, 197, 197, 157));
+    p.setBrush(QColor(197, 197, 197, 127));
+    p.drawRect(QRect(0, 0, width(), 50));
+    p.setPen(Qt::black);
+    p.setBrush(Qt::NoBrush);
+    const QString str1(tr("A simple OpenGL pbuffer example."));
+    const QString str2(tr("Use the mouse wheel to zoom, press buttons and move mouse to rotate, double-click to flip."));
+    QFontMetrics fm(p.font());
+    p.drawText(width()/2 - fm.width(str1)/2, 20, str1);
+    p.drawText(width()/2 - fm.width(str2)/2, 20 + fm.lineSpacing(), str2);
+}
+
+void GLWidget::mousePressEvent(QMouseEvent *e)
+{
+    anchor = e->pos();
+}
+
+void GLWidget::mouseMoveEvent(QMouseEvent *e)
+{
+    QPoint diff = e->pos() - anchor;
+    if (e->buttons() & Qt::LeftButton) {
+        rot_x += diff.y()/5.0f;
+        rot_y += diff.x()/5.0f;
+    } else if (e->buttons() & Qt::RightButton) {
+        rot_z += diff.x()/5.0f;
+    }
+
+    anchor = e->pos();
+    draw();
+}
+
+void GLWidget::wheelEvent(QWheelEvent *e)
+{
+    e->delta() > 0 ? scale += scale*0.1f : scale -= scale*0.1f;
+    draw();
+}
+
+void GLWidget::mouseDoubleClickEvent(QMouseEvent *)
+{
+    anim->start();
+}
+
+void GLWidget::animate(qreal val)
+{
+    rot_y = val * 180;
+    draw();
+}
+
+void GLWidget::animFinished()
+{
+    if (anim->direction() == QTimeLine::Forward)
+        anim->setDirection(QTimeLine::Backward);
+    else
+        anim->setDirection(QTimeLine::Forward);
+}
+
+void GLWidget::saveGLState()
+{
+    glPushAttrib(GL_ALL_ATTRIB_BITS);
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+}
+
+void GLWidget::restoreGLState()
+{
+    glMatrixMode(GL_PROJECTION);
+    glPopMatrix();
+    glMatrixMode(GL_MODELVIEW);
+    glPopMatrix();
+    glPopAttrib();
+}
+
+#define PI 3.14159
+
+void GLWidget::timerEvent(QTimerEvent *)
+{
+    if (QApplication::mouseButtons() != 0)
+        return;
+
+    static bool scale_in = true;
+
+    if (scale_in && scale > 35.0f)
+        scale_in = false;
+    else if (!scale_in && scale < .5f)
+        scale_in = true;
+
+    scale = scale_in ? scale + scale*0.01f : scale-scale*0.01f;
+    rot_z += 0.3f;
+    rot_x += 0.1f;
+
+    int dx, dy; // disturbance point
+    float s, v, W, t;
+    int i, j;
+    static float wt[128][128];
+    const int width = logo.width();
+    const int AMP = 5;
+
+    dx = dy = width >> 1;
+
+    W = .3f;
+    v = -4; // wave speed
+
+    for (i = 0; i < width; ++i) {
+        for ( j = 0; j < width; ++j) {
+            s = sqrt((double) ((j - dx) * (j - dx) + (i - dy) * (i - dy)));
+            wt[i][j] += 0.1f;
+            t = s / v;
+            if (s != 0)
+                wave[i*width + j] = AMP * sin(2 * PI * W * (wt[i][j] + t)) / (0.2*(s + 2));
+            else
+                wave[i*width + j] = AMP * sin(2 * PI * W * (wt[i][j] + t));
+        }
+    }
+}
diff --git a/examples/opengl/pbuffers2/glwidget.h b/examples/opengl/pbuffers2/glwidget.h
new file mode 100644
index 0000000000..8058a418a7
--- /dev/null
+++ b/examples/opengl/pbuffers2/glwidget.h
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtOpenGL>
+#include <QImage>
+#include <QTimeLine>
+#include <QSvgRenderer>
+
+class GLWidget : public QGLWidget
+{
+    Q_OBJECT
+
+public:
+    GLWidget(QWidget *parent);
+    ~GLWidget();
+
+    void saveGLState();
+    void restoreGLState();
+
+    void paintEvent(QPaintEvent *);
+    void mousePressEvent(QMouseEvent *);
+    void mouseDoubleClickEvent(QMouseEvent *);
+    void mouseMoveEvent(QMouseEvent *);
+    void timerEvent(QTimerEvent *);
+    void wheelEvent(QWheelEvent *);
+
+public slots:
+    void animate(qreal);
+    void animFinished();
+    void draw();
+
+private:
+    QPoint anchor;
+    float scale;
+    float rot_x, rot_y, rot_z;
+    GLuint tile_list;
+    GLfloat *wave;
+    bool hasDynamicTextureUpdate;
+
+    QImage logo;
+    QTimeLine *anim;
+    QSvgRenderer *svg_renderer;
+
+    GLuint dynamicTexture;
+    QGLPixelBuffer *pbuffer;
+};
+
diff --git a/examples/opengl/pbuffers2/main.cpp b/examples/opengl/pbuffers2/main.cpp
new file mode 100644
index 0000000000..9d03beb7fd
--- /dev/null
+++ b/examples/opengl/pbuffers2/main.cpp
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtGui/QMessageBox>
+#include "glwidget.h"
+
+int main(int argc, char **argv)
+{
+    Q_INIT_RESOURCE(pbuffers2);
+
+    QApplication a(argc, argv);
+    if (!QGLFormat::hasOpenGL() || !QGLPixelBuffer::hasOpenGLPbuffers()) {
+	QMessageBox::information(0, "OpenGL pbuffers 2",
+				 "This system does not support OpenGL/pbuffers.");
+        return -1;
+    }
+
+    GLWidget widget(0);
+    widget.resize(640, 480);
+    widget.show();
+    return a.exec();
+}
+
diff --git a/examples/opengl/pbuffers2/pbuffers2.pro b/examples/opengl/pbuffers2/pbuffers2.pro
new file mode 100644
index 0000000000..cbd0cb514e
--- /dev/null
+++ b/examples/opengl/pbuffers2/pbuffers2.pro
@@ -0,0 +1,21 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Fri May 12 17:15:46 2006
+######################################################################
+
+TEMPLATE = app
+TARGET =
+DEPENDPATH += .
+INCLUDEPATH += .
+
+QT += opengl svg
+
+# Input
+HEADERS += glwidget.h
+SOURCES += glwidget.cpp main.cpp
+RESOURCES += pbuffers2.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers2
+sources.files = $$SOURCES $$HEADERS $$RESOURCES pbuffers2.pro *.png *.svg
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers2
+INSTALLS += target sources
diff --git a/examples/opengl/pbuffers2/pbuffers2.qrc b/examples/opengl/pbuffers2/pbuffers2.qrc
new file mode 100644
index 0000000000..986f1ca385
--- /dev/null
+++ b/examples/opengl/pbuffers2/pbuffers2.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/res">
+   <file>bubbles.svg</file>
+   <file>designer.png</file>
+</qresource>
+</RCC>
diff --git a/examples/opengl/samplebuffers/glwidget.cpp b/examples/opengl/samplebuffers/glwidget.cpp
new file mode 100644
index 0000000000..381ff9573b
--- /dev/null
+++ b/examples/opengl/samplebuffers/glwidget.cpp
@@ -0,0 +1,165 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "glwidget.h"
+#include <math.h>
+
+#ifndef GL_MULTISAMPLE
+#define GL_MULTISAMPLE  0x809D
+#endif
+
+GLWidget::GLWidget(QWidget *parent)
+    : QGLWidget(QGLFormat(QGL::SampleBuffers), parent)
+{
+    startTimer(40);
+    setWindowTitle(tr("Sample Buffers"));
+}
+
+void GLWidget::initializeGL()
+{
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glOrtho(-.5, .5, .5, -.5, -1000, 1000);
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+    glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
+
+    makeObject();
+}
+
+void GLWidget::resizeGL(int w, int h)
+{
+    glViewport(0, 0, w, h);
+}
+
+void GLWidget::paintGL()
+{
+    static float rot = 0.0;
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+    glEnable(GL_MULTISAMPLE);
+    glTranslatef(-0.25f, -0.10f, 0.0f);
+    glScalef(0.75f, 1.15f, 0.0f);
+    glRotatef(rot, 0.0f, 0.f, 1.0f);
+    glCallList(list);
+    glPopMatrix();
+
+    glPushMatrix();
+    glDisable(GL_MULTISAMPLE);
+    glTranslatef(0.25f, -0.10f, 0.0f);
+    glScalef(0.75f, 1.15f, 0.0f);
+    glRotatef(rot, 0.0f, 0.0f, 1.0f);
+    glCallList(list);
+    glPopMatrix();
+
+    rot += 0.2f;
+
+    qglColor(Qt::black);
+    renderText(-0.35, 0.4, 0.0, "Multisampling enabled");
+    renderText(0.15, 0.4, 0.0, "Multisampling disabled");
+}
+
+void GLWidget::timerEvent(QTimerEvent *)
+{
+    update();
+}
+
+void GLWidget::makeObject()
+{
+    QColor trolltechGreen(QColor::fromCmykF(0.40, 0.0, 1.0, 0.0));
+    const double Pi = 3.14159265358979323846;
+    const int NumSectors = 15;
+    GLdouble x1 = +0.06;
+    GLdouble y1 = -0.14;
+    GLdouble x2 = +0.14;
+    GLdouble y2 = -0.06;
+    GLdouble x3 = +0.08;
+    GLdouble y3 = +0.00;
+    GLdouble x4 = +0.30;
+    GLdouble y4 = +0.22;
+
+    list = glGenLists(1);
+    glNewList(list, GL_COMPILE);
+    {
+        for (int i = 0; i < NumSectors; ++i) {
+            double angle1 = (i * 2 * Pi) / NumSectors;
+            GLdouble x5 = 0.30 * sin(angle1);
+            GLdouble y5 = 0.30 * cos(angle1);
+            GLdouble x6 = 0.20 * sin(angle1);
+            GLdouble y6 = 0.20 * cos(angle1);
+
+            double angle2 = ((i + 1) * 2 * Pi) / NumSectors;
+            GLdouble x7 = 0.20 * sin(angle2);
+            GLdouble y7 = 0.20 * cos(angle2);
+            GLdouble x8 = 0.30 * sin(angle2);
+            GLdouble y8 = 0.30 * cos(angle2);
+
+            qglColor(trolltechGreen);
+            quad(GL_QUADS, x5, y5, x6, y6, x7, y7, x8, y8);
+            qglColor(Qt::black);
+            quad(GL_LINE_LOOP, x5, y5, x6, y6, x7, y7, x8, y8);
+        }
+
+        qglColor(trolltechGreen);
+        quad(GL_QUADS, x1, y1, x2, y2, y2, x2, y1, x1);
+        quad(GL_QUADS, x3, y3, x4, y4, y4, x4, y3, x3);
+
+        qglColor(Qt::black);
+        quad(GL_LINE_LOOP, x1, y1, x2, y2, y2, x2, y1, x1);
+        quad(GL_LINE_LOOP, x3, y3, x4, y4, y4, x4, y3, x3);
+    }
+    glEndList();
+}
+
+void GLWidget::quad(GLenum primitive, GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2,
+                    GLdouble x3, GLdouble y3, GLdouble x4, GLdouble y4)
+{
+    glBegin(primitive);
+    {
+        glVertex2d(x1, y1);
+        glVertex2d(x2, y2);
+        glVertex2d(x3, y3);
+        glVertex2d(x4, y4);
+    }
+    glEnd();
+}
diff --git a/examples/opengl/samplebuffers/glwidget.h b/examples/opengl/samplebuffers/glwidget.h
new file mode 100644
index 0000000000..dee739e222
--- /dev/null
+++ b/examples/opengl/samplebuffers/glwidget.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtOpenGL>
+
+class GLWidget : public QGLWidget
+{
+public:
+    GLWidget(QWidget *parent);
+
+protected:
+    void initializeGL();
+    void resizeGL(int w, int h);
+    void paintGL();
+    void timerEvent(QTimerEvent *);
+
+    void makeObject();
+    void quad(GLenum primitive, GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2,
+              GLdouble x3, GLdouble y3, GLdouble x4, GLdouble y4);
+
+private:
+    GLuint list;
+};
+
diff --git a/examples/opengl/samplebuffers/main.cpp b/examples/opengl/samplebuffers/main.cpp
new file mode 100644
index 0000000000..88a37b4c17
--- /dev/null
+++ b/examples/opengl/samplebuffers/main.cpp
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtGui/QMessageBox>
+#include "glwidget.h"
+
+int main(int argc, char **argv)
+{
+    QApplication a(argc, argv);
+
+    QGLFormat f = QGLFormat::defaultFormat();
+    f.setSampleBuffers(true);
+    QGLFormat::setDefaultFormat(f);
+    if (!QGLFormat::hasOpenGL()) {
+	QMessageBox::information(0, "OpenGL samplebuffers",
+				 "This system does not support OpenGL.");
+        return 0;
+    }
+
+    GLWidget widget(0);
+
+    if (!widget.format().sampleBuffers()) {
+	QMessageBox::information(0, "OpenGL samplebuffers",
+				 "This system does not have sample buffer support.");
+        return 0;
+    }
+
+    widget.resize(640, 480);
+    widget.show();
+
+    return a.exec();
+}
+
diff --git a/examples/opengl/samplebuffers/samplebuffers.pro b/examples/opengl/samplebuffers/samplebuffers.pro
new file mode 100644
index 0000000000..9eb5f58b15
--- /dev/null
+++ b/examples/opengl/samplebuffers/samplebuffers.pro
@@ -0,0 +1,10 @@
+HEADERS += glwidget.h
+SOURCES += glwidget.cpp main.cpp
+
+QT += opengl
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/samplebuffers
+sources.files = $$SOURCES $$HEADERS samplebuffers.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/samplebuffers
+INSTALLS += target sources
diff --git a/examples/opengl/textures/glwidget.cpp b/examples/opengl/textures/glwidget.cpp
new file mode 100644
index 0000000000..5882373bfc
--- /dev/null
+++ b/examples/opengl/textures/glwidget.cpp
@@ -0,0 +1,182 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtOpenGL>
+
+#include <math.h>
+
+#include "glwidget.h"
+
+GLuint GLWidget::sharedObject = 0;
+int GLWidget::refCount = 0;
+
+GLWidget::GLWidget(QWidget *parent, QGLWidget *shareWidget)
+    : QGLWidget(parent, shareWidget)
+{
+    clearColor = Qt::black;
+    xRot = 0;
+    yRot = 0;
+    zRot = 0;
+}
+
+GLWidget::~GLWidget()
+{
+    if (--refCount == 0) {
+        makeCurrent();
+        glDeleteLists(sharedObject, 1);
+    }
+}
+
+QSize GLWidget::minimumSizeHint() const
+{
+    return QSize(50, 50);
+}
+
+QSize GLWidget::sizeHint() const
+{
+    return QSize(200, 200);
+}
+
+void GLWidget::rotateBy(int xAngle, int yAngle, int zAngle)
+{
+    xRot += xAngle;
+    yRot += yAngle;
+    zRot += zAngle;
+    updateGL();
+}
+
+void GLWidget::setClearColor(const QColor &color)
+{
+    clearColor = color;
+    updateGL();
+}
+
+void GLWidget::initializeGL()
+{
+    if (!sharedObject)
+        sharedObject = makeObject();
+    ++refCount;
+
+    glEnable(GL_DEPTH_TEST);
+    glEnable(GL_CULL_FACE);
+    glEnable(GL_TEXTURE_2D);
+}
+
+void GLWidget::paintGL()
+{
+    qglClearColor(clearColor);
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glLoadIdentity();
+    glTranslated(0.0, 0.0, -10.0);
+    glRotated(xRot / 16.0, 1.0, 0.0, 0.0);
+    glRotated(yRot / 16.0, 0.0, 1.0, 0.0);
+    glRotated(zRot / 16.0, 0.0, 0.0, 1.0);
+    glCallList(sharedObject);
+}
+
+void GLWidget::resizeGL(int width, int height)
+{
+    int side = qMin(width, height);
+    glViewport((width - side) / 2, (height - side) / 2, side, side);
+
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glOrtho(-0.5, +0.5, +0.5, -0.5, 4.0, 15.0);
+    glMatrixMode(GL_MODELVIEW);
+}
+
+void GLWidget::mousePressEvent(QMouseEvent *event)
+{
+    lastPos = event->pos();
+}
+
+void GLWidget::mouseMoveEvent(QMouseEvent *event)
+{
+    int dx = event->x() - lastPos.x();
+    int dy = event->y() - lastPos.y();
+
+    if (event->buttons() & Qt::LeftButton) {
+        rotateBy(8 * dy, 8 * dx, 0);
+    } else if (event->buttons() & Qt::RightButton) {
+        rotateBy(8 * dy, 0, 8 * dx);
+    }
+    lastPos = event->pos();
+}
+
+void GLWidget::mouseReleaseEvent(QMouseEvent * /* event */)
+{
+    emit clicked();
+}
+
+GLuint GLWidget::makeObject()
+{
+    static const int coords[6][4][3] = {
+        { { +1, -1, -1 }, { -1, -1, -1 }, { -1, +1, -1 }, { +1, +1, -1 } },
+        { { +1, +1, -1 }, { -1, +1, -1 }, { -1, +1, +1 }, { +1, +1, +1 } },
+        { { +1, -1, +1 }, { +1, -1, -1 }, { +1, +1, -1 }, { +1, +1, +1 } },
+        { { -1, -1, -1 }, { -1, -1, +1 }, { -1, +1, +1 }, { -1, +1, -1 } },
+        { { +1, -1, +1 }, { -1, -1, +1 }, { -1, -1, -1 }, { +1, -1, -1 } },
+        { { -1, -1, +1 }, { +1, -1, +1 }, { +1, +1, +1 }, { -1, +1, +1 } }
+    };
+
+
+    GLuint textures[6];
+    for (int j=0; j < 6; ++j)
+        textures[j] = bindTexture(QPixmap(QString(":/images/side%1.png").arg(j + 1)),
+                                  GL_TEXTURE_2D);
+
+    GLuint list = glGenLists(1);
+    glNewList(list, GL_COMPILE);
+    for (int i = 0; i < 6; ++i) {
+        glBindTexture(GL_TEXTURE_2D, textures[i]);
+        glBegin(GL_QUADS);
+        for (int j = 0; j < 4; ++j) {
+            glTexCoord2d(j == 0 || j == 3, j == 0 || j == 1);
+            glVertex3d(0.2 * coords[i][j][0], 0.2 * coords[i][j][1],
+                       0.2 * coords[i][j][2]);
+        }
+        glEnd();
+    }
+
+    glEndList();
+    return list;
+}
diff --git a/examples/opengl/textures/glwidget.h b/examples/opengl/textures/glwidget.h
new file mode 100644
index 0000000000..623b301f77
--- /dev/null
+++ b/examples/opengl/textures/glwidget.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GLWIDGET_H
+#define GLWIDGET_H
+
+#include <QGLWidget>
+
+class GLWidget : public QGLWidget
+{
+    Q_OBJECT
+
+public:
+    GLWidget(QWidget *parent = 0, QGLWidget *shareWidget = 0);
+    ~GLWidget();
+
+    QSize minimumSizeHint() const;
+    QSize sizeHint() const;
+    void rotateBy(int xAngle, int yAngle, int zAngle);
+    void setClearColor(const QColor &color);
+
+signals:
+    void clicked();
+
+protected:
+    void initializeGL();
+    void paintGL();
+    void resizeGL(int width, int height);
+    void mousePressEvent(QMouseEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
+    void mouseReleaseEvent(QMouseEvent *event);
+
+private:
+    GLuint makeObject();
+
+    QColor clearColor;
+    QPoint lastPos;
+    int xRot;
+    int yRot;
+    int zRot;
+
+    static GLuint sharedObject;
+    static int refCount;
+};
+
+#endif
diff --git a/examples/opengl/textures/images/side1.png b/examples/opengl/textures/images/side1.png
new file mode 100644
index 0000000000..2e6b471cc5
--- /dev/null
+++ b/examples/opengl/textures/images/side1.png
diff --git a/examples/opengl/textures/images/side2.png b/examples/opengl/textures/images/side2.png
new file mode 100644
index 0000000000..d1acf1b2a0
--- /dev/null
+++ b/examples/opengl/textures/images/side2.png
diff --git a/examples/opengl/textures/images/side3.png b/examples/opengl/textures/images/side3.png
new file mode 100644
index 0000000000..a6386131d8
--- /dev/null
+++ b/examples/opengl/textures/images/side3.png
diff --git a/examples/opengl/textures/images/side4.png b/examples/opengl/textures/images/side4.png
new file mode 100644
index 0000000000..ebbc1e3c34
--- /dev/null
+++ b/examples/opengl/textures/images/side4.png
diff --git a/examples/opengl/textures/images/side5.png b/examples/opengl/textures/images/side5.png
new file mode 100644
index 0000000000..fa2f709fe7
--- /dev/null
+++ b/examples/opengl/textures/images/side5.png
diff --git a/examples/opengl/textures/images/side6.png b/examples/opengl/textures/images/side6.png
new file mode 100644
index 0000000000..97141e45eb
--- /dev/null
+++ b/examples/opengl/textures/images/side6.png
diff --git a/examples/opengl/textures/main.cpp b/examples/opengl/textures/main.cpp
new file mode 100644
index 0000000000..5129cdaaf4
--- /dev/null
+++ b/examples/opengl/textures/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "window.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(textures);
+
+    QApplication app(argc, argv);
+    Window window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/opengl/textures/textures.pro b/examples/opengl/textures/textures.pro
new file mode 100644
index 0000000000..cd98a6880a
--- /dev/null
+++ b/examples/opengl/textures/textures.pro
@@ -0,0 +1,13 @@
+HEADERS       = glwidget.h \
+                window.h
+SOURCES       = glwidget.cpp \
+                main.cpp \
+                window.cpp
+RESOURCES     = textures.qrc
+QT           += opengl
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/textures
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS textures.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/textures
+INSTALLS += target sources
diff --git a/examples/opengl/textures/textures.qrc b/examples/opengl/textures/textures.qrc
new file mode 100644
index 0000000000..efa9e9c8d2
--- /dev/null
+++ b/examples/opengl/textures/textures.qrc
@@ -0,0 +1,10 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>images/side1.png</file>
+    <file>images/side2.png</file>
+    <file>images/side3.png</file>
+    <file>images/side4.png</file>
+    <file>images/side5.png</file>
+    <file>images/side6.png</file>
+</qresource>
+</RCC>
diff --git a/examples/opengl/textures/window.cpp b/examples/opengl/textures/window.cpp
new file mode 100644
index 0000000000..a974e68270
--- /dev/null
+++ b/examples/opengl/textures/window.cpp
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "glwidget.h"
+#include "window.h"
+
+Window::Window()
+{
+    QGridLayout *mainLayout = new QGridLayout;
+
+    glWidgets[0][0] = 0;
+
+    for (int i = 0; i < NumRows; ++i) {
+        for (int j = 0; j < NumColumns; ++j) {
+            QColor clearColor;
+            clearColor.setHsv(((i * NumColumns) + j) * 255
+                              / (NumRows * NumColumns - 1),
+                              255, 63);
+
+            glWidgets[i][j] = new GLWidget(0, glWidgets[0][0]);
+            glWidgets[i][j]->setClearColor(clearColor);
+            glWidgets[i][j]->rotateBy(+42 * 16, +42 * 16, -21 * 16);
+            mainLayout->addWidget(glWidgets[i][j], i, j);
+
+            connect(glWidgets[i][j], SIGNAL(clicked()),
+                    this, SLOT(setCurrentGlWidget()));
+        }
+    }
+    setLayout(mainLayout);
+
+    currentGlWidget = glWidgets[0][0];
+
+    QTimer *timer = new QTimer(this);
+    connect(timer, SIGNAL(timeout()), this, SLOT(rotateOneStep()));
+    timer->start(20);
+
+    setWindowTitle(tr("Textures"));
+}
+
+void Window::setCurrentGlWidget()
+{
+    currentGlWidget = qobject_cast<GLWidget *>(sender());
+}
+
+void Window::rotateOneStep()
+{
+    if (currentGlWidget)
+        currentGlWidget->rotateBy(+2 * 16, +2 * 16, -1 * 16);
+}
diff --git a/examples/opengl/textures/window.h b/examples/opengl/textures/window.h
new file mode 100644
index 0000000000..50bb7f07ae
--- /dev/null
+++ b/examples/opengl/textures/window.h
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QWidget>
+
+class GLWidget;
+
+class Window : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Window();
+
+private slots:
+    void setCurrentGlWidget();
+    void rotateOneStep();
+
+private:
+    enum { NumRows = 2, NumColumns = 3 };
+
+    GLWidget *glWidgets[NumRows][NumColumns];
+    GLWidget *currentGlWidget;
+};
+
+#endif
diff --git a/examples/painting/README b/examples/painting/README
new file mode 100644
index 0000000000..4f9dca0181
--- /dev/null
+++ b/examples/painting/README
@@ -0,0 +1,42 @@
+Qt's painting system is able to render vector graphics, images, and outline
+font-based text with sub-pixel accuracy accuracy using anti-aliasing to
+improve rendering quality.
+
+These examples show the most common techniques that are used when painting
+with Qt, from basic concepts such as drawing simple primitives to the use of
+transformations.
+
+
+The example launcher provided with Qt can be used to explore each of the
+examples in this directory.
+
+Documentation for these examples can be found via the Tutorial and Examples
+link in the main Qt documentation.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/painting/basicdrawing/basicdrawing.pro b/examples/painting/basicdrawing/basicdrawing.pro
new file mode 100644
index 0000000000..401126055e
--- /dev/null
+++ b/examples/painting/basicdrawing/basicdrawing.pro
@@ -0,0 +1,12 @@
+HEADERS       = renderarea.h \
+                window.h
+SOURCES       = main.cpp \
+                renderarea.cpp \
+                window.cpp
+RESOURCES     = basicdrawing.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/painting/basicdrawing
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS basicdrawing.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/painting/basicdrawing
+INSTALLS += target sources
diff --git a/examples/painting/basicdrawing/basicdrawing.qrc b/examples/painting/basicdrawing/basicdrawing.qrc
new file mode 100644
index 0000000000..9d8a23a1c8
--- /dev/null
+++ b/examples/painting/basicdrawing/basicdrawing.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>images/brick.png</file>
+    <file>images/qt-logo.png</file>
+</qresource>
+</RCC>
diff --git a/examples/painting/basicdrawing/images/brick.png b/examples/painting/basicdrawing/images/brick.png
new file mode 100644
index 0000000000..87e7df5b04
--- /dev/null
+++ b/examples/painting/basicdrawing/images/brick.png
diff --git a/examples/painting/basicdrawing/images/qt-logo.png b/examples/painting/basicdrawing/images/qt-logo.png
new file mode 100644
index 0000000000..a8b452e07a
--- /dev/null
+++ b/examples/painting/basicdrawing/images/qt-logo.png
diff --git a/examples/painting/basicdrawing/main.cpp b/examples/painting/basicdrawing/main.cpp
new file mode 100644
index 0000000000..e7c3da4cf6
--- /dev/null
+++ b/examples/painting/basicdrawing/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "window.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(basicdrawing);
+
+    QApplication app(argc, argv);
+    Window window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/painting/basicdrawing/renderarea.cpp b/examples/painting/basicdrawing/renderarea.cpp
new file mode 100644
index 0000000000..22e511f1a5
--- /dev/null
+++ b/examples/painting/basicdrawing/renderarea.cpp
@@ -0,0 +1,209 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "renderarea.h"
+
+//! [0]
+RenderArea::RenderArea(QWidget *parent)
+    : QWidget(parent)
+{
+    shape = Polygon;
+    antialiased = false;
+    transformed = false;
+    pixmap.load(":/images/qt-logo.png");
+
+    setBackgroundRole(QPalette::Base);
+    setAutoFillBackground(true);
+}
+//! [0]
+
+//! [1]
+QSize RenderArea::minimumSizeHint() const
+{
+    return QSize(100, 100);
+}
+//! [1]
+
+//! [2]
+QSize RenderArea::sizeHint() const
+{
+    return QSize(400, 200);
+}
+//! [2]
+
+//! [3]
+void RenderArea::setShape(Shape shape)
+{
+    this->shape = shape;
+    update();
+}
+//! [3]
+
+//! [4]
+void RenderArea::setPen(const QPen &pen)
+{
+    this->pen = pen;
+    update();
+}
+//! [4]
+
+//! [5]
+void RenderArea::setBrush(const QBrush &brush)
+{
+    this->brush = brush;
+    update();
+}
+//! [5]
+
+//! [6]
+void RenderArea::setAntialiased(bool antialiased)
+{
+    this->antialiased = antialiased;
+    update();
+}
+//! [6]
+
+//! [7]
+void RenderArea::setTransformed(bool transformed)
+{
+    this->transformed = transformed;
+    update();
+}
+//! [7]
+
+//! [8]
+void RenderArea::paintEvent(QPaintEvent * /* event */)
+{
+    static const QPoint points[4] = {
+        QPoint(10, 80),
+        QPoint(20, 10),
+        QPoint(80, 30),
+        QPoint(90, 70)
+    };
+
+    QRect rect(10, 20, 80, 60);
+
+    QPainterPath path;
+    path.moveTo(20, 80);
+    path.lineTo(20, 30);
+    path.cubicTo(80, 0, 50, 50, 80, 80);
+
+    int startAngle = 20 * 16;
+    int arcLength = 120 * 16;
+//! [8]
+
+//! [9]
+    QPainter painter(this);
+    painter.setPen(pen);
+    painter.setBrush(brush);
+    if (antialiased) {
+        painter.setRenderHint(QPainter::Antialiasing, true);
+//! [9]
+        painter.translate(+0.5, +0.5);
+    }
+
+//! [10]
+    for (int x = 0; x < width(); x += 100) {
+        for (int y = 0; y < height(); y += 100) {
+            painter.save();
+            painter.translate(x, y);
+//! [10] //! [11]
+            if (transformed) {
+                painter.translate(50, 50);
+                painter.rotate(60.0);
+                painter.scale(0.6, 0.9);
+                painter.translate(-50, -50);
+            }
+//! [11]
+
+//! [12]
+            switch (shape) {
+            case Line:
+                painter.drawLine(rect.bottomLeft(), rect.topRight());
+                break;
+            case Points:
+                painter.drawPoints(points, 4);
+                break;
+            case Polyline:
+                painter.drawPolyline(points, 4);
+                break;
+            case Polygon:
+                painter.drawPolygon(points, 4);
+                break;
+            case Rect:
+                painter.drawRect(rect);
+                break;
+            case RoundedRect:
+                painter.drawRoundedRect(rect, 25, 25, Qt::RelativeSize);
+                break;
+            case Ellipse:
+                painter.drawEllipse(rect);
+                break;
+            case Arc:
+                painter.drawArc(rect, startAngle, arcLength);
+                break;
+            case Chord:
+                painter.drawChord(rect, startAngle, arcLength);
+                break;
+            case Pie:
+                painter.drawPie(rect, startAngle, arcLength);
+                break;
+            case Path:
+                painter.drawPath(path);
+                break;
+            case Text:
+                painter.drawText(rect, Qt::AlignCenter, tr("Qt by\nQt Software"));
+                break;
+            case Pixmap:
+                painter.drawPixmap(10, 10, pixmap);
+            }
+//! [12] //! [13]
+            painter.restore();
+        }
+    }
+
+    painter.setPen(palette().dark().color());
+    painter.setBrush(Qt::NoBrush);
+    painter.drawRect(QRect(0, 0, width() - 1, height() - 1));
+}
+//! [13]
diff --git a/examples/painting/basicdrawing/renderarea.h b/examples/painting/basicdrawing/renderarea.h
new file mode 100644
index 0000000000..f59e843ba5
--- /dev/null
+++ b/examples/painting/basicdrawing/renderarea.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef RENDERAREA_H
+#define RENDERAREA_H
+
+#include <QBrush>
+#include <QPen>
+#include <QPixmap>
+#include <QWidget>
+
+//! [0]
+class RenderArea : public QWidget
+{
+    Q_OBJECT
+
+public:
+    enum Shape { Line, Points, Polyline, Polygon, Rect, RoundedRect, Ellipse, Arc,
+                 Chord, Pie, Path, Text, Pixmap };
+
+    RenderArea(QWidget *parent = 0);
+
+    QSize minimumSizeHint() const;
+    QSize sizeHint() const;
+
+public slots:
+    void setShape(Shape shape);
+    void setPen(const QPen &pen);
+    void setBrush(const QBrush &brush);
+    void setAntialiased(bool antialiased);
+    void setTransformed(bool transformed);
+
+protected:
+    void paintEvent(QPaintEvent *event);
+
+private:
+    Shape shape;
+    QPen pen;
+    QBrush brush;
+    bool antialiased;
+    bool transformed;
+    QPixmap pixmap;
+};
+//! [0]
+
+#endif
diff --git a/examples/painting/basicdrawing/window.cpp b/examples/painting/basicdrawing/window.cpp
new file mode 100644
index 0000000000..864016247b
--- /dev/null
+++ b/examples/painting/basicdrawing/window.cpp
@@ -0,0 +1,262 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "renderarea.h"
+#include "window.h"
+
+//! [0]
+const int IdRole = Qt::UserRole;
+//! [0]
+
+//! [1]
+Window::Window()
+{
+    renderArea = new RenderArea;
+
+    shapeComboBox = new QComboBox;
+    shapeComboBox->addItem(tr("Polygon"), RenderArea::Polygon);
+    shapeComboBox->addItem(tr("Rectangle"), RenderArea::Rect);
+    shapeComboBox->addItem(tr("Rounded Rectangle"), RenderArea::RoundedRect);
+    shapeComboBox->addItem(tr("Ellipse"), RenderArea::Ellipse);
+    shapeComboBox->addItem(tr("Pie"), RenderArea::Pie);
+    shapeComboBox->addItem(tr("Chord"), RenderArea::Chord);
+    shapeComboBox->addItem(tr("Path"), RenderArea::Path);
+    shapeComboBox->addItem(tr("Line"), RenderArea::Line);
+    shapeComboBox->addItem(tr("Polyline"), RenderArea::Polyline);
+    shapeComboBox->addItem(tr("Arc"), RenderArea::Arc);
+    shapeComboBox->addItem(tr("Points"), RenderArea::Points);
+    shapeComboBox->addItem(tr("Text"), RenderArea::Text);
+    shapeComboBox->addItem(tr("Pixmap"), RenderArea::Pixmap);
+
+    shapeLabel = new QLabel(tr("&Shape:"));
+    shapeLabel->setBuddy(shapeComboBox);
+//! [1]
+
+//! [2]
+    penWidthSpinBox = new QSpinBox;
+    penWidthSpinBox->setRange(0, 20);
+    penWidthSpinBox->setSpecialValueText(tr("0 (cosmetic pen)"));
+
+    penWidthLabel = new QLabel(tr("Pen &Width:"));
+    penWidthLabel->setBuddy(penWidthSpinBox);
+//! [2]
+
+//! [3]
+    penStyleComboBox = new QComboBox;
+    penStyleComboBox->addItem(tr("Solid"), Qt::SolidLine);
+    penStyleComboBox->addItem(tr("Dash"), Qt::DashLine);
+    penStyleComboBox->addItem(tr("Dot"), Qt::DotLine);
+    penStyleComboBox->addItem(tr("Dash Dot"), Qt::DashDotLine);
+    penStyleComboBox->addItem(tr("Dash Dot Dot"), Qt::DashDotDotLine);
+    penStyleComboBox->addItem(tr("None"), Qt::NoPen);
+
+    penStyleLabel = new QLabel(tr("&Pen Style:"));
+    penStyleLabel->setBuddy(penStyleComboBox);
+
+    penCapComboBox = new QComboBox;
+    penCapComboBox->addItem(tr("Flat"), Qt::FlatCap);
+    penCapComboBox->addItem(tr("Square"), Qt::SquareCap);
+    penCapComboBox->addItem(tr("Round"), Qt::RoundCap);
+
+    penCapLabel = new QLabel(tr("Pen &Cap:"));
+    penCapLabel->setBuddy(penCapComboBox);
+
+    penJoinComboBox = new QComboBox;
+    penJoinComboBox->addItem(tr("Miter"), Qt::MiterJoin);
+    penJoinComboBox->addItem(tr("Bevel"), Qt::BevelJoin);
+    penJoinComboBox->addItem(tr("Round"), Qt::RoundJoin);
+
+    penJoinLabel = new QLabel(tr("Pen &Join:"));
+    penJoinLabel->setBuddy(penJoinComboBox);
+//! [3]
+
+//! [4]
+    brushStyleComboBox = new QComboBox;
+    brushStyleComboBox->addItem(tr("Linear Gradient"),
+            Qt::LinearGradientPattern);
+    brushStyleComboBox->addItem(tr("Radial Gradient"),
+            Qt::RadialGradientPattern);
+    brushStyleComboBox->addItem(tr("Conical Gradient"),
+            Qt::ConicalGradientPattern);
+    brushStyleComboBox->addItem(tr("Texture"), Qt::TexturePattern);
+    brushStyleComboBox->addItem(tr("Solid"), Qt::SolidPattern);
+    brushStyleComboBox->addItem(tr("Horizontal"), Qt::HorPattern);
+    brushStyleComboBox->addItem(tr("Vertical"), Qt::VerPattern);
+    brushStyleComboBox->addItem(tr("Cross"), Qt::CrossPattern);
+    brushStyleComboBox->addItem(tr("Backward Diagonal"), Qt::BDiagPattern);
+    brushStyleComboBox->addItem(tr("Forward Diagonal"), Qt::FDiagPattern);
+    brushStyleComboBox->addItem(tr("Diagonal Cross"), Qt::DiagCrossPattern);
+    brushStyleComboBox->addItem(tr("Dense 1"), Qt::Dense1Pattern);
+    brushStyleComboBox->addItem(tr("Dense 2"), Qt::Dense2Pattern);
+    brushStyleComboBox->addItem(tr("Dense 3"), Qt::Dense3Pattern);
+    brushStyleComboBox->addItem(tr("Dense 4"), Qt::Dense4Pattern);
+    brushStyleComboBox->addItem(tr("Dense 5"), Qt::Dense5Pattern);
+    brushStyleComboBox->addItem(tr("Dense 6"), Qt::Dense6Pattern);
+    brushStyleComboBox->addItem(tr("Dense 7"), Qt::Dense7Pattern);
+    brushStyleComboBox->addItem(tr("None"), Qt::NoBrush);
+
+    brushStyleLabel = new QLabel(tr("&Brush Style:"));
+    brushStyleLabel->setBuddy(brushStyleComboBox);
+//! [4]
+
+//! [5]
+    otherOptionsLabel = new QLabel(tr("Other Options:"));
+//! [5] //! [6]
+    antialiasingCheckBox = new QCheckBox(tr("&Antialiasing"));
+//! [6] //! [7]
+    transformationsCheckBox = new QCheckBox(tr("&Transformations"));
+//! [7]
+
+//! [8]
+    connect(shapeComboBox, SIGNAL(activated(int)),
+            this, SLOT(shapeChanged()));
+    connect(penWidthSpinBox, SIGNAL(valueChanged(int)),
+            this, SLOT(penChanged()));
+    connect(penStyleComboBox, SIGNAL(activated(int)),
+            this, SLOT(penChanged()));
+    connect(penCapComboBox, SIGNAL(activated(int)),
+            this, SLOT(penChanged()));
+    connect(penJoinComboBox, SIGNAL(activated(int)),
+            this, SLOT(penChanged()));
+    connect(brushStyleComboBox, SIGNAL(activated(int)),
+            this, SLOT(brushChanged()));
+    connect(antialiasingCheckBox, SIGNAL(toggled(bool)),
+            renderArea, SLOT(setAntialiased(bool)));
+    connect(transformationsCheckBox, SIGNAL(toggled(bool)),
+            renderArea, SLOT(setTransformed(bool)));
+//! [8]
+
+//! [9]
+    QGridLayout *mainLayout = new QGridLayout;
+//! [9] //! [10]
+    mainLayout->setColumnStretch(0, 1);
+    mainLayout->setColumnStretch(3, 1);
+    mainLayout->addWidget(renderArea, 0, 0, 1, 4);
+    mainLayout->setRowMinimumHeight(1, 6);
+    mainLayout->addWidget(shapeLabel, 2, 1, Qt::AlignRight);
+    mainLayout->addWidget(shapeComboBox, 2, 2);
+    mainLayout->addWidget(penWidthLabel, 3, 1, Qt::AlignRight);
+    mainLayout->addWidget(penWidthSpinBox, 3, 2);
+    mainLayout->addWidget(penStyleLabel, 4, 1, Qt::AlignRight);
+    mainLayout->addWidget(penStyleComboBox, 4, 2);
+    mainLayout->addWidget(penCapLabel, 5, 1, Qt::AlignRight);
+    mainLayout->addWidget(penCapComboBox, 5, 2);
+    mainLayout->addWidget(penJoinLabel, 6, 1, Qt::AlignRight);
+    mainLayout->addWidget(penJoinComboBox, 6, 2);
+    mainLayout->addWidget(brushStyleLabel, 7, 1, Qt::AlignRight);
+    mainLayout->addWidget(brushStyleComboBox, 7, 2);
+    mainLayout->setRowMinimumHeight(8, 6);
+    mainLayout->addWidget(otherOptionsLabel, 9, 1, Qt::AlignRight);
+    mainLayout->addWidget(antialiasingCheckBox, 9, 2);
+    mainLayout->addWidget(transformationsCheckBox, 10, 2);
+    setLayout(mainLayout);
+
+    shapeChanged();
+    penChanged();
+    brushChanged();
+    antialiasingCheckBox->setChecked(true);
+
+    setWindowTitle(tr("Basic Drawing"));
+}
+//! [10]
+
+//! [11]
+void Window::shapeChanged()
+{
+    RenderArea::Shape shape = RenderArea::Shape(shapeComboBox->itemData(
+            shapeComboBox->currentIndex(), IdRole).toInt());
+    renderArea->setShape(shape);
+}
+//! [11]
+
+//! [12]
+void Window::penChanged()
+{
+    int width = penWidthSpinBox->value();
+    Qt::PenStyle style = Qt::PenStyle(penStyleComboBox->itemData(
+            penStyleComboBox->currentIndex(), IdRole).toInt());
+    Qt::PenCapStyle cap = Qt::PenCapStyle(penCapComboBox->itemData(
+            penCapComboBox->currentIndex(), IdRole).toInt());
+    Qt::PenJoinStyle join = Qt::PenJoinStyle(penJoinComboBox->itemData(
+            penJoinComboBox->currentIndex(), IdRole).toInt());
+
+    renderArea->setPen(QPen(Qt::blue, width, style, cap, join));
+}
+//! [12]
+
+//! [13]
+void Window::brushChanged()
+{
+    Qt::BrushStyle style = Qt::BrushStyle(brushStyleComboBox->itemData(
+//! [13]
+            brushStyleComboBox->currentIndex(), IdRole).toInt());
+
+//! [14]
+    if (style == Qt::LinearGradientPattern) {
+        QLinearGradient linearGradient(0, 0, 100, 100);
+        linearGradient.setColorAt(0.0, Qt::white);
+        linearGradient.setColorAt(0.2, Qt::green);
+        linearGradient.setColorAt(1.0, Qt::black);
+        renderArea->setBrush(linearGradient);
+//! [14] //! [15]
+    } else if (style == Qt::RadialGradientPattern) {
+        QRadialGradient radialGradient(50, 50, 50, 70, 70);
+        radialGradient.setColorAt(0.0, Qt::white);
+        radialGradient.setColorAt(0.2, Qt::green);
+        radialGradient.setColorAt(1.0, Qt::black);
+        renderArea->setBrush(radialGradient);
+    } else if (style == Qt::ConicalGradientPattern) {
+        QConicalGradient conicalGradient(50, 50, 150);
+        conicalGradient.setColorAt(0.0, Qt::white);
+        conicalGradient.setColorAt(0.2, Qt::green);
+        conicalGradient.setColorAt(1.0, Qt::black);
+        renderArea->setBrush(conicalGradient);
+//! [15] //! [16]
+    } else if (style == Qt::TexturePattern) {
+        renderArea->setBrush(QBrush(QPixmap(":/images/brick.png")));
+//! [16] //! [17]
+    } else {
+        renderArea->setBrush(QBrush(Qt::green, style));
+    }
+}
+//! [17]
diff --git a/examples/painting/basicdrawing/window.h b/examples/painting/basicdrawing/window.h
new file mode 100644
index 0000000000..7c42aeff56
--- /dev/null
+++ b/examples/painting/basicdrawing/window.h
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QCheckBox;
+class QComboBox;
+class QLabel;
+class QSpinBox;
+QT_END_NAMESPACE
+class RenderArea;
+
+//! [0]
+class Window : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Window();
+
+private slots:
+    void shapeChanged();
+    void penChanged();
+    void brushChanged();
+
+private:
+    RenderArea *renderArea;
+    QLabel *shapeLabel;
+    QLabel *penWidthLabel;
+    QLabel *penStyleLabel;
+    QLabel *penCapLabel;
+    QLabel *penJoinLabel;
+    QLabel *brushStyleLabel;
+    QLabel *otherOptionsLabel;
+    QComboBox *shapeComboBox;
+    QSpinBox *penWidthSpinBox;
+    QComboBox *penStyleComboBox;
+    QComboBox *penCapComboBox;
+    QComboBox *penJoinComboBox;
+    QComboBox *brushStyleComboBox;
+    QCheckBox *antialiasingCheckBox;
+    QCheckBox *transformationsCheckBox;
+};
+//! [0]
+
+#endif
diff --git a/examples/painting/concentriccircles/circlewidget.cpp b/examples/painting/concentriccircles/circlewidget.cpp
new file mode 100644
index 0000000000..ab62a88c54
--- /dev/null
+++ b/examples/painting/concentriccircles/circlewidget.cpp
@@ -0,0 +1,125 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "circlewidget.h"
+
+#include <stdlib.h>
+
+//! [0]
+CircleWidget::CircleWidget(QWidget *parent)
+    : QWidget(parent)
+{
+    floatBased = false;
+    antialiased = false;
+    frameNo = 0;
+
+    setBackgroundRole(QPalette::Base);
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+}
+//! [0]
+
+//! [1]
+void CircleWidget::setFloatBased(bool floatBased)
+{
+    this->floatBased = floatBased;
+    update();
+}
+//! [1]
+
+//! [2]
+void CircleWidget::setAntialiased(bool antialiased)
+{
+    this->antialiased = antialiased;
+    update();
+}
+//! [2]
+
+//! [3]
+QSize CircleWidget::minimumSizeHint() const
+{
+    return QSize(50, 50);
+}
+//! [3]
+
+//! [4]
+QSize CircleWidget::sizeHint() const
+{
+    return QSize(180, 180);
+}
+//! [4]
+
+//! [5]
+void CircleWidget::nextAnimationFrame()
+{
+    ++frameNo;
+    update();
+}
+//! [5]
+
+//! [6]
+void CircleWidget::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+    painter.setRenderHint(QPainter::Antialiasing, antialiased);
+    painter.translate(width() / 2, height() / 2);
+//! [6]
+
+//! [7]
+    for (int diameter = 0; diameter < 256; diameter += 9) {
+        int delta = abs((frameNo % 128) - diameter / 2);
+        int alpha = 255 - (delta * delta) / 4 - diameter;
+//! [7] //! [8]
+        if (alpha > 0) {
+            painter.setPen(QPen(QColor(0, diameter / 2, 127, alpha), 3));
+
+            if (floatBased) {
+                painter.drawEllipse(QRectF(-diameter / 2.0, -diameter / 2.0,
+                                           diameter, diameter));
+            } else {
+                painter.drawEllipse(QRect(-diameter / 2, -diameter / 2,
+                                          diameter, diameter));
+            }
+        }
+    }
+}
+//! [8]
diff --git a/examples/painting/concentriccircles/circlewidget.h b/examples/painting/concentriccircles/circlewidget.h
new file mode 100644
index 0000000000..c5acaa89de
--- /dev/null
+++ b/examples/painting/concentriccircles/circlewidget.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CIRCLEWIDGET_H
+#define CIRCLEWIDGET_H
+
+#include <QWidget>
+
+//! [0]
+class CircleWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    CircleWidget(QWidget *parent = 0);
+
+    void setFloatBased(bool floatBased);
+    void setAntialiased(bool antialiased);
+
+    QSize minimumSizeHint() const;
+    QSize sizeHint() const;
+
+public slots:
+    void nextAnimationFrame();
+
+protected:
+    void paintEvent(QPaintEvent *event);
+
+private:
+    bool floatBased;
+    bool antialiased;
+    int frameNo;
+};
+//! [0]
+
+#endif
diff --git a/examples/painting/concentriccircles/concentriccircles.pro b/examples/painting/concentriccircles/concentriccircles.pro
new file mode 100644
index 0000000000..093ea1c9d2
--- /dev/null
+++ b/examples/painting/concentriccircles/concentriccircles.pro
@@ -0,0 +1,11 @@
+HEADERS       = circlewidget.h \
+                window.h
+SOURCES       = circlewidget.cpp \
+                main.cpp \
+                window.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/painting/concentriccircles
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS concentriccircles.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/painting/concentriccircles
+INSTALLS += target sources
diff --git a/examples/painting/concentriccircles/main.cpp b/examples/painting/concentriccircles/main.cpp
new file mode 100644
index 0000000000..fa8b0abb9d
--- /dev/null
+++ b/examples/painting/concentriccircles/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "window.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Window window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/painting/concentriccircles/window.cpp b/examples/painting/concentriccircles/window.cpp
new file mode 100644
index 0000000000..dd5e6e5789
--- /dev/null
+++ b/examples/painting/concentriccircles/window.cpp
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "circlewidget.h"
+#include "window.h"
+
+//! [0]
+Window::Window()
+{
+    aliasedLabel = createLabel(tr("Aliased"));
+    antialiasedLabel = createLabel(tr("Antialiased"));
+    intLabel = createLabel(tr("Int"));
+    floatLabel = createLabel(tr("Float"));
+
+    QGridLayout *layout = new QGridLayout;
+    layout->addWidget(aliasedLabel, 0, 1);
+    layout->addWidget(antialiasedLabel, 0, 2);
+    layout->addWidget(intLabel, 1, 0);
+    layout->addWidget(floatLabel, 2, 0);
+//! [0]
+
+//! [1]
+    QTimer *timer = new QTimer(this);
+
+    for (int i = 0; i < 2; ++i) {
+        for (int j = 0; j < 2; ++j) {
+            circleWidgets[i][j] = new CircleWidget;
+            circleWidgets[i][j]->setAntialiased(j != 0);
+            circleWidgets[i][j]->setFloatBased(i != 0);
+
+            connect(timer, SIGNAL(timeout()),
+                    circleWidgets[i][j], SLOT(nextAnimationFrame()));
+
+            layout->addWidget(circleWidgets[i][j], i + 1, j + 1);
+        }
+    }
+//! [1] //! [2]
+    timer->start(100);
+    setLayout(layout);
+
+    setWindowTitle(tr("Concentric Circles"));
+}
+//! [2]
+
+//! [3]
+QLabel *Window::createLabel(const QString &text)
+{
+    QLabel *label = new QLabel(text);
+    label->setAlignment(Qt::AlignCenter);
+    label->setMargin(2);
+    label->setFrameStyle(QFrame::Box | QFrame::Sunken);
+    return label;
+}
+//! [3]
diff --git a/examples/painting/concentriccircles/window.h b/examples/painting/concentriccircles/window.h
new file mode 100644
index 0000000000..2b3ad67cbb
--- /dev/null
+++ b/examples/painting/concentriccircles/window.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QLabel;
+QT_END_NAMESPACE
+class CircleWidget;
+
+//! [0]
+class Window : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Window();
+
+private:
+    QLabel *createLabel(const QString &text);
+
+    QLabel *aliasedLabel;
+    QLabel *antialiasedLabel;
+    QLabel *intLabel;
+    QLabel *floatLabel;
+    CircleWidget *circleWidgets[2][2];
+};
+//! [0]
+
+#endif
diff --git a/examples/painting/fontsampler/fontsampler.pro b/examples/painting/fontsampler/fontsampler.pro
new file mode 100644
index 0000000000..8b63752feb
--- /dev/null
+++ b/examples/painting/fontsampler/fontsampler.pro
@@ -0,0 +1,10 @@
+FORMS     = mainwindowbase.ui
+HEADERS   = mainwindow.h
+SOURCES   = main.cpp \
+            mainwindow.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/painting/fontsampler
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fontsampler.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/painting/fontsampler
+INSTALLS += target sources
diff --git a/examples/painting/fontsampler/main.cpp b/examples/painting/fontsampler/main.cpp
new file mode 100644
index 0000000000..1d51376c06
--- /dev/null
+++ b/examples/painting/fontsampler/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/painting/fontsampler/mainwindow.cpp b/examples/painting/fontsampler/mainwindow.cpp
new file mode 100644
index 0000000000..424f175829
--- /dev/null
+++ b/examples/painting/fontsampler/mainwindow.cpp
@@ -0,0 +1,373 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+MainWindow::MainWindow(QWidget *parent)
+   : QMainWindow(parent)
+{
+    setupUi(this);
+
+    sampleSizes << 32 << 24 << 16 << 14 << 12 << 8 << 4 << 2 << 1;
+    markedCount = 0;
+    setupFontTree();
+
+    connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+    connect(fontTree, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)),
+            this, SLOT(showFont(QTreeWidgetItem *)));
+    connect(fontTree, SIGNAL(itemChanged(QTreeWidgetItem *, int)),
+            this, SLOT(updateStyles(QTreeWidgetItem *, int)));
+
+    fontTree->setItemSelected(fontTree->topLevelItem(0), true);
+    showFont(fontTree->topLevelItem(0));
+}
+
+void MainWindow::setupFontTree()
+{
+    QFontDatabase database;
+    fontTree->setColumnCount(1);
+    fontTree->setHeaderLabels(QStringList() << tr("Font"));
+
+    foreach (QString family, database.families()) {
+        const QStringList styles = database.styles(family);
+        if (styles.isEmpty())
+            continue;
+
+        QTreeWidgetItem *familyItem = new QTreeWidgetItem(fontTree);
+        familyItem->setText(0, family);
+        familyItem->setCheckState(0, Qt::Unchecked);
+
+        foreach (QString style, styles) {
+            QTreeWidgetItem *styleItem = new QTreeWidgetItem(familyItem);
+            styleItem->setText(0, style);
+            styleItem->setCheckState(0, Qt::Unchecked);
+            styleItem->setData(0, Qt::UserRole,
+                QVariant(database.weight(family, style)));
+            styleItem->setData(0, Qt::UserRole + 1,
+                QVariant(database.italic(family, style)));
+        }
+    }
+}
+
+void MainWindow::on_clearAction_triggered()
+{
+    QTreeWidgetItem *currentItem = fontTree->currentItem();
+    foreach (QTreeWidgetItem *item, fontTree->selectedItems())
+        fontTree->setItemSelected(item, false);
+    fontTree->setItemSelected(currentItem, true);
+}
+
+void MainWindow::on_markAction_triggered()
+{
+    markUnmarkFonts(Qt::Checked);
+}
+
+void MainWindow::on_unmarkAction_triggered()
+{
+    markUnmarkFonts(Qt::Unchecked);
+}
+
+void MainWindow::markUnmarkFonts(Qt::CheckState state)
+{
+    QList<QTreeWidgetItem *> items = fontTree->selectedItems();
+    foreach (QTreeWidgetItem *item, items) {
+        if (item->checkState(0) != state)
+            item->setCheckState(0, state);
+    }
+}
+
+void MainWindow::showFont(QTreeWidgetItem *item)
+{
+    if (!item)
+        return;
+
+    QString family;
+    QString style;
+    int weight;
+    bool italic;
+
+    if (item->parent()) {
+        family = item->parent()->text(0);
+        style = item->text(0);
+        weight = item->data(0, Qt::UserRole).toInt();
+        italic = item->data(0, Qt::UserRole + 1).toBool();
+    } else {
+        family = item->text(0);
+        style = item->child(0)->text(0);
+        weight = item->child(0)->data(0, Qt::UserRole).toInt();
+        italic = item->child(0)->data(0, Qt::UserRole + 1).toBool();
+    }
+
+    QString oldText = textEdit->toPlainText().trimmed();
+    bool modified = textEdit->document()->isModified();
+    textEdit->clear();
+    textEdit->document()->setDefaultFont(QFont(family, 32, weight, italic));
+
+    QTextCursor cursor = textEdit->textCursor();
+    QTextBlockFormat blockFormat;
+    blockFormat.setAlignment(Qt::AlignCenter);
+    cursor.insertBlock(blockFormat);
+
+    if (modified)
+        cursor.insertText(QString(oldText));
+    else
+        cursor.insertText(QString("%1 %2").arg(family).arg(style));
+
+    textEdit->document()->setModified(modified);
+}
+
+void MainWindow::updateStyles(QTreeWidgetItem *item, int column)
+{
+    if (!item || column != 0)
+        return;
+
+    Qt::CheckState state = item->checkState(0);
+    QTreeWidgetItem *parent = item->parent();
+
+    if (parent) {
+
+        // Only count style items.
+        if (state == Qt::Checked)
+            ++markedCount;
+        else
+            --markedCount;
+
+        if (state == Qt::Checked &&
+            parent->checkState(0) == Qt::Unchecked) {
+            // Mark parent items when child items are checked.
+            parent->setCheckState(0, Qt::Checked);
+
+        } else if (state == Qt::Unchecked &&
+                   parent->checkState(0) == Qt::Checked) {
+
+            bool marked = false;
+            for (int row = 0; row < parent->childCount(); ++row) {
+                if (parent->child(row)->checkState(0) == Qt::Checked) {
+                    marked = true;
+                    break;
+                }
+            }
+            // Unmark parent items when all child items are unchecked.
+            if (!marked)
+                parent->setCheckState(0, Qt::Unchecked);
+        }
+    } else {
+        int row;
+        int number = 0;
+        for (row = 0; row < item->childCount(); ++row) {
+            if (item->child(row)->checkState(0) == Qt::Checked)
+                ++number;
+        }
+
+        // Mark/unmark all child items when marking/unmarking top-level
+        // items.
+        if (state == Qt::Checked && number == 0) {
+            for (row = 0; row < item->childCount(); ++row) {
+                if (item->child(row)->checkState(0) == Qt::Unchecked)
+                    item->child(row)->setCheckState(0, Qt::Checked);
+            }
+        } else if (state == Qt::Unchecked && number > 0) {
+            for (row = 0; row < item->childCount(); ++row) {
+                if (item->child(row)->checkState(0) == Qt::Checked)
+                    item->child(row)->setCheckState(0, Qt::Unchecked);
+            }
+        }
+    }
+
+    printAction->setEnabled(markedCount > 0);
+    printPreviewAction->setEnabled(markedCount > 0);
+}
+
+void MainWindow::on_printAction_triggered()
+{
+    pageMap = currentPageMap();
+
+    if (pageMap.count() == 0)
+        return;
+
+    QPrinter printer(QPrinter::HighResolution);
+    QPrintDialog dialog(&printer, this);
+    if (dialog.exec() != QDialog::Accepted)
+        return;
+
+    int from = printer.fromPage();
+    int to = printer.toPage();
+    if (from <= 0 && to <= 0)
+        printer.setFromTo(1, pageMap.keys().count());
+
+    printDocument(&printer);
+}
+
+void MainWindow::printDocument(QPrinter *printer)
+{
+    printer->setFromTo(1, pageMap.count());
+
+    QProgressDialog progress(tr("Preparing font samples..."), tr("&Cancel"),
+                             0, pageMap.count(), this);
+    progress.setWindowModality(Qt::ApplicationModal);
+    progress.setWindowTitle(tr("Font Sampler"));
+    progress.setMinimum(printer->fromPage() - 1);
+    progress.setMaximum(printer->toPage());
+
+    QPainter painter;
+    painter.begin(printer);
+    bool firstPage = true;
+
+    for (int page = printer->fromPage(); page <= printer->toPage(); ++page) {
+
+        if (!firstPage)
+            printer->newPage();
+
+        qApp->processEvents();
+        if (progress.wasCanceled())
+            break;
+
+        printPage(page - 1, &painter, printer);
+        progress.setValue(page);
+        firstPage = false;
+    }
+
+    painter.end();
+}
+
+void MainWindow::on_printPreviewAction_triggered()
+{
+    pageMap = currentPageMap();
+
+    if (pageMap.count() == 0)
+        return;
+
+    QPrinter printer(QPrinter::HighResolution);
+    QPrintPreviewDialog preview(&printer, this);
+    connect(&preview, SIGNAL(paintRequested(QPrinter *)),
+            this, SLOT(printDocument(QPrinter *)));
+    preview.exec();
+}
+
+QMap<QString, StyleItems> MainWindow::currentPageMap()
+{
+    QMap<QString, StyleItems> pageMap;
+
+    for (int row = 0; row < fontTree->topLevelItemCount(); ++row) {
+        QTreeWidgetItem *familyItem = fontTree->topLevelItem(row);
+        QString family;
+
+        if (familyItem->checkState(0) == Qt::Checked) {
+            family = familyItem->text(0);
+            pageMap[family] = StyleItems();
+        }
+
+        for (int childRow = 0; childRow < familyItem->childCount(); ++childRow) {
+            QTreeWidgetItem *styleItem = familyItem->child(childRow);
+            if (styleItem->checkState(0) == Qt::Checked)
+                pageMap[family].append(styleItem);
+        }
+    }
+
+    return pageMap;
+}
+
+void MainWindow::printPage(int index, QPainter *painter, QPrinter *printer)
+{
+    QString family = pageMap.keys()[index];
+    StyleItems items = pageMap[family];
+
+    // Find the dimensions of the text on each page.
+    qreal width = 0.0;
+    qreal height = 0.0;
+    foreach (QTreeWidgetItem *item, items) {
+        QString style = item->text(0);
+        int weight = item->data(0, Qt::UserRole).toInt();
+        bool italic = item->data(0, Qt::UserRole + 1).toBool();
+
+        // Calculate the maximum width and total height of the text.
+        foreach (int size, sampleSizes) {
+            QFont font(family, size, weight, italic);
+            font = QFont(font, painter->device());
+            QFontMetricsF fontMetrics(font);
+            QRectF rect = fontMetrics.boundingRect(
+            QString("%1 %2").arg(family).arg(style));
+            width = qMax(rect.width(), width);
+            height += rect.height();
+        }
+    }
+
+    qreal xScale = printer->pageRect().width() / width;
+    qreal yScale = printer->pageRect().height() / height;
+    qreal scale = qMin(xScale, yScale);
+
+    qreal remainingHeight = printer->pageRect().height()/scale - height;
+    qreal spaceHeight = (remainingHeight/4.0) / (items.count() + 1);
+    qreal interLineHeight = (remainingHeight/4.0) / (sampleSizes.count() * items.count());
+
+    painter->save();
+    painter->translate(printer->pageRect().width()/2.0, printer->pageRect().height()/2.0);
+    painter->scale(scale, scale);
+    painter->setBrush(QBrush(Qt::black));
+
+    qreal x = -width/2.0;
+    qreal y = -height/2.0 - remainingHeight/4.0 + spaceHeight;
+
+    foreach (QTreeWidgetItem *item, items) {
+        QString style = item->text(0);
+        int weight = item->data(0, Qt::UserRole).toInt();
+        bool italic = item->data(0, Qt::UserRole + 1).toBool();
+
+        // Draw each line of text.
+        foreach (int size, sampleSizes) {
+            QFont font(family, size, weight, italic);
+            font = QFont(font, painter->device());
+            QFontMetricsF fontMetrics(font);
+            QRectF rect = fontMetrics.boundingRect(QString("%1 %2").arg(
+                          font.family()).arg(style));
+            y += rect.height();
+            painter->setFont(font);
+            painter->drawText(QPointF(x, y),
+                             QString("%1 %2").arg(family).arg(style));
+            y += interLineHeight;
+        }
+        y += spaceHeight;
+    }
+
+    painter->restore();
+}
diff --git a/examples/painting/fontsampler/mainwindow.h b/examples/painting/fontsampler/mainwindow.h
new file mode 100644
index 0000000000..25d7730e90
--- /dev/null
+++ b/examples/painting/fontsampler/mainwindow.h
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include "ui_mainwindowbase.h"
+
+QT_BEGIN_NAMESPACE
+class QTextEdit;
+class QTreeWidget;
+class QTreeWidgetItem;
+QT_END_NAMESPACE
+
+typedef QList<QTreeWidgetItem *> StyleItems;
+
+class MainWindow : public QMainWindow, private Ui::MainWindowBase
+{
+    Q_OBJECT
+
+public:
+    MainWindow(QWidget *parent = 0);
+
+public slots:
+    void on_clearAction_triggered();
+    void on_markAction_triggered();
+    void on_printAction_triggered();
+    void on_printPreviewAction_triggered();
+    void on_unmarkAction_triggered();
+    void printDocument(QPrinter *printer);
+    void printPage(int index, QPainter *painter, QPrinter *printer);
+    void showFont(QTreeWidgetItem *item);
+    void updateStyles(QTreeWidgetItem *item, int column);
+
+private:
+    QMap<QString, StyleItems> currentPageMap();
+    void markUnmarkFonts(Qt::CheckState state);
+    void setupFontTree();
+
+    QList<int> sampleSizes;
+    QMap<QString, StyleItems> pageMap;
+    int markedCount;
+};
+
+#endif
diff --git a/examples/painting/fontsampler/mainwindowbase.ui b/examples/painting/fontsampler/mainwindowbase.ui
new file mode 100644
index 0000000000..6545b34083
--- /dev/null
+++ b/examples/painting/fontsampler/mainwindowbase.ui
@@ -0,0 +1,140 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>MainWindowBase</class>
+ <widget class="QMainWindow" name="MainWindowBase" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>345</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Font Sampler</string>
+  </property>
+  <widget class="QWidget" name="centralwidget" >
+   <layout class="QVBoxLayout" >
+    <property name="margin" >
+     <number>9</number>
+    </property>
+    <property name="spacing" >
+     <number>6</number>
+    </property>
+    <item>
+     <widget class="QTextEdit" name="textEdit" />
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menubar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>800</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menu_Selection" >
+    <property name="title" >
+     <string>&amp;Selection</string>
+    </property>
+    <addaction name="markAction" />
+    <addaction name="unmarkAction" />
+    <addaction name="clearAction" />
+   </widget>
+   <widget class="QMenu" name="menu_File" >
+    <property name="title" >
+     <string>&amp;File</string>
+    </property>
+    <addaction name="printPreviewAction" />
+    <addaction name="printAction" />
+    <addaction name="quitAction" />
+   </widget>
+   <addaction name="menu_File" />
+   <addaction name="menu_Selection" />
+  </widget>
+  <widget class="QStatusBar" name="statusbar" />
+  <widget class="QDockWidget" name="dockWidget" >
+   <property name="features" >
+    <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable|QDockWidget::NoDockWidgetFeatures</set>
+   </property>
+   <property name="windowTitle" >
+    <string>Available Fonts</string>
+   </property>
+   <attribute name="dockWidgetArea" >
+    <number>1</number>
+   </attribute>
+   <widget class="QWidget" name="dockWidgetContents" >
+    <layout class="QVBoxLayout" >
+     <property name="margin" >
+      <number>9</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QTreeWidget" name="fontTree" >
+       <property name="selectionMode" >
+        <enum>QAbstractItemView::ExtendedSelection</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <action name="printAction" >
+   <property name="enabled" >
+    <bool>false</bool>
+   </property>
+   <property name="text" >
+    <string>&amp;Print...</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+P</string>
+   </property>
+  </action>
+  <action name="quitAction" >
+   <property name="text" >
+    <string>E&amp;xit</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+Q</string>
+   </property>
+  </action>
+  <action name="markAction" >
+   <property name="text" >
+    <string>&amp;Mark</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+M</string>
+   </property>
+  </action>
+  <action name="unmarkAction" >
+   <property name="text" >
+    <string>&amp;Unmark</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+U</string>
+   </property>
+  </action>
+  <action name="clearAction" >
+   <property name="text" >
+    <string>&amp;Clear</string>
+   </property>
+  </action>
+  <action name="printPreviewAction" >
+   <property name="enabled" >
+    <bool>false</bool>
+   </property>
+   <property name="text" >
+    <string>Print Preview...</string>
+   </property>
+  </action>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/examples/painting/imagecomposition/imagecomposer.cpp b/examples/painting/imagecomposition/imagecomposer.cpp
new file mode 100644
index 0000000000..c16d85fb3d
--- /dev/null
+++ b/examples/painting/imagecomposition/imagecomposer.cpp
@@ -0,0 +1,209 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "imagecomposer.h"
+
+//! [0]
+static const QSize resultSize(200, 200);
+//! [0]
+
+//! [1]
+ImageComposer::ImageComposer()
+{
+    sourceButton = new QToolButton;
+    sourceButton->setIconSize(resultSize);
+
+    operatorComboBox = new QComboBox;
+    addOp(QPainter::CompositionMode_SourceOver, tr("SourceOver"));
+    addOp(QPainter::CompositionMode_DestinationOver, tr("DestinationOver"));
+    addOp(QPainter::CompositionMode_Clear, tr("Clear"));
+    addOp(QPainter::CompositionMode_Source, tr("Source"));
+    addOp(QPainter::CompositionMode_Destination, tr("Destination"));
+    addOp(QPainter::CompositionMode_SourceIn, tr("SourceIn"));
+    addOp(QPainter::CompositionMode_DestinationIn, tr("DestinationIn"));
+    addOp(QPainter::CompositionMode_SourceOut, tr("SourceOut"));
+    addOp(QPainter::CompositionMode_DestinationOut, tr("DestinationOut"));
+    addOp(QPainter::CompositionMode_SourceAtop, tr("SourceAtop"));
+    addOp(QPainter::CompositionMode_DestinationAtop, tr("DestinationAtop"));
+    addOp(QPainter::CompositionMode_Xor, tr("Xor"));
+    addOp(QPainter::CompositionMode_Plus, tr("Plus"));
+    addOp(QPainter::CompositionMode_Multiply, tr("Multiply"));
+    addOp(QPainter::CompositionMode_Screen, tr("Screen"));
+    addOp(QPainter::CompositionMode_Overlay, tr("Overlay"));
+    addOp(QPainter::CompositionMode_Darken, tr("Darken"));
+    addOp(QPainter::CompositionMode_Lighten, tr("Lighten"));
+    addOp(QPainter::CompositionMode_ColorDodge, tr("ColorDodge"));
+    addOp(QPainter::CompositionMode_ColorBurn, tr("ColorBurn"));
+    addOp(QPainter::CompositionMode_HardLight, tr("HardLight"));
+    addOp(QPainter::CompositionMode_SoftLight, tr("SoftLight"));
+    addOp(QPainter::CompositionMode_Difference, tr("Difference"));
+    addOp(QPainter::CompositionMode_Exclusion, tr("Exclusion"));
+//! [1]
+
+//! [2]
+    destinationButton = new QToolButton;
+    destinationButton->setIconSize(resultSize);
+
+    equalLabel = new QLabel(tr("="));
+
+    resultLabel = new QLabel;
+    resultLabel->setMinimumWidth(resultSize.width());
+//! [2]
+
+//! [3]
+    connect(sourceButton, SIGNAL(clicked()), this, SLOT(chooseSource()));
+    connect(operatorComboBox, SIGNAL(activated(int)),
+            this, SLOT(recalculateResult()));
+    connect(destinationButton, SIGNAL(clicked()),
+            this, SLOT(chooseDestination()));
+//! [3]
+
+//! [4]
+    QGridLayout *mainLayout = new QGridLayout;
+    mainLayout->addWidget(sourceButton, 0, 0, 3, 1);
+    mainLayout->addWidget(operatorComboBox, 1, 1);
+    mainLayout->addWidget(destinationButton, 0, 2, 3, 1);
+    mainLayout->addWidget(equalLabel, 1, 3);
+    mainLayout->addWidget(resultLabel, 0, 4, 3, 1);
+    mainLayout->setSizeConstraint(QLayout::SetFixedSize);
+    setLayout(mainLayout);
+//! [4]
+
+//! [5]
+    resultImage = QImage(resultSize, QImage::Format_ARGB32_Premultiplied);
+
+    loadImage(":/images/butterfly.png", &sourceImage, sourceButton);
+    loadImage(":/images/checker.png", &destinationImage, destinationButton);
+
+    setWindowTitle(tr("Image Composition"));
+}
+//! [5]
+
+//! [6]
+void ImageComposer::chooseSource()
+{
+    chooseImage(tr("Choose Source Image"), &sourceImage, sourceButton);
+}
+//! [6]
+
+//! [7]
+void ImageComposer::chooseDestination()
+{
+    chooseImage(tr("Choose Destination Image"), &destinationImage,
+                destinationButton);
+}
+//! [7]
+
+//! [8]
+void ImageComposer::recalculateResult()
+{
+    QPainter::CompositionMode mode = currentMode();
+
+    QPainter painter(&resultImage);
+    painter.setCompositionMode(QPainter::CompositionMode_Source);
+    painter.fillRect(resultImage.rect(), Qt::transparent);
+    painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
+    painter.drawImage(0, 0, destinationImage);
+    painter.setCompositionMode(mode);
+    painter.drawImage(0, 0, sourceImage);
+    painter.setCompositionMode(QPainter::CompositionMode_DestinationOver);
+    painter.fillRect(resultImage.rect(), Qt::white);
+    painter.end();
+
+    resultLabel->setPixmap(QPixmap::fromImage(resultImage));
+}
+//! [8]
+
+//! [9]
+void ImageComposer::addOp(QPainter::CompositionMode mode, const QString &name)
+{
+    operatorComboBox->addItem(name, mode);
+}
+//! [9]
+
+//! [10]
+void ImageComposer::chooseImage(const QString &title, QImage *image,
+                                QToolButton *button)
+{
+    QString fileName = QFileDialog::getOpenFileName(this, title);
+    if (!fileName.isEmpty())
+        loadImage(fileName, image, button);
+}
+//! [10]
+
+//! [11]
+void ImageComposer::loadImage(const QString &fileName, QImage *image,
+                              QToolButton *button)
+{
+    image->load(fileName);
+
+    QImage fixedImage(resultSize, QImage::Format_ARGB32_Premultiplied);
+    QPainter painter(&fixedImage);
+    painter.setCompositionMode(QPainter::CompositionMode_Source);
+    painter.fillRect(fixedImage.rect(), Qt::transparent);
+    painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
+    painter.drawImage(imagePos(*image), *image);
+    painter.end();
+    button->setIcon(QPixmap::fromImage(fixedImage));
+
+    *image = fixedImage;
+
+    recalculateResult();
+}
+//! [11]
+
+//! [12]
+QPainter::CompositionMode ImageComposer::currentMode() const
+{
+    return (QPainter::CompositionMode)
+           operatorComboBox->itemData(operatorComboBox->currentIndex()).toInt();
+}
+//! [12]
+
+//! [13]
+QPoint ImageComposer::imagePos(const QImage &image) const
+{
+    return QPoint((resultSize.width() - image.width()) / 2,
+                  (resultSize.height() - image.height()) / 2);
+}
+//! [13]
diff --git a/examples/painting/imagecomposition/imagecomposer.h b/examples/painting/imagecomposition/imagecomposer.h
new file mode 100644
index 0000000000..e8d039f180
--- /dev/null
+++ b/examples/painting/imagecomposition/imagecomposer.h
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef IMAGECOMPOSER_H
+#define IMAGECOMPOSER_H
+
+#include <QPainter>
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QComboBox;
+class QLabel;
+class QToolButton;
+QT_END_NAMESPACE
+
+//! [0]
+class ImageComposer : public QWidget
+{
+    Q_OBJECT
+
+public:
+    ImageComposer();
+
+private slots:
+    void chooseSource();
+    void chooseDestination();
+    void recalculateResult();
+//! [0]
+
+//! [1]
+private:
+    void addOp(QPainter::CompositionMode mode, const QString &name);
+    void chooseImage(const QString &title, QImage *image, QToolButton *button);
+    void loadImage(const QString &fileName, QImage *image, QToolButton *button);
+    QPainter::CompositionMode currentMode() const;
+    QPoint imagePos(const QImage &image) const;
+
+    QToolButton *sourceButton;
+    QToolButton *destinationButton;
+    QComboBox *operatorComboBox;
+    QLabel *equalLabel;
+    QLabel *resultLabel;
+
+    QImage sourceImage;
+    QImage destinationImage;
+    QImage resultImage;
+};
+//! [1]
+
+#endif
diff --git a/examples/painting/imagecomposition/imagecomposition.pro b/examples/painting/imagecomposition/imagecomposition.pro
new file mode 100644
index 0000000000..935a1d47c1
--- /dev/null
+++ b/examples/painting/imagecomposition/imagecomposition.pro
@@ -0,0 +1,11 @@
+HEADERS       = imagecomposer.h
+SOURCES       = imagecomposer.cpp \
+                main.cpp
+RESOURCES     = imagecomposition.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/painting/imagecomposition
+sources.files = $$SOURCES $$HEADERS $$RESOURCES images *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/painting/imagecomposition
+INSTALLS += target sources
+
diff --git a/examples/painting/imagecomposition/imagecomposition.qrc b/examples/painting/imagecomposition/imagecomposition.qrc
new file mode 100644
index 0000000000..ebba7b2913
--- /dev/null
+++ b/examples/painting/imagecomposition/imagecomposition.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>images/butterfly.png</file>
+    <file>images/checker.png</file>
+</qresource>
+</RCC>
diff --git a/examples/painting/imagecomposition/images/background.png b/examples/painting/imagecomposition/images/background.png
new file mode 100644
index 0000000000..f6ad899823
--- /dev/null
+++ b/examples/painting/imagecomposition/images/background.png
diff --git a/examples/painting/imagecomposition/images/blackrectangle.png b/examples/painting/imagecomposition/images/blackrectangle.png
new file mode 100644
index 0000000000..5f2ecf8318
--- /dev/null
+++ b/examples/painting/imagecomposition/images/blackrectangle.png
diff --git a/examples/painting/imagecomposition/images/butterfly.png b/examples/painting/imagecomposition/images/butterfly.png
new file mode 100644
index 0000000000..f3e050eca2
--- /dev/null
+++ b/examples/painting/imagecomposition/images/butterfly.png
diff --git a/examples/painting/imagecomposition/images/checker.png b/examples/painting/imagecomposition/images/checker.png
new file mode 100644
index 0000000000..546609de3f
--- /dev/null
+++ b/examples/painting/imagecomposition/images/checker.png
diff --git a/examples/painting/imagecomposition/main.cpp b/examples/painting/imagecomposition/main.cpp
new file mode 100644
index 0000000000..34527a479f
--- /dev/null
+++ b/examples/painting/imagecomposition/main.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "imagecomposer.h"
+
+//! [0]
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(imagecomposition);
+
+    QApplication app(argc, argv);
+    ImageComposer composer;
+    composer.show();
+    return app.exec();
+}
+//! [0]
diff --git a/examples/painting/painterpaths/main.cpp b/examples/painting/painterpaths/main.cpp
new file mode 100644
index 0000000000..fa8b0abb9d
--- /dev/null
+++ b/examples/painting/painterpaths/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "window.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Window window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/painting/painterpaths/painterpaths.pro b/examples/painting/painterpaths/painterpaths.pro
new file mode 100644
index 0000000000..76c9e82aeb
--- /dev/null
+++ b/examples/painting/painterpaths/painterpaths.pro
@@ -0,0 +1,12 @@
+HEADERS       = renderarea.h \
+                window.h
+SOURCES       = main.cpp \
+                renderarea.cpp \
+                window.cpp
+unix:!mac:LIBS += -lm
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/painting/painterpaths
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painterpaths.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/painting/painterpaths
+INSTALLS += target sources
diff --git a/examples/painting/painterpaths/renderarea.cpp b/examples/painting/painterpaths/renderarea.cpp
new file mode 100644
index 0000000000..64d149b03a
--- /dev/null
+++ b/examples/painting/painterpaths/renderarea.cpp
@@ -0,0 +1,131 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "renderarea.h"
+
+//! [0]
+RenderArea::RenderArea(const QPainterPath &path, QWidget *parent)
+    : QWidget(parent), path(path)
+{
+    penWidth = 1;
+    rotationAngle = 0;
+    setBackgroundRole(QPalette::Base);
+}
+//! [0]
+
+//! [1]
+QSize RenderArea::minimumSizeHint() const
+{
+    return QSize(50, 50);
+}
+//! [1]
+
+//! [2]
+QSize RenderArea::sizeHint() const
+{
+    return QSize(100, 100);
+}
+//! [2]
+
+//! [3]
+void RenderArea::setFillRule(Qt::FillRule rule)
+{
+    path.setFillRule(rule);
+    update();
+}
+//! [3]
+
+//! [4]
+void RenderArea::setFillGradient(const QColor &color1, const QColor &color2)
+{
+    fillColor1 = color1;
+    fillColor2 = color2;
+    update();
+}
+//! [4]
+
+//! [5]
+void RenderArea::setPenWidth(int width)
+{
+    penWidth = width;
+    update();
+}
+//! [5]
+
+//! [6]
+void RenderArea::setPenColor(const QColor &color)
+{
+    penColor = color;
+    update();
+}
+//! [6]
+
+//! [7]
+void RenderArea::setRotationAngle(int degrees)
+{
+    rotationAngle = degrees;
+    update();
+}
+//! [7]
+
+//! [8]
+void RenderArea::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+    painter.setRenderHint(QPainter::Antialiasing);
+//! [8] //! [9]
+    painter.scale(width() / 100.0, height() / 100.0);
+    painter.translate(50.0, 50.0);
+    painter.rotate(-rotationAngle);
+    painter.translate(-50.0, -50.0);
+
+//! [9] //! [10]
+    painter.setPen(QPen(penColor, penWidth, Qt::SolidLine, Qt::RoundCap,
+                        Qt::RoundJoin));
+    QLinearGradient gradient(0, 0, 0, 100);
+    gradient.setColorAt(0.0, fillColor1);
+    gradient.setColorAt(1.0, fillColor2);
+    painter.setBrush(gradient);
+    painter.drawPath(path);
+}
+//! [10]
diff --git a/examples/painting/painterpaths/renderarea.h b/examples/painting/painterpaths/renderarea.h
new file mode 100644
index 0000000000..39b7efd477
--- /dev/null
+++ b/examples/painting/painterpaths/renderarea.h
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef RENDERAREA_H
+#define RENDERAREA_H
+
+#include <QPainterPath>
+#include <QWidget>
+
+//! [0]
+class RenderArea : public QWidget
+{
+    Q_OBJECT
+
+public:
+    RenderArea(const QPainterPath &path, QWidget *parent = 0);
+
+    QSize minimumSizeHint() const;
+    QSize sizeHint() const;
+
+public slots:
+    void setFillRule(Qt::FillRule rule);
+    void setFillGradient(const QColor &color1, const QColor &color2);
+    void setPenWidth(int width);
+    void setPenColor(const QColor &color);
+    void setRotationAngle(int degrees);
+
+protected:
+    void paintEvent(QPaintEvent *event);
+//! [0]
+
+//! [1]
+private:
+    QPainterPath path;
+    QColor fillColor1;
+    QColor fillColor2;
+    int penWidth;
+    QColor penColor;
+    int rotationAngle;
+};
+//! [1]
+
+#endif
diff --git a/examples/painting/painterpaths/window.cpp b/examples/painting/painterpaths/window.cpp
new file mode 100644
index 0000000000..712e961511
--- /dev/null
+++ b/examples/painting/painterpaths/window.cpp
@@ -0,0 +1,289 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include <math.h>
+
+#include "renderarea.h"
+#include "window.h"
+
+//! [0]
+const float Pi = 3.14159f;
+//! [0]
+
+//! [1]
+Window::Window()
+{
+    QPainterPath rectPath;
+    rectPath.moveTo(20.0, 30.0);
+    rectPath.lineTo(80.0, 30.0);
+    rectPath.lineTo(80.0, 70.0);
+    rectPath.lineTo(20.0, 70.0);
+    rectPath.closeSubpath();
+//! [1]
+
+//! [2]
+    QPainterPath roundRectPath;
+    roundRectPath.moveTo(80.0, 35.0);
+    roundRectPath.arcTo(70.0, 30.0, 10.0, 10.0, 0.0, 90.0);
+    roundRectPath.lineTo(25.0, 30.0);
+    roundRectPath.arcTo(20.0, 30.0, 10.0, 10.0, 90.0, 90.0);
+    roundRectPath.lineTo(20.0, 65.0);
+    roundRectPath.arcTo(20.0, 60.0, 10.0, 10.0, 180.0, 90.0);
+    roundRectPath.lineTo(75.0, 70.0);
+    roundRectPath.arcTo(70.0, 60.0, 10.0, 10.0, 270.0, 90.0);
+    roundRectPath.closeSubpath();
+//! [2]
+
+//! [3]
+    QPainterPath ellipsePath;
+    ellipsePath.moveTo(80.0, 50.0);
+    ellipsePath.arcTo(20.0, 30.0, 60.0, 40.0, 0.0, 360.0);
+//! [3]
+
+//! [4]
+    QPainterPath piePath;
+    piePath.moveTo(50.0, 50.0);
+    piePath.arcTo(20.0, 30.0, 60.0, 40.0, 60.0, 240.0);
+    piePath.closeSubpath();
+//! [4]
+
+//! [5]
+    QPainterPath polygonPath;
+    polygonPath.moveTo(10.0, 80.0);
+    polygonPath.lineTo(20.0, 10.0);
+    polygonPath.lineTo(80.0, 30.0);
+    polygonPath.lineTo(90.0, 70.0);
+    polygonPath.closeSubpath();
+//! [5]
+
+//! [6]
+    QPainterPath groupPath;
+    groupPath.moveTo(60.0, 40.0);
+    groupPath.arcTo(20.0, 20.0, 40.0, 40.0, 0.0, 360.0);
+    groupPath.moveTo(40.0, 40.0);
+    groupPath.lineTo(40.0, 80.0);
+    groupPath.lineTo(80.0, 80.0);
+    groupPath.lineTo(80.0, 40.0);
+    groupPath.closeSubpath();
+//! [6]
+
+//! [7]
+    QPainterPath textPath;
+    QFont timesFont("Times", 50);
+    timesFont.setStyleStrategy(QFont::ForceOutline);
+    textPath.addText(10, 70, timesFont, tr("Qt"));
+//! [7]
+
+//! [8]
+    QPainterPath bezierPath;
+    bezierPath.moveTo(20, 30);
+    bezierPath.cubicTo(80, 0, 50, 50, 80, 80);
+//! [8]
+
+//! [9]
+    QPainterPath starPath;
+    starPath.moveTo(90, 50);
+    for (int i = 1; i < 5; ++i) {
+        starPath.lineTo(50 + 40 * cos(0.8 * i * Pi),
+                        50 + 40 * sin(0.8 * i * Pi));
+    }
+    starPath.closeSubpath();
+//! [9]
+
+//! [10]
+    renderAreas[0] = new RenderArea(rectPath);
+    renderAreas[1] = new RenderArea(roundRectPath);
+    renderAreas[2] = new RenderArea(ellipsePath);
+    renderAreas[3] = new RenderArea(piePath);
+    renderAreas[4] = new RenderArea(polygonPath);
+    renderAreas[5] = new RenderArea(groupPath);
+    renderAreas[6] = new RenderArea(textPath);
+    renderAreas[7] = new RenderArea(bezierPath);
+    renderAreas[8] = new RenderArea(starPath);
+    Q_ASSERT(NumRenderAreas == 9);
+//! [10]
+
+//! [11]
+    fillRuleComboBox = new QComboBox;
+    fillRuleComboBox->addItem(tr("Odd Even"), Qt::OddEvenFill);
+    fillRuleComboBox->addItem(tr("Winding"), Qt::WindingFill);
+
+    fillRuleLabel = new QLabel(tr("Fill &Rule:"));
+    fillRuleLabel->setBuddy(fillRuleComboBox);
+//! [11]
+
+//! [12]
+    fillColor1ComboBox = new QComboBox;
+    populateWithColors(fillColor1ComboBox);
+    fillColor1ComboBox->setCurrentIndex(
+            fillColor1ComboBox->findText("mediumslateblue"));
+
+    fillColor2ComboBox = new QComboBox;
+    populateWithColors(fillColor2ComboBox);
+    fillColor2ComboBox->setCurrentIndex(
+            fillColor2ComboBox->findText("cornsilk"));
+
+    fillGradientLabel = new QLabel(tr("&Fill Gradient:"));
+    fillGradientLabel->setBuddy(fillColor1ComboBox);
+
+    fillToLabel = new QLabel(tr("to"));
+    fillToLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+
+    penWidthSpinBox = new QSpinBox;
+    penWidthSpinBox->setRange(0, 20);
+
+    penWidthLabel = new QLabel(tr("&Pen Width:"));
+    penWidthLabel->setBuddy(penWidthSpinBox);
+
+    penColorComboBox = new QComboBox;
+    populateWithColors(penColorComboBox);
+    penColorComboBox->setCurrentIndex(
+            penColorComboBox->findText("darkslateblue"));
+
+    penColorLabel = new QLabel(tr("Pen &Color:"));
+    penColorLabel->setBuddy(penColorComboBox);
+
+    rotationAngleSpinBox = new QSpinBox;
+    rotationAngleSpinBox->setRange(0, 359);
+    rotationAngleSpinBox->setWrapping(true);
+    rotationAngleSpinBox->setSuffix("\xB0");
+
+    rotationAngleLabel = new QLabel(tr("&Rotation Angle:"));
+    rotationAngleLabel->setBuddy(rotationAngleSpinBox);
+//! [12]
+
+//! [16]
+    connect(fillRuleComboBox, SIGNAL(activated(int)),
+            this, SLOT(fillRuleChanged()));
+    connect(fillColor1ComboBox, SIGNAL(activated(int)),
+            this, SLOT(fillGradientChanged()));
+    connect(fillColor2ComboBox, SIGNAL(activated(int)),
+            this, SLOT(fillGradientChanged()));
+    connect(penColorComboBox, SIGNAL(activated(int)),
+            this, SLOT(penColorChanged()));
+
+    for (int i = 0; i < NumRenderAreas; ++i) {
+        connect(penWidthSpinBox, SIGNAL(valueChanged(int)),
+                renderAreas[i], SLOT(setPenWidth(int)));
+        connect(rotationAngleSpinBox, SIGNAL(valueChanged(int)),
+                renderAreas[i], SLOT(setRotationAngle(int)));
+    }
+
+//! [16] //! [17]
+    QGridLayout *topLayout = new QGridLayout;
+    for (int i = 0; i < NumRenderAreas; ++i)
+        topLayout->addWidget(renderAreas[i], i / 3, i % 3);
+
+    QGridLayout *mainLayout = new QGridLayout;
+    mainLayout->addLayout(topLayout, 0, 0, 1, 4);
+    mainLayout->addWidget(fillRuleLabel, 1, 0);
+    mainLayout->addWidget(fillRuleComboBox, 1, 1, 1, 3);
+    mainLayout->addWidget(fillGradientLabel, 2, 0);
+    mainLayout->addWidget(fillColor1ComboBox, 2, 1);
+    mainLayout->addWidget(fillToLabel, 2, 2);
+    mainLayout->addWidget(fillColor2ComboBox, 2, 3);
+    mainLayout->addWidget(penWidthLabel, 3, 0);
+    mainLayout->addWidget(penWidthSpinBox, 3, 1, 1, 3);
+    mainLayout->addWidget(penColorLabel, 4, 0);
+    mainLayout->addWidget(penColorComboBox, 4, 1, 1, 3);
+    mainLayout->addWidget(rotationAngleLabel, 5, 0);
+    mainLayout->addWidget(rotationAngleSpinBox, 5, 1, 1, 3);
+    setLayout(mainLayout);
+//! [17]
+
+//! [18]
+    fillRuleChanged();
+    fillGradientChanged();
+    penColorChanged();
+    penWidthSpinBox->setValue(2);
+
+    setWindowTitle(tr("Painter Paths"));
+}
+//! [18]
+
+//! [19]
+void Window::fillRuleChanged()
+{
+    Qt::FillRule rule = (Qt::FillRule)currentItemData(fillRuleComboBox).toInt();
+
+    for (int i = 0; i < NumRenderAreas; ++i)
+        renderAreas[i]->setFillRule(rule);
+}
+//! [19]
+
+//! [20]
+void Window::fillGradientChanged()
+{
+    QColor color1 = qvariant_cast<QColor>(currentItemData(fillColor1ComboBox));
+    QColor color2 = qvariant_cast<QColor>(currentItemData(fillColor2ComboBox));
+
+    for (int i = 0; i < NumRenderAreas; ++i)
+        renderAreas[i]->setFillGradient(color1, color2);
+}
+//! [20]
+
+//! [21]
+void Window::penColorChanged()
+{
+    QColor color = qvariant_cast<QColor>(currentItemData(penColorComboBox));
+
+    for (int i = 0; i < NumRenderAreas; ++i)
+        renderAreas[i]->setPenColor(color);
+}
+//! [21]
+
+//! [22]
+void Window::populateWithColors(QComboBox *comboBox)
+{
+    QStringList colorNames = QColor::colorNames();
+    foreach (QString name, colorNames)
+        comboBox->addItem(name, QColor(name));
+}
+//! [22]
+
+//! [23]
+QVariant Window::currentItemData(QComboBox *comboBox)
+{
+    return comboBox->itemData(comboBox->currentIndex());
+}
+//! [23]
diff --git a/examples/painting/painterpaths/window.h b/examples/painting/painterpaths/window.h
new file mode 100644
index 0000000000..f2ad0ae0fd
--- /dev/null
+++ b/examples/painting/painterpaths/window.h
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QComboBox;
+class QLabel;
+class QSpinBox;
+QT_END_NAMESPACE
+class RenderArea;
+
+//! [0]
+class Window : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Window();
+
+private slots:
+    void fillRuleChanged();
+    void fillGradientChanged();
+    void penColorChanged();
+//! [0]
+
+//! [1]
+private:
+    void populateWithColors(QComboBox *comboBox);
+    QVariant currentItemData(QComboBox *comboBox);
+//! [1]
+
+//! [2]
+    enum { NumRenderAreas = 9 };
+
+    RenderArea *renderAreas[NumRenderAreas];
+    QLabel *fillRuleLabel;
+    QLabel *fillGradientLabel;
+    QLabel *fillToLabel;
+    QLabel *penWidthLabel;
+    QLabel *penColorLabel;
+    QLabel *rotationAngleLabel;
+    QComboBox *fillRuleComboBox;
+    QComboBox *fillColor1ComboBox;
+    QComboBox *fillColor2ComboBox;
+    QSpinBox *penWidthSpinBox;
+    QComboBox *penColorComboBox;
+    QSpinBox *rotationAngleSpinBox;
+};
+//! [2]
+
+#endif
diff --git a/examples/painting/painting.pro b/examples/painting/painting.pro
new file mode 100644
index 0000000000..b6fad5a7e6
--- /dev/null
+++ b/examples/painting/painting.pro
@@ -0,0 +1,16 @@
+TEMPLATE      = subdirs
+SUBDIRS       = basicdrawing \
+                concentriccircles \
+                imagecomposition \
+                painterpaths \
+                transformations
+
+!wince*: SUBDIRS += fontsampler
+
+contains(QT_CONFIG, svg): SUBDIRS += svgviewer
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/painting
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painting.pro README
+sources.path = $$[QT_INSTALL_EXAMPLES]/painting
+INSTALLS += target sources
diff --git a/examples/painting/svgviewer/files/bubbles.svg b/examples/painting/svgviewer/files/bubbles.svg
new file mode 100644
index 0000000000..65867da2d8
--- /dev/null
+++ b/examples/painting/svgviewer/files/bubbles.svg
@@ -0,0 +1,215 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg width="20cm" height="15cm" viewBox="0 0 800 600"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink/"
+    baseProfile="tiny" version="1.2">
+  <title>Spheres</title>
+  <desc>Semi-transparent bubbles on a colored background.</desc>
+    <defs>
+      <!-- Create radial gradients for each bubble. -->
+      <radialGradient id="blueBubble" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" stop-opacity="1" />
+        <stop offset="25%" stop-color="#cdcdff" stop-opacity=".65" />
+        <stop offset="100%" stop-color="#cdaacd" stop-opacity=".75" />
+      </radialGradient>
+      <radialGradient id="redBubble" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" stop-opacity="1" />
+        <stop offset="25%" stop-color="#ffcdcd" stop-opacity=".65" />
+        <stop offset="100%" stop-color="#bbbb99" stop-opacity=".75" />
+      </radialGradient>
+      <radialGradient id="greenBubble" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" stop-opacity="1" />
+        <stop offset="25%" stop-color="#cdffcd" stop-opacity=".65" />
+        <stop offset="100%" stop-color="#99aaaa" stop-opacity=".75" />
+      </radialGradient>
+      <radialGradient id="yellowBubble" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" stop-opacity="1" />
+        <stop offset="25%" stop-color="#ffffcd" stop-opacity=".65" />
+        <stop offset="100%" stop-color="#bbbbaa" stop-opacity=".75" />
+      </radialGradient>
+      <radialGradient id="background" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="400" fx="250" fy="250">
+        <stop offset="0%" stop-color="#ffffee" />
+        <stop offset="100%" stop-color="#ccccaa" />
+      </radialGradient>
+      <linearGradient id="surface" gradientUnits="userSpaceOnUse"
+                      x1="-100" y1="200" x2="400" y2="200">
+        <stop offset="0%" stop-color="#ffffcc" />
+        <stop offset="100%" stop-color="#bbbb88" />
+      </linearGradient>
+
+      <!-- Create radial gradients for each circle to make them look like
+           spheres. -->
+      <radialGradient id="blueSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="blue" />
+        <stop offset="100%" stop-color="#222244" />
+      </radialGradient>
+      <radialGradient id="redSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="red" />
+        <stop offset="100%" stop-color="#442222" />
+      </radialGradient>
+      <radialGradient id="greenSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="green" />
+        <stop offset="100%" stop-color="#113311" />
+      </radialGradient>
+      <radialGradient id="yellowSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="yellow" />
+        <stop offset="100%" stop-color="#444422" />
+      </radialGradient>
+      <radialGradient id="shadowGrad" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="50">
+        <stop offset="0%" stop-color="black" stop-opacity="1.0" />
+        <stop offset="100%" stop-color="white" stop-opacity="0.0" />
+      </radialGradient>
+
+      <!-- Define a shadow for each sphere. -->
+      <circle id="shadow" fill="url(#shadowGrad)" cx="0" cy="0" r="100" />
+      <g id="bubble">
+        <circle fill="black" cx="0" cy="0" r="50" />
+        <circle fill="#a6ce39" cx="0" cy="0" r="33" />
+        <path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10
+                              L -11,22 L -1,12 Z" />
+        <circle cx="0" cy="0" r="100" />
+      </g>
+    </defs>
+  <g>
+    <rect fill="url(#background)" x="0" y="0" width="800" height="600" />
+  </g>
+
+  <g transform="translate(200,700)">
+    <use xlink:href="#bubble" fill="url(#blueBubble)" />
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="1s" dur="10s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(315,700)">
+    <g transform="scale(0.5,0.5)">
+      <use xlink:href="#bubble" fill="url(#redBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="3s" dur="7s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(80,700)">
+    <g transform="scale(0.65,0.65)">
+      <use xlink:href="#bubble" fill="url(#greenBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="5s" dur="9s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(255,700)">
+    <g transform="scale(0.3,0.3)">
+      <use xlink:href="#bubble" fill="url(#yellowBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="2s" dur="6s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(565,700)">
+    <g transform="scale(0.4,0.4)">
+      <use xlink:href="#bubble" fill="url(#blueBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="4s" dur="8s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(715,700)">
+    <g transform="scale(0.6,0.6)">
+      <use xlink:href="#bubble" fill="url(#redBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="1s" dur="4s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(645,700)">
+    <g transform="scale(0.375,0.375)">
+      <use xlink:href="#bubble" fill="url(#greenBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="0s" dur="11s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(555,700)">
+    <g transform="scale(0.9,0.9)">
+      <use xlink:href="#bubble" fill="url(#yellowBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="3s" dur="7.5s" fill="freeze" repeatCount="indefinite" />
+  </g>
+
+  <g transform="translate(360,700)">
+    <g transform="scale(0.5,0.5)">
+      <use xlink:href="#bubble" fill="url(#blueBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="3s" dur="6s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(215,700)">
+    <g transform="scale(0.45,0.45)">
+      <use xlink:href="#bubble" fill="url(#redBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="5.5s" dur="7s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(420,700)">
+    <g transform="scale(0.75,0.75)">
+      <use xlink:href="#bubble" fill="url(#greenBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="1s" dur="9s" fill="freeze" repeatCount="indefinite" />
+  </g>
+  <g transform="translate(815,700)">
+    <g transform="scale(0.6,0.6)">
+      <use xlink:href="#bubble" fill="url(#yellowBubble)" />
+    </g>
+    <animateTransform attributeName="transform" type="translate"
+        values="0,0; 0,-800" begin="2s" dur="9.5s" fill="freeze" repeatCount="indefinite" />
+  </g>
+
+  <g transform="translate(225,375)" >
+    <g transform="scale(1.0,0.5)" >
+      <path d="M 0 0 L 350 0 L 450 450 L -100 450 z"
+            fill="url(#surface)" stroke="none" />
+    </g>
+  </g>
+    <g transform="translate(200,0)" >
+    <g transform="translate(200,490) scale(2.0,1.0) rotate(45)" >
+      <rect fill="#a6ce39" x="-69" y="-69" width="138" height="138" />
+      <circle fill="black" cx="0" cy="0" r="50" />
+      <circle fill="#a6ce39" cx="0" cy="0" r="33" />
+      <path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10
+                            L -11,22 L -1,12 Z" />
+      <animateTransform attributeName="transform"  type="rotate" values="0; 360"
+	         begin="0s" dur="10s" fill="freeze" repeatCount="indefinite" />
+    </g>
+    <g transform="translate(200,375)">
+      <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+      <circle fill="url(#blueSphere)" cx="0" cy="0" r="100" />
+    </g>
+    <g transform="translate(315,440)">
+      <g transform="scale(0.5,0.5)">
+        <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+        <circle fill="url(#redSphere)" cx="0" cy="0" r="100" />
+      </g>
+    </g>
+    <g transform="translate(80,475)">
+      <g transform="scale(0.65,0.65)">
+        <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+        <circle fill="url(#greenSphere)" cx="0" cy="0" r="100" />
+      </g>
+    </g>
+    <g transform="translate(255,525)">
+      <g transform="scale(0.3,0.3)">
+        <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+        <circle fill="url(#yellowSphere)" cx="0" cy="0" r="100" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/examples/painting/svgviewer/files/cubic.svg b/examples/painting/svgviewer/files/cubic.svg
new file mode 100644
index 0000000000..492bb72b8b
--- /dev/null
+++ b/examples/painting/svgviewer/files/cubic.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" standalone="no"?>
+<svg width="10cm" height="10cm" viewBox="0 0 1000 1000"
+     xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny">
+  <title>Example cubic02 - cubic Bezier commands in path data</title>
+  <desc>Picture showing examples of "C" and "S" commands,
+        along with annotations showing the control points
+        and end points</desc>
+
+  <rect fill="none" stroke="blue" stroke-width="1" x="1" y="1" width="998" height="998" />
+
+  <!-- Path 1 -->
+  <polyline fill="none" stroke="#888888" stroke-width="2" points="100,200 100,100" />
+  <polyline fill="none" stroke="#888888" stroke-width="2" points="400,100 400,200" />
+  <path fill="none" stroke="red" stroke-width="5" d="M100,200 C100,100 400,100 400,200" />
+  <circle fill="none" stroke="#888888" stroke-width="2" cx="100" cy="200" r="10" />
+  <circle fill="none" stroke="#888888" stroke-width="2" cx="400" cy="200" r="10" />
+  <circle class="CtlPoint" cx="100" cy="100" r="10" />
+  <circle class="CtlPoint" cx="400" cy="100" r="10" />
+  <text text-anchor="middle" font-size="22" font-family="Verdana" x="250" y="275">M100,200 C100,100 400,100 400,200</text>
+
+  <!-- Path 2 -->
+  <polyline fill="none" stroke="#888888" stroke-width="2" points="100,500 25,400" />
+  <polyline fill="none" stroke="#888888" stroke-width="2" points="475,400 400,500" />
+  <path fill="none" stroke="red" stroke-width="5" d="M100,500 C25,400 475,400 400,500" />
+  <circle fill="none" stroke="#888888" stroke-width="2" cx="100" cy="500" r="10" />
+  <circle fill="none" stroke="#888888" stroke-width="2" cx="400" cy="500" r="10" />
+  <circle fill="#888888" stroke="none" cx="25" cy="400" r="10" />
+  <circle fill="#888888" stroke="none" cx="475" cy="400" r="10" />
+  <text text-anchor="middle" font-size="22" font-family="Verdana" x="250" y="575">M100,500 C25,400 475,400 400,500</text>
+
+  <!-- Path 3 -->
+  <polyline fill="none" stroke="#888888" stroke-width="2" points="100,800 175,700" />
+  <polyline fill="none" stroke="#888888" stroke-width="2" points="325,700 400,800" />
+  <path fill="none" stroke="red" stroke-width="5" d="M100,800 C175,700 325,700 400,800" />
+  <circle fill="none" stroke="#888888" stroke-width="2" cx="100" cy="800" r="10" />
+  <circle fill="none" stroke="#888888" stroke-width="2" cx="400" cy="800" r="10" />
+  <circle fill="#888888" stroke="none" cx="175" cy="700" r="10" />
+  <circle fill="#888888" stroke="none" cx="325" cy="700" r="10" />
+  <text text-anchor="middle" font-size="22" font-family="Verdana" x="250" y="875">M100,800 C175,700 325,700 400,800</text>
+
+  <!-- Path 4 -->
+  <polyline fill="none" stroke="#888888" stroke-width="2" points="600,200 675,100" />
+  <polyline fill="none" stroke="#888888" stroke-width="2" points="975,100 900,200" />
+  <path fill="none" stroke="red" stroke-width="5" d="M600,200 C675,100 975,100 900,200" />
+  <circle fill="none" stroke="#888888" stroke-width="2" cx="600" cy="200" r="10" />
+  <circle fill="none" stroke="#888888" stroke-width="2" cx="900" cy="200" r="10" />
+  <circle fill="#888888" stroke="none" cx="675" cy="100" r="10" />
+  <circle fill="#888888" stroke="none" cx="975" cy="100" r="10" />
+  <text text-anchor="middle" font-size="22" font-family="Verdana" x="750" y="275">M600,200 C675,100 975,100 900,200</text>
+
+  <!-- Path 5 -->
+  <polyline fill="none" stroke="#888888" stroke-width="2" points="600,500 600,350" />
+  <polyline fill="none" stroke="#888888" stroke-width="2" points="900,650 900,500" />
+  <path fill="none" stroke="red" stroke-width="5" d="M600,500 C600,350 900,650 900,500" />
+  <circle fill="none" stroke="#888888" stroke-width="2" cx="600" cy="500" r="10" />
+  <circle fill="none" stroke="#888888" stroke-width="2" cx="900" cy="500" r="10" />
+  <circle fill="#888888" stroke="none" cx="600" cy="350" r="10" />
+  <circle fill="#888888" stroke="none" cx="900" cy="650" r="10" />
+  <text text-anchor="middle" font-size="22" font-family="Verdana" x="750" y="575">M600,500 C600,350 900,650 900,500</text>
+
+  <!-- Path 6 (C and S command) -->
+  <polyline fill="none" stroke="#888888" stroke-width="2" points="600,800 625,700" />
+  <polyline fill="none" stroke="#888888" stroke-width="2" points="725,700 750,800" />
+  <polyline fill="none" stroke="#888888" stroke-width="2" points="750,800 775,900" />
+  <polyline fill="none" stroke="#888888" stroke-width="2" points="875,900 900,800" />
+  <path fill="none" stroke="red" stroke-width="5" d="M600,800 C625,700 725,700 750,800
+                                       S875,900 900,800" />
+  <circle fill="none" stroke="#888888" stroke-width="2" cx="600" cy="800" r="10" />
+  <circle fill="none" stroke="#888888" stroke-width="2" cx="750" cy="800" r="10" />
+  <circle fill="none" stroke="#888888" stroke-width="2" cx="900" cy="800" r="10" />
+  <circle fill="#888888" stroke="none" cx="625" cy="700" r="10" />
+  <circle fill="#888888" stroke="none" cx="725" cy="700" r="10" />
+  <circle fill="#888888" stroke="none" cx="875" cy="900" r="10" />
+  <circle fill="none" stroke="blue" stroke-width="4" cx="775" cy="900" r="9" />
+  <text text-anchor="middle" font-size="22" font-family="Verdana" x="750" y="945">M600,800 C625,700 725,700 750,800</text>
+  <text text-anchor="middle" font-size="22" font-family="Verdana" x="750" y="975">S875,900 900,800</text>
+</svg>
diff --git a/examples/painting/svgviewer/files/spheres.svg b/examples/painting/svgviewer/files/spheres.svg
new file mode 100644
index 0000000000..b23164bce3
--- /dev/null
+++ b/examples/painting/svgviewer/files/spheres.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" standalone="no"?>
+<svg width="8cm" height="8cm" viewBox="0 0 400 400"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink/"
+    baseProfile="tiny" version="1.2">
+  <title>Spheres</title>
+  <desc>Gradient filled spheres with different colors.</desc>
+    <defs>
+      <!-- Create radial gradients for each circle to make them look like
+           spheres. -->
+      <radialGradient id="blueSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="blue" />
+        <stop offset="100%" stop-color="#222244" />
+      </radialGradient>
+      <radialGradient id="redSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="red" />
+        <stop offset="100%" stop-color="#442222" />
+      </radialGradient>
+      <radialGradient id="greenSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="green" />
+        <stop offset="100%" stop-color="#113311" />
+      </radialGradient>
+      <radialGradient id="yellowSphere" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="-50">
+        <stop offset="0%" stop-color="white" />
+        <stop offset="75%" stop-color="yellow" />
+        <stop offset="100%" stop-color="#444422" />
+      </radialGradient>
+      <radialGradient id="shadowGrad" gradientUnits="userSpaceOnUse"
+                      cx="0" cy="0" r="100" fx="-50" fy="50">
+        <stop offset="0%" stop-color="black" stop-opacity="1.0" />
+        <stop offset="100%" stop-color="white" stop-opacity="0.0" />
+      </radialGradient>
+
+      <!-- Define a shadow for each sphere. -->
+      <circle id="shadow" fill="url(#shadowGrad)" cx="0" cy="0" r="100" />
+    </defs>
+  <g fill="#ffee99" stroke="none" >
+    <rect x="0" y="0" width="400" height="400" />
+  </g>
+  <g fill="white" stroke="none" >
+    <rect x="0" y="175" width="400" height="225" />
+  </g>
+  <g transform="translate(200,175)">
+    <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+    <circle fill="url(#blueSphere)" cx="0" cy="0" r="100" />
+  </g>
+  <g transform="translate(315,240)">
+    <g transform="scale(0.5,0.5)">
+      <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+      <circle fill="url(#redSphere)" cx="0" cy="0" r="100" />
+    </g>
+  </g>
+  <g transform="translate(80,275)">
+    <g transform="scale(0.65,0.65)">
+      <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+      <circle fill="url(#greenSphere)" cx="0" cy="0" r="100" />
+    </g>
+  </g>
+  <g transform="translate(255,325)">
+    <g transform="scale(0.3,0.3)">
+      <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
+      <circle fill="url(#yellowSphere)" cx="0" cy="0" r="100" />
+    </g>
+  </g>
+</svg>
diff --git a/examples/painting/svgviewer/main.cpp b/examples/painting/svgviewer/main.cpp
new file mode 100644
index 0000000000..18520f74fd
--- /dev/null
+++ b/examples/painting/svgviewer/main.cpp
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QString>
+#ifndef QT_NO_OPENGL
+#include <QGLFormat>
+#endif
+
+#include "mainwindow.h"
+
+int main(int argc, char **argv)
+{
+    Q_INIT_RESOURCE(svgviewer);
+
+    QApplication app(argc, argv);
+
+    MainWindow window;
+    if (argc == 2)
+        window.openFile(argv[1]);
+    else
+        window.openFile(":/files/bubbles.svg");
+    window.show();
+    return app.exec();
+}
diff --git a/examples/painting/svgviewer/mainwindow.cpp b/examples/painting/svgviewer/mainwindow.cpp
new file mode 100644
index 0000000000..22393eb723
--- /dev/null
+++ b/examples/painting/svgviewer/mainwindow.cpp
@@ -0,0 +1,164 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mainwindow.h"
+
+#include <QtGui>
+
+#include "svgview.h"
+
+MainWindow::MainWindow()
+    : QMainWindow()
+    , m_view(new SvgView)
+{
+    QMenu *fileMenu = new QMenu(tr("&File"), this);
+    QAction *openAction = fileMenu->addAction(tr("&Open..."));
+    openAction->setShortcut(QKeySequence(tr("Ctrl+O")));
+    QAction *quitAction = fileMenu->addAction(tr("E&xit"));
+    quitAction->setShortcut(QKeySequence(tr("Ctrl+Q")));
+
+    menuBar()->addMenu(fileMenu);
+
+    QMenu *viewMenu = new QMenu(tr("&View"), this);
+    m_backgroundAction = viewMenu->addAction(tr("&Background"));
+    m_backgroundAction->setEnabled(false);
+    m_backgroundAction->setCheckable(true);
+    m_backgroundAction->setChecked(false);
+    connect(m_backgroundAction, SIGNAL(toggled(bool)), m_view, SLOT(setViewBackground(bool)));
+
+    m_outlineAction = viewMenu->addAction(tr("&Outline"));
+    m_outlineAction->setEnabled(false);
+    m_outlineAction->setCheckable(true);
+    m_outlineAction->setChecked(true);
+    connect(m_outlineAction, SIGNAL(toggled(bool)), m_view, SLOT(setViewOutline(bool)));
+
+    menuBar()->addMenu(viewMenu);
+
+    QMenu *rendererMenu = new QMenu(tr("&Renderer"), this);
+    m_nativeAction = rendererMenu->addAction(tr("&Native"));
+    m_nativeAction->setCheckable(true);
+    m_nativeAction->setChecked(true);
+#ifndef QT_NO_OPENGL
+    m_glAction = rendererMenu->addAction(tr("&OpenGL"));
+    m_glAction->setCheckable(true);
+#endif
+    m_imageAction = rendererMenu->addAction(tr("&Image"));
+    m_imageAction->setCheckable(true);
+
+#ifndef QT_NO_OPENGL
+    rendererMenu->addSeparator();
+    m_highQualityAntialiasingAction = rendererMenu->addAction(tr("&High Quality Antialiasing"));
+    m_highQualityAntialiasingAction->setEnabled(false);
+    m_highQualityAntialiasingAction->setCheckable(true);
+    m_highQualityAntialiasingAction->setChecked(false);
+    connect(m_highQualityAntialiasingAction, SIGNAL(toggled(bool)), m_view, SLOT(setHighQualityAntialiasing(bool)));
+#endif
+
+    QActionGroup *rendererGroup = new QActionGroup(this);
+    rendererGroup->addAction(m_nativeAction);
+#ifndef QT_NO_OPENGL
+    rendererGroup->addAction(m_glAction);
+#endif
+    rendererGroup->addAction(m_imageAction);
+
+    menuBar()->addMenu(rendererMenu);
+
+    connect(openAction, SIGNAL(triggered()), this, SLOT(openFile()));
+    connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+    connect(rendererGroup, SIGNAL(triggered(QAction *)),
+            this, SLOT(setRenderer(QAction *)));
+
+    setCentralWidget(m_view);
+    setWindowTitle(tr("SVG Viewer"));
+}
+
+void MainWindow::openFile(const QString &path)
+{
+    QString fileName;
+    if (path.isNull())
+        fileName = QFileDialog::getOpenFileName(this, tr("Open SVG File"),
+                m_currentPath, "SVG files (*.svg *.svgz *.svg.gz)");
+    else
+        fileName = path;
+
+    if (!fileName.isEmpty()) {
+        QFile file(fileName);
+        if (!file.exists()) {
+            QMessageBox::critical(this, tr("Open SVG File"),
+                           QString("Could not open file '%1'.").arg(fileName));
+
+            m_outlineAction->setEnabled(false);
+            m_backgroundAction->setEnabled(false);
+            return;
+        }
+
+        m_view->openFile(file);
+
+        if (!fileName.startsWith(":/")) {
+            m_currentPath = fileName;
+            setWindowTitle(tr("%1 - SVGViewer").arg(m_currentPath));
+        }
+
+        m_outlineAction->setEnabled(true);
+        m_backgroundAction->setEnabled(true);
+
+        resize(m_view->sizeHint() + QSize(80, 80 + menuBar()->height()));
+    }
+}
+
+void MainWindow::setRenderer(QAction *action)
+{
+#ifndef QT_NO_OPENGL
+    m_highQualityAntialiasingAction->setEnabled(false);
+#endif
+
+    if (action == m_nativeAction)
+        m_view->setRenderer(SvgView::Native);
+#ifndef QT_NO_OPENGL
+    else if (action == m_glAction) {
+        m_highQualityAntialiasingAction->setEnabled(true);
+        m_view->setRenderer(SvgView::OpenGL);
+    }
+#endif
+    else if (action == m_imageAction) {
+        m_view->setRenderer(SvgView::Image);
+    }
+}
diff --git a/examples/painting/svgviewer/mainwindow.h b/examples/painting/svgviewer/mainwindow.h
new file mode 100644
index 0000000000..5df430b8b7
--- /dev/null
+++ b/examples/painting/svgviewer/mainwindow.h
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include <QString>
+
+class SvgView;
+
+QT_BEGIN_NAMESPACE
+class QAction;
+class QGraphicsView;
+class QGraphicsScene;
+class QGraphicsRectItem;
+QT_END_NAMESPACE
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+public slots:
+    void openFile(const QString &path = QString());
+    void setRenderer(QAction *action);
+
+private:
+    QAction *m_nativeAction;
+    QAction *m_glAction;
+    QAction *m_imageAction;
+    QAction *m_highQualityAntialiasingAction;
+    QAction *m_backgroundAction;
+    QAction *m_outlineAction;
+
+    SvgView *m_view;
+
+    QString m_currentPath;
+};
+
+#endif
diff --git a/examples/painting/svgviewer/svgview.cpp b/examples/painting/svgviewer/svgview.cpp
new file mode 100644
index 0000000000..daf7bf0c1b
--- /dev/null
+++ b/examples/painting/svgviewer/svgview.cpp
@@ -0,0 +1,188 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "svgview.h"
+
+#include <QFile>
+#include <QWheelEvent>
+#include <QMouseEvent>
+#include <QGraphicsRectItem>
+#include <QGraphicsSvgItem>
+#include <QPaintEvent>
+#include <qmath.h>
+
+#ifndef QT_NO_OPENGL
+#include <QGLWidget>
+#endif
+
+SvgView::SvgView(QWidget *parent)
+    : QGraphicsView(parent)
+    , m_renderer(Native)
+    , m_svgItem(0)
+    , m_backgroundItem(0)
+    , m_outlineItem(0)
+{
+    setScene(new QGraphicsScene(this));
+    setTransformationAnchor(AnchorUnderMouse);
+    setDragMode(ScrollHandDrag);
+
+    // Prepare background check-board pattern
+    QPixmap tilePixmap(64, 64);
+    tilePixmap.fill(Qt::white);
+    QPainter tilePainter(&tilePixmap);
+    QColor color(220, 220, 220);
+    tilePainter.fillRect(0, 0, 32, 32, color);
+    tilePainter.fillRect(32, 32, 32, 32, color);
+    tilePainter.end();
+
+    setBackgroundBrush(tilePixmap);
+}
+
+void SvgView::drawBackground(QPainter *p, const QRectF &)
+{
+    p->save();
+    p->resetTransform();
+    p->drawTiledPixmap(viewport()->rect(), backgroundBrush().texture());
+    p->restore();
+}
+
+void SvgView::openFile(const QFile &file)
+{
+    if (!file.exists())
+        return;
+
+    QGraphicsScene *s = scene();
+
+    bool drawBackground = (m_backgroundItem ? m_backgroundItem->isVisible() : false);
+    bool drawOutline = (m_outlineItem ? m_outlineItem->isVisible() : true);
+
+    s->clear();
+    resetTransform();
+
+    m_svgItem = new QGraphicsSvgItem(file.fileName());
+    m_svgItem->setFlags(QGraphicsItem::ItemClipsToShape);
+    m_svgItem->setCacheMode(QGraphicsItem::NoCache);
+    m_svgItem->setZValue(0);
+
+    m_backgroundItem = new QGraphicsRectItem(m_svgItem->boundingRect());
+    m_backgroundItem->setBrush(Qt::white);
+    m_backgroundItem->setPen(Qt::NoPen);
+    m_backgroundItem->setVisible(drawBackground);
+    m_backgroundItem->setZValue(-1);
+
+    m_outlineItem = new QGraphicsRectItem(m_svgItem->boundingRect());
+    QPen outline(Qt::black, 2, Qt::DashLine);
+    outline.setCosmetic(true);
+    m_outlineItem->setPen(outline);
+    m_outlineItem->setBrush(Qt::NoBrush);
+    m_outlineItem->setVisible(drawOutline);
+    m_outlineItem->setZValue(1);
+
+    s->addItem(m_backgroundItem);
+    s->addItem(m_svgItem);
+    s->addItem(m_outlineItem);
+
+    s->setSceneRect(m_outlineItem->boundingRect().adjusted(-10, -10, 10, 10));
+}
+
+void SvgView::setRenderer(RendererType type)
+{
+    m_renderer = type;
+
+    if (m_renderer == OpenGL) {
+#ifndef QT_NO_OPENGL
+        setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers)));
+#endif
+    } else {
+        setViewport(new QWidget);
+    }
+}
+
+void SvgView::setHighQualityAntialiasing(bool highQualityAntialiasing)
+{
+#ifndef QT_NO_OPENGL
+    setRenderHint(QPainter::HighQualityAntialiasing, highQualityAntialiasing);
+#else
+    Q_UNUSED(highQualityAntialiasing);
+#endif
+}
+
+void SvgView::setViewBackground(bool enable)
+{
+    if (!m_backgroundItem)
+          return;
+
+    m_backgroundItem->setVisible(enable);
+}
+
+void SvgView::setViewOutline(bool enable)
+{
+    if (!m_outlineItem)
+        return;
+
+    m_outlineItem->setVisible(enable);
+}
+
+void SvgView::paintEvent(QPaintEvent *event)
+{
+    if (m_renderer == Image) {
+        if (m_image.size() != viewport()->size()) {
+            m_image = QImage(viewport()->size(), QImage::Format_ARGB32_Premultiplied);
+        }
+
+        QPainter imagePainter(&m_image);
+        QGraphicsView::render(&imagePainter);
+        imagePainter.end();
+
+        QPainter p(viewport());
+        p.drawImage(0, 0, m_image);
+
+    } else {
+        QGraphicsView::paintEvent(event);
+    }
+}
+
+void SvgView::wheelEvent(QWheelEvent *event)
+{
+    qreal factor = qPow(1.2, event->delta() / 240.0);
+    scale(factor, factor);
+    event->accept();
+}
+
diff --git a/examples/painting/svgviewer/svgview.h b/examples/painting/svgviewer/svgview.h
new file mode 100644
index 0000000000..993268a897
--- /dev/null
+++ b/examples/painting/svgviewer/svgview.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SVGVIEW_H
+#define SVGVIEW_H
+
+#include <QGraphicsView>
+
+QT_BEGIN_NAMESPACE
+class QWheelEvent;
+class QPaintEvent;
+class QFile;
+QT_END_NAMESPACE
+
+class SvgView : public QGraphicsView
+{
+    Q_OBJECT
+
+public:
+    enum RendererType { Native, OpenGL, Image };
+
+    SvgView(QWidget *parent = 0);
+
+    void openFile(const QFile &file);
+    void setRenderer(RendererType type = Native);
+    void drawBackground(QPainter *p, const QRectF &rect);
+
+public slots:
+    void setHighQualityAntialiasing(bool highQualityAntialiasing);
+    void setViewBackground(bool enable);
+    void setViewOutline(bool enable);
+
+protected:
+    void wheelEvent(QWheelEvent *event);
+    void paintEvent(QPaintEvent *event);
+
+private:
+    RendererType m_renderer;
+
+    QGraphicsItem *m_svgItem;
+    QGraphicsRectItem *m_backgroundItem;
+    QGraphicsRectItem *m_outlineItem;
+
+    QImage m_image;
+};
+#endif // SVGVIEW_H
diff --git a/examples/painting/svgviewer/svgviewer.pro b/examples/painting/svgviewer/svgviewer.pro
new file mode 100644
index 0000000000..b29e2184a4
--- /dev/null
+++ b/examples/painting/svgviewer/svgviewer.pro
@@ -0,0 +1,23 @@
+HEADERS       = mainwindow.h \
+                svgview.h
+RESOURCES     = svgviewer.qrc
+SOURCES       = main.cpp \
+                mainwindow.cpp \
+                svgview.cpp
+QT           += svg xml
+
+contains(QT_CONFIG, opengl): QT += opengl
+
+CONFIG += console
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/painting/svgviewer
+sources.files = $$SOURCES $$HEADERS $$RESOURCES svgviewer.pro files
+sources.path = $$[QT_INSTALL_EXAMPLES]/painting/svgviewer
+INSTALLS += target sources
+
+wince*: {
+     addFiles.sources = files\*.svg
+     addFiles.path = \My Documents
+     DEPLOYMENT += addFiles
+}
diff --git a/examples/painting/svgviewer/svgviewer.qrc b/examples/painting/svgviewer/svgviewer.qrc
new file mode 100644
index 0000000000..db611f51fd
--- /dev/null
+++ b/examples/painting/svgviewer/svgviewer.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+  <file>files/bubbles.svg</file>
+</qresource>
+</RCC>
+
diff --git a/examples/painting/transformations/main.cpp b/examples/painting/transformations/main.cpp
new file mode 100644
index 0000000000..fa8b0abb9d
--- /dev/null
+++ b/examples/painting/transformations/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+
+#include "window.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Window window;
+    window.show();
+    return app.exec();
+}
diff --git a/examples/painting/transformations/renderarea.cpp b/examples/painting/transformations/renderarea.cpp
new file mode 100644
index 0000000000..a25869b82b
--- /dev/null
+++ b/examples/painting/transformations/renderarea.cpp
@@ -0,0 +1,173 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "renderarea.h"
+
+//! [0]
+RenderArea::RenderArea(QWidget *parent)
+    : QWidget(parent)
+{
+    QFont newFont = font();
+    newFont.setPixelSize(12);
+    setFont(newFont);
+
+    QFontMetrics fontMetrics(newFont);
+    xBoundingRect = fontMetrics.boundingRect(tr("x"));
+    yBoundingRect = fontMetrics.boundingRect(tr("y"));
+}
+//! [0]
+
+//! [1]
+void RenderArea::setOperations(const QList<Operation> &operations)
+{
+    this->operations = operations;
+    update();
+}
+//! [1]
+
+//! [2]
+void RenderArea::setShape(const QPainterPath &shape)
+{
+    this->shape = shape;
+    update();
+}
+//! [2]
+
+//! [3]
+QSize RenderArea::minimumSizeHint() const
+{
+    return QSize(182, 182);
+}
+//! [3]
+
+//! [4]
+QSize RenderArea::sizeHint() const
+{
+    return QSize(232, 232);
+}
+//! [4]
+
+//! [5]
+void RenderArea::paintEvent(QPaintEvent *event)
+{
+    QPainter painter(this);
+    painter.setRenderHint(QPainter::Antialiasing);
+    painter.fillRect(event->rect(), QBrush(Qt::white));
+
+    painter.translate(66, 66);
+//! [5]
+
+//! [6]
+    painter.save();
+    transformPainter(painter);
+    drawShape(painter);
+    painter.restore();
+//! [6]
+
+//! [7]
+    drawOutline(painter);
+//! [7]
+
+//! [8]
+    transformPainter(painter);
+    drawCoordinates(painter);
+}
+//! [8]
+
+//! [9]
+void RenderArea::drawCoordinates(QPainter &painter)
+{
+    painter.setPen(Qt::red);
+
+    painter.drawLine(0, 0, 50, 0);
+    painter.drawLine(48, -2, 50, 0);
+    painter.drawLine(48, 2, 50, 0);
+    painter.drawText(60 - xBoundingRect.width() / 2,
+                     0 + xBoundingRect.height() / 2, tr("x"));
+
+    painter.drawLine(0, 0, 0, 50);
+    painter.drawLine(-2, 48, 0, 50);
+    painter.drawLine(2, 48, 0, 50);
+    painter.drawText(0 - yBoundingRect.width() / 2,
+                     60 + yBoundingRect.height() / 2, tr("y"));
+}
+//! [9]
+
+//! [10]
+void RenderArea::drawOutline(QPainter &painter)
+{
+    painter.setPen(Qt::darkGreen);
+    painter.setPen(Qt::DashLine);
+    painter.setBrush(Qt::NoBrush);
+    painter.drawRect(0, 0, 100, 100);
+}
+//! [10]
+
+//! [11]
+void RenderArea::drawShape(QPainter &painter)
+{
+    painter.fillPath(shape, Qt::blue);
+}
+//! [11]
+
+//! [12]
+void RenderArea::transformPainter(QPainter &painter)
+{
+    for (int i = 0; i < operations.size(); ++i) {
+        switch (operations[i]) {
+        case Translate:
+            painter.translate(50, 50);
+            break;
+        case Scale:
+            painter.scale(0.75, 0.75);
+            break;
+        case Rotate:
+            painter.rotate(60);
+            break;
+        case NoTransformation:
+        default:
+            ;
+        }
+    }
+}
+//! [12]
diff --git a/examples/painting/transformations/renderarea.h b/examples/painting/transformations/renderarea.h
new file mode 100644
index 0000000000..04ab0d318d
--- /dev/null
+++ b/examples/painting/transformations/renderarea.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef RENDERAREA_H
+#define RENDERAREA_H
+
+#include <QFont>
+#include <QList>
+#include <QPainterPath>
+#include <QRect>
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QPaintEvent;
+QT_END_NAMESPACE
+
+//! [0]
+enum Operation { NoTransformation, Translate, Rotate, Scale };
+//! [0]
+
+//! [1]
+class RenderArea : public QWidget
+{
+    Q_OBJECT
+
+public:
+    RenderArea(QWidget *parent = 0);
+
+    void setOperations(const QList<Operation> &operations);
+    void setShape(const QPainterPath &shape);
+
+    QSize minimumSizeHint() const;
+    QSize sizeHint() const;
+
+protected:
+    void paintEvent(QPaintEvent *event);
+//! [1]
+
+//! [2]
+private:
+    void drawCoordinates(QPainter &painter);
+    void drawOutline(QPainter &painter);
+    void drawShape(QPainter &painter);
+    void transformPainter(QPainter &painter);
+
+    QList<Operation> operations;
+    QPainterPath shape;
+    QRect xBoundingRect;
+    QRect yBoundingRect;
+};
+//! [2]
+
+#endif
diff --git a/examples/painting/transformations/transformations.pro b/examples/painting/transformations/transformations.pro
new file mode 100644
index 0000000000..a8ff61099d
--- /dev/null
+++ b/examples/painting/transformations/transformations.pro
@@ -0,0 +1,11 @@
+HEADERS     = renderarea.h \
+              window.h
+SOURCES     = main.cpp \
+              renderarea.cpp \
+	      window.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/painting/transformations
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS transformations.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/painting/transformations
+INSTALLS += target sources
diff --git a/examples/painting/transformations/window.cpp b/examples/painting/transformations/window.cpp
new file mode 100644
index 0000000000..7d8365418c
--- /dev/null
+++ b/examples/painting/transformations/window.cpp
@@ -0,0 +1,181 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+
+//! [0]
+Window::Window()
+{
+    originalRenderArea = new RenderArea;
+
+    shapeComboBox = new QComboBox;
+    shapeComboBox->addItem(tr("Clock"));
+    shapeComboBox->addItem(tr("House"));
+    shapeComboBox->addItem(tr("Text"));
+    shapeComboBox->addItem(tr("Truck"));
+
+    QGridLayout *layout = new QGridLayout;
+    layout->addWidget(originalRenderArea, 0, 0);
+    layout->addWidget(shapeComboBox, 1, 0);
+//! [0]
+
+//! [1]
+    for (int i = 0; i < NumTransformedAreas; ++i) {
+        transformedRenderAreas[i] = new RenderArea;
+
+        operationComboBoxes[i] = new QComboBox;
+        operationComboBoxes[i]->addItem(tr("No transformation"));
+        operationComboBoxes[i]->addItem(tr("Rotate by 60\xB0"));
+        operationComboBoxes[i]->addItem(tr("Scale to 75%"));
+        operationComboBoxes[i]->addItem(tr("Translate by (50, 50)"));
+
+        connect(operationComboBoxes[i], SIGNAL(activated(int)),
+                this, SLOT(operationChanged()));
+
+        layout->addWidget(transformedRenderAreas[i], 0, i + 1);
+        layout->addWidget(operationComboBoxes[i], 1, i + 1);
+    }
+//! [1]
+
+//! [2]
+    setLayout(layout);
+    setupShapes();
+    shapeSelected(0);
+
+    setWindowTitle(tr("Transformations"));
+}
+//! [2]
+
+//! [3]
+void Window::setupShapes()
+{
+    QPainterPath truck;
+//! [3]
+    truck.setFillRule(Qt::WindingFill);
+    truck.moveTo(0.0, 87.0);
+    truck.lineTo(0.0, 60.0);
+    truck.lineTo(10.0, 60.0);
+    truck.lineTo(35.0, 35.0);
+    truck.lineTo(100.0, 35.0);
+    truck.lineTo(100.0, 87.0);
+    truck.lineTo(0.0, 87.0);
+    truck.moveTo(17.0, 60.0);
+    truck.lineTo(55.0, 60.0);
+    truck.lineTo(55.0, 40.0);
+    truck.lineTo(37.0, 40.0);
+    truck.lineTo(17.0, 60.0);
+    truck.addEllipse(17.0, 75.0, 25.0, 25.0);
+    truck.addEllipse(63.0, 75.0, 25.0, 25.0);
+
+//! [4]
+    QPainterPath clock;
+//! [4]
+    clock.addEllipse(-50.0, -50.0, 100.0, 100.0);
+    clock.addEllipse(-48.0, -48.0, 96.0, 96.0);
+    clock.moveTo(0.0, 0.0);
+    clock.lineTo(-2.0, -2.0);
+    clock.lineTo(0.0, -42.0);
+    clock.lineTo(2.0, -2.0);
+    clock.lineTo(0.0, 0.0);
+    clock.moveTo(0.0, 0.0);
+    clock.lineTo(2.732, -0.732);
+    clock.lineTo(24.495, 14.142);
+    clock.lineTo(0.732, 2.732);
+    clock.lineTo(0.0, 0.0);
+
+//! [5]
+    QPainterPath house;
+//! [5]
+    house.moveTo(-45.0, -20.0);
+    house.lineTo(0.0, -45.0);
+    house.lineTo(45.0, -20.0);
+    house.lineTo(45.0, 45.0);
+    house.lineTo(-45.0, 45.0);
+    house.lineTo(-45.0, -20.0);
+    house.addRect(15.0, 5.0, 20.0, 35.0);
+    house.addRect(-35.0, -15.0, 25.0, 25.0);
+
+//! [6]
+    QPainterPath text;
+//! [6]
+    QFont font;
+    font.setPixelSize(50);
+    QRect fontBoundingRect = QFontMetrics(font).boundingRect(tr("Qt"));
+    text.addText(-QPointF(fontBoundingRect.center()), font, tr("Qt"));
+
+//! [7]
+    shapes.append(clock);
+    shapes.append(house);
+    shapes.append(text);
+    shapes.append(truck);
+
+    connect(shapeComboBox, SIGNAL(activated(int)),
+            this, SLOT(shapeSelected(int)));
+}
+//! [7]
+
+//! [8]
+void Window::operationChanged()
+{
+    static const Operation operationTable[] = {
+        NoTransformation, Rotate, Scale, Translate
+    };
+
+    QList<Operation> operations;
+    for (int i = 0; i < NumTransformedAreas; ++i) {
+        int index = operationComboBoxes[i]->currentIndex();
+        operations.append(operationTable[index]);
+        transformedRenderAreas[i]->setOperations(operations);
+    }
+}
+//! [8]
+
+//! [9]
+void Window::shapeSelected(int index)
+{
+    QPainterPath shape = shapes[index];
+    originalRenderArea->setShape(shape);
+    for (int i = 0; i < NumTransformedAreas; ++i)
+        transformedRenderAreas[i]->setShape(shape);
+}
+//! [9]
diff --git a/examples/painting/transformations/window.h b/examples/painting/transformations/window.h
new file mode 100644
index 0000000000..f4f05d6993
--- /dev/null
+++ b/examples/painting/transformations/window.h
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QList>
+#include <QPainterPath>
+#include <QWidget>
+
+#include "renderarea.h"
+
+QT_BEGIN_NAMESPACE
+class QComboBox;
+QT_END_NAMESPACE
+
+//! [0]
+class Window : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Window();
+
+public slots:
+    void operationChanged();
+    void shapeSelected(int index);
+//! [0]
+
+//! [1]
+private:
+    void setupShapes();
+
+    enum { NumTransformedAreas = 3 };
+    RenderArea *originalRenderArea;
+    RenderArea *transformedRenderAreas[NumTransformedAreas];
+    QComboBox *shapeComboBox;
+    QComboBox *operationComboBoxes[NumTransformedAreas];
+    QList<QPainterPath> shapes;
+};
+//! [1]
+
+#endif
diff --git a/examples/phonon/README b/examples/phonon/README
new file mode 100644
index 0000000000..d0f4462c1f
--- /dev/null
+++ b/examples/phonon/README
@@ -0,0 +1,39 @@
+Qt usese the Phonon cross-platform multimedia framework to play common
+multimedia formats.
+
+Applications can be written to take advantage of the native multimedia
+technologies on each platform via a consistent cross-platform Qt API.
+
+
+Some of the examples in this directory can be run from the example launcher;
+others can only be used from within Qt Designer.
+
+Documentation for these examples can be found via the "Tutorial and Examples"
+link in the main Qt documentation.
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/phonon/capabilities/capabilities.pro b/examples/phonon/capabilities/capabilities.pro
new file mode 100644
index 0000000000..52b6b1bd0d
--- /dev/null
+++ b/examples/phonon/capabilities/capabilities.pro
@@ -0,0 +1,16 @@
+QT      += phonon
+
+HEADERS += window.h
+SOURCES += window.cpp \
+           main.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/phonon/capabilities
+sources.files = $$SOURCES $$HEADERS capabilities.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/phonon/capabilities
+INSTALLS += target sources
+
+wince*{
+DEPLOYMENT_PLUGIN += phonon_ds9 phonon_waveout
+}
+
diff --git a/examples/phonon/capabilities/main.cpp b/examples/phonon/capabilities/main.cpp
new file mode 100644
index 0000000000..a746925f3b
--- /dev/null
+++ b/examples/phonon/capabilities/main.cpp
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+
+//! [everything]
+int main(int argv, char **args)
+{
+    QApplication app(argv, args);
+    app.setApplicationName("Phonon Capabilities Example");
+
+    Window window;
+    window.show();
+
+    return app.exec();
+}
+//! [everything]
+
diff --git a/examples/phonon/capabilities/window.cpp b/examples/phonon/capabilities/window.cpp
new file mode 100644
index 0000000000..920e3e01ab
--- /dev/null
+++ b/examples/phonon/capabilities/window.cpp
@@ -0,0 +1,166 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+
+//! [constructor]
+Window::Window()
+{
+    setupUi();
+    updateWidgets();
+
+    connect(Phonon::BackendCapabilities::notifier(),
+            SIGNAL(capabilitiesChanged()), this, SLOT(updateWidgets()));
+    connect(Phonon::BackendCapabilities::notifier(),
+            SIGNAL(availableAudioOutputDevicesChanged()), SLOT(updateWidgets()));
+}
+//! [constructor]
+
+//! [outputDevices]
+void Window::updateWidgets()
+{
+    devicesListView->setModel(new QStandardItemModel());
+    Phonon::ObjectDescriptionModel<Phonon::AudioOutputDeviceType> *model =
+            new Phonon::ObjectDescriptionModel<Phonon::AudioOutputDeviceType>();
+    model->setModelData(Phonon::BackendCapabilities::availableAudioOutputDevices());
+    devicesListView->setModel(model);
+//! [outputDevices]
+
+//! [mimeTypes]
+    mimeListWidget->clear();
+    QStringList mimeTypes =
+            Phonon::BackendCapabilities::availableMimeTypes();
+    foreach (QString mimeType, mimeTypes) {
+        QListWidgetItem *item = new QListWidgetItem(mimeListWidget);
+        item->setText(mimeType);
+    }
+//! [mimeTypes]
+
+//! [effects]
+    effectsTreeWidget->clear();
+    QList<Phonon::EffectDescription> effects =
+        Phonon::BackendCapabilities::availableAudioEffects();
+    foreach (Phonon::EffectDescription effect, effects) {
+        QTreeWidgetItem *item = new QTreeWidgetItem(effectsTreeWidget);
+        item->setText(0, tr("Effect"));
+        item->setText(1, effect.name());
+        item->setText(2, effect.description());
+//! [effects]
+
+//! [effectsParameters]
+        Phonon::Effect *instance = new Phonon::Effect(effect, this);
+        QList<Phonon::EffectParameter> parameters = instance->parameters();
+        for (int i = 0; i < parameters.size(); ++i) {
+                Phonon::EffectParameter parameter = parameters.at(i);
+
+            QVariant defaultValue = parameter.defaultValue();
+            QVariant minimumValue = parameter.minimumValue();
+            QVariant maximumValue = parameter.maximumValue();
+
+            QString valueString = QString("%1 / %2 / %3")
+                    .arg(defaultValue.toString()).arg(minimumValue.toString())
+                    .arg(maximumValue.toString()); 
+
+            QTreeWidgetItem *parameterItem = new QTreeWidgetItem(item);
+            parameterItem->setText(0, tr("Parameter"));
+            parameterItem->setText(1, parameter.name());
+            parameterItem->setText(2, parameter.description());
+            parameterItem->setText(3, QVariant::typeToName(parameter.type()));
+            parameterItem->setText(4, valueString);
+        }
+    }
+//! [effectsParameters]
+    for (int i = 0; i < effectsTreeWidget->columnCount(); ++i) {
+        if (i == 0)
+            effectsTreeWidget->setColumnWidth(0, 150);
+        else if (i == 2)
+            effectsTreeWidget->setColumnWidth(2, 350);
+        else
+            effectsTreeWidget->resizeColumnToContents(i);
+    }
+}
+
+void Window::setupUi()
+{
+    setupBackendBox();
+
+    QLayout *layout = new QVBoxLayout;
+    layout->addWidget(backendBox);
+
+    setLayout(layout);
+    setWindowTitle(tr("Backend Capabilities Example"));
+}
+
+void Window::setupBackendBox()
+{
+    backendBox = new QGroupBox(tr("Backend Capabilities"));
+
+    devicesLabel = new QLabel(tr("Available Audio Devices:"));
+    devicesListView = new QListView;
+
+    mimeTypesLabel = new QLabel(tr("Supported MIME Types:"));
+    mimeListWidget = new QListWidget;
+
+    effectsLabel = new QLabel(tr("Available Audio Effects:"));
+
+    QStringList headerLabels;
+    headerLabels << tr("Type") << tr("Name") << tr("Description") <<
+                    tr("Value Type") << tr("Default/Min/Max Values");
+
+    effectsTreeWidget = new QTreeWidget;
+    effectsTreeWidget->setHeaderLabels(headerLabels);
+    effectsTreeWidget->setColumnCount(5);
+
+    QGridLayout *layout = new QGridLayout;
+    layout->addWidget(devicesLabel, 0, 0);
+    layout->addWidget(devicesListView, 1, 0);
+    layout->addWidget(mimeTypesLabel, 0, 1);
+    layout->addWidget(mimeListWidget, 1, 1);
+    layout->addWidget(effectsLabel, 2, 0);
+    layout->addWidget(effectsTreeWidget, 3, 0, 2, 2);
+    layout->setRowStretch(3, 100);
+
+    backendBox = new QGroupBox(tr("Backend Capabilities"));
+    backendBox->setLayout(layout);
+}
+
diff --git a/examples/phonon/capabilities/window.h b/examples/phonon/capabilities/window.h
new file mode 100644
index 0000000000..23121d3084
--- /dev/null
+++ b/examples/phonon/capabilities/window.h
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QWidget>
+
+#include <Phonon/AudioOutput>
+#include <Phonon/SeekSlider>
+#include <Phonon/MediaObject>
+#include <Phonon/VolumeSlider>
+#include <Phonon/BackendCapabilities>
+#include <Phonon/Effect>
+#include <Phonon/EffectParameter>
+#include <Phonon/ObjectDescriptionModel>
+#include <QList>
+
+QT_BEGIN_NAMESPACE
+class QAction;
+class QGroupBox;
+class QPushButton;
+class QLabel;
+class QListWidget;
+class QListView;
+class QTextEdit;
+class QTreeWidget;
+QT_END_NAMESPACE
+
+
+class Window : public QWidget
+{
+    Q_OBJECT
+
+public:
+        Window();
+
+//! [windowMembers]
+private slots:
+    void updateWidgets();
+
+private:
+    void setupUi();
+    void setupBackendBox();
+
+    QGroupBox *backendBox;
+
+    QLabel *devicesLabel;
+    QLabel *mimeTypesLabel;
+    QLabel *effectsLabel;
+
+    QListWidget *mimeListWidget;
+    QListView *devicesListView;
+    QTreeWidget *effectsTreeWidget;
+//! [windowMembers]
+};
+
+#endif
+
diff --git a/examples/phonon/musicplayer/main.cpp b/examples/phonon/musicplayer/main.cpp
new file mode 100644
index 0000000000..4a614c8c98
--- /dev/null
+++ b/examples/phonon/musicplayer/main.cpp
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtGui>
+
+#include "mainwindow.h"
+
+//![1]
+int main(int argv, char **args)
+{
+    QApplication app(argv, args);
+    app.setApplicationName("Music Player");
+    app.setQuitOnLastWindowClosed(true);
+
+    MainWindow window;
+    window.show();
+
+    return app.exec(); 
+}
+//![1]
diff --git a/examples/phonon/musicplayer/mainwindow.cpp b/examples/phonon/musicplayer/mainwindow.cpp
new file mode 100644
index 0000000000..f50a2bddc4
--- /dev/null
+++ b/examples/phonon/musicplayer/mainwindow.cpp
@@ -0,0 +1,352 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+***************************************************************************/
+
+#include <QtGui>
+
+#include "mainwindow.h"
+
+//![0]
+MainWindow::MainWindow()
+{
+    audioOutput = new Phonon::AudioOutput(Phonon::MusicCategory, this);
+    mediaObject = new Phonon::MediaObject(this);
+    metaInformationResolver = new Phonon::MediaObject(this);
+
+    mediaObject->setTickInterval(1000);
+//![0]
+//![2]
+    connect(mediaObject, SIGNAL(tick(qint64)), this, SLOT(tick(qint64)));
+    connect(mediaObject, SIGNAL(stateChanged(Phonon::State, Phonon::State)),
+            this, SLOT(stateChanged(Phonon::State, Phonon::State)));
+    connect(metaInformationResolver, SIGNAL(stateChanged(Phonon::State,Phonon::State)),
+            this, SLOT(metaStateChanged(Phonon::State, Phonon::State)));
+    connect(mediaObject, SIGNAL(currentSourceChanged(const Phonon::MediaSource &)),
+            this, SLOT(sourceChanged(const Phonon::MediaSource &)));
+    connect(mediaObject, SIGNAL(aboutToFinish()), this, SLOT(aboutToFinish()));
+//![2]
+
+//![1]
+    Phonon::createPath(mediaObject, audioOutput);
+//![1]
+
+    setupActions();
+    setupMenus();
+    setupUi();
+    timeLcd->display("00:00"); 
+}
+
+//![6]
+void MainWindow::addFiles()
+{
+    QStringList files = QFileDialog::getOpenFileNames(this, tr("Select Music Files"), 
+        QDesktopServices::storageLocation(QDesktopServices::MusicLocation));
+
+    if (files.isEmpty())
+        return;
+
+    int index = sources.size();
+    foreach (QString string, files) {
+            Phonon::MediaSource source(string);
+        
+        sources.append(source);
+    } 
+    if (!sources.isEmpty())
+        metaInformationResolver->setCurrentSource(sources.at(index));
+
+}
+//![6]
+
+void MainWindow::about()
+{
+    QMessageBox::information(this, tr("About Music Player"),
+        tr("The Music Player example shows how to use Phonon - the multimedia"
+           " framework that comes with Qt - to create a simple music player."));
+}
+
+//![9]
+void MainWindow::stateChanged(Phonon::State newState, Phonon::State /* oldState */)
+{
+    switch (newState) {
+        case Phonon::ErrorState:
+            if (mediaObject->errorType() == Phonon::FatalError) {
+                QMessageBox::warning(this, tr("Fatal Error"),
+                mediaObject->errorString());
+            } else {
+                QMessageBox::warning(this, tr("Error"),
+                mediaObject->errorString());
+            }
+            break;
+//![9]
+//![10]
+        case Phonon::PlayingState:
+                playAction->setEnabled(false);
+                pauseAction->setEnabled(true);
+                stopAction->setEnabled(true);
+                break;
+        case Phonon::StoppedState:
+                stopAction->setEnabled(false);
+                playAction->setEnabled(true);
+                pauseAction->setEnabled(false);
+                timeLcd->display("00:00");
+                break;
+        case Phonon::PausedState:
+                pauseAction->setEnabled(false);
+                stopAction->setEnabled(true);
+                playAction->setEnabled(true);
+                break;
+//![10]
+        case Phonon::BufferingState:
+                break;
+        default:
+            ;
+    }
+}
+
+//![11]
+void MainWindow::tick(qint64 time)
+{
+    QTime displayTime(0, (time / 60000) % 60, (time / 1000) % 60);
+
+    timeLcd->display(displayTime.toString("mm:ss"));
+}
+//![11]
+
+//![12]
+void MainWindow::tableClicked(int row, int /* column */)
+{
+    bool wasPlaying = mediaObject->state() == Phonon::PlayingState;
+
+    mediaObject->stop();
+    mediaObject->clearQueue();
+
+    mediaObject->setCurrentSource(sources[row]);
+
+    if (wasPlaying) 
+        mediaObject->play();
+    else
+        mediaObject->stop();
+}
+//![12]
+
+//![13]
+void MainWindow::sourceChanged(const Phonon::MediaSource &source)
+{
+    musicTable->selectRow(sources.indexOf(source));
+    timeLcd->display("00:00");
+}
+//![13]
+
+//![14]
+void MainWindow::metaStateChanged(Phonon::State newState, Phonon::State /* oldState */)
+{
+    if (newState == Phonon::ErrorState) {
+        QMessageBox::warning(this, tr("Error opening files"),
+            metaInformationResolver->errorString());
+        while (!sources.isEmpty() &&
+               !(sources.takeLast() == metaInformationResolver->currentSource()));
+        return;
+    }
+
+    if (newState != Phonon::StoppedState && newState != Phonon::PausedState)
+        return;
+
+    if (metaInformationResolver->currentSource().type() == Phonon::MediaSource::Invalid)
+            return;
+
+    QMap<QString, QString> metaData = metaInformationResolver->metaData();
+
+    QString title = metaData.value("TITLE");
+    if (title == "")
+        title = metaInformationResolver->currentSource().fileName();
+
+    QTableWidgetItem *titleItem = new QTableWidgetItem(title);
+    titleItem->setFlags(titleItem->flags() ^ Qt::ItemIsEditable);
+    QTableWidgetItem *artistItem = new QTableWidgetItem(metaData.value("ARTIST"));
+    artistItem->setFlags(artistItem->flags() ^ Qt::ItemIsEditable);
+    QTableWidgetItem *albumItem = new QTableWidgetItem(metaData.value("ALBUM"));
+    albumItem->setFlags(albumItem->flags() ^ Qt::ItemIsEditable);
+    QTableWidgetItem *yearItem = new QTableWidgetItem(metaData.value("DATE"));
+    yearItem->setFlags(yearItem->flags() ^ Qt::ItemIsEditable);
+//![14]
+
+    int currentRow = musicTable->rowCount();
+    musicTable->insertRow(currentRow);
+    musicTable->setItem(currentRow, 0, titleItem);
+    musicTable->setItem(currentRow, 1, artistItem);
+    musicTable->setItem(currentRow, 2, albumItem);
+    musicTable->setItem(currentRow, 3, yearItem);
+
+//![15]
+    if (musicTable->selectedItems().isEmpty()) {
+        musicTable->selectRow(0);
+        mediaObject->setCurrentSource(metaInformationResolver->currentSource());
+    }
+
+    Phonon::MediaSource source = metaInformationResolver->currentSource();
+    int index = sources.indexOf(metaInformationResolver->currentSource()) + 1;
+    if (sources.size() > index) {
+        metaInformationResolver->setCurrentSource(sources.at(index));
+    }
+    else {
+        musicTable->resizeColumnsToContents();
+        if (musicTable->columnWidth(0) > 300)
+            musicTable->setColumnWidth(0, 300);
+    }
+}
+//![15]
+
+//![16]
+void MainWindow::aboutToFinish()
+{
+    int index = sources.indexOf(mediaObject->currentSource()) + 1;
+    if (sources.size() > index) {
+        mediaObject->enqueue(sources.at(index));
+    }
+}
+//![16]
+
+void MainWindow::setupActions()
+{
+    playAction = new QAction(style()->standardIcon(QStyle::SP_MediaPlay), tr("Play"), this);
+    playAction->setShortcut(tr("Crl+P"));
+    playAction->setDisabled(true);
+    pauseAction = new QAction(style()->standardIcon(QStyle::SP_MediaPause), tr("Pause"), this);
+    pauseAction->setShortcut(tr("Ctrl+A"));
+    pauseAction->setDisabled(true);
+    stopAction = new QAction(style()->standardIcon(QStyle::SP_MediaStop), tr("Stop"), this);
+    stopAction->setShortcut(tr("Ctrl+S"));
+    stopAction->setDisabled(true);
+    nextAction = new QAction(style()->standardIcon(QStyle::SP_MediaSkipForward), tr("Next"), this);
+    nextAction->setShortcut(tr("Ctrl+N"));
+    previousAction = new QAction(style()->standardIcon(QStyle::SP_MediaSkipBackward), tr("Previous"), this);
+    previousAction->setShortcut(tr("Ctrl+R"));
+    addFilesAction = new QAction(tr("Add &Files"), this);
+    addFilesAction->setShortcut(tr("Ctrl+F"));
+    exitAction = new QAction(tr("E&xit"), this);
+    exitAction->setShortcut(tr("Ctrl+X"));
+    aboutAction = new QAction(tr("A&bout"), this);
+    aboutAction->setShortcut(tr("Ctrl+B"));
+    aboutQtAction = new QAction(tr("About &Qt"), this);
+    aboutQtAction->setShortcut(tr("Ctrl+Q"));
+
+//![5]
+    connect(playAction, SIGNAL(triggered()), mediaObject, SLOT(play()));
+    connect(pauseAction, SIGNAL(triggered()), mediaObject, SLOT(pause()) );
+    connect(stopAction, SIGNAL(triggered()), mediaObject, SLOT(stop()));
+//![5]
+    connect(addFilesAction, SIGNAL(triggered()), this, SLOT(addFiles()));
+    connect(exitAction, SIGNAL(triggered()), this, SLOT(close()));
+    connect(aboutAction, SIGNAL(triggered()), this, SLOT(about()));
+    connect(aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+}
+
+void MainWindow::setupMenus()
+{
+    QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
+    fileMenu->addAction(addFilesAction);
+    fileMenu->addSeparator();
+    fileMenu->addAction(exitAction);
+
+    QMenu *aboutMenu = menuBar()->addMenu(tr("&Help"));
+    aboutMenu->addAction(aboutAction);
+    aboutMenu->addAction(aboutQtAction);
+}
+
+//![3]
+void MainWindow::setupUi()
+{
+//![3]
+    QToolBar *bar = new QToolBar;
+
+    bar->addAction(playAction);
+    bar->addAction(pauseAction);
+    bar->addAction(stopAction);
+    
+//![4]
+    seekSlider = new Phonon::SeekSlider(this);
+    seekSlider->setMediaObject(mediaObject);
+
+    volumeSlider = new Phonon::VolumeSlider(this);
+    volumeSlider->setAudioOutput(audioOutput);
+//![4]
+    volumeSlider->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+
+    QLabel *volumeLabel = new QLabel;
+    volumeLabel->setPixmap(QPixmap("images/volume.png"));
+
+    QPalette palette;
+    palette.setBrush(QPalette::Light, Qt::darkGray);
+
+    timeLcd = new QLCDNumber;
+    timeLcd->setPalette(palette);
+
+    QStringList headers;
+    headers << tr("Title") << tr("Artist") << tr("Album") << tr("Year");
+
+    musicTable = new QTableWidget(0, 4);
+    musicTable->setHorizontalHeaderLabels(headers);
+    musicTable->setSelectionMode(QAbstractItemView::SingleSelection);
+    musicTable->setSelectionBehavior(QAbstractItemView::SelectRows);
+    connect(musicTable, SIGNAL(cellPressed(int, int)),
+            this, SLOT(tableClicked(int, int)));
+
+    QHBoxLayout *seekerLayout = new QHBoxLayout;
+    seekerLayout->addWidget(seekSlider);
+    seekerLayout->addWidget(timeLcd);
+
+    QHBoxLayout *playbackLayout = new QHBoxLayout;
+    playbackLayout->addWidget(bar);
+    playbackLayout->addStretch();
+    playbackLayout->addWidget(volumeLabel);
+    playbackLayout->addWidget(volumeSlider);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(musicTable);
+    mainLayout->addLayout(seekerLayout);
+    mainLayout->addLayout(playbackLayout);
+
+    QWidget *widget = new QWidget;
+    widget->setLayout(mainLayout);
+
+    setCentralWidget(widget);
+    setWindowTitle("Phonon Music Player");
+}
+
diff --git a/examples/phonon/musicplayer/mainwindow.h b/examples/phonon/musicplayer/mainwindow.h
new file mode 100644
index 0000000000..2d4e2977fd
--- /dev/null
+++ b/examples/phonon/musicplayer/mainwindow.h
@@ -0,0 +1,112 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include <Phonon/AudioOutput>
+#include <Phonon/SeekSlider>
+#include <Phonon/MediaObject>
+#include <Phonon/VolumeSlider>
+#include <Phonon/BackendCapabilities>
+#include <QList>
+
+QT_BEGIN_NAMESPACE
+class QAction;
+class QTableWidget;
+class QLCDNumber;
+QT_END_NAMESPACE
+
+//![0]
+
+class MainWindow : public QMainWindow
+{
+//![0]
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+    QSize sizeHint() const {
+        return QSize(500, 300);
+    }
+
+private slots:
+    void addFiles();
+    void about();
+//![1]
+    void stateChanged(Phonon::State newState, Phonon::State oldState);
+    void tick(qint64 time);
+    void sourceChanged(const Phonon::MediaSource &source);
+    void metaStateChanged(Phonon::State newState, Phonon::State oldState);
+    void aboutToFinish();
+    void tableClicked(int row, int column);
+//![1]
+
+private:
+    void setupActions();
+    void setupMenus();
+    void setupUi();    
+
+//![2]
+    Phonon::SeekSlider *seekSlider;
+    Phonon::MediaObject *mediaObject;
+    Phonon::MediaObject *metaInformationResolver;
+    Phonon::AudioOutput *audioOutput;
+    Phonon::VolumeSlider *volumeSlider;
+    QList<Phonon::MediaSource> sources;
+//![2]
+
+    QAction *playAction;
+    QAction *pauseAction;
+    QAction *stopAction;
+    QAction *nextAction;
+    QAction *previousAction;
+    QAction *addFilesAction;
+    QAction *exitAction;
+    QAction *aboutAction;
+    QAction *aboutQtAction;
+    QLCDNumber *timeLcd;
+    QTableWidget *musicTable;
+};
+
+#endif
diff --git a/examples/phonon/musicplayer/musicplayer.pro b/examples/phonon/musicplayer/musicplayer.pro
new file mode 100644
index 0000000000..0a93dc26aa
--- /dev/null
+++ b/examples/phonon/musicplayer/musicplayer.pro
@@ -0,0 +1,16 @@
+QT        += phonon
+
+HEADERS   += mainwindow.h
+SOURCES   += main.cpp \
+             mainwindow.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/phonon/musicplayer
+sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png images
+sources.path = $$[QT_INSTALL_EXAMPLES]/phonon/musicplayer
+INSTALLS += target sources
+
+wince*{
+DEPLOYMENT_PLUGIN += phonon_ds9 phonon_waveout
+}
+
diff --git a/examples/phonon/phonon.pro b/examples/phonon/phonon.pro
new file mode 100644
index 0000000000..0dea7669aa
--- /dev/null
+++ b/examples/phonon/phonon.pro
@@ -0,0 +1,10 @@
+TEMPLATE      = subdirs
+CONFIG       += ordered
+SUBDIRS       = musicplayer \
+                capabilities
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/phonon
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS phonon.pro README
+sources.path = $$[QT_INSTALL_EXAMPLES]/phonon
+INSTALLS += target sources
diff --git a/examples/qmake/precompile/main.cpp b/examples/qmake/precompile/main.cpp
new file mode 100644
index 0000000000..28eb25ea24
--- /dev/null
+++ b/examples/qmake/precompile/main.cpp
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#include <QApplication>
+#include <QPushButton>
+#include <QLabel>
+#include "myobject.h"
+#include "mydialog.h"
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    MyObject obj;
+    MyDialog dialog;
+
+    dialog.connect(dialog.aButton, SIGNAL(clicked()), SLOT(close()));
+    dialog.show();
+
+    return app.exec();
+}
+//! [0]
diff --git a/examples/qmake/precompile/mydialog.cpp b/examples/qmake/precompile/mydialog.cpp
new file mode 100644
index 0000000000..544a94beec
--- /dev/null
+++ b/examples/qmake/precompile/mydialog.cpp
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mydialog.h"
+
+MyDialog::MyDialog(QWidget *parent)
+    : QDialog(parent)
+{
+    setupUi(this);
+}
diff --git a/examples/qmake/precompile/mydialog.h b/examples/qmake/precompile/mydialog.h
new file mode 100644
index 0000000000..948afc22ec
--- /dev/null
+++ b/examples/qmake/precompile/mydialog.h
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MYDIALOG_H
+#define MYDIALOG_H
+
+#include "ui_mydialog.h"
+
+class MyDialog : public QDialog, public Ui::MyDialog
+{
+    Q_OBJECT
+
+public:
+    MyDialog(QWidget *parent = 0);
+};
+
+#endif
diff --git a/examples/qmake/precompile/mydialog.ui b/examples/qmake/precompile/mydialog.ui
new file mode 100644
index 0000000000..d765b30760
--- /dev/null
+++ b/examples/qmake/precompile/mydialog.ui
@@ -0,0 +1,47 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>MyDialog</class>
+ <widget class="QDialog" name="MyDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>401</width>
+    <height>70</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Mach 2!</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="aLabel" >
+     <property name="text" >
+      <string>Join the life in the fastlane; - PCH enable your project today! -</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="aButton" >
+     <property name="text" >
+      <string>&amp;Quit</string>
+     </property>
+     <property name="shortcut" >
+      <string>Alt+Q</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/examples/qmake/precompile/myobject.cpp b/examples/qmake/precompile/myobject.cpp
new file mode 100644
index 0000000000..5d399eb79e
--- /dev/null
+++ b/examples/qmake/precompile/myobject.cpp
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#include <iostream>
+#include <QDebug>
+#include <QObject>
+#include "myobject.h"
+
+MyObject::MyObject()
+    : QObject()
+{
+    std::cout << "MyObject::MyObject()\n";
+}
+//! [0]
+
+MyObject::~MyObject()
+{
+    qDebug() << "MyObject::~MyObject()";
+}
diff --git a/examples/qmake/precompile/myobject.h b/examples/qmake/precompile/myobject.h
new file mode 100644
index 0000000000..90fb59d90c
--- /dev/null
+++ b/examples/qmake/precompile/myobject.h
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MYOBJECT_H
+#define MYOBJECT_H
+
+//! [0]
+#include <QObject>
+
+class MyObject : public QObject
+{
+public:
+    MyObject();
+    ~MyObject();
+};
+//! [0]
+
+#endif
diff --git a/examples/qmake/precompile/precompile.pro b/examples/qmake/precompile/precompile.pro
new file mode 100644
index 0000000000..6360f06f07
--- /dev/null
+++ b/examples/qmake/precompile/precompile.pro
@@ -0,0 +1,22 @@
+#############################################
+#
+# Example for using Precompiled Headers
+#
+#############################################
+#! [0]
+TEMPLATE  = app
+LANGUAGE  = C++
+CONFIG	 += console precompile_header
+
+# Use Precompiled headers (PCH)
+PRECOMPILED_HEADER  = stable.h
+
+HEADERS	  = stable.h \
+            mydialog.h \
+            myobject.h
+SOURCES	  = main.cpp \
+            mydialog.cpp \
+            myobject.cpp \
+            util.cpp
+FORMS     = mydialog.ui
+#! [0]
diff --git a/examples/qmake/precompile/stable.h b/examples/qmake/precompile/stable.h
new file mode 100644
index 0000000000..3eaaea9add
--- /dev/null
+++ b/examples/qmake/precompile/stable.h
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+/* Add C includes here */
+
+#if defined __cplusplus
+/* Add C++ includes here */
+
+# include <iostream>
+# include <QApplication>
+# include <QPushButton>
+# include <QLabel>
+#endif
+//! [0]
diff --git a/examples/qmake/precompile/util.cpp b/examples/qmake/precompile/util.cpp
new file mode 100644
index 0000000000..c36125857f
--- /dev/null
+++ b/examples/qmake/precompile/util.cpp
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+void util_function_does_nothing()
+{
+    // Nothing here...
+    int x = 0;
+    ++x;
+}
+//! [0]
+
diff --git a/examples/qmake/tutorial/hello.cpp b/examples/qmake/tutorial/hello.cpp
new file mode 100644
index 0000000000..9edc2afeb3
--- /dev/null
+++ b/examples/qmake/tutorial/hello.cpp
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QDebug>
+#include "hello.h"
+
+MyPushButton::MyPushButton(const QString &text)
+    : QPushButton(text)
+{
+    setObjectName("mypushbutton");
+    qDebug() << "My PushButton has been constructed";
+}
diff --git a/examples/qmake/tutorial/hello.h b/examples/qmake/tutorial/hello.h
new file mode 100644
index 0000000000..9e73e47f17
--- /dev/null
+++ b/examples/qmake/tutorial/hello.h
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QPushButton>
+
+class MyPushButton : public QPushButton
+{
+public:
+    MyPushButton(const QString &text);
+};
diff --git a/examples/qmake/tutorial/hellounix.cpp b/examples/qmake/tutorial/hellounix.cpp
new file mode 100644
index 0000000000..0fbeffd4d6
--- /dev/null
+++ b/examples/qmake/tutorial/hellounix.cpp
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// This file does nothing, but check your Makefile to see if there is a
+// reference to hello_win.cpp - there shouldn't be if qmake is used on X11.
diff --git a/examples/qmake/tutorial/hellowin.cpp b/examples/qmake/tutorial/hellowin.cpp
new file mode 100644
index 0000000000..2e966daeb6
--- /dev/null
+++ b/examples/qmake/tutorial/hellowin.cpp
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// This file does nothing, but check your Makefile to see if there is a
+// reference to hello_x11.cpp - there shouldn't be if qmake is used on Windows.
diff --git a/examples/qmake/tutorial/main.cpp b/examples/qmake/tutorial/main.cpp
new file mode 100644
index 0000000000..e0452e267a
--- /dev/null
+++ b/examples/qmake/tutorial/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include "hello.h"
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    MyPushButton helloButton("Hello world!");
+    helloButton.resize(100, 30);
+
+    helloButton.show();
+    return app.exec();
+}
diff --git a/examples/qtconcurrent/README b/examples/qtconcurrent/README
new file mode 100644
index 0000000000..af659af2cc
--- /dev/null
+++ b/examples/qtconcurrent/README
@@ -0,0 +1,38 @@
+Qt 4 extends Qt's support for multithreaded applications with an API for
+concurrent programming which includes implementations of the well-known
+map-reduce and filter-reduce algorithms.
+
+
+The example launcher provided with Qt can be used to explore each of the
+examples in this directory.
+
+Documentation for these examples can be found via the Tutorial and Examples
+link in the main Qt documentation.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/qtconcurrent/imagescaling/imagescaling.cpp b/examples/qtconcurrent/imagescaling/imagescaling.cpp
new file mode 100644
index 0000000000..d69adaacf5
--- /dev/null
+++ b/examples/qtconcurrent/imagescaling/imagescaling.cpp
@@ -0,0 +1,147 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "imagescaling.h"
+#include "math.h"
+
+#ifndef QT_NO_CONCURRENT
+
+const int imageSize = 100;
+
+QImage scale(const QString &imageFileName)
+{
+    QImage image(imageFileName);
+    return image.scaled(QSize(imageSize, imageSize), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+}
+
+Images::Images(QWidget *parent) 
+: QWidget(parent)
+{
+    setWindowTitle(tr("Image loading and scaling example"));
+    resize(800, 600);
+
+    imageScaling = new QFutureWatcher<QImage>(this);
+    connect(imageScaling, SIGNAL(resultReadyAt(int)), SLOT(showImage(int)));
+    connect(imageScaling, SIGNAL(finished()), SLOT(finished()));
+
+    openButton = new QPushButton(tr("Open Images"));
+    connect(openButton, SIGNAL(clicked()), SLOT(open()));
+
+    cancelButton = new QPushButton(tr("Cancel"));
+    cancelButton->setEnabled(false);
+    connect(cancelButton, SIGNAL(clicked()), imageScaling, SLOT(cancel()));
+   
+    pauseButton = new QPushButton(tr("Pause/Resume"));
+    pauseButton->setEnabled(false);
+    connect(pauseButton, SIGNAL(clicked()), imageScaling, SLOT(togglePaused()));
+   
+    QHBoxLayout *buttonLayout = new QHBoxLayout();
+    buttonLayout->addWidget(openButton);
+    buttonLayout->addWidget(cancelButton);
+    buttonLayout->addWidget(pauseButton);
+    buttonLayout->addStretch();
+
+    imagesLayout = new QGridLayout();
+
+    mainLayout = new QVBoxLayout();
+    mainLayout->addLayout(buttonLayout);
+    mainLayout->addLayout(imagesLayout);
+    mainLayout->addStretch();
+    setLayout(mainLayout);
+}
+
+Images::~Images()
+{
+    imageScaling->cancel();
+    imageScaling->waitForFinished();
+}
+
+void Images::open()
+{
+    // Cancel and wait if we are already loading images.
+    if (imageScaling->isRunning()) {
+        imageScaling->cancel();
+        imageScaling->waitForFinished();
+    }
+
+    // Show a file open dialog at QDesktopServices::PicturesLocation.
+    QStringList files = QFileDialog::getOpenFileNames(this, tr("Select Images"), 
+                            QDesktopServices::storageLocation(QDesktopServices::PicturesLocation),
+                            "*.jpg *.png");
+
+    if (files.count() == 0)
+        return;
+
+    // Do a simple layout.
+    qDeleteAll(labels);
+    labels.clear();
+
+    int dim = sqrt(qreal(files.count())) + 1;
+    for (int i = 0; i < dim; ++i) {
+        for (int j = 0; j < dim; ++j) {
+            QLabel *imageLabel = new QLabel;
+            imageLabel->setFixedSize(imageSize,imageSize);
+            imagesLayout->addWidget(imageLabel,i,j);
+            labels.append(imageLabel);
+        }
+    }
+
+    // Use mapped to run the thread safe scale function on the files.
+    imageScaling->setFuture(QtConcurrent::mapped(files, scale));
+
+    openButton->setEnabled(false);
+    cancelButton->setEnabled(true);
+    pauseButton->setEnabled(true);
+}
+
+void Images::showImage(int num)
+{
+    labels[num]->setPixmap(QPixmap::fromImage(imageScaling->resultAt(num)));
+}
+
+void Images::finished()
+{
+    openButton->setEnabled(true);
+    cancelButton->setEnabled(false);
+    pauseButton->setEnabled(false);
+}
+
+#endif // QT_NO_CONCURRENT
+
diff --git a/examples/qtconcurrent/imagescaling/imagescaling.h b/examples/qtconcurrent/imagescaling/imagescaling.h
new file mode 100644
index 0000000000..46dccf577f
--- /dev/null
+++ b/examples/qtconcurrent/imagescaling/imagescaling.h
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef IMAGESCALING_H
+#define IMAGESCALING_H
+
+#include <QtGui>
+
+#ifndef QT_NO_CONCURRENT
+
+class Images : public QWidget
+{
+Q_OBJECT
+public:
+    Images(QWidget *parent = 0);
+    ~Images();
+public Q_SLOTS:
+    void open();
+    void showImage(int num);
+    void finished();
+private:
+    QPushButton *openButton;
+    QPushButton *cancelButton;
+    QPushButton *pauseButton;
+    QVBoxLayout *mainLayout;
+    QList<QLabel *> labels;
+    QGridLayout *imagesLayout;
+    QFutureWatcher<QImage> *imageScaling;
+};
+
+#else
+
+// Dummy class required because QT_NO_CONCURRENT is not set when moc is run.
+class Images : public QWidget
+{
+Q_OBJECT
+public Q_SLOTS:
+    void open() {}
+    void showImage(int) {}
+    void finished() {}
+};
+
+#endif // QT_NO_CONCURRENT
+
+#endif // IMAGESCALING_H
diff --git a/examples/qtconcurrent/imagescaling/imagescaling.pro b/examples/qtconcurrent/imagescaling/imagescaling.pro
new file mode 100644
index 0000000000..fbf864ab7b
--- /dev/null
+++ b/examples/qtconcurrent/imagescaling/imagescaling.pro
@@ -0,0 +1,13 @@
+TEMPLATE = app
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += main.cpp imagescaling.cpp
+HEADERS += imagescaling.h
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/imagescaling
+sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/imagescaling
+INSTALLS += target sources
diff --git a/examples/qtconcurrent/imagescaling/main.cpp b/examples/qtconcurrent/imagescaling/main.cpp
new file mode 100644
index 0000000000..c0bf9cec00
--- /dev/null
+++ b/examples/qtconcurrent/imagescaling/main.cpp
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtGui>
+
+#ifndef QT_NO_CONCURRENT
+
+#include "imagescaling.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc,argv);
+
+    Images imageView;
+    imageView.show();
+
+    return app.exec();
+}
+
+#else
+
+int main()
+{
+    qDebug() << "Qt Concurrent is not supported on this platform";
+}
+
+#endif
diff --git a/examples/qtconcurrent/map/main.cpp b/examples/qtconcurrent/map/main.cpp
new file mode 100644
index 0000000000..35b484da32
--- /dev/null
+++ b/examples/qtconcurrent/map/main.cpp
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QImage>
+#include <QList>
+#include <QThread>
+#include <QDebug>
+#include <QApplication>
+#include <qtconcurrentmap.h>
+
+#ifndef QT_NO_CONCURRENT
+
+QImage scale(const QImage &image)
+{
+    qDebug() << "Scaling image in thread" << QThread::currentThread();
+    return image.scaled(QSize(100, 100), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    const int imageCount = 20;
+
+    // Create a list containing imageCount images.
+    QList<QImage> images;
+    for (int i = 0; i < imageCount; ++i)
+        images.append(QImage(1600, 1200, QImage::Format_ARGB32_Premultiplied));
+
+    // Use QtConcurrentBlocking::mapped to apply the scale function to all the
+    // images in the list.
+    QList<QImage> thumbnails = QtConcurrent::blockingMapped(images, scale);
+
+    return 0;
+}
+
+#else
+
+int main()
+{
+	qDebug() << "Qt Concurrent is not yet supported on this platform";
+}
+
+#endif
diff --git a/examples/qtconcurrent/map/map.pro b/examples/qtconcurrent/map/map.pro
new file mode 100644
index 0000000000..f20267bc3b
--- /dev/null
+++ b/examples/qtconcurrent/map/map.pro
@@ -0,0 +1,14 @@
+TEMPLATE = app
+TARGET = mapdemo
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += main.cpp
+CONFIG += console
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/map
+sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/map
+INSTALLS += target sources
diff --git a/examples/qtconcurrent/progressdialog/main.cpp b/examples/qtconcurrent/progressdialog/main.cpp
new file mode 100644
index 0000000000..249fbc1ee7
--- /dev/null
+++ b/examples/qtconcurrent/progressdialog/main.cpp
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#ifndef QT_NO_CONCURRENT
+
+using namespace QtConcurrent;
+
+const int iterations = 20;
+
+void spin(int &iteration)
+{
+    const int work = 1000 * 1000 * 40;
+    volatile int v = 0;
+    for (int j = 0; j < work; ++j)
+        ++v;
+
+    qDebug() << "iteration" << iteration << "in thread" << QThread::currentThreadId();
+}
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    // Prepare the vector.
+    QVector<int> vector;
+    for (int i = 0; i < iterations; ++i)
+        vector.append(i);
+
+    // Create a progress dialog.
+    QProgressDialog dialog;
+    dialog.setLabelText(QString("Progressing using %1 thread(s)...").arg(QThread::idealThreadCount()));
+ 
+    // Create a QFutureWatcher and conncect signals and slots.
+    QFutureWatcher<void> futureWatcher;
+    QObject::connect(&futureWatcher, SIGNAL(finished()), &dialog, SLOT(reset()));
+    QObject::connect(&dialog, SIGNAL(canceled()), &futureWatcher, SLOT(cancel()));
+    QObject::connect(&futureWatcher, SIGNAL(progressRangeChanged(int, int)), &dialog, SLOT(setRange(int, int)));
+    QObject::connect(&futureWatcher, SIGNAL(progressValueChanged(int)), &dialog, SLOT(setValue(int)));
+
+    // Start the computation.
+    futureWatcher.setFuture(QtConcurrent::map(vector, spin));
+
+    // Display the dialog and start the event loop.
+    dialog.exec();
+    
+    futureWatcher.waitForFinished();
+
+    // Query the future to check if was canceled.
+    qDebug() << "Canceled?" << futureWatcher.future().isCanceled();
+}
+
+#else
+
+int main()
+{
+	qDebug() << "Qt Concurrent is not yet supported on this platform";
+}
+
+#endif
+
diff --git a/examples/qtconcurrent/progressdialog/progressdialog.pro b/examples/qtconcurrent/progressdialog/progressdialog.pro
new file mode 100644
index 0000000000..12ba0bf386
--- /dev/null
+++ b/examples/qtconcurrent/progressdialog/progressdialog.pro
@@ -0,0 +1,14 @@
+TEMPLATE = app
+TARGET += 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += main.cpp
+CONFIG += console
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/progressdialog
+sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/progressdialog
+INSTALLS += target sources
diff --git a/examples/qtconcurrent/qtconcurrent.pro b/examples/qtconcurrent/qtconcurrent.pro
new file mode 100644
index 0000000000..53008f0595
--- /dev/null
+++ b/examples/qtconcurrent/qtconcurrent.pro
@@ -0,0 +1,12 @@
+TEMPLATE      = subdirs
+SUBDIRS       = imagescaling \
+                map \
+                progressdialog \
+                runfunction \
+                wordcount
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtconcurrent.pro README
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent
+INSTALLS += target sources
diff --git a/examples/qtconcurrent/runfunction/main.cpp b/examples/qtconcurrent/runfunction/main.cpp
new file mode 100644
index 0000000000..c758f83cd8
--- /dev/null
+++ b/examples/qtconcurrent/runfunction/main.cpp
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QDebug>
+#include <QThread>
+#include <QString>
+#include <qtconcurrentrun.h>
+#include <QApplication>
+
+#ifndef QT_NO_CONCURRENT
+
+using namespace QtConcurrent;
+
+void hello(QString name)
+{
+    qDebug() << "Hello" << name << "from" << QThread::currentThread();
+}
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    QFuture<void> f1 = run(hello, QString("Alice"));
+    QFuture<void> f2 = run(hello, QString("Bob"));
+    f1.waitForFinished();
+    f2.waitForFinished();
+}
+
+#else
+
+int main()
+{
+	qDebug() << "Qt Concurrent is not yet supported on this platform";
+}
+
+#endif
diff --git a/examples/qtconcurrent/runfunction/runfunction.pro b/examples/qtconcurrent/runfunction/runfunction.pro
new file mode 100644
index 0000000000..90344766c7
--- /dev/null
+++ b/examples/qtconcurrent/runfunction/runfunction.pro
@@ -0,0 +1,14 @@
+TEMPLATE = app
+TARGET += 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += main.cpp
+CONFIG += console
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/runfunction
+sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/runfunction
+INSTALLS += target sources
diff --git a/examples/qtconcurrent/wordcount/main.cpp b/examples/qtconcurrent/wordcount/main.cpp
new file mode 100644
index 0000000000..5008eaff82
--- /dev/null
+++ b/examples/qtconcurrent/wordcount/main.cpp
@@ -0,0 +1,167 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QList>
+#include <QMap>
+#include <QTextStream>
+#include <QString>
+#include <QStringList>
+#include <QDir>
+#include <QTime>
+#include <QApplication>
+#include <QDebug>
+
+#include <qtconcurrentmap.h>
+
+#ifndef QT_NO_CONCURRENT
+
+using namespace QtConcurrent;
+
+/*
+    Utility function that recursivily searches for files.
+*/
+QStringList findFiles(const QString &startDir, QStringList filters)
+{
+    QStringList names;
+    QDir dir(startDir);
+
+    foreach (QString file, dir.entryList(filters, QDir::Files))
+        names += startDir + "/" + file;
+
+    foreach (QString subdir, dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot))
+        names += findFiles(startDir + "/" + subdir, filters);
+    return names;
+}
+
+typedef QMap<QString, int> WordCount;
+
+/*
+    Single threaded word counter function.
+*/
+WordCount singleThreadedWordCount(QStringList files)
+{
+    WordCount wordCount;
+    foreach (QString file, files) {
+        QFile f(file);
+        f.open(QIODevice::ReadOnly);
+        QTextStream textStream(&f);
+        while (textStream.atEnd() == false)
+            foreach(QString word, textStream.readLine().split(" "))
+                wordCount[word] += 1;
+
+    }
+    return wordCount;
+}
+
+
+// countWords counts the words in a single file. This function is
+// called in parallel by several threads and must be thread
+// safe.
+WordCount countWords(const QString &file)
+{
+    QFile f(file);
+    f.open(QIODevice::ReadOnly);
+    QTextStream textStream(&f);
+    WordCount wordCount;
+
+    while (textStream.atEnd() == false)
+        foreach (QString word, textStream.readLine().split(" "))
+            wordCount[word] += 1;
+
+    return wordCount;
+}
+
+// reduce adds the results from map to the final
+// result. This functor will only be called by one thread
+// at a time.
+void reduce(WordCount &result, const WordCount &w)
+{
+    QMapIterator<QString, int> i(w);
+    while (i.hasNext()) {
+        i.next();
+        result[i.key()] += i.value();
+    }
+}
+
+int main(int argc, char** argv)
+{
+    QApplication app(argc, argv);
+    qDebug() << "finding files...";
+    QStringList files = findFiles("../../", QStringList() << "*.cpp" << "*.h");
+    qDebug() << files.count() << "files";
+
+    qDebug() << "warmup";
+    {
+        QTime time;
+        time.start();
+        WordCount total = singleThreadedWordCount(files);
+    }
+
+    qDebug() << "warmup done";
+
+    int singleThreadTime = 0;
+    {
+        QTime time;
+        time.start();
+        WordCount total = singleThreadedWordCount(files);
+        singleThreadTime = time.elapsed();
+        qDebug() << "single thread" << singleThreadTime;
+    }
+
+    int mapReduceTime = 0;
+    {
+        QTime time;
+        time.start();
+        WordCount total = mappedReduced(files, countWords, reduce);
+        mapReduceTime = time.elapsed();
+        qDebug() << "MapReduce" << mapReduceTime;
+    }
+    qDebug() << "MapReduce speedup x" << ((double)singleThreadTime - (double)mapReduceTime) / (double)mapReduceTime + 1;
+}
+
+#else
+
+int main()
+{
+	qDebug() << "Qt Concurrent is not yet supported on this platform";
+}
+
+#endif
diff --git a/examples/qtconcurrent/wordcount/wordcount.pro b/examples/qtconcurrent/wordcount/wordcount.pro
new file mode 100644
index 0000000000..fba95ee260
--- /dev/null
+++ b/examples/qtconcurrent/wordcount/wordcount.pro
@@ -0,0 +1,14 @@
+TEMPLATE = app
+TARGET += 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += main.cpp
+CONFIG += console
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/wordcount
+sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/wordcount
+INSTALLS += target sources
diff --git a/examples/qtestlib/README b/examples/qtestlib/README
new file mode 100644
index 0000000000..e89bf5d726
--- /dev/null
+++ b/examples/qtestlib/README
@@ -0,0 +1,38 @@
+The QTestLib framework is a tool for unit testing Qt based applications
+and libraries. QTestLib provides all the functionality commonly found
+in unit testing frameworks as well as extensions for testing graphical
+user interfaces.
+
+
+The examples in this directory should be run from the command line so
+that output printed to the console can be examined.
+
+Documentation for these examples can be found via the "Tutorial and Examples"
+link in the main Qt documentation.
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/qtestlib/qtestlib.pro b/examples/qtestlib/qtestlib.pro
new file mode 100644
index 0000000000..8addbcba63
--- /dev/null
+++ b/examples/qtestlib/qtestlib.pro
@@ -0,0 +1,8 @@
+TEMPLATE = subdirs
+SUBDIRS = tutorial1 tutorial2 tutorial3 tutorial4 tutorial5
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtestlib.pro README
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib
+INSTALLS += target sources
diff --git a/examples/qtestlib/tutorial1/testqstring.cpp b/examples/qtestlib/tutorial1/testqstring.cpp
new file mode 100644
index 0000000000..cc2e7caa1f
--- /dev/null
+++ b/examples/qtestlib/tutorial1/testqstring.cpp
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#include <QtTest/QtTest>
+
+class TestQString: public QObject
+{
+    Q_OBJECT
+private slots:
+    void toUpper();
+};
+//! [0]
+
+//! [1]
+void TestQString::toUpper()
+{
+    QString str = "Hello";
+    QCOMPARE(str.toUpper(), QString("HELLO"));
+}
+//! [1]
+
+//! [2]
+QTEST_MAIN(TestQString)
+#include "testqstring.moc"
+//! [2]
+
diff --git a/examples/qtestlib/tutorial1/tutorial1.pro b/examples/qtestlib/tutorial1/tutorial1.pro
new file mode 100644
index 0000000000..baa15b29f6
--- /dev/null
+++ b/examples/qtestlib/tutorial1/tutorial1.pro
@@ -0,0 +1,8 @@
+SOURCES = testqstring.cpp
+CONFIG  += qtestlib
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial1
+sources.files = $$SOURCES *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial1
+INSTALLS += target sources
diff --git a/examples/qtestlib/tutorial2/testqstring.cpp b/examples/qtestlib/tutorial2/testqstring.cpp
new file mode 100644
index 0000000000..1c1f6f70e6
--- /dev/null
+++ b/examples/qtestlib/tutorial2/testqstring.cpp
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+
+//! [0]
+class TestQString: public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void toUpper_data();
+    void toUpper();
+};
+//! [0]
+
+//! [1]
+void TestQString::toUpper_data()
+{
+    QTest::addColumn<QString>("string");
+    QTest::addColumn<QString>("result");
+
+    QTest::newRow("all lower") << "hello" << "HELLO";
+    QTest::newRow("mixed")     << "Hello" << "HELLO";
+    QTest::newRow("all upper") << "HELLO" << "HELLO";
+}
+//! [1]
+
+//! [2]
+void TestQString::toUpper()
+{
+    QFETCH(QString, string);
+    QFETCH(QString, result);
+
+    QCOMPARE(string.toUpper(), result);
+}
+//! [2]
+
+//! [3]
+QTEST_MAIN(TestQString)
+#include "testqstring.moc"
+//! [3]
+
diff --git a/examples/qtestlib/tutorial2/tutorial2.pro b/examples/qtestlib/tutorial2/tutorial2.pro
new file mode 100644
index 0000000000..44211d8fc4
--- /dev/null
+++ b/examples/qtestlib/tutorial2/tutorial2.pro
@@ -0,0 +1,8 @@
+SOURCES = testqstring.cpp
+CONFIG  += qtestlib
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial2
+sources.files = $$SOURCES *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial2
+INSTALLS += target sources
diff --git a/examples/qtestlib/tutorial3/testgui.cpp b/examples/qtestlib/tutorial3/testgui.cpp
new file mode 100644
index 0000000000..8e116f8cdc
--- /dev/null
+++ b/examples/qtestlib/tutorial3/testgui.cpp
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#include <QtGui>
+#include <QtTest/QtTest>
+
+class TestGui: public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testGui();
+
+};
+//! [0]
+
+//! [1]
+void TestGui::testGui()
+{
+    QLineEdit lineEdit;
+
+    QTest::keyClicks(&lineEdit, "hello world");
+
+    QCOMPARE(lineEdit.text(), QString("hello world"));
+}
+//! [1]
+
+//! [2]
+QTEST_MAIN(TestGui)
+#include "testgui.moc"
+//! [2]
+
diff --git a/examples/qtestlib/tutorial3/tutorial3.pro b/examples/qtestlib/tutorial3/tutorial3.pro
new file mode 100644
index 0000000000..b494ba8c6a
--- /dev/null
+++ b/examples/qtestlib/tutorial3/tutorial3.pro
@@ -0,0 +1,8 @@
+SOURCES = testgui.cpp
+CONFIG  += qtestlib
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial3
+sources.files = $$SOURCES *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial3
+INSTALLS += target sources
diff --git a/examples/qtestlib/tutorial4/testgui.cpp b/examples/qtestlib/tutorial4/testgui.cpp
new file mode 100644
index 0000000000..f392fec4c7
--- /dev/null
+++ b/examples/qtestlib/tutorial4/testgui.cpp
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtTest/QtTest>
+
+//! [0]
+class TestGui: public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testGui_data();
+    void testGui();
+};
+//! [0]
+
+//! [1]
+void TestGui::testGui_data()
+{
+    QTest::addColumn<QTestEventList>("events");
+    QTest::addColumn<QString>("expected");
+
+    QTestEventList list1;
+    list1.addKeyClick('a');
+    QTest::newRow("char") << list1 << "a";
+
+    QTestEventList list2;
+    list2.addKeyClick('a');
+    list2.addKeyClick(Qt::Key_Backspace);
+    QTest::newRow("there and back again") << list2 << "";
+}
+//! [1]
+
+//! [2]
+void TestGui::testGui()
+{
+    QFETCH(QTestEventList, events);
+    QFETCH(QString, expected);
+
+    QLineEdit lineEdit;
+
+    events.simulate(&lineEdit);
+
+    QCOMPARE(lineEdit.text(), expected);
+}
+//! [2]
+
+//! [3]
+QTEST_MAIN(TestGui)
+#include "testgui.moc"
+//! [3]
+
diff --git a/examples/qtestlib/tutorial4/tutorial4.pro b/examples/qtestlib/tutorial4/tutorial4.pro
new file mode 100644
index 0000000000..0777d4841f
--- /dev/null
+++ b/examples/qtestlib/tutorial4/tutorial4.pro
@@ -0,0 +1,8 @@
+SOURCES = testgui.cpp
+CONFIG  += qtestlib
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial4
+sources.files = $$SOURCES *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial4
+INSTALLS += target sources
diff --git a/examples/qtestlib/tutorial5/benchmarking.cpp b/examples/qtestlib/tutorial5/benchmarking.cpp
new file mode 100644
index 0000000000..05ca266e55
--- /dev/null
+++ b/examples/qtestlib/tutorial5/benchmarking.cpp
@@ -0,0 +1,135 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <qtest.h>
+
+class TestBenchmark : public QObject
+{
+    Q_OBJECT
+private slots:
+    void simple();
+    void multiple_data();
+    void multiple();
+    void series_data();
+    void series();
+};
+
+//! [0]
+void TestBenchmark::simple()
+{
+    QString str1 = QLatin1String("This is a test string");
+    QString str2 = QLatin1String("This is a test string");
+
+    QCOMPARE(str1.localeAwareCompare(str2), 0);
+
+    QBENCHMARK {
+        str1.localeAwareCompare(str2);
+    }
+}
+//! [0]
+
+//! [1]
+void TestBenchmark::multiple_data()
+{
+    QTest::addColumn<bool>("useLocaleCompare");
+    QTest::newRow("locale aware compare") << true;
+    QTest::newRow("standard compare") << false;
+}
+//! [1]
+
+//! [2]
+void TestBenchmark::multiple()
+{
+    QFETCH(bool, useLocaleCompare);
+    QString str1 = QLatin1String("This is a test string");
+    QString str2 = QLatin1String("This is a test string");
+    
+    int result;
+    if (useLocaleCompare) {
+        QBENCHMARK {
+            result = str1.localeAwareCompare(str2);
+        }
+    } else {
+        QBENCHMARK {
+            result = (str1 == str2);
+        }
+    }
+}
+//! [2]
+
+//! [3]
+void TestBenchmark::series_data()
+{
+    QTest::addColumn<bool>("useLocaleCompare");
+    QTest::addColumn<int>("stringSize");
+    
+    for (int i = 1; i < 10000; i += 2000) {
+        QByteArray size = QByteArray::number(i);
+        QTest::newRow(("locale aware compare--" + size).constData()) << true << i;
+        QTest::newRow(("standard compare--" + size).constData()) << false << i;
+    }
+}
+//! [4]
+
+//! [5]
+void TestBenchmark::series()
+{
+    QFETCH(bool, useLocaleCompare);
+    QFETCH(int, stringSize);
+
+    QString str1 = QString().fill('A', stringSize);
+    QString str2 = QString().fill('A', stringSize);
+    int result;
+    if (useLocaleCompare) {
+        QBENCHMARK {
+            result = str1.localeAwareCompare(str2);
+        }
+    } else {
+        QBENCHMARK {
+            result = (str1 == str2);
+        }
+    }
+}
+//! [5]
+
+QTEST_MAIN(TestBenchmark)
+#include "benchmarking.moc"
diff --git a/examples/qtestlib/tutorial5/tutorial5.pro b/examples/qtestlib/tutorial5/tutorial5.pro
new file mode 100644
index 0000000000..0310916ebd
--- /dev/null
+++ b/examples/qtestlib/tutorial5/tutorial5.pro
@@ -0,0 +1,8 @@
+SOURCES = benchmarking.cpp
+CONFIG  += qtestlib
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial5
+sources.files = $$SOURCES *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial5
+INSTALLS += target sources
diff --git a/examples/qws/README b/examples/qws/README
new file mode 100644
index 0000000000..d7cf21a5c5
--- /dev/null
+++ b/examples/qws/README
@@ -0,0 +1,38 @@
+These examples show how to take advantage of features specifically designed
+for use on systems with limited resources, specialized hardware, and small
+screens.
+
+
+The example launcher provided with Qt can be used to explore each of the
+examples in this directory.
+
+Documentation for these examples can be found via the Tutorial and Examples
+link in the main Qt documentation.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/qws/ahigl/ahigl.pro b/examples/qws/ahigl/ahigl.pro
new file mode 100644
index 0000000000..1ee8e6e150
--- /dev/null
+++ b/examples/qws/ahigl/ahigl.pro
@@ -0,0 +1,16 @@
+TEMPLATE = lib
+QT += opengl
+CONFIG += plugin
+
+TARGET	 = qahiglscreen
+
+target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers
+INSTALLS += target
+
+HEADERS	= qwindowsurface_ahigl_p.h \
+          qscreenahigl_qws.h
+
+SOURCES	= qwindowsurface_ahigl.cpp \
+          qscreenahigl_qws.cpp \
+          qscreenahiglplugin.cpp
+
diff --git a/examples/qws/ahigl/qscreenahigl_qws.cpp b/examples/qws/ahigl/qscreenahigl_qws.cpp
new file mode 100644
index 0000000000..b5880b34c5
--- /dev/null
+++ b/examples/qws/ahigl/qscreenahigl_qws.cpp
@@ -0,0 +1,963 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qscreenahigl_qws.h"
+#include "qwindowsurface_ahigl_p.h"
+
+#include <QWSServer>
+#include <QMap>
+#include <QTimer>
+#include <QTimeLine>
+
+#include <qwindowsystem_qws.h>
+#include <private/qwindowsurface_qws_p.h>
+#include <private/qfixed_p.h>
+
+#include <GLES/egl.h>
+#include <GLES/gl.h>
+#include <math.h>
+
+const int animationLength = 1500;
+const int frameSpan = 20;
+
+static GLuint createTexture(const QImage &img);
+
+class QAhiGLCursor : public QScreenCursor
+{
+public:
+    QAhiGLCursor() : texture(0) {}
+    ~QAhiGLCursor();
+
+    void set(const QImage &image, int hotx, int hoty);
+
+    GLuint texture;
+};
+
+QAhiGLCursor::~QAhiGLCursor()
+{
+    if (texture)
+        glDeleteTextures(1, &texture);
+}
+
+void QAhiGLCursor::set(const QImage &image, int hotx, int hoty)
+{
+    if (texture)
+        glDeleteTextures(1, &texture);
+
+    if (image.isNull())
+        texture = 0;
+    else
+        texture = createTexture(image.convertToFormat(QImage::Format_ARGB32));
+
+    QScreenCursor::set(image, hotx, hoty);
+}
+
+
+/*!
+  \class QAhiGLScreenPrivate
+  The QAhiGLScreenPrivate class contains state information for class QAhiGLScreen.
+
+  An instance of this class points to the owning instance of
+  class QAhiGLScreen. This class uses a QTimer to limit the
+  update frequency.
+ */
+//! [0]
+class QAhiGLScreenPrivate : public QObject
+{
+    Q_OBJECT
+
+public:
+    QAhiGLScreenPrivate(QAhiGLScreen *s);
+
+public slots:
+    void windowEvent(QWSWindow *w, QWSServer::WindowEvent e);
+    void redrawScreen();
+
+public:
+    QAhiGLScreen *screen;
+    QAhiGLCursor *cursor;
+
+    EGLContext eglContext;
+    EGLDisplay eglDisplay;
+    EGLSurface eglSurface;
+
+    QTimer updateTimer;
+    bool doEffects;
+};
+//! [0]
+
+//! [1]
+class ShowAnimation : public QTimeLine
+{
+public:
+    ShowAnimation(QAhiGLScreenPrivate *screen);
+    qreal valueForTime(int msec);
+};
+//! [1]
+
+//! [2]
+struct WindowInfo
+{
+    WindowInfo() : texture(0), animation(0) {}
+
+    GLuint texture;
+    QPointer<ShowAnimation> animation;
+};
+
+static QMap<QWSWindow*, WindowInfo*> windowMap;
+//! [2]
+
+/*!
+  Constructs the animation for the transition effect used
+  when the window associated with \a screen is displayed.
+ */
+//! [3]
+ShowAnimation::ShowAnimation(QAhiGLScreenPrivate *screen)
+    : QTimeLine(animationLength)
+{
+    setUpdateInterval(frameSpan);
+    connect(this, SIGNAL(valueChanged(qreal)), screen, SLOT(redrawScreen()));
+    connect(this, SIGNAL(finished()), this, SLOT(deleteLater()));
+    start();
+}
+//! [3]
+
+//! [4]
+qreal ShowAnimation::valueForTime(int msec)
+{
+    const qreal t = msec / qreal(duration());
+    return 3*t*t - 2*t*t*t;
+}
+//! [4]
+
+QAhiGLScreenPrivate::QAhiGLScreenPrivate(QAhiGLScreen *s)
+    : screen(s), cursor(0), doEffects(false)
+{
+    connect(&updateTimer, SIGNAL(timeout()), this, SLOT(redrawScreen()));
+}
+
+/*!
+  This slot handles the \a event when the \l {QWSServer}
+  {window server} emits a window event for the specified
+  \a window.
+
+  The \l {QWSServer::WindowEvent} {window events} handled
+  are \c Create, \c Destroy, and \c Show. The \c Create
+  event creates a new instance of \l {WindowInfo} and stores
+  it in a window map to mark the creation of a new window.
+  The \c Destroy event causes the \l {WindoInfo} instance
+  to be removed from the map and destroyed.
+
+  The \c Show event is the most interesting. If the user
+  has started the application with -display ahigl:effects,
+  then the \c Show event is handled by creating a small
+  \l {ShowAnimation} {animation} for use when the window
+  is first shown.
+ */
+//! [5]
+void QAhiGLScreenPrivate::windowEvent(QWSWindow *window,
+                                      QWSServer::WindowEvent event)
+{
+    switch (event) {
+    case QWSServer::Create:
+        windowMap[window] = new WindowInfo;
+        break;
+    case QWSServer::Show:
+        if (doEffects)
+            windowMap[window]->animation = new ShowAnimation(this);
+        break;
+    case QWSServer::Destroy:
+        delete windowMap[window];
+        windowMap.remove(window);
+        break;
+    default:
+        break;
+    }
+}
+//! [5]
+
+/*!
+  This function assumes the updateTimer is still counting down and stops it
+  and then calls redrawScreen() in the public screen driver class QAhiGLScreen.
+ */
+//! [6]
+void QAhiGLScreenPrivate::redrawScreen()
+{
+    updateTimer.stop();
+    screen->redrawScreen();
+}
+//! [6]
+
+/*!
+  \class QAhiGLScreen
+
+  \brief The QAhiGLScreen class is the screen driver for the ATI handheld device interface.
+
+  QAhiGLScreen is implemented with the d-pointer pattern. That is,
+  the only data member the class contains is a pointer called d_ptr,
+  which means data pointer. It points to an instance of a private
+  class called QAhiGLScreenPrivate, where all the screen driver's
+  context data members are defined. The d-pointer pattern is used
+  so that changes can be made to the screen driver's context data
+  members without destroying the binary compatibility of the public
+  screen driver class.
+
+  The pure virtual functions found in the base class QScreen are
+  listed below. All must have implementations in any screen driver
+  class derived from QScreen. All are impemented in this example,
+  except for setMode(), which has only been given a stub
+  implementation to satisfy the compiler.
+
+  bool connect(const QString & displaySpec);
+  void disconnect();
+  bool initDevice();
+  void setMode(int width, int height, int depth);
+
+  The stub implementation of setMode() is not meant to indicate
+  setMode() can be ignored in your own screen driver class. It was
+  simply decided not to provide a fully implemented screen driver
+  class for the example, which would normally be tailored to your
+  device's specific requirements.
+
+  The base class QGLScreen has only one pure virtual function,
+  hasOpenGL(), which must return true if your screen driver class
+  supports OpenGL.
+
+  QWSWindowSurface * createSurface(const QString & key) const
+  QWSWindowSurface * createSurface(QWidget * widget) const
+  void exposeRegion(QRegion region, int windowIndex)
+
+ */
+
+/*!
+  Constructs a new, ATI handheld device screen driver.
+
+  The displayId identifies the QWS server to connect to.
+ */
+QAhiGLScreen::QAhiGLScreen(int displayId) : QGLScreen(displayId)
+{
+    d_ptr = new QAhiGLScreenPrivate(this);
+    d_ptr->eglDisplay = EGL_NO_DISPLAY;
+    d_ptr->eglSurface = EGL_NO_SURFACE;
+}
+
+/*!
+  Destroys this ATI handheld device screen driver.
+ */
+QAhiGLScreen::~QAhiGLScreen()
+{
+    delete d_ptr;
+}
+
+/*!
+  \reimp
+ */
+//! [7]
+bool QAhiGLScreen::connect(const QString &displaySpec)
+{
+    // Hardcoded values for this device
+    w = 480;
+    h = 640;
+    dw = w;
+    dh = h;
+    d = 16;
+
+    const int dpi = 120;
+    physWidth = qRound(dw * 25.4 / dpi);
+    physHeight = qRound(dh * 25.4 / dpi);
+
+    if (displaySpec.section(':', 1, 1).contains("effects"))
+        d_ptr->doEffects = true;
+
+    return true;
+}
+//! [7]
+
+/*!
+  \reimp
+ */
+//! [8]
+bool QAhiGLScreen::initDevice()
+{
+    EGLint version, subversion;
+    EGLint attrs[] = { EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+                       EGL_STENCIL_SIZE, 8, EGL_DEPTH_SIZE, 16,
+                       EGL_NONE };
+    EGLint numConfig;
+    EGLConfig eglConfig;
+
+    d_ptr->eglDisplay = eglGetDisplay(0);
+    if (d_ptr->eglDisplay == EGL_NO_DISPLAY) {
+        qCritical("QAhiGLScreen::initDevice(): eglGetDisplay failed: 0x%x",
+                  eglGetError());
+        return false;
+    }
+
+    if (!eglInitialize(d_ptr->eglDisplay, &version, &subversion)) {
+        qCritical("QAhiGLScreen::initDevice(): eglInitialize failed: 0x%x",
+                  eglGetError());
+        return false;
+    }
+
+    if (!eglChooseConfig(d_ptr->eglDisplay, attrs, &eglConfig, 1, &numConfig)) {
+        qCritical("QAhiGLScreen::initDevice(): eglChooseConfig failed: 0x%x",
+                  eglGetError());
+        return false;
+    }
+
+    static DummyScreen win = { w, h };
+    d_ptr->eglSurface = eglCreateWindowSurface(d_ptr->eglDisplay, eglConfig,
+                                               &win, 0);
+    if (d_ptr->eglSurface == EGL_NO_SURFACE) {
+        qCritical("QAhiGLScreen::initDevice(): eglCreateWindowSurface failed: 0x%x",
+                  eglGetError());
+        return false;
+    }
+
+    d_ptr->eglContext = eglCreateContext(d_ptr->eglDisplay, eglConfig,
+                                         EGL_NO_CONTEXT, 0);
+    if (d_ptr->eglContext == EGL_NO_CONTEXT) {
+        qCritical("QAhiGLScreen::initDevice(): eglCreateContext failed: 0x%x",
+                  eglGetError());
+        return false;
+    }
+
+    if (!eglMakeCurrent(d_ptr->eglDisplay, d_ptr->eglSurface, d_ptr->eglSurface, d_ptr->eglContext)) {
+        qCritical("QAhiGLScreen::initDevice(): eglMakeCurrent failed: 0x%x",
+                  eglGetError());
+        return false;
+    }
+
+    d_ptr->connect(QWSServer::instance(),
+                   SIGNAL(windowEvent(QWSWindow*, QWSServer::WindowEvent)),
+                   SLOT(windowEvent(QWSWindow*, QWSServer::WindowEvent)));
+
+    d_ptr->cursor = new QAhiGLCursor;
+    qt_screencursor = d_ptr->cursor;
+
+    return true;
+}
+//! [8]
+
+/*!
+  \reimp
+ */
+//! [9]
+void QAhiGLScreen::shutdownDevice()
+{
+    delete d_ptr->cursor;
+    d_ptr->cursor = 0;
+    qt_screencursor = 0;
+
+    eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE,
+                   EGL_NO_SURFACE, EGL_NO_CONTEXT);
+    eglDestroyContext(d_ptr->eglDisplay, d_ptr->eglContext);
+    eglDestroySurface(d_ptr->eglDisplay, d_ptr->eglSurface);
+    eglTerminate(d_ptr->eglDisplay);
+}
+//! [9]
+
+/*!
+  \reimp
+
+  In this case, the reimplimentation does nothing. It is
+  required because the function is declared as pure virtual
+  in the base class QScreen.
+ */
+void QAhiGLScreen::disconnect()
+{
+}
+
+/*
+  This internal function rounds up to the next power of
+  two. If v is already a power of two, that same value is
+  returned.
+ */
+inline static uint nextPowerOfTwo(uint v)
+{
+    v--;
+    v |= v >> 1;
+    v |= v >> 2;
+    v |= v >> 4;
+    v |= v >> 8;
+    v |= v >> 16;
+    ++v;
+    return v;
+}
+
+/*
+  This internal function creates a texture from the image img
+  and returns its texture identifier.
+
+  The term "texture" is a graphics technology term that refers
+  to a pixmap constructed from an image by adding extra points
+  of contrast to the otherwise plain color image. The texture
+  has a, well, texture, that the original image doesn't have.
+ */
+static GLuint createTexture(const QImage &img)
+{
+    if (img.isNull())
+        return 0;
+
+    int width = img.width();
+    int height = img.height();
+    int textureWidth;
+    int textureHeight;
+    GLuint texture;
+
+    glGenTextures(1, &texture);
+    textureWidth = nextPowerOfTwo(width);
+    textureHeight = nextPowerOfTwo(height);
+    glBindTexture(GL_TEXTURE_2D, texture);
+    glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+    switch (img.format()) {
+    case QImage::Format_RGB16:
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB,
+                     textureWidth,
+                     textureHeight, 0,
+                     GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 0);
+
+        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height,
+                        GL_RGB, GL_UNSIGNED_SHORT_5_6_5, img.bits());
+        break;
+
+    case QImage::Format_ARGB32_Premultiplied:
+    case QImage::Format_ARGB32:
+    case QImage::Format_RGB32:
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
+                     textureWidth,
+                     textureHeight, 0,
+                     GL_RGBA, GL_UNSIGNED_BYTE, 0);
+        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height,
+                        GL_RGBA, GL_UNSIGNED_BYTE, img.bits());
+        break;
+
+    default:
+        break;
+    }
+
+    return texture;
+}
+
+/*
+  A helper function used by QAhiGLScreen::drawQuad().
+ */
+static void drawQuad_helper(GLshort *coords, GLfloat *texCoords)
+{
+    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+    glTexCoordPointer(2, GL_FLOAT, 0, texCoords);
+    glEnableClientState(GL_VERTEX_ARRAY);
+    glVertexPointer(2, GL_SHORT, 0, coords);
+    glEnable(GL_TEXTURE_2D);
+    glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+    glDisable(GL_TEXTURE_2D);
+    glDisableClientState(GL_VERTEX_ARRAY);
+    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+}
+
+/*
+  A helper function used by QAhiGLScreen::drawQuadWavyFlag().
+ */
+static void drawQuad_helper(GLshort *coords, GLfloat *texCoords,
+                            int arraySize, int numArrays)
+{
+    glEnable(GL_TEXTURE_2D);
+    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+    glTexCoordPointer(2, GL_FLOAT, 0, texCoords);
+    glEnableClientState(GL_VERTEX_ARRAY);
+    glVertexPointer(2, GL_SHORT, 0, coords);
+
+    for (int i = 0; i < numArrays-1; ++i)
+        glDrawArrays(GL_TRIANGLE_STRIP, i*arraySize, arraySize);
+    glDisableClientState(GL_VERTEX_ARRAY);
+    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+    glDisable(GL_TEXTURE_2D);
+}
+
+/*
+  A convenience function used by QAhiGLScreen::drawQuad().
+ */
+static void setRectCoords(GLshort *coords, QRect rect)
+{
+    coords[0] = GLshort(rect.left());
+    coords[1] = GLshort(rect.top());
+
+    coords[2] = GLshort(rect.right());
+    coords[3] = GLshort(rect.top());
+
+    coords[4] = GLshort(rect.right());
+    coords[5] = GLshort(rect.bottom());
+
+    coords[6] = GLshort(rect.left());
+    coords[7] = GLshort(rect.bottom());
+}
+
+/*!
+  A helper function used by QAhiGLScreen::drawWindow() and
+  QAhiGLScreen::redrawScreen().
+ */
+void QAhiGLScreen::drawQuad(const QRect &textureGeometry,
+                            const QRect &subGeometry,
+                            const QRect &screenGeometry)
+{
+    qreal textureWidth = qreal(nextPowerOfTwo(textureGeometry.width()));
+    qreal textureHeight = qreal(nextPowerOfTwo(textureGeometry.height()));
+
+    GLshort coords[8];
+    setRectCoords(coords, screenGeometry);
+
+    GLfloat texcoords[8];
+    texcoords[0] = (subGeometry.left() - textureGeometry.left()) / textureWidth;
+    texcoords[1] = (subGeometry.top() - textureGeometry.top()) / textureHeight;
+
+    texcoords[2] = (subGeometry.right() - textureGeometry.left()) / textureWidth;
+    texcoords[3] = (subGeometry.top() - textureGeometry.top()) / textureHeight;
+
+    texcoords[4] = (subGeometry.right() - textureGeometry.left()) / textureWidth;
+    texcoords[5] = (subGeometry.bottom() - textureGeometry.top()) / textureHeight;
+
+    texcoords[6] = (subGeometry.left() - textureGeometry.left()) / textureWidth;
+    texcoords[7] = (subGeometry.bottom() - textureGeometry.top()) / textureHeight;
+
+    drawQuad_helper(coords, texcoords);
+}
+
+/*
+  My own sine function.
+ */
+static qreal mySin(QFixed radians)
+{
+    const QFixed twoPI = QFixed::fromReal(2*M_PI);
+
+    const int tableSize = 40;
+    static int *table = 0;
+
+    if (!table) {
+        table = new int[tableSize];
+        for (int i = 0; i < tableSize; ++i) {
+            table[i] = qRound(sin(M_PI*(i*360.0/40.0)/180.0) * 16776960.0);
+        }
+    }
+
+    QFixed tableLookup = radians*tableSize/twoPI;
+    return table[tableLookup.truncate()%tableSize]/16776960.0;
+}
+
+/*
+  My own cosine function.
+ */
+static qreal myCos(QFixed radians)
+{
+    const int twoPI = qRound(2*M_PI);
+
+    const int tableSize = 40;
+    static int *table = 0;
+
+    if (!table) {
+        table = new int[tableSize];
+        for (int i = 0; i < tableSize; ++i) {
+            table[i] = int(cos(M_PI*(i*360.0/40.0)/180.0) * 16776960.0);
+        }
+    }
+
+    QFixed tableLookup = radians*tableSize/twoPI;
+    return table[tableLookup.truncate()%tableSize]/16776960.0;
+}
+
+// number of grid cells in wavy flag tesselation in x- and y-direction
+const int subdivisions = 10;
+
+/*
+  A helper function used by drawQuadWavyFlag(). It computes
+  coordinates for grid cells for a wavy flag tesselation and
+  stores them in the array called coords.
+ */
+static void setFlagCoords(GLshort *coords,
+			  QRectF screenGeometry,
+                          int frameNum,
+			  qreal progress)
+{
+    int coordIndex = 0;
+    qreal waveHeight = 30.0*(1.0-progress);
+    for (int j = 0; j < subdivisions-1; ++j) {
+        for (int i = 0; i < subdivisions; ++i) {
+            qreal c;
+            c = screenGeometry.left()
+                + (i * screenGeometry.width() / (subdivisions - 1))
+                + waveHeight * qRound(mySin(QFixed::fromReal(M_PI * 20 * (frameNum + i) / 180.0)))
+                + waveHeight * qRound(myCos(QFixed::fromReal(M_PI * 20 * (frameNum + j) / 180.0)));
+            coords[coordIndex++] = qRound(c);
+            c = screenGeometry.top()
+                + (j * screenGeometry.height() / (subdivisions - 1))
+                + waveHeight * mySin(QFixed::fromReal(M_PI * 20 * (frameNum + i) / 180.0))
+                + waveHeight * myCos(QFixed::fromReal(M_PI * 20 * (frameNum + j) / 180.0));
+            coords[coordIndex++] = qRound(c);
+            c = screenGeometry.left() + (i * screenGeometry.width() / (subdivisions - 1))
+                + waveHeight * mySin(QFixed::fromReal(M_PI * 20 * (frameNum + i) / 180.0))
+                + waveHeight * myCos(QFixed::fromReal(M_PI * 20 * (frameNum + (j+1)) / 180.0));
+            coords[coordIndex++] = qRound(c);
+
+            c = screenGeometry.top()
+                + ((j + 1) * screenGeometry.height() / (subdivisions - 1))
+                + waveHeight * mySin(QFixed::fromReal(M_PI * 20 * (frameNum + i) / 180.0))
+                + waveHeight * myCos(QFixed::fromReal(M_PI * 20 * (frameNum + (j + 1)) / 180.0));
+            coords[coordIndex++] = qRound(c);
+        }
+    }
+}
+
+static void setFlagTexCoords(GLfloat *texcoords,
+                             const QRectF &subTexGeometry,
+                             const QRectF &textureGeometry,
+                             int textureWidth, int textureHeight)
+{
+    qreal topLeftX = (subTexGeometry.left() - textureGeometry.left())/textureWidth;
+    qreal topLeftY = (textureGeometry.height() - (subTexGeometry.top() - textureGeometry.top()))/textureHeight;
+
+    qreal width = (subTexGeometry.right() - textureGeometry.left())/textureWidth - topLeftX;
+    qreal height = (textureGeometry.height() - (subTexGeometry.bottom() - textureGeometry.top()))/textureHeight - topLeftY;
+
+    int coordIndex = 0;
+    qreal spacing = subdivisions - 1;
+    for (int j = 0; j < subdivisions-1; ++j) {
+        for (int i = 0; i < subdivisions; ++i) {
+            texcoords[coordIndex++] = topLeftX + (i*width) / spacing;
+            texcoords[coordIndex++] = topLeftY + (j*height) / spacing;
+            texcoords[coordIndex++] = topLeftX + (i*width) / spacing;
+            texcoords[coordIndex++] = topLeftY + ((j+1)*height) / spacing;
+        }
+    }
+}
+
+void QAhiGLScreen::drawQuadWavyFlag(const QRect &textureGeometry,
+                                    const QRect &subTexGeometry,
+                                    const QRect &screenGeometry,
+                                    qreal progress)
+{
+    const int textureWidth = nextPowerOfTwo(textureGeometry.width());
+    const int textureHeight = nextPowerOfTwo(textureGeometry.height());
+
+    static int frameNum = 0;
+
+    GLshort coords[subdivisions*subdivisions*2*2];
+    setFlagCoords(coords, screenGeometry, frameNum++, progress);
+
+    GLfloat texcoords[subdivisions*subdivisions*2*2];
+    setFlagTexCoords(texcoords, subTexGeometry, textureGeometry,
+                     textureWidth, textureHeight);
+
+    drawQuad_helper(coords, texcoords, subdivisions*2, subdivisions);
+}
+
+void QAhiGLScreen::invalidateTexture(int windowIndex)
+{
+    if (windowIndex < 0)
+        return;
+
+    QList<QWSWindow*> windows = QWSServer::instance()->clientWindows();
+    if (windowIndex > windows.size() - 1)
+        return;
+
+    QWSWindow *win = windows.at(windowIndex);
+    if (!win)
+        return;
+
+    WindowInfo *info = windowMap[win];
+    if (info->texture) {
+        glDeleteTextures(1, &info->texture);
+        info->texture = 0;
+    }
+}
+
+void QAhiGLScreen::drawWindow(QWSWindow *win, qreal progress)
+{
+    const QRect screenRect = win->allocatedRegion().boundingRect();
+    QRect drawRect = screenRect;
+
+    glColor4f(1.0, 1.0, 1.0, progress);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glEnable(GL_BLEND);
+
+    QWSWindowSurface *surface = win->windowSurface();
+    if (!surface)
+        return;
+
+    if (progress >= 1.0) {
+        if (surface->key() == QLatin1String("ahigl")) {
+            drawRect.setCoords(drawRect.left(), drawRect.bottom(),
+                               drawRect.right(), drawRect.top());
+        }
+        drawQuad(win->requestedRegion().boundingRect(), screenRect, drawRect);
+        return;
+    }
+
+    const int dx = qRound((1 - progress) * drawRect.width() / 2);
+    const int dy = qRound((1 - progress) * drawRect.height() / 2);
+
+    drawRect.adjust(dx, dy, -dx, -dy);
+
+    if (surface->key() != QLatin1String("ahigl")) {
+        drawRect.setCoords(drawRect.left(), drawRect.bottom(),
+                           drawRect.right(), drawRect.top());
+    }
+
+    drawQuadWavyFlag(win->requestedRegion().boundingRect(), screenRect,
+                     drawRect, progress);
+}
+
+/*!
+  The window compositions are constructed here.
+ */
+//! [10]
+void QAhiGLScreen::redrawScreen()
+{
+    glBindFramebufferOES(GL_FRAMEBUFFER_EXT, 0);
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glOrthof(0, w, h, 0, -999999, 999999);
+    glViewport(0, 0, w, h);
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+
+    // Fill background color
+
+    QColor bgColor = QWSServer::instance()->backgroundBrush().color();
+    glClearColor(bgColor.redF(), bgColor.greenF(),
+                 bgColor.blueF(), bgColor.alphaF());
+    glClear(GL_COLOR_BUFFER_BIT);
+//! [10]
+
+    // Draw all windows
+
+    glDisable(GL_CULL_FACE);
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_STENCIL_TEST);
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_ONE, GL_ZERO);
+    glDisable(GL_ALPHA_TEST);
+    glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+
+//! [11]
+    QList<QWSWindow*> windows = QWSServer::instance()->clientWindows();
+    for (int i = windows.size() - 1; i >= 0; --i) {
+        QWSWindow *win = windows.at(i);
+        QWSWindowSurface *surface = win->windowSurface();
+        if (!surface)
+            continue;
+
+        WindowInfo *info = windowMap[win];
+
+        if (!info->texture) {
+            if (surface->key() == QLatin1String("ahigl"))
+                info->texture = static_cast<QAhiGLWindowSurface*>(surface)->textureId();
+            else
+                info->texture = createTexture(surface->image());
+        }
+        qreal progress;
+        if (info->animation)
+            progress = info->animation->currentValue();
+        else
+            progress = 1.0;
+
+        glBindTexture(GL_TEXTURE_2D, info->texture);
+        drawWindow(win, progress);
+    } // for i
+//! [11] //! [12]
+
+    // Draw cursor
+
+    const QAhiGLCursor *cursor = d_ptr->cursor;
+    if (cursor->texture) {
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+        glBindTexture(GL_TEXTURE_2D, d_ptr->cursor->texture);
+        drawQuad(cursor->boundingRect(), cursor->boundingRect(),
+                 cursor->boundingRect());
+    }
+
+    glPopMatrix();
+    glMatrixMode(GL_PROJECTION);
+    glPopMatrix();
+    glMatrixMode(GL_MODELVIEW);
+
+    eglSwapBuffers(d_ptr->eglDisplay, d_ptr->eglSurface);
+}
+//! [12]
+
+/*!
+  \reimp
+
+ */
+//! [13]
+void QAhiGLScreen::exposeRegion(QRegion r, int windowIndex)
+{
+    if ((r & region()).isEmpty())
+        return;
+
+    invalidateTexture(windowIndex);
+
+    if (!d_ptr->updateTimer.isActive())
+        d_ptr->updateTimer.start(frameSpan);
+}
+//! [13]
+
+/*!
+  \reimp
+
+  This overloading of createSurface() is called on the client side to
+  create a window surface for a new window. If the \a widget is a
+  QGLWidget, or if the widget's width and height are both less than or
+  equal to 256, it creates an instance of QAhiGLWindowSurface.
+  Otherwise, it calls QScreen::createSurface() to create a non-OpenGL
+  window surface. The pointer to the new window surface is returned.
+
+  Note that this function first asks whether this application is the
+  server, and it only creates an instance of QAhiGLWindowSurface if
+  the answer is yes. What this means is we only let the server have
+  access to the OpenGL hardware, because of an implementation
+  restyriction in the OpenGL libraries we are using. Thus only clients
+  that are in the server process get to create OpenGL window surfaces.
+ */
+//! [14]
+QWSWindowSurface* QAhiGLScreen::createSurface(QWidget *widget) const
+{
+    if (QApplication::type() == QApplication::GuiServer) {
+        if (qobject_cast<QGLWidget*>(widget)) {
+            return new QAhiGLWindowSurface(widget,
+					   d_ptr->eglDisplay,
+                                           d_ptr->eglSurface,
+                                           d_ptr->eglContext);
+        }
+
+        const QRect rect = widget->frameGeometry();
+        if (rect.width() <= 256 && rect.height() <= 256) {
+            return new QAhiGLWindowSurface(widget,
+					   d_ptr->eglDisplay,
+                                           d_ptr->eglSurface,
+                                           d_ptr->eglContext);
+        }
+    }
+
+    return QScreen::createSurface(widget);
+}
+//! [14]
+
+/*!
+  \reimp
+
+  This overloading of createSurface() is called on the server side
+  to manage a window surface corresponding to a window surface
+  already created on the client side.
+
+  If the \a key is "ahigl", create an instance of QAhiGLWindowSurface
+  and return it. Otherwise, call QScreen::createSurface() and return
+  the window surface it creates.
+
+  See QScreen::createSurface().
+ */
+//! [15]
+QWSWindowSurface* QAhiGLScreen::createSurface(const QString &key) const
+{
+    if (key == QLatin1String("ahigl")) {
+        return new QAhiGLWindowSurface(d_ptr->eglDisplay,
+				       d_ptr->eglSurface,
+                                       d_ptr->eglContext);
+    }
+
+    return QScreen::createSurface(key);
+}
+//! [15]
+
+/*!
+  This function would normally reset the frame buffer resolution
+  according to \a width, \a height, and the bit \a depth. It would
+  then notify other applications that their frame buffer size had
+  changed so they could redraw. The function is a no-op in this
+  example, which means the example screen driver can't change its
+  frame buffer resolution. There is no significance to that in the
+  example. You would normally implement setMode() in an OpenGL
+  screen driver. This no-op reimplementation is required here
+  because setMode() in QScreen is a pure virtual function.
+
+  See QScreen::setMode()
+ */
+void QAhiGLScreen::setMode(int width, int height, int depth)
+{
+    Q_UNUSED(width);
+    Q_UNUSED(height);
+    Q_UNUSED(depth);
+}
+
+/*!
+  This function would normally be reimplemented to prevent the
+  screen driver from updating the screen if \a on is true. It is a
+  no-op in this example, which means the screen driver can always
+  update the screen.
+
+  See QScreen::blank().
+ */
+void QAhiGLScreen::blank(bool on)
+{
+    Q_UNUSED(on);
+}
+
+/*!
+  This function always returns true, since the purpose of
+  this screen driver class is to implement an OpenGL ES
+  screen driver. In some other class designed to handle both
+  OpenGL and non-OpenGL graphics, it might test the system to
+  determine whether OpenGL graphics are supported and return
+  true or false accordingly.
+ */
+bool QAhiGLScreen::hasOpenGL()
+{
+    return true;
+}
+
+#include "qscreenahigl_qws.moc"
diff --git a/examples/qws/ahigl/qscreenahigl_qws.h b/examples/qws/ahigl/qscreenahigl_qws.h
new file mode 100644
index 0000000000..332d5c3aea
--- /dev/null
+++ b/examples/qws/ahigl/qscreenahigl_qws.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QAHIGLSCREEN_H
+#define QAHIGLSCREEN_H
+
+#include <QGLScreen>
+#include <QWSServer>
+
+QT_BEGIN_NAMESPACE
+class QAhiGLScreenPrivate;
+QT_END_NAMESPACE
+
+//! [0]
+class QAhiGLScreen : public QGLScreen
+{
+public:
+    QAhiGLScreen(int displayId);
+    virtual ~QAhiGLScreen();
+
+    bool initDevice();
+    bool connect(const QString &displaySpec);
+    void disconnect();
+    void shutdownDevice();
+
+    void setMode(int width, int height, int depth);
+    void blank(bool on);
+
+    void exposeRegion(QRegion r, int changing);
+
+    QWSWindowSurface* createSurface(QWidget *widget) const;
+    QWSWindowSurface* createSurface(const QString &key) const;
+
+    bool hasOpenGL();
+
+private:
+    void invalidateTexture(int windowIndex);
+    void redrawScreen();
+    void drawWindow(QWSWindow *win, qreal progress);
+    void drawQuad(const QRect &textureGeometry,
+                  const QRect &subGeometry,
+                  const QRect &screenGeometry);
+    void drawQuadWavyFlag(const QRect &textureGeometry,
+                          const QRect &subTexGeometry,
+                          const QRect &screenGeometry,
+                          float progress);
+
+    QAhiGLScreenPrivate *d_ptr;
+    friend class QAhiGLScreenPrivate;
+};
+//! [0]
+
+#endif // QAHIGLSCREEN_H
diff --git a/examples/qws/ahigl/qscreenahiglplugin.cpp b/examples/qws/ahigl/qscreenahiglplugin.cpp
new file mode 100644
index 0000000000..828de82998
--- /dev/null
+++ b/examples/qws/ahigl/qscreenahiglplugin.cpp
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qscreenahigl_qws.h"
+
+#include <QScreenDriverPlugin>
+#include <QStringList>
+
+//! [0]
+class QAhiGLScreenPlugin : public QScreenDriverPlugin
+{
+public:
+    QAhiGLScreenPlugin();
+
+    QStringList keys() const;
+    QScreen *create(const QString&, int displayId);
+};
+//! [0]
+
+/*!
+  \class QAhiGLScreenPlugin
+  \brief The QAhiGLScreenPlugin class is the plugin for the ATI handheld device graphics driver.
+
+  QAhiGLScreenPlugin inherits QScreenDriverPlugin. See
+  \l{How to Create Qt Plugins} for details.
+ */
+
+/*!
+  This is the default constructor.
+ */
+QAhiGLScreenPlugin::QAhiGLScreenPlugin()
+    : QScreenDriverPlugin()
+{
+}
+
+/*!
+  Returns a string list containing the string "ahigl" which
+  is the only screen driver supported by this plugin.
+ */
+QStringList QAhiGLScreenPlugin::keys() const
+{
+    return (QStringList() << "ahigl");
+}
+
+/*!
+  Creates a screen driver of the kind specified by \a driver.
+  The \a displayId identifies the Qt for Embedded Linux server to connect to.
+ */
+QScreen* QAhiGLScreenPlugin::create(const QString& driver, int displayId)
+{
+    if (driver.toLower() != "ahigl")
+        return 0;
+
+    return new QAhiGLScreen(displayId);
+}
+
+//! [1]
+Q_EXPORT_PLUGIN2(qahiglscreen, QAhiGLScreenPlugin)
+//! [1]
diff --git a/examples/qws/ahigl/qwindowsurface_ahigl.cpp b/examples/qws/ahigl/qwindowsurface_ahigl.cpp
new file mode 100644
index 0000000000..79924f9ff9
--- /dev/null
+++ b/examples/qws/ahigl/qwindowsurface_ahigl.cpp
@@ -0,0 +1,349 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qwindowsurface_ahigl_p.h"
+#include "qscreenahigl_qws.h"
+
+#include <qwsdisplay_qws.h>
+#include <QtGui/QPaintDevice>
+#include <QtGui/QWidget>
+#include <QtOpenGL/private/qglpaintdevice_qws_p.h>
+#include <QtOpenGL/private/qgl_p.h>
+#include <GLES/gl.h>
+
+/*!
+  \class QAhiGLWindowSurfacePrivate
+  \internal
+
+  \brief The QAhiGLWindowSurfacePrivate class is the private implementation
+  class for class QAhiGLWindowSurface.
+
+  This class contains only state variables.
+  */
+//! [0]
+class QAhiGLWindowSurfacePrivate
+{
+public:
+    QAhiGLWindowSurfacePrivate(EGLDisplay eglDisplay,
+			       EGLSurface eglSurface,
+                               EGLContext eglContext);
+
+    QPaintDevice *device;
+
+    int textureWidth;
+    int textureHeight;
+
+    GLuint texture;
+    GLuint frameBufferObject;
+    GLuint depthbuf;
+
+    EGLDisplay display;
+    EGLSurface surface;
+    EGLContext context;
+};
+//! [0]
+
+/*!
+  The construct just sets statwe variables using the ones
+  provided.
+ */
+QAhiGLWindowSurfacePrivate::QAhiGLWindowSurfacePrivate(EGLDisplay eglDisplay,
+                                                       EGLSurface eglSurface,
+                                                       EGLContext eglContext)
+    : texture(0), frameBufferObject(0), depthbuf(0), display(eglDisplay),
+      surface(eglSurface), context(eglContext)
+{
+}
+
+inline static int nextPowerOfTwo(uint v)
+{
+    v--;
+    v |= v >> 1;
+    v |= v >> 2;
+    v |= v >> 4;
+    v |= v >> 8;
+    v |= v >> 16;
+    ++v;
+    return v;
+}
+
+/*!
+    \class QAhiGLWindowSurface
+    \preliminary
+    \internal
+
+    \brief The QAhiGLWindowSurface class provides the drawing area
+    for top-level windows using OpenGL for drawing on an ATI handheld
+    device.
+
+    In \l{Qt for Embedded Linux}, the default behavior for each client is to
+    render widgets into an area of memory. The server then displays
+    the contents of that memory on the screen. For ATI handheld
+    devices using OpenGL, QAhiGLWindowSurface is the window surface
+    class that allocates and manages the memory areas in the clients
+    and the server.
+
+    When a screen update is required, the server runs through all the
+    top-level windows that intersect with the region being updated,
+    ensuring that the clients have updated their window surfaces. Then
+    the server uses the screen driver to copy the contents of the
+    affected window surfaces into its composition and then display the
+    composition on the screen.
+
+    \tableofcontents
+
+    \section1 Pure Virtual Functions
+
+    There are two window surface instances for each top-level window.
+    One is used by the application when drawing a window, and the
+    other is used by the server application to make its copy for
+    building a window composition to send to the screen.
+
+    The key() function is implemented to uniquely identify this window
+    surface class as "ahigl", and the isValid() function is
+    implemented to determine whether the associated window is still
+    acceptable for representation by this window surface class.  It
+    must either be a window using an \l {QGLWidget} {OpenGL widget},
+    or it must be a window whose frame is no bigger than 256 x 256.
+
+    The setGeometry() function is implemented to change the geometry
+    of the frame buffer whenever the geometry of the associated
+    top-level window changes. The image() function is called by the
+    window system when building window compositions to return an image
+    of the top-level window.
+
+    The paintDevice() function is implemented to return the appropriate
+    paint device.
+
+    \section1 Virtual Functions
+
+    When painting onto the surface, the window system will always call
+    the beginPaint() function before any painting operations are
+    performed. It ensures that the correct frame buffer will be used
+    by the OpenGL library for painting operations. Likewise, the
+    endPaint() function is automatically called when the painting is
+    done, but it isn't implemented for this example.
+*/
+
+/*!
+  This is the client side constructor.
+ */
+//! [1]
+QAhiGLWindowSurface::QAhiGLWindowSurface(QWidget *widget,
+                                         EGLDisplay eglDisplay,
+                                         EGLSurface eglSurface,
+                                         EGLContext eglContext)
+    : QWSGLWindowSurface(widget)
+{
+    d_ptr = new QAhiGLWindowSurfacePrivate(eglDisplay, eglSurface, eglContext);
+    d_ptr->device = new QWSGLPaintDevice(widget);
+
+    setSurfaceFlags(QWSWindowSurface::Buffered);
+}
+//! [1]
+
+/*!
+  This is the server side constructor.
+ */
+//! [2]
+QAhiGLWindowSurface::QAhiGLWindowSurface(EGLDisplay eglDisplay,
+                                         EGLSurface eglSurface,
+                                         EGLContext eglContext)
+{
+    d_ptr = new QAhiGLWindowSurfacePrivate(eglDisplay, eglSurface, eglContext);
+    setSurfaceFlags(QWSWindowSurface::Buffered);
+}
+//! [2]
+
+/*!
+  The destructor deletes the OpenGL structures held by the
+  private implementation class, and then it deletes the
+  private implementation class.
+ */
+QAhiGLWindowSurface::~QAhiGLWindowSurface()
+{
+    if (d_ptr->texture)
+        glDeleteTextures(1, &d_ptr->texture);
+    if (d_ptr->depthbuf)
+        glDeleteRenderbuffersOES(1, &d_ptr->depthbuf);
+    if (d_ptr->frameBufferObject)
+        glDeleteFramebuffersOES(1, &d_ptr->frameBufferObject);
+
+    delete d_ptr;
+}
+
+/*!
+  This function changes the geometry of the frame buffer
+  to the geometry in \a rect. It is called whenever the
+  geometry of the associated top-level window changes. It
+  also rebuilds the window surface's texture and binds
+  the OpenGL identifier to the texture for use by the
+  OpenGL library.
+ */
+//! [3]
+void QAhiGLWindowSurface::setGeometry(const QRect &rect)
+{
+    QSize size = rect.size();
+
+    const QWidget *w = window();
+    if (w && !w->mask().isEmpty()) {
+        const QRegion region = w->mask()
+                               & rect.translated(-w->geometry().topLeft());
+        size = region.boundingRect().size();
+    }
+
+    if (geometry().size() != size) {
+
+        // Driver specific limitations:
+        //   FBO maximimum size of 256x256
+        //   Depth buffer required
+
+        d_ptr->textureWidth = qMin(256, nextPowerOfTwo(size.width()));
+        d_ptr->textureHeight = qMin(256, nextPowerOfTwo(size.height()));
+
+        glGenTextures(1, &d_ptr->texture);
+        glBindTexture(GL_TEXTURE_2D, d_ptr->texture);
+
+        glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+        glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+        glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+        const int bufSize = d_ptr->textureWidth * d_ptr->textureHeight * 2;
+        GLshort buf[bufSize];
+        memset(buf, 0, sizeof(GLshort) * bufSize);
+
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, d_ptr->textureWidth,
+                     d_ptr->textureHeight, 0,
+                     GL_RGBA, GL_UNSIGNED_BYTE, buf);
+
+        glGenRenderbuffersOES(1, &d_ptr->depthbuf);
+        glBindRenderbufferOES(GL_RENDERBUFFER_EXT, d_ptr->depthbuf);
+        glRenderbufferStorageOES(GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT16,
+                                 d_ptr->textureWidth, d_ptr->textureHeight);
+
+        glGenFramebuffersOES(1, &d_ptr->frameBufferObject);
+        glBindFramebufferOES(GL_FRAMEBUFFER_EXT, d_ptr->frameBufferObject);
+
+        glFramebufferTexture2DOES(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
+                                  GL_TEXTURE_2D, d_ptr->texture, 0);
+        glFramebufferRenderbufferOES(GL_FRAMEBUFFER_EXT,
+                                     GL_DEPTH_ATTACHMENT_EXT,
+                                     GL_RENDERBUFFER_EXT, d_ptr->depthbuf);
+        glBindFramebufferOES(GL_FRAMEBUFFER_EXT, 0);
+    }
+
+    QWSGLWindowSurface::setGeometry(rect);
+}
+//! [3]
+
+/*!
+  Returns the window  surface's texture as a QByteArray.
+ */
+QByteArray QAhiGLWindowSurface::permanentState() const
+{
+    QByteArray array;
+    array.resize(sizeof(GLuint));
+
+    char *ptr = array.data();
+    reinterpret_cast<GLuint*>(ptr)[0] = textureId();
+    return array;
+}
+
+/*!
+  Sets the window surface's texture to \a data.
+ */
+void QAhiGLWindowSurface::setPermanentState(const QByteArray &data)
+{
+    const char *ptr = data.constData();
+    d_ptr->texture = reinterpret_cast<const GLuint*>(ptr)[0];
+}
+
+/*!
+  Returns the paint device being used for this window surface.
+ */
+QPaintDevice *QAhiGLWindowSurface::paintDevice()
+{
+    return d_ptr->device;
+}
+
+/*!
+  Returns the window surface's texture.
+ */
+GLuint QAhiGLWindowSurface::textureId() const
+{
+    return d_ptr->texture;
+}
+
+/*!
+  The \l {QWSServer} {window system} always calls this function
+  before any painting operations begin for this window surface.
+  It ensures that the correct frame buffer will be used by the
+  OpenGL library for painting operations.
+ */
+//! [4]
+void QAhiGLWindowSurface::beginPaint(const QRegion &region)
+{
+    QWSGLWindowSurface::beginPaint(region);
+
+    if (d_ptr->frameBufferObject)
+        glBindFramebufferOES(GL_FRAMEBUFFER_EXT, d_ptr->frameBufferObject);
+}
+//! [4]
+
+/*!
+  This function returns true if the window associated with
+  this window surface can still rendered using this window
+  surface class. Either the window's top-level widget must
+  be an \l {QGLWidget} {OpenGL widget}, or the window's
+  frame must be no bigger than 256 x 256.
+ */
+//! [5]
+bool QAhiGLWindowSurface::isValid() const
+{
+    if (!qobject_cast<QGLWidget*>(window())) {
+        const QRect r = window()->frameGeometry();
+        if (r.width() > 256 || r.height() > 256)
+            return false;
+    }
+    return true;
+}
+//! [5]
diff --git a/examples/qws/ahigl/qwindowsurface_ahigl_p.h b/examples/qws/ahigl/qwindowsurface_ahigl_p.h
new file mode 100644
index 0000000000..40a82ed669
--- /dev/null
+++ b/examples/qws/ahigl/qwindowsurface_ahigl_p.h
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QWINDOWSURFACE_AHIGL_P_H
+#define QWINDOWSURFACE_AHIGL_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of the QAhiGLWindowSurface class.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtOpenGL/private/qglwindowsurface_qws_p.h>
+#include <GLES/gl.h>
+#include <GLES/egl.h>
+
+QT_BEGIN_NAMESPACE
+class QAhiGLWindowSurfacePrivate;
+QT_END_NAMESPACE
+
+//! [0]
+class QAhiGLWindowSurface : public QWSGLWindowSurface
+{
+public:
+    QAhiGLWindowSurface(QWidget *widget, EGLDisplay eglDisplay,
+                        EGLSurface eglSurface, EGLContext eglContext);
+    QAhiGLWindowSurface(EGLDisplay eglDisplay, EGLSurface eglSurface,
+                        EGLContext eglContext);
+    ~QAhiGLWindowSurface();
+
+    QString key() const { return QLatin1String("ahigl"); }
+    void setGeometry(const QRect &rect);
+    QPaintDevice *paintDevice();
+    void beginPaint(const QRegion &region);
+    bool isValid() const;
+
+    QByteArray permanentState() const;
+    void setPermanentState(const QByteArray &);
+
+    QImage image() const { return QImage(); }
+
+    GLuint textureId() const;
+
+private:
+    QAhiGLWindowSurfacePrivate *d_ptr;
+};
+//! [0]
+
+#endif // QWINDOWSURFACE_AHIGL_P_H
diff --git a/examples/qws/dbscreen/dbscreen.cpp b/examples/qws/dbscreen/dbscreen.cpp
new file mode 100644
index 0000000000..bd26848859
--- /dev/null
+++ b/examples/qws/dbscreen/dbscreen.cpp
@@ -0,0 +1,99 @@
+ /****************************************************************************
+ **
+ ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+ **
+ ** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+ **
+ ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ **
+ ****************************************************************************/
+
+#include "dbscreen.h"
+#include <QApplication>
+
+//! [0]
+bool DBScreen::initDevice()
+{
+    if (!QLinuxFbScreen::initDevice())
+        return false;
+
+    QScreenCursor::initSoftwareCursor();
+    image = new QImage(deviceWidth(), deviceHeight(), pixelFormat());
+    painter = new QPainter(image);
+
+    return true;
+}
+//! [0]
+
+//! [1]
+void DBScreen::shutdownDevice()
+{
+    QLinuxFbScreen::shutdownDevice();
+    delete painter;
+    delete image;
+}
+//! [1]
+
+//! [2]
+void DBScreen::solidFill(const QColor &color, const QRegion &region)
+{
+    QVector<QRect> rects = region.rects();
+    for (int i = 0; i  < rects.size(); i++)
+        painter->fillRect(rects.at(i), color);
+}
+//! [2]
+
+//! [3]
+void DBScreen::blit(const QImage &image, const QPoint &topLeft, const QRegion &region)
+{
+    QVector<QRect> rects = region.rects();
+    for (int i = 0; i < rects.size(); i++) {
+        QRect destRect = rects.at(i);
+        QRect srcRect(destRect.x()-topLeft.x(), destRect.y()-topLeft.y(), destRect.width(), destRect.height());
+        painter->drawImage(destRect.topLeft(), image, srcRect);
+    }
+}
+//! [3]
+
+//! [4]
+void DBScreen::exposeRegion(QRegion region, int changing)
+{
+    QLinuxFbScreen::exposeRegion(region, changing);
+    QLinuxFbScreen::blit(*image, QPoint(0, 0), region);
+}
+//! [4]
+
diff --git a/examples/qws/dbscreen/dbscreen.h b/examples/qws/dbscreen/dbscreen.h
new file mode 100644
index 0000000000..00221e9c19
--- /dev/null
+++ b/examples/qws/dbscreen/dbscreen.h
@@ -0,0 +1,70 @@
+ /****************************************************************************
+ **
+ ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+ **
+ ** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+ **
+ ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ **
+ ****************************************************************************/
+
+#ifndef DBSCREEN_H
+#define DBSCREEN_H
+
+#include <QLinuxFbScreen>
+#include <QPainter>
+
+//! [0]
+class DBScreen : public QLinuxFbScreen
+{
+public:
+    DBScreen(int displayId) : QLinuxFbScreen(displayId) {};
+    ~DBScreen() {}
+    bool initDevice();
+    void shutdownDevice();
+    void blit(const QImage &image, const QPoint &topLeft, const QRegion &region);
+    void solidFill(const QColor &color, const QRegion &region);
+    void exposeRegion(QRegion region, int changing);
+
+private:
+    QPainter *painter;
+    QImage *image;
+};
+//! [0]
+
+#endif // DBSCREEN_H
+
diff --git a/examples/qws/dbscreen/dbscreen.pro b/examples/qws/dbscreen/dbscreen.pro
new file mode 100644
index 0000000000..172a02a5e7
--- /dev/null
+++ b/examples/qws/dbscreen/dbscreen.pro
@@ -0,0 +1,11 @@
+TEMPLATE    = lib
+CONFIG     += plugin
+
+TARGET      = dbscreen
+target.path += $$[QT_INSTALL_PLUGINS]/gfxdrivers
+INSTALLS    += target
+
+HEADERS     = dbscreen.h 
+SOURCES     = dbscreendriverplugin.cpp \
+              dbscreen.cpp 
+
diff --git a/examples/qws/dbscreen/dbscreendriverplugin.cpp b/examples/qws/dbscreen/dbscreendriverplugin.cpp
new file mode 100644
index 0000000000..36587a1b1d
--- /dev/null
+++ b/examples/qws/dbscreen/dbscreendriverplugin.cpp
@@ -0,0 +1,80 @@
+ /****************************************************************************
+ **
+ ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+ **
+ ** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+ **
+ ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ **
+ ****************************************************************************/
+ 
+#include <QScreenDriverPlugin>
+#include "dbscreen.h"
+
+//! [0]
+class DBScreenDriverPlugin : public QScreenDriverPlugin
+{
+public:
+    DBScreenDriverPlugin();
+    QScreen* create(const QString& key, int displayId);
+    QStringList keys () const;
+};
+//! [0]
+
+DBScreenDriverPlugin::DBScreenDriverPlugin() : QScreenDriverPlugin()
+{
+}
+
+//! [1]
+QScreen* DBScreenDriverPlugin::create(const QString& key, int displayId)
+{
+    if (key.toLower() != "dbscreen")
+        return 0;
+
+    return new DBScreen(displayId);
+}
+//! [1]
+
+//! [2]
+QStringList DBScreenDriverPlugin::keys() const
+{
+    return QStringList() << "dbscreen";
+}
+//! [2] //! [3]
+
+Q_EXPORT_PLUGIN2(dbscreen, DBScreenDriverPlugin)
+//! [3]
diff --git a/examples/qws/framebuffer/framebuffer.pro b/examples/qws/framebuffer/framebuffer.pro
new file mode 100644
index 0000000000..f9fe850aa9
--- /dev/null
+++ b/examples/qws/framebuffer/framebuffer.pro
@@ -0,0 +1,11 @@
+TEMPLATE = app
+TARGET = framebuffer
+CONFIG -= qt
+
+SOURCES += main.c
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/qws/framebuffer
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS framebuffer.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qws/framebuffer
+INSTALLS += target sources
diff --git a/examples/qws/framebuffer/main.c b/examples/qws/framebuffer/main.c
new file mode 100644
index 0000000000..2c2cf3143b
--- /dev/null
+++ b/examples/qws/framebuffer/main.c
@@ -0,0 +1,586 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <linux/fb.h>
+#include <linux/kd.h>
+#include <sys/mman.h>
+#include <sys/ioctl.h>
+#include <sys/time.h>
+#include <string.h>
+#include <errno.h>
+
+struct fb_var_screeninfo vinfo;
+struct fb_fix_screeninfo finfo;
+char *frameBuffer = 0;
+int fbFd = 0;
+int ttyFd = 0;
+
+void printFixedInfo()
+{
+    printf("Fixed screen info:\n"
+	   "\tid:          %s\n"
+	   "\tsmem_start:  0x%lx\n"
+	   "\tsmem_len:    %d\n"
+	   "\ttype:        %d\n"
+	   "\ttype_aux:    %d\n"
+	   "\tvisual:      %d\n"
+	   "\txpanstep:    %d\n"
+	   "\typanstep:    %d\n"
+	   "\tywrapstep:   %d\n"
+	   "\tline_length: %d\n"
+	   "\tmmio_start:  0x%lx\n"
+	   "\tmmio_len:    %d\n"
+	   "\taccel:       %d\n"
+	   "\n",
+	   finfo.id, finfo.smem_start, finfo.smem_len, finfo.type,
+	   finfo.type_aux, finfo.visual, finfo.xpanstep, finfo.ypanstep,
+	   finfo.ywrapstep, finfo.line_length, finfo.mmio_start,
+	   finfo.mmio_len, finfo.accel);
+}
+
+void printVariableInfo()
+{
+    printf("Variable screen info:\n"
+	   "\txres:           %d\n"
+	   "\tyres:           %d\n"
+	   "\txres_virtual:   %d\n"
+	   "\tyres_virtual:   %d\n"
+	   "\tyoffset:        %d\n"
+	   "\txoffset:        %d\n"
+	   "\tbits_per_pixel: %d\n"
+	   "\tgrayscale: %d\n"
+	   "\tred:    offset: %2d, length: %2d, msb_right: %2d\n"
+	   "\tgreen:  offset: %2d, length: %2d, msb_right: %2d\n"
+	   "\tblue:   offset: %2d, length: %2d, msb_right: %2d\n"
+	   "\ttransp: offset: %2d, length: %2d, msb_right: %2d\n"
+	   "\tnonstd:       %d\n"
+	   "\tactivate:     %d\n"
+	   "\theight:       %d\n"
+	   "\twidth:        %d\n"
+	   "\taccel_flags:  0x%x\n"
+	   "\tpixclock:     %d\n"
+	   "\tleft_margin:  %d\n"
+	   "\tright_margin: %d\n"
+	   "\tupper_margin: %d\n"
+	   "\tlower_margin: %d\n"
+	   "\thsync_len:    %d\n"
+	   "\tvsync_len:    %d\n"
+	   "\tsync:         %d\n"
+	   "\tvmode:        %d\n"
+	   "\n",
+	   vinfo.xres, vinfo.yres, vinfo.xres_virtual, vinfo.yres_virtual,
+	   vinfo.xoffset, vinfo.yoffset, vinfo.bits_per_pixel, vinfo.grayscale,
+	   vinfo.red.offset, vinfo.red.length, vinfo.red.msb_right,
+	   vinfo.green.offset, vinfo.green.length, vinfo.green.msb_right,
+	   vinfo.blue.offset, vinfo.blue.length, vinfo.blue.msb_right,
+	   vinfo.transp.offset, vinfo.transp.length, vinfo.transp.msb_right,
+	   vinfo.nonstd, vinfo.activate, vinfo.height, vinfo.width,
+	   vinfo.accel_flags, vinfo.pixclock, vinfo.left_margin,
+	   vinfo.right_margin, vinfo.upper_margin, vinfo.lower_margin,
+	   vinfo.hsync_len, vinfo.vsync_len, vinfo.sync, vinfo.vmode);
+}
+
+long switchToGraphicsMode()
+{
+    const char *const devs[] = {"/dev/tty0", "/dev/tty", "/dev/console", 0};
+    const char * const *dev;
+    long oldMode = KD_TEXT;
+
+    for (dev = devs; *dev; ++dev) {
+        ttyFd = open(*dev, O_RDWR);
+        if (ttyFd != -1)
+            break;
+        printf("Opening tty device %s failed: %s\n", *dev, strerror(errno));
+    }
+
+    ioctl(ttyFd, KDGETMODE, &oldMode);
+    if (oldMode == KD_GRAPHICS) {
+        printf("Was in graphics mode already. Skipping\n");
+        return oldMode;
+    }
+    int ret = ioctl(ttyFd, KDSETMODE, KD_GRAPHICS);
+    if (ret == -1) {
+        printf("Switch to graphics mode failed: %s\n", strerror(errno));
+	return oldMode;
+    }
+
+    printf("Successfully switched to graphics mode.\n\n");
+
+    return oldMode;
+}
+
+void restoreTextMode(long oldMode)
+{
+    if (ttyFd == -1)
+        return;
+
+    ioctl(ttyFd, KDSETMODE, oldMode);
+    close(ttyFd);
+}
+
+struct fb_cmap oldPalette;
+struct fb_cmap palette;
+int paletteSize = 0;
+
+void initPalette_16()
+{
+    if (finfo.type == FB_TYPE_PACKED_PIXELS) {
+	// We'll setup a grayscale map for 4bpp linear
+	int val = 0;
+        int i;
+	for (i = 0; i < 16; ++i) {
+	    palette.red[i] = (val << 8) | val;
+	    palette.green[i] = (val << 8) | val;
+	    palette.blue[i] = (val << 8) | val;
+            val += 17;
+	}
+	return;
+    }
+
+    // Default 16 colour palette
+    unsigned char reds[16]   = { 0x00, 0x7F, 0xBF, 0xFF, 0xFF, 0xA2,
+				 0x00, 0xFF, 0xFF, 0x00, 0x7F, 0x7F,
+				 0x00, 0x00, 0x00, 0x82 };
+    unsigned char greens[16] = { 0x00, 0x7F, 0xBF, 0xFF, 0x00, 0xC5,
+				 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00,
+				 0x00, 0x7F, 0x7F, 0x7F };
+    unsigned char blues[16]  = { 0x00, 0x7F, 0xBF, 0xFF, 0x00, 0x11,
+				 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x7F,
+				 0x7F, 0x7F, 0x00, 0x00 };
+
+    int i;
+    for (i = 0; i < 16; ++i) {
+	palette.red[i] = ((reds[i]) << 8) | reds[i];
+	palette.green[i] = ((greens[i]) << 8) | greens[i];
+	palette.blue[i] = ((blues[i]) << 8) | blues[i];
+	palette.transp[i] = 0;
+    }
+}
+
+void initPalette_256()
+{
+    if (vinfo.grayscale) {
+        int i;
+	for (i = 0; i < 256; ++i) {
+	    unsigned short c = (i << 8) | i;
+	    palette.red[i] = c;
+	    palette.green[i] = c;
+	    palette.blue[i] = c;
+	    palette.transp[i] = 0;
+	}
+	return;
+    }
+
+    // 6x6x6 216 color cube
+    int i = 0;
+    int ir, ig, ib;
+    for (ir = 0x0; ir <= 0xff; ir += 0x33) {
+	for (ig = 0x0; ig <= 0xff; ig += 0x33) {
+	    for (ib = 0x0; ib <= 0xff; ib += 0x33) {
+		palette.red[i] = (ir << 8)|ir;
+		palette.green[i] = (ig << 8)|ig;
+		palette.blue[i] = (ib << 8)|ib;
+		palette.transp[i] = 0;
+		++i;
+	    }
+	}
+    }
+}
+
+void initPalette()
+{
+    switch (vinfo.bits_per_pixel) {
+    case 8: paletteSize = 256; break;
+    case 4: paletteSize = 16; break;
+    default: break;
+    }
+
+    if (!paletteSize)
+	return; /* not using a palette */
+
+    /* read old palette */
+    oldPalette.start = 0;
+    oldPalette.len = paletteSize;
+    oldPalette.red = (unsigned short*)malloc(sizeof(unsigned short)*paletteSize);
+    oldPalette.green = (unsigned short*)malloc(sizeof(unsigned short)*paletteSize);
+    oldPalette.blue=(unsigned short*)malloc(sizeof(unsigned short)*paletteSize);
+    oldPalette.transp=(unsigned short*)malloc(sizeof(unsigned short)*paletteSize);
+    if (ioctl(ttyFd, FBIOGETCMAP, &oldPalette) == -1)
+	perror("initPalette: error reading palette");
+
+    /* create new palette */
+    palette.start = 0;
+    palette.len = paletteSize;
+    palette.red = (unsigned short*)malloc(sizeof(unsigned short)*paletteSize);
+    palette.green = (unsigned short*)malloc(sizeof(unsigned short)*paletteSize);
+    palette.blue = (unsigned short*)malloc(sizeof(unsigned short)*paletteSize);
+    palette.transp = (unsigned short*)malloc(sizeof(unsigned short)*paletteSize);
+    switch (paletteSize) {
+    case 16: initPalette_16(); break;
+    case 256: initPalette_256(); break;
+    default: break;
+    }
+
+    /* set new palette */
+    if (ioctl(ttyFd, FBIOPUTCMAP, &palette) == -1)
+	perror("initPalette: error setting palette");
+}
+
+void resetPalette()
+{
+    if (paletteSize == 0)
+	return;
+
+    if (ioctl(ttyFd, FBIOPUTCMAP, &oldPalette) == -1)
+	perror("resetPalette");
+
+    free(oldPalette.red);
+    free(oldPalette.green);
+    free(oldPalette.blue);
+    free(oldPalette.transp);
+
+    free(palette.red);
+    free(palette.green);
+    free(palette.blue);
+    free(palette.transp);
+}
+
+void drawRect_rgb32(int x0, int y0, int width, int height, int color)
+{
+    const int bytesPerPixel = 4;
+    const int stride = finfo.line_length / bytesPerPixel;
+
+    int *dest = (int*)(frameBuffer)
+                + (y0 + vinfo.yoffset) * stride
+                + (x0 + vinfo.xoffset);
+
+    int x, y;
+    for (y = 0; y < height; ++y) {
+        for (x = 0; x < width; ++x) {
+            dest[x] = color;
+        }
+        dest += stride;
+    }
+}
+
+void drawRect_rgb18(int x0, int y0, int width, int height, int color)
+{
+    const int bytesPerPixel = 3;
+    const int stride = finfo.line_length - width * bytesPerPixel;
+    const int red = (color & 0xff0000) >> 16;
+    const int green = (color & 0xff00) >> 8;
+    const int blue = (color & 0xff);
+    const unsigned int packed = (blue >> 2) |
+				((green >> 2) << 6) |
+				((red >> 2) << 12);
+    const char color18[3] = { packed & 0xff,
+			      (packed & 0xff00) >> 8,
+			      (packed & 0xff0000) >> 16 };
+
+    char *dest = (char*)(frameBuffer)
+		 + (y0 + vinfo.yoffset) * stride
+		 + (x0 + vinfo.xoffset);
+
+    int x, y;
+    for (y = 0; y < height; ++y) {
+        for (x = 0; x < width; ++x) {
+	    *dest++ = color18[0];
+	    *dest++ = color18[1];
+	    *dest++ = color18[2];
+        }
+        dest += stride;
+    }
+}
+
+void drawRect_rgb16(int x0, int y0, int width, int height, int color)
+{
+    const int bytesPerPixel = 2;
+    const int stride = finfo.line_length / bytesPerPixel;
+    const int red = (color & 0xff0000) >> (16 + 3);
+    const int green = (color & 0xff00) >> (8 + 2);
+    const int blue = (color & 0xff) >> 3;
+    const short color16 = blue | (green << 5) | (red << (5 + 6));
+
+    short *dest = (short*)(frameBuffer)
+		  + (y0 + vinfo.yoffset) * stride
+		  + (x0 + vinfo.xoffset);
+
+    int x, y;
+    for (y = 0; y < height; ++y) {
+        for (x = 0; x < width; ++x) {
+            dest[x] = color16;
+        }
+        dest += stride;
+    }
+}
+
+void drawRect_rgb15(int x0, int y0, int width, int height, int color)
+{
+    const int bytesPerPixel = 2;
+    const int stride = finfo.line_length / bytesPerPixel;
+    const int red = (color & 0xff0000) >> (16 + 3);
+    const int green = (color & 0xff00) >> (8 + 3);
+    const int blue = (color & 0xff) >> 3;
+    const short color15 = blue | (green << 5) | (red << (5 + 5));
+
+    short *dest = (short*)(frameBuffer)
+		  + (y0 + vinfo.yoffset) * stride
+		  + (x0 + vinfo.xoffset);
+
+    int x, y;
+    for (y = 0; y < height; ++y) {
+        for (x = 0; x < width; ++x) {
+            dest[x] = color15;
+        }
+        dest += stride;
+    }
+}
+
+void drawRect_palette(int x0, int y0, int width, int height, int color)
+{
+    const int bytesPerPixel = 1;
+    const int stride = finfo.line_length / bytesPerPixel;
+    const unsigned char color8 = color;
+
+    unsigned char *dest = (unsigned char*)(frameBuffer)
+                          + (y0 + vinfo.yoffset) * stride
+                          + (x0 + vinfo.xoffset);
+
+    int x, y;
+    for (y = 0; y < height; ++y) {
+        for (x = 0; x < width; ++x) {
+            dest[x] = color8;
+        }
+        dest += stride;
+    }
+}
+
+void drawRect(int x0, int y0, int width, int height, int color)
+{
+    switch (vinfo.bits_per_pixel) {
+    case 32:
+        drawRect_rgb32(x0, y0, width, height, color);
+        break;
+    case 18:
+        drawRect_rgb18(x0, y0, width, height, color);
+        break;
+    case 16:
+        drawRect_rgb16(x0, y0, width, height, color);
+        break;
+    case 15:
+        drawRect_rgb15(x0, y0, width, height, color);
+        break;
+    case 8:
+	drawRect_palette(x0, y0, width, height, color);
+	break;
+    case 4:
+	drawRect_palette(x0, y0, width, height, color);
+	break;
+    default:
+        printf("Warning: drawRect() not implemented for color depth %i\n",
+               vinfo.bits_per_pixel);
+        break;
+    }
+}
+
+#define PERFORMANCE_RUN_COUNT 5
+void performSpeedTest(void* fb, int fbSize)
+{
+    int i, j, run;
+
+    struct timeval startTime, endTime;
+    unsigned long long results[PERFORMANCE_RUN_COUNT];
+    unsigned long long average;
+
+    unsigned int* testImage;
+
+    unsigned int randData[17] = {
+        0x3A428472, 0x724B84D3, 0x26B898AB, 0x7D980E3C, 0x5345A084,
+        0x6779B66B, 0x791EE4B4, 0x6E8EE3CC, 0x63AF504A, 0x18A21B33,
+        0x0E26EB73, 0x022F708E, 0x1740F3B0, 0x7E2C699D, 0x0E8A570B,
+        0x5F2C22FB, 0x6A742130
+    };
+
+    printf("Frame Buffer Performance test...\n");
+
+    for (run=0; run<PERFORMANCE_RUN_COUNT; ++run) {
+
+        /* Generate test image with random(ish) data: */
+        testImage = (unsigned int*) malloc(fbSize);
+        j = run;
+        for (i=0; i < (int)(fbSize / sizeof(int)); ++i) {
+            testImage[i] = randData[j];
+            j++;
+            if (j >= 17)
+                j = 0;
+        }
+
+        gettimeofday(&startTime, NULL);
+        memcpy(fb, testImage, fbSize);
+        gettimeofday(&endTime, NULL);
+
+        long secsDiff = endTime.tv_sec - startTime.tv_sec;
+        results[run] = secsDiff * 1000000 + (endTime.tv_usec - startTime.tv_usec);
+
+        free(testImage);
+    }
+
+
+    average = 0;
+    for (i=0; i<PERFORMANCE_RUN_COUNT; ++i)
+        average += results[i];
+    average = average / PERFORMANCE_RUN_COUNT;
+
+    printf("        Average:   %llu usecs\n", average);
+    printf("        Bandwidth: %.03f MByte/Sec\n", (fbSize / 1048576.0) / ((double)average / 1000000.0));
+    printf("        Max. FPS:  %.03f fps\n\n", 1000000.0 / (double)average);
+
+    /* Clear the framebuffer back to black again: */
+    memset(fb, 0, fbSize);
+}
+
+int main(int argc, char **argv)
+{
+    long int screensize = 0;
+    int doGraphicsMode = 1;
+    long oldKdMode = KD_TEXT;
+    const char *devfile = "/dev/fb0";
+    int nextArg = 1;
+
+    if (nextArg < argc) {
+        if (strncmp("nographicsmodeswitch", argv[nextArg],
+                    strlen("nographicsmodeswitch")) == 0)
+        {
+	    ++nextArg;
+            doGraphicsMode = 0;
+        }
+    }
+    if (nextArg < argc)
+	devfile = argv[nextArg++];
+
+    /* Open the file for reading and writing */
+    fbFd = open(devfile, O_RDWR);
+    if (fbFd == -1) {
+	perror("Error: cannot open framebuffer device");
+	exit(1);
+    }
+    printf("The framebuffer device was opened successfully.\n\n");
+
+    /* Get fixed screen information */
+    if (ioctl(fbFd, FBIOGET_FSCREENINFO, &finfo) == -1) {
+	perror("Error reading fixed information");
+	exit(2);
+    }
+
+    printFixedInfo();
+
+    /* Figure out the size of the screen in bytes */
+    screensize = finfo.smem_len;
+
+    /* Map the device to memory */
+    frameBuffer = (char *)mmap(0, screensize,
+                               PROT_READ | PROT_WRITE, MAP_SHARED,
+                               fbFd, 0);
+    if (frameBuffer == MAP_FAILED) {
+	perror("Error: Failed to map framebuffer device to memory");
+	exit(4);
+    }
+    printf("The framebuffer device was mapped to memory successfully.\n"
+           "\n");
+
+    if (doGraphicsMode)
+        oldKdMode = switchToGraphicsMode();
+
+    /* Get variable screen information */
+    if (ioctl(fbFd, FBIOGET_VSCREENINFO, &vinfo) == -1) {
+	perror("Error reading variable information");
+	exit(3);
+    }
+
+    printVariableInfo();
+
+    performSpeedTest(frameBuffer, screensize);
+
+    initPalette();
+
+    if (paletteSize == 0) {
+        printf("Will draw 3 rectangles on the screen,\n"
+               "they should be colored red, green and blue (in that order).\n");
+        drawRect(vinfo.xres / 8, vinfo.yres / 8,
+                 vinfo.xres / 4, vinfo.yres / 4,
+                 0xffff0000);
+        drawRect(vinfo.xres * 3 / 8, vinfo.yres * 3 / 8,
+                 vinfo.xres / 4, vinfo.yres / 4,
+                 0xff00ff00);
+        drawRect(vinfo.xres * 5 / 8, vinfo.yres * 5 / 8,
+                 vinfo.xres / 4, vinfo.yres / 4,
+                 0xff0000ff);
+    } else {
+        printf("Will rectangles from the 16 first entries in the color palette"
+               " on the screen\n");
+        int y;
+        int x;
+        for (y = 0; y < 4; ++y) {
+            for (x = 0; x < 4; ++x) {
+                drawRect(vinfo.xres / 4 * x, vinfo.yres / 4 * y,
+                         vinfo.xres / 4, vinfo.yres / 4,
+                         4 * y + x);
+            }
+        }
+    }
+
+    sleep(5);
+
+    resetPalette();
+
+    printf("  Done.\n");
+
+    if (doGraphicsMode)
+        restoreTextMode(oldKdMode);
+
+    munmap(frameBuffer, screensize);
+    close(fbFd);
+    return 0;
+}
diff --git a/examples/qws/mousecalibration/calibration.cpp b/examples/qws/mousecalibration/calibration.cpp
new file mode 100644
index 0000000000..7e344e06e9
--- /dev/null
+++ b/examples/qws/mousecalibration/calibration.cpp
@@ -0,0 +1,145 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "calibration.h"
+
+#include <QWSPointerCalibrationData>
+#include <QPainter>
+#include <QFile>
+#include <QTimer>
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QMouseEvent>
+#include <QScreen>
+#include <QWSServer>
+
+//! [0]
+Calibration::Calibration()
+{
+    QRect desktop = QApplication::desktop()->geometry();
+    desktop.moveTo(QPoint(0, 0));
+    setGeometry(desktop);
+
+    setFocusPolicy(Qt::StrongFocus);
+    setFocus();
+    setModal(true);
+//! [0]
+
+//! [1]
+    int width = qt_screen->deviceWidth();
+    int height = qt_screen->deviceHeight();
+
+    int dx = width / 10;
+    int dy = height / 10;
+
+    QPoint *points = data.screenPoints;
+    points[QWSPointerCalibrationData::TopLeft] = QPoint(dx, dy);
+    points[QWSPointerCalibrationData::BottomLeft] = QPoint(dx, height - dy);
+    points[QWSPointerCalibrationData::BottomRight] = QPoint(width - dx, height - dy);
+    points[QWSPointerCalibrationData::TopRight] = QPoint(width - dx, dy);
+    points[QWSPointerCalibrationData::Center] = QPoint(width / 2, height / 2);
+//! [1]
+
+//! [2]
+    pressCount = 0;
+}
+//! [2]
+
+//! [3]
+Calibration::~Calibration()
+{
+}
+//! [3]
+
+//! [4]
+int Calibration::exec()
+{
+    QWSServer::mouseHandler()->clearCalibration();
+    grabMouse();
+    activateWindow();
+    int ret = QDialog::exec();
+    releaseMouse();
+    return ret;
+}
+//! [4]
+
+//! [5]
+void Calibration::paintEvent(QPaintEvent*)
+{
+    QPainter p(this);
+    p.fillRect(rect(), Qt::white);
+
+    QPoint point = data.screenPoints[pressCount];
+
+    // Map to logical coordinates in case the screen is transformed
+    QSize screenSize(qt_screen->deviceWidth(), qt_screen->deviceHeight());
+    point = qt_screen->mapFromDevice(point, screenSize);
+
+    p.fillRect(point.x() - 6, point.y() - 1, 13, 3, Qt::black);
+    p.fillRect(point.x() - 1, point.y() - 6, 3, 13, Qt::black);
+}
+//! [5]
+
+//! [6]
+void Calibration::mouseReleaseEvent(QMouseEvent *event)
+{
+    // Map from device coordinates in case the screen is transformed
+    QSize screenSize(qt_screen->width(), qt_screen->height());
+    QPoint p = qt_screen->mapToDevice(event->pos(), screenSize);
+
+    data.devPoints[pressCount] = p;
+
+    if (++pressCount < 5)
+        repaint();
+    else
+        accept();
+}
+//! [6]
+
+//! [7]
+void Calibration::accept()
+{
+    Q_ASSERT(pressCount == 5);
+    QWSServer::mouseHandler()->calibrate(&data);
+    QDialog::accept();
+}
+//! [7]
+
diff --git a/examples/qws/mousecalibration/calibration.h b/examples/qws/mousecalibration/calibration.h
new file mode 100644
index 0000000000..ae862e57d1
--- /dev/null
+++ b/examples/qws/mousecalibration/calibration.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CALIBRATION_H
+#define CALIBRATION_H
+
+#include <QDialog>
+#include <QWSPointerCalibrationData>
+
+//! [0]
+class Calibration : public QDialog
+{
+public:
+    Calibration();
+    ~Calibration();
+    int exec();
+
+protected:
+    void paintEvent(QPaintEvent*);
+    void mouseReleaseEvent(QMouseEvent*);
+    void accept();
+
+private:
+    QWSPointerCalibrationData data;
+    int pressCount;
+};
+//! [0]
+
+
+#endif
diff --git a/examples/qws/mousecalibration/main.cpp b/examples/qws/mousecalibration/main.cpp
new file mode 100644
index 0000000000..c318383b28
--- /dev/null
+++ b/examples/qws/mousecalibration/main.cpp
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QMessageBox>
+#include <QTimer>
+#include <QWSServer>
+
+#include "calibration.h"
+#include "scribblewidget.h"
+
+//! [0]
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv, QApplication::GuiServer);
+
+    if (!QWSServer::mouseHandler())
+        qFatal("No mouse handler installed");
+
+    {
+        QMessageBox message;
+        message.setText("<p>Please press once at each of the marks "
+                        "shown in the next screen.</p>"
+                        "<p>This messagebox will timout after 10 seconds "
+                        "if you are unable to close it.</p>");
+        QTimer::singleShot(10 * 1000, &message, SLOT(accept()));
+        message.exec();
+    }
+
+//! [0] //! [1]
+    Calibration cal;
+    cal.exec();
+//! [1]
+
+//! [2]
+    {
+        QMessageBox message;
+        message.setText("<p>The next screen will let you test the calibration "
+                        "by drawing into a widget.</p><p>This program will "
+                        "automatically close after 20 seconds.<p>");
+        QTimer::singleShot(10 * 1000, &message, SLOT(accept()));
+        message.exec();
+    }
+
+    ScribbleWidget scribble;
+    scribble.showMaximized();
+    scribble.show();
+
+    app.setActiveWindow(&scribble);
+    QTimer::singleShot(20 * 1000, &app, SLOT(quit()));
+
+    return app.exec();
+}
+//! [2]
+
diff --git a/examples/qws/mousecalibration/mousecalibration.pro b/examples/qws/mousecalibration/mousecalibration.pro
new file mode 100644
index 0000000000..bd318537a3
--- /dev/null
+++ b/examples/qws/mousecalibration/mousecalibration.pro
@@ -0,0 +1,11 @@
+HEADERS += calibration.h \
+	   scribblewidget.h
+SOURCES += calibration.cpp \
+	   scribblewidget.cpp \
+	   main.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/qws/mousecalibration
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qws/mousecalibration
+INSTALLS += target sources
diff --git a/examples/qws/mousecalibration/scribblewidget.cpp b/examples/qws/mousecalibration/scribblewidget.cpp
new file mode 100644
index 0000000000..255afd04dc
--- /dev/null
+++ b/examples/qws/mousecalibration/scribblewidget.cpp
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "scribblewidget.h"
+
+ScribbleWidget::ScribbleWidget(QWidget *parent)
+    : QWidget(parent)
+{
+    scribbling = false;
+}
+
+void ScribbleWidget::resizeEvent(QResizeEvent *e)
+{
+    image = QImage(e->size(), QImage::Format_RGB32);
+    image.fill(QColor(Qt::white).rgb());
+}
+
+void ScribbleWidget::mousePressEvent(QMouseEvent *event)
+{
+    if (event->button() != Qt::LeftButton)
+        return;
+
+    lastPoint = event->pos();
+    scribbling = true;
+}
+
+void ScribbleWidget::mouseMoveEvent(QMouseEvent *event)
+{
+    if ((event->buttons() & Qt::LeftButton) && scribbling)
+        drawLineTo(event->pos());
+}
+
+void ScribbleWidget::mouseReleaseEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton && scribbling) {
+        drawLineTo(event->pos());
+        scribbling = false;
+    }
+}
+
+void ScribbleWidget::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+    painter.drawImage(QPoint(0, 0), image);
+}
+
+void ScribbleWidget::drawLineTo(const QPoint &endPoint)
+{
+    QPainter painter(&image);
+    painter.setPen(QPen(Qt::blue, 1, Qt::SolidLine,
+                        Qt::RoundCap, Qt::RoundJoin));
+    painter.drawLine(lastPoint, endPoint);
+    update();
+    lastPoint = endPoint;
+}
diff --git a/examples/qws/mousecalibration/scribblewidget.h b/examples/qws/mousecalibration/scribblewidget.h
new file mode 100644
index 0000000000..6693082318
--- /dev/null
+++ b/examples/qws/mousecalibration/scribblewidget.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SCRIBBLEWIDGET_H
+#define SCRIBBLEWIDGET_H
+
+#include <QLabel>
+#include <QMouseEvent>
+#include <QResizeEvent>
+#include <QImage>
+#include <QPainter>
+
+class ScribbleWidget : public QWidget
+{
+public:
+    ScribbleWidget(QWidget *parent = 0);
+
+    void resizeEvent(QResizeEvent *e);
+    void mousePressEvent(QMouseEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
+    void mouseReleaseEvent(QMouseEvent *event);
+    void paintEvent(QPaintEvent *);
+
+private:
+    void drawLineTo(const QPoint &endPoint);
+
+private:
+    bool scribbling;
+    QPoint lastPoint;
+    QImage image;
+};
+
+#endif // SCRIBBLEWIDGET_H
diff --git a/examples/qws/qws.pro b/examples/qws/qws.pro
new file mode 100644
index 0000000000..fb3c3c7c09
--- /dev/null
+++ b/examples/qws/qws.pro
@@ -0,0 +1,7 @@
+TEMPLATE      = subdirs
+SUBDIRS       = framebuffer mousecalibration simpledecoration
+
+# install
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qws
+INSTALLS += sources
diff --git a/examples/qws/simpledecoration/analogclock.cpp b/examples/qws/simpledecoration/analogclock.cpp
new file mode 100644
index 0000000000..28155ba0e7
--- /dev/null
+++ b/examples/qws/simpledecoration/analogclock.cpp
@@ -0,0 +1,111 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "analogclock.h"
+
+AnalogClock::AnalogClock(QWidget *parent)
+    : QWidget(parent)
+{
+    QTimer *timer = new QTimer(this);
+    connect(timer, SIGNAL(timeout()), this, SLOT(update()));
+    timer->start(1000);
+
+    setWindowTitle(tr("Analog Clock"));
+    resize(200, 200);
+}
+
+void AnalogClock::paintEvent(QPaintEvent *)
+{
+    static const QPoint hourHand[3] = {
+        QPoint(7, 8),
+        QPoint(-7, 8),
+        QPoint(0, -40)
+    };
+    static const QPoint minuteHand[3] = {
+        QPoint(7, 8),
+        QPoint(-7, 8),
+        QPoint(0, -70)
+    };
+
+    QColor hourColor(127, 0, 127);
+    QColor minuteColor(0, 127, 127, 191);
+
+    int side = qMin(width(), height());
+    QTime time = QTime::currentTime();
+
+    QPainter painter(this);
+    painter.setRenderHint(QPainter::Antialiasing);
+    painter.translate(width() / 2, height() / 2);
+    painter.scale(side / 200.0, side / 200.0);
+
+    painter.setPen(Qt::NoPen);
+    painter.setBrush(hourColor);
+
+    painter.save();
+    painter.rotate(30.0 * ((time.hour() + time.minute() / 60.0)));
+    painter.drawConvexPolygon(hourHand, 3);
+    painter.restore();
+
+    painter.setPen(hourColor);
+
+    for (int i = 0; i < 12; ++i) {
+        painter.drawLine(88, 0, 96, 0);
+        painter.rotate(30.0);
+    }
+
+    painter.setPen(Qt::NoPen);
+    painter.setBrush(minuteColor);
+
+    painter.save();
+    painter.rotate(6.0 * (time.minute() + time.second() / 60.0));
+    painter.drawConvexPolygon(minuteHand, 3);
+    painter.restore();
+
+    painter.setPen(minuteColor);
+
+    for (int j = 0; j < 60; ++j) {
+        if ((j % 5) != 0)
+            painter.drawLine(92, 0, 96, 0);
+        painter.rotate(6.0);
+    }
+}
diff --git a/examples/qws/simpledecoration/analogclock.h b/examples/qws/simpledecoration/analogclock.h
new file mode 100644
index 0000000000..f779744314
--- /dev/null
+++ b/examples/qws/simpledecoration/analogclock.h
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ANALOGCLOCK_H
+#define ANALOGCLOCK_H
+
+#include <QWidget>
+
+class AnalogClock : public QWidget
+{
+    Q_OBJECT
+
+public:
+    AnalogClock(QWidget *parent = 0);
+
+protected:
+    void paintEvent(QPaintEvent *event);
+};
+
+#endif
diff --git a/examples/qws/simpledecoration/main.cpp b/examples/qws/simpledecoration/main.cpp
new file mode 100644
index 0000000000..597f5b3e20
--- /dev/null
+++ b/examples/qws/simpledecoration/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include "analogclock.h"
+#include "mydecoration.h"
+
+//! [create application]
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MyDecoration *decoration = new MyDecoration();
+    app.qwsSetDecoration(decoration);
+//! [create application]
+    
+//! [start application]
+    AnalogClock clock;
+    clock.show();
+
+    return app.exec();
+}
+//! [start application]
diff --git a/examples/qws/simpledecoration/mydecoration.cpp b/examples/qws/simpledecoration/mydecoration.cpp
new file mode 100644
index 0000000000..282bc88959
--- /dev/null
+++ b/examples/qws/simpledecoration/mydecoration.cpp
@@ -0,0 +1,375 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "mydecoration.h"
+
+/* XPM */
+static const char * const _close_button[] = {
+"16 16 3 1",
+"  c none",
+". c #ffafaf",
+"x c #000000",
+"                ",
+" xxxxxxxxxxxxxx ",
+" x............x ",
+" x.x........x.x ",
+" x..x......x..x ",
+" x...x....x...x ",
+" x....x..x....x ",
+" x.....xx.....x ",
+" x.....xx.....x ",
+" x....x..x....x ",
+" x...x....x...x ",
+" x..x......x..x ",
+" x.x........x.x ",
+" x............x ",
+" xxxxxxxxxxxxxx ",
+"                "};
+
+static const char * const _normalize_button[] = {
+"16 16 4 1",
+"  c none",
+". c #dfdfff",
+"o c #7f7f7f",
+"x c #000000",
+"                ",
+" xxxxxxxxxxxxxx ",
+" xx...........x ",
+" x.x..........x ",
+" x..x..x......x ",
+" x...xxx......x ",
+" x...xxx......x ",
+" x..xxxx......x ",
+" x............x ",
+" x.......xxxx.x ",
+" x.......x..x.x ",
+" x.......x..x.x ",
+" x.......xxxx.x ",
+" x............x ",
+" xxxxxxxxxxxxxx ",
+"                "};
+
+static const char * const _maximize_button[] = {
+"16 16 4 1",
+"  c none",
+". c #dfdfff",
+"o c #7f7f7f",
+"x c #000000",
+"                ",
+" xxxxxxxxxxxxxx ",
+" x............x ",
+" x.......xxxx.x ",
+" x........xxx.x ",
+" x........xxx.x ",
+" x.......x..x.x ",
+" x......x.....x ",
+" x.....x......x ",
+" x.oooo.......x ",
+" x.o..o.......x ",
+" x.o..o.......x ",
+" x.oooo.......x ",
+" x............x ",
+" xxxxxxxxxxxxxx ",
+"                "};
+
+static const char * const _help_button[] = {
+"16 16 3 1",
+"  c none",
+". c #afffdf",
+"x c #000000",
+"                ",
+" xxxxxxxxxxxxxx ",
+" x............x ",
+" x....xxxx....x ",
+" x..xx....xx..x ",
+" x.xx......xx.x ",
+" x.xx......xx.x ",
+" x........xx..x ",
+" x......xx....x ",
+" x.....xx.....x ",
+" x.....xx.....x ",
+" x............x ",
+" x.....xx.....x ",
+" x............x ",
+" xxxxxxxxxxxxxx ",
+"                "};
+
+//! [constructor start]
+MyDecoration::MyDecoration()
+    : QDecorationDefault()
+{
+    border = 4;
+    titleHeight = 24;
+    buttonWidth = 20;
+    buttonHeight = 20;
+    buttonMargin = 2;
+    buttonHints << Qt::Window
+                << Qt::WindowMaximizeButtonHint
+                << Qt::WindowContextHelpButtonHint;
+    //! [constructor start]
+
+    //! [map window flags to decoration regions]
+    buttonHintMap[Qt::Window] = Close;
+    buttonHintMap[Qt::WindowMaximizeButtonHint] = Maximize;
+    buttonHintMap[Qt::WindowContextHelpButtonHint] = Help;
+    //! [map window flags to decoration regions]
+
+    //! [map decoration regions to pixmaps]
+    normalButtonPixmaps[Close] = QPixmap(_close_button);
+    normalButtonPixmaps[Maximize] = QPixmap(_maximize_button);
+    normalButtonPixmaps[Normalize] = QPixmap(_normalize_button);
+    normalButtonPixmaps[Help] = QPixmap(_help_button);
+
+    maximizedButtonPixmaps[Close] = QPixmap(_close_button);
+    maximizedButtonPixmaps[Maximize] = QPixmap(_normalize_button);
+    maximizedButtonPixmaps[Normalize] = QPixmap(_normalize_button);
+    maximizedButtonPixmaps[Help] = QPixmap(_help_button);
+    //! [map decoration regions to pixmaps]
+
+    //! [constructor end]
+    stateRegions << Close << Maximize << Help;
+}
+//! [constructor end]
+
+//! [region start]
+QRegion MyDecoration::region(const QWidget *widget, const QRect &insideRect,
+                             int decorationRegion)
+{
+    //! [region start]
+    //! [calculate the positions of buttons based on the window flags used]
+    QHash<DecorationRegion, int> buttons;
+    Qt::WindowFlags flags = widget->windowFlags();
+    int dx = -buttonMargin - buttonWidth;
+
+    foreach (Qt::WindowType button, buttonHints) {
+        if (flags & button) {
+            int x = (buttons.size() + 1) * dx;
+            buttons[buttonHintMap[button]] = x;
+        }
+    }
+    //! [calculate the positions of buttons based on the window flags used]
+
+    //! [calculate the extent of the title]
+    int titleRightMargin = buttons.size() * dx;
+
+    QRect outsideRect(insideRect.left() - border,
+                      insideRect.top() - titleHeight - border,
+                      insideRect.width() + 2 * border,
+                      insideRect.height() + titleHeight + 2 * border);
+    //! [calculate the extent of the title]
+
+    //! [check for all regions]
+    QRegion region;
+
+    if (decorationRegion == All) {
+        region += QRegion(outsideRect) - QRegion(insideRect);
+        return region;
+    }
+    //! [check for all regions]
+
+    //! [compose a region based on the decorations specified]
+    if (decorationRegion & Title) {
+        QRect rect = outsideRect.adjusted(border, border, -border, 0);
+        rect.setHeight(titleHeight);
+
+        // Adjust the width to accommodate buttons.
+        rect.setWidth(qMax(0, rect.width() + titleRightMargin));
+        region += rect;
+    }
+    if (decorationRegion & Top) {
+        QRect rect = outsideRect.adjusted(border, 0, -border, 0);
+        rect.setHeight(border);
+        region += rect;
+    }
+    if (decorationRegion & Left) {
+        QRect rect = outsideRect.adjusted(0, border, 0, -border);
+        rect.setWidth(border);
+        region += rect;
+    }
+    if (decorationRegion & Right) {
+        QRect rect = outsideRect.adjusted(0, border, 0, -border);
+        rect.setLeft(rect.right() + 1 - border);
+        region += rect;
+    }
+    if (decorationRegion & Bottom) {
+        QRect rect = outsideRect.adjusted(border, 0, -border, 0);
+        rect.setTop(rect.bottom() + 1 - border);
+        region += rect;
+    }
+    if (decorationRegion & TopLeft) {
+        QRect rect = outsideRect;
+        rect.setWidth(border);
+        rect.setHeight(border);
+        region += rect;
+    }
+    if (decorationRegion & TopRight) {
+        QRect rect = outsideRect;
+        rect.setLeft(rect.right() + 1 - border);
+        rect.setHeight(border);
+        region += rect;